Merge branch 'gc/zero-length-branch-config-fix'
A misconfigured 'branch..remote' led to a bug in configuration
parsing.
* gc/zero-length-branch-config-fix:
remote.c: reject 0-length branch names
remote.c: don't BUG() on 0-length branch names
diff --git a/.cirrus.yml b/.cirrus.yml
index e114ffe..4860beb 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -9,7 +9,7 @@
DEFAULT_TEST_TARGET: prove
DEVELOPER: 1
freebsd_instance:
- image_family: freebsd-12-2
+ image_family: freebsd-12-3
memory: 2G
install_script:
pkg install -y gettext gmake perl5
diff --git a/.github/workflows/check-whitespace.yml b/.github/workflows/check-whitespace.yml
index 8c4358d..ad3466a 100644
--- a/.github/workflows/check-whitespace.yml
+++ b/.github/workflows/check-whitespace.yml
@@ -1,8 +1,9 @@
name: check-whitespace
-# Get the repo with the commits(+1) in the series.
+# Get the repository with all commits to ensure that we can analyze
+# all of the commits contributed via the Pull Request.
# Process `git log --check` output to extract just the check errors.
-# Add a comment to the pull request with the check errors.
+# Exit with failure upon white-space issues.
on:
pull_request:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4728168..3fa88b7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: CI/PR
+name: CI
on: [push, pull_request]
@@ -7,6 +7,7 @@
jobs:
ci-config:
+ name: config
runs-on: ubuntu-latest
outputs:
enabled: ${{ steps.check-ref.outputs.enabled }}${{ steps.skip-if-redundant.outputs.enabled }}
@@ -77,6 +78,7 @@
}
windows-build:
+ name: win build
needs: ci-config
if: needs.ci-config.outputs.enabled == 'yes'
runs-on: windows-latest
@@ -88,7 +90,7 @@
env:
HOME: ${{runner.workspace}}
NO_PERL: 1
- run: ci/make-test-artifacts.sh artifacts
+ run: . /etc/profile && ci/make-test-artifacts.sh artifacts
- name: zip up tracked files
run: git archive -o artifacts/tracked.tar.gz HEAD
- name: upload tracked files and build artifacts
@@ -97,6 +99,7 @@
name: windows-artifacts
path: artifacts
windows-test:
+ name: win test
runs-on: windows-latest
needs: [windows-build]
strategy:
@@ -115,11 +118,7 @@
- uses: git-for-windows/setup-git-for-windows-sdk@v1
- name: test
shell: bash
- run: ci/run-test-slice.sh ${{matrix.nr}} 10
- - name: ci/print-test-failures.sh
- if: failure()
- shell: bash
- run: ci/print-test-failures.sh
+ run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
- name: Upload failed tests' directories
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
uses: actions/upload-artifact@v2
@@ -127,6 +126,7 @@
name: failed-tests-windows
path: ${{env.FAILED_TEST_ARTIFACTS}}
vs-build:
+ name: win+VS build
needs: ci-config
if: needs.ci-config.outputs.enabled == 'yes'
env:
@@ -178,6 +178,7 @@
name: vs-artifacts
path: artifacts
vs-test:
+ name: win+VS test
runs-on: windows-latest
needs: vs-build
strategy:
@@ -198,12 +199,7 @@
shell: bash
env:
NO_SVN_TESTS: 1
- GIT_TEST_SKIP_REBASE_P: 1
- run: ci/run-test-slice.sh ${{matrix.nr}} 10
- - name: ci/print-test-failures.sh
- if: failure()
- shell: bash
- run: ci/print-test-failures.sh
+ run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
- name: Upload failed tests' directories
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
uses: actions/upload-artifact@v2
@@ -211,6 +207,7 @@
name: failed-tests-windows
path: ${{env.FAILED_TEST_ARTIFACTS}}
regular:
+ name: ${{matrix.vector.jobname}} (${{matrix.vector.pool}})
needs: ci-config
if: needs.ci-config.outputs.enabled == 'yes'
strategy:
@@ -220,14 +217,25 @@
- jobname: linux-clang
cc: clang
pool: ubuntu-latest
+ - jobname: linux-sha256
+ cc: clang
+ os: ubuntu
+ pool: ubuntu-latest
- jobname: linux-gcc
cc: gcc
+ cc_package: gcc-8
+ pool: ubuntu-latest
+ - jobname: linux-TEST-vars
+ cc: gcc
+ os: ubuntu
+ cc_package: gcc-8
pool: ubuntu-latest
- jobname: osx-clang
cc: clang
pool: macos-latest
- jobname: osx-gcc
cc: gcc
+ cc_package: gcc-9
pool: macos-latest
- jobname: linux-gcc-default
cc: gcc
@@ -237,14 +245,14 @@
pool: ubuntu-latest
env:
CC: ${{matrix.vector.cc}}
+ CC_PACKAGE: ${{matrix.vector.cc_package}}
jobname: ${{matrix.vector.jobname}}
+ runs_on_pool: ${{matrix.vector.pool}}
runs-on: ${{matrix.vector.pool}}
steps:
- uses: actions/checkout@v2
- 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@v2
@@ -252,6 +260,7 @@
name: failed-tests-${{matrix.vector.jobname}}
path: ${{env.FAILED_TEST_ARTIFACTS}}
dockerized:
+ name: ${{matrix.vector.jobname}} (${{matrix.vector.image}})
needs: ci-config
if: needs.ci-config.outputs.enabled == 'yes'
strategy:
@@ -260,7 +269,8 @@
vector:
- jobname: linux-musl
image: alpine
- - jobname: Linux32
+ - jobname: linux32
+ os: ubuntu32
image: daald/ubuntu32:xenial
- jobname: pedantic
image: fedora
@@ -272,8 +282,6 @@
- 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
@@ -290,6 +298,7 @@
- uses: actions/checkout@v2
- run: ci/install-dependencies.sh
- run: ci/run-static-analysis.sh
+ - run: ci/check-directional-formatting.bash
sparse:
needs: ci-config
if: needs.ci-config.outputs.enabled == 'yes'
@@ -311,6 +320,7 @@
run: ci/install-dependencies.sh
- run: make sparse
documentation:
+ name: documentation
needs: ci-config
if: needs.ci-config.outputs.enabled == 'yes'
env:
diff --git a/.gitignore b/.gitignore
index 311841f..a452215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,11 +72,13 @@
/git-format-patch
/git-fsck
/git-fsck-objects
+/git-fsmonitor--daemon
/git-gc
/git-get-tar-commit-id
/git-grep
/git-hash-object
/git-help
+/git-hook
/git-http-backend
/git-http-fetch
/git-http-push
@@ -125,7 +127,6 @@
/git-range-diff
/git-read-tree
/git-rebase
-/git-rebase--preserve-merges
/git-receive-pack
/git-reflog
/git-remote
@@ -190,6 +191,7 @@
/gitweb/static/gitweb.min.*
/config-list.h
/command-list.h
+/hook-list.h
*.tar.gz
*.dsc
*.deb
@@ -198,6 +200,7 @@
*.[aos]
*.o.json
*.py[co]
+.build/
.depend/
*.gcda
*.gcno
@@ -224,6 +227,7 @@
*.lib
*.res
*.sln
+*.sp
*.suo
*.ncb
*.vcproj
diff --git a/.mailmap b/.mailmap
index 9c6a446..07db36a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -59,8 +59,9 @@
David S. Miller <davem@davemloft.net>
David Turner <novalis@novalis.org> <dturner@twopensource.com>
David Turner <novalis@novalis.org> <dturner@twosigma.com>
-Derrick Stolee <dstolee@microsoft.com> <stolee@gmail.com>
-Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
+Derrick Stolee <derrickstolee@github.com> <stolee@gmail.com>
+Derrick Stolee <derrickstolee@github.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
+Derrick Stolee <derrickstolee@github.com> <dstolee@microsoft.com>
Deskin Miller <deskinm@umich.edu>
Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh
Dirk Süsserott <newsletter@dirk.my1.cc>
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 908330a..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-language: c
-
-cache:
- directories:
- - $HOME/travis-cache
-
-os:
- - linux
- - osx
-
-osx_image: xcode10.1
-
-compiler:
- - clang
- - gcc
-
-matrix:
- include:
- - env: jobname=linux-gcc-default
- os: linux
- compiler:
- addons:
- before_install:
- - env: jobname=linux-gcc-4.8
- os: linux
- dist: trusty
- compiler:
- - env: jobname=Linux32
- os: linux
- compiler:
- addons:
- services:
- - docker
- before_install:
- 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:
- script: ci/run-static-analysis.sh
- after_failure:
- - env: jobname=Documentation
- os: linux
- compiler:
- script: ci/test-documentation.sh
- after_failure:
-
-before_install: ci/install-dependencies.sh
-script: ci/run-build-and-tests.sh
-after_failure: ci/print-test-failures.sh
-
-notifications:
- email: false
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 65651be..0215b1f 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -70,8 +70,8 @@
- Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Christian Couder <christian.couder@gmail.com>
- - Jeff King <peff@peff.net>
- Junio C Hamano <gitster@pobox.com>
+ - Taylor Blau <me@ttaylorr.com>
All complaints will be reviewed and investigated promptly and fairly.
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index 9022d48..1c3771e 100644
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -14,4 +14,5 @@
SubmittingPatches.txt
tmp-doc-diff/
GIT-ASCIIDOCFLAGS
+/.build/
/GIT-EXCLUDED-PROGRAMS
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 711cb91..4c756be 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -26,6 +26,13 @@
go and fix it up."
Cf. http://lkml.iu.edu/hypermail/linux/kernel/1001.3/01069.html
+ - Log messages to explain your changes are as important as the
+ changes themselves. Clearly written code and in-code comments
+ explain how the code works and what is assumed from the surrounding
+ context. The log messages explain what the changes wanted to
+ achieve and why the changes were necessary (more on this in the
+ accompanying SubmittingPatches document).
+
Make your code readable and sensible, and don't try to be clever.
As for more concrete guidelines, just imitate the existing code
@@ -36,7 +43,10 @@
code is expected to match the style the surrounding code already
uses (even if it doesn't match the overall style of existing code).
-But if you must have a list of rules, here they are.
+But if you must have a list of rules, here are some language
+specific ones. Note that Documentation/ToolsForGit.txt document
+has a collection of tips to help you use some external tools
+to conform to these guidelines.
For shell scripts specifically (not exhaustive):
@@ -210,6 +220,9 @@
. since mid 2017 with 512f41cf, we have been using designated
initializers for array (e.g. "int array[10] = { [5] = 2 }").
+ . since early 2021 with 765dc168882, we have been using variadic
+ macros, mostly for printf-like trace and debug macros.
+
These used to be forbidden, but we have not heard any breakage
report, and they are assumed to be safe.
@@ -217,7 +230,10 @@
the first statement (i.e. -Wdeclaration-after-statement).
- Declaring a variable in the for loop "for (int i = 0; i < 10; i++)"
- is still not allowed in this codebase.
+ is still not allowed in this codebase. We are in the process of
+ allowing it by waiting to see that 44ba10d6 (revision: use C99
+ declaration of variable in for() loop, 2021-11-14) does not get
+ complaints. Let's revisit this around November 2022.
- NULL pointers shall be written as NULL, not as 0.
@@ -479,17 +495,6 @@
- Learn and use Git.pm if you need that functionality.
- - For Emacs, it's useful to put the following in
- GIT_CHECKOUT/.dir-locals.el, assuming you use cperl-mode:
-
- ;; note the first part is useful for C editing, too
- ((nil . ((indent-tabs-mode . t)
- (tab-width . 8)
- (fill-column . 80)))
- (cperl-mode . ((cperl-indent-level . 8)
- (cperl-extra-newline-before-brace . nil)
- (cperl-merge-trailing-else . t))))
-
For Python scripts:
- We follow PEP-8 (http://www.python.org/dev/peps/pep-0008/).
@@ -499,6 +504,33 @@
- Where required libraries do not restrict us to Python 2, we try to
also be compatible with Python 3.1 and later.
+
+Program Output
+
+ We make a distinction between a Git command's primary output and
+ output which is merely chatty feedback (for instance, status
+ messages, running transcript, or progress display), as well as error
+ messages. Roughly speaking, a Git command's primary output is that
+ which one might want to capture to a file or send down a pipe; its
+ chatty output should not interfere with these use-cases.
+
+ As such, primary output should be sent to the standard output stream
+ (stdout), and chatty output should be sent to the standard error
+ stream (stderr). Examples of commands which produce primary output
+ include `git log`, `git show`, and `git branch --list` which generate
+ output on the stdout stream.
+
+ Not all Git commands have primary output; this is often true of
+ commands whose main function is to perform an action. Some action
+ commands are silent, whereas others are chatty. An example of a
+ chatty action commands is `git clone` with its "Cloning into
+ '<path>'..." and "Checking connectivity..." status messages which it
+ sends to the stderr stream.
+
+ Error messages from Git commands should always be sent to the stderr
+ stream.
+
+
Error Messages
- Do not end error messages with a full stop.
diff --git a/Documentation/Makefile b/Documentation/Makefile
index f5605b7..f2e7fc1 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,3 +1,6 @@
+# Import tree-wide shared Makefile behavior and libraries
+include ../shared.mak
+
# Guard against environment variables
MAN1_TXT =
MAN5_TXT =
@@ -90,6 +93,9 @@
TECH_DOCS += MyFirstContribution
TECH_DOCS += MyFirstObjectWalk
TECH_DOCS += SubmittingPatches
+TECH_DOCS += ToolsForGit
+TECH_DOCS += technical/bundle-format
+TECH_DOCS += technical/cruft-packs
TECH_DOCS += technical/hash-function-transition
TECH_DOCS += technical/http-protocol
TECH_DOCS += technical/index-format
@@ -214,33 +220,6 @@
ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)'
endif
-QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
-QUIET_SUBDIR1 =
-
-ifneq ($(findstring $(MAKEFLAGS),w),w)
-PRINT_DIR = --no-print-directory
-else # "make -w"
-NO_SUBDIR = :
-endif
-
-ifneq ($(findstring $(MAKEFLAGS),s),s)
-ifndef V
- QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@;
- QUIET_XMLTO = @echo ' ' XMLTO $@;
- QUIET_DB2TEXI = @echo ' ' DB2TEXI $@;
- QUIET_MAKEINFO = @echo ' ' MAKEINFO $@;
- QUIET_DBLATEX = @echo ' ' DBLATEX $@;
- QUIET_XSLTPROC = @echo ' ' XSLTPROC $@;
- QUIET_GEN = @echo ' ' GEN $@;
- QUIET_LINT = @echo ' ' LINT $@;
- QUIET_STDERR = 2> /dev/null
- QUIET_SUBDIR0 = +@subdir=
- QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
- $(MAKE) $(PRINT_DIR) -C $$subdir
- export V
-endif
-endif
-
all: html man
html: $(DOC_HTML)
@@ -284,7 +263,7 @@
../GIT-VERSION-FILE: FORCE
$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
-ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(filter-out lint-docs clean,$(MAKECMDGOALS)),)
-include ../GIT-VERSION-FILE
endif
@@ -325,12 +304,12 @@
mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*)
$(QUIET_GEN) \
- $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \
+ $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && TOOL_MODE=diff && \
. ../git-mergetool--lib.sh && \
- show_tool_names can_diff "* " || :' >mergetools-diff.txt && \
- $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \
+ show_tool_names can_diff' | sed -e "s/\([a-z0-9]*\)/\`\1\`;;/" >mergetools-diff.txt && \
+ $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && TOOL_MODE=merge && \
. ../git-mergetool--lib.sh && \
- show_tool_names can_merge "* " || :' >mergetools-merge.txt && \
+ show_tool_names can_merge' | sed -e "s/\([a-z0-9]*\)/\`\1\`;;/" >mergetools-merge.txt && \
date >$@
TRACK_ASCIIDOCFLAGS = $(subst ','\'',$(ASCIIDOC_COMMON):$(ASCIIDOC_HTML):$(ASCIIDOC_DOCBOOK))
@@ -343,6 +322,7 @@
fi
clean:
+ $(RM) -rf .build/
$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
$(RM) *.pdf
@@ -412,7 +392,7 @@
$(RM) $@+
gitman.info: gitman.texi
- $(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi
+ $(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $<
$(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml
$(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@
@@ -456,21 +436,46 @@
print-man1:
@for i in $(MAN1_TXT); do echo $$i; done
-lint-docs::
- $(QUIET_LINT)$(PERL_PATH) lint-gitlink.perl \
+## Lint: gitlink
+LINT_DOCS_GITLINK = $(patsubst %.txt,.build/lint-docs/gitlink/%.ok,$(HOWTO_TXT) $(DOC_DEP_TXT))
+$(LINT_DOCS_GITLINK): lint-gitlink.perl
+$(LINT_DOCS_GITLINK): .build/lint-docs/gitlink/%.ok: %.txt
+ $(call mkdir_p_parent_template)
+ $(QUIET_LINT_GITLINK)$(PERL_PATH) lint-gitlink.perl \
+ $< \
$(HOWTO_TXT) $(DOC_DEP_TXT) \
--section=1 $(MAN1_TXT) \
--section=5 $(MAN5_TXT) \
- --section=7 $(MAN7_TXT); \
- $(PERL_PATH) lint-man-end-blurb.perl $(MAN_TXT); \
- $(PERL_PATH) lint-man-section-order.perl $(MAN_TXT);
+ --section=7 $(MAN7_TXT) >$@
+.PHONY: lint-docs-gitlink
+lint-docs-gitlink: $(LINT_DOCS_GITLINK)
+
+## Lint: man-end-blurb
+LINT_DOCS_MAN_END_BLURB = $(patsubst %.txt,.build/lint-docs/man-end-blurb/%.ok,$(MAN_TXT))
+$(LINT_DOCS_MAN_END_BLURB): lint-man-end-blurb.perl
+$(LINT_DOCS_MAN_END_BLURB): .build/lint-docs/man-end-blurb/%.ok: %.txt
+ $(call mkdir_p_parent_template)
+ $(QUIET_LINT_MANEND)$(PERL_PATH) lint-man-end-blurb.perl $< >$@
+.PHONY: lint-docs-man-end-blurb
+
+## Lint: man-section-order
+LINT_DOCS_MAN_SECTION_ORDER = $(patsubst %.txt,.build/lint-docs/man-section-order/%.ok,$(MAN_TXT))
+$(LINT_DOCS_MAN_SECTION_ORDER): lint-man-section-order.perl
+$(LINT_DOCS_MAN_SECTION_ORDER): .build/lint-docs/man-section-order/%.ok: %.txt
+ $(call mkdir_p_parent_template)
+ $(QUIET_LINT_MANSEC)$(PERL_PATH) lint-man-section-order.perl $< >$@
+.PHONY: lint-docs-man-section-order
+lint-docs-man-section-order: $(LINT_DOCS_MAN_SECTION_ORDER)
+
+## Lint: list of targets above
+.PHONY: lint-docs
+lint-docs: lint-docs-gitlink
+lint-docs: lint-docs-man-end-blurb
+lint-docs: lint-docs-man-section-order
ifeq ($(wildcard po/Makefile),po/Makefile)
doc-l10n install-l10n::
$(MAKE) -C po $@
endif
-# Delete the target file on error
-.DELETE_ON_ERROR:
-
.PHONY: FORCE
diff --git a/Documentation/MyFirstContribution.txt b/Documentation/MyFirstContribution.txt
index b20bc8e..1da15d9 100644
--- a/Documentation/MyFirstContribution.txt
+++ b/Documentation/MyFirstContribution.txt
@@ -710,13 +710,104 @@
Go ahead and commit this change, as well.
[[ready-to-share]]
-== Getting Ready to Share
+== Getting Ready to Share: Anatomy of a Patch Series
You may have noticed already that the Git project performs its code reviews via
emailed patches, which are then applied by the maintainer when they are ready
-and approved by the community. The Git project does not accept patches from
+and approved by the community. The Git project does not accept contributions from
pull requests, and the patches emailed for review need to be formatted a
-specific way. At this point the tutorial diverges, in order to demonstrate two
+specific way.
+
+:patch-series: https://lore.kernel.org/git/pull.1218.git.git.1645209647.gitgitgadget@gmail.com/
+:lore: https://lore.kernel.org/git/
+
+Before taking a look at how to convert your commits into emailed patches,
+let's analyze what the end result, a "patch series", looks like. Here is an
+{patch-series}[example] of the summary view for a patch series on the web interface of
+the {lore}[Git mailing list archive]:
+
+----
+2022-02-18 18:40 [PATCH 0/3] libify reflog John Cai via GitGitGadget
+2022-02-18 18:40 ` [PATCH 1/3] reflog: libify delete reflog function and helpers John Cai via GitGitGadget
+2022-02-18 19:10 ` Ævar Arnfjörð Bjarmason [this message]
+2022-02-18 19:39 ` Taylor Blau
+2022-02-18 19:48 ` Ævar Arnfjörð Bjarmason
+2022-02-18 19:35 ` Taylor Blau
+2022-02-21 1:43 ` John Cai
+2022-02-21 1:50 ` Taylor Blau
+2022-02-23 19:50 ` John Cai
+2022-02-18 20:00 ` // other replies ellided
+2022-02-18 18:40 ` [PATCH 2/3] reflog: call reflog_delete from reflog.c John Cai via GitGitGadget
+2022-02-18 19:15 ` Ævar Arnfjörð Bjarmason
+2022-02-18 20:26 ` Junio C Hamano
+2022-02-18 18:40 ` [PATCH 3/3] stash: call reflog_delete from reflog.c John Cai via GitGitGadget
+2022-02-18 19:20 ` Ævar Arnfjörð Bjarmason
+2022-02-19 0:21 ` Taylor Blau
+2022-02-22 2:36 ` John Cai
+2022-02-22 10:51 ` Ævar Arnfjörð Bjarmason
+2022-02-18 19:29 ` [PATCH 0/3] libify reflog Ævar Arnfjörð Bjarmason
+2022-02-22 18:30 ` [PATCH v2 0/3] libify reflog John Cai via GitGitGadget
+2022-02-22 18:30 ` [PATCH v2 1/3] stash: add test to ensure reflog --rewrite --updatref behavior John Cai via GitGitGadget
+2022-02-23 8:54 ` Ævar Arnfjörð Bjarmason
+2022-02-23 21:27 ` Junio C Hamano
+// continued
+----
+
+We can note a few things:
+
+- Each commit is sent as a separate email, with the commit message title as
+ subject, prefixed with "[PATCH _i_/_n_]" for the _i_-th commit of an
+ _n_-commit series.
+- Each patch is sent as a reply to an introductory email called the _cover
+ letter_ of the series, prefixed "[PATCH 0/_n_]".
+- Subsequent iterations of the patch series are labelled "PATCH v2", "PATCH
+ v3", etc. in place of "PATCH". For example, "[PATCH v2 1/3]" would be the first of
+ three patches in the second iteration. Each iteration is sent with a new cover
+ letter (like "[PATCH v2 0/3]" above), itself a reply to the cover letter of the
+ previous iteration (more on that below).
+
+NOTE: A single-patch topic is sent with "[PATCH]", "[PATCH v2]", etc. without
+_i_/_n_ numbering (in the above thread overview, no single-patch topic appears,
+though).
+
+[[cover-letter]]
+=== The cover letter
+
+In addition to an email per patch, the Git community also expects your patches
+to come with a cover letter. This is an important component of change
+submission as it explains to the community from a high level what you're trying
+to do, and why, in a way that's more apparent than just looking at your
+patches.
+
+The title of your cover letter should be something which succinctly covers the
+purpose of your entire topic branch. It's often in the imperative mood, just
+like our commit message titles. Here is how we'll title our series:
+
+---
+Add the 'psuh' command
+---
+
+The body of the cover letter is used to give additional context to reviewers.
+Be sure to explain anything your patches don't make clear on their own, but
+remember that since the cover letter is not recorded in the commit history,
+anything that might be useful to future readers of the repository's history
+should also be in your commit messages.
+
+Here's an example body for `psuh`:
+
+----
+Our internal metrics indicate widespread interest in the command
+git-psuh - that is, many users are trying to use it, but finding it is
+unavailable, using some unknown workaround instead.
+
+The following handful of patches add the psuh command and implement some
+handy features on top of it.
+
+This patchset is part of the MyFirstContribution tutorial and should not
+be merged.
+----
+
+At this point the tutorial diverges, in order to demonstrate two
different methods of formatting your patchset and getting it reviewed.
The first method to be covered is GitGitGadget, which is useful for those
@@ -808,8 +899,22 @@
request" button or the convenient "Compare & pull request" button that may
appear with the name of your newly pushed branch.
-Review the PR's title and description, as it's used by GitGitGadget as the cover
-letter for your change. When you're happy, submit your pull request.
+Review the PR's title and description, as they're used by GitGitGadget
+respectively as the subject and body of the cover letter for your change. Refer
+to <<cover-letter,"The cover letter">> above for advice on how to title your
+submission and what content to include in the description.
+
+NOTE: For single-patch contributions, your commit message should already be
+meaningful and explain at a high level the purpose (what is happening and why)
+of your patch, so you usually do not need any additional context. In that case,
+remove the PR description that GitHub automatically generates from your commit
+message (your PR description should be empty). If you do need to supply even
+more context, you can do so in that space and it will be appended to the email
+that GitGitGadget will send, between the three-dash line and the diffstat
+(see <<single-patch,Bonus Chapter: One-Patch Changes>> for how this looks once
+submitted).
+
+When you're happy, submit your pull request.
[[run-ci-ggg]]
=== Running CI and Getting Ready to Send
@@ -905,19 +1010,34 @@
themselves, you'll need to prepare the patches. Luckily, this is pretty simple:
----
-$ git format-patch --cover-letter -o psuh/ master..psuh
+$ git format-patch --cover-letter -o psuh/ --base=auto psuh@{u}..psuh
----
-The `--cover-letter` parameter tells `format-patch` to create a cover letter
-template for you. You will need to fill in the template before you're ready
-to send - but for now, the template will be next to your other patches.
+ . The `--cover-letter` option tells `format-patch` to create a
+ cover letter template for you. You will need to fill in the
+ template before you're ready to send - but for now, the template
+ will be next to your other patches.
-The `-o psuh/` parameter tells `format-patch` to place the patch files into a
-directory. This is useful because `git send-email` can take a directory and
-send out all the patches from there.
+ . The `-o psuh/` option tells `format-patch` to place the patch
+ files into a directory. This is useful because `git send-email`
+ can take a directory and send out all the patches from there.
-`master..psuh` tells `format-patch` to generate patches for the difference
-between `master` and `psuh`. It will make one patch file per commit. After you
+ . The `--base=auto` option tells the command to record the "base
+ commit", on which the recipient is expected to apply the patch
+ series. The `auto` value will cause `format-patch` to compute
+ the base commit automatically, which is the merge base of tip
+ commit of the remote-tracking branch and the specified revision
+ range.
+
+ . The `psuh@{u}..psuh` option tells `format-patch` to generate
+ patches for the commits you created on the `psuh` branch since it
+ forked from its upstream (which is `origin/master` if you
+ followed the example in the "Set up your workspace" section). If
+ you are already on the `psuh` branch, you can just say `@{u}`,
+ which means "commits on the current branch since it forked from
+ its upstream", which is the same thing.
+
+The command will make one patch file per commit. After you
run, you can go have a look at each of the patches with your favorite text
editor and make sure everything looks alright; however, it's not recommended to
make code fixups via the patch file. It's a better idea to make the change the
@@ -937,49 +1057,29 @@
Check and make sure that your patches and cover letter template exist in the
directory you specified - you're nearly ready to send out your review!
-[[cover-letter]]
+[[preparing-cover-letter]]
=== Preparing Email
-In addition to an email per patch, the Git community also expects your patches
-to come with a cover letter, typically with a subject line [PATCH 0/x] (where
-x is the number of patches you're sending). Since you invoked `format-patch`
-with `--cover-letter`, you've already got a template ready. Open it up in your
-favorite editor.
+Since you invoked `format-patch` with `--cover-letter`, you've already got a
+cover letter template ready. Open it up in your favorite editor.
You should see a number of headers present already. Check that your `From:`
-header is correct. Then modify your `Subject:` to something which succinctly
-covers the purpose of your entire topic branch, for example:
+header is correct. Then modify your `Subject:` (see <<cover-letter,above>> for
+how to choose good title for your patch series):
----
-Subject: [PATCH 0/7] adding the 'psuh' command
+Subject: [PATCH 0/7] Add the 'psuh' command
----
Make sure you retain the ``[PATCH 0/X]'' part; that's what indicates to the Git
-community that this email is the beginning of a review, and many reviewers
-filter their email for this type of flag.
+community that this email is the beginning of a patch series, and many
+reviewers filter their email for this type of flag.
You'll need to add some extra parameters when you invoke `git send-email` to add
the cover letter.
-Next you'll have to fill out the body of your cover letter. This is an important
-component of change submission as it explains to the community from a high level
-what you're trying to do, and why, in a way that's more apparent than just
-looking at your diff. Be sure to explain anything your diff doesn't make clear
-on its own.
-
-Here's an example body for `psuh`:
-
-----
-Our internal metrics indicate widespread interest in the command
-git-psuh - that is, many users are trying to use it, but finding it is
-unavailable, using some unknown workaround instead.
-
-The following handful of patches add the psuh command and implement some
-handy features on top of it.
-
-This patchset is part of the MyFirstContribution tutorial and should not
-be merged.
-----
+Next you'll have to fill out the body of your cover letter. Again, see
+<<cover-letter,above>> for what content to include.
The template created by `git format-patch --cover-letter` includes a diffstat.
This gives reviewers a summary of what they're in for when reviewing your topic.
diff --git a/Documentation/MyFirstObjectWalk.txt b/Documentation/MyFirstObjectWalk.txt
index 45eb84d..8d9e855 100644
--- a/Documentation/MyFirstObjectWalk.txt
+++ b/Documentation/MyFirstObjectWalk.txt
@@ -58,14 +58,19 @@
Add usage text and `-h` handling, like all subcommands should consistently do
(our test suite will notice and complain if you fail to do so).
+We'll need to include the `parse-options.h` header.
----
+#include "parse-options.h"
+
+...
+
int cmd_walken(int argc, const char **argv, const char *prefix)
{
const char * const walken_usage[] = {
N_("git walken"),
NULL,
- }
+ };
struct option options[] = {
OPT_END()
};
@@ -195,9 +200,14 @@
ourselves; however, we should call `git_default_config()` if we aren't calling
any other existing config callbacks.
-Add a new function to `builtin/walken.c`:
+Add a new function to `builtin/walken.c`.
+We'll also need to include the `config.h` header:
----
+#include "config.h"
+
+...
+
static int git_walken_config(const char *var, const char *value, void *cb)
{
/*
@@ -229,8 +239,14 @@
to target, as well as the `prefix` argument of `cmd_walken` and your `rev_info`
struct.
-Add the `struct rev_info` and the `repo_init_revisions()` call:
+Add the `struct rev_info` and the `repo_init_revisions()` call.
+We'll also need to include the `revision.h` header:
+
----
+#include "revision.h"
+
+...
+
int cmd_walken(int argc, const char **argv, const char *prefix)
{
/* This can go wherever you like in your declarations.*/
@@ -506,24 +522,25 @@
`traverse_commit_list()` or `traverse_commit_list_filtered()`. Those two
functions reside in `list-objects.c`; examining the source shows that, despite
the name, these functions traverse all kinds of objects. Let's have a look at
-the arguments to `traverse_commit_list_filtered()`, which are a superset of the
-arguments to the unfiltered version.
+the arguments to `traverse_commit_list()`.
-- `struct list_objects_filter_options *filter_options`: This is a struct which
- stores a filter-spec as outlined in `Documentation/rev-list-options.txt`.
-- `struct rev_info *revs`: This is the `rev_info` used for the walk.
+- `struct rev_info *revs`: This is the `rev_info` used for the walk. If
+ its `filter` member is not `NULL`, then `filter` contains information for
+ how to filter the object list.
- `show_commit_fn show_commit`: A callback which will be used to handle each
individual commit object.
- `show_object_fn show_object`: A callback which will be used to handle each
non-commit object (so each blob, tree, or tag).
- `void *show_data`: A context buffer which is passed in turn to `show_commit`
and `show_object`.
+
+In addition, `traverse_commit_list_filtered()` has an additional paramter:
+
- `struct oidset *omitted`: A linked-list of object IDs which the provided
filter caused to be omitted.
-It looks like this `traverse_commit_list_filtered()` uses callbacks we provide
-instead of needing us to call it repeatedly ourselves. Cool! Let's add the
-callbacks first.
+It looks like these methods use callbacks we provide instead of needing us
+to call it repeatedly ourselves. Cool! Let's add the callbacks first.
For the sake of this tutorial, we'll simply keep track of how many of each kind
of object we find. At file scope in `builtin/walken.c` add the following
@@ -624,9 +641,14 @@
----
Let's start by calling just the unfiltered walk and reporting our counts.
-Complete your implementation of `walken_object_walk()`:
+Complete your implementation of `walken_object_walk()`.
+We'll also need to include the `list-objects.h` header.
----
+#include "list-objects.h"
+
+...
+
traverse_commit_list(rev, walken_show_commit, walken_show_object, NULL);
printf("commits %d\nblobs %d\ntags %d\ntrees %d\n", commit_count,
@@ -691,20 +713,9 @@
referenced by `HEAD` or `HEAD`'s history, because we begin the walk with only
`HEAD` in the `pending` list.)
-First, we'll need to `#include "list-objects-filter-options.h"` and set up the
-`struct list_objects_filter_options` at the top of the function.
-
-----
-static void walken_object_walk(struct rev_info *rev)
-{
- struct list_objects_filter_options filter_options = {};
-
- ...
-----
-
For now, we are not going to track the omitted objects, so we'll replace those
parameters with `NULL`. For the sake of simplicity, we'll add a simple
-build-time branch to use our filter or not. Replace the line calling
+build-time branch to use our filter or not. Preface the line calling
`traverse_commit_list()` with the following, which will remind us which kind of
walk we've just performed:
@@ -712,19 +723,17 @@
if (0) {
/* Unfiltered: */
trace_printf(_("Unfiltered object walk.\n"));
- traverse_commit_list(rev, walken_show_commit,
- walken_show_object, NULL);
} else {
trace_printf(
_("Filtered object walk with filterspec 'tree:1'.\n"));
- parse_list_objects_filter(&filter_options, "tree:1");
-
- traverse_commit_list_filtered(&filter_options, rev,
- walken_show_commit, walken_show_object, NULL, NULL);
+ CALLOC_ARRAY(rev->filter, 1);
+ parse_list_objects_filter(rev->filter, "tree:1");
}
+ traverse_commit_list(rev, walken_show_commit,
+ walken_show_object, NULL);
----
-`struct list_objects_filter_options` is usually built directly from a command
+The `rev->filter` member is usually built directly from a command
line argument, so the module provides an easy way to build one from a string.
Even though we aren't taking user input right now, we can still build one with
a hardcoded string using `parse_list_objects_filter()`.
@@ -763,7 +772,7 @@
----
...
- traverse_commit_list_filtered(&filter_options, rev,
+ traverse_commit_list_filtered(rev,
walken_show_commit, walken_show_object, NULL, &omitted);
...
diff --git a/Documentation/RelNotes/2.30.3.txt b/Documentation/RelNotes/2.30.3.txt
new file mode 100644
index 0000000..31b2a4d
--- /dev/null
+++ b/Documentation/RelNotes/2.30.3.txt
@@ -0,0 +1,24 @@
+Git v2.30.2 Release Notes
+=========================
+
+This release addresses the security issue CVE-2022-24765.
+
+Fixes since v2.30.2
+-------------------
+
+ * Build fix on Windows.
+
+ * Fix `GIT_CEILING_DIRECTORIES` with Windows-style root directories.
+
+ * CVE-2022-24765:
+ On multi-user machines, Git users might find themselves
+ unexpectedly in a Git worktree, e.g. when another user created a
+ repository in `C:\.git`, in a mounted network drive or in a
+ scratch space. Merely having a Git-aware prompt that runs `git
+ status` (or `git diff`) and navigating to a directory which is
+ supposedly not a Git worktree, or opening such a directory in an
+ editor or IDE such as VS Code or Atom, will potentially run
+ commands defined by that other user.
+
+Credit for finding this vulnerability goes to 俞晨东; The fix was
+authored by Johannes Schindelin.
diff --git a/Documentation/RelNotes/2.30.4.txt b/Documentation/RelNotes/2.30.4.txt
new file mode 100644
index 0000000..4eedb74
--- /dev/null
+++ b/Documentation/RelNotes/2.30.4.txt
@@ -0,0 +1,21 @@
+Git v2.30.4 Release Notes
+=========================
+
+This release contains minor fix-ups for the changes that went into
+Git 2.30.3, which was made to address CVE-2022-24765.
+
+ * The code that was meant to parse the new `safe.directory`
+ configuration variable was not checking what configuration
+ variable was being fed to it, which has been corrected.
+
+ * '*' can be used as the value for the `safe.directory` variable to
+ signal that the user considers that any directory is safe.
+
+
+
+Derrick Stolee (2):
+ t0033: add tests for safe.directory
+ setup: opt-out of check with safe.directory=*
+
+Matheus Valadares (1):
+ setup: fix safe.directory key not being checked
diff --git a/Documentation/RelNotes/2.31.2.txt b/Documentation/RelNotes/2.31.2.txt
new file mode 100644
index 0000000..aa13a5b
--- /dev/null
+++ b/Documentation/RelNotes/2.31.2.txt
@@ -0,0 +1,6 @@
+Git v2.31.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.3 to address
+the security issue CVE-2022-24765; see the release notes for that
+version for details.
diff --git a/Documentation/RelNotes/2.31.3.txt b/Documentation/RelNotes/2.31.3.txt
new file mode 100644
index 0000000..ca143ab
--- /dev/null
+++ b/Documentation/RelNotes/2.31.3.txt
@@ -0,0 +1,4 @@
+Git Documentation/RelNotes/2.31.3.txt Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.31.3.
diff --git a/Documentation/RelNotes/2.32.1.txt b/Documentation/RelNotes/2.32.1.txt
new file mode 100644
index 0000000..7dcca13
--- /dev/null
+++ b/Documentation/RelNotes/2.32.1.txt
@@ -0,0 +1,6 @@
+Git v2.32.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.3 and
+v2.31.2 to address the security issue CVE-2022-24765; see the
+release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.32.2.txt b/Documentation/RelNotes/2.32.2.txt
new file mode 100644
index 0000000..cf49695
--- /dev/null
+++ b/Documentation/RelNotes/2.32.2.txt
@@ -0,0 +1,4 @@
+Git Documentation/RelNotes/2.32.2.txt Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.32.2.
diff --git a/Documentation/RelNotes/2.33.2.txt b/Documentation/RelNotes/2.33.2.txt
new file mode 100644
index 0000000..e504489
--- /dev/null
+++ b/Documentation/RelNotes/2.33.2.txt
@@ -0,0 +1,15 @@
+Git v2.33.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.3, v2.31.2
+and v2.32.1 to address the security issue CVE-2022-24765; see
+the release notes for these versions for details.
+
+In addition, it contains the following fixes:
+
+ * Squelch over-eager warning message added during this cycle.
+
+ * A bug in "git rebase -r" has been fixed.
+
+ * One CI task based on Fedora image noticed a not-quite-kosher
+ construct recently, which has been corrected.
diff --git a/Documentation/RelNotes/2.33.3.txt b/Documentation/RelNotes/2.33.3.txt
new file mode 100644
index 0000000..e2bada1
--- /dev/null
+++ b/Documentation/RelNotes/2.33.3.txt
@@ -0,0 +1,4 @@
+Git Documentation/RelNotes/2.33.3.txt Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.33.3.
diff --git a/Documentation/RelNotes/2.34.0.txt b/Documentation/RelNotes/2.34.0.txt
index 080687f..75d4fdf 100644
--- a/Documentation/RelNotes/2.34.0.txt
+++ b/Documentation/RelNotes/2.34.0.txt
@@ -4,13 +4,19 @@
Updates since Git 2.33
----------------------
+Backward compatibility notes
+
+ * The "--preserve-merges" option of "git rebase" has been removed.
+
+
UI, Workflows & Features
* Pathname expansion (like "~username/") learned a way to specify a
location relative to Git installation (e.g. its $sharedir which is
$(prefix)/share), with "%(prefix)".
- * Use `ort` instead of `recursive` as the default merge strategy.
+ * The `ort` strategy is used instead of `recursive` as the default
+ merge strategy.
* The userdiff pattern for "java" language has been updated.
@@ -62,6 +68,25 @@
* The ref iteration code used to optionally allow dangling refs to be
shown, which has been tightened up.
+ * "git add", "git mv", and "git rm" have been adjusted to avoid
+ updating paths outside of the sparse-checkout definition unless
+ the user specifies a "--sparse" option.
+
+ * "git repack" has been taught to generate multi-pack reachability
+ bitmaps.
+
+ * "git fsck" has been taught to report mismatch between expected and
+ actual types of an object better.
+
+ * In addition to GnuPG, ssh public crypto can be used for object and
+ push-cert signing. Note that this feature cannot be used with
+ ssh-keygen from OpenSSH 8.7, whose support for it is broken. Avoid
+ using it unless you update to OpenSSH 8.8.
+
+ * "git log --grep=string --author=name" learns to highlight hits just
+ like "git grep string" does.
+
+
Performance, Internal Implementation, Development Support etc.
@@ -146,6 +171,28 @@
* CI learns to run the leak sanitizer builds.
+ * "git grep --recurse-submodules" takes trees and blobs from the
+ submodule repository, but the textconv settings when processing a
+ blob from the submodule is not taken from the submodule repository.
+ A test is added to demonstrate the issue, without fixing it.
+
+ * Teach "git help -c" into helping the command line completion of
+ configuration variables.
+
+ * When "git cmd -h" shows more than one line of usage text (e.g.
+ the cmd subcommand may take sub-sub-command), parse-options API
+ learned to align these lines, even across i18n/l10n.
+
+ * Prevent "make sparse" from running for the source files that
+ haven't been modified.
+
+ * The code path to write a new version of .midx multi-pack index files
+ has learned to release the mmaped memory holding the current
+ version of .midx before removing them from the disk, as some
+ platforms do not allow removal of a file that still has mapping.
+
+ * A new feature has been added to abort early in the test framework.
+
Fixes since v2.33
-----------------
@@ -217,12 +264,8 @@
* The output from "git fast-export", when its anonymization feature
is in use, showed an annotated tag incorrectly.
- * Doc update plus improved error reporting.
-
* Recent "diff -m" changes broke "gitk", which has been corrected.
- * Regression fix.
-
* The "git apply -3" code path learned not to bother the lower level
merge machinery when the three-way merge can be trivially resolved
without the content level merge. This fixes a regression caused by
@@ -275,6 +318,108 @@
* Protocol v0 clients can get stuck parsing a malformed feature line.
+ * A few kinds of changes "git status" can show were not documented.
+ (merge d2a534c515 ja/doc-status-types-and-copies later to maint).
+
+ * The mergesort implementation used to sort linked list has been
+ optimized.
+ (merge c90cfc225b rs/mergesort later to maint).
+
+ * An editor session launched during a Git operation (e.g. during 'git
+ commit') can leave the terminal in a funny state. The code path
+ has updated to save the terminal state before, and restore it
+ after, it spawns an editor.
+ (merge 3d411afabc cm/save-restore-terminal later to maint).
+
+ * "git cat-file --batch" with the "--batch-all-objects" option is
+ supposed to iterate over all the objects found in a repository, but
+ it used to translate these object names using the replace mechanism,
+ which defeats the point of enumerating all objects in the repository.
+ This has been corrected.
+ (merge bf972896d7 jk/cat-file-batch-all-wo-replace later to maint).
+
+ * Recent sparse-index work broke safety against attempts to add paths
+ with trailing slashes to the index, which has been corrected.
+ (merge c8ad9d04c6 rs/make-verify-path-really-verify-again later to maint).
+
+ * The "--color-lines" and "--color-by-age" options of "git blame"
+ have been missing, which are now documented.
+ (merge 8c32856133 bs/doc-blame-color-lines later to maint).
+
+ * The PATH used in CI job may be too wide and let incompatible dlls
+ to be grabbed, which can cause the build&test to fail. Tighten it.
+ (merge 7491ef6198 js/windows-ci-path-fix later to maint).
+
+ * Avoid performance measurements from getting ruined by gc and other
+ housekeeping pauses interfering in the middle.
+ (merge be79131a53 rs/disable-gc-during-perf-tests later to maint).
+
+ * Stop "git add --dry-run" from creating new blob and tree objects.
+ (merge e578d0311d rs/add-dry-run-without-objects later to maint).
+
+ * "git commit" gave duplicated error message when the object store
+ was unwritable, which has been corrected.
+ (merge 4ef91a2d79 ab/fix-commit-error-message-upon-unwritable-object-store later to maint).
+
+ * Recent sparse-index addition, namely any use of index_name_pos(),
+ can expand sparse index entries and breaks any code that walks
+ cache-tree or existing index entries. One such instance of such a
+ breakage has been corrected.
+
+ * The xxdiff difftool backend can exit with status 128, which the
+ difftool-helper that launches the backend takes as a significant
+ failure, when it is not significant at all. Work it around.
+ (merge 571f4348dd da/mergetools-special-case-xxdiff-exit-128 later to maint).
+
+ * Improve test framework around unwritable directories.
+ (merge 5d22e18965 ab/test-cleanly-recreate-trash-directory later to maint).
+
+ * "git push" client talking to an HTTP server did not diagnose the
+ lack of the final status report from the other side correctly,
+ which has been corrected.
+ (merge c5c3486f38 jk/http-push-status-fix later to maint).
+
+ * Update "git archive" documentation and give explicit mention on the
+ compression level for both zip and tar.gz format.
+ (merge c4b208c309 bs/archive-doc-compression-level later to maint).
+
+ * Drop "git sparse-checkout" from the list of common commands.
+ (merge 6a9a50a8af sg/sparse-index-not-that-common-a-command later to maint).
+
+ * "git branch -c/-m new old" was not described to copy config, which
+ has been corrected.
+ (merge 8252ec300e jc/branch-copy-doc later to maint).
+
+ * Squelch over-eager warning message added during this cycle.
+
+ * Fix long-standing shell syntax error in the completion script.
+ (merge 46b0585286 re/completion-fix-test-equality later to maint).
+
+ * Teach "git commit-graph" command not to allow using replace objects
+ at all, as we do not use the commit-graph at runtime when we see
+ object replacement.
+ (merge 095d112f8c ab/ignore-replace-while-working-on-commit-graph later to maint).
+
+ * "git pull --no-verify" did not affect the underlying "git merge".
+ (merge 47bfdfb3fd ar/fix-git-pull-no-verify later to maint).
+
+ * One CI task based on Fedora image noticed a not-quite-kosher
+ construct recently, which has been corrected.
+
+ * "git pull --ff-only" and "git pull --rebase --ff-only" should make
+ it a no-op to attempt pulling from a remote that is behind us, but
+ instead the command errored out by saying it was impossible to
+ fast-forward, which may technically be true, but not a useful thing
+ to diagnose as an error. This has been corrected.
+ (merge 361cb52383 jc/fix-pull-ff-only-when-already-up-to-date later to maint).
+
+ * The way Cygwin emulates a unix-domain socket, on top of which the
+ simple-ipc mechanism is implemented, can race with the program on
+ the other side that wants to use the socket, and briefly make it
+ appear as a regular file before lstat(2) starts reporting it as a
+ socket. We now have a workaround on the side that connects to a
+ unix domain socket.
+
* Other code cleanup, docfix, build fix, etc.
(merge f188160be9 ab/bundle-remove-verbose-option later to maint).
(merge 8c6b4332b4 rs/close-pack-leakfix later to maint).
@@ -283,3 +428,11 @@
(merge 6ffb990dc4 os/status-docfix later to maint).
(merge 100c2da2d3 rs/p3400-lose-tac later to maint).
(merge 76f3b69896 tb/aggregate-ignore-leading-whitespaces later to maint).
+ (merge 6e4fd8bfcd tz/doc-link-to-bundle-format-fix later to maint).
+ (merge f6c013dfa1 jc/doc-commit-header-continuation-line later to maint).
+ (merge ec9a37d69b ab/pkt-line-cleanup later to maint).
+ (merge 8650c6298c ab/fix-make-lint-docs later to maint).
+ (merge 1c720357ce ab/test-lib-diff-cleanup later to maint).
+ (merge 6b615dbece ks/submodule-add-message-fix later to maint).
+ (merge 203eb8381a jc/doc-format-patch-clarify-auto-base later to maint).
+ (merge 559664c792 ab/test-lib later to maint).
diff --git a/Documentation/RelNotes/2.34.1.txt b/Documentation/RelNotes/2.34.1.txt
new file mode 100644
index 0000000..ad404e9
--- /dev/null
+++ b/Documentation/RelNotes/2.34.1.txt
@@ -0,0 +1,23 @@
+Git v2.34.1 Release Notes
+=========================
+
+This release is primarily to fix a handful of regressions in Git 2.34.
+
+Fixes since v2.34
+-----------------
+
+ * "git grep" looking in a blob that has non-UTF8 payload was
+ completely broken when linked with certain versions of PCREv2
+ library in the latest release.
+
+ * "git pull" with any strategy when the other side is behind us
+ should succeed as it is a no-op, but doesn't.
+
+ * An earlier change in 2.34.0 caused JGit application (that abused
+ GIT_EDITOR mechanism when invoking "git config") to get stuck with
+ a SIGTTOU signal; it has been reverted.
+
+ * An earlier change that broke .gitignore matching has been reverted.
+
+ * SubmittingPatches document gained a syntactically incorrect mark-up,
+ which has been corrected.
diff --git a/Documentation/RelNotes/2.34.2.txt b/Documentation/RelNotes/2.34.2.txt
new file mode 100644
index 0000000..0c32cd8
--- /dev/null
+++ b/Documentation/RelNotes/2.34.2.txt
@@ -0,0 +1,6 @@
+Git v2.34.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.3, v2.31.2,
+v2.32.1 and v2.33.2 to address the security issue CVE-2022-24765;
+see the release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.34.3.txt b/Documentation/RelNotes/2.34.3.txt
new file mode 100644
index 0000000..10f6171
--- /dev/null
+++ b/Documentation/RelNotes/2.34.3.txt
@@ -0,0 +1,4 @@
+Git Documentation/RelNotes/2.34.3.txt Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.34.3.
diff --git a/Documentation/RelNotes/2.35.0.txt b/Documentation/RelNotes/2.35.0.txt
new file mode 100644
index 0000000..d69b50d
--- /dev/null
+++ b/Documentation/RelNotes/2.35.0.txt
@@ -0,0 +1,412 @@
+Git 2.35 Release Notes
+======================
+
+Updates since Git 2.34
+----------------------
+
+Backward compatibility warts
+
+ * "_" is now treated as any other URL-valid characters in an URL when
+ matching the per-URL configuration variable names.
+
+ * The color palette used by "git grep" has been updated to match that
+ of GNU grep.
+
+
+Note to those who build from the source
+
+ * You may need to define NO_UNCOMPRESS2 Makefile macro if you build
+ with zlib older than 1.2.9.
+
+ * If your compiler cannot grok C99, the build will fail. See the
+ instruction at the beginning of git-compat-util.h if this happens
+ to you.
+
+
+UI, Workflows & Features
+
+ * "git status --porcelain=v2" now show the number of stash entries
+ with --show-stash like the normal output does.
+
+ * "git stash" learned the "--staged" option to stash away what has
+ been added to the index (and nothing else).
+
+ * "git var GIT_DEFAULT_BRANCH" is a way to see what name is used for
+ the newly created branch if "git init" is run.
+
+ * Various operating modes of "git reset" have been made to work
+ better with the sparse index.
+
+ * "git submodule deinit" for a submodule whose .git metadata
+ directory is embedded in its working tree refused to work, until
+ the submodule gets converted to use the "absorbed" form where the
+ metadata directory is stored in superproject, and a gitfile at the
+ top-level of the working tree of the submodule points at it. The
+ command is taught to convert such submodules to the absorbed form
+ as needed.
+
+ * The completion script (in contrib/) learns that the "--date"
+ option of commands from the "git log" family takes "human" and
+ "auto" as valid values.
+
+ * "Zealous diff3" style of merge conflict presentation has been added.
+
+ * The "git log --format=%(describe)" placeholder has been extended to
+ allow passing selected command-line options to the underlying "git
+ describe" command.
+
+ * "default" and "reset" have been added to our color palette.
+
+ * The cryptographic signing using ssh keys can specify literal keys
+ for keytypes whose name do not begin with the "ssh-" prefix by
+ using the "key::" prefix mechanism (e.g. "key::ecdsa-sha2-nistp256").
+
+ * "git fetch" without the "--update-head-ok" option ought to protect
+ a checked out branch from getting updated, to prevent the working
+ tree that checks it out to go out of sync. The code was written
+ before the use of "git worktree" got widespread, and only checked
+ the branch that was checked out in the current worktree, which has
+ been updated.
+
+ * "git name-rev" has been tweaked to give output that is shorter and
+ easier to understand.
+
+ * "git apply" has been taught to ignore a message without a patch
+ with the "--allow-empty" option. It also learned to honor the
+ "--quiet" option given from the command line.
+
+ * The "init" and "set" subcommands in "git sparse-checkout" have been
+ unified for a better user experience and performance.
+
+ * Many git commands that deal with working tree files try to remove a
+ directory that becomes empty (i.e. "git switch" from a branch that
+ has the directory to another branch that does not would attempt
+ remove all files in the directory and the directory itself). This
+ drops users into an unfamiliar situation if the command was run in
+ a subdirectory that becomes subject to removal due to the command.
+ The commands have been taught to keep an empty directory if it is
+ the directory they were started in to avoid surprising users.
+
+ * "git am" learns "--empty=(stop|drop|keep)" option to tweak what is
+ done to a piece of e-mail without a patch in it.
+
+ * The default merge message prepared by "git merge" records the name
+ of the current branch; the name can be overridden with a new option
+ to allow users to pretend a merge is made on a different branch.
+
+ * The way "git p4" shows file sizes in its output has been updated to
+ use human-readable units.
+
+ * "git -c branch.autosetupmerge=inherit branch new old" makes "new"
+ to have the same upstream as the "old" branch, instead of marking
+ "old" itself as its upstream.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * The use of errno as a means to carry the nature of error in the ref
+ API implementation has been reworked and reduced.
+
+ * Teach and encourage first-time contributors to this project to
+ state the base commit when they submit their topic.
+
+ * The command line completion for "git send-email" options have been
+ tweaked to make it easier to keep it in sync with the command itself.
+
+ * Ensure that the sparseness of the in-core index matches the
+ index.sparse configuration specified by the repository immediately
+ after the on-disk index file is read.
+
+ * Code clean-up to eventually allow information on remotes defined
+ for an arbitrary repository to be read.
+
+ * Build optimization.
+
+ * Tighten code for testing pack-bitmap.
+
+ * Weather balloon to break people with compilers that do not support
+ C99.
+
+ * The "reftable" backend for the refs API, without integrating into
+ the refs subsystem, has been added.
+
+ * More tests are marked as leak-free.
+
+ * The test framework learns to list unsatisfied test prerequisites,
+ and optionally error out when prerequisites that are expected to be
+ satisfied are not.
+
+ * The default setting for trace2 event nesting was too low to cause
+ test failures, which is worked around by bumping it up in the test
+ framework.
+
+ * Drop support for TravisCI and update test workflows at GitHub.
+
+ * Many tests that used to need GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+ mechanism to force "git" to use 'master' as the default name for
+ the initial branch no longer need it; the use of the mechanism from
+ them have been removed.
+
+ * Allow running our tests while disabling fsync.
+
+ * Document the parameters given to the reflog entry iterator callback
+ functions.
+ (merge e6e94f34b2 jc/reflog-iterator-callback-doc later to maint).
+
+ * The test helper for refs subsystem learned to write bogus and/or
+ nonexistent object name to refs to simulate error situations we
+ want to test Git in.
+
+ * "diff --histogram" optimization.
+
+ * Weather balloon to find compilers that do not grok variable
+ declaration in the for() loop.
+
+ * diff and blame commands have been taught to work better with sparse
+ index.
+
+ * The chainlint test script linter in the test suite has been updated.
+
+ * The DEVELOPER=yes build uses -std=gnu99 now.
+
+ * "git format-patch" uses a single rev_info instance and then exits.
+ Mark the structure with UNLEAK() macro to squelch leak sanitizer.
+
+ * New interface into the tmp-objdir API to help in-core use of the
+ quarantine feature.
+
+ * Broken &&-chains in the test scripts have been corrected.
+
+ * The RCS keyword substitution in "git p4" used to be done assuming
+ that the contents are UTF-8 text, which can trigger decoding
+ errors. We now treat the contents as a bytestring for robustness
+ and correctness.
+
+ * The conditions to choose different definitions of the FLEX_ARRAY
+ macro for vendor compilers has been simplified to make it easier to
+ maintain.
+
+ * Correctness and performance update to "diff --color-moved" feature.
+
+ * "git upload-pack" (the other side of "git fetch") used a 8kB buffer
+ but most of its payload came on 64kB "packets". The buffer size
+ has been enlarged so that such a packet fits.
+
+ * "git fetch" and "git pull" are now declared sparse-index clean.
+ Also "git ls-files" learns the "--sparse" option to help debugging.
+
+ * Similar message templates have been consolidated so that
+ translators need to work on fewer number of messages.
+
+
+Fixes since v2.34
+-----------------
+
+ * "git grep" looking in a blob that has non-UTF8 payload was
+ completely broken when linked with certain versions of PCREv2
+ library in the latest release.
+
+ * Other code cleanup, docfix, build fix, etc.
+
+ * "git pull" with any strategy when the other side is behind us
+ should succeed as it is a no-op, but doesn't.
+
+ * An earlier change in 2.34.0 caused JGit application (that abused
+ GIT_EDITOR mechanism when invoking "git config") to get stuck with
+ a SIGTTOU signal; it has been reverted.
+
+ * An earlier change that broke .gitignore matching has been reverted.
+
+ * Things like "git -c branch.sort=bogus branch new HEAD", i.e. the
+ operation modes of the "git branch" command that do not need the
+ sort key information, no longer errors out by seeing a bogus sort
+ key.
+ (merge 98e7ab6d42 jc/fix-ref-sorting-parse later to maint).
+
+ * The compatibility implementation for unsetenv(3) were written to
+ mimic ancient, non-POSIX, variant seen in an old glibc; it has been
+ changed to return an integer to match the more modern era.
+ (merge a38989bd5b jc/unsetenv-returns-an-int later to maint).
+
+ * The clean/smudge conversion code path has been prepared to better
+ work on platforms where ulong is narrower than size_t.
+ (merge 596b5e77c9 mc/clean-smudge-with-llp64 later to maint).
+
+ * Redact the path part of packfile URI that appears in the trace output.
+ (merge 0ba558ffb1 if/redact-packfile-uri later to maint).
+
+ * CI has been taught to catch some Unicode directional formatting
+ sequence that can be used in certain mischief.
+ (merge 0e7696c64d js/ci-no-directional-formatting later to maint).
+
+ * The "--date=format:<strftime>" gained a workaround for the lack of
+ system support for a non-local timezone to handle "%s" placeholder.
+ (merge 9b591b9403 jk/strbuf-addftime-seconds-since-epoch later to maint).
+
+ * The "merge" subcommand of "git jump" (in contrib/) silently ignored
+ pathspec and other parameters.
+ (merge 67ba13e5a4 jk/jump-merge-with-pathspec later to maint).
+
+ * The code to decode the length of packed object size has been
+ corrected.
+ (merge 34de5b8eac jt/pack-header-lshift-overflow later to maint).
+
+ * The advice message given by "git pull" when the user hasn't made a
+ choice between merge and rebase still said that the merge is the
+ default, which no longer is the case. This has been corrected.
+ (merge 71076d0edd ah/advice-pull-has-no-preference-between-rebase-and-merge later to maint).
+
+ * "git fetch", when received a bad packfile, can fail with SIGPIPE.
+ This wasn't wrong per-se, but we now detect the situation and fail
+ in a more predictable way.
+ (merge 2a4aed42ec jk/fetch-pack-avoid-sigpipe-to-index-pack later to maint).
+
+ * The function to cull a child process and determine the exit status
+ had two separate code paths for normal callers and callers in a
+ signal handler, and the latter did not yield correct value when the
+ child has caught a signal. The handling of the exit status has
+ been unified for these two code paths. An existing test with
+ flakiness has also been corrected.
+ (merge 5263e22cba jk/t7006-sigpipe-tests-fix later to maint).
+
+ * When a non-existent program is given as the pager, we tried to
+ reuse an uninitialized child_process structure and crashed, which
+ has been fixed.
+ (merge f917f57f40 em/missing-pager later to maint).
+
+ * The single-key-input mode in "git add -p" had some code to handle
+ keys that generate a sequence of input via ReadKey(), which did not
+ handle end-of-file correctly, which has been fixed.
+ (merge fc8a8126df cb/add-p-single-key-fix later to maint).
+
+ * "git rebase -x" added an unnecessary 'exec' instructions before
+ 'noop', which has been corrected.
+ (merge cc9dcdee61 en/rebase-x-fix later to maint).
+
+ * When the "git push" command is killed while the receiving end is
+ trying to report what happened to the ref update proposals, the
+ latter used to die, due to SIGPIPE. The code now ignores SIGPIPE
+ to increase our chances to run the post-receive hook after it
+ happens.
+ (merge d34182b9e3 rj/receive-pack-avoid-sigpipe-during-status-reporting later to maint).
+
+ * "git worktree add" showed "Preparing worktree" message to the
+ standard output stream, but when it failed, the message from die()
+ went to the standard error stream. Depending on the order the
+ stdio streams are flushed at the program end, this resulted in
+ confusing output. It has been corrected by sending all the chatty
+ messages to the standard error stream.
+ (merge b50252484f es/worktree-chatty-to-stderr later to maint).
+
+ * Coding guideline document has been updated to clarify what goes to
+ standard error in our system.
+ (merge e258eb4800 es/doc-stdout-vs-stderr later to maint).
+
+ * The sparse-index/sparse-checkout feature had a bug in its use of
+ the matching code to determine which path is in or outside the
+ sparse checkout patterns.
+ (merge 8c5de0d265 ds/sparse-deep-pattern-checkout-fix later to maint).
+
+ * "git rebase -x" by mistake started exporting the GIT_DIR and
+ GIT_WORK_TREE environment variables when the command was rewritten
+ in C, which has been corrected.
+ (merge 434e0636db en/rebase-x-wo-git-dir-env later to maint).
+
+ * When "git log" implicitly enabled the "decoration" processing
+ without being explicitly asked with "--decorate" option, it failed
+ to read and honor the settings given by the "--decorate-refs"
+ option.
+
+ * "git fetch --set-upstream" did not check if there is a current
+ branch, leading to a segfault when it is run on a detached HEAD,
+ which has been corrected.
+ (merge 17baeaf82d ab/fetch-set-upstream-while-detached later to maint).
+
+ * Among some code paths that ask an yes/no question, only one place
+ gave a prompt that looked different from the others, which has been
+ updated to match what the others create.
+ (merge 0fc8ed154c km/help-prompt-fix later to maint).
+
+ * "git log --invert-grep --author=<name>" used to exclude commits
+ written by the given author, but now "--invert-grep" only affects
+ the matches made by the "--grep=<pattern>" option.
+ (merge 794c000267 rs/log-invert-grep-with-headers later to maint).
+
+ * "git grep --perl-regexp" failed to match UTF-8 characters with
+ wildcard when the pattern consists only of ASCII letters, which has
+ been corrected.
+ (merge 32e3e8bc55 rs/pcre2-utf later to maint).
+
+ * Certain sparse-checkout patterns that are valid in non-cone mode
+ led to segfault in cone mode, which has been corrected.
+
+ * Use of certain "git rev-list" options with "git fast-export"
+ created nonsense results (the worst two of which being "--reverse"
+ and "--invert-grep --grep=<foo>"). The use of "--first-parent" is
+ made to behave a bit more sensible than before.
+ (merge 726a228dfb ws/fast-export-with-revision-options later to maint).
+
+ * Perf tests were run with end-user's shell, but it has been
+ corrected to use the shell specified by $TEST_SHELL_PATH.
+ (merge 9ccab75608 ja/perf-use-specified-shell later to maint).
+
+ * Fix dependency rules to generate hook-list.h header file.
+ (merge d3fd1a6667 ab/makefile-hook-list-dependency-fix later to maint).
+
+ * "git stash" by default triggers its "push" action, but its
+ implementation also made "git stash -h" to show short help only for
+ "git stash push", which has been corrected.
+ (merge ca7990cea5 ab/do-not-limit-stash-help-to-push later to maint).
+
+ * "git apply --3way" bypasses the attempt to do a three-way
+ application in more cases to address the regression caused by the
+ recent change to use direct application as a fallback.
+ (merge 34d607032c jz/apply-3-corner-cases later to maint).
+
+ * Fix performance-releated bug in "git subtree" (in contrib/).
+ (merge 3ce8888fb4 jl/subtree-check-parents-argument-passing-fix later to maint).
+
+ * Extend the guidance to choose the base commit to build your work
+ on, and hint/nudge contributors to read others' changes.
+ (merge fdfae830f8 jc/doc-submitting-patches-choice-of-base later to maint).
+
+ * A corner case bug in the ort merge strategy has been corrected.
+ (merge d30126c20d en/merge-ort-renorm-with-rename-delete-conflict-fix later to maint).
+
+ * "git stash apply" forgot to attempt restoring untracked files when
+ it failed to restore changes to tracked ones.
+ (merge 71cade5a0b en/stash-df-fix later to maint).
+
+ * Calling dynamically loaded functions on Windows has been corrected.
+ (merge 4a9b204920 ma/windows-dynload-fix later to maint).
+
+ * Some lockfile code called free() in signal-death code path, which
+ has been corrected.
+ (merge 58d4d7f1c5 ps/lockfile-cleanup-fix later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+ (merge 74db416c9c cw/protocol-v2-doc-fix later to maint).
+ (merge f9b2b6684d ja/doc-cleanup later to maint).
+ (merge 7d1b866778 jc/fix-first-object-walk later to maint).
+ (merge 538ac74604 js/trace2-avoid-recursive-errors later to maint).
+ (merge 152923b132 jk/t5319-midx-corruption-test-deflake later to maint).
+ (merge 9081a421a6 ab/checkout-branch-info-leakfix later to maint).
+ (merge 42c456ff81 rs/mergesort later to maint).
+ (merge ad506e6780 tl/midx-docfix later to maint).
+ (merge bf5b83fd8a hk/ci-checkwhitespace-commentfix later to maint).
+ (merge 49f1eb3b34 jk/refs-g11-workaround later to maint).
+ (merge 7d3fc7df70 jt/midx-doc-fix later to maint).
+ (merge 7b089120d9 hn/create-reflog-simplify later to maint).
+ (merge 9e12400da8 cb/mingw-gmtime-r later to maint).
+ (merge 0bf0de6cc7 tb/pack-revindex-on-disk-cleanup later to maint).
+ (merge 2c68f577fc ew/cbtree-remove-unused-and-broken-cb-unlink later to maint).
+ (merge eafd6e7e55 ab/die-with-bug later to maint).
+ (merge 91028f7659 jc/grep-patterntype-default-doc later to maint).
+ (merge 47ca93d071 ds/repack-fixlets later to maint).
+ (merge e6a9bc0c60 rs/t4202-invert-grep-test-fix later to maint).
+ (merge deb5407a42 gh/gpg-doc-markup-fix later to maint).
+ (merge 999bba3e0b rs/daemon-plug-leak later to maint).
+ (merge 786eb1ba39 js/l10n-mention-ngettext-early-in-readme later to maint).
+ (merge 2f12b31b74 ab/makefile-msgfmt-wo-stats later to maint).
+ (merge 0517f591ca fs/gpg-unknown-key-test-fix later to maint).
+ (merge 97d6fb5a1f ma/header-dup-cleanup later to maint).
diff --git a/Documentation/RelNotes/2.35.1.txt b/Documentation/RelNotes/2.35.1.txt
new file mode 100644
index 0000000..726ba25
--- /dev/null
+++ b/Documentation/RelNotes/2.35.1.txt
@@ -0,0 +1,6 @@
+Git v2.35.1 Release Notes
+=========================
+
+Git 2.35 shipped with a regression that broke use of "rebase" and
+"stash" in a secondary worktree. This maintenance release ought to
+fix it.
diff --git a/Documentation/RelNotes/2.35.2.txt b/Documentation/RelNotes/2.35.2.txt
new file mode 100644
index 0000000..290bfa9
--- /dev/null
+++ b/Documentation/RelNotes/2.35.2.txt
@@ -0,0 +1,7 @@
+Git v2.35.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.3,
+v2.31.2, v2.32.1, v2.33.2 and v2.34.2 to address the security
+issue CVE-2022-24765; see the release notes for these versions
+for details.
diff --git a/Documentation/RelNotes/2.35.3.txt b/Documentation/RelNotes/2.35.3.txt
new file mode 100644
index 0000000..5458ba3
--- /dev/null
+++ b/Documentation/RelNotes/2.35.3.txt
@@ -0,0 +1,4 @@
+Git Documentation/RelNotes/2.35.3.txt Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.35.3.
diff --git a/Documentation/RelNotes/2.36.0.txt b/Documentation/RelNotes/2.36.0.txt
new file mode 100644
index 0000000..e477fba
--- /dev/null
+++ b/Documentation/RelNotes/2.36.0.txt
@@ -0,0 +1,429 @@
+Git 2.36 Release Notes
+======================
+
+Updates since Git 2.35
+----------------------
+
+Backward compatibility warts
+
+ * "git name-rev --stdin" has been deprecated and issues a warning
+ when used; use "git name-rev --annotate-stdin" instead.
+
+ * "git clone --filter=... --recurse-submodules" only makes the
+ top-level a partial clone, while submodules are fully cloned. This
+ behaviour is changed to pass the same filter down to the submodules.
+
+ * With the fixes for CVE-2022-24765 that are common with versions of
+ Git 2.30.4, 2.31.3, 2.32.2, 2.33.3, 2.34.3, and 2.35.3, Git has
+ been taught not to recognise repositories owned by other users, in
+ order to avoid getting affected by their config files and hooks.
+ You can list the path to the safe/trusted repositories that may be
+ owned by others on a multi-valued configuration variable
+ `safe.directory` to override this behaviour, or use '*' to declare
+ that you trust anything.
+
+
+Note to those who build from the source
+
+ * Since Git 2.31, our source assumed that the compiler you use to
+ build Git supports variadic macros, with an easy-to-use escape
+ hatch to allow compilation without variadic macros with an request
+ to report that you had to use the escape hatch to the list.
+ Because we haven't heard from anybody who actually needed to use
+ the escape hatch, it has been removed, making support of variadic
+ macros a hard requirement.
+
+
+UI, Workflows & Features
+
+ * Assorted updates to "git cat-file", especially "-h".
+
+ * The command line completion (in contrib/) learns to complete
+ arguments to give to "git sparse-checkout" command.
+
+ * "git log --remerge-diff" shows the difference from mechanical merge
+ result and the result that is actually recorded in a merge commit.
+
+ * "git log" and friends learned an option --exclude-first-parent-only
+ to propagate UNINTERESTING bit down only along the first-parent
+ chain, just like --first-parent option shows commits that lack the
+ UNINTERESTING bit only along the first-parent chain.
+
+ * The command line completion script (in contrib/) learned to
+ complete all Git subcommands, including the ones that are normally
+ hidden, when GIT_COMPLETION_SHOW_ALL_COMMANDS is used.
+
+ * "git branch" learned the "--recurse-submodules" option.
+
+ * A user can forget to make a script file executable before giving
+ it to "git bisect run". In such a case, all tests will exit with
+ 126 or 127 error codes, even on revisions that are marked as good.
+ Try to recognize this situation and stop iteration early.
+
+ * When "index-pack" dies due to incoming data exceeding the maximum
+ allowed input size, include the value of the limit in the error
+ message.
+
+ * The error message given by "git switch HEAD~4" has been clarified
+ to suggest the "--detach" option that is required.
+
+ * In sparse-checkouts, files mis-marked as missing from the working tree
+ could lead to later problems. Such files were hard to discover, and
+ harder to correct. Automatically detecting and correcting the marking
+ of such files has been added to avoid these problems.
+
+ * "git cat-file" learns "--batch-command" mode, which is a more
+ flexible interface than the existing "--batch" or "--batch-check"
+ modes, to allow different kinds of inquiries made.
+
+ * The level of verbose output from the ort backend during inner merge
+ has been aligned to that of the recursive backend.
+
+ * "git remote rename A B", depending on the number of remote-tracking
+ refs involved, takes long time renaming them. The command has been
+ taught to show progress bar while making the user wait.
+
+ * Bundle file format gets extended to allow a partial bundle,
+ filtered by similar criteria you would give when making a
+ partial/lazy clone.
+
+ * A new built-in userdiff driver for kotlin has been added.
+
+ * "git repack" learned a new configuration to disable triggering of
+ age-old "update-server-info" command, which is rarely useful these
+ days.
+
+ * "git stash" does not allow subcommands it internally runs as its
+ implementation detail, except for "git reset", to emit messages;
+ now "git reset" part has also been squelched.
+
+ * "git ls-tree" learns "--oid-only" option, similar to "--name-only",
+ and more generalized "--format" option.
+
+ * "git fetch --refetch" learned to fetch everything without telling
+ the other side what we already have, which is useful when you
+ cannot trust what you have in the local object store.
+
+ * "git branch" gives hint when branch tracking cannot be established
+ because fetch refspecs from multiple remote repositories overlap.
+
+ * "git worktree list --porcelain" did not c-quote pathnames and lock
+ reasons with unsafe bytes correctly, which is worked around by
+ introducing NUL terminated output format with "-z".
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * "git apply" (ab)used the util pointer of the string-list to keep
+ track of how each symbolic link needs to be handled, which has been
+ simplified by using strset.
+
+ * Fix a hand-rolled alloca() imitation that may have violated
+ alignment requirement of data being sorted in compatibility
+ implementation of qsort_s() and stable qsort().
+
+ * Use the parse-options API in "git reflog" command.
+
+ * The conditional inclusion mechanism of configuration files using
+ "[includeIf <condition>]" learns to base its decision on the
+ URL of the remote repository the repository interacts with.
+ (merge 399b198489 jt/conditional-config-on-remote-url later to maint).
+
+ * "git name-rev --stdin" does not behave like usual "--stdin" at
+ all. Start the process of renaming it to "--annotate-stdin".
+ (merge a2585719b3 jc/name-rev-stdin later to maint).
+
+ * "git update-index", "git checkout-index", and "git clean" are
+ taught to work better with the sparse checkout feature.
+
+ * Use an internal call to reset_head() helper function instead of
+ spawning "git checkout" in "rebase", and update code paths that are
+ involved in the change.
+
+ * Messages "ort" merge backend prepares while dealing with conflicted
+ paths were unnecessarily confusing since it did not differentiate
+ inner merges and outer merges.
+
+ * Small modernization of the rerere-train script (in contrib/).
+
+ * Use designated initializers we started using in mid 2017 in more
+ parts of the codebase that are relatively quiescent.
+
+ * Improve failure case behaviour of xdiff library when memory
+ allocation fails.
+
+ * General clean-up in reftable implementation, including
+ clarification of the API documentation, tightening the code to
+ honor documented length limit, etc.
+
+ * Remove the escape hatch we added when we introduced the weather
+ balloon to use variadic macros unconditionally, to make it official
+ that we now have a hard dependency on the feature.
+
+ * Makefile refactoring with a bit of suffixes rule stripping to
+ optimize the runtime overhead.
+
+ * "git stash drop" is reimplemented as an internal call to
+ reflog_delete() function, instead of invoking "git reflog delete"
+ via run_command() API.
+
+ * Count string_list items in size_t, not "unsigned int".
+
+ * The single-key interactive operation used by "git add -p" has been
+ made more robust.
+
+ * Remove unneeded <meta http-equiv=content-type...> from gitweb
+ output.
+
+ * "git name-rev" learned to use the generation numbers when setting
+ the lower bound of searching commits used to explain the revision,
+ when available, instead of committer time.
+
+ * Replace core.fsyncObjectFiles with two new configuration variables,
+ core.fsync and core.fsyncMethod.
+
+ * Updates to refs traditionally weren't fsync'ed, but we can
+ configure using core.fsync variable to do so.
+
+ * "git reflog" command now uses parse-options API to parse its
+ command line options.
+
+
+Fixes since v2.35
+-----------------
+
+ * "rebase" and "stash" in secondary worktrees are broken in
+ Git 2.35.0, which has been corrected.
+
+ * "git pull --rebase" ignored the rebase.autostash configuration
+ variable when the remote history is a descendant of our history,
+ which has been corrected.
+ (merge 3013d98d7a pb/pull-rebase-autostash-fix later to maint).
+
+ * "git update-index --refresh" has been taught to deal better with
+ racy timestamps (just like "git status" already does).
+ (merge 2ede073fd2 ms/update-index-racy later to maint).
+
+ * Avoid tests that are run under GIT_TRACE2 set from failing
+ unnecessarily.
+ (merge 944d808e42 js/test-unset-trace2-parents later to maint).
+
+ * The merge-ort misbehaved when merge.renameLimit configuration is
+ set too low and failed to find all renames.
+ (merge 9ae39fef7f en/merge-ort-restart-optim-fix later to maint).
+
+ * We explain that revs come first before the pathspec among command
+ line arguments, but did not spell out that dashed options come
+ before other args, which has been corrected.
+ (merge c11f95010c tl/doc-cli-options-first later to maint).
+
+ * "git add -p" rewritten in C regressed hunk splitting in some cases,
+ which has been corrected.
+ (merge 7008ddc645 pw/add-p-hunk-split-fix later to maint).
+
+ * "git fetch --negotiate-only" is an internal command used by "git
+ push" to figure out which part of our history is missing from the
+ other side. It should never recurse into submodules even when
+ fetch.recursesubmodules configuration variable is set, nor it
+ should trigger "gc". The code has been tightened up to ensure it
+ only does common ancestry discovery and nothing else.
+ (merge de4eaae63a gc/fetch-negotiate-only-early-return later to maint).
+
+ * The code path that verifies signatures made with ssh were made to
+ work better on a system with CRLF line endings.
+ (merge caeef01ea7 fs/ssh-signing-crlf later to maint).
+
+ * "git sparse-checkout init" failed to write into $GIT_DIR/info
+ directory when the repository was created without one, which has
+ been corrected to auto-create it.
+ (merge 7f44842ac1 jt/sparse-checkout-leading-dir-fix later to maint).
+
+ * Cloning from a repository that does not yet have any branches or
+ tags but has other refs resulted in a "remote transport reported
+ error", which has been corrected.
+ (merge dccea605b6 jt/clone-not-quite-empty later to maint).
+
+ * Mark in various places in the code that the sparse index and the
+ split index features are mutually incompatible.
+ (merge 451b66c533 js/sparse-vs-split-index later to maint).
+
+ * Update the logic to compute alignment requirement for our mem-pool.
+ (merge e38bcc66d8 jc/mem-pool-alignment later to maint).
+
+ * Pick a better random number generator and use it when we prepare
+ temporary filenames.
+ (merge 47efda967c bc/csprng-mktemps later to maint).
+
+ * Update the contributor-facing documents on proposed log messages.
+ (merge cdba0295b0 jc/doc-log-messages later to maint).
+
+ * When "git fetch --prune" failed to prune the refs it wanted to
+ prune, the command issued error messages but exited with exit
+ status 0, which has been corrected.
+ (merge c9e04d905e tg/fetch-prune-exit-code-fix later to maint).
+
+ * Problems identified by Coverity in the reftable code have been
+ corrected.
+ (merge 01033de49f hn/reftable-coverity-fixes later to maint).
+
+ * A bug that made multi-pack bitmap and the object order out-of-sync,
+ making the .midx data corrupt, has been fixed.
+ (merge f8b60cf99b tb/midx-bitmap-corruption-fix later to maint).
+
+ * The build procedure has been taught to notice older version of zlib
+ and enable our replacement uncompress2() automatically.
+ (merge 07564773c2 ab/auto-detect-zlib-compress2 later to maint).
+
+ * Interaction between fetch.negotiationAlgorithm and
+ feature.experimental configuration variables has been corrected.
+ (merge 714edc620c en/fetch-negotiation-default-fix later to maint).
+
+ * "git diff --diff-filter=aR" is now parsed correctly.
+ (merge 75408ca949 js/diff-filter-negation-fix later to maint).
+
+ * When "git subtree" wants to create a merge, it used "git merge" and
+ let it be affected by end-user's "merge.ff" configuration, which
+ has been corrected.
+ (merge 9158a3564a tk/subtree-merge-not-ff-only later to maint).
+
+ * Unlike "git apply", "git patch-id" did not handle patches with
+ hunks that has only 1 line in either preimage or postimage, which
+ has been corrected.
+ (merge 757e75c81e jz/patch-id-hunk-header-parsing-fix later to maint).
+
+ * "receive-pack" checks if it will do any ref updates (various
+ conditions could reject a push) before received objects are taken
+ out of the temporary directory used for quarantine purposes, so
+ that a push that is known-to-fail will not leave crufts that a
+ future "gc" needs to clean up.
+ (merge 5407764069 cb/clear-quarantine-early-on-all-ref-update-errors later to maint).
+
+ * When there is no object to write .bitmap file for, "git
+ multi-pack-index" triggered an error, instead of just skipping,
+ which has been corrected.
+ (merge eb57277ba3 tb/midx-no-bitmap-for-no-objects later to maint).
+
+ * "git cmd -h" outside a repository should error out cleanly for many
+ commands, but instead it hit a BUG(), which has been corrected.
+ (merge 87ad07d735 js/short-help-outside-repo-fix later to maint).
+
+ * "working tree" and "per-worktree ref" were in glossary, but
+ "worktree" itself wasn't, which has been corrected.
+ (merge 2df5387ed0 jc/glossary-worktree later to maint).
+
+ * L10n support for a few error messages.
+ (merge 3d3c23b3a7 bs/forbid-i18n-of-protocol-token-in-fetch-pack later to maint).
+
+ * Test modernization.
+ (merge d4fe066e4b sy/t0001-use-path-is-helper later to maint).
+
+ * "git log --graph --graph" used to leak a graph structure, and there
+ was no way to countermand "--graph" that appear earlier on the
+ command line. A "--no-graph" option has been added and resource
+ leakage has been plugged.
+
+ * Error output given in response to an ambiguous object name has been
+ improved.
+ (merge 3a73c1dfaf ab/ambiguous-object-name later to maint).
+
+ * "git sparse-checkout" wants to work with per-worktree configuration,
+ but did not work well in a worktree attached to a bare repository.
+ (merge 3ce1138272 ds/sparse-checkout-requires-per-worktree-config later to maint).
+
+ * Setting core.untrackedCache to true failed to add the untracked
+ cache extension to the index.
+
+ * Workaround we have for versions of PCRE2 before their version 10.36
+ were in effect only for their versions newer than 10.36 by mistake,
+ which has been corrected.
+ (merge 97169fc361 rs/pcre-invalid-utf8-fix-fix later to maint).
+
+ * Document Taylor as a new member of Git PLC at SFC. Welcome.
+ (merge e8d56ca863 tb/coc-plc-update later to maint).
+
+ * "git checkout -b branch/with/multi/level/name && git stash" only
+ recorded the last level component of the branch name, which has
+ been corrected.
+
+ * Check the return value from parse_tree_indirect() to turn segfaults
+ into calls to die().
+ (merge 8d2eaf649a gc/parse-tree-indirect-errors later to maint).
+
+ * Newer version of GPGSM changed its output in a backward
+ incompatible way to break our code that parses its output. It also
+ added more processes our tests need to kill when cleaning up.
+ Adjustments have been made to accommodate these changes.
+ (merge b0b70d54c4 fs/gpgsm-update later to maint).
+
+ * The untracked cache newly computed weren't written back to the
+ on-disk index file when there is no other change to the index,
+ which has been corrected.
+
+ * "git config -h" did not describe the "--type" option correctly.
+ (merge 5445124fad mf/fix-type-in-config-h later to maint).
+
+ * The way generation number v2 in the commit-graph files are
+ (not) handled has been corrected.
+ (merge 6dbf4b8172 ds/commit-graph-gen-v2-fixes later to maint).
+
+ * The method to trigger malloc check used in our tests no longer work
+ with newer versions of glibc.
+ (merge baedc59543 ep/test-malloc-check-with-glibc-2.34 later to maint).
+
+ * When "git fetch --recurse-submodules" grabbed submodule commits
+ that would be needed to recursively check out newly fetched commits
+ in the superproject, it only paid attention to submodules that are
+ in the current checkout of the superproject. We now do so for all
+ submodules that have been run "git submodule init" on.
+
+ * "git rebase $base $non_branch_commit", when $base is an ancestor or
+ the $non_branch_commit, modified the current branch, which has been
+ corrected.
+
+ * When "shallow" information is updated, we forgot to update the
+ in-core equivalent, which has been corrected.
+
+ * When creating a loose object file, we didn't report the exact
+ filename of the file we failed to fsync, even though the
+ information was readily available, which has been corrected.
+
+ * "git am" can read from the standard input when no mailbox is given
+ on the command line, but the end-user gets no indication when it
+ happens, making Git appear stuck.
+ (merge 7b20af6a06 jc/mailsplit-warn-on-tty later to maint).
+
+ * "git mv" failed to refresh the cached stat information for the
+ entry it moved.
+ (merge b7f9130a06 vd/mv-refresh-stat later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+ (merge cfc5cf428b jc/find-header later to maint).
+ (merge 40e7cfdd46 jh/p4-fix-use-of-process-error-exception later to maint).
+ (merge 727e6ea350 jh/p4-spawning-external-commands-cleanup later to maint).
+ (merge 0a6adc26e2 rs/grep-expr-cleanup later to maint).
+ (merge 4ed7dfa713 po/readme-mention-contributor-hints later to maint).
+ (merge 6046f7a91c en/plug-leaks-in-merge later to maint).
+ (merge 8c591dbfce bc/clarify-eol-attr later to maint).
+ (merge 518e15db74 rs/parse-options-lithelp-help later to maint).
+ (merge cbac0076ef gh/doc-typos later to maint).
+ (merge ce14de03db ab/no-errno-from-resolve-ref-unsafe later to maint).
+ (merge 2826ffad8c rc/negotiate-only-typofix later to maint).
+ (merge 0f03f04c5c en/sparse-checkout-leakfix later to maint).
+ (merge 74f3390dde sy/diff-usage-typofix later to maint).
+ (merge 45d0212a71 ll/doc-mktree-typofix later to maint).
+ (merge e9b272e4c1 js/no-more-legacy-stash later to maint).
+ (merge 6798b08e84 ab/do-not-hide-failures-in-git-dot-pm later to maint).
+ (merge 9325285df4 po/doc-check-ignore-markup-fix later to maint).
+ (merge cd26cd6c7c sy/modernize-t-lib-read-tree-m-3way later to maint).
+ (merge d17294a05e ab/hash-object-leakfix later to maint).
+ (merge b8403129d3 jd/t0015-modernize later to maint).
+ (merge 332acc248d ds/mailmap later to maint).
+ (merge 04bf052eef ab/grep-patterntype later to maint).
+ (merge 6ee36364eb ab/diff-free-more later to maint).
+ (merge 63a36017fe nj/read-tree-doc-reffix later to maint).
+ (merge eed36fce38 sm/no-git-in-upstream-of-pipe-in-tests later to maint).
+ (merge c614beb933 ep/t6423-modernize later to maint).
+ (merge 57be9c6dee ab/reflog-prep-fix later to maint).
+ (merge 5327d8982a js/in-place-reverse-in-sequencer later to maint).
+ (merge 2e2c0be51e dp/worktree-repair-in-usage later to maint).
+ (merge 6563706568 jc/coding-guidelines-decl-in-for-loop later to maint).
diff --git a/Documentation/RelNotes/2.36.1.txt b/Documentation/RelNotes/2.36.1.txt
new file mode 100644
index 0000000..a961709
--- /dev/null
+++ b/Documentation/RelNotes/2.36.1.txt
@@ -0,0 +1,33 @@
+Git v2.36.1 Release Notes
+=========================
+
+Fixes since v2.36
+-----------------
+
+ * "git submodule update" without pathspec should silently skip an
+ uninitialized submodule, but it started to become noisy by mistake.
+
+ * "diff-tree --stdin" has been broken for about a year, but 2.36
+ release broke it even worse by breaking running the command with
+ <pathspec>, which in turn broke "gitk" and got noticed. This has
+ been corrected by aligning its behaviour to that of "log".
+
+ * Regression fix for 2.36 where "git name-rev" started to sometimes
+ reference strings after they are freed.
+
+ * "git show <commit1> <commit2>... -- <pathspec>" lost the pathspec
+ when showing the second and subsequent commits, which has been
+ corrected.
+
+ * "git fast-export -- <pathspec>" lost the pathspec when showing the
+ second and subsequent commits, which has been corrected.
+
+ * "git format-patch <args> -- <pathspec>" lost the pathspec when
+ showing the second and subsequent commits, which has been
+ corrected.
+
+ * Get rid of a bogus and over-eager coccinelle rule.
+
+ * Correct choices of C compilers used in various CI jobs.
+
+Also contains minor documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.36.2.txt b/Documentation/RelNotes/2.36.2.txt
new file mode 100644
index 0000000..ba5d5ac
--- /dev/null
+++ b/Documentation/RelNotes/2.36.2.txt
@@ -0,0 +1,50 @@
+Git v2.36.2 Release Notes
+=========================
+
+This maintenance release is primarily to merge down updates to the
+build and CI procedures from the 'master' front, in order to ensure
+that we can cut healthy maintenance releases in the future. It also
+contains a handful of small and trivially-correct bugfixes.
+
+Fixes since v2.36.1
+-------------------
+
+ * Fixes real problems noticed by gcc 12 and works around false
+ positives.
+
+ * Update URL to the gitk repository.
+
+ * The "--current" option of "git show-branch" should have been made
+ incompatible with the "--reflog" mode, but this was not enforced,
+ which has been corrected.
+
+ * "git archive --add-file=<path>" picked up the raw permission bits
+ from the path and propagated to zip output in some cases, without
+ normalization, which has been corrected (tar output did not have
+ this issue).
+
+ * A bit of test framework fixes with a few fixes to issues found by
+ valgrind.
+
+ * macOS CI jobs have been occasionally flaky due to tentative version
+ skew between perforce and the homebrew packager. Instead of
+ failing the whole CI job, just let it skip the p4 tests when this
+ happens.
+
+ * The commit summary shown after making a commit is matched to what
+ is given in "git status" not to use the break-rewrite heuristics.
+
+ * Avoid problems from interaction between malloc_check and address
+ sanitizer.
+
+ * "git rebase --keep-base <upstream> <branch-to-rebase>" computed the
+ commit to rebase onto incorrectly, which has been corrected.
+
+ * The path taken by "git multi-pack-index" command from the end user
+ was compared with path internally prepared by the tool withut first
+ normalizing, which lead to duplicated paths not being noticed,
+ which has been corrected.
+
+ * "git clone --origin X" leaked piece of memory that held value read
+ from the clone.defaultRemoteName configuration variable, which has
+ been plugged.
diff --git a/Documentation/RelNotes/2.37.0.txt b/Documentation/RelNotes/2.37.0.txt
new file mode 100644
index 0000000..3b52b7d
--- /dev/null
+++ b/Documentation/RelNotes/2.37.0.txt
@@ -0,0 +1,267 @@
+Git v2.37 Release Notes
+=======================
+
+UI, Workflows & Features
+
+ * "vimdiff[123]" mergetool drivers have been reimplemented with a
+ more generic layout mechanism.
+
+ * "git -v" and "git -h" are now understood as "git --version" and
+ "git --help".
+
+ * The temporary files fed to external diff command are now generated
+ inside a new temporary directory under the same basename.
+
+ * "git log --since=X" will stop traversal upon seeing a commit that
+ is older than X, but there may be commits behind it that is younger
+ than X when the commit was created with a faulty clock. A new
+ option is added to keep digging without stopping, and instead
+ filter out commits with timestamp older than X.
+
+ * "git -c branch.autosetupmerge=simple branch $A $B" will set the $B
+ as $A's upstream only when $A and $B shares the same name, and "git
+ -c push.default=simple" on branch $A would push to update the
+ branch $A at the remote $B came from. Also more places use the
+ sole remote, if exists, before defaulting to 'origin'.
+
+ * A new doc has been added that lists tips for tools to work with
+ Git's codebase.
+
+ * "git remote -v" now shows the list-objects-filter used during
+ fetching from the remote, if available.
+
+ * With the new http.curloptResolve configuration, the CURLOPT_RESOLVE
+ mechanism that allows cURL based applications to use pre-resolved
+ IP addresses for the requests is exposed to the scripts.
+
+ * "git add -i" was rewritten in C some time ago and has been in
+ testing; the reimplementation is now exposed to general public by
+ default.
+
+ * Deprecate non-cone mode of the sparse-checkout feature.
+
+ * Introduce a filesystem-dependent mechanism to optimize the way the
+ bits for many loose object files are ensured to hit the disk
+ platter.
+
+ * The "do not remove the directory the user started Git in" logic,
+ when Git cannot tell where that directory is, is disabled. Earlier
+ we refused to run in such a case.
+
+ * A mechanism to pack unreachable objects into a "cruft pack",
+ instead of ejecting them into loose form to be reclaimed later, has
+ been introduced.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * The performance of the "untracked cache" feature has been improved
+ when "--untracked-files=<mode>" and "status.showUntrackedFiles"
+ are combined.
+
+ * "git stash" works better with sparse index entries.
+
+ * "git show :<path>" learned to work better with the sparse-index
+ feature.
+
+ * Introduce and apply coccinelle rule to discourage an explicit
+ comparison between a pointer and NULL, and applies the clean-up to
+ the maintenance track.
+
+ * Preliminary code refactoring around transport and bundle code.
+
+ * "sparse-checkout" learns to work better with the sparse-index
+ feature.
+
+ * A workflow change for translators are being proposed. git.pot is
+ no longer version controlled and it is local responsibility of
+ translaters to generate it.
+
+ * Plug the memory leaks from the trickiest API of all, the revision
+ walker.
+
+
+Fixes since v2.36
+-----------------
+
+ * "git submodule update" without pathspec should silently skip an
+ uninitialized submodule, but it started to become noisy by mistake.
+ (merge 4f1ccef87c gc/submodule-update-part2 later to maint).
+
+ * "diff-tree --stdin" has been broken for about a year, but 2.36
+ release broke it even worse by breaking running the command with
+ <pathspec>, which in turn broke "gitk" and got noticed. This has
+ been corrected by aligning its behaviour to that of "log".
+ (merge f8781bfda3 jc/diff-tree-stdin-fix later to maint).
+
+ * Regression fix for 2.36 where "git name-rev" started to sometimes
+ reference strings after they are freed.
+ (merge 45a14f578e rs/name-rev-fix-free-after-use later to maint).
+
+ * "git show <commit1> <commit2>... -- <pathspec>" lost the pathspec
+ when showing the second and subsequent commits, which has been
+ corrected.
+ (merge 5cdb38458e jc/show-pathspec-fix later to maint).
+
+ * "git fast-export -- <pathspec>" lost the pathspec when showing the
+ second and subsequent commits, which has been corrected.
+ (merge d1c25272f5 rs/fast-export-pathspec-fix later to maint).
+
+ * "git format-patch <args> -- <pathspec>" lost the pathspec when
+ showing the second and subsequent commits, which has been
+ corrected.
+ (merge 91f8f7e46f rs/format-patch-pathspec-fix later to maint).
+
+ * "git clone --origin X" leaked piece of memory that held value read
+ from the clone.defaultRemoteName configuration variable, which has
+ been plugged.
+ (merge 6dfadc8981 jc/clone-remote-name-leak-fix later to maint).
+
+ * Get rid of a bogus and over-eager coccinelle rule.
+ (merge 08bdd3a185 jc/cocci-xstrdup-or-null-fix later to maint).
+
+ * The path taken by "git multi-pack-index" command from the end user
+ was compared with path internally prepared by the tool withut first
+ normalizing, which lead to duplicated paths not being noticed,
+ which has been corrected.
+ (merge 11f9e8de3d ds/midx-normalize-pathname-before-comparison later to maint).
+
+ * Correct choices of C compilers used in various CI jobs.
+ (merge 3506cae04f ab/cc-package-fixes later to maint).
+
+ * Various cleanups to "git p4".
+ (merge 4ff0108d9e jh/p4-various-fixups later to maint).
+
+ * The progress meter of "git blame" was showing incorrect numbers
+ when processing only parts of the file.
+ (merge e5f5d7d42e ea/progress-partial-blame later to maint).
+
+ * "git rebase --keep-base <upstream> <branch-to-rebase>" computed the
+ commit to rebase onto incorrectly, which has been corrected.
+ (merge 9e5ebe9668 ah/rebase-keep-base-fix later to maint).
+
+ * Fix a leak of FILE * in an error codepath.
+ (merge c0befa0c03 kt/commit-graph-plug-fp-leak-on-error later to maint).
+
+ * Avoid problems from interaction between malloc_check and address
+ sanitizer.
+ (merge 067109a5e7 pw/test-malloc-with-sanitize-address later to maint).
+
+ * The commit summary shown after making a commit is matched to what
+ is given in "git status" not to use the break-rewrite heuristics.
+ (merge 84792322ed rs/commit-summary-wo-break-rewrite later to maint).
+
+ * Update a few end-user facing messages around eol conversion.
+ (merge c970d30c2c ah/convert-warning-message later to maint).
+
+ * Trace2 documentation updates.
+ (merge a6c80c313c js/trace2-doc-fixes later to maint).
+
+ * Build procedure fixup.
+ (merge 1fbfd96f50 mg/detect-compiler-in-c-locale later to maint).
+
+ * "git pull" without "--recurse-submodules=<arg>" made
+ submodule.recurse take precedence over fetch.recurseSubmodules by
+ mistake, which has been corrected.
+ (merge 5819417365 gc/pull-recurse-submodules later to maint).
+
+ * "git bisect" was too silent before it is ready to start computing
+ the actual bisection, which has been corrected.
+ (merge f11046e6de cd/bisect-messages-from-pre-flight-states later to maint).
+
+ * macOS CI jobs have been occasionally flaky due to tentative version
+ skew between perforce and the homebrew packager. Instead of
+ failing the whole CI job, just let it skip the p4 tests when this
+ happens.
+ (merge f15e00b463 cb/ci-make-p4-optional later to maint).
+
+ * A bit of test framework fixes with a few fixes to issues found by
+ valgrind.
+ (merge 7c898554d7 ab/valgrind-fixes later to maint).
+
+ * "git archive --add-file=<path>" picked up the raw permission bits
+ from the path and propagated to zip output in some cases, without
+ normalization, which has been corrected (tar output did not have
+ this issue).
+ (merge 6a61661967 jc/archive-add-file-normalize-mode later to maint).
+
+ * "make coverage-report" without first running "make coverage" did
+ not produce any meaningful result, which has been corrected.
+ (merge 96ddfecc5b ep/coverage-report-wants-test-to-have-run later to maint).
+
+ * The "--current" option of "git show-branch" should have been made
+ incompatible with the "--reflog" mode, but this was not enforced,
+ which has been corrected.
+ (merge 41c64ae0e7 jc/show-branch-g-current later to maint).
+
+ * "git fetch" unnecessarily failed when an unexpected optional
+ section appeared in the output, which has been corrected.
+ (merge 7709acf7be jt/fetch-peek-optional-section later to maint).
+
+ * The way "git fetch" without "--update-head-ok" ensures that HEAD in
+ no worktree points at any ref being updated was too wasteful, which
+ has been optimized a bit.
+ (merge f7400da800 os/fetch-check-not-current-branch later to maint).
+
+ * "git fetch --recurse-submodules" from multiple remotes (either from
+ a remote group, or "--all") used to make one extra "git fetch" in
+ the submodules, which has been corrected.
+ (merge 0353c68818 jc/avoid-redundant-submodule-fetch later to maint).
+
+ * With a recent update to refuse access to repositories of other
+ people by default, "sudo make install" and "sudo git describe"
+ stopped working. This series intends to loosen it while keeping
+ the safety.
+ (merge b9063afda1 cb/path-owner-check-with-sudo later to maint).
+
+ * The tests that ensured merges stop when interfering local changes
+ are present did not make sure that local changes are preserved; now
+ they do.
+ (merge 4b317450ce jc/t6424-failing-merge-preserve-local-changes later to maint).
+
+ * Some real problems noticed by gcc 12 have been fixed, while false
+ positives have been worked around.
+
+ * Update the version of FreeBSD image used in Cirrus CI.
+ (merge c58bebd4c6 pb/use-freebsd-12.3-in-cirrus-ci later to maint).
+
+ * The multi-pack-index code did not protect the packfile it is going
+ to depend on from getting removed while in use, which has been
+ corrected.
+ (merge 4090511e40 tb/midx-race-in-pack-objects later to maint).
+
+ * Teach "git repack --geometric" work better with "--keep-pack" and
+ avoid corrupting the repository when packsize limit is used.
+ (merge 66731ff921 tb/geom-repack-with-keep-and-max later to maint).
+
+ * The documentation on the interaction between "--add-file" and
+ "--prefix" options of "git archive" has been improved.
+ (merge a75910602a rs/document-archive-prefix later to maint).
+
+ * A git subcommand like "git add -p" spawns a separate git process
+ while relaying its command line arguments. A pathspec with only
+ negative elements was mistakenly passed with an empty string, which
+ has been corrected.
+ (merge b02fdbc80a jc/all-negative-pathspec later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+ (merge e6b2582da3 cm/reftable-0-length-memset later to maint).
+ (merge 0b75e5bf22 ab/misc-cleanup later to maint).
+ (merge 52e1ab8a76 ea/rebase-code-simplify later to maint).
+ (merge 756d15923b sg/safe-directory-tests-and-docs later to maint).
+ (merge d097a23bfa ds/do-not-call-bug-on-bad-refs later to maint).
+ (merge c36c27e75c rs/t7812-pcre2-ws-bug-test later to maint).
+ (merge 1da312742d gf/unused-includes later to maint).
+ (merge 465b30a92d pb/submodule-recurse-mode-enum later to maint).
+ (merge 82b28c4ed8 km/t3501-use-test-helpers later to maint).
+ (merge 72315e431b sa/t1011-use-helpers later to maint).
+ (merge 95b3002201 cg/vscode-with-gdb later to maint).
+ (merge fbe5f6b804 tk/p4-utf8-bom later to maint).
+ (merge 17f273ffba tk/p4-with-explicity-sync later to maint).
+ (merge 944db25c60 kf/p4-multiple-remotes later to maint).
+ (merge b014cee8de jc/update-ozlabs-url later to maint).
+ (merge 4ec5008062 pb/ggg-in-mfc-doc later to maint).
+ (merge af845a604d tb/receive-pack-code-cleanup later to maint).
+ (merge 2acf4cf001 js/ci-gcc-12-fixes later to maint).
+ (merge 05e280c0a6 jc/http-clear-finished-pointer later to maint).
+ (merge 8c49d704ef fh/transport-push-leakfix later to maint).
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index e409022..5bd795e 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -19,8 +19,10 @@
base your work on the tip of the topic.
* A new feature should be based on `master` in general. If the new
- feature depends on a topic that is in `seen`, but not in `master`,
- base your work on the tip of that topic.
+ feature depends on other topics that are in `next`, but not in
+ `master`, fork a branch from the tip of `master`, merge these topics
+ to the branch, and work on that branch. You can remind yourself of
+ how you prepared the base with `git log --first-parent master..`.
* Corrections and enhancements to a topic not yet in `master` should
be based on the tip of that topic. If the topic has not been merged
@@ -28,10 +30,10 @@
into the series.
* In the exceptional case that a new feature depends on several topics
- not in `master`, start working on `next` or `seen` privately and send
- out patches for discussion. Before the final merge, you may have to
- wait until some of the dependent topics graduate to `master`, and
- rebase your work.
+ not in `master`, start working on `next` or `seen` privately and
+ send out patches only for discussion. Once your new feature starts
+ to stabilize, you would have to rebase it (see the "depends on other
+ topics" above).
* Some parts of the system have dedicated maintainers with their own
repositories (see the section "Subsystems" below). Changes to
@@ -71,8 +73,13 @@
[[tests]]
When adding a new feature, make sure that you have new tests to show
the feature triggers the new behavior when it should, and to show the
-feature does not trigger when it shouldn't. After any code change, make
-sure that the entire test suite passes.
+feature does not trigger when it shouldn't. After any code change,
+make sure that the entire test suite passes. When fixing a bug, make
+sure you have new tests that break if somebody else breaks what you
+fixed by accident to avoid regression. Also, try merging your work to
+'next' and 'seen' and make sure the tests still pass; topics by others
+that are still in flight may have unexpected interactions with what
+you are trying to do in your topic.
Pushing to a fork of https://github.com/git/git will use their CI
integration to test your changes on Linux, Mac and Windows. See the
@@ -103,6 +110,35 @@
[[describe-changes]]
=== Describe your changes well.
+The log message that explains your changes is just as important as the
+changes themselves. Your code may be clearly written with in-code
+comment to sufficiently explain how it works with the surrounding
+code, but those who need to fix or enhance your code in the future
+will need to know _why_ your code does what it does, for a few
+reasons:
+
+. Your code may be doing something differently from what you wanted it
+ to do. Writing down what you actually wanted to achieve will help
+ them fix your code and make it do what it should have been doing
+ (also, you often discover your own bugs yourself, while writing the
+ log message to summarize the thought behind it).
+
+. Your code may be doing things that were only necessary for your
+ immediate needs (e.g. "do X to directories" without implementing or
+ even designing what is to be done on files). Writing down why you
+ excluded what the code does not do will help guide future developers.
+ Writing down "we do X to directories, because directories have
+ characteristic Y" would help them infer "oh, files also have the same
+ characteristic Y, so perhaps doing X to them would also make sense?".
+ Saying "we don't do the same X to files, because ..." will help them
+ decide if the reasoning is sound (in which case they do not waste
+ time extending your code to cover files), or reason differently (in
+ which case, they can explain why they extend your code to cover
+ files, too).
+
+The goal of your log message is to convey the _why_ behind your
+change to help future developers.
+
The first line of the commit message should be a short description (50
characters is the soft limit, see DISCUSSION in linkgit:git-commit[1]),
and should skip the full stop. It is also conventional in most cases to
@@ -135,6 +171,13 @@
. alternate solutions considered but discarded, if any.
+[[present-tense]]
+The problem statement that describes the status quo is written in the
+present tense. Write "The code does X when it is given input Y",
+instead of "The code used to do Y when given input X". You do not
+have to say "Currently"---the status quo in the problem statement is
+about the code _without_ your change, by project convention.
+
[[imperative-mood]]
Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
@@ -144,8 +187,21 @@
archive, summarize the relevant points of the discussion.
[[commit-reference]]
-If you want to reference a previous commit in the history of a stable
-branch, use the format "abbreviated hash (subject, date)", like this:
+
+There are a few reasons why you may want to refer to another commit in
+the "more stable" part of the history (i.e. on branches like `maint`,
+`master`, and `next`):
+
+. A commit that introduced the root cause of a bug you are fixing.
+
+. A commit that introduced a feature that you are enhancing.
+
+. A commit that conflicts with your work when you made a trial merge
+ of your work into `next` and `seen` for testing.
+
+When you reference a commit on a more stable branch (like `master`,
+`maint` and `next`), use the format "abbreviated hash (subject,
+date)", like this:
....
Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30)
@@ -259,9 +315,11 @@
or include any extra files which do not relate to what your patch
is trying to achieve. Make sure to review
your patch after generating it, to ensure accuracy. Before
-sending out, please make sure it cleanly applies to the `master`
-branch head. If you are preparing a work based on "next" branch,
-that is fine, but please mark it as such.
+sending out, please make sure it cleanly applies to the base you
+have chosen in the "Decide what to base your work on" section,
+and unless it targets the `master` branch (which is the default),
+mark your patches as such.
+
[[send-patches]]
=== Sending your patches.
@@ -365,7 +423,10 @@
Send your patch with "To:" set to the mailing list, with "cc:" listing
people who are involved in the area you are touching (the `git
contacts` command in `contrib/contacts/` can help to
-identify them), to solicit comments and reviews.
+identify them), to solicit comments and reviews. Also, when you made
+trial merges of your topic to `next` and `seen`, you may have noticed
+work by others conflicting with your changes. There is a good possibility
+that these people may know the area you are touching well.
:current-maintainer: footnote:[The current maintainer: gitster@pobox.com]
:git-ml: footnote:[The mailing list: git@vger.kernel.org]
@@ -391,7 +452,10 @@
- `gitk-git/` comes from Paul Mackerras's gitk project:
- git://ozlabs.org/~paulus/gitk
+ git://git.ozlabs.org/~paulus/gitk
+
+ Those who are interested in improve gitk can volunteer to help Paul
+ in maintaining it cf. <YntxL/fTplFm8lr6@cleo>.
- `po/` comes from the localization coordinator, Jiang Xin:
@@ -448,7 +512,7 @@
entitled "What's cooking in git.git" and "What's in git.git" giving
the status of various proposed changes.
-== GitHub CI[[GHCI]]]
+== GitHub CI[[GHCI]]
With an account at GitHub, you can use GitHub CI to test your changes
on Linux, Mac and Windows. See
@@ -463,7 +527,7 @@
After the initial setup, CI will run whenever you push new changes
to your fork of Git on GitHub. You can monitor the test state of all your
-branches here: https://github.com/<Your GitHub handle>/git/actions/workflows/main.yml
+branches here: `https://github.com/<Your GitHub handle>/git/actions/workflows/main.yml`
If a branch did not pass all test cases then it is marked with a red
cross. In that case you can click on the failing job and navigate to
diff --git a/Documentation/ToolsForGit.txt b/Documentation/ToolsForGit.txt
new file mode 100644
index 0000000..5060d0d
--- /dev/null
+++ b/Documentation/ToolsForGit.txt
@@ -0,0 +1,51 @@
+Tools for developing Git
+========================
+:sectanchors:
+
+[[summary]]
+== Summary
+
+This document gathers tips, scripts and configuration file to help people
+working on Git's codebase use their favorite tools while following Git's
+coding style.
+
+[[author]]
+=== Author
+
+The Git community.
+
+[[table_of_contents]]
+== Table of contents
+
+- <<vscode>>
+- <<emacs>>
+
+[[vscode]]
+=== Visual Studio Code (VS Code)
+
+The contrib/vscode/init.sh script creates configuration files that enable
+several valuable VS Code features. See contrib/vscode/README.md for more
+information on using the script.
+
+[[emacs]]
+=== Emacs
+
+This is adapted from Linux's suggestion in its CodingStyle document:
+
+- To follow rules of the CodingGuideline, it's useful to put the following in
+GIT_CHECKOUT/.dir-locals.el, assuming you use cperl-mode:
+----
+;; note the first part is useful for C editing, too
+((nil . ((indent-tabs-mode . t)
+ (tab-width . 8)
+ (fill-column . 80)))
+ (cperl-mode . ((cperl-indent-level . 8)
+ (cperl-extra-newline-before-brace . nil)
+ (cperl-merge-trailing-else . t))))
+----
+
+For a more complete setup, since Git's codebase uses a coding style
+similar to the Linux kernel's style, tips given in Linux's CodingStyle
+document can be applied here too.
+
+==== https://www.kernel.org/doc/html/v4.10/process/coding-style.html#you-ve-made-a-mess-of-it
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 117f4cf..9a66353 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -136,5 +136,16 @@
option. An empty file name, `""`, will clear the list of revs from
previously processed files.
+--color-lines::
+ Color line annotations in the default format differently if they come from
+ the same commit as the preceding line. This makes it easier to distinguish
+ code blocks introduced by different commits. The color defaults to cyan and
+ can be adjusted using the `color.blame.repeatedLines` config option.
+
+--color-by-age::
+ Color line annotations depending on the age of the line in the default format.
+ The `color.blame.highlightRecent` config option controls what color is used for
+ each range of age.
+
-h::
Show help message.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0c0e6b8..e284b04 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -159,6 +159,33 @@
organized hierarchically and you would like to apply a configuration to
all the branches in that hierarchy.
+`hasconfig:remote.*.url:`::
+ The data that follows this keyword is taken to
+ be a pattern with standard globbing wildcards and two
+ additional ones, `**/` and `/**`, that can match multiple
+ components. The first time this keyword is seen, the rest of
+ the config files will be scanned for remote URLs (without
+ applying any values). If there exists at least one remote URL
+ that matches this pattern, the include condition is met.
++
+Files included by this option (directly or indirectly) are not allowed
+to contain remote URLs.
++
+Note that unlike other includeIf conditions, resolving this condition
+relies on information that is not yet known at the point of reading the
+condition. A typical use case is this option being present as a
+system-level or global-level config, and the remote URL being in a
+local-level config; hence the need to scan ahead when resolving this
+condition. In order to avoid the chicken-and-egg problem in which
+potentially-included files can affect whether such files are potentially
+included, Git breaks the cycle by prohibiting these files from affecting
+the resolution of these conditions (thus, prohibiting them from
+declaring remote URLs).
++
+As for the naming of this keyword, it is for forwards compatibiliy with
+a naming scheme that supports more variable-based include conditions,
+but currently Git only supports the exact keyword described above.
+
A few more notes on matching via `gitdir` and `gitdir/i`:
* Symlinks in `$GIT_DIR` are not resolved before matching.
@@ -226,6 +253,14 @@
; currently checked out
[includeIf "onbranch:foo-branch"]
path = foo.inc
+
+; include only if a remote with the given URL exists (note
+; that such a URL may be provided later in a file or in a
+; file read after this file is read, as seen in this example)
+[includeIf "hasconfig:remote.*.url:https://example.com/**"]
+ path = foo.inc
+[remote "origin"]
+ url = https://example.com/git
----
Values
@@ -262,11 +297,19 @@
colors (at most two, one for foreground and one for background)
and attributes (as many as you want), separated by spaces.
+
-The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
-`blue`, `magenta`, `cyan` and `white`. The first color given is the
-foreground; the second is the background. All the basic colors except
-`normal` have a bright variant that can be specified by prefixing the
-color with `bright`, like `brightred`.
+The basic colors accepted are `normal`, `black`, `red`, `green`,
+`yellow`, `blue`, `magenta`, `cyan`, `white` and `default`. The first
+color given is the foreground; the second is the background. All the
+basic colors except `normal` and `default` have a bright variant that can
+be specified by prefixing the color with `bright`, like `brightred`.
++
+The color `normal` makes no change to the color. It is the same as an
+empty string, but can be used as the foreground color when specifying a
+background color alone (for example, "normal red").
++
+The color `default` explicitly resets the color to the terminal default,
+for example to specify a cleared background. Although it varies between
+terminals, this is usually not the same as setting to "white black".
+
Colors may also be given as numbers between 0 and 255; these use ANSI
256-color mode (but note that not all terminals may support this). If
@@ -280,6 +323,11 @@
be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
`no-ul`, etc).
+
+The pseudo-attribute `reset` resets all colors and attributes before
+applying the specified coloring. For example, `reset green` will result
+in a green foreground and default background without any active
+attributes.
++
An empty color string produces no color effect at all. This can be used
to avoid coloring specific elements without disabling color entirely.
+
@@ -304,7 +352,7 @@
where Git itself was installed. For example, `%(prefix)/bin/` refers to
the directory in which the Git executable itself lives. If Git was
compiled without runtime prefix support, the compiled-in prefix will be
-subsituted instead. In the unlikely event that a literal path needs to
+substituted instead. In the unlikely event that a literal path needs to
be specified that should _not_ be expanded, it needs to be prefixed by
`./`, like so: `./%(prefix)/bin`.
@@ -447,7 +495,7 @@
include::config/rerere.txt[]
-include::config/reset.txt[]
+include::config/safe.txt[]
include::config/sendemail.txt[]
@@ -455,6 +503,8 @@
include::config/showbranch.txt[]
+include::config/sparse.txt[]
+
include::config/splitindex.txt[]
include::config/ssh.txt[]
diff --git a/Documentation/config/add.txt b/Documentation/config/add.txt
index c9f748f..3e859f3 100644
--- a/Documentation/config/add.txt
+++ b/Documentation/config/add.txt
@@ -7,6 +7,6 @@
variables.
add.interactive.useBuiltin::
- [EXPERIMENTAL] Set to `true` to use the experimental built-in
- implementation of the interactive version of linkgit:git-add[1]
- instead of the Perl script version. Is `false` by default.
+ Set to `false` to fall back to the original Perl implementation of
+ the interactive version of linkgit:git-add[1] instead of the built-in
+ version. Is `true` by default.
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index 063eec2..a00d010 100644
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -4,6 +4,10 @@
can tell Git that you do not need help by setting these to 'false':
+
--
+ ambiguousFetchRefspec::
+ Advice shown when fetch refspec for multiple remotes map to
+ the same remote-tracking branch namespace and causes branch
+ tracking set-up to fail.
fetchShowForcedUpdates::
Advice shown when linkgit:git-fetch[1] takes a long time
to calculate forced updates after ref updates, or to warn
@@ -67,10 +71,10 @@
commitBeforeMerge::
Advice shown when linkgit:git-merge[1] refuses to
merge to avoid overwriting local changes.
- resetQuiet::
- Advice to consider using the `--quiet` option to linkgit:git-reset[1]
- when the command takes more than 2 seconds to enumerate unstaged
- changes after reset.
+ resetNoRefresh::
+ Advice to consider using the `--no-refresh` option to
+ linkgit:git-reset[1] when the command takes more than 2 seconds
+ to refresh the index after reset.
resolveConflict::
Advice shown by various commands when conflicts
prevent the operation from being performed.
@@ -85,6 +89,9 @@
linkgit:git-switch[1] or linkgit:git-checkout[1]
to move to the detach HEAD state, to instruct how to
create a local branch after the fact.
+ suggestDetachingHead::
+ Advice shown when linkgit:git-switch[1] refuses to detach HEAD
+ without the explicit `--detach` option.
checkoutAmbiguousRemoteBranchName::
Advice shown when the argument to
linkgit:git-checkout[1] and linkgit:git-switch[1]
@@ -116,6 +123,9 @@
submoduleAlternateErrorStrategyDie::
Advice shown when a submodule.alternateErrorStrategy option
configured to "die" causes a fatal error.
+ submodulesNotUpdated::
+ Advice shown when a user runs a submodule command that fails
+ because `git submodule update --init` was not run.
addIgnoredFile::
Advice shown if a user attempts to add an ignored file to
the index.
diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt
index cc5f324..445341a 100644
--- a/Documentation/config/branch.txt
+++ b/Documentation/config/branch.txt
@@ -7,8 +7,11 @@
automatic setup is done; `true` -- automatic setup is done when the
starting point is a remote-tracking branch; `always` --
automatic setup is done when the starting point is either a
- local branch or remote-tracking
- branch. This option defaults to true.
+ local branch or remote-tracking branch; `inherit` -- if the starting point
+ has a tracking configuration, it is copied to the new
+ branch; `simple` -- automatic setup is done only when the starting point
+ is a remote-tracking branch and the new branch has the same name as the
+ remote branch. This option defaults to true.
branch.autoSetupRebase::
When a new branch is created with 'git branch', 'git switch' or 'git checkout'
@@ -37,8 +40,9 @@
may be overridden with `remote.pushDefault` (for all branches).
The remote to push to, for the current branch, may be further
overridden by `branch.<name>.pushRemote`. If no remote is
- configured, or if you are not on any branch, it defaults to
- `origin` for fetching and `remote.pushDefault` for pushing.
+ configured, or if you are not on any branch and there is more than
+ one remote defined in the repository, it defaults to `origin` for
+ fetching and `remote.pushDefault` for pushing.
Additionally, `.` (a period) is the current local repository
(a dot-repository), see `branch.<name>.merge`'s final note below.
@@ -85,10 +89,6 @@
so that the local merge commits are included in the rebase (see
linkgit:git-rebase[1] for details).
+
-When `preserve` (or just 'p', deprecated in favor of `merges`), also pass
-`--preserve-merges` along to 'git rebase' so that locally committed merge
-commits will not be flattened by running 'git pull'.
-+
When the value is `interactive` (or just 'i'), the rebase is run in interactive
mode.
+
diff --git a/Documentation/config/clone.txt b/Documentation/config/clone.txt
index 7bcfbd1..26f4fb1 100644
--- a/Documentation/config/clone.txt
+++ b/Documentation/config/clone.txt
@@ -6,3 +6,8 @@
clone.rejectShallow::
Reject to clone a repository if it is a shallow one, can be overridden by
passing option `--reject-shallow` in command line. See linkgit:git-clone[1]
+
+clone.filterSubmodules::
+ If a partial clone filter is provided (see `--filter` in
+ linkgit:git-rev-list[1]) and `--recurse-submodules` is used, also apply
+ the filter to submodules.
diff --git a/Documentation/config/color.txt b/Documentation/config/color.txt
index e05d520..1795b2d 100644
--- a/Documentation/config/color.txt
+++ b/Documentation/config/color.txt
@@ -9,26 +9,27 @@
Use customized color for hints.
color.blame.highlightRecent::
- This can be used to color the metadata of a blame line depending
- on age of the line.
+ Specify the line annotation color for `git blame --color-by-age`
+ depending upon the age of the line.
+
-This setting should be set to a comma-separated list of color and date settings,
-starting and ending with a color, the dates should be set from oldest to newest.
-The metadata will be colored given the colors if the line was introduced
-before the given timestamp, overwriting older timestamped colors.
+This setting should be set to a comma-separated list of color and
+date settings, starting and ending with a color, the dates should be
+set from oldest to newest. The metadata will be colored with the
+specified colors if the line was introduced before the given
+timestamp, overwriting older timestamped colors.
+
-Instead of an absolute timestamp relative timestamps work as well, e.g.
-2.weeks.ago is valid to address anything older than 2 weeks.
+Instead of an absolute timestamp relative timestamps work as well,
+e.g. `2.weeks.ago` is valid to address anything older than 2 weeks.
+
-It defaults to 'blue,12 month ago,white,1 month ago,red', which colors
-everything older than one year blue, recent changes between one month and
-one year old are kept white, and lines introduced within the last month are
-colored red.
+It defaults to `blue,12 month ago,white,1 month ago,red`, which
+colors everything older than one year blue, recent changes between
+one month and one year old are kept white, and lines introduced
+within the last month are colored red.
color.blame.repeatedLines::
- Use the customized color for the part of git-blame output that
- is repeated meta information per line (such as commit id,
- author name, date and timezone). Defaults to cyan.
+ Use the specified color to colorize line annotations for
+ `git blame --color-lines`, if they come from the same commit as the
+ preceding line. Defaults to cyan.
color.branch::
A boolean to enable/disable color in the output of
@@ -104,9 +105,12 @@
`matchContext`;;
matching text in context lines
`matchSelected`;;
- matching text in selected lines
+ matching text in selected lines. Also, used to customize the following
+ linkgit:git-log[1] subcommands: `--grep`, `--author` and `--committer`.
`selected`;;
- non-matching text in selected lines
+ non-matching text in selected lines. Also, used to customize the
+ following linkgit:git-log[1] subcommands: `--grep`, `--author` and
+ `--committer`.
`separator`;;
separators between fields on a line (`:`, `-`, and `=`)
and between hunks (`--`)
diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt
index c04f62a..41e330f 100644
--- a/Documentation/config/core.txt
+++ b/Documentation/config/core.txt
@@ -62,22 +62,54 @@
Defaults to `true` on Windows, and `false` elsewhere.
core.fsmonitor::
- If set, the value of this variable is used as a command which
- will identify all files that may have changed since the
- requested date/time. This information is used to speed up git by
- avoiding unnecessary processing of files that have not changed.
- See the "fsmonitor-watchman" section of linkgit:githooks[5].
+ If set to true, enable the built-in file system monitor
+ daemon for this working directory (linkgit:git-fsmonitor{litdd}daemon[1]).
++
+Like hook-based file system monitors, the built-in file system monitor
+can speed up Git commands that need to refresh the Git index
+(e.g. `git status`) in a working directory with many files. The
+built-in monitor eliminates the need to install and maintain an
+external third-party tool.
++
+The built-in file system monitor is currently available only on a
+limited set of supported platforms. Currently, this includes Windows
+and MacOS.
++
+ Otherwise, this variable contains the pathname of the "fsmonitor"
+ hook command.
++
+This hook command is used to identify all files that may have changed
+since the requested date/time. This information is used to speed up
+git by avoiding unnecessary scanning of files that have not changed.
++
+See the "fsmonitor-watchman" section of linkgit:githooks[5].
++
+Note that if you concurrently use multiple versions of Git, such
+as one version on the command line and another version in an IDE
+tool, that the definition of `core.fsmonitor` was extended to
+allow boolean values in addition to hook pathnames. Git versions
+2.35.1 and prior will not understand the boolean values and will
+consider the "true" or "false" values as hook pathnames to be
+invoked. Git versions 2.26 thru 2.35.1 default to hook protocol
+V2 and will fall back to no fsmonitor (full scan). Git versions
+prior to 2.26 default to hook protocol V1 and will silently
+assume there were no changes to report (no scan), so status
+commands may report incomplete results. For this reason, it is
+best to upgrade all of your Git versions before using the built-in
+file system monitor.
core.fsmonitorHookVersion::
- Sets the version of hook that is to be used when calling fsmonitor.
- There are currently versions 1 and 2. When this is not set,
- version 2 will be tried first and if it fails then version 1
- will be tried. Version 1 uses a timestamp as input to determine
- which files have changes since that time but some monitors
- like watchman have race conditions when used with a timestamp.
- Version 2 uses an opaque string so that the monitor can return
- something that can be used to determine what files have changed
- without race conditions.
+ Sets the protocol version to be used when invoking the
+ "fsmonitor" hook.
++
+There are currently versions 1 and 2. When this is not set,
+version 2 will be tried first and if it fails then version 1
+will be tried. Version 1 uses a timestamp as input to determine
+which files have changes since that time but some monitors
+like Watchman have race conditions when used with a timestamp.
+Version 2 uses an opaque string so that the monitor can return
+something that can be used to determine what files have changed
+without race conditions.
core.trustctime::
If false, the ctime differences between the index and the
@@ -547,13 +579,72 @@
is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent`
errors. The default tab width is 8. Allowed values are 1 to 63.
+core.fsync::
+ A comma-separated list of components of the repository that
+ should be hardened via the core.fsyncMethod when created or
+ modified. You can disable hardening of any component by
+ prefixing it with a '-'. Items that are not hardened may be
+ lost in the event of an unclean system shutdown. Unless you
+ have special requirements, it is recommended that you leave
+ this option empty or pick one of `committed`, `added`,
+ or `all`.
++
+When this configuration is encountered, the set of components starts with
+the platform default value, disabled components are removed, and additional
+components are added. `none` resets the state so that the platform default
+is ignored.
++
+The empty string resets the fsync configuration to the platform
+default. The default on most platforms is equivalent to
+`core.fsync=committed,-loose-object`, which has good performance,
+but risks losing recent work in the event of an unclean system shutdown.
++
+* `none` clears the set of fsynced components.
+* `loose-object` hardens objects added to the repo in loose-object form.
+* `pack` hardens objects added to the repo in packfile form.
+* `pack-metadata` hardens packfile bitmaps and indexes.
+* `commit-graph` hardens the commit graph file.
+* `index` hardens the index when it is modified.
+* `objects` is an aggregate option that is equivalent to
+ `loose-object,pack`.
+* `reference` hardens references modified in the repo.
+* `derived-metadata` is an aggregate option that is equivalent to
+ `pack-metadata,commit-graph`.
+* `committed` is an aggregate option that is currently equivalent to
+ `objects`. This mode sacrifices some performance to ensure that work
+ that is committed to the repository with `git commit` or similar commands
+ is hardened.
+* `added` is an aggregate option that is currently equivalent to
+ `committed,index`. This mode sacrifices additional performance to
+ ensure that the results of commands like `git add` and similar operations
+ are hardened.
+* `all` is an aggregate option that syncs all individual components above.
+
+core.fsyncMethod::
+ A value indicating the strategy Git will use to harden repository data
+ using fsync and related primitives.
++
+* `fsync` uses the fsync() system call or platform equivalents.
+* `writeout-only` issues pagecache writeback requests, but depending on the
+ filesystem and storage hardware, data added to the repository may not be
+ durable in the event of a system crash. This is the default mode on macOS.
+* `batch` enables a mode that uses writeout-only flushes to stage multiple
+ updates in the disk writeback cache and then does a single full fsync of
+ a dummy file to trigger the disk cache flush at the end of the operation.
++
+Currently `batch` mode only applies to loose-object files. Other repository
+data is made durable as if `fsync` was specified. This mode is expected to
+be as safe as `fsync` on macOS for repos stored on HFS+ or APFS filesystems
+and on Windows for repos stored on NTFS or ReFS filesystems.
+
core.fsyncObjectFiles::
This boolean will enable 'fsync()' when writing object files.
+ This setting is deprecated. Use core.fsync instead.
+
-This is a total waste of time and effort on a filesystem that orders
-data writes properly, but can be useful for filesystems that do not use
-journalling (traditional UNIX filesystems) or that only journal metadata
-and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").
+This setting affects data added to the Git repository in loose-object
+form. When set to true, Git will issue an fsync or similar system call
+to flush caches so that loose-objects remain consistent in the face
+of a unclean system shutdown.
core.preloadIndex::
Enable parallel index preload for operations like 'git diff'
@@ -615,8 +706,10 @@
core.sparseCheckoutCone::
Enables the "cone mode" of the sparse checkout feature. When the
- sparse-checkout file contains a limited set of patterns, then this
- mode provides significant performance advantages. See
+ sparse-checkout file contains a limited set of patterns, this
+ mode provides significant performance advantages. The "non
+ cone mode" can be requested to allow specifying a more flexible
+ patterns by setting this variable to 'false'. See
linkgit:git-sparse-checkout[1] for more information.
core.abbrev::
diff --git a/Documentation/config/extensions.txt b/Documentation/config/extensions.txt
index 4e23d73..bccaec7 100644
--- a/Documentation/config/extensions.txt
+++ b/Documentation/config/extensions.txt
@@ -6,3 +6,34 @@
Note that this setting should only be set by linkgit:git-init[1] or
linkgit:git-clone[1]. Trying to change it after initialization will not
work and will produce hard-to-diagnose issues.
+
+extensions.worktreeConfig::
+ If enabled, then worktrees will load config settings from the
+ `$GIT_DIR/config.worktree` file in addition to the
+ `$GIT_COMMON_DIR/config` file. Note that `$GIT_COMMON_DIR` and
+ `$GIT_DIR` are the same for the main working tree, while other
+ working trees have `$GIT_DIR` equal to
+ `$GIT_COMMON_DIR/worktrees/<id>/`. The settings in the
+ `config.worktree` file will override settings from any other
+ config files.
++
+When enabling `extensions.worktreeConfig`, you must be careful to move
+certain values from the common config file to the main working tree's
+`config.worktree` file, if present:
++
+* `core.worktree` must be moved from `$GIT_COMMON_DIR/config` to
+ `$GIT_COMMON_DIR/config.worktree`.
+* If `core.bare` is true, then it must be moved from `$GIT_COMMON_DIR/config`
+ to `$GIT_COMMON_DIR/config.worktree`.
++
+It may also be beneficial to adjust the locations of `core.sparseCheckout`
+and `core.sparseCheckoutCone` depending on your desire for customizable
+sparse-checkout settings for each worktree. By default, the `git
+sparse-checkout` builtin enables `extensions.worktreeConfig`, assigns
+these config values on a per-worktree basis, and uses the
+`$GIT_DIR/info/sparse-checkout` file to specify the sparsity for each
+worktree independently. See linkgit:git-sparse-checkout[1] for more
+details.
++
+For historical reasons, `extensions.worktreeConfig` is respected
+regardless of the `core.repositoryFormatVersion` setting.
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt
index 63748c0..cd65d23 100644
--- a/Documentation/config/fetch.txt
+++ b/Documentation/config/fetch.txt
@@ -56,18 +56,19 @@
OUTPUT in linkgit:git-fetch[1] for detail.
fetch.negotiationAlgorithm::
- Control how information about the commits in the local repository is
- sent when negotiating the contents of the packfile to be sent by the
- server. Set to "skipping" to use an algorithm that skips commits in an
- effort to converge faster, but may result in a larger-than-necessary
- packfile; or set to "noop" to not send any information at all, which
- will almost certainly result in a larger-than-necessary packfile, but
- will skip the negotiation step.
- The default is "default" which instructs Git to use the default algorithm
- that never skips commits (unless the server has acknowledged it or one
- of its descendants). If `feature.experimental` is enabled, then this
- setting defaults to "skipping".
- Unknown values will cause 'git fetch' to error out.
+ Control how information about the commits in the local repository
+ is sent when negotiating the contents of the packfile to be sent by
+ the server. Set to "consecutive" to use an algorithm that walks
+ over consecutive commits checking each one. Set to "skipping" to
+ use an algorithm that skips commits in an effort to converge
+ faster, but may result in a larger-than-necessary packfile; or set
+ to "noop" to not send any information at all, which will almost
+ certainly result in a larger-than-necessary packfile, but will skip
+ the negotiation step. Set to "default" to override settings made
+ previously and use the default behaviour. The default is normally
+ "consecutive", but if `feature.experimental` is true, then the
+ default is "skipping". Unknown values will cause 'git fetch' to
+ error out.
+
See also the `--negotiate-only` and `--negotiation-tip` options to
linkgit:git-fetch[1].
diff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt
index c834e07..38fea07 100644
--- a/Documentation/config/gc.txt
+++ b/Documentation/config/gc.txt
@@ -81,14 +81,21 @@
to enable it within all non-bare repos or it can be set to a
boolean value. The default is `true`.
+gc.cruftPacks::
+ Store unreachable objects in a cruft pack (see
+ linkgit:git-repack[1]) instead of as loose objects. The default
+ is `false`.
+
gc.pruneExpire::
- When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
- Override the grace period with this config variable. The value
- "now" may be used to disable this grace period and always prune
- unreachable objects immediately, or "never" may be used to
- suppress pruning. This feature helps prevent corruption when
- 'git gc' runs concurrently with another process writing to the
- repository; see the "NOTES" section of linkgit:git-gc[1].
+ When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'
+ (and 'repack --cruft --cruft-expiration 2.weeks.ago' if using
+ cruft packs via `gc.cruftPacks` or `--cruft`). Override the
+ grace period with this config variable. The value "now" may be
+ used to disable this grace period and always prune unreachable
+ objects immediately, or "never" may be used to suppress pruning.
+ This feature helps prevent corruption when 'git gc' runs
+ concurrently with another process writing to the repository; see
+ the "NOTES" section of linkgit:git-gc[1].
gc.worktreePruneExpire::
When 'git gc' is run, it calls
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt
index d94025c..86892ad 100644
--- a/Documentation/config/gpg.txt
+++ b/Documentation/config/gpg.txt
@@ -11,13 +11,13 @@
gpg.format::
Specifies which key format to use when signing with `--gpg-sign`.
- Default is "openpgp" and another possible value is "x509".
+ Default is "openpgp". Other possible values are "x509", "ssh".
gpg.<format>.program::
Use this to customize the program used for the signing format you
chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
be used as a legacy synonym for `gpg.openpgp.program`. The default
- value for `gpg.x509.program` is "gpgsm".
+ value for `gpg.x509.program` is "gpgsm" and `gpg.ssh.program` is "ssh-keygen".
gpg.minTrustLevel::
Specifies a minimum trust level for signature verification. If
@@ -33,3 +33,47 @@
* `marginal`
* `fully`
* `ultimate`
+
+gpg.ssh.defaultKeyCommand::
+ This command that will be run when user.signingkey is not set and a ssh
+ signature is requested. On successful exit a valid ssh public key is
+ expected in the first line of its output. To automatically use the first
+ available key from your ssh-agent set this to "ssh-add -L".
+
+gpg.ssh.allowedSignersFile::
+ A file containing ssh public keys which you are willing to trust.
+ The file consists of one or more lines of principals followed by an ssh
+ public key.
+ e.g.: `user1@example.com,user2@example.com ssh-rsa AAAAX1...`
+ See ssh-keygen(1) "ALLOWED SIGNERS" for details.
+ The principal is only used to identify the key and is available when
+ verifying a signature.
++
+SSH has no concept of trust levels like gpg does. To be able to differentiate
+between valid signatures and trusted signatures the trust level of a signature
+verification is set to `fully` when the public key is present in the allowedSignersFile.
+Otherwise the trust level is `undefined` and git verify-commit/tag will fail.
++
+This file can be set to a location outside of the repository and every developer
+maintains their own trust store. A central repository server could generate this
+file automatically from ssh keys with push access to verify the code against.
+In a corporate setting this file is probably generated at a global location
+from automation that already handles developer ssh keys.
++
+A repository that only allows signed commits can store the file
+in the repository itself using a path relative to the top-level of the working tree.
+This way only committers with an already valid key can add or change keys in the keyring.
++
+Since OpensSSH 8.8 this file allows specifying a key lifetime using valid-after &
+valid-before options. Git will mark signatures as valid if the signing key was
+valid at the time of the signature's creation. This allows users to change a
+signing key without invalidating all previously made signatures.
++
+Using a SSH CA key with the cert-authority option
+(see ssh-keygen(1) "CERTIFICATES") is also valid.
+
+gpg.ssh.revocationFile::
+ Either a SSH KRL or a list of revoked public keys (without the principal prefix).
+ See ssh-keygen(1) for details.
+ If a public key is found in this file then it will always be treated
+ as having trust level "never" and signatures will show as invalid.
diff --git a/Documentation/config/grep.txt b/Documentation/config/grep.txt
index 44abe45..182edd8 100644
--- a/Documentation/config/grep.txt
+++ b/Documentation/config/grep.txt
@@ -8,7 +8,8 @@
Set the default matching behavior. Using a value of 'basic', 'extended',
'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,
`--fixed-strings`, or `--perl-regexp` option accordingly, while the
- value 'default' will return to the default matching behavior.
+ value 'default' will use the `grep.extendedRegexp` option to choose
+ between 'basic' and 'extended'.
grep.extendedRegexp::
If set to true, enable `--extended-regexp` option by default. This
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index 7003661..179d03e 100644
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -98,6 +98,22 @@
- HTTP/2
- HTTP/1.1
+http.curloptResolve::
+ Hostname resolution information that will be used first by
+ libcurl when sending HTTP requests. This information should
+ be in one of the following formats:
+
+ - [+]HOST:PORT:ADDRESS[,ADDRESS]
+ - -HOST:PORT
+
++
+The first format redirects all requests to the given `HOST:PORT`
+to the provided `ADDRESS`(s). The second format clears all
+previous config values for that `HOST:PORT` combination. To
+allow easy overriding of all the settings inherited from the
+system config, an empty value will reset all resolution
+information to the empty list.
+
http.sslVersion::
The SSL version to use when negotiating an SSL connection, if you
want to force the default. The available and default version
diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt
index e27cc63..99e83dd 100644
--- a/Documentation/config/merge.txt
+++ b/Documentation/config/merge.txt
@@ -4,7 +4,14 @@
shows a `<<<<<<<` conflict marker, changes made by one side,
a `=======` marker, changes made by the other side, and then
a `>>>>>>>` marker. An alternate style, "diff3", adds a `|||||||`
- marker and the original text before the `=======` marker.
+ marker and the original text before the `=======` marker. The
+ "merge" style tends to produce smaller conflict regions than diff3,
+ both because of the exclusion of the original text, and because
+ when a subset of lines match on the two sides they are just pulled
+ out of the conflict region. Another alternate style, "zdiff3", is
+ similar to diff3 but removes matching lines on the two sides from
+ the conflict region when those matching lines appear near either
+ the beginning or end of a conflict region.
merge.defaultToUpstream::
If merge is called without any commit argument, merge the upstream
diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
index cafbbef..90b3809 100644
--- a/Documentation/config/mergetool.txt
+++ b/Documentation/config/mergetool.txt
@@ -45,6 +45,15 @@
value of `false` avoids using `--auto-merge` altogether, and is the
default value.
+mergetool.vimdiff.layout::
+ The vimdiff backend uses this variable to control how its split
+ windows look like. Applies even if you are using Neovim (`nvim`) or
+ gVim (`gvim`) as the merge tool. See BACKEND SPECIFIC HINTS section
+ifndef::git-mergetool[]
+ in linkgit:git-mergetool[1].
+endif::[]
+ for details.
+
mergetool.hideResolved::
During a merge Git will automatically resolve as many conflicts as
possible and write the 'MERGED' file containing conflict markers around
diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt
index 5404830..9349e09 100644
--- a/Documentation/config/pull.txt
+++ b/Documentation/config/pull.txt
@@ -18,10 +18,6 @@
so that the local merge commits are included in the rebase (see
linkgit:git-rebase[1] for details).
+
-When `preserve` (or just 'p', deprecated in favor of `merges`), also pass
-`--preserve-merges` along to 'git rebase' so that locally committed merge
-commits will not be flattened by running 'git pull'.
-+
When the value is `interactive` (or just 'i'), the rebase is run in interactive
mode.
+
diff --git a/Documentation/config/push.txt b/Documentation/config/push.txt
index 6320336..e32801e 100644
--- a/Documentation/config/push.txt
+++ b/Documentation/config/push.txt
@@ -1,3 +1,14 @@
+push.autoSetupRemote::
+ If set to "true" assume `--set-upstream` on default push when no
+ upstream tracking exists for the current branch; this option
+ takes effect with push.default options 'simple', 'upstream',
+ and 'current'. It is useful if by default you want new branches
+ to be pushed to the default remote (like the behavior of
+ 'push.default=current') and you also want the upstream tracking
+ to be set. Workflows most likely to benefit from this option are
+ 'simple' central workflows where all branches are expected to
+ have the same name on the remote.
+
push.default::
Defines the action `git push` should take if no refspec is
given (whether from the command-line, config, or elsewhere).
diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt
index a8e6437..0678b4b 100644
--- a/Documentation/config/remote.txt
+++ b/Documentation/config/remote.txt
@@ -82,5 +82,7 @@
objects.
remote.<name>.partialclonefilter::
- The filter that will be applied when fetching from this
- promisor remote.
+ The filter that will be applied when fetching from this promisor remote.
+ Changing or clearing this value will only affect fetches for new commits.
+ To fetch associated objects for commits already present in the local object
+ database, use the `--refetch` option of linkgit:git-fetch[1].
diff --git a/Documentation/config/repack.txt b/Documentation/config/repack.txt
index 9c413e1..c79af6d 100644
--- a/Documentation/config/repack.txt
+++ b/Documentation/config/repack.txt
@@ -25,3 +25,17 @@
space and extra time spent on the initial repack. This has
no effect if multiple packfiles are created.
Defaults to true on bare repos, false otherwise.
+
+repack.updateServerInfo::
+ If set to false, linkgit:git-repack[1] will not run
+ linkgit:git-update-server-info[1]. Defaults to true. Can be overridden
+ when true by the `-n` option of linkgit:git-repack[1].
+
+repack.cruftWindow::
+repack.cruftWindowMemory::
+repack.cruftDepth::
+repack.cruftThreads::
+ Parameters used by linkgit:git-pack-objects[1] when generating
+ a cruft pack and the respective parameters are not given over
+ the command line. See similarly named `pack.*` configuration
+ variables for defaults and meaning.
diff --git a/Documentation/config/reset.txt b/Documentation/config/reset.txt
deleted file mode 100644
index 63b7c45..0000000
--- a/Documentation/config/reset.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-reset.quiet::
- When set to true, 'git reset' will default to the '--quiet' option.
diff --git a/Documentation/config/safe.txt b/Documentation/config/safe.txt
new file mode 100644
index 0000000..1ee10fa
--- /dev/null
+++ b/Documentation/config/safe.txt
@@ -0,0 +1,41 @@
+safe.directory::
+ These config entries specify Git-tracked directories that are
+ considered safe even if they are owned by someone other than the
+ current user. By default, Git will refuse to even parse a Git
+ config of a repository owned by someone else, let alone run its
+ hooks, and this config setting allows users to specify exceptions,
+ e.g. for intentionally shared repositories (see the `--shared`
+ option in linkgit:git-init[1]).
++
+This is a multi-valued setting, i.e. you can add more than one directory
+via `git config --add`. To reset the list of safe directories (e.g. to
+override any such directories specified in the system config), add a
+`safe.directory` entry with an empty value.
++
+This config setting is only respected when specified in a system or global
+config, not when it is specified in a repository config, via the command
+line option `-c safe.directory=<path>`, or in environment variables.
++
+The value of this setting is interpolated, i.e. `~/<path>` expands to a
+path relative to the home directory and `%(prefix)/<path>` expands to a
+path relative to Git's (runtime) prefix.
++
+To completely opt-out of this security check, set `safe.directory` to the
+string `*`. This will allow all repositories to be treated as if their
+directory was listed in the `safe.directory` list. If `safe.directory=*`
+is set in system config and you want to re-enable this protection, then
+initialize your list with an empty value before listing the repositories
+that you deem safe.
++
+As explained, Git only allows you to access repositories owned by
+yourself, i.e. the user who is running Git, by default. When Git
+is running as 'root' in a non Windows platform that provides sudo,
+ however, git checks the SUDO_UID environment variable that sudo creates
+and will allow access to the uid recorded as its value instead.
+This is to make it easy to perform a common sequence during installation
+"make && sudo make install". A git process running under 'sudo' runs as
+'root' but the 'sudo' command exports the environment variable to record
+which id the original user has.
+If that is not what you would prefer and want git to only trust
+repositories that are owned by root instead, then you must remove
+the `SUDO_UID` variable from root's environment before invoking git.
diff --git a/Documentation/config/sparse.txt b/Documentation/config/sparse.txt
new file mode 100644
index 0000000..aff49a8
--- /dev/null
+++ b/Documentation/config/sparse.txt
@@ -0,0 +1,27 @@
+sparse.expectFilesOutsideOfPatterns::
+ Typically with sparse checkouts, files not matching any
+ sparsity patterns are marked with a SKIP_WORKTREE bit in the
+ index and are missing from the working tree. Accordingly, Git
+ will ordinarily check whether files with the SKIP_WORKTREE bit
+ are in fact present in the working tree contrary to
+ expectations. If Git finds any, it marks those paths as
+ present by clearing the relevant SKIP_WORKTREE bits. This
+ option can be used to tell Git that such
+ present-despite-skipped files are expected and to stop
+ checking for them.
++
+The default is `false`, which allows Git to automatically recover
+from the list of files in the index and working tree falling out of
+sync.
++
+Set this to `true` if you are in a setup where some external factor
+relieves Git of the responsibility for maintaining the consistency
+between the presence of working tree files and sparsity patterns. For
+example, if you have a Git-aware virtual file system that has a robust
+mechanism for keeping the working tree and the sparsity patterns up to
+date based on access patterns.
++
+Regardless of this setting, Git does not check for
+present-despite-skipped files unless sparse checkout is enabled, so
+this config option has no effect unless `core.sparseCheckout` is
+`true`.
diff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt
index 9ed7752..b9f609e 100644
--- a/Documentation/config/stash.txt
+++ b/Documentation/config/stash.txt
@@ -1,10 +1,3 @@
-stash.useBuiltin::
- 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.showIncludeUntracked::
If this is set to true, the `git stash show` command will show
the untracked files of a stash entry. Defaults to false. See
diff --git a/Documentation/config/submodule.txt b/Documentation/config/submodule.txt
index ee454f8..6490527 100644
--- a/Documentation/config/submodule.txt
+++ b/Documentation/config/submodule.txt
@@ -59,18 +59,33 @@
submodule.recurse::
A boolean indicating if commands should enable the `--recurse-submodules`
- option by default.
- Applies to all commands that support this option
- (`checkout`, `fetch`, `grep`, `pull`, `push`, `read-tree`, `reset`,
- `restore` and `switch`) except `clone` and `ls-files`.
+ option by default. 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`.
++
+The following list shows the commands that accept
+`--recurse-submodules` and whether they are supported by this
+setting.
+
+* `checkout`, `fetch`, `grep`, `pull`, `push`, `read-tree`,
+`reset`, `restore` and `switch` are always supported.
+* `clone` and `ls-files` are not supported.
+* `branch` is supported only if `submodule.propagateBranches` is
+enabled
+
+submodule.propagateBranches::
+ [EXPERIMENTAL] A boolean that enables branching support when
+ using `--recurse-submodules` or `submodule.recurse=true`.
+ Enabling this will allow certain commands to accept
+ `--recurse-submodules` and certain commands that already accept
+ `--recurse-submodules` will now consider branches.
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/user.txt b/Documentation/config/user.txt
index 59aec7c..ec9233b 100644
--- a/Documentation/config/user.txt
+++ b/Documentation/config/user.txt
@@ -36,3 +36,13 @@
commit, you can override the default selection with this variable.
This option is passed unchanged to gpg's --local-user parameter,
so you may specify a key using any method that gpg supports.
+ If gpg.format is set to `ssh` this can contain the path to either
+ your private ssh key or the public key when ssh-agent is used.
+ Alternatively it can contain a public key prefixed with `key::`
+ directly (e.g.: "key::ssh-rsa XXXXXX identifier"). The private key
+ needs to be available via ssh-agent. If not set git will call
+ gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the
+ first key available. For backward compatibility, a raw key which
+ begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated
+ as "key::ssh-rsa XXXXXX identifier", but this form is deprecated;
+ use the `key::` form instead.
diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt
index 99c455f..67645ca 100644
--- a/Documentation/date-formats.txt
+++ b/Documentation/date-formats.txt
@@ -5,9 +5,9 @@
support the following date formats:
Git internal format::
- It is `<unix timestamp> <time zone offset>`, where `<unix
- timestamp>` is the number of seconds since the UNIX epoch.
- `<time zone offset>` is a positive or negative offset from UTC.
+ It is `<unix-timestamp> <time-zone-offset>`, where
+ `<unix-timestamp>` is the number of seconds since the UNIX epoch.
+ `<time-zone-offset>` is a positive or negative offset from UTC.
For example CET (which is 1 hour ahead of UTC) is `+0100`.
RFC 2822::
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index fbbd410..7a9c3b6 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -59,7 +59,7 @@
- D: deletion of a file
- M: modification of the contents or mode of a file
- R: renaming of a file
-- T: change in the type of the file
+- T: change in the type of the file (regular file, symbolic link or submodule)
- U: file is unmerged (you must complete the merge before it can
be committed)
- X: "unknown" change type (most probably a bug, please report it)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index c89d530..3674ac4 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -34,7 +34,7 @@
endif::git-format-patch[]
ifdef::git-log[]
---diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)::
+--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r)::
--no-diff-merges::
Specify diff format to be used for merge commits. Default is
{diff-merges-default} unless `--first-parent` is in use, in which case
@@ -64,6 +64,18 @@
each of the parents. Separate log entry and diff is generated
for each parent.
+
+--diff-merges=remerge:::
+--diff-merges=r:::
+--remerge-diff:::
+ With this option, two-parent merge commits are remerged to
+ create a temporary tree object -- potentially containing files
+ with conflict markers and such. A diff is then shown between
+ that temporary tree and the actual merge commit.
++
+The output emitted when this option is used is subject to change, and
+so is its interaction with other options (unless explicitly
+documented).
++
--diff-merges=combined:::
--diff-merges=c:::
-c:::
@@ -616,11 +628,8 @@
Also, these upper-case letters can be downcased to exclude. E.g.
`--diff-filter=ad` excludes added and deleted paths.
+
-Note that not all diffs can feature all types. For instance, diffs
-from the index to the working tree can never have Added entries
-(because the set of paths included in the diff is limited by what is in
-the index). Similarly, copied and renamed entries cannot appear if
-detection for those types is disabled.
+Note that not all diffs can feature all types. For instance, copied and
+renamed entries cannot appear if detection for those types is disabled.
-S<string>::
Look for differences that change the number of occurrences of
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index e967ff1..622bd84 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -71,6 +71,7 @@
ancestors of the provided `--negotiation-tip=*` arguments,
which we have in common with the server.
+
+This is incompatible with `--recurse-submodules=[yes|on-demand]`.
Internally this is used to implement the `push.negotiate` option, see
linkgit:git-config[1].
@@ -162,6 +163,16 @@
behavior for a remote may be specified with the remote.<name>.tagOpt
setting. See linkgit:git-config[1].
+ifndef::git-pull[]
+--refetch::
+ Instead of negotiating with the server to avoid transferring commits and
+ associated objects that are already present locally, this option fetches
+ all objects as a fresh clone would. Use this to reapply a partial clone
+ filter from configuration or using `--filter=` when the filter
+ definition has changed. Automatic post-fetch maintenance will perform
+ object database pack consolidation to remove any duplicate objects.
+endif::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
@@ -185,15 +196,23 @@
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
- boolean option to completely disable recursion when set to 'no' or to
- unconditionally recurse into all populated submodules when set to
- 'yes', which is the default when this option is used without any
- 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. By default, 'on-demand' is used, unless
- `fetch.recurseSubmodules` is set (see linkgit:git-config[1]).
+ submodules should be fetched too. When recursing through submodules,
+ `git fetch` always attempts to fetch "changed" submodules, that is, a
+ submodule that has commits that are referenced by a newly fetched
+ superproject commit but are missing in the local submodule clone. A
+ changed submodule can be fetched as long as it is present locally e.g.
+ in `$GIT_DIR/modules/` (see linkgit:gitsubmodules[7]); if the upstream
+ adds a new submodule, that submodule cannot be fetched until it is
+ cloned e.g. by `git submodule update`.
++
+When set to 'on-demand', only changed submodules are fetched. When set
+to 'yes', all populated submodules are fetched and submodules that are
+both unpopulated and changed are fetched. When set to 'no', submodules
+are never fetched.
++
+When unspecified, this uses the value of `fetch.recurseSubmodules` if it
+is set (see linkgit:git-config[1]), defaulting to 'on-demand' if unset.
+When this option is used without any value, it defaults to 'yes'.
endif::git-pull[]
-j::
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index be5e3ac..11eb70f 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -9,7 +9,7 @@
--------
[verse]
'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
- [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]
+ [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] [--sparse]
[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
[--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
[--] [<pathspec>...]
@@ -79,6 +79,13 @@
--force::
Allow adding otherwise ignored files.
+--sparse::
+ Allow updating index entries outside of the sparse-checkout cone.
+ Normally, `git add` refuses to update index entries whose paths do
+ not fit within the sparse-checkout cone, since those files might
+ be removed from the working tree without warning. See
+ linkgit:git-sparse-checkout[1] for more details.
+
-i::
--interactive::
Add modified contents in the working tree interactively to
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 0a4a984..09107fb 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -16,8 +16,9 @@
[--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
[--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
[--quoted-cr=<action>]
+ [--empty=(stop|drop|keep)]
[(<mbox> | <Maildir>)...]
-'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])
+'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty)
DESCRIPTION
-----------
@@ -63,6 +64,14 @@
--quoted-cr=<action>::
This flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).
+--empty=(stop|drop|keep)::
+ By default, or when the option is set to 'stop', the command
+ errors out on an input e-mail message lacking a patch
+ and stops into the middle of the current am session. When this
+ option is set to 'drop', skip such an e-mail message instead.
+ When this option is set to 'keep', create an empty commit,
+ recording the contents of the e-mail message as its log.
+
-m::
--message-id::
Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),
@@ -191,6 +200,11 @@
the e-mail message; if `diff`, show the diff portion only.
Defaults to `raw`.
+--allow-empty::
+ After a patch failure on an input e-mail message lacking a patch,
+ create an empty commit with the contents of the e-mail message
+ as its log message.
+
DISCUSSION
----------
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index aa1ae56..b6d77f4 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -16,7 +16,7 @@
[--ignore-space-change | --ignore-whitespace]
[--whitespace=(nowarn|warn|fix|error|error-all)]
[--exclude=<path>] [--include=<path>] [--directory=<root>]
- [--verbose] [--unsafe-paths] [<patch>...]
+ [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]
DESCRIPTION
-----------
@@ -228,6 +228,11 @@
current patch being applied will be printed. This option will cause
additional information to be reported.
+-q::
+--quiet::
+ Suppress stderr output. Messages about patch status and progress
+ will not be printed.
+
--recount::
Do not trust the line counts in the hunk headers, but infer them
by inspecting the patch (e.g. after editing the patch without
@@ -251,6 +256,10 @@
the `--unsafe-paths` option to override this safety check. This option
has no effect when `--index` or `--cached` is in use.
+--allow-empty::
+ Don't return error for patches containing no diff. This includes
+ empty patches and patches with commit text only.
+
CONFIGURATION
-------------
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
index a595a0f..847777f 100644
--- a/Documentation/git-archimport.txt
+++ b/Documentation/git-archimport.txt
@@ -9,14 +9,14 @@
SYNOPSIS
--------
[verse]
-'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
- <archive/branch>[:<git-branch>] ...
+'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D <depth>] [-t <tempdir>]
+ <archive>/<branch>[:<git-branch>]...
DESCRIPTION
-----------
Imports a project from one or more GNU Arch repositories.
It will follow branches
-and repositories within the namespaces defined by the <archive/branch>
+and repositories within the namespaces defined by the <archive>/<branch>
parameters supplied. If it cannot find the remote branch a merge comes from
it will just import it as a regular commit. If it can find it, it will mark it
as a merge whenever possible (see discussion below).
@@ -27,7 +27,7 @@
It expects to be dealing with one project only. If it sees
branches that have different roots, it will refuse to run. In that case,
-edit your <archive/branch> parameters to define clearly the scope of the
+edit your <archive>/<branch> parameters to define clearly the scope of the
import.
'git archimport' uses `tla` extensively in the background to access the
@@ -42,7 +42,7 @@
While 'git archimport' will try to create sensible branch names for the
archives that it imports, it is also possible to specify Git branch names
-manually. To do so, write a Git branch name after each <archive/branch>
+manually. To do so, write a Git branch name after each <archive>/<branch>
parameter, separated by a colon. This way, you can shorten the Arch
branch names and convert Arch jargon to Git jargon, for example mapping a
"PROJECT{litdd}devo{litdd}VERSION" branch to "master".
@@ -104,8 +104,8 @@
Override the default tempdir.
-<archive/branch>::
- Archive/branch identifier in a format that `tla log` understands.
+<archive>/<branch>::
+ <archive>/<branch> identifier in a format that `tla log` understands.
GIT
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 9f81728..56989a2 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -49,7 +49,9 @@
Report progress to stderr.
--prefix=<prefix>/::
- Prepend <prefix>/ to each filename in the archive.
+ Prepend <prefix>/ to paths in the archive. Can be repeated; its
+ rightmost value is used for all tracked files. See below which
+ value gets used by `--add-file` and `--add-virtual-file`.
-o <file>::
--output=<file>::
@@ -57,9 +59,26 @@
--add-file=<file>::
Add a non-tracked file to the archive. Can be repeated to add
+ multiple files. The path of the file in the archive is built by
+ concatenating the value of the last `--prefix` option (if any)
+ before this `--add-file` and the basename of <file>.
+
+--add-virtual-file=<path>:<content>::
+ Add the specified contents to the archive. Can be repeated to add
multiple files. The path of the file in the archive is built
- by concatenating the value for `--prefix` (if any) and the
- basename of <file>.
+ by concatenating the value of the last `--prefix` option (if any)
+ before this `--add-virtual-file` and `<path>`.
++
+The `<path>` argument can start and end with a literal double-quote
+character; the contained file name is interpreted as a C-style string,
+i.e. the backslash is interpreted as escape character. The path must
+be quoted if it contains a colon, to avoid the colon from being
+misinterpreted as the separator between the path and the contents, or
+if the path begins or ends with a double-quote character.
++
+The file mode is limited to a regular file, and the option may be
+subject to platform-dependent command-line limits. For non-trivial
+cases, write an untracked file and use `--add-file` instead.
--worktree-attributes::
Look for attributes in .gitattributes files in the working tree
@@ -93,12 +112,19 @@
zip
~~~
--0::
- Store the files instead of deflating them.
--9::
- Highest and slowest compression level. You can specify any
- number from 1 to 9 to adjust compression speed and ratio.
+-<digit>::
+ Specify compression level. Larger values allow the command
+ to spend more time to compress to smaller size. Supported
+ values are from `-0` (store-only) to `-9` (best ratio).
+ Default is `-6` if not given.
+tar
+~~~
+-<number>::
+ Specify compression level. The value will be passed to the
+ compression command configured in `tar.<format>.command`. See
+ manual page of the configured command for the list of supported
+ levels and the default level if this option isn't specified.
CONFIGURATION
-------------
@@ -187,6 +213,12 @@
commit on the current branch. Note that the output format is
inferred by the extension of the output file.
+`git archive -o latest.tar --prefix=build/ --add-file=configure --prefix= HEAD`::
+
+ Creates a tar archive that contains the contents of the latest
+ commit on the current branch with no prefix and the untracked
+ file 'configure' with the prefix 'build/'.
+
`git config tar.tar.xz.command "xz -c"`::
Configure a "tar.xz" format for making LZMA-compressed tarfiles.
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 3bf5d5d..d7a46cc 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -11,8 +11,8 @@
'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]
[-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
[--ignore-rev <rev>] [--ignore-revs-file <file>]
- [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>..<rev>]
- [--] <file>
+ [--color-lines] [--color-by-age] [--progress] [--abbrev=<n>]
+ [<rev> | --contents <file> | --reverse <rev>..<rev>] [--] <file>
DESCRIPTION
-----------
@@ -93,6 +93,19 @@
is used for a caret to mark the boundary commit.
+THE DEFAULT FORMAT
+------------------
+
+When neither `--porcelain` nor `--incremental` option is specified,
+`git blame` will output annotation for each line with:
+
+- abbreviated object name for the commit the line came from;
+- author ident (by default author name and date, unless `-s` or `-e`
+ is specified); and
+- line number
+
+before the line contents.
+
THE PORCELAIN FORMAT
--------------------
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 5449767..ae82378 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -16,7 +16,8 @@
[--points-at <object>] [--format=<format>]
[(-r | --remotes) | (-a | --all)]
[--list] [<pattern>...]
-'git branch' [--track | --no-track] [-f] <branchname> [<start-point>]
+'git branch' [--track[=(direct|inherit)] | --no-track] [-f]
+ [--recurse-submodules] <branchname> [<start-point>]
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
'git branch' --unset-upstream [<branchname>]
'git branch' (-m | -M) [<oldbranch>] <newbranch>
@@ -125,14 +126,14 @@
-m::
--move::
- Move/rename a branch and the corresponding reflog.
+ Move/rename a branch, together with its config and reflog.
-M::
Shortcut for `--move --force`.
-c::
--copy::
- Copy a branch and the corresponding reflog.
+ Copy a branch, together with its config and reflog.
-C::
Shortcut for `--copy --force`.
@@ -206,24 +207,54 @@
Display the full sha1s in the output listing rather than abbreviating them.
-t::
---track::
+--track[=(direct|inherit)]::
When creating a new branch, set up `branch.<name>.remote` and
- `branch.<name>.merge` configuration entries to mark the
- start-point branch as "upstream" from the new branch. This
+ `branch.<name>.merge` configuration entries to set "upstream" tracking
+ configuration for the new branch. This
configuration will tell git to show the relationship between the
two branches in `git status` and `git branch -v`. Furthermore,
it directs `git pull` without arguments to pull from the
upstream when the new branch is checked out.
+
-This behavior is the default when the start point is a remote-tracking branch.
-Set the branch.autoSetupMerge configuration variable to `false` if you
-want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track`
-were given. Set it to `always` if you want this behavior when the
-start-point is either a local or remote-tracking branch.
+The exact upstream branch is chosen depending on the optional argument:
+`-t`, `--track`, or `--track=direct` means to use the start-point branch
+itself as the upstream; `--track=inherit` means to copy the upstream
+configuration of the start-point branch.
++
+The branch.autoSetupMerge configuration variable specifies how `git switch`,
+`git checkout` and `git branch` should behave when neither `--track` nor
+`--no-track` are specified:
++
+The default option, `true`, behaves as though `--track=direct`
+were given whenever the start-point is a remote-tracking branch.
+`false` behaves as if `--no-track` were given. `always` behaves as though
+`--track=direct` were given. `inherit` behaves as though `--track=inherit`
+were given. `simple` behaves as though `--track=direct` were given only when
+the start-point is a remote-tracking branch and the new branch has the same
+name as the remote branch.
++
+See linkgit:git-pull[1] and linkgit:git-config[1] for additional discussion on
+how the `branch.<name>.remote` and `branch.<name>.merge` options are used.
--no-track::
Do not set up "upstream" configuration, even if the
- branch.autoSetupMerge configuration variable is true.
+ branch.autoSetupMerge configuration variable is set.
+
+--recurse-submodules::
+ THIS OPTION IS EXPERIMENTAL! Causes the current command to
+ recurse into submodules if `submodule.propagateBranches` is
+ enabled. See `submodule.propagateBranches` in
+ linkgit:git-config[1]. Currently, only branch creation is
+ supported.
++
+When used in branch creation, a new branch <branchname> will be created
+in the superproject and all of the submodules in the superproject's
+<start-point>. In submodules, the branch will point to the submodule
+commit in the superproject's <start-point> but the branch's tracking
+information will be set up based on the submodule's branches and remotes
+e.g. `git branch --recurse-submodules topic origin/main` will create the
+submodule branch "topic" that points to the submodule commit in the
+superproject's "origin/main", but tracks the submodule's "origin/main".
--set-upstream::
As this option had confusing syntax, it is no longer supported.
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index 71b5eca..7685b57 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -51,10 +51,10 @@
unbundled using the `--fix-thin` option to linkgit:git-index-pack[1].
There is no option to create a "thick pack" when using revision
-exclusions, users should not be concerned about the difference. By
-using "thin packs" bundles created using exclusions are smaller in
+exclusions, and users should not be concerned about the difference. By
+using "thin packs", bundles created using exclusions are smaller in
size. That they're "thin" under the hood is merely noted here as a
-curiosity, and as a reference to other documentation
+curiosity, and as a reference to other documentation.
See link:technical/bundle-format.html[the `bundle-format`
documentation] for more details and the discussion of "thin pack" in
@@ -75,8 +75,11 @@
cleanly to the current repository. This includes checks on the
bundle format itself as well as checking that the prerequisite
commits exist and are fully linked in the current repository.
- 'git bundle' prints a list of missing commits, if any, and exits
- with a non-zero status.
+ Then, 'git bundle' prints a list of missing commits, if any.
+ Finally, information about additional capabilities, such as "object
+ filter", is printed. See "Capabilities" in link:technical/bundle-format.html
+ for more information. The exit code is zero for success, but will
+ be nonzero if the bundle file is invalid.
list-heads <file>::
Lists the references defined in the bundle. If followed by a
@@ -144,7 +147,7 @@
SPECIFYING REFERENCES
---------------------
-Revisions must accompanied by reference names to be packaged in a
+Revisions must be accompanied by reference names to be packaged in a
bundle.
More than one reference may be packaged, and more than one set of prerequisite objects can
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 4eb0421..24a811f 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -9,8 +9,14 @@
SYNOPSIS
--------
[verse]
-'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>
-'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]
+'git cat-file' <type> <object>
+'git cat-file' (-e | -p) <object>
+'git cat-file' (-t | -s) [--allow-unknown-type] <object>
+'git cat-file' (--batch | --batch-check | --batch-command) [--batch-all-objects]
+ [--buffer] [--follow-symlinks] [--unordered]
+ [--textconv | --filters]
+'git cat-file' (--textconv | --filters)
+ [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
DESCRIPTION
-----------
@@ -90,19 +96,48 @@
need to specify the path, separated by whitespace. See the
section `BATCH OUTPUT` below for details.
+--batch-command::
+--batch-command=<format>::
+ Enter a command mode that reads commands and arguments from stdin. May
+ only be combined with `--buffer`, `--textconv` or `--filters`. In the
+ case of `--textconv` or `--filters`, the input lines also need to specify
+ the path, separated by whitespace. See the section `BATCH OUTPUT` below
+ for details.
++
+`--batch-command` recognizes the following commands:
++
+--
+contents <object>::
+ Print object contents for object reference `<object>`. This corresponds to
+ the output of `--batch`.
+
+info <object>::
+ Print object info for object reference `<object>`. This corresponds to the
+ output of `--batch-check`.
+
+flush::
+ Used with `--buffer` to execute all preceding commands that were issued
+ since the beginning or since the last flush was issued. When `--buffer`
+ is used, no output will come until a `flush` is issued. When `--buffer`
+ is not used, commands are flushed each time without issuing `flush`.
+--
++
+
--batch-all-objects::
Instead of reading a list of objects on stdin, perform the
requested batch operation on all objects in the repository and
any alternate object stores (not just reachable objects).
- Requires `--batch` or `--batch-check` be specified. Note that
- the objects are visited in order sorted by their hashes.
+ Requires `--batch` or `--batch-check` be specified. By default,
+ the objects are visited in order sorted by their hashes; see
+ also `--unordered` below. Objects are presented as-is, without
+ respecting the "replace" mechanism of linkgit:git-replace[1].
--buffer::
Normally batch output is flushed after each object is output, so
that a process can interactively read and write from
`cat-file`. With this option, the output uses normal stdio
buffering; this is much more efficient when invoking
- `--batch-check` on a large number of objects.
+ `--batch-check` or `--batch-command` on a large number of objects.
--unordered::
When `--batch-all-objects` is in use, visit objects in an
@@ -194,6 +229,13 @@
the whole line is considered as an object, as if it were fed to
linkgit:git-rev-parse[1].
+When `--batch-command` is given, `cat-file` will read commands from stdin,
+one per line, and print information based on the command given. With
+`--batch-command`, the `info` command followed by an object will print
+information about the object the same way `--batch-check` would, and the
+`contents` command followed by an object prints contents in the same way
+`--batch` would.
+
You can specify the information shown for each object by using a custom
`<format>`. The `<format>` is copied literally to stdout for each
object, with placeholders of the form `%(atom)` expanded, followed by a
@@ -229,9 +271,9 @@
If no format is specified, the default format is `%(objectname)
%(objecttype) %(objectsize)`.
-If `--batch` is specified, the object information is followed by the
-object contents (consisting of `%(objectsize)` bytes), followed by a
-newline.
+If `--batch` is specified, or if `--batch-command` is used with the `contents`
+command, the object information is followed by the object contents (consisting
+of `%(objectsize)` bytes), followed by a newline.
For example, `--batch` without a custom format would produce:
diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt
index 0c3924a..2892799 100644
--- a/Documentation/git-check-ignore.txt
+++ b/Documentation/git-check-ignore.txt
@@ -33,7 +33,7 @@
Instead of printing the paths that are excluded, for each path
that matches an exclude pattern, print the exclude pattern
together with the path. (Matching an exclude pattern usually
- means the path is excluded, but if the pattern begins with '!'
+ means the path is excluded, but if the pattern begins with "`!`"
then it is a negated pattern and matching it means the path is
NOT excluded.)
+
@@ -77,7 +77,7 @@
<pathname> is the path of a file being queried, <pattern> is the
matching pattern, <source> is the pattern's source file, and <linenum>
is the line number of the pattern within that source. If the pattern
-contained a `!` prefix or `/` suffix, it will be preserved in the
+contained a "`!`" prefix or "`/`" suffix, it will be preserved in the
output. <source> will be an absolute path when referring to the file
configured by `core.excludesFile`, or relative to the repository root
when referring to `.git/info/exclude` or a per-directory exclude file.
diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt
index 4d33e7b..01dbd5c 100644
--- a/Documentation/git-checkout-index.txt
+++ b/Documentation/git-checkout-index.txt
@@ -12,6 +12,7 @@
'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
[--stage=<number>|all]
[--temp]
+ [--ignore-skip-worktree-bits]
[-z] [--stdin]
[--] [<file>...]
@@ -37,8 +38,9 @@
-a::
--all::
- checks out all files in the index. Cannot be used
- together with explicit filenames.
+ checks out all files in the index except for those with the
+ skip-worktree bit set (see `--ignore-skip-worktree-bits`).
+ Cannot be used together with explicit filenames.
-n::
--no-create::
@@ -59,6 +61,10 @@
write the content to temporary files. The temporary name
associations will be written to stdout.
+--ignore-skip-worktree-bits::
+ Check out all files, including those with the skip-worktree bit
+ set.
+
--stdin::
Instead of taking list of paths from the command line,
read list of paths from the standard input. Paths are
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index b1a6fe4..9f37e22 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -11,7 +11,7 @@
'git checkout' [-q] [-f] [-m] [<branch>]
'git checkout' [-q] [-f] [-m] --detach [<branch>]
'git checkout' [-q] [-f] [-m] [--detach] <commit>
-'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
+'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new-branch>] [<start-point>]
'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>...
'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]
'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]
@@ -43,7 +43,7 @@
rather expensive side-effects to show only the tracking information,
if exists, for the current branch.
-'git checkout' -b|-B <new_branch> [<start point>]::
+'git checkout' -b|-B <new-branch> [<start-point>]::
Specifying `-b` causes a new branch to be created as if
linkgit:git-branch[1] were called and then checked out. In
@@ -52,11 +52,11 @@
`--track` without `-b` implies branch creation; see the
description of `--track` below.
+
-If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, it
+If `-B` is given, `<new-branch>` is created if it doesn't exist; otherwise, it
is reset. This is the transactional equivalent of
+
------------
-$ git branch -f <branch> [<start point>]
+$ git branch -f <branch> [<start-point>]
$ git checkout <branch>
------------
+
@@ -118,8 +118,9 @@
-f::
--force::
When switching branches, proceed even if the index or the
- working tree differs from `HEAD`. This is used to throw away
- local changes.
+ working tree differs from `HEAD`, and even if there are untracked
+ files in the way. This is used to throw away local changes and
+ any untracked files or directories that are in the way.
+
When checking out paths from the index, do not fail upon unmerged
entries; instead, unmerged entries are ignored.
@@ -144,18 +145,18 @@
on your side branch as `theirs` (i.e. "one contributor's work on top
of it").
--b <new_branch>::
- Create a new branch named `<new_branch>` and start it at
- `<start_point>`; see linkgit:git-branch[1] for details.
+-b <new-branch>::
+ Create a new branch named `<new-branch>` and start it at
+ `<start-point>`; see linkgit:git-branch[1] for details.
--B <new_branch>::
- Creates the branch `<new_branch>` and start it at `<start_point>`;
- if it already exists, then reset it to `<start_point>`. This is
+-B <new-branch>::
+ Creates the branch `<new-branch>` and start it at `<start-point>`;
+ if it already exists, then reset it to `<start-point>`. This is
equivalent to running "git branch" with "-f"; see
linkgit:git-branch[1] for details.
-t::
---track::
+--track[=(direct|inherit)]::
When creating a new branch, set up "upstream" configuration. See
"--track" in linkgit:git-branch[1] for details.
+
@@ -209,16 +210,16 @@
`<commit>` is not a branch name. See the "DETACHED HEAD" section
below for details.
---orphan <new_branch>::
- Create a new 'orphan' branch, named `<new_branch>`, started from
- `<start_point>` and switch to it. The first commit made on this
+--orphan <new-branch>::
+ Create a new 'orphan' branch, named `<new-branch>`, started from
+ `<start-point>` and switch to it. The first commit made on this
new branch will have no parents and it will be the root of a new
history totally disconnected from all the other branches and
commits.
+
The index and the working tree are adjusted as if you had previously run
-`git checkout <start_point>`. This allows you to start a new history
-that records a set of paths similar to `<start_point>` by easily running
+`git checkout <start-point>`. This allows you to start a new history
+that records a set of paths similar to `<start-point>` by easily running
`git commit -a` to make the root commit.
+
This can be useful when you want to publish the tree from a commit
@@ -228,7 +229,7 @@
code.
+
If you want to start a disconnected history that records a set of paths
-that is totally different from the one of `<start_point>`, then you should
+that is totally different from the one of `<start-point>`, then you should
clear the index and the working tree right after creating the orphan
branch by running `git rm -rf .` from the top level of the working tree.
Afterwards you will be ready to prepare your new files, repopulating the
@@ -265,8 +266,7 @@
The same as `--merge` option above, but changes the way the
conflicting hunks are presented, overriding the
`merge.conflictStyle` configuration variable. Possible values are
- "merge" (default) and "diff3" (in addition to what is shown by
- "merge" style, shows the original contents).
+ "merge" (default), "diff3", and "zdiff3".
-p::
--patch::
@@ -340,10 +340,10 @@
merge base of `A` and `B` if there is exactly one merge base. You can
leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
-<new_branch>::
+<new-branch>::
Name for the new branch.
-<start_point>::
+<start-point>::
The name of a commit at which to start the new branch; see
linkgit:git-branch[1] for details. Defaults to `HEAD`.
+
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 5d75031..78dcc91 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -8,7 +8,7 @@
SYNOPSIS
--------
[verse]
-'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
+'git cherry-pick' [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
[-S[<keyid>]] <commit>...
'git cherry-pick' (--continue | --skip | --abort | --quit)
@@ -81,8 +81,8 @@
described above, and `-r` was to disable it. Now the
default is not to do `-x` so this option is a no-op.
--m parent-number::
---mainline parent-number::
+-m <parent-number>::
+--mainline <parent-number>::
Usually you cannot cherry-pick a merge because you do not know which
side of the merge should be considered the mainline. This
option specifies the parent number (starting from 1) of
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 3fe3810..632bd13 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -9,14 +9,14 @@
SYNOPSIS
--------
[verse]
-'git clone' [--template=<template_directory>]
+'git clone' [--template=<template-directory>]
[-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
[-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
- [--dissociate] [--separate-git-dir <git dir>]
+ [--dissociate] [--separate-git-dir <git-dir>]
[--depth <depth>] [--[no-]single-branch] [--no-tags]
[--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
[--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]
- [--filter=<filter>] [--] <repository>
+ [--filter=<filter> [--also-filter-submodules]] [--] <repository>
[<directory>]
DESCRIPTION
@@ -167,10 +167,10 @@
configuration variables are created.
--sparse::
- Initialize the sparse-checkout file so the working
- directory starts with only the files in the root
- of the repository. The sparse-checkout file can be
- modified to grow the working directory as needed.
+ Employ a sparse-checkout, with only files in the toplevel
+ directory initially being present. The
+ linkgit:git-sparse-checkout[1] command can be used to grow the
+ working directory as needed.
--filter=<filter-spec>::
Use the partial clone feature and request that the server sends
@@ -182,6 +182,11 @@
at least `<size>`. For more details on filter specifications, see
the `--filter` option in linkgit:git-rev-list[1].
+--also-filter-submodules::
+ Also apply the partial clone filter to any submodules in the repository.
+ Requires `--filter` and `--recurse-submodules`. This can be turned on by
+ default by setting the `clone.filterSubmodules` config option.
+
--mirror::
Set up a mirror of the source repository. This implies `--bare`.
Compared to `--bare`, `--mirror` not only maps local branches of the
@@ -211,7 +216,7 @@
via ssh, this specifies a non-default path for the command
run on the other end.
---template=<template_directory>::
+--template=<template-directory>::
Specify the directory from which templates will be used;
(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
@@ -294,7 +299,7 @@
superproject's recorded SHA-1. Equivalent to passing `--remote` to
`git submodule update`.
---separate-git-dir=<git dir>::
+--separate-git-dir=<git-dir>::
Instead of placing the cloned repository where it is supposed
to be, place the cloned repository at the specified directory,
then make a filesystem-agnostic Git symbolic link to there.
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 95fec5f..6c60bf9 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -212,8 +212,9 @@
each trailer would appear, and other details.
-n::
---no-verify::
- This option bypasses the pre-commit and commit-msg hooks.
+--[no-]verify::
+ By default, the pre-commit and commit-msg hooks are run.
+ When any of `--no-verify` or `-n` is given, these are bypassed.
See also linkgit:githooks[5].
--allow-empty::
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 992225f..bdcfd94 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -9,20 +9,20 @@
SYNOPSIS
--------
[verse]
-'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] name [value [value-pattern]]
-'git config' [<file-option>] [--type=<type>] --add name value
-'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all name value [value-pattern]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get name [value-pattern]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all name [value-pattern]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp name_regex [value-pattern]
-'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL
-'git config' [<file-option>] [--fixed-value] --unset name [value-pattern]
-'git config' [<file-option>] [--fixed-value] --unset-all name [value-pattern]
-'git config' [<file-option>] --rename-section old_name new_name
-'git config' [<file-option>] --remove-section name
+'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]
+'git config' [<file-option>] [--type=<type>] --add <name> <value>
+'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]
+'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>
+'git config' [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]
+'git config' [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]
+'git config' [<file-option>] --rename-section <old-name> <new-name>
+'git config' [<file-option>] --remove-section <name>
'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list
-'git config' [<file-option>] --get-color name [default]
-'git config' [<file-option>] --get-colorbool name [stdout-is-tty]
+'git config' [<file-option>] --get-color <name> [<default>]
+'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]
'git config' [<file-option>] -e | --edit
DESCRIPTION
@@ -102,9 +102,9 @@
in which section and variable names are lowercased, but subsection
names are not.
---get-urlmatch name URL::
+--get-urlmatch <name> <URL>::
When given a two-part name section.key, the value for
- section.<url>.key whose <url> part matches the best to the
+ section.<URL>.key whose <URL> part matches the best to the
given URL is returned (if no such key exists, the value for
section.key is used as a fallback). When given just the
section as name, do so for all the keys in the section and
@@ -141,12 +141,16 @@
See also <<FILES>>.
--worktree::
- Similar to `--local` except that `.git/config.worktree` is
+ Similar to `--local` except that `$GIT_DIR/config.worktree` is
read from or written to if `extensions.worktreeConfig` is
- present. If not it's the same as `--local`.
+ enabled. If not it's the same as `--local`. Note that `$GIT_DIR`
+ is equal to `$GIT_COMMON_DIR` for the main working tree, but is of
+ the form `$GIT_DIR/worktrees/<id>/` for other working trees. See
+ linkgit:git-worktree[1] to learn how to enable
+ `extensions.worktreeConfig`.
--f config-file::
---file config-file::
+-f <config-file>::
+--file <config-file>::
For writing options: write to the specified file rather than the
repository `.git/config`.
+
@@ -155,7 +159,7 @@
+
See also <<FILES>>.
---blob blob::
+--blob <blob>::
Similar to `--file` but use the given blob instead of a file. E.g.
you can use 'master:.gitmodules' to read values from the file
'.gitmodules' in the master branch. See "SPECIFYING REVISIONS"
@@ -246,18 +250,18 @@
all queried config options with the scope of that value
(local, global, system, command).
---get-colorbool name [stdout-is-tty]::
+--get-colorbool <name> [<stdout-is-tty>]::
- Find the color setting for `name` (e.g. `color.diff`) and output
- "true" or "false". `stdout-is-tty` should be either "true" or
+ Find the color setting for `<name>` (e.g. `color.diff`) and output
+ "true" or "false". `<stdout-is-tty>` should be either "true" or
"false", and is taken into account when configuration says
- "auto". If `stdout-is-tty` is missing, then checks the standard
+ "auto". If `<stdout-is-tty>` is missing, then checks the standard
output of the command itself, and exits with status 0 if color
is to be used, or exits with status 1 otherwise.
When the color setting for `name` is undefined, the command uses
`color.ui` as fallback.
---get-color name [default]::
+--get-color <name> [<default>]::
Find the color configured for `name` (e.g. `color.diff.new`) and
output it as the ANSI color escape sequence to the standard
diff --git a/Documentation/git-credential-cache--daemon.txt b/Documentation/git-credential-cache--daemon.txt
index 7051c6b..01e1c21 100644
--- a/Documentation/git-credential-cache--daemon.txt
+++ b/Documentation/git-credential-cache--daemon.txt
@@ -1,5 +1,5 @@
-git-credential-cache--daemon(1)
-===============================
+git-credential-cache{litdd}daemon(1)
+====================================
NAME
----
@@ -8,7 +8,7 @@
SYNOPSIS
--------
[verse]
-git credential-cache--daemon [--debug] <socket>
+'git credential-cache{litdd}daemon' [--debug] <socket>
DESCRIPTION
-----------
diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt
index 206e3c5..f186730 100644
--- a/Documentation/git-credential.txt
+++ b/Documentation/git-credential.txt
@@ -8,7 +8,7 @@
SYNOPSIS
--------
------------------
-git credential <fill|approve|reject>
+'git credential' (fill|approve|reject)
------------------
DESCRIPTION
diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt
index 00154b6..41c8a8a 100644
--- a/Documentation/git-cvsexportcommit.txt
+++ b/Documentation/git-cvsexportcommit.txt
@@ -9,8 +9,8 @@
SYNOPSIS
--------
[verse]
-'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]
- [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
+'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d <cvsroot>]
+ [-w <cvs-workdir>] [-W] [-f] [-m <msgprefix>] [<parent-commit>] <commit-id>
DESCRIPTION
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index de1ebed..b3f2767 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -11,9 +11,9 @@
[verse]
'git cvsimport' [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>]
[-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>]
- [-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]
- [-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>]
- [-r <remote>] [-R] [<CVS_module>]
+ [-C <git-repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]
+ [-a] [-m] [-M <regex>] [-S <regex>] [-L <commit-limit>]
+ [-r <remote>] [-R] [<CVS-module>]
DESCRIPTION
@@ -59,7 +59,7 @@
from `CVS/Root`. If no such file exists, it checks for the
`CVSROOT` environment variable.
-<CVS_module>::
+<CVS-module>::
The CVS module you want to import. Relative to <CVSROOT>.
If not given, 'git cvsimport' tries to read it from
`CVS/Repository`.
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 906774f..bf1febb 100644
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]
+'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common-diff-options>] [<path>...]
DESCRIPTION
-----------
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index 27acb31..679cae2 100644
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/git-diff-index.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>...]
+'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]
DESCRIPTION
-----------
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 2fc24c5..274d5ea 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -11,7 +11,7 @@
[verse]
'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
[-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]
- [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
+ [<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]
DESCRIPTION
-----------
diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt
index c975884..46747d5 100644
--- a/Documentation/git-fetch-pack.txt
+++ b/Documentation/git-fetch-pack.txt
@@ -101,6 +101,10 @@
current shallow boundary instead of from the tip of each
remote branch history.
+--refetch::
+ Skips negotiating commits with the server in order to fetch all matching
+ objects. Use to reapply a new partial clone blob/tree filter.
+
--no-progress::
Do not show the progress.
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 550c16c..e9d3646 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -287,12 +287,10 @@
BUGS
----
-Using --recurse-submodules can only fetch new commits in already checked
-out submodules right now. When e.g. upstream added a new submodule in the
-just fetched commits of the superproject the submodule itself cannot be
-fetched, making it impossible to check out that submodule later without
-having to do a fetch again. This is expected to be fixed in a future Git
-version.
+Using --recurse-submodules can only fetch new commits in submodules that are
+present locally e.g. in `$GIT_DIR/modules/`. If the upstream adds a new
+submodule, that submodule cannot be fetched until it is cloned e.g. by `git
+submodule update`. This is expected to be fixed in a future Git version.
SEE ALSO
--------
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 6793d8f..6f28812 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log]
+'git fmt-merge-msg' [-m <message>] [--into-name <branch>] [--log[=<n>] | --no-log]
'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file>
DESCRIPTION
@@ -44,6 +44,10 @@
Use <message> instead of the branch names for the first line
of the log message. For use with `--log`.
+--into-name <branch>::
+ Prepare the merge message as if merging to the branch `<branch>`,
+ instead of the name of the real branch to which the merge is made.
+
-F <file>::
--file <file>::
Take the list of merged objects from <file> instead of
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index fe2f69d..be797d7 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -18,7 +18,7 @@
[-n | --numbered | -N | --no-numbered]
[--start-number <n>] [--numbered-files]
[--in-reply-to=<message id>] [--suffix=.<sfx>]
- [--ignore-if-in-upstream]
+ [--ignore-if-in-upstream] [--always]
[--cover-from-description=<mode>]
[--rfc] [--subject-prefix=<subject prefix>]
[(--reroll-count|-v) <n>]
@@ -192,6 +192,10 @@
patches being generated, and any patch that matches is
ignored.
+--always::
+ Include patches for commits that do not introduce any change,
+ which are omitted by default.
+
--cover-from-description=<mode>::
Controls which parts of the cover letter will be automatically
populated using the branch's description.
@@ -689,10 +693,10 @@
for A, B and C, and the identifiers for P, X, Y, Z are appended at the
end of the first message.
-If set `--base=auto` in cmdline, it will track base commit automatically,
-the base commit will be the merge base of tip commit of the remote-tracking
+If set `--base=auto` in cmdline, it will automatically compute
+the base commit as the merge base of tip commit of the remote-tracking
branch and revision-range specified in cmdline.
-For a local branch, you need to track a remote branch by `git branch
+For a local branch, you need to make it to track a remote branch by `git branch
--set-upstream-to` before using this option.
EXAMPLES
diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index bd59661..5088783 100644
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -12,7 +12,7 @@
'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
[--[no-]full] [--strict] [--verbose] [--lost-found]
[--[no-]dangling] [--[no-]progress] [--connectivity-only]
- [--[no-]name-objects] [<object>*]
+ [--[no-]name-objects] [<object>...]
DESCRIPTION
-----------
diff --git a/Documentation/git-fsmonitor--daemon.txt b/Documentation/git-fsmonitor--daemon.txt
new file mode 100644
index 0000000..cc142fb
--- /dev/null
+++ b/Documentation/git-fsmonitor--daemon.txt
@@ -0,0 +1,75 @@
+git-fsmonitor{litdd}daemon(1)
+=============================
+
+NAME
+----
+git-fsmonitor--daemon - A Built-in File System Monitor
+
+SYNOPSIS
+--------
+[verse]
+'git fsmonitor{litdd}daemon' start
+'git fsmonitor{litdd}daemon' run
+'git fsmonitor{litdd}daemon' stop
+'git fsmonitor{litdd}daemon' status
+
+DESCRIPTION
+-----------
+
+A daemon to watch the working directory for file and directory
+changes using platform-specific file system notification facilities.
+
+This daemon communicates directly with commands like `git status`
+using the link:technical/api-simple-ipc.html[simple IPC] interface
+instead of the slower linkgit:githooks[5] interface.
+
+This daemon is built into Git so that no third-party tools are
+required.
+
+OPTIONS
+-------
+
+start::
+ Starts a daemon in the background.
+
+run::
+ Runs a daemon in the foreground.
+
+stop::
+ Stops the daemon running in the current working
+ directory, if present.
+
+status::
+ Exits with zero status if a daemon is watching the
+ current working directory.
+
+REMARKS
+-------
+
+This daemon is a long running process used to watch a single working
+directory and maintain a list of the recently changed files and
+directories. Performance of commands such as `git status` can be
+increased if they just ask for a summary of changes to the working
+directory and can avoid scanning the disk.
+
+When `core.fsmonitor` is set to `true` (see linkgit:git-config[1])
+commands, such as `git status`, will ask the daemon for changes and
+automatically start it (if necessary).
+
+For more information see the "File System Monitor" section in
+linkgit:git-update-index[1].
+
+CAVEATS
+-------
+
+The fsmonitor daemon does not currently know about submodules and does
+not know to filter out file system events that happen within a
+submodule. If fsmonitor daemon is watching a super repo and a file is
+modified within the working directory of a submodule, it will report
+the change (as happening against the super repo). However, the client
+will properly ignore these extra events, so performance may be affected
+but it will not cause an incorrect result.
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 853967d..ba4e677 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -54,6 +54,11 @@
be performed as well.
+--cruft::
+ When expiring unreachable objects, pack them separately into a
+ cruft pack instead of storing the loose objects as loose
+ objects.
+
--prune=<date>::
Prune loose objects older than date (default is 2 weeks ago,
overridable by the config variable `gc.pruneExpire`).
diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt
index c9d7e96..e8f3ccb 100644
--- a/Documentation/git-gui.txt
+++ b/Documentation/git-gui.txt
@@ -8,7 +8,7 @@
SYNOPSIS
--------
[verse]
-'git gui' [<command>] [arguments]
+'git gui' [<command>] [<arguments>]
DESCRIPTION
-----------
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 44fe886..239c68d 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -8,13 +8,15 @@
SYNOPSIS
--------
[verse]
-'git help' [-a|--all [--[no-]verbose]] [-g|--guides]
- [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE]
+'git help' [-a|--all] [--[no-]verbose] [--[no-]external-commands] [--[no-]aliases]
+'git help' [[-i|--info] [-m|--man] [-w|--web]] [<command>|<guide>]
+'git help' [-g|--guides]
+'git help' [-c|--config]
DESCRIPTION
-----------
-With no options and no COMMAND or GUIDE given, the synopsis of the 'git'
+With no options and no '<command>' or '<guide>' given, the synopsis of the 'git'
command and a list of the most commonly used Git commands are printed
on the standard output.
@@ -31,7 +33,7 @@
If an alias is given, git shows the definition of the alias on
standard output. To get the manual page for the aliased command, use
-`git COMMAND --help`.
+`git <command> --help`.
Note that `git --help ...` is identical to `git help ...` because the
former is internally converted into the latter.
@@ -44,8 +46,15 @@
-------
-a::
--all::
- Prints all the available commands on the standard output. This
- option overrides any given command or guide name.
+ Prints all the available commands on the standard output.
+
+--no-external-commands::
+ When used with `--all`, exclude the listing of external "git-*"
+ commands found in the `$PATH`.
+
+--no-aliases::
+ When used with `--all`, exclude the listing of configured
+ aliases.
--verbose::
When used with `--all` print description for all recognized
@@ -58,8 +67,7 @@
-g::
--guides::
- Prints a list of the Git concept guides on the standard output. This
- option overrides any given command or guide name.
+ Prints a list of the Git concept guides on the standard output.
-i::
--info::
diff --git a/Documentation/git-hook.txt b/Documentation/git-hook.txt
new file mode 100644
index 0000000..77c3a8a
--- /dev/null
+++ b/Documentation/git-hook.txt
@@ -0,0 +1,45 @@
+git-hook(1)
+===========
+
+NAME
+----
+git-hook - Run git hooks
+
+SYNOPSIS
+--------
+[verse]
+'git hook' run [--ignore-missing] <hook-name> [-- <hook-args>]
+
+DESCRIPTION
+-----------
+
+A command interface to running git hooks (see linkgit:githooks[5]),
+for use by other scripted git commands.
+
+SUBCOMMANDS
+-----------
+
+run::
+ Run the `<hook-name>` hook. See linkgit:githooks[5] for
+ supported hook names.
++
+
+Any positional arguments to the hook should be passed after a
+mandatory `--` (or `--end-of-options`, see linkgit:gitcli[7]). See
+linkgit:githooks[5] for arguments hooks might expect (if any).
+
+OPTIONS
+-------
+
+--ignore-missing::
+ Ignore any missing hook by quietly returning zero. Used for
+ tools that want to do a blind one-shot run of a hook that may
+ or may not be present.
+
+SEE ALSO
+--------
+linkgit:githooks[5]
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt
index 9fa17b6..319062c 100644
--- a/Documentation/git-http-fetch.txt
+++ b/Documentation/git-http-fetch.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>
+'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>
DESCRIPTION
-----------
diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index ea03a4e..7c6a6dd 100644
--- a/Documentation/git-http-push.txt
+++ b/Documentation/git-http-push.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]
+'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]
DESCRIPTION
-----------
@@ -63,16 +63,15 @@
cannot have a colon in it). A single pattern '<name>' is just a
shorthand for '<name>:<name>'.
-Each pattern pair consists of the source side (before the colon)
-and the destination side (after the colon). The ref to be
-pushed is determined by finding a match that matches the source
-side, and where it is pushed is determined by using the
-destination side.
+Each pattern pair '<src>:<dst>' consists of the source side (before
+the colon) and the destination side (after the colon). The ref to be
+pushed is determined by finding a match that matches the source side,
+and where it is pushed is determined by using the destination side.
- - It is an error if <src> does not match exactly one of the
+ - It is an error if '<src>' does not match exactly one of the
local refs.
- - If <dst> does not match any remote ref, either
+ - If '<dst>' does not match any remote ref, either
* it has to start with "refs/"; <dst> is used as the
destination literally in this case.
diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt
index 1f1e359..4e71c25 100644
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -122,6 +122,14 @@
+
include::object-format-disclaimer.txt[]
+--promisor[=<message>]::
+ Before committing the pack-index, create a .promisor file for this
+ pack. Particularly helpful when writing a promisor pack with --fix-thin
+ since the name of the pack is not final until the pack has been fully
+ written. If a `<message>` is provided, then that content will be
+ written to the .promisor file for future reference. See
+ link:technical/partial-clone.html[partial clone] for more information.
+
NOTES
-----
diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt
index 648a6cd..18bf1a3 100644
--- a/Documentation/git-init-db.txt
+++ b/Documentation/git-init-db.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]
+'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]
DESCRIPTION
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index b611d80..ad921fe 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -9,10 +9,10 @@
SYNOPSIS
--------
[verse]
-'git init' [-q | --quiet] [--bare] [--template=<template_directory>]
- [--separate-git-dir <git dir>] [--object-format=<format>]
+'git init' [-q | --quiet] [--bare] [--template=<template-directory>]
+ [--separate-git-dir <git-dir>] [--object-format=<format>]
[-b <branch-name> | --initial-branch=<branch-name>]
- [--shared[=<permissions>]] [directory]
+ [--shared[=<permissions>]] [<directory>]
DESCRIPTION
@@ -57,12 +57,12 @@
+
include::object-format-disclaimer.txt[]
---template=<template_directory>::
+--template=<template-directory>::
Specify the directory from which templates will be used. (See the "TEMPLATE
DIRECTORY" section below.)
---separate-git-dir=<git dir>::
+--separate-git-dir=<git-dir>::
Instead of initializing the repository as a directory to either `$GIT_DIR` or
`./.git/`, create a text file there containing the path to the actual
@@ -79,7 +79,7 @@
`master`, but this is subject to change in the future; the name can be
customized via the `init.defaultBranch` configuration variable).
---shared[=(false|true|umask|group|all|world|everybody|0xxx)]::
+--shared[=(false|true|umask|group|all|world|everybody|<perm>)]::
Specify that the Git repository is to be shared amongst several users. This
allows users belonging to the same group to push into that
@@ -110,13 +110,16 @@
Same as 'group', but make the repository readable by all users.
-'0xxx'::
+'<perm>'::
-'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will
-override users' umask(2) value (and not only loosen permissions as 'group' and
-'all' does). '0640' will create a repository which is group-readable, but not
-group-writable or accessible to others. '0660' will create a repo that is
-readable and writable to the current user and group, but inaccessible to others.
+'<perm>' is a 3-digit octal number prefixed with `0` and each file
+will have mode '<perm>'. '<perm>' will override users' umask(2)
+value (and not only loosen permissions as 'group' and 'all'
+does). '0640' will create a repository which is group-readable, but
+not group-writable or accessible to others. '0660' will create a repo
+that is readable and writable to the current user and group, but
+inaccessible to others (directories and executable files get their
+`x` bit from the `r` bit for corresponding classes of users).
--
By default, the configuration flag `receive.denyNonFastForwards` is enabled
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 0498e7b..20e87ce 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git log' [<options>] [<revision range>] [[--] <path>...]
+'git log' [<options>] [<revision-range>] [[--] <path>...]
DESCRIPTION
-----------
@@ -81,13 +81,13 @@
include::line-range-options.txt[]
-<revision range>::
+<revision-range>::
Show only commits in the specified revision range. When no
- <revision range> is specified, it defaults to `HEAD` (i.e. the
+ <revision-range> is specified, it defaults to `HEAD` (i.e. the
whole history leading to the current commit). `origin..HEAD`
specifies all the commits reachable from the current commit
(i.e. `HEAD`), but not from `origin`. For a complete list of
- ways to spell <revision range>, see the 'Specifying Ranges'
+ ways to spell <revision-range>, see the 'Specifying Ranges'
section of linkgit:gitrevisions[7].
[--] <path>...::
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 6d11ab5..0dabf3f 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -10,9 +10,9 @@
--------
[verse]
'git ls-files' [-z] [-t] [-v] [-f]
- (--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*
- (-[c|d|o|i|s|u|k|m])*
- [--eol]
+ [-c|--cached] [-d|--deleted] [-o|--others] [-i|--|ignored]
+ [-s|--stage] [-u|--unmerged] [-k|--|killed] [-m|--modified]
+ [--directory [--no-empty-directory]] [--eol]
[--deduplicate]
[-x <pattern>|--exclude=<pattern>]
[-X <file>|--exclude-from=<file>]
@@ -156,7 +156,7 @@
--recurse-submodules::
Recursively calls ls-files on each active submodule in the repository.
- Currently there is only support for the --cached mode.
+ Currently there is only support for the --cached and --stage modes.
--abbrev[=<n>]::
Instead of showing the full 40-byte hexadecimal object
@@ -187,6 +187,11 @@
and in the working tree ("w/<eolinfo>") are shown for regular files,
followed by the ("attr/<eolattr>").
+--sparse::
+ If the index is sparse, show the sparse directories without expanding
+ to the contained files. Sparse directories will be shown with a
+ trailing slash, such as "x/" for a sparse directory "x".
+
\--::
Do not interpret any more arguments as options.
diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index db02d6d..0240adb 100644
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -10,7 +10,7 @@
--------
[verse]
'git ls-tree' [-d] [-r] [-t] [-l] [-z]
- [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]]
+ [--name-only] [--name-status] [--object-only] [--full-name] [--full-tree] [--abbrev[=<n>]] [--format=<format>]
<tree-ish> [<path>...]
DESCRIPTION
@@ -59,6 +59,15 @@
--name-only::
--name-status::
List only filenames (instead of the "long" output), one per line.
+ Cannot be combined with `--object-only`.
+
+--object-only::
+ List only names of the objects, one per line. Cannot be combined
+ with `--name-only` or `--name-status`.
+ This is equivalent to specifying `--format='%(objectname)'`, but
+ for both this option and that exact format the command takes a
+ hand-optimized codepath instead of going through the generic
+ formatting mechanism.
--abbrev[=<n>]::
Instead of showing the full 40-byte hexadecimal object
@@ -74,6 +83,16 @@
Do not limit the listing to the current working directory.
Implies --full-name.
+--format=<format>::
+ A string that interpolates `%(fieldname)` from the result
+ being shown. It also interpolates `%%` to `%`, and
+ `%xx` where `xx` are hex digits interpolates to character
+ with hex code `xx`; for example `%00` interpolates to
+ `\0` (NUL), `%09` to `\t` (TAB) and `%0a` to `\n` (LF).
+ When specified, `--format` cannot be combined with other
+ format-altering options, including `--long`, `--name-only`
+ and `--object-only`.
+
[<path>...]::
When paths are given, show them (note that this isn't really raw
pathnames, but rather a list of patterns to match). Otherwise
@@ -82,16 +101,29 @@
Output Format
-------------
- <mode> SP <type> SP <object> TAB <file>
+
+The output format of `ls-tree` is determined by either the `--format`
+option, or other format-altering options such as `--name-only` etc.
+(see `--format` above).
+
+The use of certain `--format` directives is equivalent to using those
+options, but invoking the full formatting machinery can be slower than
+using an appropriate formatting option.
+
+In cases where the `--format` would exactly map to an existing option
+`ls-tree` will use the appropriate faster path. Thus the default format
+is equivalent to:
+
+ %(objectmode) %(objecttype) %(objectname)%x09%(path)
This output format is compatible with what `--index-info --stdin` of
'git update-index' expects.
When the `-l` option is used, format changes to
- <mode> SP <type> SP <object> SP <object size> TAB <file>
+ %(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)
-Object size identified by <object> is given in bytes, and right-justified
+Object size identified by <objectname> is given in bytes, and right-justified
with minimum width of 7 characters. Object size is given only for blobs
(file) entries; for other entries `-` character is used in place of size.
@@ -100,6 +132,34 @@
(see linkgit:git-config[1]). Using `-z` the filename is output
verbatim and the line is terminated by a NUL byte.
+Customized format:
+
+It is possible to print in a custom format by using the `--format` option,
+which is able to interpolate different fields using a `%(fieldname)` notation.
+For example, if you only care about the "objectname" and "path" fields, you
+can execute with a specific "--format" like
+
+ git ls-tree --format='%(objectname) %(path)' <tree-ish>
+
+FIELD NAMES
+-----------
+
+Various values from structured fields can be used to interpolate
+into the resulting output. For each outputing line, the following
+names can be used:
+
+objectmode::
+ The mode of the object.
+objecttype::
+ The type of the object (`commit`, `blob` or `tree`).
+objectname::
+ The name of the object.
+objectsize[:padded]::
+ The size of a `blob` object ("-" if it's a `commit` or `tree`).
+ It also supports a padded format of size with "%(objectsize:padded)".
+path::
+ The pathname of the object.
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt
index e2cfb68..e56bad2 100644
--- a/Documentation/git-maintenance.txt
+++ b/Documentation/git-maintenance.txt
@@ -10,6 +10,8 @@
--------
[verse]
'git maintenance' run [<options>]
+'git maintenance' start [--scheduler=<scheduler>]
+'git maintenance' (stop|register|unregister)
DESCRIPTION
@@ -29,6 +31,24 @@
SUBCOMMANDS
-----------
+run::
+ Run one or more maintenance tasks. If one or more `--task` options
+ are specified, then those tasks are run in that order. Otherwise,
+ the tasks are determined by which `maintenance.<task>.enabled`
+ config options are true. By default, only `maintenance.gc.enabled`
+ is true.
+
+start::
+ Start running maintenance on the current repository. This performs
+ the same config updates as the `register` subcommand, then updates
+ the background scheduler to run `git maintenance run --scheduled`
+ on an hourly basis.
+
+stop::
+ Halt the background maintenance schedule. The current repository
+ is not removed from the list of maintained repositories, in case
+ the background maintenance is restarted later.
+
register::
Initialize Git config values so any scheduled maintenance will
start running on this repository. This adds the repository to the
@@ -55,24 +75,6 @@
setting `maintenance.auto = false` in the current repository. This config
setting will remain after a `git maintenance unregister` command.
-run::
- Run one or more maintenance tasks. If one or more `--task` options
- are specified, then those tasks are run in that order. Otherwise,
- the tasks are determined by which `maintenance.<task>.enabled`
- config options are true. By default, only `maintenance.gc.enabled`
- is true.
-
-start::
- Start running maintenance on the current repository. This performs
- the same config updates as the `register` subcommand, then updates
- the background scheduler to run `git maintenance run --scheduled`
- on an hourly basis.
-
-stop::
- Halt the background maintenance schedule. The current repository
- is not removed from the list of maintained repositories, in case
- the background maintenance is restarted later.
-
unregister::
Remove the current repository from background maintenance. This
only removes the repository from the configured list. It does not
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index f856032..7e9093f 100644
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -70,6 +70,9 @@
--diff3::
Show conflicts in "diff3" style.
+--zdiff3::
+ Show conflicts in "zdiff3" style.
+
--ours::
--theirs::
--union::
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 2ab84a9..eea56b3 100644
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*)
+'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )
DESCRIPTION
-----------
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index e4f3352..3125473 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -12,7 +12,8 @@
'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
[--[no-]allow-unrelated-histories]
- [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]
+ [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>]
+ [--into-name <branch>] [<commit>...]
'git merge' (--continue | --abort | --quit)
DESCRIPTION
@@ -76,6 +77,11 @@
used to give a good default for automated 'git merge'
invocations. The automated message can include the branch description.
+--into-name <branch>::
+ Prepare the default merge message as if merging to the branch
+ `<branch>`, instead of the name of the real branch to which
+ the merge is made.
+
-F <file>::
--file=<file>::
Read the commit message to be used for the merge commit (in
@@ -240,7 +246,8 @@
------------
Here are lines that are either unchanged from the common
-ancestor, or cleanly resolved because only one side changed.
+ancestor, or cleanly resolved because only one side changed,
+or cleanly resolved because both sides changed the same way.
<<<<<<< yours:sample.txt
Conflict resolution is hard;
let's go shopping.
@@ -261,16 +268,37 @@
other side wants to claim it is easy.
An alternative style can be used by setting the "merge.conflictStyle"
-configuration variable to "diff3". In "diff3" style, the above conflict
-may look like this:
+configuration variable to either "diff3" or "zdiff3". In "diff3"
+style, the above conflict may look like this:
------------
Here are lines that are either unchanged from the common
-ancestor, or cleanly resolved because only one side changed.
+ancestor, or cleanly resolved because only one side changed,
+<<<<<<< yours:sample.txt
+or cleanly resolved because both sides changed the same way.
+Conflict resolution is hard;
+let's go shopping.
+||||||| base:sample.txt
+or cleanly resolved because both sides changed identically.
+Conflict resolution is hard.
+=======
+or cleanly resolved because both sides changed the same way.
+Git makes conflict resolution easy.
+>>>>>>> theirs:sample.txt
+And here is another line that is cleanly resolved or unmodified.
+------------
+
+while in "zdiff3" style, it may look like this:
+
+------------
+Here are lines that are either unchanged from the common
+ancestor, or cleanly resolved because only one side changed,
+or cleanly resolved because both sides changed the same way.
<<<<<<< yours:sample.txt
Conflict resolution is hard;
let's go shopping.
-|||||||
+||||||| base:sample.txt
+or cleanly resolved because both sides changed identically.
Conflict resolution is hard.
=======
Git makes conflict resolution easy.
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index e587c77..f784027 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -101,6 +101,7 @@
CONFIGURATION
-------------
+:git-mergetool: 1
include::config/mergetool.txt[]
TEMPORARY FILES
@@ -113,6 +114,13 @@
causes `git mergetool` to automatically remove the backup as files
are successfully merged.
+BACKEND SPECIFIC HINTS
+----------------------
+
+vimdiff
+~~~~~~~
+include::mergetools/vimdiff.txt[]
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt
index 27fe2b3..76b44f4 100644
--- a/Documentation/git-mktree.txt
+++ b/Documentation/git-mktree.txt
@@ -31,7 +31,7 @@
--batch::
Allow building of more than one tree object before exiting. Each
- tree is separated by as single blank line. The final new-line is
+ tree is separated by a single blank line. The final new-line is
optional. Note - if the `-z` option is used, lines are terminated
with NUL.
diff --git a/Documentation/git-multi-pack-index.txt b/Documentation/git-multi-pack-index.txt
index 3b0b55c..c588fb9 100644
--- a/Documentation/git-multi-pack-index.txt
+++ b/Documentation/git-multi-pack-index.txt
@@ -45,6 +45,25 @@
--[no-]bitmap::
Control whether or not a multi-pack bitmap is written.
+
+ --stdin-packs::
+ Write a multi-pack index containing only the set of
+ line-delimited pack index basenames provided over stdin.
+
+ --refs-snapshot=<path>::
+ With `--bitmap`, optionally specify a file which
+ contains a "refs snapshot" taken prior to repacking.
++
+A reference snapshot is composed of line-delimited OIDs corresponding to
+the reference tips, usually taken by `git repack` prior to generating a
+new pack. A line may optionally start with a `+` character to indicate
+that the reference which corresponds to that OID is "preferred" (see
+linkgit:git-config[1]'s `pack.preferBitmapTips`.)
++
+The file given at `<path>` is expected to be readable, and can contain
+duplicates. (If a given OID is given more than once, it is marked as
+preferred if at least one instance of it begins with the special `+`
+marker).
--
verify::
@@ -80,13 +99,13 @@
EXAMPLES
--------
-* Write a MIDX file for the packfiles in the current .git folder.
+* Write a MIDX file for the packfiles in the current `.git` directory.
+
-----------------------------------------------
$ git multi-pack-index write
-----------------------------------------------
-* Write a MIDX file for the packfiles in the current .git folder with a
+* Write a MIDX file for the packfiles in the current `.git` directory with a
corresponding bitmap.
+
-------------------------------------------------------------
@@ -99,7 +118,7 @@
$ git multi-pack-index --object-dir <alt> write
-----------------------------------------------
-* Verify the MIDX file for the packfiles in the current .git folder.
+* Verify the MIDX file for the packfiles in the current `.git` directory.
+
-----------------------------------------------
$ git multi-pack-index verify
diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt
index 5cb0eb0..ec8a27c 100644
--- a/Documentation/git-name-rev.txt
+++ b/Documentation/git-name-rev.txt
@@ -42,11 +42,37 @@
--all::
List all commits reachable from all refs
---stdin::
+--annotate-stdin::
Transform stdin by substituting all the 40-character SHA-1
hexes (say $hex) with "$hex ($rev_name)". When used with
--name-only, substitute with "$rev_name", omitting $hex
- altogether. Intended for the scripter's use.
+ altogether.
++
+For example:
++
+-----------
+$ cat sample.txt
+
+An abbreviated revision 2ae0a9cb82 will not be substituted.
+The full name after substitution is 2ae0a9cb8298185a94e5998086f380a355dd8907,
+while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad
+
+$ git name-rev --annotate-stdin <sample.txt
+
+An abbreviated revision 2ae0a9cb82 will not be substituted.
+The full name after substitution is 2ae0a9cb8298185a94e5998086f380a355dd8907 (master),
+while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad
+
+$ git name-rev --name-only --annotate-stdin <sample.txt
+
+An abbreviated revision 2ae0a9cb82 will not be substituted.
+The full name after substitution is master,
+while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad
+-----------
+
+--stdin::
+ This option is deprecated in favor of 'git name-rev --annotate-stdin'.
+ They are functionally equivalent.
--name-only::
Instead of printing both the SHA-1 and the name, print only
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 38e5257..de5ee67 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -9,10 +9,10 @@
SYNOPSIS
--------
[verse]
-'git p4 clone' [<sync options>] [<clone options>] <p4 depot path>...
-'git p4 sync' [<sync options>] [<p4 depot path>...]
+'git p4 clone' [<sync-options>] [<clone-options>] <p4-depot-path>...
+'git p4 sync' [<sync-options>] [<p4-depot-path>...]
'git p4 rebase'
-'git p4 submit' [<submit options>] [<master branch name>]
+'git p4 submit' [<submit-options>] [<master-branch-name>]
DESCRIPTION
@@ -361,7 +361,7 @@
p4/master. See the "Sync options" section above for more
information.
---commit <sha1>|<sha1..sha1>::
+--commit (<sha1>|<sha1>..<sha1>)::
Submit only the specified commit or range of commits, instead of the full
list of changes that are in the current Git branch.
@@ -636,7 +636,42 @@
Git expects paths encoded as UTF-8. Use this config to tell git-p4
what encoding Perforce had used for the paths. This encoding is used
to transcode the paths to UTF-8. As an example, Perforce on Windows
- often uses "cp1252" to encode path names.
+ often uses "cp1252" to encode path names. If this option is passed
+ into a p4 clone request, it is persisted in the resulting new git
+ repo.
+
+git-p4.metadataDecodingStrategy::
+ Perforce keeps the encoding of a changelist descriptions and user
+ full names as stored by the client on a given OS. The p4v client
+ uses the OS-local encoding, and so different users can end up storing
+ different changelist descriptions or user full names in different
+ encodings, in the same depot.
+ Git tolerates inconsistent/incorrect encodings in commit messages
+ and author names, but expects them to be specified in utf-8.
+ git-p4 can use three different decoding strategies in handling the
+ encoding uncertainty in Perforce: 'passthrough' simply passes the
+ original bytes through from Perforce to git, creating usable but
+ incorrectly-encoded data when the Perforce data is encoded as
+ anything other than utf-8. 'strict' expects the Perforce data to be
+ encoded as utf-8, and fails to import when this is not true.
+ 'fallback' attempts to interpret the data as utf-8, and otherwise
+ falls back to using a secondary encoding - by default the common
+ windows encoding 'cp-1252' - with upper-range bytes escaped if
+ decoding with the fallback encoding also fails.
+ Under python2 the default strategy is 'passthrough' for historical
+ reasons, and under python3 the default is 'fallback'.
+ When 'strict' is selected and decoding fails, the error message will
+ propose changing this config parameter as a workaround. If this
+ option is passed into a p4 clone request, it is persisted into the
+ resulting new git repo.
+
+git-p4.metadataFallbackEncoding::
+ Specify the fallback encoding to use when decoding Perforce author
+ names and changelists descriptions using the 'fallback' strategy
+ (see git-p4.metadataDecodingStrategy). The fallback encoding will
+ only be used when decoding as utf-8 fails. This option defaults to
+ cp1252, a common windows encoding. If this option is passed into a
+ p4 clone request, it is persisted into the resulting new git repo.
git-p4.largeFileSystem::
Specify the system that is used for large (binary) files. Please note
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index dbfd1f9..a9995a9 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -13,8 +13,9 @@
[--no-reuse-delta] [--delta-base-offset] [--non-empty]
[--local] [--incremental] [--window=<n>] [--depth=<n>]
[--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
- [--stdout [--filter=<filter-spec>] | base-name]
- [--shallow] [--keep-true-parents] [--[no-]sparse] < object-list
+ [--cruft] [--cruft-expiration=<time>]
+ [--stdout [--filter=<filter-spec>] | <base-name>]
+ [--shallow] [--keep-true-parents] [--[no-]sparse] < <object-list>
DESCRIPTION
@@ -95,6 +96,35 @@
Incompatible with `--revs`, or options that imply `--revs` (such as
`--all`), with the exception of `--unpacked`, which is compatible.
+--cruft::
+ Packs unreachable objects into a separate "cruft" pack, denoted
+ by the existence of a `.mtimes` file. Typically used by `git
+ repack --cruft`. Callers provide a list of pack names and
+ indicate which packs will remain in the repository, along with
+ which packs will be deleted (indicated by the `-` prefix). The
+ contents of the cruft pack are all objects not contained in the
+ surviving packs which have not exceeded the grace period (see
+ `--cruft-expiration` below), or which have exceeded the grace
+ period, but are reachable from an other object which hasn't.
++
+When the input lists a pack containing all reachable objects (and lists
+all other packs as pending deletion), the corresponding cruft pack will
+contain all unreachable objects (with mtime newer than the
+`--cruft-expiration`) along with any unreachable objects whose mtime is
+older than the `--cruft-expiration`, but are reachable from an
+unreachable object whose mtime is newer than the `--cruft-expiration`).
++
+Incompatible with `--unpack-unreachable`, `--keep-unreachable`,
+`--pack-loose-unreachable`, `--stdin-packs`, as well as any other
+options which imply `--revs`. Also incompatible with `--max-pack-size`;
+when this option is set, the maximum pack size is not inferred from
+`pack.packSizeLimit`.
+
+--cruft-expiration=<approxidate>::
+ If specified, objects are eliminated from the cruft pack if they
+ have an mtime older than `<approxidate>`. If unspecified (and
+ given `--cruft`), then no objects are eliminated.
+
--window=<n>::
--depth=<n>::
These two options affect how the objects contained in
diff --git a/Documentation/git-pack-redundant.txt b/Documentation/git-pack-redundant.txt
index f2869da..ee7034b 100644
--- a/Documentation/git-pack-redundant.txt
+++ b/Documentation/git-pack-redundant.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >
+'git pack-redundant' [ --verbose ] [ --alt-odb ] ( --all | <pack-filename>... )
DESCRIPTION
-----------
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index aef757e..0e14f8b 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -105,7 +105,7 @@
include::merge-options.txt[]
-r::
---rebase[=false|true|merges|preserve|interactive]::
+--rebase[=false|true|merges|interactive]::
When true, rebase the current branch on top of the upstream
branch after fetching. If there is a remote-tracking branch
corresponding to the upstream branch and the upstream branch
@@ -116,10 +116,6 @@
the local merge commits are included in the rebase (see
linkgit:git-rebase[1] for details).
+
-When set to `preserve` (deprecated in favor of `merges`), rebase with the
-`--preserve-merges` option passed to `git rebase` so that locally created
-merge commits will not be flattened.
-+
When false, merge the upstream branch into the current branch.
+
When `interactive`, enable the interactive mode of rebase.
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 5fa8bab..b9bfdc0 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -10,8 +10,7 @@
--------
[verse]
'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>]
- [-u [--exclude-per-directory=<gitignore>] | -i]]
- [--index-output=<file>] [--no-sparse-checkout]
+ [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]
(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])
@@ -39,8 +38,9 @@
--reset::
Same as -m, except that unmerged entries are discarded instead
- of failing. When used with `-u`, updates leading to loss of
- working tree changes will not abort the operation.
+ of failing. When used with `-u`, updates leading to loss of
+ working tree changes or untracked files or directories will not
+ abort the operation.
-u::
After a successful merge, update the files in the work
@@ -88,21 +88,6 @@
The command will refuse to overwrite entries that already
existed in the original index file.
---exclude-per-directory=<gitignore>::
- When running the command with `-u` and `-m` options, the
- merge result may need to overwrite paths that are not
- tracked in the current branch. The command usually
- refuses to proceed with the merge to avoid losing such a
- path. However this safety valve sometimes gets in the
- way. For example, it often happens that the other
- branch added a file that used to be a generated file in
- your branch, and the safety valve triggers when you try
- to switch to that branch after you ran `make` but before
- running `make clean` to remove the generated file. This
- option tells the command to read per-directory exclude
- file (usually '.gitignore') and allows such an untracked
- but explicitly ignored file to be overwritten.
-
--index-output=<file>::
Instead of writing the results out to `$GIT_INDEX_FILE`,
write the resulting index in the named file. While the
@@ -390,9 +375,17 @@
SPARSE CHECKOUT
---------------
+Note: The skip-worktree capabilities in linkgit:git-update-index[1]
+and `read-tree` predated the introduction of
+linkgit:git-sparse-checkout[1]. Users are encouraged to use the
+`sparse-checkout` command in preference to these plumbing commands for
+sparse-checkout/skip-worktree related needs. However, the information
+below might be useful to users trying to understand the pattern style
+used in non-cone mode of the `sparse-checkout` command.
+
"Sparse checkout" allows populating the working directory sparsely.
-It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell
-Git whether a file in the working directory is worth looking at.
+It uses the skip-worktree bit (see linkgit:git-update-index[1]) to
+tell Git whether a file in the working directory is worth looking at.
'git read-tree' and other merge-based commands ('git merge', 'git
checkout'...) can help maintaining the skip-worktree bitmap and working
@@ -400,7 +393,8 @@
define the skip-worktree reference bitmap. When 'git read-tree' needs
to update the working directory, it resets the skip-worktree bit in the index
based on this file, which uses the same syntax as .gitignore files.
-If an entry matches a pattern in this file, skip-worktree will not be
+If an entry matches a pattern in this file, or the entry corresponds to
+a file present in the working tree, then skip-worktree will not be
set on that entry. Otherwise, skip-worktree will be set.
Then it compares the new skip-worktree value with the previous one. If
@@ -435,8 +429,8 @@
SEE ALSO
--------
-linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
-linkgit:gitignore[5]; linkgit:git-sparse-checkout[1];
+linkgit:git-write-tree[1], linkgit:git-ls-files[1],
+linkgit:gitignore[5], linkgit:git-sparse-checkout[1]
GIT
---
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index c116dbf..262fb01 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -215,9 +215,10 @@
--keep-base::
Set the starting point at which to create the new commits to the
- merge base of <upstream> <branch>. Running
+ merge base of <upstream> and <branch>. Running
'git rebase --keep-base <upstream> <branch>' is equivalent to
- running 'git rebase --onto <upstream>... <upstream>'.
+ running
+ 'git rebase --onto <upstream>...<branch> <upstream> <branch>'.
+
This option is useful in the case where one is developing a feature on
top of an upstream branch. While the feature is being worked on, the
@@ -527,29 +528,12 @@
the `rebase-cousins` mode is turned on, such commits are instead rebased
onto `<upstream>` (or `<onto>`, if specified).
+
-The `--rebase-merges` mode is similar in spirit to the deprecated
-`--preserve-merges` but works with interactive rebases,
-where commits can be reordered, inserted and dropped at will.
-+
It is currently only possible to recreate the merge commits using the
`ort` merge strategy; different merge strategies can be used only via
explicit `exec git merge -s <strategy> [...]` commands.
+
See also REBASING MERGES and INCOMPATIBLE OPTIONS below.
--p::
---preserve-merges::
- [DEPRECATED: use `--rebase-merges` instead] Recreate merge commits
- instead of flattening the history by replaying commits a merge commit
- introduces. Merge conflict resolutions or manual amendments to merge
- commits are not preserved.
-+
-This uses the `--interactive` machinery internally, but combining it
-with the `--interactive` option explicitly is generally not a good
-idea unless you know what you are doing (see BUGS below).
-+
-See also INCOMPATIBLE OPTIONS below.
-
-x <cmd>::
--exec <cmd>::
Append "exec <cmd>" after each line creating a commit in the
@@ -581,9 +565,6 @@
the root commit(s) on a branch. When used with --onto, it
will skip changes already contained in <newbase> (instead of
<upstream>) whereas without --onto it will operate on every change.
- When used together with both --onto and --preserve-merges,
- 'all' root commits will be rewritten to have <newbase> as parent
- instead.
+
See also INCOMPATIBLE OPTIONS below.
@@ -645,7 +626,6 @@
* --allow-empty-message
* --[no-]autosquash
* --rebase-merges
- * --preserve-merges
* --interactive
* --exec
* --no-keep-empty
@@ -656,13 +636,6 @@
In addition, the following pairs of options are incompatible:
- * --preserve-merges and --interactive
- * --preserve-merges and --signoff
- * --preserve-merges and --rebase-merges
- * --preserve-merges and --empty=
- * --preserve-merges and --ignore-whitespace
- * --preserve-merges and --committer-date-is-author-date
- * --preserve-merges and --ignore-date
* --keep-base and --onto
* --keep-base and --root
* --fork-point and --root
@@ -742,9 +715,9 @@
generates new fake commits based off limited information in the
generated patches), those commits cannot be identified; instead it has
to fall back to a commit summary. Also, when merge.conflictStyle is
-set to diff3, the apply backend will use "constructed merge base" to
-label the content from the merge base, and thus provide no information
-about the merge base commit whatsoever.
+set to diff3 or zdiff3, the apply backend will use "constructed merge
+base" to label the content from the merge base, and thus provide no
+information about the merge base commit whatsoever.
The merge backend works with the full commits on both sides of history
and thus has no such limitations.
@@ -1280,29 +1253,6 @@
include::config/rebase.txt[]
include::config/sequencer.txt[]
-BUGS
-----
-The todo list presented by the deprecated `--preserve-merges --interactive`
-does not represent the topology of the revision graph (use `--rebase-merges`
-instead). Editing commits and rewording their commit messages should work
-fine, but attempts to reorder commits tend to produce counterintuitive results.
-Use `--rebase-merges` in such scenarios instead.
-
-For example, an attempt to rearrange
-------------
-1 --- 2 --- 3 --- 4 --- 5
-------------
-to
-------------
-1 --- 2 --- 4 --- 3 --- 5
-------------
-by moving the "pick 4" line will result in the following history:
-------------
- 3
- /
-1 --- 2 --- 4 --- 5
-------------
-
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt
index ff487ff..5ced7ad 100644
--- a/Documentation/git-reflog.txt
+++ b/Documentation/git-reflog.txt
@@ -17,12 +17,12 @@
depending on the subcommand:
[verse]
-'git reflog' ['show'] [log-options] [<ref>]
+'git reflog' ['show'] [<log-options>] [<ref>]
'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]
[--rewrite] [--updateref] [--stale-fix]
[--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]
'git reflog delete' [--rewrite] [--updateref]
- [--dry-run | -n] [--verbose] ref@\{specifier\}...
+ [--dry-run | -n] [--verbose] <ref>@\{<specifier>\}...
'git reflog exists' <ref>
Reference logs, or "reflogs", record when the tips of branches and
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 31c29c9..1dec314 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -10,15 +10,15 @@
--------
[verse]
'git remote' [-v | --verbose]
-'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>
-'git remote rename' <old> <new>
+'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>
+'git remote rename' [--[no-]progress] <old> <new>
'git remote remove' <name>
'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)
'git remote set-branches' [--add] <name> <branch>...
'git remote get-url' [--push] [--all] <name>
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
'git remote set-url --add' [--push] <name> <newurl>
-'git remote set-url --delete' [--push] <name> <url>
+'git remote set-url --delete' [--push] <name> <URL>
'git remote' [-v | --verbose] 'show' [-n] <name>...
'git remote prune' [-n | --dry-run] <name>...
'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]
@@ -35,6 +35,8 @@
-v::
--verbose::
Be a little more verbose and show remote url after name.
+ For promisor remotes, also show which filter (`blob:none` etc.)
+ are configured.
NOTE: This must be placed between `remote` and subcommand.
@@ -47,7 +49,7 @@
'add'::
Add a remote named <name> for the repository at
-<url>. The command `git fetch <name>` can then be used to create and
+<URL>. The command `git fetch <name>` can then be used to create and
update remote-tracking branches <name>/<branch>.
+
With `-f` option, `git fetch <name>` is run immediately after
@@ -152,7 +154,7 @@
With `--add`, instead of changing existing URLs, new URL is added.
+
With `--delete`, instead of changing existing URLs, all URLs matching
-regex <url> are deleted for remote <name>. Trying to delete all
+regex <URL> are deleted for remote <name>. Trying to delete all
non-push URLs is an error.
+
Note that the push URL and the fetch URL, even though they can
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 24c00c9..0bf1389 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]
+'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]
DESCRIPTION
-----------
@@ -63,6 +63,17 @@
Also run 'git prune-packed' to remove redundant
loose object files.
+--cruft::
+ Same as `-a`, unless `-d` is used. Then any unreachable objects
+ are packed into a separate cruft pack. Unreachable objects can
+ be pruned using the normal expiry rules with the next `git gc`
+ invocation (see linkgit:git-gc[1]). Incompatible with `-k`.
+
+--cruft-expiration=<approxidate>::
+ Expire unreachable objects older than `<approxidate>`
+ immediately instead of waiting for the next `git gc` invocation.
+ Only useful with `--cruft -d`.
+
-l::
Pass the `--local` option to 'git pack-objects'. See
linkgit:git-pack-objects[1].
@@ -76,8 +87,9 @@
linkgit:git-pack-objects[1].
-q::
- Pass the `-q` option to 'git pack-objects'. See
- linkgit:git-pack-objects[1].
+--quiet::
+ Show no progress over the standard error stream and pass the `-q`
+ option to 'git pack-objects'. See linkgit:git-pack-objects[1].
-n::
Do not update the server information with
@@ -128,10 +140,11 @@
-b::
--write-bitmap-index::
Write a reachability bitmap index as part of the repack. This
- only makes sense when used with `-a` or `-A`, as the bitmaps
+ only makes sense when used with `-a`, `-A` or `-m`, as the bitmaps
must be able to refer to all reachable objects. This option
- overrides the setting of `repack.writeBitmaps`. This option
- has no effect if multiple packfiles are created.
+ overrides the setting of `repack.writeBitmaps`. This option
+ has no effect if multiple packfiles are created, unless writing a
+ MIDX (in which case a multi-pack bitmap is created).
--pack-kept-objects::
Include objects in `.keep` files when repacking. Note that we
@@ -189,6 +202,15 @@
to change in the future. This option (implying a drastically different
repack mode) is not guaranteed to work with all other combinations of
option to `git repack`.
++
+When writing a multi-pack bitmap, `git repack` selects the largest resulting
+pack as the preferred pack for object selection by the MIDX (see
+linkgit:git-multi-pack-index[1]).
+
+-m::
+--write-midx::
+ Write a multi-pack index (see linkgit:git-multi-pack-index[1])
+ containing the non-redundant packs.
CONFIGURATION
-------------
diff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.txt
index 4d4392d..fa5a426 100644
--- a/Documentation/git-request-pull.txt
+++ b/Documentation/git-request-pull.txt
@@ -8,7 +8,7 @@
SYNOPSIS
--------
[verse]
-'git request-pull' [-p] <start> <url> [<end>]
+'git request-pull' [-p] <start> <URL> [<end>]
DESCRIPTION
-----------
@@ -21,7 +21,7 @@
The upstream project is expected to have the commit named by
`<start>` and the output asks it to integrate the changes you made
since that commit, up to the commit named by `<end>`, by visiting
-the repository named by `<url>`.
+the repository named by `<URL>`.
OPTIONS
@@ -33,14 +33,14 @@
Commit to start at. This names a commit that is already in
the upstream history.
-<url>::
+<URL>::
The repository URL to be pulled from.
<end>::
Commit to end at (defaults to HEAD). This names the commit
at the tip of the history you are asking to be pulled.
+
-When the repository named by `<url>` has the commit at a tip of a
+When the repository named by `<URL>` has the commit at a tip of a
ref that is different from the ref you have locally, you can use the
`<local>:<remote>` syntax, to have its local name, a colon `:`, and
its remote name.
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 252e2d4..01cb4c9 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -69,7 +69,8 @@
--hard::
Resets the index and working tree. Any changes to tracked files in the
- working tree since `<commit>` are discarded.
+ working tree since `<commit>` are discarded. Any untracked files or
+ directories in the way of writing any tracked files are simply deleted.
--merge::
Resets the index and updates the files in the working tree that are
@@ -104,10 +105,11 @@
-q::
--quiet::
---no-quiet::
- Be quiet, only report errors. The default behavior is set by the
- `reset.quiet` config option. `--quiet` and `--no-quiet` will
- override the default behavior.
+ Be quiet, only report errors.
+
+--refresh::
+--no-refresh::
+ Refresh the index after a mixed reset. Enabled by default.
--pathspec-from-file=<file>::
Pathspec is passed in `<file>` instead of commandline args. If
diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
index 55bde91..5964810 100644
--- a/Documentation/git-restore.txt
+++ b/Documentation/git-restore.txt
@@ -92,8 +92,7 @@
The same as `--merge` option above, but changes the way the
conflicting hunks are presented, overriding the
`merge.conflictStyle` configuration variable. Possible values
- are "merge" (default) and "diff3" (in addition to what is
- shown by "merge" style, shows the original contents).
+ are "merge" (default), "diff3", and "zdiff3".
--ignore-unmerged::
When restoring files on the working tree from the index, do
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 26e9b28..81bc23f 100644
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -72,6 +72,12 @@
--ignore-unmatch::
Exit with a zero status even if no files matched.
+--sparse::
+ Allow updating index entries outside of the sparse-checkout cone.
+ Normally, `git rm` refuses to update index entries whose paths do
+ not fit within the sparse-checkout cone. See
+ linkgit:git-sparse-checkout[1] for more.
+
-q::
--quiet::
`git rm` normally outputs one line (in the form of an `rm` command)
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 3db4eab..41cd8cb 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -9,7 +9,8 @@
SYNOPSIS
--------
[verse]
-'git send-email' [<options>] <file|directory|rev-list options>...
+'git send-email' [<options>] <file|directory>...
+'git send-email' [<options>] <format-patch options>
'git send-email' --dump-aliases
@@ -19,7 +20,8 @@
Patches can be specified as files, directories (which will send all
files in the directory), or directly as a revision list. In the
last case, any format accepted by linkgit:git-format-patch[1] can
-be passed to git send-email.
+be passed to git send-email, as well as options understood by
+linkgit:git-format-patch[1].
The header of the email is configurable via command-line options. If not
specified on the command line, the user will be prompted with a ReadLine
diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index 44fd146..be41f11 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -9,10 +9,10 @@
SYNOPSIS
--------
[verse]
-'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>]
+'git send-pack' [--dry-run] [--force] [--receive-pack=<git-receive-pack>]
[--verbose] [--thin] [--atomic]
[--[no-]signed|--signed=(true|false|if-asked)]
- [<host>:]<directory> [<ref>...]
+ [<host>:]<directory> (--all | <ref>...)
DESCRIPTION
-----------
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index c9c7f30..f64e770 100644
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -8,7 +8,7 @@
SYNOPSIS
--------
[verse]
-'git shortlog' [<options>] [<revision range>] [[--] <path>...]
+'git shortlog' [<options>] [<revision-range>] [[--] <path>...]
git log --pretty=short | 'git shortlog' [<options>]
DESCRIPTION
@@ -89,13 +89,13 @@
If width is `0` (zero) then indent the lines of the output without wrapping
them.
-<revision range>::
+<revision-range>::
Show only commits in the specified revision range. When no
- <revision range> is specified, it defaults to `HEAD` (i.e. the
+ <revision-range> is specified, it defaults to `HEAD` (i.e. the
whole history leading to the current commit). `origin..HEAD`
specifies all the commits reachable from the current commit
(i.e. `HEAD`), but not from `origin`. For a complete list of
- ways to spell <revision range>, see the "Specifying Ranges"
+ ways to spell <revision-range>, see the "Specifying Ranges"
section of linkgit:gitrevisions[7].
[--] <path>...::
diff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.txt
index 42056ee..3776705 100644
--- a/Documentation/git-sparse-checkout.txt
+++ b/Documentation/git-sparse-checkout.txt
@@ -3,22 +3,32 @@
NAME
----
-git-sparse-checkout - Initialize and modify the sparse-checkout
-configuration, which reduces the checkout to a set of paths
-given by a list of patterns.
+git-sparse-checkout - Reduce your working tree to a subset of tracked files
SYNOPSIS
--------
[verse]
-'git sparse-checkout <subcommand> [options]'
+'git sparse-checkout <subcommand> [<options>]'
DESCRIPTION
-----------
-Initialize and modify the sparse-checkout configuration, which reduces
-the checkout to a set of paths given by a list of patterns.
+This command is used to create sparse checkouts, which change the
+working tree from having all tracked files present to only having a
+subset of those files. It can also switch which subset of files are
+present, or undo and go back to having all tracked files present in
+the working copy.
+
+The subset of files is chosen by providing a list of directories in
+cone mode (the default), or by providing a list of patterns in
+non-cone mode.
+
+When in a sparse-checkout, other Git commands behave a bit differently.
+For example, switching branches will not update paths outside the
+sparse-checkout directories/patterns, and `git commit -a` will not record
+paths outside the sparse-checkout directories/patterns as deleted.
THIS COMMAND IS EXPERIMENTAL. ITS BEHAVIOR, AND THE BEHAVIOR OF OTHER
COMMANDS IN THE PRESENCE OF SPARSE-CHECKOUTS, WILL LIKELY CHANGE IN
@@ -28,30 +38,50 @@
COMMANDS
--------
'list'::
- Describe the patterns in the sparse-checkout file.
+ Describe the directories or patterns in the sparse-checkout file.
-'init'::
- Enable the `core.sparseCheckout` setting. If the
- sparse-checkout file does not exist, then populate it with
- patterns that match every file in the root directory and
- no other directories, then will remove all directories tracked
- by Git. Add patterns to the sparse-checkout file to
- repopulate the working directory.
+'set'::
+ Enable the necessary sparse-checkout config settings
+ (`core.sparseCheckout`, `core.sparseCheckoutCone`, and
+ `index.sparse`) if they are not already set to the desired values,
+ populate the sparse-checkout file from the list of arguments
+ following the 'set' subcommand, and update the working directory to
+ match.
+
-To avoid interfering with other worktrees, it first enables the
-`extensions.worktreeConfig` setting and makes sure to set the
-`core.sparseCheckout` setting in the worktree-specific config file.
+To ensure that adjusting the sparse-checkout settings within a worktree
+does not alter the sparse-checkout settings in other worktrees, the 'set'
+subcommand will upgrade your repository config to use worktree-specific
+config if not already present. The sparsity defined by the arguments to
+the 'set' subcommand are stored in the worktree-specific sparse-checkout
+file. See linkgit:git-worktree[1] and the documentation of
+`extensions.worktreeConfig` in linkgit:git-config[1] for more details.
+
-When `--cone` is provided, the `core.sparseCheckoutCone` setting is
-also set, allowing for better performance with a limited set of
-patterns (see 'CONE PATTERN SET' below).
+When the `--stdin` option is provided, the directories or patterns are
+read from standard in as a newline-delimited list instead of from the
+arguments.
+
-Use the `--[no-]sparse-index` option to toggle the use of the sparse
-index format. This reduces the size of the index to be more closely
-aligned with your sparse-checkout definition. This can have significant
-performance advantages for commands such as `git status` or `git add`.
-This feature is still experimental. Some commands might be slower with
-a sparse index until they are properly integrated with the feature.
+By default, the input list is considered a list of directories, matching
+the output of `git ls-tree -d --name-only`. This includes interpreting
+pathnames that begin with a double quote (") as C-style quoted strings.
+Note that all files under the specified directories (at any depth) will
+be included in the sparse checkout, as well as files that are siblings
+of either the given directory or any of its ancestors (see 'CONE PATTERN
+SET' below for more details). In the past, this was not the default,
+and `--cone` needed to be specified or `core.sparseCheckoutCone` needed
+to be enabled.
++
+When `--no-cone` is passed, the input list is considered a list of
+patterns. This mode has a number of drawbacks, including not working
+with some options like `--sparse-index`. As explained in the
+"Non-cone Problems" section below, we do not recommend using it.
++
+Use the `--[no-]sparse-index` option to use a sparse index (the
+default is to not use it). A sparse index reduces the size of the
+index to be more closely aligned with your sparse-checkout
+definition. This can have significant performance advantages for
+commands such as `git status` or `git add`. This feature is still
+experimental. Some commands might be slower with a sparse index until
+they are properly integrated with the feature.
+
**WARNING:** Using a sparse index requires modifying the index in a way
that is not completely understood by external tools. If you have trouble
@@ -60,29 +90,11 @@
understand the sparse directory entries index extension and may fail to
interact with your repository until it is disabled.
-'set'::
- Write a set of patterns to the sparse-checkout file, as given as
- a list of arguments following the 'set' subcommand. Update the
- working directory to match the new patterns. Enable the
- core.sparseCheckout config setting if it is not already enabled.
-+
-When the `--stdin` option is provided, the patterns are read from
-standard in as a newline-delimited list instead of from the arguments.
-+
-When `core.sparseCheckoutCone` is enabled, the input list is considered a
-list of directories instead of sparse-checkout patterns. The command writes
-patterns to the sparse-checkout file to include all files contained in those
-directories (recursively) as well as files that are siblings of ancestor
-directories. The input format matches the output of `git ls-tree --name-only`.
-This includes interpreting pathnames that begin with a double quote (") as
-C-style quoted strings.
-
'add'::
- Update the sparse-checkout file to include additional patterns.
- By default, these patterns are read from the command-line arguments,
- but they can be read from stdin using the `--stdin` option. When
- `core.sparseCheckoutCone` is enabled, the given patterns are interpreted
- as directory names as in the 'set' subcommand.
+ Update the sparse-checkout file to include additional directories
+ (in cone mode) or patterns (in non-cone mode). By default, these
+ directories or patterns are read from the command-line arguments,
+ but they can be read from stdin using the `--stdin` option.
'reapply'::
Reapply the sparsity pattern rules to paths in the working tree.
@@ -93,23 +105,84 @@
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.).
++
+The `reapply` command can also take `--[no-]cone` and `--[no-]sparse-index`
+flags, with the same meaning as the flags from the `set` command, in order
+to change which sparsity mode you are using without needing to also respecify
+all sparsity paths.
'disable'::
Disable the `core.sparseCheckout` config setting, and restore the
- working directory to include all files. Leaves the sparse-checkout
- file intact so a later 'git sparse-checkout init' command may
- return the working directory to the same state.
+ working directory to include all files.
-SPARSE CHECKOUT
----------------
+'init'::
+ Deprecated command that behaves like `set` with no specified paths.
+ May be removed in the future.
++
+Historically, `set` did not handle all the necessary config settings,
+which meant that both `init` and `set` had to be called. Invoking
+both meant the `init` step would first remove nearly all tracked files
+(and in cone mode, ignored files too), then the `set` step would add
+many of the tracked files (but not ignored files) back. In addition
+to the lost files, the performance and UI of this combination was
+poor.
++
+Also, historically, `init` would not actually initialize the
+sparse-checkout file if it already existed. This meant it was
+possible to return to a sparse-checkout without remembering which
+paths to pass to a subsequent 'set' or 'add' command. However,
+`--cone` and `--sparse-index` options would not be remembered across
+the disable command, so the easy restore of calling a plain `init`
+decreased in utility.
-"Sparse checkout" allows populating the working directory sparsely.
-It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell
-Git whether a file in the working directory is worth looking at. If
-the skip-worktree bit is set, then the file is ignored in the working
-directory. Git will not populate the contents of those files, which
-makes a sparse checkout helpful when working in a repository with many
-files, but only a few are important to the current user.
+EXAMPLES
+--------
+`git sparse-checkout set MY/DIR1 SUB/DIR2`::
+
+ Change to a sparse checkout with all files (at any depth) under
+ MY/DIR1/ and SUB/DIR2/ present in the working copy (plus all
+ files immediately under MY/ and SUB/ and the toplevel
+ directory). If already in a sparse checkout, change which files
+ are present in the working copy to this new selection. Note
+ that this command will also delete all ignored files in any
+ directory that no longer has either tracked or
+ non-ignored-untracked files present.
+
+`git sparse-checkout disable`::
+
+ Repopulate the working directory with all files, disabling sparse
+ checkouts.
+
+`git sparse-checkout add SOME/DIR/ECTORY`::
+
+ Add all files under SOME/DIR/ECTORY/ (at any depth) to the
+ sparse checkout, as well as all files immediately under
+ SOME/DIR/ and immediately under SOME/. Must already be in a
+ sparse checkout before using this command.
+
+`git sparse-checkout reapply`::
+
+ It is possible for commands to update the working tree in a
+ way that does not respect the selected sparsity directories.
+ This can come from tools external to Git writing files, or
+ even affect Git commands because of either special cases (such
+ as hitting conflicts when merging/rebasing), or because some
+ commands didn't fully support sparse checkouts (e.g. the old
+ `recursive` merge backend had only limited support). This
+ command reapplies the existing sparse directory specifications
+ to make the working directory match.
+
+INTERNALS -- SPARSE CHECKOUT
+----------------------------
+
+"Sparse checkout" allows populating the working directory sparsely. It
+uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell Git
+whether a file in the working directory is worth looking at. If the
+skip-worktree bit is set, and the file is not present in the working tree,
+then its absence is ignored. Git will avoid populating the contents of
+those files, which makes a sparse checkout helpful when working in a
+repository with many files, but only a few are important to the current
+user.
The `$GIT_DIR/info/sparse-checkout` file is used to define the
skip-worktree reference bitmap. When Git updates the working
@@ -117,33 +190,133 @@
on this file. The files matching the patterns in the file will
appear in the working directory, and the rest will not.
-To enable the sparse-checkout feature, run `git sparse-checkout init` to
-initialize a simple sparse-checkout file and enable the `core.sparseCheckout`
-config setting. Then, run `git sparse-checkout set` to modify the patterns in
-the sparse-checkout file.
+INTERNALS -- NON-CONE PROBLEMS
+------------------------------
-To repopulate the working directory with all files, use the
-`git sparse-checkout disable` command.
+The `$GIT_DIR/info/sparse-checkout` file populated by the `set` and
+`add` subcommands is defined to be a bunch of patterns (one per line)
+using the same syntax as `.gitignore` files. In cone mode, these
+patterns are restricted to matching directories (and users only ever
+need supply or see directory names), while in non-cone mode any
+gitignore-style pattern is permitted. Using the full gitignore-style
+patterns in non-cone mode has a number of shortcomings:
+
+ * Fundamentally, it makes various worktree-updating processes (pull,
+ merge, rebase, switch, reset, checkout, etc.) require O(N*M) pattern
+ matches, where N is the number of patterns and M is the number of
+ paths in the index. This scales poorly.
+
+ * Avoiding the scaling issue has to be done via limiting the number
+ of patterns via specifying leading directory name or glob.
+
+ * Passing globs on the command line is error-prone as users may
+ forget to quote the glob, causing the shell to expand it into all
+ matching files and pass them all individually along to
+ sparse-checkout set/add. While this could also be a problem with
+ e.g. "git grep -- *.c", mistakes with grep/log/status appear in
+ the immediate output. With sparse-checkout, the mistake gets
+ recorded at the time the sparse-checkout command is run and might
+ not be problematic until the user later switches branches or rebases
+ or merges, thus putting a delay between the user's error and when
+ they have a chance to catch/notice it.
+
+ * Related to the previous item, sparse-checkout has an 'add'
+ subcommand but no 'remove' subcommand. Even if a 'remove'
+ subcommand were added, undoing an accidental unquoted glob runs
+ the risk of "removing too much", as it may remove entries that had
+ been included before the accidental add.
+
+ * Non-cone mode uses gitignore-style patterns to select what to
+ *include* (with the exception of negated patterns), while
+ .gitignore files use gitignore-style patterns to select what to
+ *exclude* (with the exception of negated patterns). The
+ documentation on gitignore-style patterns usually does not talk in
+ terms of matching or non-matching, but on what the user wants to
+ "exclude". This can cause confusion for users trying to learn how
+ to specify sparse-checkout patterns to get their desired behavior.
+
+ * Every other git subcommand that wants to provide "special path
+ pattern matching" of some sort uses pathspecs, but non-cone mode
+ for sparse-checkout uses gitignore patterns, which feels
+ inconsistent.
+
+ * It has edge cases where the "right" behavior is unclear. Two examples:
+
+ First, two users are in a subdirectory, and the first runs
+ git sparse-checkout set '/toplevel-dir/*.c'
+ while the second runs
+ git sparse-checkout set relative-dir
+ Should those arguments be transliterated into
+ current/subdirectory/toplevel-dir/*.c
+ and
+ current/subdirectory/relative-dir
+ before inserting into the sparse-checkout file? The user who typed
+ the first command is probably aware that arguments to set/add are
+ supposed to be patterns in non-cone mode, and probably would not be
+ happy with such a transliteration. However, many gitignore-style
+ patterns are just paths, which might be what the user who typed the
+ second command was thinking, and they'd be upset if their argument
+ wasn't transliterated.
+
+ Second, what should bash-completion complete on for set/add commands
+ for non-cone users? If it suggests paths, is it exacerbating the
+ problem above? Also, if it suggests paths, what if the user has a
+ file or directory that begins with either a '!' or '#' or has a '*',
+ '\', '?', '[', or ']' in its name? And if it suggests paths, will
+ it complete "/pro" to "/proc" (in the root filesytem) rather than to
+ "/progress.txt" in the current directory? (Note that users are
+ likely to want to start paths with a leading '/' in non-cone mode,
+ for the same reason that .gitignore files often have one.)
+ Completing on files or directories might give nasty surprises in
+ all these cases.
+
+ * The excessive flexibility made other extensions essentially
+ impractical. `--sparse-index` is likely impossible in non-cone
+ mode; even if it is somehow feasible, it would have been far more
+ work to implement and may have been too slow in practice. Some
+ ideas for adding coupling between partial clones and sparse
+ checkouts are only practical with a more restricted set of paths
+ as well.
+
+For all these reasons, non-cone mode is deprecated. Please switch to
+using cone mode.
-FULL PATTERN SET
-----------------
+INTERNALS -- CONE MODE HANDLING
+-------------------------------
-By default, the sparse-checkout file uses the same syntax as `.gitignore`
-files.
+The "cone mode", which is the default, lets you specify only what
+directories to include. For any directory specified, all paths below
+that directory will be included, and any paths immediately under
+leading directories (including the toplevel directory) will also be
+included. Thus, if you specified the directory
+ Documentation/technical/
+then your sparse checkout would contain:
-While `$GIT_DIR/info/sparse-checkout` is usually used to specify what
-files are included, you can also specify what files are _not_ included,
-using negative patterns. For example, to remove the file `unwanted`:
+ * all files in the toplevel-directory
+ * all files immediately under Documentation/
+ * all files at any depth under Documentation/technical/
-----------------
-/*
-!unwanted
-----------------
+Also, in cone mode, even if no directories are specified, then the
+files in the toplevel directory will be included.
+
+When changing the sparse-checkout patterns in cone mode, Git will inspect each
+tracked directory that is not within the sparse-checkout cone to see if it
+contains any untracked files. If all of those files are ignored due to the
+`.gitignore` patterns, then the directory will be deleted. If any of the
+untracked files within that directory is not ignored, then no deletions will
+occur within that directory and a warning message will appear. If these files
+are important, then reset your sparse-checkout definition so they are included,
+use `git add` and `git commit` to store them, then remove any remaining files
+manually to ensure Git can behave optimally.
+
+See also the "Internals -- Cone Pattern Set" section to learn how the
+directories are transformed under the hood into a subset of the
+Full Pattern Set of sparse-checkout.
-CONE PATTERN SET
-----------------
+INTERNALS -- FULL PATTERN SET
+-----------------------------
The full pattern set allows for arbitrary pattern matches and complicated
inclusion/exclusion rules. These can result in O(N*M) pattern matches when
@@ -151,32 +324,62 @@
of paths in the index. To combat this performance issue, a more restricted
pattern set is allowed when `core.sparseCheckoutCone` is enabled.
-The accepted patterns in the cone pattern set are:
+The sparse-checkout file uses the same syntax as `.gitignore` files;
+see linkgit:gitignore[5] for details. Here, though, the patterns are
+usually being used to select which files to include rather than which
+files to exclude. (However, it can get a bit confusing since
+gitignore-style patterns have negations defined by patterns which
+begin with a '!', so you can also select files to _not_ include.)
+
+For example, to select everything, and then to remove the file
+`unwanted` (so that every file will appear in your working tree except
+the file named `unwanted`):
+
+ git sparse-checkout set --no-cone '/*' '!unwanted'
+
+These patterns are just placed into the
+`$GIT_DIR/info/sparse-checkout` as-is, so the contents of that file
+at this point would be
+
+----------------
+/*
+!unwanted
+----------------
+
+See also the "Sparse Checkout" section of linkgit:git-read-tree[1] to
+learn more about the gitignore-style patterns used in sparse
+checkouts.
+
+
+INTERNALS -- CONE PATTERN SET
+-----------------------------
+
+In cone mode, only directories are accepted, but they are translated into
+the same gitignore-style patterns used in the full pattern set. We refer
+to the particular patterns used in those mode as being of one of two types:
1. *Recursive:* All paths inside a directory are included.
2. *Parent:* All files immediately inside a directory are included.
-In addition to the above two patterns, we also expect that all files in the
-root directory are included. If a recursive pattern is added, then all
-leading directories are added as parent patterns.
-
-By default, when running `git sparse-checkout init`, the root directory is
-added as a parent pattern. At this point, the sparse-checkout file contains
-the following patterns:
+Since cone mode always includes files at the toplevel, when running
+`git sparse-checkout set` with no directories specified, the toplevel
+directory is added as a parent pattern. At this point, the
+sparse-checkout file contains the following patterns:
----------------
/*
!/*/
----------------
-This says "include everything in root, but nothing two levels below root."
+This says "include everything immediately under the toplevel
+directory, but nothing at any level below that."
-When in cone mode, the `git sparse-checkout set` subcommand takes a list of
-directories instead of a list of sparse-checkout patterns. In this mode,
-the command `git sparse-checkout set A/B/C` sets the directory `A/B/C` as
-a recursive pattern, the directories `A` and `A/B` are added as parent
-patterns. The resulting sparse-checkout file is now
+When in cone mode, the `git sparse-checkout set` subcommand takes a
+list of directories. The command `git sparse-checkout set A/B/C` sets
+the directory `A/B/C` as a recursive pattern, the directories `A` and
+`A/B` are added as parent patterns. The resulting sparse-checkout file
+is now
----------------
/*
@@ -191,14 +394,18 @@
Here, order matters, so the negative patterns are overridden by the positive
patterns that appear lower in the file.
-If `core.sparseCheckoutCone=true`, then Git will parse the sparse-checkout file
-expecting patterns of these types. Git will warn if the patterns do not match.
-If the patterns do match the expected format, then Git will use faster hash-
-based algorithms to compute inclusion in the sparse-checkout.
+Unless `core.sparseCheckoutCone` is explicitly set to `false`, Git will
+parse the sparse-checkout file expecting patterns of these types. Git will
+warn if the patterns do not match. If the patterns do match the expected
+format, then Git will use faster hash-based algorithms to compute inclusion
+in the sparse-checkout. If they do not match, git will behave as though
+`core.sparseCheckoutCone` was false, regardless of its setting.
-In the cone mode case, the `git sparse-checkout list` subcommand will list the
-directories that define the recursive patterns. For the example sparse-checkout
-file above, the output is as follows:
+In the cone mode case, despite the fact that full patterns are written
+to the $GIT_DIR/info/sparse-checkout file, the `git sparse-checkout
+list` subcommand will list the directories that define the recursive
+patterns. For the example sparse-checkout file above, the output is as
+follows:
--------------------------
$ git sparse-checkout list
@@ -210,19 +417,9 @@
'git sparse-checkout set' command to reflect the expected cone in the working
directory.
-When changing the sparse-checkout patterns in cone mode, Git will inspect each
-tracked directory that is not within the sparse-checkout cone to see if it
-contains any untracked files. If all of those files are ignored due to the
-`.gitignore` patterns, then the directory will be deleted. If any of the
-untracked files within that directory is not ignored, then no deletions will
-occur within that directory and a warning message will appear. If these files
-are important, then reset your sparse-checkout definition so they are included,
-use `git add` and `git commit` to store them, then remove any remaining files
-manually to ensure Git can behave optimally.
-
-SUBMODULES
-----------
+INTERNALS -- SUBMODULES
+-----------------------
If your repository contains one or more submodules, then submodules
are populated based on interactions with the `git submodule` command.
diff --git a/Documentation/git-stage.txt b/Documentation/git-stage.txt
index 25bcda9..2f6aaa7 100644
--- a/Documentation/git-stage.txt
+++ b/Documentation/git-stage.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git stage' args...
+'git stage' <arg>...
DESCRIPTION
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index be6084c..6e15f47 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -13,7 +13,7 @@
'git stash' drop [-q|--quiet] [<stash>]
'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
'git stash' branch <branchname> [<stash>]
-'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
+'git stash' [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]
[-u|--include-untracked] [-a|--all] [-m|--message <message>]
[--pathspec-from-file=<file> [--pathspec-file-nul]]
[--] [<pathspec>...]]
@@ -47,7 +47,7 @@
COMMANDS
--------
-push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]::
+push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]::
Save your local modifications to a new 'stash entry' and roll them
back to HEAD (in the working tree and in the index).
@@ -60,7 +60,7 @@
are `stash -p` which acts as alias for `stash push -p` and pathspec elements,
which are allowed after a double hyphen `--` for disambiguation.
-save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
+save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
This option is deprecated in favour of 'git stash push'. It
differs from "stash push" in that it cannot take pathspec.
@@ -205,6 +205,16 @@
The `--patch` option implies `--keep-index`. You can use
`--no-keep-index` to override this.
+-S::
+--staged::
+ This option is only valid for `push` and `save` commands.
++
+Stash only the changes that are currently staged. This is similar to
+basic `git commit` except the state is committed to the stash instead
+of current branch.
++
+The `--patch` option has priority over this one.
+
--pathspec-from-file=<file>::
This option is only valid for `push` command.
+
@@ -341,6 +351,24 @@
$ git commit foo -m 'Remaining parts'
----------------------------------------------------------------
+Saving unrelated changes for future use::
+
+When you are in the middle of massive changes and you find some
+unrelated issue that you don't want to forget to fix, you can do the
+change(s), stage them, and use `git stash push --staged` to stash them
+out for future use. This is similar to committing the staged changes,
+only the commit ends-up being in the stash and not on the current branch.
++
+----------------------------------------------------------------
+# ... hack hack hack ...
+$ git add --patch foo # add unrelated changes to the index
+$ git stash push --staged # save these changes to the stash
+# ... hack hack hack, finish curent changes ...
+$ git commit -m 'Massive' # commit fully tested changes
+$ git switch fixup-branch # switch to another branch
+$ git stash pop # to finish work on the saved changes
+----------------------------------------------------------------
+
Recovering stash entries that were cleared/dropped erroneously::
If you mistakenly drop or clear stash entries, they cannot be recovered
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index c33a3d8..54a4b29 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -207,26 +207,29 @@
* ' ' = unmodified
* 'M' = modified
+* 'T' = file type changed (regular file, symbolic link or submodule)
* 'A' = added
* 'D' = deleted
* 'R' = renamed
-* 'C' = copied
+* 'C' = copied (if config option status.renames is set to "copies")
* 'U' = updated but unmerged
....
X Y Meaning
-------------------------------------------------
[AMD] not updated
-M [ MD] updated in index
-A [ MD] added to index
+M [ MTD] updated in index
+T [ MTD] type changed in index
+A [ MTD] added to index
D deleted from index
-R [ MD] renamed in index
-C [ MD] copied in index
-[MARC] index and work tree matches
-[ MARC] M work tree changed since index
-[ MARC] D deleted in work tree
-[ D] R renamed in work tree
-[ D] C copied in work tree
+R [ MTD] renamed in index
+C [ MTD] copied in index
+[MTARC] index and work tree matches
+[ MTARC] M work tree changed since index
+[ MTARC] T type changed in work tree since index
+[ MTARC] D deleted in work tree
+ R renamed in work tree
+ C copied in work tree
-------------------------------------------------
D D unmerged, both deleted
A U unmerged, added by us
@@ -311,6 +314,14 @@
------------------------------------------------------------
....
+Stash Information
+^^^^^^^^^^^^^^^^^
+
+If `--show-stash` is given, one line is printed showing the number of stash
+entries if non-zero:
+
+ # stash <N>
+
Changed Tracked Entries
^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 7e5f995..4d3ab6b 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -133,7 +133,7 @@
that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal
options.
-update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]::
+update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--filter <filter spec>] [--] [<path>...]::
+
--
Update the registered submodules to match what the superproject
@@ -177,6 +177,10 @@
If `--recursive` is specified, this command will recurse into the
registered submodules, and update any nested submodules within.
+
+If `--filter <filter spec>` is specified, the given partial clone filter will be
+applied to the submodule. See linkgit:git-rev-list[1] for details on filter
+specifications.
--
set-branch (-b|--branch) <branch> [--] <path>::
set-branch (-d|--default) [--] <path>::
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index d5776ff..4e92308 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -575,7 +575,7 @@
-------
--shared[=(false|true|umask|group|all|world|everybody)]::
---template=<template_directory>::
+--template=<template-directory>::
Only used with the 'init' command.
These are passed directly to 'git init'.
@@ -678,7 +678,6 @@
--strategy=<strategy>::
-p::
--rebase-merges::
---preserve-merges (DEPRECATED)::
These are only used with the 'dcommit' and 'rebase' commands.
+
Passed directly to 'git rebase' when using 'dcommit' if a
diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt
index 5c438cd..bbcbdce 100644
--- a/Documentation/git-switch.txt
+++ b/Documentation/git-switch.txt
@@ -137,8 +137,7 @@
The same as `--merge` option above, but changes the way the
conflicting hunks are presented, overriding the
`merge.conflictStyle` configuration variable. Possible values are
- "merge" (default) and "diff3" (in addition to what is shown by
- "merge" style, shows the original contents).
+ "merge" (default), "diff3", and "zdiff3".
-q::
--quiet::
@@ -152,7 +151,7 @@
attached to a terminal, regardless of `--quiet`.
-t::
---track::
+--track [direct|inherit]::
When creating a new branch, set up "upstream" configuration.
`-c` is implied. See `--track` in linkgit:git-branch[1] for
details.
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 2853f16..5ea2f2c 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -351,6 +351,10 @@
the index (use `git update-index --really-refresh` if you want
to mark them as "assume unchanged").
+Sometimes users confuse the assume-unchanged bit with the
+skip-worktree bit. See the final paragraph in the "Skip-worktree bit"
+section below for an explanation of the differences.
+
EXAMPLES
--------
@@ -392,22 +396,47 @@
SKIP-WORKTREE BIT
-----------------
-Skip-worktree bit can be defined in one (long) sentence: When reading
-an entry, if it is marked as skip-worktree, then Git pretends its
-working directory version is up to date and read the index version
-instead.
+Skip-worktree bit can be defined in one (long) sentence: Tell git to
+avoid writing the file to the working directory when reasonably
+possible, and treat the file as unchanged when it is not
+present in the working directory.
-To elaborate, "reading" means checking for file existence, reading
-file attributes or file content. The working directory version may be
-present or absent. If present, its content may match against the index
-version or not. Writing is not affected by this bit, content safety
-is still first priority. Note that Git _can_ update working directory
-file, that is marked skip-worktree, if it is safe to do so (i.e.
-working directory version matches index version)
+Note that not all git commands will pay attention to this bit, and
+some only partially support it.
+
+The update-index flags and the read-tree capabilities relating to the
+skip-worktree bit predated the introduction of the
+linkgit:git-sparse-checkout[1] command, which provides a much easier
+way to configure and handle the skip-worktree bits. If you want to
+reduce your working tree to only deal with a subset of the files in
+the repository, we strongly encourage the use of
+linkgit:git-sparse-checkout[1] in preference to the low-level
+update-index and read-tree primitives.
+
+The primary purpose of the skip-worktree bit is to enable sparse
+checkouts, i.e. to have working directories with only a subset of
+paths present. When the skip-worktree bit is set, Git commands (such
+as `switch`, `pull`, `merge`) will avoid writing these files.
+However, these commands will sometimes write these files anyway in
+important cases such as conflicts during a merge or rebase. Git
+commands will also avoid treating the lack of such files as an
+intentional deletion; for example `git add -u` will not not stage a
+deletion for these files and `git commit -a` will not make a commit
+deleting them either.
Although this bit looks similar to assume-unchanged bit, its goal is
-different from assume-unchanged bit's. Skip-worktree also takes
-precedence over assume-unchanged bit when both are set.
+different. The assume-unchanged bit is for leaving the file in the
+working tree but having Git omit checking it for changes and presuming
+that the file has not been changed (though if it can determine without
+stat'ing the file that it has changed, it is free to record the
+changes). skip-worktree tells Git to ignore the absence of the file,
+avoid updating it when possible with commands that normally update
+much of the working directory (e.g. `checkout`, `switch`, `pull`,
+etc.), and not have its absence be recorded in commits. Note that in
+sparse checkouts (setup by `git sparse-checkout` or by configuring
+core.sparseCheckout to true), if a file is marked as skip-worktree in
+the index but is found in the working tree, Git will clear the
+skip-worktree bit for that file.
SPLIT INDEX
-----------
@@ -498,7 +527,9 @@
This feature is intended to speed up git operations for repos that have
large working directories.
-It enables git to work together with a file system monitor (see the
+It enables git to work together with a file system monitor (see
+linkgit:git-fsmonitor{litdd}daemon[1]
+and the
"fsmonitor-watchman" section of linkgit:githooks[5]) that can
inform it as to what files have been modified. This enables git to avoid
having to lstat() every file to find modified files.
@@ -509,8 +540,8 @@
If you want to enable (or disable) this feature, it is easier to use
the `core.fsmonitor` configuration variable (see
-linkgit:git-config[1]) than using the `--fsmonitor` option to
-`git update-index` in each repository, especially if you want to do so
+linkgit:git-config[1]) than using the `--fsmonitor` option to `git
+update-index` in each repository, especially if you want to do so
across all repositories you use, because you can set the configuration
variable in your `$HOME/.gitconfig` just once and have it affect all
repositories you touch.
diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
index 6072f93..387cc1b 100644
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -59,6 +59,9 @@
The build you are using chose '{git-default-pager}' as the default.
endif::git-default-pager[]
+GIT_DEFAULT_BRANCH::
+ The name of the first branch created in newly initialized repositories.
+
SEE ALSO
--------
linkgit:git-commit-tree[1]
diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 8d162b5..f2f996c 100644
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt
@@ -8,7 +8,7 @@
SYNOPSIS
--------
[verse]
-'git web{litdd}browse' [<options>] <url|file>...
+'git web{litdd}browse' [<options>] (<URL>|<file>)...
DESCRIPTION
-----------
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 8a7cbdd..ada30c8 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -10,7 +10,7 @@
--------
[verse]
'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]
-'git worktree list' [--porcelain]
+'git worktree list' [-v | --porcelain [-z]]
'git worktree lock' [--reason <string>] <worktree>
'git worktree move' <worktree> <new-path>
'git worktree prune' [-n] [-v] [--expire <expire>]
@@ -25,45 +25,49 @@
A git repository can support multiple working trees, allowing you to check
out more than one branch at a time. With `git worktree add` a new working
-tree is associated with the repository. This new working tree is called a
-"linked working tree" as opposed to the "main working tree" prepared by
-linkgit:git-init[1] or linkgit:git-clone[1].
-A repository has one main working tree (if it's not a
-bare repository) and zero or more linked working trees. When you are done
-with a linked working tree, remove it with `git worktree remove`.
+tree is associated with the repository, along with additional metadata
+that differentiates that working tree from others in the same repository.
+The working tree, along with this metadata, is called a "worktree".
+
+This new worktree is called a "linked worktree" as opposed to the "main
+worktree" prepared by linkgit:git-init[1] or linkgit:git-clone[1].
+A repository has one main worktree (if it's not a bare repository) and
+zero or more linked worktrees. When you are done with a linked worktree,
+remove it with `git worktree remove`.
In its simplest form, `git worktree add <path>` automatically creates a
new branch whose name is the final component of `<path>`, which is
convenient if you plan to work on a new topic. For instance, `git
worktree add ../hotfix` creates new branch `hotfix` and checks it out at
-path `../hotfix`. To instead work on an existing branch in a new working
-tree, use `git worktree add <path> <branch>`. On the other hand, if you
-just plan to make some experimental changes or do testing without
-disturbing existing development, it is often convenient to create a
-'throwaway' working tree not associated with any branch. For instance,
-`git worktree add -d <path>` creates a new working tree with a detached
-`HEAD` at the same commit as the current branch.
+path `../hotfix`. To instead work on an existing branch in a new worktree,
+use `git worktree add <path> <branch>`. On the other hand, if you just
+plan to make some experimental changes or do testing without disturbing
+existing development, it is often convenient to create a 'throwaway'
+worktree not associated with any branch. For instance,
+`git worktree add -d <path>` creates a new worktree with a detached `HEAD`
+at the same commit as the current branch.
If a working tree is deleted without using `git worktree remove`, then
its associated administrative files, which reside in the repository
(see "DETAILS" below), will eventually be removed automatically (see
`gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run
-`git worktree prune` in the main or any linked working tree to
-clean up any stale administrative files.
+`git worktree prune` in the main or any linked worktree to clean up any
+stale administrative files.
-If a linked working tree is stored on a portable device or network share
-which is not always mounted, you can prevent its administrative files from
-being pruned by issuing the `git worktree lock` command, optionally
-specifying `--reason` to explain why the working tree is locked.
+If the working tree for a linked worktree is stored on a portable device
+or network share which is not always mounted, you can prevent its
+administrative files from being pruned by issuing the `git worktree lock`
+command, optionally specifying `--reason` to explain why the worktree is
+locked.
COMMANDS
--------
add <path> [<commit-ish>]::
-Create `<path>` and checkout `<commit-ish>` into it. The new working directory
-is linked to the current repository, sharing everything except working
-directory specific files such as `HEAD`, `index`, etc. As a convenience,
-`<commit-ish>` may be a bare "`-`", which is synonymous with `@{-1}`.
+Create a worktree at `<path>` and checkout `<commit-ish>` into it. The new worktree
+is linked to the current repository, sharing everything except per-worktree
+files such as `HEAD`, `index`, etc. As a convenience, `<commit-ish>` may
+be a bare "`-`", which is synonymous with `@{-1}`.
+
If `<commit-ish>` is a branch name (call it `<branch>`) and is not found,
and neither `-b` nor `-B` nor `--detach` are used, but there does
@@ -84,100 +88,97 @@
linkgit:git-config[1].
+
If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used,
-then, as a convenience, the new working tree is associated with a branch
-(call it `<branch>`) named after `$(basename <path>)`. If `<branch>`
-doesn't exist, a new branch based on `HEAD` is automatically created as
-if `-b <branch>` was given. If `<branch>` does exist, it will be
-checked out in the new working tree, if it's not checked out anywhere
-else, otherwise the command will refuse to create the working tree (unless
-`--force` is used).
+then, as a convenience, the new worktree is associated with a branch (call
+it `<branch>`) named after `$(basename <path>)`. If `<branch>` doesn't
+exist, a new branch based on `HEAD` is automatically created as if
+`-b <branch>` was given. If `<branch>` does exist, it will be checked out
+in the new worktree, if it's not checked out anywhere else, otherwise the
+command will refuse to create the worktree (unless `--force` is used).
list::
-List details of each working tree. The main working tree is listed first,
-followed by each of the linked working trees. The output details include
-whether the working tree is bare, the revision currently checked out, the
+List details of each worktree. The main worktree is listed first,
+followed by each of the linked worktrees. The output details include
+whether the worktree is bare, the revision currently checked out, the
branch currently checked out (or "detached HEAD" if none), "locked" if
-the worktree is locked, "prunable" if the worktree can be pruned by `prune`
-command.
+the worktree is locked, "prunable" if the worktree can be pruned by the
+`prune` command.
lock::
-If a working tree is on a portable device or network share which
-is not always mounted, lock it to prevent its administrative
-files from being pruned automatically. This also prevents it from
-being moved or deleted. Optionally, specify a reason for the lock
-with `--reason`.
+If a worktree is on a portable device or network share which is not always
+mounted, lock it to prevent its administrative files from being pruned
+automatically. This also prevents it from being moved or deleted.
+Optionally, specify a reason for the lock with `--reason`.
move::
-Move a working tree to a new location. Note that the main working tree
-or linked working trees containing submodules cannot be moved with this
-command. (The `git worktree repair` command, however, can reestablish
-the connection with linked working trees if you move the main working
-tree manually.)
+Move a worktree to a new location. Note that the main worktree or linked
+worktrees containing submodules cannot be moved with this command. (The
+`git worktree repair` command, however, can reestablish the connection
+with linked worktrees if you move the main worktree manually.)
prune::
-Prune working tree information in `$GIT_DIR/worktrees`.
+Prune worktree information in `$GIT_DIR/worktrees`.
remove::
-Remove a working tree. Only clean working trees (no untracked files
-and no modification in tracked files) can be removed. Unclean working
-trees or ones with submodules can be removed with `--force`. The main
-working tree cannot be removed.
+Remove a worktree. Only clean worktrees (no untracked files and no
+modification in tracked files) can be removed. Unclean worktrees or ones
+with submodules can be removed with `--force`. The main worktree cannot be
+removed.
repair [<path>...]::
-Repair working tree administrative files, if possible, if they have
-become corrupted or outdated due to external factors.
+Repair worktree administrative files, if possible, if they have become
+corrupted or outdated due to external factors.
+
-For instance, if the main working tree (or bare repository) is moved,
-linked working trees will be unable to locate it. Running `repair` in
-the main working tree will reestablish the connection from linked
-working trees back to the main working tree.
+For instance, if the main worktree (or bare repository) is moved, linked
+worktrees will be unable to locate it. Running `repair` in the main
+worktree will reestablish the connection from linked worktrees back to the
+main worktree.
+
-Similarly, if a linked working tree is moved without using `git worktree
-move`, the main working tree (or bare repository) will be unable to
-locate it. Running `repair` within the recently-moved working tree will
-reestablish the connection. If multiple linked working trees are moved,
-running `repair` from any working tree with each tree's new `<path>` as
-an argument, will reestablish the connection to all the specified paths.
+Similarly, if the working tree for a linked worktree is moved without
+using `git worktree move`, the main worktree (or bare repository) will be
+unable to locate it. Running `repair` within the recently-moved worktree
+will reestablish the connection. If multiple linked worktrees are moved,
+running `repair` from any worktree with each tree's new `<path>` as an
+argument, will reestablish the connection to all the specified paths.
+
-If both the main working tree and linked working trees have been moved
-manually, then running `repair` in the main working tree and specifying the
-new `<path>` of each linked working tree will reestablish all connections
-in both directions.
+If both the main worktree and linked worktrees have been moved manually,
+then running `repair` in the main worktree and specifying the new `<path>`
+of each linked worktree will reestablish all connections in both
+directions.
unlock::
-Unlock a working tree, allowing it to be pruned, moved or deleted.
+Unlock a worktree, allowing it to be pruned, moved or deleted.
OPTIONS
-------
-f::
--force::
- By default, `add` refuses to create a new working tree when
+ By default, `add` refuses to create a new worktree when
`<commit-ish>` is a branch name and is already checked out by
- another working tree, or if `<path>` is already assigned to some
- working tree but is missing (for instance, if `<path>` was deleted
+ another worktree, or if `<path>` is already assigned to some
+ worktree but is missing (for instance, if `<path>` was deleted
manually). This option overrides these safeguards. To add a missing but
- locked working tree path, specify `--force` twice.
+ locked worktree path, specify `--force` twice.
+
-`move` refuses to move a locked working tree unless `--force` is specified
-twice. If the destination is already assigned to some other working tree but is
+`move` refuses to move a locked worktree unless `--force` is specified
+twice. If the destination is already assigned to some other worktree but is
missing (for instance, if `<new-path>` was deleted manually), then `--force`
allows the move to proceed; use `--force` twice if the destination is locked.
+
-`remove` refuses to remove an unclean working tree unless `--force` is used.
-To remove a locked working tree, specify `--force` twice.
+`remove` refuses to remove an unclean worktree unless `--force` is used.
+To remove a locked worktree, specify `--force` twice.
-b <new-branch>::
-B <new-branch>::
With `add`, create a new branch named `<new-branch>` starting at
- `<commit-ish>`, and check out `<new-branch>` into the new working tree.
+ `<commit-ish>`, and check out `<new-branch>` into the new worktree.
If `<commit-ish>` is omitted, it defaults to `HEAD`.
By default, `-b` refuses to create a new branch if it already
exists. `-B` overrides this safeguard, resetting `<new-branch>` to
@@ -185,7 +186,7 @@
-d::
--detach::
- With `add`, detach `HEAD` in the new working tree. See "DETACHED HEAD"
+ With `add`, detach `HEAD` in the new worktree. See "DETACHED HEAD"
in linkgit:git-checkout[1].
--[no-]checkout::
@@ -211,7 +212,7 @@
`--track` in linkgit:git-branch[1] for details.
--lock::
- Keep the working tree locked after creation. This is the
+ Keep the worktree locked after creation. This is the
equivalent of `git worktree lock` after `git worktree add`,
but without a race condition.
@@ -223,7 +224,14 @@
--porcelain::
With `list`, output in an easy-to-parse format for scripts.
This format will remain stable across Git versions and regardless of user
- configuration. See below for details.
+ configuration. It is recommended to combine this with `-z`.
+ See below for details.
+
+-z::
+ Terminate each line with a NUL rather than a newline when
+ `--porcelain` is specified with `list`. This makes it possible
+ to parse the output when a worktree path contains a newline
+ character.
-q::
--quiet::
@@ -236,43 +244,42 @@
With `list`, output additional information about worktrees (see below).
--expire <time>::
- With `prune`, only expire unused working trees older than `<time>`.
+ With `prune`, only expire unused worktrees older than `<time>`.
+
-With `list`, annotate missing working trees as prunable if they are
-older than `<time>`.
+With `list`, annotate missing worktrees as prunable if they are older than
+`<time>`.
--reason <string>::
- With `lock` or with `add --lock`, an explanation why the working tree is locked.
+ With `lock` or with `add --lock`, an explanation why the worktree
+ is locked.
<worktree>::
- Working trees can be identified by path, either relative or
- absolute.
+ Worktrees can be identified by path, either relative or absolute.
+
-If the last path components in the working tree's path is unique among
-working trees, it can be used to identify a working tree. For example if
-you only have two working trees, at `/abc/def/ghi` and `/abc/def/ggg`,
-then `ghi` or `def/ghi` is enough to point to the former working tree.
+If the last path components in the worktree's path is unique among
+worktrees, it can be used to identify a worktree. For example if you only
+have two worktrees, at `/abc/def/ghi` and `/abc/def/ggg`, then `ghi` or
+`def/ghi` is enough to point to the former worktree.
REFS
----
-In multiple working trees, some refs may be shared between all working
-trees and some refs are local. One example is `HEAD` which is different for each
-working tree. This section is about the sharing rules and how to access
-refs of one working tree from another.
+When using multiple worktrees, some refs are shared between all worktrees,
+but others are specific to an individual worktree. One example is `HEAD`,
+which is different for each worktree. This section is about the sharing
+rules and how to access refs of one worktree from another.
-In general, all pseudo refs are per working tree and all refs starting
-with `refs/` are shared. Pseudo refs are ones like `HEAD` which are
-directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are
-exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not
-shared.
+In general, all pseudo refs are per-worktree and all refs starting with
+`refs/` are shared. Pseudo refs are ones like `HEAD` which are directly
+under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are exceptions,
+however: refs inside `refs/bisect` and `refs/worktree` are not shared.
-Refs that are per working tree can still be accessed from another
-working tree via two special paths, `main-worktree` and `worktrees`. The
-former gives access to per-working tree refs of the main working tree,
-while the latter to all linked working trees.
+Refs that are per-worktree can still be accessed from another worktree via
+two special paths, `main-worktree` and `worktrees`. The former gives
+access to per-worktree refs of the main worktree, while the latter to all
+linked worktrees.
For example, `main-worktree/HEAD` or `main-worktree/refs/bisect/good`
-resolve to the same value as the main working tree's `HEAD` and
+resolve to the same value as the main worktree's `HEAD` and
`refs/bisect/good` respectively. Similarly, `worktrees/foo/HEAD` or
`worktrees/bar/refs/bisect/bad` are the same as
`$GIT_COMMON_DIR/worktrees/foo/HEAD` and
@@ -284,13 +291,13 @@
CONFIGURATION FILE
------------------
-By default, the repository `config` file is shared across all working
-trees. If the config variables `core.bare` or `core.worktree` are
-already present in the config file, they will be applied to the main
-working trees only.
+By default, the repository `config` file is shared across all worktrees.
+If the config variables `core.bare` or `core.worktree` are present in the
+common config file and `extensions.worktreeConfig` is disabled, then they
+will be applied to the main worktree only.
-In order to have configuration specific to working trees, you can turn
-on the `worktreeConfig` extension, e.g.:
+In order to have worktree-specific configuration, you can turn on the
+`worktreeConfig` extension, e.g.:
------------
$ git config extensions.worktreeConfig true
@@ -303,40 +310,45 @@
Note that in this file, the exception for `core.bare` and `core.worktree`
is gone. If they exist in `$GIT_DIR/config`, you must move
-them to the `config.worktree` of the main working tree. You may also
-take this opportunity to review and move other configuration that you
-do not want to share to all working trees:
+them to the `config.worktree` of the main worktree. You may also take this
+opportunity to review and move other configuration that you do not want to
+share to all worktrees:
- - `core.worktree` and `core.bare` should never be shared
+ - `core.worktree` should never be shared.
- - `core.sparseCheckout` is recommended per working tree, unless you
- are sure you always use sparse checkout for all working trees.
+ - `core.bare` should not be shared if the value is `core.bare=true`.
+
+ - `core.sparseCheckout` should not be shared, unless you are sure you
+ always use sparse checkout for all worktrees.
+
+See the documentation of `extensions.worktreeConfig` in
+linkgit:git-config[1] for more details.
DETAILS
-------
-Each linked working tree has a private sub-directory in the repository's
+Each linked worktree has a private sub-directory in the repository's
`$GIT_DIR/worktrees` directory. The private sub-directory's name is usually
-the base name of the linked working tree's path, possibly appended with a
+the base name of the linked worktree's path, possibly appended with a
number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the
command `git worktree add /path/other/test-next next` creates the linked
-working tree in `/path/other/test-next` and also creates a
+worktree in `/path/other/test-next` and also creates a
`$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1`
if `test-next` is already taken).
-Within a linked working tree, `$GIT_DIR` is set to point to this private
+Within a linked worktree, `$GIT_DIR` is set to point to this private
directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and
-`$GIT_COMMON_DIR` is set to point back to the main working tree's `$GIT_DIR`
+`$GIT_COMMON_DIR` is set to point back to the main worktree's `$GIT_DIR`
(e.g. `/path/main/.git`). These settings are made in a `.git` file located at
-the top directory of the linked working tree.
+the top directory of the linked worktree.
Path resolution via `git rev-parse --git-path` uses either
`$GIT_DIR` or `$GIT_COMMON_DIR` depending on the path. For example, in the
-linked working tree `git rev-parse --git-path HEAD` returns
+linked worktree `git rev-parse --git-path HEAD` returns
`/path/main/.git/worktrees/test-next/HEAD` (not
`/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git
rev-parse --git-path refs/heads/master` uses
`$GIT_COMMON_DIR` and returns `/path/main/.git/refs/heads/master`,
-since refs are shared across all working trees, except `refs/bisect` and
+since refs are shared across all worktrees, except `refs/bisect` and
`refs/worktree`.
See linkgit:gitrepository-layout[5] for more information. The rule of
@@ -344,8 +356,8 @@
`$GIT_DIR` or `$GIT_COMMON_DIR` when you need to directly access something
inside `$GIT_DIR`. Use `git rev-parse --git-path` to get the final path.
-If you manually move a linked working tree, you need to update the `gitdir` file
-in the entry's directory. For example, if a linked working tree is moved
+If you manually move a linked worktree, you need to update the `gitdir` file
+in the entry's directory. For example, if a linked worktree is moved
to `/newpath/test-next` and its `.git` file points to
`/path/main/.git/worktrees/test-next`, then update
`/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next`
@@ -354,10 +366,10 @@
To prevent a `$GIT_DIR/worktrees` entry from being pruned (which
can be useful in some situations, such as when the
-entry's working tree is stored on a portable device), use the
+entry's worktree is stored on a portable device), use the
`git worktree lock` command, which adds a file named
`locked` to the entry's directory. The file contains the reason in
-plain text. For example, if a linked working tree's `.git` file points
+plain text. For example, if a linked worktree's `.git` file points
to `/path/main/.git/worktrees/test-next` then a file named
`/path/main/.git/worktrees/test-next/locked` will prevent the
`test-next` entry from being pruned. See
@@ -378,11 +390,11 @@
/path/to/other-linked-worktree 1234abc (detached HEAD)
------------
-The command also shows annotations for each working tree, according to its state.
+The command also shows annotations for each worktree, according to its state.
These annotations are:
- * `locked`, if the working tree is locked.
- * `prunable`, if the working tree can be pruned via `git worktree prune`.
+ * `locked`, if the worktree is locked.
+ * `prunable`, if the worktree can be pruned via `git worktree prune`.
------------
$ git worktree list
@@ -400,23 +412,24 @@
/path/to/linked-worktree abcd1234 [master]
/path/to/locked-worktree-no-reason abcd5678 (detached HEAD) locked
/path/to/locked-worktree-with-reason 1234abcd (brancha)
- locked: working tree path is mounted on a portable device
+ locked: worktree path is mounted on a portable device
/path/to/prunable-worktree 5678abc1 (detached HEAD)
prunable: gitdir file points to non-existent location
------------
Note that the annotation is moved to the next line if the additional
information is available, otherwise it stays on the same line as the
-working tree itself.
+worktree itself.
Porcelain Format
~~~~~~~~~~~~~~~~
-The porcelain format has a line per attribute. Attributes are listed with a
+The porcelain format has a line per attribute. If `-z` is given then the lines
+are terminated with NUL rather than a newline. Attributes are listed with a
label and value separated by a single space. Boolean attributes (like `bare`
and `detached`) are listed as a label only, and are present only
if the value is true. Some attributes (like `locked`) can be listed as a label
only or with a value depending upon whether a reason is available. The first
-attribute of a working tree is always `worktree`, an empty line indicates the
+attribute of a worktree is always `worktree`, an empty line indicates the
end of the record. For example:
------------
@@ -449,7 +462,7 @@
------------
-If the lock reason contains "unusual" characters such as newline, they
+Unless `-z` is used any "unusual" characters in the lock reason such as newlines
are escaped and the entire reason is quoted as explained for the
configuration variable `core.quotePath` (see linkgit:git-config[1]).
For Example:
@@ -468,7 +481,7 @@
linkgit:git-stash[1] to store your changes away temporarily, however, your
working tree is in such a state of disarray (with new, moved, and removed
files, and other bits and pieces strewn around) that you don't want to risk
-disturbing any of it. Instead, you create a temporary linked working tree to
+disturbing any of it. Instead, you create a temporary linked worktree to
make the emergency fix, remove it when done, and then resume your earlier
refactoring session.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index d63c65e..302607a 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git' [--version] [--help] [-C <path>] [-c <name>=<value>]
+'git' [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
[--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
[-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]
[--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
@@ -39,13 +39,15 @@
OPTIONS
-------
+-v::
--version::
Prints the Git suite version that the 'git' program came from.
+
-This option is internaly converted to `git version ...` and accepts
+This option is internally converted to `git version ...` and accepts
the same options as the linkgit:git-version[1] command. If `--help` is
also given, it takes precedence over `--version`.
+-h::
--help::
Prints the synopsis and a list of the most commonly used
commands. If the option `--all` or `-a` is given then all
@@ -832,8 +834,9 @@
`GIT_TRACE_REDACT`::
By default, when tracing is activated, Git redacts the values of
- cookies, the "Authorization:" header, and the "Proxy-Authorization:"
- header. Set this variable to `0` to prevent this redaction.
+ cookies, the "Authorization:" header, the "Proxy-Authorization:"
+ header and packfile URIs. Set this variable to `0` to prevent this
+ redaction.
`GIT_LITERAL_PATHSPECS`::
Setting this variable to `1` will cause Git to treat all
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 83fd4e1..4b36d51 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -160,11 +160,13 @@
^^^^^
This attribute sets a specific line-ending style to be used in the
-working directory. It enables end-of-line conversion without any
-content checks, effectively setting the `text` attribute. Note that
-setting this attribute on paths which are in the index with CRLF line
-endings may make the paths to be considered dirty. Adding the path to
-the index again will normalize the line endings in the index.
+working directory. This attribute has effect only if the `text`
+attribute is set or unspecified, or if it is set to `auto`, the file is
+detected as text, and it is stored with LF endings in the index. Note
+that setting this attribute on paths which are in the index with CRLF
+line endings may make the paths to be considered dirty unless
+`text=auto` is set. Adding the path to the index again will normalize
+the line endings in the index.
Set to string value "crlf"::
@@ -827,6 +829,8 @@
- `java` suitable for source code in the Java language.
+- `kotlin` suitable for source code in the Kotlin language.
+
- `markdown` suitable for Markdown documents.
- `matlab` suitable for source code in the MATLAB and Octave languages.
diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 92e4ba6..1819a5a 100644
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -19,6 +19,15 @@
"tree-ish", depending on the context and command) and paths as their
arguments. Here are the rules:
+ * Options come first and then args.
+ A subcommand may take dashed options (which may take their own
+ arguments, e.g. "--max-parents 2") and arguments. You SHOULD
+ give dashed options first and then arguments. Some commands may
+ accept dashed options after you have already gave non-option
+ arguments (which may make the command ambiguous), but you should
+ not rely on it (because eventually we may find a way to fix
+ these ambiguity by enforcing the "options then args" rule).
+
* Revisions come first and then paths.
E.g. in `git diff v1.0 v2.0 arch/x86 include/asm-x86`,
`v1.0` and `v2.0` are revisions and `arch/x86` and `include/asm-x86`
@@ -72,24 +81,24 @@
Here are the rules regarding the "flags" that you should follow when you are
scripting Git:
- * it's preferred to use the non-dashed form of Git commands, which means that
+ * It's preferred to use the non-dashed form of Git commands, which means that
you should prefer `git foo` to `git-foo`.
- * splitting short options to separate words (prefer `git foo -a -b`
+ * Splitting short options to separate words (prefer `git foo -a -b`
to `git foo -ab`, the latter may not even work).
- * when a command-line option takes an argument, use the 'stuck' form. In
+ * When a command-line option takes an argument, use the 'stuck' form. In
other words, write `git foo -oArg` instead of `git foo -o Arg` for short
options, and `git foo --long-opt=Arg` instead of `git foo --long-opt Arg`
for long options. An option that takes optional option-argument must be
written in the 'stuck' form.
- * when you give a revision parameter to a command, make sure the parameter is
+ * When you give a revision parameter to a command, make sure the parameter is
not ambiguous with a name of a file in the work tree. E.g. do not write
`git log -1 HEAD` but write `git log -1 HEAD --`; the former will not work
if you happen to have a file called `HEAD` in the work tree.
- * many commands allow a long option `--option` to be abbreviated
+ * Many commands allow a long option `--option` to be abbreviated
only to their unique prefix (e.g. if there is no other option
whose name begins with `opt`, you may be able to spell `--opt` to
invoke the `--option` flag), but you should fully spell them out
diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt
index 758bf39..80517b4 100644
--- a/Documentation/gitcredentials.txt
+++ b/Documentation/gitcredentials.txt
@@ -132,7 +132,7 @@
compares hostnames exactly, without considering whether two hosts are part of
the same domain. Likewise, a config entry for `http://example.com` would not
match: Git compares the protocols exactly. However, you may use wildcards in
-the domain name and other pattern matching techniques as with the `http.<url>.*`
+the domain name and other pattern matching techniques as with the `http.<URL>.*`
options.
If the "pattern" URL does include a path component, then this too must match
@@ -147,7 +147,7 @@
Options for a credential context can be configured either in
`credential.*` (which applies to all credentials), or
-`credential.<url>.*`, where <url> matches the context as described
+`credential.<URL>.*`, where <URL> matches the context as described
above.
The following options are available in either location:
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index b51959f..a16e62b 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -698,6 +698,10 @@
Only one parameter should be set to "1" when the hook runs. The hook
running passing "1", "1" should not be possible.
+SEE ALSO
+--------
+linkgit:git-hook[1]
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index f8a1fc2..f2738b1 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -155,7 +155,7 @@
EXAMPLES
--------
- - The pattern `hello.*` matches any file or folder
+ - The pattern `hello.*` matches any file or directory
whose name begins with `hello.`. If one wants to restrict
this only to the directory and not in its subdirectories,
one can prepend the pattern with a slash, i.e. `/hello.*`;
diff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt
index 891c8da..941858a 100644
--- a/Documentation/gitsubmodules.txt
+++ b/Documentation/gitsubmodules.txt
@@ -226,7 +226,7 @@
----------------------------------
# Add a submodule
- git submodule add <url> <path>
+ git submodule add <URL> <path>
# Occasionally update the submodule to a new version:
git -C <path> checkout <new version>
diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index 3cc9b03..7cee9d3 100644
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -547,7 +547,7 @@
# make the front page an internal rewrite to the gitweb script
RewriteRule ^/$ /cgi-bin/gitweb.cgi [QSA,L,PT]
- # look for a public_git folder in unix users' home
+ # look for a public_git directory in unix users' home
# http://git.example.org/~<user>/
RewriteRule ^/\~([^\/]+)(/|/gitweb.cgi)?$ /cgi-bin/gitweb.cgi \
[QSA,E=GITWEB_PROJECTROOT:/home/$1/public_git/,L,PT]
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index 47cf97f..5930526 100644
--- a/Documentation/gitworkflows.txt
+++ b/Documentation/gitworkflows.txt
@@ -394,7 +394,7 @@
-------------------------------------
Please pull from
- <url> <branch>
+ <URL> <branch>
-------------------------------------
In that case, 'git pull' can do the fetch and merge in one go, as
@@ -403,7 +403,7 @@
.Push/pull: Merging remote topics
[caption="Recipe: "]
=====================================
-`git pull <url> <branch>`
+`git pull <URL> <branch>`
=====================================
Occasionally, the maintainer may get merge conflicts when they try to
@@ -440,7 +440,7 @@
.format-patch/am: Keeping topics up to date
[caption="Recipe: "]
=====================================
-`git pull --rebase <url> <branch>`
+`git pull --rebase <URL> <branch>`
=====================================
You can then fix the conflicts during the rebase. Presumably you have
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index c077971..aa2f41f 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -312,7 +312,7 @@
ls-tree", "git add", "git grep", "git diff", "git checkout",
and many other commands to
limit the scope of operations to some subset of the tree or
-worktree. See the documentation of each command for whether
+working tree. See the documentation of each command for whether
paths are relative to the current directory or toplevel. The
pathspec syntax is as follows:
+
@@ -446,7 +446,7 @@
interface than the <<def_plumbing,plumbing>>.
[[def_per_worktree_ref]]per-worktree ref::
- Refs that are per-<<def_working_tree,worktree>>, rather than
+ Refs that are per-<<def_worktree,worktree>>, rather than
global. This is presently only <<def_HEAD,HEAD>> and any refs
that start with `refs/bisect/`, but might later include other
unusual refs.
@@ -669,3 +669,12 @@
The tree of actual checked out files. The working tree normally
contains the contents of the <<def_HEAD,HEAD>> commit's tree,
plus any local changes that you have made but not yet committed.
+
+[[def_worktree]]worktree::
+ A repository can have zero (i.e. bare repository) or one or
+ more worktrees attached to it. One "worktree" consists of a
+ "working tree" and repository metadata, most of which are
+ shared among other worktrees of a single repository, and
+ some of which are maintained separately per worktree
+ (e.g. the index, HEAD and pseudorefs like MERGE_HEAD,
+ per-worktree refs and per-worktree configuration file).
diff --git a/Documentation/lint-gitlink.perl b/Documentation/lint-gitlink.perl
index b22a367..1c61dd9 100755
--- a/Documentation/lint-gitlink.perl
+++ b/Documentation/lint-gitlink.perl
@@ -5,11 +5,12 @@
# Parse arguments, a simple state machine for input like:
#
-# howto/*.txt config/*.txt --section=1 git.txt git-add.txt [...] --to-lint git-add.txt a-file.txt [...]
+# <file-to-check.txt> <valid-files-to-link-to> --section=1 git.txt git-add.txt [...] --to-lint git-add.txt a-file.txt [...]
my %TXT;
my %SECTION;
my $section;
my $lint_these = 0;
+my $to_check = shift @ARGV;
for my $arg (@ARGV) {
if (my ($sec) = $arg =~ /^--section=(\d+)$/s) {
$section = $sec;
@@ -30,13 +31,14 @@
my ($pos, $line, $target, $msg) = @_;
substr($line, $pos) = "' <-- HERE";
$line =~ s/^\s+//;
- print "$ARGV:$.: error: $target: $msg, shown with 'HERE' below:\n";
- print "$ARGV:$.:\t'$line\n";
+ print STDERR "$ARGV:$.: error: $target: $msg, shown with 'HERE' below:\n";
+ print STDERR "$ARGV:$.:\t'$line\n";
$exit_code = 1;
}
@ARGV = sort values %TXT;
-die "BUG: Nothing to process!" unless @ARGV;
+die "BUG: No list of valid linkgit:* files given" unless @ARGV;
+@ARGV = $to_check;
while (<>) {
my $line = $_;
while ($line =~ m/linkgit:((.*?)\[(\d)\])/g) {
diff --git a/Documentation/lint-man-end-blurb.perl b/Documentation/lint-man-end-blurb.perl
index d69312e..6bdb13a 100755
--- a/Documentation/lint-man-end-blurb.perl
+++ b/Documentation/lint-man-end-blurb.perl
@@ -6,7 +6,7 @@
my $exit_code = 0;
sub report {
my ($target, $msg) = @_;
- print "error: $target: $msg\n";
+ print STDERR "error: $target: $msg\n";
$exit_code = 1;
}
diff --git a/Documentation/lint-man-section-order.perl b/Documentation/lint-man-section-order.perl
index b05f915..425377d 100755
--- a/Documentation/lint-man-section-order.perl
+++ b/Documentation/lint-man-section-order.perl
@@ -46,7 +46,7 @@
my $exit_code = 0;
sub report {
my ($msg) = @_;
- print "$ARGV:$.: $msg\n";
+ print STDERR "$ARGV:$.: $msg\n";
$exit_code = 1;
}
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 61ec157..d8f7cd7 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -132,8 +132,9 @@
Only useful when merging.
endif::git-pull[]
---no-verify::
- This option bypasses the pre-merge and commit-msg hooks.
+--[no-]verify::
+ By default, the pre-merge and commit-msg hooks are run.
+ When `--no-verify` is given, these are bypassed.
See also linkgit:githooks[5].
ifdef::git-pull[]
Only useful when merging.
diff --git a/Documentation/mergetools/vimdiff.txt b/Documentation/mergetools/vimdiff.txt
new file mode 100644
index 0000000..2d631e9
--- /dev/null
+++ b/Documentation/mergetools/vimdiff.txt
@@ -0,0 +1,194 @@
+Description
+^^^^^^^^^^^
+
+When specifying `--tool=vimdiff` in `git mergetool` Git will open Vim with a 4
+windows layout distributed in the following way:
+....
+------------------------------------------
+| | | |
+| LOCAL | BASE | REMOTE |
+| | | |
+------------------------------------------
+| |
+| MERGED |
+| |
+------------------------------------------
+....
+`LOCAL`, `BASE` and `REMOTE` are read-only buffers showing the contents of the
+conflicting file in specific commits ("commit you are merging into", "common
+ancestor commit" and "commit you are merging from" respectively)
+
+`MERGED` is a writable buffer where you have to resolve the conflicts (using the
+other read-only buffers as a reference). Once you are done, save and exit Vim as
+usual (`:wq`) or, if you want to abort, exit using `:cq`.
+
+Layout configuration
+^^^^^^^^^^^^^^^^^^^^
+
+You can change the windows layout used by Vim by setting configuration variable
+`mergetool.vimdiff.layout` which accepts a string where the following separators
+have special meaning:
+
+ - `+` is used to "open a new tab"
+ - `,` is used to "open a new vertical split"
+ - `/` is used to "open a new horizontal split"
+ - `@` is used to indicate which is the file containing the final version after
+ solving the conflicts. If not present, `MERGED` will be used by default.
+
+The precedence of the operators is this one (you can use parentheses to change
+it):
+
+ `@` > `+` > `/` > `,`
+
+Let's see some examples to understand how it works:
+
+* `layout = "(LOCAL,BASE,REMOTE)/MERGED"`
++
+--
+This is exactly the same as the default layout we have already seen.
+
+Note that `/` has precedence over `,` and thus the parenthesis are not
+needed in this case. The next layout definition is equivalent:
+
+ layout = "LOCAL,BASE,REMOTE / MERGED"
+--
+* `layout = "LOCAL,MERGED,REMOTE"`
++
+--
+If, for some reason, we are not interested in the `BASE` buffer.
+....
+------------------------------------------
+| | | |
+| | | |
+| LOCAL | MERGED | REMOTE |
+| | | |
+| | | |
+------------------------------------------
+....
+--
+* `layout = "MERGED"`
++
+--
+Only the `MERGED` buffer will be shown. Note, however, that all the other
+ones are still loaded in vim, and you can access them with the "buffers"
+command.
+....
+------------------------------------------
+| |
+| |
+| MERGED |
+| |
+| |
+------------------------------------------
+....
+--
+* `layout = "@LOCAL,REMOTE"`
++
+--
+When `MERGED` is not present in the layout, you must "mark" one of the
+buffers with an asterisk. That will become the buffer you need to edit and
+save after resolving the conflicts.
+....
+------------------------------------------
+| | |
+| | |
+| | |
+| LOCAL | REMOTE |
+| | |
+| | |
+| | |
+------------------------------------------
+....
+--
+* `layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE"`
++
+--
+Three tabs will open: the first one is a copy of the default layout, while
+the other two only show the differences between (`BASE` and `LOCAL`) and
+(`BASE` and `REMOTE`) respectively.
+....
+------------------------------------------
+| <TAB #1> | TAB #2 | TAB #3 | |
+------------------------------------------
+| | | |
+| LOCAL | BASE | REMOTE |
+| | | |
+------------------------------------------
+| |
+| MERGED |
+| |
+------------------------------------------
+....
+....
+------------------------------------------
+| TAB #1 | <TAB #2> | TAB #3 | |
+------------------------------------------
+| | |
+| | |
+| | |
+| BASE | LOCAL |
+| | |
+| | |
+| | |
+------------------------------------------
+....
+....
+------------------------------------------
+| TAB #1 | TAB #2 | <TAB #3> | |
+------------------------------------------
+| | |
+| | |
+| | |
+| BASE | REMOTE |
+| | |
+| | |
+| | |
+------------------------------------------
+....
+--
+* `layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE + (LOCAL/BASE/REMOTE),MERGED"`
++
+--
+Same as the previous example, but adds a fourth tab with the same
+information as the first tab, with a different layout.
+....
+---------------------------------------------
+| TAB #1 | TAB #2 | TAB #3 | <TAB #4> |
+---------------------------------------------
+| LOCAL | |
+|---------------------| |
+| BASE | MERGED |
+|---------------------| |
+| REMOTE | |
+---------------------------------------------
+....
+Note how in the third tab definition we need to use parenthesis to make `,`
+have precedence over `/`.
+--
+
+Variants
+^^^^^^^^
+
+Instead of `--tool=vimdiff`, you can also use one of these other variants:
+
+ * `--tool=gvimdiff`, to open gVim instead of Vim.
+
+ * `--tool=nvimdiff`, to open Neovim instead of Vim.
+
+When using these variants, in order to specify a custom layout you will have to
+set configuration variables `mergetool.gvimdiff.layout` and
+`mergetool.nvimdiff.layout` instead of `mergetool.vimdiff.layout`
+
+In addition, for backwards compatibility with previous Git versions, you can
+also append `1`, `2` or `3` to either `vimdiff` or any of the variants (ex:
+`vimdiff3`, `nvimdiff1`, etc...) to use a predefined layout.
+In other words, using `--tool=[g,n,]vimdiffx` is the same as using
+`--tool=[g,n,]vimdiff` and setting configuration variable
+`mergetool.[g,n,]vimdiff.layout` to...
+
+ * `x=1`: `"@LOCAL, REMOTE"`
+ * `x=2`: `"LOCAL, MERGED, REMOTE"`
+ * `x=3`: `"MERGED"`
+
+Example: using `--tool=gvimdiff2` will open `gvim` with three columns (LOCAL,
+MERGED and REMOTE).
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index ef6bd42..0b4c1c8 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -20,7 +20,7 @@
* 'oneline'
- <hash> <title line>
+ <hash> <title-line>
+
This is designed to be as compact as possible.
@@ -29,17 +29,17 @@
commit <hash>
Author: <author>
- <title line>
+ <title-line>
* 'medium'
commit <hash>
Author: <author>
- Date: <author date>
+ Date: <author-date>
- <title line>
+ <title-line>
- <full commit message>
+ <full-commit-message>
* 'full'
@@ -47,25 +47,25 @@
Author: <author>
Commit: <committer>
- <title line>
+ <title-line>
- <full commit message>
+ <full-commit-message>
* 'fuller'
commit <hash>
Author: <author>
- AuthorDate: <author date>
+ AuthorDate: <author-date>
Commit: <committer>
- CommitDate: <committer date>
+ CommitDate: <committer-date>
- <title line>
+ <title-line>
- <full commit message>
+ <full-commit-message>
* 'reference'
- <abbrev hash> (<title line>, <short author date>)
+ <abbrev-hash> (<title-line>, <short-author-date>)
+
This format is used to refer to another commit in a commit message and
is the same as `--pretty='format:%C(auto)%h (%s, %ad)'`. By default,
@@ -78,10 +78,10 @@
From <hash> <date>
From: <author>
- Date: <author date>
- Subject: [PATCH] <title line>
+ Date: <author-date>
+ Subject: [PATCH] <title-line>
- <full commit message>
+ <full-commit-message>
* 'mboxrd'
+
@@ -101,9 +101,9 @@
`git log --raw`. To get full object names in a raw diff format,
use `--no-abbrev`.
-* 'format:<string>'
+* 'format:<format-string>'
+
-The 'format:<string>' format allows you to specify which information
+The 'format:<format-string>' format allows you to specify which information
you want to show. It works a little bit like printf format,
with the notable exception that you get a newline with '%n'
instead of '\n'.
@@ -220,6 +220,12 @@
inconsistent when tags are added or removed at
the same time.
+
+** 'tags[=<bool-value>]': Instead of only considering annotated tags,
+ consider lightweight tags as well.
+** 'abbrev=<number>': Instead of using the default number of hexadecimal digits
+ (which will vary according to the number of objects in the repository with a
+ default of 7) of the abbreviated object name, use <number> digits, or as many
+ digits as needed to form a unique object name.
** 'match=<pattern>': Only consider tags matching the given
`glob(7)` pattern, excluding the "refs/tags/" prefix.
** 'exclude=<pattern>': Do not consider tags matching the given
@@ -273,12 +279,7 @@
If any option is provided multiple times the
last occurrence wins.
+
-The boolean options accept an optional value `[=<BOOL>]`. The values
-`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"
-sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean
-option is given with no value, it's enabled.
-+
-** 'key=<K>': only show trailers with specified key. Matching is done
+** 'key=<key>': only show trailers with specified <key>. Matching is done
case-insensitively and trailing colon is optional. If option is
given multiple times trailer lines matching any of the keys are
shown. This option automatically enables the `only` option so that
@@ -286,25 +287,25 @@
desired it can be disabled with `only=false`. E.g.,
`%(trailers:key=Reviewed-by)` shows trailer lines with key
`Reviewed-by`.
-** 'only[=<BOOL>]': select whether non-trailer lines from the trailer
+** 'only[=<bool>]': select whether non-trailer lines from the trailer
block should be included.
-** 'separator=<SEP>': specify a separator inserted between trailer
+** 'separator=<sep>': specify a separator inserted between trailer
lines. When this option is not given each trailer line is
- terminated with a line feed character. The string SEP may contain
+ terminated with a line feed character. The string <sep> may contain
the literal formatting codes described above. To use comma as
separator one must use `%x2C` as it would otherwise be parsed as
next option. E.g., `%(trailers:key=Ticket,separator=%x2C )`
shows all trailer lines whose key is "Ticket" separated by a comma
and a space.
-** 'unfold[=<BOOL>]': make it behave as if interpret-trailer's `--unfold`
+** 'unfold[=<bool>]': make it behave as if interpret-trailer's `--unfold`
option was given. E.g.,
`%(trailers:only,unfold=true)` unfolds and shows all trailer lines.
-** 'keyonly[=<BOOL>]': only show the key part of the trailer.
-** 'valueonly[=<BOOL>]': only show the value part of the trailer.
-** 'key_value_separator=<SEP>': specify a separator inserted between
+** 'keyonly[=<bool>]': only show the key part of the trailer.
+** 'valueonly[=<bool>]': only show the value part of the trailer.
+** 'key_value_separator=<sep>': specify a separator inserted between
trailer lines. When this option is not given each trailer key-value
pair is separated by ": ". Otherwise it shares the same semantics
- as 'separator=<SEP>' above.
+ as 'separator=<sep>' above.
NOTE: Some placeholders may depend on other options given to the
revision traversal engine. For example, the `%g*` reflog options will
@@ -313,6 +314,11 @@
decoration format if `--decorate` was not already provided on the command
line.
+The boolean options accept an optional value `[=<bool-value>]`. The values
+`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"
+sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean
+option is given with no value, it's enabled.
+
If you add a `+` (plus sign) after '%' of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index b3af850..dc685be 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -41,8 +41,8 @@
in `X` and we are outputting in `X`, we will output the object
verbatim; this means that invalid sequences in the original
commit may be copied to the output. Likewise, if iconv(3) fails
- to convert the commit, we will output the original object
- verbatim, along with a warning.
+ to convert the commit, we will quietly output the original
+ object verbatim.
--expand-tabs=<n>::
--expand-tabs::
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index b7bd27e..195e74e 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -25,6 +25,11 @@
--after=<date>::
Show commits more recent than a specific date.
+--since-as-filter=<date>::
+ Show all commits more recent than a specific date. This visits
+ all commits in the range, rather than stopping at the first commit which
+ is older than a specific date.
+
--until=<date>::
--before=<date>::
Show commits older than a specific date.
@@ -122,19 +127,27 @@
parents) and `--max-parents=-1` (negative numbers denote no upper limit).
--first-parent::
- Follow only the first parent commit upon seeing a merge
- commit. This option can give a better overview when
- viewing the evolution of a particular topic branch,
- because merges into a topic branch tend to be only about
- adjusting to updated upstream from time to time, and
- this option allows you to ignore the individual commits
- brought in to your history by such a merge.
+ When finding commits to include, follow only the first
+ parent commit upon seeing a merge commit. This option
+ can give a better overview when viewing the evolution of
+ a particular topic branch, because merges into a topic
+ branch tend to be only about adjusting to updated upstream
+ from time to time, and this option allows you to ignore
+ the individual commits brought in to your history by such
+ a merge.
ifdef::git-log[]
+
This option also changes default diff format for merge commits
to `first-parent`, see `--diff-merges=first-parent` for details.
endif::git-log[]
+--exclude-first-parent-only::
+ When finding commits to exclude (with a '{caret}'), follow only
+ the first parent commit upon seeing a merge commit.
+ This can be used to find the set of changes in a topic branch
+ from the point where it diverged from the remote branch, given
+ that arbitrary merges can be valid topic branch changes.
+
--not::
Reverses the meaning of the '{caret}' prefix (or lack thereof)
for all following revision specifiers, up to the next `--not`.
@@ -968,11 +981,6 @@
objects.
endif::git-rev-list[]
---unsorted-input::
- Show commits in the order they were given on the command line instead
- of sorting them in reverse chronological order by commit time. Cannot
- be combined with `--no-walk` or `--no-walk=sorted`.
-
--no-walk[=(sorted|unsorted)]::
Only show the given commits, but do not traverse their ancestors.
This has no effect if a range is specified. If the argument
@@ -980,8 +988,7 @@
given on the command line. Otherwise (if `sorted` or no argument
was given), the commits are shown in reverse chronological order
by commit time.
- Cannot be combined with `--graph`. Cannot be combined with
- `--unsorted-input` if `sorted` or no argument was given.
+ Cannot be combined with `--graph`.
--do-walk::
Overrides a previous `--no-walk`.
@@ -1053,7 +1060,7 @@
has no effect.
`--date=format:...` feeds the format `...` to your system `strftime`,
-except for %z and %Z, which are handled internally.
+except for %s, %z, and %Z, which are handled internally.
Use `--date=format:%c` to show the date in your system locale's
preferred format. See the `strftime` manual for a complete list of
format placeholders. When using `-local`, the correct syntax is
diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt
index b9f3198..f4a8a69 100644
--- a/Documentation/technical/api-trace2.txt
+++ b/Documentation/technical/api-trace2.txt
@@ -5,7 +5,7 @@
explicitly enabled by enabling one or more Trace2 Targets.
The Trace2 API is intended to replace the existing (Trace1)
-printf-style tracing provided by the existing `GIT_TRACE` and
+`printf()`-style tracing provided by the existing `GIT_TRACE` and
`GIT_TRACE_PERFORMANCE` facilities. During initial implementation,
Trace2 and Trace1 may operate in parallel.
@@ -24,8 +24,8 @@
Trace2 is controlled using `trace2.*` config values in the system and
global config files and `GIT_TRACE2*` environment variables. Trace2 does
-not read from repo local or worktree config files or respect `-c`
-command line config settings.
+not read from repo local or worktree config files, nor does it respect
+`-c` command line config settings.
== Trace2 Targets
@@ -34,8 +34,8 @@
=== The Normal Format Target
-The normal format target is a tradition printf format and similar
-to GIT_TRACE format. This format is enabled with the `GIT_TRACE2`
+The normal format target is a traditional `printf()` format and similar
+to the `GIT_TRACE` format. This format is enabled with the `GIT_TRACE2`
environment variable or the `trace2.normalTarget` system or global
config setting.
@@ -69,8 +69,8 @@
=== The Performance Format Target
The performance format target (PERF) is a column-based format to
-replace GIT_TRACE_PERFORMANCE and is suitable for development and
-testing, possibly to complement tools like gprof. This format is
+replace `GIT_TRACE_PERFORMANCE` and is suitable for development and
+testing, possibly to complement tools like `gprof`. This format is
enabled with the `GIT_TRACE2_PERF` environment variable or the
`trace2.perfTarget` system or global config setting.
@@ -128,7 +128,7 @@
------------
$ cat ~/log.event
-{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"2","exe":"2.20.1.155.g426c96fcdb"}
+{"event":"version","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"3","exe":"2.20.1.155.g426c96fcdb"}
{"event":"start","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621027Z","file":"common-main.c","line":39,"t_abs":0.001173,"argv":["git","version"]}
{"event":"cmd_name","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621122Z","file":"git.c","line":432,"name":"version","hierarchy":"version"}
{"event":"exit","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621236Z","file":"git.c","line":662,"t_abs":0.001227,"code":0}
@@ -170,9 +170,9 @@
take a `va_list` argument.
Some functions have a `_printf_fl()` suffix to indicate that they also
-take a varargs argument.
+take a `printf()` style format with a variable number of arguments.
-There are CPP wrapper macros and ifdefs to hide most of these details.
+There are CPP wrapper macros and `#ifdef`s to hide most of these details.
See `trace2.h` for more details. The following discussion will only
describe the simplified forms.
@@ -234,7 +234,7 @@
is the event name.
`<event-message>`::
- is a free-form printf message intended for human consumption.
+ is a free-form `printf()` message intended for human consumption.
+
Note that this may contain embedded LF or CRLF characters that are
not escaped, so the event may spill across multiple lines.
@@ -300,7 +300,7 @@
indicate a broad category, such as "index" or "status".
`<perf-event-message>`::
- is a free-form printf message intended for human consumption.
+ is a free-form `printf()` message intended for human consumption.
------------
15:33:33.532712 wt-status.c:2310 | d0 | main | region_enter | r1 | 0.126064 | | status | label:print
@@ -391,7 +391,7 @@
{
"event":"version",
...
- "evt":"2", # EVENT format version
+ "evt":"3", # EVENT format version
"exe":"2.20.1.155.g426c96fcdb" # git version
}
------------
@@ -533,7 +533,7 @@
------------
`"cmd_mode"`::
- This event, when present, describes the command variant This
+ This event, when present, describes the command variant. This
event may be emitted more than once.
+
------------
@@ -588,7 +588,7 @@
`"child_exit"`::
This event is generated after the current process has returned
- from the waitpid() and collected the exit information from the
+ from the `waitpid()` and collected the exit information from the
child.
+
------------
@@ -609,10 +609,50 @@
+
Note that the `t_rel` field contains the observed run time in seconds
for the child process (starting before the fork/exec/spawn and
-stopping after the waitpid() and includes OS process creation overhead).
+stopping after the `waitpid()` and includes OS process creation overhead).
So this time will be slightly larger than the atexit time reported by
the child process itself.
+`"child_ready"`::
+ This event is generated after the current process has started
+ a background process and released all handles to it.
++
+------------
+{
+ "event":"child_ready",
+ ...
+ "child_id":2,
+ "pid":14708, # child PID
+ "ready":"ready", # child ready state
+ "t_rel":0.110605 # observed run-time of child process
+}
+------------
++
+Note that the session-id of the child process is not available to
+the current/spawning process, so the child's PID is reported here as
+a hint for post-processing. (But it is only a hint because the child
+process may be a shell script which doesn't have a session-id.)
++
+This event is generated after the child is started in the background
+and given a little time to boot up and start working. If the child
+starts up normally while the parent is still waiting, the "ready"
+field will have the value "ready".
+If the child is too slow to start and the parent times out, the field
+will have the value "timeout".
+If the child starts but the parent is unable to probe it, the field
+will have the value "error".
++
+After the parent process emits this event, it will release all of its
+handles to the child process and treat the child as a background
+daemon. So even if the child does eventually finish booting up,
+the parent will not emit an updated event.
++
+Note that the `t_rel` field contains the observed run time in seconds
+when the parent released the child process into the background.
+The child is assumed to be a long-running daemon process and may
+outlive the parent process. So the parent's child event times should
+not be compared to the child's atexit times.
+
`"exec"`::
This event is generated before git attempts to `exec()`
another command rather than starting a child process.
@@ -909,7 +949,7 @@
Regions::
- Regions can be use to time an interesting section of code.
+ Regions can be used to time an interesting section of code.
+
----------------
void wt_status_collect(struct wt_status *s)
@@ -1063,9 +1103,9 @@
Thread messages added to a thread-proc.
+
-For example, the multithreaded preload-index code can be
+For example, the multi-threaded preload-index code can be
instrumented with a region around the thread pool and then
-per-thread start and exit events within the threadproc.
+per-thread start and exit events within the thread-proc.
+
----------------
static void *preload_thread(void *_data)
@@ -1174,11 +1214,11 @@
There are a few issues to resolve before we can completely
switch to Trace2.
-* Updating existing tests that assume GIT_TRACE format messages.
+* Updating existing tests that assume `GIT_TRACE` format messages.
-* How to best handle custom GIT_TRACE_<key> messages?
+* How to best handle custom `GIT_TRACE_<key>` messages?
-** The GIT_TRACE_<key> mechanism allows each <key> to write to a
+** The `GIT_TRACE_<key>` mechanism allows each <key> to write to a
different file (in addition to just stderr).
** Do we want to maintain that ability or simply write to the existing
diff --git a/Documentation/technical/bundle-format.txt b/Documentation/technical/bundle-format.txt
index bac558d..b9be864 100644
--- a/Documentation/technical/bundle-format.txt
+++ b/Documentation/technical/bundle-format.txt
@@ -71,6 +71,11 @@
== Capabilities
Because there is no opportunity for negotiation, unknown capabilities cause 'git
-bundle' to abort. The only known capability is `object-format`, which specifies
-the hash algorithm in use, and can take the same values as the
-`extensions.objectFormat` configuration value.
+bundle' to abort.
+
+* `object-format` specifies the hash algorithm in use, and can take the same
+ values as the `extensions.objectFormat` configuration value.
+
+* `filter` specifies an object filter as in the `--filter` option in
+ linkgit:git-rev-list[1]. The resulting pack-file must be marked as a
+ `.promisor` pack-file after it is unbundled.
diff --git a/Documentation/technical/commit-graph-format.txt b/Documentation/technical/commit-graph-format.txt
index 87971c2..484b185 100644
--- a/Documentation/technical/commit-graph-format.txt
+++ b/Documentation/technical/commit-graph-format.txt
@@ -93,7 +93,7 @@
2 bits of the lowest byte, storing the 33rd and 34th bit of the
commit time.
- Generation Data (ID: {'G', 'D', 'A', 'T' }) (N * 4 bytes) [Optional]
+ Generation Data (ID: {'G', 'D', 'A', '2' }) (N * 4 bytes) [Optional]
* This list of 4-byte values store corrected commit date offsets for the
commits, arranged in the same order as commit data chunk.
* If the corrected commit date offset cannot be stored within 31 bits,
@@ -104,7 +104,7 @@
by compatible versions of Git and in case of split commit-graph chains,
the topmost layer also has Generation Data chunk.
- Generation Data Overflow (ID: {'G', 'D', 'O', 'V' }) [Optional]
+ Generation Data Overflow (ID: {'G', 'D', 'O', '2' }) [Optional]
* This list of 8-byte values stores the corrected commit date offsets
for commits with corrected commit date offsets that cannot be
stored within 31 bits.
@@ -156,3 +156,11 @@
TRAILER:
H-byte HASH-checksum of all of the above.
+
+== Historical Notes:
+
+The Generation Data (GDA2) and Generation Data Overflow (GDO2) chunks have
+the number '2' in their chunk IDs because a previous version of Git wrote
+possibly erroneous data in these chunks with the IDs "GDAT" and "GDOV". By
+changing the IDs, newer versions of Git will silently ignore those older
+chunks and write the new information without trusting the incorrect data.
diff --git a/Documentation/technical/cruft-packs.txt b/Documentation/technical/cruft-packs.txt
new file mode 100644
index 0000000..d81f3a8
--- /dev/null
+++ b/Documentation/technical/cruft-packs.txt
@@ -0,0 +1,123 @@
+= Cruft packs
+
+The cruft packs feature offer an alternative to Git's traditional mechanism of
+removing unreachable objects. This document provides an overview of Git's
+pruning mechanism, and how a cruft pack can be used instead to accomplish the
+same.
+
+== Background
+
+To remove unreachable objects from your repository, Git offers `git repack -Ad`
+(see linkgit:git-repack[1]). Quoting from the documentation:
+
+[quote]
+[...] unreachable objects in a previous pack become loose, unpacked objects,
+instead of being left in the old pack. [...] loose unreachable objects will be
+pruned according to normal expiry rules with the next 'git gc' invocation.
+
+Unreachable objects aren't removed immediately, since doing so could race with
+an incoming push which may reference an object which is about to be deleted.
+Instead, those unreachable objects are stored as loose objects and stay that way
+until they are older than the expiration window, at which point they are removed
+by linkgit:git-prune[1].
+
+Git must store these unreachable objects loose in order to keep track of their
+per-object mtimes. If these unreachable objects were written into one big pack,
+then either freshening that pack (because an object contained within it was
+re-written) or creating a new pack of unreachable objects would cause the pack's
+mtime to get updated, and the objects within it would never leave the expiration
+window. Instead, objects are stored loose in order to keep track of the
+individual object mtimes and avoid a situation where all cruft objects are
+freshened at once.
+
+This can lead to undesirable situations when a repository contains many
+unreachable objects which have not yet left the grace period. Having large
+directories in the shards of `.git/objects` can lead to decreased performance in
+the repository. But given enough unreachable objects, this can lead to inode
+starvation and degrade the performance of the whole system. Since we
+can never pack those objects, these repositories often take up a large amount of
+disk space, since we can only zlib compress them, but not store them in delta
+chains.
+
+== Cruft packs
+
+A cruft pack eliminates the need for storing unreachable objects in a loose
+state by including the per-object mtimes in a separate file alongside a single
+pack containing all loose objects.
+
+A cruft pack is written by `git repack --cruft` when generating a new pack.
+linkgit:git-pack-objects[1]'s `--cruft` option. Note that `git repack --cruft`
+is a classic all-into-one repack, meaning that everything in the resulting pack is
+reachable, and everything else is unreachable. Once written, the `--cruft`
+option instructs `git repack` to generate another pack containing only objects
+not packed in the previous step (which equates to packing all unreachable
+objects together). This progresses as follows:
+
+ 1. Enumerate every object, marking any object which is (a) not contained in a
+ kept-pack, and (b) whose mtime is within the grace period as a traversal
+ tip.
+
+ 2. Perform a reachability traversal based on the tips gathered in the previous
+ step, adding every object along the way to the pack.
+
+ 3. Write the pack out, along with a `.mtimes` file that records the per-object
+ timestamps.
+
+This mode is invoked internally by linkgit:git-repack[1] when instructed to
+write a cruft pack. Crucially, the set of in-core kept packs is exactly the set
+of packs which will not be deleted by the repack; in other words, they contain
+all of the repository's reachable objects.
+
+When a repository already has a cruft pack, `git repack --cruft` typically only
+adds objects to it. An exception to this is when `git repack` is given the
+`--cruft-expiration` option, which allows the generated cruft pack to omit
+expired objects instead of waiting for linkgit:git-gc[1] to expire those objects
+later on.
+
+It is linkgit:git-gc[1] that is typically responsible for removing expired
+unreachable objects.
+
+== Caution for mixed-version environments
+
+Repositories that have cruft packs in them will continue to work with any older
+version of Git. Note, however, that previous versions of Git which do not
+understand the `.mtimes` file will use the cruft pack's mtime as the mtime for
+all of the objects in it. In other words, do not expect older (pre-cruft pack)
+versions of Git to interpret or even read the contents of the `.mtimes` file.
+
+Note that having mixed versions of Git GC-ing the same repository can lead to
+unreachable objects never being completely pruned. This can happen under the
+following circumstances:
+
+ - An older version of Git running GC explodes the contents of an existing
+ cruft pack loose, using the cruft pack's mtime.
+ - A newer version running GC collects those loose objects into a cruft pack,
+ where the .mtime file reflects the loose object's actual mtimes, but the
+ cruft pack mtime is "now".
+
+Repeating this process will lead to unreachable objects not getting pruned as a
+result of repeatedly resetting the objects' mtimes to the present time.
+
+If you are GC-ing repositories in a mixed version environment, consider omitting
+the `--cruft` option when using linkgit:git-repack[1] and linkgit:git-gc[1], and
+leaving the `gc.cruftPacks` configuration unset until all writers understand
+cruft packs.
+
+== Alternatives
+
+Notable alternatives to this design include:
+
+ - The location of the per-object mtime data, and
+ - Storing unreachable objects in multiple cruft packs.
+
+On the location of mtime data, a new auxiliary file tied to the pack was chosen
+to avoid complicating the `.idx` format. If the `.idx` format were ever to gain
+support for optional chunks of data, it may make sense to consolidate the
+`.mtimes` format into the `.idx` itself.
+
+Storing unreachable objects among multiple cruft packs (e.g., creating a new
+cruft pack during each repacking operation including only unreachable objects
+which aren't already stored in an earlier cruft pack) is significantly more
+complicated to construct, and so aren't pursued here. The obvious drawback to
+the current implementation is that the entire cruft pack must be re-written from
+scratch.
diff --git a/Documentation/technical/multi-pack-index.txt b/Documentation/technical/multi-pack-index.txt
index 86f40f2..f2221d2 100644
--- a/Documentation/technical/multi-pack-index.txt
+++ b/Documentation/technical/multi-pack-index.txt
@@ -17,13 +17,14 @@
The multi-pack-index (MIDX for short) stores a list of objects
and their offsets into multiple packfiles. It contains:
-- A list of packfile names.
-- A sorted list of object IDs.
-- A list of metadata for the ith object ID including:
- - A value j referring to the jth packfile.
- - An offset within the jth packfile for the object.
-- If large offsets are required, we use another list of large
+* A list of packfile names.
+* A sorted list of object IDs.
+* A list of metadata for the ith object ID including:
+** A value j referring to the jth packfile.
+** An offset within the jth packfile for the object.
+* If large offsets are required, we use another list of large
offsets similar to version 2 pack-indexes.
+- An optional list of objects in pseudo-pack order (used with MIDX bitmaps).
Thus, we can provide O(log N) lookup time for any number
of packfiles.
@@ -87,11 +88,6 @@
helpful to organize packfiles by object type (commit, tree, blob,
etc.) and use this metadata to help that maintenance.
-- The partial clone feature records special "promisor" packs that
- may point to objects that are not stored locally, but available
- on request to a server. The multi-pack-index does not currently
- track these promisor packs.
-
Related Links
-------------
[0] https://bugs.chromium.org/p/git/issues/detail?id=6
diff --git a/Documentation/technical/pack-format.txt b/Documentation/technical/pack-format.txt
index 8d2f42f..b520aa9 100644
--- a/Documentation/technical/pack-format.txt
+++ b/Documentation/technical/pack-format.txt
@@ -294,6 +294,25 @@
All 4-byte numbers are in network order.
+== pack-*.mtimes files have the format:
+
+All 4-byte numbers are in network byte order.
+
+ - A 4-byte magic number '0x4d544d45' ('MTME').
+
+ - A 4-byte version identifier (= 1).
+
+ - A 4-byte hash function identifier (= 1 for SHA-1, 2 for SHA-256).
+
+ - A table of 4-byte unsigned integers. The ith value is the
+ modification time (mtime) of the ith object in the corresponding
+ pack by lexicographic (index) order. The mtimes count standard
+ epoch seconds.
+
+ - A trailer, containing a checksum of the corresponding packfile,
+ and a checksum of all of the above (each having length according
+ to the specified hash function).
+
== multi-pack-index (MIDX) files have the following format:
The multi-pack-index files refer to multiple pack-files and loose objects.
@@ -376,6 +395,11 @@
[Optional] Object Large Offsets (ID: {'L', 'O', 'F', 'F'})
8-byte offsets into large packfiles.
+ [Optional] Bitmap pack order (ID: {'R', 'I', 'D', 'X'})
+ A list of MIDX positions (one per object in the MIDX, num_objects in
+ total, each a 4-byte unsigned integer in network byte order), sorted
+ according to their relative bitmap/pseudo-pack positions.
+
TRAILER:
Index checksum of the above contents.
@@ -456,9 +480,5 @@
objects in packs stored by the MIDX, laid out in pack order, and the
packs arranged in MIDX order (with the preferred pack coming first).
-Finally, note that the MIDX's reverse index is not stored as a chunk in
-the multi-pack-index itself. This is done because the reverse index
-includes the checksum of the pack or MIDX to which it belongs, which
-makes it impossible to write in the MIDX. To avoid races when rewriting
-the MIDX, a MIDX reverse index includes the MIDX's checksum in its
-filename (e.g., `multi-pack-index-xyz.rev`).
+The MIDX's reverse index is stored in the optional 'RIDX' chunk within
+the MIDX itself.
diff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt
index a0dd7c6..99f0eb3 100644
--- a/Documentation/technical/partial-clone.txt
+++ b/Documentation/technical/partial-clone.txt
@@ -181,6 +181,9 @@
currently fetches all objects referred to by the requested objects, even
though they are not necessary.
+- Fetching with `--refetch` will request a complete new filtered packfile from
+ the remote, which can be used to change a filter without needing to
+ dynamically fetch missing objects.
Using many promisor remotes
---------------------------
diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt
index 21e8258..8a877d2 100644
--- a/Documentation/technical/protocol-v2.txt
+++ b/Documentation/technical/protocol-v2.txt
@@ -125,11 +125,11 @@
empty-request = flush-pkt
command-request = command
capability-list
- [command-args]
+ delim-pkt
+ command-args
flush-pkt
command = PKT-LINE("command=" key LF)
- command-args = delim-pkt
- *command-specific-arg
+ command-args = *command-specific-arg
command-specific-args are packet line framed arguments defined by
each individual command.
diff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.txt
index d7c3b64..6a67cc4 100644
--- a/Documentation/technical/reftable.txt
+++ b/Documentation/technical/reftable.txt
@@ -443,7 +443,7 @@
Object blocks are optional. Writers may choose to omit object blocks,
especially if readers will not use the object name to ref mapping.
-Object blocks use unique, abbreviated 2-32 object name keys, mapping to
+Object blocks use unique, abbreviated 2-31 byte object name keys, mapping to
ref blocks containing references pointing to that object directly, or as
the peeled value of an annotated tag. Like ref blocks, object blocks use
the file's standard block size. The abbreviation length is available in
diff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt
index af5f9fc..35d4541 100644
--- a/Documentation/technical/rerere.txt
+++ b/Documentation/technical/rerere.txt
@@ -14,9 +14,9 @@
Different conflict styles and branch names are normalized by stripping
the labels from the conflict markers, and removing the common ancestor
-version from the `diff3` conflict style. Branches that are merged
-in different order are normalized by sorting the conflict hunks. More
-on each of those steps in the following sections.
+version from the `diff3` or `zdiff3` conflict styles. Branches that
+are merged in different order are normalized by sorting the conflict
+hunks. More on each of those steps in the following sections.
Once these two normalization operations are applied, a conflict ID is
calculated based on the normalized conflict, which is later used by
@@ -42,8 +42,8 @@
>>>>>>> AC
Doing the analogous with AC2 (forking a branch ABAC2 off of branch AB
-and then merging branch AC2 into it), using the diff3 conflict style,
-we get a conflict like the following:
+and then merging branch AC2 into it), using the diff3 or zdiff3
+conflict style, we get a conflict like the following:
<<<<<<< HEAD
B
diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt
index 2c9406a..166721b 100644
--- a/Documentation/technical/signature-format.txt
+++ b/Documentation/technical/signature-format.txt
@@ -13,6 +13,22 @@
and end with `-----END PGP SIGNATURE-----`, unless gpg is told to
produce RFC1991 signatures which use `MESSAGE` instead of `SIGNATURE`.
+Signatures sometimes appear as a part of the normal payload
+(e.g. a signed tag has the signature block appended after the payload
+that the signature applies to), and sometimes appear in the value of
+an object header (e.g. a merge commit that merged a signed tag would
+have the entire tag contents on its "mergetag" header). In the case
+of the latter, the usual multi-line formatting rule for object
+headers applies. I.e. the second and subsequent lines are prefixed
+with a SP to signal that the line is continued from the previous
+line.
+
+This is even true for an originally empty line. In the following
+examples, the end of line that ends with a whitespace letter is
+highlighted with a `$` sign; if you are trying to recreate these
+example by hand, do not cut and paste them---they are there
+primarily to highlight extra whitespace at the end of some lines.
+
The signed payload and the way the signature is embedded depends
on the type of the object resp. transaction.
@@ -78,7 +94,7 @@
committer C O Mitter <committer@example.com> 1465981137 +0000
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-
+ $
iQEcBAABAgAGBQJXYRjRAAoJEGEJLoW3InGJ3IwIAIY4SA6GxY3BjL60YyvsJPh/
HRCJwH+w7wt3Yc/9/bW2F+gF72kdHOOs2jfv+OZhq0q4OAN6fvVSczISY/82LpS7
DVdMQj2/YcHDT4xrDNBnXnviDO9G7am/9OE77kEbXrp7QPxvhjkicHNwy2rEflAA
@@ -128,13 +144,13 @@
type commit
tag signedtag
tagger C O Mitter <committer@example.com> 1465981006 +0000
-
+ $
signed tag
-
+ $
signed tag message body
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-
+ $
iQEcBAABAgAGBQJXYRhOAAoJEGEJLoW3InGJklkIAIcnhL7RwEb/+QeX9enkXhxn
rxfdqrvWd1K80sl2TOt8Bg/NYwrUBw/RWJ+sg/hhHp4WtvE1HDGHlkEz3y11Lkuh
8tSxS3qKTxXUGozyPGuE90sJfExhZlW4knIQ1wt/yWqM+33E9pN4hzPqLwyrdods
diff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt
index bd184cd..86d0008 100644
--- a/Documentation/urls-remotes.txt
+++ b/Documentation/urls-remotes.txt
@@ -26,14 +26,14 @@
------------
[remote "<name>"]
- url = <url>
+ url = <URL>
pushurl = <pushurl>
push = <refspec>
fetch = <refspec>
------------
The `<pushurl>` is used for pushes only. It is optional and defaults
-to `<url>`.
+to `<URL>`.
Named file in `$GIT_DIR/remotes`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -67,10 +67,10 @@
------------
- <url>#<head>
+ <URL>#<head>
------------
-`<url>` is required; `#<head>` is optional.
+`<URL>` is required; `#<head>` is optional.
Depending on the operation, git will use one of the following
refspecs, if you don't provide one on the command line.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b48559d..1d66769 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.33.GIT
+DEF_VER=v2.36.GIT
LF='
'
diff --git a/Makefile b/Makefile
index c3bbfae..790382b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
# The default target of this Makefile is...
all::
+# Import tree-wide shared Makefile behavior and libraries
+include shared.mak
+
# Define V=1 to have a more verbose compile.
#
# Define SHELL_PATH to a POSIX shell if your /bin/sh is broken.
@@ -234,6 +237,14 @@
# Define NO_TRUSTABLE_FILEMODE if your filesystem may claim to support
# the executable mode bit, but doesn't really do so.
#
+# Define CSPRNG_METHOD to "arc4random" if your system has arc4random and
+# arc4random_buf, "libbsd" if your system has those functions from libbsd,
+# "getrandom" if your system has getrandom, "getentropy" if your system has
+# getentropy, "rtlgenrandom" for RtlGenRandom (Windows only), or "openssl" if
+# you'd want to use the OpenSSL CSPRNG. You may set multiple options with
+# spaces, in which case a suitable option will be chosen. If unset or set to
+# anything else, defaults to using "/dev/urandom".
+#
# Define NEEDS_MODE_TRANSLATION if your OS strays from the typical file type
# bits in mode values (e.g. z/OS defines I_SFMT to 0xFF000000 as opposed to the
# usual 0xF000).
@@ -305,9 +316,6 @@
#
# Define NO_TCLTK if you do not want Tcl/Tk GUI.
#
-# Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep
-# and egrep that are pickier when their input contains non-ASCII data.
-#
# The TCL_PATH variable governs the location of the Tcl interpreter
# used to optimize git-gui for your system. Only used if NO_TCLTK
# is not set. Defaults to the bare 'tclsh'.
@@ -406,6 +414,8 @@
#
# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC.
#
+# Define HAVE_SYNC_FILE_RANGE if your platform has sync_file_range.
+#
# Define NEEDS_LIBRT if your platform requires linking with librt (glibc version
# before 2.17) for clock_gettime and CLOCK_MONOTONIC.
#
@@ -465,6 +475,11 @@
# directory, and the JSON compilation database 'compile_commands.json' will be
# created at the root of the repository.
#
+# If your platform supports a built-in fsmonitor backend, set
+# FSMONITOR_DAEMON_BACKEND to the "<name>" of the corresponding
+# `compat/fsmonitor/fsm-listen-<name>.c` that implements the
+# `fsm_listen__*()` routines.
+#
# Define DEVELOPER to enable more compiler warnings. Compiler version
# and family are auto detected, but could be overridden by defining
# COMPILER_FEATURES (see config.mak.dev). You can still set
@@ -554,7 +569,9 @@
TCL_PATH = tclsh
TCLTK_PATH = wish
XGETTEXT = xgettext
+MSGCAT = msgcat
MSGFMT = msgfmt
+MSGMERGE = msgmerge
CURL_CONFIG = curl-config
GCOV = gcov
STRIP = strip
@@ -609,7 +626,6 @@
SCRIPT_SH += git-web--browse.sh
SCRIPT_LIB += git-mergetool--lib
-SCRIPT_LIB += git-rebase--preserve-merges
SCRIPT_LIB += git-sh-i18n
SCRIPT_LIB += git-sh-setup
@@ -695,6 +711,7 @@
TEST_BUILTINS_OBJS += test-chmtime.o
TEST_BUILTINS_OBJS += test-config.o
TEST_BUILTINS_OBJS += test-crontab.o
+TEST_BUILTINS_OBJS += test-csprng.o
TEST_BUILTINS_OBJS += test-ctype.o
TEST_BUILTINS_OBJS += test-date.o
TEST_BUILTINS_OBJS += test-delta.o
@@ -706,6 +723,7 @@
TEST_BUILTINS_OBJS += test-dump-untracked-cache.o
TEST_BUILTINS_OBJS += test-example-decorate.o
TEST_BUILTINS_OBJS += test-fast-rebase.o
+TEST_BUILTINS_OBJS += test-fsmonitor-client.o
TEST_BUILTINS_OBJS += test-genrandom.o
TEST_BUILTINS_OBJS += test-genzeros.o
TEST_BUILTINS_OBJS += test-getcwd.o
@@ -722,6 +740,7 @@
TEST_BUILTINS_OBJS += test-oidmap.o
TEST_BUILTINS_OBJS += test-oidtree.o
TEST_BUILTINS_OBJS += test-online-cpus.o
+TEST_BUILTINS_OBJS += test-pack-mtimes.o
TEST_BUILTINS_OBJS += test-parse-options.o
TEST_BUILTINS_OBJS += test-parse-pathspec-file.o
TEST_BUILTINS_OBJS += test-partial-clone.o
@@ -736,6 +755,7 @@
TEST_BUILTINS_OBJS += test-read-graph.o
TEST_BUILTINS_OBJS += test-read-midx.o
TEST_BUILTINS_OBJS += test-ref-store.o
+TEST_BUILTINS_OBJS += test-reftable.o
TEST_BUILTINS_OBJS += test-regex.o
TEST_BUILTINS_OBJS += test-repository.o
TEST_BUILTINS_OBJS += test-revision-walking.o
@@ -814,16 +834,44 @@
LIB_FILE = libgit.a
XDIFF_LIB = xdiff/lib.a
+REFTABLE_LIB = reftable/libreftable.a
+REFTABLE_TEST_LIB = reftable/libreftable_test.a
GENERATED_H += command-list.h
GENERATED_H += config-list.h
+GENERATED_H += hook-list.h
-LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
+.PHONY: generated-hdrs
+generated-hdrs: $(GENERATED_H)
+
+## Exhaustive lists of our source files, either dynamically generated,
+## or hardcoded.
+SOURCES_CMD = ( \
+ git ls-files --deduplicate \
+ '*.[hcS]' \
+ '*.sh' \
+ ':!*[tp][0-9][0-9][0-9][0-9]*' \
+ ':!contrib' \
+ 2>/dev/null || \
$(FIND) . \
- -name .git -prune -o \
- -name t -prune -o \
- -name Documentation -prune -o \
- -name '*.h' -print)))
+ \( -name .git -type d -prune \) \
+ -o \( -name '[tp][0-9][0-9][0-9][0-9]*' -prune \) \
+ -o \( -name contrib -type d -prune \) \
+ -o \( -name build -type d -prune \) \
+ -o \( -name .build -type d -prune \) \
+ -o \( -name 'trash*' -type d -prune \) \
+ -o \( -name '*.[hcS]' -type f -print \) \
+ -o \( -name '*.sh' -type f -print \) \
+ | sed -e 's|^\./||' \
+ )
+FOUND_SOURCE_FILES := $(filter-out $(GENERATED_H),$(shell $(SOURCES_CMD)))
+
+FOUND_C_SOURCES = $(filter %.c,$(FOUND_SOURCE_FILES))
+FOUND_H_SOURCES = $(filter %.h,$(FOUND_SOURCE_FILES))
+
+COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FOUND_C_SOURCES))
+
+LIB_H = $(FOUND_H_SOURCES)
LIB_OBJS += abspath.o
LIB_OBJS += add-interactive.o
@@ -857,6 +905,7 @@
LIB_OBJS += commit.o
LIB_OBJS += compat/obstack.o
LIB_OBJS += compat/terminal.o
+LIB_OBJS += compat/zlib-uncompress2.o
LIB_OBJS += config.o
LIB_OBJS += connect.o
LIB_OBJS += connected.o
@@ -894,6 +943,8 @@
LIB_OBJS += fmt-merge-msg.o
LIB_OBJS += fsck.o
LIB_OBJS += fsmonitor.o
+LIB_OBJS += fsmonitor-ipc.o
+LIB_OBJS += fsmonitor-settings.o
LIB_OBJS += gettext.o
LIB_OBJS += gpg-interface.o
LIB_OBJS += graph.o
@@ -902,6 +953,7 @@
LIB_OBJS += hashmap.o
LIB_OBJS += help.o
LIB_OBJS += hex.o
+LIB_OBJS += hook.o
LIB_OBJS += ident.o
LIB_OBJS += json-writer.o
LIB_OBJS += kwset.o
@@ -945,6 +997,7 @@
LIB_OBJS += pack-bitmap-write.o
LIB_OBJS += pack-bitmap.o
LIB_OBJS += pack-check.o
+LIB_OBJS += pack-mtimes.o
LIB_OBJS += pack-objects.o
LIB_OBJS += pack-revindex.o
LIB_OBJS += pack-write.o
@@ -975,6 +1028,7 @@
LIB_OBJS += rebase.o
LIB_OBJS += ref-filter.o
LIB_OBJS += reflog-walk.o
+LIB_OBJS += reflog.o
LIB_OBJS += refs.o
LIB_OBJS += refs/debug.o
LIB_OBJS += refs/files-backend.o
@@ -1098,11 +1152,13 @@
BUILTIN_OBJS += builtin/for-each-ref.o
BUILTIN_OBJS += builtin/for-each-repo.o
BUILTIN_OBJS += builtin/fsck.o
+BUILTIN_OBJS += builtin/fsmonitor--daemon.o
BUILTIN_OBJS += builtin/gc.o
BUILTIN_OBJS += builtin/get-tar-commit-id.o
BUILTIN_OBJS += builtin/grep.o
BUILTIN_OBJS += builtin/hash-object.o
BUILTIN_OBJS += builtin/help.o
+BUILTIN_OBJS += builtin/hook.o
BUILTIN_OBJS += builtin/index-pack.o
BUILTIN_OBJS += builtin/init-db.o
BUILTIN_OBJS += builtin/interpret-trailers.o
@@ -1188,7 +1244,8 @@
THIRD_PARTY_SOURCES += sha1collisiondetection/%
THIRD_PARTY_SOURCES += sha1dc/%
-GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB)
+# xdiff and reftable libs may in turn depend on what is in libgit.a
+GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(LIB_FILE)
EXTLIBS =
GIT_USER_AGENT = git/$(GIT_VERSION)
@@ -1200,6 +1257,7 @@
# Set CFLAGS, LDFLAGS and other *FLAGS variables. These might be
# tweaked by config.* below as well as the command-line, both of
# which'll override these defaults.
+# Older versions of GCC may require adding "-std=gnu99" at the end.
CFLAGS = -g -O2 -Wall
LDFLAGS =
CC_LD_DYNPATH = -Wl,-rpath,
@@ -1211,11 +1269,12 @@
PTHREAD_CFLAGS =
# For the 'sparse' target
-SPARSE_FLAGS ?=
+SPARSE_FLAGS ?= -std=gnu99
SP_EXTRA_FLAGS = -Wno-universal-initializer
-# For informing GIT-BUILD-OPTIONS of the SANITIZE=leak target
+# For informing GIT-BUILD-OPTIONS of the SANITIZE=leak,address targets
SANITIZE_LEAK =
+SANITIZE_ADDRESS =
# For the 'coccicheck' target; setting SPATCH_BATCH_SIZE higher will
# usually result in less CPU usage at the cost of higher peak memory.
@@ -1248,10 +1307,6 @@
ALL_CFLAGS = $(DEVELOPER_CFLAGS) $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
-comma := ,
-empty :=
-space := $(empty) $(empty)
-
ifdef SANITIZE
SANITIZERS := $(foreach flag,$(subst $(comma),$(space),$(SANITIZE)),$(flag))
BASIC_CFLAGS += -fsanitize=$(SANITIZE) -fno-sanitize-recover=$(SANITIZE)
@@ -1265,6 +1320,7 @@
endif
ifneq ($(filter address,$(SANITIZERS)),)
NO_REGEX = NeededForASAN
+SANITIZE_ADDRESS = YesCompiledWithIt
endif
endif
@@ -1869,7 +1925,7 @@
endif
ifndef NO_MSGFMT_EXTENDED_OPTIONS
- MSGFMT += --check --statistics
+ MSGFMT += --check
endif
ifdef HAVE_CLOCK_GETTIME
@@ -1880,6 +1936,10 @@
BASIC_CFLAGS += -DHAVE_CLOCK_MONOTONIC
endif
+ifdef HAVE_SYNC_FILE_RANGE
+ BASIC_CFLAGS += -DHAVE_SYNC_FILE_RANGE
+endif
+
ifdef NEEDS_LIBRT
EXTLIBS += -lrt
endif
@@ -1896,6 +1956,32 @@
BASIC_CFLAGS += -DHAVE_GETDELIM
endif
+ifneq ($(findstring arc4random,$(CSPRNG_METHOD)),)
+ BASIC_CFLAGS += -DHAVE_ARC4RANDOM
+endif
+
+ifneq ($(findstring libbsd,$(CSPRNG_METHOD)),)
+ BASIC_CFLAGS += -DHAVE_ARC4RANDOM_LIBBSD
+ EXTLIBS += -lbsd
+endif
+
+ifneq ($(findstring getrandom,$(CSPRNG_METHOD)),)
+ BASIC_CFLAGS += -DHAVE_GETRANDOM
+endif
+
+ifneq ($(findstring getentropy,$(CSPRNG_METHOD)),)
+ BASIC_CFLAGS += -DHAVE_GETENTROPY
+endif
+
+ifneq ($(findstring rtlgenrandom,$(CSPRNG_METHOD)),)
+ BASIC_CFLAGS += -DHAVE_RTLGENRANDOM
+endif
+
+ifneq ($(findstring openssl,$(CSPRNG_METHOD)),)
+ BASIC_CFLAGS += -DHAVE_OPENSSL_CSPRNG
+ EXTLIBS += -lcrypto -lssl
+endif
+
ifneq ($(PROCFS_EXECUTABLE_PATH),)
procfs_executable_path_SQ = $(subst ','\'',$(PROCFS_EXECUTABLE_PATH))
BASIC_CFLAGS += '-DPROCFS_EXECUTABLE_PATH="$(procfs_executable_path_SQ)"'
@@ -1923,6 +2009,11 @@
COMPAT_OBJS += compat/access.o
endif
+ifdef FSMONITOR_DAEMON_BACKEND
+ COMPAT_CFLAGS += -DHAVE_FSMONITOR_DAEMON_BACKEND
+ COMPAT_OBJS += compat/fsmonitor/fsm-listen-$(FSMONITOR_DAEMON_BACKEND).o
+endif
+
ifeq ($(TCLTK_PATH),)
NO_TCLTK = NoThanks
endif
@@ -1939,39 +2030,6 @@
PAGER_ENV = LESS=FRX LV=-c
endif
-QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
-QUIET_SUBDIR1 =
-
-ifneq ($(findstring w,$(MAKEFLAGS)),w)
-PRINT_DIR = --no-print-directory
-else # "make -w"
-NO_SUBDIR = :
-endif
-
-ifneq ($(findstring s,$(MAKEFLAGS)),s)
-ifndef V
- QUIET_CC = @echo ' ' CC $@;
- QUIET_AR = @echo ' ' AR $@;
- QUIET_LINK = @echo ' ' LINK $@;
- QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
- QUIET_GEN = @echo ' ' GEN $@;
- QUIET_LNCP = @echo ' ' LN/CP $@;
- QUIET_XGETTEXT = @echo ' ' XGETTEXT $@;
- QUIET_MSGFMT = @echo ' ' MSGFMT $@;
- QUIET_GCOV = @echo ' ' GCOV $@;
- QUIET_SP = @echo ' ' SP $<;
- QUIET_HDR = @echo ' ' HDR $(<:hcc=h);
- QUIET_RC = @echo ' ' RC $@;
- QUIET_SPATCH = @echo ' ' SPATCH $<;
- QUIET_SUBDIR0 = +@subdir=
- QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
- $(MAKE) $(PRINT_DIR) -C $$subdir
- export V
- export QUIET_GEN
- export QUIET_BUILT_IN
-endif
-endif
-
ifdef NO_INSTALL_HARDLINKS
export NO_INSTALL_HARDLINKS
endif
@@ -2100,11 +2158,6 @@
BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
endif
-PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
-PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))"
-PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
-BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
-
ALL_CFLAGS += $(BASIC_CFLAGS)
ALL_LDFLAGS += $(BASIC_LDFLAGS)
@@ -2157,16 +2210,6 @@
strip: $(PROGRAMS) git$X
$(STRIP) $(STRIP_OPTS) $^
-### Flags affecting all rules
-
-# A GNU make extension since gmake 3.72 (released in late 1994) to
-# remove the target of rules if commands in those rules fail. The
-# default is to only do that if make itself receives a signal. Affects
-# all targets, see:
-#
-# info make --index-search=.DELETE_ON_ERROR
-.DELETE_ON_ERROR:
-
### Target-specific flags and dependencies
# The generic compilation pattern rule and automatically
@@ -2211,6 +2254,7 @@
$(filter %.o,$^) $(LIBS)
help.sp help.s help.o: command-list.h
+builtin/bugreport.sp builtin/bugreport.s builtin/bugreport.o: hook-list.h
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 = \
@@ -2218,6 +2262,12 @@
'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
'-DGIT_INFO_PATH="$(infodir_relative_SQ)"'
+PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
+PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))"
+PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
+pager.sp pager.s pager.o: EXTRA_CPPFLAGS = \
+ -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
+
version.sp version.s version.o: GIT-VERSION-FILE GIT-USER-AGENT
version.sp version.s version.o: EXTRA_CPPFLAGS = \
'-DGIT_VERSION="$(GIT_VERSION)"' \
@@ -2235,35 +2285,22 @@
config-list.h: generate-configlist.sh
config-list.h: Documentation/*config.txt Documentation/config/*.txt
- $(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh \
- >$@+ && mv $@+ $@
+ $(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh >$@
command-list.h: generate-cmdlist.sh command-list.txt
command-list.h: $(wildcard Documentation/git*.txt)
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \
$(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \
- command-list.txt >$@+ && mv $@+ $@
+ command-list.txt >$@
-SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
- $(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
- $(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP):$(PAGER_ENV):\
+hook-list.h: generate-hooklist.sh Documentation/githooks.txt
+ $(QUIET_GEN)$(SHELL_PATH) ./generate-hooklist.sh >$@
+
+SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):\
+ $(localedir_SQ):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
+ $(gitwebdir_SQ):$(PERL_PATH_SQ):$(PAGER_ENV):\
$(perllibdir_SQ)
-define cmd_munge_script
-sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
- -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
- -e 's|@@DIFF@@|$(DIFF_SQ)|' \
- -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
- -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
- -e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \
- -e $(BROKEN_PATH_FIX) \
- -e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \
- -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
- -e 's|@@SANE_TEXT_GREP@@|$(SANE_TEXT_GREP)|g' \
- -e 's|@@PAGER_ENV@@|$(PAGER_ENV_SQ)|g' \
- $@.sh >$@+
-endef
-
GIT-SCRIPT-DEFINES: FORCE
@FLAGS='$(SCRIPT_DEFINES)'; \
if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \
@@ -2271,6 +2308,18 @@
echo "$$FLAGS" >$@; \
fi
+define cmd_munge_script
+sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
+ -e 's|@@DIFF@@|$(DIFF_SQ)|' \
+ -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
+ -e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \
+ -e $(BROKEN_PATH_FIX) \
+ -e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \
+ -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
+ -e 's|@@PAGER_ENV@@|$(PAGER_ENV_SQ)|g' \
+ $@.sh >$@+
+endef
$(SCRIPT_SH_GEN) : % : %.sh GIT-SCRIPT-DEFINES
$(QUIET_GEN)$(cmd_munge_script) && \
@@ -2430,7 +2479,36 @@
.PHONY: xdiff-objs
xdiff-objs: $(XDIFF_OBJS)
+REFTABLE_OBJS += reftable/basics.o
+REFTABLE_OBJS += reftable/error.o
+REFTABLE_OBJS += reftable/block.o
+REFTABLE_OBJS += reftable/blocksource.o
+REFTABLE_OBJS += reftable/iter.o
+REFTABLE_OBJS += reftable/publicbasics.o
+REFTABLE_OBJS += reftable/merged.o
+REFTABLE_OBJS += reftable/pq.o
+REFTABLE_OBJS += reftable/reader.o
+REFTABLE_OBJS += reftable/record.o
+REFTABLE_OBJS += reftable/refname.o
+REFTABLE_OBJS += reftable/generic.o
+REFTABLE_OBJS += reftable/stack.o
+REFTABLE_OBJS += reftable/tree.o
+REFTABLE_OBJS += reftable/writer.o
+
+REFTABLE_TEST_OBJS += reftable/basics_test.o
+REFTABLE_TEST_OBJS += reftable/block_test.o
+REFTABLE_TEST_OBJS += reftable/dump.o
+REFTABLE_TEST_OBJS += reftable/merged_test.o
+REFTABLE_TEST_OBJS += reftable/pq_test.o
+REFTABLE_TEST_OBJS += reftable/record_test.o
+REFTABLE_TEST_OBJS += reftable/readwrite_test.o
+REFTABLE_TEST_OBJS += reftable/refname_test.o
+REFTABLE_TEST_OBJS += reftable/stack_test.o
+REFTABLE_TEST_OBJS += reftable/test_framework.o
+REFTABLE_TEST_OBJS += reftable/tree_test.o
+
TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
+
.PHONY: test-objs
test-objs: $(TEST_OBJS)
@@ -2446,9 +2524,16 @@
OBJECTS += $(TEST_OBJS)
OBJECTS += $(XDIFF_OBJS)
OBJECTS += $(FUZZ_OBJS)
+OBJECTS += $(REFTABLE_OBJS) $(REFTABLE_TEST_OBJS)
+
ifndef NO_CURL
OBJECTS += http.o http-walker.o remote-curl.o
endif
+
+SCALAR_SOURCES := contrib/scalar/scalar.c
+SCALAR_OBJECTS := $(SCALAR_SOURCES:c=o)
+OBJECTS += $(SCALAR_OBJECTS)
+
.PHONY: objects
objects: $(OBJECTS)
@@ -2487,8 +2572,6 @@
ASM_OBJ := $(ASM_SRC:S=o)
C_OBJ := $(filter-out $(ASM_OBJ),$(OBJECTS))
-.SUFFIXES:
-
$(C_OBJ): %.o: %.c GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir)
$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
$(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir)
@@ -2505,13 +2588,6 @@
include $(dep_files_present)
endif
else
-# Dependencies on header files, for platforms that do not support
-# the gcc -MMD option.
-#
-# Dependencies on automatically generated headers such as command-list.h
-# should _not_ be included here, since they are necessary even when
-# building an object for the first time.
-
$(OBJECTS): $(LIB_H) $(GENERATED_H)
endif
@@ -2589,12 +2665,22 @@
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
+contrib/scalar/scalar$X: $(SCALAR_OBJECTS) GIT-LDFLAGS $(GITLIBS)
+ $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
+ $(filter %.o,$^) $(LIBS)
+
$(LIB_FILE): $(LIB_OBJS)
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
$(XDIFF_LIB): $(XDIFF_OBJS)
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
+$(REFTABLE_LIB): $(REFTABLE_OBJS)
+ $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
+
+$(REFTABLE_TEST_LIB): $(REFTABLE_TEST_OBJS)
+ $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
+
export DEFAULT_EDITOR DEFAULT_PAGER
Documentation/GIT-EXCLUDED-PROGRAMS: FORCE
@@ -2627,18 +2713,18 @@
--force-po \
--add-comments=TRANSLATORS: \
--msgid-bugs-address="Git Mailing List <git@vger.kernel.org>" \
- --from-code=UTF-8
+ --package-name=Git
XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
--keyword=_ --keyword=N_ --keyword="Q_:1,2"
XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
--keyword=gettextln --keyword=eval_gettextln
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \
--keyword=__ --keyword=N__ --keyword="__n:1,2"
-LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
-LOCALIZED_SH = $(SCRIPT_SH)
-LOCALIZED_SH += git-rebase--preserve-merges.sh
-LOCALIZED_SH += git-sh-setup.sh
-LOCALIZED_PERL = $(SCRIPT_PERL)
+MSGMERGE_FLAGS = --add-location --backup=off --update
+LOCALIZED_C = $(sort $(FOUND_C_SOURCES) $(FOUND_H_SOURCES) $(SCALAR_SOURCES) \
+ $(GENERATED_H))
+LOCALIZED_SH = $(sort $(SCRIPT_SH) git-sh-setup.sh)
+LOCALIZED_PERL = $(sort $(SCRIPT_PERL))
ifdef XGETTEXT_INCLUDE_TESTS
LOCALIZED_C += t/t0200/test.c
@@ -2646,38 +2732,129 @@
LOCALIZED_PERL += t/t0200/test.perl
endif
-## Note that this is meant to be run only by the localization coordinator
-## under a very controlled condition, i.e. (1) it is to be run in a
-## Git repository (not a tarball extract), (2) any local modifications
-## will be lost.
+## We generate intermediate .build/pot/po/%.po files containing a
+## extract of the translations we find in each file in the source
+## tree. We will assemble them using msgcat to create the final
+## "po/git.pot" file.
+LOCALIZED_ALL_GEN_PO =
+
+LOCALIZED_C_GEN_PO = $(LOCALIZED_C:%=.build/pot/po/%.po)
+LOCALIZED_ALL_GEN_PO += $(LOCALIZED_C_GEN_PO)
+
+LOCALIZED_SH_GEN_PO = $(LOCALIZED_SH:%=.build/pot/po/%.po)
+LOCALIZED_ALL_GEN_PO += $(LOCALIZED_SH_GEN_PO)
+
+LOCALIZED_PERL_GEN_PO = $(LOCALIZED_PERL:%=.build/pot/po/%.po)
+LOCALIZED_ALL_GEN_PO += $(LOCALIZED_PERL_GEN_PO)
+
## Gettext tools cannot work with our own custom PRItime type, so
## we replace PRItime with PRIuMAX. We need to update this to
## PRIdMAX if we switch to a signed type later.
+$(LOCALIZED_C_GEN_PO): .build/pot/po/%.po: %
+ $(call mkdir_p_parent_template)
+ $(QUIET_XGETTEXT) \
+ if grep -q PRItime $<; then \
+ (\
+ sed -e 's|PRItime|PRIuMAX|g' <$< \
+ >.build/pot/po/$< && \
+ cd .build/pot/po && \
+ $(XGETTEXT) --omit-header \
+ -o $(@:.build/pot/po/%=%) \
+ $(XGETTEXT_FLAGS_C) $< && \
+ rm $<; \
+ ); \
+ else \
+ $(XGETTEXT) --omit-header \
+ -o $@ $(XGETTEXT_FLAGS_C) $<; \
+ fi
-po/git.pot: $(GENERATED_H) FORCE
- # All modifications will be reverted at the end, so we do not
- # want to have any local change.
- git diff --quiet HEAD && git diff --quiet --cached
+$(LOCALIZED_SH_GEN_PO): .build/pot/po/%.po: %
+ $(call mkdir_p_parent_template)
+ $(QUIET_XGETTEXT)$(XGETTEXT) --omit-header \
+ -o$@ $(XGETTEXT_FLAGS_SH) $<
- @for s in $(LOCALIZED_C) $(LOCALIZED_SH) $(LOCALIZED_PERL); \
- do \
- sed -e 's|PRItime|PRIuMAX|g' <"$$s" >"$$s+" && \
- cat "$$s+" >"$$s" && rm "$$s+"; \
- done
+$(LOCALIZED_PERL_GEN_PO): .build/pot/po/%.po: %
+ $(call mkdir_p_parent_template)
+ $(QUIET_XGETTEXT)$(XGETTEXT) --omit-header \
+ -o$@ $(XGETTEXT_FLAGS_PERL) $<
- $(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ $(XGETTEXT_FLAGS_C) $(LOCALIZED_C)
- $(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_SH) \
- $(LOCALIZED_SH)
- $(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_PERL) \
- $(LOCALIZED_PERL)
+define gen_pot_header
+$(XGETTEXT) $(XGETTEXT_FLAGS_C) \
+ -o - /dev/null | \
+sed -e 's|charset=CHARSET|charset=UTF-8|' \
+ -e 's|\(Last-Translator: \)FULL NAME <.*>|\1make by the Makefile|' \
+ -e 's|\(Language-Team: \)LANGUAGE <.*>|\1Git Mailing List <git@vger.kernel.org>|' \
+ >$@ && \
+echo '"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"' >>$@
+endef
- # Reverting the munged source, leaving only the updated $@
- git reset --hard
- mv $@+ $@
+.build/pot/git.header: $(LOCALIZED_ALL_GEN_PO)
+ $(call mkdir_p_parent_template)
+ $(QUIET_GEN)$(gen_pot_header)
+
+po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO)
+ $(QUIET_GEN)$(MSGCAT) $^ >$@
.PHONY: pot
pot: po/git.pot
+define check_po_file_envvar
+ $(if $(PO_FILE), \
+ $(if $(filter po/%.po,$(PO_FILE)), , \
+ $(error PO_FILE should match pattern: "po/%.po")), \
+ $(error PO_FILE is not defined))
+endef
+
+.PHONY: po-update
+po-update: po/git.pot
+ $(check_po_file_envvar)
+ @if test ! -e $(PO_FILE); then \
+ echo >&2 "error: $(PO_FILE) does not exist"; \
+ echo >&2 'To create an initial po file, use: "make po-init PO_FILE=po/XX.po"'; \
+ exit 1; \
+ fi
+ $(QUIET_MSGMERGE)$(MSGMERGE) $(MSGMERGE_FLAGS) $(PO_FILE) po/git.pot
+
+.PHONY: check-pot
+check-pot: $(LOCALIZED_ALL_GEN_PO)
+
+### TODO FIXME: Translating everything in these files is a bad
+### heuristic for "core", as we'll translate obscure error() messages
+### along with commonly seen i18n messages. A better heuristic would
+### be to e.g. use spatch to first remove error/die/warning
+### etc. messages.
+LOCALIZED_C_CORE =
+LOCALIZED_C_CORE += builtin/checkout.c
+LOCALIZED_C_CORE += builtin/clone.c
+LOCALIZED_C_CORE += builtin/index-pack.c
+LOCALIZED_C_CORE += builtin/push.c
+LOCALIZED_C_CORE += builtin/reset.c
+LOCALIZED_C_CORE += remote.c
+LOCALIZED_C_CORE += wt-status.c
+
+LOCALIZED_C_CORE_GEN_PO = $(LOCALIZED_C_CORE:%=.build/pot/po/%.po)
+
+.build/pot/git-core.header: $(LOCALIZED_C_CORE_GEN_PO)
+ $(call mkdir_p_parent_template)
+ $(QUIET_GEN)$(gen_pot_header)
+
+po/git-core.pot: .build/pot/git-core.header $(LOCALIZED_C_CORE_GEN_PO)
+ $(QUIET_GEN)$(MSGCAT) $^ >$@
+
+.PHONY: po-init
+po-init: po/git-core.pot
+ $(check_po_file_envvar)
+ @if test -e $(PO_FILE); then \
+ echo >&2 "error: $(PO_FILE) exists already"; \
+ exit 1; \
+ fi
+ $(QUIET_MSGINIT)msginit \
+ --input=$< \
+ --output=$(PO_FILE) \
+ --no-translator \
+ --locale=$(PO_FILE:po/%.po=%)
+
+## po/*.po files & their rules
ifdef NO_GETTEXT
POFILES :=
MOFILES :=
@@ -2689,7 +2866,8 @@
endif
po/build/locale/%/LC_MESSAGES/git.mo: po/%.po
- $(QUIET_MSGFMT)mkdir -p $(dir $@) && $(MSGFMT) -o $@ $<
+ $(call mkdir_p_parent_template)
+ $(QUIET_MSGFMT)$(MSGFMT) -o $@ $<
LIB_PERL := $(wildcard perl/Git.pm perl/Git/*.pm perl/Git/*/*.pm perl/Git/*/*/*.pm)
LIB_PERL_GEN := $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_PERL))
@@ -2705,35 +2883,16 @@
endif
perl/build/lib/%.pm: perl/%.pm GIT-PERL-DEFINES
- $(QUIET_GEN)mkdir -p $(dir $@) && \
+ $(call mkdir_p_parent_template)
+ $(QUIET_GEN) \
sed -e 's|@@LOCALEDIR@@|$(perl_localedir_SQ)|g' \
-e 's|@@NO_GETTEXT@@|$(NO_GETTEXT_SQ)|g' \
-e 's|@@NO_PERL_CPAN_FALLBACKS@@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \
< $< > $@
perl/build/man/man3/Git.3pm: perl/Git.pm
- $(QUIET_GEN)mkdir -p $(dir $@) && \
- pod2man $< $@
-
-FIND_SOURCE_FILES = ( \
- git ls-files \
- '*.[hcS]' \
- '*.sh' \
- ':!*[tp][0-9][0-9][0-9][0-9]*' \
- ':!contrib' \
- 2>/dev/null || \
- $(FIND) . \
- \( -name .git -type d -prune \) \
- -o \( -name '[tp][0-9][0-9][0-9][0-9]*' -prune \) \
- -o \( -name contrib -type d -prune \) \
- -o \( -name build -type d -prune \) \
- -o \( -name 'trash*' -type d -prune \) \
- -o \( -name '*.[hcS]' -type f -print \) \
- -o \( -name '*.sh' -type f -print \) \
- | sed -e 's|^\./||' \
- )
-
-FOUND_SOURCE_FILES = $(shell $(FIND_SOURCE_FILES))
+ $(call mkdir_p_parent_template)
+ $(QUIET_GEN)pod2man $< $@
$(ETAGS_TARGET): $(FOUND_SOURCE_FILES)
$(QUIET_GEN)$(RM) $@+ && \
@@ -2802,7 +2961,11 @@
@echo PAGER_ENV=\''$(subst ','\'',$(subst ','\'',$(PAGER_ENV)))'\' >>$@+
@echo DC_SHA1=\''$(subst ','\'',$(subst ','\'',$(DC_SHA1)))'\' >>$@+
@echo SANITIZE_LEAK=\''$(subst ','\'',$(subst ','\'',$(SANITIZE_LEAK)))'\' >>$@+
+ @echo SANITIZE_ADDRESS=\''$(subst ','\'',$(subst ','\'',$(SANITIZE_ADDRESS)))'\' >>$@+
@echo X=\'$(X)\' >>$@+
+ifdef FSMONITOR_DAEMON_BACKEND
+ @echo FSMONITOR_DAEMON_BACKEND=\''$(subst ','\'',$(subst ','\'',$(FSMONITOR_DAEMON_BACKEND)))'\' >>$@+
+endif
ifdef TEST_OUTPUT_DIRECTORY
@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+
endif
@@ -2867,7 +3030,7 @@
all:: $(TEST_PROGRAMS) $(test_bindir_programs)
bin-wrappers/%: wrap-for-bin.sh
- @mkdir -p bin-wrappers
+ $(call mkdir_p_parent_template)
$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@BUILD_DIR@@|$(shell pwd)|' \
-e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%$(X),$(@F))$(patsubst git%,$(X),$(filter $(@F),$(BINDIR_PROGRAMS_NEED_X)))|' < $< > $@ && \
@@ -2894,7 +3057,7 @@
t/helper/test-tool$X: $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
-t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS)
+t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS) $(REFTABLE_TEST_LIB)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS)
check-sha1:: t/helper/test-tool$X
@@ -2902,14 +3065,16 @@
SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ))
-$(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE
+$(SP_OBJ): %.sp: %.c %.o
$(QUIET_SP)cgcc -no-compile $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) \
- $(SPARSE_FLAGS) $(SP_EXTRA_FLAGS) $<
+ -Wsparse-error \
+ $(SPARSE_FLAGS) $(SP_EXTRA_FLAGS) $< && \
+ >$@
-.PHONY: sparse $(SP_OBJ)
+.PHONY: sparse
sparse: $(SP_OBJ)
-EXCEPT_HDRS := command-list.h config-list.h unicode-width.h compat/% xdiff/%
+EXCEPT_HDRS := $(GENERATED_H) unicode-width.h compat/% xdiff/%
ifndef GCRYPT_SHA256
EXCEPT_HDRS += sha256/gcrypt.h
endif
@@ -2931,7 +3096,8 @@
style:
git clang-format --style file --diff --extensions c,h
-check: config-list.h command-list.h
+.PHONY: check
+check: $(GENERATED_H)
@if sparse; \
then \
echo >&2 "Use 'make sparse' instead"; \
@@ -2941,9 +3107,6 @@
exit 1; \
fi
-FOUND_C_SOURCES = $(filter %.c,$(FOUND_SOURCE_FILES))
-COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FOUND_C_SOURCES))
-
%.cocci.patch: %.cocci $(COCCI_SOURCES)
$(QUIET_SPATCH) \
if test $(SPATCH_BATCH_SIZE) = 0; then \
@@ -3227,12 +3390,15 @@
$(RM) contrib/coccinelle/*.cocci.patch*
clean: profile-clean coverage-clean cocciclean
+ $(RM) -r .build
+ $(RM) po/git.pot po/git-core.pot
$(RM) *.res
$(RM) $(OBJECTS)
- $(RM) $(LIB_FILE) $(XDIFF_LIB)
+ $(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(REFTABLE_TEST_LIB)
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
$(RM) $(TEST_PROGRAMS)
$(RM) $(FUZZ_PROGRAMS)
+ $(RM) $(SP_OBJ)
$(RM) $(HCC)
$(RM) -r bin-wrappers $(dep_dirs) $(compdb_dir) compile_commands.json
$(RM) -r po/build/
@@ -3343,6 +3509,7 @@
$(RM) coverage-untested-functions
$(RM) -r cover_db/
$(RM) -r cover_db_html/
+ $(RM) coverage-test.made
coverage-clean: coverage-clean-results
$(RM) $(addsuffix *.gcno,$(object_dirs))
@@ -3357,13 +3524,17 @@
coverage-test: coverage-clean-results coverage-compile
$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" \
DEFAULT_TEST_TARGET=test -j1 test
+ touch coverage-test.made
+
+coverage-test.made:
+ $(MAKE) coverage-test
coverage-prove: coverage-clean-results coverage-compile
$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" \
DEFAULT_TEST_TARGET=prove GIT_PROVE_OPTS="$(GIT_PROVE_OPTS) -j1" \
-j1 test
-coverage-report:
+coverage-report: coverage-test.made
$(QUIET_GCOV)for dir in $(object_dirs); do \
$(GCOV) $(GCOVFLAGS) --object-directory=$$dir $$dir*.c || exit; \
done
diff --git a/README.md b/README.md
index eb8115e..7ce4f05 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[](https://github.com/git/git/actions?query=branch%3Amaster+event%3Apush)
+[](https://github.com/git/git/actions?query=branch%3Amaster+event%3Apush)
Git - fast, scalable, distributed revision control system
=========================================================
@@ -32,10 +32,16 @@
The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org (read
-[Documentation/SubmittingPatches][] for instructions on patch submission).
+[Documentation/SubmittingPatches][] for instructions on patch submission
+and [Documentation/CodingGuidelines][]).
+
+Those wishing to help with error message, usage and informational message
+string translations (localization l10) should see [po/README.md][]
+(a `po` file is a Portable Object file that holds the translations).
+
To subscribe to the list, send an email with just "subscribe git" in
-the body to majordomo@vger.kernel.org. The mailing list archives are
-available at <https://lore.kernel.org/git/>,
+the body to majordomo@vger.kernel.org (not the Git list). The mailing
+list archives are available at <https://lore.kernel.org/git/>,
<http://marc.info/?l=git> and other archival sites.
Issues which are security relevant should be disclosed privately to
@@ -64,3 +70,5 @@
[Documentation/giteveryday.txt]: Documentation/giteveryday.txt
[Documentation/gitcvs-migration.txt]: Documentation/gitcvs-migration.txt
[Documentation/SubmittingPatches]: Documentation/SubmittingPatches
+[Documentation/CodingGuidelines]: Documentation/CodingGuidelines
+[po/README.md]: po/README.md
diff --git a/RelNotes b/RelNotes
index 6c94469..51144b6 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.34.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.37.0.txt
\ No newline at end of file
diff --git a/add-interactive.c b/add-interactive.c
index 6498ae1..6047e8f 100644
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -70,6 +70,8 @@ void init_add_i_state(struct add_i_state *s, struct repository *r)
&s->interactive_diff_algorithm);
git_config_get_bool("interactive.singlekey", &s->use_single_key);
+ if (s->use_single_key)
+ setbuf(stdin, NULL);
}
void clear_add_i_state(struct add_i_state *s)
@@ -566,8 +568,7 @@ static int get_modified_files(struct repository *r,
run_diff_files(&rev, 0);
}
- if (ps)
- clear_pathspec(&rev.prune_data);
+ release_revisions(&rev);
}
hashmap_clear_and_free(&s.file_map, struct pathname_entry, ent);
if (unmerged_count)
@@ -797,14 +798,14 @@ static int run_revert(struct add_i_state *s, const struct pathspec *ps,
diffopt.flags.override_submodule_config = 1;
diffopt.repo = s->r;
- if (do_diff_cache(&oid, &diffopt))
+ if (do_diff_cache(&oid, &diffopt)) {
+ diff_free(&diffopt);
res = -1;
- else {
+ } else {
diffcore_std(&diffopt);
diff_flush(&diffopt);
}
free(paths);
- clear_pathspec(&diffopt.pathspec);
if (!res && write_locked_index(s->r->index, &index_lock,
COMMIT_LOCK) < 0)
diff --git a/add-patch.c b/add-patch.c
index 8c41cdf..509ca04 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -305,7 +305,7 @@ static void setup_child_process(struct add_p_state *s,
va_end(ap);
cp->git_cmd = 1;
- strvec_pushf(&cp->env_array,
+ strvec_pushf(&cp->env,
INDEX_ENVIRONMENT "=%s", s->s.r->index_file);
}
@@ -383,6 +383,17 @@ static int is_octal(const char *p, size_t len)
return 1;
}
+static void complete_file(char marker, struct hunk *hunk)
+{
+ if (marker == '-' || marker == '+')
+ /*
+ * Last hunk ended in non-context line (i.e. it
+ * appended lines to the file, so there are no
+ * trailing context lines).
+ */
+ hunk->splittable_into++;
+}
+
static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
{
struct strvec args = STRVEC_INIT;
@@ -413,7 +424,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
strvec_push(&args, ps->items[i].original);
setup_child_process(s, &cp, NULL);
- cp.argv = args.v;
+ strvec_pushv(&cp.args, args.v);
res = capture_command(&cp, plain, 0);
if (res) {
strvec_clear(&args);
@@ -431,7 +442,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
setup_child_process(s, &colored_cp, NULL);
xsnprintf((char *)args.v[color_arg_index], 8, "--color");
- colored_cp.argv = args.v;
+ strvec_pushv(&colored_cp.args, args.v);
colored = &s->colored;
res = capture_command(&colored_cp, colored, 0);
strvec_clear(&args);
@@ -472,6 +483,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
eol = pend;
if (starts_with(p, "diff ")) {
+ complete_file(marker, hunk);
ALLOC_GROW_BY(s->file_diff, s->file_diff_nr, 1,
file_diff_alloc);
file_diff = s->file_diff + s->file_diff_nr - 1;
@@ -598,13 +610,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
file_diff->hunk->colored_end = hunk->colored_end;
}
}
-
- if (marker == '-' || marker == '+')
- /*
- * Last hunk ended in non-context line (i.e. it appended lines
- * to the file, so there are no trailing context lines).
- */
- hunk->splittable_into++;
+ complete_file(marker, hunk);
/* non-colored shorter than colored? */
if (colored_p != colored_pend) {
diff --git a/advice.c b/advice.c
index 2f5499a..6fda9ed 100644
--- a/advice.c
+++ b/advice.c
@@ -39,9 +39,11 @@ static struct {
[ADVICE_ADD_EMPTY_PATHSPEC] = { "addEmptyPathspec", 1 },
[ADVICE_ADD_IGNORED_FILE] = { "addIgnoredFile", 1 },
[ADVICE_AM_WORK_DIR] = { "amWorkDir", 1 },
+ [ADVICE_AMBIGUOUS_FETCH_REFSPEC] = { "ambiguousFetchRefspec", 1 },
[ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = { "checkoutAmbiguousRemoteBranchName", 1 },
[ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge", 1 },
[ADVICE_DETACHED_HEAD] = { "detachedHead", 1 },
+ [ADVICE_SUGGEST_DETACHING_HEAD] = { "suggestDetachingHead", 1 },
[ADVICE_FETCH_SHOW_FORCED_UPDATES] = { "fetchShowForcedUpdates", 1 },
[ADVICE_GRAFT_FILE_DEPRECATED] = { "graftFileDeprecated", 1 },
[ADVICE_IGNORED_HOOK] = { "ignoredHook", 1 },
@@ -60,7 +62,7 @@ static struct {
[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_RESET_NO_REFRESH_WARNING] = { "resetNoRefresh", 1 },
[ADVICE_RESOLVE_CONFLICT] = { "resolveConflict", 1 },
[ADVICE_RM_HINTS] = { "rmHints", 1 },
[ADVICE_SEQUENCER_IN_USE] = { "sequencerInUse", 1 },
@@ -70,6 +72,7 @@ static struct {
[ADVICE_STATUS_HINTS] = { "statusHints", 1 },
[ADVICE_STATUS_U_OPTION] = { "statusUoption", 1 },
[ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE] = { "submoduleAlternateErrorStrategyDie", 1 },
+ [ADVICE_SUBMODULES_NOT_UPDATED] = { "submodulesNotUpdated", 1 },
[ADVICE_UPDATE_SPARSE_PATH] = { "updateSparsePath", 1 },
[ADVICE_WAITING_FOR_EDITOR] = { "waitingForEditor", 1 },
};
@@ -224,15 +227,16 @@ void advise_on_updating_sparse_paths(struct string_list *pathspec_list)
if (!pathspec_list->nr)
return;
- fprintf(stderr, _("The following pathspecs didn't match any"
- " eligible path, but they do match index\n"
- "entries outside the current sparse checkout:\n"));
+ fprintf(stderr, _("The following paths and/or pathspecs matched paths that exist\n"
+ "outside of your sparse-checkout definition, so will not be\n"
+ "updated in the index:\n"));
for_each_string_list_item(item, pathspec_list)
fprintf(stderr, "%s\n", item->string);
advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH,
- _("Disable or modify the sparsity rules if you intend"
- " to update such entries."));
+ _("If you intend to update such entries, try one of the following:\n"
+ "* Use the --sparse option.\n"
+ "* Disable or modify the sparsity rules."));
}
void detach_advice(const char *new_name)
diff --git a/advice.h b/advice.h
index 601265f..7ddc6cb 100644
--- a/advice.h
+++ b/advice.h
@@ -17,9 +17,11 @@ struct string_list;
ADVICE_ADD_EMPTY_PATHSPEC,
ADVICE_ADD_IGNORED_FILE,
ADVICE_AM_WORK_DIR,
+ ADVICE_AMBIGUOUS_FETCH_REFSPEC,
ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME,
ADVICE_COMMIT_BEFORE_MERGE,
ADVICE_DETACHED_HEAD,
+ ADVICE_SUGGEST_DETACHING_HEAD,
ADVICE_FETCH_SHOW_FORCED_UPDATES,
ADVICE_GRAFT_FILE_DEPRECATED,
ADVICE_IGNORED_HOOK,
@@ -35,7 +37,7 @@ struct string_list;
ADVICE_PUSH_UPDATE_REJECTED_ALIAS,
ADVICE_PUSH_UPDATE_REJECTED,
ADVICE_PUSH_REF_NEEDS_UPDATE,
- ADVICE_RESET_QUIET_WARNING,
+ ADVICE_RESET_NO_REFRESH_WARNING,
ADVICE_RESOLVE_CONFLICT,
ADVICE_RM_HINTS,
ADVICE_SEQUENCER_IN_USE,
@@ -44,6 +46,7 @@ struct string_list;
ADVICE_STATUS_HINTS,
ADVICE_STATUS_U_OPTION,
ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE,
+ ADVICE_SUBMODULES_NOT_UPDATED,
ADVICE_UPDATE_SPARSE_PATH,
ADVICE_WAITING_FOR_EDITOR,
ADVICE_SKIPPED_CHERRY_PICKS,
diff --git a/alloc.c b/alloc.c
index 957a0af..27f697e 100644
--- a/alloc.c
+++ b/alloc.c
@@ -27,7 +27,6 @@ union any_object {
};
struct alloc_state {
- int count; /* total number of nodes allocated */
int nr; /* number of nodes left in current allocation */
void *p; /* first free node in current allocation */
@@ -63,7 +62,6 @@ static inline void *alloc_node(struct alloc_state *s, size_t node_size)
s->slabs[s->slab_nr++] = s->p;
}
s->nr--;
- s->count++;
ret = s->p;
s->p = (char *)s->p + node_size;
memset(ret, 0, node_size);
@@ -122,22 +120,3 @@ void *alloc_commit_node(struct repository *r)
init_commit_node(c);
return c;
}
-
-static void report(const char *name, unsigned int count, size_t size)
-{
- fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n",
- name, count, (uintmax_t) size);
-}
-
-#define REPORT(name, type) \
- report(#name, r->parsed_objects->name##_state->count, \
- r->parsed_objects->name##_state->count * sizeof(type) >> 10)
-
-void alloc_report(struct repository *r)
-{
- REPORT(blob, struct blob);
- REPORT(tree, struct tree);
- REPORT(commit, struct commit);
- REPORT(tag, struct tag);
- REPORT(object, union any_object);
-}
diff --git a/alloc.h b/alloc.h
index 371d388..3f4a0ad 100644
--- a/alloc.h
+++ b/alloc.h
@@ -13,7 +13,6 @@ void init_commit_node(struct commit *c);
void *alloc_commit_node(struct repository *r);
void *alloc_tag_node(struct repository *r);
void *alloc_object_node(struct repository *r);
-void alloc_report(struct repository *r);
struct alloc_state *allocate_alloc_state(void);
void clear_alloc_state(struct alloc_state *s);
diff --git a/apply.c b/apply.c
index 43a0aeb..2b7cd93 100644
--- a/apply.c
+++ b/apply.c
@@ -103,7 +103,8 @@ int init_apply_state(struct apply_state *state,
state->linenr = 1;
string_list_init_nodup(&state->fn_table);
string_list_init_nodup(&state->limit_by_name);
- string_list_init_nodup(&state->symlink_changes);
+ strset_init(&state->removed_symlinks);
+ strset_init(&state->kept_symlinks);
strbuf_init(&state->root, 0);
git_apply_config();
@@ -117,7 +118,8 @@ int init_apply_state(struct apply_state *state,
void clear_apply_state(struct apply_state *state)
{
string_list_clear(&state->limit_by_name, 0);
- string_list_clear(&state->symlink_changes, 0);
+ strset_clear(&state->removed_symlinks);
+ strset_clear(&state->kept_symlinks);
strbuf_release(&state->root);
/* &state->fn_table is cleared at the end of apply_patch() */
@@ -133,10 +135,10 @@ int check_apply_state(struct apply_state *state, int force_apply)
int is_not_gitdir = !startup_info->have_repository;
if (state->apply_with_reject && state->threeway)
- return error(_("--reject and --3way cannot be used together."));
+ return error(_("options '%s' and '%s' cannot be used together"), "--reject", "--3way");
if (state->threeway) {
if (is_not_gitdir)
- return error(_("--3way outside a repository"));
+ return error(_("'%s' outside a repository"), "--3way");
state->check_index = 1;
}
if (state->apply_with_reject) {
@@ -147,10 +149,10 @@ int check_apply_state(struct apply_state *state, int force_apply)
if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor))
state->apply = 0;
if (state->check_index && is_not_gitdir)
- return error(_("--index outside a repository"));
+ return error(_("'%s' outside a repository"), "--index");
if (state->cached) {
if (is_not_gitdir)
- return error(_("--cached outside a repository"));
+ return error(_("'%s' outside a repository"), "--cached");
state->check_index = 1;
}
if (state->ita_only && (state->check_index || is_not_gitdir))
@@ -217,13 +219,18 @@ static void free_fragment_list(struct fragment *list)
}
}
-static void free_patch(struct patch *patch)
+void release_patch(struct patch *patch)
{
free_fragment_list(patch->fragments);
free(patch->def_name);
free(patch->old_name);
free(patch->new_name);
free(patch->result);
+}
+
+static void free_patch(struct patch *patch)
+{
+ release_patch(patch);
free(patch);
}
@@ -3157,7 +3164,7 @@ static int apply_binary(struct apply_state *state,
* See if the old one matches what the patch
* applies to.
*/
- hash_object_file(the_hash_algo, img->buf, img->len, blob_type,
+ hash_object_file(the_hash_algo, img->buf, img->len, OBJ_BLOB,
&oid);
if (strcmp(oid_to_hex(&oid), patch->old_oid_prefix))
return error(_("the patch applies to '%s' (%s), "
@@ -3203,7 +3210,7 @@ static int apply_binary(struct apply_state *state,
name);
/* verify that the result matches */
- hash_object_file(the_hash_algo, img->buf, img->len, blob_type,
+ hash_object_file(the_hash_algo, img->buf, img->len, OBJ_BLOB,
&oid);
if (strcmp(oid_to_hex(&oid), patch->new_oid_prefix))
return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
@@ -3267,11 +3274,11 @@ static struct patch *in_fn_table(struct apply_state *state, const char *name)
{
struct string_list_item *item;
- if (name == NULL)
+ if (!name)
return NULL;
item = string_list_lookup(&state->fn_table, name);
- if (item != NULL)
+ if (item)
return (struct patch *)item->util;
return NULL;
@@ -3311,7 +3318,7 @@ static void add_to_fn_table(struct apply_state *state, struct patch *patch)
* This should cover the cases for normal diffs,
* file creations and copies
*/
- if (patch->new_name != NULL) {
+ if (patch->new_name) {
item = string_list_insert(&state->fn_table, patch->new_name);
item->util = patch;
}
@@ -3492,7 +3499,7 @@ static int three_way_merge(struct apply_state *state,
{
mmfile_t base_file, our_file, their_file;
mmbuffer_t result = { NULL };
- int status;
+ enum ll_merge_result status;
/* resolve trivial cases first */
if (oideq(base, ours))
@@ -3509,6 +3516,9 @@ static int three_way_merge(struct apply_state *state,
&their_file, "theirs",
state->repo->index,
NULL);
+ if (status == LL_MERGE_BINARY_CONFLICT)
+ warning("Cannot merge binary files: %s (%s vs. %s)",
+ path, "ours", "theirs");
free(base_file.ptr);
free(our_file.ptr);
free(their_file.ptr);
@@ -3582,12 +3592,14 @@ static int try_threeway(struct apply_state *state,
/* No point falling back to 3-way merge in these cases */
if (patch->is_delete ||
- S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))
+ S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode) ||
+ (patch->is_new && !patch->direct_to_threeway) ||
+ (patch->is_rename && !patch->lines_added && !patch->lines_deleted))
return -1;
/* Preimage the patch was prepared for */
if (patch->is_new)
- write_object_file("", 0, blob_type, &pre_oid);
+ write_object_file("", 0, OBJ_BLOB, &pre_oid);
else if (get_oid(patch->old_oid_prefix, &pre_oid) ||
read_blob_object(&buf, &pre_oid, patch->old_mode))
return error(_("repository lacks the necessary blob to perform 3-way merge."));
@@ -3603,7 +3615,7 @@ static int try_threeway(struct apply_state *state,
return -1;
}
/* post_oid is theirs */
- write_object_file(tmp_image.buf, tmp_image.len, blob_type, &post_oid);
+ write_object_file(tmp_image.buf, tmp_image.len, OBJ_BLOB, &post_oid);
clear_image(&tmp_image);
/* our_oid is ours */
@@ -3616,7 +3628,7 @@ static int try_threeway(struct apply_state *state,
return error(_("cannot read the current contents of '%s'"),
patch->old_name);
}
- write_object_file(tmp_image.buf, tmp_image.len, blob_type, &our_oid);
+ write_object_file(tmp_image.buf, tmp_image.len, OBJ_BLOB, &our_oid);
clear_image(&tmp_image);
/* in-core three-way merge between post and our using pre as base */
@@ -3812,59 +3824,31 @@ static int check_to_create(struct apply_state *state,
return 0;
}
-static uintptr_t register_symlink_changes(struct apply_state *state,
- const char *path,
- uintptr_t what)
-{
- struct string_list_item *ent;
-
- ent = string_list_lookup(&state->symlink_changes, path);
- if (!ent) {
- ent = string_list_insert(&state->symlink_changes, path);
- ent->util = (void *)0;
- }
- ent->util = (void *)(what | ((uintptr_t)ent->util));
- return (uintptr_t)ent->util;
-}
-
-static uintptr_t check_symlink_changes(struct apply_state *state, const char *path)
-{
- struct string_list_item *ent;
-
- ent = string_list_lookup(&state->symlink_changes, path);
- if (!ent)
- return 0;
- return (uintptr_t)ent->util;
-}
-
static void prepare_symlink_changes(struct apply_state *state, struct patch *patch)
{
for ( ; patch; patch = patch->next) {
if ((patch->old_name && S_ISLNK(patch->old_mode)) &&
(patch->is_rename || patch->is_delete))
/* the symlink at patch->old_name is removed */
- register_symlink_changes(state, patch->old_name, APPLY_SYMLINK_GOES_AWAY);
+ strset_add(&state->removed_symlinks, patch->old_name);
if (patch->new_name && S_ISLNK(patch->new_mode))
/* the symlink at patch->new_name is created or remains */
- register_symlink_changes(state, patch->new_name, APPLY_SYMLINK_IN_RESULT);
+ strset_add(&state->kept_symlinks, patch->new_name);
}
}
static int path_is_beyond_symlink_1(struct apply_state *state, struct strbuf *name)
{
do {
- unsigned int change;
-
while (--name->len && name->buf[name->len] != '/')
; /* scan backwards */
if (!name->len)
break;
name->buf[name->len] = '\0';
- change = check_symlink_changes(state, name->buf);
- if (change & APPLY_SYMLINK_IN_RESULT)
+ if (strset_contains(&state->kept_symlinks, name->buf))
return 1;
- if (change & APPLY_SYMLINK_GOES_AWAY)
+ if (strset_contains(&state->removed_symlinks, name->buf))
/*
* This cannot be "return 0", because we may
* see a new one created at a higher level.
@@ -4344,7 +4328,7 @@ static int add_index_file(struct apply_state *state,
}
fill_stat_cache_info(state->repo->index, ce, &st);
}
- if (write_object_file(buf, size, blob_type, &ce->oid) < 0) {
+ if (write_object_file(buf, size, OBJ_BLOB, &ce->oid) < 0) {
discard_cache_entry(ce);
return error(_("unable to create backing store "
"for newly created file %s"), path);
@@ -4752,8 +4736,10 @@ static int apply_patch(struct apply_state *state,
}
if (!list && !skipped_patch) {
- error(_("unrecognized input"));
- res = -128;
+ if (!state->allow_empty) {
+ error(_("No valid patches in input (allow with \"--allow-empty\")"));
+ res = -128;
+ }
goto end;
}
@@ -5071,7 +5057,7 @@ int apply_parse_options(int argc, const char **argv,
N_("leave the rejected hunks in corresponding *.rej files")),
OPT_BOOL(0, "allow-overlap", &state->allow_overlap,
N_("allow overlapping hunks")),
- OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")),
+ OPT__VERBOSITY(&state->apply_verbosity),
OPT_BIT(0, "inaccurate-eof", options,
N_("tolerate incorrectly detected missing new-line at the end of file"),
APPLY_OPT_INACCURATE_EOF),
@@ -5081,6 +5067,8 @@ int apply_parse_options(int argc, const char **argv,
OPT_CALLBACK(0, "directory", state, N_("root"),
N_("prepend <root> to all filenames"),
apply_option_parse_directory),
+ OPT_BOOL(0, "allow-empty", &state->allow_empty,
+ N_("don't return error for empty patches")),
OPT_END()
};
diff --git a/apply.h b/apply.h
index da3d95f..b9f18ce 100644
--- a/apply.h
+++ b/apply.h
@@ -4,6 +4,7 @@
#include "hash.h"
#include "lockfile.h"
#include "string-list.h"
+#include "strmap.h"
struct repository;
@@ -25,20 +26,6 @@ enum apply_verbosity {
verbosity_verbose = 1
};
-/*
- * We need to keep track of how symlinks in the preimage are
- * manipulated by the patches. A patch to add a/b/c where a/b
- * is a symlink should not be allowed to affect the directory
- * the symlink points at, but if the same patch removes a/b,
- * it is perfectly fine, as the patch removes a/b to make room
- * to create a directory a/b so that a/b/c can be created.
- *
- * See also "struct string_list symlink_changes" in "struct
- * apply_state".
- */
-#define APPLY_SYMLINK_GOES_AWAY 01
-#define APPLY_SYMLINK_IN_RESULT 02
-
struct apply_state {
const char *prefix;
@@ -66,6 +53,7 @@ struct apply_state {
int threeway;
int unidiff_zero;
int unsafe_paths;
+ int allow_empty;
/* Other non boolean parameters */
struct repository *repo;
@@ -85,7 +73,16 @@ struct apply_state {
/* Various "current state" */
int linenr; /* current line number */
- struct string_list symlink_changes; /* we have to track symlinks */
+ /*
+ * We need to keep track of how symlinks in the preimage are
+ * manipulated by the patches. A patch to add a/b/c where a/b
+ * is a symlink should not be allowed to affect the directory
+ * the symlink points at, but if the same patch removes a/b,
+ * it is perfectly fine, as the patch removes a/b to make room
+ * to create a directory a/b so that a/b/c can be created.
+ */
+ struct strset removed_symlinks;
+ struct strset kept_symlinks;
/*
* For "diff-stat" like behaviour, we keep track of the biggest change
@@ -176,6 +173,8 @@ int parse_git_diff_header(struct strbuf *root,
unsigned int size,
struct patch *patch);
+void release_patch(struct patch *patch);
+
/*
* Some aspects of the apply behavior are controlled by the following
* bits in the "options" parameter passed to apply_all_patches().
diff --git a/archive-tar.c b/archive-tar.c
index 05d2455..042feb6 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -430,7 +430,6 @@ static int write_tar_filter_archive(const struct archiver *ar,
{
struct strbuf cmd = STRBUF_INIT;
struct child_process filter = CHILD_PROCESS_INIT;
- const char *argv[2];
int r;
if (!ar->data)
@@ -440,14 +439,12 @@ static int write_tar_filter_archive(const struct archiver *ar,
if (args->compression_level >= 0)
strbuf_addf(&cmd, " -%d", args->compression_level);
- argv[0] = cmd.buf;
- argv[1] = NULL;
- filter.argv = argv;
+ strvec_push(&filter.args, cmd.buf);
filter.use_shell = 1;
filter.in = -1;
if (start_command(&filter) < 0)
- die_errno(_("unable to start '%s' filter"), argv[0]);
+ die_errno(_("unable to start '%s' filter"), cmd.buf);
close(1);
if (dup2(filter.in, 1) < 0)
die_errno(_("unable to redirect descriptor"));
@@ -457,16 +454,16 @@ static int write_tar_filter_archive(const struct archiver *ar,
close(1);
if (finish_command(&filter) != 0)
- die(_("'%s' filter reported error"), argv[0]);
+ die(_("'%s' filter reported error"), cmd.buf);
strbuf_release(&cmd);
return r;
}
static struct archiver tar_archiver = {
- "tar",
- write_tar_archive,
- ARCHIVER_REMOTE
+ .name = "tar",
+ .write_archive = write_tar_archive,
+ .flags = ARCHIVER_REMOTE,
};
void init_tar_archiver(void)
diff --git a/archive-zip.c b/archive-zip.c
index 2961e01..9fe43d7 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -9,6 +9,7 @@
#include "object-store.h"
#include "userdiff.h"
#include "xdiff-interface.h"
+#include "date.h"
static int zip_date;
static int zip_time;
@@ -637,9 +638,9 @@ static int write_zip_archive(const struct archiver *ar,
}
static struct archiver zip_archiver = {
- "zip",
- write_zip_archive,
- ARCHIVER_WANT_COMPRESSION_LEVELS|ARCHIVER_REMOTE
+ .name = "zip",
+ .write_archive = write_zip_archive,
+ .flags = ARCHIVER_WANT_COMPRESSION_LEVELS|ARCHIVER_REMOTE,
};
void init_zip_archiver(void)
diff --git a/archive.c b/archive.c
index a3bbb09..d5109ab 100644
--- a/archive.c
+++ b/archive.c
@@ -9,10 +9,11 @@
#include "parse-options.h"
#include "unpack-trees.h"
#include "dir.h"
+#include "quote.h"
static char const * const archive_usage[] = {
N_("git archive [<options>] <tree-ish> [<path>...]"),
- N_("git archive --list"),
+ "git archive --list",
N_("git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"),
N_("git archive --remote <repo> [--exec <cmd>] --list"),
NULL
@@ -185,7 +186,7 @@ static int write_archive_entry(const struct object_id *oid, const char *base,
buffer = object_file_to_archive(args, path.buf, oid, mode, &type, &size);
if (!buffer)
- return error(_("cannot read %s"), oid_to_hex(oid));
+ return error(_("cannot read '%s'"), oid_to_hex(oid));
err = write_entry(args, oid, path.buf, path.len, mode, buffer, size);
free(buffer);
return err;
@@ -263,6 +264,7 @@ static int queue_or_write_archive_entry(const struct object_id *oid,
struct extra_file_info {
char *base;
struct stat stat;
+ void *content;
};
int write_archive_entries(struct archiver_args *args,
@@ -331,19 +333,27 @@ int write_archive_entries(struct archiver_args *args,
put_be64(fake_oid.hash, i + 1);
- strbuf_reset(&path_in_archive);
- if (info->base)
- strbuf_addstr(&path_in_archive, info->base);
- strbuf_addstr(&path_in_archive, basename(path));
+ if (!info->content) {
+ strbuf_reset(&path_in_archive);
+ if (info->base)
+ strbuf_addstr(&path_in_archive, info->base);
+ strbuf_addstr(&path_in_archive, basename(path));
- strbuf_reset(&content);
- if (strbuf_read_file(&content, path, info->stat.st_size) < 0)
- err = error_errno(_("could not read '%s'"), path);
- else
- err = write_entry(args, &fake_oid, path_in_archive.buf,
- path_in_archive.len,
- info->stat.st_mode,
- content.buf, content.len);
+ strbuf_reset(&content);
+ if (strbuf_read_file(&content, path, info->stat.st_size) < 0)
+ err = error_errno(_("cannot read '%s'"), path);
+ else
+ err = write_entry(args, &fake_oid, path_in_archive.buf,
+ path_in_archive.len,
+ canon_mode(info->stat.st_mode),
+ content.buf, content.len);
+ } else {
+ err = write_entry(args, &fake_oid,
+ path, strlen(path),
+ canon_mode(info->stat.st_mode),
+ info->content, info->stat.st_size);
+ }
+
if (err)
break;
}
@@ -465,7 +475,7 @@ static void parse_treeish_arg(const char **argv,
}
tree = parse_tree_indirect(&oid);
- if (tree == NULL)
+ if (!tree)
die(_("not a tree object: %s"), oid_to_hex(&oid));
if (prefix) {
@@ -493,6 +503,7 @@ static void extra_file_info_clear(void *util, const char *str)
{
struct extra_file_info *info = util;
free(info->base);
+ free(info->content);
free(info);
}
@@ -514,14 +525,49 @@ static int add_file_cb(const struct option *opt, const char *arg, int unset)
if (!arg)
return -1;
- path = prefix_filename(args->prefix, arg);
- item = string_list_append_nodup(&args->extra_files, path);
- item->util = info = xmalloc(sizeof(*info));
+ info = xmalloc(sizeof(*info));
info->base = xstrdup_or_null(base);
- if (stat(path, &info->stat))
- die(_("File not found: %s"), path);
- if (!S_ISREG(info->stat.st_mode))
- die(_("Not a regular file: %s"), path);
+
+ if (!strcmp(opt->long_name, "add-file")) {
+ path = prefix_filename(args->prefix, arg);
+ if (stat(path, &info->stat))
+ die(_("File not found: %s"), path);
+ if (!S_ISREG(info->stat.st_mode))
+ die(_("Not a regular file: %s"), path);
+ info->content = NULL; /* read the file later */
+ } else if (!strcmp(opt->long_name, "add-virtual-file")) {
+ struct strbuf buf = STRBUF_INIT;
+ const char *p = arg;
+
+ if (*p != '"')
+ p = strchr(p, ':');
+ else if (unquote_c_style(&buf, p, &p) < 0)
+ die(_("unclosed quote: '%s'"), arg);
+
+ if (!p || *p != ':')
+ die(_("missing colon: '%s'"), arg);
+
+ if (p == arg)
+ die(_("empty file name: '%s'"), arg);
+
+ path = buf.len ?
+ strbuf_detach(&buf, NULL) : xstrndup(arg, p - arg);
+
+ if (args->prefix) {
+ char *save = path;
+ path = prefix_filename(args->prefix, path);
+ free(save);
+ }
+ memset(&info->stat, 0, sizeof(info->stat));
+ info->stat.st_mode = S_IFREG | 0644;
+ info->content = xstrdup(p + 1);
+ info->stat.st_size = strlen(info->content);
+ } else {
+ BUG("add_file_cb() called for %s", opt->long_name);
+ }
+ item = string_list_append_nodup(&args->extra_files, path);
+ item->util = info;
+
return 0;
}
@@ -554,6 +600,9 @@ static int parse_archive_args(int argc, const char **argv,
{ OPTION_CALLBACK, 0, "add-file", args, N_("file"),
N_("add untracked file to archive"), 0, add_file_cb,
(intptr_t)&base },
+ { OPTION_CALLBACK, 0, "add-virtual-file", args,
+ N_("path:content"), N_("add untracked file to archive"), 0,
+ add_file_cb, (intptr_t)&base },
OPT_STRING('o', "output", &output, N_("file"),
N_("write the archive to this file")),
OPT_BOOL(0, "worktree-attributes", &worktree_attributes,
@@ -577,11 +626,11 @@ static int parse_archive_args(int argc, const char **argv,
if (remote)
die(_("Unexpected option --remote"));
if (exec)
- die(_("Option --exec can only be used together with --remote"));
+ die(_("the option '%s' requires '%s'"), "--exec", "--remote");
if (output)
die(_("Unexpected option --output"));
if (is_remote && args->extra_files.nr)
- die(_("Options --add-file and --remote cannot be used together"));
+ die(_("options '%s' and '%s' cannot be used together"), "--add-file", "--remote");
if (!base)
base = "";
diff --git a/attr.c b/attr.c
index 79adaa5..21e4ad2 100644
--- a/attr.c
+++ b/attr.c
@@ -14,7 +14,6 @@
#include "utf8.h"
#include "quote.h"
#include "thread-utils.h"
-#include "dir.h"
const char git_attr__true[] = "(builtin)true";
const char git_attr__false[] = "\0(builtin)false";
@@ -80,7 +79,7 @@ static int attr_hash_entry_cmp(const void *unused_cmp_data,
* Access to this dictionary must be surrounded with a mutex.
*/
static struct attr_hashmap g_attr_hashmap = {
- HASHMAP_INIT(attr_hash_entry_cmp, NULL)
+ .map = HASHMAP_INIT(attr_hash_entry_cmp, NULL),
};
/*
diff --git a/attr.h b/attr.h
index 3732505..3fb40cc 100644
--- a/attr.h
+++ b/attr.h
@@ -121,7 +121,6 @@ struct git_attr;
/* opaque structures used internally for attribute collection */
struct all_attrs_item;
struct attr_stack;
-struct index_state;
/*
* Given a string, return the gitattribute object that
diff --git a/banned.h b/banned.h
index 7ab4f2e..6ccf46b 100644
--- a/banned.h
+++ b/banned.h
@@ -21,13 +21,8 @@
#undef sprintf
#undef vsprintf
-#ifdef HAVE_VARIADIC_MACROS
#define sprintf(...) BANNED(sprintf)
#define vsprintf(...) BANNED(vsprintf)
-#else
-#define sprintf(buf,fmt,arg) BANNED(sprintf)
-#define vsprintf(buf,fmt,arg) BANNED(vsprintf)
-#endif
#undef gmtime
#define gmtime(t) BANNED(gmtime)
diff --git a/bisect.c b/bisect.c
index 888949f..b63669c 100644
--- a/bisect.c
+++ b/bisect.c
@@ -724,7 +724,8 @@ static int is_expected_rev(const struct object_id *oid)
return res;
}
-static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
+enum bisect_error bisect_checkout(const struct object_id *bisect_rev,
+ int no_checkout)
{
char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
struct commit *commit;
@@ -883,6 +884,7 @@ static int check_ancestors(struct repository *r, int rev_nr,
/* Clean up objects used, as they will be reused. */
clear_commit_marks_many(rev_nr, rev, ALL_REV_FLAGS);
+ release_revisions(&revs);
return res;
}
@@ -963,6 +965,7 @@ static void show_diff_tree(struct repository *r,
setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
log_tree_commit(&opt, commit);
+ release_revisions(&opt);
}
/*
@@ -1007,7 +1010,7 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
*/
enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
{
- struct rev_info revs;
+ struct rev_info revs = REV_INFO_INIT;
struct commit_list *tried;
int reaches = 0, all = 0, nr, steps;
enum bisect_error res = BISECT_OK;
@@ -1032,7 +1035,7 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
res = check_good_are_ancestors_of_bad(r, prefix, no_checkout);
if (res)
- return res;
+ goto cleanup;
bisect_rev_setup(r, &revs, prefix, "%s", "^%s", 1);
@@ -1057,14 +1060,16 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
term_good,
term_bad);
- return BISECT_FAILED;
+ res = BISECT_FAILED;
+ goto cleanup;
}
if (!all) {
fprintf(stderr, _("No testable commit found.\n"
"Maybe you started with bad path arguments?\n"));
- return BISECT_NO_TESTABLE_COMMIT;
+ res = BISECT_NO_TESTABLE_COMMIT;
+ goto cleanup;
}
bisect_rev = &revs.commits->item->object.oid;
@@ -1084,7 +1089,8 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
* for negative return values for early returns up
* until the cmd_bisect__helper() caller.
*/
- return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
+ res = BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
+ goto cleanup;
}
nr = all - reaches - 1;
@@ -1103,7 +1109,10 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
/* Clean up objects used, as they will be reused. */
repo_clear_commit_marks(r, ALL_REV_FLAGS);
- return bisect_checkout(bisect_rev, no_checkout);
+ res = bisect_checkout(bisect_rev, no_checkout);
+cleanup:
+ release_revisions(&revs);
+ return res;
}
static inline int log2i(int n)
diff --git a/bisect.h b/bisect.h
index ec24ac2..ee3fd65 100644
--- a/bisect.h
+++ b/bisect.h
@@ -3,6 +3,7 @@
struct commit_list;
struct repository;
+struct object_id;
/*
* Find bisection. If something is found, `reaches` will be the number of
@@ -61,6 +62,15 @@ enum bisect_error {
BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11
};
+/*
+ * Stores how many good/bad commits we have stored for a bisect. nr_bad can
+ * only be 0 or 1.
+ */
+struct bisect_state {
+ unsigned int nr_good;
+ unsigned int nr_bad;
+};
+
enum bisect_error bisect_next_all(struct repository *r, const char *prefix);
int estimate_bisect_steps(int all);
@@ -69,4 +79,7 @@ void read_bisect_terms(const char **bad, const char **good);
int bisect_clean_state(void);
+enum bisect_error bisect_checkout(const struct object_id *bisect_rev,
+ int no_checkout);
+
#endif
diff --git a/blame.c b/blame.c
index 206c295..da1052a 100644
--- a/blame.c
+++ b/blame.c
@@ -1072,7 +1072,7 @@ static struct blame_entry *blame_merge(struct blame_entry *list1,
if (p1->s_lno <= p2->s_lno) {
do {
tail = &p1->next;
- if ((p1 = *tail) == NULL) {
+ if (!(p1 = *tail)) {
*tail = p2;
return list1;
}
@@ -1082,7 +1082,7 @@ static struct blame_entry *blame_merge(struct blame_entry *list1,
*tail = p2;
do {
tail = &p2->next;
- if ((p2 = *tail) == NULL) {
+ if (!(p2 = *tail)) {
*tail = p1;
return list1;
}
@@ -1090,7 +1090,7 @@ static struct blame_entry *blame_merge(struct blame_entry *list1,
*tail = p1;
do {
tail = &p1->next;
- if ((p1 = *tail) == NULL) {
+ if (!(p1 = *tail)) {
*tail = p2;
return list1;
}
@@ -1403,7 +1403,6 @@ static struct blame_origin *find_origin(struct repository *r,
}
}
diff_flush(&diff_opts);
- clear_pathspec(&diff_opts.pathspec);
return porigin;
}
@@ -1447,7 +1446,6 @@ static struct blame_origin *find_rename(struct repository *r,
}
}
diff_flush(&diff_opts);
- clear_pathspec(&diff_opts.pathspec);
return porigin;
}
@@ -2328,7 +2326,6 @@ static void find_copy_in_parent(struct blame_scoreboard *sb,
} while (unblamed);
target->suspects = reverse_blame(leftover, NULL);
diff_flush(&diff_opts);
- clear_pathspec(&diff_opts.pathspec);
}
/*
@@ -2615,7 +2612,7 @@ void assign_blame(struct blame_scoreboard *sb, int opt)
else {
commit->object.flags |= UNINTERESTING;
if (commit->object.parsed)
- mark_parents_uninteresting(commit);
+ mark_parents_uninteresting(sb->revs, commit);
}
/* treat root commit as boundary */
if (!commit->parents && !sb->show_root)
diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c
index 1bb6e7c..5974cd7 100644
--- a/block-sha1/sha1.c
+++ b/block-sha1/sha1.c
@@ -11,27 +11,10 @@
#include "sha1.h"
-#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-
-/*
- * Force usage of rol or ror by selecting the one with the smaller constant.
- * It _can_ generate slightly smaller code (a constant of 1 is special), but
- * perhaps more importantly it's possibly faster on any uarch that does a
- * rotate with a loop.
- */
-
-#define SHA_ASM(op, x, n) ({ unsigned int __res; __asm__(op " %1,%0":"=r" (__res):"i" (n), "0" (x)); __res; })
-#define SHA_ROL(x,n) SHA_ASM("rol", x, n)
-#define SHA_ROR(x,n) SHA_ASM("ror", x, n)
-
-#else
-
#define SHA_ROT(X,l,r) (((X) << (l)) | ((X) >> (r)))
#define SHA_ROL(X,n) SHA_ROT(X,n,32-(n))
#define SHA_ROR(X,n) SHA_ROT(X,32-(n),n)
-#endif
-
/*
* If you have 32 registers or more, the compiler can (and should)
* try to change the array[] accesses into registers. However, on
diff --git a/branch.c b/branch.c
index 07a4643..4c8523c 100644
--- a/branch.c
+++ b/branch.c
@@ -8,29 +8,45 @@
#include "sequencer.h"
#include "commit.h"
#include "worktree.h"
+#include "submodule-config.h"
+#include "run-command.h"
struct tracking {
struct refspec_item spec;
- char *src;
+ struct string_list *srcs;
const char *remote;
int matches;
};
+struct find_tracked_branch_cb {
+ struct tracking *tracking;
+ struct string_list ambiguous_remotes;
+};
+
static int find_tracked_branch(struct remote *remote, void *priv)
{
- struct tracking *tracking = priv;
+ struct find_tracked_branch_cb *ftb = priv;
+ struct tracking *tracking = ftb->tracking;
if (!remote_find_tracking(remote, &tracking->spec)) {
- if (++tracking->matches == 1) {
- tracking->src = tracking->spec.src;
+ switch (++tracking->matches) {
+ case 1:
+ string_list_append(tracking->srcs, tracking->spec.src);
tracking->remote = remote->name;
- } else {
+ break;
+ case 2:
+ /* there are at least two remotes; backfill the first one */
+ string_list_append(&ftb->ambiguous_remotes, tracking->remote);
+ /* fall through */
+ default:
+ string_list_append(&ftb->ambiguous_remotes, remote->name);
free(tracking->spec.src);
- FREE_AND_NULL(tracking->src);
+ string_list_clear(tracking->srcs, 0);
+ break;
}
+ /* remote_find_tracking() searches by src if present */
tracking->spec.src = NULL;
}
-
return 0;
}
@@ -49,25 +65,46 @@ static int should_setup_rebase(const char *origin)
return 0;
}
-static const char tracking_advice[] =
-N_("\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\".");
-
-int install_branch_config(int flag, const char *local, const char *origin, const char *remote)
+/**
+ * Install upstream tracking configuration for a branch; specifically, add
+ * `branch.<name>.remote` and `branch.<name>.merge` entries.
+ *
+ * `flag` contains integer flags for options; currently only
+ * BRANCH_CONFIG_VERBOSE is checked.
+ *
+ * `local` is the name of the branch whose configuration we're installing.
+ *
+ * `origin` is the name of the remote owning the upstream branches. NULL means
+ * the upstream branches are local to this repo.
+ *
+ * `remotes` is a list of refs that are upstream of local
+ */
+static int install_branch_config_multiple_remotes(int flag, const char *local,
+ const char *origin, struct string_list *remotes)
{
const char *shortname = NULL;
struct strbuf key = STRBUF_INIT;
+ struct string_list_item *item;
int rebasing = should_setup_rebase(origin);
- if (skip_prefix(remote, "refs/heads/", &shortname)
- && !strcmp(local, shortname)
- && !origin) {
- warning(_("Not setting branch %s as its own upstream."),
- local);
- return 0;
- }
+ if (!remotes->nr)
+ BUG("must provide at least one remote for branch config");
+ if (rebasing && remotes->nr > 1)
+ die(_("cannot inherit upstream tracking configuration of "
+ "multiple refs when rebasing is requested"));
+
+ /*
+ * If the new branch is trying to track itself, something has gone
+ * wrong. Warn the user and don't proceed any further.
+ */
+ if (!origin)
+ for_each_string_list_item(item, remotes)
+ if (skip_prefix(item->string, "refs/heads/", &shortname)
+ && !strcmp(local, shortname)) {
+ warning(_("not setting branch '%s' as its own upstream"),
+ local);
+ return 0;
+ }
strbuf_addf(&key, "branch.%s.remote", local);
if (git_config_set_gently(key.buf, origin ? origin : ".") < 0)
@@ -75,8 +112,17 @@ int install_branch_config(int flag, const char *local, const char *origin, const
strbuf_reset(&key);
strbuf_addf(&key, "branch.%s.merge", local);
- if (git_config_set_gently(key.buf, remote) < 0)
+ /*
+ * We want to overwrite any existing config with all the branches in
+ * "remotes". Override any existing config, then write our branches. If
+ * more than one is provided, use CONFIG_REGEX_NONE to preserve what
+ * we've written so far.
+ */
+ if (git_config_set_gently(key.buf, NULL) < 0)
goto out_err;
+ for_each_string_list_item(item, remotes)
+ if (git_config_set_multivar_gently(key.buf, item->string, CONFIG_REGEX_NONE, 0) < 0)
+ goto out_err;
if (rebasing) {
strbuf_reset(&key);
@@ -87,80 +133,212 @@ int install_branch_config(int flag, const char *local, const char *origin, const
strbuf_release(&key);
if (flag & BRANCH_CONFIG_VERBOSE) {
- if (shortname) {
- if (origin)
- printf_ln(rebasing ?
- _("Branch '%s' set up to track remote branch '%s' from '%s' by rebasing.") :
- _("Branch '%s' set up to track remote branch '%s' from '%s'."),
- local, shortname, origin);
- else
- printf_ln(rebasing ?
- _("Branch '%s' set up to track local branch '%s' by rebasing.") :
- _("Branch '%s' set up to track local branch '%s'."),
- local, shortname);
- } else {
- if (origin)
- printf_ln(rebasing ?
- _("Branch '%s' set up to track remote ref '%s' by rebasing.") :
- _("Branch '%s' set up to track remote ref '%s'."),
- local, remote);
- else
- printf_ln(rebasing ?
- _("Branch '%s' set up to track local ref '%s' by rebasing.") :
- _("Branch '%s' set up to track local ref '%s'."),
- local, remote);
+ struct strbuf tmp_ref_name = STRBUF_INIT;
+ struct string_list friendly_ref_names = STRING_LIST_INIT_DUP;
+
+ for_each_string_list_item(item, remotes) {
+ shortname = item->string;
+ skip_prefix(shortname, "refs/heads/", &shortname);
+ if (origin) {
+ strbuf_addf(&tmp_ref_name, "%s/%s",
+ origin, shortname);
+ string_list_append_nodup(
+ &friendly_ref_names,
+ strbuf_detach(&tmp_ref_name, NULL));
+ } else {
+ string_list_append(
+ &friendly_ref_names, shortname);
+ }
}
+
+ if (remotes->nr == 1) {
+ /*
+ * Rebasing is only allowed in the case of a single
+ * upstream branch.
+ */
+ printf_ln(rebasing ?
+ _("branch '%s' set up to track '%s' by rebasing.") :
+ _("branch '%s' set up to track '%s'."),
+ local, friendly_ref_names.items[0].string);
+ } else {
+ printf_ln(_("branch '%s' set up to track:"), local);
+ for_each_string_list_item(item, &friendly_ref_names)
+ printf_ln(" %s", item->string);
+ }
+
+ string_list_clear(&friendly_ref_names, 0);
}
return 0;
out_err:
strbuf_release(&key);
- error(_("Unable to write upstream branch configuration"));
+ error(_("unable to write upstream branch configuration"));
- advise(_(tracking_advice),
- origin ? origin : "",
- origin ? "/" : "",
- shortname ? shortname : remote);
+ advise(_("\nAfter fixing the error cause you may try to fix up\n"
+ "the remote tracking information by invoking:"));
+ if (remotes->nr == 1)
+ advise(" git branch --set-upstream-to=%s%s%s",
+ origin ? origin : "",
+ origin ? "/" : "",
+ remotes->items[0].string);
+ else {
+ advise(" git config --add branch.\"%s\".remote %s",
+ local, origin ? origin : ".");
+ for_each_string_list_item(item, remotes)
+ advise(" git config --add branch.\"%s\".merge %s",
+ local, item->string);
+ }
return -1;
}
+int install_branch_config(int flag, const char *local, const char *origin,
+ const char *remote)
+{
+ int ret;
+ struct string_list remotes = STRING_LIST_INIT_DUP;
+
+ string_list_append(&remotes, remote);
+ ret = install_branch_config_multiple_remotes(flag, local, origin, &remotes);
+ string_list_clear(&remotes, 0);
+ return ret;
+}
+
+static int inherit_tracking(struct tracking *tracking, const char *orig_ref)
+{
+ const char *bare_ref;
+ struct branch *branch;
+ int i;
+
+ bare_ref = orig_ref;
+ skip_prefix(orig_ref, "refs/heads/", &bare_ref);
+
+ branch = branch_get(bare_ref);
+ if (!branch->remote_name) {
+ warning(_("asked to inherit tracking from '%s', but no remote is set"),
+ bare_ref);
+ return -1;
+ }
+
+ if (branch->merge_nr < 1 || !branch->merge_name || !branch->merge_name[0]) {
+ warning(_("asked to inherit tracking from '%s', but no merge configuration is set"),
+ bare_ref);
+ return -1;
+ }
+
+ tracking->remote = xstrdup(branch->remote_name);
+ for (i = 0; i < branch->merge_nr; i++)
+ string_list_append(tracking->srcs, branch->merge_name[i]);
+ return 0;
+}
+
/*
- * This is called when new_ref is branched off of orig_ref, and tries
- * to infer the settings for branch.<new_ref>.{remote,merge} from the
- * config.
+ * Used internally to set the branch.<new_ref>.{remote,merge} config
+ * settings so that branch 'new_ref' tracks 'orig_ref'. Unlike
+ * dwim_and_setup_tracking(), this does not do DWIM, i.e. "origin/main"
+ * will not be expanded to "refs/remotes/origin/main", so it is not safe
+ * for 'orig_ref' to be raw user input.
*/
static void setup_tracking(const char *new_ref, const char *orig_ref,
enum branch_track track, int quiet)
{
struct tracking tracking;
+ struct string_list tracking_srcs = STRING_LIST_INIT_DUP;
int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
+ struct find_tracked_branch_cb ftb_cb = {
+ .tracking = &tracking,
+ .ambiguous_remotes = STRING_LIST_INIT_DUP,
+ };
+
+ if (!track)
+ BUG("asked to set up tracking, but tracking is disallowed");
memset(&tracking, 0, sizeof(tracking));
tracking.spec.dst = (char *)orig_ref;
- if (for_each_remote(find_tracked_branch, &tracking))
- return;
+ tracking.srcs = &tracking_srcs;
+ if (track != BRANCH_TRACK_INHERIT)
+ for_each_remote(find_tracked_branch, &ftb_cb);
+ else if (inherit_tracking(&tracking, orig_ref))
+ goto cleanup;
if (!tracking.matches)
switch (track) {
+ /* If ref is not remote, still use local */
case BRANCH_TRACK_ALWAYS:
case BRANCH_TRACK_EXPLICIT:
case BRANCH_TRACK_OVERRIDE:
+ /* Remote matches not evaluated */
+ case BRANCH_TRACK_INHERIT:
break;
+ /* Otherwise, if no remote don't track */
default:
- return;
+ goto cleanup;
}
- if (tracking.matches > 1)
- die(_("Not tracking: ambiguous information for ref %s"),
- orig_ref);
+ /*
+ * This check does not apply to BRANCH_TRACK_INHERIT;
+ * that supports multiple entries in tracking_srcs but
+ * leaves tracking.matches at 0.
+ */
+ if (tracking.matches > 1) {
+ int status = die_message(_("not tracking: ambiguous information for ref '%s'"),
+ orig_ref);
+ if (advice_enabled(ADVICE_AMBIGUOUS_FETCH_REFSPEC)) {
+ struct strbuf remotes_advice = STRBUF_INIT;
+ struct string_list_item *item;
- if (install_branch_config(config_flags, new_ref, tracking.remote,
- tracking.src ? tracking.src : orig_ref) < 0)
- exit(-1);
+ for_each_string_list_item(item, &ftb_cb.ambiguous_remotes)
+ /*
+ * TRANSLATORS: This is a line listing a remote with duplicate
+ * refspecs in the advice message below. For RTL languages you'll
+ * probably want to swap the "%s" and leading " " space around.
+ */
+ strbuf_addf(&remotes_advice, _(" %s\n"), item->string);
- free(tracking.src);
+ /*
+ * TRANSLATORS: The second argument is a \n-delimited list of
+ * duplicate refspecs, composed above.
+ */
+ advise(_("There are multiple remotes whose fetch refspecs map to the remote\n"
+ "tracking ref '%s':\n"
+ "%s"
+ "\n"
+ "This is typically a configuration error.\n"
+ "\n"
+ "To support setting up tracking branches, ensure that\n"
+ "different remotes' fetch refspecs map into different\n"
+ "tracking namespaces."), orig_ref,
+ remotes_advice.buf);
+ strbuf_release(&remotes_advice);
+ }
+ exit(status);
+ }
+
+ if (track == BRANCH_TRACK_SIMPLE) {
+ /*
+ * Only track if remote branch name matches.
+ * Reaching into items[0].string is safe because
+ * we know there is at least one and not more than
+ * one entry (because only BRANCH_TRACK_INHERIT can
+ * produce more than one entry).
+ */
+ const char *tracked_branch;
+ if (!skip_prefix(tracking.srcs->items[0].string,
+ "refs/heads/", &tracked_branch) ||
+ strcmp(tracked_branch, new_ref))
+ return;
+ }
+
+ if (tracking.srcs->nr < 1)
+ string_list_append(tracking.srcs, orig_ref);
+ if (install_branch_config_multiple_remotes(config_flags, new_ref,
+ tracking.remote, tracking.srcs) < 0)
+ exit(1);
+
+cleanup:
+ string_list_clear(&tracking_srcs, 0);
+ string_list_clear(&ftb_cb.ambiguous_remotes, 0);
}
int read_branch_desc(struct strbuf *buf, const char *branch_name)
@@ -186,7 +364,7 @@ int read_branch_desc(struct strbuf *buf, const char *branch_name)
int validate_branchname(const char *name, struct strbuf *ref)
{
if (strbuf_check_branch_ref(ref, name))
- die(_("'%s' is not a valid branch name."), name);
+ die(_("'%s' is not a valid branch name"), name);
return ref_exists(ref->buf);
}
@@ -199,18 +377,23 @@ int validate_branchname(const char *name, struct strbuf *ref)
*/
int validate_new_branchname(const char *name, struct strbuf *ref, int force)
{
- const char *head;
+ struct worktree **worktrees;
+ const struct worktree *wt;
if (!validate_branchname(name, ref))
return 0;
if (!force)
- die(_("A branch named '%s' already exists."),
+ die(_("a branch named '%s' already exists"),
ref->buf + strlen("refs/heads/"));
- head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
- if (!is_bare_repository() && head && !strcmp(head, ref->buf))
- die(_("Cannot force update the current branch."));
+ worktrees = get_worktrees();
+ wt = find_shared_symref(worktrees, "HEAD", ref->buf);
+ if (wt && !wt->is_bare)
+ die(_("cannot force update the branch '%s' "
+ "checked out at '%s'"),
+ ref->buf + strlen("refs/heads/"), wt->path);
+ free_worktrees(worktrees);
return 1;
}
@@ -230,7 +413,7 @@ static int validate_remote_tracking_branch(char *ref)
}
static const char upstream_not_branch[] =
-N_("Cannot setup tracking information; starting point '%s' is not a branch.");
+N_("cannot set up tracking information; starting point '%s' is not a branch");
static const char upstream_missing[] =
N_("the requested upstream branch '%s' does not exist");
static const char upstream_advice[] =
@@ -243,42 +426,46 @@ N_("\n"
"will track its remote counterpart, you may want to use\n"
"\"git push -u\" to set the upstream config as you push.");
-void create_branch(struct repository *r,
- const char *name, const char *start_name,
- int force, int clobber_head_ok, int reflog,
- int quiet, enum branch_track track)
+/**
+ * DWIMs a user-provided ref to determine the starting point for a
+ * branch and validates it, where:
+ *
+ * - r is the repository to validate the branch for
+ *
+ * - start_name is the ref that we would like to test. This is
+ * expanded with DWIM and assigned to out_real_ref.
+ *
+ * - track is the tracking mode of the new branch. If tracking is
+ * explicitly requested, start_name must be a branch (because
+ * otherwise start_name cannot be tracked)
+ *
+ * - out_oid is an out parameter containing the object_id of start_name
+ *
+ * - out_real_ref is an out parameter containing the full, 'real' form
+ * of start_name e.g. refs/heads/main instead of main
+ *
+ */
+static void dwim_branch_start(struct repository *r, const char *start_name,
+ enum branch_track track, char **out_real_ref,
+ struct object_id *out_oid)
{
struct commit *commit;
struct object_id oid;
char *real_ref;
- struct strbuf ref = STRBUF_INIT;
- int forcing = 0;
- int dont_change_ref = 0;
int explicit_tracking = 0;
if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
explicit_tracking = 1;
- if ((track == BRANCH_TRACK_OVERRIDE || clobber_head_ok)
- ? validate_branchname(name, &ref)
- : validate_new_branchname(name, &ref, force)) {
- if (!force)
- dont_change_ref = 1;
- else
- forcing = 1;
- }
-
real_ref = NULL;
if (get_oid_mb(start_name, &oid)) {
if (explicit_tracking) {
- if (advice_enabled(ADVICE_SET_UPSTREAM_FAILURE)) {
- error(_(upstream_missing), start_name);
- advise(_(upstream_advice));
- exit(1);
- }
- die(_(upstream_missing), start_name);
+ int code = die_message(_(upstream_missing), start_name);
+ advise_if_enabled(ADVICE_SET_UPSTREAM_FAILURE,
+ _(upstream_advice));
+ exit(code);
}
- die(_("Not a valid object name: '%s'."), start_name);
+ die(_("not a valid object name: '%s'"), start_name);
}
switch (dwim_ref(start_name, strlen(start_name), &oid, &real_ref, 0)) {
@@ -298,46 +485,248 @@ void create_branch(struct repository *r,
}
break;
default:
- die(_("Ambiguous object name: '%s'."), start_name);
+ die(_("ambiguous object name: '%s'"), start_name);
break;
}
- if ((commit = lookup_commit_reference(r, &oid)) == NULL)
- die(_("Not a valid branch point: '%s'."), start_name);
- oidcpy(&oid, &commit->object.oid);
+ if (!(commit = lookup_commit_reference(r, &oid)))
+ die(_("not a valid branch point: '%s'"), start_name);
+ if (out_real_ref) {
+ *out_real_ref = real_ref;
+ real_ref = NULL;
+ }
+ if (out_oid)
+ oidcpy(out_oid, &commit->object.oid);
+
+ FREE_AND_NULL(real_ref);
+}
+
+void create_branch(struct repository *r,
+ const char *name, const char *start_name,
+ int force, int clobber_head_ok, int reflog,
+ int quiet, enum branch_track track, int dry_run)
+{
+ struct object_id oid;
+ char *real_ref;
+ struct strbuf ref = STRBUF_INIT;
+ int forcing = 0;
+ struct ref_transaction *transaction;
+ struct strbuf err = STRBUF_INIT;
+ char *msg;
+
+ if (track == BRANCH_TRACK_OVERRIDE)
+ BUG("'track' cannot be BRANCH_TRACK_OVERRIDE. Did you mean to call dwim_and_setup_tracking()?");
+ if (clobber_head_ok && !force)
+ BUG("'clobber_head_ok' can only be used with 'force'");
+
+ if (clobber_head_ok ?
+ validate_branchname(name, &ref) :
+ validate_new_branchname(name, &ref, force)) {
+ forcing = 1;
+ }
+
+ dwim_branch_start(r, start_name, track, &real_ref, &oid);
+ if (dry_run)
+ goto cleanup;
if (reflog)
log_all_ref_updates = LOG_REFS_NORMAL;
- if (!dont_change_ref) {
- struct ref_transaction *transaction;
- struct strbuf err = STRBUF_INIT;
- char *msg;
-
- if (forcing)
- msg = xstrfmt("branch: Reset to %s", start_name);
- else
- msg = xstrfmt("branch: Created from %s", start_name);
-
- transaction = ref_transaction_begin(&err);
- if (!transaction ||
- ref_transaction_update(transaction, ref.buf,
- &oid, forcing ? NULL : null_oid(),
- 0, msg, &err) ||
- ref_transaction_commit(transaction, &err))
- die("%s", err.buf);
- ref_transaction_free(transaction);
- strbuf_release(&err);
- free(msg);
- }
+ if (forcing)
+ msg = xstrfmt("branch: Reset to %s", start_name);
+ else
+ msg = xstrfmt("branch: Created from %s", start_name);
+ transaction = ref_transaction_begin(&err);
+ if (!transaction ||
+ ref_transaction_update(transaction, ref.buf,
+ &oid, forcing ? NULL : null_oid(),
+ 0, msg, &err) ||
+ ref_transaction_commit(transaction, &err))
+ die("%s", err.buf);
+ ref_transaction_free(transaction);
+ strbuf_release(&err);
+ free(msg);
if (real_ref && track)
setup_tracking(ref.buf + 11, real_ref, track, quiet);
+cleanup:
strbuf_release(&ref);
free(real_ref);
}
+void dwim_and_setup_tracking(struct repository *r, const char *new_ref,
+ const char *orig_ref, enum branch_track track,
+ int quiet)
+{
+ char *real_orig_ref;
+ dwim_branch_start(r, orig_ref, track, &real_orig_ref, NULL);
+ setup_tracking(new_ref, real_orig_ref, track, quiet);
+}
+
+/**
+ * Creates a branch in a submodule by calling
+ * create_branches_recursively() in a child process. The child process
+ * is necessary because install_branch_config_multiple_remotes() (which
+ * is called by setup_tracking()) does not support writing configs to
+ * submodules.
+ */
+static int submodule_create_branch(struct repository *r,
+ const struct submodule *submodule,
+ const char *name, const char *start_oid,
+ const char *tracking_name, int force,
+ int reflog, int quiet,
+ enum branch_track track, int dry_run)
+{
+ int ret = 0;
+ struct child_process child = CHILD_PROCESS_INIT;
+ struct strbuf child_err = STRBUF_INIT;
+ struct strbuf out_buf = STRBUF_INIT;
+ char *out_prefix = xstrfmt("submodule '%s': ", submodule->name);
+ child.git_cmd = 1;
+ child.err = -1;
+ child.stdout_to_stderr = 1;
+
+ prepare_other_repo_env(&child.env, r->gitdir);
+ /*
+ * submodule_create_branch() is indirectly invoked by "git
+ * branch", but we cannot invoke "git branch" in the child
+ * process. "git branch" accepts a branch name and start point,
+ * where the start point is assumed to provide both the OID
+ * (start_oid) and the branch to use for tracking
+ * (tracking_name). But when recursing through submodules,
+ * start_oid and tracking name need to be specified separately
+ * (see create_branches_recursively()).
+ */
+ strvec_pushl(&child.args, "submodule--helper", "create-branch", NULL);
+ if (dry_run)
+ strvec_push(&child.args, "--dry-run");
+ if (force)
+ strvec_push(&child.args, "--force");
+ if (quiet)
+ strvec_push(&child.args, "--quiet");
+ if (reflog)
+ strvec_push(&child.args, "--create-reflog");
+
+ switch (track) {
+ case BRANCH_TRACK_NEVER:
+ strvec_push(&child.args, "--no-track");
+ break;
+ case BRANCH_TRACK_ALWAYS:
+ case BRANCH_TRACK_EXPLICIT:
+ strvec_push(&child.args, "--track=direct");
+ break;
+ case BRANCH_TRACK_OVERRIDE:
+ BUG("BRANCH_TRACK_OVERRIDE cannot be used when creating a branch.");
+ break;
+ case BRANCH_TRACK_INHERIT:
+ strvec_push(&child.args, "--track=inherit");
+ break;
+ case BRANCH_TRACK_UNSPECIFIED:
+ /* Default for "git checkout". Do not pass --track. */
+ case BRANCH_TRACK_REMOTE:
+ /* Default for "git branch". Do not pass --track. */
+ case BRANCH_TRACK_SIMPLE:
+ /* Config-driven only. Do not pass --track. */
+ break;
+ }
+
+ strvec_pushl(&child.args, name, start_oid, tracking_name, NULL);
+
+ if ((ret = start_command(&child)))
+ return ret;
+ ret = finish_command(&child);
+ strbuf_read(&child_err, child.err, 0);
+ strbuf_add_lines(&out_buf, out_prefix, child_err.buf, child_err.len);
+
+ if (ret)
+ fprintf(stderr, "%s", out_buf.buf);
+ else
+ printf("%s", out_buf.buf);
+
+ strbuf_release(&child_err);
+ strbuf_release(&out_buf);
+ return ret;
+}
+
+void create_branches_recursively(struct repository *r, const char *name,
+ const char *start_commitish,
+ const char *tracking_name, int force,
+ int reflog, int quiet, enum branch_track track,
+ int dry_run)
+{
+ int i = 0;
+ char *branch_point = NULL;
+ struct object_id super_oid;
+ struct submodule_entry_list submodule_entry_list;
+
+ /* Perform dwim on start_commitish to get super_oid and branch_point. */
+ dwim_branch_start(r, start_commitish, BRANCH_TRACK_NEVER,
+ &branch_point, &super_oid);
+
+ /*
+ * If we were not given an explicit name to track, then assume we are at
+ * the top level and, just like the non-recursive case, the tracking
+ * name is the branch point.
+ */
+ if (!tracking_name)
+ tracking_name = branch_point;
+
+ submodules_of_tree(r, &super_oid, &submodule_entry_list);
+ /*
+ * Before creating any branches, first check that the branch can
+ * be created in every submodule.
+ */
+ for (i = 0; i < submodule_entry_list.entry_nr; i++) {
+ if (!submodule_entry_list.entries[i].repo) {
+ int code = die_message(
+ _("submodule '%s': unable to find submodule"),
+ submodule_entry_list.entries[i].submodule->name);
+ if (advice_enabled(ADVICE_SUBMODULES_NOT_UPDATED))
+ advise(_("You may try updating the submodules using 'git checkout %s && git submodule update --init'"),
+ start_commitish);
+ exit(code);
+ }
+
+ if (submodule_create_branch(
+ submodule_entry_list.entries[i].repo,
+ submodule_entry_list.entries[i].submodule, name,
+ oid_to_hex(&submodule_entry_list.entries[i]
+ .name_entry->oid),
+ tracking_name, force, reflog, quiet, track, 1))
+ die(_("submodule '%s': cannot create branch '%s'"),
+ submodule_entry_list.entries[i].submodule->name,
+ name);
+ }
+
+ create_branch(the_repository, name, start_commitish, force, 0, reflog, quiet,
+ BRANCH_TRACK_NEVER, dry_run);
+ if (dry_run)
+ return;
+ /*
+ * NEEDSWORK If tracking was set up in the superproject but not the
+ * submodule, users might expect "git branch --recurse-submodules" to
+ * fail or give a warning, but this is not yet implemented because it is
+ * tedious to determine whether or not tracking was set up in the
+ * superproject.
+ */
+ if (track)
+ setup_tracking(name, tracking_name, track, quiet);
+
+ for (i = 0; i < submodule_entry_list.entry_nr; i++) {
+ if (submodule_create_branch(
+ submodule_entry_list.entries[i].repo,
+ submodule_entry_list.entries[i].submodule, name,
+ oid_to_hex(&submodule_entry_list.entries[i]
+ .name_entry->oid),
+ tracking_name, force, reflog, quiet, track, 0))
+ die(_("submodule '%s': cannot create branch '%s'"),
+ submodule_entry_list.entries[i].submodule->name,
+ name);
+ repo_clear(submodule_entry_list.entries[i].repo);
+ }
+}
+
void remove_merge_branch_state(struct repository *r)
{
unlink(git_path_merge_head(r));
@@ -357,14 +746,16 @@ void remove_branch_state(struct repository *r, int verbose)
void die_if_checked_out(const char *branch, int ignore_current_worktree)
{
+ struct worktree **worktrees = get_worktrees();
const struct worktree *wt;
- wt = find_shared_symref("HEAD", branch);
- if (!wt || (ignore_current_worktree && wt->is_current))
- return;
- skip_prefix(branch, "refs/heads/", &branch);
- die(_("'%s' is already checked out at '%s'"),
- branch, wt->path);
+ wt = find_shared_symref(worktrees, "HEAD", branch);
+ if (wt && (!ignore_current_worktree || !wt->is_current)) {
+ skip_prefix(branch, "refs/heads/", &branch);
+ die(_("'%s' is already checked out at '%s'"), branch, wt->path);
+ }
+
+ free_worktrees(worktrees);
}
int replace_each_worktree_head_symref(const char *oldref, const char *newref,
diff --git a/branch.h b/branch.h
index df0be61..560b6b9 100644
--- a/branch.h
+++ b/branch.h
@@ -10,13 +10,37 @@ enum branch_track {
BRANCH_TRACK_REMOTE,
BRANCH_TRACK_ALWAYS,
BRANCH_TRACK_EXPLICIT,
- BRANCH_TRACK_OVERRIDE
+ BRANCH_TRACK_OVERRIDE,
+ BRANCH_TRACK_INHERIT,
+ BRANCH_TRACK_SIMPLE,
};
extern enum branch_track git_branch_track;
/* Functions for acting on the information about branches. */
+/**
+ * Sets branch.<new_ref>.{remote,merge} config settings such that
+ * new_ref tracks orig_ref according to the specified tracking mode.
+ *
+ * - new_ref is the name of the branch that we are setting tracking
+ * for.
+ *
+ * - orig_ref is the name of the ref that is 'upstream' of new_ref.
+ * orig_ref will be expanded with DWIM so that the config settings
+ * are in the correct format e.g. "refs/remotes/origin/main" instead
+ * of "origin/main".
+ *
+ * - track is the tracking mode e.g. BRANCH_TRACK_REMOTE causes
+ * new_ref to track orig_ref directly, whereas BRANCH_TRACK_INHERIT
+ * causes new_ref to track whatever orig_ref tracks.
+ *
+ * - quiet suppresses tracking information.
+ */
+void dwim_and_setup_tracking(struct repository *r, const char *new_ref,
+ const char *orig_ref, enum branch_track track,
+ int quiet);
+
/*
* Creates a new branch, where:
*
@@ -29,8 +53,8 @@ extern enum branch_track git_branch_track;
*
* - force enables overwriting an existing (non-head) branch
*
- * - clobber_head_ok allows the currently checked out (hence existing)
- * branch to be overwritten; without 'force', it has no effect.
+ * - clobber_head_ok, when enabled with 'force', allows the currently
+ * checked out (head) branch to be overwritten
*
* - reflog creates a reflog for the branch
*
@@ -39,13 +63,45 @@ extern enum branch_track git_branch_track;
* - track causes the new branch to be configured to merge the remote branch
* that start_name is a tracking branch for (if any).
*
+ * - dry_run causes the branch to be validated but not created.
+ *
*/
void create_branch(struct repository *r,
const char *name, const char *start_name,
int force, int clobber_head_ok,
- int reflog, int quiet, enum branch_track track);
+ int reflog, int quiet, enum branch_track track,
+ int dry_run);
/*
+ * Creates a new branch in a repository and its submodules (and its
+ * submodules, recursively). The parameters are mostly analogous to
+ * those of create_branch() except for start_name, which is represented
+ * by two different parameters:
+ *
+ * - start_commitish is the commit-ish, in repository r, that determines
+ * which commits the branches will point to. The superproject branch
+ * will point to the commit of start_commitish and the submodule
+ * branches will point to the gitlink commit oids in start_commitish's
+ * tree.
+ *
+ * - tracking_name is the name of the ref, in repository r, that will be
+ * used to set up tracking information. This value is propagated to
+ * all submodules, which will evaluate the ref using their own ref
+ * stores. If NULL, this defaults to start_commitish.
+ *
+ * When this function is called on the superproject, start_commitish
+ * can be any user-provided ref and tracking_name can be NULL (similar
+ * to create_branches()). But when recursing through submodules,
+ * start_commitish is the plain gitlink commit oid. Since the oid cannot
+ * be used for tracking information, tracking_name is propagated and
+ * used for tracking instead.
+ */
+void create_branches_recursively(struct repository *r, const char *name,
+ const char *start_commitish,
+ const char *tracking_name, int force,
+ int reflog, int quiet, enum branch_track track,
+ int dry_run);
+/*
* Check if 'name' can be a valid name for a branch; die otherwise.
* Return 1 if the named branch already exists; return 0 otherwise.
* Fill ref with the full refname for the branch.
diff --git a/builtin.h b/builtin.h
index 8a58743..40e9ecc 100644
--- a/builtin.h
+++ b/builtin.h
@@ -159,11 +159,13 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
int cmd_for_each_repo(int argc, const char **argv, const char *prefix);
int cmd_format_patch(int argc, const char **argv, const char *prefix);
int cmd_fsck(int argc, const char **argv, const char *prefix);
+int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix);
int cmd_gc(int argc, const char **argv, const char *prefix);
int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix);
int cmd_grep(int argc, const char **argv, const char *prefix);
int cmd_hash_object(int argc, const char **argv, const char *prefix);
int cmd_help(int argc, const char **argv, const char *prefix);
+int cmd_hook(int argc, const char **argv, const char *prefix);
int cmd_index_pack(int argc, const char **argv, const char *prefix);
int cmd_init_db(int argc, const char **argv, const char *prefix);
int cmd_interpret_trailers(int argc, const char **argv, const char *prefix);
diff --git a/builtin/add.c b/builtin/add.c
index 24da075..f843729 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -30,8 +30,8 @@ static int patch_interactive, add_interactive, edit_interactive;
static int take_worktree_changes;
static int add_renormalize;
static int pathspec_file_nul;
+static int include_sparse;
static const char *pathspec_from_file;
-static int legacy_stash_p; /* support for the scripted `git stash` */
struct update_callback_data {
int flags;
@@ -46,7 +46,9 @@ static int chmod_pathspec(struct pathspec *pathspec, char flip, int show_only)
struct cache_entry *ce = active_cache[i];
int err;
- if (ce_skip_worktree(ce))
+ if (!include_sparse &&
+ (ce_skip_worktree(ce) ||
+ !path_in_sparse_checkout(ce->name, &the_index)))
continue;
if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL))
@@ -94,6 +96,10 @@ static void update_callback(struct diff_queue_struct *q,
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
const char *path = p->one->path;
+
+ if (!include_sparse && !path_in_sparse_checkout(path, &the_index))
+ continue;
+
switch (fix_unmerged_status(p, data)) {
default:
die(_("unexpected diff status %c"), p->status);
@@ -135,8 +141,17 @@ int add_files_to_cache(const char *prefix,
rev.diffopt.format_callback_data = &data;
rev.diffopt.flags.override_submodule_config = 1;
rev.max_count = 0; /* do not compare unmerged paths with stage #2 */
+
+ /*
+ * Use an ODB transaction to optimize adding multiple objects.
+ * This function is invoked from commands other than 'add', which
+ * may not have their own transaction active.
+ */
+ begin_odb_transaction();
run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
- clear_pathspec(&rev.prune_data);
+ end_odb_transaction();
+
+ release_revisions(&rev);
return !!data.add_errors;
}
@@ -147,7 +162,9 @@ static int renormalize_tracked_files(const struct pathspec *pathspec, int flags)
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
- if (ce_skip_worktree(ce))
+ if (!include_sparse &&
+ (ce_skip_worktree(ce) ||
+ !path_in_sparse_checkout(ce->name, &the_index)))
continue;
if (ce_stage(ce))
continue; /* do not touch unmerged paths */
@@ -228,17 +245,12 @@ int run_add_interactive(const char *revision, const char *patch_mode,
int use_builtin_add_i =
git_env_bool("GIT_TEST_ADD_I_USE_BUILTIN", -1);
- if (use_builtin_add_i < 0) {
- int experimental;
- if (!git_config_get_bool("add.interactive.usebuiltin",
- &use_builtin_add_i))
- ; /* ok */
- else if (!git_config_get_bool("feature.experimental", &experimental) &&
- experimental)
- use_builtin_add_i = 1;
- }
+ if (use_builtin_add_i < 0 &&
+ git_config_get_bool("add.interactive.usebuiltin",
+ &use_builtin_add_i))
+ use_builtin_add_i = 1;
- if (use_builtin_add_i == 1) {
+ if (use_builtin_add_i != 0) {
enum add_p_mode mode;
if (!patch_mode)
@@ -293,15 +305,11 @@ int interactive_add(const char **argv, const char *prefix, int patch)
static int edit_patch(int argc, const char **argv, const char *prefix)
{
char *file = git_pathdup("ADD_EDIT.patch");
- const char *apply_argv[] = { "apply", "--recount", "--cached",
- NULL, NULL };
struct child_process child = CHILD_PROCESS_INIT;
struct rev_info rev;
int out;
struct stat st;
- apply_argv[3] = file;
-
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
if (read_cache() < 0)
@@ -329,12 +337,14 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
die(_("Empty patch. Aborted."));
child.git_cmd = 1;
- child.argv = apply_argv;
+ strvec_pushl(&child.args, "apply", "--recount", "--cached", file,
+ NULL);
if (run_command(&child))
die(_("Could not apply '%s'"), file);
unlink(file);
free(file);
+ release_revisions(&rev);
return 0;
}
@@ -377,12 +387,11 @@ static struct option builtin_add_options[] = {
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")),
+ OPT_BOOL(0, "sparse", &include_sparse, N_("allow updating entries outside of the sparse-checkout cone")),
OPT_STRING(0, "chmod", &chmod_arg, "(+|-)x",
N_("override the executable bit of the listed files")),
OPT_HIDDEN_BOOL(0, "warn-embedded-repo", &warn_on_embedded_repo,
N_("warn when adding an embedded repository")),
- OPT_HIDDEN_BOOL(0, "legacy-stash-p", &legacy_stash_p,
- N_("backend for `git stash -p`")),
OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
OPT_END(),
@@ -442,6 +451,7 @@ static void check_embedded_repo(const char *path)
static int add_files(struct dir_struct *dir, int flags)
{
int i, exit_status = 0;
+ struct string_list matched_sparse_paths = STRING_LIST_INIT_NODUP;
if (dir->ignored_nr) {
fprintf(stderr, _(ignore_error));
@@ -455,6 +465,12 @@ static int add_files(struct dir_struct *dir, int flags)
}
for (i = 0; i < dir->nr; i++) {
+ if (!include_sparse &&
+ !path_in_sparse_checkout(dir->entries[i]->name, &the_index)) {
+ string_list_append(&matched_sparse_paths,
+ dir->entries[i]->name);
+ continue;
+ }
if (add_file_to_index(&the_index, dir->entries[i]->name, flags)) {
if (!ignore_add_errors)
die(_("adding files failed"));
@@ -463,6 +479,14 @@ static int add_files(struct dir_struct *dir, int flags)
check_embedded_repo(dir->entries[i]->name);
}
}
+
+ if (matched_sparse_paths.nr) {
+ advise_on_updating_sparse_paths(&matched_sparse_paths);
+ exit_status = 1;
+ }
+
+ string_list_clear(&matched_sparse_paths, 0);
+
return exit_status;
}
@@ -485,26 +509,15 @@ int cmd_add(int argc, const char **argv, const char *prefix)
add_interactive = 1;
if (add_interactive) {
if (show_only)
- die(_("--dry-run is incompatible with --interactive/--patch"));
+ die(_("options '%s' and '%s' cannot be used together"), "--dry-run", "--interactive/--patch");
if (pathspec_from_file)
- die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
+ die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch");
exit(interactive_add(argv + 1, prefix, patch_interactive));
}
- if (legacy_stash_p) {
- struct pathspec pathspec;
-
- parse_pathspec(&pathspec, 0,
- PATHSPEC_PREFER_FULL |
- PATHSPEC_SYMLINK_LEADING_PATH |
- PATHSPEC_PREFIX_ORIGIN,
- prefix, argv);
-
- return run_add_interactive(NULL, "--patch=stash", &pathspec);
- }
if (edit_interactive) {
if (pathspec_from_file)
- die(_("--pathspec-from-file is incompatible with --edit"));
+ die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--edit");
return(edit_patch(argc, argv, prefix));
}
argc--;
@@ -516,10 +529,10 @@ int cmd_add(int argc, const char **argv, const char *prefix)
addremove = 0; /* "-u" was given but not "-A" */
if (addremove && take_worktree_changes)
- die(_("-A and -u are mutually incompatible"));
+ die(_("options '%s' and '%s' cannot be used together"), "-A", "-u");
if (!show_only && ignore_missing)
- die(_("Option --ignore-missing can only be used together with --dry-run"));
+ die(_("the option '%s' requires '%s'"), "--ignore-missing", "--dry-run");
if (chmod_arg && ((chmod_arg[0] != '-' && chmod_arg[0] != '+') ||
chmod_arg[1] != 'x' || chmod_arg[2]))
@@ -544,14 +557,14 @@ int cmd_add(int argc, const char **argv, const char *prefix)
if (pathspec_from_file) {
if (pathspec.nr)
- die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+ die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
parse_pathspec_file(&pathspec, PATHSPEC_ATTR,
PATHSPEC_PREFER_FULL |
PATHSPEC_SYMLINK_LEADING_PATH,
prefix, pathspec_from_file, pathspec_file_nul);
} else if (pathspec_file_nul) {
- die(_("--pathspec-file-nul requires --pathspec-from-file"));
+ die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
}
if (require_pathspec && pathspec.nr == 0) {
@@ -627,7 +640,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
if (seen[i])
continue;
- if (matches_skip_worktree(&pathspec, i, &skip_worktree_seen)) {
+ if (!include_sparse &&
+ matches_skip_worktree(&pathspec, i, &skip_worktree_seen)) {
string_list_append(&only_match_skip_worktree,
pathspec.items[i].original);
continue;
@@ -661,7 +675,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
string_list_clear(&only_match_skip_worktree, 0);
}
- plug_bulk_checkin();
+ begin_odb_transaction();
if (add_renormalize)
exit_status |= renormalize_tracked_files(&pathspec, flags);
@@ -673,7 +687,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
if (chmod_arg && pathspec.nr)
exit_status |= chmod_pathspec(&pathspec, chmod_arg[0], show_only);
- unplug_bulk_checkin();
+ end_odb_transaction();
finish:
if (write_locked_index(&the_index, &lock_file,
diff --git a/builtin/am.c b/builtin/am.c
index e4a0ff9..93bec62 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -11,6 +11,7 @@
#include "parse-options.h"
#include "dir.h"
#include "run-command.h"
+#include "hook.h"
#include "quote.h"
#include "tempfile.h"
#include "lockfile.h"
@@ -33,6 +34,7 @@
#include "string-list.h"
#include "packfile.h"
#include "repository.h"
+#include "pretty.h"
/**
* Returns the length of the first line of msg.
@@ -86,6 +88,12 @@ enum show_patch_type {
SHOW_PATCH_DIFF = 1,
};
+enum empty_action {
+ STOP_ON_EMPTY_COMMIT = 0, /* output errors and stop in the middle of an am session */
+ DROP_EMPTY_COMMIT, /* skip with a notice message, unless "--quiet" has been passed */
+ KEEP_EMPTY_COMMIT, /* keep recording as empty commits */
+};
+
struct am_state {
/* state directory path */
char *dir;
@@ -117,6 +125,7 @@ struct am_state {
int message_id;
int scissors; /* enum scissors_type */
int quoted_cr; /* enum quoted_cr_action */
+ int empty_type; /* enum empty_action */
struct strvec git_apply_opts;
const char *resolvemsg;
int committer_date_is_author_date;
@@ -177,6 +186,25 @@ static int am_option_parse_quoted_cr(const struct option *opt,
return 0;
}
+static int am_option_parse_empty(const struct option *opt,
+ const char *arg, int unset)
+{
+ int *opt_value = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+
+ if (!strcmp(arg, "stop"))
+ *opt_value = STOP_ON_EMPTY_COMMIT;
+ else if (!strcmp(arg, "drop"))
+ *opt_value = DROP_EMPTY_COMMIT;
+ else if (!strcmp(arg, "keep"))
+ *opt_value = KEEP_EMPTY_COMMIT;
+ else
+ return error(_("invalid value for '%s': '%s'"), "--empty", arg);
+
+ return 0;
+}
+
/**
* Returns path relative to the am_state directory.
*/
@@ -447,7 +475,7 @@ static int run_applypatch_msg_hook(struct am_state *state)
int ret;
assert(state->msg);
- ret = run_hook_le(NULL, "applypatch-msg", am_path(state, "final-commit"), NULL);
+ ret = run_hooks_l("applypatch-msg", am_path(state, "final-commit"), NULL);
if (!ret) {
FREE_AND_NULL(state->msg);
@@ -1125,6 +1153,12 @@ static void NORETURN die_user_resolve(const struct am_state *state)
printf_ln(_("When you have resolved this problem, run \"%s --continue\"."), cmdline);
printf_ln(_("If you prefer to skip this patch, run \"%s --skip\" instead."), cmdline);
+
+ if (advice_enabled(ADVICE_AM_WORK_DIR) &&
+ is_empty_or_missing_file(am_path(state, "patch")) &&
+ !repo_index_has_changes(the_repository, NULL, NULL))
+ printf_ln(_("To record the empty patch as an empty commit, run \"%s --allow-empty\"."), cmdline);
+
printf_ln(_("To restore the original branch and stop patching, run \"%s --abort\"."), cmdline);
}
@@ -1247,11 +1281,6 @@ static int parse_mail(struct am_state *state, const char *mail)
goto finish;
}
- if (is_empty_or_missing_file(am_path(state, "patch"))) {
- printf_ln(_("Patch is empty."));
- die_user_resolve(state);
- }
-
strbuf_addstr(&msg, "\n\n");
strbuf_addbuf(&msg, &mi.log_message);
strbuf_stripspace(&msg, 0);
@@ -1368,6 +1397,7 @@ static void write_commit_patch(const struct am_state *state, struct commit *comm
add_pending_object(&rev_info, &commit->object, "");
diff_setup_done(&rev_info.diffopt);
log_tree_commit(&rev_info, commit);
+ release_revisions(&rev_info);
}
/**
@@ -1400,6 +1430,7 @@ static void write_index_patch(const struct am_state *state)
add_pending_object(&rev_info, &tree->object, "");
diff_setup_done(&rev_info.diffopt);
run_diff_index(&rev_info, 1);
+ release_revisions(&rev_info);
}
/**
@@ -1553,6 +1584,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
add_pending_oid(&rev_info, "HEAD", &our_tree, 0);
diff_setup_done(&rev_info.diffopt);
run_diff_index(&rev_info, 1);
+ release_revisions(&rev_info);
}
if (run_apply(state, index_path))
@@ -1608,7 +1640,7 @@ static void do_commit(const struct am_state *state)
const char *reflog_msg, *author, *committer = NULL;
struct strbuf sb = STRBUF_INIT;
- if (run_hook_le(NULL, "pre-applypatch", NULL))
+ if (run_hooks("pre-applypatch"))
exit(1);
if (write_cache_as_tree(&tree, 0, NULL))
@@ -1660,7 +1692,7 @@ static void do_commit(const struct am_state *state)
fclose(fp);
}
- run_hook_le(NULL, "post-applypatch", NULL);
+ run_hooks("post-applypatch");
strbuf_release(&sb);
}
@@ -1762,6 +1794,7 @@ static void am_run(struct am_state *state, int resume)
while (state->cur <= state->last) {
const char *mail = am_path(state, msgnum(state));
int apply_status;
+ int to_keep;
reset_ident_date();
@@ -1791,8 +1824,29 @@ static void am_run(struct am_state *state, int resume)
if (state->interactive && do_interactive(state))
goto next;
+ to_keep = 0;
+ if (is_empty_or_missing_file(am_path(state, "patch"))) {
+ switch (state->empty_type) {
+ case DROP_EMPTY_COMMIT:
+ say(state, stdout, _("Skipping: %.*s"), linelen(state->msg), state->msg);
+ goto next;
+ break;
+ case KEEP_EMPTY_COMMIT:
+ to_keep = 1;
+ say(state, stdout, _("Creating an empty commit: %.*s"),
+ linelen(state->msg), state->msg);
+ break;
+ case STOP_ON_EMPTY_COMMIT:
+ printf_ln(_("Patch is empty."));
+ die_user_resolve(state);
+ break;
+ }
+ }
+
if (run_applypatch_msg_hook(state))
exit(1);
+ if (to_keep)
+ goto commit;
say(state, stdout, _("Applying: %.*s"), linelen(state->msg), state->msg);
@@ -1826,6 +1880,7 @@ static void am_run(struct am_state *state, int resume)
die_user_resolve(state);
}
+commit:
do_commit(state);
next:
@@ -1855,19 +1910,24 @@ static void am_run(struct am_state *state, int resume)
/**
* Resume the current am session after patch application failure. The user did
* all the hard work, and we do not have to do any patch application. Just
- * trust and commit what the user has in the index and working tree.
+ * trust and commit what the user has in the index and working tree. If `allow_empty`
+ * is true, commit as an empty commit when index has not changed and lacking a patch.
*/
-static void am_resolve(struct am_state *state)
+static void am_resolve(struct am_state *state, int allow_empty)
{
validate_resume_state(state);
say(state, stdout, _("Applying: %.*s"), linelen(state->msg), state->msg);
if (!repo_index_has_changes(the_repository, NULL, NULL)) {
- printf_ln(_("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."));
- die_user_resolve(state);
+ if (allow_empty && is_empty_or_missing_file(am_path(state, "patch"))) {
+ printf_ln(_("No changes - recorded it as an empty commit."));
+ } else {
+ printf_ln(_("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."));
+ die_user_resolve(state);
+ }
}
if (unmerged_cache()) {
@@ -1917,7 +1977,8 @@ static int fast_forward_to(struct tree *head, struct tree *remote, int reset)
opts.dst_index = &the_index;
opts.update = 1;
opts.merge = 1;
- opts.reset = reset;
+ opts.reset = reset ? UNPACK_RESET_PROTECT_UNTRACKED : 0;
+ opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
opts.fn = twoway_merge;
init_tree_desc(&t[0], head->buffer, head->size);
init_tree_desc(&t[1], remote->buffer, remote->size);
@@ -2182,7 +2243,8 @@ static int parse_opt_patchformat(const struct option *opt, const char *arg, int
* when you add new options
*/
else
- return error(_("Invalid value for --patch-format: %s"), arg);
+ return error(_("invalid value for '%s': '%s'"),
+ "--patch-format", arg);
return 0;
}
@@ -2193,7 +2255,8 @@ enum resume_type {
RESUME_SKIP,
RESUME_ABORT,
RESUME_QUIT,
- RESUME_SHOW_PATCH
+ RESUME_SHOW_PATCH,
+ RESUME_ALLOW_EMPTY,
};
struct resume_mode {
@@ -2224,13 +2287,14 @@ static int parse_opt_show_current_patch(const struct option *opt, const char *ar
break;
}
if (new_value >= ARRAY_SIZE(valid_modes))
- return error(_("Invalid value for --show-current-patch: %s"), arg);
+ return error(_("invalid value for '%s': '%s'"),
+ "--show-current-patch", arg);
}
if (resume->mode == RESUME_SHOW_PATCH && new_value != resume->sub_mode)
- return error(_("--show-current-patch=%s is incompatible with "
- "--show-current-patch=%s"),
- arg, valid_modes[resume->sub_mode]);
+ return error(_("options '%s=%s' and '%s=%s' "
+ "cannot be used together"),
+ "--show-current-patch", "--show-current-patch", arg, valid_modes[resume->sub_mode]);
resume->mode = RESUME_SHOW_PATCH;
resume->sub_mode = new_value;
@@ -2346,6 +2410,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
N_("show the patch being applied"),
PARSE_OPT_CMDMODE | PARSE_OPT_OPTARG | PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
parse_opt_show_current_patch, RESUME_SHOW_PATCH },
+ OPT_CMDMODE(0, "allow-empty", &resume.mode,
+ N_("record the empty patch as an empty commit"),
+ RESUME_ALLOW_EMPTY),
OPT_BOOL(0, "committer-date-is-author-date",
&state.committer_date_is_author_date,
N_("lie about committer date")),
@@ -2355,6 +2422,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
{ OPTION_STRING, 'S', "gpg-sign", &state.sign_commit, N_("key-id"),
N_("GPG-sign commits"),
PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
+ OPT_CALLBACK_F(STOP_ON_EMPTY_COMMIT, "empty", &state.empty_type, "{stop,drop,keep}",
+ N_("how to handle empty patches"),
+ PARSE_OPT_NONEG, am_option_parse_empty),
OPT_HIDDEN_BOOL(0, "rebasing", &state.rebasing,
N_("(internal use for git-rebase)")),
OPT_END()
@@ -2451,7 +2521,8 @@ int cmd_am(int argc, const char **argv, const char *prefix)
am_run(&state, 1);
break;
case RESUME_RESOLVED:
- am_resolve(&state);
+ case RESUME_ALLOW_EMPTY:
+ am_resolve(&state, resume.mode == RESUME_ALLOW_EMPTY ? 1 : 0);
break;
case RESUME_SKIP:
am_skip(&state);
diff --git a/builtin/apply.c b/builtin/apply.c
index 3f099b9..555219d 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1,7 +1,6 @@
#include "cache.h"
#include "builtin.h"
#include "parse-options.h"
-#include "lockfile.h"
#include "apply.h"
static const char * const apply_usage[] = {
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 28a2e6a..8a052c7 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -22,15 +22,15 @@ static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
static const char * const git_bisect_helper_usage[] = {
N_("git bisect--helper --bisect-reset [<commit>]"),
- N_("git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"),
+ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]",
N_("git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>]"
" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]"),
- N_("git bisect--helper --bisect-next"),
+ "git bisect--helper --bisect-next",
N_("git bisect--helper --bisect-state (bad|new) [<rev>]"),
N_("git bisect--helper --bisect-state (good|old) [<rev>...]"),
N_("git bisect--helper --bisect-replay <filename>"),
N_("git bisect--helper --bisect-skip [(<rev>|<range>)...]"),
- N_("git bisect--helper --bisect-visualize"),
+ "git bisect--helper --bisect-visualize",
N_("git bisect--helper --bisect-run <cmd>..."),
NULL
};
@@ -329,12 +329,12 @@ static int check_and_set_terms(struct bisect_terms *terms, const char *cmd)
return 0;
}
-static int mark_good(const char *refname, const struct object_id *oid,
- int flag, void *cb_data)
+static int inc_nr(const char *refname, const struct object_id *oid,
+ int flag, void *cb_data)
{
- int *m_good = (int *)cb_data;
- *m_good = 0;
- return 1;
+ unsigned int *nr = (unsigned int *)cb_data;
+ (*nr)++;
+ return 0;
}
static const char need_bad_and_good_revision_warning[] =
@@ -384,23 +384,64 @@ static int decide_next(const struct bisect_terms *terms,
vocab_good, vocab_bad, vocab_good, vocab_bad);
}
-static int bisect_next_check(const struct bisect_terms *terms,
- const char *current_term)
+static void bisect_status(struct bisect_state *state,
+ const struct bisect_terms *terms)
{
- int missing_good = 1, missing_bad = 1;
char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad);
char *good_glob = xstrfmt("%s-*", terms->term_good);
if (ref_exists(bad_ref))
- missing_bad = 0;
+ state->nr_bad = 1;
- for_each_glob_ref_in(mark_good, good_glob, "refs/bisect/",
- (void *) &missing_good);
+ for_each_glob_ref_in(inc_nr, good_glob, "refs/bisect/",
+ (void *) &state->nr_good);
free(good_glob);
free(bad_ref);
+}
- return decide_next(terms, current_term, missing_good, missing_bad);
+__attribute__((format (printf, 1, 2)))
+static void bisect_log_printf(const char *fmt, ...)
+{
+ struct strbuf buf = STRBUF_INIT;
+ va_list ap;
+
+ va_start(ap, fmt);
+ strbuf_vaddf(&buf, fmt, ap);
+ va_end(ap);
+
+ printf("%s", buf.buf);
+ append_to_file(git_path_bisect_log(), "# %s", buf.buf);
+
+ strbuf_release(&buf);
+}
+
+static void bisect_print_status(const struct bisect_terms *terms)
+{
+ struct bisect_state state = { 0 };
+
+ bisect_status(&state, terms);
+
+ /* If we had both, we'd already be started, and shouldn't get here. */
+ if (state.nr_good && state.nr_bad)
+ return;
+
+ if (!state.nr_good && !state.nr_bad)
+ bisect_log_printf(_("status: waiting for both good and bad commits\n"));
+ else if (state.nr_good)
+ bisect_log_printf(Q_("status: waiting for bad commit, %d good commit known\n",
+ "status: waiting for bad commit, %d good commits known\n",
+ state.nr_good), state.nr_good);
+ else
+ bisect_log_printf(_("status: waiting for good commit(s), bad commit known\n"));
+}
+
+static int bisect_next_check(const struct bisect_terms *terms,
+ const char *current_term)
+{
+ struct bisect_state state = { 0 };
+ bisect_status(&state, terms);
+ return decide_next(terms, current_term, !state.nr_good, !state.nr_bad);
}
static int get_terms(struct bisect_terms *terms)
@@ -433,7 +474,7 @@ static int bisect_terms(struct bisect_terms *terms, const char *option)
if (get_terms(terms))
return error(_("no terms defined"));
- if (option == NULL) {
+ if (!option) {
printf(_("Your current terms are %s for the old state\n"
"and %s for the new state.\n"),
terms->term_good, terms->term_bad);
@@ -555,6 +596,7 @@ static int bisect_skipped_commits(struct bisect_terms *terms)
reset_revision_walk();
strbuf_release(&commit_name);
+ release_revisions(&revs);
fclose(fp);
return 0;
}
@@ -606,8 +648,10 @@ static enum bisect_error bisect_next(struct bisect_terms *terms, const char *pre
static enum bisect_error bisect_auto_next(struct bisect_terms *terms, const char *prefix)
{
- if (bisect_next_check(terms, NULL))
+ if (bisect_next_check(terms, NULL)) {
+ bisect_print_status(terms);
return BISECT_OK;
+ }
return bisect_next(terms, prefix);
}
@@ -1041,6 +1085,7 @@ static enum bisect_error bisect_skip(struct bisect_terms *terms, const char **ar
oid_to_hex(&commit->object.oid));
reset_revision_walk();
+ release_revisions(&revs);
} else {
strvec_push(&argv_state, argv[i]);
}
@@ -1089,14 +1134,52 @@ static int bisect_visualize(struct bisect_terms *terms, const char **argv, int a
return res;
}
+static int get_first_good(const char *refname, const struct object_id *oid,
+ int flag, void *cb_data)
+{
+ oidcpy(cb_data, oid);
+ return 1;
+}
+
+static int verify_good(const struct bisect_terms *terms,
+ const char **quoted_argv)
+{
+ int rc;
+ enum bisect_error res;
+ struct object_id good_rev;
+ struct object_id current_rev;
+ char *good_glob = xstrfmt("%s-*", terms->term_good);
+ int no_checkout = ref_exists("BISECT_HEAD");
+
+ for_each_glob_ref_in(get_first_good, good_glob, "refs/bisect/",
+ &good_rev);
+ free(good_glob);
+
+ if (read_ref(no_checkout ? "BISECT_HEAD" : "HEAD", ¤t_rev))
+ return -1;
+
+ res = bisect_checkout(&good_rev, no_checkout);
+ if (res != BISECT_OK)
+ return -1;
+
+ printf(_("running %s\n"), quoted_argv[0]);
+ rc = run_command_v_opt(quoted_argv, RUN_USING_SHELL);
+
+ res = bisect_checkout(¤t_rev, no_checkout);
+ if (res != BISECT_OK)
+ return -1;
+
+ return rc;
+}
+
static int bisect_run(struct bisect_terms *terms, const char **argv, int argc)
{
int res = BISECT_OK;
struct strbuf command = STRBUF_INIT;
- struct strvec args = STRVEC_INIT;
struct strvec run_args = STRVEC_INIT;
const char *new_state;
int temporary_stdout_fd, saved_stdout;
+ int is_first_run = 1;
if (bisect_next_check(terms, NULL))
return BISECT_FAILED;
@@ -1111,16 +1194,37 @@ static int bisect_run(struct bisect_terms *terms, const char **argv, int argc)
strvec_push(&run_args, command.buf);
while (1) {
- strvec_clear(&args);
-
printf(_("running %s\n"), command.buf);
res = run_command_v_opt(run_args.v, RUN_USING_SHELL);
+ /*
+ * Exit code 126 and 127 can either come from the shell
+ * if it was unable to execute or even find the script,
+ * or from the script itself. Check with a known-good
+ * revision to avoid trashing the bisect run due to a
+ * missing or non-executable script.
+ */
+ if (is_first_run && (res == 126 || res == 127)) {
+ int rc = verify_good(terms, run_args.v);
+ is_first_run = 0;
+ if (rc < 0) {
+ error(_("unable to verify '%s' on good"
+ " revision"), command.buf);
+ res = BISECT_FAILED;
+ break;
+ }
+ if (rc == res) {
+ error(_("bogus exit code %d for good revision"),
+ rc);
+ res = BISECT_FAILED;
+ break;
+ }
+ }
+
if (res < 0 || 128 <= res) {
error(_("bisect run failed: exit code %d from"
" '%s' is < 0 or >= 128"), res, command.buf);
- strbuf_release(&command);
- return res;
+ break;
}
if (res == 125)
@@ -1132,8 +1236,10 @@ static int bisect_run(struct bisect_terms *terms, const char **argv, int argc)
temporary_stdout_fd = open(git_path_bisect_run(), O_CREAT | O_WRONLY | O_TRUNC, 0666);
- if (temporary_stdout_fd < 0)
- return error_errno(_("cannot open file '%s' for writing"), git_path_bisect_run());
+ if (temporary_stdout_fd < 0) {
+ res = error_errno(_("cannot open file '%s' for writing"), git_path_bisect_run());
+ break;
+ }
fflush(stdout);
saved_stdout = dup(1);
@@ -1158,16 +1264,16 @@ static int bisect_run(struct bisect_terms *terms, const char **argv, int argc)
res = BISECT_OK;
} else if (res) {
error(_("bisect run failed: 'git bisect--helper --bisect-state"
- " %s' exited with error code %d"), args.v[0], res);
+ " %s' exited with error code %d"), new_state, res);
} else {
continue;
}
-
- strbuf_release(&command);
- strvec_clear(&args);
- strvec_clear(&run_args);
- return res;
+ break;
}
+
+ strbuf_release(&command);
+ strvec_clear(&run_args);
+ return res;
}
int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
@@ -1209,7 +1315,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
OPT_CMDMODE(0, "bisect-visualize", &cmdmode,
N_("visualize the bisection"), BISECT_VISUALIZE),
OPT_CMDMODE(0, "bisect-run", &cmdmode,
- N_("use <cmd>... to automatically bisect."), BISECT_RUN),
+ N_("use <cmd>... to automatically bisect"), BISECT_RUN),
OPT_BOOL(0, "no-log", &nolog,
N_("no log for BISECT_WRITE")),
OPT_END()
diff --git a/builtin/blame.c b/builtin/blame.c
index 641523f..02e3942 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -101,6 +101,16 @@ struct commit_info {
struct strbuf summary;
};
+#define COMMIT_INFO_INIT { \
+ .author = STRBUF_INIT, \
+ .author_mail = STRBUF_INIT, \
+ .author_tz = STRBUF_INIT, \
+ .committer = STRBUF_INIT, \
+ .committer_mail = STRBUF_INIT, \
+ .committer_tz = STRBUF_INIT, \
+ .summary = STRBUF_INIT, \
+}
+
/*
* Parse author/committer line in the commit object buffer
*/
@@ -160,18 +170,6 @@ static void get_ac_line(const char *inbuf, const char *what,
strbuf_add(name, namebuf, namelen);
}
-static void commit_info_init(struct commit_info *ci)
-{
-
- strbuf_init(&ci->author, 0);
- strbuf_init(&ci->author_mail, 0);
- strbuf_init(&ci->author_tz, 0);
- strbuf_init(&ci->committer, 0);
- strbuf_init(&ci->committer_mail, 0);
- strbuf_init(&ci->committer_tz, 0);
- strbuf_init(&ci->summary, 0);
-}
-
static void commit_info_destroy(struct commit_info *ci)
{
@@ -192,8 +190,6 @@ static void get_commit_info(struct commit *commit,
const char *subject, *encoding;
const char *message;
- commit_info_init(ret);
-
encoding = get_log_output_encoding();
message = logmsg_reencode(commit, NULL, encoding);
get_ac_line(message, "\nauthor ",
@@ -246,7 +242,7 @@ static void write_filename_info(struct blame_origin *suspect)
*/
static int emit_one_suspect_detail(struct blame_origin *suspect, int repeat)
{
- struct commit_info ci;
+ struct commit_info ci = COMMIT_INFO_INIT;
if (!repeat && (suspect->commit->object.flags & METAINFO_SHOWN))
return 0;
@@ -440,7 +436,7 @@ static void emit_other(struct blame_scoreboard *sb, struct blame_entry *ent, int
int cnt;
const char *cp;
struct blame_origin *suspect = ent->suspect;
- struct commit_info ci;
+ struct commit_info ci = COMMIT_INFO_INIT;
char hex[GIT_MAX_HEXSZ + 1];
int show_raw_time = !!(opt & OUTPUT_RAW_TIMESTAMP);
const char *default_color = NULL, *color = NULL, *reset = NULL;
@@ -630,7 +626,7 @@ static void find_alignment(struct blame_scoreboard *sb, int *option)
if (longest_file < num)
longest_file = num;
if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
- struct commit_info ci;
+ struct commit_info ci = COMMIT_INFO_INIT;
suspect->commit->object.flags |= METAINFO_SHOWN;
get_commit_info(suspect->commit, &ci, 1);
if (*option & OUTPUT_SHOW_EMAIL)
@@ -725,8 +721,8 @@ static int git_blame_config(const char *var, const char *value, void *cb)
}
if (!strcmp(var, "color.blame.repeatedlines")) {
if (color_parse_mem(value, strlen(value), repeated_meta_color))
- warning(_("invalid color '%s' in color.blame.repeatedLines"),
- value);
+ warning(_("invalid value for '%s': '%s'"),
+ "color.blame.repeatedLines", value);
return 0;
}
if (!strcmp(var, "color.blame.highlightrecent")) {
@@ -743,7 +739,8 @@ static int git_blame_config(const char *var, const char *value, void *cb)
coloring_mode &= ~(OUTPUT_COLOR_LINE |
OUTPUT_SHOW_AGE_WITH_COLOR);
} else {
- warning(_("invalid value for blame.coloring"));
+ warning(_("invalid value for '%s': '%s'"),
+ "blame.coloring", value);
return 0;
}
}
@@ -901,6 +898,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
unsigned int range_i;
long anchor;
const int hexsz = the_hash_algo->hexsz;
+ long num_lines = 0;
setup_default_color_by_age();
git_config(git_blame_config, &output_option);
@@ -917,6 +915,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
for (;;) {
switch (parse_options_step(&ctx, options, blame_opt_usage)) {
+ case PARSE_OPT_NON_OPTION:
+ case PARSE_OPT_UNKNOWN:
+ break;
case PARSE_OPT_HELP:
case PARSE_OPT_ERROR:
exit(129);
@@ -935,11 +936,15 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
parse_revision_opt(&revs, &ctx, options, blame_opt_usage);
}
parse_done:
+ revision_opts_finish(&revs);
no_whole_file_rename = !revs.diffopt.flags.follow_renames;
xdl_opts |= revs.diffopt.xdl_opts & XDF_INDENT_HEURISTIC;
revs.diffopt.flags.follow_renames = 0;
argc = parse_options_end(&ctx);
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
if (incremental || (output_option & OUTPUT_PORCELAIN)) {
if (show_progress > 0)
die(_("--progress can't be used with --incremental or porcelain formats"));
@@ -1125,7 +1130,10 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
for (range_i = ranges.nr; range_i > 0; --range_i) {
const struct range *r = &ranges.ranges[range_i - 1];
ent = blame_entry_prepend(ent, r->start, r->end, o);
+ num_lines += (r->end - r->start);
}
+ if (!num_lines)
+ num_lines = sb.num_lines;
o->suspects = ent;
prio_queue_put(&sb.commits, o->commit);
@@ -1154,7 +1162,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
sb.found_guilty_entry = &found_guilty_entry;
sb.found_guilty_entry_data = π
if (show_progress)
- pi.progress = start_delayed_progress(_("Blaming lines"), sb.num_lines);
+ pi.progress = start_delayed_progress(_("Blaming lines"), num_lines);
assign_blame(&sb, opt);
@@ -1163,7 +1171,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
if (!incremental)
setup_pager();
else
- return 0;
+ goto cleanup;
blame_sort_final(&sb);
@@ -1197,6 +1205,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
printf("num commits: %d\n", sb.num_commits);
}
+cleanup:
cleanup_scoreboard(&sb);
+ release_revisions(&revs);
return 0;
}
diff --git a/builtin/branch.c b/builtin/branch.c
index 0b7ed82..5d00d0b 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -27,7 +27,8 @@
static const char * const builtin_branch_usage[] = {
N_("git branch [<options>] [-r | -a] [--merged] [--no-merged]"),
- N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
+ N_("git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]"),
+ N_("git branch [<options>] [-l] [<pattern>...]"),
N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
N_("git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"),
@@ -38,6 +39,8 @@ static const char * const builtin_branch_usage[] = {
static const char *head;
static struct object_id head_oid;
+static int recurse_submodules = 0;
+static int submodule_propagate_branches = 0;
static int branch_use_color = -1;
static char branch_colors[][COLOR_MAXLEN] = {
@@ -77,12 +80,11 @@ define_list_config_array(color_branch_slots);
static int git_branch_config(const char *var, const char *value, void *cb)
{
const char *slot_name;
- struct ref_sorting **sorting_tail = (struct ref_sorting **)cb;
if (!strcmp(var, "branch.sort")) {
if (!value)
return config_error_nonbool(var);
- parse_ref_sorting(sorting_tail, value);
+ string_list_append(cb, value);
return 0;
}
@@ -100,6 +102,15 @@ static int git_branch_config(const char *var, const char *value, void *cb)
return config_error_nonbool(var);
return color_parse(value, branch_colors[slot]);
}
+ if (!strcmp(var, "submodule.recurse")) {
+ recurse_submodules = git_config_bool(var, value);
+ return 0;
+ }
+ if (!strcasecmp(var, "submodule.propagateBranches")) {
+ submodule_propagate_branches = git_config_bool(var, value);
+ return 0;
+ }
+
return git_color_default_config(var, value, cb);
}
@@ -193,6 +204,7 @@ static void delete_branch_config(const char *branchname)
static int delete_branches(int argc, const char **argv, int force, int kinds,
int quiet)
{
+ struct worktree **worktrees;
struct commit *head_rev = NULL;
struct object_id oid;
char *name = NULL;
@@ -229,6 +241,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
if (!head_rev)
die(_("Couldn't look up commit object for HEAD"));
}
+
+ worktrees = get_worktrees();
+
for (i = 0; i < argc; i++, strbuf_reset(&bname)) {
char *target = NULL;
int flags = 0;
@@ -239,7 +254,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
if (kinds == FILTER_REFS_BRANCHES) {
const struct worktree *wt =
- find_shared_symref("HEAD", name);
+ find_shared_symref(worktrees, "HEAD", name);
if (wt) {
error(_("Cannot delete branch '%s' "
"checked out at '%s'"),
@@ -300,6 +315,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
free(name);
strbuf_release(&bname);
+ free_worktrees(worktrees);
return ret;
}
@@ -407,7 +423,8 @@ static char *build_format(struct ref_filter *filter, int maxwidth, const char *r
return strbuf_detach(&fmt, NULL);
}
-static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting, struct ref_format *format)
+static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting,
+ struct ref_format *format, struct string_list *output)
{
int i;
struct ref_array array;
@@ -449,7 +466,7 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin
if (column_active(colopts)) {
assert(!filter->verbose && "--column and --verbose are incompatible");
/* format to a string_list to let print_columns() do its job */
- string_list_append(&output, out.buf);
+ string_list_append(output, out.buf);
} else {
fwrite(out.buf, 1, out.len, stdout);
putchar('\n');
@@ -616,15 +633,18 @@ static int edit_branch_description(const char *branch_name)
int cmd_branch(int argc, const char **argv, const char *prefix)
{
- int delete = 0, rename = 0, copy = 0, force = 0, list = 0;
- int show_current = 0;
- int reflog = 0, edit_description = 0;
- int quiet = 0, unset_upstream = 0;
+ /* possible actions */
+ int delete = 0, rename = 0, copy = 0, list = 0,
+ unset_upstream = 0, show_current = 0, edit_description = 0;
const char *new_upstream = NULL;
+ int noncreate_actions = 0;
+ /* possible options */
+ int reflog = 0, quiet = 0, icase = 0, force = 0,
+ recurse_submodules_explicit = 0;
enum branch_track track;
struct ref_filter filter;
- int icase = 0;
- static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
+ static struct ref_sorting *sorting;
+ struct string_list sorting_options = STRING_LIST_INIT_DUP;
struct ref_format format = REF_FORMAT_INIT;
struct option options[] = {
@@ -632,8 +652,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
OPT__VERBOSE(&filter.verbose,
N_("show hash and subject, give twice for upstream branch")),
OPT__QUIET(&quiet, N_("suppress informational messages")),
- OPT_SET_INT('t', "track", &track, N_("set up tracking mode (see git-pull(1))"),
- BRANCH_TRACK_EXPLICIT),
+ OPT_CALLBACK_F('t', "track", &track, "(direct|inherit)",
+ N_("set branch tracking configuration"),
+ PARSE_OPT_OPTARG,
+ parse_opt_tracking_mode),
OPT_SET_INT_F(0, "set-upstream", &track, N_("do not use"),
BRANCH_TRACK_OVERRIDE, PARSE_OPT_HIDDEN),
OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")),
@@ -665,10 +687,11 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
OPT_MERGED(&filter, N_("print only branches that are merged")),
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),
+ OPT_REF_SORT(&sorting_options),
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_BOOL(0, "recurse-submodules", &recurse_submodules_explicit, N_("recurse through submodules")),
OPT_STRING( 0 , "format", &format.format, N_("format"), N_("format to use for the output")),
OPT_END(),
};
@@ -682,7 +705,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (argc == 2 && !strcmp(argv[1], "-h"))
usage_with_options(builtin_branch_usage, options);
- git_config(git_branch_config, sorting_tail);
+ git_config(git_branch_config, &sorting_options);
track = git_branch_track;
@@ -705,10 +728,23 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
filter.reachable_from || filter.unreachable_from || filter.points_at.nr)
list = 1;
- if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current +
- list + edit_description + unset_upstream > 1)
+ noncreate_actions = !!delete + !!rename + !!copy + !!new_upstream +
+ !!show_current + !!list + !!edit_description +
+ !!unset_upstream;
+ if (noncreate_actions > 1)
usage_with_options(builtin_branch_usage, options);
+ if (recurse_submodules_explicit) {
+ if (!submodule_propagate_branches)
+ die(_("branch with --recurse-submodules can only be used if submodule.propagateBranches is enabled"));
+ if (noncreate_actions)
+ die(_("--recurse-submodules can only be used to create branches"));
+ }
+
+ recurse_submodules =
+ (recurse_submodules || recurse_submodules_explicit) &&
+ submodule_propagate_branches;
+
if (filter.abbrev == -1)
filter.abbrev = DEFAULT_ABBREV;
filter.ignore_case = icase;
@@ -716,7 +752,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
finalize_colopts(&colopts, -1);
if (filter.verbose) {
if (explicitly_enable_column(colopts))
- die(_("--column and --verbose are incompatible"));
+ die(_("options '%s' and '%s' cannot be used together"), "--column", "--verbose");
colopts = 0;
}
@@ -748,14 +784,14 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
* local branches 'refs/heads/...' and finally remote-tracking
* branches 'refs/remotes/...'.
*/
- if (!sorting)
- sorting = ref_default_sorting();
+ sorting = ref_sorting_options(&sorting_options);
ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
ref_sorting_set_sort_flags_all(
sorting, REF_SORTING_DETACHED_HEAD_FIRST, 1);
- print_ref_list(&filter, sorting, &format);
+ print_ref_list(&filter, sorting, &format, &output);
print_columns(&output, colopts, NULL);
string_list_clear(&output, 0);
+ ref_sorting_release(sorting);
return 0;
} else if (edit_description) {
const char *branch_name;
@@ -820,12 +856,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (!ref_exists(branch->refname))
die(_("branch '%s' does not exist"), branch->name);
- /*
- * create_branch takes care of setting up the tracking
- * info and making sure new_upstream is correct
- */
- create_branch(the_repository, branch->name, new_upstream,
- 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
+ dwim_and_setup_tracking(the_repository, branch->name,
+ new_upstream, BRANCH_TRACK_OVERRIDE,
+ quiet);
} else if (unset_upstream) {
struct branch *branch = branch_get(argv[0]);
struct strbuf buf = STRBUF_INIT;
@@ -849,7 +882,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
strbuf_addf(&buf, "branch.%s.merge", branch->name);
git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
strbuf_release(&buf);
- } else if (argc > 0 && argc <= 2) {
+ } else if (!noncreate_actions && argc > 0 && argc <= 2) {
+ const char *branch_name = argv[0];
+ const char *start_name = argc == 2 ? argv[1] : head;
+
if (filter.kind != FILTER_REFS_BRANCHES)
die(_("The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"));
@@ -857,10 +893,14 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (track == BRANCH_TRACK_OVERRIDE)
die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."));
- create_branch(the_repository,
- argv[0], (argc == 2) ? argv[1] : head,
- force, 0, reflog, quiet, track);
-
+ if (recurse_submodules) {
+ create_branches_recursively(the_repository, branch_name,
+ start_name, NULL, force,
+ reflog, quiet, track, 0);
+ return 0;
+ }
+ create_branch(the_repository, branch_name, start_name, force, 0,
+ reflog, quiet, track, 0);
} else
usage_with_options(builtin_branch_usage, options);
diff --git a/builtin/bugreport.c b/builtin/bugreport.c
index 06ed10d..9de32bc 100644
--- a/builtin/bugreport.c
+++ b/builtin/bugreport.c
@@ -3,7 +3,8 @@
#include "strbuf.h"
#include "help.h"
#include "compat/compiler.h"
-#include "run-command.h"
+#include "hook.h"
+#include "hook-list.h"
static void get_system_info(struct strbuf *sys_info)
@@ -41,39 +42,7 @@ static void get_system_info(struct strbuf *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;
+ const char **p;
if (nongit) {
strbuf_addstr(hook_info,
@@ -81,9 +50,12 @@ static void get_populated_hooks(struct strbuf *hook_info, int nongit)
return;
}
- for (i = 0; i < ARRAY_SIZE(hook); i++)
- if (find_hook(hook[i]))
- strbuf_addf(hook_info, "%s\n", hook[i]);
+ for (p = hook_name_list; *p; p++) {
+ const char *hook = *p;
+
+ if (hook_exists(hook))
+ strbuf_addf(hook_info, "%s\n", hook);
+ }
}
static const char * const bugreport_usage[] = {
diff --git a/builtin/bundle.c b/builtin/bundle.c
index 5a85d7c..2adad54 100644
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -93,6 +93,7 @@ static int cmd_bundle_create(int argc, const char **argv, const char *prefix) {
if (!startup_info->have_repository)
die(_("Need a repository to create a bundle."));
ret = !!create_bundle(the_repository, bundle_file, argc, argv, &pack_opts, version);
+ strvec_clear(&pack_opts);
free(bundle_file);
return ret;
}
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 243fe68..50cf389 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -17,14 +17,20 @@
#include "object-store.h"
#include "promisor-remote.h"
+enum batch_mode {
+ BATCH_MODE_CONTENTS,
+ BATCH_MODE_INFO,
+ BATCH_MODE_QUEUE_AND_DISPATCH,
+};
+
struct batch_options {
int enabled;
int follow_symlinks;
- int print_contents;
+ enum batch_mode batch_mode;
int buffer_output;
int all_objects;
int unordered;
- int cmdmode; /* may be 'w' or 'c' for --filters or --textconv */
+ int transform_mode; /* may be 'w' or 'c' for --filters or --textconv */
const char *format;
};
@@ -73,14 +79,17 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
struct object_info oi = OBJECT_INFO_INIT;
struct strbuf sb = STRBUF_INIT;
unsigned flags = OBJECT_INFO_LOOKUP_REPLACE;
+ unsigned get_oid_flags = GET_OID_RECORD_PATH | GET_OID_ONLY_TO_DIE;
const char *path = force_path;
+ const int opt_cw = (opt == 'c' || opt == 'w');
+ if (!path && opt_cw)
+ get_oid_flags |= GET_OID_REQUIRE_PATH;
if (unknown_type)
flags |= OBJECT_INFO_ALLOW_UNKNOWN_TYPE;
- if (get_oid_with_context(the_repository, obj_name,
- GET_OID_RECORD_PATH,
- &oid, &obj_context))
+ if (get_oid_with_context(the_repository, obj_name, get_oid_flags, &oid,
+ &obj_context))
die("Not a valid object name %s", obj_name);
if (!path)
@@ -112,9 +121,6 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
return !has_object_file(&oid);
case 'w':
- if (!path)
- die("git cat-file --filters %s: <object> must be "
- "<sha1:path>", obj_name);
if (filter_object(path, obj_context.mode,
&oid, &buf, &size))
@@ -122,10 +128,6 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
break;
case 'c':
- if (!path)
- die("git cat-file --textconv %s: <object> must be <sha1:path>",
- obj_name);
-
if (textconv_object(the_repository, path, obj_context.mode,
&oid, 1, &buf, &size))
break;
@@ -154,7 +156,10 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
break;
case 0:
- if (type_from_string(exp_type) == OBJ_BLOB) {
+ {
+ enum object_type exp_type_id = type_from_string(exp_type);
+
+ if (exp_type_id == OBJ_BLOB) {
struct object_id blob_oid;
if (oid_object_info(the_repository, &oid, NULL) == OBJ_TAG) {
char *buffer = read_object_file(&oid, &type,
@@ -176,10 +181,10 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
* fall-back to the usual case.
*/
}
- buf = read_object_with_reference(the_repository,
- &oid, exp_type, &size, NULL);
+ buf = read_object_with_reference(the_repository, &oid,
+ exp_type_id, &size, NULL);
break;
-
+ }
default:
die("git cat-file: unknown option: %s", exp_type);
}
@@ -306,19 +311,19 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
if (data->type == OBJ_BLOB) {
if (opt->buffer_output)
fflush(stdout);
- if (opt->cmdmode) {
+ if (opt->transform_mode) {
char *contents;
unsigned long size;
if (!data->rest)
die("missing path for '%s'", oid_to_hex(oid));
- if (opt->cmdmode == 'w') {
+ if (opt->transform_mode == 'w') {
if (filter_object(data->rest, 0100644, oid,
&contents, &size))
die("could not convert '%s' %s",
oid_to_hex(oid), data->rest);
- } else if (opt->cmdmode == 'c') {
+ } else if (opt->transform_mode == 'c') {
enum object_type type;
if (!textconv_object(the_repository,
data->rest, 0100644, oid,
@@ -330,7 +335,7 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
die("could not convert '%s' %s",
oid_to_hex(oid), data->rest);
} else
- BUG("invalid cmdmode: %c", opt->cmdmode);
+ BUG("invalid transform_mode: %c", opt->transform_mode);
batch_write(opt, contents, size);
free(contents);
} else {
@@ -355,26 +360,55 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
}
}
+static void print_default_format(struct strbuf *scratch, struct expand_data *data)
+{
+ strbuf_addf(scratch, "%s %s %"PRIuMAX"\n", oid_to_hex(&data->oid),
+ type_name(data->type),
+ (uintmax_t)data->size);
+}
+
+/*
+ * If "pack" is non-NULL, then "offset" is the byte offset within the pack from
+ * which the object may be accessed (though note that we may also rely on
+ * data->oid, too). If "pack" is NULL, then offset is ignored.
+ */
static void batch_object_write(const char *obj_name,
struct strbuf *scratch,
struct batch_options *opt,
- struct expand_data *data)
+ struct expand_data *data,
+ struct packed_git *pack,
+ off_t offset)
{
- if (!data->skip_object_info &&
- oid_object_info_extended(the_repository, &data->oid, &data->info,
- OBJECT_INFO_LOOKUP_REPLACE) < 0) {
- printf("%s missing\n",
- obj_name ? obj_name : oid_to_hex(&data->oid));
- fflush(stdout);
- return;
+ if (!data->skip_object_info) {
+ int ret;
+
+ if (pack)
+ ret = packed_object_info(the_repository, pack, offset,
+ &data->info);
+ else
+ ret = oid_object_info_extended(the_repository,
+ &data->oid, &data->info,
+ OBJECT_INFO_LOOKUP_REPLACE);
+ if (ret < 0) {
+ printf("%s missing\n",
+ obj_name ? obj_name : oid_to_hex(&data->oid));
+ fflush(stdout);
+ return;
+ }
}
strbuf_reset(scratch);
- strbuf_expand(scratch, opt->format, expand_format, data);
- strbuf_addch(scratch, '\n');
+
+ if (!opt->format) {
+ print_default_format(scratch, data);
+ } else {
+ strbuf_expand(scratch, opt->format, expand_format, data);
+ strbuf_addch(scratch, '\n');
+ }
+
batch_write(opt, scratch->buf, scratch->len);
- if (opt->print_contents) {
+ if (opt->batch_mode == BATCH_MODE_CONTENTS) {
print_object_or_die(opt, data);
batch_write(opt, "\n", 1);
}
@@ -428,7 +462,7 @@ static void batch_one_object(const char *obj_name,
return;
}
- batch_object_write(obj_name, scratch, opt, data);
+ batch_object_write(obj_name, scratch, opt, data, NULL, 0);
}
struct object_cb_data {
@@ -442,7 +476,8 @@ static int batch_object_cb(const struct object_id *oid, void *vdata)
{
struct object_cb_data *data = vdata;
oidcpy(&data->expand->oid, oid);
- batch_object_write(NULL, data->scratch, data->opt, data->expand);
+ batch_object_write(NULL, data->scratch, data->opt, data->expand,
+ NULL, 0);
return 0;
}
@@ -463,21 +498,26 @@ static int collect_packed_object(const struct object_id *oid,
return 0;
}
-static int batch_unordered_object(const struct object_id *oid, void *vdata)
+static int batch_unordered_object(const struct object_id *oid,
+ struct packed_git *pack, off_t offset,
+ void *vdata)
{
struct object_cb_data *data = vdata;
if (oidset_insert(data->seen, oid))
return 0;
- return batch_object_cb(oid, data);
+ oidcpy(&data->expand->oid, oid);
+ batch_object_write(NULL, data->scratch, data->opt, data->expand,
+ pack, offset);
+ return 0;
}
static int batch_unordered_loose(const struct object_id *oid,
const char *path,
void *data)
{
- return batch_unordered_object(oid, data);
+ return batch_unordered_object(oid, NULL, 0, data);
}
static int batch_unordered_packed(const struct object_id *oid,
@@ -485,9 +525,142 @@ static int batch_unordered_packed(const struct object_id *oid,
uint32_t pos,
void *data)
{
- return batch_unordered_object(oid, data);
+ return batch_unordered_object(oid, pack,
+ nth_packed_object_offset(pack, pos),
+ data);
}
+typedef void (*parse_cmd_fn_t)(struct batch_options *, const char *,
+ struct strbuf *, struct expand_data *);
+
+struct queued_cmd {
+ parse_cmd_fn_t fn;
+ char *line;
+};
+
+static void parse_cmd_contents(struct batch_options *opt,
+ const char *line,
+ struct strbuf *output,
+ struct expand_data *data)
+{
+ opt->batch_mode = BATCH_MODE_CONTENTS;
+ batch_one_object(line, output, opt, data);
+}
+
+static void parse_cmd_info(struct batch_options *opt,
+ const char *line,
+ struct strbuf *output,
+ struct expand_data *data)
+{
+ opt->batch_mode = BATCH_MODE_INFO;
+ batch_one_object(line, output, opt, data);
+}
+
+static void dispatch_calls(struct batch_options *opt,
+ struct strbuf *output,
+ struct expand_data *data,
+ struct queued_cmd *cmd,
+ int nr)
+{
+ int i;
+
+ if (!opt->buffer_output)
+ die(_("flush is only for --buffer mode"));
+
+ for (i = 0; i < nr; i++)
+ cmd[i].fn(opt, cmd[i].line, output, data);
+
+ fflush(stdout);
+}
+
+static void free_cmds(struct queued_cmd *cmd, size_t *nr)
+{
+ size_t i;
+
+ for (i = 0; i < *nr; i++)
+ FREE_AND_NULL(cmd[i].line);
+
+ *nr = 0;
+}
+
+
+static const struct parse_cmd {
+ const char *name;
+ parse_cmd_fn_t fn;
+ unsigned takes_args;
+} commands[] = {
+ { "contents", parse_cmd_contents, 1},
+ { "info", parse_cmd_info, 1},
+ { "flush", NULL, 0},
+};
+
+static void batch_objects_command(struct batch_options *opt,
+ struct strbuf *output,
+ struct expand_data *data)
+{
+ struct strbuf input = STRBUF_INIT;
+ struct queued_cmd *queued_cmd = NULL;
+ size_t alloc = 0, nr = 0;
+
+ while (!strbuf_getline(&input, stdin)) {
+ int i;
+ const struct parse_cmd *cmd = NULL;
+ const char *p = NULL, *cmd_end;
+ struct queued_cmd call = {0};
+
+ if (!input.len)
+ die(_("empty command in input"));
+ if (isspace(*input.buf))
+ die(_("whitespace before command: '%s'"), input.buf);
+
+ for (i = 0; i < ARRAY_SIZE(commands); i++) {
+ if (!skip_prefix(input.buf, commands[i].name, &cmd_end))
+ continue;
+
+ cmd = &commands[i];
+ if (cmd->takes_args) {
+ if (*cmd_end != ' ')
+ die(_("%s requires arguments"),
+ commands[i].name);
+
+ p = cmd_end + 1;
+ } else if (*cmd_end) {
+ die(_("%s takes no arguments"),
+ commands[i].name);
+ }
+
+ break;
+ }
+
+ if (!cmd)
+ die(_("unknown command: '%s'"), input.buf);
+
+ if (!strcmp(cmd->name, "flush")) {
+ dispatch_calls(opt, output, data, queued_cmd, nr);
+ free_cmds(queued_cmd, &nr);
+ } else if (!opt->buffer_output) {
+ cmd->fn(opt, p, output, data);
+ } else {
+ ALLOC_GROW(queued_cmd, nr + 1, alloc);
+ call.fn = cmd->fn;
+ call.line = xstrdup_or_null(p);
+ queued_cmd[nr++] = call;
+ }
+ }
+
+ if (opt->buffer_output &&
+ nr &&
+ !git_env_bool("GIT_TEST_CAT_FILE_NO_FLUSH_ON_EXIT", 0)) {
+ dispatch_calls(opt, output, data, queued_cmd, nr);
+ free_cmds(queued_cmd, &nr);
+ }
+
+ free(queued_cmd);
+ strbuf_release(&input);
+}
+
+#define DEFAULT_FORMAT "%(objectname) %(objecttype) %(objectsize)"
+
static int batch_objects(struct batch_options *opt)
{
struct strbuf input = STRBUF_INIT;
@@ -496,9 +669,6 @@ static int batch_objects(struct batch_options *opt)
int save_warning;
int retval = 0;
- if (!opt->format)
- opt->format = "%(objectname) %(objecttype) %(objectsize)";
-
/*
* Expand once with our special mark_query flag, which will prime the
* object_info to be handed to oid_object_info_extended for each
@@ -506,17 +676,22 @@ static int batch_objects(struct batch_options *opt)
*/
memset(&data, 0, sizeof(data));
data.mark_query = 1;
- strbuf_expand(&output, opt->format, expand_format, &data);
+ strbuf_expand(&output,
+ opt->format ? opt->format : DEFAULT_FORMAT,
+ expand_format,
+ &data);
data.mark_query = 0;
strbuf_release(&output);
- if (opt->cmdmode)
+ if (opt->transform_mode)
data.split_on_whitespace = 1;
+ if (opt->format && !strcmp(opt->format, DEFAULT_FORMAT))
+ opt->format = NULL;
/*
* If we are printing out the object, then always fill in the type,
* since we will want to decide whether or not to stream.
*/
- if (opt->print_contents)
+ if (opt->batch_mode == BATCH_MODE_CONTENTS)
data.info.typep = &data.type;
if (opt->all_objects) {
@@ -529,6 +704,8 @@ static int batch_objects(struct batch_options *opt)
if (has_promisor_remote())
warning("This repository uses promisor remotes. Some objects may not be loaded.");
+ read_replace_refs = 0;
+
cb.opt = opt;
cb.expand = &data;
cb.scratch = &output;
@@ -568,6 +745,11 @@ static int batch_objects(struct batch_options *opt)
save_warning = warn_on_object_refname_ambiguity;
warn_on_object_refname_ambiguity = 0;
+ if (opt->batch_mode == BATCH_MODE_QUEUE_AND_DISPATCH) {
+ batch_objects_command(opt, &output, &data);
+ goto cleanup;
+ }
+
while (strbuf_getline(&input, stdin) != EOF) {
if (data.split_on_whitespace) {
/*
@@ -586,18 +768,13 @@ static int batch_objects(struct batch_options *opt)
batch_one_object(input.buf, &output, opt, &data);
}
+ cleanup:
strbuf_release(&input);
strbuf_release(&output);
warn_on_object_refname_ambiguity = save_warning;
return retval;
}
-static const char * const cat_file_usage[] = {
- N_("git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>"),
- N_("git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-symlinks] [--textconv | --filters]"),
- NULL
-};
-
static int git_cat_file_config(const char *var, const char *value, void *cb)
{
if (userdiff_config(var, value) < 0)
@@ -619,7 +796,16 @@ static int batch_option_callback(const struct option *opt,
}
bo->enabled = 1;
- bo->print_contents = !strcmp(opt->long_name, "batch");
+
+ if (!strcmp(opt->long_name, "batch"))
+ bo->batch_mode = BATCH_MODE_CONTENTS;
+ else if (!strcmp(opt->long_name, "batch-check"))
+ bo->batch_mode = BATCH_MODE_INFO;
+ else if (!strcmp(opt->long_name, "batch-command"))
+ bo->batch_mode = BATCH_MODE_QUEUE_AND_DISPATCH;
+ else
+ BUG("%s given to batch-option-callback", opt->long_name);
+
bo->format = arg;
return 0;
@@ -628,90 +814,142 @@ static int batch_option_callback(const struct option *opt,
int cmd_cat_file(int argc, const char **argv, const char *prefix)
{
int opt = 0;
+ int opt_cw = 0;
+ int opt_epts = 0;
const char *exp_type = NULL, *obj_name = NULL;
struct batch_options batch = {0};
int unknown_type = 0;
+ const char * const usage[] = {
+ N_("git cat-file <type> <object>"),
+ N_("git cat-file (-e | -p) <object>"),
+ N_("git cat-file (-t | -s) [--allow-unknown-type] <object>"),
+ N_("git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]\n"
+ " [--buffer] [--follow-symlinks] [--unordered]\n"
+ " [--textconv | --filters]"),
+ N_("git cat-file (--textconv | --filters)\n"
+ " [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"),
+ NULL
+ };
const struct option options[] = {
- OPT_GROUP(N_("<type> can be one of: blob, tree, commit, tag")),
- OPT_CMDMODE('t', NULL, &opt, N_("show object type"), 't'),
- OPT_CMDMODE('s', NULL, &opt, N_("show object size"), 's'),
+ /* Simple queries */
+ OPT_GROUP(N_("Check object existence or emit object contents")),
OPT_CMDMODE('e', NULL, &opt,
- N_("exit with zero when there's no error"), 'e'),
- OPT_CMDMODE('p', NULL, &opt, N_("pretty-print object's content"), 'p'),
- OPT_CMDMODE(0, "textconv", &opt,
- N_("for blob objects, run textconv on object's content"), 'c'),
- OPT_CMDMODE(0, "filters", &opt,
- N_("for blob objects, run filters on object's content"), 'w'),
- OPT_STRING(0, "path", &force_path, N_("blob"),
- N_("use a specific path for --textconv/--filters")),
+ N_("check if <object> exists"), 'e'),
+ OPT_CMDMODE('p', NULL, &opt, N_("pretty-print <object> content"), 'p'),
+
+ OPT_GROUP(N_("Emit [broken] object attributes")),
+ OPT_CMDMODE('t', NULL, &opt, N_("show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"), 't'),
+ OPT_CMDMODE('s', NULL, &opt, N_("show object size"), 's'),
OPT_BOOL(0, "allow-unknown-type", &unknown_type,
N_("allow -s and -t to work with broken/corrupt objects")),
+ /* Batch mode */
+ OPT_GROUP(N_("Batch objects requested on stdin (or --batch-all-objects)")),
+ OPT_CALLBACK_F(0, "batch", &batch, N_("format"),
+ N_("show full <object> or <rev> contents"),
+ PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
+ batch_option_callback),
+ OPT_CALLBACK_F(0, "batch-check", &batch, N_("format"),
+ N_("like --batch, but don't emit <contents>"),
+ PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
+ batch_option_callback),
+ OPT_CALLBACK_F(0, "batch-command", &batch, N_("format"),
+ N_("read commands from stdin"),
+ PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
+ batch_option_callback),
+ OPT_CMDMODE(0, "batch-all-objects", &opt,
+ N_("with --batch[-check]: ignores stdin, batches all known objects"), 'b'),
+ /* Batch-specific options */
+ OPT_GROUP(N_("Change or optimize batch output")),
OPT_BOOL(0, "buffer", &batch.buffer_output, N_("buffer --batch output")),
- 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),
- 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),
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,
- N_("show all objects with --batch or --batch-check")),
+ N_("follow in-tree symlinks")),
OPT_BOOL(0, "unordered", &batch.unordered,
- N_("do not order --batch-all-objects output")),
+ N_("do not order objects before emitting them")),
+ /* Textconv options, stand-ole*/
+ OPT_GROUP(N_("Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)")),
+ OPT_CMDMODE(0, "textconv", &opt,
+ N_("run textconv on object's content"), 'c'),
+ OPT_CMDMODE(0, "filters", &opt,
+ N_("run filters on object's content"), 'w'),
+ OPT_STRING(0, "path", &force_path, N_("blob|tree"),
+ N_("use a <path> for (--textconv | --filters); Not with 'batch'")),
OPT_END()
};
git_config(git_cat_file_config, NULL);
batch.buffer_output = -1;
- argc = parse_options(argc, argv, prefix, options, cat_file_usage, 0);
- if (opt) {
- if (batch.enabled && (opt == 'c' || opt == 'w'))
- batch.cmdmode = opt;
- else if (argc == 1)
- obj_name = argv[0];
- else
- usage_with_options(cat_file_usage, options);
- }
- if (!opt && !batch.enabled) {
- if (argc == 2) {
- exp_type = argv[0];
- obj_name = argv[1];
- } else
- usage_with_options(cat_file_usage, options);
- }
- if (batch.enabled) {
- if (batch.cmdmode != opt || argc)
- usage_with_options(cat_file_usage, options);
- if (batch.cmdmode && batch.all_objects)
- die("--batch-all-objects cannot be combined with "
- "--textconv nor with --filters");
- }
+ argc = parse_options(argc, argv, prefix, options, usage, 0);
+ opt_cw = (opt == 'c' || opt == 'w');
+ opt_epts = (opt == 'e' || opt == 'p' || opt == 't' || opt == 's');
- if ((batch.follow_symlinks || batch.all_objects) && !batch.enabled) {
- usage_with_options(cat_file_usage, options);
- }
+ /* --batch-all-objects? */
+ if (opt == 'b')
+ batch.all_objects = 1;
- if (force_path && opt != 'c' && opt != 'w') {
- error("--path=<path> needs --textconv or --filters");
- usage_with_options(cat_file_usage, options);
- }
+ /* Option compatibility */
+ if (force_path && !opt_cw)
+ usage_msg_optf(_("'%s=<%s>' needs '%s' or '%s'"),
+ usage, options,
+ "--path", _("path|tree-ish"), "--filters",
+ "--textconv");
- if (force_path && batch.enabled) {
- error("--path=<path> incompatible with --batch");
- usage_with_options(cat_file_usage, options);
- }
+ /* Option compatibility with batch mode */
+ if (batch.enabled)
+ ;
+ else if (batch.follow_symlinks)
+ usage_msg_optf(_("'%s' requires a batch mode"), usage, options,
+ "--follow-symlinks");
+ else if (batch.buffer_output >= 0)
+ usage_msg_optf(_("'%s' requires a batch mode"), usage, options,
+ "--buffer");
+ else if (batch.all_objects)
+ usage_msg_optf(_("'%s' requires a batch mode"), usage, options,
+ "--batch-all-objects");
+ /* Batch defaults */
if (batch.buffer_output < 0)
batch.buffer_output = batch.all_objects;
- if (batch.enabled)
+ /* Return early if we're in batch mode? */
+ if (batch.enabled) {
+ if (opt_cw)
+ batch.transform_mode = opt;
+ else if (opt && opt != 'b')
+ usage_msg_optf(_("'-%c' is incompatible with batch mode"),
+ usage, options, opt);
+ else if (argc)
+ usage_msg_opt(_("batch modes take no arguments"), usage,
+ options);
+
return batch_objects(&batch);
+ }
+
+ if (opt) {
+ if (!argc && opt == 'c')
+ usage_msg_optf(_("<rev> required with '%s'"),
+ usage, options, "--textconv");
+ else if (!argc && opt == 'w')
+ usage_msg_optf(_("<rev> required with '%s'"),
+ usage, options, "--filters");
+ else if (!argc && opt_epts)
+ usage_msg_optf(_("<object> required with '-%c'"),
+ usage, options, opt);
+ else if (argc == 1)
+ obj_name = argv[0];
+ else
+ usage_msg_opt(_("too many arguments"), usage, options);
+ } else if (!argc) {
+ usage_with_options(usage, options);
+ } else if (argc != 2) {
+ usage_msg_optf(_("only two arguments allowed in <type> <object> mode, not %d"),
+ usage, options, argc);
+ } else if (argc) {
+ exp_type = argv[0];
+ obj_name = argv[1];
+ }
if (unknown_type && opt != 't' && opt != 's')
die("git cat-file --allow-unknown-type: use with -s or -t");
diff --git a/builtin/checkout--worker.c b/builtin/checkout--worker.c
index fb9fd13..ede7dc3 100644
--- a/builtin/checkout--worker.c
+++ b/builtin/checkout--worker.c
@@ -82,8 +82,8 @@ static void worker_loop(struct checkout *state)
size_t i, nr = 0, alloc = 0;
while (1) {
- int len = packet_read(0, NULL, NULL, packet_buffer,
- sizeof(packet_buffer), 0);
+ int len = packet_read(0, packet_buffer, sizeof(packet_buffer),
+ 0);
if (len < 0)
BUG("packet_read() returned negative value");
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index e21620d..97e06e8 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -7,6 +7,7 @@
#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "builtin.h"
#include "config.h"
+#include "dir.h"
#include "lockfile.h"
#include "quote.h"
#include "cache-tree.h"
@@ -17,6 +18,7 @@
#define CHECKOUT_ALL 4
static int nul_term_line;
static int checkout_stage; /* default to checkout stage0 */
+static int ignore_skip_worktree; /* default to 0 */
static int to_tempfile;
static char topath[4][TEMPORARY_FILENAME_LENGTH + 1];
@@ -65,6 +67,8 @@ static int checkout_file(const char *name, const char *prefix)
int namelen = strlen(name);
int pos = cache_name_pos(name, namelen);
int has_same_name = 0;
+ int is_file = 0;
+ int is_skipped = 1;
int did_checkout = 0;
int errs = 0;
@@ -78,6 +82,12 @@ static int checkout_file(const char *name, const char *prefix)
break;
has_same_name = 1;
pos++;
+ if (S_ISSPARSEDIR(ce->ce_mode))
+ break;
+ is_file = 1;
+ if (!ignore_skip_worktree && ce_skip_worktree(ce))
+ break;
+ is_skipped = 0;
if (ce_stage(ce) != checkout_stage
&& (CHECKOUT_ALL != checkout_stage || !ce_stage(ce)))
continue;
@@ -106,6 +116,11 @@ static int checkout_file(const char *name, const char *prefix)
fprintf(stderr, "git checkout-index: %s ", name);
if (!has_same_name)
fprintf(stderr, "is not in the cache");
+ else if (!is_file)
+ fprintf(stderr, "is a sparse directory");
+ else if (is_skipped)
+ fprintf(stderr, "has skip-worktree enabled; "
+ "use '--ignore-skip-worktree-bits' to checkout");
else if (checkout_stage)
fprintf(stderr, "does not exist at stage %d",
checkout_stage);
@@ -121,10 +136,27 @@ static int checkout_all(const char *prefix, int prefix_length)
int i, errs = 0;
struct cache_entry *last_ce = NULL;
- /* TODO: audit for interaction with sparse-index. */
- ensure_full_index(&the_index);
for (i = 0; i < active_nr ; i++) {
struct cache_entry *ce = active_cache[i];
+
+ if (S_ISSPARSEDIR(ce->ce_mode)) {
+ if (!ce_skip_worktree(ce))
+ BUG("sparse directory '%s' does not have skip-worktree set", ce->name);
+
+ /*
+ * If the current entry is a sparse directory and skip-worktree
+ * entries are being checked out, expand the index and continue
+ * the loop on the current index position (now pointing to the
+ * first entry inside the expanded sparse directory).
+ */
+ if (ignore_skip_worktree) {
+ ensure_full_index(&the_index);
+ ce = active_cache[i];
+ }
+ }
+
+ if (!ignore_skip_worktree && ce_skip_worktree(ce))
+ continue;
if (ce_stage(ce) != checkout_stage
&& (CHECKOUT_ALL != checkout_stage || !ce_stage(ce)))
continue;
@@ -185,6 +217,8 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
struct option builtin_checkout_index_options[] = {
OPT_BOOL('a', "all", &all,
N_("check out all files in the index")),
+ OPT_BOOL(0, "ignore-skip-worktree-bits", &ignore_skip_worktree,
+ N_("do not skip files with skip-worktree set")),
OPT__FORCE(&force, N_("force overwrite of existing files"), 0),
OPT__QUIET(&quiet,
N_("no warning for existing files and files not in index")),
@@ -212,6 +246,9 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
git_config(git_default_config, NULL);
prefix_length = prefix ? strlen(prefix) : 0;
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
if (read_cache() < 0) {
die("invalid cache");
}
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 8c69dcd..2eefda8 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -9,6 +9,7 @@
#include "config.h"
#include "diff.h"
#include "dir.h"
+#include "hook.h"
#include "ll-merge.h"
#include "lockfile.h"
#include "merge-recursive.h"
@@ -91,8 +92,8 @@ struct checkout_opts {
};
struct branch_info {
- const char *name; /* The short name used */
- const char *path; /* The full name of a real branch */
+ char *name; /* The short name used */
+ 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. */
@@ -103,10 +104,18 @@ struct branch_info {
char *checkout;
};
+static void branch_info_release(struct branch_info *info)
+{
+ free(info->name);
+ free(info->path);
+ free(info->refname);
+ free(info->checkout);
+}
+
static int post_checkout_hook(struct commit *old_commit, struct commit *new_commit,
int changed)
{
- return run_hook_le(NULL, "post-checkout",
+ return run_hooks_l("post-checkout",
oid_to_hex(old_commit ? &old_commit->object.oid : null_oid()),
oid_to_hex(new_commit ? &new_commit->object.oid : null_oid()),
changed ? "1" : "0", NULL);
@@ -237,6 +246,7 @@ static int checkout_merged(int pos, const struct checkout *state,
struct cache_entry *ce = active_cache[pos];
const char *path = ce->name;
mmfile_t ancestor, ours, theirs;
+ enum ll_merge_result merge_status;
int status;
struct object_id oid;
mmbuffer_t result_buf;
@@ -267,13 +277,16 @@ static int checkout_merged(int pos, const struct checkout *state,
memset(&ll_opts, 0, sizeof(ll_opts));
git_config_get_bool("merge.renormalize", &renormalize);
ll_opts.renormalize = renormalize;
- status = ll_merge(&result_buf, path, &ancestor, "base",
- &ours, "ours", &theirs, "theirs",
- state->istate, &ll_opts);
+ merge_status = ll_merge(&result_buf, path, &ancestor, "base",
+ &ours, "ours", &theirs, "theirs",
+ state->istate, &ll_opts);
free(ancestor.ptr);
free(ours.ptr);
free(theirs.ptr);
- if (status < 0 || !result_buf.ptr) {
+ if (merge_status == LL_MERGE_BINARY_CONFLICT)
+ warning("Cannot merge binary files: %s (%s vs. %s)",
+ path, "ours", "theirs");
+ if (merge_status < 0 || !result_buf.ptr) {
free(result_buf.ptr);
return error(_("path '%s': cannot merge"), path);
}
@@ -290,7 +303,7 @@ static int checkout_merged(int pos, const struct checkout *state,
* (it also writes the merge result to the object database even
* when it may contain conflicts).
*/
- if (write_object_file(result_buf.ptr, result_buf.size, blob_type, &oid))
+ if (write_object_file(result_buf.ptr, result_buf.size, OBJ_BLOB, &oid))
die(_("Unable to add merge result for '%s'"), path);
free(result_buf.ptr);
ce = make_transient_cache_entry(mode, &oid, path, 2, ce_mem_pool);
@@ -456,10 +469,10 @@ static int checkout_paths(const struct checkout_opts *opts,
die(_("'%s' cannot be used with updating paths"), "--detach");
if (opts->merge && opts->patch_mode)
- die(_("'%s' cannot be used with %s"), "--merge", "--patch");
+ die(_("options '%s' and '%s' cannot be used together"), "--merge", "--patch");
if (opts->ignore_unmerged && opts->merge)
- die(_("'%s' cannot be used with %s"),
+ die(_("options '%s' and '%s' cannot be used together"),
opts->ignore_unmerged_opt, "-m");
if (opts->new_branch)
@@ -616,7 +629,7 @@ static void show_local_changes(struct object *head,
diff_setup_done(&rev.diffopt);
add_pending_object(&rev, head, NULL);
run_diff_index(&rev, 0);
- object_array_clear(&rev.pending);
+ release_revisions(&rev);
}
static void describe_detached_head(const char *msg, struct commit *commit)
@@ -646,7 +659,9 @@ static int reset_tree(struct tree *tree, const struct checkout_opts *o,
opts.head_idx = -1;
opts.update = worktree;
opts.skip_unmerged = !worktree;
- opts.reset = 1;
+ opts.reset = o->force ? UNPACK_RESET_OVERWRITE_UNTRACKED :
+ UNPACK_RESET_PROTECT_UNTRACKED;
+ opts.preserve_ignored = (!o->force && !o->overwrite_ignore);
opts.merge = 1;
opts.fn = oneway_merge;
opts.verbose_update = o->show_progress;
@@ -686,9 +701,12 @@ static void setup_branch_path(struct branch_info *branch)
repo_get_oid_committish(the_repository, branch->name, &branch->oid);
strbuf_branchname(&buf, branch->name, INTERPRET_BRANCH_LOCAL);
- if (strcmp(buf.buf, branch->name))
+ if (strcmp(buf.buf, branch->name)) {
+ free(branch->name);
branch->name = xstrdup(buf.buf);
+ }
strbuf_splice(&buf, 0, 0, "refs/heads/", 11);
+ free(branch->path);
branch->path = strbuf_detach(&buf, NULL);
}
@@ -720,6 +738,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
struct tree_desc trees[2];
struct tree *tree;
struct unpack_trees_options topts;
+ const struct object_id *old_commit_oid;
memset(&topts, 0, sizeof(topts));
topts.head_idx = -1;
@@ -746,14 +765,16 @@ static int merge_working_tree(const struct checkout_opts *opts,
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;
- setup_standard_excludes(topts.dir);
- }
- tree = parse_tree_indirect(old_branch_info->commit ?
- &old_branch_info->commit->object.oid :
- the_hash_algo->empty_tree);
+ topts.preserve_ignored = !opts->overwrite_ignore;
+
+ old_commit_oid = old_branch_info->commit ?
+ &old_branch_info->commit->object.oid :
+ the_hash_algo->empty_tree;
+ tree = parse_tree_indirect(old_commit_oid);
+ if (!tree)
+ die(_("unable to parse commit %s"),
+ oid_to_hex(old_commit_oid));
+
init_tree_desc(&trees[0], tree->buffer, tree->size);
parse_tree(new_tree);
tree = new_tree;
@@ -813,7 +834,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
if (ret)
return ret;
o.ancestor = old_branch_info->name;
- if (old_branch_info->name == NULL) {
+ if (!old_branch_info->name) {
strbuf_add_unique_abbrev(&old_commit_shortname,
&old_branch_info->commit->object.oid,
DEFAULT_ABBREV);
@@ -876,7 +897,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
int ret;
struct strbuf err = STRBUF_INIT;
- ret = safe_create_reflog(refname, 1, &err);
+ ret = safe_create_reflog(refname, &err);
if (ret) {
fprintf(stderr, _("Can not do reflog for '%s': %s\n"),
opts->new_orphan_branch, err.buf);
@@ -895,8 +916,11 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
opts->new_branch_force ? 1 : 0,
opts->new_branch_log,
opts->quiet,
- opts->track);
- new_branch_info->name = opts->new_branch;
+ opts->track,
+ 0);
+ free(new_branch_info->name);
+ free(new_branch_info->refname);
+ new_branch_info->name = xstrdup(opts->new_branch);
setup_branch_path(new_branch_info);
}
@@ -1058,14 +1082,14 @@ static void orphaned_commit_warning(struct commit *old_commit, struct commit *ne
/* Clean up objects used, as they will be reused. */
repo_clear_commit_marks(the_repository, ALL_REV_FLAGS);
+ release_revisions(&revs);
}
static int switch_branches(const struct checkout_opts *opts,
struct branch_info *new_branch_info)
{
int ret = 0;
- struct branch_info old_branch_info;
- void *path_to_free;
+ struct branch_info old_branch_info = { 0 };
struct object_id rev;
int flag, writeout_error = 0;
int do_merge = 1;
@@ -1073,25 +1097,29 @@ static int switch_branches(const struct checkout_opts *opts,
trace2_cmd_mode("branch");
memset(&old_branch_info, 0, sizeof(old_branch_info));
- old_branch_info.path = path_to_free = resolve_refdup("HEAD", 0, &rev, &flag);
+ old_branch_info.path = resolve_refdup("HEAD", 0, &rev, &flag);
if (old_branch_info.path)
old_branch_info.commit = lookup_commit_reference_gently(the_repository, &rev, 1);
if (!(flag & REF_ISSYMREF))
- old_branch_info.path = NULL;
+ FREE_AND_NULL(old_branch_info.path);
- if (old_branch_info.path)
- skip_prefix(old_branch_info.path, "refs/heads/", &old_branch_info.name);
+ if (old_branch_info.path) {
+ const char *const prefix = "refs/heads/";
+ const char *p;
+ if (skip_prefix(old_branch_info.path, prefix, &p))
+ old_branch_info.name = xstrdup(p);
+ }
if (opts->new_orphan_branch && opts->orphan_from_empty_tree) {
if (new_branch_info->name)
BUG("'switch --orphan' should never accept a commit as starting point");
new_branch_info->commit = NULL;
- new_branch_info->name = "(empty)";
+ new_branch_info->name = xstrdup("(empty)");
do_merge = 1;
}
if (!new_branch_info->name) {
- new_branch_info->name = "HEAD";
+ new_branch_info->name = xstrdup("HEAD");
new_branch_info->commit = old_branch_info.commit;
if (!new_branch_info->commit)
die(_("You are on a branch yet to be born"));
@@ -1104,7 +1132,7 @@ static int switch_branches(const struct checkout_opts *opts,
if (do_merge) {
ret = merge_working_tree(opts, &old_branch_info, new_branch_info, &writeout_error);
if (ret) {
- free(path_to_free);
+ branch_info_release(&old_branch_info);
return ret;
}
}
@@ -1115,7 +1143,8 @@ static int switch_branches(const struct checkout_opts *opts,
update_refs_for_switch(opts, &old_branch_info, new_branch_info);
ret = post_checkout_hook(old_branch_info.commit, new_branch_info->commit, 1);
- free(path_to_free);
+ branch_info_release(&old_branch_info);
+
return ret || writeout_error;
}
@@ -1147,16 +1176,15 @@ static void setup_new_branch_info_and_source_tree(
struct tree **source_tree = &opts->source_tree;
struct object_id branch_rev;
- new_branch_info->name = arg;
+ new_branch_info->name = xstrdup(arg);
setup_branch_path(new_branch_info);
if (!check_refname_format(new_branch_info->path, 0) &&
!read_ref(new_branch_info->path, &branch_rev))
oidcpy(rev, &branch_rev);
- else {
- free((char *)new_branch_info->path);
- new_branch_info->path = NULL; /* not an existing branch */
- }
+ else
+ /* not an existing branch */
+ FREE_AND_NULL(new_branch_info->path);
new_branch_info->commit = lookup_commit_reference_gently(the_repository, rev, 1);
if (!new_branch_info->commit) {
@@ -1377,23 +1405,31 @@ static void die_expecting_a_branch(const struct branch_info *branch_info)
{
struct object_id oid;
char *to_free;
+ int code;
if (dwim_ref(branch_info->name, strlen(branch_info->name), &oid, &to_free, 0) == 1) {
const char *ref = to_free;
if (skip_prefix(ref, "refs/tags/", &ref))
- die(_("a branch is expected, got tag '%s'"), ref);
- if (skip_prefix(ref, "refs/remotes/", &ref))
- die(_("a branch is expected, got remote branch '%s'"), ref);
- die(_("a branch is expected, got '%s'"), ref);
+ code = die_message(_("a branch is expected, got tag '%s'"), ref);
+ else if (skip_prefix(ref, "refs/remotes/", &ref))
+ code = die_message(_("a branch is expected, got remote branch '%s'"), ref);
+ else
+ code = die_message(_("a branch is expected, got '%s'"), ref);
}
- if (branch_info->commit)
- die(_("a branch is expected, got commit '%s'"), branch_info->name);
- /*
- * This case should never happen because we already die() on
- * non-commit, but just in case.
- */
- die(_("a branch is expected, got '%s'"), branch_info->name);
+ else if (branch_info->commit)
+ code = die_message(_("a branch is expected, got commit '%s'"), branch_info->name);
+ else
+ /*
+ * This case should never happen because we already die() on
+ * non-commit, but just in case.
+ */
+ code = die_message(_("a branch is expected, got '%s'"), branch_info->name);
+
+ if (advice_enabled(ADVICE_SUGGEST_DETACHING_HEAD))
+ advise(_("If you want to detach HEAD at the commit, try again with the --detach option."));
+
+ exit(code);
}
static void die_if_some_operation_in_progress(void)
@@ -1519,7 +1555,7 @@ static struct option *add_common_options(struct checkout_opts *opts,
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"),
- N_("conflict style (merge or diff3)")),
+ N_("conflict style (merge, diff3, or zdiff3)")),
OPT_END()
};
struct option *newopts = parse_options_concat(prevopts, options);
@@ -1532,8 +1568,10 @@ static struct option *add_common_switch_branch_options(
{
struct option options[] = {
OPT_BOOL('d', "detach", &opts->force_detach, N_("detach HEAD at named commit")),
- OPT_SET_INT('t', "track", &opts->track, N_("set upstream info for new branch"),
- BRANCH_TRACK_EXPLICIT),
+ OPT_CALLBACK_F('t', "track", &opts->track, "(direct|inherit)",
+ N_("set branch tracking configuration"),
+ PARSE_OPT_OPTARG,
+ parse_opt_tracking_mode),
OPT__FORCE(&opts->force, N_("force checkout (throw away local modifications)"),
PARSE_OPT_NOCOMPLETE),
OPT_STRING(0, "orphan", &opts->new_orphan_branch, N_("new-branch"), N_("new unparented branch")),
@@ -1576,20 +1614,20 @@ 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[])
+ const char * const usagestr[],
+ struct branch_info *new_branch_info)
{
- struct branch_info new_branch_info;
int parseopt_flags = 0;
- memset(&new_branch_info, 0, sizeof(new_branch_info));
opts->overwrite_ignore = 1;
opts->prefix = prefix;
opts->show_progress = -1;
git_config(git_checkout_config, opts);
-
- prepare_repo_settings(the_repository);
- the_repository->settings.command_requires_full_index = 0;
+ if (the_repository->gitdir) {
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+ }
opts->track = BRANCH_TRACK_UNSPECIFIED;
@@ -1619,11 +1657,11 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
}
if ((!!opts->new_branch + !!opts->new_branch_force + !!opts->new_orphan_branch) > 1)
- die(_("-%c, -%c and --orphan are mutually exclusive"),
- cb_option, toupper(cb_option));
+ die(_("options '-%c', '-%c', and '%s' cannot be used together"),
+ cb_option, toupper(cb_option), "--orphan");
if (opts->overlay_mode == 1 && opts->patch_mode)
- die(_("-p and --overlay are mutually exclusive"));
+ die(_("options '%s' and '%s' cannot be used together"), "-p", "--overlay");
if (opts->checkout_index >= 0 || opts->checkout_worktree >= 0) {
if (opts->checkout_index < 0)
@@ -1690,7 +1728,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
opts->track == BRANCH_TRACK_UNSPECIFIED &&
!opts->new_branch;
int n = parse_branchname_arg(argc, argv, dwim_ok,
- &new_branch_info, opts, &rev);
+ new_branch_info, opts, &rev);
argv += n;
argc -= n;
} else if (!opts->accept_ref && opts->from_treeish) {
@@ -1699,7 +1737,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
if (get_oid_mb(opts->from_treeish, &rev))
die(_("could not resolve %s"), opts->from_treeish);
- setup_new_branch_info_and_source_tree(&new_branch_info,
+ setup_new_branch_info_and_source_tree(new_branch_info,
opts, &rev,
opts->from_treeish);
@@ -1719,7 +1757,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
* Try to give more helpful suggestion.
* new_branch && argc > 1 will be caught later.
*/
- if (opts->new_branch && argc == 1 && !new_branch_info.commit)
+ if (opts->new_branch && argc == 1 && !new_branch_info->commit)
die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),
argv[0], opts->new_branch);
@@ -1730,19 +1768,19 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
if (opts->pathspec_from_file) {
if (opts->pathspec.nr)
- die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+ die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
if (opts->force_detach)
- die(_("--pathspec-from-file is incompatible with --detach"));
+ die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--detach");
if (opts->patch_mode)
- die(_("--pathspec-from-file is incompatible with --patch"));
+ die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
parse_pathspec_file(&opts->pathspec, 0,
0,
prefix, opts->pathspec_from_file, opts->pathspec_file_nul);
} else if (opts->pathspec_file_nul) {
- die(_("--pathspec-file-nul requires --pathspec-from-file"));
+ die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
}
opts->pathspec.recursive = 1;
@@ -1768,11 +1806,10 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
strbuf_release(&buf);
}
- UNLEAK(opts);
if (opts->patch_mode || opts->pathspec.nr)
- return checkout_paths(opts, &new_branch_info);
+ return checkout_paths(opts, new_branch_info);
else
- return checkout_branch(opts, &new_branch_info);
+ return checkout_branch(opts, new_branch_info);
}
int cmd_checkout(int argc, const char **argv, const char *prefix)
@@ -1791,6 +1828,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
OPT_END()
};
int ret;
+ struct branch_info new_branch_info = { 0 };
memset(&opts, 0, sizeof(opts));
opts.dwim_new_local_branch = 1;
@@ -1821,7 +1859,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
options = add_checkout_path_options(&opts, options);
ret = checkout_main(argc, argv, prefix, &opts,
- options, checkout_usage);
+ options, checkout_usage, &new_branch_info);
+ branch_info_release(&new_branch_info);
+ clear_pathspec(&opts.pathspec);
FREE_AND_NULL(options);
return ret;
}
@@ -1842,6 +1882,7 @@ int cmd_switch(int argc, const char **argv, const char *prefix)
OPT_END()
};
int ret;
+ struct branch_info new_branch_info = { 0 };
memset(&opts, 0, sizeof(opts));
opts.dwim_new_local_branch = 1;
@@ -1861,7 +1902,8 @@ int cmd_switch(int argc, const char **argv, const char *prefix)
cb_option = 'c';
ret = checkout_main(argc, argv, prefix, &opts,
- options, switch_branch_usage);
+ options, switch_branch_usage, &new_branch_info);
+ branch_info_release(&new_branch_info);
FREE_AND_NULL(options);
return ret;
}
@@ -1883,6 +1925,7 @@ int cmd_restore(int argc, const char **argv, const char *prefix)
OPT_END()
};
int ret;
+ struct branch_info new_branch_info = { 0 };
memset(&opts, 0, sizeof(opts));
opts.accept_ref = 0;
@@ -1898,7 +1941,8 @@ int cmd_restore(int argc, const char **argv, const char *prefix)
options = add_checkout_path_options(&opts, options);
ret = checkout_main(argc, argv, prefix, &opts,
- options, restore_usage);
+ options, restore_usage, &new_branch_info);
+ branch_info_release(&new_branch_info);
FREE_AND_NULL(options);
return ret;
}
diff --git a/builtin/clean.c b/builtin/clean.c
index 98a2860..5466636 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -36,6 +36,8 @@ static const char *msg_skip_git_dir = N_("Skipping repository %s\n");
static const char *msg_would_skip_git_dir = N_("Would skip repository %s\n");
static const char *msg_warn_remove_failed = N_("failed to remove %s");
static const char *msg_warn_lstat_failed = N_("could not lstat %s\n");
+static const char *msg_skip_cwd = N_("Refusing to remove current working directory\n");
+static const char *msg_would_skip_cwd = N_("Would refuse to remove current working directory\n");
enum color_clean {
CLEAN_COLOR_RESET = 0,
@@ -153,6 +155,8 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
{
DIR *dir;
struct strbuf quoted = STRBUF_INIT;
+ struct strbuf realpath = STRBUF_INIT;
+ struct strbuf real_ocwd = STRBUF_INIT;
struct dirent *e;
int res = 0, ret = 0, gone = 1, original_len = path->len, len;
struct string_list dels = STRING_LIST_INIT_DUP;
@@ -231,16 +235,36 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
strbuf_setlen(path, original_len);
if (*dir_gone) {
- res = dry_run ? 0 : rmdir(path->buf);
- if (!res)
- *dir_gone = 1;
- else {
- int saved_errno = errno;
- quote_path(path->buf, prefix, "ed, 0);
- errno = saved_errno;
- warning_errno(_(msg_warn_remove_failed), quoted.buf);
+ /*
+ * Normalize path components in path->buf, e.g. change '\' to
+ * '/' on Windows.
+ */
+ strbuf_realpath(&realpath, path->buf, 1);
+
+ /*
+ * path and realpath are absolute; for comparison, we would
+ * like to transform startup_info->original_cwd to an absolute
+ * path too.
+ */
+ if (startup_info->original_cwd)
+ strbuf_realpath(&real_ocwd,
+ startup_info->original_cwd, 1);
+
+ if (!strbuf_cmp(&realpath, &real_ocwd)) {
+ printf("%s", dry_run ? _(msg_would_skip_cwd) : _(msg_skip_cwd));
*dir_gone = 0;
- ret = 1;
+ } else {
+ res = dry_run ? 0 : rmdir(path->buf);
+ if (!res)
+ *dir_gone = 1;
+ else {
+ int saved_errno = errno;
+ quote_path(path->buf, prefix, "ed, 0);
+ errno = saved_errno;
+ warning_errno(_(msg_warn_remove_failed), quoted.buf);
+ *dir_gone = 0;
+ ret = 1;
+ }
}
}
@@ -250,6 +274,8 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
printf(dry_run ? _(msg_would_remove) : _(msg_remove), dels.items[i].string);
}
out:
+ strbuf_release(&realpath);
+ strbuf_release(&real_ocwd);
strbuf_release("ed);
string_list_clear(&dels, 0);
return ret;
@@ -983,6 +1009,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
dir.flags |= DIR_KEEP_UNTRACKED_CONTENTS;
}
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
if (read_cache() < 0)
die(_("index file corrupt"));
diff --git a/builtin/clone.c b/builtin/clone.c
index c9d4ca2..89a91b0 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -32,6 +32,8 @@
#include "connected.h"
#include "packfile.h"
#include "list-objects-filter-options.h"
+#include "hook.h"
+#include "bundle.h"
/*
* Overall FIXMEs:
@@ -71,6 +73,8 @@ static int option_dissociate;
static int max_jobs = -1;
static struct string_list option_recurse_submodules = STRING_LIST_INIT_NODUP;
static struct list_objects_filter_options filter_options;
+static int option_filter_submodules = -1; /* unspecified */
+static int config_filter_submodules = -1; /* unspecified */
static struct string_list server_options = STRING_LIST_INIT_NODUP;
static int option_remote_submodules;
@@ -150,6 +154,8 @@ static struct option builtin_clone_options[] = {
OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
TRANSPORT_FAMILY_IPV6),
OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
+ OPT_BOOL(0, "also-filter-submodules", &option_filter_submodules,
+ N_("apply partial clone filters to submodules")),
OPT_BOOL(0, "remote-submodules", &option_remote_submodules,
N_("any cloned submodules will use their remote-tracking branch")),
OPT_BOOL(0, "sparse", &option_sparse_checkout,
@@ -633,7 +639,7 @@ static int git_sparse_checkout_init(const char *repo)
{
struct strvec argv = STRVEC_INIT;
int result = 0;
- strvec_pushl(&argv, "-C", repo, "sparse-checkout", "init", NULL);
+ strvec_pushl(&argv, "-C", repo, "sparse-checkout", "set", NULL);
/*
* We must apply the setting in the current process
@@ -650,7 +656,7 @@ static int git_sparse_checkout_init(const char *repo)
return result;
}
-static int checkout(int submodule_progress)
+static int checkout(int submodule_progress, int filter_submodules)
{
struct object_id oid;
char *head;
@@ -687,6 +693,7 @@ static int checkout(int submodule_progress)
opts.update = 1;
opts.merge = 1;
opts.clone = 1;
+ opts.preserve_ignored = 0;
opts.fn = oneway_merge;
opts.verbose_update = (option_verbosity >= 0);
opts.src_index = &the_index;
@@ -694,6 +701,8 @@ static int checkout(int submodule_progress)
init_checkout_metadata(&opts.meta, head, &oid, NULL);
tree = parse_tree_indirect(&oid);
+ if (!tree)
+ die(_("unable to parse commit %s"), oid_to_hex(&oid));
parse_tree(tree);
init_tree_desc(&t, tree->buffer, tree->size);
if (unpack_trees(1, &t, &opts) < 0)
@@ -704,7 +713,7 @@ static int checkout(int submodule_progress)
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("unable to write new index file"));
- err |= run_hook_le(NULL, "post-checkout", oid_to_hex(null_oid()),
+ err |= run_hooks_l("post-checkout", oid_to_hex(null_oid()),
oid_to_hex(&oid), "1", NULL);
if (!err && (option_recurse_submodules.nr > 0)) {
@@ -728,6 +737,10 @@ static int checkout(int submodule_progress)
strvec_push(&args, "--no-fetch");
}
+ if (filter_submodules && filter_options.choice)
+ strvec_pushf(&args, "--filter=%s",
+ expand_list_objects_filter_spec(&filter_options));
+
if (option_single_branch >= 0)
strvec_push(&args, option_single_branch ?
"--single-branch" :
@@ -748,6 +761,8 @@ static int git_clone_config(const char *k, const char *v, void *cb)
}
if (!strcmp(k, "clone.rejectshallow"))
config_reject_shallow = git_config_bool(k, v);
+ if (!strcmp(k, "clone.filtersubmodules"))
+ config_filter_submodules = git_config_bool(k, v);
return git_default_config(k, v, cb);
}
@@ -861,7 +876,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
const struct ref *refs, *remote_head;
struct ref *remote_head_points_at = NULL;
const struct ref *our_head_points_at;
- struct ref *mapped_refs;
+ struct ref *mapped_refs = NULL;
const struct ref *ref;
struct strbuf key = STRBUF_INIT;
struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT;
@@ -870,6 +885,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
struct remote *remote;
int err = 0, complete_refs_before_fetch = 1;
int submodule_progress;
+ int filter_submodules = 0;
struct transport_ls_refs_options transport_ls_refs_options =
TRANSPORT_LS_REFS_OPTIONS_INIT;
@@ -899,10 +915,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (option_bare) {
if (option_origin)
- die(_("--bare and --origin %s options are incompatible."),
- option_origin);
+ die(_("options '%s' and '%s %s' cannot be used together"),
+ "--bare", "--origin", option_origin);
if (real_git_dir)
- die(_("--bare and --separate-git-dir are incompatible."));
+ die(_("options '%s' and '%s' cannot be used together"), "--bare", "--separate-git-dir");
option_no_checkout = 1;
}
@@ -1039,8 +1055,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
init_db(git_dir, real_git_dir, option_template, GIT_HASH_UNKNOWN, NULL,
INIT_DB_QUIET);
- if (real_git_dir)
+ if (real_git_dir) {
+ free((char *)git_dir);
git_dir = real_git_dir;
+ }
/*
* additional config can be injected with -c, make sure it's included
@@ -1064,13 +1082,36 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
reject_shallow = option_reject_shallow;
/*
+ * If option_filter_submodules is specified from CLI option,
+ * ignore config_filter_submodules from git_clone_config.
+ */
+ if (config_filter_submodules != -1)
+ filter_submodules = config_filter_submodules;
+ if (option_filter_submodules != -1)
+ filter_submodules = option_filter_submodules;
+
+ /*
+ * Exit if the user seems to be doing something silly with submodule
+ * filter flags (but not with filter configs, as those should be
+ * set-and-forget).
+ */
+ if (option_filter_submodules > 0 && !filter_options.choice)
+ die(_("the option '%s' requires '%s'"),
+ "--also-filter-submodules", "--filter");
+ if (option_filter_submodules > 0 && !option_recurse_submodules.nr)
+ die(_("the option '%s' requires '%s'"),
+ "--also-filter-submodules", "--recurse-submodules");
+
+ /*
* apply the remote name provided by --origin only after this second
* call to git_config, to ensure it overrides all config-based values.
*/
- if (option_origin != NULL)
+ if (option_origin) {
+ free(remote_name);
remote_name = xstrdup(option_origin);
+ }
- if (remote_name == NULL)
+ if (!remote_name)
remote_name = xstrdup("origin");
if (!valid_remote_name(remote_name))
@@ -1134,6 +1175,18 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
warning(_("--local is ignored"));
transport->cloning = 1;
+ if (is_bundle) {
+ struct bundle_header header = BUNDLE_HEADER_INIT;
+ int fd = read_bundle_header(path, &header);
+ int has_filter = header.filter.choice != LOFC_DISABLED;
+
+ if (fd > 0)
+ close(fd);
+ bundle_header_release(&header);
+ if (has_filter)
+ die(_("cannot clone from filtered bundle"));
+ }
+
transport_set_option(transport, TRANS_OPT_KEEP, "yes");
if (reject_shallow)
@@ -1181,7 +1234,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
refs = transport_get_remote_refs(transport, &transport_ls_refs_options);
- if (refs) {
+ if (refs)
+ mapped_refs = wanted_peer_refs(refs, &remote->fetch);
+
+ if (mapped_refs) {
int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
/*
@@ -1190,8 +1246,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
*/
initialize_repository_version(hash_algo, 1);
repo_set_hash_algo(the_repository, hash_algo);
-
- mapped_refs = wanted_peer_refs(refs, &remote->fetch);
/*
* transport_get_remote_refs() may return refs with null sha-1
* in mapped_refs (see struct transport->get_refs_list
@@ -1230,14 +1284,14 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
}
else {
const char *branch;
- char *ref;
+ const char *ref;
+ char *ref_free = NULL;
if (option_branch)
die(_("Remote branch %s not found in upstream %s"),
option_branch, remote_name);
warning(_("You appear to have cloned an empty repository."));
- mapped_refs = NULL;
our_head_points_at = NULL;
remote_head_points_at = NULL;
remote_head = NULL;
@@ -1247,17 +1301,16 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
skip_prefix(transport_ls_refs_options.unborn_head_target,
"refs/heads/", &branch)) {
ref = transport_ls_refs_options.unborn_head_target;
- transport_ls_refs_options.unborn_head_target = NULL;
create_symref("HEAD", ref, reflog_msg.buf);
} else {
branch = git_default_branch_name(0);
- ref = xstrfmt("refs/heads/%s", branch);
+ ref_free = xstrfmt("refs/heads/%s", branch);
+ ref = ref_free;
}
if (!option_bare)
install_branch_config(0, branch, remote_name, ref);
-
- free(ref);
+ free(ref_free);
}
write_refspec_config(src_ref_prefix, our_head_points_at,
@@ -1268,7 +1321,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (is_local)
clone_local(path, git_dir);
- else if (refs && complete_refs_before_fetch) {
+ else if (mapped_refs && complete_refs_before_fetch) {
if (transport_fetch_refs(transport, mapped_refs))
die(_("remote transport reported error"));
}
@@ -1287,7 +1340,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
*/
submodule_progress = transport->progress;
- transport_unlock_pack(transport);
+ transport_unlock_pack(transport, 0);
transport_disconnect(transport);
if (option_dissociate) {
@@ -1296,7 +1349,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
}
junk_mode = JUNK_LEAVE_REPO;
- err = checkout(submodule_progress);
+ err = checkout(submodule_progress, filter_submodules);
free(remote_name);
strbuf_release(&reflog_msg);
@@ -1309,7 +1362,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
UNLEAK(repo);
junk_mode = JUNK_LEAVE_ALL;
- strvec_clear(&transport_ls_refs_options.ref_prefixes);
- free(transport_ls_refs_options.unborn_head_target);
+ transport_ls_refs_options_release(&transport_ls_refs_options);
return err;
}
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 3c3de3a..51c4040 100644
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -172,8 +172,8 @@ static int write_option_max_new_filters(const struct option *opt,
const char *s;
*to = strtol(arg, (char **)&s, 10);
if (*s)
- return error(_("%s expects a numerical value"),
- optname(opt, opt->flags));
+ return error(_("option `%s' expects a numerical value"),
+ "max-new-filters");
}
return 0;
}
@@ -192,7 +192,7 @@ static int git_commit_graph_write_config(const char *var, const char *value,
static int graph_write(int argc, const char **argv)
{
- struct string_list pack_indexes = STRING_LIST_INIT_NODUP;
+ struct string_list pack_indexes = STRING_LIST_INIT_DUP;
struct strbuf buf = STRBUF_INIT;
struct oidset commits = OIDSET_INIT;
struct object_directory *odb = NULL;
@@ -263,7 +263,6 @@ static int graph_write(int argc, const char **argv)
git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0))
flags |= COMMIT_GRAPH_WRITE_BLOOM_FILTERS;
- read_replace_refs = 0;
odb = find_odb(the_repository, opts.obj_dir);
if (opts.reachable) {
@@ -274,8 +273,8 @@ static int graph_write(int argc, const char **argv)
if (opts.stdin_packs) {
while (strbuf_getline(&buf, stdin) != EOF)
- string_list_append(&pack_indexes,
- strbuf_detach(&buf, NULL));
+ string_list_append_nodup(&pack_indexes,
+ strbuf_detach(&buf, NULL));
} else if (opts.stdin_commits) {
oidset_init(&commits, 0);
if (opts.progress)
@@ -318,6 +317,7 @@ int cmd_commit_graph(int argc, const char **argv, const char *prefix)
if (!argc)
goto usage;
+ read_replace_refs = 0;
save_commit_buffer = 0;
if (!strcmp(argv[0], "verify"))
diff --git a/builtin/commit.c b/builtin/commit.c
index e7320f6..fcf9c85 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -19,6 +19,7 @@
#include "revision.h"
#include "wt-status.h"
#include "run-command.h"
+#include "hook.h"
#include "refs.h"
#include "log-tree.h"
#include "strbuf.h"
@@ -36,6 +37,7 @@
#include "help.h"
#include "commit-reach.h"
#include "commit-graph.h"
+#include "pretty.h"
static const char * const builtin_commit_usage[] = {
N_("git commit [<options>] [--] <pathspec>..."),
@@ -354,19 +356,19 @@ static const char *prepare_index(const char **argv, const char *prefix,
if (pathspec_from_file) {
if (interactive)
- die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
+ die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch");
if (all)
- die(_("--pathspec-from-file with -a does not make sense"));
+ die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "-a");
if (pathspec.nr)
- die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+ die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
parse_pathspec_file(&pathspec, 0,
PATHSPEC_PREFER_FULL,
prefix, pathspec_from_file, pathspec_file_nul);
} else if (pathspec_file_nul) {
- die(_("--pathspec-file-nul requires --pathspec-from-file"));
+ die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
}
if (!pathspec.nr && (also || (only && !allow_empty &&
@@ -724,11 +726,13 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
int clean_message_contents = (cleanup_mode != COMMIT_MSG_CLEANUP_NONE);
int old_display_comment_prefix;
int merge_contains_scissors = 0;
+ int invoked_hook;
/* This checks and barfs if author is badly specified */
determine_author_info(author_ident);
- if (!no_verify && run_commit_hook(use_editor, index_file, "pre-commit", NULL))
+ if (!no_verify && run_commit_hook(use_editor, index_file, &invoked_hook,
+ "pre-commit", NULL))
return 0;
if (squash_message) {
@@ -798,7 +802,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
if (!strcmp(fixup_prefix, "amend")) {
if (have_option_m)
- die(_("cannot combine -m with --fixup:%s"), fixup_message);
+ die(_("options '%s' and '%s:%s' cannot be used together"), "-m", "--fixup", fixup_message);
prepare_amend_commit(commit, &sb, &ctx);
}
} else if (!stat(git_path_merge_msg(the_repository), &statbuf)) {
@@ -857,7 +861,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
}
s->fp = fopen_for_writing(git_path_commit_editmsg());
- if (s->fp == NULL)
+ if (!s->fp)
die_errno(_("could not open '%s'"), git_path_commit_editmsg());
/* Ignore status.displayCommentPrefix: we do need comments in COMMIT_EDITMSG. */
@@ -1051,10 +1055,10 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
return 0;
}
- if (!no_verify && find_hook("pre-commit")) {
+ if (!no_verify && invoked_hook) {
/*
- * Re-read the index as pre-commit hook could have updated it,
- * and write it out as a tree. We must do this before we invoke
+ * Re-read the index as the pre-commit-commit hook was invoked
+ * and could have updated it. We must do this before we invoke
* the editor and after we invoke run_status above.
*/
discard_cache();
@@ -1066,7 +1070,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
return 0;
}
- if (run_commit_hook(use_editor, index_file, "prepare-commit-msg",
+ if (run_commit_hook(use_editor, index_file, NULL, "prepare-commit-msg",
git_path_commit_editmsg(), hook_arg1, hook_arg2, NULL))
return 0;
@@ -1083,7 +1087,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
}
if (!no_verify &&
- run_commit_hook(use_editor, index_file, "commit-msg", git_path_commit_editmsg(), NULL)) {
+ run_commit_hook(use_editor, index_file, NULL, "commit-msg",
+ git_path_commit_editmsg(), NULL)) {
return 0;
}
@@ -1095,7 +1100,6 @@ static const char *find_author_by_nickname(const char *name)
struct rev_info revs;
struct commit *commit;
struct strbuf buf = STRBUF_INIT;
- struct string_list mailmap = STRING_LIST_INIT_NODUP;
const char *av[20];
int ac = 0;
@@ -1106,7 +1110,8 @@ static const char *find_author_by_nickname(const char *name)
av[++ac] = buf.buf;
av[++ac] = NULL;
setup_revisions(ac, av, &revs, NULL);
- revs.mailmap = &mailmap;
+ revs.mailmap = xmalloc(sizeof(struct string_list));
+ string_list_init_nodup(revs.mailmap);
read_mailmap(revs.mailmap);
if (prepare_revision_walk(&revs))
@@ -1117,7 +1122,7 @@ static const char *find_author_by_nickname(const char *name)
ctx.date_mode.type = DATE_NORMAL;
strbuf_release(&buf);
format_commit_message(commit, "%aN <%aE>", &buf, &ctx);
- clear_mailmap(&mailmap);
+ release_revisions(&revs);
return strbuf_detach(&buf, NULL);
}
die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name);
@@ -1192,7 +1197,7 @@ static void finalize_deferred_config(struct wt_status *s)
status_format == STATUS_FORMAT_UNSPECIFIED)
status_format = STATUS_FORMAT_PORCELAIN;
else if (status_format == STATUS_FORMAT_LONG)
- die(_("--long and -z are incompatible"));
+ die(_("options '%s' and '%s' cannot be used together"), "--long", "-z");
}
if (use_deferred_config && status_format == STATUS_FORMAT_UNSPECIFIED)
@@ -1228,9 +1233,10 @@ static void check_fixup_reword_options(int argc, const char *argv[]) {
die(_("You are in the middle of a cherry-pick -- cannot reword."));
}
if (argc)
- die(_("cannot combine reword option of --fixup with path '%s'"), *argv);
+ die(_("reword option of '%s' and path '%s' cannot be used together"), "--fixup", *argv);
if (patch_interactive || interactive || all || also || only)
- die(_("reword option of --fixup is mutually exclusive with --patch/--interactive/--all/--include/--only"));
+ die(_("reword option of '%s' and '%s' cannot be used together"),
+ "--fixup", "--patch/--interactive/--all/--include/--only");
}
static int parse_and_validate_options(int argc, const char *argv[],
@@ -1240,8 +1246,6 @@ static int parse_and_validate_options(int argc, const char *argv[],
struct commit *current_head,
struct wt_status *s)
{
- int f = 0;
-
argc = parse_options(argc, argv, prefix, options, usage, 0);
finalize_deferred_config(s);
@@ -1249,7 +1253,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
force_author = find_author_by_nickname(force_author);
if (force_author && renew_authorship)
- die(_("Using both --reset-author and --author does not make sense"));
+ die(_("options '%s' and '%s' cannot be used together"), "--reset-author", "--author");
if (logfile || have_option_m || use_message)
use_editor = 0;
@@ -1266,20 +1270,16 @@ static int parse_and_validate_options(int argc, const char *argv[],
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"));
- if (use_message)
- f++;
- if (edit_message)
- f++;
- if (fixup_message)
- f++;
- if (logfile)
- f++;
- if (f > 1)
- die(_("Only one of -c/-C/-F/--fixup can be used."));
- if (have_option_m && (edit_message || use_message || logfile))
- die((_("Option -m cannot be combined with -c/-C/-F.")));
- if (f || have_option_m)
+ die(_("options '%s' and '%s' cannot be used together"), "--squash", "--fixup");
+ die_for_incompatible_opt4(!!use_message, "-C",
+ !!edit_message, "-c",
+ !!logfile, "-F",
+ !!fixup_message, "--fixup");
+ die_for_incompatible_opt4(have_option_m, "-m",
+ !!edit_message, "-c",
+ !!use_message, "-C",
+ !!logfile, "-F");
+ if (use_message || edit_message || logfile ||fixup_message || have_option_m)
template_file = NULL;
if (edit_message)
use_message = edit_message;
@@ -1304,9 +1304,10 @@ static int parse_and_validate_options(int argc, const char *argv[],
if (patch_interactive)
interactive = 1;
- if (also + only + all + interactive > 1)
- die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
-
+ die_for_incompatible_opt4(also, "-i/--include",
+ only, "-o/--only",
+ all, "-a/--all",
+ interactive, "--interactive/-p/--patch");
if (fixup_message) {
/*
* We limit --fixup's suboptions to only alpha characters.
@@ -1686,6 +1687,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
struct commit *current_head = NULL;
struct commit_extra_header *extra = NULL;
struct strbuf err = STRBUF_INIT;
+ int ret = 0;
if (argc == 2 && !strcmp(argv[1], "-h"))
usage_with_options(builtin_commit_usage, builtin_commit_options);
@@ -1720,8 +1722,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
running hooks, writing the trees, and interacting with the user. */
if (!prepare_to_commit(index_file, prefix,
current_head, &s, &author_ident)) {
+ ret = 1;
rollback_index_files();
- return 1;
+ goto cleanup;
}
/* Determine parents */
@@ -1819,7 +1822,6 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
rollback_index_files();
die(_("failed to write commit object"));
}
- strbuf_release(&author_ident);
free_commit_extra_headers(extra);
if (update_head_with_reflog(current_head, &oid, reflog_msg, &sb,
@@ -1843,7 +1845,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
repo_rerere(the_repository, 0);
run_auto_maintenance(quiet);
- run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
+ run_commit_hook(use_editor, get_index_file(), NULL, "post-commit",
+ NULL);
if (amend && !no_post_rewrite) {
commit_post_rewrite(the_repository, current_head, &oid);
}
@@ -1860,7 +1863,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
apply_autostash(git_path_merge_autostash(the_repository));
+cleanup:
+ UNLEAK(author_ident);
UNLEAK(err);
UNLEAK(sb);
- return 0;
+ return ret;
}
diff --git a/builtin/config.c b/builtin/config.c
index 865fddd..e7b88a9 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -151,7 +151,7 @@ static struct option builtin_config_options[] = {
OPT_BIT(0, "get-color", &actions, N_("find the color configured: slot [default]"), ACTION_GET_COLOR),
OPT_BIT(0, "get-colorbool", &actions, N_("find the color setting: slot [stdout-is-tty]"), ACTION_GET_COLORBOOL),
OPT_GROUP(N_("Type")),
- OPT_CALLBACK('t', "type", &type, "", N_("value is given this type"), option_parse_type),
+ OPT_CALLBACK('t', "type", &type, N_("type"), N_("value is given this type"), option_parse_type),
OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or \"false\""), TYPE_BOOL),
OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"), TYPE_INT),
OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or --int"), TYPE_BOOL_OR_INT),
@@ -575,7 +575,7 @@ static int get_urlmatch(const char *var, const char *url)
int ret;
char *section_tail;
struct string_list_item *item;
- struct urlmatch_config config = { STRING_LIST_INIT_DUP };
+ struct urlmatch_config config = URLMATCH_CONFIG_INIT;
struct string_list values = STRING_LIST_INIT_DUP;
config.collect_fn = urlmatch_collect_fn;
@@ -612,7 +612,7 @@ static int get_urlmatch(const char *var, const char *url)
strbuf_release(&matched->value);
}
- string_list_clear(&config.vars, 1);
+ urlmatch_config_release(&config);
string_list_clear(&values, 1);
free(config.url.url);
diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index 3fae474..07b9419 100644
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -87,7 +87,7 @@ static int print_alternate(struct object_directory *odb, void *data)
}
static char const * const count_objects_usage[] = {
- N_("git count-objects [-v] [-H | --human-readable]"),
+ "git count-objects [-v] [-H | --human-readable]",
NULL
};
diff --git a/builtin/credential.c b/builtin/credential.c
index d75dcdc..d7b304f 100644
--- a/builtin/credential.c
+++ b/builtin/credential.c
@@ -4,7 +4,7 @@
#include "config.h"
static const char usage_msg[] =
- "git credential [fill|approve|reject]";
+ "git credential (fill|approve|reject)";
int cmd_credential(int argc, const char **argv, const char *prefix)
{
diff --git a/builtin/describe.c b/builtin/describe.c
index e912ba5..a76f1a1 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -517,6 +517,7 @@ static void describe_blob(struct object_id oid, struct strbuf *dst)
traverse_commit_list(&revs, process_commit, process_object, &pcd);
reset_revision_walk();
+ release_revisions(&revs);
}
static void describe(const char *arg, int last_one)
@@ -590,7 +591,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
save_commit_buffer = 0;
if (longformat && abbrev == 0)
- die(_("--long is incompatible with --abbrev=0"));
+ die(_("options '%s' and '%s' cannot be used together"), "--long", "--abbrev=0");
if (contains) {
struct string_list_item *item;
@@ -667,12 +668,13 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
suffix = NULL;
else
suffix = dirty;
+ release_revisions(&revs);
}
describe("HEAD", 1);
} else if (dirty) {
- die(_("--dirty is incompatible with commit-ishes"));
+ die(_("option '%s' and commit-ishes cannot be used together"), "--dirty");
} else if (broken) {
- die(_("--broken is incompatible with commit-ishes"));
+ die(_("option '%s' and commit-ishes cannot be used together"), "--broken");
} else {
while (argc-- > 0)
describe(*argv++, argc == 0);
diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 70103c4..2bfaf9b 100644
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -77,8 +77,12 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
perror("read_cache_preload");
- return -1;
+ result = -1;
+ goto cleanup;
}
+cleanup:
result = run_diff_files(&rev, options);
- return diff_result_code(&rev.diffopt, result);
+ result = diff_result_code(&rev.diffopt, result);
+ release_revisions(&rev);
+ return result;
}
diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 5fd23ab..7d158af 100644
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -70,6 +70,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
return -1;
}
result = run_diff_index(&rev, option);
- UNLEAK(rev);
- return diff_result_code(&rev.diffopt, result);
+ result = diff_result_code(&rev.diffopt, result);
+ release_revisions(&rev);
+ return result;
}
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index f33d30d..116097a 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -152,7 +152,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
}
if (read_stdin && merge_base)
- die(_("--stdin and --merge-base are mutually exclusive"));
+ die(_("options '%s' and '%s' cannot be used together"), "--stdin", "--merge-base");
if (merge_base && opt->pending.nr != 2)
die(_("--merge-base only works with two commits"));
@@ -195,6 +195,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
int saved_dcctc = 0;
opt->diffopt.rotate_to_strict = 0;
+ opt->diffopt.no_free = 1;
if (opt->diffopt.detect_rename) {
if (!the_index.cache)
repo_read_index(the_repository);
@@ -217,6 +218,8 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
}
opt->diffopt.degraded_cc_to_c = saved_dcctc;
opt->diffopt.needed_rename_limit = saved_nrl;
+ opt->diffopt.no_free = 0;
+ diff_free(&opt->diffopt);
}
return diff_result_code(&opt->diffopt, 0);
diff --git a/builtin/diff.c b/builtin/diff.c
index dd8ce68..54bb3de 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -28,9 +28,9 @@ static const char builtin_diff_usage[] =
"git diff [<options>] [<commit>] [--] [<path>...]\n"
" or: git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
" or: git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
-" or: git diff [<options>] <commit>...<commit>] [--] [<path>...]\n"
-" or: git diff [<options>] <blob> <blob>]\n"
-" or: git diff [<options>] --no-index [--] <path> <path>]\n"
+" or: git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+" or: git diff [<options>] <blob> <blob>\n"
+" or: git diff [<options>] --no-index [--] <path> <path>\n"
COMMON_DIFF_OPTIONS_HELP;
static const char *blob_path(struct object_array_entry *entry)
@@ -352,7 +352,7 @@ static void symdiff_prepare(struct rev_info *rev, struct symdiff *sym)
othercount++;
continue;
}
- if (map == NULL)
+ if (!map)
map = bitmap_new();
bitmap_set(map, i);
}
@@ -437,6 +437,11 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
prefix = setup_git_directory_gently(&nongit);
+ if (!nongit) {
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+ }
+
if (!no_index) {
/*
* Treat git diff with at least one path outside of the
@@ -589,7 +594,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
result = diff_result_code(&rev.diffopt, result);
if (1 < rev.diffopt.skip_stat_unmatch)
refresh_index_quietly();
- UNLEAK(rev);
+ release_revisions(&rev);
UNLEAK(ent);
UNLEAK(blob);
return result;
diff --git a/builtin/difftool.c b/builtin/difftool.c
index 4931c10..b3c509b 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -202,15 +202,10 @@ static void changed_files(struct hashmap *result, const char *index_path,
{
struct child_process update_index = CHILD_PROCESS_INIT;
struct child_process diff_files = CHILD_PROCESS_INIT;
- struct strbuf index_env = STRBUF_INIT, buf = STRBUF_INIT;
- const char *git_dir = absolute_path(get_git_dir()), *env[] = {
- NULL, NULL
- };
+ struct strbuf buf = STRBUF_INIT;
+ const char *git_dir = absolute_path(get_git_dir());
FILE *fp;
- strbuf_addf(&index_env, "GIT_INDEX_FILE=%s", index_path);
- env[0] = index_env.buf;
-
strvec_pushl(&update_index.args,
"--git-dir", git_dir, "--work-tree", workdir,
"update-index", "--really-refresh", "-q",
@@ -222,7 +217,7 @@ static void changed_files(struct hashmap *result, const char *index_path,
update_index.use_shell = 0;
update_index.clean_on_exit = 1;
update_index.dir = workdir;
- update_index.env = env;
+ strvec_pushf(&update_index.env, "GIT_INDEX_FILE=%s", index_path);
/* Ignore any errors of update-index */
run_command(&update_index);
@@ -235,7 +230,7 @@ static void changed_files(struct hashmap *result, const char *index_path,
diff_files.clean_on_exit = 1;
diff_files.out = -1;
diff_files.dir = workdir;
- diff_files.env = env;
+ strvec_pushf(&diff_files.env, "GIT_INDEX_FILE=%s", index_path);
if (start_command(&diff_files))
die("could not obtain raw diff");
fp = xfdopen(diff_files.out, "r");
@@ -248,7 +243,6 @@ static void changed_files(struct hashmap *result, const char *index_path,
fclose(fp);
if (finish_command(&diff_files))
die("diff-files did not exit properly");
- strbuf_release(&index_env);
strbuf_release(&buf);
}
@@ -681,7 +675,7 @@ static int run_file_diff(int prompt, const char *prefix,
child->git_cmd = 1;
child->dir = prefix;
- strvec_pushv(&child->env_array, env);
+ strvec_pushv(&child->env, env);
return run_command(child);
}
@@ -736,10 +730,11 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
setenv(GIT_DIR_ENVIRONMENT, absolute_path(get_git_dir()), 1);
setenv(GIT_WORK_TREE_ENVIRONMENT, absolute_path(get_git_work_tree()), 1);
} else if (dir_diff)
- die(_("--dir-diff is incompatible with --no-index"));
+ die(_("options '%s' and '%s' cannot be used together"), "--dir-diff", "--no-index");
- if (use_gui_tool + !!difftool_cmd + !!extcmd > 1)
- die(_("--gui, --tool and --extcmd are mutually exclusive"));
+ die_for_incompatible_opt3(use_gui_tool, "--gui",
+ !!difftool_cmd, "--tool",
+ !!extcmd, "--extcmd");
if (use_gui_tool)
setenv("GIT_MERGETOOL_GUI", "true", 1);
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 95e8e89..e1748fb 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -26,7 +26,7 @@
#include "commit-slab.h"
static const char *fast_export_usage[] = {
- N_("git fast-export [rev-list-opts]"),
+ N_("git fast-export [<rev-list-opts>]"),
NULL
};
@@ -107,18 +107,6 @@ static int parse_opt_reencode_mode(const struct option *opt,
static struct decoration idnums;
static uint32_t last_idnum;
-
-static int has_unshown_parent(struct commit *commit)
-{
- struct commit_list *parent;
-
- for (parent = commit->parents; parent; parent = parent->next)
- if (!(parent->item->object.flags & SHOWN) &&
- !(parent->item->object.flags & UNINTERESTING))
- return 1;
- return 0;
-}
-
struct anonymized_entry {
struct hashmap_entry hash;
const char *anon;
@@ -312,7 +300,7 @@ static void export_blob(const struct object_id *oid)
if (!buf)
die("could not read blob %s", oid_to_hex(oid));
if (check_object_signature(the_repository, oid, buf, size,
- type_name(type)) < 0)
+ type) < 0)
die("oid mismatch in blob %s", oid_to_hex(oid));
object = parse_object_buffer(the_repository, oid, type,
size, buf, &eaten);
@@ -752,20 +740,6 @@ static char *anonymize_tag(void *data)
return strbuf_detach(&out, NULL);
}
-static void handle_tail(struct object_array *commits, struct rev_info *revs,
- struct string_list *paths_of_changed_objects)
-{
- struct commit *commit;
- while (commits->nr) {
- commit = (struct commit *)object_array_pop(commits);
- if (has_unshown_parent(commit)) {
- /* Queue again, to be handled later */
- add_object_array(&commit->object, NULL, commits);
- return;
- }
- handle_commit(commit, revs, paths_of_changed_objects);
- }
-}
static void handle_tag(const char *name, struct tag *tag)
{
@@ -1185,7 +1159,6 @@ static int parse_opt_anonymize_map(const struct option *opt,
int cmd_fast_export(int argc, const char **argv, const char *prefix)
{
struct rev_info revs;
- struct object_array commits = OBJECT_ARRAY_INIT;
struct commit *commit;
char *export_filename = NULL,
*import_filename = NULL,
@@ -1254,7 +1227,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
usage_with_options (fast_export_usage, options);
if (anonymized_seeds.cmpfn && !anonymize)
- die(_("--anonymize-map without --anonymize does not make sense"));
+ die(_("the option '%s' requires '%s'"), "--anonymize-map", "--anonymize");
if (refspecs_list.nr) {
int i;
@@ -1269,7 +1242,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
printf("feature done\n");
if (import_filename && import_filename_if_exists)
- die(_("Cannot pass both --import-marks and --import-marks-if-exists"));
+ die(_("options '%s' and '%s' cannot be used together"), "--import-marks", "--import-marks-if-exists");
if (import_filename)
import_marks(import_filename, 0);
else if (import_filename_if_exists)
@@ -1283,18 +1256,14 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
if (prepare_revision_walk(&revs))
die("revision walk setup failed");
+
+ revs.reverse = 1;
revs.diffopt.format_callback = show_filemodify;
revs.diffopt.format_callback_data = &paths_of_changed_objects;
revs.diffopt.flags.recursive = 1;
- while ((commit = get_revision(&revs))) {
- if (has_unshown_parent(commit)) {
- add_object_array(&commit->object, NULL, &commits);
- }
- else {
- handle_commit(commit, &revs, &paths_of_changed_objects);
- handle_tail(&commits, &revs, &paths_of_changed_objects);
- }
- }
+ revs.diffopt.no_free = 1;
+ while ((commit = get_revision(&revs)))
+ handle_commit(commit, &revs, &paths_of_changed_objects);
handle_tags_and_duplicates(&extra_refs);
handle_tags_and_duplicates(&tag_refs);
@@ -1307,6 +1276,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
printf("done\n");
refspec_clear(&refspecs);
+ release_revisions(&revs);
return 0;
}
diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 20406f6..28d3193 100644
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -19,6 +19,7 @@
#include "mem-pool.h"
#include "commit-reach.h"
#include "khash.h"
+#include "date.h"
#define PACK_ID_BITS 16
#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
@@ -176,8 +177,9 @@ static int global_argc;
static const char **global_argv;
/* Memory pools */
-static struct mem_pool fi_mem_pool = {NULL, 2*1024*1024 -
- sizeof(struct mp_block), 0 };
+static struct mem_pool fi_mem_pool = {
+ .block_alloc = 2*1024*1024 - sizeof(struct mp_block),
+};
/* Atom management */
static unsigned int atom_table_sz = 4451;
@@ -205,7 +207,9 @@ static int import_marks_file_done;
static int relative_marks_paths;
/* Our last blob */
-static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
+static struct last_object last_blob = {
+ .data = STRBUF_INIT,
+ };
/* Tree management */
static unsigned int tree_entry_alloc = 1000;
@@ -231,7 +235,10 @@ static struct tag *last_tag;
static whenspec_type whenspec = WHENSPEC_RAW;
static struct strbuf command_buf = STRBUF_INIT;
static int unread_command_buf;
-static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
+static struct recent_command cmd_hist = {
+ .prev = &cmd_hist,
+ .next = &cmd_hist,
+};
static struct recent_command *cmd_tail = &cmd_hist;
static struct recent_command *rc_free;
static unsigned int cmd_save = 100;
@@ -401,16 +408,18 @@ static void dump_marks(void);
static NORETURN void die_nicely(const char *err, va_list params)
{
+ va_list cp;
static int zombie;
- char message[2 * PATH_MAX];
+ report_fn die_message_fn = get_die_message_routine();
- vsnprintf(message, sizeof(message), err, params);
- fputs("fatal: ", stderr);
- fputs(message, stderr);
- fputc('\n', stderr);
+ va_copy(cp, params);
+ die_message_fn(err, params);
if (!zombie) {
+ char message[2 * PATH_MAX];
+
zombie = 1;
+ vsnprintf(message, sizeof(message), err, cp);
write_crash_report(message);
end_packfile();
unkeep_all_packs();
@@ -856,7 +865,7 @@ static void end_packfile(void)
struct tag *t;
close_pack_windows(pack_data);
- finalize_hashfile(pack_file, cur_pack_oid.hash, 0);
+ finalize_hashfile(pack_file, cur_pack_oid.hash, FSYNC_COMPONENT_PACK, 0);
fixup_pack_header_footer(pack_data->pack_fd, pack_data->hash,
pack_data->pack_name, object_count,
cur_pack_oid.hash, pack_size);
@@ -935,8 +944,8 @@ static int store_object(
git_hash_ctx c;
git_zstream s;
- hdrlen = xsnprintf((char *)hdr, sizeof(hdr), "%s %lu",
- type_name(type), (unsigned long)dat->len) + 1;
+ hdrlen = format_object_header((char *)hdr, sizeof(hdr), type,
+ dat->len);
the_hash_algo->init_fn(&c);
the_hash_algo->update_fn(&c, hdr, hdrlen);
the_hash_algo->update_fn(&c, dat->buf, dat->len);
@@ -1089,7 +1098,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
hashfile_checkpoint(pack_file, &checkpoint);
offset = checkpoint.offset;
- hdrlen = xsnprintf((char *)out_buf, out_sz, "blob %" PRIuMAX, len) + 1;
+ hdrlen = format_object_header((char *)out_buf, out_sz, OBJ_BLOB, len);
the_hash_algo->init_fn(&c);
the_hash_algo->update_fn(&c, out_buf, hdrlen);
@@ -2481,7 +2490,7 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
unsigned long size;
char *buf = read_object_with_reference(the_repository,
&commit_oid,
- commit_type, &size,
+ OBJ_COMMIT, &size,
&commit_oid);
if (!buf || size < the_hash_algo->hexsz + 6)
die("Not a valid commit: %s", p);
@@ -2553,7 +2562,7 @@ static void parse_from_existing(struct branch *b)
char *buf;
buf = read_object_with_reference(the_repository,
- &b->oid, commit_type, &size,
+ &b->oid, OBJ_COMMIT, &size,
&b->oid);
parse_from_commit(b, buf, size);
free(buf);
@@ -2649,7 +2658,7 @@ static struct hash_list *parse_merge(unsigned int *count)
unsigned long size;
char *buf = read_object_with_reference(the_repository,
&n->oid,
- commit_type,
+ OBJ_COMMIT,
&size, &n->oid);
if (!buf || size < the_hash_algo->hexsz + 6)
die("Not a valid commit: %s", from);
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index c2d96f4..f045bbb 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -153,11 +153,15 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
args.from_promisor = 1;
continue;
}
- if (skip_prefix(arg, ("--" CL_ARG__FILTER "="), &arg)) {
+ if (!strcmp("--refetch", arg)) {
+ args.refetch = 1;
+ continue;
+ }
+ if (skip_prefix(arg, ("--filter="), &arg)) {
parse_list_objects_filter(&args.filter_options, arg);
continue;
}
- if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) {
+ if (!strcmp(arg, ("--no-filter"))) {
list_objects_filter_set_no_filter(&args.filter_options);
continue;
}
diff --git a/builtin/fetch.c b/builtin/fetch.c
index f7abbc3..ac29c2b 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -28,6 +28,7 @@
#include "promisor-remote.h"
#include "commit-graph.h"
#include "shallow.h"
+#include "worktree.h"
#define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
@@ -58,7 +59,7 @@ static int prune_tags = -1; /* unspecified */
static int all, append, dry_run, force, keep, multiple, update_head_ok;
static int write_fetch_head = 1;
-static int verbosity, deepen_relative, set_upstream;
+static int verbosity, deepen_relative, set_upstream, refetch;
static int progress = -1;
static int enable_auto_gc = 1;
static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
@@ -75,6 +76,7 @@ static struct transport *gtransport;
static struct transport *gsecondary;
static const char *submodule_prefix = "";
static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
+static int recurse_submodules_cli = RECURSE_SUBMODULES_DEFAULT;
static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;
static int shown_url = 0;
static struct refspec refmap = REFSPEC_INIT_FETCH;
@@ -166,7 +168,7 @@ static struct option builtin_fetch_options[] = {
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")),
- OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
+ OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules_cli, N_("on-demand"),
N_("control recursive fetching of submodules"),
PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules),
OPT_BOOL(0, "dry-run", &dry_run,
@@ -188,6 +190,9 @@ static struct option builtin_fetch_options[] = {
OPT_SET_INT_F(0, "unshallow", &unshallow,
N_("convert to a complete repository"),
1, PARSE_OPT_NONEG),
+ OPT_SET_INT_F(0, "refetch", &refetch,
+ N_("re-fetch without negotiating common commits"),
+ 1, PARSE_OPT_NONEG),
{ OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
OPT_CALLBACK_F(0, "recurse-submodules-default",
@@ -222,17 +227,22 @@ static struct option builtin_fetch_options[] = {
OPT_END()
};
-static void unlock_pack(void)
+static void unlock_pack(unsigned int flags)
{
if (gtransport)
- transport_unlock_pack(gtransport);
+ transport_unlock_pack(gtransport, flags);
if (gsecondary)
- transport_unlock_pack(gsecondary);
+ transport_unlock_pack(gsecondary, flags);
+}
+
+static void unlock_pack_atexit(void)
+{
+ unlock_pack(0);
}
static void unlock_pack_on_signal(int signo)
{
- unlock_pack();
+ unlock_pack(TRANSPORT_UNLOCK_PACK_IN_SIGNAL_HANDLER);
sigchain_pop(signo);
raise(signo);
}
@@ -342,7 +352,19 @@ static void clear_item(struct refname_hash_entry *item)
item->ignore = 1;
}
+
+static void add_already_queued_tags(const char *refname,
+ const struct object_id *old_oid,
+ const struct object_id *new_oid,
+ void *cb_data)
+{
+ struct hashmap *queued_tags = cb_data;
+ if (starts_with(refname, "refs/tags/") && new_oid)
+ (void) refname_hash_add(queued_tags, refname, new_oid);
+}
+
static void find_non_local_tags(const struct ref *refs,
+ struct ref_transaction *transaction,
struct ref **head,
struct ref ***tail)
{
@@ -360,6 +382,16 @@ static void find_non_local_tags(const struct ref *refs,
create_fetch_oidset(head, &fetch_oids);
for_each_ref(add_one_refname, &existing_refs);
+
+ /*
+ * If we already have a transaction, then we need to filter out all
+ * tags which have already been queued up.
+ */
+ if (transaction)
+ ref_transaction_for_each_queued_update(transaction,
+ add_already_queued_tags,
+ &existing_refs);
+
for (ref = refs; ref; ref = ref->next) {
if (!starts_with(ref->name, "refs/tags/"))
continue;
@@ -552,7 +584,7 @@ static struct ref *get_ref_map(struct remote *remote,
for (i = 0; i < fetch_refspec->nr; i++)
get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1);
} else if (refmap.nr) {
- die("--refmap option is only meaningful with command-line refspec(s).");
+ die("--refmap option is only meaningful with command-line refspec(s)");
} else {
/* Use the defaults */
struct branch *branch = branch_get(NULL);
@@ -583,7 +615,7 @@ static struct ref *get_ref_map(struct remote *remote,
} else if (!prefetch) {
ref_map = get_remote_ref(remote_refs, "HEAD");
if (!ref_map)
- die(_("Couldn't find remote ref HEAD"));
+ die(_("couldn't find remote ref HEAD"));
ref_map->fetch_head_status = FETCH_HEAD_MERGE;
tail = &ref_map->next;
}
@@ -593,7 +625,7 @@ static struct ref *get_ref_map(struct remote *remote,
/* also fetch all tags */
get_fetch_map(remote_refs, tag_refspec, &tail, 0);
else if (tags == TAGS_DEFAULT && *autotags)
- find_non_local_tags(remote_refs, &ref_map, &tail);
+ find_non_local_tags(remote_refs, NULL, &ref_map, &tail);
/* Now append any refs to be updated opportunistically: */
*tail = orefs;
@@ -757,8 +789,8 @@ static void prepare_format_display(struct ref *ref_map)
else if (!strcasecmp(format, "compact"))
compact_format = 1;
else
- die(_("configuration fetch.output contains invalid value %s"),
- format);
+ die(_("invalid value for '%s': '%s'"),
+ "fetch.output", format);
for (rm = ref_map; rm; rm = rm->next) {
if (rm->status == REF_STATUS_REJECT_SHALLOW ||
@@ -848,13 +880,12 @@ static void format_display(struct strbuf *display, char code,
static int update_local_ref(struct ref *ref,
struct ref_transaction *transaction,
- const char *remote,
- const struct ref *remote_ref,
- struct strbuf *display,
- int summary_width)
+ const char *remote, const struct ref *remote_ref,
+ struct strbuf *display, int summary_width,
+ struct worktree **worktrees)
{
struct commit *current = NULL, *updated;
- struct branch *current_branch = branch_get(NULL);
+ const struct worktree *wt;
const char *pretty_ref = prettify_refname(ref->name);
int fast_forward = 0;
@@ -868,16 +899,17 @@ static int update_local_ref(struct ref *ref,
return 0;
}
- if (current_branch &&
- !strcmp(ref->name, current_branch->name) &&
- !(update_head_ok || is_bare_repository()) &&
- !is_null_oid(&ref->old_oid)) {
+ if (!update_head_ok &&
+ (wt = find_shared_symref(worktrees, "HEAD", ref->name)) &&
+ !wt->is_bare && !is_null_oid(&ref->old_oid)) {
/*
* If this is the head, and it's not okay to update
* the head, and the old value of the head isn't empty...
*/
format_display(display, '!', _("[rejected]"),
- _("can't fetch in current branch"),
+ wt->is_current ?
+ _("can't fetch in current branch") :
+ _("checked out in another worktree"),
remote, pretty_ref, summary_width);
return 1;
}
@@ -995,7 +1027,7 @@ static int open_fetch_head(struct fetch_head *fetch_head)
if (write_fetch_head) {
fetch_head->fp = fopen(filename, "a");
if (!fetch_head->fp)
- return error_errno(_("cannot open %s"), filename);
+ return error_errno(_("cannot open '%s'"), filename);
strbuf_init(&fetch_head->buf, 0);
} else {
fetch_head->fp = NULL;
@@ -1067,30 +1099,29 @@ static void close_fetch_head(struct fetch_head *fetch_head)
}
static const char warn_show_forced_updates[] =
-N_("Fetch normally indicates which branches had a forced update,\n"
- "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
- "flag or run 'git config fetch.showForcedUpdates true'.");
+N_("fetch normally indicates which branches had a forced update,\n"
+ "but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+ "flag or run 'git config fetch.showForcedUpdates true'");
static const char warn_time_show_forced_updates[] =
-N_("It took %.2f seconds to check forced updates. You can use\n"
+N_("it took %.2f seconds to check forced updates; you can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
- " to avoid this check.\n");
+ "to avoid this check\n");
static int store_updated_refs(const char *raw_url, const char *remote_name,
- int connectivity_checked, struct ref *ref_map)
+ int connectivity_checked,
+ struct ref_transaction *transaction, struct ref *ref_map,
+ struct fetch_head *fetch_head, struct worktree **worktrees)
{
- struct fetch_head fetch_head;
int url_len, i, rc = 0;
struct strbuf note = STRBUF_INIT, err = STRBUF_INIT;
- struct ref_transaction *transaction = NULL;
const char *what, *kind;
struct ref *rm;
char *url;
int want_status;
- int summary_width = transport_summary_width(ref_map);
+ int summary_width = 0;
- rc = open_fetch_head(&fetch_head);
- if (rc)
- return -1;
+ if (verbosity >= 0)
+ summary_width = transport_summary_width(ref_map);
if (raw_url)
url = transport_anonymize_url(raw_url);
@@ -1107,14 +1138,6 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
}
}
- if (atomic_fetch) {
- transaction = ref_transaction_begin(&err);
- if (!transaction) {
- error("%s", err.buf);
- goto abort;
- }
- }
-
prepare_format_display(ref_map);
/*
@@ -1126,7 +1149,6 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
want_status <= FETCH_HEAD_IGNORE;
want_status++) {
for (rm = ref_map; rm; rm = rm->next) {
- struct commit *commit = NULL;
struct ref *ref = NULL;
if (rm->status == REF_STATUS_REJECT_SHALLOW) {
@@ -1137,21 +1159,34 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
}
/*
- * References in "refs/tags/" are often going to point
- * to annotated tags, which are not part of the
- * commit-graph. We thus only try to look up refs in
- * the graph which are not in that namespace to not
- * regress performance in repositories with many
- * annotated tags.
+ * When writing FETCH_HEAD we need to determine whether
+ * we already have the commit or not. If not, then the
+ * reference is not for merge and needs to be written
+ * to the reflog after other commits which we already
+ * have. We're not interested in this property though
+ * in case FETCH_HEAD is not to be updated, so we can
+ * skip the classification in that case.
*/
- if (!starts_with(rm->name, "refs/tags/"))
- commit = lookup_commit_in_graph(the_repository, &rm->old_oid);
- if (!commit) {
- commit = lookup_commit_reference_gently(the_repository,
- &rm->old_oid,
- 1);
- if (!commit)
- rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
+ if (fetch_head->fp) {
+ struct commit *commit = NULL;
+
+ /*
+ * References in "refs/tags/" are often going to point
+ * to annotated tags, which are not part of the
+ * commit-graph. We thus only try to look up refs in
+ * the graph which are not in that namespace to not
+ * regress performance in repositories with many
+ * annotated tags.
+ */
+ if (!starts_with(rm->name, "refs/tags/"))
+ commit = lookup_commit_in_graph(the_repository, &rm->old_oid);
+ if (!commit) {
+ commit = lookup_commit_reference_gently(the_repository,
+ &rm->old_oid,
+ 1);
+ if (!commit)
+ rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
+ }
}
if (rm->fetch_head_status != want_status)
@@ -1198,14 +1233,15 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
strbuf_addf(¬e, "'%s' of ", what);
}
- append_fetch_head(&fetch_head, &rm->old_oid,
+ append_fetch_head(fetch_head, &rm->old_oid,
rm->fetch_head_status,
note.buf, url, url_len);
strbuf_reset(¬e);
if (ref) {
rc |= update_local_ref(ref, transaction, what,
- rm, ¬e, summary_width);
+ rm, ¬e, summary_width,
+ worktrees);
free(ref);
} else if (write_fetch_head || dry_run) {
/*
@@ -1229,17 +1265,6 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
}
}
- if (!rc && transaction) {
- rc = ref_transaction_commit(transaction, &err);
- if (rc) {
- error("%s", err.buf);
- goto abort;
- }
- }
-
- if (!rc)
- commit_fetch_head(&fetch_head);
-
if (rc & STORE_REF_ERROR_DF_CONFLICT)
error(_("some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting "
@@ -1257,9 +1282,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
abort:
strbuf_release(¬e);
strbuf_release(&err);
- ref_transaction_free(transaction);
free(url);
- close_fetch_head(&fetch_head);
return rc;
}
@@ -1285,6 +1308,14 @@ static int check_exist_and_connected(struct ref *ref_map)
return -1;
/*
+ * Similarly, if we need to refetch, we always want to perform a full
+ * fetch ignoring existing objects.
+ */
+ if (refetch)
+ return -1;
+
+
+ /*
* check_connected() allows objects to merely be promised, but
* we need all direct targets to exist.
*/
@@ -1298,7 +1329,11 @@ static int check_exist_and_connected(struct ref *ref_map)
return check_connected(iterate_ref_map, &rm, &opt);
}
-static int fetch_and_consume_refs(struct transport *transport, struct ref *ref_map)
+static int fetch_and_consume_refs(struct transport *transport,
+ struct ref_transaction *transaction,
+ struct ref *ref_map,
+ struct fetch_head *fetch_head,
+ struct worktree **worktrees)
{
int connectivity_checked = 1;
int ret;
@@ -1319,24 +1354,25 @@ static int fetch_and_consume_refs(struct transport *transport, struct ref *ref_m
}
trace2_region_enter("fetch", "consume_refs", the_repository);
- ret = store_updated_refs(transport->url,
- transport->remote->name,
- connectivity_checked,
- ref_map);
+ ret = store_updated_refs(transport->url, transport->remote->name,
+ connectivity_checked, transaction, ref_map,
+ fetch_head, worktrees);
trace2_region_leave("fetch", "consume_refs", the_repository);
out:
- transport_unlock_pack(transport);
+ transport_unlock_pack(transport, 0);
return ret;
}
-static int prune_refs(struct refspec *rs, struct ref *ref_map,
+static int prune_refs(struct refspec *rs,
+ struct ref_transaction *transaction,
+ struct ref *ref_map,
const char *raw_url)
{
int url_len, i, result = 0;
struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
+ struct strbuf err = STRBUF_INIT;
char *url;
- int summary_width = transport_summary_width(stale_refs);
const char *dangling_msg = dry_run
? _(" (%s will become dangling)")
: _(" (%s has become dangling)");
@@ -1355,16 +1391,27 @@ static int prune_refs(struct refspec *rs, struct ref *ref_map,
url_len = i - 3;
if (!dry_run) {
- struct string_list refnames = STRING_LIST_INIT_NODUP;
+ if (transaction) {
+ for (ref = stale_refs; ref; ref = ref->next) {
+ result = ref_transaction_delete(transaction, ref->name, NULL, 0,
+ "fetch: prune", &err);
+ if (result)
+ goto cleanup;
+ }
+ } else {
+ struct string_list refnames = STRING_LIST_INIT_NODUP;
- for (ref = stale_refs; ref; ref = ref->next)
- string_list_append(&refnames, ref->name);
+ for (ref = stale_refs; ref; ref = ref->next)
+ string_list_append(&refnames, ref->name);
- result = delete_refs("fetch: prune", &refnames, 0);
- string_list_clear(&refnames, 0);
+ result = delete_refs("fetch: prune", &refnames, 0);
+ string_list_clear(&refnames, 0);
+ }
}
if (verbosity >= 0) {
+ int summary_width = transport_summary_width(stale_refs);
+
for (ref = stale_refs; ref; ref = ref->next) {
struct strbuf sb = STRBUF_INIT;
if (!shown_url) {
@@ -1380,23 +1427,26 @@ static int prune_refs(struct refspec *rs, struct ref *ref_map,
}
}
+cleanup:
+ strbuf_release(&err);
free(url);
free_refs(stale_refs);
return result;
}
-static void check_not_current_branch(struct ref *ref_map)
+static void check_not_current_branch(struct ref *ref_map,
+ struct worktree **worktrees)
{
- struct branch *current_branch = branch_get(NULL);
-
- if (is_bare_repository() || !current_branch)
- return;
-
+ const struct worktree *wt;
for (; ref_map; ref_map = ref_map->next)
- if (ref_map->peer_ref && !strcmp(current_branch->refname,
- ref_map->peer_ref->name))
- die(_("Refusing to fetch into current branch %s "
- "of non-bare repository"), current_branch->refname);
+ if (ref_map->peer_ref &&
+ starts_with(ref_map->peer_ref->name, "refs/heads/") &&
+ (wt = find_shared_symref(worktrees, "HEAD",
+ ref_map->peer_ref->name)) &&
+ !wt->is_bare)
+ die(_("refusing to fetch into branch '%s' "
+ "checked out at '%s'"),
+ ref_map->peer_ref->name, wt->path);
}
static int truncate_fetch_head(void)
@@ -1405,7 +1455,7 @@ static int truncate_fetch_head(void)
FILE *fp = fopen_for_writing(filename);
if (!fp)
- return error_errno(_("cannot open %s"), filename);
+ return error_errno(_("cannot open '%s'"), filename);
fclose(fp);
return 0;
}
@@ -1414,10 +1464,10 @@ static void set_option(struct transport *transport, const char *name, const char
{
int r = transport_set_option(transport, name, value);
if (r < 0)
- die(_("Option \"%s\" value \"%s\" is not valid for %s"),
+ die(_("option \"%s\" value \"%s\" is not valid for %s"),
name, value, transport->url);
if (r > 0)
- warning(_("Option \"%s\" is ignored for %s\n"),
+ warning(_("option \"%s\" is ignored for %s\n"),
name, transport->url);
}
@@ -1451,7 +1501,7 @@ static void add_negotiation_tips(struct git_transport_options *smart_options)
old_nr = oids->nr;
for_each_glob_ref(add_oid, s, oids);
if (old_nr == oids->nr)
- warning("Ignoring --negotiation-tip=%s because it does not match any refs",
+ warning("ignoring --negotiation-tip=%s because it does not match any refs",
s);
}
smart_options->negotiation_tips = oids;
@@ -1479,6 +1529,8 @@ static struct transport *prepare_transport(struct remote *remote, int deepen)
set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
if (update_shallow)
set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
+ if (refetch)
+ set_option(transport, TRANS_OPT_REFETCH, "yes");
if (filter_options.choice) {
const char *spec =
expand_list_objects_filter_spec(&filter_options);
@@ -1489,14 +1541,18 @@ static struct transport *prepare_transport(struct remote *remote, int deepen)
if (transport->smart_options)
add_negotiation_tips(transport->smart_options);
else
- warning("Ignoring --negotiation-tip because the protocol does not support it.");
+ warning("ignoring --negotiation-tip because the protocol does not support it");
}
return transport;
}
-static void backfill_tags(struct transport *transport, struct ref *ref_map)
+static int backfill_tags(struct transport *transport,
+ struct ref_transaction *transaction,
+ struct ref *ref_map,
+ struct fetch_head *fetch_head,
+ struct worktree **worktrees)
{
- int cannot_reuse;
+ int retcode, cannot_reuse;
/*
* Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
@@ -1515,24 +1571,30 @@ static void backfill_tags(struct transport *transport, struct ref *ref_map)
transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
transport_set_option(transport, TRANS_OPT_DEPTH, "0");
transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
- fetch_and_consume_refs(transport, ref_map);
+ retcode = fetch_and_consume_refs(transport, transaction, ref_map, fetch_head, worktrees);
if (gsecondary) {
transport_disconnect(gsecondary);
gsecondary = NULL;
}
+
+ return retcode;
}
static int do_fetch(struct transport *transport,
struct refspec *rs)
{
- struct ref *ref_map;
+ struct ref_transaction *transaction = NULL;
+ struct ref *ref_map = NULL;
int autotags = (transport->remote->fetch_tags == 1);
int retcode = 0;
const struct ref *remote_refs;
struct transport_ls_refs_options transport_ls_refs_options =
TRANSPORT_LS_REFS_OPTIONS_INIT;
int must_list_refs = 1;
+ struct worktree **worktrees = get_worktrees();
+ struct fetch_head fetch_head = { 0 };
+ struct strbuf err = STRBUF_INIT;
if (tags == TAGS_DEFAULT) {
if (transport->remote->fetch_tags == 2)
@@ -1583,12 +1645,24 @@ static int do_fetch(struct transport *transport,
} else
remote_refs = NULL;
- strvec_clear(&transport_ls_refs_options.ref_prefixes);
+ transport_ls_refs_options_release(&transport_ls_refs_options);
ref_map = get_ref_map(transport->remote, remote_refs, rs,
tags, &autotags);
if (!update_head_ok)
- check_not_current_branch(ref_map);
+ check_not_current_branch(ref_map, worktrees);
+
+ retcode = open_fetch_head(&fetch_head);
+ if (retcode)
+ goto cleanup;
+
+ if (atomic_fetch) {
+ transaction = ref_transaction_begin(&err);
+ if (!transaction) {
+ retcode = error("%s", err.buf);
+ goto cleanup;
+ }
+ }
if (tags == TAGS_DEFAULT && autotags)
transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
@@ -1599,19 +1673,61 @@ static int do_fetch(struct transport *transport,
* don't care whether --tags was specified.
*/
if (rs->nr) {
- prune_refs(rs, ref_map, transport->url);
+ retcode = prune_refs(rs, transaction, ref_map, transport->url);
} else {
- prune_refs(&transport->remote->fetch,
- ref_map,
- transport->url);
+ retcode = prune_refs(&transport->remote->fetch,
+ transaction, ref_map,
+ transport->url);
}
+ if (retcode != 0)
+ retcode = 1;
}
- if (fetch_and_consume_refs(transport, ref_map)) {
- free_refs(ref_map);
+
+ if (fetch_and_consume_refs(transport, transaction, ref_map, &fetch_head, worktrees)) {
retcode = 1;
goto cleanup;
}
+ /*
+ * If neither --no-tags nor --tags was specified, do automated tag
+ * following.
+ */
+ if (tags == TAGS_DEFAULT && autotags) {
+ struct ref *tags_ref_map = NULL, **tail = &tags_ref_map;
+
+ find_non_local_tags(remote_refs, transaction, &tags_ref_map, &tail);
+ if (tags_ref_map) {
+ /*
+ * If backfilling of tags fails then we want to tell
+ * the user so, but we have to continue regardless to
+ * populate upstream information of the references we
+ * have already fetched above. The exception though is
+ * when `--atomic` is passed: in that case we'll abort
+ * the transaction and don't commit anything.
+ */
+ if (backfill_tags(transport, transaction, tags_ref_map,
+ &fetch_head, worktrees))
+ retcode = 1;
+ }
+
+ free_refs(tags_ref_map);
+ }
+
+ if (transaction) {
+ if (retcode)
+ goto cleanup;
+
+ retcode = ref_transaction_commit(transaction, &err);
+ if (retcode) {
+ error("%s", err.buf);
+ ref_transaction_free(transaction);
+ transaction = NULL;
+ goto cleanup;
+ }
+ }
+
+ commit_fetch_head(&fetch_head);
+
if (set_upstream) {
struct branch *branch = branch_get("HEAD");
struct ref *rm;
@@ -1631,13 +1747,23 @@ static int do_fetch(struct transport *transport,
if (!rm->peer_ref) {
if (source_ref) {
warning(_("multiple branches detected, incompatible with --set-upstream"));
- goto skip;
+ goto cleanup;
} else {
source_ref = rm;
}
}
}
if (source_ref) {
+ if (!branch) {
+ const char *shortname = source_ref->name;
+ skip_prefix(shortname, "refs/heads/", &shortname);
+
+ warning(_("could not set upstream of HEAD to '%s' from '%s' when "
+ "it does not point to any branch."),
+ shortname, transport->remote->name);
+ goto cleanup;
+ }
+
if (!strcmp(source_ref->name, "HEAD") ||
starts_with(source_ref->name, "refs/heads/"))
install_branch_config(0,
@@ -1651,25 +1777,21 @@ static int do_fetch(struct transport *transport,
else
warning(_("unknown branch type"));
} else {
- warning(_("no source branch found.\n"
- "you need to specify exactly one branch with the --set-upstream option."));
+ warning(_("no source branch found;\n"
+ "you need to specify exactly one branch with the --set-upstream option"));
}
}
- skip:
- free_refs(ref_map);
- /* if neither --no-tags nor --tags was specified, do automated tag
- * following ... */
- if (tags == TAGS_DEFAULT && autotags) {
- struct ref **tail = &ref_map;
- ref_map = NULL;
- find_non_local_tags(remote_refs, &ref_map, &tail);
- if (ref_map)
- backfill_tags(transport, ref_map);
- free_refs(ref_map);
+cleanup:
+ if (retcode && transaction) {
+ ref_transaction_abort(transaction, &err);
+ error("%s", err.buf);
}
- cleanup:
+ close_fetch_head(&fetch_head);
+ strbuf_release(&err);
+ free_refs(ref_map);
+ free_worktrees(worktrees);
return retcode;
}
@@ -1790,7 +1912,7 @@ static int fetch_failed_to_start(struct strbuf *out, void *cb, void *task_cb)
struct parallel_fetch_state *state = cb;
const char *remote = task_cb;
- state->result = error(_("Could not fetch %s"), remote);
+ state->result = error(_("could not fetch %s"), remote);
return 0;
}
@@ -1845,7 +1967,7 @@ static int fetch_multiple(struct string_list *list, int max_children)
if (verbosity >= 0)
printf(_("Fetching %s\n"), name);
if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
- error(_("Could not fetch %s"), name);
+ error(_("could not fetch %s"), name);
result = 1;
}
strvec_pop(&argv);
@@ -1906,8 +2028,8 @@ static int fetch_one(struct remote *remote, int argc, const char **argv,
int remote_via_config = remote_is_configured(remote, 0);
if (!remote)
- die(_("No remote repository specified. Please, specify either a URL or a\n"
- "remote name from which new revisions should be fetched."));
+ die(_("no remote repository specified; please specify either a URL or a\n"
+ "remote name from which new revisions should be fetched"));
gtransport = prepare_transport(remote, 1);
@@ -1942,7 +2064,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv,
if (!strcmp(argv[i], "tag")) {
i++;
if (i >= argc)
- die(_("You need to specify a tag name."));
+ die(_("you need to specify a tag name"));
refspec_appendf(&rs, "refs/tags/%s:refs/tags/%s",
argv[i], argv[i]);
@@ -1962,7 +2084,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv,
gtransport->server_options = &server_options;
sigchain_push_common(unlock_pack_on_signal);
- atexit(unlock_pack);
+ atexit(unlock_pack_atexit);
sigchain_push(SIGPIPE, SIG_IGN);
exit_code = do_fetch(gtransport, &rs);
sigchain_pop(SIGPIPE);
@@ -1993,9 +2115,35 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
}
git_config(git_fetch_config, NULL);
+ if (the_repository->gitdir) {
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+ }
argc = parse_options(argc, argv, prefix,
builtin_fetch_options, builtin_fetch_usage, 0);
+
+ if (recurse_submodules_cli != RECURSE_SUBMODULES_DEFAULT)
+ recurse_submodules = recurse_submodules_cli;
+
+ if (negotiate_only) {
+ switch (recurse_submodules_cli) {
+ case RECURSE_SUBMODULES_OFF:
+ case RECURSE_SUBMODULES_DEFAULT:
+ /*
+ * --negotiate-only should never recurse into
+ * submodules. Skip it by setting recurse_submodules to
+ * RECURSE_SUBMODULES_OFF.
+ */
+ recurse_submodules = RECURSE_SUBMODULES_OFF;
+ break;
+
+ default:
+ die(_("options '%s' and '%s' cannot be used together"),
+ "--negotiate-only", "--recurse-submodules");
+ }
+ }
+
if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
int *sfjc = submodule_fetch_jobs_config == -1
? &submodule_fetch_jobs_config : NULL;
@@ -2006,18 +2154,18 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
}
if (negotiate_only && !negotiation_tip.nr)
- die(_("--negotiate-only needs one or more --negotiate-tip=*"));
+ die(_("--negotiate-only needs one or more --negotiation-tip=*"));
if (deepen_relative) {
if (deepen_relative < 0)
- die(_("Negative depth in --deepen is not supported"));
+ die(_("negative depth in --deepen is not supported"));
if (depth)
- die(_("--deepen and --depth are mutually exclusive"));
+ die(_("options '%s' and '%s' cannot be used together"), "--deepen", "--depth");
depth = xstrfmt("%d", deepen_relative);
}
if (unshallow) {
if (depth)
- die(_("--depth and --unshallow cannot be used together"));
+ die(_("options '%s' and '%s' cannot be used together"), "--depth", "--unshallow");
else if (!is_repository_shallow(the_repository))
die(_("--unshallow on a complete repository does not make sense"));
else
@@ -2040,6 +2188,10 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
else if (argc > 1)
die(_("fetch --all does not make sense with refspecs"));
(void) for_each_remote(get_one_remote_for_fetch, &list);
+
+ /* do not do fetch_multiple() of one */
+ if (list.nr == 1)
+ remote = remote_get(list.items[0].string);
} else if (argc == 0) {
/* No arguments -- use default remote */
remote = remote_get(NULL);
@@ -2047,14 +2199,15 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
/* All arguments are assumed to be remotes or groups */
for (i = 0; i < argc; i++)
if (!add_remote_or_group(argv[i], &list))
- die(_("No such remote or remote group: %s"), argv[i]);
+ die(_("no such remote or remote group: %s"),
+ argv[i]);
} else {
/* Single remote or group */
(void) add_remote_or_group(argv[0], &list);
if (list.nr > 1) {
/* More than one remote */
if (argc > 1)
- die(_("Fetching a group and specifying refspecs does not make sense"));
+ die(_("fetching a group and specifying refspecs does not make sense"));
} else {
/* Zero or one remotes */
remote = remote_get(argv[0]);
@@ -2075,8 +2228,9 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
if (gtransport->smart_options) {
gtransport->smart_options->acked_commits = &acked_commits;
} else {
- warning(_("Protocol does not support --negotiate-only, exiting."));
- return 1;
+ warning(_("protocol does not support --negotiate-only, exiting"));
+ result = 1;
+ goto cleanup;
}
if (server_options.nr)
gtransport->server_options = &server_options;
@@ -2112,7 +2266,17 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
result = fetch_multiple(&list, max_children);
}
- if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
+
+ /*
+ * This is only needed after fetch_one(), which does not fetch
+ * submodules by itself.
+ *
+ * When we fetch from multiple remotes, fetch_multiple() has
+ * already updated submodules to grab commits necessary for
+ * the fetched history from each remote, so there is no need
+ * to fetch submodules from here.
+ */
+ if (!result && remote && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
struct strvec options = STRVEC_INIT;
int max_children = max_jobs;
@@ -2122,17 +2286,26 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
max_children = fetch_parallel_config;
add_options_to_argv(&options);
- result = fetch_populated_submodules(the_repository,
- &options,
- submodule_prefix,
- recurse_submodules,
- recurse_submodules_default,
- verbosity < 0,
- max_children);
+ result = fetch_submodules(the_repository,
+ &options,
+ submodule_prefix,
+ recurse_submodules,
+ recurse_submodules_default,
+ verbosity < 0,
+ max_children);
strvec_clear(&options);
}
- string_list_clear(&list, 0);
+ /*
+ * Skip irrelevant tasks because we know objects were not
+ * fetched.
+ *
+ * NEEDSWORK: as a future optimization, we can return early
+ * whenever objects were not fetched e.g. if we already have all
+ * of them.
+ */
+ if (negotiate_only)
+ goto cleanup;
prepare_repo_settings(the_repository);
if (fetch_write_commit_graph > 0 ||
@@ -2148,8 +2321,27 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
NULL);
}
- if (enable_auto_gc)
- run_auto_maintenance(verbosity < 0);
+ if (enable_auto_gc) {
+ if (refetch) {
+ /*
+ * Hint auto-maintenance strongly to encourage repacking,
+ * but respect config settings disabling it.
+ */
+ int opt_val;
+ if (git_config_get_int("gc.autopacklimit", &opt_val))
+ opt_val = -1;
+ if (opt_val != 0)
+ git_config_push_parameter("gc.autoPackLimit=1");
+ if (git_config_get_int("maintenance.incremental-repack.auto", &opt_val))
+ opt_val = -1;
+ if (opt_val != 0)
+ git_config_push_parameter("maintenance.incremental-repack.auto=-1");
+ }
+ run_auto_maintenance(verbosity < 0);
+ }
+
+ cleanup:
+ string_list_clear(&list, 0);
return result;
}
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 48a8699..8d8fd39 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -12,6 +12,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
{
const char *inpath = NULL;
const char *message = NULL;
+ char *into_name = NULL;
int shortlog_len = -1;
struct option options[] = {
{ OPTION_INTEGER, 0, "log", &shortlog_len, N_("n"),
@@ -23,6 +24,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
DEFAULT_MERGE_LOG_LEN },
OPT_STRING('m', "message", &message, N_("text"),
N_("use <text> as start of message")),
+ OPT_STRING(0, "into-name", &into_name, N_("name"),
+ N_("use <name> instead of the real target branch")),
OPT_FILENAME('F', "file", &inpath, N_("file to read from")),
OPT_END()
};
@@ -56,6 +59,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
opts.add_title = !message;
opts.credit_people = 1;
opts.shortlog_len = shortlog_len;
+ opts.into_name = into_name;
ret = fmt_merge_msg(&input, &output, &opts);
if (ret)
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 642b4b8..6f62f40 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -17,7 +17,8 @@ static char const * const for_each_ref_usage[] = {
int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
{
int i;
- struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
+ struct ref_sorting *sorting;
+ struct string_list sorting_options = STRING_LIST_INIT_DUP;
int maxcount = 0, icase = 0;
struct ref_array array;
struct ref_filter filter;
@@ -39,7 +40,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
OPT_INTEGER( 0 , "count", &maxcount, N_("show only <n> matched refs")),
OPT_STRING( 0 , "format", &format.format, N_("format"), N_("format to use for the output")),
OPT__COLOR(&format.use_color, N_("respect format colors")),
- OPT_REF_SORT(sorting_tail),
+ OPT_REF_SORT(&sorting_options),
OPT_CALLBACK(0, "points-at", &filter.points_at,
N_("object"), N_("print only refs which points at the given object"),
parse_opt_object_name),
@@ -70,8 +71,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
if (verify_ref_format(&format))
usage_with_options(for_each_ref_usage, opts);
- if (!sorting)
- sorting = ref_default_sorting();
+ sorting = ref_sorting_options(&sorting_options);
ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
filter.ignore_case = icase;
@@ -96,6 +96,6 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
ref_array_clear(&array);
free_commit_list(filter.with_commit);
free_commit_list(filter.no_commit);
- UNLEAK(sorting);
+ ref_sorting_release(sorting);
return 0;
}
diff --git a/builtin/fsck.c b/builtin/fsck.c
index b42b6fe..9e54892 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -593,18 +593,44 @@ static void get_default_heads(void)
}
}
+struct for_each_loose_cb
+{
+ struct progress *progress;
+ struct strbuf obj_type;
+};
+
static int fsck_loose(const struct object_id *oid, const char *path, void *data)
{
+ struct for_each_loose_cb *cb_data = data;
struct object *obj;
- enum object_type type;
+ enum object_type type = OBJ_NONE;
unsigned long size;
- void *contents;
+ void *contents = NULL;
int eaten;
+ struct object_info oi = OBJECT_INFO_INIT;
+ struct object_id real_oid = *null_oid();
+ int err = 0;
- if (read_loose_object(path, oid, &type, &size, &contents) < 0) {
+ strbuf_reset(&cb_data->obj_type);
+ oi.type_name = &cb_data->obj_type;
+ oi.sizep = &size;
+ oi.typep = &type;
+
+ if (read_loose_object(path, oid, &real_oid, &contents, &oi) < 0) {
+ if (contents && !oideq(&real_oid, oid))
+ err = error(_("%s: hash-path mismatch, found at: %s"),
+ oid_to_hex(&real_oid), path);
+ else
+ err = error(_("%s: object corrupt or missing: %s"),
+ oid_to_hex(oid), path);
+ }
+ if (type != OBJ_NONE && type < 0)
+ err = error(_("%s: object is of unknown type '%s': %s"),
+ oid_to_hex(&real_oid), cb_data->obj_type.buf,
+ path);
+ if (err < 0) {
errors_found |= ERROR_OBJECT;
- error(_("%s: object corrupt or missing: %s"),
- oid_to_hex(oid), path);
+ free(contents);
return 0; /* keep checking other objects */
}
@@ -640,8 +666,10 @@ static int fsck_cruft(const char *basename, const char *path, void *data)
return 0;
}
-static int fsck_subdir(unsigned int nr, const char *path, void *progress)
+static int fsck_subdir(unsigned int nr, const char *path, void *data)
{
+ struct for_each_loose_cb *cb_data = data;
+ struct progress *progress = cb_data->progress;
display_progress(progress, nr + 1);
return 0;
}
@@ -649,6 +677,10 @@ static int fsck_subdir(unsigned int nr, const char *path, void *progress)
static void fsck_object_dir(const char *path)
{
struct progress *progress = NULL;
+ struct for_each_loose_cb cb_data = {
+ .obj_type = STRBUF_INIT,
+ .progress = progress,
+ };
if (verbose)
fprintf_ln(stderr, _("Checking object directory"));
@@ -657,9 +689,10 @@ static void fsck_object_dir(const char *path)
progress = start_progress(_("Checking object directories"), 256);
for_each_loose_file_in_objdir(path, fsck_loose, fsck_cruft, fsck_subdir,
- progress);
+ &cb_data);
display_progress(progress, 256);
stop_progress(&progress);
+ strbuf_release(&cb_data.obj_type);
}
static int fsck_head_link(const char *head_ref_name,
@@ -803,6 +836,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
fsck_enable_object_names(&fsck_walk_options);
git_config(git_fsck_config, &fsck_obj_options);
+ prepare_repo_settings(the_repository);
if (connectivity_only) {
for_each_loose_object(mark_loose_for_connectivity, NULL, 0);
@@ -908,33 +942,29 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
check_connectivity();
- if (!git_config_get_bool("core.commitgraph", &i) && i) {
+ if (the_repository->settings.core_commit_graph) {
struct child_process commit_graph_verify = CHILD_PROCESS_INIT;
- const char *verify_argv[] = { "commit-graph", "verify", NULL, NULL, NULL };
prepare_alt_odb(the_repository);
for (odb = the_repository->objects->odb; odb; odb = odb->next) {
child_process_init(&commit_graph_verify);
- commit_graph_verify.argv = verify_argv;
commit_graph_verify.git_cmd = 1;
- verify_argv[2] = "--object-dir";
- verify_argv[3] = odb->path;
+ strvec_pushl(&commit_graph_verify.args, "commit-graph",
+ "verify", "--object-dir", odb->path, NULL);
if (run_command(&commit_graph_verify))
errors_found |= ERROR_COMMIT_GRAPH;
}
}
- if (!git_config_get_bool("core.multipackindex", &i) && i) {
+ if (the_repository->settings.core_multi_pack_index) {
struct child_process midx_verify = CHILD_PROCESS_INIT;
- const char *midx_argv[] = { "multi-pack-index", "verify", NULL, NULL, NULL };
prepare_alt_odb(the_repository);
for (odb = the_repository->objects->odb; odb; odb = odb->next) {
child_process_init(&midx_verify);
- midx_verify.argv = midx_argv;
midx_verify.git_cmd = 1;
- midx_argv[2] = "--object-dir";
- midx_argv[3] = odb->path;
+ strvec_pushl(&midx_verify.args, "multi-pack-index",
+ "verify", "--object-dir", odb->path, NULL);
if (run_command(&midx_verify))
errors_found |= ERROR_MULTI_PACK_INDEX;
}
diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c
new file mode 100644
index 0000000..46be55a
--- /dev/null
+++ b/builtin/fsmonitor--daemon.c
@@ -0,0 +1,1479 @@
+#include "builtin.h"
+#include "config.h"
+#include "parse-options.h"
+#include "fsmonitor.h"
+#include "fsmonitor-ipc.h"
+#include "compat/fsmonitor/fsm-listen.h"
+#include "fsmonitor--daemon.h"
+#include "simple-ipc.h"
+#include "khash.h"
+#include "pkt-line.h"
+
+static const char * const builtin_fsmonitor__daemon_usage[] = {
+ N_("git fsmonitor--daemon start [<options>]"),
+ N_("git fsmonitor--daemon run [<options>]"),
+ N_("git fsmonitor--daemon stop"),
+ N_("git fsmonitor--daemon status"),
+ NULL
+};
+
+#ifdef HAVE_FSMONITOR_DAEMON_BACKEND
+/*
+ * Global state loaded from config.
+ */
+#define FSMONITOR__IPC_THREADS "fsmonitor.ipcthreads"
+static int fsmonitor__ipc_threads = 8;
+
+#define FSMONITOR__START_TIMEOUT "fsmonitor.starttimeout"
+static int fsmonitor__start_timeout_sec = 60;
+
+#define FSMONITOR__ANNOUNCE_STARTUP "fsmonitor.announcestartup"
+static int fsmonitor__announce_startup = 0;
+
+static int fsmonitor_config(const char *var, const char *value, void *cb)
+{
+ if (!strcmp(var, FSMONITOR__IPC_THREADS)) {
+ int i = git_config_int(var, value);
+ if (i < 1)
+ return error(_("value of '%s' out of range: %d"),
+ FSMONITOR__IPC_THREADS, i);
+ fsmonitor__ipc_threads = i;
+ return 0;
+ }
+
+ if (!strcmp(var, FSMONITOR__START_TIMEOUT)) {
+ int i = git_config_int(var, value);
+ if (i < 0)
+ return error(_("value of '%s' out of range: %d"),
+ FSMONITOR__START_TIMEOUT, i);
+ fsmonitor__start_timeout_sec = i;
+ return 0;
+ }
+
+ if (!strcmp(var, FSMONITOR__ANNOUNCE_STARTUP)) {
+ int is_bool;
+ int i = git_config_bool_or_int(var, value, &is_bool);
+ if (i < 0)
+ return error(_("value of '%s' not bool or int: %d"),
+ var, i);
+ fsmonitor__announce_startup = i;
+ return 0;
+ }
+
+ return git_default_config(var, value, cb);
+}
+
+/*
+ * Acting as a CLIENT.
+ *
+ * Send a "quit" command to the `git-fsmonitor--daemon` (if running)
+ * and wait for it to shutdown.
+ */
+static int do_as_client__send_stop(void)
+{
+ struct strbuf answer = STRBUF_INIT;
+ int ret;
+
+ ret = fsmonitor_ipc__send_command("quit", &answer);
+
+ /* The quit command does not return any response data. */
+ strbuf_release(&answer);
+
+ if (ret)
+ return ret;
+
+ trace2_region_enter("fsm_client", "polling-for-daemon-exit", NULL);
+ while (fsmonitor_ipc__get_state() == IPC_STATE__LISTENING)
+ sleep_millisec(50);
+ trace2_region_leave("fsm_client", "polling-for-daemon-exit", NULL);
+
+ return 0;
+}
+
+static int do_as_client__status(void)
+{
+ enum ipc_active_state state = fsmonitor_ipc__get_state();
+
+ switch (state) {
+ case IPC_STATE__LISTENING:
+ printf(_("fsmonitor-daemon is watching '%s'\n"),
+ the_repository->worktree);
+ return 0;
+
+ default:
+ printf(_("fsmonitor-daemon is not watching '%s'\n"),
+ the_repository->worktree);
+ return 1;
+ }
+}
+
+enum fsmonitor_cookie_item_result {
+ FCIR_ERROR = -1, /* could not create cookie file ? */
+ FCIR_INIT,
+ FCIR_SEEN,
+ FCIR_ABORT,
+};
+
+struct fsmonitor_cookie_item {
+ struct hashmap_entry entry;
+ char *name;
+ enum fsmonitor_cookie_item_result result;
+};
+
+static int cookies_cmp(const void *data, const struct hashmap_entry *he1,
+ const struct hashmap_entry *he2, const void *keydata)
+{
+ const struct fsmonitor_cookie_item *a =
+ container_of(he1, const struct fsmonitor_cookie_item, entry);
+ const struct fsmonitor_cookie_item *b =
+ container_of(he2, const struct fsmonitor_cookie_item, entry);
+
+ return strcmp(a->name, keydata ? keydata : b->name);
+}
+
+static enum fsmonitor_cookie_item_result with_lock__wait_for_cookie(
+ struct fsmonitor_daemon_state *state)
+{
+ /* assert current thread holding state->main_lock */
+
+ int fd;
+ struct fsmonitor_cookie_item *cookie;
+ struct strbuf cookie_pathname = STRBUF_INIT;
+ struct strbuf cookie_filename = STRBUF_INIT;
+ enum fsmonitor_cookie_item_result result;
+ int my_cookie_seq;
+
+ CALLOC_ARRAY(cookie, 1);
+
+ my_cookie_seq = state->cookie_seq++;
+
+ strbuf_addf(&cookie_filename, "%i-%i", getpid(), my_cookie_seq);
+
+ strbuf_addbuf(&cookie_pathname, &state->path_cookie_prefix);
+ strbuf_addbuf(&cookie_pathname, &cookie_filename);
+
+ cookie->name = strbuf_detach(&cookie_filename, NULL);
+ cookie->result = FCIR_INIT;
+ hashmap_entry_init(&cookie->entry, strhash(cookie->name));
+
+ hashmap_add(&state->cookies, &cookie->entry);
+
+ trace_printf_key(&trace_fsmonitor, "cookie-wait: '%s' '%s'",
+ cookie->name, cookie_pathname.buf);
+
+ /*
+ * Create the cookie file on disk and then wait for a notification
+ * that the listener thread has seen it.
+ */
+ fd = open(cookie_pathname.buf, O_WRONLY | O_CREAT | O_EXCL, 0600);
+ if (fd < 0) {
+ error_errno(_("could not create fsmonitor cookie '%s'"),
+ cookie->name);
+
+ cookie->result = FCIR_ERROR;
+ goto done;
+ }
+
+ /*
+ * Technically, close() and unlink() can fail, but we don't
+ * care here. We only created the file to trigger a watch
+ * event from the FS to know that when we're up to date.
+ */
+ close(fd);
+ unlink(cookie_pathname.buf);
+
+ /*
+ * Technically, this is an infinite wait (well, unless another
+ * thread sends us an abort). I'd like to change this to
+ * use `pthread_cond_timedwait()` and return an error/timeout
+ * and let the caller do the trivial response thing, but we
+ * don't have that routine in our thread-utils.
+ *
+ * After extensive beta testing I'm not really worried about
+ * this. Also note that the above open() and unlink() calls
+ * will cause at least two FS events on that path, so the odds
+ * of getting stuck are pretty slim.
+ */
+ while (cookie->result == FCIR_INIT)
+ pthread_cond_wait(&state->cookies_cond,
+ &state->main_lock);
+
+done:
+ hashmap_remove(&state->cookies, &cookie->entry, NULL);
+
+ result = cookie->result;
+
+ free(cookie->name);
+ free(cookie);
+ strbuf_release(&cookie_pathname);
+
+ return result;
+}
+
+/*
+ * Mark these cookies as _SEEN and wake up the corresponding client threads.
+ */
+static void with_lock__mark_cookies_seen(struct fsmonitor_daemon_state *state,
+ const struct string_list *cookie_names)
+{
+ /* assert current thread holding state->main_lock */
+
+ int k;
+ int nr_seen = 0;
+
+ for (k = 0; k < cookie_names->nr; k++) {
+ struct fsmonitor_cookie_item key;
+ struct fsmonitor_cookie_item *cookie;
+
+ key.name = cookie_names->items[k].string;
+ hashmap_entry_init(&key.entry, strhash(key.name));
+
+ cookie = hashmap_get_entry(&state->cookies, &key, entry, NULL);
+ if (cookie) {
+ trace_printf_key(&trace_fsmonitor, "cookie-seen: '%s'",
+ cookie->name);
+ cookie->result = FCIR_SEEN;
+ nr_seen++;
+ }
+ }
+
+ if (nr_seen)
+ pthread_cond_broadcast(&state->cookies_cond);
+}
+
+/*
+ * Set _ABORT on all pending cookies and wake up all client threads.
+ */
+static void with_lock__abort_all_cookies(struct fsmonitor_daemon_state *state)
+{
+ /* assert current thread holding state->main_lock */
+
+ struct hashmap_iter iter;
+ struct fsmonitor_cookie_item *cookie;
+ int nr_aborted = 0;
+
+ hashmap_for_each_entry(&state->cookies, &iter, cookie, entry) {
+ trace_printf_key(&trace_fsmonitor, "cookie-abort: '%s'",
+ cookie->name);
+ cookie->result = FCIR_ABORT;
+ nr_aborted++;
+ }
+
+ if (nr_aborted)
+ pthread_cond_broadcast(&state->cookies_cond);
+}
+
+/*
+ * Requests to and from a FSMonitor Protocol V2 provider use an opaque
+ * "token" as a virtual timestamp. Clients can request a summary of all
+ * created/deleted/modified files relative to a token. In the response,
+ * clients receive a new token for the next (relative) request.
+ *
+ *
+ * Token Format
+ * ============
+ *
+ * The contents of the token are private and provider-specific.
+ *
+ * For the built-in fsmonitor--daemon, we define a token as follows:
+ *
+ * "builtin" ":" <token_id> ":" <sequence_nr>
+ *
+ * The "builtin" prefix is used as a namespace to avoid conflicts
+ * with other providers (such as Watchman).
+ *
+ * The <token_id> is an arbitrary OPAQUE string, such as a GUID,
+ * UUID, or {timestamp,pid}. It is used to group all filesystem
+ * events that happened while the daemon was monitoring (and in-sync
+ * with the filesystem).
+ *
+ * Unlike FSMonitor Protocol V1, it is not defined as a timestamp
+ * and does not define less-than/greater-than relationships.
+ * (There are too many race conditions to rely on file system
+ * event timestamps.)
+ *
+ * The <sequence_nr> is a simple integer incremented whenever the
+ * daemon needs to make its state public. For example, if 1000 file
+ * system events come in, but no clients have requested the data,
+ * the daemon can continue to accumulate file changes in the same
+ * bin and does not need to advance the sequence number. However,
+ * as soon as a client does arrive, the daemon needs to start a new
+ * bin and increment the sequence number.
+ *
+ * The sequence number serves as the boundary between 2 sets
+ * of bins -- the older ones that the client has already seen
+ * and the newer ones that it hasn't.
+ *
+ * When a new <token_id> is created, the <sequence_nr> is reset to
+ * zero.
+ *
+ *
+ * About Token Ids
+ * ===============
+ *
+ * A new token_id is created:
+ *
+ * [1] each time the daemon is started.
+ *
+ * [2] any time that the daemon must re-sync with the filesystem
+ * (such as when the kernel drops or we miss events on a very
+ * active volume).
+ *
+ * [3] in response to a client "flush" command (for dropped event
+ * testing).
+ *
+ * When a new token_id is created, the daemon is free to discard all
+ * cached filesystem events associated with any previous token_ids.
+ * Events associated with a non-current token_id will never be sent
+ * to a client. A token_id change implicitly means that the daemon
+ * has gap in its event history.
+ *
+ * Therefore, clients that present a token with a stale (non-current)
+ * token_id will always be given a trivial response.
+ */
+struct fsmonitor_token_data {
+ struct strbuf token_id;
+ struct fsmonitor_batch *batch_head;
+ struct fsmonitor_batch *batch_tail;
+ uint64_t client_ref_count;
+};
+
+struct fsmonitor_batch {
+ struct fsmonitor_batch *next;
+ uint64_t batch_seq_nr;
+ const char **interned_paths;
+ size_t nr, alloc;
+ time_t pinned_time;
+};
+
+static struct fsmonitor_token_data *fsmonitor_new_token_data(void)
+{
+ static int test_env_value = -1;
+ static uint64_t flush_count = 0;
+ struct fsmonitor_token_data *token;
+ struct fsmonitor_batch *batch;
+
+ CALLOC_ARRAY(token, 1);
+ batch = fsmonitor_batch__new();
+
+ strbuf_init(&token->token_id, 0);
+ token->batch_head = batch;
+ token->batch_tail = batch;
+ token->client_ref_count = 0;
+
+ if (test_env_value < 0)
+ test_env_value = git_env_bool("GIT_TEST_FSMONITOR_TOKEN", 0);
+
+ if (!test_env_value) {
+ struct timeval tv;
+ struct tm tm;
+ time_t secs;
+
+ gettimeofday(&tv, NULL);
+ secs = tv.tv_sec;
+ gmtime_r(&secs, &tm);
+
+ strbuf_addf(&token->token_id,
+ "%"PRIu64".%d.%4d%02d%02dT%02d%02d%02d.%06ldZ",
+ flush_count++,
+ getpid(),
+ tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
+ tm.tm_hour, tm.tm_min, tm.tm_sec,
+ (long)tv.tv_usec);
+ } else {
+ strbuf_addf(&token->token_id, "test_%08x", test_env_value++);
+ }
+
+ /*
+ * We created a new <token_id> and are starting a new series
+ * of tokens with a zero <seq_nr>.
+ *
+ * Since clients cannot guess our new (non test) <token_id>
+ * they will always receive a trivial response (because of the
+ * mismatch on the <token_id>). The trivial response will
+ * tell them our new <token_id> so that subsequent requests
+ * will be relative to our new series. (And when sending that
+ * response, we pin the current head of the batch list.)
+ *
+ * Even if the client correctly guesses the <token_id>, their
+ * request of "builtin:<token_id>:0" asks for all changes MORE
+ * RECENT than batch/bin 0.
+ *
+ * This implies that it is a waste to accumulate paths in the
+ * initial batch/bin (because they will never be transmitted).
+ *
+ * So the daemon could be running for days and watching the
+ * file system, but doesn't need to actually accumulate any
+ * paths UNTIL we need to set a reference point for a later
+ * relative request.
+ *
+ * However, it is very useful for testing to always have a
+ * reference point set. Pin batch 0 to force early file system
+ * events to accumulate.
+ */
+ if (test_env_value)
+ batch->pinned_time = time(NULL);
+
+ return token;
+}
+
+struct fsmonitor_batch *fsmonitor_batch__new(void)
+{
+ struct fsmonitor_batch *batch;
+
+ CALLOC_ARRAY(batch, 1);
+
+ return batch;
+}
+
+void fsmonitor_batch__free_list(struct fsmonitor_batch *batch)
+{
+ while (batch) {
+ struct fsmonitor_batch *next = batch->next;
+
+ /*
+ * The actual strings within the array of this batch
+ * are interned, so we don't own them. We only own
+ * the array.
+ */
+ free(batch->interned_paths);
+ free(batch);
+
+ batch = next;
+ }
+}
+
+void fsmonitor_batch__add_path(struct fsmonitor_batch *batch,
+ const char *path)
+{
+ const char *interned_path = strintern(path);
+
+ trace_printf_key(&trace_fsmonitor, "event: %s", interned_path);
+
+ ALLOC_GROW(batch->interned_paths, batch->nr + 1, batch->alloc);
+ batch->interned_paths[batch->nr++] = interned_path;
+}
+
+static void fsmonitor_batch__combine(struct fsmonitor_batch *batch_dest,
+ const struct fsmonitor_batch *batch_src)
+{
+ size_t k;
+
+ ALLOC_GROW(batch_dest->interned_paths,
+ batch_dest->nr + batch_src->nr + 1,
+ batch_dest->alloc);
+
+ for (k = 0; k < batch_src->nr; k++)
+ batch_dest->interned_paths[batch_dest->nr++] =
+ batch_src->interned_paths[k];
+}
+
+/*
+ * To keep the batch list from growing unbounded in response to filesystem
+ * activity, we try to truncate old batches from the end of the list as
+ * they become irrelevant.
+ *
+ * We assume that the .git/index will be updated with the most recent token
+ * any time the index is updated. And future commands will only ask for
+ * recent changes *since* that new token. So as tokens advance into the
+ * future, older batch items will never be requested/needed. So we can
+ * truncate them without loss of functionality.
+ *
+ * However, multiple commands may be talking to the daemon concurrently
+ * or perform a slow command, so a little "token skew" is possible.
+ * Therefore, we want this to be a little bit lazy and have a generous
+ * delay.
+ *
+ * The current reader thread walked backwards in time from `token->batch_head`
+ * back to `batch_marker` somewhere in the middle of the batch list.
+ *
+ * Let's walk backwards in time from that marker an arbitrary delay
+ * and truncate the list there. Note that these timestamps are completely
+ * artificial (based on when we pinned the batch item) and not on any
+ * filesystem activity.
+ *
+ * Return the obsolete portion of the list after we have removed it from
+ * the official list so that the caller can free it after leaving the lock.
+ */
+#define MY_TIME_DELAY_SECONDS (5 * 60) /* seconds */
+
+static struct fsmonitor_batch *with_lock__truncate_old_batches(
+ struct fsmonitor_daemon_state *state,
+ const struct fsmonitor_batch *batch_marker)
+{
+ /* assert current thread holding state->main_lock */
+
+ const struct fsmonitor_batch *batch;
+ struct fsmonitor_batch *remainder;
+
+ if (!batch_marker)
+ return NULL;
+
+ trace_printf_key(&trace_fsmonitor, "Truncate: mark (%"PRIu64",%"PRIu64")",
+ batch_marker->batch_seq_nr,
+ (uint64_t)batch_marker->pinned_time);
+
+ for (batch = batch_marker; batch; batch = batch->next) {
+ time_t t;
+
+ if (!batch->pinned_time) /* an overflow batch */
+ continue;
+
+ t = batch->pinned_time + MY_TIME_DELAY_SECONDS;
+ if (t > batch_marker->pinned_time) /* too close to marker */
+ continue;
+
+ goto truncate_past_here;
+ }
+
+ return NULL;
+
+truncate_past_here:
+ state->current_token_data->batch_tail = (struct fsmonitor_batch *)batch;
+
+ remainder = ((struct fsmonitor_batch *)batch)->next;
+ ((struct fsmonitor_batch *)batch)->next = NULL;
+
+ return remainder;
+}
+
+static void fsmonitor_free_token_data(struct fsmonitor_token_data *token)
+{
+ if (!token)
+ return;
+
+ assert(token->client_ref_count == 0);
+
+ strbuf_release(&token->token_id);
+
+ fsmonitor_batch__free_list(token->batch_head);
+
+ free(token);
+}
+
+/*
+ * Flush all of our cached data about the filesystem. Call this if we
+ * lose sync with the filesystem and miss some notification events.
+ *
+ * [1] If we are missing events, then we no longer have a complete
+ * history of the directory (relative to our current start token).
+ * We should create a new token and start fresh (as if we just
+ * booted up).
+ *
+ * [2] Some of those lost events may have been for cookie files. We
+ * should assume the worst and abort them rather letting them starve.
+ *
+ * If there are no concurrent threads reading the current token data
+ * series, we can free it now. Otherwise, let the last reader free
+ * it.
+ *
+ * Either way, the old token data series is no longer associated with
+ * our state data.
+ */
+static void with_lock__do_force_resync(struct fsmonitor_daemon_state *state)
+{
+ /* assert current thread holding state->main_lock */
+
+ struct fsmonitor_token_data *free_me = NULL;
+ struct fsmonitor_token_data *new_one = NULL;
+
+ new_one = fsmonitor_new_token_data();
+
+ if (state->current_token_data->client_ref_count == 0)
+ free_me = state->current_token_data;
+ state->current_token_data = new_one;
+
+ fsmonitor_free_token_data(free_me);
+
+ with_lock__abort_all_cookies(state);
+}
+
+void fsmonitor_force_resync(struct fsmonitor_daemon_state *state)
+{
+ pthread_mutex_lock(&state->main_lock);
+ with_lock__do_force_resync(state);
+ pthread_mutex_unlock(&state->main_lock);
+}
+
+/*
+ * Format an opaque token string to send to the client.
+ */
+static void with_lock__format_response_token(
+ struct strbuf *response_token,
+ const struct strbuf *response_token_id,
+ const struct fsmonitor_batch *batch)
+{
+ /* assert current thread holding state->main_lock */
+
+ strbuf_reset(response_token);
+ strbuf_addf(response_token, "builtin:%s:%"PRIu64,
+ response_token_id->buf, batch->batch_seq_nr);
+}
+
+/*
+ * Parse an opaque token from the client.
+ * Returns -1 on error.
+ */
+static int fsmonitor_parse_client_token(const char *buf_token,
+ struct strbuf *requested_token_id,
+ uint64_t *seq_nr)
+{
+ const char *p;
+ char *p_end;
+
+ strbuf_reset(requested_token_id);
+ *seq_nr = 0;
+
+ if (!skip_prefix(buf_token, "builtin:", &p))
+ return -1;
+
+ while (*p && *p != ':')
+ strbuf_addch(requested_token_id, *p++);
+ if (!*p++)
+ return -1;
+
+ *seq_nr = (uint64_t)strtoumax(p, &p_end, 10);
+ if (*p_end)
+ return -1;
+
+ return 0;
+}
+
+KHASH_INIT(str, const char *, int, 0, kh_str_hash_func, kh_str_hash_equal)
+
+static int do_handle_client(struct fsmonitor_daemon_state *state,
+ const char *command,
+ ipc_server_reply_cb *reply,
+ struct ipc_server_reply_data *reply_data)
+{
+ struct fsmonitor_token_data *token_data = NULL;
+ struct strbuf response_token = STRBUF_INIT;
+ struct strbuf requested_token_id = STRBUF_INIT;
+ struct strbuf payload = STRBUF_INIT;
+ uint64_t requested_oldest_seq_nr = 0;
+ uint64_t total_response_len = 0;
+ const char *p;
+ const struct fsmonitor_batch *batch_head;
+ const struct fsmonitor_batch *batch;
+ struct fsmonitor_batch *remainder = NULL;
+ intmax_t count = 0, duplicates = 0;
+ kh_str_t *shown;
+ int hash_ret;
+ int do_trivial = 0;
+ int do_flush = 0;
+ int do_cookie = 0;
+ enum fsmonitor_cookie_item_result cookie_result;
+
+ /*
+ * We expect `command` to be of the form:
+ *
+ * <command> := quit NUL
+ * | flush NUL
+ * | <V1-time-since-epoch-ns> NUL
+ * | <V2-opaque-fsmonitor-token> NUL
+ */
+
+ if (!strcmp(command, "quit")) {
+ /*
+ * A client has requested over the socket/pipe that the
+ * daemon shutdown.
+ *
+ * Tell the IPC thread pool to shutdown (which completes
+ * the await in the main thread (which can stop the
+ * fsmonitor listener thread)).
+ *
+ * There is no reply to the client.
+ */
+ return SIMPLE_IPC_QUIT;
+
+ } else if (!strcmp(command, "flush")) {
+ /*
+ * Flush all of our cached data and generate a new token
+ * just like if we lost sync with the filesystem.
+ *
+ * Then send a trivial response using the new token.
+ */
+ do_flush = 1;
+ do_trivial = 1;
+
+ } else if (!skip_prefix(command, "builtin:", &p)) {
+ /* assume V1 timestamp or garbage */
+
+ char *p_end;
+
+ strtoumax(command, &p_end, 10);
+ trace_printf_key(&trace_fsmonitor,
+ ((*p_end) ?
+ "fsmonitor: invalid command line '%s'" :
+ "fsmonitor: unsupported V1 protocol '%s'"),
+ command);
+ do_trivial = 1;
+
+ } else {
+ /* We have "builtin:*" */
+ if (fsmonitor_parse_client_token(command, &requested_token_id,
+ &requested_oldest_seq_nr)) {
+ trace_printf_key(&trace_fsmonitor,
+ "fsmonitor: invalid V2 protocol token '%s'",
+ command);
+ do_trivial = 1;
+
+ } else {
+ /*
+ * We have a V2 valid token:
+ * "builtin:<token_id>:<seq_nr>"
+ */
+ do_cookie = 1;
+ }
+ }
+
+ pthread_mutex_lock(&state->main_lock);
+
+ if (!state->current_token_data)
+ BUG("fsmonitor state does not have a current token");
+
+ /*
+ * Write a cookie file inside the directory being watched in
+ * an effort to flush out existing filesystem events that we
+ * actually care about. Suspend this client thread until we
+ * see the filesystem events for this cookie file.
+ *
+ * Creating the cookie lets us guarantee that our FS listener
+ * thread has drained the kernel queue and we are caught up
+ * with the kernel.
+ *
+ * If we cannot create the cookie (or otherwise guarantee that
+ * we are caught up), we send a trivial response. We have to
+ * assume that there might be some very, very recent activity
+ * on the FS still in flight.
+ */
+ if (do_cookie) {
+ cookie_result = with_lock__wait_for_cookie(state);
+ if (cookie_result != FCIR_SEEN) {
+ error(_("fsmonitor: cookie_result '%d' != SEEN"),
+ cookie_result);
+ do_trivial = 1;
+ }
+ }
+
+ if (do_flush)
+ with_lock__do_force_resync(state);
+
+ /*
+ * We mark the current head of the batch list as "pinned" so
+ * that the listener thread will treat this item as read-only
+ * (and prevent any more paths from being added to it) from
+ * now on.
+ */
+ token_data = state->current_token_data;
+ batch_head = token_data->batch_head;
+ ((struct fsmonitor_batch *)batch_head)->pinned_time = time(NULL);
+
+ /*
+ * FSMonitor Protocol V2 requires that we send a response header
+ * with a "new current token" and then all of the paths that changed
+ * since the "requested token". We send the seq_nr of the just-pinned
+ * head batch so that future requests from a client will be relative
+ * to it.
+ */
+ with_lock__format_response_token(&response_token,
+ &token_data->token_id, batch_head);
+
+ reply(reply_data, response_token.buf, response_token.len + 1);
+ total_response_len += response_token.len + 1;
+
+ trace2_data_string("fsmonitor", the_repository, "response/token",
+ response_token.buf);
+ trace_printf_key(&trace_fsmonitor, "response token: %s",
+ response_token.buf);
+
+ if (!do_trivial) {
+ if (strcmp(requested_token_id.buf, token_data->token_id.buf)) {
+ /*
+ * The client last spoke to a different daemon
+ * instance -OR- the daemon had to resync with
+ * the filesystem (and lost events), so reject.
+ */
+ trace2_data_string("fsmonitor", the_repository,
+ "response/token", "different");
+ do_trivial = 1;
+
+ } else if (requested_oldest_seq_nr <
+ token_data->batch_tail->batch_seq_nr) {
+ /*
+ * The client wants older events than we have for
+ * this token_id. This means that the end of our
+ * batch list was truncated and we cannot give the
+ * client a complete snapshot relative to their
+ * request.
+ */
+ trace_printf_key(&trace_fsmonitor,
+ "client requested truncated data");
+ do_trivial = 1;
+ }
+ }
+
+ if (do_trivial) {
+ pthread_mutex_unlock(&state->main_lock);
+
+ reply(reply_data, "/", 2);
+
+ trace2_data_intmax("fsmonitor", the_repository,
+ "response/trivial", 1);
+
+ goto cleanup;
+ }
+
+ /*
+ * We're going to hold onto a pointer to the current
+ * token-data while we walk the list of batches of files.
+ * During this time, we will NOT be under the lock.
+ * So we ref-count it.
+ *
+ * This allows the listener thread to continue prepending
+ * new batches of items to the token-data (which we'll ignore).
+ *
+ * AND it allows the listener thread to do a token-reset
+ * (and install a new `current_token_data`).
+ */
+ token_data->client_ref_count++;
+
+ pthread_mutex_unlock(&state->main_lock);
+
+ /*
+ * The client request is relative to the token that they sent,
+ * so walk the batch list backwards from the current head back
+ * to the batch (sequence number) they named.
+ *
+ * We use khash to de-dup the list of pathnames.
+ *
+ * NEEDSWORK: each batch contains a list of interned strings,
+ * so we only need to do pointer comparisons here to build the
+ * hash table. Currently, we're still comparing the string
+ * values.
+ */
+ shown = kh_init_str();
+ for (batch = batch_head;
+ batch && batch->batch_seq_nr > requested_oldest_seq_nr;
+ batch = batch->next) {
+ size_t k;
+
+ for (k = 0; k < batch->nr; k++) {
+ const char *s = batch->interned_paths[k];
+ size_t s_len;
+
+ if (kh_get_str(shown, s) != kh_end(shown))
+ duplicates++;
+ else {
+ kh_put_str(shown, s, &hash_ret);
+
+ trace_printf_key(&trace_fsmonitor,
+ "send[%"PRIuMAX"]: %s",
+ count, s);
+
+ /* Each path gets written with a trailing NUL */
+ s_len = strlen(s) + 1;
+
+ if (payload.len + s_len >=
+ LARGE_PACKET_DATA_MAX) {
+ reply(reply_data, payload.buf,
+ payload.len);
+ total_response_len += payload.len;
+ strbuf_reset(&payload);
+ }
+
+ strbuf_add(&payload, s, s_len);
+ count++;
+ }
+ }
+ }
+
+ if (payload.len) {
+ reply(reply_data, payload.buf, payload.len);
+ total_response_len += payload.len;
+ }
+
+ kh_release_str(shown);
+
+ pthread_mutex_lock(&state->main_lock);
+
+ if (token_data->client_ref_count > 0)
+ token_data->client_ref_count--;
+
+ if (token_data->client_ref_count == 0) {
+ if (token_data != state->current_token_data) {
+ /*
+ * The listener thread did a token-reset while we were
+ * walking the batch list. Therefore, this token is
+ * stale and can be discarded completely. If we are
+ * the last reader thread using this token, we own
+ * that work.
+ */
+ fsmonitor_free_token_data(token_data);
+ } else if (batch) {
+ /*
+ * We are holding the lock and are the only
+ * reader of the ref-counted portion of the
+ * list, so we get the honor of seeing if the
+ * list can be truncated to save memory.
+ *
+ * The main loop did not walk to the end of the
+ * list, so this batch is the first item in the
+ * batch-list that is older than the requested
+ * end-point sequence number. See if the tail
+ * end of the list is obsolete.
+ */
+ remainder = with_lock__truncate_old_batches(state,
+ batch);
+ }
+ }
+
+ pthread_mutex_unlock(&state->main_lock);
+
+ if (remainder)
+ fsmonitor_batch__free_list(remainder);
+
+ trace2_data_intmax("fsmonitor", the_repository, "response/length", total_response_len);
+ trace2_data_intmax("fsmonitor", the_repository, "response/count/files", count);
+ trace2_data_intmax("fsmonitor", the_repository, "response/count/duplicates", duplicates);
+
+cleanup:
+ strbuf_release(&response_token);
+ strbuf_release(&requested_token_id);
+ strbuf_release(&payload);
+
+ return 0;
+}
+
+static ipc_server_application_cb handle_client;
+
+static int handle_client(void *data,
+ const char *command, size_t command_len,
+ ipc_server_reply_cb *reply,
+ struct ipc_server_reply_data *reply_data)
+{
+ struct fsmonitor_daemon_state *state = data;
+ int result;
+
+ /*
+ * The Simple IPC API now supports {char*, len} arguments, but
+ * FSMonitor always uses proper null-terminated strings, so
+ * we can ignore the command_len argument. (Trust, but verify.)
+ */
+ if (command_len != strlen(command))
+ BUG("FSMonitor assumes text messages");
+
+ trace_printf_key(&trace_fsmonitor, "requested token: %s", command);
+
+ trace2_region_enter("fsmonitor", "handle_client", the_repository);
+ trace2_data_string("fsmonitor", the_repository, "request", command);
+
+ result = do_handle_client(state, command, reply, reply_data);
+
+ trace2_region_leave("fsmonitor", "handle_client", the_repository);
+
+ return result;
+}
+
+#define FSMONITOR_DIR "fsmonitor--daemon"
+#define FSMONITOR_COOKIE_DIR "cookies"
+#define FSMONITOR_COOKIE_PREFIX (FSMONITOR_DIR "/" FSMONITOR_COOKIE_DIR "/")
+
+enum fsmonitor_path_type fsmonitor_classify_path_workdir_relative(
+ const char *rel)
+{
+ if (fspathncmp(rel, ".git", 4))
+ return IS_WORKDIR_PATH;
+ rel += 4;
+
+ if (!*rel)
+ return IS_DOT_GIT;
+ if (*rel != '/')
+ return IS_WORKDIR_PATH; /* e.g. .gitignore */
+ rel++;
+
+ if (!fspathncmp(rel, FSMONITOR_COOKIE_PREFIX,
+ strlen(FSMONITOR_COOKIE_PREFIX)))
+ return IS_INSIDE_DOT_GIT_WITH_COOKIE_PREFIX;
+
+ return IS_INSIDE_DOT_GIT;
+}
+
+enum fsmonitor_path_type fsmonitor_classify_path_gitdir_relative(
+ const char *rel)
+{
+ if (!fspathncmp(rel, FSMONITOR_COOKIE_PREFIX,
+ strlen(FSMONITOR_COOKIE_PREFIX)))
+ return IS_INSIDE_GITDIR_WITH_COOKIE_PREFIX;
+
+ return IS_INSIDE_GITDIR;
+}
+
+static enum fsmonitor_path_type try_classify_workdir_abs_path(
+ struct fsmonitor_daemon_state *state,
+ const char *path)
+{
+ const char *rel;
+
+ if (fspathncmp(path, state->path_worktree_watch.buf,
+ state->path_worktree_watch.len))
+ return IS_OUTSIDE_CONE;
+
+ rel = path + state->path_worktree_watch.len;
+
+ if (!*rel)
+ return IS_WORKDIR_PATH; /* it is the root dir exactly */
+ if (*rel != '/')
+ return IS_OUTSIDE_CONE;
+ rel++;
+
+ return fsmonitor_classify_path_workdir_relative(rel);
+}
+
+enum fsmonitor_path_type fsmonitor_classify_path_absolute(
+ struct fsmonitor_daemon_state *state,
+ const char *path)
+{
+ const char *rel;
+ enum fsmonitor_path_type t;
+
+ t = try_classify_workdir_abs_path(state, path);
+ if (state->nr_paths_watching == 1)
+ return t;
+ if (t != IS_OUTSIDE_CONE)
+ return t;
+
+ if (fspathncmp(path, state->path_gitdir_watch.buf,
+ state->path_gitdir_watch.len))
+ return IS_OUTSIDE_CONE;
+
+ rel = path + state->path_gitdir_watch.len;
+
+ if (!*rel)
+ return IS_GITDIR; /* it is the <gitdir> exactly */
+ if (*rel != '/')
+ return IS_OUTSIDE_CONE;
+ rel++;
+
+ return fsmonitor_classify_path_gitdir_relative(rel);
+}
+
+/*
+ * We try to combine small batches at the front of the batch-list to avoid
+ * having a long list. This hopefully makes it a little easier when we want
+ * to truncate and maintain the list. However, we don't want the paths array
+ * to just keep growing and growing with realloc, so we insert an arbitrary
+ * limit.
+ */
+#define MY_COMBINE_LIMIT (1024)
+
+void fsmonitor_publish(struct fsmonitor_daemon_state *state,
+ struct fsmonitor_batch *batch,
+ const struct string_list *cookie_names)
+{
+ if (!batch && !cookie_names->nr)
+ return;
+
+ pthread_mutex_lock(&state->main_lock);
+
+ if (batch) {
+ struct fsmonitor_batch *head;
+
+ head = state->current_token_data->batch_head;
+ if (!head) {
+ BUG("token does not have batch");
+ } else if (head->pinned_time) {
+ /*
+ * We cannot alter the current batch list
+ * because:
+ *
+ * [a] it is being transmitted to at least one
+ * client and the handle_client() thread has a
+ * ref-count, but not a lock on the batch list
+ * starting with this item.
+ *
+ * [b] it has been transmitted in the past to
+ * at least one client such that future
+ * requests are relative to this head batch.
+ *
+ * So, we can only prepend a new batch onto
+ * the front of the list.
+ */
+ batch->batch_seq_nr = head->batch_seq_nr + 1;
+ batch->next = head;
+ state->current_token_data->batch_head = batch;
+ } else if (!head->batch_seq_nr) {
+ /*
+ * Batch 0 is unpinned. See the note in
+ * `fsmonitor_new_token_data()` about why we
+ * don't need to accumulate these paths.
+ */
+ fsmonitor_batch__free_list(batch);
+ } else if (head->nr + batch->nr > MY_COMBINE_LIMIT) {
+ /*
+ * The head batch in the list has never been
+ * transmitted to a client, but folding the
+ * contents of the new batch onto it would
+ * exceed our arbitrary limit, so just prepend
+ * the new batch onto the list.
+ */
+ batch->batch_seq_nr = head->batch_seq_nr + 1;
+ batch->next = head;
+ state->current_token_data->batch_head = batch;
+ } else {
+ /*
+ * We are free to add the paths in the given
+ * batch onto the end of the current head batch.
+ */
+ fsmonitor_batch__combine(head, batch);
+ fsmonitor_batch__free_list(batch);
+ }
+ }
+
+ if (cookie_names->nr)
+ with_lock__mark_cookies_seen(state, cookie_names);
+
+ pthread_mutex_unlock(&state->main_lock);
+}
+
+static void *fsm_listen__thread_proc(void *_state)
+{
+ struct fsmonitor_daemon_state *state = _state;
+
+ trace2_thread_start("fsm-listen");
+
+ trace_printf_key(&trace_fsmonitor, "Watching: worktree '%s'",
+ state->path_worktree_watch.buf);
+ if (state->nr_paths_watching > 1)
+ trace_printf_key(&trace_fsmonitor, "Watching: gitdir '%s'",
+ state->path_gitdir_watch.buf);
+
+ fsm_listen__loop(state);
+
+ pthread_mutex_lock(&state->main_lock);
+ if (state->current_token_data &&
+ state->current_token_data->client_ref_count == 0)
+ fsmonitor_free_token_data(state->current_token_data);
+ state->current_token_data = NULL;
+ pthread_mutex_unlock(&state->main_lock);
+
+ trace2_thread_exit();
+ return NULL;
+}
+
+static int fsmonitor_run_daemon_1(struct fsmonitor_daemon_state *state)
+{
+ struct ipc_server_opts ipc_opts = {
+ .nr_threads = fsmonitor__ipc_threads,
+
+ /*
+ * We know that there are no other active threads yet,
+ * so we can let the IPC layer temporarily chdir() if
+ * it needs to when creating the server side of the
+ * Unix domain socket.
+ */
+ .uds_disallow_chdir = 0
+ };
+
+ /*
+ * Start the IPC thread pool before the we've started the file
+ * system event listener thread so that we have the IPC handle
+ * before we need it.
+ */
+ if (ipc_server_run_async(&state->ipc_server_data,
+ fsmonitor_ipc__get_path(), &ipc_opts,
+ handle_client, state))
+ return error_errno(
+ _("could not start IPC thread pool on '%s'"),
+ fsmonitor_ipc__get_path());
+
+ /*
+ * Start the fsmonitor listener thread to collect filesystem
+ * events.
+ */
+ if (pthread_create(&state->listener_thread, NULL,
+ fsm_listen__thread_proc, state) < 0) {
+ ipc_server_stop_async(state->ipc_server_data);
+ ipc_server_await(state->ipc_server_data);
+
+ return error(_("could not start fsmonitor listener thread"));
+ }
+
+ /*
+ * The daemon is now fully functional in background threads.
+ * Wait for the IPC thread pool to shutdown (whether by client
+ * request or from filesystem activity).
+ */
+ ipc_server_await(state->ipc_server_data);
+
+ /*
+ * The fsmonitor listener thread may have received a shutdown
+ * event from the IPC thread pool, but it doesn't hurt to tell
+ * it again. And wait for it to shutdown.
+ */
+ fsm_listen__stop_async(state);
+ pthread_join(state->listener_thread, NULL);
+
+ return state->error_code;
+}
+
+static int fsmonitor_run_daemon(void)
+{
+ struct fsmonitor_daemon_state state;
+ int err;
+
+ memset(&state, 0, sizeof(state));
+
+ hashmap_init(&state.cookies, cookies_cmp, NULL, 0);
+ pthread_mutex_init(&state.main_lock, NULL);
+ pthread_cond_init(&state.cookies_cond, NULL);
+ state.error_code = 0;
+ state.current_token_data = fsmonitor_new_token_data();
+
+ /* Prepare to (recursively) watch the <worktree-root> directory. */
+ strbuf_init(&state.path_worktree_watch, 0);
+ strbuf_addstr(&state.path_worktree_watch, absolute_path(get_git_work_tree()));
+ state.nr_paths_watching = 1;
+
+ /*
+ * We create and delete cookie files somewhere inside the .git
+ * directory to help us keep sync with the file system. If
+ * ".git" is not a directory, then <gitdir> is not inside the
+ * cone of <worktree-root>, so set up a second watch to watch
+ * the <gitdir> so that we get events for the cookie files.
+ */
+ strbuf_init(&state.path_gitdir_watch, 0);
+ strbuf_addbuf(&state.path_gitdir_watch, &state.path_worktree_watch);
+ strbuf_addstr(&state.path_gitdir_watch, "/.git");
+ if (!is_directory(state.path_gitdir_watch.buf)) {
+ strbuf_reset(&state.path_gitdir_watch);
+ strbuf_addstr(&state.path_gitdir_watch, absolute_path(get_git_dir()));
+ state.nr_paths_watching = 2;
+ }
+
+ /*
+ * We will write filesystem syncing cookie files into
+ * <gitdir>/<fsmonitor-dir>/<cookie-dir>/<pid>-<seq>.
+ *
+ * The extra layers of subdirectories here keep us from
+ * changing the mtime on ".git/" or ".git/foo/" when we create
+ * or delete cookie files.
+ *
+ * There have been problems with some IDEs that do a
+ * non-recursive watch of the ".git/" directory and run a
+ * series of commands any time something happens.
+ *
+ * For example, if we place our cookie files directly in
+ * ".git/" or ".git/foo/" then a `git status` (or similar
+ * command) from the IDE will cause a cookie file to be
+ * created in one of those dirs. This causes the mtime of
+ * those dirs to change. This triggers the IDE's watch
+ * notification. This triggers the IDE to run those commands
+ * again. And the process repeats and the machine never goes
+ * idle.
+ *
+ * Adding the extra layers of subdirectories prevents the
+ * mtime of ".git/" and ".git/foo" from changing when a
+ * cookie file is created.
+ */
+ strbuf_init(&state.path_cookie_prefix, 0);
+ strbuf_addbuf(&state.path_cookie_prefix, &state.path_gitdir_watch);
+
+ strbuf_addch(&state.path_cookie_prefix, '/');
+ strbuf_addstr(&state.path_cookie_prefix, FSMONITOR_DIR);
+ mkdir(state.path_cookie_prefix.buf, 0777);
+
+ strbuf_addch(&state.path_cookie_prefix, '/');
+ strbuf_addstr(&state.path_cookie_prefix, FSMONITOR_COOKIE_DIR);
+ mkdir(state.path_cookie_prefix.buf, 0777);
+
+ strbuf_addch(&state.path_cookie_prefix, '/');
+
+ /*
+ * Confirm that we can create platform-specific resources for the
+ * filesystem listener before we bother starting all the threads.
+ */
+ if (fsm_listen__ctor(&state)) {
+ err = error(_("could not initialize listener thread"));
+ goto done;
+ }
+
+ err = fsmonitor_run_daemon_1(&state);
+
+done:
+ pthread_cond_destroy(&state.cookies_cond);
+ pthread_mutex_destroy(&state.main_lock);
+ fsm_listen__dtor(&state);
+
+ ipc_server_free(state.ipc_server_data);
+
+ strbuf_release(&state.path_worktree_watch);
+ strbuf_release(&state.path_gitdir_watch);
+ strbuf_release(&state.path_cookie_prefix);
+
+ return err;
+}
+
+static int try_to_run_foreground_daemon(int detach_console)
+{
+ /*
+ * Technically, we don't need to probe for an existing daemon
+ * process, since we could just call `fsmonitor_run_daemon()`
+ * and let it fail if the pipe/socket is busy.
+ *
+ * However, this method gives us a nicer error message for a
+ * common error case.
+ */
+ if (fsmonitor_ipc__get_state() == IPC_STATE__LISTENING)
+ die(_("fsmonitor--daemon is already running '%s'"),
+ the_repository->worktree);
+
+ if (fsmonitor__announce_startup) {
+ fprintf(stderr, _("running fsmonitor-daemon in '%s'\n"),
+ the_repository->worktree);
+ fflush(stderr);
+ }
+
+#ifdef GIT_WINDOWS_NATIVE
+ if (detach_console)
+ FreeConsole();
+#endif
+
+ return !!fsmonitor_run_daemon();
+}
+
+static start_bg_wait_cb bg_wait_cb;
+
+static int bg_wait_cb(const struct child_process *cp, void *cb_data)
+{
+ enum ipc_active_state s = fsmonitor_ipc__get_state();
+
+ switch (s) {
+ case IPC_STATE__LISTENING:
+ /* child is "ready" */
+ return 0;
+
+ case IPC_STATE__NOT_LISTENING:
+ case IPC_STATE__PATH_NOT_FOUND:
+ /* give child more time */
+ return 1;
+
+ default:
+ case IPC_STATE__INVALID_PATH:
+ case IPC_STATE__OTHER_ERROR:
+ /* all the time in world won't help */
+ return -1;
+ }
+}
+
+static int try_to_start_background_daemon(void)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+ enum start_bg_result sbgr;
+
+ /*
+ * Before we try to create a background daemon process, see
+ * if a daemon process is already listening. This makes it
+ * easier for us to report an already-listening error to the
+ * console, since our spawn/daemon can only report the success
+ * of creating the background process (and not whether it
+ * immediately exited).
+ */
+ if (fsmonitor_ipc__get_state() == IPC_STATE__LISTENING)
+ die(_("fsmonitor--daemon is already running '%s'"),
+ the_repository->worktree);
+
+ if (fsmonitor__announce_startup) {
+ fprintf(stderr, _("starting fsmonitor-daemon in '%s'\n"),
+ the_repository->worktree);
+ fflush(stderr);
+ }
+
+ cp.git_cmd = 1;
+
+ strvec_push(&cp.args, "fsmonitor--daemon");
+ strvec_push(&cp.args, "run");
+ strvec_push(&cp.args, "--detach");
+ strvec_pushf(&cp.args, "--ipc-threads=%d", fsmonitor__ipc_threads);
+
+ cp.no_stdin = 1;
+ cp.no_stdout = 1;
+ cp.no_stderr = 1;
+
+ sbgr = start_bg_command(&cp, bg_wait_cb, NULL,
+ fsmonitor__start_timeout_sec);
+
+ switch (sbgr) {
+ case SBGR_READY:
+ return 0;
+
+ default:
+ case SBGR_ERROR:
+ case SBGR_CB_ERROR:
+ return error(_("daemon failed to start"));
+
+ case SBGR_TIMEOUT:
+ return error(_("daemon not online yet"));
+
+ case SBGR_DIED:
+ return error(_("daemon terminated"));
+ }
+}
+
+int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix)
+{
+ const char *subcmd;
+ int detach_console = 0;
+
+ struct option options[] = {
+ OPT_BOOL(0, "detach", &detach_console, N_("detach from console")),
+ OPT_INTEGER(0, "ipc-threads",
+ &fsmonitor__ipc_threads,
+ N_("use <n> ipc worker threads")),
+ OPT_INTEGER(0, "start-timeout",
+ &fsmonitor__start_timeout_sec,
+ N_("max seconds to wait for background daemon startup")),
+
+ OPT_END()
+ };
+
+ git_config(fsmonitor_config, NULL);
+
+ argc = parse_options(argc, argv, prefix, options,
+ builtin_fsmonitor__daemon_usage, 0);
+ if (argc != 1)
+ usage_with_options(builtin_fsmonitor__daemon_usage, options);
+ subcmd = argv[0];
+
+ if (fsmonitor__ipc_threads < 1)
+ die(_("invalid 'ipc-threads' value (%d)"),
+ fsmonitor__ipc_threads);
+
+ if (!strcmp(subcmd, "start"))
+ return !!try_to_start_background_daemon();
+
+ if (!strcmp(subcmd, "run"))
+ return !!try_to_run_foreground_daemon(detach_console);
+
+ if (!strcmp(subcmd, "stop"))
+ return !!do_as_client__send_stop();
+
+ if (!strcmp(subcmd, "status"))
+ return !!do_as_client__status();
+
+ die(_("Unhandled subcommand '%s'"), subcmd);
+}
+
+#else
+int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix)
+{
+ struct option options[] = {
+ OPT_END()
+ };
+
+ if (argc == 2 && !strcmp(argv[1], "-h"))
+ usage_with_options(builtin_fsmonitor__daemon_usage, options);
+
+ die(_("fsmonitor--daemon not supported on this platform"));
+}
+#endif
diff --git a/builtin/gc.c b/builtin/gc.c
index 6b3de3d..4ea7008 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -30,8 +30,8 @@
#include "promisor-remote.h"
#include "refs.h"
#include "remote.h"
-#include "object-store.h"
#include "exec-cmd.h"
+#include "hook.h"
#define FAILED_RUN "failed to run %s"
@@ -42,6 +42,7 @@ static const char * const builtin_gc_usage[] = {
static int pack_refs = 1;
static int prune_reflogs = 1;
+static int cruft_packs = 0;
static int aggressive_depth = 50;
static int aggressive_window = 250;
static int gc_auto_threshold = 6700;
@@ -152,6 +153,7 @@ static void gc_config(void)
git_config_get_int("gc.auto", &gc_auto_threshold);
git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit);
git_config_get_bool("gc.autodetach", &detach_auto);
+ git_config_get_bool("gc.cruftpacks", &cruft_packs);
git_config_get_expiry("gc.pruneexpire", &prune_expire);
git_config_get_expiry("gc.worktreepruneexpire", &prune_worktrees_expire);
git_config_get_expiry("gc.logexpiry", &gc_log_expire);
@@ -331,7 +333,11 @@ static void add_repack_all_option(struct string_list *keep_pack)
{
if (prune_expire && !strcmp(prune_expire, "now"))
strvec_push(&repack, "-a");
- else {
+ else if (cruft_packs) {
+ strvec_push(&repack, "--cruft");
+ if (prune_expire)
+ strvec_pushf(&repack, "--cruft-expiration=%s", prune_expire);
+ } else {
strvec_push(&repack, "-A");
if (prune_expire)
strvec_pushf(&repack, "--unpack-unreachable=%s", prune_expire);
@@ -394,7 +400,7 @@ static int need_to_gc(void)
else
return 0;
- if (run_hook_le(NULL, "pre-auto-gc", NULL))
+ if (run_hooks("pre-auto-gc"))
return 0;
return 1;
}
@@ -446,7 +452,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
fscanf(fp, scan_fmt, &pid, locking_host) == 2 &&
/* be gentle to concurrent "gc" on remote hosts */
(strcmp(locking_host, my_host) || !kill(pid, 0) || errno == EPERM);
- if (fp != NULL)
+ if (fp)
fclose(fp);
if (should_exit) {
if (fd >= 0)
@@ -470,7 +476,8 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
/*
* Returns 0 if there was no previous error and gc can proceed, 1 if
* gc should not proceed due to an error in the last run. Prints a
- * message and returns -1 if an error occurred while reading gc.log
+ * message and returns with a non-[01] status code if an error occurred
+ * while reading gc.log
*/
static int report_last_gc_error(void)
{
@@ -484,7 +491,7 @@ static int report_last_gc_error(void)
if (errno == ENOENT)
goto done;
- ret = error_errno(_("cannot stat '%s'"), gc_log_path);
+ ret = die_message_errno(_("cannot stat '%s'"), gc_log_path);
goto done;
}
@@ -493,7 +500,7 @@ static int report_last_gc_error(void)
len = strbuf_read_file(&sb, gc_log_path, 0);
if (len < 0)
- ret = error_errno(_("cannot read '%s'"), gc_log_path);
+ ret = die_message_errno(_("cannot read '%s'"), gc_log_path);
else if (len > 0) {
/*
* A previous gc failed. Report the error, and don't
@@ -550,6 +557,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
{ OPTION_STRING, 0, "prune", &prune_expire, N_("date"),
N_("prune unreferenced objects"),
PARSE_OPT_OPTARG, NULL, (intptr_t)prune_expire },
+ OPT_BOOL(0, "cruft", &cruft_packs, N_("pack unreferenced objects separately")),
OPT_BOOL(0, "aggressive", &aggressive, N_("be more thorough (increased runtime)")),
OPT_BOOL_F(0, "auto", &auto_gc, N_("enable auto-gc mode"),
PARSE_OPT_NOCOMPLETE),
@@ -611,12 +619,13 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
}
if (detach_auto) {
int ret = report_last_gc_error();
- if (ret < 0)
- /* an I/O error occurred, already reported */
- exit(128);
+
if (ret == 1)
/* Last gc --auto failed. Skip this one. */
return 0;
+ else if (ret)
+ /* an I/O error occurred, already reported */
+ return ret;
if (lock_repo_for_gc(force, &pid))
return 0;
@@ -668,6 +677,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
die(FAILED_RUN, repack.v[0]);
if (prune_expire) {
+ /* run `git prune` even if using cruft packs */
strvec_push(&prune, prune_expire);
if (quiet)
strvec_push(&prune, "--no-progress");
@@ -1049,12 +1059,11 @@ static int maintenance_task_loose_objects(struct maintenance_run_opts *opts)
static int incremental_repack_auto_condition(void)
{
struct packed_git *p;
- int enabled;
int incremental_repack_auto_limit = 10;
int count = 0;
- if (git_config_get_bool("core.multiPackIndex", &enabled) ||
- !enabled)
+ prepare_repo_settings(the_repository);
+ if (!the_repository->settings.core_multi_pack_index)
return 0;
git_config_get_int("maintenance.incremental-repack.auto",
@@ -2000,15 +2009,11 @@ static int schtasks_update_schedule(int run_maintenance, int fd)
return schtasks_remove_tasks();
}
-static int is_crontab_available(void)
+MAYBE_UNUSED
+static int check_crontab_process(const char *cmd)
{
- const char *cmd = "crontab";
- int is_available;
struct child_process child = CHILD_PROCESS_INIT;
- if (get_schedule_cmd(&cmd, &is_available))
- return is_available;
-
strvec_split(&child.args, cmd);
strvec_push(&child.args, "-l");
child.no_stdin = 1;
@@ -2023,6 +2028,25 @@ static int is_crontab_available(void)
return 1;
}
+static int is_crontab_available(void)
+{
+ const char *cmd = "crontab";
+ int is_available;
+
+ if (get_schedule_cmd(&cmd, &is_available))
+ return is_available;
+
+#ifdef __APPLE__
+ /*
+ * macOS has cron, but it requires special permissions and will
+ * create a UI alert when attempting to run this command.
+ */
+ return 0;
+#else
+ return check_crontab_process(cmd);
+#endif
+}
+
#define BEGIN_LINE "# BEGIN GIT MAINTENANCE SCHEDULE"
#define END_LINE "# END GIT MAINTENANCE SCHEDULE"
@@ -2222,7 +2246,7 @@ static int systemd_timer_write_unit_templates(const char *exec_path)
goto error;
}
file = fopen_or_warn(filename, "w");
- if (file == NULL)
+ if (!file)
goto error;
unit = "# This file was created and is maintained by Git.\n"
@@ -2251,7 +2275,7 @@ static int systemd_timer_write_unit_templates(const char *exec_path)
filename = xdg_config_home_systemd("git-maintenance@.service");
file = fopen_or_warn(filename, "w");
- if (file == NULL)
+ if (!file)
goto error;
unit = "# This file was created and is maintained by Git.\n"
diff --git a/builtin/grep.c b/builtin/grep.c
index 8af5249..bcb07ea 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -26,6 +26,8 @@
#include "object-store.h"
#include "packfile.h"
+static const char *grep_prefix;
+
static char const * const grep_usage[] = {
N_("git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"),
NULL
@@ -199,8 +201,8 @@ static void *run(void *arg)
grep_source_clear_data(&w->source);
work_done(w);
}
- free_grep_patterns(arg);
- free(arg);
+ free_grep_patterns(opt);
+ free(opt);
return (void*) (intptr_t) hit;
}
@@ -284,7 +286,7 @@ static int wait_all(void)
static int grep_cmd_config(const char *var, const char *value, void *cb)
{
int st = grep_config(var, value, cb);
- if (git_color_default_config(var, value, cb) < 0)
+ if (git_color_default_config(var, value, NULL) < 0)
st = -1;
if (!strcmp(var, "grep.threads")) {
@@ -315,11 +317,11 @@ static void grep_source_name(struct grep_opt *opt, const char *filename,
strbuf_reset(out);
if (opt->null_following_name) {
- if (opt->relative && opt->prefix_length) {
+ if (opt->relative && grep_prefix) {
struct strbuf rel_buf = STRBUF_INIT;
const char *rel_name =
relative_path(filename + tree_name_len,
- opt->prefix, &rel_buf);
+ grep_prefix, &rel_buf);
if (tree_name_len)
strbuf_add(out, filename, tree_name_len);
@@ -332,8 +334,8 @@ static void grep_source_name(struct grep_opt *opt, const char *filename,
return;
}
- if (opt->relative && opt->prefix_length)
- quote_path(filename + tree_name_len, opt->prefix, out, 0);
+ if (opt->relative && grep_prefix)
+ quote_path(filename + tree_name_len, grep_prefix, out, 0);
else
quote_c_style(filename + tree_name_len, out, NULL, 0);
@@ -401,7 +403,7 @@ static void append_path(struct grep_opt *opt, const void *data, size_t len)
if (len == 1 && *(const char *)data == '\0')
return;
- string_list_append(path_list, xstrndup(data, len));
+ string_list_append_nodup(path_list, xstrndup(data, len));
}
static void run_pager(struct grep_opt *opt, const char *prefix)
@@ -482,7 +484,7 @@ static int grep_submodule(struct grep_opt *opt,
object_type = oid_object_info(subrepo, oid, NULL);
obj_read_unlock();
data = read_object_with_reference(subrepo,
- oid, tree_type,
+ oid, OBJ_TREE,
&size, NULL);
if (!data)
die(_("unable to read tree (%s)"), oid_to_hex(oid));
@@ -651,7 +653,7 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
int hit, len;
data = read_object_with_reference(opt->repo,
- &obj->oid, tree_type,
+ &obj->oid, OBJ_TREE,
&size, NULL);
if (!data)
die(_("unable to read tree (%s)"), oid_to_hex(&obj->oid));
@@ -839,11 +841,10 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
struct grep_opt opt;
struct object_array list = OBJECT_ARRAY_INIT;
struct pathspec pathspec;
- struct string_list path_list = STRING_LIST_INIT_NODUP;
+ struct string_list path_list = STRING_LIST_INIT_DUP;
int i;
int dummy;
int use_index = 1;
- int pattern_type_arg = GREP_PATTERN_TYPE_UNSPECIFIED;
int allow_revs;
struct option options[] = {
@@ -877,16 +878,16 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
N_("descend at most <depth> levels"), PARSE_OPT_NONEG,
NULL, 1 },
OPT_GROUP(""),
- OPT_SET_INT('E', "extended-regexp", &pattern_type_arg,
+ OPT_SET_INT('E', "extended-regexp", &opt.pattern_type_option,
N_("use extended POSIX regular expressions"),
GREP_PATTERN_TYPE_ERE),
- OPT_SET_INT('G', "basic-regexp", &pattern_type_arg,
+ OPT_SET_INT('G', "basic-regexp", &opt.pattern_type_option,
N_("use basic POSIX regular expressions (default)"),
GREP_PATTERN_TYPE_BRE),
- OPT_SET_INT('F', "fixed-strings", &pattern_type_arg,
+ OPT_SET_INT('F', "fixed-strings", &opt.pattern_type_option,
N_("interpret patterns as fixed strings"),
GREP_PATTERN_TYPE_FIXED),
- OPT_SET_INT('P', "perl-regexp", &pattern_type_arg,
+ OPT_SET_INT('P', "perl-regexp", &opt.pattern_type_option,
N_("use Perl-compatible regular expressions"),
GREP_PATTERN_TYPE_PCRE),
OPT_GROUP(""),
@@ -962,9 +963,10 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
PARSE_OPT_NOCOMPLETE),
OPT_END()
};
+ grep_prefix = prefix;
- git_config(grep_cmd_config, NULL);
- grep_init(&opt, the_repository, prefix);
+ grep_init(&opt, the_repository);
+ git_config(grep_cmd_config, &opt);
/*
* If there is no -- then the paths must exist in the working
@@ -979,7 +981,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, grep_usage,
PARSE_OPT_KEEP_DASHDASH |
PARSE_OPT_STOP_AT_NON_OPTION);
- grep_commit_pattern_type(pattern_type_arg, &opt);
if (use_index && !startup_info->have_repository) {
int fallback = 0;
@@ -1159,19 +1160,17 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
strbuf_addf(&buf, "+/%s%s",
strcmp("less", pager) ? "" : "*",
opt.pattern_list->pattern);
- string_list_append(&path_list,
- strbuf_detach(&buf, NULL));
+ string_list_append_nodup(&path_list,
+ strbuf_detach(&buf, NULL));
}
}
if (!show_in_pager && !opt.status_only)
setup_pager();
- if (!use_index && (untracked || cached))
- die(_("--cached or --untracked cannot be used with --no-index"));
-
- if (untracked && cached)
- die(_("--untracked cannot be used with --cached"));
+ die_for_incompatible_opt3(!use_index, "--no-index",
+ untracked, "--untracked",
+ cached, "--cached");
if (!use_index || untracked) {
int use_exclude = (opt_exclude < 0) ? use_index : !!opt_exclude;
@@ -1195,7 +1194,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
if (hit && show_in_pager)
run_pager(&opt, prefix);
clear_pathspec(&pathspec);
+ string_list_clear(&path_list, 0);
free_grep_patterns(&opt);
+ object_array_clear(&list);
free_repos();
return !hit;
}
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index c7b3ad7..fbae878 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -25,7 +25,7 @@ static int hash_literally(struct object_id *oid, int fd, const char *type, unsig
if (strbuf_read(&buf, fd, 4096) < 0)
ret = -1;
else
- ret = hash_object_file_literally(buf.buf, buf.len, type, oid,
+ ret = write_object_file_literally(buf.buf, buf.len, type, oid,
flags);
strbuf_release(&buf);
return ret;
@@ -81,7 +81,7 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
{
static const char * const hash_object_usage[] = {
N_("git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] [--] <file>..."),
- N_("git hash-object --stdin-paths"),
+ "git hash-object --stdin-paths",
NULL
};
const char *type = blob_type;
@@ -92,6 +92,7 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
int nongit = 0;
unsigned flags = HASH_FORMAT_CHECK;
const char *vpath = NULL;
+ char *vpath_free = NULL;
const struct option hash_object_options[] = {
OPT_STRING('t', NULL, &type, N_("type"), N_("object type")),
OPT_BIT('w', NULL, &flags, N_("write the object into the object database"),
@@ -114,8 +115,10 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
else
prefix = setup_git_directory_gently(&nongit);
- if (vpath && prefix)
- vpath = prefix_filename(prefix, vpath);
+ if (vpath && prefix) {
+ vpath_free = prefix_filename(prefix, vpath);
+ vpath = vpath_free;
+ }
git_config(git_default_config, NULL);
@@ -156,5 +159,7 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
if (stdin_paths)
hash_stdin_paths(type, no_filters, flags, literally);
+ free(vpath_free);
+
return 0;
}
diff --git a/builtin/help.c b/builtin/help.c
index 7731659..222f994 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -7,7 +7,6 @@
#include "exec-cmd.h"
#include "parse-options.h"
#include "run-command.h"
-#include "column.h"
#include "config-list.h"
#include "help.h"
#include "alias.h"
@@ -34,32 +33,57 @@ enum help_format {
HELP_FORMAT_WEB
};
-static const char *html_path;
+enum show_config_type {
+ SHOW_CONFIG_HUMAN,
+ SHOW_CONFIG_VARS,
+ SHOW_CONFIG_SECTIONS,
+};
-static int show_all = 0;
-static int show_guides = 0;
-static int show_config;
+static enum help_action {
+ HELP_ACTION_ALL = 1,
+ HELP_ACTION_GUIDES,
+ HELP_ACTION_CONFIG,
+ HELP_ACTION_CONFIG_FOR_COMPLETION,
+ HELP_ACTION_CONFIG_SECTIONS_FOR_COMPLETION,
+} cmd_mode;
+
+static const char *html_path;
static int verbose = 1;
-static unsigned int colopts;
static enum help_format help_format = HELP_FORMAT_NONE;
static int exclude_guides;
+static int show_external_commands = -1;
+static int show_aliases = -1;
static struct option builtin_help_options[] = {
- OPT_BOOL('a', "all", &show_all, N_("print all available commands")),
+ OPT_CMDMODE('a', "all", &cmd_mode, N_("print all available commands"),
+ HELP_ACTION_ALL),
+ OPT_BOOL(0, "external-commands", &show_external_commands,
+ N_("show external commands in --all")),
+ OPT_BOOL(0, "aliases", &show_aliases, N_("show aliases in --all")),
OPT_HIDDEN_BOOL(0, "exclude-guides", &exclude_guides, N_("exclude guides")),
- OPT_BOOL('g', "guides", &show_guides, N_("print list of useful guides")),
- OPT_BOOL('c', "config", &show_config, N_("print all configuration variable names")),
- OPT_SET_INT_F(0, "config-for-completion", &show_config, "", 2, PARSE_OPT_HIDDEN),
OPT_SET_INT('m', "man", &help_format, N_("show man page"), HELP_FORMAT_MAN),
OPT_SET_INT('w', "web", &help_format, N_("show manual in web browser"),
HELP_FORMAT_WEB),
OPT_SET_INT('i', "info", &help_format, N_("show info page"),
HELP_FORMAT_INFO),
OPT__VERBOSE(&verbose, N_("print command description")),
+
+ OPT_CMDMODE('g', "guides", &cmd_mode, N_("print list of useful guides"),
+ HELP_ACTION_GUIDES),
+ OPT_CMDMODE('c', "config", &cmd_mode, N_("print all configuration variable names"),
+ HELP_ACTION_CONFIG),
+ OPT_CMDMODE_F(0, "config-for-completion", &cmd_mode, "",
+ HELP_ACTION_CONFIG_FOR_COMPLETION, PARSE_OPT_HIDDEN),
+ OPT_CMDMODE_F(0, "config-sections-for-completion", &cmd_mode, "",
+ HELP_ACTION_CONFIG_SECTIONS_FOR_COMPLETION, PARSE_OPT_HIDDEN),
+
OPT_END(),
};
static const char * const builtin_help_usage[] = {
- N_("git help [--all] [--guides] [--man | --web | --info] [<command>]"),
+ "git help [-a|--all] [--[no-]verbose]] [--[no-]external-commands] [--[no-]aliases]",
+ N_("git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"),
+ "git help [-g|--guides]",
+ "git help [-c|--config]",
NULL
};
@@ -70,7 +94,7 @@ struct slot_expansion {
int found;
};
-static void list_config_help(int for_human)
+static void list_config_help(enum show_config_type type)
{
struct slot_expansion slot_expansions[] = {
{ "advice", "*", list_config_advices },
@@ -88,6 +112,8 @@ static void list_config_help(int for_human)
const char **p;
struct slot_expansion *e;
struct string_list keys = STRING_LIST_INIT_DUP;
+ struct string_list keys_uniq = STRING_LIST_INIT_DUP;
+ struct string_list_item *item;
int i;
for (p = config_name_list; *p; p++) {
@@ -118,34 +144,46 @@ static void list_config_help(int for_human)
for (i = 0; i < keys.nr; i++) {
const char *var = keys.items[i].string;
const char *wildcard, *tag, *cut;
+ const char *dot = NULL;
+ struct strbuf sb = STRBUF_INIT;
- if (for_human) {
+ switch (type) {
+ case SHOW_CONFIG_HUMAN:
puts(var);
continue;
+ case SHOW_CONFIG_SECTIONS:
+ dot = strchr(var, '.');
+ break;
+ case SHOW_CONFIG_VARS:
+ break;
}
-
wildcard = strchr(var, '*');
tag = strchr(var, '<');
- if (!wildcard && !tag) {
- puts(var);
+ if (!dot && !wildcard && !tag) {
+ string_list_append(&keys_uniq, var);
continue;
}
- if (wildcard && !tag)
+ if (dot)
+ cut = dot;
+ else 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);
+ strbuf_add(&sb, var, cut - var);
+ string_list_append(&keys_uniq, sb.buf);
+ strbuf_release(&sb);
+
}
string_list_clear(&keys, 0);
+ string_list_remove_duplicates(&keys_uniq, 0);
+ for_each_string_list_item(item, &keys_uniq)
+ puts(item->string);
+ string_list_clear(&keys_uniq, 0);
}
static enum help_format parse_help_format(const char *format)
@@ -179,11 +217,10 @@ static int check_emacsclient_version(void)
{
struct strbuf buffer = STRBUF_INIT;
struct child_process ec_process = CHILD_PROCESS_INIT;
- const char *argv_ec[] = { "emacsclient", "--version", NULL };
int version;
/* emacsclient prints its version number on stderr */
- ec_process.argv = argv_ec;
+ strvec_pushl(&ec_process.args, "emacsclient", "--version", NULL);
ec_process.err = -1;
ec_process.stdout_to_stderr = 1;
if (start_command(&ec_process))
@@ -349,8 +386,6 @@ static int add_man_viewer_info(const char *var, const char *value)
static int git_help_config(const char *var, const char *value, void *cb)
{
- if (starts_with(var, "column."))
- return git_column_config(var, value, "help", &colopts);
if (!strcmp(var, "help.format")) {
if (!value)
return config_error_nonbool(var);
@@ -544,6 +579,42 @@ static const char *check_git_cmd(const char* cmd)
return cmd;
}
+static void no_help_format(const char *opt_mode, enum help_format fmt)
+{
+ const char *opt_fmt;
+
+ switch (fmt) {
+ case HELP_FORMAT_NONE:
+ return;
+ case HELP_FORMAT_MAN:
+ opt_fmt = "--man";
+ break;
+ case HELP_FORMAT_INFO:
+ opt_fmt = "--info";
+ break;
+ case HELP_FORMAT_WEB:
+ opt_fmt = "--web";
+ break;
+ default:
+ BUG("unreachable");
+ }
+
+ usage_msg_optf(_("options '%s' and '%s' cannot be used together"),
+ builtin_help_usage, builtin_help_options, opt_mode,
+ opt_fmt);
+}
+
+static void opt_mode_usage(int argc, const char *opt_mode,
+ enum help_format fmt)
+{
+ if (argc)
+ usage_msg_optf(_("the '%s' option doesn't take any non-option arguments"),
+ builtin_help_usage, builtin_help_options,
+ opt_mode);
+
+ no_help_format(opt_mode, fmt);
+}
+
int cmd_help(int argc, const char **argv, const char *prefix)
{
int nongit;
@@ -554,39 +625,45 @@ int cmd_help(int argc, const char **argv, const char *prefix)
builtin_help_usage, 0);
parsed_help_format = help_format;
- if (show_all) {
- git_config(git_help_config, NULL);
+ if (cmd_mode != HELP_ACTION_ALL &&
+ (show_external_commands >= 0 ||
+ show_aliases >= 0))
+ usage_msg_opt(_("the '--no-[external-commands|aliases]' options can only be used with '--all'"),
+ builtin_help_usage, builtin_help_options);
+
+ switch (cmd_mode) {
+ case HELP_ACTION_ALL:
+ opt_mode_usage(argc, "--all", help_format);
if (verbose) {
setup_pager();
- list_all_cmds_help();
+ list_all_cmds_help(show_external_commands,
+ show_aliases);
return 0;
}
printf(_("usage: %s%s"), _(git_usage_string), "\n\n");
load_command_list("git-", &main_cmds, &other_cmds);
- list_commands(colopts, &main_cmds, &other_cmds);
- }
-
- if (show_config) {
- int for_human = show_config == 1;
-
- if (!for_human) {
- list_config_help(for_human);
- return 0;
- }
- setup_pager();
- list_config_help(for_human);
- printf("\n%s\n", _("'git help config' for more information"));
- return 0;
- }
-
- if (show_guides)
- list_guides_help();
-
- if (show_all || show_guides) {
+ list_commands(&main_cmds, &other_cmds);
printf("%s\n", _(git_more_info_string));
- /*
- * We're done. Ignore any remaining args
- */
+ break;
+ case HELP_ACTION_GUIDES:
+ opt_mode_usage(argc, "--guides", help_format);
+ list_guides_help();
+ printf("%s\n", _(git_more_info_string));
+ return 0;
+ case HELP_ACTION_CONFIG_FOR_COMPLETION:
+ opt_mode_usage(argc, "--config-for-completion", help_format);
+ list_config_help(SHOW_CONFIG_VARS);
+ return 0;
+ case HELP_ACTION_CONFIG_SECTIONS_FOR_COMPLETION:
+ opt_mode_usage(argc, "--config-sections-for-completion",
+ help_format);
+ list_config_help(SHOW_CONFIG_SECTIONS);
+ return 0;
+ case HELP_ACTION_CONFIG:
+ opt_mode_usage(argc, "--config", help_format);
+ setup_pager();
+ list_config_help(SHOW_CONFIG_HUMAN);
+ printf("\n%s\n", _("'git help config' for more information"));
return 0;
}
diff --git a/builtin/hook.c b/builtin/hook.c
new file mode 100644
index 0000000..54e5c6e
--- /dev/null
+++ b/builtin/hook.c
@@ -0,0 +1,84 @@
+#include "cache.h"
+#include "builtin.h"
+#include "config.h"
+#include "hook.h"
+#include "parse-options.h"
+#include "strbuf.h"
+#include "strvec.h"
+
+#define BUILTIN_HOOK_RUN_USAGE \
+ N_("git hook run [--ignore-missing] <hook-name> [-- <hook-args>]")
+
+static const char * const builtin_hook_usage[] = {
+ BUILTIN_HOOK_RUN_USAGE,
+ NULL
+};
+
+static const char * const builtin_hook_run_usage[] = {
+ BUILTIN_HOOK_RUN_USAGE,
+ NULL
+};
+
+static int run(int argc, const char **argv, const char *prefix)
+{
+ int i;
+ struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+ int ignore_missing = 0;
+ const char *hook_name;
+ struct option run_options[] = {
+ OPT_BOOL(0, "ignore-missing", &ignore_missing,
+ N_("silently ignore missing requested <hook-name>")),
+ OPT_END(),
+ };
+ int ret;
+
+ argc = parse_options(argc, argv, prefix, run_options,
+ builtin_hook_run_usage,
+ PARSE_OPT_KEEP_DASHDASH);
+
+ if (!argc)
+ goto usage;
+
+ /*
+ * Having a -- for "run" when providing <hook-args> is
+ * mandatory.
+ */
+ if (argc > 1 && strcmp(argv[1], "--") &&
+ strcmp(argv[1], "--end-of-options"))
+ goto usage;
+
+ /* Add our arguments, start after -- */
+ for (i = 2 ; i < argc; i++)
+ strvec_push(&opt.args, argv[i]);
+
+ /* Need to take into account core.hooksPath */
+ git_config(git_default_config, NULL);
+
+ hook_name = argv[0];
+ if (!ignore_missing)
+ opt.error_if_missing = 1;
+ ret = run_hooks_opt(hook_name, &opt);
+ if (ret < 0) /* error() return */
+ ret = 1;
+ return ret;
+usage:
+ usage_with_options(builtin_hook_run_usage, run_options);
+}
+
+int cmd_hook(int argc, const char **argv, const char *prefix)
+{
+ struct option builtin_hook_options[] = {
+ OPT_END(),
+ };
+
+ argc = parse_options(argc, argv, NULL, builtin_hook_options,
+ builtin_hook_usage, PARSE_OPT_STOP_AT_NON_OPTION);
+ if (!argc)
+ goto usage;
+
+ if (!strcmp(argv[0], "run"))
+ return run(argc, argv, prefix);
+
+usage:
+ usage_with_options(builtin_hook_usage, builtin_hook_options);
+}
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 7ce69c0..3e385b4 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -323,8 +323,12 @@ static void use(int bytes)
if (signed_add_overflows(consumed_bytes, bytes))
die(_("pack too large for current definition of off_t"));
consumed_bytes += bytes;
- if (max_input_size && consumed_bytes > max_input_size)
- die(_("pack exceeds maximum allowed size"));
+ if (max_input_size && consumed_bytes > max_input_size) {
+ struct strbuf size_limit = STRBUF_INIT;
+ strbuf_humanise_bytes(&size_limit, max_input_size);
+ die(_("pack exceeds maximum allowed size (%s)"),
+ size_limit.buf);
+ }
}
static const char *open_pack_file(const char *pack_name)
@@ -449,8 +453,7 @@ static void *unpack_entry_data(off_t offset, unsigned long size,
int hdrlen;
if (!is_delta_type(type)) {
- hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX,
- type_name(type),(uintmax_t)size) + 1;
+ hdrlen = format_object_header(hdr, sizeof(hdr), type, size);
the_hash_algo->init_fn(&c);
the_hash_algo->update_fn(&c, hdr, hdrlen);
} else
@@ -579,7 +582,7 @@ static void *unpack_data(struct object_entry *obj,
if (!n)
die(Q_("premature end of pack file, %"PRIuMAX" byte missing",
"premature end of pack file, %"PRIuMAX" bytes missing",
- (unsigned int)len),
+ len),
(uintmax_t)len);
from += n;
len -= n;
@@ -971,7 +974,7 @@ static struct base_data *resolve_delta(struct object_entry *delta_obj,
if (!result_data)
bad_object(delta_obj->idx.offset, _("failed to apply delta"));
hash_object_file(the_hash_algo, result_data, result_size,
- type_name(delta_obj->real_type), &delta_obj->idx.oid);
+ delta_obj->real_type, &delta_obj->idx.oid);
sha1_object(result_data, NULL, result_size, delta_obj->real_type,
&delta_obj->idx.oid);
@@ -1109,6 +1112,7 @@ static void *threaded_second_pass(void *data)
list_add(&child->list, &work_head);
base_cache_used += child->size;
prune_base_data(NULL);
+ free_base_data(child);
} else {
/*
* This child does not have its own children. It may be
@@ -1131,6 +1135,7 @@ static void *threaded_second_pass(void *data)
p = next_p;
}
+ FREE_AND_NULL(child);
}
work_unlock();
}
@@ -1286,7 +1291,7 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha
nr_objects - nr_objects_initial);
stop_progress_msg(&progress, msg.buf);
strbuf_release(&msg);
- finalize_hashfile(f, tail_hash, 0);
+ finalize_hashfile(f, tail_hash, FSYNC_COMPONENT_PACK, 0);
hashcpy(read_hash, pack_hash);
fixup_pack_header_footer(output_fd, pack_hash,
curr_pack, nr_objects,
@@ -1413,9 +1418,8 @@ static void fix_unresolved_deltas(struct hashfile *f)
if (!data)
continue;
- if (check_object_signature(the_repository, &d->oid,
- data, size,
- type_name(type)))
+ if (check_object_signature(the_repository, &d->oid, data, size,
+ type) < 0)
die(_("local object %s is corrupt"), oid_to_hex(&d->oid));
/*
@@ -1424,6 +1428,7 @@ static void fix_unresolved_deltas(struct hashfile *f)
* object).
*/
append_obj_to_pack(f, d->oid.hash, data, size, type);
+ free(data);
threaded_second_pass(NULL);
display_progress(progress, nr_resolved_deltas);
@@ -1486,7 +1491,7 @@ static void rename_tmp_packfile(const char **final_name,
if (!*final_name)
*final_name = odb_pack_name(name, hash, ext);
if (finalize_object_file(curr_name, *final_name))
- die(_("unable to rename temporary '*.%s' file to '%s"),
+ die(_("unable to rename temporary '*.%s' file to '%s'"),
ext, *final_name);
} else if (make_read_only_if_same) {
chmod(*final_name, 0444);
@@ -1508,7 +1513,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
if (!from_stdin) {
close(input_fd);
} else {
- fsync_or_die(output_fd, curr_pack_name);
+ fsync_component_or_die(FSYNC_COMPONENT_PACK, output_fd, curr_pack_name);
err = close(output_fd);
if (err)
die_errno(_("error while closing pack file"));
@@ -1703,6 +1708,7 @@ static void show_pack_info(int stat_only)
i + 1,
chain_histogram[i]);
}
+ free(chain_histogram);
}
int cmd_index_pack(int argc, const char **argv, const char *prefix)
@@ -1845,11 +1851,11 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
if (!pack_name && !from_stdin)
usage(index_pack_usage);
if (fix_thin_pack && !from_stdin)
- die(_("--fix-thin cannot be used without --stdin"));
+ die(_("the option '%s' requires '%s'"), "--fix-thin", "--stdin");
if (from_stdin && !startup_info->have_repository)
die(_("--stdin requires a git repository"));
if (from_stdin && hash_algo)
- die(_("--object-format cannot be used with --stdin"));
+ die(_("options '%s' and '%s' cannot be used together"), "--object-format", "--stdin");
if (!index_name && pack_name)
index_name = derive_filename(pack_name, "pack", "idx", &index_name_buf);
@@ -1932,14 +1938,15 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
if (do_fsck_object && fsck_finish(&fsck_options))
die(_("fsck error in pack objects"));
+ free(opts.anomaly);
free(objects);
strbuf_release(&index_name_buf);
strbuf_release(&rev_index_name_buf);
- if (pack_name == NULL)
+ if (!pack_name)
free((void *) curr_pack);
- if (index_name == NULL)
+ if (!index_name)
free((void *) curr_index);
- if (rev_index_name == NULL)
+ if (!rev_index_name)
free((void *) curr_rev_index);
/*
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 2167796..546f9c5 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -557,7 +557,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, init_db_options, init_db_usage, 0);
if (real_git_dir && is_bare_repository_cfg == 1)
- die(_("--separate-git-dir and --bare are mutually exclusive"));
+ die(_("options '%s' and '%s' cannot be used together"), "--separate-git-dir", "--bare");
if (real_git_dir && !is_absolute_path(real_git_dir))
real_git_dir = real_pathdup(real_git_dir, 1);
diff --git a/builtin/log.c b/builtin/log.c
index f75d87e..88a5e98 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -35,6 +35,7 @@
#include "repository.h"
#include "commit-reach.h"
#include "range-diff.h"
+#include "tmp-objdir.h"
#define MAIL_DEFAULT_WRAP 72
#define COVER_FROM_AUTO_MAX_SUBJECT_LEN 100
@@ -230,7 +231,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
}
if (mailmap) {
- rev->mailmap = xcalloc(1, sizeof(struct string_list));
+ rev->mailmap = xmalloc(sizeof(struct string_list));
+ string_list_init_nodup(rev->mailmap);
read_mailmap(rev->mailmap);
}
@@ -245,10 +247,24 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
rev->abbrev_commit = 0;
}
- if (rev->commit_format == CMIT_FMT_USERFORMAT && !w.decorate)
- decoration_style = 0;
+ if (rev->commit_format == CMIT_FMT_USERFORMAT) {
+ if (!w.decorate) {
+ /*
+ * Disable decoration loading if the format will not
+ * show them anyway.
+ */
+ decoration_style = 0;
+ } else if (!decoration_style) {
+ /*
+ * If we are going to show them, make sure we do load
+ * them here, but taking care not to override a
+ * specific style set by config or --decorate.
+ */
+ decoration_style = DECORATE_SHORT_REFS;
+ }
+ }
- if (decoration_style) {
+ if (decoration_style || rev->simplify_by_decoration) {
const struct string_list *config_exclude =
repo_config_get_value_multi(the_repository,
"log.excludeDecoration");
@@ -260,7 +276,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
item->string);
}
- rev->show_decorations = 1;
+ if (decoration_style)
+ rev->show_decorations = 1;
load_ref_decorations(&decoration_filter, decoration_style);
}
@@ -278,6 +295,12 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
cmd_log_init_finish(argc, argv, prefix, rev, opt);
}
+static int cmd_log_deinit(int ret, struct rev_info *rev)
+{
+ release_revisions(rev);
+ return ret;
+}
+
/*
* This gives a rough estimate for how many commits we
* will print out in the list.
@@ -401,12 +424,19 @@ static void finish_early_output(struct rev_info *rev)
show_early_header(rev, "done", n);
}
-static int cmd_log_walk(struct rev_info *rev)
+static int cmd_log_walk_no_free(struct rev_info *rev)
{
struct commit *commit;
int saved_nrl = 0;
int saved_dcctc = 0;
+ if (rev->remerge_diff) {
+ rev->remerge_objdir = tmp_objdir_create("remerge-diff");
+ if (!rev->remerge_objdir)
+ die(_("unable to create temporary object directory"));
+ tmp_objdir_replace_primary_odb(rev->remerge_objdir, 1);
+ }
+
if (rev->early_output)
setup_early_output();
@@ -421,7 +451,6 @@ static int cmd_log_walk(struct rev_info *rev)
* and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
* retain that state information if replacing rev->diffopt in this loop
*/
- rev->diffopt.no_free = 1;
while ((commit = get_revision(rev)) != NULL) {
if (!log_tree_commit(rev, commit) && rev->max_count >= 0)
/*
@@ -446,8 +475,11 @@ static int cmd_log_walk(struct rev_info *rev)
}
rev->diffopt.degraded_cc_to_c = saved_dcctc;
rev->diffopt.needed_rename_limit = saved_nrl;
- rev->diffopt.no_free = 0;
- diff_free(&rev->diffopt);
+
+ if (rev->remerge_diff) {
+ tmp_objdir_destroy(rev->remerge_objdir);
+ rev->remerge_objdir = NULL;
+ }
if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
rev->diffopt.flags.check_failed) {
@@ -456,6 +488,17 @@ static int cmd_log_walk(struct rev_info *rev)
return diff_result_code(&rev->diffopt, 0);
}
+static int cmd_log_walk(struct rev_info *rev)
+{
+ int retval;
+
+ rev->diffopt.no_free = 1;
+ retval = cmd_log_walk_no_free(rev);
+ rev->diffopt.no_free = 0;
+ diff_free(&rev->diffopt);
+ return retval;
+}
+
static int git_log_config(const char *var, const char *value, void *cb)
{
const char *slot_name;
@@ -505,8 +548,6 @@ static int git_log_config(const char *var, const char *value, void *cb)
return 0;
}
- if (grep_config(var, value, cb) < 0)
- return -1;
if (git_gpg_config(var, value, cb) < 0)
return -1;
return git_diff_ui_config(var, value, cb);
@@ -521,6 +562,8 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix)
git_config(git_log_config, NULL);
repo_init_revisions(the_repository, &rev, prefix);
+ git_config(grep_config, &rev.grep_filter);
+
rev.diff = 1;
rev.simplify_history = 0;
memset(&opt, 0, sizeof(opt));
@@ -529,7 +572,7 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix)
cmd_log_init(argc, argv, prefix, &rev, &opt);
if (!rev.diffopt.output_format)
rev.diffopt.output_format = DIFF_FORMAT_RAW;
- return cmd_log_walk(&rev);
+ return cmd_log_deinit(cmd_log_walk(&rev), &rev);
}
static void show_tagger(const char *buf, struct rev_info *rev)
@@ -633,8 +676,15 @@ int cmd_show(int argc, const char **argv, const char *prefix)
init_log_defaults();
git_config(git_log_config, NULL);
+ if (the_repository->gitdir) {
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+ }
+
memset(&match_all, 0, sizeof(match_all));
repo_init_revisions(the_repository, &rev, prefix);
+ git_config(grep_config, &rev.grep_filter);
+
rev.diff = 1;
rev.always_show_header = 1;
rev.no_walk = 1;
@@ -646,10 +696,11 @@ int cmd_show(int argc, const char **argv, const char *prefix)
cmd_log_init(argc, argv, prefix, &rev, &opt);
if (!rev.no_walk)
- return cmd_log_walk(&rev);
+ return cmd_log_deinit(cmd_log_walk(&rev), &rev);
count = rev.pending.nr;
objects = rev.pending.objects;
+ rev.diffopt.no_free = 1;
for (i = 0; i < count && !ret; i++) {
struct object *o = objects[i].item;
const char *name = objects[i].name;
@@ -695,14 +746,17 @@ int cmd_show(int argc, const char **argv, const char *prefix)
rev.pending.nr = rev.pending.alloc = 0;
rev.pending.objects = NULL;
add_object_array(o, name, &rev.pending);
- ret = cmd_log_walk(&rev);
+ ret = cmd_log_walk_no_free(&rev);
break;
default:
ret = error(_("unknown type: %d"), o->type);
}
}
- free(objects);
- return ret;
+
+ rev.diffopt.no_free = 0;
+ diff_free(&rev.diffopt);
+
+ return cmd_log_deinit(ret, &rev);
}
/*
@@ -718,6 +772,8 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix)
repo_init_revisions(the_repository, &rev, prefix);
init_reflog_walk(&rev.reflog_info);
+ git_config(grep_config, &rev.grep_filter);
+
rev.verbose_header = 1;
memset(&opt, 0, sizeof(opt));
opt.def = "HEAD";
@@ -728,7 +784,7 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix)
rev.always_show_header = 1;
cmd_log_init_finish(argc, argv, prefix, &rev, &opt);
- return cmd_log_walk(&rev);
+ return cmd_log_deinit(cmd_log_walk(&rev), &rev);
}
static void log_setup_revisions_tweak(struct rev_info *rev,
@@ -751,13 +807,15 @@ int cmd_log(int argc, const char **argv, const char *prefix)
git_config(git_log_config, NULL);
repo_init_revisions(the_repository, &rev, prefix);
+ git_config(grep_config, &rev.grep_filter);
+
rev.always_show_header = 1;
memset(&opt, 0, sizeof(opt));
opt.def = "HEAD";
opt.revarg_opt = REVARG_COMMITTISH;
opt.tweak = log_setup_revisions_tweak;
cmd_log_init(argc, argv, prefix, &rev, &opt);
- return cmd_log_walk(&rev);
+ return cmd_log_deinit(cmd_log_walk(&rev), &rev);
}
/* format-patch */
@@ -978,7 +1036,7 @@ static int open_next_file(struct commit *commit, const char *subject,
if (!quiet)
printf("%s\n", filename.buf + outdir_offset);
- if ((rev->diffopt.file = fopen(filename.buf, "w")) == NULL) {
+ if (!(rev->diffopt.file = fopen(filename.buf, "w"))) {
error_errno(_("cannot open patch file %s"), filename.buf);
strbuf_release(&filename);
return -1;
@@ -1712,6 +1770,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
struct commit *commit;
struct commit **list = NULL;
struct rev_info rev;
+ char *to_free = NULL;
struct setup_revision_opt s_r_opt;
int nr = 0, total, i;
int use_stdout = 0;
@@ -1833,10 +1892,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
extra_hdr.strdup_strings = 1;
extra_to.strdup_strings = 1;
extra_cc.strdup_strings = 1;
+
init_log_defaults();
init_display_notes(¬es_opt);
git_config(git_format_config, NULL);
repo_init_revisions(the_repository, &rev, prefix);
+ git_config(grep_config, &rev.grep_filter);
+
rev.show_notes = show_notes;
memcpy(&rev.notes_opt, ¬es_opt, sizeof(notes_opt));
rev.commit_format = CMIT_FMT_EMAIL;
@@ -1846,6 +1908,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
rev.diff = 1;
rev.max_parents = 1;
rev.diffopt.flags.recursive = 1;
+ rev.diffopt.no_free = 1;
rev.subject_prefix = fmt_patch_subject_prefix;
memset(&s_r_opt, 0, sizeof(s_r_opt));
s_r_opt.def = "HEAD";
@@ -1909,7 +1972,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
strbuf_addch(&buf, '\n');
}
- rev.extra_headers = strbuf_detach(&buf, NULL);
+ rev.extra_headers = to_free = strbuf_detach(&buf, NULL);
if (from) {
if (split_ident_line(&rev.from_ident, from, strlen(from)))
@@ -1928,9 +1991,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
numbered = 0;
if (numbered && keep_subject)
- die(_("-n and -k are mutually exclusive"));
+ die(_("options '%s' and '%s' cannot be used together"), "-n", "-k");
if (keep_subject && subject_prefix)
- die(_("--subject-prefix/--rfc and -k are mutually exclusive"));
+ die(_("options '%s' and '%s' cannot be used together"), "--subject-prefix/--rfc", "-k");
rev.preserve_subject = keep_subject;
argc = setup_revisions(argc, argv, &rev, &s_r_opt);
@@ -1943,6 +2006,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
die(_("--name-status does not make sense"));
if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
die(_("--check does not make sense"));
+ if (rev.remerge_diff)
+ die(_("--remerge-diff does not make sense"));
if (!use_patch_format &&
(!rev.diffopt.output_format ||
@@ -1963,18 +2028,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (rev.show_notes)
load_display_notes(&rev.notes_opt);
- if (use_stdout + rev.diffopt.close_file + !!output_directory > 1)
- die(_("--stdout, --output, and --output-directory are mutually exclusive"));
+ die_for_incompatible_opt3(use_stdout, "--stdout",
+ rev.diffopt.close_file, "--output",
+ !!output_directory, "--output-directory");
if (use_stdout) {
setup_pager();
- } else if (rev.diffopt.close_file) {
- /*
- * The diff code parsed --output; it has already opened the
- * file, but we must instruct it not to close after each diff.
- */
- rev.diffopt.no_free = 1;
- } else {
+ } else if (!rev.diffopt.close_file) {
int saved;
if (!output_directory)
@@ -2097,7 +2157,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (creation_factor < 0)
creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT;
else if (!rdiff_prev)
- die(_("--creation-factor requires --range-diff"));
+ die(_("the option '%s' requires '%s'"), "--creation-factor", "--range-diff");
if (rdiff_prev) {
if (!cover_letter && total != 1)
@@ -2133,8 +2193,10 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
prepare_bases(&bases, base, list, nr);
}
- if (in_reply_to || thread || cover_letter)
- rev.ref_message_ids = xcalloc(1, sizeof(struct string_list));
+ if (in_reply_to || thread || cover_letter) {
+ rev.ref_message_ids = xmalloc(sizeof(*rev.ref_message_ids));
+ string_list_init_nodup(rev.ref_message_ids);
+ }
if (in_reply_to) {
const char *msgid = clean_message_id(in_reply_to);
string_list_append(rev.ref_message_ids, msgid);
@@ -2241,7 +2303,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
strbuf_release(&rdiff1);
strbuf_release(&rdiff2);
strbuf_release(&rdiff_title);
- return 0;
+ free(to_free);
+ if (rev.ref_message_ids)
+ string_list_clear(rev.ref_message_ids, 0);
+ free(rev.ref_message_ids);
+ return cmd_log_deinit(0, &rev);
}
static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index a2000ed..e791b65 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -37,6 +37,7 @@ static int debug_mode;
static int show_eol;
static int recurse_submodules;
static int skipping_duplicates;
+static int show_sparse_dirs;
static const char *prefix;
static int max_prefix_len;
@@ -243,7 +244,7 @@ static void show_ce(struct repository *repo, struct dir_struct *dir,
printf("%s%06o %s %d\t",
tag,
ce->ce_mode,
- find_unique_abbrev(&ce->oid, abbrev),
+ repo_find_unique_abbrev(repo, &ce->oid, abbrev),
ce_stage(ce));
}
write_eolinfo(repo->index, ce, fullname);
@@ -315,8 +316,10 @@ static void show_files(struct repository *repo, struct dir_struct *dir)
if (!(show_cached || show_stage || show_deleted || show_modified))
return;
- /* TODO: audit for interaction with sparse-index. */
- ensure_full_index(repo->index);
+
+ if (!show_sparse_dirs)
+ ensure_full_index(repo->index);
+
for (i = 0; i < repo->index->cache_nr; i++) {
const struct cache_entry *ce = repo->index->cache[i];
struct stat st;
@@ -670,12 +673,18 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")),
OPT_BOOL(0, "deduplicate", &skipping_duplicates,
N_("suppress duplicate entries")),
+ OPT_BOOL(0, "sparse", &show_sparse_dirs,
+ N_("show sparse directories in the presence of a sparse index")),
OPT_END()
};
+ int ret = 0;
if (argc == 2 && !strcmp(argv[1], "-h"))
usage_with_options(ls_files_usage, builtin_ls_files_options);
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
prefix = cmd_prefix;
if (prefix)
prefix_len = strlen(prefix);
@@ -717,7 +726,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
setup_work_tree();
if (recurse_submodules &&
- (show_stage || show_deleted || show_others || show_unmerged ||
+ (show_deleted || show_others || show_unmerged ||
show_killed || show_modified || show_resolve_undo || with_tree))
die("ls-files --recurse-submodules unsupported mode");
@@ -766,7 +775,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
* would not make any sense with this option.
*/
if (show_stage || show_unmerged)
- die("ls-files --with-tree is incompatible with -s or -u");
+ die(_("options '%s' and '%s' cannot be used together"), "ls-files --with-tree", "-s/-u");
overlay_tree_on_index(the_repository->index, with_tree, max_prefix);
}
@@ -775,16 +784,13 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
if (show_resolve_undo)
show_ru_info(the_repository->index);
- if (ps_matched) {
- int bad;
- bad = report_path_error(ps_matched, &pathspec);
- if (bad)
- fprintf(stderr, "Did you forget to 'git add'?\n");
-
- return bad ? 1 : 0;
+ if (ps_matched && report_path_error(ps_matched, &pathspec)) {
+ fprintf(stderr, "Did you forget to 'git add'?\n");
+ ret = 1;
}
+ string_list_clear(&exclude_list, 0);
dir_clear(&dir);
free(max_prefix);
- return 0;
+ return ret;
}
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index f4fd823..df44e5c 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -7,8 +7,8 @@
static const char * const ls_remote_usage[] = {
N_("git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
- " [-q | --quiet] [--exit-code] [--get-url]\n"
- " [--symref] [<repository> [<refs>...]]"),
+ " [-q | --quiet] [--exit-code] [--get-url]\n"
+ " [--symref] [<repository> [<refs>...]]"),
NULL
};
@@ -54,7 +54,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
struct transport *transport;
const struct ref *ref;
struct ref_array ref_array;
- static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
+ struct string_list sorting_options = STRING_LIST_INIT_DUP;
struct option options[] = {
OPT__QUIET(&quiet, N_("do not print remote URL")),
@@ -68,7 +68,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL),
OPT_BOOL(0, "get-url", &get_url,
N_("take url.<base>.insteadOf into account")),
- OPT_REF_SORT(sorting_tail),
+ OPT_REF_SORT(&sorting_options),
OPT_SET_INT_F(0, "exit-code", &status,
N_("exit with exit code 2 if no matching refs are found"),
2, PARSE_OPT_NOCOMPLETE),
@@ -86,8 +86,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
packet_trace_identity("ls-remote");
- UNLEAK(sorting);
-
if (argc > 1) {
int i;
CALLOC_ARRAY(pattern, argc);
@@ -116,7 +114,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
}
transport = transport_get(remote, NULL);
- if (uploadpack != NULL)
+ if (uploadpack)
transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
if (server_options.nr)
transport->server_options = &server_options;
@@ -139,8 +137,13 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
item->symref = xstrdup_or_null(ref->symref);
}
- if (sorting)
+ if (sorting_options.nr) {
+ struct ref_sorting *sorting;
+
+ sorting = ref_sorting_options(&sorting_options);
ref_array_sort(sorting, &ref_array);
+ ref_sorting_release(sorting);
+ }
for (i = 0; i < ref_array.nr; i++) {
const struct ref_array_item *ref = ref_array.items[i];
@@ -152,6 +155,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
ref_array_clear(&ref_array);
if (transport_disconnect(transport))
- return 1;
+ status = 1;
+ transport_ls_refs_options_release(&transport_options);
return status;
}
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 3a44263..e279be8 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -16,22 +16,102 @@
static int line_termination = '\n';
#define LS_RECURSIVE 1
-#define LS_TREE_ONLY 2
-#define LS_SHOW_TREES 4
-#define LS_NAME_ONLY 8
-#define LS_SHOW_SIZE 16
+#define LS_TREE_ONLY (1 << 1)
+#define LS_SHOW_TREES (1 << 2)
static int abbrev;
static int ls_options;
static struct pathspec pathspec;
static int chomp_prefix;
static const char *ls_tree_prefix;
+static const char *format;
+struct show_tree_data {
+ unsigned mode;
+ enum object_type type;
+ const struct object_id *oid;
+ const char *pathname;
+ struct strbuf *base;
+};
static const char * const ls_tree_usage[] = {
N_("git ls-tree [<options>] <tree-ish> [<path>...]"),
NULL
};
-static int show_recursive(const char *base, int baselen, const char *pathname)
+static enum ls_tree_cmdmode {
+ MODE_DEFAULT = 0,
+ MODE_LONG,
+ MODE_NAME_ONLY,
+ MODE_NAME_STATUS,
+ MODE_OBJECT_ONLY,
+} cmdmode;
+
+static void expand_objectsize(struct strbuf *line, const struct object_id *oid,
+ const enum object_type type, unsigned int padded)
+{
+ if (type == OBJ_BLOB) {
+ unsigned long size;
+ if (oid_object_info(the_repository, oid, &size) < 0)
+ die(_("could not get object info about '%s'"),
+ oid_to_hex(oid));
+ if (padded)
+ strbuf_addf(line, "%7"PRIuMAX, (uintmax_t)size);
+ else
+ strbuf_addf(line, "%"PRIuMAX, (uintmax_t)size);
+ } else if (padded) {
+ strbuf_addf(line, "%7s", "-");
+ } else {
+ strbuf_addstr(line, "-");
+ }
+}
+
+static size_t expand_show_tree(struct strbuf *sb, const char *start,
+ void *context)
+{
+ struct show_tree_data *data = context;
+ const char *end;
+ const char *p;
+ unsigned int errlen;
+ size_t len = strbuf_expand_literal_cb(sb, start, NULL);
+
+ if (len)
+ return len;
+ if (*start != '(')
+ die(_("bad ls-tree format: element '%s' does not start with '('"), start);
+
+ end = strchr(start + 1, ')');
+ if (!end)
+ die(_("bad ls-tree format: element '%s' does not end in ')'"), start);
+
+ len = end - start + 1;
+ if (skip_prefix(start, "(objectmode)", &p)) {
+ strbuf_addf(sb, "%06o", data->mode);
+ } else if (skip_prefix(start, "(objecttype)", &p)) {
+ strbuf_addstr(sb, type_name(data->type));
+ } else if (skip_prefix(start, "(objectsize:padded)", &p)) {
+ expand_objectsize(sb, data->oid, data->type, 1);
+ } else if (skip_prefix(start, "(objectsize)", &p)) {
+ expand_objectsize(sb, data->oid, data->type, 0);
+ } else if (skip_prefix(start, "(objectname)", &p)) {
+ strbuf_add_unique_abbrev(sb, data->oid, abbrev);
+ } else if (skip_prefix(start, "(path)", &p)) {
+ const char *name = data->base->buf;
+ const char *prefix = chomp_prefix ? ls_tree_prefix : NULL;
+ struct strbuf quoted = STRBUF_INIT;
+ struct strbuf sbuf = STRBUF_INIT;
+ strbuf_addstr(data->base, data->pathname);
+ name = relative_path(data->base->buf, prefix, &sbuf);
+ quote_c_style(name, "ed, NULL, 0);
+ strbuf_addbuf(sb, "ed);
+ strbuf_release(&sbuf);
+ strbuf_release("ed);
+ } else {
+ errlen = (unsigned long)len;
+ die(_("bad ls-tree format: %%%.*s"), errlen, start);
+ }
+ return len;
+}
+
+static int show_recursive(const char *base, size_t baselen, const char *pathname)
{
int i;
@@ -43,7 +123,7 @@ static int show_recursive(const char *base, int baselen, const char *pathname)
for (i = 0; i < pathspec.nr; i++) {
const char *spec = pathspec.items[i].match;
- int len, speclen;
+ size_t len, speclen;
if (strncmp(base, spec, baselen))
continue;
@@ -61,69 +141,197 @@ static int show_recursive(const char *base, int baselen, const char *pathname)
return 0;
}
-static int show_tree(const struct object_id *oid, struct strbuf *base,
- const char *pathname, unsigned mode, void *context)
+static int show_tree_fmt(const struct object_id *oid, struct strbuf *base,
+ const char *pathname, unsigned mode, void *context)
{
- int retval = 0;
- int baselen;
- const char *type = blob_type;
+ size_t baselen;
+ int recurse = 0;
+ struct strbuf sb = STRBUF_INIT;
+ enum object_type type = object_type(mode);
- if (S_ISGITLINK(mode)) {
- /*
- * Maybe we want to have some recursive version here?
- *
- * Something similar to this incomplete example:
- *
- if (show_subprojects(base, baselen, pathname))
- retval = READ_TREE_RECURSIVE;
- *
- */
- type = commit_type;
- } else if (S_ISDIR(mode)) {
- if (show_recursive(base->buf, base->len, pathname)) {
- retval = READ_TREE_RECURSIVE;
- if (!(ls_options & LS_SHOW_TREES))
- return retval;
- }
- type = tree_type;
- }
- else if (ls_options & LS_TREE_ONLY)
+ struct show_tree_data data = {
+ .mode = mode,
+ .type = type,
+ .oid = oid,
+ .pathname = pathname,
+ .base = base,
+ };
+
+ if (type == OBJ_TREE && show_recursive(base->buf, base->len, pathname))
+ recurse = READ_TREE_RECURSIVE;
+ if (type == OBJ_TREE && recurse && !(ls_options & LS_SHOW_TREES))
+ return recurse;
+ if (type == OBJ_BLOB && (ls_options & LS_TREE_ONLY))
return 0;
- if (!(ls_options & LS_NAME_ONLY)) {
- if (ls_options & LS_SHOW_SIZE) {
- char size_text[24];
- if (!strcmp(type, blob_type)) {
- unsigned long size;
- if (oid_object_info(the_repository, oid, &size) == OBJ_BAD)
- xsnprintf(size_text, sizeof(size_text),
- "BAD");
- else
- xsnprintf(size_text, sizeof(size_text),
- "%"PRIuMAX, (uintmax_t)size);
- } else
- xsnprintf(size_text, sizeof(size_text), "-");
- printf("%06o %s %s %7s\t", mode, type,
- find_unique_abbrev(oid, abbrev),
- size_text);
- } else
- printf("%06o %s %s\t", mode, type,
- find_unique_abbrev(oid, abbrev));
- }
baselen = base->len;
+ strbuf_expand(&sb, format, expand_show_tree, &data);
+ strbuf_addch(&sb, line_termination);
+ fwrite(sb.buf, sb.len, 1, stdout);
+ strbuf_release(&sb);
+ strbuf_setlen(base, baselen);
+ return recurse;
+}
+
+static int show_tree_common(struct show_tree_data *data, int *recurse,
+ const struct object_id *oid, struct strbuf *base,
+ const char *pathname, unsigned mode)
+{
+ enum object_type type = object_type(mode);
+ int ret = -1;
+
+ *recurse = 0;
+ data->mode = mode;
+ data->type = type;
+ data->oid = oid;
+ data->pathname = pathname;
+ data->base = base;
+
+ if (type == OBJ_BLOB) {
+ if (ls_options & LS_TREE_ONLY)
+ ret = 0;
+ } else if (type == OBJ_TREE &&
+ show_recursive(base->buf, base->len, pathname)) {
+ *recurse = READ_TREE_RECURSIVE;
+ if (!(ls_options & LS_SHOW_TREES))
+ ret = *recurse;
+ }
+
+ return ret;
+}
+
+static void show_tree_common_default_long(struct strbuf *base,
+ const char *pathname,
+ const size_t baselen)
+{
+ strbuf_addstr(base, pathname);
+ write_name_quoted_relative(base->buf,
+ chomp_prefix ? ls_tree_prefix : NULL, stdout,
+ line_termination);
+ strbuf_setlen(base, baselen);
+}
+
+static int show_tree_default(const struct object_id *oid, struct strbuf *base,
+ const char *pathname, unsigned mode,
+ void *context)
+{
+ int early;
+ int recurse;
+ struct show_tree_data data = { 0 };
+
+ early = show_tree_common(&data, &recurse, oid, base, pathname, mode);
+ if (early >= 0)
+ return early;
+
+ printf("%06o %s %s\t", data.mode, type_name(data.type),
+ find_unique_abbrev(data.oid, abbrev));
+ show_tree_common_default_long(base, pathname, data.base->len);
+ return recurse;
+}
+
+static int show_tree_long(const struct object_id *oid, struct strbuf *base,
+ const char *pathname, unsigned mode, void *context)
+{
+ int early;
+ int recurse;
+ struct show_tree_data data = { 0 };
+ char size_text[24];
+
+ early = show_tree_common(&data, &recurse, oid, base, pathname, mode);
+ if (early >= 0)
+ return early;
+
+ if (data.type == OBJ_BLOB) {
+ unsigned long size;
+ if (oid_object_info(the_repository, data.oid, &size) == OBJ_BAD)
+ xsnprintf(size_text, sizeof(size_text), "BAD");
+ else
+ xsnprintf(size_text, sizeof(size_text),
+ "%" PRIuMAX, (uintmax_t)size);
+ } else {
+ xsnprintf(size_text, sizeof(size_text), "-");
+ }
+
+ printf("%06o %s %s %7s\t", data.mode, type_name(data.type),
+ find_unique_abbrev(data.oid, abbrev), size_text);
+ show_tree_common_default_long(base, pathname, data.base->len);
+ return recurse;
+}
+
+static int show_tree_name_only(const struct object_id *oid, struct strbuf *base,
+ const char *pathname, unsigned mode, void *context)
+{
+ int early;
+ int recurse;
+ const size_t baselen = base->len;
+ struct show_tree_data data = { 0 };
+
+ early = show_tree_common(&data, &recurse, oid, base, pathname, mode);
+ if (early >= 0)
+ return early;
+
strbuf_addstr(base, pathname);
write_name_quoted_relative(base->buf,
chomp_prefix ? ls_tree_prefix : NULL,
stdout, line_termination);
strbuf_setlen(base, baselen);
- return retval;
+ return recurse;
}
+static int show_tree_object(const struct object_id *oid, struct strbuf *base,
+ const char *pathname, unsigned mode, void *context)
+{
+ int early;
+ int recurse;
+ struct show_tree_data data = { 0 };
+
+ early = show_tree_common(&data, &recurse, oid, base, pathname, mode);
+ if (early >= 0)
+ return early;
+
+ printf("%s%c", find_unique_abbrev(oid, abbrev), line_termination);
+ return recurse;
+}
+
+struct ls_tree_cmdmode_to_fmt {
+ enum ls_tree_cmdmode mode;
+ const char *const fmt;
+ read_tree_fn_t fn;
+};
+
+static struct ls_tree_cmdmode_to_fmt ls_tree_cmdmode_format[] = {
+ {
+ .mode = MODE_DEFAULT,
+ .fmt = "%(objectmode) %(objecttype) %(objectname)%x09%(path)",
+ .fn = show_tree_default,
+ },
+ {
+ .mode = MODE_LONG,
+ .fmt = "%(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)",
+ .fn = show_tree_long,
+ },
+ {
+ .mode = MODE_NAME_ONLY, /* And MODE_NAME_STATUS */
+ .fmt = "%(path)",
+ .fn = show_tree_name_only,
+ },
+ {
+ .mode = MODE_OBJECT_ONLY,
+ .fmt = "%(objectname)",
+ .fn = show_tree_object
+ },
+ {
+ /* fallback */
+ .fn = show_tree_default,
+ },
+};
+
int cmd_ls_tree(int argc, const char **argv, const char *prefix)
{
struct object_id oid;
struct tree *tree;
int i, full_tree = 0;
+ read_tree_fn_t fn = NULL;
const struct option ls_tree_options[] = {
OPT_BIT('d', NULL, &ls_options, N_("only show trees"),
LS_TREE_ONLY),
@@ -133,24 +341,30 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
LS_SHOW_TREES),
OPT_SET_INT('z', NULL, &line_termination,
N_("terminate entries with NUL byte"), 0),
- OPT_BIT('l', "long", &ls_options, N_("include object size"),
- LS_SHOW_SIZE),
- OPT_BIT(0, "name-only", &ls_options, N_("list only filenames"),
- LS_NAME_ONLY),
- OPT_BIT(0, "name-status", &ls_options, N_("list only filenames"),
- LS_NAME_ONLY),
+ OPT_CMDMODE('l', "long", &cmdmode, N_("include object size"),
+ MODE_LONG),
+ OPT_CMDMODE(0, "name-only", &cmdmode, N_("list only filenames"),
+ MODE_NAME_ONLY),
+ OPT_CMDMODE(0, "name-status", &cmdmode, N_("list only filenames"),
+ MODE_NAME_STATUS),
+ OPT_CMDMODE(0, "object-only", &cmdmode, N_("list only objects"),
+ MODE_OBJECT_ONLY),
OPT_SET_INT(0, "full-name", &chomp_prefix,
N_("use full path names"), 0),
OPT_BOOL(0, "full-tree", &full_tree,
N_("list entire tree; not just current directory "
"(implies --full-name)")),
+ OPT_STRING_F(0, "format", &format, N_("format"),
+ N_("format to use for the output"),
+ PARSE_OPT_NONEG),
OPT__ABBREV(&abbrev),
OPT_END()
};
+ struct ls_tree_cmdmode_to_fmt *m2f = ls_tree_cmdmode_format;
git_config(git_default_config, NULL);
ls_tree_prefix = prefix;
- if (prefix && *prefix)
+ if (prefix)
chomp_prefix = strlen(prefix);
argc = parse_options(argc, argv, prefix, ls_tree_options,
@@ -159,11 +373,23 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
ls_tree_prefix = prefix = NULL;
chomp_prefix = 0;
}
+ /*
+ * We wanted to detect conflicts between --name-only and
+ * --name-status, but once we're done with that subsequent
+ * code should only need to check the primary name.
+ */
+ if (cmdmode == MODE_NAME_STATUS)
+ cmdmode = MODE_NAME_ONLY;
+
/* -d -r should imply -t, but -d by itself should not have to. */
if ( (LS_TREE_ONLY|LS_RECURSIVE) ==
((LS_TREE_ONLY|LS_RECURSIVE) & ls_options))
ls_options |= LS_SHOW_TREES;
+ if (format && cmdmode)
+ usage_msg_opt(
+ _("--format can't be combined with other format-altering options"),
+ ls_tree_usage, ls_tree_options);
if (argc < 1)
usage_with_options(ls_tree_usage, ls_tree_options);
if (get_oid(argv[0], &oid))
@@ -185,6 +411,24 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
tree = parse_tree_indirect(&oid);
if (!tree)
die("not a tree object");
- return !!read_tree(the_repository, tree,
- &pathspec, show_tree, NULL);
+ /*
+ * The generic show_tree_fmt() is slower than show_tree(), so
+ * take the fast path if possible.
+ */
+ while (m2f) {
+ if (!m2f->fmt) {
+ fn = format ? show_tree_fmt : show_tree_default;
+ } else if (format && !strcmp(format, m2f->fmt)) {
+ cmdmode = m2f->mode;
+ fn = m2f->fn;
+ } else if (!format && cmdmode == m2f->mode) {
+ fn = m2f->fn;
+ } else {
+ m2f++;
+ continue;
+ }
+ break;
+ }
+
+ return !!read_tree(the_repository, tree, &pathspec, fn, NULL);
}
diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 7baef30..73509f6 100644
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -120,7 +120,7 @@ static int populate_maildir_list(struct string_list *list, const char *path)
for (sub = subs; *sub; ++sub) {
free(name);
name = xstrfmt("%s/%s", path, *sub);
- if ((dir = opendir(name)) == NULL) {
+ if (!(dir = opendir(name))) {
if (errno == ENOENT)
continue;
error_errno("cannot opendir %s", name);
@@ -223,6 +223,9 @@ static int split_mbox(const char *file, const char *dir, int allow_bare,
FILE *f = !strcmp(file, "-") ? stdin : fopen(file, "r");
int file_done = 0;
+ if (isatty(fileno(f)))
+ warning(_("reading patches from stdin/tty..."));
+
if (!f) {
error_errno("cannot open mbox %s", file);
goto out;
diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 6719ac1..a11f8c6 100644
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -138,6 +138,7 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)
int rev_nr = 0;
int show_all = 0;
int cmdmode = 0;
+ int ret;
struct option options[] = {
OPT_BOOL('a', "all", &show_all, N_("output all common ancestors")),
@@ -159,12 +160,14 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)
if (argc < 2)
usage_with_options(merge_base_usage, options);
if (show_all)
- die("--is-ancestor cannot be used with --all");
+ die(_("options '%s' and '%s' cannot be used together"),
+ "--is-ancestor", "--all");
return handle_is_ancestor(argc, argv);
}
if (cmdmode == 'r' && show_all)
- die("--independent cannot be used with --all");
+ die(_("options '%s' and '%s' cannot be used together"),
+ "--independent", "--all");
if (cmdmode == 'o')
return handle_octopus(argc, argv, show_all);
@@ -184,5 +187,7 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)
ALLOC_ARRAY(rev, argc);
while (argc-- > 0)
rev[rev_nr++] = get_commit_reference(*argv++);
- return show_merge_base(rev, rev_nr, show_all);
+ ret = show_merge_base(rev, rev_nr, show_all);
+ free(rev);
+ return ret;
}
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 06a2f90..e695867 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -34,6 +34,8 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
struct option options[] = {
OPT_BOOL('p', "stdout", &to_stdout, N_("send results to standard output")),
OPT_SET_INT(0, "diff3", &xmp.style, N_("use a diff3 based merge"), XDL_MERGE_DIFF3),
+ OPT_SET_INT(0, "zdiff3", &xmp.style, N_("use a zealous diff3 based merge"),
+ XDL_MERGE_ZEALOUS_DIFF3),
OPT_SET_INT(0, "ours", &xmp.favor, N_("for conflicts, use our version"),
XDL_MERGE_FAVOR_OURS),
OPT_SET_INT(0, "theirs", &xmp.favor, N_("for conflicts, use their version"),
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index a4bfd8f..b9acbf5 100644
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -58,7 +58,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
"Ignoring %s.",
"cannot handle more than %d bases. "
"Ignoring %s.",
- (int)ARRAY_SIZE(bases)-1),
+ ARRAY_SIZE(bases)-1),
(int)ARRAY_SIZE(bases)-1, argv[i]);
}
if (argc - i != 3) /* "--" "<head>" "<remote>" */
diff --git a/builtin/merge.c b/builtin/merge.c
index 3fbdacc..d9784d4 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -13,6 +13,7 @@
#include "builtin.h"
#include "lockfile.h"
#include "run-command.h"
+#include "hook.h"
#include "diff.h"
#include "diff-merges.h"
#include "refs.h"
@@ -86,6 +87,7 @@ static int signoff;
static const char *sign_commit;
static int autostash;
static int no_verify;
+static char *into_name;
static struct strategy all_strategy[] = {
{ "recursive", NO_TRIVIAL },
@@ -285,6 +287,8 @@ static struct option builtin_merge_options[] = {
{ OPTION_LOWLEVEL_CALLBACK, 'F', "file", &merge_msg, N_("path"),
N_("read message from file"), PARSE_OPT_NONEG,
NULL, 0, option_read_message },
+ OPT_STRING(0, "into-name", &into_name, N_("name"),
+ N_("use <name> instead of the real target")),
OPT__VERBOSITY(&verbosity),
OPT_BOOL(0, "abort", &abort_current_merge,
N_("abort the current in-progress merge")),
@@ -309,10 +313,9 @@ static int save_state(struct object_id *stash)
int len;
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf buffer = STRBUF_INIT;
- const char *argv[] = {"stash", "create", NULL};
int rc = -1;
- cp.argv = argv;
+ strvec_pushl(&cp.args, "stash", "create", NULL);
cp.out = -1;
cp.git_cmd = 1;
@@ -440,6 +443,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
}
write_file_buf(git_path_squash_msg(the_repository), out.buf, out.len);
strbuf_release(&out);
+ release_revisions(&rev);
}
static void finish(struct commit *head_commit,
@@ -487,7 +491,7 @@ static void finish(struct commit *head_commit,
}
/* Run a post-merge hook */
- run_hook_le(NULL, "post-merge", squash ? "1" : "0", NULL);
+ run_hooks_l("post-merge", squash ? "1" : "0", NULL);
apply_autostash(git_path_merge_autostash(the_repository));
strbuf_release(&reflog_message);
@@ -680,6 +684,7 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,
opts.verbose_update = 1;
opts.trivial_merges_only = 1;
opts.merge = 1;
+ opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
trees[nr_trees] = parse_tree_indirect(common);
if (!trees[nr_trees++])
return -1;
@@ -841,15 +846,20 @@ static void prepare_to_commit(struct commit_list *remoteheads)
struct strbuf msg = STRBUF_INIT;
const char *index_file = get_index_file();
- if (!no_verify && run_commit_hook(0 < option_edit, index_file, "pre-merge-commit", NULL))
- abort_commit(remoteheads, NULL);
- /*
- * Re-read the index as pre-merge-commit hook could have updated it,
- * and write it out as a tree. We must do this before we invoke
- * the editor and after we invoke run_status above.
- */
- if (find_hook("pre-merge-commit"))
- discard_cache();
+ if (!no_verify) {
+ int invoked_hook;
+
+ if (run_commit_hook(0 < option_edit, index_file, &invoked_hook,
+ "pre-merge-commit", NULL))
+ abort_commit(remoteheads, NULL);
+ /*
+ * Re-read the index as pre-merge-commit hook could have updated it,
+ * and write it out as a tree. We must do this before we invoke
+ * the editor and after we invoke run_status above.
+ */
+ if (invoked_hook)
+ discard_cache();
+ }
read_cache_from(index_file);
strbuf_addbuf(&msg, &merge_msg);
if (squash)
@@ -871,7 +881,8 @@ static void prepare_to_commit(struct commit_list *remoteheads)
append_signoff(&msg, ignore_non_trailer(msg.buf, msg.len), 0);
write_merge_heads(remoteheads);
write_file_buf(git_path_merge_msg(the_repository), msg.buf, msg.len);
- if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
+ if (run_commit_hook(0 < option_edit, get_index_file(), NULL,
+ "prepare-commit-msg",
git_path_merge_msg(the_repository), "merge", NULL))
abort_commit(remoteheads, NULL);
if (0 < option_edit) {
@@ -880,7 +891,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
}
if (!no_verify && run_commit_hook(0 < option_edit, get_index_file(),
- "commit-msg",
+ NULL, "commit-msg",
git_path_merge_msg(the_repository), NULL))
abort_commit(remoteheads, NULL);
@@ -988,6 +999,7 @@ static int evaluate_result(void)
*/
cnt += count_unmerged_entries();
+ release_revisions(&rev);
return cnt;
}
@@ -1120,6 +1132,7 @@ static void prepare_merge_message(struct strbuf *merge_names, struct strbuf *mer
opts.add_title = !have_message;
opts.shortlog_len = shortlog_len;
opts.credit_people = (0 < option_edit);
+ opts.into_name = into_name;
fmt_merge_msg(merge_names, merge_msg, &opts);
if (merge_msg->len)
@@ -1268,7 +1281,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
struct commit_list *common = NULL;
const char *best_strategy = NULL, *wt_strategy = NULL;
- struct commit_list *remoteheads, *p;
+ struct commit_list *remoteheads = NULL, *p;
void *branch_to_free;
int orig_argc = argc;
@@ -1395,9 +1408,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (squash) {
if (fast_forward == FF_NO)
- die(_("You cannot combine --squash with --no-ff."));
+ die(_("options '%s' and '%s' cannot be used together"), "--squash", "--no-ff.");
if (option_commit > 0)
- die(_("You cannot combine --squash with --commit."));
+ die(_("options '%s' and '%s' cannot be used together"), "--squash", "--commit.");
/*
* squash can now silently disable option_commit - this is not
* a problem as it is only overriding the default, not a user
@@ -1563,8 +1576,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (autostash)
create_autostash(the_repository,
- git_path_merge_autostash(the_repository),
- "merge");
+ git_path_merge_autostash(the_repository));
if (checkout_fast_forward(the_repository,
&head_commit->object.oid,
&commit->object.oid,
@@ -1576,6 +1588,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
finish(head_commit, remoteheads, &commit->object.oid, msg.buf);
remove_merge_branch_state(the_repository);
+ strbuf_release(&msg);
goto done;
} else if (!remoteheads->next && common->next)
;
@@ -1634,8 +1647,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (autostash)
create_autostash(the_repository,
- git_path_merge_autostash(the_repository),
- "merge");
+ git_path_merge_autostash(the_repository));
/* We are going to make a new commit. */
git_committer_info(IDENT_STRICT);
@@ -1746,6 +1758,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
ret = suggest_conflicts();
done:
+ if (!automerge_was_ok) {
+ free_commit_list(common);
+ free_commit_list(remoteheads);
+ }
+ strbuf_release(&buf);
free(branch_to_free);
return ret;
}
diff --git a/builtin/mktag.c b/builtin/mktag.c
index dddcccd..5d22909 100644
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -7,7 +7,7 @@
#include "config.h"
static char const * const builtin_mktag_usage[] = {
- N_("git mktag"),
+ "git mktag",
NULL
};
static int option_strict = 1;
@@ -61,8 +61,8 @@ static int verify_object_in_tag(struct object_id *tagged_oid, int *tagged_type)
type_name(*tagged_type), type_name(type));
repl = lookup_replace_object(the_repository, tagged_oid);
- ret = check_object_signature(the_repository, repl,
- buffer, size, type_name(*tagged_type));
+ ret = check_object_signature(the_repository, repl, buffer, size,
+ *tagged_type);
free(buffer);
return ret;
@@ -96,10 +96,10 @@ int cmd_mktag(int argc, const char **argv, const char *prefix)
&tagged_oid, &tagged_type))
die(_("tag on stdin did not pass our strict fsck check"));
- if (verify_object_in_tag(&tagged_oid, &tagged_type))
+ if (verify_object_in_tag(&tagged_oid, &tagged_type) < 0)
die(_("tag on stdin did not refer to a valid object"));
- if (write_object_file(buf.buf, buf.len, tag_type, &result) < 0)
+ if (write_object_file(buf.buf, buf.len, OBJ_TAG, &result) < 0)
die(_("unable to write tag file"));
strbuf_release(&buf);
diff --git a/builtin/mktree.c b/builtin/mktree.c
index ae78ca1..902edba 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -58,12 +58,12 @@ static void write_tree(struct object_id *oid)
strbuf_add(&buf, ent->oid.hash, the_hash_algo->rawsz);
}
- write_object_file(buf.buf, buf.len, tree_type, oid);
+ write_object_file(buf.buf, buf.len, OBJ_TREE, oid);
strbuf_release(&buf);
}
static const char *mktree_usage[] = {
- N_("git mktree [-z] [--missing] [--batch]"),
+ "git mktree [-z] [--missing] [--batch]",
NULL
};
diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 6426bbd..5edbb7f 100644
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -7,7 +7,8 @@
#include "object-store.h"
#define BUILTIN_MIDX_WRITE_USAGE \
- N_("git multi-pack-index [<options>] write [--preferred-pack=<pack>]")
+ N_("git multi-pack-index [<options>] write [--preferred-pack=<pack>]" \
+ "[--refs-snapshot=<path>]")
#define BUILTIN_MIDX_VERIFY_USAGE \
N_("git multi-pack-index [<options>] verify")
@@ -43,15 +44,31 @@ static char const * const builtin_multi_pack_index_usage[] = {
};
static struct opts_multi_pack_index {
- const char *object_dir;
+ char *object_dir;
const char *preferred_pack;
+ const char *refs_snapshot;
unsigned long batch_size;
unsigned flags;
+ int stdin_packs;
} opts;
+
+static int parse_object_dir(const struct option *opt, const char *arg,
+ int unset)
+{
+ free(opts.object_dir);
+ if (unset)
+ opts.object_dir = xstrdup(get_object_directory());
+ else
+ opts.object_dir = real_pathdup(arg, 1);
+ return 0;
+}
+
static struct option common_opts[] = {
- OPT_FILENAME(0, "object-dir", &opts.object_dir,
- N_("object directory containing set of packfile and pack-index pairs")),
+ OPT_CALLBACK(0, "object-dir", &opts.object_dir,
+ N_("directory"),
+ N_("object directory containing set of packfile and pack-index pairs"),
+ parse_object_dir),
OPT_END(),
};
@@ -77,6 +94,16 @@ static int git_multi_pack_index_write_config(const char *var, const char *value,
return 0;
}
+static void read_packs_from_stdin(struct string_list *to)
+{
+ struct strbuf buf = STRBUF_INIT;
+ while (strbuf_getline(&buf, stdin) != EOF)
+ string_list_append(to, buf.buf);
+ string_list_sort(to);
+
+ strbuf_release(&buf);
+}
+
static int cmd_multi_pack_index_write(int argc, const char **argv)
{
struct option *options;
@@ -88,6 +115,10 @@ static int cmd_multi_pack_index_write(int argc, const char **argv)
MIDX_WRITE_BITMAP | MIDX_WRITE_REV_INDEX),
OPT_BIT(0, "progress", &opts.flags,
N_("force progress reporting"), MIDX_PROGRESS),
+ OPT_BOOL(0, "stdin-packs", &opts.stdin_packs,
+ N_("write multi-pack index containing only given indexes")),
+ OPT_FILENAME(0, "refs-snapshot", &opts.refs_snapshot,
+ N_("refs snapshot for selecting bitmap commits")),
OPT_END(),
};
@@ -110,8 +141,23 @@ static int cmd_multi_pack_index_write(int argc, const char **argv)
FREE_AND_NULL(options);
+ if (opts.stdin_packs) {
+ struct string_list packs = STRING_LIST_INIT_DUP;
+ int ret;
+
+ read_packs_from_stdin(&packs);
+
+ ret = write_midx_file_only(opts.object_dir, &packs,
+ opts.preferred_pack,
+ opts.refs_snapshot, opts.flags);
+
+ string_list_clear(&packs, 0);
+
+ return ret;
+
+ }
return write_midx_file(opts.object_dir, opts.preferred_pack,
- opts.flags);
+ opts.refs_snapshot, opts.flags);
}
static int cmd_multi_pack_index_verify(int argc, const char **argv)
@@ -135,6 +181,8 @@ static int cmd_multi_pack_index_verify(int argc, const char **argv)
usage_with_options(builtin_multi_pack_index_verify_usage,
options);
+ FREE_AND_NULL(options);
+
return verify_midx_file(the_repository, opts.object_dir, opts.flags);
}
@@ -159,6 +207,8 @@ static int cmd_multi_pack_index_expire(int argc, const char **argv)
usage_with_options(builtin_multi_pack_index_expire_usage,
options);
+ FREE_AND_NULL(options);
+
return expire_midx_packs(the_repository, opts.object_dir, opts.flags);
}
@@ -196,31 +246,40 @@ static int cmd_multi_pack_index_repack(int argc, const char **argv)
int cmd_multi_pack_index(int argc, const char **argv,
const char *prefix)
{
+ int res;
struct option *builtin_multi_pack_index_options = common_opts;
git_config(git_default_config, NULL);
+ if (the_repository &&
+ the_repository->objects &&
+ the_repository->objects->odb)
+ opts.object_dir = xstrdup(the_repository->objects->odb->path);
+
argc = parse_options(argc, argv, prefix,
builtin_multi_pack_index_options,
builtin_multi_pack_index_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
- if (!opts.object_dir)
- opts.object_dir = get_object_directory();
-
if (!argc)
goto usage;
if (!strcmp(argv[0], "repack"))
- return cmd_multi_pack_index_repack(argc, argv);
+ res = cmd_multi_pack_index_repack(argc, argv);
else if (!strcmp(argv[0], "write"))
- return cmd_multi_pack_index_write(argc, argv);
+ res = cmd_multi_pack_index_write(argc, argv);
else if (!strcmp(argv[0], "verify"))
- return cmd_multi_pack_index_verify(argc, argv);
+ res = cmd_multi_pack_index_verify(argc, argv);
else if (!strcmp(argv[0], "expire"))
- return cmd_multi_pack_index_expire(argc, argv);
+ res = cmd_multi_pack_index_expire(argc, argv);
+ else {
+ error(_("unrecognized subcommand: %s"), argv[0]);
+ goto usage;
+ }
- error(_("unrecognized subcommand: %s"), argv[0]);
+ free(opts.object_dir);
+ return res;
+
usage:
usage_with_options(builtin_multi_pack_index_usage,
builtin_multi_pack_index_options);
diff --git a/builtin/mv.c b/builtin/mv.c
index c2f96c8..83a465b 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -118,21 +118,23 @@ static int index_range_of_same_dir(const char *src, int length,
int cmd_mv(int argc, const char **argv, const char *prefix)
{
int i, flags, gitmodules_modified = 0;
- int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
+ int verbose = 0, show_only = 0, force = 0, ignore_errors = 0, ignore_sparse = 0;
struct option builtin_mv_options[] = {
OPT__VERBOSE(&verbose, N_("be verbose")),
OPT__DRY_RUN(&show_only, N_("dry run")),
OPT__FORCE(&force, N_("force move/rename even if target exists"),
PARSE_OPT_NOCOMPLETE),
OPT_BOOL('k', NULL, &ignore_errors, N_("skip move/rename errors")),
+ OPT_BOOL(0, "sparse", &ignore_sparse, N_("allow updating entries outside of the sparse-checkout cone")),
OPT_END(),
};
const char **source, **destination, **dest_path, **submodule_gitfile;
- enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
+ enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX, SPARSE } *modes;
struct stat st;
struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
struct lock_file lock_file = LOCK_INIT;
struct cache_entry *ce;
+ struct string_list only_match_skip_worktree = STRING_LIST_INIT_NODUP;
git_config(git_default_config, NULL);
@@ -176,14 +178,17 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
const char *src = source[i], *dst = destination[i];
int length, src_is_dir;
const char *bad = NULL;
+ int skip_sparse = 0;
if (show_only)
printf(_("Checking rename of '%s' to '%s'\n"), src, dst);
length = strlen(src);
- if (lstat(src, &st) < 0)
- bad = _("bad source");
- else if (!strncmp(src, dst, length) &&
+ if (lstat(src, &st) < 0) {
+ /* only error if existence is expected. */
+ if (modes[i] != SPARSE)
+ bad = _("bad source");
+ } else if (!strncmp(src, dst, length) &&
(dst[length] == 0 || dst[length] == '/')) {
bad = _("can not move directory into itself");
} else if ((src_is_dir = S_ISDIR(st.st_mode))
@@ -212,11 +217,12 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
dst_len = strlen(dst);
for (j = 0; j < last - first; j++) {
- const char *path = active_cache[first + j]->name;
+ const struct cache_entry *ce = active_cache[first + j];
+ const char *path = ce->name;
source[argc + j] = path;
destination[argc + j] =
prefix_path(dst, dst_len, path + length + 1);
- modes[argc + j] = INDEX;
+ modes[argc + j] = ce_skip_worktree(ce) ? SPARSE : INDEX;
submodule_gitfile[argc + j] = NULL;
}
argc += last - first;
@@ -244,14 +250,36 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
bad = _("multiple sources for the same target");
else if (is_dir_sep(dst[strlen(dst) - 1]))
bad = _("destination directory does not exist");
- else
+ else {
+ /*
+ * We check if the paths are in the sparse-checkout
+ * definition as a very final check, since that
+ * allows us to point the user to the --sparse
+ * option as a way to have a successful run.
+ */
+ if (!ignore_sparse &&
+ !path_in_sparse_checkout(src, &the_index)) {
+ string_list_append(&only_match_skip_worktree, src);
+ skip_sparse = 1;
+ }
+ if (!ignore_sparse &&
+ !path_in_sparse_checkout(dst, &the_index)) {
+ string_list_append(&only_match_skip_worktree, dst);
+ skip_sparse = 1;
+ }
+
+ if (skip_sparse)
+ goto remove_entry;
+
string_list_insert(&src_for_dst, dst);
+ }
if (!bad)
continue;
if (!ignore_errors)
die(_("%s, source=%s, destination=%s"),
bad, src, dst);
+remove_entry:
if (--argc > 0) {
int n = argc - i;
memmove(source + i, source + i + 1,
@@ -266,6 +294,12 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
}
}
+ if (only_match_skip_worktree.nr) {
+ advise_on_updating_sparse_paths(&only_match_skip_worktree);
+ if (!ignore_errors)
+ return 1;
+ }
+
for (i = 0; i < argc; i++) {
const char *src = source[i], *dst = destination[i];
enum update_mode mode = modes[i];
@@ -274,7 +308,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
printf(_("Renaming %s to %s\n"), src, dst);
if (show_only)
continue;
- if (mode != INDEX && rename(src, dst) < 0) {
+ if (mode != INDEX && mode != SPARSE && rename(src, dst) < 0) {
if (ignore_errors)
continue;
die_errno(_("renaming '%s' failed"), src);
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index b221d30..02ea9d1 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -9,6 +9,7 @@
#include "prio-queue.h"
#include "hash-lookup.h"
#include "commit-slab.h"
+#include "commit-graph.h"
/*
* One day. See the 'name a rev shortly after epoch' test in t6120 when
@@ -17,7 +18,7 @@
#define CUTOFF_DATE_SLOP 86400
struct rev_name {
- char *tip_name;
+ const char *tip_name;
timestamp_t taggerdate;
int generation;
int distance;
@@ -26,15 +27,64 @@ struct rev_name {
define_commit_slab(commit_rev_name, struct rev_name);
+static timestamp_t generation_cutoff = GENERATION_NUMBER_INFINITY;
static timestamp_t cutoff = TIME_MAX;
static struct commit_rev_name rev_names;
+/* Disable the cutoff checks entirely */
+static void disable_cutoff(void)
+{
+ generation_cutoff = 0;
+ cutoff = 0;
+}
+
+/* Cutoff searching any commits older than this one */
+static void set_commit_cutoff(struct commit *commit)
+{
+
+ if (cutoff > commit->date)
+ cutoff = commit->date;
+
+ if (generation_cutoff) {
+ timestamp_t generation = commit_graph_generation(commit);
+
+ if (generation_cutoff > generation)
+ generation_cutoff = generation;
+ }
+}
+
+/* adjust the commit date cutoff with a slop to allow for slightly incorrect
+ * commit timestamps in case of clock skew.
+ */
+static void adjust_cutoff_timestamp_for_slop(void)
+{
+ if (cutoff) {
+ /* check for undeflow */
+ if (cutoff > TIME_MIN + CUTOFF_DATE_SLOP)
+ cutoff = cutoff - CUTOFF_DATE_SLOP;
+ else
+ cutoff = TIME_MIN;
+ }
+}
+
+/* Check if a commit is before the cutoff. Prioritize generation numbers
+ * first, but use the commit timestamp if we lack generation data.
+ */
+static int commit_is_before_cutoff(struct commit *commit)
+{
+ if (generation_cutoff < GENERATION_NUMBER_INFINITY)
+ return generation_cutoff &&
+ commit_graph_generation(commit) < generation_cutoff;
+
+ return commit->date < cutoff;
+}
+
/* How many generations are maximally preferred over _one_ merge traversal? */
#define MERGE_TRAVERSAL_WEIGHT 65535
static int is_valid_rev_name(const struct rev_name *name)
{
- return name && (name->generation || name->tip_name);
+ return name && name->tip_name;
}
static struct rev_name *get_commit_rev_name(const struct commit *commit)
@@ -44,11 +94,20 @@ static struct rev_name *get_commit_rev_name(const struct commit *commit)
return is_valid_rev_name(name) ? name : NULL;
}
+static int effective_distance(int distance, int generation)
+{
+ return distance + (generation > 0 ? MERGE_TRAVERSAL_WEIGHT : 0);
+}
+
static int is_better_name(struct rev_name *name,
timestamp_t taggerdate,
+ int generation,
int distance,
int from_tag)
{
+ int name_distance = effective_distance(name->distance, name->generation);
+ int new_distance = effective_distance(distance, generation);
+
/*
* When comparing names based on tags, prefer names
* based on the older tag, even if it is farther away.
@@ -56,7 +115,7 @@ static int is_better_name(struct rev_name *name,
if (from_tag && name->from_tag)
return (name->taggerdate > taggerdate ||
(name->taggerdate == taggerdate &&
- name->distance > distance));
+ name_distance > new_distance));
/*
* We know that at least one of them is a non-tag at this point.
@@ -69,8 +128,8 @@ static int is_better_name(struct rev_name *name,
* We are now looking at two non-tags. Tiebreak to favor
* shorter hops.
*/
- if (name->distance != distance)
- return name->distance > distance;
+ if (name_distance != new_distance)
+ return name_distance > new_distance;
/* ... or tiebreak to favor older date */
if (name->taggerdate != taggerdate)
@@ -87,20 +146,9 @@ static struct rev_name *create_or_update_name(struct commit *commit,
{
struct rev_name *name = commit_rev_name_at(&rev_names, commit);
- if (is_valid_rev_name(name)) {
- if (!is_better_name(name, taggerdate, distance, from_tag))
- return NULL;
-
- /*
- * This string might still be shared with ancestors
- * (generation > 0). We can release it here regardless,
- * because the new name that has just won will be better
- * for them as well, so name_rev() will replace these
- * stale pointers when it processes the parents.
- */
- if (!name->generation)
- free(name->tip_name);
- }
+ if (is_valid_rev_name(name) &&
+ !is_better_name(name, taggerdate, generation, distance, from_tag))
+ return NULL;
name->taggerdate = taggerdate;
name->generation = generation;
@@ -142,7 +190,7 @@ static void name_rev(struct commit *start_commit,
struct rev_name *start_name;
parse_commit(start_commit);
- if (start_commit->date < cutoff)
+ if (commit_is_before_cutoff(start_commit))
return;
start_name = create_or_update_name(start_commit, taggerdate, 0, 0,
@@ -172,7 +220,7 @@ static void name_rev(struct commit *start_commit,
int generation, distance;
parse_commit(parent);
- if (parent->date < cutoff)
+ if (commit_is_before_cutoff(parent))
continue;
if (parent_number > 1) {
@@ -464,7 +512,7 @@ static void show_name(const struct object *obj,
static char const * const name_rev_usage[] = {
N_("git name-rev [<options>] <commit>..."),
N_("git name-rev [<options>] --all"),
- N_("git name-rev [<options>] --stdin"),
+ N_("git name-rev [<options>] --annotate-stdin"),
NULL
};
@@ -518,7 +566,7 @@ static void name_rev_line(char *p, struct name_ref_data *data)
int cmd_name_rev(int argc, const char **argv, const char *prefix)
{
struct object_array revs = OBJECT_ARRAY_INIT;
- int all = 0, transform_stdin = 0, allow_undefined = 1, always = 0, peel_tag = 0;
+ int all = 0, annotate_stdin = 0, transform_stdin = 0, allow_undefined = 1, always = 0, peel_tag = 0;
struct name_ref_data data = { 0, 0, STRING_LIST_INIT_NODUP, STRING_LIST_INIT_NODUP };
struct option opts[] = {
OPT_BOOL(0, "name-only", &data.name_only, N_("print only ref-based names (no object names)")),
@@ -529,7 +577,8 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
N_("ignore refs matching <pattern>")),
OPT_GROUP(""),
OPT_BOOL(0, "all", &all, N_("list all commits reachable from all refs")),
- OPT_BOOL(0, "stdin", &transform_stdin, N_("read from stdin")),
+ OPT_BOOL(0, "stdin", &transform_stdin, N_("deprecated: use annotate-stdin instead")),
+ OPT_BOOL(0, "annotate-stdin", &annotate_stdin, N_("annotate text from stdin")),
OPT_BOOL(0, "undefined", &allow_undefined, N_("allow to print `undefined` names (default)")),
OPT_BOOL(0, "always", &always,
N_("show abbreviated commit object as fallback")),
@@ -545,12 +594,20 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
init_commit_rev_name(&rev_names);
git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, opts, name_rev_usage, 0);
- if (all + transform_stdin + !!argc > 1) {
+
+ if (transform_stdin) {
+ warning("--stdin is deprecated. Please use --annotate-stdin instead, "
+ "which is functionally equivalent.\n"
+ "This option will be removed in a future release.");
+ annotate_stdin = 1;
+ }
+
+ if (all + annotate_stdin + !!argc > 1) {
error("Specify either a list, or --all, not both!");
usage_with_options(name_rev_usage, opts);
}
- if (all || transform_stdin)
- cutoff = 0;
+ if (all || annotate_stdin)
+ disable_cutoff();
for (; argc; argc--, argv++) {
struct object_id oid;
@@ -578,10 +635,8 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
continue;
}
- if (commit) {
- if (cutoff > commit->date)
- cutoff = commit->date;
- }
+ if (commit)
+ set_commit_cutoff(commit);
if (peel_tag) {
if (!commit) {
@@ -594,25 +649,19 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
add_object_array(object, *argv, &revs);
}
- if (cutoff) {
- /* check for undeflow */
- if (cutoff > TIME_MIN + CUTOFF_DATE_SLOP)
- cutoff = cutoff - CUTOFF_DATE_SLOP;
- else
- cutoff = TIME_MIN;
- }
+ adjust_cutoff_timestamp_for_slop();
+
for_each_ref(name_ref, &data);
name_tips();
- if (transform_stdin) {
- char buffer[2048];
+ if (annotate_stdin) {
+ struct strbuf sb = STRBUF_INIT;
- while (!feof(stdin)) {
- char *p = fgets(buffer, sizeof(buffer), stdin);
- if (!p)
- break;
- name_rev_line(p, &data);
+ while (strbuf_getline(&sb, stdin) != EOF) {
+ strbuf_addch(&sb, '\n');
+ name_rev_line(sb.buf, &data);
}
+ strbuf_release(&sb);
} else if (all) {
int i, max;
diff --git a/builtin/notes.c b/builtin/notes.c
index 71c5958..a3d0d15 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -32,8 +32,8 @@ static const char * const git_notes_usage[] = {
N_("git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"),
N_("git notes [--ref <notes-ref>] show [<object>]"),
N_("git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"),
- N_("git notes merge --commit [-v | -q]"),
- N_("git notes merge --abort [-v | -q]"),
+ "git notes merge --commit [-v | -q]",
+ "git notes merge --abort [-v | -q]",
N_("git notes [--ref <notes-ref>] remove [<object>...]"),
N_("git notes [--ref <notes-ref>] prune [-n] [-v]"),
N_("git notes [--ref <notes-ref>] get-ref"),
@@ -89,7 +89,7 @@ static const char * const git_notes_prune_usage[] = {
};
static const char * const git_notes_get_ref_usage[] = {
- N_("git notes get-ref"),
+ "git notes get-ref",
NULL
};
@@ -134,14 +134,13 @@ static void copy_obj_to_fd(int fd, const struct object_id *oid)
static void write_commented_object(int fd, const struct object_id *object)
{
- const char *show_args[5] =
- {"show", "--stat", "--no-notes", oid_to_hex(object), NULL};
struct child_process show = CHILD_PROCESS_INIT;
struct strbuf buf = STRBUF_INIT;
struct strbuf cbuf = STRBUF_INIT;
/* Invoke "git show --stat --no-notes $object" */
- show.argv = show_args;
+ strvec_pushl(&show.args, "show", "--stat", "--no-notes",
+ oid_to_hex(object), NULL);
show.no_stdin = 1;
show.out = -1;
show.err = 0;
@@ -200,12 +199,13 @@ static void prepare_note_data(const struct object_id *object, struct note_data *
static void write_note_data(struct note_data *d, struct object_id *oid)
{
- if (write_object_file(d->buf.buf, d->buf.len, blob_type, oid)) {
- error(_("unable to write note object"));
+ if (write_object_file(d->buf.buf, d->buf.len, OBJ_BLOB, oid)) {
+ int status = die_message(_("unable to write note object"));
+
if (d->edit_path)
- error(_("the note contents have been left in %s"),
- d->edit_path);
- exit(128);
+ die_message(_("the note contents have been left in %s"),
+ d->edit_path);
+ exit(status);
}
}
@@ -861,15 +861,19 @@ static int merge(int argc, const char **argv, const char *prefix)
update_ref(msg.buf, default_notes_ref(), &result_oid, NULL, 0,
UPDATE_REFS_DIE_ON_ERR);
else { /* Merge has unresolved conflicts */
+ struct worktree **worktrees;
const struct worktree *wt;
/* Update .git/NOTES_MERGE_PARTIAL with partial merge result */
update_ref(msg.buf, "NOTES_MERGE_PARTIAL", &result_oid, NULL,
0, UPDATE_REFS_DIE_ON_ERR);
/* Store ref-to-be-updated into .git/NOTES_MERGE_REF */
- wt = find_shared_symref("NOTES_MERGE_REF", default_notes_ref());
+ worktrees = get_worktrees();
+ wt = find_shared_symref(worktrees, "NOTES_MERGE_REF",
+ default_notes_ref());
if (wt)
die(_("a notes merge into %s is already in-progress at %s"),
default_notes_ref(), wt->path);
+ free_worktrees(worktrees);
if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL))
die(_("failed to store link to current notes ref (%s)"),
default_notes_ref());
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 1a3dd44..cc5f410 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -36,6 +36,7 @@
#include "trace2.h"
#include "shallow.h"
#include "promisor-remote.h"
+#include "pack-mtimes.h"
/*
* Objects we are going to pack are collected in the `to_pack` structure.
@@ -194,6 +195,8 @@ static int reuse_delta = 1, reuse_object = 1;
static int keep_unreachable, unpack_unreachable, include_tag;
static timestamp_t unpack_unreachable_expiration;
static int pack_loose_unreachable;
+static int cruft;
+static timestamp_t cruft_expiration;
static int local;
static int have_non_local_packs;
static int incremental;
@@ -237,8 +240,6 @@ static unsigned long cache_max_small_delta_size = 1000;
static unsigned long window_memory_limit = 0;
-static struct list_objects_filter_options filter_options;
-
static struct string_list uri_protocols = STRING_LIST_INIT_NODUP;
enum missing_action {
@@ -1199,16 +1200,26 @@ static void write_pack_file(void)
display_progress(progress_state, written);
}
- /*
- * Did we write the wrong # entries in the header?
- * If so, rewrite it like in fast-import
- */
if (pack_to_stdout) {
- finalize_hashfile(f, hash, CSUM_HASH_IN_STREAM | CSUM_CLOSE);
+ /*
+ * We never fsync when writing to stdout since we may
+ * not be writing to an actual pack file. For instance,
+ * the upload-pack code passes a pipe here. Calling
+ * fsync on a pipe results in unnecessary
+ * synchronization with the reader on some platforms.
+ */
+ finalize_hashfile(f, hash, FSYNC_COMPONENT_NONE,
+ CSUM_HASH_IN_STREAM | CSUM_CLOSE);
} else if (nr_written == nr_remaining) {
- finalize_hashfile(f, hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);
+ finalize_hashfile(f, hash, FSYNC_COMPONENT_PACK,
+ CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);
} else {
- int fd = finalize_hashfile(f, hash, 0);
+ /*
+ * If we wrote the wrong number of entries in the
+ * header, rewrite it like in fast-import.
+ */
+
+ int fd = finalize_hashfile(f, hash, FSYNC_COMPONENT_PACK, 0);
fixup_pack_header_footer(fd, hash, pack_tmp_name,
nr_written, hash, offset);
close(fd);
@@ -1252,9 +1263,13 @@ static void write_pack_file(void)
&to_pack, written_list, nr_written);
}
+ if (cruft)
+ pack_idx_opts.flags |= WRITE_MTIMES;
+
stage_tmp_packfiles(&tmpname, pack_tmp_name,
written_list, nr_written,
- &pack_idx_opts, hash, &idx_tmp_name);
+ &to_pack, &pack_idx_opts, hash,
+ &idx_tmp_name);
if (write_bitmap_index) {
size_t tmpname_len = tmpname.len;
@@ -1349,6 +1364,9 @@ static int want_found_object(const struct object_id *oid, int exclude,
if (incremental)
return 0;
+ if (!is_pack_valid(p))
+ return -1;
+
/*
* When asked to do --local (do not include an object that appears in a
* pack we borrow from elsewhere) or --honor-pack-keep (do not include
@@ -1464,6 +1482,9 @@ static int want_object_in_pack(const struct object_id *oid,
want = want_found_object(oid, exclude, *found_pack);
if (want != -1)
return want;
+
+ *found_pack = NULL;
+ *found_offset = 0;
}
for (m = get_multi_pack_index(the_repository); m; m = m->next) {
@@ -1507,13 +1528,13 @@ static int want_object_in_pack(const struct object_id *oid,
return 1;
}
-static void create_object_entry(const struct object_id *oid,
- enum object_type type,
- uint32_t hash,
- int exclude,
- int no_try_delta,
- struct packed_git *found_pack,
- off_t found_offset)
+static struct object_entry *create_object_entry(const struct object_id *oid,
+ enum object_type type,
+ uint32_t hash,
+ int exclude,
+ int no_try_delta,
+ struct packed_git *found_pack,
+ off_t found_offset)
{
struct object_entry *entry;
@@ -1530,6 +1551,8 @@ static void create_object_entry(const struct object_id *oid,
}
entry->no_try_delta = no_try_delta;
+
+ return entry;
}
static const char no_closure_warning[] = N_(
@@ -1802,7 +1825,7 @@ static void add_preferred_base(struct object_id *oid)
return;
data = read_object_with_reference(the_repository, oid,
- tree_type, &size, &tree_oid);
+ OBJ_TREE, &size, &tree_oid);
if (!data)
return;
@@ -3193,10 +3216,8 @@ static int add_object_entry_from_pack(const struct object_id *oid,
uint32_t pos,
void *_data)
{
- struct rev_info *revs = _data;
- struct object_info oi = OBJECT_INFO_INIT;
off_t ofs;
- enum object_type type;
+ enum object_type type = OBJ_NONE;
display_progress(progress_state, ++nr_seen);
@@ -3207,19 +3228,24 @@ static int add_object_entry_from_pack(const struct object_id *oid,
if (!want_object_in_pack(oid, 0, &p, &ofs))
return 0;
- oi.typep = &type;
- if (packed_object_info(the_repository, p, ofs, &oi) < 0)
- die(_("could not get type of object %s in pack %s"),
- oid_to_hex(oid), p->pack_name);
- else if (type == OBJ_COMMIT) {
- /*
- * commits in included packs are used as starting points for the
- * subsequent revision walk
- */
- add_pending_oid(revs, NULL, oid, 0);
- }
+ if (p) {
+ struct rev_info *revs = _data;
+ struct object_info oi = OBJECT_INFO_INIT;
- stdin_packs_found_nr++;
+ oi.typep = &type;
+ if (packed_object_info(the_repository, p, ofs, &oi) < 0) {
+ die(_("could not get type of object %s in pack %s"),
+ oid_to_hex(oid), p->pack_name);
+ } else if (type == OBJ_COMMIT) {
+ /*
+ * commits in included packs are used as starting points for the
+ * subsequent revision walk
+ */
+ add_pending_oid(revs, NULL, oid, 0);
+ }
+
+ stdin_packs_found_nr++;
+ }
create_object_entry(oid, type, 0, 0, 0, p, ofs);
@@ -3338,6 +3364,8 @@ static void read_packs_list_from_stdin(void)
struct packed_git *p = item->util;
if (!p)
die(_("could not find pack '%s'"), item->string);
+ if (!is_pack_valid(p))
+ die(_("packfile %s cannot be accessed"), p->pack_name);
}
/*
@@ -3361,8 +3389,6 @@ static void read_packs_list_from_stdin(void)
for_each_string_list_item(item, &include_packs) {
struct packed_git *p = item->util;
- if (!p)
- die(_("could not find pack '%s'"), item->string);
for_each_object_in_pack(p,
add_object_entry_from_pack,
&revs,
@@ -3386,6 +3412,217 @@ static void read_packs_list_from_stdin(void)
string_list_clear(&exclude_packs, 0);
}
+static void add_cruft_object_entry(const struct object_id *oid, enum object_type type,
+ struct packed_git *pack, off_t offset,
+ const char *name, uint32_t mtime)
+{
+ struct object_entry *entry;
+
+ display_progress(progress_state, ++nr_seen);
+
+ entry = packlist_find(&to_pack, oid);
+ if (entry) {
+ if (name) {
+ entry->hash = pack_name_hash(name);
+ entry->no_try_delta = no_try_delta(name);
+ }
+ } else {
+ if (!want_object_in_pack(oid, 0, &pack, &offset))
+ return;
+ if (!pack && type == OBJ_BLOB && !has_loose_object(oid)) {
+ /*
+ * If a traversed tree has a missing blob then we want
+ * to avoid adding that missing object to our pack.
+ *
+ * This only applies to missing blobs, not trees,
+ * because the traversal needs to parse sub-trees but
+ * not blobs.
+ *
+ * Note we only perform this check when we couldn't
+ * already find the object in a pack, so we're really
+ * limited to "ensure non-tip blobs which don't exist in
+ * packs do exist via loose objects". Confused?
+ */
+ return;
+ }
+
+ entry = create_object_entry(oid, type, pack_name_hash(name),
+ 0, name && no_try_delta(name),
+ pack, offset);
+ }
+
+ if (mtime > oe_cruft_mtime(&to_pack, entry))
+ oe_set_cruft_mtime(&to_pack, entry, mtime);
+ return;
+}
+
+static void show_cruft_object(struct object *obj, const char *name, void *data)
+{
+ /*
+ * if we did not record it earlier, it's at least as old as our
+ * expiration value. Rather than find it exactly, just use that
+ * value. This may bump it forward from its real mtime, but it
+ * will still be "too old" next time we run with the same
+ * expiration.
+ *
+ * if obj does appear in the packing list, this call is a noop (or may
+ * set the namehash).
+ */
+ add_cruft_object_entry(&obj->oid, obj->type, NULL, 0, name, cruft_expiration);
+}
+
+static void show_cruft_commit(struct commit *commit, void *data)
+{
+ show_cruft_object((struct object*)commit, NULL, data);
+}
+
+static int cruft_include_check_obj(struct object *obj, void *data)
+{
+ return !has_object_kept_pack(&obj->oid, IN_CORE_KEEP_PACKS);
+}
+
+static int cruft_include_check(struct commit *commit, void *data)
+{
+ return cruft_include_check_obj((struct object*)commit, data);
+}
+
+static void set_cruft_mtime(const struct object *object,
+ struct packed_git *pack,
+ off_t offset, time_t mtime)
+{
+ add_cruft_object_entry(&object->oid, object->type, pack, offset, NULL,
+ mtime);
+}
+
+static void mark_pack_kept_in_core(struct string_list *packs, unsigned keep)
+{
+ struct string_list_item *item = NULL;
+ for_each_string_list_item(item, packs) {
+ struct packed_git *p = item->util;
+ if (!p)
+ die(_("could not find pack '%s'"), item->string);
+ p->pack_keep_in_core = keep;
+ }
+}
+
+static void add_unreachable_loose_objects(void);
+static void add_objects_in_unpacked_packs(void);
+
+static void enumerate_cruft_objects(void)
+{
+ if (progress)
+ progress_state = start_progress(_("Enumerating cruft objects"), 0);
+
+ add_objects_in_unpacked_packs();
+ add_unreachable_loose_objects();
+
+ stop_progress(&progress_state);
+}
+
+static void enumerate_and_traverse_cruft_objects(struct string_list *fresh_packs)
+{
+ struct packed_git *p;
+ struct rev_info revs;
+ int ret;
+
+ repo_init_revisions(the_repository, &revs, NULL);
+
+ revs.tag_objects = 1;
+ revs.tree_objects = 1;
+ revs.blob_objects = 1;
+
+ revs.include_check = cruft_include_check;
+ revs.include_check_obj = cruft_include_check_obj;
+
+ revs.ignore_missing_links = 1;
+
+ if (progress)
+ progress_state = start_progress(_("Enumerating cruft objects"), 0);
+ ret = add_unseen_recent_objects_to_traversal(&revs, cruft_expiration,
+ set_cruft_mtime, 1);
+ stop_progress(&progress_state);
+
+ if (ret)
+ die(_("unable to add cruft objects"));
+
+ /*
+ * Re-mark only the fresh packs as kept so that objects in
+ * unknown packs do not halt the reachability traversal early.
+ */
+ for (p = get_all_packs(the_repository); p; p = p->next)
+ p->pack_keep_in_core = 0;
+ mark_pack_kept_in_core(fresh_packs, 1);
+
+ if (prepare_revision_walk(&revs))
+ die(_("revision walk setup failed"));
+ if (progress)
+ progress_state = start_progress(_("Traversing cruft objects"), 0);
+ nr_seen = 0;
+ traverse_commit_list(&revs, show_cruft_commit, show_cruft_object, NULL);
+
+ stop_progress(&progress_state);
+}
+
+static void read_cruft_objects(void)
+{
+ struct strbuf buf = STRBUF_INIT;
+ struct string_list discard_packs = STRING_LIST_INIT_DUP;
+ struct string_list fresh_packs = STRING_LIST_INIT_DUP;
+ struct packed_git *p;
+
+ ignore_packed_keep_in_core = 1;
+
+ while (strbuf_getline(&buf, stdin) != EOF) {
+ if (!buf.len)
+ continue;
+
+ if (*buf.buf == '-')
+ string_list_append(&discard_packs, buf.buf + 1);
+ else
+ string_list_append(&fresh_packs, buf.buf);
+ strbuf_reset(&buf);
+ }
+
+ string_list_sort(&discard_packs);
+ string_list_sort(&fresh_packs);
+
+ for (p = get_all_packs(the_repository); p; p = p->next) {
+ const char *pack_name = pack_basename(p);
+ struct string_list_item *item;
+
+ item = string_list_lookup(&fresh_packs, pack_name);
+ if (!item)
+ item = string_list_lookup(&discard_packs, pack_name);
+
+ if (item) {
+ item->util = p;
+ } else {
+ /*
+ * This pack wasn't mentioned in either the "fresh" or
+ * "discard" list, so the caller didn't know about it.
+ *
+ * Mark it as kept so that its objects are ignored by
+ * add_unseen_recent_objects_to_traversal(). We'll
+ * unmark it before starting the traversal so it doesn't
+ * halt the traversal early.
+ */
+ p->pack_keep_in_core = 1;
+ }
+ }
+
+ mark_pack_kept_in_core(&fresh_packs, 1);
+ mark_pack_kept_in_core(&discard_packs, 0);
+
+ if (cruft_expiration)
+ enumerate_and_traverse_cruft_objects(&fresh_packs);
+ else
+ enumerate_cruft_objects();
+
+ strbuf_release(&buf);
+ string_list_clear(&discard_packs, 0);
+ string_list_clear(&fresh_packs, 0);
+}
+
static void read_object_list_from_stdin(void)
{
char line[GIT_MAX_HEXSZ + 1 + PATH_MAX + 2];
@@ -3397,7 +3634,7 @@ static void read_object_list_from_stdin(void)
if (feof(stdin))
break;
if (!ferror(stdin))
- die("BUG: fgets returned NULL, not EOF, not error!");
+ BUG("fgets returned NULL, not EOF, not error!");
if (errno != EINTR)
die_errno("fgets");
clearerr(stdin);
@@ -3504,7 +3741,7 @@ static int option_parse_missing_action(const struct option *opt,
return 0;
}
- die(_("invalid value for --missing"));
+ die(_("invalid value for '%s': '%s'"), "--missing", arg);
return 0;
}
@@ -3518,7 +3755,24 @@ static int add_object_in_unpacked_pack(const struct object_id *oid,
uint32_t pos,
void *_data)
{
- add_object_entry(oid, OBJ_NONE, "", 0);
+ if (cruft) {
+ off_t offset;
+ time_t mtime;
+
+ if (pack->is_cruft) {
+ if (load_pack_mtimes(pack) < 0)
+ die(_("could not load cruft pack .mtimes"));
+ mtime = nth_packed_mtime(pack, pos);
+ } else {
+ mtime = pack->mtime;
+ }
+ offset = nth_packed_object_offset(pack, pos);
+
+ add_cruft_object_entry(oid, OBJ_NONE, pack, offset,
+ NULL, mtime);
+ } else {
+ add_object_entry(oid, OBJ_NONE, "", 0);
+ }
return 0;
}
@@ -3542,7 +3796,19 @@ static int add_loose_object(const struct object_id *oid, const char *path,
return 0;
}
- add_object_entry(oid, type, "", 0);
+ if (cruft) {
+ struct stat st;
+ if (stat(path, &st) < 0) {
+ if (errno == ENOENT)
+ return 0;
+ return error_errno("unable to stat %s", oid_to_hex(oid));
+ }
+
+ add_cruft_object_entry(oid, type, NULL, 0, NULL,
+ st.st_mtime);
+ } else {
+ add_object_entry(oid, type, "", 0);
+ }
return 0;
}
@@ -3651,7 +3917,7 @@ static int pack_options_allow_reuse(void)
static int get_object_list_from_bitmap(struct rev_info *revs)
{
- if (!(bitmap_git = prepare_bitmap_walk(revs, &filter_options, 0)))
+ if (!(bitmap_git = prepare_bitmap_walk(revs, 0)))
return -1;
if (pack_options_allow_reuse() &&
@@ -3714,9 +3980,8 @@ static void mark_bitmap_preferred_tips(void)
}
}
-static void get_object_list(int ac, const char **av)
+static void get_object_list(struct rev_info *revs, int ac, const char **av)
{
- struct rev_info revs;
struct setup_revision_opt s_r_opt = {
.allow_exclude_promisor_objects = 1,
};
@@ -3724,9 +3989,8 @@ static void get_object_list(int ac, const char **av)
int flags = 0;
int save_warning;
- repo_init_revisions(the_repository, &revs, NULL);
save_commit_buffer = 0;
- setup_revisions(ac, av, &revs, &s_r_opt);
+ setup_revisions(ac, av, revs, &s_r_opt);
/* make sure shallows are read */
is_repository_shallow(the_repository);
@@ -3756,13 +4020,13 @@ static void get_object_list(int ac, const char **av)
}
die(_("not a rev '%s'"), line);
}
- if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME))
+ if (handle_revision_arg(line, revs, flags, REVARG_CANNOT_BE_FILENAME))
die(_("bad revision '%s'"), line);
}
warn_on_object_refname_ambiguity = save_warning;
- if (use_bitmap_index && !get_object_list_from_bitmap(&revs))
+ if (use_bitmap_index && !get_object_list_from_bitmap(revs))
return;
if (use_delta_islands)
@@ -3771,24 +4035,24 @@ static void get_object_list(int ac, const char **av)
if (write_bitmap_index)
mark_bitmap_preferred_tips();
- if (prepare_revision_walk(&revs))
+ if (prepare_revision_walk(revs))
die(_("revision walk setup failed"));
- mark_edges_uninteresting(&revs, show_edge, sparse);
+ mark_edges_uninteresting(revs, show_edge, sparse);
if (!fn_show_object)
fn_show_object = show_object;
- traverse_commit_list_filtered(&filter_options, &revs,
- show_commit, fn_show_object, NULL,
- NULL);
+ traverse_commit_list(revs,
+ show_commit, fn_show_object,
+ NULL);
if (unpack_unreachable_expiration) {
- revs.ignore_missing_links = 1;
- if (add_unseen_recent_objects_to_traversal(&revs,
- unpack_unreachable_expiration))
+ revs->ignore_missing_links = 1;
+ if (add_unseen_recent_objects_to_traversal(revs,
+ unpack_unreachable_expiration, NULL, 0))
die(_("unable to add recent objects"));
- if (prepare_revision_walk(&revs))
+ if (prepare_revision_walk(revs))
die(_("revision walk setup failed"));
- traverse_commit_list(&revs, record_recent_commit,
+ traverse_commit_list(revs, record_recent_commit,
record_recent_object, NULL);
}
@@ -3861,6 +4125,35 @@ static int option_parse_unpack_unreachable(const struct option *opt,
return 0;
}
+static int option_parse_cruft_expiration(const struct option *opt,
+ const char *arg, int unset)
+{
+ if (unset) {
+ cruft = 0;
+ cruft_expiration = 0;
+ } else {
+ cruft = 1;
+ if (arg)
+ cruft_expiration = approxidate(arg);
+ }
+ return 0;
+}
+
+struct po_filter_data {
+ unsigned have_revs:1;
+ struct rev_info revs;
+};
+
+static struct list_objects_filter_options *po_filter_revs_init(void *value)
+{
+ struct po_filter_data *data = value;
+
+ repo_init_revisions(the_repository, &data->revs, NULL);
+ data->have_revs = 1;
+
+ return &data->revs.filter;
+}
+
int cmd_pack_objects(int argc, const char **argv, const char *prefix)
{
int use_internal_rev_list = 0;
@@ -3871,6 +4164,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
int rev_list_index = 0;
int stdin_packs = 0;
struct string_list keep_pack_list = STRING_LIST_INIT_NODUP;
+ struct po_filter_data pfd = { .have_revs = 0 };
+
struct option pack_objects_options[] = {
OPT_SET_INT('q', "quiet", &progress,
N_("do not show progress meter"), 0),
@@ -3933,6 +4228,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
OPT_CALLBACK_F(0, "unpack-unreachable", NULL, N_("time"),
N_("unpack unreachable objects newer than <time>"),
PARSE_OPT_OPTARG, option_parse_unpack_unreachable),
+ OPT_BOOL(0, "cruft", &cruft, N_("create a cruft pack")),
+ OPT_CALLBACK_F(0, "cruft-expiration", NULL, N_("time"),
+ N_("expire cruft objects older than <time>"),
+ PARSE_OPT_OPTARG, option_parse_cruft_expiration),
OPT_BOOL(0, "sparse", &sparse,
N_("use the sparse reachability algorithm")),
OPT_BOOL(0, "thin", &thin,
@@ -3956,7 +4255,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
&write_bitmap_index,
N_("write a bitmap index if possible"),
WRITE_BITMAP_QUIET, PARSE_OPT_HIDDEN),
- OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
+ OPT_PARSE_LIST_OBJECTS_FILTER_INIT(&pfd, po_filter_revs_init),
OPT_CALLBACK_F(0, "missing", NULL, N_("action"),
N_("handling for missing objects"), PARSE_OPT_NONEG,
option_parse_missing_action),
@@ -3976,9 +4275,11 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
read_replace_refs = 0;
sparse = git_env_bool("GIT_TEST_PACK_SPARSE", -1);
- prepare_repo_settings(the_repository);
- if (sparse < 0)
- sparse = the_repository->settings.pack_use_sparse;
+ if (the_repository->gitdir) {
+ prepare_repo_settings(the_repository);
+ if (sparse < 0)
+ sparse = the_repository->settings.pack_use_sparse;
+ }
reset_pack_idx_option(&pack_idx_opts);
git_config(git_pack_config, NULL);
@@ -4057,7 +4358,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
if (!HAVE_THREADS && delta_search_threads != 1)
warning(_("no threads support, ignoring --threads"));
- if (!pack_to_stdout && !pack_size_limit)
+ if (!pack_to_stdout && !pack_size_limit && !cruft)
pack_size_limit = pack_size_limit_cfg;
if (pack_to_stdout && pack_size_limit)
die(_("--max-pack-size cannot be used to build a pack for transfer"));
@@ -4070,11 +4371,11 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
die(_("--thin cannot be used to build an indexable pack"));
if (keep_unreachable && unpack_unreachable)
- die(_("--keep-unreachable and --unpack-unreachable are incompatible"));
+ die(_("options '%s' and '%s' cannot be used together"), "--keep-unreachable", "--unpack-unreachable");
if (!rev_list_all || !rev_list_reflog || !rev_list_index)
unpack_unreachable_expiration = 0;
- if (filter_options.choice) {
+ if (pfd.have_revs && pfd.revs.filter.choice) {
if (!pack_to_stdout)
die(_("cannot use --filter without --stdout"));
if (stdin_packs)
@@ -4084,6 +4385,15 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
if (stdin_packs && use_internal_rev_list)
die(_("cannot use internal rev list with --stdin-packs"));
+ if (cruft) {
+ if (use_internal_rev_list)
+ die(_("cannot use internal rev list with --cruft"));
+ if (stdin_packs)
+ die(_("cannot use --stdin-packs with --cruft"));
+ if (pack_size_limit)
+ die(_("cannot use --max-pack-size with --cruft"));
+ }
+
/*
* "soft" reasons not to use bitmaps - for on-disk repack by default we want
*
@@ -4140,7 +4450,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
the_repository);
prepare_packing_data(the_repository, &to_pack);
- if (progress)
+ if (progress && !cruft)
progress_state = start_progress(_("Enumerating objects"), 0);
if (stdin_packs) {
/* avoids adding objects in excluded packs */
@@ -4148,11 +4458,19 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
read_packs_list_from_stdin();
if (rev_list_unpacked)
add_unreachable_loose_objects();
- } else if (!use_internal_rev_list)
+ } else if (cruft) {
+ read_cruft_objects();
+ } else if (!use_internal_rev_list) {
read_object_list_from_stdin();
- else {
- get_object_list(rp.nr, rp.v);
- strvec_clear(&rp);
+ } else if (pfd.have_revs) {
+ get_object_list(&pfd.revs, rp.nr, rp.v);
+ release_revisions(&pfd.revs);
+ } else {
+ struct rev_info revs;
+
+ repo_init_revisions(the_repository, &revs, NULL);
+ get_object_list(&revs, rp.nr, rp.v);
+ release_revisions(&revs);
}
cleanup_preferred_base();
if (include_tag && nr_result)
@@ -4162,7 +4480,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
the_repository);
if (non_empty && !nr_result)
- return 0;
+ goto cleanup;
if (nr_result) {
trace2_region_enter("pack-objects", "prepare-pack",
the_repository);
@@ -4183,5 +4501,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
" pack-reused %"PRIu32),
written, written_delta, reused, reused_delta,
reuse_packfile_objects);
+
+cleanup:
+ strvec_clear(&rp);
+
return 0;
}
diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index 8bf5c0a..ed9b901 100644
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -101,7 +101,7 @@ static inline struct llist_item *llist_insert(struct llist *list,
oidread(&new_item->oid, oid);
new_item->next = NULL;
- if (after != NULL) {
+ if (after) {
new_item->next = after->next;
after->next = new_item;
if (after == list->back)
@@ -157,7 +157,7 @@ static inline struct llist_item * llist_sorted_remove(struct llist *list, const
if (cmp > 0) /* not in list, since sorted */
return prev;
if (!cmp) { /* found */
- if (prev == NULL) {
+ if (!prev) {
if (hint != NULL && hint != list->front) {
/* we don't know the previous element */
hint = NULL;
@@ -219,7 +219,7 @@ static struct pack_list * pack_list_difference(const struct pack_list *A,
struct pack_list *ret;
const struct pack_list *pl;
- if (A == NULL)
+ if (!A)
return NULL;
pl = B;
@@ -317,7 +317,7 @@ static size_t get_pack_redundancy(struct pack_list *pl)
struct pack_list *subset;
size_t ret = 0;
- if (pl == NULL)
+ if (!pl)
return 0;
while ((subset = pl->next)) {
@@ -611,7 +611,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
while (*(argv + i) != NULL)
add_pack_file(*(argv + i++));
- if (local_packs == NULL)
+ if (!local_packs)
die("Zero packs found!");
load_all_objects();
diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index 822ffff..881fcf3 100644
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -32,8 +32,12 @@ static int scan_hunk_header(const char *p, int *p_before, int *p_after)
n = strspn(q, digits);
if (q[n] == ',') {
q += n + 1;
+ *p_before = atoi(q);
n = strspn(q, digits);
+ } else {
+ *p_before = 1;
}
+
if (n == 0 || q[n] != ' ' || q[n+1] != '+')
return 0;
@@ -41,13 +45,14 @@ static int scan_hunk_header(const char *p, int *p_before, int *p_after)
n = strspn(r, digits);
if (r[n] == ',') {
r += n + 1;
+ *p_after = atoi(r);
n = strspn(r, digits);
+ } else {
+ *p_after = 1;
}
if (n == 0)
return 0;
- *p_before = atoi(q);
- *p_after = atoi(r);
return 1;
}
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index b7b9281..da3273a 100644
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -3,7 +3,7 @@
#include "prune-packed.h"
static const char * const prune_packed_usage[] = {
- N_("git prune-packed [-n | --dry-run] [-q | --quiet]"),
+ "git prune-packed [-n | --dry-run] [-q | --quiet]",
NULL
};
diff --git a/builtin/prune.c b/builtin/prune.c
index 485c9a3..df376b2 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -26,10 +26,22 @@ static int prune_tmp_file(const char *fullpath)
return error("Could not stat '%s'", fullpath);
if (st.st_mtime > expire)
return 0;
- if (show_only || verbose)
- printf("Removing stale temporary file %s\n", fullpath);
- if (!show_only)
- unlink_or_warn(fullpath);
+ if (S_ISDIR(st.st_mode)) {
+ if (show_only || verbose)
+ printf("Removing stale temporary directory %s\n", fullpath);
+ if (!show_only) {
+ struct strbuf remove_dir_buf = STRBUF_INIT;
+
+ strbuf_addstr(&remove_dir_buf, fullpath);
+ remove_dir_recursively(&remove_dir_buf, 0);
+ strbuf_release(&remove_dir_buf);
+ }
+ } else {
+ if (show_only || verbose)
+ printf("Removing stale temporary file %s\n", fullpath);
+ if (!show_only)
+ unlink_or_warn(fullpath);
+ }
return 0;
}
@@ -184,5 +196,6 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
prune_shallow(show_only ? PRUNE_SHOW_ONLY : 0);
}
+ release_revisions(&revs);
return 0;
}
diff --git a/builtin/pull.c b/builtin/pull.c
index cf6c56e..01155ba 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -31,9 +31,8 @@
/**
* Parses the value of --rebase. If value is a false value, returns
* REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is
- * "merges", returns REBASE_MERGES. If value is "preserve", returns
- * REBASE_PRESERVE. If value is a invalid value, dies with a fatal error if
- * fatal is true, otherwise returns REBASE_INVALID.
+ * "merges", returns REBASE_MERGES. If value is a invalid value, dies with
+ * a fatal error if fatal is true, otherwise returns REBASE_INVALID.
*/
static enum rebase_type parse_config_rebase(const char *key, const char *value,
int fatal)
@@ -43,9 +42,9 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value,
return v;
if (fatal)
- die(_("Invalid value for %s: %s"), key, value);
+ die(_("invalid value for '%s': '%s'"), key, value);
else
- error(_("Invalid value for %s: %s"), key, value);
+ error(_("invalid value for '%s': '%s'"), key, value);
return REBASE_INVALID;
}
@@ -73,6 +72,7 @@ static const char * const pull_usage[] = {
static int opt_verbosity;
static char *opt_progress;
static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
+static int recurse_submodules_cli = RECURSE_SUBMODULES_DEFAULT;
/* Options passed to git-merge or git-rebase */
static enum rebase_type opt_rebase = -1;
@@ -85,6 +85,7 @@ static char *opt_edit;
static char *cleanup_arg;
static char *opt_ff;
static char *opt_verify_signatures;
+static char *opt_verify;
static int opt_autostash = -1;
static int config_autostash;
static int check_trust_level = 1;
@@ -120,14 +121,14 @@ static struct option pull_options[] = {
N_("force progress reporting"),
PARSE_OPT_NOARG),
OPT_CALLBACK_F(0, "recurse-submodules",
- &recurse_submodules, N_("on-demand"),
+ &recurse_submodules_cli, N_("on-demand"),
N_("control for recursive fetching of submodules"),
PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules),
/* Options passed to git-merge or git-rebase */
OPT_GROUP(N_("Options related to merging")),
OPT_CALLBACK_F('r', "rebase", &opt_rebase,
- "(false|true|merges|preserve|interactive)",
+ "(false|true|merges|interactive)",
N_("incorporate changes by rebasing rather than merging"),
PARSE_OPT_OPTARG, parse_opt_rebase),
OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
@@ -161,6 +162,9 @@ static struct option pull_options[] = {
OPT_PASSTHRU(0, "ff-only", &opt_ff, NULL,
N_("abort if fast-forward is not possible"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG),
+ OPT_PASSTHRU(0, "verify", &opt_verify, NULL,
+ N_("control use of pre-merge-commit and commit-msg hooks"),
+ PARSE_OPT_NOARG),
OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures, NULL,
N_("verify that the named commit has a valid GPG signature"),
PARSE_OPT_NOARG),
@@ -315,7 +319,7 @@ static const char *config_get_ff(void)
if (!strcmp(value, "only"))
return "--ff-only";
- die(_("Invalid value for pull.ff: %s"), value);
+ die(_("invalid value for '%s': '%s'"), "pull.ff", value);
}
/**
@@ -533,8 +537,8 @@ static int run_fetch(const char *repo, const char **refspecs)
strvec_push(&args, opt_tags);
if (opt_prune)
strvec_push(&args, opt_prune);
- if (recurse_submodules != RECURSE_SUBMODULES_DEFAULT)
- switch (recurse_submodules) {
+ if (recurse_submodules_cli != RECURSE_SUBMODULES_DEFAULT)
+ switch (recurse_submodules_cli) {
case RECURSE_SUBMODULES_ON:
strvec_push(&args, "--recurse-submodules=on");
break;
@@ -676,6 +680,8 @@ static int run_merge(void)
strvec_pushf(&args, "--cleanup=%s", cleanup_arg);
if (opt_ff)
strvec_push(&args, opt_ff);
+ if (opt_verify)
+ strvec_push(&args, opt_verify);
if (opt_verify_signatures)
strvec_push(&args, opt_verify_signatures);
strvec_pushv(&args, opt_strategies.v);
@@ -884,8 +890,6 @@ static int run_rebase(const struct object_id *newbase,
/* Options passed to git-rebase */
if (opt_rebase == REBASE_MERGES)
strvec_push(&args, "--rebase-merges");
- else if (opt_rebase == REBASE_PRESERVE)
- strvec_push(&args, "--preserve-merges");
else if (opt_rebase == REBASE_INTERACTIVE)
strvec_push(&args, "--interactive");
if (opt_diffstat)
@@ -934,13 +938,40 @@ static int get_can_ff(struct object_id *orig_head,
return ret;
}
+/*
+ * Is orig_head a descendant of _all_ merge_heads?
+ * Unfortunately is_descendant_of() cannot be used as it asks
+ * if orig_head is a descendant of at least one of them.
+ */
+static int already_up_to_date(struct object_id *orig_head,
+ struct oid_array *merge_heads)
+{
+ int i;
+ struct commit *ours;
+
+ ours = lookup_commit_reference(the_repository, orig_head);
+ for (i = 0; i < merge_heads->nr; i++) {
+ struct commit_list *list = NULL;
+ struct commit *theirs;
+ int ok;
+
+ theirs = lookup_commit_reference(the_repository, &merge_heads->oid[i]);
+ commit_list_insert(theirs, &list);
+ ok = repo_is_descendant_of(the_repository, ours, list);
+ free_commit_list(list);
+ if (!ok)
+ return 0;
+ }
+ return 1;
+}
+
static void show_advice_pull_non_ff(void)
{
advise(_("You have divergent branches and need to specify how to reconcile them.\n"
"You can do so by running one of the following commands sometime before\n"
"your next pull:\n"
"\n"
- " git config pull.rebase false # merge (the default strategy)\n"
+ " git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
@@ -958,14 +989,22 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
struct object_id rebase_fork_point;
int rebase_unspecified = 0;
int can_ff;
+ int divergent;
if (!getenv("GIT_REFLOG_ACTION"))
set_reflog_message(argc, argv);
git_config(git_pull_config, NULL);
+ if (the_repository->gitdir) {
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+ }
argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0);
+ if (recurse_submodules_cli != RECURSE_SUBMODULES_DEFAULT)
+ recurse_submodules = recurse_submodules_cli;
+
if (cleanup_arg)
/*
* this only checks the validity of cleanup_arg; we don't need
@@ -1005,14 +1044,13 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
oidclr(&orig_head);
if (opt_rebase) {
- int autostash = config_autostash;
- if (opt_autostash != -1)
- autostash = opt_autostash;
+ if (opt_autostash == -1)
+ opt_autostash = config_autostash;
if (is_null_oid(&orig_head) && !is_cache_unborn())
die(_("Updating an unborn branch with changes added to the index."));
- if (!autostash)
+ if (!opt_autostash)
require_clean_work_tree(the_repository,
N_("pull with rebase"),
_("please commit or stash them."), 1, 0);
@@ -1072,15 +1110,16 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
}
can_ff = get_can_ff(&orig_head, &merge_heads);
+ divergent = !can_ff && !already_up_to_date(&orig_head, &merge_heads);
/* ff-only takes precedence over rebase */
if (opt_ff && !strcmp(opt_ff, "--ff-only")) {
- if (!can_ff)
+ if (divergent)
die_ff_impossible();
opt_rebase = REBASE_FALSE;
}
/* If no action specified and we can't fast forward, then warn. */
- if (!opt_ff && rebase_unspecified && !can_ff) {
+ if (!opt_ff && rebase_unspecified && divergent) {
show_advice_pull_non_ff();
die(_("Need to specify how to reconcile divergent branches."));
}
diff --git a/builtin/push.c b/builtin/push.c
index 4b026ce..86b44f8 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -2,6 +2,7 @@
* "git push"
*/
#include "cache.h"
+#include "branch.h"
#include "config.h"
#include "refs.h"
#include "refspec.h"
@@ -151,7 +152,8 @@ static NORETURN void die_push_simple(struct branch *branch,
* upstream to a non-branch, we should probably be showing
* them the big ugly fully qualified ref.
*/
- const char *advice_maybe = "";
+ const char *advice_pushdefault_maybe = "";
+ const char *advice_automergesimple_maybe = "";
const char *short_upstream = branch->merge[0]->src;
skip_prefix(short_upstream, "refs/heads/", &short_upstream);
@@ -161,9 +163,16 @@ static NORETURN void die_push_simple(struct branch *branch,
* push.default.
*/
if (push_default == PUSH_DEFAULT_UNSPECIFIED)
- advice_maybe = _("\n"
+ advice_pushdefault_maybe = _("\n"
"To choose either option permanently, "
- "see push.default in 'git help config'.");
+ "see push.default in 'git help config'.\n");
+ if (git_branch_track != BRANCH_TRACK_SIMPLE)
+ advice_automergesimple_maybe = _("\n"
+ "To avoid automatically configuring "
+ "upstream branches when their name\n"
+ "doesn't match the local branch, see option "
+ "'simple' of branch.autosetupmerge\n"
+ "in 'git help config'.\n");
die(_("The upstream branch of your current branch does not match\n"
"the name of your current branch. To push to the upstream branch\n"
"on the remote, use\n"
@@ -173,9 +182,10 @@ static NORETURN void die_push_simple(struct branch *branch,
"To push to the branch of the same name on the remote, use\n"
"\n"
" git push %s HEAD\n"
- "%s"),
+ "%s%s"),
remote->name, short_upstream,
- remote->name, advice_maybe);
+ remote->name, advice_pushdefault_maybe,
+ advice_automergesimple_maybe);
}
static const char message_detached_head_die[] =
@@ -185,16 +195,32 @@ static const char message_detached_head_die[] =
"\n"
" git push %s HEAD:<name-of-remote-branch>\n");
-static const char *get_upstream_ref(struct branch *branch, const char *remote_name)
+static const char *get_upstream_ref(int flags, struct branch *branch, const char *remote_name)
{
- if (!branch->merge_nr || !branch->merge || !branch->remote_name)
+ if (branch->merge_nr == 0 && (flags & TRANSPORT_PUSH_AUTO_UPSTREAM)) {
+ /* if missing, assume same; set_upstream will be defined later */
+ return branch->refname;
+ }
+
+ if (!branch->merge_nr || !branch->merge || !branch->remote_name) {
+ const char *advice_autosetup_maybe = "";
+ if (!(flags & TRANSPORT_PUSH_AUTO_UPSTREAM)) {
+ advice_autosetup_maybe = _("\n"
+ "To have this happen automatically for "
+ "branches without a tracking\n"
+ "upstream, see 'push.autoSetupRemote' "
+ "in 'git help config'.\n");
+ }
die(_("The current branch %s has no upstream branch.\n"
"To push the current branch and set the remote as upstream, use\n"
"\n"
- " git push --set-upstream %s %s\n"),
+ " git push --set-upstream %s %s\n"
+ "%s"),
branch->name,
remote_name,
- branch->name);
+ branch->name,
+ advice_autosetup_maybe);
+ }
if (branch->merge_nr != 1)
die(_("The current branch %s has multiple upstream branches, "
"refusing to push."), branch->name);
@@ -202,7 +228,7 @@ static const char *get_upstream_ref(struct branch *branch, const char *remote_na
return branch->merge[0]->src;
}
-static void setup_default_push_refspecs(struct remote *remote)
+static void setup_default_push_refspecs(int *flags, struct remote *remote)
{
struct branch *branch;
const char *dst;
@@ -234,7 +260,7 @@ static void setup_default_push_refspecs(struct remote *remote)
case PUSH_DEFAULT_SIMPLE:
if (!same_remote)
break;
- if (strcmp(branch->refname, get_upstream_ref(branch, remote->name)))
+ if (strcmp(branch->refname, get_upstream_ref(*flags, branch, remote->name)))
die_push_simple(branch, remote);
break;
@@ -244,13 +270,21 @@ static void setup_default_push_refspecs(struct remote *remote)
"your current branch '%s', without telling me what to push\n"
"to update which remote branch."),
remote->name, branch->name);
- dst = get_upstream_ref(branch, remote->name);
+ dst = get_upstream_ref(*flags, branch, remote->name);
break;
case PUSH_DEFAULT_CURRENT:
break;
}
+ /*
+ * this is a default push - if auto-upstream is enabled and there is
+ * no upstream defined, then set it (with options 'simple', 'upstream',
+ * and 'current').
+ */
+ if ((*flags & TRANSPORT_PUSH_AUTO_UPSTREAM) && branch->merge_nr == 0)
+ *flags |= TRANSPORT_PUSH_SET_UPSTREAM;
+
refspec_appendf(&rs, "%s:%s", branch->refname, dst);
}
@@ -401,7 +435,7 @@ static int do_push(int flags,
if (remote->push.nr) {
push_refspec = &remote->push;
} else if (!(flags & TRANSPORT_PUSH_MIRROR))
- setup_default_push_refspecs(remote);
+ setup_default_push_refspecs(&flags, remote);
}
errs = 0;
url_nr = push_url_of_remote(remote, &url);
@@ -472,6 +506,10 @@ static int git_push_config(const char *k, const char *v, void *cb)
else
*flags &= ~TRANSPORT_PUSH_FOLLOW_TAGS;
return 0;
+ } else if (!strcmp(k, "push.autosetupremote")) {
+ if (git_config_bool(k, v))
+ *flags |= TRANSPORT_PUSH_AUTO_UPSTREAM;
+ return 0;
} else if (!strcmp(k, "push.gpgsign")) {
const char *value;
if (!git_config_get_value("push.gpgsign", &value)) {
@@ -486,7 +524,7 @@ static int git_push_config(const char *k, const char *v, void *cb)
if (value && !strcasecmp(value, "if-asked"))
set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_IF_ASKED);
else
- return error("Invalid value for '%s'", k);
+ return error(_("invalid value for '%s'"), k);
}
}
} else if (!strcmp(k, "push.recursesubmodules")) {
@@ -589,7 +627,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
set_push_cert_flags(&flags, push_cert);
if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
- die(_("--delete is incompatible with --all, --mirror and --tags"));
+ die(_("options '%s' and '%s' cannot be used together"), "--delete", "--all/--mirror/--tags");
if (deleterefs && argc < 2)
die(_("--delete doesn't make sense without any refs"));
@@ -627,18 +665,18 @@ int cmd_push(int argc, const char **argv, const char *prefix)
if (flags & TRANSPORT_PUSH_ALL) {
if (tags)
- die(_("--all and --tags are incompatible"));
+ die(_("options '%s' and '%s' cannot be used together"), "--all", "--tags");
if (argc >= 2)
die(_("--all can't be combined with refspecs"));
}
if (flags & TRANSPORT_PUSH_MIRROR) {
if (tags)
- die(_("--mirror and --tags are incompatible"));
+ die(_("options '%s' and '%s' cannot be used together"), "--mirror", "--tags");
if (argc >= 2)
die(_("--mirror can't be combined with refspecs"));
}
if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR))
- die(_("--all and --mirror are incompatible"));
+ die(_("options '%s' and '%s' cannot be used together"), "--all", "--mirror");
if (!is_empty_cas(&cas) && (flags & TRANSPORT_PUSH_FORCE_IF_INCLUDES))
cas.use_force_if_includes = 1;
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 485e7b0..9f1f33e 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -38,7 +38,7 @@ static int list_tree(struct object_id *oid)
}
static const char * const read_tree_usage[] = {
- N_("git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"),
+ N_("git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"),
NULL
};
@@ -53,24 +53,16 @@ static int index_output_cb(const struct option *opt, const char *arg,
static int exclude_per_directory_cb(const struct option *opt, const char *arg,
int unset)
{
- struct dir_struct *dir;
struct unpack_trees_options *opts;
BUG_ON_OPT_NEG(unset);
opts = (struct unpack_trees_options *)opt->value;
- if (opts->dir)
- die("more than one --exclude-per-directory given.");
-
- dir = xcalloc(1, sizeof(*opts->dir));
- dir->flags |= DIR_SHOW_IGNORED;
- dir->exclude_per_dir = arg;
- opts->dir = dir;
- /* We do not need to nor want to do read-directory
- * here; we are merely interested in reusing the
- * per directory ignore stack mechanism.
- */
+ if (!opts->update)
+ die("--exclude-per-directory is meaningless unless -u");
+ if (strcmp(arg, ".gitignore"))
+ die("--exclude-per-directory argument must be .gitignore");
return 0;
}
@@ -168,12 +160,22 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
argc = parse_options(argc, argv, cmd_prefix, read_tree_options,
read_tree_usage, 0);
- hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
-
prefix_set = opts.prefix ? 1 : 0;
if (1 < opts.merge + opts.reset + prefix_set)
die("Which one? -m, --reset, or --prefix?");
+ /* Prefix should not start with a directory separator */
+ if (opts.prefix && opts.prefix[0] == '/')
+ die("Invalid prefix, prefix cannot start with '/'");
+
+ if (opts.reset)
+ opts.reset = UNPACK_RESET_OVERWRITE_UNTRACKED;
+
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
+ hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
+
/*
* NEEDSWORK
*
@@ -209,11 +211,15 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
if ((opts.update || opts.index_only) && !opts.merge)
die("%s is meaningless without -m, --reset, or --prefix",
opts.update ? "-u" : "-i");
- if ((opts.dir && !opts.update))
- die("--exclude-per-directory is meaningless unless -u");
+ if (opts.update && !opts.reset)
+ opts.preserve_ignored = 0;
+ /* otherwise, opts.preserve_ignored is irrelevant */
if (opts.merge && !opts.index_only)
setup_work_tree();
+ if (opts.skip_sparse_checkout)
+ ensure_full_index(&the_index);
+
if (opts.merge) {
switch (stage - 1) {
case 0:
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 8c6393f..7ab50cd 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -28,6 +28,7 @@
#include "sequencer.h"
#include "rebase-interactive.h"
#include "reset.h"
+#include "hook.h"
#define DEFAULT_REFLOG_ACTION "rebase"
@@ -36,7 +37,7 @@ static char const * const builtin_rebase_usage[] = {
"[--onto <newbase> | --keep-base] [<upstream> [<branch>]]"),
N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
"--root [<branch>]"),
- N_("git rebase --continue | --abort | --skip | --edit-todo"),
+ "git rebase --continue | --abort | --skip | --edit-todo",
NULL
};
@@ -48,8 +49,7 @@ static GIT_PATH_FUNC(merge_dir, "rebase-merge")
enum rebase_type {
REBASE_UNSPECIFIED = -1,
REBASE_APPLY,
- REBASE_MERGE,
- REBASE_PRESERVE_MERGES
+ REBASE_MERGE
};
enum empty_type {
@@ -163,12 +163,7 @@ enum action {
ACTION_ABORT,
ACTION_QUIT,
ACTION_EDIT_TODO,
- ACTION_SHOW_CURRENT_PATCH,
- ACTION_SHORTEN_OIDS,
- ACTION_EXPAND_OIDS,
- ACTION_CHECK_TODO_LIST,
- ACTION_REARRANGE_SQUASH,
- ACTION_ADD_EXEC
+ ACTION_SHOW_CURRENT_PATCH
};
static const char *action_names[] = { "undefined",
@@ -179,81 +174,6 @@ static const char *action_names[] = { "undefined",
"edit_todo",
"show_current_patch" };
-static int add_exec_commands(struct string_list *commands)
-{
- const char *todo_file = rebase_path_todo();
- struct todo_list todo_list = TODO_LIST_INIT;
- int res;
-
- if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
- return error_errno(_("could not read '%s'."), todo_file);
-
- if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
- &todo_list)) {
- todo_list_release(&todo_list);
- return error(_("unusable todo list: '%s'"), todo_file);
- }
-
- todo_list_add_exec_commands(&todo_list, commands);
- res = todo_list_write_to_file(the_repository, &todo_list,
- todo_file, NULL, NULL, -1, 0);
- todo_list_release(&todo_list);
-
- if (res)
- return error_errno(_("could not write '%s'."), todo_file);
- return 0;
-}
-
-static int rearrange_squash_in_todo_file(void)
-{
- const char *todo_file = rebase_path_todo();
- struct todo_list todo_list = TODO_LIST_INIT;
- int res = 0;
-
- if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
- return error_errno(_("could not read '%s'."), todo_file);
- if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
- &todo_list)) {
- todo_list_release(&todo_list);
- return error(_("unusable todo list: '%s'"), todo_file);
- }
-
- res = todo_list_rearrange_squash(&todo_list);
- if (!res)
- res = todo_list_write_to_file(the_repository, &todo_list,
- todo_file, NULL, NULL, -1, 0);
-
- todo_list_release(&todo_list);
-
- if (res)
- return error_errno(_("could not write '%s'."), todo_file);
- return 0;
-}
-
-static int transform_todo_file(unsigned flags)
-{
- const char *todo_file = rebase_path_todo();
- struct todo_list todo_list = TODO_LIST_INIT;
- int res;
-
- if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
- return error_errno(_("could not read '%s'."), todo_file);
-
- if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
- &todo_list)) {
- todo_list_release(&todo_list);
- return error(_("unusable todo list: '%s'"), todo_file);
- }
-
- res = todo_list_write_to_file(the_repository, &todo_list, todo_file,
- NULL, NULL, -1, flags);
- todo_list_release(&todo_list);
-
- if (res)
- return error_errno(_("could not write '%s'."), todo_file);
- return 0;
-}
-
static int edit_todo_file(unsigned flags)
{
const char *todo_file = rebase_path_todo();
@@ -403,7 +323,6 @@ static int run_sequencer_rebase(struct rebase_options *opts,
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;
flags |= opts->flags & REBASE_NO_QUIET ? TODO_LIST_WARN_SKIPPED_CHERRY_PICKS : 0;
@@ -439,24 +358,6 @@ static int run_sequencer_rebase(struct rebase_options *opts,
break;
}
- case ACTION_SHORTEN_OIDS:
- case ACTION_EXPAND_OIDS:
- ret = transform_todo_file(flags);
- break;
- case ACTION_CHECK_TODO_LIST:
- ret = check_todo_list_from_file(the_repository);
- break;
- case ACTION_REARRANGE_SQUASH:
- ret = rearrange_squash_in_todo_file();
- break;
- case ACTION_ADD_EXEC: {
- struct string_list commands = STRING_LIST_INIT_DUP;
-
- split_exec_commands(opts->cmd, &commands);
- ret = add_exec_commands(&commands);
- string_list_clear(&commands, 0);
- break;
- }
default:
BUG("invalid command '%d'", command);
}
@@ -478,105 +379,9 @@ static int parse_opt_keep_empty(const struct option *opt, const char *arg,
return 0;
}
-static const char * const builtin_rebase_interactive_usage[] = {
- N_("git rebase--interactive [<options>]"),
- NULL
-};
-
-int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
-{
- struct rebase_options opts = REBASE_OPTIONS_INIT;
- struct object_id squash_onto = *null_oid();
- enum action command = ACTION_NONE;
- struct option options[] = {
- OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"),
- REBASE_FORCE),
- OPT_CALLBACK_F('k', "keep-empty", &options, NULL,
- N_("keep commits which start empty"),
- PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
- parse_opt_keep_empty),
- OPT_BOOL_F(0, "allow-empty-message", &opts.allow_empty_message,
- N_("allow commits with empty messages"),
- PARSE_OPT_HIDDEN),
- OPT_BOOL(0, "rebase-merges", &opts.rebase_merges, N_("rebase merge commits")),
- OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins,
- N_("keep original branch points of cousins")),
- OPT_BOOL(0, "autosquash", &opts.autosquash,
- N_("move commits that begin with squash!/fixup!")),
- OPT_BOOL(0, "signoff", &opts.signoff, N_("sign commits")),
- OPT_BIT('v', "verbose", &opts.flags,
- N_("display a diffstat of what changed upstream"),
- REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
- OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
- ACTION_CONTINUE),
- OPT_CMDMODE(0, "skip", &command, N_("skip commit"), ACTION_SKIP),
- OPT_CMDMODE(0, "edit-todo", &command, N_("edit the todo list"),
- ACTION_EDIT_TODO),
- OPT_CMDMODE(0, "show-current-patch", &command, N_("show the current patch"),
- ACTION_SHOW_CURRENT_PATCH),
- OPT_CMDMODE(0, "shorten-ids", &command,
- N_("shorten commit ids in the todo list"), ACTION_SHORTEN_OIDS),
- OPT_CMDMODE(0, "expand-ids", &command,
- N_("expand commit ids in the todo list"), ACTION_EXPAND_OIDS),
- OPT_CMDMODE(0, "check-todo-list", &command,
- N_("check the todo list"), ACTION_CHECK_TODO_LIST),
- OPT_CMDMODE(0, "rearrange-squash", &command,
- N_("rearrange fixup/squash lines"), ACTION_REARRANGE_SQUASH),
- OPT_CMDMODE(0, "add-exec-commands", &command,
- N_("insert exec commands in todo list"), ACTION_ADD_EXEC),
- { OPTION_CALLBACK, 0, "onto", &opts.onto, N_("onto"), N_("onto"),
- PARSE_OPT_NONEG, parse_opt_commit, 0 },
- { OPTION_CALLBACK, 0, "restrict-revision", &opts.restrict_revision,
- N_("restrict-revision"), N_("restrict revision"),
- PARSE_OPT_NONEG, parse_opt_commit, 0 },
- { OPTION_CALLBACK, 0, "squash-onto", &squash_onto, N_("squash-onto"),
- N_("squash onto"), PARSE_OPT_NONEG, parse_opt_object_id, 0 },
- { OPTION_CALLBACK, 0, "upstream", &opts.upstream, N_("upstream"),
- N_("the upstream commit"), PARSE_OPT_NONEG, parse_opt_commit,
- 0 },
- OPT_STRING(0, "head-name", &opts.head_name, N_("head-name"), N_("head name")),
- { OPTION_STRING, 'S', "gpg-sign", &opts.gpg_sign_opt, N_("key-id"),
- N_("GPG-sign commits"),
- PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
- OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"),
- N_("rebase strategy")),
- OPT_STRING(0, "strategy-opts", &opts.strategy_opts, N_("strategy-opts"),
- N_("strategy options")),
- OPT_STRING(0, "switch-to", &opts.switch_to, N_("switch-to"),
- N_("the branch or commit to checkout")),
- OPT_STRING(0, "onto-name", &opts.onto_name, N_("onto-name"), N_("onto name")),
- OPT_STRING(0, "cmd", &opts.cmd, N_("cmd"), N_("the command to run")),
- OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_autoupdate),
- OPT_BOOL(0, "reschedule-failed-exec", &opts.reschedule_failed_exec,
- N_("automatically re-schedule any `exec` that fails")),
- OPT_END()
- };
-
- opts.rebase_cousins = -1;
-
- if (argc == 1)
- usage_with_options(builtin_rebase_interactive_usage, options);
-
- argc = parse_options(argc, argv, prefix, options,
- builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
-
- prepare_repo_settings(the_repository);
- the_repository->settings.command_requires_full_index = 0;
-
- if (!is_null_oid(&squash_onto))
- opts.squash_onto = &squash_onto;
-
- if (opts.rebase_cousins >= 0 && !opts.rebase_merges)
- warning(_("--[no-]rebase-cousins has no effect without "
- "--rebase-merges"));
-
- return !!run_sequencer_rebase(&opts, command);
-}
-
static int is_merge(struct rebase_options *opts)
{
- return opts->type == REBASE_MERGE ||
- opts->type == REBASE_PRESERVE_MERGES;
+ return opts->type == REBASE_MERGE;
}
static void imply_merge(struct rebase_options *opts, const char *option)
@@ -586,7 +391,6 @@ static void imply_merge(struct rebase_options *opts, const char *option)
die(_("%s requires the merge backend"), option);
break;
case REBASE_MERGE:
- case REBASE_PRESERVE_MERGES:
break;
default:
opts->type = REBASE_MERGE; /* implied */
@@ -765,20 +569,10 @@ static int finish_rebase(struct rebase_options *opts)
return ret;
}
-static void add_var(struct strbuf *buf, const char *name, const char *value)
-{
- if (!value)
- strbuf_addf(buf, "unset %s; ", name);
- else {
- strbuf_addf(buf, "%s=", name);
- sq_quote_buf(buf, value);
- strbuf_addstr(buf, "; ");
- }
-}
-
static int move_to_original_branch(struct rebase_options *opts)
{
- struct strbuf orig_head_reflog = STRBUF_INIT, head_reflog = STRBUF_INIT;
+ struct strbuf branch_reflog = STRBUF_INIT, head_reflog = STRBUF_INIT;
+ struct reset_head_opts ropts = { 0 };
int ret;
if (!opts->head_name)
@@ -787,16 +581,17 @@ static int move_to_original_branch(struct rebase_options *opts)
if (!opts->onto)
BUG("move_to_original_branch without onto");
- strbuf_addf(&orig_head_reflog, "rebase finished: %s onto %s",
+ strbuf_addf(&branch_reflog, "rebase finished: %s onto %s",
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(the_repository, NULL, "", opts->head_name,
- RESET_HEAD_REFS_ONLY,
- orig_head_reflog.buf, head_reflog.buf,
- DEFAULT_REFLOG_ACTION);
+ ropts.branch = opts->head_name;
+ ropts.flags = RESET_HEAD_REFS_ONLY;
+ ropts.branch_msg = branch_reflog.buf;
+ ropts.head_msg = head_reflog.buf;
+ ret = reset_head(the_repository, &ropts);
- strbuf_release(&orig_head_reflog);
+ strbuf_release(&branch_reflog);
strbuf_release(&head_reflog);
return ret;
}
@@ -878,13 +673,15 @@ static int run_am(struct rebase_options *opts)
status = run_command(&format_patch);
if (status) {
+ struct reset_head_opts ropts = { 0 };
unlink(rebased_patches);
free(rebased_patches);
strvec_clear(&am.args);
- reset_head(the_repository, &opts->orig_head, "checkout",
- opts->head_name, 0,
- "HEAD", NULL, DEFAULT_REFLOG_ACTION);
+ ropts.oid = &opts->orig_head;
+ ropts.branch = opts->head_name;
+ ropts.default_reflog_action = DEFAULT_REFLOG_ACTION;
+ reset_head(the_repository, &ropts);
error(_("\ngit encountered an error while preparing the "
"patches to replay\n"
"these revisions:\n"
@@ -932,10 +729,7 @@ static int run_am(struct rebase_options *opts)
static int run_specific_rebase(struct rebase_options *opts, enum action action)
{
- const char *argv[] = { NULL, NULL };
- struct strbuf script_snippet = STRBUF_INIT, buf = STRBUF_INIT;
int status;
- const char *backend, *backend_func;
if (opts->type == REBASE_MERGE) {
/* Run sequencer-based rebase */
@@ -952,87 +746,11 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
}
status = run_sequencer_rebase(opts, action);
- goto finished_rebase;
- }
-
- if (opts->type == REBASE_APPLY) {
+ } else if (opts->type == REBASE_APPLY)
status = run_am(opts);
- goto finished_rebase;
- }
-
- add_var(&script_snippet, "GIT_DIR", absolute_path(get_git_dir()));
- add_var(&script_snippet, "state_dir", opts->state_dir);
-
- add_var(&script_snippet, "upstream_name", opts->upstream_name);
- add_var(&script_snippet, "upstream", opts->upstream ?
- oid_to_hex(&opts->upstream->object.oid) : NULL);
- add_var(&script_snippet, "head_name",
- opts->head_name ? opts->head_name : "detached HEAD");
- add_var(&script_snippet, "orig_head", oid_to_hex(&opts->orig_head));
- add_var(&script_snippet, "onto", opts->onto ?
- oid_to_hex(&opts->onto->object.oid) : NULL);
- add_var(&script_snippet, "onto_name", opts->onto_name);
- add_var(&script_snippet, "revisions", opts->revisions);
- add_var(&script_snippet, "restrict_revision", opts->restrict_revision ?
- oid_to_hex(&opts->restrict_revision->object.oid) : NULL);
- sq_quote_argv_pretty(&buf, opts->git_am_opts.v);
- add_var(&script_snippet, "git_am_opt", buf.buf);
- strbuf_release(&buf);
- add_var(&script_snippet, "verbose",
- opts->flags & REBASE_VERBOSE ? "t" : "");
- add_var(&script_snippet, "diffstat",
- opts->flags & REBASE_DIFFSTAT ? "t" : "");
- add_var(&script_snippet, "force_rebase",
- opts->flags & REBASE_FORCE ? "t" : "");
- if (opts->switch_to)
- add_var(&script_snippet, "switch_to", opts->switch_to);
- add_var(&script_snippet, "action", opts->action ? opts->action : "");
- add_var(&script_snippet, "signoff", opts->signoff ? "--signoff" : "");
- add_var(&script_snippet, "allow_rerere_autoupdate",
- 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);
- add_var(&script_snippet, "allow_empty_message",
- opts->allow_empty_message ? "--allow-empty-message" : "");
- add_var(&script_snippet, "rebase_merges",
- opts->rebase_merges ? "t" : "");
- add_var(&script_snippet, "rebase_cousins",
- opts->rebase_cousins ? "t" : "");
- add_var(&script_snippet, "strategy", opts->strategy);
- add_var(&script_snippet, "strategy_opts", opts->strategy_opts);
- add_var(&script_snippet, "rebase_root", opts->root ? "t" : "");
- add_var(&script_snippet, "squash_onto",
- opts->squash_onto ? oid_to_hex(opts->squash_onto) : "");
- add_var(&script_snippet, "git_format_patch_opt",
- opts->git_format_patch_opt.buf);
-
- if (is_merge(opts) &&
- !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
- strbuf_addstr(&script_snippet,
- "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; ");
- opts->autosquash = 0;
- }
-
- switch (opts->type) {
- case REBASE_PRESERVE_MERGES:
- backend = "git-rebase--preserve-merges";
- backend_func = "git_rebase__preserve_merges";
- break;
- default:
+ else
BUG("Unhandled rebase type %d", opts->type);
- break;
- }
- strbuf_addf(&script_snippet,
- ". git-sh-setup && . %s && %s", backend, backend_func);
- argv[0] = script_snippet.buf;
-
- status = run_command_v_opt(argv, RUN_USING_SHELL);
-finished_rebase:
if (opts->dont_finish_rebase)
; /* do nothing */
else if (opts->type == REBASE_MERGE)
@@ -1050,8 +768,6 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
die("Nothing to do");
}
- strbuf_release(&script_snippet);
-
return status ? -1 : 0;
}
@@ -1101,6 +817,28 @@ static int rebase_config(const char *var, const char *value, void *data)
return git_default_config(var, value, data);
}
+static int checkout_up_to_date(struct rebase_options *options)
+{
+ struct strbuf buf = STRBUF_INIT;
+ struct reset_head_opts ropts = { 0 };
+ int ret = 0;
+
+ strbuf_addf(&buf, "%s: checkout %s",
+ getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
+ options->switch_to);
+ ropts.oid = &options->orig_head;
+ ropts.branch = options->head_name;
+ ropts.flags = RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
+ if (!ropts.branch)
+ ropts.flags |= RESET_HEAD_DETACH;
+ ropts.head_msg = buf.buf;
+ if (reset_head(the_repository, &ropts) < 0)
+ ret = error(_("could not switch to %s"), options->switch_to);
+ strbuf_release(&buf);
+
+ return ret;
+}
+
/*
* Determines whether the commits in from..to are linear, i.e. contain
* no merge commits. This function *expects* `from` to be an ancestor of
@@ -1187,7 +925,7 @@ static int parse_opt_merge(const struct option *opt, const char *arg, int unset)
return 0;
}
-/* -i followed by -p is still explicitly interactive, but -p alone is not */
+/* -i followed by -r is still explicitly interactive, but -r alone is not */
static int parse_opt_interactive(const struct option *opt, const char *arg,
int unset)
{
@@ -1305,6 +1043,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
char *squash_onto_name = NULL;
int reschedule_failed_exec = -1;
int allow_preemptive_ff = 1;
+ int preserve_merges_selected = 0;
+ struct reset_head_opts ropts = { 0 };
struct option builtin_rebase_options[] = {
OPT_STRING(0, "onto", &options.onto_name,
N_("revision"),
@@ -1369,10 +1109,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
N_("let the user edit the list of commits to rebase"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
parse_opt_interactive),
- OPT_SET_INT_F('p', "preserve-merges", &options.type,
+ OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected,
N_("(DEPRECATED) try to recreate merges instead of "
"ignoring them"),
- REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
+ 1, PARSE_OPT_HIDDEN),
OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
N_("how to handle commits that become empty"),
@@ -1443,16 +1183,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
strbuf_reset(&buf);
strbuf_addf(&buf, "%s/rewritten", merge_dir());
if (is_directory(buf.buf)) {
- options.type = REBASE_PRESERVE_MERGES;
- options.flags |= REBASE_INTERACTIVE_EXPLICIT;
+ die("`rebase -p` is no longer supported");
} else {
strbuf_reset(&buf);
strbuf_addf(&buf, "%s/interactive", merge_dir());
- if(file_exists(buf.buf)) {
- options.type = REBASE_MERGE;
+ options.type = REBASE_MERGE;
+ if (file_exists(buf.buf))
options.flags |= REBASE_INTERACTIVE_EXPLICIT;
- } else
- options.type = REBASE_MERGE;
}
options.state_dir = merge_dir();
}
@@ -1465,6 +1202,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
builtin_rebase_options,
builtin_rebase_usage, 0);
+ if (preserve_merges_selected)
+ die(_("--preserve-merges was replaced by --rebase-merges"));
+
if (action != ACTION_NONE && total_argc != 2) {
usage_with_options(builtin_rebase_usage,
builtin_rebase_options);
@@ -1474,19 +1214,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
usage_with_options(builtin_rebase_usage,
builtin_rebase_options);
- if (options.type == REBASE_PRESERVE_MERGES)
- warning(_("git rebase --preserve-merges is deprecated. "
- "Use --rebase-merges instead."));
-
if (keep_base) {
if (options.onto_name)
- die(_("cannot combine '--keep-base' with '--onto'"));
+ die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--onto");
if (options.root)
- die(_("cannot combine '--keep-base' with '--root'"));
+ die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--root");
}
if (options.root && options.fork_point > 0)
- die(_("cannot combine '--root' with '--fork-point'"));
+ die(_("options '%s' and '%s' cannot be used together"), "--root", "--fork-point");
if (action != ACTION_NONE && !in_progress)
die(_("No rebase in progress?"));
@@ -1544,9 +1280,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
rerere_clear(the_repository, &merge_rr);
string_list_clear(&merge_rr, 1);
-
- if (reset_head(the_repository, NULL, "reset", NULL, RESET_HEAD_HARD,
- NULL, NULL, DEFAULT_REFLOG_ACTION) < 0)
+ ropts.flags = RESET_HEAD_HARD;
+ if (reset_head(the_repository, &ropts) < 0)
die(_("could not discard worktree changes"));
remove_branch_state(the_repository, 0);
if (read_basic_state(&options))
@@ -1563,9 +1298,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (read_basic_state(&options))
exit(1);
- if (reset_head(the_repository, &options.orig_head, "reset",
- options.head_name, RESET_HEAD_HARD,
- NULL, NULL, DEFAULT_REFLOG_ACTION) < 0)
+ ropts.oid = &options.orig_head;
+ ropts.branch = options.head_name;
+ ropts.flags = RESET_HEAD_HARD;
+ ropts.default_reflog_action = DEFAULT_REFLOG_ACTION;
+ if (reset_head(the_repository, &ropts) < 0)
die(_("could not move back to %s"),
oid_to_hex(&options.orig_head));
remove_branch_state(the_repository, 0);
@@ -1697,7 +1434,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (options.ignore_date)
strvec_push(&options.git_am_opts, "--ignore-date");
} else {
- /* REBASE_MERGE and PRESERVE_MERGES */
+ /* REBASE_MERGE */
if (ignore_whitespace) {
string_list_append(&strategy_options,
"ignore-space-change");
@@ -1723,7 +1460,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
case REBASE_APPLY:
die(_("--strategy requires --merge or --interactive"));
case REBASE_MERGE:
- case REBASE_PRESERVE_MERGES:
/* compatible */
break;
case REBASE_UNSPECIFIED:
@@ -1751,8 +1487,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (i >= 0) {
if (is_merge(&options))
- die(_("cannot combine apply options with "
- "merge options"));
+ die(_("apply options and merge options "
+ "cannot be used together"));
else
options.type = REBASE_APPLY;
}
@@ -1775,7 +1511,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
switch (options.type) {
case REBASE_MERGE:
- case REBASE_PRESERVE_MERGES:
options.state_dir = merge_dir();
break;
case REBASE_APPLY:
@@ -1800,28 +1535,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
options.reschedule_failed_exec = reschedule_failed_exec;
if (options.signoff) {
- if (options.type == REBASE_PRESERVE_MERGES)
- die("cannot combine '--signoff' with "
- "'--preserve-merges'");
strvec_push(&options.git_am_opts, "--signoff");
options.flags |= REBASE_FORCE;
}
- if (options.type == REBASE_PRESERVE_MERGES) {
- /*
- * Note: incompatibility with --signoff handled in signoff block above
- * Note: incompatibility with --interactive is just a strong warning;
- * git-rebase.txt caveats with "unless you know what you are doing"
- */
- if (options.rebase_merges)
- die(_("cannot combine '--preserve-merges' with "
- "'--rebase-merges'"));
-
- if (options.reschedule_failed_exec)
- die(_("error: cannot combine '--preserve-merges' with "
- "'--reschedule-failed-exec'"));
- }
-
if (!options.root) {
if (argc < 1) {
struct branch *branch;
@@ -1864,33 +1581,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
options.upstream_arg = "--root";
}
- /* Make sure the branch to rebase onto is valid. */
- if (keep_base) {
- strbuf_reset(&buf);
- strbuf_addstr(&buf, options.upstream_name);
- strbuf_addstr(&buf, "...");
- options.onto_name = xstrdup(buf.buf);
- } else if (!options.onto_name)
- options.onto_name = options.upstream_name;
- if (strstr(options.onto_name, "...")) {
- if (get_oid_mb(options.onto_name, &merge_base) < 0) {
- if (keep_base)
- die(_("'%s': need exactly one merge base with branch"),
- options.upstream_name);
- else
- die(_("'%s': need exactly one merge base"),
- options.onto_name);
- }
- options.onto = lookup_commit_or_die(&merge_base,
- options.onto_name);
- } else {
- options.onto =
- lookup_commit_reference_by_name(options.onto_name);
- if (!options.onto)
- die(_("Does not point to a valid commit '%s'"),
- options.onto_name);
- }
-
/*
* If the branch to rebase is given, that is the branch we will rebase
* branch_name -- branch/commit being rebased, or
@@ -1940,6 +1630,34 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
} else
BUG("unexpected number of arguments left to parse");
+ /* Make sure the branch to rebase onto is valid. */
+ if (keep_base) {
+ strbuf_reset(&buf);
+ strbuf_addstr(&buf, options.upstream_name);
+ strbuf_addstr(&buf, "...");
+ strbuf_addstr(&buf, branch_name);
+ options.onto_name = xstrdup(buf.buf);
+ } else if (!options.onto_name)
+ options.onto_name = options.upstream_name;
+ if (strstr(options.onto_name, "...")) {
+ if (get_oid_mb(options.onto_name, &merge_base) < 0) {
+ if (keep_base)
+ die(_("'%s': need exactly one merge base with branch"),
+ options.upstream_name);
+ else
+ die(_("'%s': need exactly one merge base"),
+ options.onto_name);
+ }
+ options.onto = lookup_commit_or_die(&merge_base,
+ options.onto_name);
+ } else {
+ options.onto =
+ lookup_commit_reference_by_name(options.onto_name);
+ if (!options.onto)
+ die(_("Does not point to a valid commit '%s'"),
+ options.onto_name);
+ }
+
if (options.fork_point > 0) {
struct commit *head =
lookup_commit_reference(the_repository,
@@ -1951,10 +1669,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (repo_read_index(the_repository) < 0)
die(_("could not read index"));
- if (options.autostash) {
- create_autostash(the_repository, state_dir_path("autostash", &options),
- DEFAULT_REFLOG_ACTION);
- }
+ if (options.autostash)
+ create_autostash(the_repository,
+ state_dir_path("autostash", &options));
+
if (require_clean_work_tree(the_repository, "rebase",
_("Please commit or stash them."), 1, 1)) {
@@ -1983,21 +1701,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (!(options.flags & REBASE_FORCE)) {
/* Lazily switch to the target branch if needed... */
if (options.switch_to) {
- strbuf_reset(&buf);
- strbuf_addf(&buf, "%s: checkout %s",
- getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
- options.switch_to);
- if (reset_head(the_repository,
- &options.orig_head, "checkout",
- options.head_name,
- RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
- NULL, buf.buf,
- DEFAULT_REFLOG_ACTION) < 0) {
- ret = error(_("could not switch to "
- "%s"),
- options.switch_to);
+ ret = checkout_up_to_date(&options);
+ if (ret)
goto cleanup;
- }
}
if (!(options.flags & REBASE_NO_QUIET))
@@ -2022,7 +1728,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
/* If a hook exists, give it a chance to interrupt*/
if (!ok_to_skip_pre_rebase &&
- run_hook_le(NULL, "pre-rebase", options.upstream_arg,
+ run_hooks_l("pre-rebase", options.upstream_arg,
argc ? argv[0] : NULL, NULL))
die(_("The pre-rebase hook refused to rebase."));
@@ -2064,10 +1770,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
strbuf_addf(&msg, "%s: checkout %s",
getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
- if (reset_head(the_repository, &options.onto->object.oid, "checkout", NULL,
- RESET_HEAD_DETACH | RESET_ORIG_HEAD |
- RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
- NULL, msg.buf, DEFAULT_REFLOG_ACTION))
+ ropts.oid = &options.onto->object.oid;
+ ropts.orig_head = &options.orig_head,
+ ropts.flags = RESET_HEAD_DETACH | RESET_ORIG_HEAD |
+ RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
+ ropts.head_msg = msg.buf;
+ ropts.default_reflog_action = DEFAULT_REFLOG_ACTION;
+ if (reset_head(the_repository, &ropts))
die(_("Could not detach HEAD"));
strbuf_release(&msg);
@@ -2082,9 +1791,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
strbuf_addf(&msg, "rebase finished: %s onto %s",
options.head_name ? options.head_name : "detached HEAD",
oid_to_hex(&options.onto->object.oid));
- reset_head(the_repository, NULL, "Fast-forwarded", options.head_name,
- RESET_HEAD_REFS_ONLY, "HEAD", msg.buf,
- DEFAULT_REFLOG_ACTION);
+ memset(&ropts, 0, sizeof(ropts));
+ ropts.branch = options.head_name;
+ ropts.flags = RESET_HEAD_REFS_ONLY;
+ ropts.head_msg = msg.buf;
+ reset_head(the_repository, &ropts);
strbuf_release(&msg);
ret = finish_rebase(&options);
goto cleanup;
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 48960a9..e6e1d63 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -7,6 +7,7 @@
#include "pkt-line.h"
#include "sideband.h"
#include "run-command.h"
+#include "hook.h"
#include "exec-cmd.h"
#include "commit.h"
#include "object.h"
@@ -134,6 +135,10 @@ static int receive_pack_config(const char *var, const char *value, void *cb)
if (status)
return status;
+ status = git_gpg_config(var, value, NULL);
+ if (status)
+ return status;
+
if (strcmp(var, "receive.denydeletes") == 0) {
deny_deletes = git_config_bool(var, value);
return 0;
@@ -170,7 +175,7 @@ static int receive_pack_config(const char *var, const char *value, void *cb)
strbuf_addf(&fsck_msg_types, "%c%s=%s",
fsck_msg_types.len ? ',' : '=', var, value);
else
- warning("Skipping unknown msg id '%s'", var);
+ warning("skipping unknown msg id '%s'", var);
return 0;
}
@@ -576,32 +581,19 @@ static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp)
return strbuf_detach(&buf, NULL);
}
-/*
- * NEEDSWORK: reuse find_commit_header() from jk/commit-author-parsing
- * after dropping "_commit" from its name and possibly moving it out
- * of commit.c
- */
static char *find_header(const char *msg, size_t len, const char *key,
const char **next_line)
{
- int key_len = strlen(key);
- const char *line = msg;
+ size_t out_len;
+ const char *val = find_header_mem(msg, len, key, &out_len);
- while (line && line < msg + len) {
- const char *eol = strchrnul(line, '\n');
+ if (!val)
+ return NULL;
- if ((msg + len <= eol) || line == eol)
- return NULL;
- if (line + key_len < eol &&
- !memcmp(line, key, key_len) && line[key_len] == ' ') {
- int offset = key_len + 1;
- if (next_line)
- *next_line = *eol ? eol + 1 : eol;
- return xmemdupz(line + offset, (eol - line) - offset);
- }
- line = *eol ? eol + 1 : NULL;
- }
- return NULL;
+ if (next_line)
+ *next_line = val + out_len + 1;
+
+ return xmemdupz(val, out_len);
}
/*
@@ -757,36 +749,38 @@ static void prepare_push_cert_sha1(struct child_process *proc)
int bogs /* beginning_of_gpg_sig */;
already_done = 1;
- if (write_object_file(push_cert.buf, push_cert.len, "blob",
+ if (write_object_file(push_cert.buf, push_cert.len, OBJ_BLOB,
&push_cert_oid))
oidclr(&push_cert_oid);
memset(&sigcheck, '\0', sizeof(sigcheck));
bogs = parse_signed_buffer(push_cert.buf, push_cert.len);
- check_signature(push_cert.buf, bogs, push_cert.buf + bogs,
- push_cert.len - bogs, &sigcheck);
+ sigcheck.payload = xmemdupz(push_cert.buf, bogs);
+ sigcheck.payload_len = bogs;
+ check_signature(&sigcheck, push_cert.buf + bogs,
+ push_cert.len - bogs);
nonce_status = check_nonce(push_cert.buf, bogs);
}
if (!is_null_oid(&push_cert_oid)) {
- strvec_pushf(&proc->env_array, "GIT_PUSH_CERT=%s",
+ strvec_pushf(&proc->env, "GIT_PUSH_CERT=%s",
oid_to_hex(&push_cert_oid));
- strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_SIGNER=%s",
+ strvec_pushf(&proc->env, "GIT_PUSH_CERT_SIGNER=%s",
sigcheck.signer ? sigcheck.signer : "");
- strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_KEY=%s",
+ strvec_pushf(&proc->env, "GIT_PUSH_CERT_KEY=%s",
sigcheck.key ? sigcheck.key : "");
- strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_STATUS=%c",
+ strvec_pushf(&proc->env, "GIT_PUSH_CERT_STATUS=%c",
sigcheck.result);
if (push_cert_nonce) {
- strvec_pushf(&proc->env_array,
+ strvec_pushf(&proc->env,
"GIT_PUSH_CERT_NONCE=%s",
push_cert_nonce);
- strvec_pushf(&proc->env_array,
+ strvec_pushf(&proc->env,
"GIT_PUSH_CERT_NONCE_STATUS=%s",
nonce_status);
if (nonce_status == NONCE_SLOP)
- strvec_pushf(&proc->env_array,
+ strvec_pushf(&proc->env,
"GIT_PUSH_CERT_NONCE_SLOP=%ld",
nonce_stamp_slop);
}
@@ -807,33 +801,31 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed,
{
struct child_process proc = CHILD_PROCESS_INIT;
struct async muxer;
- const char *argv[2];
int code;
+ const char *hook_path = find_hook(hook_name);
- argv[0] = find_hook(hook_name);
- if (!argv[0])
+ if (!hook_path)
return 0;
- argv[1] = NULL;
-
- proc.argv = argv;
+ strvec_push(&proc.args, hook_path);
proc.in = -1;
proc.stdout_to_stderr = 1;
proc.trace2_hook_name = hook_name;
if (feed_state->push_options) {
- int i;
+ size_t i;
for (i = 0; i < feed_state->push_options->nr; i++)
- strvec_pushf(&proc.env_array,
- "GIT_PUSH_OPTION_%d=%s", i,
+ strvec_pushf(&proc.env,
+ "GIT_PUSH_OPTION_%"PRIuMAX"=%s",
+ (uintmax_t)i,
feed_state->push_options->items[i].string);
- strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT=%d",
- feed_state->push_options->nr);
+ strvec_pushf(&proc.env, "GIT_PUSH_OPTION_COUNT=%"PRIuMAX"",
+ (uintmax_t)feed_state->push_options->nr);
} else
- strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT");
+ strvec_pushf(&proc.env, "GIT_PUSH_OPTION_COUNT");
if (tmp_objdir)
- strvec_pushv(&proc.env_array, tmp_objdir_env(tmp_objdir));
+ strvec_pushv(&proc.env, tmp_objdir_env(tmp_objdir));
if (use_sideband) {
memset(&muxer, 0, sizeof(muxer));
@@ -938,23 +930,21 @@ static int run_receive_hook(struct command *commands,
static int run_update_hook(struct command *cmd)
{
- const char *argv[5];
struct child_process proc = CHILD_PROCESS_INIT;
int code;
+ const char *hook_path = find_hook("update");
- argv[0] = find_hook("update");
- if (!argv[0])
+ if (!hook_path)
return 0;
- argv[1] = cmd->ref_name;
- argv[2] = oid_to_hex(&cmd->old_oid);
- argv[3] = oid_to_hex(&cmd->new_oid);
- argv[4] = NULL;
+ strvec_push(&proc.args, hook_path);
+ strvec_push(&proc.args, cmd->ref_name);
+ strvec_push(&proc.args, oid_to_hex(&cmd->old_oid));
+ strvec_push(&proc.args, oid_to_hex(&cmd->new_oid));
proc.no_stdin = 1;
proc.stdout_to_stderr = 1;
proc.err = use_sideband ? -1 : 0;
- proc.argv = argv;
proc.trace2_hook_name = "update";
code = start_command(&proc);
@@ -1112,22 +1102,20 @@ static int run_proc_receive_hook(struct command *commands,
struct child_process proc = CHILD_PROCESS_INIT;
struct async muxer;
struct command *cmd;
- const char *argv[2];
struct packet_reader reader;
struct strbuf cap = STRBUF_INIT;
struct strbuf errmsg = STRBUF_INIT;
int hook_use_push_options = 0;
int version = 0;
int code;
+ const char *hook_path = find_hook("proc-receive");
- argv[0] = find_hook("proc-receive");
- if (!argv[0]) {
+ if (!hook_path) {
rp_error("cannot find hook 'proc-receive'");
return -1;
}
- argv[1] = NULL;
- proc.argv = argv;
+ strvec_push(&proc.args, hook_path);
proc.in = -1;
proc.out = -1;
proc.trace2_hook_name = "proc-receive";
@@ -1365,23 +1353,11 @@ static const char *push_to_deploy(unsigned char *sha1,
struct strvec *env,
const char *work_tree)
{
- const char *update_refresh[] = {
- "update-index", "-q", "--ignore-submodules", "--refresh", NULL
- };
- const char *diff_files[] = {
- "diff-files", "--quiet", "--ignore-submodules", "--", NULL
- };
- const char *diff_index[] = {
- "diff-index", "--quiet", "--cached", "--ignore-submodules",
- NULL, "--", NULL
- };
- const char *read_tree[] = {
- "read-tree", "-u", "-m", NULL, NULL
- };
struct child_process child = CHILD_PROCESS_INIT;
- child.argv = update_refresh;
- child.env = env->v;
+ strvec_pushl(&child.args, "update-index", "-q", "--ignore-submodules",
+ "--refresh", NULL);
+ strvec_pushv(&child.env, env->v);
child.dir = work_tree;
child.no_stdin = 1;
child.stdout_to_stderr = 1;
@@ -1391,8 +1367,9 @@ static const char *push_to_deploy(unsigned char *sha1,
/* run_command() does not clean up completely; reinitialize */
child_process_init(&child);
- child.argv = diff_files;
- child.env = env->v;
+ strvec_pushl(&child.args, "diff-files", "--quiet",
+ "--ignore-submodules", "--", NULL);
+ strvec_pushv(&child.env, env->v);
child.dir = work_tree;
child.no_stdin = 1;
child.stdout_to_stderr = 1;
@@ -1400,12 +1377,13 @@ static const char *push_to_deploy(unsigned char *sha1,
if (run_command(&child))
return "Working directory has unstaged changes";
- /* diff-index with either HEAD or an empty tree */
- diff_index[4] = head_has_history() ? "HEAD" : empty_tree_oid_hex();
-
child_process_init(&child);
- child.argv = diff_index;
- child.env = env->v;
+ strvec_pushl(&child.args, "diff-index", "--quiet", "--cached",
+ "--ignore-submodules",
+ /* diff-index with either HEAD or an empty tree */
+ head_has_history() ? "HEAD" : empty_tree_oid_hex(),
+ "--", NULL);
+ strvec_pushv(&child.env, env->v);
child.no_stdin = 1;
child.no_stdout = 1;
child.stdout_to_stderr = 0;
@@ -1413,10 +1391,10 @@ static const char *push_to_deploy(unsigned char *sha1,
if (run_command(&child))
return "Working directory has staged changes";
- read_tree[3] = hash_to_hex(sha1);
child_process_init(&child);
- child.argv = read_tree;
- child.env = env->v;
+ strvec_pushl(&child.args, "read-tree", "-u", "-m", hash_to_hex(sha1),
+ NULL);
+ strvec_pushv(&child.env, env->v);
child.dir = work_tree;
child.no_stdin = 1;
child.no_stdout = 1;
@@ -1431,12 +1409,17 @@ static const char *push_to_deploy(unsigned char *sha1,
static const char *push_to_checkout_hook = "push-to-checkout";
static const char *push_to_checkout(unsigned char *hash,
+ int *invoked_hook,
struct strvec *env,
const char *work_tree)
{
+ struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+ opt.invoked_hook = invoked_hook;
+
strvec_pushf(env, "GIT_WORK_TREE=%s", absolute_path(work_tree));
- if (run_hook_le(env->v, push_to_checkout_hook,
- hash_to_hex(hash), NULL))
+ strvec_pushv(&opt.env, env->v);
+ strvec_push(&opt.args, hash_to_hex(hash));
+ if (run_hooks_opt(push_to_checkout_hook, &opt))
return "push-to-checkout hook declined";
else
return NULL;
@@ -1444,29 +1427,22 @@ static const char *push_to_checkout(unsigned char *hash,
static const char *update_worktree(unsigned char *sha1, const struct worktree *worktree)
{
- const char *retval, *work_tree, *git_dir = NULL;
+ const char *retval, *git_dir;
struct strvec env = STRVEC_INIT;
+ int invoked_hook;
- if (worktree && worktree->path)
- work_tree = worktree->path;
- else if (git_work_tree_cfg)
- work_tree = git_work_tree_cfg;
- else
- work_tree = "..";
+ if (!worktree || !worktree->path)
+ BUG("worktree->path must be non-NULL");
- if (is_bare_repository())
+ if (worktree->is_bare)
return "denyCurrentBranch = updateInstead needs a worktree";
- if (worktree)
- git_dir = get_worktree_git_dir(worktree);
- if (!git_dir)
- git_dir = get_git_dir();
+ git_dir = get_worktree_git_dir(worktree);
strvec_pushf(&env, "GIT_DIR=%s", absolute_path(git_dir));
- if (!find_hook(push_to_checkout_hook))
- retval = push_to_deploy(sha1, &env, work_tree);
- else
- retval = push_to_checkout(sha1, &env, work_tree);
+ retval = push_to_checkout(sha1, &invoked_hook, &env, worktree->path);
+ if (!invoked_hook)
+ retval = push_to_deploy(sha1, &env, worktree->path);
strvec_clear(&env);
return retval;
@@ -1481,19 +1457,22 @@ static const char *update(struct command *cmd, struct shallow_info *si)
struct object_id *old_oid = &cmd->old_oid;
struct object_id *new_oid = &cmd->new_oid;
int do_update_worktree = 0;
- const struct worktree *worktree = is_bare_repository() ? NULL : find_shared_symref("HEAD", name);
+ struct worktree **worktrees = get_worktrees();
+ const struct worktree *worktree =
+ find_shared_symref(worktrees, "HEAD", name);
/* only refs/... are allowed */
if (!starts_with(name, "refs/") || check_refname_format(name + 5, 0)) {
rp_error("refusing to create funny ref '%s' remotely", name);
- return "funny refname";
+ ret = "funny refname";
+ goto out;
}
strbuf_addf(&namespaced_name_buf, "%s%s", get_git_namespace(), name);
free(namespaced_name);
namespaced_name = strbuf_detach(&namespaced_name_buf, NULL);
- if (worktree) {
+ if (worktree && !worktree->is_bare) {
switch (deny_current_branch) {
case DENY_IGNORE:
break;
@@ -1505,7 +1484,8 @@ static const char *update(struct command *cmd, struct shallow_info *si)
rp_error("refusing to update checked out branch: %s", name);
if (deny_current_branch == DENY_UNCONFIGURED)
refuse_unconfigured_deny();
- return "branch is currently checked out";
+ ret = "branch is currently checked out";
+ goto out;
case DENY_UPDATE_INSTEAD:
/* pass -- let other checks intervene first */
do_update_worktree = 1;
@@ -1516,13 +1496,15 @@ static const char *update(struct command *cmd, struct shallow_info *si)
if (!is_null_oid(new_oid) && !has_object_file(new_oid)) {
error("unpack should have generated %s, "
"but I can't find it!", oid_to_hex(new_oid));
- return "bad pack";
+ ret = "bad pack";
+ goto out;
}
if (!is_null_oid(old_oid) && is_null_oid(new_oid)) {
if (deny_deletes && starts_with(name, "refs/heads/")) {
rp_error("denying ref deletion for %s", name);
- return "deletion prohibited";
+ ret = "deletion prohibited";
+ goto out;
}
if (worktree || (head_name && !strcmp(namespaced_name, head_name))) {
@@ -1538,9 +1520,11 @@ static const char *update(struct command *cmd, struct shallow_info *si)
if (deny_delete_current == DENY_UNCONFIGURED)
refuse_unconfigured_deny_delete_current();
rp_error("refusing to delete the current branch: %s", name);
- return "deletion of the current branch prohibited";
+ ret = "deletion of the current branch prohibited";
+ goto out;
default:
- return "Invalid denyDeleteCurrent setting";
+ ret = "Invalid denyDeleteCurrent setting";
+ goto out;
}
}
}
@@ -1558,25 +1542,28 @@ static const char *update(struct command *cmd, struct shallow_info *si)
old_object->type != OBJ_COMMIT ||
new_object->type != OBJ_COMMIT) {
error("bad sha1 objects for %s", name);
- return "bad ref";
+ ret = "bad ref";
+ goto out;
}
old_commit = (struct commit *)old_object;
new_commit = (struct commit *)new_object;
if (!in_merge_bases(old_commit, new_commit)) {
rp_error("denying non-fast-forward %s"
" (you should pull first)", name);
- return "non-fast-forward";
+ ret = "non-fast-forward";
+ goto out;
}
}
if (run_update_hook(cmd)) {
rp_error("hook declined to update %s", name);
- return "hook declined";
+ ret = "hook declined";
+ goto out;
}
if (do_update_worktree) {
- ret = update_worktree(new_oid->hash, find_shared_symref("HEAD", name));
+ ret = update_worktree(new_oid->hash, worktree);
if (ret)
- return ret;
+ goto out;
}
if (is_null_oid(new_oid)) {
@@ -1584,9 +1571,9 @@ static const char *update(struct command *cmd, struct shallow_info *si)
if (!parse_object(the_repository, old_oid)) {
old_oid = NULL;
if (ref_exists(name)) {
- rp_warning("Allowing deletion of corrupt ref.");
+ rp_warning("allowing deletion of corrupt ref");
} else {
- rp_warning("Deleting a non-existent ref.");
+ rp_warning("deleting a non-existent ref");
cmd->did_not_exist = 1;
}
}
@@ -1595,17 +1582,19 @@ static const char *update(struct command *cmd, struct shallow_info *si)
old_oid,
0, "push", &err)) {
rp_error("%s", err.buf);
- strbuf_release(&err);
- return "failed to delete";
+ ret = "failed to delete";
+ } else {
+ ret = NULL; /* good */
}
strbuf_release(&err);
- return NULL; /* good */
}
else {
struct strbuf err = STRBUF_INIT;
if (shallow_update && si->shallow_ref[cmd->index] &&
- update_shallow_ref(cmd, si))
- return "shallow error";
+ update_shallow_ref(cmd, si)) {
+ ret = "shallow error";
+ goto out;
+ }
if (ref_transaction_update(transaction,
namespaced_name,
@@ -1613,14 +1602,16 @@ static const char *update(struct command *cmd, struct shallow_info *si)
0, "push",
&err)) {
rp_error("%s", err.buf);
- strbuf_release(&err);
-
- return "failed to update ref";
+ ret = "failed to update ref";
+ } else {
+ ret = NULL; /* good */
}
strbuf_release(&err);
-
- return NULL; /* good */
}
+
+out:
+ free_worktrees(worktrees);
+ return ret;
}
static void run_update_post_hook(struct command *commands)
@@ -1673,7 +1664,7 @@ static void check_aliased_update_internal(struct command *cmd,
}
dst_name = strip_namespace(dst_name);
- if ((item = string_list_lookup(list, dst_name)) == NULL)
+ if (!(item = string_list_lookup(list, dst_name)))
return;
cmd->skip_update = 1;
@@ -1974,6 +1965,15 @@ static void execute_commands(struct command *commands,
}
/*
+ * If there is no command ready to run, should return directly to destroy
+ * temporary data in the quarantine area.
+ */
+ for (cmd = commands; cmd && cmd->error_string; cmd = cmd->next)
+ ; /* nothing */
+ if (!cmd)
+ return;
+
+ /*
* Now we'll start writing out refs, which means the objects need
* to be in their final positions so that other processes can see them.
*/
@@ -2208,13 +2208,13 @@ static const char *unpack(int err_fd, struct shallow_info *si)
strvec_push(&child.args, alt_shallow_file);
}
- tmp_objdir = tmp_objdir_create();
+ tmp_objdir = tmp_objdir_create("incoming");
if (!tmp_objdir) {
if (err_fd > 0)
close(err_fd);
return "unable to create temporary object directory";
}
- child.env = tmp_objdir_env(tmp_objdir);
+ strvec_pushv(&child.env, tmp_objdir_env(tmp_objdir));
/*
* Normally we just pass the tmp_objdir environment to the child
@@ -2485,9 +2485,9 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, receive_pack_usage, 0);
if (argc > 1)
- usage_msg_opt(_("Too many arguments."), receive_pack_usage, options);
+ usage_msg_opt(_("too many arguments"), receive_pack_usage, options);
if (argc == 0)
- usage_msg_opt(_("You must specify a directory."), receive_pack_usage, options);
+ usage_msg_opt(_("you must specify a directory"), receive_pack_usage, options);
service_dir = argv[0];
@@ -2537,7 +2537,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
PACKET_READ_CHOMP_NEWLINE |
PACKET_READ_DIE_ON_ERR_PACKET);
- if ((commands = read_head_info(&reader, &shallow)) != NULL) {
+ if ((commands = read_head_info(&reader, &shallow))) {
const char *unpack_status = NULL;
struct string_list push_options = STRING_LIST_INIT_DUP;
@@ -2561,25 +2561,25 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
&push_options);
if (pack_lockfile)
unlink_or_warn(pack_lockfile);
+ sigchain_push(SIGPIPE, SIG_IGN);
if (report_status_v2)
report_v2(commands, unpack_status);
else if (report_status)
report(commands, unpack_status);
+ sigchain_pop(SIGPIPE);
run_receive_hook(commands, "post-receive", 1,
&push_options);
run_update_post_hook(commands);
string_list_clear(&push_options, 0);
if (auto_gc) {
- const char *argv_gc_auto[] = {
- "gc", "--auto", "--quiet", NULL,
- };
struct child_process proc = CHILD_PROCESS_INIT;
proc.no_stdin = 1;
proc.stdout_to_stderr = 1;
proc.err = use_sideband ? -1 : 0;
proc.git_cmd = proc.close_object_store = 1;
- proc.argv = argv_gc_auto;
+ strvec_pushl(&proc.args, "gc", "--auto", "--quiet",
+ NULL);
if (!start_command(&proc)) {
if (use_sideband)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index bd4c669..4dd297d 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -1,429 +1,77 @@
#include "builtin.h"
#include "config.h"
-#include "lockfile.h"
-#include "object-store.h"
-#include "repository.h"
-#include "commit.h"
-#include "refs.h"
-#include "dir.h"
-#include "tree-walk.h"
-#include "diff.h"
#include "revision.h"
#include "reachable.h"
#include "worktree.h"
+#include "reflog.h"
-/* NEEDSWORK: switch to using parse_options */
-static const char reflog_expire_usage[] =
-N_("git reflog expire [--expire=<time>] "
- "[--expire-unreachable=<time>] "
- "[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] "
- "[--verbose] [--all] <refs>...");
-static const char reflog_delete_usage[] =
-N_("git reflog delete [--rewrite] [--updateref] "
- "[--dry-run | -n] [--verbose] <refs>...");
-static const char reflog_exists_usage[] =
-N_("git reflog exists <ref>");
+#define BUILTIN_REFLOG_SHOW_USAGE \
+ N_("git reflog [show] [<log-options>] [<ref>]")
+
+#define BUILTIN_REFLOG_EXPIRE_USAGE \
+ N_("git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" \
+ " [--rewrite] [--updateref] [--stale-fix]\n" \
+ " [--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]")
+
+#define BUILTIN_REFLOG_DELETE_USAGE \
+ N_("git reflog delete [--rewrite] [--updateref]\n" \
+ " [--dry-run | -n] [--verbose] <ref>@{<specifier>}...")
+
+#define BUILTIN_REFLOG_EXISTS_USAGE \
+ N_("git reflog exists <ref>")
+
+static const char *const reflog_show_usage[] = {
+ BUILTIN_REFLOG_SHOW_USAGE,
+ NULL,
+};
+
+static const char *const reflog_expire_usage[] = {
+ BUILTIN_REFLOG_EXPIRE_USAGE,
+ NULL
+};
+
+static const char *const reflog_delete_usage[] = {
+ BUILTIN_REFLOG_DELETE_USAGE,
+ NULL
+};
+
+static const char *const reflog_exists_usage[] = {
+ BUILTIN_REFLOG_EXISTS_USAGE,
+ NULL,
+};
+
+static const char *const reflog_usage[] = {
+ BUILTIN_REFLOG_SHOW_USAGE,
+ BUILTIN_REFLOG_EXPIRE_USAGE,
+ BUILTIN_REFLOG_DELETE_USAGE,
+ BUILTIN_REFLOG_EXISTS_USAGE,
+ NULL
+};
static timestamp_t default_reflog_expire;
static timestamp_t default_reflog_expire_unreachable;
-struct cmd_reflog_expire_cb {
- struct rev_info revs;
- int stalefix;
- timestamp_t expire_total;
- timestamp_t expire_unreachable;
- int recno;
+struct worktree_reflogs {
+ struct worktree *worktree;
+ struct string_list reflogs;
};
-struct expire_reflog_policy_cb {
- enum {
- UE_NORMAL,
- UE_ALWAYS,
- UE_HEAD
- } unreachable_expire_kind;
- struct commit_list *mark_list;
- unsigned long mark_limit;
- struct cmd_reflog_expire_cb cmd;
- struct commit *tip_commit;
- struct commit_list *tips;
-};
-
-struct collected_reflog {
- struct object_id oid;
- char reflog[FLEX_ARRAY];
-};
-
-struct collect_reflog_cb {
- struct collected_reflog **e;
- int alloc;
- int nr;
- struct worktree *wt;
-};
-
-/* Remember to update object flag allocation in object.h */
-#define INCOMPLETE (1u<<10)
-#define STUDYING (1u<<11)
-#define REACHABLE (1u<<12)
-
-static int tree_is_complete(const struct object_id *oid)
-{
- struct tree_desc desc;
- struct name_entry entry;
- int complete;
- struct tree *tree;
-
- tree = lookup_tree(the_repository, oid);
- if (!tree)
- return 0;
- if (tree->object.flags & SEEN)
- return 1;
- if (tree->object.flags & INCOMPLETE)
- return 0;
-
- if (!tree->buffer) {
- enum object_type type;
- unsigned long size;
- void *data = read_object_file(oid, &type, &size);
- if (!data) {
- tree->object.flags |= INCOMPLETE;
- return 0;
- }
- tree->buffer = data;
- tree->size = size;
- }
- init_tree_desc(&desc, tree->buffer, tree->size);
- complete = 1;
- while (tree_entry(&desc, &entry)) {
- if (!has_object_file(&entry.oid) ||
- (S_ISDIR(entry.mode) && !tree_is_complete(&entry.oid))) {
- tree->object.flags |= INCOMPLETE;
- complete = 0;
- }
- }
- free_tree_buffer(tree);
-
- if (complete)
- tree->object.flags |= SEEN;
- return complete;
-}
-
-static int commit_is_complete(struct commit *commit)
-{
- struct object_array study;
- struct object_array found;
- int is_incomplete = 0;
- int i;
-
- /* early return */
- if (commit->object.flags & SEEN)
- return 1;
- if (commit->object.flags & INCOMPLETE)
- return 0;
- /*
- * Find all commits that are reachable and are not marked as
- * SEEN. Then make sure the trees and blobs contained are
- * complete. After that, mark these commits also as SEEN.
- * If some of the objects that are needed to complete this
- * commit are missing, mark this commit as INCOMPLETE.
- */
- memset(&study, 0, sizeof(study));
- memset(&found, 0, sizeof(found));
- add_object_array(&commit->object, NULL, &study);
- add_object_array(&commit->object, NULL, &found);
- commit->object.flags |= STUDYING;
- while (study.nr) {
- struct commit *c;
- struct commit_list *parent;
-
- c = (struct commit *)object_array_pop(&study);
- if (!c->object.parsed && !parse_object(the_repository, &c->object.oid))
- c->object.flags |= INCOMPLETE;
-
- if (c->object.flags & INCOMPLETE) {
- is_incomplete = 1;
- break;
- }
- else if (c->object.flags & SEEN)
- continue;
- for (parent = c->parents; parent; parent = parent->next) {
- struct commit *p = parent->item;
- if (p->object.flags & STUDYING)
- continue;
- p->object.flags |= STUDYING;
- add_object_array(&p->object, NULL, &study);
- add_object_array(&p->object, NULL, &found);
- }
- }
- if (!is_incomplete) {
- /*
- * make sure all commits in "found" array have all the
- * necessary objects.
- */
- for (i = 0; i < found.nr; i++) {
- struct commit *c =
- (struct commit *)found.objects[i].item;
- if (!tree_is_complete(get_commit_tree_oid(c))) {
- is_incomplete = 1;
- c->object.flags |= INCOMPLETE;
- }
- }
- if (!is_incomplete) {
- /* mark all found commits as complete, iow SEEN */
- for (i = 0; i < found.nr; i++)
- found.objects[i].item->flags |= SEEN;
- }
- }
- /* clear flags from the objects we traversed */
- for (i = 0; i < found.nr; i++)
- found.objects[i].item->flags &= ~STUDYING;
- if (is_incomplete)
- commit->object.flags |= INCOMPLETE;
- else {
- /*
- * If we come here, we have (1) traversed the ancestry chain
- * from the "commit" until we reach SEEN commits (which are
- * known to be complete), and (2) made sure that the commits
- * encountered during the above traversal refer to trees that
- * are complete. Which means that we know *all* the commits
- * we have seen during this process are complete.
- */
- for (i = 0; i < found.nr; i++)
- found.objects[i].item->flags |= SEEN;
- }
- /* free object arrays */
- object_array_clear(&study);
- object_array_clear(&found);
- return !is_incomplete;
-}
-
-static int keep_entry(struct commit **it, struct object_id *oid)
-{
- struct commit *commit;
-
- if (is_null_oid(oid))
- return 1;
- commit = lookup_commit_reference_gently(the_repository, oid, 1);
- if (!commit)
- return 0;
-
- /*
- * Make sure everything in this commit exists.
- *
- * We have walked all the objects reachable from the refs
- * and cache earlier. The commits reachable by this commit
- * must meet SEEN commits -- and then we should mark them as
- * SEEN as well.
- */
- if (!commit_is_complete(commit))
- return 0;
- *it = commit;
- return 1;
-}
-
-/*
- * Starting from commits in the cb->mark_list, mark commits that are
- * reachable from them. Stop the traversal at commits older than
- * the expire_limit and queue them back, so that the caller can call
- * us again to restart the traversal with longer expire_limit.
- */
-static void mark_reachable(struct expire_reflog_policy_cb *cb)
-{
- struct commit_list *pending;
- timestamp_t expire_limit = cb->mark_limit;
- struct commit_list *leftover = NULL;
-
- for (pending = cb->mark_list; pending; pending = pending->next)
- pending->item->object.flags &= ~REACHABLE;
-
- pending = cb->mark_list;
- while (pending) {
- struct commit_list *parent;
- struct commit *commit = pop_commit(&pending);
- if (commit->object.flags & REACHABLE)
- continue;
- if (parse_commit(commit))
- continue;
- commit->object.flags |= REACHABLE;
- if (commit->date < expire_limit) {
- commit_list_insert(commit, &leftover);
- continue;
- }
- commit->object.flags |= REACHABLE;
- parent = commit->parents;
- while (parent) {
- commit = parent->item;
- parent = parent->next;
- if (commit->object.flags & REACHABLE)
- continue;
- commit_list_insert(commit, &pending);
- }
- }
- cb->mark_list = leftover;
-}
-
-static int unreachable(struct expire_reflog_policy_cb *cb, struct commit *commit, struct object_id *oid)
-{
- /*
- * We may or may not have the commit yet - if not, look it
- * up using the supplied sha1.
- */
- if (!commit) {
- if (is_null_oid(oid))
- return 0;
-
- commit = lookup_commit_reference_gently(the_repository, oid,
- 1);
-
- /* Not a commit -- keep it */
- if (!commit)
- return 0;
- }
-
- /* Reachable from the current ref? Don't prune. */
- if (commit->object.flags & REACHABLE)
- return 0;
-
- if (cb->mark_list && cb->mark_limit) {
- cb->mark_limit = 0; /* dig down to the root */
- mark_reachable(cb);
- }
-
- return !(commit->object.flags & REACHABLE);
-}
-
-/*
- * Return true iff the specified reflog entry should be expired.
- */
-static int should_expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
- const char *email, timestamp_t timestamp, int tz,
- const char *message, void *cb_data)
-{
- struct expire_reflog_policy_cb *cb = cb_data;
- struct commit *old_commit, *new_commit;
-
- if (timestamp < cb->cmd.expire_total)
- return 1;
-
- old_commit = new_commit = NULL;
- if (cb->cmd.stalefix &&
- (!keep_entry(&old_commit, ooid) || !keep_entry(&new_commit, noid)))
- return 1;
-
- if (timestamp < cb->cmd.expire_unreachable) {
- if (cb->unreachable_expire_kind == UE_ALWAYS)
- return 1;
- if (unreachable(cb, old_commit, ooid) || unreachable(cb, new_commit, noid))
- return 1;
- }
-
- if (cb->cmd.recno && --(cb->cmd.recno) == 0)
- return 1;
-
- return 0;
-}
-
-static int push_tip_to_list(const char *refname, const struct object_id *oid,
- int flags, void *cb_data)
-{
- struct commit_list **list = cb_data;
- struct commit *tip_commit;
- if (flags & REF_ISSYMREF)
- return 0;
- tip_commit = lookup_commit_reference_gently(the_repository, oid, 1);
- if (!tip_commit)
- return 0;
- commit_list_insert(tip_commit, list);
- return 0;
-}
-
-static int is_head(const char *refname)
-{
- switch (ref_type(refname)) {
- case REF_TYPE_OTHER_PSEUDOREF:
- case REF_TYPE_MAIN_PSEUDOREF:
- if (parse_worktree_ref(refname, NULL, NULL, &refname))
- BUG("not a worktree ref: %s", refname);
- break;
- default:
- break;
- }
- return !strcmp(refname, "HEAD");
-}
-
-static void reflog_expiry_prepare(const char *refname,
- const struct object_id *oid,
- void *cb_data)
-{
- struct expire_reflog_policy_cb *cb = cb_data;
-
- if (!cb->cmd.expire_unreachable || is_head(refname)) {
- cb->tip_commit = NULL;
- cb->unreachable_expire_kind = UE_HEAD;
- } else {
- cb->tip_commit = lookup_commit_reference_gently(the_repository,
- oid, 1);
- if (!cb->tip_commit)
- cb->unreachable_expire_kind = UE_ALWAYS;
- else
- cb->unreachable_expire_kind = UE_NORMAL;
- }
-
- if (cb->cmd.expire_unreachable <= cb->cmd.expire_total)
- cb->unreachable_expire_kind = UE_ALWAYS;
-
- cb->mark_list = NULL;
- cb->tips = NULL;
- if (cb->unreachable_expire_kind != UE_ALWAYS) {
- if (cb->unreachable_expire_kind == UE_HEAD) {
- struct commit_list *elem;
-
- for_each_ref(push_tip_to_list, &cb->tips);
- for (elem = cb->tips; elem; elem = elem->next)
- commit_list_insert(elem->item, &cb->mark_list);
- } else {
- commit_list_insert(cb->tip_commit, &cb->mark_list);
- }
- cb->mark_limit = cb->cmd.expire_total;
- mark_reachable(cb);
- }
-}
-
-static void reflog_expiry_cleanup(void *cb_data)
-{
- struct expire_reflog_policy_cb *cb = cb_data;
-
- if (cb->unreachable_expire_kind != UE_ALWAYS) {
- if (cb->unreachable_expire_kind == UE_HEAD) {
- struct commit_list *elem;
- for (elem = cb->tips; elem; elem = elem->next)
- clear_commit_marks(elem->item, REACHABLE);
- free_commit_list(cb->tips);
- } else {
- clear_commit_marks(cb->tip_commit, REACHABLE);
- }
- }
-}
-
static int collect_reflog(const char *ref, const struct object_id *oid, int unused, void *cb_data)
{
- struct collected_reflog *e;
- struct collect_reflog_cb *cb = cb_data;
+ struct worktree_reflogs *cb = cb_data;
+ struct worktree *worktree = cb->worktree;
struct strbuf newref = STRBUF_INIT;
/*
* Avoid collecting the same shared ref multiple times because
* they are available via all worktrees.
*/
- if (!cb->wt->is_current && ref_type(ref) == REF_TYPE_NORMAL)
+ if (!worktree->is_current && ref_type(ref) == REF_TYPE_NORMAL)
return 0;
- strbuf_worktree_ref(cb->wt, &newref, ref);
- FLEX_ALLOC_STR(e, reflog, newref.buf);
- strbuf_release(&newref);
+ strbuf_worktree_ref(worktree, &newref, ref);
+ string_list_append_nodup(&cb->reflogs, strbuf_detach(&newref, NULL));
- oidcpy(&e->oid, oid);
- ALLOC_GROW(cb->e, cb->nr + 1, cb->alloc);
- cb->e[cb->nr++] = e;
return 0;
}
@@ -504,18 +152,18 @@ static int reflog_expire_config(const char *var, const char *value, void *cb)
return 0;
}
-static void set_reflog_expiry_param(struct cmd_reflog_expire_cb *cb, int slot, const char *ref)
+static void set_reflog_expiry_param(struct cmd_reflog_expire_cb *cb, const char *ref)
{
struct reflog_expire_cfg *ent;
- if (slot == (EXPIRE_TOTAL|EXPIRE_UNREACH))
+ if (cb->explicit_expiry == (EXPIRE_TOTAL|EXPIRE_UNREACH))
return; /* both given explicitly -- nothing to tweak */
for (ent = reflog_expire_cfg; ent; ent = ent->next) {
if (!wildmatch(ent->pattern, ref, 0)) {
- if (!(slot & EXPIRE_TOTAL))
+ if (!(cb->explicit_expiry & EXPIRE_TOTAL))
cb->expire_total = ent->expire_total;
- if (!(slot & EXPIRE_UNREACH))
+ if (!(cb->explicit_expiry & EXPIRE_UNREACH))
cb->expire_unreachable = ent->expire_unreachable;
return;
}
@@ -525,27 +173,94 @@ static void set_reflog_expiry_param(struct cmd_reflog_expire_cb *cb, int slot, c
* If unconfigured, make stash never expire
*/
if (!strcmp(ref, "refs/stash")) {
- if (!(slot & EXPIRE_TOTAL))
+ if (!(cb->explicit_expiry & EXPIRE_TOTAL))
cb->expire_total = 0;
- if (!(slot & EXPIRE_UNREACH))
+ if (!(cb->explicit_expiry & EXPIRE_UNREACH))
cb->expire_unreachable = 0;
return;
}
/* Nothing matched -- use the default value */
- if (!(slot & EXPIRE_TOTAL))
+ if (!(cb->explicit_expiry & EXPIRE_TOTAL))
cb->expire_total = default_reflog_expire;
- if (!(slot & EXPIRE_UNREACH))
+ if (!(cb->explicit_expiry & EXPIRE_UNREACH))
cb->expire_unreachable = default_reflog_expire_unreachable;
}
+static int expire_unreachable_callback(const struct option *opt,
+ const char *arg,
+ int unset)
+{
+ struct cmd_reflog_expire_cb *cmd = opt->value;
+
+ if (parse_expiry_date(arg, &cmd->expire_unreachable))
+ die(_("invalid timestamp '%s' given to '--%s'"),
+ arg, opt->long_name);
+
+ cmd->explicit_expiry |= EXPIRE_UNREACH;
+ return 0;
+}
+
+static int expire_total_callback(const struct option *opt,
+ const char *arg,
+ int unset)
+{
+ struct cmd_reflog_expire_cb *cmd = opt->value;
+
+ if (parse_expiry_date(arg, &cmd->expire_total))
+ die(_("invalid timestamp '%s' given to '--%s'"),
+ arg, opt->long_name);
+
+ cmd->explicit_expiry |= EXPIRE_TOTAL;
+ return 0;
+}
+
+static int cmd_reflog_show(int argc, const char **argv, const char *prefix)
+{
+ struct option options[] = {
+ OPT_END()
+ };
+
+ parse_options(argc, argv, prefix, options, reflog_show_usage,
+ PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0 |
+ PARSE_OPT_KEEP_UNKNOWN);
+
+ return cmd_log_reflog(argc, argv, prefix);
+}
+
static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
{
- struct expire_reflog_policy_cb cb;
+ struct cmd_reflog_expire_cb cmd = { 0 };
timestamp_t now = time(NULL);
int i, status, do_all, all_worktrees = 1;
- int explicit_expiry = 0;
unsigned int flags = 0;
+ int verbose = 0;
+ reflog_expiry_should_prune_fn *should_prune_fn = should_expire_reflog_ent;
+ const struct option options[] = {
+ OPT_BIT(0, "dry-run", &flags, N_("do not actually prune any entries"),
+ EXPIRE_REFLOGS_DRY_RUN),
+ OPT_BIT(0, "rewrite", &flags,
+ N_("rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"),
+ EXPIRE_REFLOGS_REWRITE),
+ OPT_BIT(0, "updateref", &flags,
+ N_("update the reference to the value of the top reflog entry"),
+ EXPIRE_REFLOGS_UPDATE_REF),
+ OPT_BOOL(0, "verbose", &verbose, N_("print extra information on screen")),
+ OPT_CALLBACK_F(0, "expire", &cmd, N_("timestamp"),
+ N_("prune entries older than the specified time"),
+ PARSE_OPT_NONEG,
+ expire_total_callback),
+ OPT_CALLBACK_F(0, "expire-unreachable", &cmd, N_("timestamp"),
+ N_("prune entries older than <time> that are not reachable from the current tip of the branch"),
+ PARSE_OPT_NONEG,
+ expire_unreachable_callback),
+ OPT_BOOL(0, "stale-fix", &cmd.stalefix,
+ N_("prune any reflog entries that point to broken commits")),
+ OPT_BOOL(0, "all", &do_all, N_("process the reflogs of all references")),
+ OPT_BOOL(1, "single-worktree", &all_worktrees,
+ N_("limits processing to reflogs from the current worktree only")),
+ OPT_END()
+ };
default_reflog_expire_unreachable = now - 30 * 24 * 3600;
default_reflog_expire = now - 90 * 24 * 3600;
@@ -553,179 +268,81 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
save_commit_buffer = 0;
do_all = status = 0;
- memset(&cb, 0, sizeof(cb));
- cb.cmd.expire_total = default_reflog_expire;
- cb.cmd.expire_unreachable = default_reflog_expire_unreachable;
+ cmd.explicit_expiry = 0;
+ cmd.expire_total = default_reflog_expire;
+ cmd.expire_unreachable = default_reflog_expire_unreachable;
- for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
+ argc = parse_options(argc, argv, prefix, options, reflog_expire_usage, 0);
- if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n"))
- flags |= EXPIRE_REFLOGS_DRY_RUN;
- else if (skip_prefix(arg, "--expire=", &arg)) {
- if (parse_expiry_date(arg, &cb.cmd.expire_total))
- die(_("'%s' is not a valid timestamp"), arg);
- explicit_expiry |= EXPIRE_TOTAL;
- }
- else if (skip_prefix(arg, "--expire-unreachable=", &arg)) {
- if (parse_expiry_date(arg, &cb.cmd.expire_unreachable))
- die(_("'%s' is not a valid timestamp"), arg);
- explicit_expiry |= EXPIRE_UNREACH;
- }
- else if (!strcmp(arg, "--stale-fix"))
- cb.cmd.stalefix = 1;
- else if (!strcmp(arg, "--rewrite"))
- flags |= EXPIRE_REFLOGS_REWRITE;
- else if (!strcmp(arg, "--updateref"))
- flags |= EXPIRE_REFLOGS_UPDATE_REF;
- else if (!strcmp(arg, "--all"))
- do_all = 1;
- else if (!strcmp(arg, "--single-worktree"))
- all_worktrees = 0;
- else if (!strcmp(arg, "--verbose"))
- flags |= EXPIRE_REFLOGS_VERBOSE;
- else if (!strcmp(arg, "--")) {
- i++;
- break;
- }
- else if (arg[0] == '-')
- usage(_(reflog_expire_usage));
- else
- break;
- }
+ if (verbose)
+ should_prune_fn = should_expire_reflog_ent_verbose;
/*
* We can trust the commits and objects reachable from refs
* even in older repository. We cannot trust what's reachable
* from reflog if the repository was pruned with older git.
*/
- if (cb.cmd.stalefix) {
- repo_init_revisions(the_repository, &cb.cmd.revs, prefix);
- cb.cmd.revs.do_not_die_on_missing_tree = 1;
- cb.cmd.revs.ignore_missing = 1;
- cb.cmd.revs.ignore_missing_links = 1;
- if (flags & EXPIRE_REFLOGS_VERBOSE)
+ if (cmd.stalefix) {
+ struct rev_info revs;
+
+ repo_init_revisions(the_repository, &revs, prefix);
+ revs.do_not_die_on_missing_tree = 1;
+ revs.ignore_missing = 1;
+ revs.ignore_missing_links = 1;
+ if (verbose)
printf(_("Marking reachable objects..."));
- mark_reachable_objects(&cb.cmd.revs, 0, 0, NULL);
- if (flags & EXPIRE_REFLOGS_VERBOSE)
+ mark_reachable_objects(&revs, 0, 0, NULL);
+ release_revisions(&revs);
+ if (verbose)
putchar('\n');
}
if (do_all) {
- struct collect_reflog_cb collected;
+ struct worktree_reflogs collected = {
+ .reflogs = STRING_LIST_INIT_DUP,
+ };
+ struct string_list_item *item;
struct worktree **worktrees, **p;
- int i;
- memset(&collected, 0, sizeof(collected));
worktrees = get_worktrees();
for (p = worktrees; *p; p++) {
if (!all_worktrees && !(*p)->is_current)
continue;
- collected.wt = *p;
+ collected.worktree = *p;
refs_for_each_reflog(get_worktree_ref_store(*p),
collect_reflog, &collected);
}
free_worktrees(worktrees);
- for (i = 0; i < collected.nr; i++) {
- struct collected_reflog *e = collected.e[i];
- set_reflog_expiry_param(&cb.cmd, explicit_expiry, e->reflog);
- status |= reflog_expire(e->reflog, flags,
+ for_each_string_list_item(item, &collected.reflogs) {
+ struct expire_reflog_policy_cb cb = {
+ .cmd = cmd,
+ .dry_run = !!(flags & EXPIRE_REFLOGS_DRY_RUN),
+ };
+
+ set_reflog_expiry_param(&cb.cmd, item->string);
+ status |= reflog_expire(item->string, flags,
reflog_expiry_prepare,
- should_expire_reflog_ent,
+ should_prune_fn,
reflog_expiry_cleanup,
&cb);
- free(e);
}
- free(collected.e);
+ string_list_clear(&collected.reflogs, 0);
}
- for (; i < argc; i++) {
+ for (i = 0; i < argc; i++) {
char *ref;
+ struct expire_reflog_policy_cb cb = { .cmd = cmd };
+
if (!dwim_log(argv[i], strlen(argv[i]), NULL, &ref)) {
status |= error(_("%s points nowhere!"), argv[i]);
continue;
}
- set_reflog_expiry_param(&cb.cmd, explicit_expiry, ref);
+ set_reflog_expiry_param(&cb.cmd, ref);
status |= reflog_expire(ref, flags,
reflog_expiry_prepare,
- should_expire_reflog_ent,
- reflog_expiry_cleanup,
- &cb);
- }
- return status;
-}
-
-static int count_reflog_ent(struct object_id *ooid, struct object_id *noid,
- const char *email, timestamp_t timestamp, int tz,
- const char *message, void *cb_data)
-{
- struct expire_reflog_policy_cb *cb = cb_data;
- if (!cb->cmd.expire_total || timestamp < cb->cmd.expire_total)
- cb->cmd.recno++;
- return 0;
-}
-
-static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
-{
- struct expire_reflog_policy_cb cb;
- int i, status = 0;
- unsigned int flags = 0;
-
- memset(&cb, 0, sizeof(cb));
-
- for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
- if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n"))
- flags |= EXPIRE_REFLOGS_DRY_RUN;
- else if (!strcmp(arg, "--rewrite"))
- flags |= EXPIRE_REFLOGS_REWRITE;
- else if (!strcmp(arg, "--updateref"))
- flags |= EXPIRE_REFLOGS_UPDATE_REF;
- else if (!strcmp(arg, "--verbose"))
- flags |= EXPIRE_REFLOGS_VERBOSE;
- else if (!strcmp(arg, "--")) {
- i++;
- break;
- }
- else if (arg[0] == '-')
- usage(_(reflog_delete_usage));
- else
- break;
- }
-
- if (argc - i < 1)
- return error(_("no reflog specified to delete"));
-
- for ( ; i < argc; i++) {
- const char *spec = strstr(argv[i], "@{");
- char *ep, *ref;
- int recno;
-
- if (!spec) {
- status |= error(_("not a reflog: %s"), argv[i]);
- continue;
- }
-
- if (!dwim_log(argv[i], spec - argv[i], NULL, &ref)) {
- status |= error(_("no reflog for '%s'"), argv[i]);
- continue;
- }
-
- recno = strtoul(spec + 2, &ep, 10);
- if (*ep == '}') {
- cb.cmd.recno = -recno;
- for_each_reflog_ent(ref, count_reflog_ent, &cb);
- } else {
- cb.cmd.expire_total = approxidate(spec + 2);
- for_each_reflog_ent(ref, count_reflog_ent, &cb);
- cb.cmd.expire_total = 0;
- }
-
- status |= reflog_expire(ref, flags,
- reflog_expiry_prepare,
- should_expire_reflog_ent,
+ should_prune_fn,
reflog_expiry_cleanup,
&cb);
free(ref);
@@ -733,59 +350,94 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
return status;
}
+static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
+{
+ int i, status = 0;
+ unsigned int flags = 0;
+ int verbose = 0;
+
+ const struct option options[] = {
+ OPT_BIT(0, "dry-run", &flags, N_("do not actually prune any entries"),
+ EXPIRE_REFLOGS_DRY_RUN),
+ OPT_BIT(0, "rewrite", &flags,
+ N_("rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"),
+ EXPIRE_REFLOGS_REWRITE),
+ OPT_BIT(0, "updateref", &flags,
+ N_("update the reference to the value of the top reflog entry"),
+ EXPIRE_REFLOGS_UPDATE_REF),
+ OPT_BOOL(0, "verbose", &verbose, N_("print extra information on screen")),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options, reflog_delete_usage, 0);
+
+ if (argc < 1)
+ return error(_("no reflog specified to delete"));
+
+ for (i = 0; i < argc; i++)
+ status |= reflog_delete(argv[i], flags, verbose);
+
+ return status;
+}
+
static int cmd_reflog_exists(int argc, const char **argv, const char *prefix)
{
- int i, start = 0;
+ struct option options[] = {
+ OPT_END()
+ };
+ const char *refname;
- for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
- if (!strcmp(arg, "--")) {
- i++;
- break;
- }
- else if (arg[0] == '-')
- usage(_(reflog_exists_usage));
- else
- break;
- }
+ argc = parse_options(argc, argv, prefix, options, reflog_exists_usage,
+ 0);
+ if (!argc)
+ usage_with_options(reflog_exists_usage, options);
- start = i;
-
- if (argc - start != 1)
- usage(_(reflog_exists_usage));
-
- if (check_refname_format(argv[start], REFNAME_ALLOW_ONELEVEL))
- die(_("invalid ref format: %s"), argv[start]);
- return !reflog_exists(argv[start]);
+ refname = argv[0];
+ if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
+ die(_("invalid ref format: %s"), refname);
+ return !reflog_exists(refname);
}
/*
* main "reflog"
*/
-static const char reflog_usage[] =
-N_("git reflog [ show | expire | delete | exists ]");
-
int cmd_reflog(int argc, const char **argv, const char *prefix)
{
- if (argc > 1 && !strcmp(argv[1], "-h"))
- usage(_(reflog_usage));
+ struct option options[] = {
+ OPT_END()
+ };
- /* With no command, we default to showing it. */
- if (argc < 2 || *argv[1] == '-')
- return cmd_log_reflog(argc, argv, prefix);
+ argc = parse_options(argc, argv, prefix, options, reflog_usage,
+ PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0 |
+ PARSE_OPT_KEEP_UNKNOWN |
+ PARSE_OPT_NO_INTERNAL_HELP);
+
+ /*
+ * With "git reflog" we default to showing it. !argc is
+ * impossible with PARSE_OPT_KEEP_ARGV0.
+ */
+ if (argc == 1)
+ goto log_reflog;
+
+ if (!strcmp(argv[1], "-h"))
+ usage_with_options(reflog_usage, options);
+ else if (*argv[1] == '-')
+ goto log_reflog;
if (!strcmp(argv[1], "show"))
- return cmd_log_reflog(argc - 1, argv + 1, prefix);
-
- if (!strcmp(argv[1], "expire"))
+ return cmd_reflog_show(argc - 1, argv + 1, prefix);
+ else if (!strcmp(argv[1], "expire"))
return cmd_reflog_expire(argc - 1, argv + 1, prefix);
-
- if (!strcmp(argv[1], "delete"))
+ else if (!strcmp(argv[1], "delete"))
return cmd_reflog_delete(argc - 1, argv + 1, prefix);
-
- if (!strcmp(argv[1], "exists"))
+ else if (!strcmp(argv[1], "exists"))
return cmd_reflog_exists(argc - 1, argv + 1, prefix);
+ /*
+ * Fall-through for e.g. "git reflog -1", "git reflog master",
+ * as well as the plain "git reflog" above goto above.
+ */
+log_reflog:
return cmd_log_reflog(argc, argv, prefix);
}
diff --git a/builtin/remote.c b/builtin/remote.c
index 7f88e6c..d4b69fe 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -12,11 +12,12 @@
#include "object-store.h"
#include "strvec.h"
#include "commit-reach.h"
+#include "progress.h"
static const char * const builtin_remote_usage[] = {
- N_("git remote [-v | --verbose]"),
+ "git remote [-v | --verbose]",
N_("git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <name> <url>"),
- N_("git remote rename <old> <new>"),
+ N_("git remote rename [--[no-]progress] <old> <new>"),
N_("git remote remove <name>"),
N_("git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"),
N_("git remote [-v | --verbose] show [-n] <name>"),
@@ -36,7 +37,7 @@ static const char * const builtin_remote_add_usage[] = {
};
static const char * const builtin_remote_rename_usage[] = {
- N_("git remote rename <old> <new>"),
+ N_("git remote rename [--[no-]progress] <old> <new>"),
NULL
};
@@ -318,6 +319,9 @@ static int config_read_branches(const char *key, const char *value, void *cb)
* truth value with >= REBASE_TRUE.
*/
info->rebase = rebase_parse_value(value);
+ if (info->rebase == REBASE_INVALID)
+ warning(_("unhandled branch.%s.rebase=%s; assuming "
+ "'true'"), name, value);
break;
case PUSH_REMOTE:
if (info->push_remote_name)
@@ -344,6 +348,14 @@ struct ref_states {
int queried;
};
+#define REF_STATES_INIT { \
+ .new_refs = STRING_LIST_INIT_DUP, \
+ .stale = STRING_LIST_INIT_DUP, \
+ .tracked = STRING_LIST_INIT_DUP, \
+ .heads = STRING_LIST_INIT_DUP, \
+ .push = STRING_LIST_INIT_DUP, \
+}
+
static int get_ref_states(const struct ref *remote_refs, struct ref_states *states)
{
struct ref *fetch_map = NULL, **tail = &fetch_map;
@@ -355,9 +367,6 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat
die(_("Could not get fetch map for refspec %s"),
states->remote->fetch.raw[i]);
- states->new_refs.strdup_strings = 1;
- states->tracked.strdup_strings = 1;
- states->stale.strdup_strings = 1;
for (ref = fetch_map; ref; ref = ref->next) {
if (!ref->peer_ref || !ref_exists(ref->peer_ref->name))
string_list_append(&states->new_refs, abbrev_branch(ref->name));
@@ -406,7 +415,6 @@ static int get_push_ref_states(const struct ref *remote_refs,
match_push_refs(local_refs, &push_map, &remote->push, MATCH_REFS_NONE);
- states->push.strdup_strings = 1;
for (ref = push_map; ref; ref = ref->next) {
struct string_list_item *item;
struct push_info *info;
@@ -449,7 +457,6 @@ static int get_push_ref_states_noquery(struct ref_states *states)
if (remote->mirror)
return 0;
- states->push.strdup_strings = 1;
if (!remote->push.nr) {
item = string_list_append(&states->push, _("(matching)"));
info = item->util = xcalloc(1, sizeof(struct push_info));
@@ -483,7 +490,6 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat
refspec.force = 0;
refspec.pattern = 1;
refspec.src = refspec.dst = "refs/heads/*";
- states->heads.strdup_strings = 1;
get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0);
matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"),
fetch_map, 1);
@@ -566,6 +572,7 @@ struct rename_info {
const char *old_name;
const char *new_name;
struct string_list *remote_branches;
+ uint32_t symrefs_nr;
};
static int read_remote_branches(const char *refname,
@@ -582,10 +589,12 @@ static int read_remote_branches(const char *refname,
item = string_list_append(rename->remote_branches, refname);
symref = resolve_ref_unsafe(refname, RESOLVE_REF_READING,
NULL, &flag);
- if (symref && (flag & REF_ISSYMREF))
+ if (symref && (flag & REF_ISSYMREF)) {
item->util = xstrdup(symref);
- else
+ rename->symrefs_nr++;
+ } else {
item->util = NULL;
+ }
}
strbuf_release(&buf);
@@ -669,7 +678,9 @@ static void handle_push_default(const char* old_name, const char* new_name)
static int mv(int argc, const char **argv)
{
+ int show_progress = isatty(2);
struct option options[] = {
+ OPT_BOOL(0, "progress", &show_progress, N_("force progress reporting")),
OPT_END()
};
struct remote *oldremote, *newremote;
@@ -677,14 +688,19 @@ static int mv(int argc, const char **argv)
old_remote_context = STRBUF_INIT;
struct string_list remote_branches = STRING_LIST_INIT_DUP;
struct rename_info rename;
- int i, refspec_updated = 0;
+ int i, refs_renamed_nr = 0, refspec_updated = 0;
+ struct progress *progress = NULL;
- if (argc != 3)
+ argc = parse_options(argc, argv, NULL, options,
+ builtin_remote_rename_usage, 0);
+
+ if (argc != 2)
usage_with_options(builtin_remote_rename_usage, options);
- rename.old_name = argv[1];
- rename.new_name = argv[2];
+ rename.old_name = argv[0];
+ rename.new_name = argv[1];
rename.remote_branches = &remote_branches;
+ rename.symrefs_nr = 0;
oldremote = remote_get(rename.old_name);
if (!remote_is_configured(oldremote, 1)) {
@@ -759,15 +775,26 @@ static int mv(int argc, const char **argv)
* the new symrefs.
*/
for_each_ref(read_remote_branches, &rename);
+ if (show_progress) {
+ /*
+ * Count symrefs twice, since "renaming" them is done by
+ * deleting and recreating them in two separate passes.
+ */
+ progress = start_progress(_("Renaming remote references"),
+ rename.remote_branches->nr + rename.symrefs_nr);
+ }
for (i = 0; i < remote_branches.nr; i++) {
struct string_list_item *item = remote_branches.items + i;
- int flag = 0;
+ struct strbuf referent = STRBUF_INIT;
- read_ref_full(item->string, RESOLVE_REF_READING, NULL, &flag);
- if (!(flag & REF_ISSYMREF))
+ if (refs_read_symbolic_ref(get_main_ref_store(the_repository), item->string,
+ &referent))
continue;
if (delete_ref(NULL, item->string, NULL, REF_NO_DEREF))
die(_("deleting '%s' failed"), item->string);
+
+ strbuf_release(&referent);
+ display_progress(progress, ++refs_renamed_nr);
}
for (i = 0; i < remote_branches.nr; i++) {
struct string_list_item *item = remote_branches.items + i;
@@ -783,6 +810,7 @@ static int mv(int argc, const char **argv)
item->string, buf.buf);
if (rename_ref(item->string, buf.buf, buf2.buf))
die(_("renaming '%s' failed"), item->string);
+ display_progress(progress, ++refs_renamed_nr);
}
for (i = 0; i < remote_branches.nr; i++) {
struct string_list_item *item = remote_branches.items + i;
@@ -802,7 +830,9 @@ static int mv(int argc, const char **argv)
item->string, buf.buf);
if (create_symref(buf.buf, buf2.buf, buf3.buf))
die(_("creating '%s' failed"), buf.buf);
+ display_progress(progress, ++refs_renamed_nr);
}
+ stop_progress(&progress);
string_list_clear(&remote_branches, 1);
handle_push_default(rename.old_name, rename.new_name);
@@ -970,26 +1000,31 @@ static int get_remote_ref_states(const char *name,
}
struct show_info {
- struct string_list *list;
- struct ref_states *states;
+ struct string_list list;
+ struct ref_states states;
int width, width2;
int any_rebase;
};
+#define SHOW_INFO_INIT { \
+ .list = STRING_LIST_INIT_DUP, \
+ .states = REF_STATES_INIT, \
+}
+
static int add_remote_to_show_info(struct string_list_item *item, void *cb_data)
{
struct show_info *info = cb_data;
int n = strlen(item->string);
if (n > info->width)
info->width = n;
- string_list_insert(info->list, item->string);
+ string_list_insert(&info->list, item->string);
return 0;
}
static int show_remote_info_item(struct string_list_item *item, void *cb_data)
{
struct show_info *info = cb_data;
- struct ref_states *states = info->states;
+ struct ref_states *states = &info->states;
const char *name = item->string;
if (states->queried) {
@@ -1016,7 +1051,7 @@ static int show_remote_info_item(struct string_list_item *item, void *cb_data)
static int add_local_to_show_info(struct string_list_item *branch_item, void *cb_data)
{
struct show_info *show_info = cb_data;
- struct ref_states *states = show_info->states;
+ struct ref_states *states = &show_info->states;
struct branch_info *branch_info = branch_item->util;
struct string_list_item *item;
int n;
@@ -1029,7 +1064,7 @@ static int add_local_to_show_info(struct string_list_item *branch_item, void *cb
if (branch_info->rebase >= REBASE_TRUE)
show_info->any_rebase = 1;
- item = string_list_insert(show_info->list, branch_item->string);
+ item = string_list_insert(&show_info->list, branch_item->string);
item->util = branch_info;
return 0;
@@ -1084,7 +1119,7 @@ static int add_push_to_show_info(struct string_list_item *push_item, void *cb_da
show_info->width = n;
if ((n = strlen(push_info->dest)) > show_info->width2)
show_info->width2 = n;
- item = string_list_append(show_info->list, push_item->string);
+ item = string_list_append(&show_info->list, push_item->string);
item->util = push_item->util;
return 0;
}
@@ -1150,14 +1185,22 @@ static int show_push_info_item(struct string_list_item *item, void *cb_data)
static int get_one_entry(struct remote *remote, void *priv)
{
struct string_list *list = priv;
- struct strbuf url_buf = STRBUF_INIT;
+ struct strbuf remote_info_buf = STRBUF_INIT;
const char **url;
int i, url_nr;
if (remote->url_nr > 0) {
- strbuf_addf(&url_buf, "%s (fetch)", remote->url[0]);
+ struct strbuf promisor_config = STRBUF_INIT;
+ const char *partial_clone_filter = NULL;
+
+ strbuf_addf(&promisor_config, "remote.%s.partialclonefilter", remote->name);
+ strbuf_addf(&remote_info_buf, "%s (fetch)", remote->url[0]);
+ if (!git_config_get_string_tmp(promisor_config.buf, &partial_clone_filter))
+ strbuf_addf(&remote_info_buf, " [%s]", partial_clone_filter);
+
+ strbuf_release(&promisor_config);
string_list_append(list, remote->name)->util =
- strbuf_detach(&url_buf, NULL);
+ strbuf_detach(&remote_info_buf, NULL);
} else
string_list_append(list, remote->name)->util = NULL;
if (remote->pushurl_nr) {
@@ -1169,9 +1212,9 @@ static int get_one_entry(struct remote *remote, void *priv)
}
for (i = 0; i < url_nr; i++)
{
- strbuf_addf(&url_buf, "%s (push)", url[i]);
+ strbuf_addf(&remote_info_buf, "%s (push)", url[i]);
string_list_append(list, remote->name)->util =
- strbuf_detach(&url_buf, NULL);
+ strbuf_detach(&remote_info_buf, NULL);
}
return 0;
@@ -1212,9 +1255,7 @@ static int show(int argc, const char **argv)
OPT_BOOL('n', NULL, &no_query, N_("do not query remotes")),
OPT_END()
};
- struct ref_states states;
- struct string_list info_list = STRING_LIST_INIT_NODUP;
- struct show_info info;
+ struct show_info info = SHOW_INFO_INIT;
argc = parse_options(argc, argv, NULL, options, builtin_remote_show_usage,
0);
@@ -1225,26 +1266,22 @@ static int show(int argc, const char **argv)
if (!no_query)
query_flag = (GET_REF_STATES | GET_HEAD_NAMES | GET_PUSH_REF_STATES);
- memset(&states, 0, sizeof(states));
- memset(&info, 0, sizeof(info));
- info.states = &states;
- info.list = &info_list;
for (; argc; argc--, argv++) {
int i;
const char **url;
int url_nr;
- get_remote_ref_states(*argv, &states, query_flag);
+ get_remote_ref_states(*argv, &info.states, query_flag);
printf_ln(_("* remote %s"), *argv);
- printf_ln(_(" Fetch URL: %s"), states.remote->url_nr > 0 ?
- states.remote->url[0] : _("(no URL)"));
- if (states.remote->pushurl_nr) {
- url = states.remote->pushurl;
- url_nr = states.remote->pushurl_nr;
+ printf_ln(_(" Fetch URL: %s"), info.states.remote->url_nr > 0 ?
+ info.states.remote->url[0] : _("(no URL)"));
+ if (info.states.remote->pushurl_nr) {
+ url = info.states.remote->pushurl;
+ url_nr = info.states.remote->pushurl_nr;
} else {
- url = states.remote->url;
- url_nr = states.remote->url_nr;
+ url = info.states.remote->url;
+ url_nr = info.states.remote->url_nr;
}
for (i = 0; i < url_nr; i++)
/*
@@ -1257,57 +1294,57 @@ static int show(int argc, const char **argv)
printf_ln(_(" Push URL: %s"), _("(no URL)"));
if (no_query)
printf_ln(_(" HEAD branch: %s"), _("(not queried)"));
- else if (!states.heads.nr)
+ else if (!info.states.heads.nr)
printf_ln(_(" HEAD branch: %s"), _("(unknown)"));
- else if (states.heads.nr == 1)
- printf_ln(_(" HEAD branch: %s"), states.heads.items[0].string);
+ else if (info.states.heads.nr == 1)
+ printf_ln(_(" HEAD branch: %s"), info.states.heads.items[0].string);
else {
printf(_(" HEAD branch (remote HEAD is ambiguous,"
" may be one of the following):\n"));
- for (i = 0; i < states.heads.nr; i++)
- printf(" %s\n", states.heads.items[i].string);
+ for (i = 0; i < info.states.heads.nr; i++)
+ printf(" %s\n", info.states.heads.items[i].string);
}
/* remote branch info */
info.width = 0;
- for_each_string_list(&states.new_refs, add_remote_to_show_info, &info);
- for_each_string_list(&states.tracked, add_remote_to_show_info, &info);
- for_each_string_list(&states.stale, add_remote_to_show_info, &info);
- if (info.list->nr)
+ for_each_string_list(&info.states.new_refs, add_remote_to_show_info, &info);
+ for_each_string_list(&info.states.tracked, add_remote_to_show_info, &info);
+ for_each_string_list(&info.states.stale, add_remote_to_show_info, &info);
+ if (info.list.nr)
printf_ln(Q_(" Remote branch:%s",
" Remote branches:%s",
- info.list->nr),
+ info.list.nr),
no_query ? _(" (status not queried)") : "");
- for_each_string_list(info.list, show_remote_info_item, &info);
- string_list_clear(info.list, 0);
+ for_each_string_list(&info.list, show_remote_info_item, &info);
+ string_list_clear(&info.list, 0);
/* git pull info */
info.width = 0;
info.any_rebase = 0;
for_each_string_list(&branch_list, add_local_to_show_info, &info);
- if (info.list->nr)
+ if (info.list.nr)
printf_ln(Q_(" Local branch configured for 'git pull':",
" Local branches configured for 'git pull':",
- info.list->nr));
- for_each_string_list(info.list, show_local_info_item, &info);
- string_list_clear(info.list, 0);
+ info.list.nr));
+ for_each_string_list(&info.list, show_local_info_item, &info);
+ string_list_clear(&info.list, 0);
/* git push info */
- if (states.remote->mirror)
+ if (info.states.remote->mirror)
printf_ln(_(" Local refs will be mirrored by 'git push'"));
info.width = info.width2 = 0;
- for_each_string_list(&states.push, add_push_to_show_info, &info);
- QSORT(info.list->items, info.list->nr, cmp_string_with_push);
- if (info.list->nr)
+ for_each_string_list(&info.states.push, add_push_to_show_info, &info);
+ QSORT(info.list.items, info.list.nr, cmp_string_with_push);
+ if (info.list.nr)
printf_ln(Q_(" Local ref configured for 'git push'%s:",
" Local refs configured for 'git push'%s:",
- info.list->nr),
+ info.list.nr),
no_query ? _(" (status not queried)") : "");
- for_each_string_list(info.list, show_push_info_item, &info);
- string_list_clear(info.list, 0);
+ for_each_string_list(&info.list, show_push_info_item, &info);
+ string_list_clear(&info.list, 0);
- free_remote_ref_states(&states);
+ free_remote_ref_states(&info.states);
}
return result;
@@ -1334,8 +1371,7 @@ static int set_head(int argc, const char **argv)
if (!opt_a && !opt_d && argc == 2) {
head_name = xstrdup(argv[1]);
} else if (opt_a && !opt_d && argc == 1) {
- struct ref_states states;
- memset(&states, 0, sizeof(states));
+ struct ref_states states = REF_STATES_INIT;
get_remote_ref_states(argv[0], &states, GET_HEAD_NAMES);
if (!states.heads.nr)
result |= error(_("Cannot determine remote HEAD"));
@@ -1374,14 +1410,13 @@ static int set_head(int argc, const char **argv)
static int prune_remote(const char *remote, int dry_run)
{
int result = 0;
- struct ref_states states;
+ struct ref_states states = REF_STATES_INIT;
struct string_list refs_to_prune = STRING_LIST_INIT_NODUP;
struct string_list_item *item;
const char *dangling_msg = dry_run
? _(" %s will become dangling!")
: _(" %s has become dangling!");
- memset(&states, 0, sizeof(states));
get_remote_ref_states(remote, &states, GET_REF_STATES);
if (!states.stale.nr) {
diff --git a/builtin/repack.c b/builtin/repack.c
index cb9f4bf..c957b29 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -15,12 +15,24 @@
#include "promisor-remote.h"
#include "shallow.h"
#include "pack.h"
+#include "pack-bitmap.h"
+#include "refs.h"
+#define ALL_INTO_ONE 1
+#define LOOSEN_UNREACHABLE 2
+#define PACK_CRUFT 4
+
+#define DELETE_PACK 1
+#define CRUFT_PACK 2
+
+static int pack_everything;
static int delta_base_offset = 1;
static int pack_kept_objects = -1;
static int write_bitmaps = -1;
static int use_delta_islands;
+static int run_update_server_info = 1;
static char *packdir, *packtmp_name, *packtmp;
+static char *cruft_expiration;
static const char *const git_repack_usage[] = {
N_("git repack [<options>]"),
@@ -32,9 +44,21 @@ static const char incremental_bitmap_conflict_error[] = N_(
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
);
+struct pack_objects_args {
+ const char *window;
+ const char *window_memory;
+ const char *depth;
+ const char *threads;
+ const char *max_pack_size;
+ int no_reuse_delta;
+ int no_reuse_object;
+ int quiet;
+ int local;
+};
static int repack_config(const char *var, const char *value, void *cb)
{
+ struct pack_objects_args *cruft_po_args = cb;
if (!strcmp(var, "repack.usedeltabaseoffset")) {
delta_base_offset = git_config_bool(var, value);
return 0;
@@ -52,6 +76,18 @@ static int repack_config(const char *var, const char *value, void *cb)
use_delta_islands = git_config_bool(var, value);
return 0;
}
+ if (strcmp(var, "repack.updateserverinfo") == 0) {
+ run_update_server_info = git_config_bool(var, value);
+ return 0;
+ }
+ if (!strcmp(var, "repack.cruftwindow"))
+ return git_config_string(&cruft_po_args->window, var, value);
+ if (!strcmp(var, "repack.cruftwindowmemory"))
+ return git_config_string(&cruft_po_args->window_memory, var, value);
+ if (!strcmp(var, "repack.cruftdepth"))
+ return git_config_string(&cruft_po_args->depth, var, value);
+ if (!strcmp(var, "repack.cruftthreads"))
+ return git_config_string(&cruft_po_args->threads, var, value);
return git_default_config(var, value, cb);
}
@@ -94,12 +130,14 @@ static void remove_pack_on_signal(int signo)
}
/*
- * Adds all packs hex strings to the fname list, which do not
- * have a corresponding .keep file. These packs are not to
- * be kept if we are going to pack everything into one file.
+ * Adds all packs hex strings to either fname_nonkept_list or
+ * fname_kept_list based on whether each pack has a corresponding
+ * .keep file or not. Packs without a .keep file are not to be kept
+ * if we are going to pack everything into one file.
*/
-static void get_non_kept_pack_filenames(struct string_list *fname_list,
- const struct string_list *extra_keep)
+static void collect_pack_filenames(struct string_list *fname_nonkept_list,
+ struct string_list *fname_kept_list,
+ const struct string_list *extra_keep)
{
DIR *dir;
struct dirent *e;
@@ -112,23 +150,29 @@ static void get_non_kept_pack_filenames(struct string_list *fname_list,
size_t len;
int i;
- for (i = 0; i < extra_keep->nr; i++)
- if (!fspathcmp(e->d_name, extra_keep->items[i].string))
- break;
- if (extra_keep->nr > 0 && i < extra_keep->nr)
- continue;
-
if (!strip_suffix(e->d_name, ".pack", &len))
continue;
+ for (i = 0; i < extra_keep->nr; i++)
+ if (!fspathcmp(e->d_name, extra_keep->items[i].string))
+ break;
+
fname = xmemdupz(e->d_name, len);
- if (!file_exists(mkpath("%s/%s.keep", packdir, fname)))
- string_list_append_nodup(fname_list, fname);
- else
- free(fname);
+ if ((extra_keep->nr > 0 && i < extra_keep->nr) ||
+ (file_exists(mkpath("%s/%s.keep", packdir, fname)))) {
+ string_list_append_nodup(fname_kept_list, fname);
+ } else {
+ struct string_list_item *item;
+ item = string_list_append_nodup(fname_nonkept_list,
+ fname);
+ if (file_exists(mkpath("%s/%s.mtimes", packdir, fname)))
+ item->util = (void*)(uintptr_t)CRUFT_PACK;
+ }
}
closedir(dir);
+
+ string_list_sort(fname_kept_list);
}
static void remove_redundant_pack(const char *dir_name, const char *base_name)
@@ -143,18 +187,6 @@ static void remove_redundant_pack(const char *dir_name, const char *base_name)
strbuf_release(&buf);
}
-struct pack_objects_args {
- const char *window;
- const char *window_memory;
- const char *depth;
- const char *threads;
- const char *max_pack_size;
- int no_reuse_delta;
- int no_reuse_object;
- int quiet;
- int local;
-};
-
static void prepare_pack_objects(struct child_process *cmd,
const struct pack_objects_args *args)
{
@@ -209,6 +241,7 @@ static struct {
} exts[] = {
{".pack"},
{".rev", 1},
+ {".mtimes", 1},
{".bitmap", 1},
{".promisor", 1},
{".idx"},
@@ -255,9 +288,11 @@ static void repack_promisor_objects(const struct pack_objects_args *args,
for_each_packed_object(write_oid, &cmd,
FOR_EACH_OBJECT_PROMISOR_ONLY);
- if (cmd.in == -1)
+ if (cmd.in == -1) {
/* No packed objects; cmd was never started */
+ child_process_clear(&cmd);
return;
+ }
close(cmd.in);
@@ -294,9 +329,6 @@ static void repack_promisor_objects(const struct pack_objects_args *args,
die(_("could not finish pack-objects to repack promisor objects"));
}
-#define ALL_INTO_ONE 1
-#define LOOSEN_UNREACHABLE 2
-
struct pack_geometry {
struct packed_git **pack;
uint32_t pack_nr, pack_alloc;
@@ -322,16 +354,39 @@ static int geometry_cmp(const void *va, const void *vb)
return 0;
}
-static void init_pack_geometry(struct pack_geometry **geometry_p)
+static void init_pack_geometry(struct pack_geometry **geometry_p,
+ struct string_list *existing_kept_packs)
{
struct packed_git *p;
struct pack_geometry *geometry;
+ struct strbuf buf = STRBUF_INIT;
*geometry_p = xcalloc(1, sizeof(struct pack_geometry));
geometry = *geometry_p;
for (p = get_all_packs(the_repository); p; p = p->next) {
- if (!pack_kept_objects && p->pack_keep)
+ if (!pack_kept_objects) {
+ /*
+ * Any pack that has its pack_keep bit set will appear
+ * in existing_kept_packs below, but this saves us from
+ * doing a more expensive check.
+ */
+ if (p->pack_keep)
+ continue;
+
+ /*
+ * The pack may be kept via the --keep-pack option;
+ * check 'existing_kept_packs' to determine whether to
+ * ignore it.
+ */
+ strbuf_reset(&buf);
+ strbuf_addstr(&buf, pack_basename(p));
+ strbuf_strip_suffix(&buf, ".pack");
+
+ if (string_list_has_string(existing_kept_packs, buf.buf))
+ continue;
+ }
+ if (p->is_cruft)
continue;
ALLOC_GROW(geometry->pack,
@@ -343,6 +398,7 @@ static void init_pack_geometry(struct pack_geometry **geometry_p)
}
QSORT(geometry->pack, geometry->pack_nr, geometry_cmp);
+ strbuf_release(&buf);
}
static void split_pack_geometry(struct pack_geometry *geometry, int factor)
@@ -422,6 +478,25 @@ static void split_pack_geometry(struct pack_geometry *geometry, int factor)
geometry->split = split;
}
+static struct packed_git *get_largest_active_pack(struct pack_geometry *geometry)
+{
+ if (!geometry) {
+ /*
+ * No geometry means either an all-into-one repack (in which
+ * case there is only one pack left and it is the largest) or an
+ * incremental one.
+ *
+ * If repacking incrementally, then we could check the size of
+ * all packs to determine which should be preferred, but leave
+ * this for later.
+ */
+ return NULL;
+ }
+ if (geometry->split == geometry->pack_nr)
+ return NULL;
+ return geometry->pack[geometry->pack_nr - 1];
+}
+
static void clear_pack_geometry(struct pack_geometry *geometry)
{
if (!geometry)
@@ -433,27 +508,244 @@ static void clear_pack_geometry(struct pack_geometry *geometry)
geometry->split = 0;
}
+struct midx_snapshot_ref_data {
+ struct tempfile *f;
+ struct oidset seen;
+ int preferred;
+};
+
+static int midx_snapshot_ref_one(const char *refname,
+ const struct object_id *oid,
+ int flag, void *_data)
+{
+ struct midx_snapshot_ref_data *data = _data;
+ struct object_id peeled;
+
+ if (!peel_iterated_oid(oid, &peeled))
+ oid = &peeled;
+
+ if (oidset_insert(&data->seen, oid))
+ return 0; /* already seen */
+
+ if (oid_object_info(the_repository, oid, NULL) != OBJ_COMMIT)
+ return 0;
+
+ fprintf(data->f->fp, "%s%s\n", data->preferred ? "+" : "",
+ oid_to_hex(oid));
+
+ return 0;
+}
+
+static void midx_snapshot_refs(struct tempfile *f)
+{
+ struct midx_snapshot_ref_data data;
+ const struct string_list *preferred = bitmap_preferred_tips(the_repository);
+
+ data.f = f;
+ data.preferred = 0;
+ oidset_init(&data.seen, 0);
+
+ if (!fdopen_tempfile(f, "w"))
+ die(_("could not open tempfile %s for writing"),
+ get_tempfile_path(f));
+
+ if (preferred) {
+ struct string_list_item *item;
+
+ data.preferred = 1;
+ for_each_string_list_item(item, preferred)
+ for_each_ref_in(item->string, midx_snapshot_ref_one, &data);
+ data.preferred = 0;
+ }
+
+ for_each_ref(midx_snapshot_ref_one, &data);
+
+ if (close_tempfile_gently(f)) {
+ int save_errno = errno;
+ delete_tempfile(&f);
+ errno = save_errno;
+ die_errno(_("could not close refs snapshot tempfile"));
+ }
+
+ oidset_clear(&data.seen);
+}
+
+static void midx_included_packs(struct string_list *include,
+ struct string_list *existing_nonkept_packs,
+ struct string_list *existing_kept_packs,
+ struct string_list *names,
+ struct pack_geometry *geometry)
+{
+ struct string_list_item *item;
+
+ for_each_string_list_item(item, existing_kept_packs)
+ string_list_insert(include, xstrfmt("%s.idx", item->string));
+ for_each_string_list_item(item, names)
+ string_list_insert(include, xstrfmt("pack-%s.idx", item->string));
+ if (geometry) {
+ struct strbuf buf = STRBUF_INIT;
+ uint32_t i;
+ for (i = geometry->split; i < geometry->pack_nr; i++) {
+ struct packed_git *p = geometry->pack[i];
+
+ strbuf_addstr(&buf, pack_basename(p));
+ strbuf_strip_suffix(&buf, ".pack");
+ strbuf_addstr(&buf, ".idx");
+
+ string_list_insert(include, strbuf_detach(&buf, NULL));
+ }
+
+ for_each_string_list_item(item, existing_nonkept_packs) {
+ if (!((uintptr_t)item->util & CRUFT_PACK)) {
+ /*
+ * no need to check DELETE_PACK, since we're not
+ * doing an ALL_INTO_ONE repack
+ */
+ continue;
+ }
+ string_list_insert(include, xstrfmt("%s.idx", item->string));
+ }
+ } else {
+ for_each_string_list_item(item, existing_nonkept_packs) {
+ if ((uintptr_t)item->util & DELETE_PACK)
+ continue;
+ string_list_insert(include, xstrfmt("%s.idx", item->string));
+ }
+ }
+}
+
+static int write_midx_included_packs(struct string_list *include,
+ struct pack_geometry *geometry,
+ const char *refs_snapshot,
+ int show_progress, int write_bitmaps)
+{
+ struct child_process cmd = CHILD_PROCESS_INIT;
+ struct string_list_item *item;
+ struct packed_git *largest = get_largest_active_pack(geometry);
+ FILE *in;
+ int ret;
+
+ if (!include->nr)
+ return 0;
+
+ cmd.in = -1;
+ cmd.git_cmd = 1;
+
+ strvec_push(&cmd.args, "multi-pack-index");
+ strvec_pushl(&cmd.args, "write", "--stdin-packs", NULL);
+
+ if (show_progress)
+ strvec_push(&cmd.args, "--progress");
+ else
+ strvec_push(&cmd.args, "--no-progress");
+
+ if (write_bitmaps)
+ strvec_push(&cmd.args, "--bitmap");
+
+ if (largest)
+ strvec_pushf(&cmd.args, "--preferred-pack=%s",
+ pack_basename(largest));
+
+ if (refs_snapshot)
+ strvec_pushf(&cmd.args, "--refs-snapshot=%s", refs_snapshot);
+
+ ret = start_command(&cmd);
+ if (ret)
+ return ret;
+
+ in = xfdopen(cmd.in, "w");
+ for_each_string_list_item(item, include)
+ fprintf(in, "%s\n", item->string);
+ fclose(in);
+
+ return finish_command(&cmd);
+}
+
+static int write_cruft_pack(const struct pack_objects_args *args,
+ const char *pack_prefix,
+ struct string_list *names,
+ struct string_list *existing_packs,
+ struct string_list *existing_kept_packs)
+{
+ struct child_process cmd = CHILD_PROCESS_INIT;
+ struct strbuf line = STRBUF_INIT;
+ struct string_list_item *item;
+ FILE *in, *out;
+ int ret;
+
+ prepare_pack_objects(&cmd, args);
+
+ strvec_push(&cmd.args, "--cruft");
+ if (cruft_expiration)
+ strvec_pushf(&cmd.args, "--cruft-expiration=%s",
+ cruft_expiration);
+
+ strvec_push(&cmd.args, "--honor-pack-keep");
+ strvec_push(&cmd.args, "--non-empty");
+ strvec_push(&cmd.args, "--max-pack-size=0");
+
+ cmd.in = -1;
+
+ ret = start_command(&cmd);
+ if (ret)
+ return ret;
+
+ /*
+ * names has a confusing double use: it both provides the list
+ * of just-written new packs, and accepts the name of the cruft
+ * pack we are writing.
+ *
+ * By the time it is read here, it contains only the pack(s)
+ * that were just written, which is exactly the set of packs we
+ * want to consider kept.
+ */
+ in = xfdopen(cmd.in, "w");
+ for_each_string_list_item(item, names)
+ fprintf(in, "%s-%s.pack\n", pack_prefix, item->string);
+ for_each_string_list_item(item, existing_packs)
+ fprintf(in, "-%s.pack\n", item->string);
+ for_each_string_list_item(item, existing_kept_packs)
+ fprintf(in, "%s.pack\n", item->string);
+ fclose(in);
+
+ out = xfdopen(cmd.out, "r");
+ while (strbuf_getline_lf(&line, out) != EOF) {
+ if (line.len != the_hash_algo->hexsz)
+ die(_("repack: Expecting full hex object ID lines only "
+ "from pack-objects."));
+ string_list_append(names, line.buf);
+ }
+ fclose(out);
+
+ strbuf_release(&line);
+
+ return finish_command(&cmd);
+}
+
int cmd_repack(int argc, const char **argv, const char *prefix)
{
struct child_process cmd = CHILD_PROCESS_INIT;
struct string_list_item *item;
struct string_list names = STRING_LIST_INIT_DUP;
struct string_list rollback = STRING_LIST_INIT_NODUP;
- struct string_list existing_packs = STRING_LIST_INIT_DUP;
+ struct string_list existing_nonkept_packs = STRING_LIST_INIT_DUP;
+ struct string_list existing_kept_packs = STRING_LIST_INIT_DUP;
struct pack_geometry *geometry = NULL;
struct strbuf line = STRBUF_INIT;
+ struct tempfile *refs_snapshot = NULL;
int i, ext, ret;
FILE *out;
+ int show_progress;
/* variables to be filled by option parsing */
- int pack_everything = 0;
int delete_redundant = 0;
const char *unpack_unreachable = NULL;
int keep_unreachable = 0;
struct string_list keep_pack_list = STRING_LIST_INIT_NODUP;
- int no_update_server_info = 0;
struct pack_objects_args po_args = {NULL};
+ struct pack_objects_args cruft_po_args = {NULL};
int geometric_factor = 0;
+ int write_midx = 0;
struct option builtin_repack_options[] = {
OPT_BIT('a', NULL, &pack_everything,
@@ -461,14 +753,19 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
OPT_BIT('A', NULL, &pack_everything,
N_("same as -a, and turn unreachable objects loose"),
LOOSEN_UNREACHABLE | ALL_INTO_ONE),
+ OPT_BIT(0, "cruft", &pack_everything,
+ N_("same as -a, pack unreachable cruft objects separately"),
+ PACK_CRUFT),
+ OPT_STRING(0, "cruft-expiration", &cruft_expiration, N_("approxidate"),
+ N_("with -C, expire objects older than this")),
OPT_BOOL('d', NULL, &delete_redundant,
N_("remove redundant packs, and run git-prune-packed")),
OPT_BOOL('f', NULL, &po_args.no_reuse_delta,
N_("pass --no-reuse-delta to git-pack-objects")),
OPT_BOOL('F', NULL, &po_args.no_reuse_object,
N_("pass --no-reuse-object to git-pack-objects")),
- OPT_BOOL('n', NULL, &no_update_server_info,
- N_("do not run git-update-server-info")),
+ OPT_NEGBIT('n', NULL, &run_update_server_info,
+ N_("do not run git-update-server-info"), 1),
OPT__QUIET(&po_args.quiet, N_("be quiet")),
OPT_BOOL('l', "local", &po_args.local,
N_("pass --local to git-pack-objects")),
@@ -496,10 +793,12 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
N_("do not repack this pack")),
OPT_INTEGER('g', "geometric", &geometric_factor,
N_("find a geometric progression with factor <N>")),
+ OPT_BOOL('m', "write-midx", &write_midx,
+ N_("write a multi-pack index of the resulting packs")),
OPT_END()
};
- git_config(repack_config, NULL);
+ git_config(repack_config, &cruft_po_args);
argc = parse_options(argc, argv, prefix, builtin_repack_options,
git_repack_usage, 0);
@@ -509,11 +808,20 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
if (keep_unreachable &&
(unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE)))
- die(_("--keep-unreachable and -A are incompatible"));
+ die(_("options '%s' and '%s' cannot be used together"), "--keep-unreachable", "-A");
+
+ if (pack_everything & PACK_CRUFT) {
+ pack_everything |= ALL_INTO_ONE;
+
+ if (unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE))
+ die(_("options '%s' and '%s' cannot be used together"), "--cruft", "-A");
+ if (keep_unreachable)
+ die(_("options '%s' and '%s' cannot be used together"), "--cruft", "-k");
+ }
if (write_bitmaps < 0) {
- if (!(pack_everything & ALL_INTO_ONE) ||
- !is_bare_repository())
+ if (!write_midx &&
+ (!(pack_everything & ALL_INTO_ONE) || !is_bare_repository()))
write_bitmaps = 0;
} else if (write_bitmaps &&
git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0) &&
@@ -521,26 +829,43 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
write_bitmaps = 0;
}
if (pack_kept_objects < 0)
- pack_kept_objects = write_bitmaps > 0;
+ pack_kept_objects = write_bitmaps > 0 && !write_midx;
- if (write_bitmaps && !(pack_everything & ALL_INTO_ONE))
+ if (write_bitmaps && !(pack_everything & ALL_INTO_ONE) && !write_midx)
die(_(incremental_bitmap_conflict_error));
- if (geometric_factor) {
- if (pack_everything)
- die(_("--geometric is incompatible with -A, -a"));
- init_pack_geometry(&geometry);
- split_pack_geometry(geometry, geometric_factor);
+ if (write_midx && write_bitmaps) {
+ struct strbuf path = STRBUF_INIT;
+
+ strbuf_addf(&path, "%s/%s_XXXXXX", get_object_directory(),
+ "bitmap-ref-tips");
+
+ refs_snapshot = xmks_tempfile(path.buf);
+ midx_snapshot_refs(refs_snapshot);
+
+ strbuf_release(&path);
}
packdir = mkpathdup("%s/pack", get_object_directory());
packtmp_name = xstrfmt(".tmp-%d-pack", (int)getpid());
packtmp = mkpathdup("%s/%s", packdir, packtmp_name);
+ collect_pack_filenames(&existing_nonkept_packs, &existing_kept_packs,
+ &keep_pack_list);
+
+ if (geometric_factor) {
+ if (pack_everything)
+ die(_("options '%s' and '%s' cannot be used together"), "--geometric", "-A/-a");
+ init_pack_geometry(&geometry, &existing_kept_packs);
+ split_pack_geometry(geometry, geometric_factor);
+ }
+
sigchain_push_common(remove_pack_on_signal);
prepare_pack_objects(&cmd, &po_args);
+ show_progress = !po_args.quiet && isatty(2);
+
strvec_push(&cmd.args, "--keep-true-parents");
if (!pack_kept_objects)
strvec_push(&cmd.args, "--honor-pack-keep");
@@ -565,19 +890,20 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
}
if (has_promisor_remote())
strvec_push(&cmd.args, "--exclude-promisor-objects");
- if (write_bitmaps > 0)
- strvec_push(&cmd.args, "--write-bitmap-index");
- else if (write_bitmaps < 0)
- strvec_push(&cmd.args, "--write-bitmap-index-quiet");
+ if (!write_midx) {
+ if (write_bitmaps > 0)
+ strvec_push(&cmd.args, "--write-bitmap-index");
+ else if (write_bitmaps < 0)
+ strvec_push(&cmd.args, "--write-bitmap-index-quiet");
+ }
if (use_delta_islands)
strvec_push(&cmd.args, "--delta-islands");
if (pack_everything & ALL_INTO_ONE) {
- get_non_kept_pack_filenames(&existing_packs, &keep_pack_list);
-
repack_promisor_objects(&po_args, &names);
- if (existing_packs.nr && delete_redundant) {
+ if (existing_nonkept_packs.nr && delete_redundant &&
+ !(pack_everything & PACK_CRUFT)) {
for_each_string_list_item(item, &names) {
strvec_pushf(&cmd.args, "--keep-pack=%s-%s.pack",
packtmp_name, item->string);
@@ -639,6 +965,35 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
if (!names.nr && !po_args.quiet)
printf_ln(_("Nothing new to pack."));
+ if (pack_everything & PACK_CRUFT) {
+ const char *pack_prefix;
+ if (!skip_prefix(packtmp, packdir, &pack_prefix))
+ die(_("pack prefix %s does not begin with objdir %s"),
+ packtmp, packdir);
+ if (*pack_prefix == '/')
+ pack_prefix++;
+
+ if (!cruft_po_args.window)
+ cruft_po_args.window = po_args.window;
+ if (!cruft_po_args.window_memory)
+ cruft_po_args.window_memory = po_args.window_memory;
+ if (!cruft_po_args.depth)
+ cruft_po_args.depth = po_args.depth;
+ if (!cruft_po_args.threads)
+ cruft_po_args.threads = po_args.threads;
+
+ cruft_po_args.local = po_args.local;
+ cruft_po_args.quiet = po_args.quiet;
+
+ ret = write_cruft_pack(&cruft_po_args, pack_prefix, &names,
+ &existing_nonkept_packs,
+ &existing_kept_packs);
+ if (ret)
+ return ret;
+ }
+
+ string_list_sort(&names);
+
for_each_string_list_item(item, &names) {
item->util = (void *)(uintptr_t)populate_pack_exts(item->string);
}
@@ -657,7 +1012,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
fname_old = mkpathdup("%s-%s%s",
packtmp, item->string, exts[ext].name);
- if (((uintptr_t)item->util) & (1 << ext)) {
+ if (((uintptr_t)item->util) & ((uintptr_t)1 << ext)) {
struct stat statbuffer;
if (!stat(fname_old, &statbuffer)) {
statbuffer.st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
@@ -677,20 +1032,48 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
}
/* End of pack replacement. */
- reprepare_packed_git(the_repository);
-
- if (delete_redundant) {
+ if (delete_redundant && pack_everything & ALL_INTO_ONE) {
const int hexsz = the_hash_algo->hexsz;
- int opts = 0;
- string_list_sort(&names);
- for_each_string_list_item(item, &existing_packs) {
+ for_each_string_list_item(item, &existing_nonkept_packs) {
char *sha1;
size_t len = strlen(item->string);
if (len < hexsz)
continue;
sha1 = item->string + len - hexsz;
+ /*
+ * Mark this pack for deletion, which ensures that this
+ * pack won't be included in a MIDX (if `--write-midx`
+ * was given) and that we will actually delete this pack
+ * (if `-d` was given).
+ */
if (!string_list_has_string(&names, sha1))
- remove_redundant_pack(packdir, item->string);
+ item->util = (void*)(uintptr_t)((size_t)item->util | DELETE_PACK);
+ }
+ }
+
+ if (write_midx) {
+ struct string_list include = STRING_LIST_INIT_NODUP;
+ midx_included_packs(&include, &existing_nonkept_packs,
+ &existing_kept_packs, &names, geometry);
+
+ ret = write_midx_included_packs(&include, geometry,
+ refs_snapshot ? get_tempfile_path(refs_snapshot) : NULL,
+ show_progress, write_bitmaps > 0);
+
+ string_list_clear(&include, 0);
+
+ if (ret)
+ return ret;
+ }
+
+ reprepare_packed_git(the_repository);
+
+ if (delete_redundant) {
+ int opts = 0;
+ for_each_string_list_item(item, &existing_nonkept_packs) {
+ if (!((uintptr_t)item->util & DELETE_PACK))
+ continue;
+ remove_redundant_pack(packdir, item->string);
}
if (geometry) {
@@ -711,7 +1094,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
}
strbuf_release(&buf);
}
- if (!po_args.quiet && isatty(2))
+ if (show_progress)
opts |= PRUNE_PACKED_VERBOSE;
prune_packed_objects(opts);
@@ -722,7 +1105,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
prune_shallow(PRUNE_QUICK);
}
- if (!no_update_server_info)
+ if (run_update_server_info)
update_server_info(0);
remove_temporary_files();
@@ -730,12 +1113,13 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
unsigned flags = 0;
if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP, 0))
flags |= MIDX_WRITE_BITMAP | MIDX_WRITE_REV_INDEX;
- write_midx_file(get_object_directory(), NULL, flags);
+ write_midx_file(get_object_directory(), NULL, NULL, flags);
}
string_list_clear(&names, 0);
string_list_clear(&rollback, 0);
- string_list_clear(&existing_packs, 0);
+ string_list_clear(&existing_nonkept_packs, 0);
+ string_list_clear(&existing_kept_packs, 0);
clear_pack_geometry(geometry);
strbuf_release(&line);
diff --git a/builtin/replace.c b/builtin/replace.c
index 946938d..583702a 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -22,7 +22,7 @@ static const char * const git_replace_usage[] = {
N_("git replace [-f] <object> <replacement>"),
N_("git replace [-f] --edit <object>"),
N_("git replace [-f] --graft <commit> [<parent>...]"),
- N_("git replace [-f] --convert-graft-file"),
+ "git replace [-f] --convert-graft-file",
N_("git replace -d <object>..."),
N_("git replace [--format=<format>] [-l [<pattern>]]"),
NULL
@@ -72,7 +72,7 @@ static int list_replace_refs(const char *pattern, const char *format)
{
struct show_data data;
- if (pattern == NULL)
+ if (!pattern)
pattern = "*";
data.pattern = pattern;
@@ -258,11 +258,10 @@ static int import_object(struct object_id *oid, enum object_type type,
return error_errno(_("unable to open %s for reading"), filename);
if (!raw && type == OBJ_TREE) {
- const char *argv[] = { "mktree", NULL };
struct child_process cmd = CHILD_PROCESS_INIT;
struct strbuf result = STRBUF_INIT;
- cmd.argv = argv;
+ strvec_push(&cmd.args, "mktree");
cmd.git_cmd = 1;
cmd.in = fd;
cmd.out = -1;
@@ -410,7 +409,7 @@ static int check_one_mergetag(struct commit *commit,
int i;
hash_object_file(the_hash_algo, extra->value, extra->len,
- type_name(OBJ_TAG), &tag_oid);
+ OBJ_TAG, &tag_oid);
tag = lookup_tag(the_repository, &tag_oid);
if (!tag)
return error(_("bad mergetag in commit '%s'"), ref);
@@ -475,7 +474,7 @@ static int create_graft(int argc, const char **argv, int force, int gentle)
return -1;
}
- if (write_object_file(buf.buf, buf.len, commit_type, &new_oid)) {
+ if (write_object_file(buf.buf, buf.len, OBJ_COMMIT, &new_oid)) {
strbuf_release(&buf);
return error(_("could not write replacement commit for: '%s'"),
old_ref);
diff --git a/builtin/reset.c b/builtin/reset.c
index 51c9e2f..344fff8 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -25,6 +25,7 @@
#include "cache-tree.h"
#include "submodule.h"
#include "submodule-config.h"
+#include "dir.h"
#define REFRESH_INDEX_DELAY_WARNING_IN_MS (2 * 1000)
@@ -67,12 +68,18 @@ static int reset_index(const char *ref, const struct object_id *oid, int reset_t
case KEEP:
case MERGE:
opts.update = 1;
+ opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
break;
case HARD:
opts.update = 1;
- /* fallthrough */
+ opts.reset = UNPACK_RESET_OVERWRITE_UNTRACKED;
+ break;
+ case MIXED:
+ opts.reset = UNPACK_RESET_PROTECT_UNTRACKED;
+ /* but opts.update=0, so working tree not updated */
+ break;
default:
- opts.reset = 1;
+ BUG("invalid reset_type passed to reset_index");
}
read_cache_unmerged();
@@ -130,21 +137,36 @@ static void update_index_from_diff(struct diff_queue_struct *q,
int intent_to_add = *(int *)data;
for (i = 0; i < q->nr; i++) {
+ int pos;
struct diff_filespec *one = q->queue[i]->one;
- int is_missing = !(one->mode && !is_null_oid(&one->oid));
+ int is_in_reset_tree = one->mode && !is_null_oid(&one->oid);
struct cache_entry *ce;
- if (is_missing && !intent_to_add) {
+ if (!is_in_reset_tree && !intent_to_add) {
remove_file_from_cache(one->path);
continue;
}
ce = make_cache_entry(&the_index, one->mode, &one->oid, one->path,
0, 0);
+
+ /*
+ * If the file 1) corresponds to an existing index entry with
+ * skip-worktree set, or 2) does not exist in the index but is
+ * outside the sparse checkout definition, add a skip-worktree bit
+ * to the new index entry. Note that a sparse index will be expanded
+ * if this entry is outside the sparse cone - this is necessary
+ * to properly construct the reset sparse directory.
+ */
+ pos = cache_name_pos(one->path, strlen(one->path));
+ if ((pos >= 0 && ce_skip_worktree(active_cache[pos])) ||
+ (pos < 0 && !path_in_sparse_checkout(one->path, &the_index)))
+ ce->ce_flags |= CE_SKIP_WORKTREE;
+
if (!ce)
die(_("make_cache_entry failed for path '%s'"),
one->path);
- if (is_missing) {
+ if (!is_in_reset_tree) {
ce->ce_flags |= CE_INTENT_TO_ADD;
set_object_name_for_intent_to_add_entry(ce);
}
@@ -152,6 +174,88 @@ static void update_index_from_diff(struct diff_queue_struct *q,
}
}
+static int pathspec_needs_expanded_index(const struct pathspec *pathspec)
+{
+ unsigned int i, pos;
+ int res = 0;
+ char *skip_worktree_seen = NULL;
+
+ /*
+ * When using a magic pathspec, assume for the sake of simplicity that
+ * the index needs to be expanded to match all matchable files.
+ */
+ if (pathspec->magic)
+ return 1;
+
+ for (i = 0; i < pathspec->nr; i++) {
+ struct pathspec_item item = pathspec->items[i];
+
+ /*
+ * If the pathspec item has a wildcard, the index should be expanded
+ * if the pathspec has the possibility of matching a subset of entries inside
+ * of a sparse directory (but not the entire directory).
+ *
+ * If the pathspec item is a literal path, the index only needs to be expanded
+ * if a) the pathspec isn't in the sparse checkout cone (to make sure we don't
+ * expand for in-cone files) and b) it doesn't match any sparse directories
+ * (since we can reset whole sparse directories without expanding them).
+ */
+ if (item.nowildcard_len < item.len) {
+ /*
+ * Special case: if the pattern is a path inside the cone
+ * followed by only wildcards, the pattern cannot match
+ * partial sparse directories, so we know we don't need to
+ * expand the index.
+ *
+ * Examples:
+ * - in-cone/foo***: doesn't need expanded index
+ * - not-in-cone/bar*: may need expanded index
+ * - **.c: may need expanded index
+ */
+ if (strspn(item.original + item.nowildcard_len, "*") == item.len - item.nowildcard_len &&
+ path_in_cone_mode_sparse_checkout(item.original, &the_index))
+ continue;
+
+ for (pos = 0; pos < active_nr; pos++) {
+ struct cache_entry *ce = active_cache[pos];
+
+ if (!S_ISSPARSEDIR(ce->ce_mode))
+ continue;
+
+ /*
+ * If the pre-wildcard length is longer than the sparse
+ * directory name and the sparse directory is the first
+ * component of the pathspec, need to expand the index.
+ */
+ if (item.nowildcard_len > ce_namelen(ce) &&
+ !strncmp(item.original, ce->name, ce_namelen(ce))) {
+ res = 1;
+ break;
+ }
+
+ /*
+ * If the pre-wildcard length is shorter than the sparse
+ * directory and the pathspec does not match the whole
+ * directory, need to expand the index.
+ */
+ if (!strncmp(item.original, ce->name, item.nowildcard_len) &&
+ wildmatch(item.original, ce->name, 0)) {
+ res = 1;
+ break;
+ }
+ }
+ } else if (!path_in_cone_mode_sparse_checkout(item.original, &the_index) &&
+ !matches_skip_worktree(pathspec, i, &skip_worktree_seen))
+ res = 1;
+
+ if (res > 0)
+ break;
+ }
+
+ free(skip_worktree_seen);
+ return res;
+}
+
static int read_from_tree(const struct pathspec *pathspec,
struct object_id *tree_oid,
int intent_to_add)
@@ -164,13 +268,18 @@ static int read_from_tree(const struct pathspec *pathspec,
opt.format_callback = update_index_from_diff;
opt.format_callback_data = &intent_to_add;
opt.flags.override_submodule_config = 1;
+ opt.flags.recursive = 1;
opt.repo = the_repository;
+ opt.change = diff_change;
+ opt.add_remove = diff_addremove;
+
+ if (pathspec->nr && the_index.sparse_index && pathspec_needs_expanded_index(pathspec))
+ ensure_full_index(&the_index);
if (do_diff_cache(tree_oid, &opt))
return 1;
diffcore_std(&opt);
diff_flush(&opt);
- clear_pathspec(&opt.pathspec);
return 0;
}
@@ -243,9 +352,6 @@ static void parse_args(struct pathspec *pathspec,
}
*rev_ret = rev;
- if (read_cache() < 0)
- die(_("index file corrupt"));
-
parse_pathspec(pathspec, 0,
PATHSPEC_PREFER_FULL |
(patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0),
@@ -286,6 +392,7 @@ static int git_reset_config(const char *var, const char *value, void *cb)
int cmd_reset(int argc, const char **argv, const char *prefix)
{
int reset_type = NONE, update_ref_status = 0, quiet = 0;
+ int no_refresh = 0;
int patch_mode = 0, pathspec_file_nul = 0, unborn;
const char *rev, *pathspec_from_file = NULL;
struct object_id oid;
@@ -293,6 +400,8 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
int intent_to_add = 0;
const struct option options[] = {
OPT__QUIET(&quiet, N_("be quiet, only report errors")),
+ OPT_BOOL(0, "no-refresh", &no_refresh,
+ N_("skip refreshing the index after reset")),
OPT_SET_INT(0, "mixed", &reset_type,
N_("reset HEAD and index"), MIXED),
OPT_SET_INT(0, "soft", &reset_type, N_("reset only HEAD"), SOFT),
@@ -314,7 +423,6 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
};
git_config(git_reset_config, NULL);
- git_config_get_bool("reset.quiet", &quiet);
argc = parse_options(argc, argv, prefix, options, git_reset_usage,
PARSE_OPT_KEEP_DASHDASH);
@@ -322,16 +430,16 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
if (pathspec_from_file) {
if (patch_mode)
- die(_("--pathspec-from-file is incompatible with --patch"));
+ die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
if (pathspec.nr)
- die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+ die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
parse_pathspec_file(&pathspec, 0,
PATHSPEC_PREFER_FULL,
prefix, pathspec_from_file, pathspec_file_nul);
} else if (pathspec_file_nul) {
- die(_("--pathspec-file-nul requires --pathspec-from-file"));
+ die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
}
unborn = !strcmp(rev, "HEAD") && get_oid("HEAD", &oid);
@@ -358,7 +466,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
if (patch_mode) {
if (reset_type != NONE)
- die(_("--patch is incompatible with --{hard,mixed,soft}"));
+ die(_("options '%s' and '%s' cannot be used together"), "--patch", "--{hard,mixed,soft}");
trace2_cmd_mode("patch-interactive");
return run_add_interactive(rev, "--patch=reset", &pathspec);
}
@@ -389,7 +497,13 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
_(reset_type_names[reset_type]));
if (intent_to_add && reset_type != MIXED)
- die(_("-N can only be used with --mixed"));
+ die(_("the option '%s' requires '%s'"), "-N", "--mixed");
+
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
+ if (read_cache() < 0)
+ die(_("index file corrupt"));
/* Soft reset does not touch the index file nor the working tree
* at all, but requires them in a good order. Other resets reset
@@ -405,17 +519,16 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
if (read_from_tree(&pathspec, &oid, intent_to_add))
return 1;
the_index.updated_skipworktree = 1;
- if (!quiet && get_git_work_tree()) {
+ if (!no_refresh && get_git_work_tree()) {
uint64_t t_begin, t_delta_in_ms;
t_begin = getnanotime();
refresh_index(&the_index, flags, NULL, NULL,
_("Unstaged changes after reset:"));
t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
- if (advice_enabled(ADVICE_RESET_QUIET_WARNING) && t_delta_in_ms > REFRESH_INDEX_DELAY_WARNING_IN_MS) {
- printf(_("\nIt took %.2f seconds to enumerate unstaged changes after reset. You can\n"
- "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
- "to make this the default.\n"), t_delta_in_ms / 1000.0);
+ if (!quiet && advice_enabled(ADVICE_RESET_NO_REFRESH_WARNING) && t_delta_in_ms > REFRESH_INDEX_DELAY_WARNING_IN_MS) {
+ advise(_("It took %.2f seconds to refresh the index after reset. You can use\n"
+ "'--no-refresh' to avoid this."), t_delta_in_ms / 1000.0);
}
}
} else {
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 36cb909..30fd8e8 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -20,7 +20,7 @@
#include "packfile.h"
static const char rev_list_usage[] =
-"git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
+"git rev-list [<options>] <commit-id>... [-- <path>...]\n"
" limiting output:\n"
" --max-count=<n>\n"
" --max-age=<epoch>\n"
@@ -62,7 +62,6 @@ static const char rev_list_usage[] =
static struct progress *progress;
static unsigned progress_counter;
-static struct list_objects_filter_options filter_options;
static struct oidset omitted_objects;
static int arg_print_omitted; /* print objects omitted by filter */
@@ -214,10 +213,8 @@ static void show_commit(struct commit *commit, void *data)
static void finish_commit(struct commit *commit)
{
- if (commit->parents) {
- free_commit_list(commit->parents);
- commit->parents = NULL;
- }
+ free_commit_list(commit->parents);
+ commit->parents = NULL;
free_commit_buffer(the_repository->parsed_objects,
commit);
}
@@ -400,7 +397,6 @@ static inline int parse_missing_action_value(const char *value)
}
static int try_bitmap_count(struct rev_info *revs,
- struct list_objects_filter_options *filter,
int filter_provided_objects)
{
uint32_t commit_count = 0,
@@ -436,7 +432,7 @@ static int try_bitmap_count(struct rev_info *revs,
*/
max_count = revs->max_count;
- bitmap_git = prepare_bitmap_walk(revs, filter, filter_provided_objects);
+ bitmap_git = prepare_bitmap_walk(revs, filter_provided_objects);
if (!bitmap_git)
return -1;
@@ -453,7 +449,6 @@ static int try_bitmap_count(struct rev_info *revs,
}
static int try_bitmap_traversal(struct rev_info *revs,
- struct list_objects_filter_options *filter,
int filter_provided_objects)
{
struct bitmap_index *bitmap_git;
@@ -465,7 +460,7 @@ static int try_bitmap_traversal(struct rev_info *revs,
if (revs->max_count >= 0)
return -1;
- bitmap_git = prepare_bitmap_walk(revs, filter, filter_provided_objects);
+ bitmap_git = prepare_bitmap_walk(revs, filter_provided_objects);
if (!bitmap_git)
return -1;
@@ -475,7 +470,6 @@ static int try_bitmap_traversal(struct rev_info *revs,
}
static int try_bitmap_disk_usage(struct rev_info *revs,
- struct list_objects_filter_options *filter,
int filter_provided_objects)
{
struct bitmap_index *bitmap_git;
@@ -483,7 +477,7 @@ static int try_bitmap_disk_usage(struct rev_info *revs,
if (!show_disk_usage)
return -1;
- bitmap_git = prepare_bitmap_walk(revs, filter, filter_provided_objects);
+ bitmap_git = prepare_bitmap_walk(revs, filter_provided_objects);
if (!bitmap_git)
return -1;
@@ -506,6 +500,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
int use_bitmap_index = 0;
int filter_provided_objects = 0;
const char *show_progress = NULL;
+ int ret = 0;
if (argc == 2 && !strcmp(argv[1], "-h"))
usage(rev_list_usage);
@@ -538,7 +533,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
const char *arg = argv[i];
if (skip_prefix(arg, "--missing=", &arg)) {
if (revs.exclude_promisor_objects)
- die(_("cannot combine --exclude-promisor-objects and --missing"));
+ die(_("options '%s' and '%s' cannot be used together"), "--exclude-promisor-objects", "--missing");
if (parse_missing_action_value(arg))
break;
}
@@ -589,23 +584,12 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
}
if (!strcmp(arg, "--test-bitmap")) {
test_bitmap_walk(&revs);
- return 0;
+ goto cleanup;
}
if (skip_prefix(arg, "--progress=", &arg)) {
show_progress = arg;
continue;
}
-
- if (skip_prefix(arg, ("--" CL_ARG__FILTER "="), &arg)) {
- parse_list_objects_filter(&filter_options, arg);
- if (filter_options.choice && !revs.blob_objects)
- die(_("object filtering requires --objects"));
- continue;
- }
- if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) {
- list_objects_filter_set_no_filter(&filter_options);
- continue;
- }
if (!strcmp(arg, "--filter-provided-objects")) {
filter_provided_objects = 1;
continue;
@@ -676,7 +660,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
if (revs.count &&
(revs.tag_objects || revs.tree_objects || revs.blob_objects) &&
(revs.left_right || revs.cherry_mark))
- die(_("marked counting is incompatible with --objects"));
+ die(_("marked counting and '%s' cannot be used together"), "--objects");
save_commit_buffer = (revs.verbose_header ||
revs.grep_filter.pattern_list ||
@@ -688,12 +672,12 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
progress = start_delayed_progress(show_progress, 0);
if (use_bitmap_index) {
- if (!try_bitmap_count(&revs, &filter_options, filter_provided_objects))
- return 0;
- if (!try_bitmap_disk_usage(&revs, &filter_options, filter_provided_objects))
- return 0;
- if (!try_bitmap_traversal(&revs, &filter_options, filter_provided_objects))
- return 0;
+ if (!try_bitmap_count(&revs, filter_provided_objects))
+ goto cleanup;
+ if (!try_bitmap_disk_usage(&revs, filter_provided_objects))
+ goto cleanup;
+ if (!try_bitmap_traversal(&revs, filter_provided_objects))
+ goto cleanup;
}
if (prepare_revision_walk(&revs))
@@ -713,8 +697,10 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
find_bisection(&revs.commits, &reaches, &all, bisect_flags);
- if (bisect_show_vars)
- return show_bisect_vars(&info, reaches, all);
+ if (bisect_show_vars) {
+ ret = show_bisect_vars(&info, reaches, all);
+ goto cleanup;
+ }
}
if (filter_provided_objects) {
@@ -733,7 +719,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
oidset_init(&missing_objects, DEFAULT_OIDSET_SIZE);
traverse_commit_list_filtered(
- &filter_options, &revs, show_commit, show_object, &info,
+ &revs, show_commit, show_object, &info,
(arg_print_omitted ? &omitted_objects : NULL));
if (arg_print_omitted) {
@@ -769,5 +755,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
if (show_disk_usage)
printf("%"PRIuMAX"\n", (uintmax_t)total_disk_usage);
- return 0;
+cleanup:
+ release_revisions(&revs);
+ return ret;
}
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 8480a59..b259d89 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -476,7 +476,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
/* name(s) */
s = strpbrk(sb.buf, flag_chars);
- if (s == NULL)
+ if (!s)
s = help;
if (s - sb.buf == 1) /* short option only */
@@ -723,6 +723,9 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
prefix = setup_git_directory();
git_config(git_default_config, NULL);
did_repo_setup = 1;
+
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
}
if (!strcmp(arg, "--")) {
diff --git a/builtin/rm.c b/builtin/rm.c
index 3b44b80..84a935a 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -237,6 +237,7 @@ static int check_local_mod(struct object_id *head, int index_only)
static int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0;
static int ignore_unmatch = 0, pathspec_file_nul;
+static int include_sparse;
static char *pathspec_from_file;
static struct option builtin_rm_options[] = {
@@ -247,6 +248,7 @@ static struct option builtin_rm_options[] = {
OPT_BOOL('r', NULL, &recursive, N_("allow recursive removal")),
OPT_BOOL( 0 , "ignore-unmatch", &ignore_unmatch,
N_("exit with a zero status even if nothing matched")),
+ OPT_BOOL(0, "sparse", &include_sparse, N_("allow updating entries outside of the sparse-checkout cone")),
OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
OPT_END(),
@@ -270,13 +272,13 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
if (pathspec_from_file) {
if (pathspec.nr)
- die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+ die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
parse_pathspec_file(&pathspec, 0,
PATHSPEC_PREFER_CWD,
prefix, pathspec_from_file, pathspec_file_nul);
} else if (pathspec_file_nul) {
- die(_("--pathspec-file-nul requires --pathspec-from-file"));
+ die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
}
if (!pathspec.nr)
@@ -298,7 +300,10 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
ensure_full_index(&the_index);
for (i = 0; i < active_nr; i++) {
const struct cache_entry *ce = active_cache[i];
- if (ce_skip_worktree(ce))
+
+ if (!include_sparse &&
+ (ce_skip_worktree(ce) ||
+ !path_in_sparse_checkout(ce->name, &the_index)))
continue;
if (!ce_path_match(&the_index, ce, &pathspec, seen))
continue;
@@ -322,7 +327,8 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
seen_any = 1;
else if (ignore_unmatch)
continue;
- else if (matches_skip_worktree(&pathspec, i, &skip_worktree_seen))
+ else if (!include_sparse &&
+ matches_skip_worktree(&pathspec, i, &skip_worktree_seen))
string_list_append(&only_match_skip_worktree, original);
else
die(_("pathspec '%s' did not match any files"), original);
@@ -393,12 +399,13 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
if (!index_only) {
int removed = 0, gitmodules_modified = 0;
struct strbuf buf = STRBUF_INIT;
+ int flag = force ? REMOVE_DIR_PURGE_ORIGINAL_CWD : 0;
for (i = 0; i < list.nr; i++) {
const char *path = list.entry[i].name;
if (list.entry[i].is_submodule) {
strbuf_reset(&buf);
strbuf_addstr(&buf, path);
- if (remove_dir_recursively(&buf, 0))
+ if (remove_dir_recursively(&buf, flag))
die(_("could not remove '%s'"), path);
removed = 1;
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 729dea1..64962be 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -17,10 +17,10 @@
#include "protocol.h"
static const char * const send_pack_usage[] = {
- N_("git send-pack [--all | --mirror] [--dry-run] [--force] "
- "[--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] "
- "[<host>:]<directory> [<ref>...]\n"
- " --all and explicit <ref> specification are mutually exclusive."),
+ N_("git send-pack [--mirror] [--dry-run] [--force]\n"
+ " [--receive-pack=<git-receive-pack>]\n"
+ " [--verbose] [--thin] [--atomic]\n"
+ " [<host>:]<directory> (--all | <ref>...)"),
NULL,
};
@@ -87,6 +87,10 @@ static void print_helper_status(struct ref *ref)
break;
case REF_STATUS_EXPECTING_REPORT:
+ res = "error";
+ msg = "expecting report";
+ break;
+
default:
continue;
}
@@ -141,7 +145,7 @@ static int send_pack_config(const char *k, const char *v, void *cb)
if (value && !strcasecmp(value, "if-asked"))
args.push_cert = SEND_PACK_PUSH_CERT_IF_ASKED;
else
- return error("Invalid value for '%s'", k);
+ return error(_("invalid value for '%s'"), k);
}
}
}
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 3e7ab1c..35825f0 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -81,8 +81,10 @@ static void insert_one_record(struct shortlog *log,
format_subject(&subject, oneline, " ");
buffer = strbuf_detach(&subject, NULL);
- if (item->util == NULL)
- item->util = xcalloc(1, sizeof(struct string_list));
+ if (!item->util) {
+ item->util = xmalloc(sizeof(struct string_list));
+ string_list_init_nodup(item->util);
+ }
string_list_append(item->util, buffer);
}
}
@@ -374,6 +376,9 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
for (;;) {
switch (parse_options_step(&ctx, options, shortlog_usage)) {
+ case PARSE_OPT_NON_OPTION:
+ case PARSE_OPT_UNKNOWN:
+ break;
case PARSE_OPT_HELP:
case PARSE_OPT_ERROR:
exit(129);
@@ -385,6 +390,7 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
parse_revision_opt(&rev, &ctx, options, shortlog_usage);
}
parse_done:
+ revision_opts_finish(&rev);
argc = parse_options_end(&ctx);
if (nongit && argc > 1) {
@@ -416,6 +422,8 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
else
get_from_rev(&rev, &log);
+ release_revisions(&rev);
+
shortlog_output(&log);
if (log.file != stdout)
fclose(log.file);
@@ -431,7 +439,7 @@ static void add_wrapped_shortlog_msg(struct strbuf *sb, const char *s,
void shortlog_output(struct shortlog *log)
{
- int i, j;
+ size_t i, j;
struct strbuf sb = STRBUF_INIT;
if (log->sort_by_number)
@@ -444,10 +452,10 @@ void shortlog_output(struct shortlog *log)
(int)UTIL_TO_INT(item), item->string);
} else {
struct string_list *onelines = item->util;
- fprintf(log->file, "%s (%d):\n",
- item->string, onelines->nr);
- for (j = onelines->nr - 1; j >= 0; j--) {
- const char *msg = onelines->items[j].string;
+ fprintf(log->file, "%s (%"PRIuMAX"):\n",
+ item->string, (uintmax_t)onelines->nr);
+ for (j = onelines->nr; j >= 1; j--) {
+ const char *msg = onelines->items[j - 1].string;
if (log->wrap_lines) {
strbuf_reset(&sb);
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index bea4bbf..64c649c 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -8,12 +8,13 @@
#include "parse-options.h"
#include "dir.h"
#include "commit-slab.h"
+#include "date.h"
static const char* show_branch_usage[] = {
N_("git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
- " [--current] [--color[=<when>] | --no-color] [--sparse]\n"
- " [--more=<n> | --list | --independent | --merge-base]\n"
- " [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
+ " [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+ " [--more=<n> | --list | --independent | --merge-base]\n"
+ " [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
N_("git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"),
NULL
};
@@ -707,10 +708,14 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
*
* Also --all and --remotes do not make sense either.
*/
- die(_("--reflog is incompatible with --all, --remotes, "
- "--independent or --merge-base"));
+ die(_("options '%s' and '%s' cannot be used together"), "--reflog",
+ "--all/--remotes/--independent/--merge-base");
}
+ if (with_current_branch && reflog)
+ die(_("options '%s' and '%s' cannot be used together"),
+ "--reflog", "--current");
+
/* If nothing is specified, show all branches by default */
if (ac <= topics && all_heads + all_remotes == 0)
all_heads = 1;
@@ -761,6 +766,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
char *logmsg;
char *nth_desc;
const char *msg;
+ char *end;
timestamp_t timestamp;
int tz;
@@ -770,11 +776,12 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
reflog = i;
break;
}
- msg = strchr(logmsg, '\t');
- if (!msg)
- msg = "(none)";
- else
- msg++;
+
+ end = strchr(logmsg, '\n');
+ if (end)
+ *end = '\0';
+
+ msg = (*logmsg == '\0') ? "(none)" : logmsg;
reflog_msg[i] = xstrfmt("(%s) %s",
show_date(timestamp, tz,
DATE_MODE(RELATIVE)),
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index d0f5c47..f91e29b 100644
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -1,4 +1,5 @@
#include "builtin.h"
+#include "cache.h"
#include "config.h"
#include "dir.h"
#include "parse-options.h"
@@ -7,7 +8,6 @@
#include "run-command.h"
#include "strbuf.h"
#include "string-list.h"
-#include "cache.h"
#include "cache-tree.h"
#include "lockfile.h"
#include "resolve-undo.h"
@@ -15,6 +15,7 @@
#include "wt-status.h"
#include "quote.h"
#include "sparse-index.h"
+#include "worktree.h"
static const char *empty_base = "";
@@ -43,7 +44,7 @@ static void write_patterns_to_file(FILE *fp, struct pattern_list *pl)
}
static char const * const builtin_sparse_checkout_list_usage[] = {
- N_("git sparse-checkout list"),
+ "git sparse-checkout list",
NULL
};
@@ -56,6 +57,9 @@ static int sparse_checkout_list(int argc, const char **argv)
char *sparse_filename;
int res;
+ if (!core_apply_sparse_checkout)
+ die(_("this worktree is not sparse"));
+
argc = parse_options(argc, argv, NULL,
builtin_sparse_checkout_list_options,
builtin_sparse_checkout_list_usage, 0);
@@ -124,7 +128,7 @@ static void clean_tracked_sparse_directories(struct repository *r)
* sparse index will not delete directories that contain
* conflicted entries or submodules.
*/
- if (!r->index->sparse_index) {
+ if (r->index->sparse_index == INDEX_EXPANDED) {
/*
* If something, such as a merge conflict or other concern,
* prevents us from converting to a sparse index, then do
@@ -182,6 +186,8 @@ static void clean_tracked_sparse_directories(struct repository *r)
item->string);
}
+ strvec_clear(&s);
+ clear_pathspec(&p);
dir_clear(&dir);
}
@@ -322,11 +328,11 @@ static int write_patterns_and_update(struct pattern_list *pl)
fd = hold_lock_file_for_update(&lk, sparse_filename,
LOCK_DIE_ON_ERROR);
+ free(sparse_filename);
result = update_working_directory(pl);
if (result) {
rollback_lock_file(&lk);
- free(sparse_filename);
clear_pattern_list(pl);
update_working_directory(NULL);
return result;
@@ -342,7 +348,6 @@ static int write_patterns_and_update(struct pattern_list *pl)
fflush(fp);
commit_lock_file(&lk);
- free(sparse_filename);
clear_pattern_list(pl);
return 0;
@@ -356,32 +361,68 @@ enum sparse_checkout_mode {
static int set_config(enum sparse_checkout_mode mode)
{
- const char *config_path;
-
- if (upgrade_repository_format(1) < 0)
- die(_("unable to upgrade repository format to enable worktreeConfig"));
- if (git_config_set_gently("extensions.worktreeConfig", "true")) {
- error(_("failed to set extensions.worktreeConfig setting"));
+ /* Update to use worktree config, if not already. */
+ if (init_worktree_config(the_repository)) {
+ error(_("failed to initialize worktree config"));
return 1;
}
- config_path = git_path("config.worktree");
- git_config_set_in_file_gently(config_path,
- "core.sparseCheckout",
- mode ? "true" : NULL);
-
- git_config_set_in_file_gently(config_path,
- "core.sparseCheckoutCone",
- mode == MODE_CONE_PATTERNS ? "true" : NULL);
+ if (repo_config_set_worktree_gently(the_repository,
+ "core.sparseCheckout",
+ mode ? "true" : "false") ||
+ repo_config_set_worktree_gently(the_repository,
+ "core.sparseCheckoutCone",
+ mode == MODE_CONE_PATTERNS ?
+ "true" : "false"))
+ return 1;
if (mode == MODE_NO_PATTERNS)
- set_sparse_index_config(the_repository, 0);
+ return set_sparse_index_config(the_repository, 0);
+
+ return 0;
+}
+
+static int update_modes(int *cone_mode, int *sparse_index)
+{
+ int mode, record_mode;
+
+ /* Determine if we need to record the mode; ensure sparse checkout on */
+ record_mode = (*cone_mode != -1) || !core_apply_sparse_checkout;
+
+ /* If not specified, use previous definition of cone mode */
+ if (*cone_mode == -1 && core_apply_sparse_checkout)
+ *cone_mode = core_sparse_checkout_cone;
+
+ /* Set cone/non-cone mode appropriately */
+ core_apply_sparse_checkout = 1;
+ if (*cone_mode == 1 || *cone_mode == -1) {
+ mode = MODE_CONE_PATTERNS;
+ core_sparse_checkout_cone = 1;
+ } else {
+ mode = MODE_ALL_PATTERNS;
+ core_sparse_checkout_cone = 0;
+ }
+ if (record_mode && set_config(mode))
+ return 1;
+
+ /* Set sparse-index/non-sparse-index mode if specified */
+ if (*sparse_index >= 0) {
+ if (set_sparse_index_config(the_repository, *sparse_index) < 0)
+ die(_("failed to modify sparse-index config"));
+
+ /* force an index rewrite */
+ repo_read_index(the_repository);
+ the_repository->index->updated_workdir = 1;
+
+ if (!*sparse_index)
+ ensure_full_index(the_repository->index);
+ }
return 0;
}
static char const * const builtin_sparse_checkout_init_usage[] = {
- N_("git sparse-checkout init [--cone] [--[no-]sparse-index]"),
+ "git sparse-checkout init [--cone] [--[no-]sparse-index]",
NULL
};
@@ -396,7 +437,6 @@ static int sparse_checkout_init(int argc, const char **argv)
char *sparse_filename;
int res;
struct object_id oid;
- int mode;
struct strbuf pattern = STRBUF_INIT;
static struct option builtin_sparse_checkout_init_options[] = {
@@ -409,19 +449,14 @@ static int sparse_checkout_init(int argc, const char **argv)
repo_read_index(the_repository);
+ init_opts.cone_mode = -1;
init_opts.sparse_index = -1;
argc = parse_options(argc, argv, NULL,
builtin_sparse_checkout_init_options,
builtin_sparse_checkout_init_usage, 0);
- if (init_opts.cone_mode) {
- mode = MODE_CONE_PATTERNS;
- core_sparse_checkout_cone = 1;
- } else
- mode = MODE_ALL_PATTERNS;
-
- if (set_config(mode))
+ if (update_modes(&init_opts.cone_mode, &init_opts.sparse_index))
return 1;
memset(&pl, 0, sizeof(pl));
@@ -429,17 +464,6 @@ static int sparse_checkout_init(int argc, const char **argv)
sparse_filename = get_sparse_checkout_filename();
res = add_patterns_from_file_to_list(sparse_filename, "", 0, &pl, NULL, 0);
- if (init_opts.sparse_index >= 0) {
- if (set_sparse_index_config(the_repository, init_opts.sparse_index) < 0)
- die(_("failed to modify sparse-index config"));
-
- /* force an index rewrite */
- repo_read_index(the_repository);
- the_repository->index->updated_workdir = 1;
- }
-
- core_apply_sparse_checkout = 1;
-
/* If we already have a sparse-checkout file, use it. */
if (res >= 0) {
free(sparse_filename);
@@ -450,6 +474,9 @@ static int sparse_checkout_init(int argc, const char **argv)
FILE *fp;
/* assume we are in a fresh repo, but update the sparse-checkout file */
+ if (safe_create_leading_directories(sparse_filename))
+ die(_("unable to create leading directories of %s"),
+ sparse_filename);
fp = xfopen(sparse_filename, "w");
if (!fp)
die(_("failed to open '%s'"), sparse_filename);
@@ -483,7 +510,7 @@ static void insert_recursive_pattern(struct pattern_list *pl, struct strbuf *pat
char *oldpattern = e->pattern;
size_t newlen;
- if (slash == e->pattern)
+ if (!slash || slash == e->pattern)
break;
newlen = slash - e->pattern;
@@ -515,17 +542,9 @@ static void strbuf_to_cone_pattern(struct strbuf *line, struct pattern_list *pl)
insert_recursive_pattern(pl, line);
}
-static char const * const builtin_sparse_checkout_set_usage[] = {
- N_("git sparse-checkout (set|add) (--stdin | <patterns>)"),
- NULL
-};
-
-static struct sparse_checkout_set_opts {
- int use_stdin;
-} set_opts;
-
static void add_patterns_from_input(struct pattern_list *pl,
- int argc, const char **argv)
+ int argc, const char **argv,
+ int use_stdin)
{
int i;
if (core_sparse_checkout_cone) {
@@ -535,7 +554,7 @@ static void add_patterns_from_input(struct pattern_list *pl,
hashmap_init(&pl->parent_hashmap, pl_hashmap_cmp, NULL, 0);
pl->use_cone_patterns = 1;
- if (set_opts.use_stdin) {
+ if (use_stdin) {
struct strbuf unquoted = STRBUF_INIT;
while (!strbuf_getline(&line, stdin)) {
if (line.buf[0] == '"') {
@@ -559,7 +578,7 @@ static void add_patterns_from_input(struct pattern_list *pl,
}
}
} else {
- if (set_opts.use_stdin) {
+ if (use_stdin) {
struct strbuf line = STRBUF_INIT;
while (!strbuf_getline(&line, stdin)) {
@@ -580,7 +599,8 @@ enum modify_type {
};
static void add_patterns_cone_mode(int argc, const char **argv,
- struct pattern_list *pl)
+ struct pattern_list *pl,
+ int use_stdin)
{
struct strbuf buffer = STRBUF_INIT;
struct pattern_entry *pe;
@@ -588,7 +608,7 @@ static void add_patterns_cone_mode(int argc, const char **argv,
struct pattern_list existing;
char *sparse_filename = get_sparse_checkout_filename();
- add_patterns_from_input(pl, argc, argv);
+ add_patterns_from_input(pl, argc, argv, use_stdin);
memset(&existing, 0, sizeof(existing));
existing.use_cone_patterns = core_sparse_checkout_cone;
@@ -598,6 +618,9 @@ static void add_patterns_cone_mode(int argc, const char **argv,
die(_("unable to load existing sparse-checkout patterns"));
free(sparse_filename);
+ if (!existing.use_cone_patterns)
+ die(_("existing sparse-checkout patterns do not use cone mode"));
+
hashmap_for_each_entry(&existing.recursive_hashmap, &iter, pe, ent) {
if (!hashmap_contains_parent(&pl->recursive_hashmap,
pe->pattern, &buffer) ||
@@ -614,17 +637,19 @@ static void add_patterns_cone_mode(int argc, const char **argv,
}
static void add_patterns_literal(int argc, const char **argv,
- struct pattern_list *pl)
+ struct pattern_list *pl,
+ int use_stdin)
{
char *sparse_filename = get_sparse_checkout_filename();
if (add_patterns_from_file_to_list(sparse_filename, "", 0,
pl, NULL, 0))
die(_("unable to load existing sparse-checkout patterns"));
free(sparse_filename);
- add_patterns_from_input(pl, argc, argv);
+ add_patterns_from_input(pl, argc, argv, use_stdin);
}
-static int modify_pattern_list(int argc, const char **argv, enum modify_type m)
+static int modify_pattern_list(int argc, const char **argv, int use_stdin,
+ enum modify_type m)
{
int result;
int changed_config = 0;
@@ -633,13 +658,13 @@ static int modify_pattern_list(int argc, const char **argv, enum modify_type m)
switch (m) {
case ADD:
if (core_sparse_checkout_cone)
- add_patterns_cone_mode(argc, argv, pl);
+ add_patterns_cone_mode(argc, argv, pl, use_stdin);
else
- add_patterns_literal(argc, argv, pl);
+ add_patterns_literal(argc, argv, pl, use_stdin);
break;
case REPLACE:
- add_patterns_from_input(pl, argc, argv);
+ add_patterns_from_input(pl, argc, argv, use_stdin);
break;
}
@@ -659,46 +684,195 @@ static int modify_pattern_list(int argc, const char **argv, enum modify_type m)
return result;
}
-static int sparse_checkout_set(int argc, const char **argv, const char *prefix,
- enum modify_type m)
+static void sanitize_paths(int argc, const char **argv,
+ const char *prefix, int skip_checks)
{
- static struct option builtin_sparse_checkout_set_options[] = {
- OPT_BOOL(0, "stdin", &set_opts.use_stdin,
+ int i;
+
+ if (!argc)
+ return;
+
+ if (prefix && *prefix && core_sparse_checkout_cone) {
+ /*
+ * The args are not pathspecs, so unfortunately we
+ * cannot imitate how cmd_add() uses parse_pathspec().
+ */
+ int prefix_len = strlen(prefix);
+
+ for (i = 0; i < argc; i++)
+ argv[i] = prefix_path(prefix, prefix_len, argv[i]);
+ }
+
+ if (skip_checks)
+ return;
+
+ if (prefix && *prefix && !core_sparse_checkout_cone)
+ die(_("please run from the toplevel directory in non-cone mode"));
+
+ if (core_sparse_checkout_cone) {
+ for (i = 0; i < argc; i++) {
+ if (argv[i][0] == '/')
+ die(_("specify directories rather than patterns (no leading slash)"));
+ if (argv[i][0] == '!')
+ die(_("specify directories rather than patterns. If your directory starts with a '!', pass --skip-checks"));
+ if (strpbrk(argv[i], "*?[]"))
+ die(_("specify directories rather than patterns. If your directory really has any of '*?[]\\' in it, pass --skip-checks"));
+ }
+ }
+
+ for (i = 0; i < argc; i++) {
+ struct cache_entry *ce;
+ struct index_state *index = the_repository->index;
+ int pos = index_name_pos(index, argv[i], strlen(argv[i]));
+
+ if (pos < 0)
+ continue;
+ ce = index->cache[pos];
+ if (S_ISSPARSEDIR(ce->ce_mode))
+ continue;
+
+ if (core_sparse_checkout_cone)
+ die(_("'%s' is not a directory; to treat it as a directory anyway, rerun with --skip-checks"), argv[i]);
+ else
+ warning(_("pass a leading slash before paths such as '%s' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual)."), argv[i]);
+ }
+}
+
+static char const * const builtin_sparse_checkout_add_usage[] = {
+ N_("git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"),
+ NULL
+};
+
+static struct sparse_checkout_add_opts {
+ int skip_checks;
+ int use_stdin;
+} add_opts;
+
+static int sparse_checkout_add(int argc, const char **argv, const char *prefix)
+{
+ static struct option builtin_sparse_checkout_add_options[] = {
+ OPT_BOOL_F(0, "skip-checks", &add_opts.skip_checks,
+ N_("skip some sanity checks on the given paths that might give false positives"),
+ PARSE_OPT_NONEG),
+ OPT_BOOL(0, "stdin", &add_opts.use_stdin,
N_("read patterns from standard in")),
OPT_END(),
};
+ if (!core_apply_sparse_checkout)
+ die(_("no sparse-checkout to add to"));
+
repo_read_index(the_repository);
argc = parse_options(argc, argv, prefix,
+ builtin_sparse_checkout_add_options,
+ builtin_sparse_checkout_add_usage,
+ PARSE_OPT_KEEP_UNKNOWN);
+
+ sanitize_paths(argc, argv, prefix, add_opts.skip_checks);
+
+ return modify_pattern_list(argc, argv, add_opts.use_stdin, ADD);
+}
+
+static char const * const builtin_sparse_checkout_set_usage[] = {
+ N_("git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] (--stdin | <patterns>)"),
+ NULL
+};
+
+static struct sparse_checkout_set_opts {
+ int cone_mode;
+ int sparse_index;
+ int skip_checks;
+ int use_stdin;
+} set_opts;
+
+static int sparse_checkout_set(int argc, const char **argv, const char *prefix)
+{
+ int default_patterns_nr = 2;
+ const char *default_patterns[] = {"/*", "!/*/", NULL};
+
+ static struct option builtin_sparse_checkout_set_options[] = {
+ OPT_BOOL(0, "cone", &set_opts.cone_mode,
+ N_("initialize the sparse-checkout in cone mode")),
+ OPT_BOOL(0, "sparse-index", &set_opts.sparse_index,
+ N_("toggle the use of a sparse index")),
+ OPT_BOOL_F(0, "skip-checks", &set_opts.skip_checks,
+ N_("skip some sanity checks on the given paths that might give false positives"),
+ PARSE_OPT_NONEG),
+ OPT_BOOL_F(0, "stdin", &set_opts.use_stdin,
+ N_("read patterns from standard in"),
+ PARSE_OPT_NONEG),
+ OPT_END(),
+ };
+
+ repo_read_index(the_repository);
+
+ set_opts.cone_mode = -1;
+ set_opts.sparse_index = -1;
+
+ argc = parse_options(argc, argv, prefix,
builtin_sparse_checkout_set_options,
builtin_sparse_checkout_set_usage,
PARSE_OPT_KEEP_UNKNOWN);
- return modify_pattern_list(argc, argv, m);
+ if (update_modes(&set_opts.cone_mode, &set_opts.sparse_index))
+ return 1;
+
+ /*
+ * Cone mode automatically specifies the toplevel directory. For
+ * non-cone mode, if nothing is specified, manually select just the
+ * top-level directory (much as 'init' would do).
+ */
+ if (!core_sparse_checkout_cone && argc == 0) {
+ argv = default_patterns;
+ argc = default_patterns_nr;
+ } else {
+ sanitize_paths(argc, argv, prefix, set_opts.skip_checks);
+ }
+
+ return modify_pattern_list(argc, argv, set_opts.use_stdin, REPLACE);
}
static char const * const builtin_sparse_checkout_reapply_usage[] = {
- N_("git sparse-checkout reapply"),
+ "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]",
NULL
};
+static struct sparse_checkout_reapply_opts {
+ int cone_mode;
+ int sparse_index;
+} reapply_opts;
+
static int sparse_checkout_reapply(int argc, const char **argv)
{
static struct option builtin_sparse_checkout_reapply_options[] = {
+ OPT_BOOL(0, "cone", &reapply_opts.cone_mode,
+ N_("initialize the sparse-checkout in cone mode")),
+ OPT_BOOL(0, "sparse-index", &reapply_opts.sparse_index,
+ N_("toggle the use of a sparse index")),
OPT_END(),
};
+ if (!core_apply_sparse_checkout)
+ die(_("must be in a sparse-checkout to reapply sparsity patterns"));
+
+ reapply_opts.cone_mode = -1;
+ reapply_opts.sparse_index = -1;
+
argc = parse_options(argc, argv, NULL,
builtin_sparse_checkout_reapply_options,
builtin_sparse_checkout_reapply_usage, 0);
repo_read_index(the_repository);
+
+ if (update_modes(&reapply_opts.cone_mode, &reapply_opts.sparse_index))
+ return 1;
+
return update_working_directory(NULL);
}
static char const * const builtin_sparse_checkout_disable_usage[] = {
- N_("git sparse-checkout disable"),
+ "git sparse-checkout disable",
NULL
};
@@ -710,6 +884,17 @@ static int sparse_checkout_disable(int argc, const char **argv)
struct pattern_list pl;
struct strbuf match_all = STRBUF_INIT;
+ /*
+ * We do not exit early if !core_apply_sparse_checkout; due to the
+ * ability for users to manually muck things up between
+ * direct editing of .git/info/sparse-checkout
+ * running read-tree -m u HEAD or update-index --skip-worktree
+ * direct toggling of config options
+ * users might end up with an index with SKIP_WORKTREE bit set on
+ * some files and not know how to undo it. So, here we just
+ * forcibly return to a dense checkout regardless of initial state.
+ */
+
argc = parse_options(argc, argv, NULL,
builtin_sparse_checkout_disable_options,
builtin_sparse_checkout_disable_usage, 0);
@@ -752,15 +937,18 @@ int cmd_sparse_checkout(int argc, const char **argv, const char *prefix)
git_config(git_default_config, NULL);
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
if (argc > 0) {
if (!strcmp(argv[0], "list"))
return sparse_checkout_list(argc, argv);
if (!strcmp(argv[0], "init"))
return sparse_checkout_init(argc, argv);
if (!strcmp(argv[0], "set"))
- return sparse_checkout_set(argc, argv, prefix, REPLACE);
+ return sparse_checkout_set(argc, argv, prefix);
if (!strcmp(argv[0], "add"))
- return sparse_checkout_set(argc, argv, prefix, ADD);
+ return sparse_checkout_add(argc, argv, prefix);
if (!strcmp(argv[0], "reapply"))
return sparse_checkout_reapply(argc, argv);
if (!strcmp(argv[0], "disable"))
diff --git a/builtin/stash.c b/builtin/stash.c
index 5512f49..30fa101 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -7,6 +7,7 @@
#include "cache-tree.h"
#include "unpack-trees.h"
#include "merge-recursive.h"
+#include "merge-ort-wrappers.h"
#include "strvec.h"
#include "run-command.h"
#include "dir.h"
@@ -16,7 +17,7 @@
#include "log-tree.h"
#include "diffcore.h"
#include "exec-cmd.h"
-#include "entry.h"
+#include "reflog.h"
#define INCLUDE_ALL_FILES 2
@@ -27,11 +28,11 @@ static const char * const git_stash_usage[] = {
N_("git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
N_("git stash branch <branchname> [<stash>]"),
"git stash clear",
- N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+ N_("git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"),
- N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+ N_("git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"),
NULL
};
@@ -85,7 +86,7 @@ static const char * const git_stash_push_usage[] = {
static const char * const git_stash_save_usage[] = {
N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
- " [-u|--include-untracked] [-a|--all] [<message>]"),
+ " [-u|--include-untracked] [-a|--all] [<message>]"),
NULL
};
@@ -116,6 +117,10 @@ struct stash_info {
int has_u;
};
+#define STASH_INFO_INIT { \
+ .revision = STRBUF_INIT, \
+}
+
static void free_stash_info(struct stash_info *info)
{
strbuf_release(&info->revision);
@@ -157,10 +162,8 @@ static int get_stash_info(struct stash_info *info, int argc, const char **argv)
if (argc == 1)
commit = argv[0];
- strbuf_init(&info->revision, 0);
if (!commit) {
if (!ref_exists(ref_stash)) {
- free_stash_info(info);
fprintf_ln(stderr, _("No stash entries found."));
return -1;
}
@@ -174,11 +177,8 @@ static int get_stash_info(struct stash_info *info, int argc, const char **argv)
revision = info->revision.buf;
- if (get_oid(revision, &info->w_commit)) {
- error(_("%s is not a valid reference"), revision);
- free_stash_info(info);
- return -1;
- }
+ if (get_oid(revision, &info->w_commit))
+ return error(_("%s is not a valid reference"), revision);
assert_stash_like(info, revision);
@@ -197,7 +197,7 @@ static int get_stash_info(struct stash_info *info, int argc, const char **argv)
info->is_stash_ref = !strcmp(expanded_ref, ref_stash);
break;
default: /* Invalid or ambiguous */
- free_stash_info(info);
+ break;
}
free(expanded_ref);
@@ -256,8 +256,10 @@ static int reset_tree(struct object_id *i_tree, int update, int reset)
opts.src_index = &the_index;
opts.dst_index = &the_index;
opts.merge = 1;
- opts.reset = reset;
+ opts.reset = reset ? UNPACK_RESET_PROTECT_UNTRACKED : 0;
opts.update = update;
+ if (update)
+ opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
opts.fn = oneway_merge;
if (unpack_trees(nr_trees, t, &opts))
@@ -308,7 +310,7 @@ static int reset_head(void)
* API for resetting.
*/
cp.git_cmd = 1;
- strvec_push(&cp.args, "reset");
+ strvec_pushl(&cp.args, "reset", "--quiet", "--refresh", NULL);
return run_command(&cp);
}
@@ -354,7 +356,7 @@ static int restore_untracked(struct object_id *u_tree)
cp.git_cmd = 1;
strvec_push(&cp.args, "read-tree");
strvec_push(&cp.args, oid_to_hex(u_tree));
- strvec_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
+ strvec_pushf(&cp.env, "GIT_INDEX_FILE=%s",
stash_index_path.buf);
if (run_command(&cp)) {
remove_path(stash_index_path.buf);
@@ -364,7 +366,7 @@ static int restore_untracked(struct object_id *u_tree)
child_process_init(&cp);
cp.git_cmd = 1;
strvec_pushl(&cp.args, "checkout-index", "--all", NULL);
- strvec_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
+ strvec_pushf(&cp.env, "GIT_INDEX_FILE=%s",
stash_index_path.buf);
res = run_command(&cp);
@@ -490,13 +492,13 @@ static void unstage_changes_unless_new(struct object_id *orig_tree)
static int do_apply_stash(const char *prefix, struct stash_info *info,
int index, int quiet)
{
- int ret;
+ int clean, ret;
int has_index = index;
struct merge_options o;
struct object_id c_tree;
struct object_id index_tree;
- struct commit *result;
- const struct object_id *bases[1];
+ struct tree *head, *merge, *merge_base;
+ struct lock_file lock = LOCK_INIT;
read_cache_preload(NULL);
if (refresh_and_write_cache(REFRESH_QUIET, 0, 0))
@@ -539,6 +541,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
o.branch1 = "Updated upstream";
o.branch2 = "Stashed changes";
+ o.ancestor = "Stash base";
if (oideq(&info->b_tree, &c_tree))
o.branch1 = "Version stash was based on";
@@ -549,28 +552,45 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
if (o.verbosity >= 3)
printf_ln(_("Merging %s with %s"), o.branch1, o.branch2);
- bases[0] = &info->b_tree;
+ head = lookup_tree(o.repo, &c_tree);
+ merge = lookup_tree(o.repo, &info->w_tree);
+ merge_base = lookup_tree(o.repo, &info->b_tree);
- ret = merge_recursive_generic(&o, &c_tree, &info->w_tree, 1, bases,
- &result);
+ repo_hold_locked_index(o.repo, &lock, LOCK_DIE_ON_ERROR);
+ clean = merge_ort_nonrecursive(&o, head, merge, merge_base);
+
+ /*
+ * If 'clean' >= 0, reverse the value for 'ret' so 'ret' is 0 when the
+ * merge was clean, and nonzero if the merge was unclean or encountered
+ * an error.
+ */
+ ret = clean >= 0 ? !clean : clean;
+
+ if (ret < 0)
+ rollback_lock_file(&lock);
+ else if (write_locked_index(o.repo->index, &lock,
+ COMMIT_LOCK | SKIP_IF_UNCHANGED))
+ ret = error(_("could not write index"));
+
if (ret) {
rerere(0);
if (index)
fprintf_ln(stderr, _("Index was not unstashed."));
- return ret;
+ goto restore_untracked;
}
if (has_index) {
if (reset_tree(&index_tree, 0, 0))
- return -1;
+ ret = -1;
} else {
unstage_changes_unless_new(&c_tree);
}
+restore_untracked:
if (info->has_u && restore_untracked(&info->u_tree))
- return error(_("could not restore untracked files from stash"));
+ ret = error(_("could not restore untracked files from stash"));
if (!quiet) {
struct child_process cp = CHILD_PROCESS_INIT;
@@ -582,23 +602,23 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
*/
cp.git_cmd = 1;
cp.dir = prefix;
- strvec_pushf(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT"=%s",
+ strvec_pushf(&cp.env, GIT_WORK_TREE_ENVIRONMENT"=%s",
absolute_path(get_git_work_tree()));
- strvec_pushf(&cp.env_array, GIT_DIR_ENVIRONMENT"=%s",
+ strvec_pushf(&cp.env, GIT_DIR_ENVIRONMENT"=%s",
absolute_path(get_git_dir()));
strvec_push(&cp.args, "status");
run_command(&cp);
}
- return 0;
+ return ret;
}
static int apply_stash(int argc, const char **argv, const char *prefix)
{
- int ret;
+ int ret = -1;
int quiet = 0;
int index = 0;
- struct stash_info info;
+ struct stash_info info = STASH_INFO_INIT;
struct option options[] = {
OPT__QUIET(&quiet, N_("be quiet, only report errors")),
OPT_BOOL(0, "index", &index,
@@ -610,9 +630,10 @@ static int apply_stash(int argc, const char **argv, const char *prefix)
git_stash_apply_usage, 0);
if (get_stash_info(&info, argc, argv))
- return -1;
+ goto cleanup;
ret = do_apply_stash(prefix, &info, index, quiet);
+cleanup:
free_stash_info(&info);
return ret;
}
@@ -631,20 +652,9 @@ static int reflog_is_empty(const char *refname)
static int do_drop_stash(struct stash_info *info, int quiet)
{
- int ret;
- struct child_process cp_reflog = CHILD_PROCESS_INIT;
-
- /*
- * reflog does not provide a simple function for deleting refs. One will
- * need to be added to avoid implementing too much reflog code here
- */
-
- cp_reflog.git_cmd = 1;
- strvec_pushl(&cp_reflog.args, "reflog", "delete", "--updateref",
- "--rewrite", NULL);
- strvec_push(&cp_reflog.args, info->revision.buf);
- ret = run_command(&cp_reflog);
- if (!ret) {
+ if (!reflog_delete(info->revision.buf,
+ EXPIRE_REFLOGS_REWRITE | EXPIRE_REFLOGS_UPDATE_REF,
+ 0)) {
if (!quiet)
printf_ln(_("Dropped %s (%s)"), info->revision.buf,
oid_to_hex(&info->w_commit));
@@ -659,20 +669,25 @@ static int do_drop_stash(struct stash_info *info, int quiet)
return 0;
}
-static void assert_stash_ref(struct stash_info *info)
+static int get_stash_info_assert(struct stash_info *info, int argc,
+ const char **argv)
{
- if (!info->is_stash_ref) {
- error(_("'%s' is not a stash reference"), info->revision.buf);
- free_stash_info(info);
- exit(1);
- }
+ int ret = get_stash_info(info, argc, argv);
+
+ if (ret < 0)
+ return ret;
+
+ if (!info->is_stash_ref)
+ return error(_("'%s' is not a stash reference"), info->revision.buf);
+
+ return 0;
}
static int drop_stash(int argc, const char **argv, const char *prefix)
{
- int ret;
+ int ret = -1;
int quiet = 0;
- struct stash_info info;
+ struct stash_info info = STASH_INFO_INIT;
struct option options[] = {
OPT__QUIET(&quiet, N_("be quiet, only report errors")),
OPT_END()
@@ -681,22 +696,21 @@ static int drop_stash(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options,
git_stash_drop_usage, 0);
- if (get_stash_info(&info, argc, argv))
- return -1;
-
- assert_stash_ref(&info);
+ if (get_stash_info_assert(&info, argc, argv))
+ goto cleanup;
ret = do_drop_stash(&info, quiet);
+cleanup:
free_stash_info(&info);
return ret;
}
static int pop_stash(int argc, const char **argv, const char *prefix)
{
- int ret;
+ int ret = -1;
int index = 0;
int quiet = 0;
- struct stash_info info;
+ struct stash_info info = STASH_INFO_INIT;
struct option options[] = {
OPT__QUIET(&quiet, N_("be quiet, only report errors")),
OPT_BOOL(0, "index", &index,
@@ -707,25 +721,25 @@ static int pop_stash(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options,
git_stash_pop_usage, 0);
- if (get_stash_info(&info, argc, argv))
- return -1;
+ if (get_stash_info_assert(&info, argc, argv))
+ goto cleanup;
- assert_stash_ref(&info);
if ((ret = do_apply_stash(prefix, &info, index, quiet)))
printf_ln(_("The stash entry is kept in case "
"you need it again."));
else
ret = do_drop_stash(&info, quiet);
+cleanup:
free_stash_info(&info);
return ret;
}
static int branch_stash(int argc, const char **argv, const char *prefix)
{
- int ret;
+ int ret = -1;
const char *branch = NULL;
- struct stash_info info;
+ struct stash_info info = STASH_INFO_INIT;
struct child_process cp = CHILD_PROCESS_INIT;
struct option options[] = {
OPT_END()
@@ -742,7 +756,7 @@ static int branch_stash(int argc, const char **argv, const char *prefix)
branch = argv[0];
if (get_stash_info(&info, argc - 1, argv + 1))
- return -1;
+ goto cleanup;
cp.git_cmd = 1;
strvec_pushl(&cp.args, "checkout", "-b", NULL);
@@ -754,8 +768,8 @@ static int branch_stash(int argc, const char **argv, const char *prefix)
if (!ret && info.is_stash_ref)
ret = do_drop_stash(&info, 0);
+cleanup:
free_stash_info(&info);
-
return ret;
}
@@ -785,7 +799,6 @@ static int list_stash(int argc, const char **argv, const char *prefix)
static int show_stat = 1;
static int show_patch;
static int show_include_untracked;
-static int use_legacy_stash;
static int git_stash_config(const char *var, const char *value, void *cb)
{
@@ -801,10 +814,6 @@ static int git_stash_config(const char *var, const char *value, void *cb)
show_include_untracked = git_config_bool(var, value);
return 0;
}
- if (!strcmp(var, "stash.usebuiltin")) {
- use_legacy_stash = !git_config_bool(var, value);
- return 0;
- }
return git_diff_basic_config(var, value, cb);
}
@@ -838,8 +847,8 @@ static void diff_include_untracked(const struct stash_info *info, struct diff_op
static int show_stash(int argc, const char **argv, const char *prefix)
{
int i;
- int ret = 0;
- struct stash_info info;
+ int ret = -1;
+ struct stash_info info = STASH_INFO_INIT;
struct rev_info rev;
struct strvec stash_args = STRVEC_INIT;
struct strvec revision_args = STRVEC_INIT;
@@ -857,6 +866,7 @@ static int show_stash(int argc, const char **argv, const char *prefix)
UNTRACKED_ONLY, PARSE_OPT_NONEG),
OPT_END()
};
+ int do_usage = 0;
init_diff_ui_defaults();
git_config(git_diff_ui_config, NULL);
@@ -874,10 +884,8 @@ static int show_stash(int argc, const char **argv, const char *prefix)
strvec_push(&revision_args, argv[i]);
}
- ret = get_stash_info(&info, stash_args.nr, stash_args.v);
- strvec_clear(&stash_args);
- if (ret)
- return -1;
+ if (get_stash_info(&info, stash_args.nr, stash_args.v))
+ goto cleanup;
/*
* The config settings are applied only if there are not passed
@@ -891,16 +899,14 @@ static int show_stash(int argc, const char **argv, const char *prefix)
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
if (!show_stat && !show_patch) {
- free_stash_info(&info);
- return 0;
+ ret = 0;
+ goto cleanup;
}
}
argc = setup_revisions(revision_args.nr, revision_args.v, &rev, NULL);
- if (argc > 1) {
- free_stash_info(&info);
- usage_with_options(git_stash_show_usage, options);
- }
+ if (argc > 1)
+ goto usage;
if (!rev.diffopt.output_format) {
rev.diffopt.output_format = DIFF_FORMAT_PATCH;
diff_setup_done(&rev.diffopt);
@@ -925,8 +931,17 @@ static int show_stash(int argc, const char **argv, const char *prefix)
}
log_tree_diff_flush(&rev);
+ ret = diff_result_code(&rev.diffopt, 0);
+cleanup:
+ strvec_clear(&stash_args);
free_stash_info(&info);
- return diff_result_code(&rev.diffopt, 0);
+ release_revisions(&rev);
+ if (do_usage)
+ usage_with_options(git_stash_show_usage, options);
+ return ret;
+usage:
+ do_usage = 1;
+ goto cleanup;
}
static int do_store_stash(const struct object_id *w_commit, const char *stash_msg,
@@ -1060,7 +1075,6 @@ static int check_changes_tracked_files(const struct pathspec *ps)
goto done;
}
- object_array_clear(&rev.pending);
result = run_diff_files(&rev, 0);
if (diff_result_code(&rev.diffopt, result)) {
ret = 1;
@@ -1068,7 +1082,7 @@ static int check_changes_tracked_files(const struct pathspec *ps)
}
done:
- clear_pathspec(&rev.prune_data);
+ release_revisions(&rev);
return ret;
}
@@ -1101,7 +1115,7 @@ static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
cp_upd_index.git_cmd = 1;
strvec_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
"--remove", "--stdin", NULL);
- strvec_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
+ strvec_pushf(&cp_upd_index.env, "GIT_INDEX_FILE=%s",
stash_index_path.buf);
strbuf_addf(&untracked_msg, "untracked files on %s\n", msg->buf);
@@ -1130,6 +1144,38 @@ static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
return ret;
}
+static int stash_staged(struct stash_info *info, struct strbuf *out_patch,
+ int quiet)
+{
+ int ret = 0;
+ struct child_process cp_diff_tree = CHILD_PROCESS_INIT;
+ struct index_state istate = { NULL };
+
+ if (write_index_as_tree(&info->w_tree, &istate, the_repository->index_file,
+ 0, NULL)) {
+ ret = -1;
+ goto done;
+ }
+
+ cp_diff_tree.git_cmd = 1;
+ strvec_pushl(&cp_diff_tree.args, "diff-tree", "-p", "-U1", "HEAD",
+ oid_to_hex(&info->w_tree), "--", NULL);
+ if (pipe_command(&cp_diff_tree, NULL, 0, out_patch, 0, NULL, 0)) {
+ ret = -1;
+ goto done;
+ }
+
+ if (!out_patch->len) {
+ if (!quiet)
+ fprintf_ln(stderr, _("No staged changes"));
+ ret = 1;
+ }
+
+done:
+ discard_index(&istate);
+ return ret;
+}
+
static int stash_patch(struct stash_info *info, const struct pathspec *ps,
struct strbuf *out_patch, int quiet)
{
@@ -1143,7 +1189,7 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps,
cp_read_tree.git_cmd = 1;
strvec_pushl(&cp_read_tree.args, "read-tree", "HEAD", NULL);
- strvec_pushf(&cp_read_tree.env_array, "GIT_INDEX_FILE=%s",
+ strvec_pushf(&cp_read_tree.env, "GIT_INDEX_FILE=%s",
stash_index_path.buf);
if (run_command(&cp_read_tree)) {
ret = -1;
@@ -1230,7 +1276,7 @@ static int stash_working_tree(struct stash_info *info, const struct pathspec *ps
strvec_pushl(&cp_upd_index.args, "update-index",
"--ignore-skip-worktree-entries",
"-z", "--add", "--remove", "--stdin", NULL);
- strvec_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
+ strvec_pushf(&cp_upd_index.env, "GIT_INDEX_FILE=%s",
stash_index_path.buf);
if (pipe_command(&cp_upd_index, diff_output.buf, diff_output.len,
@@ -1247,16 +1293,14 @@ static int stash_working_tree(struct stash_info *info, const struct pathspec *ps
done:
discard_index(&istate);
- UNLEAK(rev);
- object_array_clear(&rev.pending);
- clear_pathspec(&rev.prune_data);
+ release_revisions(&rev);
strbuf_release(&diff_output);
remove_path(stash_index_path.buf);
return ret;
}
static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_buf,
- int include_untracked, int patch_mode,
+ int include_untracked, int patch_mode, int only_staged,
struct stash_info *info, struct strbuf *patch,
int quiet)
{
@@ -1297,7 +1341,7 @@ static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_b
branch_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flags);
if (flags & REF_ISSYMREF)
- branch_name = strrchr(branch_ref, '/') + 1;
+ skip_prefix(branch_ref, "refs/heads/", &branch_name);
head_short_sha1 = find_unique_abbrev(&head_commit->object.oid,
DEFAULT_ABBREV);
strbuf_addf(&msg, "%s: %s ", branch_name, head_short_sha1);
@@ -1335,6 +1379,16 @@ static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_b
} else if (ret > 0) {
goto done;
}
+ } else if (only_staged) {
+ ret = stash_staged(info, patch, quiet);
+ if (ret < 0) {
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot save the current "
+ "staged state"));
+ goto done;
+ } else if (ret > 0) {
+ goto done;
+ }
} else {
if (stash_working_tree(info, ps)) {
if (!quiet)
@@ -1381,9 +1435,9 @@ static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_b
static int create_stash(int argc, const char **argv, const char *prefix)
{
- int ret = 0;
+ int ret;
struct strbuf stash_msg_buf = STRBUF_INIT;
- struct stash_info info;
+ struct stash_info info = STASH_INFO_INIT;
struct pathspec ps;
/* Starting with argv[1], since argv[0] is "create" */
@@ -1393,20 +1447,21 @@ static int create_stash(int argc, const char **argv, const char *prefix)
if (!check_changes_tracked_files(&ps))
return 0;
- ret = do_create_stash(&ps, &stash_msg_buf, 0, 0, &info,
+ ret = do_create_stash(&ps, &stash_msg_buf, 0, 0, 0, &info,
NULL, 0);
if (!ret)
printf_ln("%s", oid_to_hex(&info.w_commit));
+ free_stash_info(&info);
strbuf_release(&stash_msg_buf);
return ret;
}
static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int quiet,
- int keep_index, int patch_mode, int include_untracked)
+ int keep_index, int patch_mode, int include_untracked, int only_staged)
{
int ret = 0;
- struct stash_info info;
+ struct stash_info info = STASH_INFO_INIT;
struct strbuf patch = STRBUF_INIT;
struct strbuf stash_msg_buf = STRBUF_INIT;
struct strbuf untracked_files = STRBUF_INIT;
@@ -1421,6 +1476,17 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
goto done;
}
+ /* --patch overrides --staged */
+ if (patch_mode)
+ only_staged = 0;
+
+ if (only_staged && include_untracked) {
+ fprintf_ln(stderr, _("Can't use --staged and --include-untracked"
+ " or --all at the same time"));
+ ret = -1;
+ goto done;
+ }
+
read_cache_preload(NULL);
if (!include_untracked && ps->nr) {
int i;
@@ -1461,7 +1527,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
if (stash_msg)
strbuf_addstr(&stash_msg_buf, stash_msg);
- if (do_create_stash(ps, &stash_msg_buf, include_untracked, patch_mode,
+ if (do_create_stash(ps, &stash_msg_buf, include_untracked, patch_mode, only_staged,
&info, &patch, quiet)) {
ret = -1;
goto done;
@@ -1478,13 +1544,19 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
printf_ln(_("Saved working directory and index state %s"),
stash_msg_buf.buf);
- if (!patch_mode) {
+ if (!(patch_mode || only_staged)) {
if (include_untracked && !ps->nr) {
struct child_process cp = CHILD_PROCESS_INIT;
cp.git_cmd = 1;
+ if (startup_info->original_cwd) {
+ cp.dir = startup_info->original_cwd;
+ strvec_pushf(&cp.env, "%s=%s",
+ GIT_WORK_TREE_ENVIRONMENT,
+ the_repository->worktree);
+ }
strvec_pushl(&cp.args, "clean", "--force",
- "--quiet", "-d", NULL);
+ "--quiet", "-d", ":/", NULL);
if (include_untracked == INCLUDE_ALL_FILES)
strvec_push(&cp.args, "-x");
if (run_command(&cp)) {
@@ -1533,6 +1605,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
} else {
struct child_process cp = CHILD_PROCESS_INIT;
cp.git_cmd = 1;
+ /* BUG: this nukes untracked files in the way */
strvec_pushl(&cp.args, "reset", "--hard", "-q",
"--no-recurse-submodules", NULL);
if (run_command(&cp)) {
@@ -1575,7 +1648,8 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
struct child_process cp = CHILD_PROCESS_INIT;
cp.git_cmd = 1;
- strvec_pushl(&cp.args, "reset", "-q", "--", NULL);
+ strvec_pushl(&cp.args, "reset", "-q", "--refresh", "--",
+ NULL);
add_pathspecs(&cp.args, ps);
if (run_command(&cp)) {
ret = -1;
@@ -1586,6 +1660,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
}
done:
+ free_stash_info(&info);
strbuf_release(&stash_msg_buf);
return ret;
}
@@ -1595,6 +1670,7 @@ static int push_stash(int argc, const char **argv, const char *prefix,
{
int force_assume = 0;
int keep_index = -1;
+ int only_staged = 0;
int patch_mode = 0;
int include_untracked = 0;
int quiet = 0;
@@ -1605,6 +1681,8 @@ static int push_stash(int argc, const char **argv, const char *prefix,
struct option options[] = {
OPT_BOOL('k', "keep-index", &keep_index,
N_("keep index")),
+ OPT_BOOL('S', "staged", &only_staged,
+ N_("stash staged changes only")),
OPT_BOOL('p', "patch", &patch_mode,
N_("stash in patch mode")),
OPT__QUIET(&quiet, N_("quiet mode")),
@@ -1622,6 +1700,7 @@ static int push_stash(int argc, const char **argv, const char *prefix,
if (argc) {
force_assume = !strcmp(argv[0], "-p");
argc = parse_options(argc, argv, prefix, options,
+ push_assumed ? git_stash_usage :
git_stash_push_usage,
PARSE_OPT_KEEP_DASHDASH);
}
@@ -1641,25 +1720,29 @@ static int push_stash(int argc, const char **argv, const char *prefix,
if (pathspec_from_file) {
if (patch_mode)
- die(_("--pathspec-from-file is incompatible with --patch"));
+ die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
+
+ if (only_staged)
+ die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--staged");
if (ps.nr)
- die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+ die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
parse_pathspec_file(&ps, 0,
PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN,
prefix, pathspec_from_file, pathspec_file_nul);
} else if (pathspec_file_nul) {
- die(_("--pathspec-file-nul requires --pathspec-from-file"));
+ die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
}
return do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode,
- include_untracked);
+ include_untracked, only_staged);
}
static int save_stash(int argc, const char **argv, const char *prefix)
{
int keep_index = -1;
+ int only_staged = 0;
int patch_mode = 0;
int include_untracked = 0;
int quiet = 0;
@@ -1670,6 +1753,8 @@ static int save_stash(int argc, const char **argv, const char *prefix)
struct option options[] = {
OPT_BOOL('k', "keep-index", &keep_index,
N_("keep index")),
+ OPT_BOOL('S', "staged", &only_staged,
+ N_("stash staged changes only")),
OPT_BOOL('p', "patch", &patch_mode,
N_("stash in patch mode")),
OPT__QUIET(&quiet, N_("quiet mode")),
@@ -1691,7 +1776,7 @@ static int save_stash(int argc, const char **argv, const char *prefix)
memset(&ps, 0, sizeof(ps));
ret = do_push_stash(&ps, stash_msg, quiet, keep_index,
- patch_mode, include_untracked);
+ patch_mode, include_untracked, only_staged);
strbuf_release(&stash_msg_buf);
return ret;
@@ -1709,14 +1794,12 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
git_config(git_stash_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);
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
index_file = get_index_file();
strbuf_addf(&stash_index_path, "%s.stash.%" PRIuMAX, index_file,
(uintmax_t)pid);
@@ -1746,8 +1829,8 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
else if (!strcmp(argv[0], "save"))
return !!save_stash(argc, argv, prefix);
else if (*argv[0] != '-')
- usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]),
- git_stash_usage, options);
+ usage_msg_optf(_("unknown subcommand: %s"),
+ git_stash_usage, options, argv[0]);
/* Assume 'stash push' */
strvec_push(&args, "push");
diff --git a/builtin/stripspace.c b/builtin/stripspace.c
index be33eb8..1e34cf2 100644
--- a/builtin/stripspace.c
+++ b/builtin/stripspace.c
@@ -15,8 +15,8 @@ static void comment_lines(struct strbuf *buf)
}
static const char * const stripspace_usage[] = {
- N_("git stripspace [-s | --strip-comments]"),
- N_("git stripspace [-c | --comment-lines]"),
+ "git stripspace [-s | --strip-comments]",
+ "git stripspace [-c | --comment-lines]",
NULL
};
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index d574d65..5c77dfc 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -20,6 +20,8 @@
#include "diff.h"
#include "object-store.h"
#include "advice.h"
+#include "branch.h"
+#include "list-objects-filter-options.h"
#define OPT_QUIET (1 << 0)
#define OPT_CACHED (1 << 1)
@@ -29,11 +31,13 @@
typedef void (*each_submodule_fn)(const struct cache_entry *list_item,
void *cb_data);
-static char *get_default_remote(void)
+static char *repo_get_default_remote(struct repository *repo)
{
char *dest = NULL, *ret;
struct strbuf sb = STRBUF_INIT;
- const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
+ struct ref_store *store = get_main_ref_store(repo);
+ const char *refname = refs_resolve_ref_unsafe(store, "HEAD", 0, NULL,
+ NULL);
if (!refname)
die(_("No such ref: %s"), "HEAD");
@@ -46,7 +50,7 @@ static char *get_default_remote(void)
die(_("Expecting a full ref name, got %s"), refname);
strbuf_addf(&sb, "branch.%s.remote", refname);
- if (git_config_get_string(sb.buf, &dest))
+ if (repo_config_get_string(repo, sb.buf, &dest))
ret = xstrdup("origin");
else
ret = dest;
@@ -55,148 +59,17 @@ static char *get_default_remote(void)
return ret;
}
-static int print_default_remote(int argc, const char **argv, const char *prefix)
+static char *get_default_remote_submodule(const char *module_path)
{
- char *remote;
+ struct repository subrepo;
- if (argc != 1)
- die(_("submodule--helper print-default-remote takes no arguments"));
-
- remote = get_default_remote();
- if (remote)
- printf("%s\n", remote);
-
- free(remote);
- return 0;
+ repo_submodule_init(&subrepo, the_repository, module_path, null_oid());
+ return repo_get_default_remote(&subrepo);
}
-static int starts_with_dot_slash(const char *str)
+static char *get_default_remote(void)
{
- return str[0] == '.' && is_dir_sep(str[1]);
-}
-
-static int starts_with_dot_dot_slash(const char *str)
-{
- return str[0] == '.' && str[1] == '.' && is_dir_sep(str[2]);
-}
-
-/*
- * Returns 1 if it was the last chop before ':'.
- */
-static int chop_last_dir(char **remoteurl, int is_relative)
-{
- char *rfind = find_last_dir_sep(*remoteurl);
- if (rfind) {
- *rfind = '\0';
- return 0;
- }
-
- rfind = strrchr(*remoteurl, ':');
- if (rfind) {
- *rfind = '\0';
- return 1;
- }
-
- if (is_relative || !strcmp(".", *remoteurl))
- die(_("cannot strip one component off url '%s'"),
- *remoteurl);
-
- free(*remoteurl);
- *remoteurl = xstrdup(".");
- return 0;
-}
-
-/*
- * The `url` argument is the URL that navigates to the submodule origin
- * repo. When relative, this URL is relative to the superproject origin
- * URL repo. The `up_path` argument, if specified, is the relative
- * path that navigates from the submodule working tree to the superproject
- * working tree. Returns the origin URL of the submodule.
- *
- * Return either an absolute URL or filesystem path (if the superproject
- * origin URL is an absolute URL or filesystem path, respectively) or a
- * relative file system path (if the superproject origin URL is a relative
- * file system path).
- *
- * When the output is a relative file system path, the path is either
- * relative to the submodule working tree, if up_path is specified, or to
- * the superproject working tree otherwise.
- *
- * NEEDSWORK: This works incorrectly on the domain and protocol part.
- * remote_url url outcome expectation
- * http://a.com/b ../c http://a.com/c as is
- * http://a.com/b/ ../c http://a.com/c same as previous line, but
- * ignore trailing slash in url
- * http://a.com/b ../../c http://c error out
- * http://a.com/b ../../../c http:/c error out
- * http://a.com/b ../../../../c http:c error out
- * http://a.com/b ../../../../../c .:c error out
- * NEEDSWORK: Given how chop_last_dir() works, this function is broken
- * when a local part has a colon in its path component, too.
- */
-static char *relative_url(const char *remote_url,
- const char *url,
- const char *up_path)
-{
- int is_relative = 0;
- int colonsep = 0;
- char *out;
- char *remoteurl = xstrdup(remote_url);
- struct strbuf sb = STRBUF_INIT;
- size_t len = strlen(remoteurl);
-
- if (is_dir_sep(remoteurl[len-1]))
- remoteurl[len-1] = '\0';
-
- if (!url_is_local_not_ssh(remoteurl) || is_absolute_path(remoteurl))
- is_relative = 0;
- else {
- is_relative = 1;
- /*
- * Prepend a './' to ensure all relative
- * remoteurls start with './' or '../'
- */
- if (!starts_with_dot_slash(remoteurl) &&
- !starts_with_dot_dot_slash(remoteurl)) {
- strbuf_reset(&sb);
- strbuf_addf(&sb, "./%s", remoteurl);
- free(remoteurl);
- remoteurl = strbuf_detach(&sb, NULL);
- }
- }
- /*
- * When the url starts with '../', remove that and the
- * last directory in remoteurl.
- */
- while (url) {
- if (starts_with_dot_dot_slash(url)) {
- url += 3;
- colonsep |= chop_last_dir(&remoteurl, is_relative);
- } else if (starts_with_dot_slash(url))
- url += 2;
- else
- break;
- }
- strbuf_reset(&sb);
- strbuf_addf(&sb, "%s%s%s", remoteurl, colonsep ? ":" : "/", url);
- if (ends_with(url, "/"))
- strbuf_setlen(&sb, sb.len - 1);
- free(remoteurl);
-
- if (starts_with_dot_slash(sb.buf))
- out = xstrdup(sb.buf + 2);
- else
- out = xstrdup(sb.buf);
-
- if (!up_path || !is_relative) {
- strbuf_release(&sb);
- return out;
- }
-
- strbuf_reset(&sb);
- strbuf_addf(&sb, "%s%s", up_path, out);
- free(out);
- return strbuf_detach(&sb, NULL);
+ return repo_get_default_remote(the_repository);
}
static char *resolve_relative_url(const char *rel_url, const char *up_path, int quiet)
@@ -245,11 +118,10 @@ static int resolve_relative_url_test(int argc, const char **argv, const char *pr
return 0;
}
-/* the result should be freed by the caller. */
-static char *get_submodule_displaypath(const char *path, const char *prefix)
+static char *do_get_submodule_displaypath(const char *path,
+ const char *prefix,
+ const char *super_prefix)
{
- const char *super_prefix = get_super_prefix();
-
if (prefix && super_prefix) {
BUG("cannot have prefix '%s' and superprefix '%s'",
prefix, super_prefix);
@@ -265,6 +137,13 @@ static char *get_submodule_displaypath(const char *path, const char *prefix)
}
}
+/* the result should be freed by the caller. */
+static char *get_submodule_displaypath(const char *path, const char *prefix)
+{
+ const char *super_prefix = get_super_prefix();
+ return do_get_submodule_displaypath(path, prefix, super_prefix);
+}
+
static char *compute_rev_name(const char *sub_path, const char* object_id)
{
struct strbuf sb = STRBUF_INIT;
@@ -284,7 +163,7 @@ static char *compute_rev_name(const char *sub_path, const char* object_id)
for (d = describe_argv; *d; d++) {
struct child_process cp = CHILD_PROCESS_INIT;
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.dir = sub_path;
cp.git_cmd = 1;
cp.no_stderr = 1;
@@ -471,7 +350,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
if (!is_submodule_populated_gently(path, NULL))
goto cleanup;
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
/*
* For the purpose of executing <command> in the submodule,
@@ -491,12 +370,12 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
char *toplevel = xgetcwd();
struct strbuf sb = STRBUF_INIT;
- strvec_pushf(&cp.env_array, "name=%s", sub->name);
- strvec_pushf(&cp.env_array, "sm_path=%s", path);
- strvec_pushf(&cp.env_array, "displaypath=%s", displaypath);
- strvec_pushf(&cp.env_array, "sha1=%s",
+ strvec_pushf(&cp.env, "name=%s", sub->name);
+ strvec_pushf(&cp.env, "sm_path=%s", path);
+ strvec_pushf(&cp.env, "displaypath=%s", displaypath);
+ strvec_pushf(&cp.env, "sha1=%s",
oid_to_hex(ce_oid));
- strvec_pushf(&cp.env_array, "toplevel=%s", toplevel);
+ strvec_pushf(&cp.env, "toplevel=%s", toplevel);
/*
* Since the path variable was accessible from the script
@@ -505,7 +384,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
* on windows. And since environment variables are
* case-insensitive in windows, it interferes with the
* existing PATH variable. Hence, to avoid that, we expose
- * path via the args strvec and not via env_array.
+ * path via the args strvec and not via env.
*/
sq_quote_buf(&sb, path);
strvec_pushf(&cp.args, "path=%s; %s",
@@ -528,7 +407,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
cpr.git_cmd = 1;
cpr.dir = path;
- prepare_submodule_repo_env(&cpr.env_array);
+ prepare_submodule_repo_env(&cpr.env);
strvec_pushl(&cpr.args, "--super-prefix", NULL);
strvec_pushf(&cpr.args, "%s/", displaypath);
@@ -584,20 +463,36 @@ static int module_foreach(int argc, const char **argv, const char *prefix)
return 0;
}
+static int starts_with_dot_slash(const char *const path)
+{
+ return path_match_flags(path, PATH_MATCH_STARTS_WITH_DOT_SLASH |
+ PATH_MATCH_XPLATFORM);
+}
+
+static int starts_with_dot_dot_slash(const char *const path)
+{
+ return path_match_flags(path, PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH |
+ PATH_MATCH_XPLATFORM);
+}
+
struct init_cb {
const char *prefix;
+ const char *superprefix;
unsigned int flags;
};
#define INIT_CB_INIT { 0 }
static void init_submodule(const char *path, const char *prefix,
- unsigned int flags)
+ const char *superprefix, unsigned int flags)
{
const struct submodule *sub;
struct strbuf sb = STRBUF_INIT;
char *upd = NULL, *url = NULL, *displaypath;
- displaypath = get_submodule_displaypath(path, prefix);
+ /* try superprefix from the environment, if it is not passed explicitly */
+ if (!superprefix)
+ superprefix = get_super_prefix();
+ displaypath = do_get_submodule_displaypath(path, prefix, superprefix);
sub = submodule_from_path(the_repository, null_oid(), path);
@@ -671,7 +566,7 @@ static void init_submodule(const char *path, const char *prefix,
static void init_submodule_cb(const struct cache_entry *list_item, void *cb_data)
{
struct init_cb *info = cb_data;
- init_submodule(list_item->name, info->prefix, info->flags);
+ init_submodule(list_item->name, info->prefix, info->superprefix, info->flags);
}
static int module_init(int argc, const char **argv, const char *prefix)
@@ -754,7 +649,7 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
{
char *displaypath;
struct strvec diff_files_args = STRVEC_INIT;
- struct rev_info rev;
+ struct rev_info rev = REV_INFO_INIT;
int diff_files_result;
struct strbuf buf = STRBUF_INIT;
const char *git_dir;
@@ -821,7 +716,7 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
cpr.git_cmd = 1;
cpr.dir = path;
- prepare_submodule_repo_env(&cpr.env_array);
+ prepare_submodule_repo_env(&cpr.env);
strvec_push(&cpr.args, "--super-prefix");
strvec_pushf(&cpr.args, "%s/", displaypath);
@@ -841,6 +736,7 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
cleanup:
strvec_clear(&diff_files_args);
free(displaypath);
+ release_revisions(&rev);
}
static void status_submodule_cb(const struct cache_entry *list_item,
@@ -943,7 +839,7 @@ static char *verify_submodule_committish(const char *sm_path,
cp_rev_parse.git_cmd = 1;
cp_rev_parse.dir = sm_path;
- prepare_submodule_repo_env(&cp_rev_parse.env_array);
+ prepare_submodule_repo_env(&cp_rev_parse.env);
strvec_pushl(&cp_rev_parse.args, "rev-parse", "-q", "--short", NULL);
strvec_pushf(&cp_rev_parse.args, "%s^0", committish);
strvec_push(&cp_rev_parse.args, "--");
@@ -984,7 +880,7 @@ static void print_submodule_summary(struct summary_cb *info, char *errmsg,
cp_log.git_cmd = 1;
cp_log.dir = p->sm_path;
- prepare_submodule_repo_env(&cp_log.env_array);
+ prepare_submodule_repo_env(&cp_log.env);
strvec_pushl(&cp_log.args, "log", NULL);
if (S_ISGITLINK(p->mod_src) && S_ISGITLINK(p->mod_dst)) {
@@ -1101,7 +997,7 @@ static void generate_submodule_summary(struct summary_cb *info,
cp_rev_list.git_cmd = 1;
cp_rev_list.dir = p->sm_path;
- prepare_submodule_repo_env(&cp_rev_list.env_array);
+ prepare_submodule_repo_env(&cp_rev_list.env);
if (!capture_command(&cp_rev_list, &sb_rev_list, 0))
total_commits = atoi(sb_rev_list.buf);
@@ -1219,6 +1115,7 @@ static int compute_summary_module_list(struct object_id *head_oid,
struct strvec diff_args = STRVEC_INIT;
struct rev_info rev;
struct module_cb_list list = MODULE_CB_LIST_INIT;
+ int ret = 0;
strvec_push(&diff_args, get_diff_cmd(diff_cmd));
if (info->cached)
@@ -1244,11 +1141,13 @@ static int compute_summary_module_list(struct object_id *head_oid,
setup_work_tree();
if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
perror("read_cache_preload");
- return -1;
+ ret = -1;
+ goto cleanup;
}
} else if (read_cache() < 0) {
perror("read_cache");
- return -1;
+ ret = -1;
+ goto cleanup;
}
if (diff_cmd == DIFF_INDEX)
@@ -1256,8 +1155,10 @@ static int compute_summary_module_list(struct object_id *head_oid,
else
run_diff_files(&rev, 0);
prepare_submodule_summary(info, &list);
+cleanup:
strvec_clear(&diff_args);
- return 0;
+ release_revisions(&rev);
+ return ret;
}
static int module_summary(int argc, const char **argv, const char *prefix)
@@ -1313,7 +1214,7 @@ static int module_summary(int argc, const char **argv, const char *prefix)
if (files) {
if (cached)
- die(_("--cached and --files are mutually exclusive"));
+ die(_("options '%s' and '%s' cannot be used together"), "--cached", "--files");
diff_cmd = DIFF_FILES;
}
@@ -1341,9 +1242,8 @@ static void sync_submodule(const char *path, const char *prefix,
{
const struct submodule *sub;
char *remote_key = NULL;
- char *sub_origin_url, *super_config_url, *displaypath;
+ char *sub_origin_url, *super_config_url, *displaypath, *default_remote;
struct strbuf sb = STRBUF_INIT;
- struct child_process cp = CHILD_PROCESS_INIT;
char *sub_config_path = NULL;
if (!is_submodule_active(the_repository, path))
@@ -1382,21 +1282,15 @@ static void sync_submodule(const char *path, const char *prefix,
if (!is_submodule_populated_gently(path, NULL))
goto cleanup;
- prepare_submodule_repo_env(&cp.env_array);
- cp.git_cmd = 1;
- cp.dir = path;
- strvec_pushl(&cp.args, "submodule--helper",
- "print-default-remote", NULL);
-
strbuf_reset(&sb);
- if (capture_command(&cp, &sb, 0))
+ default_remote = get_default_remote_submodule(path);
+ if (!default_remote)
die(_("failed to get the default remote for submodule '%s'"),
path);
- strbuf_strip_suffix(&sb, "\n");
- remote_key = xstrfmt("remote.%s.url", sb.buf);
+ remote_key = xstrfmt("remote.%s.url", default_remote);
+ free(default_remote);
- strbuf_reset(&sb);
submodule_to_gitdir(&sb, path);
strbuf_addstr(&sb, "/config");
@@ -1409,7 +1303,7 @@ static void sync_submodule(const char *path, const char *prefix,
cpr.git_cmd = 1;
cpr.dir = path;
- prepare_submodule_repo_env(&cpr.env_array);
+ prepare_submodule_repo_env(&cpr.env);
strvec_push(&cpr.args, "--super-prefix");
strvec_pushf(&cpr.args, "%s/", displaypath);
@@ -1503,16 +1397,17 @@ static void deinit_submodule(const char *path, const char *prefix,
struct strbuf sb_rm = STRBUF_INIT;
const char *format;
- /*
- * protect submodules containing a .git directory
- * NEEDSWORK: instead of dying, automatically call
- * absorbgitdirs and (possibly) warn.
- */
- if (is_directory(sub_git_dir))
- die(_("Submodule work tree '%s' contains a .git "
- "directory (use 'rm -rf' if you really want "
- "to remove it including all of its history)"),
- displaypath);
+ if (is_directory(sub_git_dir)) {
+ if (!(flags & OPT_QUIET))
+ warning(_("Submodule work tree '%s' contains a .git "
+ "directory. This will be replaced with a "
+ ".git file by using absorbgitdirs."),
+ displaypath);
+
+ absorb_git_dir_into_superproject(path,
+ ABSORB_GITDIR_RECURSE_SUBMODULES);
+
+ }
if (!(flags & OPT_FORCE)) {
struct child_process cp_rm = CHILD_PROCESS_INIT;
@@ -1629,6 +1524,7 @@ struct module_clone_data {
const char *name;
const char *url;
const char *depth;
+ struct list_objects_filter_options *filter_options;
struct string_list reference;
unsigned int quiet: 1;
unsigned int progress: 1;
@@ -1636,7 +1532,10 @@ struct module_clone_data {
unsigned int require_init: 1;
int single_branch;
};
-#define MODULE_CLONE_DATA_INIT { .reference = STRING_LIST_INIT_NODUP, .single_branch = -1 }
+#define MODULE_CLONE_DATA_INIT { \
+ .reference = STRING_LIST_INIT_NODUP, \
+ .single_branch = -1, \
+}
struct submodule_alternate_setup {
const char *submodule_name;
@@ -1795,6 +1694,10 @@ static int clone_submodule(struct module_clone_data *clone_data)
strvec_push(&cp.args, "--dissociate");
if (sm_gitdir && *sm_gitdir)
strvec_pushl(&cp.args, "--separate-git-dir", sm_gitdir, NULL);
+ if (clone_data->filter_options && clone_data->filter_options->choice)
+ strvec_pushf(&cp.args, "--filter=%s",
+ expand_list_objects_filter_spec(
+ clone_data->filter_options));
if (clone_data->single_branch >= 0)
strvec_push(&cp.args, clone_data->single_branch ?
"--single-branch" :
@@ -1805,7 +1708,7 @@ static int clone_submodule(struct module_clone_data *clone_data)
strvec_push(&cp.args, clone_data->path);
cp.git_cmd = 1;
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.no_stdin = 1;
if(run_command(&cp))
@@ -1851,6 +1754,7 @@ static int module_clone(int argc, const char **argv, const char *prefix)
{
int dissociate = 0, quiet = 0, progress = 0, require_init = 0;
struct module_clone_data clone_data = MODULE_CLONE_DATA_INIT;
+ struct list_objects_filter_options filter_options;
struct option module_clone_options[] = {
OPT_STRING(0, "prefix", &clone_data.prefix,
@@ -1873,24 +1777,26 @@ static int module_clone(int argc, const char **argv, const char *prefix)
OPT_STRING(0, "depth", &clone_data.depth,
N_("string"),
N_("depth for shallow clones")),
- OPT__QUIET(&quiet, "Suppress output for cloning a submodule"),
+ OPT__QUIET(&quiet, "suppress output for cloning a submodule"),
OPT_BOOL(0, "progress", &progress,
N_("force cloning progress")),
OPT_BOOL(0, "require-init", &require_init,
N_("disallow cloning into non-empty directory")),
OPT_BOOL(0, "single-branch", &clone_data.single_branch,
N_("clone only one branch, HEAD or --branch")),
+ OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
OPT_END()
};
const char *const git_submodule_helper_usage[] = {
N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
"[--reference <repository>] [--name <name>] [--depth <depth>] "
- "[--single-branch] "
+ "[--single-branch] [--filter <filter-spec>] "
"--url <url> --path <path>"),
NULL
};
+ memset(&filter_options, 0, sizeof(filter_options));
argc = parse_options(argc, argv, prefix, module_clone_options,
git_submodule_helper_usage, 0);
@@ -1898,12 +1804,14 @@ static int module_clone(int argc, const char **argv, const char *prefix)
clone_data.quiet = !!quiet;
clone_data.progress = !!progress;
clone_data.require_init = !!require_init;
+ clone_data.filter_options = &filter_options;
if (argc || !clone_data.url || !clone_data.path || !*(clone_data.path))
usage_with_options(git_submodule_helper_usage,
module_clone_options);
clone_submodule(&clone_data);
+ list_objects_filter_release(&filter_options);
return 0;
}
@@ -1944,29 +1852,6 @@ static void determine_submodule_update_strategy(struct repository *r,
free(key);
}
-static int module_update_module_mode(int argc, const char **argv, const char *prefix)
-{
- const char *path, *update = NULL;
- int just_cloned;
- struct submodule_update_strategy update_strategy = { .type = SM_UPDATE_CHECKOUT };
-
- if (argc < 3 || argc > 4)
- die("submodule--helper update-module-clone expects <just-cloned> <path> [<update>]");
-
- just_cloned = git_config_int("just_cloned", argv[1]);
- path = argv[2];
-
- if (argc == 4)
- update = argv[3];
-
- determine_submodule_update_strategy(the_repository,
- just_cloned, path, update,
- &update_strategy);
- fputs(submodule_strategy_to_string(&update_strategy), stdout);
-
- return 0;
-}
-
struct update_clone_data {
const struct submodule *sub;
struct object_id oid;
@@ -1974,27 +1859,13 @@ struct update_clone_data {
};
struct submodule_update_clone {
- /* index into 'list', the list of submodules to look into for cloning */
+ /* index into 'update_data.list', the list of submodules to look into for cloning */
int current;
- struct module_list list;
- unsigned warn_if_uninitialized : 1;
-
- /* update parameter passed via commandline */
- struct submodule_update_strategy update;
/* configuration parameters which are passed on to the children */
- int progress;
- int quiet;
- int recommend_shallow;
- struct string_list references;
- int dissociate;
- unsigned require_init;
- const char *depth;
- const char *recursive_prefix;
- const char *prefix;
- int single_branch;
+ struct update_data *update_data;
- /* to be consumed by git-submodule.sh */
+ /* to be consumed by update_submodule() */
struct update_clone_data *update_clone;
int update_clone_nr; int update_clone_alloc;
@@ -2004,33 +1875,48 @@ struct submodule_update_clone {
/* failed clones to be retried again */
const struct cache_entry **failed_clones;
int failed_clones_nr, failed_clones_alloc;
-
- int max_jobs;
};
-#define SUBMODULE_UPDATE_CLONE_INIT { \
+#define SUBMODULE_UPDATE_CLONE_INIT { 0 }
+
+struct update_data {
+ const char *prefix;
+ const char *recursive_prefix;
+ const char *displaypath;
+ const char *update_default;
+ struct object_id suboid;
+ struct string_list references;
+ struct submodule_update_strategy update_strategy;
+ struct list_objects_filter_options *filter_options;
+ struct module_list list;
+ int depth;
+ int max_jobs;
+ int single_branch;
+ int recommend_shallow;
+ unsigned int require_init;
+ unsigned int force;
+ unsigned int quiet;
+ unsigned int nofetch;
+ unsigned int remote;
+ unsigned int progress;
+ unsigned int dissociate;
+ unsigned int init;
+ unsigned int warn_if_uninitialized;
+ unsigned int recursive;
+
+ /* copied over from update_clone_data */
+ struct object_id oid;
+ unsigned int just_cloned;
+ const char *sm_path;
+};
+#define UPDATE_DATA_INIT { \
+ .update_strategy = SUBMODULE_UPDATE_STRATEGY_INIT, \
.list = MODULE_LIST_INIT, \
- .update = SUBMODULE_UPDATE_STRATEGY_INIT, \
.recommend_shallow = -1, \
.references = STRING_LIST_INIT_DUP, \
.single_branch = -1, \
.max_jobs = 1, \
}
-struct update_data {
- const char *recursive_prefix;
- const char *sm_path;
- const char *displaypath;
- struct object_id oid;
- struct object_id suboid;
- struct submodule_update_strategy update_strategy;
- int depth;
- unsigned int force: 1;
- unsigned int quiet: 1;
- unsigned int nofetch: 1;
- unsigned int just_cloned: 1;
-};
-#define UPDATE_DATA_INIT { .update_strategy = SUBMODULE_UPDATE_STRATEGY_INIT }
-
static void next_submodule_warn_missing(struct submodule_update_clone *suc,
struct strbuf *out, const char *displaypath)
{
@@ -2038,7 +1924,7 @@ static void next_submodule_warn_missing(struct submodule_update_clone *suc,
* Only mention uninitialized submodules when their
* paths have been specified.
*/
- if (suc->warn_if_uninitialized) {
+ if (suc->update_data->warn_if_uninitialized) {
strbuf_addf(out,
_("Submodule path '%s' not initialized"),
displaypath);
@@ -2070,8 +1956,8 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
int need_free_url = 0;
if (ce_stage(ce)) {
- if (suc->recursive_prefix)
- strbuf_addf(&sb, "%s/%s", suc->recursive_prefix, ce->name);
+ if (suc->update_data->recursive_prefix)
+ strbuf_addf(&sb, "%s/%s", suc->update_data->recursive_prefix, ce->name);
else
strbuf_addstr(&sb, ce->name);
strbuf_addf(out, _("Skipping unmerged submodule %s"), sb.buf);
@@ -2081,8 +1967,8 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
sub = submodule_from_path(the_repository, null_oid(), ce->name);
- if (suc->recursive_prefix)
- displaypath = relative_path(suc->recursive_prefix,
+ if (suc->update_data->recursive_prefix)
+ displaypath = relative_path(suc->update_data->recursive_prefix,
ce->name, &displaypath_sb);
else
displaypath = ce->name;
@@ -2100,8 +1986,8 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
}
free(key);
- if (suc->update.type == SM_UPDATE_NONE
- || (suc->update.type == SM_UPDATE_UNSPECIFIED
+ if (suc->update_data->update_strategy.type == SM_UPDATE_NONE
+ || (suc->update_data->update_strategy.type == SM_UPDATE_UNSPECIFIED
&& update_type == SM_UPDATE_NONE)) {
strbuf_addf(out, _("Skipping submodule '%s'"), displaypath);
strbuf_addch(out, '\n');
@@ -2145,30 +2031,33 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
child->err = -1;
strvec_push(&child->args, "submodule--helper");
strvec_push(&child->args, "clone");
- if (suc->progress)
+ if (suc->update_data->progress)
strvec_push(&child->args, "--progress");
- if (suc->quiet)
+ if (suc->update_data->quiet)
strvec_push(&child->args, "--quiet");
- if (suc->prefix)
- strvec_pushl(&child->args, "--prefix", suc->prefix, NULL);
- if (suc->recommend_shallow && sub->recommend_shallow == 1)
+ if (suc->update_data->prefix)
+ strvec_pushl(&child->args, "--prefix", suc->update_data->prefix, NULL);
+ if (suc->update_data->recommend_shallow && sub->recommend_shallow == 1)
strvec_push(&child->args, "--depth=1");
- if (suc->require_init)
+ else if (suc->update_data->depth)
+ strvec_pushf(&child->args, "--depth=%d", suc->update_data->depth);
+ if (suc->update_data->filter_options && suc->update_data->filter_options->choice)
+ strvec_pushf(&child->args, "--filter=%s",
+ expand_list_objects_filter_spec(suc->update_data->filter_options));
+ if (suc->update_data->require_init)
strvec_push(&child->args, "--require-init");
strvec_pushl(&child->args, "--path", sub->path, NULL);
strvec_pushl(&child->args, "--name", sub->name, NULL);
strvec_pushl(&child->args, "--url", url, NULL);
- if (suc->references.nr) {
+ if (suc->update_data->references.nr) {
struct string_list_item *item;
- for_each_string_list_item(item, &suc->references)
+ for_each_string_list_item(item, &suc->update_data->references)
strvec_pushl(&child->args, "--reference", item->string, NULL);
}
- if (suc->dissociate)
+ if (suc->update_data->dissociate)
strvec_push(&child->args, "--dissociate");
- if (suc->depth)
- strvec_push(&child->args, suc->depth);
- if (suc->single_branch >= 0)
- strvec_push(&child->args, suc->single_branch ?
+ if (suc->update_data->single_branch >= 0)
+ strvec_push(&child->args, suc->update_data->single_branch ?
"--single-branch" :
"--no-single-branch");
@@ -2190,8 +2079,8 @@ static int update_clone_get_next_task(struct child_process *child,
const struct cache_entry *ce;
int index;
- for (; suc->current < suc->list.nr; suc->current++) {
- ce = suc->list.entries[suc->current];
+ for (; suc->current < suc->update_data->list.nr; suc->current++) {
+ ce = suc->update_data->list.entries[suc->current];
if (prepare_to_clone_next_submodule(ce, child, suc, err)) {
int *p = xmalloc(sizeof(*p));
*p = suc->current;
@@ -2206,7 +2095,7 @@ static int update_clone_get_next_task(struct child_process *child,
* stragglers again, which we can imagine as an extension of the
* entry list.
*/
- index = suc->current - suc->list.nr;
+ index = suc->current - suc->update_data->list.nr;
if (index < suc->failed_clones_nr) {
int *p;
ce = suc->failed_clones[index];
@@ -2251,8 +2140,8 @@ static int update_clone_task_finished(int result,
if (!result)
return 0;
- if (idx < suc->list.nr) {
- ce = suc->list.entries[idx];
+ if (idx < suc->update_data->list.nr) {
+ ce = suc->update_data->list.entries[idx];
strbuf_addf(err, _("Failed to clone '%s'. Retry scheduled"),
ce->name);
strbuf_addch(err, '\n');
@@ -2262,7 +2151,7 @@ static int update_clone_task_finished(int result,
suc->failed_clones[suc->failed_clones_nr++] = ce;
return 0;
} else {
- idx -= suc->list.nr;
+ idx -= suc->update_data->list.nr;
ce = suc->failed_clones[idx];
strbuf_addf(err, _("Failed to clone '%s' a second time, aborting"),
ce->name);
@@ -2294,7 +2183,7 @@ static int is_tip_reachable(const char *path, struct object_id *oid)
cp.no_stderr = 1;
strvec_pushl(&cp.args, "rev-list", "-n", "1", hex, "--not", "--all", NULL);
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
if (capture_command(&cp, &rev, GIT_MAX_HEXSZ + 1) || rev.len)
return 0;
@@ -2306,7 +2195,7 @@ static int fetch_in_submodule(const char *module_path, int depth, int quiet, str
{
struct child_process cp = CHILD_PROCESS_INIT;
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.git_cmd = 1;
cp.dir = xstrdup(module_path);
@@ -2326,83 +2215,76 @@ static int fetch_in_submodule(const char *module_path, int depth, int quiet, str
static int run_update_command(struct update_data *ud, int subforce)
{
- struct strvec args = STRVEC_INIT;
- struct strvec child_env = STRVEC_INIT;
+ struct child_process cp = CHILD_PROCESS_INIT;
char *oid = oid_to_hex(&ud->oid);
int must_die_on_failure = 0;
- int git_cmd;
switch (ud->update_strategy.type) {
case SM_UPDATE_CHECKOUT:
- git_cmd = 1;
- strvec_pushl(&args, "checkout", "-q", NULL);
+ cp.git_cmd = 1;
+ strvec_pushl(&cp.args, "checkout", "-q", NULL);
if (subforce)
- strvec_push(&args, "-f");
+ strvec_push(&cp.args, "-f");
break;
case SM_UPDATE_REBASE:
- git_cmd = 1;
- strvec_push(&args, "rebase");
+ cp.git_cmd = 1;
+ strvec_push(&cp.args, "rebase");
if (ud->quiet)
- strvec_push(&args, "--quiet");
+ strvec_push(&cp.args, "--quiet");
must_die_on_failure = 1;
break;
case SM_UPDATE_MERGE:
- git_cmd = 1;
- strvec_push(&args, "merge");
+ cp.git_cmd = 1;
+ strvec_push(&cp.args, "merge");
if (ud->quiet)
- strvec_push(&args, "--quiet");
+ strvec_push(&cp.args, "--quiet");
must_die_on_failure = 1;
break;
case SM_UPDATE_COMMAND:
- git_cmd = 0;
- strvec_push(&args, ud->update_strategy.command);
+ cp.use_shell = 1;
+ strvec_push(&cp.args, ud->update_strategy.command);
must_die_on_failure = 1;
break;
default:
BUG("unexpected update strategy type: %s",
submodule_strategy_to_string(&ud->update_strategy));
}
- strvec_push(&args, oid);
+ strvec_push(&cp.args, oid);
- prepare_submodule_repo_env(&child_env);
- if (run_command_v_opt_cd_env(args.v, git_cmd ? RUN_GIT_CMD : RUN_USING_SHELL,
- ud->sm_path, child_env.v)) {
+ cp.dir = xstrdup(ud->sm_path);
+ prepare_submodule_repo_env(&cp.env);
+ if (run_command(&cp)) {
switch (ud->update_strategy.type) {
case SM_UPDATE_CHECKOUT:
- printf(_("Unable to checkout '%s' in submodule path '%s'"),
- oid, ud->displaypath);
+ die_message(_("Unable to checkout '%s' in submodule path '%s'"),
+ oid, ud->displaypath);
break;
case SM_UPDATE_REBASE:
- printf(_("Unable to rebase '%s' in submodule path '%s'"),
- oid, ud->displaypath);
+ die_message(_("Unable to rebase '%s' in submodule path '%s'"),
+ oid, ud->displaypath);
break;
case SM_UPDATE_MERGE:
- printf(_("Unable to merge '%s' in submodule path '%s'"),
- oid, ud->displaypath);
+ die_message(_("Unable to merge '%s' in submodule path '%s'"),
+ oid, ud->displaypath);
break;
case SM_UPDATE_COMMAND:
- printf(_("Execution of '%s %s' failed in submodule path '%s'"),
- ud->update_strategy.command, oid, ud->displaypath);
+ die_message(_("Execution of '%s %s' failed in submodule path '%s'"),
+ ud->update_strategy.command, oid, ud->displaypath);
break;
default:
BUG("unexpected update strategy type: %s",
submodule_strategy_to_string(&ud->update_strategy));
}
- /*
- * NEEDSWORK: We are currently printing to stdout with error
- * return so that the shell caller handles the error output
- * properly. Once we start handling the error messages within
- * C, we should use die() instead.
- */
if (must_die_on_failure)
- return 2;
- /*
- * This signifies to the caller in shell that the command
- * failed without dying
- */
+ exit(128);
+
+ /* the command failed, but update must continue */
return 1;
}
+ if (ud->quiet)
+ return 0;
+
switch (ud->update_strategy.type) {
case SM_UPDATE_CHECKOUT:
printf(_("Submodule path '%s': checked out '%s'\n"),
@@ -2428,7 +2310,7 @@ static int run_update_command(struct update_data *ud, int subforce)
return 0;
}
-static int do_run_update_procedure(struct update_data *ud)
+static int run_update_procedure(struct update_data *ud)
{
int subforce = is_null_oid(&ud->suboid) || ud->force;
@@ -2458,181 +2340,6 @@ static int do_run_update_procedure(struct update_data *ud)
return run_update_command(ud, subforce);
}
-static void update_submodule(struct update_clone_data *ucd)
-{
- fprintf(stdout, "dummy %s %d\t%s\n",
- oid_to_hex(&ucd->oid),
- ucd->just_cloned,
- ucd->sub->path);
-}
-
-static int update_submodules(struct submodule_update_clone *suc)
-{
- int i;
-
- run_processes_parallel_tr2(suc->max_jobs, update_clone_get_next_task,
- update_clone_start_failure,
- update_clone_task_finished, suc, "submodule",
- "parallel/update");
-
- /*
- * We saved the output and put it out all at once now.
- * That means:
- * - the listener does not have to interleave their (checkout)
- * work with our fetching. The writes involved in a
- * checkout involve more straightforward sequential I/O.
- * - the listener can avoid doing any work if fetching failed.
- */
- if (suc->quickstop)
- return 1;
-
- for (i = 0; i < suc->update_clone_nr; i++)
- update_submodule(&suc->update_clone[i]);
-
- return 0;
-}
-
-static int update_clone(int argc, const char **argv, const char *prefix)
-{
- const char *update = NULL;
- struct pathspec pathspec;
- struct submodule_update_clone suc = SUBMODULE_UPDATE_CLONE_INIT;
-
- struct option module_update_clone_options[] = {
- OPT_STRING(0, "prefix", &prefix,
- N_("path"),
- N_("path into the working tree")),
- OPT_STRING(0, "recursive-prefix", &suc.recursive_prefix,
- N_("path"),
- N_("path into the working tree, across nested "
- "submodule boundaries")),
- OPT_STRING(0, "update", &update,
- N_("string"),
- N_("rebase, merge, checkout or none")),
- OPT_STRING_LIST(0, "reference", &suc.references, N_("repo"),
- N_("reference repository")),
- OPT_BOOL(0, "dissociate", &suc.dissociate,
- N_("use --reference only while cloning")),
- OPT_STRING(0, "depth", &suc.depth, "<depth>",
- N_("create a shallow clone truncated to the "
- "specified number of revisions")),
- OPT_INTEGER('j', "jobs", &suc.max_jobs,
- N_("parallel jobs")),
- OPT_BOOL(0, "recommend-shallow", &suc.recommend_shallow,
- N_("whether the initial clone should follow the shallow recommendation")),
- OPT__QUIET(&suc.quiet, N_("don't print cloning progress")),
- OPT_BOOL(0, "progress", &suc.progress,
- N_("force cloning progress")),
- OPT_BOOL(0, "require-init", &suc.require_init,
- N_("disallow cloning into non-empty directory")),
- OPT_BOOL(0, "single-branch", &suc.single_branch,
- N_("clone only one branch, HEAD or --branch")),
- OPT_END()
- };
-
- const char *const git_submodule_helper_usage[] = {
- N_("git submodule--helper update-clone [--prefix=<path>] [<path>...]"),
- NULL
- };
- suc.prefix = prefix;
-
- update_clone_config_from_gitmodules(&suc.max_jobs);
- git_config(git_update_clone_config, &suc.max_jobs);
-
- argc = parse_options(argc, argv, prefix, module_update_clone_options,
- git_submodule_helper_usage, 0);
-
- if (update)
- if (parse_submodule_update_strategy(update, &suc.update) < 0)
- die(_("bad value for update parameter"));
-
- if (module_list_compute(argc, argv, prefix, &pathspec, &suc.list) < 0)
- return 1;
-
- if (pathspec.nr)
- suc.warn_if_uninitialized = 1;
-
- return update_submodules(&suc);
-}
-
-static int run_update_procedure(int argc, const char **argv, const char *prefix)
-{
- int force = 0, quiet = 0, nofetch = 0, just_cloned = 0;
- char *prefixed_path, *update = NULL;
- struct update_data update_data = UPDATE_DATA_INIT;
-
- struct option options[] = {
- OPT__QUIET(&quiet, N_("suppress output for update by rebase or merge")),
- OPT__FORCE(&force, N_("force checkout updates"), 0),
- OPT_BOOL('N', "no-fetch", &nofetch,
- N_("don't fetch new objects from the remote site")),
- OPT_BOOL(0, "just-cloned", &just_cloned,
- N_("overrides update mode in case the repository is a fresh clone")),
- OPT_INTEGER(0, "depth", &update_data.depth, N_("depth for shallow fetch")),
- OPT_STRING(0, "prefix", &prefix,
- N_("path"),
- N_("path into the working tree")),
- OPT_STRING(0, "update", &update,
- N_("string"),
- N_("rebase, merge, checkout or none")),
- OPT_STRING(0, "recursive-prefix", &update_data.recursive_prefix, N_("path"),
- N_("path into the working tree, across nested "
- "submodule boundaries")),
- OPT_CALLBACK_F(0, "oid", &update_data.oid, N_("sha1"),
- N_("SHA1 expected by superproject"), PARSE_OPT_NONEG,
- parse_opt_object_id),
- OPT_CALLBACK_F(0, "suboid", &update_data.suboid, N_("subsha1"),
- N_("SHA1 of submodule's HEAD"), PARSE_OPT_NONEG,
- parse_opt_object_id),
- OPT_END()
- };
-
- const char *const usage[] = {
- N_("git submodule--helper run-update-procedure [<options>] <path>"),
- NULL
- };
-
- argc = parse_options(argc, argv, prefix, options, usage, 0);
-
- if (argc != 1)
- usage_with_options(usage, options);
-
- update_data.force = !!force;
- update_data.quiet = !!quiet;
- update_data.nofetch = !!nofetch;
- update_data.just_cloned = !!just_cloned;
- update_data.sm_path = argv[0];
-
- if (update_data.recursive_prefix)
- prefixed_path = xstrfmt("%s%s", update_data.recursive_prefix, update_data.sm_path);
- else
- prefixed_path = xstrdup(update_data.sm_path);
-
- update_data.displaypath = get_submodule_displaypath(prefixed_path, prefix);
-
- determine_submodule_update_strategy(the_repository, update_data.just_cloned,
- update_data.sm_path, update,
- &update_data.update_strategy);
-
- free(prefixed_path);
-
- if (!oideq(&update_data.oid, &update_data.suboid) || update_data.force)
- return do_run_update_procedure(&update_data);
-
- return 3;
-}
-
-static int resolve_relative_path(int argc, const char **argv, const char *prefix)
-{
- struct strbuf sb = STRBUF_INIT;
- if (argc != 3)
- die("submodule--helper relative-path takes exactly 2 arguments, got %d", argc);
-
- printf("%s", relative_path(argv[1], argv[2], &sb));
- strbuf_release(&sb);
- return 0;
-}
-
static const char *remote_submodule_branch(const char *path)
{
const struct submodule *sub;
@@ -2671,23 +2378,318 @@ static const char *remote_submodule_branch(const char *path)
return branch;
}
-static int resolve_remote_submodule_branch(int argc, const char **argv,
- const char *prefix)
+static void ensure_core_worktree(const char *path)
{
- const char *ret;
- struct strbuf sb = STRBUF_INIT;
- if (argc != 2)
- die("submodule--helper remote-branch takes exactly one arguments, got %d", argc);
+ const char *cw;
+ struct repository subrepo;
- ret = remote_submodule_branch(argv[1]);
- if (!ret)
- die("submodule %s doesn't exist", argv[1]);
+ if (repo_submodule_init(&subrepo, the_repository, path, null_oid()))
+ die(_("could not get a repository handle for submodule '%s'"), path);
- printf("%s", ret);
- strbuf_release(&sb);
+ if (!repo_config_get_string_tmp(&subrepo, "core.worktree", &cw)) {
+ char *cfg_file, *abs_path;
+ const char *rel_path;
+ struct strbuf sb = STRBUF_INIT;
+
+ cfg_file = repo_git_path(&subrepo, "config");
+
+ abs_path = absolute_pathdup(path);
+ rel_path = relative_path(abs_path, subrepo.gitdir, &sb);
+
+ git_config_set_in_file(cfg_file, "core.worktree", rel_path);
+
+ free(cfg_file);
+ free(abs_path);
+ strbuf_release(&sb);
+ }
+}
+
+static void update_data_to_args(struct update_data *update_data, struct strvec *args)
+{
+ strvec_pushl(args, "submodule--helper", "update", "--recursive", NULL);
+ strvec_pushf(args, "--jobs=%d", update_data->max_jobs);
+ if (update_data->recursive_prefix)
+ strvec_pushl(args, "--recursive-prefix",
+ update_data->recursive_prefix, NULL);
+ if (update_data->quiet)
+ strvec_push(args, "--quiet");
+ if (update_data->force)
+ strvec_push(args, "--force");
+ if (update_data->init)
+ strvec_push(args, "--init");
+ if (update_data->remote)
+ strvec_push(args, "--remote");
+ if (update_data->nofetch)
+ strvec_push(args, "--no-fetch");
+ if (update_data->dissociate)
+ strvec_push(args, "--dissociate");
+ if (update_data->progress)
+ strvec_push(args, "--progress");
+ if (update_data->require_init)
+ strvec_push(args, "--require-init");
+ if (update_data->depth)
+ strvec_pushf(args, "--depth=%d", update_data->depth);
+ if (update_data->update_default)
+ strvec_pushl(args, "--update", update_data->update_default, NULL);
+ if (update_data->references.nr) {
+ struct string_list_item *item;
+ for_each_string_list_item(item, &update_data->references)
+ strvec_pushl(args, "--reference", item->string, NULL);
+ }
+ if (update_data->filter_options && update_data->filter_options->choice)
+ strvec_pushf(args, "--filter=%s",
+ expand_list_objects_filter_spec(
+ update_data->filter_options));
+ if (update_data->recommend_shallow == 0)
+ strvec_push(args, "--no-recommend-shallow");
+ else if (update_data->recommend_shallow == 1)
+ strvec_push(args, "--recommend-shallow");
+ if (update_data->single_branch >= 0)
+ strvec_push(args, update_data->single_branch ?
+ "--single-branch" :
+ "--no-single-branch");
+}
+
+static int update_submodule(struct update_data *update_data)
+{
+ char *prefixed_path;
+
+ ensure_core_worktree(update_data->sm_path);
+
+ if (update_data->recursive_prefix)
+ prefixed_path = xstrfmt("%s%s", update_data->recursive_prefix,
+ update_data->sm_path);
+ else
+ prefixed_path = xstrdup(update_data->sm_path);
+
+ update_data->displaypath = get_submodule_displaypath(prefixed_path,
+ update_data->prefix);
+ free(prefixed_path);
+
+ determine_submodule_update_strategy(the_repository, update_data->just_cloned,
+ update_data->sm_path, update_data->update_default,
+ &update_data->update_strategy);
+
+ if (update_data->just_cloned)
+ oidcpy(&update_data->suboid, null_oid());
+ else if (resolve_gitlink_ref(update_data->sm_path, "HEAD", &update_data->suboid))
+ die(_("Unable to find current revision in submodule path '%s'"),
+ update_data->displaypath);
+
+ if (update_data->remote) {
+ char *remote_name = get_default_remote_submodule(update_data->sm_path);
+ const char *branch = remote_submodule_branch(update_data->sm_path);
+ char *remote_ref = xstrfmt("refs/remotes/%s/%s", remote_name, branch);
+
+ if (!update_data->nofetch) {
+ if (fetch_in_submodule(update_data->sm_path, update_data->depth,
+ 0, NULL))
+ die(_("Unable to fetch in submodule path '%s'"),
+ update_data->sm_path);
+ }
+
+ if (resolve_gitlink_ref(update_data->sm_path, remote_ref, &update_data->oid))
+ die(_("Unable to find %s revision in submodule path '%s'"),
+ remote_ref, update_data->sm_path);
+
+ free(remote_ref);
+ }
+
+ if (!oideq(&update_data->oid, &update_data->suboid) || update_data->force)
+ if (run_update_procedure(update_data))
+ return 1;
+
+ if (update_data->recursive) {
+ struct child_process cp = CHILD_PROCESS_INIT;
+ struct update_data next = *update_data;
+ int res;
+
+ if (update_data->recursive_prefix)
+ prefixed_path = xstrfmt("%s%s/", update_data->recursive_prefix,
+ update_data->sm_path);
+ else
+ prefixed_path = xstrfmt("%s/", update_data->sm_path);
+
+ next.recursive_prefix = get_submodule_displaypath(prefixed_path,
+ update_data->prefix);
+ next.prefix = NULL;
+ oidcpy(&next.oid, null_oid());
+ oidcpy(&next.suboid, null_oid());
+
+ cp.dir = update_data->sm_path;
+ cp.git_cmd = 1;
+ prepare_submodule_repo_env(&cp.env);
+ update_data_to_args(&next, &cp.args);
+
+ /* die() if child process die()'d */
+ res = run_command(&cp);
+ if (!res)
+ return 0;
+ die_message(_("Failed to recurse into submodule path '%s'"),
+ update_data->displaypath);
+ if (res == 128)
+ exit(res);
+ else if (res)
+ return 1;
+ }
+
return 0;
}
+static int update_submodules(struct update_data *update_data)
+{
+ int i, res = 0;
+ struct submodule_update_clone suc = SUBMODULE_UPDATE_CLONE_INIT;
+
+ suc.update_data = update_data;
+ run_processes_parallel_tr2(suc.update_data->max_jobs, update_clone_get_next_task,
+ update_clone_start_failure,
+ update_clone_task_finished, &suc, "submodule",
+ "parallel/update");
+
+ /*
+ * We saved the output and put it out all at once now.
+ * That means:
+ * - the listener does not have to interleave their (checkout)
+ * work with our fetching. The writes involved in a
+ * checkout involve more straightforward sequential I/O.
+ * - the listener can avoid doing any work if fetching failed.
+ */
+ if (suc.quickstop) {
+ res = 1;
+ goto cleanup;
+ }
+
+ for (i = 0; i < suc.update_clone_nr; i++) {
+ struct update_clone_data ucd = suc.update_clone[i];
+
+ oidcpy(&update_data->oid, &ucd.oid);
+ update_data->just_cloned = ucd.just_cloned;
+ update_data->sm_path = ucd.sub->path;
+
+ if (update_submodule(update_data))
+ res = 1;
+ }
+
+cleanup:
+ string_list_clear(&update_data->references, 0);
+ return res;
+}
+
+static int module_update(int argc, const char **argv, const char *prefix)
+{
+ struct pathspec pathspec;
+ struct update_data opt = UPDATE_DATA_INIT;
+ struct list_objects_filter_options filter_options;
+ int ret;
+
+ struct option module_update_options[] = {
+ OPT__FORCE(&opt.force, N_("force checkout updates"), 0),
+ OPT_BOOL(0, "init", &opt.init,
+ N_("initialize uninitialized submodules before update")),
+ OPT_BOOL(0, "remote", &opt.remote,
+ N_("use SHA-1 of submodule's remote tracking branch")),
+ OPT_BOOL(0, "recursive", &opt.recursive,
+ N_("traverse submodules recursively")),
+ OPT_BOOL('N', "no-fetch", &opt.nofetch,
+ N_("don't fetch new objects from the remote site")),
+ OPT_STRING(0, "prefix", &opt.prefix,
+ N_("path"),
+ N_("path into the working tree")),
+ OPT_STRING(0, "recursive-prefix", &opt.recursive_prefix,
+ N_("path"),
+ N_("path into the working tree, across nested "
+ "submodule boundaries")),
+ OPT_STRING(0, "update", &opt.update_default,
+ N_("string"),
+ N_("rebase, merge, checkout or none")),
+ OPT_STRING_LIST(0, "reference", &opt.references, N_("repo"),
+ N_("reference repository")),
+ OPT_BOOL(0, "dissociate", &opt.dissociate,
+ N_("use --reference only while cloning")),
+ OPT_INTEGER(0, "depth", &opt.depth,
+ N_("create a shallow clone truncated to the "
+ "specified number of revisions")),
+ OPT_INTEGER('j', "jobs", &opt.max_jobs,
+ N_("parallel jobs")),
+ OPT_BOOL(0, "recommend-shallow", &opt.recommend_shallow,
+ N_("whether the initial clone should follow the shallow recommendation")),
+ OPT__QUIET(&opt.quiet, N_("don't print cloning progress")),
+ OPT_BOOL(0, "progress", &opt.progress,
+ N_("force cloning progress")),
+ OPT_BOOL(0, "require-init", &opt.require_init,
+ N_("disallow cloning into non-empty directory")),
+ OPT_BOOL(0, "single-branch", &opt.single_branch,
+ N_("clone only one branch, HEAD or --branch")),
+ OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
+ OPT_END()
+ };
+
+ const char *const git_submodule_helper_usage[] = {
+ N_("git submodule [--quiet] update"
+ " [--init [--filter=<filter-spec>]] [--remote]"
+ " [-N|--no-fetch] [-f|--force]"
+ " [--checkout|--merge|--rebase]"
+ " [--[no-]recommend-shallow] [--reference <repository>]"
+ " [--recursive] [--[no-]single-branch] [--] [<path>...]"),
+ NULL
+ };
+
+ update_clone_config_from_gitmodules(&opt.max_jobs);
+ git_config(git_update_clone_config, &opt.max_jobs);
+
+ memset(&filter_options, 0, sizeof(filter_options));
+ argc = parse_options(argc, argv, prefix, module_update_options,
+ git_submodule_helper_usage, 0);
+
+ if (filter_options.choice && !opt.init) {
+ usage_with_options(git_submodule_helper_usage,
+ module_update_options);
+ }
+
+ opt.filter_options = &filter_options;
+
+ if (opt.update_default)
+ if (parse_submodule_update_strategy(opt.update_default,
+ &opt.update_strategy) < 0)
+ die(_("bad value for update parameter"));
+
+ if (module_list_compute(argc, argv, prefix, &pathspec, &opt.list) < 0) {
+ list_objects_filter_release(&filter_options);
+ return 1;
+ }
+
+ if (pathspec.nr)
+ opt.warn_if_uninitialized = 1;
+
+ if (opt.init) {
+ struct module_list list = MODULE_LIST_INIT;
+ struct init_cb info = INIT_CB_INIT;
+
+ if (module_list_compute(argc, argv, opt.prefix,
+ &pathspec, &list) < 0)
+ return 1;
+
+ /*
+ * If there are no path args and submodule.active is set then,
+ * by default, only initialize 'active' modules.
+ */
+ if (!argc && git_config_get_value_multi("submodule.active"))
+ module_list_active(&list);
+
+ info.prefix = opt.prefix;
+ info.superprefix = opt.recursive_prefix;
+ if (opt.quiet)
+ info.flags |= OPT_QUIET;
+
+ for_each_listed_submodule(&list, init_submodule_cb, &info);
+ }
+
+ ret = update_submodules(&opt);
+ list_objects_filter_release(&filter_options);
+ return ret;
+}
+
static int push_check(int argc, const char **argv, const char *prefix)
{
struct remote *remote;
@@ -2765,40 +2767,6 @@ static int push_check(int argc, const char **argv, const char *prefix)
return 0;
}
-static int ensure_core_worktree(int argc, const char **argv, const char *prefix)
-{
- const char *path;
- const char *cw;
- struct repository subrepo;
-
- if (argc != 2)
- BUG("submodule--helper ensure-core-worktree <path>");
-
- path = argv[1];
-
- if (repo_submodule_init(&subrepo, the_repository, path, null_oid()))
- die(_("could not get a repository handle for submodule '%s'"), path);
-
- if (!repo_config_get_string_tmp(&subrepo, "core.worktree", &cw)) {
- char *cfg_file, *abs_path;
- const char *rel_path;
- struct strbuf sb = STRBUF_INIT;
-
- cfg_file = repo_git_path(&subrepo, "config");
-
- abs_path = absolute_pathdup(path);
- rel_path = relative_path(abs_path, subrepo.gitdir, &sb);
-
- git_config_set_in_file(cfg_file, "core.worktree", rel_path);
-
- free(cfg_file);
- free(abs_path);
- strbuf_release(&sb);
- }
-
- return 0;
-}
-
static int absorb_git_dirs(int argc, const char **argv, const char *prefix)
{
int i;
@@ -2882,7 +2850,7 @@ static int module_config(int argc, const char **argv, const char *prefix)
const char *const git_submodule_helper_usage[] = {
N_("git submodule--helper config <name> [<value>]"),
N_("git submodule--helper config --unset <name>"),
- N_("git submodule--helper config --check-writeable"),
+ "git submodule--helper config --check-writeable",
NULL
};
@@ -2971,7 +2939,7 @@ static int module_set_branch(int argc, const char **argv, const char *prefix)
die(_("--branch or --default required"));
if (opt_branch && opt_default)
- die(_("--branch and --default are mutually exclusive"));
+ die(_("options '%s' and '%s' cannot be used together"), "--branch", "--default");
if (argc != 1 || !(path = argv[0]))
usage_with_options(usage, options);
@@ -2983,6 +2951,44 @@ static int module_set_branch(int argc, const char **argv, const char *prefix)
return !!ret;
}
+static int module_create_branch(int argc, const char **argv, const char *prefix)
+{
+ enum branch_track track;
+ int quiet = 0, force = 0, reflog = 0, dry_run = 0;
+
+ struct option options[] = {
+ OPT__QUIET(&quiet, N_("print only error messages")),
+ OPT__FORCE(&force, N_("force creation"), 0),
+ OPT_BOOL(0, "create-reflog", &reflog,
+ N_("create the branch's reflog")),
+ OPT_CALLBACK_F('t', "track", &track, "(direct|inherit)",
+ N_("set branch tracking configuration"),
+ PARSE_OPT_OPTARG,
+ parse_opt_tracking_mode),
+ OPT__DRY_RUN(&dry_run,
+ N_("show whether the branch would be created")),
+ OPT_END()
+ };
+ const char *const usage[] = {
+ N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"),
+ NULL
+ };
+
+ git_config(git_default_config, NULL);
+ track = git_branch_track;
+ argc = parse_options(argc, argv, prefix, options, usage, 0);
+
+ if (argc != 3)
+ usage_with_options(usage, options);
+
+ if (!quiet && !dry_run)
+ printf_ln(_("creating branch '%s'"), argv[0]);
+
+ create_branches_recursively(the_repository, argv[0], argv[1], argv[2],
+ force, reflog, quiet, track, dry_run);
+ return 0;
+}
+
struct add_data {
const char *prefix;
const char *branch;
@@ -2999,15 +3005,15 @@ struct add_data {
};
#define ADD_DATA_INIT { .depth = -1 }
-static void show_fetch_remotes(FILE *output, const char *git_dir_path)
+static void append_fetch_remotes(struct strbuf *msg, const char *git_dir_path)
{
struct child_process cp_remote = CHILD_PROCESS_INIT;
struct strbuf sb_remote_out = STRBUF_INIT;
cp_remote.git_cmd = 1;
- strvec_pushf(&cp_remote.env_array,
+ strvec_pushf(&cp_remote.env,
"GIT_DIR=%s", git_dir_path);
- strvec_push(&cp_remote.env_array, "GIT_WORK_TREE=.");
+ strvec_push(&cp_remote.env, "GIT_WORK_TREE=.");
strvec_pushl(&cp_remote.args, "remote", "-v", NULL);
if (!capture_command(&cp_remote, &sb_remote_out, 0)) {
char *next_line;
@@ -3015,7 +3021,7 @@ static void show_fetch_remotes(FILE *output, const char *git_dir_path)
while ((next_line = strchr(line, '\n')) != NULL) {
size_t len = next_line - line;
if (strip_suffix_mem(line, &len, " (fetch)"))
- fprintf(output, " %.*s\n", (int)len, line);
+ strbuf_addf(msg, " %.*s\n", (int)len, line);
line = next_line + 1;
}
}
@@ -3047,19 +3053,27 @@ static int add_submodule(const struct add_data *add_data)
if (is_directory(submod_gitdir_path)) {
if (!add_data->force) {
- fprintf(stderr, _("A git directory for '%s' is found "
- "locally with remote(s):"),
- add_data->sm_name);
- show_fetch_remotes(stderr, submod_gitdir_path);
+ struct strbuf msg = STRBUF_INIT;
+ char *die_msg;
+
+ strbuf_addf(&msg, _("A git directory for '%s' is found "
+ "locally with remote(s):\n"),
+ add_data->sm_name);
+
+ append_fetch_remotes(&msg, submod_gitdir_path);
free(submod_gitdir_path);
- die(_("If you want to reuse this local git "
- "directory instead of cloning again from\n"
- " %s\n"
- "use the '--force' option. If the local git "
- "directory is not the correct repo\n"
- "or if you are unsure what this means, choose "
- "another name with the '--name' option.\n"),
- add_data->realrepo);
+
+ strbuf_addf(&msg, _("If you want to reuse this local git "
+ "directory instead of cloning again from\n"
+ " %s\n"
+ "use the '--force' option. If the local git "
+ "directory is not the correct repo\n"
+ "or you are unsure what this means choose "
+ "another name with the '--name' option."),
+ add_data->realrepo);
+
+ die_msg = strbuf_detach(&msg, NULL);
+ die("%s", die_msg);
} else {
printf(_("Reactivating local git directory for "
"submodule '%s'\n"), add_data->sm_name);
@@ -3083,9 +3097,13 @@ static int add_submodule(const struct add_data *add_data)
if (clone_submodule(&clone_data))
return -1;
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.git_cmd = 1;
cp.dir = add_data->sm_path;
+ /*
+ * NOTE: we only get here if add_data->force is true, so
+ * passing --force to checkout is reasonable.
+ */
strvec_pushl(&cp.args, "checkout", "-f", "-q", NULL);
if (add_data->branch) {
@@ -3216,6 +3234,7 @@ static void die_on_index_match(const char *path, int force)
}
free(ps_matched);
}
+ clear_pathspec(&ps);
}
static void die_on_repo_without_commits(const char *path)
@@ -3227,12 +3246,14 @@ static void die_on_repo_without_commits(const char *path)
if (resolve_gitlink_ref(path, "HEAD", &oid) < 0)
die(_("'%s' does not have a commit checked out"), path);
}
+ strbuf_release(&sb);
}
static int module_add(int argc, const char **argv, const char *prefix)
{
int force = 0, quiet = 0, progress = 0, dissociate = 0;
struct add_data add_data = ADD_DATA_INIT;
+ char *to_free = NULL;
struct option options[] = {
OPT_STRING('b', "branch", &add_data.branch, N_("branch"),
@@ -3245,7 +3266,7 @@ static int module_add(int argc, const char **argv, const char *prefix)
N_("reference repository")),
OPT_BOOL(0, "dissociate", &dissociate, N_("borrow the objects from reference repositories")),
OPT_STRING(0, "name", &add_data.sm_name, N_("name"),
- N_("sets the submodule’s name to the given string "
+ N_("sets the submodule's name to the given string "
"instead of defaulting to its path")),
OPT_INTEGER(0, "depth", &add_data.depth, N_("depth for shallow clones")),
OPT_END()
@@ -3284,7 +3305,8 @@ static int module_add(int argc, const char **argv, const char *prefix)
"of the working tree"));
/* dereference source url relative to parent's url */
- add_data.realrepo = resolve_relative_url(add_data.repo, NULL, 1);
+ to_free = resolve_relative_url(add_data.repo, NULL, 1);
+ add_data.realrepo = to_free;
} else if (is_dir_sep(add_data.repo[0]) || strchr(add_data.repo, ':')) {
add_data.realrepo = add_data.repo;
} else {
@@ -3337,6 +3359,7 @@ static int module_add(int argc, const char **argv, const char *prefix)
}
configure_added_submodule(&add_data);
free(add_data.sm_path);
+ free(to_free);
return 0;
}
@@ -3354,20 +3377,14 @@ static struct cmd_struct commands[] = {
{"name", module_name, 0},
{"clone", module_clone, 0},
{"add", module_add, SUPPORT_SUPER_PREFIX},
- {"update-module-mode", module_update_module_mode, 0},
- {"update-clone", update_clone, 0},
- {"run-update-procedure", run_update_procedure, 0},
- {"ensure-core-worktree", ensure_core_worktree, 0},
- {"relative-path", resolve_relative_path, 0},
+ {"update", module_update, 0},
{"resolve-relative-url-test", resolve_relative_url_test, 0},
{"foreach", module_foreach, SUPPORT_SUPER_PREFIX},
{"init", module_init, SUPPORT_SUPER_PREFIX},
{"status", module_status, SUPPORT_SUPER_PREFIX},
- {"print-default-remote", print_default_remote, 0},
{"sync", module_sync, SUPPORT_SUPER_PREFIX},
{"deinit", module_deinit, 0},
{"summary", module_summary, SUPPORT_SUPER_PREFIX},
- {"remote-branch", resolve_remote_submodule_branch, 0},
{"push-check", push_check, 0},
{"absorb-git-dirs", absorb_git_dirs, SUPPORT_SUPER_PREFIX},
{"is-active", is_active, 0},
@@ -3375,6 +3392,7 @@ static struct cmd_struct commands[] = {
{"config", module_config, 0},
{"set-url", module_set_url, 0},
{"set-branch", module_set_branch, 0},
+ {"create-branch", module_create_branch, 0},
};
int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
diff --git a/builtin/tag.c b/builtin/tag.c
index 065b6bf..75dece0 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -20,13 +20,14 @@
#include "oid-array.h"
#include "column.h"
#include "ref-filter.h"
+#include "date.h"
static const char * const git_tag_usage[] = {
N_("git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
- "\t\t<tagname> [<head>]"),
+ " <tagname> [<head>]"),
N_("git tag -d <tagname>..."),
N_("git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
- "\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"),
+ " [--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"),
N_("git tag -v [--format=<format>] <tagname>..."),
NULL
};
@@ -178,7 +179,6 @@ static const char tag_template_nocleanup[] =
static int git_tag_config(const char *var, const char *value, void *cb)
{
int status;
- struct ref_sorting **sorting_tail = (struct ref_sorting **)cb;
if (!strcmp(var, "tag.gpgsign")) {
config_sign_tag = git_config_bool(var, value);
@@ -188,7 +188,7 @@ static int git_tag_config(const char *var, const char *value, void *cb)
if (!strcmp(var, "tag.sort")) {
if (!value)
return config_error_nonbool(var);
- parse_ref_sorting(sorting_tail, value);
+ string_list_append(cb, value);
return 0;
}
@@ -239,7 +239,7 @@ static int build_tag_object(struct strbuf *buf, int sign, struct object_id *resu
{
if (sign && do_sign(buf) < 0)
return error(_("unable to sign the tag"));
- if (write_object_file(buf->buf, buf->len, tag_type, result) < 0)
+ if (write_object_file(buf->buf, buf->len, OBJ_TAG, result) < 0)
return error(_("unable to write tag file"));
return 0;
}
@@ -364,7 +364,7 @@ static void create_reflog_msg(const struct object_id *oid, struct strbuf *sb)
strbuf_addstr(sb, "object of unknown type");
break;
case OBJ_COMMIT:
- if ((buf = read_object_file(oid, &type, &size)) != NULL) {
+ if ((buf = read_object_file(oid, &type, &size))) {
subject_len = find_commit_subject(buf, &subject_start);
strbuf_insert(sb, sb->len, subject_start, subject_len);
} else {
@@ -372,7 +372,7 @@ static void create_reflog_msg(const struct object_id *oid, struct strbuf *sb)
}
free(buf);
- if ((c = lookup_commit_reference(the_repository, oid)) != NULL)
+ if ((c = lookup_commit_reference(the_repository, oid)))
strbuf_addf(sb, ", %s", show_date(c->date, 0, DATE_MODE(SHORT)));
break;
case OBJ_TREE:
@@ -432,11 +432,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
int annotate = 0, force = 0;
int cmdmode = 0, create_tag_object = 0;
const char *msgfile = NULL, *keyid = NULL;
- struct msg_arg msg = { 0, STRBUF_INIT };
+ struct msg_arg msg = { .buf = STRBUF_INIT };
struct ref_transaction *transaction;
struct strbuf err = STRBUF_INIT;
struct ref_filter filter;
- static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
+ struct ref_sorting *sorting;
+ struct string_list sorting_options = STRING_LIST_INIT_DUP;
struct ref_format format = REF_FORMAT_INIT;
int icase = 0;
int edit_flag = 0;
@@ -470,7 +471,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
OPT_WITHOUT(&filter.no_commit, N_("print only tags that don't contain the commit")),
OPT_MERGED(&filter, N_("print only tags that are merged")),
OPT_NO_MERGED(&filter, N_("print only tags that are not merged")),
- OPT_REF_SORT(sorting_tail),
+ OPT_REF_SORT(&sorting_options),
{
OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"),
N_("print only tags of the object"), PARSE_OPT_LASTARG_DEFAULT,
@@ -482,10 +483,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
OPT_BOOL('i', "ignore-case", &icase, N_("sorting and filtering are case insensitive")),
OPT_END()
};
+ int ret = 0;
+ const char *only_in_list = NULL;
setup_ref_filter_porcelain_msg();
- git_config(git_tag_config, sorting_tail);
+ git_config(git_tag_config, &sorting_options);
memset(&opt, 0, sizeof(opt));
memset(&filter, 0, sizeof(filter));
@@ -521,15 +524,13 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
finalize_colopts(&colopts, -1);
if (cmdmode == 'l' && filter.lines != -1) {
if (explicitly_enable_column(colopts))
- die(_("--column and -n are incompatible"));
+ die(_("options '%s' and '%s' cannot be used together"), "--column", "-n");
colopts = 0;
}
- if (!sorting)
- sorting = ref_default_sorting();
+ sorting = ref_sorting_options(&sorting_options);
ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
filter.ignore_case = icase;
if (cmdmode == 'l') {
- int ret;
if (column_active(colopts)) {
struct column_options copts;
memset(&copts, 0, sizeof(copts));
@@ -540,29 +541,36 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
ret = list_tags(&filter, sorting, &format);
if (column_active(colopts))
stop_column_filter();
- return ret;
+ goto cleanup;
}
if (filter.lines != -1)
- die(_("-n option is only allowed in list mode"));
- if (filter.with_commit)
- die(_("--contains option is only allowed in list mode"));
- if (filter.no_commit)
- die(_("--no-contains option is only allowed in list mode"));
- if (filter.points_at.nr)
- die(_("--points-at option is only allowed in list mode"));
- if (filter.reachable_from || filter.unreachable_from)
- die(_("--merged and --no-merged options are only allowed in list mode"));
- if (cmdmode == 'd')
- return delete_tags(argv);
+ only_in_list = "-n";
+ else if (filter.with_commit)
+ only_in_list = "--contains";
+ else if (filter.no_commit)
+ only_in_list = "--no-contains";
+ else if (filter.points_at.nr)
+ only_in_list = "--points-at";
+ else if (filter.reachable_from)
+ only_in_list = "--merged";
+ else if (filter.unreachable_from)
+ only_in_list = "--no-merged";
+ if (only_in_list)
+ die(_("the '%s' option is only allowed in list mode"), only_in_list);
+ if (cmdmode == 'd') {
+ ret = delete_tags(argv);
+ goto cleanup;
+ }
if (cmdmode == 'v') {
if (format.format && verify_ref_format(&format))
usage_with_options(git_tag_usage, options);
- return for_each_tag_name(argv, verify_tag, &format);
+ ret = for_each_tag_name(argv, verify_tag, &format);
+ goto cleanup;
}
if (msg.given || msgfile) {
if (msg.given && msgfile)
- die(_("only one -F or -m option is allowed."));
+ die(_("options '%s' and '%s' cannot be used together"), "-F", "-m");
if (msg.given)
strbuf_addbuf(&buf, &(msg.buf));
else {
@@ -626,10 +634,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
printf(_("Updated tag '%s' (was %s)\n"), tag,
find_unique_abbrev(&prev, DEFAULT_ABBREV));
- UNLEAK(buf);
- UNLEAK(ref);
- UNLEAK(reflog_msg);
- UNLEAK(msg);
- UNLEAK(err);
- return 0;
+cleanup:
+ ref_sorting_release(sorting);
+ strbuf_release(&buf);
+ strbuf_release(&ref);
+ strbuf_release(&reflog_msg);
+ strbuf_release(&msg.buf);
+ strbuf_release(&err);
+ return ret;
}
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 4a94662..56d05e2 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -1,5 +1,6 @@
#include "builtin.h"
#include "cache.h"
+#include "bulk-checkin.h"
#include "config.h"
#include "object-store.h"
#include "object.h"
@@ -177,7 +178,7 @@ static void write_cached_object(struct object *obj, struct obj_buffer *obj_buf)
struct object_id oid;
if (write_object_file(obj_buf->buffer, obj_buf->size,
- type_name(obj->type), &oid) < 0)
+ obj->type, &oid) < 0)
die("failed to write object %s", oid_to_hex(&obj->oid));
obj->flags |= FLAG_WRITTEN;
}
@@ -243,7 +244,7 @@ static void write_object(unsigned nr, enum object_type type,
void *buf, unsigned long size)
{
if (!strict) {
- if (write_object_file(buf, size, type_name(type),
+ if (write_object_file(buf, size, type,
&obj_list[nr].oid) < 0)
die("failed to write object");
added_object(nr, type, buf, size);
@@ -251,7 +252,7 @@ static void write_object(unsigned nr, enum object_type type,
obj_list[nr].obj = NULL;
} else if (type == OBJ_BLOB) {
struct blob *blob;
- if (write_object_file(buf, size, type_name(type),
+ if (write_object_file(buf, size, type,
&obj_list[nr].oid) < 0)
die("failed to write object");
added_object(nr, type, buf, size);
@@ -266,7 +267,7 @@ static void write_object(unsigned nr, enum object_type type,
} else {
struct object *obj;
int eaten;
- hash_object_file(the_hash_algo, buf, size, type_name(type),
+ hash_object_file(the_hash_algo, buf, size, type,
&obj_list[nr].oid);
added_object(nr, type, buf, size);
obj = parse_object_buffer(the_repository, &obj_list[nr].oid,
@@ -503,10 +504,12 @@ static void unpack_all(void)
if (!quiet)
progress = start_progress(_("Unpacking objects"), nr_objects);
CALLOC_ARRAY(obj_list, nr_objects);
+ begin_odb_transaction();
for (i = 0; i < nr_objects; i++) {
unpack_one(i);
display_progress(progress, i + 1);
}
+ end_odb_transaction();
stop_progress(&progress);
if (delta_list)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 187203e..43c713c 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -5,6 +5,7 @@
*/
#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "cache.h"
+#include "bulk-checkin.h"
#include "config.h"
#include "lockfile.h"
#include "quote.h"
@@ -57,6 +58,14 @@ static void report(const char *fmt, ...)
if (!verbose)
return;
+ /*
+ * It is possible, though unlikely, that a caller could use the verbose
+ * output to synchronize with addition of objects to the object
+ * database. The current implementation of ODB transactions leaves
+ * objects invisible while a transaction is active, so flush the
+ * transaction here before reporting a change made by update-index.
+ */
+ flush_odb_transaction();
va_start(vp, fmt);
vprintf(fmt, vp);
putchar('\n');
@@ -606,7 +615,7 @@ static struct cache_entry *read_one_ent(const char *which,
error("%s: not in %s branch.", path, which);
return NULL;
}
- if (mode == S_IFDIR) {
+ if (!the_index.sparse_index && mode == S_IFDIR) {
if (which)
error("%s: not a blob in %s branch.", path, which);
return NULL;
@@ -743,8 +752,6 @@ static int do_reupdate(int ac, const char **av,
*/
has_head = 0;
redo:
- /* TODO: audit for interaction with sparse-index. */
- ensure_full_index(&the_index);
for (pos = 0; pos < active_nr; pos++) {
const struct cache_entry *ce = active_cache[pos];
struct cache_entry *old = NULL;
@@ -761,6 +768,16 @@ static int do_reupdate(int ac, const char **av,
discard_cache_entry(old);
continue; /* unchanged */
}
+
+ /* At this point, we know the contents of the sparse directory are
+ * modified with respect to HEAD, so we expand the index and restart
+ * to process each path individually
+ */
+ if (S_ISSPARSEDIR(ce->ce_mode)) {
+ ensure_full_index(&the_index);
+ goto redo;
+ }
+
/* Be careful. The working tree may not have the
* path anymore, in which case, under 'allow_remove',
* or worse yet 'allow_replace', active_nr may decrease.
@@ -787,6 +804,17 @@ static int refresh(struct refresh_params *o, unsigned int flag)
setup_work_tree();
read_cache();
*o->has_errors |= refresh_cache(o->flags | flag);
+ if (has_racy_timestamp(&the_index)) {
+ /*
+ * Even if nothing else has changed, updating the file
+ * increases the chance that racy timestamps become
+ * non-racy, helping future run-time performance.
+ * We do that even in case of "errors" returned by
+ * refresh_cache() as these are no actual errors.
+ * cmd_status() does the same.
+ */
+ active_cache_changed |= SOMETHING_CHANGED;
+ }
return 0;
}
@@ -1077,6 +1105,9 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
git_config(git_default_config, NULL);
+ prepare_repo_settings(r);
+ the_repository->settings.command_requires_full_index = 0;
+
/* we will diagnose later if it turns out that we need to update it */
newfd = hold_locked_index(&lock_file, 0);
if (newfd < 0)
@@ -1094,6 +1125,12 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
*/
parse_options_start(&ctx, argc, argv, prefix,
options, PARSE_OPT_STOP_AT_NON_OPTION);
+
+ /*
+ * Allow the object layer to optimize adding multiple objects in
+ * a batch.
+ */
+ begin_odb_transaction();
while (ctx.argc) {
if (parseopt_state != PARSE_OPT_DONE)
parseopt_state = parse_options_step(&ctx, options,
@@ -1168,6 +1205,11 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
strbuf_release(&buf);
}
+ /*
+ * By now we have added all of the new objects
+ */
+ end_odb_transaction();
+
if (split_index > 0) {
if (git_config_get_split_index() == 0)
warning(_("core.splitIndex is set to false; "
@@ -1214,14 +1256,17 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
}
if (fsmonitor > 0) {
- if (git_config_get_fsmonitor() == 0)
+ enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
+ if (fsm_mode == FSMONITOR_MODE_DISABLED) {
warning(_("core.fsmonitor is unset; "
"set it if you really want to "
"enable fsmonitor"));
+ }
add_fsmonitor(&the_index);
report(_("fsmonitor enabled"));
} else if (!fsmonitor) {
- if (git_config_get_fsmonitor() == 1)
+ enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
+ if (fsm_mode > FSMONITOR_MODE_DISABLED)
warning(_("core.fsmonitor is set; "
"remove it if you really want to "
"disable fsmonitor"));
diff --git a/builtin/update-server-info.c b/builtin/update-server-info.c
index 4321a34..880fffe 100644
--- a/builtin/update-server-info.c
+++ b/builtin/update-server-info.c
@@ -4,7 +4,7 @@
#include "parse-options.h"
static const char * const update_server_info_usage[] = {
- N_("git update-server-info [--force]"),
+ "git update-server-info [--force]",
NULL
};
diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index 24654b4..98d028d 100644
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -77,7 +77,7 @@ static ssize_t process_input(int child_fd, int band)
int cmd_upload_archive(int argc, const char **argv, const char *prefix)
{
- struct child_process writer = { argv };
+ struct child_process writer = CHILD_PROCESS_INIT;
if (argc == 2 && !strcmp(argv[1], "-h"))
usage(upload_archive_usage);
@@ -89,9 +89,10 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
* multiplexed out to our fd#1. If the child dies, we tell the other
* end over channel #3.
*/
- argv[0] = "upload-archive--writer";
writer.out = writer.err = -1;
writer.git_cmd = 1;
+ strvec_push(&writer.args, "upload-archive--writer");
+ strvec_pushv(&writer.args, argv + 1);
if (start_command(&writer)) {
int err = errno;
packet_write_fmt(1, "NACK unable to spawn subprocess\n");
diff --git a/builtin/var.c b/builtin/var.c
index 6c6f46b..491db27 100644
--- a/builtin/var.c
+++ b/builtin/var.c
@@ -5,6 +5,7 @@
*/
#include "builtin.h"
#include "config.h"
+#include "refs.h"
static const char var_usage[] = "git var (-l | <variable>)";
@@ -27,6 +28,11 @@ static const char *pager(int flag)
return pgm;
}
+static const char *default_branch(int flag)
+{
+ return git_default_branch_name(1);
+}
+
struct git_var {
const char *name;
const char *(*read)(int);
@@ -36,6 +42,7 @@ static struct git_var git_vars[] = {
{ "GIT_AUTHOR_IDENT", git_author_info },
{ "GIT_EDITOR", editor },
{ "GIT_PAGER", pager },
+ { "GIT_DEFAULT_BRANCH", default_branch },
{ "", NULL },
};
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 0d0a80d..cd62eef 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -8,6 +8,7 @@
#include "branch.h"
#include "refs.h"
#include "run-command.h"
+#include "hook.h"
#include "sigchain.h"
#include "submodule.h"
#include "utf8.h"
@@ -21,6 +22,7 @@ static const char * const worktree_usage[] = {
N_("git worktree move <worktree> <new-path>"),
N_("git worktree prune [<options>]"),
N_("git worktree remove [<options>] <worktree>"),
+ N_("git worktree repair [<path>...]"),
N_("git worktree unlock <path>"),
NULL
};
@@ -71,7 +73,7 @@ static void delete_worktrees_dir_if_empty(void)
static void prune_worktree(const char *id, const char *reason)
{
if (show_only || verbose)
- printf_ln(_("Removing %s/%s: %s"), "worktrees", id, reason);
+ fprintf_ln(stderr, _("Removing %s/%s: %s"), "worktrees", id, reason);
if (!show_only)
delete_git_dir(id);
}
@@ -235,6 +237,74 @@ static void check_candidate_path(const char *path,
die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), path, cmd);
}
+static void copy_sparse_checkout(const char *worktree_git_dir)
+{
+ char *from_file = git_pathdup("info/sparse-checkout");
+ char *to_file = xstrfmt("%s/info/sparse-checkout", worktree_git_dir);
+
+ if (file_exists(from_file)) {
+ if (safe_create_leading_directories(to_file) ||
+ copy_file(to_file, from_file, 0666))
+ error(_("failed to copy '%s' to '%s'; sparse-checkout may not work correctly"),
+ from_file, to_file);
+ }
+
+ free(from_file);
+ free(to_file);
+}
+
+static void copy_filtered_worktree_config(const char *worktree_git_dir)
+{
+ char *from_file = git_pathdup("config.worktree");
+ char *to_file = xstrfmt("%s/config.worktree", worktree_git_dir);
+
+ if (file_exists(from_file)) {
+ struct config_set cs = { { 0 } };
+ const char *core_worktree;
+ int bare;
+
+ if (safe_create_leading_directories(to_file) ||
+ copy_file(to_file, from_file, 0666)) {
+ error(_("failed to copy worktree config from '%s' to '%s'"),
+ from_file, to_file);
+ goto worktree_copy_cleanup;
+ }
+
+ git_configset_init(&cs);
+ git_configset_add_file(&cs, from_file);
+
+ if (!git_configset_get_bool(&cs, "core.bare", &bare) &&
+ bare &&
+ git_config_set_multivar_in_file_gently(
+ to_file, "core.bare", NULL, "true", 0))
+ error(_("failed to unset '%s' in '%s'"),
+ "core.bare", to_file);
+ if (!git_configset_get_value(&cs, "core.worktree", &core_worktree) &&
+ git_config_set_in_file_gently(to_file,
+ "core.worktree", NULL))
+ error(_("failed to unset '%s' in '%s'"),
+ "core.worktree", to_file);
+
+ git_configset_clear(&cs);
+ }
+
+worktree_copy_cleanup:
+ free(from_file);
+ free(to_file);
+}
+
+static int checkout_worktree(const struct add_opts *opts,
+ struct strvec *child_env)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+ cp.git_cmd = 1;
+ strvec_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL);
+ if (opts->quiet)
+ strvec_push(&cp.args, "--quiet");
+ strvec_pushv(&cp.env, child_env->v);
+ return run_command(&cp);
+}
+
static int add_worktree(const char *path, const char *refname,
const struct add_opts *opts)
{
@@ -334,6 +404,21 @@ static int add_worktree(const char *path, const char *refname,
strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
write_file(sb.buf, "../..");
+ /*
+ * If the current worktree has sparse-checkout enabled, then copy
+ * the sparse-checkout patterns from the current worktree.
+ */
+ if (core_apply_sparse_checkout)
+ copy_sparse_checkout(sb_repo.buf);
+
+ /*
+ * If we are using worktree config, then copy all current config
+ * values from the current worktree into the new one, that way the
+ * new worktree behaves the same as this one.
+ */
+ if (repository_format_worktree_config)
+ copy_filtered_worktree_config(sb_repo.buf);
+
strvec_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
strvec_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
cp.git_cmd = 1;
@@ -348,22 +433,14 @@ static int add_worktree(const char *path, const char *refname,
strvec_push(&cp.args, "--quiet");
}
- cp.env = child_env.v;
+ strvec_pushv(&cp.env, child_env.v);
ret = run_command(&cp);
if (ret)
goto done;
- if (opts->checkout) {
- cp.argv = NULL;
- strvec_clear(&cp.args);
- strvec_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL);
- if (opts->quiet)
- strvec_push(&cp.args, "--quiet");
- cp.env = child_env.v;
- ret = run_command(&cp);
- if (ret)
- goto done;
- }
+ if (opts->checkout &&
+ (ret = checkout_worktree(opts, &child_env)))
+ goto done;
is_junk = 0;
FREE_AND_NULL(junk_work_tree);
@@ -381,22 +458,17 @@ static int add_worktree(const char *path, const char *refname,
* is_junk is cleared, but do return appropriate code when hook fails.
*/
if (!ret && opts->checkout) {
- const char *hook = find_hook("post-checkout");
- if (hook) {
- const char *env[] = { "GIT_DIR", "GIT_WORK_TREE", NULL };
- cp.git_cmd = 0;
- cp.no_stdin = 1;
- cp.stdout_to_stderr = 1;
- cp.dir = path;
- cp.env = env;
- cp.argv = NULL;
- cp.trace2_hook_name = "post-checkout";
- strvec_pushl(&cp.args, absolute_path(hook),
- oid_to_hex(null_oid()),
- oid_to_hex(&commit->object.oid),
- "1", NULL);
- ret = run_command(&cp);
- }
+ struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+
+ strvec_pushl(&opt.env, "GIT_DIR", "GIT_WORK_TREE", NULL);
+ strvec_pushl(&opt.args,
+ oid_to_hex(null_oid()),
+ oid_to_hex(&commit->object.oid),
+ "1",
+ NULL);
+ opt.dir = path;
+
+ ret = run_hooks_opt("post-checkout", &opt);
}
strvec_clear(&child_env);
@@ -417,24 +489,24 @@ static void print_preparing_worktree_line(int detach,
if (force_new_branch) {
struct commit *commit = lookup_commit_reference_by_name(new_branch);
if (!commit)
- printf_ln(_("Preparing worktree (new branch '%s')"), new_branch);
+ fprintf_ln(stderr, _("Preparing worktree (new branch '%s')"), new_branch);
else
- printf_ln(_("Preparing worktree (resetting branch '%s'; was at %s)"),
+ fprintf_ln(stderr, _("Preparing worktree (resetting branch '%s'; was at %s)"),
new_branch,
find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));
} else if (new_branch) {
- printf_ln(_("Preparing worktree (new branch '%s')"), new_branch);
+ fprintf_ln(stderr, _("Preparing worktree (new branch '%s')"), new_branch);
} else {
struct strbuf s = STRBUF_INIT;
if (!detach && !strbuf_check_branch_ref(&s, branch) &&
ref_exists(s.buf))
- printf_ln(_("Preparing worktree (checking out '%s')"),
+ fprintf_ln(stderr, _("Preparing worktree (checking out '%s')"),
branch);
else {
struct commit *commit = lookup_commit_reference_by_name(branch);
if (!commit)
die(_("invalid reference: %s"), branch);
- printf_ln(_("Preparing worktree (detached HEAD %s)"),
+ fprintf_ln(stderr, _("Preparing worktree (detached HEAD %s)"),
find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));
}
strbuf_release(&s);
@@ -503,9 +575,9 @@ static int add(int ac, const char **av, const char *prefix)
opts.checkout = 1;
ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
if (!!opts.detach + !!new_branch + !!new_branch_force > 1)
- die(_("-b, -B, and --detach are mutually exclusive"));
+ die(_("options '%s', '%s', and '%s' cannot be used together"), "-b", "-B", "--detach");
if (lock_reason && !keep_locked)
- die(_("--reason requires --lock"));
+ die(_("the option '%s' requires '%s'"), "--reason", "--lock");
if (lock_reason)
opts.keep_locked = lock_reason;
else if (keep_locked)
@@ -579,35 +651,37 @@ static int add(int ac, const char **av, const char *prefix)
return add_worktree(path, branch, &opts);
}
-static void show_worktree_porcelain(struct worktree *wt)
+static void show_worktree_porcelain(struct worktree *wt, int line_terminator)
{
const char *reason;
- printf("worktree %s\n", wt->path);
+ printf("worktree %s%c", wt->path, line_terminator);
if (wt->is_bare)
- printf("bare\n");
+ printf("bare%c", line_terminator);
else {
- printf("HEAD %s\n", oid_to_hex(&wt->head_oid));
+ printf("HEAD %s%c", oid_to_hex(&wt->head_oid), line_terminator);
if (wt->is_detached)
- printf("detached\n");
+ printf("detached%c", line_terminator);
else if (wt->head_ref)
- printf("branch %s\n", wt->head_ref);
+ printf("branch %s%c", wt->head_ref, line_terminator);
}
reason = worktree_lock_reason(wt);
- if (reason && *reason) {
- struct strbuf sb = STRBUF_INIT;
- quote_c_style(reason, &sb, NULL, 0);
- printf("locked %s\n", sb.buf);
- strbuf_release(&sb);
- } else if (reason)
- printf("locked\n");
+ if (reason) {
+ fputs("locked", stdout);
+ if (*reason) {
+ fputc(' ', stdout);
+ write_name_quoted(reason, stdout, line_terminator);
+ } else {
+ fputc(line_terminator, stdout);
+ }
+ }
reason = worktree_prune_reason(wt, expire);
if (reason)
- printf("prunable %s\n", reason);
+ printf("prunable %s%c", reason, line_terminator);
- printf("\n");
+ fputc(line_terminator, stdout);
}
static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len)
@@ -685,12 +759,15 @@ static void pathsort(struct worktree **wt)
static int list(int ac, const char **av, const char *prefix)
{
int porcelain = 0;
+ int line_terminator = '\n';
struct option options[] = {
OPT_BOOL(0, "porcelain", &porcelain, N_("machine-readable output")),
OPT__VERBOSE(&verbose, N_("show extended annotations and reasons, if available")),
OPT_EXPIRY_DATE(0, "expire", &expire,
N_("add 'prunable' annotation to worktrees older than <time>")),
+ OPT_SET_INT('z', NULL, &line_terminator,
+ N_("terminate records with a NUL character"), '\0'),
OPT_END()
};
@@ -699,7 +776,9 @@ static int list(int ac, const char **av, const char *prefix)
if (ac)
usage_with_options(worktree_usage, options);
else if (verbose && porcelain)
- die(_("--verbose and --porcelain are mutually exclusive"));
+ die(_("options '%s' and '%s' cannot be used together"), "--verbose", "--porcelain");
+ else if (!line_terminator && !porcelain)
+ die(_("the option '%s' requires '%s'"), "-z", "--porcelain");
else {
struct worktree **worktrees = get_worktrees();
int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i;
@@ -712,7 +791,8 @@ static int list(int ac, const char **av, const char *prefix)
for (i = 0; worktrees[i]; i++) {
if (porcelain)
- show_worktree_porcelain(worktrees[i]);
+ show_worktree_porcelain(worktrees[i],
+ line_terminator);
else
show_worktree(worktrees[i], path_maxlen, abbrev);
}
@@ -909,9 +989,9 @@ static void check_clean_worktree(struct worktree *wt,
validate_no_submodules(wt);
child_process_init(&cp);
- strvec_pushf(&cp.env_array, "%s=%s/.git",
+ strvec_pushf(&cp.env, "%s=%s/.git",
GIT_DIR_ENVIRONMENT, wt->path);
- strvec_pushf(&cp.env_array, "%s=%s",
+ strvec_pushf(&cp.env, "%s=%s",
GIT_WORK_TREE_ENVIRONMENT, wt->path);
strvec_pushl(&cp.args, "status",
"--porcelain", "--ignore-submodules=none",
@@ -1005,7 +1085,7 @@ static int remove_worktree(int ac, const char **av, const char *prefix)
static void report_repair(int iserr, const char *path, const char *msg, void *cb_data)
{
if (!iserr) {
- printf_ln(_("repair: %s: %s"), msg, path);
+ fprintf_ln(stderr, _("repair: %s: %s"), msg, path);
} else {
int *exit_status = (int *)cb_data;
fprintf_ln(stderr, _("error: %s: %s"), msg, path);
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 8785b2a..98ec893 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -3,16 +3,21 @@
*/
#include "cache.h"
#include "bulk-checkin.h"
+#include "lockfile.h"
#include "repository.h"
#include "csum-file.h"
#include "pack.h"
#include "strbuf.h"
+#include "string-list.h"
+#include "tmp-objdir.h"
#include "packfile.h"
#include "object-store.h"
-static struct bulk_checkin_state {
- unsigned plugged:1;
+static int odb_transaction_nesting;
+static struct tmp_objdir *bulk_fsync_objdir;
+
+static struct bulk_checkin_packfile {
char *pack_tmp_name;
struct hashfile *f;
off_t offset;
@@ -21,7 +26,7 @@ static struct bulk_checkin_state {
struct pack_idx_entry **written;
uint32_t alloc_written;
uint32_t nr_written;
-} state;
+} bulk_checkin_packfile;
static void finish_tmp_packfile(struct strbuf *basename,
const char *pack_tmp_name,
@@ -33,13 +38,13 @@ static void finish_tmp_packfile(struct strbuf *basename,
char *idx_tmp_name = NULL;
stage_tmp_packfiles(basename, pack_tmp_name, written_list, nr_written,
- pack_idx_opts, hash, &idx_tmp_name);
+ NULL, pack_idx_opts, hash, &idx_tmp_name);
rename_tmp_packfile_idx(basename, &idx_tmp_name);
free(idx_tmp_name);
}
-static void finish_bulk_checkin(struct bulk_checkin_state *state)
+static void flush_bulk_checkin_packfile(struct bulk_checkin_packfile *state)
{
unsigned char hash[GIT_MAX_RAWSZ];
struct strbuf packname = STRBUF_INIT;
@@ -53,9 +58,10 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state)
unlink(state->pack_tmp_name);
goto clear_exit;
} else if (state->nr_written == 1) {
- finalize_hashfile(state->f, hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);
+ finalize_hashfile(state->f, hash, FSYNC_COMPONENT_PACK,
+ CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);
} else {
- int fd = finalize_hashfile(state->f, hash, 0);
+ int fd = finalize_hashfile(state->f, hash, FSYNC_COMPONENT_PACK, 0);
fixup_pack_header_footer(fd, hash, state->pack_tmp_name,
state->nr_written, hash,
state->offset);
@@ -79,7 +85,41 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state)
reprepare_packed_git(the_repository);
}
-static int already_written(struct bulk_checkin_state *state, struct object_id *oid)
+/*
+ * Cleanup after batch-mode fsync_object_files.
+ */
+static void flush_batch_fsync(void)
+{
+ struct strbuf temp_path = STRBUF_INIT;
+ struct tempfile *temp;
+
+ if (!bulk_fsync_objdir)
+ return;
+
+ /*
+ * Issue a full hardware flush against a temporary file to ensure
+ * that all objects are durable before any renames occur. The code in
+ * fsync_loose_object_bulk_checkin has already issued a writeout
+ * request, but it has not flushed any writeback cache in the storage
+ * hardware or any filesystem logs. This fsync call acts as a barrier
+ * to ensure that the data in each new object file is durable before
+ * the final name is visible.
+ */
+ strbuf_addf(&temp_path, "%s/bulk_fsync_XXXXXX", get_object_directory());
+ temp = xmks_tempfile(temp_path.buf);
+ fsync_or_die(get_tempfile_fd(temp), get_tempfile_path(temp));
+ delete_tempfile(&temp);
+ strbuf_release(&temp_path);
+
+ /*
+ * Make the object files visible in the primary ODB after their data is
+ * fully durable.
+ */
+ tmp_objdir_migrate(bulk_fsync_objdir);
+ bulk_fsync_objdir = NULL;
+}
+
+static int already_written(struct bulk_checkin_packfile *state, struct object_id *oid)
{
int i;
@@ -111,7 +151,7 @@ static int already_written(struct bulk_checkin_state *state, struct object_id *o
* status before calling us just in case we ask it to call us again
* with a new pack.
*/
-static int stream_to_pack(struct bulk_checkin_state *state,
+static int stream_to_pack(struct bulk_checkin_packfile *state,
git_hash_ctx *ctx, off_t *already_hashed_to,
int fd, size_t size, enum object_type type,
const char *path, unsigned flags)
@@ -188,7 +228,7 @@ static int stream_to_pack(struct bulk_checkin_state *state,
}
/* Lazily create backing packfile for the state */
-static void prepare_to_stream(struct bulk_checkin_state *state,
+static void prepare_to_stream(struct bulk_checkin_packfile *state,
unsigned flags)
{
if (!(flags & HASH_WRITE_OBJECT) || state->f)
@@ -203,7 +243,7 @@ static void prepare_to_stream(struct bulk_checkin_state *state,
die_errno("unable to write pack header");
}
-static int deflate_to_pack(struct bulk_checkin_state *state,
+static int deflate_to_pack(struct bulk_checkin_packfile *state,
struct object_id *result_oid,
int fd, size_t size,
enum object_type type, const char *path,
@@ -220,8 +260,8 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
if (seekback == (off_t) -1)
return error("cannot find the current offset");
- header_len = xsnprintf((char *)obuf, sizeof(obuf), "%s %" PRIuMAX,
- type_name(type), (uintmax_t)size) + 1;
+ header_len = format_object_header((char *)obuf, sizeof(obuf),
+ type, size);
the_hash_algo->init_fn(&ctx);
the_hash_algo->update_fn(&ctx, obuf, header_len);
@@ -250,7 +290,7 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
BUG("should not happen");
hashfile_truncate(state->f, &checkpoint);
state->offset = checkpoint.offset;
- finish_bulk_checkin(state);
+ flush_bulk_checkin_packfile(state);
if (lseek(fd, seekback, SEEK_SET) == (off_t) -1)
return error("cannot seek back");
}
@@ -273,25 +313,67 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
return 0;
}
+void prepare_loose_object_bulk_checkin(void)
+{
+ /*
+ * We lazily create the temporary object directory
+ * the first time an object might be added, since
+ * callers may not know whether any objects will be
+ * added at the time they call begin_odb_transaction.
+ */
+ if (!odb_transaction_nesting || bulk_fsync_objdir)
+ return;
+
+ bulk_fsync_objdir = tmp_objdir_create("bulk-fsync");
+ if (bulk_fsync_objdir)
+ tmp_objdir_replace_primary_odb(bulk_fsync_objdir, 0);
+}
+
+void fsync_loose_object_bulk_checkin(int fd, const char *filename)
+{
+ /*
+ * If we have an active ODB transaction, we issue a call that
+ * cleans the filesystem page cache but avoids a hardware flush
+ * command. Later on we will issue a single hardware flush
+ * before renaming the objects to their final names as part of
+ * flush_batch_fsync.
+ */
+ if (!bulk_fsync_objdir ||
+ git_fsync(fd, FSYNC_WRITEOUT_ONLY) < 0) {
+ fsync_or_die(fd, filename);
+ }
+}
+
int index_bulk_checkin(struct object_id *oid,
int fd, size_t size, enum object_type type,
const char *path, unsigned flags)
{
- int status = deflate_to_pack(&state, oid, fd, size, type,
+ int status = deflate_to_pack(&bulk_checkin_packfile, oid, fd, size, type,
path, flags);
- if (!state.plugged)
- finish_bulk_checkin(&state);
+ if (!odb_transaction_nesting)
+ flush_bulk_checkin_packfile(&bulk_checkin_packfile);
return status;
}
-void plug_bulk_checkin(void)
+void begin_odb_transaction(void)
{
- state.plugged = 1;
+ odb_transaction_nesting += 1;
}
-void unplug_bulk_checkin(void)
+void flush_odb_transaction(void)
{
- state.plugged = 0;
- if (state.f)
- finish_bulk_checkin(&state);
+ flush_batch_fsync();
+ flush_bulk_checkin_packfile(&bulk_checkin_packfile);
+}
+
+void end_odb_transaction(void)
+{
+ odb_transaction_nesting -= 1;
+ if (odb_transaction_nesting < 0)
+ BUG("Unbalanced ODB transaction nesting");
+
+ if (odb_transaction_nesting)
+ return;
+
+ flush_odb_transaction();
}
diff --git a/bulk-checkin.h b/bulk-checkin.h
index b26f3dc..8281b9c 100644
--- a/bulk-checkin.h
+++ b/bulk-checkin.h
@@ -6,11 +6,34 @@
#include "cache.h"
+void prepare_loose_object_bulk_checkin(void);
+void fsync_loose_object_bulk_checkin(int fd, const char *filename);
+
int index_bulk_checkin(struct object_id *oid,
int fd, size_t size, enum object_type type,
const char *path, unsigned flags);
-void plug_bulk_checkin(void);
-void unplug_bulk_checkin(void);
+/*
+ * Tell the object database to optimize for adding
+ * multiple objects. end_odb_transaction must be called
+ * to make new objects visible. Transactions can be nested,
+ * and objects are only visible after the outermost transaction
+ * is complete or the transaction is flushed.
+ */
+void begin_odb_transaction(void);
+
+/*
+ * Make any objects that are currently part of a pending object
+ * database transaction visible. It is valid to call this function
+ * even if no transaction is active.
+ */
+void flush_odb_transaction(void);
+
+/*
+ * Tell the object database to make any objects from the
+ * current transaction visible if this is the final nested
+ * transaction.
+ */
+void end_odb_transaction(void);
#endif
diff --git a/bundle.c b/bundle.c
index a0bb687..0208e6d 100644
--- a/bundle.c
+++ b/bundle.c
@@ -11,7 +11,7 @@
#include "run-command.h"
#include "refs.h"
#include "strvec.h"
-
+#include "list-objects-filter-options.h"
static const char v2_bundle_signature[] = "# v2 git bundle\n";
static const char v3_bundle_signature[] = "# v3 git bundle\n";
@@ -33,6 +33,7 @@ void bundle_header_release(struct bundle_header *header)
{
string_list_clear(&header->prerequisites, 1);
string_list_clear(&header->references, 1);
+ list_objects_filter_release(&header->filter);
}
static int parse_capability(struct bundle_header *header, const char *capability)
@@ -45,6 +46,10 @@ static int parse_capability(struct bundle_header *header, const char *capability
header->hash_algo = &hash_algos[algo];
return 0;
}
+ if (skip_prefix(capability, "filter=", &arg)) {
+ parse_list_objects_filter(&header->filter, arg);
+ return 0;
+ }
return error(_("unknown capability '%s'"), capability);
}
@@ -61,8 +66,8 @@ static int parse_bundle_signature(struct bundle_header *header, const char *line
return -1;
}
-static int parse_bundle_header(int fd, struct bundle_header *header,
- const char *report_path)
+int read_bundle_header_fd(int fd, struct bundle_header *header,
+ const char *report_path)
{
struct strbuf buf = STRBUF_INIT;
int status = 0;
@@ -138,7 +143,7 @@ int read_bundle_header(const char *path, struct bundle_header *header)
if (fd < 0)
return error(_("could not open '%s'"), path);
- return parse_bundle_header(fd, header, path);
+ return read_bundle_header_fd(fd, header, path);
}
int is_bundle(const char *path, int quiet)
@@ -148,7 +153,7 @@ int is_bundle(const char *path, int quiet)
if (fd < 0)
return 0;
- fd = parse_bundle_header(fd, &header, quiet ? NULL : path);
+ fd = read_bundle_header_fd(fd, &header, quiet ? NULL : path);
if (fd >= 0)
close(fd);
bundle_header_release(&header);
@@ -191,14 +196,16 @@ int verify_bundle(struct repository *r,
* to be verbose about the errors
*/
struct string_list *p = &header->prerequisites;
- struct rev_info revs;
+ struct rev_info revs = REV_INFO_INIT;
const char *argv[] = {NULL, "--all", NULL};
struct commit *commit;
int i, ret = 0, req_nr;
const char *message = _("Repository lacks these prerequisite commits:");
- if (!r || !r->objects || !r->objects->odb)
- return error(_("need a repository to verify a bundle"));
+ if (!r || !r->objects || !r->objects->odb) {
+ ret = error(_("need a repository to verify a bundle"));
+ goto cleanup;
+ }
repo_init_revisions(r, &revs, NULL);
for (i = 0; i < p->nr; i++) {
@@ -216,10 +223,12 @@ int verify_bundle(struct repository *r,
error("%s %s", oid_to_hex(oid), name);
}
if (revs.pending.nr != p->nr)
- return ret;
+ goto cleanup;
req_nr = revs.pending.nr;
setup_revisions(2, argv, &revs, NULL);
+ list_objects_filter_copy(&revs.filter, &header->filter);
+
if (prepare_revision_walk(&revs))
die(_("revision walk setup failed"));
@@ -255,21 +264,30 @@ int verify_bundle(struct repository *r,
r = &header->references;
printf_ln(Q_("The bundle contains this ref:",
- "The bundle contains these %d refs:",
+ "The bundle contains these %"PRIuMAX" refs:",
r->nr),
- r->nr);
+ (uintmax_t)r->nr);
list_refs(r, 0, NULL);
+
r = &header->prerequisites;
if (!r->nr) {
printf_ln(_("The bundle records a complete history."));
} else {
printf_ln(Q_("The bundle requires this ref:",
- "The bundle requires these %d refs:",
+ "The bundle requires these %"PRIuMAX" refs:",
r->nr),
- r->nr);
+ (uintmax_t)r->nr);
list_refs(r, 0, NULL);
}
+
+ printf_ln("The bundle uses this hash algorithm: %s",
+ header->hash_algo->name);
+ if (header->filter.choice)
+ printf_ln("The bundle uses this filter: %s",
+ list_objects_filter_spec(&header->filter));
}
+cleanup:
+ release_revisions(&revs);
return ret;
}
@@ -319,6 +337,9 @@ static int write_pack_data(int bundle_fd, struct rev_info *revs, struct strvec *
"--stdout", "--thin", "--delta-base-offset",
NULL);
strvec_pushv(&pack_objects.args, pack_options->v);
+ if (revs->filter.choice)
+ strvec_pushf(&pack_objects.args, "--filter=%s",
+ list_objects_filter_spec(&revs->filter));
pack_objects.in = -1;
pack_objects.out = bundle_fd;
pack_objects.git_cmd = 1;
@@ -486,10 +507,37 @@ int create_bundle(struct repository *r, const char *path,
int bundle_to_stdout;
int ref_count = 0;
struct rev_info revs, revs_copy;
- int min_version = the_hash_algo == &hash_algos[GIT_HASH_SHA1] ? 2 : 3;
+ int min_version = 2;
struct bundle_prerequisites_info bpi;
int i;
+ /* init revs to list objects for pack-objects later */
+ save_commit_buffer = 0;
+ repo_init_revisions(r, &revs, NULL);
+
+ /*
+ * Pre-initialize the '--objects' flag so we can parse a
+ * --filter option successfully.
+ */
+ revs.tree_objects = revs.blob_objects = 1;
+
+ argc = setup_revisions(argc, argv, &revs, NULL);
+
+ /*
+ * Reasons to require version 3:
+ *
+ * 1. @object-format is required because our hash algorithm is not
+ * SHA1.
+ * 2. @filter is required because we parsed an object filter.
+ */
+ if (the_hash_algo != &hash_algos[GIT_HASH_SHA1] || revs.filter.choice)
+ min_version = 3;
+
+ if (argc > 1) {
+ error(_("unrecognized argument: %s"), argv[1]);
+ goto err;
+ }
+
bundle_to_stdout = !strcmp(path, "-");
if (bundle_to_stdout)
bundle_fd = 1;
@@ -512,17 +560,14 @@ int create_bundle(struct repository *r, const char *path,
write_or_die(bundle_fd, capability, strlen(capability));
write_or_die(bundle_fd, the_hash_algo->name, strlen(the_hash_algo->name));
write_or_die(bundle_fd, "\n", 1);
- }
- /* init revs to list objects for pack-objects later */
- save_commit_buffer = 0;
- repo_init_revisions(r, &revs, NULL);
-
- argc = setup_revisions(argc, argv, &revs, NULL);
-
- if (argc > 1) {
- error(_("unrecognized argument: %s"), argv[1]);
- goto err;
+ if (revs.filter.choice) {
+ const char *value = expand_list_objects_filter_spec(&revs.filter);
+ capability = "@filter=";
+ write_or_die(bundle_fd, capability, strlen(capability));
+ write_or_die(bundle_fd, value, strlen(value));
+ write_or_die(bundle_fd, "\n", 1);
+ }
}
/* save revs.pending in revs_copy for later use */
@@ -544,6 +589,12 @@ int create_bundle(struct repository *r, const char *path,
die("revision walk setup failed");
bpi.fd = bundle_fd;
bpi.pending = &revs_copy.pending;
+
+ /*
+ * Remove any object walking here. We only care about commits and
+ * tags here. The revs_copy has the right instances of these values.
+ */
+ revs.blob_objects = revs.tree_objects = 0;
traverse_commit_list(&revs, write_bundle_prerequisites, NULL, &bpi);
object_array_remove_duplicates(&revs_copy.pending);
@@ -574,6 +625,10 @@ int unbundle(struct repository *r, struct bundle_header *header,
struct child_process ip = CHILD_PROCESS_INIT;
strvec_pushl(&ip.args, "index-pack", "--fix-thin", "--stdin", NULL);
+ /* If there is a filter, then we need to create the promisor pack. */
+ if (header->filter.choice)
+ strvec_push(&ip.args, "--promisor=from-bundle");
+
if (extra_index_pack_args) {
strvec_pushv(&ip.args, extra_index_pack_args->v);
strvec_clear(extra_index_pack_args);
diff --git a/bundle.h b/bundle.h
index 06009fe..0c052f5 100644
--- a/bundle.h
+++ b/bundle.h
@@ -4,12 +4,14 @@
#include "strvec.h"
#include "cache.h"
#include "string-list.h"
+#include "list-objects-filter-options.h"
struct bundle_header {
unsigned version;
struct string_list prerequisites;
struct string_list references;
const struct git_hash_algo *hash_algo;
+ struct list_objects_filter_options filter;
};
#define BUNDLE_HEADER_INIT \
@@ -22,6 +24,8 @@ void bundle_header_release(struct bundle_header *header);
int is_bundle(const char *path, int quiet);
int read_bundle_header(const char *path, struct bundle_header *header);
+int read_bundle_header_fd(int fd, struct bundle_header *header,
+ const char *report_path);
int create_bundle(struct repository *r, const char *path,
int argc, const char **argv, struct strvec *pack_options,
int version);
diff --git a/cache-tree.c b/cache-tree.c
index 90919f9..a92c23e 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -3,6 +3,7 @@
#include "tree.h"
#include "tree-walk.h"
#include "cache-tree.h"
+#include "bulk-checkin.h"
#include "object-store.h"
#include "replace-object.h"
#include "promisor-remote.h"
@@ -100,6 +101,33 @@ struct cache_tree_sub *cache_tree_sub(struct cache_tree *it, const char *path)
return find_subtree(it, path, pathlen, 1);
}
+struct cache_tree *cache_tree_find_path(struct cache_tree *it, const char *path)
+{
+ const char *slash;
+ int namelen;
+ struct cache_tree_sub it_sub = {
+ .cache_tree = it,
+ };
+ struct cache_tree_sub *down = &it_sub;
+
+ while (down) {
+ slash = strchrnul(path, '/');
+ namelen = slash - path;
+ down->cache_tree->entry_count = -1;
+ if (!*slash) {
+ int pos;
+ pos = cache_tree_subtree_pos(down->cache_tree, path, namelen);
+ if (0 <= pos)
+ return down->cache_tree->down[pos]->cache_tree;
+ return NULL;
+ }
+ down = find_subtree(it, path, namelen, 0);
+ path = slash + 1;
+ }
+
+ return NULL;
+}
+
static int do_invalidate_path(struct cache_tree *it, const char *path)
{
/* a/b/c
@@ -432,16 +460,17 @@ static int update_one(struct cache_tree *it,
if (repair) {
struct object_id oid;
hash_object_file(the_hash_algo, buffer.buf, buffer.len,
- tree_type, &oid);
+ OBJ_TREE, &oid);
if (has_object_file_with_flags(&oid, OBJECT_INFO_SKIP_FETCH_OBJECT))
oidcpy(&it->oid, &oid);
else
to_invalidate = 1;
} else if (dryrun) {
hash_object_file(the_hash_algo, buffer.buf, buffer.len,
- tree_type, &it->oid);
- } else if (write_object_file(buffer.buf, buffer.len, tree_type,
- &it->oid)) {
+ OBJ_TREE, &it->oid);
+ } else if (write_object_file_flags(buffer.buf, buffer.len, OBJ_TREE,
+ &it->oid, flags & WRITE_TREE_SILENT
+ ? HASH_SILENT : 0)) {
strbuf_release(&buffer);
return -1;
}
@@ -473,8 +502,10 @@ int cache_tree_update(struct index_state *istate, int flags)
trace_performance_enter();
trace2_region_enter("cache_tree", "update", the_repository);
+ begin_odb_transaction();
i = update_one(istate->cache_tree, istate->cache, istate->cache_nr,
"", 0, &skip, flags);
+ end_odb_transaction();
trace2_region_leave("cache_tree", "update", the_repository);
trace_performance_leave("cache_tree_update");
if (i < 0)
@@ -740,15 +771,26 @@ int write_index_as_tree(struct object_id *oid, struct index_state *index_state,
return ret;
}
+static void prime_cache_tree_sparse_dir(struct cache_tree *it,
+ struct tree *tree)
+{
+
+ oidcpy(&it->oid, &tree->object.oid);
+ it->entry_count = 1;
+}
+
static void prime_cache_tree_rec(struct repository *r,
struct cache_tree *it,
- struct tree *tree)
+ struct tree *tree,
+ struct strbuf *tree_path)
{
struct tree_desc desc;
struct name_entry entry;
int cnt;
+ int base_path_len = tree_path->len;
oidcpy(&it->oid, &tree->object.oid);
+
init_tree_desc(&desc, tree->buffer, tree->size);
cnt = 0;
while (tree_entry(&desc, &entry)) {
@@ -757,14 +799,40 @@ static void prime_cache_tree_rec(struct repository *r,
else {
struct cache_tree_sub *sub;
struct tree *subtree = lookup_tree(r, &entry.oid);
+
if (!subtree->object.parsed)
parse_tree(subtree);
sub = cache_tree_sub(it, entry.path);
sub->cache_tree = cache_tree();
- prime_cache_tree_rec(r, sub->cache_tree, subtree);
+
+ /*
+ * Recursively-constructed subtree path is only needed when working
+ * in a sparse index (where it's used to determine whether the
+ * subtree is a sparse directory in the index).
+ */
+ if (r->index->sparse_index) {
+ strbuf_setlen(tree_path, base_path_len);
+ strbuf_grow(tree_path, base_path_len + entry.pathlen + 1);
+ strbuf_add(tree_path, entry.path, entry.pathlen);
+ strbuf_addch(tree_path, '/');
+ }
+
+ /*
+ * If a sparse index is in use, the directory being processed may be
+ * sparse. To confirm that, we can check whether an entry with that
+ * exact name exists in the index. If it does, the created subtree
+ * should be sparse. Otherwise, cache tree expansion should continue
+ * as normal.
+ */
+ if (r->index->sparse_index &&
+ index_entry_exists(r->index, tree_path->buf, tree_path->len))
+ prime_cache_tree_sparse_dir(sub->cache_tree, subtree);
+ else
+ prime_cache_tree_rec(r, sub->cache_tree, subtree, tree_path);
cnt += sub->cache_tree->entry_count;
}
}
+
it->entry_count = cnt;
}
@@ -772,11 +840,14 @@ void prime_cache_tree(struct repository *r,
struct index_state *istate,
struct tree *tree)
{
+ struct strbuf tree_path = STRBUF_INIT;
+
trace2_region_enter("cache-tree", "prime_cache_tree", the_repository);
cache_tree_free(&istate->cache_tree);
istate->cache_tree = cache_tree();
- prime_cache_tree_rec(r, istate->cache_tree, tree);
+ prime_cache_tree_rec(r, istate->cache_tree, tree, &tree_path);
+ strbuf_release(&tree_path);
istate->cache_changed |= CACHE_TREE_CHANGED;
trace2_region_leave("cache-tree", "prime_cache_tree", the_repository);
}
@@ -826,10 +897,17 @@ static void verify_one_sparse(struct repository *r,
path->buf);
}
-static void verify_one(struct repository *r,
- struct index_state *istate,
- struct cache_tree *it,
- struct strbuf *path)
+/*
+ * Returns:
+ * 0 - Verification completed.
+ * 1 - Restart verification - a call to ensure_full_index() freed the cache
+ * tree that is being verified and verification needs to be restarted from
+ * the new toplevel cache tree.
+ */
+static int verify_one(struct repository *r,
+ struct index_state *istate,
+ struct cache_tree *it,
+ struct strbuf *path)
{
int i, pos, len = path->len;
struct strbuf tree_buf = STRBUF_INIT;
@@ -837,21 +915,30 @@ static void verify_one(struct repository *r,
for (i = 0; i < it->subtree_nr; i++) {
strbuf_addf(path, "%s/", it->down[i]->name);
- verify_one(r, istate, it->down[i]->cache_tree, path);
+ if (verify_one(r, istate, it->down[i]->cache_tree, path))
+ return 1;
strbuf_setlen(path, len);
}
if (it->entry_count < 0 ||
/* no verification on tests (t7003) that replace trees */
lookup_replace_object(r, &it->oid) != &it->oid)
- return;
+ return 0;
if (path->len) {
+ /*
+ * If the index is sparse and the cache tree is not
+ * index_name_pos() may trigger ensure_full_index() which will
+ * free the tree that is being verified.
+ */
+ int is_sparse = istate->sparse_index;
pos = index_name_pos(istate, path->buf, path->len);
+ if (is_sparse && !istate->sparse_index)
+ return 1;
if (pos >= 0) {
verify_one_sparse(r, istate, it, path, pos);
- return;
+ return 0;
}
pos = -pos - 1;
@@ -891,7 +978,7 @@ static void verify_one(struct repository *r,
strbuf_addf(&tree_buf, "%o %.*s%c", mode, entlen, name, '\0');
strbuf_add(&tree_buf, oid->hash, r->hash_algo->rawsz);
}
- hash_object_file(r->hash_algo, tree_buf.buf, tree_buf.len, tree_type,
+ hash_object_file(r->hash_algo, tree_buf.buf, tree_buf.len, OBJ_TREE,
&new_oid);
if (!oideq(&new_oid, &it->oid))
BUG("cache-tree for path %.*s does not match. "
@@ -899,6 +986,7 @@ static void verify_one(struct repository *r,
oid_to_hex(&new_oid), oid_to_hex(&it->oid));
strbuf_setlen(path, len);
strbuf_release(&tree_buf);
+ return 0;
}
void cache_tree_verify(struct repository *r, struct index_state *istate)
@@ -907,6 +995,10 @@ void cache_tree_verify(struct repository *r, struct index_state *istate)
if (!istate->cache_tree)
return;
- verify_one(r, istate, istate->cache_tree, &path);
+ if (verify_one(r, istate, istate->cache_tree, &path)) {
+ strbuf_reset(&path);
+ if (verify_one(r, istate, istate->cache_tree, &path))
+ BUG("ensure_full_index() called twice while verifying cache tree");
+ }
strbuf_release(&path);
}
diff --git a/cache-tree.h b/cache-tree.h
index 8efecce..f75f8e7 100644
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -29,6 +29,8 @@ struct cache_tree_sub *cache_tree_sub(struct cache_tree *, const char *);
int cache_tree_subtree_pos(struct cache_tree *it, const char *path, int pathlen);
+struct cache_tree *cache_tree_find_path(struct cache_tree *it, const char *path);
+
void cache_tree_write(struct strbuf *, struct cache_tree *root);
struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
diff --git a/cache.h b/cache.h
index d092820..ac5ab4e 100644
--- a/cache.h
+++ b/cache.h
@@ -18,7 +18,6 @@
#include "repository.h"
#include "mem-pool.h"
-#include <zlib.h>
typedef struct git_zstream {
z_stream z;
unsigned long avail_in;
@@ -311,6 +310,29 @@ struct untracked_cache;
struct progress;
struct pattern_list;
+enum sparse_index_mode {
+ /*
+ * There are no sparse directories in the index at all.
+ *
+ * Repositories that don't use cone-mode sparse-checkout will
+ * always have their indexes in this mode.
+ */
+ INDEX_EXPANDED = 0,
+
+ /*
+ * The index has already been collapsed to sparse directories
+ * whereever possible.
+ */
+ INDEX_COLLAPSED,
+
+ /*
+ * The sparse directories that exist are outside the
+ * sparse-checkout boundary, but it is possible that some file
+ * entries could collapse to sparse directory entries.
+ */
+ INDEX_PARTIALLY_SPARSE,
+};
+
struct index_state {
struct cache_entry **cache;
unsigned int version;
@@ -324,14 +346,8 @@ struct index_state {
drop_cache_tree : 1,
updated_workdir : 1,
updated_skipworktree : 1,
- fsmonitor_has_run_once : 1,
-
- /*
- * sparse_index == 1 when sparse-directory
- * entries exist. Requires sparse-checkout
- * in cone mode.
- */
- sparse_index : 1;
+ fsmonitor_has_run_once : 1;
+ enum sparse_index_mode sparse_index;
struct hashmap name_hash;
struct hashmap dir_hash;
struct object_id oid;
@@ -350,8 +366,6 @@ void add_name_hash(struct index_state *istate, struct cache_entry *ce);
void remove_name_hash(struct index_state *istate, struct cache_entry *ce);
void free_name_hash(struct index_state *istate);
-void ensure_full_index(struct index_state *istate);
-
/* Cache entry creation and cleanup */
/*
@@ -569,7 +583,7 @@ extern char *git_work_tree_cfg;
int is_inside_work_tree(void);
const char *get_git_dir(void);
const char *get_git_common_dir(void);
-char *get_object_directory(void);
+const char *get_object_directory(void);
char *get_index_file(void);
char *get_graft_file(struct repository *r);
void set_git_dir(const char *path, int make_realpath);
@@ -817,6 +831,16 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na
int index_name_pos(struct index_state *, const char *name, int namelen);
/*
+ * Determines whether an entry with the given name exists within the
+ * given index. The return value is 1 if an exact match is found, otherwise
+ * it is 0. Note that, unlike index_name_pos, this function does not expand
+ * the index if it is sparse. If an item exists within the full index but it
+ * is contained within a sparse directory (and not in the sparse index), 0 is
+ * returned.
+ */
+int index_entry_exists(struct index_state *, const char *name, int namelen);
+
+/*
* Some functions return the negative complement of an insert position when a
* precise match was not found but a position was found where the entry would
* need to be inserted. This helper protects that logic from any integer
@@ -881,12 +905,14 @@ void *read_blob_data_from_index(struct index_state *, const char *, unsigned lon
#define CE_MATCH_IGNORE_FSMONITOR 0X20
int is_racy_timestamp(const struct index_state *istate,
const struct cache_entry *ce);
+int has_racy_timestamp(struct index_state *istate);
int ie_match_stat(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
int ie_modified(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
#define HASH_WRITE_OBJECT 1
#define HASH_FORMAT_CHECK 2
#define HASH_RENORMALIZE 4
+#define HASH_SILENT 8
int index_fd(struct index_state *istate, struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
int index_path(struct index_state *istate, struct object_id *oid, const char *path, struct stat *st, unsigned flags);
@@ -984,15 +1010,70 @@ void reset_shared_repository(void);
extern int read_replace_refs;
extern char *git_replace_ref_base;
+/*
+ * These values are used to help identify parts of a repository to fsync.
+ * FSYNC_COMPONENT_NONE identifies data that will not be a persistent part of the
+ * repository and so shouldn't be fsynced.
+ */
+enum fsync_component {
+ FSYNC_COMPONENT_NONE,
+ FSYNC_COMPONENT_LOOSE_OBJECT = 1 << 0,
+ FSYNC_COMPONENT_PACK = 1 << 1,
+ FSYNC_COMPONENT_PACK_METADATA = 1 << 2,
+ FSYNC_COMPONENT_COMMIT_GRAPH = 1 << 3,
+ FSYNC_COMPONENT_INDEX = 1 << 4,
+ FSYNC_COMPONENT_REFERENCE = 1 << 5,
+};
+
+#define FSYNC_COMPONENTS_OBJECTS (FSYNC_COMPONENT_LOOSE_OBJECT | \
+ FSYNC_COMPONENT_PACK)
+
+#define FSYNC_COMPONENTS_DERIVED_METADATA (FSYNC_COMPONENT_PACK_METADATA | \
+ FSYNC_COMPONENT_COMMIT_GRAPH)
+
+#define FSYNC_COMPONENTS_DEFAULT ((FSYNC_COMPONENTS_OBJECTS | \
+ FSYNC_COMPONENTS_DERIVED_METADATA) & \
+ ~FSYNC_COMPONENT_LOOSE_OBJECT)
+
+#define FSYNC_COMPONENTS_COMMITTED (FSYNC_COMPONENTS_OBJECTS | \
+ FSYNC_COMPONENT_REFERENCE)
+
+#define FSYNC_COMPONENTS_ADDED (FSYNC_COMPONENTS_COMMITTED | \
+ FSYNC_COMPONENT_INDEX)
+
+#define FSYNC_COMPONENTS_ALL (FSYNC_COMPONENT_LOOSE_OBJECT | \
+ FSYNC_COMPONENT_PACK | \
+ FSYNC_COMPONENT_PACK_METADATA | \
+ FSYNC_COMPONENT_COMMIT_GRAPH | \
+ FSYNC_COMPONENT_INDEX | \
+ FSYNC_COMPONENT_REFERENCE)
+
+#ifndef FSYNC_COMPONENTS_PLATFORM_DEFAULT
+#define FSYNC_COMPONENTS_PLATFORM_DEFAULT FSYNC_COMPONENTS_DEFAULT
+#endif
+
+/*
+ * A bitmask indicating which components of the repo should be fsynced.
+ */
+extern enum fsync_component fsync_components;
extern int fsync_object_files;
+extern int use_fsync;
+
+enum fsync_method {
+ FSYNC_METHOD_FSYNC,
+ FSYNC_METHOD_WRITEOUT_ONLY,
+ FSYNC_METHOD_BATCH,
+};
+
+extern enum fsync_method fsync_method;
extern int core_preload_index;
extern int precomposed_unicode;
extern int protect_hfs;
extern int protect_ntfs;
-extern const char *core_fsmonitor;
extern int core_apply_sparse_checkout;
extern int core_sparse_checkout_cone;
+extern int sparse_expect_files_outside_of_patterns;
/*
* Returns the boolean value of $GIT_OPTIONAL_LOCKS (or the default value).
@@ -1268,11 +1349,64 @@ char *xdg_cache_home(const char *filename);
int git_open_cloexec(const char *name, int flags);
#define git_open(name) git_open_cloexec(name, O_RDONLY)
-int unpack_loose_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz);
-int parse_loose_header(const char *hdr, unsigned long *sizep);
+/**
+ * unpack_loose_header() initializes the data stream needed to unpack
+ * a loose object header.
+ *
+ * Returns:
+ *
+ * - ULHR_OK on success
+ * - ULHR_BAD on error
+ * - ULHR_TOO_LONG if the header was too long
+ *
+ * It will only parse up to MAX_HEADER_LEN bytes unless an optional
+ * "hdrbuf" argument is non-NULL. This is intended for use with
+ * OBJECT_INFO_ALLOW_UNKNOWN_TYPE to extract the bad type for (error)
+ * reporting. The full header will be extracted to "hdrbuf" for use
+ * with parse_loose_header(), ULHR_TOO_LONG will still be returned
+ * from this function to indicate that the header was too long.
+ */
+enum unpack_loose_header_result {
+ ULHR_OK,
+ ULHR_BAD,
+ ULHR_TOO_LONG,
+};
+enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,
+ unsigned char *map,
+ unsigned long mapsize,
+ void *buffer,
+ unsigned long bufsiz,
+ struct strbuf *hdrbuf);
+
+/**
+ * parse_loose_header() parses the starting "<type> <len>\0" of an
+ * object. If it doesn't follow that format -1 is returned. To check
+ * the validity of the <type> populate the "typep" in the "struct
+ * object_info". It will be OBJ_BAD if the object type is unknown. The
+ * parsed <len> can be retrieved via "oi->sizep", and from there
+ * passed to unpack_loose_rest().
+ */
+struct object_info;
+int parse_loose_header(const char *hdr, struct object_info *oi);
+
+/**
+ * With in-core object data in "buf", rehash it to make sure the
+ * object name actually matches "oid" to detect object corruption.
+ *
+ * A negative value indicates an error, usually that the OID is not
+ * what we expected, but it might also indicate another error.
+ */
int check_object_signature(struct repository *r, const struct object_id *oid,
- void *buf, unsigned long size, const char *type);
+ void *map, unsigned long size,
+ enum object_type type);
+
+/**
+ * A streaming version of check_object_signature().
+ * Try reading the object named with "oid" using
+ * the streaming interface and rehash it to do the same.
+ */
+int stream_object_signature(struct repository *r, const struct object_id *oid);
int finalize_object_file(const char *tmpfile, const char *filename);
@@ -1326,6 +1460,7 @@ struct object_context {
#define GET_OID_FOLLOW_SYMLINKS 0100
#define GET_OID_RECORD_PATH 0200
#define GET_OID_ONLY_TO_DIE 04000
+#define GET_OID_REQUIRE_PATH 010000
#define GET_OID_DISAMBIGUATORS \
(GET_OID_COMMIT | GET_OID_COMMITTISH | \
@@ -1498,7 +1633,7 @@ int cache_name_stage_compare(const char *name1, int len1, int stage1, const char
void *read_object_with_reference(struct repository *r,
const struct object_id *oid,
- const char *required_type,
+ enum object_type required_type,
unsigned long *size,
struct object_id *oid_ret);
@@ -1508,47 +1643,6 @@ struct object *repo_peel_to_type(struct repository *r,
#define peel_to_type(name, namelen, obj, type) \
repo_peel_to_type(the_repository, name, namelen, obj, type)
-enum date_mode_type {
- DATE_NORMAL = 0,
- DATE_HUMAN,
- DATE_RELATIVE,
- DATE_SHORT,
- DATE_ISO8601,
- DATE_ISO8601_STRICT,
- DATE_RFC2822,
- DATE_STRFTIME,
- DATE_RAW,
- DATE_UNIX
-};
-
-struct date_mode {
- enum date_mode_type type;
- const char *strftime_fmt;
- int local;
-};
-
-/*
- * Convenience helper for passing a constant type, like:
- *
- * show_date(t, tz, DATE_MODE(NORMAL));
- */
-#define DATE_MODE(t) date_mode_from_type(DATE_##t)
-struct date_mode *date_mode_from_type(enum date_mode_type type);
-
-const char *show_date(timestamp_t time, int timezone, const struct date_mode *mode);
-void show_date_relative(timestamp_t time, struct strbuf *timebuf);
-void show_date_human(timestamp_t time, int tz, const struct timeval *now,
- struct strbuf *timebuf);
-int parse_date(const char *date, struct strbuf *out);
-int parse_date_basic(const char *date, timestamp_t *timestamp, int *offset);
-int parse_expiry_date(const char *date, timestamp_t *timestamp);
-void datestamp(struct strbuf *out);
-#define approxidate(s) approxidate_careful((s), NULL)
-timestamp_t approxidate_careful(const char *, int *);
-timestamp_t approxidate_relative(const char *date);
-void parse_date_format(const char *format, struct date_mode *mode);
-int date_overflows(timestamp_t date);
-
#define IDENT_STRICT 1
#define IDENT_NO_DATE 2
#define IDENT_NO_NAME 4
@@ -1595,14 +1689,6 @@ struct ident_split {
int split_ident_line(struct ident_split *, const char *, int);
/*
- * Like show_date, but pull the timestamp and tz parameters from
- * the ident_split. It will also sanity-check the values and produce
- * a well-known sentinel date if they appear bogus.
- */
-const char *show_ident_date(const struct ident_split *id,
- const struct date_mode *mode);
-
-/*
* Compare split idents for equality or strict ordering. Note that we
* compare only the ident part of the line, ignoring any timestamp.
*
@@ -1699,6 +1785,13 @@ int copy_file_with_time(const char *dst, const char *src, int mode);
void write_or_die(int fd, const void *buf, size_t count);
void fsync_or_die(int fd, const char *);
+int fsync_component(enum fsync_component component, int fd);
+void fsync_component_or_die(enum fsync_component component, int fd, const char *msg);
+
+static inline int batch_fsync_enabled(enum fsync_component component)
+{
+ return (fsync_components & component) && (fsync_method == FSYNC_METHOD_BATCH);
+}
ssize_t read_in_full(int fd, void *buf, size_t count);
ssize_t write_in_full(int fd, const void *buf, size_t count);
@@ -1794,8 +1887,10 @@ void overlay_tree_on_index(struct index_state *istate,
struct startup_info {
int have_repository;
const char *prefix;
+ const char *original_cwd;
};
extern struct startup_info *startup_info;
+extern const char *tmp_original_cwd;
/* merge.c */
struct commit_list;
diff --git a/cbtree.c b/cbtree.c
index b0c65d8..336e46d 100644
--- a/cbtree.c
+++ b/cbtree.c
@@ -95,38 +95,6 @@ struct cb_node *cb_lookup(struct cb_tree *t, const uint8_t *k, size_t klen)
return p && !memcmp(p->k, k, klen) ? p : NULL;
}
-struct cb_node *cb_unlink(struct cb_tree *t, const uint8_t *k, size_t klen)
-{
- struct cb_node **wherep = &t->root;
- struct cb_node **whereq = NULL;
- struct cb_node *q = NULL;
- size_t direction = 0;
- uint8_t c;
- struct cb_node *p = t->root;
-
- if (!p) return NULL; /* empty tree, nothing to delete */
-
- /* traverse to find best match, keeping link to parent */
- while (1 & (uintptr_t)p) {
- whereq = wherep;
- q = cb_node_of(p);
- c = q->byte < klen ? k[q->byte] : 0;
- direction = (1 + (q->otherbits | c)) >> 8;
- wherep = q->child + direction;
- p = *wherep;
- }
-
- if (memcmp(p->k, k, klen))
- return NULL; /* no match, nothing unlinked */
-
- /* found an exact match */
- if (whereq) /* update parent */
- *whereq = q->child[1 - direction];
- else
- t->root = NULL;
- return p;
-}
-
static enum cb_next cb_descend(struct cb_node *p, cb_iter fn, void *arg)
{
if (1 & (uintptr_t)p) {
diff --git a/cbtree.h b/cbtree.h
index dedbb8e..0be14fb 100644
--- a/cbtree.h
+++ b/cbtree.h
@@ -47,7 +47,6 @@ static inline void cb_init(struct cb_tree *t)
struct cb_node *cb_lookup(struct cb_tree *, const uint8_t *k, size_t klen);
struct cb_node *cb_insert(struct cb_tree *, struct cb_node *, size_t klen);
-struct cb_node *cb_unlink(struct cb_tree *t, const uint8_t *k, size_t klen);
typedef enum cb_next (*cb_iter)(struct cb_node *, void *arg);
diff --git a/chunk-format.c b/chunk-format.c
index 1c3dca6..0275b74 100644
--- a/chunk-format.c
+++ b/chunk-format.c
@@ -181,3 +181,15 @@ int read_chunk(struct chunkfile *cf,
return CHUNK_NOT_FOUND;
}
+
+uint8_t oid_version(const struct git_hash_algo *algop)
+{
+ switch (hash_algo_by_ptr(algop)) {
+ case GIT_HASH_SHA1:
+ return 1;
+ case GIT_HASH_SHA256:
+ return 2;
+ default:
+ die(_("invalid hash version"));
+ }
+}
diff --git a/chunk-format.h b/chunk-format.h
index 9ccbe00..7885aa0 100644
--- a/chunk-format.h
+++ b/chunk-format.h
@@ -2,6 +2,7 @@
#define CHUNK_FORMAT_H
#include "git-compat-util.h"
+#include "hash.h"
struct hashfile;
struct chunkfile;
@@ -65,4 +66,6 @@ int read_chunk(struct chunkfile *cf,
chunk_read_fn fn,
void *data);
+uint8_t oid_version(const struct git_hash_algo *algop);
+
#endif
diff --git a/ci/check-directional-formatting.bash b/ci/check-directional-formatting.bash
new file mode 100755
index 0000000..e6211b1
--- /dev/null
+++ b/ci/check-directional-formatting.bash
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# This script verifies that the non-binary files tracked in the Git index do
+# not contain any Unicode directional formatting: such formatting could be used
+# to deceive reviewers into interpreting code differently from the compiler.
+# This is intended to run on an Ubuntu agent in a GitHub workflow.
+#
+# To allow translated messages to introduce such directional formatting in the
+# future, we exclude the `.po` files from this validation.
+#
+# Neither GNU grep nor `git grep` (not even with `-P`) handle `\u` as a way to
+# specify UTF-8.
+#
+# To work around that, we use `printf` to produce the pattern as a byte
+# sequence, and then feed that to `git grep` as a byte sequence (setting
+# `LC_CTYPE` to make sure that the arguments are interpreted as intended).
+#
+# Note: we need to use Bash here because its `printf` interprets `\uNNNN` as
+# UTF-8 code points, as desired. Running this script through Ubuntu's `dash`,
+# for example, would use a `printf` that does not understand that syntax.
+
+# U+202a..U+2a2e: LRE, RLE, PDF, LRO and RLO
+# U+2066..U+2069: LRI, RLI, FSI and PDI
+regex='(\u202a|\u202b|\u202c|\u202d|\u202e|\u2066|\u2067|\u2068|\u2069)'
+
+! LC_CTYPE=C git grep -El "$(LC_CTYPE=C.UTF-8 printf "$regex")" \
+ -- ':(exclude,attr:binary)' ':(exclude)*.po'
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 1d0e48f..107757a 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -5,24 +5,17 @@
. ${0%/*}/lib.sh
-P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
+P4WHENCE=https://cdist2.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|linux-leaks)
- sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+case "$runs_on_pool" in
+ubuntu-latest)
sudo apt-get -q update
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
- ;;
- esac
-
+ $UBUNTU_COMMON_PKGS $CC_PACKAGE
mkdir --parents "$P4_PATH"
pushd "$P4_PATH"
wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
@@ -37,29 +30,33 @@
cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
popd
;;
-osx-clang|osx-gcc)
+macos-latest)
export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
# Uncomment this if you want to run perf tests:
# brew install gnu-time
test -z "$BREW_INSTALL_PACKAGES" ||
brew install $BREW_INSTALL_PACKAGES
brew link --force gettext
- brew install --cask --no-quarantine perforce || {
- # Update the definitions and try again
- cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask &&
- git -C "$cask_repo" pull --no-stat --ff-only &&
- brew install --cask --no-quarantine perforce
- } ||
- brew install homebrew/cask/perforce
- case "$jobname" in
- osx-gcc)
- brew install gcc@9
- # Just in case the image is updated to contain gcc@9
- # pre-installed but not linked.
- brew link gcc@9
- ;;
- esac
+ mkdir -p $HOME/bin
+ (
+ cd $HOME/bin
+ wget -q "https://cdist2.perforce.com/perforce/r21.2/bin.macosx1015x86_64/helix-core-server.tgz" &&
+ tar -xf helix-core-server.tgz &&
+ sudo xattr -d com.apple.quarantine p4 p4d 2>/dev/null || true
+ )
+ PATH="$PATH:${HOME}/bin"
+ export PATH
+
+ if test -n "$CC_PACKAGE"
+ then
+ BREW_PACKAGE=${CC_PACKAGE/-/@}
+ brew install "$BREW_PACKAGE"
+ brew link "$BREW_PACKAGE"
+ fi
;;
+esac
+
+case "$jobname" in
StaticAnalysis)
sudo apt-get -q update
sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
@@ -77,21 +74,25 @@
test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
sudo gem install --version 1.5.8 asciidoctor
;;
-linux-gcc-default|linux-gcc-4.8)
+linux-gcc-default)
sudo apt-get -q update
sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
;;
esac
-if type p4d >/dev/null && type p4 >/dev/null
+if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1
then
echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
p4d -V | grep Rev.
echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
p4 -V | grep Rev.
+else
+ echo >&2 "WARNING: perforce wasn't installed, see above for clues why"
fi
-if type git-lfs >/dev/null
+if type git-lfs >/dev/null 2>&1
then
echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)"
git-lfs version
+else
+ echo >&2 "WARNING: git-lfs wasn't installed, see above for clues why"
fi
diff --git a/ci/install-docker-dependencies.sh b/ci/install-docker-dependencies.sh
index 07a8c6b..78b7e32 100755
--- a/ci/install-docker-dependencies.sh
+++ b/ci/install-docker-dependencies.sh
@@ -4,7 +4,7 @@
#
case "$jobname" in
-Linux32)
+linux32)
linux32 --32bit i386 sh -c '
apt update >/dev/null &&
apt install -y build-essential libcurl4-openssl-dev \
diff --git a/ci/lib.sh b/ci/lib.sh
index 82cb17f..2f6d9d2 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -1,5 +1,50 @@
# Library of functions shared by all CI scripts
+if test true != "$GITHUB_ACTIONS"
+then
+ begin_group () { :; }
+ end_group () { :; }
+
+ group () {
+ shift
+ "$@"
+ }
+ set -x
+else
+ begin_group () {
+ need_to_end_group=t
+ echo "::group::$1" >&2
+ set -x
+ }
+
+ end_group () {
+ test -n "$need_to_end_group" || return 0
+ set +x
+ need_to_end_group=
+ echo '::endgroup::' >&2
+ }
+ trap end_group EXIT
+
+ group () {
+ set +x
+ begin_group "$1"
+ shift
+ "$@"
+ res=$?
+ end_group
+ return $res
+ }
+
+ begin_group "CI setup"
+fi
+
+# Set 'exit on error' for all CI scripts to let the caller know that
+# something went wrong.
+#
+# We already enabled tracing executed commands earlier. This helps by showing
+# how # environment variables are set and and dependencies are installed.
+set -e
+
skip_branch_tip_with_tag () {
# Sometimes, a branch is pushed at the same time the tag that points
# at the same commit as the tip of the branch is pushed, and building
@@ -34,7 +79,7 @@
# successfully before (e.g. because the branch got rebased, changing only
# the commit messages).
skip_good_tree () {
- if test "$TRAVIS_DEBUG_MODE" = true || test true = "$GITHUB_ACTIONS"
+ if test true = "$GITHUB_ACTIONS"
then
return
fi
@@ -60,7 +105,7 @@
cat <<-EOF
$(tput setaf 2)Skipping build job for commit $CI_COMMIT.$(tput sgr0)
This commit's tree has already been built and tested successfully in build job $prev_good_job_number for commit $prev_good_commit.
- The log of that build job is available at $(url_for_job_id $prev_good_job_id)
+ The log of that build job is available at $SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$prev_good_job_id
To force a re-build delete the branch's cache and then hit 'Restart job'.
EOF
fi
@@ -69,8 +114,7 @@
exit 0
}
-check_unignored_build_artifacts ()
-{
+check_unignored_build_artifacts () {
! git ls-files --other --exclude-standard --error-unmatch \
-- ':/*' 2>/dev/null ||
{
@@ -79,41 +123,17 @@
}
}
+handle_failed_tests () {
+ return 1
+}
+
# 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=
-# Set 'exit on error' for all CI scripts to let the caller know that
-# something went wrong.
-# Set tracing executed commands, primarily setting environment variables
-# and installing dependencies.
-set -ex
-
-if test true = "$TRAVIS"
-then
- CI_TYPE=travis
- # When building a PR, TRAVIS_BRANCH refers to the *target* branch. Not
- # what we want here. We want the source branch instead.
- CI_BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
- CI_COMMIT="$TRAVIS_COMMIT"
- CI_JOB_ID="$TRAVIS_JOB_ID"
- CI_JOB_NUMBER="$TRAVIS_JOB_NUMBER"
- CI_OS_NAME="$TRAVIS_OS_NAME"
- CI_REPO_SLUG="$TRAVIS_REPO_SLUG"
-
- cache_dir="$HOME/travis-cache"
-
- url_for_job_id () {
- echo "https://travis-ci.org/$CI_REPO_SLUG/jobs/$1"
- }
-
- BREW_INSTALL_PACKAGES="git-lfs gettext"
- export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
- export GIT_TEST_OPTS="--verbose-log -x --immediate"
- MAKEFLAGS="$MAKEFLAGS --jobs=2"
-elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
+if test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
then
CI_TYPE=azure-pipelines
# We are running in Azure Pipelines
@@ -130,10 +150,6 @@
# among *all* phases)
cache_dir="$HOME/test-cache/$SYSTEM_PHASENAME"
- url_for_job_id () {
- echo "$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1"
- }
-
export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
MAKEFLAGS="$MAKEFLAGS --jobs=10"
@@ -148,13 +164,33 @@
test macos != "$CI_OS_NAME" || CI_OS_NAME=osx
CI_REPO_SLUG="$GITHUB_REPOSITORY"
CI_JOB_ID="$GITHUB_RUN_ID"
- CC="${CC:-gcc}"
+ CC="${CC_PACKAGE:-${CC:-gcc}}"
DONT_SKIP_TAGS=t
+ handle_failed_tests () {
+ mkdir -p t/failed-test-artifacts
+ echo "FAILED_TEST_ARTIFACTS=t/failed-test-artifacts" >>$GITHUB_ENV
+
+ for test_exit in t/test-results/*.exit
+ do
+ test 0 != "$(cat "$test_exit")" || continue
+
+ test_name="${test_exit%.exit}"
+ test_name="${test_name##*/}"
+ printf "\\e[33m\\e[1m=== Failed test: ${test_name} ===\\e[m\\n"
+ echo "The full logs are in the artifacts attached to this run."
+ cat "t/test-results/$test_name.markup"
+
+ trash_dir="t/trash directory.$test_name"
+ cp "t/test-results/$test_name.out" t/failed-test-artifacts/
+ tar czf t/failed-test-artifacts/"$test_name".trash.tar.gz "$trash_dir"
+ done
+ return 1
+ }
cache_dir="$HOME/none"
export GIT_PROVE_OPTS="--timer --jobs 10"
- export GIT_TEST_OPTS="--verbose-log -x"
+ export GIT_TEST_OPTS="--verbose-log -x --github-workflow-markup"
MAKEFLAGS="$MAKEFLAGS --jobs=10"
test windows != "$CI_OS_NAME" ||
GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
@@ -182,11 +218,15 @@
export GIT_TEST_CLONE_2GB=true
export SKIP_DASHED_BUILT_INS=YesPlease
-case "$jobname" in
-linux-clang|linux-gcc|linux-leaks)
+case "$runs_on_pool" in
+ubuntu-latest)
+ if test "$jobname" = "linux-gcc-default"
+ then
+ break
+ fi
+
if [ "$jobname" = linux-gcc ]
then
- export CC=gcc-8
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3"
else
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2"
@@ -206,23 +246,18 @@
GIT_LFS_PATH="$HOME/custom/git-lfs"
export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
;;
-osx-clang|osx-gcc)
+macos-latest)
if [ "$jobname" = osx-gcc ]
then
- export CC=gcc-9
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
else
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
fi
+ ;;
+esac
- # t9810 occasionally fails on Travis CI OS X
- # t9816 occasionally fails with "TAP out of sequence errors" on
- # Travis CI OS X
- export GIT_SKIP_TESTS="t9810 t9816"
- ;;
-linux-gcc-default)
- ;;
-Linux32)
+case "$jobname" in
+linux32)
CC=gcc
;;
linux-musl)
@@ -231,9 +266,6 @@
MAKEFLAGS="$MAKEFLAGS NO_REGEX=Yes ICONV_OMITS_BOM=Yes"
MAKEFLAGS="$MAKEFLAGS GIT_TEST_UTF8_LOCALE=C.UTF-8"
;;
-esac
-
-case "$jobname" in
linux-leaks)
export SANITIZE=leak
export GIT_TEST_PASSING_SANITIZE_LEAK=true
@@ -241,3 +273,6 @@
esac
MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
+
+end_group
+set -x
diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh
index c70d6cd..57277ee 100755
--- a/ci/print-test-failures.sh
+++ b/ci/print-test-failures.sh
@@ -39,8 +39,6 @@
test_name="${test_name##*/}"
trash_dir="trash directory.$test_name"
case "$CI_TYPE" in
- travis)
- ;;
azure-pipelines)
mkdir -p failed-test-artifacts
mv "$trash_dir" failed-test-artifacts
@@ -88,11 +86,3 @@
fi
fi
done
-
-if [ $combined_trash_size -gt 0 ]
-then
- echo "------------------------------------------------------------------------"
- echo "Trash directories embedded in this log can be extracted by running:"
- echo
- echo " curl https://api.travis-ci.org/v3/job/$TRAVIS_JOB_ID/log.txt |./ci/util/extract-trash-dirs.sh"
-fi
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index cc62616..8ebff42 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -10,16 +10,13 @@
*) ln -s "$cache_dir/.prove" t/.prove;;
esac
-if test "$jobname" = "pedantic"
-then
- export DEVOPTS=pedantic
-fi
+run_tests=t
-make
case "$jobname" in
linux-gcc)
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- make test
+ ;;
+linux-TEST-vars)
export GIT_TEST_SPLIT_INDEX=yes
export GIT_TEST_MERGE_ALGORITHM=recursive
export GIT_TEST_FULL_IN_PACK_ARRAY=true
@@ -29,27 +26,31 @@
export GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1
export GIT_TEST_MULTI_PACK_INDEX=1
export GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=1
- export GIT_TEST_ADD_I_USE_BUILTIN=1
+ export GIT_TEST_ADD_I_USE_BUILTIN=0
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
export GIT_TEST_WRITE_REV_INDEX=1
export GIT_TEST_CHECKOUT_WORKERS=2
- make test
;;
linux-clang)
export GIT_TEST_DEFAULT_HASH=sha1
- make test
+ ;;
+linux-sha256)
export GIT_TEST_DEFAULT_HASH=sha256
- make test
;;
-linux-gcc-4.8|pedantic)
+pedantic)
# Don't run the tests; we only care about whether Git can be
- # built with GCC 4.8 or with pedantic
- ;;
-*)
- make test
+ # built.
+ export DEVOPTS=pedantic
+ run_tests=
;;
esac
+group Build make
+if test -n "$run_tests"
+then
+ group "Run tests" make test ||
+ handle_failed_tests
+fi
check_unignored_build_artifacts
save_good_tree
diff --git a/ci/run-docker-build.sh b/ci/run-docker-build.sh
index 8d47a5f..6cd832e 100755
--- a/ci/run-docker-build.sh
+++ b/ci/run-docker-build.sh
@@ -15,7 +15,7 @@
fi
case "$jobname" in
-Linux32)
+linux32)
switch_cmd="linux32 --32bit i386"
;;
linux-musl)
@@ -47,15 +47,6 @@
else
useradd -u $HOST_UID $CI_USER
fi
-
- # Due to a bug the test suite was run as root in the past, so
- # a prove state file created back then is only accessible by
- # root. Now that bug is fixed, the test suite is run as a
- # regular user, but the prove state file coming from Travis
- # CI's cache might still be owned by root.
- # Make sure that this user has rights to any cached files,
- # including an existing prove state file.
- test -n "$cache_dir" && chown -R $HOST_UID:$HOST_UID "$cache_dir"
fi
# Build and test
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index 37fa372..af89d16 100755
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -6,7 +6,7 @@
. ${0%/*}/lib.sh
case "$jobname" in
-Linux32)
+linux32)
CI_CONTAINER="daald/ubuntu32:xenial"
;;
linux-musl)
@@ -25,7 +25,7 @@
# root@container:/# export jobname=<jobname>
# root@container:/# /usr/src/git/ci/run-docker-build.sh <host-user-id>
-container_cache_dir=/tmp/travis-cache
+container_cache_dir=/tmp/container-cache
docker run \
--interactive \
diff --git a/ci/run-static-analysis.sh b/ci/run-static-analysis.sh
index 65bcebd..0d51e5c 100755
--- a/ci/run-static-analysis.sh
+++ b/ci/run-static-analysis.sh
@@ -29,4 +29,6 @@
make hdr-check ||
exit 1
+make check-pot
+
save_good_tree
diff --git a/ci/run-test-slice.sh b/ci/run-test-slice.sh
index f8c2c31..a3c6795 100755
--- a/ci/run-test-slice.sh
+++ b/ci/run-test-slice.sh
@@ -10,8 +10,9 @@
*) ln -s "$cache_dir/.prove" t/.prove;;
esac
-make --quiet -C t T="$(cd t &&
+group "Run tests" make --quiet -C t T="$(cd t &&
./helper/test-tool path-utils slice-tests "$1" "$2" t[0-9]*.sh |
- tr '\n' ' ')"
+ tr '\n' ' ')" ||
+handle_failed_tests
check_unignored_build_artifacts
diff --git a/color.c b/color.c
index 64f52a4..4f884c6 100644
--- a/color.c
+++ b/color.c
@@ -40,7 +40,7 @@ struct color {
enum {
COLOR_UNSPECIFIED = 0,
COLOR_NORMAL,
- COLOR_ANSI, /* basic 0-7 ANSI colors */
+ COLOR_ANSI, /* basic 0-7 ANSI colors + "default" (value = 9) */
COLOR_256,
COLOR_RGB
} type;
@@ -83,6 +83,27 @@ static int parse_ansi_color(struct color *out, const char *name, int len)
int i;
int color_offset = COLOR_FOREGROUND_ANSI;
+ if (match_word(name, len, "default")) {
+ /*
+ * Restores to the terminal's default color, which may not be
+ * the same as explicitly setting "white" or "black".
+ *
+ * ECMA-48 - Control Functions \
+ * for Coded Character Sets, 5th edition (June 1991):
+ * > 39 default display colour (implementation-defined)
+ * > 49 default background colour (implementation-defined)
+ *
+ * Although not supported /everywhere/--according to terminfo,
+ * some terminals define "op" (original pair) as a blunt
+ * "set to white on black", or even "send full SGR reset"--
+ * it's standard and well-supported enough that if a user
+ * asks for it in their config this will do the right thing.
+ */
+ out->type = COLOR_ANSI;
+ out->value = 9 + color_offset;
+ return 0;
+ }
+
if (strncasecmp(name, "bright", 6) == 0) {
color_offset = COLOR_FOREGROUND_BRIGHT_ANSI;
name += 6;
@@ -234,6 +255,7 @@ int color_parse_mem(const char *value, int value_len, char *dst)
const char *ptr = value;
int len = value_len;
char *end = dst + COLOR_MAXLEN;
+ unsigned int has_reset = 0;
unsigned int attr = 0;
struct color fg = { COLOR_UNSPECIFIED };
struct color bg = { COLOR_UNSPECIFIED };
@@ -248,12 +270,7 @@ int color_parse_mem(const char *value, int value_len, char *dst)
return 0;
}
- if (!strncasecmp(ptr, "reset", len)) {
- xsnprintf(dst, end - dst, GIT_COLOR_RESET);
- return 0;
- }
-
- /* [fg [bg]] [attr]... */
+ /* [reset] [fg [bg]] [attr]... */
while (len > 0) {
const char *word = ptr;
struct color c = { COLOR_UNSPECIFIED };
@@ -270,6 +287,11 @@ int color_parse_mem(const char *value, int value_len, char *dst)
len--;
}
+ if (match_word(word, wordlen, "reset")) {
+ has_reset = 1;
+ continue;
+ }
+
if (!parse_color(&c, word, wordlen)) {
if (fg.type == COLOR_UNSPECIFIED) {
fg = c;
@@ -295,13 +317,16 @@ int color_parse_mem(const char *value, int value_len, char *dst)
*dst++ = (x); \
} while(0)
- if (attr || !color_empty(&fg) || !color_empty(&bg)) {
+ if (has_reset || attr || !color_empty(&fg) || !color_empty(&bg)) {
int sep = 0;
int i;
OUT('\033');
OUT('[');
+ if (has_reset)
+ sep++;
+
for (i = 0; attr; i++) {
unsigned bit = (1 << i);
if (!(attr & bit))
diff --git a/color.h b/color.h
index 98894d6..cfc8f84 100644
--- a/color.h
+++ b/color.h
@@ -6,6 +6,7 @@ struct strbuf;
/*
* The maximum length of ANSI color sequence we would generate:
* - leading ESC '[' 2
+ * - reset ';' .................1
* - attr + ';' 2 * num_attr (e.g. "1;")
* - no-attr + ';' 3 * num_attr (e.g. "22;")
* - fg color + ';' 17 (e.g. "38;2;255;255;255;")
@@ -24,30 +25,42 @@ struct strbuf;
#define GIT_COLOR_NORMAL ""
#define GIT_COLOR_RESET "\033[m"
#define GIT_COLOR_BOLD "\033[1m"
+#define GIT_COLOR_BLACK "\033[30m"
#define GIT_COLOR_RED "\033[31m"
#define GIT_COLOR_GREEN "\033[32m"
#define GIT_COLOR_YELLOW "\033[33m"
#define GIT_COLOR_BLUE "\033[34m"
#define GIT_COLOR_MAGENTA "\033[35m"
#define GIT_COLOR_CYAN "\033[36m"
+#define GIT_COLOR_WHITE "\033[37m"
+#define GIT_COLOR_DEFAULT "\033[39m"
+#define GIT_COLOR_BOLD_BLACK "\033[1;30m"
#define GIT_COLOR_BOLD_RED "\033[1;31m"
#define GIT_COLOR_BOLD_GREEN "\033[1;32m"
#define GIT_COLOR_BOLD_YELLOW "\033[1;33m"
#define GIT_COLOR_BOLD_BLUE "\033[1;34m"
#define GIT_COLOR_BOLD_MAGENTA "\033[1;35m"
#define GIT_COLOR_BOLD_CYAN "\033[1;36m"
+#define GIT_COLOR_BOLD_WHITE "\033[1;37m"
+#define GIT_COLOR_BOLD_DEFAULT "\033[1;39m"
+#define GIT_COLOR_FAINT_BLACK "\033[2;30m"
#define GIT_COLOR_FAINT_RED "\033[2;31m"
#define GIT_COLOR_FAINT_GREEN "\033[2;32m"
#define GIT_COLOR_FAINT_YELLOW "\033[2;33m"
#define GIT_COLOR_FAINT_BLUE "\033[2;34m"
#define GIT_COLOR_FAINT_MAGENTA "\033[2;35m"
#define GIT_COLOR_FAINT_CYAN "\033[2;36m"
+#define GIT_COLOR_FAINT_WHITE "\033[2;37m"
+#define GIT_COLOR_FAINT_DEFAULT "\033[2;39m"
+#define GIT_COLOR_BG_BLACK "\033[40m"
#define GIT_COLOR_BG_RED "\033[41m"
#define GIT_COLOR_BG_GREEN "\033[42m"
#define GIT_COLOR_BG_YELLOW "\033[43m"
#define GIT_COLOR_BG_BLUE "\033[44m"
#define GIT_COLOR_BG_MAGENTA "\033[45m"
#define GIT_COLOR_BG_CYAN "\033[46m"
+#define GIT_COLOR_BG_WHITE "\033[47m"
+#define GIT_COLOR_BG_DEFAULT "\033[49m"
#define GIT_COLOR_FAINT "\033[2m"
#define GIT_COLOR_FAINT_ITALIC "\033[2;3m"
#define GIT_COLOR_REVERSE "\033[7m"
diff --git a/combine-diff.c b/combine-diff.c
index d93782d..b724f02 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -195,10 +195,10 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
struct lline *baseend, *newend = NULL;
int i, j, origbaselen = *lenbase;
- if (newline == NULL)
+ if (!newline)
return base;
- if (base == NULL) {
+ if (!base) {
*lenbase = lennew;
return newline;
}
diff --git a/command-list.txt b/command-list.txt
index a289f09..9bd6f3c 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -43,7 +43,7 @@
# specified here, which can only have "guide" attribute and nothing
# else.
#
-### command list (do not change this line, also do not change alignment)
+### command list (do not change this line)
# command name category [category] [category]
git-add mainporcelain worktree
git-am mainporcelain
@@ -60,9 +60,9 @@
git-check-attr purehelpers
git-check-ignore purehelpers
git-check-mailmap purehelpers
+git-check-ref-format purehelpers
git-checkout mainporcelain
git-checkout-index plumbingmanipulators
-git-check-ref-format purehelpers
git-cherry plumbinginterrogators complete
git-cherry-pick mainporcelain
git-citool mainporcelain
@@ -103,6 +103,7 @@
git-gui mainporcelain
git-hash-object plumbingmanipulators
git-help ancillaryinterrogators complete
+git-hook purehelpers
git-http-backend synchingrepositories
git-http-fetch synchelpers
git-http-push synchelpers
@@ -111,7 +112,6 @@
git-init mainporcelain init
git-instaweb ancillaryinterrogators complete
git-interpret-trailers purehelpers
-gitk mainporcelain
git-log mainporcelain info
git-ls-files plumbinginterrogators
git-ls-remote plumbinginterrogators
@@ -124,11 +124,11 @@
git-merge-file plumbingmanipulators
git-merge-index plumbingmanipulators
git-merge-one-file purehelpers
-git-mergetool ancillarymanipulators complete
git-merge-tree ancillaryinterrogators
-git-multi-pack-index plumbingmanipulators
+git-mergetool ancillarymanipulators complete
git-mktag plumbingmanipulators
git-mktree plumbingmanipulators
+git-multi-pack-index plumbingmanipulators
git-mv mainporcelain worktree
git-name-rev plumbinginterrogators
git-notes mainporcelain
@@ -154,23 +154,23 @@
git-rerere ancillaryinterrogators
git-reset mainporcelain history
git-restore mainporcelain worktree
-git-revert mainporcelain
git-rev-list plumbinginterrogators
git-rev-parse plumbinginterrogators
+git-revert mainporcelain
git-rm mainporcelain worktree
git-send-email foreignscminterface complete
git-send-pack synchingrepositories
+git-sh-i18n purehelpers
+git-sh-setup purehelpers
git-shell synchelpers
git-shortlog mainporcelain
git-show mainporcelain info
git-show-branch ancillaryinterrogators complete
git-show-index plumbinginterrogators
git-show-ref plumbinginterrogators
-git-sh-i18n purehelpers
-git-sh-setup purehelpers
-git-sparse-checkout mainporcelain worktree
-git-stash mainporcelain
+git-sparse-checkout mainporcelain
git-stage complete
+git-stash mainporcelain
git-status mainporcelain info
git-stripspace purehelpers
git-submodule mainporcelain
@@ -189,7 +189,6 @@
git-verify-commit ancillaryinterrogators
git-verify-pack plumbinginterrogators
git-verify-tag ancillaryinterrogators
-gitweb ancillaryinterrogators
git-whatchanged ancillaryinterrogators complete
git-worktree mainporcelain
git-write-tree plumbingmanipulators
@@ -204,6 +203,7 @@
gitglossary guide
githooks guide
gitignore guide
+gitk mainporcelain
gitmailmap guide
gitmodules guide
gitnamespaces guide
@@ -211,6 +211,7 @@
gitrepository-layout guide
gitrevisions guide
gitsubmodules guide
-gittutorial-2 guide
gittutorial guide
+gittutorial-2 guide
+gitweb ancillaryinterrogators
gitworkflows guide
diff --git a/commit-graph.c b/commit-graph.c
index 2706683..92d4503 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -39,8 +39,8 @@ void git_test_write_commit_graph_or_die(void)
#define GRAPH_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */
#define GRAPH_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */
#define GRAPH_CHUNKID_DATA 0x43444154 /* "CDAT" */
-#define GRAPH_CHUNKID_GENERATION_DATA 0x47444154 /* "GDAT" */
-#define GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW 0x47444f56 /* "GDOV" */
+#define GRAPH_CHUNKID_GENERATION_DATA 0x47444132 /* "GDA2" */
+#define GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW 0x47444f32 /* "GDO2" */
#define GRAPH_CHUNKID_EXTRAEDGES 0x45444745 /* "EDGE" */
#define GRAPH_CHUNKID_BLOOMINDEXES 0x42494458 /* "BIDX" */
#define GRAPH_CHUNKID_BLOOMDATA 0x42444154 /* "BDAT" */
@@ -193,18 +193,6 @@ char *get_commit_graph_chain_filename(struct object_directory *odb)
return xstrfmt("%s/info/commit-graphs/commit-graph-chain", odb->path);
}
-static uint8_t oid_version(void)
-{
- switch (hash_algo_by_ptr(the_hash_algo)) {
- case GIT_HASH_SHA1:
- return 1;
- case GIT_HASH_SHA256:
- return 2;
- default:
- die(_("invalid hash version"));
- }
-}
-
static struct commit_graph *alloc_commit_graph(void)
{
struct commit_graph *g = xcalloc(1, sizeof(*g));
@@ -365,9 +353,9 @@ struct commit_graph *parse_commit_graph(struct repository *r,
}
hash_version = *(unsigned char*)(data + 5);
- if (hash_version != oid_version()) {
+ if (hash_version != oid_version(the_hash_algo)) {
error(_("commit-graph hash version %X does not match version %X"),
- hash_version, oid_version());
+ hash_version, oid_version(the_hash_algo));
return NULL;
}
@@ -407,6 +395,9 @@ struct commit_graph *parse_commit_graph(struct repository *r,
&graph->chunk_generation_data);
pair_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW,
&graph->chunk_generation_data_overflow);
+
+ if (graph->chunk_generation_data)
+ graph->read_generation_data = 1;
}
if (r->settings.commit_graph_read_changed_paths) {
@@ -520,10 +511,13 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r,
stat_res = stat(chain_name, &st);
free(chain_name);
- if (!fp ||
- stat_res ||
- st.st_size <= the_hash_algo->hexsz)
+ if (!fp)
return NULL;
+ if (stat_res ||
+ st.st_size <= the_hash_algo->hexsz) {
+ fclose(fp);
+ return NULL;
+ }
count = st.st_size / (the_hash_algo->hexsz + 1);
CALLOC_ARRAY(oids, count);
@@ -632,10 +626,13 @@ static int prepare_commit_graph(struct repository *r)
struct object_directory *odb;
/*
+ * Early return if there is no git dir or if the commit graph is
+ * disabled.
+ *
* This must come before the "already attempted?" check below, because
* we want to disable even an already-loaded graph file.
*/
- if (r->commit_graph_disabled)
+ if (!r->gitdir || r->commit_graph_disabled)
return 0;
if (r->objects->commit_graph_attempted)
@@ -800,7 +797,7 @@ static void fill_commit_graph_info(struct commit *item, struct commit_graph *g,
die(_("commit-graph requires overflow generation data but has none"));
offset_pos = offset ^ CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW;
- graph_data->generation = get_be64(g->chunk_generation_data_overflow + 8 * offset_pos);
+ graph_data->generation = item->date + get_be64(g->chunk_generation_data_overflow + 8 * offset_pos);
} else
graph_data->generation = item->date + offset;
} else
@@ -1553,12 +1550,16 @@ static void compute_generation_numbers(struct write_commit_graph_context *ctx)
if (current->date && current->date > max_corrected_commit_date)
max_corrected_commit_date = current->date - 1;
commit_graph_data_at(current)->generation = max_corrected_commit_date + 1;
-
- if (commit_graph_data_at(current)->generation - current->date > GENERATION_NUMBER_V2_OFFSET_MAX)
- ctx->num_generation_data_overflows++;
}
}
}
+
+ for (i = 0; i < ctx->commits.nr; i++) {
+ struct commit *c = ctx->commits.list[i];
+ timestamp_t offset = commit_graph_data_at(c)->generation - c->date;
+ if (offset > GENERATION_NUMBER_V2_OFFSET_MAX)
+ ctx->num_generation_data_overflows++;
+ }
stop_progress(&ctx->progress);
}
@@ -1676,21 +1677,22 @@ int write_commit_graph_reachable(struct object_directory *odb,
}
static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
- struct string_list *pack_indexes)
+ const struct string_list *pack_indexes)
{
uint32_t i;
struct strbuf progress_title = STRBUF_INIT;
struct strbuf packname = STRBUF_INIT;
int dirlen;
+ int ret = 0;
strbuf_addf(&packname, "%s/pack/", ctx->odb->path);
dirlen = packname.len;
if (ctx->report_progress) {
strbuf_addf(&progress_title,
- Q_("Finding commits for commit graph in %d pack",
- "Finding commits for commit graph in %d packs",
+ Q_("Finding commits for commit graph in %"PRIuMAX" pack",
+ "Finding commits for commit graph in %"PRIuMAX" packs",
pack_indexes->nr),
- pack_indexes->nr);
+ (uintmax_t)pack_indexes->nr);
ctx->progress = start_delayed_progress(progress_title.buf, 0);
ctx->progress_done = 0;
}
@@ -1700,12 +1702,12 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
strbuf_addstr(&packname, pack_indexes->items[i].string);
p = add_packed_git(packname.buf, packname.len, 1);
if (!p) {
- error(_("error adding pack %s"), packname.buf);
- return -1;
+ ret = error(_("error adding pack %s"), packname.buf);
+ goto cleanup;
}
if (open_pack_index(p)) {
- error(_("error opening index for %s"), packname.buf);
- return -1;
+ ret = error(_("error opening index for %s"), packname.buf);
+ goto cleanup;
}
for_each_object_in_pack(p, add_packed_commits, ctx,
FOR_EACH_OBJECT_PACK_ORDER);
@@ -1713,11 +1715,12 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
free(p);
}
+cleanup:
stop_progress(&ctx->progress);
strbuf_release(&progress_title);
strbuf_release(&packname);
- return 0;
+ return ret;
}
static int fill_oids_from_commits(struct write_commit_graph_context *ctx,
@@ -1849,6 +1852,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
hold_lock_file_for_update_mode(&lk, lock_name,
LOCK_DIE_ON_ERROR, 0444);
+ free(lock_name);
fd = git_mkstemp_mode(ctx->graph_name, 0444);
if (fd < 0) {
@@ -1908,7 +1912,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
hashwrite_be32(f, GRAPH_SIGNATURE);
hashwrite_u8(f, GRAPH_VERSION);
- hashwrite_u8(f, oid_version());
+ hashwrite_u8(f, oid_version(the_hash_algo));
hashwrite_u8(f, get_num_chunks(cf));
hashwrite_u8(f, ctx->num_commit_graphs_after - 1);
@@ -1939,7 +1943,8 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
}
close_commit_graph(ctx->r->objects);
- finalize_hashfile(f, file_hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC);
+ finalize_hashfile(f, file_hash, FSYNC_COMPONENT_COMMIT_GRAPH,
+ CSUM_HASH_IN_STREAM | CSUM_FSYNC);
free_chunkfile(cf);
if (ctx->split) {
@@ -1973,6 +1978,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
} else {
char *graph_name = get_commit_graph_filename(ctx->odb);
unlink(graph_name);
+ free(graph_name);
}
ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1] = xstrdup(hash_to_hex(file_hash));
@@ -2191,7 +2197,8 @@ static void mark_commit_graphs(struct write_commit_graph_context *ctx)
struct stat st;
struct utimbuf updated_time;
- stat(ctx->commit_graph_filenames_before[i], &st);
+ if (stat(ctx->commit_graph_filenames_before[i], &st) < 0)
+ continue;
updated_time.actime = st.st_atime;
updated_time.modtime = now;
@@ -2232,7 +2239,8 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx)
strbuf_setlen(&path, dirnamelen);
strbuf_addstr(&path, de->d_name);
- stat(path.buf, &st);
+ if (stat(path.buf, &st) < 0)
+ continue;
if (st.st_mtime > expire_time)
continue;
@@ -2256,7 +2264,7 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx)
}
int write_commit_graph(struct object_directory *odb,
- struct string_list *pack_indexes,
+ const struct string_list *const pack_indexes,
struct oidset *commits,
enum commit_graph_write_flags flags,
const struct commit_graph_opts *opts)
@@ -2552,7 +2560,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
odb_parents = odb_commit->parents;
while (graph_parents) {
- if (odb_parents == NULL) {
+ if (!odb_parents) {
graph_report(_("commit-graph parent list for commit %s is too long"),
oid_to_hex(&cur_oid));
break;
@@ -2575,7 +2583,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
odb_parents = odb_parents->next;
}
- if (odb_parents != NULL)
+ if (odb_parents)
graph_report(_("commit-graph parent list for commit %s terminates early"),
oid_to_hex(&cur_oid));
diff --git a/commit-graph.h b/commit-graph.h
index 04a94e1..2e3ac35 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -142,7 +142,7 @@ int write_commit_graph_reachable(struct object_directory *odb,
enum commit_graph_write_flags flags,
const struct commit_graph_opts *opts);
int write_commit_graph(struct object_directory *odb,
- struct string_list *pack_indexes,
+ const struct string_list *pack_indexes,
struct oidset *commits,
enum commit_graph_write_flags flags,
const struct commit_graph_opts *opts);
diff --git a/commit.c b/commit.c
index 551de49..9628716 100644
--- a/commit.c
+++ b/commit.c
@@ -21,6 +21,7 @@
#include "commit-reach.h"
#include "run-command.h"
#include "shallow.h"
+#include "hook.h"
static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
@@ -248,6 +249,16 @@ int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
return ret;
}
+void reset_commit_grafts(struct repository *r)
+{
+ int i;
+
+ for (i = 0; i < r->parsed_objects->grafts_nr; i++)
+ free(r->parsed_objects->grafts[i]);
+ r->parsed_objects->grafts_nr = 0;
+ r->parsed_objects->commit_graft_prepared = 0;
+}
+
struct commit_buffer {
void *buffer;
unsigned long size;
@@ -396,17 +407,14 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
if (item->object.parsed)
return 0;
-
- if (item->parents) {
- /*
- * Presumably this is leftover from an earlier failed parse;
- * clear it out in preparation for us re-parsing (we'll hit the
- * same error, but that's good, since it lets our caller know
- * the result cannot be trusted.
- */
- free_commit_list(item->parents);
- item->parents = NULL;
- }
+ /*
+ * Presumably this is leftover from an earlier failed parse;
+ * clear it out in preparation for us re-parsing (we'll hit the
+ * same error, but that's good, since it lets our caller know
+ * the result cannot be trusted.
+ */
+ free_commit_list(item->parents);
+ item->parents = NULL;
tail += size;
if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
@@ -1212,8 +1220,10 @@ int check_commit_signature(const struct commit *commit, struct signature_check *
if (parse_signed_commit(commit, &payload, &signature, the_hash_algo) <= 0)
goto out;
- ret = check_signature(payload.buf, payload.len, signature.buf,
- signature.len, sigc);
+
+ sigc->payload_type = SIGNATURE_PAYLOAD_COMMIT;
+ sigc->payload = strbuf_detach(&payload, &sigc->payload_len);
+ ret = check_signature(sigc, signature.buf, signature.len);
out:
strbuf_release(&payload);
@@ -1565,7 +1575,7 @@ int commit_tree_extended(const char *msg, size_t msg_len,
goto out;
}
- result = write_object_file(buffer.buf, buffer.len, commit_type, ret);
+ result = write_object_file(buffer.buf, buffer.len, OBJ_COMMIT, ret);
out:
strbuf_release(&buffer);
return result;
@@ -1629,12 +1639,20 @@ struct commit_list **commit_list_append(struct commit *commit,
return &new_commit->next;
}
-const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
+const char *find_header_mem(const char *msg, size_t len,
+ const char *key, size_t *out_len)
{
int key_len = strlen(key);
const char *line = msg;
- while (line) {
+ /*
+ * NEEDSWORK: It's possible for strchrnul() to scan beyond the range
+ * given by len. However, current callers are safe because they compute
+ * len by scanning a NUL-terminated block of memory starting at msg.
+ * Nonetheless, it would be better to ensure the function does not look
+ * at msg beyond the len provided by the caller.
+ */
+ while (line && line < msg + len) {
const char *eol = strchrnul(line, '\n');
if (line == eol)
@@ -1651,6 +1669,10 @@ const char *find_commit_header(const char *msg, const char *key, size_t *out_len
return NULL;
}
+const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
+{
+ return find_header_mem(msg, strlen(msg), key, out_len);
+}
/*
* Inspect the given string and determine the true "end" of the log message, in
* order to find where to put a new Signed-off-by trailer. Ignored are
@@ -1698,24 +1720,25 @@ size_t ignore_non_trailer(const char *buf, size_t len)
}
int run_commit_hook(int editor_is_used, const char *index_file,
- const char *name, ...)
+ int *invoked_hook, const char *name, ...)
{
- struct strvec hook_env = STRVEC_INIT;
+ struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
va_list args;
- int ret;
+ const char *arg;
- strvec_pushf(&hook_env, "GIT_INDEX_FILE=%s", index_file);
+ strvec_pushf(&opt.env, "GIT_INDEX_FILE=%s", index_file);
/*
* Let the hook know that no editor will be launched.
*/
if (!editor_is_used)
- strvec_push(&hook_env, "GIT_EDITOR=:");
+ strvec_push(&opt.env, "GIT_EDITOR=:");
va_start(args, name);
- ret = run_hook_ve(hook_env.v, name, args);
+ while ((arg = va_arg(args, const char *)))
+ strvec_push(&opt.args, arg);
va_end(args);
- strvec_clear(&hook_env);
- return ret;
+ opt.invoked_hook = invoked_hook;
+ return run_hooks_opt(name, &opt);
}
diff --git a/commit.h b/commit.h
index 3ea3276..21e4d25 100644
--- a/commit.h
+++ b/commit.h
@@ -249,6 +249,7 @@ int commit_graft_pos(struct repository *r, const struct object_id *oid);
int register_commit_graft(struct repository *r, struct commit_graft *, int);
void prepare_commit_graft(struct repository *r);
struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
+void reset_commit_grafts(struct repository *r);
struct commit *get_fork_point(const char *refname, struct commit *commit);
@@ -290,12 +291,17 @@ void free_commit_extra_headers(struct commit_extra_header *extra);
/*
* Search the commit object contents given by "msg" for the header "key".
+ * Reads up to "len" bytes of "msg".
* Returns a pointer to the start of the header contents, or NULL. The length
* of the header, up to the first newline, is returned via out_len.
*
* Note that some headers (like mergetag) may be multi-line. It is the caller's
* responsibility to parse further in this case!
*/
+const char *find_header_mem(const char *msg, size_t len,
+ const char *key,
+ size_t *out_len);
+
const char *find_commit_header(const char *msg, const char *key,
size_t *out_len);
@@ -364,7 +370,8 @@ int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused)
int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
LAST_ARG_MUST_BE_NULL
-int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
+int run_commit_hook(int editor_is_used, const char *index_file,
+ int *invoked_hook, const char *name, ...);
/* Sign a commit or tag buffer, storing the result in a header. */
int sign_with_header(struct strbuf *buf, const char *keyid);
diff --git a/common-main.c b/common-main.c
index 71e21dd..29fb745 100644
--- a/common-main.c
+++ b/common-main.c
@@ -26,6 +26,7 @@ static void restore_sigpipe_to_default(void)
int main(int argc, const char **argv)
{
int result;
+ struct strbuf tmp = STRBUF_INIT;
trace2_initialize_clock();
@@ -49,9 +50,15 @@ int main(int argc, const char **argv)
trace2_cmd_start(argv);
trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
+ if (!strbuf_getcwd(&tmp))
+ tmp_original_cwd = strbuf_detach(&tmp, NULL);
+
result = cmd_main(argc, argv);
- trace2_cmd_exit(result);
-
- return result;
+ /*
+ * We define exit() to call trace2_cmd_exit_fl() in
+ * git-compat-util.h. Whether we reach this or exit()
+ * elsewhere we'll always run our trace2 exit handler.
+ */
+ exit(result);
}
diff --git a/compat/.gitattributes b/compat/.gitattributes
new file mode 100644
index 0000000..40dbfb1
--- /dev/null
+++ b/compat/.gitattributes
@@ -0,0 +1 @@
+/zlib-uncompress2.c whitespace=-indent-with-non-tab,-trailing-space
diff --git a/compat/fsmonitor/fsm-darwin-gcc.h b/compat/fsmonitor/fsm-darwin-gcc.h
new file mode 100644
index 0000000..1c75c3d
--- /dev/null
+++ b/compat/fsmonitor/fsm-darwin-gcc.h
@@ -0,0 +1,92 @@
+#ifndef FSM_DARWIN_GCC_H
+#define FSM_DARWIN_GCC_H
+
+#ifndef __clang__
+/*
+ * It is possible to #include CoreFoundation/CoreFoundation.h when compiling
+ * with clang, but not with GCC as of time of writing.
+ *
+ * See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93082 for details.
+ */
+typedef unsigned int FSEventStreamCreateFlags;
+#define kFSEventStreamEventFlagNone 0x00000000
+#define kFSEventStreamEventFlagMustScanSubDirs 0x00000001
+#define kFSEventStreamEventFlagUserDropped 0x00000002
+#define kFSEventStreamEventFlagKernelDropped 0x00000004
+#define kFSEventStreamEventFlagEventIdsWrapped 0x00000008
+#define kFSEventStreamEventFlagHistoryDone 0x00000010
+#define kFSEventStreamEventFlagRootChanged 0x00000020
+#define kFSEventStreamEventFlagMount 0x00000040
+#define kFSEventStreamEventFlagUnmount 0x00000080
+#define kFSEventStreamEventFlagItemCreated 0x00000100
+#define kFSEventStreamEventFlagItemRemoved 0x00000200
+#define kFSEventStreamEventFlagItemInodeMetaMod 0x00000400
+#define kFSEventStreamEventFlagItemRenamed 0x00000800
+#define kFSEventStreamEventFlagItemModified 0x00001000
+#define kFSEventStreamEventFlagItemFinderInfoMod 0x00002000
+#define kFSEventStreamEventFlagItemChangeOwner 0x00004000
+#define kFSEventStreamEventFlagItemXattrMod 0x00008000
+#define kFSEventStreamEventFlagItemIsFile 0x00010000
+#define kFSEventStreamEventFlagItemIsDir 0x00020000
+#define kFSEventStreamEventFlagItemIsSymlink 0x00040000
+#define kFSEventStreamEventFlagOwnEvent 0x00080000
+#define kFSEventStreamEventFlagItemIsHardlink 0x00100000
+#define kFSEventStreamEventFlagItemIsLastHardlink 0x00200000
+#define kFSEventStreamEventFlagItemCloned 0x00400000
+
+typedef struct __FSEventStream *FSEventStreamRef;
+typedef const FSEventStreamRef ConstFSEventStreamRef;
+
+typedef unsigned int CFStringEncoding;
+#define kCFStringEncodingUTF8 0x08000100
+
+typedef const struct __CFString *CFStringRef;
+typedef const struct __CFArray *CFArrayRef;
+typedef const struct __CFRunLoop *CFRunLoopRef;
+
+struct FSEventStreamContext {
+ long long version;
+ void *cb_data, *retain, *release, *copy_description;
+};
+
+typedef struct FSEventStreamContext FSEventStreamContext;
+typedef unsigned int FSEventStreamEventFlags;
+#define kFSEventStreamCreateFlagNoDefer 0x02
+#define kFSEventStreamCreateFlagWatchRoot 0x04
+#define kFSEventStreamCreateFlagFileEvents 0x10
+
+typedef unsigned long long FSEventStreamEventId;
+#define kFSEventStreamEventIdSinceNow 0xFFFFFFFFFFFFFFFFULL
+
+typedef void (*FSEventStreamCallback)(ConstFSEventStreamRef streamRef,
+ void *context,
+ __SIZE_TYPE__ num_of_events,
+ void *event_paths,
+ const FSEventStreamEventFlags event_flags[],
+ const FSEventStreamEventId event_ids[]);
+typedef double CFTimeInterval;
+FSEventStreamRef FSEventStreamCreate(void *allocator,
+ FSEventStreamCallback callback,
+ FSEventStreamContext *context,
+ CFArrayRef paths_to_watch,
+ FSEventStreamEventId since_when,
+ CFTimeInterval latency,
+ FSEventStreamCreateFlags flags);
+CFStringRef CFStringCreateWithCString(void *allocator, const char *string,
+ CFStringEncoding encoding);
+CFArrayRef CFArrayCreate(void *allocator, const void **items, long long count,
+ void *callbacks);
+void CFRunLoopRun(void);
+void CFRunLoopStop(CFRunLoopRef run_loop);
+CFRunLoopRef CFRunLoopGetCurrent(void);
+extern CFStringRef kCFRunLoopDefaultMode;
+void FSEventStreamScheduleWithRunLoop(FSEventStreamRef stream,
+ CFRunLoopRef run_loop,
+ CFStringRef run_loop_mode);
+unsigned char FSEventStreamStart(FSEventStreamRef stream);
+void FSEventStreamStop(FSEventStreamRef stream);
+void FSEventStreamInvalidate(FSEventStreamRef stream);
+void FSEventStreamRelease(FSEventStreamRef stream);
+
+#endif /* !clang */
+#endif /* FSM_DARWIN_GCC_H */
diff --git a/compat/fsmonitor/fsm-listen-darwin.c b/compat/fsmonitor/fsm-listen-darwin.c
new file mode 100644
index 0000000..dc8a331
--- /dev/null
+++ b/compat/fsmonitor/fsm-listen-darwin.c
@@ -0,0 +1,427 @@
+#ifndef __clang__
+#include "fsm-darwin-gcc.h"
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreServices/CoreServices.h>
+
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER
+/*
+ * This enum value was added in 10.13 to:
+ *
+ * /Applications/Xcode.app/Contents/Developer/Platforms/ \
+ * MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/ \
+ * Library/Frameworks/CoreServices.framework/Frameworks/ \
+ * FSEvents.framework/Versions/Current/Headers/FSEvents.h
+ *
+ * If we're compiling against an older SDK, this symbol won't be
+ * present. Silently define it here so that we don't have to ifdef
+ * the logging or masking below. This should be harmless since older
+ * versions of macOS won't ever emit this FS event anyway.
+ */
+#define kFSEventStreamEventFlagItemCloned 0x00400000
+#endif
+#endif
+
+#include "cache.h"
+#include "fsmonitor.h"
+#include "fsm-listen.h"
+#include "fsmonitor--daemon.h"
+
+struct fsmonitor_daemon_backend_data
+{
+ CFStringRef cfsr_worktree_path;
+ CFStringRef cfsr_gitdir_path;
+
+ CFArrayRef cfar_paths_to_watch;
+ int nr_paths_watching;
+
+ FSEventStreamRef stream;
+
+ CFRunLoopRef rl;
+
+ enum shutdown_style {
+ SHUTDOWN_EVENT = 0,
+ FORCE_SHUTDOWN,
+ FORCE_ERROR_STOP,
+ } shutdown_style;
+
+ unsigned int stream_scheduled:1;
+ unsigned int stream_started:1;
+};
+
+static void log_flags_set(const char *path, const FSEventStreamEventFlags flag)
+{
+ struct strbuf msg = STRBUF_INIT;
+
+ if (flag & kFSEventStreamEventFlagMustScanSubDirs)
+ strbuf_addstr(&msg, "MustScanSubDirs|");
+ if (flag & kFSEventStreamEventFlagUserDropped)
+ strbuf_addstr(&msg, "UserDropped|");
+ if (flag & kFSEventStreamEventFlagKernelDropped)
+ strbuf_addstr(&msg, "KernelDropped|");
+ if (flag & kFSEventStreamEventFlagEventIdsWrapped)
+ strbuf_addstr(&msg, "EventIdsWrapped|");
+ if (flag & kFSEventStreamEventFlagHistoryDone)
+ strbuf_addstr(&msg, "HistoryDone|");
+ if (flag & kFSEventStreamEventFlagRootChanged)
+ strbuf_addstr(&msg, "RootChanged|");
+ if (flag & kFSEventStreamEventFlagMount)
+ strbuf_addstr(&msg, "Mount|");
+ if (flag & kFSEventStreamEventFlagUnmount)
+ strbuf_addstr(&msg, "Unmount|");
+ if (flag & kFSEventStreamEventFlagItemChangeOwner)
+ strbuf_addstr(&msg, "ItemChangeOwner|");
+ if (flag & kFSEventStreamEventFlagItemCreated)
+ strbuf_addstr(&msg, "ItemCreated|");
+ if (flag & kFSEventStreamEventFlagItemFinderInfoMod)
+ strbuf_addstr(&msg, "ItemFinderInfoMod|");
+ if (flag & kFSEventStreamEventFlagItemInodeMetaMod)
+ strbuf_addstr(&msg, "ItemInodeMetaMod|");
+ if (flag & kFSEventStreamEventFlagItemIsDir)
+ strbuf_addstr(&msg, "ItemIsDir|");
+ if (flag & kFSEventStreamEventFlagItemIsFile)
+ strbuf_addstr(&msg, "ItemIsFile|");
+ if (flag & kFSEventStreamEventFlagItemIsHardlink)
+ strbuf_addstr(&msg, "ItemIsHardlink|");
+ if (flag & kFSEventStreamEventFlagItemIsLastHardlink)
+ strbuf_addstr(&msg, "ItemIsLastHardlink|");
+ if (flag & kFSEventStreamEventFlagItemIsSymlink)
+ strbuf_addstr(&msg, "ItemIsSymlink|");
+ if (flag & kFSEventStreamEventFlagItemModified)
+ strbuf_addstr(&msg, "ItemModified|");
+ if (flag & kFSEventStreamEventFlagItemRemoved)
+ strbuf_addstr(&msg, "ItemRemoved|");
+ if (flag & kFSEventStreamEventFlagItemRenamed)
+ strbuf_addstr(&msg, "ItemRenamed|");
+ if (flag & kFSEventStreamEventFlagItemXattrMod)
+ strbuf_addstr(&msg, "ItemXattrMod|");
+ if (flag & kFSEventStreamEventFlagOwnEvent)
+ strbuf_addstr(&msg, "OwnEvent|");
+ if (flag & kFSEventStreamEventFlagItemCloned)
+ strbuf_addstr(&msg, "ItemCloned|");
+
+ trace_printf_key(&trace_fsmonitor, "fsevent: '%s', flags=%u %s",
+ path, flag, msg.buf);
+
+ strbuf_release(&msg);
+}
+
+static int ef_is_root_delete(const FSEventStreamEventFlags ef)
+{
+ return (ef & kFSEventStreamEventFlagItemIsDir &&
+ ef & kFSEventStreamEventFlagItemRemoved);
+}
+
+static int ef_is_root_renamed(const FSEventStreamEventFlags ef)
+{
+ return (ef & kFSEventStreamEventFlagItemIsDir &&
+ ef & kFSEventStreamEventFlagItemRenamed);
+}
+
+static int ef_is_dropped(const FSEventStreamEventFlags ef)
+{
+ return (ef & kFSEventStreamEventFlagMustScanSubDirs ||
+ ef & kFSEventStreamEventFlagKernelDropped ||
+ ef & kFSEventStreamEventFlagUserDropped);
+}
+
+static void fsevent_callback(ConstFSEventStreamRef streamRef,
+ void *ctx,
+ size_t num_of_events,
+ void *event_paths,
+ const FSEventStreamEventFlags event_flags[],
+ const FSEventStreamEventId event_ids[])
+{
+ struct fsmonitor_daemon_state *state = ctx;
+ struct fsmonitor_daemon_backend_data *data = state->backend_data;
+ char **paths = (char **)event_paths;
+ struct fsmonitor_batch *batch = NULL;
+ struct string_list cookie_list = STRING_LIST_INIT_DUP;
+ const char *path_k;
+ const char *slash;
+ int k;
+ struct strbuf tmp = STRBUF_INIT;
+
+ /*
+ * Build a list of all filesystem changes into a private/local
+ * list and without holding any locks.
+ */
+ for (k = 0; k < num_of_events; k++) {
+ /*
+ * On Mac, we receive an array of absolute paths.
+ */
+ path_k = paths[k];
+
+ /*
+ * If you want to debug FSEvents, log them to GIT_TRACE_FSMONITOR.
+ * Please don't log them to Trace2.
+ *
+ * trace_printf_key(&trace_fsmonitor, "Path: '%s'", path_k);
+ */
+
+ /*
+ * If event[k] is marked as dropped, we assume that we have
+ * lost sync with the filesystem and should flush our cached
+ * data. We need to:
+ *
+ * [1] Abort/wake any client threads waiting for a cookie and
+ * flush the cached state data (the current token), and
+ * create a new token.
+ *
+ * [2] Discard the batch that we were locally building (since
+ * they are conceptually relative to the just flushed
+ * token).
+ */
+ if (ef_is_dropped(event_flags[k])) {
+ if (trace_pass_fl(&trace_fsmonitor))
+ log_flags_set(path_k, event_flags[k]);
+
+ fsmonitor_force_resync(state);
+ fsmonitor_batch__free_list(batch);
+ string_list_clear(&cookie_list, 0);
+
+ /*
+ * We assume that any events that we received
+ * in this callback after this dropped event
+ * may still be valid, so we continue rather
+ * than break. (And just in case there is a
+ * delete of ".git" hiding in there.)
+ */
+ continue;
+ }
+
+ switch (fsmonitor_classify_path_absolute(state, path_k)) {
+
+ case IS_INSIDE_DOT_GIT_WITH_COOKIE_PREFIX:
+ case IS_INSIDE_GITDIR_WITH_COOKIE_PREFIX:
+ /* special case cookie files within .git or gitdir */
+
+ /* Use just the filename of the cookie file. */
+ slash = find_last_dir_sep(path_k);
+ string_list_append(&cookie_list,
+ slash ? slash + 1 : path_k);
+ break;
+
+ case IS_INSIDE_DOT_GIT:
+ case IS_INSIDE_GITDIR:
+ /* ignore all other paths inside of .git or gitdir */
+ break;
+
+ case IS_DOT_GIT:
+ case IS_GITDIR:
+ /*
+ * If .git directory is deleted or renamed away,
+ * we have to quit.
+ */
+ if (ef_is_root_delete(event_flags[k])) {
+ trace_printf_key(&trace_fsmonitor,
+ "event: gitdir removed");
+ goto force_shutdown;
+ }
+ if (ef_is_root_renamed(event_flags[k])) {
+ trace_printf_key(&trace_fsmonitor,
+ "event: gitdir renamed");
+ goto force_shutdown;
+ }
+ break;
+
+ case IS_WORKDIR_PATH:
+ /* try to queue normal pathnames */
+
+ if (trace_pass_fl(&trace_fsmonitor))
+ log_flags_set(path_k, event_flags[k]);
+
+ /*
+ * Because of the implicit "binning" (the
+ * kernel calls us at a given frequency) and
+ * de-duping (the kernel is free to combine
+ * multiple events for a given pathname), an
+ * individual fsevent could be marked as both
+ * a file and directory. Add it to the queue
+ * with both spellings so that the client will
+ * know how much to invalidate/refresh.
+ */
+
+ if (event_flags[k] & kFSEventStreamEventFlagItemIsFile) {
+ const char *rel = path_k +
+ state->path_worktree_watch.len + 1;
+
+ if (!batch)
+ batch = fsmonitor_batch__new();
+ fsmonitor_batch__add_path(batch, rel);
+ }
+
+ if (event_flags[k] & kFSEventStreamEventFlagItemIsDir) {
+ const char *rel = path_k +
+ state->path_worktree_watch.len + 1;
+
+ strbuf_reset(&tmp);
+ strbuf_addstr(&tmp, rel);
+ strbuf_addch(&tmp, '/');
+
+ if (!batch)
+ batch = fsmonitor_batch__new();
+ fsmonitor_batch__add_path(batch, tmp.buf);
+ }
+
+ break;
+
+ case IS_OUTSIDE_CONE:
+ default:
+ trace_printf_key(&trace_fsmonitor,
+ "ignoring '%s'", path_k);
+ break;
+ }
+ }
+
+ fsmonitor_publish(state, batch, &cookie_list);
+ string_list_clear(&cookie_list, 0);
+ strbuf_release(&tmp);
+ return;
+
+force_shutdown:
+ fsmonitor_batch__free_list(batch);
+ string_list_clear(&cookie_list, 0);
+
+ data->shutdown_style = FORCE_SHUTDOWN;
+ CFRunLoopStop(data->rl);
+ strbuf_release(&tmp);
+ return;
+}
+
+/*
+ * In the call to `FSEventStreamCreate()` to setup our watch, the
+ * `latency` argument determines the frequency of calls to our callback
+ * with new FS events. Too slow and events get dropped; too fast and
+ * we burn CPU unnecessarily. Since it is rather obscure, I don't
+ * think this needs to be a config setting. I've done extensive
+ * testing on my systems and chosen the value below. It gives good
+ * results and I've not seen any dropped events.
+ *
+ * With a latency of 0.1, I was seeing lots of dropped events during
+ * the "touch 100000" files test within t/perf/p7519, but with a
+ * latency of 0.001 I did not see any dropped events. So I'm going
+ * to assume that this is the "correct" value.
+ *
+ * https://developer.apple.com/documentation/coreservices/1443980-fseventstreamcreate
+ */
+
+int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
+{
+ FSEventStreamCreateFlags flags = kFSEventStreamCreateFlagNoDefer |
+ kFSEventStreamCreateFlagWatchRoot |
+ kFSEventStreamCreateFlagFileEvents;
+ FSEventStreamContext ctx = {
+ 0,
+ state,
+ NULL,
+ NULL,
+ NULL
+ };
+ struct fsmonitor_daemon_backend_data *data;
+ const void *dir_array[2];
+
+ CALLOC_ARRAY(data, 1);
+ state->backend_data = data;
+
+ data->cfsr_worktree_path = CFStringCreateWithCString(
+ NULL, state->path_worktree_watch.buf, kCFStringEncodingUTF8);
+ dir_array[data->nr_paths_watching++] = data->cfsr_worktree_path;
+
+ if (state->nr_paths_watching > 1) {
+ data->cfsr_gitdir_path = CFStringCreateWithCString(
+ NULL, state->path_gitdir_watch.buf,
+ kCFStringEncodingUTF8);
+ dir_array[data->nr_paths_watching++] = data->cfsr_gitdir_path;
+ }
+
+ data->cfar_paths_to_watch = CFArrayCreate(NULL, dir_array,
+ data->nr_paths_watching,
+ NULL);
+ data->stream = FSEventStreamCreate(NULL, fsevent_callback, &ctx,
+ data->cfar_paths_to_watch,
+ kFSEventStreamEventIdSinceNow,
+ 0.001, flags);
+ if (!data->stream)
+ goto failed;
+
+ /*
+ * `data->rl` needs to be set inside the listener thread.
+ */
+
+ return 0;
+
+failed:
+ error(_("Unable to create FSEventStream."));
+
+ FREE_AND_NULL(state->backend_data);
+ return -1;
+}
+
+void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
+{
+ struct fsmonitor_daemon_backend_data *data;
+
+ if (!state || !state->backend_data)
+ return;
+
+ data = state->backend_data;
+
+ if (data->stream) {
+ if (data->stream_started)
+ FSEventStreamStop(data->stream);
+ if (data->stream_scheduled)
+ FSEventStreamInvalidate(data->stream);
+ FSEventStreamRelease(data->stream);
+ }
+
+ FREE_AND_NULL(state->backend_data);
+}
+
+void fsm_listen__stop_async(struct fsmonitor_daemon_state *state)
+{
+ struct fsmonitor_daemon_backend_data *data;
+
+ data = state->backend_data;
+ data->shutdown_style = SHUTDOWN_EVENT;
+
+ CFRunLoopStop(data->rl);
+}
+
+void fsm_listen__loop(struct fsmonitor_daemon_state *state)
+{
+ struct fsmonitor_daemon_backend_data *data;
+
+ data = state->backend_data;
+
+ data->rl = CFRunLoopGetCurrent();
+
+ FSEventStreamScheduleWithRunLoop(data->stream, data->rl, kCFRunLoopDefaultMode);
+ data->stream_scheduled = 1;
+
+ if (!FSEventStreamStart(data->stream)) {
+ error(_("Failed to start the FSEventStream"));
+ goto force_error_stop_without_loop;
+ }
+ data->stream_started = 1;
+
+ CFRunLoopRun();
+
+ switch (data->shutdown_style) {
+ case FORCE_ERROR_STOP:
+ state->error_code = -1;
+ /* fall thru */
+ case FORCE_SHUTDOWN:
+ ipc_server_stop_async(state->ipc_server_data);
+ /* fall thru */
+ case SHUTDOWN_EVENT:
+ default:
+ break;
+ }
+ return;
+
+force_error_stop_without_loop:
+ state->error_code = -1;
+ ipc_server_stop_async(state->ipc_server_data);
+ return;
+}
diff --git a/compat/fsmonitor/fsm-listen-win32.c b/compat/fsmonitor/fsm-listen-win32.c
new file mode 100644
index 0000000..5b928ab
--- /dev/null
+++ b/compat/fsmonitor/fsm-listen-win32.c
@@ -0,0 +1,586 @@
+#include "cache.h"
+#include "config.h"
+#include "fsmonitor.h"
+#include "fsm-listen.h"
+#include "fsmonitor--daemon.h"
+
+/*
+ * The documentation of ReadDirectoryChangesW() states that the maximum
+ * buffer size is 64K when the monitored directory is remote.
+ *
+ * Larger buffers may be used when the monitored directory is local and
+ * will help us receive events faster from the kernel and avoid dropped
+ * events.
+ *
+ * So we try to use a very large buffer and silently fallback to 64K if
+ * we get an error.
+ */
+#define MAX_RDCW_BUF_FALLBACK (65536)
+#define MAX_RDCW_BUF (65536 * 8)
+
+struct one_watch
+{
+ char buffer[MAX_RDCW_BUF];
+ DWORD buf_len;
+ DWORD count;
+
+ struct strbuf path;
+ HANDLE hDir;
+ HANDLE hEvent;
+ OVERLAPPED overlapped;
+
+ /*
+ * Is there an active ReadDirectoryChangesW() call pending. If so, we
+ * need to later call GetOverlappedResult() and possibly CancelIoEx().
+ */
+ BOOL is_active;
+};
+
+struct fsmonitor_daemon_backend_data
+{
+ struct one_watch *watch_worktree;
+ struct one_watch *watch_gitdir;
+
+ HANDLE hEventShutdown;
+
+ HANDLE hListener[3]; /* we don't own these handles */
+#define LISTENER_SHUTDOWN 0
+#define LISTENER_HAVE_DATA_WORKTREE 1
+#define LISTENER_HAVE_DATA_GITDIR 2
+ int nr_listener_handles;
+};
+
+/*
+ * Convert the WCHAR path from the notification into UTF8 and
+ * then normalize it.
+ */
+static int normalize_path_in_utf8(FILE_NOTIFY_INFORMATION *info,
+ struct strbuf *normalized_path)
+{
+ int reserve;
+ int len = 0;
+
+ strbuf_reset(normalized_path);
+ if (!info->FileNameLength)
+ goto normalize;
+
+ /*
+ * Pre-reserve enough space in the UTF8 buffer for
+ * each Unicode WCHAR character to be mapped into a
+ * sequence of 2 UTF8 characters. That should let us
+ * avoid ERROR_INSUFFICIENT_BUFFER 99.9+% of the time.
+ */
+ reserve = info->FileNameLength + 1;
+ strbuf_grow(normalized_path, reserve);
+
+ for (;;) {
+ len = WideCharToMultiByte(CP_UTF8, 0, info->FileName,
+ info->FileNameLength / sizeof(WCHAR),
+ normalized_path->buf,
+ strbuf_avail(normalized_path) - 1,
+ NULL, NULL);
+ if (len > 0)
+ goto normalize;
+ if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
+ error(_("[GLE %ld] could not convert path to UTF-8: '%.*ls'"),
+ GetLastError(),
+ (int)(info->FileNameLength / sizeof(WCHAR)),
+ info->FileName);
+ return -1;
+ }
+
+ strbuf_grow(normalized_path,
+ strbuf_avail(normalized_path) + reserve);
+ }
+
+normalize:
+ strbuf_setlen(normalized_path, len);
+ return strbuf_normalize_path(normalized_path);
+}
+
+void fsm_listen__stop_async(struct fsmonitor_daemon_state *state)
+{
+ SetEvent(state->backend_data->hListener[LISTENER_SHUTDOWN]);
+}
+
+static struct one_watch *create_watch(struct fsmonitor_daemon_state *state,
+ const char *path)
+{
+ struct one_watch *watch = NULL;
+ DWORD desired_access = FILE_LIST_DIRECTORY;
+ DWORD share_mode =
+ FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE;
+ HANDLE hDir;
+ wchar_t wpath[MAX_PATH];
+
+ if (xutftowcs_path(wpath, path) < 0) {
+ error(_("could not convert to wide characters: '%s'"), path);
+ return NULL;
+ }
+
+ hDir = CreateFileW(wpath,
+ desired_access, share_mode, NULL, OPEN_EXISTING,
+ FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED,
+ NULL);
+ if (hDir == INVALID_HANDLE_VALUE) {
+ error(_("[GLE %ld] could not watch '%s'"),
+ GetLastError(), path);
+ return NULL;
+ }
+
+ CALLOC_ARRAY(watch, 1);
+
+ watch->buf_len = sizeof(watch->buffer); /* assume full MAX_RDCW_BUF */
+
+ strbuf_init(&watch->path, 0);
+ strbuf_addstr(&watch->path, path);
+
+ watch->hDir = hDir;
+ watch->hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+
+ return watch;
+}
+
+static void destroy_watch(struct one_watch *watch)
+{
+ if (!watch)
+ return;
+
+ strbuf_release(&watch->path);
+ if (watch->hDir != INVALID_HANDLE_VALUE)
+ CloseHandle(watch->hDir);
+ if (watch->hEvent != INVALID_HANDLE_VALUE)
+ CloseHandle(watch->hEvent);
+
+ free(watch);
+}
+
+static int start_rdcw_watch(struct fsmonitor_daemon_backend_data *data,
+ struct one_watch *watch)
+{
+ DWORD dwNotifyFilter =
+ FILE_NOTIFY_CHANGE_FILE_NAME |
+ FILE_NOTIFY_CHANGE_DIR_NAME |
+ FILE_NOTIFY_CHANGE_ATTRIBUTES |
+ FILE_NOTIFY_CHANGE_SIZE |
+ FILE_NOTIFY_CHANGE_LAST_WRITE |
+ FILE_NOTIFY_CHANGE_CREATION;
+
+ ResetEvent(watch->hEvent);
+
+ memset(&watch->overlapped, 0, sizeof(watch->overlapped));
+ watch->overlapped.hEvent = watch->hEvent;
+
+ /*
+ * Queue an async call using Overlapped IO. This returns immediately.
+ * Our event handle will be signalled when the real result is available.
+ *
+ * The return value here just means that we successfully queued it.
+ * We won't know if the Read...() actually produces data until later.
+ */
+ watch->is_active = ReadDirectoryChangesW(
+ watch->hDir, watch->buffer, watch->buf_len, TRUE,
+ dwNotifyFilter, &watch->count, &watch->overlapped, NULL);
+
+ if (watch->is_active)
+ return 0;
+
+ error(_("ReadDirectoryChangedW failed on '%s' [GLE %ld]"),
+ watch->path.buf, GetLastError());
+ return -1;
+}
+
+static int recv_rdcw_watch(struct one_watch *watch)
+{
+ DWORD gle;
+
+ watch->is_active = FALSE;
+
+ /*
+ * The overlapped result is ready. If the Read...() was successful
+ * we finally receive the actual result into our buffer.
+ */
+ if (GetOverlappedResult(watch->hDir, &watch->overlapped, &watch->count,
+ TRUE))
+ return 0;
+
+ gle = GetLastError();
+ if (gle == ERROR_INVALID_PARAMETER &&
+ /*
+ * The kernel throws an invalid parameter error when our
+ * buffer is too big and we are pointed at a remote
+ * directory (and possibly for other reasons). Quietly
+ * set it down and try again.
+ *
+ * See note about MAX_RDCW_BUF at the top.
+ */
+ watch->buf_len > MAX_RDCW_BUF_FALLBACK) {
+ watch->buf_len = MAX_RDCW_BUF_FALLBACK;
+ return -2;
+ }
+
+ /*
+ * NEEDSWORK: If an external <gitdir> is deleted, the above
+ * returns an error. I'm not sure that there's anything that
+ * we can do here other than failing -- the <worktree>/.git
+ * link file would be broken anyway. We might try to check
+ * for that and return a better error message, but I'm not
+ * sure it is worth it.
+ */
+
+ error(_("GetOverlappedResult failed on '%s' [GLE %ld]"),
+ watch->path.buf, gle);
+ return -1;
+}
+
+static void cancel_rdcw_watch(struct one_watch *watch)
+{
+ DWORD count;
+
+ if (!watch || !watch->is_active)
+ return;
+
+ /*
+ * The calls to ReadDirectoryChangesW() and GetOverlappedResult()
+ * form a "pair" (my term) where we queue an IO and promise to
+ * hang around and wait for the kernel to give us the result.
+ *
+ * If for some reason after we queue the IO, we have to quit
+ * or otherwise not stick around for the second half, we must
+ * tell the kernel to abort the IO. This prevents the kernel
+ * from writing to our buffer and/or signalling our event
+ * after we free them.
+ *
+ * (Ask me how much fun it was to track that one down).
+ */
+ CancelIoEx(watch->hDir, &watch->overlapped);
+ GetOverlappedResult(watch->hDir, &watch->overlapped, &count, TRUE);
+ watch->is_active = FALSE;
+}
+
+/*
+ * Process filesystem events that happen anywhere (recursively) under the
+ * <worktree> root directory. For a normal working directory, this includes
+ * both version controlled files and the contents of the .git/ directory.
+ *
+ * If <worktree>/.git is a file, then we only see events for the file
+ * itself.
+ */
+static int process_worktree_events(struct fsmonitor_daemon_state *state)
+{
+ struct fsmonitor_daemon_backend_data *data = state->backend_data;
+ struct one_watch *watch = data->watch_worktree;
+ struct strbuf path = STRBUF_INIT;
+ struct string_list cookie_list = STRING_LIST_INIT_DUP;
+ struct fsmonitor_batch *batch = NULL;
+ const char *p = watch->buffer;
+
+ /*
+ * If the kernel gets more events than will fit in the kernel
+ * buffer associated with our RDCW handle, it drops them and
+ * returns a count of zero.
+ *
+ * Yes, the call returns WITHOUT error and with length zero.
+ * This is the documented behavior. (My testing has confirmed
+ * that it also sets the last error to ERROR_NOTIFY_ENUM_DIR,
+ * but we do not rely on that since the function did not
+ * return an error and it is not documented.)
+ *
+ * (The "overflow" case is not ambiguous with the "no data" case
+ * because we did an INFINITE wait.)
+ *
+ * This means we have a gap in coverage. Tell the daemon layer
+ * to resync.
+ */
+ if (!watch->count) {
+ trace2_data_string("fsmonitor", NULL, "fsm-listen/kernel",
+ "overflow");
+ fsmonitor_force_resync(state);
+ return LISTENER_HAVE_DATA_WORKTREE;
+ }
+
+ /*
+ * On Windows, `info` contains an "array" of paths that are
+ * relative to the root of whichever directory handle received
+ * the event.
+ */
+ for (;;) {
+ FILE_NOTIFY_INFORMATION *info = (void *)p;
+ const char *slash;
+ enum fsmonitor_path_type t;
+
+ strbuf_reset(&path);
+ if (normalize_path_in_utf8(info, &path) == -1)
+ goto skip_this_path;
+
+ t = fsmonitor_classify_path_workdir_relative(path.buf);
+
+ switch (t) {
+ case IS_INSIDE_DOT_GIT_WITH_COOKIE_PREFIX:
+ /* special case cookie files within .git */
+
+ /* Use just the filename of the cookie file. */
+ slash = find_last_dir_sep(path.buf);
+ string_list_append(&cookie_list,
+ slash ? slash + 1 : path.buf);
+ break;
+
+ case IS_INSIDE_DOT_GIT:
+ /* ignore everything inside of "<worktree>/.git/" */
+ break;
+
+ case IS_DOT_GIT:
+ /* "<worktree>/.git" was deleted (or renamed away) */
+ if ((info->Action == FILE_ACTION_REMOVED) ||
+ (info->Action == FILE_ACTION_RENAMED_OLD_NAME)) {
+ trace2_data_string("fsmonitor", NULL,
+ "fsm-listen/dotgit",
+ "removed");
+ goto force_shutdown;
+ }
+ break;
+
+ case IS_WORKDIR_PATH:
+ /* queue normal pathname */
+ if (!batch)
+ batch = fsmonitor_batch__new();
+ fsmonitor_batch__add_path(batch, path.buf);
+ break;
+
+ case IS_GITDIR:
+ case IS_INSIDE_GITDIR:
+ case IS_INSIDE_GITDIR_WITH_COOKIE_PREFIX:
+ default:
+ BUG("unexpected path classification '%d' for '%s'",
+ t, path.buf);
+ }
+
+skip_this_path:
+ if (!info->NextEntryOffset)
+ break;
+ p += info->NextEntryOffset;
+ }
+
+ fsmonitor_publish(state, batch, &cookie_list);
+ batch = NULL;
+ string_list_clear(&cookie_list, 0);
+ strbuf_release(&path);
+ return LISTENER_HAVE_DATA_WORKTREE;
+
+force_shutdown:
+ fsmonitor_batch__free_list(batch);
+ string_list_clear(&cookie_list, 0);
+ strbuf_release(&path);
+ return LISTENER_SHUTDOWN;
+}
+
+/*
+ * Process filesystem events that happened anywhere (recursively) under the
+ * external <gitdir> (such as non-primary worktrees or submodules).
+ * We only care about cookie files that our client threads created here.
+ *
+ * Note that we DO NOT get filesystem events on the external <gitdir>
+ * itself (it is not inside something that we are watching). In particular,
+ * we do not get an event if the external <gitdir> is deleted.
+ */
+static int process_gitdir_events(struct fsmonitor_daemon_state *state)
+{
+ struct fsmonitor_daemon_backend_data *data = state->backend_data;
+ struct one_watch *watch = data->watch_gitdir;
+ struct strbuf path = STRBUF_INIT;
+ struct string_list cookie_list = STRING_LIST_INIT_DUP;
+ const char *p = watch->buffer;
+
+ if (!watch->count) {
+ trace2_data_string("fsmonitor", NULL, "fsm-listen/kernel",
+ "overflow");
+ fsmonitor_force_resync(state);
+ return LISTENER_HAVE_DATA_GITDIR;
+ }
+
+ for (;;) {
+ FILE_NOTIFY_INFORMATION *info = (void *)p;
+ const char *slash;
+ enum fsmonitor_path_type t;
+
+ strbuf_reset(&path);
+ if (normalize_path_in_utf8(info, &path) == -1)
+ goto skip_this_path;
+
+ t = fsmonitor_classify_path_gitdir_relative(path.buf);
+
+ switch (t) {
+ case IS_INSIDE_GITDIR_WITH_COOKIE_PREFIX:
+ /* special case cookie files within gitdir */
+
+ /* Use just the filename of the cookie file. */
+ slash = find_last_dir_sep(path.buf);
+ string_list_append(&cookie_list,
+ slash ? slash + 1 : path.buf);
+ break;
+
+ case IS_INSIDE_GITDIR:
+ goto skip_this_path;
+
+ default:
+ BUG("unexpected path classification '%d' for '%s'",
+ t, path.buf);
+ }
+
+skip_this_path:
+ if (!info->NextEntryOffset)
+ break;
+ p += info->NextEntryOffset;
+ }
+
+ fsmonitor_publish(state, NULL, &cookie_list);
+ string_list_clear(&cookie_list, 0);
+ strbuf_release(&path);
+ return LISTENER_HAVE_DATA_GITDIR;
+}
+
+void fsm_listen__loop(struct fsmonitor_daemon_state *state)
+{
+ struct fsmonitor_daemon_backend_data *data = state->backend_data;
+ DWORD dwWait;
+ int result;
+
+ state->error_code = 0;
+
+ if (start_rdcw_watch(data, data->watch_worktree) == -1)
+ goto force_error_stop;
+
+ if (data->watch_gitdir &&
+ start_rdcw_watch(data, data->watch_gitdir) == -1)
+ goto force_error_stop;
+
+ for (;;) {
+ dwWait = WaitForMultipleObjects(data->nr_listener_handles,
+ data->hListener,
+ FALSE, INFINITE);
+
+ if (dwWait == WAIT_OBJECT_0 + LISTENER_HAVE_DATA_WORKTREE) {
+ result = recv_rdcw_watch(data->watch_worktree);
+ if (result == -1) {
+ /* hard error */
+ goto force_error_stop;
+ }
+ if (result == -2) {
+ /* retryable error */
+ if (start_rdcw_watch(data, data->watch_worktree) == -1)
+ goto force_error_stop;
+ continue;
+ }
+
+ /* have data */
+ if (process_worktree_events(state) == LISTENER_SHUTDOWN)
+ goto force_shutdown;
+ if (start_rdcw_watch(data, data->watch_worktree) == -1)
+ goto force_error_stop;
+ continue;
+ }
+
+ if (dwWait == WAIT_OBJECT_0 + LISTENER_HAVE_DATA_GITDIR) {
+ result = recv_rdcw_watch(data->watch_gitdir);
+ if (result == -1) {
+ /* hard error */
+ goto force_error_stop;
+ }
+ if (result == -2) {
+ /* retryable error */
+ if (start_rdcw_watch(data, data->watch_gitdir) == -1)
+ goto force_error_stop;
+ continue;
+ }
+
+ /* have data */
+ if (process_gitdir_events(state) == LISTENER_SHUTDOWN)
+ goto force_shutdown;
+ if (start_rdcw_watch(data, data->watch_gitdir) == -1)
+ goto force_error_stop;
+ continue;
+ }
+
+ if (dwWait == WAIT_OBJECT_0 + LISTENER_SHUTDOWN)
+ goto clean_shutdown;
+
+ error(_("could not read directory changes [GLE %ld]"),
+ GetLastError());
+ goto force_error_stop;
+ }
+
+force_error_stop:
+ state->error_code = -1;
+
+force_shutdown:
+ /*
+ * Tell the IPC thead pool to stop (which completes the await
+ * in the main thread (which will also signal this thread (if
+ * we are still alive))).
+ */
+ ipc_server_stop_async(state->ipc_server_data);
+
+clean_shutdown:
+ cancel_rdcw_watch(data->watch_worktree);
+ cancel_rdcw_watch(data->watch_gitdir);
+}
+
+int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
+{
+ struct fsmonitor_daemon_backend_data *data;
+
+ CALLOC_ARRAY(data, 1);
+
+ data->hEventShutdown = CreateEvent(NULL, TRUE, FALSE, NULL);
+
+ data->watch_worktree = create_watch(state,
+ state->path_worktree_watch.buf);
+ if (!data->watch_worktree)
+ goto failed;
+
+ if (state->nr_paths_watching > 1) {
+ data->watch_gitdir = create_watch(state,
+ state->path_gitdir_watch.buf);
+ if (!data->watch_gitdir)
+ goto failed;
+ }
+
+ data->hListener[LISTENER_SHUTDOWN] = data->hEventShutdown;
+ data->nr_listener_handles++;
+
+ data->hListener[LISTENER_HAVE_DATA_WORKTREE] =
+ data->watch_worktree->hEvent;
+ data->nr_listener_handles++;
+
+ if (data->watch_gitdir) {
+ data->hListener[LISTENER_HAVE_DATA_GITDIR] =
+ data->watch_gitdir->hEvent;
+ data->nr_listener_handles++;
+ }
+
+ state->backend_data = data;
+ return 0;
+
+failed:
+ CloseHandle(data->hEventShutdown);
+ destroy_watch(data->watch_worktree);
+ destroy_watch(data->watch_gitdir);
+
+ return -1;
+}
+
+void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
+{
+ struct fsmonitor_daemon_backend_data *data;
+
+ if (!state || !state->backend_data)
+ return;
+
+ data = state->backend_data;
+
+ CloseHandle(data->hEventShutdown);
+ destroy_watch(data->watch_worktree);
+ destroy_watch(data->watch_gitdir);
+
+ FREE_AND_NULL(state->backend_data);
+}
diff --git a/compat/fsmonitor/fsm-listen.h b/compat/fsmonitor/fsm-listen.h
new file mode 100644
index 0000000..f053934
--- /dev/null
+++ b/compat/fsmonitor/fsm-listen.h
@@ -0,0 +1,49 @@
+#ifndef FSM_LISTEN_H
+#define FSM_LISTEN_H
+
+/* This needs to be implemented by each backend */
+
+#ifdef HAVE_FSMONITOR_DAEMON_BACKEND
+
+struct fsmonitor_daemon_state;
+
+/*
+ * Initialize platform-specific data for the fsmonitor listener thread.
+ * This will be called from the main thread PRIOR to staring the
+ * fsmonitor_fs_listener thread.
+ *
+ * Returns 0 if successful.
+ * Returns -1 otherwise.
+ */
+int fsm_listen__ctor(struct fsmonitor_daemon_state *state);
+
+/*
+ * Cleanup platform-specific data for the fsmonitor listener thread.
+ * This will be called from the main thread AFTER joining the listener.
+ */
+void fsm_listen__dtor(struct fsmonitor_daemon_state *state);
+
+/*
+ * The main body of the platform-specific event loop to watch for
+ * filesystem events. This will run in the fsmonitor_fs_listen thread.
+ *
+ * It should call `ipc_server_stop_async()` if the listener thread
+ * prematurely terminates (because of a filesystem error or if it
+ * detects that the .git directory has been deleted). (It should NOT
+ * do so if the listener thread receives a normal shutdown signal from
+ * the IPC layer.)
+ *
+ * It should set `state->error_code` to -1 if the daemon should exit
+ * with an error.
+ */
+void fsm_listen__loop(struct fsmonitor_daemon_state *state);
+
+/*
+ * Gently request that the fsmonitor listener thread shutdown.
+ * It does not wait for it to stop. The caller should do a JOIN
+ * to wait for it.
+ */
+void fsm_listen__stop_async(struct fsmonitor_daemon_state *state);
+
+#endif /* HAVE_FSMONITOR_DAEMON_BACKEND */
+#endif /* FSM_LISTEN_H */
diff --git a/compat/mingw.c b/compat/mingw.c
index 9e0cd1e..2607de9 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1,5 +1,6 @@
#include "../git-compat-util.h"
#include "win32.h"
+#include <aclapi.h>
#include <conio.h>
#include <wchar.h>
#include "../strbuf.h"
@@ -8,6 +9,8 @@
#include "win32/lazyload.h"
#include "../config.h"
#include "dir.h"
+#define SECURITY_WIN32
+#include <sspi.h>
#define HCAST(type, handle) ((type)(intptr_t)handle)
@@ -959,9 +962,11 @@ static inline void time_t_to_filetime(time_t t, FILETIME *ft)
int mingw_utime (const char *file_name, const struct utimbuf *times)
{
FILETIME mft, aft;
- int fh, rc;
+ int rc;
DWORD attrs;
wchar_t wfilename[MAX_PATH];
+ HANDLE osfilehandle;
+
if (xutftowcs_path(wfilename, file_name) < 0)
return -1;
@@ -973,7 +978,17 @@ int mingw_utime (const char *file_name, const struct utimbuf *times)
SetFileAttributesW(wfilename, attrs & ~FILE_ATTRIBUTE_READONLY);
}
- if ((fh = _wopen(wfilename, O_RDWR | O_BINARY)) < 0) {
+ osfilehandle = CreateFileW(wfilename,
+ FILE_WRITE_ATTRIBUTES,
+ 0 /*FileShare.None*/,
+ NULL,
+ OPEN_EXISTING,
+ (attrs != INVALID_FILE_ATTRIBUTES &&
+ (attrs & FILE_ATTRIBUTE_DIRECTORY)) ?
+ FILE_FLAG_BACKUP_SEMANTICS : 0,
+ NULL);
+ if (osfilehandle == INVALID_HANDLE_VALUE) {
+ errno = err_win_to_posix(GetLastError());
rc = -1;
goto revert_attrs;
}
@@ -985,12 +1000,15 @@ int mingw_utime (const char *file_name, const struct utimbuf *times)
GetSystemTimeAsFileTime(&mft);
aft = mft;
}
- if (!SetFileTime((HANDLE)_get_osfhandle(fh), NULL, &aft, &mft)) {
+
+ if (!SetFileTime(osfilehandle, NULL, &aft, &mft)) {
errno = EINVAL;
rc = -1;
} else
rc = 0;
- close(fh);
+
+ if (osfilehandle != INVALID_HANDLE_VALUE)
+ CloseHandle(osfilehandle);
revert_attrs:
if (attrs != INVALID_FILE_ATTRIBUTES &&
@@ -1008,7 +1026,7 @@ size_t mingw_strftime(char *s, size_t max,
/* 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,
+ DECLARE_PROC_ADDR(ucrtbase.dll, size_t, __cdecl, strftime, char *, size_t,
const char *, const struct tm *);
if (INIT_PROC_ADDR(strftime))
@@ -1042,7 +1060,7 @@ char *mingw_mktemp(char *template)
int mkstemp(char *template)
{
char *filename = mktemp(template);
- if (filename == NULL)
+ if (!filename)
return -1;
return open(filename, O_RDWR | O_CREAT, 0600);
}
@@ -1083,6 +1101,7 @@ int pipe(int filedes[2])
return 0;
}
+#ifndef __MINGW64__
struct tm *gmtime_r(const time_t *timep, struct tm *result)
{
if (gmtime_s(result, timep) == 0)
@@ -1096,6 +1115,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
return result;
return NULL;
}
+#endif
char *mingw_getcwd(char *pointer, int len)
{
@@ -1123,6 +1143,10 @@ char *mingw_getcwd(char *pointer, int len)
}
if (!ret || ret >= ARRAY_SIZE(wpointer))
return NULL;
+ if (GetFileAttributesW(wpointer) == INVALID_FILE_ATTRIBUTES) {
+ errno = ENOENT;
+ return NULL;
+ }
if (xwcstoutf(pointer, wpointer, len) < 0)
return NULL;
convert_slashes(pointer);
@@ -2183,7 +2207,7 @@ enum EXTENDED_NAME_FORMAT {
static char *get_extended_user_info(enum EXTENDED_NAME_FORMAT type)
{
- DECLARE_PROC_ADDR(secur32.dll, BOOL, GetUserNameExW,
+ DECLARE_PROC_ADDR(secur32.dll, BOOL, SEC_ENTRY, GetUserNameExW,
enum EXTENDED_NAME_FORMAT, LPCWSTR, PULONG);
static wchar_t wbuffer[1024];
DWORD len;
@@ -2308,7 +2332,7 @@ int setitimer(int type, struct itimerval *in, struct itimerval *out)
static const struct timeval zero;
static int atexit_done;
- if (out != NULL)
+ if (out)
return errno = EINVAL,
error("setitimer param 3 != NULL not implemented");
if (!is_timeval_eq(&in->it_interval, &zero) &&
@@ -2337,7 +2361,7 @@ int sigaction(int sig, struct sigaction *in, struct sigaction *out)
if (sig != SIGALRM)
return errno = EINVAL,
error("sigaction only implemented for SIGALRM");
- if (out != NULL)
+ if (out)
return errno = EINVAL,
error("sigaction: param 3 != NULL not implemented");
@@ -2622,6 +2646,92 @@ static void setup_windows_environment(void)
}
}
+static PSID get_current_user_sid(void)
+{
+ HANDLE token;
+ DWORD len = 0;
+ PSID result = NULL;
+
+ if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token))
+ return NULL;
+
+ if (!GetTokenInformation(token, TokenUser, NULL, 0, &len)) {
+ TOKEN_USER *info = xmalloc((size_t)len);
+ if (GetTokenInformation(token, TokenUser, info, len, &len)) {
+ len = GetLengthSid(info->User.Sid);
+ result = xmalloc(len);
+ if (!CopySid(len, result, info->User.Sid)) {
+ error(_("failed to copy SID (%ld)"),
+ GetLastError());
+ FREE_AND_NULL(result);
+ }
+ }
+ FREE_AND_NULL(info);
+ }
+ CloseHandle(token);
+
+ return result;
+}
+
+int is_path_owned_by_current_sid(const char *path)
+{
+ WCHAR wpath[MAX_PATH];
+ PSID sid = NULL;
+ PSECURITY_DESCRIPTOR descriptor = NULL;
+ DWORD err;
+
+ static wchar_t home[MAX_PATH];
+
+ int result = 0;
+
+ if (xutftowcs_path(wpath, path) < 0)
+ return 0;
+
+ /*
+ * On Windows, the home directory is owned by the administrator, but for
+ * all practical purposes, it belongs to the user. Do pretend that it is
+ * owned by the user.
+ */
+ if (!*home) {
+ DWORD size = ARRAY_SIZE(home);
+ DWORD len = GetEnvironmentVariableW(L"HOME", home, size);
+ if (!len || len > size)
+ wcscpy(home, L"::N/A::");
+ }
+ if (!wcsicmp(wpath, home))
+ return 1;
+
+ /* Get the owner SID */
+ err = GetNamedSecurityInfoW(wpath, SE_FILE_OBJECT,
+ OWNER_SECURITY_INFORMATION |
+ DACL_SECURITY_INFORMATION,
+ &sid, NULL, NULL, NULL, &descriptor);
+
+ if (err != ERROR_SUCCESS)
+ error(_("failed to get owner for '%s' (%ld)"), path, err);
+ else if (sid && IsValidSid(sid)) {
+ /* Now, verify that the SID matches the current user's */
+ static PSID current_user_sid;
+
+ if (!current_user_sid)
+ current_user_sid = get_current_user_sid();
+
+ if (current_user_sid &&
+ IsValidSid(current_user_sid) &&
+ EqualSid(sid, current_user_sid))
+ result = 1;
+ }
+
+ /*
+ * We can release the security descriptor struct only now because `sid`
+ * actually points into this struct.
+ */
+ if (descriptor)
+ LocalFree(descriptor);
+
+ return result;
+}
+
int is_valid_win32_path(const char *path, int allow_literal_nul)
{
const char *p = path;
@@ -2720,7 +2830,7 @@ int is_valid_win32_path(const char *path, int allow_literal_nul)
}
c = path[i];
- if (c && c != '.' && c != ':' && c != '/' && c != '\\')
+ if (c && c != '.' && c != ':' && !is_xplatform_dir_sep(c))
goto not_a_reserved_name;
/* contains reserved name */
diff --git a/compat/mingw.h b/compat/mingw.h
index c9a52ad..a74da68 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -329,6 +329,12 @@ int mingw_getpagesize(void);
#define getpagesize mingw_getpagesize
#endif
+int win32_fsync_no_flush(int fd);
+#define fsync_no_flush win32_fsync_no_flush
+
+#define FSYNC_COMPONENTS_PLATFORM_DEFAULT (FSYNC_COMPONENTS_DEFAULT | FSYNC_COMPONENT_LOOSE_OBJECT)
+#define FSYNC_METHOD_DEFAULT (FSYNC_METHOD_BATCH)
+
struct rlimit {
unsigned int rlim_cur;
};
@@ -454,6 +460,13 @@ char *mingw_query_user_email(void);
#endif
/**
+ * Verifies that the specified path is owned by the user running the
+ * current process.
+ */
+int is_path_owned_by_current_sid(const char *path);
+#define is_path_owned_by_current_user is_path_owned_by_current_sid
+
+/**
* Verifies that the given path is a valid one on Windows.
*
* In particular, path segments are disallowed which
diff --git a/compat/mkdir.c b/compat/mkdir.c
index 9e253fb..02aea3b 100644
--- a/compat/mkdir.c
+++ b/compat/mkdir.c
@@ -9,7 +9,7 @@ int compat_mkdir_wo_trailing_slash(const char *dir, mode_t mode)
size_t len = strlen(dir);
if (len && dir[len-1] == '/') {
- if ((tmp_dir = strdup(dir)) == NULL)
+ if (!(tmp_dir = strdup(dir)))
return -1;
tmp_dir[len-1] = '\0';
}
diff --git a/compat/mmap.c b/compat/mmap.c
index 8d6c02d..2fe1c77 100644
--- a/compat/mmap.c
+++ b/compat/mmap.c
@@ -13,7 +13,7 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of
}
start = malloc(length);
- if (start == NULL) {
+ if (!start) {
errno = ENOMEM;
return MAP_FAILED;
}
diff --git a/compat/nedmalloc/nedmalloc.c b/compat/nedmalloc/nedmalloc.c
index edb438a..2c0ace7 100644
--- a/compat/nedmalloc/nedmalloc.c
+++ b/compat/nedmalloc/nedmalloc.c
@@ -323,7 +323,6 @@ static NOINLINE void RemoveCacheEntries(nedpool *p, threadcache *tc, unsigned in
}
static void DestroyCaches(nedpool *p) THROWSPEC
{
- if(p->caches)
{
threadcache *tc;
int n;
diff --git a/compat/qsort_s.c b/compat/qsort_s.c
index 52d1f0a..0f7ff30 100644
--- a/compat/qsort_s.c
+++ b/compat/qsort_s.c
@@ -49,21 +49,15 @@ int git_qsort_s(void *b, size_t n, size_t s,
int (*cmp)(const void *, const void *, void *), void *ctx)
{
const size_t size = st_mult(n, s);
- char buf[1024];
+ char *tmp;
if (!n)
return 0;
if (!b || !cmp)
return -1;
- if (size < sizeof(buf)) {
- /* The temporary array fits on the small on-stack buffer. */
- msort_with_tmp(b, n, s, cmp, buf, ctx);
- } else {
- /* It's somewhat large, so malloc it. */
- char *tmp = xmalloc(size);
- msort_with_tmp(b, n, s, cmp, tmp, ctx);
- free(tmp);
- }
+ tmp = xmalloc(size);
+ msort_with_tmp(b, n, s, cmp, tmp, ctx);
+ free(tmp);
return 0;
}
diff --git a/compat/simple-ipc/ipc-unix-socket.c b/compat/simple-ipc/ipc-unix-socket.c
index 1927e6e..28a7928 100644
--- a/compat/simple-ipc/ipc-unix-socket.c
+++ b/compat/simple-ipc/ipc-unix-socket.c
@@ -35,6 +35,28 @@ enum ipc_active_state ipc_get_active_state(const char *path)
}
}
+#ifdef __CYGWIN__
+ /*
+ * Cygwin emulates Unix sockets by writing special-crafted files whose
+ * `system` bit is set.
+ *
+ * If we are too fast, Cygwin might still be in the process of marking
+ * the underlying file as a system file. Until then, we will not see a
+ * Unix socket here, but a plain file instead. Just in case that this
+ * is happening, wait a little and try again.
+ */
+ {
+ static const int delay[] = { 1, 10, 20, 40, -1 };
+ int i;
+
+ for (i = 0; S_ISREG(st.st_mode) && delay[i] > 0; i++) {
+ sleep_millisec(delay[i]);
+ if (lstat(path, &st) == -1)
+ return IPC_STATE__INVALID_PATH;
+ }
+ }
+#endif
+
/* also complain if a plain file is in the way */
if ((st.st_mode & S_IFMT) != S_IFSOCK)
return IPC_STATE__INVALID_PATH;
@@ -168,7 +190,8 @@ void ipc_client_close_connection(struct ipc_client_connection *connection)
int ipc_client_send_command_to_connection(
struct ipc_client_connection *connection,
- const char *message, struct strbuf *answer)
+ const char *message, size_t message_len,
+ struct strbuf *answer)
{
int ret = 0;
@@ -176,7 +199,7 @@ int ipc_client_send_command_to_connection(
trace2_region_enter("ipc-client", "send-command", NULL);
- if (write_packetized_from_buf_no_flush(message, strlen(message),
+ if (write_packetized_from_buf_no_flush(message, message_len,
connection->fd) < 0 ||
packet_flush_gently(connection->fd) < 0) {
ret = error(_("could not send IPC command"));
@@ -197,7 +220,8 @@ int ipc_client_send_command_to_connection(
int ipc_client_send_command(const char *path,
const struct ipc_client_connect_options *options,
- const char *message, struct strbuf *answer)
+ const char *message, size_t message_len,
+ struct strbuf *answer)
{
int ret = -1;
enum ipc_active_state state;
@@ -208,7 +232,9 @@ int ipc_client_send_command(const char *path,
if (state != IPC_STATE__LISTENING)
return ret;
- ret = ipc_client_send_command_to_connection(connection, message, answer);
+ ret = ipc_client_send_command_to_connection(connection,
+ message, message_len,
+ answer);
ipc_client_close_connection(connection);
@@ -503,7 +529,7 @@ static int worker_thread__do_io(
if (ret >= 0) {
ret = worker_thread_data->server_data->application_cb(
worker_thread_data->server_data->application_data,
- buf.buf, do_io_reply_callback, &reply_data);
+ buf.buf, buf.len, do_io_reply_callback, &reply_data);
packet_flush_gently(reply_data.fd);
}
diff --git a/compat/simple-ipc/ipc-win32.c b/compat/simple-ipc/ipc-win32.c
index 8dc7bda..20ea7b6 100644
--- a/compat/simple-ipc/ipc-win32.c
+++ b/compat/simple-ipc/ipc-win32.c
@@ -3,6 +3,8 @@
#include "strbuf.h"
#include "pkt-line.h"
#include "thread-utils.h"
+#include "accctrl.h"
+#include "aclapi.h"
#ifndef SUPPORTS_SIMPLE_IPC
/*
@@ -49,6 +51,9 @@ static enum ipc_active_state get_active_state(wchar_t *pipe_path)
if (GetLastError() == ERROR_FILE_NOT_FOUND)
return IPC_STATE__PATH_NOT_FOUND;
+ trace2_data_intmax("ipc-debug", NULL, "getstate/waitpipe/gle",
+ (intmax_t)GetLastError());
+
return IPC_STATE__OTHER_ERROR;
}
@@ -109,9 +114,15 @@ static enum ipc_active_state connect_to_server(
t_start_ms = (DWORD)(getnanotime() / 1000000);
if (!WaitNamedPipeW(wpath, timeout_ms)) {
- if (GetLastError() == ERROR_SEM_TIMEOUT)
+ DWORD gleWait = GetLastError();
+
+ if (gleWait == ERROR_SEM_TIMEOUT)
return IPC_STATE__NOT_LISTENING;
+ trace2_data_intmax("ipc-debug", NULL,
+ "connect/waitpipe/gle",
+ (intmax_t)gleWait);
+
return IPC_STATE__OTHER_ERROR;
}
@@ -133,17 +144,31 @@ static enum ipc_active_state connect_to_server(
break; /* try again */
default:
+ trace2_data_intmax("ipc-debug", NULL,
+ "connect/createfile/gle",
+ (intmax_t)gle);
+
return IPC_STATE__OTHER_ERROR;
}
}
if (!SetNamedPipeHandleState(hPipe, &mode, NULL, NULL)) {
+ gle = GetLastError();
+ trace2_data_intmax("ipc-debug", NULL,
+ "connect/setpipestate/gle",
+ (intmax_t)gle);
+
CloseHandle(hPipe);
return IPC_STATE__OTHER_ERROR;
}
*pfd = _open_osfhandle((intptr_t)hPipe, O_RDWR|O_BINARY);
if (*pfd < 0) {
+ gle = GetLastError();
+ trace2_data_intmax("ipc-debug", NULL,
+ "connect/openosfhandle/gle",
+ (intmax_t)gle);
+
CloseHandle(hPipe);
return IPC_STATE__OTHER_ERROR;
}
@@ -208,7 +233,8 @@ void ipc_client_close_connection(struct ipc_client_connection *connection)
int ipc_client_send_command_to_connection(
struct ipc_client_connection *connection,
- const char *message, struct strbuf *answer)
+ const char *message, size_t message_len,
+ struct strbuf *answer)
{
int ret = 0;
@@ -216,7 +242,7 @@ int ipc_client_send_command_to_connection(
trace2_region_enter("ipc-client", "send-command", NULL);
- if (write_packetized_from_buf_no_flush(message, strlen(message),
+ if (write_packetized_from_buf_no_flush(message, message_len,
connection->fd) < 0 ||
packet_flush_gently(connection->fd) < 0) {
ret = error(_("could not send IPC command"));
@@ -239,7 +265,8 @@ int ipc_client_send_command_to_connection(
int ipc_client_send_command(const char *path,
const struct ipc_client_connect_options *options,
- const char *message, struct strbuf *response)
+ const char *message, size_t message_len,
+ struct strbuf *response)
{
int ret = -1;
enum ipc_active_state state;
@@ -250,7 +277,9 @@ int ipc_client_send_command(const char *path,
if (state != IPC_STATE__LISTENING)
return ret;
- ret = ipc_client_send_command_to_connection(connection, message, response);
+ ret = ipc_client_send_command_to_connection(connection,
+ message, message_len,
+ response);
ipc_client_close_connection(connection);
@@ -458,7 +487,7 @@ static int do_io(struct ipc_server_thread_data *server_thread_data)
if (ret >= 0) {
ret = server_thread_data->server_data->application_cb(
server_thread_data->server_data->application_data,
- buf.buf, do_io_reply_callback, &reply_data);
+ buf.buf, buf.len, do_io_reply_callback, &reply_data);
packet_flush_gently(reply_data.fd);
@@ -565,11 +594,132 @@ static void *server_thread_proc(void *_server_thread_data)
return NULL;
}
+/*
+ * We need to build a Windows "SECURITY_ATTRIBUTES" object and use it
+ * to apply an ACL when we create the initial instance of the Named
+ * Pipe. The construction is somewhat involved and consists of
+ * several sequential steps and intermediate objects.
+ *
+ * We use this structure to hold these intermediate pointers so that
+ * we can free them as a group. (It is unclear from the docs whether
+ * some of these intermediate pointers can be freed before we are
+ * finished using the "lpSA" member.)
+ */
+struct my_sa_data
+{
+ PSID pEveryoneSID;
+ PACL pACL;
+ PSECURITY_DESCRIPTOR pSD;
+ LPSECURITY_ATTRIBUTES lpSA;
+};
+
+static void init_sa(struct my_sa_data *d)
+{
+ memset(d, 0, sizeof(*d));
+}
+
+static void release_sa(struct my_sa_data *d)
+{
+ if (d->pEveryoneSID)
+ FreeSid(d->pEveryoneSID);
+ if (d->pACL)
+ LocalFree(d->pACL);
+ if (d->pSD)
+ LocalFree(d->pSD);
+ if (d->lpSA)
+ LocalFree(d->lpSA);
+
+ memset(d, 0, sizeof(*d));
+}
+
+/*
+ * Create SECURITY_ATTRIBUTES to apply to the initial named pipe. The
+ * creator of the first server instance gets to set the ACLs on it.
+ *
+ * We allow the well-known group `EVERYONE` to have read+write access
+ * to the named pipe so that clients can send queries to the daemon
+ * and receive the response.
+ *
+ * Normally, this is not necessary since the daemon is usually
+ * automatically started by a foreground command like `git status`,
+ * but in those cases where an elevated Git command started the daemon
+ * (such that the daemon itself runs with elevation), we need to add
+ * the ACL so that non-elevated commands can write to it.
+ *
+ * The following document was helpful:
+ * https://docs.microsoft.com/en-us/windows/win32/secauthz/creating-a-security-descriptor-for-a-new-object-in-c--
+ *
+ * Returns d->lpSA set to a SA or NULL.
+ */
+static LPSECURITY_ATTRIBUTES get_sa(struct my_sa_data *d)
+{
+ SID_IDENTIFIER_AUTHORITY sid_auth_world = SECURITY_WORLD_SID_AUTHORITY;
+#define NR_EA (1)
+ EXPLICIT_ACCESS ea[NR_EA];
+ DWORD dwResult;
+
+ if (!AllocateAndInitializeSid(&sid_auth_world, 1,
+ SECURITY_WORLD_RID, 0,0,0,0,0,0,0,
+ &d->pEveryoneSID)) {
+ DWORD gle = GetLastError();
+ trace2_data_intmax("ipc-debug", NULL, "alloc-world-sid/gle",
+ (intmax_t)gle);
+ goto fail;
+ }
+
+ memset(ea, 0, NR_EA * sizeof(EXPLICIT_ACCESS));
+
+ ea[0].grfAccessPermissions = GENERIC_READ | GENERIC_WRITE;
+ ea[0].grfAccessMode = SET_ACCESS;
+ ea[0].grfInheritance = NO_INHERITANCE;
+ ea[0].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
+ ea[0].Trustee.TrusteeForm = TRUSTEE_IS_SID;
+ ea[0].Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP;
+ ea[0].Trustee.ptstrName = (LPTSTR)d->pEveryoneSID;
+
+ dwResult = SetEntriesInAcl(NR_EA, ea, NULL, &d->pACL);
+ if (dwResult != ERROR_SUCCESS) {
+ DWORD gle = GetLastError();
+ trace2_data_intmax("ipc-debug", NULL, "set-acl-entry/gle",
+ (intmax_t)gle);
+ trace2_data_intmax("ipc-debug", NULL, "set-acl-entry/dw",
+ (intmax_t)dwResult);
+ goto fail;
+ }
+
+ d->pSD = (PSECURITY_DESCRIPTOR)LocalAlloc(
+ LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH);
+ if (!InitializeSecurityDescriptor(d->pSD, SECURITY_DESCRIPTOR_REVISION)) {
+ DWORD gle = GetLastError();
+ trace2_data_intmax("ipc-debug", NULL, "init-sd/gle", (intmax_t)gle);
+ goto fail;
+ }
+
+ if (!SetSecurityDescriptorDacl(d->pSD, TRUE, d->pACL, FALSE)) {
+ DWORD gle = GetLastError();
+ trace2_data_intmax("ipc-debug", NULL, "set-sd-dacl/gle", (intmax_t)gle);
+ goto fail;
+ }
+
+ d->lpSA = (LPSECURITY_ATTRIBUTES)LocalAlloc(LPTR, sizeof(SECURITY_ATTRIBUTES));
+ d->lpSA->nLength = sizeof(SECURITY_ATTRIBUTES);
+ d->lpSA->lpSecurityDescriptor = d->pSD;
+ d->lpSA->bInheritHandle = FALSE;
+
+ return d->lpSA;
+
+fail:
+ release_sa(d);
+ return NULL;
+}
+
static HANDLE create_new_pipe(wchar_t *wpath, int is_first)
{
HANDLE hPipe;
DWORD dwOpenMode, dwPipeMode;
- LPSECURITY_ATTRIBUTES lpsa = NULL;
+ struct my_sa_data my_sa_data;
+
+ init_sa(&my_sa_data);
dwOpenMode = PIPE_ACCESS_INBOUND | PIPE_ACCESS_OUTBOUND |
FILE_FLAG_OVERLAPPED;
@@ -585,20 +735,15 @@ static HANDLE create_new_pipe(wchar_t *wpath, int is_first)
* set the ACL / Security Attributes on the named
* pipe; subsequent instances inherit and cannot
* change them.
- *
- * TODO Should we allow the application layer to
- * specify security attributes, such as `LocalService`
- * or `LocalSystem`, when we create the named pipe?
- * This question is probably not important when the
- * daemon is started by a foreground user process and
- * only needs to talk to the current user, but may be
- * if the daemon is run via the Control Panel as a
- * System Service.
*/
+ get_sa(&my_sa_data);
}
hPipe = CreateNamedPipeW(wpath, dwOpenMode, dwPipeMode,
- PIPE_UNLIMITED_INSTANCES, 1024, 1024, 0, lpsa);
+ PIPE_UNLIMITED_INSTANCES, 1024, 1024, 0,
+ my_sa_data.lpSA);
+
+ release_sa(&my_sa_data);
return hPipe;
}
diff --git a/compat/terminal.c b/compat/terminal.c
index 43b73dd..7db330c 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -1,4 +1,4 @@
-#include "git-compat-util.h"
+#include "cache.h"
#include "compat/terminal.h"
#include "sigchain.h"
#include "strbuf.h"
@@ -8,12 +8,10 @@
#if defined(HAVE_DEV_TTY) || defined(GIT_WINDOWS_NATIVE)
-static void restore_term(void);
-
static void restore_term_on_signal(int sig)
{
restore_term();
- sigchain_pop(sig);
+ /* restore_term calls sigchain_pop_common */
raise(sig);
}
@@ -22,48 +20,227 @@ static void restore_term_on_signal(int sig)
#define INPUT_PATH "/dev/tty"
#define OUTPUT_PATH "/dev/tty"
+static volatile sig_atomic_t term_fd_needs_closing;
static int term_fd = -1;
static struct termios old_term;
-static void restore_term(void)
+static const char *background_resume_msg;
+static const char *restore_error_msg;
+static volatile sig_atomic_t ttou_received;
+
+/* async safe error function for use by signal handlers. */
+static void write_err(const char *msg)
+{
+ write_in_full(2, "error: ", strlen("error: "));
+ write_in_full(2, msg, strlen(msg));
+ write_in_full(2, "\n", 1);
+}
+
+static void print_background_resume_msg(int signo)
+{
+ int saved_errno = errno;
+ sigset_t mask;
+ struct sigaction old_sa;
+ struct sigaction sa = { .sa_handler = SIG_DFL };
+
+ ttou_received = 1;
+ write_err(background_resume_msg);
+ sigaction(signo, &sa, &old_sa);
+ raise(signo);
+ sigemptyset(&mask);
+ sigaddset(&mask, signo);
+ sigprocmask(SIG_UNBLOCK, &mask, NULL);
+ /* Stopped here */
+ sigprocmask(SIG_BLOCK, &mask, NULL);
+ sigaction(signo, &old_sa, NULL);
+ errno = saved_errno;
+}
+
+static void restore_terminal_on_suspend(int signo)
+{
+ int saved_errno = errno;
+ int res;
+ struct termios t;
+ sigset_t mask;
+ struct sigaction old_sa;
+ struct sigaction sa = { .sa_handler = SIG_DFL };
+ int can_restore = 1;
+
+ if (tcgetattr(term_fd, &t) < 0)
+ can_restore = 0;
+
+ if (tcsetattr(term_fd, TCSAFLUSH, &old_term) < 0)
+ write_err(restore_error_msg);
+
+ sigaction(signo, &sa, &old_sa);
+ raise(signo);
+ sigemptyset(&mask);
+ sigaddset(&mask, signo);
+ sigprocmask(SIG_UNBLOCK, &mask, NULL);
+ /* Stopped here */
+ sigprocmask(SIG_BLOCK, &mask, NULL);
+ sigaction(signo, &old_sa, NULL);
+ if (!can_restore) {
+ write_err(restore_error_msg);
+ goto out;
+ }
+ /*
+ * If we resume in the background then we receive SIGTTOU when calling
+ * tcsetattr() below. Set up a handler to print an error message in that
+ * case.
+ */
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGTTOU);
+ sa.sa_mask = old_sa.sa_mask;
+ sa.sa_handler = print_background_resume_msg;
+ sa.sa_flags = SA_RESTART;
+ sigaction(SIGTTOU, &sa, &old_sa);
+ again:
+ ttou_received = 0;
+ sigprocmask(SIG_UNBLOCK, &mask, NULL);
+ res = tcsetattr(term_fd, TCSAFLUSH, &t);
+ sigprocmask(SIG_BLOCK, &mask, NULL);
+ if (ttou_received)
+ goto again;
+ else if (res < 0)
+ write_err(restore_error_msg);
+ sigaction(SIGTTOU, &old_sa, NULL);
+ out:
+ errno = saved_errno;
+}
+
+static void reset_job_signals(void)
+{
+ if (restore_error_msg) {
+ signal(SIGTTIN, SIG_DFL);
+ signal(SIGTTOU, SIG_DFL);
+ signal(SIGTSTP, SIG_DFL);
+ restore_error_msg = NULL;
+ background_resume_msg = NULL;
+ }
+}
+
+static void close_term_fd(void)
+{
+ if (term_fd_needs_closing)
+ close(term_fd);
+ term_fd_needs_closing = 0;
+ term_fd = -1;
+}
+
+void restore_term(void)
{
if (term_fd < 0)
return;
tcsetattr(term_fd, TCSAFLUSH, &old_term);
- close(term_fd);
- term_fd = -1;
+ close_term_fd();
+ sigchain_pop_common();
+ reset_job_signals();
}
-static int disable_bits(tcflag_t bits)
+int save_term(enum save_term_flags flags)
+{
+ struct sigaction sa;
+
+ if (term_fd < 0)
+ term_fd = ((flags & SAVE_TERM_STDIN)
+ ? 0
+ : open("/dev/tty", O_RDWR));
+ if (term_fd < 0)
+ return -1;
+ term_fd_needs_closing = !(flags & SAVE_TERM_STDIN);
+ if (tcgetattr(term_fd, &old_term) < 0) {
+ close_term_fd();
+ return -1;
+ }
+ sigchain_push_common(restore_term_on_signal);
+ /*
+ * If job control is disabled then the shell will have set the
+ * disposition of SIGTSTP to SIG_IGN.
+ */
+ sigaction(SIGTSTP, NULL, &sa);
+ if (sa.sa_handler == SIG_IGN)
+ return 0;
+
+ /* avoid calling gettext() from signal handler */
+ background_resume_msg = _("cannot resume in the background, please use 'fg' to resume");
+ restore_error_msg = _("cannot restore terminal settings");
+ sa.sa_handler = restore_terminal_on_suspend;
+ sa.sa_flags = SA_RESTART;
+ sigemptyset(&sa.sa_mask);
+ sigaddset(&sa.sa_mask, SIGTSTP);
+ sigaddset(&sa.sa_mask, SIGTTIN);
+ sigaddset(&sa.sa_mask, SIGTTOU);
+ sigaction(SIGTSTP, &sa, NULL);
+ sigaction(SIGTTIN, &sa, NULL);
+ sigaction(SIGTTOU, &sa, NULL);
+
+ return 0;
+}
+
+static int disable_bits(enum save_term_flags flags, tcflag_t bits)
{
struct termios t;
- term_fd = open("/dev/tty", O_RDWR);
- if (tcgetattr(term_fd, &t) < 0)
- goto error;
+ if (save_term(flags) < 0)
+ return -1;
- old_term = t;
- sigchain_push_common(restore_term_on_signal);
+ t = old_term;
t.c_lflag &= ~bits;
+ if (bits & ICANON) {
+ t.c_cc[VMIN] = 1;
+ t.c_cc[VTIME] = 0;
+ }
if (!tcsetattr(term_fd, TCSAFLUSH, &t))
return 0;
-error:
- close(term_fd);
- term_fd = -1;
+ sigchain_pop_common();
+ reset_job_signals();
+ close_term_fd();
return -1;
}
-static int disable_echo(void)
+static int disable_echo(enum save_term_flags flags)
{
- return disable_bits(ECHO);
+ return disable_bits(flags, ECHO);
}
-static int enable_non_canonical(void)
+static int enable_non_canonical(enum save_term_flags flags)
{
- return disable_bits(ICANON | ECHO);
+ return disable_bits(flags, ICANON | ECHO);
+}
+
+/*
+ * On macos it is not possible to use poll() with a terminal so use select
+ * instead.
+ */
+static int getchar_with_timeout(int timeout)
+{
+ struct timeval tv, *tvp = NULL;
+ fd_set readfds;
+ int res;
+
+ again:
+ if (timeout >= 0) {
+ tv.tv_sec = timeout / 1000;
+ tv.tv_usec = (timeout % 1000) * 1000;
+ tvp = &tv;
+ }
+
+ FD_ZERO(&readfds);
+ FD_SET(0, &readfds);
+ res = select(1, &readfds, NULL, NULL, tvp);
+ if (!res)
+ return EOF;
+ if (res < 0) {
+ if (errno == EINTR)
+ goto again;
+ else
+ return EOF;
+ }
+ return getchar();
}
#elif defined(GIT_WINDOWS_NATIVE)
@@ -75,9 +252,10 @@ static int enable_non_canonical(void)
static int use_stty = 1;
static struct string_list stty_restore = STRING_LIST_INIT_DUP;
static HANDLE hconin = INVALID_HANDLE_VALUE;
-static DWORD cmode;
+static HANDLE hconout = INVALID_HANDLE_VALUE;
+static DWORD cmode_in, cmode_out;
-static void restore_term(void)
+void restore_term(void)
{
if (use_stty) {
int i;
@@ -94,15 +272,51 @@ static void restore_term(void)
return;
}
+ sigchain_pop_common();
+
if (hconin == INVALID_HANDLE_VALUE)
return;
- SetConsoleMode(hconin, cmode);
+ SetConsoleMode(hconin, cmode_in);
CloseHandle(hconin);
- hconin = INVALID_HANDLE_VALUE;
+ if (cmode_out) {
+ assert(hconout != INVALID_HANDLE_VALUE);
+ SetConsoleMode(hconout, cmode_out);
+ CloseHandle(hconout);
+ }
+
+ hconin = hconout = INVALID_HANDLE_VALUE;
}
-static int disable_bits(DWORD bits)
+int save_term(enum save_term_flags flags)
+{
+ hconin = CreateFileA("CONIN$", GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_READ, NULL, OPEN_EXISTING,
+ FILE_ATTRIBUTE_NORMAL, NULL);
+ if (hconin == INVALID_HANDLE_VALUE)
+ return -1;
+
+ if (flags & SAVE_TERM_DUPLEX) {
+ hconout = CreateFileA("CONOUT$", GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
+ FILE_ATTRIBUTE_NORMAL, NULL);
+ if (hconout == INVALID_HANDLE_VALUE)
+ goto error;
+
+ GetConsoleMode(hconout, &cmode_out);
+ }
+
+ GetConsoleMode(hconin, &cmode_in);
+ use_stty = 0;
+ sigchain_push_common(restore_term_on_signal);
+ return 0;
+error:
+ CloseHandle(hconin);
+ hconin = INVALID_HANDLE_VALUE;
+ return -1;
+}
+
+static int disable_bits(enum save_term_flags flags, DWORD bits)
{
if (use_stty) {
struct child_process cp = CHILD_PROCESS_INIT;
@@ -111,7 +325,11 @@ static int disable_bits(DWORD bits)
if (bits & ENABLE_LINE_INPUT) {
string_list_append(&stty_restore, "icanon");
- strvec_push(&cp.args, "-icanon");
+ /*
+ * POSIX allows VMIN and VTIME to overlap with VEOF and
+ * VEOL - let's hope that is not the case on windows.
+ */
+ strvec_pushl(&cp.args, "-icanon", "min", "1", "time", "0", NULL);
}
if (bits & ENABLE_ECHO_INPUT) {
@@ -135,31 +353,28 @@ static int disable_bits(DWORD bits)
use_stty = 0;
}
- hconin = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ, NULL, OPEN_EXISTING,
- FILE_ATTRIBUTE_NORMAL, NULL);
- if (hconin == INVALID_HANDLE_VALUE)
+ if (save_term(flags) < 0)
return -1;
- GetConsoleMode(hconin, &cmode);
- sigchain_push_common(restore_term_on_signal);
- if (!SetConsoleMode(hconin, cmode & ~bits)) {
+ if (!SetConsoleMode(hconin, cmode_in & ~bits)) {
CloseHandle(hconin);
hconin = INVALID_HANDLE_VALUE;
+ sigchain_pop_common();
return -1;
}
return 0;
}
-static int disable_echo(void)
+static int disable_echo(enum save_term_flags flags)
{
- return disable_bits(ENABLE_ECHO_INPUT);
+ return disable_bits(flags, ENABLE_ECHO_INPUT);
}
-static int enable_non_canonical(void)
+static int enable_non_canonical(enum save_term_flags flags)
{
- return disable_bits(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
+ return disable_bits(flags,
+ ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
}
/*
@@ -193,6 +408,16 @@ static int mingw_getchar(void)
}
#define getchar mingw_getchar
+static int getchar_with_timeout(int timeout)
+{
+ struct pollfd pfd = { .fd = 0, .events = POLLIN };
+
+ if (poll(&pfd, 1, timeout) < 1)
+ return EOF;
+
+ return getchar();
+}
+
#endif
#ifndef FORCE_TEXT
@@ -215,7 +440,7 @@ char *git_terminal_prompt(const char *prompt, int echo)
return NULL;
}
- if (!echo && disable_echo()) {
+ if (!echo && disable_echo(0)) {
fclose(input_fh);
fclose(output_fh);
return NULL;
@@ -309,7 +534,7 @@ int read_key_without_echo(struct strbuf *buf)
static int warning_displayed;
int ch;
- if (warning_displayed || enable_non_canonical() < 0) {
+ if (warning_displayed || enable_non_canonical(SAVE_TERM_STDIN) < 0) {
if (!warning_displayed) {
warning("reading single keystrokes not supported on "
"this platform; reading line instead");
@@ -343,14 +568,9 @@ int read_key_without_echo(struct strbuf *buf)
* half a second when we know that the sequence is complete.
*/
while (!is_known_escape_sequence(buf->buf)) {
- struct pollfd pfd = { .fd = 0, .events = POLLIN };
-
- if (poll(&pfd, 1, 500) < 1)
- break;
-
- ch = getchar();
+ ch = getchar_with_timeout(500);
if (ch == EOF)
- return 0;
+ break;
strbuf_addch(buf, ch);
}
}
@@ -361,6 +581,16 @@ int read_key_without_echo(struct strbuf *buf)
#else
+int save_term(enum save_term_flags flags)
+{
+ /* no duplex support available */
+ return -!!(flags & SAVE_TERM_DUPLEX);
+}
+
+void restore_term(void)
+{
+}
+
char *git_terminal_prompt(const char *prompt, int echo)
{
return getpass(prompt);
diff --git a/compat/terminal.h b/compat/terminal.h
index a9d52b8..79ed00c 100644
--- a/compat/terminal.h
+++ b/compat/terminal.h
@@ -1,6 +1,24 @@
#ifndef COMPAT_TERMINAL_H
#define COMPAT_TERMINAL_H
+enum save_term_flags {
+ /* Save input and output settings */
+ SAVE_TERM_DUPLEX = 1 << 0,
+ /* Save stdin rather than /dev/tty (fails if stdin is not a terminal) */
+ SAVE_TERM_STDIN = 1 << 1,
+};
+
+/*
+ * Save the terminal attributes so they can be restored later by a
+ * call to restore_term(). Note that every successful call to
+ * save_term() must be matched by a call to restore_term() even if the
+ * attributes have not been changed. Returns 0 on success, -1 on
+ * failure.
+ */
+int save_term(enum save_term_flags flags);
+/* Restore the terminal attributes that were saved with save_term() */
+void restore_term(void);
+
char *git_terminal_prompt(const char *prompt, int echo);
/* Read a single keystroke, without echoing it to the terminal */
diff --git a/compat/unsetenv.c b/compat/unsetenv.c
index bf5fd70..b9d34af 100644
--- a/compat/unsetenv.c
+++ b/compat/unsetenv.c
@@ -1,6 +1,6 @@
#include "../git-compat-util.h"
-void gitunsetenv (const char *name)
+int gitunsetenv(const char *name)
{
#if !defined(__MINGW32__)
extern char **environ;
@@ -24,4 +24,6 @@ void gitunsetenv (const char *name)
++dst;
}
environ[dst] = NULL;
+
+ return 0;
}
diff --git a/compat/vcbuild/README b/compat/vcbuild/README
index 51fb083..29ec1d0 100644
--- a/compat/vcbuild/README
+++ b/compat/vcbuild/README
@@ -92,7 +92,7 @@
the git operations.
3. Inside Git's directory run the command:
- make command-list.h config-list.h
+ make generated-hdrs
to generate the header file needed to compile git.
4. Then either build Git with the GNU Make Makefile in the Git projects
diff --git a/compat/win32/flush.c b/compat/win32/flush.c
new file mode 100644
index 0000000..291f90e
--- /dev/null
+++ b/compat/win32/flush.c
@@ -0,0 +1,28 @@
+#include "git-compat-util.h"
+#include <winternl.h>
+#include "lazyload.h"
+
+int win32_fsync_no_flush(int fd)
+{
+ IO_STATUS_BLOCK io_status;
+
+#define FLUSH_FLAGS_FILE_DATA_ONLY 1
+
+ DECLARE_PROC_ADDR(ntdll.dll, NTSTATUS, NTAPI, NtFlushBuffersFileEx,
+ HANDLE FileHandle, ULONG Flags, PVOID Parameters, ULONG ParameterSize,
+ PIO_STATUS_BLOCK IoStatusBlock);
+
+ if (!INIT_PROC_ADDR(NtFlushBuffersFileEx)) {
+ errno = ENOSYS;
+ return -1;
+ }
+
+ memset(&io_status, 0, sizeof(io_status));
+ if (NtFlushBuffersFileEx((HANDLE)_get_osfhandle(fd), FLUSH_FLAGS_FILE_DATA_ONLY,
+ NULL, 0, &io_status)) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/compat/win32/lazyload.h b/compat/win32/lazyload.h
index 2b36371..f2bb96c 100644
--- a/compat/win32/lazyload.h
+++ b/compat/win32/lazyload.h
@@ -4,7 +4,7 @@
/*
* A pair of macros to simplify loading of DLL functions. Example:
*
- * DECLARE_PROC_ADDR(kernel32.dll, BOOL, CreateHardLinkW,
+ * DECLARE_PROC_ADDR(kernel32.dll, BOOL, WINAPI, CreateHardLinkW,
* LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES);
*
* if (!INIT_PROC_ADDR(CreateHardLinkW))
@@ -25,10 +25,10 @@ struct proc_addr {
};
/* Declares a function to be loaded dynamically from a DLL. */
-#define DECLARE_PROC_ADDR(dll, rettype, function, ...) \
+#define DECLARE_PROC_ADDR(dll, rettype, convention, function, ...) \
static struct proc_addr proc_addr_##function = \
{ #dll, #function, NULL, 0 }; \
- typedef rettype (WINAPI *proc_type_##function)(__VA_ARGS__); \
+ typedef rettype (convention *proc_type_##function)(__VA_ARGS__); \
static proc_type_##function function
/*
diff --git a/compat/win32/path-utils.h b/compat/win32/path-utils.h
index bba2b64..65fa3b9 100644
--- a/compat/win32/path-utils.h
+++ b/compat/win32/path-utils.h
@@ -6,11 +6,7 @@ int win32_has_dos_drive_prefix(const char *path);
int win32_skip_dos_drive_prefix(char **path);
#define skip_dos_drive_prefix win32_skip_dos_drive_prefix
-static inline int win32_is_dir_sep(int c)
-{
- return c == '/' || c == '\\';
-}
-#define is_dir_sep win32_is_dir_sep
+#define is_dir_sep is_xplatform_dir_sep
static inline char *win32_find_last_dir_sep(const char *path)
{
char *ret = NULL;
diff --git a/compat/win32/syslog.c b/compat/win32/syslog.c
index 161978d..1f8d893 100644
--- a/compat/win32/syslog.c
+++ b/compat/win32/syslog.c
@@ -43,6 +43,7 @@ void syslog(int priority, const char *fmt, ...)
va_end(ap);
while ((pos = strstr(str, "%1")) != NULL) {
+ size_t offset = pos - str;
char *oldstr = str;
str = realloc(str, st_add(++str_len, 1));
if (!str) {
@@ -50,6 +51,7 @@ void syslog(int priority, const char *fmt, ...)
warning_errno("realloc failed");
return;
}
+ pos = str + offset;
memmove(pos + 2, pos + 1, strlen(pos));
pos[1] = ' ';
}
diff --git a/compat/win32/trace2_win32_process_info.c b/compat/win32/trace2_win32_process_info.c
index 8ccbd1c..a53fd92 100644
--- a/compat/win32/trace2_win32_process_info.c
+++ b/compat/win32/trace2_win32_process_info.c
@@ -143,8 +143,8 @@ static void get_is_being_debugged(void)
*/
static void get_peak_memory_info(void)
{
- DECLARE_PROC_ADDR(psapi.dll, BOOL, GetProcessMemoryInfo, HANDLE,
- PPROCESS_MEMORY_COUNTERS, DWORD);
+ DECLARE_PROC_ADDR(psapi.dll, BOOL, WINAPI, GetProcessMemoryInfo,
+ HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD);
if (INIT_PROC_ADDR(GetProcessMemoryInfo)) {
PROCESS_MEMORY_COUNTERS pmc;
diff --git a/compat/winansi.c b/compat/winansi.c
index c27b20a..3abe8dd 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -3,6 +3,7 @@
*/
#undef NOGDI
+
#include "../git-compat-util.h"
#include <wingdi.h>
#include <winreg.h>
@@ -45,8 +46,9 @@ typedef struct _CONSOLE_FONT_INFOEX {
static void warn_if_raster_font(void)
{
DWORD fontFamily = 0;
- DECLARE_PROC_ADDR(kernel32.dll, BOOL, GetCurrentConsoleFontEx,
- HANDLE, BOOL, PCONSOLE_FONT_INFOEX);
+ DECLARE_PROC_ADDR(kernel32.dll, BOOL, WINAPI,
+ GetCurrentConsoleFontEx, HANDLE, BOOL,
+ PCONSOLE_FONT_INFOEX);
/* don't bother if output was ascii only */
if (!non_ascii_used)
diff --git a/compat/zlib-uncompress2.c b/compat/zlib-uncompress2.c
new file mode 100644
index 0000000..77a1b08
--- /dev/null
+++ b/compat/zlib-uncompress2.c
@@ -0,0 +1,96 @@
+#include "git-compat-util.h"
+
+#if ZLIB_VERNUM < 0x1290
+/* taken from zlib's uncompr.c
+
+ commit cacf7f1d4e3d44d871b605da3b647f07d718623f
+ Author: Mark Adler <madler@alumni.caltech.edu>
+ Date: Sun Jan 15 09:18:46 2017 -0800
+
+ zlib 1.2.11
+
+*/
+
+/*
+ * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* clang-format off */
+
+/* ===========================================================================
+ Decompresses the source buffer into the destination buffer. *sourceLen is
+ the byte length of the source buffer. Upon entry, *destLen is the total size
+ of the destination buffer, which must be large enough to hold the entire
+ uncompressed data. (The size of the uncompressed data must have been saved
+ previously by the compressor and transmitted to the decompressor by some
+ mechanism outside the scope of this compression library.) Upon exit,
+ *destLen is the size of the decompressed data and *sourceLen is the number
+ of source bytes consumed. Upon return, source + *sourceLen points to the
+ first unused input byte.
+
+ uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
+ Z_DATA_ERROR if the input data was corrupted, including if the input data is
+ an incomplete zlib stream.
+*/
+int ZEXPORT uncompress2 (
+ Bytef *dest,
+ uLongf *destLen,
+ const Bytef *source,
+ uLong *sourceLen) {
+ z_stream stream;
+ int err;
+ const uInt max = (uInt)-1;
+ uLong len, left;
+ Byte buf[1]; /* for detection of incomplete stream when *destLen == 0 */
+
+ len = *sourceLen;
+ if (*destLen) {
+ left = *destLen;
+ *destLen = 0;
+ }
+ else {
+ left = 1;
+ dest = buf;
+ }
+
+ stream.next_in = (z_const Bytef *)source;
+ stream.avail_in = 0;
+ stream.zalloc = (alloc_func)0;
+ stream.zfree = (free_func)0;
+ stream.opaque = (voidpf)0;
+
+ err = inflateInit(&stream);
+ if (err != Z_OK) return err;
+
+ stream.next_out = dest;
+ stream.avail_out = 0;
+
+ do {
+ if (stream.avail_out == 0) {
+ stream.avail_out = left > (uLong)max ? max : (uInt)left;
+ left -= stream.avail_out;
+ }
+ if (stream.avail_in == 0) {
+ stream.avail_in = len > (uLong)max ? max : (uInt)len;
+ len -= stream.avail_in;
+ }
+ err = inflate(&stream, Z_NO_FLUSH);
+ } while (err == Z_OK);
+
+ *sourceLen -= len + stream.avail_in;
+ if (dest != buf)
+ *destLen = stream.total_out;
+ else if (stream.total_out && err == Z_BUF_ERROR)
+ left = 1;
+
+ inflateEnd(&stream);
+ return err == Z_STREAM_END ? Z_OK :
+ err == Z_NEED_DICT ? Z_DATA_ERROR :
+ err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
+ err;
+}
+#else
+static void *dummy_variable = &dummy_variable;
+#endif
diff --git a/config.c b/config.c
index 2dcbe90..9b0e9c9 100644
--- a/config.c
+++ b/config.c
@@ -6,6 +6,7 @@
*
*/
#include "cache.h"
+#include "date.h"
#include "branch.h"
#include "config.h"
#include "environment.h"
@@ -21,6 +22,7 @@
#include "dir.h"
#include "color.h"
#include "refs.h"
+#include "worktree.h"
struct config_source {
struct config_source *prev;
@@ -120,6 +122,22 @@ static long config_buf_ftell(struct config_source *conf)
return conf->u.buf.pos;
}
+struct config_include_data {
+ int depth;
+ config_fn_t fn;
+ void *data;
+ const struct config_options *opts;
+ struct git_config_source *config_source;
+
+ /*
+ * All remote URLs discovered when reading all config files.
+ */
+ struct string_list *remote_urls;
+};
+#define CONFIG_INCLUDE_INIT { 0 }
+
+static int git_config_include(const char *var, const char *value, void *data);
+
#define MAX_INCLUDE_DEPTH 10
static const char include_depth_advice[] = N_(
"exceeded maximum include depth (%d) while including\n"
@@ -148,8 +166,10 @@ static int handle_path_include(const char *path, struct config_include_data *inc
if (!is_absolute_path(path)) {
char *slash;
- if (!cf || !cf->path)
- return error(_("relative config includes must come from files"));
+ if (!cf || !cf->path) {
+ ret = error(_("relative config includes must come from files"));
+ goto cleanup;
+ }
slash = find_last_dir_sep(cf->path);
if (slash)
@@ -167,6 +187,7 @@ static int handle_path_include(const char *path, struct config_include_data *inc
ret = git_config_from_file(git_config_include, path, inc);
inc->depth--;
}
+cleanup:
strbuf_release(&buf);
free(expanded);
return ret;
@@ -291,9 +312,92 @@ static int include_by_branch(const char *cond, size_t cond_len)
return ret;
}
-static int include_condition_is_true(const struct config_options *opts,
+static int add_remote_url(const char *var, const char *value, void *data)
+{
+ struct string_list *remote_urls = data;
+ const char *remote_name;
+ size_t remote_name_len;
+ const char *key;
+
+ if (!parse_config_key(var, "remote", &remote_name, &remote_name_len,
+ &key) &&
+ remote_name &&
+ !strcmp(key, "url"))
+ string_list_append(remote_urls, value);
+ return 0;
+}
+
+static void populate_remote_urls(struct config_include_data *inc)
+{
+ struct config_options opts;
+
+ struct config_source *store_cf = cf;
+ struct key_value_info *store_kvi = current_config_kvi;
+ enum config_scope store_scope = current_parsing_scope;
+
+ opts = *inc->opts;
+ opts.unconditional_remote_url = 1;
+
+ cf = NULL;
+ current_config_kvi = NULL;
+ current_parsing_scope = 0;
+
+ inc->remote_urls = xmalloc(sizeof(*inc->remote_urls));
+ string_list_init_dup(inc->remote_urls);
+ config_with_options(add_remote_url, inc->remote_urls, inc->config_source, &opts);
+
+ cf = store_cf;
+ current_config_kvi = store_kvi;
+ current_parsing_scope = store_scope;
+}
+
+static int forbid_remote_url(const char *var, const char *value, void *data)
+{
+ const char *remote_name;
+ size_t remote_name_len;
+ const char *key;
+
+ if (!parse_config_key(var, "remote", &remote_name, &remote_name_len,
+ &key) &&
+ remote_name &&
+ !strcmp(key, "url"))
+ die(_("remote URLs cannot be configured in file directly or indirectly included by includeIf.hasconfig:remote.*.url"));
+ return 0;
+}
+
+static int at_least_one_url_matches_glob(const char *glob, int glob_len,
+ struct string_list *remote_urls)
+{
+ struct strbuf pattern = STRBUF_INIT;
+ struct string_list_item *url_item;
+ int found = 0;
+
+ strbuf_add(&pattern, glob, glob_len);
+ for_each_string_list_item(url_item, remote_urls) {
+ if (!wildmatch(pattern.buf, url_item->string, WM_PATHNAME)) {
+ found = 1;
+ break;
+ }
+ }
+ strbuf_release(&pattern);
+ return found;
+}
+
+static int include_by_remote_url(struct config_include_data *inc,
+ const char *cond, size_t cond_len)
+{
+ if (inc->opts->unconditional_remote_url)
+ return 1;
+ if (!inc->remote_urls)
+ populate_remote_urls(inc);
+ return at_least_one_url_matches_glob(cond, cond_len,
+ inc->remote_urls);
+}
+
+static int include_condition_is_true(struct config_include_data *inc,
const char *cond, size_t cond_len)
{
+ const struct config_options *opts = inc->opts;
if (skip_prefix_mem(cond, cond_len, "gitdir:", &cond, &cond_len))
return include_by_gitdir(opts, cond, cond_len, 0);
@@ -301,12 +405,15 @@ static int include_condition_is_true(const struct config_options *opts,
return include_by_gitdir(opts, cond, cond_len, 1);
else if (skip_prefix_mem(cond, cond_len, "onbranch:", &cond, &cond_len))
return include_by_branch(cond, cond_len);
+ else if (skip_prefix_mem(cond, cond_len, "hasconfig:remote.*.url:", &cond,
+ &cond_len))
+ return include_by_remote_url(inc, cond, cond_len);
/* unknown conditionals are always false */
return 0;
}
-int git_config_include(const char *var, const char *value, void *data)
+static int git_config_include(const char *var, const char *value, void *data)
{
struct config_include_data *inc = data;
const char *cond, *key;
@@ -325,9 +432,15 @@ int git_config_include(const char *var, const char *value, void *data)
ret = handle_path_include(value, inc);
if (!parse_config_key(var, "includeif", &cond, &cond_len, &key) &&
- (cond && include_condition_is_true(inc->opts, cond, cond_len)) &&
- !strcmp(key, "path"))
+ cond && include_condition_is_true(inc, cond, cond_len) &&
+ !strcmp(key, "path")) {
+ config_fn_t old_fn = inc->fn;
+
+ if (inc->opts->unconditional_remote_url)
+ inc->fn = forbid_remote_url;
ret = handle_path_include(value, inc);
+ inc->fn = old_fn;
+ }
return ret;
}
@@ -1210,6 +1323,80 @@ static int git_parse_maybe_bool_text(const char *value)
return -1;
}
+static const struct fsync_component_name {
+ const char *name;
+ enum fsync_component component_bits;
+} fsync_component_names[] = {
+ { "loose-object", FSYNC_COMPONENT_LOOSE_OBJECT },
+ { "pack", FSYNC_COMPONENT_PACK },
+ { "pack-metadata", FSYNC_COMPONENT_PACK_METADATA },
+ { "commit-graph", FSYNC_COMPONENT_COMMIT_GRAPH },
+ { "index", FSYNC_COMPONENT_INDEX },
+ { "objects", FSYNC_COMPONENTS_OBJECTS },
+ { "reference", FSYNC_COMPONENT_REFERENCE },
+ { "derived-metadata", FSYNC_COMPONENTS_DERIVED_METADATA },
+ { "committed", FSYNC_COMPONENTS_COMMITTED },
+ { "added", FSYNC_COMPONENTS_ADDED },
+ { "all", FSYNC_COMPONENTS_ALL },
+};
+
+static enum fsync_component parse_fsync_components(const char *var, const char *string)
+{
+ enum fsync_component current = FSYNC_COMPONENTS_PLATFORM_DEFAULT;
+ enum fsync_component positive = 0, negative = 0;
+
+ while (string) {
+ int i;
+ size_t len;
+ const char *ep;
+ int negated = 0;
+ int found = 0;
+
+ string = string + strspn(string, ", \t\n\r");
+ ep = strchrnul(string, ',');
+ len = ep - string;
+ if (!strcmp(string, "none")) {
+ current = FSYNC_COMPONENT_NONE;
+ goto next_name;
+ }
+
+ if (*string == '-') {
+ negated = 1;
+ string++;
+ len--;
+ if (!len)
+ warning(_("invalid value for variable %s"), var);
+ }
+
+ if (!len)
+ break;
+
+ for (i = 0; i < ARRAY_SIZE(fsync_component_names); ++i) {
+ const struct fsync_component_name *n = &fsync_component_names[i];
+
+ if (strncmp(n->name, string, len))
+ continue;
+
+ found = 1;
+ if (negated)
+ negative |= n->component_bits;
+ else
+ positive |= n->component_bits;
+ }
+
+ if (!found) {
+ char *component = xstrndup(string, len);
+ warning(_("ignoring unknown core.fsync component '%s'"), component);
+ free(component);
+ }
+
+next_name:
+ string = ep;
+ }
+
+ return (current & ~negative) | positive;
+}
+
int git_parse_maybe_bool(const char *value)
{
int v = git_parse_maybe_bool_text(value);
@@ -1487,7 +1674,30 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
return 0;
}
+ if (!strcmp(var, "core.fsync")) {
+ if (!value)
+ return config_error_nonbool(var);
+ fsync_components = parse_fsync_components(var, value);
+ return 0;
+ }
+
+ if (!strcmp(var, "core.fsyncmethod")) {
+ if (!value)
+ return config_error_nonbool(var);
+ if (!strcmp(value, "fsync"))
+ fsync_method = FSYNC_METHOD_FSYNC;
+ else if (!strcmp(value, "writeout-only"))
+ fsync_method = FSYNC_METHOD_WRITEOUT_ONLY;
+ else if (!strcmp(value, "batch"))
+ fsync_method = FSYNC_METHOD_BATCH;
+ else
+ warning(_("ignoring unknown core.fsyncMethod value '%s'"), value);
+
+ }
+
if (!strcmp(var, "core.fsyncobjectfiles")) {
+ if (fsync_object_files < 0)
+ warning(_("core.fsyncObjectFiles is deprecated; use core.fsync instead"));
fsync_object_files = git_config_bool(var, value);
return 0;
}
@@ -1541,6 +1751,17 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
return platform_core_config(var, value, cb);
}
+static int git_default_sparse_config(const char *var, const char *value)
+{
+ if (!strcmp(var, "sparse.expectfilesoutsideofpatterns")) {
+ sparse_expect_files_outside_of_patterns = git_config_bool(var, value);
+ return 0;
+ }
+
+ /* Add other config variables here and to Documentation/config/sparse.txt. */
+ return 0;
+}
+
static int git_default_i18n_config(const char *var, const char *value)
{
if (!strcmp(var, "i18n.commitencoding"))
@@ -1556,9 +1777,15 @@ static int git_default_i18n_config(const char *var, const char *value)
static int git_default_branch_config(const char *var, const char *value)
{
if (!strcmp(var, "branch.autosetupmerge")) {
- if (value && !strcasecmp(value, "always")) {
+ if (value && !strcmp(value, "always")) {
git_branch_track = BRANCH_TRACK_ALWAYS;
return 0;
+ } else if (value && !strcmp(value, "inherit")) {
+ git_branch_track = BRANCH_TRACK_INHERIT;
+ return 0;
+ } else if (value && !strcmp(value, "simple")) {
+ git_branch_track = BRANCH_TRACK_SIMPLE;
+ return 0;
}
git_branch_track = git_config_bool(var, value);
return 0;
@@ -1669,6 +1896,9 @@ int git_default_config(const char *var, const char *value, void *cb)
return 0;
}
+ if (starts_with(var, "sparse."))
+ return git_default_sparse_config(var, value);
+
/* Add other config variables here and to Documentation/config.txt. */
return 0;
}
@@ -1923,11 +2153,13 @@ int config_with_options(config_fn_t fn, void *data,
const struct config_options *opts)
{
struct config_include_data inc = CONFIG_INCLUDE_INIT;
+ int ret;
if (opts->respect_includes) {
inc.fn = fn;
inc.data = data;
inc.opts = opts;
+ inc.config_source = config_source;
fn = git_config_include;
data = &inc;
}
@@ -1940,17 +2172,23 @@ int config_with_options(config_fn_t fn, void *data,
* regular lookup sequence.
*/
if (config_source && config_source->use_stdin) {
- return git_config_from_stdin(fn, data);
+ ret = git_config_from_stdin(fn, data);
} else if (config_source && config_source->file) {
- return git_config_from_file(fn, config_source->file, data);
+ ret = git_config_from_file(fn, config_source->file, data);
} else if (config_source && config_source->blob) {
struct repository *repo = config_source->repo ?
config_source->repo : the_repository;
- return git_config_from_blob_ref(fn, repo, config_source->blob,
+ ret = git_config_from_blob_ref(fn, repo, config_source->blob,
data);
+ } else {
+ ret = do_git_config_sequence(opts, fn, data);
}
- return do_git_config_sequence(opts, fn, data);
+ if (inc.remote_urls) {
+ string_list_clear(inc.remote_urls, 0);
+ FREE_AND_NULL(inc.remote_urls);
+ }
+ return ret;
}
static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
@@ -2172,8 +2410,8 @@ int git_configset_get_string(struct config_set *cs, const char *key, char **dest
return 1;
}
-int git_configset_get_string_tmp(struct config_set *cs, const char *key,
- const char **dest)
+static int git_configset_get_string_tmp(struct config_set *cs, const char *key,
+ const char **dest)
{
const char *value;
if (!git_configset_get_value(cs, key, &value)) {
@@ -2502,20 +2740,6 @@ int git_config_get_max_percent_split_change(void)
return -1; /* default value */
}
-int git_config_get_fsmonitor(void)
-{
- if (git_config_get_pathname("core.fsmonitor", &core_fsmonitor))
- core_fsmonitor = getenv("GIT_TEST_FSMONITOR");
-
- if (core_fsmonitor && !*core_fsmonitor)
- core_fsmonitor = NULL;
-
- if (core_fsmonitor)
- return 1;
-
- return 0;
-}
-
int git_config_get_index_threads(int *dest)
{
int is_bool, val;
@@ -2552,11 +2776,12 @@ void git_die_config(const char *key, const char *err, ...)
{
const struct string_list *values;
struct key_value_info *kv_info;
+ report_fn error_fn = get_error_routine();
if (err) {
va_list params;
va_start(params, err);
- vreportf("error: ", err, params);
+ error_fn(err, params);
va_end(params);
}
values = git_config_get_value_multi(key);
@@ -2877,6 +3102,20 @@ int git_config_set_gently(const char *key, const char *value)
return git_config_set_multivar_gently(key, value, NULL, 0);
}
+int repo_config_set_worktree_gently(struct repository *r,
+ const char *key, const char *value)
+{
+ /* Only use worktree-specific config if it is is already enabled. */
+ if (repository_format_worktree_config) {
+ char *file = repo_git_path(r, "config.worktree");
+ int ret = git_config_set_multivar_in_file_gently(
+ file, key, value, NULL, 0);
+ free(file);
+ return ret;
+ }
+ return repo_config_set_multivar_gently(r, key, value, NULL, 0);
+}
+
void git_config_set(const char *key, const char *value)
{
git_config_set_multivar(key, value, NULL, 0);
@@ -2956,7 +3195,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
goto out_free;
}
/* if nothing to unset, error out */
- if (value == NULL) {
+ if (!value) {
ret = CONFIG_NOTHING_SET;
goto out_free;
}
@@ -2972,7 +3211,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
int i, new_line = 0;
struct config_options opts;
- if (value_pattern == NULL)
+ if (!value_pattern)
store.value_pattern = NULL;
else if (value_pattern == CONFIG_REGEX_NONE)
store.value_pattern = CONFIG_REGEX_NONE;
@@ -3112,7 +3351,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
}
/* write the pair (value == NULL means unset) */
- if (value != NULL) {
+ if (value) {
if (!store.section_seen) {
if (write_section(fd, key, &store) < 0)
goto write_err_out;
@@ -3174,14 +3413,28 @@ void git_config_set_multivar_in_file(const char *config_filename,
int git_config_set_multivar_gently(const char *key, const char *value,
const char *value_pattern, unsigned flags)
{
- return git_config_set_multivar_in_file_gently(NULL, key, value, value_pattern,
- flags);
+ return repo_config_set_multivar_gently(the_repository, key, value,
+ value_pattern, flags);
+}
+
+int repo_config_set_multivar_gently(struct repository *r, const char *key,
+ const char *value,
+ const char *value_pattern, unsigned flags)
+{
+ char *file = repo_git_path(r, "config");
+ int res = git_config_set_multivar_in_file_gently(file,
+ key, value,
+ value_pattern,
+ flags);
+ free(file);
+ return res;
}
void git_config_set_multivar(const char *key, const char *value,
const char *value_pattern, unsigned flags)
{
- git_config_set_multivar_in_file(NULL, key, value, value_pattern,
+ git_config_set_multivar_in_file(git_path("config"),
+ key, value, value_pattern,
flags);
}
@@ -3319,7 +3572,7 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename
offset = section_name_match(&buf[i], old_name);
if (offset > 0) {
ret++;
- if (new_name == NULL) {
+ if (!new_name) {
remove = 1;
continue;
}
diff --git a/config.h b/config.h
index f119de0..7654f61 100644
--- a/config.h
+++ b/config.h
@@ -89,6 +89,15 @@ struct config_options {
unsigned int ignore_worktree : 1;
unsigned int ignore_cmdline : 1;
unsigned int system_gently : 1;
+
+ /*
+ * For internal use. Include all includeif.hasremoteurl paths without
+ * checking if the repo has that remote URL, and when doing so, verify
+ * that files included in this way do not configure any remote URLs
+ * themselves.
+ */
+ unsigned int unconditional_remote_url : 1;
+
const char *commondir;
const char *git_dir;
config_parser_event_fn_t event_fn;
@@ -126,6 +135,8 @@ int git_default_config(const char *, const char *, void *);
/**
* Read a specific file in git-config format.
* This function takes the same callback and data parameters as `git_config`.
+ *
+ * Unlike git_config(), this function does not respect includes.
*/
int git_config_from_file(config_fn_t fn, const char *, void *);
@@ -158,6 +169,8 @@ void read_very_early_config(config_fn_t cb, void *data);
* will first feed the user-wide one to the callback, and then the
* repo-specific one; by overwriting, the higher-priority repo-specific
* value is left at the end).
+ *
+ * Unlike git_config_from_file(), this function respects includes.
*/
void git_config(config_fn_t fn, void *);
@@ -254,6 +267,13 @@ void git_config_set_in_file(const char *, const char *, const char *);
int git_config_set_gently(const char *, const char *);
/**
+ * Write a config value that should apply to the current worktree. If
+ * extensions.worktreeConfig is enabled, then the write will happen in the
+ * current worktree's config. Otherwise, write to the common config file.
+ */
+int repo_config_set_worktree_gently(struct repository *, const char *, const char *);
+
+/**
* write config values to `.git/config`, takes a key/value pair as parameter.
*/
void git_config_set(const char *, const char *);
@@ -281,6 +301,7 @@ int git_config_parse_key(const char *, char **, size_t *);
int git_config_set_multivar_gently(const char *, const char *, const char *, unsigned);
void git_config_set_multivar(const char *, const char *, const char *, unsigned);
+int repo_config_set_multivar_gently(struct repository *, const char *, const char *, const char *, unsigned);
int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, unsigned);
/**
@@ -338,39 +359,6 @@ const char *current_config_origin_type(void);
const char *current_config_name(void);
int current_config_line(void);
-/**
- * Include Directives
- * ------------------
- *
- * By default, the config parser does not respect include directives.
- * However, a caller can use the special `git_config_include` wrapper
- * callback to support them. To do so, you simply wrap your "real" callback
- * function and data pointer in a `struct config_include_data`, and pass
- * the wrapper to the regular config-reading functions. For example:
- *
- * -------------------------------------------
- * int read_file_with_include(const char *file, config_fn_t fn, void *data)
- * {
- * struct config_include_data inc = CONFIG_INCLUDE_INIT;
- * inc.fn = fn;
- * inc.data = data;
- * return git_config_from_file(git_config_include, file, &inc);
- * }
- * -------------------------------------------
- *
- * `git_config` respects includes automatically. The lower-level
- * `git_config_from_file` does not.
- *
- */
-struct config_include_data {
- int depth;
- config_fn_t fn;
- void *data;
- const struct config_options *opts;
-};
-#define CONFIG_INCLUDE_INIT { 0 }
-int git_config_include(const char *name, const char *value, void *data);
-
/*
* Match and parse a config key of the form:
*
@@ -486,7 +474,6 @@ void git_configset_clear(struct config_set *cs);
int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
-int git_configset_get_string_tmp(struct config_set *cs, const char *key, const char **dest);
int git_configset_get_int(struct config_set *cs, const char *key, int *dest);
int git_configset_get_ulong(struct config_set *cs, const char *key, unsigned long *dest);
int git_configset_get_bool(struct config_set *cs, const char *key, int *dest);
@@ -610,7 +597,6 @@ int git_config_get_pathname(const char *key, const char **dest);
int git_config_get_index_threads(int *dest);
int git_config_get_split_index(void);
int git_config_get_max_percent_split_change(void);
-int git_config_get_fsmonitor(void);
/* This dies if the configured or default date is in the future */
int git_config_get_expiry(const char *key, const char **output);
diff --git a/config.mak.dev b/config.mak.dev
index 7673fed..335efd4 100644
--- a/config.mak.dev
+++ b/config.mak.dev
@@ -19,6 +19,16 @@
endif
endif
endif
+
+ifneq ($(uname_S),FreeBSD)
+ifneq ($(or $(filter gcc6,$(COMPILER_FEATURES)),$(filter clang7,$(COMPILER_FEATURES))),)
+DEVELOPER_CFLAGS += -std=gnu99
+endif
+else
+# FreeBSD cannot limit to C99 because its system headers unconditionally
+# rely on C11 features.
+endif
+
DEVELOPER_CFLAGS += -Wdeclaration-after-statement
DEVELOPER_CFLAGS += -Wformat-security
DEVELOPER_CFLAGS += -Wold-style-definition
@@ -55,4 +65,9 @@
endif
endif
+# https://bugzilla.redhat.com/show_bug.cgi?id=2075786
+ifneq ($(filter gcc12,$(COMPILER_FEATURES)),)
+DEVELOPER_CFLAGS += -Wno-error=stringop-overread
+endif
+
GIT_TEST_PERL_FATAL_WARNINGS = YesPlease
diff --git a/config.mak.uname b/config.mak.uname
index 2b178ba..259d151 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -57,13 +57,17 @@
HAVE_CLOCK_MONOTONIC = YesPlease
# -lrt is needed for clock_gettime on glibc <= 2.16
NEEDS_LIBRT = YesPlease
+ HAVE_SYNC_FILE_RANGE = YesPlease
HAVE_GETDELIM = YesPlease
- SANE_TEXT_GREP=-a
FREAD_READS_DIRECTORIES = UnfortunatelyYes
BASIC_CFLAGS += -DHAVE_SYSINFO
PROCFS_EXECUTABLE_PATH = /proc/self/exe
HAVE_PLATFORM_PROCINFO = YesPlease
COMPAT_OBJS += compat/linux/procinfo.o
+ # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7.
+ ifneq ($(findstring .el7.,$(uname_R)),)
+ BASIC_CFLAGS += -std=c99
+ endif
endif
ifeq ($(uname_S),GNU/kFreeBSD)
HAVE_ALLOCA_H = YesPlease
@@ -142,6 +146,7 @@
HAVE_BSD_SYSCTL = YesPlease
FREAD_READS_DIRECTORIES = UnfortunatelyYes
HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
+ CSPRNG_METHOD = arc4random
# Workaround for `gettext` being keg-only and not even being linked via
# `brew link --force gettext`, should be obsolete as of
@@ -153,6 +158,16 @@
MSGFMT = /usr/local/opt/gettext/bin/msgfmt
endif
endif
+
+ # The builtin FSMonitor on MacOS builds upon Simple-IPC. Both require
+ # Unix domain sockets and PThreads.
+ ifndef NO_PTHREADS
+ ifndef NO_UNIX_SOCKETS
+ FSMONITOR_DAEMON_BACKEND = darwin
+ endif
+ endif
+
+ BASIC_LDFLAGS += -framework CoreServices
endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease
@@ -257,6 +272,7 @@
HAVE_PATHS_H = YesPlease
HAVE_BSD_SYSCTL = YesPlease
HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
+ CSPRNG_METHOD = arc4random
PAGER_ENV = LESS=FRX LV=-c MORE=FRX
FREAD_READS_DIRECTORIES = UnfortunatelyYes
FILENO_IS_A_MACRO = UnfortunatelyYes
@@ -271,6 +287,7 @@
HAVE_PATHS_H = YesPlease
HAVE_BSD_SYSCTL = YesPlease
HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
+ CSPRNG_METHOD = arc4random
PROCFS_EXECUTABLE_PATH = /proc/curproc/file
FREAD_READS_DIRECTORIES = UnfortunatelyYes
FILENO_IS_A_MACRO = UnfortunatelyYes
@@ -282,6 +299,7 @@
NEEDS_LIBICONV = YesPlease
HAVE_PATHS_H = YesPlease
HAVE_BSD_SYSCTL = YesPlease
+ CSPRNG_METHOD = arc4random
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -293,6 +311,7 @@
HAVE_PATHS_H = YesPlease
HAVE_BSD_SYSCTL = YesPlease
HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
+ CSPRNG_METHOD = arc4random
PROCFS_EXECUTABLE_PATH = /proc/curproc/exe
endif
ifeq ($(uname_S),AIX)
@@ -422,10 +441,16 @@
NO_STRTOUMAX = YesPlease
NO_MKDTEMP = YesPlease
NO_INTTYPES_H = YesPlease
+ CSPRNG_METHOD = rtlgenrandom
# VS2015 with UCRT claims that snprintf and friends are C99 compliant,
# so we don't need this:
#
# SNPRINTF_RETURNS_BOGUS = YesPlease
+
+ # The builtin FSMonitor requires Named Pipes and Threads on Windows.
+ # These are always available, so we do not have to conditionally
+ # support it.
+ FSMONITOR_DAEMON_BACKEND = win32
NO_SVN_TESTS = YesPlease
RUNTIME_PREFIX = YesPlease
HAVE_WPGMPTR = YesWeDo
@@ -454,6 +479,7 @@
CFLAGS =
BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
+ compat/win32/flush.o \
compat/win32/path-utils.o \
compat/win32/pthread.o compat/win32/syslog.o \
compat/win32/trace2_win32_process_info.o \
@@ -589,6 +615,7 @@
NO_MMAP = YesPlease
NO_POLL = YesPlease
NO_INTPTR_T = UnfortunatelyYes
+ CSPRNG_METHOD = openssl
SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
SHELL_PATH = /usr/coreutils/bin/bash
endif
@@ -609,6 +636,11 @@
NO_STRTOUMAX = YesPlease
NO_MKDTEMP = YesPlease
NO_SVN_TESTS = YesPlease
+
+ # The builtin FSMonitor requires Named Pipes and Threads on Windows.
+ # These are always available, so we do not have to conditionally
+ # support it.
+ FSMONITOR_DAEMON_BACKEND = win32
RUNTIME_PREFIX = YesPlease
HAVE_WPGMPTR = YesWeDo
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
@@ -624,11 +656,13 @@
NO_POSIX_GOODIES = UnfortunatelyYes
DEFAULT_HELP_FORMAT = html
HAVE_PLATFORM_PROCINFO = YesPlease
+ CSPRNG_METHOD = rtlgenrandom
BASIC_LDFLAGS += -municode
COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
compat/win32/trace2_win32_process_info.o \
+ compat/win32/flush.o \
compat/win32/path-utils.o \
compat/win32/pthread.o compat/win32/syslog.o \
compat/win32/dirent.o
@@ -716,7 +750,6 @@
git diff-index --cached --quiet HEAD --
# Make .vcxproj files and add them
- unset QUIET_GEN QUIET_BUILT_IN; \
perl contrib/buildsystems/generate -g Vcxproj
git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
@@ -739,9 +772,9 @@
echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets
git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets
- # 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 generated headers
+ $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(GENERATED_H)
+ git add -f $(GENERATED_H)
# Add scripts
rm -f perl/perl.mak
diff --git a/configure.ac b/configure.ac
index 031e8d3..7dcd048 100644
--- a/configure.ac
+++ b/configure.ac
@@ -507,14 +507,6 @@
esac
fi
-if grep -a ascii configure.ac >/dev/null; then
- AC_MSG_RESULT([Using 'grep -a' for sane_grep])
- SANE_TEXT_GREP=-a
-else
- SANE_TEXT_GREP=
-fi
-GIT_CONF_SUBST([SANE_TEXT_GREP])
-
## Checks for libraries.
AC_MSG_NOTICE([CHECKS for libraries])
#
@@ -1090,6 +1082,14 @@
[AC_MSG_RESULT([no])
HAVE_CLOCK_MONOTONIC=])
GIT_CONF_SUBST([HAVE_CLOCK_MONOTONIC])
+
+#
+# Define HAVE_SYNC_FILE_RANGE=YesPlease if sync_file_range is available.
+GIT_CHECK_FUNC(sync_file_range,
+ [HAVE_SYNC_FILE_RANGE=YesPlease],
+ [HAVE_SYNC_FILE_RANGE=])
+GIT_CONF_SUBST([HAVE_SYNC_FILE_RANGE])
+
#
# Define NO_SETITIMER if you don't have setitimer.
GIT_CHECK_FUNC(setitimer,
@@ -1189,9 +1189,6 @@
GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
## Other checks.
-# Define USE_PIC if you need the main git objects to be built with -fPIC
-# in order to build and link perl/Git.so. x86-64 seems to need this.
-#
# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
# Enable it on Windows. By default, symrefs are still used.
#
diff --git a/connect.c b/connect.c
index eaf7d6d..5ea53de 100644
--- a/connect.c
+++ b/connect.c
@@ -379,7 +379,7 @@ struct ref **get_remote_heads(struct packet_reader *reader,
/* Returns 1 when a valid ref has been added to `list`, 0 otherwise */
static int process_ref_v2(struct packet_reader *reader, struct ref ***list,
- char **unborn_head_target)
+ const char **unborn_head_target)
{
int ret = 1;
int i = 0;
@@ -473,22 +473,9 @@ void check_stateless_delimiter(int stateless_rpc,
die("%s", error);
}
-struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
- struct ref **list, int for_push,
- struct transport_ls_refs_options *transport_options,
- const struct string_list *server_options,
- int stateless_rpc)
+static void send_capabilities(int fd_out, struct packet_reader *reader)
{
- int i;
const char *hash_name;
- struct strvec *ref_prefixes = transport_options ?
- &transport_options->ref_prefixes : NULL;
- char **unborn_head_target = transport_options ?
- &transport_options->unborn_head_target : NULL;
- *list = NULL;
-
- if (server_supports_v2("ls-refs", 1))
- packet_write_fmt(fd_out, "command=ls-refs\n");
if (server_supports_v2("agent", 0))
packet_write_fmt(fd_out, "agent=%s", git_user_agent_sanitized());
@@ -502,6 +489,26 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
} else {
reader->hash_algo = &hash_algos[GIT_HASH_SHA1];
}
+}
+
+struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
+ struct ref **list, int for_push,
+ struct transport_ls_refs_options *transport_options,
+ const struct string_list *server_options,
+ int stateless_rpc)
+{
+ int i;
+ struct strvec *ref_prefixes = transport_options ?
+ &transport_options->ref_prefixes : NULL;
+ const char **unborn_head_target = transport_options ?
+ &transport_options->unborn_head_target : NULL;
+ *list = NULL;
+
+ if (server_supports_v2("ls-refs", 1))
+ packet_write_fmt(fd_out, "command=ls-refs\n");
+
+ /* Send capabilities */
+ send_capabilities(fd_out, reader);
if (server_options && server_options->nr &&
server_supports_v2("server-option", 1))
@@ -1327,7 +1334,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
strvec_push(&detect.args, ssh);
strvec_push(&detect.args, "-G");
- push_ssh_options(&detect.args, &detect.env_array,
+ push_ssh_options(&detect.args, &detect.env,
VARIANT_SSH, port, version, flags);
strvec_push(&detect.args, ssh_host);
@@ -1335,7 +1342,8 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
}
strvec_push(&conn->args, ssh);
- push_ssh_options(&conn->args, &conn->env_array, variant, port, version, flags);
+ push_ssh_options(&conn->args, &conn->env, variant, port, version,
+ flags);
strvec_push(&conn->args, ssh_host);
}
@@ -1397,7 +1405,7 @@ struct child_process *git_connect(int fd[2], const char *url,
/* remove repo-local variables from the environment */
for (var = local_repo_env; *var; var++)
- strvec_push(&conn->env_array, *var);
+ strvec_push(&conn->env, *var);
conn->use_shell = 1;
conn->in = conn->out = -1;
@@ -1429,7 +1437,7 @@ struct child_process *git_connect(int fd[2], const char *url,
transport_check_allowed("file");
conn->trace2_child_class = "transport/file";
if (version > 0) {
- strvec_pushf(&conn->env_array,
+ strvec_pushf(&conn->env,
GIT_PROTOCOL_ENVIRONMENT "=version=%d",
version);
}
diff --git a/connected.c b/connected.c
index cf68e37..74a20cb 100644
--- a/connected.c
+++ b/connected.c
@@ -107,10 +107,10 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
if (opt->progress)
strvec_pushf(&rev_list.args, "--progress=%s",
_("Checking connectivity"));
- strvec_push(&rev_list.args, "--unsorted-input");
rev_list.git_cmd = 1;
- rev_list.env = opt->env;
+ if (opt->env)
+ strvec_pushv(&rev_list.env, opt->env);
rev_list.in = -1;
rev_list.no_stdout = 1;
if (opt->err_fd)
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 171b412..29acc4f 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -54,7 +54,7 @@
option(USE_VCPKG "Whether or not to use vcpkg for obtaining dependencies. Only applicable to Windows platforms" ON)
if(NOT WIN32)
- set(USE_VCPKG OFF CACHE BOOL FORCE)
+ set(USE_VCPKG OFF CACHE BOOL "" FORCE)
endif()
if(NOT DEFINED CMAKE_EXPORT_COMPILE_COMMANDS)
@@ -108,7 +108,6 @@
#TODO gitk git-gui gitweb
#TODO Enable NLS on windows natively
-#TODO Add pcre support
#macros for parsing the Makefile for sources and scripts
macro(parse_makefile_for_sources list_var regex)
@@ -160,6 +159,14 @@
find_package(Intl)
endif()
+find_package(PkgConfig)
+if(PkgConfig_FOUND)
+ pkg_check_modules(PCRE2 libpcre2-8)
+ if(PCRE2_FOUND)
+ add_compile_definitions(USE_LIBPCRE2)
+ endif()
+endif()
+
if(NOT Intl_FOUND)
add_compile_definitions(NO_GETTEXT)
if(NOT Iconv_FOUND)
@@ -180,6 +187,9 @@
if(Intl_FOUND)
include_directories(SYSTEM ${Intl_INCLUDE_DIRS})
endif()
+if(PCRE2_FOUND)
+ include_directories(SYSTEM ${PCRE2_INCLUDE_DIRS})
+endif()
if(WIN32 AND NOT MSVC)#not required for visual studio builds
@@ -208,7 +218,7 @@
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
- add_compile_options(/MP)
+ add_compile_options(/MP /std:c11)
endif()
#default behaviour
@@ -260,16 +270,24 @@
_CONSOLE DETECT_MSYS_TTY STRIP_EXTENSION=".exe" NO_SYMLINK_HEAD UNRELIABLE_FSTAT
NOGDI OBJECT_CREATION_MODE=1 __USE_MINGW_ANSI_STDIO=0
USE_NED_ALLOCATOR OVERRIDE_STRDUP MMAP_PREVENTS_DELETE USE_WIN32_MMAP
- UNICODE _UNICODE HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET)
- list(APPEND compat_SOURCES compat/mingw.c compat/winansi.c compat/win32/path-utils.c
- compat/win32/pthread.c compat/win32mmap.c compat/win32/syslog.c
- compat/win32/trace2_win32_process_info.c compat/win32/dirent.c
- compat/nedmalloc/nedmalloc.c compat/strdup.c)
+ HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET HAVE_RTLGENRANDOM)
+ list(APPEND compat_SOURCES
+ compat/mingw.c
+ compat/winansi.c
+ compat/win32/flush.c
+ compat/win32/path-utils.c
+ compat/win32/pthread.c
+ compat/win32mmap.c
+ compat/win32/syslog.c
+ compat/win32/trace2_win32_process_info.c
+ compat/win32/dirent.c
+ compat/nedmalloc/nedmalloc.c
+ compat/strdup.c)
set(NO_UNIX_SOCKETS 1)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )
- list(APPEND compat_SOURCES unix-socket.c unix-stream-server.c)
+ list(APPEND compat_SOURCES unix-socket.c unix-stream-server.c compat/linux/procinfo.c)
endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
@@ -285,6 +303,16 @@
endif()
endif()
+if(SUPPORTS_SIMPLE_IPC)
+ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+ add_compile_definitions(HAVE_FSMONITOR_DAEMON_BACKEND)
+ list(APPEND compat_SOURCES compat/fsmonitor/fsm-listen-win32.c)
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ add_compile_definitions(HAVE_FSMONITOR_DAEMON_BACKEND)
+ list(APPEND compat_SOURCES compat/fsmonitor/fsm-listen-darwin.c)
+ endif()
+endif()
+
set(EXE_EXTENSION ${CMAKE_EXECUTABLE_SUFFIX})
#header checks
@@ -624,6 +652,13 @@
OUTPUT_FILE ${CMAKE_BINARY_DIR}/config-list.h)
endif()
+if(NOT EXISTS ${CMAKE_BINARY_DIR}/hook-list.h)
+ message("Generating hook-list.h")
+ execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-hooklist.sh
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ OUTPUT_FILE ${CMAKE_BINARY_DIR}/hook-list.h)
+endif()
+
include_directories(${CMAKE_BINARY_DIR})
#build
@@ -640,6 +675,12 @@
list(TRANSFORM libxdiff_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
add_library(xdiff STATIC ${libxdiff_SOURCES})
+#reftable
+parse_makefile_for_sources(reftable_SOURCES "REFTABLE_OBJS")
+
+list(TRANSFORM reftable_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
+add_library(reftable STATIC ${reftable_SOURCES})
+
if(WIN32)
if(NOT MSVC)#use windres when compiling with gcc and clang
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git.res
@@ -662,13 +703,17 @@
#link all required libraries to common-main
add_library(common-main OBJECT ${CMAKE_SOURCE_DIR}/common-main.c)
-target_link_libraries(common-main libgit xdiff ${ZLIB_LIBRARIES})
+target_link_libraries(common-main libgit xdiff reftable ${ZLIB_LIBRARIES})
if(Intl_FOUND)
target_link_libraries(common-main ${Intl_LIBRARIES})
endif()
if(Iconv_FOUND)
target_link_libraries(common-main ${Iconv_LIBRARIES})
endif()
+if(PCRE2_FOUND)
+ target_link_libraries(common-main ${PCRE2_LIBRARIES})
+ target_link_directories(common-main PUBLIC ${PCRE2_LIBRARY_DIRS})
+endif()
if(WIN32)
target_link_libraries(common-main ws2_32 ntdll ${CMAKE_BINARY_DIR}/git.res)
add_dependencies(common-main git-rc)
@@ -774,7 +819,6 @@
string(REPLACE "@@USE_GETTEXT_SCHEME@@" "" content "${content}")
string(REPLACE "# @@BROKEN_PATH_FIX@@" "" content "${content}")
string(REPLACE "@@PERL@@" "${PERL_PATH}" content "${content}")
- string(REPLACE "@@SANE_TEXT_GREP@@" "-a" content "${content}")
string(REPLACE "@@PAGER_ENV@@" "LESS=FRX LV=-c" content "${content}")
file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
endforeach()
@@ -902,11 +946,15 @@
add_executable(test-fake-ssh ${CMAKE_SOURCE_DIR}/t/helper/test-fake-ssh.c)
target_link_libraries(test-fake-ssh common-main)
+#reftable-tests
+parse_makefile_for_sources(test-reftable_SOURCES "REFTABLE_TEST_OBJS")
+list(TRANSFORM test-reftable_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
+
#test-tool
parse_makefile_for_sources(test-tool_SOURCES "TEST_BUILTINS_OBJS")
list(TRANSFORM test-tool_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/t/helper/")
-add_executable(test-tool ${CMAKE_SOURCE_DIR}/t/helper/test-tool.c ${test-tool_SOURCES})
+add_executable(test-tool ${CMAKE_SOURCE_DIR}/t/helper/test-tool.c ${test-tool_SOURCES} ${test-reftable_SOURCES})
target_link_libraries(test-tool common-main)
set_target_properties(test-fake-ssh test-tool
diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
index d258445..1a25789 100644
--- a/contrib/buildsystems/Generators/Vcxproj.pm
+++ b/contrib/buildsystems/Generators/Vcxproj.pm
@@ -77,7 +77,7 @@
my $libs_release = "\n ";
my $libs_debug = "\n ";
if (!$static_library) {
- $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
+ $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib|reftable\/libreftable\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
$libs_debug = $libs_release;
$libs_debug =~ s/zlib\.lib/zlibd\.lib/g;
$libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g;
@@ -232,6 +232,7 @@
EOM
if (!$static_library || $target =~ 'vcs-svn' || $target =~ 'xdiff') {
my $uuid_libgit = $$build_structure{"LIBS_libgit_GUID"};
+ my $uuid_libreftable = $$build_structure{"LIBS_reftable/libreftable_GUID"};
my $uuid_xdiff_lib = $$build_structure{"LIBS_xdiff/lib_GUID"};
print F << "EOM";
@@ -241,6 +242,14 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
EOM
+ if (!($name =~ /xdiff|libreftable/)) {
+ print F << "EOM";
+ <ProjectReference Include="$cdup\\reftable\\libreftable\\libreftable.vcxproj">
+ <Project>$uuid_libreftable</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+EOM
+ }
if (!($name =~ 'xdiff')) {
print F << "EOM";
<ProjectReference Include="$cdup\\xdiff\\lib\\xdiff_lib.vcxproj">
diff --git a/contrib/coccinelle/equals-null.cocci b/contrib/coccinelle/equals-null.cocci
new file mode 100644
index 0000000..92c7054
--- /dev/null
+++ b/contrib/coccinelle/equals-null.cocci
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+@@
+expression e;
+statement s;
+@@
+if (
+(
+!e
+|
+- e == NULL
++ !e
+)
+ )
+ {...}
+else s
+
+@@
+expression e;
+statement s;
+@@
+if (
+(
+e
+|
+- e != NULL
++ e
+)
+ )
+ {...}
+else s
diff --git a/contrib/coccinelle/free.cocci b/contrib/coccinelle/free.cocci
index 4490069..6fb9eb6 100644
--- a/contrib/coccinelle/free.cocci
+++ b/contrib/coccinelle/free.cocci
@@ -2,13 +2,21 @@
expression E;
@@
- if (E)
+(
free(E);
+|
+ free_commit_list(E);
+)
@@
expression E;
@@
- if (!E)
+(
free(E);
+|
+ free_commit_list(E);
+)
@@
expression E;
@@ -16,3 +24,22 @@
- free(E);
+ FREE_AND_NULL(E);
- E = NULL;
+
+@@
+expression E;
+@@
+- if (E)
+- {
+ free_commit_list(E);
+ E = NULL;
+- }
+
+@@
+expression E;
+statement S;
+@@
+- if (E) {
++ if (E)
+ S
+ free_commit_list(E);
+- }
diff --git a/contrib/coccinelle/strbuf.cocci b/contrib/coccinelle/strbuf.cocci
index d9ada69..0970d98 100644
--- a/contrib/coccinelle/strbuf.cocci
+++ b/contrib/coccinelle/strbuf.cocci
@@ -15,7 +15,7 @@
@@
expression E;
struct strbuf SB;
-format F =~ "s";
+format F =~ "^s$";
@@
- strbuf_addf(E, "%@F@", SB.buf);
+ strbuf_addbuf(E, &SB);
@@ -23,7 +23,7 @@
@@
expression E;
struct strbuf *SBP;
-format F =~ "s";
+format F =~ "^s$";
@@
- strbuf_addf(E, "%@F@", SBP->buf);
+ strbuf_addbuf(E, SBP);
@@ -44,7 +44,7 @@
@@
expression E1, E2;
-format F =~ "s";
+format F =~ "^s$";
@@
- strbuf_addf(E1, "%@F@", E2);
+ strbuf_addstr(E1, E2);
diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci
index 2ee702e..072ea0d 100644
--- a/contrib/coccinelle/the_repository.pending.cocci
+++ b/contrib/coccinelle/the_repository.pending.cocci
@@ -14,21 +14,6 @@
@@
expression E;
@@
-- has_sha1_file(
-+ repo_has_sha1_file(the_repository,
- E)
-
-@@
-expression E;
-expression F;
-@@
-- has_sha1_file_with_flags(
-+ repo_has_sha1_file_with_flags(the_repository,
- E)
-
-@@
-expression E;
-@@
- has_object_file(
+ repo_has_object_file(the_repository,
E)
diff --git a/contrib/coccinelle/xstrdup_or_null.cocci b/contrib/coccinelle/xstrdup_or_null.cocci
index 8e05d1c..9c1d293 100644
--- a/contrib/coccinelle/xstrdup_or_null.cocci
+++ b/contrib/coccinelle/xstrdup_or_null.cocci
@@ -1,13 +1,5 @@
@@
expression E;
-expression V;
-@@
-- if (E)
-- V = xstrdup(E);
-+ V = xstrdup_or_null(E);
-
-@@
-expression E;
@@
- xstrdup(absolute_path(E))
+ absolute_pathdup(E)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8108eda..ba5c395 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -49,6 +49,11 @@
# and git-switch completion (e.g., completing "foo" when "origin/foo"
# exists).
#
+# GIT_COMPLETION_SHOW_ALL_COMMANDS
+#
+# When set to "1" suggest all commands, including plumbing commands
+# which are hidden by default (e.g. "cat-file" on "git ca<TAB>").
+#
# GIT_COMPLETION_SHOW_ALL
#
# When set to "1" suggest all options, including options which are
@@ -515,7 +520,7 @@
# argument, and using the options specified in the second argument.
__git_ls_files_helper ()
{
- if [ "$2" == "--committable" ]; then
+ if [ "$2" = "--committable" ]; then
__git -C "$1" -c core.quotePath=false diff-index \
--name-only --relative HEAD -- "${3//\\/\\\\}*"
else
@@ -1566,7 +1571,7 @@
case "$cur" in
--conflict=*)
- __gitcomp "diff3 merge" "" "${cur##--conflict=}"
+ __gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
;;
--*)
__gitcomp_builtin checkout
@@ -2001,7 +2006,7 @@
"
__git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd"
-__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:"
+__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default human raw unix auto: format:"
_git_log ()
{
@@ -2359,16 +2364,7 @@
return
;;
--*)
- __gitcomp_builtin send-email "--annotate --bcc --cc --cc-cmd --chain-reply-to
- --compose --confirm= --dry-run --envelope-sender
- --from --identity
- --in-reply-to --no-chain-reply-to --no-signed-off-by-cc
- --no-suppress-from --no-thread --quiet --reply-to
- --signed-off-by-cc --smtp-pass --smtp-server
- --smtp-server-port --smtp-encryption= --smtp-user
- --subject --suppress-cc= --suppress-from --thread --to
- --validate --no-validate
- $__git_format_patch_extra_options"
+ __gitcomp_builtin send-email "$__git_format_patch_extra_options"
return
;;
esac
@@ -2446,7 +2442,7 @@
case "$cur" in
--conflict=*)
- __gitcomp "diff3 merge" "" "${cur##--conflict=}"
+ __gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
;;
--*)
__gitcomp_builtin switch
@@ -2503,7 +2499,14 @@
__git_compute_config_vars ()
{
test -n "$__git_config_vars" ||
- __git_config_vars="$(git help --config-for-completion | sort -u)"
+ __git_config_vars="$(git help --config-for-completion)"
+}
+
+__git_config_sections=
+__git_compute_config_sections ()
+{
+ test -n "$__git_config_sections" ||
+ __git_config_sections="$(git help --config-sections-for-completion)"
}
# Completes possible values of various configuration variables.
@@ -2543,7 +2546,7 @@
return
;;
branch.*.rebase)
- __gitcomp "false true merges preserve interactive" "" "$cur_"
+ __gitcomp "false true merges interactive" "" "$cur_"
return
;;
remote.pushdefault)
@@ -2717,16 +2720,8 @@
__gitcomp "$__git_config_vars" "" "$cur_" "$sfx"
;;
*)
- __git_compute_config_vars
- __gitcomp "$(echo "$__git_config_vars" |
- awk -F . '{
- sections[$1] = 1
- }
- END {
- for (s in sections)
- print s "."
- }
- ')" "" "$cur_"
+ __git_compute_config_sections
+ __gitcomp "$__git_config_sections" "" "$cur_" "."
;;
esac
}
@@ -2887,7 +2882,7 @@
case "$cur" in
--conflict=*)
- __gitcomp "diff3 merge" "" "${cur##--conflict=}"
+ __gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
;;
--source=*)
__git_complete_refs --cur="${cur##--source=}"
@@ -2895,6 +2890,10 @@
--*)
__gitcomp_builtin restore
;;
+ *)
+ if __git rev-parse --verify --quiet HEAD >/dev/null; then
+ __git_complete_index_file "--modified"
+ fi
esac
}
@@ -2996,9 +2995,37 @@
__git_complete_revlist
}
+__gitcomp_directories ()
+{
+ local _tmp_dir _tmp_completions _found=0
+
+ # Get the directory of the current token; this differs from dirname
+ # in that it keeps up to the final trailing slash. If no slash found
+ # that's fine too.
+ [[ "$cur" =~ .*/ ]]
+ _tmp_dir=$BASH_REMATCH
+
+ # Find possible directory completions, adding trailing '/' characters,
+ # de-quoting, and handling unusual characters.
+ while IFS= read -r -d $'\0' c ; do
+ # If there are directory completions, find ones that start
+ # with "$cur", the current token, and put those in COMPREPLY
+ if [[ $c == "$cur"* ]]; then
+ COMPREPLY+=("$c/")
+ _found=1
+ fi
+ done < <(git ls-tree -z -d --name-only HEAD $_tmp_dir)
+
+ if [[ $_found == 0 ]] && [[ "$cur" =~ /$ ]]; then
+ # No possible further completions any deeper, so assume we're at
+ # a leaf directory and just consider it complete
+ __gitcomp_direct_append "$cur "
+ fi
+}
+
_git_sparse_checkout ()
{
- local subcommands="list init set disable"
+ local subcommands="list init set disable add reapply"
local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then
__gitcomp "$subcommands"
@@ -3006,14 +3033,14 @@
fi
case "$subcommand,$cur" in
- init,--*)
- __gitcomp "--cone"
+ *,--*)
+ __gitcomp_builtin sparse-checkout_$subcommand "" "--"
;;
- set,--*)
- __gitcomp "--stdin"
- ;;
- *)
- ;;
+ set,*|add,*)
+ if [ "$(__git config core.sparseCheckoutCone)" == "true" ] ||
+ [ -n "$(__git_find_on_cmdline --cone)" ]; then
+ __gitcomp_directories
+ fi
esac
}
@@ -3465,7 +3492,13 @@
then
__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
else
- __gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
+ local list_cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config
+
+ if test "${GIT_COMPLETION_SHOW_ALL_COMMANDS-}" = "1"
+ then
+ list_cmds=builtins,$list_cmds
+ fi
+ __gitcomp "$(__git --list-cmds=$list_cmds)"
fi
;;
esac
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index db7c006..87b2b91 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -66,6 +66,11 @@
# git always compare HEAD to @{upstream}
# svn always compare HEAD to your SVN upstream
#
+# By default, __git_ps1 will compare HEAD to your SVN upstream if it can
+# find one, or @{upstream} otherwise. Once you have set
+# GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
+# setting the bash.showUpstream config variable.
+#
# You can change the separator between the branch name and the above
# state symbols by setting GIT_PS1_STATESEPARATOR. The default separator
# is SP.
@@ -79,11 +84,6 @@
# single '?' character by setting GIT_PS1_COMPRESSSPARSESTATE, or omitted
# by setting GIT_PS1_OMITSPARSESTATE.
#
-# By default, __git_ps1 will compare HEAD to your SVN upstream if it can
-# find one, or @{upstream} otherwise. Once you have set
-# GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
-# setting the bash.showUpstream config variable.
-#
# If you would like to see more information about the identity of
# commits checked out as a detached HEAD, set GIT_PS1_DESCRIBE_STYLE
# to one of these values:
@@ -115,7 +115,7 @@
{
local key value
local svn_remote svn_url_pattern count n
- local upstream=git legacy="" verbose="" name=""
+ local upstream_type=git legacy="" verbose="" name=""
svn_remote=()
# get some config options from git-config
@@ -132,7 +132,7 @@
svn-remote.*.url)
svn_remote[$((${#svn_remote[@]} + 1))]="$value"
svn_url_pattern="$svn_url_pattern\\|$value"
- upstream=svn+git # default upstream is SVN if available, else git
+ upstream_type=svn+git # default upstream type is SVN if available, else git
;;
esac
done <<< "$output"
@@ -141,16 +141,16 @@
local option
for option in ${GIT_PS1_SHOWUPSTREAM}; do
case "$option" in
- git|svn) upstream="$option" ;;
+ git|svn) upstream_type="$option" ;;
verbose) verbose=1 ;;
legacy) legacy=1 ;;
name) name=1 ;;
esac
done
- # Find our upstream
- case "$upstream" in
- git) upstream="@{upstream}" ;;
+ # Find our upstream type
+ case "$upstream_type" in
+ git) upstream_type="@{upstream}" ;;
svn*)
# get the upstream from the "git-svn-id: ..." in a commit message
# (git-svn uses essentially the same procedure internally)
@@ -167,12 +167,12 @@
if [[ -z "$svn_upstream" ]]; then
# default branch name for checkouts with no layout:
- upstream=${GIT_SVN_ID:-git-svn}
+ upstream_type=${GIT_SVN_ID:-git-svn}
else
- upstream=${svn_upstream#/}
+ upstream_type=${svn_upstream#/}
fi
- elif [[ "svn+git" = "$upstream" ]]; then
- upstream="@{upstream}"
+ elif [[ "svn+git" = "$upstream_type" ]]; then
+ upstream_type="@{upstream}"
fi
;;
esac
@@ -180,11 +180,11 @@
# Find how many commits we are ahead/behind our upstream
if [[ -z "$legacy" ]]; then
count="$(git rev-list --count --left-right \
- "$upstream"...HEAD 2>/dev/null)"
+ "$upstream_type"...HEAD 2>/dev/null)"
else
# produce equivalent output to --count for older versions of git
local commits
- if commits="$(git rev-list --left-right "$upstream"...HEAD 2>/dev/null)"
+ if commits="$(git rev-list --left-right "$upstream_type"...HEAD 2>/dev/null)"
then
local commit behind=0 ahead=0
for commit in $commits
@@ -214,26 +214,26 @@
*) # diverged from upstream
p="<>" ;;
esac
- else
+ else # verbose, set upstream instead of p
case "$count" in
"") # no upstream
- p="" ;;
+ upstream="" ;;
"0 0") # equal to upstream
- p=" u=" ;;
+ upstream="|u=" ;;
"0 "*) # ahead of upstream
- p=" u+${count#0 }" ;;
+ upstream="|u+${count#0 }" ;;
*" 0") # behind upstream
- p=" u-${count% 0}" ;;
+ upstream="|u-${count% 0}" ;;
*) # diverged from upstream
- p=" u+${count#* }-${count% *}" ;;
+ upstream="|u+${count#* }-${count% *}" ;;
esac
if [[ -n "$count" && -n "$name" ]]; then
__git_ps1_upstream_name=$(git rev-parse \
- --abbrev-ref "$upstream" 2>/dev/null)
+ --abbrev-ref "$upstream_type" 2>/dev/null)
if [ $pcmode = yes ] && [ $ps1_expanded = yes ]; then
- p="$p \${__git_ps1_upstream_name}"
+ upstream="$upstream \${__git_ps1_upstream_name}"
else
- p="$p ${__git_ps1_upstream_name}"
+ upstream="$upstream ${__git_ps1_upstream_name}"
# not needed anymore; keep user's
# environment clean
unset __git_ps1_upstream_name
@@ -512,7 +512,8 @@
local u=""
local h=""
local c=""
- local p=""
+ local p="" # short version of upstream state indicator
+ local upstream="" # verbose version of upstream state indicator
if [ "true" = "$inside_gitdir" ]; then
if [ "true" = "$bare_repo" ]; then
@@ -568,8 +569,8 @@
b="\${__git_ps1_branch_name}"
fi
- local f="$h$w$i$s$u"
- local gitstring="$c$b${f:+$z$f}${sparse}$r$p"
+ local f="$h$w$i$s$u$p"
+ local gitstring="$c$b${f:+$z$f}${sparse}$r${upstream}"
if [ $pcmode = yes ]; then
if [ "${__git_printf_supports_v-}" != yes ]; then
diff --git a/contrib/git-jump/README b/contrib/git-jump/README
index 2f618a7..8bcace2 100644
--- a/contrib/git-jump/README
+++ b/contrib/git-jump/README
@@ -65,6 +65,9 @@
# jump to merge conflicts
git jump merge
+# documentation conflicts are hard; skip past them for now
+git jump merge :^Documentation
+
# jump to all instances of foo_bar
git jump grep foo_bar
diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump
index 931b0fe..92dbd4c 100755
--- a/contrib/git-jump/git-jump
+++ b/contrib/git-jump/git-jump
@@ -39,7 +39,7 @@
}
mode_merge() {
- git ls-files -u |
+ git ls-files -u "$@" |
perl -pe 's/^.*?\t//' |
sort -u |
while IFS= read fn; do
diff --git a/contrib/mw-to-git/t/t9365-continuing-queries.sh b/contrib/mw-to-git/t/t9365-continuing-queries.sh
index 0164547..d3e7312 100755
--- a/contrib/mw-to-git/t/t9365-continuing-queries.sh
+++ b/contrib/mw-to-git/t/t9365-continuing-queries.sh
@@ -12,7 +12,7 @@
for i in $(test_seq 501)
do
echo "creating revision $i" &&
- wiki_editpage foo "revision $i<br/>" true
+ wiki_editpage foo "revision $i<br/>" true || return 1
done
'
diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
index eeee45d..26b724c 100755
--- a/contrib/rerere-train.sh
+++ b/contrib/rerere-train.sh
@@ -86,12 +86,12 @@
fi
if test -s "$GIT_DIR/MERGE_RR"
then
- git show -s --pretty=format:"Learning from %h %s" "$commit"
+ git --no-pager show -s --format="Learning from %h %s" "$commit"
git rerere
git checkout -q $commit -- .
git rerere
fi
- git reset -q --hard
+ git reset -q --hard # Might nuke untracked files...
done
if test -z "$branch"
diff --git a/contrib/scalar/.gitignore b/contrib/scalar/.gitignore
new file mode 100644
index 0000000..ff3d47e
--- /dev/null
+++ b/contrib/scalar/.gitignore
@@ -0,0 +1,2 @@
+/*.exe
+/scalar
diff --git a/contrib/scalar/Makefile b/contrib/scalar/Makefile
new file mode 100644
index 0000000..37f283f
--- /dev/null
+++ b/contrib/scalar/Makefile
@@ -0,0 +1,35 @@
+# The default target of this Makefile is...
+all::
+
+# Import tree-wide shared Makefile behavior and libraries
+include ../../shared.mak
+
+include ../../config.mak.uname
+-include ../../config.mak.autogen
+-include ../../config.mak
+
+TARGETS = scalar$(X) scalar.o
+GITLIBS = ../../common-main.o ../../libgit.a ../../xdiff/lib.a
+
+all:: scalar$(X) ../../bin-wrappers/scalar
+
+$(GITLIBS):
+ $(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) $(subst ../../,,$@)
+
+$(TARGETS): $(GITLIBS) scalar.c
+ $(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) $(patsubst %,contrib/scalar/%,$@)
+
+clean:
+ $(RM) $(TARGETS) ../../bin-wrappers/scalar
+
+../../bin-wrappers/scalar: ../../wrap-for-bin.sh Makefile
+ @mkdir -p ../../bin-wrappers
+ $(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ -e 's|@@BUILD_DIR@@|$(shell cd ../.. && pwd)|' \
+ -e 's|@@PROG@@|contrib/scalar/scalar$(X)|' < $< > $@ && \
+ chmod +x $@
+
+test: all
+ $(MAKE) -C t
+
+.PHONY: $(GITLIBS) all clean test FORCE
diff --git a/contrib/scalar/README.md b/contrib/scalar/README.md
new file mode 100644
index 0000000..634b577
--- /dev/null
+++ b/contrib/scalar/README.md
@@ -0,0 +1,82 @@
+# Scalar - an opinionated repository management tool
+
+Scalar is an add-on to Git that helps users take advantage of advanced
+performance features in Git. Originally implemented in C# using .NET Core,
+based on the learnings from the VFS for Git project, most of the techniques
+developed by the Scalar project have been integrated into core Git already:
+
+* partial clone,
+* commit graphs,
+* multi-pack index,
+* sparse checkout (cone mode),
+* scheduled background maintenance,
+* etc
+
+This directory contains the remaining parts of Scalar that are not (yet) in
+core Git.
+
+## Roadmap
+
+The idea is to populate this directory via incremental patch series and
+eventually move to a top-level directory next to `gitk-git/` and to `git-gui/`. The
+current plan involves the following patch series:
+
+- `scalar-the-beginning`: The initial patch series which sets up
+ `contrib/scalar/` and populates it with a minimal `scalar` command that
+ demonstrates the fundamental ideas.
+
+- `scalar-c-and-C`: The `scalar` command learns about two options that can be
+ specified before the command, `-c <key>=<value>` and `-C <directory>`.
+
+- `scalar-diagnose`: The `scalar` command is taught the `diagnose` subcommand.
+
+- `scalar-and-builtin-fsmonitor`: The built-in FSMonitor is enabled in `scalar
+ register` and in `scalar clone`, for an enormous performance boost when
+ working in large worktrees. This patch series necessarily depends on Jeff
+ Hostetler's FSMonitor patch series to be integrated into Git.
+
+- `scalar-gentler-config-locking`: Scalar enlistments are registered in the
+ user's Git config. This usually does not represent any problem because it is
+ rare for a user to register an enlistment. However, in Scalar's functional
+ tests, Scalar enlistments are created galore, and in parallel, which can lead
+ to lock contention. This patch series works around that problem by re-trying
+ to lock the config file in a gentle fashion.
+
+- `scalar-extra-docs`: Add some extensive documentation that has been written
+ in the original Scalar project (all subject to discussion, of course).
+
+- `optionally-install-scalar`: Now that Scalar is feature (and documentation)
+ complete and is verified in CI builds, let's offer to install it.
+
+- `move-scalar-to-toplevel`: Now that Scalar is complete, let's move it next to
+ `gitk-git/` and to `git-gui/`, making it a top-level command.
+
+The following two patch series exist in Microsoft's fork of Git and are
+publicly available. There is no current plan to upstream them, not because I
+want to withhold these patches, but because I don't think the Git community is
+interested in these patches.
+
+There are some interesting ideas there, but the implementation is too specific
+to Azure Repos and/or VFS for Git to be of much help in general (and also: my
+colleagues tried to upstream some patches already and the enthusiasm for
+integrating things related to Azure Repos and VFS for Git can be summarized in
+very, very few words).
+
+These still exist mainly because the GVFS protocol is what Azure Repos has
+instead of partial clone, while Git is focused on improving partial clone:
+
+- `scalar-with-gvfs`: The primary purpose of this patch series is to support
+ existing Scalar users whose repositories are hosted in Azure Repos (which
+ does not support Git's partial clones, but supports its predecessor, the GVFS
+ protocol, which is used by Scalar to emulate the partial clone).
+
+ Since the GVFS protocol will never be supported by core Git, this patch
+ series will remain in Microsoft's fork of Git.
+
+- `run-scalar-functional-tests`: The Scalar project developed a quite
+ comprehensive set of integration tests (or, "Functional Tests"). They are the
+ sole remaining part of the original C#-based Scalar project, and this patch
+ adds a GitHub workflow that runs them all.
+
+ Since the tests partially depend on features that are only provided in the
+ `scalar-with-gvfs` patch series, this patch cannot be upstreamed.
diff --git a/contrib/scalar/scalar.c b/contrib/scalar/scalar.c
new file mode 100644
index 0000000..2817691
--- /dev/null
+++ b/contrib/scalar/scalar.c
@@ -0,0 +1,1133 @@
+/*
+ * The Scalar command-line interface.
+ */
+
+#include "cache.h"
+#include "gettext.h"
+#include "parse-options.h"
+#include "config.h"
+#include "run-command.h"
+#include "refs.h"
+#include "dir.h"
+#include "packfile.h"
+#include "help.h"
+#include "archive.h"
+#include "object-store.h"
+
+/*
+ * Remove the deepest subdirectory in the provided path string. Path must not
+ * include a trailing path separator. Returns 1 if parent directory found,
+ * otherwise 0.
+ */
+static int strbuf_parent_directory(struct strbuf *buf)
+{
+ size_t len = buf->len;
+ size_t offset = offset_1st_component(buf->buf);
+ char *path_sep = find_last_dir_sep(buf->buf + offset);
+ strbuf_setlen(buf, path_sep ? path_sep - buf->buf : offset);
+
+ return buf->len < len;
+}
+
+static void setup_enlistment_directory(int argc, const char **argv,
+ const char * const *usagestr,
+ const struct option *options,
+ struct strbuf *enlistment_root)
+{
+ struct strbuf path = STRBUF_INIT;
+ char *root;
+ int enlistment_found = 0;
+
+ if (startup_info->have_repository)
+ BUG("gitdir already set up?!?");
+
+ if (argc > 1)
+ usage_with_options(usagestr, options);
+
+ /* find the worktree, determine its corresponding root */
+ if (argc == 1) {
+ strbuf_add_absolute_path(&path, argv[0]);
+ if (!is_directory(path.buf))
+ die(_("'%s' does not exist"), path.buf);
+ } else if (strbuf_getcwd(&path) < 0)
+ die(_("need a working directory"));
+
+ strbuf_trim_trailing_dir_sep(&path);
+ do {
+ const size_t len = path.len;
+
+ /* check if currently in enlistment root with src/ workdir */
+ strbuf_addstr(&path, "/src");
+ if (is_nonbare_repository_dir(&path)) {
+ if (enlistment_root)
+ strbuf_add(enlistment_root, path.buf, len);
+
+ enlistment_found = 1;
+ break;
+ }
+
+ /* reset to original path */
+ strbuf_setlen(&path, len);
+
+ /* check if currently in workdir */
+ if (is_nonbare_repository_dir(&path)) {
+ if (enlistment_root) {
+ /*
+ * If the worktree's directory's name is `src`, the enlistment is the
+ * parent directory, otherwise it is identical to the worktree.
+ */
+ root = strip_path_suffix(path.buf, "src");
+ strbuf_addstr(enlistment_root, root ? root : path.buf);
+ free(root);
+ }
+
+ enlistment_found = 1;
+ break;
+ }
+ } while (strbuf_parent_directory(&path));
+
+ if (!enlistment_found)
+ die(_("could not find enlistment root"));
+
+ if (chdir(path.buf) < 0)
+ die_errno(_("could not switch to '%s'"), path.buf);
+
+ strbuf_release(&path);
+ setup_git_directory();
+}
+
+static int run_git(const char *arg, ...)
+{
+ struct strvec argv = STRVEC_INIT;
+ va_list args;
+ const char *p;
+ int res;
+
+ va_start(args, arg);
+ strvec_push(&argv, arg);
+ while ((p = va_arg(args, const char *)))
+ strvec_push(&argv, p);
+ va_end(args);
+
+ res = run_command_v_opt(argv.v, RUN_GIT_CMD);
+
+ strvec_clear(&argv);
+ return res;
+}
+
+static int set_recommended_config(int reconfigure)
+{
+ struct {
+ const char *key;
+ const char *value;
+ int overwrite_on_reconfigure;
+ } config[] = {
+ /* Required */
+ { "am.keepCR", "true", 1 },
+ { "core.FSCache", "true", 1 },
+ { "core.multiPackIndex", "true", 1 },
+ { "core.preloadIndex", "true", 1 },
+#ifndef WIN32
+ { "core.untrackedCache", "true", 1 },
+#else
+ /*
+ * Unfortunately, Scalar's Functional Tests demonstrated
+ * that the untracked cache feature is unreliable on Windows
+ * (which is a bummer because that platform would benefit the
+ * most from it). For some reason, freshly created files seem
+ * not to update the directory's `lastModified` time
+ * immediately, but the untracked cache would need to rely on
+ * that.
+ *
+ * Therefore, with a sad heart, we disable this very useful
+ * feature on Windows.
+ */
+ { "core.untrackedCache", "false", 1 },
+#endif
+ { "core.logAllRefUpdates", "true", 1 },
+ { "credential.https://dev.azure.com.useHttpPath", "true", 1 },
+ { "credential.validate", "false", 1 }, /* GCM4W-only */
+ { "gc.auto", "0", 1 },
+ { "gui.GCWarning", "false", 1 },
+ { "index.threads", "true", 1 },
+ { "index.version", "4", 1 },
+ { "merge.stat", "false", 1 },
+ { "merge.renames", "true", 1 },
+ { "pack.useBitmaps", "false", 1 },
+ { "pack.useSparse", "true", 1 },
+ { "receive.autoGC", "false", 1 },
+ { "feature.manyFiles", "false", 1 },
+ { "feature.experimental", "false", 1 },
+ { "fetch.unpackLimit", "1", 1 },
+ { "fetch.writeCommitGraph", "false", 1 },
+#ifdef WIN32
+ { "http.sslBackend", "schannel", 1 },
+#endif
+ /* Optional */
+ { "status.aheadBehind", "false" },
+ { "commitGraph.generationVersion", "1" },
+ { "core.autoCRLF", "false" },
+ { "core.safeCRLF", "false" },
+ { "fetch.showForcedUpdates", "false" },
+ { NULL, NULL },
+ };
+ int i;
+ char *value;
+
+ for (i = 0; config[i].key; i++) {
+ if ((reconfigure && config[i].overwrite_on_reconfigure) ||
+ git_config_get_string(config[i].key, &value)) {
+ trace2_data_string("scalar", the_repository, config[i].key, "created");
+ if (git_config_set_gently(config[i].key,
+ config[i].value) < 0)
+ return error(_("could not configure %s=%s"),
+ config[i].key, config[i].value);
+ } else {
+ trace2_data_string("scalar", the_repository, config[i].key, "exists");
+ free(value);
+ }
+ }
+
+ /*
+ * The `log.excludeDecoration` setting is special because it allows
+ * for multiple values.
+ */
+ if (git_config_get_string("log.excludeDecoration", &value)) {
+ trace2_data_string("scalar", the_repository,
+ "log.excludeDecoration", "created");
+ if (git_config_set_multivar_gently("log.excludeDecoration",
+ "refs/prefetch/*",
+ CONFIG_REGEX_NONE, 0))
+ return error(_("could not configure "
+ "log.excludeDecoration"));
+ } else {
+ trace2_data_string("scalar", the_repository,
+ "log.excludeDecoration", "exists");
+ free(value);
+ }
+
+ return 0;
+}
+
+static int toggle_maintenance(int enable)
+{
+ return run_git("maintenance", enable ? "start" : "unregister", NULL);
+}
+
+static int add_or_remove_enlistment(int add)
+{
+ int res;
+
+ if (!the_repository->worktree)
+ die(_("Scalar enlistments require a worktree"));
+
+ res = run_git("config", "--global", "--get", "--fixed-value",
+ "scalar.repo", the_repository->worktree, NULL);
+
+ /*
+ * If we want to add and the setting is already there, then do nothing.
+ * If we want to remove and the setting is not there, then do nothing.
+ */
+ if ((add && !res) || (!add && res))
+ return 0;
+
+ return run_git("config", "--global", add ? "--add" : "--unset",
+ add ? "--no-fixed-value" : "--fixed-value",
+ "scalar.repo", the_repository->worktree, NULL);
+}
+
+static int register_dir(void)
+{
+ int res = add_or_remove_enlistment(1);
+
+ if (!res)
+ res = set_recommended_config(0);
+
+ if (!res)
+ res = toggle_maintenance(1);
+
+ return res;
+}
+
+static int unregister_dir(void)
+{
+ int res = 0;
+
+ if (toggle_maintenance(0) < 0)
+ res = -1;
+
+ if (add_or_remove_enlistment(0) < 0)
+ res = -1;
+
+ return res;
+}
+
+static int add_directory_to_archiver(struct strvec *archiver_args,
+ const char *path, int recurse)
+{
+ int at_root = !*path;
+ DIR *dir = opendir(at_root ? "." : path);
+ struct dirent *e;
+ struct strbuf buf = STRBUF_INIT;
+ size_t len;
+ int res = 0;
+
+ if (!dir)
+ return error_errno(_("could not open directory '%s'"), path);
+
+ if (!at_root)
+ strbuf_addf(&buf, "%s/", path);
+ len = buf.len;
+ strvec_pushf(archiver_args, "--prefix=%s", buf.buf);
+
+ while (!res && (e = readdir(dir))) {
+ if (!strcmp(".", e->d_name) || !strcmp("..", e->d_name))
+ continue;
+
+ strbuf_setlen(&buf, len);
+ strbuf_addstr(&buf, e->d_name);
+
+ if (e->d_type == DT_REG)
+ strvec_pushf(archiver_args, "--add-file=%s", buf.buf);
+ else if (e->d_type != DT_DIR)
+ warning(_("skipping '%s', which is neither file nor "
+ "directory"), buf.buf);
+ else if (recurse &&
+ add_directory_to_archiver(archiver_args,
+ buf.buf, recurse) < 0)
+ res = -1;
+ }
+
+ closedir(dir);
+ strbuf_release(&buf);
+ return res;
+}
+
+#ifndef WIN32
+#include <sys/statvfs.h>
+#endif
+
+static int get_disk_info(struct strbuf *out)
+{
+#ifdef WIN32
+ struct strbuf buf = STRBUF_INIT;
+ char volume_name[MAX_PATH], fs_name[MAX_PATH];
+ DWORD serial_number, component_length, flags;
+ ULARGE_INTEGER avail2caller, total, avail;
+
+ strbuf_realpath(&buf, ".", 1);
+ if (!GetDiskFreeSpaceExA(buf.buf, &avail2caller, &total, &avail)) {
+ error(_("could not determine free disk size for '%s'"),
+ buf.buf);
+ strbuf_release(&buf);
+ return -1;
+ }
+
+ strbuf_setlen(&buf, offset_1st_component(buf.buf));
+ if (!GetVolumeInformationA(buf.buf, volume_name, sizeof(volume_name),
+ &serial_number, &component_length, &flags,
+ fs_name, sizeof(fs_name))) {
+ error(_("could not get info for '%s'"), buf.buf);
+ strbuf_release(&buf);
+ return -1;
+ }
+ strbuf_addf(out, "Available space on '%s': ", buf.buf);
+ strbuf_humanise_bytes(out, avail2caller.QuadPart);
+ strbuf_addch(out, '\n');
+ strbuf_release(&buf);
+#else
+ struct strbuf buf = STRBUF_INIT;
+ struct statvfs stat;
+
+ strbuf_realpath(&buf, ".", 1);
+ if (statvfs(buf.buf, &stat) < 0) {
+ error_errno(_("could not determine free disk size for '%s'"),
+ buf.buf);
+ strbuf_release(&buf);
+ return -1;
+ }
+
+ strbuf_addf(out, "Available space on '%s': ", buf.buf);
+ strbuf_humanise_bytes(out, st_mult(stat.f_bsize, stat.f_bavail));
+ strbuf_addf(out, " (mount flags 0x%lx)\n", stat.f_flag);
+ strbuf_release(&buf);
+#endif
+ return 0;
+}
+
+/* printf-style interface, expects `<key>=<value>` argument */
+static int set_config(const char *fmt, ...)
+{
+ struct strbuf buf = STRBUF_INIT;
+ char *value;
+ int res;
+ va_list args;
+
+ va_start(args, fmt);
+ strbuf_vaddf(&buf, fmt, args);
+ va_end(args);
+
+ value = strchr(buf.buf, '=');
+ if (value)
+ *(value++) = '\0';
+ res = git_config_set_gently(buf.buf, value);
+ strbuf_release(&buf);
+
+ return res;
+}
+
+static char *remote_default_branch(const char *url)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+ struct strbuf out = STRBUF_INIT;
+
+ cp.git_cmd = 1;
+ strvec_pushl(&cp.args, "ls-remote", "--symref", url, "HEAD", NULL);
+ if (!pipe_command(&cp, NULL, 0, &out, 0, NULL, 0)) {
+ const char *line = out.buf;
+
+ while (*line) {
+ const char *eol = strchrnul(line, '\n'), *p;
+ size_t len = eol - line;
+ char *branch;
+
+ if (!skip_prefix(line, "ref: ", &p) ||
+ !strip_suffix_mem(line, &len, "\tHEAD")) {
+ line = eol + (*eol == '\n');
+ continue;
+ }
+
+ eol = line + len;
+ if (skip_prefix(p, "refs/heads/", &p)) {
+ branch = xstrndup(p, eol - p);
+ strbuf_release(&out);
+ return branch;
+ }
+
+ error(_("remote HEAD is not a branch: '%.*s'"),
+ (int)(eol - p), p);
+ strbuf_release(&out);
+ return NULL;
+ }
+ }
+ warning(_("failed to get default branch name from remote; "
+ "using local default"));
+ strbuf_reset(&out);
+
+ child_process_init(&cp);
+ cp.git_cmd = 1;
+ strvec_pushl(&cp.args, "symbolic-ref", "--short", "HEAD", NULL);
+ if (!pipe_command(&cp, NULL, 0, &out, 0, NULL, 0)) {
+ strbuf_trim(&out);
+ return strbuf_detach(&out, NULL);
+ }
+
+ strbuf_release(&out);
+ error(_("failed to get default branch name"));
+ return NULL;
+}
+
+static int delete_enlistment(struct strbuf *enlistment)
+{
+#ifdef WIN32
+ struct strbuf parent = STRBUF_INIT;
+#endif
+
+ if (unregister_dir())
+ die(_("failed to unregister repository"));
+
+#ifdef WIN32
+ /*
+ * Change the current directory to one outside of the enlistment so
+ * that we may delete everything underneath it.
+ */
+ strbuf_addbuf(&parent, enlistment);
+ strbuf_parent_directory(&parent);
+ if (chdir(parent.buf) < 0)
+ die_errno(_("could not switch to '%s'"), parent.buf);
+ strbuf_release(&parent);
+#endif
+
+ if (remove_dir_recursively(enlistment, 0))
+ die(_("failed to delete enlistment directory"));
+
+ return 0;
+}
+
+/*
+ * Dummy implementation; Using `get_version_info()` would cause a link error
+ * without this.
+ */
+void load_builtin_commands(const char *prefix, struct cmdnames *cmds)
+{
+ die("not implemented");
+}
+
+static int cmd_clone(int argc, const char **argv)
+{
+ const char *branch = NULL;
+ int full_clone = 0, single_branch = 0;
+ struct option clone_options[] = {
+ OPT_STRING('b', "branch", &branch, N_("<branch>"),
+ N_("branch to checkout after clone")),
+ OPT_BOOL(0, "full-clone", &full_clone,
+ N_("when cloning, create full working directory")),
+ OPT_BOOL(0, "single-branch", &single_branch,
+ N_("only download metadata for the branch that will "
+ "be checked out")),
+ OPT_END(),
+ };
+ const char * const clone_usage[] = {
+ N_("scalar clone [<options>] [--] <repo> [<dir>]"),
+ NULL
+ };
+ const char *url;
+ char *enlistment = NULL, *dir = NULL;
+ struct strbuf buf = STRBUF_INIT;
+ int res;
+
+ argc = parse_options(argc, argv, NULL, clone_options, clone_usage, 0);
+
+ if (argc == 2) {
+ url = argv[0];
+ enlistment = xstrdup(argv[1]);
+ } else if (argc == 1) {
+ url = argv[0];
+
+ strbuf_addstr(&buf, url);
+ /* Strip trailing slashes, if any */
+ while (buf.len > 0 && is_dir_sep(buf.buf[buf.len - 1]))
+ strbuf_setlen(&buf, buf.len - 1);
+ /* Strip suffix `.git`, if any */
+ strbuf_strip_suffix(&buf, ".git");
+
+ enlistment = find_last_dir_sep(buf.buf);
+ if (!enlistment) {
+ die(_("cannot deduce worktree name from '%s'"), url);
+ }
+ enlistment = xstrdup(enlistment + 1);
+ } else {
+ usage_msg_opt(_("You must specify a repository to clone."),
+ clone_usage, clone_options);
+ }
+
+ if (is_directory(enlistment))
+ die(_("directory '%s' exists already"), enlistment);
+
+ dir = xstrfmt("%s/src", enlistment);
+
+ strbuf_reset(&buf);
+ if (branch)
+ strbuf_addf(&buf, "init.defaultBranch=%s", branch);
+ else {
+ char *b = repo_default_branch_name(the_repository, 1);
+ strbuf_addf(&buf, "init.defaultBranch=%s", b);
+ free(b);
+ }
+
+ if ((res = run_git("-c", buf.buf, "init", "--", dir, NULL)))
+ goto cleanup;
+
+ if (chdir(dir) < 0) {
+ res = error_errno(_("could not switch to '%s'"), dir);
+ goto cleanup;
+ }
+
+ setup_git_directory();
+
+ /* common-main already logs `argv` */
+ trace2_def_repo(the_repository);
+
+ if (!branch && !(branch = remote_default_branch(url))) {
+ res = error(_("failed to get default branch for '%s'"), url);
+ goto cleanup;
+ }
+
+ if (set_config("remote.origin.url=%s", url) ||
+ set_config("remote.origin.fetch="
+ "+refs/heads/%s:refs/remotes/origin/%s",
+ single_branch ? branch : "*",
+ single_branch ? branch : "*") ||
+ set_config("remote.origin.promisor=true") ||
+ set_config("remote.origin.partialCloneFilter=blob:none")) {
+ res = error(_("could not configure remote in '%s'"), dir);
+ goto cleanup;
+ }
+
+ if (!full_clone &&
+ (res = run_git("sparse-checkout", "init", "--cone", NULL)))
+ goto cleanup;
+
+ if (set_recommended_config(0))
+ return error(_("could not configure '%s'"), dir);
+
+ if ((res = run_git("fetch", "--quiet", "origin", NULL))) {
+ warning(_("partial clone failed; attempting full clone"));
+
+ if (set_config("remote.origin.promisor") ||
+ set_config("remote.origin.partialCloneFilter")) {
+ res = error(_("could not configure for full clone"));
+ goto cleanup;
+ }
+
+ if ((res = run_git("fetch", "--quiet", "origin", NULL)))
+ goto cleanup;
+ }
+
+ if ((res = set_config("branch.%s.remote=origin", branch)))
+ goto cleanup;
+ if ((res = set_config("branch.%s.merge=refs/heads/%s",
+ branch, branch)))
+ goto cleanup;
+
+ strbuf_reset(&buf);
+ strbuf_addf(&buf, "origin/%s", branch);
+ res = run_git("checkout", "-f", "-t", buf.buf, NULL);
+ if (res)
+ goto cleanup;
+
+ res = register_dir();
+
+cleanup:
+ free(enlistment);
+ free(dir);
+ strbuf_release(&buf);
+ return res;
+}
+
+static void dir_file_stats_objects(const char *full_path, size_t full_path_len,
+ const char *file_name, void *data)
+{
+ struct strbuf *buf = data;
+ struct stat st;
+
+ if (!stat(full_path, &st))
+ strbuf_addf(buf, "%-70s %16" PRIuMAX "\n", file_name,
+ (uintmax_t)st.st_size);
+}
+
+static int dir_file_stats(struct object_directory *object_dir, void *data)
+{
+ struct strbuf *buf = data;
+
+ strbuf_addf(buf, "Contents of %s:\n", object_dir->path);
+
+ for_each_file_in_pack_dir(object_dir->path, dir_file_stats_objects,
+ data);
+
+ return 0;
+}
+
+static int count_files(char *path)
+{
+ DIR *dir = opendir(path);
+ struct dirent *e;
+ int count = 0;
+
+ if (!dir)
+ return 0;
+
+ while ((e = readdir(dir)) != NULL)
+ if (!is_dot_or_dotdot(e->d_name) && e->d_type == DT_REG)
+ count++;
+
+ closedir(dir);
+ return count;
+}
+
+static void loose_objs_stats(struct strbuf *buf, const char *path)
+{
+ DIR *dir = opendir(path);
+ struct dirent *e;
+ int count;
+ int total = 0;
+ unsigned char c;
+ struct strbuf count_path = STRBUF_INIT;
+ size_t base_path_len;
+
+ if (!dir)
+ return;
+
+ strbuf_addstr(buf, "Object directory stats for ");
+ strbuf_add_absolute_path(buf, path);
+ strbuf_addstr(buf, ":\n");
+
+ strbuf_add_absolute_path(&count_path, path);
+ strbuf_addch(&count_path, '/');
+ base_path_len = count_path.len;
+
+ while ((e = readdir(dir)) != NULL)
+ if (!is_dot_or_dotdot(e->d_name) &&
+ e->d_type == DT_DIR && strlen(e->d_name) == 2 &&
+ !hex_to_bytes(&c, e->d_name, 1)) {
+ strbuf_setlen(&count_path, base_path_len);
+ strbuf_addstr(&count_path, e->d_name);
+ total += (count = count_files(count_path.buf));
+ strbuf_addf(buf, "%s : %7d files\n", e->d_name, count);
+ }
+
+ strbuf_addf(buf, "Total: %d loose objects", total);
+
+ strbuf_release(&count_path);
+ closedir(dir);
+}
+
+static int cmd_diagnose(int argc, const char **argv)
+{
+ struct option options[] = {
+ OPT_END(),
+ };
+ const char * const usage[] = {
+ N_("scalar diagnose [<enlistment>]"),
+ NULL
+ };
+ struct strbuf zip_path = STRBUF_INIT;
+ struct strvec archiver_args = STRVEC_INIT;
+ char **argv_copy = NULL;
+ int stdout_fd = -1, archiver_fd = -1;
+ time_t now = time(NULL);
+ struct tm tm;
+ struct strbuf path = STRBUF_INIT, buf = STRBUF_INIT;
+ int res = 0;
+
+ argc = parse_options(argc, argv, NULL, options,
+ usage, 0);
+
+ setup_enlistment_directory(argc, argv, usage, options, &zip_path);
+
+ strbuf_addstr(&zip_path, "/.scalarDiagnostics/scalar_");
+ strbuf_addftime(&zip_path,
+ "%Y%m%d_%H%M%S", localtime_r(&now, &tm), 0, 0);
+ strbuf_addstr(&zip_path, ".zip");
+ switch (safe_create_leading_directories(zip_path.buf)) {
+ case SCLD_EXISTS:
+ case SCLD_OK:
+ break;
+ default:
+ error_errno(_("could not create directory for '%s'"),
+ zip_path.buf);
+ goto diagnose_cleanup;
+ }
+ stdout_fd = dup(1);
+ if (stdout_fd < 0) {
+ res = error_errno(_("could not duplicate stdout"));
+ goto diagnose_cleanup;
+ }
+
+ archiver_fd = xopen(zip_path.buf, O_CREAT | O_WRONLY | O_TRUNC, 0666);
+ if (archiver_fd < 0 || dup2(archiver_fd, 1) < 0) {
+ res = error_errno(_("could not redirect output"));
+ goto diagnose_cleanup;
+ }
+
+ init_zip_archiver();
+ strvec_pushl(&archiver_args, "scalar-diagnose", "--format=zip", NULL);
+
+ strbuf_reset(&buf);
+ strbuf_addstr(&buf, "Collecting diagnostic info\n\n");
+ get_version_info(&buf, 1);
+
+ strbuf_addf(&buf, "Enlistment root: %s\n", the_repository->worktree);
+ get_disk_info(&buf);
+ write_or_die(stdout_fd, buf.buf, buf.len);
+ strvec_pushf(&archiver_args,
+ "--add-virtual-file=diagnostics.log:%.*s",
+ (int)buf.len, buf.buf);
+
+ strbuf_reset(&buf);
+ strbuf_addstr(&buf, "--add-virtual-file=packs-local.txt:");
+ dir_file_stats(the_repository->objects->odb, &buf);
+ foreach_alt_odb(dir_file_stats, &buf);
+ strvec_push(&archiver_args, buf.buf);
+
+ strbuf_reset(&buf);
+ strbuf_addstr(&buf, "--add-virtual-file=objects-local.txt:");
+ loose_objs_stats(&buf, ".git/objects");
+ strvec_push(&archiver_args, buf.buf);
+
+ if ((res = add_directory_to_archiver(&archiver_args, ".git", 0)) ||
+ (res = add_directory_to_archiver(&archiver_args, ".git/hooks", 0)) ||
+ (res = add_directory_to_archiver(&archiver_args, ".git/info", 0)) ||
+ (res = add_directory_to_archiver(&archiver_args, ".git/logs", 1)) ||
+ (res = add_directory_to_archiver(&archiver_args, ".git/objects/info", 0)))
+ goto diagnose_cleanup;
+
+ strvec_pushl(&archiver_args, "--prefix=",
+ oid_to_hex(the_hash_algo->empty_tree), "--", NULL);
+
+ /* `write_archive()` modifies the `argv` passed to it. Let it. */
+ argv_copy = xmemdupz(archiver_args.v,
+ sizeof(char *) * archiver_args.nr);
+ res = write_archive(archiver_args.nr, (const char **)argv_copy, NULL,
+ the_repository, NULL, 0);
+ if (res) {
+ error(_("failed to write archive"));
+ goto diagnose_cleanup;
+ }
+
+ if (!res)
+ fprintf(stderr, "\n"
+ "Diagnostics complete.\n"
+ "All of the gathered info is captured in '%s'\n",
+ zip_path.buf);
+
+diagnose_cleanup:
+ if (archiver_fd >= 0) {
+ close(1);
+ dup2(stdout_fd, 1);
+ }
+ free(argv_copy);
+ strvec_clear(&archiver_args);
+ strbuf_release(&zip_path);
+ strbuf_release(&path);
+ strbuf_release(&buf);
+
+ return res;
+}
+
+static int cmd_list(int argc, const char **argv)
+{
+ if (argc != 1)
+ die(_("`scalar list` does not take arguments"));
+
+ if (run_git("config", "--global", "--get-all", "scalar.repo", NULL) < 0)
+ return -1;
+ return 0;
+}
+
+static int cmd_register(int argc, const char **argv)
+{
+ struct option options[] = {
+ OPT_END(),
+ };
+ const char * const usage[] = {
+ N_("scalar register [<enlistment>]"),
+ NULL
+ };
+
+ argc = parse_options(argc, argv, NULL, options,
+ usage, 0);
+
+ setup_enlistment_directory(argc, argv, usage, options, NULL);
+
+ return register_dir();
+}
+
+static int get_scalar_repos(const char *key, const char *value, void *data)
+{
+ struct string_list *list = data;
+
+ if (!strcmp(key, "scalar.repo"))
+ string_list_append(list, value);
+
+ return 0;
+}
+
+static int cmd_reconfigure(int argc, const char **argv)
+{
+ int all = 0;
+ struct option options[] = {
+ OPT_BOOL('a', "all", &all,
+ N_("reconfigure all registered enlistments")),
+ OPT_END(),
+ };
+ const char * const usage[] = {
+ N_("scalar reconfigure [--all | <enlistment>]"),
+ NULL
+ };
+ struct string_list scalar_repos = STRING_LIST_INIT_DUP;
+ int i, res = 0;
+ struct repository r = { NULL };
+ struct strbuf commondir = STRBUF_INIT, gitdir = STRBUF_INIT;
+
+ argc = parse_options(argc, argv, NULL, options,
+ usage, 0);
+
+ if (!all) {
+ setup_enlistment_directory(argc, argv, usage, options, NULL);
+
+ return set_recommended_config(1);
+ }
+
+ if (argc > 0)
+ usage_msg_opt(_("--all or <enlistment>, but not both"),
+ usage, options);
+
+ git_config(get_scalar_repos, &scalar_repos);
+
+ for (i = 0; i < scalar_repos.nr; i++) {
+ const char *dir = scalar_repos.items[i].string;
+
+ strbuf_reset(&commondir);
+ strbuf_reset(&gitdir);
+
+ if (chdir(dir) < 0) {
+ warning_errno(_("could not switch to '%s'"), dir);
+ res = -1;
+ } else if (discover_git_directory(&commondir, &gitdir) < 0) {
+ warning_errno(_("git repository gone in '%s'"), dir);
+ res = -1;
+ } else {
+ git_config_clear();
+
+ the_repository = &r;
+ r.commondir = commondir.buf;
+ r.gitdir = gitdir.buf;
+
+ if (set_recommended_config(1) < 0)
+ res = -1;
+ }
+ }
+
+ string_list_clear(&scalar_repos, 1);
+ strbuf_release(&commondir);
+ strbuf_release(&gitdir);
+
+ return res;
+}
+
+static int cmd_run(int argc, const char **argv)
+{
+ struct option options[] = {
+ OPT_END(),
+ };
+ struct {
+ const char *arg, *task;
+ } tasks[] = {
+ { "config", NULL },
+ { "commit-graph", "commit-graph" },
+ { "fetch", "prefetch" },
+ { "loose-objects", "loose-objects" },
+ { "pack-files", "incremental-repack" },
+ { NULL, NULL }
+ };
+ struct strbuf buf = STRBUF_INIT;
+ const char *usagestr[] = { NULL, NULL };
+ int i;
+
+ strbuf_addstr(&buf, N_("scalar run <task> [<enlistment>]\nTasks:\n"));
+ for (i = 0; tasks[i].arg; i++)
+ strbuf_addf(&buf, "\t%s\n", tasks[i].arg);
+ usagestr[0] = buf.buf;
+
+ argc = parse_options(argc, argv, NULL, options,
+ usagestr, 0);
+
+ if (!argc)
+ usage_with_options(usagestr, options);
+
+ if (!strcmp("all", argv[0])) {
+ i = -1;
+ } else {
+ for (i = 0; tasks[i].arg && strcmp(tasks[i].arg, argv[0]); i++)
+ ; /* keep looking for the task */
+
+ if (i > 0 && !tasks[i].arg) {
+ error(_("no such task: '%s'"), argv[0]);
+ usage_with_options(usagestr, options);
+ }
+ }
+
+ argc--;
+ argv++;
+ setup_enlistment_directory(argc, argv, usagestr, options, NULL);
+ strbuf_release(&buf);
+
+ if (i == 0)
+ return register_dir();
+
+ if (i > 0)
+ return run_git("maintenance", "run",
+ "--task", tasks[i].task, NULL);
+
+ if (register_dir())
+ return -1;
+ for (i = 1; tasks[i].arg; i++)
+ if (run_git("maintenance", "run",
+ "--task", tasks[i].task, NULL))
+ return -1;
+ return 0;
+}
+
+static int remove_deleted_enlistment(struct strbuf *path)
+{
+ int res = 0;
+ strbuf_realpath_forgiving(path, path->buf, 1);
+
+ if (run_git("config", "--global",
+ "--unset", "--fixed-value",
+ "scalar.repo", path->buf, NULL) < 0)
+ res = -1;
+
+ if (run_git("config", "--global",
+ "--unset", "--fixed-value",
+ "maintenance.repo", path->buf, NULL) < 0)
+ res = -1;
+
+ return res;
+}
+
+static int cmd_unregister(int argc, const char **argv)
+{
+ struct option options[] = {
+ OPT_END(),
+ };
+ const char * const usage[] = {
+ N_("scalar unregister [<enlistment>]"),
+ NULL
+ };
+
+ argc = parse_options(argc, argv, NULL, options,
+ usage, 0);
+
+ /*
+ * Be forgiving when the enlistment or worktree does not even exist any
+ * longer; This can be the case if a user deleted the worktree by
+ * mistake and _still_ wants to unregister the thing.
+ */
+ if (argc == 1) {
+ struct strbuf src_path = STRBUF_INIT, workdir_path = STRBUF_INIT;
+
+ strbuf_addf(&src_path, "%s/src/.git", argv[0]);
+ strbuf_addf(&workdir_path, "%s/.git", argv[0]);
+ if (!is_directory(src_path.buf) && !is_directory(workdir_path.buf)) {
+ /* remove possible matching registrations */
+ int res = -1;
+
+ strbuf_strip_suffix(&src_path, "/.git");
+ res = remove_deleted_enlistment(&src_path) && res;
+
+ strbuf_strip_suffix(&workdir_path, "/.git");
+ res = remove_deleted_enlistment(&workdir_path) && res;
+
+ strbuf_release(&src_path);
+ strbuf_release(&workdir_path);
+ return res;
+ }
+ strbuf_release(&src_path);
+ strbuf_release(&workdir_path);
+ }
+
+ setup_enlistment_directory(argc, argv, usage, options, NULL);
+
+ return unregister_dir();
+}
+
+static int cmd_delete(int argc, const char **argv)
+{
+ char *cwd = xgetcwd();
+ struct option options[] = {
+ OPT_END(),
+ };
+ const char * const usage[] = {
+ N_("scalar delete <enlistment>"),
+ NULL
+ };
+ struct strbuf enlistment = STRBUF_INIT;
+ int res = 0;
+
+ argc = parse_options(argc, argv, NULL, options,
+ usage, 0);
+
+ if (argc != 1)
+ usage_with_options(usage, options);
+
+ setup_enlistment_directory(argc, argv, usage, options, &enlistment);
+
+ if (dir_inside_of(cwd, enlistment.buf) >= 0)
+ res = error(_("refusing to delete current working directory"));
+ else {
+ close_object_store(the_repository->objects);
+ res = delete_enlistment(&enlistment);
+ }
+ strbuf_release(&enlistment);
+ free(cwd);
+
+ return res;
+}
+
+static int cmd_version(int argc, const char **argv)
+{
+ int verbose = 0, build_options = 0;
+ struct option options[] = {
+ OPT__VERBOSE(&verbose, N_("include Git version")),
+ OPT_BOOL(0, "build-options", &build_options,
+ N_("include Git's build options")),
+ OPT_END(),
+ };
+ const char * const usage[] = {
+ N_("scalar verbose [-v | --verbose] [--build-options]"),
+ NULL
+ };
+ struct strbuf buf = STRBUF_INIT;
+
+ argc = parse_options(argc, argv, NULL, options,
+ usage, 0);
+
+ if (argc != 0)
+ usage_with_options(usage, options);
+
+ get_version_info(&buf, build_options);
+ fprintf(stderr, "%s\n", buf.buf);
+ strbuf_release(&buf);
+
+ return 0;
+}
+
+static struct {
+ const char *name;
+ int (*fn)(int, const char **);
+} builtins[] = {
+ { "clone", cmd_clone },
+ { "list", cmd_list },
+ { "register", cmd_register },
+ { "unregister", cmd_unregister },
+ { "run", cmd_run },
+ { "reconfigure", cmd_reconfigure },
+ { "delete", cmd_delete },
+ { "version", cmd_version },
+ { "diagnose", cmd_diagnose },
+ { NULL, NULL},
+};
+
+int cmd_main(int argc, const char **argv)
+{
+ struct strbuf scalar_usage = STRBUF_INIT;
+ int i;
+
+ while (argc > 1 && *argv[1] == '-') {
+ if (!strcmp(argv[1], "-C")) {
+ if (argc < 3)
+ die(_("-C requires a <directory>"));
+ if (chdir(argv[2]) < 0)
+ die_errno(_("could not change to '%s'"),
+ argv[2]);
+ argc -= 2;
+ argv += 2;
+ } else if (!strcmp(argv[1], "-c")) {
+ if (argc < 3)
+ die(_("-c requires a <key>=<value> argument"));
+ git_config_push_parameter(argv[2]);
+ argc -= 2;
+ argv += 2;
+ } else
+ break;
+ }
+
+ if (argc > 1) {
+ argv++;
+ argc--;
+
+ for (i = 0; builtins[i].name; i++)
+ if (!strcmp(builtins[i].name, argv[0]))
+ return !!builtins[i].fn(argc, argv);
+ }
+
+ strbuf_addstr(&scalar_usage,
+ N_("scalar [-C <directory>] [-c <key>=<value>] "
+ "<command> [<options>]\n\nCommands:\n"));
+ for (i = 0; builtins[i].name; i++)
+ strbuf_addf(&scalar_usage, "\t%s\n", builtins[i].name);
+
+ usage(scalar_usage.buf);
+}
diff --git a/contrib/scalar/scalar.txt b/contrib/scalar/scalar.txt
new file mode 100644
index 0000000..c0425e0
--- /dev/null
+++ b/contrib/scalar/scalar.txt
@@ -0,0 +1,167 @@
+scalar(1)
+=========
+
+NAME
+----
+scalar - an opinionated repository management tool
+
+SYNOPSIS
+--------
+[verse]
+scalar clone [--single-branch] [--branch <main-branch>] [--full-clone] <url> [<enlistment>]
+scalar list
+scalar register [<enlistment>]
+scalar unregister [<enlistment>]
+scalar run ( all | config | commit-graph | fetch | loose-objects | pack-files ) [<enlistment>]
+scalar reconfigure [ --all | <enlistment> ]
+scalar diagnose [<enlistment>]
+scalar delete <enlistment>
+
+DESCRIPTION
+-----------
+
+Scalar is an opinionated repository management tool. By creating new
+repositories or registering existing repositories with Scalar, your Git
+experience will speed up. Scalar sets advanced Git config settings,
+maintains your repositories in the background, and helps reduce data sent
+across the network.
+
+An important Scalar concept is the enlistment: this is the top-level directory
+of the project. It usually contains the subdirectory `src/` which is a Git
+worktree. This encourages the separation between tracked files (inside `src/`)
+and untracked files, such as build artifacts (outside `src/`). When registering
+an existing Git worktree with Scalar whose name is not `src`, the enlistment
+will be identical to the worktree.
+
+The `scalar` command implements various subcommands, and different options
+depending on the subcommand. With the exception of `clone`, `list` and
+`reconfigure --all`, all subcommands expect to be run in an enlistment.
+
+The following options can be specified _before_ the subcommand:
+
+-C <directory>::
+ Before running the subcommand, change the working directory. This
+ option imitates the same option of linkgit:git[1].
+
+-c <key>=<value>::
+ For the duration of running the specified subcommand, configure this
+ setting. This option imitates the same option of linkgit:git[1].
+
+COMMANDS
+--------
+
+Clone
+~~~~~
+
+clone [<options>] <url> [<enlistment>]::
+ Clones the specified repository, similar to linkgit:git-clone[1]. By
+ default, only commit and tree objects are cloned. Once finished, the
+ worktree is located at `<enlistment>/src`.
++
+The sparse-checkout feature is enabled (except when run with `--full-clone`)
+and the only files present are those in the top-level directory. Use
+`git sparse-checkout set` to expand the set of directories you want to see,
+or `git sparse-checkout disable` to expand to all files (see
+linkgit:git-sparse-checkout[1] for more details). You can explore the
+subdirectories outside your sparse-checkout by using `git ls-tree
+HEAD[:<directory>]`.
+
+-b <name>::
+--branch <name>::
+ Instead of checking out the branch pointed to by the cloned
+ repository's HEAD, check out the `<name>` branch instead.
+
+--[no-]single-branch::
+ Clone only the history leading to the tip of a single branch, either
+ specified by the `--branch` option or the primary branch remote's
+ `HEAD` points at.
++
+Further fetches into the resulting repository will only update the
+remote-tracking branch for the branch this option was used for the initial
+cloning. If the HEAD at the remote did not point at any branch when
+`--single-branch` clone was made, no remote-tracking branch is created.
+
+--[no-]full-clone::
+ A sparse-checkout is initialized by default. This behavior can be
+ turned off via `--full-clone`.
+
+List
+~~~~
+
+list::
+ List enlistments that are currently registered by Scalar. This
+ subcommand does not need to be run inside an enlistment.
+
+Register
+~~~~~~~~
+
+register [<enlistment>]::
+ Adds the enlistment's repository to the list of registered repositories
+ and starts background maintenance. If `<enlistment>` is not provided,
+ then the enlistment associated with the current working directory is
+ registered.
++
+Note: when this subcommand is called in a worktree that is called `src/`, its
+parent directory is considered to be the Scalar enlistment. If the worktree is
+_not_ called `src/`, it itself will be considered to be the Scalar enlistment.
+
+Unregister
+~~~~~~~~~~
+
+unregister [<enlistment>]::
+ Remove the specified repository from the list of repositories
+ registered with Scalar and stop the scheduled background maintenance.
+
+Run
+~~~
+
+scalar run ( all | config | commit-graph | fetch | loose-objects | pack-files ) [<enlistment>]::
+ Run the given maintenance task (or all tasks, if `all` was specified).
+ Except for `all` and `config`, this subcommand simply hands off to
+ linkgit:git-maintenance[1] (mapping `fetch` to `prefetch` and
+ `pack-files` to `incremental-repack`).
++
+These tasks are run automatically as part of the scheduled maintenance,
+as soon as the repository is registered with Scalar. It should therefore
+not be necessary to run this subcommand manually.
++
+The `config` task is specific to Scalar and configures all those
+opinionated default settings that make Git work more efficiently with
+large repositories. As this task is run as part of `scalar clone`
+automatically, explicit invocations of this task are rarely needed.
+
+Reconfigure
+~~~~~~~~~~~
+
+After a Scalar upgrade, or when the configuration of a Scalar enlistment
+was somehow corrupted or changed by mistake, this subcommand allows to
+reconfigure the enlistment.
+
+With the `--all` option, all enlistments currently registered with Scalar
+will be reconfigured. Use this option after each Scalar upgrade.
+
+Diagnose
+~~~~~~~~
+
+diagnose [<enlistment>]::
+ When reporting issues with Scalar, it is often helpful to provide the
+ information gathered by this command, including logs and certain
+ statistics describing the data shape of the current enlistment.
++
+The output of this command is a `.zip` file that is written into
+a directory adjacent to the worktree in the `src` directory.
+
+Delete
+~~~~~~
+
+delete <enlistment>::
+ This subcommand lets you delete an existing Scalar enlistment from your
+ local file system, unregistering the repository.
+
+SEE ALSO
+--------
+linkgit:git-clone[1], linkgit:git-maintenance[1].
+
+Scalar
+---
+Associated with the linkgit:git[1] suite
diff --git a/contrib/scalar/t/Makefile b/contrib/scalar/t/Makefile
new file mode 100644
index 0000000..01e82e5
--- /dev/null
+++ b/contrib/scalar/t/Makefile
@@ -0,0 +1,81 @@
+# Import tree-wide shared Makefile behavior and libraries
+include ../../../shared.mak
+
+# Run scalar tests
+#
+# Copyright (c) 2005,2021 Junio C Hamano, Johannes Schindelin
+#
+
+-include ../../../config.mak.autogen
+-include ../../../config.mak
+
+SHELL_PATH ?= $(SHELL)
+PERL_PATH ?= /usr/bin/perl
+RM ?= rm -f
+PROVE ?= prove
+DEFAULT_TEST_TARGET ?= test
+TEST_LINT ?= test-lint
+
+ifdef TEST_OUTPUT_DIRECTORY
+TEST_RESULTS_DIRECTORY = $(TEST_OUTPUT_DIRECTORY)/test-results
+else
+TEST_RESULTS_DIRECTORY = ../../../t/test-results
+endif
+
+# Shell quote;
+SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
+TEST_RESULTS_DIRECTORY_SQ = $(subst ','\'',$(TEST_RESULTS_DIRECTORY))
+
+T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
+
+all: $(DEFAULT_TEST_TARGET)
+
+test: $(TEST_LINT)
+ $(MAKE) aggregate-results-and-cleanup
+
+prove: $(TEST_LINT)
+ @echo "*** prove ***"; GIT_CONFIG=.git/config $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
+ $(MAKE) clean-except-prove-cache
+
+$(T):
+ @echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
+
+clean-except-prove-cache:
+ $(RM) -r 'trash directory'.* '$(TEST_RESULTS_DIRECTORY_SQ)'
+ $(RM) -r valgrind/bin
+
+clean: clean-except-prove-cache
+ $(RM) .prove
+
+test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax
+
+test-lint-duplicates:
+ @dups=`echo $(T) | tr ' ' '\n' | sed 's/-.*//' | sort | uniq -d` && \
+ test -z "$$dups" || { \
+ echo >&2 "duplicate test numbers:" $$dups; exit 1; }
+
+test-lint-executable:
+ @bad=`for i in $(T); do test -x "$$i" || echo $$i; done` && \
+ test -z "$$bad" || { \
+ echo >&2 "non-executable tests:" $$bad; exit 1; }
+
+test-lint-shell-syntax:
+ @'$(PERL_PATH_SQ)' ../../../t/check-non-portable-shell.pl $(T)
+
+aggregate-results-and-cleanup: $(T)
+ $(MAKE) aggregate-results
+ $(MAKE) clean
+
+aggregate-results:
+ for f in '$(TEST_RESULTS_DIRECTORY_SQ)'/t*-*.counts; do \
+ echo "$$f"; \
+ done | '$(SHELL_PATH_SQ)' ../../../t/aggregate-results.sh
+
+valgrind:
+ $(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind"
+
+test-results:
+ mkdir -p test-results
+
+.PHONY: $(T) aggregate-results clean valgrind
diff --git a/contrib/scalar/t/t9099-scalar.sh b/contrib/scalar/t/t9099-scalar.sh
new file mode 100755
index 0000000..10b1172
--- /dev/null
+++ b/contrib/scalar/t/t9099-scalar.sh
@@ -0,0 +1,123 @@
+#!/bin/sh
+
+test_description='test the `scalar` command'
+
+TEST_DIRECTORY=$PWD/../../../t
+export TEST_DIRECTORY
+
+# Make it work with --no-bin-wrappers
+PATH=$PWD/..:$PATH
+
+. ../../../t/test-lib.sh
+
+GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab ../cron.txt,launchctl:true,schtasks:true"
+export GIT_TEST_MAINT_SCHEDULER
+
+test_expect_success 'scalar shows a usage' '
+ test_expect_code 129 scalar -h
+'
+
+test_expect_success 'scalar unregister' '
+ git init vanish/src &&
+ scalar register vanish/src &&
+ git config --get --global --fixed-value \
+ maintenance.repo "$(pwd)/vanish/src" &&
+ scalar list >scalar.repos &&
+ grep -F "$(pwd)/vanish/src" scalar.repos &&
+ rm -rf vanish/src/.git &&
+ scalar unregister vanish &&
+ test_must_fail git config --get --global --fixed-value \
+ maintenance.repo "$(pwd)/vanish/src" &&
+ scalar list >scalar.repos &&
+ ! grep -F "$(pwd)/vanish/src" scalar.repos
+'
+
+test_expect_success 'set up repository to clone' '
+ test_commit first &&
+ test_commit second &&
+ test_commit third &&
+ git switch -c parallel first &&
+ mkdir -p 1/2 &&
+ test_commit 1/2/3 &&
+ git config uploadPack.allowFilter true &&
+ git config uploadPack.allowAnySHA1InWant true
+'
+
+test_expect_success 'scalar clone' '
+ second=$(git rev-parse --verify second:second.t) &&
+ scalar clone "file://$(pwd)" cloned --single-branch &&
+ (
+ cd cloned/src &&
+
+ git config --get --global --fixed-value maintenance.repo \
+ "$(pwd)" &&
+
+ git for-each-ref --format="%(refname)" refs/remotes/origin/ >actual &&
+ echo "refs/remotes/origin/parallel" >expect &&
+ test_cmp expect actual &&
+
+ test_path_is_missing 1/2 &&
+ test_must_fail git rev-list --missing=print $second &&
+ git rev-list $second &&
+ git cat-file blob $second >actual &&
+ echo "second" >expect &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'scalar reconfigure' '
+ git init one/src &&
+ scalar register one &&
+ git -C one/src config core.preloadIndex false &&
+ scalar reconfigure one &&
+ test true = "$(git -C one/src config core.preloadIndex)" &&
+ git -C one/src config core.preloadIndex false &&
+ scalar reconfigure -a &&
+ test true = "$(git -C one/src config core.preloadIndex)"
+'
+
+test_expect_success 'scalar delete without enlistment shows a usage' '
+ test_expect_code 129 scalar delete
+'
+
+test_expect_success 'scalar delete with enlistment' '
+ scalar delete cloned &&
+ test_path_is_missing cloned
+'
+
+test_expect_success 'scalar supports -c/-C' '
+ test_when_finished "scalar delete sub" &&
+ git init sub &&
+ scalar -C sub -c status.aheadBehind=bogus register &&
+ test -z "$(git -C sub config --local status.aheadBehind)" &&
+ test true = "$(git -C sub config core.preloadIndex)"
+'
+
+test_expect_success '`scalar [...] <dir>` errors out when dir is missing' '
+ ! scalar run config cloned 2>err &&
+ grep "cloned. does not exist" err
+'
+
+SQ="'"
+test_expect_success UNZIP 'scalar diagnose' '
+ scalar clone "file://$(pwd)" cloned --single-branch &&
+ git repack &&
+ echo "$(pwd)/.git/objects/" >>cloned/src/.git/objects/info/alternates &&
+ test_commit -C cloned/src loose &&
+ scalar diagnose cloned >out 2>err &&
+ grep "Available space" out &&
+ sed -n "s/.*$SQ\\(.*\\.zip\\)$SQ.*/\\1/p" <err >zip_path &&
+ zip_path=$(cat zip_path) &&
+ test -n "$zip_path" &&
+ unzip -v "$zip_path" &&
+ folder=${zip_path%.zip} &&
+ test_path_is_missing "$folder" &&
+ unzip -p "$zip_path" diagnostics.log >out &&
+ test_file_not_empty out &&
+ unzip -p "$zip_path" packs-local.txt >out &&
+ grep "$(pwd)/.git/objects" out &&
+ unzip -p "$zip_path" objects-local.txt >out &&
+ grep "^Total: [1-9]" out
+'
+
+test_done
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 7f767b5..1af1d96 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -296,10 +296,9 @@
done
}
-# Usage: check_parents PARENTS_EXPR
+# Usage: check_parents [REVS...]
check_parents () {
- assert test $# = 1
- missed=$(cache_miss "$1") || exit $?
+ missed=$(cache_miss "$@") || exit $?
local indent=$(($indent + 1))
for miss in $missed
do
@@ -753,7 +752,7 @@
fi
createcount=$(($createcount + 1))
debug "parents: $parents"
- check_parents "$parents"
+ check_parents $parents
newparents=$(cache_get $parents) || exit $?
debug "newparents: $newparents"
@@ -976,10 +975,10 @@
if test -n "$arg_addmerge_message"
then
- git merge -Xsubtree="$arg_prefix" \
+ git merge --no-ff -Xsubtree="$arg_prefix" \
--message="$arg_addmerge_message" "$rev"
else
- git merge -Xsubtree="$arg_prefix" $rev
+ git merge --no-ff -Xsubtree="$arg_prefix" $rev
fi
}
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 4153b65..1c1f76f 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -1445,7 +1445,7 @@
) &&
test_create_commit "$test_count" folder_subtree/0 &&
test_create_commit "$test_count" folder_subtree/b &&
- cherry=$(cd "$test_count"; git rev-parse HEAD) &&
+ cherry=$(cd "$test_count" && git rev-parse HEAD) &&
(
cd "$test_count" &&
git checkout branch
diff --git a/contrib/vscode/README.md b/contrib/vscode/README.md
index 8202d62..f383c95 100644
--- a/contrib/vscode/README.md
+++ b/contrib/vscode/README.md
@@ -6,7 +6,11 @@
[Windows](https://code.visualstudio.com/docs/setup/windows),
[macOS](https://code.visualstudio.com/docs/setup/mac) and
[Linux](https://code.visualstudio.com/docs/setup/linux). Among other languages,
-it has [support for C/C++ via an extension](https://github.com/Microsoft/vscode-cpptools).
+it has [support for C/C++ via an extension](https://github.com/Microsoft/vscode-cpptools) with
+[debugging support](https://code.visualstudio.com/docs/editor/debugging)
+
+To get help about "how to personalize your settings" read:
+[How to set up your settings](https://code.visualstudio.com/docs/getstarted/settings)
To start developing Git with VS Code, simply run the Unix shell script called
`init.sh` in this directory, which creates the configuration files in
diff --git a/contrib/vscode/init.sh b/contrib/vscode/init.sh
index 27de949..f139fd8 100755
--- a/contrib/vscode/init.sh
+++ b/contrib/vscode/init.sh
@@ -271,7 +271,6 @@
"stopAtEntry": false,
"cwd": "\${workspaceFolder}",
"environment": [],
- "externalConsole": true,
"MIMode": "gdb",
"miDebuggerPath": "$GDBPATH",
"setupCommands": [
diff --git a/convert.c b/convert.c
index 0d6fb34..4d15372 100644
--- a/convert.c
+++ b/convert.c
@@ -195,9 +195,9 @@ static void check_global_conv_flags_eol(const char *path,
if (conv_flags & CONV_EOL_RNDTRP_DIE)
die(_("CRLF would be replaced by LF in %s"), path);
else if (conv_flags & CONV_EOL_RNDTRP_WARN)
- warning(_("CRLF will be replaced by LF in %s.\n"
- "The file will have its original line"
- " endings in your working directory"), path);
+ warning(_("in the working copy of '%s', CRLF will be"
+ " replaced by LF the next time Git touches"
+ " it"), path);
} else if (old_stats->lonelf && !new_stats->lonelf ) {
/*
* CRLFs would be added by checkout
@@ -205,9 +205,9 @@ static void check_global_conv_flags_eol(const char *path,
if (conv_flags & CONV_EOL_RNDTRP_DIE)
die(_("LF would be replaced by CRLF in %s"), path);
else if (conv_flags & CONV_EOL_RNDTRP_WARN)
- warning(_("LF will be replaced by CRLF in %s.\n"
- "The file will have its original line"
- " endings in your working directory"), path);
+ warning(_("in the working copy of '%s', LF will be"
+ " replaced by CRLF the next time Git touches"
+ " it"), path);
}
}
@@ -613,7 +613,7 @@ static int crlf_to_worktree(const char *src, size_t len, struct strbuf *buf,
struct filter_params {
const char *src;
- unsigned long size;
+ size_t size;
int fd;
const char *cmd;
const char *path;
@@ -1159,7 +1159,7 @@ static int ident_to_worktree(const char *src, size_t len,
/* are we "faking" in place editing ? */
if (src == buf->buf)
to_free = strbuf_detach(buf, NULL);
- hash_object_file(the_hash_algo, src, len, "blob", &oid);
+ hash_object_file(the_hash_algo, src, len, OBJ_BLOB, &oid);
strbuf_grow(buf, len + cnt * (the_hash_algo->hexsz + 3));
for (;;) {
@@ -1574,12 +1574,12 @@ static void null_free_fn(struct stream_filter *filter)
}
static struct stream_filter_vtbl null_vtbl = {
- null_filter_fn,
- null_free_fn,
+ .filter = null_filter_fn,
+ .free = null_free_fn,
};
static struct stream_filter null_filter_singleton = {
- &null_vtbl,
+ .vtbl = &null_vtbl,
};
int is_null_stream_filter(struct stream_filter *filter)
@@ -1683,8 +1683,8 @@ static void lf_to_crlf_free_fn(struct stream_filter *filter)
}
static struct stream_filter_vtbl lf_to_crlf_vtbl = {
- lf_to_crlf_filter_fn,
- lf_to_crlf_free_fn,
+ .filter = lf_to_crlf_filter_fn,
+ .free = lf_to_crlf_free_fn,
};
static struct stream_filter *lf_to_crlf_filter(void)
@@ -1779,8 +1779,8 @@ static void cascade_free_fn(struct stream_filter *filter)
}
static struct stream_filter_vtbl cascade_vtbl = {
- cascade_filter_fn,
- cascade_free_fn,
+ .filter = cascade_filter_fn,
+ .free = cascade_free_fn,
};
static struct stream_filter *cascade_filter(struct stream_filter *one,
@@ -1931,8 +1931,8 @@ static void ident_free_fn(struct stream_filter *filter)
}
static struct stream_filter_vtbl ident_vtbl = {
- ident_filter_fn,
- ident_free_fn,
+ .filter = ident_filter_fn,
+ .free = ident_free_fn,
};
static struct stream_filter *ident_filter(const struct object_id *oid)
diff --git a/credential.c b/credential.c
index 000ac7a..f6389a5 100644
--- a/credential.c
+++ b/credential.c
@@ -105,7 +105,7 @@ static int match_partial_url(const char *url, void *cb)
static void credential_apply_config(struct credential *c)
{
char *normalized_url;
- struct urlmatch_config config = { STRING_LIST_INIT_DUP };
+ struct urlmatch_config config = URLMATCH_CONFIG_INIT;
struct strbuf url = STRBUF_INIT;
if (!c->host)
@@ -130,6 +130,7 @@ static void credential_apply_config(struct credential *c)
git_config(urlmatch_config_entry, &config);
string_list_clear(&config.vars, 1);
free(normalized_url);
+ urlmatch_config_release(&config);
strbuf_release(&url);
c->configured = 1;
diff --git a/csum-file.c b/csum-file.c
index 26e8a6d..59ef339 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -58,7 +58,8 @@ static void free_hashfile(struct hashfile *f)
free(f);
}
-int finalize_hashfile(struct hashfile *f, unsigned char *result, unsigned int flags)
+int finalize_hashfile(struct hashfile *f, unsigned char *result,
+ enum fsync_component component, unsigned int flags)
{
int fd;
@@ -69,7 +70,7 @@ int finalize_hashfile(struct hashfile *f, unsigned char *result, unsigned int fl
if (flags & CSUM_HASH_IN_STREAM)
flush(f, f->buffer, the_hash_algo->rawsz);
if (flags & CSUM_FSYNC)
- fsync_or_die(f->fd, f->name);
+ fsync_component_or_die(component, f->fd, f->name);
if (flags & CSUM_CLOSE) {
if (close(f->fd))
die_errno("%s: sha1 file error on close", f->name);
diff --git a/csum-file.h b/csum-file.h
index 291215b..0d29f52 100644
--- a/csum-file.h
+++ b/csum-file.h
@@ -1,6 +1,7 @@
#ifndef CSUM_FILE_H
#define CSUM_FILE_H
+#include "cache.h"
#include "hash.h"
struct progress;
@@ -38,7 +39,7 @@ int hashfile_truncate(struct hashfile *, struct hashfile_checkpoint *);
struct hashfile *hashfd(int fd, const char *name);
struct hashfile *hashfd_check(const char *name);
struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp);
-int finalize_hashfile(struct hashfile *, unsigned char *, unsigned int);
+int finalize_hashfile(struct hashfile *, unsigned char *, enum fsync_component, unsigned int);
void hashwrite(struct hashfile *, const void *, unsigned int);
void hashflush(struct hashfile *f);
void crc32_begin(struct hashfile *);
diff --git a/daemon.c b/daemon.c
index 5c4cbad..58f1077 100644
--- a/daemon.c
+++ b/daemon.c
@@ -63,6 +63,12 @@ struct hostinfo {
unsigned int hostname_lookup_done:1;
unsigned int saw_extended_args:1;
};
+#define HOSTINFO_INIT { \
+ .hostname = STRBUF_INIT, \
+ .canon_hostname = STRBUF_INIT, \
+ .ip_address = STRBUF_INIT, \
+ .tcp_port = STRBUF_INIT, \
+}
static void lookup_hostname(struct hostinfo *hi);
@@ -226,13 +232,13 @@ static const char *path_ok(const char *directory, struct hostinfo *hi)
rlen = strlcpy(interp_path, expanded_path.buf,
sizeof(interp_path));
+ strbuf_release(&expanded_path);
if (rlen >= sizeof(interp_path)) {
logerror("interpolated path too large: %s",
interp_path);
return NULL;
}
- strbuf_release(&expanded_path);
loginfo("Interpolated dir '%s'", interp_path);
dir = interp_path;
@@ -320,22 +326,18 @@ static int run_access_hook(struct daemon_service *service, const char *dir,
{
struct child_process child = CHILD_PROCESS_INIT;
struct strbuf buf = STRBUF_INIT;
- const char *argv[8];
- const char **arg = argv;
char *eol;
int seen_errors = 0;
- *arg++ = access_hook;
- *arg++ = service->name;
- *arg++ = path;
- *arg++ = hi->hostname.buf;
- *arg++ = get_canon_hostname(hi);
- *arg++ = get_ip_address(hi);
- *arg++ = hi->tcp_port.buf;
- *arg = NULL;
+ strvec_push(&child.args, access_hook);
+ strvec_push(&child.args, service->name);
+ strvec_push(&child.args, path);
+ strvec_push(&child.args, hi->hostname.buf);
+ strvec_push(&child.args, get_canon_hostname(hi));
+ strvec_push(&child.args, get_ip_address(hi));
+ strvec_push(&child.args, hi->tcp_port.buf);
child.use_shell = 1;
- child.argv = argv;
child.no_stdin = 1;
child.no_stderr = 1;
child.out = -1;
@@ -445,7 +447,7 @@ static void copy_to_log(int fd)
FILE *fp;
fp = fdopen(fd, "r");
- if (fp == NULL) {
+ if (!fp) {
logerror("fdopen of error channel failed");
close(fd);
return;
@@ -482,7 +484,7 @@ static int upload_pack(const struct strvec *env)
strvec_pushl(&cld.args, "upload-pack", "--strict", NULL);
strvec_pushf(&cld.args, "--timeout=%u", timeout);
- strvec_pushv(&cld.env_array, env->v);
+ strvec_pushv(&cld.env, env->v);
return run_service_command(&cld);
}
@@ -492,7 +494,7 @@ static int upload_archive(const struct strvec *env)
struct child_process cld = CHILD_PROCESS_INIT;
strvec_push(&cld.args, "upload-archive");
- strvec_pushv(&cld.env_array, env->v);
+ strvec_pushv(&cld.env, env->v);
return run_service_command(&cld);
}
@@ -502,7 +504,7 @@ static int receive_pack(const struct strvec *env)
struct child_process cld = CHILD_PROCESS_INIT;
strvec_push(&cld.args, "receive-pack");
- strvec_pushv(&cld.env_array, env->v);
+ strvec_pushv(&cld.env, env->v);
return run_service_command(&cld);
}
@@ -727,15 +729,6 @@ static void lookup_hostname(struct hostinfo *hi)
}
}
-static void hostinfo_init(struct hostinfo *hi)
-{
- memset(hi, 0, sizeof(*hi));
- strbuf_init(&hi->hostname, 0);
- strbuf_init(&hi->canon_hostname, 0);
- strbuf_init(&hi->ip_address, 0);
- strbuf_init(&hi->tcp_port, 0);
-}
-
static void hostinfo_clear(struct hostinfo *hi)
{
strbuf_release(&hi->hostname);
@@ -760,17 +753,15 @@ static int execute(void)
char *line = packet_buffer;
int pktlen, len, i;
char *addr = getenv("REMOTE_ADDR"), *port = getenv("REMOTE_PORT");
- struct hostinfo hi;
+ struct hostinfo hi = HOSTINFO_INIT;
struct strvec env = STRVEC_INIT;
- hostinfo_init(&hi);
-
if (addr)
loginfo("Connection from %s:%s", addr, port);
set_keep_alive(0);
alarm(init_timeout ? init_timeout : timeout);
- pktlen = packet_read(0, NULL, NULL, packet_buffer, sizeof(packet_buffer), 0);
+ pktlen = packet_read(0, packet_buffer, sizeof(packet_buffer), 0);
alarm(0);
len = strlen(line);
@@ -913,21 +904,21 @@ static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
char buf[128] = "";
struct sockaddr_in *sin_addr = (void *) addr;
inet_ntop(addr->sa_family, &sin_addr->sin_addr, buf, sizeof(buf));
- strvec_pushf(&cld.env_array, "REMOTE_ADDR=%s", buf);
- strvec_pushf(&cld.env_array, "REMOTE_PORT=%d",
+ strvec_pushf(&cld.env, "REMOTE_ADDR=%s", buf);
+ strvec_pushf(&cld.env, "REMOTE_PORT=%d",
ntohs(sin_addr->sin_port));
#ifndef NO_IPV6
} else if (addr->sa_family == AF_INET6) {
char buf[128] = "";
struct sockaddr_in6 *sin6_addr = (void *) addr;
inet_ntop(AF_INET6, &sin6_addr->sin6_addr, buf, sizeof(buf));
- strvec_pushf(&cld.env_array, "REMOTE_ADDR=[%s]", buf);
- strvec_pushf(&cld.env_array, "REMOTE_PORT=%d",
+ strvec_pushf(&cld.env, "REMOTE_ADDR=[%s]", buf);
+ strvec_pushf(&cld.env, "REMOTE_PORT=%d",
ntohs(sin6_addr->sin6_port));
#endif
}
- cld.argv = cld_argv.v;
+ strvec_pushv(&cld.args, cld_argv.v);
cld.in = incoming;
cld.out = dup(incoming);
diff --git a/date.c b/date.c
index c55ea47..68a260c 100644
--- a/date.c
+++ b/date.c
@@ -5,11 +5,12 @@
*/
#include "cache.h"
+#include "date.h"
/*
* This is like mktime, but without normalization of tm_wday and tm_yday.
*/
-static time_t tm_to_time_t(const struct tm *tm)
+time_t tm_to_time_t(const struct tm *tm)
{
static const int mdays[] = {
0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
@@ -205,11 +206,10 @@ void show_date_relative(timestamp_t time, struct strbuf *timebuf)
struct date_mode *date_mode_from_type(enum date_mode_type type)
{
- static struct date_mode mode;
+ static struct date_mode mode = DATE_MODE_INIT;
if (type == DATE_STRFTIME)
BUG("cannot create anonymous strftime date_mode struct");
mode.type = type;
- mode.local = 0;
return &mode;
}
@@ -993,6 +993,11 @@ void parse_date_format(const char *format, struct date_mode *mode)
die("unknown date format %s", format);
}
+void date_mode_release(struct date_mode *mode)
+{
+ free((char *)mode->strftime_fmt);
+}
+
void datestamp(struct strbuf *out)
{
time_t now;
diff --git a/date.h b/date.h
new file mode 100644
index 0000000..5d4eaba
--- /dev/null
+++ b/date.h
@@ -0,0 +1,74 @@
+#ifndef DATE_H
+#define DATE_H
+
+/**
+ * The date mode type. This has DATE_NORMAL at an explicit "= 0" to
+ * accommodate a memset([...], 0, [...]) initialization when "struct
+ * date_mode" is used as an embedded struct member, as in the case of
+ * e.g. "struct pretty_print_context" and "struct rev_info".
+ */
+enum date_mode_type {
+ DATE_NORMAL = 0,
+ DATE_HUMAN,
+ DATE_RELATIVE,
+ DATE_SHORT,
+ DATE_ISO8601,
+ DATE_ISO8601_STRICT,
+ DATE_RFC2822,
+ DATE_STRFTIME,
+ DATE_RAW,
+ DATE_UNIX
+};
+
+struct date_mode {
+ enum date_mode_type type;
+ const char *strftime_fmt;
+ int local;
+};
+
+#define DATE_MODE_INIT { \
+ .type = DATE_NORMAL, \
+}
+
+/**
+ * Convenience helper for passing a constant type, like:
+ *
+ * show_date(t, tz, DATE_MODE(NORMAL));
+ */
+#define DATE_MODE(t) date_mode_from_type(DATE_##t)
+struct date_mode *date_mode_from_type(enum date_mode_type type);
+
+/**
+ * Format <'time', 'timezone'> into static memory according to 'mode'
+ * and return it. The mode is an initialized "struct date_mode"
+ * (usually from the DATE_MODE() macro).
+ */
+const char *show_date(timestamp_t time, int timezone, const struct date_mode *mode);
+
+/**
+ * Parse a date format for later use with show_date().
+ *
+ * When the "date_mode_type" is DATE_STRFTIME the "strftime_fmt"
+ * member of "struct date_mode" will be a malloc()'d format string to
+ * be used with strbuf_addftime(), in which case you'll need to call
+ * date_mode_release() later.
+ */
+void parse_date_format(const char *format, struct date_mode *mode);
+
+/**
+ * Release a "struct date_mode", currently only required if
+ * parse_date_format() has parsed a "DATE_STRFTIME" format.
+ */
+void date_mode_release(struct date_mode *mode);
+
+void show_date_relative(timestamp_t time, struct strbuf *timebuf);
+int parse_date(const char *date, struct strbuf *out);
+int parse_date_basic(const char *date, timestamp_t *timestamp, int *offset);
+int parse_expiry_date(const char *date, timestamp_t *timestamp);
+void datestamp(struct strbuf *out);
+#define approxidate(s) approxidate_careful((s), NULL)
+timestamp_t approxidate_careful(const char *, int *);
+timestamp_t approxidate_relative(const char *date);
+int date_overflows(timestamp_t date);
+time_t tm_to_time_t(const struct tm *tm);
+#endif
diff --git a/delta.h b/delta.h
index 2df5fe1..8a56ec0 100644
--- a/delta.h
+++ b/delta.h
@@ -90,15 +90,15 @@ static inline unsigned long get_delta_hdr_size(const unsigned char **datap,
const unsigned char *top)
{
const unsigned char *data = *datap;
- unsigned long cmd, size = 0;
+ size_t cmd, size = 0;
int i = 0;
do {
cmd = *data++;
- size |= (cmd & 0x7f) << i;
+ size |= st_left_shift(cmd & 0x7f, i);
i += 7;
} while (cmd & 0x80 && data < top);
*datap = data;
- return size;
+ return cast_size_t_to_ulong(size);
}
#endif
diff --git a/detect-compiler b/detect-compiler
index 11d60da..50087f5 100755
--- a/detect-compiler
+++ b/detect-compiler
@@ -9,7 +9,7 @@
#
# FreeBSD clang version 3.4.1 (tags/RELEASE...)
get_version_line() {
- $CC -v 2>&1 | grep ' version '
+ LANG=C LC_ALL=C $CC -v 2>&1 | grep ' version '
}
get_family() {
diff --git a/diff-lib.c b/diff-lib.c
index ca085a0..7eb66a4 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -641,7 +641,7 @@ int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt)
if (diff_cache(&revs, tree_oid, NULL, 1))
exit(128);
- clear_pathspec(&revs.prune_data);
+ release_revisions(&revs);
return 0;
}
@@ -651,6 +651,7 @@ int index_differs_from(struct repository *r,
{
struct rev_info rev;
struct setup_revision_opt opt;
+ unsigned has_changes;
repo_init_revisions(r, &rev, NULL);
memset(&opt, 0, sizeof(opt));
@@ -662,8 +663,9 @@ int index_differs_from(struct repository *r,
diff_flags_or(&rev.diffopt.flags, flags);
rev.diffopt.ita_invisible_in_index = ita_invisible_in_index;
run_diff_index(&rev, 1);
- object_array_clear(&rev.pending);
- return (rev.diffopt.flags.has_changes != 0);
+ has_changes = rev.diffopt.flags.has_changes;
+ release_revisions(&rev);
+ return (has_changes != 0);
}
static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data)
diff --git a/diff-merges.c b/diff-merges.c
index 5060ccd..7f64156 100644
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -17,12 +17,14 @@ static void suppress(struct rev_info *revs)
revs->combined_all_paths = 0;
revs->merges_imply_patch = 0;
revs->merges_need_diff = 0;
+ revs->remerge_diff = 0;
}
static void set_separate(struct rev_info *revs)
{
suppress(revs);
revs->separate_merges = 1;
+ revs->simplify_history = 0;
}
static void set_first_parent(struct rev_info *revs)
@@ -45,6 +47,13 @@ static void set_dense_combined(struct rev_info *revs)
revs->dense_combined_merges = 1;
}
+static void set_remerge_diff(struct rev_info *revs)
+{
+ suppress(revs);
+ revs->remerge_diff = 1;
+ revs->simplify_history = 0;
+}
+
static diff_merges_setup_func_t func_by_opt(const char *optarg)
{
if (!strcmp(optarg, "off") || !strcmp(optarg, "none"))
@@ -57,6 +66,8 @@ static diff_merges_setup_func_t func_by_opt(const char *optarg)
return set_combined;
else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
return set_dense_combined;
+ else if (!strcmp(optarg, "r") || !strcmp(optarg, "remerge"))
+ return set_remerge_diff;
else if (!strcmp(optarg, "m") || !strcmp(optarg, "on"))
return set_to_default;
return NULL;
@@ -67,7 +78,7 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
diff_merges_setup_func_t func = func_by_opt(optarg);
if (!func)
- die(_("unknown value for --diff-merges: %s"), optarg);
+ die(_("invalid value for '%s': '%s'"), "--diff-merges", optarg);
func(revs);
@@ -110,6 +121,9 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
} else if (!strcmp(arg, "--cc")) {
set_dense_combined(revs);
revs->merges_imply_patch = 1;
+ } else if (!strcmp(arg, "--remerge-diff")) {
+ set_remerge_diff(revs);
+ revs->merges_imply_patch = 1;
} else if (!strcmp(arg, "--no-diff-merges")) {
suppress(revs);
} else if (!strcmp(arg, "--combined-all-paths")) {
diff --git a/diff.c b/diff.c
index 861282d..e71cf75 100644
--- a/diff.c
+++ b/diff.c
@@ -18,6 +18,7 @@
#include "submodule-config.h"
#include "submodule.h"
#include "hashmap.h"
+#include "mem-pool.h"
#include "ll-merge.h"
#include "string-list.h"
#include "strvec.h"
@@ -27,6 +28,7 @@
#include "help.h"
#include "promisor-remote.h"
#include "dir.h"
+#include "strmap.h"
#ifdef NO_FAST_WORKING_DIRECTORY
#define FAST_WORKING_DIRECTORY 0
@@ -773,6 +775,7 @@ struct emitted_diff_symbol {
int flags;
int indent_off; /* Offset to first non-whitespace character */
int indent_width; /* The visual width of the indentation */
+ unsigned id;
enum diff_symbol s;
};
#define EMITTED_DIFF_SYMBOL_INIT { 0 }
@@ -797,10 +800,18 @@ static void append_emitted_diff_symbol(struct diff_options *o,
f->line = e->line ? xmemdupz(e->line, e->len) : NULL;
}
+static void free_emitted_diff_symbols(struct emitted_diff_symbols *e)
+{
+ if (!e)
+ return;
+ free(e->buf);
+ free(e);
+}
+
struct moved_entry {
- struct hashmap_entry ent;
const struct emitted_diff_symbol *es;
struct moved_entry *next_line;
+ struct moved_entry *next_match;
};
struct moved_block {
@@ -808,11 +819,6 @@ struct moved_block {
int wsd; /* The whitespace delta of this block */
};
-static void moved_block_clear(struct moved_block *b)
-{
- memset(b, 0, sizeof(*b));
-}
-
#define INDENT_BLANKLINE INT_MIN
static void fill_es_indent_data(struct emitted_diff_symbol *es)
@@ -856,79 +862,41 @@ static void fill_es_indent_data(struct emitted_diff_symbol *es)
}
static int compute_ws_delta(const struct emitted_diff_symbol *a,
- const struct emitted_diff_symbol *b,
- int *out)
+ const struct emitted_diff_symbol *b)
{
- int a_len = a->len,
- b_len = b->len,
- a_off = a->indent_off,
- a_width = a->indent_width,
- b_off = b->indent_off,
+ int a_width = a->indent_width,
b_width = b->indent_width;
- int delta;
- if (a_width == INDENT_BLANKLINE && b_width == INDENT_BLANKLINE) {
- *out = INDENT_BLANKLINE;
- return 1;
- }
+ if (a_width == INDENT_BLANKLINE && b_width == INDENT_BLANKLINE)
+ return INDENT_BLANKLINE;
- if (a->s == DIFF_SYMBOL_PLUS)
- delta = a_width - b_width;
- else
- delta = b_width - a_width;
-
- if (a_len - a_off != b_len - b_off ||
- memcmp(a->line + a_off, b->line + b_off, a_len - a_off))
- return 0;
-
- *out = delta;
-
- return 1;
+ return a_width - b_width;
}
-static int cmp_in_block_with_wsd(const struct diff_options *o,
- const struct moved_entry *cur,
- const struct moved_entry *match,
- struct moved_block *pmb,
- int n)
+static int cmp_in_block_with_wsd(const struct moved_entry *cur,
+ const struct emitted_diff_symbol *l,
+ struct moved_block *pmb)
{
- struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
- int al = cur->es->len, bl = match->es->len, cl = l->len;
- const char *a = cur->es->line,
- *b = match->es->line,
- *c = l->line;
- int a_off = cur->es->indent_off,
- a_width = cur->es->indent_width,
- c_off = l->indent_off,
- c_width = l->indent_width;
+ int a_width = cur->es->indent_width, b_width = l->indent_width;
int delta;
- /*
- * We need to check if 'cur' is equal to 'match'. As those
- * are from the same (+/-) side, we do not need to adjust for
- * indent changes. However these were found using fuzzy
- * matching so we do have to check if they are equal. Here we
- * just check the lengths. We delay calling memcmp() to check
- * the contents until later as if the length comparison for a
- * and c fails we can avoid the call all together.
- */
- if (al != bl)
+ /* The text of each line must match */
+ if (cur->es->id != l->id)
return 1;
- /* If 'l' and 'cur' are both blank then they match. */
- if (a_width == INDENT_BLANKLINE && c_width == INDENT_BLANKLINE)
+ /*
+ * If 'l' and 'cur' are both blank then we don't need to check the
+ * indent. We only need to check cur as we know the strings match.
+ * */
+ if (a_width == INDENT_BLANKLINE)
return 0;
/*
* The indent changes of the block are known and stored in pmb->wsd;
* however we need to check if the indent changes of the current line
- * match those of the current block and that the text of 'l' and 'cur'
- * after the indentation match.
+ * match those of the current block.
*/
- if (cur->es->s == DIFF_SYMBOL_PLUS)
- delta = a_width - c_width;
- else
- delta = c_width - a_width;
+ delta = b_width - a_width;
/*
* If the previous lines of this block were all blank then set its
@@ -937,166 +905,165 @@ static int cmp_in_block_with_wsd(const struct diff_options *o,
if (pmb->wsd == INDENT_BLANKLINE)
pmb->wsd = delta;
- return !(delta == pmb->wsd && al - a_off == cl - c_off &&
- !memcmp(a, b, al) && !
- memcmp(a + a_off, c + c_off, al - a_off));
+ return delta != pmb->wsd;
}
-static int moved_entry_cmp(const void *hashmap_cmp_fn_data,
- const struct hashmap_entry *eptr,
- const struct hashmap_entry *entry_or_key,
- const void *keydata)
+struct interned_diff_symbol {
+ struct hashmap_entry ent;
+ struct emitted_diff_symbol *es;
+};
+
+static int interned_diff_symbol_cmp(const void *hashmap_cmp_fn_data,
+ const struct hashmap_entry *eptr,
+ const struct hashmap_entry *entry_or_key,
+ const void *keydata)
{
const struct diff_options *diffopt = hashmap_cmp_fn_data;
- const struct moved_entry *a, *b;
+ const struct emitted_diff_symbol *a, *b;
unsigned flags = diffopt->color_moved_ws_handling
& XDF_WHITESPACE_FLAGS;
- a = container_of(eptr, const struct moved_entry, ent);
- b = container_of(entry_or_key, const struct moved_entry, ent);
+ a = container_of(eptr, const struct interned_diff_symbol, ent)->es;
+ b = container_of(entry_or_key, const struct interned_diff_symbol, ent)->es;
- if (diffopt->color_moved_ws_handling &
- COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
- /*
- * As there is not specific white space config given,
- * we'd need to check for a new block, so ignore all
- * white space. The setup of the white space
- * configuration for the next block is done else where
- */
- flags |= XDF_IGNORE_WHITESPACE;
-
- return !xdiff_compare_lines(a->es->line, a->es->len,
- b->es->line, b->es->len,
- flags);
+ return !xdiff_compare_lines(a->line + a->indent_off,
+ a->len - a->indent_off,
+ b->line + b->indent_off,
+ b->len - b->indent_off, flags);
}
-static struct moved_entry *prepare_entry(struct diff_options *o,
- int line_no)
+static void prepare_entry(struct diff_options *o, struct emitted_diff_symbol *l,
+ struct interned_diff_symbol *s)
{
- struct moved_entry *ret = xmalloc(sizeof(*ret));
- struct emitted_diff_symbol *l = &o->emitted_symbols->buf[line_no];
unsigned flags = o->color_moved_ws_handling & XDF_WHITESPACE_FLAGS;
- unsigned int hash = xdiff_hash_string(l->line, l->len, flags);
+ unsigned int hash = xdiff_hash_string(l->line + l->indent_off,
+ l->len - l->indent_off, flags);
- hashmap_entry_init(&ret->ent, hash);
- ret->es = l;
- ret->next_line = NULL;
-
- return ret;
+ hashmap_entry_init(&s->ent, hash);
+ s->es = l;
}
-static void add_lines_to_move_detection(struct diff_options *o,
- struct hashmap *add_lines,
- struct hashmap *del_lines)
+struct moved_entry_list {
+ struct moved_entry *add, *del;
+};
+
+static struct moved_entry_list *add_lines_to_move_detection(struct diff_options *o,
+ struct mem_pool *entry_mem_pool)
{
struct moved_entry *prev_line = NULL;
-
+ struct mem_pool interned_pool;
+ struct hashmap interned_map;
+ struct moved_entry_list *entry_list = NULL;
+ size_t entry_list_alloc = 0;
+ unsigned id = 0;
int n;
- for (n = 0; n < o->emitted_symbols->nr; n++) {
- struct hashmap *hm;
- struct moved_entry *key;
- switch (o->emitted_symbols->buf[n].s) {
- case DIFF_SYMBOL_PLUS:
- hm = add_lines;
- break;
- case DIFF_SYMBOL_MINUS:
- hm = del_lines;
- break;
- default:
+ hashmap_init(&interned_map, interned_diff_symbol_cmp, o, 8096);
+ mem_pool_init(&interned_pool, 1024 * 1024);
+
+ for (n = 0; n < o->emitted_symbols->nr; n++) {
+ struct interned_diff_symbol key;
+ struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
+ struct interned_diff_symbol *s;
+ struct moved_entry *entry;
+
+ if (l->s != DIFF_SYMBOL_PLUS && l->s != DIFF_SYMBOL_MINUS) {
prev_line = NULL;
continue;
}
if (o->color_moved_ws_handling &
COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
- fill_es_indent_data(&o->emitted_symbols->buf[n]);
- key = prepare_entry(o, n);
- if (prev_line && prev_line->es->s == o->emitted_symbols->buf[n].s)
- prev_line->next_line = key;
+ fill_es_indent_data(l);
- hashmap_add(hm, &key->ent);
- prev_line = key;
+ prepare_entry(o, l, &key);
+ s = hashmap_get_entry(&interned_map, &key, ent, &key.ent);
+ if (s) {
+ l->id = s->es->id;
+ } else {
+ l->id = id;
+ ALLOC_GROW_BY(entry_list, id, 1, entry_list_alloc);
+ hashmap_add(&interned_map,
+ memcpy(mem_pool_alloc(&interned_pool,
+ sizeof(key)),
+ &key, sizeof(key)));
+ }
+ entry = mem_pool_alloc(entry_mem_pool, sizeof(*entry));
+ entry->es = l;
+ entry->next_line = NULL;
+ if (prev_line && prev_line->es->s == l->s)
+ prev_line->next_line = entry;
+ prev_line = entry;
+ if (l->s == DIFF_SYMBOL_PLUS) {
+ entry->next_match = entry_list[l->id].add;
+ entry_list[l->id].add = entry;
+ } else {
+ entry->next_match = entry_list[l->id].del;
+ entry_list[l->id].del = entry;
+ }
}
+
+ hashmap_clear(&interned_map);
+ mem_pool_discard(&interned_pool, 0);
+
+ return entry_list;
}
static void pmb_advance_or_null(struct diff_options *o,
- struct moved_entry *match,
- struct hashmap *hm,
+ struct emitted_diff_symbol *l,
struct moved_block *pmb,
- int pmb_nr)
+ int *pmb_nr)
{
- int i;
- for (i = 0; i < pmb_nr; i++) {
+ int i, j;
+
+ for (i = 0, j = 0; i < *pmb_nr; i++) {
+ int match;
struct moved_entry *prev = pmb[i].match;
struct moved_entry *cur = (prev && prev->next_line) ?
prev->next_line : NULL;
- if (cur && !hm->cmpfn(o, &cur->ent, &match->ent, NULL)) {
- pmb[i].match = cur;
- } else {
- pmb[i].match = NULL;
+
+ if (o->color_moved_ws_handling &
+ COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
+ match = cur &&
+ !cmp_in_block_with_wsd(cur, l, &pmb[i]);
+ else
+ match = cur && cur->es->id == l->id;
+
+ if (match) {
+ pmb[j] = pmb[i];
+ pmb[j++].match = cur;
}
}
+ *pmb_nr = j;
}
-static void pmb_advance_or_null_multi_match(struct diff_options *o,
- struct moved_entry *match,
- struct hashmap *hm,
- struct moved_block *pmb,
- int pmb_nr, int n)
+static void fill_potential_moved_blocks(struct diff_options *o,
+ struct moved_entry *match,
+ struct emitted_diff_symbol *l,
+ struct moved_block **pmb_p,
+ int *pmb_alloc_p, int *pmb_nr_p)
+
{
- int i;
- char *got_match = xcalloc(1, pmb_nr);
+ struct moved_block *pmb = *pmb_p;
+ int pmb_alloc = *pmb_alloc_p, pmb_nr = *pmb_nr_p;
- hashmap_for_each_entry_from(hm, match, ent) {
- for (i = 0; i < pmb_nr; i++) {
- struct moved_entry *prev = pmb[i].match;
- struct moved_entry *cur = (prev && prev->next_line) ?
- prev->next_line : NULL;
- if (!cur)
- continue;
- if (!cmp_in_block_with_wsd(o, cur, match, &pmb[i], n))
- got_match[i] |= 1;
- }
+ /*
+ * The current line is the start of a new block.
+ * Setup the set of potential blocks.
+ */
+ for (; match; match = match->next_match) {
+ ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc);
+ if (o->color_moved_ws_handling &
+ COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
+ pmb[pmb_nr].wsd = compute_ws_delta(l, match->es);
+ else
+ pmb[pmb_nr].wsd = 0;
+ pmb[pmb_nr++].match = match;
}
- for (i = 0; i < pmb_nr; i++) {
- if (got_match[i]) {
- /* Advance to the next line */
- pmb[i].match = pmb[i].match->next_line;
- } else {
- moved_block_clear(&pmb[i]);
- }
- }
-
- free(got_match);
-}
-
-static int shrink_potential_moved_blocks(struct moved_block *pmb,
- int pmb_nr)
-{
- int lp, rp;
-
- /* Shrink the set of potential block to the remaining running */
- for (lp = 0, rp = pmb_nr - 1; lp <= rp;) {
- while (lp < pmb_nr && pmb[lp].match)
- lp++;
- /* lp points at the first NULL now */
-
- while (rp > -1 && !pmb[rp].match)
- rp--;
- /* rp points at the last non-NULL */
-
- if (lp < pmb_nr && rp > -1 && lp < rp) {
- pmb[lp] = pmb[rp];
- memset(&pmb[rp], 0, sizeof(pmb[rp]));
- rp--;
- lp++;
- }
- }
-
- /* Remember the number of running sets */
- return rp + 1;
+ *pmb_p = pmb;
+ *pmb_alloc_p = pmb_alloc;
+ *pmb_nr_p = pmb_nr;
}
/*
@@ -1115,6 +1082,8 @@ static int shrink_potential_moved_blocks(struct moved_block *pmb,
* NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
* Think of a way to unify them.
*/
+#define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \
+ (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT)
static int adjust_last_block(struct diff_options *o, int n, int block_length)
{
int i, alnum_count = 0;
@@ -1131,95 +1100,85 @@ static int adjust_last_block(struct diff_options *o, int n, int block_length)
}
}
for (i = 1; i < block_length + 1; i++)
- o->emitted_symbols->buf[n - i].flags &= ~DIFF_SYMBOL_MOVED_LINE;
+ o->emitted_symbols->buf[n - i].flags &= ~DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK;
return 0;
}
/* Find blocks of moved code, delegate actual coloring decision to helper */
static void mark_color_as_moved(struct diff_options *o,
- struct hashmap *add_lines,
- struct hashmap *del_lines)
+ struct moved_entry_list *entry_list)
{
struct moved_block *pmb = NULL; /* potentially moved blocks */
int pmb_nr = 0, pmb_alloc = 0;
int n, flipped_block = 0, block_length = 0;
+ enum diff_symbol moved_symbol = DIFF_SYMBOL_BINARY_DIFF_HEADER;
for (n = 0; n < o->emitted_symbols->nr; n++) {
- struct hashmap *hm = NULL;
- struct moved_entry *key;
struct moved_entry *match = NULL;
struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
- enum diff_symbol last_symbol = 0;
switch (l->s) {
case DIFF_SYMBOL_PLUS:
- hm = del_lines;
- key = prepare_entry(o, n);
- match = hashmap_get_entry(hm, key, ent, NULL);
- free(key);
+ match = entry_list[l->id].del;
break;
case DIFF_SYMBOL_MINUS:
- hm = add_lines;
- key = prepare_entry(o, n);
- match = hashmap_get_entry(hm, key, ent, NULL);
- free(key);
+ match = entry_list[l->id].add;
break;
default:
flipped_block = 0;
}
- if (!match) {
- int i;
-
- adjust_last_block(o, n, block_length);
- for(i = 0; i < pmb_nr; i++)
- moved_block_clear(&pmb[i]);
+ if (pmb_nr && (!match || l->s != moved_symbol)) {
+ if (!adjust_last_block(o, n, block_length) &&
+ block_length > 1) {
+ /*
+ * Rewind in case there is another match
+ * starting at the second line of the block
+ */
+ match = NULL;
+ n -= block_length;
+ }
pmb_nr = 0;
block_length = 0;
flipped_block = 0;
- last_symbol = l->s;
+ }
+ if (!match) {
+ moved_symbol = DIFF_SYMBOL_BINARY_DIFF_HEADER;
continue;
}
if (o->color_moved == COLOR_MOVED_PLAIN) {
- last_symbol = l->s;
l->flags |= DIFF_SYMBOL_MOVED_LINE;
continue;
}
- if (o->color_moved_ws_handling &
- COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
- pmb_advance_or_null_multi_match(o, match, hm, pmb, pmb_nr, n);
- else
- pmb_advance_or_null(o, match, hm, pmb, pmb_nr);
-
- pmb_nr = shrink_potential_moved_blocks(pmb, pmb_nr);
+ pmb_advance_or_null(o, l, pmb, &pmb_nr);
if (pmb_nr == 0) {
- /*
- * The current line is the start of a new block.
- * Setup the set of potential blocks.
- */
- hashmap_for_each_entry_from(hm, match, ent) {
- ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc);
- if (o->color_moved_ws_handling &
- COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) {
- if (compute_ws_delta(l, match->es,
- &pmb[pmb_nr].wsd))
- pmb[pmb_nr++].match = match;
- } else {
- pmb[pmb_nr].wsd = 0;
- pmb[pmb_nr++].match = match;
- }
- }
+ int contiguous = adjust_last_block(o, n, block_length);
- if (adjust_last_block(o, n, block_length) &&
- pmb_nr && last_symbol != l->s)
+ if (!contiguous && block_length > 1)
+ /*
+ * Rewind in case there is another match
+ * starting at the second line of the block
+ */
+ n -= block_length;
+ else
+ fill_potential_moved_blocks(o, match, l,
+ &pmb, &pmb_alloc,
+ &pmb_nr);
+
+ if (contiguous && pmb_nr && moved_symbol == l->s)
flipped_block = (flipped_block + 1) % 2;
else
flipped_block = 0;
+ if (pmb_nr)
+ moved_symbol = l->s;
+ else
+ moved_symbol = DIFF_SYMBOL_BINARY_DIFF_HEADER;
+
block_length = 0;
}
@@ -1229,17 +1188,12 @@ static void mark_color_as_moved(struct diff_options *o,
if (flipped_block && o->color_moved != COLOR_MOVED_BLOCKS)
l->flags |= DIFF_SYMBOL_MOVED_LINE_ALT;
}
- last_symbol = l->s;
}
adjust_last_block(o, n, block_length);
- for(n = 0; n < pmb_nr; n++)
- moved_block_clear(&pmb[n]);
free(pmb);
}
-#define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \
- (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT)
static void dim_moved_lines(struct diff_options *o)
{
int n;
@@ -1573,7 +1527,9 @@ static void emit_diff_symbol_from_struct(struct diff_options *o,
static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s,
const char *line, int len, unsigned flags)
{
- struct emitted_diff_symbol e = {line, len, flags, 0, 0, s};
+ struct emitted_diff_symbol e = {
+ .line = line, .len = len, .flags = flags, .s = s
+ };
if (o->emitted_symbols)
append_emitted_diff_symbol(o, &e);
@@ -2279,7 +2235,7 @@ static void free_diff_words_data(struct emit_callback *ecbdata)
{
if (ecbdata->diff_words) {
diff_words_flush(ecbdata);
- free (ecbdata->diff_words->opt->emitted_symbols);
+ free_emitted_diff_symbols(ecbdata->diff_words->opt->emitted_symbols);
free (ecbdata->diff_words->opt);
free (ecbdata->diff_words->minus.text.ptr);
free (ecbdata->diff_words->minus.orig);
@@ -3406,6 +3362,31 @@ struct userdiff_driver *get_textconv(struct repository *r,
return userdiff_get_textconv(r, one->driver);
}
+static struct strbuf *additional_headers(struct diff_options *o,
+ const char *path)
+{
+ if (!o->additional_path_headers)
+ return NULL;
+ return strmap_get(o->additional_path_headers, path);
+}
+
+static void add_formatted_headers(struct strbuf *msg,
+ struct strbuf *more_headers,
+ const char *line_prefix,
+ const char *meta,
+ const char *reset)
+{
+ char *next, *newline;
+
+ for (next = more_headers->buf; *next; next = newline) {
+ newline = strchrnul(next, '\n');
+ strbuf_addf(msg, "%s%s%.*s%s\n", line_prefix, meta,
+ (int)(newline - next), next, reset);
+ if (*newline)
+ newline++;
+ }
+}
+
static void builtin_diff(const char *name_a,
const char *name_b,
struct diff_filespec *one,
@@ -3464,6 +3445,17 @@ static void builtin_diff(const char *name_a,
b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
+ if (!DIFF_FILE_VALID(one) && !DIFF_FILE_VALID(two)) {
+ /*
+ * We should only reach this point for pairs from
+ * create_filepairs_for_header_only_notifications(). For
+ * these, we should avoid the "/dev/null" special casing
+ * above, meaning we avoid showing such pairs as either
+ * "new file" or "deleted file" below.
+ */
+ lbl[0] = a_one;
+ lbl[1] = b_two;
+ }
strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset);
if (lbl[0][0] == '/') {
/* /dev/null */
@@ -4144,18 +4136,13 @@ static void prep_temp_blob(struct index_state *istate,
int mode)
{
struct strbuf buf = STRBUF_INIT;
- 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_");
- strbuf_addstr(&tempfile, base);
-
- temp->tempfile = mks_tempfile_ts(tempfile.buf, strlen(base) + 1);
+ temp->tempfile = mks_tempfile_dt("git-blob-XXXXXX", base);
if (!temp->tempfile)
die_errno("unable to create temp-file");
if (convert_to_working_tree(istate, path,
@@ -4170,7 +4157,6 @@ static void prep_temp_blob(struct index_state *istate,
oid_to_hex_r(temp->hex, oid);
xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
strbuf_release(&buf);
- strbuf_release(&tempfile);
free(path_dup);
}
@@ -4328,6 +4314,7 @@ static void fill_metainfo(struct strbuf *msg,
const char *set = diff_get_color(use_color, DIFF_METAINFO);
const char *reset = diff_get_color(use_color, DIFF_RESET);
const char *line_prefix = diff_line_prefix(o);
+ struct strbuf *more_headers = NULL;
*must_show_header = 1;
strbuf_init(msg, PATH_MAX * 2 + 300);
@@ -4364,6 +4351,11 @@ static void fill_metainfo(struct strbuf *msg,
default:
*must_show_header = 0;
}
+ if ((more_headers = additional_headers(o, name))) {
+ add_formatted_headers(msg, more_headers,
+ line_prefix, set, reset);
+ *must_show_header = 1;
+ }
if (one && two && !oideq(&one->oid, &two->oid)) {
const unsigned hexsz = the_hash_algo->hexsz;
int abbrev = o->abbrev ? o->abbrev : DEFAULT_ABBREV;
@@ -4623,6 +4615,43 @@ void repo_diff_setup(struct repository *r, struct diff_options *options)
prep_parse_options(options);
}
+static const char diff_status_letters[] = {
+ DIFF_STATUS_ADDED,
+ DIFF_STATUS_COPIED,
+ DIFF_STATUS_DELETED,
+ DIFF_STATUS_MODIFIED,
+ DIFF_STATUS_RENAMED,
+ DIFF_STATUS_TYPE_CHANGED,
+ DIFF_STATUS_UNKNOWN,
+ DIFF_STATUS_UNMERGED,
+ DIFF_STATUS_FILTER_AON,
+ DIFF_STATUS_FILTER_BROKEN,
+ '\0',
+};
+
+static unsigned int filter_bit['Z' + 1];
+
+static void prepare_filter_bits(void)
+{
+ int i;
+
+ if (!filter_bit[DIFF_STATUS_ADDED]) {
+ for (i = 0; diff_status_letters[i]; i++)
+ filter_bit[(int) diff_status_letters[i]] = (1 << i);
+ }
+}
+
+static unsigned filter_bit_tst(char status, const struct diff_options *opt)
+{
+ return opt->filter & filter_bit[(int) status];
+}
+
+unsigned diff_filter_bit(char status)
+{
+ prepare_filter_bits();
+ return filter_bit[(int) status];
+}
+
void diff_setup_done(struct diff_options *options)
{
unsigned check_mask = DIFF_FORMAT_NAME |
@@ -4639,16 +4668,20 @@ void diff_setup_done(struct diff_options *options)
options->set_default(options);
if (HAS_MULTI_BITS(options->output_format & check_mask))
- die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
+ die(_("options '%s', '%s', '%s', and '%s' cannot be used together"),
+ "--name-only", "--name-status", "--check", "-s");
if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK))
- die(_("-G, -S and --find-object are mutually exclusive"));
+ die(_("options '%s', '%s', and '%s' cannot be used together"),
+ "-G", "-S", "--find-object");
if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_G_REGEX_MASK))
- die(_("-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"));
+ die(_("options '%s' and '%s' cannot be used together, use '%s' with '%s'"),
+ "-G", "--pickaxe-regex", "--pickaxe-regex", "-S");
if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK))
- die(_("--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S"));
+ die(_("options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"),
+ "--pickaxe-all", "--find-object", "--pickaxe-all", "-G", "-S");
/*
* Most of the time we can say "there are changes"
@@ -4732,6 +4765,12 @@ void diff_setup_done(struct diff_options *options)
if (!options->use_color || external_diff())
options->color_moved = 0;
+ if (options->filter_not) {
+ if (!options->filter)
+ options->filter = ~filter_bit[DIFF_STATUS_FILTER_AON];
+ options->filter &= ~options->filter_not;
+ }
+
FREE_AND_NULL(options->parseopts);
}
@@ -4823,43 +4862,6 @@ static int parse_dirstat_opt(struct diff_options *options, const char *params)
return 1;
}
-static const char diff_status_letters[] = {
- DIFF_STATUS_ADDED,
- DIFF_STATUS_COPIED,
- DIFF_STATUS_DELETED,
- DIFF_STATUS_MODIFIED,
- DIFF_STATUS_RENAMED,
- DIFF_STATUS_TYPE_CHANGED,
- DIFF_STATUS_UNKNOWN,
- DIFF_STATUS_UNMERGED,
- DIFF_STATUS_FILTER_AON,
- DIFF_STATUS_FILTER_BROKEN,
- '\0',
-};
-
-static unsigned int filter_bit['Z' + 1];
-
-static void prepare_filter_bits(void)
-{
- int i;
-
- if (!filter_bit[DIFF_STATUS_ADDED]) {
- for (i = 0; diff_status_letters[i]; i++)
- filter_bit[(int) diff_status_letters[i]] = (1 << i);
- }
-}
-
-static unsigned filter_bit_tst(char status, const struct diff_options *opt)
-{
- return opt->filter & filter_bit[(int) status];
-}
-
-unsigned diff_filter_bit(char status)
-{
- prepare_filter_bits();
- return filter_bit[(int) status];
-}
-
static int diff_opt_diff_filter(const struct option *option,
const char *optarg, int unset)
{
@@ -4869,21 +4871,6 @@ static int diff_opt_diff_filter(const struct option *option,
BUG_ON_OPT_NEG(unset);
prepare_filter_bits();
- /*
- * If there is a negation e.g. 'd' in the input, and we haven't
- * initialized the filter field with another --diff-filter, start
- * from full set of bits, except for AON.
- */
- if (!opt->filter) {
- for (i = 0; (optch = optarg[i]) != '\0'; i++) {
- if (optch < 'a' || 'z' < optch)
- continue;
- opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1;
- opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON];
- break;
- }
- }
-
for (i = 0; (optch = optarg[i]) != '\0'; i++) {
unsigned int bit;
int negate;
@@ -4900,7 +4887,7 @@ static int diff_opt_diff_filter(const struct option *option,
return error(_("unknown change class '%c' in --diff-filter=%s"),
optarg[i], optarg);
if (negate)
- opt->filter &= ~bit;
+ opt->filter_not |= bit;
else
opt->filter |= bit;
}
@@ -5645,7 +5632,7 @@ static void prep_parse_options(struct diff_options *options)
N_("select files by diff type"),
PARSE_OPT_NONEG, diff_opt_diff_filter),
{ OPTION_CALLBACK, 0, "output", options, N_("<file>"),
- N_("Output to a specific file"),
+ N_("output to a specific file"),
PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
OPT_END()
@@ -5852,12 +5839,27 @@ int diff_unmodified_pair(struct diff_filepair *p)
static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
{
- if (diff_unmodified_pair(p))
+ int include_conflict_headers =
+ (additional_headers(o, p->one->path) &&
+ (!o->filter || filter_bit_tst(DIFF_STATUS_UNMERGED, o)));
+
+ /*
+ * Check if we can return early without showing a diff. Note that
+ * diff_filepair only stores {oid, path, mode, is_valid}
+ * information for each path, and thus diff_unmodified_pair() only
+ * considers those bits of info. However, we do not want pairs
+ * created by create_filepairs_for_header_only_notifications()
+ * (which always look like unmodified pairs) to be ignored, so
+ * return early if both p is unmodified AND we don't want to
+ * include_conflict_headers.
+ */
+ if (diff_unmodified_pair(p) && !include_conflict_headers)
return;
+ /* Actually, we can also return early to avoid showing tree diffs */
if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
(DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
- return; /* no tree diffs in patch format */
+ return;
run_diff(p, o);
}
@@ -5888,10 +5890,17 @@ static void diff_flush_checkdiff(struct diff_filepair *p,
run_checkdiff(p, o);
}
-int diff_queue_is_empty(void)
+int diff_queue_is_empty(struct diff_options *o)
{
struct diff_queue_struct *q = &diff_queued_diff;
int i;
+ int include_conflict_headers =
+ (o->additional_path_headers &&
+ (!o->filter || filter_bit_tst(DIFF_STATUS_UNMERGED, o)));
+
+ if (include_conflict_headers)
+ return 0;
+
for (i = 0; i < q->nr; i++)
if (!diff_unmodified_pair(q->queue[i]))
return 0;
@@ -6325,6 +6334,54 @@ void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
warning(_(rename_limit_advice), varname, needed);
}
+static void create_filepairs_for_header_only_notifications(struct diff_options *o)
+{
+ struct strset present;
+ struct diff_queue_struct *q = &diff_queued_diff;
+ struct hashmap_iter iter;
+ struct strmap_entry *e;
+ int i;
+
+ strset_init_with_options(&present, /*pool*/ NULL, /*strdup*/ 0);
+
+ /*
+ * Find out which paths exist in diff_queued_diff, preferring
+ * one->path for any pair that has multiple paths.
+ */
+ for (i = 0; i < q->nr; i++) {
+ struct diff_filepair *p = q->queue[i];
+ char *path = p->one->path ? p->one->path : p->two->path;
+
+ if (strmap_contains(o->additional_path_headers, path))
+ strset_add(&present, path);
+ }
+
+ /*
+ * Loop over paths in additional_path_headers; for each NOT already
+ * in diff_queued_diff, create a synthetic filepair and insert that
+ * into diff_queued_diff.
+ */
+ strmap_for_each_entry(o->additional_path_headers, &iter, e) {
+ if (!strset_contains(&present, e->key)) {
+ struct diff_filespec *one, *two;
+ struct diff_filepair *p;
+
+ one = alloc_filespec(e->key);
+ two = alloc_filespec(e->key);
+ fill_filespec(one, null_oid(), 0, 0);
+ fill_filespec(two, null_oid(), 0, 0);
+ p = diff_queue(q, one, two);
+ p->status = DIFF_STATUS_MODIFIED;
+ }
+ }
+
+ /* Re-sort the filepairs */
+ diffcore_fix_diff_index();
+
+ /* Cleanup */
+ strset_clear(&present);
+}
+
static void diff_flush_patch_all_file_pairs(struct diff_options *o)
{
int i;
@@ -6337,6 +6394,9 @@ static void diff_flush_patch_all_file_pairs(struct diff_options *o)
if (o->color_moved)
o->emitted_symbols = &esm;
+ if (o->additional_path_headers)
+ create_filepairs_for_header_only_notifications(o);
+
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
if (check_pair_status(p))
@@ -6345,24 +6405,18 @@ static void diff_flush_patch_all_file_pairs(struct diff_options *o)
if (o->emitted_symbols) {
if (o->color_moved) {
- struct hashmap add_lines, del_lines;
+ struct mem_pool entry_pool;
+ struct moved_entry_list *entry_list;
- if (o->color_moved_ws_handling &
- COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
- o->color_moved_ws_handling |= XDF_IGNORE_WHITESPACE;
-
- hashmap_init(&del_lines, moved_entry_cmp, o, 0);
- hashmap_init(&add_lines, moved_entry_cmp, o, 0);
-
- add_lines_to_move_detection(o, &add_lines, &del_lines);
- mark_color_as_moved(o, &add_lines, &del_lines);
+ mem_pool_init(&entry_pool, 1024 * 1024);
+ entry_list = add_lines_to_move_detection(o,
+ &entry_pool);
+ mark_color_as_moved(o, entry_list);
if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
dim_moved_lines(o);
- hashmap_clear_and_free(&add_lines, struct moved_entry,
- ent);
- hashmap_clear_and_free(&del_lines, struct moved_entry,
- ent);
+ mem_pool_discard(&entry_pool, 0);
+ free(entry_list);
}
for (i = 0; i < esm.nr; i++)
@@ -6400,6 +6454,8 @@ void diff_free(struct diff_options *options)
diff_free_file(options);
diff_free_ignore_regex(options);
+ clear_pathspec(&options->pathspec);
+ FREE_AND_NULL(options->parseopts);
}
void diff_flush(struct diff_options *options)
@@ -6413,7 +6469,7 @@ void diff_flush(struct diff_options *options)
* Order: raw, stat, summary, patch
* or: name/name-status/checkdiff (other bits clear)
*/
- if (!q->nr)
+ if (!q->nr && !options->additional_path_headers)
goto free_queue;
if (output_format & (DIFF_FORMAT_RAW |
@@ -6921,19 +6977,15 @@ static char *run_textconv(struct repository *r,
size_t *outsize)
{
struct diff_tempfile *temp;
- const char *argv[3];
- const char **arg = argv;
struct child_process child = CHILD_PROCESS_INIT;
struct strbuf buf = STRBUF_INIT;
int err = 0;
temp = prepare_temp_file(r, spec->path, spec);
- *arg++ = pgm;
- *arg++ = temp->name;
- *arg = NULL;
+ strvec_push(&child.args, pgm);
+ strvec_push(&child.args, temp->name);
child.use_shell = 1;
- child.argv = argv;
child.out = -1;
if (start_command(&child)) {
remove_tempfile();
diff --git a/diff.h b/diff.h
index 8ba85c5..8ae18e5 100644
--- a/diff.h
+++ b/diff.h
@@ -283,7 +283,7 @@ struct diff_options {
struct diff_flags flags;
/* diff-filter bits */
- unsigned int filter;
+ unsigned int filter, filter_not;
int use_color;
@@ -395,6 +395,7 @@ struct diff_options {
struct repository *repo;
struct option *parseopts;
+ struct strmap *additional_path_headers;
int no_free;
};
@@ -593,7 +594,7 @@ void diffcore_fix_diff_index(void);
" show all files diff when -S is used and hit is found.\n" \
" -a --text treat all files as text.\n"
-int diff_queue_is_empty(void);
+int diff_queue_is_empty(struct diff_options *o);
void diff_flush(struct diff_options*);
void diff_free(struct diff_options*);
void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
diff --git a/diffcore-delta.c b/diffcore-delta.c
index 5668ace..18d8f76 100644
--- a/diffcore-delta.c
+++ b/diffcore-delta.c
@@ -133,10 +133,10 @@ static struct spanhash_top *hash_chars(struct repository *r,
i = INITIAL_HASH_SIZE;
hash = xmalloc(st_add(sizeof(*hash),
- st_mult(sizeof(struct spanhash), 1<<i)));
+ st_mult(sizeof(struct spanhash), (size_t)1 << i)));
hash->alloc_log2 = i;
hash->free = INITIAL_FREE(i);
- memset(hash->data, 0, sizeof(struct spanhash) * (1<<i));
+ memset(hash->data, 0, sizeof(struct spanhash) * ((size_t)1 << i));
n = 0;
accum1 = accum2 = 0;
@@ -159,7 +159,7 @@ static struct spanhash_top *hash_chars(struct repository *r,
n = 0;
accum1 = accum2 = 0;
}
- QSORT(hash->data, 1ul << hash->alloc_log2, spanhash_cmp);
+ QSORT(hash->data, (size_t)1ul << hash->alloc_log2, spanhash_cmp);
return hash;
}
diff --git a/diffcore-rename.c b/diffcore-rename.c
index bebd4ed..c0422d9 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -261,7 +261,7 @@ static unsigned int hash_filespec(struct repository *r,
if (diff_populate_filespec(r, filespec, NULL))
return 0;
hash_object_file(r->hash_algo, filespec->data, filespec->size,
- "blob", &filespec->oid);
+ OBJ_BLOB, &filespec->oid);
}
return oidhash(&filespec->oid);
}
diff --git a/dir.c b/dir.c
index 39fce3b..6ca2ef5 100644
--- a/dir.c
+++ b/dir.c
@@ -727,7 +727,7 @@ static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern
}
if (given->patternlen < 2 ||
- *given->pattern == '*' ||
+ *given->pattern != '/' ||
strstr(given->pattern, "**")) {
/* Not a cone pattern. */
warning(_("unrecognized pattern: '%s'"), given->pattern);
@@ -819,9 +819,7 @@ static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern
/* we already included this at the parent level */
warning(_("your sparse-checkout file may have issues: pattern '%s' is repeated"),
given->pattern);
- hashmap_remove(&pl->parent_hashmap, &translated->ent, &data);
- free(data);
- free(translated);
+ goto clear_hashmaps;
}
return;
@@ -1115,7 +1113,7 @@ static int add_patterns(const char *fname, const char *base, int baselen,
&istate->cache[pos]->oid);
else
hash_object_file(the_hash_algo, buf, size,
- "blob", &oid_stat->oid);
+ OBJ_BLOB, &oid_stat->oid);
fill_stat_data(&oid_stat->stat, &st);
oid_stat->valid = 1;
}
@@ -1460,23 +1458,41 @@ static int path_in_sparse_checkout_1(const char *path,
struct index_state *istate,
int require_cone_mode)
{
- const char *base;
int dtype = DT_REG;
+ enum pattern_match_result match = UNDECIDED;
+ const char *end, *slash;
/*
- * We default to accepting a path if there are no patterns or
- * they are of the wrong type.
+ * We default to accepting a path if the path is empty, there are no
+ * patterns, or the patterns are of the wrong type.
*/
- if (init_sparse_checkout_patterns(istate) ||
+ if (!*path ||
+ init_sparse_checkout_patterns(istate) ||
(require_cone_mode &&
!istate->sparse_checkout_patterns->use_cone_patterns))
return 1;
- base = strrchr(path, '/');
- return path_matches_pattern_list(path, strlen(path), base ? base + 1 : path,
- &dtype,
- istate->sparse_checkout_patterns,
- istate) > 0;
+ /*
+ * If UNDECIDED, use the match from the parent dir (recursively), or
+ * fall back to NOT_MATCHED at the topmost level. Note that cone mode
+ * never returns UNDECIDED, so we will execute only one iteration in
+ * this case.
+ */
+ for (end = path + strlen(path);
+ end > path && match == UNDECIDED;
+ end = slash) {
+
+ for (slash = end - 1; slash > path && *slash != '/'; slash--)
+ ; /* do nothing */
+
+ match = path_matches_pattern_list(path, end - path,
+ slash > path ? slash + 1 : path, &dtype,
+ istate->sparse_checkout_patterns, istate);
+
+ /* We are going to match the parent dir now */
+ dtype = DT_DIR;
+ }
+ return match > 0;
}
int path_in_sparse_checkout(const char *path,
@@ -2731,13 +2747,33 @@ static void set_untracked_ident(struct untracked_cache *uc)
strbuf_addch(&uc->ident, 0);
}
-static void new_untracked_cache(struct index_state *istate)
+static unsigned new_untracked_cache_flags(struct index_state *istate)
+{
+ struct repository *repo = istate->repo;
+ char *val;
+
+ /*
+ * This logic is coordinated with the setting of these flags in
+ * wt-status.c#wt_status_collect_untracked(), and the evaluation
+ * of the config setting in commit.c#git_status_config()
+ */
+ if (!repo_config_get_string(repo, "status.showuntrackedfiles", &val) &&
+ !strcmp(val, "all"))
+ return 0;
+
+ /*
+ * The default, if "all" is not set, is "normal" - leading us here.
+ * If the value is "none" then it really doesn't matter.
+ */
+ return DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
+}
+
+static void new_untracked_cache(struct index_state *istate, int flags)
{
struct untracked_cache *uc = xcalloc(1, sizeof(*uc));
strbuf_init(&uc->ident, 100);
uc->exclude_per_dir = ".gitignore";
- /* should be the same flags used by git-status */
- uc->dir_flags = DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
+ uc->dir_flags = flags >= 0 ? flags : new_untracked_cache_flags(istate);
set_untracked_ident(uc);
istate->untracked = uc;
istate->cache_changed |= UNTRACKED_CHANGED;
@@ -2746,11 +2782,11 @@ static void new_untracked_cache(struct index_state *istate)
void add_untracked_cache(struct index_state *istate)
{
if (!istate->untracked) {
- new_untracked_cache(istate);
+ new_untracked_cache(istate, -1);
} else {
if (!ident_in_untracked(istate->untracked)) {
free_untracked_cache(istate->untracked);
- new_untracked_cache(istate);
+ new_untracked_cache(istate, -1);
}
}
}
@@ -2766,7 +2802,8 @@ void remove_untracked_cache(struct index_state *istate)
static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *dir,
int base_len,
- const struct pathspec *pathspec)
+ const struct pathspec *pathspec,
+ struct index_state *istate)
{
struct untracked_cache_dir *root;
static int untracked_cache_disabled = -1;
@@ -2797,17 +2834,9 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d
if (base_len || (pathspec && pathspec->nr))
return NULL;
- /* Different set of flags may produce different results */
- if (dir->flags != dir->untracked->dir_flags ||
- /*
- * See treat_directory(), case index_nonexistent. Without
- * this flag, we may need to also cache .git file content
- * for the resolve_gitlink_ref() call, which we don't.
- */
- !(dir->flags & DIR_SHOW_OTHER_DIRECTORIES) ||
- /* We don't support collecting ignore files */
- (dir->flags & (DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO |
- DIR_COLLECT_IGNORED)))
+ /* We don't support collecting ignore files */
+ if (dir->flags & (DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO |
+ DIR_COLLECT_IGNORED))
return NULL;
/*
@@ -2830,8 +2859,55 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d
return NULL;
}
- if (!dir->untracked->root)
+ /*
+ * If the untracked structure we received does not have the same flags
+ * as requested in this run, we're going to need to either discard the
+ * existing structure (and potentially later recreate), or bypass the
+ * untracked cache mechanism for this run.
+ */
+ if (dir->flags != dir->untracked->dir_flags) {
+ /*
+ * If the untracked structure we received does not have the same flags
+ * as configured, then we need to reset / create a new "untracked"
+ * structure to match the new config.
+ *
+ * Keeping the saved and used untracked cache consistent with the
+ * configuration provides an opportunity for frequent users of
+ * "git status -uall" to leverage the untracked cache by aligning their
+ * configuration - setting "status.showuntrackedfiles" to "all" or
+ * "normal" as appropriate.
+ *
+ * Previously using -uall (or setting "status.showuntrackedfiles" to
+ * "all") was incompatible with untracked cache and *consistently*
+ * caused surprisingly bad performance (with fscache and fsmonitor
+ * enabled) on Windows.
+ *
+ * IMPROVEMENT OPPORTUNITY: If we reworked the untracked cache storage
+ * to not be as bound up with the desired output in a given run,
+ * and instead iterated through and stored enough information to
+ * correctly serve both "modes", then users could get peak performance
+ * with or without '-uall' regardless of their
+ * "status.showuntrackedfiles" config.
+ */
+ if (dir->untracked->dir_flags != new_untracked_cache_flags(istate)) {
+ free_untracked_cache(istate->untracked);
+ new_untracked_cache(istate, dir->flags);
+ dir->untracked = istate->untracked;
+ }
+ else {
+ /*
+ * Current untracked cache data is consistent with config, but not
+ * usable in this request/run; just bypass untracked cache.
+ */
+ return NULL;
+ }
+ }
+
+ if (!dir->untracked->root) {
+ /* Untracked cache existed but is not initialized; fix that */
FLEX_ALLOC_STR(dir->untracked->root, name, "");
+ istate->cache_changed |= UNTRACKED_CHANGED;
+ }
/* Validate $GIT_DIR/info/exclude and core.excludesfile */
root = dir->untracked->root;
@@ -2901,7 +2977,7 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,
return dir->nr;
}
- untracked = validate_untracked_cache(dir, len, pathspec);
+ untracked = validate_untracked_cache(dir, len, pathspec, istate);
if (!untracked)
/*
* make sure untracked cache code path is disabled,
@@ -2921,7 +2997,9 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,
if (force_untracked_cache < 0)
force_untracked_cache =
- git_env_bool("GIT_FORCE_UNTRACKED_CACHE", 0);
+ git_env_bool("GIT_FORCE_UNTRACKED_CACHE", -1);
+ if (force_untracked_cache < 0)
+ force_untracked_cache = (istate->repo->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE);
if (force_untracked_cache &&
dir->untracked == istate->untracked &&
(dir->untracked->dir_opened ||
@@ -3032,7 +3110,7 @@ char *git_url_basename(const char *repo, int is_bundle, int is_bare)
* Skip scheme.
*/
start = strstr(repo, "://");
- if (start == NULL)
+ if (!start)
start = repo;
else
start += 3;
@@ -3060,6 +3138,15 @@ char *git_url_basename(const char *repo, int is_bundle, int is_bare)
}
/*
+ * It should not be possible to overflow `ptrdiff_t` by passing in an
+ * insanely long URL, but GCC does not know that and will complain
+ * without this check.
+ */
+ if (end - start < 0)
+ die(_("No directory name could be guessed.\n"
+ "Please specify a directory on the command line"));
+
+ /*
* Strip trailing port number if we've got only a
* hostname (that is, there is no dir separator but a
* colon). This check is required such that we do not
@@ -3143,6 +3230,7 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
int ret = 0, original_len = path->len, len, kept_down = 0;
int only_empty = (flag & REMOVE_DIR_EMPTY_ONLY);
int keep_toplevel = (flag & REMOVE_DIR_KEEP_TOPLEVEL);
+ int purge_original_cwd = (flag & REMOVE_DIR_PURGE_ORIGINAL_CWD);
struct object_id submodule_head;
if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
@@ -3198,9 +3286,14 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
closedir(dir);
strbuf_setlen(path, original_len);
- if (!ret && !keep_toplevel && !kept_down)
- ret = (!rmdir(path->buf) || errno == ENOENT) ? 0 : -1;
- else if (kept_up)
+ if (!ret && !keep_toplevel && !kept_down) {
+ if (!purge_original_cwd &&
+ startup_info->original_cwd &&
+ !strcmp(startup_info->original_cwd, path->buf))
+ ret = -1; /* Do not remove current working directory */
+ else
+ ret = (!rmdir(path->buf) || errno == ENOENT) ? 0 : -1;
+ } else if (kept_up)
/*
* report the uplevel that it is not an error that we
* did not rmdir() our directory.
@@ -3266,6 +3359,9 @@ int remove_path(const char *name)
slash = dirs + (slash - name);
do {
*slash = '\0';
+ if (startup_info->original_cwd &&
+ !strcmp(startup_info->original_cwd, dirs))
+ break;
} while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/')));
free(dirs);
}
@@ -3859,3 +3955,32 @@ void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_
connect_work_tree_and_git_dir(path, new_git_dir, 0);
}
+
+int path_match_flags(const char *const str, const enum path_match_flags flags)
+{
+ const char *p = str;
+
+ if (flags & PATH_MATCH_NATIVE &&
+ flags & PATH_MATCH_XPLATFORM)
+ BUG("path_match_flags() must get one match kind, not multiple!");
+ else if (!(flags & PATH_MATCH_KINDS_MASK))
+ BUG("path_match_flags() must get at least one match kind!");
+
+ if (flags & PATH_MATCH_STARTS_WITH_DOT_SLASH &&
+ flags & PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH)
+ BUG("path_match_flags() must get one platform kind, not multiple!");
+ else if (!(flags & PATH_MATCH_PLATFORM_MASK))
+ BUG("path_match_flags() must get at least one platform kind!");
+
+ if (*p++ != '.')
+ return 0;
+ if (flags & PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH &&
+ *p++ != '.')
+ return 0;
+
+ if (flags & PATH_MATCH_NATIVE)
+ return is_dir_sep(*p);
+ else if (flags & PATH_MATCH_XPLATFORM)
+ return is_xplatform_dir_sep(*p);
+ BUG("unreachable");
+}
diff --git a/dir.h b/dir.h
index 83f46c0..7bc8620 100644
--- a/dir.h
+++ b/dir.h
@@ -495,6 +495,9 @@ int get_sparse_checkout_patterns(struct pattern_list *pl);
/* Remove the contents of path, but leave path itself. */
#define REMOVE_DIR_KEEP_TOPLEVEL 04
+/* Remove the_original_cwd too */
+#define REMOVE_DIR_PURGE_ORIGINAL_CWD 0x08
+
/*
* Remove path and its contents, recursively. flags is a combination
* of the above REMOVE_DIR_* constants. Return 0 on success.
@@ -504,7 +507,11 @@ int get_sparse_checkout_patterns(struct pattern_list *pl);
*/
int remove_dir_recursively(struct strbuf *path, int flag);
-/* tries to remove the path with empty directories along it, ignores ENOENT */
+/*
+ * Tries to remove the path, along with leading empty directories so long as
+ * those empty directories are not startup_info->original_cwd. Ignores
+ * ENOENT.
+ */
int remove_path(const char *path);
int fspathcmp(const char *a, const char *b);
@@ -571,4 +578,67 @@ void connect_work_tree_and_git_dir(const char *work_tree,
void relocate_gitdir(const char *path,
const char *old_git_dir,
const char *new_git_dir);
+
+/**
+ * The "enum path_matches_kind" determines how path_match_flags() will
+ * behave. The flags come in sets, and one (and only one) must be
+ * provided out of each "set":
+ *
+ * PATH_MATCH_NATIVE:
+ * Path separator is is_dir_sep()
+ * PATH_MATCH_XPLATFORM:
+ * Path separator is is_xplatform_dir_sep()
+ *
+ * Do we use is_dir_sep() to check for a directory separator
+ * (*_NATIVE), or do we always check for '/' or '\' (*_XPLATFORM). The
+ * "*_NATIVE" version on Windows is the same as "*_XPLATFORM",
+ * everywhere else "*_NATIVE" means "only /".
+ *
+ * PATH_MATCH_STARTS_WITH_DOT_SLASH:
+ * Match a path starting with "./"
+ * PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH:
+ * Match a path starting with "../"
+ *
+ * The "/" in the above is adjusted based on the "*_NATIVE" and
+ * "*_XPLATFORM" flags.
+ */
+enum path_match_flags {
+ PATH_MATCH_NATIVE = 1 << 0,
+ PATH_MATCH_XPLATFORM = 1 << 1,
+ PATH_MATCH_STARTS_WITH_DOT_SLASH = 1 << 2,
+ PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH = 1 << 3,
+};
+#define PATH_MATCH_KINDS_MASK (PATH_MATCH_STARTS_WITH_DOT_SLASH | \
+ PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH)
+#define PATH_MATCH_PLATFORM_MASK (PATH_MATCH_NATIVE | PATH_MATCH_XPLATFORM)
+
+/**
+ * path_match_flags() checks if a given "path" matches a given "enum
+ * path_match_flags" criteria.
+ */
+int path_match_flags(const char *const path, const enum path_match_flags f);
+
+/**
+ * starts_with_dot_slash_native(): convenience wrapper for
+ * path_match_flags() with PATH_MATCH_STARTS_WITH_DOT_SLASH and
+ * PATH_MATCH_NATIVE.
+ */
+static inline int starts_with_dot_slash_native(const char *const path)
+{
+ const enum path_match_flags what = PATH_MATCH_STARTS_WITH_DOT_SLASH;
+
+ return path_match_flags(path, what | PATH_MATCH_NATIVE);
+}
+
+/**
+ * starts_with_dot_slash_native(): convenience wrapper for
+ * path_match_flags() with PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH and
+ * PATH_MATCH_NATIVE.
+ */
+static inline int starts_with_dot_dot_slash_native(const char *const path)
+{
+ const enum path_match_flags what = PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH;
+
+ return path_match_flags(path, what | PATH_MATCH_NATIVE);
+}
#endif
diff --git a/editor.c b/editor.c
index fdd3eea..008c04f 100644
--- a/editor.c
+++ b/editor.c
@@ -1,6 +1,7 @@
#include "cache.h"
#include "config.h"
#include "strbuf.h"
+#include "strvec.h"
#include "run-command.h"
#include "sigchain.h"
@@ -55,7 +56,6 @@ static int launch_specified_editor(const char *editor, const char *path,
if (strcmp(editor, ":")) {
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_enabled(ADVICE_WAITING_FOR_EDITOR) && isatty(2);
@@ -77,10 +77,10 @@ static int launch_specified_editor(const char *editor, const char *path,
}
strbuf_realpath(&realpath, path, 1);
- args[1] = realpath.buf;
- p.argv = args;
- p.env = env;
+ strvec_pushl(&p.args, editor, realpath.buf, NULL);
+ if (env)
+ strvec_pushv(&p.env, (const char **)env);
p.use_shell = 1;
p.trace2_child_class = "editor";
if (start_command(&p) < 0) {
diff --git a/entry.c b/entry.c
index 9b0f968..1c9df62 100644
--- a/entry.c
+++ b/entry.c
@@ -82,11 +82,13 @@ static int create_file(const char *path, unsigned int mode)
return open(path, O_WRONLY | O_CREAT | O_EXCL, mode);
}
-void *read_blob_entry(const struct cache_entry *ce, unsigned long *size)
+void *read_blob_entry(const struct cache_entry *ce, size_t *size)
{
enum object_type type;
- void *blob_data = read_object_file(&ce->oid, &type, size);
+ unsigned long ul;
+ void *blob_data = read_object_file(&ce->oid, &type, &ul);
+ *size = ul;
if (blob_data) {
if (type == OBJ_BLOB)
return blob_data;
@@ -271,7 +273,7 @@ static int write_entry(struct cache_entry *ce, char *path, struct conv_attrs *ca
int fd, ret, fstat_done = 0;
char *new_blob;
struct strbuf buf = STRBUF_INIT;
- unsigned long size;
+ size_t size;
ssize_t wrote;
size_t newsize = 0;
struct stat st;
diff --git a/entry.h b/entry.h
index 2254c62..252fd24 100644
--- a/entry.h
+++ b/entry.h
@@ -52,7 +52,7 @@ int finish_delayed_checkout(struct checkout *state, int *nr_checkouts,
*/
void unlink_entry(const struct cache_entry *ce);
-void *read_blob_entry(const struct cache_entry *ce, unsigned long *size);
+void *read_blob_entry(const struct cache_entry *ce, size_t *size);
int fstat_checkout_output(int fd, const struct checkout *state, struct stat *st);
void update_ce_after_write(const struct checkout *state, struct cache_entry *ce,
struct stat *st);
diff --git a/environment.c b/environment.c
index 9da7f3c..b3296ce 100644
--- a/environment.c
+++ b/environment.c
@@ -17,6 +17,7 @@
#include "commit.h"
#include "strvec.h"
#include "object-store.h"
+#include "tmp-objdir.h"
#include "chdir-notify.h"
#include "shallow.h"
@@ -41,7 +42,10 @@ const char *git_attributes_file;
const char *git_hooks_path;
int zlib_compression_level = Z_BEST_SPEED;
int pack_compression_level = Z_DEFAULT_COMPRESSION;
-int fsync_object_files;
+int fsync_object_files = -1;
+int use_fsync = -1;
+enum fsync_method fsync_method = FSYNC_METHOD_DEFAULT;
+enum fsync_component fsync_components = FSYNC_COMPONENTS_DEFAULT;
size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
size_t delta_base_cache_limit = 96 * 1024 * 1024;
@@ -68,6 +72,7 @@ char *notes_ref_name;
int grafts_replace_parents = 1;
int core_apply_sparse_checkout;
int core_sparse_checkout_cone;
+int sparse_expect_files_outside_of_patterns;
int merge_log_config = -1;
int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
unsigned long pack_size_limit_cfg;
@@ -82,7 +87,6 @@ int protect_hfs = PROTECT_HFS_DEFAULT;
#define PROTECT_NTFS_DEFAULT 1
#endif
int protect_ntfs = PROTECT_NTFS_DEFAULT;
-const char *core_fsmonitor;
/*
* The character that begins a commented line in user-editable file
@@ -168,6 +172,10 @@ void setup_git_env(const char *git_dir)
args.graft_file = getenv_safe(&to_free, GRAFT_ENVIRONMENT);
args.index_file = getenv_safe(&to_free, INDEX_ENVIRONMENT);
args.alternate_db = getenv_safe(&to_free, ALTERNATE_DB_ENVIRONMENT);
+ if (getenv(GIT_QUARANTINE_ENVIRONMENT)) {
+ args.disable_ref_updates = 1;
+ }
+
repo_set_gitdir(the_repository, git_dir, &args);
strvec_clear(&to_free);
@@ -265,7 +273,7 @@ const char *get_git_work_tree(void)
return the_repository->worktree;
}
-char *get_object_directory(void)
+const char *get_object_directory(void)
{
if (!the_repository->objects->odb)
BUG("git environment hasn't been setup");
@@ -331,10 +339,14 @@ static void update_relative_gitdir(const char *name,
void *data)
{
char *path = reparent_relative_path(old_cwd, new_cwd, get_git_dir());
+ struct tmp_objdir *tmp_objdir = tmp_objdir_unapply_primary_odb();
+
trace_printf_key(&trace_setup_key,
"setup: move $GIT_DIR to '%s'",
path);
set_git_dir_1(path);
+ if (tmp_objdir)
+ tmp_objdir_reapply_primary_odb(tmp_objdir, old_cwd, new_cwd);
free(path);
}
diff --git a/ewah/bitmap.c b/ewah/bitmap.c
index 38a47c4..ac61864 100644
--- a/ewah/bitmap.c
+++ b/ewah/bitmap.c
@@ -216,14 +216,9 @@ int bitmap_is_subset(struct bitmap *self, struct bitmap *other)
return 0;
}
-void bitmap_reset(struct bitmap *bitmap)
-{
- memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t));
-}
-
void bitmap_free(struct bitmap *bitmap)
{
- if (bitmap == NULL)
+ if (!bitmap)
return;
free(bitmap->words);
diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c
index 2a8c7c5..6fe48d3 100644
--- a/ewah/ewah_bitmap.c
+++ b/ewah/ewah_bitmap.c
@@ -451,7 +451,7 @@ struct ewah_bitmap *ewah_pool_new(void)
void ewah_pool_free(struct ewah_bitmap *self)
{
- if (self == NULL)
+ if (!self)
return;
if (bitmap_pool_size == BITMAP_POOL_MAX ||
diff --git a/ewah/ewok.h b/ewah/ewok.h
index 6692096..7eb8b9b 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -177,7 +177,6 @@ struct bitmap *bitmap_dup(const struct bitmap *src);
void bitmap_set(struct bitmap *self, size_t pos);
void bitmap_unset(struct bitmap *self, size_t pos);
int bitmap_get(struct bitmap *self, size_t pos);
-void bitmap_reset(struct bitmap *self);
void bitmap_free(struct bitmap *self);
int bitmap_equals(struct bitmap *self, struct bitmap *other);
int bitmap_is_subset(struct bitmap *self, struct bitmap *other);
diff --git a/fetch-negotiator.c b/fetch-negotiator.c
index 2733902..be38336 100644
--- a/fetch-negotiator.c
+++ b/fetch-negotiator.c
@@ -18,8 +18,13 @@ void fetch_negotiator_init(struct repository *r,
noop_negotiator_init(negotiator);
return;
- case FETCH_NEGOTIATION_DEFAULT:
+ case FETCH_NEGOTIATION_CONSECUTIVE:
default_negotiator_init(negotiator);
return;
}
}
+
+void fetch_negotiator_init_noop(struct fetch_negotiator *negotiator)
+{
+ noop_negotiator_init(negotiator);
+}
diff --git a/fetch-negotiator.h b/fetch-negotiator.h
index ea78868..e348905 100644
--- a/fetch-negotiator.h
+++ b/fetch-negotiator.h
@@ -53,7 +53,15 @@ struct fetch_negotiator {
void *data;
};
+/*
+ * Initialize a negotiator based on the repository settings.
+ */
void fetch_negotiator_init(struct repository *r,
struct fetch_negotiator *negotiator);
+/*
+ * Initialize a noop negotiator.
+ */
+void fetch_negotiator_init_noop(struct fetch_negotiator *negotiator);
+
#endif
diff --git a/fetch-pack.c b/fetch-pack.c
index a9604f3..cb6647d 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -25,6 +25,7 @@
#include "shallow.h"
#include "commit-reach.h"
#include "commit-graph.h"
+#include "sigchain.h"
static int transfer_unpack_limit = -1;
static int fetch_unpack_limit = -1;
@@ -114,11 +115,12 @@ static void for_each_cached_alternate(struct fetch_negotiator *negotiator,
cb(negotiator, cache.items[i]);
}
-static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
- int mark_tags_complete)
+static struct commit *deref_without_lazy_fetch_extended(const struct object_id *oid,
+ int mark_tags_complete,
+ enum object_type *type,
+ unsigned int oi_flags)
{
- enum object_type type;
- struct object_info info = { .typep = &type };
+ struct object_info info = { .typep = type };
struct commit *commit;
commit = lookup_commit_in_graph(the_repository, oid);
@@ -127,9 +129,9 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
while (1) {
if (oid_object_info_extended(the_repository, oid, &info,
- OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK))
+ oi_flags))
return NULL;
- if (type == OBJ_TAG) {
+ if (*type == OBJ_TAG) {
struct tag *tag = (struct tag *)
parse_object(the_repository, oid);
@@ -143,7 +145,7 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
}
}
- if (type == OBJ_COMMIT) {
+ if (*type == OBJ_COMMIT) {
struct commit *commit = lookup_commit(the_repository, oid);
if (!commit || repo_parse_commit(the_repository, commit))
return NULL;
@@ -153,6 +155,16 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
return NULL;
}
+
+static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
+ int mark_tags_complete)
+{
+ enum object_type type;
+ unsigned flags = OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK;
+ return deref_without_lazy_fetch_extended(oid, mark_tags_complete,
+ &type, flags);
+}
+
static int rev_list_insert_ref(struct fetch_negotiator *negotiator,
const struct object_id *oid)
{
@@ -296,7 +308,7 @@ static int find_common(struct fetch_negotiator *negotiator,
struct packet_reader reader;
if (args->stateless_rpc && multi_ack == 1)
- die(_("--stateless-rpc requires multi_ack_detailed"));
+ die(_("the option '%s' requires '%s'"), "--stateless-rpc", "multi_ack_detailed");
packet_reader_init(&reader, fd[0], NULL, 0,
PACKET_READ_CHOMP_NEWLINE |
@@ -311,19 +323,21 @@ static int find_common(struct fetch_negotiator *negotiator,
const char *remote_hex;
struct object *o;
- /*
- * If that object is complete (i.e. it is an ancestor of a
- * local ref), we tell them we have it but do not have to
- * tell them about its ancestors, which they already know
- * about.
- *
- * We use lookup_object here because we are only
- * interested in the case we *know* the object is
- * reachable and we have already scanned it.
- */
- if (((o = lookup_object(the_repository, remote)) != NULL) &&
- (o->flags & COMPLETE)) {
- continue;
+ if (!args->refetch) {
+ /*
+ * If that object is complete (i.e. it is an ancestor of a
+ * local ref), we tell them we have it but do not have to
+ * tell them about its ancestors, which they already know
+ * about.
+ *
+ * We use lookup_object here because we are only
+ * interested in the case we *know* the object is
+ * reachable and we have already scanned it.
+ */
+ if (((o = lookup_object(the_repository, remote)) != NULL) &&
+ (o->flags & COMPLETE)) {
+ continue;
+ }
}
remote_hex = oid_to_hex(remote);
@@ -691,30 +705,37 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
int old_save_commit_buffer = save_commit_buffer;
timestamp_t cutoff = 0;
+ if (args->refetch)
+ return;
+
save_commit_buffer = 0;
trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
for (ref = *refs; ref; ref = ref->next) {
- struct object *o;
+ struct commit *commit;
- if (!has_object_file_with_flags(&ref->old_oid,
+ commit = lookup_commit_in_graph(the_repository, &ref->old_oid);
+ if (!commit) {
+ struct object *o;
+
+ if (!has_object_file_with_flags(&ref->old_oid,
OBJECT_INFO_QUICK |
- OBJECT_INFO_SKIP_FETCH_OBJECT))
- continue;
- o = parse_object(the_repository, &ref->old_oid);
- if (!o)
- continue;
+ OBJECT_INFO_SKIP_FETCH_OBJECT))
+ continue;
+ o = parse_object(the_repository, &ref->old_oid);
+ if (!o || o->type != OBJ_COMMIT)
+ continue;
+
+ commit = (struct commit *)o;
+ }
/*
* We already have it -- which may mean that we were
* in sync with the other side at some time after
* that (it is OK if we guess wrong here).
*/
- if (o->type == OBJ_COMMIT) {
- struct commit *commit = (struct commit *)o;
- if (!cutoff || cutoff < commit->date)
- cutoff = commit->date;
- }
+ if (!cutoff || cutoff < commit->date)
+ cutoff = commit->date;
}
trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
@@ -826,6 +847,16 @@ static void parse_gitmodules_oids(int fd, struct oidset *gitmodules_oids)
} while (1);
}
+static void add_index_pack_keep_option(struct strvec *args)
+{
+ char hostname[HOST_NAME_MAX + 1];
+
+ if (xgethostname(hostname, sizeof(hostname)))
+ xsnprintf(hostname, sizeof(hostname), "localhost");
+ strvec_pushf(args, "--keep=fetch-pack %"PRIuMAX " on %s",
+ (uintmax_t)getpid(), hostname);
+}
+
/*
* If packfile URIs were provided, pass a non-NULL pointer to index_pack_args.
* The strings to pass as the --index-pack-arg arguments to http-fetch will be
@@ -895,14 +926,8 @@ static int get_pack(struct fetch_pack_args *args,
strvec_push(&cmd.args, "-v");
if (args->use_thin_pack)
strvec_push(&cmd.args, "--fix-thin");
- if ((do_keep || index_pack_args) && (args->lock_pack || unpack_limit)) {
- char hostname[HOST_NAME_MAX + 1];
- if (xgethostname(hostname, sizeof(hostname)))
- xsnprintf(hostname, sizeof(hostname), "localhost");
- strvec_pushf(&cmd.args,
- "--keep=fetch-pack %"PRIuMAX " on %s",
- (uintmax_t)getpid(), hostname);
- }
+ if ((do_keep || index_pack_args) && (args->lock_pack || unpack_limit))
+ add_index_pack_keep_option(&cmd.args);
if (!index_pack_args && args->check_self_contained_and_connected)
strvec_push(&cmd.args, "--check-self-contained-and-connected");
else
@@ -956,6 +981,8 @@ static int get_pack(struct fetch_pack_args *args,
strvec_push(index_pack_args, cmd.args.v[i]);
}
+ sigchain_push(SIGPIPE, SIG_IGN);
+
cmd.in = demux.out;
cmd.git_cmd = 1;
if (start_command(&cmd))
@@ -986,6 +1013,8 @@ static int get_pack(struct fetch_pack_args *args,
if (use_sideband && finish_async(&demux))
die(_("error in sideband demultiplexer"));
+ sigchain_pop(SIGPIPE);
+
/*
* Now that index-pack has succeeded, write the promisor file using the
* obtained .keep filename if necessary
@@ -1019,7 +1048,11 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
struct fetch_negotiator *negotiator;
negotiator = &negotiator_alloc;
- fetch_negotiator_init(r, negotiator);
+ if (args->refetch) {
+ fetch_negotiator_init_noop(negotiator);
+ } else {
+ fetch_negotiator_init(r, negotiator);
+ }
sort_ref_list(&ref, ref_compare_name);
QSORT(sought, nr_sought, cmp_ref_by_name);
@@ -1112,7 +1145,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
mark_complete_and_common_ref(negotiator, args, &ref);
filter_refs(args, &ref, sought, nr_sought);
- if (everything_local(args, &ref)) {
+ if (!args->refetch && everything_local(args, &ref)) {
packet_flush(fd[1]);
goto all_done;
}
@@ -1352,17 +1385,20 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
static int process_section_header(struct packet_reader *reader,
const char *section, int peek)
{
- int ret;
+ int ret = 0;
- if (packet_reader_peek(reader) != PACKET_READ_NORMAL)
- die(_("error reading section header '%s'"), section);
-
- ret = !strcmp(reader->line, section);
+ if (packet_reader_peek(reader) == PACKET_READ_NORMAL &&
+ !strcmp(reader->line, section))
+ ret = 1;
if (!peek) {
- if (!ret)
- die(_("expected '%s', received '%s'"),
- section, reader->line);
+ if (!ret) {
+ if (reader->line)
+ die(_("expected '%s', received '%s'"),
+ section, reader->line);
+ else
+ die(_("expected '%s'"), section);
+ }
packet_reader_read(reader);
}
@@ -1410,9 +1446,17 @@ static int process_ack(struct fetch_negotiator *negotiator,
* otherwise.
*/
if (*received_ready && reader->status != PACKET_READ_DELIM)
- die(_("expected packfile to be sent after 'ready'"));
+ /*
+ * TRANSLATORS: The parameter will be 'ready', a protocol
+ * keyword.
+ */
+ die(_("expected packfile to be sent after '%s'"), "ready");
if (!*received_ready && reader->status != PACKET_READ_FLUSH)
- die(_("expected no other sections to be sent after no 'ready'"));
+ /*
+ * TRANSLATORS: The parameter will be 'ready', a protocol
+ * keyword.
+ */
+ die(_("expected no other sections to be sent after no '%s'"), "ready");
return 0;
}
@@ -1570,7 +1614,10 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
struct strvec index_pack_args = STRVEC_INIT;
negotiator = &negotiator_alloc;
- fetch_negotiator_init(r, negotiator);
+ if (args->refetch)
+ fetch_negotiator_init_noop(negotiator);
+ else
+ fetch_negotiator_init(r, negotiator);
packet_reader_init(&reader, fd[0], NULL, 0,
PACKET_READ_CHOMP_NEWLINE |
@@ -1596,7 +1643,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
/* Filter 'ref' by 'sought' and those that aren't local */
mark_complete_and_common_ref(negotiator, args, &ref);
filter_refs(args, &ref, sought, nr_sought);
- if (everything_local(args, &ref))
+ if (!args->refetch && everything_local(args, &ref))
state = FETCH_DONE;
else
state = FETCH_SEND_REQUEST;
@@ -1653,8 +1700,13 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
receive_wanted_refs(&reader, sought, nr_sought);
/* get the pack(s) */
+ if (git_env_bool("GIT_TRACE_REDACT", 1))
+ reader.options |= PACKET_READ_REDACT_URI_PATH;
if (process_section_header(&reader, "packfile-uris", 1))
receive_packfile_uris(&reader, &packfile_uris);
+ /* We don't expect more URIs. Reset to avoid expensive URI check. */
+ reader.options &= ~PACKET_READ_REDACT_URI_PATH;
+
process_section_header(&reader, "packfile", 0);
/*
diff --git a/fetch-pack.h b/fetch-pack.h
index 7f94a2a..8c7752f 100644
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -42,6 +42,7 @@ struct fetch_pack_args {
unsigned update_shallow:1;
unsigned reject_shallow_remote:1;
unsigned deepen:1;
+ unsigned refetch:1;
/*
* Indicate that the remote of this request is a promisor remote. The
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index b969dc6..f48f44f 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -9,6 +9,7 @@
#include "branch.h"
#include "fmt-merge-msg.h"
#include "commit-reach.h"
+#include "gpg-interface.h"
static int use_branch_desc;
static int suppress_dest_pattern_seen;
@@ -16,6 +17,8 @@ static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP;
int fmt_merge_msg_config(const char *key, const char *value, void *cb)
{
+ int status = 0;
+
if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) {
int is_bool;
merge_log_config = git_config_bool_or_int(key, value, &is_bool);
@@ -34,6 +37,9 @@ int fmt_merge_msg_config(const char *key, const char *value, void *cb)
string_list_append(&suppress_dest_patterns, value);
suppress_dest_pattern_seen = 1;
} else {
+ status = git_gpg_config(key, value, NULL);
+ if (status)
+ return status;
return git_default_config(key, value, cb);
}
return 0;
@@ -527,14 +533,14 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
else {
buf = payload.buf;
len = payload.len;
- if (check_signature(payload.buf, payload.len, sig.buf,
- sig.len, &sigc) &&
- !sigc.gpg_output)
+ sigc.payload_type = SIGNATURE_PAYLOAD_TAG;
+ sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
+ if (check_signature(&sigc, sig.buf, sig.len) &&
+ !sigc.output)
strbuf_addstr(&sig, "gpg verification failed.\n");
else
- strbuf_addstr(&sig, sigc.gpg_output);
+ strbuf_addstr(&sig, sigc.output);
}
- signature_check_clear(&sigc);
if (!tag_number++) {
fmt_tag_signature(&tagbuf, &sig, buf, len);
@@ -558,6 +564,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
}
strbuf_release(&payload);
strbuf_release(&sig);
+ signature_check_clear(&sigc);
next:
free(origbuf);
}
@@ -643,12 +650,15 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
memset(&merge_parents, 0, sizeof(merge_parents));
- /* get current branch */
+ /* learn the commit that we merge into and the current branch name */
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/"))
+
+ if (opts->into_name)
+ current_branch = opts->into_name;
+ else if (starts_with(current_branch, "refs/heads/"))
current_branch += 11;
find_merge_parents(&merge_parents, in, &head_oid);
@@ -689,6 +699,7 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
shortlog(origins.items[i].string,
origins.items[i].util,
head, &rev, opts, out);
+ release_revisions(&rev);
}
strbuf_complete_line(out);
diff --git a/fmt-merge-msg.h b/fmt-merge-msg.h
index f2ab0e0..9905404 100644
--- a/fmt-merge-msg.h
+++ b/fmt-merge-msg.h
@@ -9,6 +9,7 @@ struct fmt_merge_msg_opts {
unsigned add_title:1,
credit_people:1;
int shortlog_len;
+ const char *into_name;
};
extern int merge_log_config;
diff --git a/fsck.c b/fsck.c
index 3ec500d..dd4822b 100644
--- a/fsck.c
+++ b/fsck.c
@@ -975,27 +975,16 @@ int fsck_tag_standalone(const struct object_id *oid, const char *buffer,
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)
+static int starts_with_dot_slash(const char *const path)
{
- return str[0] == '.' && (str[1] == '/' || str[1] == '\\');
+ return path_match_flags(path, PATH_MATCH_STARTS_WITH_DOT_SLASH |
+ PATH_MATCH_XPLATFORM);
}
-/*
- * 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)
+static int starts_with_dot_dot_slash(const char *const path)
{
- return str[0] == '.' && starts_with_dot_slash(str + 1);
+ return path_match_flags(path, PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH |
+ PATH_MATCH_XPLATFORM);
}
static int submodule_url_is_relative(const char *url)
diff --git a/fsmonitor--daemon.h b/fsmonitor--daemon.h
new file mode 100644
index 0000000..bd09fff
--- /dev/null
+++ b/fsmonitor--daemon.h
@@ -0,0 +1,166 @@
+#ifndef FSMONITOR_DAEMON_H
+#define FSMONITOR_DAEMON_H
+
+#ifdef HAVE_FSMONITOR_DAEMON_BACKEND
+
+#include "cache.h"
+#include "dir.h"
+#include "run-command.h"
+#include "simple-ipc.h"
+#include "thread-utils.h"
+
+struct fsmonitor_batch;
+struct fsmonitor_token_data;
+
+/*
+ * Create a new batch of path(s). The returned batch is considered
+ * private and not linked into the fsmonitor daemon state. The caller
+ * should fill this batch with one or more paths and then publish it.
+ */
+struct fsmonitor_batch *fsmonitor_batch__new(void);
+
+/*
+ * Free the list of batches starting with this one.
+ */
+void fsmonitor_batch__free_list(struct fsmonitor_batch *batch);
+
+/*
+ * Add this path to this batch of modified files.
+ *
+ * The batch should be private and NOT (yet) linked into the fsmonitor
+ * daemon state and therefore not yet visible to worker threads and so
+ * no locking is required.
+ */
+void fsmonitor_batch__add_path(struct fsmonitor_batch *batch, const char *path);
+
+struct fsmonitor_daemon_backend_data; /* opaque platform-specific data */
+
+struct fsmonitor_daemon_state {
+ pthread_t listener_thread;
+ pthread_mutex_t main_lock;
+
+ struct strbuf path_worktree_watch;
+ struct strbuf path_gitdir_watch;
+ int nr_paths_watching;
+
+ struct fsmonitor_token_data *current_token_data;
+
+ struct strbuf path_cookie_prefix;
+ pthread_cond_t cookies_cond;
+ int cookie_seq;
+ struct hashmap cookies;
+
+ int error_code;
+ struct fsmonitor_daemon_backend_data *backend_data;
+
+ struct ipc_server_data *ipc_server_data;
+};
+
+/*
+ * Pathname classifications.
+ *
+ * The daemon classifies the pathnames that it receives from file
+ * system notification events into the following categories and uses
+ * that to decide whether clients are told about them. (And to watch
+ * for file system synchronization events.)
+ *
+ * The daemon only collects and reports on the set of modified paths
+ * within the working directory (proper).
+ *
+ * The client should only care about paths within the working
+ * directory proper (inside the working directory and not ".git" nor
+ * inside of ".git/"). That is, the client has read the index and is
+ * asking for a list of any paths in the working directory that have
+ * been modified since the last token. The client does not care about
+ * file system changes within the ".git/" directory (such as new loose
+ * objects or packfiles). So the client will only receive paths that
+ * are classified as IS_WORKDIR_PATH.
+ *
+ * Note that ".git" is usually a directory and is therefore inside
+ * the cone of the FS watch that we have on the working directory root,
+ * so we will also get FS events for disk activity on and within ".git/"
+ * that we need to respond to or filter from the client.
+ *
+ * But Git also allows ".git" to be a *file* that points to a GITDIR
+ * outside of the working directory. When this happens, we need to
+ * create FS watches on both the working directory root *and* on the
+ * (external) GITDIR root. (The latter is required because we put
+ * cookie files inside it and use them to sync with the FS event
+ * stream.)
+ *
+ * Note that in the context of this discussion, I'm using "GITDIR"
+ * to only mean an external GITDIR referenced by a ".git" file.
+ *
+ * The platform FS event backends will receive watch-specific
+ * relative paths (except for those OS's that always emit absolute
+ * paths). We use the following enum and routines to classify each
+ * path so that we know how to handle it. There is a slight asymmetry
+ * here because ".git/" is inside the working directory and the
+ * (external) GITDIR is not, and therefore how we handle events may
+ * vary slightly, so I have different enums for "IS...DOT_GIT..." and
+ * "IS...GITDIR...".
+ *
+ * The daemon uses the IS_DOT_GIT and IS_GITDIR internally to mean the
+ * exact ".git" file/directory or GITDIR directory. If the daemon
+ * receives a delete event for either of these paths, it will
+ * automatically shutdown, for example.
+ *
+ * Note that the daemon DOES NOT explicitly watch nor special case the
+ * index. The daemon does not read the index nor have any internal
+ * index-relative state, so there are no "IS...INDEX..." enum values.
+ */
+enum fsmonitor_path_type {
+ IS_WORKDIR_PATH = 0,
+
+ IS_DOT_GIT,
+ IS_INSIDE_DOT_GIT,
+ IS_INSIDE_DOT_GIT_WITH_COOKIE_PREFIX,
+
+ IS_GITDIR,
+ IS_INSIDE_GITDIR,
+ IS_INSIDE_GITDIR_WITH_COOKIE_PREFIX,
+
+ IS_OUTSIDE_CONE,
+};
+
+/*
+ * Classify a pathname relative to the root of the working directory.
+ */
+enum fsmonitor_path_type fsmonitor_classify_path_workdir_relative(
+ const char *relative_path);
+
+/*
+ * Classify a pathname relative to a <gitdir> that is external to the
+ * worktree directory.
+ */
+enum fsmonitor_path_type fsmonitor_classify_path_gitdir_relative(
+ const char *relative_path);
+
+/*
+ * Classify an absolute pathname received from a filesystem event.
+ */
+enum fsmonitor_path_type fsmonitor_classify_path_absolute(
+ struct fsmonitor_daemon_state *state,
+ const char *path);
+
+/*
+ * Prepend the this batch of path(s) onto the list of batches associated
+ * with the current token. This makes the batch visible to worker threads.
+ *
+ * The caller no longer owns the batch and must not free it.
+ *
+ * Wake up the client threads waiting on these cookies.
+ */
+void fsmonitor_publish(struct fsmonitor_daemon_state *state,
+ struct fsmonitor_batch *batch,
+ const struct string_list *cookie_names);
+
+/*
+ * If the platform-specific layer loses sync with the filesystem,
+ * it should call this to invalidate cached data and abort waiting
+ * threads.
+ */
+void fsmonitor_force_resync(struct fsmonitor_daemon_state *state);
+
+#endif /* HAVE_FSMONITOR_DAEMON_BACKEND */
+#endif /* FSMONITOR_DAEMON_H */
diff --git a/fsmonitor-ipc.c b/fsmonitor-ipc.c
new file mode 100644
index 0000000..789e739
--- /dev/null
+++ b/fsmonitor-ipc.c
@@ -0,0 +1,171 @@
+#include "cache.h"
+#include "fsmonitor.h"
+#include "simple-ipc.h"
+#include "fsmonitor-ipc.h"
+#include "run-command.h"
+#include "strbuf.h"
+#include "trace2.h"
+
+#ifndef HAVE_FSMONITOR_DAEMON_BACKEND
+
+/*
+ * A trivial implementation of the fsmonitor_ipc__ API for unsupported
+ * platforms.
+ */
+
+int fsmonitor_ipc__is_supported(void)
+{
+ return 0;
+}
+
+const char *fsmonitor_ipc__get_path(void)
+{
+ return NULL;
+}
+
+enum ipc_active_state fsmonitor_ipc__get_state(void)
+{
+ return IPC_STATE__OTHER_ERROR;
+}
+
+int fsmonitor_ipc__send_query(const char *since_token,
+ struct strbuf *answer)
+{
+ return -1;
+}
+
+int fsmonitor_ipc__send_command(const char *command,
+ struct strbuf *answer)
+{
+ return -1;
+}
+
+#else
+
+int fsmonitor_ipc__is_supported(void)
+{
+ return 1;
+}
+
+GIT_PATH_FUNC(fsmonitor_ipc__get_path, "fsmonitor--daemon.ipc")
+
+enum ipc_active_state fsmonitor_ipc__get_state(void)
+{
+ return ipc_get_active_state(fsmonitor_ipc__get_path());
+}
+
+static int spawn_daemon(void)
+{
+ const char *args[] = { "fsmonitor--daemon", "start", NULL };
+
+ return run_command_v_opt_tr2(args, RUN_COMMAND_NO_STDIN | RUN_GIT_CMD,
+ "fsmonitor");
+}
+
+int fsmonitor_ipc__send_query(const char *since_token,
+ struct strbuf *answer)
+{
+ int ret = -1;
+ int tried_to_spawn = 0;
+ enum ipc_active_state state = IPC_STATE__OTHER_ERROR;
+ struct ipc_client_connection *connection = NULL;
+ struct ipc_client_connect_options options
+ = IPC_CLIENT_CONNECT_OPTIONS_INIT;
+ const char *tok = since_token ? since_token : "";
+ size_t tok_len = since_token ? strlen(since_token) : 0;
+
+ options.wait_if_busy = 1;
+ options.wait_if_not_found = 0;
+
+ trace2_region_enter("fsm_client", "query", NULL);
+ trace2_data_string("fsm_client", NULL, "query/command", tok);
+
+try_again:
+ state = ipc_client_try_connect(fsmonitor_ipc__get_path(), &options,
+ &connection);
+
+ switch (state) {
+ case IPC_STATE__LISTENING:
+ ret = ipc_client_send_command_to_connection(
+ connection, tok, tok_len, answer);
+ ipc_client_close_connection(connection);
+
+ trace2_data_intmax("fsm_client", NULL,
+ "query/response-length", answer->len);
+ goto done;
+
+ case IPC_STATE__NOT_LISTENING:
+ case IPC_STATE__PATH_NOT_FOUND:
+ if (tried_to_spawn)
+ goto done;
+
+ tried_to_spawn++;
+ if (spawn_daemon())
+ goto done;
+
+ /*
+ * Try again, but this time give the daemon a chance to
+ * actually create the pipe/socket.
+ *
+ * Granted, the daemon just started so it can't possibly have
+ * any FS cached yet, so we'll always get a trivial answer.
+ * BUT the answer should include a new token that can serve
+ * as the basis for subsequent requests.
+ */
+ options.wait_if_not_found = 1;
+ goto try_again;
+
+ case IPC_STATE__INVALID_PATH:
+ ret = error(_("fsmonitor_ipc__send_query: invalid path '%s'"),
+ fsmonitor_ipc__get_path());
+ goto done;
+
+ case IPC_STATE__OTHER_ERROR:
+ default:
+ ret = error(_("fsmonitor_ipc__send_query: unspecified error on '%s'"),
+ fsmonitor_ipc__get_path());
+ goto done;
+ }
+
+done:
+ trace2_region_leave("fsm_client", "query", NULL);
+
+ return ret;
+}
+
+int fsmonitor_ipc__send_command(const char *command,
+ struct strbuf *answer)
+{
+ struct ipc_client_connection *connection = NULL;
+ struct ipc_client_connect_options options
+ = IPC_CLIENT_CONNECT_OPTIONS_INIT;
+ int ret;
+ enum ipc_active_state state;
+ const char *c = command ? command : "";
+ size_t c_len = command ? strlen(command) : 0;
+
+ strbuf_reset(answer);
+
+ options.wait_if_busy = 1;
+ options.wait_if_not_found = 0;
+
+ state = ipc_client_try_connect(fsmonitor_ipc__get_path(), &options,
+ &connection);
+ if (state != IPC_STATE__LISTENING) {
+ die(_("fsmonitor--daemon is not running"));
+ return -1;
+ }
+
+ ret = ipc_client_send_command_to_connection(connection, c, c_len,
+ answer);
+ ipc_client_close_connection(connection);
+
+ if (ret == -1) {
+ die(_("could not send '%s' command to fsmonitor--daemon"), c);
+ return -1;
+ }
+
+ return 0;
+}
+
+#endif
diff --git a/fsmonitor-ipc.h b/fsmonitor-ipc.h
new file mode 100644
index 0000000..b6a7067
--- /dev/null
+++ b/fsmonitor-ipc.h
@@ -0,0 +1,48 @@
+#ifndef FSMONITOR_IPC_H
+#define FSMONITOR_IPC_H
+
+#include "simple-ipc.h"
+
+/*
+ * Returns true if built-in file system monitor daemon is defined
+ * for this platform.
+ */
+int fsmonitor_ipc__is_supported(void);
+
+/*
+ * Returns the pathname to the IPC named pipe or Unix domain socket
+ * where a `git-fsmonitor--daemon` process will listen. This is a
+ * per-worktree value.
+ *
+ * Returns NULL if the daemon is not supported on this platform.
+ */
+const char *fsmonitor_ipc__get_path(void);
+
+/*
+ * Try to determine whether there is a `git-fsmonitor--daemon` process
+ * listening on the IPC pipe/socket.
+ */
+enum ipc_active_state fsmonitor_ipc__get_state(void);
+
+/*
+ * Connect to a `git-fsmonitor--daemon` process via simple-ipc
+ * and ask for the set of changed files since the given token.
+ *
+ * Spawn a daemon process in the background if necessary.
+ *
+ * Returns -1 on error; 0 on success.
+ */
+int fsmonitor_ipc__send_query(const char *since_token,
+ struct strbuf *answer);
+
+/*
+ * Connect to a `git-fsmonitor--daemon` process via simple-ipc and
+ * send a command verb. If no daemon is available, we DO NOT try to
+ * start one.
+ *
+ * Returns -1 on error; 0 on success.
+ */
+int fsmonitor_ipc__send_command(const char *command,
+ struct strbuf *answer);
+
+#endif /* FSMONITOR_IPC_H */
diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c
new file mode 100644
index 0000000..757d230
--- /dev/null
+++ b/fsmonitor-settings.c
@@ -0,0 +1,114 @@
+#include "cache.h"
+#include "config.h"
+#include "repository.h"
+#include "fsmonitor-settings.h"
+
+/*
+ * We keep this structure defintion private and have getters
+ * for all fields so that we can lazy load it as needed.
+ */
+struct fsmonitor_settings {
+ enum fsmonitor_mode mode;
+ char *hook_path;
+};
+
+static void lookup_fsmonitor_settings(struct repository *r)
+{
+ struct fsmonitor_settings *s;
+ const char *const_str;
+ int bool_value;
+
+ if (r->settings.fsmonitor)
+ return;
+
+ CALLOC_ARRAY(s, 1);
+ s->mode = FSMONITOR_MODE_DISABLED;
+
+ r->settings.fsmonitor = s;
+
+ /*
+ * Overload the existing "core.fsmonitor" config setting (which
+ * has historically been either unset or a hook pathname) to
+ * now allow a boolean value to enable the builtin FSMonitor
+ * or to turn everything off. (This does imply that you can't
+ * use a hook script named "true" or "false", but that's OK.)
+ */
+ switch (repo_config_get_maybe_bool(r, "core.fsmonitor", &bool_value)) {
+
+ case 0: /* config value was set to <bool> */
+ if (bool_value)
+ fsm_settings__set_ipc(r);
+ return;
+
+ case 1: /* config value was unset */
+ const_str = getenv("GIT_TEST_FSMONITOR");
+ break;
+
+ case -1: /* config value set to an arbitrary string */
+ if (repo_config_get_pathname(r, "core.fsmonitor", &const_str))
+ return; /* should not happen */
+ break;
+
+ default: /* should not happen */
+ return;
+ }
+
+ if (!const_str || !*const_str)
+ return;
+
+ fsm_settings__set_hook(r, const_str);
+}
+
+enum fsmonitor_mode fsm_settings__get_mode(struct repository *r)
+{
+ if (!r)
+ r = the_repository;
+
+ lookup_fsmonitor_settings(r);
+
+ return r->settings.fsmonitor->mode;
+}
+
+const char *fsm_settings__get_hook_path(struct repository *r)
+{
+ if (!r)
+ r = the_repository;
+
+ lookup_fsmonitor_settings(r);
+
+ return r->settings.fsmonitor->hook_path;
+}
+
+void fsm_settings__set_ipc(struct repository *r)
+{
+ if (!r)
+ r = the_repository;
+
+ lookup_fsmonitor_settings(r);
+
+ r->settings.fsmonitor->mode = FSMONITOR_MODE_IPC;
+ FREE_AND_NULL(r->settings.fsmonitor->hook_path);
+}
+
+void fsm_settings__set_hook(struct repository *r, const char *path)
+{
+ if (!r)
+ r = the_repository;
+
+ lookup_fsmonitor_settings(r);
+
+ r->settings.fsmonitor->mode = FSMONITOR_MODE_HOOK;
+ FREE_AND_NULL(r->settings.fsmonitor->hook_path);
+ r->settings.fsmonitor->hook_path = strdup(path);
+}
+
+void fsm_settings__set_disabled(struct repository *r)
+{
+ if (!r)
+ r = the_repository;
+
+ lookup_fsmonitor_settings(r);
+
+ r->settings.fsmonitor->mode = FSMONITOR_MODE_DISABLED;
+ FREE_AND_NULL(r->settings.fsmonitor->hook_path);
+}
diff --git a/fsmonitor-settings.h b/fsmonitor-settings.h
new file mode 100644
index 0000000..a4c5d7b
--- /dev/null
+++ b/fsmonitor-settings.h
@@ -0,0 +1,21 @@
+#ifndef FSMONITOR_SETTINGS_H
+#define FSMONITOR_SETTINGS_H
+
+struct repository;
+
+enum fsmonitor_mode {
+ FSMONITOR_MODE_DISABLED = 0,
+ FSMONITOR_MODE_HOOK = 1, /* core.fsmonitor=<hook_path> */
+ FSMONITOR_MODE_IPC = 2, /* core.fsmonitor=<true> */
+};
+
+void fsm_settings__set_ipc(struct repository *r);
+void fsm_settings__set_hook(struct repository *r, const char *path);
+void fsm_settings__set_disabled(struct repository *r);
+
+enum fsmonitor_mode fsm_settings__get_mode(struct repository *r);
+const char *fsm_settings__get_hook_path(struct repository *r);
+
+struct fsmonitor_settings;
+
+#endif /* FSMONITOR_SETTINGS_H */
diff --git a/fsmonitor.c b/fsmonitor.c
index ab9bfc6..292a674 100644
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -3,6 +3,7 @@
#include "dir.h"
#include "ewah/ewok.h"
#include "fsmonitor.h"
+#include "fsmonitor-ipc.h"
#include "run-command.h"
#include "strbuf.h"
@@ -148,15 +149,18 @@ void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate)
/*
* Call the query-fsmonitor hook passing the last update token of the saved results.
*/
-static int query_fsmonitor(int version, const char *last_update, struct strbuf *query_result)
+static int query_fsmonitor_hook(struct repository *r,
+ int version,
+ const char *last_update,
+ struct strbuf *query_result)
{
struct child_process cp = CHILD_PROCESS_INIT;
int result;
- if (!core_fsmonitor)
+ if (fsm_settings__get_mode(r) != FSMONITOR_MODE_HOOK)
return -1;
- strvec_push(&cp.args, core_fsmonitor);
+ strvec_push(&cp.args, fsm_settings__get_hook_path(r));
strvec_pushf(&cp.args, "%d", version);
strvec_pushf(&cp.args, "%s", last_update);
cp.use_shell = 1;
@@ -168,29 +172,15 @@ static int query_fsmonitor(int version, const char *last_update, struct strbuf *
if (result)
trace2_data_intmax("fsm_hook", NULL, "query/failed", result);
- else {
+ else
trace2_data_intmax("fsm_hook", NULL, "query/response-length",
query_result->len);
- if (fsmonitor_is_trivial_response(query_result))
- trace2_data_intmax("fsm_hook", NULL,
- "query/trivial-response", 1);
- }
-
trace2_region_leave("fsm_hook", "query", NULL);
return result;
}
-int fsmonitor_is_trivial_response(const struct strbuf *query_result)
-{
- static char trivial_response[3] = { '\0', '/', '\0' };
-
- return query_result->len >= 3 &&
- !memcmp(trivial_response,
- &query_result->buf[query_result->len - 3], 3);
-}
-
static void fsmonitor_refresh_callback(struct index_state *istate, char *name)
{
int i, len = strlen(name);
@@ -229,6 +219,43 @@ static void fsmonitor_refresh_callback(struct index_state *istate, char *name)
untracked_cache_invalidate_path(istate, name, 0);
}
+/*
+ * The number of pathnames that we need to receive from FSMonitor
+ * before we force the index to be updated.
+ *
+ * Note that any pathname within the set of received paths MAY cause
+ * cache-entry or istate flag bits to be updated and thus cause the
+ * index to be updated on disk.
+ *
+ * However, the response may contain many paths (such as ignored
+ * paths) that will not update any flag bits. And thus not force the
+ * index to be updated. (This is fine and normal.) It also means
+ * that the token will not be updated in the FSMonitor index
+ * extension. So the next Git command will find the same token in the
+ * index, make the same token-relative request, and receive the same
+ * response (plus any newly changed paths). If this response is large
+ * (and continues to grow), performance could be impacted.
+ *
+ * For example, if the user runs a build and it writes 100K object
+ * files but doesn't modify any source files, the index would not need
+ * to be updated. The FSMonitor response (after the build and
+ * relative to a pre-build token) might be 5MB. Each subsequent Git
+ * command will receive that same 100K/5MB response until something
+ * causes the index to be updated. And `refresh_fsmonitor()` will
+ * have to iterate over those 100K paths each time.
+ *
+ * Performance could be improved if we optionally force update the
+ * index after a very large response and get an updated token into
+ * the FSMonitor index extension. This should allow subsequent
+ * commands to get smaller and more current responses.
+ *
+ * The value chosen here does not need to be precise. The index
+ * will be updated automatically the first time the user touches
+ * a tracked file and causes a command like `git status` to
+ * update an mtime to be updated and/or set a flag bit.
+ */
+static int fsmonitor_force_update_threshold = 100;
+
void refresh_fsmonitor(struct index_state *istate)
{
struct strbuf query_result = STRBUF_INIT;
@@ -238,17 +265,62 @@ void refresh_fsmonitor(struct index_state *istate)
struct strbuf last_update_token = STRBUF_INIT;
char *buf;
unsigned int i;
+ int is_trivial = 0;
+ struct repository *r = istate->repo ? istate->repo : the_repository;
+ enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
- if (!core_fsmonitor || istate->fsmonitor_has_run_once)
+ if (fsm_mode <= FSMONITOR_MODE_DISABLED ||
+ istate->fsmonitor_has_run_once)
return;
- hook_version = fsmonitor_hook_version();
-
istate->fsmonitor_has_run_once = 1;
trace_printf_key(&trace_fsmonitor, "refresh fsmonitor");
+
+ if (fsm_mode == FSMONITOR_MODE_IPC) {
+ query_success = !fsmonitor_ipc__send_query(
+ istate->fsmonitor_last_update ?
+ istate->fsmonitor_last_update : "builtin:fake",
+ &query_result);
+ if (query_success) {
+ /*
+ * The response contains a series of nul terminated
+ * strings. The first is the new token.
+ *
+ * Use `char *buf` as an interlude to trick the CI
+ * static analysis to let us use `strbuf_addstr()`
+ * here (and only copy the token) rather than
+ * `strbuf_addbuf()`.
+ */
+ buf = query_result.buf;
+ strbuf_addstr(&last_update_token, buf);
+ bol = last_update_token.len + 1;
+ is_trivial = query_result.buf[bol] == '/';
+ if (is_trivial)
+ trace2_data_intmax("fsm_client", NULL,
+ "query/trivial-response", 1);
+ } else {
+ /*
+ * The builtin daemon is not available on this
+ * platform -OR- we failed to get a response.
+ *
+ * Generate a fake token (rather than a V1
+ * timestamp) for the index extension. (If
+ * they switch back to the hook API, we don't
+ * want ambiguous state.)
+ */
+ strbuf_addstr(&last_update_token, "builtin:fake");
+ }
+
+ goto apply_results;
+ }
+
+ assert(fsm_mode == FSMONITOR_MODE_HOOK);
+
+ hook_version = fsmonitor_hook_version();
+
/*
- * This could be racy so save the date/time now and query_fsmonitor
+ * This could be racy so save the date/time now and query_fsmonitor_hook
* should be inclusive to ensure we don't miss potential changes.
*/
last_update = getnanotime();
@@ -256,13 +328,14 @@ void refresh_fsmonitor(struct index_state *istate)
strbuf_addf(&last_update_token, "%"PRIu64"", last_update);
/*
- * If we have a last update token, call query_fsmonitor for the set of
+ * If we have a last update token, call query_fsmonitor_hook for the set of
* changes since that token, else assume everything is possibly dirty
* and check it all.
*/
if (istate->fsmonitor_last_update) {
if (hook_version == -1 || hook_version == HOOK_INTERFACE_VERSION2) {
- query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION2,
+ query_success = !query_fsmonitor_hook(
+ r, HOOK_INTERFACE_VERSION2,
istate->fsmonitor_last_update, &query_result);
if (query_success) {
@@ -283,6 +356,7 @@ void refresh_fsmonitor(struct index_state *istate)
query_success = 0;
} else {
bol = last_update_token.len + 1;
+ is_trivial = query_result.buf[bol] == '/';
}
} else if (hook_version < 0) {
hook_version = HOOK_INTERFACE_VERSION1;
@@ -292,37 +366,83 @@ void refresh_fsmonitor(struct index_state *istate)
}
if (hook_version == HOOK_INTERFACE_VERSION1) {
- query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION1,
+ query_success = !query_fsmonitor_hook(
+ r, HOOK_INTERFACE_VERSION1,
istate->fsmonitor_last_update, &query_result);
+ if (query_success)
+ is_trivial = query_result.buf[0] == '/';
}
- trace_performance_since(last_update, "fsmonitor process '%s'", core_fsmonitor);
- trace_printf_key(&trace_fsmonitor, "fsmonitor process '%s' returned %s",
- core_fsmonitor, query_success ? "success" : "failure");
+ if (is_trivial)
+ trace2_data_intmax("fsm_hook", NULL,
+ "query/trivial-response", 1);
+
+ trace_performance_since(last_update, "fsmonitor process '%s'",
+ fsm_settings__get_hook_path(r));
+ trace_printf_key(&trace_fsmonitor,
+ "fsmonitor process '%s' returned %s",
+ fsm_settings__get_hook_path(r),
+ query_success ? "success" : "failure");
}
- /* a fsmonitor process can return '/' to indicate all entries are invalid */
- if (query_success && query_result.buf[bol] != '/') {
- /* Mark all entries returned by the monitor as dirty */
+apply_results:
+ /*
+ * The response from FSMonitor (excluding the header token) is
+ * either:
+ *
+ * [a] a (possibly empty) list of NUL delimited relative
+ * pathnames of changed paths. This list can contain
+ * files and directories. Directories have a trailing
+ * slash.
+ *
+ * [b] a single '/' to indicate the provider had no
+ * information and that we should consider everything
+ * invalid. We call this a trivial response.
+ */
+ trace2_region_enter("fsmonitor", "apply_results", istate->repo);
+
+ if (query_success && !is_trivial) {
+ /*
+ * Mark all pathnames returned by the monitor as dirty.
+ *
+ * This updates both the cache-entries and the untracked-cache.
+ */
+ int count = 0;
+
buf = query_result.buf;
for (i = bol; i < query_result.len; i++) {
if (buf[i] != '\0')
continue;
fsmonitor_refresh_callback(istate, buf + bol);
bol = i + 1;
+ count++;
}
- if (bol < query_result.len)
+ if (bol < query_result.len) {
fsmonitor_refresh_callback(istate, buf + bol);
+ count++;
+ }
/* Now mark the untracked cache for fsmonitor usage */
if (istate->untracked)
istate->untracked->use_fsmonitor = 1;
- } else {
- /* We only want to run the post index changed hook if we've actually changed entries, so keep track
- * if we actually changed entries or not */
+ if (count > fsmonitor_force_update_threshold)
+ istate->cache_changed |= FSMONITOR_CHANGED;
+
+ trace2_data_intmax("fsmonitor", istate->repo, "apply_count",
+ count);
+
+ } else {
+ /*
+ * We failed to get a response or received a trivial response,
+ * so invalidate everything.
+ *
+ * We only want to run the post index changed hook if
+ * we've actually changed entries, so keep track if we
+ * actually changed entries or not.
+ */
int is_cache_changed = 0;
- /* Mark all entries invalid */
+
for (i = 0; i < istate->cache_nr; i++) {
if (istate->cache[i]->ce_flags & CE_FSMONITOR_VALID) {
is_cache_changed = 1;
@@ -330,13 +450,18 @@ void refresh_fsmonitor(struct index_state *istate)
}
}
- /* If we're going to check every file, ensure we save the results */
+ /*
+ * If we're going to check every file, ensure we save
+ * the results.
+ */
if (is_cache_changed)
istate->cache_changed |= FSMONITOR_CHANGED;
if (istate->untracked)
istate->untracked->use_fsmonitor = 0;
}
+ trace2_region_leave("fsmonitor", "apply_results", istate->repo);
+
strbuf_release(&query_result);
/* Now that we've updated istate, save the last_update_token */
@@ -411,7 +536,8 @@ void remove_fsmonitor(struct index_state *istate)
void tweak_fsmonitor(struct index_state *istate)
{
unsigned int i;
- int fsmonitor_enabled = git_config_get_fsmonitor();
+ int fsmonitor_enabled = (fsm_settings__get_mode(istate->repo)
+ > FSMONITOR_MODE_DISABLED);
if (istate->fsmonitor_dirty) {
if (fsmonitor_enabled) {
@@ -431,16 +557,8 @@ void tweak_fsmonitor(struct index_state *istate)
istate->fsmonitor_dirty = NULL;
}
- switch (fsmonitor_enabled) {
- case -1: /* keep: do nothing */
- break;
- case 0: /* false */
- remove_fsmonitor(istate);
- break;
- case 1: /* true */
+ if (fsmonitor_enabled)
add_fsmonitor(istate);
- break;
- default: /* unknown value: do nothing */
- break;
- }
+ else
+ remove_fsmonitor(istate);
}
diff --git a/fsmonitor.h b/fsmonitor.h
index f20d726..3f41f65 100644
--- a/fsmonitor.h
+++ b/fsmonitor.h
@@ -3,6 +3,7 @@
#include "cache.h"
#include "dir.h"
+#include "fsmonitor-settings.h"
extern struct trace_key trace_fsmonitor;
@@ -57,7 +58,10 @@ int fsmonitor_is_trivial_response(const struct strbuf *query_result);
*/
static inline int is_fsmonitor_refreshed(const struct index_state *istate)
{
- return !core_fsmonitor || istate->fsmonitor_has_run_once;
+ enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(istate->repo);
+
+ return fsm_mode <= FSMONITOR_MODE_DISABLED ||
+ istate->fsmonitor_has_run_once;
}
/*
@@ -67,7 +71,10 @@ static inline int is_fsmonitor_refreshed(const struct index_state *istate)
*/
static inline void mark_fsmonitor_valid(struct index_state *istate, struct cache_entry *ce)
{
- if (core_fsmonitor && !(ce->ce_flags & CE_FSMONITOR_VALID)) {
+ enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(istate->repo);
+
+ if (fsm_mode > FSMONITOR_MODE_DISABLED &&
+ !(ce->ce_flags & CE_FSMONITOR_VALID)) {
istate->cache_changed = 1;
ce->ce_flags |= CE_FSMONITOR_VALID;
trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_clean '%s'", ce->name);
@@ -83,7 +90,9 @@ static inline void mark_fsmonitor_valid(struct index_state *istate, struct cache
*/
static inline void mark_fsmonitor_invalid(struct index_state *istate, struct cache_entry *ce)
{
- if (core_fsmonitor) {
+ enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(istate->repo);
+
+ if (fsm_mode > FSMONITOR_MODE_DISABLED) {
ce->ce_flags &= ~CE_FSMONITOR_VALID;
untracked_cache_invalidate_path(istate, ce->name, 1);
trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_invalid '%s'", ce->name);
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 9dbbb08..205541e 100755
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -6,37 +6,38 @@
}
command_list () {
- eval "grep -ve '^#' $exclude_programs" <"$1"
-}
-
-get_categories () {
- tr ' ' '\012'|
- grep -v '^$' |
- sort |
- uniq
+ while read cmd rest
+ do
+ case "$cmd" in
+ "#"* | '')
+ # Ignore comments and allow empty lines
+ continue
+ ;;
+ *)
+ case "$exclude_programs" in
+ *":$cmd:"*)
+ ;;
+ *)
+ echo "$cmd $rest"
+ ;;
+ esac
+ esac
+ done <"$1"
}
category_list () {
- command_list "$1" |
- cut -c 40- |
- get_categories
-}
-
-get_synopsis () {
- sed -n '
- /^NAME/,/'"$1"'/H
- ${
- x
- s/.*'"$1"' - \(.*\)/N_("\1")/
- p
- }' "Documentation/$1.txt"
+ echo "$1" |
+ cut -d' ' -f2- |
+ tr ' ' '\012' |
+ grep -v '^$' |
+ LC_ALL=C sort -u
}
define_categories () {
echo
echo "/* Command categories */"
bit=0
- category_list "$1" |
+ echo "$1" |
while read cat
do
echo "#define CAT_$cat (1UL << $bit)"
@@ -50,7 +51,7 @@
echo "/* Category names */"
echo "static const char *category_names[] = {"
bit=0
- category_list "$1" |
+ echo "$1" |
while read cat
do
echo " \"$cat\", /* (1UL << $bit) */"
@@ -63,27 +64,38 @@
print_command_list () {
echo "static struct cmdname_help command_list[] = {"
- command_list "$1" |
+ echo "$1" |
while read cmd rest
do
- printf " { \"$cmd\", $(get_synopsis $cmd), 0"
- for cat in $(echo "$rest" | get_categories)
+ synopsis=
+ while read line
do
- printf " | CAT_$cat"
- done
+ case "$line" in
+ "$cmd - "*)
+ synopsis=${line#$cmd - }
+ break
+ ;;
+ esac
+ done <"Documentation/$cmd.txt"
+
+ printf '\t{ "%s", N_("%s"), 0' "$cmd" "$synopsis"
+ printf " | CAT_%s" $rest
echo " },"
done
echo "};"
}
-exclude_programs=
+exclude_programs=:
while test "--exclude-program" = "$1"
do
shift
- exclude_programs="$exclude_programs -e \"^$1 \""
+ exclude_programs="$exclude_programs$1:"
shift
done
+commands="$(command_list "$1")"
+categories="$(category_list "$commands")"
+
echo "/* Automatically generated by generate-cmdlist.sh */
struct cmdname_help {
const char *name;
@@ -91,8 +103,8 @@
uint32_t category;
};
"
-define_categories "$1"
+define_categories "$categories"
echo
-define_category_names "$1"
+define_category_names "$categories"
echo
-print_command_list "$1"
+print_command_list "$commands"
diff --git a/generate-hooklist.sh b/generate-hooklist.sh
new file mode 100755
index 0000000..2f9f54e
--- /dev/null
+++ b/generate-hooklist.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Usage: ./generate-hooklist.sh >hook-list.h
+
+cat <<EOF
+/* Automatically generated by generate-hooklist.sh */
+
+static const char *hook_name_list[] = {
+EOF
+
+sed -n \
+ -e '/^~~~~*$/ {x; s/^.*$/ "&",/; p;}' \
+ -e 'x' \
+ <Documentation/githooks.txt |
+ LC_ALL=C sort
+
+cat <<EOF
+ NULL,
+};
+EOF
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index bc3a1e8..95887fd 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1175,15 +1175,17 @@
ReadMode 'cbreak';
my $key = ReadKey 0;
ReadMode 'restore';
- if ($use_termcap and $key eq "\e") {
- while (!defined $term_escapes{$key}) {
- my $next = ReadKey 0.5;
- last if (!defined $next);
- $key .= $next;
+ if (defined $key) {
+ if ($use_termcap and $key eq "\e") {
+ while (!defined $term_escapes{$key}) {
+ my $next = ReadKey 0.5;
+ last if (!defined $next);
+ $key .= $next;
+ }
+ $key =~ s/\e/^[/;
}
- $key =~ s/\e/^[/;
+ print "$key";
}
- print "$key" if defined $key;
print "\n";
return $key;
} else {
diff --git a/git-compat-util.h b/git-compat-util.h
index 141bb86..d9457b9 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1,6 +1,19 @@
#ifndef GIT_COMPAT_UTIL_H
#define GIT_COMPAT_UTIL_H
+#if __STDC_VERSION__ - 0 < 199901L
+/*
+ * Git is in a testing period for mandatory C99 support in the compiler. If
+ * your compiler is reasonably recent, you can try to enable C99 support (or,
+ * for MSVC, C11 support). If you encounter a problem and can't enable C99
+ * support with your compiler (such as with "-std=gnu99") and don't have access
+ * to one with this support, such as GCC or Clang, you can remove this #if
+ * directive, but please report the details of your system to
+ * git@vger.kernel.org.
+ */
+#error "Required C99 support is in a test phase. Please see git-compat-util.h for more details."
+#endif
+
#ifdef USE_MSVC_CRTDBG
/*
* For these to work they must appear very early in each
@@ -33,14 +46,23 @@
/*
* See if our compiler is known to support flexible array members.
*/
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && (!defined(__SUNPRO_C) || (__SUNPRO_C > 0x580))
-# define FLEX_ARRAY /* empty */
+
+/*
+ * Check vendor specific quirks first, before checking the
+ * __STDC_VERSION__, as vendor compilers can lie and we need to be
+ * able to work them around. Note that by not defining FLEX_ARRAY
+ * here, we can fall back to use the "safer but a bit wasteful" one
+ * later.
+ */
+#if defined(__SUNPRO_C) && (__SUNPRO_C <= 0x580)
#elif defined(__GNUC__)
# if (__GNUC__ >= 3)
# define FLEX_ARRAY /* empty */
# else
# define FLEX_ARRAY 0 /* older GNU extension */
# endif
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+# define FLEX_ARRAY /* empty */
#endif
/*
@@ -113,6 +135,14 @@
#define unsigned_mult_overflows(a, b) \
((a) && (b) > maximum_unsigned_value_of_type(a) / (a))
+/*
+ * Returns true if the left shift of "a" by "shift" bits will
+ * overflow. The type of "a" must be unsigned.
+ */
+#define unsigned_left_shift_overflows(a, shift) \
+ ((shift) < bitsizeof(a) && \
+ (a) > maximum_unsigned_value_of_type(a) >> (shift))
+
#ifdef __GNUC__
#define TYPEOF(x) (__typeof__(x))
#else
@@ -127,7 +157,9 @@
/* Approximation of the length of the decimal representation of this type. */
#define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1)
-#if defined(__sun__)
+#ifdef __MINGW64__
+#define _POSIX_C_SOURCE 1
+#elif defined(__sun__)
/*
* On Solaris, when _XOPEN_EXTENDED is set, its header file
* forces the programs to be XPG4v2, defeating any _XOPEN_SOURCE
@@ -204,6 +236,12 @@
#include <sys/sysctl.h>
#endif
+/* Used by compat/win32/path-utils.h, and more */
+static inline int is_xplatform_dir_sep(int c)
+{
+ return c == '/' || c == '\\';
+}
+
#if defined(__CYGWIN__)
#include "compat/win32/path-utils.h"
#endif
@@ -235,6 +273,12 @@
#else
#include <stdint.h>
#endif
+#ifdef HAVE_ARC4RANDOM_LIBBSD
+#include <bsd/stdlib.h>
+#endif
+#ifdef HAVE_GETRANDOM
+#include <sys/random.h>
+#endif
#ifdef NO_INTPTR_T
/*
* On I16LP32, ILP32 and LP64 "long" is the safe bet, however
@@ -378,11 +422,11 @@ static inline int git_skip_dos_drive_prefix(char **path)
#define skip_dos_drive_prefix git_skip_dos_drive_prefix
#endif
-#ifndef is_dir_sep
static inline int git_is_dir_sep(int c)
{
return c == '/';
}
+#ifndef is_dir_sep
#define is_dir_sep git_is_dir_sep
#endif
@@ -398,6 +442,69 @@ static inline int git_offset_1st_component(const char *path)
#define is_valid_path(path) 1
#endif
+#ifndef is_path_owned_by_current_user
+
+#ifdef __TANDEM
+#define ROOT_UID 65535
+#else
+#define ROOT_UID 0
+#endif
+
+/*
+ * Do not use this function when
+ * (1) geteuid() did not say we are running as 'root', or
+ * (2) using this function will compromise the system.
+ *
+ * PORTABILITY WARNING:
+ * This code assumes uid_t is unsigned because that is what sudo does.
+ * If your uid_t type is signed and all your ids are positive then it
+ * should all work fine.
+ * If your version of sudo uses negative values for uid_t or it is
+ * buggy and return an overflowed value in SUDO_UID, then git might
+ * fail to grant access to your repository properly or even mistakenly
+ * grant access to someone else.
+ * In the unlikely scenario this happened to you, and that is how you
+ * got to this message, we would like to know about it; so sent us an
+ * email to git@vger.kernel.org indicating which platform you are
+ * using and which version of sudo, so we can improve this logic and
+ * maybe provide you with a patch that would prevent this issue again
+ * in the future.
+ */
+static inline void extract_id_from_env(const char *env, uid_t *id)
+{
+ const char *real_uid = getenv(env);
+
+ /* discard anything empty to avoid a more complex check below */
+ if (real_uid && *real_uid) {
+ char *endptr = NULL;
+ unsigned long env_id;
+
+ errno = 0;
+ /* silent overflow errors could trigger a bug here */
+ env_id = strtoul(real_uid, &endptr, 10);
+ if (!*endptr && !errno)
+ *id = env_id;
+ }
+}
+
+static inline int is_path_owned_by_current_uid(const char *path)
+{
+ struct stat st;
+ uid_t euid;
+
+ if (lstat(path, &st))
+ return 0;
+
+ euid = geteuid();
+ if (euid == ROOT_UID)
+ extract_id_from_env("SUDO_UID", &euid);
+
+ return st.st_uid == euid;
+}
+
+#define is_path_owned_by_current_user is_path_owned_by_current_uid
+#endif
+
#ifndef find_last_dir_sep
static inline char *git_find_last_dir_sep(const char *path)
{
@@ -466,11 +573,12 @@ static inline int git_has_dir_sep(const char *path)
struct strbuf;
/* General helper functions */
-void vreportf(const char *prefix, const char *err, va_list params);
NORETURN void usage(const char *err);
NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2)));
NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
+int die_message(const char *err, ...) __attribute__((format (printf, 1, 2)));
+int die_message_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
int error_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
@@ -486,12 +594,14 @@ void warning_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
#include <openssl/x509v3.h>
#endif /* NO_OPENSSL */
+#ifdef HAVE_OPENSSL_CSPRNG
+#include <openssl/rand.h>
+#endif
+
/*
* Let callers be aware of the constant return value; this can help
* gcc with -Wuninitialized analysis. We restrict this trick to gcc, though,
- * because some compilers may not support variadic macros. Since we're only
- * trying to help gcc, anyway, it's OK; other compilers will fall back to
- * using the function as usual.
+ * because other compilers may be confused by this.
*/
#if defined(__GNUC__)
static inline int const_error(void)
@@ -505,6 +615,7 @@ static inline int const_error(void)
typedef void (*report_fn)(const char *, va_list params);
void set_die_routine(NORETURN_PTR report_fn routine);
+report_fn get_die_message_routine(void);
void set_error_routine(report_fn routine);
report_fn get_error_routine(void);
void set_warn_routine(report_fn routine);
@@ -729,7 +840,7 @@ char *gitmkdtemp(char *);
#ifdef NO_UNSETENV
#define unsetenv gitunsetenv
-void gitunsetenv(const char *);
+int gitunsetenv(const char *);
#endif
#ifdef NO_STRCASESTR
@@ -862,6 +973,23 @@ static inline size_t st_sub(size_t a, size_t b)
return a - b;
}
+static inline size_t st_left_shift(size_t a, unsigned shift)
+{
+ if (unsigned_left_shift_overflows(a, shift))
+ die("size_t overflow: %"PRIuMAX" << %u",
+ (uintmax_t)a, shift);
+ return a << shift;
+}
+
+static inline unsigned long cast_size_t_to_ulong(size_t a)
+{
+ if (a != (unsigned long)a)
+ die("object too large to read on this platform: %"
+ PRIuMAX" is cut off to %lu",
+ (uintmax_t)a, (unsigned long)a);
+ return (unsigned long)a;
+}
+
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
# define xalloca(size) (alloca(size))
@@ -879,7 +1007,6 @@ char *xstrndup(const char *str, size_t len);
void *xrealloc(void *ptr, size_t size);
void *xcalloc(size_t nmemb, size_t size);
void xsetenv(const char *name, const char *value, int overwrite);
-void xunsetenv(const char *name);
void *xmmap(void *start, size_t length, int prot, int flags, int fd, off_t offset);
const char *mmap_os_err(void);
void *xmmap_gently(void *start, size_t length, int prot, int flags, int fd, off_t offset);
@@ -1196,24 +1323,43 @@ static inline int regexec_buf(const regex_t *preg, const char *buf, size_t size,
#endif
#endif
-/*
- * This is always defined as a first step towards making the use of variadic
- * macros unconditional. If it causes compilation problems on your platform,
- * please report it to the Git mailing list at git@vger.kernel.org.
- */
-#define HAVE_VARIADIC_MACROS 1
-
/* usage.c: only to be used for testing BUG() implementation (see test-tool) */
extern int BUG_exit_code;
-#ifdef HAVE_VARIADIC_MACROS
__attribute__((format (printf, 3, 4))) NORETURN
void BUG_fl(const char *file, int line, const char *fmt, ...);
#define BUG(...) BUG_fl(__FILE__, __LINE__, __VA_ARGS__)
+
+#ifndef FSYNC_METHOD_DEFAULT
+#ifdef __APPLE__
+#define FSYNC_METHOD_DEFAULT FSYNC_METHOD_WRITEOUT_ONLY
#else
-__attribute__((format (printf, 1, 2))) NORETURN
-void BUG(const char *fmt, ...);
+#define FSYNC_METHOD_DEFAULT FSYNC_METHOD_FSYNC
#endif
+#endif
+
+enum fsync_action {
+ FSYNC_WRITEOUT_ONLY,
+ FSYNC_HARDWARE_FLUSH
+};
+
+/*
+ * Issues an fsync against the specified file according to the specified mode.
+ *
+ * FSYNC_WRITEOUT_ONLY attempts to use interfaces available on some operating
+ * systems to flush the OS cache without issuing a flush command to the storage
+ * controller. If those interfaces are unavailable, the function fails with
+ * ENOSYS.
+ *
+ * FSYNC_HARDWARE_FLUSH does an OS writeout and hardware flush to ensure that
+ * changes are durable. It is not expected to fail.
+ */
+int git_fsync(int fd, enum fsync_action action);
+
+/*
+ * Writes out trace statistics for fsync using the trace2 API.
+ */
+void trace_git_fsync_stats(void);
/*
* Preserves errno, prints a message, but gives no warning for ENOENT.
@@ -1336,6 +1482,18 @@ void unleak_memory(const void *ptr, size_t len);
#define UNLEAK(var) do {} while (0)
#endif
+#define z_const
+#include <zlib.h>
+
+#if ZLIB_VERNUM < 0x1290
+/*
+ * This is uncompress2, which is only available in zlib >= 1.2.9
+ * (released as of early 2017). See compat/zlib-uncompress2.c.
+ */
+int uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source,
+ uLong *sourceLen);
+#endif
+
/*
* This include must come after system headers, since it introduces macros that
* replace system names.
@@ -1382,4 +1540,11 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset)
void sleep_millisec(int millisec);
+/*
+ * Generate len bytes from the system cryptographically secure PRNG.
+ * Returns 0 on success and -1 on error, setting errno. The inability to
+ * satisfy the full request is an error.
+ */
+int csprng_bytes(void *buf, size_t len);
+
#endif
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 64319be..4c81180 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -3607,6 +3607,22 @@
use strict;
use warnings;
use DBI;
+our $_use_fsync;
+
+# n.b. consider using Git.pm
+sub use_fsync {
+ if (!defined($_use_fsync)) {
+ my $x = $ENV{GIT_TEST_FSYNC};
+ if (defined $x) {
+ local $ENV{GIT_CONFIG};
+ delete $ENV{GIT_CONFIG};
+ my $v = ::safe_pipe_capture('git', '-c', "test.fsync=$x",
+ qw(config --type=bool test.fsync));
+ $_use_fsync = defined($v) ? ($v eq "true\n") : 1;
+ }
+ }
+ $_use_fsync;
+}
=head1 METHODS
@@ -3676,6 +3692,9 @@
$self->{dbuser},
$self->{dbpass});
die "Error connecting to database\n" unless defined $self->{dbh};
+ if ($self->{dbdriver} eq 'SQLite' && !use_fsync()) {
+ $self->{dbh}->do('PRAGMA synchronous = OFF');
+ }
$self->{tables} = {};
foreach my $table ( keys %{$self->{dbh}->table_info(undef,undef,undef,'TABLE')->fetchall_hashref('TABLE_NAME')} )
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index cb89372..3a51d45 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -579,7 +579,7 @@
git hash-object -t tag -w --stdin) ||
die "Could not create new tag object for $ref"
if git cat-file tag "$ref" | \
- sane_grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1
+ grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1
then
warn "gpg signature stripped from tag object $sha1t"
fi
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 7c55229..4349566 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -49,7 +49,7 @@
*apache2*|*lighttpd*|*httpd*)
# yes, *httpd* covers *lighttpd* above, but it is there for clarity
# ensure that the apache2/lighttpd command ends with "-f"
- if ! echo "$httpd" | sane_grep -- '-f *$' >/dev/null 2>&1
+ if ! echo "$httpd" | grep -- '-f *$' >/dev/null 2>&1
then
httpd="$httpd -f"
fi
@@ -380,10 +380,7 @@
DirectoryIndex gitweb.cgi
EOF
- # check to see if Dennis Stosberg's mod_perl compatibility patch
- # (<20060621130708.Gcbc6e5c@leonov.stosberg.net>) has been applied
- if test -f "$module_path/mod_perl.so" &&
- sane_grep 'MOD_PERL' "$root/gitweb.cgi" >/dev/null
+ if test -f "$module_path/mod_perl.so"
then
# favor mod_perl if available
cat >> "$conf" <<EOF
@@ -402,7 +399,7 @@
# plain-old CGI
resolve_full_httpd
list_mods=$(echo "$full_httpd" | sed 's/-f$/-l/')
- $list_mods | sane_grep 'mod_cgi\.c' >/dev/null 2>&1 || \
+ $list_mods | grep 'mod_cgi\.c' >/dev/null 2>&1 || \
if test -f "$module_path/mod_cgi.so"
then
echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf"
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 542a6a7..9f99201 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -63,7 +63,7 @@
preamble=
fi
shown_any=yes
- printf "%s%s\n" "$per_line_prefix" "$toolname"
+ printf "%s%-15s %s\n" "$per_line_prefix" "$toolname" $(diff_mode && diff_cmd_help "$toolname" || merge_cmd_help "$toolname")
fi
done
@@ -162,10 +162,18 @@
return 1
}
+ diff_cmd_help () {
+ return 0
+ }
+
merge_cmd () {
return 1
}
+ merge_cmd_help () {
+ return 0
+ }
+
hide_resolved_enabled () {
return 0
}
diff --git a/git-p4.py b/git-p4.py
index 2b45002..8fbf6eb 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -7,34 +7,52 @@
# 2007 Trolltech ASA
# License: MIT <http://www.opensource.org/licenses/mit-license.php>
#
-# pylint: disable=invalid-name,missing-docstring,too-many-arguments,broad-except
-# pylint: disable=no-self-use,wrong-import-position,consider-iterating-dictionary
-# pylint: disable=wrong-import-order,unused-import,too-few-public-methods
-# pylint: disable=too-many-lines,ungrouped-imports,fixme,too-many-locals
-# pylint: disable=line-too-long,bad-whitespace,superfluous-parens
-# pylint: disable=too-many-statements,too-many-instance-attributes
-# pylint: disable=too-many-branches,too-many-nested-blocks
+# pylint: disable=bad-whitespace
+# pylint: disable=broad-except
+# pylint: disable=consider-iterating-dictionary
+# pylint: disable=disable
+# pylint: disable=fixme
+# pylint: disable=invalid-name
+# pylint: disable=line-too-long
+# pylint: disable=missing-docstring
+# pylint: disable=no-self-use
+# pylint: disable=superfluous-parens
+# pylint: disable=too-few-public-methods
+# pylint: disable=too-many-arguments
+# pylint: disable=too-many-branches
+# pylint: disable=too-many-instance-attributes
+# pylint: disable=too-many-lines
+# pylint: disable=too-many-locals
+# pylint: disable=too-many-nested-blocks
+# pylint: disable=too-many-statements
+# pylint: disable=ungrouped-imports
+# pylint: disable=unused-import
+# pylint: disable=wrong-import-order
+# pylint: disable=wrong-import-position
#
+
+import struct
import sys
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 ctypes
+import errno
import functools
+import glob
import marshal
-import subprocess
-import tempfile
-import time
+import optparse
+import os
import platform
import re
import shutil
import stat
+import subprocess
+import tempfile
+import time
import zipfile
import zlib
-import ctypes
-import errno
-import glob
# On python2.7 where raw_input() and input() are both availble,
# we want raw_input's semantics, but aliased to input for python3
@@ -52,22 +70,42 @@
defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$'
# The block size is reduced automatically if required
-defaultBlockSize = 1<<20
+defaultBlockSize = 1 << 20
+
+defaultMetadataDecodingStrategy = 'passthrough' if sys.version_info.major == 2 else 'fallback'
+defaultFallbackMetadataEncoding = 'cp1252'
p4_access_checked = False
+re_ko_keywords = re.compile(br'\$(Id|Header)(:[^$\n]+)?\$')
+re_k_keywords = re.compile(br'\$(Id|Header|Author|Date|DateTime|Change|File|Revision)(:[^$\n]+)?\$')
+
+
+def format_size_human_readable(num):
+ """Returns a number of units (typically bytes) formatted as a
+ human-readable string.
+ """
+ if num < 1024:
+ return '{:d} B'.format(num)
+ for unit in ["Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"]:
+ num /= 1024.0
+ if num < 1024.0:
+ return "{:3.1f} {}B".format(num, unit)
+ return "{:.1f} YiB".format(num)
+
+
def p4_build_cmd(cmd):
"""Build a suitable p4 command line.
- This consolidates building and returning a p4 command line into one
- location. It means that hooking into the environment, or other configuration
- can be done more easily.
- """
+ This consolidates building and returning a p4 command line into one
+ location. It means that hooking into the environment, or other
+ configuration can be done more easily.
+ """
real_cmd = ["p4"]
user = gitConfig("git-p4.user")
if len(user) > 0:
- real_cmd += ["-u",user]
+ real_cmd += ["-u", user]
password = gitConfig("git-p4.password")
if len(password) > 0:
@@ -93,10 +131,7 @@ def p4_build_cmd(cmd):
# Provide a way to not pass this option by setting git-p4.retries to 0
real_cmd += ["-r", str(retries)]
- if not isinstance(cmd, list):
- real_cmd = ' '.join(real_cmd) + ' ' + cmd
- else:
- real_cmd += cmd
+ real_cmd += cmd
# now check that we can actually talk to the server
global p4_access_checked
@@ -106,31 +141,31 @@ def p4_build_cmd(cmd):
return real_cmd
+
def git_dir(path):
- """ Return TRUE if the given path is a git directory (/path/to/dir/.git).
- This won't automatically add ".git" to a directory.
- """
+ """Return TRUE if the given path is a git directory (/path/to/dir/.git).
+ This won't automatically add ".git" to a directory.
+ """
d = read_pipe(["git", "--git-dir", path, "rev-parse", "--git-dir"], True).strip()
if not d or len(d) == 0:
return None
else:
return d
+
def chdir(path, is_client_path=False):
- """Do chdir to the given path, and set the PWD environment
- variable for use by P4. It does not look at getcwd() output.
- Since we're not using the shell, it is necessary to set the
- PWD environment variable explicitly.
+ """Do chdir to the given path, and set the PWD environment variable for use
+ by P4. It does not look at getcwd() output. Since we're not using the
+ shell, it is necessary to set the PWD environment variable explicitly.
- Normally, expand the path to force it to be absolute. This
- addresses the use of relative path names inside P4 settings,
- e.g. P4CONFIG=.p4config. P4 does not simply open the filename
- as given; it looks for .p4config using PWD.
+ Normally, expand the path to force it to be absolute. This addresses
+ the use of relative path names inside P4 settings, e.g.
+ P4CONFIG=.p4config. P4 does not simply open the filename as given; it
+ looks for .p4config using PWD.
- If is_client_path, the path was handed to us directly by p4,
- and may be a symbolic link. Do not call os.getcwd() in this
- case, because it will cause p4 to think that PWD is not inside
- the client path.
+ If is_client_path, the path was handed to us directly by p4, and may be
+ a symbolic link. Do not call os.getcwd() in this case, because it will
+ cause p4 to think that PWD is not inside the client path.
"""
os.chdir(path)
@@ -138,6 +173,7 @@ def chdir(path, is_client_path=False):
path = os.getcwd()
os.environ['PWD'] = path
+
def calcDiskFree():
"""Return free space in bytes on the disk of the given dirname."""
if platform.system() == 'Windows':
@@ -148,52 +184,124 @@ def calcDiskFree():
st = os.statvfs(os.getcwd())
return st.f_bavail * st.f_frsize
+
def die(msg):
- """ Terminate execution. Make sure that any running child processes have been wait()ed for before
- calling this.
- """
+ """Terminate execution. Make sure that any running child processes have
+ been wait()ed for before calling this.
+ """
if verbose:
raise Exception(msg)
else:
sys.stderr.write(msg + "\n")
sys.exit(1)
-def prompt(prompt_text):
- """ Prompt the user to choose one of the choices
- Choices are identified in the prompt_text by square brackets around
- a single letter option.
- """
+def prompt(prompt_text):
+ """Prompt the user to choose one of the choices.
+
+ Choices are identified in the prompt_text by square brackets around a
+ single letter option.
+ """
choices = set(m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text))
while True:
sys.stderr.flush()
sys.stdout.write(prompt_text)
sys.stdout.flush()
- response=sys.stdin.readline().strip().lower()
+ 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
+
+class MetadataDecodingException(Exception):
+ def __init__(self, input_string):
+ self.input_string = input_string
+
+ def __str__(self):
+ return """Decoding perforce metadata failed!
+The failing string was:
+---
+{}
+---
+Consider setting the git-p4.metadataDecodingStrategy config option to
+'fallback', to allow metadata to be decoded using a fallback encoding,
+defaulting to cp1252.""".format(self.input_string)
+
+
+encoding_fallback_warning_issued = False
+encoding_escape_warning_issued = False
+def metadata_stream_to_writable_bytes(s):
+ encodingStrategy = gitConfig('git-p4.metadataDecodingStrategy') or defaultMetadataDecodingStrategy
+ fallbackEncoding = gitConfig('git-p4.metadataFallbackEncoding') or defaultFallbackMetadataEncoding
+ if not isinstance(s, bytes):
+ return s.encode('utf_8')
+ if encodingStrategy == 'passthrough':
+ return s
+ try:
+ s.decode('utf_8')
+ return s
+ except UnicodeDecodeError:
+ if encodingStrategy == 'fallback' and fallbackEncoding:
+ global encoding_fallback_warning_issued
+ global encoding_escape_warning_issued
+ try:
+ if not encoding_fallback_warning_issued:
+ print("\nCould not decode value as utf-8; using configured fallback encoding %s: %s" % (fallbackEncoding, s))
+ print("\n(this warning is only displayed once during an import)")
+ encoding_fallback_warning_issued = True
+ return s.decode(fallbackEncoding).encode('utf_8')
+ except Exception as exc:
+ if not encoding_escape_warning_issued:
+ print("\nCould not decode value with configured fallback encoding %s; escaping bytes over 127: %s" % (fallbackEncoding, s))
+ print("\n(this warning is only displayed once during an import)")
+ encoding_escape_warning_issued = True
+ escaped_bytes = b''
+ # bytes and strings work very differently in python2 vs python3...
+ if str is bytes:
+ for byte in s:
+ byte_number = struct.unpack('>B', byte)[0]
+ if byte_number > 127:
+ escaped_bytes += b'%'
+ escaped_bytes += hex(byte_number)[2:].upper()
+ else:
+ escaped_bytes += byte
+ else:
+ for byte_number in s:
+ if byte_number > 127:
+ escaped_bytes += b'%'
+ escaped_bytes += hex(byte_number).upper().encode()[2:]
+ else:
+ escaped_bytes += bytes([byte_number])
+ return escaped_bytes
+
+ raise MetadataDecodingException(s)
+
+
def decode_path(path):
- """Decode a given string (bytes or otherwise) using configured path encoding options
- """
+ """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
@@ -206,174 +314,128 @@ def decode_path(path):
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."""
+ args = ['git', 'hook', 'run', '--ignore-missing', cmd]
+ if param:
+ args.append("--")
+ for p in param:
+ args.append(p)
+ return subprocess.call(args) == 0
+
+
+def write_pipe(c, stdin, *k, **kw):
if verbose:
- sys.stderr.write("Looking for hook: %s\n" % cmd)
- sys.stderr.flush()
+ sys.stderr.write('Writing pipe: {}\n'.format(' '.join(c)))
- 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 = not isinstance(c, list)
- p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand)
+ p = subprocess.Popen(c, stdin=subprocess.PIPE, *k, **kw)
pipe = p.stdin
val = pipe.write(stdin)
pipe.close()
if p.wait():
- die('Command failed: %s' % str(c))
+ die('Command failed: {}'.format(' '.join(c)))
return val
-def p4_write_pipe(c, stdin):
+
+def p4_write_pipe(c, stdin, *k, **kw):
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)
+ return write_pipe(real_cmd, stdin, *k, **kw)
-def read_pipe_full(c):
- """ Read output from command. Returns a tuple
- of the return status, stdout text and stderr
- text.
- """
+
+def read_pipe_full(c, *k, **kw):
+ """Read output from command. Returns a tuple of the return status, stdout
+ text and stderr text.
+ """
if verbose:
- sys.stderr.write('Reading pipe: %s\n' % str(c))
+ sys.stderr.write('Reading pipe: {}\n'.format(' '.join(c)))
- expand = not isinstance(c, list)
- p = subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=expand)
- (out, err) = p.communicate()
+ p = subprocess.Popen(
+ c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, *k, **kw)
+ out, err = p.communicate()
return (p.returncode, out, decode_text_stream(err))
-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)
+def read_pipe(c, ignore_error=False, raw=False, *k, **kw):
+ """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, *k, **kw)
if retcode != 0:
if ignore_error:
out = ""
else:
- die('Command failed: %s\nError: %s' % (str(c), err))
+ die('Command failed: {}\nError: {}'.format(' '.join(c), err))
if not raw:
out = decode_text_stream(out)
return out
-def read_pipe_text(c):
- """ Read output from a command with trailing whitespace stripped.
- On error, returns None.
- """
- (retcode, out, err) = read_pipe_full(c)
+
+def read_pipe_text(c, *k, **kw):
+ """Read output from a command with trailing whitespace stripped. On error,
+ returns None.
+ """
+ retcode, out, err = read_pipe_full(c, *k, **kw)
if retcode != 0:
return None
else:
return decode_text_stream(out).rstrip()
-def p4_read_pipe(c, ignore_error=False, raw=False):
- real_cmd = p4_build_cmd(c)
- return read_pipe(real_cmd, ignore_error, raw=raw)
-def read_pipe_lines(c):
+def p4_read_pipe(c, ignore_error=False, raw=False, *k, **kw):
+ real_cmd = p4_build_cmd(c)
+ return read_pipe(real_cmd, ignore_error, raw=raw, *k, **kw)
+
+
+def read_pipe_lines(c, raw=False, *k, **kw):
if verbose:
- sys.stderr.write('Reading pipe: %s\n' % str(c))
+ sys.stderr.write('Reading pipe: {}\n'.format(' '.join(c)))
- expand = not isinstance(c, list)
- p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
+ p = subprocess.Popen(c, stdout=subprocess.PIPE, *k, **kw)
pipe = p.stdout
- val = [decode_text_stream(line) for line in pipe.readlines()]
+ lines = pipe.readlines()
+ if not raw:
+ lines = [decode_text_stream(line) for line in lines]
if pipe.close() or p.wait():
- die('Command failed: %s' % str(c))
- return val
+ die('Command failed: {}'.format(' '.join(c)))
+ return lines
-def p4_read_pipe_lines(c):
- """Specifically invoke p4 on the command supplied. """
+
+def p4_read_pipe_lines(c, *k, **kw):
+ """Specifically invoke p4 on the command supplied."""
real_cmd = p4_build_cmd(c)
- return read_pipe_lines(real_cmd)
+ return read_pipe_lines(real_cmd, *k, **kw)
+
def p4_has_command(cmd):
- """Ask p4 for help on this command. If it returns an error, the
- command does not exist in this version of p4."""
+ """Ask p4 for help on this command. If it returns an error, the command
+ does not exist in this version of p4.
+ """
real_cmd = p4_build_cmd(["help", cmd])
p = subprocess.Popen(real_cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
p.communicate()
return p.returncode == 0
+
def p4_has_move_command():
- """See if the move command exists, that it supports -k, and that
- it has not been administratively disabled. The arguments
- must be correct, but the filenames do not have to exist. Use
- ones with wildcards so even if they exist, it will fail."""
+ """See if the move command exists, that it supports -k, and that it has not
+ been administratively disabled. The arguments must be correct, but the
+ filenames do not have to exist. Use ones with wildcards so even if they
+ exist, it will fail.
+ """
if not p4_has_command("move"):
return False
cmd = p4_build_cmd(["move", "-k", "@from", "@to"])
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- (out, err) = p.communicate()
+ out, err = p.communicate()
err = decode_text_stream(err)
# return code will be 1 in either case
if err.find("Invalid option") >= 0:
@@ -383,30 +445,33 @@ def p4_has_move_command():
# assume it failed because @... was invalid changelist
return True
-def system(cmd, ignore_error=False):
- expand = not isinstance(cmd, list)
+
+def system(cmd, ignore_error=False, *k, **kw):
if verbose:
- sys.stderr.write("executing %s\n" % str(cmd))
- retcode = subprocess.call(cmd, shell=expand)
+ sys.stderr.write("executing {}\n".format(
+ ' '.join(cmd) if isinstance(cmd, list) else cmd))
+ retcode = subprocess.call(cmd, *k, **kw)
if retcode and not ignore_error:
- raise CalledProcessError(retcode, cmd)
+ raise subprocess.CalledProcessError(retcode, cmd)
return retcode
-def p4_system(cmd):
- """Specifically invoke p4 as the system command. """
+
+def p4_system(cmd, *k, **kw):
+ """Specifically invoke p4 as the system command."""
real_cmd = p4_build_cmd(cmd)
- expand = not isinstance(real_cmd, list)
- retcode = subprocess.call(real_cmd, shell=expand)
+ retcode = subprocess.call(real_cmd, *k, **kw)
if retcode:
- raise CalledProcessError(retcode, real_cmd)
+ raise subprocess.CalledProcessError(retcode, real_cmd)
+
def die_bad_access(s):
die("failure accessing depot: {0}".format(s.rstrip()))
+
def p4_check_access(min_expiration=1):
- """ Check if we can access Perforce - account still logged in
- """
+ """Check if we can access Perforce - account still logged in."""
+
results = p4CmdList(["login", "-s"])
if len(results) == 0:
@@ -449,62 +514,78 @@ def p4_check_access(min_expiration=1):
else:
die_bad_access("unknown error code {0}".format(code))
+
_p4_version_string = None
+
+
def p4_version_string():
- """Read the version string, showing just the last line, which
- hopefully is the interesting version bit.
+ """Read the version string, showing just the last line, which hopefully is
+ the interesting version bit.
$ p4 -V
Perforce - The Fast Software Configuration Management System.
Copyright 1995-2011 Perforce Software. All rights reserved.
Rev. P4/NTX86/2011.1/393975 (2011/12/16).
- """
+ """
global _p4_version_string
if not _p4_version_string:
a = p4_read_pipe_lines(["-V"])
_p4_version_string = a[-1].rstrip()
return _p4_version_string
+
def p4_integrate(src, dest):
p4_system(["integrate", "-Dt", wildcard_encode(src), wildcard_encode(dest)])
+
def p4_sync(f, *options):
p4_system(["sync"] + list(options) + [wildcard_encode(f)])
+
def p4_add(f):
- # forcibly add file names with wildcards
+ """Forcibly add file names with wildcards."""
if wildcard_present(f):
p4_system(["add", "-f", f])
else:
p4_system(["add", f])
+
def p4_delete(f):
p4_system(["delete", wildcard_encode(f)])
+
def p4_edit(f, *options):
p4_system(["edit"] + list(options) + [wildcard_encode(f)])
+
def p4_revert(f):
p4_system(["revert", wildcard_encode(f)])
+
def p4_reopen(type, f):
p4_system(["reopen", "-t", type, wildcard_encode(f)])
+
def p4_reopen_in_change(changelist, files):
cmd = ["reopen", "-c", str(changelist)] + files
p4_system(cmd)
+
def p4_move(src, dest):
p4_system(["move", "-k", wildcard_encode(src), wildcard_encode(dest)])
+
def p4_last_change():
results = p4CmdList(["changes", "-m", "1"], skip_info=True)
return int(results[0]['change'])
+
def p4_describe(change, shelved=False):
- """Make sure it returns a valid result by checking for
- the presence of field "time". Return a dict of the
- results."""
+ """Make sure it returns a valid result by checking for the presence of
+ field "time".
+
+ Return a dict of the results.
+ """
cmd = ["describe", "-s"]
if shelved:
@@ -529,12 +610,11 @@ def p4_describe(change, shelved=False):
return d
-#
-# Canonicalize the p4 type and return a tuple of the
-# base type, plus any modifiers. See "p4 help filetypes"
-# for a list and explanation.
-#
+
def split_p4_type(p4type):
+ """Canonicalize the p4 type and return a tuple of the base type, plus any
+ modifiers. See "p4 help filetypes" for a list and explanation.
+ """
p4_filetypes_historical = {
"ctempobj": "binary+Sw",
@@ -564,51 +644,46 @@ def split_p4_type(p4type):
mods = s[1]
return (base, mods)
-#
-# return the raw p4 type of a file (text, text+ko, etc)
-#
+
def p4_type(f):
+ """Return the raw p4 type of a file (text, text+ko, etc)."""
+
results = p4CmdList(["fstat", "-T", "headType", wildcard_encode(f)])
return results[0]['headType']
-#
-# Given a type base and modifier, return a regexp matching
-# the keywords that can be expanded in the file
-#
+
def p4_keywords_regexp_for_type(base, type_mods):
+ """Given a type base and modifier, return a regexp matching the keywords
+ that can be expanded in the file.
+ """
+
if base in ("text", "unicode", "binary"):
- kwords = None
if "ko" in type_mods:
- kwords = 'Id|Header'
+ return re_ko_keywords
elif "k" in type_mods:
- kwords = 'Id|Header|Author|Date|DateTime|Change|File|Revision'
+ return re_k_keywords
else:
return None
- pattern = r"""
- \$ # Starts with a dollar, followed by...
- (%s) # one of the keywords, followed by...
- (:[^$\n]+)? # possibly an old expansion, followed by...
- \$ # another dollar
- """ % kwords
- return pattern
else:
return None
-#
-# Given a file, return a regexp matching the possible
-# RCS keywords that will be expanded, or None for files
-# with kw expansion turned off.
-#
+
def p4_keywords_regexp_for_file(file):
+ """Given a file, return a regexp matching the possible RCS keywords that
+ will be expanded, or None for files with kw expansion turned off.
+ """
+
if not os.path.exists(file):
return None
else:
- (type_base, type_mods) = split_p4_type(p4_type(file))
+ type_base, type_mods = split_p4_type(p4_type(file))
return p4_keywords_regexp_for_type(type_base, type_mods)
+
def setP4ExecBit(file, mode):
- # Reopens an already open file and changes the execute bit to match
- # the execute bit setting in the passed in mode.
+ """Reopens an already open file and changes the execute bit to match the
+ execute bit setting in the passed in mode.
+ """
p4Type = "+x"
@@ -621,8 +696,9 @@ def setP4ExecBit(file, mode):
p4_reopen(p4Type, file)
+
def getP4OpenedType(file):
- # Returns the perforce file type for the given file.
+ """Returns the perforce file type for the given file."""
result = p4_read_pipe(["opened", wildcard_encode(file)])
match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result)
@@ -631,8 +707,10 @@ def getP4OpenedType(file):
else:
die("Could not determine file type for %s (result: '%s')" % (file, result))
-# Return the set of all p4 labels
+
def getP4Labels(depotPaths):
+ """Return the set of all p4 labels."""
+
labels = set()
if not isinstance(depotPaths, list):
depotPaths = [depotPaths]
@@ -643,34 +721,39 @@ def getP4Labels(depotPaths):
return labels
-# Return the set of all git tags
+
def getGitTags():
+ """Return the set of all git tags."""
+
gitTags = set()
for line in read_pipe_lines(["git", "tag"]):
tag = line.strip()
gitTags.add(tag)
return gitTags
+
_diff_tree_pattern = None
+
def parseDiffTreeEntry(entry):
"""Parses a single diff tree entry into its component elements.
- See git-diff-tree(1) manpage for details about the format of the diff
- output. This method returns a dictionary with the following elements:
+ See git-diff-tree(1) manpage for details about the format of the diff
+ output. This method returns a dictionary with the following elements:
- src_mode - The mode of the source file
- dst_mode - The mode of the destination file
- src_sha1 - The sha1 for the source file
- dst_sha1 - The sha1 fr the destination file
- status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc)
- status_score - The score for the status (applicable for 'C' and 'R'
- statuses). This is None if there is no score.
- src - The path for the source file.
- dst - The path for the destination file. This is only present for
- copy or renames. If it is not present, this is None.
+ src_mode - The mode of the source file
+ dst_mode - The mode of the destination file
+ src_sha1 - The sha1 for the source file
+ dst_sha1 - The sha1 fr the destination file
+ status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc)
+ status_score - The score for the status (applicable for 'C' and 'R'
+ statuses). This is None if there is no score.
+ src - The path for the source file.
+ dst - The path for the destination file. This is only present for
+ copy or renames. If it is not present, this is None.
- If the pattern is not matched, None is returned."""
+ If the pattern is not matched, None is returned.
+ """
global _diff_tree_pattern
if not _diff_tree_pattern:
@@ -690,54 +773,61 @@ def parseDiffTreeEntry(entry):
}
return None
+
def isModeExec(mode):
- # Returns True if the given git mode represents an executable file,
- # otherwise False.
+ """Returns True if the given git mode represents an executable file,
+ otherwise False.
+ """
return mode[-3:] == "755"
+
class P4Exception(Exception):
- """ Base class for exceptions from the p4 client """
+ """Base class for exceptions from the p4 client."""
+
def __init__(self, exit_code):
self.p4ExitCode = exit_code
+
class P4ServerException(P4Exception):
- """ Base class for exceptions where we get some kind of marshalled up result from the server """
+ """Base class for exceptions where we get some kind of marshalled up result
+ from the server.
+ """
+
def __init__(self, exit_code, p4_result):
super(P4ServerException, self).__init__(exit_code)
self.p4_result = p4_result
self.code = p4_result[0]['code']
self.data = p4_result[0]['data']
+
class P4RequestSizeException(P4ServerException):
- """ One of the maxresults or maxscanrows errors """
+ """One of the maxresults or maxscanrows errors."""
+
def __init__(self, exit_code, p4_result, limit):
super(P4RequestSizeException, self).__init__(exit_code, p4_result)
self.limit = limit
+
class P4CommandException(P4Exception):
- """ Something went wrong calling p4 which means we have to give up """
+ """Something went wrong calling p4 which means we have to give up."""
+
def __init__(self, msg):
self.msg = msg
def __str__(self):
return self.msg
+
def isModeExecChanged(src_mode, dst_mode):
return isModeExec(src_mode) != isModeExec(dst_mode)
+
def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
- errors_as_exceptions=False):
+ errors_as_exceptions=False, *k, **kw):
- if not isinstance(cmd, list):
- cmd = "-G " + cmd
- expand = True
- else:
- cmd = ["-G"] + cmd
- expand = False
-
- cmd = p4_build_cmd(cmd)
+ cmd = p4_build_cmd(["-G"] + cmd)
if verbose:
- sys.stderr.write("Opening pipe: %s\n" % str(cmd))
+ sys.stderr.write("Opening pipe: {}\n".format(' '.join(cmd)))
# Use a temporary file to avoid deadlocks without
# subprocess.communicate(), which would put another copy
@@ -754,10 +844,8 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
stdin_file.flush()
stdin_file.seek(0)
- p4 = subprocess.Popen(cmd,
- shell=expand,
- stdin=stdin_file,
- stdout=subprocess.PIPE)
+ p4 = subprocess.Popen(
+ cmd, stdin=stdin_file, stdout=subprocess.PIPE, *k, **kw)
result = []
try:
@@ -766,11 +854,12 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
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
+ # - `desc` or `FullName` which may contain non-UTF8 encoded text handled below, eagerly converted to bytes
+ # - `depotFile[0-9]*`, `path`, or `clientFile` which may contain non-UTF8 encoded text, handled by decode_path()
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')):
+ if isinstance(value, bytes) and not (key in ('data', 'desc', 'FullName', 'path', 'clientFile') or key.startswith('depotFile')):
value = value.decode()
decoded_entry[key] = value
# Parse out data if it's an error response
@@ -780,6 +869,10 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
if skip_info:
if 'code' in entry and entry['code'] == 'info':
continue
+ if 'desc' in entry:
+ entry['desc'] = metadata_stream_to_writable_bytes(entry['desc'])
+ if 'FullName' in entry:
+ entry['FullName'] = metadata_stream_to_writable_bytes(entry['FullName'])
if cb is not None:
cb(entry)
else:
@@ -810,12 +903,14 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
return result
-def p4Cmd(cmd):
- list = p4CmdList(cmd)
+
+def p4Cmd(cmd, *k, **kw):
+ list = p4CmdList(cmd, *k, **kw)
result = {}
for entry in list:
result.update(entry)
- return result;
+ return result
+
def p4Where(depotPath):
if not depotPath.endswith("/"):
@@ -837,7 +932,7 @@ def p4Where(depotPath):
if data[:space] == depotPath:
output = entry
break
- if output == None:
+ if output is None:
return ""
if output["code"] == "error":
return ""
@@ -853,48 +948,54 @@ def p4Where(depotPath):
clientPath = clientPath[:-3]
return clientPath
+
def currentGitBranch():
return read_pipe_text(["git", "symbolic-ref", "--short", "-q", "HEAD"])
+
def isValidGitDir(path):
- return git_dir(path) != None
+ return git_dir(path) is not None
+
def parseRevision(ref):
- return read_pipe("git rev-parse %s" % ref).strip()
+ return read_pipe(["git", "rev-parse", ref]).strip()
+
def branchExists(ref):
rev = read_pipe(["git", "rev-parse", "-q", "--verify", ref],
ignore_error=True)
return len(rev) > 0
+
def extractLogMessageFromGitCommit(commit):
logMessage = ""
- ## fixme: title is first line of commit, not 1st paragraph.
+ # fixme: title is first line of commit, not 1st paragraph.
foundTitle = False
for log in read_pipe_lines(["git", "cat-file", "commit", commit]):
- if not foundTitle:
- if len(log) == 1:
- foundTitle = True
- continue
+ if not foundTitle:
+ if len(log) == 1:
+ foundTitle = True
+ continue
- logMessage += log
+ logMessage += log
return logMessage
+
def extractSettingsGitLog(log):
values = {}
for line in log.split("\n"):
line = line.strip()
- m = re.search (r"^ *\[git-p4: (.*)\]$", line)
+ m = re.search(r"^ *\[git-p4: (.*)\]$", line)
if not m:
continue
- assignments = m.group(1).split (':')
+ assignments = m.group(1).split(':')
for a in assignments:
- vals = a.split ('=')
+ vals = a.split('=')
key = vals[0].strip()
- val = ('='.join (vals[1:])).strip()
- if val.endswith ('\"') and val.startswith('"'):
+ val = ('='.join(vals[1:])).strip()
+ if val.endswith('\"') and val.startswith('"'):
val = val[1:-1]
values[key] = val
@@ -906,41 +1007,49 @@ def extractSettingsGitLog(log):
values['depot-paths'] = paths.split(',')
return values
+
def gitBranchExists(branch):
proc = subprocess.Popen(["git", "rev-parse", branch],
- stderr=subprocess.PIPE, stdout=subprocess.PIPE);
- return proc.wait() == 0;
+ stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+ return proc.wait() == 0
+
def gitUpdateRef(ref, newvalue):
subprocess.check_call(["git", "update-ref", ref, newvalue])
+
def gitDeleteRef(ref):
subprocess.check_call(["git", "update-ref", "-d", ref])
+
_gitConfig = {}
+
def gitConfig(key, typeSpecifier=None):
if key not in _gitConfig:
- cmd = [ "git", "config" ]
+ cmd = ["git", "config"]
if typeSpecifier:
- cmd += [ typeSpecifier ]
- cmd += [ key ]
+ cmd += [typeSpecifier]
+ cmd += [key]
s = read_pipe(cmd, ignore_error=True)
_gitConfig[key] = s.strip()
return _gitConfig[key]
+
def gitConfigBool(key):
"""Return a bool, using git config --bool. It is True only if the
variable is set to true, and False if set to false or not present
- in the config."""
+ in the config.
+ """
if key not in _gitConfig:
_gitConfig[key] = gitConfig(key, '--bool') == "true"
return _gitConfig[key]
+
def gitConfigInt(key):
if key not in _gitConfig:
- cmd = [ "git", "config", "--int", key ]
+ cmd = ["git", "config", "--int", key]
s = read_pipe(cmd, ignore_error=True)
v = s.strip()
try:
@@ -949,6 +1058,7 @@ def gitConfigInt(key):
_gitConfig[key] = None
return _gitConfig[key]
+
def gitConfigList(key):
if key not in _gitConfig:
s = read_pipe(["git", "config", "--get-all", key], ignore_error=True)
@@ -957,20 +1067,51 @@ def gitConfigList(key):
_gitConfig[key] = []
return _gitConfig[key]
+def fullP4Ref(incomingRef, importIntoRemotes=True):
+ """Standardize a given provided p4 ref value to a full git ref:
+ refs/foo/bar/branch -> use it exactly
+ p4/branch -> prepend refs/remotes/ or refs/heads/
+ branch -> prepend refs/remotes/p4/ or refs/heads/p4/"""
+ if incomingRef.startswith("refs/"):
+ return incomingRef
+ if importIntoRemotes:
+ prepend = "refs/remotes/"
+ else:
+ prepend = "refs/heads/"
+ if not incomingRef.startswith("p4/"):
+ prepend += "p4/"
+ return prepend + incomingRef
+
+def shortP4Ref(incomingRef, importIntoRemotes=True):
+ """Standardize to a "short ref" if possible:
+ refs/foo/bar/branch -> ignore
+ refs/remotes/p4/branch or refs/heads/p4/branch -> shorten
+ p4/branch -> shorten"""
+ if importIntoRemotes:
+ longprefix = "refs/remotes/p4/"
+ else:
+ longprefix = "refs/heads/p4/"
+ if incomingRef.startswith(longprefix):
+ return incomingRef[len(longprefix):]
+ if incomingRef.startswith("p4/"):
+ return incomingRef[3:]
+ return incomingRef
+
def p4BranchesInGit(branchesAreInRemotes=True):
"""Find all the branches whose names start with "p4/", looking
in remotes or heads as specified by the argument. Return
a dictionary of { branch: revision } for each one found.
The branch names are the short names, without any
- "p4/" prefix."""
+ "p4/" prefix.
+ """
branches = {}
- cmdline = "git rev-parse --symbolic "
+ cmdline = ["git", "rev-parse", "--symbolic"]
if branchesAreInRemotes:
- cmdline += "--remotes"
+ cmdline.append("--remotes")
else:
- cmdline += "--branches"
+ cmdline.append("--branches")
for line in read_pipe_lines(cmdline):
line = line.strip()
@@ -989,10 +1130,11 @@ def p4BranchesInGit(branchesAreInRemotes=True):
return branches
+
def branch_exists(branch):
"""Make sure that the given ref name really exists."""
- cmd = [ "git", "rev-parse", "--symbolic", "--verify", branch ]
+ cmd = ["git", "rev-parse", "--symbolic", "--verify", branch]
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, _ = p.communicate()
out = decode_text_stream(out)
@@ -1001,7 +1143,8 @@ def branch_exists(branch):
# expect exactly one line of output: the branch name
return out.rstrip() == branch
-def findUpstreamBranchPoint(head = "HEAD"):
+
+def findUpstreamBranchPoint(head="HEAD"):
branches = p4BranchesInGit()
# map from depot-path to branch name
branchByDepotPath = {}
@@ -1010,8 +1153,12 @@ def findUpstreamBranchPoint(head = "HEAD"):
log = extractLogMessageFromGitCommit(tip)
settings = extractSettingsGitLog(log)
if "depot-paths" in settings:
+ git_branch = "remotes/p4/" + branch
paths = ",".join(settings["depot-paths"])
- branchByDepotPath[paths] = "remotes/p4/" + branch
+ branchByDepotPath[paths] = git_branch
+ if "change" in settings:
+ paths = paths + ";" + settings["change"]
+ branchByDepotPath[paths] = git_branch
settings = None
parent = 0
@@ -1021,6 +1168,10 @@ def findUpstreamBranchPoint(head = "HEAD"):
settings = extractSettingsGitLog(log)
if "depot-paths" in settings:
paths = ",".join(settings["depot-paths"])
+ if "change" in settings:
+ expaths = paths + ";" + settings["change"]
+ if expaths in branchByDepotPath:
+ return [branchByDepotPath[expaths], settings]
if paths in branchByDepotPath:
return [branchByDepotPath[paths], settings]
@@ -1028,14 +1179,15 @@ def findUpstreamBranchPoint(head = "HEAD"):
return ["", settings]
-def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent=True):
+
+def createOrUpdateBranchesFromOrigin(localRefPrefix="refs/remotes/p4/", silent=True):
if not silent:
print("Creating/updating branch(es) in %s based on origin branch(es)"
% localRefPrefix)
originPrefix = "origin/p4/"
- for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
+ for line in read_pipe_lines(["git", "rev-parse", "--symbolic", "--remotes"]):
line = line.strip()
if (not line.startswith(originPrefix)) or line.endswith("HEAD"):
continue
@@ -1045,8 +1197,7 @@ def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent
originHead = line
original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
- if ('depot-paths' not in original
- or 'change' not in original):
+ if 'depot-paths' not in original or 'change' not in original:
continue
update = False
@@ -1073,10 +1224,11 @@ def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent
remoteHead, ','.join(settings['depot-paths'])))
if update:
- system("git update-ref %s %s" % (remoteHead, originHead))
+ system(["git", "update-ref", remoteHead, originHead])
+
def originP4BranchesExist():
- return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
+ return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
def p4ParseNumericChangeRange(parts):
@@ -1088,12 +1240,14 @@ def p4ParseNumericChangeRange(parts):
return (changeStart, changeEnd)
+
def chooseBlockSize(blockSize):
if blockSize:
return blockSize
else:
return defaultBlockSize
+
def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
assert depotPaths
@@ -1111,7 +1265,7 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
parts = changeRange.split(',')
assert len(parts) == 2
try:
- (changeStart, changeEnd) = p4ParseNumericChangeRange(parts)
+ changeStart, changeEnd = p4ParseNumericChangeRange(parts)
block_size = chooseBlockSize(requestedBlockSize)
except ValueError:
changeStart = parts[0][1:]
@@ -1149,7 +1303,8 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
else:
block_size = max(2, block_size // 2)
- if verbose: print("block size error, retrying with block size {0}".format(block_size))
+ if verbose:
+ print("block size error, retrying with block size {0}".format(block_size))
continue
except P4Exception as e:
die('Error retrieving changes description ({0})'.format(e.p4ExitCode))
@@ -1171,23 +1326,27 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
changes = sorted(changes)
return changes
+
def p4PathStartsWith(path, prefix):
- # This method tries to remedy a potential mixed-case issue:
- #
- # If UserA adds //depot/DirA/file1
- # and UserB adds //depot/dira/file2
- #
- # we may or may not have a problem. If you have core.ignorecase=true,
- # we treat DirA and dira as the same directory
+ """This method tries to remedy a potential mixed-case issue:
+
+ If UserA adds //depot/DirA/file1
+ and UserB adds //depot/dira/file2
+
+ we may or may not have a problem. If you have core.ignorecase=true,
+ we treat DirA and dira as the same directory.
+ """
if gitConfigBool("core.ignorecase"):
return path.lower().startswith(prefix.lower())
return path.startswith(prefix)
+
def getClientSpec():
"""Look at the p4 client spec, create a View() object that contains
- all the mappings, and return it."""
+ all the mappings, and return it.
+ """
- specList = p4CmdList("client -o")
+ specList = p4CmdList(["client", "-o"])
if len(specList) != 1:
die('Output from "client -o" is %d lines, expecting 1' %
len(specList))
@@ -1199,7 +1358,7 @@ def getClientSpec():
client_name = entry["Client"]
# just the keys that start with "View"
- view_keys = [ k for k in entry.keys() if k.startswith("View") ]
+ view_keys = [k for k in entry.keys() if k.startswith("View")]
# hold this new View
view = View(client_name)
@@ -1213,10 +1372,11 @@ def getClientSpec():
return view
+
def getClientRoot():
"""Grab the client directory."""
- output = p4CmdList("client -o")
+ output = p4CmdList(["client", "-o"])
if len(output) != 1:
die('Output from "client -o" is %d lines, expecting 1' % len(output))
@@ -1226,12 +1386,15 @@ def getClientRoot():
return entry["Root"]
-#
-# P4 wildcards are not allowed in filenames. P4 complains
-# if you simply add them, but you can force it with "-f", in
-# which case it translates them into %xx encoding internally.
-#
+
def wildcard_decode(path):
+ """Decode P4 wildcards into %xx encoding
+
+ P4 wildcards are not allowed in filenames. P4 complains if you simply
+ add them, but you can force it with "-f", in which case it translates
+ them into %xx encoding internally.
+ """
+
# Search for and fix just these four characters. Do % last so
# that fixing it does not inadvertently create new %-escapes.
# Cannot have * in a filename in windows; untested as to
@@ -1243,7 +1406,10 @@ def wildcard_decode(path):
.replace("%25", "%")
return path
+
def wildcard_encode(path):
+ """Encode %xx coded wildcards into P4 coding."""
+
# do % first to avoid double-encoding the %s introduced here
path = path.replace("%", "%25") \
.replace("*", "%2A") \
@@ -1251,10 +1417,12 @@ def wildcard_encode(path):
.replace("@", "%40")
return path
+
def wildcard_present(path):
m = re.search("[*#@%]", path)
return m is not None
+
class LargeFileSystem(object):
"""Base class for large file system support."""
@@ -1263,13 +1431,15 @@ def __init__(self, writeToGitStream):
self.writeToGitStream = writeToGitStream
def generatePointer(self, cloneDestination, contentFile):
- """Return the content of a pointer file that is stored in Git instead of
- the actual content."""
+ """Return the content of a pointer file that is stored in Git instead
+ of the actual content.
+ """
assert False, "Method 'generatePointer' required in " + self.__class__.__name__
def pushFile(self, localLargeFile):
"""Push the actual content which is not stored in the Git repository to
- a server."""
+ a server.
+ """
assert False, "Method 'pushFile' required in " + self.__class__.__name__
def hasLargeFileExtension(self, relPath):
@@ -1317,10 +1487,11 @@ def isLargeFile(self, relPath):
def processContent(self, git_mode, relPath, contents):
"""Processes the content of git fast import. This method decides if a
file is stored in the large file system and handles all necessary
- steps."""
+ steps.
+ """
if self.exceedsLargeFileThreshold(relPath, contents) or self.hasLargeFileExtension(relPath):
contentTempFile = self.generateTempFile(contents)
- (pointer_git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile)
+ pointer_git_mode, contents, localLargeFile = self.generatePointer(contentTempFile)
if pointer_git_mode:
git_mode = pointer_git_mode
if localLargeFile:
@@ -1336,12 +1507,14 @@ def processContent(self, git_mode, relPath, contents):
sys.stderr.write("%s moved to large file system (%s)\n" % (relPath, localLargeFile))
return (git_mode, contents)
+
class MockLFS(LargeFileSystem):
"""Mock large file system for testing."""
def generatePointer(self, contentFile):
"""The pointer content is the original content prefixed with "pointer-".
- The local filename of the large file storage is derived from the file content.
+ The local filename of the large file storage is derived from the
+ file content.
"""
with open(contentFile, 'r') as f:
content = next(f)
@@ -1351,17 +1524,19 @@ def generatePointer(self, contentFile):
return (gitMode, pointerContents, localLargeFile)
def pushFile(self, localLargeFile):
- """The remote filename of the large file storage is the same as the local
- one but in a different directory.
+ """The remote filename of the large file storage is the same as the
+ local one but in a different directory.
"""
remotePath = os.path.join(os.path.dirname(localLargeFile), '..', 'remote')
if not os.path.exists(remotePath):
os.makedirs(remotePath)
shutil.copyfile(localLargeFile, os.path.join(remotePath, os.path.basename(localLargeFile)))
+
class GitLFS(LargeFileSystem):
"""Git LFS as backend for the git-p4 large file system.
- See https://git-lfs.github.com/ for details."""
+ See https://git-lfs.github.com/ for details.
+ """
def __init__(self, *args):
LargeFileSystem.__init__(self, *args)
@@ -1447,9 +1622,10 @@ def processContent(self, git_mode, relPath, contents):
else:
return LargeFileSystem.processContent(self, git_mode, relPath, contents)
+
class Command:
- delete_actions = ( "delete", "move/delete", "purge" )
- add_actions = ( "add", "branch", "move/add" )
+ delete_actions = ("delete", "move/delete", "purge")
+ add_actions = ("add", "branch", "move/add")
def __init__(self):
self.usage = "usage: %prog [options]"
@@ -1462,6 +1638,7 @@ def ensure_value(self, attr, value):
setattr(self, attr, value)
return getattr(self, attr)
+
class P4UserMap:
def __init__(self):
self.userMapFromPerforceServer = False
@@ -1471,7 +1648,7 @@ def p4UserId(self):
if self.myP4UserId:
return self.myP4UserId
- results = p4CmdList("user -o")
+ results = p4CmdList(["user", "-o"])
for r in results:
if 'User' in r:
self.myP4UserId = r['User']
@@ -1479,7 +1656,7 @@ def p4UserId(self):
die("Could not find your p4 user id")
def p4UserIsMe(self, p4User):
- # return True if the given p4 user is actually me
+ """Return True if the given p4 user is actually me."""
me = self.p4UserId()
if not p4User or p4User != me:
return False
@@ -1496,10 +1673,16 @@ def getUserMapFromPerforceServer(self):
self.users = {}
self.emails = {}
- for output in p4CmdList("users"):
+ for output in p4CmdList(["users"]):
if "User" not in output:
continue
- self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
+ # "FullName" is bytes. "Email" on the other hand might be bytes
+ # or unicode string depending on whether we are running under
+ # python2 or python3. To support
+ # git-p4.metadataDecodingStrategy=fallback, self.users dict values
+ # are always bytes, ready to be written to git.
+ emailbytes = metadata_stream_to_writable_bytes(output["Email"])
+ self.users[output["User"]] = output["FullName"] + b" <" + emailbytes + b">"
self.emails[output["Email"]] = output["User"]
mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE)
@@ -1509,102 +1692,31 @@ def getUserMapFromPerforceServer(self):
user = mapUser[0][0]
fullname = mapUser[0][1]
email = mapUser[0][2]
- self.users[user] = fullname + " <" + email + ">"
+ fulluser = fullname + " <" + email + ">"
+ self.users[user] = metadata_stream_to_writable_bytes(fulluser)
self.emails[email] = user
- s = ''
+ s = b''
for (key, val) in self.users.items():
- s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1))
+ keybytes = metadata_stream_to_writable_bytes(key)
+ s += b"%s\t%s\n" % (keybytes.expandtabs(1), val.expandtabs(1))
- open(self.getUserCacheFilename(), 'w').write(s)
+ open(self.getUserCacheFilename(), 'wb').write(s)
self.userMapFromPerforceServer = True
def loadUserMapFromCache(self):
self.users = {}
self.userMapFromPerforceServer = False
try:
- cache = open(self.getUserCacheFilename(), 'r')
+ cache = open(self.getUserCacheFilename(), 'rb')
lines = cache.readlines()
cache.close()
for line in lines:
- entry = line.strip().split("\t")
- self.users[entry[0]] = entry[1]
+ entry = line.strip().split(b"\t")
+ self.users[entry[0].decode('utf_8')] = entry[1]
except IOError:
self.getUserMapFromPerforceServer()
-class P4Debug(Command):
- def __init__(self):
- Command.__init__(self)
- self.options = []
- self.description = "A tool to debug the output of p4 -G."
- self.needsGit = False
-
- def run(self, args):
- j = 0
- for output in p4CmdList(args):
- print('Element: %d' % j)
- j += 1
- print(output)
- return True
-
-class P4RollBack(Command):
- def __init__(self):
- Command.__init__(self)
- self.options = [
- optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")
- ]
- self.description = "A tool to debug the multi-branch import. Don't use :)"
- self.rollbackLocalBranches = False
-
- def run(self, args):
- if len(args) != 1:
- return False
- maxChange = int(args[0])
-
- if "p4ExitCode" in p4Cmd("changes -m 1"):
- die("Problems executing p4");
-
- if self.rollbackLocalBranches:
- refPrefix = "refs/heads/"
- lines = read_pipe_lines("git rev-parse --symbolic --branches")
- else:
- refPrefix = "refs/remotes/"
- lines = read_pipe_lines("git rev-parse --symbolic --remotes")
-
- for line in lines:
- if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
- line = line.strip()
- ref = refPrefix + line
- log = extractLogMessageFromGitCommit(ref)
- settings = extractSettingsGitLog(log)
-
- depotPaths = settings['depot-paths']
- change = settings['change']
-
- changed = False
-
- if len(p4Cmd("changes -m 1 " + ' '.join (['%s...@%s' % (p, maxChange)
- for p in depotPaths]))) == 0:
- print("Branch %s did not exist at change %s, deleting." % (ref, maxChange))
- system("git update-ref -d %s `git rev-parse %s`" % (ref, ref))
- continue
-
- while change and int(change) > maxChange:
- changed = True
- if self.verbose:
- print("%s is at %s ; rewinding towards %s" % (ref, change, maxChange))
- system("git update-ref %s \"%s^\"" % (ref, ref))
- log = extractLogMessageFromGitCommit(ref)
- settings = extractSettingsGitLog(log)
-
-
- depotPaths = settings['depot-paths']
- change = settings['change']
-
- if changed:
- print("%s rewound to %s" % (ref, change))
-
- return True
class P4Submit(Command, P4UserMap):
@@ -1694,24 +1806,24 @@ def __init__(self):
die("Large file system not supported for git-p4 submit command. Please remove it from config.")
def check(self):
- if len(p4CmdList("opened ...")) > 0:
+ if len(p4CmdList(["opened", "..."])) > 0:
die("You have files opened with perforce! Close them before starting the sync.")
def separate_jobs_from_description(self, message):
- """Extract and return a possible Jobs field in the commit
- message. It goes into a separate section in the p4 change
- specification.
+ """Extract and return a possible Jobs field in the commit message. It
+ goes into a separate section in the p4 change specification.
- A jobs line starts with "Jobs:" and looks like a new field
- in a form. Values are white-space separated on the same
- line or on following lines that start with a tab.
+ A jobs line starts with "Jobs:" and looks like a new field in a
+ form. Values are white-space separated on the same line or on
+ following lines that start with a tab.
- This does not parse and extract the full git commit message
- like a p4 form. It just sees the Jobs: line as a marker
- to pass everything from then on directly into the p4 form,
- but outside the description section.
+ This does not parse and extract the full git commit message like a
+ p4 form. It just sees the Jobs: line as a marker to pass everything
+ from then on directly into the p4 form, but outside the description
+ section.
- Return a tuple (stripped log message, jobs string)."""
+ Return a tuple (stripped log message, jobs string).
+ """
m = re.search(r'^Jobs:', message, re.MULTILINE)
if m is None:
@@ -1722,9 +1834,10 @@ def separate_jobs_from_description(self, message):
return (stripped_message, jobtext)
def prepareLogMessage(self, template, message, jobs):
- """Edits the template returned from "p4 change -o" to insert
- the message in the Description field, and the jobs text in
- the Jobs field."""
+ """Edits the template returned from "p4 change -o" to insert the
+ message in the Description field, and the jobs text in the Jobs
+ field.
+ """
result = ""
inDescriptionSection = False
@@ -1753,18 +1866,15 @@ def prepareLogMessage(self, template, message, jobs):
return result
- def patchRCSKeywords(self, file, pattern):
- # Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern
- (handle, outFileName) = tempfile.mkstemp(dir='.')
+ def patchRCSKeywords(self, file, regexp):
+ """Attempt to zap the RCS keywords in a p4 controlled file matching the
+ given regex.
+ """
+ handle, outFileName = tempfile.mkstemp(dir='.')
try:
- outFile = os.fdopen(handle, "w+")
- inFile = open(file, "r")
- regexp = re.compile(pattern, re.VERBOSE)
- for line in inFile.readlines():
- line = regexp.sub(r'$\1$', line)
- outFile.write(line)
- inFile.close()
- outFile.close()
+ with os.fdopen(handle, "wb") as outFile, open(file, "rb") as inFile:
+ for line in inFile.readlines():
+ outFile.write(regexp.sub(br'$\1$', line))
# Forcibly overwrite the original file
os.unlink(file)
shutil.move(outFileName, file)
@@ -1776,21 +1886,23 @@ def patchRCSKeywords(self, file, pattern):
print("Patched up RCS keywords in %s" % file)
- def p4UserForCommit(self,id):
- # Return the tuple (perforce user,git email) for a given git commit id
+ def p4UserForCommit(self, id):
+ """Return the tuple (perforce user,git email) for a given git commit
+ id.
+ """
self.getUserMapFromPerforceServer()
gitEmail = read_pipe(["git", "log", "--max-count=1",
"--format=%ae", id])
gitEmail = gitEmail.strip()
if gitEmail not in self.emails:
- return (None,gitEmail)
+ return (None, gitEmail)
else:
- return (self.emails[gitEmail],gitEmail)
+ return (self.emails[gitEmail], gitEmail)
- def checkValidP4Users(self,commits):
- # check if any git authors cannot be mapped to p4 users
+ def checkValidP4Users(self, commits):
+ """Check if any git authors cannot be mapped to p4 users."""
for id in commits:
- (user,email) = self.p4UserForCommit(id)
+ user, email = self.p4UserForCommit(id)
if not user:
msg = "Cannot find p4 user for email %s in commit %s." % (email, id)
if gitConfigBool("git-p4.allowMissingP4Users"):
@@ -1799,11 +1911,13 @@ def checkValidP4Users(self,commits):
die("Error: %s\nSet git-p4.allowMissingP4Users to true to allow this." % msg)
def lastP4Changelist(self):
- # Get back the last changelist number submitted in this client spec. This
- # then gets used to patch up the username in the change. If the same
- # client spec is being used by multiple processes then this might go
- # wrong.
- results = p4CmdList("client -o") # find the current client
+ """Get back the last changelist number submitted in this client spec.
+
+ This then gets used to patch up the username in the change. If the
+ same client spec is being used by multiple processes then this might
+ go wrong.
+ """
+ results = p4CmdList(["client", "-o"]) # find the current client
client = None
for r in results:
if 'Client' in r:
@@ -1818,19 +1932,21 @@ def lastP4Changelist(self):
die("Could not get changelist number for last submit - cannot patch up user details")
def modifyChangelistUser(self, changelist, newUser):
- # fixup the user field of a changelist after it has been submitted.
- changes = p4CmdList("change -o %s" % changelist)
+ """Fixup the user field of a changelist after it has been submitted."""
+ changes = p4CmdList(["change", "-o", changelist])
if len(changes) != 1:
die("Bad output from p4 change modifying %s to user %s" %
(changelist, newUser))
c = changes[0]
- if c['User'] == newUser: return # nothing to do
+ if c['User'] == newUser:
+ # Nothing to do
+ return
c['User'] = newUser
# p4 does not understand format version 3 and above
input = marshal.dumps(c, 2)
- result = p4CmdList("change -f -i", stdin=input)
+ result = p4CmdList(["change", "-f", "-i"], stdin=input)
for r in result:
if 'code' in r:
if r['code'] == 'error':
@@ -1841,8 +1957,9 @@ def modifyChangelistUser(self, changelist, newUser):
die("Could not modify user field of changelist %s to %s" % (changelist, newUser))
def canChangeChangelists(self):
- # check to see if we have p4 admin or super-user permissions, either of
- # which are required to modify changelists.
+ """Check to see if we have p4 admin or super-user permissions, either
+ of which are required to modify changelists.
+ """
results = p4CmdList(["protects", self.depotPath])
for r in results:
if 'perm' in r:
@@ -1854,13 +1971,15 @@ def canChangeChangelists(self):
def prepareSubmitTemplate(self, changelist=None):
"""Run "p4 change -o" to grab a change specification template.
+
This does not use "p4 -G", as it is nice to keep the submission
template in original order, since a human might edit it.
Remove lines in the Files section that show changes to files
- outside the depot path we're committing into."""
+ outside the depot path we're committing into.
+ """
- [upstream, settings] = findUpstreamBranchPoint()
+ upstream, settings = findUpstreamBranchPoint()
template = """\
# A Perforce Change Specification.
@@ -1921,8 +2040,10 @@ def prepareSubmitTemplate(self, changelist=None):
return template
def edit_template(self, template_file):
- """Invoke the editor to let the user change the submission
- message. Return true if okay to continue with the submit."""
+ """Invoke the editor to let the user change the submission message.
+
+ Return true if okay to continue with the submit.
+ """
# if configured to skip the editing part, just submit
if gitConfigBool("git-p4.skipSubmitEdit"):
@@ -1936,7 +2057,7 @@ def edit_template(self, template_file):
if "P4EDITOR" in os.environ and (os.environ.get("P4EDITOR") != ""):
editor = os.environ.get("P4EDITOR")
else:
- editor = read_pipe("git var GIT_EDITOR").strip()
+ editor = read_pipe(["git", "var", "GIT_EDITOR"]).strip()
system(["sh", "-c", ('%s "$@"' % editor), editor, template_file])
# If the file was not saved, prompt to see if this patch should
@@ -1981,7 +2102,9 @@ def get_diff_description(self, editedFiles, filesToAdd, symlinks):
for line in f.readlines():
newdiff += "+" + line
except UnicodeDecodeError:
- pass # Found non-text data and skip, since diff description should only include text
+ # Found non-text data and skip, since diff description
+ # should only include text
+ pass
f.close()
return (diff + newdiff).replace('\r\n', '\n')
@@ -1992,9 +2115,10 @@ def applyCommit(self, id):
print("Applying", read_pipe(["git", "show", "-s",
"--format=format:%h %s", id]))
- (p4User, gitEmail) = self.p4UserForCommit(id)
+ p4User, gitEmail = self.p4UserForCommit(id)
- diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (self.diffOpts, id, id))
+ diff = read_pipe_lines(
+ ["git", "diff-tree", "-r"] + self.diffOpts + ["{}^".format(id), id])
filesToAdd = set()
filesToChangeType = set()
filesToDelete = set()
@@ -2091,25 +2215,24 @@ def applyCommit(self, id):
# the patch to see if that's possible.
if gitConfigBool("git-p4.attemptRCSCleanup"):
file = None
- pattern = None
kwfiles = {}
for file in editedFiles | filesToDelete:
# did this file's delta contain RCS keywords?
- pattern = p4_keywords_regexp_for_file(file)
-
- if pattern:
+ regexp = p4_keywords_regexp_for_file(file)
+ if regexp:
# this file is a possibility...look for RCS keywords.
- regexp = re.compile(pattern, re.VERBOSE)
- for line in read_pipe_lines(["git", "diff", "%s^..%s" % (id, id), file]):
+ for line in read_pipe_lines(
+ ["git", "diff", "%s^..%s" % (id, id), file],
+ raw=True):
if regexp.search(line):
if verbose:
- print("got keyword match on %s in %s in %s" % (pattern, line, file))
- kwfiles[file] = pattern
+ print("got keyword match on %s in %s in %s" % (regex.pattern, line, file))
+ kwfiles[file] = regexp
break
- for file in kwfiles:
+ for file, regexp in kwfiles.items():
if verbose:
- print("zapping %s with %s" % (line,pattern))
+ print("zapping %s with %s" % (line, regexp.pattern))
# File is being deleted, so not open in p4. Must
# disable the read-only bit on windows.
if self.isWindows and file not in editedFiles:
@@ -2131,7 +2254,7 @@ def applyCommit(self, id):
#
# Apply the patch for real, and do add/delete/+x handling.
#
- system(applyPatchCmd)
+ system(applyPatchCmd, shell=True)
for f in filesToChangeType:
p4_edit(f, "-t", "auto")
@@ -2157,13 +2280,13 @@ def applyCommit(self, id):
#
logMessage = extractLogMessageFromGitCommit(id)
logMessage = logMessage.strip()
- (logMessage, jobs) = self.separate_jobs_from_description(logMessage)
+ logMessage, jobs = self.separate_jobs_from_description(logMessage)
template = self.prepareSubmitTemplate(update_shelve)
submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
if self.preserveUser:
- submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User
+ submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User
if self.checkAuthorship and not self.p4UserIsMe(p4User):
submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
@@ -2175,7 +2298,7 @@ def applyCommit(self, id):
submitTemplate += separatorLine
submitTemplate += self.get_diff_description(editedFiles, filesToAdd, symlinks)
- (handle, fileName) = tempfile.mkstemp()
+ handle, fileName = tempfile.mkstemp()
tmpFile = os.fdopen(handle, "w+b")
if self.isWindows:
submitTemplate = submitTemplate.replace("\n", "\r\n")
@@ -2202,13 +2325,13 @@ def applyCommit(self, id):
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" \
+ 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" \
+ 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.")
@@ -2276,9 +2399,9 @@ def applyCommit(self, id):
# Revert changes if we skip this patch
if not submitted or self.shelve:
if self.shelve:
- print ("Reverting shelved files.")
+ print("Reverting shelved files.")
else:
- print ("Submission cancelled, undoing p4 changes.")
+ print("Submission cancelled, undoing p4 changes.")
sys.stdout.flush()
for f in editedFiles | filesToDelete:
p4_revert(f)
@@ -2290,9 +2413,11 @@ def applyCommit(self, id):
os.remove(fileName)
return submitted
- # Export git tags as p4 labels. Create a p4 label and then tag
- # with that.
def exportGitTags(self, gitTags):
+ """Export git tags as p4 labels. Create a p4 label and then tag with
+ that.
+ """
+
validLabelRegexp = gitConfig("git-p4.labelExportRegexp")
if len(validLabelRegexp) == 0:
validLabelRegexp = defaultLabelRegexp
@@ -2338,7 +2463,7 @@ def exportGitTags(self, gitTags):
# Create the label - use the same view as the client spec we are using
clientSpec = getClientSpec()
- labelTemplate = "Label: %s\n" % name
+ labelTemplate = "Label: %s\n" % name
labelTemplate += "Description:\n"
for b in body:
labelTemplate += "\t" + b + "\n"
@@ -2349,7 +2474,7 @@ def exportGitTags(self, gitTags):
if self.dry_run:
print("Would create p4 label %s for tag" % name)
elif self.prepare_p4_only:
- print("Not creating p4 label %s for tag due to option" \
+ print("Not creating p4 label %s for tag due to option"
" --prepare-p4-only" % name)
else:
p4_write_pipe(["label", "-i"], labelTemplate)
@@ -2380,7 +2505,7 @@ def run(self, args):
if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
die("%s is not in git-p4.allowSubmit" % self.master)
- [upstream, settings] = findUpstreamBranchPoint()
+ upstream, settings = findUpstreamBranchPoint()
self.depotPath = settings['depot-paths'][0]
if len(self.origin) == 0:
self.origin = upstream
@@ -2481,17 +2606,17 @@ def run(self, args):
#
if self.detectRenames:
# command-line -M arg
- self.diffOpts = "-M"
+ self.diffOpts = ["-M"]
else:
# If not explicitly set check the config variable
detectRenames = gitConfig("git-p4.detectRenames")
if detectRenames.lower() == "false" or detectRenames == "":
- self.diffOpts = ""
+ self.diffOpts = []
elif detectRenames.lower() == "true":
- self.diffOpts = "-M"
+ self.diffOpts = ["-M"]
else:
- self.diffOpts = "-M%s" % detectRenames
+ self.diffOpts = ["-M{}".format(detectRenames)]
# no command-line arg for -C or --find-copies-harder, just
# config variables
@@ -2499,12 +2624,12 @@ def run(self, args):
if detectCopies.lower() == "false" or detectCopies == "":
pass
elif detectCopies.lower() == "true":
- self.diffOpts += " -C"
+ self.diffOpts.append("-C")
else:
- self.diffOpts += " -C%s" % detectCopies
+ self.diffOpts.append("-C{}".format(detectCopies))
if gitConfigBool("git-p4.detectCopiesHarder"):
- self.diffOpts += " --find-copies-harder"
+ self.diffOpts.append("--find-copies-harder")
num_shelves = len(self.update_shelve)
if num_shelves > 0 and num_shelves != len(commits):
@@ -2514,13 +2639,13 @@ def run(self, args):
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', " \
+ 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) )
+ print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed "
+ "with the error '{0}'".format(e.message))
sys.exit(1)
#
@@ -2542,7 +2667,7 @@ def run(self, args):
applied.append(commit)
if self.prepare_p4_only:
if i < last:
- print("Processing only the first commit due to option" \
+ print("Processing only the first commit due to option"
" --prepare-p4-only")
break
else:
@@ -2612,13 +2737,15 @@ def run(self, args):
# exit with error unless everything applied perfectly
if len(commits) != len(applied):
- sys.exit(1)
+ sys.exit(1)
return True
+
class View(object):
- """Represent a p4 view ("p4 help views"), and map files in a
- repo according to the view."""
+ """Represent a p4 view ("p4 help views"), and map files in a repo according
+ to the view.
+ """
def __init__(self, client_name):
self.mappings = []
@@ -2627,9 +2754,10 @@ def __init__(self, client_name):
self.client_spec_path_cache = {}
def append(self, view_line):
- """Parse a view line, splitting it into depot and client
- sides. Append to self.mappings, preserving order. This
- is only needed for tag creation."""
+ """Parse a view line, splitting it into depot and client sides. Append
+ to self.mappings, preserving order. This is only needed for tag
+ creation.
+ """
# Split the view line into exactly two words. P4 enforces
# structure on these lines that simplifies this quite a bit.
@@ -2678,7 +2806,7 @@ def convert_client_path(self, clientFile):
return clientFile[len(self.client_prefix):]
def update_client_spec_path_cache(self, files):
- """ Caching file paths by "p4 where" batch query """
+ """Caching file paths by "p4 where" batch query."""
# List depot file paths exclude that already cached
fileArgs = [f['path'] for f in files if decode_path(f['path']) not in self.client_spec_path_cache]
@@ -2710,9 +2838,11 @@ def update_client_spec_path_cache(self, files):
self.client_spec_path_cache[depotFile] = b''
def map_in_client(self, depot_path):
- """Return the relative location in the client where this
- depot file should live. Returns "" if the file should
- not be mapped in the client."""
+ """Return the relative location in the client where this depot file
+ should live.
+
+ Returns "" if the file should not be mapped in the client.
+ """
if gitConfigBool("core.ignorecase"):
depot_path = depot_path.lower()
@@ -2720,14 +2850,16 @@ def map_in_client(self, depot_path):
if depot_path in self.client_spec_path_cache:
return self.client_spec_path_cache[depot_path]
- die( "Error: %s is not found in client spec path" % depot_path )
+ die("Error: %s is not found in client spec path" % depot_path)
return ""
+
def cloneExcludeCallback(option, opt_str, value, parser):
# prepend "/" because the first "/" was consumed as part of the option itself.
# ("-//depot/A/..." becomes "/depot/A/..." after option parsing)
parser.values.cloneExclude += ["/" + re.sub(r"\.\.\.$", "", value)]
+
class P4Sync(Command, P4UserMap):
def __init__(self):
@@ -2808,8 +2940,8 @@ def __init__(self):
self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
self.labels = {}
- # Force a checkpoint in fast-import and wait for it to finish
def checkpoint(self):
+ """Force a checkpoint in fast-import and wait for it to finish."""
self.gitStream.write("checkpoint\n\n")
self.gitStream.write("progress checkpoint\n\n")
self.gitStream.flush()
@@ -2830,11 +2962,11 @@ def isPathWanted(self, path):
return True
return False
- def extractFilesFromCommit(self, commit, shelved=False, shelved_cl = 0):
+ def extractFilesFromCommit(self, commit, shelved=False, shelved_cl=0):
files = []
fnum = 0
while "depotFile%s" % fnum in commit:
- path = commit["depotFile%s" % fnum]
+ path = commit["depotFile%s" % fnum]
found = self.isPathWanted(decode_path(path))
if not found:
fnum = fnum + 1
@@ -2861,10 +2993,10 @@ def extractJobsFromCommit(self, commit):
return jobs
def stripRepoPath(self, path, prefixes):
- """When streaming files, this is called to map a p4 depot path
- to where it should go in git. The prefixes are either
- self.depotPaths, or self.branchPrefixes in the case of
- branch detection."""
+ """When streaming files, this is called to map a p4 depot path to where
+ it should go in git. The prefixes are either self.depotPaths, or
+ self.branchPrefixes in the case of branch detection.
+ """
if self.useClientSpec:
# branch detection moves files up a level (the branch name)
@@ -2893,8 +3025,9 @@ def stripRepoPath(self, path, prefixes):
return path
def splitFilesIntoBranches(self, commit):
- """Look at each depotFile in the commit to figure out to what
- branch it belongs."""
+ """Look at each depotFile in the commit to figure out to what branch it
+ belongs.
+ """
if self.clientSpecDirs:
files = self.extractFilesFromCommit(commit)
@@ -2954,10 +3087,12 @@ def encodeWithUTF8(self, path):
print('Path with non-ASCII characters detected. Used %s to encode: %s ' % (encoding, path))
return path
- # output one file from the P4 stream
- # - helper for streamP4Files
-
def streamOneP4File(self, file, contents):
+ """Output one file from the P4 stream.
+
+ This is a helper for streamP4Files().
+ """
+
file_path = file['depotFile']
relPath = self.stripRepoPath(decode_path(file_path), self.branchPrefixes)
@@ -2965,11 +3100,13 @@ def streamOneP4File(self, file, contents):
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_path, relPath, size/1024/1024))
+ # Deleted files don't get a fileSize apparently
+ size = 0
+ sys.stdout.write('\r%s --> %s (%s)\n' % (
+ file_path, relPath, format_size_human_readable(size)))
sys.stdout.flush()
- (type_base, type_mods) = split_p4_type(file["type"])
+ type_base, type_mods = split_p4_type(file["type"])
git_mode = "100644"
if "x" in type_mods:
@@ -3012,7 +3149,7 @@ def streamOneP4File(self, file, contents):
else:
if p4_version_string().find('/NT') >= 0:
text = text.replace(b'\r\n', b'\n')
- contents = [ text ]
+ contents = [text]
if type_base == "apple":
# Apple filetype files will be streamed as a concatenation of
@@ -3027,17 +3164,24 @@ def streamOneP4File(self, file, contents):
print("\nIgnoring apple filetype file %s" % file['depotFile'])
return
+ if type_base == "utf8":
+ # The type utf8 explicitly means utf8 *with BOM*. These are
+ # streamed just like regular text files, however, without
+ # the BOM in the stream.
+ # Therefore, to accurately import these files into git, we
+ # need to explicitly re-add the BOM before writing.
+ # 'contents' is a set of bytes in this case, so create the
+ # BOM prefix as a b'' literal.
+ contents = [b'\xef\xbb\xbf' + contents[0]] + contents[1:]
+
# Note that we do not try to de-mangle keywords on utf16 files,
# even though in theory somebody may want that.
- pattern = p4_keywords_regexp_for_type(type_base, type_mods)
- if pattern:
- regexp = re.compile(pattern, re.VERBOSE)
- text = ''.join(decode_text_stream(c) for c in contents)
- text = regexp.sub(r'$\1$', text)
- contents = [ encode_text_stream(text) ]
+ regexp = p4_keywords_regexp_for_type(type_base, type_mods)
+ if regexp:
+ contents = [regexp.sub(br'$\1$', c) for c in contents]
if self.largeFileSystem:
- (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)
+ git_mode, contents = self.largeFileSystem.processContent(git_mode, relPath, contents)
self.writeToGitStream(git_mode, relPath, contents)
@@ -3051,8 +3195,8 @@ def streamOneP4Deletion(self, file):
if self.largeFileSystem and self.largeFileSystem.isLargeFile(relPath):
self.largeFileSystem.removeLargeFile(relPath)
- # handle another chunk of streaming data
def streamP4FilesCb(self, marshalled):
+ """Handle another chunk of streaming data."""
# catch p4 errors and complain
err = None
@@ -3064,9 +3208,8 @@ def streamP4FilesCb(self, marshalled):
if not err and 'fileSize' in self.stream_file:
required_bytes = int((4 * int(self.stream_file["fileSize"])) - calcDiskFree())
if required_bytes > 0:
- err = 'Not enough space left on %s! Free at least %i MB.' % (
- os.getcwd(), required_bytes/1024/1024
- )
+ err = 'Not enough space left on %s! Free at least %s.' % (
+ os.getcwd(), format_size_human_readable(required_bytes))
if err:
f = None
@@ -3104,19 +3247,22 @@ def streamP4FilesCb(self, marshalled):
self.stream_file[k] = marshalled[k]
if (verbose and
- 'streamContentSize' in self.stream_file and
- 'fileSize' in self.stream_file and
- 'depotFile' in self.stream_file):
+ 'streamContentSize' in self.stream_file and
+ 'fileSize' in self.stream_file and
+ 'depotFile' in self.stream_file):
size = int(self.stream_file["fileSize"])
if size > 0:
progress = 100*self.stream_file['streamContentSize']/size
- sys.stdout.write('\r%s %d%% (%i MB)' % (self.stream_file['depotFile'], progress, int(size/1024/1024)))
+ sys.stdout.write('\r%s %d%% (%s)' % (
+ self.stream_file['depotFile'], progress,
+ format_size_human_readable(size)))
sys.stdout.flush()
self.stream_have_file_info = True
- # Stream directly from "p4 files" into "git fast-import"
def streamP4Files(self, files):
+ """Stream directly from "p4 files" into "git fast-import."""
+
filesForCommit = []
filesToRead = []
filesToDelete = []
@@ -3164,12 +3310,14 @@ def make_email(self, userid):
if userid in self.users:
return self.users[userid]
else:
- return "%s <a@b>" % userid
+ userid_bytes = metadata_stream_to_writable_bytes(userid)
+ return b"%s <a@b>" % userid_bytes
def streamTag(self, gitStream, labelName, labelDetails, commit, epoch):
- """ Stream a p4 tag.
- commit is either a git commit, or a fast-import mark, ":<p4commit>"
- """
+ """Stream a p4 tag.
+
+ Commit is either a git commit, or a fast-import mark, ":<p4commit>".
+ """
if verbose:
print("writing tag %s for commit %s" % (labelName, commit))
@@ -3187,11 +3335,12 @@ def streamTag(self, gitStream, labelName, labelDetails, commit, epoch):
email = self.make_email(owner)
else:
email = self.make_email(self.p4UserId())
- tagger = "%s %s %s" % (email, epoch, self.tz)
- gitStream.write("tagger %s\n" % tagger)
+ gitStream.write("tagger ")
+ gitStream.write(email)
+ gitStream.write(" %s %s\n" % (epoch, self.tz))
- print("labelDetails=",labelDetails)
+ print("labelDetails=", labelDetails)
if 'Description' in labelDetails:
description = labelDetails['Description']
else:
@@ -3219,15 +3368,18 @@ def hasBranchPrefix(self, 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.
+ """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:
@@ -3254,7 +3406,7 @@ def findShadowedFiles(self, files, change):
'rev': record['headRev'],
'type': record['headType']})
- def commit(self, details, files, branch, parent = "", allow_empty=False):
+ def commit(self, details, files, branch, parent="", allow_empty=False):
epoch = details["time"]
author = details["user"]
jobs = self.extractJobsFromCommit(details)
@@ -3282,12 +3434,12 @@ def commit(self, details, files, branch, parent = "", allow_empty=False):
self.gitStream.write("commit %s\n" % branch)
self.gitStream.write("mark :%s\n" % details["change"])
self.committedChanges.add(int(details["change"]))
- committer = ""
if author not in self.users:
self.getUserMapFromPerforceServer()
- committer = "%s %s %s" % (self.make_email(author), epoch, self.tz)
- self.gitStream.write("committer %s\n" % committer)
+ self.gitStream.write("committer ")
+ self.gitStream.write(self.make_email(author))
+ self.gitStream.write(" %s %s\n" % (epoch, self.tz))
self.gitStream.write("data <<EOT\n")
self.gitStream.write(details["desc"])
@@ -3344,8 +3496,11 @@ def commit(self, details, files, branch, parent = "", allow_empty=False):
print("Tag %s does not match with change %s: file count is different."
% (labelDetails["label"], change))
- # Build a dictionary of changelists and labels, for "detect-labels" option.
def getLabels(self):
+ """Build a dictionary of changelists and labels, for "detect-labels"
+ option.
+ """
+
self.labels = {}
l = p4CmdList(["labels"] + ["%s..." % p for p in self.depotPaths])
@@ -3371,11 +3526,12 @@ def getLabels(self):
if self.verbose:
print("Label changes: %s" % self.labels.keys())
- # Import p4 labels as git tags. A direct mapping does not
- # exist, so assume that if all the files are at the same revision
- # then we can use that, or it's something more complicated we should
- # just ignore.
def importP4Labels(self, stream, p4Labels):
+ """Import p4 labels as git tags. A direct mapping does not exist, so
+ assume that if all the files are at the same revision then we can
+ use that, or it's something more complicated we should just ignore.
+ """
+
if verbose:
print("import p4 labels: " + ' '.join(p4Labels))
@@ -3390,7 +3546,7 @@ def importP4Labels(self, stream, p4Labels):
if not m.match(name):
if verbose:
- print("label %s does not match regexp %s" % (name,validLabelRegexp))
+ print("label %s does not match regexp %s" % (name, validLabelRegexp))
continue
if name in ignoredP4Labels:
@@ -3446,19 +3602,16 @@ def guessProjectName(self):
p = p[:-1]
p = p[p.strip().rfind("/") + 1:]
if not p.endswith("/"):
- p += "/"
+ p += "/"
return p
def getBranchMapping(self):
lostAndFoundBranches = set()
user = gitConfig("git-p4.branchUser")
- if len(user) > 0:
- command = "branches -u %s" % user
- else:
- command = "branches"
- for info in p4CmdList(command):
+ for info in p4CmdList(
+ ["branches"] + (["-u", user] if len(user) > 0 else [])):
details = p4Cmd(["branch", "-o", info["branch"]])
viewIdx = 0
while "View%s" % viewIdx in details:
@@ -3469,7 +3622,7 @@ def getBranchMapping(self):
continue
source = paths[0]
destination = paths[1]
- ## HACK
+ # HACK
if p4PathStartsWith(source, self.depotPaths[0]) and p4PathStartsWith(destination, self.depotPaths[0]):
source = source[len(self.depotPaths[0]):-4]
destination = destination[len(self.depotPaths[0]):-4]
@@ -3498,7 +3651,7 @@ def getBranchMapping(self):
configBranches = gitConfigList("git-p4.branchList")
for branch in configBranches:
if branch:
- (source, destination) = branch.split(":")
+ source, destination = branch.split(":")
self.knownBranches[destination] = source
lostAndFoundBranches.discard(destination)
@@ -3506,7 +3659,6 @@ def getBranchMapping(self):
if source not in self.knownBranches:
lostAndFoundBranches.add(source)
-
for branch in lostAndFoundBranches:
self.knownBranches[branch] = branch
@@ -3549,7 +3701,8 @@ def gitCommitByP4Change(self, ref, change):
while True:
if self.verbose:
print("trying: earliest %s latest %s" % (earliestCommit, latestCommit))
- next = read_pipe("git rev-list --bisect %s %s" % (latestCommit, earliestCommit)).strip()
+ next = read_pipe(["git", "rev-list", "--bisect",
+ latestCommit, earliestCommit]).strip()
if len(next) == 0:
if self.verbose:
print("argh")
@@ -3577,27 +3730,22 @@ def gitCommitByP4Change(self, ref, change):
def importNewBranch(self, branch, maxChange):
# make fast-import flush all changes to disk and update the refs using the checkpoint
# command so that we can try to find the branch parent in the git history
- self.gitStream.write("checkpoint\n\n");
- self.gitStream.flush();
+ self.gitStream.write("checkpoint\n\n")
+ self.gitStream.flush()
branchPrefix = self.depotPaths[0] + branch + "/"
range = "@1,%s" % maxChange
- #print "prefix" + branchPrefix
changes = p4ChangesForPaths([branchPrefix], range, self.changes_block_size)
if len(changes) <= 0:
return False
firstChange = changes[0]
- #print "first change in branch: %s" % firstChange
sourceBranch = self.knownBranches[branch]
sourceDepotPath = self.depotPaths[0] + sourceBranch
sourceRef = self.gitRefForBranch(sourceBranch)
- #print "source " + sourceBranch
branchParentChange = int(p4Cmd(["changes", "-m", "1", "%s...@1,%s" % (sourceDepotPath, firstChange)])["change"])
- #print "branch parent: %s" % branchParentChange
gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)
if len(gitParent) > 0:
self.initialParents[self.gitRefForBranch(branch)] = gitParent
- #print "parent git commit: %s" % gitParent
self.importChanges(changes)
return True
@@ -3623,7 +3771,8 @@ def importChanges(self, changes, origin_revision=0):
self.updateOptionDict(description)
if not self.silent:
- sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
+ sys.stdout.write("\rImporting revision %s (%d%%)" % (
+ change, (cnt * 100) // len(changes)))
sys.stdout.flush()
cnt = cnt + 1
@@ -3631,9 +3780,9 @@ def importChanges(self, changes, origin_revision=0):
if self.detectBranches:
branches = self.splitFilesIntoBranches(description)
for branch in branches.keys():
- ## HACK --hwn
+ # HACK --hwn
branchPrefix = self.depotPaths[0] + branch + "/"
- self.branchPrefixes = [ branchPrefix ]
+ self.branchPrefixes = [branchPrefix]
parent = ""
@@ -3653,12 +3802,12 @@ def importChanges(self, changes, origin_revision=0):
fullBranch = self.projectName + branch
if fullBranch not in self.p4BranchesInGit:
if not self.silent:
- print("\n Importing new branch %s" % fullBranch);
+ print("\n Importing new branch %s" % fullBranch)
if self.importNewBranch(branch, change - 1):
parent = ""
self.p4BranchesInGit.append(fullBranch)
if not self.silent:
- print("\n Resuming with change %s" % change);
+ print("\n Resuming with change %s" % change)
if self.verbose:
print("parent determined through known branches: %s" % parent)
@@ -3704,7 +3853,7 @@ def sync_origin_only(self):
if self.hasOrigin:
if not self.silent:
print('Syncing with origin first, using "git fetch origin"')
- system("git fetch origin")
+ system(["git", "fetch", "origin"])
def importHeadRevision(self, revision):
print("Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), revision, self.branch))
@@ -3717,7 +3866,7 @@ def importHeadRevision(self, revision):
newestRevision = 0
fileCnt = 0
- fileArgs = ["%s...%s" % (p,revision) for p in self.depotPaths]
+ fileArgs = ["%s...%s" % (p, revision) for p in self.depotPaths]
for info in p4CmdList(["files"] + fileArgs):
@@ -3726,24 +3875,21 @@ def importHeadRevision(self, revision):
% info['data'])
if info['data'].find("must refer to client") >= 0:
sys.stderr.write("This particular p4 error is misleading.\n")
- sys.stderr.write("Perhaps the depot path was misspelled.\n");
+ sys.stderr.write("Perhaps the depot path was misspelled.\n")
sys.stderr.write("Depot path: %s\n" % " ".join(self.depotPaths))
sys.exit(1)
if 'p4ExitCode' in info:
sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode'])
sys.exit(1)
-
change = int(info["change"])
if change > newestRevision:
newestRevision = change
if info["action"] in self.delete_actions:
- # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
- #fileCnt = fileCnt + 1
continue
- for prop in ["depotFile", "rev", "action", "type" ]:
+ for prop in ["depotFile", "rev", "action", "type"]:
details["%s%s" % (prop, fileCnt)] = info[prop]
fileCnt = fileCnt + 1
@@ -3763,7 +3909,6 @@ def importHeadRevision(self, revision):
print("IO error details: {}".format(err))
print(self.gitError.read())
-
def importRevisions(self, args, branch_arg_given):
changes = []
@@ -3835,7 +3980,7 @@ def openStreams(self):
self.importProcess = subprocess.Popen(["git", "fast-import"],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
- stderr=subprocess.PIPE);
+ stderr=subprocess.PIPE)
self.gitOutput = self.importProcess.stdout
self.gitStream = self.importProcess.stdin
self.gitError = self.importProcess.stderr
@@ -3871,8 +4016,8 @@ def run(self, args):
if len(self.branch) == 0:
self.branch = self.refPrefix + "master"
if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
- system("git update-ref %s refs/heads/p4" % self.branch)
- system("git branch -D p4")
+ system(["git", "update-ref", self.branch, "refs/heads/p4"])
+ system(["git", "branch", "-D", "p4"])
# accept either the command-line option, or the configuration variable
if self.useClientSpec:
@@ -3895,9 +4040,13 @@ def run(self, args):
# restrict to just this one, disabling detect-branches
if branch_arg_given:
- short = self.branch.split("/")[-1]
+ short = shortP4Ref(self.branch, self.importIntoRemotes)
if short in branches:
- self.p4BranchesInGit = [ short ]
+ self.p4BranchesInGit = [short]
+ elif self.branch.startswith('refs/') and \
+ branchExists(self.branch) and \
+ '[git-p4:' in extractLogMessageFromGitCommit(self.branch):
+ self.p4BranchesInGit = [self.branch]
else:
self.p4BranchesInGit = branches.keys()
@@ -3914,13 +4063,13 @@ def run(self, args):
p4Change = 0
for branch in self.p4BranchesInGit:
- logMsg = extractLogMessageFromGitCommit(self.refPrefix + branch)
+ logMsg = extractLogMessageFromGitCommit(fullP4Ref(branch,
+ self.importIntoRemotes))
settings = extractSettingsGitLog(logMsg)
self.readOptions(settings)
- if ('depot-paths' in settings
- and 'change' in settings):
+ if 'depot-paths' in settings and 'change' in settings:
change = int(settings['change']) + 1
p4Change = max(p4Change, change)
@@ -3937,7 +4086,7 @@ def run(self, args):
i = i - 1
break
- paths.append ("/".join(cur_list[:i + 1]))
+ paths.append("/".join(cur_list[:i + 1]))
self.previousDepotPaths = paths
@@ -3947,18 +4096,7 @@ def run(self, args):
if not self.silent and not self.detectBranches:
print("Performing incremental import into %s git branch" % self.branch)
- # accept multiple ref name abbreviations:
- # refs/foo/bar/branch -> use it exactly
- # p4/branch -> prepend refs/remotes/ or refs/heads/
- # branch -> prepend refs/remotes/p4/ or refs/heads/p4/
- if not self.branch.startswith("refs/"):
- if self.importIntoRemotes:
- prepend = "refs/remotes/"
- else:
- prepend = "refs/heads/"
- if not self.branch.startswith("p4/"):
- prepend += "p4/"
- self.branch = prepend + self.branch
+ self.branch = fullP4Ref(self.branch, self.importIntoRemotes)
if len(args) == 0 and self.depotPaths:
if not self.silent:
@@ -3966,8 +4104,8 @@ def run(self, args):
else:
if self.depotPaths and self.depotPaths != args:
print("previous import used depot path %s and now %s was specified. "
- "This doesn't work!" % (' '.join (self.depotPaths),
- ' '.join (args)))
+ "This doesn't work!" % (' '.join(self.depotPaths),
+ ' '.join(args)))
sys.exit(1)
self.depotPaths = sorted(args)
@@ -4007,7 +4145,7 @@ def run(self, args):
if len(self.changesFile) == 0:
revision = "#head"
- p = re.sub ("\.\.\.$", "", p)
+ p = re.sub("\.\.\.$", "", p)
if not p.endswith("/"):
p += "/"
@@ -4021,10 +4159,10 @@ def run(self, args):
self.loadUserMapFromCache()
self.labels = {}
if self.detectLabels:
- self.getLabels();
+ self.getLabels()
if self.detectBranches:
- ## FIXME - what's a P4 projectName ?
+ # FIXME - what's a P4 projectName ?
self.projectName = self.guessProjectName()
if self.hasOrigin:
@@ -4037,7 +4175,7 @@ def run(self, args):
for b in self.p4BranchesInGit:
if b != "master":
- ## FIXME
+ # FIXME
b = b[len(self.projectName):]
self.createdBranches.add(b)
@@ -4075,7 +4213,7 @@ def run(self, args):
# Cleanup temporary branches created during import
if self.tempBranches != []:
for branch in self.tempBranches:
- read_pipe("git update-ref -d %s" % branch)
+ read_pipe(["git", "update-ref", "-d", branch])
os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation))
# Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow
@@ -4087,6 +4225,7 @@ def run(self, args):
return True
+
class P4Rebase(Command):
def __init__(self):
Command.__init__(self)
@@ -4106,11 +4245,11 @@ def run(self, args):
def rebase(self):
if os.system("git update-index --refresh") != 0:
- die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.");
- if len(read_pipe("git diff-index HEAD --")) > 0:
- die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
+ die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.")
+ if len(read_pipe(["git", "diff-index", "HEAD", "--"])) > 0:
+ die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.")
- [upstream, settings] = findUpstreamBranchPoint()
+ upstream, settings = findUpstreamBranchPoint()
if len(upstream) == 0:
die("Cannot find upstream branchpoint for rebase")
@@ -4118,11 +4257,13 @@ def rebase(self):
upstream = re.sub("~[0-9]+$", "", upstream)
print("Rebasing the current branch onto %s" % upstream)
- oldHead = read_pipe("git rev-parse HEAD").strip()
- system("git rebase %s" % upstream)
- system("git diff-tree --stat --summary -M %s HEAD --" % oldHead)
+ oldHead = read_pipe(["git", "rev-parse", "HEAD"]).strip()
+ system(["git", "rebase", upstream])
+ system(["git", "diff-tree", "--stat", "--summary", "-M", oldHead,
+ "HEAD", "--"])
return True
+
class P4Clone(P4Sync):
def __init__(self):
P4Sync.__init__(self)
@@ -4140,7 +4281,7 @@ def __init__(self):
self.cloneBare = False
def defaultDestination(self, args):
- ## TODO: use common prefix of args?
+ # TODO: use common prefix of args?
depotPath = args[0]
depotDir = re.sub("(@[^@]*)$", "", depotPath)
depotDir = re.sub("(#[^#]*)$", "", depotDir)
@@ -4176,31 +4317,40 @@ def run(self, args):
os.makedirs(self.cloneDestination)
chdir(self.cloneDestination)
- init_cmd = [ "git", "init" ]
+ init_cmd = ["git", "init"]
if self.cloneBare:
init_cmd.append("--bare")
retcode = subprocess.call(init_cmd)
if retcode:
- raise CalledProcessError(retcode, init_cmd)
+ raise subprocess.CalledProcessError(retcode, init_cmd)
if not P4Sync.run(self, depotPaths):
return False
# create a master branch and check out a work tree
if gitBranchExists(self.branch):
- system([ "git", "branch", currentGitBranch(), self.branch ])
+ system(["git", "branch", currentGitBranch(), self.branch])
if not self.cloneBare:
- system([ "git", "checkout", "-f" ])
+ system(["git", "checkout", "-f"])
else:
- print('Not checking out any branch, use ' \
+ print('Not checking out any branch, use '
'"git checkout -q -b master <branch>"')
# auto-set this variable if invoked with --use-client-spec
if self.useClientSpec_from_options:
- system("git config --bool git-p4.useclientspec true")
+ system(["git", "config", "--bool", "git-p4.useclientspec", "true"])
+
+ # persist any git-p4 encoding-handling config options passed in for clone:
+ if gitConfig('git-p4.metadataDecodingStrategy'):
+ system(["git", "config", "git-p4.metadataDecodingStrategy", gitConfig('git-p4.metadataDecodingStrategy')])
+ if gitConfig('git-p4.metadataFallbackEncoding'):
+ system(["git", "config", "git-p4.metadataFallbackEncoding", gitConfig('git-p4.metadataFallbackEncoding')])
+ if gitConfig('git-p4.pathEncoding'):
+ system(["git", "config", "git-p4.pathEncoding", gitConfig('git-p4.pathEncoding')])
return True
+
class P4Unshelve(Command):
def __init__(self):
Command.__init__(self)
@@ -4217,14 +4367,14 @@ def __init__(self):
self.destbranch = "refs/remotes/p4-unshelved"
def renameBranch(self, branch_name):
- """ Rename the existing branch to branch_name.N
- """
+ """Rename the existing branch to branch_name.N ."""
found = True
- for i in range(0,1000):
+ for i in range(0, 1000):
backup_branch_name = "{0}.{1}".format(branch_name, i)
if not gitBranchExists(backup_branch_name):
- gitUpdateRef(backup_branch_name, branch_name) # copy ref to backup
+ # Copy ref to backup
+ gitUpdateRef(backup_branch_name, branch_name)
gitDeleteRef(branch_name)
found = True
print("renamed old unshelve branch to {0}".format(backup_branch_name))
@@ -4234,9 +4384,9 @@ def renameBranch(self, branch_name):
sys.exit("gave up trying to rename existing branch {0}".format(sync.branch))
def findLastP4Revision(self, starting_point):
- """ Look back from starting_point for the first commit created by git-p4
- to find the P4 commit we are based on, and the depot-paths.
- """
+ """Look back from starting_point for the first commit created by git-p4
+ to find the P4 commit we are based on, and the depot-paths.
+ """
for parent in (range(65535)):
log = extractLogMessageFromGitCommit("{0}~{1}".format(starting_point, parent))
@@ -4247,8 +4397,9 @@ def findLastP4Revision(self, starting_point):
sys.exit("could not find git-p4 commits in {0}".format(self.origin))
def createShelveParent(self, change, branch_name, sync, origin):
- """ Create a commit matching the parent of the shelved changelist 'change'
- """
+ """Create a commit matching the parent of the shelved changelist
+ 'change'.
+ """
parent_description = p4_describe(change, shelved=True)
parent_description['desc'] = 'parent for shelved changelist {}\n'.format(change)
files = sync.extractFilesFromCommit(parent_description, shelved=False, shelved_cl=change)
@@ -4316,10 +4467,11 @@ def run(self, args):
return True
+
class P4Branches(Command):
def __init__(self):
Command.__init__(self)
- self.options = [ ]
+ self.options = []
self.description = ("Shows the git branches that hold imports and their "
+ "corresponding perforce depot paths")
self.verbose = False
@@ -4328,10 +4480,7 @@ def run(self, args):
if originP4BranchesExist():
createOrUpdateBranchesFromOrigin()
- cmdline = "git rev-parse --symbolic "
- cmdline += " --remotes"
-
- for line in read_pipe_lines(cmdline):
+ for line in read_pipe_lines(["git", "rev-parse", "--symbolic", "--remotes"]):
line = line.strip()
if not line.startswith('p4/') or line == "p4/HEAD":
@@ -4344,6 +4493,7 @@ def run(self, args):
print("%s <= %s (%s)" % (branch, ",".join(settings["depot-paths"]), settings["change"]))
return True
+
class HelpFormatter(optparse.IndentedHelpFormatter):
def __init__(self):
optparse.IndentedHelpFormatter.__init__(self)
@@ -4354,6 +4504,7 @@ def format_description(self, description):
else:
return ""
+
def printUsage(commands):
print("usage: %s <command> [options]" % sys.argv[0])
print("")
@@ -4362,18 +4513,18 @@ def printUsage(commands):
print("Try %s <command> --help for command specific help." % sys.argv[0])
print("")
+
commands = {
- "debug" : P4Debug,
- "submit" : P4Submit,
- "commit" : P4Submit,
- "sync" : P4Sync,
- "rebase" : P4Rebase,
- "clone" : P4Clone,
- "rollback" : P4RollBack,
- "branches" : P4Branches,
- "unshelve" : P4Unshelve,
+ "submit": P4Submit,
+ "commit": P4Submit,
+ "sync": P4Sync,
+ "rebase": P4Rebase,
+ "clone": P4Clone,
+ "branches": P4Branches,
+ "unshelve": P4Unshelve,
}
+
def main():
if len(sys.argv[1:]) == 0:
printUsage(commands.keys())
@@ -4400,11 +4551,11 @@ def main():
parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
options,
- description = cmd.description,
- formatter = HelpFormatter())
+ description=cmd.description,
+ formatter=HelpFormatter())
try:
- (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
+ cmd, args = parser.parse_args(sys.argv[2:], cmd)
except:
parser.print_help()
raise
@@ -4412,15 +4563,15 @@ def main():
global verbose
verbose = cmd.verbose
if cmd.needsGit:
- if cmd.gitdir == None:
+ if cmd.gitdir is None:
cmd.gitdir = os.path.abspath(".git")
if not isValidGitDir(cmd.gitdir):
# "rev-parse --git-dir" without arguments will try $PWD/.git
- cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
+ cmd.gitdir = read_pipe(["git", "rev-parse", "--git-dir"]).strip()
if os.path.exists(cmd.gitdir):
- cdup = read_pipe("git rev-parse --show-cdup").strip()
+ cdup = read_pipe(["git", "rev-parse", "--show-cdup"]).strip()
if len(cdup) > 0:
- chdir(cdup);
+ chdir(cdup)
if not isValidGitDir(cmd.gitdir):
if isValidGitDir(cmd.gitdir + "/.git"):
diff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh
deleted file mode 100644
index b9c71d2..0000000
--- a/git-rebase--preserve-merges.sh
+++ /dev/null
@@ -1,1057 +0,0 @@
-# This shell script fragment is sourced by git-rebase to implement its
-# preserve-merges mode.
-#
-# Copyright (c) 2006 Johannes E. Schindelin
-#
-# The file containing rebase commands, comments, and empty lines.
-# This file is created by "git rebase -i" then edited by the user. As
-# the lines are processed, they are removed from the front of this
-# file and written to the tail of $done.
-todo="$state_dir"/git-rebase-todo
-
-# The rebase command lines that have already been processed. A line
-# is moved here when it is first handled, before any associated user
-# actions.
-done="$state_dir"/done
-
-# The commit message that is planned to be used for any changes that
-# need to be committed following a user interaction.
-msg="$state_dir"/message
-
-# The file into which is accumulated the suggested commit message for
-# squash/fixup commands. When the first of a series of squash/fixups
-# is seen, the file is created and the commit message from the
-# previous commit and from the first squash/fixup commit are written
-# to it. The commit message for each subsequent squash/fixup commit
-# is appended to the file as it is processed.
-#
-# The first line of the file is of the form
-# # This is a combination of $count commits.
-# where $count is the number of commits whose messages have been
-# written to the file so far (including the initial "pick" commit).
-# Each time that a commit message is processed, this line is read and
-# updated. It is deleted just before the combined commit is made.
-squash_msg="$state_dir"/message-squash
-
-# If the current series of squash/fixups has not yet included a squash
-# command, then this file exists and holds the commit message of the
-# original "pick" commit. (If the series ends without a "squash"
-# command, then this can be used as the commit message of the combined
-# commit without opening the editor.)
-fixup_msg="$state_dir"/message-fixup
-
-# $rewritten is the name of a directory containing files for each
-# commit that is reachable by at least one merge base of $head and
-# $upstream. They are not necessarily rewritten, but their children
-# might be. This ensures that commits on merged, but otherwise
-# unrelated side branches are left alone. (Think "X" in the man page's
-# example.)
-rewritten="$state_dir"/rewritten
-
-dropped="$state_dir"/dropped
-
-end="$state_dir"/end
-msgnum="$state_dir"/msgnum
-
-# A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
-# GIT_AUTHOR_DATE that will be used for the commit that is currently
-# being rebased.
-author_script="$state_dir"/author-script
-
-# When an "edit" rebase command is being processed, the SHA1 of the
-# commit to be edited is recorded in this file. When "git rebase
-# --continue" is executed, if there are any staged changes then they
-# will be amended to the HEAD commit, but only provided the HEAD
-# commit is still the commit to be edited. When any other rebase
-# command is processed, this file is deleted.
-amend="$state_dir"/amend
-
-# For the post-rewrite hook, we make a list of rewritten commits and
-# their new sha1s. The rewritten-pending list keeps the sha1s of
-# commits that have been processed, but not committed yet,
-# e.g. because they are waiting for a 'squash' command.
-rewritten_list="$state_dir"/rewritten-list
-rewritten_pending="$state_dir"/rewritten-pending
-
-# Work around Git for Windows' Bash whose "read" does not strip CRLF
-# and leaves CR at the end instead.
-cr=$(printf "\015")
-
-resolvemsg="
-$(gettext 'Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".')
-"
-
-write_basic_state () {
- echo "$head_name" > "$state_dir"/head-name &&
- echo "$onto" > "$state_dir"/onto &&
- echo "$orig_head" > "$state_dir"/orig-head &&
- test t = "$GIT_QUIET" && : > "$state_dir"/quiet
- test t = "$verbose" && : > "$state_dir"/verbose
- test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
- test -n "$strategy_opts" && echo "$strategy_opts" > \
- "$state_dir"/strategy_opts
- test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \
- "$state_dir"/allow_rerere_autoupdate
- test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
- test -n "$signoff" && echo "$signoff" >"$state_dir"/signoff
- test -n "$reschedule_failed_exec" && : > "$state_dir"/reschedule-failed-exec
-}
-
-apply_autostash () {
- if test -f "$state_dir/autostash"
- then
- stash_sha1=$(cat "$state_dir/autostash")
- if git stash apply $stash_sha1 >/dev/null 2>&1
- then
- echo "$(gettext 'Applied autostash.')" >&2
- else
- git stash store -m "autostash" -q $stash_sha1 ||
- die "$(eval_gettext "Cannot store \$stash_sha1")"
- gettext 'Applying autostash resulted in conflicts.
-Your changes are safe in the stash.
-You can run "git stash pop" or "git stash drop" at any time.
-' >&2
- fi
- fi
-}
-
-output () {
- case "$verbose" in
- '')
- output=$("$@" 2>&1 )
- status=$?
- test $status != 0 && printf "%s\n" "$output"
- return $status
- ;;
- *)
- "$@"
- ;;
- esac
-}
-
-strategy_args=${strategy:+--strategy=$strategy}
-test -n "$strategy_opts" &&
-eval '
- for strategy_opt in '"$strategy_opts"'
- do
- strategy_args="$strategy_args -X$(git rev-parse --sq-quote "${strategy_opt#--}")"
- done
-'
-
-GIT_CHERRY_PICK_HELP="$resolvemsg"
-export GIT_CHERRY_PICK_HELP
-
-comment_char=$(git config --get core.commentchar 2>/dev/null)
-case "$comment_char" in
-'' | auto)
- comment_char="#"
- ;;
-?)
- ;;
-*)
- comment_char=$(echo "$comment_char" | cut -c1)
- ;;
-esac
-
-warn () {
- printf '%s\n' "$*" >&2
-}
-
-# Output the commit message for the specified commit.
-commit_message () {
- git cat-file commit "$1" | sed "1,/^$/d"
-}
-
-orig_reflog_action="$GIT_REFLOG_ACTION"
-
-comment_for_reflog () {
- case "$orig_reflog_action" in
- ''|rebase*)
- GIT_REFLOG_ACTION="rebase -i ($1)"
- export GIT_REFLOG_ACTION
- ;;
- esac
-}
-
-last_count=
-mark_action_done () {
- sed -e 1q < "$todo" >> "$done"
- sed -e 1d < "$todo" >> "$todo".new
- mv -f "$todo".new "$todo"
- new_count=$(( $(git stripspace --strip-comments <"$done" | wc -l) ))
- echo $new_count >"$msgnum"
- total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l)))
- echo $total >"$end"
- if test "$last_count" != "$new_count"
- then
- last_count=$new_count
- eval_gettext "Rebasing (\$new_count/\$total)"; printf "\r"
- test -z "$verbose" || echo
- fi
-}
-
-append_todo_help () {
- gettext "
-Commands:
-p, pick <commit> = use commit
-r, reword <commit> = use commit, but edit the commit message
-e, edit <commit> = use commit, but stop for amending
-s, squash <commit> = use commit, but meld into previous commit
-f, fixup <commit> = like \"squash\", but discard this commit's log message
-x, exec <commit> = run command (the rest of the line) using shell
-d, drop <commit> = remove commit
-l, label <label> = label current HEAD with a name
-t, reset <label> = reset HEAD to a label
-m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
-. create a merge commit using the original merge commit's
-. message (or the oneline, if no original merge commit was
-. specified). Use -c <commit> to reword the commit message.
-
-These lines can be re-ordered; they are executed from top to bottom.
-" | git stripspace --comment-lines >>"$todo"
-
- if test $(get_missing_commit_check_level) = error
- then
- gettext "
-Do not remove any line. Use 'drop' explicitly to remove a commit.
-" | git stripspace --comment-lines >>"$todo"
- else
- gettext "
-If you remove a line here THAT COMMIT WILL BE LOST.
-" | git stripspace --comment-lines >>"$todo"
- fi
-}
-
-make_patch () {
- sha1_and_parents="$(git rev-list --parents -1 "$1")"
- case "$sha1_and_parents" in
- ?*' '?*' '?*)
- git diff --cc $sha1_and_parents
- ;;
- ?*' '?*)
- git diff-tree -p "$1^!"
- ;;
- *)
- echo "Root commit"
- ;;
- esac > "$state_dir"/patch
- test -f "$msg" ||
- commit_message "$1" > "$msg"
- test -f "$author_script" ||
- get_author_ident_from_commit "$1" > "$author_script"
-}
-
-die_with_patch () {
- echo "$1" > "$state_dir"/stopped-sha
- git update-ref REBASE_HEAD "$1"
- make_patch "$1"
- die "$2"
-}
-
-exit_with_patch () {
- echo "$1" > "$state_dir"/stopped-sha
- git update-ref REBASE_HEAD "$1"
- make_patch $1
- git rev-parse --verify HEAD > "$amend"
- gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
- warn "$(eval_gettext "\
-You can amend the commit now, with
-
- git commit --amend \$gpg_sign_opt_quoted
-
-Once you are satisfied with your changes, run
-
- git rebase --continue")"
- warn
- exit $2
-}
-
-die_abort () {
- apply_autostash
- rm -rf "$state_dir"
- die "$1"
-}
-
-has_action () {
- test -n "$(git stripspace --strip-comments <"$1")"
-}
-
-is_empty_commit() {
- tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null) || {
- sha1=$1
- die "$(eval_gettext "\$sha1: not a commit that can be picked")"
- }
- ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null) ||
- ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904
- test "$tree" = "$ptree"
-}
-
-is_merge_commit()
-{
- git rev-parse --verify --quiet "$1"^2 >/dev/null 2>&1
-}
-
-# Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
-# GIT_AUTHOR_DATE exported from the current environment.
-do_with_author () {
- (
- export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
- "$@"
- )
-}
-
-git_sequence_editor () {
- if test -z "$GIT_SEQUENCE_EDITOR"
- then
- GIT_SEQUENCE_EDITOR="$(git config sequence.editor)"
- if [ -z "$GIT_SEQUENCE_EDITOR" ]
- then
- GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $?
- fi
- fi
-
- eval "$GIT_SEQUENCE_EDITOR" '"$@"'
-}
-
-pick_one () {
- ff=--ff
-
- case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
- case "$force_rebase" in '') ;; ?*) ff= ;; esac
- output git rev-parse --verify $sha1 || die "$(eval_gettext "Invalid commit name: \$sha1")"
-
- if is_empty_commit "$sha1"
- then
- empty_args="--allow-empty"
- fi
-
- pick_one_preserving_merges "$@"
-}
-
-pick_one_preserving_merges () {
- fast_forward=t
- case "$1" in
- -n)
- fast_forward=f
- sha1=$2
- ;;
- *)
- sha1=$1
- ;;
- esac
- sha1=$(git rev-parse $sha1)
-
- if test -f "$state_dir"/current-commit && test "$fast_forward" = t
- then
- while read current_commit
- do
- git rev-parse HEAD > "$rewritten"/$current_commit
- done <"$state_dir"/current-commit
- rm "$state_dir"/current-commit ||
- die "$(gettext "Cannot write current commit's replacement sha1")"
- fi
-
- echo $sha1 >> "$state_dir"/current-commit
-
- # rewrite parents; if none were rewritten, we can fast-forward.
- new_parents=
- pend=" $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)"
- if test "$pend" = " "
- then
- pend=" root"
- fi
- while [ "$pend" != "" ]
- do
- p=$(expr "$pend" : ' \([^ ]*\)')
- pend="${pend# $p}"
-
- if test -f "$rewritten"/$p
- then
- new_p=$(cat "$rewritten"/$p)
-
- # If the todo reordered commits, and our parent is marked for
- # rewriting, but hasn't been gotten to yet, assume the user meant to
- # drop it on top of the current HEAD
- if test -z "$new_p"
- then
- new_p=$(git rev-parse HEAD)
- fi
-
- test $p != $new_p && fast_forward=f
- case "$new_parents" in
- *$new_p*)
- ;; # do nothing; that parent is already there
- *)
- new_parents="$new_parents $new_p"
- ;;
- esac
- else
- if test -f "$dropped"/$p
- then
- fast_forward=f
- replacement="$(cat "$dropped"/$p)"
- test -z "$replacement" && replacement=root
- pend=" $replacement$pend"
- else
- new_parents="$new_parents $p"
- fi
- fi
- done
- case $fast_forward in
- t)
- output warn "$(eval_gettext "Fast-forward to \$sha1")"
- output git reset --hard $sha1 ||
- die "$(eval_gettext "Cannot fast-forward to \$sha1")"
- ;;
- f)
- first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
-
- if [ "$1" != "-n" ]
- then
- # detach HEAD to current parent
- output git checkout $first_parent 2> /dev/null ||
- die "$(eval_gettext "Cannot move HEAD to \$first_parent")"
- fi
-
- case "$new_parents" in
- ' '*' '*)
- test "a$1" = a-n && die "$(eval_gettext "Refusing to squash a merge: \$sha1")"
-
- # redo merge
- author_script_content=$(get_author_ident_from_commit $sha1)
- eval "$author_script_content"
- msg_content="$(commit_message $sha1)"
- # No point in merging the first parent, that's HEAD
- new_parents=${new_parents# $first_parent}
- merge_args="--no-log --no-ff"
- if ! do_with_author output eval \
- git merge ${gpg_sign_opt:+$(git rev-parse \
- --sq-quote "$gpg_sign_opt")} \
- $allow_rerere_autoupdate "$merge_args" \
- "$strategy_args" \
- -m "$(git rev-parse --sq-quote "$msg_content")" \
- "$new_parents"
- then
- printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
- die_with_patch $sha1 "$(eval_gettext "Error redoing merge \$sha1")"
- fi
- echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list"
- ;;
- *)
- output eval git cherry-pick $allow_rerere_autoupdate \
- $allow_empty_message \
- ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
- "$strategy_args" "$@" ||
- die_with_patch $sha1 "$(eval_gettext "Could not pick \$sha1")"
- ;;
- esac
- ;;
- esac
-}
-
-this_nth_commit_message () {
- n=$1
- eval_gettext "This is the commit message #\${n}:"
-}
-
-skip_nth_commit_message () {
- n=$1
- eval_gettext "The commit message #\${n} will be skipped:"
-}
-
-update_squash_messages () {
- if test -f "$squash_msg"; then
- mv "$squash_msg" "$squash_msg".bak || exit
- count=$(($(sed -n \
- -e "1s/^$comment_char[^0-9]*\([0-9][0-9]*\).*/\1/p" \
- -e "q" < "$squash_msg".bak)+1))
- {
- printf '%s\n' "$comment_char $(eval_ngettext \
- "This is a combination of \$count commit." \
- "This is a combination of \$count commits." \
- $count)"
- sed -e 1d -e '2,/^./{
- /^$/d
- }' <"$squash_msg".bak
- } >"$squash_msg"
- else
- commit_message HEAD >"$fixup_msg" ||
- die "$(eval_gettext "Cannot write \$fixup_msg")"
- count=2
- {
- printf '%s\n' "$comment_char $(gettext "This is a combination of 2 commits.")"
- printf '%s\n' "$comment_char $(gettext "This is the 1st commit message:")"
- echo
- cat "$fixup_msg"
- } >"$squash_msg"
- fi
- case $1 in
- squash)
- rm -f "$fixup_msg"
- echo
- printf '%s\n' "$comment_char $(this_nth_commit_message $count)"
- echo
- commit_message $2
- ;;
- fixup)
- echo
- printf '%s\n' "$comment_char $(skip_nth_commit_message $count)"
- echo
- # Change the space after the comment character to TAB:
- commit_message $2 | git stripspace --comment-lines | sed -e 's/ / /'
- ;;
- esac >>"$squash_msg"
-}
-
-peek_next_command () {
- git stripspace --strip-comments <"$todo" | sed -n -e 's/ .*//p' -e q
-}
-
-# A squash/fixup has failed. Prepare the long version of the squash
-# commit message, then die_with_patch. This code path requires the
-# user to edit the combined commit message for all commits that have
-# been squashed/fixedup so far. So also erase the old squash
-# messages, effectively causing the combined commit to be used as the
-# new basis for any further squash/fixups. Args: sha1 rest
-die_failed_squash() {
- sha1=$1
- rest=$2
- mv "$squash_msg" "$msg" || exit
- rm -f "$fixup_msg"
- cp "$msg" "$GIT_DIR"/MERGE_MSG || exit
- warn
- warn "$(eval_gettext "Could not apply \$sha1... \$rest")"
- die_with_patch $sha1 ""
-}
-
-flush_rewritten_pending() {
- test -s "$rewritten_pending" || return
- newsha1="$(git rev-parse HEAD^0)"
- sed "s/$/ $newsha1/" < "$rewritten_pending" >> "$rewritten_list"
- rm -f "$rewritten_pending"
-}
-
-record_in_rewritten() {
- oldsha1="$(git rev-parse $1)"
- echo "$oldsha1" >> "$rewritten_pending"
-
- case "$(peek_next_command)" in
- squash|s|fixup|f)
- ;;
- *)
- flush_rewritten_pending
- ;;
- esac
-}
-
-do_pick () {
- sha1=$1
- rest=$2
- if test "$(git rev-parse HEAD)" = "$squash_onto"
- then
- # Set the correct commit message and author info on the
- # sentinel root before cherry-picking the original changes
- # without committing (-n). Finally, update the sentinel again
- # to include these changes. If the cherry-pick results in a
- # conflict, this means our behaviour is similar to a standard
- # failed cherry-pick during rebase, with a dirty index to
- # resolve before manually running git commit --amend then git
- # rebase --continue.
- git commit --allow-empty --allow-empty-message --amend \
- --no-post-rewrite -n -q -C $sha1 $signoff &&
- pick_one -n $sha1 &&
- git commit --allow-empty --allow-empty-message \
- --amend --no-post-rewrite -n -q -C $sha1 $signoff \
- ${gpg_sign_opt:+"$gpg_sign_opt"} ||
- die_with_patch $sha1 "$(eval_gettext "Could not apply \$sha1... \$rest")"
- else
- pick_one $sha1 ||
- die_with_patch $sha1 "$(eval_gettext "Could not apply \$sha1... \$rest")"
- fi
-}
-
-do_next () {
- rm -f "$msg" "$author_script" "$amend" "$state_dir"/stopped-sha || exit
- read -r command sha1 rest < "$todo"
- case "$command" in
- "$comment_char"*|''|noop|drop|d)
- mark_action_done
- ;;
- "$cr")
- # Work around CR left by "read" (e.g. with Git for Windows' Bash).
- mark_action_done
- ;;
- pick|p)
- comment_for_reflog pick
-
- mark_action_done
- do_pick $sha1 "$rest"
- record_in_rewritten $sha1
- ;;
- reword|r)
- comment_for_reflog reword
-
- mark_action_done
- do_pick $sha1 "$rest"
- git commit --amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} \
- $allow_empty_message || {
- warn "$(eval_gettext "\
-Could not amend commit after successfully picking \$sha1... \$rest
-This is most likely due to an empty commit message, or the pre-commit hook
-failed. If the pre-commit hook failed, you may need to resolve the issue before
-you are able to reword the commit.")"
- exit_with_patch $sha1 1
- }
- record_in_rewritten $sha1
- ;;
- edit|e)
- comment_for_reflog edit
-
- mark_action_done
- do_pick $sha1 "$rest"
- sha1_abbrev=$(git rev-parse --short $sha1)
- warn "$(eval_gettext "Stopped at \$sha1_abbrev... \$rest")"
- exit_with_patch $sha1 0
- ;;
- squash|s|fixup|f)
- case "$command" in
- squash|s)
- squash_style=squash
- ;;
- fixup|f)
- squash_style=fixup
- ;;
- esac
- comment_for_reflog $squash_style
-
- test -f "$done" && has_action "$done" ||
- die "$(eval_gettext "Cannot '\$squash_style' without a previous commit")"
-
- mark_action_done
- update_squash_messages $squash_style $sha1
- author_script_content=$(get_author_ident_from_commit HEAD)
- echo "$author_script_content" > "$author_script"
- eval "$author_script_content"
- if ! pick_one -n $sha1
- then
- git rev-parse --verify HEAD >"$amend"
- die_failed_squash $sha1 "$rest"
- fi
- case "$(peek_next_command)" in
- squash|s|fixup|f)
- # This is an intermediate commit; its message will only be
- # used in case of trouble. So use the long version:
- do_with_author output git commit --amend --no-verify -F "$squash_msg" \
- ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
- die_failed_squash $sha1 "$rest"
- ;;
- *)
- # This is the final command of this squash/fixup group
- if test -f "$fixup_msg"
- then
- do_with_author git commit --amend --no-verify -F "$fixup_msg" \
- ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
- die_failed_squash $sha1 "$rest"
- else
- cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG || exit
- rm -f "$GIT_DIR"/MERGE_MSG
- do_with_author git commit --amend --no-verify -F "$GIT_DIR"/SQUASH_MSG -e \
- ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
- die_failed_squash $sha1 "$rest"
- fi
- rm -f "$squash_msg" "$fixup_msg"
- ;;
- esac
- record_in_rewritten $sha1
- ;;
- x|"exec")
- read -r command rest < "$todo"
- mark_action_done
- eval_gettextln "Executing: \$rest"
- "${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution
- status=$?
- # Run in subshell because require_clean_work_tree can die.
- dirty=f
- (require_clean_work_tree "rebase" 2>/dev/null) || dirty=t
- if test "$status" -ne 0
- then
- warn "$(eval_gettext "Execution failed: \$rest")"
- test "$dirty" = f ||
- warn "$(gettext "and made changes to the index and/or the working tree")"
-
- warn "$(gettext "\
-You can fix the problem, and then run
-
- git rebase --continue")"
- warn
- if test $status -eq 127 # command not found
- then
- status=1
- fi
- exit "$status"
- elif test "$dirty" = t
- then
- # TRANSLATORS: after these lines is a command to be issued by the user
- warn "$(eval_gettext "\
-Execution succeeded: \$rest
-but left changes to the index and/or the working tree
-Commit or stash your changes, and then run
-
- git rebase --continue")"
- warn
- exit 1
- fi
- ;;
- *)
- warn "$(eval_gettext "Unknown command: \$command \$sha1 \$rest")"
- fixtodo="$(gettext "Please fix this using 'git rebase --edit-todo'.")"
- if git rev-parse --verify -q "$sha1" >/dev/null
- then
- die_with_patch $sha1 "$fixtodo"
- else
- die "$fixtodo"
- fi
- ;;
- esac
- test -s "$todo" && return
-
- comment_for_reflog finish &&
- newhead=$(git rev-parse HEAD) &&
- case $head_name in
- refs/*)
- message="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
- git update-ref -m "$message" $head_name $newhead $orig_head &&
- git symbolic-ref \
- -m "$GIT_REFLOG_ACTION: returning to $head_name" \
- HEAD $head_name
- ;;
- esac && {
- test ! -f "$state_dir"/verbose ||
- git diff-tree --stat $orig_head..HEAD
- } &&
- {
- test -s "$rewritten_list" &&
- git notes copy --for-rewrite=rebase < "$rewritten_list" ||
- true # we don't care if this copying failed
- } &&
- hook="$(git rev-parse --git-path hooks/post-rewrite)"
- if test -x "$hook" && test -s "$rewritten_list"; then
- "$hook" rebase < "$rewritten_list"
- true # we don't care if this hook failed
- fi &&
- warn "$(eval_gettext "Successfully rebased and updated \$head_name.")"
-
- return 1 # not failure; just to break the do_rest loop
-}
-
-# can only return 0, when the infinite loop breaks
-do_rest () {
- while :
- do
- do_next || break
- done
-}
-
-expand_todo_ids() {
- git rebase--interactive --expand-ids
-}
-
-collapse_todo_ids() {
- git rebase--interactive --shorten-ids
-}
-
-# Switch to the branch in $into and notify it in the reflog
-checkout_onto () {
- GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name"
- output git checkout $onto || die_abort "$(gettext "could not detach HEAD")"
- git update-ref ORIG_HEAD $orig_head
-}
-
-get_missing_commit_check_level () {
- check_level=$(git config --get rebase.missingCommitsCheck)
- check_level=${check_level:-ignore}
- # Don't be case sensitive
- printf '%s' "$check_level" | tr 'A-Z' 'a-z'
-}
-
-# Initiate an action. If the cannot be any
-# further action it may exec a command
-# or exit and not return.
-#
-# TODO: Consider a cleaner return model so it
-# never exits and always return 0 if process
-# is complete.
-#
-# Parameter 1 is the action to initiate.
-#
-# Returns 0 if the action was able to complete
-# and if 1 if further processing is required.
-initiate_action () {
- case "$1" in
- continue)
- # do we have anything to commit?
- if git diff-index --cached --quiet HEAD --
- then
- # Nothing to commit -- skip this commit
-
- test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD ||
- rm "$GIT_DIR"/CHERRY_PICK_HEAD ||
- die "$(gettext "Could not remove CHERRY_PICK_HEAD")"
- else
- if ! test -f "$author_script"
- then
- gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
- die "$(eval_gettext "\
-You have staged changes in your working tree.
-If these changes are meant to be
-squashed into the previous commit, run:
-
- git commit --amend \$gpg_sign_opt_quoted
-
-If they are meant to go into a new commit, run:
-
- git commit \$gpg_sign_opt_quoted
-
-In both cases, once you're done, continue with:
-
- git rebase --continue
-")"
- fi
- . "$author_script" ||
- die "$(gettext "Error trying to find the author identity to amend commit")"
- if test -f "$amend"
- then
- current_head=$(git rev-parse --verify HEAD)
- test "$current_head" = $(cat "$amend") ||
- die "$(gettext "\
-You have uncommitted changes in your working tree. Please commit them
-first and then run 'git rebase --continue' again.")"
- do_with_author git commit --amend --no-verify -F "$msg" -e \
- ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
- die "$(gettext "Could not commit staged changes.")"
- else
- do_with_author git commit --no-verify -F "$msg" -e \
- ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
- die "$(gettext "Could not commit staged changes.")"
- fi
- fi
-
- if test -r "$state_dir"/stopped-sha
- then
- record_in_rewritten "$(cat "$state_dir"/stopped-sha)"
- fi
-
- require_clean_work_tree "rebase"
- do_rest
- return 0
- ;;
- skip)
- git rerere clear
- do_rest
- return 0
- ;;
- edit-todo)
- git stripspace --strip-comments <"$todo" >"$todo".new
- mv -f "$todo".new "$todo"
- collapse_todo_ids
- append_todo_help
- gettext "
-You are editing the todo file of an ongoing interactive rebase.
-To continue rebase after editing, run:
- git rebase --continue
-
-" | git stripspace --comment-lines >>"$todo"
-
- git_sequence_editor "$todo" ||
- die "$(gettext "Could not execute editor")"
- expand_todo_ids
-
- exit
- ;;
- show-current-patch)
- exec git show REBASE_HEAD --
- ;;
- *)
- return 1 # continue
- ;;
- esac
-}
-
-setup_reflog_action () {
- comment_for_reflog start
-
- if test ! -z "$switch_to"
- then
- GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to"
- output git checkout "$switch_to" -- ||
- die "$(eval_gettext "Could not checkout \$switch_to")"
-
- comment_for_reflog start
- fi
-}
-
-init_basic_state () {
- orig_head=$(git rev-parse --verify HEAD) || die "$(gettext "No HEAD?")"
- mkdir -p "$state_dir" || die "$(eval_gettext "Could not create temporary \$state_dir")"
- rm -f "$(git rev-parse --git-path REBASE_HEAD)"
-
- : > "$state_dir"/interactive || die "$(gettext "Could not mark as interactive")"
- write_basic_state
-}
-
-init_revisions_and_shortrevisions () {
- shorthead=$(git rev-parse --short $orig_head)
- shortonto=$(git rev-parse --short $onto)
- if test -z "$rebase_root"
- # this is now equivalent to ! -z "$upstream"
- then
- shortupstream=$(git rev-parse --short $upstream)
- revisions=$upstream...$orig_head
- shortrevisions=$shortupstream..$shorthead
- else
- revisions=$onto...$orig_head
- shortrevisions=$shorthead
- test -z "$squash_onto" ||
- echo "$squash_onto" >"$state_dir"/squash-onto
- fi
-}
-
-complete_action() {
- test -s "$todo" || echo noop >> "$todo"
- test -z "$autosquash" || git rebase--interactive --rearrange-squash || exit
- test -n "$cmd" && git rebase--interactive --add-exec-commands --cmd "$cmd"
-
- todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
- todocount=${todocount##* }
-
-cat >>"$todo" <<EOF
-
-$comment_char $(eval_ngettext \
- "Rebase \$shortrevisions onto \$shortonto (\$todocount command)" \
- "Rebase \$shortrevisions onto \$shortonto (\$todocount commands)" \
- "$todocount")
-EOF
- append_todo_help
- gettext "
-However, if you remove everything, the rebase will be aborted.
-
-" | git stripspace --comment-lines >>"$todo"
-
- if test -z "$keep_empty"
- then
- printf '%s\n' "$comment_char $(gettext "Note that empty commits are commented out")" >>"$todo"
- fi
-
-
- has_action "$todo" ||
- return 2
-
- cp "$todo" "$todo".backup
- collapse_todo_ids
- git_sequence_editor "$todo" ||
- die_abort "$(gettext "Could not execute editor")"
-
- has_action "$todo" ||
- return 2
-
- git rebase--interactive --check-todo-list || {
- ret=$?
- checkout_onto
- exit $ret
- }
-
- expand_todo_ids
- checkout_onto
- do_rest
-}
-
-git_rebase__preserve_merges () {
- initiate_action "$action"
- ret=$?
- if test $ret = 0; then
- return 0
- fi
-
- setup_reflog_action
- init_basic_state
-
- if test -z "$rebase_root"
- then
- mkdir "$rewritten" &&
- for c in $(git merge-base --all $orig_head $upstream)
- do
- echo $onto > "$rewritten"/$c ||
- die "$(gettext "Could not init rewritten commits")"
- done
- else
- mkdir "$rewritten" &&
- echo $onto > "$rewritten"/root ||
- die "$(gettext "Could not init rewritten commits")"
- fi
-
- init_revisions_and_shortrevisions
-
- format=$(git config --get rebase.instructionFormat)
- # the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse
- git rev-list --format="%m%H ${format:-%s}" \
- --reverse --left-right --topo-order \
- $revisions ${restrict_revision+^$restrict_revision} | \
- sed -n "s/^>//p" |
- while read -r sha1 rest
- do
- if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1
- then
- comment_out="$comment_char "
- else
- comment_out=
- fi
-
- if test -z "$rebase_root"
- then
- preserve=t
- for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)
- do
- if test -f "$rewritten"/$p
- then
- preserve=f
- fi
- done
- else
- preserve=f
- fi
- if test f = "$preserve"
- then
- touch "$rewritten"/$sha1
- printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
- fi
- done
-
- # Watch for commits that been dropped by --cherry-pick
- mkdir "$dropped"
- # Save all non-cherry-picked changes
- git rev-list $revisions --left-right --cherry-pick | \
- sed -n "s/^>//p" > "$state_dir"/not-cherry-picks
- # Now all commits and note which ones are missing in
- # not-cherry-picks and hence being dropped
- git rev-list $revisions |
- while read rev
- do
- if test -f "$rewritten"/$rev &&
- ! sane_grep "$rev" "$state_dir"/not-cherry-picks >/dev/null
- then
- # Use -f2 because if rev-list is telling us this commit is
- # not worthwhile, we don't want to track its multiple heads,
- # just the history of its first-parent for others that will
- # be rebasing on top of it
- git rev-list --parents -1 $rev | cut -d' ' -s -f2 > "$dropped"/$rev
- sha1=$(git rev-list -1 $rev)
- sane_grep -v "^[a-z][a-z]* $sha1" <"$todo" > "${todo}2" ; mv "${todo}2" "$todo"
- rm "$rewritten"/$rev
- fi
- done
-
- complete_action
-}
diff --git a/git-send-email.perl b/git-send-email.perl
index 5262d88..5861e99 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -40,7 +40,8 @@
sub usage {
print <<EOT;
-git send-email [options] <file | directory | rev-list options >
+git send-email' [<options>] <file|directory>
+git send-email' [<options>] <format-patch options>
git send-email --dump-aliases
Composing:
@@ -113,9 +114,38 @@
exit(1);
}
+sub uniq {
+ my %seen;
+ grep !$seen{$_}++, @_;
+}
+
sub completion_helper {
- print Git::command('format-patch', '--git-completion-helper');
- exit(0);
+ my ($original_opts) = @_;
+ my %not_for_completion = (
+ "git-completion-helper" => undef,
+ "h" => undef,
+ );
+ my @send_email_opts = ();
+
+ foreach my $key (keys %$original_opts) {
+ unless (exists $not_for_completion{$key}) {
+ $key =~ s/!$//;
+
+ if ($key =~ /[:=][si]$/) {
+ $key =~ s/[:=][si]$//;
+ push (@send_email_opts, "--$_=") foreach (split (/\|/, $key));
+ } else {
+ push (@send_email_opts, "--$_") foreach (split (/\|/, $key));
+ }
+ }
+ }
+
+ my @format_patch_opts = split(/ /, Git::command('format-patch', '--git-completion-helper'));
+ my @opts = (@send_email_opts, @format_patch_opts);
+ @opts = uniq (grep !/^$/, @opts);
+ # There's an implicit '\n' here already, no need to add an explicit one.
+ print "@opts";
+ exit(0);
}
# most mail servers generate the Date: header, but not all...
@@ -195,13 +225,13 @@
my $editor;
sub system_or_msg {
- my ($args, $msg) = @_;
+ my ($args, $msg, $cmd_name) = @_;
system(@$args);
my $signalled = $? & 127;
my $exit_code = $? >> 8;
return unless $signalled or $exit_code;
- my @sprintf_args = ($args->[0], $exit_code);
+ my @sprintf_args = ($cmd_name ? $cmd_name : $args->[0], $exit_code);
if (defined $msg) {
# Quiet the 'redundant' warning category, except we
# need to support down to Perl 5.8, so we can't do a
@@ -425,10 +455,11 @@
my $key = "sendemail.identity";
$identity = Git::config(@repo, $key) if exists $known_config_keys{$key};
}
-my $rc = GetOptions(
+my %identity_options = (
"identity=s" => \$identity,
"no-identity" => \$no_identity,
);
+my $rc = GetOptions(%identity_options);
usage() unless $rc;
undef $identity if $no_identity;
@@ -444,14 +475,17 @@
my $help;
my $git_completion_helper;
-$rc = GetOptions("h" => \$help,
- "dump-aliases" => \$dump_aliases);
+my %dump_aliases_options = (
+ "h" => \$help,
+ "dump-aliases" => \$dump_aliases,
+);
+$rc = GetOptions(%dump_aliases_options);
usage() unless $rc;
die __("--dump-aliases incompatible with other options\n")
if !$help and $dump_aliases and @ARGV;
-$rc = GetOptions(
+my %options = (
"sender|from=s" => \$sender,
- "in-reply-to=s" => \$initial_in_reply_to,
+ "in-reply-to=s" => \$initial_in_reply_to,
"reply-to=s" => \$reply_to,
"subject=s" => \$initial_subject,
"to=s" => \@getopt_to,
@@ -508,7 +542,8 @@
"batch-size=i" => \$batch_size,
"relogin-delay=i" => \$relogin_delay,
"git-completion-helper" => \$git_completion_helper,
- );
+);
+$rc = GetOptions(%options);
# Munge any "either config or getopt, not both" variables
my @initial_to = @getopt_to ? @getopt_to : ($no_to ? () : @config_to);
@@ -516,7 +551,8 @@
my @initial_bcc = @getopt_bcc ? @getopt_bcc : ($no_bcc ? () : @config_bcc);
usage() if $help;
-completion_helper() if $git_completion_helper;
+my %all_options = (%options, %dump_aliases_options, %identity_options);
+completion_helper(\%all_options) if $git_completion_helper;
unless ($rc) {
usage();
}
@@ -2039,10 +2075,10 @@
my ($fn, $xfer_encoding) = @_;
if ($repo) {
+ my $hook_name = 'sendemail-validate';
my $hooks_path = $repo->command_oneline('rev-parse', '--git-path', 'hooks');
require File::Spec;
- my $validate_hook = File::Spec->catfile($hooks_path,
- 'sendemail-validate');
+ my $validate_hook = File::Spec->catfile($hooks_path, $hook_name);
my $hook_error;
if (-x $validate_hook) {
require Cwd;
@@ -2052,13 +2088,18 @@
chdir($repo->wc_path() or $repo->repo_path())
or die("chdir: $!");
local $ENV{"GIT_DIR"} = $repo->repo_path();
- $hook_error = system_or_msg([$validate_hook, $target]);
+ my @cmd = ("git", "hook", "run", "--ignore-missing",
+ $hook_name, "--");
+ my @cmd_msg = (@cmd, "<patch>");
+ my @cmd_run = (@cmd, $target);
+ $hook_error = system_or_msg(\@cmd_run, undef, "@cmd_msg");
chdir($cwd_save) or die("chdir: $!");
}
if ($hook_error) {
- die sprintf(__("fatal: %s: rejected by sendemail-validate hook\n" .
- "%s\n" .
- "warning: no patches were sent\n"), $fn, $hook_error);
+ $hook_error = sprintf(
+ __("fatal: %s: rejected by %s hook\n%s\nwarning: no patches were sent\n"),
+ $fn, $hook_name, $hook_error);
+ die $hook_error;
}
}
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index e3d9f48..a15c062 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -51,12 +51,6 @@
)
}
- eval_ngettext () {
- ngettext "$1" "$2" "$3" | (
- export PATH $(git sh-i18n--envsubst --variables "$2");
- git sh-i18n--envsubst "$2"
- )
- }
;;
*)
gettext () {
@@ -70,12 +64,6 @@
)
}
- eval_ngettext () {
- (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
- export PATH $(git sh-i18n--envsubst --variables "$2");
- git sh-i18n--envsubst "$2"
- )
- }
;;
esac
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index cee053c..d92df37 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -101,7 +101,6 @@
case "$1" in
-h)
echo "$LONG_USAGE"
- case "$0" in *git-legacy-stash) exit 129;; esac
exit
esac
fi
@@ -173,14 +172,6 @@
eval "$GIT_PAGER" '"$@"'
}
-sane_grep () {
- GREP_OPTIONS= LC_ALL=C grep @@SANE_TEXT_GREP@@ "$@"
-}
-
-sane_egrep () {
- GREP_OPTIONS= LC_ALL=C egrep @@SANE_TEXT_GREP@@ "$@"
-}
-
is_bare_repository () {
git rev-parse --is-bare-repository
}
@@ -217,9 +208,6 @@
then
action=$1
case "$action" in
- rebase)
- gettextln "Cannot rebase: You have unstaged changes." >&2
- ;;
"rewrite branches")
gettextln "Cannot rewrite branches: You have unstaged changes." >&2
;;
@@ -235,14 +223,7 @@
if test $err = 0
then
action=$1
- case "$action" in
- rebase)
- gettextln "Cannot rebase: Your index contains uncommitted changes." >&2
- ;;
- *)
- eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
- ;;
- esac
+ eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
else
gettextln "Additionally, your index contains uncommitted changes." >&2
fi
diff --git a/git-submodule.sh b/git-submodule.sh
index 652861a..fd0b4a2 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -10,7 +10,7 @@
or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
or: $dashless [--quiet] init [--] [<path>...]
or: $dashless [--quiet] deinit [-f|--force] (--all| [--] <path>...)
- or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
+ or: $dashless [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
or: $dashless [--quiet] set-branch (--default|--branch <branch>) [--] <path>
or: $dashless [--quiet] set-url [--] <path> <newurl>
or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
@@ -49,14 +49,7 @@
single_branch=
jobs=
recommend_shallow=
-
-die_if_unmatched ()
-{
- if test "$1" = "#unmatched"
- then
- exit ${2:-1}
- fi
-}
+filter=
isnumber()
{
@@ -246,20 +239,6 @@
git ${wt_prefix:+-C "$wt_prefix"} submodule--helper deinit ${GIT_QUIET:+--quiet} ${force:+--force} ${deinit_all:+--all} -- "$@"
}
-# usage: fetch_in_submodule <module_path> [<depth>] [<sha1>]
-# Because arguments are positional, use an empty string to omit <depth>
-# but include <sha1>.
-fetch_in_submodule () (
- sanitize_submodule_env &&
- cd "$1" &&
- if test $# -eq 3
- then
- echo "$3" | git fetch ${GIT_QUIET:+--quiet} --stdin ${2:+"$2"}
- else
- git fetch ${GIT_QUIET:+--quiet} ${2:+"$2"}
- fi
-)
-
#
# Update each submodule path to correct revision, using clone and checkout as needed
#
@@ -347,6 +326,14 @@
--no-single-branch)
single_branch="--no-single-branch"
;;
+ --filter)
+ case "$2" in '') usage ;; esac
+ filter="--filter=$2"
+ shift
+ ;;
+ --filter=*)
+ filter="$1"
+ ;;
--)
shift
break
@@ -361,133 +348,28 @@
shift
done
- if test -n "$init"
- then
- cmd_init "--" "$@" || return
- fi
-
- {
- git submodule--helper update-clone ${GIT_QUIET:+--quiet} \
+ git ${wt_prefix:+-C "$wt_prefix"} submodule--helper update \
+ ${GIT_QUIET:+--quiet} \
+ ${force:+--force} \
${progress:+"--progress"} \
+ ${remote:+--remote} \
+ ${recursive:+--recursive} \
+ ${init:+--init} \
+ ${nofetch:+--no-fetch} \
${wt_prefix:+--prefix "$wt_prefix"} \
${prefix:+--recursive-prefix "$prefix"} \
${update:+--update "$update"} \
${reference:+"$reference"} \
${dissociate:+"--dissociate"} \
- ${depth:+--depth "$depth"} \
+ ${depth:+"$depth"} \
${require_init:+--require-init} \
+ ${dissociate:+"--dissociate"} \
$single_branch \
$recommend_shallow \
$jobs \
+ $filter \
-- \
- "$@" || echo "#unmatched" $?
- } | {
- err=
- while read -r quickabort sha1 just_cloned sm_path
- do
- die_if_unmatched "$quickabort" "$sha1"
-
- git submodule--helper ensure-core-worktree "$sm_path" || exit 1
-
- displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
-
- if test $just_cloned -eq 1
- then
- subsha1=
- else
- just_cloned=
- subsha1=$(sanitize_submodule_env; cd "$sm_path" &&
- git rev-parse --verify HEAD) ||
- die "fatal: $(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
- fi
-
- if test -n "$remote"
- then
- branch=$(git submodule--helper remote-branch "$sm_path")
- if test -z "$nofetch"
- then
- # Fetch remote before determining tracking $sha1
- fetch_in_submodule "$sm_path" $depth ||
- die "fatal: $(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
- fi
- remote_name=$(sanitize_submodule_env; cd "$sm_path" && git submodule--helper print-default-remote)
- sha1=$(sanitize_submodule_env; cd "$sm_path" &&
- git rev-parse --verify "${remote_name}/${branch}") ||
- die "fatal: $(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")"
- fi
-
- out=$(git submodule--helper run-update-procedure \
- ${wt_prefix:+--prefix "$wt_prefix"} \
- ${GIT_QUIET:+--quiet} \
- ${force:+--force} \
- ${just_cloned:+--just-cloned} \
- ${nofetch:+--no-fetch} \
- ${depth:+"$depth"} \
- ${update:+--update "$update"} \
- ${prefix:+--recursive-prefix "$prefix"} \
- ${sha1:+--oid "$sha1"} \
- ${subsha1:+--suboid "$subsha1"} \
- "--" \
- "$sm_path")
-
- # exit codes for run-update-procedure:
- # 0: update was successful, say command output
- # 1: update procedure failed, but should not die
- # 2 or 128: subcommand died during execution
- # 3: no update procedure was run
- res="$?"
- case $res in
- 0)
- say "$out"
- ;;
- 1)
- err="${err};fatal: $out"
- continue
- ;;
- 2|128)
- die_with_status $res "fatal: $out"
- ;;
- esac
-
- if test -n "$recursive"
- then
- (
- prefix=$(git submodule--helper relative-path "$prefix$sm_path/" "$wt_prefix")
- wt_prefix=
- sanitize_submodule_env
- cd "$sm_path" &&
- eval cmd_update
- )
- res=$?
- if test $res -gt 0
- then
- die_msg="fatal: $(eval_gettext "Failed to recurse into submodule path '\$displaypath'")"
- if test $res -ne 2
- then
- err="${err};$die_msg"
- continue
- else
- die_with_status $res "$die_msg"
- fi
- fi
- fi
- done
-
- if test -n "$err"
- then
- OIFS=$IFS
- IFS=';'
- for e in $err
- do
- if test -n "$e"
- then
- echo >&2 "$e"
- fi
- done
- IFS=$OIFS
- exit 1
- fi
- }
+ "$@"
}
#
diff --git a/git-svn.perl b/git-svn.perl
index 70cb5e2..be987e3 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -273,7 +273,6 @@
'fetch-all|all' => \$_fetch_all,
'dry-run|n' => \$_dry_run,
'rebase-merges|p' => \$_rebase_merges,
- 'preserve-merges|p' => \$_rebase_merges,
%fc_opts } ],
'commit-diff' => [ \&cmd_commit_diff,
'Commit a diff between two trees',
diff --git a/git.c b/git.c
index 60c2784..5ff4f3e 100644
--- a/git.c
+++ b/git.c
@@ -25,7 +25,7 @@ struct cmd_struct {
};
const char git_usage_string[] =
- N_("git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+ N_("git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
@@ -146,7 +146,8 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
* commands can be written with "--" prepended
* to make them look like flags.
*/
- if (!strcmp(cmd, "--help") || !strcmp(cmd, "--version"))
+ if (!strcmp(cmd, "--help") || !strcmp(cmd, "-h") ||
+ !strcmp(cmd, "--version") || !strcmp(cmd, "-v"))
break;
/*
@@ -185,7 +186,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "--git-dir")) {
if (*argc < 2) {
- fprintf(stderr, _("no directory given for --git-dir\n" ));
+ fprintf(stderr, _("no directory given for '%s' option\n" ), "--git-dir");
usage(git_usage_string);
}
setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1);
@@ -213,7 +214,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "--work-tree")) {
if (*argc < 2) {
- fprintf(stderr, _("no directory given for --work-tree\n" ));
+ fprintf(stderr, _("no directory given for '%s' option\n" ), "--work-tree");
usage(git_usage_string);
}
setenv(GIT_WORK_TREE_ENVIRONMENT, (*argv)[1], 1);
@@ -297,7 +298,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "-C")) {
if (*argc < 2) {
- fprintf(stderr, _("no directory given for -C\n" ));
+ fprintf(stderr, _("no directory given for '%s' option\n" ), "-C");
usage(git_usage_string);
}
if ((*argv)[1][0]) {
@@ -421,27 +422,31 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
int status, help;
struct stat st;
const char *prefix;
+ int run_setup = (p->option & (RUN_SETUP | RUN_SETUP_GENTLY));
- prefix = NULL;
help = argc == 2 && !strcmp(argv[1], "-h");
- if (!help) {
- if (p->option & RUN_SETUP)
- prefix = setup_git_directory();
- else if (p->option & RUN_SETUP_GENTLY) {
- int nongit_ok;
- prefix = setup_git_directory_gently(&nongit_ok);
- }
- precompose_argv_prefix(argc, argv, NULL);
- if (use_pager == -1 && p->option & (RUN_SETUP | RUN_SETUP_GENTLY) &&
- !(p->option & DELAY_PAGER_CONFIG))
- use_pager = check_pager_config(p->cmd);
- if (use_pager == -1 && p->option & USE_PAGER)
- use_pager = 1;
+ if (help && (run_setup & RUN_SETUP))
+ /* demote to GENTLY to allow 'git cmd -h' outside repo */
+ run_setup = RUN_SETUP_GENTLY;
- if ((p->option & (RUN_SETUP | RUN_SETUP_GENTLY)) &&
- startup_info->have_repository) /* get_git_dir() may set up repo, avoid that */
- trace_repo_setup(prefix);
+ if (run_setup & RUN_SETUP) {
+ prefix = setup_git_directory();
+ } else if (run_setup & RUN_SETUP_GENTLY) {
+ int nongit_ok;
+ prefix = setup_git_directory_gently(&nongit_ok);
+ } else {
+ prefix = NULL;
}
+ assert(!prefix || *prefix);
+ precompose_argv_prefix(argc, argv, NULL);
+ if (use_pager == -1 && run_setup &&
+ !(p->option & DELAY_PAGER_CONFIG))
+ use_pager = check_pager_config(p->cmd);
+ if (use_pager == -1 && p->option & USE_PAGER)
+ use_pager = 1;
+ if (run_setup && startup_info->have_repository)
+ /* get_git_dir() may set up repo, avoid that */
+ trace_repo_setup(prefix);
commit_pager_choice();
if (!help && get_super_prefix()) {
@@ -533,11 +538,13 @@ static struct cmd_struct commands[] = {
{ "format-patch", cmd_format_patch, RUN_SETUP },
{ "fsck", cmd_fsck, RUN_SETUP },
{ "fsck-objects", cmd_fsck, RUN_SETUP },
+ { "fsmonitor--daemon", cmd_fsmonitor__daemon, RUN_SETUP },
{ "gc", cmd_gc, RUN_SETUP },
{ "get-tar-commit-id", cmd_get_tar_commit_id, NO_PARSEOPT },
{ "grep", cmd_grep, RUN_SETUP_GENTLY },
{ "hash-object", cmd_hash_object },
{ "help", cmd_help },
+ { "hook", cmd_hook, RUN_SETUP },
{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY | NO_PARSEOPT },
{ "init", cmd_init_db },
{ "init-db", cmd_init_db },
@@ -577,7 +584,6 @@ static struct cmd_struct commands[] = {
{ "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER },
{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
{ "rebase", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },
- { "rebase--interactive", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },
{ "receive-pack", cmd_receive_pack },
{ "reflog", cmd_reflog, RUN_SETUP },
{ "remote", cmd_remote, RUN_SETUP },
@@ -888,8 +894,10 @@ int cmd_main(int argc, const char **argv)
argc--;
handle_options(&argv, &argc, NULL);
if (argc > 0) {
- /* translate --help and --version into commands */
- skip_prefix(argv[0], "--", &argv[0]);
+ if (!strcmp("--version", argv[0]) || !strcmp("-v", argv[0]))
+ argv[0] = "version";
+ else if (!strcmp("--help", argv[0]) || !strcmp("-h", argv[0]))
+ argv[0] = "help";
} else {
/* The user didn't specify a command; give them help */
commit_pager_choice();
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 23d9dd1..0ae7d68 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -2955,9 +2955,9 @@
proc resizeclistpanes {win w} {
global oldwidth oldsash use_ttk
if {[info exists oldwidth($win)]} {
- if {[info exists oldsash($win)]} {
- set s0 [lindex $oldsash($win) 0]
- set s1 [lindex $oldsash($win) 1]
+ if {[info exists oldsash($win)]} {
+ set s0 [lindex $oldsash($win) 0]
+ set s1 [lindex $oldsash($win) 1]
} elseif {$use_ttk} {
set s0 [$win sashpos 0]
set s1 [$win sashpos 1]
@@ -2991,8 +2991,10 @@
} else {
$win sash place 0 $sash0 [lindex $s0 1]
$win sash place 1 $sash1 [lindex $s1 1]
+ set sash0 [list $sash0 [lindex $s0 1]]
+ set sash1 [list $sash1 [lindex $s1 1]]
}
- set oldsash($win) [list $sash0 $sash1]
+ set oldsash($win) [list $sash0 $sash1]
}
set oldwidth($win) $w
}
@@ -3000,8 +3002,8 @@
proc resizecdetpanes {win w} {
global oldwidth oldsash use_ttk
if {[info exists oldwidth($win)]} {
- if {[info exists oldsash($win)]} {
- set s0 $oldsash($win)
+ if {[info exists oldsash($win)]} {
+ set s0 $oldsash($win)
} elseif {$use_ttk} {
set s0 [$win sashpos 0]
} else {
@@ -3023,8 +3025,9 @@
$win sashpos 0 $sash0
} else {
$win sash place 0 $sash0 [lindex $s0 1]
+ set sash0 [list $sash0 [lindex $s0 1]]
}
- set oldsash($win) $sash0
+ set oldsash($win) $sash0
}
set oldwidth($win) $w
}
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index fbd1c20..606b501 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -4213,8 +4213,7 @@
my %opts = @_;
my $title = get_page_title();
- my $content_type = get_content_type_html();
- print $cgi->header(-type=>$content_type, -charset => 'utf-8',
+ print $cgi->header(-type=>get_content_type_html(), -charset => 'utf-8',
-status=> $status, -expires => $expires)
unless ($opts{'-no_http_header'});
my $mod_perl_version = $ENV{'MOD_PERL'} ? " $ENV{'MOD_PERL'}" : '';
@@ -4225,7 +4224,6 @@
<!-- git web interface version $version, (C) 2005-2006, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke -->
<!-- git core binaries version $git_version -->
<head>
-<meta http-equiv="content-type" content="$content_type; charset=utf-8"/>
<meta name="generator" content="gitweb/$version git/$git_version$mod_perl_version"/>
<meta name="robots" content="index, nofollow"/>
<title>$title</title>
diff --git a/gpg-interface.c b/gpg-interface.c
index 127aecf..280f1fa 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -3,11 +3,14 @@
#include "config.h"
#include "run-command.h"
#include "strbuf.h"
+#include "dir.h"
#include "gpg-interface.h"
#include "sigchain.h"
#include "tempfile.h"
+#include "alias.h"
static char *configured_signing_key;
+static const char *ssh_default_key_command, *ssh_allowed_signers, *ssh_revocation_file;
static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED;
struct gpg_format {
@@ -15,6 +18,14 @@ struct gpg_format {
const char *program;
const char **verify_args;
const char **sigs;
+ int (*verify_signed_buffer)(struct signature_check *sigc,
+ struct gpg_format *fmt,
+ const char *signature,
+ size_t signature_size);
+ int (*sign_buffer)(struct strbuf *buffer, struct strbuf *signature,
+ const char *signing_key);
+ const char *(*get_default_key)(void);
+ const char *(*get_key_id)(void);
};
static const char *openpgp_verify_args[] = {
@@ -35,14 +46,59 @@ static const char *x509_sigs[] = {
NULL
};
+static const char *ssh_verify_args[] = { NULL };
+static const char *ssh_sigs[] = {
+ "-----BEGIN SSH SIGNATURE-----",
+ NULL
+};
+
+static int verify_gpg_signed_buffer(struct signature_check *sigc,
+ struct gpg_format *fmt,
+ const char *signature,
+ size_t signature_size);
+static int verify_ssh_signed_buffer(struct signature_check *sigc,
+ struct gpg_format *fmt,
+ const char *signature,
+ size_t signature_size);
+static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature,
+ const char *signing_key);
+static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
+ const char *signing_key);
+
+static const char *get_default_ssh_signing_key(void);
+
+static const char *get_ssh_key_id(void);
+
static struct gpg_format gpg_format[] = {
- { .name = "openpgp", .program = "gpg",
- .verify_args = openpgp_verify_args,
- .sigs = openpgp_sigs
+ {
+ .name = "openpgp",
+ .program = "gpg",
+ .verify_args = openpgp_verify_args,
+ .sigs = openpgp_sigs,
+ .verify_signed_buffer = verify_gpg_signed_buffer,
+ .sign_buffer = sign_buffer_gpg,
+ .get_default_key = NULL,
+ .get_key_id = NULL,
},
- { .name = "x509", .program = "gpgsm",
- .verify_args = x509_verify_args,
- .sigs = x509_sigs
+ {
+ .name = "x509",
+ .program = "gpgsm",
+ .verify_args = x509_verify_args,
+ .sigs = x509_sigs,
+ .verify_signed_buffer = verify_gpg_signed_buffer,
+ .sign_buffer = sign_buffer_gpg,
+ .get_default_key = NULL,
+ .get_key_id = NULL,
+ },
+ {
+ .name = "ssh",
+ .program = "ssh-keygen",
+ .verify_args = ssh_verify_args,
+ .sigs = ssh_sigs,
+ .verify_signed_buffer = verify_ssh_signed_buffer,
+ .sign_buffer = sign_buffer_ssh,
+ .get_default_key = get_default_ssh_signing_key,
+ .get_key_id = get_ssh_key_id,
},
};
@@ -72,7 +128,7 @@ static struct gpg_format *get_format_by_sig(const char *sig)
void signature_check_clear(struct signature_check *sigc)
{
FREE_AND_NULL(sigc->payload);
- FREE_AND_NULL(sigc->gpg_output);
+ FREE_AND_NULL(sigc->output);
FREE_AND_NULL(sigc->gpg_status);
FREE_AND_NULL(sigc->signer);
FREE_AND_NULL(sigc->key);
@@ -257,16 +313,16 @@ static void parse_gpg_output(struct signature_check *sigc)
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)
+static int verify_gpg_signed_buffer(struct signature_check *sigc,
+ struct gpg_format *fmt,
+ const char *signature,
+ size_t signature_size)
{
struct child_process gpg = CHILD_PROCESS_INIT;
- struct gpg_format *fmt;
struct tempfile *temp;
int ret;
- struct strbuf buf = STRBUF_INIT;
+ struct strbuf gpg_stdout = STRBUF_INIT;
+ struct strbuf gpg_stderr = STRBUF_INIT;
temp = mks_tempfile_t(".git_vtag_tmpXXXXXX");
if (!temp)
@@ -279,10 +335,6 @@ static int verify_signed_buffer(const char *payload, size_t payload_size,
return -1;
}
- fmt = get_format_by_sig(signature);
- if (!fmt)
- BUG("bad signature '%s'", signature);
-
strvec_push(&gpg.args, fmt->program);
strvec_pushv(&gpg.args, fmt->verify_args);
strvec_pushl(&gpg.args,
@@ -290,57 +342,322 @@ static int verify_signed_buffer(const char *payload, size_t payload_size,
"--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);
+ ret = pipe_command(&gpg, sigc->payload, sigc->payload_len, &gpg_stdout, 0,
+ &gpg_stderr, 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 */
+ ret |= !strstr(gpg_stdout.buf, "\n[GNUPG:] GOODSIG ");
+ sigc->output = strbuf_detach(&gpg_stderr, NULL);
+ sigc->gpg_status = strbuf_detach(&gpg_stdout, NULL);
+
+ parse_gpg_output(sigc);
+
+ strbuf_release(&gpg_stdout);
+ strbuf_release(&gpg_stderr);
return ret;
}
-int check_signature(const char *payload, size_t plen, const char *signature,
- size_t slen, struct signature_check *sigc)
+static void parse_ssh_output(struct signature_check *sigc)
{
- struct strbuf gpg_output = STRBUF_INIT;
- struct strbuf gpg_status = STRBUF_INIT;
+ const char *line, *principal, *search;
+ char *to_free;
+ char *key = NULL;
+
+ /*
+ * ssh-keygen output should be:
+ * Good "git" signature for PRINCIPAL with RSA key SHA256:FINGERPRINT
+ *
+ * or for valid but unknown keys:
+ * Good "git" signature with RSA key SHA256:FINGERPRINT
+ *
+ * Note that "PRINCIPAL" can contain whitespace, "RSA" and
+ * "SHA256" part could be a different token that names of
+ * the algorithms used, and "FINGERPRINT" is a hexadecimal
+ * string. By finding the last occurence of " with ", we can
+ * reliably parse out the PRINCIPAL.
+ */
+ sigc->result = 'B';
+ sigc->trust_level = TRUST_NEVER;
+
+ line = to_free = xmemdupz(sigc->output, strcspn(sigc->output, "\n"));
+
+ if (skip_prefix(line, "Good \"git\" signature for ", &line)) {
+ /* Search for the last "with" to get the full principal */
+ principal = line;
+ do {
+ search = strstr(line, " with ");
+ if (search)
+ line = search + 1;
+ } while (search != NULL);
+ if (line == principal)
+ goto cleanup;
+
+ /* Valid signature and known principal */
+ sigc->result = 'G';
+ sigc->trust_level = TRUST_FULLY;
+ sigc->signer = xmemdupz(principal, line - principal - 1);
+ } else if (skip_prefix(line, "Good \"git\" signature with ", &line)) {
+ /* Valid signature, but key unknown */
+ sigc->result = 'G';
+ sigc->trust_level = TRUST_UNDEFINED;
+ } else {
+ goto cleanup;
+ }
+
+ key = strstr(line, "key ");
+ if (key) {
+ sigc->fingerprint = xstrdup(strstr(line, "key ") + 4);
+ sigc->key = xstrdup(sigc->fingerprint);
+ } else {
+ /*
+ * Output did not match what we expected
+ * Treat the signature as bad
+ */
+ sigc->result = 'B';
+ }
+
+cleanup:
+ free(to_free);
+}
+
+static int verify_ssh_signed_buffer(struct signature_check *sigc,
+ struct gpg_format *fmt,
+ const char *signature,
+ size_t signature_size)
+{
+ struct child_process ssh_keygen = CHILD_PROCESS_INIT;
+ struct tempfile *buffer_file;
+ int ret = -1;
+ const char *line;
+ char *principal;
+ struct strbuf ssh_principals_out = STRBUF_INIT;
+ struct strbuf ssh_principals_err = STRBUF_INIT;
+ struct strbuf ssh_keygen_out = STRBUF_INIT;
+ struct strbuf ssh_keygen_err = STRBUF_INIT;
+ struct strbuf verify_time = STRBUF_INIT;
+ const struct date_mode verify_date_mode = {
+ .type = DATE_STRFTIME,
+ .strftime_fmt = "%Y%m%d%H%M%S",
+ /* SSH signing key validity has no timezone information - Use the local timezone */
+ .local = 1,
+ };
+
+ if (!ssh_allowed_signers) {
+ error(_("gpg.ssh.allowedSignersFile needs to be configured and exist for ssh signature verification"));
+ return -1;
+ }
+
+ buffer_file = mks_tempfile_t(".git_vtag_tmpXXXXXX");
+ if (!buffer_file)
+ return error_errno(_("could not create temporary file"));
+ if (write_in_full(buffer_file->fd, signature, signature_size) < 0 ||
+ close_tempfile_gently(buffer_file) < 0) {
+ error_errno(_("failed writing detached signature to '%s'"),
+ buffer_file->filename.buf);
+ delete_tempfile(&buffer_file);
+ return -1;
+ }
+
+ if (sigc->payload_timestamp)
+ strbuf_addf(&verify_time, "-Overify-time=%s",
+ show_date(sigc->payload_timestamp, 0, &verify_date_mode));
+
+ /* Find the principal from the signers */
+ strvec_pushl(&ssh_keygen.args, fmt->program,
+ "-Y", "find-principals",
+ "-f", ssh_allowed_signers,
+ "-s", buffer_file->filename.buf,
+ verify_time.buf,
+ NULL);
+ ret = pipe_command(&ssh_keygen, NULL, 0, &ssh_principals_out, 0,
+ &ssh_principals_err, 0);
+ if (ret && strstr(ssh_principals_err.buf, "usage:")) {
+ error(_("ssh-keygen -Y find-principals/verify is needed for ssh signature verification (available in openssh version 8.2p1+)"));
+ goto out;
+ }
+ if (ret || !ssh_principals_out.len) {
+ /*
+ * We did not find a matching principal in the allowedSigners
+ * Check without validation
+ */
+ child_process_init(&ssh_keygen);
+ strvec_pushl(&ssh_keygen.args, fmt->program,
+ "-Y", "check-novalidate",
+ "-n", "git",
+ "-s", buffer_file->filename.buf,
+ verify_time.buf,
+ NULL);
+ pipe_command(&ssh_keygen, sigc->payload, sigc->payload_len,
+ &ssh_keygen_out, 0, &ssh_keygen_err, 0);
+
+ /*
+ * Fail on unknown keys
+ * we still call check-novalidate to display the signature info
+ */
+ ret = -1;
+ } else {
+ /* Check every principal we found (one per line) */
+ const char *next;
+ for (line = ssh_principals_out.buf;
+ *line;
+ line = next) {
+ const char *end_of_text;
+
+ next = end_of_text = strchrnul(line, '\n');
+
+ /* Did we find a LF, and did we have CR before it? */
+ if (*end_of_text &&
+ line < end_of_text &&
+ end_of_text[-1] == '\r')
+ end_of_text--;
+
+ /* Unless we hit NUL, skip over the LF we found */
+ if (*next)
+ next++;
+
+ /* Not all lines are data. Skip empty ones */
+ if (line == end_of_text)
+ continue;
+
+ /* We now know we have an non-empty line. Process it */
+ principal = xmemdupz(line, end_of_text - line);
+
+ child_process_init(&ssh_keygen);
+ strbuf_release(&ssh_keygen_out);
+ strbuf_release(&ssh_keygen_err);
+ strvec_push(&ssh_keygen.args, fmt->program);
+ /*
+ * We found principals
+ * Try with each until we find a match
+ */
+ strvec_pushl(&ssh_keygen.args, "-Y", "verify",
+ "-n", "git",
+ "-f", ssh_allowed_signers,
+ "-I", principal,
+ "-s", buffer_file->filename.buf,
+ verify_time.buf,
+ NULL);
+
+ if (ssh_revocation_file) {
+ if (file_exists(ssh_revocation_file)) {
+ strvec_pushl(&ssh_keygen.args, "-r",
+ ssh_revocation_file, NULL);
+ } else {
+ warning(_("ssh signing revocation file configured but not found: %s"),
+ ssh_revocation_file);
+ }
+ }
+
+ sigchain_push(SIGPIPE, SIG_IGN);
+ ret = pipe_command(&ssh_keygen, sigc->payload, sigc->payload_len,
+ &ssh_keygen_out, 0, &ssh_keygen_err, 0);
+ sigchain_pop(SIGPIPE);
+
+ FREE_AND_NULL(principal);
+
+ if (!ret)
+ ret = !starts_with(ssh_keygen_out.buf, "Good");
+
+ if (!ret)
+ break;
+ }
+ }
+
+ strbuf_stripspace(&ssh_keygen_out, 0);
+ strbuf_stripspace(&ssh_keygen_err, 0);
+ /* Add stderr outputs to show the user actual ssh-keygen errors */
+ strbuf_add(&ssh_keygen_out, ssh_principals_err.buf, ssh_principals_err.len);
+ strbuf_add(&ssh_keygen_out, ssh_keygen_err.buf, ssh_keygen_err.len);
+ sigc->output = strbuf_detach(&ssh_keygen_out, NULL);
+ sigc->gpg_status = xstrdup(sigc->output);
+
+ parse_ssh_output(sigc);
+
+out:
+ if (buffer_file)
+ delete_tempfile(&buffer_file);
+ strbuf_release(&ssh_principals_out);
+ strbuf_release(&ssh_principals_err);
+ strbuf_release(&ssh_keygen_out);
+ strbuf_release(&ssh_keygen_err);
+ strbuf_release(&verify_time);
+
+ return ret;
+}
+
+static int parse_payload_metadata(struct signature_check *sigc)
+{
+ const char *ident_line = NULL;
+ size_t ident_len;
+ struct ident_split ident;
+ const char *signer_header;
+
+ switch (sigc->payload_type) {
+ case SIGNATURE_PAYLOAD_COMMIT:
+ signer_header = "committer";
+ break;
+ case SIGNATURE_PAYLOAD_TAG:
+ signer_header = "tagger";
+ break;
+ case SIGNATURE_PAYLOAD_UNDEFINED:
+ case SIGNATURE_PAYLOAD_PUSH_CERT:
+ /* Ignore payloads we don't want to parse */
+ return 0;
+ default:
+ BUG("invalid value for sigc->payload_type");
+ }
+
+ ident_line = find_commit_header(sigc->payload, signer_header, &ident_len);
+ if (!ident_line || !ident_len)
+ return 1;
+
+ if (split_ident_line(&ident, ident_line, ident_len))
+ return 1;
+
+ if (!sigc->payload_timestamp && ident.date_begin && ident.date_end)
+ sigc->payload_timestamp = parse_timestamp(ident.date_begin, NULL, 10);
+
+ return 0;
+}
+
+int check_signature(struct signature_check *sigc,
+ const char *signature, size_t slen)
+{
+ struct gpg_format *fmt;
int status;
sigc->result = 'N';
sigc->trust_level = -1;
- status = verify_signed_buffer(payload, plen, signature, slen,
- &gpg_output, &gpg_status);
- if (status && !gpg_output.len)
- goto out;
- sigc->payload = xmemdupz(payload, plen);
- sigc->gpg_output = strbuf_detach(&gpg_output, NULL);
- sigc->gpg_status = strbuf_detach(&gpg_status, NULL);
- parse_gpg_output(sigc);
+ fmt = get_format_by_sig(signature);
+ if (!fmt)
+ die(_("bad/incompatible signature '%s'"), signature);
+
+ if (parse_payload_metadata(sigc))
+ return 1;
+
+ status = fmt->verify_signed_buffer(sigc, fmt, signature, slen);
+
+ if (status && !sigc->output)
+ return !!status;
+
status |= sigc->result != 'G';
status |= sigc->trust_level < configured_min_trust_level;
- out:
- strbuf_release(&gpg_status);
- strbuf_release(&gpg_output);
-
return !!status;
}
void print_signature_buffer(const struct signature_check *sigc, unsigned flags)
{
- const char *output = flags & GPG_VERIFY_RAW ?
- sigc->gpg_status : sigc->gpg_output;
+ const char *output = flags & GPG_VERIFY_RAW ? sigc->gpg_status :
+ sigc->output;
if (flags & GPG_VERIFY_VERBOSE && sigc->payload)
- fputs(sigc->payload, stdout);
+ fwrite(sigc->payload, 1, sigc->payload_len, stdout);
if (output)
fputs(output, stderr);
@@ -399,7 +716,7 @@ int git_gpg_config(const char *var, const char *value, void *cb)
return config_error_nonbool(var);
fmt = get_format_by_name(value);
if (!fmt)
- return error("unsupported value for %s: %s",
+ return error(_("invalid value for '%s': '%s'"),
var, value);
use_format = fmt;
return 0;
@@ -414,17 +731,38 @@ int git_gpg_config(const char *var, const char *value, void *cb)
free(trust);
if (ret)
- return error("unsupported value for %s: %s", var,
- value);
+ return error(_("invalid value for '%s': '%s'"),
+ var, value);
return 0;
}
+ if (!strcmp(var, "gpg.ssh.defaultkeycommand")) {
+ if (!value)
+ return config_error_nonbool(var);
+ return git_config_string(&ssh_default_key_command, var, value);
+ }
+
+ if (!strcmp(var, "gpg.ssh.allowedsignersfile")) {
+ if (!value)
+ return config_error_nonbool(var);
+ return git_config_pathname(&ssh_allowed_signers, var, value);
+ }
+
+ if (!strcmp(var, "gpg.ssh.revocationfile")) {
+ if (!value)
+ return config_error_nonbool(var);
+ return git_config_pathname(&ssh_revocation_file, var, value);
+ }
+
if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program"))
fmtname = "openpgp";
if (!strcmp(var, "gpg.x509.program"))
fmtname = "x509";
+ if (!strcmp(var, "gpg.ssh.program"))
+ fmtname = "ssh";
+
if (fmtname) {
fmt = get_format_by_name(fmtname);
return git_config_string(&fmt->program, var, value);
@@ -433,18 +771,170 @@ int git_gpg_config(const char *var, const char *value, void *cb)
return 0;
}
+/*
+ * Returns 1 if `string` contains a literal ssh key, 0 otherwise
+ * `key` will be set to the start of the actual key if a prefix is present.
+ */
+static int is_literal_ssh_key(const char *string, const char **key)
+{
+ if (skip_prefix(string, "key::", key))
+ return 1;
+ if (starts_with(string, "ssh-")) {
+ *key = string;
+ return 1;
+ }
+ return 0;
+}
+
+static char *get_ssh_key_fingerprint(const char *signing_key)
+{
+ struct child_process ssh_keygen = CHILD_PROCESS_INIT;
+ int ret = -1;
+ struct strbuf fingerprint_stdout = STRBUF_INIT;
+ struct strbuf **fingerprint;
+ char *fingerprint_ret;
+ const char *literal_key = NULL;
+
+ /*
+ * With SSH Signing this can contain a filename or a public key
+ * For textual representation we usually want a fingerprint
+ */
+ if (is_literal_ssh_key(signing_key, &literal_key)) {
+ strvec_pushl(&ssh_keygen.args, "ssh-keygen", "-lf", "-", NULL);
+ ret = pipe_command(&ssh_keygen, literal_key,
+ strlen(literal_key), &fingerprint_stdout, 0,
+ NULL, 0);
+ } else {
+ strvec_pushl(&ssh_keygen.args, "ssh-keygen", "-lf",
+ configured_signing_key, NULL);
+ ret = pipe_command(&ssh_keygen, NULL, 0, &fingerprint_stdout, 0,
+ NULL, 0);
+ }
+
+ if (!!ret)
+ die_errno(_("failed to get the ssh fingerprint for key '%s'"),
+ signing_key);
+
+ fingerprint = strbuf_split_max(&fingerprint_stdout, ' ', 3);
+ if (!fingerprint[1])
+ die_errno(_("failed to get the ssh fingerprint for key '%s'"),
+ signing_key);
+
+ fingerprint_ret = strbuf_detach(fingerprint[1], NULL);
+ strbuf_list_free(fingerprint);
+ strbuf_release(&fingerprint_stdout);
+ return fingerprint_ret;
+}
+
+/* Returns the first public key from an ssh-agent to use for signing */
+static const char *get_default_ssh_signing_key(void)
+{
+ struct child_process ssh_default_key = CHILD_PROCESS_INIT;
+ int ret = -1;
+ struct strbuf key_stdout = STRBUF_INIT, key_stderr = STRBUF_INIT;
+ struct strbuf **keys;
+ char *key_command = NULL;
+ const char **argv;
+ int n;
+ char *default_key = NULL;
+ const char *literal_key = NULL;
+
+ if (!ssh_default_key_command)
+ die(_("either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"));
+
+ key_command = xstrdup(ssh_default_key_command);
+ n = split_cmdline(key_command, &argv);
+
+ if (n < 0)
+ die("malformed build-time gpg.ssh.defaultKeyCommand: %s",
+ split_cmdline_strerror(n));
+
+ strvec_pushv(&ssh_default_key.args, argv);
+ ret = pipe_command(&ssh_default_key, NULL, 0, &key_stdout, 0,
+ &key_stderr, 0);
+
+ if (!ret) {
+ keys = strbuf_split_max(&key_stdout, '\n', 2);
+ if (keys[0] && is_literal_ssh_key(keys[0]->buf, &literal_key)) {
+ /*
+ * We only use `is_literal_ssh_key` here to check validity
+ * The prefix will be stripped when the key is used.
+ */
+ default_key = strbuf_detach(keys[0], NULL);
+ } else {
+ warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"),
+ key_stderr.buf, key_stdout.buf);
+ }
+
+ strbuf_list_free(keys);
+ } else {
+ warning(_("gpg.ssh.defaultKeyCommand failed: %s %s"),
+ key_stderr.buf, key_stdout.buf);
+ }
+
+ free(key_command);
+ free(argv);
+ strbuf_release(&key_stdout);
+
+ return default_key;
+}
+
+static const char *get_ssh_key_id(void) {
+ return get_ssh_key_fingerprint(get_signing_key());
+}
+
+/* Returns a textual but unique representation of the signing key */
+const char *get_signing_key_id(void)
+{
+ if (use_format->get_key_id) {
+ return use_format->get_key_id();
+ }
+
+ /* GPG/GPGSM only store a key id on this variable */
+ return get_signing_key();
+}
+
const char *get_signing_key(void)
{
if (configured_signing_key)
return configured_signing_key;
- return git_committer_info(IDENT_STRICT|IDENT_NO_DATE);
+ if (use_format->get_default_key) {
+ return use_format->get_default_key();
+ }
+
+ return git_committer_info(IDENT_STRICT | IDENT_NO_DATE);
}
int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key)
{
+ return use_format->sign_buffer(buffer, signature, signing_key);
+}
+
+/*
+ * Strip CR from the line endings, in case we are on Windows.
+ * NEEDSWORK: make it trim only CRs before LFs and rename
+ */
+static void remove_cr_after(struct strbuf *buffer, size_t offset)
+{
+ size_t i, j;
+
+ for (i = j = offset; i < buffer->len; i++) {
+ if (buffer->buf[i] != '\r') {
+ if (i != j)
+ buffer->buf[j] = buffer->buf[i];
+ j++;
+ }
+ }
+ strbuf_setlen(buffer, j);
+}
+
+static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature,
+ const char *signing_key)
+{
struct child_process gpg = CHILD_PROCESS_INIT;
int ret;
- size_t i, j, bottom;
+ size_t bottom;
+ const char *cp;
struct strbuf gpg_status = STRBUF_INIT;
strvec_pushl(&gpg.args,
@@ -464,19 +954,111 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *sig
signature, 1024, &gpg_status, 0);
sigchain_pop(SIGPIPE);
- ret |= !strstr(gpg_status.buf, "\n[GNUPG:] SIG_CREATED ");
+ for (cp = gpg_status.buf;
+ cp && (cp = strstr(cp, "[GNUPG:] SIG_CREATED "));
+ cp++) {
+ if (cp == gpg_status.buf || cp[-1] == '\n')
+ break; /* found */
+ }
+ ret |= !cp;
strbuf_release(&gpg_status);
if (ret)
return error(_("gpg failed to sign the data"));
/* Strip CR from the line endings, in case we are on Windows. */
- for (i = j = bottom; i < signature->len; i++)
- if (signature->buf[i] != '\r') {
- if (i != j)
- signature->buf[j] = signature->buf[i];
- j++;
- }
- strbuf_setlen(signature, j);
+ remove_cr_after(signature, bottom);
return 0;
}
+
+static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
+ const char *signing_key)
+{
+ struct child_process signer = CHILD_PROCESS_INIT;
+ int ret = -1;
+ size_t bottom, keylen;
+ struct strbuf signer_stderr = STRBUF_INIT;
+ struct tempfile *key_file = NULL, *buffer_file = NULL;
+ char *ssh_signing_key_file = NULL;
+ struct strbuf ssh_signature_filename = STRBUF_INIT;
+ const char *literal_key = NULL;
+
+ if (!signing_key || signing_key[0] == '\0')
+ return error(
+ _("user.signingkey needs to be set for ssh signing"));
+
+ if (is_literal_ssh_key(signing_key, &literal_key)) {
+ /* A literal ssh key */
+ key_file = mks_tempfile_t(".git_signing_key_tmpXXXXXX");
+ if (!key_file)
+ return error_errno(
+ _("could not create temporary file"));
+ keylen = strlen(literal_key);
+ if (write_in_full(key_file->fd, literal_key, keylen) < 0 ||
+ close_tempfile_gently(key_file) < 0) {
+ error_errno(_("failed writing ssh signing key to '%s'"),
+ key_file->filename.buf);
+ goto out;
+ }
+ ssh_signing_key_file = strbuf_detach(&key_file->filename, NULL);
+ } else {
+ /* We assume a file */
+ ssh_signing_key_file = expand_user_path(signing_key, 1);
+ }
+
+ buffer_file = mks_tempfile_t(".git_signing_buffer_tmpXXXXXX");
+ if (!buffer_file) {
+ error_errno(_("could not create temporary file"));
+ goto out;
+ }
+
+ if (write_in_full(buffer_file->fd, buffer->buf, buffer->len) < 0 ||
+ close_tempfile_gently(buffer_file) < 0) {
+ error_errno(_("failed writing ssh signing key buffer to '%s'"),
+ buffer_file->filename.buf);
+ goto out;
+ }
+
+ strvec_pushl(&signer.args, use_format->program,
+ "-Y", "sign",
+ "-n", "git",
+ "-f", ssh_signing_key_file,
+ buffer_file->filename.buf,
+ NULL);
+
+ sigchain_push(SIGPIPE, SIG_IGN);
+ ret = pipe_command(&signer, NULL, 0, NULL, 0, &signer_stderr, 0);
+ sigchain_pop(SIGPIPE);
+
+ if (ret) {
+ if (strstr(signer_stderr.buf, "usage:"))
+ error(_("ssh-keygen -Y sign is needed for ssh signing (available in openssh version 8.2p1+)"));
+
+ error("%s", signer_stderr.buf);
+ goto out;
+ }
+
+ bottom = signature->len;
+
+ strbuf_addbuf(&ssh_signature_filename, &buffer_file->filename);
+ strbuf_addstr(&ssh_signature_filename, ".sig");
+ if (strbuf_read_file(signature, ssh_signature_filename.buf, 0) < 0) {
+ error_errno(
+ _("failed reading ssh signing data buffer from '%s'"),
+ ssh_signature_filename.buf);
+ }
+ unlink_or_warn(ssh_signature_filename.buf);
+
+ /* Strip CR from the line endings, in case we are on Windows. */
+ remove_cr_after(signature, bottom);
+
+out:
+ if (key_file)
+ delete_tempfile(&key_file);
+ if (buffer_file)
+ delete_tempfile(&buffer_file);
+ strbuf_release(&signer_stderr);
+ strbuf_release(&ssh_signature_filename);
+ FREE_AND_NULL(ssh_signing_key_file);
+ return ret;
+}
diff --git a/gpg-interface.h b/gpg-interface.h
index 80567e4..b30cbdc 100644
--- a/gpg-interface.h
+++ b/gpg-interface.h
@@ -15,9 +15,19 @@ enum signature_trust_level {
TRUST_ULTIMATE,
};
+enum payload_type {
+ SIGNATURE_PAYLOAD_UNDEFINED,
+ SIGNATURE_PAYLOAD_COMMIT,
+ SIGNATURE_PAYLOAD_TAG,
+ SIGNATURE_PAYLOAD_PUSH_CERT,
+};
+
struct signature_check {
char *payload;
- char *gpg_output;
+ size_t payload_len;
+ enum payload_type payload_type;
+ timestamp_t payload_timestamp;
+ char *output;
char *gpg_status;
/*
@@ -64,9 +74,14 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature,
int git_gpg_config(const char *, const char *, void *);
void set_signing_key(const char *);
const char *get_signing_key(void);
-int check_signature(const char *payload, size_t plen,
- const char *signature, size_t slen,
- struct signature_check *sigc);
+
+/*
+ * Returns a textual unique representation of the signing key in use
+ * Either a GPG KeyID or a SSH Key Fingerprint
+ */
+const char *get_signing_key_id(void);
+int check_signature(struct signature_check *sigc,
+ const char *signature, size_t slen);
void print_signature_buffer(const struct signature_check *sigc,
unsigned flags);
diff --git a/graph.c b/graph.c
index e3828eb..568b6e7 100644
--- a/graph.c
+++ b/graph.c
@@ -401,6 +401,18 @@ struct git_graph *graph_init(struct rev_info *opt)
return graph;
}
+void graph_clear(struct git_graph *graph)
+{
+ if (!graph)
+ return;
+
+ free(graph->columns);
+ free(graph->new_columns);
+ free(graph->mapping);
+ free(graph->old_mapping);
+ free(graph);
+}
+
static void graph_update_state(struct git_graph *graph, enum graph_state s)
{
graph->prev_state = graph->state;
diff --git a/graph.h b/graph.h
index 8313e29..e88632a 100644
--- a/graph.h
+++ b/graph.h
@@ -140,6 +140,11 @@ void graph_set_column_colors(const char **colors, unsigned short colors_max);
struct git_graph *graph_init(struct rev_info *opt);
/*
+ * Free a struct git_graph.
+ */
+void graph_clear(struct git_graph *graph);
+
+/*
* Update a git_graph with a new commit.
* This will cause the graph to begin outputting lines for the new commit
* the next time graph_next_line() is called.
diff --git a/grep.c b/grep.c
index 14fe8a0..82eb7da 100644
--- a/grep.c
+++ b/grep.c
@@ -19,27 +19,6 @@ static void std_output(struct grep_opt *opt, const void *buf, size_t size)
fwrite(buf, size, 1, stdout);
}
-static struct grep_opt grep_defaults = {
- .relative = 1,
- .pathname = 1,
- .max_depth = -1,
- .pattern_type_option = GREP_PATTERN_TYPE_UNSPECIFIED,
- .colors = {
- [GREP_COLOR_CONTEXT] = "",
- [GREP_COLOR_FILENAME] = "",
- [GREP_COLOR_FUNCTION] = "",
- [GREP_COLOR_LINENO] = "",
- [GREP_COLOR_COLUMNNO] = "",
- [GREP_COLOR_MATCH_CONTEXT] = GIT_COLOR_BOLD_RED,
- [GREP_COLOR_MATCH_SELECTED] = GIT_COLOR_BOLD_RED,
- [GREP_COLOR_SELECTED] = "",
- [GREP_COLOR_SEP] = GIT_COLOR_CYAN,
- },
- .only_matching = 0,
- .color = -1,
- .output = std_output,
-};
-
static const char *color_grep_slots[] = {
[GREP_COLOR_CONTEXT] = "context",
[GREP_COLOR_FILENAME] = "filename",
@@ -75,20 +54,12 @@ define_list_config_array_extra(color_grep_slots, {"match"});
*/
int grep_config(const char *var, const char *value, void *cb)
{
- struct grep_opt *opt = &grep_defaults;
+ struct grep_opt *opt = cb;
const char *slot;
if (userdiff_config(var, value) < 0)
return -1;
- /*
- * The instance of grep_opt that we set up here is copied by
- * grep_init() to be used by each individual invocation.
- * When populating a new field of this structure here, be
- * sure to think about ownership -- e.g., you might need to
- * override the shallow copy in grep_init() with a deep copy.
- */
-
if (!strcmp(var, "grep.extendedregexp")) {
opt->extended_regexp_option = git_config_bool(var, value);
return 0;
@@ -134,78 +105,16 @@ int grep_config(const char *var, const char *value, void *cb)
return 0;
}
-/*
- * Initialize one instance of grep_opt and copy the
- * default values from the template we read the configuration
- * information in an earlier call to git_config(grep_config).
- */
-void grep_init(struct grep_opt *opt, struct repository *repo, const char *prefix)
+void grep_init(struct grep_opt *opt, struct repository *repo)
{
- *opt = grep_defaults;
+ struct grep_opt blank = GREP_OPT_INIT;
+ memcpy(opt, &blank, sizeof(*opt));
opt->repo = repo;
- opt->prefix = prefix;
- opt->prefix_length = (prefix && *prefix) ? strlen(prefix) : 0;
opt->pattern_tail = &opt->pattern_list;
opt->header_tail = &opt->header_list;
}
-static void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, struct grep_opt *opt)
-{
- /*
- * When committing to the pattern type by setting the relevant
- * fields in grep_opt it's generally not necessary to zero out
- * the fields we're not choosing, since they won't have been
- * set by anything. The extended_regexp_option field is the
- * only exception to this.
- *
- * This is because in the process of parsing grep.patternType
- * & grep.extendedRegexp we set opt->pattern_type_option and
- * opt->extended_regexp_option, respectively. We then
- * internally use opt->extended_regexp_option to see if we're
- * compiling an ERE. It must be unset if that's not actually
- * the case.
- */
- if (pattern_type != GREP_PATTERN_TYPE_ERE &&
- opt->extended_regexp_option)
- opt->extended_regexp_option = 0;
-
- switch (pattern_type) {
- case GREP_PATTERN_TYPE_UNSPECIFIED:
- /* fall through */
-
- case GREP_PATTERN_TYPE_BRE:
- break;
-
- case GREP_PATTERN_TYPE_ERE:
- opt->extended_regexp_option = 1;
- break;
-
- case GREP_PATTERN_TYPE_FIXED:
- opt->fixed = 1;
- break;
-
- case GREP_PATTERN_TYPE_PCRE:
- opt->pcre2 = 1;
- break;
- }
-}
-
-void grep_commit_pattern_type(enum grep_pattern_type pattern_type, struct grep_opt *opt)
-{
- if (pattern_type != GREP_PATTERN_TYPE_UNSPECIFIED)
- grep_set_pattern_type_option(pattern_type, opt);
- else if (opt->pattern_type_option != GREP_PATTERN_TYPE_UNSPECIFIED)
- grep_set_pattern_type_option(opt->pattern_type_option, opt);
- else if (opt->extended_regexp_option)
- /*
- * This branch *must* happen after setting from the
- * opt->pattern_type_option above, we don't want
- * grep.extendedRegexp to override grep.patternType!
- */
- grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, opt);
-}
-
static struct grep_pat *create_grep_pat(const char *pat, size_t patlen,
const char *origin, int no,
enum grep_pat_token t,
@@ -362,6 +271,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
int jitret;
int patinforet;
size_t jitsizearg;
+ int literal = !opt->ignore_case && (p->fixed || p->is_fixed);
/*
* Call pcre2_general_context_create() before calling any
@@ -382,11 +292,10 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
}
options |= PCRE2_CASELESS;
}
- if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern) &&
- !(!opt->ignore_case && (p->fixed || p->is_fixed)))
+ if (!opt->ignore_locale && is_utf8_locale() && !literal)
options |= (PCRE2_UTF | PCRE2_MATCH_INVALID_UTF);
-#ifdef GIT_PCRE2_VERSION_10_36_OR_HIGHER
+#ifndef GIT_PCRE2_VERSION_10_36_OR_HIGHER
/* Work around https://bugs.exim.org/show_bug.cgi?id=2642 fixed in 10.36 */
if (PCRE2_MATCH_INVALID_UTF && options & (PCRE2_UTF | PCRE2_CASELESS))
options |= PCRE2_NO_START_OPTIMIZE;
@@ -523,11 +432,17 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
int err;
int regflags = REG_NEWLINE;
+ if (opt->pattern_type_option == GREP_PATTERN_TYPE_UNSPECIFIED)
+ opt->pattern_type_option = (opt->extended_regexp_option
+ ? GREP_PATTERN_TYPE_ERE
+ : GREP_PATTERN_TYPE_BRE);
+
p->word_regexp = opt->word_regexp;
p->ignore_case = opt->ignore_case;
- p->fixed = opt->fixed;
+ p->fixed = opt->pattern_type_option == GREP_PATTERN_TYPE_FIXED;
- if (memchr(p->pattern, 0, p->patternlen) && !opt->pcre2)
+ if (opt->pattern_type_option != GREP_PATTERN_TYPE_PCRE &&
+ memchr(p->pattern, 0, p->patternlen))
die(_("given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2"));
p->is_fixed = is_fixed(p->pattern, p->patternlen);
@@ -578,14 +493,14 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
return;
}
- if (opt->pcre2) {
+ if (opt->pattern_type_option == GREP_PATTERN_TYPE_PCRE) {
compile_pcre2_pattern(p, opt);
return;
}
if (p->ignore_case)
regflags |= REG_ICASE;
- if (opt->extended_regexp_option)
+ if (opt->pattern_type_option == GREP_PATTERN_TYPE_ERE)
regflags |= REG_EXTENDED;
err = regcomp(&p->regexp, p->pattern, regflags);
if (err) {
@@ -595,6 +510,35 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
}
}
+static struct grep_expr *grep_not_expr(struct grep_expr *expr)
+{
+ struct grep_expr *z = xcalloc(1, sizeof(*z));
+ z->node = GREP_NODE_NOT;
+ z->u.unary = expr;
+ return z;
+}
+
+static struct grep_expr *grep_binexp(enum grep_expr_node kind,
+ struct grep_expr *left,
+ struct grep_expr *right)
+{
+ struct grep_expr *z = xcalloc(1, sizeof(*z));
+ z->node = kind;
+ z->u.binary.left = left;
+ z->u.binary.right = right;
+ return z;
+}
+
+static struct grep_expr *grep_or_expr(struct grep_expr *left, struct grep_expr *right)
+{
+ return grep_binexp(GREP_NODE_OR, left, right);
+}
+
+static struct grep_expr *grep_and_expr(struct grep_expr *left, struct grep_expr *right)
+{
+ return grep_binexp(GREP_NODE_AND, left, right);
+}
+
static struct grep_expr *compile_pattern_or(struct grep_pat **);
static struct grep_expr *compile_pattern_atom(struct grep_pat **list)
{
@@ -638,12 +582,10 @@ static struct grep_expr *compile_pattern_not(struct grep_pat **list)
if (!p->next)
die("--not not followed by pattern expression");
*list = p->next;
- CALLOC_ARRAY(x, 1);
- x->node = GREP_NODE_NOT;
- x->u.unary = compile_pattern_not(list);
- if (!x->u.unary)
+ x = compile_pattern_not(list);
+ if (!x)
die("--not followed by non pattern expression");
- return x;
+ return grep_not_expr(x);
default:
return compile_pattern_atom(list);
}
@@ -652,7 +594,7 @@ static struct grep_expr *compile_pattern_not(struct grep_pat **list)
static struct grep_expr *compile_pattern_and(struct grep_pat **list)
{
struct grep_pat *p;
- struct grep_expr *x, *y, *z;
+ struct grep_expr *x, *y;
x = compile_pattern_not(list);
p = *list;
@@ -665,11 +607,7 @@ static struct grep_expr *compile_pattern_and(struct grep_pat **list)
y = compile_pattern_and(list);
if (!y)
die("--and not followed by pattern expression");
- CALLOC_ARRAY(z, 1);
- z->node = GREP_NODE_AND;
- z->u.binary.left = x;
- z->u.binary.right = y;
- return z;
+ return grep_and_expr(x, y);
}
return x;
}
@@ -677,7 +615,7 @@ static struct grep_expr *compile_pattern_and(struct grep_pat **list)
static struct grep_expr *compile_pattern_or(struct grep_pat **list)
{
struct grep_pat *p;
- struct grep_expr *x, *y, *z;
+ struct grep_expr *x, *y;
x = compile_pattern_and(list);
p = *list;
@@ -685,11 +623,7 @@ static struct grep_expr *compile_pattern_or(struct grep_pat **list)
y = compile_pattern_or(list);
if (!y)
die("not a pattern expression %s", p->pattern);
- CALLOC_ARRAY(z, 1);
- z->node = GREP_NODE_OR;
- z->u.binary.left = x;
- z->u.binary.right = y;
- return z;
+ return grep_or_expr(x, y);
}
return x;
}
@@ -706,15 +640,6 @@ static struct grep_expr *grep_true_expr(void)
return z;
}
-static struct grep_expr *grep_or_expr(struct grep_expr *left, struct grep_expr *right)
-{
- struct grep_expr *z = xcalloc(1, sizeof(*z));
- z->node = GREP_NODE_OR;
- z->u.binary.left = left;
- z->u.binary.right = right;
- return z;
-}
-
static struct grep_expr *prep_header_patterns(struct grep_opt *opt)
{
struct grep_pat *p;
@@ -797,7 +722,7 @@ void compile_grep_patterns(struct grep_opt *opt)
}
}
- if (opt->all_match || header_expr)
+ if (opt->all_match || opt->no_body_match || header_expr)
opt->extended = 1;
else if (!opt->extended)
return;
@@ -808,6 +733,9 @@ void compile_grep_patterns(struct grep_opt *opt)
if (p)
die("incomplete pattern expression: %s", p->pattern);
+ if (opt->no_body_match && opt->pattern_expression)
+ opt->pattern_expression = grep_not_expr(opt->pattern_expression);
+
if (!header_expr)
return;
@@ -944,10 +872,10 @@ static struct {
{ "reflog ", 7 },
};
-static int match_one_pattern(struct grep_pat *p,
- const char *bol, const char *eol,
- enum grep_context ctx,
- regmatch_t *pmatch, int eflags)
+static int headerless_match_one_pattern(struct grep_pat *p,
+ const char *bol, const char *eol,
+ enum grep_context ctx,
+ regmatch_t *pmatch, int eflags)
{
int hit = 0;
const char *start = bol;
@@ -956,25 +884,6 @@ static int match_one_pattern(struct grep_pat *p,
((p->token == GREP_PATTERN_HEAD) != (ctx == GREP_CONTEXT_HEAD)))
return 0;
- if (p->token == GREP_PATTERN_HEAD) {
- const char *field;
- size_t len;
- assert(p->field < ARRAY_SIZE(header_field));
- field = header_field[p->field].field;
- len = header_field[p->field].len;
- if (strncmp(bol, field, len))
- return 0;
- bol += len;
- switch (p->field) {
- case GREP_HEADER_AUTHOR:
- case GREP_HEADER_COMMITTER:
- strip_timestamp(bol, &eol);
- break;
- default:
- break;
- }
- }
-
again:
hit = patmatch(p, bol, eol, pmatch, eflags);
@@ -1025,6 +934,36 @@ static int match_one_pattern(struct grep_pat *p,
return hit;
}
+static int match_one_pattern(struct grep_pat *p,
+ const char *bol, const char *eol,
+ enum grep_context ctx, regmatch_t *pmatch,
+ int eflags)
+{
+ const char *field;
+ size_t len;
+
+ if (p->token == GREP_PATTERN_HEAD) {
+ assert(p->field < ARRAY_SIZE(header_field));
+ field = header_field[p->field].field;
+ len = header_field[p->field].len;
+ if (strncmp(bol, field, len))
+ return 0;
+ bol += len;
+
+ switch (p->field) {
+ case GREP_HEADER_AUTHOR:
+ case GREP_HEADER_COMMITTER:
+ strip_timestamp(bol, &eol);
+ break;
+ default:
+ break;
+ }
+ }
+
+ return headerless_match_one_pattern(p, bol, eol, ctx, pmatch, eflags);
+}
+
+
static int match_expr_eval(struct grep_opt *opt, struct grep_expr *x,
const char *bol, const char *eol,
enum grep_context ctx, ssize_t *col,
@@ -1046,6 +985,8 @@ static int match_expr_eval(struct grep_opt *opt, struct grep_expr *x,
if (h && (*col < 0 || tmp.rm_so < *col))
*col = tmp.rm_so;
}
+ if (x->u.atom->token == GREP_PATTERN_BODY)
+ opt->body_hit |= h;
break;
case GREP_NODE_NOT:
/*
@@ -1143,7 +1084,7 @@ static int match_next_pattern(struct grep_pat *p,
{
regmatch_t match;
- if (!match_one_pattern(p, bol, eol, ctx, &match, eflags))
+ if (!headerless_match_one_pattern(p, bol, eol, ctx, &match, eflags))
return 0;
if (match.rm_so < 0 || match.rm_eo < 0)
return 0;
@@ -1158,19 +1099,26 @@ static int match_next_pattern(struct grep_pat *p,
return 1;
}
-static int next_match(struct grep_opt *opt,
- const char *bol, const char *eol,
- enum grep_context ctx, regmatch_t *pmatch, int eflags)
+int grep_next_match(struct grep_opt *opt,
+ const char *bol, const char *eol,
+ enum grep_context ctx, regmatch_t *pmatch,
+ enum grep_header_field field, int eflags)
{
struct grep_pat *p;
int hit = 0;
pmatch->rm_so = pmatch->rm_eo = -1;
if (bol < eol) {
- for (p = opt->pattern_list; p; p = p->next) {
+ for (p = ((ctx == GREP_CONTEXT_HEAD)
+ ? opt->header_list : opt->pattern_list);
+ p; p = p->next) {
switch (p->token) {
- case GREP_PATTERN: /* atom */
case GREP_PATTERN_HEAD:
+ if ((field != GREP_HEADER_FIELD_MAX) &&
+ (p->field != field))
+ continue;
+ /* fall thru */
+ case GREP_PATTERN: /* atom */
case GREP_PATTERN_BODY:
hit |= match_next_pattern(p, bol, eol, ctx,
pmatch, eflags);
@@ -1261,7 +1209,8 @@ static void show_line(struct grep_opt *opt,
else if (sign == '=')
line_color = opt->colors[GREP_COLOR_FUNCTION];
}
- while (next_match(opt, bol, eol, ctx, &match, eflags)) {
+ while (grep_next_match(opt, bol, eol, ctx, &match,
+ GREP_HEADER_FIELD_MAX, eflags)) {
if (match.rm_so == match.rm_eo)
break;
@@ -1806,16 +1755,19 @@ int grep_source(struct grep_opt *opt, struct grep_source *gs)
* we do not have to do the two-pass grep when we do not check
* buffer-wide "all-match".
*/
- if (!opt->all_match)
+ if (!opt->all_match && !opt->no_body_match)
return grep_source_1(opt, gs, 0);
/* Otherwise the toplevel "or" terms hit a bit differently.
* We first clear hit markers from them.
*/
clr_hit_marker(opt->pattern_expression);
+ opt->body_hit = 0;
grep_source_1(opt, gs, 1);
- if (!chk_hit_marker(opt->pattern_expression))
+ if (opt->all_match && !chk_hit_marker(opt->pattern_expression))
+ return 0;
+ if (opt->no_body_match && opt->body_hit)
return 0;
return grep_source_1(opt, gs, 0);
diff --git a/grep.h b/grep.h
index af1d579..c722d25 100644
--- a/grep.h
+++ b/grep.h
@@ -128,15 +128,12 @@ struct grep_opt {
* instead.
*
* This is potentially the cause of at least one bug - "git grep"
- * ignoring the textconv attributes from submodules. See [1] for more
- * information.
- * [1] https://lore.kernel.org/git/CAHd-oW5iEQarYVxEXoTG-ua2zdoybTrSjCBKtO0YT292fm0NQQ@mail.gmail.com/
+ * using the textconv attributes from the superproject on the
+ * submodules. See the failing "git grep --textconv" tests in
+ * t7814-grep-recurse-submodules.sh for more information.
*/
struct repository *repo;
- const char *prefix;
- int prefix_length;
- regex_t regexp;
int linenum;
int columnnum;
int invert;
@@ -146,8 +143,9 @@ struct grep_opt {
int unmatch_name_only;
int count;
int word_regexp;
- int fixed;
int all_match;
+ int no_body_match;
+ int body_hit;
#define GREP_BINARY_DEFAULT 0
#define GREP_BINARY_NOMATCH 1
#define GREP_BINARY_TEXT 2
@@ -155,7 +153,6 @@ struct grep_opt {
int allow_textconv;
int extended;
int use_reflog_filter;
- int pcre2;
int relative;
int pathname;
int null_following_name;
@@ -165,7 +162,7 @@ struct grep_opt {
int funcname;
int funcbody;
int extended_regexp_option;
- int pattern_type_option;
+ enum grep_pattern_type pattern_type_option;
int ignore_locale;
char colors[NR_GREP_COLORS][COLOR_MAXLEN];
unsigned pre_context;
@@ -180,9 +177,29 @@ struct grep_opt {
void *output_priv;
};
+#define GREP_OPT_INIT { \
+ .relative = 1, \
+ .pathname = 1, \
+ .max_depth = -1, \
+ .pattern_type_option = GREP_PATTERN_TYPE_UNSPECIFIED, \
+ .colors = { \
+ [GREP_COLOR_CONTEXT] = "", \
+ [GREP_COLOR_FILENAME] = GIT_COLOR_MAGENTA, \
+ [GREP_COLOR_FUNCTION] = "", \
+ [GREP_COLOR_LINENO] = GIT_COLOR_GREEN, \
+ [GREP_COLOR_COLUMNNO] = GIT_COLOR_GREEN, \
+ [GREP_COLOR_MATCH_CONTEXT] = GIT_COLOR_BOLD_RED, \
+ [GREP_COLOR_MATCH_SELECTED] = GIT_COLOR_BOLD_RED, \
+ [GREP_COLOR_SELECTED] = "", \
+ [GREP_COLOR_SEP] = GIT_COLOR_CYAN, \
+ }, \
+ .only_matching = 0, \
+ .color = -1, \
+ .output = std_output, \
+}
+
int grep_config(const char *var, const char *value, void *);
-void grep_init(struct grep_opt *, struct repository *repo, const char *prefix);
-void grep_commit_pattern_type(enum grep_pattern_type, struct grep_opt *opt);
+void grep_init(struct grep_opt *, struct repository *repo);
void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t);
void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *origin, int no, enum grep_pat_token t);
@@ -191,6 +208,15 @@ void compile_grep_patterns(struct grep_opt *opt);
void free_grep_patterns(struct grep_opt *opt);
int grep_buffer(struct grep_opt *opt, const char *buf, unsigned long size);
+/* The field parameter is only used to filter header patterns
+ * (where appropriate). If filtering isn't desirable
+ * GREP_HEADER_FIELD_MAX should be supplied.
+ */
+int grep_next_match(struct grep_opt *opt,
+ const char *bol, const char *eol,
+ enum grep_context ctx, regmatch_t *pmatch,
+ enum grep_header_field field, int eflags);
+
struct grep_source {
char *name;
diff --git a/hash.h b/hash.h
index 9e25c40..5d40368 100644
--- a/hash.h
+++ b/hash.h
@@ -95,12 +95,18 @@ static inline void git_SHA256_Clone(git_SHA256_CTX *dst, const git_SHA256_CTX *s
/* Number of algorithms supported (including unknown). */
#define GIT_HASH_NALGOS (GIT_HASH_SHA256 + 1)
+/* "sha1", big-endian */
+#define GIT_SHA1_FORMAT_ID 0x73686131
+
/* The length in bytes and in hex digits of an object name (SHA-1 value). */
#define GIT_SHA1_RAWSZ 20
#define GIT_SHA1_HEXSZ (2 * GIT_SHA1_RAWSZ)
/* The block size of SHA-1. */
#define GIT_SHA1_BLKSZ 64
+/* "s256", big-endian */
+#define GIT_SHA256_FORMAT_ID 0x73323536
+
/* The length in bytes and in hex digits of an object name (SHA-256 value). */
#define GIT_SHA256_RAWSZ 32
#define GIT_SHA256_HEXSZ (2 * GIT_SHA256_RAWSZ)
diff --git a/help.c b/help.c
index be2fa64..41c41c2 100644
--- a/help.c
+++ b/help.c
@@ -12,6 +12,7 @@
#include "refs.h"
#include "parse-options.h"
#include "prompt.h"
+#include "fsmonitor-ipc.h"
struct category_description {
uint32_t category;
@@ -124,7 +125,9 @@ static void print_cmd_by_category(const struct category_description *catdesc,
uint32_t mask = catdesc[i].category;
const char *desc = catdesc[i].desc;
- printf("\n%s\n", _(desc));
+ if (i)
+ putchar('\n');
+ puts(_(desc));
print_command_list(cmds, mask, longest);
}
free(cmds);
@@ -293,9 +296,21 @@ void load_command_list(const char *prefix,
exclude_cmds(other_cmds, main_cmds);
}
-void list_commands(unsigned int colopts,
- struct cmdnames *main_cmds, struct cmdnames *other_cmds)
+static int get_colopts(const char *var, const char *value, void *data)
{
+ unsigned int *colopts = data;
+
+ if (starts_with(var, "column."))
+ return git_column_config(var, value, "help", colopts);
+
+ return 0;
+}
+
+void list_commands(struct cmdnames *main_cmds, struct cmdnames *other_cmds)
+{
+ unsigned int colopts = 0;
+ git_config(get_colopts, &colopts);
+
if (main_cmds->cnt) {
const char *exec_path = git_exec_path();
printf_ln(_("available git commands in '%s'"), exec_path);
@@ -305,7 +320,7 @@ void list_commands(unsigned int colopts,
}
if (other_cmds->cnt) {
- printf_ln(_("git commands available from elsewhere on your $PATH"));
+ puts(_("git commands available from elsewhere on your $PATH"));
putchar('\n');
pretty_print_cmdnames(other_cmds, colopts);
putchar('\n');
@@ -315,6 +330,7 @@ void list_commands(unsigned int colopts,
void list_common_cmds_help(void)
{
puts(_("These are common Git commands used in various situations:"));
+ putchar('\n');
print_cmd_by_category(common_categories, NULL);
}
@@ -420,15 +436,10 @@ static int get_alias(const char *var, const char *value, void *data)
return 0;
}
-void list_all_cmds_help(void)
+static void list_all_cmds_help_external_commands(void)
{
struct string_list others = STRING_LIST_INIT_DUP;
- struct string_list alias_list = STRING_LIST_INIT_DUP;
- struct cmdname_help *aliases;
- int i, longest;
-
- printf_ln(_("See 'git help <command>' to read about a specific subcommand"));
- print_cmd_by_category(main_categories, &longest);
+ int i;
list_all_other_cmds(&others);
if (others.nr)
@@ -436,6 +447,13 @@ void list_all_cmds_help(void)
for (i = 0; i < others.nr; i++)
printf(" %s\n", others.items[i].string);
string_list_clear(&others, 0);
+}
+
+static void list_all_cmds_help_aliases(int longest)
+{
+ struct string_list alias_list = STRING_LIST_INIT_DUP;
+ struct cmdname_help *aliases;
+ int i;
git_config(get_alias, &alias_list);
string_list_sort(&alias_list);
@@ -461,6 +479,20 @@ void list_all_cmds_help(void)
string_list_clear(&alias_list, 1);
}
+void list_all_cmds_help(int show_external_commands, int show_aliases)
+{
+ int longest;
+
+ puts(_("See 'git help <command>' to read about a specific subcommand"));
+ putchar('\n');
+ print_cmd_by_category(main_categories, &longest);
+
+ if (show_external_commands)
+ list_all_cmds_help_external_commands();
+ if (show_aliases)
+ list_all_cmds_help_aliases(longest);
+}
+
int is_in_cmdlist(struct cmdnames *c, const char *s)
{
int i;
@@ -631,7 +663,7 @@ const char *help_unknown_cmd(const char *cmd)
else if (autocorrect == AUTOCORRECT_PROMPT) {
char *answer;
struct strbuf msg = STRBUF_INIT;
- strbuf_addf(&msg, _("Run '%s' instead? (y/N)"), assumed);
+ strbuf_addf(&msg, _("Run '%s' instead [y/N]? "), assumed);
answer = git_prompt(msg.buf, PROMPT_ECHO);
strbuf_release(&msg);
if (!(starts_with(answer, "y") ||
@@ -683,6 +715,9 @@ void get_version_info(struct strbuf *buf, int show_build_options)
strbuf_addf(buf, "sizeof-size_t: %d\n", (int)sizeof(size_t));
strbuf_addf(buf, "shell-path: %s\n", SHELL_PATH);
/* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */
+
+ if (fsmonitor_ipc__is_supported())
+ strbuf_addstr(buf, "feature: fsmonitor--daemon\n");
}
}
diff --git a/help.h b/help.h
index 5871e93..971a3ad 100644
--- a/help.h
+++ b/help.h
@@ -20,7 +20,7 @@ static inline void mput_char(char c, unsigned int num)
}
void list_common_cmds_help(void);
-void list_all_cmds_help(void);
+void list_all_cmds_help(int show_external_commands, int show_aliases);
void list_guides_help(void);
void list_all_main_cmds(struct string_list *list);
@@ -37,7 +37,7 @@ void add_cmdname(struct cmdnames *cmds, const char *name, int len);
/* Here we require that excludes is a sorted list. */
void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes);
int is_in_cmdlist(struct cmdnames *cmds, const char *name);
-void list_commands(unsigned int colopts, struct cmdnames *main_cmds, struct cmdnames *other_cmds);
+void list_commands(struct cmdnames *main_cmds, struct cmdnames *other_cmds);
void get_version_info(struct strbuf *buf, int show_build_options);
/*
diff --git a/hook.c b/hook.c
new file mode 100644
index 0000000..2b47bdf
--- /dev/null
+++ b/hook.c
@@ -0,0 +1,180 @@
+#include "cache.h"
+#include "hook.h"
+#include "run-command.h"
+#include "config.h"
+
+const char *find_hook(const char *name)
+{
+ static struct strbuf path = STRBUF_INIT;
+
+ strbuf_reset(&path);
+ strbuf_git_path(&path, "hooks/%s", name);
+ if (access(path.buf, X_OK) < 0) {
+ int err = errno;
+
+#ifdef STRIP_EXTENSION
+ strbuf_addstr(&path, STRIP_EXTENSION);
+ if (access(path.buf, X_OK) >= 0)
+ return path.buf;
+ if (errno == EACCES)
+ err = errno;
+#endif
+
+ if (err == EACCES && advice_enabled(ADVICE_IGNORED_HOOK)) {
+ static struct string_list advise_given = STRING_LIST_INIT_DUP;
+
+ if (!string_list_lookup(&advise_given, name)) {
+ string_list_insert(&advise_given, name);
+ advise(_("The '%s' hook was ignored because "
+ "it's not set as executable.\n"
+ "You can disable this warning with "
+ "`git config advice.ignoredHook false`."),
+ path.buf);
+ }
+ }
+ return NULL;
+ }
+ return path.buf;
+}
+
+int hook_exists(const char *name)
+{
+ return !!find_hook(name);
+}
+
+static int pick_next_hook(struct child_process *cp,
+ struct strbuf *out,
+ void *pp_cb,
+ void **pp_task_cb)
+{
+ struct hook_cb_data *hook_cb = pp_cb;
+ const char *hook_path = hook_cb->hook_path;
+
+ if (!hook_path)
+ return 0;
+
+ cp->no_stdin = 1;
+ strvec_pushv(&cp->env, hook_cb->options->env.v);
+ cp->stdout_to_stderr = 1;
+ cp->trace2_hook_name = hook_cb->hook_name;
+ cp->dir = hook_cb->options->dir;
+
+ strvec_push(&cp->args, hook_path);
+ strvec_pushv(&cp->args, hook_cb->options->args.v);
+
+ /* Provide context for errors if necessary */
+ *pp_task_cb = (char *)hook_path;
+
+ /*
+ * This pick_next_hook() will be called again, we're only
+ * running one hook, so indicate that no more work will be
+ * done.
+ */
+ hook_cb->hook_path = NULL;
+
+ return 1;
+}
+
+static int notify_start_failure(struct strbuf *out,
+ void *pp_cb,
+ void *pp_task_cp)
+{
+ struct hook_cb_data *hook_cb = pp_cb;
+ const char *hook_path = pp_task_cp;
+
+ hook_cb->rc |= 1;
+
+ strbuf_addf(out, _("Couldn't start hook '%s'\n"),
+ hook_path);
+
+ return 1;
+}
+
+static int notify_hook_finished(int result,
+ struct strbuf *out,
+ void *pp_cb,
+ void *pp_task_cb)
+{
+ struct hook_cb_data *hook_cb = pp_cb;
+ struct run_hooks_opt *opt = hook_cb->options;
+
+ hook_cb->rc |= result;
+
+ if (opt->invoked_hook)
+ *opt->invoked_hook = 1;
+
+ return 0;
+}
+
+static void run_hooks_opt_clear(struct run_hooks_opt *options)
+{
+ strvec_clear(&options->env);
+ strvec_clear(&options->args);
+}
+
+int run_hooks_opt(const char *hook_name, struct run_hooks_opt *options)
+{
+ struct strbuf abs_path = STRBUF_INIT;
+ struct hook_cb_data cb_data = {
+ .rc = 0,
+ .hook_name = hook_name,
+ .options = options,
+ };
+ const char *const hook_path = find_hook(hook_name);
+ int jobs = 1;
+ int ret = 0;
+
+ if (!options)
+ BUG("a struct run_hooks_opt must be provided to run_hooks");
+
+ if (options->invoked_hook)
+ *options->invoked_hook = 0;
+
+ if (!hook_path && !options->error_if_missing)
+ goto cleanup;
+
+ if (!hook_path) {
+ ret = error("cannot find a hook named %s", hook_name);
+ goto cleanup;
+ }
+
+ cb_data.hook_path = hook_path;
+ if (options->dir) {
+ strbuf_add_absolute_path(&abs_path, hook_path);
+ cb_data.hook_path = abs_path.buf;
+ }
+
+ run_processes_parallel_tr2(jobs,
+ pick_next_hook,
+ notify_start_failure,
+ notify_hook_finished,
+ &cb_data,
+ "hook",
+ hook_name);
+ ret = cb_data.rc;
+cleanup:
+ strbuf_release(&abs_path);
+ run_hooks_opt_clear(options);
+ return ret;
+}
+
+int run_hooks(const char *hook_name)
+{
+ struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+
+ return run_hooks_opt(hook_name, &opt);
+}
+
+int run_hooks_l(const char *hook_name, ...)
+{
+ struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+ va_list ap;
+ const char *arg;
+
+ va_start(ap, hook_name);
+ while ((arg = va_arg(ap, const char *)))
+ strvec_push(&opt.args, arg);
+ va_end(ap);
+
+ return run_hooks_opt(hook_name, &opt);
+}
diff --git a/hook.h b/hook.h
new file mode 100644
index 0000000..4258b13
--- /dev/null
+++ b/hook.h
@@ -0,0 +1,85 @@
+#ifndef HOOK_H
+#define HOOK_H
+#include "strvec.h"
+
+struct run_hooks_opt
+{
+ /* Environment vars to be set for each hook */
+ struct strvec env;
+
+ /* Args to be passed to each hook */
+ struct strvec args;
+
+ /* Emit an error if the hook is missing */
+ unsigned int error_if_missing:1;
+
+ /**
+ * An optional initial working directory for the hook,
+ * translates to "struct child_process"'s "dir" member.
+ */
+ const char *dir;
+
+ /**
+ * A pointer which if provided will be set to 1 or 0 depending
+ * on if a hook was started, regardless of whether or not that
+ * was successful. I.e. if the underlying start_command() was
+ * successful this will be set to 1.
+ *
+ * Used for avoiding TOCTOU races in code that would otherwise
+ * call hook_exist() after a "maybe hook run" to see if a hook
+ * was invoked.
+ */
+ int *invoked_hook;
+};
+
+#define RUN_HOOKS_OPT_INIT { \
+ .env = STRVEC_INIT, \
+ .args = STRVEC_INIT, \
+}
+
+struct hook_cb_data {
+ /* rc reflects the cumulative failure state */
+ int rc;
+ const char *hook_name;
+ const char *hook_path;
+ struct run_hooks_opt *options;
+};
+
+/*
+ * Returns the path to the hook file, or NULL if the hook is missing
+ * or disabled. Note that this points to static storage that will be
+ * overwritten by further calls to find_hook and run_hook_*.
+ */
+const char *find_hook(const char *name);
+
+/**
+ * A boolean version of find_hook()
+ */
+int hook_exists(const char *hookname);
+
+/**
+ * Takes a `hook_name`, resolves it to a path with find_hook(), and
+ * runs the hook for you with the options specified in "struct
+ * run_hooks opt". Will free memory associated with the "struct run_hooks_opt".
+ *
+ * Returns the status code of the run hook, or a negative value on
+ * error().
+ */
+int run_hooks_opt(const char *hook_name, struct run_hooks_opt *options);
+
+/**
+ * A wrapper for run_hooks_opt() which provides a dummy "struct
+ * run_hooks_opt" initialized with "RUN_HOOKS_OPT_INIT".
+ */
+int run_hooks(const char *hook_name);
+
+/**
+ * Like run_hooks(), a wrapper for run_hooks_opt().
+ *
+ * In addition to the wrapping behavior provided by run_hooks(), this
+ * wrapper takes a list of strings terminated by a NULL
+ * argument. These things will be used as positional arguments to the
+ * hook. This function behaves like the old run_hook_le() API.
+ */
+int run_hooks_l(const char *hook_name, ...);
+#endif
diff --git a/http-backend.c b/http-backend.c
index e7c0eea..58b83a9 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -13,6 +13,7 @@
#include "packfile.h"
#include "object-store.h"
#include "protocol.h"
+#include "date.h"
static const char content_type[] = "Content-Type";
static const char content_length[] = "Content-Length";
@@ -466,9 +467,7 @@ static void run_service(const char **argv, int buffer_input)
struct child_process cld = CHILD_PROCESS_INIT;
ssize_t req_len = get_content_length();
- if (encoding && !strcmp(encoding, "gzip"))
- gzipped_request = 1;
- else if (encoding && !strcmp(encoding, "x-gzip"))
+ if (encoding && (!strcmp(encoding, "gzip") || !strcmp(encoding, "x-gzip")))
gzipped_request = 1;
if (!user || !*user)
@@ -477,12 +476,12 @@ static void run_service(const char **argv, int buffer_input)
host = "(none)";
if (!getenv("GIT_COMMITTER_NAME"))
- strvec_pushf(&cld.env_array, "GIT_COMMITTER_NAME=%s", user);
+ strvec_pushf(&cld.env, "GIT_COMMITTER_NAME=%s", user);
if (!getenv("GIT_COMMITTER_EMAIL"))
- strvec_pushf(&cld.env_array,
+ strvec_pushf(&cld.env,
"GIT_COMMITTER_EMAIL=%s@http.%s", user, host);
- cld.argv = argv;
+ strvec_pushv(&cld.args, argv);
if (buffer_input || gzipped_request || req_len >= 0)
cld.in = -1;
cld.git_cmd = 1;
@@ -661,8 +660,9 @@ static NORETURN void die_webcgi(const char *err, va_list params)
{
if (dead <= 1) {
struct strbuf hdr = STRBUF_INIT;
+ report_fn die_message_fn = get_die_message_routine();
- vreportf("fatal: ", err, params);
+ die_message_fn(err, params);
http_status(&hdr, 500, "Internal Server Error");
hdr_nocache(&hdr);
diff --git a/http-fetch.c b/http-fetch.c
index fa64246..31bc5c7 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -4,6 +4,7 @@
#include "http.h"
#include "walker.h"
#include "strvec.h"
+#include "urlmatch.h"
static const char http_fetch_usage[] = "git http-fetch "
"[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin | --packfile=hash | commit-id] url";
@@ -54,7 +55,7 @@ static void fetch_single_packfile(struct object_id *packfile_hash,
http_init(NULL, url, 0);
preq = new_direct_http_pack_request(packfile_hash->hash, xstrdup(url));
- if (preq == NULL)
+ if (!preq)
die("couldn't create http pack request");
preq->slot->results = &results;
preq->index_pack_args = index_pack_args;
@@ -63,8 +64,17 @@ static void fetch_single_packfile(struct object_id *packfile_hash,
if (start_active_slot(preq->slot)) {
run_active_slot(preq->slot);
if (results.curl_result != CURLE_OK) {
- die("Unable to get pack file %s\n%s", preq->url,
- curl_errorstr);
+ struct url_info url;
+ char *nurl = url_normalize(preq->url, &url);
+ if (!nurl || !git_env_bool("GIT_TRACE_REDACT", 1)) {
+ die("unable to get pack file '%s'\n%s", preq->url,
+ curl_errorstr);
+ } else {
+ die("failed to get '%.*s' url from '%.*s' "
+ "(full URL redacted due to GIT_TRACE_REDACT setting)\n%s",
+ (int)url.scheme_len, url.url,
+ (int)url.host_len, &url.url[url.host_off], curl_errorstr);
+ }
}
} else {
die("Unable to start request");
@@ -131,7 +141,7 @@ int cmd_main(int argc, const char **argv)
if (packfile) {
if (!index_pack_args.nr)
- die(_("--packfile requires --index-pack-args"));
+ die(_("the option '%s' requires '%s'"), "--packfile", "--index-pack-args");
fetch_single_packfile(&packfile_hash, argv[arg],
index_pack_args.v);
@@ -140,7 +150,7 @@ int cmd_main(int argc, const char **argv)
}
if (index_pack_args.nr)
- die(_("--index-pack-args can only be used with --packfile"));
+ die(_("the option '%s' requires '%s'"), "--index-pack-args", "--packfile");
if (commits_on_stdin) {
commits = walker_targets_stdin(&commit_id, &write_ref);
diff --git a/http-push.c b/http-push.c
index 3309aaf..5f4340a 100644
--- a/http-push.c
+++ b/http-push.c
@@ -253,7 +253,7 @@ static void start_fetch_loose(struct transfer_request *request)
struct http_object_request *obj_req;
obj_req = new_http_object_request(repo->url, &request->obj->oid);
- if (obj_req == NULL) {
+ if (!obj_req) {
request->state = ABORTED;
return;
}
@@ -318,7 +318,7 @@ static void start_fetch_packed(struct transfer_request *request)
fprintf(stderr, " which contains %s\n", oid_to_hex(&request->obj->oid));
preq = new_http_pack_request(target->hash, repo->url);
- if (preq == NULL) {
+ if (!preq) {
repo->can_update_info_refs = 0;
return;
}
@@ -363,7 +363,7 @@ static void start_put(struct transfer_request *request)
git_zstream stream;
unpacked = read_object_file(&request->obj->oid, &type, &len);
- hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(type), (uintmax_t)len) + 1;
+ hdrlen = format_object_header(hdr, sizeof(hdr), type, len);
/* Set it up */
git_deflate_init(&stream, zlib_compression_level);
@@ -520,7 +520,7 @@ static void finish_request(struct transfer_request *request)
/* Keep locks active */
check_locks();
- if (request->headers != NULL)
+ if (request->headers)
curl_slist_free_all(request->headers);
/* URL is reused for MOVE after PUT and used during FETCH */
@@ -783,7 +783,7 @@ xml_start_tag(void *userData, const char *name, const char **atts)
const char *c = strchr(name, ':');
int old_namelen, new_len;
- if (c == NULL)
+ if (!c)
c = name;
else
c++;
@@ -811,7 +811,7 @@ xml_end_tag(void *userData, const char *name)
ctx->userFunc(ctx, 1);
- if (c == NULL)
+ if (!c)
c = name;
else
c++;
@@ -1689,7 +1689,6 @@ int cmd_main(int argc, const char **argv)
struct refspec rs = REFSPEC_INIT_PUSH;
struct remote_lock *ref_lock = NULL;
struct remote_lock *info_ref_lock = NULL;
- struct rev_info revs;
int delete_branch = 0;
int force_delete = 0;
int objects_to_send;
@@ -1825,6 +1824,7 @@ int cmd_main(int argc, const char **argv)
new_refs = 0;
for (ref = remote_refs; ref; ref = ref->next) {
+ struct rev_info revs;
struct strvec commit_argv = STRVEC_INIT;
if (!ref->peer_ref)
@@ -1893,7 +1893,7 @@ int cmd_main(int argc, const char **argv)
/* Lock remote branch ref */
ref_lock = lock_remote(ref->name, LOCK_TIME);
- if (ref_lock == NULL) {
+ if (!ref_lock) {
fprintf(stderr, "Unable to lock remote branch %s\n",
ref->name);
if (helper_status)
@@ -1941,6 +1941,7 @@ int cmd_main(int argc, const char **argv)
unlock_remote(ref_lock);
check_locks();
strvec_clear(&commit_argv);
+ release_revisions(&revs);
}
/* Update remote server info if appropriate */
diff --git a/http-walker.c b/http-walker.c
index 910fae5..b8f0f98 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -59,7 +59,7 @@ static void start_object_request(struct walker *walker,
struct http_object_request *req;
req = new_http_object_request(obj_req->repo->base, &obj_req->oid);
- if (req == NULL) {
+ if (!req) {
obj_req->state = ABORTED;
return;
}
@@ -106,7 +106,7 @@ static void process_object_response(void *callback_data)
/* Use alternates if necessary */
if (missing_target(obj_req->req)) {
fetch_alternates(walker, alt->base);
- if (obj_req->repo->next != NULL) {
+ if (obj_req->repo->next) {
obj_req->repo =
obj_req->repo->next;
release_http_object_request(obj_req->req);
@@ -225,12 +225,12 @@ static void process_alternates_response(void *callback_data)
alt_req->url->buf);
active_requests++;
slot->in_use = 1;
- if (slot->finished != NULL)
+ if (slot->finished)
(*slot->finished) = 0;
if (!start_active_slot(slot)) {
cdata->got_alternates = -1;
slot->in_use = 0;
- if (slot->finished != NULL)
+ if (slot->finished)
(*slot->finished) = 1;
}
return;
@@ -443,7 +443,7 @@ static int http_fetch_pack(struct walker *walker, struct alt_base *repo, unsigne
}
preq = new_http_pack_request(target->hash, repo->base);
- if (preq == NULL)
+ if (!preq)
goto abort;
preq->slot->results = &results;
@@ -489,11 +489,11 @@ static int fetch_object(struct walker *walker, unsigned char *hash)
if (hasheq(obj_req->oid.hash, hash))
break;
}
- if (obj_req == NULL)
+ if (!obj_req)
return error("Couldn't find request for %s in the queue", hex);
if (has_object_file(&obj_req->oid)) {
- if (obj_req->req != NULL)
+ if (obj_req->req)
abort_http_object_request(obj_req->req);
abort_object_request(obj_req);
return 0;
diff --git a/http.c b/http.c
index 53cf7ad..11c6f69 100644
--- a/http.c
+++ b/http.c
@@ -128,6 +128,8 @@ static struct curl_slist *pragma_header;
static struct curl_slist *no_pragma_header;
static struct string_list extra_http_headers = STRING_LIST_INIT_DUP;
+static struct curl_slist *host_resolutions;
+
static struct active_request_slot *active_queue_head;
static char *cached_accept_language;
@@ -197,11 +199,11 @@ static void finish_active_slot(struct active_request_slot *slot)
closedown_active_slot(slot);
curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE, &slot->http_code);
- if (slot->finished != NULL)
+ if (slot->finished)
(*slot->finished) = 1;
/* Store slot results so they can be read after the slot is reused */
- if (slot->results != NULL) {
+ if (slot->results) {
slot->results->curl_result = slot->curl_result;
slot->results->http_code = slot->http_code;
curl_easy_getinfo(slot->curl, CURLINFO_HTTPAUTH_AVAIL,
@@ -212,7 +214,7 @@ static void finish_active_slot(struct active_request_slot *slot)
}
/* Run callback if appropriate */
- if (slot->callback_func != NULL)
+ if (slot->callback_func)
slot->callback_func(slot->callback_data);
}
@@ -234,7 +236,7 @@ static void process_curl_messages(void)
while (slot != NULL &&
slot->curl != curl_message->easy_handle)
slot = slot->next;
- if (slot != NULL) {
+ if (slot) {
xmulti_remove_handle(slot);
slot->curl_result = curl_result;
finish_active_slot(slot);
@@ -393,6 +395,18 @@ static int http_options(const char *var, const char *value, void *cb)
return 0;
}
+ if (!strcmp("http.curloptresolve", var)) {
+ if (!value) {
+ return config_error_nonbool(var);
+ } else if (!*value) {
+ curl_slist_free_all(host_resolutions);
+ host_resolutions = NULL;
+ } else {
+ host_resolutions = curl_slist_append(host_resolutions, value);
+ }
+ return 0;
+ }
+
if (!strcmp("http.followredirects", var)) {
if (value && !strcmp(value, "initial"))
http_follow_config = HTTP_FOLLOW_INITIAL;
@@ -838,16 +852,16 @@ static CURL *get_curl_handle(void)
curl_easy_setopt(result, CURLOPT_SSL_CIPHER_LIST,
ssl_cipherlist);
- if (ssl_cert != NULL)
+ if (ssl_cert)
curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert);
if (has_cert_password())
curl_easy_setopt(result, CURLOPT_KEYPASSWD, cert_auth.password);
- if (ssl_key != NULL)
+ if (ssl_key)
curl_easy_setopt(result, CURLOPT_SSLKEY, ssl_key);
- if (ssl_capath != NULL)
+ if (ssl_capath)
curl_easy_setopt(result, CURLOPT_CAPATH, ssl_capath);
#ifdef GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY
- if (ssl_pinnedkey != NULL)
+ if (ssl_pinnedkey)
curl_easy_setopt(result, CURLOPT_PINNEDPUBLICKEY, ssl_pinnedkey);
#endif
if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) &&
@@ -857,10 +871,10 @@ static CURL *get_curl_handle(void)
curl_easy_setopt(result, CURLOPT_PROXY_CAINFO, NULL);
#endif
} else if (ssl_cainfo != NULL || http_proxy_ssl_ca_info != NULL) {
- if (ssl_cainfo != NULL)
+ if (ssl_cainfo)
curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo);
#ifdef GIT_CURL_HAVE_CURLOPT_PROXY_CAINFO
- if (http_proxy_ssl_ca_info != NULL)
+ if (http_proxy_ssl_ca_info)
curl_easy_setopt(result, CURLOPT_PROXY_CAINFO, http_proxy_ssl_ca_info);
#endif
}
@@ -990,7 +1004,7 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
char *low_speed_limit;
char *low_speed_time;
char *normalized_url;
- struct urlmatch_config config = { STRING_LIST_INIT_DUP };
+ struct urlmatch_config config = URLMATCH_CONFIG_INIT;
config.section = "http";
config.key = NULL;
@@ -1050,7 +1064,7 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
{
char *http_max_requests = getenv("GIT_HTTP_MAX_REQUESTS");
- if (http_max_requests != NULL)
+ if (http_max_requests)
max_requests = atoi(http_max_requests);
}
@@ -1069,10 +1083,10 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");
low_speed_limit = getenv("GIT_HTTP_LOW_SPEED_LIMIT");
- if (low_speed_limit != NULL)
+ if (low_speed_limit)
curl_low_speed_limit = strtol(low_speed_limit, NULL, 10);
low_speed_time = getenv("GIT_HTTP_LOW_SPEED_TIME");
- if (low_speed_time != NULL)
+ if (low_speed_time)
curl_low_speed_time = strtol(low_speed_time, NULL, 10);
if (curl_ssl_verify == -1)
@@ -1109,7 +1123,7 @@ void http_cleanup(void)
while (slot != NULL) {
struct active_request_slot *next = slot->next;
- if (slot->curl != NULL) {
+ if (slot->curl) {
xmulti_remove_handle(slot);
curl_easy_cleanup(slot->curl);
}
@@ -1131,6 +1145,9 @@ void http_cleanup(void)
curl_slist_free_all(no_pragma_header);
no_pragma_header = NULL;
+ curl_slist_free_all(host_resolutions);
+ host_resolutions = NULL;
+
if (curl_http_proxy) {
free((void *)curl_http_proxy);
curl_http_proxy = NULL;
@@ -1147,13 +1164,13 @@ void http_cleanup(void)
free((void *)http_proxy_authmethod);
http_proxy_authmethod = NULL;
- if (cert_auth.password != NULL) {
+ if (cert_auth.password) {
memset(cert_auth.password, 0, strlen(cert_auth.password));
FREE_AND_NULL(cert_auth.password);
}
ssl_cert_password_required = 0;
- if (proxy_cert_auth.password != NULL) {
+ if (proxy_cert_auth.password) {
memset(proxy_cert_auth.password, 0, strlen(proxy_cert_auth.password));
FREE_AND_NULL(proxy_cert_auth.password);
}
@@ -1179,14 +1196,14 @@ struct active_request_slot *get_active_slot(void)
while (slot != NULL && slot->in_use)
slot = slot->next;
- if (slot == NULL) {
+ if (!slot) {
newslot = xmalloc(sizeof(*newslot));
newslot->curl = NULL;
newslot->in_use = 0;
newslot->next = NULL;
slot = active_queue_head;
- if (slot == NULL) {
+ if (!slot) {
active_queue_head = newslot;
} else {
while (slot->next != NULL)
@@ -1196,7 +1213,7 @@ struct active_request_slot *get_active_slot(void)
slot = newslot;
}
- if (slot->curl == NULL) {
+ if (!slot->curl) {
slot->curl = curl_easy_duphandle(curl_default);
curl_session_count++;
}
@@ -1211,6 +1228,7 @@ struct active_request_slot *get_active_slot(void)
if (curl_save_cookies)
curl_easy_setopt(slot->curl, CURLOPT_COOKIEJAR, curl_cookie_file);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, pragma_header);
+ curl_easy_setopt(slot->curl, CURLOPT_RESOLVE, host_resolutions);
curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, curl_errorstr);
curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, NULL);
curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, NULL);
@@ -1367,6 +1385,32 @@ void run_active_slot(struct active_request_slot *slot)
select(max_fd+1, &readfds, &writefds, &excfds, &select_timeout);
}
}
+
+ /*
+ * The value of slot->finished we set before the loop was used
+ * to set our "finished" variable when our request completed.
+ *
+ * 1. The slot may not have been reused for another requst
+ * yet, in which case it still has &finished.
+ *
+ * 2. The slot may already be in-use to serve another request,
+ * which can further be divided into two cases:
+ *
+ * (a) If call run_active_slot() hasn't been called for that
+ * other request, slot->finished would have been cleared
+ * by get_active_slot() and has NULL.
+ *
+ * (b) If the request did call run_active_slot(), then the
+ * call would have updated slot->finished at the beginning
+ * of this function, and with the clearing of the member
+ * below, we would find that slot->finished is now NULL.
+ *
+ * In all cases, slot->finished has no useful information to
+ * anybody at this point. Some compilers warn us for
+ * attempting to smuggle a pointer that is about to become
+ * invalid, i.e. &finished. We clear it here to assure them.
+ */
+ slot->finished = NULL;
}
static void release_active_slot(struct active_request_slot *slot)
@@ -1768,7 +1812,7 @@ static int http_request(const char *url,
slot = get_active_slot();
curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
- if (result == NULL) {
+ if (!result) {
curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1);
} else {
curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
@@ -1945,8 +1989,8 @@ int http_get_strbuf(const char *url,
* If a previous interrupted download is detected (i.e. a previous temporary
* file is still around) the download is resumed.
*/
-static int http_get_file(const char *url, const char *filename,
- struct http_get_options *options)
+int http_get_file(const char *url, const char *filename,
+ struct http_get_options *options)
{
int ret;
struct strbuf tmpfile = STRBUF_INIT;
@@ -2100,7 +2144,7 @@ int http_get_info_packs(const char *base_url, struct packed_git **packs_head)
void release_http_pack_request(struct http_pack_request *preq)
{
- if (preq->packfile != NULL) {
+ if (preq->packfile) {
fclose(preq->packfile);
preq->packfile = NULL;
}
@@ -2126,8 +2170,9 @@ int finish_http_pack_request(struct http_pack_request *preq)
ip.git_cmd = 1;
ip.in = tmpfile_fd;
- ip.argv = preq->index_pack_args ? preq->index_pack_args
- : default_index_pack_args;
+ strvec_pushv(&ip.args, preq->index_pack_args ?
+ preq->index_pack_args :
+ default_index_pack_args);
if (preq->preserve_index_pack_stdout)
ip.out = 0;
@@ -2390,7 +2435,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
void process_http_object_request(struct http_object_request *freq)
{
- if (freq->slot == NULL)
+ if (!freq->slot)
return;
freq->curl_result = freq->slot->curl_result;
freq->http_code = freq->slot->http_code;
@@ -2447,7 +2492,7 @@ void release_http_object_request(struct http_object_request *freq)
freq->localfile = -1;
}
FREE_AND_NULL(freq->url);
- if (freq->slot != NULL) {
+ if (freq->slot) {
freq->slot->callback_func = NULL;
freq->slot->callback_data = NULL;
release_active_slot(freq->slot);
diff --git a/http.h b/http.h
index df1590e..ba303cf 100644
--- a/http.h
+++ b/http.h
@@ -163,6 +163,15 @@ struct http_get_options {
*/
int http_get_strbuf(const char *url, struct strbuf *result, struct http_get_options *options);
+/*
+ * Downloads a URL and stores the result in the given file.
+ *
+ * If a previous interrupted download is detected (i.e. a previous temporary
+ * file is still around) the download is resumed.
+ */
+int http_get_file(const char *url, const char *filename,
+ struct http_get_options *options);
+
int http_fetch_ref(const char *base, struct ref *ref);
/* Helpers for fetching packs */
diff --git a/ident.c b/ident.c
index 6aba4b5..89ca5b4 100644
--- a/ident.c
+++ b/ident.c
@@ -7,6 +7,7 @@
*/
#include "cache.h"
#include "config.h"
+#include "date.h"
static struct strbuf git_default_name = STRBUF_INIT;
static struct strbuf git_default_email = STRBUF_INIT;
diff --git a/imap-send.c b/imap-send.c
index e6090a0..a50af56 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -27,7 +27,7 @@
#include "exec-cmd.h"
#include "run-command.h"
#include "parse-options.h"
-#ifdef NO_OPENSSL
+#if defined(NO_OPENSSL) && !defined(HAVE_OPENSSL_CSPRNG)
typedef void *SSL;
#endif
#ifdef USE_CURL_FOR_IMAP_SEND
@@ -98,17 +98,7 @@ struct imap_server_conf {
};
static struct imap_server_conf server = {
- NULL, /* name */
- NULL, /* tunnel */
- NULL, /* host */
- 0, /* port */
- NULL, /* folder */
- NULL, /* user */
- NULL, /* pass */
- 0, /* use_ssl */
- 1, /* ssl_verify */
- 0, /* use_html */
- NULL, /* auth_method */
+ .ssl_verify = 1,
};
struct imap_socket {
diff --git a/kwset.c b/kwset.c
index fc439e0..08aadf0 100644
--- a/kwset.c
+++ b/kwset.c
@@ -477,7 +477,7 @@ kwsprep (kwset_t kws)
next[i] = NULL;
treenext(kwset->trie->links, next);
- if ((trans = kwset->trans) != NULL)
+ if ((trans = kwset->trans))
for (i = 0; i < NCHAR; ++i)
kwset->next[i] = next[U(trans[i])];
else
@@ -485,7 +485,7 @@ kwsprep (kwset_t kws)
}
/* Fix things up for any translation table. */
- if ((trans = kwset->trans) != NULL)
+ if ((trans = kwset->trans))
for (i = 0; i < NCHAR; ++i)
kwset->delta[i] = delta[U(trans[i])];
else
diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
index fd8d59f..4b25287 100644
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@ -40,22 +40,7 @@ const char *list_object_filter_config_name(enum list_objects_filter_choice c)
BUG("list_object_filter_config_name: invalid argument '%d'", c);
}
-/*
- * Parse value of the argument to the "filter" keyword.
- * On the command line this looks like:
- * --filter=<arg>
- * and in the pack protocol as:
- * "filter" SP <arg>
- *
- * The filter keyword will be used by many commands.
- * See Documentation/rev-list-options.txt for allowed values for <arg>.
- *
- * Capture the given arg as the "filter_spec". This can be forwarded to
- * subordinate commands when necessary (although it's better to pass it through
- * expand_list_objects_filter_spec() first). We also "intern" the arg for the
- * convenience of the current command.
- */
-static int gently_parse_list_objects_filter(
+int gently_parse_list_objects_filter(
struct list_objects_filter_options *filter_options,
const char *arg,
struct strbuf *errbuf)
@@ -300,6 +285,10 @@ int opt_parse_list_objects_filter(const struct option *opt,
const char *arg, int unset)
{
struct list_objects_filter_options *filter_options = opt->value;
+ opt_lof_init init = (opt_lof_init)opt->defval;
+
+ if (init)
+ filter_options = init(opt->value);
if (unset || !arg)
list_objects_filter_set_no_filter(filter_options);
@@ -415,3 +404,22 @@ void partial_clone_get_default_filter_spec(
&errbuf);
strbuf_release(&errbuf);
}
+
+void list_objects_filter_copy(
+ struct list_objects_filter_options *dest,
+ const struct list_objects_filter_options *src)
+{
+ int i;
+ struct string_list_item *item;
+
+ /* Copy everything. We will overwrite the pointers shortly. */
+ memcpy(dest, src, sizeof(struct list_objects_filter_options));
+
+ string_list_init_dup(&dest->filter_spec);
+ for_each_string_list_item(item, &src->filter_spec)
+ string_list_append(&dest->filter_spec, item->string);
+
+ ALLOC_ARRAY(dest->sub, dest->sub_alloc);
+ for (i = 0; i < src->sub_nr; i++)
+ list_objects_filter_copy(&dest->sub[i], &src->sub[i]);
+}
diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
index da5b673..ffc02d7 100644
--- a/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@ -69,8 +69,25 @@ struct list_objects_filter_options {
*/
};
-/* Normalized command line arguments */
-#define CL_ARG__FILTER "filter"
+/*
+ * Parse value of the argument to the "filter" keyword.
+ * On the command line this looks like:
+ * --filter=<arg>
+ * and in the pack protocol as:
+ * "filter" SP <arg>
+ *
+ * The filter keyword will be used by many commands.
+ * See Documentation/rev-list-options.txt for allowed values for <arg>.
+ *
+ * Capture the given arg as the "filter_spec". This can be forwarded to
+ * subordinate commands when necessary (although it's better to pass it through
+ * expand_list_objects_filter_spec() first). We also "intern" the arg for the
+ * convenience of the current command.
+ */
+int gently_parse_list_objects_filter(
+ struct list_objects_filter_options *filter_options,
+ const char *arg,
+ struct strbuf *errbuf);
void list_objects_filter_die_if_populated(
struct list_objects_filter_options *filter_options);
@@ -87,13 +104,31 @@ void parse_list_objects_filter(
struct list_objects_filter_options *filter_options,
const char *arg);
+/**
+ * The opt->value to opt_parse_list_objects_filter() is either a
+ * "struct list_objects_filter_option *" when using
+ * OPT_PARSE_LIST_OBJECTS_FILTER().
+ *
+ * Or, if using no "struct option" field is used by the callback,
+ * except the "defval" which is expected to be an "opt_lof_init"
+ * function, which is called with the "opt->value" and must return a
+ * pointer to the ""struct list_objects_filter_option *" to be used.
+ *
+ * The OPT_PARSE_LIST_OBJECTS_FILTER_INIT() can be used e.g. the
+ * "struct list_objects_filter_option" is embedded in a "struct
+ * rev_info", which the "defval" could be tasked with lazily
+ * initializing. See cmd_pack_objects() for an example.
+ */
int opt_parse_list_objects_filter(const struct option *opt,
const char *arg, int unset);
+typedef struct list_objects_filter_options *(*opt_lof_init)(void *);
+#define OPT_PARSE_LIST_OBJECTS_FILTER_INIT(fo, init) \
+ { OPTION_CALLBACK, 0, "filter", (fo), N_("args"), \
+ N_("object filtering"), 0, opt_parse_list_objects_filter, \
+ (intptr_t)(init) }
#define OPT_PARSE_LIST_OBJECTS_FILTER(fo) \
- OPT_CALLBACK(0, CL_ARG__FILTER, fo, N_("args"), \
- N_("object filtering"), \
- opt_parse_list_objects_filter)
+ OPT_PARSE_LIST_OBJECTS_FILTER_INIT((fo), NULL)
/*
* Translates abbreviated numbers in the filter's filter_spec into their
@@ -132,4 +167,8 @@ void partial_clone_get_default_filter_spec(
struct list_objects_filter_options *filter_options,
const char *remote);
+void list_objects_filter_copy(
+ struct list_objects_filter_options *dest,
+ const struct list_objects_filter_options *src);
+
#endif /* LIST_OBJECTS_FILTER_OPTIONS_H */
diff --git a/list-objects.c b/list-objects.c
index 2f623f8..250d9de 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -21,6 +21,23 @@ struct traversal_context {
struct filter *filter;
};
+static void show_commit(struct traversal_context *ctx,
+ struct commit *commit)
+{
+ if (!ctx->show_commit)
+ return;
+ ctx->show_commit(commit, ctx->show_data);
+}
+
+static void show_object(struct traversal_context *ctx,
+ struct object *object,
+ const char *name)
+{
+ if (!ctx->show_object)
+ return;
+ ctx->show_object(object, name, ctx->show_data);
+}
+
static void process_blob(struct traversal_context *ctx,
struct blob *blob,
struct strbuf *path,
@@ -60,7 +77,7 @@ static void process_blob(struct traversal_context *ctx,
if (r & LOFR_MARK_SEEN)
obj->flags |= SEEN;
if (r & LOFR_DO_SHOW)
- ctx->show_object(obj, path->buf, ctx->show_data);
+ show_object(ctx, obj, path->buf);
strbuf_setlen(path, pathlen);
}
@@ -194,7 +211,7 @@ static void process_tree(struct traversal_context *ctx,
if (r & LOFR_MARK_SEEN)
obj->flags |= SEEN;
if (r & LOFR_DO_SHOW)
- ctx->show_object(obj, base->buf, ctx->show_data);
+ show_object(ctx, obj, base->buf);
if (base->len)
strbuf_addch(base, '/');
@@ -210,7 +227,7 @@ static void process_tree(struct traversal_context *ctx,
if (r & LOFR_MARK_SEEN)
obj->flags |= SEEN;
if (r & LOFR_DO_SHOW)
- ctx->show_object(obj, base->buf, ctx->show_data);
+ show_object(ctx, obj, base->buf);
strbuf_setlen(base, baselen);
free_tree_buffer(tree);
@@ -228,7 +245,7 @@ static void process_tag(struct traversal_context *ctx,
if (r & LOFR_MARK_SEEN)
tag->object.flags |= SEEN;
if (r & LOFR_DO_SHOW)
- ctx->show_object(&tag->object, name, ctx->show_data);
+ show_object(ctx, &tag->object, name);
}
static void mark_edge_parents_uninteresting(struct commit *commit,
@@ -402,7 +419,7 @@ static void do_traverse(struct traversal_context *ctx)
if (r & LOFR_MARK_SEEN)
commit->object.flags |= SEEN;
if (r & LOFR_DO_SHOW)
- ctx->show_commit(commit, ctx->show_data);
+ show_commit(ctx, commit);
if (ctx->revs->tree_blobs_in_commit_order)
/*
@@ -416,35 +433,25 @@ static void do_traverse(struct traversal_context *ctx)
strbuf_release(&csp);
}
-void traverse_commit_list(struct rev_info *revs,
- show_commit_fn show_commit,
- show_object_fn show_object,
- void *show_data)
-{
- struct traversal_context ctx;
- ctx.revs = revs;
- ctx.show_commit = show_commit;
- ctx.show_object = show_object;
- ctx.show_data = show_data;
- ctx.filter = NULL;
- do_traverse(&ctx);
-}
-
void traverse_commit_list_filtered(
- struct list_objects_filter_options *filter_options,
struct rev_info *revs,
show_commit_fn show_commit,
show_object_fn show_object,
void *show_data,
struct oidset *omitted)
{
- struct traversal_context ctx;
+ struct traversal_context ctx = {
+ .revs = revs,
+ .show_object = show_object,
+ .show_commit = show_commit,
+ .show_data = show_data,
+ };
- ctx.revs = revs;
- ctx.show_object = show_object;
- ctx.show_commit = show_commit;
- ctx.show_data = show_data;
- ctx.filter = list_objects_filter__init(omitted, filter_options);
+ if (revs->filter.choice)
+ ctx.filter = list_objects_filter__init(omitted, &revs->filter);
+
do_traverse(&ctx);
- list_objects_filter__free(ctx.filter);
+
+ if (ctx.filter)
+ list_objects_filter__free(ctx.filter);
}
diff --git a/list-objects.h b/list-objects.h
index a952680..9eaf4de 100644
--- a/list-objects.h
+++ b/list-objects.h
@@ -7,7 +7,6 @@ struct rev_info;
typedef void (*show_commit_fn)(struct commit *, void *);
typedef void (*show_object_fn)(struct object *, const char *, void *);
-void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);
typedef void (*show_edge_fn)(struct commit *);
void mark_edges_uninteresting(struct rev_info *revs,
@@ -18,11 +17,20 @@ struct oidset;
struct list_objects_filter_options;
void traverse_commit_list_filtered(
- struct list_objects_filter_options *filter_options,
struct rev_info *revs,
show_commit_fn show_commit,
show_object_fn show_object,
void *show_data,
struct oidset *omitted);
+static inline void traverse_commit_list(
+ struct rev_info *revs,
+ show_commit_fn show_commit,
+ show_object_fn show_object,
+ void *show_data)
+{
+ traverse_commit_list_filtered(revs, show_commit,
+ show_object, show_data, NULL);
+}
+
#endif /* LIST_OBJECTS_H */
diff --git a/ll-merge.c b/ll-merge.c
index 2616575..14b8362 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -14,7 +14,7 @@
struct ll_merge_driver;
-typedef int (*ll_merge_fn)(const struct ll_merge_driver *,
+typedef enum ll_merge_result (*ll_merge_fn)(const struct ll_merge_driver *,
mmbuffer_t *result,
const char *path,
mmfile_t *orig, const char *orig_name,
@@ -49,7 +49,7 @@ void reset_merge_attributes(void)
/*
* Built-in low-levels
*/
-static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
+static enum ll_merge_result ll_binary_merge(const struct ll_merge_driver *drv_unused,
mmbuffer_t *result,
const char *path,
mmfile_t *orig, const char *orig_name,
@@ -58,6 +58,7 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
const struct ll_merge_options *opts,
int marker_size)
{
+ enum ll_merge_result ret;
mmfile_t *stolen;
assert(opts);
@@ -68,16 +69,19 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
*/
if (opts->virtual_ancestor) {
stolen = orig;
+ ret = LL_MERGE_OK;
} else {
switch (opts->variant) {
default:
- warning("Cannot merge binary files: %s (%s vs. %s)",
- path, name1, name2);
- /* fallthru */
+ ret = LL_MERGE_BINARY_CONFLICT;
+ stolen = src1;
+ break;
case XDL_MERGE_FAVOR_OURS:
+ ret = LL_MERGE_OK;
stolen = src1;
break;
case XDL_MERGE_FAVOR_THEIRS:
+ ret = LL_MERGE_OK;
stolen = src2;
break;
}
@@ -87,16 +91,10 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
result->size = stolen->size;
stolen->ptr = NULL;
- /*
- * With -Xtheirs or -Xours, we have cleanly merged;
- * otherwise we got a conflict.
- */
- return opts->variant == XDL_MERGE_FAVOR_OURS ||
- opts->variant == XDL_MERGE_FAVOR_THEIRS ?
- 0 : 1;
+ return ret;
}
-static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
+static enum ll_merge_result ll_xdl_merge(const struct ll_merge_driver *drv_unused,
mmbuffer_t *result,
const char *path,
mmfile_t *orig, const char *orig_name,
@@ -105,7 +103,9 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
const struct ll_merge_options *opts,
int marker_size)
{
+ enum ll_merge_result ret;
xmparam_t xmp;
+ int status;
assert(opts);
if (orig->size > MAX_XDIFF_SIZE ||
@@ -133,10 +133,12 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
xmp.ancestor = orig_name;
xmp.file1 = name1;
xmp.file2 = name2;
- return xdl_merge(orig, src1, src2, &xmp, result);
+ status = xdl_merge(orig, src1, src2, &xmp, result);
+ ret = (status > 0) ? LL_MERGE_CONFLICT : status;
+ return ret;
}
-static int ll_union_merge(const struct ll_merge_driver *drv_unused,
+static enum ll_merge_result ll_union_merge(const struct ll_merge_driver *drv_unused,
mmbuffer_t *result,
const char *path,
mmfile_t *orig, const char *orig_name,
@@ -178,7 +180,7 @@ static void create_temp(mmfile_t *src, char *path, size_t len)
/*
* User defined low-level merge driver support.
*/
-static int ll_ext_merge(const struct ll_merge_driver *fn,
+static enum ll_merge_result ll_ext_merge(const struct ll_merge_driver *fn,
mmbuffer_t *result,
const char *path,
mmfile_t *orig, const char *orig_name,
@@ -194,6 +196,7 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
const char *args[] = { NULL, NULL };
int status, fd, i;
struct stat st;
+ enum ll_merge_result ret;
assert(opts);
sq_quote_buf(&path_sq, path);
@@ -204,7 +207,7 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
dict[4].placeholder = "P"; dict[4].value = path_sq.buf;
dict[5].placeholder = NULL; dict[5].value = NULL;
- if (fn->cmdline == NULL)
+ if (!fn->cmdline)
die("custom merge driver %s lacks command line.", fn->name);
result->ptr = NULL;
@@ -236,7 +239,8 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
unlink_or_warn(temp[i]);
strbuf_release(&cmd);
strbuf_release(&path_sq);
- return status;
+ ret = (status > 0) ? LL_MERGE_CONFLICT : status;
+ return ret;
}
/*
@@ -362,7 +366,7 @@ static void normalize_file(mmfile_t *mm, const char *path, struct index_state *i
}
}
-int ll_merge(mmbuffer_t *result_buf,
+enum ll_merge_result ll_merge(mmbuffer_t *result_buf,
const char *path,
mmfile_t *ancestor, const char *ancestor_label,
mmfile_t *ours, const char *our_label,
diff --git a/ll-merge.h b/ll-merge.h
index aceb1b2..e4a20e8 100644
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -82,13 +82,20 @@ struct ll_merge_options {
long xdl_opts;
};
+enum ll_merge_result {
+ LL_MERGE_ERROR = -1,
+ LL_MERGE_OK = 0,
+ LL_MERGE_CONFLICT,
+ LL_MERGE_BINARY_CONFLICT,
+};
+
/**
* Perform a three-way single-file merge in core. This is a thin wrapper
* around `xdl_merge` that takes the path and any merge backend specified in
* `.gitattributes` or `.git/info/attributes` into account.
* Returns 0 for a clean merge.
*/
-int ll_merge(mmbuffer_t *result_buf,
+enum ll_merge_result ll_merge(mmbuffer_t *result_buf,
const char *path,
mmfile_t *ancestor, const char *ancestor_label,
mmfile_t *ours, const char *our_label,
diff --git a/log-tree.c b/log-tree.c
index 6dc4412..d0ac0a6 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -1,12 +1,15 @@
#include "cache.h"
+#include "commit-reach.h"
#include "config.h"
#include "diff.h"
#include "object-store.h"
#include "repository.h"
+#include "tmp-objdir.h"
#include "commit.h"
#include "tag.h"
#include "graph.h"
#include "log-tree.h"
+#include "merge-ort.h"
#include "reflog-walk.h"
#include "refs.h"
#include "string-list.h"
@@ -16,6 +19,7 @@
#include "line-log.h"
#include "help.h"
#include "range-diff.h"
+#include "strmap.h"
static struct decoration name_decoration = { "object names" };
static int decoration_loaded;
@@ -84,7 +88,7 @@ static int match_ref_pattern(const char *refname,
const struct string_list_item *item)
{
int matched = 0;
- if (item->util == NULL) {
+ if (!item->util) {
if (!wildmatch(item->string, refname, 0))
matched = 1;
} else {
@@ -513,12 +517,13 @@ static void show_signature(struct rev_info *opt, struct commit *commit)
if (parse_signed_commit(commit, &payload, &signature, the_hash_algo) <= 0)
goto out;
- status = check_signature(payload.buf, payload.len, signature.buf,
- signature.len, &sigc);
- if (status && !sigc.gpg_output)
+ sigc.payload_type = SIGNATURE_PAYLOAD_COMMIT;
+ sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
+ status = check_signature(&sigc, signature.buf, signature.len);
+ if (status && !sigc.output)
show_sig_lines(opt, status, "No signature\n");
else
- show_sig_lines(opt, status, sigc.gpg_output);
+ show_sig_lines(opt, status, sigc.output);
signature_check_clear(&sigc);
out:
@@ -560,7 +565,7 @@ static int show_one_mergetag(struct commit *commit,
struct strbuf signature = STRBUF_INIT;
hash_object_file(the_hash_algo, extra->value, extra->len,
- type_name(OBJ_TAG), &oid);
+ OBJ_TAG, &oid);
tag = lookup_tag(the_repository, &oid);
if (!tag)
return -1; /* error message already given */
@@ -583,10 +588,11 @@ static int show_one_mergetag(struct commit *commit,
status = -1;
if (parse_signature(extra->value, extra->len, &payload, &signature)) {
/* could have a good signature */
- status = check_signature(payload.buf, payload.len,
- signature.buf, signature.len, &sigc);
- if (sigc.gpg_output)
- strbuf_addstr(&verify_message, sigc.gpg_output);
+ sigc.payload_type = SIGNATURE_PAYLOAD_TAG;
+ sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
+ status = check_signature(&sigc, signature.buf, signature.len);
+ if (sigc.output)
+ strbuf_addstr(&verify_message, sigc.output);
else
strbuf_addstr(&verify_message, "No signature\n");
signature_check_clear(&sigc);
@@ -847,7 +853,7 @@ int log_tree_diff_flush(struct rev_info *opt)
opt->shown_dashes = 0;
diffcore_std(&opt->diffopt);
- if (diff_queue_is_empty()) {
+ if (diff_queue_is_empty(&opt->diffopt)) {
int saved_fmt = opt->diffopt.output_format;
opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_flush(&opt->diffopt);
@@ -902,6 +908,106 @@ static int do_diff_combined(struct rev_info *opt, struct commit *commit)
return !opt->loginfo;
}
+static void setup_additional_headers(struct diff_options *o,
+ struct strmap *all_headers)
+{
+ struct hashmap_iter iter;
+ struct strmap_entry *entry;
+
+ /*
+ * Make o->additional_path_headers contain the subset of all_headers
+ * that match o->pathspec. If there aren't any that match o->pathspec,
+ * then make o->additional_path_headers be NULL.
+ */
+
+ if (!o->pathspec.nr) {
+ o->additional_path_headers = all_headers;
+ return;
+ }
+
+ o->additional_path_headers = xmalloc(sizeof(struct strmap));
+ strmap_init_with_options(o->additional_path_headers, NULL, 0);
+ strmap_for_each_entry(all_headers, &iter, entry) {
+ if (match_pathspec(the_repository->index, &o->pathspec,
+ entry->key, strlen(entry->key),
+ 0 /* prefix */, NULL /* seen */,
+ 0 /* is_dir */))
+ strmap_put(o->additional_path_headers,
+ entry->key, entry->value);
+ }
+ if (!strmap_get_size(o->additional_path_headers)) {
+ strmap_clear(o->additional_path_headers, 0);
+ FREE_AND_NULL(o->additional_path_headers);
+ }
+}
+
+static void cleanup_additional_headers(struct diff_options *o)
+{
+ if (!o->pathspec.nr) {
+ o->additional_path_headers = NULL;
+ return;
+ }
+ if (!o->additional_path_headers)
+ return;
+
+ strmap_clear(o->additional_path_headers, 0);
+ FREE_AND_NULL(o->additional_path_headers);
+}
+
+static int do_remerge_diff(struct rev_info *opt,
+ struct commit_list *parents,
+ struct object_id *oid,
+ struct commit *commit)
+{
+ struct merge_options o;
+ struct commit_list *bases;
+ struct merge_result res = {0};
+ struct pretty_print_context ctx = {0};
+ struct commit *parent1 = parents->item;
+ struct commit *parent2 = parents->next->item;
+ struct strbuf parent1_desc = STRBUF_INIT;
+ struct strbuf parent2_desc = STRBUF_INIT;
+
+ /* Setup merge options */
+ init_merge_options(&o, the_repository);
+ o.show_rename_progress = 0;
+ o.record_conflict_msgs_as_headers = 1;
+ o.msg_header_prefix = "remerge";
+
+ ctx.abbrev = DEFAULT_ABBREV;
+ format_commit_message(parent1, "%h (%s)", &parent1_desc, &ctx);
+ format_commit_message(parent2, "%h (%s)", &parent2_desc, &ctx);
+ o.branch1 = parent1_desc.buf;
+ o.branch2 = parent2_desc.buf;
+
+ /* Parse the relevant commits and get the merge bases */
+ parse_commit_or_die(parent1);
+ parse_commit_or_die(parent2);
+ bases = get_merge_bases(parent1, parent2);
+
+ /* Re-merge the parents */
+ merge_incore_recursive(&o, bases, parent1, parent2, &res);
+
+ /* Show the diff */
+ setup_additional_headers(&opt->diffopt, res.path_messages);
+ diff_tree_oid(&res.tree->object.oid, oid, "", &opt->diffopt);
+ log_tree_diff_flush(opt);
+
+ /* Cleanup */
+ cleanup_additional_headers(&opt->diffopt);
+ strbuf_release(&parent1_desc);
+ strbuf_release(&parent2_desc);
+ merge_finalize(&o, &res);
+
+ /* Clean up the contents of the temporary object directory */
+ if (opt->remerge_objdir)
+ tmp_objdir_discard_objects(opt->remerge_objdir);
+ else
+ BUG("did a remerge diff without remerge_objdir?!?");
+
+ return !opt->loginfo;
+}
+
/*
* Show the diff of a commit.
*
@@ -936,6 +1042,18 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
}
if (is_merge) {
+ int octopus = (parents->next->next != NULL);
+
+ if (opt->remerge_diff) {
+ if (octopus) {
+ show_log(opt);
+ fprintf(opt->diffopt.file,
+ "diff: warning: Skipping remerge-diff "
+ "for octopus merges.\n");
+ return 1;
+ }
+ return do_remerge_diff(opt, parents, oid, commit);
+ }
if (opt->combine_merges)
return do_diff_combined(opt, commit);
if (opt->separate_merges) {
@@ -980,6 +1098,7 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
opt->loginfo = &log;
opt->diffopt.no_free = 1;
+ /* NEEDSWORK: no restoring of no_free? Why? */
if (opt->line_level_traverse)
return line_log_print(opt, commit);
diff --git a/ls-refs.c b/ls-refs.c
index 5407832..98e6937 100644
--- a/ls-refs.c
+++ b/ls-refs.c
@@ -34,7 +34,8 @@ static void ensure_config_read(void)
} else if (!strcmp(str, "ignore")) {
/* do nothing */
} else {
- die(_("invalid value '%s' for lsrefs.unborn"), str);
+ die(_("invalid value for '%s': '%s'"),
+ "lsrefs.unborn", str);
}
}
config_read = 1;
diff --git a/mailinfo.c b/mailinfo.c
index 02f6f95..9621ba6 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -698,7 +698,7 @@ static int is_scissors_line(const char *line)
continue;
}
last_nonblank = c;
- if (first_nonblank == NULL)
+ if (!first_nonblank)
first_nonblank = c;
if (*c == '-') {
in_perforation = 1;
@@ -1094,7 +1094,7 @@ static void handle_body(struct mailinfo *mi, struct strbuf *line)
*/
lines = strbuf_split(line, '\n');
for (it = lines; (sb = *it); it++) {
- if (*(it + 1) == NULL) /* The last line */
+ if (!*(it + 1)) /* The last line */
if (sb->buf[sb->len - 1] != '\n') {
/* Partial line, save it for later. */
strbuf_addbuf(&prev, sb);
diff --git a/mailmap.c b/mailmap.c
index 40ce152..da2589b 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -43,8 +43,8 @@ static void free_mailmap_info(void *p, const char *s)
static void free_mailmap_entry(void *p, const char *s)
{
struct mailmap_entry *me = (struct mailmap_entry *)p;
- debug_mm("mailmap: removing entries for <%s>, with %d sub-entries\n",
- s, me->namemap.nr);
+ debug_mm("mailmap: removing entries for <%s>, with %"PRIuMAX" sub-entries\n",
+ s, (uintmax_t)me->namemap.nr);
debug_mm("mailmap: - simple: '%s' <%s>\n",
debug_str(me->name), debug_str(me->email));
@@ -77,7 +77,7 @@ static void add_mapping(struct string_list *map,
struct mailmap_entry *me;
struct string_list_item *item;
- if (old_email == NULL) {
+ if (!old_email) {
old_email = new_email;
new_email = NULL;
}
@@ -92,7 +92,7 @@ static void add_mapping(struct string_list *map,
item->util = me;
}
- if (old_name == NULL) {
+ if (!old_name) {
debug_mm("mailmap: adding (simple) entry for '%s'\n", old_email);
/* Replace current name and new email for simple entry */
@@ -123,9 +123,9 @@ static char *parse_name_and_email(char *buffer, char **name,
char *left, *right, *nstart, *nend;
*name = *email = NULL;
- if ((left = strchr(buffer, '<')) == NULL)
+ if (!(left = strchr(buffer, '<')))
return NULL;
- if ((right = strchr(left+1, '>')) == NULL)
+ if (!(right = strchr(left + 1, '>')))
return NULL;
if (!allow_empty_email && (left+1 == right))
return NULL;
@@ -153,7 +153,7 @@ static void read_mailmap_line(struct string_list *map, char *buffer)
if (buffer[0] == '#')
return;
- if ((name2 = parse_name_and_email(buffer, &name1, &email1, 0)) != NULL)
+ if ((name2 = parse_name_and_email(buffer, &name1, &email1, 0)))
parse_name_and_email(name2, &name2, &email2, 1);
if (email1)
@@ -250,7 +250,8 @@ int read_mailmap(struct string_list *map)
void clear_mailmap(struct string_list *map)
{
- debug_mm("mailmap: clearing %d entries...\n", map->nr);
+ debug_mm("mailmap: clearing %"PRIuMAX" entries...\n",
+ (uintmax_t)map->nr);
map->strdup_strings = 1;
string_list_clear_func(map, free_mailmap_entry);
debug_mm("mailmap: cleared\n");
@@ -319,7 +320,7 @@ int map_user(struct string_list *map,
(int)*emaillen, debug_str(*email));
item = lookup_prefix(map, *email, *emaillen);
- if (item != NULL) {
+ if (item) {
me = (struct mailmap_entry *)item->util;
if (me->namemap.nr) {
/*
@@ -333,7 +334,7 @@ int map_user(struct string_list *map,
item = subitem;
}
}
- if (item != NULL) {
+ if (item) {
struct mailmap_info *mi = (struct mailmap_info *)item->util;
if (mi->name == NULL && mi->email == NULL) {
debug_mm("map_user: -- (no simple mapping)\n");
diff --git a/match-trees.c b/match-trees.c
index df41398..49398e5 100644
--- a/match-trees.c
+++ b/match-trees.c
@@ -235,7 +235,7 @@ static int splice_tree(const struct object_id *oid1, const char *prefix,
rewrite_with = oid2;
}
hashcpy(rewrite_here, rewrite_with->hash);
- status = write_object_file(buf, sz, tree_type, result);
+ status = write_object_file(buf, sz, OBJ_TREE, result);
free(buf);
return status;
}
diff --git a/mem-pool.c b/mem-pool.c
index ccdcad2..599d8e8 100644
--- a/mem-pool.c
+++ b/mem-pool.c
@@ -8,6 +8,26 @@
#define BLOCK_GROWTH_SIZE (1024 * 1024 - sizeof(struct mp_block))
/*
+ * The inner union is an approximation for C11's max_align_t, and the
+ * struct + offsetof computes _Alignof. This can all just be replaced
+ * with _Alignof(max_align_t) if/when C11 is part of the baseline.
+ * Note that _Alignof(X) need not be the same as sizeof(X); it's only
+ * required to be a (possibly trivial) factor. They are the same for
+ * most architectures, but m68k for example has only 2-byte alignment
+ * for its 4-byte and 8-byte types, so using sizeof would waste space.
+ *
+ * Add more types to the union if the current set is insufficient.
+ */
+struct git_max_alignment {
+ char unalign;
+ union {
+ uintmax_t max_align_uintmax;
+ void *max_align_pointer;
+ } aligned;
+};
+#define GIT_MAX_ALIGNMENT offsetof(struct git_max_alignment, aligned)
+
+/*
* Allocate a new mp_block and insert it after the block specified in
* `insert_after`. If `insert_after` is NULL, then insert block at the
* head of the linked list.
@@ -69,9 +89,9 @@ void *mem_pool_alloc(struct mem_pool *pool, size_t len)
struct mp_block *p = NULL;
void *r;
- /* round up to a 'uintmax_t' alignment */
- if (len & (sizeof(uintmax_t) - 1))
- len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
+ /* round up to a 'GIT_MAX_ALIGNMENT' alignment */
+ if (len & (GIT_MAX_ALIGNMENT - 1))
+ len += GIT_MAX_ALIGNMENT - (len & (GIT_MAX_ALIGNMENT - 1));
if (pool->mp_block &&
pool->mp_block->end - pool->mp_block->next_free >= len)
diff --git a/merge-blobs.c b/merge-blobs.c
index ee0a0e9..8138090 100644
--- a/merge-blobs.c
+++ b/merge-blobs.c
@@ -36,7 +36,7 @@ static void *three_way_filemerge(struct index_state *istate,
mmfile_t *their,
unsigned long *size)
{
- int merge_status;
+ enum ll_merge_result merge_status;
mmbuffer_t res;
/*
@@ -50,6 +50,9 @@ static void *three_way_filemerge(struct index_state *istate,
istate, NULL);
if (merge_status < 0)
return NULL;
+ if (merge_status == LL_MERGE_BINARY_CONFLICT)
+ warning("Cannot merge binary files: %s (%s vs. %s)",
+ path, ".our", ".their");
*size = res.size;
return res.ptr;
diff --git a/merge-ort.c b/merge-ort.c
index ab42c5d..b5015b9 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -609,6 +609,7 @@ static int err(struct merge_options *opt, const char *err, ...)
static void format_commit(struct strbuf *sb,
int indent,
+ struct repository *repo,
struct commit *commit)
{
struct merge_remote_desc *desc;
@@ -622,7 +623,7 @@ static void format_commit(struct strbuf *sb,
return;
}
- format_commit_message(commit, "%h %s", sb, &ctx);
+ repo_format_commit_message(repo, commit, "%h %s", sb, &ctx);
strbuf_addch(sb, '\n');
}
@@ -633,17 +634,57 @@ static void path_msg(struct merge_options *opt,
const char *fmt, ...)
{
va_list ap;
- struct strbuf *sb = strmap_get(&opt->priv->output, path);
+ struct strbuf *sb, *dest;
+ struct strbuf tmp = STRBUF_INIT;
+
+ if (opt->record_conflict_msgs_as_headers && omittable_hint)
+ return; /* Do not record mere hints in headers */
+ if (opt->priv->call_depth && opt->verbosity < 5)
+ return; /* Ignore messages from inner merges */
+
+ sb = strmap_get(&opt->priv->output, path);
if (!sb) {
sb = xmalloc(sizeof(*sb));
strbuf_init(sb, 0);
strmap_put(&opt->priv->output, path, sb);
}
+ dest = (opt->record_conflict_msgs_as_headers ? &tmp : sb);
+
va_start(ap, fmt);
- strbuf_vaddf(sb, fmt, ap);
+ if (opt->priv->call_depth) {
+ strbuf_addchars(dest, ' ', 2);
+ strbuf_addstr(dest, "From inner merge:");
+ strbuf_addchars(dest, ' ', opt->priv->call_depth * 2);
+ }
+ strbuf_vaddf(dest, fmt, ap);
va_end(ap);
+ if (opt->record_conflict_msgs_as_headers) {
+ int i_sb = 0, i_tmp = 0;
+
+ /* Start with the specified prefix */
+ if (opt->msg_header_prefix)
+ strbuf_addf(sb, "%s ", opt->msg_header_prefix);
+
+ /* Copy tmp to sb, adding spaces after newlines */
+ strbuf_grow(sb, sb->len + 2*tmp.len); /* more than sufficient */
+ for (; i_tmp < tmp.len; i_tmp++, i_sb++) {
+ /* Copy next character from tmp to sb */
+ sb->buf[sb->len + i_sb] = tmp.buf[i_tmp];
+
+ /* If we copied a newline, add a space */
+ if (tmp.buf[i_tmp] == '\n')
+ sb->buf[++i_sb] = ' ';
+ }
+ /* Update length and ensure it's NUL-terminated */
+ sb->len += i_sb;
+ sb->buf[sb->len] = '\0';
+
+ strbuf_release(&tmp);
+ }
+
+ /* Add final newline character to sb */
strbuf_addch(sb, '\n');
}
@@ -687,13 +728,15 @@ static void add_flattened_path(struct strbuf *out, const char *s)
out->buf[i] = '_';
}
-static char *unique_path(struct strmap *existing_paths,
+static char *unique_path(struct merge_options *opt,
const char *path,
const char *branch)
{
+ char *ret = NULL;
struct strbuf newpath = STRBUF_INIT;
int suffix = 0;
size_t base_len;
+ struct strmap *existing_paths = &opt->priv->paths;
strbuf_addf(&newpath, "%s~", path);
add_flattened_path(&newpath, branch);
@@ -704,7 +747,11 @@ static char *unique_path(struct strmap *existing_paths,
strbuf_addf(&newpath, "_%d", suffix++);
}
- return strbuf_detach(&newpath, NULL);
+ /* Track the new path in our memory pool */
+ ret = mem_pool_alloc(&opt->priv->pool, newpath.len + 1);
+ memcpy(ret, newpath.buf, newpath.len + 1);
+ strbuf_release(&newpath);
+ return ret;
}
/*** Function Grouping: functions related to collect_merge_info() ***/
@@ -1547,6 +1594,7 @@ static int find_first_merges(struct repository *repo,
}
object_array_clear(&merges);
+ release_revisions(&revs);
return result->nr;
}
@@ -1578,17 +1626,6 @@ static int merge_submodule(struct merge_options *opt,
if (is_null_oid(b))
return 0;
- /*
- * NEEDSWORK: Remove this when all submodule object accesses are
- * through explicitly specified repositores.
- */
- if (add_submodule_odb(path)) {
- path_msg(opt, path, 0,
- _("Failed to merge submodule %s (not checked out)"),
- path);
- return 0;
- }
-
if (repo_submodule_init(&subrepo, opt->repo, path, null_oid())) {
path_msg(opt, path, 0,
_("Failed to merge submodule %s (not checked out)"),
@@ -1653,7 +1690,7 @@ static int merge_submodule(struct merge_options *opt,
break;
case 1:
- format_commit(&sb, 4,
+ format_commit(&sb, 4, &subrepo,
(struct commit *)merges.objects[0].item);
path_msg(opt, path, 0,
_("Failed to merge submodule %s, but a possible merge "
@@ -1670,7 +1707,7 @@ static int merge_submodule(struct merge_options *opt,
break;
default:
for (i = 0; i < merges.nr; i++)
- format_commit(&sb, 4,
+ format_commit(&sb, 4, &subrepo,
(struct commit *)merges.objects[i].item);
path_msg(opt, path, 0,
_("Failed to merge submodule %s, but multiple "
@@ -1753,7 +1790,7 @@ static int merge_3way(struct merge_options *opt,
mmfile_t orig, src1, src2;
struct ll_merge_options ll_opts = {0};
char *base, *name1, *name2;
- int merge_status;
+ enum ll_merge_result merge_status;
if (!opt->priv->attr_index.initialized)
initialize_attr_index(opt);
@@ -1797,6 +1834,10 @@ static int merge_3way(struct merge_options *opt,
merge_status = ll_merge(result_buf, path, &orig, base,
&src1, name1, &src2, name2,
&opt->priv->attr_index, &ll_opts);
+ if (merge_status == LL_MERGE_BINARY_CONFLICT)
+ path_msg(opt, path, 0,
+ "warning: Cannot merge binary files: %s (%s vs. %s)",
+ path, name1, name2);
free(base);
free(name1);
@@ -1898,7 +1939,7 @@ static int handle_content_merge(struct merge_options *opt,
if (!ret &&
write_object_file(result_buf.ptr, result_buf.size,
- blob_type, &result->oid))
+ OBJ_BLOB, &result->oid))
ret = err(opt, _("Unable to add %s to database"),
path);
@@ -2028,7 +2069,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt,
* to ensure that's the case.
*/
c_info = strmap_get(collisions, new_path);
- if (c_info == NULL)
+ if (!c_info)
BUG("c_info is NULL");
/*
@@ -2426,7 +2467,7 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
*/
ci->path_conflict = 1;
if (pair->status == 'A')
- path_msg(opt, new_path, 0,
+ path_msg(opt, new_path, 1,
_("CONFLICT (file location): %s added in %s "
"inside a directory that was renamed in %s, "
"suggesting it should perhaps be moved to "
@@ -2434,7 +2475,7 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
old_path, branch_with_new_path,
branch_with_dir_rename, new_path);
else
- path_msg(opt, new_path, 0,
+ path_msg(opt, new_path, 1,
_("CONFLICT (file location): %s renamed to %s "
"in %s, inside a directory that was renamed "
"in %s, suggesting it should perhaps be "
@@ -3058,18 +3099,21 @@ static int detect_and_process_renames(struct merge_options *opt,
struct tree *side1,
struct tree *side2)
{
- struct diff_queue_struct combined;
+ struct diff_queue_struct combined = { 0 };
struct rename_info *renames = &opt->priv->renames;
- int need_dir_renames, s, clean = 1;
+ int need_dir_renames, s, i, clean = 1;
unsigned detection_run = 0;
- memset(&combined, 0, sizeof(combined));
if (!possible_renames(renames))
goto cleanup;
trace2_region_enter("merge", "regular renames", opt->repo);
detection_run |= detect_regular_renames(opt, MERGE_SIDE1);
detection_run |= detect_regular_renames(opt, MERGE_SIDE2);
+ if (renames->needed_limit) {
+ renames->cached_pairs_valid_side = 0;
+ renames->redo_after_renames = 0;
+ }
if (renames->redo_after_renames && detection_run) {
int i, side;
struct diff_filepair *p;
@@ -3143,13 +3187,9 @@ static int detect_and_process_renames(struct merge_options *opt,
free(renames->pairs[s].queue);
DIFF_QUEUE_CLEAR(&renames->pairs[s]);
}
- if (combined.nr) {
- int i;
- for (i = 0; i < combined.nr; i++)
- pool_diff_free_filepair(&opt->priv->pool,
- combined.queue[i]);
- free(combined.queue);
- }
+ for (i = 0; i < combined.nr; i++)
+ pool_diff_free_filepair(&opt->priv->pool, combined.queue[i]);
+ free(combined.queue);
return clean;
}
@@ -3353,7 +3393,7 @@ static void write_tree(struct object_id *result_oid,
}
/* Write this object file out, and record in result_oid */
- write_object_file(buf.buf, buf.len, tree_type, result_oid);
+ write_object_file(buf.buf, buf.len, OBJ_TREE, result_oid);
strbuf_release(&buf);
}
@@ -3647,7 +3687,7 @@ static void process_entry(struct merge_options *opt,
*/
df_file_index = (ci->dirmask & (1 << 1)) ? 2 : 1;
branch = (df_file_index == 1) ? opt->branch1 : opt->branch2;
- path = unique_path(&opt->priv->paths, path, branch);
+ path = unique_path(opt, path, branch);
strmap_put(&opt->priv->paths, path, new_ci);
path_msg(opt, path, 0,
@@ -3772,14 +3812,12 @@ static void process_entry(struct merge_options *opt,
/* Insert entries into opt->priv_paths */
assert(rename_a || rename_b);
if (rename_a) {
- a_path = unique_path(&opt->priv->paths,
- path, opt->branch1);
+ a_path = unique_path(opt, path, opt->branch1);
strmap_put(&opt->priv->paths, a_path, ci);
}
if (rename_b)
- b_path = unique_path(&opt->priv->paths,
- path, opt->branch2);
+ b_path = unique_path(opt, path, opt->branch2);
else
b_path = path;
strmap_put(&opt->priv->paths, b_path, new_ci);
@@ -3851,9 +3889,22 @@ static void process_entry(struct merge_options *opt,
if (opt->renormalize &&
blob_unchanged(opt, &ci->stages[0], &ci->stages[side],
path)) {
- ci->merged.is_null = 1;
- ci->merged.clean = 1;
- assert(!ci->df_conflict && !ci->path_conflict);
+ if (!ci->path_conflict) {
+ /*
+ * Blob unchanged after renormalization, so
+ * there's no modify/delete conflict after all;
+ * we can just remove the file.
+ */
+ ci->merged.is_null = 1;
+ ci->merged.clean = 1;
+ /*
+ * file goes away => even if there was a
+ * directory/file conflict there isn't one now.
+ */
+ ci->df_conflict = 0;
+ } else {
+ /* rename/delete, so conflict remains */
+ }
} else if (ci->path_conflict &&
oideq(&ci->stages[0].oid, &ci->stages[side].oid)) {
/*
@@ -4014,8 +4065,8 @@ static void process_entries(struct merge_options *opt,
trace2_region_enter("merge", "process_entries cleanup", opt->repo);
if (dir_metadata.offsets.nr != 1 ||
(uintptr_t)dir_metadata.offsets.items[0].util != 0) {
- printf("dir_metadata.offsets.nr = %d (should be 1)\n",
- dir_metadata.offsets.nr);
+ printf("dir_metadata.offsets.nr = %"PRIuMAX" (should be 1)\n",
+ (uintmax_t)dir_metadata.offsets.nr);
printf("dir_metadata.offsets.items[0].util = %u (should be 0)\n",
(unsigned)(uintptr_t)dir_metadata.offsets.items[0].util);
fflush(stdout);
@@ -4062,11 +4113,7 @@ static int checkout(struct merge_options *opt,
unpack_opts.quiet = 0; /* FIXME: sequencer might want quiet? */
unpack_opts.verbose_update = (opt->verbosity > 2);
unpack_opts.fn = twoway_merge;
- if (1/* FIXME: opts->overwrite_ignore*/) {
- CALLOC_ARRAY(unpack_opts.dir, 1);
- unpack_opts.dir->flags |= DIR_SHOW_IGNORED;
- setup_standard_excludes(unpack_opts.dir);
- }
+ unpack_opts.preserve_ignored = 0; /* FIXME: !opts->overwrite_ignore */
parse_tree(prev);
init_tree_desc(&trees[0], prev->buffer, prev->size);
parse_tree(next);
@@ -4074,8 +4121,6 @@ static int checkout(struct merge_options *opt,
ret = unpack_trees(2, trees, &unpack_opts);
clear_unpack_trees_porcelain(&unpack_opts);
- dir_clear(unpack_opts.dir);
- FREE_AND_NULL(unpack_opts.dir);
return ret;
}
@@ -4160,7 +4205,7 @@ static int record_conflicted_index_entries(struct merge_options *opt)
struct stat st;
if (!lstat(path, &st)) {
- char *new_name = unique_path(&opt->priv->paths,
+ char *new_name = unique_path(opt,
path,
"cruft");
@@ -4168,7 +4213,6 @@ static int record_conflicted_index_entries(struct merge_options *opt)
_("Note: %s not up to date and in way of checking out conflicted version; old copy renamed to %s"),
path, new_name);
errs |= rename(path, new_name);
- free(new_name);
}
errs |= checkout_entry(ce, &state, NULL, NULL);
}
@@ -4258,6 +4302,9 @@ void merge_switch_to_result(struct merge_options *opt,
struct string_list olist = STRING_LIST_INIT_NODUP;
int i;
+ if (opt->record_conflict_msgs_as_headers)
+ BUG("Either display conflict messages or record them as headers, not both");
+
trace2_region_enter("merge", "display messages", opt->repo);
/* Hack to pre-allocate olist to the desired size */
@@ -4359,6 +4406,9 @@ static void merge_start(struct merge_options *opt, struct merge_result *result)
assert(opt->recursive_variant >= MERGE_VARIANT_NORMAL &&
opt->recursive_variant <= MERGE_VARIANT_THEIRS);
+ if (opt->msg_header_prefix)
+ assert(opt->record_conflict_msgs_as_headers);
+
/*
* detect_renames, verbosity, buffer_output, and obuf are ignored
* fields that were used by "recursive" rather than "ort" -- but
@@ -4559,6 +4609,7 @@ static void merge_ort_nonrecursive_internal(struct merge_options *opt,
trace2_region_leave("merge", "process_entries", opt->repo);
/* Set return values */
+ result->path_messages = &opt->priv->output;
result->tree = parse_tree_indirect(&working_tree_oid);
/* existence of conflicted entries implies unclean */
result->clean &= strmap_empty(&opt->priv->conflicted);
@@ -4578,7 +4629,7 @@ static void merge_ort_internal(struct merge_options *opt,
struct commit *h2,
struct merge_result *result)
{
- struct commit_list *iter;
+ struct commit *next;
struct commit *merged_merge_bases;
const char *ancestor_name;
struct strbuf merge_base_abbrev = STRBUF_INIT;
@@ -4590,7 +4641,7 @@ static void merge_ort_internal(struct merge_options *opt,
}
merged_merge_bases = pop_commit(&merge_bases);
- if (merged_merge_bases == NULL) {
+ if (!merged_merge_bases) {
/* if there is no common ancestor, use an empty tree */
struct tree *tree;
@@ -4607,7 +4658,8 @@ static void merge_ort_internal(struct merge_options *opt,
ancestor_name = merge_base_abbrev.buf;
}
- for (iter = merge_bases; iter; iter = iter->next) {
+ for (next = pop_commit(&merge_bases); next;
+ next = pop_commit(&merge_bases)) {
const char *saved_b1, *saved_b2;
struct commit *prev = merged_merge_bases;
@@ -4624,7 +4676,7 @@ static void merge_ort_internal(struct merge_options *opt,
saved_b2 = opt->branch2;
opt->branch1 = "Temporary merge branch 1";
opt->branch2 = "Temporary merge branch 2";
- merge_ort_internal(opt, NULL, prev, iter->item, result);
+ merge_ort_internal(opt, NULL, prev, next, result);
if (result->clean < 0)
return;
opt->branch1 = saved_b1;
@@ -4635,8 +4687,7 @@ static void merge_ort_internal(struct merge_options *opt,
result->tree,
"merged tree");
commit_list_insert(prev, &merged_merge_bases->parents);
- commit_list_insert(iter->item,
- &merged_merge_bases->parents->next);
+ commit_list_insert(next, &merged_merge_bases->parents->next);
clear_or_reinit_internal_opts(opt->priv, 1);
}
diff --git a/merge-ort.h b/merge-ort.h
index c011864..fe599b8 100644
--- a/merge-ort.h
+++ b/merge-ort.h
@@ -5,6 +5,7 @@
struct commit;
struct tree;
+struct strmap;
struct merge_result {
/*
@@ -24,6 +25,15 @@ struct merge_result {
struct tree *tree;
/*
+ * Special messages and conflict notices for various paths
+ *
+ * This is a map of pathnames to strbufs. It contains various
+ * warning/conflict/notice messages (possibly multiple per path)
+ * that callers may want to use.
+ */
+ struct strmap *path_messages;
+
+ /*
* Additional metadata used by merge_switch_to_result() or future calls
* to merge_incore_*(). Includes data needed to update the index (if
* !clean) and to print "CONFLICT" messages. Not for external use.
diff --git a/merge-recursive.c b/merge-recursive.c
index 5a2d8a6..b83a129 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -82,7 +82,7 @@ static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap,
{
struct dir_rename_entry key;
- if (dir == NULL)
+ if (!dir)
return NULL;
hashmap_entry_init(&key.ent, strhash(dir));
key.dir = dir;
@@ -334,7 +334,9 @@ static void output(struct merge_options *opt, int v, const char *fmt, ...)
flush_output(opt);
}
-static void output_commit_title(struct merge_options *opt, struct commit *commit)
+static void repo_output_commit_title(struct merge_options *opt,
+ struct repository *repo,
+ struct commit *commit)
{
struct merge_remote_desc *desc;
@@ -343,23 +345,29 @@ static void output_commit_title(struct merge_options *opt, struct commit *commit
if (desc)
strbuf_addf(&opt->obuf, "virtual %s\n", desc->name);
else {
- strbuf_add_unique_abbrev(&opt->obuf, &commit->object.oid,
- DEFAULT_ABBREV);
+ strbuf_repo_add_unique_abbrev(&opt->obuf, repo,
+ &commit->object.oid,
+ DEFAULT_ABBREV);
strbuf_addch(&opt->obuf, ' ');
- if (parse_commit(commit) != 0)
+ if (repo_parse_commit(repo, commit) != 0)
strbuf_addstr(&opt->obuf, _("(bad commit)\n"));
else {
const char *title;
- const char *msg = get_commit_buffer(commit, NULL);
+ const char *msg = repo_get_commit_buffer(repo, commit, NULL);
int len = find_commit_subject(msg, &title);
if (len)
strbuf_addf(&opt->obuf, "%.*s\n", len, title);
- unuse_commit_buffer(commit, msg);
+ repo_unuse_commit_buffer(repo, commit, msg);
}
}
flush_output(opt);
}
+static void output_commit_title(struct merge_options *opt, struct commit *commit)
+{
+ repo_output_commit_title(opt, the_repository, commit);
+}
+
static int add_cacheinfo(struct merge_options *opt,
const struct diff_filespec *blob,
const char *path, int stage, int refresh, int options)
@@ -409,8 +417,11 @@ static int unpack_trees_start(struct merge_options *opt,
memset(&opt->priv->unpack_opts, 0, sizeof(opt->priv->unpack_opts));
if (opt->priv->call_depth)
opt->priv->unpack_opts.index_only = 1;
- else
+ else {
opt->priv->unpack_opts.update = 1;
+ /* FIXME: should only do this if !overwrite_ignore */
+ opt->priv->unpack_opts.preserve_ignored = 0;
+ }
opt->priv->unpack_opts.merge = 1;
opt->priv->unpack_opts.head_idx = 2;
opt->priv->unpack_opts.fn = threeway_merge;
@@ -511,10 +522,10 @@ static struct stage_data *insert_stage_data(struct repository *r,
*/
static struct string_list *get_unmerged(struct index_state *istate)
{
- struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
+ struct string_list *unmerged = xmalloc(sizeof(struct string_list));
int i;
- unmerged->strdup_strings = 1;
+ string_list_init_dup(unmerged);
/* TODO: audit for interaction with sparse-index. */
ensure_full_index(istate);
@@ -1033,7 +1044,7 @@ static int merge_3way(struct merge_options *opt,
mmfile_t orig, src1, src2;
struct ll_merge_options ll_opts = {0};
char *base, *name1, *name2;
- int merge_status;
+ enum ll_merge_result merge_status;
ll_opts.renormalize = opt->renormalize;
ll_opts.extra_marker_size = extra_marker_size;
@@ -1079,6 +1090,9 @@ static int merge_3way(struct merge_options *opt,
merge_status = ll_merge(result_buf, a->path, &orig, base,
&src1, name1, &src2, name2,
opt->repo->index, &ll_opts);
+ if (merge_status == LL_MERGE_BINARY_CONFLICT)
+ warning("Cannot merge binary files: %s (%s vs. %s)",
+ a->path, name1, name2);
free(base);
free(name1);
@@ -1146,17 +1160,18 @@ static int find_first_merges(struct repository *repo,
}
object_array_clear(&merges);
+ release_revisions(&revs);
return result->nr;
}
-static void print_commit(struct commit *commit)
+static void print_commit(struct repository *repo, struct commit *commit)
{
struct strbuf sb = STRBUF_INIT;
struct pretty_print_context ctx = {0};
ctx.date_mode.type = DATE_NORMAL;
/* FIXME: Merge this with output_commit_title() */
assert(!merge_remote_util(commit));
- format_commit_message(commit, " %h: %m %s", &sb, &ctx);
+ repo_format_commit_message(repo, commit, " %h: %m %s", &sb, &ctx);
fprintf(stderr, "%s\n", sb.buf);
strbuf_release(&sb);
}
@@ -1196,15 +1211,6 @@ static int merge_submodule(struct merge_options *opt,
if (is_null_oid(b))
return 0;
- /*
- * NEEDSWORK: Remove this when all submodule object accesses are
- * through explicitly specified repositores.
- */
- if (add_submodule_odb(path)) {
- output(opt, 1, _("Failed to merge submodule %s (not checked out)"), path);
- return 0;
- }
-
if (repo_submodule_init(&subrepo, opt->repo, path, null_oid())) {
output(opt, 1, _("Failed to merge submodule %s (not checked out)"), path);
return 0;
@@ -1229,7 +1235,7 @@ static int merge_submodule(struct merge_options *opt,
oidcpy(result, b);
if (show(opt, 3)) {
output(opt, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
- output_commit_title(opt, commit_b);
+ repo_output_commit_title(opt, &subrepo, commit_b);
} else if (show(opt, 2))
output(opt, 2, _("Fast-forwarding submodule %s"), path);
else
@@ -1242,7 +1248,7 @@ static int merge_submodule(struct merge_options *opt,
oidcpy(result, a);
if (show(opt, 3)) {
output(opt, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
- output_commit_title(opt, commit_a);
+ repo_output_commit_title(opt, &subrepo, commit_a);
} else if (show(opt, 2))
output(opt, 2, _("Fast-forwarding submodule %s"), path);
else
@@ -1274,7 +1280,7 @@ static int merge_submodule(struct merge_options *opt,
case 1:
output(opt, 1, _("Failed to merge submodule %s (not fast-forward)"), path);
output(opt, 2, _("Found a possible merge resolution for the submodule:\n"));
- print_commit((struct commit *) merges.objects[0].item);
+ print_commit(&subrepo, (struct commit *) merges.objects[0].item);
output(opt, 2, _(
"If this is correct simply add it to the index "
"for example\n"
@@ -1287,7 +1293,7 @@ static int merge_submodule(struct merge_options *opt,
default:
output(opt, 1, _("Failed to merge submodule %s (multiple merges found)"), path);
for (i = 0; i < merges.nr; i++)
- print_commit((struct commit *) merges.objects[i].item);
+ print_commit(&subrepo, (struct commit *) merges.objects[i].item);
}
object_array_clear(&merges);
@@ -1371,7 +1377,7 @@ static int merge_mode_and_contents(struct merge_options *opt,
if (!ret &&
write_object_file(result_buf.ptr, result_buf.size,
- blob_type, &result->blob.oid))
+ OBJ_BLOB, &result->blob.oid))
ret = err(opt, _("Unable to add %s to database"),
a->path);
@@ -1985,14 +1991,14 @@ static void get_renamed_dir_portion(const char *old_path, const char *new_path,
* renamed means the root directory can never be renamed -- because
* the root directory always exists).
*/
- if (end_of_old == NULL)
+ if (!end_of_old)
return; /* Note: *old_dir and *new_dir are still NULL */
/*
* If new_path contains no directory (end_of_new is NULL), then we
* have a rename of old_path's directory to the root directory.
*/
- if (end_of_new == NULL) {
+ if (!end_of_new) {
*old_dir = xstrndup(old_path, end_of_old - old_path);
*new_dir = xstrdup("");
return;
@@ -2111,7 +2117,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt,
* to ensure that's the case.
*/
collision_ent = collision_find_entry(collisions, new_path);
- if (collision_ent == NULL)
+ if (!collision_ent)
BUG("collision_ent is NULL");
/*
@@ -2991,7 +2997,7 @@ static void final_cleanup_rename(struct string_list *rename)
const struct rename *re;
int i;
- if (rename == NULL)
+ if (!rename)
return;
for (i = 0; i < rename->nr; i++) {
@@ -3600,7 +3606,7 @@ static int merge_recursive_internal(struct merge_options *opt,
}
merged_merge_bases = pop_commit(&merge_bases);
- if (merged_merge_bases == NULL) {
+ if (!merged_merge_bases) {
/* if there is no common ancestor, use an empty tree */
struct tree *tree;
@@ -3709,6 +3715,10 @@ static int merge_start(struct merge_options *opt, struct tree *head)
assert(opt->priv == NULL);
+ /* Not supported; option specific to merge-ort */
+ assert(!opt->record_conflict_msgs_as_headers);
+ assert(!opt->msg_header_prefix);
+
/* Sanity check on repo state; index must match head */
if (repo_index_has_changes(opt->repo, head, &sb)) {
err(opt, _("Your local changes to the following files would be overwritten by merge:\n %s"),
diff --git a/merge-recursive.h b/merge-recursive.h
index 0795a1d..b88000e 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -46,6 +46,8 @@ struct merge_options {
/* miscellaneous control options */
const char *subtree_shift;
unsigned renormalize : 1;
+ unsigned record_conflict_msgs_as_headers : 1;
+ const char *msg_header_prefix;
/* internal fields used by the implementation */
struct merge_options_internal *priv;
diff --git a/merge.c b/merge.c
index 6e73688..2382ff6 100644
--- a/merge.c
+++ b/merge.c
@@ -53,7 +53,6 @@ int checkout_fast_forward(struct repository *r,
struct unpack_trees_options opts;
struct tree_desc t[MAX_UNPACK_TREES];
int i, nr_trees = 0;
- struct dir_struct dir = DIR_INIT;
struct lock_file lock_file = LOCK_INIT;
refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
@@ -80,11 +79,7 @@ int checkout_fast_forward(struct repository *r,
}
memset(&opts, 0, sizeof(opts));
- if (overwrite_ignore) {
- dir.flags |= DIR_SHOW_IGNORED;
- setup_standard_excludes(&dir);
- opts.dir = &dir;
- }
+ opts.preserve_ignored = !overwrite_ignore;
opts.head_idx = 1;
opts.src_index = r->index;
@@ -101,7 +96,6 @@ int checkout_fast_forward(struct repository *r,
clear_unpack_trees_porcelain(&opts);
return -1;
}
- dir_clear(&dir);
clear_unpack_trees_porcelain(&opts);
if (write_locked_index(r->index, &lock_file, COMMIT_LOCK))
diff --git a/mergesort.c b/mergesort.c
index e5fdf2e..bd9c6ef 100644
--- a/mergesort.c
+++ b/mergesort.c
@@ -1,73 +1,84 @@
#include "cache.h"
#include "mergesort.h"
-struct mergesort_sublist {
- void *ptr;
- unsigned long len;
-};
-
-static void *get_nth_next(void *list, unsigned long n,
- void *(*get_next_fn)(const void *))
+/* Combine two sorted lists. Take from `list` on equality. */
+static void *llist_merge(void *list, void *other,
+ void *(*get_next_fn)(const void *),
+ void (*set_next_fn)(void *, void *),
+ int (*compare_fn)(const void *, const void *))
{
- while (n-- && list)
- list = get_next_fn(list);
- return list;
+ void *result = list, *tail;
+
+ if (compare_fn(list, other) > 0) {
+ result = other;
+ goto other;
+ }
+ for (;;) {
+ do {
+ tail = list;
+ list = get_next_fn(list);
+ if (!list) {
+ set_next_fn(tail, other);
+ return result;
+ }
+ } while (compare_fn(list, other) <= 0);
+ set_next_fn(tail, other);
+ other:
+ do {
+ tail = other;
+ other = get_next_fn(other);
+ if (!other) {
+ set_next_fn(tail, list);
+ return result;
+ }
+ } while (compare_fn(list, other) > 0);
+ set_next_fn(tail, list);
+ }
}
-static void *pop_item(struct mergesort_sublist *l,
- void *(*get_next_fn)(const void *))
-{
- void *p = l->ptr;
- l->ptr = get_next_fn(l->ptr);
- l->len = l->ptr ? (l->len - 1) : 0;
- return p;
-}
-
+/*
+ * Perform an iterative mergesort using an array of sublists.
+ *
+ * n is the number of items.
+ * ranks[i] is undefined if n & 2^i == 0, and assumed empty.
+ * ranks[i] contains a sublist of length 2^i otherwise.
+ *
+ * The number of bits in a void pointer limits the number of objects
+ * that can be created, and thus the number of array elements necessary
+ * to be able to sort any valid list.
+ *
+ * Adding an item to this array is like incrementing a binary number;
+ * positional values for set bits correspond to sublist lengths.
+ */
void *llist_mergesort(void *list,
void *(*get_next_fn)(const void *),
void (*set_next_fn)(void *, void *),
int (*compare_fn)(const void *, const void *))
{
- unsigned long l;
+ void *ranks[bitsizeof(void *)];
+ size_t n = 0;
+ int i;
- if (!list)
- return NULL;
- for (l = 1; ; l *= 2) {
- void *curr;
- struct mergesort_sublist p, q;
+ while (list) {
+ void *next = get_next_fn(list);
+ if (next)
+ set_next_fn(list, NULL);
+ for (i = 0; n & ((size_t)1 << i); i++)
+ list = llist_merge(ranks[i], list, get_next_fn,
+ set_next_fn, compare_fn);
+ n++;
+ ranks[i] = list;
+ list = next;
+ }
- p.ptr = list;
- q.ptr = get_nth_next(p.ptr, l, get_next_fn);
- if (!q.ptr)
- break;
- p.len = q.len = l;
-
- if (compare_fn(p.ptr, q.ptr) > 0)
- list = curr = pop_item(&q, get_next_fn);
+ for (i = 0; n; i++, n >>= 1) {
+ if (!(n & 1))
+ continue;
+ if (list)
+ list = llist_merge(ranks[i], list, get_next_fn,
+ set_next_fn, compare_fn);
else
- list = curr = pop_item(&p, get_next_fn);
-
- while (p.ptr) {
- while (p.len || q.len) {
- void *prev = curr;
-
- if (!p.len)
- curr = pop_item(&q, get_next_fn);
- else if (!q.len)
- curr = pop_item(&p, get_next_fn);
- else if (compare_fn(p.ptr, q.ptr) > 0)
- curr = pop_item(&q, get_next_fn);
- else
- curr = pop_item(&p, get_next_fn);
- set_next_fn(prev, curr);
- }
- p.ptr = q.ptr;
- p.len = l;
- q.ptr = get_nth_next(p.ptr, l, get_next_fn);
- q.len = q.ptr ? l : 0;
-
- }
- set_next_fn(curr, NULL);
+ list = ranks[i];
}
return list;
}
diff --git a/mergetools/araxis b/mergetools/araxis
index e2407b6..eb32a7d 100644
--- a/mergetools/araxis
+++ b/mergetools/araxis
@@ -2,6 +2,10 @@
"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
}
+diff_cmd_help () {
+ echo "Use Araxis Merge (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -13,6 +17,10 @@
fi
}
+merge_cmd_help () {
+ echo "Use Araxis Merge (requires a graphical session)"
+}
+
translate_merge_tool_path() {
echo compare
}
diff --git a/mergetools/bc b/mergetools/bc
index 26c19d4..2922667 100644
--- a/mergetools/bc
+++ b/mergetools/bc
@@ -2,6 +2,10 @@
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
+diff_cmd_help () {
+ echo "Use Beyond Compare (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -13,6 +17,10 @@
fi
}
+merge_cmd_help () {
+ echo "Use Beyond Compare (requires a graphical session)"
+}
+
translate_merge_tool_path() {
if type bcomp >/dev/null 2>/dev/null
then
diff --git a/mergetools/codecompare b/mergetools/codecompare
index 9f60e8d..610963d 100644
--- a/mergetools/codecompare
+++ b/mergetools/codecompare
@@ -2,6 +2,10 @@
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
+diff_cmd_help () {
+ echo "Use Code Compare (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -13,6 +17,10 @@
fi
}
+merge_cmd_help () {
+ echo "Use Code Compare (requires a graphical session)"
+}
+
translate_merge_tool_path() {
if merge_mode
then
diff --git a/mergetools/deltawalker b/mergetools/deltawalker
index ee6f374..efae4c2 100644
--- a/mergetools/deltawalker
+++ b/mergetools/deltawalker
@@ -2,6 +2,10 @@
"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}
+diff_cmd_help () {
+ echo "Use DeltaWalker (requires a graphical session)"
+}
+
merge_cmd () {
# Adding $(pwd)/ in front of $MERGED should not be necessary.
# However without it, DeltaWalker (at least v1.9.8 on Windows)
@@ -16,6 +20,10 @@
fi >/dev/null 2>&1
}
+merge_cmd_help () {
+ echo "Use DeltaWalker (requires a graphical session)"
+}
+
translate_merge_tool_path () {
echo DeltaWalker
}
diff --git a/mergetools/diffmerge b/mergetools/diffmerge
index 9b6355b..9b5b62d 100644
--- a/mergetools/diffmerge
+++ b/mergetools/diffmerge
@@ -2,6 +2,10 @@
"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}
+diff_cmd_help () {
+ echo "Use DiffMerge (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -13,6 +17,10 @@
fi
}
+merge_cmd_help () {
+ echo "Use DiffMerge (requires a graphical session)"
+}
+
exit_code_trustable () {
true
}
diff --git a/mergetools/diffuse b/mergetools/diffuse
index 5a3ae8b..ebfaba5 100644
--- a/mergetools/diffuse
+++ b/mergetools/diffuse
@@ -2,6 +2,10 @@
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}
+diff_cmd_help () {
+ echo "Use Diffuse (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -13,3 +17,7 @@
"$LOCAL" "$MERGED" "$REMOTE" | cat
fi
}
+
+merge_cmd_help () {
+ echo "Use Diffuse (requires a graphical session)"
+}
diff --git a/mergetools/ecmerge b/mergetools/ecmerge
index 6c5101c..0d4d609 100644
--- a/mergetools/ecmerge
+++ b/mergetools/ecmerge
@@ -2,6 +2,10 @@
"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
}
+diff_cmd_help () {
+ echo "Use ECMerge (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -12,3 +16,7 @@
--default --mode=merge2 --to="$MERGED"
fi
}
+
+merge_cmd_help () {
+ echo "Use ECMerge (requires a graphical session)"
+}
diff --git a/mergetools/emerge b/mergetools/emerge
index d1ce513..fc6892c 100644
--- a/mergetools/emerge
+++ b/mergetools/emerge
@@ -2,6 +2,10 @@
"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
}
+diff_cmd_help () {
+ echo "Use Emacs' Emerge"
+}
+
merge_cmd () {
if $base_present
then
@@ -17,6 +21,10 @@
fi
}
+merge_cmd_help () {
+ echo "Use Emacs' Emerge"
+}
+
translate_merge_tool_path() {
echo emacs
}
diff --git a/mergetools/examdiff b/mergetools/examdiff
index e72b06f..6f53ca9 100644
--- a/mergetools/examdiff
+++ b/mergetools/examdiff
@@ -2,6 +2,10 @@
"$merge_tool_path" "$LOCAL" "$REMOTE" -nh
}
+diff_cmd_help () {
+ echo "Use ExamDiff Pro (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -11,6 +15,10 @@
fi
}
+merge_cmd_help () {
+ echo "Use ExamDiff Pro (requires a graphical session)"
+}
+
translate_merge_tool_path() {
mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
}
diff --git a/mergetools/guiffy b/mergetools/guiffy
index 8b23a13..3ed07ef 100644
--- a/mergetools/guiffy
+++ b/mergetools/guiffy
@@ -2,6 +2,10 @@
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
+diff_cmd_help () {
+ echo "Use Guiffy's Diff Tool (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -13,6 +17,10 @@
fi
}
+merge_cmd_help () {
+ echo "Use Guiffy's Diff Tool (requires a graphical session)"
+}
+
exit_code_trustable () {
true
}
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
index 520cb91..ee8b3a05 100644
--- a/mergetools/kdiff3
+++ b/mergetools/kdiff3
@@ -4,6 +4,10 @@
"$LOCAL" "$REMOTE" >/dev/null 2>&1
}
+diff_cmd_help () {
+ echo "Use KDiff3 (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -22,6 +26,10 @@
fi
}
+merge_cmd_help () {
+ echo "Use KDiff3 (requires a graphical session)"
+}
+
exit_code_trustable () {
true
}
diff --git a/mergetools/kompare b/mergetools/kompare
index e8c0bfa..4ce23db 100644
--- a/mergetools/kompare
+++ b/mergetools/kompare
@@ -2,10 +2,18 @@
return 1
}
+diff_cmd_help () {
+ echo "Use Kompare (requires a graphical session)"
+}
+
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
+merge_cmd_help () {
+ echo "Use Kompare (requires a graphical session)"
+}
+
exit_code_trustable () {
true
}
diff --git a/mergetools/meld b/mergetools/meld
index aab4ebb..8ec0867 100644
--- a/mergetools/meld
+++ b/mergetools/meld
@@ -2,6 +2,10 @@
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
+diff_cmd_help () {
+ echo "Use Meld (requires a graphical session)"
+}
+
merge_cmd () {
check_meld_for_features
@@ -20,6 +24,10 @@
fi
}
+merge_cmd_help () {
+ echo "Use Meld (requires a graphical session) with optional \`auto merge\` (see \`git help mergetool\`'s \`CONFIGURATION\` section)"
+}
+
# Get meld help message
init_meld_help_msg () {
if test -z "$meld_help_msg"
diff --git a/mergetools/opendiff b/mergetools/opendiff
index b608dd6..44adf8f 100644
--- a/mergetools/opendiff
+++ b/mergetools/opendiff
@@ -2,6 +2,10 @@
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}
+diff_cmd_help () {
+ echo "Use FileMerge (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -12,3 +16,7 @@
-merge "$MERGED" | cat
fi
}
+
+merge_cmd_help () {
+ echo "Use FileMerge (requires a graphical session)"
+}
diff --git a/mergetools/p4merge b/mergetools/p4merge
index 7a5b291..f3cb197 100644
--- a/mergetools/p4merge
+++ b/mergetools/p4merge
@@ -19,6 +19,10 @@
fi
}
+diff_cmd_help () {
+ echo "Use HelixCore P4Merge (requires a graphical session)"
+}
+
merge_cmd () {
if ! $base_present
then
@@ -34,3 +38,7 @@
printf "%s" "$empty_file"
}
+
+merge_cmd_help () {
+ echo "Use HelixCore P4Merge (requires a graphical session)"
+}
diff --git a/mergetools/smerge b/mergetools/smerge
index 9c2e6f6..5410835 100644
--- a/mergetools/smerge
+++ b/mergetools/smerge
@@ -2,6 +2,10 @@
"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
}
+diff_cmd_help () {
+ echo "Use Sublime Merge (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -10,3 +14,7 @@
"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
fi
}
+
+merge_cmd_help () {
+ echo "Use Sublime Merge (requires a graphical session)"
+}
diff --git a/mergetools/tkdiff b/mergetools/tkdiff
index eee5cb5..66906a7 100644
--- a/mergetools/tkdiff
+++ b/mergetools/tkdiff
@@ -2,6 +2,10 @@
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
+diff_cmd_help () {
+ echo "Use TkDiff (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -14,3 +18,7 @@
exit_code_trustable () {
true
}
+
+merge_cmd_help () {
+ echo "Use TkDiff (requires a graphical session)"
+}
diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge
index d7ab666..507edcd 100644
--- a/mergetools/tortoisemerge
+++ b/mergetools/tortoisemerge
@@ -2,6 +2,10 @@
return 1
}
+diff_cmd_help () {
+ echo "Use TortoiseMerge (requires a graphical session)"
+}
+
merge_cmd () {
if $base_present
then
@@ -30,3 +34,7 @@
echo tortoisemerge
fi
}
+
+merge_cmd_help () {
+ echo "Use TortoiseMerge (requires a graphical session)"
+}
diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index 96f6209..461a89b 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -1,49 +1,495 @@
+# This script can be run in two different contexts:
+#
+# - From git, when the user invokes the "vimdiff" merge tool. In this context
+# this script expects the following environment variables (among others) to
+# be defined (which is something "git" takes care of):
+#
+# - $BASE
+# - $LOCAL
+# - $REMOTE
+# - $MERGED
+#
+# In this mode, all this script does is to run the next command:
+#
+# vim -f -c ... $LOCAL $BASE $REMOTE $MERGED
+#
+# ...where the "..." string depends on the value of the
+# "mergetool.vimdiff.layout" configuration variable and is used to open vim
+# with a certain layout of buffers, windows and tabs.
+#
+# - From a script inside the unit tests framework folder ("t" folder) by
+# sourcing this script and then manually calling "run_unit_tests", which
+# will run a battery of unit tests to make sure nothing breaks.
+# In this context this script does not expect any particular environment
+# variable to be set.
+
+
+################################################################################
+## Internal functions (not meant to be used outside this script)
+################################################################################
+
+debug_print () {
+ # Send message to stderr if global variable GIT_MERGETOOL_VIMDIFF is set
+ # to "true"
+
+ if test -n "$GIT_MERGETOOL_VIMDIFF_DEBUG"
+ then
+ >&2 echo "$@"
+ fi
+}
+
+substring () {
+ # Return a substring of $1 containing $3 characters starting at
+ # zero-based offset $2.
+ #
+ # Examples:
+ #
+ # substring "Hello world" 0 4 --> "Hell"
+ # substring "Hello world" 3 4 --> "lo w"
+ # substring "Hello world" 3 10 --> "lo world"
+
+ STRING=$1
+ START=$2
+ LEN=$3
+
+ echo "$STRING" | cut -c$(( START + 1 ))-$(( START + $LEN ))
+}
+
+gen_cmd_aux () {
+ # Auxiliary function used from "gen_cmd()".
+ # Read that other function documentation for more details.
+
+ LAYOUT=$1
+ CMD=$2 # This is a second (hidden) argument used for recursion
+
+ debug_print
+ debug_print "LAYOUT : $LAYOUT"
+ debug_print "CMD : $CMD"
+
+ if test -z "$CMD"
+ then
+ CMD="echo" # vim "nop" operator
+ fi
+
+ start=0
+ end=${#LAYOUT}
+
+ nested=0
+ nested_min=100
+
+
+ # Step 1:
+ #
+ # Increase/decrease "start"/"end" indices respectively to get rid of
+ # outer parenthesis.
+ #
+ # Example:
+ #
+ # - BEFORE: (( LOCAL , BASE ) / MERGED )
+ # - AFTER : ( LOCAL , BASE ) / MERGED
+
+ oldIFS=$IFS
+ IFS=#
+ for c in $(echo "$LAYOUT" | sed 's:.:&#:g')
+ do
+ if test "$c" = " "
+ then
+ continue
+ fi
+
+ if test "$c" = "("
+ then
+ nested=$(( nested + 1 ))
+ continue
+ fi
+
+ if test "$c" = ")"
+ then
+ nested=$(( nested - 1 ))
+ continue
+ fi
+
+ if test "$nested" -lt "$nested_min"
+ then
+ nested_min=$nested
+ fi
+ done
+ IFS=$oldIFS
+
+ debug_print "NESTED MIN: $nested_min"
+
+ while test "$nested_min" -gt "0"
+ do
+ start=$(( start + 1 ))
+ end=$(( end - 1 ))
+
+ start_minus_one=$(( start - 1 ))
+
+ while ! test "$(substring "$LAYOUT" "$start_minus_one" 1)" = "("
+ do
+ start=$(( start + 1 ))
+ start_minus_one=$(( start_minus_one + 1 ))
+ done
+
+ while ! test "$(substring "$LAYOUT" "$end" 1)" = ")"
+ do
+ end=$(( end - 1 ))
+ done
+
+ nested_min=$(( nested_min - 1 ))
+ done
+
+ debug_print "CLEAN : $(substring "$LAYOUT" "$start" "$(( end - start ))")"
+
+
+ # Step 2:
+ #
+ # Search for all valid separators ("+", "/" or ",") which are *not*
+ # inside parenthesis. Save the index at which each of them makes the
+ # first appearance.
+
+ index_new_tab=""
+ index_horizontal_split=""
+ index_vertical_split=""
+
+ nested=0
+ i=$(( start - 1 ))
+
+ oldIFS=$IFS
+ IFS=#
+ for c in $(substring "$LAYOUT" "$start" "$(( end - start ))" | sed 's:.:&#:g');
+ do
+ i=$(( i + 1 ))
+
+ if test "$c" = " "
+ then
+ continue
+ fi
+
+ if test "$c" = "("
+ then
+ nested=$(( nested + 1 ))
+ continue
+ fi
+
+ if test "$c" = ")"
+ then
+ nested=$(( nested - 1 ))
+ continue
+ fi
+
+ if test "$nested" = 0
+ then
+ current=$c
+
+ if test "$current" = "+"
+ then
+ if test -z "$index_new_tab"
+ then
+ index_new_tab=$i
+ fi
+
+ elif test "$current" = "/"
+ then
+ if test -z "$index_horizontal_split"
+ then
+ index_horizontal_split=$i
+ fi
+
+ elif test "$current" = ","
+ then
+ if test -z "$index_vertical_split"
+ then
+ index_vertical_split=$i
+ fi
+ fi
+ fi
+ done
+ IFS=$oldIFS
+
+
+ # Step 3:
+ #
+ # Process the separator with the highest order of precedence
+ # (";" has the highest precedence and "|" the lowest one).
+ #
+ # By "process" I mean recursively call this function twice: the first
+ # one with the substring at the left of the separator and the second one
+ # with the one at its right.
+
+ terminate="false"
+
+ if ! test -z "$index_new_tab"
+ then
+ before="-tabnew"
+ after="tabnext"
+ index=$index_new_tab
+ terminate="true"
+
+ elif ! test -z "$index_horizontal_split"
+ then
+ before="split"
+ after="wincmd j"
+ index=$index_horizontal_split
+ terminate="true"
+
+ elif ! test -z "$index_vertical_split"
+ then
+ before="vertical split"
+ after="wincmd l"
+ index=$index_vertical_split
+ terminate="true"
+ fi
+
+ if test "$terminate" = "true"
+ then
+ CMD="$CMD | $before"
+ CMD=$(gen_cmd_aux "$(substring "$LAYOUT" "$start" "$(( index - start ))")" "$CMD")
+ CMD="$CMD | $after"
+ CMD=$(gen_cmd_aux "$(substring "$LAYOUT" "$(( index + 1 ))" "$(( ${#LAYOUT} - index ))")" "$CMD")
+ echo "$CMD"
+ return
+ fi
+
+
+ # Step 4:
+ #
+ # If we reach this point, it means there are no separators and we just
+ # need to print the command to display the specified buffer
+
+ target=$(substring "$LAYOUT" "$start" "$(( end - start ))" | sed 's:[ @();|-]::g')
+
+ if test "$target" = "LOCAL"
+ then
+ CMD="$CMD | 1b"
+
+ elif test "$target" = "BASE"
+ then
+ CMD="$CMD | 2b"
+
+ elif test "$target" = "REMOTE"
+ then
+ CMD="$CMD | 3b"
+
+ elif test "$target" = "MERGED"
+ then
+ CMD="$CMD | 4b"
+
+ else
+ CMD="$CMD | ERROR: >$target<"
+ fi
+
+ echo "$CMD"
+ return
+}
+
+
+gen_cmd () {
+ # This function returns (in global variable FINAL_CMD) the string that
+ # you can use when invoking "vim" (as shown next) to obtain a given
+ # layout:
+ #
+ # $ vim -f $FINAL_CMD "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
+ #
+ # It takes one single argument: a string containing the desired layout
+ # definition.
+ #
+ # The syntax of the "layout definitions" is explained in "Documentation/
+ # mergetools/vimdiff.txt" but you can already intuitively understand how
+ # it works by knowing that...
+ #
+ # * "+" means "a new vim tab"
+ # * "/" means "a new vim horizontal split"
+ # * "," means "a new vim vertical split"
+ #
+ # It also returns (in global variable FINAL_TARGET) the name ("LOCAL",
+ # "BASE", "REMOTE" or "MERGED") of the file that is marked with an "@",
+ # or "MERGED" if none of them is.
+ #
+ # Example:
+ #
+ # gen_cmd "@LOCAL , REMOTE"
+ # |
+ # `-> FINAL_CMD == "-c \"echo | vertical split | 1b | wincmd l | 3b | tabdo windo diffthis\" -c \"tabfirst\""
+ # FINAL_TARGET == "LOCAL"
+
+ LAYOUT=$1
+
+
+ # Search for a "@" in one of the files identifiers ("LOCAL", "BASE",
+ # "REMOTE", "MERGED"). If not found, use "MERGE" as the default file
+ # where changes will be saved.
+
+ if echo "$LAYOUT" | grep @LOCAL >/dev/null
+ then
+ FINAL_TARGET="LOCAL"
+ elif echo "$LAYOUT" | grep @BASE >/dev/null
+ then
+ FINAL_TARGET="BASE"
+ else
+ FINAL_TARGET="MERGED"
+ fi
+
+
+ # Obtain the first part of vim "-c" option to obtain the desired layout
+
+ CMD=$(gen_cmd_aux "$LAYOUT")
+
+
+ # Adjust the just obtained script depending on whether more than one
+ # windows are visible or not
+
+ if echo "$LAYOUT" | grep ",\|/" >/dev/null
+ then
+ CMD="$CMD | tabdo windo diffthis"
+ else
+ CMD="$CMD | bufdo diffthis"
+ fi
+
+
+ # Add an extra "-c" option to move to the first tab (notice that we
+ # can't simply append the command to the previous "-c" string as
+ # explained here: https://github.com/vim/vim/issues/9076
+
+ FINAL_CMD="-c \"$CMD\" -c \"tabfirst\""
+}
+
+
+################################################################################
+## API functions (called from "git-mergetool--lib.sh")
+################################################################################
+
diff_cmd () {
"$merge_tool_path" -R -f -d \
-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
}
+
+diff_cmd_help () {
+ TOOL=$1
+
+ case "$TOOL" in
+ nvimdiff*)
+ printf "Use Neovim"
+ ;;
+ gvimdiff*)
+ printf "Use gVim (requires a graphical session)"
+ ;;
+ vimdiff*)
+ printf "Use Vim"
+ ;;
+ esac
+
+ return 0
+}
+
+
merge_cmd () {
+ layout=$(git config mergetool.vimdiff.layout)
+
case "$1" in
*vimdiff)
- if $base_present
+ if test -z "$layout"
then
- "$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
- "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
- else
- "$merge_tool_path" -f -d -c 'wincmd l' \
- "$LOCAL" "$MERGED" "$REMOTE"
+ # Default layout when none is specified
+ layout="(LOCAL,BASE,REMOTE)/MERGED"
fi
;;
*vimdiff1)
- "$merge_tool_path" -f -d \
- -c 'echon "Resolve conflicts leftward then save. Use :cq to abort."' \
- "$LOCAL" "$REMOTE"
- ret="$?"
- if test "$ret" -eq 0
- then
- cp -- "$LOCAL" "$MERGED"
- fi
- return "$ret"
+ layout="@LOCAL,REMOTE"
;;
*vimdiff2)
- "$merge_tool_path" -f -d -c 'wincmd l' \
- "$LOCAL" "$MERGED" "$REMOTE"
+ layout="LOCAL,MERGED,REMOTE"
;;
*vimdiff3)
- if $base_present
- then
- "$merge_tool_path" -f -d -c 'hid | hid | hid' \
- "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
- else
- "$merge_tool_path" -f -d -c 'hid | hid' \
- "$LOCAL" "$REMOTE" "$MERGED"
- fi
+ layout="MERGED"
;;
esac
+
+ gen_cmd "$layout"
+
+ debug_print ""
+ debug_print "FINAL CMD : $FINAL_CMD"
+ debug_print "FINAL TAR : $FINAL_TARGET"
+
+ if $base_present
+ then
+ eval "$merge_tool_path" \
+ -f "$FINAL_CMD" "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
+ else
+ # If there is no BASE (example: a merge conflict in a new file
+ # with the same name created in both braches which didn't exist
+ # before), close all BASE windows using vim's "quit" command
+
+ FINAL_CMD=$(echo "$FINAL_CMD" | \
+ sed -e 's:2b:quit:g' -e 's:3b:2b:g' -e 's:4b:3b:g')
+
+ eval "$merge_tool_path" \
+ -f "$FINAL_CMD" "$LOCAL" "$REMOTE" "$MERGED"
+ fi
+
+ ret="$?"
+
+ if test "$ret" -eq 0
+ then
+ case "$FINAL_TARGET" in
+ LOCAL)
+ source_path="$LOCAL"
+ ;;
+ REMOTE)
+ source_path="$REMOTE"
+ ;;
+ MERGED|*)
+ # Do nothing
+ source_path=
+ ;;
+ esac
+
+ if test -n "$source_path"
+ then
+ cp "$source_path" "$MERGED"
+ fi
+ fi
+
+ return "$ret"
}
-translate_merge_tool_path() {
+
+merge_cmd_help () {
+ TOOL=$1
+
+ case "$TOOL" in
+ nvimdiff*)
+ printf "Use Neovim "
+ ;;
+ gvimdiff*)
+ printf "Use gVim (requires a graphical session) "
+ ;;
+ vimdiff*)
+ printf "Use Vim "
+ ;;
+ esac
+
+ case "$TOOL" in
+ *1)
+ echo "with a 2 panes layout (LOCAL and REMOTE)"
+ ;;
+ *2)
+ echo "with a 3 panes layout (LOCAL, MERGED and REMOTE)"
+ ;;
+ *3)
+ echo "where only the MERGED file is shown"
+ ;;
+ *)
+ echo "with a custom layout (see \`git help mergetool\`'s \`BACKEND SPECIFIC HINTS\` section)"
+ ;;
+ esac
+
+ return 0
+}
+
+
+translate_merge_tool_path () {
case "$1" in
nvimdiff*)
echo nvim
@@ -57,14 +503,121 @@
esac
}
+
exit_code_trustable () {
true
}
+
list_tool_variants () {
- for prefix in '' g n; do
- for suffix in '' 1 2 3; do
- echo "${prefix}vimdiff${suffix}"
+ if test "$TOOL_MODE" = "diff"
+ then
+ for prefix in '' g n
+ do
+ echo "${prefix}vimdiff"
done
+ else
+ for prefix in '' g n
+ do
+ for suffix in '' 1 2 3
+ do
+ echo "${prefix}vimdiff${suffix}"
+ done
+ done
+ fi
+}
+
+
+################################################################################
+## Unit tests (called from scripts inside the "t" folder)
+################################################################################
+
+run_unit_tests () {
+ # Function to make sure that we don't break anything when modifying this
+ # script.
+
+ NUMBER_OF_TEST_CASES=16
+
+ TEST_CASE_01="(LOCAL,BASE,REMOTE)/MERGED" # default behaviour
+ TEST_CASE_02="@LOCAL,REMOTE" # when using vimdiff1
+ TEST_CASE_03="LOCAL,MERGED,REMOTE" # when using vimdiff2
+ TEST_CASE_04="MERGED" # when using vimdiff3
+ TEST_CASE_05="LOCAL/MERGED/REMOTE"
+ TEST_CASE_06="(LOCAL/REMOTE),MERGED"
+ TEST_CASE_07="MERGED,(LOCAL/REMOTE)"
+ TEST_CASE_08="(LOCAL,REMOTE)/MERGED"
+ TEST_CASE_09="MERGED/(LOCAL,REMOTE)"
+ TEST_CASE_10="(LOCAL/BASE/REMOTE),MERGED"
+ TEST_CASE_11="(LOCAL,BASE,REMOTE)/MERGED+BASE,LOCAL+BASE,REMOTE+(LOCAL/BASE/REMOTE),MERGED"
+ TEST_CASE_12="((LOCAL,REMOTE)/BASE),MERGED"
+ TEST_CASE_13="((LOCAL,REMOTE)/BASE),((LOCAL/REMOTE),MERGED)"
+ TEST_CASE_14="BASE,REMOTE+BASE,LOCAL"
+ TEST_CASE_15=" (( (LOCAL , BASE , REMOTE) / MERGED)) +(BASE) , LOCAL+ BASE , REMOTE+ (((LOCAL / BASE / REMOTE)) , MERGED ) "
+ TEST_CASE_16="LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE + (LOCAL / BASE / REMOTE),MERGED"
+
+ EXPECTED_CMD_01="-c \"echo | split | vertical split | 1b | wincmd l | vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_02="-c \"echo | vertical split | 1b | wincmd l | 3b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_03="-c \"echo | vertical split | 1b | wincmd l | vertical split | 4b | wincmd l | 3b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_04="-c \"echo | 4b | bufdo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_05="-c \"echo | split | 1b | wincmd j | split | 4b | wincmd j | 3b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_06="-c \"echo | vertical split | split | 1b | wincmd j | 3b | wincmd l | 4b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_07="-c \"echo | vertical split | 4b | wincmd l | split | 1b | wincmd j | 3b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_08="-c \"echo | split | vertical split | 1b | wincmd l | 3b | wincmd j | 4b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_09="-c \"echo | split | 4b | wincmd j | vertical split | 1b | wincmd l | 3b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_10="-c \"echo | vertical split | split | 1b | wincmd j | split | 2b | wincmd j | 3b | wincmd l | 4b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_11="-c \"echo | -tabnew | split | vertical split | 1b | wincmd l | vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabnext | -tabnew | vertical split | 2b | wincmd l | 1b | tabnext | -tabnew | vertical split | 2b | wincmd l | 3b | tabnext | vertical split | split | 1b | wincmd j | split | 2b | wincmd j | 3b | wincmd l | 4b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_12="-c \"echo | vertical split | split | vertical split | 1b | wincmd l | 3b | wincmd j | 2b | wincmd l | 4b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_13="-c \"echo | vertical split | split | vertical split | 1b | wincmd l | 3b | wincmd j | 2b | wincmd l | vertical split | split | 1b | wincmd j | 3b | wincmd l | 4b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_14="-c \"echo | -tabnew | vertical split | 2b | wincmd l | 3b | tabnext | vertical split | 2b | wincmd l | 1b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_15="-c \"echo | -tabnew | split | vertical split | 1b | wincmd l | vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabnext | -tabnew | vertical split | 2b | wincmd l | 1b | tabnext | -tabnew | vertical split | 2b | wincmd l | 3b | tabnext | vertical split | split | 1b | wincmd j | split | 2b | wincmd j | 3b | wincmd l | 4b | tabdo windo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_16="-c \"echo | -tabnew | split | vertical split | 1b | wincmd l | vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabnext | -tabnew | vertical split | 2b | wincmd l | 1b | tabnext | -tabnew | vertical split | 2b | wincmd l | 3b | tabnext | vertical split | split | 1b | wincmd j | split | 2b | wincmd j | 3b | wincmd l | 4b | tabdo windo diffthis\" -c \"tabfirst\""
+
+ EXPECTED_TARGET_01="MERGED"
+ EXPECTED_TARGET_02="LOCAL"
+ EXPECTED_TARGET_03="MERGED"
+ EXPECTED_TARGET_04="MERGED"
+ EXPECTED_TARGET_05="MERGED"
+ EXPECTED_TARGET_06="MERGED"
+ EXPECTED_TARGET_07="MERGED"
+ EXPECTED_TARGET_08="MERGED"
+ EXPECTED_TARGET_09="MERGED"
+ EXPECTED_TARGET_10="MERGED"
+ EXPECTED_TARGET_11="MERGED"
+ EXPECTED_TARGET_12="MERGED"
+ EXPECTED_TARGET_13="MERGED"
+ EXPECTED_TARGET_14="MERGED"
+ EXPECTED_TARGET_15="MERGED"
+ EXPECTED_TARGET_16="MERGED"
+
+ at_least_one_ko="false"
+
+ for i in $(seq -w 1 99)
+ do
+ if test "$i" -gt $NUMBER_OF_TEST_CASES
+ then
+ break
+ fi
+
+ gen_cmd "$(eval echo \${TEST_CASE_"$i"})"
+
+ if test "$FINAL_CMD" = "$(eval echo \${EXPECTED_CMD_"$i"})" \
+ && test "$FINAL_TARGET" = "$(eval echo \${EXPECTED_TARGET_"$i"})"
+ then
+ printf "Test Case #%02d: OK\n" "$(echo "$i" | sed 's/^0*//')"
+ else
+ printf "Test Case #%02d: KO !!!!\n" "$(echo "$i" | sed 's/^0*//')"
+ echo " FINAL_CMD : $FINAL_CMD"
+ echo " FINAL_CMD (expected) : $(eval echo \${EXPECTED_CMD_"$i"})"
+ echo " FINAL_TARGET : $FINAL_TARGET"
+ echo " FINAL_TARGET (expected): $(eval echo \${EXPECTED_TARGET_"$i"})"
+ at_least_one_ko="true"
+ fi
done
+
+ if test "$at_least_one_ko" = "true"
+ then
+ return 255
+ else
+ return 0
+ fi
}
diff --git a/mergetools/winmerge b/mergetools/winmerge
index 74d0325..36c72dd 100644
--- a/mergetools/winmerge
+++ b/mergetools/winmerge
@@ -3,6 +3,10 @@
return 0
}
+diff_cmd_help () {
+ echo "Use WinMerge (requires a graphical session)"
+}
+
merge_cmd () {
# mergetool.winmerge.trustExitCode is implicitly false.
# touch $BACKUP so that we can check_unchanged.
@@ -13,3 +17,7 @@
translate_merge_tool_path() {
mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
}
+
+merge_cmd_help () {
+ echo "Use WinMerge (requires a graphical session)"
+}
diff --git a/mergetools/xxdiff b/mergetools/xxdiff
index ce5b8e9..cd205f9 100644
--- a/mergetools/xxdiff
+++ b/mergetools/xxdiff
@@ -3,6 +3,17 @@
-R 'Accel.Search: "Ctrl+F"' \
-R 'Accel.SearchForward: "Ctrl+G"' \
"$LOCAL" "$REMOTE"
+
+ # xxdiff can segfault on binary files which are often uninteresting.
+ # Do not allow segfaults to stop us from continuing on to the next file.
+ if test $? = 128
+ then
+ return 1
+ fi
+}
+
+diff_cmd_help () {
+ echo "Use xxdiff (requires a graphical session)"
}
merge_cmd () {
@@ -21,3 +32,7 @@
--merged-file "$MERGED" "$LOCAL" "$REMOTE"
fi
}
+
+merge_cmd_help () {
+ echo "Use xxdiff (requires a graphical session)"
+}
diff --git a/midx.c b/midx.c
index 4a01583..5f0dd38 100644
--- a/midx.c
+++ b/midx.c
@@ -33,6 +33,7 @@
#define MIDX_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */
#define MIDX_CHUNKID_OBJECTOFFSETS 0x4f4f4646 /* "OOFF" */
#define MIDX_CHUNKID_LARGEOFFSETS 0x4c4f4646 /* "LOFF" */
+#define MIDX_CHUNKID_REVINDEX 0x52494458 /* "RIDX" */
#define MIDX_CHUNK_FANOUT_SIZE (sizeof(uint32_t) * 256)
#define MIDX_CHUNK_OFFSET_WIDTH (2 * sizeof(uint32_t))
#define MIDX_CHUNK_LARGE_OFFSET_WIDTH (sizeof(uint64_t))
@@ -40,32 +41,20 @@
#define PACK_EXPIRED UINT_MAX
-static uint8_t oid_version(void)
-{
- switch (hash_algo_by_ptr(the_hash_algo)) {
- case GIT_HASH_SHA1:
- return 1;
- case GIT_HASH_SHA256:
- return 2;
- default:
- die(_("invalid hash version"));
- }
-}
-
const unsigned char *get_midx_checksum(struct multi_pack_index *m)
{
return m->data + m->data_len - the_hash_algo->rawsz;
}
-char *get_midx_filename(const char *object_dir)
+void get_midx_filename(struct strbuf *out, const char *object_dir)
{
- return xstrfmt("%s/pack/multi-pack-index", object_dir);
+ strbuf_addf(out, "%s/pack/multi-pack-index", object_dir);
}
-char *get_midx_rev_filename(struct multi_pack_index *m)
+void get_midx_rev_filename(struct strbuf *out, struct multi_pack_index *m)
{
- return xstrfmt("%s/pack/multi-pack-index-%s.rev",
- m->object_dir, hash_to_hex(get_midx_checksum(m)));
+ get_midx_filename(out, m->object_dir);
+ strbuf_addf(out, "-%s.rev", hash_to_hex(get_midx_checksum(m)));
}
static int midx_read_oid_fanout(const unsigned char *chunk_start,
@@ -89,28 +78,30 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
size_t midx_size;
void *midx_map = NULL;
uint32_t hash_version;
- char *midx_name = get_midx_filename(object_dir);
+ struct strbuf midx_name = STRBUF_INIT;
uint32_t i;
const char *cur_pack_name;
struct chunkfile *cf = NULL;
- fd = git_open(midx_name);
+ get_midx_filename(&midx_name, object_dir);
+
+ fd = git_open(midx_name.buf);
if (fd < 0)
goto cleanup_fail;
if (fstat(fd, &st)) {
- error_errno(_("failed to read %s"), midx_name);
+ error_errno(_("failed to read %s"), midx_name.buf);
goto cleanup_fail;
}
midx_size = xsize_t(st.st_size);
if (midx_size < MIDX_MIN_SIZE) {
- error(_("multi-pack-index file %s is too small"), midx_name);
+ error(_("multi-pack-index file %s is too small"), midx_name.buf);
goto cleanup_fail;
}
- FREE_AND_NULL(midx_name);
+ strbuf_release(&midx_name);
midx_map = xmmap(NULL, midx_size, PROT_READ, MAP_PRIVATE, fd, 0);
close(fd);
@@ -131,9 +122,9 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
m->version);
hash_version = m->data[MIDX_BYTE_HASH_VERSION];
- if (hash_version != oid_version()) {
+ if (hash_version != oid_version(the_hash_algo)) {
error(_("multi-pack-index hash version %u does not match version %u"),
- hash_version, oid_version());
+ hash_version, oid_version(the_hash_algo));
goto cleanup_fail;
}
m->hash_len = the_hash_algo->rawsz;
@@ -159,6 +150,9 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
pair_chunk(cf, MIDX_CHUNKID_LARGEOFFSETS, &m->chunk_large_offsets);
+ if (git_env_bool("GIT_TEST_MIDX_READ_RIDX", 1))
+ pair_chunk(cf, MIDX_CHUNKID_REVINDEX, &m->chunk_revindex);
+
m->num_objects = ntohl(m->chunk_oid_fanout[255]);
CALLOC_ARRAY(m->pack_names, m->num_packs);
@@ -179,12 +173,13 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
trace2_data_intmax("midx", the_repository, "load/num_packs", m->num_packs);
trace2_data_intmax("midx", the_repository, "load/num_objects", m->num_objects);
+ free_chunkfile(cf);
return m;
cleanup_fail:
free(m);
- free(midx_name);
- free(cf);
+ strbuf_release(&midx_name);
+ free_chunkfile(cf);
if (midx_map)
munmap(midx_map, midx_size);
if (0 <= fd)
@@ -413,7 +408,7 @@ static size_t write_midx_header(struct hashfile *f,
{
hashwrite_be32(f, MIDX_SIGNATURE);
hashwrite_u8(f, MIDX_VERSION);
- hashwrite_u8(f, oid_version());
+ hashwrite_u8(f, oid_version(the_hash_algo));
hashwrite_u8(f, num_chunks);
hashwrite_u8(f, 0); /* unused */
hashwrite_be32(f, num_packs);
@@ -460,6 +455,8 @@ struct write_midx_context {
uint32_t num_large_offsets;
int preferred_pack_idx;
+
+ struct string_list *to_include;
};
static void add_pack_to_midx(const char *full_path, size_t full_path_len,
@@ -469,8 +466,26 @@ static void add_pack_to_midx(const char *full_path, size_t full_path_len,
if (ends_with(file_name, ".idx")) {
display_progress(ctx->progress, ++ctx->pack_paths_checked);
+ /*
+ * Note that at most one of ctx->m and ctx->to_include are set,
+ * so we are testing midx_contains_pack() and
+ * string_list_has_string() independently (guarded by the
+ * appropriate NULL checks).
+ *
+ * We could support passing to_include while reusing an existing
+ * MIDX, but don't currently since the reuse process drags
+ * forward all packs from an existing MIDX (without checking
+ * whether or not they appear in the to_include list).
+ *
+ * If we added support for that, these next two conditional
+ * should be performed independently (likely checking
+ * to_include before the existing MIDX).
+ */
if (ctx->m && midx_contains_pack(ctx->m, file_name))
return;
+ else if (ctx->to_include &&
+ !string_list_has_string(ctx->to_include, file_name))
+ return;
ALLOC_GROW(ctx->info, ctx->nr + 1, ctx->alloc);
@@ -810,6 +825,18 @@ static int write_midx_large_offsets(struct hashfile *f,
return 0;
}
+static int write_midx_revindex(struct hashfile *f,
+ void *data)
+{
+ struct write_midx_context *ctx = data;
+ uint32_t i;
+
+ for (i = 0; i < ctx->entries_nr; i++)
+ hashwrite_be32(f, ctx->pack_order[i]);
+
+ return 0;
+}
+
struct midx_pack_order_data {
uint32_t nr;
uint32_t pack;
@@ -948,7 +975,43 @@ static void bitmap_show_commit(struct commit *commit, void *_data)
data->commits[data->commits_nr++] = commit;
}
+static int read_refs_snapshot(const char *refs_snapshot,
+ struct rev_info *revs)
+{
+ struct strbuf buf = STRBUF_INIT;
+ struct object_id oid;
+ FILE *f = xfopen(refs_snapshot, "r");
+
+ while (strbuf_getline(&buf, f) != EOF) {
+ struct object *object;
+ int preferred = 0;
+ char *hex = buf.buf;
+ const char *end = NULL;
+
+ if (buf.len && *buf.buf == '+') {
+ preferred = 1;
+ hex = &buf.buf[1];
+ }
+
+ if (parse_oid_hex(hex, &oid, &end) < 0)
+ die(_("could not parse line: %s"), buf.buf);
+ if (*end)
+ die(_("malformed line: %s"), buf.buf);
+
+ object = parse_object_or_die(&oid, NULL);
+ if (preferred)
+ object->flags |= NEEDS_BITMAP;
+
+ add_pending_object(revs, object, "");
+ }
+
+ fclose(f);
+ strbuf_release(&buf);
+ return 0;
+}
+
static struct commit **find_commits_for_midx_bitmap(uint32_t *indexed_commits_nr_p,
+ const char *refs_snapshot,
struct write_midx_context *ctx)
{
struct rev_info revs;
@@ -957,8 +1020,12 @@ static struct commit **find_commits_for_midx_bitmap(uint32_t *indexed_commits_nr
cb.ctx = ctx;
repo_init_revisions(the_repository, &revs, NULL);
- setup_revisions(0, NULL, &revs, NULL);
- for_each_ref(add_ref_to_pending, &revs);
+ if (refs_snapshot) {
+ read_refs_snapshot(refs_snapshot, &revs);
+ } else {
+ setup_revisions(0, NULL, &revs, NULL);
+ for_each_ref(add_ref_to_pending, &revs);
+ }
/*
* Skipping promisor objects here is intentional, since it only excludes
@@ -982,11 +1049,13 @@ static struct commit **find_commits_for_midx_bitmap(uint32_t *indexed_commits_nr
if (indexed_commits_nr_p)
*indexed_commits_nr_p = cb.commits_nr;
+ release_revisions(&revs);
return cb.commits;
}
static int write_midx_bitmap(char *midx_name, unsigned char *midx_hash,
struct write_midx_context *ctx,
+ const char *refs_snapshot,
unsigned flags)
{
struct packing_data pdata;
@@ -997,12 +1066,15 @@ static int write_midx_bitmap(char *midx_name, unsigned char *midx_hash,
char *bitmap_name = xstrfmt("%s-%s.bitmap", midx_name, hash_to_hex(midx_hash));
int ret;
+ if (!ctx->entries_nr)
+ BUG("cannot write a bitmap without any objects");
+
if (flags & MIDX_WRITE_BITMAP_HASH_CACHE)
options |= BITMAP_OPT_HASH_CACHE;
prepare_midx_packing_data(&pdata, ctx);
- commits = find_commits_for_midx_bitmap(&commits_nr, ctx);
+ commits = find_commits_for_midx_bitmap(&commits_nr, refs_snapshot, ctx);
/*
* Build the MIDX-order index based on pdata.objects (which is already
@@ -1046,36 +1118,61 @@ static int write_midx_bitmap(char *midx_name, unsigned char *midx_hash,
return ret;
}
+static struct multi_pack_index *lookup_multi_pack_index(struct repository *r,
+ const char *object_dir)
+{
+ struct multi_pack_index *result = NULL;
+ struct multi_pack_index *cur;
+ char *obj_dir_real = real_pathdup(object_dir, 1);
+ struct strbuf cur_path_real = STRBUF_INIT;
+
+ /* Ensure the given object_dir is local, or a known alternate. */
+ find_odb(r, obj_dir_real);
+
+ for (cur = get_multi_pack_index(r); cur; cur = cur->next) {
+ strbuf_realpath(&cur_path_real, cur->object_dir, 1);
+ if (!strcmp(obj_dir_real, cur_path_real.buf)) {
+ result = cur;
+ goto cleanup;
+ }
+ }
+
+cleanup:
+ free(obj_dir_real);
+ strbuf_release(&cur_path_real);
+ return result;
+}
+
static int write_midx_internal(const char *object_dir,
+ struct string_list *packs_to_include,
struct string_list *packs_to_drop,
const char *preferred_pack_name,
+ const char *refs_snapshot,
unsigned flags)
{
- char *midx_name;
+ struct strbuf midx_name = STRBUF_INIT;
unsigned char midx_hash[GIT_MAX_RAWSZ];
uint32_t i;
struct hashfile *f = NULL;
struct lock_file lk;
struct write_midx_context ctx = { 0 };
- struct multi_pack_index *cur;
int pack_name_concat_len = 0;
int dropped_packs = 0;
int result = 0;
struct chunkfile *cf;
- /* Ensure the given object_dir is local, or a known alternate. */
- find_odb(the_repository, object_dir);
-
- midx_name = get_midx_filename(object_dir);
- if (safe_create_leading_directories(midx_name))
+ get_midx_filename(&midx_name, object_dir);
+ if (safe_create_leading_directories(midx_name.buf))
die_errno(_("unable to create leading directories of %s"),
- midx_name);
+ midx_name.buf);
- for (cur = get_multi_pack_index(the_repository); cur; cur = cur->next) {
- if (!strcmp(object_dir, cur->object_dir)) {
- ctx.m = cur;
- break;
- }
+ if (!packs_to_include) {
+ /*
+ * Only reference an existing MIDX when not filtering which
+ * packs to include, since all packs and objects are copied
+ * blindly from an existing MIDX if one is present.
+ */
+ ctx.m = lookup_multi_pack_index(the_repository, object_dir);
}
if (ctx.m && !midx_checksum_valid(ctx.m)) {
@@ -1125,10 +1222,13 @@ static int write_midx_internal(const char *object_dir,
else
ctx.progress = NULL;
+ ctx.to_include = packs_to_include;
+
for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &ctx);
stop_progress(&ctx.progress);
- if (ctx.m && ctx.nr == ctx.m->num_packs && !packs_to_drop) {
+ if ((ctx.m && ctx.nr == ctx.m->num_packs) &&
+ !(packs_to_include || packs_to_drop)) {
struct bitmap_index *bitmap_git;
int bitmap_exists;
int want_bitmap = flags & MIDX_WRITE_BITMAP;
@@ -1293,7 +1393,7 @@ static int write_midx_internal(const char *object_dir,
pack_name_concat_len += MIDX_CHUNK_ALIGNMENT -
(pack_name_concat_len % MIDX_CHUNK_ALIGNMENT);
- hold_lock_file_for_update(&lk, midx_name, LOCK_DIE_ON_ERROR);
+ hold_lock_file_for_update(&lk, midx_name.buf, LOCK_DIE_ON_ERROR);
f = hashfd(get_lock_file_fd(&lk), get_lock_file_path(&lk));
if (ctx.nr - dropped_packs == 0) {
@@ -1302,6 +1402,12 @@ static int write_midx_internal(const char *object_dir,
goto cleanup;
}
+ if (!ctx.entries_nr) {
+ if (flags & MIDX_WRITE_BITMAP)
+ warning(_("refusing to write multi-pack .bitmap without any objects"));
+ flags &= ~(MIDX_WRITE_REV_INDEX | MIDX_WRITE_BITMAP);
+ }
+
cf = init_chunkfile(f);
add_chunk(cf, MIDX_CHUNKID_PACKNAMES, pack_name_concat_len,
@@ -1320,19 +1426,26 @@ static int write_midx_internal(const char *object_dir,
(size_t)ctx.num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH,
write_midx_large_offsets);
+ if (flags & (MIDX_WRITE_REV_INDEX | MIDX_WRITE_BITMAP)) {
+ ctx.pack_order = midx_pack_order(&ctx);
+ add_chunk(cf, MIDX_CHUNKID_REVINDEX,
+ ctx.entries_nr * sizeof(uint32_t),
+ write_midx_revindex);
+ }
+
write_midx_header(f, get_num_chunks(cf), ctx.nr - dropped_packs);
write_chunkfile(cf, &ctx);
- finalize_hashfile(f, midx_hash, CSUM_FSYNC | CSUM_HASH_IN_STREAM);
+ finalize_hashfile(f, midx_hash, FSYNC_COMPONENT_PACK_METADATA,
+ CSUM_FSYNC | CSUM_HASH_IN_STREAM);
free_chunkfile(cf);
- if (flags & (MIDX_WRITE_REV_INDEX | MIDX_WRITE_BITMAP))
- ctx.pack_order = midx_pack_order(&ctx);
-
- if (flags & MIDX_WRITE_REV_INDEX)
- write_midx_reverse_index(midx_name, midx_hash, &ctx);
+ if (flags & MIDX_WRITE_REV_INDEX &&
+ git_env_bool("GIT_TEST_MIDX_WRITE_REV", 0))
+ write_midx_reverse_index(midx_name.buf, midx_hash, &ctx);
if (flags & MIDX_WRITE_BITMAP) {
- if (write_midx_bitmap(midx_name, midx_hash, &ctx, flags) < 0) {
+ if (write_midx_bitmap(midx_name.buf, midx_hash, &ctx,
+ refs_snapshot, flags) < 0) {
error(_("could not write multi-pack bitmap"));
result = 1;
goto cleanup;
@@ -1342,7 +1455,8 @@ static int write_midx_internal(const char *object_dir,
if (ctx.m)
close_object_store(the_repository->objects);
- commit_lock_file(&lk);
+ if (commit_lock_file(&lk) < 0)
+ die_errno(_("could not write multi-pack-index"));
clear_midx_files_ext(object_dir, ".bitmap", midx_hash);
clear_midx_files_ext(object_dir, ".rev", midx_hash);
@@ -1360,16 +1474,28 @@ static int write_midx_internal(const char *object_dir,
free(ctx.entries);
free(ctx.pack_perm);
free(ctx.pack_order);
- free(midx_name);
+ strbuf_release(&midx_name);
return result;
}
int write_midx_file(const char *object_dir,
const char *preferred_pack_name,
+ const char *refs_snapshot,
unsigned flags)
{
- return write_midx_internal(object_dir, NULL, preferred_pack_name, flags);
+ return write_midx_internal(object_dir, NULL, NULL, preferred_pack_name,
+ refs_snapshot, flags);
+}
+
+int write_midx_file_only(const char *object_dir,
+ struct string_list *packs_to_include,
+ const char *preferred_pack_name,
+ const char *refs_snapshot,
+ unsigned flags)
+{
+ return write_midx_internal(object_dir, packs_to_include, NULL,
+ preferred_pack_name, refs_snapshot, flags);
}
struct clear_midx_data {
@@ -1412,20 +1538,22 @@ static void clear_midx_files_ext(const char *object_dir, const char *ext,
void clear_midx_file(struct repository *r)
{
- char *midx = get_midx_filename(r->objects->odb->path);
+ struct strbuf midx = STRBUF_INIT;
+
+ get_midx_filename(&midx, r->objects->odb->path);
if (r->objects && r->objects->multi_pack_index) {
close_midx(r->objects->multi_pack_index);
r->objects->multi_pack_index = NULL;
}
- if (remove_path(midx))
- die(_("failed to clear multi-pack-index at %s"), midx);
+ if (remove_path(midx.buf))
+ die(_("failed to clear multi-pack-index at %s"), midx.buf);
clear_midx_files_ext(r->objects->odb->path, ".bitmap", NULL);
clear_midx_files_ext(r->objects->odb->path, ".rev", NULL);
- free(midx);
+ strbuf_release(&midx);
}
static int verify_midx_error;
@@ -1478,12 +1606,15 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag
if (!m) {
int result = 0;
struct stat sb;
- char *filename = get_midx_filename(object_dir);
- if (!stat(filename, &sb)) {
+ struct strbuf filename = STRBUF_INIT;
+
+ get_midx_filename(&filename, object_dir);
+
+ if (!stat(filename.buf, &sb)) {
error(_("multi-pack-index file exists, but failed to parse"));
result = 1;
}
- free(filename);
+ strbuf_release(&filename);
return result;
}
@@ -1516,7 +1647,7 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag
* Remaining tests assume that we have objects, so we can
* return here.
*/
- return verify_midx_error;
+ goto cleanup;
}
if (flags & MIDX_PROGRESS)
@@ -1594,7 +1725,9 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag
}
stop_progress(&progress);
+cleanup:
free(pairs);
+ close_midx(m);
return verify_midx_error;
}
@@ -1603,7 +1736,7 @@ int expire_midx_packs(struct repository *r, const char *object_dir, unsigned fla
{
uint32_t i, *count, result = 0;
struct string_list packs_to_drop = STRING_LIST_INIT_DUP;
- struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
+ struct multi_pack_index *m = lookup_multi_pack_index(r, object_dir);
struct progress *progress = NULL;
if (!m)
@@ -1648,12 +1781,11 @@ int expire_midx_packs(struct repository *r, const char *object_dir, unsigned fla
free(count);
- if (packs_to_drop.nr) {
- result = write_midx_internal(object_dir, &packs_to_drop, NULL, flags);
- m = NULL;
- }
+ if (packs_to_drop.nr)
+ result = write_midx_internal(object_dir, NULL, &packs_to_drop, NULL, NULL, flags);
string_list_clear(&packs_to_drop, 0);
+
return result;
}
@@ -1769,7 +1901,7 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size,
struct child_process cmd = CHILD_PROCESS_INIT;
FILE *cmd_in;
struct strbuf base_name = STRBUF_INIT;
- struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
+ struct multi_pack_index *m = lookup_multi_pack_index(r, object_dir);
/*
* When updating the default for these configuration
@@ -1840,12 +1972,9 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size,
goto cleanup;
}
- result = write_midx_internal(object_dir, NULL, NULL, flags);
- m = NULL;
+ result = write_midx_internal(object_dir, NULL, NULL, NULL, NULL, flags);
cleanup:
- if (m)
- close_midx(m);
free(include_pack);
return result;
}
diff --git a/midx.h b/midx.h
index 541d9ac..22e8e53 100644
--- a/midx.h
+++ b/midx.h
@@ -2,6 +2,7 @@
#define MIDX_H
#include "repository.h"
+#include "string-list.h"
struct object_id;
struct pack_entry;
@@ -35,6 +36,7 @@ struct multi_pack_index {
const unsigned char *chunk_oid_lookup;
const unsigned char *chunk_object_offsets;
const unsigned char *chunk_large_offsets;
+ const unsigned char *chunk_revindex;
const char **pack_names;
struct packed_git **packs;
@@ -47,8 +49,8 @@ struct multi_pack_index {
#define MIDX_WRITE_BITMAP_HASH_CACHE (1 << 3)
const unsigned char *get_midx_checksum(struct multi_pack_index *m);
-char *get_midx_filename(const char *object_dir);
-char *get_midx_rev_filename(struct multi_pack_index *m);
+void get_midx_filename(struct strbuf *out, const char *object_dir);
+void get_midx_rev_filename(struct strbuf *out, struct multi_pack_index *m);
struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local);
int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id);
@@ -62,7 +64,19 @@ int fill_midx_entry(struct repository *r, const struct object_id *oid, struct pa
int midx_contains_pack(struct multi_pack_index *m, const char *idx_or_pack_name);
int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, int local);
-int write_midx_file(const char *object_dir, const char *preferred_pack_name, unsigned flags);
+/*
+ * Variant of write_midx_file which writes a MIDX containing only the packs
+ * specified in packs_to_include.
+ */
+int write_midx_file(const char *object_dir,
+ const char *preferred_pack_name,
+ const char *refs_snapshot,
+ unsigned flags);
+int write_midx_file_only(const char *object_dir,
+ struct string_list *packs_to_include,
+ const char *preferred_pack_name,
+ const char *refs_snapshot,
+ unsigned flags);
void clear_midx_file(struct repository *r);
int verify_midx_file(struct repository *r, const char *object_dir, unsigned flags);
int expire_midx_packs(struct repository *r, const char *object_dir, unsigned flags);
diff --git a/notes-cache.c b/notes-cache.c
index 2473314..9dfd251 100644
--- a/notes-cache.c
+++ b/notes-cache.c
@@ -92,7 +92,7 @@ int notes_cache_put(struct notes_cache *c, struct object_id *key_oid,
{
struct object_id value_oid;
- if (write_object_file(data, size, "blob", &value_oid) < 0)
+ if (write_object_file(data, size, OBJ_BLOB, &value_oid) < 0)
return -1;
return add_note(&c->tree, key_oid, &value_oid, NULL);
}
diff --git a/notes-merge.c b/notes-merge.c
index b4a3a90..b4cc594 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -113,6 +113,7 @@ static struct notes_merge_pair *find_notes_merge_pair_pos(
}
static struct object_id uninitialized = {
+ .hash =
"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" \
"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
};
@@ -175,7 +176,6 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
oid_to_hex(&mp->remote));
}
diff_flush(&opt);
- clear_pathspec(&opt.pathspec);
*num_changes = len;
return changes;
@@ -261,7 +261,6 @@ static void diff_tree_local(struct notes_merge_options *o,
oid_to_hex(&mp->local));
}
diff_flush(&opt);
- clear_pathspec(&opt.pathspec);
}
static void check_notes_merge_worktree(struct notes_merge_options *o)
@@ -344,7 +343,7 @@ static int ll_merge_in_worktree(struct notes_merge_options *o,
{
mmbuffer_t result_buf;
mmfile_t base, local, remote;
- int status;
+ enum ll_merge_result status;
read_mmblob(&base, &p->base);
read_mmblob(&local, &p->local);
@@ -358,6 +357,9 @@ static int ll_merge_in_worktree(struct notes_merge_options *o,
free(local.ptr);
free(remote.ptr);
+ if (status == LL_MERGE_BINARY_CONFLICT)
+ warning("Cannot merge binary files: %s (%s vs. %s)",
+ oid_to_hex(&p->obj), o->local_ref, o->remote_ref);
if ((status < 0) || !result_buf.ptr)
die("Failed to execute internal merge");
diff --git a/notes.c b/notes.c
index f87dac4..7452e71 100644
--- a/notes.c
+++ b/notes.c
@@ -675,7 +675,7 @@ static int tree_write_stack_finish_subtree(struct tree_write_stack *tws)
ret = tree_write_stack_finish_subtree(n);
if (ret)
return ret;
- ret = write_object_file(n->buf.buf, n->buf.len, tree_type, &s);
+ ret = write_object_file(n->buf.buf, n->buf.len, OBJ_TREE, &s);
if (ret)
return ret;
strbuf_release(&n->buf);
@@ -836,7 +836,7 @@ int combine_notes_concatenate(struct object_id *cur_oid,
free(new_msg);
/* create a new blob object from buf */
- ret = write_object_file(buf, buf_len, blob_type, cur_oid);
+ ret = write_object_file(buf, buf_len, OBJ_BLOB, cur_oid);
free(buf);
return ret;
}
@@ -916,7 +916,7 @@ int combine_notes_cat_sort_uniq(struct object_id *cur_oid,
string_list_join_lines_helper, &buf))
goto out;
- ret = write_object_file(buf.buf, buf.len, blob_type, cur_oid);
+ ret = write_object_file(buf.buf, buf.len, OBJ_BLOB, cur_oid);
out:
strbuf_release(&buf);
@@ -1192,7 +1192,7 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
ret = for_each_note(t, flags, write_each_note, &cb_data) ||
write_each_non_note_until(NULL, &cb_data) ||
tree_write_stack_finish_subtree(&root) ||
- write_object_file(root.buf.buf, root.buf.len, tree_type, result);
+ write_object_file(root.buf.buf, root.buf.len, OBJ_TREE, result);
strbuf_release(&root.buf);
return ret;
}
diff --git a/object-file.c b/object-file.c
index 112d9b4..6c8e3b1 100644
--- a/object-file.c
+++ b/object-file.c
@@ -165,54 +165,51 @@ static void git_hash_unknown_final_oid(struct object_id *oid, git_hash_ctx *ctx)
BUG("trying to finalize unknown hash");
}
-
const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
{
- NULL,
- 0x00000000,
- 0,
- 0,
- 0,
- git_hash_unknown_init,
- git_hash_unknown_clone,
- git_hash_unknown_update,
- git_hash_unknown_final,
- git_hash_unknown_final_oid,
- NULL,
- NULL,
- NULL,
+ .name = NULL,
+ .format_id = 0x00000000,
+ .rawsz = 0,
+ .hexsz = 0,
+ .blksz = 0,
+ .init_fn = git_hash_unknown_init,
+ .clone_fn = git_hash_unknown_clone,
+ .update_fn = git_hash_unknown_update,
+ .final_fn = git_hash_unknown_final,
+ .final_oid_fn = git_hash_unknown_final_oid,
+ .empty_tree = NULL,
+ .empty_blob = NULL,
+ .null_oid = NULL,
},
{
- "sha1",
- /* "sha1", big-endian */
- 0x73686131,
- GIT_SHA1_RAWSZ,
- GIT_SHA1_HEXSZ,
- GIT_SHA1_BLKSZ,
- git_hash_sha1_init,
- git_hash_sha1_clone,
- git_hash_sha1_update,
- git_hash_sha1_final,
- git_hash_sha1_final_oid,
- &empty_tree_oid,
- &empty_blob_oid,
- &null_oid_sha1,
+ .name = "sha1",
+ .format_id = GIT_SHA1_FORMAT_ID,
+ .rawsz = GIT_SHA1_RAWSZ,
+ .hexsz = GIT_SHA1_HEXSZ,
+ .blksz = GIT_SHA1_BLKSZ,
+ .init_fn = git_hash_sha1_init,
+ .clone_fn = git_hash_sha1_clone,
+ .update_fn = git_hash_sha1_update,
+ .final_fn = git_hash_sha1_final,
+ .final_oid_fn = git_hash_sha1_final_oid,
+ .empty_tree = &empty_tree_oid,
+ .empty_blob = &empty_blob_oid,
+ .null_oid = &null_oid_sha1,
},
{
- "sha256",
- /* "s256", big-endian */
- 0x73323536,
- GIT_SHA256_RAWSZ,
- GIT_SHA256_HEXSZ,
- GIT_SHA256_BLKSZ,
- git_hash_sha256_init,
- git_hash_sha256_clone,
- git_hash_sha256_update,
- git_hash_sha256_final,
- git_hash_sha256_final_oid,
- &empty_tree_oid_sha256,
- &empty_blob_oid_sha256,
- &null_oid_sha256,
+ .name = "sha256",
+ .format_id = GIT_SHA256_FORMAT_ID,
+ .rawsz = GIT_SHA256_RAWSZ,
+ .hexsz = GIT_SHA256_HEXSZ,
+ .blksz = GIT_SHA256_BLKSZ,
+ .init_fn = git_hash_sha256_init,
+ .clone_fn = git_hash_sha256_clone,
+ .update_fn = git_hash_sha256_update,
+ .final_fn = git_hash_sha256_final,
+ .final_oid_fn = git_hash_sha256_final_oid,
+ .empty_tree = &empty_tree_oid_sha256,
+ .empty_blob = &empty_blob_oid_sha256,
+ .null_oid = &null_oid_sha256,
}
};
@@ -277,10 +274,11 @@ static struct cached_object {
static int cached_object_nr, cached_object_alloc;
static struct cached_object empty_tree = {
- { EMPTY_TREE_SHA1_BIN_LITERAL },
- OBJ_TREE,
- "",
- 0
+ .oid = {
+ .hash = EMPTY_TREE_SHA1_BIN_LITERAL,
+ },
+ .type = OBJ_TREE,
+ .buf = "",
};
static struct cached_object *find_cached_object(const struct object_id *oid)
@@ -683,6 +681,49 @@ void add_to_alternates_memory(const char *reference)
'\n', NULL, 0);
}
+struct object_directory *set_temporary_primary_odb(const char *dir, int will_destroy)
+{
+ struct object_directory *new_odb;
+
+ /*
+ * Make sure alternates are initialized, or else our entry may be
+ * overwritten when they are.
+ */
+ prepare_alt_odb(the_repository);
+
+ /*
+ * Make a new primary odb and link the old primary ODB in as an
+ * alternate
+ */
+ new_odb = xcalloc(1, sizeof(*new_odb));
+ new_odb->path = xstrdup(dir);
+
+ /*
+ * Disable ref updates while a temporary odb is active, since
+ * the objects in the database may roll back.
+ */
+ new_odb->disable_ref_updates = 1;
+ new_odb->will_destroy = will_destroy;
+ new_odb->next = the_repository->objects->odb;
+ the_repository->objects->odb = new_odb;
+ return new_odb->next;
+}
+
+void restore_primary_odb(struct object_directory *restore_odb, const char *old_path)
+{
+ struct object_directory *cur_odb = the_repository->objects->odb;
+
+ if (strcmp(old_path, cur_odb->path))
+ BUG("expected %s as primary object store; found %s",
+ old_path, cur_odb->path);
+
+ if (cur_odb->next != restore_odb)
+ BUG("we expect the old primary object store to be the first alternate");
+
+ the_repository->objects->odb = restore_odb;
+ free_object_directory(cur_odb);
+}
+
/*
* Compute the exact path an alternate is at and returns it. In case of
* error NULL is returned and the human readable error is added to `err`
@@ -797,7 +838,7 @@ static void fill_alternate_refs_command(struct child_process *cmd,
}
}
- cmd->env = local_repo_env;
+ strvec_pushv(&cmd->env, (const char **)local_repo_env);
cmd->out = -1;
}
@@ -956,7 +997,7 @@ int has_loose_object_nonlocal(const struct object_id *oid)
return check_and_freshen_nonlocal(oid, 0);
}
-static int has_loose_object(const struct object_id *oid)
+int has_loose_object(const struct object_id *oid)
{
return check_and_freshen(oid, 0);
}
@@ -1009,33 +1050,50 @@ void *xmmap(void *start, size_t length,
return ret;
}
-/*
- * With an in-core object data in "map", rehash it to make sure the
- * object name actually matches "oid" to detect object corruption.
- * With "map" == NULL, try reading the object named with "oid" using
- * the streaming interface and rehash it to do the same.
- */
+static int format_object_header_literally(char *str, size_t size,
+ const char *type, size_t objsize)
+{
+ return xsnprintf(str, size, "%s %"PRIuMAX, type, (uintmax_t)objsize) + 1;
+}
+
+int format_object_header(char *str, size_t size, enum object_type type,
+ size_t objsize)
+{
+ const char *name = type_name(type);
+
+ if (!name)
+ BUG("could not get a type name for 'enum object_type' value %d", type);
+
+ return format_object_header_literally(str, size, name, objsize);
+}
+
int check_object_signature(struct repository *r, const struct object_id *oid,
- void *map, unsigned long size, const char *type)
+ void *buf, unsigned long size,
+ enum object_type type)
{
struct object_id real_oid;
+
+ hash_object_file(r->hash_algo, buf, size, type, &real_oid);
+
+ return !oideq(oid, &real_oid) ? -1 : 0;
+}
+
+int stream_object_signature(struct repository *r, const struct object_id *oid)
+{
+ struct object_id real_oid;
+ unsigned long size;
enum object_type obj_type;
struct git_istream *st;
git_hash_ctx c;
char hdr[MAX_HEADER_LEN];
int hdrlen;
- if (map) {
- hash_object_file(r->hash_algo, map, size, type, &real_oid);
- return !oideq(oid, &real_oid) ? -1 : 0;
- }
-
st = open_istream(r, oid, &obj_type, &size, NULL);
if (!st)
return -1;
/* Generate the header */
- hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(obj_type), (uintmax_t)size) + 1;
+ hdrlen = format_object_header(hdr, sizeof(hdr), obj_type, size);
/* Sha1.. */
r->hash_algo->init_fn(&c);
@@ -1187,11 +1245,14 @@ void *map_loose_object(struct repository *r,
return map_loose_object_1(r, NULL, oid, size);
}
-static int unpack_loose_short_header(git_zstream *stream,
- unsigned char *map, unsigned long mapsize,
- void *buffer, unsigned long bufsiz)
+enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,
+ unsigned char *map,
+ unsigned long mapsize,
+ void *buffer,
+ unsigned long bufsiz,
+ struct strbuf *header)
{
- int ret;
+ int status;
/* Get the data stream */
memset(stream, 0, sizeof(*stream));
@@ -1202,43 +1263,24 @@ static int unpack_loose_short_header(git_zstream *stream,
git_inflate_init(stream);
obj_read_unlock();
- ret = git_inflate(stream, 0);
+ status = git_inflate(stream, 0);
obj_read_lock();
-
- return ret;
-}
-
-int unpack_loose_header(git_zstream *stream,
- unsigned char *map, unsigned long mapsize,
- void *buffer, unsigned long bufsiz)
-{
- int status = unpack_loose_short_header(stream, map, mapsize,
- buffer, bufsiz);
-
if (status < Z_OK)
- return status;
-
- /* Make sure we have the terminating NUL */
- if (!memchr(buffer, '\0', stream->next_out - (unsigned char *)buffer))
- return -1;
- return 0;
-}
-
-static int unpack_loose_header_to_strbuf(git_zstream *stream, unsigned char *map,
- unsigned long mapsize, void *buffer,
- unsigned long bufsiz, struct strbuf *header)
-{
- int status;
-
- status = unpack_loose_short_header(stream, map, mapsize, buffer, bufsiz);
- if (status < Z_OK)
- return -1;
+ return ULHR_BAD;
/*
* Check if entire header is unpacked in the first iteration.
*/
if (memchr(buffer, '\0', stream->next_out - (unsigned char *)buffer))
- return 0;
+ return ULHR_OK;
+
+ /*
+ * We have a header longer than MAX_HEADER_LEN. The "header"
+ * here is only non-NULL when we run "cat-file
+ * --allow-unknown-type".
+ */
+ if (!header)
+ return ULHR_TOO_LONG;
/*
* buffer[0..bufsiz] was not large enough. Copy the partial
@@ -1259,7 +1301,7 @@ static int unpack_loose_header_to_strbuf(git_zstream *stream, unsigned char *map
stream->next_out = buffer;
stream->avail_out = bufsiz;
} while (status != Z_STREAM_END);
- return -1;
+ return ULHR_TOO_LONG;
}
static void *unpack_loose_rest(git_zstream *stream,
@@ -1317,11 +1359,10 @@ static void *unpack_loose_rest(git_zstream *stream,
* too permissive for what we want to check. So do an anal
* object header parse by hand.
*/
-static int parse_loose_header_extended(const char *hdr, struct object_info *oi,
- unsigned int flags)
+int parse_loose_header(const char *hdr, struct object_info *oi)
{
const char *type_buf = hdr;
- unsigned long size;
+ size_t size;
int type, type_len = 0;
/*
@@ -1340,15 +1381,6 @@ static int parse_loose_header_extended(const char *hdr, struct object_info *oi,
type = type_from_string_gently(type_buf, type_len, 1);
if (oi->type_name)
strbuf_add(oi->type_name, type_buf, type_len);
- /*
- * Set type to 0 if its an unknown object and
- * we're obtaining the type using '--allow-unknown-type'
- * option.
- */
- if ((flags & OBJECT_INFO_ALLOW_UNKNOWN_TYPE) && (type < 0))
- type = 0;
- else if (type < 0)
- die(_("invalid object type"));
if (oi->typep)
*oi->typep = type;
@@ -1365,25 +1397,24 @@ static int parse_loose_header_extended(const char *hdr, struct object_info *oi,
if (c > 9)
break;
hdr++;
- size = size * 10 + c;
+ size = st_add(st_mult(size, 10), c);
}
}
if (oi->sizep)
- *oi->sizep = size;
+ *oi->sizep = cast_size_t_to_ulong(size);
/*
* The length must be followed by a zero byte
*/
- return *hdr ? -1 : type;
-}
+ if (*hdr)
+ return -1;
-int parse_loose_header(const char *hdr, unsigned long *sizep)
-{
- struct object_info oi = OBJECT_INFO_INIT;
-
- oi.sizep = sizep;
- return parse_loose_header_extended(hdr, &oi, 0);
+ /*
+ * The format is valid, but the type may still be bogus. The
+ * Caller needs to check its oi->typep.
+ */
+ return 0;
}
static int loose_object_info(struct repository *r,
@@ -1397,6 +1428,8 @@ static int loose_object_info(struct repository *r,
char hdr[MAX_HEADER_LEN];
struct strbuf hdrbuf = STRBUF_INIT;
unsigned long size_scratch;
+ enum object_type type_scratch;
+ int allow_unknown = flags & OBJECT_INFO_ALLOW_UNKNOWN_TYPE;
if (oi->delta_base_oid)
oidclr(oi->delta_base_oid);
@@ -1427,43 +1460,48 @@ static int loose_object_info(struct repository *r,
if (!oi->sizep)
oi->sizep = &size_scratch;
+ if (!oi->typep)
+ oi->typep = &type_scratch;
if (oi->disk_sizep)
*oi->disk_sizep = mapsize;
- if ((flags & OBJECT_INFO_ALLOW_UNKNOWN_TYPE)) {
- if (unpack_loose_header_to_strbuf(&stream, map, mapsize, hdr, sizeof(hdr), &hdrbuf) < 0)
- status = error(_("unable to unpack %s header with --allow-unknown-type"),
- oid_to_hex(oid));
- } else if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0)
+
+ switch (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),
+ allow_unknown ? &hdrbuf : NULL)) {
+ case ULHR_OK:
+ if (parse_loose_header(hdrbuf.len ? hdrbuf.buf : hdr, oi) < 0)
+ status = error(_("unable to parse %s header"), oid_to_hex(oid));
+ else if (!allow_unknown && *oi->typep < 0)
+ die(_("invalid object type"));
+
+ if (!oi->contentp)
+ break;
+ *oi->contentp = unpack_loose_rest(&stream, hdr, *oi->sizep, oid);
+ if (*oi->contentp)
+ goto cleanup;
+
+ status = -1;
+ break;
+ case ULHR_BAD:
status = error(_("unable to unpack %s header"),
oid_to_hex(oid));
- if (status < 0)
- ; /* Do nothing */
- else if (hdrbuf.len) {
- if ((status = parse_loose_header_extended(hdrbuf.buf, oi, flags)) < 0)
- status = error(_("unable to parse %s header with --allow-unknown-type"),
- oid_to_hex(oid));
- } else if ((status = parse_loose_header_extended(hdr, oi, flags)) < 0)
- status = error(_("unable to parse %s header"), oid_to_hex(oid));
+ break;
+ case ULHR_TOO_LONG:
+ status = error(_("header for %s too long, exceeds %d bytes"),
+ oid_to_hex(oid), MAX_HEADER_LEN);
+ break;
+ }
- if (status >= 0 && oi->contentp) {
- *oi->contentp = unpack_loose_rest(&stream, hdr,
- *oi->sizep, oid);
- if (!*oi->contentp) {
- git_inflate_end(&stream);
- status = -1;
- }
- } else
- git_inflate_end(&stream);
-
+ git_inflate_end(&stream);
+cleanup:
munmap(map, mapsize);
- if (status && oi->typep)
- *oi->typep = status;
if (oi->sizep == &size_scratch)
oi->sizep = NULL;
strbuf_release(&hdrbuf);
+ if (oi->typep == &type_scratch)
+ oi->typep = NULL;
oi->whence = OI_LOOSE;
- return (status < 0) ? status : 0;
+ return status;
}
int obj_read_use_lock = 0;
@@ -1546,7 +1584,14 @@ static int do_oid_object_info_extended(struct repository *r,
break;
}
- if (register_all_submodule_odb_as_alternates())
+ /*
+ * If r is the_repository, this might be an attempt at
+ * accessing a submodule object as if it were in the_repository
+ * (having called add_submodule_odb() on that submodule's ODB).
+ * If any such ODBs exist, register them and try again.
+ */
+ if (r == the_repository &&
+ register_all_submodule_odb_as_alternates())
/* We added some alternates; retry */
continue;
@@ -1633,7 +1678,7 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type,
{
struct cached_object *co;
- hash_object_file(the_hash_algo, buf, len, type_name(type), oid);
+ hash_object_file(the_hash_algo, buf, len, type, oid);
if (has_object_file_with_flags(oid, OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT) ||
find_cached_object(oid))
return 0;
@@ -1683,7 +1728,7 @@ void *read_object_file_extended(struct repository *r,
die(_("loose object %s (stored in %s) is corrupt"),
oid_to_hex(repl), path);
- if ((p = has_packed_and_bad(r, repl)) != NULL)
+ if ((p = has_packed_and_bad(r, repl)))
die(_("packed object %s (stored in %s) is corrupt"),
oid_to_hex(repl), p->pack_name);
obj_read_unlock();
@@ -1693,16 +1738,15 @@ void *read_object_file_extended(struct repository *r,
void *read_object_with_reference(struct repository *r,
const struct object_id *oid,
- const char *required_type_name,
+ enum object_type required_type,
unsigned long *size,
struct object_id *actual_oid_return)
{
- enum object_type type, required_type;
+ enum object_type type;
void *buffer;
unsigned long isize;
struct object_id actual_oid;
- required_type = type_from_string(required_type_name);
oidcpy(&actual_oid, oid);
while (1) {
int ref_length = -1;
@@ -1740,21 +1784,40 @@ void *read_object_with_reference(struct repository *r,
}
}
+static void hash_object_body(const struct git_hash_algo *algo, git_hash_ctx *c,
+ const void *buf, unsigned long len,
+ struct object_id *oid,
+ char *hdr, int *hdrlen)
+{
+ algo->init_fn(c);
+ algo->update_fn(c, hdr, *hdrlen);
+ algo->update_fn(c, buf, len);
+ algo->final_oid_fn(oid, c);
+}
+
static void write_object_file_prepare(const struct git_hash_algo *algo,
const void *buf, unsigned long len,
+ enum object_type type, struct object_id *oid,
+ char *hdr, int *hdrlen)
+{
+ git_hash_ctx c;
+
+ /* Generate the header */
+ *hdrlen = format_object_header(hdr, *hdrlen, type, len);
+
+ /* Sha1.. */
+ hash_object_body(algo, &c, buf, len, oid, hdr, hdrlen);
+}
+
+static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
+ const void *buf, unsigned long len,
const char *type, struct object_id *oid,
char *hdr, int *hdrlen)
{
git_hash_ctx c;
- /* Generate the header */
- *hdrlen = xsnprintf(hdr, *hdrlen, "%s %"PRIuMAX , type, (uintmax_t)len)+1;
-
- /* Sha1.. */
- algo->init_fn(&c);
- algo->update_fn(&c, hdr, *hdrlen);
- algo->update_fn(&c, buf, len);
- algo->final_oid_fn(oid, &c);
+ *hdrlen = format_object_header_literally(hdr, *hdrlen, type, len);
+ hash_object_body(algo, &c, buf, len, oid, hdr, hdrlen);
}
/*
@@ -1807,21 +1870,38 @@ static int write_buffer(int fd, const void *buf, size_t len)
return 0;
}
-int hash_object_file(const struct git_hash_algo *algo, const void *buf,
- unsigned long len, const char *type,
- struct object_id *oid)
+static void hash_object_file_literally(const struct git_hash_algo *algo,
+ const void *buf, unsigned long len,
+ const char *type, struct object_id *oid)
{
char hdr[MAX_HEADER_LEN];
int hdrlen = sizeof(hdr);
- write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen);
- return 0;
+
+ write_object_file_prepare_literally(algo, buf, len, type, oid, hdr, &hdrlen);
+}
+
+void hash_object_file(const struct git_hash_algo *algo, const void *buf,
+ unsigned long len, enum object_type type,
+ struct object_id *oid)
+{
+ hash_object_file_literally(algo, buf, len, type_name(type), oid);
}
/* Finalize a file on disk, and close it. */
-static void close_loose_object(int fd)
+static void close_loose_object(int fd, const char *filename)
{
- if (fsync_object_files)
- fsync_or_die(fd, "loose object file");
+ if (the_repository->objects->odb->will_destroy)
+ goto out;
+
+ if (batch_fsync_enabled(FSYNC_COMPONENT_LOOSE_OBJECT))
+ fsync_loose_object_bulk_checkin(fd, filename);
+ else if (fsync_object_files > 0)
+ fsync_or_die(fd, filename);
+ else
+ fsync_component_or_die(FSYNC_COMPONENT_LOOSE_OBJECT, fd,
+ filename);
+
+out:
if (close(fd) != 0)
die_errno(_("error when closing loose object file"));
}
@@ -1873,7 +1953,7 @@ static int create_tmpfile(struct strbuf *tmp, const char *filename)
static int write_loose_object(const struct object_id *oid, char *hdr,
int hdrlen, const void *buf, unsigned long len,
- time_t mtime)
+ time_t mtime, unsigned flags)
{
int fd, ret;
unsigned char compressed[4096];
@@ -1883,11 +1963,16 @@ static int write_loose_object(const struct object_id *oid, char *hdr,
static struct strbuf tmp_file = STRBUF_INIT;
static struct strbuf filename = STRBUF_INIT;
+ if (batch_fsync_enabled(FSYNC_COMPONENT_LOOSE_OBJECT))
+ prepare_loose_object_bulk_checkin();
+
loose_object_path(the_repository, &filename, oid);
fd = create_tmpfile(&tmp_file, filename.buf);
if (fd < 0) {
- if (errno == EACCES)
+ if (flags & HASH_SILENT)
+ return -1;
+ else if (errno == EACCES)
return error(_("insufficient permission for adding an object to repository database %s"), get_object_directory());
else
return error_errno(_("unable to create temporary file"));
@@ -1931,13 +2016,14 @@ static int write_loose_object(const struct object_id *oid, char *hdr,
die(_("confused by unstable object source data for %s"),
oid_to_hex(oid));
- close_loose_object(fd);
+ close_loose_object(fd, tmp_file.buf);
if (mtime) {
struct utimbuf utb;
utb.actime = mtime;
utb.modtime = mtime;
- if (utime(tmp_file.buf, &utb) < 0)
+ if (utime(tmp_file.buf, &utb) < 0 &&
+ !(flags & HASH_SILENT))
warning_errno(_("failed utime() on %s"), tmp_file.buf);
}
@@ -1954,6 +2040,8 @@ static int freshen_packed_object(const struct object_id *oid)
struct pack_entry e;
if (!find_pack_entry(the_repository, oid, &e))
return 0;
+ if (e.p->is_cruft)
+ return 0;
if (e.p->freshened)
return 1;
if (!freshen_file(e.p->pack_name))
@@ -1962,8 +2050,9 @@ static int freshen_packed_object(const struct object_id *oid)
return 1;
}
-int write_object_file(const void *buf, unsigned long len, const char *type,
- struct object_id *oid)
+int write_object_file_flags(const void *buf, unsigned long len,
+ enum object_type type, struct object_id *oid,
+ unsigned flags)
{
char hdr[MAX_HEADER_LEN];
int hdrlen = sizeof(hdr);
@@ -1975,12 +2064,12 @@ int write_object_file(const void *buf, unsigned long len, const char *type,
&hdrlen);
if (freshen_packed_object(oid) || freshen_loose_object(oid))
return 0;
- return write_loose_object(oid, hdr, hdrlen, buf, len, 0);
+ return write_loose_object(oid, hdr, hdrlen, buf, len, 0, flags);
}
-int hash_object_file_literally(const void *buf, unsigned long len,
- const char *type, struct object_id *oid,
- unsigned flags)
+int write_object_file_literally(const void *buf, unsigned long len,
+ const char *type, struct object_id *oid,
+ unsigned flags)
{
char *header;
int hdrlen, status = 0;
@@ -1988,14 +2077,14 @@ int hash_object_file_literally(const void *buf, unsigned long len,
/* type string, SP, %lu of the length plus NUL must fit this */
hdrlen = strlen(type) + MAX_HEADER_LEN;
header = xmalloc(hdrlen);
- write_object_file_prepare(the_hash_algo, buf, len, type, oid, header,
- &hdrlen);
+ write_object_file_prepare_literally(the_hash_algo, buf, len, type,
+ oid, header, &hdrlen);
if (!(flags & HASH_WRITE_OBJECT))
goto cleanup;
if (freshen_packed_object(oid) || freshen_loose_object(oid))
goto cleanup;
- status = write_loose_object(oid, header, hdrlen, buf, len, 0);
+ status = write_loose_object(oid, header, hdrlen, buf, len, 0, 0);
cleanup:
free(header);
@@ -2016,8 +2105,8 @@ int force_object_loose(const struct object_id *oid, time_t mtime)
buf = read_object(the_repository, oid, &type, &len);
if (!buf)
return error(_("cannot read object for %s"), oid_to_hex(oid));
- hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(type), (uintmax_t)len) + 1;
- ret = write_loose_object(oid, hdr, hdrlen, buf, len, mtime);
+ hdrlen = format_object_header(hdr, sizeof(hdr), type, len);
+ ret = write_loose_object(oid, hdr, hdrlen, buf, len, mtime, 0);
free(buf);
return ret;
@@ -2082,7 +2171,8 @@ static int index_mem(struct index_state *istate,
enum object_type type,
const char *path, unsigned flags)
{
- int ret, re_allocated = 0;
+ int ret = 0;
+ int re_allocated = 0;
int write_object = flags & HASH_WRITE_OBJECT;
if (!type)
@@ -2109,10 +2199,9 @@ static int index_mem(struct index_state *istate,
}
if (write_object)
- ret = write_object_file(buf, size, type_name(type), oid);
+ ret = write_object_file(buf, size, type, oid);
else
- ret = hash_object_file(the_hash_algo, buf, size,
- type_name(type), oid);
+ hash_object_file(the_hash_algo, buf, size, type, oid);
if (re_allocated)
free(buf);
return ret;
@@ -2124,7 +2213,7 @@ static int index_stream_convert_blob(struct index_state *istate,
const char *path,
unsigned flags)
{
- int ret;
+ int ret = 0;
const int write_object = flags & HASH_WRITE_OBJECT;
struct strbuf sbuf = STRBUF_INIT;
@@ -2135,11 +2224,11 @@ static int index_stream_convert_blob(struct index_state *istate,
get_conv_flags(flags));
if (write_object)
- ret = write_object_file(sbuf.buf, sbuf.len, type_name(OBJ_BLOB),
+ ret = write_object_file(sbuf.buf, sbuf.len, OBJ_BLOB,
oid);
else
- ret = hash_object_file(the_hash_algo, sbuf.buf, sbuf.len,
- type_name(OBJ_BLOB), oid);
+ hash_object_file(the_hash_algo, sbuf.buf, sbuf.len, OBJ_BLOB,
+ oid);
strbuf_release(&sbuf);
return ret;
}
@@ -2258,8 +2347,8 @@ int index_path(struct index_state *istate, struct object_id *oid,
return error_errno("readlink(\"%s\")", path);
if (!(flags & HASH_WRITE_OBJECT))
hash_object_file(the_hash_algo, sb.buf, sb.len,
- blob_type, oid);
- else if (write_object_file(sb.buf, sb.len, blob_type, oid))
+ OBJ_BLOB, oid);
+ else if (write_object_file(sb.buf, sb.len, OBJ_BLOB, oid))
rc = error(_("%s: failed to insert into database"), path);
strbuf_release(&sb);
break;
@@ -2432,7 +2521,7 @@ struct oidtree *odb_loose_cache(struct object_directory *odb,
struct strbuf buf = STRBUF_INIT;
size_t word_bits = bitsizeof(odb->loose_objects_subdir_seen[0]);
size_t word_index = subdir_nr / word_bits;
- size_t mask = 1u << (subdir_nr % word_bits);
+ size_t mask = (size_t)1u << (subdir_nr % word_bits);
uint32_t *bitmap;
if (subdir_nr < 0 ||
@@ -2524,17 +2613,16 @@ static int check_stream_oid(git_zstream *stream,
int read_loose_object(const char *path,
const struct object_id *expected_oid,
- enum object_type *type,
- unsigned long *size,
- void **contents)
+ struct object_id *real_oid,
+ void **contents,
+ struct object_info *oi)
{
int ret = -1;
void *map = NULL;
unsigned long mapsize;
git_zstream stream;
char hdr[MAX_HEADER_LEN];
-
- *contents = NULL;
+ unsigned long *size = oi->sizep;
map = map_loose_object_1(the_repository, path, NULL, &mapsize);
if (!map) {
@@ -2542,19 +2630,19 @@ int read_loose_object(const char *path,
goto out;
}
- if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0) {
+ if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),
+ NULL) != ULHR_OK) {
error(_("unable to unpack header of %s"), path);
goto out;
}
- *type = parse_loose_header(hdr, size);
- if (*type < 0) {
+ if (parse_loose_header(hdr, oi) < 0) {
error(_("unable to parse header of %s"), path);
git_inflate_end(&stream);
goto out;
}
- if (*type == OBJ_BLOB && *size > big_file_threshold) {
+ if (*oi->typep == OBJ_BLOB && *size > big_file_threshold) {
if (check_stream_oid(&stream, hdr, *size, path, expected_oid) < 0)
goto out;
} else {
@@ -2564,14 +2652,11 @@ int read_loose_object(const char *path,
git_inflate_end(&stream);
goto out;
}
- if (check_object_signature(the_repository, expected_oid,
+ hash_object_file_literally(the_repository->hash_algo,
*contents, *size,
- type_name(*type))) {
- error(_("hash mismatch for %s (expected %s)"), path,
- oid_to_hex(expected_oid));
- free(*contents);
+ oi->type_name->buf, real_oid);
+ if (!oideq(expected_oid, real_oid))
goto out;
- }
}
ret = 0; /* everything checks out */
diff --git a/object-name.c b/object-name.c
index fdff460..4d27465 100644
--- a/object-name.c
+++ b/object-name.c
@@ -15,6 +15,7 @@
#include "submodule.h"
#include "midx.h"
#include "commit-reach.h"
+#include "date.h"
static int get_oid_oneline(struct repository *r, const char *, struct object_id *, struct commit_list *);
@@ -351,35 +352,118 @@ static int init_object_disambiguation(struct repository *r,
return 0;
}
+struct ambiguous_output {
+ const struct disambiguate_state *ds;
+ struct strbuf advice;
+ struct strbuf sb;
+};
+
static int show_ambiguous_object(const struct object_id *oid, void *data)
{
- const struct disambiguate_state *ds = data;
- struct strbuf desc = STRBUF_INIT;
+ struct ambiguous_output *state = data;
+ const struct disambiguate_state *ds = state->ds;
+ struct strbuf *advice = &state->advice;
+ struct strbuf *sb = &state->sb;
int type;
+ const char *hash;
if (ds->fn && !ds->fn(ds->repo, oid, ds->cb_data))
return 0;
+ hash = repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV);
type = oid_object_info(ds->repo, oid, NULL);
+
+ if (type < 0) {
+ /*
+ * TRANSLATORS: This is a line of ambiguous object
+ * output shown when we cannot look up or parse the
+ * object in question. E.g. "deadbeef [bad object]".
+ */
+ strbuf_addf(sb, _("%s [bad object]"), hash);
+ goto out;
+ }
+
+ assert(type == OBJ_TREE || type == OBJ_COMMIT ||
+ type == OBJ_BLOB || type == OBJ_TAG);
+
if (type == OBJ_COMMIT) {
+ struct strbuf date = STRBUF_INIT;
+ struct strbuf msg = STRBUF_INIT;
struct commit *commit = lookup_commit(ds->repo, oid);
+
if (commit) {
struct pretty_print_context pp = {0};
pp.date_mode.type = DATE_SHORT;
- format_commit_message(commit, " %ad - %s", &desc, &pp);
+ format_commit_message(commit, "%ad", &date, &pp);
+ format_commit_message(commit, "%s", &msg, &pp);
}
+
+ /*
+ * TRANSLATORS: This is a line of ambiguous commit
+ * object output. E.g.:
+ *
+ * "deadbeef commit 2021-01-01 - Some Commit Message"
+ */
+ strbuf_addf(sb, _("%s commit %s - %s"), hash, date.buf,
+ msg.buf);
+
+ strbuf_release(&date);
+ strbuf_release(&msg);
} else if (type == OBJ_TAG) {
struct tag *tag = lookup_tag(ds->repo, oid);
- if (!parse_tag(tag) && tag->tag)
- strbuf_addf(&desc, " %s", tag->tag);
+
+ if (!parse_tag(tag) && tag->tag) {
+ /*
+ * TRANSLATORS: This is a line of ambiguous
+ * tag object output. E.g.:
+ *
+ * "deadbeef tag 2022-01-01 - Some Tag Message"
+ *
+ * The second argument is the YYYY-MM-DD found
+ * in the tag.
+ *
+ * The third argument is the "tag" string
+ * from object.c.
+ */
+ strbuf_addf(sb, _("%s tag %s - %s"), hash,
+ show_date(tag->date, 0, DATE_MODE(SHORT)),
+ tag->tag);
+ } else {
+ /*
+ * TRANSLATORS: This is a line of ambiguous
+ * tag object output where we couldn't parse
+ * the tag itself. E.g.:
+ *
+ * "deadbeef [bad tag, could not parse it]"
+ */
+ strbuf_addf(sb, _("%s [bad tag, could not parse it]"),
+ hash);
+ }
+ } else if (type == OBJ_TREE) {
+ /*
+ * TRANSLATORS: This is a line of ambiguous <type>
+ * object output. E.g. "deadbeef tree".
+ */
+ strbuf_addf(sb, _("%s tree"), hash);
+ } else if (type == OBJ_BLOB) {
+ /*
+ * TRANSLATORS: This is a line of ambiguous <type>
+ * object output. E.g. "deadbeef blob".
+ */
+ strbuf_addf(sb, _("%s blob"), hash);
}
- advise(" %s %s%s",
- repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV),
- type_name(type) ? type_name(type) : "unknown type",
- desc.buf);
- strbuf_release(&desc);
+out:
+ /*
+ * TRANSLATORS: This is line item of ambiguous object output
+ * from describe_ambiguous_object() above. For RTL languages
+ * you'll probably want to swap the "%s" and leading " " space
+ * around.
+ */
+ strbuf_addf(advice, _(" %s\n"), sb->buf);
+
+ strbuf_reset(sb);
return 0;
}
@@ -476,6 +560,11 @@ static enum get_oid_result get_short_oid(struct repository *r,
if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {
struct oid_array collect = OID_ARRAY_INIT;
+ struct ambiguous_output out = {
+ .ds = &ds,
+ .sb = STRBUF_INIT,
+ .advice = STRBUF_INIT,
+ };
error(_("short object ID %s is ambiguous"), ds.hex_pfx);
@@ -488,13 +577,22 @@ static enum get_oid_result get_short_oid(struct repository *r,
if (!ds.ambiguous)
ds.fn = NULL;
- advise(_("The candidates are:"));
repo_for_each_abbrev(r, ds.hex_pfx, collect_ambiguous, &collect);
sort_ambiguous_oid_array(r, &collect);
- if (oid_array_for_each(&collect, show_ambiguous_object, &ds))
+ if (oid_array_for_each(&collect, show_ambiguous_object, &out))
BUG("show_ambiguous_object shouldn't return non-zero");
+
+ /*
+ * TRANSLATORS: The argument is the list of ambiguous
+ * objects composed in show_ambiguous_object(). See
+ * its "TRANSLATORS" comments for details.
+ */
+ advise(_("The candidates are:\n%s"), out.advice.buf);
+
oid_array_clear(&collect);
+ strbuf_release(&out.advice);
+ strbuf_release(&out.sb);
}
return status;
@@ -1734,7 +1832,8 @@ static void diagnose_invalid_index_path(struct repository *r,
pos = -pos - 1;
if (pos < istate->cache_nr) {
ce = istate->cache[pos];
- if (ce_namelen(ce) == namelen &&
+ if (!S_ISSPARSEDIR(ce->ce_mode) &&
+ ce_namelen(ce) == namelen &&
!memcmp(ce->name, filename, namelen))
die(_("path '%s' is in the index, but not at stage %d\n"
"hint: Did you mean ':%d:%s'?"),
@@ -1750,7 +1849,8 @@ static void diagnose_invalid_index_path(struct repository *r,
pos = -pos - 1;
if (pos < istate->cache_nr) {
ce = istate->cache[pos];
- if (ce_namelen(ce) == fullname.len &&
+ if (!S_ISSPARSEDIR(ce->ce_mode) &&
+ ce_namelen(ce) == fullname.len &&
!memcmp(ce->name, fullname.buf, fullname.len))
die(_("path '%s' is in the index, but not '%s'\n"
"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"),
@@ -1783,6 +1883,20 @@ static char *resolve_relative_path(struct repository *r, const char *rel)
rel);
}
+static int reject_tree_in_index(struct repository *repo,
+ int only_to_die,
+ const struct cache_entry *ce,
+ int stage,
+ const char *prefix,
+ const char *cp)
+{
+ if (!S_ISSPARSEDIR(ce->ce_mode))
+ return 0;
+ if (only_to_die)
+ diagnose_invalid_index_path(repo, stage, prefix, cp);
+ return -1;
+}
+
static enum get_oid_result get_oid_with_context_1(struct repository *repo,
const char *name,
unsigned flags,
@@ -1795,13 +1909,13 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
const char *cp;
int only_to_die = flags & GET_OID_ONLY_TO_DIE;
- if (only_to_die)
- flags |= GET_OID_QUIETLY;
-
memset(oc, 0, sizeof(*oc));
oc->mode = S_IFINVALID;
strbuf_init(&oc->symlink_path, 0);
ret = get_oid_1(repo, name, namelen, oid, flags);
+ if (!ret && flags & GET_OID_REQUIRE_PATH)
+ die(_("<object>:<path> required, only <object> '%s' given"),
+ name);
if (!ret)
return ret;
/*
@@ -1857,9 +1971,12 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
memcmp(ce->name, cp, namelen))
break;
if (ce_stage(ce) == stage) {
+ free(new_path);
+ if (reject_tree_in_index(repo, only_to_die, ce,
+ stage, prefix, cp))
+ return -1;
oidcpy(oid, &ce->oid);
oc->mode = ce->ce_mode;
- free(new_path);
return 0;
}
pos++;
@@ -1932,7 +2049,7 @@ void maybe_die_on_misspelt_object_name(struct repository *r,
{
struct object_context oc;
struct object_id oid;
- get_oid_with_context_1(r, name, GET_OID_ONLY_TO_DIE,
+ get_oid_with_context_1(r, name, GET_OID_ONLY_TO_DIE | GET_OID_QUIETLY,
prefix, &oid, &oc);
}
diff --git a/object-store.h b/object-store.h
index 1e647a5..539ea43 100644
--- a/object-store.h
+++ b/object-store.h
@@ -28,6 +28,18 @@ struct object_directory {
struct oidtree *loose_objects_cache;
/*
+ * This is a temporary object store created by the tmp_objdir
+ * facility. Disable ref updates since the objects in the store
+ * might be discarded on rollback.
+ */
+ int disable_ref_updates;
+
+ /*
+ * This object store is ephemeral, so there is no need to fsync.
+ */
+ int will_destroy;
+
+ /*
* Path to the alternative object store. If this is a relative path,
* it is relative to the current working directory.
*/
@@ -59,6 +71,17 @@ void add_to_alternates_file(const char *dir);
void add_to_alternates_memory(const char *dir);
/*
+ * Replace the current writable object directory with the specified temporary
+ * object directory; returns the former primary object directory.
+ */
+struct object_directory *set_temporary_primary_odb(const char *dir, int will_destroy);
+
+/*
+ * Restore a previous ODB replaced by set_temporary_main_odb.
+ */
+void restore_primary_odb(struct object_directory *restore_odb, const char *old_path);
+
+/*
* Populate and return the loose object cache array corresponding to the
* given object ID.
*/
@@ -68,6 +91,9 @@ struct oidtree *odb_loose_cache(struct object_directory *odb,
/* Empty the loose object cache for the specified object directory. */
void odb_clear_loose_cache(struct object_directory *odb);
+/* Clear and free the specified object directory */
+void free_object_directory(struct object_directory *odb);
+
struct packed_git {
struct hashmap_entry packmap_ent;
struct packed_git *next;
@@ -89,12 +115,20 @@ struct packed_git {
freshened:1,
do_not_close:1,
pack_promisor:1,
- multi_pack_index:1;
+ multi_pack_index:1,
+ is_cruft:1;
unsigned char hash[GIT_MAX_RAWSZ];
struct revindex_entry *revindex;
const uint32_t *revindex_data;
const uint32_t *revindex_map;
size_t revindex_size;
+ /*
+ * mtimes_map points at the beginning of the memory mapped region of
+ * this pack's corresponding .mtimes file, and mtimes_size is the size
+ * of that .mtimes file
+ */
+ const uint32_t *mtimes_map;
+ size_t mtimes_size;
/* something like ".git/objects/pack/xxxxx.pack" */
char pack_name[FLEX_ARRAY]; /* more */
};
@@ -219,16 +253,22 @@ static inline void *repo_read_object_file(struct repository *r,
/* Read and unpack an object file into memory, write memory to an object file */
int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);
-int hash_object_file(const struct git_hash_algo *algo, const void *buf,
- unsigned long len, const char *type,
- struct object_id *oid);
+void hash_object_file(const struct git_hash_algo *algo, const void *buf,
+ unsigned long len, enum object_type type,
+ struct object_id *oid);
-int write_object_file(const void *buf, unsigned long len,
- const char *type, struct object_id *oid);
+int write_object_file_flags(const void *buf, unsigned long len,
+ enum object_type type, struct object_id *oid,
+ unsigned flags);
+static inline int write_object_file(const void *buf, unsigned long len,
+ enum object_type type, struct object_id *oid)
+{
+ return write_object_file_flags(buf, len, type, oid, 0);
+}
-int hash_object_file_literally(const void *buf, unsigned long len,
- const char *type, struct object_id *oid,
- unsigned flags);
+int write_object_file_literally(const void *buf, unsigned long len,
+ const char *type, struct object_id *oid,
+ unsigned flags);
/*
* Add an object file to the in-memory object store, without writing it
@@ -245,6 +285,7 @@ int force_object_loose(const struct object_id *oid, time_t mtime);
/*
* Open the loose object at path, check its hash, and return the contents,
+ * use the "oi" argument to assert things about the object, or e.g. populate its
* type, and size. If the object is a blob, then "contents" may return NULL,
* to allow streaming of large blobs.
*
@@ -252,9 +293,9 @@ int force_object_loose(const struct object_id *oid, time_t mtime);
*/
int read_loose_object(const char *path,
const struct object_id *expected_oid,
- enum object_type *type,
- unsigned long *size,
- void **contents);
+ struct object_id *real_oid,
+ void **contents,
+ struct object_info *oi);
/* Retry packed storage after checking packed and loose storage */
#define HAS_OBJECT_RECHECK_PACKED 1
@@ -279,10 +320,6 @@ int has_object(struct repository *r, const struct object_id *oid,
* These functions can be removed once all callers have migrated to
* has_object() and/or oid_object_info_extended().
*/
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
-#define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags)
-#define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1)
-#endif
int repo_has_object_file(struct repository *r, const struct object_id *oid);
int repo_has_object_file_with_flags(struct repository *r,
const struct object_id *oid, int flags);
@@ -298,6 +335,16 @@ int repo_has_object_file_with_flags(struct repository *r,
*/
int has_loose_object_nonlocal(const struct object_id *);
+int has_loose_object(const struct object_id *);
+
+/**
+ * format_object_header() is a thin wrapper around s xsnprintf() that
+ * writes the initial "<type> <obj-len>" part of the loose object
+ * header. It returns the size that snprintf() returns + 1.
+ */
+int format_object_header(char *str, size_t size, enum object_type type,
+ size_t objsize);
+
void assert_oid_type(const struct object_id *oid, enum object_type expect);
/*
diff --git a/object.c b/object.c
index 4e85955..588b815 100644
--- a/object.c
+++ b/object.c
@@ -199,7 +199,7 @@ struct object *lookup_object_by_type(struct repository *r,
case OBJ_BLOB:
return (struct object *)lookup_blob(r, oid);
default:
- die("BUG: unknown object type %d", type);
+ BUG("unknown object type %d", type);
}
}
@@ -279,7 +279,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
if ((obj && obj->type == OBJ_BLOB && repo_has_object_file(r, oid)) ||
(!obj && repo_has_object_file(r, oid) &&
oid_object_info(r, oid, NULL) == OBJ_BLOB)) {
- if (check_object_signature(r, repl, NULL, 0, NULL) < 0) {
+ if (stream_object_signature(r, repl) < 0) {
error(_("hash mismatch %s"), oid_to_hex(oid));
return NULL;
}
@@ -289,8 +289,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
buffer = repo_read_object_file(r, oid, &type, &size);
if (buffer) {
- if (check_object_signature(r, repl, buffer, size,
- type_name(type)) < 0) {
+ if (check_object_signature(r, repl, buffer, size, type) < 0) {
free(buffer);
error(_("hash mismatch %s"), oid_to_hex(repl));
return NULL;
@@ -513,7 +512,7 @@ struct raw_object_store *raw_object_store_new(void)
return o;
}
-static void free_object_directory(struct object_directory *odb)
+void free_object_directory(struct object_directory *odb)
{
free(odb->path);
odb_clear_loose_cache(odb);
diff --git a/object.h b/object.h
index cb556ab..a221946 100644
--- a/object.h
+++ b/object.h
@@ -75,7 +75,7 @@ struct object_array {
* builtin/fsck.c: 0--3
* builtin/gc.c: 0
* builtin/index-pack.c: 2021
- * builtin/reflog.c: 10--12
+ * reflog.c: 10--12
* builtin/show-branch.c: 0-------------------------------------------26
* builtin/unpack-objects.c: 2021
*/
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 9c55c15..c43375b 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -326,6 +326,7 @@ static void bitmap_builder_init(struct bitmap_builder *bb,
trace2_data_intmax("pack-bitmap-write", the_repository,
"num_maximal_commits", num_maximal);
+ release_revisions(&revs);
free_commit_list(reusable);
}
@@ -575,15 +576,15 @@ void bitmap_writer_select_commits(struct commit **indexed_commits,
QSORT(indexed_commits, indexed_commits_nr, date_compare);
- if (writer.show_progress)
- writer.progress = start_progress("Selecting bitmap commits", 0);
-
if (indexed_commits_nr < 100) {
for (i = 0; i < indexed_commits_nr; ++i)
push_bitmapped_commit(indexed_commits[i]);
return;
}
+ if (writer.show_progress)
+ writer.progress = start_progress("Selecting bitmap commits", 0);
+
for (;;) {
struct commit *chosen = NULL;
@@ -719,7 +720,8 @@ void bitmap_writer_finish(struct pack_idx_entry **index,
if (options & BITMAP_OPT_HASH_CACHE)
write_hash_cache(f, index, index_nr);
- finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);
+ finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA,
+ CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);
if (adjust_shared_perm(tmp_file.buf))
die_errno("unable to make temporary bitmap file readable");
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 33a3732..3613422 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -111,7 +111,7 @@ static struct ewah_bitmap *lookup_stored_bitmap(struct stored_bitmap *st)
struct ewah_bitmap *parent;
struct ewah_bitmap *composed;
- if (st->xor == NULL)
+ if (!st->xor)
return st->root;
composed = ewah_pool_new();
@@ -279,7 +279,7 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
if (xor_offset > 0) {
xor_bitmap = recent_bitmaps[(i - xor_offset) % MAX_XOR_OFFSET];
- if (xor_bitmap == NULL)
+ if (!xor_bitmap)
return error("Invalid XOR offset in bitmap pack index");
}
@@ -292,9 +292,12 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
char *midx_bitmap_filename(struct multi_pack_index *midx)
{
- return xstrfmt("%s-%s.bitmap",
- get_midx_filename(midx->object_dir),
- hash_to_hex(get_midx_checksum(midx)));
+ struct strbuf buf = STRBUF_INIT;
+
+ get_midx_filename(&buf, midx->object_dir);
+ strbuf_addf(&buf, "-%s.bitmap", hash_to_hex(get_midx_checksum(midx)));
+
+ return strbuf_detach(&buf, NULL);
}
char *pack_bitmap_filename(struct packed_git *p)
@@ -312,6 +315,8 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
struct stat st;
char *idx_name = midx_bitmap_filename(midx);
int fd = git_open(idx_name);
+ uint32_t i;
+ struct packed_git *preferred;
free(idx_name);
@@ -324,10 +329,12 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
}
if (bitmap_git->pack || bitmap_git->midx) {
+ struct strbuf buf = STRBUF_INIT;
+ get_midx_filename(&buf, midx->object_dir);
/* ignore extra bitmap file; we can only handle one */
- warning("ignoring extra bitmap file: %s",
- get_midx_filename(midx->object_dir));
+ warning("ignoring extra bitmap file: %s", buf.buf);
close(fd);
+ strbuf_release(&buf);
return -1;
}
@@ -348,12 +355,28 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
warning(_("multi-pack bitmap is missing required reverse index"));
goto cleanup;
}
+
+ for (i = 0; i < bitmap_git->midx->num_packs; i++) {
+ if (prepare_midx_pack(the_repository, bitmap_git->midx, i))
+ die(_("could not open pack %s"),
+ bitmap_git->midx->pack_names[i]);
+ }
+
+ preferred = bitmap_git->midx->packs[midx_preferred_pack(bitmap_git)];
+ if (!is_pack_valid(preferred)) {
+ warning(_("preferred pack (%s) is invalid"),
+ preferred->pack_name);
+ goto cleanup;
+ }
+
return 0;
cleanup:
munmap(bitmap_git->map, bitmap_git->map_size);
bitmap_git->map_size = 0;
+ bitmap_git->map_pos = 0;
bitmap_git->map = NULL;
+ bitmap_git->midx = NULL;
return -1;
}
@@ -400,6 +423,8 @@ static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git
munmap(bitmap_git->map, bitmap_git->map_size);
bitmap_git->map = NULL;
bitmap_git->map_size = 0;
+ bitmap_git->map_pos = 0;
+ bitmap_git->pack = NULL;
return -1;
}
@@ -420,8 +445,6 @@ static int load_reverse_index(struct bitmap_index *bitmap_git)
* since we will need to make use of them in pack-objects.
*/
for (i = 0; i < bitmap_git->midx->num_packs; i++) {
- if (prepare_midx_pack(the_repository, bitmap_git->midx, i))
- die(_("load_reverse_index: could not open pack"));
ret = load_pack_revindex(bitmap_git->midx->packs[i]);
if (ret)
return ret;
@@ -719,7 +742,7 @@ static int add_commit_to_bitmap(struct bitmap_index *bitmap_git,
if (!or_with)
return 0;
- if (*base == NULL)
+ if (!*base)
*base = ewah_to_bitmap(or_with);
else
bitmap_or_ewah(*base, or_with);
@@ -730,8 +753,7 @@ static int add_commit_to_bitmap(struct bitmap_index *bitmap_git,
static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
struct rev_info *revs,
struct object_list *roots,
- struct bitmap *seen,
- struct list_objects_filter_options *filter)
+ struct bitmap *seen)
{
struct bitmap *base = NULL;
int needs_walk = 0;
@@ -763,7 +785,7 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
* Best case scenario: We found bitmaps for all the roots,
* so the resulting `or` bitmap has the full reachability analysis
*/
- if (not_mapped == NULL)
+ if (!not_mapped)
return base;
roots = not_mapped;
@@ -797,7 +819,7 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
struct include_data incdata;
struct bitmap_show_data show_data;
- if (base == NULL)
+ if (!base)
base = bitmap_new();
incdata.bitmap_git = bitmap_git;
@@ -814,9 +836,9 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
show_data.bitmap_git = bitmap_git;
show_data.base = base;
- traverse_commit_list_filtered(filter, revs,
- show_commit, show_object,
- &show_data, NULL);
+ traverse_commit_list(revs,
+ show_commit, show_object,
+ &show_data);
revs->include_check = NULL;
revs->include_check_obj = NULL;
@@ -1210,7 +1232,6 @@ static int can_filter_bitmap(struct list_objects_filter_options *filter)
}
struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
- struct list_objects_filter_options *filter,
int filter_provided_objects)
{
unsigned int i;
@@ -1231,7 +1252,7 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
if (revs->prune)
return NULL;
- if (!can_filter_bitmap(filter))
+ if (!can_filter_bitmap(&revs->filter))
return NULL;
/* try to open a bitmapped pack, but don't parse it yet
@@ -1288,17 +1309,15 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
if (haves) {
revs->ignore_missing_links = 1;
- haves_bitmap = find_objects(bitmap_git, revs, haves, NULL,
- filter);
+ haves_bitmap = find_objects(bitmap_git, revs, haves, NULL);
reset_revision_walk();
revs->ignore_missing_links = 0;
- if (haves_bitmap == NULL)
+ if (!haves_bitmap)
BUG("failed to perform bitmap walk");
}
- wants_bitmap = find_objects(bitmap_git, revs, wants, haves_bitmap,
- filter);
+ wants_bitmap = find_objects(bitmap_git, revs, wants, haves_bitmap);
if (!wants_bitmap)
BUG("failed to perform bitmap walk");
@@ -1306,8 +1325,10 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
if (haves_bitmap)
bitmap_and_not(wants_bitmap, haves_bitmap);
- filter_bitmap(bitmap_git, (filter && filter_provided_objects) ? NULL : wants,
- wants_bitmap, filter);
+ filter_bitmap(bitmap_git,
+ (revs->filter.choice && filter_provided_objects) ? NULL : wants,
+ wants_bitmap,
+ &revs->filter);
bitmap_git->result = wants_bitmap;
bitmap_git->haves = haves_bitmap;
@@ -1418,7 +1439,7 @@ static int try_partial_reuse(struct packed_git *pack,
return 0;
}
-static uint32_t midx_preferred_pack(struct bitmap_index *bitmap_git)
+uint32_t midx_preferred_pack(struct bitmap_index *bitmap_git)
{
struct multi_pack_index *m = bitmap_git->midx;
if (!m)
@@ -1691,7 +1712,7 @@ void test_bitmap_walk(struct rev_info *revs)
result = ewah_to_bitmap(bm);
}
- if (result == NULL)
+ if (!result)
die("Commit %s doesn't have an indexed bitmap", oid_to_hex(&root->oid));
revs->tag_objects = 1;
@@ -1721,6 +1742,12 @@ void test_bitmap_walk(struct rev_info *revs)
else
die("mismatch in bitmap results");
+ bitmap_free(result);
+ bitmap_free(tdata.base);
+ bitmap_free(tdata.commits);
+ bitmap_free(tdata.trees);
+ bitmap_free(tdata.blobs);
+ bitmap_free(tdata.tags);
free_bitmap_index(bitmap_git);
}
@@ -1748,7 +1775,7 @@ int test_bitmap_hashes(struct repository *r)
struct object_id oid;
uint32_t i, index_pos;
- if (!bitmap_git->hashes)
+ if (!bitmap_git || !bitmap_git->hashes)
goto cleanup;
for (i = 0; i < bitmap_num_objects(bitmap_git); i++) {
@@ -1848,9 +1875,17 @@ void free_bitmap_index(struct bitmap_index *b)
ewah_pool_free(b->trees);
ewah_pool_free(b->blobs);
ewah_pool_free(b->tags);
+ if (b->bitmaps) {
+ struct stored_bitmap *sb;
+ kh_foreach_value(b->bitmaps, sb, {
+ ewah_pool_free(sb->root);
+ free(sb);
+ });
+ }
kh_destroy_oid_map(b->bitmaps);
free(b->ext_index.objects);
free(b->ext_index.hashes);
+ kh_destroy_oid_pos(b->ext_index.positions);
bitmap_free(b->result);
bitmap_free(b->haves);
if (bitmap_is_midx(b)) {
diff --git a/pack-bitmap.h b/pack-bitmap.h
index ed46d27..3d3ddd7 100644
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -10,7 +10,6 @@
struct commit;
struct repository;
struct rev_info;
-struct list_objects_filter_options;
static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'};
@@ -54,8 +53,8 @@ void test_bitmap_walk(struct rev_info *revs);
int test_bitmap_commits(struct repository *r);
int test_bitmap_hashes(struct repository *r);
struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
- struct list_objects_filter_options *filter,
int filter_provided_objects);
+uint32_t midx_preferred_pack(struct bitmap_index *bitmap_git);
int reuse_partial_packfile_from_bitmap(struct bitmap_index *,
struct packed_git **packfile,
uint32_t *entries,
diff --git a/pack-check.c b/pack-check.c
index c8e560d..bfb593b 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -127,7 +127,7 @@ static int verify_packfile(struct repository *r,
if (type == OBJ_BLOB && big_file_threshold <= size) {
/*
- * Let check_object_signature() check it with
+ * Let stream_object_signature() check it with
* the streaming interface; no point slurping
* the data in-core only to discard.
*/
@@ -142,7 +142,11 @@ static int verify_packfile(struct repository *r,
err = error("cannot unpack %s from %s at offset %"PRIuMAX"",
oid_to_hex(&oid), p->pack_name,
(uintmax_t)entries[i].offset);
- else if (check_object_signature(r, &oid, data, size, type_name(type)))
+ else if (data && check_object_signature(r, &oid, data, size,
+ type) < 0)
+ err = error("packed %s from %s is corrupt",
+ oid_to_hex(&oid), p->pack_name);
+ else if (!data && stream_object_signature(r, &oid) < 0)
err = error("packed %s from %s is corrupt",
oid_to_hex(&oid), p->pack_name);
else if (fn) {
diff --git a/pack-mtimes.c b/pack-mtimes.c
new file mode 100644
index 0000000..0e0aafd
--- /dev/null
+++ b/pack-mtimes.c
@@ -0,0 +1,129 @@
+#include "git-compat-util.h"
+#include "pack-mtimes.h"
+#include "object-store.h"
+#include "packfile.h"
+
+static char *pack_mtimes_filename(struct packed_git *p)
+{
+ size_t len;
+ if (!strip_suffix(p->pack_name, ".pack", &len))
+ BUG("pack_name does not end in .pack");
+ return xstrfmt("%.*s.mtimes", (int)len, p->pack_name);
+}
+
+#define MTIMES_HEADER_SIZE (12)
+
+struct mtimes_header {
+ uint32_t signature;
+ uint32_t version;
+ uint32_t hash_id;
+};
+
+static int load_pack_mtimes_file(char *mtimes_file,
+ uint32_t num_objects,
+ const uint32_t **data_p, size_t *len_p)
+{
+ int fd, ret = 0;
+ struct stat st;
+ uint32_t *data = NULL;
+ size_t mtimes_size, expected_size;
+ struct mtimes_header header;
+
+ fd = git_open(mtimes_file);
+
+ if (fd < 0) {
+ ret = -1;
+ goto cleanup;
+ }
+ if (fstat(fd, &st)) {
+ ret = error_errno(_("failed to read %s"), mtimes_file);
+ goto cleanup;
+ }
+
+ mtimes_size = xsize_t(st.st_size);
+
+ if (mtimes_size < MTIMES_HEADER_SIZE) {
+ ret = error(_("mtimes file %s is too small"), mtimes_file);
+ goto cleanup;
+ }
+
+ data = xmmap(NULL, mtimes_size, PROT_READ, MAP_PRIVATE, fd, 0);
+
+ header.signature = ntohl(data[0]);
+ header.version = ntohl(data[1]);
+ header.hash_id = ntohl(data[2]);
+
+ if (header.signature != MTIMES_SIGNATURE) {
+ ret = error(_("mtimes file %s has unknown signature"), mtimes_file);
+ goto cleanup;
+ }
+
+ if (header.version != 1) {
+ ret = error(_("mtimes file %s has unsupported version %"PRIu32),
+ mtimes_file, header.version);
+ goto cleanup;
+ }
+
+ if (!(header.hash_id == 1 || header.hash_id == 2)) {
+ ret = error(_("mtimes file %s has unsupported hash id %"PRIu32),
+ mtimes_file, header.hash_id);
+ goto cleanup;
+ }
+
+
+ expected_size = MTIMES_HEADER_SIZE;
+ expected_size = st_add(expected_size, st_mult(sizeof(uint32_t), num_objects));
+ expected_size = st_add(expected_size, 2 * (header.hash_id == 1 ? GIT_SHA1_RAWSZ : GIT_SHA256_RAWSZ));
+
+ if (mtimes_size != expected_size) {
+ ret = error(_("mtimes file %s is corrupt"), mtimes_file);
+ goto cleanup;
+ }
+
+cleanup:
+ if (ret) {
+ if (data)
+ munmap(data, mtimes_size);
+ } else {
+ *len_p = mtimes_size;
+ *data_p = data;
+ }
+
+ close(fd);
+ return ret;
+}
+
+int load_pack_mtimes(struct packed_git *p)
+{
+ char *mtimes_name = NULL;
+ int ret = 0;
+
+ if (!p->is_cruft)
+ return ret; /* not a cruft pack */
+ if (p->mtimes_map)
+ return ret; /* already loaded */
+
+ ret = open_pack_index(p);
+ if (ret < 0)
+ goto cleanup;
+
+ mtimes_name = pack_mtimes_filename(p);
+ ret = load_pack_mtimes_file(mtimes_name,
+ p->num_objects,
+ &p->mtimes_map,
+ &p->mtimes_size);
+cleanup:
+ free(mtimes_name);
+ return ret;
+}
+
+uint32_t nth_packed_mtime(struct packed_git *p, uint32_t pos)
+{
+ if (!p->mtimes_map)
+ BUG("pack .mtimes file not loaded for %s", p->pack_name);
+ if (p->num_objects <= pos)
+ BUG("pack .mtimes out-of-bounds (%"PRIu32" vs %"PRIu32")",
+ pos, p->num_objects);
+
+ return get_be32(p->mtimes_map + pos + 3);
+}
diff --git a/pack-mtimes.h b/pack-mtimes.h
new file mode 100644
index 0000000..cc957b3
--- /dev/null
+++ b/pack-mtimes.h
@@ -0,0 +1,26 @@
+#ifndef PACK_MTIMES_H
+#define PACK_MTIMES_H
+
+#include "git-compat-util.h"
+
+#define MTIMES_SIGNATURE 0x4d544d45 /* "MTME" */
+#define MTIMES_VERSION 1
+
+struct packed_git;
+
+/*
+ * Loads the .mtimes file corresponding to "p", if any, returning zero
+ * on success.
+ */
+int load_pack_mtimes(struct packed_git *p);
+
+/* Returns the mtime associated with the object at position "pos" (in
+ * lexicographic/index order) in pack "p".
+ *
+ * Note that it is a BUG() to call this function if either (a) "p" does
+ * not have a corresponding .mtimes file, or (b) it does, but it hasn't
+ * been loaded
+ */
+uint32_t nth_packed_mtime(struct packed_git *p, uint32_t pos);
+
+#endif
diff --git a/pack-objects.c b/pack-objects.c
index fe2a4ea..272e8d4 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -170,6 +170,9 @@ struct object_entry *packlist_alloc(struct packing_data *pdata,
if (pdata->layer)
REALLOC_ARRAY(pdata->layer, pdata->nr_alloc);
+
+ if (pdata->cruft_mtime)
+ REALLOC_ARRAY(pdata->cruft_mtime, pdata->nr_alloc);
}
new_entry = pdata->objects + pdata->nr_objects++;
@@ -198,6 +201,9 @@ struct object_entry *packlist_alloc(struct packing_data *pdata,
if (pdata->layer)
pdata->layer[pdata->nr_objects - 1] = 0;
+ if (pdata->cruft_mtime)
+ pdata->cruft_mtime[pdata->nr_objects - 1] = 0;
+
return new_entry;
}
diff --git a/pack-objects.h b/pack-objects.h
index dca2351..393b9db 100644
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -168,6 +168,14 @@ struct packing_data {
/* delta islands */
unsigned int *tree_depth;
unsigned char *layer;
+
+ /*
+ * Used when writing cruft packs.
+ *
+ * Object mtimes are stored in pack order when writing, but
+ * written out in lexicographic (index) order.
+ */
+ uint32_t *cruft_mtime;
};
void prepare_packing_data(struct repository *r, struct packing_data *pdata);
@@ -289,4 +297,21 @@ static inline void oe_set_layer(struct packing_data *pack,
pack->layer[e - pack->objects] = layer;
}
+static inline uint32_t oe_cruft_mtime(struct packing_data *pack,
+ struct object_entry *e)
+{
+ if (!pack->cruft_mtime)
+ return 0;
+ return pack->cruft_mtime[e - pack->objects];
+}
+
+static inline void oe_set_cruft_mtime(struct packing_data *pack,
+ struct object_entry *e,
+ uint32_t mtime)
+{
+ if (!pack->cruft_mtime)
+ CALLOC_ARRAY(pack->cruft_mtime, pack->nr_alloc);
+ pack->cruft_mtime[e - pack->objects] = mtime;
+}
+
#endif
diff --git a/pack-revindex.c b/pack-revindex.c
index 0e4a31d..08dc160 100644
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@ -296,14 +296,34 @@ int load_pack_revindex(struct packed_git *p)
int load_midx_revindex(struct multi_pack_index *m)
{
- char *revindex_name;
+ struct strbuf revindex_name = STRBUF_INIT;
int ret;
+
if (m->revindex_data)
return 0;
- revindex_name = get_midx_rev_filename(m);
+ if (m->chunk_revindex) {
+ /*
+ * If the MIDX `m` has a `RIDX` chunk, then use its contents for
+ * the reverse index instead of trying to load a separate `.rev`
+ * file.
+ *
+ * Note that we do *not* set `m->revindex_map` here, since we do
+ * not want to accidentally call munmap() in the middle of the
+ * MIDX.
+ */
+ trace2_data_string("load_midx_revindex", the_repository,
+ "source", "midx");
+ m->revindex_data = (const uint32_t *)m->chunk_revindex;
+ return 0;
+ }
- ret = load_revindex_from_disk(revindex_name,
+ trace2_data_string("load_midx_revindex", the_repository,
+ "source", "rev");
+
+ get_midx_rev_filename(&revindex_name, m);
+
+ ret = load_revindex_from_disk(revindex_name.buf,
m->num_objects,
&m->revindex_map,
&m->revindex_len);
@@ -313,7 +333,7 @@ int load_midx_revindex(struct multi_pack_index *m)
m->revindex_data = (const uint32_t *)((const char *)m->revindex_map + RIDX_HEADER_SIZE);
cleanup:
- free(revindex_name);
+ strbuf_release(&revindex_name);
return ret;
}
diff --git a/pack-write.c b/pack-write.c
index a5846f3..23c0342 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -2,6 +2,11 @@
#include "pack.h"
#include "csum-file.h"
#include "remote.h"
+#include "chunk-format.h"
+#include "pack-mtimes.h"
+#include "oidmap.h"
+#include "chunk-format.h"
+#include "pack-objects.h"
void reset_pack_idx_option(struct pack_idx_option *opts)
{
@@ -159,9 +164,9 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
}
hashwrite(f, sha1, the_hash_algo->rawsz);
- finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_CLOSE |
- ((opts->flags & WRITE_IDX_VERIFY)
- ? 0 : CSUM_FSYNC));
+ finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA,
+ CSUM_HASH_IN_STREAM | CSUM_CLOSE |
+ ((opts->flags & WRITE_IDX_VERIFY) ? 0 : CSUM_FSYNC));
return index_name;
}
@@ -181,21 +186,9 @@ static int pack_order_cmp(const void *va, const void *vb, void *ctx)
static void write_rev_header(struct hashfile *f)
{
- uint32_t oid_version;
- switch (hash_algo_by_ptr(the_hash_algo)) {
- case GIT_HASH_SHA1:
- oid_version = 1;
- break;
- case GIT_HASH_SHA256:
- oid_version = 2;
- break;
- default:
- die("write_rev_header: unknown hash version");
- }
-
hashwrite_be32(f, RIDX_SIGNATURE);
hashwrite_be32(f, RIDX_VERSION);
- hashwrite_be32(f, oid_version);
+ hashwrite_be32(f, oid_version(the_hash_algo));
}
static void write_rev_index_positions(struct hashfile *f,
@@ -281,12 +274,77 @@ const char *write_rev_file_order(const char *rev_name,
if (rev_name && adjust_shared_perm(rev_name) < 0)
die(_("failed to make %s readable"), rev_name);
- finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_CLOSE |
- ((flags & WRITE_IDX_VERIFY) ? 0 : CSUM_FSYNC));
+ finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA,
+ CSUM_HASH_IN_STREAM | CSUM_CLOSE |
+ ((flags & WRITE_IDX_VERIFY) ? 0 : CSUM_FSYNC));
return rev_name;
}
+static void write_mtimes_header(struct hashfile *f)
+{
+ hashwrite_be32(f, MTIMES_SIGNATURE);
+ hashwrite_be32(f, MTIMES_VERSION);
+ hashwrite_be32(f, oid_version(the_hash_algo));
+}
+
+/*
+ * Writes the object mtimes of "objects" for use in a .mtimes file.
+ * Note that objects must be in lexicographic (index) order, which is
+ * the expected ordering of these values in the .mtimes file.
+ */
+static void write_mtimes_objects(struct hashfile *f,
+ struct packing_data *to_pack,
+ struct pack_idx_entry **objects,
+ uint32_t nr_objects)
+{
+ uint32_t i;
+ for (i = 0; i < nr_objects; i++) {
+ struct object_entry *e = (struct object_entry*)objects[i];
+ hashwrite_be32(f, oe_cruft_mtime(to_pack, e));
+ }
+}
+
+static void write_mtimes_trailer(struct hashfile *f, const unsigned char *hash)
+{
+ hashwrite(f, hash, the_hash_algo->rawsz);
+}
+
+static const char *write_mtimes_file(const char *mtimes_name,
+ struct packing_data *to_pack,
+ struct pack_idx_entry **objects,
+ uint32_t nr_objects,
+ const unsigned char *hash)
+{
+ struct hashfile *f;
+ int fd;
+
+ if (!to_pack)
+ BUG("cannot call write_mtimes_file with NULL packing_data");
+
+ if (!mtimes_name) {
+ struct strbuf tmp_file = STRBUF_INIT;
+ fd = odb_mkstemp(&tmp_file, "pack/tmp_mtimes_XXXXXX");
+ mtimes_name = strbuf_detach(&tmp_file, NULL);
+ } else {
+ unlink(mtimes_name);
+ fd = xopen(mtimes_name, O_CREAT|O_EXCL|O_WRONLY, 0600);
+ }
+ f = hashfd(fd, mtimes_name);
+
+ write_mtimes_header(f);
+ write_mtimes_objects(f, to_pack, objects, nr_objects);
+ write_mtimes_trailer(f, hash);
+
+ if (adjust_shared_perm(mtimes_name) < 0)
+ die(_("failed to make %s readable"), mtimes_name);
+
+ finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA,
+ CSUM_HASH_IN_STREAM | CSUM_CLOSE | CSUM_FSYNC);
+
+ return mtimes_name;
+}
+
off_t write_pack_header(struct hashfile *f, uint32_t nr_entries)
{
struct pack_header hdr;
@@ -390,7 +448,7 @@ void fixup_pack_header_footer(int pack_fd,
the_hash_algo->final_fn(partial_pack_hash, &old_hash_ctx);
the_hash_algo->final_fn(new_pack_hash, &new_hash_ctx);
write_or_die(pack_fd, new_pack_hash, the_hash_algo->rawsz);
- fsync_or_die(pack_fd, pack_name);
+ fsync_component_or_die(FSYNC_COMPONENT_PACK, pack_fd, pack_name);
}
char *index_pack_lockfile(int ip_out, int *is_well_formed)
@@ -483,11 +541,13 @@ void stage_tmp_packfiles(struct strbuf *name_buffer,
const char *pack_tmp_name,
struct pack_idx_entry **written_list,
uint32_t nr_written,
+ struct packing_data *to_pack,
struct pack_idx_option *pack_idx_opts,
unsigned char hash[],
char **idx_tmp_name)
{
const char *rev_tmp_name = NULL;
+ const char *mtimes_tmp_name = NULL;
if (adjust_shared_perm(pack_tmp_name))
die_errno("unable to make temporary pack file readable");
@@ -500,9 +560,17 @@ void stage_tmp_packfiles(struct strbuf *name_buffer,
rev_tmp_name = write_rev_file(NULL, written_list, nr_written, hash,
pack_idx_opts->flags);
+ if (pack_idx_opts->flags & WRITE_MTIMES) {
+ mtimes_tmp_name = write_mtimes_file(NULL, to_pack, written_list,
+ nr_written,
+ hash);
+ }
+
rename_tmp_packfile(name_buffer, pack_tmp_name, "pack");
if (rev_tmp_name)
rename_tmp_packfile(name_buffer, rev_tmp_name, "rev");
+ if (mtimes_tmp_name)
+ rename_tmp_packfile(name_buffer, mtimes_tmp_name, "mtimes");
}
void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought)
diff --git a/pack.h b/pack.h
index b22bfc4..01d3859 100644
--- a/pack.h
+++ b/pack.h
@@ -44,6 +44,7 @@ struct pack_idx_option {
#define WRITE_IDX_STRICT 02
#define WRITE_REV 04
#define WRITE_REV_VERIFY 010
+#define WRITE_MTIMES 020
uint32_t version;
uint32_t off32_limit;
@@ -109,11 +110,14 @@ int encode_in_pack_object_header(unsigned char *hdr, int hdr_len,
#define PH_ERROR_PROTOCOL (-3)
int read_pack_header(int fd, struct pack_header *);
+struct packing_data;
+
struct hashfile *create_tmp_packfile(char **pack_tmp_name);
void stage_tmp_packfiles(struct strbuf *name_buffer,
const char *pack_tmp_name,
struct pack_idx_entry **written_list,
uint32_t nr_written,
+ struct packing_data *to_pack,
struct pack_idx_option *pack_idx_opts,
unsigned char hash[],
char **idx_tmp_name);
diff --git a/packfile.c b/packfile.c
index 89402cf..8e812a8 100644
--- a/packfile.c
+++ b/packfile.c
@@ -116,7 +116,7 @@ int load_idx(const char *path, const unsigned int hashsz, void *idx_map,
if (idx_size < 4 * 256 + hashsz + hashsz)
return error("index file %s is too small", path);
- if (idx_map == NULL)
+ if (!idx_map)
return error("empty data");
if (hdr->idx_signature == htonl(PACK_IDX_SIGNATURE)) {
@@ -324,7 +324,8 @@ void close_pack_index(struct packed_git *p)
}
}
-void close_pack_revindex(struct packed_git *p) {
+static void close_pack_revindex(struct packed_git *p)
+{
if (!p->revindex_map)
return;
@@ -333,12 +334,22 @@ void close_pack_revindex(struct packed_git *p) {
p->revindex_data = NULL;
}
+static void close_pack_mtimes(struct packed_git *p)
+{
+ if (!p->mtimes_map)
+ return;
+
+ munmap((void *)p->mtimes_map, p->mtimes_size);
+ p->mtimes_map = NULL;
+}
+
void close_pack(struct packed_git *p)
{
close_pack_windows(p);
close_pack_fd(p);
close_pack_index(p);
close_pack_revindex(p);
+ close_pack_mtimes(p);
oidset_clear(&p->bad_objects);
}
@@ -362,7 +373,7 @@ void close_object_store(struct raw_object_store *o)
void unlink_pack_path(const char *pack_name, int force_delete)
{
- static const char *exts[] = {".pack", ".idx", ".rev", ".keep", ".bitmap", ".promisor"};
+ static const char *exts[] = {".pack", ".idx", ".rev", ".keep", ".bitmap", ".promisor", ".mtimes"};
int i;
struct strbuf buf = STRBUF_INIT;
size_t plen;
@@ -717,6 +728,10 @@ struct packed_git *add_packed_git(const char *path, size_t path_len, int local)
if (!access(p->pack_name, F_OK))
p->pack_promisor = 1;
+ xsnprintf(p->pack_name + path_len, alloc - path_len, ".mtimes");
+ if (!access(p->pack_name, F_OK))
+ p->is_cruft = 1;
+
xsnprintf(p->pack_name + path_len, alloc - path_len, ".pack");
if (stat(p->pack_name, &st) || !S_ISREG(st.st_mode)) {
free(p);
@@ -868,7 +883,8 @@ static void prepare_pack(const char *full_name, size_t full_name_len,
ends_with(file_name, ".pack") ||
ends_with(file_name, ".bitmap") ||
ends_with(file_name, ".keep") ||
- ends_with(file_name, ".promisor"))
+ ends_with(file_name, ".promisor") ||
+ ends_with(file_name, ".mtimes"))
string_list_append(data->garbage, full_name);
else
report_garbage(PACKDIR_FILE_GARBAGE, full_name);
@@ -1060,7 +1076,7 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf,
unsigned long len, enum object_type *type, unsigned long *sizep)
{
unsigned shift;
- unsigned long size, c;
+ size_t size, c;
unsigned long used = 0;
c = buf[used++];
@@ -1068,16 +1084,16 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf,
size = c & 15;
shift = 4;
while (c & 0x80) {
- if (len <= used || bitsizeof(long) <= shift) {
+ if (len <= used || (bitsizeof(long) - 7) < shift) {
error("bad object header");
size = used = 0;
break;
}
c = buf[used++];
- size += (c & 0x7f) << shift;
+ size = st_add(size, st_left_shift(c & 0x7f, shift));
shift += 7;
}
- *sizep = size;
+ *sizep = cast_size_t_to_ulong(size);
return used;
}
diff --git a/packfile.h b/packfile.h
index 1861467..a3f6723 100644
--- a/packfile.h
+++ b/packfile.h
@@ -90,7 +90,6 @@ uint32_t get_pack_fanout(struct packed_git *p, uint32_t value);
unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
void close_pack_windows(struct packed_git *);
-void close_pack_revindex(struct packed_git *);
void close_pack(struct packed_git *);
void close_object_store(struct raw_object_store *o);
void unuse_pack(struct pack_window **);
diff --git a/pager.c b/pager.c
index 52f27a6..5cfe23b 100644
--- a/pager.c
+++ b/pager.c
@@ -8,7 +8,7 @@
#define DEFAULT_PAGER "less"
#endif
-static struct child_process pager_process = CHILD_PROCESS_INIT;
+static struct child_process pager_process;
static const char *pager_program;
/* Is the value coming back from term_columns() just a guess? */
@@ -99,7 +99,7 @@ void prepare_pager_args(struct child_process *pager_process, const char *pager)
{
strvec_push(&pager_process->args, pager);
pager_process->use_shell = 1;
- setup_pager_env(&pager_process->env_array);
+ setup_pager_env(&pager_process->env);
pager_process->trace2_child_class = "pager";
}
@@ -124,10 +124,12 @@ void setup_pager(void)
setenv("GIT_PAGER_IN_USE", "true", 1);
+ child_process_init(&pager_process);
+
/* spawn the pager */
prepare_pager_args(&pager_process, pager);
pager_process.in = -1;
- strvec_push(&pager_process.env_array, "GIT_PAGER_IN_USE");
+ strvec_push(&pager_process.env, "GIT_PAGER_IN_USE");
if (start_command(&pager_process))
return;
diff --git a/parallel-checkout.c b/parallel-checkout.c
index ddc0ff3..31a3d0e 100644
--- a/parallel-checkout.c
+++ b/parallel-checkout.c
@@ -39,8 +39,8 @@ void get_parallel_checkout_configs(int *num_workers, int *threshold)
if (env_workers && *env_workers) {
if (strtol_i(env_workers, 10, num_workers)) {
- die("invalid value for GIT_TEST_CHECKOUT_WORKERS: '%s'",
- env_workers);
+ die(_("invalid value for '%s': '%s'"),
+ "GIT_TEST_CHECKOUT_WORKERS", env_workers);
}
if (*num_workers < 1)
*num_workers = online_cpus();
@@ -261,7 +261,7 @@ static int write_pc_item_to_fd(struct parallel_checkout_item *pc_item, int fd,
struct stream_filter *filter;
struct strbuf buf = STRBUF_INIT;
char *blob;
- unsigned long size;
+ size_t size;
ssize_t wrote;
/* Sanity check */
@@ -603,8 +603,7 @@ static void gather_results_from_workers(struct pc_worker *workers,
continue;
if (pfd->revents & POLLIN) {
- int len = packet_read(pfd->fd, NULL, NULL,
- packet_buffer,
+ int len = packet_read(pfd->fd, packet_buffer,
sizeof(packet_buffer), 0);
if (len < 0) {
diff --git a/parse-options-cb.c b/parse-options-cb.c
index 3c811e1..d346dbe 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -1,5 +1,6 @@
#include "git-compat-util.h"
#include "parse-options.h"
+#include "branch.h"
#include "cache.h"
#include "commit.h"
#include "color.h"
@@ -293,3 +294,18 @@ int parse_opt_passthru_argv(const struct option *opt, const char *arg, int unset
return 0;
}
+
+int parse_opt_tracking_mode(const struct option *opt, const char *arg, int unset)
+{
+ if (unset)
+ *(enum branch_track *)opt->value = BRANCH_TRACK_NEVER;
+ else if (!arg || !strcmp(arg, "direct"))
+ *(enum branch_track *)opt->value = BRANCH_TRACK_EXPLICIT;
+ else if (!strcmp(arg, "inherit"))
+ *(enum branch_track *)opt->value = BRANCH_TRACK_INHERIT;
+ else
+ return error(_("option `%s' expects \"%s\" or \"%s\""),
+ "--track", "direct", "inherit");
+
+ return 0;
+}
diff --git a/parse-options.c b/parse-options.c
index 55c5821..6e57744 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -8,10 +8,13 @@
static int disallow_abbreviated_options;
-#define OPT_SHORT 1
-#define OPT_UNSET 2
+enum opt_parsed {
+ OPT_LONG = 0,
+ OPT_SHORT = 1<<0,
+ OPT_UNSET = 1<<1,
+};
-int optbug(const struct option *opt, const char *reason)
+static int optbug(const struct option *opt, const char *reason)
{
if (opt->long_name) {
if (opt->short_name)
@@ -22,9 +25,26 @@ int optbug(const struct option *opt, const char *reason)
return error("BUG: switch '%c' %s", opt->short_name, reason);
}
+static const char *optname(const struct option *opt, enum opt_parsed flags)
+{
+ static struct strbuf sb = STRBUF_INIT;
+
+ strbuf_reset(&sb);
+ if (flags & OPT_SHORT)
+ strbuf_addf(&sb, "switch `%c'", opt->short_name);
+ else if (flags & OPT_UNSET)
+ strbuf_addf(&sb, "option `no-%s'", opt->long_name);
+ else if (flags == OPT_LONG)
+ strbuf_addf(&sb, "option `%s'", opt->long_name);
+ else
+ BUG("optname() got unknown flags %d", flags);
+
+ return sb.buf;
+}
+
static enum parse_opt_result get_arg(struct parse_opt_ctx_t *p,
const struct option *opt,
- int flags, const char **arg)
+ enum opt_parsed flags, const char **arg)
{
if (p->opt) {
*arg = p->opt;
@@ -50,7 +70,7 @@ static void fix_filename(const char *prefix, const char **file)
static enum parse_opt_result opt_command_mode_error(
const struct option *opt,
const struct option *all_opts,
- int flags)
+ enum opt_parsed flags)
{
const struct option *that;
struct strbuf that_name = STRBUF_INIT;
@@ -82,7 +102,7 @@ static enum parse_opt_result opt_command_mode_error(
static enum parse_opt_result get_value(struct parse_opt_ctx_t *p,
const struct option *opt,
const struct option *all_opts,
- int flags)
+ enum opt_parsed flags)
{
const char *s, *arg;
const int unset = flags & OPT_UNSET;
@@ -298,11 +318,11 @@ static enum parse_opt_result parse_long_opt(
const struct option *all_opts = options;
const char *arg_end = strchrnul(arg, '=');
const struct option *abbrev_option = NULL, *ambiguous_option = NULL;
- int abbrev_flags = 0, ambiguous_flags = 0;
+ enum opt_parsed abbrev_flags = OPT_LONG, ambiguous_flags = OPT_LONG;
for (; options->type != OPTION_END; options++) {
const char *rest, *long_name = options->long_name;
- int flags = 0, opt_flags = 0;
+ enum opt_parsed flags = OPT_LONG, opt_flags = OPT_LONG;
if (!long_name)
continue;
@@ -384,8 +404,9 @@ static enum parse_opt_result parse_long_opt(
return PARSE_OPT_UNKNOWN;
}
-static int parse_nodash_opt(struct parse_opt_ctx_t *p, const char *arg,
- const struct option *options)
+static enum parse_opt_result parse_nodash_opt(struct parse_opt_ctx_t *p,
+ const char *arg,
+ const struct option *options)
{
const struct option *all_opts = options;
@@ -395,7 +416,7 @@ static int parse_nodash_opt(struct parse_opt_ctx_t *p, const char *arg,
if (options->short_name == arg[0] && arg[1] == '\0')
return get_value(p, options, all_opts, OPT_SHORT);
}
- return -2;
+ return PARSE_OPT_ERROR;
}
static void check_typos(const char *arg, const struct option *options)
@@ -481,7 +502,8 @@ static void parse_options_check(const struct option *opts)
static void parse_options_start_1(struct parse_opt_ctx_t *ctx,
int argc, const char **argv, const char *prefix,
- const struct option *options, int flags)
+ const struct option *options,
+ enum parse_opt_flags flags)
{
ctx->argc = argc;
ctx->argv = argv;
@@ -506,7 +528,8 @@ static void parse_options_start_1(struct parse_opt_ctx_t *ctx,
void parse_options_start(struct parse_opt_ctx_t *ctx,
int argc, const char **argv, const char *prefix,
- const struct option *options, int flags)
+ const struct option *options,
+ enum parse_opt_flags flags)
{
memset(ctx, 0, sizeof(*ctx));
parse_options_start_1(ctx, argc, argv, prefix, options, flags);
@@ -697,13 +720,14 @@ static void free_preprocessed_options(struct option *options)
free(options);
}
-static int usage_with_options_internal(struct parse_opt_ctx_t *,
- const char * const *,
- const struct option *, int, int);
+static enum parse_opt_result usage_with_options_internal(struct parse_opt_ctx_t *,
+ const char * const *,
+ const struct option *,
+ int, int);
-int parse_options_step(struct parse_opt_ctx_t *ctx,
- const struct option *options,
- const char * const usagestr[])
+enum parse_opt_result parse_options_step(struct parse_opt_ctx_t *ctx,
+ const struct option *options,
+ const char * const usagestr[])
{
int internal_help = !(ctx->flags & PARSE_OPT_NO_INTERNAL_HELP);
@@ -837,9 +861,11 @@ int parse_options_end(struct parse_opt_ctx_t *ctx)
return ctx->cpidx + ctx->argc;
}
-int parse_options(int argc, const char **argv, const char *prefix,
- const struct option *options, const char * const usagestr[],
- int flags)
+int parse_options(int argc, const char **argv,
+ const char *prefix,
+ const struct option *options,
+ const char * const usagestr[],
+ enum parse_opt_flags flags)
{
struct parse_opt_ctx_t ctx;
struct option *real_options;
@@ -861,7 +887,7 @@ int parse_options(int argc, const char **argv, const char *prefix,
case PARSE_OPT_NON_OPTION:
case PARSE_OPT_DONE:
break;
- default: /* PARSE_OPT_UNKNOWN */
+ case PARSE_OPT_UNKNOWN:
if (ctx.argv[0][1] == '-') {
error(_("unknown option `%s'"), ctx.argv[0] + 2);
} else if (isascii(*ctx.opt)) {
@@ -897,32 +923,85 @@ static int usage_argh(const struct option *opts, FILE *outfile)
#define USAGE_OPTS_WIDTH 24
#define USAGE_GAP 2
-static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
- const char * const *usagestr,
- const struct option *opts, int full, int err)
+static enum parse_opt_result usage_with_options_internal(struct parse_opt_ctx_t *ctx,
+ const char * const *usagestr,
+ const struct option *opts,
+ int full, int err)
{
FILE *outfile = err ? stderr : stdout;
int need_newline;
+ const char *usage_prefix = _("usage: %s");
+ /*
+ * The translation could be anything, but we can count on
+ * msgfmt(1)'s --check option to have asserted that "%s" is in
+ * the translation. So compute the length of the "usage: "
+ * part. We are assuming that the translator wasn't overly
+ * clever and used e.g. "%1$s" instead of "%s", there's only
+ * one "%s" in "usage_prefix" above, so there's no reason to
+ * do so even with a RTL language.
+ */
+ size_t usage_len = strlen(usage_prefix) - strlen("%s");
+ /*
+ * TRANSLATORS: the colon here should align with the
+ * one in "usage: %s" translation.
+ */
+ const char *or_prefix = _(" or: %s");
+ /*
+ * TRANSLATORS: You should only need to translate this format
+ * string if your language is a RTL language (e.g. Arabic,
+ * Hebrew etc.), not if it's a LTR language (e.g. German,
+ * Russian, Chinese etc.).
+ *
+ * When a translated usage string has an embedded "\n" it's
+ * because options have wrapped to the next line. The line
+ * after the "\n" will then be padded to align with the
+ * command name, such as N_("git cmd [opt]\n<8
+ * spaces>[opt2]"), where the 8 spaces are the same length as
+ * "git cmd ".
+ *
+ * This format string prints out that already-translated
+ * line. The "%*s" is whitespace padding to account for the
+ * padding at the start of the line that we add in this
+ * function. The "%s" is a line in the (hopefully already
+ * translated) N_() usage string, which contained embedded
+ * newlines before we split it up.
+ */
+ const char *usage_continued = _("%*s%s");
+ const char *prefix = usage_prefix;
+ int saw_empty_line = 0;
+
if (!usagestr)
return PARSE_OPT_HELP;
if (!err && ctx && ctx->flags & PARSE_OPT_SHELL_EVAL)
fprintf(outfile, "cat <<\\EOF\n");
- fprintf_ln(outfile, _("usage: %s"), _(*usagestr++));
- while (*usagestr && **usagestr)
- /*
- * TRANSLATORS: the colon here should align with the
- * one in "usage: %s" translation.
- */
- fprintf_ln(outfile, _(" or: %s"), _(*usagestr++));
while (*usagestr) {
- if (**usagestr)
- fprintf_ln(outfile, _(" %s"), _(*usagestr));
- else
- fputc('\n', outfile);
- usagestr++;
+ const char *str = _(*usagestr++);
+ struct string_list list = STRING_LIST_INIT_DUP;
+ unsigned int j;
+
+ if (!saw_empty_line && !*str)
+ saw_empty_line = 1;
+
+ string_list_split(&list, str, '\n', -1);
+ for (j = 0; j < list.nr; j++) {
+ const char *line = list.items[j].string;
+
+ if (saw_empty_line && *line)
+ fprintf_ln(outfile, _(" %s"), line);
+ else if (saw_empty_line)
+ fputc('\n', outfile);
+ else if (!j)
+ fprintf_ln(outfile, prefix, line);
+ else
+ fprintf_ln(outfile, usage_continued,
+ (int)usage_len, "", line);
+ }
+ string_list_clear(&list, 0);
+
+ prefix = or_prefix;
}
need_newline = 1;
@@ -997,21 +1076,53 @@ void NORETURN usage_msg_opt(const char *msg,
const char * const *usagestr,
const struct option *options)
{
- fprintf(stderr, "fatal: %s\n\n", msg);
+ die_message("%s\n", msg); /* The extra \n is intentional */
usage_with_options(usagestr, options);
}
-const char *optname(const struct option *opt, int flags)
+void NORETURN usage_msg_optf(const char * const fmt,
+ const char * const *usagestr,
+ const struct option *options, ...)
{
- static struct strbuf sb = STRBUF_INIT;
+ struct strbuf msg = STRBUF_INIT;
+ va_list ap;
+ va_start(ap, options);
+ strbuf_vaddf(&msg, fmt, ap);
+ va_end(ap);
- strbuf_reset(&sb);
- if (flags & OPT_SHORT)
- strbuf_addf(&sb, "switch `%c'", opt->short_name);
- else if (flags & OPT_UNSET)
- strbuf_addf(&sb, "option `no-%s'", opt->long_name);
- else
- strbuf_addf(&sb, "option `%s'", opt->long_name);
+ usage_msg_opt(msg.buf, usagestr, options);
+}
- return sb.buf;
+void die_for_incompatible_opt4(int opt1, const char *opt1_name,
+ int opt2, const char *opt2_name,
+ int opt3, const char *opt3_name,
+ int opt4, const char *opt4_name)
+{
+ int count = 0;
+ const char *options[4];
+
+ if (opt1)
+ options[count++] = opt1_name;
+ if (opt2)
+ options[count++] = opt2_name;
+ if (opt3)
+ options[count++] = opt3_name;
+ if (opt4)
+ options[count++] = opt4_name;
+ switch (count) {
+ case 4:
+ die(_("options '%s', '%s', '%s', and '%s' cannot be used together"),
+ opt1_name, opt2_name, opt3_name, opt4_name);
+ break;
+ case 3:
+ die(_("options '%s', '%s', and '%s' cannot be used together"),
+ options[0], options[1], options[2]);
+ break;
+ case 2:
+ die(_("options '%s' and '%s' cannot be used together"),
+ options[0], options[1]);
+ break;
+ default:
+ break;
+ }
}
diff --git a/parse-options.h b/parse-options.h
index 39d9088..685fcca 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -33,6 +33,7 @@ enum parse_opt_flags {
PARSE_OPT_KEEP_UNKNOWN = 1 << 3,
PARSE_OPT_NO_INTERNAL_HELP = 1 << 4,
PARSE_OPT_ONE_SHOT = 1 << 5,
+ PARSE_OPT_SHELL_EVAL = 1 << 6,
};
enum parse_opt_option_flags {
@@ -44,7 +45,6 @@ enum parse_opt_option_flags {
PARSE_OPT_NODASH = 1 << 5,
PARSE_OPT_LITERAL_ARGHELP = 1 << 6,
PARSE_OPT_FROM_ALIAS = 1 << 7,
- PARSE_OPT_SHELL_EVAL = 1 << 8,
PARSE_OPT_NOCOMPLETE = 1 << 9,
PARSE_OPT_COMP_ARG = 1 << 10,
PARSE_OPT_CMDMODE = 1 << 11,
@@ -85,6 +85,11 @@ typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,
* token to explain the kind of argument this option wants. Does not
* begin in capital letter, and does not end with a full stop.
* Should be wrapped by N_() for translation.
+ * Is automatically enclosed in brackets when printed, unless it
+ * contains any of the following characters: ()<>[]|
+ * E.g. "name" is shown as "<name>" to indicate that a name value
+ * needs to be supplied, not the literal string "name", but
+ * "<start>,<end>" and "(this|that)" are printed verbatim.
*
* `help`::
* the short help associated to what the option does.
@@ -134,7 +139,7 @@ struct option {
const char *argh;
const char *help;
- int flags;
+ enum parse_opt_option_flags flags;
parse_opt_cb *callback;
intptr_t defval;
parse_opt_ll_cb *ll_callback;
@@ -166,8 +171,10 @@ struct option {
#define OPT_BOOL(s, l, v, h) OPT_BOOL_F(s, l, v, h, 0)
#define OPT_HIDDEN_BOOL(s, l, v, h) { OPTION_SET_INT, (s), (l), (v), NULL, \
(h), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1}
-#define OPT_CMDMODE(s, l, v, h, i) { OPTION_SET_INT, (s), (l), (v), NULL, \
- (h), PARSE_OPT_CMDMODE|PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) }
+#define OPT_CMDMODE_F(s, l, v, h, i, f) { OPTION_SET_INT, (s), (l), (v), NULL, \
+ (h), PARSE_OPT_CMDMODE|PARSE_OPT_NOARG|PARSE_OPT_NONEG | (f), NULL, (i) }
+#define OPT_CMDMODE(s, l, v, h, i) OPT_CMDMODE_F(s, l, v, h, i, 0)
+
#define OPT_INTEGER(s, l, v, h) OPT_INTEGER_F(s, l, v, h, 0)
#define OPT_MAGNITUDE(s, l, v, h) { OPTION_MAGNITUDE, (s), (l), (v), \
N_("n"), (h), PARSE_OPT_NONEG }
@@ -213,7 +220,8 @@ struct option {
*/
int parse_options(int argc, const char **argv, const char *prefix,
const struct option *options,
- const char * const usagestr[], int flags);
+ const char * const usagestr[],
+ enum parse_opt_flags flags);
NORETURN void usage_with_options(const char * const *usagestr,
const struct option *options);
@@ -222,8 +230,31 @@ NORETURN void usage_msg_opt(const char *msg,
const char * const *usagestr,
const struct option *options);
-int optbug(const struct option *opt, const char *reason);
-const char *optname(const struct option *opt, int flags);
+/**
+ * usage_msg_optf() is like usage_msg_opt() except that the first
+ * argument is a format string, and optional format arguments follow
+ * after the 3rd option.
+ */
+__attribute__((format (printf,1,4)))
+void NORETURN usage_msg_optf(const char *fmt,
+ const char * const *usagestr,
+ const struct option *options, ...);
+
+void die_for_incompatible_opt4(int opt1, const char *opt1_name,
+ int opt2, const char *opt2_name,
+ int opt3, const char *opt3_name,
+ int opt4, const char *opt4_name);
+
+
+static inline void die_for_incompatible_opt3(int opt1, const char *opt1_name,
+ int opt2, const char *opt2_name,
+ int opt3, const char *opt3_name)
+{
+ die_for_incompatible_opt4(opt1, opt1_name,
+ opt2, opt2_name,
+ opt3, opt3_name,
+ 0, "");
+}
/*
* Use these assertions for callbacks that expect to be called with NONEG and
@@ -262,7 +293,7 @@ struct parse_opt_ctx_t {
const char **out;
int argc, cpidx, total;
const char *opt;
- int flags;
+ enum parse_opt_flags flags;
const char *prefix;
const char **alias_groups; /* must be in groups of 3 elements! */
struct option *updated_options;
@@ -270,11 +301,12 @@ struct parse_opt_ctx_t {
void parse_options_start(struct parse_opt_ctx_t *ctx,
int argc, const char **argv, const char *prefix,
- const struct option *options, int flags);
+ const struct option *options,
+ enum parse_opt_flags flags);
-int parse_options_step(struct parse_opt_ctx_t *ctx,
- const struct option *options,
- const char * const usagestr[]);
+enum parse_opt_result parse_options_step(struct parse_opt_ctx_t *ctx,
+ const struct option *options,
+ const char * const usagestr[]);
int parse_options_end(struct parse_opt_ctx_t *ctx);
@@ -300,6 +332,8 @@ enum parse_opt_result parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx,
const char *, int);
int parse_opt_passthru(const struct option *, const char *, int);
int parse_opt_passthru_argv(const struct option *, const char *, int);
+/* value is enum branch_track* */
+int parse_opt_tracking_mode(const struct option *, const char *, int);
#define OPT__VERBOSE(var, h) OPT_COUNTUP('v', "verbose", (var), (h))
#define OPT__QUIET(var, h) OPT_COUNTUP('q', "quiet", (var), (h))
diff --git a/path.c b/path.c
index 2c89547..a3cfcd8 100644
--- a/path.c
+++ b/path.c
@@ -733,7 +733,7 @@ char *interpolate_path(const char *path, int real_home)
struct strbuf user_path = STRBUF_INIT;
const char *to_copy = path;
- if (path == NULL)
+ if (!path)
goto return_null;
if (skip_prefix(path, "%(prefix)/", &path))
@@ -1225,11 +1225,15 @@ int longest_ancestor_length(const char *path, struct string_list *prefixes)
const char *ceil = prefixes->items[i].string;
int len = strlen(ceil);
- if (len == 1 && ceil[0] == '/')
- len = 0; /* root matches anything, with length 0 */
- else if (!strncmp(path, ceil, len) && path[len] == '/')
- ; /* match of length len */
- else
+ /*
+ * For root directories (`/`, `C:/`, `//server/share/`)
+ * adjust the length to exclude the trailing slash.
+ */
+ if (len > 0 && ceil[len - 1] == '/')
+ len--;
+
+ if (strncmp(path, ceil, len) ||
+ path[len] != '/' || !path[len + 1])
continue; /* no match */
if (len > max_len)
@@ -1409,7 +1413,7 @@ int is_ntfs_dotgit(const char *name)
for (;;) {
c = *(name++);
- if (!c || c == '\\' || c == '/' || c == ':')
+ if (!c || is_xplatform_dir_sep(c) || c == ':')
return 1;
if (c != '.' && c != ' ')
return 0;
diff --git a/path.h b/path.h
index b68691a..0a59c85 100644
--- a/path.h
+++ b/path.h
@@ -169,20 +169,6 @@ void report_linked_checkout_garbage(void);
return r->cached_paths.var; \
}
-struct path_cache {
- const char *squash_msg;
- const char *merge_msg;
- const char *merge_rr;
- const char *merge_mode;
- const char *merge_head;
- const char *merge_autostash;
- const char *auto_merge;
- const char *fetch_head;
- const char *shallow;
-};
-
-#define PATH_CACHE_INIT { 0 }
-
const char *git_path_squash_msg(struct repository *r);
const char *git_path_merge_msg(struct repository *r);
const char *git_path_merge_rr(struct repository *r);
diff --git a/pathspec.c b/pathspec.c
index 44306fd..84ad9c7 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -39,7 +39,8 @@ void add_pathspec_matches_against_index(const struct pathspec *pathspec,
return;
for (i = 0; i < istate->cache_nr; i++) {
const struct cache_entry *ce = istate->cache[i];
- if (sw_action == PS_IGNORE_SKIP_WORKTREE && ce_skip_worktree(ce))
+ if (sw_action == PS_IGNORE_SKIP_WORKTREE &&
+ (ce_skip_worktree(ce) || !path_in_sparse_checkout(ce->name, istate)))
continue;
ce_path_match(istate, ce, pathspec, seen);
}
@@ -70,7 +71,7 @@ char *find_pathspecs_matching_skip_worktree(const struct pathspec *pathspec)
for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce = istate->cache[i];
- if (ce_skip_worktree(ce))
+ if (ce_skip_worktree(ce) || !path_in_sparse_checkout(ce->name, istate))
ce_path_match(istate, ce, pathspec, seen);
}
@@ -628,7 +629,7 @@ void parse_pathspec(struct pathspec *pathspec,
*/
if (nr_exclude == n) {
int plen = (!(flags & PATHSPEC_PREFER_CWD)) ? 0 : prefixlen;
- init_pathspec_item(item + n, 0, prefix, plen, "");
+ init_pathspec_item(item + n, 0, prefix, plen, ".");
pathspec->nr++;
}
diff --git a/pathspec.h b/pathspec.h
index 2341dc9..402ebb8 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -58,8 +58,7 @@ struct pathspec {
#define GUARD_PATHSPEC(ps, mask) \
do { \
if ((ps)->magic & ~(mask)) \
- die("BUG:%s:%d: unsupported magic %x", \
- __FILE__, __LINE__, (ps)->magic & ~(mask)); \
+ BUG("unsupported magic %x", (ps)->magic & ~(mask)); \
} while (0)
/* parse_pathspec flags */
diff --git a/perl/Git.pm b/perl/Git.pm
index 090a7df..080cdc2 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -1686,6 +1686,16 @@
# by searching for it at proper places.
sub _execv_git_cmd { exec('git', @_); }
+sub _is_sig {
+ my ($v, $n) = @_;
+
+ # We are avoiding a "use POSIX qw(SIGPIPE SIGABRT)" in the hot
+ # Git.pm codepath.
+ require POSIX;
+ no strict 'refs';
+ $v == *{"POSIX::$n"}->();
+}
+
# Close pipe to a subprocess.
sub _cmd_close {
my $ctx = shift @_;
@@ -1698,9 +1708,16 @@
} elsif ($? >> 8) {
# The caller should pepper this.
throw Git::Error::Command($ctx, $? >> 8);
+ } elsif ($? & 127 && _is_sig($? & 127, "SIGPIPE")) {
+ # we might e.g. closed a live stream; the command
+ # dying of SIGPIPE would drive us here.
+ } elsif ($? & 127 && _is_sig($? & 127, "SIGABRT")) {
+ die sprintf('BUG?: got SIGABRT ($? = %d, $? & 127 = %d) when closing pipe',
+ $?, $? & 127);
+ } elsif ($? & 127) {
+ die sprintf('got signal ($? = %d, $? & 127 = %d) when closing pipe',
+ $?, $? & 127);
}
- # else we might e.g. closed a live stream; the command
- # dying of SIGPIPE would drive us here.
}
}
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 35ff5a6..6ce2e28 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -6,7 +6,7 @@
use vars qw/$_no_metadata
$_repack $_repack_flags $_use_svm_props $_head
$_use_svnsync_props $no_reuse_existing
- $_use_log_author $_add_author_from $_localtime/;
+ $_use_log_author $_add_author_from $_localtime $_use_fsync/;
use Carp qw/croak/;
use File::Path qw/mkpath/;
use IPC::Open3;
@@ -2269,6 +2269,19 @@
}
}
+# TODO: move this to Git.pm?
+sub use_fsync {
+ if (!defined($_use_fsync)) {
+ my $x = $ENV{GIT_TEST_FSYNC};
+ if (defined $x) {
+ my $v = command_oneline('-c', "test.fsync=$x",
+ qw(config --type=bool test.fsync));
+ $_use_fsync = defined($v) ? ($v eq "true\n") : 1;
+ }
+ }
+ $_use_fsync;
+}
+
sub rev_map_set {
my ($self, $rev, $commit, $update_ref, $uuid) = @_;
defined $commit or die "missing arg3\n";
@@ -2290,7 +2303,7 @@
my $sync;
# both of these options make our .rev_db file very, very important
# and we can't afford to lose it because rebuild() won't work
- if ($self->use_svm_props || $self->no_metadata) {
+ if (($self->use_svm_props || $self->no_metadata) && use_fsync()) {
require File::Copy;
$sync = 1;
File::Copy::copy($db, $db_lock) or die "rev_map_set(@_): ",
diff --git a/pkt-line.c b/pkt-line.c
index de4a94b..8e43c2d 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -289,22 +289,6 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
va_end(args);
}
-void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len)
-{
- size_t orig_len, n;
-
- orig_len = buf->len;
- strbuf_addstr(buf, "0000");
- strbuf_add(buf, data, len);
- n = buf->len - orig_len;
-
- if (n > LARGE_PACKET_MAX)
- die(_("protocol error: impossibly long line"));
-
- set_packet_header(&buf->buf[orig_len], n);
- packet_trace(data, len, 1);
-}
-
int write_packetized_from_fd_no_flush(int fd_in, int fd_out)
{
char *buf = xmalloc(LARGE_PACKET_DATA_MAX);
@@ -386,6 +370,32 @@ int packet_length(const char lenbuf_hex[4])
return (val < 0) ? val : (val << 8) | hex2chr(lenbuf_hex + 2);
}
+static char *find_packfile_uri_path(const char *buffer)
+{
+ const char *URI_MARK = "://";
+ char *path;
+ int len;
+
+ /* First char is sideband mark */
+ buffer += 1;
+
+ len = strspn(buffer, "0123456789abcdefABCDEF");
+ /* size of SHA1 and SHA256 hash */
+ if (!(len == 40 || len == 64) || buffer[len] != ' ')
+ return NULL; /* required "<hash>SP" not seen */
+
+ path = strstr(buffer + len + 1, URI_MARK);
+ if (!path)
+ return NULL;
+
+ path = strchr(path + strlen(URI_MARK), '/');
+ if (!path || !*(path + 1))
+ return NULL;
+
+ /* position after '/' */
+ return ++path;
+}
+
enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
size_t *src_len, char *buffer,
unsigned size, int *pktlen,
@@ -393,6 +403,7 @@ enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
{
int len;
char linelen[4];
+ char *uri_path_start;
if (get_packet_data(fd, src_buffer, src_len, linelen, 4, options) < 0) {
*pktlen = -1;
@@ -443,7 +454,18 @@ enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
len--;
buffer[len] = 0;
- packet_trace(buffer, len, 0);
+ if (options & PACKET_READ_REDACT_URI_PATH &&
+ (uri_path_start = find_packfile_uri_path(buffer))) {
+ const char *redacted = "<redacted>";
+ struct strbuf tracebuf = STRBUF_INIT;
+ strbuf_insert(&tracebuf, 0, buffer, len);
+ strbuf_splice(&tracebuf, uri_path_start - buffer,
+ strlen(uri_path_start), redacted, strlen(redacted));
+ packet_trace(tracebuf.buf, tracebuf.len, 0);
+ strbuf_release(&tracebuf);
+ } else {
+ packet_trace(buffer, len, 0);
+ }
if ((options & PACKET_READ_DIE_ON_ERR_PACKET) &&
starts_with(buffer, "ERR "))
@@ -453,38 +475,28 @@ enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
return PACKET_READ_NORMAL;
}
-int packet_read(int fd, char **src_buffer, size_t *src_len,
- char *buffer, unsigned size, int options)
+int packet_read(int fd, char *buffer, unsigned size, int options)
{
int pktlen = -1;
- packet_read_with_status(fd, src_buffer, src_len, buffer, size,
- &pktlen, options);
+ packet_read_with_status(fd, NULL, NULL, buffer, size, &pktlen,
+ options);
return pktlen;
}
-static char *packet_read_line_generic(int fd,
- char **src, size_t *src_len,
- int *dst_len)
+char *packet_read_line(int fd, int *dst_len)
{
- int len = packet_read(fd, src, src_len,
- packet_buffer, sizeof(packet_buffer),
+ int len = packet_read(fd, packet_buffer, sizeof(packet_buffer),
PACKET_READ_CHOMP_NEWLINE);
if (dst_len)
*dst_len = len;
return (len > 0) ? packet_buffer : NULL;
}
-char *packet_read_line(int fd, int *len_p)
-{
- return packet_read_line_generic(fd, NULL, NULL, len_p);
-}
-
int packet_read_line_gently(int fd, int *dst_len, char **dst_line)
{
- int len = packet_read(fd, NULL, NULL,
- packet_buffer, sizeof(packet_buffer),
+ int len = packet_read(fd, packet_buffer, sizeof(packet_buffer),
PACKET_READ_CHOMP_NEWLINE|PACKET_READ_GENTLE_ON_EOF);
if (dst_len)
*dst_len = len;
@@ -493,11 +505,6 @@ int packet_read_line_gently(int fd, int *dst_len, char **dst_line)
return len;
}
-char *packet_read_line_buf(char **src, size_t *src_len, int *dst_len)
-{
- return packet_read_line_generic(-1, src, src_len, dst_len);
-}
-
ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out, int options)
{
int packet_len;
@@ -507,7 +514,7 @@ ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out, int options)
for (;;) {
strbuf_grow(sb_out, LARGE_PACKET_DATA_MAX);
- packet_len = packet_read(fd_in, NULL, NULL,
+ packet_len = packet_read(fd_in,
/* strbuf_grow() above always allocates one extra byte to
* store a '\0' at the end of the string. packet_read()
* writes a '\0' extra byte at the end, too. Let it know
diff --git a/pkt-line.h b/pkt-line.h
index 82b95e4..6d2a63d 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -29,7 +29,6 @@ void packet_buf_delim(struct strbuf *buf);
void set_packet_header(char *buf, int size);
void packet_write(int fd_out, const char *buf, size_t size);
void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
-void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len);
int packet_flush_gently(int fd);
int packet_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
int write_packetized_from_fd_no_flush(int fd_in, int fd_out);
@@ -88,8 +87,8 @@ void packet_fflush(FILE *f);
#define PACKET_READ_CHOMP_NEWLINE (1u<<1)
#define PACKET_READ_DIE_ON_ERR_PACKET (1u<<2)
#define PACKET_READ_GENTLE_ON_READ_ERROR (1u<<3)
-int packet_read(int fd, char **src_buffer, size_t *src_len, char
- *buffer, unsigned size, int options);
+#define PACKET_READ_REDACT_URI_PATH (1u<<4)
+int packet_read(int fd, char *buffer, unsigned size, int options);
/*
* Convert a four hex digit packet line length header into its numeric
@@ -139,12 +138,6 @@ char *packet_read_line(int fd, int *size);
int packet_read_line_gently(int fd, int *size, char **dst_line);
/*
- * Same as packet_read_line, but read from a buf rather than a descriptor;
- * see packet_read for details on how src_* is used.
- */
-char *packet_read_line_buf(char **src_buf, size_t *src_len, int *size);
-
-/*
* Reads a stream of variable sized packets until a flush packet is detected.
*/
ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out, int options);
diff --git a/po/.gitignore b/po/.gitignore
index 796b96d..ff0e517 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1 +1,3 @@
/build
+/git.pot
+/git-core.pot
diff --git a/po/README.md b/po/README.md
index dcd8436..74856ca 100644
--- a/po/README.md
+++ b/po/README.md
@@ -9,8 +9,14 @@
https://github.com/git-l10n/git-po/
-The two character language translation codes are defined by ISO\_639-1, as
-stated in the gettext(1) full manual, appendix A.1, Usual Language Codes.
+We will use XX as an alias to refer to the language translation code in
+the following paragraphs, for example we use "po/XX.po" to refer to the
+translation file for a specific language. But this doesn't mean that
+the language code has only two letters. The language code can be in one
+of two forms: "ll" or "ll\_CC". Here "ll" is the ISO 639 two-letter
+language code and "CC" is the ISO 3166 two-letter code for country names
+and subdivisions. For example: "de" for German language code, "zh\_CN"
+for Simplified Chinese language code.
## Contributing to an existing translation
@@ -39,72 +45,74 @@
person per language.
-## Core translation
-
-The core translation is the smallest set of work that must be completed
-for a new language translation. Because there are more than 5000 messages
-in the template message file "po/git.pot" that need to be translated,
-this is not a piece of cake for the contributor for a new language.
-
-The core template message file which contains a small set of messages
-will be generated in "po-core/core.pot" automatically by running a helper
-program named "git-po-helper" (described later).
-
-```shell
-git-po-helper init --core XX.po
-```
-
-After translating the generated "po-core/XX.po", you can merge it to
-"po/XX.po" using the following commands:
-
-```shell
-msgcat po-core/XX.po po/XX.po -s -o /tmp/XX.po
-mv /tmp/XX.po po/XX.po
-git-po-helper update XX.po
-```
-
-Edit "po/XX.po" by hand to fix "fuzzy" messages, which may have misplaced
-translated messages and duplicate messages.
-
-
## Translation Process Flow
The overall data-flow looks like this:
- +-------------------+ +------------------+
- | Git source code | ---(1)---> | L10n coordinator |
- | repository | <---(4)--- | repository |
- +-------------------+ +------------------+
- | ^
- (2) (3)
- V |
- +------------------+
- | Language Team XX |
- +------------------+
+ +-------------------+ +------------------+
+ | Git source code | ----(2)---> | L10n coordinator |
+ | repository | <---(5)---- | repository |
+ +-------------------+ +------------------+
+ | | ^
+ (1) (3) (4)
+ V v |
+ +----------------------------------+
+ | Language Team XX |
+ +----------------------------------+
- Translatable strings are marked in the source file.
-- L10n coordinator pulls from the source (1)
-- L10n coordinator updates the message template "po/git.pot"
-- Language team pulls from L10n coordinator (2)
-- Language team updates the message file "po/XX.po"
-- L10n coordinator pulls from Language team (3)
-- L10n coordinator asks the result to be pulled (4).
+- Language teams can start translation iterations at any time, even
+ before the l10n window opens:
+
+ + Pull from the master branch of the source (1)
+ + Update the message file by running "make po-update PO\_FILE=po/XX.po"
+ + Translate the message file "po/XX.po"
+
+- The L10n coordinator pulls from source and announces the l10n window
+ open (2)
+- Language team pulls from the l10n coordinator, starts another
+ translation iteration against the l10n coordinator's tree (3)
+
+ + Run "git pull --rebase" from the l10n coordinator
+ + Update the message file by running "make po-update PO\_FILE=po/XX.po"
+ + Translate the message file "po/XX.po"
+ + Squash trivial l10n git commits using "git rebase -i"
+
+- Language team sends pull request to the l10n coordinator (4)
+- L10n coordinator checks and merges
+- L10n coordinator asks the result to be pulled (5).
-## Maintaining the "po/git.pot" file
+## Dynamically generated POT files
-(This is done by the l10n coordinator).
+POT files are templates for l10n contributors to create or update their
+translation files. We used to have the "po/git.pot" file which was
+generated by the l10n coordinator, but this file had been removed from
+the tree.
-The "po/git.pot" file contains a message catalog extracted from Git's
-sources. The l10n coordinator maintains it by adding new translations with
-msginit(1), or update existing ones with msgmerge(1). In order to update
-the Git sources to extract the messages from, the l10n coordinator is
-expected to pull from the main git repository at strategic point in
-history (e.g. when a major release and release candidates are tagged),
-and then run "make pot" at the top-level directory.
+The two POT files "po/git.pot" and "po/git-core.pot" can be created
+dynamically when necessary.
-Language contributors use this file to prepare translations for their
-language, but they are not expected to modify it.
+L10n contributors use "po/git.pot" to prepare translations for their
+languages, but they are not expected to modify it. The "po/git.pot" file
+can be generated manually with the following command:
+
+```shell
+make po/git.pot
+```
+
+The "po/git-core.pot" file is the template for core translations. A core
+translation is the minimum set of work necessary to complete a
+translation of a new language. Since there are more than 5000 messages
+in the full set of template message file "po/git.pot" that need to be
+translated, this is not a piece of cake for new language contributors.
+
+The "core" template file "po/git-core.pot" can be generated manually
+by running:
+
+```shell
+make po/git-core.pot
+```
## Initializing a "XX.po" file
@@ -115,32 +123,14 @@
you add a translation for the first time by running:
```shell
-msginit --locale=XX
+make po-init PO_FILE=po/XX.po
```
-in the "po/" directory, where XX is the locale, e.g. "de", "is", "pt\_BR",
-"zh\_CN", etc.
+where XX is the locale, e.g. "de", "is", "pt\_BR", "zh\_CN", etc.
-Then edit the automatically generated copyright info in your new "XX.po"
-to be correct, e.g. for Icelandic:
-
-```diff
-@@ -1,6 +1,6 @@
--# Icelandic translations for PACKAGE package.
--# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER
--# This file is distributed under the same license as the PACKAGE package.
-+# Icelandic translations for Git.
-+# Copyright (C) 2010 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-+# This file is distributed under the same license as the Git package.
- # Ævar Arnfjörð Bjarmason <avarab@gmail.com>, 2010.
-```
-
-And change references to PACKAGE VERSION in the PO Header Entry to
-just "Git":
-
-```shell
-perl -pi -e 's/(?<="Project-Id-Version: )PACKAGE VERSION/Git/' XX.po
-```
+The newly generated message file "po/XX.po" is based on the core pot
+file "po/git-core.pot", so it contains only a minimal set of messages
+and it's a good start for a new language contribution.
Once you are done testing the translation (see below), commit the result
and ask the l10n coordinator to pull from you.
@@ -153,19 +143,53 @@
If you are replacing translation strings in an existing "XX.po" file to
improve the translation, just edit the file.
-If there's an existing "XX.po" file for your language, but the repository
-of the l10n coordinator has newer "po/git.pot" file, you would need to first
-pull from the l10n coordinator (see the beginning of this document for its
-URL), and then update the existing translation by running:
+If you want to find new translatable strings in source files of upstream
+repository and propagate them to your "po/XX.po", run command:
```shell
-msgmerge --add-location --backup=off -U XX.po git.pot
+make po-update PO_FILE=po/XX.po
```
-in the "po/" directory, where "XX.po" is the file you want to update.
+It will:
-Once you are done testing the translation (see below), commit the result
-and ask the l10n coordinator to pull from you.
+- Call "make po/git.pot" to generate new "po/git.pot" file
+- Call "msgmerge --add-location --backup=off -U po/XX.po po/git.pot"
+ to update your "po/XX.po"
+- The "--add-location" option for msgmerge will add location lines,
+ and these location lines will help translation tools to locate
+ translation context easily.
+
+Once you are done testing the translation (see below), it's better
+to commit a location-less "po/XX.po" file to save repository space
+and make a user-friendly patch for review.
+
+To save a location-less "po/XX.po" automatically in repository, you
+can:
+
+First define a new attribute for "po/XX.po" by appending the following
+line in ".git/info/attributes":
+
+```
+/po/XX.po filter=gettext-no-location
+```
+
+Then define the driver for the "gettext-no-location" clean filter to
+strip out both filenames and locations from the contents as follows:
+
+```shell
+git config --global filter.gettext-no-location.clean \
+ "msgcat --no-location -"
+```
+
+For users who have gettext version 0.20 or higher, it is also possible
+to define a clean filter to preserve filenames but not locations:
+
+```shell
+git config --global filter.gettext-no-location.clean \
+ "msgcat --add-location=file -"
+```
+
+You're now ready to ask the l10n coordinator to pull from you.
## Fuzzy translation
@@ -196,6 +220,14 @@
messages that deviate from the originals in whether they begin/end
with a newline or not.
+L10n coordinator will check your contributions using a helper program
+(see "PO helper" section below):
+
+```shell
+git-po-helper check-po po/XX.po
+git-po-helper check-commits <rev-list-opts>
+```
+
## Marking strings for translation
@@ -221,6 +253,10 @@
- Adjust the strings so that they're easy to translate. Most of the
advice in `info '(gettext)Preparing Strings'` applies here.
+- Strings referencing numbers of items may need to be split into singular and
+ plural forms; see the Q\_() wrapper in the C sub-section below for an
+ example.
+
- If something is unclear or ambiguous you can use a "TRANSLATORS"
comment to tell the translators what to make of it. These will be
extracted by xgettext(1) and put in the "po/\*.po" files, e.g. from
@@ -366,29 +402,6 @@
To build and install the helper program from source, see
[git-po-helper/README][].
-Usage for git-po-helper:
-
-- To start a new language translation:
-
- ```shell
- git-po-helper init XX.po
- ```
-
-- To update your "XX.po" file:
-
- ```shell
- git-po-helper update XX.po
- ```
-
-- To check commit log and syntax of "XX.po":
-
- ```shell
- git-po-helper check-po XX.po
- git-po-helper check-commits
- ```
-
-Run "git-po-helper" without arguments to show usage.
-
## Conventions
@@ -432,13 +445,8 @@
- Initialize proper filename of the "XX.po" file conforming to
iso-639 and iso-3166.
-- Must complete a minimal translation based on the "po-core/core.pot"
- template. Using the following command to initialize the minimal
- "po-core/XX.po" file:
-
- ```shell
- git-po-helper init --core <your-language>
- ```
+- Must complete a minimal translation based on the "Core
+ translation". See that section above.
- Add a new entry in the "po/TEAMS" file with proper format, and check
the syntax of "po/TEAMS" by running the following command:
diff --git a/po/TEAMS b/po/TEAMS
index 66ad06b..2e40726 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -51,8 +51,8 @@
Leader: Arusekk <arek_koz@o2.pl>
Language: pt_PT (Portuguese - Portugal)
-Repository: https://github.com/git-l10n-pt-PT/git-po/
-Leader: Daniel Santos <hello@brighterdan.com>
+Repository: https://codeberg.org/git-pt/Git-PO-pt_PT/
+Leader: Daniel Santos <dacs.git@brilhante.top>
Language: ru (Russian)
Repository: https://github.com/DJm00n/git-po-ru/
@@ -73,7 +73,7 @@
Members: Nguyễn Thái Ngọc Duy <pclouds AT gmail.com>
Language: zh_CN (Simplified Chinese)
-Repository: https://github.com/fangyi-zhou/git/
+Repository: https://github.com/fangyi-zhou/git-po/
Leader: Fangyi Zhou <me AT fangyi.io>
Members: Ray Chen <oldsharp AT gmail.com>
依云 <lilydjwg AT gmail.com>
diff --git a/po/bg.po b/po/bg.po
index 905eb8e..8328531 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,7 +1,7 @@
# Bulgarian translation of git po-file.
# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Alexander Shopov <ash@kambanaria.org>.
# This file is distributed under the same license as the git package.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022.
#
# ========================
# DICTIONARY TO MERGE IN GIT GUI
@@ -33,6 +33,7 @@
# switch to branch преминавам към клон
# sparse entry/blob частично изтеглена директория/път/обект-BLOB
# sparse index частичен индекс
+# sparcity частичност
# revision range диапазон на версиите
# cover letter придружаващо писмо
# reference repository еталонно хранилище
@@ -62,6 +63,7 @@
# fallback резервен вариант
# pathspec magic опция за магически пътища
# bitmap index индекс на база битови маски
+# multi-pack bitmap многопакетната битова маска
# mark маркер
# plumbing команди от системно ниво
# porcelain команди от потребителско ниво
@@ -143,9 +145,10 @@
# blame извеждане на авторство
# refname име на указател
# cone pattern matching пътеводно напасване
+# sparse-checkout cone пътеводен сегмент на частичното изтегляне
# negative pattern отрицателен шаблон
# colored hunk/diff оцветено парче/разлика
-# up to date обновен, освен като самостотелва дума - актуален или completely up to date - напълно актуален
+# up to date обновен, освен като самостоятелна дума - актуален или completely up to date - напълно актуален
# stateless без запазване на състоянието
# end packet пакет за край
# identity самоличност, информация за
@@ -157,8 +160,14 @@
# expired остарял
# reroll-count номер на редакция
# Nth re-roll N-та поредна редакция
-# fetch доставам
+# fetch доставям
# prefetch предварително доставяне
+# scheduler планиращ модул
+# snapshot снимка
+# enlistment зачислена директория
+# zealous merge засилено сливане
+# unregister отчислявам
+# marked counting изброяване
# ------------------------
# „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$
# ------------------------
@@ -173,12 +182,13 @@
# msgcat todo1.po todo2.po > todo.po
# grep '^#: ' todo.po | sed 's/^#: //' | tr ' ' '\n' | sed 's/:[0-9]*$//' > FILES
# 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.31\n"
+"Project-Id-Version: git 2.34\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-03 17:06+0800\n"
-"PO-Revision-Date: 2021-08-06 13:38+0300\n"
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
+"PO-Revision-Date: 2022-01-16 10:50+0100\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@@ -187,233 +197,234 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Неуспешен анализ — „%s“."
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "индексът не може да бъде прочетен"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "двоично"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "нищо"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "няма промени"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Обновяване"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "неуспешно добавяне в индекса на „%s“"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
msgid "could not write index"
msgstr "индексът не може да бъде записан"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d файл обновен\n"
msgstr[1] "%d файла обновени\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Отмяна"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "Указателят „HEAD^{tree}“ не може да бъде анализиран"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d файл с отменени промени\n"
msgstr[1] "%d файла с отменени промени\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Няма неследени файлове.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Добавяне на неследени"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d файл добавен\n"
msgstr[1] "%d файла добавени\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "пренебрегване на неслятото: „%s“"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Само двоични файлове са променени.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Няма промени.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Обновяване на кръпка"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Преглед на разликата"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "извеждане на пътищата с промени"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "добавяне на състоянието на работното дърво към промените в индекса"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "връщане на състоянието на индекса към соченото от „HEAD“"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "интерактивни избор и промяна на парчета код"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "разлика между соченото от „HEAD“ и индекса"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr "добавяне на съдържанието на неследените файлове към индекса"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "Помощ:"
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "избор на eдин елемент"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "избор на поредица от елементи"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "избор на няколко поредици от елементи"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "избор на базата на уникален префикс"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "изваждане на указаното от избора"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "избор на всички елементи"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(празно) приключване на избирането"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "избор на номериран елемент"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "(празно) без избор на нищо"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "●●● Команди ●●●"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "Избор на следващо действие"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "в индекса"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "извън индекса"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
#: git-add--interactive.perl:213
msgid "path"
msgstr "път"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "индексът не може да бъде обновен"
#
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Изход.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Добавяне на изтриването [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Добавяне на добавянето [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Добавяне на това парче [y,n,q,a,d%s,?]? "
@@ -440,22 +451,22 @@
"a — добавяне на това и всички следващи парчета от файла в индекса\n"
"d — без добавяне на това и всички следващи парчета от файла в индекса\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Скатаване на добавянето [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? "
@@ -482,22 +493,22 @@
"a — скатаване на това и всички следващи парчета от файла\n"
"d — без скатаване на това и всички следващи парчета от файла\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Изваждане на добавянето [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? "
@@ -524,23 +535,23 @@
"a — изваждане на това и всички следващи парчета от файла от индекса\n"
"d — без изваждане на това и всички следващи парчета от файла от индекса\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на изтриването към индекса [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на добавянето към индекса [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на това парче към индекса [y,n,q,a,d%s,?]? "
@@ -567,28 +578,28 @@
"a — прилагане на това и всички следващи парчета от файла към индекса\n"
"d — без прилагане на това и всички следващи парчета от файла към индекса\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d"
"%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на добавянето от работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? "
@@ -618,26 +629,26 @@
"d — без премахване на това и всички следващи парчета от файла от работното "
"дърво\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на промяната в правата за достъп от индекса и работното дърво [y,"
"n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на добавянето от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? "
@@ -659,25 +670,25 @@
"d — без премахване на това и всички следващи парчета от файла от индекса и "
"работното дърво\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната в правата за достъп от индекса и работното дърво [y,n,"
"q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на добавянето от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? "
@@ -819,7 +830,7 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
@@ -831,11 +842,11 @@
msgid "The selected hunks do not apply to the index!"
msgstr "Избраните парчета не може да се добавят в индекса!"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Да се приложат ли към работното дърво? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Нищо не е приложено.\n"
@@ -873,11 +884,11 @@
msgid "No other hunks to goto"
msgstr "Няма други парчета"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "към кое парче да се придвижи? "
@@ -897,7 +908,7 @@
msgid "No other hunks to search"
msgstr "Няма други парчета за търсене"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "да се търси с регулярен израз? "
@@ -927,7 +938,7 @@
msgid "'git apply' failed"
msgstr "неуспешно изпълнение на „git apply“"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -937,37 +948,37 @@
"За да изключите това предупреждение, изпълнете:\n"
" git config advice.%s false"
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sподсказка: %.*s%s\n"
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Отбирането на подавания е блокирано от неслети файлове."
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr "Подаването е блокирано от неслети файлове."
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr "Сливането е блокирано от неслети файлове."
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr "Издърпването е блокирано от неслети файлове."
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr "Отмяната е блокирана от неслети файлове."
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Действието „%s“ е блокирано от неслети файлове."
-#: advice.c:270
+#: advice.c:196
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."
@@ -975,40 +986,47 @@
"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n"
"за да отбележите коригирането им. След това извършете подаването."
-#: advice.c:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "Изход от програмата заради некоригиран конфликт."
-#: advice.c:283 builtin/merge.c:1374
+#: advice.c:209 builtin/merge.c:1382
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)."
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "Промените трябва да се подадат преди сливане."
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "Изход от програмата заради незавършено сливане."
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Не може да се извърши превъртане, преустановяване на действието."
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"Следните пътища не съвпадат с никой от настроените, но съвпадат с обекти\n"
-"в индекса, които са извън текущото частично изтегляне:\n"
+"Следните пътища напасват с пътища извън дефиницията за частично\n"
+"изтегляне и няма да се обновят в индекса:\n"
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Изключете или променете правилата за частичност, ако искате до обновявате "
-"такива обекти."
+"Ако искате да ги обновите, пробвайте едно от следните:\n"
+" ⁃ ползвайте опцията „--sparse“\n"
+" ⁃ изключете или променете правилата за частичност."
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1069,21 +1087,33 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "непозната опция за игнориране на знаците за интервали „%s“"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "опциите „--reject“ и „--3way“ са несъвместими"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "опциите „%s“ и „%s“ са несъвместими"
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "като „--3way“, но извън хранилище"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "като „--index“, но извън хранилище"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "като „--cached“, но извън хранилище"
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "„%s“ извън хранилище"
#: apply.c:800
#, c-format
@@ -1197,37 +1227,37 @@
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит"
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "грешка в двоичната кръпка на ред %d: %.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неразпозната двоичната кръпка на ред %d"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "кръпката е с изцяло повредени данни на ред %d"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "символната връзка „%s“ не може да бъде прочетена"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправилно начало на ред: „%c“"
-#: apply.c:3056
+#: apply.c:3057
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -1236,13 +1266,13 @@
msgstr[1] ""
"%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)."
-#: apply.c:3068
+#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
"Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
@@ -1251,316 +1281,318 @@
"при търсене за:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "липсват данните за двоичната кръпка за „%s“"
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"двоичната кръпка не може да се приложи в обратна посока, когато обратното "
"парче за „%s“ липсва"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание."
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
"необходимият резултат след операцията — „%s“ за „%s“ не може да бъде "
"прочетен"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
-#: apply.c:3208
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а "
"бе получено: „%s“)"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "неуспешно прилагане на кръпка: „%s:%ld“"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "„%s“ не може да се изтегли"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
#, c-format
msgid "failed to read %s"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: apply.c:3412
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "изчитане на „%s“ след проследяване на символна връзка"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3711
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "обектът с път „%s“ е преименуван или изтрит"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3726
#, c-format
msgid "%s: does not exist in index"
msgstr "„%s“ не съществува в индекса"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3734 apply.c:3978
#, c-format
msgid "%s: does not match index"
msgstr "„%s“ не съответства на индекса"
-#: apply.c:3571
+#: apply.c:3595
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "в хранилището липсват необходимите обекти-BLOB, за тройно сливане."
-#: apply.c:3574
+#: apply.c:3598
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Тройно сливане…\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3614 apply.c:3618
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "текущото съдържание на „%s“ не може да бъде прочетено"
-#: apply.c:3606
+#: apply.c:3630
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Неуспешно тройно сливане…\n"
-#: apply.c:3620
+#: apply.c:3644
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Конфликти при прилагането на кръпката към „%s“.\n"
-#: apply.c:3625
+#: apply.c:3649
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Кръпката бе приложена чисто към „%s“.\n"
-#: apply.c:3642
+#: apply.c:3666
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Преминаване към пряко прилагане…\n"
-#: apply.c:3654
+#: apply.c:3678
msgid "removal patch leaves file contents"
msgstr "изтриващата кръпка оставя файла непразен"
-#: apply.c:3727
+#: apply.c:3751
#, c-format
msgid "%s: wrong type"
msgstr "„%s“: неправилен вид"
-#: apply.c:3729
+#: apply.c:3753
#, c-format
msgid "%s has type %o, expected %o"
msgstr "„%s“ е от вид „%o“, а се очакваше „%o“"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
#, c-format
msgid "invalid path '%s'"
msgstr "неправилен път: „%s“"
-#: apply.c:3952
+#: apply.c:3976
#, c-format
msgid "%s: already exists in index"
msgstr "„%s“: вече съществува в индекса"
-#: apply.c:3956
+#: apply.c:3980
#, c-format
msgid "%s: already exists in working directory"
msgstr "„%s“: вече съществува в работното дърво"
-#: apply.c:3976
+#: apply.c:4000
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)"
-#: apply.c:3981
+#: apply.c:4005
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“"
-#: apply.c:4001
+#: apply.c:4025
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "засегнатият файл „%s“ е след символна връзка"
-#: apply.c:4005
+#: apply.c:4029
#, c-format
msgid "%s: patch does not apply"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: apply.c:4020
+#: apply.c:4044
#, c-format
msgid "Checking patch %s..."
msgstr "Проверяване на кръпката „%s“…"
-#: apply.c:4112
+#: apply.c:4136
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)."
-#: apply.c:4119
+#: apply.c:4143
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“"
-#: apply.c:4122
+#: apply.c:4146
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)."
-#: apply.c:4131
+#: apply.c:4155
#, c-format
msgid "could not add %s to temporary index"
msgstr "„%s“ не може да се добави към временния индекс"
-#: apply.c:4141
+#: apply.c:4165
#, c-format
msgid "could not write temporary index to %s"
msgstr "временният индекс не може да се запази в „%s“"
-#: apply.c:4279
+#: apply.c:4303
#, c-format
msgid "unable to remove %s from index"
msgstr "„%s“ не може да се извади от индекса"
-#: apply.c:4313
+#: apply.c:4337
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "повредена кръпка за модула „%s“"
-#: apply.c:4319
+#: apply.c:4343
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
"не може да се получи информация чрез „stat“ за новосъздадения файл „%s“"
-#: apply.c:4327
+#: apply.c:4351
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"не може да се за създаде мястото за съхранение на новосъздадения файл „%s“"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4357 apply.c:4502
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не може да се добави запис в кеша за „%s“"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: apply.c:4380
+#: apply.c:4404
#, c-format
msgid "closing file '%s'"
msgstr "затваряне на файла „%s“"
-#: apply.c:4450
+#: apply.c:4474
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“"
-#: apply.c:4548
+#: apply.c:4572
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Кръпката „%s“ бе приложена чисто."
-#: apply.c:4556
+#: apply.c:4580
msgid "internal error"
msgstr "вътрешна грешка"
-#: apply.c:4559
+#: apply.c:4583
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Прилагане на кръпката „%%s“ с %d отхвърлено парче…"
msgstr[1] "Прилагане на кръпката „%%s“ с %d отхвърлени парчета…"
-#: apply.c:4570
+#: apply.c:4594
#, c-format
msgid "truncating .rej filename to %.*s.rej"
-msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“"
+msgstr "съкращаване на името на файла с отхвърлените парчета на „%.*s.rej“"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4602
#, c-format
msgid "cannot open %s"
msgstr "„%s“ не може да бъде отворен"
-#: apply.c:4592
+#: apply.c:4616
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "%d-то парче бе успешно приложено."
-#: apply.c:4596
+#: apply.c:4620
#, c-format
msgid "Rejected hunk #%d."
msgstr "%d-то парче бе отхвърлено."
-#: apply.c:4725
+#: apply.c:4749
#, c-format
msgid "Skipped patch '%s'."
msgstr "Пропусната кръпка: „%s“"
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "непознат вход"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr ""
+"На входа няма непразни кръпки (те се приемат при опция „--allow-empty“)"
-#: apply.c:4753
+#: apply.c:4779
msgid "unable to read index file"
msgstr "индексът не може да бъде записан"
-#: apply.c:4910
+#: apply.c:4936
#, c-format
msgid "can't open patch '%s': %s"
msgstr "кръпката „%s“ не може да бъде отворена: %s"
-#: apply.c:4937
+#: apply.c:4963
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
msgstr[1] "пренебрегнати са %d грешки в знаците за интервали"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4969 apply.c:4984
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ред добавя грешки в знаците за интервали."
msgstr[1] "%d реда добавят грешки в знаците за интервали."
-#: apply.c:4951
+#: apply.c:4977
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1569,141 +1601,139 @@
msgstr[1] ""
"Добавени са %d реда след корекцията на грешките в знаците за интервали."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Новият индекс не може да бъде записан"
-#: apply.c:4995
+#: apply.c:5021
msgid "don't apply changes matching the given path"
msgstr "без прилагане на промените напасващи на дадения път"
-#: apply.c:4998
+#: apply.c:5024
msgid "apply changes matching the given path"
msgstr "прилагане на промените напасващи на дадения път"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5026 builtin/am.c:2376
msgid "num"
msgstr "БРОЙ"
-#: apply.c:5001
+#: apply.c:5027
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
-#: apply.c:5004
+#: apply.c:5030
msgid "ignore additions made by the patch"
msgstr "игнориране на редовете добавени от тази кръпка"
-#: apply.c:5006
+#: apply.c:5032
msgid "instead of applying the patch, output diffstat for the input"
msgstr "извеждане на статистика на промените без прилагане на кръпката"
-#: apply.c:5010
+#: apply.c:5036
msgid "show number of added and deleted lines in decimal notation"
msgstr "извеждане на броя на добавените и изтритите редове"
-#: apply.c:5012
+#: apply.c:5038
msgid "instead of applying the patch, output a summary for the input"
msgstr "извеждане на статистика на входните данни без прилагане на кръпката"
-#: apply.c:5014
+#: apply.c:5040
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "проверка дали кръпката може да се приложи, без действително прилагане"
-#: apply.c:5016
+#: apply.c:5042
msgid "make sure the patch is applicable to the current index"
msgstr "проверка дали кръпката може да бъде приложена към текущия индекс"
-#: apply.c:5018
+#: apply.c:5044
msgid "mark new files with `git add --intent-to-add`"
msgstr "отбелязване на новите файлове с „git add --intent-to-add“"
-#: apply.c:5020
+#: apply.c:5046
msgid "apply a patch without touching the working tree"
msgstr "прилагане на кръпката без промяна на работното дърво"
-#: apply.c:5022
+#: apply.c:5048
msgid "accept a patch that touches outside the working area"
msgstr "прилагане на кръпка, която променя и файлове извън работното дърво"
-#: apply.c:5025
+#: apply.c:5051
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--"
"summary“"
-#: apply.c:5027
+#: apply.c:5053
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"пробване с тройно сливане, ако това не сработи — стандартно прилагане на "
"кръпка"
-#: apply.c:5029
+#: apply.c:5055
msgid "build a temporary index based on embedded index information"
msgstr ""
"създаване на временен индекс на база на включената информация за индекса"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5058 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "разделяне на пътищата с нулевия знак „NUL“"
-#: apply.c:5034
+#: apply.c:5060
msgid "ensure at least <n> lines of context match"
msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "действие"
-#: apply.c:5036
+#: apply.c:5062
msgid "detect new or modified lines that have whitespace errors"
msgstr "засичане на нови или променени редове с грешки в знаците за интервали"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5065 apply.c:5068
msgid "ignore changes in whitespace when finding context"
msgstr ""
"игнориране на промените в знаците за интервали при откриване на контекста"
-#: apply.c:5045
+#: apply.c:5071
msgid "apply the patch in reverse"
msgstr "прилагане на кръпката в обратна посока"
-#: apply.c:5047
+#: apply.c:5073
msgid "don't expect at least one line of context"
msgstr "без изискване на дори и един ред контекст"
-#: apply.c:5049
+#: apply.c:5075
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“"
-#: apply.c:5051
+#: apply.c:5077
msgid "allow overlapping hunks"
msgstr "позволяване на застъпващи се парчета"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "повече подробности"
-
-#: apply.c:5054
+#: apply.c:5080
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл"
-#: apply.c:5057
+#: apply.c:5083
msgid "do not trust the line counts in the hunk headers"
msgstr "без доверяване на номерата на редовете в заглавните части на парчетата"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5085 builtin/am.c:2364
msgid "root"
msgstr "НАЧАЛНА_ДИРЕКТОРИЯ"
-#: apply.c:5060
+#: apply.c:5086
msgid "prepend <root> to all filenames"
msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове"
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "да не се връща грешка при празни кръпки"
+
#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
@@ -1714,16 +1744,16 @@
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "неподдържани права за достъп до файл: 0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "филтърът „%s“ не може да бъде стартиран"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "дескрипторът не може да бъде пренасочен"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "филтърът „%s“ върна грешка"
@@ -1767,156 +1797,152 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list"
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
#, c-format
-msgid "cannot read %s"
-msgstr "обектът „%s“ не може да бъде прочетен"
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1143
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "пътят „%s“ не съвпада с никой файл"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "такъв указател няма: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "неправилно име на обект: „%s“"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "не е обект-дърво: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "текущата работна директория не е следена"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Файлът „%s“ липсва"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "„%s“ не е обикновен файл"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "ФОРМАТ"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "ФОРМАТ на архива"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
msgid "prefix"
msgstr "ПРЕФИКС"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "добавяне на този ПРЕФИКС към всеки път в архива"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "ФАЙЛ"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "добавяне на неследените файлове към архива"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "запазване на архива в този ФАЙЛ"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "изчитане на „.gitattributes“ в работната директория"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "извеждане на архивираните файлове на стандартната грешка"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "задаване на нивото на компресиране"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "извеждане на списъка с поддържаните формати"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
msgid "repo"
msgstr "хранилище"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "получаване на архива от отдалеченото ХРАНИЛИЩЕ"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
msgid "command"
msgstr "команда"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "път към отдалечената команда „git-upload-archive“"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Неочаквана опция „--remote“"
-#: archive.c:581
-msgid "Option --exec can only be used together with --remote"
-msgstr "опцията „--exec“ изисква „--remote“"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "опцията „%s“ изисква „%s“"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Неочаквана опция „--output“"
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "опциите „--add-file“ и „--remote“ са несъвместими"
-
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Непознат формат на архив: „%s“"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "„%.*s“ е неправилно име за атрибут"
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s: командата не е позволена: „%s:%d“"
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1924,22 +1950,22 @@
"Отрицателните шаблони се игнорират в атрибутите на git.\n"
"Ако ви трябва начална удивителна, ползвайте „\\!“."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Неправилно цитирано съдържание във файла „%s“: %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Повече не може да се търси двоично!\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "Неправилно име на подаване „%s“"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1948,7 +1974,7 @@
"Неправилна база за сливане: %s.\n"
"Следователно грешката е коригирана между „%s“ и [%s].\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1957,7 +1983,7 @@
"Нова база за сливане: %s.\n"
"Свойството е променено между „%s“ и [%s].\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1966,7 +1992,7 @@
"Базата за сливане „%s“ е %s.\n"
"Следователно първото %s подаване е между „%s“ и [%s].\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1977,7 +2003,7 @@
"Двоичното търсене с git bisect няма да работи правилно.\n"
"Дали не сте объркали указателите „%s“ и „%s“?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1988,36 +2014,36 @@
"Не може да сме сигурни, че първото %s подаване е между „%s“ и „%s“.\n"
"Двоичното търсене продължава."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Двоично търсене: трябва да се провери база за сливане\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "необходима е версия „%s“"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "файлът „%s“ не може да бъде създаден"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "неуспешно прочитане на указателите за двоично търсене"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "„%s“ e както „%s“, така и „%s“\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -2026,7 +2052,7 @@
"Липсва подходящо за тестване подаване.\n"
"Проверете параметрите за пътищата.\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -2036,7 +2062,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -2057,11 +2083,12 @@
"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
"указването на крайно подаване"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "неуспешно настройване на обхождането на версиите"
@@ -2082,101 +2109,97 @@
msgid "cannot read blob %s for path %s"
msgstr "обектът-BLOB „%s“ в пътя %s не може да бъде прочетен"
-#: branch.c:53
+#: branch.c:77
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
+msgstr ""
+"настроените множество указатели, които да се следят, не може да се наследят "
+"при пребазиране"
+
+#: branch.c:88
#, c-format
+msgid "not setting branch '%s' as its own upstream"
+msgstr ""
+"клонът „%s“ не може да служи като източник за собствената си синхронизация"
+
+#: branch.c:144
+#, c-format
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "клонът „%s“ ще следи „%s“ чрез пребазиране."
+
+#: branch.c:145
+#, c-format
+msgid "branch '%s' set up to track '%s'."
+msgstr "клонът „%s“ ще следи „%s“."
+
+#: branch.c:148
+#, c-format
+msgid "branch '%s' set up to track:"
+msgstr "клонът „%s“ ще следи:"
+
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "настройките за следения клон не може да бъдат записани"
+
+#: branch.c:162
msgid ""
"\n"
"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"the remote tracking information by invoking:"
msgstr ""
"\n"
"След корекция на грешката, може да обновите\n"
-"информацията за следения клон чрез:\n"
-"git branch --set-upstream-to=%s%s%s"
+"информацията за следения клон чрез:"
-#: branch.c:67
+#: branch.c:203
#, c-format
-msgid "Not setting branch %s as its own upstream."
+msgid "asked to inherit tracking from '%s', but no remote is set"
msgstr ""
-"Клонът „%s“ не може да служи като източник за собствената си синхронизация."
+"заявка за наследяване на следенето от „%s“, но не е зададено отдалечено "
+"хранилище"
-#: branch.c:93
+#: branch.c:209
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr ""
-"Клонът „%s“ ще следи отдалечения клон „%s“ от хранилището „%s“ чрез "
-"пребазиране."
+"заявка за наследяване на следенето от „%s“, но не е настроен режим за "
+"пребазиране"
-#: branch.c:94
+#: branch.c:252
#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "Клонът „%s“ ще следи отдалечения клон „%s“ от хранилището „%s“."
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "няма следене: информацията за указателя „%s“ не е еднозначна"
-#: branch.c:98
+#: branch.c:287
#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "Клонът „%s“ ще следи локалния клон „%s“ чрез пребазиране."
+msgid "'%s' is not a valid branch name"
+msgstr "„%s“ не е позволено име за клон"
-#: branch.c:99
+#: branch.c:307
#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "Клонът „%s“ ще следи локалния клон „%s“."
+msgid "a branch named '%s' already exists"
+msgstr "вече съществува клон с име „%s“."
-#: branch.c:104
+# FIXME
+#: branch.c:313
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr "Клонът „%s“ ще следи отдалечения указател „%s“ чрез пребазиране."
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr ""
+"не може принудително да обновите клона „%s“, който е изтеглен в пътя „%s“"
-#: branch.c:105
+#: branch.c:336
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "Клонът „%s“ ще следи отдалечения указател „%s“."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"настройките за следенето не може да се зададат — началото „%s“ не е клон"
-#: branch.c:109
-#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr "Клонът „%s“ ще следи локалния указател „%s“ чрез пребазиране."
-
-#: branch.c:110
-#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "Клонът „%s“ ще следи локалния указател „%s“."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Настройките за следения клон не може да бъдат записани"
-
-#: branch.c:156
-#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Няма следене: информацията за указателя „%s“ не е еднозначна"
-
-#: branch.c:189
-#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "„%s“ не е позволено име за клон."
-
-#: branch.c:208
-#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Вече съществува клон с име „%s“."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Текущият клон не може да бъде принудително обновен."
-
-#: branch.c:233
-#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "Зададените настройки за следенето са грешни — началото „%s“ не е клон."
-
-#: branch.c:235
+#: branch.c:338
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "заявеният отдалечен клон „%s“ не съществува"
-#: branch.c:237
+#: branch.c:340
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -2195,27 +2218,28 @@
"може да използвате „git push -u“, за да настроите към кой клон да се "
"изтласква."
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Неправилно име на обект: „%s“"
+msgid "not a valid object name: '%s'"
+msgstr "неправилно име на обект: „%s“"
-#: branch.c:301
+#: branch.c:404
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Името на обект не е еднозначно: „%s“"
+msgid "ambiguous object name: '%s'"
+msgstr "името на обект не е еднозначно: „%s“"
-#: branch.c:306
+#: branch.c:409
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Неправилно място за начало на клон: „%s“"
+msgid "not a valid branch point: '%s'"
+msgstr "неправилно място за начало на клон: „%s“"
-#: branch.c:366
+#: branch.c:469
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "„%s“ вече е изтеглен в „%s“"
-#: branch.c:389
+#: branch.c:494
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "Указателят „HEAD“ на работното дърво „%s“ не е обновен"
@@ -2240,8 +2264,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "непозната заглавна част: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "„%s“ не може да се отвори"
@@ -2300,7 +2324,7 @@
msgid "cannot write bundle version %d with algorithm %s"
msgstr "пратка %d не може да се запише с алгоритъм %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
@@ -2337,12 +2361,12 @@
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "ненулев идентификатор за краен откъс %<PRIx32>"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "неправилна стойност за цвят: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "неправилна версия на контролна сума"
@@ -2388,197 +2412,197 @@
msgid "unable to find all commit-graph files"
msgstr "някои файлове на гра̀фа с подаванията не може да бъдат открити"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:749 commit-graph.c:786
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
"неправилна позиция на подаването. Вероятно графът с подаванията е повреден"
-#: commit-graph.c:766
+#: commit-graph.c:770
#, c-format
msgid "could not find commit %s"
msgstr "подаването „%s“ не може да бъде открито"
-#: commit-graph.c:799
+#: commit-graph.c:803
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
"графът с подаванията изисква генериране на данни за отместването, но такива "
"липсват"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1108 builtin/am.c:1369
#, c-format
msgid "unable to parse commit %s"
msgstr "подаването не може да бъде анализирано: %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "видът на обекта „%s“ не може да бъде определен"
-#: commit-graph.c:1368
+#: commit-graph.c:1401
msgid "Loading known commits in commit graph"
msgstr "Зареждане на познатите подавания в гра̀фа с подаванията"
-#: commit-graph.c:1385
+#: commit-graph.c:1418
msgid "Expanding reachable commits in commit graph"
msgstr "Разширяване на достижимите подавания в гра̀фа"
-#: commit-graph.c:1405
+#: commit-graph.c:1438
msgid "Clearing commit marks in commit graph"
msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията"
-#: commit-graph.c:1424
+#: commit-graph.c:1457
msgid "Computing commit graph topological levels"
msgstr "Изчисляване на топологичните нива в гра̀фа с подаванията"
-#: commit-graph.c:1477
+#: commit-graph.c:1510
msgid "Computing commit graph generation numbers"
msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията"
-#: commit-graph.c:1558
+#: commit-graph.c:1591
msgid "Computing commit changed paths Bloom filters"
msgstr "Изчисляване на филтрите на Блум на пътищата с промяна при подаването"
-#: commit-graph.c:1635
+#: commit-graph.c:1668
msgid "Collecting referenced commits"
msgstr "Събиране на свързаните подавания"
-#: commit-graph.c:1660
+#: commit-graph.c:1693
#, 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:1673
+#: commit-graph.c:1706
#, c-format
msgid "error adding pack %s"
msgstr "грешка при добавяне на пакетен файл „%s“"
-#: commit-graph.c:1677
+#: commit-graph.c:1710
#, c-format
msgid "error opening index for %s"
msgstr "грешка при отваряне на индекса на „%s“"
-#: commit-graph.c:1714
+#: commit-graph.c:1747
msgid "Finding commits for commit graph among packed objects"
msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти"
-#: commit-graph.c:1732
+#: commit-graph.c:1765
msgid "Finding extra edges in commit graph"
msgstr "Откриване на още върхове в гра̀фа с подаванията"
-#: commit-graph.c:1781
+#: commit-graph.c:1814
msgid "failed to write correct number of base graph ids"
msgstr "правилният брой на базовите идентификатори не може да се запише"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1845 midx.c:1149
#, c-format
msgid "unable to create leading directories of %s"
msgstr "родителските директории на „%s“ не може да бъдат създадени"
-#: commit-graph.c:1825
+#: commit-graph.c:1858
msgid "unable to create temporary graph layer"
msgstr "не може да бъде създаден временен слой за гра̀фа с подаванията"
-#: commit-graph.c:1830
+#: commit-graph.c:1863
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "правата за споделен достъп до „%s“ не може да бъдат зададени"
-#: commit-graph.c:1887
+#: commit-graph.c:1920
#, 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:1923
+#: commit-graph.c:1956
msgid "unable to open commit-graph chain file"
msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори"
-#: commit-graph.c:1939
+#: commit-graph.c:1972
msgid "failed to rename base commit-graph file"
msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван"
-#: commit-graph.c:1959
+#: commit-graph.c:1992
msgid "failed to rename temporary commit-graph file"
msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван"
-#: commit-graph.c:2092
+#: commit-graph.c:2125
msgid "Scanning merged commits"
msgstr "Търсене на подаванията със сливания"
-#: commit-graph.c:2136
+#: commit-graph.c:2169
msgid "Merging commit-graph"
msgstr "Сливане на гра̀фа с подаванията"
-#: commit-graph.c:2244
+#: commit-graph.c:2277
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"опит за запис на гра̀фа с подаванията, но настройката „core.commitGraph“ е "
"изключена"
-#: commit-graph.c:2351
+#: commit-graph.c:2384
msgid "too many commits to write graph"
msgstr "прекалено много подавания за записване на гра̀фа"
-#: commit-graph.c:2449
+#: commit-graph.c:2482
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден"
-#: commit-graph.c:2459
+#: commit-graph.c:2492
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
"неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ "
"е преди „%s“, а не трябва"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2502 commit-graph.c:2517
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а "
"трябва да е %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2509
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира"
-#: commit-graph.c:2494
+#: commit-graph.c:2527
msgid "Verifying commits in commit graph"
msgstr "Проверка на подаванията в гра̀фа"
-#: commit-graph.c:2509
+#: commit-graph.c:2542
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се "
"анализира"
-#: commit-graph.c:2516
+#: commit-graph.c:2549
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с "
"подаванията е „%s“, а трябва да е „%s“"
-#: commit-graph.c:2526
+#: commit-graph.c:2559
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг"
-#: commit-graph.c:2535
+#: commit-graph.c:2568
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“"
-#: commit-graph.c:2549
+#: commit-graph.c:2582
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс"
-#: commit-graph.c:2554
+#: commit-graph.c:2587
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2586,7 +2610,7 @@
"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде "
"не е"
-#: commit-graph.c:2558
+#: commit-graph.c:2591
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2594,32 +2618,32 @@
"номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а "
"другаде е"
-#: commit-graph.c:2575
+#: commit-graph.c:2608
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %<PRIuMAX> < "
"%<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2614
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"датата на подаване на „%s“ в гра̀фа с подаванията е %<PRIuMAX>, а трябва да е "
"%<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "„%s“ не може да се анализира"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s не е подаване!"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2642,29 +2666,29 @@
"\n"
" git config advice.graftFileDeprecated false"
-#: commit.c:1237
+#: commit.c:1241
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1241
+#: commit.c:1245
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1244
+#: commit.c:1248
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Подаването „%s“ е без подпис от GPG."
-#: commit.c:1247
+#: commit.c:1251
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n"
-#: commit.c:1501
+#: commit.c:1505
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"
@@ -2678,7 +2702,7 @@
msgid "memory exhausted"
msgstr "паметта свърши"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2693,35 +2717,35 @@
" %s\n"
"Това може да се дължи на зацикляне при вмъкването."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "пътят за вмъкване „%s“не може да бъде разширен"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "относителните вмъквания на конфигурации трябва да идват от файлове"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr "относителните условни изрази за вмъкване трябва да идват от файлове"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "неправилен формат на настройка: %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "липсва име на променлива на средата за настройката „%.*s“"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "липсва променлива на средата „%s“ за настройката „%.*s“"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "ключът не съдържа раздел: „%s“"
@@ -2731,168 +2755,168 @@
msgid "key does not contain variable name: %s"
msgstr "ключът не съдържа име на променлива: „%s“"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2806
#, c-format
msgid "invalid key: %s"
msgstr "неправилен ключ: „%s“"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "неправилен ключ (нов ред): „%s“"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "празен ключ за настройка"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "неправилен конфигурационен параметър: „%s“"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "неправилен формат в „%s“"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "неправилен брой в „%s“"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "прекалено много записи в „%s“"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "ключът за настройка „%s“ липсва"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "стойността за настройка „%s“ липсва"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "неправилен ред за настройки %d в BLOB „%s“"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "неправилен ред за настройки %d във файла „%s“"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "неправилен ред за настройки %d на стандартния вход"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "неправилен ред за настройки %d в BLOB за подмодул „%s“"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "неправилен ред за настройки %d на командния ред „%s“"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "неправилен ред за настройки %d в „%s“"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "извън диапазона"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "неправилна мерна единица"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "неправилна числова стойност „%s“ за „%s“: %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB „%s“: %s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ във файла „%s“: %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на стандартния вход: %s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB от подмодул „%s“: %s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на командния ред „%s“: %s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "неправилна булева стойност „%s“ за „%s“"
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "домашната папка на потребителя не може да бъде открита: „%s“"
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "„%s“ не е правилна стойност за време за „%s“"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "дължината на съкращаване е извън интервала ([4; 40]): %d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "неправилно ниво на компресиране: %d"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "настройката „core.commentChar“ трябва да е само един знак"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "неправилен режим за създаването на обекти: %s"
-#: config.c:1599
+#: config.c:1584
#, c-format
msgid "malformed value for %s"
msgstr "неправилна стойност за „%s“"
-#: config.c:1625
+#: config.c:1610
#, c-format
msgid "malformed value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: config.c:1626
+#: config.c:1611
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"трябва да е една от следните стойности: „nothing“ (без изтласкване при липса "
@@ -2900,132 +2924,132 @@
"„simple“ (клонът със същото име, от който се издърпва), „upstream“ (клонът, "
"от който се издърпва) или „current“ (клонът със същото име)"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1672 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "неправилно ниво на компресиране при пакетиране: %d"
-#: config.c:1809
+#: config.c:1795
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да се зареди"
-#: config.c:1812
+#: config.c:1798
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "указателят „%s“ не сочи към обект-BLOB"
-#: config.c:1829
+#: config.c:1816
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да бъде открит"
-#: config.c:1874
+#: config.c:1861
#, c-format
msgid "failed to parse %s"
msgstr "„%s“ не може да бъде анализиран"
-#: config.c:1930
+#: config.c:1917
msgid "unable to parse command-line config"
msgstr "неправилни настройки от командния ред"
-#: config.c:2294
+#: config.c:2285
msgid "unknown error occurred while reading the configuration files"
msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
-#: config.c:2468
+#: config.c:2459
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Неправилен %s: „%s“"
-#: config.c:2513
+#: config.c:2504
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не "
"%d"
-#: config.c:2559
+#: config.c:2550
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "неразпозната стойност „%s“ от командния ред"
-#: config.c:2561
+#: config.c:2552
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d"
-#: config.c:2645
+#: config.c:2637
#, c-format
msgid "invalid section name '%s'"
msgstr "неправилно име на раздел: „%s“"
-#: config.c:2677
+#: config.c:2669
#, c-format
msgid "%s has multiple values"
msgstr "зададени са няколко стойности за „%s“"
-#: config.c:2706
+#: config.c:2698
#, c-format
msgid "failed to write new configuration file %s"
msgstr "новият конфигурационен файл „%s“ не може да бъде запазен"
-#: config.c:2958 config.c:3285
+#: config.c:2950 config.c:3277
#, c-format
msgid "could not lock config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде заключен"
-#: config.c:2969
+#: config.c:2961
#, c-format
msgid "opening %s"
msgstr "отваряне на „%s“"
-#: config.c:3006 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "неправилен шаблон: %s"
-#: config.c:3031
+#: config.c:3023
#, c-format
msgid "invalid config file %s"
msgstr "неправилен конфигурационен файл: „%s“"
-#: config.c:3044 config.c:3298
+#: config.c:3036 config.c:3290
#, c-format
msgid "fstat on %s failed"
msgstr "неуспешно изпълнение на „fstat“ върху „%s“"
-#: config.c:3055
+#: config.c:3047
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“%s"
-#: config.c:3065 config.c:3303
+#: config.c:3057 config.c:3295
#, c-format
msgid "chmod on %s failed"
msgstr "неуспешна смяна на права с „chmod“ върху „%s“"
-#: config.c:3150 config.c:3400
+#: config.c:3142 config.c:3392
#, c-format
msgid "could not write config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде записан"
-#: config.c:3184
+#: config.c:3176
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "„%s“ не може да се зададе да е „%s“"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "„%s“ не може да се премахне"
-#: config.c:3276
+#: config.c:3268
#, c-format
msgid "invalid section name: %s"
msgstr "неправилно име на раздел: %s"
-#: config.c:3443
+#: config.c:3435
#, c-format
msgid "missing value for '%s'"
msgstr "липсва стойност за „%s“"
@@ -3061,72 +3085,72 @@
msgstr ""
"след първоначалната обява на възможностите се очаква изчистване на буферите"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "пропускане на възможностите след първия ред „%s“"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "протоколна грешка: неочаквани възможности^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "протоколна грешка: очаква се SHA1 на плитък обект, а бе получено: „%s“"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "отсрещното хранилище не може да е плитко"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "неправилен пакет"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "протоколна грешка: неочаквано „%s“"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "сървърът указа непознат формат на обект: „%s“"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "неправилен отговор на „ls-refs“: „%s“"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "след изброяването на указателите се очаква изчистване на буферите"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "след изброяването на указателите се очаква пакет за край"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "протокол „%s“ не се поддържа"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "неуспешно задаване на „SO_KEEPALIVE“ на гнездо"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Търсене на „%s“… "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "„%s“ (порт %s) не може да се открие („%s“)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -3135,7 +3159,7 @@
"готово.\n"
"Свързване към „%s“ (порт %s)…"
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -3145,90 +3169,90 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "действието завърши."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "„%s“ не може да се открие (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "непознат порт „%s“"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "необичайното име на хост „%s“ е блокирано"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "необичайният порт „%s“ е блокиран"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "посредникът „%s“ не може да се стартира"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"не е указан път. Проверете синтаксиса с командата:\n"
"\n"
" git help pull"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr ""
"знакът за нов ред не е позволен в адресите и в пътищата до хранилищата "
"„git://“"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-4“"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-6“"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
"вариантът за „ssh“ — „simple“ (опростен), не поддържа задаването на порт"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "необичайният път „%s“ е блокиран"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "неуспешно създаване на процес"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "Проверка на свързаността"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Командата „git rev-list“ не може да бъде изпълнена."
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "неуспешен запис на списъка с версиите"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "стандартният вход на списъка с версиите не може да бъде затворен"
#: convert.c:183
#, c-format
msgid "illegal crlf_action %d"
-msgstr "неправилно действие за край на ред: %d"
+msgstr "неправилно действие за край на ред (crlf_action): %d"
#: convert.c:196
#, c-format
@@ -3338,7 +3362,7 @@
msgid "path name too long for external filter"
msgstr "пътят е прекалено дълъг за външен филтър"
-#: convert.c:934
+#: convert.c:935
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -3347,17 +3371,17 @@
"външният филтър „%s“ вече не е наличен, въпреки че не всички пътища са "
"филтрирани"
-#: convert.c:1234
+#: convert.c:1236
msgid "true/false are no valid working-tree-encodings"
msgstr ""
"„true“/„false“ (истина/лъжа̀) не може да са кодирания на работното дърво"
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: неуспешно изпълнение на декодиращ филтър „%s“"
-#: convert.c:1490
+#: convert.c:1492
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: неуспешно изпълнение на кодиращ филтър „%s“"
@@ -3375,17 +3399,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr "адресът трябва задължително да съдържа протокол"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "адресът съдържа нов ред в частта за %s: %s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "адресът е без схема: %s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "адресът за идентификация не може да се анализира: „%s“"
@@ -3489,23 +3513,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr "непозната стойност за опцията „--diff-merges“: „%s“"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "опцията „--merge-base“ не работи с диапазони"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "опцията „--merge-base“ работи само с подавания"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "Указателят „HEAD“ не може да бъде получен"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "липсва база за сливане"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "много бази за сливане"
@@ -3521,28 +3545,28 @@
"Не е хранилище на git. Ползвайте опцията „--no-index“, за да сравните "
"пътища извън работно дърво"
-#: diff.c:156
+#: diff.c:158
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Неуспешно разпознаване на „%s“ като процент-праг за статистиката по "
"директории\n"
-#: diff.c:161
+#: diff.c:163
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Непознат параметър „%s“ за статистиката по директории'\n"
-#: diff.c:297
+#: diff.c:299
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
"настройката за цвят за преместване трябва да е една от: „no“ (без), "
-"„default“ (стандартно), „blocks“ (парчета), „zebra“ (райе), "
-"„dimmed_zebra“ (тъмно райе), „plain“ (обикновено)"
+"„default“ (стандартно), „blocks“ (парчета), „zebra“ (райе), „dimmed-"
+"zebra“ (тъмно райе), „plain“ (обикновено)"
-#: diff.c:325
+#: diff.c:327
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3555,7 +3579,7 @@
"„allow-indentation-change“ (позволяване на промените в празните знаци за "
"форматиране)"
-#: diff.c:333
+#: diff.c:335
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3563,12 +3587,12 @@
"„color-moved-ws“: „allow-indentation-change“ е несъвместима с другите режими "
"за празни знаци"
-#: diff.c:410
+#: diff.c:412
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Непозната стойност „%s“ за настройката „diff.submodule“"
-#: diff.c:470
+#: diff.c:472
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3577,53 +3601,49 @@
"Грешки в настройката „diff.dirstat“:\n"
"%s"
-#: diff.c:4282
+#: diff.c:4237
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“"
-#: diff.c:4634
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr ""
-"опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими "
-"една с друга"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "опциите „%s“, „%s“, „%s“ и „%s“ са несъвместими"
-#: diff.c:4637
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "опциите „-G“, „-S“ и „--find-object“ са несъвместими една с друга"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "опциите „%s“, „%s“ и „%s“ са несъвместими"
-#: diff.c:4640
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "опциите „%s“ и „%s“ са несъвместими, използвайте „%s“ с „%s“"
+
+#: diff.c:4601
+#, c-format
msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr ""
-"опциите „-G“ и „--pickaxe-regex“ са несъвместими една с друга. Пробвайте „--"
-"pickaxe-regex“ със „-S“"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "опциите „%s“ и „%s“ са несъвместими, използвайте „%s“ с „%s“ и „%s“"
-#: diff.c:4643
-msgid ""
-"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr ""
-"опциите „--pickaxe-all“ и „--find-object“ са несъвместими една с друга. "
-"Пробвайте „--pickaxe-all“ с „-G“ и „-S“"
-
-#: diff.c:4722
+#: diff.c:4681
msgid "--follow requires exactly one pathspec"
msgstr "опцията „--follow“ изисква точно един път"
-#: diff.c:4770
+#: diff.c:4729
#, c-format
msgid "invalid --stat value: %s"
msgstr "неправилна стойност за „--stat“: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "опцията „%s“ очаква число за аргумент"
-#: diff.c:4807
+#: diff.c:4766
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3632,44 +3652,44 @@
"Неразпознат параметър към опцията „--dirstat/-X“:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4851
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“"
-#: diff.c:4916
+#: diff.c:4875
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "непозната стойност след „ws-error-highlight=%.*s“"
-#: diff.c:4930
+#: diff.c:4889
#, c-format
msgid "unable to resolve '%s'"
msgstr "„%s“ не може да се открие"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4939 diff.c:4945
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
"опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/"
"МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от"
-#: diff.c:4998
+#: diff.c:4957
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "опцията „%s“ изисква знак, а не: „%s“"
-#: diff.c:5019
+#: diff.c:4978
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "неправилен аргумент за „--color-moved“: „%s“"
-#: diff.c:5038
+#: diff.c:4997
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "неправилен режим „%s“ за „ --color-moved-ws“"
-#: diff.c:5078
+#: diff.c:5037
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3678,158 +3698,158 @@
"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и "
"„histogram“ (хистограмен)"
-#: diff.c:5114 diff.c:5134
+#: diff.c:5073 diff.c:5093
#, c-format
msgid "invalid argument to %s"
msgstr "неправилен аргумент към „%s“"
-#: diff.c:5238
+#: diff.c:5197
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "неправилен регулярен израз подаден към „-I“: „%s“"
-#: diff.c:5287
+#: diff.c:5246
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "неразпознат параметър към опцията „--submodule“: „%s“"
-#: diff.c:5343
+#: diff.c:5302
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "неправилен аргумент към „--word-diff“: „%s“"
-#: diff.c:5379
+#: diff.c:5338
msgid "Diff output format options"
msgstr "Формат на изхода за разликите"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5340 diff.c:5346
msgid "generate patch"
msgstr "създаване на кръпки"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
msgid "suppress diff output"
msgstr "без извеждане на разликите"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5348 diff.c:5462 diff.c:5469
msgid "<n>"
msgstr "БРОЙ"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5349 diff.c:5352
msgid "generate diffs with <n> lines context"
msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове"
-#: diff.c:5395
+#: diff.c:5354
msgid "generate the diff in raw format"
msgstr "файловете с разлики да са в суров формат"
-#: diff.c:5398
+#: diff.c:5357
msgid "synonym for '-p --raw'"
-msgstr "псевдоним на „-p --stat“"
+msgstr "псевдоним на „-p --raw“"
-#: diff.c:5402
+#: diff.c:5361
msgid "synonym for '-p --stat'"
msgstr "псевдоним на „-p --stat“"
-#: diff.c:5406
+#: diff.c:5365
msgid "machine friendly --stat"
msgstr "„--stat“ във формат за четене от програма"
-#: diff.c:5409
+#: diff.c:5368
msgid "output only the last line of --stat"
msgstr "извеждане само на последния ред на „--stat“"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5370 diff.c:5378
msgid "<param1,param2>..."
msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …"
-#: diff.c:5412
+#: diff.c:5371
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "извеждане на разпределението на промените за всяка поддиректория"
-#: diff.c:5416
+#: diff.c:5375
msgid "synonym for --dirstat=cumulative"
msgstr "псевдоним на „--dirstat=cumulative“"
-#: diff.c:5420
+#: diff.c:5379
msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "псевдоним на „--dirstat=ФАЙЛОВЕ,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“"
+msgstr "псевдоним на „--dirstat=ФАЙЛ…,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“"
-#: diff.c:5424
+#: diff.c:5383
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"предупреждаване, ако промените водят до маркери за конфликт или грешки в "
"празните знаци"
-#: diff.c:5427
+#: diff.c:5386
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"съкратено резюме на създадените, преименуваните и файловете с промяна на "
"режима на достъп"
-#: diff.c:5430
+#: diff.c:5389
msgid "show only names of changed files"
msgstr "извеждане само на имената на променените файлове"
-#: diff.c:5433
+#: diff.c:5392
msgid "show only names and status of changed files"
msgstr "извеждане само на имената и статистиката за променените файлове"
-#: diff.c:5435
+#: diff.c:5394
msgid "<width>[,<name-width>[,<count>]]"
msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]"
-#: diff.c:5436
+#: diff.c:5395
msgid "generate diffstat"
msgstr "извеждане на статистика за промените"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5397 diff.c:5400 diff.c:5403
msgid "<width>"
msgstr "ШИРОЧИНА"
-#: diff.c:5439
+#: diff.c:5398
msgid "generate diffstat with a given width"
msgstr "статистика с такава ШИРОЧИНА за промените"
-#: diff.c:5442
+#: diff.c:5401
msgid "generate diffstat with a given name width"
msgstr "статистика за промените с такава ШИРОЧИНА на имената"
-#: diff.c:5445
+#: diff.c:5404
msgid "generate diffstat with a given graph width"
msgstr "статистика за промените с такава ШИРОЧИНА на гра̀фа"
-#: diff.c:5447
+#: diff.c:5406
msgid "<count>"
msgstr "БРОЙ"
-#: diff.c:5448
+#: diff.c:5407
msgid "generate diffstat with limited lines"
msgstr "ограничаване на БРОя на редовете в статистиката за промените"
-#: diff.c:5451
+#: diff.c:5410
msgid "generate compact summary in diffstat"
msgstr "кратко резюме в статистиката за промените"
-#: diff.c:5454
+#: diff.c:5413
msgid "output a binary diff that can be applied"
msgstr "извеждане на двоична разлика във вид за прилагане"
-#: diff.c:5457
+#: diff.c:5416
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"показване на пълните имена на обекти в редовете за индекса при вариантите "
"преди и след промяната"
-#: diff.c:5459
+#: diff.c:5418
msgid "show colored diff"
msgstr "разлики в цвят"
-#: diff.c:5460
+#: diff.c:5419
msgid "<kind>"
msgstr "ВИД"
-#: diff.c:5461
+#: diff.c:5420
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3837,7 +3857,7 @@
"грешките в празните знаци да се указват в редовете за контекста, вариантите "
"преди и след разликата,"
-#: diff.c:5464
+#: diff.c:5423
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3845,261 +3865,261 @@
"без преименуване на пътищата. Да се използват нулеви байтове за разделители "
"на полета в изхода при ползване на опцията „--raw“ или „--numstat“"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
msgid "<prefix>"
msgstr "ПРЕФИКС"
-#: diff.c:5468
+#: diff.c:5427
msgid "show the given source prefix instead of \"a/\""
msgstr "префикс вместо „a/“ за източник"
-#: diff.c:5471
+#: diff.c:5430
msgid "show the given destination prefix instead of \"b/\""
msgstr "префикс вместо „b/“ за цел"
-#: diff.c:5474
+#: diff.c:5433
msgid "prepend an additional prefix to every line of output"
msgstr "добавяне на допълнителен префикс за всеки ред на изхода"
-#: diff.c:5477
+#: diff.c:5436
msgid "do not show any source or destination prefix"
msgstr "без префикс за източника и целта"
-#: diff.c:5480
+#: diff.c:5439
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"извеждане на контекст между последователните парчета с разлики от указания "
"БРОЙ редове"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5443 diff.c:5448 diff.c:5453
msgid "<char>"
msgstr "ЗНАК"
-#: diff.c:5485
+#: diff.c:5444
msgid "specify the character to indicate a new line instead of '+'"
msgstr "знак вместо „+“ за нов вариант на ред"
-#: diff.c:5490
+#: diff.c:5449
msgid "specify the character to indicate an old line instead of '-'"
msgstr "знак вместо „-“ за стар вариант на ред"
-#: diff.c:5495
+#: diff.c:5454
msgid "specify the character to indicate a context instead of ' '"
msgstr "знак вместо „ “ за контекст"
-#: diff.c:5498
+#: diff.c:5457
msgid "Diff rename options"
msgstr "Настройки за разлики с преименуване"
-#: diff.c:5499
+#: diff.c:5458
msgid "<n>[/<m>]"
msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]"
-#: diff.c:5500
+#: diff.c:5459
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"заместване на пълните промени с последователност от изтриване и създаване"
-#: diff.c:5504
+#: diff.c:5463
msgid "detect renames"
msgstr "засичане на преименуванията"
-#: diff.c:5508
+#: diff.c:5467
msgid "omit the preimage for deletes"
msgstr "без предварителен вариант при изтриване"
-#: diff.c:5511
+#: diff.c:5470
msgid "detect copies"
msgstr "засичане на копиранията"
-#: diff.c:5515
+#: diff.c:5474
msgid "use unmodified files as source to find copies"
msgstr "търсене на копирано и от непроменените файлове"
-#: diff.c:5517
+#: diff.c:5476
msgid "disable rename detection"
msgstr "без търсене на преименувания"
-#: diff.c:5520
+#: diff.c:5479
msgid "use empty blobs as rename source"
msgstr "празни обекти като източник при преименувания"
-#: diff.c:5522
+#: diff.c:5481
msgid "continue listing the history of a file beyond renames"
msgstr ""
"продължаване на извеждането на историята — без отрязването при преименувания "
"на файл"
-#: diff.c:5525
+#: diff.c:5484
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
"без засичане на преименувания/копирания, ако броят им надвишава тази стойност"
-#: diff.c:5527
+#: diff.c:5486
msgid "Diff algorithm options"
msgstr "Опции към алгоритъма за разлики"
-#: diff.c:5529
+#: diff.c:5488
msgid "produce the smallest possible diff"
msgstr "търсене на възможно най-малка разлика"
-#: diff.c:5532
+#: diff.c:5491
msgid "ignore whitespace when comparing lines"
msgstr "без промени в празните знаци при сравняване на редове"
-#: diff.c:5535
+#: diff.c:5494
msgid "ignore changes in amount of whitespace"
msgstr "без промени в празните знаци"
-#: diff.c:5538
+#: diff.c:5497
msgid "ignore changes in whitespace at EOL"
msgstr "без промени в празните знаци в края на редовете"
-#: diff.c:5541
+#: diff.c:5500
msgid "ignore carrier-return at the end of line"
msgstr "без промени в знаците за край на ред"
-#: diff.c:5544
+#: diff.c:5503
msgid "ignore changes whose lines are all blank"
msgstr "без промени в редовете, които са изцяло от празни знаци"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
msgid "<regex>"
msgstr "РЕГУЛЯРЕН_ИЗРАЗ"
-#: diff.c:5547
+#: diff.c:5506
msgid "ignore changes whose all lines match <regex>"
msgstr "без промени в редовете, които напасват РЕГУЛЯРНия_ИЗРАЗ"
-#: diff.c:5550
+#: diff.c:5509
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"евристика за преместване на границите на парчетата за улесняване на четенето"
-#: diff.c:5553
+#: diff.c:5512
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "разлика чрез алгоритъм за подредба като пасианс"
-#: diff.c:5557
+#: diff.c:5516
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "разлика по хистограмния алгоритъм"
-#: diff.c:5559
+#: diff.c:5518
msgid "<algorithm>"
msgstr "АЛГОРИТЪМ"
-#: diff.c:5560
+#: diff.c:5519
msgid "choose a diff algorithm"
msgstr "избор на АЛГОРИТЪМа за разлики"
-#: diff.c:5562
+#: diff.c:5521
msgid "<text>"
msgstr "ТЕКСТ"
-#: diff.c:5563
+#: diff.c:5522
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "разлика чрез алгоритъма със закотвяне"
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5524 diff.c:5533 diff.c:5536
msgid "<mode>"
msgstr "РЕЖИМ"
-#: diff.c:5566
+#: diff.c:5525
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи"
-#: diff.c:5569
+#: diff.c:5528
msgid "use <regex> to decide what a word is"
msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи"
-#: diff.c:5572
+#: diff.c:5531
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“"
-#: diff.c:5575
+#: diff.c:5534
msgid "moved lines of code are colored differently"
msgstr "различен цвят за извеждане на преместените редове"
-#: diff.c:5578
+#: diff.c:5537
msgid "how white spaces are ignored in --color-moved"
msgstr ""
"режим за прескачането на празните знаци при задаването на „--color-moved“"
-#: diff.c:5581
+#: diff.c:5540
msgid "Other diff options"
msgstr "Други опции за разлики"
-#: diff.c:5583
+#: diff.c:5542
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"при изпълнение от поддиректория да се пренебрегват разликите извън нея и да "
"се ползват относителни пътища"
-#: diff.c:5587
+#: diff.c:5546
msgid "treat all files as text"
msgstr "обработка на всички файлове като текстови"
-#: diff.c:5589
+#: diff.c:5548
msgid "swap two inputs, reverse the diff"
msgstr "размяна на двата входа — обръщане на разликата"
-#: diff.c:5591
+#: diff.c:5550
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
"завършване с код за състояние 1 при наличието на разлики, а в противен "
"случай — с 0"
-#: diff.c:5593
+#: diff.c:5552
msgid "disable all output of the program"
msgstr "без всякакъв изход от програмата"
-#: diff.c:5595
+#: diff.c:5554
msgid "allow an external diff helper to be executed"
msgstr "позволяване на изпълнение на външна помощна програма за разлики"
-#: diff.c:5597
+#: diff.c:5556
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"изпълнение на външни програми-филтри при сравнението на двоични файлове"
-#: diff.c:5599
+#: diff.c:5558
msgid "<when>"
msgstr "КОГА"
-#: diff.c:5600
+#: diff.c:5559
msgid "ignore changes to submodules in the diff generation"
msgstr "игнориране на промените в подмодулите при извеждането на разликите"
-#: diff.c:5603
+#: diff.c:5562
msgid "<format>"
msgstr "ФОРМАТ"
-#: diff.c:5604
+#: diff.c:5563
msgid "specify how differences in submodules are shown"
msgstr "начин за извеждане на промените в подмодулите"
-#: diff.c:5608
+#: diff.c:5567
msgid "hide 'git add -N' entries from the index"
msgstr "без включване в индекса на записите, добавени с „git add -N“"
-#: diff.c:5611
+#: diff.c:5570
msgid "treat 'git add -N' entries as real in the index"
msgstr "включване в индекса на записите, добавени с „git add -N“"
-#: diff.c:5613
+#: diff.c:5572
msgid "<string>"
msgstr "НИЗ"
-#: diff.c:5614
+#: diff.c:5573
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "търсене на разлики, които променят броя на поява на указаните низове"
-#: diff.c:5617
+#: diff.c:5576
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -4107,69 +4127,69 @@
"търсене на разлики, които променят броя на поява на низовете, които напасват "
"на регулярния израз"
-#: diff.c:5620
+#: diff.c:5579
msgid "show all changes in the changeset with -S or -G"
msgstr "извеждане на всички промени с „-G“/„-S“"
-#: diff.c:5623
+#: diff.c:5582
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX"
-#: diff.c:5626
+#: diff.c:5585
msgid "control the order in which files appear in the output"
msgstr "управление на подредбата на файловете в изхода"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5586 diff.c:5589
msgid "<path>"
msgstr "ПЪТ"
-#: diff.c:5628
+#: diff.c:5587
msgid "show the change in the specified path first"
msgstr "първо извеждане на промяната в указания път"
-#: diff.c:5631
+#: diff.c:5590
msgid "skip the output to the specified path"
msgstr "прескачане на изхода към указания път"
-#: diff.c:5633
+#: diff.c:5592
msgid "<object-id>"
msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ"
-#: diff.c:5634
+#: diff.c:5593
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "търсене на разлики, които променят броя на поява на указания обект"
-#: diff.c:5636
+#: diff.c:5595
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
-#: diff.c:5637
+#: diff.c:5596
msgid "select files by diff type"
msgstr "избор на файловете по вид разлика"
-#: diff.c:5639
+#: diff.c:5598
msgid "<file>"
msgstr "ФАЙЛ"
-#: diff.c:5640
+#: diff.c:5599
msgid "Output to a specific file"
msgstr "Изход към указания файл"
-#: diff.c:6298
+#: diff.c:6257
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"пълното търсене на преименувания на обекти се прескача поради многото "
"файлове."
-#: diff.c:6301
+#: diff.c:6260
msgid "only found copies from modified paths due to too many files."
msgstr ""
"установени са само точните копия на променените пътища поради многото "
"файлове."
-#: diff.c:6304
+#: diff.c:6263
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -4180,7 +4200,7 @@
msgid "failed to read orderfile '%s'"
msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен"
-#: diffcore-rename.c:1510
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Търсене на преименувания на обекти съчетани с промени"
@@ -4199,52 +4219,60 @@
msgid "unrecognized pattern: '%s'"
msgstr "непознат шаблон: „%s“"
-#: dir.c:792 dir.c:806
+#: dir.c:790 dir.c:804
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "непознат отрицателен шаблон: „%s“"
-#: dir.c:824
+#: dir.c:820
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
"файлът определящ частичността на изтегленото хранилище може да има проблем: "
"шаблонът „%s“ се повтаря"
-#: dir.c:834
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr "изключване на пътеводното напасване"
-#: dir.c:1221
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "„%s“ не може да се ползва за игнорираните файлове (като gitignore)"
-#: dir.c:2358
+#: dir.c:2418
#, c-format
msgid "could not open directory '%s'"
msgstr "директорията „%s“ не може да бъде отворена"
-#: dir.c:2660
+#: dir.c:2720
msgid "failed to get kernel name and information"
msgstr "името и версията на ядрото не бяха получени"
-#: dir.c:2784
+#: dir.c:2844
msgid "untracked cache is disabled on this system or location"
msgstr ""
"кешът за неследените файлове е изключен на тази система или местоположение"
-#: dir.c:3617
+#: dir.c:3112
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Името на директорията не може да бъде отгатнато.\n"
+"Задайте директорията изрично на командния ред"
+
+#: dir.c:3800
#, c-format
msgid "index file corrupt in repo %s"
msgstr "файлът с индекса е повреден в хранилището „%s“"
-#: dir.c:3664 dir.c:3669
+#: dir.c:3847 dir.c:3852
#, c-format
msgid "could not create directories for %s"
msgstr "директориите за „%s“ не може да бъдат създадени"
-#: dir.c:3698
+#: dir.c:3881
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "директорията на git не може да се мигрира от „%s“ до „%s“"
@@ -4254,301 +4282,377 @@
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "Подсказка: чака се редакторът ви да затвори файла …%c"
-#: entry.c:176
+#: entry.c:179
msgid "Filtering content"
msgstr "Филтриране на съдържанието"
-#: entry.c:497
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "неуспешно изпълнение на „stat“ върху файла „%s“"
-#: environment.c:152
+#: environment.c:145
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "неправилен път към пространства от имена „%s“"
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "GIT_DIR не може да се зададе да е „%s“"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "прекалено много аргументи за изпълнение „%s“"
-#: fetch-pack.c:182
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: очаква се плитък списък"
-#: fetch-pack.c:185
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: след плитък списък се очаква изчистващ пакет „flush“"
-#: fetch-pack.c:196
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
"git fetch-pack: очаква се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“"
-#: fetch-pack.c:216
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: очаква се „ACK“/„NAK“, а бе получено „%s“"
-#: fetch-pack.c:227
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "невъзможно писане към отдалечено хранилище"
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:395 fetch-pack.c:1439
#, c-format
msgid "invalid shallow line: %s"
msgstr "неправилен плитък ред: „%s“"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:401 fetch-pack.c:1445
#, c-format
msgid "invalid unshallow line: %s"
msgstr "неправилен неплитък ред: „%s“"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:403 fetch-pack.c:1447
#, c-format
msgid "object not found: %s"
msgstr "обектът „%s“ липсва"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:406 fetch-pack.c:1450
#, c-format
msgid "error in object: %s"
msgstr "грешка в обекта: „%s“"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:408 fetch-pack.c:1452
#, c-format
msgid "no shallow found: %s"
msgstr "не е открит плитък обект: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:411 fetch-pack.c:1456
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "очаква се плитък или не обект, а бе получено: „%s“"
-#: fetch-pack.c:439
+#: fetch-pack.c:451
#, c-format
msgid "got %s %d %s"
msgstr "получено бе %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:468
#, c-format
msgid "invalid commit %s"
msgstr "неправилно подаване: „%s“"
-#: fetch-pack.c:487
+#: fetch-pack.c:499
msgid "giving up"
msgstr "преустановяване"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:512 progress.c:339
msgid "done"
msgstr "действието завърши"
-#: fetch-pack.c:512
+#: fetch-pack.c:524
#, c-format
msgid "got %s (%d) %s"
msgstr "получено бе %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:560
#, c-format
msgid "Marking %s as complete"
msgstr "Отбелязване на „%s“ като пълно"
-#: fetch-pack.c:763
+#: fetch-pack.c:775
#, c-format
msgid "already have %s (%s)"
msgstr "вече има „%s“ (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:861
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: не може да се създаде процес за демултиплексора"
-#: fetch-pack.c:857
+#: fetch-pack.c:869
msgid "protocol error: bad pack header"
msgstr "протоколна грешка: неправилна заглавна част на пакет"
-#: fetch-pack.c:951
+#: fetch-pack.c:965
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: не може да се създаде процес за „%s“"
-#: fetch-pack.c:957
+#: fetch-pack.c:971
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: неправилен изход от командата „index-pack“"
-#: fetch-pack.c:974
+#: fetch-pack.c:988
#, c-format
msgid "%s failed"
msgstr "неуспешно изпълнение на „%s“"
-#: fetch-pack.c:976
+#: fetch-pack.c:990
msgid "error in sideband demultiplexer"
msgstr "грешка в демултиплексора"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1035
#, c-format
msgid "Server version is %.*s"
msgstr "Версията на сървъра е: %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
#, c-format
msgid "Server supports %s"
msgstr "Сървърът поддържа „%s“"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1045
msgid "Server does not support shallow clients"
msgstr "Сървърът не поддържа плитки клиенти"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-since"
msgstr "Сървърът не поддържа опцията „--shallow-since“"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1110
msgid "Server does not support --shallow-exclude"
msgstr "Сървърът не поддържа опцията „--shallow-exclude“"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1114
msgid "Server does not support --deepen"
msgstr "Сървърът не поддържа опцията „--deepen“"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1116
msgid "Server does not support this repository's object format"
msgstr "Сървърът не поддържа форма̀та на обектите на това хранилище"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1129
msgid "no common commits"
msgstr "няма общи подавания"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "клонираното хранилище е плитко, затова няма да се клонира."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1144 fetch-pack.c:1681
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: неуспешно доставяне."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1258
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "различни алгоритми — на клиента: „%s“, на сървъра: „%s“"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1262
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "сървърът не поддържа алгоритъм „%s“"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1295
msgid "Server does not support shallow requests"
msgstr "Сървърът не поддържа плитки заявки"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1302
msgid "Server supports filter"
msgstr "Сървърът поддържа филтри"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1345 fetch-pack.c:2063
msgid "unable to write request to remote"
msgstr "невъзможно писане към отдалечено хранилище"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1363
#, c-format
msgid "error reading section header '%s'"
msgstr "грешка при прочитане на заглавната част на раздел „%s“"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1369
#, c-format
msgid "expected '%s', received '%s'"
msgstr "очаква се „%s“, а бе получено „%s“"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1403
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "неочакван ред за потвърждение: „%s“"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1408
#, c-format
msgid "error processing acks: %d"
msgstr "грешка при обработка на потвържденията: %d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1418
msgid "expected packfile to be sent after 'ready'"
msgstr ""
"очакваше се пакетният файл да бъде изпратен след отговор за готовност (ready)"
-#: fetch-pack.c:1404
+#: fetch-pack.c:1420
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"очакваше се след липса на отговор за готовност (ready) да не се се пращат "
"други раздели"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1461
#, c-format
msgid "error processing shallow info: %d"
msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1510
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "очаква се искан указател, а бе получено: „%s“"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1515
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "неочакван искан указател: „%s“"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1520
#, c-format
msgid "error processing wanted refs: %d"
msgstr "грешка при обработката на исканите указатели: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1550
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: очаква се пакет за край на отговора"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1959
msgid "no matching remote head"
msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1982 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
-#: fetch-pack.c:2065
+#: fetch-pack.c:2085
msgid "unexpected 'ready' from remote"
msgstr "неочаквано състояние за готовност от отдалечено хранилище"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2108
#, c-format
msgid "no such remote ref %s"
msgstr "такъв отдалечен указател няма: %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2111
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Сървърът не позволява заявка за необявен обект „%s“"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
msgid "could not create temporary file"
msgstr "не може да се създаде временен файл"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:460
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Програмата не успя да запише самостоятелния подпис в „%s“"
-#: gpg-interface.c:470
+#: gpg-interface.c:451
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"настройката „gpg.ssh.allowedSignersFile“ трябва да е зададена за проверка на "
+"подписите на ssh"
+
+#: gpg-interface.c:480
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"За проверка на подписите е необходима командата (достъпна от openssh ≥ "
+"8.2p1+):\n"
+"\n"
+" ssh-keygen -Y find-principals/verify"
+
+#: gpg-interface.c:536
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+"файлът за отхвърляне на подписи на ssh е настроен, но не може да се открие: "
+"%s"
+
+#: gpg-interface.c:624
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "лош/несъвместим подпис „%s“"
+
+#: gpg-interface.c:801 gpg-interface.c:806
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "отпечатъкът по ssh на ключа „%s“ не може да бъде получен"
+
+#: gpg-interface.c:829
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"Поне една от настройките „user.signingkey“ или „gpg.ssh.defaultKeyCommand“ "
+"трябва да е зададена"
+
+#: gpg-interface.c:851
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"командата „gpg.ssh.defaultKeyCommand“ завърши успешно, но не върна никакви "
+"ключове: %s %s"
+
+#: gpg-interface.c:857
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "неуспешно изпълнение на „gpg.ssh.defaultKeyCommand“: %s %s"
+
+#: gpg-interface.c:945
msgid "gpg failed to sign the data"
-msgstr "Програмата „gpg“ не подписа данните."
+msgstr "Програмата „gpg“ не подписа данните"
+
+#: gpg-interface.c:967
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr ""
+"за подписване със ssh е необходимо да зададете настройката „user.signingkey“"
+
+#: gpg-interface.c:978
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "неуспешно запазване на ключа за подписване на ssh в „%s“"
+
+#: gpg-interface.c:996
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "неуспешно запазване на буфера за подписване на ssh в „%s“"
+
+#: gpg-interface.c:1014
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"За подписване със ssh е необходима командата (достъпна от openssh ≥ "
+"8.2p1+):\n"
+"\n"
+" ssh-keygen -Y"
+
+#: gpg-interface.c:1026
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "неуспешно прочитане на буфера за подписване на ssh от „%s“"
#: graph.c:98
#, c-format
@@ -4563,109 +4667,109 @@
"зададеният шаблон съдържа нулев знак (идва от -f „ФАЙЛ“). Това се поддържа "
"в комбинация с „-P“ само при ползването на „PCRE v2“"
-#: grep.c:1895
+#: grep.c:1942
#, c-format
msgid "'%s': unable to read %s"
msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: grep.c:1923
+#: grep.c:1970
#, c-format
msgid "'%s': short read"
msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "създаване на работно дърво (погледнете: „git help tutorial“)"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr "работа по текущата промяна (погледнете: „git help everyday“)"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr "преглед на историята и състоянието (погледнете: „git help revisions“)"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "увеличаване, отбелязване и промяна на общата история"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "съвместна работа (погледнете: „git help workflows“)"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Основни команди от потребителско ниво"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Помощни команди / Променящи"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Помощни команди / Запитващи"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "Съвместна работа с други хора"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Команди от ниско ниво / Променящи"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Команди от ниско ниво / Запитващи"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Команди от ниско ниво / Синхронизация на хранилища"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Команди от ниско ниво / Допълнителни инструменти"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "налични команди на git от „%s“"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "команди на git от други директории от „$PATH“"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "Това са най-често използваните команди на Git:"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "неподдържан списък от команди „%s“"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Ръководствата за концепциите в Git са:"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "За повече информация за КОМАНДА изпълнете „git help КОМАНДА“"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Външни команди"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Псевдоними на командите"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4674,36 +4778,41 @@
"Изглежда, че „%s“ е команда на git, но тя не може да\n"
"бъде изпълнена. Вероятно пакетът „git-%s“ е повреден."
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Странно, изглежда, че на системата ви няма нито една команда на git."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: Пробвахте да изпълните команда на Git на име „%s“, а такава "
"не съществува."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
"Изпълнението автоматично продължава, като се счита, че имате предвид „%s“."
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Да се изпълни „%s“ вместо това [y/N]? "
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"Изпълнението автоматично ще продължи след %0.1f сек., като се счита, че "
"имате предвид „%s“."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4717,16 +4826,16 @@
"\n"
"Най-близките команди са"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [ОПЦИЯ…]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4740,6 +4849,16 @@
"\n"
"Команди с подобно име са:"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Куката „%s“ се прескача, защото липсват права за изпълнение.\n"
+"За да изключите това предупреждение, изпълнете:\n"
+" git config advice.ignoredHook false"
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Липсва информация за автора\n"
@@ -4805,7 +4924,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr "името съдържа само непозволени знаци: „%s“"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "неправилен формат на дата: %s"
@@ -4902,7 +5021,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "неправилна стойност „%s“ за „lsrefs.unborn“"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "неочакван ред: „%s“"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "след аргументите към „ls-refs“ се очаква изчистване на буферите"
@@ -4910,39 +5034,39 @@
msgid "quoted CRLF detected"
msgstr "цитирани знаци CRLF"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "неправилно действие „%s“ за „%s“"
-#: merge-ort.c:1228 merge-recursive.c:1206
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Неуспешно сливане на подмодула „%s“ (не е изтеглен)"
-#: merge-ort.c:1237 merge-recursive.c:1213
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Неуспешно сливане на подмодула „%s“ (няма подавания)"
-#: merge-ort.c:1246 merge-recursive.c:1220
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Подмодулът „%s“ не може да бъде слят (базата за сливане не предшества "
"подаванията)"
-#: merge-ort.c:1256 merge-ort.c:1263
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Бележка: Превъртане на подмодула „%s“ към „%s“"
-#: merge-ort.c:1284
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr "Неуспешно сливане на подмодула „%s“"
-#: merge-ort.c:1291
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4951,7 +5075,7 @@
"Неуспешно сливане на подмодула „%s“, но е открито възможно решение:\n"
"%s\n"
-#: merge-ort.c:1295 merge-recursive.c:1274
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4967,7 +5091,7 @@
"\n"
"Това приема предложеното.\n"
-#: merge-ort.c:1308
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4976,21 +5100,21 @@
"Неуспешно сливане на подмодула „%s“, но са открити множество решения:\n"
"%s"
-#: merge-ort.c:1527 merge-recursive.c:1363
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "Неуспешно вътрешно сливане"
-#: merge-ort.c:1532 merge-recursive.c:1368
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "„%s“ не може да се добави в базата с данни"
-#: merge-ort.c:1539 merge-recursive.c:1401
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "Автоматично сливане на „%s“"
-#: merge-ort.c:1678 merge-recursive.c:2123
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4999,7 +5123,7 @@
"КОНФЛИКТ (косвено преименуване на директория): следният файл или директория "
"„%s“ не позволяват косвеното преименуване на следния път/ища: %s."
-#: merge-ort.c:1688 merge-recursive.c:2133
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -5009,7 +5133,7 @@
"съответства на „%s“. Косвено преименуване на директория води до поставянето "
"на тези пътища там: %s."
-#: merge-ort.c:1746
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -5020,7 +5144,7 @@
"да се преименува „%s“, защото е преместен в няколко нови директории, без "
"никоя от тях да е по-честа цел."
-#: merge-ort.c:1900 merge-recursive.c:2469
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -5029,7 +5153,7 @@
"ПРЕДУПРЕЖДЕНИЕ: прескачане на преименуването на „%s“ на „%s“ в „%s“, защото "
"„%s“ също е с променено име."
-#: merge-ort.c:2044 merge-recursive.c:3252
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -5038,7 +5162,7 @@
"Обновен път: „%s“ е добавен в „%s“ в директория, която е преименувана в "
"„%s“. Обектът се мести в „%s“."
-#: merge-ort.c:2051 merge-recursive.c:3259
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -5047,7 +5171,7 @@
"Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директория, която е "
"преименувана в „%s“. Обектът се мести в „%s“."
-#: merge-ort.c:2064 merge-recursive.c:3255
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -5056,7 +5180,7 @@
"КОНФЛИКТ (места на файлове): „%s“ е добавен в „%s“ в директория, която е "
"преименувана в „%s“. Предложението е да преместите обекта в „%s“."
-#: merge-ort.c:2072 merge-recursive.c:3262
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -5065,14 +5189,14 @@
"КОНФЛИКТ (места на файлове): „%s“ е преименуван на „%s“ в „%s“ в директория, "
"която е преименувана в „%s“. Предложението е да преместите обекта в „%s“."
-#: merge-ort.c:2228
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон „%s“ "
"и на „%s“ в „%s“."
-#: merge-ort.c:2323
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -5083,24 +5207,24 @@
"има и промени в съдържанието, а и има съвпадение на пътя. Може да се "
"получат вложени маркери за конфликт."
-#: merge-ort.c:2342 merge-ort.c:2366
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
"е изтрит в „%s“."
-#: merge-ort.c:2819 merge-recursive.c:3013
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr "обектът „%s“ не може да се прочете"
-#: merge-ort.c:2822 merge-recursive.c:3016
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr "обектът „%s“ не е BLOB"
-#: merge-ort.c:3250
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -5109,7 +5233,7 @@
"КОНФЛИКТ (файл/директория): директория на мястото на „%s“ от „%s“, вместо "
"това се извършва преместване в „%s“."
-#: merge-ort.c:3326
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -5118,7 +5242,7 @@
"КОНФЛИКТ (различни видове): „%s“ е различен вид обект в двата варианта. И "
"двата се преименуват, за да може всичко да е отразено."
-#: merge-ort.c:3333
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -5127,24 +5251,24 @@
"КОНФЛИКТ (различни видове): „%s“ е различен вид обект в двата варианта. "
"Извършва се преименуване в единия, за да може всичко да е отразено."
-#: merge-ort.c:3433 merge-recursive.c:3092
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "съдържание"
-#: merge-ort.c:3435 merge-recursive.c:3096
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "добавяне/добавяне"
-#: merge-ort.c:3437 merge-recursive.c:3141
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr "ПОДМОДУЛ"
-#: merge-ort.c:3439 merge-recursive.c:3142
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“"
-#: merge-ort.c:3470
+#: merge-ort.c:3869
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -5153,7 +5277,7 @@
"КОНФЛИКТ (промяна/изтриване): „%s“ е изтрит в %s, а е променен в %s. Версия "
"%s на „%s“ е оставена в дървото."
-#: merge-ort.c:3757
+#: merge-ort.c:4165
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5165,12 +5289,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4116
+#: merge-ort.c:4534
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "неуспешно събиране на информацията за сливането на „%s“, „%s“ и „%s“"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3707
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -5179,113 +5303,113 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
msgid "Already up to date."
msgstr "Вече е обновено."
-#: merge-recursive.c:357
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(лошо подаване)\n"
-#: merge-recursive.c:380
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
"неуспешно изпълнение на „add_cacheinfo“ за пътя „%s“. Сливането е "
"преустановено."
-#: merge-recursive.c:389
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"неуспешно изпълнение на „add_cacheinfo“ за обновяването на пътя „%s“. "
"Сливането е преустановено."
-#: merge-recursive.c:877
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "грешка при създаването на пътя „%s“%s"
-#: merge-recursive.c:888
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n"
-#: merge-recursive.c:902 merge-recursive.c:921
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": възможно е да има конфликт директория/файл."
-#: merge-recursive.c:911
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
"преустановяване на действието, за да не се изтрие неследеният файл „%s“"
-#: merge-recursive.c:952 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "обектът „%s“ (%s) не може да бъде прочетен"
-#: merge-recursive.c:957
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е"
-#: merge-recursive.c:982
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "„%s“ не може да се отвори: %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "неуспешно създаване на символната връзка „%s“: %s"
-#: merge-recursive.c:998
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
"не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“"
-#: merge-recursive.c:1228 merge-recursive.c:1240
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Превъртане на подмодула „%s“ до следното подаване:"
-#: merge-recursive.c:1231 merge-recursive.c:1243
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Превъртане на подмодула „%s“"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Неуспешно сливане на подмодула „%s“ (липсва сливането, което се предшества "
"от подаванията)"
-#: merge-recursive.c:1270
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Неуспешно сливане на подмодула „%s“ (не е превъртане)"
-#: merge-recursive.c:1271
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
"Открито е сливане, което може да решава проблема със сливането на "
"подмодула:\n"
-#: merge-recursive.c:1283
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Неуспешно сливане на подмодула „%s“ (открити са множество сливания)"
-#: merge-recursive.c:1425
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "Грешка: за да не се изтрие неследеният файл „%s“, се записва в „%s“."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5294,7 +5418,7 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото."
-#: merge-recursive.c:1502
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5303,7 +5427,7 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
"%s. Версия %s на „%s“ е оставена в дървото."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5312,7 +5436,7 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото: %s."
-#: merge-recursive.c:1514
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5321,45 +5445,45 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
"%s. Версия %s на „%s“ е оставена в дървото: %s."
-#: merge-recursive.c:1549
+#: merge-recursive.c:1558
msgid "rename"
msgstr "преименуване"
-#: merge-recursive.c:1549
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "преименуван"
-#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Преустановяване на действието, за да не се изгуби промененият „%s“"
-#: merge-recursive.c:1610
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Отказ да се загуби неследеният файл „%s“, защото е на място, където пречи."
-#: merge-recursive.c:1668
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
"„%s“ е добавен в „%s“"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1708
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“"
-#: merge-recursive.c:1704
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Преустановяване на действието, за да не се изгуби неследеният файл „%s“. "
"Вместо него се добавя „%s“"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5368,18 +5492,18 @@
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
-#: merge-recursive.c:1736
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " (некоригиран конфликт)"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1837
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“"
-#: merge-recursive.c:2091
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5390,7 +5514,7 @@
"постави „%s“, защото няколко нови директории поделят съдържанието на "
"директория „%s“, като никоя не съдържа мнозинство от файловете ѝ."
-#: merge-recursive.c:2225
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5399,81 +5523,81 @@
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“"
-#: merge-recursive.c:3080
+#: merge-recursive.c:3089
msgid "modify"
msgstr "промяна"
-#: merge-recursive.c:3080
+#: merge-recursive.c:3089
msgid "modified"
msgstr "променен"
-#: merge-recursive.c:3119
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)"
-#: merge-recursive.c:3172
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "Добавяне като „%s“"
-#: merge-recursive.c:3376
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "Изтриване на „%s“"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "файл/директория"
-#: merge-recursive.c:3404
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "директория/файл"
-#: merge-recursive.c:3411
+#: merge-recursive.c:3420
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"КОНФЛИКТ (%s): Съществува директория на име „%s“ в „%s“. Добавяне на „%s“ "
"като „%s“"
-#: merge-recursive.c:3420
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "Добавяне на „%s“"
-#: merge-recursive.c:3429
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "КОНФЛИКТ (добавяне/добавяне): Конфликт при сливане на „%s“"
-#: merge-recursive.c:3482
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "неуспешно сливане на дърветата „%s“ и „%s“"
-#: merge-recursive.c:3576
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "Сливане:"
-#: merge-recursive.c:3589
+#: merge-recursive.c:3598
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "открит е %u общ предшественик:"
msgstr[1] "открити са %u общи предшественици:"
-#: merge-recursive.c:3639
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "сливането не върна подаване"
-#: merge-recursive.c:3804
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "Неуспешен анализ на обекта „%s“"
-#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Индексът не може да бъде прочетен"
@@ -5481,143 +5605,176 @@
msgid "failed to read the cache"
msgstr "кешът не може да бъде прочетен"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "неуспешно записване на новия индекс"
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "неправилен размер на откъс (OID fanout) на индекса за множество пакети"
-#: midx.c:105
+#: midx.c:111
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "файлът с индекса за множество пакети „%s“ е твърде малък"
-#: midx.c:121
+#: midx.c:127
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "отпечатъкът на индекса за множество пакети 0x%08x не съвпада с 0x%08x"
-#: midx.c:126
+#: midx.c:132
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "непозната версия на индекс за множество пакети — %d"
-#: midx.c:131
+#: midx.c:137
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
"версията на контролната сума на индекса за множество пакети %u не съвпада с "
"%u"
-#: midx.c:148
+#: midx.c:154
msgid "multi-pack-index missing required pack-name chunk"
msgstr "липсва откъс (pack-name) от индекс за множество пакети"
-#: midx.c:150
+#: midx.c:156
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "липсва откъс (OID fanout) от индекс за множество пакети"
-#: midx.c:152
+#: midx.c:158
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "липсва откъс (OID lookup) от индекс за множество пакети"
-#: midx.c:154
+#: midx.c:160
msgid "multi-pack-index missing required object offsets chunk"
msgstr "липсва откъс за отместванията на обекти от индекс за множество пакети"
-#: midx.c:170
+#: midx.c:176
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"неправилна подредба на имената в индекс за множество пакети: „%s“ се появи "
"преди „%s“"
-#: midx.c:214
+#: midx.c:224
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
"неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)"
-#: midx.c:264
+#: midx.c:274
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"индексът за множество пакети съдържа 64-битови отмествания, но размерът на "
"„off_t“ е недостатъчен"
-#: midx.c:490
+#: midx.c:505
#, c-format
msgid "failed to add packfile '%s'"
msgstr "пакетният файл „%s“ не може да бъде добавен"
-#: midx.c:496
+#: midx.c:511
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "индексът за пакети „%s“ не може да бъде отворен"
-#: midx.c:564
+#: midx.c:579
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "обект %d в пакетния файл липсва"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:895
msgid "cannot store reverse index file"
msgstr "файлът за индекса не може да бъде съхранен"
-#: midx.c:920
+#: midx.c:993
+#, c-format
+msgid "could not parse line: %s"
+msgstr "редът не може да се анализира: „%s“"
+
+#: midx.c:995
+#, c-format
+msgid "malformed line: %s"
+msgstr "неправилен ред: „%s“."
+
+#: midx.c:1162
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr ""
"индексът за множество пакети се прескача, защото контролната сума не съвпада"
-#: midx.c:943
+#: midx.c:1187
+msgid "could not load pack"
+msgstr "пакетът не може да се зареди"
+
+#: midx.c:1193
+#, c-format
+msgid "could not open index for %s"
+msgstr "индексът за „%s“ не може да се отвори"
+
+#: midx.c:1204
msgid "Adding packfiles to multi-pack-index"
msgstr "Добавяне на пакетни файлове към индекс за множество пакети"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "пакетният файл за триене „%s“ не може да се открие"
-
-#: midx.c:1034
+#: midx.c:1247
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "непознат предпочитан пакет: %s"
-#: midx.c:1039
+#: midx.c:1292
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr ""
+"не може да изберете „%s“, който не съдържа обекти, за предпочитан пакет"
+
+#: midx.c:1324
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "пакетният файл за триене „%s“ не може да се открие"
+
+#: midx.c:1370
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "предпочитаният пакет „%s“ е остарял"
-#: midx.c:1055
+#: midx.c:1383
msgid "no pack files to index."
msgstr "няма пакетни файлове за индексиране"
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1420
+msgid "could not write multi-pack bitmap"
+msgstr "многопакетната битова маска не може да бъде запазена"
+
+#: midx.c:1430
+msgid "could not write multi-pack-index"
+msgstr "индексът за множество пакети не може да бъде запазен"
+
+#: midx.c:1489 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: midx.c:1166
+#: midx.c:1522
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "индексът за множество пакети не може да бъде изчистен при „%s“"
-#: midx.c:1225
+#: midx.c:1585
msgid "multi-pack-index file exists, but failed to parse"
msgstr "файлът с индекса за множество пакети, но не може да бъде анализиран"
-#: midx.c:1233
+#: midx.c:1593
msgid "incorrect checksum"
msgstr "неправилна контролна сума"
-#: midx.c:1236
+#: midx.c:1596
msgid "Looking for referenced packfiles"
msgstr "Търсене на указаните пакетни файлове"
-#: midx.c:1251
+#: midx.c:1611
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5625,75 +5782,75 @@
"неправилна подредба на откъси (OID fanout): fanout[%d] = %<PRIx32> > "
"%<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1616
msgid "the midx contains no oid"
msgstr "във файла с индекса за множество пакети няма идентификатори на обекти"
-#: midx.c:1265
+#: midx.c:1625
msgid "Verifying OID order in multi-pack-index"
msgstr ""
"Проверка на подредбата на идентификатори на обекти във файл с индекс към "
"множество пакетни файлове"
-#: midx.c:1274
+#: midx.c:1634
#, 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:1294
+#: midx.c:1654
msgid "Sorting objects by packfile"
msgstr "Подредба на обектите по пакетни файлове"
-#: midx.c:1301
+#: midx.c:1661
msgid "Verifying object offsets"
msgstr "Проверка на отместването на обекти"
-#: midx.c:1317
+#: midx.c:1677
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден"
-#: midx.c:1323
+#: midx.c:1683
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "индексът на пакета „%s“ не може да бъде зареден"
-#: midx.c:1332
+#: midx.c:1692
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "неправилно отместване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1719
msgid "Counting referenced objects"
msgstr "Преброяване на свързаните обекти"
-#: midx.c:1367
+#: midx.c:1729
msgid "Finding and deleting unreferenced packfiles"
msgstr "Търсене и изтриване на несвързаните пакетни файлове"
-#: midx.c:1558
+#: midx.c:1921
msgid "could not start pack-objects"
msgstr "командата „pack-objects“ не може да бъде стартирана"
-#: midx.c:1578
+#: midx.c:1941
msgid "could not finish pack-objects"
msgstr "командата „pack-objects“ не може да бъде завършена"
#: name-hash.c:542
#, c-format
msgid "unable to create lazy_dir thread: %s"
-msgstr "не може да се създаде нишка за директории: %s"
+msgstr "не може да се създаде нишка за директории (lazy_dir): %s"
#: name-hash.c:564
#, c-format
msgid "unable to create lazy_name thread: %s"
-msgstr "не може да се създаде нишка за имена: %s"
+msgstr "не може да се създаде нишка за имена (lazy_name): %s"
#: name-hash.c:570
#, c-format
msgid "unable to join lazy_name thread: %s"
-msgstr "не може да се изчака нишка за имена: %s"
+msgstr "не може да се изчака нишка за имена (lazy_name): %s"
#: notes-merge.c:277
#, c-format
@@ -5743,266 +5900,263 @@
msgid "Bad %s value: '%s'"
msgstr "Зададена е лоша стойност на променливата „%s“: „%s“"
-#: object-file.c:526
+#: object-file.c:456
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"директорията за обекти „%s“ не съществува, проверете „.git/objects/info/"
"alternates“"
-#: object-file.c:584
+#: object-file.c:514
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "алтернативният път към обекти не може да бъде нормализиран: „%s“"
-#: object-file.c:658
+#: object-file.c:588
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
"%s: алтернативните хранилища за обекти се пренебрегват поради прекалено "
"дълбоко влагане"
-#: object-file.c:665
+#: object-file.c:595
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "директорията за обекти „%s“ не може да бъде нормализирана"
-#: object-file.c:708
+#: object-file.c:638
msgid "unable to fdopen alternates lockfile"
msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“"
-#: object-file.c:726
+#: object-file.c:656
msgid "unable to read alternates file"
msgstr "файлът с алтернативите не може да бъде прочетен"
-#: object-file.c:733
+#: object-file.c:663
msgid "unable to move new alternates file into place"
msgstr "новият файл с алтернативите не може да бъде преместен на мястото му"
-#: object-file.c:768
+#: object-file.c:741
#, c-format
msgid "path '%s' does not exist"
msgstr "пътят „%s“ не съществува."
-#: object-file.c:789
+#: object-file.c:762
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано."
-#: object-file.c:795
+#: object-file.c:768
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "еталонното хранилище „%s“ не е локално"
-#: object-file.c:801
+#: object-file.c:774
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "еталонното хранилище „%s“ е плитко"
-#: object-file.c:809
+#: object-file.c:782
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "еталонното хранилище „%s“ е с присаждане"
-#: object-file.c:869
+#: object-file.c:813
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "директорията с обекти, която отговаря на „%s“, не може да бъде открита"
+
+#: object-file.c:863
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
-#: object-file.c:1019
+#: object-file.c:1013
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
"неуспешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1048
#, c-format
msgid "mmap failed%s"
msgstr "неуспешно изпълнение на „mmap“%s"
-#: object-file.c:1218
+#: object-file.c:1214
#, c-format
msgid "object file %s is empty"
msgstr "файлът с обектите „%s“ е празен"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1333 object-file.c:2542
#, c-format
msgid "corrupt loose object '%s'"
msgstr "непакетираният обект „%s“ е повреден"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1335 object-file.c:2546
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "грешни данни в края на непакетирания обект „%s“"
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr "неправилен вид обект"
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-"заглавната част „%s“ не може да се разпакетира с опцията „--allow-unknown-"
-"type“"
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-"заглавната част „%s“ не може да се анализира с опцията „--allow-unknown-type“"
-
-#: object-file.c:1493
+#: object-file.c:1457
#, c-format
msgid "unable to parse %s header"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: object-file.c:1717
+#: object-file.c:1459
+msgid "invalid object type"
+msgstr "неправилен вид обект"
+
+#: object-file.c:1470
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
+
+#: object-file.c:1474
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "заглавната част на „%s“ е прекалено дълга — надхвърля %d байта"
+
+#: object-file.c:1704
#, c-format
msgid "failed to read object %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: object-file.c:1721
+#: object-file.c:1708
#, c-format
msgid "replacement %s not found for %s"
msgstr "заместителят „%s“ на „%s“ не може да бъде открит"
-#: object-file.c:1725
+#: object-file.c:1712
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "непакетираният обект „%s“ (в „%s“) е повреден"
-#: object-file.c:1729
+#: object-file.c:1716
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "пакетираният обект „%s“ (в „%s“) е повреден"
-#: object-file.c:1834
+#: object-file.c:1821
#, c-format
msgid "unable to write file %s"
msgstr "файлът „%s“ не може да бъде записан"
-#: object-file.c:1841
+#: object-file.c:1828
#, c-format
msgid "unable to set permission to '%s'"
msgstr "правата за достъп до „%s“ не може да бъдат зададени"
-#: object-file.c:1848
+#: object-file.c:1835
msgid "file write error"
msgstr "грешка при запис на файл"
-#: object-file.c:1868
+#: object-file.c:1858
msgid "error when closing loose object file"
msgstr "грешка при затварянето на файла с непакетиран обект"
-#: object-file.c:1933
+#: object-file.c:1925
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"няма права за добавяне на обект към базата от данни на хранилището „%s“"
-#: object-file.c:1935
+#: object-file.c:1927
msgid "unable to create temporary file"
msgstr "не може да бъде създаден временен файл"
-#: object-file.c:1959
+#: object-file.c:1951
msgid "unable to write loose object file"
msgstr "грешка при записа на файла с непакетиран обект"
-#: object-file.c:1965
+#: object-file.c:1957
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d"
-#: object-file.c:1969
+#: object-file.c:1961
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "неуспешно приключване на „deflate“ върху „%s“: %d"
-#: object-file.c:1973
+#: object-file.c:1965
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "грешка поради нестабилния източник данни за обектите „%s“"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1976 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
-#: object-file.c:2060
+#: object-file.c:2054
#, c-format
msgid "cannot read object for %s"
msgstr "обектът за „%s“ не може да се прочете"
-#: object-file.c:2111
+#: object-file.c:2105
msgid "corrupt commit"
msgstr "повредено подаване"
-#: object-file.c:2119
+#: object-file.c:2113
msgid "corrupt tag"
msgstr "повреден етикет"
-#: object-file.c:2219
+#: object-file.c:2213
#, c-format
msgid "read error while indexing %s"
msgstr "грешка при четене по време на индексиране на „%s“"
-#: object-file.c:2222
+#: object-file.c:2216
#, c-format
msgid "short read while indexing %s"
msgstr "непълно прочитане по време на индексиране на „%s“"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2289 object-file.c:2299
#, c-format
msgid "%s: failed to insert into database"
msgstr "„%s“ не може да се вмъкне в базата от данни"
-#: object-file.c:2311
+#: object-file.c:2305
#, c-format
msgid "%s: unsupported file type"
msgstr "неподдържан вид файл: „%s“"
-#: object-file.c:2335
+#: object-file.c:2329 builtin/fetch.c:1453
#, c-format
msgid "%s is not a valid object"
msgstr "„%s“ е неправилен обект"
-#: object-file.c:2337
+#: object-file.c:2331
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "„%s“ е неправилен обект от вид „%s“"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2358
#, c-format
msgid "unable to open %s"
msgstr "обектът „%s“ не може да бъде отворен"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2553
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "неправилна контролна сума за „%s“ (трябва да е %s)"
-#: object-file.c:2583
+#: object-file.c:2576
#, c-format
msgid "unable to mmap %s"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
-#: object-file.c:2588
+#: object-file.c:2582
#, c-format
msgid "unable to unpack header of %s"
msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-#: object-file.c:2594
+#: object-file.c:2587
#, c-format
msgid "unable to parse header of %s"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: object-file.c:2605
+#: object-file.c:2598
#, c-format
msgid "unable to unpack contents of %s"
msgstr "съдържанието на „%s“ не може да бъде разпакетирано"
@@ -6032,9 +6186,9 @@
"с 40 шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n"
"Възможно е такива указатели да са създадени случайно. Например:\n"
"\n"
-" git switch -c $BRANCH $(git rev-parse …)\n"
+" git switch -c $br $(git rev-parse …)\n"
"\n"
-"където стойността на променливата на средата BRANCH е празна, при което\n"
+"където стойността на променливата на средата „$br“ е празна, при което\n"
"се създава подобен указател. Прегледайте тези указатели и ги изтрийте.\n"
"За да изключите това съобщение, изпълнете:\n"
"\n"
@@ -6131,12 +6285,27 @@
msgid "hash mismatch %s"
msgstr "разлика в контролната сума: „%s“"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "задължителният обратен индекс липсва в многопакетната битова маска"
+
+#: pack-bitmap.c:429
+msgid "load_reverse_index: could not open pack"
+msgstr ""
+"load_reverse_index: пакетът не може да се отвори (при зареждане на обратния "
+"индекс)"
+
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "размерът на „%s“ не може да бъде получен"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1935
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "„%s“ липсва в пакет „%s“ при отместване %<PRIuMAX>"
+
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "използваното място за „%s“ не може да бъде получено"
@@ -6168,137 +6337,142 @@
"идентификатор на контролна сума %2$<PRIu32> на файла с обратен индекс „%1$s“ "
"не се поддържа"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "обратният индекс не може едновременно да се записва и да се проверява"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "не може да се получи информация чрез „stat“ за „%s“"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "не може да се дадат права за четене на „%s“"
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "гарантиращият файл „%s“ не може да се запише"
-#: packfile.c:625
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
"отместване преди края на пакетния файл (възможно е индексът да е повреден)"
-#: packfile.c:655
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "не може да се изпълни „mmap“ върху пакетния файл „%s“%s"
-#: packfile.c:1934
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"отместване преди началото на индекса на пакетния файл „%s“ (възможно е "
"индексът да е повреден)"
-#: packfile.c:1938
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът "
"да е отрязан)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "опцията „%s“ очаква число за аргумент"
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "неправилна дата на срок: „%s“"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
"опцията „%s“ изисква някоя от стойностите: „always“ (винаги), "
"„auto“ (автоматично) или „never“ (никога)"
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "неправилно име на обект „%s“"
-#: parse-options.c:38
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "опцията „%s“ изисква някоя от стойностите: „%s“ или „%s“"
+
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "опцията „%s“ изисква аргумент"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "опциите „%s“ и „%s“ са несъвместими"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "опцията „%s“ е несъвместима с нещо"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "опцията „%s“ не приема аргументи"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "опцията „%s“ не е налична"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
"„%s“ очаква неотрицателно цяло число, евентуално със суфикс „k“/„m“/„g“"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "нееднозначна опция: „%s“ (може да е „--%s%s“ или „--%s%s“)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "„--%s“ (с 2 тирета) ли имахте предвид?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "псевдоним на „--%s“"
-#: parse-options.c:879
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "непозната опция: „%s“"
-#: parse-options.c:881
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "непознат флаг „%c“"
-#: parse-options.c:883
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "непозната стойност извън „ascii“ в низа: „%s“"
-#: parse-options.c:907
+#: parse-options.c:920
msgid "..."
msgstr "…"
-#: parse-options.c:926
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "употреба: %s"
@@ -6306,48 +6480,72 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-ЧИСЛО"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "Не може да се дадат права за запис в директорията „%s“ на групата"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"Екраниращият знак „\\“не може да е последен знак в стойността на атрибут"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Позволено е само едно указване на „attr:“."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "„attr:“ трябва да указва стойност"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "неправилно име на атрибут: „%s“"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "глобалните настройки за пътища „glob“ и „noglob“ са несъвместими"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6355,51 +6553,51 @@
"глобалната настройка за дословни пътища „literal“ е несъвместима с всички "
"други глобални настройки за пътища"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "неправилен параметър за опцията за магически пътища „prefix“"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Неправилна стойност за опцията за магически пътища „%.*s“ в „%s“"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Знакът „)“ липсва в опцията за магически пътища в „%s“"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Магическите пътища „%c“ са без реализация за „%s“"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: опциите „literal“ и „glob“ са несъвместими"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: „%s“ е извън хранилището при „%s“"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "„%s“ (клавиш: „%c“)"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: магическите пътища не се поддържат от командата „%s“"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "пътят „%s“ е след символна връзка"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "неправилно цитиран ред: %s"
@@ -6420,7 +6618,7 @@
msgid "flush packet write failed"
msgstr "неуспешно изчистване на буферите при запис на пакет"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "протоколна грешка: прекалено дълъг ред"
@@ -6428,7 +6626,7 @@
msgid "packet write with format failed"
msgstr "неуспешен запис на пакет с формат"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"неуспешен запис на пакетен файл — данните надвишават максималният размер на "
@@ -6439,25 +6637,25 @@
msgid "packet write failed: %s"
msgstr "неуспешен запис на пакет: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "грешка при четене"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "отдалеченото хранилище неочаквано прекъсна връзката"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "протоколна грешка: неправилeн знак за дължина на ред: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "протоколна грешка: неправилна дължина на ред: %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "отдалечена грешка: %s"
@@ -6471,7 +6669,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "не може да се създаде нишка за изпълнението на „lstat“: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "аргументът към опцията „--pretty“ не може да се анализира"
@@ -6503,21 +6701,21 @@
msgid "Removing duplicate objects"
msgstr "Изтриване на повтарящите се обекти"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "командата за журнала с подавания „log“ не може да се стартира"
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr ""
"изходът от командата за журнала с подавания „log“ не може да се прочете"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5602
#, c-format
msgid "could not parse commit '%s'"
msgstr "подаването „%s“ не може да бъде анализирано"
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6526,71 +6724,67 @@
"първият ред от изхода на командата „log“ не може да се анализира, защото не "
"започва с „commit “: „%s“"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "заглавната част на git „%.*s“ не може да се анализира"
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "неуспешно търсене на разлика"
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "опциите „--left-only“ и „--right-only“ са несъвместими"
-
#: range-diff.c:562 range-diff.c:564
#, c-format
msgid "could not parse log for '%s'"
msgstr "журналът с подаванията на „%s“ не може да бъде анализиран"
-#: read-cache.c:710
+#: read-cache.c:723
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
"няма да бъде добавен псевдоним за файл „%s“ („%s“ вече съществува в индекса)"
-#: read-cache.c:726
+#: read-cache.c:739
msgid "cannot create an empty blob in the object database"
msgstr "в базата от данни за обектите не може да се създаде празен обект-BLOB"
-#: read-cache.c:748
+#: read-cache.c:761
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s: може да добавяте само обикновени файлове, символни връзки и директории "
"на git"
-#: read-cache.c:753
+#: read-cache.c:766 builtin/submodule--helper.c:3242
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "не е изтеглено подаване в „%s“"
-#: read-cache.c:805
+#: read-cache.c:818
#, c-format
msgid "unable to index file '%s'"
msgstr "файлът „%s“ не може да бъде индексиран"
-#: read-cache.c:824
+#: read-cache.c:837
#, c-format
msgid "unable to add '%s' to index"
msgstr "„%s“ не може да се добави в индекса"
-#: read-cache.c:835
+#: read-cache.c:848
#, c-format
msgid "unable to stat '%s'"
msgstr "„stat“ не може да се изпълни върху „%s“"
-#: read-cache.c:1358
+#: read-cache.c:1386
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "„%s“ съществува и като файл, и като директория"
-#: read-cache.c:1573
+#: read-cache.c:1601
msgid "Refresh index"
msgstr "Обновяване на индекса"
-#: read-cache.c:1705
+#: read-cache.c:1733
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6599,7 +6793,7 @@
"Зададена е неправилна стойност на настройката „index.version“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1715
+#: read-cache.c:1743
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6609,146 +6803,152 @@
"„GIT_INDEX_VERSION“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1771
+#: read-cache.c:1799
#, c-format
msgid "bad signature 0x%08x"
msgstr "неправилен подпис: „0x%08x“"
-#: read-cache.c:1774
+#: read-cache.c:1802
#, c-format
msgid "bad index version %d"
msgstr "неправилна версия на индекса %d"
-#: read-cache.c:1783
+#: read-cache.c:1811
msgid "bad index file sha1 signature"
msgstr "неправилен подпис за контролна сума по SHA1 на файла на индекса"
-#: read-cache.c:1817
+#: read-cache.c:1845
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
"индексът ползва разширение „%.4s“, което не се поддържа от тази версия на git"
-#: read-cache.c:1819
+#: read-cache.c:1847
#, c-format
msgid "ignoring %.4s extension"
msgstr "игнориране на разширението „%.4s“"
-#: read-cache.c:1856
+#: read-cache.c:1884
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "непознат формат на запис в индекса: „0x%08x“"
-#: read-cache.c:1872
+#: read-cache.c:1900
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "неправилно име на поле в индекса близо до пътя „%s“"
-#: read-cache.c:1929
+#: read-cache.c:1957
msgid "unordered stage entries in index"
msgstr "неподредени записи в индекса"
-#: read-cache.c:1932
+#: read-cache.c:1960
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "множество записи за слетия файл „%s“"
-#: read-cache.c:1935
+#: read-cache.c:1963
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "неподредени записи за „%s“"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:331
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
msgid "index file corrupt"
msgstr "файлът с индекса е повреден"
-#: read-cache.c:2185
+#: read-cache.c:2222
#, c-format
msgid "unable to create load_cache_entries thread: %s"
-msgstr "не може да се създаде нишка за зареждане на обектите от кеша: %s"
+msgstr ""
+"не може да се създаде нишка за зареждане на обектите от кеша "
+"(load_cache_entries): %s"
-#: read-cache.c:2198
+#: read-cache.c:2235
#, c-format
msgid "unable to join load_cache_entries thread: %s"
-msgstr "не може да се изчака нишка за зареждане на обектите от кеша: %s"
+msgstr ""
+"не може да се изчака нишка за зареждане на обектите от кеша "
+"(load_cache_entries): %s"
-#: read-cache.c:2231
+#: read-cache.c:2268
#, c-format
msgid "%s: index file open failed"
msgstr "%s: неуспешно отваряне на файла на индекса"
-#: read-cache.c:2235
+#: read-cache.c:2272
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: не може да се получи информация за отворения индекс със „stat“"
-#: read-cache.c:2239
+#: read-cache.c:2276
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: файлът на индекса е по-малък от очакваното"
-#: read-cache.c:2243
+#: read-cache.c:2280
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: неуспешно изпълнение на „mmap“ върху индексния файл%s"
-#: read-cache.c:2286
+#: read-cache.c:2323
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-"не може да се създаде нишка за зареждане на разширенията на индекса: %s"
+"не може да се създаде нишка за зареждане на разширенията на индекса "
+"(load_index_extensions): %s"
-#: read-cache.c:2313
+#: read-cache.c:2350
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-"не може да се създаде нишка за зареждане на разширенията на индекса: %s"
+"не може да се създаде нишка за зареждане на разширенията на индекса "
+"(load_index_extensions): %s"
-#: read-cache.c:2351
+#: read-cache.c:2396
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "споделеният индекс „%s“ не може да се обнови"
-#: read-cache.c:2398
+#: read-cache.c:2455
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "грешки в индекса — в „%2$s“ се очаква „%1$s“, а бе получено „%3$s“"
-#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
#, c-format
msgid "could not close '%s'"
msgstr "„%s“ не може да се затвори"
-#: read-cache.c:3074
+#: read-cache.c:3129
msgid "failed to convert to a sparse-index"
msgstr "индексът не може да бъде превърнат в частичен"
-#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3200
#, c-format
msgid "could not stat '%s'"
msgstr "неуспешно изпълнение на „stat“ върху „%s“"
-#: read-cache.c:3158
+#: read-cache.c:3213
#, c-format
msgid "unable to open git dir: %s"
msgstr "не може да се отвори директорията на git: %s"
-#: read-cache.c:3170
+#: read-cache.c:3225
#, c-format
msgid "unable to unlink: %s"
msgstr "неуспешно изтриване на „%s“"
-#: read-cache.c:3199
+#: read-cache.c:3254
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "правата за достъп до „%s“ не може да бъдат поправени"
-#: read-cache.c:3348
+#: read-cache.c:3411
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: не може да се премине към етап №0"
@@ -6830,7 +7030,7 @@
msgstr[0] "Пребазиране на „%s“ върху „%s“ (%d команди)"
msgstr[1] "Пребазиране на „%s“ върху „%s“ (%d команда)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6838,7 +7038,7 @@
"\n"
"Не изтривайте редове. Подаванията може да се прескачат с командата „drop“.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6846,7 +7046,7 @@
"\n"
"Ако изтриете ред, съответстващото му подаване ще бъде ИЗТРИТО.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6861,7 +7061,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6871,14 +7071,14 @@
"Ако изтриете всичко, пребазирането ще бъде преустановено.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "„%s“ не може да се запише"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "„%s“ не може да се запише."
@@ -6909,14 +7109,12 @@
"предупреждение)\n"
"или „error“ (считане за грешка).\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "от „%s“ не може да се чете."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: „merges“ заменя „preserve“"
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
msgid "gone"
msgstr "изтрит"
@@ -6935,257 +7133,229 @@
msgid "ahead %d, behind %d"
msgstr "напред с %d, назад с %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "очакван формат: %%(color:ЦВЯТ)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "непознат цвят: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "очаква се цяло число за „refname:lstrip=%s“"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "очаква се цяло число за „refname:rstrip=%s“"
-#: ref-filter.c:260
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "непознат аргумент за „%%(%s)“: %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) не приема аргументи"
-#: ref-filter.c:339
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "непознат аргумент за %%(objectsize): %s"
-
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) не приема аргументи"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) не приема аргументи"
-#: ref-filter.c:372
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "непознат аргумент за %%(subject): %s"
-
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
-msgstr "очаква се %%(trailers:КЛЮЧ=СТОЙНОСТ)"
+msgstr "очаква се %%(trailers:key=ЕПИЛОГ)"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "непознат аргумент „%%(trailers)“: %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "очаква се положителна стойност за „contents:lines=%s“"
-#: ref-filter.c:426
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "непознат аргумент за %%(contents): %s"
-
-#: ref-filter.c:441
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "очаква се положителна стойност за „%s“ в %%(%s)"
-#: ref-filter.c:445
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "непознат аргумент „%s“ в %%(%s)"
-
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "непозната опция за е-поща: %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "непозната позиция: %s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "непозната широчина: %s"
-#: ref-filter.c:517
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "непознат аргумент за %%(align): %s"
-
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "очаква се положителна широчина с лексемата „%%(align)“"
-#: ref-filter.c:543
+#: ref-filter.c:568
#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "непознат аргумент за „%%(if)“: %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) не приема аргументи"
-#: ref-filter.c:645
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "неправилно име на обект: „%.*s“"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "непознато име на обект: „%.*s“"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "не е хранилище на git, а полето „%.*s“ изисква достъп данни на обектни"
-#: ref-filter.c:801
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "формат: лексемата %%(if) е използвана без съответната ѝ %%(then)"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "формат: лексемата %%(%s) е използвана без съответната ѝ %%(%s)"
-#: ref-filter.c:865
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "формат: лексемата %%(then) е използвана без съответната ѝ %%(if)"
-
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "формат: лексемата %%(then) е използвана повече от един път"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "формат: лексемата %%(then) е използвана след %%(else)"
-#: ref-filter.c:897
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(if)"
-
-#: ref-filter.c:899
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(then)"
-
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "формат: лексемата %%(else) е използвана повече от един път"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "формат: лексемата %%(end) е използвана без съответната ѝ"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "неправилен форматиращ низ „%s“"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "тази команда отхвърли лексемата %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr ""
+"опцията „--format=%.*s“ е несъвместима с „--python“, „--shell“, „--tcl“"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(извън клон, пребазиране на „%s“)"
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(извън клон, пребазиране на несвързан указател „HEAD“ при „%s“)"
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(извън клон, двоично търсене от „%s“)"
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(указателят „HEAD“ не е свързан и е при „%s“)"
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(указателят „HEAD“ не е свързан и е отделѐн от „%s“)"
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "(извън клон)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "обектът „%s“ липсва за „%s“"
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "обект със сгрешен формат при „%s“"
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "игнориране на указателя с грешно име „%s“"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr "игнориране на повредения указател „%s“"
-#: ref-filter.c:2498
+#: ref-filter.c:2629
#, c-format
msgid "format: %%(end) atom missing"
msgstr "грешка във форма̀та: липсва лексемата %%(end)"
-#: ref-filter.c:2592
+#: ref-filter.c:2740
#, c-format
msgid "malformed object name %s"
msgstr "неправилно име на обект „%s“"
-#: ref-filter.c:2597
+#: ref-filter.c:2745
#, c-format
msgid "option `%s' must point to a commit"
msgstr "опцията „%s“ не сочи към подаване"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "„%s“ не сочи към позволен обект!"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -7210,12 +7380,12 @@
"\n"
" git branch -m ИМЕ\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "„%s“ не може да бъде получен"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "неправилно име на клон: „%s = %s“"
@@ -7225,66 +7395,66 @@
msgid "ignoring dangling symref %s"
msgstr "игнориране на указател на обект извън клон „%s“"
-#: refs.c:922
+#: refs.c:925
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "има пропуски в журнала с подаванията за указателя „%s“ след „%s“"
-#: refs.c:929
+#: refs.c:932
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "журналът с подаванията за указателя „%s“ свършва неочаквано след „%s“"
-#: refs.c:994
+#: refs.c:997
#, c-format
msgid "log for %s is empty"
msgstr "журналът с подаванията за указателя „%s“ е празен"
-#: refs.c:1086
+#: refs.c:1090
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "указател не може да се обнови с грешно име „%s“"
-#: refs.c:1157
+#: refs.c:1168
#, c-format
msgid "update_ref failed for ref '%s': %s"
-msgstr "неуспешно обновяване на указателя „%s“: %s"
+msgstr "неуспешно обновяване на указателя (update_ref) „%s“: %s"
-#: refs.c:2051
+#: refs.c:2067
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "не са позволени повече от една промени на указателя „%s“"
-#: refs.c:2131
+#: refs.c:2150
msgid "ref updates forbidden inside quarantine environment"
msgstr "обновяванията на указатели са забранени в среди под карантина"
-#: refs.c:2142
+#: refs.c:2161
msgid "ref updates aborted by hook"
msgstr "обновяванията на указатели са преустановени от кука"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2269 refs.c:2299
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "„%s“ съществува, не може да се създаде „%s“"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2275 refs.c:2310
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1267
#, c-format
msgid "could not remove reference %s"
msgstr "Указателят „%s“ не може да бъде изтрит"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Указателят „%s“ не може да бъде изтрит: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "Указателите не може да бъдат изтрити: %s"
@@ -7294,51 +7464,51 @@
msgid "invalid refspec '%s'"
msgstr "неправилен указател: „%s“"
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
"съкращението за отдалечено хранилище не може за започва със знака „/“: %s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "зададен е повече от един пакет за получаване, ще се ползва първият"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "зададен е повече от един пакет за изпращане, ще се ползва първият"
-#: remote.c:590
+#: remote.c:699
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“"
-#: remote.c:594
+#: remote.c:703
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "„%s“ обикновено следи „%s“, а не „%s“"
-#: remote.c:598
+#: remote.c:707
#, c-format
msgid "%s tracks both %s and %s"
msgstr "„%s“ следи както „%s“, така и „%s“"
-#: remote.c:666
+#: remote.c:775
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "ключ „%s“ на шаблона не съдържа „*“"
-#: remote.c:676
+#: remote.c:785
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "стойност „%s“ на шаблона не съдържа „*“"
-#: remote.c:1083
+#: remote.c:1192
#, c-format
msgid "src refspec %s does not match any"
msgstr "указателят на версия-източник „%s“ не съвпада с никой обект"
-#: remote.c:1088
+#: remote.c:1197
#, c-format
msgid "src refspec %s matches more than one"
msgstr "указателят на версия-източник „%s“ съвпада с повече от един обект"
@@ -7347,7 +7517,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1212
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -7371,7 +7541,7 @@
"Никой от вариантите не сработи. Трябва сами да укажете пълното име на\n"
"указателя."
-#: remote.c:1123
+#: remote.c:1232
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -7382,7 +7552,7 @@
"като\n"
"изтласкате към „%s:refs/heads/%s“?"
-#: remote.c:1128
+#: remote.c:1237
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -7393,7 +7563,7 @@
"като\n"
"изтласкате към „%s:refs/tags/%s“?"
-#: remote.c:1133
+#: remote.c:1242
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -7403,7 +7573,7 @@
"ИЗТОЧНИКът е обект-дърво. Не целите ли всъщност да създадете нов клон като\n"
"изтласкате към „%s:refs/tags/%s“?"
-#: remote.c:1138
+#: remote.c:1247
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -7413,118 +7583,118 @@
"ИЗТОЧНИКът е обект-BLOB. Не целите ли всъщност да създадете нов клон като\n"
"изтласкате към „%s:refs/tags/%s“?"
-#: remote.c:1174
+#: remote.c:1283
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "не е открит клон съответстващ на „%s“"
-#: remote.c:1185
+#: remote.c:1294
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "„%s“ не може да се изтрие: отдалечения указател не съществува"
-#: remote.c:1197
+#: remote.c:1306
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "указателят на версия-цел „%s“ съвпада с повече от един обект"
-#: remote.c:1204
+#: remote.c:1313
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
"указателят на версия-цел „%s“ съответства и ще получава от повече от един "
"източник"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
msgid "HEAD does not point to a branch"
msgstr "Указателят „HEAD“ не сочи към клон"
-#: remote.c:1733
+#: remote.c:1843
#, c-format
msgid "no such branch: '%s'"
msgstr "няма клон на име „%s“"
-#: remote.c:1736
+#: remote.c:1846
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "не е зададен клон-източник за клона „%s“"
-#: remote.c:1742
+#: remote.c:1852
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "клонът-източник „%s“ не е съхранен като следящ клон"
-#: remote.c:1757
+#: remote.c:1867
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"липсва локален следящ клон за местоположението за изтласкване „%s“ в "
"хранилището „%s“"
-#: remote.c:1769
+#: remote.c:1882
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "няма информация клонът „%s“ да следи някой друг"
-#: remote.c:1779
+#: remote.c:1892
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "указателят за изтласкване на „%s“ не включва „%s“"
-#: remote.c:1792
+#: remote.c:1905
msgid "push has no destination (push.default is 'nothing')"
msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)"
-#: remote.c:1814
+#: remote.c:1927
msgid "cannot resolve 'simple' push to a single destination"
msgstr "простото (simple) изтласкване не съответства на една цел"
-#: remote.c:1943
+#: remote.c:2060
#, c-format
msgid "couldn't find remote ref %s"
msgstr "отдалеченият указател „%s“ не може да бъде открит"
-#: remote.c:1956
+#: remote.c:2073
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "• прескачане на неочаквания локален указател „%s“"
-#: remote.c:2119
+#: remote.c:2236
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n"
-#: remote.c:2123
+#: remote.c:2240
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
-#: remote.c:2126
+#: remote.c:2243
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Клонът е обновен към „%s“.\n"
-#: remote.c:2130
+#: remote.c:2247
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Клонът ви и „%s“ сочат към различни подавания.\n"
-#: remote.c:2133
+#: remote.c:2250
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (за повече информация ползвайте „%s“)\n"
-#: remote.c:2137
+#: remote.c:2254
#, 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:2143
+#: remote.c:2260
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (публикувайте локалните си промени чрез „git push“)\n"
-#: remote.c:2146
+#: remote.c:2263
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -7532,11 +7702,11 @@
msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n"
msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n"
-#: remote.c:2154
+#: remote.c:2271
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (обновете локалния си клон чрез „git pull“)\n"
-#: remote.c:2157
+#: remote.c:2274
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -7551,11 +7721,11 @@
"Текущият клон се е отделил от „%s“,\n"
"двата имат съответно по %d и %d несъвпадащи подавания.\n"
-#: remote.c:2167
+#: remote.c:2284
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n"
-#: remote.c:2359
+#: remote.c:2476
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "очакваното име на обект „%s“ не може да бъде анализирано"
@@ -7588,7 +7758,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "грешки при записването на „%s“ (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr "грешка при изчистването на буферите при записването на „%s“"
@@ -7636,8 +7806,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Предварителният вариант на „%s“ е запазен"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
#, c-format
msgid "could not create directory '%s'"
msgstr "Директорията „%s“ не може да бъде създадена"
@@ -7675,49 +7845,35 @@
msgid "could not determine HEAD revision"
msgstr "не може да се определи към какво да сочи указателят „HEAD“"
-#: reset.c:70 reset.c:76 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3700
#, c-format
msgid "failed to find tree of %s"
msgstr "дървото, сочено от „%s“, не може да бъде открито"
-#: revision.c:2344
+#: revision.c:2347
msgid "--unpacked=<packfile> no longer supported"
msgstr "опцията „--unpacked=ПАКЕТЕН_ФАЙЛ“ вече не се поддържа"
-#: revision.c:2684
+#: revision.c:2686
msgid "your current branch appears to be broken"
msgstr "Текущият клон е повреден"
-#: revision.c:2687
+#: revision.c:2689
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Текущият клон „%s“ е без подавания "
-#: revision.c:2893
+#: revision.c:2891
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
"опцията „-L“ поддържа единствено форматирането на разликите според опциите „-"
"p“ и „-s“"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "неуспешно отваряне на „/dev/null“"
-
-#: run-command.c:1274
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "не може да се създаде асинхронна нишка: %s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Куката „%s“ се прескача, защото липсват права за изпълнение.\n"
-"За да изключите това предупреждение, изпълнете:\n"
-" git config advice.ignoredHook false"
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
@@ -7739,24 +7895,24 @@
msgid "failed to sign the push certificate"
msgstr "сертификатът за изтласкване не може да бъде подписан"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack: неуспешно създаване на процес"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "неуспешно договаряне на изтласкване, но се продължава с изтласкването"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr ""
"отсрещната страна не поддържа алгоритъма за контролни суми на това хранилище"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7764,101 +7920,155 @@
"отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се "
"използва сертификат"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "отсрещната страна не поддържа опции при изтласкване"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "несъществуващ режим на изчистване „%s“ на съобщение при подаване"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "„%s“ не може да бъде изтрит"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "„%s“ не може да бъде изтрит"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "отмяна"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "отбиране"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "пребазиране"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "неизвестно действие: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-"след коригирането на конфликтите, отбележете съответните\n"
-"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“."
+"след коригирането на конфликтите, отбележете съответните пътища с:\n"
+"\n"
+" git add ПЪТ…\n"
+"\n"
+"или\n"
+"\n"
+" git rm ПЪТ…"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"след коригирането на конфликтите, отбележете съответните\n"
-"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n"
-"подайте резултата с командата „git commit'“."
+"След коригирането на конфликтите отбележете решаването им чрез:\n"
+"\n"
+" git add/rm ПЪТ…\n"
+"\n"
+"и изпълнете:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"Ако предпочитате да прескочите тази кръпка, изпълнете:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
+"За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
+"изпълнете:\n"
+"\n"
+" git cherry-pick --abort"
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"След коригирането на конфликтите отбележете решаването им чрез:\n"
+"\n"
+" git add/rm ПЪТ…\n"
+"\n"
+"и изпълнете:\n"
+"\n"
+" git revert --continue\n"
+"\n"
+"Ако предпочитате да прескочите тази кръпка, изпълнете:\n"
+"\n"
+" git revert --skip\n"
+"\n"
+"За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
+"изпълнете:\n"
+"\n"
+" git revert --abort"
+
+#: sequencer.c:448 sequencer.c:3292
#, c-format
msgid "could not lock '%s'"
msgstr "„%s“ не може да се заключи"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "краят на ред не може да се запише в „%s“"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
#, c-format
msgid "failed to finalize '%s'"
msgstr "„%s“ не може да се завърши"
-#: sequencer.c:486
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "файлът „%s“ не може да бъде прочетен"
+
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "локалните ви промени ще бъдат презаписани при %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "подайте или скатайте промените, за да продължите"
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: превъртане"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:614
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Несъществуващ режим на изчистване „%s“"
@@ -7866,65 +8076,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: новият индекс не може да бъде запазен"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "дървото на кеша не може да бъде обновено"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "в „%.*s“ няма ключове"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "цитирането на стойността на „%s“ не може да бъде изчистено"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "файлът не може да бъде прочетен: „%s“"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "настройката за автор „GIT_AUTHOR_NAME“ вече е зададена"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "настройката за дата „GIT_AUTHOR_DATE“ вече е зададена"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "непозната променлива „%s“"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "настройката за автор „GIT_AUTHOR_NAME“ липсва"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ липсва"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "настройката за дата „GIT_AUTHOR_DATE“ липсва"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7953,13 +8163,13 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr ""
"неуспешно изпълнение на куката при промяна на съобщението при подаване "
"(prepare-commit-msg)"
-#: sequencer.c:1218
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7987,7 +8197,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -8012,356 +8222,362 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1288
msgid "couldn't look up newly created commit"
msgstr "току що създаденото подаване не може да бъде открито"
-#: sequencer.c:1275
+#: sequencer.c:1290
msgid "could not parse newly created commit"
msgstr "току що създаденото подаване не може да бъде анализирано"
-#: sequencer.c:1321
+#: sequencer.c:1339
msgid "unable to resolve HEAD after creating commit"
msgstr ""
"състоянието сочено от указателя „HEAD“ не може да бъде открито след "
"подаването"
-#: sequencer.c:1323
+#: sequencer.c:1342
msgid "detached HEAD"
msgstr "несвързан връх „HEAD“"
-#: sequencer.c:1327
+#: sequencer.c:1346
msgid " (root-commit)"
msgstr " (начално подаване)"
-#: sequencer.c:1348
+#: sequencer.c:1367
msgid "could not parse HEAD"
msgstr "указателят „HEAD“ не може да бъде анализиран"
-#: sequencer.c:1350
+#: sequencer.c:1369
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
msgid "could not parse HEAD commit"
msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1429 sequencer.c:2314
msgid "unable to parse commit author"
msgstr "авторът на подаването не може да бъде анализиран"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "Командата „git write-tree“ не успя да запише обект-дърво"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1473 sequencer.c:1593
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "съобщението за подаване не може да бъде прочетено от „%s“"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1504 sequencer.c:1536
#, c-format
msgid "invalid author identity '%s'"
msgstr "неправилна самоличност за автор: „%s“"
-#: sequencer.c:1491
+#: sequencer.c:1510
msgid "corrupt author: missing date information"
msgstr "повредена информация за автор: липсва дата"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909
-#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "обектът за подаването не може да бъде записан"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "„%s“ не може да се обнови"
-#: sequencer.c:1606
+#: sequencer.c:1625
#, c-format
msgid "could not parse commit %s"
msgstr "подаването „%s“ не може да бъде анализирано"
-#: sequencer.c:1611
+#: sequencer.c:1630
#, c-format
msgid "could not parse parent commit %s"
msgstr "родителското подаване „%s“ не може да бъде анализирано"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1713 sequencer.c:1994
#, c-format
msgid "unknown command: %d"
msgstr "непозната команда: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1755
msgid "This is the 1st commit message:"
msgstr "Това е 1-то съобщение при подаване:"
-#: sequencer.c:1737
+#: sequencer.c:1756
#, c-format
msgid "This is the commit message #%d:"
msgstr "Това е съобщение при подаване №%d:"
-#: sequencer.c:1738
+#: sequencer.c:1757
msgid "The 1st commit message will be skipped:"
msgstr "Съобщението при подаване №1 ще бъде прескочено:"
-#: sequencer.c:1739
+#: sequencer.c:1758
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Съобщението при подаване №%d ще бъде прескочено:"
-#: sequencer.c:1740
+#: sequencer.c:1759
#, c-format
msgid "This is a combination of %d commits."
msgstr "Това е обединение от %d подавания"
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1906 sequencer.c:1963
#, c-format
msgid "cannot write '%s'"
msgstr "„%s“ не може да се запази"
-#: sequencer.c:1934
+#: sequencer.c:1953
msgid "need a HEAD to fixup"
msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1955 sequencer.c:3596
msgid "could not read HEAD"
msgstr "указателят „HEAD“ не може да се прочете"
-#: sequencer.c:1938
+#: sequencer.c:1957
msgid "could not read HEAD's commit message"
msgstr ""
"съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s"
-#: sequencer.c:1962
+#: sequencer.c:1981
#, c-format
msgid "could not read commit message of %s"
msgstr "съобщението за подаване към „%s“ не може да бъде прочетено"
-#: sequencer.c:2072
+#: sequencer.c:2091
msgid "your index file is unmerged."
msgstr "индексът не е слят."
-#: sequencer.c:2079
+#: sequencer.c:2098
msgid "cannot fixup root commit"
msgstr "началното подаване не може да се вкара в предходното му"
-#: sequencer.c:2098
+#: sequencer.c:2117
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“"
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2125 sequencer.c:2133
#, c-format
msgid "commit %s does not have parent %d"
msgstr "подаването „%s“ няма родител %d"
-#: sequencer.c:2120
+#: sequencer.c:2139
#, 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:2139
+#: sequencer.c:2158
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: неразпозната стойност за родителското подаване „%s“"
-#: sequencer.c:2205
+#: sequencer.c:2224
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "„%s“ не може да се преименува на „%s“"
-#: sequencer.c:2265
+#: sequencer.c:2284
#, c-format
msgid "could not revert %s... %s"
msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-#: sequencer.c:2266
+#: sequencer.c:2285
#, c-format
msgid "could not apply %s... %s"
msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-#: sequencer.c:2287
+#: sequencer.c:2306
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "прескачане на %s %s — кръпката вече е приложена\n"
-#: sequencer.c:2345
+#: sequencer.c:2364
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: неуспешно изчитане на индекса"
-#: sequencer.c:2352
+#: sequencer.c:2372
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: неуспешно обновяване на индекса"
-#: sequencer.c:2425
+#: sequencer.c:2452
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "„%s“ не приема аргументи: „%s“"
-#: sequencer.c:2434
+#: sequencer.c:2461
#, c-format
msgid "missing arguments for %s"
msgstr "„%s“ изисква аргументи"
-#: sequencer.c:2477
+#: sequencer.c:2504
#, c-format
msgid "could not parse '%s'"
msgstr "„%s“ не може да се анализира"
-#: sequencer.c:2538
+#: sequencer.c:2565
#, c-format
msgid "invalid line %d: %.*s"
msgstr "неправилен ред %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2576
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Без предишно подаване не може да се изпълни „%s“"
-#: sequencer.c:2635
+#: sequencer.c:2624 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "от „%s“ не може да се чете."
+
+#: sequencer.c:2662
msgid "cancelling a cherry picking in progress"
msgstr "преустановяване на извършваното в момента отбиране на подавания"
-#: sequencer.c:2644
+#: sequencer.c:2671
msgid "cancelling a revert in progress"
msgstr "преустановяване на извършваното в момента отмяна на подаване"
-#: sequencer.c:2690
+#: sequencer.c:2711
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "коригирайте това чрез „git rebase --edit-todo“."
-#: sequencer.c:2692
+#: sequencer.c:2713
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "неизползваем файл с описание на предстоящите действия: „%s“"
-#: sequencer.c:2697
+#: sequencer.c:2718
msgid "no commits parsed."
msgstr "никое от подаванията не може да се разпознае."
-#: sequencer.c:2708
+#: sequencer.c:2729
msgid "cannot cherry-pick during a revert."
msgstr ""
"по време на отмяна на подаване не може да се извърши отбиране на подаване."
-#: sequencer.c:2710
+#: sequencer.c:2731
msgid "cannot revert during a cherry-pick."
msgstr "по време на отбиране не може да се извърши отмяна на подаване."
-#: sequencer.c:2788
+#: sequencer.c:2809
#, c-format
msgid "invalid value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: sequencer.c:2897
+#: sequencer.c:2918
msgid "unusable squash-onto"
msgstr "подаването, в което другите да се вкарат, не може да се използва"
-#: sequencer.c:2917
+#: sequencer.c:2938
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "неправилен файл с опции: „%s“"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3033 sequencer.c:4902
msgid "empty commit set passed"
msgstr "зададено е празно множество от подавания"
-#: sequencer.c:3029
+#: sequencer.c:3050
msgid "revert is already in progress"
msgstr "в момента вече се извършва отмяна на подавания"
-#: sequencer.c:3031
+#: sequencer.c:3052
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
+msgstr "използвайте „git revert (--continue | %s--abort | --quit)“"
-#: sequencer.c:3034
+#: sequencer.c:3055
msgid "cherry-pick is already in progress"
msgstr "в момента вече се извършва отбиране на подавания"
-#: sequencer.c:3036
+#: sequencer.c:3057
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
-#: sequencer.c:3050
+#: sequencer.c:3071
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
"директорията за определянето на последователността „%s“ не може да бъде "
"създадена"
-#: sequencer.c:3065
+#: sequencer.c:3086
msgid "could not lock HEAD"
msgstr "указателят „HEAD“ не може да се заключи"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3146 sequencer.c:4612
msgid "no cherry-pick or revert in progress"
msgstr ""
"в момента не се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3148 sequencer.c:3159
msgid "cannot resolve HEAD"
msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3150 sequencer.c:3194
msgid "cannot abort from a branch yet to be born"
msgstr ""
"действието не може да бъде преустановено, когато сте на клон, който тепърва "
"предстои да бъде създаден"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "„%s“ не може да бъде отворен"
-#: sequencer.c:3161
+#: sequencer.c:3182
#, c-format
msgid "cannot read '%s': %s"
msgstr "„%s“ не може да бъде прочетен: %s"
-#: sequencer.c:3162
+#: sequencer.c:3183
msgid "unexpected end of file"
msgstr "неочакван край на файл"
-#: sequencer.c:3168
+#: sequencer.c:3189
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е "
"повреден"
-#: sequencer.c:3179
+#: sequencer.c:3200
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n"
"Не се правят промени."
-#: sequencer.c:3220
+#: sequencer.c:3241
msgid "no revert in progress"
msgstr "в момента не тече пребазиране"
-#: sequencer.c:3229
+#: sequencer.c:3250
msgid "no cherry-pick in progress"
msgstr "в момента не се извършва отбиране на подавания"
-#: sequencer.c:3239
+#: sequencer.c:3260
msgid "failed to skip the commit"
msgstr "неуспешно прескачане на подаването"
-#: sequencer.c:3246
+#: sequencer.c:3267
msgid "there is nothing to skip"
msgstr "няма какво да се прескочи"
-#: sequencer.c:3249
+#: sequencer.c:3270
#, c-format
msgid ""
"have you committed already?\n"
@@ -8371,16 +8587,16 @@
"\n"
" git %s --continue"
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3432 sequencer.c:4503
msgid "cannot read HEAD"
msgstr "указателят „HEAD“ не може да бъде прочетен"
-#: sequencer.c:3428
+#: sequencer.c:3449
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:3436
+#: sequencer.c:3457
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8399,27 +8615,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3467
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“"
-#: sequencer.c:3453
+#: sequencer.c:3474
#, c-format
msgid "Could not merge %.*s"
msgstr "Невъзможно сливане на „%.*s“"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:3483
+#: sequencer.c:3503
#, c-format
msgid "Executing: %s\n"
msgstr "В момента се изпълнява: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3514
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8434,11 +8650,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3520
msgid "and made changes to the index and/or the working tree\n"
msgstr "и променѝ индекса и/или работното дърво\n"
-#: sequencer.c:3510
+#: sequencer.c:3526
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8455,90 +8671,90 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3586
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "неправилно име на етикет: „%.*s“"
-#: sequencer.c:3645
+#: sequencer.c:3659
msgid "writing fake root commit"
msgstr "запазване на фалшиво начално подаване"
-#: sequencer.c:3650
+#: sequencer.c:3664
msgid "writing squash-onto"
msgstr "запазване на подаването, в което другите да се вкарат"
-#: sequencer.c:3734
+#: sequencer.c:3743
#, c-format
msgid "could not resolve '%s'"
msgstr "„%s“ не може да бъде открит"
-#: sequencer.c:3767
+#: sequencer.c:3775
msgid "cannot merge without a current revision"
msgstr "без текущо подаване не може да се слива"
-#: sequencer.c:3789
+#: sequencer.c:3797
#, c-format
msgid "unable to parse '%.*s'"
msgstr "„%.*s“ не може да се анализира"
-#: sequencer.c:3798
+#: sequencer.c:3806
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "няма нищо за сливане: „%.*s“"
-#: sequencer.c:3810
+#: sequencer.c:3818
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "върху начално подаване не може да се извърши множествено сливане"
-#: sequencer.c:3826
+#: sequencer.c:3873
#, c-format
msgid "could not get commit message of '%s'"
msgstr "съобщението за подаване към „%s“ не може да бъде получено"
-#: sequencer.c:4009
+#: sequencer.c:4019
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "сливането на „%.*s“ не може даже да започне"
-#: sequencer.c:4025
+#: sequencer.c:4035
msgid "merge: Unable to write new index file"
msgstr "сливане: новият индекс не може да бъде запазен"
-#: sequencer.c:4099
+#: sequencer.c:4116
msgid "Cannot autostash"
msgstr "Не може да се скатае автоматично"
-#: sequencer.c:4102
+#: sequencer.c:4119
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Неочакван резултат при скатаване: „%s“"
-#: sequencer.c:4108
+#: sequencer.c:4125
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Директорията за „%s“ не може да бъде създадена"
-#: sequencer.c:4111
+#: sequencer.c:4128
#, c-format
msgid "Created autostash: %s\n"
msgstr "Автоматично скатано: „%s“\n"
-#: sequencer.c:4115
+#: sequencer.c:4132
msgid "could not reset --hard"
msgstr "неуспешно изпълнение на „git reset --hard“"
-#: sequencer.c:4140
+#: sequencer.c:4157
#, c-format
msgid "Applied autostash.\n"
msgstr "Автоматично скатаното е приложено.\n"
-#: sequencer.c:4152
+#: sequencer.c:4169
#, c-format
msgid "cannot store %s"
msgstr "„%s“ не може да бъде запазен"
-#: sequencer.c:4155
+#: sequencer.c:4172
#, c-format
msgid ""
"%s\n"
@@ -8550,29 +8766,29 @@
"„git stash pop“ или да ги изхвърлите чрез „git stash drop“, когато "
"поискате.\n"
-#: sequencer.c:4160
+#: sequencer.c:4177
msgid "Applying autostash resulted in conflicts."
msgstr "Конфликти при прилагането на автоматично скатаното."
-#: sequencer.c:4161
+#: sequencer.c:4178
msgid "Autostash exists; creating a new stash entry."
msgstr "Вече има запис за автоматично скатано, затова се създава нов запис."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4252
msgid "could not detach HEAD"
msgstr "указателят „HEAD“ не може да се отдели"
-#: sequencer.c:4248
+#: sequencer.c:4267
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Бе спряно при „HEAD“\n"
-#: sequencer.c:4250
+#: sequencer.c:4269
#, c-format
msgid "Stopped at %s\n"
msgstr "Бе спряно при „%s“\n"
-#: sequencer.c:4258
+#: sequencer.c:4301
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8595,58 +8811,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4347
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Пребазиране (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4393
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Спиране при „%s“… %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4463
#, c-format
msgid "unknown command %d"
msgstr "непозната команда %d"
-#: sequencer.c:4480
+#: sequencer.c:4511
msgid "could not read orig-head"
msgstr "указателят за „orig-head“ не може да се прочете"
-#: sequencer.c:4485
+#: sequencer.c:4516
msgid "could not read 'onto'"
msgstr "указателят за „onto“ не може да се прочете"
-#: sequencer.c:4499
+#: sequencer.c:4530
#, c-format
msgid "could not update HEAD to %s"
msgstr "„HEAD“ не може да бъде обновен до „%s“"
-#: sequencer.c:4559
+#: sequencer.c:4590
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Успешно пребазиране и обновяване на „%s“.\n"
-#: sequencer.c:4611
+#: sequencer.c:4642
msgid "cannot rebase: You have unstaged changes."
msgstr "не може да пребазирате, защото има промени, които не са в индекса."
-#: sequencer.c:4620
+#: sequencer.c:4651
msgid "cannot amend non-existing commit"
msgstr "несъществуващо подаване не може да се поправи"
-#: sequencer.c:4622
+#: sequencer.c:4653
#, c-format
msgid "invalid file: '%s'"
msgstr "неправилен файл: „%s“"
-#: sequencer.c:4624
+#: sequencer.c:4655
#, c-format
msgid "invalid contents: '%s'"
msgstr "неправилно съдържание: „%s“"
-#: sequencer.c:4627
+#: sequencer.c:4658
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8656,59 +8872,69 @@
"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
"отново изпълнете „git rebase --continue“."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4694 sequencer.c:4733
#, c-format
msgid "could not write file: '%s'"
msgstr "файлът „%s“ не може да бъде записан"
-#: sequencer.c:4718
+#: sequencer.c:4749
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-#: sequencer.c:4725
+#: sequencer.c:4759
msgid "could not commit staged changes."
msgstr "промените в индекса не може да бъдат подадени."
-#: sequencer.c:4845
+#: sequencer.c:4879
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не може да се отбере „%s“"
-#: sequencer.c:4849
+#: sequencer.c:4883
#, c-format
msgid "%s: bad revision"
msgstr "%s: неправилна версия"
-#: sequencer.c:4884
+#: sequencer.c:4918
msgid "can't revert as initial commit"
msgstr "първоначалното подаване не може да бъде отменено"
-#: sequencer.c:5361
+#: sequencer.c:5189 sequencer.c:5418
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "прескачане на вече приложеното подаване „%s“"
+
+#: sequencer.c:5259 sequencer.c:5434
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+"може да включите пропуснатите подавания с опцията „--reapply-cherry-picks“"
+
+#: sequencer.c:5405
msgid "make_script: unhandled options"
msgstr "make_script: неподдържани опции"
-#: sequencer.c:5364
+#: sequencer.c:5408
msgid "make_script: error preparing revisions"
msgstr "make_script: грешка при подготовката на версии"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5666 sequencer.c:5683
msgid "nothing to do"
msgstr "няма какво да се прави"
-#: sequencer.c:5650
+#: sequencer.c:5702
msgid "could not skip unnecessary pick commands"
msgstr "излишните команди за отбиране не бяха прескочени"
-#: sequencer.c:5750
+#: sequencer.c:5802
msgid "the script was already rearranged."
msgstr "скриптът вече е преподреден."
-#: setup.c:133
+#: setup.c:134
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "„%s“ е извън хранилището при „%s“"
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -8719,7 +8945,7 @@
"\n"
" git КОМАНДА -- ПЪТ…"
-#: setup.c:198
+#: setup.c:199
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8732,12 +8958,12 @@
"\n"
" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-#: setup.c:264
+#: setup.c:265
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "опцията „%s“ трябва да е преди първия аргумент, който не е опция"
-#: setup.c:283
+#: setup.c:284
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -8749,103 +8975,103 @@
"\n"
" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-#: setup.c:419
+#: setup.c:420
msgid "unable to set up work tree using invalid config"
msgstr ""
"не може да се зададе текуща работна директория при неправилни настройки"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "тази команда трябва да се изпълни в работно дърво"
-#: setup.c:658
+#: setup.c:722
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Очаква се версия на хранилището на git <= %d, а не %d"
-#: setup.c:666
+#: setup.c:730
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "открито е непознато разширение в хранилището:"
msgstr[1] "открити са непознати разширения в хранилището:"
-#: setup.c:680
+#: setup.c:744
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "версията на хранилището е 0, но е открито разширение за версия 1:"
msgstr[1] "версията на хранилището е 0, но са открити разширения за версия 1:"
-#: setup.c:701
+#: setup.c:765
#, c-format
msgid "error opening '%s'"
msgstr "„%s“ не може да се отвори"
-#: setup.c:703
+#: setup.c:767
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "прекалено голям файл „.git“: „%s“"
-#: setup.c:705
+#: setup.c:769
#, c-format
msgid "error reading %s"
msgstr "грешка при прочитане на „%s“"
-#: setup.c:707
+#: setup.c:771
#, c-format
msgid "invalid gitfile format: %s"
msgstr "неправилен формат на gitfile: %s"
-#: setup.c:709
+#: setup.c:773
#, c-format
msgid "no path in gitfile: %s"
msgstr "липсва път в gitfile: „%s“"
-#: setup.c:711
+#: setup.c:775
#, c-format
msgid "not a git repository: %s"
msgstr "не е хранилище на Git: %s"
-#: setup.c:813
+#: setup.c:877
#, c-format
msgid "'$%s' too big"
msgstr "„%s“ е прекалено голям"
-#: setup.c:827
+#: setup.c:891
#, c-format
msgid "not a git repository: '%s'"
msgstr "не е хранилище на git: „%s“"
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
#, c-format
msgid "cannot chdir to '%s'"
msgstr "не може да се влезе в директорията „%s“"
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
msgid "cannot come back to cwd"
msgstr "процесът не може да се върне към предишната работна директория"
-#: setup.c:988
+#: setup.c:1052
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%*s%s%s“"
-#: setup.c:1231
+#: setup.c:1295
msgid "Unable to read current working directory"
msgstr "Текущата работна директория не може да бъде прочетена"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
#, c-format
msgid "cannot change to '%s'"
msgstr "не може да се влезе в директорията „%s“"
-#: setup.c:1251
+#: setup.c:1315
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
"нито тази, нито която и да е от по-горните директории, не е хранилище на "
"git: %s"
-#: setup.c:1257
+#: setup.c:1321
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -8856,7 +9082,7 @@
"Git работи в рамките на една файлова система, защото променливата на средата "
"„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
-#: setup.c:1381
+#: setup.c:1446
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8866,27 +9092,15 @@
"(0%.3o).\n"
"Собственикът на файла трябва да има права за писане и четене."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "неуспешно изпълнение на „open“ или „dup“ върху „/dev/null“"
-
-#: setup.c:1445
+#: setup.c:1508
msgid "fork failed"
msgstr "неуспешно създаване на процес чрез „fork“"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1513
msgid "setsid failed"
msgstr "неуспешно изпълнение на „setsid“"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "опит за ползване на частичен индекс без пътеводен режим"
-
-#: sparse-index.c:174
-msgid "unable to update cache-tree, staying full"
-msgstr "дървото на кеша не може да бъде обновено и остава пълно"
-
-#: sparse-index.c:261
+#: sparse-index.c:289
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "обектът в индекса е директория, но не частично изтеглена (%08x)"
@@ -8943,13 +9157,13 @@
msgstr[0] "%u байт/сек."
msgstr[1] "%u байта/сек."
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "„%s“ не може да бъде отворен за запис"
-#: strbuf.c:1177
+#: strbuf.c:1195
#, c-format
msgid "could not edit '%s'"
msgstr "„%s“ не може да се редактира"
@@ -8975,7 +9189,7 @@
msgid "invalid value for %s"
msgstr "Неправилна стойност за „%s“"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен"
@@ -9000,22 +9214,22 @@
msgid "staging updated .gitmodules failed"
msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "в неподготвения подмодул „%s“"
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Пътят „%s“ е в подмодула „%.*s“"
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "неправилен аргумент за „--ignore-submodules“: „%s“"
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -9024,12 +9238,12 @@
"Подмодулът при подаване %s на пътя „%s“ е различен от другия модул със "
"същото име, затова първият се прескача."
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!"
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -9038,36 +9252,36 @@
"Командата „git rev-list ПОДАВАНИЯ --not --remotes -n 1“ не може да се "
"изпълни в подмодула „%s“"
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "процесът за подмодула „%s“ завърши неуспешно"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Не може да се открие към какво сочи указателят „HEAD“"
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Изтласкване на подмодула „%s“\n"
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Подмодулът „%s“ не може да бъде изтласкан\n"
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Доставяне на подмодула „%s%s“\n"
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Подмодулът „%s“ не може да бъде достъпен\n"
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -9076,63 +9290,63 @@
"Грешки при доставяне на подмодул:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "„%s“ не е хранилище на git"
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr ""
"Командата „git status --porcelain=2“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr ""
"командата „git status --porcelain=2“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Настройката „core.worktree“ не може да се изтрие в подмодула „%s“"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "неуспешна обработка на поддиректориите в подмодула „%s“"
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "неуспешно зануляване на индекса на подмодула"
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "индексът на подмодула „%s“ не е чист"
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Подмодулът „%s“ не може да се обнови."
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "„%s“ (директория на подмодул) е в директорията на git: „%.*s“"
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -9140,17 +9354,17 @@
"не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно "
"работно дърво"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "името на подмодула „%s“ не може да бъде намерено"
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "„%s“ не може да се премести в съществуваща директория на git"
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -9161,11 +9375,11 @@
"„%s“ към\n"
"„%s“\n"
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "„ls-stat“ не може да се стартира в „..“"
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "„ls-tree“ завърши с неочакван изходен код: %d"
@@ -9187,7 +9401,7 @@
msgstr "непозната стойност „%s“ за настройката „%s“"
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "стойността „%s“ се повтаря в настройките"
@@ -9202,11 +9416,11 @@
msgid "could not read input file '%s'"
msgstr "входният файл „%s“ не може да бъде прочетен"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "от стандартния вход не може да се чете"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "Не може да се получи информация чрез „stat“ за „%s“"
@@ -9278,7 +9492,7 @@
msgid "error while running fast-import"
msgstr "грешка при изпълнението на бързо внасяне"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "указателят „%s“ не може да се прочете"
@@ -9296,7 +9510,7 @@
msgid "invalid remote service path"
msgstr "неправилен път на отдалечената услуга"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1479
msgid "operation not supported by protocol"
msgstr "опцията не се поддържа от протокола"
@@ -9305,7 +9519,7 @@
msgid "can't connect to subservice %s"
msgstr "неуспешно свързване към подуслугата „%s“"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr "опцията „--negotiate-only“ изисква версия 2 на протокола"
@@ -9319,63 +9533,62 @@
msgstr ""
"очаква се или успех, или грешка, но насрещната помощна програма върна „%s“"
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "насрещната помощна програма завърши с неочакван изходен код: „%s“"
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "насрещната помощна програма „%s“ не поддържа проби „dry-run“"
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "насрещната помощна програма „%s“ не поддържа опцията „--signed“"
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr ""
"насрещната помощна програма „%s“ не поддържа опцията „--signed=if-asked“"
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "насрещната помощна програма „%s“ не поддържа опцията „--atomic“"
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "насрещната помощна програма „%s“ не поддържа опцията „%s“"
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване"
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
"насрещната помощна програма не поддържа изтласкване. Необходимо е "
"изброяване на указателите"
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
-msgstr ""
-"насрещната помощна програма не поддържа „%s“ поддържа опцията „--force“"
+msgstr "насрещната помощна програма „%s“ не поддържа опцията „--force“"
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "не може да се извърши бързо изнасяне"
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "грешка при изпълнението на командата за бързо изнасяне"
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9384,52 +9597,52 @@
"Няма общи указатели, не са указани никакви указатели —\n"
"нищо няма да бъде направено. Пробвайте да укажете клон.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "обект с неподдържан формат „%s“"
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "неправилен отговор в списъка с указатели: „%s“"
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "неуспешно четене на „%s“"
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "неуспешен запис в „%s“"
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "неуспешно изпълнение на нишката „%s“"
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "завършването на нишката „%s“ не може да се изчака: „%s“"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“"
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“"
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "неуспешно изпълнение на „%s“"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "неуспешно стартиране на нишка за копиране на данните"
@@ -9443,47 +9656,47 @@
msgid "could not read bundle '%s'"
msgstr "пратката на git „%s“ не може да бъде прочетена"
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: неправилна опция за дълбочина: %s"
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
"За повече информация вижте раздела „protocol.version“ в „git help config“"
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "опциите на сървъра изискват поне версия 2 на протокола"
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr "сървърът не поддържа „wait-for-done“"
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "стойността на настройката „transport.color.*“ не може да се разпознае"
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "протокол версия 2 все още не се поддържа"
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "непозната стойност за настройката „%s“: „%s“"
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "преносът по „%s“ не е позволен"
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "командата „git-over-rsync“ вече не се поддържа"
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9492,7 +9705,7 @@
"Следните пътища за подмодули съдържат промени,\n"
"които липсват от всички отдалечени хранилища:\n"
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9517,11 +9730,11 @@
" git push\n"
"\n"
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr "Преустановяване на действието."
-#: transport.c:1346
+#: transport.c:1343
msgid "failed to push all needed submodules"
msgstr "неуспешно изтласкване на всички необходими подмодули"
@@ -9541,7 +9754,7 @@
msgid "too-short tree file"
msgstr "прекалено кратък файл-дърво"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9550,7 +9763,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 checkout:\n"
@@ -9559,7 +9772,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 merge:\n"
@@ -9568,7 +9781,7 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да слеете."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9577,7 +9790,7 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9586,7 +9799,7 @@
"„%s“ ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да извършите „%s“."
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9595,7 +9808,7 @@
"„%s“ ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -9604,7 +9817,16 @@
"Обновяването на следните директории ще изтрие неследените файлове в тях:\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Текущата работна директория няма да бъде изтрита:\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9613,7 +9835,7 @@
"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да преминете на друг клон."
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9622,7 +9844,7 @@
"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9631,7 +9853,7 @@
"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да слеете."
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9640,7 +9862,7 @@
"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9649,7 +9871,7 @@
"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9658,7 +9880,7 @@
"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9668,7 +9890,7 @@
"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да смените клон."
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9678,7 +9900,7 @@
"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9687,7 +9909,7 @@
"Сливането ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да слеете."
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9696,7 +9918,7 @@
"Сливането ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9705,7 +9927,7 @@
"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9714,12 +9936,12 @@
"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои."
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -9728,7 +9950,7 @@
"Подмодулът не може да бъде обновен:\n"
"„%s“"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -9739,7 +9961,7 @@
"изтегляне:\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9749,7 +9971,7 @@
"изтегляне:\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -9760,12 +9982,12 @@
"частично изтегляне:\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "Преустановяване на действието\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9776,11 +9998,11 @@
"\n"
" git sparse-checkout reapply\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "Обновяване на файлове"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -9790,17 +10012,17 @@
"във файлови системи, които не различават главни от малки букви)\n"
"и само един от участниците в конфликта е в работното дърво:\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1636
msgid "Updating index flags"
msgstr "Обновяване на флаговете на индекса"
-#: unpack-trees.c:2707
+#: unpack-trees.c:2803
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
"работното дърво и неследеното подаване съдържат повтарящи се обекти: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1565
msgid "expected flush after fetch arguments"
msgstr "след аргументите на „fetch“ се очаква изчистване на буферите"
@@ -9837,116 +10059,126 @@
msgid "Fetching objects"
msgstr "Доставяне на обектите"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "„%s“ не може да бъде прочетен"
-#: worktree.c:303
+#: worktree.c:305
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "„%s“ в основното работно дърво не е директорията на хранилището"
-#: worktree.c:314
+#: worktree.c:316
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"файлът „%s“ не съдържа абсолютния път към местоположението на работното дърво"
-#: worktree.c:326
+#: worktree.c:328
#, c-format
msgid "'%s' does not exist"
msgstr "„%s“ не съществува."
-#: worktree.c:332
+#: worktree.c:334
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "„%s“ не е файл на .git, код за грешка: %d"
-#: worktree.c:341
+#: worktree.c:343
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "„%s“ не сочи към обратно към „%s“"
-#: worktree.c:603
+#: worktree.c:604
msgid "not a directory"
msgstr "не е директория"
-#: worktree.c:612
+#: worktree.c:613
msgid ".git is not a file"
msgstr "„.git“ не е файл"
-#: worktree.c:614
+#: worktree.c:615
msgid ".git file broken"
msgstr "„.git“ е повреден"
-#: worktree.c:616
+#: worktree.c:617
msgid ".git file incorrect"
msgstr "„.git“ е неправилен"
-#: worktree.c:722
+#: worktree.c:723
msgid "not a valid path"
msgstr "неправилен път"
-#: worktree.c:728
+#: worktree.c:729
msgid "unable to locate repository; .git is not a file"
msgstr "не може да се открие хранилище: „.git“ не е файл"
-#: worktree.c:732
+#: worktree.c:733
msgid "unable to locate repository; .git file does not reference a repository"
msgstr "не може да се открие хранилище: файлът „.git“ не сочи към хранилище"
-#: worktree.c:736
+#: worktree.c:737
msgid "unable to locate repository; .git file broken"
msgstr "не може да се открие хранилище: „.git“ е повреден"
-#: worktree.c:742
+#: worktree.c:743
msgid "gitdir unreadable"
msgstr "директорията „gitdir“ не може да се прочете"
-#: worktree.c:746
+#: worktree.c:747
msgid "gitdir incorrect"
msgstr "неправилна директория „gitdir“"
-#: worktree.c:771
+#: worktree.c:772
msgid "not a valid directory"
msgstr "не е валидна директория"
-#: worktree.c:777
+#: worktree.c:778
msgid "gitdir file does not exist"
msgstr "файлът „gitdir“ не съществува"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "файлът „gitdir“ не може да бъде прочетен (%s)"
-#: worktree.c:801
+#: worktree.c:802
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr ""
"изчитането върна по-малко байтове от очакваното (очаквани: %<PRIuMAX> байта, "
"получени: %<PRIuMAX>)"
-#: worktree.c:809
+#: worktree.c:810
msgid "invalid gitdir file"
msgstr "неправилен файл „gitdir“"
-#: worktree.c:817
+#: worktree.c:818
msgid "gitdir file points to non-existent location"
msgstr "файлът „gitdir“ сочи несъществуващо местоположение"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "променливата на средата „%s“ не може да се зададе чрез „setenv“"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "пакетният файл „%s“ не може да бъде създаден"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "„%s“ не може да бъде отворен и за четене, и за запис"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "няма достъп до „%s“"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "текущата работна директория е недостъпна"
@@ -9987,11 +10219,11 @@
msgstr ""
" (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
msgid "Changes to be committed:"
msgstr "Промени, които ще бъдат подадени:"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
msgid "Changes not staged for commit:"
msgstr "Промени, които не са в индекса за подаване:"
@@ -10096,22 +10328,22 @@
msgid "untracked content, "
msgstr "неследено съдържание, "
-#: wt-status.c:958
+#: wt-status.c:964
#, 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:989
+#: wt-status.c:995
msgid "Submodules changed but not updated:"
msgstr "Подмодулите са променени, но не са обновени:"
-#: wt-status.c:991
+#: wt-status.c:997
msgid "Submodule changes to be committed:"
msgstr "Промени в подмодулите за подаване:"
-#: wt-status.c:1073
+#: wt-status.c:1079
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -10119,7 +10351,7 @@
"Не променяйте и не изтривайте горния ред.\n"
"Всичко отдолу ще бъде изтрито."
-#: wt-status.c:1165
+#: wt-status.c:1171
#, c-format
msgid ""
"\n"
@@ -10130,275 +10362,282 @@
"Изчисляването на броя различаващи се подавания отне %.2f сек.\n"
"За да избегнете това, ползвайте „--no-ahead-behind“.\n"
-#: wt-status.c:1195
+#: wt-status.c:1201
msgid "You have unmerged paths."
msgstr "Някои пътища не са слети."
-#: wt-status.c:1198
+#: wt-status.c:1204
msgid " (fix conflicts and run \"git commit\")"
msgstr " (коригирайте конфликтите и изпълнете „git commit“)"
-#: wt-status.c:1200
+#: wt-status.c:1206
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (използвайте „git merge --abort“, за да преустановите сливането)"
-#: wt-status.c:1204
+#: wt-status.c:1210
msgid "All conflicts fixed but you are still merging."
msgstr "Всички конфликти са решени, но продължавате сливането."
-#: wt-status.c:1207
+#: wt-status.c:1213
msgid " (use \"git commit\" to conclude merge)"
msgstr " (използвайте „git commit“, за да завършите сливането)"
-#: wt-status.c:1216
+#: wt-status.c:1224
msgid "You are in the middle of an am session."
msgstr "В момента прилагате поредица от кръпки чрез „git am“."
-#: wt-status.c:1219
+#: wt-status.c:1227
msgid "The current patch is empty."
msgstr "Текущата кръпка е празна."
-#: wt-status.c:1223
+#: wt-status.c:1232
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)"
-#: wt-status.c:1225
+#: wt-status.c:1234
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (използвайте „git am --allow-empty“, за да включите кръпката като празно "
+"подаване)"
+
+#: wt-status.c:1239
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (използвайте „git am --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1360
+#: wt-status.c:1372
msgid "git-rebase-todo is missing."
msgstr "„git-rebase-todo“ липсва."
-#: wt-status.c:1362
+#: wt-status.c:1374
msgid "No commands done."
msgstr "Не са изпълнени команди."
-#: wt-status.c:1365
+#: wt-status.c:1377
#, 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:1376
+#: wt-status.c:1388
#, c-format
msgid " (see more in file %s)"
msgstr " (повече информация има във файла „%s“)"
-#: wt-status.c:1381
+#: wt-status.c:1393
msgid "No commands remaining."
msgstr "Не остават повече команди."
-#: wt-status.c:1384
+#: wt-status.c:1396
#, 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:1392
+#: wt-status.c:1404
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
" (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
-#: wt-status.c:1404
+#: wt-status.c:1416
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "В момента пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1409
+#: wt-status.c:1421
msgid "You are currently rebasing."
msgstr "В момента пребазирате."
-#: wt-status.c:1422
+#: wt-status.c:1434
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)"
-#: wt-status.c:1424
+#: wt-status.c:1436
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1426
+#: wt-status.c:1438
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (използвайте „git rebase --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1433
+#: wt-status.c:1445
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (всички конфликти са коригирани: изпълнете „git rebase --continue“)"
-#: wt-status.c:1437
+#: wt-status.c:1449
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1442
+#: wt-status.c:1454
msgid "You are currently splitting a commit during a rebase."
msgstr "В момента разделяте подаване докато пребазирате."
-#: wt-status.c:1445
+#: wt-status.c:1457
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (След като работното ви дърво стане чисто, използвайте „git rebase --"
"continue“)"
-#: wt-status.c:1449
+#: wt-status.c:1461
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1454
+#: wt-status.c:1466
msgid "You are currently editing a commit during a rebase."
msgstr "В момента редактирате подаване докато пребазирате."
-#: wt-status.c:1457
+#: wt-status.c:1469
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (използвайте „git commit --amend“, за да редактирате текущото подаване)"
-#: wt-status.c:1459
+#: wt-status.c:1471
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (използвайте „git rebase --continue“, след като завършите промените си)"
-#: wt-status.c:1470
+#: wt-status.c:1482
msgid "Cherry-pick currently in progress."
msgstr "В момента се извършва отбиране на подавания."
-#: wt-status.c:1473
+#: wt-status.c:1485
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "В момента отбирате подаването „%s“."
-#: wt-status.c:1480
+#: wt-status.c:1492
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1483
+#: wt-status.c:1495
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (за да продължите, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1486
+#: wt-status.c:1498
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1488
+#: wt-status.c:1500
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (използвайте „git cherry-pick --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1490
+#: wt-status.c:1502
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (използвайте „git cherry-pick --abort“, за да отмените всички действия с "
"отбиране)"
-#: wt-status.c:1500
+#: wt-status.c:1512
msgid "Revert currently in progress."
msgstr "В момента тече отмяна на подаване."
-#: wt-status.c:1503
+#: wt-status.c:1515
#, c-format
msgid "You are currently reverting commit %s."
msgstr "В момента отменяте подаване „%s“."
-#: wt-status.c:1509
+#: wt-status.c:1521
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)"
-#: wt-status.c:1512
+#: wt-status.c:1524
msgid " (run \"git revert --continue\" to continue)"
msgstr " (за да продължите, изпълнете „git revert --continue“)"
-#: wt-status.c:1515
+#: wt-status.c:1527
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)"
-#: wt-status.c:1517
+#: wt-status.c:1529
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (използвайте „git revert --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1519
+#: wt-status.c:1531
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (използвайте „git revert --abort“, за да преустановите отмяната на "
"подаване)"
-#: wt-status.c:1529
+#: wt-status.c:1541
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "В момента търсите двоично, като сте стартирали от клон „%s“."
-#: wt-status.c:1533
+#: wt-status.c:1545
msgid "You are currently bisecting."
msgstr "В момента търсите двоично."
-#: wt-status.c:1536
+#: wt-status.c:1548
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (използвайте „git bisect reset“, за да се върнете към първоначалното "
"състояние и клон)"
-#: wt-status.c:1547
+#: wt-status.c:1559
msgid "You are in a sparse checkout."
msgstr "Вие сте в частично изтегляне."
-#: wt-status.c:1550
+#: wt-status.c:1562
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
"Намирате се в частично изтеглено хранилище с %d%% налични, следени файла."
-#: wt-status.c:1794
+#: wt-status.c:1806
msgid "On branch "
msgstr "На клон "
-#: wt-status.c:1801
+#: wt-status.c:1813
msgid "interactive rebase in progress; onto "
msgstr "извършвате интерактивно пребазиране върху "
-#: wt-status.c:1803
+#: wt-status.c:1815
msgid "rebase in progress; onto "
msgstr "извършвате пребазиране върху "
-#: wt-status.c:1808
+#: wt-status.c:1820
msgid "HEAD detached at "
msgstr "Указателят „HEAD“ не е свързан и е при "
-#: wt-status.c:1810
+#: wt-status.c:1822
msgid "HEAD detached from "
msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
-#: wt-status.c:1813
+#: wt-status.c:1825
msgid "Not currently on any branch."
msgstr "Извън всички клони."
-#: wt-status.c:1830
+#: wt-status.c:1842
msgid "Initial commit"
msgstr "Първоначално подаване"
-#: wt-status.c:1831
+#: wt-status.c:1843
msgid "No commits yet"
msgstr "Все още липсват подавания"
-#: wt-status.c:1845
+#: wt-status.c:1857
msgid "Untracked files"
msgstr "Неследени файлове"
-#: wt-status.c:1847
+#: wt-status.c:1859
msgid "Ignored files"
msgstr "Игнорирани файлове"
-#: wt-status.c:1851
+#: wt-status.c:1863
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10410,32 +10649,32 @@
"изпълнението, но ще трябва да добавяте новите файлове ръчно.\n"
"За повече подробности погледнете „git status help“."
-#: wt-status.c:1857
+#: wt-status.c:1869
#, c-format
msgid "Untracked files not listed%s"
msgstr "Неследените файлове не са изведени%s"
-#: wt-status.c:1859
+#: wt-status.c:1871
msgid " (use -u option to show untracked files)"
msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)"
-#: wt-status.c:1865
+#: wt-status.c:1877
msgid "No changes"
msgstr "Няма промени"
-#: wt-status.c:1870
+#: wt-status.c:1882
#, 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:1874
+#: wt-status.c:1886
#, c-format
msgid "no changes added to commit\n"
msgstr "към индекса за подаване не са добавени промени\n"
-#: wt-status.c:1878
+#: wt-status.c:1890
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -10444,89 +10683,89 @@
"към индекса за подаване не са добавени промени, но има нови файлове "
"(използвайте „git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1882
+#: wt-status.c:1894
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n"
-#: wt-status.c:1886
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"липсват каквито и да е промени (създайте или копирайте файлове и използвайте "
"„git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
#, c-format
msgid "nothing to commit\n"
msgstr "липсват каквито и да е промени\n"
-#: wt-status.c:1893
+#: wt-status.c:1905
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и "
"неследените файлове)\n"
-#: wt-status.c:1898
+#: wt-status.c:1910
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "липсват каквито и да е промени, работното дърво е чисто\n"
-#: wt-status.c:2003
+#: wt-status.c:2015
msgid "No commits yet on "
msgstr "Все още липсват подавания в "
-#: wt-status.c:2007
+#: wt-status.c:2019
msgid "HEAD (no branch)"
msgstr "HEAD (извън клон)"
-#: wt-status.c:2038
+#: wt-status.c:2050
msgid "different"
msgstr "различен"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
msgid "behind "
msgstr "назад с "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
msgid "ahead "
msgstr "напред с "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "не може да извършите „%s“, защото има промени, които не са в индекса."
-#: wt-status.c:2575
+#: wt-status.c:2602
msgid "additionally, your index contains uncommitted changes."
msgstr "освен това в индекса има неподадени промени."
-#: wt-status.c:2577
+#: wt-status.c:2604
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "не може да извършите „%s“, защото в индекса има неподадени промени."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "командата за комуникация между процеси не може да бъде пратена"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "отговорът за комуникацията между процеси не може да бъде прочетен"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "неуспешно изпълнение на „accept_thread“ върху нишката „%s“"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "не може да се стартира нишката worker[0] за „%s“"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "неуспешно изтриване на „%s“"
@@ -10535,136 +10774,142 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "правата на „%2$s“ не може да се зададат да са %1$cx"
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "неочакван изходен код при генериране на разлика: %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "неуспешно обновяване на файловете"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "изтриване на „%s“\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "Промени, които и след обновяването на индекса не са добавени към него:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Файлът „%s“ не може да бъде отворен за запис."
-
-#: builtin/add.c:322
+#: builtin/add.c:326
msgid "Could not write patch"
msgstr "Кръпката не може да бъде записана"
-#: builtin/add.c:325
+#: builtin/add.c:329
msgid "editing patch failed"
msgstr "неуспешно редактиране на кръпка"
-#: builtin/add.c:328
+#: builtin/add.c:332
#, c-format
msgid "Could not stat '%s'"
msgstr "Не може да се получи информация чрез „stat“ за файла „%s“"
-#: builtin/add.c:330
+#: builtin/add.c:334
msgid "Empty patch. Aborted."
msgstr "Празна кръпка, преустановяване на действието."
-#: builtin/add.c:335
+#: builtin/add.c:340
#, c-format
msgid "Could not apply '%s'"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: builtin/add.c:343
+#: builtin/add.c:348
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "пробно изпълнение"
-#: builtin/add.c:366
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "повече подробности"
+
+#: builtin/add.c:371
msgid "interactive picking"
msgstr "интерактивно отбиране на промени"
-#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
msgid "select hunks interactively"
msgstr "интерактивен избор на парчета код"
-#: builtin/add.c:368
+#: builtin/add.c:373
msgid "edit current diff and apply"
msgstr "редактиране на текущата разлика и прилагане"
-#: builtin/add.c:369
+#: builtin/add.c:374
msgid "allow adding otherwise ignored files"
msgstr "добавяне и на иначе игнорираните файлове"
-#: builtin/add.c:370
+#: builtin/add.c:375
msgid "update tracked files"
msgstr "обновяване на следените файлове"
-#: builtin/add.c:371
+#: builtin/add.c:376
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "уеднаквяване на знаците за край на файл (включва опцията „-u“)"
-#: builtin/add.c:372
+#: builtin/add.c:377
msgid "record only the fact that the path will be added later"
msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно"
-#: builtin/add.c:373
+#: builtin/add.c:378
msgid "add changes from all tracked and untracked files"
msgstr "добавяне на всички промени в следените и неследените файлове"
-#: builtin/add.c:376
+#: builtin/add.c:381
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"игнориране на пътищата, които са изтрити от работното дърво (същото като „--"
"no-all“)"
-#: builtin/add.c:378
+#: builtin/add.c:383
msgid "don't add, only refresh the index"
msgstr "без добавяне на нови файлове, само обновяване на индекса"
-#: builtin/add.c:379
+#: builtin/add.c:384
msgid "just skip files which cannot be added because of errors"
msgstr "прескачане на файловете, които не може да бъдат добавени поради грешки"
-#: builtin/add.c:380
+#: builtin/add.c:385
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"проверка, че при пробно изпълнение всички файлове, дори и изтритите, се "
"игнорират"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr ""
+"обновяване и на записите извън пътеводния сегмент на частичното изтегляне"
+
+#: builtin/add.c:388 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "изрично задаване на стойността на флага дали файлът е изпълним"
-#: builtin/add.c:384
+#: builtin/add.c:390
msgid "warn when adding an embedded repository"
msgstr "предупреждаване при добавяне на вградено хранилище"
-#: builtin/add.c:386
+#: builtin/add.c:392
msgid "backend for `git stash -p`"
msgstr "реализация на „git stash -p“"
-#: builtin/add.c:404
+#: builtin/add.c:410
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10695,12 +10940,12 @@
"\n"
"За повече информация погледнете „git help submodule“."
-#: builtin/add.c:432
+#: builtin/add.c:439
#, c-format
msgid "adding embedded git repository: %s"
msgstr "добавяне на вградено хранилище: %s"
-#: builtin/add.c:451
+#: builtin/add.c:459
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10711,56 +10956,27 @@
"\n"
" git config advice.addIgnoredFile false"
-#: builtin/add.c:460
+#: builtin/add.c:474
msgid "adding files failed"
msgstr "неуспешно добавяне на файлове"
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr ""
-"опцията „--dry-run“ е несъвместима с всяка от опциите „--interactive“/„--"
-"patch“"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr ""
-"опцията „--pathspec-from-file“ е несъвместима с всяка от опциите „--"
-"interactive“/„--patch“"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "опциите „--pathspec-from-file“ и „--edit“ са несъвместими"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "опциите „-A“ и „-u“ са несъвместими"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "опцията „--ignore-missing“ изисква „--dry-run“"
-
-#: builtin/add.c:526
+#: builtin/add.c:548
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“"
-#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr ""
-"опцията „--pathspec-from-file“ е несъвместима с аргументи, указващи пътища"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "опцията „%s“ и път са несъвместими"
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "опцията „--pathspec-file-nul“ изисква опция „--pathspec-from-file“"
-
-#: builtin/add.c:555
+#: builtin/add.c:580
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Нищо не е зададено и нищо не е добавено.\n"
-#: builtin/add.c:557
+#: builtin/add.c:582
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10771,110 +10987,128 @@
"\n"
" git config advice.addEmptyPathspec false"
-#: builtin/am.c:365
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "Неправилна стойност за „--empty“: „%s“"
+
+#: builtin/am.c:392
msgid "could not parse author script"
msgstr "скриптът за автор не може да се анализира"
-#: builtin/am.c:455
+#: builtin/am.c:482
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
-#: builtin/am.c:497
+#: builtin/am.c:524
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Даденият входен ред е с неправилен формат: „%s“."
-#: builtin/am.c:535
+#: builtin/am.c:562
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Бележката не може да се копира от „%s“ към „%s“"
-#: builtin/am.c:561
+#: builtin/am.c:588
msgid "fseek failed"
msgstr "неуспешно изпълнение на „fseek“"
-#: builtin/am.c:749
+#: builtin/am.c:776
#, c-format
msgid "could not parse patch '%s'"
msgstr "кръпката „%s“ не може да се анализира"
-#: builtin/am.c:814
+#: builtin/am.c:841
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
"Само една поредица от кръпки от „StGIT“ може да бъде прилагана в даден момент"
-#: builtin/am.c:862
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "неправилна стойност за време"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:894 builtin/am.c:906
msgid "invalid Date line"
msgstr "неправилен ред за дата „Date“"
-#: builtin/am.c:874
+#: builtin/am.c:901
msgid "invalid timezone offset"
msgstr "неправилно отместване на часовия пояс"
-#: builtin/am.c:967
+#: builtin/am.c:994
msgid "Patch format detection failed."
msgstr "Форматът на кръпката не може да бъде определен."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:999 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/am.c:977
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Кръпките не може да бъдат разделени."
-#: builtin/am.c:1126
+#: builtin/am.c:1153
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "След коригирането на този проблем изпълнете „%s --continue“."
+msgstr ""
+"След коригирането на този проблем изпълнете:\n"
+"\n"
+" %s --continue“"
-#: builtin/am.c:1127
+#: builtin/am.c:1154
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“."
+msgstr ""
+"Ако предпочитате да прескочите тази кръпка, изпълнете:\n"
+"\n"
+" %s --skip"
-#: builtin/am.c:1128
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"За да включите празната кръпка като празно подаване, изпълнете:\n"
+"\n"
+" %s --allow-empty"
+
+#: builtin/am.c:1161
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“."
+msgstr ""
+"За да се върнете към първоначалното състояние, изпълнете:\n"
+"\n"
+" %s --abort"
-#: builtin/am.c:1223
+#: builtin/am.c:1256
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Кръпката е пратена с форматиране „format=flowed“. Празните знаци в края на "
"редовете може да се загубят."
-#: builtin/am.c:1251
-msgid "Patch is empty."
-msgstr "Кръпката е празна."
-
-#: builtin/am.c:1316
+#: builtin/am.c:1344
#, c-format
msgid "missing author line in commit %s"
msgstr "липсва ред за авторство в подаването „%s“"
-#: builtin/am.c:1319
+#: builtin/am.c:1347
#, c-format
msgid "invalid ident line: %.*s"
msgstr "грешен ред с идентичност: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1566
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"В хранилището липсват необходимите обекти-BLOB, за да се премине към тройно "
"сливане."
-#: builtin/am.c:1540
+#: builtin/am.c:1568
msgid "Using index info to reconstruct a base tree..."
msgstr "Базовото дърво се реконструира от информацията в индекса…"
-#: builtin/am.c:1559
+#: builtin/am.c:1587
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10882,24 +11116,24 @@
"Кръпката не може да се приложи към обектите-BLOB в индекса.\n"
"Да не би да сте я редактирали на ръка?"
-#: builtin/am.c:1565
+#: builtin/am.c:1593
msgid "Falling back to patching base and 3-way merge..."
msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…"
-#: builtin/am.c:1591
+#: builtin/am.c:1619
msgid "Failed to merge in the changes."
msgstr "Неуспешно сливане на промените."
-#: builtin/am.c:1623
+#: builtin/am.c:1651
msgid "applying to an empty history"
msgstr "прилагане върху празна история"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1703 builtin/am.c:1707
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "не може да се продължи — „%s“ не съществува."
-#: builtin/am.c:1697
+#: builtin/am.c:1725
msgid "Commit Body is:"
msgstr "Тялото на кръпката за прилагане е:"
@@ -10907,45 +11141,63 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1735
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
"на всичко:"
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1781 builtin/commit.c:409
msgid "unable to write index file"
msgstr "индексът не може да бъде записан"
-#: builtin/am.c:1757
+#: builtin/am.c:1785
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
"Индексът не е чист: кръпките не може да бъдат приложени (замърсени са: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Прескачане: %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Създаване на празно подаване: %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Кръпката е празна."
+
+#: builtin/am.c:1847 builtin/am.c:1916
#, c-format
msgid "Applying: %.*s"
msgstr "Прилагане: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1864
msgid "No changes -- Patch already applied."
msgstr "Без промени — кръпката вече е приложена."
-#: builtin/am.c:1820
+#: builtin/am.c:1870
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Неуспешно прилагане на кръпка при %s %.*s“"
-#: builtin/am.c:1824
+#: builtin/am.c:1874
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"За да видите неуспешно приложени кръпки, използвайте:\n"
"\n"
" git am --show-current-patch=diff"
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "Няма промени — създаване на празно подаване."
+
+#: builtin/am.c:1922
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10955,7 +11207,7 @@
"Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n"
"кръпка е довела до същите промени и в такъв случай просто пропуснете тази."
-#: builtin/am.c:1875
+#: builtin/am.c:1930
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10966,17 +11218,17 @@
"След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n"
"За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
#, c-format
msgid "Could not parse object '%s'."
msgstr "„%s“ не е разпознат като обект."
-#: builtin/am.c:2034
+#: builtin/am.c:2090 builtin/am.c:2166
msgid "failed to clean index"
msgstr "индексът не може да бъде изчистен"
-#: builtin/am.c:2078
+#: builtin/am.c:2134
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10987,166 +11239,173 @@
"сочи към\n"
"„ORIG_HEAD“"
-#: builtin/am.c:2185
+#: builtin/am.c:2242
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Неправилна стойност за „--patch-format“: „%s“"
-#: builtin/am.c:2227
+#: builtin/am.c:2285
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Неправилна стойност за „--show-current-patch“: „%s“"
-#: builtin/am.c:2231
+#: builtin/am.c:2289
#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr ""
-"опциите „--show-current-patch=%s“ и „--show-current-patch=%s“ са несъвместими"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "опциите „%s=%s“ и „%s=%s“ са несъвместими"
-#: builtin/am.c:2262
+#: builtin/am.c:2320
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]"
-#: builtin/am.c:2263
+#: builtin/am.c:2321
msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
+msgstr "git am [ОПЦИЯ…] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2327
msgid "run interactively"
msgstr "интерактивна работа"
-#: builtin/am.c:2271
+#: builtin/am.c:2329
msgid "historical option -- no-op"
msgstr "изоставена опция, съществува по исторически причини, нищо не прави"
-#: builtin/am.c:2273
+#: builtin/am.c:2331
msgid "allow fall back on 3way merging if needed"
msgstr "да се преминава към тройно сливане при нужда."
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
msgid "be quiet"
msgstr "без извеждане на информация"
-#: builtin/am.c:2276
+#: builtin/am.c:2334
msgid "add a Signed-off-by trailer to the commit message"
msgstr "добавяне на епилог за подпис „Signed-off-by“ в съобщението за подаване"
-#: builtin/am.c:2279
+#: builtin/am.c:2337
msgid "recode into utf8 (default)"
msgstr "прекодиране в UTF-8 (стандартно)"
-#: builtin/am.c:2281
+#: builtin/am.c:2339
msgid "pass -k flag to git-mailinfo"
msgstr "подаване на опцията „-k“ на командата „git-mailinfo“"
-#: builtin/am.c:2283
+#: builtin/am.c:2341
msgid "pass -b flag to git-mailinfo"
msgstr "подаване на опцията „-b“ на командата „git-mailinfo“"
-#: builtin/am.c:2285
+#: builtin/am.c:2343
msgid "pass -m flag to git-mailinfo"
msgstr "подаване на опцията „-m“ на командата „git-mailinfo“"
-#: builtin/am.c:2287
+#: builtin/am.c:2345
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
"подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
-#: builtin/am.c:2290
+#: builtin/am.c:2348
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо "
"от „am.keepcr“"
-#: builtin/am.c:2293
+#: builtin/am.c:2351
msgid "strip everything before a scissors line"
msgstr "пропускане на всичко преди реда за отрязване"
-#: builtin/am.c:2295
+#: builtin/am.c:2353
msgid "pass it through git-mailinfo"
msgstr "прекарване през „git-mailinfo“"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
msgid "pass it through git-apply"
msgstr "прекарване през „git-apply“"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
#: parse-options.h:317
msgid "n"
msgstr "БРОЙ"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "ФОРМАТ"
-#: builtin/am.c:2322
+#: builtin/am.c:2380
msgid "format the patch(es) are in"
msgstr "формат на кръпките"
-#: builtin/am.c:2328
+#: builtin/am.c:2386
msgid "override error message when patch failure occurs"
msgstr "избрано от вас съобщение за грешка при прилагане на кръпки"
-#: builtin/am.c:2330
+#: builtin/am.c:2388
msgid "continue applying patches after resolving a conflict"
msgstr "продължаване на прилагането на кръпки след коригирането на конфликт"
-#: builtin/am.c:2333
+#: builtin/am.c:2391
msgid "synonyms for --continue"
msgstr "псевдоними на „--continue“"
-#: builtin/am.c:2336
+#: builtin/am.c:2394
msgid "skip the current patch"
msgstr "прескачане на текущата кръпка"
-#: builtin/am.c:2339
+#: builtin/am.c:2397
msgid "restore the original branch and abort the patching operation"
msgstr ""
"възстановяване на първоначалното състояние на клона и преустановяване на "
"прилагането на кръпката"
-#: builtin/am.c:2342
+#: builtin/am.c:2400
msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
"преустановяване на прилагането на кръпката без промяна към кое сочи „HEAD“"
-#: builtin/am.c:2346
+#: builtin/am.c:2404
msgid "show the patch being applied"
msgstr "показване на прилаганата кръпка"
-#: builtin/am.c:2351
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "прилагане на празна кръпка като празно подаване"
+
+#: builtin/am.c:2412
msgid "lie about committer date"
msgstr "дата за подаване различна от първоначалната"
-#: builtin/am.c:2353
+#: builtin/am.c:2414
msgid "use current timestamp for author date"
msgstr "използване на текущото време като това за автор"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2417 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "подписване на подаванията с GPG"
-#: builtin/am.c:2359
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "как да се обработват празните подавания"
+
+#: builtin/am.c:2423
msgid "(internal use for git-rebase)"
msgstr "(ползва се вътрешно за „git-rebase“)"
-#: builtin/am.c:2377
+#: builtin/am.c:2441
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."
@@ -11154,18 +11413,18 @@
"Опциите „-b“/„--binary“ отдавна не правят нищо и\n"
"ще бъдат премахнати в бъдеще. Не ги ползвайте."
-#: builtin/am.c:2384
+#: builtin/am.c:2448
msgid "failed to read the index"
msgstr "неуспешно изчитане на индекса"
-#: builtin/am.c:2399
+#: builtin/am.c:2463
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"предишната директория за пребазиране „%s“ все още съществува, а е зададен "
"файл „mbox“."
-#: builtin/am.c:2423
+#: builtin/am.c:2487
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -11174,11 +11433,11 @@
"Открита е излишна директория „%s“.\n"
"Може да я изтриете с командата „git am --abort“."
-#: builtin/am.c:2429
+#: builtin/am.c:2493
msgid "Resolve operation not in progress, we are not resuming."
msgstr "В момента не тече операция по коригиране и няма как да се продължи."
-#: builtin/am.c:2439
+#: builtin/am.c:2503
msgid "interactive mode requires patches on the command line"
msgstr "интерактивният режим изисква кръпки на командния ред"
@@ -11186,45 +11445,36 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [ОПЦИЯ…] [КРЪПКА…]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "архивният файл „%s“ не може да бъде създаден"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "изходът не може да бъде пренасочен"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Липсва адрес за отдалеченото хранилище"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
"git archive: очакваше се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: получен е „NACK“ — %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: протоколна грешка"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: очакваше се изчистване на буферите чрез „flush“"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [ПОДАВАНЕ]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check ЛОШО ДОБРО УПРАВЛЯВАЩА_ДУМА"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -11248,60 +11498,73 @@
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr "git bisect--helper --bisect-reset (ЛОШО) [ВЕРСИЯ]"
+msgstr "git bisect--helper --bisect-state (ЛОШО) [ВЕРСИЯ]"
#: builtin/bisect--helper.c:30
msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr "git bisect--helper --bisect-reset (ДОБРО) [ВЕРСИЯ…]"
+msgstr "git bisect--helper --bisect-state (ДОБРО) [ВЕРСИЯ…]"
#: builtin/bisect--helper.c:31
msgid "git bisect--helper --bisect-replay <filename>"
-msgstr "git bisect--helper --bisect-next ИМЕ_НА_ФАЙЛ"
+msgstr "git bisect--helper --bisect-replay ИМЕ_НА_ФАЙЛ"
#: builtin/bisect--helper.c:32
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr "git bisect--helper --bisect-reset [(ВЕРСИЯ|ДИАПАЗОН)…]"
+msgstr "git bisect--helper --bisect-skip [(ВЕРСИЯ|ДИАПАЗОН)…]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run КОМАНДА…"
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "файлът „%s“ не може да се отвори в режим „%s“"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "във файла „%s“ не може да се пише"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "файлът „%s“ не може да бъде отворен за четене"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "„%s“ е неправилна управляваща дума"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "„%s“ е вградена команда и не може да се използва като управляваща дума"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "не може да смените значението на управляващата дума „%s“"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "използвайте две различни управляващи думи"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "В момента не се извършва двоично търсене.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "„%s“ не е подаване"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11309,27 +11572,27 @@
"първоначално указаното „%s“ в указателя „HEAD“ не може да бъде\n"
"изтеглено. Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Неправилен аргумент на функцията „bisect_write“: „%s“"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "идентификаторът на обект на версия „%s“ не може да бъде получен"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "файлът „%s“ не може да бъде отворен"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Неправилна команда: в момента се изпълнява двоично търсене по %s/%s."
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -11338,7 +11601,7 @@
"Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n"
"направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11349,7 +11612,7 @@
"Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n"
"направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "двоично търсене само по „%s“ подаване."
@@ -11358,15 +11621,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не"
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "не са указани управляващи думи"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11375,7 +11638,7 @@
"Текущите управляващи думи са: %s за старото състояние\n"
"и %s за новото състояние.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11384,56 +11647,56 @@
"на „git bisect terms“ е подаден неправилен аргумент „%s“\n"
"Поддържат се опциите „--term-good“/„--term-old“ и „--term-bad„/„--term-new“."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "неуспешно настройване на обхождането на версиите\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "файлът „%s“ не може да се отвори за добавяне"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "„“ е неправилна управляваща дума"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "непозната опция: %s"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "„%s“ не изглежда като указател към версия"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "Неправилен указател „HEAD“"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"Неуспешно преминаване към „%s“. Изпълнете командата „git bisect start "
"СЪЩЕСТВУВАЩ_КЛОН“."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
"не може да се търси двоично, когато е изпълнена командата „cg-seek“ от "
"„cogito“"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "Неправилен указател „HEAD“ — необичаен символен указател"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "неправилен указател: „%s“"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Започнете като изпълните командата „git bisect start“\n"
@@ -11441,108 +11704,158 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Да се извърши ли автоматично? „Y“ — ДА, „n“ — не"
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "опцията „--bisect-state“ изисква поне един аргумент"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "Командата „git bisect %s“ приема само един аргумент."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Неправилна версия: „%s“"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Неправилна версия (не е подаване): „%s“"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "В момента не се извършва двоично търсене."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr ""
"Непозната команда „%s“. Възможностите са: „start“, „skip“, „good“, „bad“ (и "
"вариантите им)"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr ""
"файлът „%s“ не може да бъде прочетен, за да се изпълнят командите от него "
"наново"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "неуспешно двоично търсене, не е зададена команда."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "изпълнение на %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"неуспешно двоично търсене: изходният код от командата „%2$s“ е %1$d — това е "
+"извън интервала [0, 128)"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "файлът „%s“ не може да бъде отворен за запис"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "двоичното търсене не може да продължи"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "успешно двоично търсене"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "двоичното търсене откри първото лошо подаване"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"неуспешно двоично търсене: „git bisect--helper --bisect-state %s“ завърши с "
+"код за грешка: %d"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "изчистване на състоянието на двоичното търсене"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "проверка дали съществуват одобряващи/отхвърлящи управляващи думи"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "извеждане на управляващите думи"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "начало на двоично търсене"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "откриване на следващото подаване при двоично търсене"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "задаване на състоянието на указателя/ите"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "извеждане на стъпките на двоичното търсене досега"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "наново изпълнение на двоичното търсене чрез дадения файл"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "прескачане на някои подавания при изтегляне"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "визуализиране на двоичното търсене"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr ""
+"за автоматично определяне на състоянието при двоичното търсене да се ползва "
+"тази КОМАНДА…"
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "липсва запис за „BISECT_WRITE“"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "опцията „--bisect-reset“ изисква или 0 аргументи, или 1 — подаване"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "опцията „--bisect-next-check“ изисква 2 или 3 аргумента"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "опцията „--bisect-terms“ изисква 0 или 1 аргумента"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "опцията „--bisect-next“ не приема аргументи"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "опцията „--bisect-log“ не приема аргументи"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "не е зададен журнален файл"
@@ -11554,167 +11867,169 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "трябва да е цвят: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "трябва да завършва с цвят"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "неправилен цвят „%s“ в „color.blame.repeatedLines“"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "неправилна стойност за „blame.coloring“"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "версията за прескачане „%s“ не може да бъде открита"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr "извеждане на авторството с намирането му, последователно"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr ""
"без извеждане на имената на обектите за граничните подавания (стандартно "
"опцията е изключена)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr ""
"началните подавания да не се считат за гранични (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "извеждане на статистика за извършените действия"
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "извеждане на напредъка"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "извеждане на допълнителна информация за определянето на авторството"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr ""
"извеждане на първоначалното име на файл (стандартно това е автоматично)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr ""
"извеждане на първоначалния номер на ред (стандартно опцията е изключена)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "извеждане във формат за по-нататъшна обработка"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr ""
"извеждане във формат за команди от потребителско ниво с информация на всеки "
"ред"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
msgid "use the same output mode as git-annotate (Default: off)"
msgstr ""
"използване на същия формат като „git-annotate“ (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "извеждане на неформатирани времена (стандартно опцията е изключена)"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "извеждане на пълните суми по SHA1 (стандартно опцията е изключена)"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr "без име на автор и време на промяна (стандартно опцията е изключена)"
-#: builtin/blame.c:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr ""
"извеждане на е-пощата на автора, а не името му (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "без разлики в знаците за интервали"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
msgid "rev"
msgstr "ВЕРС"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "прескачане на ВЕРСията при извеждане на авторството"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "прескачане на версиите указани във ФАЙЛа"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr ""
"оцветяване на повтарящите се метаданни от предишния ред в различен цвят"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "оцветяване на редовете по възраст"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr "допълнителни изчисления за по-добри резултати"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "изчитане на версиите от ФАЙЛа, а не чрез изпълнение на „git-rev-list“"
-#: builtin/blame.c:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "използване на съдържанието на ФАЙЛа като крайно положение"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "напасване на редовете"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr ""
"търсене на копирани редове както в рамките на един файл, така и от един файл "
"към друг"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr ""
"търсене на преместени редове както в рамките на един файл, така и от един "
"файл към друг"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "диапазон"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
"информация само за редовете в диапазона НАЧАЛО,КРАЙ или само на :ФУНКЦИЯта"
-#: builtin/blame.c:945
+#: builtin/blame.c:947
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите "
@@ -11728,18 +12043,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:998
msgid "4 years, 11 months ago"
msgstr "преди 4 години и 11 месеца"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1114
#, 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:1157
+#: builtin/blame.c:1159
msgid "Blaming lines"
msgstr "Редове с авторство"
@@ -11771,7 +12086,7 @@
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [ОПЦИЯ…] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:153
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -11780,7 +12095,7 @@
"изтриване на клона „%s“, който е слят към „%s“,\n"
" но още не е слят към върха „HEAD“."
-#: builtin/branch.c:158
+#: builtin/branch.c:157
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -11789,12 +12104,12 @@
"отказване на изтриване на клона „%s“, който не е слят към\n"
" „%s“, но е слят към върха „HEAD“."
-#: builtin/branch.c:172
+#: builtin/branch.c:171
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Обектът-подаване за „%s“ не може да бъде открит"
-#: builtin/branch.c:176
+#: builtin/branch.c:175
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -11803,7 +12118,7 @@
"Клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n"
"да го изтриете, изпълнете „git branch -D %s“."
-#: builtin/branch.c:189
+#: builtin/branch.c:188
msgid "Update of config-file failed"
msgstr "Неуспешно обновяване на конфигурационния файл"
@@ -11815,100 +12130,100 @@
msgid "Couldn't look up commit object for HEAD"
msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит"
-#: builtin/branch.c:244
+#: builtin/branch.c:247
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Не може да изтриете клона „%s“, който е изтеглен в пътя „%s“"
-#: builtin/branch.c:259
+#: builtin/branch.c:262
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "следящият клон „%s“ не може да бъде открит."
-#: builtin/branch.c:260
+#: builtin/branch.c:263
#, c-format
msgid "branch '%s' not found."
msgstr "клонът „%s“ не може да бъде открит."
-#: builtin/branch.c:291
+#: builtin/branch.c:294
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Изтрит следящ клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:295
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "форматиращият низ не може да бъде анализиран: %s"
-#: builtin/branch.c:471
+#: builtin/branch.c:476
msgid "could not resolve HEAD"
msgstr "подаването, сочено от указателя „HEAD“, не може да се установи"
-#: builtin/branch.c:477
+#: builtin/branch.c:482
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "„HEAD“ (%s) сочи извън директорията „refs/heads“"
-#: builtin/branch.c:492
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Клонът „%s“ се пребазира върху „%s“"
-#: builtin/branch.c:496
+#: builtin/branch.c:501
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Търси се двоично в клона „%s“ при „%s“"
-#: builtin/branch.c:513
+#: builtin/branch.c:518
msgid "cannot copy the current branch while not on any."
msgstr "не може да копирате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:515
+#: builtin/branch.c:520
msgid "cannot rename the current branch while not on any."
msgstr ""
"не може да преименувате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:526
+#: builtin/branch.c:531
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Неправилно име на клон: „%s“"
-#: builtin/branch.c:555
+#: builtin/branch.c:560
msgid "Branch rename failed"
msgstr "Неуспешно преименуване на клон"
-#: builtin/branch.c:557
+#: builtin/branch.c:562
msgid "Branch copy failed"
msgstr "Неуспешно копиране на клон"
-#: builtin/branch.c:561
+#: builtin/branch.c:566
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Клонът с неправилно име „%s“ е копиран"
-#: builtin/branch.c:564
+#: builtin/branch.c:569
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Клонът с неправилно име „%s“ е преименуван"
-#: builtin/branch.c:570
+#: builtin/branch.c:575
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен"
-#: builtin/branch.c:579
+#: builtin/branch.c:584
msgid "Branch is renamed, but update of config-file failed"
msgstr "Клонът е преименуван, но конфигурационният файл не е обновен"
-#: builtin/branch.c:581
+#: builtin/branch.c:586
msgid "Branch is copied, but update of config-file failed"
msgstr "Клонът е копиран, но конфигурационният файл не е обновен"
-#: builtin/branch.c:597
+#: builtin/branch.c:602
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11919,183 +12234,179 @@
" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:637
msgid "Generic options"
msgstr "Общи настройки"
-#: builtin/branch.c:633
+#: builtin/branch.c:639
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
"извеждане на контролната сума и темата. Повтарянето на опцията прибавя "
"отдалечените клони"
-#: builtin/branch.c:634
+#: builtin/branch.c:640
msgid "suppress informational messages"
msgstr "без информационни съобщения"
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "задаване на режима на следене (виж git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "настройване кой клон да се следи"
-#: builtin/branch.c:637
+#: builtin/branch.c:645
msgid "do not use"
msgstr "да не се ползва"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:647
msgid "upstream"
msgstr "клон-източник"
-#: builtin/branch.c:639
+#: builtin/branch.c:647
msgid "change the upstream info"
msgstr "смяна на клона-източник"
-#: builtin/branch.c:640
+#: builtin/branch.c:648
msgid "unset the upstream info"
msgstr "изчистване на информацията за клон-източник"
-#: builtin/branch.c:641
+#: builtin/branch.c:649
msgid "use colored output"
msgstr "цветен изход"
-#: builtin/branch.c:642
+#: builtin/branch.c:650
msgid "act on remote-tracking branches"
msgstr "действие върху следящите клони"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:652 builtin/branch.c:654
msgid "print only branches that contain the commit"
msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:653 builtin/branch.c:655
msgid "print only branches that don't contain the commit"
msgstr "извеждане само на клоните, които не съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:650
+#: builtin/branch.c:658
msgid "Specific git-branch actions:"
msgstr "Специални действия на „git-branch“:"
-#: builtin/branch.c:651
+#: builtin/branch.c:659
msgid "list both remote-tracking and local branches"
msgstr "извеждане както на следящите, така и на локалните клони"
-#: builtin/branch.c:653
+#: builtin/branch.c:661
msgid "delete fully merged branch"
msgstr "изтриване на клони, които са напълно слети"
-#: builtin/branch.c:654
+#: builtin/branch.c:662
msgid "delete branch (even if not merged)"
msgstr "изтриване и на клони, които не са напълно слети"
-#: builtin/branch.c:655
+#: builtin/branch.c:663
msgid "move/rename a branch and its reflog"
msgstr ""
"преместване/преименуване на клон и принадлежащият му журнал на указателите"
-#: builtin/branch.c:656
+#: builtin/branch.c:664
msgid "move/rename a branch, even if target exists"
msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:657
+#: builtin/branch.c:665
msgid "copy a branch and its reflog"
msgstr "копиране на клон и принадлежащия му журнал на указателите"
-#: builtin/branch.c:658
+#: builtin/branch.c:666
msgid "copy a branch, even if target exists"
msgstr "копиране на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:659
+#: builtin/branch.c:667
msgid "list branch names"
msgstr "извеждане на имената на клоните"
-#: builtin/branch.c:660
+#: builtin/branch.c:668
msgid "show current branch name"
msgstr "извеждане на името на текущия клон"
-#: builtin/branch.c:661
+#: builtin/branch.c:669
msgid "create the branch's reflog"
msgstr "създаване на журнала на указателите на клона"
-#: builtin/branch.c:663
+#: builtin/branch.c:671
msgid "edit the description for the branch"
msgstr "редактиране на описанието на клона"
-#: builtin/branch.c:664
+#: builtin/branch.c:672
msgid "force creation, move/rename, deletion"
msgstr "принудително създаване, преместване, преименуване, изтриване"
-#: builtin/branch.c:665
+#: builtin/branch.c:673
msgid "print only branches that are merged"
msgstr "извеждане само на слетите клони"
-#: builtin/branch.c:666
+#: builtin/branch.c:674
msgid "print only branches that are not merged"
msgstr "извеждане само на неслетите клони"
-#: builtin/branch.c:667
+#: builtin/branch.c:675
msgid "list branches in columns"
msgstr "извеждане по колони"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "ОБЕКТ"
-#: builtin/branch.c:670
+#: builtin/branch.c:678
msgid "print only branches of the object"
msgstr "извеждане само на клоните на ОБЕКТА"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "подредбата и филтрирането третират еднакво малките и главните букви"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "ФОРМАТ за изхода"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:703 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "В директорията „refs/heads“ липсва файл „HEAD“"
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "опциите „--column“ и „--verbose“ са несъвместими"
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
msgid "branch name required"
msgstr "Необходимо е име на клон"
-#: builtin/branch.c:766
+#: builtin/branch.c:774
msgid "Cannot give description to detached HEAD"
msgstr "Не може да зададете описание на несвързан „HEAD“"
-#: builtin/branch.c:771
+#: builtin/branch.c:779
msgid "cannot edit description of more than one branch"
msgstr "Не може да редактирате описанието на повече от един клон едновременно"
-#: builtin/branch.c:778
+#: builtin/branch.c:786
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "В клона „%s“ все още няма подавания."
-#: builtin/branch.c:781
+#: builtin/branch.c:789
#, c-format
msgid "No branch named '%s'."
msgstr "Липсва клон на име „%s“."
-#: builtin/branch.c:796
+#: builtin/branch.c:804
msgid "too many branches for a copy operation"
msgstr "прекалено много клони за копиране"
-#: builtin/branch.c:805
+#: builtin/branch.c:813
msgid "too many arguments for a rename operation"
msgstr "прекалено много аргументи към командата за преименуване"
-#: builtin/branch.c:810
+#: builtin/branch.c:818
msgid "too many arguments to set new upstream"
msgstr "прекалено много аргументи към командата за следене"
-#: builtin/branch.c:814
+#: builtin/branch.c:822
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12103,31 +12414,31 @@
"Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към "
"никой клон."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:825 builtin/branch.c:848
#, c-format
msgid "no such branch '%s'"
msgstr "Няма клон на име „%s“."
-#: builtin/branch.c:821
+#: builtin/branch.c:829
#, c-format
msgid "branch '%s' does not exist"
msgstr "Не съществува клон на име „%s“."
-#: builtin/branch.c:834
+#: builtin/branch.c:842
msgid "too many arguments to unset upstream"
msgstr "прекалено много аргументи към командата за спиране на следене"
-#: builtin/branch.c:838
+#: builtin/branch.c:846
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон."
-#: builtin/branch.c:844
+#: builtin/branch.c:852
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Няма информация клонът „%s“ да следи някой друг"
-#: builtin/branch.c:854
+#: builtin/branch.c:862
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>?"
@@ -12135,7 +12446,7 @@
"опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон.\n"
"Пробвайте с: „-a|-r --list ШАБЛОН“"
-#: builtin/branch.c:858
+#: builtin/branch.c:866
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -12143,32 +12454,32 @@
"опцията „--set-upstream“ вече не се поддържа. Използвайте „--track“ или „--"
"set-upstream-to“"
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "версия на git:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "грешка при изпълнението на „uname()“ — „%s“ (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "компилатор: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "библиотека на C: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "командата е стартирана извън хранилище на Git, затова няма куки\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory ФАЙЛ] [-s|--suffix ФОРМАТ]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -12204,38 +12515,33 @@
"Разгледайте останалата част от доклада за грешка по-долу.\n"
"Може да изтриете редовете, които не искате да споделите.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "укажете файла, в който да се запази докладът за грешка"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "укажете суфикса на файла във формат за „strftime“"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "родителските директории на „%s“ не може да бъдат създадени"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Информация за системата"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Включени куки"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "новият файл „%s“ не може да бъде създаден"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "в „%s“ не може да се пише"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Новият доклад е създаден в „%s“.\n"
@@ -12256,54 +12562,54 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle ФАЙЛ [ИМЕ_НА_УКАЗАТЕЛ…]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "без извеждане на напредъка"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "извеждане на напредъка"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "извеждане на напредъка във фазата на запазване на обектите"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
"същото действие като опцията „--all-progress“ при извеждането на напредъка"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "версия на пратката"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "За създаването на пратка е необходимо хранилище."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "без подробна информация за пратките"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "Пратката „%s“ е наред\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr "За приемането на пратка е необходимо хранилище."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "повече подробности. Поставя се пред подкоманда"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Разпакетиране на пратки от обекти"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Непозната подкоманда: %s"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -12311,7 +12617,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ"
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -12319,79 +12625,79 @@
"git cat-file (--batch[=ФОРМАТ] | --batch-check[=ФОРМАТ]) [--follow-symlinks] "
"[--textconv | --filters]"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "може да укажете само една пакетна опция"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
"ВИДът може да е: „blob“ (BLOB), „tree“ (дърво), „commit“ (подаване), "
"„tag“ (етикет)"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "извеждане на вида на обект"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "извеждане на размера на обект"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "изход с 0, когато няма грешка"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "форматирано извеждане на съдържанието на обекта"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr ""
"да се стартира програмата зададена в настройката „textconv“ за преобразуване "
"на съдържанието на обекта-BLOB"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr ""
"да се стартират програмите за преобразуване на съдържанието на обектите-BLOB"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "обект-BLOB"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr "опциите „--textconv“/„--filters“ изискват път"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "буфериране на изхода от „--batch“"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr ""
"извеждане на информация и съдържание на обектите подадени на стандартния вход"
-#: builtin/cat-file.c:656
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "извеждане на информация за обектите подадени на стандартния вход"
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--"
"batch-check“)"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "извеждане на всички обекти с „--batch“ или „--batch-check“"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
msgstr "без подреждане на изхода от „--batch-all-objects“"
@@ -12411,7 +12717,7 @@
msgid "use .gitattributes only from the index"
msgstr "използване на файла „.gitattributes“ само от индекса"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "изчитане на имената на файловете от стандартния вход"
@@ -12419,7 +12725,7 @@
msgid "terminate input and output records by a NUL character"
msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
#: builtin/worktree.c:493
msgid "suppress progress reporting"
msgstr "без показване на напредъка"
@@ -12478,10 +12784,10 @@
msgstr "git checkout--worker [ОПЦИЯ…]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1824
-#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835
-#: builtin/submodule--helper.c:2333 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
msgid "string"
msgstr "НИЗ"
@@ -12545,99 +12851,94 @@
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [ОПЦИЯ…] [--source=КЛОН] ФАЙЛ…"
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
#, c-format
msgid "path '%s' does not have our version"
msgstr "вашата версия липсва в пътя „%s“"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
#, c-format
msgid "path '%s' does not have their version"
msgstr "чуждата версия липсва в пътя „%s“"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
#, c-format
msgid "path '%s': cannot merge"
msgstr "пътят „%s“ не може да бъде слян"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Резултатът за „%s“ не може да бъде слян"
-#: builtin/checkout.c:414
+#: builtin/checkout.c:419
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "Пресъздаден е %d конфликт при сливане"
msgstr[1] "Пресъздадени са %d конфликта при сливане"
-#: builtin/checkout.c:419
+#: builtin/checkout.c:424
#, 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:426
+#: builtin/checkout.c:431
#, 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:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "опцията „%s“ е несъвместима с обновяването на пътища"
-#: builtin/checkout.c:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "опциите „%s“ и „%s“ са несъвместими"
-
-#: builtin/checkout.c:469
+#: builtin/checkout.c:474
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“."
-#: builtin/checkout.c:473
+#: builtin/checkout.c:478
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "не е указано нито „%s“, нито „%s“"
-#: builtin/checkout.c:477
+#: builtin/checkout.c:482
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "опцията „%s“ е задължителна, когато „%s“ не е зададена"
-#: builtin/checkout.c:482 builtin/checkout.c:487
+#: builtin/checkout.c:487 builtin/checkout.c:492
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "опцията „%3$s“ е несъвместима както с „%1$s“, така и с „%2$s“"
-#: builtin/checkout.c:563 builtin/checkout.c:570
+#: builtin/checkout.c:566 builtin/checkout.c:573
#, c-format
msgid "path '%s' is unmerged"
msgstr "пътят „%s“ не е слят"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:747
msgid "you need to resolve your current index first"
msgstr "първо трябва да коригирате индекса си"
-#: builtin/checkout.c:793
+#: builtin/checkout.c:797
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12647,50 +12948,50 @@
"индекса:\n"
"%s"
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n"
-#: builtin/checkout.c:928
+#: builtin/checkout.c:934
msgid "HEAD is now at"
msgstr "Указателят „HEAD“ в момента сочи към"
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "Указателят „HEAD“ не може да бъде обновен"
-#: builtin/checkout.c:936
+#: builtin/checkout.c:942
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Зануляване на клона „%s“\n"
-#: builtin/checkout.c:939
+#: builtin/checkout.c:945
#, c-format
msgid "Already on '%s'\n"
msgstr "Вече сте на „%s“\n"
-#: builtin/checkout.c:943
+#: builtin/checkout.c:949
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Преминаване към клона „%s“ и зануляване на промените\n"
-#: builtin/checkout.c:945 builtin/checkout.c:1376
+#: builtin/checkout.c:951 builtin/checkout.c:1388
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Преминахте към новия клон „%s“\n"
-#: builtin/checkout.c:947
+#: builtin/checkout.c:953
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Преминахте към клона „%s“\n"
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1004
#, c-format
msgid " ... and %d more.\n"
msgstr "… и още %d.\n"
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1010
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12712,7 +13013,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1023
+#: builtin/checkout.c:1029
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12739,19 +13040,19 @@
" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
"\n"
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1064
msgid "internal error in revision walk"
msgstr "вътрешна грешка при обхождането на версиите"
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
msgid "Previous HEAD position was"
msgstr "Преди това „HEAD“ сочеше към"
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
msgid "You are on a branch yet to be born"
msgstr "В момента сте на клон, който все още не е създаден"
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1196
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12760,7 +13061,7 @@
"„%s“ може да е както локален файл, така и следящ клон. За уточняване\n"
"ползвайте разделителя „--“ (и евентуално опцията „--no-guess“)"
-#: builtin/checkout.c:1191
+#: builtin/checkout.c:1203
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"
@@ -12782,51 +13083,51 @@
"\n"
" checkout.defaultRemote=origin"
-#: builtin/checkout.c:1201
+#: builtin/checkout.c:1213
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "„%s“ напасва с множество (%d) отдалечени клони"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1279
msgid "only one reference expected"
msgstr "очаква се само един указател"
-#: builtin/checkout.c:1284
+#: builtin/checkout.c:1296
#, c-format
msgid "only one reference expected, %d given."
msgstr "очаква се един указател, а сте подали %d."
-#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
#, c-format
msgid "invalid reference: %s"
msgstr "неправилен указател: %s"
-#: builtin/checkout.c:1343 builtin/checkout.c:1709
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
#, c-format
msgid "reference is not a tree: %s"
msgstr "указателят не сочи към обект-дърво: %s"
-#: builtin/checkout.c:1390
+#: builtin/checkout.c:1402
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "очаква се клон, а не етикет — „%s“"
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1404
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "очаква се локален, а не отдалечен клон — „%s“"
-#: builtin/checkout.c:1393 builtin/checkout.c:1401
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "очаква се клон, а не „%s“"
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1408
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "очаква се клон, а не подаване — „%s“"
-#: builtin/checkout.c:1412
+#: builtin/checkout.c:1424
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12834,7 +13135,7 @@
"по време на сливане не може да преминете към друг клон.\n"
"Пробвайте с „git merge --quit“ или „git worktree add“."
-#: builtin/checkout.c:1416
+#: builtin/checkout.c:1428
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12843,7 +13144,7 @@
"клон.\n"
"Пробвайте с „git am --quit“ или „git worktree add“."
-#: builtin/checkout.c:1420
+#: builtin/checkout.c:1432
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12851,7 +13152,7 @@
"по време на пребазиране не може да преминете към друг клон.\n"
"Пробвайте с „git rebase --quit“ или „git worktree add“."
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1436
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12859,7 +13160,7 @@
"по време на отбиране на подавания не може да преминете към друг клон.\n"
"Пробвайте с „git cherry-pick --quit“ или „git worktree add“."
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1440
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12867,139 +13168,129 @@
"по време на отмяна на подавания не може да преминете към друг клон.\n"
"Пробвайте с „git revert --quit“ или „git worktree add“."
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1444
msgid "you are switching branch while bisecting"
msgstr "преминаване към друг клон по време на двоично търсене"
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1451
msgid "paths cannot be used with switching branches"
msgstr "задаването на път е несъвместимо с преминаването от един клон към друг"
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг"
-#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:1467
+#: builtin/checkout.c:1479
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "опцията „%s“ е несъвместима със задаването на НАЧАЛО"
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1487
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ "
"не е такъв"
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1494
msgid "missing branch or commit argument"
msgstr "липсва аргумент — клон или подаване"
-#: builtin/checkout.c:1525
+#: builtin/checkout.c:1537
msgid "perform a 3-way merge with the new branch"
msgstr "извършване на тройно сливане с новия клон"
-#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
msgid "style"
msgstr "СТИЛ"
-#: builtin/checkout.c:1527
-msgid "conflict style (merge or diff3)"
-msgstr "действие при конфликт (сливане или тройна разлика)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr ""
+"действие при конфликт („merge“ — сливане или тройна разлика с „diff3“ или "
+"„zdiff3“)"
-#: builtin/checkout.c:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1551 builtin/worktree.c:488
msgid "detach HEAD at named commit"
msgstr "отделяне на указателя „HEAD“ към указаното подаване"
-#: builtin/checkout.c:1540
-msgid "set upstream info for new branch"
-msgstr "задаване на кой клон бива следен при създаването на новия клон"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "задаване на режима на следене (виж git-pull(1))"
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1556
msgid "force checkout (throw away local modifications)"
msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
msgid "new-branch"
msgstr "НОВ_КЛОН"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
msgid "new unparented branch"
msgstr "нов клон без родител"
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1560 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "обновяване на игнорираните файлове (стандартно)"
-#: builtin/checkout.c:1549
+#: builtin/checkout.c:1563
msgid "do not check if another worktree is holding the given ref"
msgstr "без проверка дали друго работно дърво държи указателя"
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1576
msgid "checkout our version for unmerged files"
msgstr "изтегляне на вашата версия на неслетите файлове"
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1579
msgid "checkout their version for unmerged files"
msgstr "изтегляне на чуждата версия на неслетите файлове"
-#: builtin/checkout.c:1569
+#: builtin/checkout.c:1583
msgid "do not limit pathspecs to sparse entries only"
msgstr "без ограничаване на изброените пътища само до частично изтеглените"
-#: builtin/checkout.c:1624
+#: builtin/checkout.c:1640
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "опциите „-%c“, „-%c“ и „--orphan“ са несъвместими една с друга"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "опциите „-%c“, „-%c“ и „%s“ са несъвместими"
-#: builtin/checkout.c:1628
-msgid "-p and --overlay are mutually exclusive"
-msgstr "опциите „-p“ и „--overlay“ са несъвместими"
-
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1681
msgid "--track needs a branch name"
msgstr "опцията „--track“ изисква име на клон"
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1686
#, c-format
msgid "missing branch name; try -%c"
msgstr "липсва име на клон, използвайте опцията „-%c“"
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1718
#, c-format
msgid "could not resolve %s"
msgstr "„%s“ не може да бъде открит"
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1734
msgid "invalid path specification"
msgstr "указан е неправилен път"
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1741
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1745
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“"
-#: builtin/checkout.c:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "опциите „--pathspec-from-file“ и „--detach“ са несъвместими"
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "опциите „--pathspec-from-file“ и „--patch“ са несъвместими"
-
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1770
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -13007,74 +13298,75 @@
"git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n"
"са несъвместими с изтегляне от индекса."
-#: builtin/checkout.c:1759
+#: builtin/checkout.c:1775
msgid "you must specify path(s) to restore"
msgstr "трябва да укажете поне един път за възстановяване"
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
#: builtin/worktree.c:486
msgid "branch"
msgstr "клон"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1801
msgid "create and checkout a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1803
msgid "create/reset and checkout a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1804
msgid "create reflog for new branch"
msgstr "създаване на журнал на указателите за нов клон"
-#: builtin/checkout.c:1791
+#: builtin/checkout.c:1806
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
"опит за отгатване на име на клон след неуспешен опит с „git checkout "
"НЕСЪЩЕСТВУВАЩ_КЛОН“ (стандартно)"
-#: builtin/checkout.c:1792
+#: builtin/checkout.c:1807
msgid "use overlay mode (default)"
msgstr "използване на припокриващ режим (стандартно)"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1855
msgid "create and switch to a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1857
msgid "create/reset and switch to a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1859
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
"опит за отгатване на име на клон след неуспешен опит с „git switch "
"НЕСЪЩЕСТВУВАЩ_КЛОН“"
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1861
msgid "throw away local modifications"
msgstr "зануляване на локалните промени"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1897
msgid "which tree-ish to checkout from"
msgstr "към кой указател към дърво да се премине"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1899
msgid "restore the index"
msgstr "възстановяване на индекса"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1901
msgid "restore the working tree (default)"
msgstr "възстановяване на работното дърво (стандартно)"
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1903
msgid "ignore unmerged entries"
msgstr "пренебрегване на неслетите елементи"
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1904
msgid "use overlay mode"
msgstr "използване на припокриващ режим"
@@ -13108,7 +13400,15 @@
msgid "could not lstat %s\n"
msgstr "не може да се получи информация чрез „lstat“ за „%s“\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Текущата работна директория няма да бъде изтрита\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Текущата работна директория няма да бъде изтрита\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -13121,7 +13421,7 @@
"ПРЕФИКС — избор на единствен обект по този уникален префикс\n"
" — (празно) нищо да не се избира\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -13142,33 +13442,33 @@
"* — избиране на всички обекти\n"
" — (празно) завършване на избирането\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Неправилен избор (%s).\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Шаблони за игнорирани елементи≫ "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Избиране на обекти за изтриване"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ"
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -13186,52 +13486,52 @@
"help — този край\n"
"? — подсказка за шаблоните"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Следният обект ще бъде изтрит:"
msgstr[1] "Следните обекти ще бъдат изтрити:"
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Файловете за изчистване свършиха. Изход от програмата."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "принудително изтриване"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "интерактивно изтриване"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "изтриване на цели директории"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "ШАБЛОН"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "добавяне на ШАБЛОН от файлове, които да не се трият"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "изтриване и на игнорираните файлове"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "изтриване само на игнорирани файлове"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -13239,7 +13539,7 @@
"Настройката „clean.requireForce“ е зададена като истина, което изисква някоя "
"от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -13248,7 +13548,7 @@
"което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши "
"изчистване"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "опциите „-x“ и „-X“ са несъвместими"
@@ -13305,19 +13605,21 @@
msgid "directory from which templates will be used"
msgstr "директория, която съдържа шаблоните, които да се ползват"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831
-#: builtin/submodule--helper.c:2336
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
msgid "reference repository"
msgstr "еталонно хранилище"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1833
-#: builtin/submodule--helper.c:2338
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
msgid "use --reference only while cloning"
msgstr "опцията „--reference“ може да се използва само при клониране"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "ИМЕ"
@@ -13333,8 +13635,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr "ДЪЛБОЧИНА"
@@ -13342,8 +13644,8 @@
msgid "create a shallow clone of that depth"
msgstr "плитко клониране до тази ДЪЛБОЧИНА"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr "ВРЕМЕ"
@@ -13351,17 +13653,17 @@
msgid "create a shallow clone since a specific time"
msgstr "плитко клониране до момент във времето"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "ВЕРСИЯ"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "задълбочаване на историята на плитко хранилище до изключващ указател"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1843
-#: builtin/submodule--helper.c:2352
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
msgid "clone only one branch, HEAD or --branch"
msgstr ""
"клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично "
@@ -13392,22 +13694,22 @@
msgid "set config inside the new repository"
msgstr "задаване на настройките на новото хранилище"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "специфични за сървъра"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "опция за пренос"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "само адреси IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "само адреси IPv6"
@@ -13422,51 +13724,43 @@
"инициализиране на файла за частично изтегляне („.git/info/sparse-checkout“) "
"да съдържа само файловете в основната директория"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Името на директорията не може да бъде отгатнато.\n"
-"Задайте директорията изрично на командния ред"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "„%s“ съществува и не е директория"
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "неуспешно итериране по „%s“"
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "връзката „%s“ не може да бъде създадена"
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "файлът не може да бъде копиран като „%s“"
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "неуспешно итериране по „%s“"
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "действието завърши.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13479,108 +13773,104 @@
"\n"
" git restore --source=HEAD :/\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
"Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
"и който следва да бъде изтеглен, не съществува."
-#: builtin/clone.c:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "обектът „%s“ не може да бъде обновен"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "частичното изтегляне не може да се инициализира"
-#: builtin/clone.c:784
+#: builtin/clone.c:668
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n"
"което не съществува. Не може да се изтегли определен клон.\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "работното дърво не може да бъде подготвено"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "настройките не може да бъдат записани в конфигурационния файл"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "не може да се извърши пакетиране за изчистване на файловете"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "временният файл за алтернативни обекти не може да бъде изтрит"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886
msgid "Too many arguments."
msgstr "Прекалено много аргументи."
-#: builtin/clone.c:1005
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
msgid "You must specify a repository to clone."
msgstr "Трябва да укажете кое хранилище искате да клонирате."
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "опциите „--bare“ и „--origin %s“ са несъвместими."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "опциите „%s“ и „%s %s“ са несъвместими"
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "не съществува хранилище „%s“"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2052
#, c-format
msgid "depth %s is not a positive number"
msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевият път „%s“ съществува и не е празна директория."
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "пътят в хранилището „%s“ съществува и не е празна директория."
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "в „%s“ вече съществува работно дърво."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "родителските директории на „%s“ не може да бъдат създадени"
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "работното дърво в „%s“ не може да бъде създадено."
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клониране и създаване на голо хранилище в „%s“…\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клониране и създаване на хранилище в „%s“…\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -13588,53 +13878,53 @@
"опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-"
"if-able“"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "„%s“ е неправилно име за отдалечено хранилище"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--depth“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-since“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--filter“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "опцията „--local“ се прескача"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr "отдалеченият транспорт върна грешка"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "Изглежда клонирахте празно хранилище."
@@ -13670,14 +13960,14 @@
msgid "--command must be the first argument"
msgstr "опцията „--command“ трябва да е първият аргумент"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir ДИР_ОБЕКТИ] [--shallow] [--"
"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13687,99 +13977,97 @@
"split[=СТРАТЕГИЯ]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "директорията с обекти, която отговаря на „%s“, не може да бъде открита"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
msgid "dir"
msgstr "директория"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "ДИРекторията_с_ОБЕКТИ за запазване на гра̀фа"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
"ако гра̀фа с подаванията е раздробен, да се проверява само файлът на върха"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Графът с подаванията не може да се отвори: „%s“"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "непознат аргумент към „--split“: %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "неочакван, нешестнайсетичен идентификатор на обект: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "неправилен обект: „%s“"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "обхождането да започне от всички указатели"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
"проверка на подаванията за индексите на пакетите изброени на командния ред"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "започване на обхождането при подаванията подадени на стандартния вход"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr ""
"включване на всички подавания, които вече са във файла с гра̀фа на подаванията"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "включване на изчисленията за променените пътища"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "позволяване на запис на нарастващ файл с гра̀фа на подаванията"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "максимален брой подавания в небазово ниво на раздробен граф"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
"максимално отношение на броя подавания в две последователни нива в раздробен "
"граф"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "обявяване за остарели само на файловете по-стари от това ВРЕМЕ"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "максимален брой промени в пътищата следени от филтрите на Блум"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"опциите „--reachable“, „--stdin-commits“ и „--stdin-packs“ са несъвместими"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Получаване на подаванията от входа"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "непозната подкоманда: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13793,70 +14081,65 @@
msgid "duplicate parent %s ignored"
msgstr "прескачане на повтарящ се родител: „%s“"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
#, c-format
msgid "not a valid object name %s"
msgstr "неправилно име на обект: „%s“"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: „%s“ не може да се отвори"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: „%s“ не може да се прочете"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: „%s“ не може да се затвори"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "родител"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "ИДЕНТИФИКАТОР на обекта за подаването-родител"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
+#: builtin/tag.c:454
msgid "message"
msgstr "СЪОБЩЕНИЕ"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
msgid "commit message"
msgstr "СЪОБЩЕНИЕ при подаване"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "изчитане на съобщението за подаване от ФАЙЛ"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "подписване на подаването с GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "трябва да е точно едно дърво"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: не може да се прочете"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/commit.c:51
+#: builtin/commit.c:52
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13868,7 +14151,7 @@
"с опцията „--allow-empty“, или да го изтриете от историята с командата:\n"
"„git reset HEAD^“.\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13883,21 +14166,21 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr ""
"В противен случай използвайте командата:\n"
"\n"
" git rebase --skip\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr ""
"В противен случай използвайте командата:\n"
"\n"
" git cherry-pick --skip\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13919,73 +14202,69 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "опциите „-a“ и „--pathspec-from-file“ са несъвместими"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "опциите „--include“ и „--only“ изискват аргументи."
-#: builtin/commit.c:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "временният индекс не може да бъде създаден"
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "неуспешно интерактивно добавяне"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "временният индекс не може да бъде обновен"
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "Дървото на основния кеш не може да бъде обновено"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
-msgstr "новият индекс не може да бъде записан"
+msgstr "новият индекс (new_index) не може да бъде записан"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "по време на сливане не може да се извърши частично подаване."
-#: builtin/commit.c:491
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr "по време на отбиране не може да се извърши частично подаване."
-#: builtin/commit.c:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "по време на пребазиране не може да се извърши частично подаване."
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "индексът не може да бъде прочетен"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "временният индекс не може да бъде записан"
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "заглавната част за автор в подаването „%s“ липсва"
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "заглавната част за автор в подаването „%s“ е неправилна"
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "неправилен параметър към опцията „--author“"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13993,43 +14272,43 @@
"не може да се избере знак за коментар — в текущото съобщение за подаване са "
"използвани всички подобни знаци"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "следното подаване не може да бъде открито: %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(изчитане на съобщението за подаване от стандартния вход)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "съобщението за подаване не бе прочетено стандартния вход"
-#: builtin/commit.c:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен"
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "опциите „-m“ и „--fixup“ са несъвместими:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "опциите „--%s“ и „--%s:%s“ са несъвместими"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "съобщението за вкарване SQUASH_MSG не може да бъде прочетено"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "шаблонът за подаване не може да бъде запазен"
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -14038,7 +14317,7 @@
"Въведете съобщението за подаване на промените. Редовете, които започват\n"
"с „%c“, ще бъдат пропуснати.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -14047,7 +14326,7 @@
"Въведете съобщението за подаване на промените. Редовете, които започват\n"
"с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:900
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -14056,7 +14335,7 @@
"Въведете съобщението за подаване на промените. Редовете, които започват\n"
"с „%c“, също ще бъдат включени — може да ги изтриете вие.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -14067,7 +14346,7 @@
"с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n"
"съобщение преустановява подаването.\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -14082,7 +14361,7 @@
" git update-ref -d MERGE_HEAD\n"
"и опитайте отново.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -14097,88 +14376,79 @@
" git update-ref -d CHERRY_PICK_HEAD\n"
"и опитайте отново.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sАвтор: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sПодаващ: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr "епилогът не може да се подаде на „--trailers“"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Грешка при изграждане на дърветата"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:316
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с "
"никой автор"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Неправилен режим за игнорираните файлове: „%s“"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1451
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправилен режим за неследените файлове: „%s“"
-#: builtin/commit.c:1195
-msgid "--long and -z are incompatible"
-msgstr "опциите „--long“ и „-z“ са несъвместими."
-
-#: builtin/commit.c:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr ""
"В момента се извършва сливане, не може да промените съобщение при подаване."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr ""
"В момента се извършва отбиране на подаване, не може да промените съобщение "
"при подаване."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr ""
-"опцията за промяна на съобщението на „--fixup“ и указването на път „%s“ са "
-"несъвместими"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "опцията за промяна на съобщението „%s“ и пътят „%s“ са несъвместими"
-#: builtin/commit.c:1233
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"опцията за промяна на съобщението на „--fixup“ и „--patch“/„--interactive“/"
-"„--all“/„--include“/„--only“ са несъвместими"
+#: builtin/commit.c:1234
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "опциите „%s“ и „%s“ са несъвместими"
-#: builtin/commit.c:1252
+#: builtin/commit.c:1254
msgid "Using both --reset-author and --author does not make sense"
-msgstr "опциите „--reset-author“ и „--author“ са несъвместими."
+msgstr "опциите „--reset-author“ и „--author“ са несъвместими"
#: builtin/commit.c:1261
msgid "You have nothing to amend."
@@ -14225,58 +14495,58 @@
msgid "unknown option: --fixup=%s:%s"
msgstr "непозната опция: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1355
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "опцията „-a“ е несъвместима със задаването на пътища: „%s…“"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1486 builtin/commit.c:1655
msgid "show status concisely"
msgstr "кратка информация за състоянието"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1488 builtin/commit.c:1657
msgid "show branch information"
msgstr "информация за клоните"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1490
msgid "show stash information"
msgstr "информация за скатаното"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1492 builtin/commit.c:1659
msgid "compute full ahead/behind values"
msgstr "изчисляване на точните стойности напред/назад"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1494
msgid "version"
msgstr "версия"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
#: builtin/worktree.c:690
msgid "machine-readable output"
msgstr "формат на изхода за четене от програма"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1497 builtin/commit.c:1663
msgid "show status in long format (default)"
msgstr "подробна информация за състоянието (стандартно)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1500 builtin/commit.c:1666
msgid "terminate entries with NUL"
msgstr "разделяне на елементите с нулевия знак „NUL“"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
msgid "mode"
msgstr "РЕЖИМ"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1503 builtin/commit.c:1669
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна "
"информация), „normal“ (кратка информация), „no“ (без неследените файлове). "
"Стандартният РЕЖИМ е: „all“."
-#: builtin/commit.c:1504
+#: builtin/commit.c:1507
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -14285,11 +14555,11 @@
"„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните "
"файлове). Стандартният РЕЖИМ е: „traditional“."
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1509 parse-options.h:192
msgid "when"
msgstr "КОГА"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1510
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -14298,197 +14568,197 @@
"една от „all“ (всички), „dirty“ (тези с неподадени промени), "
"„untracked“ (неследени)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1512
msgid "list untracked files in columns"
msgstr "извеждане на неследените файлове в колони"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1513
msgid "do not detect renames"
msgstr "без засичане на преименуванията"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1515
msgid "detect renames, optionally set similarity index"
msgstr "засичане на преименуванията, може да се зададе коефициент на прилика"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1538
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Неподдържана комбинация от аргументи за игнорирани и неследени файлове"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1620
msgid "suppress summary after successful commit"
msgstr "без информация след успешно подаване"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1621
msgid "show diff in commit message template"
msgstr "добавяне на разликата към шаблона за съобщението при подаване"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1623
msgid "Commit message options"
msgstr "Опции за съобщението при подаване"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
msgid "read message from file"
msgstr "взимане на съобщението от ФАЙЛ"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1625
msgid "author"
msgstr "АВТОР"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1625
msgid "override author for commit"
msgstr "задаване на АВТОР за подаването"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
msgid "date"
msgstr "ДАТА"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1626
msgid "override date for commit"
msgstr "задаване на ДАТА за подаването"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
msgid "commit"
msgstr "ПОДАВАНЕ"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1628
msgid "reuse and edit message from specified commit"
msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1629
msgid "reuse message from specified commit"
msgstr "преизползване на съобщението от указаното ПОДАВАНЕ"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1634
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]подаване"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1634
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предходното без следа или за промяна на подаването или съобщението"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1635
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предното"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1636
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
msgid "trailer"
-msgstr "епилог"
+msgstr "ЕПИЛОГ"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1637
msgid "add custom trailer(s)"
-msgstr "добовяне на друг епилог"
+msgstr "добавяне на друг ЕПИЛОГ"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "добавяне на епилог за подпис „Signed-off-by“"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1639
msgid "use specified template file"
msgstr "използване на указания шаблонен ФАЙЛ"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1640
msgid "force edit of commit"
msgstr "редактиране на подаване"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1642
msgid "include status in commit message template"
msgstr "вмъкване на състоянието в шаблона за съобщението при подаване"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1647
msgid "Commit contents options"
msgstr "Опции за избор на файлове при подаване"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1648
msgid "commit all changed files"
msgstr "подаване на всички променени файлове"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1649
msgid "add specified files to index for commit"
msgstr "добавяне на указаните файлове към индекса за подаване"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1650
msgid "interactively add files"
msgstr "интерактивно добавяне на файлове"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1651
msgid "interactively add changes"
msgstr "интерактивно добавяне на промени"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
msgid "commit only specified files"
msgstr "подаване само на указаните файлове"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1653
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
"без изпълнение на куките преди подаване и при промяна на съобщението за "
"подаване (pre-commit и commit-msg)"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1654
msgid "show what would be committed"
msgstr "отпечатване на това, което би било подадено"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1667
msgid "amend previous commit"
msgstr "поправяне на предишното подаване"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1668
msgid "bypass post-rewrite hook"
msgstr "без изпълнение на куката след презаписване (post-rewrite)"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1675
msgid "ok to record an empty change"
msgstr "позволяване на празни подавания"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1677
msgid "ok to record a change with an empty message"
msgstr "позволяване на подавания с празни съобщения"
-#: builtin/commit.c:1747
+#: builtin/commit.c:1753
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)"
-#: builtin/commit.c:1754
+#: builtin/commit.c:1760
msgid "could not read MERGE_MODE"
msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен"
-#: builtin/commit.c:1775
+#: builtin/commit.c:1781
#, c-format
msgid "could not read commit message: %s"
msgstr "съобщението за подаване не може да бъде прочетено: %s"
-#: builtin/commit.c:1782
+#: builtin/commit.c:1788
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1787
+#: builtin/commit.c:1793
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Неизвършване на подаване поради нередактирано съобщение.\n"
-#: builtin/commit.c:1798
+#: builtin/commit.c:1804
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1834
+#: builtin/commit.c:1840
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14756,7 +15026,7 @@
#: builtin/config.c:684
msgid "$HOME not set"
-msgstr "променливата „HOME“ не е зададена"
+msgstr "стойността „$HOME“ не е зададена"
#: builtin/config.c:708
msgid ""
@@ -14764,7 +15034,7 @@
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
"section in \"git help worktree\" for details"
msgstr ""
-"опцията „--worktre“ не приема множество работни дървета, преди\n"
+"опцията „--worktree“ не приема множество работни дървета, преди\n"
"включването на разширението в настройките „worktreeConfig“. За\n"
"повече информация вижте раздела „CONFIGURATION FILE“ в\n"
"„git help worktree“"
@@ -14865,10 +15135,10 @@
#: builtin/credential-cache--daemon.c:316
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr ""
-"демонът за кеша с идентификациите е недостъпен — липсва поддръжка на гнезда "
-"на unix"
+"демонът за кеша с идентификациите е недостъпен (credential-cache--daemon) — "
+"липсва поддръжка на гнезда на unix"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr ""
"кешът с идентификациите е недостъпен — липсва поддръжка на гнезда на unix"
@@ -15014,7 +15284,7 @@
msgid "do not consider tags matching <pattern>"
msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
msgid "show abbreviated commit object as fallback"
msgstr "извеждане на съкратено име на обект като резервен вариант"
@@ -15031,25 +15301,14 @@
msgstr ""
"добавяне на такъв МАРКЕР на счупеното работно дърво (стандартно е „-broken“)"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "опциите „--long“ и „--abbrev=0“ са несъвместими"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Не са открити имена — нищо не може да бъде описано."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "опцията „--dirty“ е несъвместима с указател към подаване"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "опцията „--broken“ е несъвместима с указател към подаване"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "опциите „-stdin“ и „--merge-base“ са несъвместими"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "опциите „%s“ и указателите към обекти са несъвместими"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
@@ -15070,26 +15329,26 @@
msgid "%s...%s: no merge base"
msgstr "„%s..%s“: липсва база за сливане"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "Не е хранилище на Git"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:537 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "зададен е неправилен обект „%s“."
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "зададени са повече от 2 обекта-BLOB: „%s“"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "зададен е неподдържан обект „%s“."
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: много бази за сливане, ще се ползва „%s“"
@@ -15098,115 +15357,107 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [ОПЦИЯ…] [ПОДАВАНЕ [ПОДАВАНЕ]] [[--] ПЪТ…]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "неуспешно действие с изходен код: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "символната връзка „%s“ не може да бъде прочетена"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "файлът, сочен от символната връзка „%s“, не може да бъде прочетен"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "обектът „%s“ за символната връзка „%s“ не може да бъде прочетен"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n"
"в режима за разлики върху директории („-d“ и „--dir-diff“)."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "и двата файла са променени: „%s“ и „%s“."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "работното дърво е изоставено."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "в „%s“ има временни файлове."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "възможно е да ги изчистите или възстановите"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "неуспешно действие с изходен код: %d"
+
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "използвайте „diff.guitool“ вместо „diff.tool“"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "разлика по директории"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "следване на символните връзки при разлика по директории"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:700
msgid "tool"
msgstr "ПРОГРАМА"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "използване на указаната ПРОГРАМА"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--"
"tool“"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:706
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
-"„git-difftool“ да спре работа, когато стартираната ПРОГРАМА завърши с "
-"ненулев код"
+"„git-difftool“ да спре работа, когато стартираната ПРОГРАМА за разлики "
+"завърши с ненулев код"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "команда за разглеждане на разлики"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "подава се към „diff“"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "„git-difftool“ изисква работно дърво или опцията „--no-index“"
-#: builtin/difftool.c:741
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "опциите „--dir-diff“ и „--no-index“ са несъвместими"
-
#: builtin/difftool.c:744
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "опциите „--gui“, „--tool“ и „--extcmd“ са несъвместими една с друга"
-
-#: builtin/difftool.c:752
msgid "no <tool> given for --tool=<tool>"
msgstr "не е зададена програма за „--tool=ПРОГРАМА“"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:751
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "не е зададена команда за „--extcmd=КОМАНДА“"
@@ -15214,7 +15465,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] ОПЦИИ ПРОМЕНЛИВИ"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "ВИД"
@@ -15246,128 +15497,120 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Грешка: непреките етикети не се изнасят, освен ако не зададете „--mark-tags“."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "опцията „--anonymize-map“ изисква аргумент"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "Как да се обработват подписаните етикети"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "Как да се обработват етикетите на филтрираните обекти"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"как да се обработват съобщенията за подаване, които са в друго кодиране"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "запазване на маркерите в този ФАЙЛ"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "внасяне на маркерите от този ФАЙЛ"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "внасяне на маркерите от този ФАЙЛ, ако съществува"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr ""
"да се използва изкуствено име на човек при липса на създател на етикета"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "извеждане на цялото дърво за всяко подаване"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "използване на маркер за завършване на потока"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "без извеждане на съдържанието на обектите-BLOB"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
msgid "refspec"
msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "анонимизиране на извежданата информация"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "ОТ:КЪМ"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "заместване ОТ със КЪМ в анонимизирания изход"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"указване на родителите, които не са в потока на бързо изнасяне, с "
"идентификатор на обект"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "извеждане на първоначалните идентификатори на обектите BLOB/подавяния"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "задаване на идентификатори на маркери на етикетите"
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "опцията „--anonymize-map“ изисква „--anonymize“"
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "опциите „--import-marks“ и „--import-marks-if-exists“ са несъвместими"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "Липсват маркери „от“ за подмодула „%s“"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "Липсват маркери „до“ за подмодула „%s“"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "Очаква се команда „mark“, а бе получена: „%s“"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "Очаква се команда „to“, а бе получена: „%s“"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
msgid "Expected format name:filename for submodule rewrite option"
msgstr "опцията за презапис на подмодул изисква формат: име:име_на_файл"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "„%s“ изисква изричното задаване на опцията „--allow-unsafe-features“"
@@ -15377,120 +15620,120 @@
msgid "Lockfile created but not reported: %s"
msgstr "Заключващият файл е създаден, но не е докладван: „%s“"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [ОПЦИЯ…] ГРУПА"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [ОПЦИЯ…]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
msgid "fetch.parallel cannot be negative"
msgstr "опцията „fetch.parallel“ трябва да е неотрицателна"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:146 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "доставяне от всички отдалечени хранилища"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:148 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "задаване на клон за следене за издърпване/доставяне"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:150 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
msgid "use atomic transaction to update references"
msgstr "изискване на атомарни операции за обновяване на указателите"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:154 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "отдалечен път, където да се качи пакетът"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
msgid "force overwrite of local reference"
msgstr "принудително презаписване на локален указател"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
msgid "fetch from multiple remotes"
msgstr "доставяне от множество отдалечени хранилища"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:159 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "доставяне на всички етикети и принадлежащи обекти"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "do not fetch all tags (--no-tags)"
msgstr "без доставянето на всички етикети „--no-tags“"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
msgid "number of submodules fetched in parallel"
msgstr "брой подмодули доставени паралелно"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
"промяна на указателя, така че и той, както останалите, да бъде в „refs/"
"prefetch/“"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:167 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"окастряне на локалните етикети, които вече не съществуват в отдалеченото "
"хранилище и презаписване на променените"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
msgid "on-demand"
msgstr "ПРИ НУЖДА"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
msgid "control recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
msgid "write fetched references to the FETCH_HEAD file"
msgstr "запазване на доставените указатели във файла „FETCH_HEAD“"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:177 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "запазване на изтеглените пакети с обекти"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
msgid "allow updating of HEAD ref"
msgstr "позволяване на обновяването на указателя „HEAD“"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "задълбочаване на историята на плитко хранилище"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:184 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "задълбочаване на историята на плитко хранилище до определено време"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:190 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "превръщане в пълно хранилище"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
msgid "prepend this to submodule path output"
msgstr "добавяне на това пред пътя на подмодула"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -15498,121 +15741,127 @@
"стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с "
"приоритет)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:200 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "приемане на указатели, които обновяват „.git/shallow“"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:201 builtin/pull.c:230
msgid "refmap"
msgstr "КАРТА_С_УКАЗАТЕЛИ"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:202 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:209 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "докладване, че всички обекти може са достижими при започване от този"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
"без доставяне на пакетни файлове, вместо това да се извеждат предшественици "
"на договорните върхове"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
msgid "run 'maintenance --auto' after fetching"
msgstr "изпълняване на „maintenance --auto“ след доставяне"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:218 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "проверка за принудителни обновявания на всички клони"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
msgid "write the commit-graph after fetching"
msgstr "запазване на гра̀фа с подаванията след доставяне"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
msgid "accept refspecs from stdin"
msgstr "четене на указателите от стандартния вход"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
+#: builtin/fetch.c:592
+msgid "couldn't find remote ref HEAD"
+msgstr "указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:766
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "настройката „fetch.output“ е с неправилна стойност „%s“"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:867
#, c-format
msgid "object %s not found"
msgstr "обектът „%s“ липсва"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:871
msgid "[up to date]"
msgstr "[актуален]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
msgid "[rejected]"
msgstr "[отхвърлен]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:885
msgid "can't fetch in current branch"
msgstr "в текущия клон не може да се доставя"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "изтеглен в друго работно дърво"
+
+#: builtin/fetch.c:896
msgid "[tag update]"
msgstr "[обновяване на етикетите]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
msgid "unable to update local ref"
msgstr "локален указател не може да бъде обновен"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:901
msgid "would clobber existing tag"
msgstr "съществуващ етикет ще бъде презаписан"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:923
msgid "[new tag]"
msgstr "[нов етикет]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:926
msgid "[new branch]"
msgstr "[нов клон]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:929
msgid "[new ref]"
msgstr "[нов указател]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:968
msgid "forced update"
msgstr "принудително обновяване"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:973
msgid "non-fast-forward"
msgstr "същинско сливане"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1076
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'."
+"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 ""
-"За да я включите еднократно ползвайте опцията „--show-forced-updates“, а за "
-"да я включите за постоянно, изпълнете:\n"
+"Обичайно при доставяне се извежда, кои клони са били принудително обновени,\n"
+"но тази проверка е изключена. За да я включите за командата, ползвайте "
+"опцията\n"
+"„--show-forced-updates“, а за да я включите за постоянно, изпълнете:\n"
"\n"
" git config fetch.showForcedUpdates true"
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1080
#, c-format
msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
"Проверката за принудителни изтласквания отне %.2f сек. Може да я прескочите "
"еднократно с опцията „--no-show-forced-updates“, а за да я изключите за "
@@ -15620,23 +15869,23 @@
"\n"
" git config fetch.showForcedUpdates false\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1112
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1141
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr ""
"отхвърляне на „%s“, защото плитките върхове не може да бъдат обновявани"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
#, c-format
msgid "From %.*s\n"
msgstr "От %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1252
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15646,151 +15895,157 @@
"„git remote prune %s“, за да премахнете остарелите клони, които\n"
"предизвикват конфликта"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1349
#, c-format
msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще се окаже извън клон)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1350
#, c-format
msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1382
msgid "[deleted]"
msgstr "[изтрит]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1383 builtin/remote.c:1128
msgid "(none)"
msgstr "(нищо)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1405
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "не може да доставите в клона „%s“, който е изтеглен в пътя „%s“"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1425
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1428
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
msgstr "опцията „%s“ се прескача при „%s“\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1455
+#, c-format
+msgid "the object %s does not exist"
+msgstr "обектът „%s“ не съществува"
+
+#: builtin/fetch.c:1643
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
"засечени са множество клони, това е несъвместимо с опцията „--set-upstream“"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1655
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"следеното от „HEAD“ не може да се смени от „%2$s“ на „%1$s“, защото второто "
+"не сочи към никой клон."
+
+#: builtin/fetch.c:1668
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "не може да указвате клон за следене на отдалечен етикет"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1670
msgid "not setting upstream for a remote tag"
msgstr "не може да указвате клон за следене на отдалечен етикет"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1672
msgid "unknown branch type"
msgstr "непознат вид клон"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1674
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
-"не е открит клон за следене.\n"
-"Трябва изрично да зададете един клон с опцията „--set-upstream option“."
+"не е открит клон за следене;\n"
+"трябва изрично да зададете точно един клон с опцията „--set-upstream“"
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
#, c-format
msgid "Fetching %s\n"
msgstr "Доставяне на „%s“\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
#, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
msgstr "„%s“ не може да се достави"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1826
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "„%s“ не може да се достави (изходният код е: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1930
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
-"Не сте указали отдалечено хранилище. Задайте или адрес, или име\n"
+"не сте указали отдалечено хранилище; задайте или адрес, или име\n"
"на отдалечено хранилище, откъдето да се доставят новите версии."
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Трябва да укажете име на етикет."
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "трябва да укажете име на етикет"
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2032
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr ""
"Опцията „--negotiate-only“ изисква една или повече опции „--negotiate-tip=*“"
-#: builtin/fetch.c:1998
-msgid "Negative depth in --deepen is not supported"
-msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
-#: builtin/fetch.c:2000
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "опциите „--deepen“ и „--depth“ са несъвместими"
-
-#: builtin/fetch.c:2005
-msgid "--depth and --unshallow cannot be used together"
-msgstr "опциите „--depth“ и „--unshallow“ са несъвместими"
-
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2045
msgid "--unshallow on a complete repository does not make sense"
msgstr "не може да използвате опцията „--unshallow“ върху пълно хранилище"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2062
msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не може да добавите аргумент-хранилище"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2064
msgid "fetch --all does not make sense with refspecs"
msgstr "към „git fetch --all“ не може да добавите аргумент-указател на версия"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2073
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
+msgid "no such remote or remote group: %s"
+msgstr "няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
-#: builtin/fetch.c:2042
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Указването на група и указването на версия са несъвместими"
+#: builtin/fetch.c:2081
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "доставянето на група и указването на версия са несъвместими"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2097
msgid "must supply remote when using --negotiate-only"
msgstr "опцията „--negotiate-only“ изисква хранилище"
-#: builtin/fetch.c:2063
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Протоколът не поддържа опцията „--negotiate-only“, изход от прогамата."
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "протоколът не поддържа опцията „--negotiate-only“, изход от програмата"
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2121
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в "
-"настройката „extensions.partialClone“"
+"настройката „extensions.partialclone“"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2125
msgid "--atomic can only be used when fetching from one remote"
msgstr ""
"опцията „--atomic“ поддържа доставяне само от едно отдалечено хранилище"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2129
msgid "--stdin can only be used when fetching from one remote"
msgstr "опцията „--stdin“ поддържа доставяне само от едно отдалечено хранилище"
@@ -15800,25 +16055,29 @@
msgstr ""
"git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--log[=БРОЙ] | --no-log] [--file ФАЙЛ]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
"вмъкване на журнал състоящ се от не повече от БРОЙ записа от съкратения "
"журнал"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "псевдоним на „--log“ (ОСТАРЯЛО)"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "ТЕКСТ"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "за начало на съобщението да се ползва ТЕКСТ"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "използване на това ИМЕ вместо истинския клон-цел"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "файл, от който да се чете"
@@ -15838,47 +16097,47 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [ПОДАВАНЕ]] [--no-contains [ПОДАВАНЕ]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "цитиране подходящо за командни интерпретатори на обвивката"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "цитиране подходящо за perl"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "цитиране подходящо за python"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "цитиране подходящо за tcl"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "извеждане само на този БРОЙ напаснати указатели"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
msgid "respect format colors"
msgstr "спазване на цветовете на форма̀та"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "извеждане само на указателите, сочещи към ОБЕКТА"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "извеждане само на слетите указатели"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "извеждане само на неслетите указатели"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "извеждане само на указателите, които съдържат това ПОДАВАНЕ"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ"
@@ -15886,15 +16145,15 @@
msgid "git for-each-repo --config=<config> <command-args>"
msgstr "git for-each-repo --config=НАСТРОЙКА АРГУМЕНТ…"
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
msgid "config"
msgstr "настройка"
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
msgid "config key storing a list of repository paths"
msgstr "настройка, която съдържа списък с пътища към хранилища"
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
msgid "missing --config=<config>"
msgstr "липсва --config=НАСТРОЙКА"
@@ -16014,130 +16273,140 @@
msgid "notice: No default references"
msgstr "внимание: няма указатели по подразбиране"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: разлика в контролната сума при: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
-msgstr "„%s“: липсващ обект: „%s“"
+msgstr "%s: развален или липсващ обект: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: обектът е непознат вид „%s“: %s"
+
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "„%s“: не може да се анализира: „%s“"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "неправилен ред с контролна сума по SHA1: „%s“"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "Проверка на директория с обекти"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "Проверка на директориите с обекти"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "Проверка на връзките на „%s“"
#
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:710 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "неправилен указател „%s“"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "„%s“ сочи към нещо необичайно (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: несвързаният връх „HEAD“ не сочи към нищо"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "предупреждение: „%s“ сочи към все още несъществуващ клон (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "Проверка на дървото на кеша"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "„%s“: неправилен указател за SHA1 в дървото на кеша"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "в дървото на кеша има нещо, което не е дърво"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "показване на недостижимите обекти"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "показване на обектите извън клоните"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "показване на етикетите"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "показване на кореновите възли"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "задаване на обекти от индекса да са коренови"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "проследяване и на указателите от журнала с указателите (стандартно)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "допълнително да се проверяват пакетите и алтернативните обекти"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "проверка само на връзката"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "по-строги проверки"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "показване на напредъка"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "показване на подробни имена на достижимите обекти"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Проверка на обектите"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "„%s“: липсващ обект"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "неправилен параметър: очаква се SHA1, а бе получено: „%s“"
@@ -16156,85 +16425,79 @@
msgid "failed to parse '%s' value '%s'"
msgstr "стойността на „%s“ — „%s“ не може да се анализира"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "не може да се получи информация чрез „stat“ за директорията „%s“"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr "файлът „%s“ не може да бъде прочетен"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
-"При последното изпълнение на „git gc“ бе докладвана грешка. Коригирайте "
-"причината за\n"
-"нея и изтрийте „%s“.\n"
+"При последното изпълнение на „git gc“ бе докладвано следното — коригирайте\n"
+"причината за него и изтрийте „%s“.\n"
"Автоматичното изчистване на боклука няма да работи, преди да изтриете "
"файла.\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "окастряне на обектите, към които нищо не сочи"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "включване на автоматичното събиране на боклука (auto-gc)"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr ""
"изрично стартиране на събирането на боклука, дори и ако вече работи друго "
"събиране"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "препакетиране на всичко без най-големия пакет"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "неразпозната стойност на „gc.logexpiry“ %s"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "неразпозната стойност на периода за окастряне: %s"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Автоматично пакетиране на заден фон на хранилището за по-добра "
"производителност.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
"Погледнете ръководството за повече информация как да изпълните „git help "
"gc“.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16243,33 +16506,33 @@
"процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n"
"опцията „--force“)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Има прекалено много недостижими, непакетирани обекти.\n"
"Използвайте „git prune“, за да ги окастрите."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=ЗАДАЧА] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "опцията „--no-schedule“ не е позволена"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "непознат аргумент към „--schedule“: %s"
-#: builtin/gc.c:869
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "графът с подаванията не може да бъде записан"
-#: builtin/gc.c:905
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "неуспешно предварително доставяне на отдалечените клони"
@@ -16281,137 +16544,176 @@
msgid "failed to finish 'git pack-objects' process"
msgstr "процесът за командата „git pack-objects“ не може да завърши"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "индексът за множество пакети не може да бъде записан"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "неуспешно изпълнение на „git multi-pack-index expire“"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "неуспешно изпълнение на „git multi-pack-index repack“"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"задачата „incremental-repack“ се прескача, защото настройката „core."
"multiPackIndex“ е изключена"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "заключващият файл „%s“ съществува. Действието се прескача"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "неуспешно изпълнение на задачата „%s“"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "„%s“ не е правилна задача"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "задачата „%s“ не може да се избере повече от веднъж"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "изпълняване на задачи според състоянието на хранилището"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "честота"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "изпълняване на задачи по график"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "без извеждане на напредъка и друга информация на стандартния изход"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
msgid "task"
msgstr "задача"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "изпълнение на определена задача"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr ""
-"може да се указва максимум една от опциите „--auto“ и „--schedule=ЧЕСТОТА“"
+msgstr "опциите „--auto“ и „--schedule=ЧЕСТОТА“ са несъвместими"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "неуспешно изпълнение на „git config“"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "грешка при заместването на пътя „%s“"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "неуспешно стартиране на „launchctl“."
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "директориите за „%s“ не може да бъдат създадени"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "услугата „%s“ не може се настрои първоначално"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "неуспешно създаване на временен файл за xml"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "задачите за периодично изпълнение не може да се стартират"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"неуспешно изпълнение на „crontab -l“. Системата ви може да не поддържа "
"„cron“"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"неуспешно изпълнение на „crontab“. Системата ви може да не поддържа „cron“"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "стандартният вход на „crontab“ не може да се отвори"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "процесът на „crontab“ умря"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "неуспешно стартиране на „systemctl“"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "неуспешно изпълнение на „systemctl“"
+
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "неуспешно изтриване на „%s“"
+
+#: builtin/gc.c:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "непознат аргумент към „--scheduler“: %s"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "липсват както таймери на systemd, така и crontab"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "планиращият модул „%s“ липсва"
+
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr "друг процес задава поддръжката на заден фон"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=ПЛАНИРАЩ_МОДУЛ]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "ПЛАНИРАЩ_МОДУЛ"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "ПЛАНИРАЩият_МОДУЛ, който да изпълнява задачите"
+
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "неуспешно добавяне на хранилище към файла с глобални настройки"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance ПОДКОМАНДА [ОПЦИЯ…]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "неправилна подкоманда: „%s“"
@@ -16420,12 +16722,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [ОПЦИЯ…] [-e] ШАБЛОН [ВЕРСИЯ…] [[--] ПЪТ…]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: неуспешно създаване на нишка: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "зададен е неправилен брой нишки (%d) за %s"
@@ -16434,275 +16736,275 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "дървото не може да бъде прочетено (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не може да се изпълни „grep“ от обект от вида %s"
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "опцията „%c“ очаква число за аргумент"
-#: builtin/grep.c:837
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr "търсене в индекса, а не в работното дърво"
-#: builtin/grep.c:839
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "търсене и във файловете, които не са под управлението на git"
-#: builtin/grep.c:841
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "търсене и в следените, и в неследените файлове"
-#: builtin/grep.c:843
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "игнориране на файловете указани в „.gitignore“"
-#: builtin/grep.c:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "рекурсивно търсене във всички подмодули"
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "извеждане на редовете, които не съвпадат"
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "без значение на регистъра на буквите (главни/малки)"
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "напасване на шаблоните само по границите на думите"
-#: builtin/grep.c:854
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "обработване на двоичните файлове като текстови"
-#: builtin/grep.c:856
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "прескачане на двоичните файлове"
-#: builtin/grep.c:859
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr ""
"обработване на двоичните файлове чрез филтри за преобразуване към текст"
-#: builtin/grep.c:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "търсене в поддиректориите (стандартно)"
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото"
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "разширени регулярни изрази по POSIX"
-#: builtin/grep.c:870
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "основни регулярни изрази по POSIX (стандартно)"
-#: builtin/grep.c:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "шаблоните са дословни низове"
-#: builtin/grep.c:876
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "регулярни изрази на Perl"
-#: builtin/grep.c:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "извеждане на номерата на редовете"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "извеждане на номера на колоната на първото напасване"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "без извеждане на имената на файловете"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "извеждане на имената на файловете"
-#: builtin/grep.c:884
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr ""
"извеждане на относителните имена на файловете спрямо основната директория на "
"хранилището"
-#: builtin/grep.c:886
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "извеждане само на имената на файловете без напасващите редове"
-#: builtin/grep.c:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "псевдоним на „--files-with-matches“"
-#: builtin/grep.c:891
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr ""
"извеждане само на имената на файловете, които не съдържат ред, напасващ на "
"шаблона"
-#: builtin/grep.c:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл"
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "извеждане само на частите на редовете, които съвпадат"
-#: builtin/grep.c:898
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr "извеждане на броя на съвпаденията вместо напасващите редове"
-#: builtin/grep.c:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "оцветяване на напасванията"
-#: builtin/grep.c:901
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr "извеждане на празен ред между напасванията от различни файлове"
-#: builtin/grep.c:903
+#: builtin/grep.c:917
msgid "show filename only once above matches from same file"
msgstr ""
"извеждане на името на файла само веднъж за всички напасвания от този файл"
-#: builtin/grep.c:906
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "извеждане на такъв БРОЙ редове преди и след напасванията"
-#: builtin/grep.c:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "извеждане на такъв БРОЙ редове преди напасванията"
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "извеждане на такъв БРОЙ редове след напасванията"
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "използване на такъв БРОЙ работещи нишки"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "псевдоним на „-C БРОЙ“"
-#: builtin/grep.c:917
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона"
-#: builtin/grep.c:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "извеждане на обхващащата функция"
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "изчитане на шаблоните от ФАЙЛ"
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "напасване на ШАБЛОН"
-#: builtin/grep.c:926
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "комбиниране на шаблоните указани с опцията „-e“"
-#: builtin/grep.c:938
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr ""
"без извеждане на стандартния изход. Изходният код указва наличието на "
"напасване"
-#: builtin/grep.c:940
+#: builtin/grep.c:954
msgid "show only matches from files that match all patterns"
msgstr ""
"извеждане на редове само от файловете, които напасват на всички шаблони"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "pager"
msgstr "програма за преглед по страници"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "извеждане на съвпадащите файлове в програма за преглед по страници"
-#: builtin/grep.c:947
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
"позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази "
"опция)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "не сте задали шаблон"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
-msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии."
+msgstr "опциите „--no-index“ и „--untracked“ са несъвместими с версии."
-#: builtin/grep.c:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "версията „%s“ не може бъде открита"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "опциите „--untracked“ и „--recurse-submodules“ са несъвместими"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "неправилна комбинация от опции, „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "зададен е неправилен брой нишки: %d"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr "опцията „--open-files-in-pager“ изисква търсене в работното дърво"
-#: builtin/grep.c:1157
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“"
-#: builtin/grep.c:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "опциите „--untracked“ и „--cached“ са несъвместими"
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени "
"файлове"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "опцията „--cached“ е несъвместима със задаване на дърво"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16710,97 +17012,109 @@
"git hash-object [-t ВИД] [-w] [--path=ФАЙЛ | --no-filters] [--stdin] [--] "
"ФАЙЛ…"
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "ВИД на обекта"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "записване на обекта в базата от данни за обектите"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "изчитане на обекта от стандартния вход"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "запазване на файла както е — без филтри"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"създаване и изчисляване на контролни суми на произволни данни за повредени "
"обекти за трасиране на Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "обработване на ФАЙЛа все едно е с този път"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "показване на всички налични команди"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "без въведения"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "показване на списък с въведения"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "показване на имената на всички конфигуриращи променливи"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "показване на страница от ръководството"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "показване на страница от ръководството в уеб браузър"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "показване на информационна страница"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "извеждане на описанието на команда"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [КОМАНДА]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "показване на списък с въведения"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "показване на имената на всички конфигуриращи променливи"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [КОМАНДА]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "непознат формат на помощта „%s“"
-#: builtin/help.c:190
+#: builtin/help.c:222
msgid "Failed to start emacsclient."
msgstr "Неуспешно стартиране на „emacsclient“."
-#: builtin/help.c:203
+#: builtin/help.c:235
msgid "Failed to parse emacsclient version."
msgstr "Версията на „emacsclient“ не може да се анализира."
-#: builtin/help.c:211
+#: builtin/help.c:243
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Прекалено стара версия на „emacsclient“ — %d (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
#, c-format
msgid "failed to exec '%s'"
msgstr "неуспешно изпълнение на „%s“"
-#: builtin/help.c:307
+#: builtin/help.c:339
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16809,7 +17123,7 @@
"„%s“: път към неподдържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.cmd“."
-#: builtin/help.c:319
+#: builtin/help.c:351
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16818,342 +17132,319 @@
"„%s“: команда за поддържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.path“."
-#: builtin/help.c:436
+#: builtin/help.c:466
#, c-format
msgid "'%s': unknown man viewer."
msgstr "„%s“: непозната програма за преглед на ръководството."
-#: builtin/help.c:452
+#: builtin/help.c:482
msgid "no man viewer handled the request"
msgstr "никоя програма за преглед на ръководство не успя да обработи заявката"
-#: builtin/help.c:459
+#: builtin/help.c:489
msgid "no info viewer handled the request"
msgstr ""
"никоя програма за преглед на информационните страници не успя да обработи "
"заявката"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "„%s“ е псевдоним на „%s“"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:564 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "неправилен низ за настройката „alias.%s“: „%s“"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:580
+msgid "this option doesn't take any other arguments"
+msgstr "опцията не приема аргументи"
+
+#: builtin/help.c:601 builtin/help.c:628
#, c-format
msgid "usage: %s%s"
msgstr "употреба: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:623
msgid "'git help config' for more information"
msgstr "За повече информация изпълнете „git help config“"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "неправилен вид на обекта „%s“"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "очакваният обект „%s“ не бе получен"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "неправилен вид на обекта „%s“: очакваше се „%s“, а бе получен „%s“"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "не може да се запълни %d байт"
msgstr[1] "не може да се запълнят %d байта"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "неочакван край на файл"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "грешка при четене на входните данни"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "използвани са повече от наличните байтове"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "пакетният файл надвишава максималния възможен размер"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "пакетният файл „%s“ не може да бъде създаден"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "пакетният файл „%s“ не може да бъде отворен"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "несъответствие в подписа към пакетния файл"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "повреден обект в пакетния файл при отместване %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "декомпресирането с „inflate“ върна %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "стойността на отместването за обекта-разлика води до препълване"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "стойността на отместването за обекта-разлика е извън диапазона"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "непознат вид обект %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "пакетният файл не може да бъде прочетен"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "неочакван край на файл, липсва %<PRIuMAX> байт"
msgstr[1] "неочакван край на файл, липсват %<PRIuMAX> байта"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "сериозна грешка при декомпресиране с „inflate“"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
"СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "съществуващият обект в „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "съществуващият обект „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "неправилен обект-BLOB „%s“"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "грешка при проверката на пакетирани обекти"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Някои обекти, наследници на „%s“, не може да бъдат достигнати"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "разликата не може да бъде приложена"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "Получаване на обекти"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "Индексиране на обекти"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "пакетният файл е повреден (нееднакви суми по SHA1)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "не може да се получи информация за пакетния файл с „fstat“"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "в края на пакетния файл има повредени данни"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
-msgstr ""
-"фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, "
-"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
-"kernel.org“."
+msgstr "фатална грешка във функцията „parse_pack_objects“"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "Откриване на съответните разлики"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "не може да се създаде нишка: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
-msgstr ""
-"фатална грешка във функцията „conclude_pack“. Това е грешка в Git, "
-"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
-"kernel.org“."
+msgstr "фатална грешка"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "действието завърши с %d локален обект"
msgstr[1] "действието завърши с %d локални обекта"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в "
"диска)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "в пакета има %d ненапасваща разлика"
msgstr[1] "в пакета има %d ненапасващи разлики"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "добавеният обект не може да се компресира с „deflate“: %d"
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "локалният обект „%s“ е повреден"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "името на пакетния файл „%s“ не завършва с „%s“"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "грешка при запис на файла „%s“ „%s“"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "грешка при затварянето на записания файл „%s“ „%s“"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "временният файл „*.%s“ не може да се преименува на „%s“"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "грешка при затварянето на пакетния файл"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "пакетният файл не може да бъде запазен"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "файлът за индекса не може да бъде съхранен"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "%d обект не е разлика"
msgstr[1] "%d обекта не са разлика"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, 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:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "Процесът не може да се върне към предишната работна директория"
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "неправилна стойност „%s“"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "непознат алгоритъм за контролни суми „%s“"
#: builtin/index-pack.c:1850
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "опцията „--fix-thin“ изисква „--stdin“"
-
-#: builtin/index-pack.c:1852
msgid "--stdin requires a git repository"
msgstr "„--stdin“ изисква хранилище на git"
-#: builtin/index-pack.c:1854
-msgid "--object-format cannot be used with --stdin"
-msgstr "опцията „--object-format“ и „--stdin“ са несъвместими"
-
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "опцията „--verify“ изисква име на пакетен файл"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "грешка при проверка с „fsck“ на пакетните обекти"
@@ -17279,10 +17570,6 @@
msgid "specify the hash algorithm to use"
msgstr "указване на алгоритъм за контролна сума"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "опциите „--separate-git-dir“ и „--bare“ са несъвместими"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
@@ -17365,7 +17652,7 @@
#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
-msgstr "опцията „--trailer“ е несъвместима с „--name-only“"
+msgstr "опцията „--trailer“ е несъвместима с „--only-input“"
#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
@@ -17418,85 +17705,85 @@
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "опцията „-LДИАПАЗОН:ФАЙЛ“ не може да се ползва с път"
-#: builtin/log.c:306
+#: builtin/log.c:321
#, c-format
msgid "Final output: %d %s\n"
msgstr "Резултат: %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:586
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: повреден файл"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
#, c-format
msgid "could not read object %s"
msgstr "обектът не може да бъде прочетен: %s"
-#: builtin/log.c:701
+#: builtin/log.c:716
#, c-format
msgid "unknown type: %d"
msgstr "неизвестен вид: %d"
-#: builtin/log.c:846
+#: builtin/log.c:861
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: неправилно придружаващо писмо от режима на описание"
-#: builtin/log.c:853
+#: builtin/log.c:868
msgid "format.headers without value"
msgstr "не е зададена стойност на „format.headers“"
-#: builtin/log.c:982
+#: builtin/log.c:997
#, c-format
msgid "cannot open patch file %s"
msgstr "файлът-кръпка „%s“ не може да бъде отворен"
-#: builtin/log.c:999
+#: builtin/log.c:1014
msgid "need exactly one range"
msgstr "трябва да зададете точно един диапазон"
-#: builtin/log.c:1009
+#: builtin/log.c:1024
msgid "not a range"
msgstr "не е диапазон"
-#: builtin/log.c:1173
+#: builtin/log.c:1188
msgid "cover letter needs email format"
msgstr "придружаващото писмо трябва да е форматирано като е-писмо"
-#: builtin/log.c:1179
+#: builtin/log.c:1194
msgid "failed to create cover-letter file"
msgstr "неуспешно създаване на придружаващо писмо"
-#: builtin/log.c:1266
+#: builtin/log.c:1281
#, c-format
msgid "insane in-reply-to: %s"
msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1308
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]"
-#: builtin/log.c:1351
+#: builtin/log.c:1366
msgid "two output directories?"
msgstr "може да укажете максимум една директория за изход"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
#, c-format
msgid "unknown commit %s"
msgstr "непознато подаване: „%s“"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 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:1522
+#: builtin/log.c:1537
msgid "could not find exact merge base"
msgstr "точната база за сливане не може да бъде открита"
-#: builtin/log.c:1532
+#: builtin/log.c:1547
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"
@@ -17507,307 +17794,289 @@
"Може ръчно да зададете базово подаване чрез „--"
"base=<ИДЕНТИФИКАТОР_НА_БАЗОВО_ПОДАВАНЕ>“."
-#: builtin/log.c:1555
+#: builtin/log.c:1570
msgid "failed to find exact merge base"
msgstr "точната база при сливане не може да бъде открита"
-#: builtin/log.c:1572
+#: builtin/log.c:1587
msgid "base commit should be the ancestor of revision list"
msgstr "базовото подаване трябва да е предшественикът на списъка с версиите"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "base commit shouldn't be in revision list"
msgstr "базовото подаване не може да е в списъка с версиите"
-#: builtin/log.c:1640
+#: builtin/log.c:1655
msgid "cannot get patch id"
msgstr "идентификаторът на кръпката не може да бъде получен"
-#: builtin/log.c:1703
+#: builtin/log.c:1718
msgid "failed to infer range-diff origin of current series"
msgstr ""
"неуспешно определяне на началото на диапазонната разлика на текущата поредица"
-#: builtin/log.c:1705
+#: builtin/log.c:1720
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr ""
"„%s“ се ползва като началото на диапазонната разлика на текущата поредица"
-#: builtin/log.c:1749
+#: builtin/log.c:1764
msgid "use [PATCH n/m] even with a single patch"
msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка"
-#: builtin/log.c:1752
+#: builtin/log.c:1767
msgid "use [PATCH] even with multiple patches"
msgstr "номерация „[PATCH]“ дори и при множество кръпки"
-#: builtin/log.c:1756
+#: builtin/log.c:1771
msgid "print patches to standard out"
msgstr "извеждане на кръпките на стандартния изход"
-#: builtin/log.c:1758
+#: builtin/log.c:1773
msgid "generate a cover letter"
msgstr "създаване на придружаващо писмо"
-#: builtin/log.c:1760
+#: builtin/log.c:1775
msgid "use simple number sequence for output file names"
msgstr "проста числова последователност за имената на файловете-кръпки"
-#: builtin/log.c:1761
+#: builtin/log.c:1776
msgid "sfx"
msgstr "ЗНАЦИ"
-#: builtin/log.c:1762
+#: builtin/log.c:1777
msgid "use <sfx> instead of '.patch'"
msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“"
-#: builtin/log.c:1764
+#: builtin/log.c:1779
msgid "start numbering patches at <n> instead of 1"
msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1"
-#: builtin/log.c:1765
+#: builtin/log.c:1780
msgid "reroll-count"
msgstr "номер на редакция"
-#: builtin/log.c:1766
+#: builtin/log.c:1781
msgid "mark the series as Nth re-roll"
msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки"
-#: builtin/log.c:1768
+#: builtin/log.c:1783
msgid "max length of output filename"
msgstr "максимална дължина на име на всеки пакетен файл"
-#: builtin/log.c:1770
+#: builtin/log.c:1785
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "използване на „[RFC PATCH]“ вместо „[PATCH]“"
-#: builtin/log.c:1773
+#: builtin/log.c:1788
msgid "cover-from-description-mode"
msgstr "режим-придружаващо-писмо-по-описание"
-#: builtin/log.c:1774
+#: builtin/log.c:1789
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
"генериране на частите на придружаващото писмо на базата на описанието на "
"клона"
-#: builtin/log.c:1776
+#: builtin/log.c:1791
msgid "use [<prefix>] instead of [PATCH]"
msgstr "използване на този „[ПРЕФИКС]“ вместо „[PATCH]“"
-#: builtin/log.c:1779
+#: builtin/log.c:1794
msgid "store resulting files in <dir>"
msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
-#: builtin/log.c:1782
+#: builtin/log.c:1797
msgid "don't strip/add [PATCH]"
msgstr "без добавяне/махане на префикса „[PATCH]“"
-#: builtin/log.c:1785
+#: builtin/log.c:1800
msgid "don't output binary diffs"
msgstr "без извеждане на разлики между двоични файлове"
-#: builtin/log.c:1787
+#: builtin/log.c:1802
msgid "output all-zero hash in From header"
msgstr "в заглавната част „From:“ (от) контролната сума да е само от нули"
-#: builtin/log.c:1789
+#: builtin/log.c:1804
msgid "don't include a patch matching a commit upstream"
msgstr "без кръпки, които присъстват в следения клон"
-#: builtin/log.c:1791
+#: builtin/log.c:1806
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)"
-#: builtin/log.c:1793
+#: builtin/log.c:1808
msgid "Messaging"
msgstr "Опции при изпращане"
-#: builtin/log.c:1794
+#: builtin/log.c:1809
msgid "header"
msgstr "ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1795
+#: builtin/log.c:1810
msgid "add email header"
msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
msgid "email"
msgstr "Е-ПОЩА"
-#: builtin/log.c:1796
+#: builtin/log.c:1811
msgid "add To: header"
msgstr "добавяне на заглавна част „To:“ (до)"
-#: builtin/log.c:1797
+#: builtin/log.c:1812
msgid "add Cc: header"
msgstr "добавяне на заглавна част „Cc:“ (и до)"
-#: builtin/log.c:1798
+#: builtin/log.c:1813
msgid "ident"
msgstr "ИДЕНТИЧНОСТ"
-#: builtin/log.c:1799
+#: builtin/log.c:1814
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако "
"не е зададена такава, се взима адреса на подаващия"
-#: builtin/log.c:1801
+#: builtin/log.c:1816
msgid "message-id"
msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1802
+#: builtin/log.c:1817
msgid "make first mail a reply to <message-id>"
msgstr ""
"първото съобщение да е в отговор на е-писмото с този "
"ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
msgid "boundary"
msgstr "граница"
-#: builtin/log.c:1804
+#: builtin/log.c:1819
msgid "attach the patch"
msgstr "прикрепяне на кръпката"
-#: builtin/log.c:1807
+#: builtin/log.c:1822
msgid "inline the patch"
msgstr "включване на кръпката в текста на писмата"
-#: builtin/log.c:1811
+#: builtin/log.c:1826
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или "
"„deep“ (дълбок)"
-#: builtin/log.c:1813
+#: builtin/log.c:1828
msgid "signature"
msgstr "подпис"
-#: builtin/log.c:1814
+#: builtin/log.c:1829
msgid "add a signature"
msgstr "добавяне на поле за подпис"
-#: builtin/log.c:1815
+#: builtin/log.c:1830
msgid "base-commit"
msgstr "БАЗОВО_ПОДАВАНЕ"
-#: builtin/log.c:1816
+#: builtin/log.c:1831
msgid "add prerequisite tree info to the patch series"
msgstr "добавяне на необходимото БАЗово дърво към поредицата от кръпки"
-#: builtin/log.c:1819
+#: builtin/log.c:1834
msgid "add a signature from a file"
msgstr "добавяне на подпис от файл"
-#: builtin/log.c:1820
+#: builtin/log.c:1835
msgid "don't print the patch filenames"
msgstr "без извеждане на имената на кръпките"
-#: builtin/log.c:1822
+#: builtin/log.c:1837
msgid "show progress while generating patches"
msgstr "извеждане на напредъка във фазата на създаване на кръпките"
-#: builtin/log.c:1824
+#: builtin/log.c:1839
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"показване на промените спрямо ВЕРСията в придружаващото писмо или единствена "
"кръпка"
-#: builtin/log.c:1827
+#: builtin/log.c:1842
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"показване на промените спрямо указателя на ВЕРСията в придружаващото писмо "
"или единствена кръпка"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "процент за претегляне при оценка на създаването"
-#: builtin/log.c:1916
+#: builtin/log.c:1931
#, c-format
msgid "invalid ident line: %s"
msgstr "грешна идентичност: %s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "опциите „-n“ и „-k“ са несъвместими"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
msgid "--name-only does not make sense"
msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1943
+#: builtin/log.c:1958
msgid "--name-status does not make sense"
msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1945
+#: builtin/log.c:1960
msgid "--check does not make sense"
msgstr "опцията „--check“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-"опциите „--stdout“, „--output“ и „--output-directory“ са несъвместими една с "
-"друга"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
"опцията „--interdiff“ изисква опция „--cover-letter“ или единствена кръпка"
-#: builtin/log.c:2093
+#: builtin/log.c:2108
msgid "Interdiff:"
msgstr "Разлика в разликите:"
-#: builtin/log.c:2094
+#: builtin/log.c:2109
#, c-format
msgid "Interdiff against v%d:"
msgstr "Разлика в разликите спрямо v%d:"
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "опцията „--creation-factor“ изисква опция „--range-diff“"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
"опцията „--range-diff“ изисква опция „--cover-letter“ или единствена кръпка"
-#: builtin/log.c:2112
+#: builtin/log.c:2127
msgid "Range-diff:"
msgstr "Диапазонна разлика:"
-#: builtin/log.c:2113
+#: builtin/log.c:2128
#, c-format
msgid "Range-diff against v%d:"
msgstr "Диапазонна разлика спрямо v%d:"
-#: builtin/log.c:2124
+#: builtin/log.c:2139
#, c-format
msgid "unable to read signature file '%s'"
msgstr "файлът „%s“ с подпис не може да бъде прочетен"
-#: builtin/log.c:2160
+#: builtin/log.c:2175
msgid "Generating patches"
msgstr "Създаване на кръпки"
-#: builtin/log.c:2204
+#: builtin/log.c:2219
msgid "failed to create output files"
msgstr "неуспешно създаване на изходни файлове"
-#: builtin/log.c:2263
+#: builtin/log.c:2279
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2333
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17815,131 +18084,140 @@
"Следеният отдалечен клон не бе открит, затова изрично задайте "
"ОТДАЛЕЧЕН_КЛОН.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [ОПЦИЯ…] [ФАЙЛ…]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "разделяне на пътищата с нулевия знак „NUL“"
+
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "извеждане на състоянието на файловете с еднобуквени флагове"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "малки букви за файловете, които да се счетат за непроменени"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "малки букви за файловете за командата „fsmonitor clean“"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "извеждане на кешираните файлове (стандартно)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "извеждане на изтритите файлове"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "извеждане на променените файлове"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "извеждане на другите файлове"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "извеждане на игнорираните файлове"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "извеждане на името на обекта за съдържанието на индекса"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr "извеждане на файловете, които трябва да бъдат изтрити"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "извеждане само на името на другите (неследените) директории"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "извеждане на знаците за край на ред във файловете"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "без извеждане на празните директории"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "извеждане на неслетите файлове"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "извеждане на информацията за отмяна на разрешените подавания"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "прескачане на файловете напасващи ШАБЛОНа"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "шаблоните за игнориране да се прочетат от този ФАЙЛ"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "изчитане на шаблоните за игнориране от ФАЙЛ"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
"изчитане на допълнителните шаблони за игнориране по директория от този ФАЙЛ"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "добавяне на стандартно игнорираните от Git файлове"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "пътищата да са относителни спрямо основната директория на проекта"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:667
msgid "recurse through submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr "грешка, ако някой от тези ФАЙЛове не е в индекса"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "УКАЗАТЕЛ_КЪМ_ДЪРВО"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"считане, че пътищата изтрити след УКАЗАТЕЛя_КЪМ_ДЪРВО все още съществуват"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "извеждане на информацията за изчистване на грешки"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "без повтаряне на записите"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr ""
+"указване на частично изтеглените директории при наличието на частичен индекс"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=КОМАНДА]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "без извеждане на адресите на отдалечените хранилища"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "КОМАНДА"
@@ -18012,9 +18290,7 @@
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
-msgstr ""
-"git mailinfo [ОПЦИЯ…] СЪОБЩЕНИЕ КРЪПКА < ПИСМО >ИНФОРМАЦИЯ\n"
-"git diff --no-index ПЪТ ПЪТ"
+msgstr "git mailinfo [ОПЦИЯ…] СЪОБЩЕНИЕ КРЪПКА < ПИСМО >ИНФОРМАЦИЯ"
#: builtin/mailinfo.c:58
msgid "keep subject"
@@ -18063,7 +18339,7 @@
msgid "use headers in message's body"
msgstr "заглавни части в тялото на писмото"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "празна пощенска кутия mbox: „%s“"
@@ -18126,26 +18402,30 @@
msgstr "сливане на базата на „diff3“"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "засилено сливане на базата на „diff3“"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "при конфликти да се ползва локалната версия"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "при конфликти да се ползва чуждата версия"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "при конфликти да се ползва обединена версия"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "при конфликти да се ползва маркер с такъв БРОЙ знаци"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "без предупреждения при конфликти"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "задаване на етикети за ФАЙЛ_1/ОРИГИНАЛ/ФАЙЛ_2"
@@ -18180,188 +18460,192 @@
msgid "Merging %s with %s\n"
msgstr "Сливане на „%s“ с „%s“\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]"
-#: builtin/merge.c:123
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "опцията „-m“ изисква стойност"
-#: builtin/merge.c:146
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "опцията „%s“ изисква стойност"
-#: builtin/merge.c:199
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Няма такава стратегия за сливане: „%s“.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Наличните стратегии са:"
-#: builtin/merge.c:205
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Допълнителните стратегии са:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "без извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(псевдоним на „--stat“)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
"за подаване"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "създаване на едно подаване вместо извършване на сливане"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "извършване на подаване при успешно сливане (стандартно действие)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "редактиране на съобщението преди подаване"
-#: builtin/merge.c:271
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "позволяване на превъртане (стандартно действие)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "преустановяване, ако превъртането е невъзможно"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "проверка, че указаното подаване е с правилен подпис на GPG"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "СТРАТЕГИЯ"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "СТРАТЕГИЯ за сливане, която да се ползва"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "ОПЦИЯ=СТОЙНОСТ"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "ОПЦИЯ за избраната стратегия за сливане"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "използване на това ИМЕ вместо истинския клон-цел"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "преустановяване на текущото сливане"
-#: builtin/merge.c:292
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
-msgstr "преустановяване без промяна на индекса и работното дърво"
+msgstr "преустановяване (--abort) без промяна на индекса и работното дърво"
-#: builtin/merge.c:294
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "продължаване на текущото сливане"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "позволяване на сливане на независими истории"
-#: builtin/merge.c:303
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr ""
"без изпълнение на куките преди подаване и сливане и при промяна на "
"съобщението за подаване (pre-merge-commit и commit-msg)"
-#: builtin/merge.c:320
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "не може да се извърши скатаване"
-#: builtin/merge.c:325
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "неуспешно скатаване"
-#: builtin/merge.c:330
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "неправилен обект: „%s“"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "неуспешно прочитане на обект-дърво"
-#: builtin/merge.c:400
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "Вече е обновено (няма какво да се вкара)"
-#: builtin/merge.c:414
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Вкарано подаване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
"Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "„%s“ не сочи към подаване"
-#: builtin/merge.c:602
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“"
-#: builtin/merge.c:728
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "Поддържа се само сливане на точно две истории."
-#: builtin/merge.c:741
+#: builtin/merge.c:745
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“"
+msgid "unknown strategy option: -X%s"
+msgstr "непозната опция за стратегия: -X%s"
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "„%s“ не може да бъде записан"
-#: builtin/merge.c:812
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "От „%s“ не може да се чете"
-#: builtin/merge.c:821
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Сливането няма да бъде подадено. За завършването му и подаването му "
"използвайте командата „git commit“.\n"
-#: builtin/merge.c:827
+#: builtin/merge.c:831
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"
@@ -18370,11 +18654,11 @@
"В съобщението при подаване добавете информация за причината за\n"
"сливането, особено ако сливате обновен отдалечен клон в тематичен клон.\n"
-#: builtin/merge.c:832
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Празно съобщение предотвратява подаването.\n"
-#: builtin/merge.c:835
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18383,76 +18667,76 @@
"Редовете, които започват с „%c“, ще бъдат пропуснати, а празно\n"
"съобщение преустановява подаването.\n"
-#: builtin/merge.c:888
+#: builtin/merge.c:894
msgid "Empty commit message."
msgstr "Празно съобщение при подаване."
-#: builtin/merge.c:903
+#: builtin/merge.c:909
#, c-format
msgid "Wonderful.\n"
msgstr "Първият етап на сливането завърши.\n"
-#: builtin/merge.c:964
+#: builtin/merge.c:970
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Неуспешно автоматично сливане — коригирайте конфликтите и подайте "
"резултата.\n"
-#: builtin/merge.c:1003
+#: builtin/merge.c:1009
msgid "No current branch."
msgstr "Няма текущ клон."
-#: builtin/merge.c:1005
+#: builtin/merge.c:1011
msgid "No remote for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/merge.c:1007
+#: builtin/merge.c:1013
msgid "No default upstream defined for the current branch."
msgstr "Текущият клон не следи никой клон."
-#: builtin/merge.c:1012
+#: builtin/merge.c:1018
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Никой клон не следи клона „%s“ от хранилището „%s“"
-#: builtin/merge.c:1069
+#: builtin/merge.c:1075
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Неправилна стойност „%s“ в средата „%s“"
-#: builtin/merge.c:1172
+#: builtin/merge.c:1177
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "не може да се слее в „%s“: %s"
-#: builtin/merge.c:1206
+#: builtin/merge.c:1211
msgid "not something we can merge"
msgstr "не може да се слее"
-#: builtin/merge.c:1316
+#: builtin/merge.c:1324
msgid "--abort expects no arguments"
msgstr "опцията „--abort“ не приема аргументи"
-#: builtin/merge.c:1320
+#: builtin/merge.c:1328
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Не може да преустановите сливане, защото в момента не се извършва такова "
"(липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1346
msgid "--quit expects no arguments"
msgstr "опцията „--quit“ не приема аргументи"
-#: builtin/merge.c:1351
+#: builtin/merge.c:1359
msgid "--continue expects no arguments"
msgstr "опцията „--continue“ не приема аргументи"
-#: builtin/merge.c:1355
+#: builtin/merge.c:1363
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1371
+#: builtin/merge.c:1379
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18460,7 +18744,7 @@
"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n"
"Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1378
+#: builtin/merge.c:1386
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18468,100 +18752,86 @@
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува). Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1381
+#: builtin/merge.c:1389
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува)."
-#: builtin/merge.c:1395
-msgid "You cannot combine --squash with --no-ff."
-msgstr "опциите „--squash“ и „--no-ff“ са несъвместими."
-
-#: builtin/merge.c:1397
-msgid "You cannot combine --squash with --commit."
-msgstr "опциите „--squash“ и „--commit“ са несъвместими."
-
-#: builtin/merge.c:1413
+#: builtin/merge.c:1421
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена."
-#: builtin/merge.c:1430
+#: builtin/merge.c:1438
msgid "Squash commit into empty head not supported yet"
msgstr "Вкарване на подаване във връх без история все още не се поддържа"
-#: builtin/merge.c:1432
+#: builtin/merge.c:1440
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-"Понеже върхът е без история, всички сливания са превъртания, не може да се "
-"извърши същинско сливане изисквано от опцията „--no-ff“"
+"Понеже върхът е без история, сливания, които не са превъртания, са невъзможни"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1445
#, c-format
msgid "%s - not something we can merge"
msgstr "„%s“ — не е нещо, което може да се слее"
-#: builtin/merge.c:1439
+#: builtin/merge.c:1447
msgid "Can merge only exactly one commit into empty head"
msgstr "Може да слеете точно едно подаване във връх без история"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1534
msgid "refusing to merge unrelated histories"
msgstr "независими истории не може да се слеят"
-#: builtin/merge.c:1539
+#: builtin/merge.c:1553
#, c-format
msgid "Updating %s..%s\n"
msgstr "Обновяване „%s..%s“\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1601
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Проба със сливане в рамките на индекса…\n"
-#: builtin/merge.c:1592
+#: builtin/merge.c:1608
#, c-format
msgid "Nope.\n"
msgstr "Неуспешно сливане.\n"
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "Не може да се извърши превъртане, преустановяване на действието."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: builtin/merge.c:1667 builtin/merge.c:1733
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Привеждане на дървото към първоначалното…\n"
-#: builtin/merge.c:1655
+#: builtin/merge.c:1671
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Пробване със стратегията за сливане „%s“…\n"
-#: builtin/merge.c:1707
+#: builtin/merge.c:1723
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Никоя стратегия за сливане не може да извърши сливането.\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1725
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Неуспешно сливане със стратегия „%s“.\n"
-#: builtin/merge.c:1718
+#: builtin/merge.c:1735
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr ""
"Ползва се стратегията „%s“, която ще подготви дървото за коригиране на "
"ръка.\n"
-#: builtin/merge.c:1732
+#: builtin/merge.c:1749
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-"Автоматичното сливане завърши успешно. Самото подаване не е извършено, "
-"защото бе зададена опцията „--no-commit“.\n"
+"Автоматичното сливане завърши успешно. Самото подаване не е извършено\n"
#: builtin/mktag.c:10
msgid "git mktag"
@@ -18592,15 +18862,15 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "обектът „%s“ е с етикет за %s, но е %s"
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr "етикетът на стандартния вход не преминава строгата проверка с „fsck“"
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr "етикетът на стандартния вход не сочи към правилен обект"
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
msgid "unable to write tag file"
msgstr "файлът за етикета не може да бъде запазен"
@@ -18621,37 +18891,55 @@
msgstr "разрешаване на създаването на повече от едно дърво"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [ОПЦИЯ…] write [--preferred-pack=ПАКЕТ]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [ОПЦИЯ…] write [--preferred-pack=ПАКЕТ] [--refs-"
+"snapshot=ПЪТ]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [ОПЦИЯ…] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [ОПЦИЯ…] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [ОПЦИЯ…] repack [--batch-size=РАЗМЕР]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"ДИРекторията_с_ОБЕКТи съдържа множество двойки пакетни файлове със "
"съответния им индекс"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "предпочитан_пакет"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr ""
"пакет, който да се преизползва при изчисляване на многопакетна битовата маска"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "запазване на многопакетната битова маска"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr ""
+"запазване на битовата маска за множество пакети, съдържаща само дадените "
+"индекси"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "снимка на указателите за избор на подавания по битова маска"
+
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18659,11 +18947,6 @@
"при препакетиране пакетните файлове, които са с по-малък от този размер, да "
"се обединяват в пакети с по-голям от този размер"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "непозната подкоманда: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ"
@@ -18692,119 +18975,119 @@
msgid "skip move/rename errors"
msgstr "прескачане на грешките при преместване/преименуване"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "целта „%s“ съществува и не е директория"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "неправилен обект"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "директория не може да се премести в себе си"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "директория не може да се премести върху файл"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "първоначалната директория е празна"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "не е под контрола на Git"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "конфликт"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "целта съществува"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "презаписване на „%s“"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Презаписването е невъзможно"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "множество източници за една цел"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "целевата директория не съществува"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, обект: „%s“, цел: „%s“"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Преименуване на „%s“ на „%s“\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
#, c-format
msgid "renaming '%s' failed"
msgstr "неуспешно преименуване на „%s“"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [ОПЦИЯ…] ПОДАВАНЕ…"
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [ОПЦИЯ…] --all"
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [ОПЦИЯ…] --stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
msgid "print only ref-based names (no object names)"
msgstr "извеждане само на имена на базата на указатели (а не имена на обекти)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
msgid "only use tags to name the commits"
msgstr "използване само на етикетите за именуване на подаванията"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
msgid "only use refs matching <pattern>"
msgstr "използване само на указателите напасващи на ШАБЛОНа"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
msgid "ignore refs matching <pattern>"
msgstr "игнориране на указателите напасващи на ШАБЛОНа"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
msgid "list all commits reachable from all refs"
msgstr ""
"извеждане на всички подавания, които може да бъдат достигнати от всички "
"указатели"
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
msgid "read from stdin"
msgstr "четене от стандартния вход"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
msgid "allow to print `undefined` names (default)"
msgstr "да се извеждат и недефинираните имена (стандартна стойност на опцията)"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
msgid "dereference tags in the input (internal use)"
msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)"
@@ -18924,62 +19207,62 @@
msgid "Write/edit the notes for the following object:"
msgstr "Записване/редактиране на бележките за следния обект:"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "действието „show“ не може да се изпълни за обект „%s“"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "изведената информация от действието „show“ не може да се прочете"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "действието „show“ не може да се завърши за обект „%s“"
-#: builtin/notes.c:197
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr "задайте съдържанието на бележката с някоя от опциите „-m“ или „-F“"
-#: builtin/notes.c:206
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "обектът-бележка не може да бъде записан"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "съдържанието на бележката е във файла „%s“"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:581
#, c-format
msgid "could not open or read '%s'"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "не може да се открие към какво сочи „%s“."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "обектът „%s“ не може да бъде прочетен."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr ""
"съдържанието на бележка не може да се вземе от обект, който не е BLOB: „%s“."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "входен ред с неправилен формат: „%s“."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "бележката не може да се копира от „%s“ към „%s“"
@@ -18987,50 +19270,50 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
"няма да се извърши „%s“ върху бележките в „%s“, защото са извън „refs/"
"notes/“."
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
msgid "too many arguments"
msgstr "прекалено много аргументи"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "няма бележки за обекта „%s“."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "низ, който е съдържанието на бележката"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "ФАЙЛ със съдържанието на бележката"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "преизползване и редактиране на указания ОБЕКТ-бележка"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "преизползване на указания ОБЕКТ-бележка"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "приемане и на празни бележки"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "замяна на съществуващите бележки"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19039,31 +19322,31 @@
"Не може да се добави бележка, защото такава вече съществува за обекта „%s“. "
"Използвайте опцията „-f“, за да презапишете съществуващи бележки."
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Презаписване на съществуващите бележки за обекта „%s“\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "Изтриване на бележката за обекта „%s“\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "изчитане на обектите от стандартния вход"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"зареждане на настройките за КОМАНДАта, която презаписва подавания (включва "
"опцията „--stdin“)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "прекалено малко аргументи"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19072,12 +19355,12 @@
"Не може да се копира бележка, защото такава вече съществува за обекта „%s“. "
"Използвайте опцията „-f“, за да презапишете съществуващи бележки."
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "няма бележки за обекта-източник „%s“. Не може да се копира."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -19088,52 +19371,52 @@
"Вместо това ги използвайте с подкомандата „add“: „git notes add -f -m/-F/-c/-"
"C“.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде изтрит"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "указателят „NOTES_MERGE_REF“ не може да бъде изтрит"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "работната директория на „git notes merge“ не може да бъде изтрита"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде прочетен"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се открие."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се анализира."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "не може да се открие към какво сочи „NOTES_MERGE_REF“"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "неуспешно сливане на бележките"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "непозната стратегия за сливане на бележки „%s“"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Общи опции"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Опции при сливане"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -19143,46 +19426,46 @@
"„union“ (обединяване), „cat_sort_uniq“ (обединяване, подреждане, уникални "
"резултати)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Подаване на неслети бележки"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "завършване на сливането чрез подаване на неслети бележки"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Преустановяване на корекцията при сливането на бележки"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "преустановяване на сливането на бележки"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "опциите „--commit“, „--abort“ и „-s“/„--strategy“ са несъвместими"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "трябва да укажете указател към бележка за сливане."
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "неизвестна стратегия към опцията „-s“/„--strategy“: „%s“"
-#: builtin/notes.c:873
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "в момента се извършва сливане на бележките в „%s“ при „%s“"
-#: builtin/notes.c:876
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "не може да се запази връзка към указателя на текущата бележка („%s“)."
-#: builtin/notes.c:878
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19193,41 +19476,41 @@
"резултата с „git notes merge --commit“ или преустановете сливането с "
"командата „git notes merge --abort“.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:594
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Не може да се открие към какво сочи „%s“."
-#: builtin/notes.c:900
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "Няма бележки за обекта „%s“\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "опитът за изтриването на несъществуваща бележка не се счита за грешка"
-#: builtin/notes.c:915
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "изчитане на имената на обектите от стандартния вход"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "само извеждане без действително окастряне"
-#: builtin/notes.c:955
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "докладване на окастрените обекти"
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1036 builtin/stash.c:1818
#, c-format
msgid "unknown subcommand: %s"
msgstr "непозната подкоманда: %s"
@@ -19279,87 +19562,91 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "очаква се обект при отместване %<PRIuMAX> в пакетния файл „%s“"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"изключване на записването на битовата маска, пакетите са разделени поради "
"стойността на „pack.packSizeLimit“"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "Записване на обектите"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "неуспешно записване на индекси на база битови маски"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "бяха записани %<PRIu32> обекти, а се очакваха %<PRIu32>"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"изключване на записването на битовата маска, защото някои обекти няма да се "
"пакетират"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "прекалено далечно начало на отместването за обектите-разлика за „%s“"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "недостижимо начало на отместването за обектите-разлика за „%s“"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "Преброяване на обектите"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "обектът „%s“ не може да се прочете"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "обектът „%s“ е с неправилна дължина (%<PRIuMAX>, а не %<PRIuMAX>)"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "неоптимизиран пакет — паметта свърши"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Делта компресията ще използва до %d нишки"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
"обектите, които може да бъдат достигнати от етикета „%s“, не може да бъдат "
"пакетирани"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "Компресиране на обектите"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "неправилен брой разлики"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19368,7 +19655,7 @@
"стойността на „uploadpack.blobpackfileuri“ трябва да е във формат "
"„СУМА_НА_ОБЕКТ СУМА_НА_ПАКЕТ АДРЕС“ (получена е „%s“)"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19376,17 +19663,18 @@
"вече има настройка за обекта в друг ред „uploadpack."
"blobpackfileuri“ (получена е „%s“)"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "видът на обекта „%s“ в пакет „%s“ не може да бъде определен"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr "пакетът „%s“ не може да се открие"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -19395,7 +19683,7 @@
"очаква се идентификатор на краен обект, а не:\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -19404,264 +19692,260 @@
"очаква се идентификатор на обект, а не:\n"
" %s"
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "неправилна стойност за „--missing“"
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "индексът на пакетния файл не може да бъде отворен"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "непакетираният обект в „%s“ не може да бъде анализиран"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "оставането на обекта непакетиран не може да бъде наложено"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "„%s“ не е версия"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "неправилна версия „%s“"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "скорошните обекти не може да бъдат добавени"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "неподдържана версия на индекса „%s“"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "неправилна версия на индекса „%s“"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr ""
"запазване на индекса на пакетните файлове във форма̀та с указаната версия"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "максимален размер на всеки пакетен файл"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "игнориране на обектите заети от други хранилища на обекти"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "игнориране на пакетираните обекти"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "ограничаване на прозореца за пакетиране по брой обекти"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"ограничаване на прозореца за пакетиране и по памет освен по брой обекти"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"максимална дължина на веригата от разлики, която е позволена в пакетния файл"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "преизползване на съществуващите разлики"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "преизползване на съществуващите обекти"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "използване на обекти „OFS_DELTA“"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr ""
"стартиране на нишки за претърсване на най-добрите съвпадения на разликите"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "без създаване на празен пакетен файл"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "изчитане на версиите от стандартния вход"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "ограничаване до все още непакетираните обекти"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr ""
"включване на всички обекти, които може да се достигнат от произволен указател"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr "включване и на обектите сочени от записите в журнала на указателите"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "включване и на обектите сочени от индекса"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr "изчитане на пакетите от стандартния вход"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "извеждане на пакета на стандартния изход"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"включване и на обектите-етикети, които сочат към обектите, които ще бъдат "
"пакетирани"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "запазване на недостижимите обекти"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "пакетиране и на недостижимите обекти"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "използване на алгоритъм за частична достижимост"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "създаване на съкратени пакети"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "пакетиране подходящо за плитко доставяне"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "игнориране на пакетите, които са придружени от файл „.keep“"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "пропускане на този пакет"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "ниво на компресиране при пакетиране"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr ""
"извеждане на всички родители — дори и тези, които нормално са скрити при "
"присажданията"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"използване на съществуващи индекси на база битови маски за ускоряване на "
"преброяването на обектите"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "запазване и на индекс на база битова маска, заедно с индекса за пакета"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "записване на индекси на база битови маски при възможност"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "как да се обработват липсващите обекти"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr "без пакетиране на обекти в гарантиращи пакети"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr "без промяна на групите при делта компресия"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "протокол"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "без ползване на настройки „uploadpack.blobpackfileuri“ с този протокол"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "веригата с разлики е прекалено дълбока — %d, ще се ползва %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
"Стойността на настройката „pack.deltaCacheLimit“ е прекалено голяма. Ще се "
"ползва %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"опцията „--max-pack-size“ не може да се използва за създаване на пакетни "
"файлове за пренос"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "минималният размер на пакетите е 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
"опцията „--thin“не може да се използва за създаване на пакетни файлове с "
"индекс"
-#: builtin/pack-objects.c:4104
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "опциите „--keep-unreachable“ и „--unpack-unreachable“ са несъвместими"
-
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
-msgstr "опцията „-filter“ изисква „-stdout“"
+msgstr "опцията „--filter“ изисква „--stdout“"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
-msgstr "опциите „-filter“ и „--stdin-packs“ са несъвместими"
+msgstr "опциите „--filter“ и „--stdin-packs“ са несъвместими"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr ""
"вътрешният списък на указатели и опцията „--stdin-packs“ са несъвместими"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "Изброяване на обектите"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4180
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19704,19 +19988,19 @@
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "информация за окастрените обекти"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "обявяване на обектите по-стари от това ВРЕМЕ за остарели"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr "ограничаване на обхождането до обекти извън гарантиращи пакети"
-#: builtin/prune.c:152
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "хранилище с важни обекти не може да се окастря"
@@ -19729,44 +20013,50 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Опции при сливане"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "внасяне на промените чрез пребазиране, а не чрез сливане"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "позволяване на превъртания"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr ""
+"дали куките преди подаване и сливане и при промяна на съобщението за "
+"подаване (pre-merge-commit и commit-msg) да се изпълнят"
+
+#: builtin/pull.c:171 parse-options.h:340
msgid "automatically stash/stash pop before and after"
msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Опции при доставяне"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "принудително презаписване на локалния клон"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "брой подмодули издърпани паралелно"
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Неправилна стойност за „pull.ff“: „%s“"
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -19774,14 +20064,14 @@
"Между указателите, които току що доставихте, няма подходящ кандидат, върху "
"който да пребазирате."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Между указателите, които току що доставихте, няма подходящ кандидат, който "
"да слеете."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19789,7 +20079,7 @@
"Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в "
"отдалеченото хранилище."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19800,43 +20090,44 @@
"Понеже това не е хранилището по подразбиране на текущия клон, трябва\n"
"да укажете отдалечения клон на командния ред."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "Извън всички клони."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Укажете върху кой клон искате да пребазирате."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Укажете кой клон искате да слеете."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "За повече информация погледнете ръководството „git-pull(1)“"
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
msgid "<branch>"
msgstr "КЛОН"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Ако искате да зададете информация за следен клон, може да направите това с "
"командата:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19845,22 +20136,22 @@
"За сливане е указан отдалеченият указател „%s“,\n"
"но такъв не е доставен."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "недостъпно подаване: %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "без „--verify-signatures“ при пребазиране"
-#: builtin/pull.c:930
+#: builtin/pull.c:969
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
@@ -19870,32 +20161,32 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Не се насърчава издърпване без указване на стратегията за съгласуване на\n"
-"клоните. За да заглушите това съобщение, изпълнете някоя от следните\n"
+"Някои от клоните са се раздалечили и трябва да укажете как да се решава\n"
+"това. За да заглушите това съобщение, изпълнете някоя от следните\n"
"команди преди следващото издърпване:\n"
"\n"
-" git config pull.rebase false # сливане (стандартна стратегия)\n"
-" git config pull.rebase true # пребазиране\n"
-" git config pull.ff only # само превъртане\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:990
+#: builtin/pull.c:1046
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновяване на все още несъздаден клон с промените от индекса"
-#: builtin/pull.c:994
+#: builtin/pull.c:1050
msgid "pull with rebase"
msgstr "издърпване с пребазиране"
-#: builtin/pull.c:995
+#: builtin/pull.c:1051
msgid "please commit or stash them."
msgstr "трябва да подадете или скатаете промените."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1076
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19905,7 +20196,7 @@
"доставянето обнови върха на текущия клон. Работното\n"
"ви копие бе превъртяно от подаване „%s“."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1082
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19922,15 +20213,24 @@
" git reset --hard\n"
"за връщане към нормално състояние."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1097
msgid "Cannot merge multiple branches into empty head."
msgstr "Не може да сливате множество клони в празен върхов указател."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1102
msgid "Cannot rebase onto multiple branches."
msgstr "Не може да пребазирате върху повече от един клон."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1104
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Не може да превъртите към повече от един клон."
+
+#: builtin/pull.c:1119
+msgid "Need to specify how to reconcile divergent branches."
+msgstr ""
+"Трябва да укажете как да се решават разликите при разминаване на клоните."
+
+#: builtin/pull.c:1133
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"пребазирането е невъзможно заради локално записаните промени по подмодулите"
@@ -20120,15 +20420,15 @@
msgid "failed to push some refs to '%s'"
msgstr "част от указателите не бяха изтласкани към „%s“"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
msgid "repository"
msgstr "хранилище"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "изтласкване на всички указатели"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "огледално копие на всички указатели"
@@ -20140,19 +20440,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "принудително обновяване"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "ИМЕ_НА_УКАЗАТЕЛ:ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr ""
"изискване обновяванията в отдалечените хранилища да се внасят и в локалното"
@@ -20161,12 +20461,12 @@
msgid "control recursive pushing of submodules"
msgstr "управление на рекурсивното изтласкване на подмодулите"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "използване на съкратени пакети"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "програма за получаването на пакети"
@@ -20188,19 +20488,14 @@
"изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото "
"изтласкване, етикети"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "подписване на изтласкването с GPG"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "изискване на атомарни операции от отсрещната страна"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr ""
-"опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“"
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "опцията „--delete“ изисква поне един указател на версия"
@@ -20232,26 +20527,14 @@
"\n"
" git push ИМЕ\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "опциите „--all“ и „--tags“ са несъвместими"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "опцията „--all“ е несъвместима с указването на версия"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "опциите „--mirror“ и „--tags“ са несъвместими"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "опцията „--mirror“ е несъвместима с указването на версия"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "опциите „--all“ и „--mirror“ са несъвместими"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред"
@@ -20304,83 +20587,82 @@
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=ПРЕФИКС) "
-"[-u [--exclude-per-directory=ФАЙЛ_С_ИЗКЛЮЧЕНИЯ] | -i]] [--no-sparse-"
-"checkout] [--index-output=ФАЙЛ] (--empty | УКАЗАТЕЛ_КЪМ_ДЪРВО_1 "
-"[УКАЗАТЕЛ_КЪМ_ДЪРВО_2 [УКАЗАТЕЛ_КЪМ_ДЪРВО_3]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=ФАЙЛ] (--empty | "
+"УКАЗАТЕЛ_КЪМ_ДЪРВО_1 [УКАЗАТЕЛ_КЪМ_ДЪРВО_2 [УКАЗАТЕЛ_КЪМ_ДЪРВО_3]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "запазване на индекса в този ФАЙЛ"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "само зануляване на индекса"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Сливане"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "да се извърши и сливане след освен изчитането"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "тройно сливане, ако не се налага пофайлово сливане"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "тройно сливане при добавяне на добавяне и изтриване на файлове"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "същото като опцията „-m“, но неслетите обекти се пренебрегват"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "ПОДДИРЕКТОРИЯ/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "изчитане на дървото към индекса като да е в тази ПОДДИРЕКТОРИЯ/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "обновяване на работното дърво с резултата от сливането"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "ФАЙЛ_С_ИЗКЛЮЧЕНИЯ"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "позволяване на презаписването на изрично пренебрегваните файлове"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "без проверка на работното дърво след сливането"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "без обновяване и на индекса, и на работното дърво"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "без прилагане на филтъра за частично изтегляне"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "изчистване на грешки в командата „unpack-trees“"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "без информационни съобщения"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "Първо трябва да коригирате индекса си"
@@ -20402,197 +20684,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "неуспешно изтриване на списъка за изпълнение: „%s“"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "не може да се създаде временна директория „%s“"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "невъзможно задаване на интерактивна работа"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "файлът с командите не може да се генерира"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "опциите „--upstream“ и „--onto“ изискват базово подаване"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [ОПЦИЯ…]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "запазванe на първоначално празните подавания"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "позволяване на празни съобщения при подаване"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "пребазиране на подаванията със сливания"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr ""
-"запазване на първоначалните точки на разклоняване на сестринските клони"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "преместване на подаванията, които започват със „squash!“/“fixup!“"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "подписване на подаванията"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "извеждане на статистика с промените в следения клон"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "продължаване на пребазирането"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "прескачане на подаване"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "редактиране на списъка с команди за изпълнение"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "извеждане на текущата кръпка"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "съкратени идентификатори в списъка за изпълнение"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "пълни идентификатори в списъка за изпълнение"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "проверка на списъка за изпълнение"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr ""
-"преподреждане на редовете за вкарване на подаванията подаванията в "
-"предходните им със и без смени на съобщението"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "вмъкване на командите за изпълнение в списъка за изпълнение"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "върху"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "ограничена версия"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "ограничена версия"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "подаване, в което другите да се вкарат"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "подаване, в което другите да се вкарат"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "подаване на източника"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "име на върха"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "име на върха"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "стратегия на пребазиране"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "опции на стратегията"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "опции на стратегията"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "преминаване към"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "клонът, към който да се премине"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "име на база"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "име на база"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "команда"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "команда за изпълнение"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr ""
-"автоматично подаване за повторно изпълнение на командите завършили с неуспех"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "опциите „--[no-]rebase-cousins“ изискват опцията „--rebase-merges“"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "„%s“ изисква пребазиране"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "не може да се премине към новата база, зададена с „onto“: „%s“"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "неправилен указател към първоначален връх „orig-head“: „%s“"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "неправилната стойност на „allow_rerere_autoupdate“ се прескача: „%s“"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20606,7 +20735,7 @@
"За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
"изпълнете „git rebase --abort“."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -20624,7 +20753,7 @@
"\n"
"В резултат те не може да се пребазират."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20633,7 +20762,7 @@
"неправилна стойност „%s“: вариантите са „drop“ (прескачане), "
"„keep“ (запазване) и „ask“ (питане)"
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -20650,7 +20779,7 @@
" git rebase КЛОН\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20663,192 +20792,190 @@
"\n"
" git branch --set-upstream-to=%s/КЛОН %s\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "командите за изпълнение не може да съдържат нови редове"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "празна команда за изпълнение"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "пребазиране върху зададения, а не следения клон"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr "за текуща база да се ползва базата за сливане на клона и следеното"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "позволяване на куката преди пребазиране да се изпълни"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "без извеждане на информация. Включва опцията „--no-stat“"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "извеждане на статистика с промените в следения клон"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "без извеждане на статистика с промените в следения клон"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "добавяне на епилог за подпис „Signed-off-by“ към всяко подаване"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "датата на подаващия да отговаря на датата на автора"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "да се ползва днешна дата, а не тази на автора"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "псевдоним на „--reset-author-date“"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "подава се на командата „git apply“"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "без промени в празните знаци"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "отбиране на всички подавания дори да няма промени"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "продължаване"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "прескачане на текущата кръпка и продължаване"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "преустановяване и възстановяване на първоначалния клон"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "преустановяване без промяна към какво сочи „HEAD“"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "редактиране на файла с команди при интерактивно пребазиране"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "показване на кръпката, която се прилага или слива"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "при пребазиране да се ползва стратегия с прилагане"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "при пребазиране да се ползва стратегия със сливане"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr ""
"позволяване на потребителя да редактира списъка с подавания за пребазиране"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(ОСТАРЯЛО) пресъздаване на сливанията вместо да се прескачат"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "как да се обработват оказалите се празни подавания"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "запазванe на първоначално празните подавания"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
"преместване на подаванията, които започват със „squash!“/“fixup!“ при „-i“"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr ""
"добавяне на редове с команди за изпълнение след всяко подаване в "
"редактирания списък"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "позволяване на пребазиране на подавания с празни съобщения"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "опит за пребазиране на сливанията вместо те да се прескачат"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
"за доуточняването на следения клон, използвайте:\n"
"\n"
" git merge-base --fork-point"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "използване на зададената стратегията на сливане"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "опция"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "аргументът да се подаде на стратегията за сливане"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "пребазиране на всички достижими подавания до началното им подаване"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+"автоматично подаване за повторно изпълнение на командите завършили с неуспех"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr "прилагане на всички промени, дори и наличните вече в следеното"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-"Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да "
+"Изглежда, че сега се прилагат кръпки чрез командата „git am“. Не може да "
"пребазирате в момента."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"Опцията „--preserve-merges“ е остаряла. Ползвайте „--rebase-merges“ вместо "
-"нея."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "Опцията „--preserve-merges“ е заменена с „--rebase-merges“."
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "опциите „--keep-base“ и „--onto“ са несъвместими"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "опциите „--keep-base“ и „--root“ са несъвместими"
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "опциите „--root“ и „--fork-point“ са несъвместими"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Изглежда в момента не тече пребазиране"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Указателят „HEAD“ не може да бъде прочетен"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20856,16 +20983,16 @@
"Трябва да редактирате всички конфликти при сливането. След това\n"
"отбележете коригирането им чрез командата „git add“"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "промените в работното дърво не може да бъдат занулени"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "връщането към „%s“ е невъзможно"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20886,143 +21013,132 @@
"за\n"
"да не загубите случайно промени.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "опцията „C“ очаква число за аргумент"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Неизвестна стратегия: „%s“"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr ""
"опцията „--strategy“ изисква някоя от опциите „--merge“ или „--interactive“"
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "опциите за „apply“ са несъвместими с опциите за сливане"
+#: builtin/rebase.c:1463
+msgid "apply options and merge options cannot be used together"
+msgstr "опциите за прилагане и сливане са несъвместими"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Непозната реализация на пребазиране: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
"опцията „--reschedule-failed-exec“ изисква някоя от опциите „--exec“ или „--"
"interactive“"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "опциите „--preserve-merges“ и „--rebase-merges“ са несъвместими"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"ГРЕШКА: опциите „--preserve-merges“ и „--reschedule-failed-exec“ са "
-"несъвместими"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "неправилен следен клон: „%s“"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "Не може да се създаде ново начално подаване"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "„%s“: изисква се точно една база за сливане с клона"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "„%s“: изисква се точно една база за пребазиране"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Указателят „%s“ не сочи към подаване"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „%s“"
+msgid "no such branch/commit '%s'"
+msgstr "не съществува клон/подаване „%s“"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2414
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2659
#, c-format
msgid "No such ref: %s"
msgstr "Такъв указател няма: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "Подаването, сочено от указателя „HEAD“, не може да бъде открито"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Промените трябва или да се подадат, или да се скатаят."
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "не може да се премине към „%s“"
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "Указателят „HEAD“ е напълно актуален."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Текущият клон „%s“ е напълно актуален.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "Указателят „HEAD“ е напълно актуален — принудително пребазиране"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Текущият клон „%s“ е напълно актуален — принудително пребазиране\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "Промените в „%s“:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Промените от „%s“ към „%s“:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Първо, указателят „HEAD“ започва да сочи към базата, върху която "
"пребазирате…\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "Указателят „HEAD“ не може да се отделѝ"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Превъртане на „%s“ към „%s“.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT"
@@ -21080,13 +21196,13 @@
"За да заглушите това съобщение, задайте настройката\n"
"„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2474
msgid "quiet"
msgstr "без извеждане на информация"
-#: builtin/receive-pack.c:2492
-msgid "You must specify a directory."
-msgstr "Трябва да укажете директория."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "трябва да укажете директория"
#: builtin/reflog.c:17
msgid ""
@@ -21109,41 +21225,41 @@
msgid "git reflog exists <ref>"
msgstr "git reflog exists УКАЗАТЕЛ"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "„%s“ не е правилна стойност за време"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
#, c-format
msgid "Marking reachable objects..."
msgstr "Отбелязване на достижимите обекти…"
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
#, c-format
msgid "%s points nowhere!"
msgstr "„%s“ не сочи наникъде!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:731
msgid "no reflog specified to delete"
msgstr "не е указан журнал с подавания за изтриване"
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
#, c-format
msgid "not a reflog: %s"
msgstr "„%s“ не е журнал с подавания"
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
#, c-format
msgid "no reflog for '%s'"
msgstr "липсва журнал с подаванията за „%s“"
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
#, c-format
msgid "invalid ref format: %s"
msgstr "неправилен формат на указател: %s"
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
@@ -21235,6 +21351,11 @@
msgid "Updating %s"
msgstr "Обновяване на „%s“"
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "„%s“ не може да се достави"
+
#: builtin/remote.c:131
msgid ""
"--mirror is dangerous and deprecated; please\n"
@@ -21284,7 +21405,7 @@
"указването на следени клони е смислено само за отдалечени хранилища, от "
"които се доставя"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "вече съществува отдалечено хранилище с име „%s“."
@@ -21294,25 +21415,30 @@
msgid "Could not setup master '%s'"
msgstr "Основният клон „%s“ не може да бъде настроен"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "„branch.%s.rebase=%s“ не се поддържа. Приема се „true“ (истина)"
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Обектите за доставяне за указателя „%s“ не може да бъдат получени"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(съвпадащи)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(за изтриване)"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "„%s“ не може да се зададе"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -21323,17 +21449,17 @@
" %s:%d\n"
"използва отдалечено хранилище, което вече не съществува: „%s“"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "Няма отдалечено хранилище на име „%s“"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“"
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -21344,17 +21470,17 @@
" %s\n"
" Променете настройките ръчно, ако е необходимо."
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "неуспешно изтриване на „%s“"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "неуспешно създаване на „%s“"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -21368,121 +21494,121 @@
"Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n"
"Изтрийте ги чрез командата:"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Разделът „%s“ в настройките не може да бъде изтрит"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " следен"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " стар (изтрийте чрез „git remote prune“)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " неясно състояние"
# CHECK
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-"неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече "
-"от 1 клон"
+"неправилен клон за сливане „branch.%s.merge“. Невъзможно е да пребазирате "
+"върху повече от 1 клон"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "интерактивно пребазиране върху отдалечения клон „%s“"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "интерактивно пребазиране (със сливания) върху отдалечения клон „%s“"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "пребазиране върху отдалечения клон „%s“"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " сливане с отдалечения клон „%s“"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "сливане с отдалечения клон „%s“"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s и с отдалечения клон „%s“\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "създаден"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "изтрит"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "актуален"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "може да се превърти"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "локалният е изостанал"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s принудително изтласква към %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s изтласква към %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s принудително изтласква към %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s изтласква към %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "без заявки към отдалечените хранилища"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "● отдалечено хранилище „%s“"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " Адрес за доставяне: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(без адрес)"
@@ -21490,25 +21616,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " Адрес за изтласкване: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " клон сочен от HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(без проверка)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(непознат)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -21517,161 +21643,165 @@
"хранилище\n"
" не е еднозначен и е някой от следните):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Отдалечен клон:%s"
msgstr[1] " Отдалечени клони:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (състоянието не бе проверено)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Локален клон настроен за издърпване чрез „git pull“:"
msgstr[1] " Локални клони настроени за издърпване чрез „git pull“:"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локалните указатели ще бъдат пренесени чрез „ push“"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Локалният указател, настроен за „git push“%s:"
msgstr[1] " Локалните указатели, настроени за „git push“%s:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "Не може да се установи отдалеченият връх"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Множество клони с върхове. Изберете изрично някой от тях чрез командата:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "„%s“ не може да бъде изтрит"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "Неправилен указател: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "„%s“ не може да се настрои"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr "„%s“ ще се превърне в обект извън клоните!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr "„%s“ се превърна в обект извън клоните!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "Окастряне на „%s“"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "адрес: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " ● [ще бъде окастрено] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " ● [окастрено] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "окастряне на огледалата на отдалечените хранилища след доставяне"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "Няма отдалечено хранилище на име „%s“"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "добавяне на клон"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "не е указано отдалечено хранилище"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "запитване към адресите за изтласкване, а не за доставяне"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "извеждане на всички адреси"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "не е зададен адрес за отдалеченото хранилище „%s“"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "промяна на адресите за изтласкване"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "добавяне на адреси"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "изтриване на адреси"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "опциите „--add“ и „--delete“ са несъвместими"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Неправилен (стар) формат за адрес: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "Такъв адрес не е открит: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "повече подробности. Поставя се пред подкоманда"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [ОПЦИЯ…]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21680,154 +21810,159 @@
"Ползвайте опцията --no-write-bitmap-index или изключете настройката\n"
"„pack.writebitmaps“."
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"командата „pack-objects“ не може да се стартира за препакетирането на "
"гарантиращите обекти"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:275 builtin/repack.c:820
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: от „pack-objects“ се изискват редове само с пълни шестнайсетични "
"указатели."
-#: builtin/repack.c:294
+#: builtin/repack.c:299
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"командата „pack-objects“ не може да завърши за препакетирането на "
"гарантиращите обекти"
-#: builtin/repack.c:309
+#: builtin/repack.c:314
#, c-format
msgid "cannot open index for %s"
msgstr "грешка при отваряне на индекса за „%s“"
-#: builtin/repack.c:368
+#: builtin/repack.c:373
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "пакет „%s“ е твърде голям, за да е част от геометрична прогресия"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
#, c-format
msgid "pack %s too large to roll up"
msgstr "пакет „%s“ е твърде голям за свиване"
-#: builtin/repack.c:460
+#: builtin/repack.c:498
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "временният файл „%s“ не може да бъде отворен за запис"
+
+#: builtin/repack.c:516
+msgid "could not close refs snapshot tempfile"
+msgstr "временният файл със снимка на указателите не може да се затвори"
+
+#: builtin/repack.c:630
msgid "pack everything in a single pack"
msgstr "пакетиране на всичко в пакет"
-#: builtin/repack.c:462
+#: builtin/repack.c:632
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
"същото като опцията „-a“. Допълнително — недостижимите обекти да станат "
"непакетирани"
-#: builtin/repack.c:465
+#: builtin/repack.c:635
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
"премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
"prune-packed“"
-#: builtin/repack.c:467
+#: builtin/repack.c:637
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“"
-#: builtin/repack.c:469
+#: builtin/repack.c:639
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
"подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“"
-#: builtin/repack.c:471
+#: builtin/repack.c:641
msgid "do not run git-update-server-info"
msgstr "без изпълнение на командата „git-update-server-info“"
-#: builtin/repack.c:474
+#: builtin/repack.c:644
msgid "pass --local to git-pack-objects"
msgstr "подаване на опцията „--local“ на командата „git-pack-objects“"
-#: builtin/repack.c:476
+#: builtin/repack.c:646
msgid "write bitmap index"
msgstr "създаване и записване на индекси на база битови маски"
-#: builtin/repack.c:478
+#: builtin/repack.c:648
msgid "pass --delta-islands to git-pack-objects"
msgstr "подаване на опцията „--delta-islands“ на командата „git-pack-objects“"
-#: builtin/repack.c:479
+#: builtin/repack.c:649
msgid "approxidate"
msgstr "евристична дата"
-#: builtin/repack.c:480
+#: builtin/repack.c:650
msgid "with -A, do not loosen objects older than this"
msgstr ""
"при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от "
"това"
-#: builtin/repack.c:482
+#: builtin/repack.c:652
msgid "with -a, repack unreachable objects"
msgstr "с „-a“ — препакетиране на недостижимите обекти"
-#: builtin/repack.c:484
+#: builtin/repack.c:654
msgid "size of the window used for delta compression"
msgstr "размер на прозореца за делта компресията"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:655 builtin/repack.c:661
msgid "bytes"
msgstr "байтове"
-#: builtin/repack.c:486
+#: builtin/repack.c:656
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"същото като горната опция, но ограничението да е по размер на паметта, а не "
"по броя на обектите"
-#: builtin/repack.c:488
+#: builtin/repack.c:658
msgid "limits the maximum delta depth"
msgstr "ограничаване на максималната дълбочина на делтата"
-#: builtin/repack.c:490
+#: builtin/repack.c:660
msgid "limits the maximum number of threads"
msgstr "ограничаване на максималния брой нишки"
-#: builtin/repack.c:492
+#: builtin/repack.c:662
msgid "maximum size of each packfile"
msgstr "максимален размер на всеки пакет"
-#: builtin/repack.c:494
+#: builtin/repack.c:664
msgid "repack objects in packs marked with .keep"
msgstr "препакетиране на обектите в пакети белязани с „.keep“"
-#: builtin/repack.c:496
+#: builtin/repack.c:666
msgid "do not repack this pack"
msgstr "без препакетиране на този пакет"
-#: builtin/repack.c:498
+#: builtin/repack.c:668
msgid "find a geometric progression with factor <N>"
msgstr "откриване на геометрична прогресия с частно <N>"
-#: builtin/repack.c:508
+#: builtin/repack.c:670
+msgid "write a multi-pack index of the resulting packs"
+msgstr "запазване на многопакетен индекс за създадените пакети"
+
+#: builtin/repack.c:680
msgid "cannot delete packs in a precious-objects repo"
msgstr "пакетите в хранилище с важни обекти не може да се трият"
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "опциите „--keep-unreachable“ и „-A“ са несъвместими"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "опциите „--geometric“ и „-A“/„-a“ са несъвместими"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:829
msgid "Nothing new to pack."
msgstr "Нищо ново за пакетиране"
-#: builtin/repack.c:669
+#: builtin/repack.c:859
#, c-format
msgid "missing required file: %s"
msgstr "липсва задължителния файл „%s“"
-#: builtin/repack.c:671
+#: builtin/repack.c:861
#, c-format
msgid "could not unlink: %s"
msgstr "неуспешно изтриване на „%s“"
@@ -21910,67 +22045,61 @@
msgid "unable to open %s for reading"
msgstr "„%s“ не може да бъде отворен за четене"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "не може да се създаде процес за „mktree“"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "не може да се прочете от „mktree“"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "„mktree“ завърши с грешка"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "„mktree“ не върна име на обект"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "„fstat“ не може да се изпълни върху „%s“"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "обектът не може да бъде записан в базата от данни"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "неправилно име на обект: „%s“"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "не може да се определи видът на обекта „%s“"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "неуспешно редактиране на файла с обектите"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "новият и старият обект са един и същ: „%s“"
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "„%s“ не може да се анализира като подаване"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "етикетът при сливане в подаването „%s“ e неправилен"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "етикетът при сливане в подаването „%s“ e неправилен"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21979,31 +22108,31 @@
"Първоначалното подаване „%s“ съдържа етикета при сливане „%s“, който е "
"изхвърлен, затова използвайте опцията „--edit“, а не „--graft“."
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "първоначалното подаване „%s“ е с подпис на GPG"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "Подписът ще бъде премахнат в заменящото подаване!"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "заменящото подаване за „%s“ не може да бъде записано"
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "присадката за „%s“ е излишна"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "новото и старото подаване са едно и също: „%s“"
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -22012,71 +22141,71 @@
"следните присадки не може да се преобразуват:\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "извеждане на списъка с указателите за замяна"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "изтриване на указателите за замяна"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "редактиране на съществуващ обект"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "смяна на родителите на подаване"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "преобразуване на файла за присадките"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "замяна на указателя, ако съществува"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "без форматирано извеждане на съдържанието — за опцията „--edit“"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "използване на този ФОРМАТ"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "опцията „--format“ изисква извеждане на списък"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "опцията „-f“ изисква запазването на заместител"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "опцията „--raw“ изисква „--edit“"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "опцията „-d“ изисква поне един аргумент"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "неправилен брой аргументи"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "опцията „-e“ изисква поне един аргумент"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "опцията „-g“ изисква поне един аргумент"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "опцията „--convert-graft-file“ не приема аргументи"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "опцията „-l“ приема точно един шаблон"
@@ -22097,137 +22226,127 @@
msgid "unable to generate diff for '%s'"
msgstr "неуспешно генериране на разлика за „%s“"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ПОДАВАНЕ]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] ПЪТИЩА…"
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] "
"[УКАЗАТЕЛ_КЪМ_ДЪРВО]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] [ПЪТИЩА…]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "смесено (mixed)"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "меко (soft)"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "пълно (hard)"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "слято (merge)"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "запазващо (keep)"
-#: builtin/reset.c:83
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "Указателят „HEAD“ е повреден."
-#: builtin/reset.c:85
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "Дървото, сочено от указателя „HEAD“, не може да бъде открито."
-#: builtin/reset.c:91
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "Дървото, сочено от „%s“, не може да бъде открито."
-#: builtin/reset.c:116
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "Указателят „HEAD“ сочи към „%s“"
-#: builtin/reset.c:195
+#: builtin/reset.c:299
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Не може да се извърши %s зануляване по време на сливане."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
msgid "be quiet, only report errors"
msgstr "по-малко подробности, да се извеждат само грешките"
-#: builtin/reset.c:297
+#: builtin/reset.c:398
msgid "reset HEAD and index"
msgstr "индекса и указателя „HEAD“, без работното дърво"
-#: builtin/reset.c:298
+#: builtin/reset.c:399
msgid "reset only HEAD"
msgstr "само указателя „HEAD“, без индекса и работното дърво"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:401 builtin/reset.c:403
msgid "reset HEAD, index and working tree"
msgstr "указателя „HEAD“, индекса и работното дърво"
-#: builtin/reset.c:304
+#: builtin/reset.c:405
msgid "reset HEAD but keep local changes"
msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени"
-#: builtin/reset.c:310
+#: builtin/reset.c:411
msgid "record only the fact that removed paths will be added later"
msgstr ""
"отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно"
-#: builtin/reset.c:344
+#: builtin/reset.c:445
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Стойността „%s“ не е разпозната като съществуваща версия."
-#: builtin/reset.c:352
+#: builtin/reset.c:453
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "„%s“ не е разпознат като дърво."
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr ""
-"опцията „--patch“ е несъвместима с всяка от опциите „--hard“/„--mixed“/„--"
-"soft“"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:472
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това "
"изпълнете „git reset -- ПЪТ…“."
-#: builtin/reset.c:373
+#: builtin/reset.c:474
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ."
-#: builtin/reset.c:388
+#: builtin/reset.c:489
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "В голо хранилище не може да извършите %s зануляване"
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "опцията „-N“ изисква опцията „--mixed“"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:520
msgid "Unstaged changes after reset:"
msgstr "Промени извън индекса след зануляването:"
-#: builtin/reset.c:416
+#: builtin/reset.c:523
#, c-format
msgid ""
"\n"
@@ -22240,19 +22359,15 @@
"Опцията „--quiet“ заглушава това съобщение еднократно. За постоянно\n"
"заглушаване задайте настройката „reset.quiet“ да е „true“ (истина).\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:541
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Индексът не може да бъде занулен към версия „%s“."
-#: builtin/reset.c:439
+#: builtin/reset.c:546
msgid "Could not write new index file."
msgstr "Новият индекс не може да бъде записан."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "опциите „--exclude-promisor-objects“ и „--missing“ и са несъвместими"
-
#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr "филтрирането на обекти изисква опцията „--objects“"
@@ -22262,8 +22377,9 @@
msgstr "командата „rev-list“ не поддържа извеждането на бележки"
#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "опцията „--objects“ е несъвместима с изброяването"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "опцията „%s“ е несъвместима с изброяването"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -22426,15 +22542,19 @@
msgid "preserve initially empty commits"
msgstr "запазване на първоначално празните подавания"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "позволяване на празни съобщения при подаване"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "запазване на излишните, празни подавания"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "неуспешна отмяна"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "неуспешно отбиране"
@@ -22487,72 +22607,73 @@
msgstr[0] "следният файл е с променено съдържание"
msgstr[1] "следните файлове са с променено съдържание"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "да не се извеждат изтритите файлове"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "изтриване само от индекса"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "въпреки проверката за актуалността на съдържанието"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "рекурсивно изтриване"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr ""
"изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за "
"изтриване"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "Не са зададени пътища. Кои файлове да се изтрият?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"за да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n"
"или ги скатайте"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "без използването на опцията „-r“ „%s“ няма да се изтрие рекурсивно"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: „%s“ не може да се изтрие"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-"
-"pack=ПАКЕТ] [--verbose] [--thin] [--atomic] [ХОСТ:]ДИРЕКТОРИЯ [УКАЗАТЕЛ…]\n"
-" опцията „--all“ и изричното посочване на УКАЗАТЕЛ са взаимно несъвместими."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=ПАКЕТ]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [ХОСТ:]ДИРЕКТОРИЯ (--all | УКАЗАТЕЛ…])"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "име на отдалечено хранилище"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "използване на протокол без запазване на състоянието за RPC"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "четене на указателите от стандартния вход"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "извеждане на състоянието от отдалечената помощна функция"
@@ -22609,21 +22730,21 @@
msgid "group by field"
msgstr "групиране по поле"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "прекалено много аргументи извън хранилище"
#: builtin/show-branch.c:13
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-" [--current] [--color[=КОГА] | --no-color] [--sparse]\n"
-" [--more=БРОЙ | --list | --independent | --merge-base]\n"
-" [--no-name | --sha1-name] [--topics] [(РЕВИЗИЯ | УКАЗАТЕЛ)…]"
+" [--current] [--color[=КОГА] | --no-color] [--sparse]\n"
+" [--more=БРОЙ | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(РЕВИЗИЯ | УКАЗАТЕЛ)…]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -22636,117 +22757,110 @@
msgstr[0] "„%s“ се прескача — не може да се обработят повече от %d указател"
msgstr[1] "„%s“ се прескача — не може да се обработят повече от %d указатели"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "никой указател не съвпада с „%s“"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "извеждане на следящите и локалните клони"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "извеждане на следящите клони"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "оцветяване на „*!+-“ според клоните"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "извеждане на такъв БРОЙ подавания от общия предшественик"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "псевдоним на „more=-1“"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "без низове за имената на клоните"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "включване и на текущия клон"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "именуване на подаванията с имената им на обекти"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "извеждане на възможните бази за сливания"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr "извеждане на недостижимите указатели"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "извеждане на подаванията в топологическа подредба"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr "извеждане само на подаванията, които не са от първия клон"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "извеждане на сливанията, които може да се достигнат само от един връх"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr ""
"топологическа подредба, при запазване на подредбата по дата, доколкото е\n"
"възможно"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "БРОЙ[,БАЗА]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr "показване на най-много БРОЙ журнални записа с начало съответната БАЗА"
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"опцията „--reflog“ е несъвместима с опциите „--all“, „--remotes“, „--"
-"independent“ и „--merge-base“"
-
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "не е зададен клон, а указателят „HEAD“ е неправилен"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
-msgstr "опцията „--track“ изисква точно едно име на клон"
+msgstr "опцията „--reflog“ изисква точно едно име на клон"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "само %d запис може да бъде показан наведнъж."
msgstr[1] "само %d записа може да бъде показани наведнъж."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "такъв указател няма: %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:830
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "не може да се обработи повече от %d указател."
msgstr[1] "не може да се обработят повече от %d указатели."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:834
#, c-format
msgid "'%s' is not a valid ref."
msgstr "„%s“ е неправилен указател."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:837
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "подаването „%s“ (%s) липсва"
@@ -22815,77 +22929,120 @@
msgid "git sparse-checkout list"
msgstr "git sparse-checkout list"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "това работно дърво не е частично"
+
+#: builtin/sparse-checkout.c:75
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"това не е частично работно дърво (вероятно липсва файл „sparse-checkout“)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:176
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"директорията „%s“ съдържа неследени файлове, но не е в пътищата на "
+"пътеводното напасване на частичното изтегляне"
+
+#: builtin/sparse-checkout.c:184
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "директорията „%s“ не може да бъде изтрита"
+
+#: builtin/sparse-checkout.c:324
msgid "failed to create directory for sparse-checkout file"
msgstr "директорията за частично изтегляне „%s“ не може да бъде създадена"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:365
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
"настройката „worktreeConfig“ не може да се включи, защото форматът на "
"хранилището не може да се обнови"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:367
msgid "failed to set extensions.worktreeConfig setting"
msgstr "неуспешно задаване на настройката „extensions.worktreeConfig“"
-#: builtin/sparse-checkout.c:290
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-
-#: builtin/sparse-checkout.c:310
-msgid "initialize the sparse-checkout in cone mode"
-msgstr "инициализиране на частичното изтегляне в пътеводен режим"
-
-#: builtin/sparse-checkout.c:312
-msgid "toggle the use of a sparse index"
-msgstr "превключване на ползването на частичен индекс"
-
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:411
msgid "failed to modify sparse-index config"
msgstr "настройките на частичния индекс не може да се променят"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:422
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "инициализиране на частичното изтегляне в пътеводен режим"
+
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
+msgid "toggle the use of a sparse index"
+msgstr "превключване на ползването на частичен индекс"
+
+#: builtin/sparse-checkout.c:476
#, c-format
msgid "failed to open '%s'"
msgstr "„%s“ не може да се отвори"
-#: builtin/sparse-checkout.c:419
+#: builtin/sparse-checkout.c:528
#, c-format
msgid "could not normalize path %s"
msgstr "пътят „%s“ не може да се нормализира"
-#: builtin/sparse-checkout.c:431
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | ШАБЛОН…)"
-
-#: builtin/sparse-checkout.c:456
+#: builtin/sparse-checkout.c:557
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "цитирането на низ, форматиран за C — „%s“ не може да бъде изчистено"
-#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
msgid "unable to load existing sparse-checkout patterns"
msgstr "шаблоните за частично изтегляне не може да се заредят"
-#: builtin/sparse-checkout.c:579
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr ""
+"съществуващите шаблони за частично изтегляне не използват пътеводни сегменти"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | ШАБЛОН…)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
msgid "read patterns from standard in"
msgstr "изчитане на шаблоните от стандартния вход"
-#: builtin/sparse-checkout.c:594
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "няма частично изтегляне, към което да се добавя"
-#: builtin/sparse-checkout.c:613
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"ШАБЛОН…)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"шаблоните за частичност може да бъдат приложени наново само в частично "
+"изтеглено хранилище"
+
+#: builtin/sparse-checkout.c:803
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:644
+#: builtin/sparse-checkout.c:845
msgid "error while refreshing working directory"
msgstr "грешка при обновяване на работната директория"
@@ -22911,22 +23068,26 @@
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message СЪОБЩЕНИЕ]\n"
" [--pathspec-from-file=ФАЙЛ [--pathspec-file-nul]]\n"
" [--] [ПЪТ…]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [СЪОБЩЕНИЕ]"
#: builtin/stash.c:55
@@ -22951,6 +23112,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message СЪОБЩЕНИЕ]\n"
" [--] [ПЪТ…]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [СЪОБЩЕНИЕ]]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22974,7 +23143,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "командата „git stash clear“ не поддържа аргументи"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22985,168 +23154,186 @@
" „%s“ на „%s“\n"
" за да се направи място.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "по време на сливане не може да приложите нещо скатано"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "файлът с разликите „%s^!“ не може да се генерира"
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr ""
"в индекса има конфликти. Пробвайте да изпълните командата без опцията „--"
"index“."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "дървото сочено от индекса не може да бъде запазено"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "неследени файлове не може да се възстановят от скатаното"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Сливане на „%s“ с „%s“"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "Индексът не е изваден от скатаното."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "неследени файлове не може да се възстановят от скатаното"
+
+#: builtin/stash.c:608 builtin/stash.c:706
msgid "attempt to recreate the index"
msgstr "опит за повторно създаване на индекса"
-#: builtin/stash.c:635
+#: builtin/stash.c:652
#, c-format
msgid "Dropped %s (%s)"
msgstr "Изтрито: „%s“ (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:655
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "Скатаното „%s“ не може да бъде изтрито"
-#: builtin/stash.c:651
+#: builtin/stash.c:668
#, c-format
msgid "'%s' is not a stash reference"
msgstr "„%s“ не е указател към нещо скатано"
-#: builtin/stash.c:701
+#: builtin/stash.c:718
msgid "The stash entry is kept in case you need it again."
msgstr "Скатаното е запазено в случай, че ви потрябва отново."
-#: builtin/stash.c:724
+#: builtin/stash.c:741
msgid "No branch name specified"
msgstr "Не е указано име на клон"
-#: builtin/stash.c:808
+#: builtin/stash.c:825
msgid "failed to parse tree"
msgstr "дървото не може да бъде анализирано"
-#: builtin/stash.c:819
+#: builtin/stash.c:836
msgid "failed to unpack trees"
msgstr "дървото не може да бъде разпакетирано"
-#: builtin/stash.c:839
+#: builtin/stash.c:856
msgid "include untracked files in the stash"
msgstr "скатаване и на неследените файлове"
-#: builtin/stash.c:842
+#: builtin/stash.c:859
msgid "only show untracked files in the stash"
msgstr "извеждане само на неследените файлове в скатаното"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:946 builtin/stash.c:983
#, c-format
msgid "Cannot update %s with %s"
msgstr "Указателят „%s“ не може да бъде обновен да сочи към „%s“"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
msgid "stash message"
msgstr "съобщение при скатаване"
-#: builtin/stash.c:957
+#: builtin/stash.c:974
msgid "\"git stash store\" requires one <commit> argument"
msgstr "командата „git stash store“ изисква точно един аргумент-ПОДАВАНЕ"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "Няма промени в индекса"
+
+#: builtin/stash.c:1220
msgid "No changes selected"
msgstr "Не са избрани никакви промени"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1320
msgid "You do not have the initial commit yet"
msgstr "Все още липсва първоначално подаване"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1347
msgid "Cannot save the current index state"
msgstr "Състоянието на текущия индекс не може да бъде запазено"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1356
msgid "Cannot save the untracked files"
msgstr "Неследените файлове не може да се запазят"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1367 builtin/stash.c:1386
msgid "Cannot save the current worktree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Състоянието на текущия индекс не може да бъде запазено"
+
+#: builtin/stash.c:1414
msgid "Cannot record working tree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1463
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"опцията „--staged“ е несъвместима както с „--include-untracked“, така и с „--"
+"all“"
+
+#: builtin/stash.c:1492
msgid "Did you forget to 'git add'?"
msgstr "Пробвайте да използвате „git add“"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1507
msgid "No local changes to save"
msgstr "Няма никакви локални промени за скатаване"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1514
msgid "Cannot initialize stash"
msgstr "Скатаването не може да стартира"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1529
msgid "Cannot save the current status"
msgstr "Текущото състояние не може да бъде запазено"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1534
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Състоянието на работната директория и индекса e запазено: „%s“"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1627
msgid "Cannot remove worktree changes"
msgstr "Промените в работното дърво не може да бъдат занулени"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1667 builtin/stash.c:1739
msgid "keep index"
msgstr "запазване на индекса"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "скатаване само на промените, вкарани в индекса"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
msgid "stash in patch mode"
msgstr "скатаване в режим за кръпки"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1672 builtin/stash.c:1744
msgid "quiet mode"
msgstr "без извеждане на информация"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1674 builtin/stash.c:1746
msgid "include untracked files in stash"
msgstr "скатаване и на неследените файлове"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1676 builtin/stash.c:1748
msgid "include ignore files"
msgstr "скатаване и на игнорираните файлове"
-#: builtin/stash.c:1700
+#: builtin/stash.c:1783
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -23170,7 +23357,7 @@
msgid "prepend comment character and space to each line"
msgstr "добавяне на „# “ в началото на всеки ред"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Очаква се пълно име на указател, а не „%s“"
@@ -23185,59 +23372,7 @@
msgid "cannot strip one component off url '%s'"
msgstr "не може да се махне компонент от адреса „%s“"
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-msgid "alternative anchor for relative paths"
-msgstr "директория за определянето на относителните пътища"
-
-#: builtin/submodule--helper.c:414
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
-
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:652
-#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“"
-
-#: builtin/submodule--helper.c:524
-#, c-format
-msgid "Entering '%s'\n"
-msgstr "Влизане в „%s“\n"
-
-#: builtin/submodule--helper.c:527
-#, c-format
-msgid ""
-"run_command returned non-zero status for %s\n"
-"."
-msgstr ""
-"изпълнената команда завърши с ненулев изход за „%s“\n"
-"."
-
-#: builtin/submodule--helper.c:549
-#, c-format
-msgid ""
-"run_command returned non-zero status while recursing in the nested "
-"submodules of %s\n"
-"."
-msgstr ""
-"изпълнената команда завърши с ненулев изход при обхождане на подмодулите, "
-"вложени в „%s“\n"
-"."
-
-#: builtin/submodule--helper.c:565
-msgid "suppress output of entering each submodule command"
-msgstr "без извеждане на изход при въвеждането на всяка команда за подмодули"
-
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
-#: builtin/submodule--helper.c:1487
-msgid "recurse into nested submodules"
-msgstr "рекурсивно обхождане на подмодулите"
-
-#: builtin/submodule--helper.c:572
-msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] КОМАНДА"
-
-#: builtin/submodule--helper.c:599
+#: builtin/submodule--helper.c:211
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -23246,55 +23381,107 @@
"настройката „%s“ липсва. Приема се, че това хранилище е правилният източник "
"за себе си."
-#: builtin/submodule--helper.c:666
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
+msgid "alternative anchor for relative paths"
+msgstr "директория за определянето на относителните пътища"
+
+#: builtin/submodule--helper.c:410
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
+
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“"
+
+#: builtin/submodule--helper.c:520
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Влизане в „%s“\n"
+
+#: builtin/submodule--helper.c:523
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"изпълнената команда (run_command) завърши с ненулев изход за „%s“\n"
+"."
+
+#: builtin/submodule--helper.c:545
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"изпълнената команда (run_command) завърши с ненулев изход при обхождане на "
+"подмодулите, вложени в „%s“\n"
+"."
+
+#: builtin/submodule--helper.c:561
+msgid "suppress output of entering each submodule command"
+msgstr "без извеждане на изход при въвеждането на всяка команда за подмодули"
+
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
+msgid "recurse into nested submodules"
+msgstr "рекурсивно обхождане на подмодулите"
+
+#: builtin/submodule--helper.c:568
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] КОМАНДА"
+
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:670
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n"
-#: builtin/submodule--helper.c:680
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n"
-#: builtin/submodule--helper.c:687
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:709
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr "без извеждане на информация при инициализирането на подмодул"
-#: builtin/submodule--helper.c:714
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [ОПЦИЯ…] [ПЪТ]"
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "указателят сочен от „HEAD“ в подмодула „%s“ не може да бъде открит"
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "неуспешно рекурсивно обхождане на подмодула „%s“"
-#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
msgid "suppress submodule status output"
msgstr "без изход за състоянието на подмодула"
-#: builtin/submodule--helper.c:887
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -23302,109 +23489,106 @@
"използване на подаването указано в индекса, а не това от указателя „HEAD“ на "
"подмодула"
-#: builtin/submodule--helper.c:893
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]"
-#: builtin/submodule--helper.c:917
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name ПЪТ"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "● %s %s(обект-BLOB)→%s(подмодул)"
-#: builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "● %s %s(подмодул)→%s(обект-BLOB)"
-#: builtin/submodule--helper.c:1005
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "неуспешно изчисляване на контролната сума на обект от „%s“"
-#: builtin/submodule--helper.c:1059
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "неочакван режим „%o“\n"
-#: builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
"използване на подаването указано в индекса, а не това от указателя „HEAD“ на "
"подмодула"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr ""
"сравнение на подаването указано в индекса с това от указателя „HEAD“ на "
"подмодула"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "прескачане на подмодули, чиято настройка „ignore_config“ е „all“"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "ограничаване на размера на обобщението"
-#: builtin/submodule--helper.c:1311
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
-msgstr "git submodule--helper summary [ОПЦИЯ…] [ПОДАВАНЕ] -- [ПЪТ]"
+msgstr "git submodule--helper summary [ОПЦИЯ…] [ПОДАВАНЕ] [--] [ПЪТ]"
-#: builtin/submodule--helper.c:1335
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "не може да се достави версия за „HEAD“"
-#: builtin/submodule--helper.c:1340
-msgid "--cached and --files are mutually exclusive"
-msgstr "опциите „--cached“ и „--files“ са несъвместими"
-
-#: builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Синхронизиране на адреса на подмодул за „%s“\n"
-#: builtin/submodule--helper.c:1413
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "неуспешно регистриране на адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:1427
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде получен"
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде променен"
-#: builtin/submodule--helper.c:1485
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr "без извеждане на информация при синхронизирането на подмодул"
-#: builtin/submodule--helper.c:1492
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]"
-#: builtin/submodule--helper.c:1546
+#: builtin/submodule--helper.c:1508
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"Работното дърво на подмодул „%s“ съдържа директория „.git“.\n"
-"(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)"
+"Работното дърво на подмодул „%s“ съдържа директория „.git“. Тя ще се "
+"заменени\n"
+"с файл „.git“ чрез командата „absorbgitdirs“."
-#: builtin/submodule--helper.c:1558
+#: builtin/submodule--helper.c:1525
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23413,47 +23597,47 @@
"Работното дърво на подмодул „%s“ съдържа локални промени. Може да ги "
"отхвърлите с опцията „-f“"
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1533
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Директорията „%s“ е изчистена\n"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1535
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
"Директорията към работното дърво на подмодула „%s“ не може да бъде изтрита\n"
-#: builtin/submodule--helper.c:1579
+#: builtin/submodule--helper.c:1546
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "празната директория за подмодула „%s“ не може да бъде създадена"
-#: builtin/submodule--helper.c:1595
+#: builtin/submodule--helper.c:1562
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Регистрацията на подмодула „%s“ (%s) за пътя „%s“ е премахната\n"
-#: builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:1591
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"изтриване на работните дървета на подмодулите, дори когато те съдържат "
"локални промени"
-#: builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:1592
msgid "unregister all submodules"
msgstr "премахване на регистрациите на всички подмодули"
-#: builtin/submodule--helper.c:1630
+#: builtin/submodule--helper.c:1597
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ПЪТ…]]"
-#: builtin/submodule--helper.c:1644
+#: builtin/submodule--helper.c:1611
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Използвайте „--all“, за да премахнете всички подмодули"
-#: builtin/submodule--helper.c:1713
+#: builtin/submodule--helper.c:1656
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -23465,47 +23649,70 @@
"задайте настройката „submodule.alternateErrorStrategy“ да е „info“ или\n"
"при клониране ползвайте опцията „--reference-if-able“ вместо „--reference“."
-#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s"
-#: builtin/submodule--helper.c:1791
+#: builtin/submodule--helper.c:1740
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“"
-#: builtin/submodule--helper.c:1798
+#: builtin/submodule--helper.c:1747
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“"
-#: builtin/submodule--helper.c:1822
+#: builtin/submodule--helper.c:1772
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+"„%s“ не може нито да се създаде, нито да се ползва в директорията на git на "
+"друг подмодул"
+
+#: builtin/submodule--helper.c:1813
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул"
+
+#: builtin/submodule--helper.c:1818
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "директорията не е празна: „%s“"
+
+#: builtin/submodule--helper.c:1830
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "директорията на подмодула „%s“ не може да бъде получена"
+
+#: builtin/submodule--helper.c:1862
msgid "where the new submodule will be cloned to"
msgstr "къде да се клонира новият подмодул"
-#: builtin/submodule--helper.c:1825
+#: builtin/submodule--helper.c:1865
msgid "name of the new submodule"
msgstr "име на новия подмодул"
-#: builtin/submodule--helper.c:1828
+#: builtin/submodule--helper.c:1868
msgid "url where to clone the submodule from"
msgstr "адрес, от който да се клонира новият подмодул"
-#: builtin/submodule--helper.c:1836
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
msgid "depth for shallow clones"
msgstr "дълбочина на плитките хранилища"
-#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
msgid "force cloning progress"
msgstr "извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
msgid "disallow cloning into non-empty directory"
msgstr "предотвратяване на клониране в непразна история"
-#: builtin/submodule--helper.c:1848
+#: builtin/submodule--helper.c:1888
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23514,108 +23721,185 @@
"git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] "
"[--name ИМЕ] [--depth ДЪЛБОЧИНА] [--single-branch] --url АДРЕС --path ПЪТ"
-#: builtin/submodule--helper.c:1873
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr ""
-"„%s“ не може нито да се създаде, нито да се ползва в директорията на git на "
-"друг подмодул"
-
-#: builtin/submodule--helper.c:1884
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул"
-
-#: builtin/submodule--helper.c:1888
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "директорията не е празна: „%s“"
-
-#: builtin/submodule--helper.c:1900
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "директорията на подмодула „%s“ не може да бъде получена"
-
-#: builtin/submodule--helper.c:1936
+#: builtin/submodule--helper.c:1925
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:1940
+#: builtin/submodule--helper.c:1929
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Настроен е неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:2041
+#: builtin/submodule--helper.c:2044
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Пътят на подмодула „%s“ не е инициализиран"
-#: builtin/submodule--helper.c:2045
+#: builtin/submodule--helper.c:2048
msgid "Maybe you want to use 'update --init'?"
msgstr "Вероятно искахте да използвате „update --init“?"
-#: builtin/submodule--helper.c:2075
+#: builtin/submodule--helper.c:2078
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Прескачане на неслетия подмодул „%s“"
-#: builtin/submodule--helper.c:2104
+#: builtin/submodule--helper.c:2107
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Прескачане на подмодула „%s“"
-#: builtin/submodule--helper.c:2254
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит"
-#: builtin/submodule--helper.c:2265
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
"Втори неуспешен опит за клониране на „%s“. Действието се преустановява"
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2373
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Неуспешно изтегляне на версия „%s“ в пътя към подмодул „%s“'"
+
+#: builtin/submodule--helper.c:2377
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Неуспешно пребазиране на версия „%s“ в пътя към подмодул „%s“"
+
+#: builtin/submodule--helper.c:2381
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Неуспешно сливане на версия „%s“ в пътя към подмодул „%s“"
+
+#: builtin/submodule--helper.c:2385
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Неуспешно изпълнение на командата „%s %s“ в пътя към подмодул „%s“"
+
+#: builtin/submodule--helper.c:2409
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Път към подмодул „%s“: изтеглена е версия „%s“\n"
+
+#: builtin/submodule--helper.c:2413
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Път към подмодул „%s“: пребазиран към „%s“\n"
+
+#: builtin/submodule--helper.c:2417
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Път към подмодул „%s“: слят в „%s“\n"
+
+#: builtin/submodule--helper.c:2421
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Пътят на подмодула „%s“: „%s %s“\n"
+
+#: builtin/submodule--helper.c:2445
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"Неуспешно доставяне в пътя към подмодул „%s“, опит за директно доставяне на "
+"„%s“"
+
+#: builtin/submodule--helper.c:2454
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Подмодулът в пътя „%s“ е доставен, но не съдържа обекта със сума\n"
+"„%s“. Директното доставяне на това подаване е неуспешно."
+
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
msgid "path into the working tree"
msgstr "път към работното дърво"
-#: builtin/submodule--helper.c:2330
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
msgid "path into the working tree, across nested submodule boundaries"
msgstr "път към работното дърво, през границите на вложените подмодули"
-#: builtin/submodule--helper.c:2334
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
msgid "rebase, merge, checkout or none"
msgstr ""
"„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или "
"„none“ (нищо да не се прави)"
-#: builtin/submodule--helper.c:2340
+#: builtin/submodule--helper.c:2518
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "извършване на плитко клониране, отрязано до указания брой версии"
-#: builtin/submodule--helper.c:2343
+#: builtin/submodule--helper.c:2521
msgid "parallel jobs"
msgstr "брой паралелни процеси"
-#: builtin/submodule--helper.c:2345
+#: builtin/submodule--helper.c:2523
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "дали първоначалното клониране да е плитко, както се препоръчва"
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2524
msgid "don't print cloning progress"
msgstr "без извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2535
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:2370
+#: builtin/submodule--helper.c:2548
msgid "bad value for update parameter"
msgstr "неправилен параметър към опцията „--update“"
-#: builtin/submodule--helper.c:2418
+#: builtin/submodule--helper.c:2566
+msgid "suppress output for update by rebase or merge"
+msgstr ""
+"без извеждане на информация при обновяване чрез пребазиране или сливане"
+
+#: builtin/submodule--helper.c:2567
+msgid "force checkout updates"
+msgstr "принудително изтегляне на обновленията"
+
+#: builtin/submodule--helper.c:2569
+msgid "don't fetch new objects from the remote site"
+msgstr "без доставяне на новите обекти от отдалеченото хранилище"
+
+#: builtin/submodule--helper.c:2571
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+"различен режим на обновяване, когато хранилището е чисто ново изтеглено"
+
+#: builtin/submodule--helper.c:2572
+msgid "depth for shallow fetch"
+msgstr "дълбочина на плиткото доставяне"
+
+#: builtin/submodule--helper.c:2582
+msgid "sha1"
+msgstr "сума по SHA1"
+
+#: builtin/submodule--helper.c:2583
+msgid "SHA1 expected by superproject"
+msgstr "сумата по SHA1, очаквана от обхващащия модул"
+
+#: builtin/submodule--helper.c:2585
+msgid "subsha1"
+msgstr "сумата по SHA1 на подмодула"
+
+#: builtin/submodule--helper.c:2586
+msgid "SHA1 of submodule's HEAD"
+msgstr "сумата по SHA1 за указателя HEAD на подмодула"
+
+#: builtin/submodule--helper.c:2592
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [ОПЦИЯ…] [ПЪТ]"
+
+#: builtin/submodule--helper.c:2663
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23624,83 +23908,188 @@
"Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, "
"но той не е на никой клон"
-#: builtin/submodule--helper.c:2541
+#: builtin/submodule--helper.c:2781
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "не може да се получи връзка към хранилище за подмодула „%s“"
-#: builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2814
msgid "recurse into submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/submodule--helper.c:2580
+#: builtin/submodule--helper.c:2820
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [ОПЦИЯ…] [ПЪТ…]"
-#: builtin/submodule--helper.c:2636
+#: builtin/submodule--helper.c:2876
msgid "check if it is safe to write to the .gitmodules file"
msgstr "проверка дали писането във файла „.gitmodules“ е безопасно"
-#: builtin/submodule--helper.c:2639
+#: builtin/submodule--helper.c:2879
msgid "unset the config in the .gitmodules file"
msgstr "изтриване на настройка във файла „.gitmodules“"
-#: builtin/submodule--helper.c:2644
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config ИМЕ [СТОЙНОСТ]"
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset ИМЕ"
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2886
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2665 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "файлът „.gitmodules“ трябва да е в работното дърво"
-#: builtin/submodule--helper.c:2681
+#: builtin/submodule--helper.c:2921
msgid "suppress output for setting url of a submodule"
msgstr "без извеждане на информация при задаването на адреса на подмодул"
-#: builtin/submodule--helper.c:2685
+#: builtin/submodule--helper.c:2925
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] [ПЪТ] [НОВ_ПЪТ]"
-#: builtin/submodule--helper.c:2718
+#: builtin/submodule--helper.c:2958
msgid "set the default tracking branch to master"
msgstr "задаване на стандартния следящ клон да е „master“"
-#: builtin/submodule--helper.c:2720
+#: builtin/submodule--helper.c:2960
msgid "set the default tracking branch"
msgstr "задаване на стандартния следящ клон"
-#: builtin/submodule--helper.c:2724
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) ПЪТ"
-#: builtin/submodule--helper.c:2725
+#: builtin/submodule--helper.c:2965
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-b|--branch) КЛОН ПЪТ"
-#: builtin/submodule--helper.c:2732
+#: builtin/submodule--helper.c:2972
msgid "--branch or --default required"
msgstr "необходимо е една от опциите „--branch“ и „--default“"
-#: builtin/submodule--helper.c:2735
-msgid "--branch and --default are mutually exclusive"
-msgstr "опциите „--branch“ и „--default“ са несъвместими"
+#: builtin/submodule--helper.c:3038
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "Добавяне на съществуващото хранилище в „%s“ към индекса\n"
-#: builtin/submodule--helper.c:2792 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3041
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "„%s“ съществува, а не е хранилище на Git"
+
+#: builtin/submodule--helper.c:3054
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr ""
+"Открита е локална директория на Git — „%s“, която сочи към отдалечените "
+"хранилища:\n"
+
+#: builtin/submodule--helper.c:3061
+#, c-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" %s\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
+msgstr ""
+"Ако искате да преизползвате тази локална директория на git, вместо да\n"
+"клонирате отново:\n"
+" %s\n"
+"използвайте опцията „--force“. Ако локалната директория на git не е\n"
+"правилното хранилище или ако не знаете какво означава това, използвайте\n"
+"друго име като аргумент към опцията „--name“."
+
+#: builtin/submodule--helper.c:3073
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "Активиране на локалното хранилище за подмодула „%s“ наново.\n"
+
+#: builtin/submodule--helper.c:3110
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "Подмодулът „%s“ не може да бъде изтеглен"
+
+#: builtin/submodule--helper.c:3149
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Неуспешно добавяне на подмодула „%s“"
+
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Неуспешно регистриране на подмодула „%s“"
+
+#: builtin/submodule--helper.c:3222
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "„%s“ вече съществува в индекса"
+
+#: builtin/submodule--helper.c:3225
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "„%s“ вече съществува в индекса и не е подмодул"
+
+#: builtin/submodule--helper.c:3254
+msgid "branch of repository to add as submodule"
+msgstr "клон на хранилище, който да се добави като подмодул"
+
+#: builtin/submodule--helper.c:3255
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "позволяване на добавяне и на иначе игнорираните файлове"
+
+#: builtin/submodule--helper.c:3257
+msgid "print only error messages"
+msgstr "извеждане само на съобщенията за грешка"
+
+#: builtin/submodule--helper.c:3261
+msgid "borrow the objects from reference repositories"
+msgstr "заемане на обектите от еталонните хранилища"
+
+#: builtin/submodule--helper.c:3263
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr "името на подмодула да е указаното, а не да е същото като пътя"
+
+#: builtin/submodule--helper.c:3270
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ПЪТ]"
+
+#: builtin/submodule--helper.c:3298
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"Относителен път може да се ползва само от основната директория на работното "
+"дърво"
+
+#: builtin/submodule--helper.c:3306
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr ""
+"адрес на хранилище: „%s“ трябва или да е абсолютен, или да започва с „./“ "
+"или „../“"
+
+#: builtin/submodule--helper.c:3341
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "„%s“ е неправилно име за подмодул"
+
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "„%s“ не поддържа опцията „--super-prefix“"
-#: builtin/submodule--helper.c:2798
+#: builtin/submodule--helper.c:3411
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "„%s“ не е подкоманда на „submodule--helper“"
@@ -23725,18 +24114,18 @@
msgid "shorten ref output"
msgstr "кратка информация за указателя"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "причина"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "причина за обновяването"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u ИДЕНТИФИКАТОР_НА_КЛЮЧ] [-f] [-m СЪОБЩЕНИЕ | -F ФАЙЛ]\n"
" ЕТИКЕТ [ВРЪХ]"
@@ -23749,7 +24138,7 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[БРОЙ]] [--contains ПОДАВАНЕ] [--no-contains ПОДАВАНЕ]\n"
@@ -23798,11 +24187,11 @@
"Редовете, които започват с „%c“, също ще бъдат включени — може да ги "
"изтриете вие.\n"
-#: builtin/tag.c:241
+#: builtin/tag.c:240
msgid "unable to sign the tag"
msgstr "етикетът не може да бъде подписан"
-#: builtin/tag.c:259
+#: builtin/tag.c:258
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -23816,134 +24205,111 @@
"\n"
" git tag -f %s %s^{}"
-#: builtin/tag.c:275
+#: builtin/tag.c:274
msgid "bad object type."
msgstr "неправилен вид обект."
-#: builtin/tag.c:328
+#: builtin/tag.c:325
msgid "no tag message?"
msgstr "липсва съобщение за етикета"
-#: builtin/tag.c:335
+#: builtin/tag.c:332
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Съобщението за етикета е запазено във файла „%s“\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "извеждане на имената на етикетите"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "изтриване на етикети"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "проверка на етикети"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Опции при създаването на етикети"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "анотирането на етикети изисква съобщение"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "СЪОБЩЕНИЕ за етикет"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "принудително редактиране на съобщение за етикет"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "анотиран етикет с подпис по GPG"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "използване на друг ключ за подписването на етикет"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "замяна на етикета, ако съществува"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "създаване на журнал на указателите"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Опции за извеждането на етикети"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "извеждане на списъка на етикетите по колони"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "извеждане само на етикетите, които съдържат подаването"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "извеждане само на етикетите, които не съдържат подаването"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "извеждане само на слетите етикети"
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "извеждане само на неслетите етикети"
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "извеждане само на етикетите на ОБЕКТА"
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "опциите „--column“ и „-n“ са несъвместими"
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "опцията „%s“ изисква режим на списък"
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "опцията „-n“ изисква режим на списък."
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "опцията „-contains“ изисква режим на списък."
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "опцията „-contains“ изисква режим на списък."
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "опцията „-points-at“ изисква режим на списък."
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "опциите „--merged“ и „--no-merged“ изискват режим на списък."
-
-#: builtin/tag.c:567
-msgid "only one -F or -m option is allowed."
-msgstr "опциите „-F“ и „-m“ са несъвместими."
-
-#: builtin/tag.c:592
+#: builtin/tag.c:597
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s“ е неправилно име за етикет."
-#: builtin/tag.c:597
+#: builtin/tag.c:602
#, c-format
msgid "tag '%s' already exists"
msgstr "етикетът „%s“ вече съществува"
-#: builtin/tag.c:628
+#: builtin/tag.c:633
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Обновен етикет „%s“ (бе „%s“)\n"
@@ -23957,217 +24323,212 @@
msgid "failed to create directory %s"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "файлът „%s“ не може да бъде създаден"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "директорията „%s“ не може да бъде изтрита"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Проверка на времето на промяна (mtime) на файла „%s“"
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"добавянето на нов файл"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"добавянето на нова директория"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr ""
"информацията получена чрез „stat“ за директорията се променя след "
"обновяването на нов файл"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"информацията получена чрез „stat“ за директорията се променя след добавянето "
"на файл в поддиректория"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"изтриването на файл"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"изтриването на директория"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " Добре"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr ""
"продължаване с обновяването, дори когато индексът трябва да бъде обновен"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "подмодулите да се игнорират при обновяването"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "новите файлове да не се игнорират"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "файлове да може да заменят директории и обратно"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "предупреждаване при липсващи в работното дърво файлове"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr "обновяване дори и индексът да съдържа неслети обекти"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "обновяване на информацията от функцията „stat“"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
"като опцията „--refresh“, но да се проверят и обектите, които са били приети "
"за непроменени"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "РЕЖИМ,ОБЕКТ,ПЪТ"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "добавяне на изброените обекти към индекса"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "задаване на флаг, че файлът не се променя"
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "изчистване на флага, че файлът не се променя"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "задаване на флаг, че файловете са само за индекса"
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "изчистване на флага, че файловете са само за индекса"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr "без промяна на файловете само за индекса"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr "добавяне само към индекса без добавяне към базата от данни за обектите"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
"при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия "
"байт"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "изчитане на списъка с пътища за обновяване от стандартния вход"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "добавяне на елементите от стандартния вход към индекса"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
"възстановяване на състоянието преди сливане или нужда от обновяване за "
"изброените пътища"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "игнориране на файловете, които липсват в работното дърво"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "извеждане на действията на стандартния изход"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
"забравяне на записаната информация за неразрешени конфликти — за командите "
"от потребителско ниво"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "записване на индекса в този формат"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "включване или изключване на разделянето на индекса"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "включване/изключване на кеша за неследените файлове"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr "проверка дали файловата система поддържа кеш за неследени файлове"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"включване на кеша за неследените файлове без проверка на файловата система"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr "запис на индекса, дори да не е отбелязан като променен"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr "включване или изключване на наблюдението на файловата система"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "отбелязване на файловете, че може да се следят чрез файловата система"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr "изчистване на флага за следенето чрез файловата система"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -24175,7 +24536,7 @@
"Настройката „core.splitIndex“ е зададена на „false“ (лъжа̀). Сменете я или я "
"изтрийте, за да включите разделянето на индекса"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -24183,7 +24544,7 @@
"Настройката „core.splitIndex“ е зададена на „true“ (истина). Сменете я или "
"я изтрийте, за да изключите разделянето на индекса."
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -24191,11 +24552,11 @@
"Настройката „core.untrackedCache“ е зададена на „true“ (истина). Сменете я "
"или я изтрийте, за да изключите кеша за неследените файлове"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "Кешът за неследените файлове е изключен"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -24203,29 +24564,29 @@
"Настройката „core.untrackedCache“ е зададена на „false“ (лъжа̀). Сменете я "
"или я изтрийте, за да включите кеша за неследените файлове"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Кешът за неследените файлове е включен за „%s“"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"Настройката „core.fsmonitor“ не е зададена. Задайте я, за да включите "
"следенето чрез файловата система."
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "следенето чрез файловата система е включено"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"Настройката „core.fsmonitor“ е зададена. Изтрийте я, за да изключите "
"следенето чрез файловата система."
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "следенето чрез файловата система е изключено"
@@ -24241,21 +24602,21 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "изтриване на указателя"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "обновяване на ИМЕто_НА_УКАЗАТЕЛя, а не това, към което сочи"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr ""
"някои от елементите подадени на стандартния вход завършват с нулевия знак "
"„NUL“"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "изчитане на указателите от стандартния вход"
@@ -24269,28 +24630,28 @@
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
-msgstr "git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ"
+msgstr "git upload-pack [ОПЦИЯ…] ДИРЕКТОРИЯ"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "изход след първоначалната размяна на заявка и отговор"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "изход след първоначалната обява на указатели"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "доставяне на информацията/указателите за „git-http-backend“"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"да не се търси „ДИРЕКТОРИЯ/.git/“, ако ДИРЕКТОРИЯта не е под контрола на Git"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "трансферът да се преустанови след този БРОЙ секунди"
#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr "git verify-tag [-v | --verbose] ПОДАВАНЕ…"
+msgstr "git verify-commit [-v | --verbose] ПОДАВАНЕ…"
#: builtin/verify-commit.c:68
msgid "print commit contents"
@@ -24320,63 +24681,58 @@
msgid "print tag contents"
msgstr "извеждане на съдържанието на ЕТИКЕТи"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [ОПЦИЯ…] ПЪТ [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [ОПЦИЯ…]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move [ДЪРВО] [НОВ_ПЪТ]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [ОПЦИЯ…]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock [ПЪТ]"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "неуспешно изтриване на „%s“"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Изтриване на „%s/%s“: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr "докладване на окастрените работни дървета"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "обявяване на работните копия по-стари от това ВРЕМЕ за остарели"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "„%s“ вече съществува"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "целта не може да се ползва за работно дърво: „%s“"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -24386,7 +24742,7 @@
"За изрично задаване ползвайте „%s -f -f“, а за изчистване —\n"
"„unlock“, „prune“ или „remove“"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -24396,12 +24752,12 @@
"За изрично задаване ползвайте „%s -f“, а за изчистване —\n"
"„prune“ или „remove“"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr "инициализация"
@@ -24459,14 +24815,6 @@
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "опит за напасване на името на новия клон с това на следящ клон"
-#: builtin/worktree.c:506
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга"
-
-#: builtin/worktree.c:508
-msgid "--reason requires --lock"
-msgstr "опцията „--reason“ изисква „--lock“"
-
#: builtin/worktree.c:512
msgid "added with --lock"
msgstr "добавена с „--lock“"
@@ -24484,10 +24832,6 @@
msgstr ""
"добавяне на анотация за окастряне на работните копия по-стари от това ВРЕМЕ"
-#: builtin/worktree.c:702
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "опциите „--verbose“ и „--porcelain“ са несъвместими"
-
#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
#: builtin/worktree.c:972
#, c-format
@@ -24665,21 +25009,16 @@
"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“. За преглед на\n"
"системата за помощ използвайте „git help git“."
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "опцията „--git-dir“ изисква директория\n"
+msgid "no directory given for '%s' option\n"
+msgstr "опцията „%s“ изисква директория\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "опцията „--namespace“ изисква име\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "опцията „--work-tree“ изисква директория\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
@@ -24695,11 +25034,6 @@
msgid "no config key given for --config-env\n"
msgstr "опцията „--config-env“ изисква ключ\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "опцията „-C“ изисква директория\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
@@ -24729,29 +25063,29 @@
msgid "recursive alias: %s"
msgstr "зациклен псевдоним: „%s“"
-#: git.c:476
+#: git.c:479
msgid "write failure on standard output"
msgstr "грешка при запис на стандартния изход"
-#: git.c:478
+#: git.c:481
msgid "unknown write failure on standard output"
msgstr "неизвестна грешка при запис на стандартния изход"
-#: git.c:480
+#: git.c:483
msgid "close failed on standard output"
msgstr "грешка при затваряне на стандартния изход"
-#: git.c:833
+#: git.c:835
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "зацикляне в псевдонимите: заместванията на „%s“ не приключват:%s"
-#: git.c:883
+#: git.c:885
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "„%s“ не може да се обработи като вградена команда"
-#: git.c:896
+#: git.c:898
#, c-format
msgid ""
"usage: %s\n"
@@ -24760,35 +25094,27 @@
"употреба: %s\n"
"\n"
-#: git.c:916
+#: git.c:918
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"неуспешно заместване на псевдонима „%s“ — резултатът „%s“ не е команда на "
"git\n"
-#: git.c:928
+#: git.c:930
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "командата „%s“ не може да се изпълни: %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr "опцията „--packfile“ изисква валидна контролна сума (а не „%s“)"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "не е хранилище на Git"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "опцията „--packfile“ изисква опция „--index-pack-args“"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "опцията „--index-pack-args“ изисква опция „--packfile“"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "неподдържани опции"
@@ -24814,65 +25140,31 @@
msgid "exit immediately after advertising capabilities"
msgstr "изход след първоначалната обява на възможностите"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "гнездото/каналът вече се ползват: „%s“"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "сървърът не стартира на гнездо/канал „%s“"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "демонът не може да се стартира във фонов режим"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "неуспешно изпълнение на „waitpid“"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "демонът още не отговаря на заявки"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "демонът не е стартирал"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "„waitpid“ върна неочаквана стойност"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "демонът не е спрял"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [ИМЕ] [ОПЦИЯ…]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [ИМЕ] [НИШКИ]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr "test-helper simple-ipc start-daemon [ИМЕ] [НИШКИ] [ИЗЧАКВАНЕ]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [ИМЕ] [ИЗЧАКВАНЕ]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [ИМЕ] [ЛЕКСЕМА]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [ИМЕ] [БРОЙ_БАЙТОВЕ] [РАЗМЕР]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24880,88 +25172,84 @@
"test-helper simple-ipc multiple [ИМЕ] [НИШКИ] [БРОЙ_БАЙТОВЕ] "
"[РАЗМЕР_НА_ПАКЕТА]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "име или път за гнездото на Unix"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "име на именован канал"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "брой нишки в запаса нишки"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "секунди изчакване на демона да стартира или спре"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "брой байтове"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "брой заявки на нишка"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "байта"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "знаци за пращане"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "лексема"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "командна лексема за пращане"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
"отрицателна стойност за „http.postbuffer“. Ще се ползва стандартната: %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Управлението на делегирането не се поддържа от cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "„CURLSSLOPT_NO_REVOKE“ не се поддържа от cURL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Ограничаването на протоколите не се поддържа от cURL < 7.44.0"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Неподдържана реализация на SSL „%s“. Поддържат се:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"Реализацията на SSL не може да се зададе да е „%s“: cURL е компилиран без "
"поддръжка на SSL"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
"Реализацията на SSL не може да се зададе да е „%s“, защото вече е зададена "
"друга"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24979,47 +25267,52 @@
"неправилно екраниране или цитиране в стойността към опция за изтласкване: "
"„%s“"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "„%sinfo/refs“ е неизползваемо, проверете дали е хранилище на git"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"неправилен отговор от сървъра: очакваше се услуга, а бе получен изчистващ "
"пакет „flush“"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "неправилен отговор от сървъра, бе получено: „%s“"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "хранилището „%s“ липсва"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Неуспешна идентификация към „%s“"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "няма достъп до „%s“ със следната настройка на „http.pinnedPubkey“: %s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "няма достъп до „%s“: %s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "пренасочване към „%s“"
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "получен е EOF, в режим без поддръжка за това"
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr "отдалеченият сървър прати неочакван пакет за край на отговор"
@@ -25029,90 +25322,261 @@
"данните за POST не може да се прочетат наново, пробвайте да увеличите "
"настройката „http.postBuffer“"
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: неправилeн знак за дължина на ред: %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: неочакван пакет за край на отговор"
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "Неуспешно отдалечено извикване. %s"
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "толкова големи изтласквания не може да се изпълнят"
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
"заявката не може да бъде декомпресирана, грешка от „zlib“ при "
"декомпресиране: %d"
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
"заявката не може да бъде декомпресирана; грешка от „zlib“ при завършване: %d<"
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "получени са %d байта от заглавна част"
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "очакват се още %d байта от тялото на отговора"
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "опростеният транспорт по http не поддържа плитки клиенти"
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "неуспешно доставяне."
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "умният вариант на http не може да доставя по SHA1"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "протоколна грешка: очаква се SHA1 или указател, а бе получено: „%s“"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "транспортът по http не поддържа „%s“"
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "неуспешно изпълнение на „git-http-push“"
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: употреба: git remote-curl ХРАНИЛИЩЕ [АДРЕС]"
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: грешка при изчитането на потока команди от git"
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: опит за доставяне без локално хранилище"
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: непозната команда „%s“ от git"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "необходима е работна директория"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "началната зачислена директория не може да бъде открита"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "не може да се премине към „%s“"
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "настройката „%s=%s“ не може да се зададе"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "„log.excludeDecoration“ не може да се настрои"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Зачисляването на директории чрез „scalar“ изисква работно дърво"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "отдалеченият указател „HEAD“ не сочи към клон: „%.*s“"
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"името на стандартния клон на отдалеченото хранилище не може да се получи, "
+"затова ще се ползва локално настроеното име на стандартния клон"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "неуспешно получаване на името на стандартния клон"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "хранилището не може да бъде отчислено"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "зачислената директория не може да бъде изтрита"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "към кой клон да се премине след клониране"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "при клониране да се създава пълна работна директория"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "да се свалят метаданните само за изтегляния клон"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "името на работното дърво не може да се извлече от „%s“"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "директорията „%s“ вече съществува"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "основният клон на „%s“ не може да бъде получен"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "отдалеченото хранилище в „%s“ не може да се настрои"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "„%s“ не може да се настрои"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "неуспешно създаване на непълно хранилище, ще се опита пълно хранилище"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "не може да се настрои пълно клониране"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "„scalar list“ не приема аргументи"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "пренастройване на всички зачислени директории"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "опцията „--all“ и указването на зачислена директория не са съвместими"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "вече няма хранилище на git в „%s“"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run ЗАДАЧА [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]\n"
+"Задачи:\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "няма задача с име „%s“"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete ЗАЧИСЛЕНА_ДИРЕКТОРИЯ"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "текущата работна директория няма да бъде изтрита"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "включване и на версията на git"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "включване и на опциите за компилиране на git"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar КОМАНДА [ОПЦИЯ…]<\n"
+"\n"
+"Команди:\n"
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr "липсва информация за компилатора\n"
@@ -25129,11 +25593,11 @@
msgid "object filtering"
msgstr "филтриране по вид на обекта"
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr "период на валидност/запазване"
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "нулева операция (за съвместимост с предишни версии)"
@@ -25164,11 +25628,11 @@
"при ползването на „--pathspec-from-file“, пътищата са разделени с нулевия "
"знак „NUL“"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "key"
msgstr "КЛЮЧ"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "име на полето, по което да е подредбата"
@@ -25242,18 +25706,18 @@
msgstr "Извеждане на каноничните име и адрес на е-поща на контактите"
#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Проверка дали името на указателя е по правилата"
+
+#: command-list.h:66
msgid "Switch branches or restore working tree files"
msgstr ""
"Преминаване към друг клон или възстановяване на файловете в работното дърво"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "Копиране на файлове от индекса към работното дърво"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Проверка дали името на указателя е по правилата"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr ""
@@ -25459,454 +25923,418 @@
"Добавяне или обработка на структурирана информация в съобщенията при подаване"
#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Разглеждане на хранилище на Git"
-
-#: command-list.h:117
msgid "Show commit logs"
msgstr "Извеждане на журнала с подаванията"
-#: command-list.h:118
+#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr "Извеждане на информация за файловете в индекса и работното дърво"
-#: command-list.h:119
+#: command-list.h:118
msgid "List references in a remote repository"
msgstr "Извеждане на указателите в отдалечено хранилище"
-#: command-list.h:120
+#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "Извеждане на съдържанието на обект-дърво"
-#: command-list.h:121
+#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "Изваждане на кръпка и авторството от е-писмо"
-#: command-list.h:122
+#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "Проста програма за разделяне на файлове във формат UNIX mbox"
-#: command-list.h:123
+#: command-list.h:122
msgid "Run tasks to optimize Git repository data"
msgstr "Изпълнение на задачи за оптимизиране на хранилището на Git"
-#: command-list.h:124
+#: command-list.h:123
msgid "Join two or more development histories together"
msgstr "Сливане на две или повече поредици/истории от промени"
-#: command-list.h:125
+#: command-list.h:124
msgid "Find as good common ancestors as possible for a merge"
msgstr "Откриване на най-подходящите общи предшественици за сливане"
-#: command-list.h:126
+#: command-list.h:125
msgid "Run a three-way file merge"
msgstr "Изпълнение на тройно сливане"
-#: command-list.h:127
+#: command-list.h:126
msgid "Run a merge for files needing merging"
msgstr "Сливане на файловете, които се нуждаят от това"
-#: command-list.h:128
+#: command-list.h:127
msgid "The standard helper program to use with git-merge-index"
msgstr "Стандартната помощна програма за „git-merge-index“"
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "Извеждане на тройно сливане без промяна на индекса"
+
#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "Изпълнение на програмите за коригиране на конфликтите при сливане"
#: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "Извеждане на тройно сливане без промяна на индекса"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Запис и проверка на индексите за множество пакети"
-
-#: command-list.h:132
msgid "Creates a tag object with extra validation"
msgstr "Създаване на обект-етикет с допълнителни проверки"
-#: command-list.h:133
+#: command-list.h:131
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Създаване на обект-дърво от текст във формат „ls-tree“"
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "Запис и проверка на индексите за множество пакети"
+
+#: command-list.h:133
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Преместване или преименуване на файл, директория или символна връзка"
-#: command-list.h:135
+#: command-list.h:134
msgid "Find symbolic names for given revs"
msgstr "Откриване на имената дадени на версия"
-#: command-list.h:136
+#: command-list.h:135
msgid "Add or inspect object notes"
msgstr "Добавяне или преглед на бележки към обект"
-#: command-list.h:137
+#: command-list.h:136
msgid "Import from and submit to Perforce repositories"
msgstr "Внасяне и подаване към хранилища на Perforce"
-#: command-list.h:138
+#: command-list.h:137
msgid "Create a packed archive of objects"
msgstr "Създаване на пакетиран архив от обекти"
-#: command-list.h:139
+#: command-list.h:138
msgid "Find redundant pack files"
msgstr "Намиране на повтарящи се пакетни файлове"
-#: command-list.h:140
+#: command-list.h:139
msgid "Pack heads and tags for efficient repository access"
msgstr "Пакетиране на върховете и етикетите за бърз достъп до хранилище"
-#: command-list.h:141
+#: command-list.h:140
msgid "Compute unique ID for a patch"
msgstr "Генериране на уникален идентификатор на кръпка"
-#: command-list.h:142
+#: command-list.h:141
msgid "Prune all unreachable objects from the object database"
msgstr "Окастряне на всички недостижими обекти в базата от данни за обектите"
-#: command-list.h:143
+#: command-list.h:142
msgid "Remove extra objects that are already in pack files"
msgstr "Изтриване на допълнителните обекти, които вече са в пакетни файлове"
-#: command-list.h:144
+#: command-list.h:143
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "Доставяне и внасяне на промените от друго хранилище или клон"
-#: command-list.h:145
+#: command-list.h:144
msgid "Update remote refs along with associated objects"
msgstr "Обновяване на отдалечените указатели и свързаните с тях обекти"
-#: command-list.h:146
+#: command-list.h:145
msgid "Applies a quilt patchset onto the current branch"
msgstr "Прилагане на поредица от кръпки от quilt към текущия клон"
-#: command-list.h:147
+#: command-list.h:146
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr "Сравняване на два диапазона от подавания (напр. две версии на клон)"
-#: command-list.h:148
+#: command-list.h:147
msgid "Reads tree information into the index"
msgstr "Изчитане на информация за обект-дърво в индекса"
-#: command-list.h:149
+#: command-list.h:148
msgid "Reapply commits on top of another base tip"
msgstr "Прилагане на подаванията върху друг връх"
-#: command-list.h:150
+#: command-list.h:149
msgid "Receive what is pushed into the repository"
msgstr "Получаване на изтласканото в хранилището"
-#: command-list.h:151
+#: command-list.h:150
msgid "Manage reflog information"
msgstr "Управление на информацията в журнала на указателите"
-#: command-list.h:152
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "Управление на набор от следени хранилища"
-#: command-list.h:153
+#: command-list.h:152
msgid "Pack unpacked objects in a repository"
msgstr "Пакетиране на непакетираните обекти в хранилище"
-#: command-list.h:154
+#: command-list.h:153
msgid "Create, list, delete refs to replace objects"
msgstr "Създаване, извеждане, изтриване на указатели за замяна на обекти"
-#: command-list.h:155
+#: command-list.h:154
msgid "Generates a summary of pending changes"
msgstr "Обобщение на предстоящите промени"
-#: command-list.h:156
+#: command-list.h:155
msgid "Reuse recorded resolution of conflicted merges"
msgstr "Преизползване на вече запазено коригиране на конфликт при сливане"
-#: command-list.h:157
+#: command-list.h:156
msgid "Reset current HEAD to the specified state"
msgstr "Привеждане на указателя „HEAD“ към зададеното състояние"
-#: command-list.h:158
+#: command-list.h:157
msgid "Restore working tree files"
msgstr "Възстановяване на файловете в работното дърво"
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Отменяне на съществуващи подавания"
-
-#: command-list.h:160
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Извеждане на подаванията в обратна хронологическа подредба"
-#: command-list.h:161
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Избор и промяна на параметри"
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "Отменяне на съществуващи подавания"
+
+#: command-list.h:161
msgid "Remove files from the working tree and from the index"
msgstr "Изтриване на файлове от работното дърво и индекса"
-#: command-list.h:163
+#: command-list.h:162
msgid "Send a collection of patches as emails"
msgstr "Изпращане на поредица от кръпки по е-поща"
-#: command-list.h:164
+#: command-list.h:163
msgid "Push objects over Git protocol to another repository"
msgstr "Изтласкване на обекти по протокола на Git към друго хранилище"
-#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
-msgstr "Ограничена входна обвивка за достъп през SSH само до Git"
-
-#: command-list.h:166
-msgid "Summarize 'git log' output"
-msgstr "Обобщен изход от „git log“"
-
-#: command-list.h:167
-msgid "Show various types of objects"
-msgstr "Извеждане на различните видове обекти в Git"
-
-#: command-list.h:168
-msgid "Show branches and their commits"
-msgstr "Извеждане на клоните и подаванията в тях"
-
-#: command-list.h:169
-msgid "Show packed archive index"
-msgstr "Извеждане на индекса на пакетирания архив"
-
-#: command-list.h:170
-msgid "List references in a local repository"
-msgstr "Извеждане на указателите в локално хранилище"
-
-#: command-list.h:171
+#: command-list.h:164
msgid "Git's i18n setup code for shell scripts"
msgstr "Настройки на Git за интернационализация на скриптовете на обвивката"
-#: command-list.h:172
+#: command-list.h:165
msgid "Common Git shell script setup code"
msgstr "Настройки на Git за скриптовете на обвивката"
-#: command-list.h:173
+#: command-list.h:166
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Ограничена входна обвивка за достъп през SSH само до Git"
+
+#: command-list.h:167
+msgid "Summarize 'git log' output"
+msgstr "Обобщен изход от „git log“"
+
+#: command-list.h:168
+msgid "Show various types of objects"
+msgstr "Извеждане на различните видове обекти в Git"
+
+#: command-list.h:169
+msgid "Show branches and their commits"
+msgstr "Извеждане на клоните и подаванията в тях"
+
+#: command-list.h:170
+msgid "Show packed archive index"
+msgstr "Извеждане на индекса на пакетирания архив"
+
+#: command-list.h:171
+msgid "List references in a local repository"
+msgstr "Извеждане на указателите в локално хранилище"
+
+#: command-list.h:172
msgid "Initialize and modify the sparse-checkout"
msgstr "Инициализиране и промяна на частичното изтегляне"
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Добавяне на съдържанието на файла към индекса"
+
#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
msgstr "Скатаване на неподадените промени в работното дърво"
#: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Добавяне на съдържанието на файла към индекса"
-
-#: command-list.h:176
msgid "Show the working tree status"
msgstr "Извеждане на състоянието на работното дърво"
-#: command-list.h:177
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "Премахване на излишните знаци за интервали"
-#: command-list.h:178
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "Инициализиране, обновяване или разглеждане на подмодули"
-#: command-list.h:179
+#: command-list.h:178
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Двупосочна работа между хранилища под Subversion и Git"
-#: command-list.h:180
+#: command-list.h:179
msgid "Switch branches"
msgstr "Преминаване към друг клон"
-#: command-list.h:181
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "Извеждане, промяна и изтриване на символни указатели"
-#: command-list.h:182
+#: command-list.h:181
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG"
-#: command-list.h:183
+#: command-list.h:182
msgid "Creates a temporary file with a blob's contents"
msgstr "Създаване на временен файл със същото съдържание като обектът-BLOB"
-#: command-list.h:184
+#: command-list.h:183
msgid "Unpack objects from a packed archive"
msgstr "Разпакетиране на обекти от пакетиран архив"
-#: command-list.h:185
+#: command-list.h:184
msgid "Register file contents in the working tree to the index"
msgstr "Регистриране на съдържанието на файловете от работното дърво в индекса"
-#: command-list.h:186
+#: command-list.h:185
msgid "Update the object name stored in a ref safely"
msgstr "Безопасно обновяване на името на обект в указател"
-#: command-list.h:187
+#: command-list.h:186
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Обновяване на файла с допълнителна информация в помощ на опростените сървъри"
-#: command-list.h:188
+#: command-list.h:187
msgid "Send archive back to git-archive"
msgstr "Изпращане на архива обратно към „git-archive“"
-#: command-list.h:189
+#: command-list.h:188
msgid "Send objects packed back to git-fetch-pack"
msgstr "Изпращане на пакетираните обекти обратно към „git-fetch-pack“"
-#: command-list.h:190
+#: command-list.h:189
msgid "Show a Git logical variable"
msgstr "Извеждане на логическа променлива на Git"
-#: command-list.h:191
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "Проверка на подписите GPG върху подаванията"
-#: command-list.h:192
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "Проверка на пакетираните архивни файлове на Git"
-#: command-list.h:193
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "Проверка на подписите GPG върху етикетите"
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Уеб интерфейс на Git"
-
-#: command-list.h:195
+#: command-list.h:193
msgid "Show logs with difference each commit introduces"
msgstr "Извеждане на журнал с разликите, въведени с всяко подаване"
-#: command-list.h:196
+#: command-list.h:194
msgid "Manage multiple working trees"
msgstr "Управление на множество работни дървета"
-#: command-list.h:197
+#: command-list.h:195
msgid "Create a tree object from the current index"
msgstr "Създаване на обект-дърво от текущия индекс"
-#: command-list.h:198
+#: command-list.h:196
msgid "Defining attributes per path"
msgstr "Указване на атрибути към път"
-#: command-list.h:199
+#: command-list.h:197
msgid "Git command-line interface and conventions"
msgstr "Команден ред и конвенции на Git"
-#: command-list.h:200
+#: command-list.h:198
msgid "A Git core tutorial for developers"
msgstr "Въвеждащ урок в Git за разработчици"
-#: command-list.h:201
+#: command-list.h:199
msgid "Providing usernames and passwords to Git"
msgstr "Въвеждане на имена и пароли към Git"
-#: command-list.h:202
+#: command-list.h:200
msgid "Git for CVS users"
msgstr "Git за потребители на CVS"
-#: command-list.h:203
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "Настройване на изгледа на разликите"
-#: command-list.h:204
+#: command-list.h:202
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Полезен минимален набор от команди за ежедневната работа с Git"
-#: command-list.h:205
+#: command-list.h:203
msgid "Frequently asked questions about using Git"
msgstr "Често задавани въпроси за употребата на Git"
-#: command-list.h:206
+#: command-list.h:204
msgid "A Git Glossary"
msgstr "Речник с термините на Git"
-#: command-list.h:207
+#: command-list.h:205
msgid "Hooks used by Git"
msgstr "Куки на Git"
-#: command-list.h:208
+#: command-list.h:206
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани"
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Разглеждане на хранилище на Git"
+
+#: command-list.h:208
msgid "Map author/committer names and/or E-Mail addresses"
msgstr "Съответствия на имена на автор/подаващ и/или адреси на е-поща"
-#: command-list.h:210
+#: command-list.h:209
msgid "Defining submodule properties"
msgstr "Дефиниране на свойствата на подмодулите"
-#: command-list.h:211
+#: command-list.h:210
msgid "Git namespaces"
msgstr "Пространства от имена на Git"
-#: command-list.h:212
+#: command-list.h:211
msgid "Helper programs to interact with remote repositories"
msgstr "Помощни програми за работа с отдалечените хранилища"
-#: command-list.h:213
+#: command-list.h:212
msgid "Git Repository Layout"
msgstr "Устройство на хранилището на Git"
-#: command-list.h:214
+#: command-list.h:213
msgid "Specifying revisions and ranges for Git"
msgstr "Указване на версии и диапазони в Git"
-#: command-list.h:215
+#: command-list.h:214
msgid "Mounting one repository inside another"
msgstr "Монтиране на едно хранилище в друго"
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Въвеждащ урок за Git"
+
#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "Въвеждащ урок за Git: втора част"
#: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "Въвеждащ урок за Git"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Уеб интерфейс на Git"
#: command-list.h:218
msgid "An overview of recommended workflows with Git"
msgstr "Общ преглед на препоръчваните начини за работа с Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "неуспешно двоично търсене, не е зададена команда."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "изпълнение на командата „${command}“"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"неуспешно двоично търсене:\n"
-"изходният код от командата „${command}“ е ${res} — това е извън интервала "
-"[0, 128)"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "двоичното търсене не може да продължи"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"неуспешно двоично търсене:\n"
-"функцията „bisect-state ${state}“ завърши с код за грешка ${res}"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "успешно двоично търсене"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25945,99 +26373,17 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Простото сливане не сработи, пробва се автоматично сливане."
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"Относителен път може да се ползва само от основната директория на работното "
-"дърво"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-"адрес на хранилище: „${repo}“ трябва или да е абсолютен, или да започва с "
-"„./“ или „../“"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "„${sm_path}“ вече съществува в индекса"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "„${sm_path}“ вече съществува в индекса и не е подмодул"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "в „${sm_path}“ не е изтеглено подаване"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Добавяне на съществуващото хранилище в „${sm_path}“ към индекса"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "„${sm_path}“ съществува, а не е хранилище на Git"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"Открита е локална директория на Git — „${sm_name}“, която сочи към "
-"отдалечените хранилища:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-" $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Ако искате да преизползвате тази директория на git, вместо да клонирате "
-"отново\n"
-" $realrepo\n"
-"използвайте опцията „--force“. Ако локалната директория на git не е за\n"
-"правилното хранилище или ако не знаете какво означава това, използвайте\n"
-"друго име като аргумент към опцията „--name“."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Активиране на локалното хранилище за подмодула „${sm_name}“ наново."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Неуспешно добавяне на подмодула „${sm_path}“"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Неуспешно регистриране на подмодула „${sm_path}“"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Текущата версия за подмодула в „${displaypath}“ липсва"
-#: git-submodule.sh:578
+#: git-submodule.sh:411
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“"
-#: git-submodule.sh:583
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -26046,473 +26392,56 @@
"Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ "
"липсва"
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Неуспешно доставяне в пътя към подмодул „${displaypath}“, опит за директно "
-"доставяне на „${sha1}“"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Подмодулът в пътя „$displaypath“ е доставен, но не съдържа обекта със сума\n"
-"„${sha1}“. Директното доставяне на това подаване е неуспешно."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул "
-"„${displaypath}“"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул "
-"„${displaypath}“"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“"
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Автоматично скатаното е приложено."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "„$stash_sha1“ не може да бъде запазен"
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"Прилагането на автоматично скатаното доведе до конфликти. Промените ви са\n"
-"надеждно скатани. Може да пробвате да ги приложите чрез „git stash pop“\n"
-"или да ги изхвърлите чрез „git stash drop“, когато поискате.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Пребазиране ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Команди:\n"
-" p, pick ПОДАВАНЕ — прилагане на подаването\n"
-" r, reword ПОДАВАНЕ — прилагане на подаването, но промяна на съобщението му\n"
-" e, edit ПОДАВАНЕ — прилагане на подаването и спиране при него за още "
-"промени\n"
-" s, squash ПОДАВАНЕ — вкарване на подаването в предходното му\n"
-" f, fixup ПОДАВАНЕ — вкарване на подаването в предходното му, без смяна на\n"
-" съобщението\n"
-" x, exec ПОДАВАНЕ — изпълнение на команда към обвивката: останалата част "
-"на\n"
-" реда\n"
-" d, drop ПОДАВАНЕ — прескачане на подаването\n"
-" l, label ЕТИКЕТ — задаване на етикет на указаното от HEAD\n"
-" t, reset ЕТИКЕТ — зануляване на HEAD към ЕТИКЕТа\n"
-" m, merge [-C ПОДАВАНЕ | -c ПОДАВАНЕ] ЕТИКЕТ [# ЕДИН_РЕД]\n"
-" — създаване на подаване със сливане със съобщението от\n"
-" първоначалното подаване (или съобщението от ЕДИН_РЕД,\n"
-" ако не е зададено подаване със сливане. С опцията\n"
-" „-c ПОДАВАНЕ“, може да смените съобщението.\n"
-"\n"
-"Може да променяте последователността на редовете — те се изпълняват\n"
-"последователно отгоре-надолу.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Може да промените подаването с командата:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"След като привършите, продължете с командата:\n"
-"\n"
-" git rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: това не е подаване, което може да бъде отбрано"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Неправилно име на подаване: „$sha1“"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr ""
-"Заместващата сума по SHA1 за текущото подаване не може да бъде запазена"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Превъртане до „$sha1“"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Не може да се превърти до „$sha1“"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Указателят „HEAD“ не може да се насочи към „$first_parent“"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Подаването не може да се смачка: „$sha1“"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Грешка при повтарянето на сливането на „$sha1“"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "„$sha1“ не може да се отбере."
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Това е съобщение при подаване №${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Съобщение при подаване №${n} ще бъде прескочено."
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Това е обединение от $count подаване."
-msgstr[1] "Това е обединение от $count подавания."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Новото съобщение при подаване „$fixup_msg“ не може да бъде запазено"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Това е обединение от 2 подавания"
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Не може да се подаде $sha1… $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Подаването не може за де промени след успешното отбиране на „$sha1…“ $rest.\n"
-"Най-вероятните причини са празно съобщение при подаване или неуспешно "
-"изпълнение\n"
-"на куката преди подаване. Ако имате проблем с куката, ще трябва да го "
-"коригирате,\n"
-"преди да може да промените съобщението на подаването."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Спиране при „$sha1_abbrev…“ $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Без предходно подаване не може да се изпълни „$squash_style“"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "В момента се изпълнява: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Неуспешно изпълнение: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "и промени индекса и/или работното дърво"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Може да коригирате проблема, след което изпълнете:\n"
-"\n"
-" git rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Успешно изпълнение: $rest\n"
-"Остават още промени в индекса или работното дърво.\n"
-"Трябва да ги подадете или скатаете и след това изпълнете:\n"
-"\n"
-" git rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Непозната команда: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Коригирайте това чрез „git rebase --edit-todo“."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Успешно пребазиране и обновяване на „$head_name“."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"В индекса има промени. Ако искате да ги вкарате в\n"
-"предишното подаване, изпълнете:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Ако искате да създадете ново подаване, изпълнете:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"И в двата случая след като привършите, продължете с командата:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Не може да бъде открит автор за поправянето на подаването"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
-"отново изпълнете „git rebase --continue“."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Промените в индекса не може да бъдат подадени."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Текстовият редактор не може да бъде стартиран"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "„$switch_to“ не може да се изтегли"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Липсва указател „HEAD“"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Временната директория „$state_dir“ не може да бъде създадена"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Пребазирането не е интерактивно"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-"Пребазиране на $shortrevisions върху $shortonto ($todocount команда)"
-msgstr[1] ""
-"Пребазиране на $shortrevisions върху $shortonto ($todocount команди)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Празните подавания са коментирани"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Списъкът с презаписаните подавания не може да бъде създаден"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "Употреба: $dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"Не може да се премине към „$cdup“ — основната директория на работното дърво."
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
"ФАТАЛНА ГРЕШКА: „$program_name“ не може да се ползва без работно дърво."
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Не може да пребазирате, защото има промени, които не са в индекса."
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:213
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Не може да презапишете клоните, защото има промени, които не са в индекса."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"Не може да издърпвате при това пребазиране, защото има промени, които не са "
-"в индекса."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:216
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
"Не може да изпълните „$action“, защото има промени, които не са в индекса."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "Не може да пребазирате, защото в индекса има неподадени промени."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Не може да издърпвате при това пребазиране, защото в индекса има неподадени "
-"промени."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:227
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Не може да изпълните „$action“, защото в индекса има неподадени промени."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:229
msgid "Additionally, your index contains uncommitted changes."
msgstr "Освен това в индекса има неподадени промени."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:349
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Тази команда трябва да се изпълни от основната директория на работното дърво"
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:354
msgid "Unable to determine absolute path of git directory"
msgstr "Абсолютният път на работното дърво не може да се определи"
@@ -26601,7 +26530,7 @@
msgstr ""
"файлът за редактиране на парчето код не може да бъде отворен за четене: „%s“"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -26615,7 +26544,7 @@
"a — добавяне на това и всички следващи парчета от файла в индекса\n"
"d — без добавяне на това и всички следващи парчета от файла в индекса"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -26629,7 +26558,7 @@
"a — скатаване на това и всички следващи парчета от файла\n"
"d — без скатаване на това и всички следващи парчета от файла"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -26643,7 +26572,7 @@
"a — изваждане на това и всички следващи парчета от файла от индекса\n"
"d — без изваждане на това и всички следващи парчета от файла от индекса"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -26657,7 +26586,7 @@
"a — прилагане на това и всички следващи парчета от файла към индекса\n"
"d — без прилагане на това и всички следващи парчета от файла към индекса"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -26674,7 +26603,7 @@
"d — без премахване на това и всички следващи парчета от файла от работното "
"дърво"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -26691,7 +26620,7 @@
"d — без премахване на това и всички следващи парчета от файла от индекса и "
"работното дърво"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -26708,7 +26637,7 @@
"d — без прилагане на това и всички следващи парчета от файла от индекса и "
"работното дърво"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -26722,7 +26651,7 @@
"a — прилагане на това и всички следващи парчета от файла\n"
"d — без прилагане на това и всички следващи парчета от файла"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -26744,92 +26673,92 @@
"e — ръчно редактиране на текущото парче\n"
"? — извеждане не помощта\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "Избраните парчета не може да се добавят в индекса!\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "пренебрегване на неслятото: „%s“\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната в правата за достъп към работното дърво [y,n,q,a,d"
"%s,?]? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на добавянето към работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на парчето към работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "Няма други парчета\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Неправилен номер: „%s“\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Има само %d парче.\n"
msgstr[1] "Има само %d парчета.\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "Няма други парчета за търсене\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Сгрешен регулярен израз „%s“: %s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "Никое парче не напасва на регулярния израз\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Няма друго парче преди това\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Няма друго парче след това\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "Това парче не може да бъде разделено\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Разделяне на %d парче.\n"
msgstr[1] "Разделяне на %d парчета.\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "Това парче не може да бъде редактирано\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -26850,59 +26779,59 @@
" и индекса\n"
"add untracked — добавяне на неследените файлове към промените в индекса\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "„--“ липсва"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
-msgstr "неизвестна стратегия за прилагане на кръпка: „%s“"
+msgstr "неизвестна стратегия за прилагане на кръпка към „--patch“: „%s“"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "указан е неправилен аргумент „%s“, а се очаква „--“."
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
"разликата между местния часови пояс и GMT съдържа дробна част от минута\n"
"\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "разликата между местния часовия пояс и GMT е 24 часа или повече\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "ФАТАЛНА ГРЕШКА: „%s“ не завърши успешно, а с код %d"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
"текстовият редактор приключи работата с грешка, всичко се преустановява"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "„%s“ съдържа временна версия на подготвяното е-писмо.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "„%s.final“ съдържа подготвеното е-писмо.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "опцията „--dump-aliases“ е несъвместима с другите опции\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26913,11 +26842,11 @@
"забележете знака „e“. За да изключите тази проверка, задайте\n"
"настройката „sendemail.forbidSendmailVariables“ да е „false“ (лъжа̀).\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Командата „git format-patch“ не може да се изпълни извън хранилище\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -26925,40 +26854,40 @@
"„batch-size“ и „relogin“ трябва да се указват заедно (или чрез командния "
"ред, или чрез настройките)\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Непознато поле за опцията „--suppress-cc“: „%s“\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Непозната стойност за „--confirm“: %s\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: псевдоними за sendmail съдържащи кавички („\"“) не се "
"поддържат: %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: „:include:“ не се поддържа: %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: пренасочвания „/file“ или „|pipe“ не се поддържат: %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: редът за „sendmail“ не е разпознат: %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -26973,12 +26902,12 @@
" ● укажете „./%s“ за файл;\n"
" ● използвате опцията „--format-patch“ за диапазон.\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Директорията „%s“ не може да се отвори: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
@@ -26988,17 +26917,17 @@
"Не са указани кръпки!\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "В „%s“ липсва тема"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "„%s“ не може да се отвори за запис: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -27013,27 +26942,27 @@
"\n"
"Изтрийте всичко, ако не искате да изпратите обобщаващо писмо.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "„%s“ не може да се отвори: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "„%s.final“ не може да се отвори: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "Обобщаващото писмо е празно и се прескача\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Сигурни ли сте, че искате да ползвате „%s“ [y/N]? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -27041,11 +26970,11 @@
"Следните файлове са 8 битови, но не са с обявена заглавна част „Content-"
"Transfer-Encoding“.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Кое 8 битово кодиране се ползва [стандартно: UTF-8]? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -27058,22 +26987,22 @@
"все още е с шаблонното заглавие „*** SUBJECT HERE ***“. Ползвайте опцията\n"
"„--force“, ако сте сигурни, че точно това искате да изпратите.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "На кой да се пратят е-писмата (незадължително поле)"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "ФАТАЛНА ГРЕШКА: „%s“ е псевдоним на себе си\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Идентификатор на съобщение „Message-ID“, което да се използва за обявяването "
"на отговор „In-Reply-To“ (незадължително поле)"
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "ГРЕШКА: не може да се извлече адрес от „%s“\n"
@@ -27081,18 +27010,18 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
"Какво да се направи с този адрес? „q“ (спиране), „d“ (изтриване), "
"„e“ (редактиране): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Пътят към сертификат „%s“ не съществува."
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -27120,116 +27049,116 @@
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Изпращане на е-писмото? „y“ (да), „n“ (не), „e“ (редактиране), „q“ (изход), "
"„a“ (всичко): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "Изискване на отговор към това е-писмо"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "Сървърът за SMTP не е настроен правилно."
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Сървърът не поддържа „STARTTLS“! %s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Неуспешно изпълнение на STARTTLS! %s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Подсистемата за SMTP не може да се инициализира. Проверете настройките и "
"използвайте опцията: „--smtp-debug“."
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "„%s“ не може да бъде изпратен\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Проба за изпращане на „%s“\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "Изпращане на „%s“\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "Успех при пробата. От журнала:\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "Успех. От журнала:\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Резултат: "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Резултат: успех\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "файлът „%s“ не може да бъде отворен"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Добавяне на „до: %s“ от ред „%s“\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(не-mbox) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(тяло) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Не може да бъде се изпълни „%s“"
-#: git-send-email.perl:1972
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Добавяне на „%s: %s“ от: „%s“\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) програмният канал не може да се затвори за изпълнението на „%s“"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "съобщението не може да се изпрати чрез 7 битови знаци"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "неправилно кодиране за пренос"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2095
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -27240,12 +27169,12 @@
"%s\n"
"ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "„%s“ не може да се отвори: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2108
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -27254,13 +27183,13 @@
"ФАТАЛНА ГРЕШКА: %s: %d е повече от 998 знака\n"
"ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2126
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "„%s“ се пропуска, защото е с разширение за архивен файл: „%s“.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2130
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Наистина ли искате да изпратите „%s“? [y|N]: "
diff --git a/po/ca.po b/po/ca.po
index e6e77f3..524330a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,7 +1,7 @@
# Catalan translations for Git.
# This file is distributed under the same license as the Git package.
# Alex Henrie <alexhenrie24@gmail.com>, 2014-2016.
-# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2021
+# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2022
#
# Terminologia i criteris utilitzats
#
@@ -9,25 +9,30 @@
# -----------------+---------------------------------
# ahead | davant per
# amend | esmenar
-# bundle | farcell
# broken | malmès
+# bundle | farcell
# chunk | fragment
+# cover letter | carta de presentació
# delta | diferència
# deprecated | en desús
# detached | separat
# dry-run | fer una prova
# fatal | fatal
+# fetch | obtenir
# flush | buidar / buidatge
# hint | consell
# hook | lligam
# hunk | tros
# not supported | no està admès
+# pull | baixar
+# push | pujar
# repository | repositori
# setting | paràmetre
# shallow | superficial
# skip | ometre
+# sparse | dispers
# squelch | silenciar
-# sparse-index | índex dispers
+# supported | admetre
# token | testimoni
# unset | desassignar
# upstream | font
@@ -43,7 +48,7 @@
# Anglès | Català
# -----------------+---------------------------------
# blame | «blame»
-# HEAD | HEAD (f, la branca) - (no s'apostrofa)
+# HEAD | HEAD (f, la branca actual) - (no s'apostrofa)
# cherry pick | «cherry pick»
# promisor | «promisor»
# rebase | «rebase»
@@ -52,13 +57,16 @@
# squash | «squash»
# trailer | «trailer»
# unstage | «unstage»
+#
+# Vegeu també https://git.github.io/htmldocs/gitglossary.html
+#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-05-17 16:02+0800\n"
-"PO-Revision-Date: 2021-05-14 10:22-0600\n"
-"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
+"POT-Creation-Date: 2022-04-06 14:40+0800\n"
+"PO-Revision-Date: 2022-04-13 19:00-0600\n"
+"Last-Translator: Jordi Mas i Hernàndez <jmas@softcatala.org>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
@@ -67,243 +75,243 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.3.1\n"
-#: add-interactive.c:376
+#: add-interactive.c:382
#, c-format
msgid "Huh (%s)?"
msgstr "Perdó (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
+#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
+#: builtin/rebase.c:1671
msgid "could not read index"
msgstr "no s'ha pogut llegir l'índex"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:590 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binari"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:648 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "res"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:649 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "sense canvis"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:686 git-add--interactive.perl:641
msgid "Update"
msgstr "Actualitza"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:703 add-interactive.c:891
#, c-format
msgid "could not stage '%s'"
msgstr "no s'ha pogut fer «stage» «%s»"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
msgid "could not write index"
msgstr "no s'ha pogut escriure l'índex"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:712 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "actualitzat %d camí\n"
msgstr[1] "actualitzats %d camins\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:730 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s està ara sense seguiment.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry ha fallat per al camí «%s»"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:765 git-add--interactive.perl:653
msgid "Revert"
msgstr "Reverteix"
-#: add-interactive.c:775
+#: add-interactive.c:781
msgid "Could not parse HEAD^{tree}"
msgstr "No s'ha pogut analitzar HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:819 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "revertit %d camí\n"
msgstr[1] "revertits %d camins\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:870 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Sense fitxers no seguits.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:874 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Afegeix sense seguiment"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:901 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "afegit %d camí\n"
msgstr[1] "afegits %d camins\n"
-#: add-interactive.c:925
+#: add-interactive.c:931
#, c-format
msgid "ignoring unmerged: %s"
msgstr "s'està ignorant allò no fusionat: %s"
-#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
-msgstr "Només s'han canviat els fitxers binaris.\n"
+msgstr "Només han canviat fitxers binaris.\n"
-#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Sense canvis.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:949 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Actualització del pedaç"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:988 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Reviseu les diferències"
-#: add-interactive.c:1010
+#: add-interactive.c:1016
msgid "show paths with changes"
msgstr "mostra els camins amb canvis"
-#: add-interactive.c:1012
+#: add-interactive.c:1018
msgid "add working tree state to the staged set of changes"
msgstr "afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»"
-#: add-interactive.c:1014
+#: add-interactive.c:1020
msgid "revert staged set of changes back to the HEAD version"
msgstr "reverteix el conjunt de canvis «staged» a la versió HEAD"
-#: add-interactive.c:1016
+#: add-interactive.c:1022
msgid "pick hunks and update selectively"
msgstr "selecciona els trossos i actualitza selectivament"
-#: add-interactive.c:1018
+#: add-interactive.c:1024
msgid "view diff between HEAD and index"
msgstr "visualitza les diferències entre HEAD i l'índex"
-#: add-interactive.c:1020
+#: add-interactive.c:1026
msgid "add contents of untracked files to the staged set of changes"
msgstr "afegeix contingut de fitxers no seguits al conjunt de canvis «staged»"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1034 add-interactive.c:1083
msgid "Prompt help:"
msgstr "Mostra ajuda:"
-#: add-interactive.c:1030
+#: add-interactive.c:1036
msgid "select a single item"
msgstr "seleccioneu un únic ítem"
-#: add-interactive.c:1032
+#: add-interactive.c:1038
msgid "select a range of items"
msgstr "seleccioneu un rang d'ítems"
-#: add-interactive.c:1034
+#: add-interactive.c:1040
msgid "select multiple ranges"
msgstr "seleccioneu rangs múltiples"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1042 add-interactive.c:1087
msgid "select item based on unique prefix"
msgstr "seleccioneu un ítem basant-se en un prefix únic"
-#: add-interactive.c:1038
+#: add-interactive.c:1044
msgid "unselect specified items"
msgstr "desselecciona els ítems especificats"
-#: add-interactive.c:1040
+#: add-interactive.c:1046
msgid "choose all items"
msgstr "trieu tots els ítems"
-#: add-interactive.c:1042
+#: add-interactive.c:1048
msgid "(empty) finish selecting"
msgstr "(buit) finalitza la selecció"
-#: add-interactive.c:1079
+#: add-interactive.c:1085
msgid "select a numbered item"
msgstr "seleccioneu un ítem numerat"
-#: add-interactive.c:1083
+#: add-interactive.c:1089
msgid "(empty) select nothing"
msgstr "(buit) no seleccionis res"
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** Ordres ***"
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "I ara què"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "staged"
msgstr "staged"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "unstaged"
msgstr "unstaged"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
+#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
+#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
+#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
#: git-add--interactive.perl:213
msgid "path"
msgstr "camí"
-#: add-interactive.c:1151
+#: add-interactive.c:1157
msgid "could not refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Adeu.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Afegeix a «stage» [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? "
#: add-patch.c:39
msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"staging."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" staging."
msgstr ""
-"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
-"«staging»."
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a"
+" «staging»."
#: add-patch.c:42
msgid ""
@@ -319,30 +327,30 @@
"a - fes «stage» d'aquest tros i de tota la resta de trossos del fitxer\n"
"d - no facis «stage» d'aquest tros ni de cap altre restant del fitxer\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Afegeix a «stash» [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? "
#: add-patch.c:61
msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"stashing."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" stashing."
msgstr ""
"Si el pedaç s'aplica de forma neta, el tros editat es marcarà immediatament "
"per a «stashing»."
@@ -361,33 +369,33 @@
"a - fes «stash» d'aquest tros i de tota la resta de trossos del fitxer\n"
"d - no facis «stash» d'aquest tros ni de cap altre restant del fitxer\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Afegeix a «unstage» [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? "
#: add-patch.c:85
msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"unstaging."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" unstaging."
msgstr ""
-"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
-"«unstaging»."
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a"
+" «unstaging»."
#: add-patch.c:88
msgid ""
@@ -403,33 +411,33 @@
"a - fes «unstage» d'aquest tros i de tota la resta de trossos del fitxer\n"
"d - no facis «unstage» d'aquest tros ni de cap altre restant del fitxer\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Aplica la supressió a l'índex [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Aplica l'addició a l'índex [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Aplica aquest tros a l'índex [y,n,q,a,d%s,?]? "
#: add-patch.c:108 add-patch.c:176 add-patch.c:221
msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"applying."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" applying."
msgstr ""
-"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per "
-"aplicar-lo."
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a"
+" aplicar-lo."
#: add-patch.c:111
msgid ""
@@ -445,37 +453,37 @@
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Descarta el canvi de mode de l'arbre de treball [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Descarta suprimir de l'arbre de treball [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Descarta l'addició de l'arbre de treball [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Descarta aquest tros de l'arbre de treball [y,n,q,a,d%s,?]? "
#: add-patch.c:131 add-patch.c:154 add-patch.c:199
msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"discarding."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" discarding."
msgstr ""
-"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
-"ser descartat."
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a"
+" ser descartat."
#: add-patch.c:134 add-patch.c:202
msgid ""
@@ -491,25 +499,26 @@
"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-"Descarta el canvi de mode de l'índex i de l'arbre de treball [y,n,q,a,d"
-"%s,?]? "
+"Descarta el canvi de mode de l'índex i de l'arbre de treball "
+"[y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Descarta suprimir de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? "
+msgstr ""
+"Descarta suprimir de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Descarta l'addició de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
@@ -529,23 +538,24 @@
"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Aplica el canvi de mode a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplica la supressió a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
+msgstr ""
+"Aplica la supressió a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica l'addició a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica aquest tros a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
@@ -578,34 +588,34 @@
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer\n"
-#: add-patch.c:342
+#: add-patch.c:343
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "no s'ha pogut analitzar la capçalera del tros «%.*s»"
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "no s'ha pogut analitzar la capçalera del tros acolorida «%.*s»"
-#: add-patch.c:419
+#: add-patch.c:431
msgid "could not parse diff"
msgstr "no s'ha pogut analitzar el diff"
-#: add-patch.c:438
+#: add-patch.c:450
msgid "could not parse colored diff"
msgstr "no s'ha pogut analitzar el diff acolorit"
-#: add-patch.c:452
+#: add-patch.c:464
#, c-format
msgid "failed to run '%s'"
msgstr "no s'ha pogut executar «%s»"
-#: add-patch.c:611
+#: add-patch.c:618
msgid "mismatched output from interactive.diffFilter"
msgstr "sortida no coincident des d'interactive.diffFilter"
-#: add-patch.c:612
+#: add-patch.c:619
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -613,7 +623,7 @@
"El filtre ha de mantenir una correspondència d'un a un\n"
"entre les línies d'entrada i sortida."
-#: add-patch.c:790
+#: add-patch.c:797
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -622,7 +632,7 @@
"s'esperava la línia amb contingut #%d a\n"
"%.*s"
-#: add-patch.c:805
+#: add-patch.c:812
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -635,12 +645,12 @@
"\tno acaben amb:\n"
"%.*s"
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1088 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-"Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n"
+"Mode d'edició de trossos manual - vegeu més avall per a una guia ràpida.\n"
-#: add-patch.c:1085
+#: add-patch.c:1092
#, c-format
msgid ""
"---\n"
@@ -654,21 +664,21 @@
"Les línies que comencin per %c s'eliminaran.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1106 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
-"Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n"
+"Si no s'aplica correctament, tindreu una oportunitat per a editar-lo\n"
"de nou. Si s'eliminen totes les línies del tros, llavors l'edició s'avorta\n"
"i el tros es deixa sense cap canvi.\n"
-#: add-patch.c:1132
+#: add-patch.c:1139
msgid "could not parse hunk header"
msgstr "no s'ha pogut analitzar la capçalera del tros"
-#: add-patch.c:1177
+#: add-patch.c:1184
msgid "'git apply --cached' failed"
msgstr "«git apply --cached» ha fallat"
@@ -677,33 +687,33 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#.
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input
#. at this point.
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1246 git-add--interactive.perl:1242
+#: add-patch.c:1253 git-add--interactive.perl:1244
msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?"
+" "
msgstr ""
"El tros editat no s'aplica. Editeu-lo de nou (si responeu «no» es "
"descartarà) [y/n]? "
-#: add-patch.c:1289
+#: add-patch.c:1296
msgid "The selected hunks do not apply to the index!"
msgstr "Els trossos seleccionats no s'apliquen a l'índex!"
-#: add-patch.c:1290 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
-#: add-patch.c:1297 git-add--interactive.perl:1349
+#: add-patch.c:1304 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "No s'ha aplicat res.\n"
-#: add-patch.c:1354
+#: add-patch.c:1361
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -725,73 +735,73 @@
"e - edita manualment el tros actual\n"
"? - mostra l'ajuda\n"
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1523 add-patch.c:1533
msgid "No previous hunk"
msgstr "Sense tros previ"
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1528 add-patch.c:1538
msgid "No next hunk"
msgstr "No hi ha tros següent"
-#: add-patch.c:1537
+#: add-patch.c:1544
msgid "No other hunks to goto"
msgstr "No hi ha altres trossos on anar-hi"
-#: add-patch.c:1548 git-add--interactive.perl:1606
+#: add-patch.c:1555 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "ves a quin tros (<ret> per a veure'n més)? "
-#: add-patch.c:1549 git-add--interactive.perl:1608
+#: add-patch.c:1556 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "ves a quin tros? "
-#: add-patch.c:1560
+#: add-patch.c:1567
#, c-format
msgid "Invalid number: '%s'"
msgstr "Número no vàlid: «%s»"
-#: add-patch.c:1565
+#: add-patch.c:1572
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Només %d tros disponible."
msgstr[1] "Només %d trossos disponibles."
-#: add-patch.c:1574
+#: add-patch.c:1581
msgid "No other hunks to search"
msgstr "No hi ha cap altre tros a cercar"
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1587 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "cerca per expressió regular? "
-#: add-patch.c:1595
+#: add-patch.c:1602
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Expressió regular de cerca mal formada %s: %s"
-#: add-patch.c:1612
+#: add-patch.c:1619
msgid "No hunk matches the given pattern"
msgstr "No hi ha trossos que coincideixin amb el patró donat"
-#: add-patch.c:1619
+#: add-patch.c:1626
msgid "Sorry, cannot split this hunk"
msgstr "No es pot dividir aquest tros"
-#: add-patch.c:1623
+#: add-patch.c:1630
#, c-format
msgid "Split into %d hunks."
msgstr "Divideix en %d trossos."
-#: add-patch.c:1627
+#: add-patch.c:1634
msgid "Sorry, cannot edit this hunk"
msgstr "No es pot editar aquest tros"
-#: add-patch.c:1679
+#: add-patch.c:1686
msgid "'git apply' failed"
msgstr "«git apply» ha fallat"
-#: advice.c:145
+#: advice.c:81
#, c-format
msgid ""
"\n"
@@ -800,75 +810,87 @@
"\n"
"Desactiva aquest missatge amb «git config advice.%s false»"
-#: advice.c:161
+#: advice.c:97
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sconsell: %.*s%s\n"
-#: advice.c:252
+#: advice.c:181
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:254
+#: advice.c:183
msgid "Committing is not possible because you have unmerged files."
msgstr "Cometre no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:256
+#: advice.c:185
msgid "Merging is not possible because you have unmerged files."
msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:258
+#: advice.c:187
msgid "Pulling is not possible because you have unmerged files."
msgstr "Baixar no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:260
+#: advice.c:189
msgid "Reverting is not possible because you have unmerged files."
msgstr "Revertir no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:262
+#: advice.c:191
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "No és possible %s perquè teniu fitxers sense fusionar."
-#: advice.c:270
+#: advice.c:199
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
"Arregleu-los en l'arbre de treball, i després useu\n"
-"«git add/rm <fitxer>» segons sigui apropiat per a marcar la\n"
-"resolució i feu una comissió."
+"«git add/rm <fitxer>» segons sigui apropiat per a\n"
+"marcar la resolució i feu una comissió."
-#: advice.c:278
+#: advice.c:207
msgid "Exiting because of an unresolved conflict."
msgstr "S'està sortint a causa d'un conflicte no resolt."
-#: advice.c:283 builtin/merge.c:1374
+#: advice.c:212 builtin/merge.c:1388
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
-#: advice.c:285
+#: advice.c:214
msgid "Please, commit your changes before merging."
msgstr "Cometeu els vostres canvis abans de fusionar."
-#: advice.c:286
+#: advice.c:215
msgid "Exiting because of unfinished merge."
msgstr "S'està sortint a causa d'una fusió no terminada."
-#: advice.c:296
+#: advice.c:220
+msgid "Not possible to fast-forward, aborting."
+msgstr "No és possible avançar ràpidament, s'està avortant."
+
+#: advice.c:230
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
+"Els camins següents i/o les especificacions de camins coincideixen\n"
+"amb camins que existeixen fora de la vostra definició de\n"
+"«sparse-checkout», així que no serà actualitzaran en l'índex:\n"
-#: advice.c:303
+#: advice.c:237
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
+"Si voleu actualitzar aquestes entrades, proveu les següents solucions:\n"
+"* Utilitzeu l'opció --sparse.\n"
+"* Inhabiliteu o modifiqueu les regles de dispersió."
-#: advice.c:310
+#: advice.c:245
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -886,15 +908,14 @@
"\n"
" git switch -\n"
"\n"
-"Turn off this advice by setting config variable advice.detachedHead to "
-"false\n"
+"Turn off this advice by setting config variable advice.detachedHead to false\n"
"\n"
msgstr ""
"Avís: s'està canviant a «%s».\n"
"\n"
"Esteu en un estat de «HEAD separat». Podeu donar un cop d'ull, fer canvis\n"
-"experimentals i cometre'ls, i podeu descartar qualsevol comissió que feu\n"
-"en aquest estat sense impactar a cap branca tornant a una branca.\n"
+"experimentals i cometre'ls. Podeu descartar qualsevol comissió que feu\n"
+"en aquest estat, sense impactar a cap branca, tornant a una branca.\n"
"\n"
"Si voleu crear una branca nova per a conservar les comissions que creeu,\n"
"poder fer-ho (ara o més tard) usant -c amb l'ordre switch. Exemple:\n"
@@ -905,8 +926,7 @@
"\n"
" git switch -\n"
"\n"
-"Desactiveu aquest consell configurant la variable advice.detachedHead a "
-"«false»\n"
+"Desactiveu aquest consell configurant la variable advice.detachedHead a «false»\n"
"\n"
#: alias.c:50
@@ -927,81 +947,96 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opció ignora l'espai en blanc «%s» no reconeguda"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject i --3way no es poden usar junts."
+#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
+#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
+#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
+#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
+#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
+#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
+#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
+#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
+#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
+#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
+#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
+#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
+#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
+#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
+#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
+#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
+#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
+#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
+#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
+#: builtin/worktree.c:779
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "les opcions «%s» i «%s» no es poden usar juntes"
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way fora d'un repositori"
+#: apply.c:141 apply.c:152 apply.c:155
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "«%s» fora d'un repositori"
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index fora d'un repositori"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached fora d'un repositori"
-
-#: apply.c:800
+#: apply.c:807
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "No es pot preparar l'expressió regular de marca de temps %s"
-#: apply.c:809
+#: apply.c:816
#, c-format
msgid "regexec returned %d for input: %s"
-msgstr "regexec ha retornat %d per l'entrada: %s"
+msgstr "regexec ha retornat %d per a l'entrada: %s"
-#: apply.c:883
+#: apply.c:890
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"
-#: apply.c:921
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff incorrecte - s'esperava /dev/null, s'ha rebut %s en la "
"línia %d"
-#: apply.c:927
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia "
"%d"
-#: apply.c:928
+#: apply.c:935
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la "
"línia %d"
-#: apply.c:933
+#: apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff incorrecte - s'esperava /dev/null en la línia %d"
-#: apply.c:962
+#: apply.c:969
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "mode no vàlid en la línia %d: %s"
-#: apply.c:1281
+#: apply.c:1288
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "línies de capçalera %d i %d inconsistents"
-#: apply.c:1371
+#: apply.c:1378
#, c-format
msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
+"git diff header lacks filename information when removing %d leading pathname"
+" component (line %d)"
msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
+"git diff header lacks filename information when removing %d leading pathname"
+" components (line %d)"
msgstr[0] ""
"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
"%d component de nom de camí inicial (línia %d)"
@@ -1009,93 +1044,93 @@
"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
"%d components de nom de camí inicial (línia %d)"
-#: apply.c:1384
+#: apply.c:1391
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"a la capçalera de git diff li manca informació de nom de fitxer (línia %d)"
-#: apply.c:1480
+#: apply.c:1487
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recompte: línia inesperada: %.*s"
-#: apply.c:1549
+#: apply.c:1556
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
-#: apply.c:1752
+#: apply.c:1759
msgid "new file depends on old contents"
msgstr "el fitxer nou depèn dels continguts antics"
-#: apply.c:1754
+#: apply.c:1761
msgid "deleted file still has contents"
msgstr "el fitxer suprimit encara té continguts"
-#: apply.c:1788
+#: apply.c:1795
#, c-format
msgid "corrupt patch at line %d"
msgstr "pedaç malmès a la línia %d"
-#: apply.c:1825
+#: apply.c:1832
#, c-format
msgid "new file %s depends on old contents"
msgstr "el fitxer nou %s depèn dels continguts antics"
-#: apply.c:1827
+#: apply.c:1834
#, c-format
msgid "deleted file %s still has contents"
msgstr "el fitxer suprimit %s encara té continguts"
-#: apply.c:1830
+#: apply.c:1837
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** advertència: el fitxer %s queda buit però no se suprimeix"
-#: apply.c:1977
+#: apply.c:1985
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "pedaç binari malmès a la línia %d: %.*s"
-#: apply.c:2014
+#: apply.c:2022
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "pedaç binari no reconegut a la línia %d"
-#: apply.c:2176
+#: apply.c:2184
#, c-format
msgid "patch with only garbage at line %d"
msgstr "pedaç amb només escombraries a la línia %d"
-#: apply.c:2262
+#: apply.c:2270
#, c-format
msgid "unable to read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: apply.c:2266
+#: apply.c:2274
#, c-format
msgid "unable to open or read %s"
msgstr "no s'ha pogut obrir o llegir %s"
-#: apply.c:2935
+#: apply.c:2943
#, c-format
msgid "invalid start of line: '%c'"
msgstr "inici de línia no vàlid: «%c»"
-#: apply.c:3056
+#: apply.c:3064
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament d'%d línia)."
msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament de %d línies)."
-#: apply.c:3068
+#: apply.c:3076
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"
-#: apply.c:3074
+#: apply.c:3082
#, c-format
msgid ""
"while searching for:\n"
@@ -1104,23 +1139,23 @@
"tot cercant:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3104
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "manquen les dades de pedaç binari de «%s»"
-#: apply.c:3104
+#: apply.c:3112
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s»"
-#: apply.c:3151
+#: apply.c:3159
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa"
-#: apply.c:3162
+#: apply.c:3170
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -1128,290 +1163,291 @@
"el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts "
"actuals."
-#: apply.c:3170
+#: apply.c:3178
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "el pedaç s'aplica a un «%s» buit però no és buit"
-#: apply.c:3188
+#: apply.c:3196
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "no es pot llegir la postimatge %s necessària per a «%s»"
-#: apply.c:3201
+#: apply.c:3209
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el pedaç binari no s'aplica a «%s»"
-#: apply.c:3208
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha "
"rebut %s)"
-#: apply.c:3229
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el pedaç ha fallat: %s:%ld"
-#: apply.c:3352
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
+#: setup.c:309
#, c-format
msgid "failed to read %s"
msgstr "s'ha produït un error en llegir %s"
-#: apply.c:3412
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3449 apply.c:3721
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3559 apply.c:3736
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existeix en l'índex"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3568 apply.c:3744 apply.c:3960
#, c-format
msgid "%s: does not match index"
msgstr "%s: no coincideix amb l'índex"
-#: apply.c:3571
+#: apply.c:3605
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
"al repositori li manca el blob necessari per a fer a una fusió de 3 vies."
-#: apply.c:3574
+#: apply.c:3608
#, c-format
msgid "Performing three-way merge...\n"
msgstr "S'està fent una fusió de 3 vies...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3624 apply.c:3628
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "no es poden llegir els continguts actuals de «%s»"
-#: apply.c:3606
+#: apply.c:3640
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "S'ha produït un error en fer una fusió de tres vies...\n"
-#: apply.c:3620
+#: apply.c:3654
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n"
-#: apply.c:3625
+#: apply.c:3659
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
-#: apply.c:3642
+#: apply.c:3676
#, c-format
msgid "Falling back to direct application...\n"
msgstr "S'està usant alternativament l'aplicació directa...\n"
-#: apply.c:3654
+#: apply.c:3688
msgid "removal patch leaves file contents"
msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
-#: apply.c:3727
+#: apply.c:3761
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipus erroni"
-#: apply.c:3729
+#: apply.c:3763
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s és del tipus %o, s'esperava %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
+#: read-cache.c:1399
#, c-format
msgid "invalid path '%s'"
msgstr "camí no vàlid: «%s»"
-#: apply.c:3952
+#: apply.c:3958
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ja existeix en l'índex"
-#: apply.c:3956
+#: apply.c:3962
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ja existeix en el directori de treball"
-#: apply.c:3976
+#: apply.c:3982
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"
-#: apply.c:3981
+#: apply.c:3987
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"
-#: apply.c:4001
+#: apply.c:4007
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "el fitxer afectat «%s» és més enllà d'un enllaç simbòlic"
-#: apply.c:4005
+#: apply.c:4011
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el pedaç no s'aplica"
-#: apply.c:4020
+#: apply.c:4026
#, c-format
msgid "Checking patch %s..."
msgstr "S'està comprovant el pedaç %s..."
-#: apply.c:4112
+#: apply.c:4118
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "falta la informació sha1 o és inútil per al submòdul %s"
-#: apply.c:4119
+#: apply.c:4125
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "canvi de mode per a %s, el qual no està en la HEAD actual"
-#: apply.c:4122
+#: apply.c:4128
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta informació sha1 o és inútil (%s)."
-#: apply.c:4131
+#: apply.c:4137
#, c-format
msgid "could not add %s to temporary index"
msgstr "no s'ha pogut afegir %s a l'índex temporal"
-#: apply.c:4141
+#: apply.c:4147
#, c-format
msgid "could not write temporary index to %s"
msgstr "no s'ha pogut escriure l'índex temporal a %s"
-#: apply.c:4279
+#: apply.c:4285
#, c-format
msgid "unable to remove %s from index"
msgstr "no s'ha pogut eliminar %s de l'índex"
-#: apply.c:4313
+#: apply.c:4319
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "pedaç malmès per al submòdul %s"
-#: apply.c:4319
+#: apply.c:4325
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»"
-#: apply.c:4327
+#: apply.c:4333
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-"no s'ha pogut crear un magatzem de suport per al fitxer novament creat "
-"%s"
+"no s'ha pogut crear un magatzem de suport per al fitxer novament creat %s"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4339 apply.c:4484
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no s'ha pogut afegir una entrada de cau per a %s"
-#: apply.c:4376 builtin/bisect--helper.c:523
+#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "no s'ha pogut escriure a «%s»"
-#: apply.c:4380
+#: apply.c:4386
#, c-format
msgid "closing file '%s'"
msgstr "s'està tancant el fitxer «%s»"
-#: apply.c:4450
+#: apply.c:4456
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
-#: apply.c:4548
+#: apply.c:4554
#, c-format
msgid "Applied patch %s cleanly."
msgstr "El pedaç %s s'ha aplicat netament."
-#: apply.c:4556
+#: apply.c:4562
msgid "internal error"
msgstr "error intern"
-#: apply.c:4559
+#: apply.c:4565
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..."
msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..."
-#: apply.c:4570
+#: apply.c:4576
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4584
#, c-format
msgid "cannot open %s"
msgstr "no es pot obrir %s"
-#: apply.c:4592
+#: apply.c:4598
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "El tros #%d s'ha aplicat netament."
-#: apply.c:4596
+#: apply.c:4602
#, c-format
msgid "Rejected hunk #%d."
msgstr "S'ha rebutjat el tros #%d."
-#: apply.c:4725
+#: apply.c:4731
#, c-format
msgid "Skipped patch '%s'."
msgstr "S'ha omès el pedaç «%s»."
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "entrada no reconeguda"
+#: apply.c:4740
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr ""
+"No hi ha pedaços vàlids a l'entrada (permeteu-los amb «--allow-empty»)"
-#: apply.c:4753
+#: apply.c:4761
msgid "unable to read index file"
msgstr "no es pot llegir el fitxer d'índex"
-#: apply.c:4910
+#: apply.c:4918
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no es pot obrir el pedaç «%s»: %s"
-#: apply.c:4937
+#: apply.c:4945
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "s'ha silenciat %d error d'espai en blanc"
msgstr[1] "s'han silenciat %d errors d'espai en blanc"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4951 apply.c:4966
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d línia afegeix errors d'espai en blanc."
msgstr[1] "%d línies afegeixen errors d'espai en blanc."
-#: apply.c:4951
+#: apply.c:4959
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1420,179 +1456,180 @@
msgstr[1] ""
"S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
-#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "No s'ha pogut escriure un fitxer d'índex nou"
-#: apply.c:4995
+#: apply.c:5003
msgid "don't apply changes matching the given path"
msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-#: apply.c:4998
+#: apply.c:5006
msgid "apply changes matching the given path"
msgstr "aplica els canvis que coincideixin amb el camí donat"
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5008 builtin/am.c:2379
msgid "num"
-msgstr "número"
+msgstr "nombre"
-#: apply.c:5001
+#: apply.c:5009
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"elimina <nombre> barres obliqües inicials dels camins de diferència "
"tradicionals"
-#: apply.c:5004
+#: apply.c:5012
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
-#: apply.c:5006
+#: apply.c:5014
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
+"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de "
+"l'entrada"
-#: apply.c:5010
+#: apply.c:5018
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
-#: apply.c:5012
+#: apply.c:5020
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada"
-#: apply.c:5014
+#: apply.c:5022
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable"
-#: apply.c:5016
+#: apply.c:5024
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: apply.c:5018
+#: apply.c:5026
msgid "mark new files with `git add --intent-to-add`"
msgstr "marca els fitxers nous amb «git add --intent-to-add»"
-#: apply.c:5020
+#: apply.c:5028
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: apply.c:5022
+#: apply.c:5030
msgid "accept a patch that touches outside the working area"
msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-#: apply.c:5025
+#: apply.c:5033
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: apply.c:5027
+#: apply.c:5035
msgid "attempt three-way merge, fall back on normal patch if that fails"
-msgstr "intenta una fusió de tres vies, si falla intenta llavors un pedaç normal"
+msgstr ""
+"intenta una fusió de tres vies, si falla intenta llavors un pedaç normal"
-#: apply.c:5029
+#: apply.c:5037
msgid "build a temporary index based on embedded index information"
-msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
+msgstr ""
+"construeix un índex temporal basat en la informació d'índex incrustada"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5040 builtin/checkout-index.c:230
msgid "paths are separated with NUL character"
msgstr "els camins se separen amb el caràcter NUL"
-#: apply.c:5034
+#: apply.c:5042
msgid "ensure at least <n> lines of context match"
msgstr "assegura't que almenys <n> línies de context coincideixin"
-#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
+#: builtin/rebase.c:1079
msgid "action"
msgstr "acció"
-#: apply.c:5036
+#: apply.c:5044
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"detecta les línies noves o modificades que tinguin errors d'espai en blanc"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5047 apply.c:5050
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc en cercar context"
-#: apply.c:5045
+#: apply.c:5053
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
-#: apply.c:5047
+#: apply.c:5055
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
-#: apply.c:5049
+#: apply.c:5057
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
-#: apply.c:5051
+#: apply.c:5059
msgid "allow overlapping hunks"
-msgstr "permet trossos encavalcants"
+msgstr "permet trossos superposats"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "sigues detallat"
-
-#: apply.c:5054
+#: apply.c:5062
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
-#: apply.c:5057
+#: apply.c:5065
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos"
-#: apply.c:5059 builtin/am.c:2305
+#: apply.c:5067 builtin/am.c:2367
msgid "root"
msgstr "arrel"
-#: apply.c:5060
+#: apply.c:5068
msgid "prepend <root> to all filenames"
msgstr "anteposa <arrel> a tots els noms de fitxer"
-#: archive-tar.c:125 archive-zip.c:345
+#: apply.c:5071
+msgid "don't return error for empty patches"
+msgstr "no retornis l'error per als pedaços buits"
+
+#: archive-tar.c:125 archive-zip.c:346
#, c-format
msgid "cannot stream blob %s"
msgstr "no es pot transmetre el blob %s"
-#: archive-tar.c:265 archive-zip.c:358
+#: archive-tar.c:265 archive-zip.c:359
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "no s'ha pogut iniciar el filtre «%s»"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "no s'ha pogut redirigir el descriptor"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "«%s» error reportat pel filtre"
-#: archive-zip.c:318
+#: archive-zip.c:319
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "el camí no és vàlid en UTF-8: %s"
-#: archive-zip.c:322
+#: archive-zip.c:323
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s"
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
#, c-format
msgid "deflate error (%d)"
msgstr "error de deflació (%d)"
-#: archive-zip.c:603
+#: archive-zip.c:604
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>"
@@ -1601,13 +1638,10 @@
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<opcions>] <arbre> [<camí>...]"
-#: 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>...]"
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> "
+"[<path>...]"
msgstr ""
"git archive --remote <repositori> [--exec <ordre>] [<opcions>] <arbre> "
"[<camí>...]"
@@ -1616,141 +1650,138 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repositori> [--exec <ordre>] --list"
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:579
#, c-format
-msgid "cannot read %s"
+msgid "cannot read '%s'"
msgstr "no es pot llegir «%s»"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
-#, c-format
-msgid "could not read '%s'"
-msgstr "no s'ha pogut llegir «%s»"
-
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "no existeix la referència: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "no és un nom d'objecte vàlid: %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "no és un objecte d'arbre: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "no se segueix el directori de treball actual"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Fitxer no trobat: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "No és un fitxer normal: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "format"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1809
msgid "prefix"
msgstr "prefix"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
+#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
msgid "file"
msgstr "fitxer"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "inclou els fitxers no seguits a l'arxiu"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "escriu l'arxiu a aquest fitxer"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "llegeix .gitattributes en el directori de treball"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "informa de fitxers arxivats en stderr"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "estableix el nivell de compressió"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "llista els formats d'arxiu admesos"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
+#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
msgid "repo"
msgstr "repositori"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "recupera l'arxiu del repositori remot <repositori>"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
msgid "command"
msgstr "ordre"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "camí a l'ordre git-upload-archive remota"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Opció inesperada --remote"
-#: archive.c:581
-msgid "Option --exec can only be used together with --remote"
-msgstr "L'opció --exec només es pot usar juntament amb --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
+#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
+#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
+#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
+#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
+#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "l'opció «%s» requereix «%s»"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Opció inesperada --output"
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Les opcions --add-file i --remote no es poden usar juntes"
-
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'arxiu desconegut «%s»"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument no admès per al format «%s»: -%d"
@@ -1773,22 +1804,22 @@
"Els patrons negatius s'ignoren en els atributs de git\n"
"Useu «\\!» per exclamació capdavantera literal."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "No podem bisecar més!\n"
-#: bisect.c:766
+#: bisect.c:765
#, c-format
msgid "Not a valid commit name %s"
msgstr "No és un nom de comissió vàlid %s"
-#: bisect.c:791
+#: bisect.c:790
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1797,7 +1828,7 @@
"La base de fusió %s és errònia.\n"
"Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n"
-#: bisect.c:796
+#: bisect.c:795
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1806,7 +1837,7 @@
"La base de fusió %s és nova.\n"
"La propietat s'ha canviat entre %s i [%s].\n"
-#: bisect.c:801
+#: bisect.c:800
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1815,7 +1846,7 @@
"La base de fusió %s és %s.\n"
"Això vol dir que la primera comissió «%s» és entre %s i [%s].\n"
-#: bisect.c:809
+#: bisect.c:808
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1826,7 +1857,7 @@
"git bisect no pot funcionar correctament en aquest cas.\n"
"Potser heu confós les revisions %s i %s?\n"
-#: bisect.c:822
+#: bisect.c:821
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1834,40 +1865,39 @@
"We continue anyway."
msgstr ""
"s'ha d'ometre la base de fusió entre %s i [%s].\n"
-"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i "
-"%s.\n"
+"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i %s.\n"
"Continuem de totes maneres."
-#: bisect.c:861
+#: bisect.c:860
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisecant: s'ha de provar una base de fusió\n"
-#: bisect.c:911
+#: bisect.c:910
#, c-format
msgid "a %s revision is needed"
msgstr "es necessita una revisió %s"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:940
#, c-format
msgid "could not create file '%s'"
msgstr "no s'ha pogut crear el fitxer «%s»"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:986 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "no s'ha pogut llegir el fitxer «%s»"
-#: bisect.c:1027
+#: bisect.c:1026
msgid "reading bisect refs failed"
msgstr "la lectura de les referències de bisecció ha fallat"
-#: bisect.c:1057
+#: bisect.c:1056
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s era ambdós %s i %s\n"
-#: bisect.c:1066
+#: bisect.c:1065
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1876,7 +1906,7 @@
"No s'ha trobat cap comissió comprovable.\n"
"Potser heu començat amb paràmetres de camí incorrectes?\n"
-#: bisect.c:1095
+#: bisect.c:1094
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1885,157 +1915,178 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
-#.
-#: bisect.c:1101
+#: bisect.c:1100
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bisecant: manca %d revisió a provar després d'aquesta %s\n"
msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n"
-#: blame.c:2776
+#: blame.c:2773
msgid "--contents and --reverse do not blend well."
msgstr "--contents i --reverse no funcionen bé juntes."
-#: blame.c:2790
+#: blame.c:2787
msgid "cannot use --contents with final commit object name"
msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final"
-#: blame.c:2811
+#: blame.c:2808
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse i --first-parent junts requereixen una última comissió "
"especificada"
-#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
+#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
+#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
+#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
+#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
-msgstr "la configuració del passeig per revisions ha fallat"
+msgstr "la configuració del recorregut de revisions ha fallat"
-#: blame.c:2838
+#: blame.c:2835
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-"--reverse --first-parent junts requereixen un rang de la cadena de mares "
-"primeres"
+"--reverse --first-parent junts requereixen un rang de la cadena de pares "
+"primers"
-#: blame.c:2849
+#: blame.c:2846
#, c-format
msgid "no such path %s in %s"
msgstr "no hi ha tal camí %s en %s"
-#: blame.c:2860
+#: blame.c:2857
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "no es pot llegir el blob %s per al camí %s"
-#: branch.c:53
-#, c-format
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr ""
-"\n"
-"Després de corregir la causa de l'error, podeu\n"
-"intentar corregir la informació de seguiment remot\n"
-"invocant «git branch --set-upstream-to=%s%s%s»."
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "No s'està establint la branca %s com a la seva pròpia font."
-
#: branch.c:93
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
msgstr ""
-"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s» "
-"fent «rebase»."
-
-#: branch.c:94
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr ""
-"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
-
-#: branch.c:98
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
-"La branca «%s» està configurada per a seguir la branca local «%s» fent "
-"«rebase»."
-
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "La branca «%s» està configurada per a seguir la branca local «%s»."
+"no es pot heretar la configuració del seguiment de la font de múltiples "
+"referències quan es demana fer «rebase»"
#: branch.c:104
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "no s'està establert la branca «%s» com a la seva pròpia font"
+
+#: branch.c:160
+#, c-format
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "la branca «%s» està configurada per a seguir «%s» fent «rebase»."
+
+#: branch.c:161
+#, c-format
+msgid "branch '%s' set up to track '%s'."
+msgstr "la branca «%s» està configurada per a seguir «%s»."
+
+#: branch.c:164
+#, c-format
+msgid "branch '%s' set up to track:"
+msgstr "la branca «%s» està configurada per a seguir:"
+
+#: branch.c:176
+msgid "unable to write upstream branch configuration"
+msgstr "no es pot escriure la configuració de la branca font"
+
+#: branch.c:178
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
msgstr ""
-"La branca «%s» està configurada per a seguir la referència remota «%s» fent "
-"«rebase»."
+"\n"
+"Després de corregir la causa de l'error, podeu intentar\n"
+"corregir la informació de seguiment remot executant:"
-#: branch.c:105
+#: branch.c:219
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
+msgid "asked to inherit tracking from '%s', but no remote is set"
msgstr ""
-"La branca «%s» està configurada per a seguir la referència remota «%s»."
+"s'ha demanat que hereti el seguiment de «%s», però no s'ha establert cap "
+"remot"
-#: branch.c:109
+#: branch.c:225
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr ""
-"La branca «%s» està configurada per a seguir la referència local «%s» fent "
-"«rebase»."
+"s'ha demanat que hereti el seguiment de «%s», però no s'ha establert cap "
+"configuració de fusionat"
-#: branch.c:110
+#: branch.c:277
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "La branca «%s» està configurada per a seguir la referència local «%s»."
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "no s'està seguint: informació ambigua per a la referència «%s»"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "No es pot escriure la configuració de la branca font"
-
-#: branch.c:156
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading " " space around.
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#: branch.c:289 object-name.c:464
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "No seguint: informació ambigua per a la referència %s"
+msgid " %s\n"
+msgstr " %s\n"
-#: branch.c:189
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#: branch.c:295
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "«%s» no és un nom de branca vàlid."
-
-#: branch.c:208
-#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Una branca amb nom «%s» ja existeix."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "No es pot actualitzar la branca actual a la força."
-
-#: branch.c:233
-#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
msgstr ""
-"No es pot configurar la informació de seguiment; el punt inicial «%s» no és "
-"una branca."
+"Hi ha diversos remots pels quals les refspecs coincideixen amb la ref\n"
+"de seguiment remot «%s»:\n"
+"%s\n"
+"Normalment es tracta d'un error de configuració.\n"
+"\n"
+"Per a donar suport a la creació de branques de seguiment, assegureu-vos que\n"
+"els diferents refspecs remots s'assignen a diferents espais de noms\n"
+"de seguiment."
-#: branch.c:235
+#: branch.c:344
+#, c-format
+msgid "'%s' is not a valid branch name"
+msgstr "«%s» no és un nom de branca vàlid"
+
+#: branch.c:364
+#, c-format
+msgid "a branch named '%s' already exists"
+msgstr "ja existeix una branca amb nom «%s»"
+
+#: branch.c:370
+#, c-format
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "no es pot forçar l'actualització de la branca «%s», agafada a «%s»"
+
+#: branch.c:393
+#, c-format
+msgid ""
+"cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"no es pot configurar la informació de seguiment; el punt inicial «%s» no és "
+"una branca"
+
+#: branch.c:395
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branca font demanada «%s» no existeix"
-#: branch.c:237
+#: branch.c:397
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -2056,156 +2107,173 @@
"«git push -u» per a establir la configuració font\n"
"mentre pugeu."
-#: branch.c:281
+#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "No és un nom d'objecte vàlid: «%s»."
+msgid "not a valid object name: '%s'"
+msgstr "no és un nom d'objecte vàlid: «%s»"
-#: branch.c:301
+#: branch.c:465
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Nom d'objecte ambigu: «%s»."
+msgid "ambiguous object name: '%s'"
+msgstr "nom d'objecte ambigu: «%s»"
-#: branch.c:306
+#: branch.c:470
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "No és un punt de ramificació vàlid: «%s»."
+msgid "not a valid branch point: '%s'"
+msgstr "no és un punt de ramificació vàlid: «%s»"
-#: branch.c:366
+#: branch.c:658
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "submòdul «%s»: no es pot trobar el submòdul"
+
+#: branch.c:661
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
+msgstr ""
+"Podeu provar d'actualitzar els submòduls utilitzant «git checkout %s && git submodule update --init»"
+
+#: branch.c:672 branch.c:698
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "submòdul «%s»: no es pot crear la branca: «%s»"
+
+#: branch.c:730
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "«%s» ja s'ha agafat a «%s»"
-#: branch.c:389
+#: branch.c:755
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD de l'arbre de treball %s no està actualitzat"
-#: bundle.c:41
+#: bundle.c:45
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
-msgstr "Algoritme de hash del farcell desconegut: %s"
+msgstr "algoritme de hash del farcell desconegut: %s"
-#: bundle.c:45
+#: bundle.c:53
#, c-format
msgid "unknown capability '%s'"
msgstr "funcionalitat «%s» desconeguda"
-#: bundle.c:71
+#: bundle.c:79
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
msgstr "«%s» no sembla un fitxer de farcell v2 o v3"
-#: bundle.c:110
+#: bundle.c:118
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "capçalera no reconeguda: %s%s (%d)"
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
+#: builtin/commit.c:865
#, c-format
msgid "could not open '%s'"
msgstr "no s'ha pogut obrir «%s»"
-#: bundle.c:189
+#: bundle.c:203
msgid "Repository lacks these prerequisite commits:"
msgstr "Al repositori li manquen aquestes comissions prerequerides:"
-#: bundle.c:192
+#: bundle.c:206
msgid "need a repository to verify a bundle"
-msgstr "cal un repositori per verificar un farcell"
+msgstr "cal un repositori per a verificar un farcell"
-#: bundle.c:243
+#: bundle.c:264
#, c-format
msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
msgstr[0] "El farcell conté aquesta referència:"
-msgstr[1] "El farcell conté aquestes %d referències:"
+msgstr[1] "El farcell conté aquestes %<PRIuMAX> referències:"
-#: bundle.c:250
+#: bundle.c:272
msgid "The bundle records a complete history."
msgstr "El farcell registra una història completa."
-#: bundle.c:252
+#: bundle.c:274
#, c-format
msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
msgstr[0] "El farcell requereix aquesta referència:"
-msgstr[1] "El farcell requereix aquestes %d referències:"
+msgstr[1] "El farcell requereix aquestes %<PRIuMAX> referències:"
-#: bundle.c:319
+#: bundle.c:350
msgid "unable to dup bundle descriptor"
msgstr "no s'ha pogut duplicar el descriptor del farcell"
-#: bundle.c:326
+#: bundle.c:357
msgid "Could not spawn pack-objects"
-msgstr "No s'ha pogut generar el pack-objects"
+msgstr "No s'ha pogut engendrar el pack-objects"
-#: bundle.c:337
+#: bundle.c:368
msgid "pack-objects died"
-msgstr "El pack-objects s'ha mort"
+msgstr "el pack-objects s'ha mort"
-#: bundle.c:386
+#: bundle.c:417
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "les opcions de la llista de revisions exclouen la referència «%s»"
-#: bundle.c:490
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "versió del farcell no compatible %d"
-
-#: bundle.c:492
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "no es pot escriure la versió %d amb l'algorisme %s"
-
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument no reconegut: %s"
-#: bundle.c:539
+#: bundle.c:548
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "versió del farcell no compatible %d"
+
+#: bundle.c:550
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "no es pot escriure la versió del farcell %d amb l'algorisme %s"
+
+#: bundle.c:600
msgid "Refusing to create empty bundle."
msgstr "S'està refusant crear un farcell buit."
-#: bundle.c:549
+#: bundle.c:610
#, c-format
msgid "cannot create '%s'"
msgstr "no es pot crear «%s»"
-#: bundle.c:574
+#: bundle.c:639
msgid "index-pack died"
-msgstr "L'index-pack s'ha mort"
+msgstr "l'index-pack s'ha mort"
-#: chunk-format.c:113
+#: chunk-format.c:117
msgid "terminating chunk id appears earlier than expected"
msgstr ""
-"l'identificador de fragment de finalització apareix abans del que "
-"s'esperava"
+"l'identificador de fragment de finalització apareix abans del que s'esperava"
-#: chunk-format.c:122
+#: chunk-format.c:126
#, c-format
msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr ""
-"desplaçament incorrecte del fragment %<PRIx64> and %<PRIx64>"
+msgstr "desplaçament incorrecte del fragment %<PRIx64> i %<PRIx64>"
-#: chunk-format.c:129
+#: chunk-format.c:133
#, c-format
msgid "duplicate chunk ID %<PRIx32> found"
-msgstr "S'ha trobat un ID del fragment %<PRIx32> duplicat"
+msgstr "s'ha trobat un ID del fragment %<PRIx32> duplicat"
-#: chunk-format.c:143
+#: chunk-format.c:147
#, c-format
msgid "final chunk has non-zero id %<PRIx32>"
-msgstr "El fragment final té un id %<PRIx32> que no és zero"
+msgstr "el fragment final té un id %<PRIx32> que no és zero"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "valor de color no vàlid: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:52
msgid "invalid hash version"
msgstr "especificació de hash no vàlida"
@@ -2234,262 +2302,272 @@
#, c-format
msgid "commit-graph file is too small to hold %u chunks"
msgstr ""
-"el fitxer del graf de comissions és massa petit per guardar %u fragments"
+"el fitxer del graf de comissions és massa petit per a guardar %u fragments"
-#: commit-graph.c:482
+#: commit-graph.c:485
msgid "commit-graph has no base graphs chunk"
msgstr "el fragment del graf de comissions no té grafs de base"
-#: commit-graph.c:492
+#: commit-graph.c:495
msgid "commit-graph chain does not match"
msgstr "la cadena del graf de comissions no coincideix"
-#: commit-graph.c:540
+#: commit-graph.c:543
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr ""
"la cadena del graf de comissions no és vàlida: la línia «%s» no és un hash"
-#: commit-graph.c:564
+#: commit-graph.c:567
msgid "unable to find all commit-graph files"
msgstr "no es poden trobar tots els fitxers del graf de comissions"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:752 commit-graph.c:789
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
"posició de la comissió no vàlida. Probablement el graf de comissions està "
"malmès"
-#: commit-graph.c:766
+#: commit-graph.c:773
#, c-format
msgid "could not find commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: commit-graph.c:799
+#: commit-graph.c:806
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
+"el graf de comissions requereix dades de generació de desbordaments però no "
+"en té cap"
-#: commit-graph.c:1075 builtin/am.c:1340
+#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
+#: builtin/clone.c:705
#, c-format
msgid "unable to parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:2897
+#: commit-graph.c:1373 builtin/pack-objects.c:3078
#, c-format
msgid "unable to get type of object %s"
msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
-#: commit-graph.c:1368
+#: commit-graph.c:1404
msgid "Loading known commits in commit graph"
msgstr "S'estan carregant comissions conegudes al graf de comissions"
-#: commit-graph.c:1385
+#: commit-graph.c:1421
msgid "Expanding reachable commits in commit graph"
msgstr "S'estan expandint les comissions abastables al graf de comissions"
-#: commit-graph.c:1405
+#: commit-graph.c:1441
msgid "Clearing commit marks in commit graph"
msgstr "S'estan esborrant les marques de comissions al graf de comissions"
-#: commit-graph.c:1424
+#: commit-graph.c:1460
msgid "Computing commit graph topological levels"
msgstr "S'estan calculant els nivells topològics del graf de comissions"
-#: commit-graph.c:1477
+#: commit-graph.c:1513
msgid "Computing commit graph generation numbers"
msgstr "S'estan calculant els nombres de generació del graf de comissions"
-#: commit-graph.c:1558
+#: commit-graph.c:1598
msgid "Computing commit changed paths Bloom filters"
msgstr ""
"S'estan calculant els canvis les rutes de la comissió en els filtres Bloom"
-#: commit-graph.c:1635
+#: commit-graph.c:1675
msgid "Collecting referenced commits"
msgstr "S'estan recollint els objectes referenciats"
-#: commit-graph.c:1660
+#: commit-graph.c:1701
#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "S'estan cercant les comissions pel graf de comissions en %d paquet"
-msgstr[1] "S'estan cercant les comissions pel graf de comissions en %d paquets"
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] ""
+"S'estan cercant les comissions pel graf de comissions en %<PRIuMAX> paquet"
+msgstr[1] ""
+"S'estan cercant les comissions pel graf de comissions en %<PRIuMAX> paquets"
-#: commit-graph.c:1673
+#: commit-graph.c:1714
#, c-format
msgid "error adding pack %s"
msgstr "error en afegir paquet %s"
-#: commit-graph.c:1677
+#: commit-graph.c:1718
#, c-format
msgid "error opening index for %s"
msgstr "s'ha produït un error en obrir l'índex per «%s»"
-#: commit-graph.c:1714
+#: commit-graph.c:1756
msgid "Finding commits for commit graph among packed objects"
msgstr ""
"S'estan cercant les comissions pel graf de comissions entre els objectes "
"empaquetats"
-#: commit-graph.c:1732
+#: commit-graph.c:1774
msgid "Finding extra edges in commit graph"
msgstr "S'estan cercant les vores addicionals al graf de comissions"
-#: commit-graph.c:1781
+#: commit-graph.c:1823
msgid "failed to write correct number of base graph ids"
msgstr ""
"s'ha produït un error en escriure el nombre correcte d'ids base del graf"
-#: commit-graph.c:1812 midx.c:906
+#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
#, c-format
msgid "unable to create leading directories of %s"
msgstr "no s'han pogut crear els directoris inicials de «%s»"
-#: commit-graph.c:1825
+#: commit-graph.c:1868
msgid "unable to create temporary graph layer"
msgstr "no s'ha pogut crear una capa de graf temporal"
-#: commit-graph.c:1830
+#: commit-graph.c:1873
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "no s'han pogut ajustar els permisos compartits per a «%s»"
-#: commit-graph.c:1887
+#: commit-graph.c:1930
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "S'està escrivint el graf de comissions en %d pas"
msgstr[1] "S'està escrivint el graf de comissions en %d passos"
-#: commit-graph.c:1923
+#: commit-graph.c:1967
msgid "unable to open commit-graph chain file"
msgstr "no s'ha pogut obrir el fitxer d'encadenament del graf de comissions"
-#: commit-graph.c:1939
+#: commit-graph.c:1983
msgid "failed to rename base commit-graph file"
msgstr "no s'ha pogut canviar el nom del fitxer base del graf de comissions"
-#: commit-graph.c:1959
+#: commit-graph.c:2004
msgid "failed to rename temporary commit-graph file"
msgstr ""
"no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
-#: commit-graph.c:2092
+#: commit-graph.c:2137
msgid "Scanning merged commits"
msgstr "S'estan escanejant les comissions fusionades"
-#: commit-graph.c:2136
+#: commit-graph.c:2181
msgid "Merging commit-graph"
msgstr "S'està fusionant el graf de comissions"
-#: commit-graph.c:2244
+#: commit-graph.c:2289
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"s'està intentant escriure un graf de comissions, però «core.commitGraph» "
"està desactivat"
-#: commit-graph.c:2351
+#: commit-graph.c:2396
msgid "too many commits to write graph"
-msgstr "massa comissions per escriure un graf"
+msgstr "massa comissions per a escriure un graf"
-#: commit-graph.c:2450
+#: commit-graph.c:2494
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"el fitxer commit-graph (graf de comissions) té una suma de verificació "
"incorrecta i probablement és corrupte"
-#: commit-graph.c:2460
+#: commit-graph.c:2504
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "el gràfic de comissions té una ordre OID incorrecta; %s llavors %s"
-#: commit-graph.c:2470 commit-graph.c:2485
+#: commit-graph.c:2514 commit-graph.c:2529
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-"el graf de comissions té un valor de «fanout» incorrecte: fanout[%d] = %u != "
-"%u"
+"el graf de comissions té un valor de «fanout» incorrecte: fanout[%d] = %u !="
+" %u"
-#: commit-graph.c:2477
+#: commit-graph.c:2521
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
"s'ha produït un error en analitzar la comissió %s del graf de comissions"
-#: commit-graph.c:2495
+#: commit-graph.c:2539
msgid "Verifying commits in commit graph"
msgstr "S'estan verificant les comissions al graf de comissions"
-#: commit-graph.c:2510
+#: commit-graph.c:2554
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"no s'han pogut analitzar la comissió %s de la base de dades d'objectes per "
"al graf de comissions"
-#: commit-graph.c:2517
+#: commit-graph.c:2561
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-"OID de l'arbre arrel per a comissions %s en el graf de comissions és %s != %s"
+"OID de l'arbre arrel per a comissions %s en el graf de comissions és %s != "
+"%s"
-#: commit-graph.c:2527
+#: commit-graph.c:2571
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
"la llista de pares del graf de comissions per a la comissió %s és massa "
"llarga"
-#: commit-graph.c:2536
+#: commit-graph.c:2580
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "el pare pel graf de comissions %s és %s != %s"
-#: commit-graph.c:2550
+#: commit-graph.c:2594
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "la llista pare del graf de comissions per %s acaba aviat"
-#: commit-graph.c:2555
+#: commit-graph.c:2599
#, c-format
msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+"commit-graph has generation number zero for commit %s, but non-zero "
+"elsewhere"
msgstr ""
-"El graf de comissions té nombre de generació zero per a la comissió %s, però "
-"té no zero en altres llocs"
+"el graf de comissions té nombre de generació zero per a la comissió %s, però"
+" té no zero en altres llocs"
-#: commit-graph.c:2559
+#: commit-graph.c:2603
#, c-format
msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+"commit-graph has non-zero generation number for commit %s, but zero "
+"elsewhere"
msgstr ""
-"El graf de comissions té un nombre de generació diferent de zero per a "
+"el graf de comissions té un nombre de generació diferent de zero per a "
"comissió %s però té zero en altres llocs"
-#: commit-graph.c:2576
+#: commit-graph.c:2620
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
-msgstr "generació del graf de comissions per a la comissió %s és %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+"generació del graf de comissions per a la comissió %s és %<PRIuMAX> < "
+"%<PRIuMAX>"
-#: commit-graph.c:2582
+#: commit-graph.c:2626
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-"La data d'enviament per a la comissió %s en el graf de comissions és "
+"la data d'enviament per a la comissió %s en el graf de comissions és "
"%<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457
+#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
+#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
-#: commit.c:54
+#: commit.c:56
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s no és una comissió!"
-#: commit.c:194
+#: commit.c:197
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2503,32 +2581,33 @@
"La compatibilitat amb <GIT_DIR>/info/grafts és obsoleta\n"
"i s'eliminarà en una futura versió del Git.\n"
"\n"
-"Si us plau useu «git replace --convert-graft-file»\n"
-"per convertir els grafs en substitució de referències. Desactiveu aquest "
-"missatge executant\n"
+"Useu «git replace --convert-graft-file»\n"
+"per a convertir els grafs en referències de reemplaçament.\n"
+"\n"
+"Desactiveu aquest missatge executant\n"
"«git config advice.graftFileDeprecated false»"
-#: commit.c:1237
+#: commit.c:1252
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s."
-#: commit.c:1241
+#: commit.c:1256
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s."
-#: commit.c:1244
+#: commit.c:1259
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La comissió %s no té signatura GPG."
-#: commit.c:1247
+#: commit.c:1262
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La comissió %s té una signatura GPG bona de %s\n"
-#: commit.c:1501
+#: commit.c:1516
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"
@@ -2543,7 +2622,15 @@
msgid "memory exhausted"
msgstr "memòria esgotada"
-#: config.c:126
+#: compat/terminal.c:167
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr "no es pot reprendre en segon pla, si us plau useu «fg» per a reprendre"
+
+#: compat/terminal.c:168
+msgid "cannot restore terminal settings"
+msgstr "no es poden restaurar els paràmetres del terminal"
+
+#: config.c:143
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2558,341 +2645,372 @@
"\t%s\n"
"Això pot ser degut a inclusions circulars."
-#: config.c:142
+#: config.c:159
#, c-format
msgid "could not expand include path '%s'"
msgstr "no s'ha pogut expandir el camí d'inclusió «%s»"
-#: config.c:153
+#: config.c:170
msgid "relative config includes must come from files"
msgstr "les inclusions de configuració relatives han de venir de fitxers"
-#: config.c:199
+#: config.c:219
msgid "relative config include conditionals must come from files"
msgstr ""
"els condicionals d'inclusió de configuració relatius han de venir de fitxers"
-#: config.c:396
+#: config.c:364
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"URL remots no es poden configurar en un fitxer directament o indirectament "
+"inclòs per «includeIf.hasconfig:remote.*.url»"
+
+#: config.c:508
#, c-format
msgid "invalid config format: %s"
msgstr "format de configuració no vàlid: %s"
-#: config.c:400
+#: config.c:512
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
-msgstr ""
+msgstr "falta el nom de la variable d'entorn per a la configuració «%.*s»"
-#: config.c:405
+#: config.c:517
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr ""
+msgstr "falta la variable d'entorn «%s» per a la configuració «%.*s»"
-#: config.c:442
+#: config.c:553
#, c-format
msgid "key does not contain a section: %s"
msgstr "la clau no conté una secció: «%s»"
-#: config.c:448
+#: config.c:558
#, c-format
msgid "key does not contain variable name: %s"
msgstr "la clau no conté un nom de variable: «%s»"
-#: config.c:472 sequencer.c:2785
+#: config.c:580 sequencer.c:2802
#, c-format
msgid "invalid key: %s"
msgstr "clau no vàlida: %s"
-#: config.c:478
+#: config.c:585
#, c-format
msgid "invalid key (newline): %s"
msgstr "clau no vàlida (línia nova): %s"
-#: config.c:511
+#: config.c:605
msgid "empty config key"
msgstr "clau de configuració buida"
-#: config.c:529 config.c:541
+#: config.c:623 config.c:635
#, c-format
msgid "bogus config parameter: %s"
msgstr "paràmetre de configuració erroni: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:649 config.c:666 config.c:673 config.c:682
#, c-format
msgid "bogus format in %s"
msgstr "format erroni a %s"
-#: config.c:622
+#: config.c:716
#, c-format
msgid "bogus count in %s"
msgstr "comptatge erroni a %s"
-#: config.c:626
+#: config.c:720
#, c-format
msgid "too many entries in %s"
msgstr "hi ha massa arguments a %s"
-#: config.c:636
+#: config.c:730
#, c-format
msgid "missing config key %s"
msgstr "falta la clau de configuració %s"
-#: config.c:644
+#: config.c:738
#, c-format
msgid "missing config value %s"
msgstr "falta el valor de configuració %s"
-#: config.c:995
+#: config.c:1089
#, c-format
msgid "bad config line %d in blob %s"
msgstr "línia de configuració %d errònia en el blob %s"
-#: config.c:999
+#: config.c:1093
#, c-format
msgid "bad config line %d in file %s"
msgstr "línia de configuració %d errònia en el fitxer %s"
-#: config.c:1003
+#: config.c:1097
#, c-format
msgid "bad config line %d in standard input"
msgstr "línia de configuració %d errònia en l'entrada estàndard"
-#: config.c:1007
+#: config.c:1101
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "línia de configuració %d errònia en el blob de submòdul %s"
-#: config.c:1011
+#: config.c:1105
#, c-format
msgid "bad config line %d in command line %s"
msgstr "línia de configuració %d errònia en la línia d'ordres %s"
-#: config.c:1015
+#: config.c:1109
#, c-format
msgid "bad config line %d in %s"
msgstr "línia de configuració %d errònia en %s"
-#: config.c:1152
+#: config.c:1246
msgid "out of range"
msgstr "fora de rang"
-#: config.c:1152
+#: config.c:1246
msgid "invalid unit"
msgstr "unitat no vàlida"
-#: config.c:1153
+#: config.c:1247
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
-#: config.c:1163
+#: config.c:1257
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: %s"
-#: config.c:1166
+#: config.c:1260
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
+msgstr ""
+"valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
-#: config.c:1169
+#: config.c:1263
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s"
+"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: "
+"%s"
-#: config.c:1172
+#: config.c:1266
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valor de configuració numèric «%s» erroni per «%s» en el blob de submòdul "
"%s: %s"
-#: config.c:1175
+#: config.c:1269
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: "
"%s"
-#: config.c:1178
+#: config.c:1272
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "valor de configuració numèric incorrecte «%s» per «%s» en %s: %s"
-#: config.c:1257
+#: config.c:1368
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "valor no vàlid per a la variable %s"
+
+#: config.c:1389
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "s'ignora el component core.fsync «%s» desconegut"
+
+#: config.c:1425
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "valor de configuració booleà erroni «%s» per a «%s»"
-#: config.c:1275
+#: config.c:1443
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»"
-#: config.c:1284
+#: config.c:1452
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "«%s» per a «%s» no és una marca de temps vàlida"
-#: config.c:1377
+#: config.c:1545
#, c-format
msgid "abbrev length out of range: %d"
msgstr "la longitud d'«abbrev» està fora de rang: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1559 config.c:1570
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivell de compressió de zlib incorrecte %d"
-#: config.c:1494
+#: config.c:1660
msgid "core.commentChar should only be one character"
msgstr "core.commentChar només hauria de ser un caràcter"
-#: config.c:1527
+#: config.c:1692
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "s'ignora el valor desconegut «%s» de core.fsyncMethod"
+
+#: config.c:1698
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles és obsolet; useu core.fsync"
+
+#: config.c:1714
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode de creació d'objecte no vàlid: %s"
-#: config.c:1599
+#: config.c:1800
#, c-format
msgid "malformed value for %s"
msgstr "valor no vàlid per a %s"
-#: config.c:1625
+#: config.c:1826
#, c-format
msgid "malformed value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
-#: config.c:1626
+#: config.c:1827
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"ha de ser un dels elements següents: nothing, matching, simple, upstream o "
"current"
-#: config.c:1687 builtin/pack-objects.c:3924
+#: config.c:1888 builtin/pack-objects.c:4078
#, c-format
msgid "bad pack compression level %d"
msgstr "nivell de compressió de paquet %d erroni"
-#: config.c:1809
+#: config.c:2014
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»"
-#: config.c:1812
+#: config.c:2017
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "la referència «%s» no assenyala a un blob"
-#: config.c:1829
+#: config.c:2035
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "no s'ha pogut resoldre el blob de configuració: «%s»"
-#: config.c:1873
+#: config.c:2080
#, c-format
msgid "failed to parse %s"
msgstr "s'ha produït un error en analitzar %s"
-#: config.c:1929
+#: config.c:2136
msgid "unable to parse command-line config"
msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
-#: config.c:2293
+#: config.c:2512
msgid "unknown error occurred while reading the configuration files"
-msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
+msgstr ""
+"un error desconegut ha ocorregut en llegir els fitxers de configuració"
-#: config.c:2467
+#: config.c:2686
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s no vàlid: «%s»"
-#: config.c:2512
+#: config.c:2731
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "valor «%d» a splitIndex.maxPercentChange ha d'estar entre 0 i 100"
-#: config.c:2558
+#: config.c:2763
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres"
-#: config.c:2560
+#: config.c:2765
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d"
-#: config.c:2644
+#: config.c:2850
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de secció no vàlid «%s»"
-#: config.c:2676
+#: config.c:2882
#, c-format
msgid "%s has multiple values"
msgstr "%s té múltiples valors"
-#: config.c:2705
+#: config.c:2911
#, c-format
msgid "failed to write new configuration file %s"
msgstr "no es pot escriure un nou fitxer de configuració %s"
-#: config.c:2957 config.c:3283
+#: config.c:3177 config.c:3518
#, c-format
msgid "could not lock config file %s"
msgstr "no s'ha pogut blocar el fitxer de configuració %s"
-#: config.c:2968
+#: config.c:3188
#, c-format
msgid "opening %s"
msgstr "s'està obrint %s"
-#: config.c:3005 builtin/config.c:361
+#: config.c:3225 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "patró no vàlid: %s"
-#: config.c:3030
+#: config.c:3250
#, c-format
msgid "invalid config file %s"
msgstr "fitxer de configuració no vàlid %s"
-#: config.c:3043 config.c:3296
+#: config.c:3263 config.c:3531
#, c-format
msgid "fstat on %s failed"
msgstr "ha fallat «fstat» a %s"
-#: config.c:3054
+#: config.c:3274
#, c-format
-msgid "unable to mmap '%s'"
-msgstr "no s'ha pogut fer «mmap» «%s»"
+msgid "unable to mmap '%s'%s"
+msgstr "no s'ha pogut fer «mmap» «%s»%s"
-#: config.c:3063 config.c:3301
+#: config.c:3284 config.c:3536
#, c-format
msgid "chmod on %s failed"
msgstr "ha fallat chmod a %s"
-#: config.c:3148 config.c:3398
+#: config.c:3369 config.c:3633
#, c-format
msgid "could not write config file %s"
msgstr "no s'ha pogut escriure el fitxer de configuració «%s»"
-#: config.c:3182
+#: config.c:3403
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no s'ha pogut establir «%s» a «%s»"
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885
+#: builtin/remote.c:893
#, c-format
msgid "could not unset '%s'"
msgstr "no s'ha pogut desassignar «%s»"
-#: config.c:3274
+#: config.c:3509
#, c-format
msgid "invalid section name: %s"
msgstr "nom de secció no vàlida: %s"
-#: config.c:3441
+#: config.c:3676
#, c-format
msgid "missing value for '%s'"
msgstr "falta el valor per «%s»"
@@ -2927,73 +3045,74 @@
msgid "expected flush after capabilities"
msgstr "s'esperava un buidatge després de les capacitats"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "ignora les capacitats després de la primera línia «%s»"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "error de protocol: unexpected capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
"s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "el repositori de l'altre extrem no pot ser shallow"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "paquet no vàlid"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "s'ha produït un error de protocol: no s'esperava «%s»"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "format d'objecte «%s» especificat pel servidor desconegut"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "resposta de ls-refs no vàlida: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "s'esperava una neteja després del llistat de referències"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
-msgstr "s'esperava un final de resposta després del llistat de referències"
+msgstr ""
+"s'esperava un paquet de final de resposta després del llistat de referències"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "el protocol «%s» no és compatible"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "no s'ha pogut establir SO_KEEPALIVE al sòcol"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "S'està cercant %s..."
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "no s'ha pogut trobar %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -3002,7 +3121,7 @@
"fet.\n"
"S'està connectant a %s (port %s) ... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -3012,79 +3131,81 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "fet."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "no s'ha pogut trobar %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "port desconegut %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "s'ha bloquejat el nom estrany d'amfitrió «%s»"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "s'ha bloquejat el port estrany «%s»"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "no s'ha pogut iniciar servidor intermediari «%s»"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-"no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per "
-"URL"
+"no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per"
+" URL"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr ""
+"la línia nova està prohibida en els servidors git:// i els camins de "
+"repositori"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "la variant «simple» de ssh no és compatible amb -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "la variant «simple» de ssh no és compatible amb -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "la variant «simple» de ssh no permet definir el port"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "s'ha bloquejat el nom de fitxer estrany «%s»"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "no s'ha pogut bifurcar"
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "S'està comprovant la connectivitat"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "No s'ha pogut executar «git rev-list»"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "escriptura fallada al rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "s'ha produït un error en tancar l'stdin del rev-list"
@@ -3105,8 +3226,7 @@
"The file will have its original line endings in your working directory"
msgstr ""
"CRLF serà reemplaçat per LF en %s.\n"
-"El fitxer tindrà els seus terminadors de línia originals en el vostre "
-"directori de treball"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de treball"
#: convert.c:206
#, c-format
@@ -3120,8 +3240,7 @@
"The file will have its original line endings in your working directory"
msgstr ""
"LF serà reemplaçat per CRLF en %s.\n"
-"El fitxer tindrà els seus terminadors de línia originals en el vostre "
-"directori de treball"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de treball"
#: convert.c:273
#, c-format
@@ -3134,8 +3253,8 @@
"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
"working-tree-encoding."
msgstr ""
-"El fitxer «%s» conté una marca d'ordre de byte (BOM). Utilitzeu UTF-%.*s com "
-"a codificacions d'arbre de treball."
+"El fitxer «%s» conté una marca d'ordre de byte (BOM). Utilitzeu UTF-%.*s com"
+" a codificacions d'arbre de treball."
#: convert.c:293
#, c-format
@@ -3145,11 +3264,12 @@
#: convert.c:295
#, c-format
msgid ""
-"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
-"%sLE (depending on the byte order) as working-tree-encoding."
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or "
+"UTF-%sLE (depending on the byte order) as working-tree-encoding."
msgstr ""
-"Falta una marca d'ordre de byte (BOM) al fitxer «%s». Useu UTF-%sBE o UTF-"
-"%sLE (depenent de l'ordre de byte) com a codificacions d'arbre de treball."
+"Falta una marca d'ordre de byte (BOM) al fitxer «%s». Useu UTF-%sBE o "
+"UTF-%sLE (depenent de l'ordre de byte) com a codificacions d'arbre de "
+"treball."
#: convert.c:408 convert.c:479
#, c-format
@@ -3194,25 +3314,25 @@
msgid "path name too long for external filter"
msgstr "el nom del camí és massa gran per al filtre extern"
-#: convert.c:934
+#: convert.c:935
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr ""
-"el filtre extern «%s» ja no està disponible encara que no s'han filtrat tots "
-"els camins"
+"el filtre extern «%s» ja no està disponible encara que no s'han filtrat tots"
+" els camins"
-#: convert.c:1234
+#: convert.c:1236
msgid "true/false are no valid working-tree-encodings"
msgstr "cert/fals no són codificacions d'arbre de treball vàlides"
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: el filtre de netejat «%s» ha fallat"
-#: convert.c:1490
+#: convert.c:1492
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: ha fallat el filtre smudge %s"
@@ -3232,68 +3352,68 @@
msgstr ""
"s'ha rebutjat treballar amb credencials que no tenen el camp de protocol"
-#: credential.c:394
+#: credential.c:396
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "url conté una línia nova en %s component: %s"
-#: credential.c:438
+#: credential.c:440
#, c-format
msgid "url has no scheme: %s"
msgstr "l'url no té esquema: %s"
-#: credential.c:511
+#: credential.c:513
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "no s'ha pogut analitzar l'URL de credencials: %s"
-#: date.c:138
+#: date.c:139
msgid "in the future"
msgstr "en el futur"
-#: date.c:144
+#: date.c:145
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "fa %<PRIuMAX> segon"
msgstr[1] "fa %<PRIuMAX> segons"
-#: date.c:151
+#: date.c:152
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "fa %<PRIuMAX> minut"
msgstr[1] "fa %<PRIuMAX> minuts"
-#: date.c:158
+#: date.c:159
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "fa %<PRIuMAX> hora"
msgstr[1] "fa %<PRIuMAX> hores"
-#: date.c:165
+#: date.c:166
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "fa %<PRIuMAX> dia"
msgstr[1] "fa %<PRIuMAX> dies"
-#: date.c:171
+#: date.c:172
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "fa %<PRIuMAX> setmana"
msgstr[1] "fa %<PRIuMAX> setmanes"
-#: date.c:178
+#: date.c:179
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "fa %<PRIuMAX> mes"
msgstr[1] "fa %<PRIuMAX> mesos"
-#: date.c:189
+#: date.c:190
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -3301,14 +3421,14 @@
msgstr[1] "%<PRIuMAX> anys"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
+#: date.c:193
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "fa %s i %<PRIuMAX> mes"
msgstr[1] "fa %s i %<PRIuMAX> mesos"
-#: date.c:197 date.c:202
+#: date.c:198 date.c:203
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
@@ -3342,36 +3462,40 @@
msgid "Marked %d islands, done.\n"
msgstr "Marcades %d illes, fet.\n"
-#: diff-merges.c:80
+#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
+#: parallel-checkout.c:42 sequencer.c:2805 setup.c:562 builtin/am.c:203
+#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
+#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
+#: builtin/pull.c:47 builtin/pull.c:321
#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "valor desconegut per a --diff-merges: %s"
+msgid "invalid value for '%s': '%s'"
+msgstr "valor no vàlid per a «%s»: «%s»"
-#: diff-lib.c:538
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base no funciona amb intervals"
-#: diff-lib.c:540
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base només funciona amb comissions"
-#: diff-lib.c:557
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "no s'ha pogut obtenir HEAD"
-#: diff-lib.c:564
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "no s'ha trobat una base de fusió"
-#: diff-lib.c:566
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "s'han trobat múltiples bases de fusió"
-#: diff-no-index.c:238
+#: diff-no-index.c:237
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<opcions>] <camí> <camí>"
-#: diff-no-index.c:263
+#: diff-no-index.c:262
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
"tree"
@@ -3379,19 +3503,19 @@
"No és un repositori Git. Useu --no-index per a comparar dos camins fora del "
"directori de treball"
-#: diff.c:156
+#: diff.c:159
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" S'ha produït un error en analitzar el percentatge limitant de dirstat "
"«%s»\n"
-#: diff.c:161
+#: diff.c:164
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paràmetre de dirstat desconegut «%s»\n"
-#: diff.c:297
+#: diff.c:300
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3399,31 +3523,31 @@
"el paràmetre de color en moviment ha de ser «no», «default», «blocks», "
"«zebra», «dimmed-zebra» o «plain»"
-#: diff.c:325
+#: diff.c:328
#, c-format
msgid ""
-"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
-"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change',"
+" 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
"el mode «%s» de «color-moved-ws» és desconegut, els valor possibles són "
"«ignore-space-change», «ignore-space-at-eol», «ignore-all-space», «allow-"
"indentation-change»"
-#: diff.c:333
+#: diff.c:336
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr ""
-"color-moved-ws: allow-indentation-change no es pot combinar amb altres modes "
-"d'espai en blanc"
+"color-moved-ws: allow-indentation-change no es pot combinar amb altres modes"
+" d'espai en blanc"
-#: diff.c:410
+#: diff.c:413
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valor desconegut de la variable de configuració de «diff.submodule»: «%s»"
-#: diff.c:470
+#: diff.c:473
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3432,35 +3556,49 @@
"S'han trobat errors en la variable de configuració «diff.dirstat»:\n"
"%s"
-#: diff.c:4278
+#: diff.c:4282
#, c-format
msgid "external diff died, stopping at %s"
msgstr "el diff external s'ha mort, s'està aturant a %s"
-#: diff.c:4630
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check i -s són mútuament excloents"
+#: diff.c:4677 parse-options.c:1114
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "les opcions «%s», «%s», «%s», i «%s» no es poden usar juntes"
-#: diff.c:4633
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S and --find-object són mútuament excloents"
+#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "les opcions «%s», «%s», i «%s» no es poden usar juntes"
-#: diff.c:4712
+#: diff.c:4685
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "les opcions «%s» i «%s» no es poden usar juntes, useu «%s» amb «%s»"
+
+#: diff.c:4689
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"les opcions «%s» i «%s» no es poden usar juntes, useu «%s» amb «%s» i «%s»"
+
+#: diff.c:4769
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
-#: diff.c:4760
+#: diff.c:4823
#, c-format
msgid "invalid --stat value: %s"
msgstr "valor --stat no vàlid: %s"
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s espera un valor numèric"
-#: diff.c:4797
+#: diff.c:4860
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3469,200 +3607,199 @@
"S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:4882
+#: diff.c:4893
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s"
-#: diff.c:4906
+#: diff.c:4917
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valor desconegut després de ws-error-highlight=%.*s"
-#: diff.c:4920
+#: diff.c:4931
#, c-format
msgid "unable to resolve '%s'"
msgstr "no s'ha pogut resoldre «%s»"
-#: diff.c:4970 diff.c:4976
+#: diff.c:4981 diff.c:4987
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s espera una forma <n>/<m>"
-#: diff.c:4988
+#: diff.c:4999
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s esperava un caràcter, s'ha rebut «%s»"
-#: diff.c:5009
+#: diff.c:5020
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "argument --color-moved incorrecte: %s"
-#: diff.c:5028
+#: diff.c:5039
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "mode «%s» no vàlid en --color-moved-ws"
-#: diff.c:5068
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
+#: diff.c:5079
+msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\""
msgstr ""
"l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»"
-#: diff.c:5104 diff.c:5124
+#: diff.c:5115 diff.c:5135
#, c-format
msgid "invalid argument to %s"
msgstr "argument no vàlid a %s"
-#: diff.c:5228
+#: diff.c:5239
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "expressió regular donada a -I: no vàlida: «%s»"
-#: diff.c:5277
+#: diff.c:5288
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
"s'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»"
-#: diff.c:5333
+#: diff.c:5344
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "argument --word-diff incorrecte: %s"
-#: diff.c:5369
+#: diff.c:5380
msgid "Diff output format options"
msgstr "Opcions del format de sortida del diff"
-#: diff.c:5371 diff.c:5377
+#: diff.c:5382 diff.c:5388
msgid "generate patch"
-msgstr "generant pedaç"
+msgstr "genera el pedaç"
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5385 builtin/log.c:180
msgid "suppress diff output"
msgstr "omet la sortida de diferències"
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5390 diff.c:5504 diff.c:5511
msgid "<n>"
msgstr "<n>"
-#: diff.c:5380 diff.c:5383
+#: diff.c:5391 diff.c:5394
msgid "generate diffs with <n> lines context"
msgstr "genera diffs amb <n> línies de context"
-#: diff.c:5385
+#: diff.c:5396
msgid "generate the diff in raw format"
msgstr "genera el diff en format cru"
-#: diff.c:5388
+#: diff.c:5399
msgid "synonym for '-p --raw'"
msgstr "sinònim de «-p --raw»"
-#: diff.c:5392
+#: diff.c:5403
msgid "synonym for '-p --stat'"
msgstr "sinònim de «-p --stat»"
-#: diff.c:5396
+#: diff.c:5407
msgid "machine friendly --stat"
msgstr "llegible per màquina --stat"
-#: diff.c:5399
+#: diff.c:5410
msgid "output only the last line of --stat"
msgstr "mostra només l'última línia de --stat"
-#: diff.c:5401 diff.c:5409
+#: diff.c:5412 diff.c:5420
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5402
+#: diff.c:5413
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"genera la distribució de la quantitat relativa de canvis per a cada "
"subdirectori"
-#: diff.c:5406
+#: diff.c:5417
msgid "synonym for --dirstat=cumulative"
msgstr "sinònim de --dirstat=cumulative"
-#: diff.c:5410
+#: diff.c:5421
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinònim de --dirstat=files,param1,param2..."
-#: diff.c:5414
+#: diff.c:5425
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"avisa si els canvis introdueixen marcadors en conflicte o errors d'espai en "
"blanc"
-#: diff.c:5417
+#: diff.c:5428
msgid "condensed summary such as creations, renames and mode changes"
msgstr "resum condensat com ara creacions, canvis de nom i mode"
-#: diff.c:5420
+#: diff.c:5431
msgid "show only names of changed files"
msgstr "mostra només els noms de fitxers canviats"
-#: diff.c:5423
+#: diff.c:5434
msgid "show only names and status of changed files"
msgstr "mostra només els noms i l'estat dels fitxers canviats"
-#: diff.c:5425
+#: diff.c:5436
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<amplada>[<amplada-nom>[,<recompte>]]"
-#: diff.c:5426
+#: diff.c:5437
msgid "generate diffstat"
msgstr "genera diffstat"
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5439 diff.c:5442 diff.c:5445
msgid "<width>"
msgstr "<amplada>"
-#: diff.c:5429
+#: diff.c:5440
msgid "generate diffstat with a given width"
msgstr "genera diffstat amb una amplada donada"
-#: diff.c:5432
+#: diff.c:5443
msgid "generate diffstat with a given name width"
msgstr "genera diffstat amb un nom d'amplada donat"
-#: diff.c:5435
+#: diff.c:5446
msgid "generate diffstat with a given graph width"
msgstr "genera diffstat amb una amplada de graf donada"
-#: diff.c:5437
+#: diff.c:5448
msgid "<count>"
msgstr "<comptador>"
-#: diff.c:5438
+#: diff.c:5449
msgid "generate diffstat with limited lines"
msgstr "genera diffstat amb línies limitades"
-#: diff.c:5441
+#: diff.c:5452
msgid "generate compact summary in diffstat"
msgstr "genera un resum compacte a diffstat"
-#: diff.c:5444
+#: diff.c:5455
msgid "output a binary diff that can be applied"
msgstr "diff amb sortida binària que pot ser aplicada"
-#: diff.c:5447
+#: diff.c:5458
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-"mostra els noms complets dels objectes pre i post-imatge a les línies «index»"
+"mostra els noms complets dels objectes pre i post-imatge a les línies "
+"«index»"
-#: diff.c:5449
+#: diff.c:5460
msgid "show colored diff"
msgstr "mostra un diff amb colors"
-#: diff.c:5450
+#: diff.c:5461
msgid "<kind>"
msgstr "<kind>"
-#: diff.c:5451
+#: diff.c:5462
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3670,7 +3807,7 @@
"ressalta els errors d'espai en blanc a les línies «context», «old» o «new» "
"al diff"
-#: diff.c:5454
+#: diff.c:5465
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3678,255 +3815,255 @@
"no consolidis els noms de camí i utilitza NULs com a terminadors de camp de "
"sortida en --raw o --numstat"
-#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
msgid "<prefix>"
msgstr "<prefix>"
-#: diff.c:5458
+#: diff.c:5469
msgid "show the given source prefix instead of \"a/\""
msgstr "mostra el prefix d'origen donat en lloc de «a/»"
-#: diff.c:5461
+#: diff.c:5472
msgid "show the given destination prefix instead of \"b/\""
msgstr "mostra el prefix de destinació indicat en lloc de «b/»"
-#: diff.c:5464
+#: diff.c:5475
msgid "prepend an additional prefix to every line of output"
msgstr "afegir un prefix addicional per a cada línia de sortida"
-#: diff.c:5467
+#: diff.c:5478
msgid "do not show any source or destination prefix"
msgstr "no mostris cap prefix d'origen o destí"
-#: diff.c:5470
+#: diff.c:5481
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"mostra el context entre trossos de diferència fins al nombre especificat de "
"línies"
-#: diff.c:5474 diff.c:5479 diff.c:5484
+#: diff.c:5485 diff.c:5490 diff.c:5495
msgid "<char>"
msgstr "<char>"
-#: diff.c:5475
+#: diff.c:5486
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
"especifiqueu el caràcter per a indicar una línia nova en comptes de «+»"
-#: diff.c:5480
+#: diff.c:5491
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
"especifiqueu el caràcter per a indicar una línia antiga en comptes de «-»"
-#: diff.c:5485
+#: diff.c:5496
msgid "specify the character to indicate a context instead of ' '"
msgstr "especifiqueu el caràcter per a indicar context en comptes de « »"
-#: diff.c:5488
+#: diff.c:5499
msgid "Diff rename options"
msgstr "Opcions de canvi de nom del diff"
-#: diff.c:5489
+#: diff.c:5500
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5490
+#: diff.c:5501
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"divideix els canvis de reescriptura completa en parells de suprimir i crear"
-#: diff.c:5494
+#: diff.c:5505
msgid "detect renames"
msgstr "detecta els canvis de noms"
-#: diff.c:5498
+#: diff.c:5509
msgid "omit the preimage for deletes"
msgstr "omet les preimatges per les supressions"
-#: diff.c:5501
+#: diff.c:5512
msgid "detect copies"
msgstr "detecta còpies"
-#: diff.c:5505
+#: diff.c:5516
msgid "use unmodified files as source to find copies"
-msgstr "usa els fitxers no modificats com a font per trobar còpies"
+msgstr "usa els fitxers no modificats com a font per a trobar còpies"
-#: diff.c:5507
+#: diff.c:5518
msgid "disable rename detection"
msgstr "inhabilita la detecció de canvis de nom"
-#: diff.c:5510
+#: diff.c:5521
msgid "use empty blobs as rename source"
msgstr "usa els blobs buits com a font de canvi de nom"
-#: diff.c:5512
+#: diff.c:5523
msgid "continue listing the history of a file beyond renames"
msgstr "continua llistant l'històric d'un fitxer més enllà dels canvis de nom"
-#: diff.c:5515
+#: diff.c:5526
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-"Evita la detecció de canvi de nom/còpia si el nombre d'objectius de canvi de "
-"nom/còpia supera el límit indicat"
+"evita la detecció de canvi de nom/còpia si el nombre d'objectius de canvi de"
+" nom/còpia supera el límit indicat"
-#: diff.c:5517
+#: diff.c:5528
msgid "Diff algorithm options"
msgstr "Opcions de l'algorisme Diff"
-#: diff.c:5519
+#: diff.c:5530
msgid "produce the smallest possible diff"
msgstr "produeix el diff més petit possible"
-#: diff.c:5522
+#: diff.c:5533
msgid "ignore whitespace when comparing lines"
msgstr "ignora els espais en blanc en comparar línies"
-#: diff.c:5525
+#: diff.c:5536
msgid "ignore changes in amount of whitespace"
msgstr "ignora els canvis en la quantitat d'espai en blanc"
-#: diff.c:5528
+#: diff.c:5539
msgid "ignore changes in whitespace at EOL"
msgstr "ignora els canvis d'espai en blanc al final de la línia"
-#: diff.c:5531
+#: diff.c:5542
msgid "ignore carrier-return at the end of line"
msgstr "ignora els retorns de línia al final de la línia"
-#: diff.c:5534
+#: diff.c:5545
msgid "ignore changes whose lines are all blank"
msgstr "ignora els canvis en línies que estan en blanc"
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5537
+#: diff.c:5548
msgid "ignore changes whose all lines match <regex>"
msgstr "ignora els canvis en les línies que coincideixen amb <regex>"
-#: diff.c:5540
+#: diff.c:5551
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"heurística per a desplaçar els límits del tros de diferència per a una "
"lectura fàcil"
-#: diff.c:5543
+#: diff.c:5554
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera diff usant l'algorisme «patience diff»"
-#: diff.c:5547
+#: diff.c:5558
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera diff usant l'algorisme «histogram diff»"
-#: diff.c:5549
+#: diff.c:5560
msgid "<algorithm>"
msgstr "<algorisme>"
-#: diff.c:5550
+#: diff.c:5561
msgid "choose a diff algorithm"
msgstr "trieu un algorisme per al diff"
-#: diff.c:5552
+#: diff.c:5563
msgid "<text>"
msgstr "<text>"
-#: diff.c:5553
+#: diff.c:5564
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "genera diff usant l'algorisme «anchored diff»"
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5566 diff.c:5575 diff.c:5578
msgid "<mode>"
msgstr "<mode>"
-#: diff.c:5556
+#: diff.c:5567
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-"mostra el diff de paraules usant <mode> per delimitar les paraules "
+"mostra el diff de paraules usant <mode> per a delimitar les paraules "
"modificades"
-#: diff.c:5559
+#: diff.c:5570
msgid "use <regex> to decide what a word is"
msgstr "utilitza <regex> per a decidir què és una paraula"
-#: diff.c:5562
+#: diff.c:5573
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5565
+#: diff.c:5576
msgid "moved lines of code are colored differently"
msgstr "les línies de codi que s'ha mogut s'acoloreixen diferent"
-#: diff.c:5568
+#: diff.c:5579
msgid "how white spaces are ignored in --color-moved"
msgstr "com s'ignoren els espais en blanc a --color-moved"
-#: diff.c:5571
+#: diff.c:5582
msgid "Other diff options"
msgstr "Altres opcions diff"
-#: diff.c:5573
+#: diff.c:5584
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-"quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els "
-"camins relatius"
+"quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els"
+" camins relatius"
-#: diff.c:5577
+#: diff.c:5588
msgid "treat all files as text"
msgstr "tracta tots els fitxers com a text"
-#: diff.c:5579
+#: diff.c:5590
msgid "swap two inputs, reverse the diff"
msgstr "intercanvia les dues entrades, inverteix el diff"
-#: diff.c:5581
+#: diff.c:5592
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "surt amb 1 si hi ha diferències, 0 en cas contrari"
-#: diff.c:5583
+#: diff.c:5594
msgid "disable all output of the program"
msgstr "inhabilita totes les sortides del programa"
-#: diff.c:5585
+#: diff.c:5596
msgid "allow an external diff helper to be executed"
msgstr "permet executar un ajudant de diff extern"
-#: diff.c:5587
+#: diff.c:5598
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"executa els filtres externs de conversió de text en comparar fitxers binaris"
-#: diff.c:5589
+#: diff.c:5600
msgid "<when>"
msgstr "<quan>"
-#: diff.c:5590
+#: diff.c:5601
msgid "ignore changes to submodules in the diff generation"
msgstr "ignora els canvis als submòduls en la generació del diff"
-#: diff.c:5593
+#: diff.c:5604
msgid "<format>"
msgstr "<format>"
-#: diff.c:5594
+#: diff.c:5605
msgid "specify how differences in submodules are shown"
msgstr "especifiqueu com es mostren els canvis als submòduls"
-#: diff.c:5598
+#: diff.c:5609
msgid "hide 'git add -N' entries from the index"
msgstr "amaga les entrades «git add -N» de l'índex"
-#: diff.c:5601
+#: diff.c:5612
msgid "treat 'git add -N' entries as real in the index"
msgstr "tracta les entrades «git add -N» com a reals a l'índex"
-#: diff.c:5603
+#: diff.c:5614
msgid "<string>"
msgstr "<cadena>"
-#: diff.c:5604
+#: diff.c:5615
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3934,7 +4071,7 @@
"cerca les diferències que canvien el nombre d'ocurrències de la cadena "
"especificada"
-#: diff.c:5607
+#: diff.c:5618
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3942,35 +4079,35 @@
"cerca les diferències que canvien el nombre d'ocurrències de l'expressió "
"regular especificada"
-#: diff.c:5610
+#: diff.c:5621
msgid "show all changes in the changeset with -S or -G"
msgstr "mostra tots els canvis amb el conjunt de canvis amb -S o -G"
-#: diff.c:5613
+#: diff.c:5624
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tracta <cadena> a -S com a expressió regular POSIX ampliada"
-#: diff.c:5616
+#: diff.c:5627
msgid "control the order in which files appear in the output"
msgstr "controla l'ordre amb el qual els fitxers apareixen en la sortida"
-#: diff.c:5617 diff.c:5620
+#: diff.c:5628 diff.c:5631
msgid "<path>"
msgstr "<camí>"
-#: diff.c:5618
+#: diff.c:5629
msgid "show the change in the specified path first"
msgstr "mostra el canvi primer al camí especificat"
-#: diff.c:5621
+#: diff.c:5632
msgid "skip the output to the specified path"
msgstr "omet la sortida al camí especificat"
-#: diff.c:5623
+#: diff.c:5634
msgid "<object-id>"
msgstr "<id de l'objecte>"
-#: diff.c:5624
+#: diff.c:5635
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3978,111 +4115,119 @@
"cerca les diferències que canvien el nombre d'ocurrències de l'objecte "
"especificat"
-#: diff.c:5626
+#: diff.c:5637
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5627
+#: diff.c:5638
msgid "select files by diff type"
msgstr "seleccioneu els fitxers per tipus de diff"
-#: diff.c:5629
+#: diff.c:5640
msgid "<file>"
msgstr "<fitxer>"
-#: diff.c:5630
-msgid "Output to a specific file"
-msgstr "Sortida a un fitxer específic"
+#: diff.c:5641
+msgid "output to a specific file"
+msgstr "sortida a un fitxer específic"
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6321
+msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
-"s'ha omès la detecció de canvi de nom inexacta a causa de massa fitxers."
+"s'ha omès la detecció de canvi de nom exhaustiva perquè hi ha massa fitxers."
-#: diff.c:6290
+#: diff.c:6324
msgid "only found copies from modified paths due to too many files."
msgstr ""
-"només s'han trobat còpies des de camins modificats a causa de massa fitxers."
+"només s'han trobat còpies des de camins modificats perquè de massa fitxers."
-#: diff.c:6293
+#: diff.c:6327
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
-"l'ordre."
+"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar"
+" l'ordre."
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "S'està realitzant una detecció inexacta de canvis de nom"
#: diffcore-rotate.c:29
-#, c-format
+#, c-format
msgid "No such path '%s' in the diff"
msgstr "No existeix el camí «%s» al diff"
-#: dir.c:578
+#: dir.c:593
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
"l'especificació de camí «%s» no ha coincidit amb cap fitxer que git conegui"
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "patró no reconegut: «%s»"
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "patró negatiu no reconegut: «%s»"
-#: dir.c:809
+#: dir.c:820
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
"el vostre fitxer «sparse-checkout» pot tenir problemes el patró «%s» es "
"repeteix"
-#: dir.c:819
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr "inhabilita la coincidència de patrons «cone»"
-#: dir.c:1206
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "no es pot usar %s com a fitxer d'exclusió"
-#: dir.c:2314
+#: dir.c:2419
#, c-format
msgid "could not open directory '%s'"
msgstr "no s'ha pogut obrir el directori «%s»"
-#: dir.c:2614
+#: dir.c:2721
msgid "failed to get kernel name and information"
msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli"
-#: dir.c:2738
+#: dir.c:2846
msgid "untracked cache is disabled on this system or location"
msgstr ""
"la memòria cau no seguida està inhabilitada en aquest sistema o ubicació"
-#: dir.c:3543
+#: dir.c:3119
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"No s'ha pogut deduir cap nom de directori.\n"
+"Especifiqueu un directori en la línia d'ordres"
+
+#: dir.c:3807
#, c-format
msgid "index file corrupt in repo %s"
msgstr "el fitxer d'índex al repositori %s és malmès"
-#: dir.c:3590 dir.c:3595
+#: dir.c:3854 dir.c:3859
#, c-format
msgid "could not create directories for %s"
msgstr "no s'han pogut crear directoris per %s"
-#: dir.c:3624
+#: dir.c:3888
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
@@ -4101,407 +4246,502 @@
msgid "could not stat file '%s'"
msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
-#: environment.c:152
+#: environment.c:147
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "camí d'espai de noms git incorrecte «%s»"
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "no s'ha pogut establir GIT_DIR a «%s»"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "hi ha massa arguments per a executar %s"
-#: fetch-pack.c:182
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: llista shallow esperada"
-#: fetch-pack.c:185
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-"git fetch-pack: s'esperava un paquet de buidatge després d'una llista shallow"
+"git fetch-pack: s'esperava un paquet de buidatge després d'una llista "
+"shallow"
-#: fetch-pack.c:196
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de buidatge"
-#: fetch-pack.c:216
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»"
-#: fetch-pack.c:227
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "no s'ha pogut escriure al remot"
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc requereix multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:397 fetch-pack.c:1460
#, c-format
msgid "invalid shallow line: %s"
msgstr "línia de shallow no vàlida: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:403 fetch-pack.c:1466
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línia d'unshallow no vàlida: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:405 fetch-pack.c:1468
#, c-format
msgid "object not found: %s"
msgstr "objecte no trobat: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:408 fetch-pack.c:1471
#, c-format
msgid "error in object: %s"
msgstr "error en objecte: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:410 fetch-pack.c:1473
#, c-format
msgid "no shallow found: %s"
msgstr "no s'ha trobat cap shallow: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:413 fetch-pack.c:1477
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:453
#, c-format
msgid "got %s %d %s"
msgstr "s'ha rebut %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:470
#, c-format
msgid "invalid commit %s"
msgstr "comissió no vàlida %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:501
msgid "giving up"
msgstr "s'abandona"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:514 progress.h:25
msgid "done"
msgstr "fet"
-#: fetch-pack.c:512
+#: fetch-pack.c:526
#, c-format
msgid "got %s (%d) %s"
msgstr "s'ha rebut %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:562
#, c-format
msgid "Marking %s as complete"
msgstr "S'està marcant %s com a complet"
-#: fetch-pack.c:763
+#: fetch-pack.c:784
#, c-format
msgid "already have %s (%s)"
msgstr "ja es té %s (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:870
msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
+msgstr ""
+"fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
-#: fetch-pack.c:857
+#: fetch-pack.c:878
msgid "protocol error: bad pack header"
msgstr "error de protocol: capçalera de paquet errònia"
-#: fetch-pack.c:951
+#: fetch-pack.c:974
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no es pot bifurcar de %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:980
msgid "fetch-pack: invalid index-pack output"
-msgstr ""
+msgstr "fetch-pack: sortida d'index-pack no vàlida"
-#: fetch-pack.c:974
+#: fetch-pack.c:997
#, c-format
msgid "%s failed"
msgstr "%s ha fallat"
-#: fetch-pack.c:976
+#: fetch-pack.c:999
msgid "error in sideband demultiplexer"
msgstr "error en desmultiplexor de banda lateral"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1048
#, c-format
msgid "Server version is %.*s"
msgstr "La versió del servidor és %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
+#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
+#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
+#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
#, c-format
msgid "Server supports %s"
msgstr "El servidor accepta %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1058
msgid "Server does not support shallow clients"
msgstr "El servidor no permet clients superficials"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1118
msgid "Server does not support --shallow-since"
msgstr "El servidor no admet --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1123
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no admet --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1127
msgid "Server does not support --deepen"
msgstr "El servidor no admet --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1129
msgid "Server does not support this repository's object format"
-msgstr "El servidor no és compatible amb el format d'objecte d'aquest repositori"
+msgstr ""
+"El servidor no és compatible amb el format d'objecte d'aquest repositori"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1142
msgid "no common commits"
msgstr "cap comissió en comú"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
msgid "source repository is shallow, reject to clone."
msgstr "el repositori font és superficial, es rebutja clonar-ho."
-#: fetch-pack.c:1128 fetch-pack.c:1651
+#: fetch-pack.c:1157 fetch-pack.c:1705
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: l'obtenció ha fallat."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1271
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "algoritmes no coincidents: client %s; servidor %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1275
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "el servidor no és compatible amb l'algorisme «%s»"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1308
msgid "Server does not support shallow requests"
msgstr "El servidor no permet sol·licituds superficials"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1315
msgid "Server supports filter"
msgstr "El servidor accepta filtratge"
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: fetch-pack.c:1358 fetch-pack.c:2087
msgid "unable to write request to remote"
msgstr "no s'ha pogut escriure la sol·licitud al remot"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1376
#, c-format
msgid "error reading section header '%s'"
msgstr "error en llegir la capçalera de la secció «%s»"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1382
#, c-format
msgid "expected '%s', received '%s'"
msgstr "s'esperava «%s», s'ha rebut «%s»"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1416
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "línia de confirmació inesperada: «%s»"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1421
#, c-format
msgid "error processing acks: %d"
msgstr "s'ha produït un error en processar els acks: %d"
-#: fetch-pack.c:1402
-msgid "expected packfile to be sent after 'ready'"
-msgstr "s'esperava l'enviament del fitxer de paquet després de «ready»"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#: fetch-pack.c:1435
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "s'esperava que el fitxer de paquet s'enviés després de «%s»"
-#: fetch-pack.c:1404
-msgid "expected no other sections to be sent after no 'ready'"
-msgstr "s'esperava que no s'enviés cap altra secció després de no «ready»"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#: fetch-pack.c:1441
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "no s'esperava que cap altra secció s'enviés després de «%s»"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1482
#, c-format
msgid "error processing shallow info: %d"
msgstr "s'ha produït un error en processar la informació superficial: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1531
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "s'esperava wanted-ref, s'ha rebut «%s»"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1536
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inesperat: «%s»"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1541
#, c-format
msgid "error processing wanted refs: %d"
msgstr "s'ha produït un error en processar les referències desitjades: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1571
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: s'esperava un paquet de final de resposta"
-#: fetch-pack.c:1930
+#: fetch-pack.c:1983
msgid "no matching remote head"
msgstr "no hi ha cap HEAD remot coincident"
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: fetch-pack.c:2006 builtin/clone.c:587
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: fetch-pack.c:2056
+#: fetch-pack.c:2109
msgid "unexpected 'ready' from remote"
msgstr "«ready» no esperat des del remot"
-#: fetch-pack.c:2079
+#: fetch-pack.c:2132
#, c-format
msgid "no such remote ref %s"
msgstr "no existeix la referència remota %s"
-#: fetch-pack.c:2082
+#: fetch-pack.c:2135
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
-#: gpg-interface.c:273
+#: fsmonitor-ipc.c:119
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: camí no vàlid «%s»"
+
+#: fsmonitor-ipc.c:125
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: error no especificat en «%s»"
+
+#: fsmonitor-ipc.c:155
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon no s'està executant"
+
+#: fsmonitor-ipc.c:164
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "no s'ha pogut enviar l'ordre «%s» a fsmonitor--daemon"
+
+#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
+#: gpg-interface.c:1011
msgid "could not create temporary file"
msgstr "no s'ha pogut crear el fitxer temporal"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:459
#, c-format
msgid "failed writing detached signature to '%s'"
-msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
+msgstr ""
+"s'ha produït un error en escriure la clau de signatura separada a «%s»"
-#: gpg-interface.c:470
+#: gpg-interface.c:450
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile s'ha de configurar i existeix per a la "
+"verificació de la signatura ssh"
+
+#: gpg-interface.c:479
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify és necessari per a la verificació de la"
+" signatura ssh (disponible a opensh versió 8.2p1+)"
+
+#: gpg-interface.c:550
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "fitxer de revocació de la signatura ssh configurat però no trobat: %s"
+
+#: gpg-interface.c:638
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "la signatura «%s» és incompatible o està malmesa"
+
+#: gpg-interface.c:815 gpg-interface.c:820
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "no s'ha pogut obtenir l'empremta ssh de la clau «%s»"
+
+#: gpg-interface.c:843
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"o bé user.signingkey o gpg.ssh.defaultKeyCommand han de ser configurats"
+
+#: gpg-interface.c:865
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand ha tingut èxit però no ha retornat cap clau: %s %s"
+
+#: gpg-interface.c:871
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand ha fallat: %s %s"
+
+#: gpg-interface.c:966
msgid "gpg failed to sign the data"
msgstr "gpg ha fallat en signar les dades"
+#: gpg-interface.c:988
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey s'ha d'establir per a signar amb ssh"
+
+#: gpg-interface.c:999
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "s'ha produït un error en escriure la clau de signatura ssh a «%s»"
+
+#: gpg-interface.c:1017
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "s'ha produït un error en escriure la clau de signatura ssh a «%s»"
+
+#: gpg-interface.c:1035
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y sign és necessari per a signar amb ssh (disponible a openssh "
+"versió 8.2p1+)"
+
+#: gpg-interface.c:1047
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "s'ha produït un error en llegir la signatura ssh des de «%s»"
+
#: graph.c:98
#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "ignora el color no vàlid «%.*s» a log.graphColors"
-#: grep.c:531
+#: grep.c:446
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
msgstr ""
-"el patró indicat conté byte NULL (via -f <fitxer>). Això només és compatible "
-"amb -P sota PCRE v2"
+"el patró indicat conté byte NULL (via -f <fitxer>). Això només és compatible"
+" amb -P sota PCRE v2"
-#: grep.c:1893
+#: grep.c:1859
#, c-format
msgid "'%s': unable to read %s"
msgstr "«%s»: no s'ha pogut llegir %s"
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1876 setup.c:177 builtin/clone.c:308 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "s'ha produït un error en fer stat a «%s»"
-#: grep.c:1921
+#: grep.c:1887
#, c-format
msgid "'%s': short read"
msgstr "«%s»: lectura curta"
-#: help.c:23
+#: help.c:25
msgid "start a working area (see also: git help tutorial)"
msgstr "començar una àrea de treball (vegeu també: git help tutorial)"
-#: help.c:24
+#: help.c:26
msgid "work on the current change (see also: git help everyday)"
msgstr "treballar en el canvi actual (vegeu també: git help everyday)"
-#: help.c:25
+#: help.c:27
msgid "examine the history and state (see also: git help revisions)"
msgstr "examinar la història i l'estat (vegeu també: git help revisions)"
-#: help.c:26
+#: help.c:28
msgid "grow, mark and tweak your common history"
msgstr "fer créixer, marcar i ajustar la vostra història comuna"
-#: help.c:27
+#: help.c:29
msgid "collaborate (see also: git help workflows)"
msgstr "col·laborar (vegeu també: git help workflow)"
-#: help.c:31
+#: help.c:33
msgid "Main Porcelain Commands"
msgstr "Ordres principals de porcellana"
-#: help.c:32
+#: help.c:34
msgid "Ancillary Commands / Manipulators"
msgstr "Ordres auxiliars / manipuladors"
-#: help.c:33
+#: help.c:35
msgid "Ancillary Commands / Interrogators"
msgstr "Ordres auxiliars / interrogadors"
-#: help.c:34
+#: help.c:36
msgid "Interacting with Others"
msgstr "Interaccionar amb altres"
-#: help.c:35
+#: help.c:37
msgid "Low-level Commands / Manipulators"
msgstr "Ordres de baix nivell / Manipuladors"
-#: help.c:36
+#: help.c:38
msgid "Low-level Commands / Interrogators"
msgstr "Ordres de baix nivell / Interrogadors"
-#: help.c:37
+#: help.c:39
msgid "Low-level Commands / Syncing Repositories"
msgstr "Ordres de baix nivell / Sincronització de repositoris"
-#: help.c:38
+#: help.c:40
msgid "Low-level Commands / Internal Helpers"
msgstr "Ordres de baix nivell / Ajudants interns"
-#: help.c:300
+#: help.c:316
#, c-format
msgid "available git commands in '%s'"
msgstr "ordres de git disponibles en «%s»"
-#: help.c:307
+#: help.c:323
msgid "git commands available from elsewhere on your $PATH"
msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
-#: help.c:316
+#: help.c:332
msgid "These are common Git commands used in various situations:"
-msgstr ""
-"Aquestes són ordres habituals del Git usades en diverses situacions:"
+msgstr "Aquestes són ordres habituals del Git usades en diverses situacions:"
-#: help.c:365 git.c:100
+#: help.c:382 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "tipus de llistat de l'ordre no compatible «%s»"
-#: help.c:405
+#: help.c:422
msgid "The Git concept guides are:"
msgstr "Les guies de Git de conceptes són:"
-#: help.c:429
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Vegeu «git help <ordre>» per llegir sobre una subordre específica"
-
-#: help.c:434
+#: help.c:446
msgid "External commands"
msgstr "Ordres externes"
-#: help.c:449
+#: help.c:468
msgid "Command aliases"
msgstr "Àlies d'ordres"
-#: help.c:527
+#: help.c:486
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Vegeu «git help <ordre>» per a llegir sobre una subordre específica"
+
+#: help.c:563
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4510,33 +4750,38 @@
"«%s» sembla una ordre de git, però no hem pogut\n"
"executar-la. Pot ser que git-%s estigui malmès?"
-#: help.c:543 help.c:631
+#: help.c:585 help.c:682
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: «%s» no és una ordre de git. Vegeu «git --help»."
-#: help.c:591
+#: help.c:633
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
-#: help.c:613
+#: help.c:655
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix."
-#: help.c:618
+#: help.c:660
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "El procés continuarà, pressuposant que volíeu dir «%s»."
-#: help.c:623
+#: help.c:666
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Voleu executar «%s» en el seu lloc? [y/N]? "
+
+#: help.c:674
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»."
-#: help.c:635
+#: help.c:686
msgid ""
"\n"
"The most similar command is"
@@ -4550,16 +4795,16 @@
"\n"
"Les ordres més similars són"
-#: help.c:675
+#: help.c:729
msgid "git version [<options>]"
msgstr "git version [<opcions>]"
-#: help.c:730
+#: help.c:784
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:788
msgid ""
"\n"
"Did you mean this?"
@@ -4573,15 +4818,29 @@
"\n"
"Volíeu dir un d'aquests?"
-#: ident.c:353
+#: hook.c:28
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"El lligam «%s» s'ha ignorat perquè no s'ha establert com a executable.\n"
+"Podeu desactivar aquest avís amb «git config advice.ignoredHook false»."
+
+#: hook.c:87
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "No s'ha pogut iniciar el lligam «%s»'\n"
+
+#: ident.c:354
msgid "Author identity unknown\n"
msgstr "Identitat de l'autor desconeguda\n"
-#: ident.c:356
+#: ident.c:357
msgid "Committer identity unknown\n"
msgstr "Es desconeix la identitat del comitent\n"
-#: ident.c:362
+#: ident.c:363
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -4606,80 +4865,80 @@
"per a establir la identitat predeterminada del vostre compte.\n"
"Ometeu --global per a establir la identitat només en aquest repositori.\n"
-#: ident.c:397
+#: ident.c:398
msgid "no email was given and auto-detection is disabled"
msgstr ""
"no s'ha proporcionat cap adreça electrònica i la detecció automàtica està "
"inhabilitada"
-#: ident.c:402
+#: ident.c:403
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr ""
"no s'ha pogut detectar automàticament una adreça electrònica vàlida (s'ha "
"rebut «%s»)"
-#: ident.c:419
+#: ident.c:420
msgid "no name was given and auto-detection is disabled"
msgstr ""
"no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada"
-#: ident.c:425
+#: ident.c:426
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "no s'ha pogut detectar automàticament el nom (s'ha rebut «%s»)"
-#: ident.c:433
+#: ident.c:434
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "nom d'identitat buit (per <%s>) no és permès"
-#: ident.c:439
+#: ident.c:440
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "el nom conté només caràcters no permesos: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:455 builtin/commit.c:649
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
-#: list-objects-filter-options.c:83
+#: list-objects-filter-options.c:68
msgid "expected 'tree:<depth>'"
msgstr "s'esperava «tree:<profunditat>»"
-#: list-objects-filter-options.c:98
+#: list-objects-filter-options.c:83
msgid "sparse:path filters support has been dropped"
msgstr "sparse: s'ha eliminat la implementació de filtres de camí sparse"
-#: list-objects-filter-options.c:105
+#: list-objects-filter-options.c:90
#, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "«%s» per a «object:type=<type>» no és un tipus d'objecte vàlid"
-#: list-objects-filter-options.c:124
+#: list-objects-filter-options.c:109
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "filtre d'especificació no vàlid: «%s»"
-#: list-objects-filter-options.c:140
+#: list-objects-filter-options.c:125
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr "cal escapar el caràcter en el sub-filter-spec «%c»"
-#: list-objects-filter-options.c:182
+#: list-objects-filter-options.c:167
msgid "expected something after combine:"
msgstr "s'esperava alguna cosa després de combinar:"
-#: list-objects-filter-options.c:264
+#: list-objects-filter-options.c:249
msgid "multiple filter-specs cannot be combined"
msgstr "no es poden combinar múltiples especificacions de filtratge"
-#: list-objects-filter-options.c:376
+#: list-objects-filter-options.c:365
msgid "unable to upgrade repository format to support partial clone"
msgstr ""
-"no s'ha pogut actualitzar el format del repositori perquè sigui compatible amb "
-"un clonatge parcial"
+"no s'ha pogut actualitzar el format del repositori perquè sigui compatible "
+"amb un clonatge parcial"
#: list-objects-filter.c:532
#, c-format
@@ -4691,17 +4950,17 @@
msgid "unable to parse sparse filter data in %s"
msgstr "no s'han pogut analitzar les dades disperses filtrades %s"
-#: list-objects.c:127
+#: list-objects.c:144
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr "l'entrada «%s» a l'arbre %s té mode d'arbre, però no és un arbre"
-#: list-objects.c:140
+#: list-objects.c:157
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "l'entrada «%s» a l'arbre %s té mode blob, però no és un blob"
-#: list-objects.c:395
+#: list-objects.c:415
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "no s'ha pogut carregar l'arrel de l'arbre per la comissió %s"
@@ -4722,8 +4981,8 @@
"Sembla que un altre procés de git s'està executant en aquest\n"
"repositori, per exemple, un editor obert per «git commit». \n"
"Assegureu-vos que tots els processos s'hagin acabat i\n"
-"llavors proveu de nou. Si encara falla, pot ser que un procés de\n"
-"git ha tingut un error:\n"
+"llavors proveu de nou. Si encara falla, pot ser un procés git\n"
+"ha fallat en aquest repositori abans:\n"
"elimineu el fitxer manualment per a continuar."
#: lockfile.c:160
@@ -4731,12 +4990,12 @@
msgid "Unable to create '%s.lock': %s"
msgstr "No s'ha pogut crear «%s.lock»: %s"
-#: ls-refs.c:37
+#: ls-refs.c:175
#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "valor «%s» no vàlid per a «lsrefs.unborn»"
+msgid "unexpected line: '%s'"
+msgstr "línia inesperada: «%s»"
-#: ls-refs.c:167
+#: ls-refs.c:179
msgid "expected flush after ls-refs arguments"
msgstr "s'esperava una neteja després dels arguments ls-refs"
@@ -4744,39 +5003,40 @@
msgid "quoted CRLF detected"
msgstr "CRLF citat detectat"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "acció «%s» incorrecta per a «%s»"
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1630 merge-recursive.c:1214
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "S'ha produït un error en fusionar el submòdul %s (no està agafat)"
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1639 merge-recursive.c:1221
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
-msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)"
+msgstr ""
+"S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)"
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1648 merge-recursive.c:1228
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"S'ha produït un error en fusionar el submòdul %s (les comissions no "
"segueixen merge-base)"
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1658 merge-ort.c:1666
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Nota: avançament ràpid del submòdul %s a %s"
-#: merge-ort.c:1172
+#: merge-ort.c:1688
#, c-format
msgid "Failed to merge submodule %s"
-msgstr "s'ha produït un error en fusionar recursivament el submòdul «%s»"
+msgstr "S'ha produït un error en fusionar el submòdul «%s»"
-#: merge-ort.c:1179
+#: merge-ort.c:1695
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4785,7 +5045,7 @@
"S'ha produït un error en fusionar el submòdul %s, però existeix una solució possible:\n"
"%s\n"
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1699 merge-recursive.c:1284
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4802,7 +5062,7 @@
"\n"
"que acceptarà aquest suggeriment.\n"
-#: merge-ort.c:1196
+#: merge-ort.c:1712
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4811,21 +5071,21 @@
"S'ha produït un error en fusionar el submòdul %s, però existeixen múltiples solucions possibles:\n"
"%s"
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1937 merge-recursive.c:1375
msgid "Failed to execute internal merge"
msgstr "S'ha produït un error en executar la fusió interna"
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1942 merge-recursive.c:1380
#, c-format
msgid "Unable to add %s to database"
msgstr "No s'ha pogut afegir %s a la base de dades"
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1949 merge-recursive.c:1413
#, c-format
msgid "Auto-merging %s"
msgstr "S'està autofusionant %s"
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2088 merge-recursive.c:2135
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4835,7 +5095,7 @@
"existent a %s en forma de canvi del nom del directori implícit, posant-hi "
"els camins següents a: %s."
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2098 merge-recursive.c:2145
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4845,7 +5105,7 @@
"camí a %s; els canvis del nom del directori implícits han intentat posar "
"aquests camins a: %s segons"
-#: merge-ort.c:1634
+#: merge-ort.c:2156
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4853,10 +5113,10 @@
"majority of the files."
msgstr ""
"CONFLICTE (divisió de canvi de nom de directori): no està clar on col·locar "
-"%s; s'han canviat de nom a múltiples altres "
-"directoris, sense una destinació per a la majoria dels fitxers."
+"%s; s'han canviat de nom a múltiples altres directoris, sense una destinació"
+" per a la majoria dels fitxers."
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2310 merge-recursive.c:2481
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4865,137 +5125,149 @@
"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell "
"mateix ja havia canviat de nom."
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2450 merge-recursive.c:3264
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
-"Pedaç actualitzat: %s afegit a %s dins d'un directori que va canviar de nom a %s; "
-"movent-lo a %s."
+"Pedaç actualitzat: %s afegit a %s dins d'un directori que va canviar de nom "
+"a %s; movent-lo a %s."
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2457 merge-recursive.c:3271
#, c-format
msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in"
+" %s; moving it to %s."
msgstr ""
-"Pedaç actualitzat: %s canviat al nom %s a %s, dins d'un directori que va canviar de nom a %s; "
-"movent-lo a %s."
+"Pedaç actualitzat: %s canviat al nom %s a %s, dins d'un directori que va "
+"canviar de nom a %s; movent-lo a %s."
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2470 merge-recursive.c:3267
#, c-format
msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
+"CONFLICT (file location): %s added in %s inside a directory that was renamed"
+" in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-"CONFLICTE (ubicació del fitxer): %s afegit a %s dins d'un directori "
-"que va canviar de nom a %s suggerint que potser hauria de moure's "
-"a %s."
+"CONFLICTE (ubicació del fitxer): %s afegit a %s dins d'un directori que va "
+"canviar de nom a %s suggerint que potser hauria de moure's a %s."
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2478 merge-recursive.c:3274
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
"CONFLICTE (ubicació del fitxer): %s canviat al nom %s a %s, dins d'un "
-"directori que va canviar de nom a %s, suggerint que potser hauria de moure's "
-"a %s."
+"directori que va canviar de nom a %s, suggerint que potser hauria de moure's"
+" a %s."
-#: merge-ort.c:2103
+#: merge-ort.c:2634
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
-msgstr "CONFLICTE (canvi de nom/canvi de nom): %s ara té el nom %s a %s i %s a %s."
+msgstr ""
+"CONFLICTE (canvi de nom/canvi de nom): %s ara té el nom %s a %s i %s a %s."
-#: merge-ort.c:2198
+#: merge-ort.c:2729
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
-"conflicts AND collides with another path; this may result in nested conflict "
-"markers."
+"conflicts AND collides with another path; this may result in nested conflict"
+" markers."
msgstr ""
+"CONFLICTE (canvi de nom implicat en la col·lisió): el canvi de nom de %s -> "
+"%s té conflictes de contingut i col·lisiona amb un altre camí; això pot "
+"donar lloc a marcadors de conflicte imbricats."
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2748 merge-ort.c:2772
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
-"CONFLICTE (canvi de nom/supressió): %s ara té el nom %s a %s, però s'ha suprimit "
-"a %s."
+"CONFLICTE (canvi de nom/supressió): %s ara té el nom %s a %s, però s'ha "
+"suprimit a %s."
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3261 merge-recursive.c:3025
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3264 merge-recursive.c:3028
#, c-format
msgid "object %s is not a blob"
msgstr "l'objecte %s no és un blob"
-#: merge-ort.c:2981
+#: merge-ort.c:3693
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr ""
+"CONFLICTE (fitxer/directori): directori en el camí de %s des de %s; en "
+"comptes es mou a %s."
-#: merge-ort.c:3055
+#: merge-ort.c:3770
#, c-format
msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed both "
-"of them so each can be recorded somewhere."
+"CONFLICT (distinct types): %s had different types on each side; renamed both"
+" of them so each can be recorded somewhere."
msgstr ""
+"CONFLICTE (tipus diferents): %s tenia diferents tipus a cada costat; se'ls "
+"ha canviat el nom per tal que cadascun pugui ser registrat en algun lloc."
-#: merge-ort.c:3062
+#: merge-ort.c:3777
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
"of them so each can be recorded somewhere."
msgstr ""
+"CONFLICTE (tipus diferents): %s té diferents tipus a cada costat; s'ha "
+"canviat el nom d'un d'ells per tal que cadascun pugui ser registrat en algun"
+" lloc."
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3866 merge-recursive.c:3104
msgid "content"
msgstr "contingut"
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3868 merge-recursive.c:3108
msgid "add/add"
msgstr "afegiment/afegiment"
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3870 merge-recursive.c:3153
msgid "submodule"
msgstr "submòdul"
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3872 merge-recursive.c:3154
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: merge-ort.c:3198
+#: merge-ort.c:3916
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"of %s left in tree."
msgstr ""
-"CONFLICTE: (modificació/supressió): %s suprimit a %s i modificat a %s. La versió %s de %s "
-"s'ha deixat en l'arbre."
+"CONFLICTE: (modificació/supressió): %s suprimit a %s i modificat a %s. La "
+"versió %s de %s s'ha deixat en l'arbre."
-#: merge-ort.c:3433
+#: merge-ort.c:4212
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
"copy renamed to %s"
msgstr ""
+"Nota: %s no està actualitzat i en forma de comprovar la versió en conflicte;"
+" còpia antiga reanomenada a %s"
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
-#.
-#: merge-ort.c:3730
+#: merge-ort.c:4586
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
-msgstr "ha fallat la recollida de la informació de fusió per als arbres %s, %s, %s"
+msgstr ""
+"ha fallat la recollida de la informació de fusió per als arbres %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3723
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -5004,110 +5276,111 @@
"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
msgid "Already up to date."
msgstr "Ja està al dia."
-#: merge-recursive.c:356
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(comissió errònia)\n"
-#: merge-recursive.c:379
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo ha fallat per al camí «%s»; interrompent la fusió."
-#: merge-recursive.c:388
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo ha fallat al refrescar el camí «%s»; interrompent la fusió."
-#: merge-recursive.c:876
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "s'ha produït un error en crear el camí «%s»%s"
-#: merge-recursive.c:887
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": potser un conflicte D/F?"
-#: merge-recursive.c:910
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:47
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no es pot llegir l'objecte %s «%s»"
-#: merge-recursive.c:956
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob esperat per a %s «%s»"
-#: merge-recursive.c:981
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "s'ha produït un error en obrir «%s»: %s"
-#: merge-recursive.c:992
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s"
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "no se sap què fer amb %06o %s «%s»"
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Avançament ràpid del submòdul %s a la següent comissió:"
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1239 merge-recursive.c:1252
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avançament ràpid al submòdul %s"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-"Ha fallat en fusionar el submòdul %s (no s'ha trobat les comissions següents)"
+"Ha fallat en fusionar el submòdul %s (no s'ha trobat les comissions "
+"següents)"
-#: merge-recursive.c:1269
+#: merge-recursive.c:1280
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
"S'ha produït un error en fusionar el submòdul %s (sense avançament ràpid)"
-#: merge-recursive.c:1270
+#: merge-recursive.c:1281
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n"
-#: merge-recursive.c:1282
+#: merge-recursive.c:1293
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
"S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples "
"fusions)"
-#: merge-recursive.c:1424
+#: merge-recursive.c:1437
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha "
"escrit a %s."
-#: merge-recursive.c:1496
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5116,7 +5389,7 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre."
-#: merge-recursive.c:1501
+#: merge-recursive.c:1514
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5125,7 +5398,7 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
"de %s s'ha deixat en l'arbre."
-#: merge-recursive.c:1508
+#: merge-recursive.c:1521
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5134,7 +5407,7 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre a %s."
-#: merge-recursive.c:1513
+#: merge-recursive.c:1526
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5143,66 +5416,66 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
"de %s s'ha deixat en l'arbre a %s."
-#: merge-recursive.c:1548
+#: merge-recursive.c:1561
msgid "rename"
msgstr "canvi de nom"
-#: merge-recursive.c:1548
+#: merge-recursive.c:1561
msgid "renamed"
msgstr "canviat de nom"
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "S'està refusant a perdre el fitxer brut a %s"
-#: merge-recursive.c:1609
+#: merge-recursive.c:1622
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig "
"de l'operació."
-#: merge-recursive.c:1667
+#: merge-recursive.c:1680
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s. S'ha afegit "
"%s a %s"
-#: merge-recursive.c:1698
+#: merge-recursive.c:1711
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això"
-#: merge-recursive.c:1703
+#: merge-recursive.c:1716
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"S'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint "
"com a %s"
-#: merge-recursive.c:1730
+#: merge-recursive.c:1743
#, c-format
msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+"\"%s\"->\"%s\" in \"%s\"%s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la branca "
"«%s» canvi de nom «%s»->«%s» en «%s»%s"
-#: merge-recursive.c:1735
+#: merge-recursive.c:1748
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
-#: merge-recursive.c:1827
+#: merge-recursive.c:1840
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
"nom %s->%s en %s"
-#: merge-recursive.c:2090
+#: merge-recursive.c:2103
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5213,90 +5486,91 @@
"%s perquè el directori %s s'han canviat de nom a múltiples altres "
"directoris, sense una destinació per a la majoria dels fitxers."
-#: merge-recursive.c:2224
+#: merge-recursive.c:2237
#, c-format
msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
+"%s->%s in %s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): canvi de nom %s->%s en %s. Canvi de "
"nom de directori %s->%s en %s"
-#: merge-recursive.c:3069
+#: merge-recursive.c:3092
msgid "modify"
msgstr "modificació"
-#: merge-recursive.c:3069
+#: merge-recursive.c:3092
msgid "modified"
msgstr "modificat"
-#: merge-recursive.c:3108
+#: merge-recursive.c:3131
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "S'ha omès %s (el fusionat és igual a l'existent)"
-#: merge-recursive.c:3161
+#: merge-recursive.c:3184
#, c-format
msgid "Adding as %s instead"
msgstr "S'està afegint com a %s en lloc d'això"
-#: merge-recursive.c:3368
+#: merge-recursive.c:3388
#, c-format
msgid "Removing %s"
msgstr "S'està eliminant %s"
-#: merge-recursive.c:3391
+#: merge-recursive.c:3411
msgid "file/directory"
msgstr "fitxer/directori"
-#: merge-recursive.c:3396
+#: merge-recursive.c:3416
msgid "directory/file"
msgstr "directori/fitxer"
-#: merge-recursive.c:3403
+#: merge-recursive.c:3423
#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgid ""
+"CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a "
-"%s"
+"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a"
+" %s"
-#: merge-recursive.c:3412
+#: merge-recursive.c:3432
#, c-format
msgid "Adding %s"
msgstr "S'està afegint %s"
-#: merge-recursive.c:3421
+#: merge-recursive.c:3441
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s"
-#: merge-recursive.c:3474
+#: merge-recursive.c:3494
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "la fusió dels arbres %s i %s ha fallat"
-#: merge-recursive.c:3568
+#: merge-recursive.c:3588
msgid "Merging:"
msgstr "S'està fusionant:"
-#: merge-recursive.c:3581
+#: merge-recursive.c:3601
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "s'ha trobat %u avantpassat en comú:"
msgstr[1] "s'han trobat %u avantpassats en comú:"
-#: merge-recursive.c:3631
+#: merge-recursive.c:3651
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
-#: merge-recursive.c:3796
+#: merge-recursive.c:3823
#, c-format
msgid "Could not parse object '%s'"
msgstr "No s'ha pogut analitzar l'objecte «%s»"
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
@@ -5304,187 +5578,239 @@
msgid "failed to read the cache"
msgstr "s'ha produït un error en llegir la memòria cau"
-#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
+#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: midx.c:74
+#: midx.c:79
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "l'OID de l'índex multipaquet és d'una mida incorrecta"
-#: midx.c:105
+#: midx.c:112
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "el fitxer de l'índex multipaquet %s és massa petit"
-#: midx.c:121
+#: midx.c:128
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-"la signatura de l'índex multipaquet 0x%08x no coincideix amb la signatura 0x%08x"
+"la signatura de l'índex multipaquet 0x%08x no coincideix amb la signatura "
+"0x%08x"
-#: midx.c:126
+#: midx.c:133
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "no es reconeix la versió %d de l'índex multipaquet"
-#: midx.c:131
+#: midx.c:138
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
"la versió del hash índex multipaquet %u no coincideix amb la versió %u"
-#: midx.c:148
+#: midx.c:155
msgid "multi-pack-index missing required pack-name chunk"
msgstr "falta un fragment de nom de paquet necessari al multi-index"
-#: midx.c:150
+#: midx.c:157
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "falta un fragment «fanout» OID necessari al multi-pack-index"
-#: midx.c:152
+#: midx.c:159
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "falta un fragment de cerca «fanout» OID necessari al multi-pack-index"
-#: midx.c:154
+#: midx.c:161
msgid "multi-pack-index missing required object offsets chunk"
msgstr "falta un fragment necessari dels desplaçaments al multi-pack-index"
-#: midx.c:170
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr "els noms de paquet de l'índex multipaquet estan desordenats «%s» abans de «%s»"
+msgstr ""
+"els noms de paquet de l'índex multipaquet estan desordenats «%s» abans de "
+"«%s»"
-#: midx.c:214
+#: midx.c:228
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "pack-int-id: %u incorrecte (%u paquets en total)"
-#: midx.c:264
+#: midx.c:278
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-"l'índex multipaquet emmagatzema un desplaçament de 64 bits, però off_t és massa petit"
+"l'índex multipaquet emmagatzema un desplaçament de 64 bits, però off_t és "
+"massa petit"
-#: midx.c:490
+#: midx.c:509
#, c-format
msgid "failed to add packfile '%s'"
msgstr "no s'ha pogut afegir el fitxer de paquet «%s»"
-#: midx.c:496
+#: midx.c:515
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "no s'ha pogut obrir l'índex del paquet «%s»"
-#: midx.c:564
+#: midx.c:583
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "no s'ha pogut localitzar l'objecte %d en el fitxer de paquet"
-#: midx.c:880 builtin/index-pack.c:1535
+#: midx.c:911
msgid "cannot store reverse index file"
msgstr "no es pot emmagatzemar el fitxer d'índex invers"
-#: midx.c:933
+#: midx.c:1009
+#, c-format
+msgid "could not parse line: %s"
+msgstr "no s'ha pogut analitzar la línia: %s"
+
+#: midx.c:1011
+#, c-format
+msgid "malformed line: %s"
+msgstr "línia mal formada: %s"
+
+#: midx.c:1181
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+"s'està ignorant l'índex multipaquet existent; la suma de verificació no "
+"coincideix"
+
+#: midx.c:1206
+msgid "could not load pack"
+msgstr "no s'ha pogut carregar el paquet"
+
+#: midx.c:1212
+#, c-format
+msgid "could not open index for %s"
+msgstr "s'ha produït un error en obrir l'índex per «%s»"
+
+#: midx.c:1223
msgid "Adding packfiles to multi-pack-index"
msgstr "S'estan afegint fitxers empaquetats a l'índex multipaquet"
-#: midx.c:979
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "no s'ha vist caure el fitxer empaquetat %s"
-
-#: midx.c:1024
+#: midx.c:1266
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "paquet preferit desconegut: «%s»"
-#: midx.c:1029
+#: midx.c:1311
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "no es pot seleccionar un paquet preferit %s sense objectes"
+
+#: midx.c:1343
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "no s'ha vist caure el fitxer empaquetat %s"
+
+#: midx.c:1389
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "el paquet preferit «%s» ha caducat"
-#: midx.c:1045
+#: midx.c:1402
msgid "no pack files to index."
msgstr "no hi ha fitxers empaquetats a indexar."
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1409
+#, fuzzy
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "es nega a escriure el .bitmap multi-paquet sense cap objecte"
+
+#: midx.c:1451
+msgid "could not write multi-pack bitmap"
+msgstr "no s'han pogut escriure els mapes de bits dels multipaquets"
+
+#: midx.c:1461
+msgid "could not write multi-pack-index"
+msgstr "no s'ha pogut escriure l'índex multipaquet"
+
+#: midx.c:1520 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "s'ha produït un error en eliminar %s"
-#: midx.c:1156
+#: midx.c:1553
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "no s'ha pogut netejar l'índex multipaquet a %s"
-#: midx.c:1214
+#: midx.c:1616
msgid "multi-pack-index file exists, but failed to parse"
-msgstr "el fitxer de l'índex multipaquet existeix, però no s'ha pogut analitzar"
+msgstr ""
+"el fitxer de l'índex multipaquet existeix, però no s'ha pogut analitzar"
-#: midx.c:1222
+#: midx.c:1624
+msgid "incorrect checksum"
+msgstr "suma de verificació incorrecta"
+
+#: midx.c:1627
msgid "Looking for referenced packfiles"
msgstr "S'estan cercant fitxers empaquetats referenciats"
-#: midx.c:1237
+#: midx.c:1642
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid fanout desordenat: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1242
+#: midx.c:1647
msgid "the midx contains no oid"
msgstr "el midx no conté cap oid"
-#: midx.c:1251
+#: midx.c:1656
msgid "Verifying OID order in multi-pack-index"
msgstr "S'està verificant l'ordre OID a l'índex multipaquet"
-#: midx.c:1260
+#: midx.c:1665
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid lookup desordenat: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1280
+#: midx.c:1685
msgid "Sorting objects by packfile"
msgstr "S'estan ordenant els objectes per fitxer empaquetats"
-#: midx.c:1287
+#: midx.c:1692
msgid "Verifying object offsets"
msgstr "S'estan verificant els desplaçaments dels objectes"
-#: midx.c:1303
+#: midx.c:1708
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
-msgstr ""
-"no s'ha pogut carregar l'entrada del paquet per a oid[%d] = %s"
+msgstr "no s'ha pogut carregar l'entrada del paquet per a oid[%d] = %s"
-#: midx.c:1309
+#: midx.c:1714
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer empaquetat %s"
-#: midx.c:1318
+#: midx.c:1723
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-"desplaçament incorrecte de l'objecte per a oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+"desplaçament incorrecte de l'objecte per a oid[%d] = %s: %<PRIx64> != "
+"%<PRIx64>"
-#: midx.c:1343
+#: midx.c:1750
msgid "Counting referenced objects"
msgstr "S'estan comptant els objectes referenciats"
-#: midx.c:1353
+#: midx.c:1760
msgid "Finding and deleting unreferenced packfiles"
msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats"
-#: midx.c:1544
+#: midx.c:1952
msgid "could not start pack-objects"
msgstr "no s'ha pogut iniciar el pack-objects"
-#: midx.c:1564
+#: midx.c:1972
msgid "could not finish pack-objects"
msgstr "no s'ha pogut finalitzar el pack-objects"
@@ -5503,18 +5829,16 @@
msgid "unable to join lazy_name thread: %s"
msgstr "no s'ha pogut unir el fil «lazy_name»: %s"
-#: notes-merge.c:277
+#: notes-merge.c:276
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
-"commit/abort the previous merge before you start a new notes merge."
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge."
msgstr ""
"No heu acabat la vostra fusió de notes prèvia (%s existeix).\n"
-"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/"
-"avortar la fusió prèvia abans de començar una fusió de notes nova."
+"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/avortar la fusió prèvia abans de començar una fusió de notes nova."
-#: notes-merge.c:284
+#: notes-merge.c:283
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "No heu conclòs la vostra fusió de notes (%s existeix)."
@@ -5536,283 +5860,348 @@
#. TRANSLATORS: The first %s is the name of
#. the environment variable, the second %s is
#. its value.
-#.
#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Valor erroni de %s: «%s»"
-#: object-file.c:526
+#: object-file.c:457
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-"no existeix el directori d'objecte %s; comproveu .git/objects/info/alternates"
+"no existeix el directori d'objecte %s; comproveu "
+".git/objects/info/alternates"
-#: object-file.c:577
+#: object-file.c:515
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "no s'ha pogut normalitzar el camí a l'objecte alternatiu: %s"
-#: object-file.c:649
+#: object-file.c:589
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-"%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació massa "
-"profunda"
+"%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació "
+"massa profunda"
-#: object-file.c:656
+#: object-file.c:596
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s"
-#: object-file.c:699
+#: object-file.c:639
msgid "unable to fdopen alternates lockfile"
msgstr "no s'ha pogut fer «fdopen» al fitxer de bloqueig alternatiu"
-#: object-file.c:717
+#: object-file.c:657
msgid "unable to read alternates file"
msgstr "no es pot llegir el fitxer «alternates»"
-#: object-file.c:724
+#: object-file.c:664
msgid "unable to move new alternates file into place"
msgstr "no s'ha pogut moure el nou fitxer «alternates» al lloc"
-#: object-file.c:759
+#: object-file.c:742
#, c-format
msgid "path '%s' does not exist"
msgstr "el camí «%s» no existeix"
-#: object-file.c:780
+#: object-file.c:763
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"encara no s'admet el repositori de referència «%s» com a agafament enllaçat."
-#: object-file.c:786
+#: object-file.c:769
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "el repositori de referència «%s» no és un repositori local."
-#: object-file.c:792
+#: object-file.c:775
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "el repositori de referència «%s» és superficial"
-#: object-file.c:800
+#: object-file.c:783
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "el repositori de referència «%s» és empeltat"
-#: object-file.c:860
+#: object-file.c:814
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "no s'ha pogut trobar el directori de l'objecte que coincideixi amb %s"
+
+#: object-file.c:864
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
"línia no vàlida quan s'analitzaven les referències de l'«alternate»: %s"
-#: object-file.c:1010
+#: object-file.c:1014
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "s'està intentant fer mmap %<PRIuMAX> per sobre del límit %<PRIuMAX>"
-#: object-file.c:1031
-msgid "mmap failed"
-msgstr "mmap ha fallat"
+#: object-file.c:1049
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap ha fallat%s"
-#: object-file.c:1195
+#: object-file.c:1230
#, c-format
msgid "object file %s is empty"
msgstr "el tipus d'objecte %s és buit"
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1349 object-file.c:2588
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objecte solt corrupte «%s»"
-#: object-file.c:1332 object-file.c:2528
+#: object-file.c:1351 object-file.c:2592
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "brossa al final de l'objecte solt «%s»"
-#: object-file.c:1374
-msgid "invalid object type"
-msgstr "tipus d'objecte és incorrecte"
-
-#: object-file.c:1458
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "no s'ha pogut desempaquetar la capçalera %s amb --allow-unknown-type"
-
-#: object-file.c:1461
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "no s'ha pogut desempaquetar la capçalera %s"
-
-#: object-file.c:1467
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "no s'ha pogut analitzar la capçalera %s amb --allow-unknown-type"
-
-#: object-file.c:1470
+#: object-file.c:1473
#, c-format
msgid "unable to parse %s header"
msgstr "no s'ha pogut analitzar la capçalera %s"
-#: object-file.c:1697
+#: object-file.c:1475
+msgid "invalid object type"
+msgstr "tipus d'objecte és incorrecte"
+
+#: object-file.c:1486
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "no s'ha pogut desempaquetar la capçalera %s"
+
+#: object-file.c:1490
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "la capçalera per a %s és massa llarga, supera els %d bytes"
+
+#: object-file.c:1720
#, c-format
msgid "failed to read object %s"
msgstr "s'ha produït un error en llegir l'objecte %s"
-#: object-file.c:1701
+#: object-file.c:1724
#, c-format
msgid "replacement %s not found for %s"
msgstr "no s'ha trobat el reemplaçament %s per a %s"
-#: object-file.c:1705
+#: object-file.c:1728
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "l'objecte solt %s (emmagatzemat a %s) és corrupte"
-#: object-file.c:1709
+#: object-file.c:1732
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "l'objecte empaquetat %s (emmagatzemat a %s) és corrupte"
-#: object-file.c:1814
+#: object-file.c:1855
#, c-format
msgid "unable to write file %s"
msgstr "no s'ha pogut escriure al fitxer %s"
-#: object-file.c:1821
+#: object-file.c:1862
#, c-format
msgid "unable to set permission to '%s'"
msgstr "no s'ha pogut establir el permís a «%s»"
-#: object-file.c:1828
+#: object-file.c:1869
msgid "file write error"
msgstr "s'ha produït un error en escriure al fitxer"
-#: object-file.c:1848
+#: object-file.c:1904
msgid "error when closing loose object file"
msgstr "error en tancar el fitxer d'objecte solt"
-#: object-file.c:1913
+#: object-file.c:1971
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-"permisos insuficients per a afegir un objecte a la base de dades del repositori "
-"%s"
+"permisos insuficients per a afegir un objecte a la base de dades del "
+"repositori %s"
-#: object-file.c:1915
+#: object-file.c:1973
msgid "unable to create temporary file"
msgstr "no s'ha pogut crear un fitxer temporal"
-#: object-file.c:1939
+#: object-file.c:1997
msgid "unable to write loose object file"
msgstr "no s'ha pogut escriure el fitxer d'objecte solt"
-#: object-file.c:1945
+#: object-file.c:2003
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "no s'ha pogut desinflar l'object nou %s (%d)"
-#: object-file.c:1949
+#: object-file.c:2007
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "ha fallat deflateEnd a l'objecte %s(%d)"
-#: object-file.c:1953
+#: object-file.c:2011
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "confós per la font de dades inestable de l'objecte per a %s"
-#: object-file.c:1963 builtin/pack-objects.c:1097
+#: object-file.c:2022 builtin/pack-objects.c:1251
#, c-format
msgid "failed utime() on %s"
msgstr "ha fallat utime() a %s"
-#: object-file.c:2040
+#: object-file.c:2100
#, c-format
msgid "cannot read object for %s"
msgstr "no es pot llegir l'objecte per a %s"
-#: object-file.c:2091
+#: object-file.c:2151
msgid "corrupt commit"
msgstr "comissió corrupta"
-#: object-file.c:2099
+#: object-file.c:2159
msgid "corrupt tag"
msgstr "etiqueta corrupta"
-#: object-file.c:2199
+#: object-file.c:2259
#, c-format
msgid "read error while indexing %s"
msgstr "error de lectura mentre s'indexava %s"
-#: object-file.c:2202
+#: object-file.c:2262
#, c-format
msgid "short read while indexing %s"
msgstr "lectura curta mentre s'indexa %s"
-#: object-file.c:2275 object-file.c:2285
+#: object-file.c:2335 object-file.c:2345
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: no s'han pogut inserir a la base de dades"
-#: object-file.c:2291
+#: object-file.c:2351
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipus de fitxer no suportat"
-#: object-file.c:2315
+#: object-file.c:2375 builtin/fetch.c:1494
#, c-format
msgid "%s is not a valid object"
msgstr "%s no és un objecte vàlid"
-#: object-file.c:2317
+#: object-file.c:2377
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no és un objecte de «%s» vàlid"
-#: object-file.c:2344 builtin/index-pack.c:192
+#: object-file.c:2404
#, c-format
msgid "unable to open %s"
msgstr "no s'ha pogut obrir %s"
-#: object-file.c:2535 object-file.c:2588
+#: object-file.c:2599
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "no coincideix la suma per a %s (s'esperava %s)"
-#: object-file.c:2559
+#: object-file.c:2622
#, c-format
msgid "unable to mmap %s"
msgstr "no s'ha pogut fer «mmap» %s"
-#: object-file.c:2564
+#: object-file.c:2628
#, c-format
msgid "unable to unpack header of %s"
msgstr "no s'ha pogut desempaquetar la capçalera de %s"
-#: object-file.c:2570
+#: object-file.c:2633
#, c-format
msgid "unable to parse header of %s"
msgstr "no s'ha pogut analitzar la capçalera de %s"
-#: object-file.c:2581
+#: object-file.c:2644
#, c-format
msgid "unable to unpack contents of %s"
msgstr "no s'han pogut desempaquetar els continguts de %s"
-#: object-name.c:486
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#: object-name.c:382
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [objecte incorrecte]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#: object-name.c:407
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s comissió %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#: object-name.c:428
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s etiqueta %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#. "deadbeef [bad tag, could not parse it]"
+#: object-name.c:439
+#, c-format, fuzzy
+msgid "%s [bad tag, could not parse it]"
+msgstr "tagetiqueta dolenta, no s'ha pogut analitzar]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#: object-name.c:447
+#, c-format, fuzzy
+msgid "%s tree"
+msgstr "arbre del 0%"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#: object-name.c:453
+#, c-format, fuzzy
+msgid "%s blob"
+msgstr "blob"
+
+#: object-name.c:569
#, c-format
msgid "short object ID %s is ambiguous"
msgstr "l'id d'objecte curt %s és ambigu"
-#: object-name.c:497
-msgid "The candidates are:"
-msgstr "Els candidats són:"
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#: object-name.c:591
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Els candidats són:\n"
+"%s"
-#: object-name.c:796
+#: object-name.c:888
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5836,22 +6225,22 @@
"suprimiu-les. Desactiveu aquest missatge executant\n"
"«git config advice.objectNameWarning false»"
-#: object-name.c:916
+#: object-name.c:1008
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "registre per a «%.*s» només retorna a %s"
-#: object-name.c:924
+#: object-name.c:1016
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "registre per a «%.*s» només té %d entrades"
-#: object-name.c:1702
+#: object-name.c:1794
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "el camí «%s» existeix al disc, però no a «%.*s»"
-#: object-name.c:1708
+#: object-name.c:1800
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
@@ -5860,45 +6249,50 @@
"el camí «%s» existeix, però no «%s»\n"
"consell: volíeu dir «%.*s:%s» conegut com a «%.*s:./%s»?"
-#: object-name.c:1717
+#: object-name.c:1809
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "el camí «%s» no existeix en «%.*s»"
-#: object-name.c:1745
+#: object-name.c:1837
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
"hint: Did you mean ':%d:%s'?"
msgstr ""
-"el camí «%s» està a l'índex, però no a «stage» %d\n."
-"consell: volíeu dir «:%d:%s»?"
+"el camí «%s» està a l'índex, però no a «stage» %d\n"
+".consell: volíeu dir «:%d:%s»?"
-#: object-name.c:1761
+#: object-name.c:1853
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
msgstr ""
-"el camí «%s» està a l'índex, però no a «%s»\n."
-"consell: volíeu dir «:%d:%s» conegut com a «:%d:./%s»?"
+"el camí «%s» està a l'índex, però no a «%s»\n"
+".consell: volíeu dir «:%d:%s» conegut com a «:%d:./%s»?"
-#: object-name.c:1769
+#: object-name.c:1861
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "el camí «%s» existeix al disc, però no a l'índex"
-#: object-name.c:1771
-#, c-format
+#: object-name.c:1863
+#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "el camí «%s» no existeix (ni al disc ni a l'índex)"
-#: object-name.c:1784
+#: object-name.c:1876
msgid "relative path syntax can't be used outside working tree"
msgstr ""
"la sintaxi de camí relatiu no es pot utilitzar fora de l'arbre de treball"
-#: object-name.c:1922
+#: object-name.c:1901
+#, c-format, fuzzy
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<object>:<path> requerit, només <object>'%s' donat"
+
+#: object-name.c:2014
#, c-format
msgid "invalid object name '%.*s'."
msgstr "nom d'objecte no vàlid «%.*s»."
@@ -5913,27 +6307,40 @@
msgid "object %s is a %s, not a %s"
msgstr "l'objecte %s és %s, no pas %s"
-#: object.c:232
+#: object.c:250
#, c-format
msgid "object %s has unknown type id %d"
msgstr "l'objecte %s té un identificador de tipus %d desconegut"
-#: object.c:245
+#: object.c:263
#, c-format
msgid "unable to parse object: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: object.c:265 object.c:277
+#: object.c:283 object.c:294
#, c-format
msgid "hash mismatch %s"
msgstr "el resum no coincideix %s"
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "falta l'índex invers necessari al mapa de bits multipaquet"
+
+#: pack-bitmap.c:433
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: no s'ha pogut obrir el paquet"
+
+#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
#, c-format
msgid "unable to get size of %s"
msgstr "no s'ha pogut obtenir la mida de %s"
-#: pack-bitmap.c:1547 builtin/rev-list.c:92
+#: pack-bitmap.c:1937
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "no s'ha pogut trobar %s al paquet %s al desplaçament %<PRIuMAX>"
+
+#: pack-bitmap.c:1973 builtin/rev-list.c:91
#, c-format
msgid "unable to get disk usage of %s"
msgstr "no s'ha pogut obtenir l'ús del disc de %s"
@@ -5956,185 +6363,217 @@
#: pack-revindex.c:238
#, c-format
msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr ""
+msgstr "el fitxer d'índex invers %s té la versió %<PRIu32> no admesa"
#: pack-revindex.c:243
#, c-format
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
-msgstr ""
+msgstr "el fitxer d'índex invers %s té un ID de resum %<PRIu32> no admès"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "no es pot escriure i verificar l'índex invers"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "no s'ha pogut fer stat a: %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "s'ha produït un error en fer %s llegible"
-#: pack-write.c:522
+#: pack-write.c:521
#, c-format
msgid "could not write '%s' promisor file"
msgstr "no s'ha pogut escriure «%s» al fitxer «promisor»"
-#: packfile.c:625
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
-#: packfile.c:1937
+#: packfile.c:657
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "el fitxer de paquet %s no es pot mapar%s"
+
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)"
-#: packfile.c:1941
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "l'opció «%s» espera un valor numèric"
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "data de venciment «%s» mal formada"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "l'opció «%s» espera «always», «auto» o «never»"
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "nom d'objecte «%s» mal format"
-#: parse-options.c:38
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "l'opció «%s» espera «%s» o «%s»"
+
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s requereix un valor"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s és incompatible amb %s"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s: és incompatible amb alguna altra cosa"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s no accepta cap valor"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s no és disponible"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s espera un valor enter no negatiu amb un sufix opcional k/m/g"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "opció ambigua: %s (pot ser --%s%s o --%s%s)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
-msgstr "voleu dir «--%s» (amb dos traços)?"
+msgstr "voleu dir «--%s» (amb dos guionets)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "àlies de --%s"
-#: parse-options.c:879
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "opció desconeguda «%s»"
-#: parse-options.c:881
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
-msgstr "«switch» «%c» desconegut"
+msgstr "opció «%c» desconeguda"
-#: parse-options.c:883
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "opció no ascii desconeguda en la cadena: «%s»"
-#: parse-options.c:907
+#: parse-options.c:920
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "ús: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
-#.
-#: parse-options.c:932
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#: parse-options.c:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-NUM"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "No s'ha pogut fer %s escrivible pel grup"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"El caràcter d'escapament «\\» no està permès com a últim caràcter en un "
"valor d'un atribut"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Només es permet una especificació «attr:»."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "una especificació d'atribut no pot estar buida"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "nom d'atribut no vàlid %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"els paràmetres d'especificació de camí «glob» i «noglob» globals són "
"incompatibles"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6142,52 +6581,52 @@
"el paràmetre d'especificació de camí «literal» global és incompatible amb "
"tots els altres paràmetres d'especificació de camí globals"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "paràmetre no vàlid per a la màgia d'especificació de camí «prefix»"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Màgia d'especificació de camí no vàlida «%.*s» en «%s»"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "«)» mancant al final de la màgia d'especificació de camí en «%s»"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Màgia d'especificació de camí no implementada «%c» en «%s»"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: «literal» i «glob» són incompatibles"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: «%s» està fora del repositori en «%s»"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "«%s» (mnemònic: «%c»)"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
"%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "la línia està mal citada: %s"
@@ -6201,14 +6640,14 @@
msgstr "no s'ha pogut escriure el paquet delim"
#: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "no s'ha pogut escriure el paquet de separació sense estat"
+msgid "unable to write response end packet"
+msgstr "no s'ha pogut escriure el paquet de final de resposta"
#: pkt-line.c:113
msgid "flush packet write failed"
msgstr "s'ha produït un error en escriure el paquet de buidatge"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "error de protocol: longitud de línia impossible"
@@ -6216,7 +6655,7 @@
msgid "packet write with format failed"
msgstr "ha fallat l'escriptura del paquet amb format"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"no s'ha pogut escriure el paquet - les dades excedeixen la mida màxima del "
@@ -6227,25 +6666,25 @@
msgid "packet write failed: %s"
msgstr "no s'ha pogut escriure el paquet: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "error de lectura"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "el remot ha penjat inesperadament"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "error de protocol: longitud de línia errònia %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "error remot: %s"
@@ -6259,23 +6698,23 @@
msgid "unable to create threaded lstat: %s"
msgstr "no s'han pogut crear lstat amb fils %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
-#: promisor-remote.c:30
+#: promisor-remote.c:31
msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote no es pot bifurcar obtenint el subprocés"
+msgstr "promisor-remote: no es pot bifurcar el subprocés d'obtenció"
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "promisor-remote no s'ha pogut escriure per obtenir el subprocés"
+msgstr "promisor-remote: no s'ha pogut escriure per al subprocés d'obtenció"
-#: promisor-remote.c:41
+#: promisor-remote.c:44
msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr "promisor-remote no s'ha pogut tancar stdin per obtenir el subprocés"
+msgstr "promisor-remote: no s'ha pogut tancar stdin al subprocés d'obtenció"
-#: promisor-remote.c:53
+#: promisor-remote.c:54
#, c-format
msgid "promisor remote name cannot begin with '/': %s"
msgstr "el nom remot «promisor» no pot començar amb «/»: %s"
@@ -6286,22 +6725,22 @@
#: prune-packed.c:35
msgid "Removing duplicate objects"
-msgstr "S'estan eliminant objectes duplicats"
+msgstr "S'estan eliminant els objectes duplicats"
-#: range-diff.c:78
+#: range-diff.c:68
msgid "could not start `log`"
msgstr "no s'ha pogut iniciar «log»"
-#: range-diff.c:80
+#: range-diff.c:70
msgid "could not read `log` output"
msgstr "no s'ha pogut llegir la sortida de «log»"
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:98 sequencer.c:5575
#, c-format
msgid "could not parse commit '%s'"
msgstr "no s'ha pogut analitzar la comissió «%s»"
-#: range-diff.c:115
+#: range-diff.c:109
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6310,70 +6749,65 @@
"no s'ha pogut analitzar la primera línia de la sortida «log»: no començava "
"amb «commit»: «%s»"
-#: range-diff.c:140
+#: range-diff.c:132
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "no s'ha pogut llegir la capçalera de la gif «%.*s»"
-#: range-diff.c:306
+#: range-diff.c:300
msgid "failed to generate diff"
msgstr "s'ha produït un error en generar el diff"
-#: range-diff.c:558
-#
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only i --right-only són mútuament excloents"
-
-#: range-diff.c:561 range-diff.c:563
+#: range-diff.c:558 range-diff.c:560
#, c-format
msgid "could not parse log for '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»"
-#: read-cache.c:708
+#: read-cache.c:737
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "no s'afegirà l'àlies «%s»: («%s» ja existeix en l'índex)"
-#: read-cache.c:724
+#: read-cache.c:753
msgid "cannot create an empty blob in the object database"
msgstr "no es pot crear un blob buit a la base de dades d'objectes"
-#: read-cache.c:746
+#: read-cache.c:775
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s: només pot afegir fitxers normals, enllaços simbòlics o directoris git"
-#: read-cache.c:751
+#: read-cache.c:780 builtin/submodule--helper.c:3359
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "«%s» no té una comissió comprovada"
-#: read-cache.c:803
+#: read-cache.c:832
#, c-format
msgid "unable to index file '%s'"
msgstr "no es pot llegir indexar el fitxer «%s»"
-#: read-cache.c:822
+#: read-cache.c:851
#, c-format
msgid "unable to add '%s' to index"
msgstr "no s'ha pogut afegir «%s» a l'índex"
-#: read-cache.c:833
+#: read-cache.c:862
#, c-format
msgid "unable to stat '%s'"
msgstr "no s'ha pogut fer «stat» a «%s»"
-#: read-cache.c:1356
+#: read-cache.c:1404
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "«%s» apareix com a fitxer i com a directori"
-#: read-cache.c:1571
+#: read-cache.c:1619
msgid "Refresh index"
msgstr "Actualitza l'índex"
-#: read-cache.c:1700
+#: read-cache.c:1751
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6382,7 +6816,7 @@
"index.version està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:1710
+#: read-cache.c:1761
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6391,155 +6825,158 @@
"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:1766
+#: read-cache.c:1817
#, c-format
msgid "bad signature 0x%08x"
msgstr "signatura malmesa 0x%08x"
-#: read-cache.c:1769
+#: read-cache.c:1820
#, c-format
msgid "bad index version %d"
msgstr "versió d'índex incorrecta %d"
-#: read-cache.c:1778
+#: read-cache.c:1829
msgid "bad index file sha1 signature"
msgstr "signatura sha1 malmesa al fitxer d'índex"
-#: read-cache.c:1812
+#: read-cache.c:1863
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "l'índex usa l'extensió %.4s, que no es pot entendre"
-#: read-cache.c:1814
+#: read-cache.c:1865
#, c-format
msgid "ignoring %.4s extension"
msgstr "s'està ignorant l'extensió %.4s"
-#: read-cache.c:1851
+#: read-cache.c:1902
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "format d'entrada d'índex desconeguda «0x%08x»"
-#: read-cache.c:1867
+#: read-cache.c:1918
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "camp del nom mal formatat l'índex, camí a prop «%s»"
-#: read-cache.c:1924
+#: read-cache.c:1975
msgid "unordered stage entries in index"
msgstr "entrades «stage» no ordenades en l'índex"
-#: read-cache.c:1927
+#: read-cache.c:1978
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "múltiples entrades «stage» per al fitxer fusionat «%s»"
-#: read-cache.c:1930
+#: read-cache.c:1981
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "entrades «stage» no ordenades per a «%s»"
-#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
+#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
+#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
+#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
+#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
+#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
-#: read-cache.c:2180
+#: read-cache.c:2240
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "no s'ha pogut crear fil «load_cache_entries»: %s"
-#: read-cache.c:2193
+#: read-cache.c:2253
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "no s'ha pogut unir al fil «load_cache_entries»: %s"
-#: read-cache.c:2226
+#: read-cache.c:2286
#, c-format
msgid "%s: index file open failed"
msgstr "%s: ha fallat l'obertura del fitxer d'índex"
-#: read-cache.c:2230
+#: read-cache.c:2290
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: no es pot fer «stat» a l'índex obert"
-#: read-cache.c:2234
+#: read-cache.c:2294
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: fitxer d'índex més petit que s'esperava"
-#: read-cache.c:2238
+#: read-cache.c:2298
#, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: no es pot mapar el fitxer d'índex"
+msgid "%s: unable to map index file%s"
+msgstr "%s: no es pot mapar el fitxer d'índex%s"
-#: read-cache.c:2280
+#: read-cache.c:2341
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "no s'ha pogut crear un fil «load_index_extensions»: %s"
-#: read-cache.c:2307
+#: read-cache.c:2368
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "no s'ha pogut unir un fil «load_index_extensions»: %s"
-#: read-cache.c:2345
+#: read-cache.c:2414
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "no s'ha pogut refrescar l'índex compartit «%s»"
-#: read-cache.c:2392
+#: read-cache.c:2473
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "índex malmès, s'esperava %s a %s, s'ha rebut %s"
-#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: read-cache.c:3032
+#, fuzzy
+msgid "cannot write split index for a sparse index"
+msgstr "no es pot escriure l'índex de divisió per a un índex dispers"
+
+#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
#, c-format
msgid "could not close '%s'"
msgstr "no s'ha pogut tancar «%s»"
-#: read-cache.c:3138
+#: read-cache.c:3157
msgid "failed to convert to a sparse-index"
msgstr "s'ha produït un error en convertir a un índex dispers"
-#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3228
#, c-format
msgid "could not stat '%s'"
msgstr "no s'ha pogut fer stat a «%s»"
-#: read-cache.c:3222
+#: read-cache.c:3241
#, c-format
msgid "unable to open git dir: %s"
msgstr "no s'ha pogut obrir el directori git: %s"
-#: read-cache.c:3234
+#: read-cache.c:3253
#, c-format
msgid "unable to unlink: %s"
msgstr "no s'ha pogut desenllaçar: %s"
-#: read-cache.c:3263
+#: read-cache.c:3282
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "no s'han pogut corregir els bits de permisos en «%s»"
-#: read-cache.c:3412
+#: read-cache.c:3439
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: no es pot baixar fins al «stage» #0"
#: rebase-interactive.c:11
msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-"Podeu arreglar-ho amb «git rebase --edit-todo» i després «git rebase --"
-"continue».\n"
+"Podeu arreglar-ho amb «git rebase --edit-todo» i després «git rebase --continue».\n"
"O bé, podeu avortar el «rebase» amb «git rebase --abort».\n"
#: rebase-interactive.c:33
@@ -6579,25 +7016,20 @@
"p, pick <comissió> = usa la comissió\n"
"r, reword <comissió> = usa la comissió, però edita el missatge de comissió\n"
"e, edit <comissió> = usa la comissió, però atura't per a esmenar-la\n"
-"s, squash <comissió> = usa la comissió, però fusiona-la a la comissió "
-"prèvia\n"
+"s, squash <comissió> = usa la comissió, però fusiona-la a la comissió prèvia\n"
"f, fixup [-C | -c] <commit> = com a «squash», però manté només el missatge\n"
" de comissió previ, a menys que s'usi -C, en aquest cas\n"
" manté només el missatge d'aquesta comissió; -c és el mateix\n"
" que -C, però obre l'editor\n"
-"x, exec <ordre> = executa l'ordre (la resta de la línia) usant "
-"l'intèrpret d'ordres\n"
-"b, break = atura't aquí (continua fent «rebase» després amb «git rebase --"
-"continue»)\n"
+"x, exec <ordre> = executa l'ordre (la resta de la línia) usant l'intèrpret d'ordres\n"
+"b, break = atura't aquí (continua fent «rebase» després amb «git rebase --continue»)\n"
"d, drop <comissió> = elimina la comissió\n"
"l, label <etiqueta> = etiqueta la HEAD actual amb un nom\n"
"t, reset <etiqueta> = reinicia HEAD a una etiqueta\n"
"m, merge [-C <comissió> | -c <comissió>] <etiqueta> [# <oneline>]\n"
". crea una comissió de fusió usant el missatge de la comissió\n"
-". de fusió original (o línia única, si no hi ha cap comissió de fusió "
-"original\n"
-". especificada). Useu -c <comissió> per a reescriure el missatge de la "
-"comissió.\n"
+". de fusió original (o línia única, si no hi ha cap comissió de fusió original\n"
+". especificada). Useu -c <comissió> per a reescriure el missatge de la comissió.\n"
"\n"
"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
@@ -6608,16 +7040,15 @@
msgstr[0] "Fes «rebase» de %s a %s (%d ordre)"
msgstr[1] "Fes «rebase» de %s a %s (%d ordres)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
"\n"
-"No elimineu cap línia. Useu «drop» explícitament per a eliminar una "
-"comissió.\n"
+"No elimineu cap línia. Useu «drop» explícitament per a eliminar una comissió.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6625,7 +7056,7 @@
"\n"
"Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6639,7 +7070,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6649,14 +7080,14 @@
"No obstant, si elimineu tot, s'avortarà el «rebase».\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
+#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
+#: builtin/rebase.c:191
#, c-format
msgid "could not write '%s'"
msgstr "no s'ha pogut escriure «%s»"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "no s'ha pogut escriure a «%s»."
@@ -6667,8 +7098,7 @@
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
-"Advertència: pot ser que algunes comissions s'hagin descartat "
-"accidentalment.\n"
+"Advertència: pot ser que algunes comissions s'hagin descartat accidentalment.\n"
"Les comissions descartades (més nova a més vella):\n"
#: rebase-interactive.c:203
@@ -6676,26 +7106,21 @@
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
-"Per a evitar aquest missatge, useu «drop» per a eliminar explícitament una "
-"comissió.\n"
+"Per a evitar aquest missatge, useu «drop» per a eliminar explícitament una comissió.\n"
"\n"
-"Useu «git config rebase.missingCommitsCheck» per a canviar el nivell "
-"d'advertències.\n"
+"Useu «git config rebase.missingCommitsCheck» per a canviar el nivell d'advertències.\n"
"Els comportaments possibles són: ignore, warn, error.\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "no s'ha pogut llegir «%s»."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: «conserva» substituït per «fusiona»"
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2057
msgid "gone"
msgstr "no hi és"
@@ -6714,259 +7139,240 @@
msgid "ahead %d, behind %d"
msgstr "davant per %d, darrere per %d"
-#: ref-filter.c:175
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format esperat: %%(color:<color>)"
-#: ref-filter.c:177
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconegut: %%(color:%s)"
-#: ref-filter.c:199
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valor enter esperat pel nom de referència:lstrip=%s"
-#: ref-filter.c:203
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valor enter esperat pel nom de referència:rstrip=%s"
-#: ref-filter.c:205
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argument %%(%s) desconegut: %s"
-#: ref-filter.c:260
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) no accepta arguments"
-#: ref-filter.c:282
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "argument %%(objectsize) no reconegut: %s"
-
-#: ref-filter.c:290
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) no accepta arguments"
-#: ref-filter.c:302
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no accepta arguments"
-#: ref-filter.c:315
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "argument %%(subject) no reconegut: %s"
-
-#: ref-filter.c:334
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
-msgstr ""
+msgstr "s'esperava %%(trailers:key=<value>)"
-#: ref-filter.c:336
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argument %%(trailers) desconegut: %s"
-#: ref-filter.c:367
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positiu esperat conté:lines=%s"
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "argument %%(contents) no reconegut: %s"
-
-#: ref-filter.c:384
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "valor positiu esperat «%s» a %%(%s)"
-#: ref-filter.c:388
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "argument no reconegut «%s» a %%(%s)"
-
-#: ref-filter.c:402
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "opció del correu electrònic no reconeguda: «%s»"
-#: ref-filter.c:432
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format esperat: %%(align:<amplada>,<posició>)"
-#: ref-filter.c:444
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "posició no reconeguda:%s"
-#: ref-filter.c:451
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "amplada no reconeguda:%s"
-#: ref-filter.c:460
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "argument %%(align) no reconegut: %s"
-
-#: ref-filter.c:468
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "amplada positiva esperada amb l'àtom %%(align)"
-#: ref-filter.c:486
+#: ref-filter.c:568
#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "argument %%(if) no reconegut: %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) no accepta arguments"
-#: ref-filter.c:588
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de camp mal format: %.*s"
-#: ref-filter.c:615
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de camp desconegut: %.*s"
-#: ref-filter.c:619
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-"no és un repositori, git però el camp «%.*s» requereix accés a les dades de "
+"no és un repositori git, però el camp «%.*s» requereix accés a les dades de "
"l'objecte"
-#: ref-filter.c:743
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "format: s'ha usat l'àtom %%(if) sense un àtom %%(then)"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format: l'àtom %%(%s) usat sense un àtom %%(%s)"
-#: ref-filter.c:807
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "format: s'ha usat l'àtom %%(then) sense un àtom %%(if)"
-
-#: ref-filter.c:809
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: s'ha usat l'àtom %%(then) més d'un cop"
-#: ref-filter.c:811
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
-#: ref-filter.c:839
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(if)"
-
-#: ref-filter.c:841
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(then)"
-
-#: ref-filter.c:843
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: s'ha usat l'àtom %%(else) més d'un cop"
-#: ref-filter.c:858
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
-#: ref-filter.c:915
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "cadena de format mal format %s"
-#: ref-filter.c:1556
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "aquesta ordre rebutja l'àtom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "no es pot usar --format=%.*s amb --python, --shell, --tcl"
+
+#: ref-filter.c:1707
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(sense branca, s'està fent «rebase» %s)"
-#: ref-filter.c:1559
-#, c-format
+#: ref-filter.c:1710
+#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(sense branca, s'està fent «rebase» d'un «HEAD» separat %s)"
-#: ref-filter.c:1562
+#: ref-filter.c:1713
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(sense branca, bisecció començada en %s)"
-#: ref-filter.c:1566
+#: ref-filter.c:1717
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD separat a %s)"
-#: ref-filter.c:1569
+#: ref-filter.c:1720
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD separat des de %s)"
-#: ref-filter.c:1572
+#: ref-filter.c:1723
msgid "(no branch)"
msgstr "(sense branca)"
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1755 ref-filter.c:1973
#, c-format
msgid "missing object %s for %s"
msgstr "manca l'objecte %s per a %s"
-#: ref-filter.c:1614
+#: ref-filter.c:1765
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer ha fallat en %s per a %s"
-#: ref-filter.c:1997
+#: ref-filter.c:2156
#, c-format
msgid "malformed object at '%s'"
msgstr "objecte mal format a «%s»"
-#: ref-filter.c:2086
+#: ref-filter.c:2246
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "s'està ignorant la referència amb nom malmès %s"
-#: ref-filter.c:2091 refs.c:676
+#: ref-filter.c:2251 refs.c:672
#, c-format
msgid "ignoring broken ref %s"
-msgstr "s'està ignorant la referència trencada %s"
+msgstr "s'està ignorant la referència malmesa %s"
-#: ref-filter.c:2431
+#: ref-filter.c:2630
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: manca l'àtom %%(end)"
-#: ref-filter.c:2525
+#: ref-filter.c:2741
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objecte %s mal format"
-#: ref-filter.c:2530
+#: ref-filter.c:2746
#, c-format
msgid "option `%s' must point to a commit"
msgstr "l'opció «%s» ha d'apuntar a una comissió"
-#: refs.c:264
+#: reflog.c:407
+#, c-format
+msgid "not a reflog: %s"
+msgstr "no és un registre de referència: %s"
+
+#: reflog.c:410
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "cap registre de referència per a «%s»"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s no apunta a un objecte vàlid"
-#: refs.c:566
+#: refs.c:561
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6980,33 +7386,43 @@
"\n"
"\tgit branch -m <name>\n"
msgstr ""
+"S'està utilitzant «%s» com a nom de la branca inicial. Aquest nom de branca\n"
+"per defecte es pot canviar. Per a configurar el nom inicial de la branca que\n"
+"s'utilitzarà en tots els repositoris nous, i que suprimirà aquest avís, useu:\n"
+"\n"
+"\tgit config --global init.defaultBranch <nom>\n"
+"\n"
+"Els noms més usats habitualment en lloc de «master» són «main», «trunk» i\n"
+"«development». La branca acabada de crear es pot canviar de nom amb l'ordre:\n"
+"\n"
+"\tgit branch -m <nom>\n"
-#: refs.c:588
+#: refs.c:583
#, c-format
msgid "could not retrieve `%s`"
msgstr "no s'ha pogut recuperar «%s»"
-#: refs.c:598
+#: refs.c:593
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "nom de branca no vàlida: %s = %s"
-#: refs.c:674
+#: refs.c:670
#, c-format
msgid "ignoring dangling symref %s"
msgstr "s'està ignorant symref penjant %s"
-#: refs.c:922
+#: refs.c:919
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "registre per a ref %s té un buit després de %s"
-#: refs.c:929
-#, , c-format
+#: refs.c:926
+#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "registre per als ref %s ha acabat inesperadament a %s"
-#: refs.c:994
+#: refs.c:991
#, c-format
msgid "log for %s is empty"
msgstr "el registre per a %s és buit"
@@ -7016,46 +7432,46 @@
msgid "refusing to update ref with bad name '%s'"
msgstr "s'està refusant la referència amb nom malmès «%s»"
-#: refs.c:1157
+#: refs.c:1164
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "ha fallat update_ref per a la ref «%s»: %s"
-#: refs.c:2051
+#: refs.c:2059
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "no es permeten múltiples actualitzacions per a la referència «%s»"
-#: refs.c:2131
+#: refs.c:2145
msgid "ref updates forbidden inside quarantine environment"
msgstr "no està permès actualitzar les referències en un entorn de quarantena"
-#: refs.c:2142
+#: refs.c:2156
msgid "ref updates aborted by hook"
msgstr "les actualitzacions de referències s'han avortat per un lligam"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2264 refs.c:2294
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "«%s» existeix; no es pot crear «%s»"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2270 refs.c:2305
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "no es poden processar «%s» i «%s» a la vegada"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1295
#, c-format
msgid "could not remove reference %s"
msgstr "no s'ha pogut eliminar la referència %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1310 refs/packed-backend.c:1565
+#: refs/packed-backend.c:1575
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no s'ha pogut suprimir la referència %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1313 refs/packed-backend.c:1578
#, c-format
msgid "could not delete references: %s"
msgstr "no s'han pogut suprimir les referències: %s"
@@ -7065,60 +7481,61 @@
msgid "invalid refspec '%s'"
msgstr "refspec no vàlida: «%s»"
-#: remote.c:351
-#, fuzzy, c-format
+#: remote.c:402
+#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
-msgstr "config remote abreviation no pot començar amb «/»: %s"
+msgstr ""
+"l'abreviatura del fitxer de configuració remot no pot començar amb «/»: %s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "més d'un paquet de recepció donat, usant el primer"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "més d'un paquet de càrrega donat, usant el primer"
-#: remote.c:590
+#: remote.c:698
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "No es poden obtenir ambdós %s i %s a %s"
-#: remote.c:594
+#: remote.c:702
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s generalment segueix %s, no %s"
-#: remote.c:598
+#: remote.c:706
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s segueix ambdós %s i %s"
-#: remote.c:666
+#: remote.c:774
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "la clau «%s» del patró no té «*»"
-#: remote.c:676
+#: remote.c:784
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "el valor «%s» del patró no té «*»"
-#: remote.c:1083
+#: remote.c:1191
#, c-format
msgid "src refspec %s does not match any"
msgstr "l'especificació de referència src %s no coincideix amb cap referència"
-#: remote.c:1088
+#: remote.c:1196
#, c-format
msgid "src refspec %s matches more than one"
-msgstr "l'especificació de referència de src %s coincideix amb més d'una referència"
+msgstr ""
+"l'especificació de referència de src %s coincideix amb més d'una referència"
#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
-#.
-#: remote.c:1103
-#, fuzzy, c-format
+#: remote.c:1211
+#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"starting with \"refs/\"). We tried to guess what you meant by:\n"
@@ -7130,13 +7547,17 @@
"\n"
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-"La destinació que heu proporcionat no és un nom de referència complet (és a "
-"dir començant per \"refs/\"). Hem intentat endevinar el que voleu dir amb - "
-"Buscant una referència que coincideixi amb '%s' al costat remot. - Comprovar "
-"si el <src> ser empès ('%s') és una referència a \"refs/{headtags}/\". Si és "
-"així afegirem un refs/{headstags que no ha funcionat completament."
+"La destinació que heu proporcionat no és un nom de referència complet\n"
+"(p. ex., que comenci amb «refs/»). Hem intentat deduir el que voleu dir:\n"
+"\n"
+"- Buscant una referència que coincideixi amb «%s» al costat remot.\n"
+"- Comprovant si el <src> que s'ha pujat («%s»)\n"
+" és una referència «refs/{heads,tags}/». Si és així, afegim el prefix\n"
+" refs/{heads,tags}/ corresponent al costat remot.\n"
+"\n"
+"Res d'això ha funcionat. Cal que proporcioneu una referència completa."
-#: remote.c:1123
+#: remote.c:1231
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -7147,7 +7568,7 @@
"Voleu crear una branca nova empenyent a\n"
"«%s:refs/heads/%s»?"
-#: remote.c:1128
+#: remote.c:1236
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -7157,7 +7578,7 @@
"La part <src> de l'especificació de la referència és un objecte d'etiqueta.\n"
"Voleu crear una etiqueta pujant-la a «%srefs/tags/%s»?"
-#: remote.c:1133
+#: remote.c:1241
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -7167,7 +7588,7 @@
"La part <src> de l'especificació de la referència és un objecte d'arbre.\n"
"Voleu crear una etiqueta pujant-la a «%srefs/tags/%s»?"
-#: remote.c:1138
+#: remote.c:1246
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -7175,118 +7596,121 @@
"'%s:refs/tags/%s'?"
msgstr ""
"La part <src> de l'especificació de la referència és un objecte blob.\n"
-"Voleu posar una etiqueta al blob nou mitjançant la pujada a\n?"
-"«%s:refs/tags/%s»?"
+"Voleu posar una etiqueta al blob nou mitjançant la pujada a\n"
+"?«%s:refs/tags/%s»?"
-#: remote.c:1174
+#: remote.c:1282
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "«%s» no es pot resoldre a una branca"
-#: remote.c:1185
+#: remote.c:1293
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "no s'ha pogut suprimir «%s»: la referència remota no existeix"
-#: remote.c:1197
+#: remote.c:1305
#, c-format
msgid "dst refspec %s matches more than one"
-msgstr "l'especificació de la referència dst %s coincideixen amb més d'una referència"
+msgstr ""
+"l'especificació de la referència dst %s coincideixen amb més d'una "
+"referència"
-#: remote.c:1204
+#: remote.c:1312
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "l'especificació de la referència dst %s rep més d'una referència src"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1833 remote.c:1940
msgid "HEAD does not point to a branch"
msgstr "HEAD no assenyala cap branca"
-#: remote.c:1733
+#: remote.c:1842
#, c-format
msgid "no such branch: '%s'"
msgstr "no existeix la branca: «%s»"
-#: remote.c:1736
+#: remote.c:1845
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "cap font configurada per a la branca «%s»"
-#: remote.c:1742
+#: remote.c:1851
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
-#: remote.c:1757
+#: remote.c:1866
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-"el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot"
+"el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment "
+"remot"
-#: remote.c:1769
+#: remote.c:1881
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branca «%s» no té cap remot al qual pujar"
-#: remote.c:1779
+#: remote.c:1891
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
-msgstr "les especificacions de referència de «%s» no inclouen «%s»"
+msgstr "les especificacions de referència de pujada «%s» no inclouen «%s»"
-#: remote.c:1792
+#: remote.c:1904
msgid "push has no destination (push.default is 'nothing')"
msgstr "push no té destí (push.default és «nothing»)"
-#: remote.c:1814
+#: remote.c:1926
msgid "cannot resolve 'simple' push to a single destination"
msgstr "no es pot resoldre una pujada «simple» a un sol destí"
-#: remote.c:1943
+#: remote.c:2059
#, c-format
msgid "couldn't find remote ref %s"
msgstr "no s'ha pogut trobar la referència remota %s"
-#: remote.c:1956
+#: remote.c:2072
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* S'estan ignorant les referències «%s» localment"
-#: remote.c:2119
+#: remote.c:2235
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "La vostra branca està basada en «%s», però la font no hi és.\n"
-#: remote.c:2123
+#: remote.c:2239
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (useu «git branch --unset-upstream» per a arreglar-ho)\n"
-#: remote.c:2126
+#: remote.c:2242
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "La vostra branca està al dia amb «%s».\n"
-#: remote.c:2130
+#: remote.c:2246
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n"
-#: remote.c:2133
+#: remote.c:2249
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (useu «%s» per a detalls)\n"
-#: remote.c:2137
+#: remote.c:2253
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "La vostra branca està %2$d comissió per davant de «%1$s».\n"
msgstr[1] "La vostra branca està %2$d comissions per davant de «%1$s».\n"
-#: remote.c:2143
+#: remote.c:2259
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (useu «git push» per a publicar les vostres comissions locals)\n"
-#: remote.c:2146
+#: remote.c:2262
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -7298,11 +7722,11 @@
"La vostra branca està %2$d comissions per darrere de «%1$s», i pot avançar-"
"se ràpidament.\n"
-#: remote.c:2154
+#: remote.c:2270
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (useu «git pull» per a actualitzar la vostra branca local)\n"
-#: remote.c:2157
+#: remote.c:2273
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -7317,11 +7741,11 @@
"La vostra branca i «%s» han divergit,\n"
"i tenen %d i %d comissions distintes cada una, respectivament.\n"
-#: remote.c:2167
+#: remote.c:2283
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (useu «git pull» per a fusionar la branca remota amb la vostra)\n"
-#: remote.c:2359
+#: remote.c:2475
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "no es pot analitzar el nom de l'objecte esperat «%s»"
@@ -7354,130 +7778,121 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "s'han produït errors en escriure «%s» (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr "no s'ha pogut buidar «%s»"
-#: rerere.c:487 rerere.c:1023
+#: rerere.c:487 rerere.c:1024
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "no s'han pogut analitzar els pedaços en conflicte a «%s»"
-#: rerere.c:668
+#: rerere.c:669
#, c-format
msgid "failed utime() on '%s'"
msgstr "s'ha produït un error en fer «failed utime()» a «%s»"
-#: rerere.c:678
+#: rerere.c:679
#, c-format
msgid "writing '%s' failed"
msgstr "s'ha produït un error en escriure «%s»"
-#: rerere.c:698
+#: rerere.c:699
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "«Staged» «%s» utilitzant una resolució anterior."
-#: rerere.c:737
+#: rerere.c:738
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "Es recorda la resolució per a «%s»."
-#: rerere.c:772
+#: rerere.c:773
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "S'ha resolt «%s» usant una resolució anterior."
-#: rerere.c:787
+#: rerere.c:788
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "no es pot desenllaçar «%s» (extraviat)"
-#: rerere.c:791
+#: rerere.c:792
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "Imatge prèvia registrada per a «%s»"
-#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
+#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
#, c-format
msgid "could not create directory '%s'"
msgstr "no s'ha pogut crear el directori «%s»"
-#: rerere.c:1041
+#: rerere.c:1042
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "ha fallat en actualitzar l'estat en conflicte a «%s»"
-#: rerere.c:1052 rerere.c:1059
+#: rerere.c:1053 rerere.c:1060
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "no hi ha cap resolució recordada per a «%s»"
-#: rerere.c:1061
+#: rerere.c:1062
#, c-format
msgid "cannot unlink '%s'"
msgstr "no es pot fer «unlink» de «%s»"
-#: rerere.c:1071
+#: rerere.c:1072
#, c-format
msgid "Updated preimage for '%s'"
msgstr "Imatge prèvia actualitzada per a «%s»"
-#: rerere.c:1080
+#: rerere.c:1081
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "S'ha oblidat la resolució per a «%s»\n"
-#: rerere.c:1191
+#: rerere.c:1192
msgid "unable to open rr-cache directory"
msgstr "no s'ha pogut obrir el directori rr-cache"
-#: reset.c:42
+#: reset.c:112
msgid "could not determine HEAD revision"
msgstr "no s'ha pogut determinar la revisió de HEAD"
-#: reset.c:70 reset.c:76 sequencer.c:3669
+#: reset.c:141 reset.c:147 sequencer.c:3696
#, c-format
msgid "failed to find tree of %s"
msgstr "s'ha produït un error en cercar l'arbre de %s"
-#: revision.c:2343
+#: revision.c:2358
msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<packfile> ja no s'ha admet"
+msgstr "--unpacked=<packfile> ja no s'admet"
-#: revision.c:2683
+#: revision.c:2712
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla malmesa"
-#: revision.c:2686
+#: revision.c:2715
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "la branca actual «%s» encara no té cap comissió"
-#: revision.c:2892
+#: revision.c:2901
+msgid "object filtering requires --objects"
+msgstr "el filtratge d'objectes requereix --objects"
+
+#: revision.c:2918
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L no és encara compatible amb formats que no siguin «-p» o «-s»"
-#: run-command.c:767
-msgid "open /dev/null failed"
-msgstr "s'ha produït un error en obrir /dev/null"
-
-#: run-command.c:1275
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "no s'ha pogut crear fil «async»: %s"
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"El lligam «%s» s'ha ignorat perquè no s'ha establert com a executable.\n"
-"Podeu desactivar aquest avís amb «git config advice.ignoredHook false»."
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
@@ -7498,71 +7913,74 @@
msgid "failed to sign the push certificate"
msgstr "s'ha produït un error en signar el certificat de pujada"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack: no es pot bifurcar obtenint un subprocés"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr ""
+"ha fallat la negociació de la pujada; s'està procedint igualment amb "
+"l'empenta"
-#: send-pack.c:52
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
-msgstr "el receptor de destí no admet l'algorisme d'hash del repositori"
+msgstr "el receptor de destí no admet l'algorisme de hash del repositori"
-#: send-pack.c:529
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "el destí receptor no admet pujar --signed"
-#: send-pack.c:531
+#: send-pack.c:539
msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+"not sending a push certificate since the receiving end does not support "
+"--signed push"
msgstr ""
"no s'està enviant una certificació de pujada perquè el destí receptor no "
"admet pujar --signed"
-#: send-pack.c:543
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "el destí receptor no admet pujar --atomic"
-#: send-pack.c:548
+#: send-pack.c:551
msgid "the receiving end does not support push options"
-msgstr "el destí receptor no admet opcions de pujada"
+msgstr "el receptor al destí no admet opcions de pujada"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mode de neteja «%s» no vàlid en la comissió del missatge"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "no s'ha pogut suprimir «%s»"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "no s'ha pogut eliminar «%s»"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "revertir"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "acció desconeguda: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7570,119 +7988,146 @@
"després de resoldre els conflictes, marqueu els camins\n"
"corregits amb «git add <camins>» o «git rm <camins>»"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"després de resoldre els conflictes, marqueu els camins\n"
-"corregits amb «git add <camins>» o «git rm <camins>»\n"
-"i cometeu el resultat amb «git commit»"
+"Després de resoldre els conflictes, marqueu-los amb\n"
+"«git add/rm <pathspec>», llavors executeu\n"
+"«git cherry-pick --continue».\n"
+"Podeu també ometre aquesta comissió amb «git cherry-pick --skip».\n"
+"Per a interrompre i tornar a l'estat anterior abans de «git cherry-pick»,\n"
+"executeu «git cherry-pick --abort»."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Després de resoldre els conflictes, marqueu-los amb\n"
+"«git add/rm <pathspec>», llavors executeu\n"
+"«git revert --continue».\n"
+"Podeu també ometre aquesta comissió amb «git revert --skip».\n"
+"Per a interrompre i tornar a l'estat anterior abans de «git revert»,\n"
+"executeu «git revert --abort»."
+
+#: sequencer.c:448 sequencer.c:3288
#, c-format
msgid "could not lock '%s'"
msgstr "no s'ha pogut bloquejar «%s»"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
+#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
#, c-format
msgid "could not write to '%s'"
msgstr "no s'ha pogut escriure a «%s»"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3565
#, c-format
msgid "failed to finalize '%s'"
msgstr "s'ha produït un error en finalitzar «%s»"
-#: sequencer.c:486
+#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
+#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
+#, c-format
+msgid "could not read '%s'"
+msgstr "no s'ha pogut llegir «%s»"
+
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "els vostres canvis locals se sobreescriurien per %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avanç ràpid"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:615
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de neteja no vàlid %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
-#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "no s'ha pogut actualitzar l'arbre cau"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "no s'ha pogut resoldre la comissió HEAD"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "no hi ha una clau a «%.*s»"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "no s'han pogut treure les cometes del valor de «%s»"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
+#: builtin/am.c:849 builtin/rebase.c:699
#, c-format
msgid "could not open '%s' for reading"
msgstr "no s'ha pogut obrir «%s» per a lectura"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "variable «%s» desconeguda"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "falta «GIT_AUTHOR_NAME»"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "falta «GIT_AUTHOR_EMAIL»"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "falta «GIT_AUTHOR_DATE»"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7699,8 +8144,7 @@
" git rebase --continue\n"
msgstr ""
"teniu canvis «staged» en el vostre arbre de treball\n"
-"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, "
-"executeu:\n"
+"Si aquests canvis estan pensats per a fer «squash» a la comissió prèvia, executeu:\n"
"\n"
" git commit --amend %s\n"
"\n"
@@ -7712,11 +8156,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr "el lligam «prepare-commit-msg» ha fallat"
-#: sequencer.c:1218
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7734,7 +8178,7 @@
"automàticament basant-se en el vostre nom d'usuari i nom de màquina. \n"
"Comproveu que siguin correctes. Podeu suprimir aquest\n"
"missatge establint-los explícitament. Executeu l'ordre següent i\n"
-"seguiu les instruccions en el vostre editor per editar el vostre\n"
+"seguiu les instruccions en l'editor per a editar el vostre\n"
"fitxer de configuració:\n"
"\n"
" git config --global --edit\n"
@@ -7743,7 +8187,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7769,343 +8213,344 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1287
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
-#: sequencer.c:1275
+#: sequencer.c:1289
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
-#: sequencer.c:1321
+#: sequencer.c:1336
msgid "unable to resolve HEAD after creating commit"
msgstr "no s'ha pogut resoldre HEAD després de crear la comissió"
-#: sequencer.c:1323
+#: sequencer.c:1338
msgid "detached HEAD"
msgstr "HEAD separat"
-#: sequencer.c:1327
+#: sequencer.c:1342
msgid " (root-commit)"
msgstr " (comissió arrel)"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "could not parse HEAD"
msgstr "no s'ha pogut analitzar HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1365
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s no és una comissió!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1425 sequencer.c:2310
msgid "unable to parse commit author"
msgstr "no s'ha pogut analitzar l'autor de la comissió"
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1469 sequencer.c:1589
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1500 sequencer.c:1532
#, c-format
msgid "invalid author identity '%s'"
msgstr "identitat d'autor no vàlida: «%s»"
-#: sequencer.c:1491
+#: sequencer.c:1506
msgid "corrupt author: missing date information"
msgstr "autor malmès: falta la informació de la data"
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821
+#: builtin/merge.c:921 builtin/merge.c:946 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "s'ha produït un error en escriure l'objecte de comissió"
-#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
+#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: sequencer.c:1606
+#: sequencer.c:1621
#, c-format
msgid "could not parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: sequencer.c:1611
+#: sequencer.c:1626
#, c-format
msgid "could not parse parent commit %s"
msgstr "no s'ha pogut analitzar la comissió pare %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1709 sequencer.c:1990
#, c-format
msgid "unknown command: %d"
msgstr "ordre desconeguda: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1751
msgid "This is the 1st commit message:"
msgstr "Aquest és el 1r missatge de comissió:"
-#: sequencer.c:1737
+#: sequencer.c:1752
#, c-format
msgid "This is the commit message #%d:"
msgstr "Aquest és el missatge de comissió #%d:"
-#: sequencer.c:1738
+#: sequencer.c:1753
msgid "The 1st commit message will be skipped:"
msgstr "El primer missatge de comissió s'ometrà:"
-#: sequencer.c:1739
+#: sequencer.c:1754
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El missatge de comissió núm. #%d s'ometrà:"
-#: sequencer.c:1740
+#: sequencer.c:1755
#, c-format
msgid "This is a combination of %d commits."
msgstr "Això és una combinació de %d comissions."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1902 sequencer.c:1959
#, c-format
msgid "cannot write '%s'"
msgstr "no es pot escriure «%s»"
-#: sequencer.c:1934
+#: sequencer.c:1949
msgid "need a HEAD to fixup"
-msgstr "cal un HEAD per reparar-ho"
+msgstr "cal un HEAD per a reparar-ho"
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1951 sequencer.c:3592
msgid "could not read HEAD"
msgstr "no s'ha pogut llegir HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1953
msgid "could not read HEAD's commit message"
msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
-#: sequencer.c:1962
+#: sequencer.c:1977
#, c-format
msgid "could not read commit message of %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: sequencer.c:2072
+#: sequencer.c:2087
msgid "your index file is unmerged."
msgstr "el vostre fitxer d'índex està sense fusionar."
-#: sequencer.c:2079
+#: sequencer.c:2094
msgid "cannot fixup root commit"
msgstr "no es pot arreglar la comissió arrel"
-#: sequencer.c:2098
+#: sequencer.c:2113
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2121 sequencer.c:2129
#, c-format
msgid "commit %s does not have parent %d"
msgstr "la comissió %s no té pare %d"
-#: sequencer.c:2120
+#: sequencer.c:2135
#, c-format
msgid "cannot get commit message for %s"
msgstr "no es pot obtenir el missatge de comissió de %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2154
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no es pot analitzar la comissió pare %s"
-#: sequencer.c:2205
+#: sequencer.c:2220
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
-#: sequencer.c:2265
+#: sequencer.c:2280
#, c-format
msgid "could not revert %s... %s"
msgstr "no s'ha pogut revertir %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2281
#, c-format
msgid "could not apply %s... %s"
msgstr "no s'ha pogut aplicar %s... %s"
-#: sequencer.c:2287
-#, fuzzy, c-format
+#: sequencer.c:2302
+#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr ""
-"deixant anar per cents per cents -- el contingut del pedaç ja s'ha avançat"
+msgstr "descartant %s %s -- el contingut del pedaç ja està a la font\n"
-#: sequencer.c:2345
+#: sequencer.c:2360
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: s'ha produït un error en llegir l'índex"
-#: sequencer.c:2352
+#: sequencer.c:2368
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: s'ha produït un error en actualitzar l'índex"
-#: sequencer.c:2425
+#: sequencer.c:2448
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s no accepta arguments: «%s»"
-#: sequencer.c:2434
+#: sequencer.c:2457
#, c-format
msgid "missing arguments for %s"
msgstr "falten els arguments per a %s"
-#: sequencer.c:2477
+#: sequencer.c:2500
#, c-format
msgid "could not parse '%s'"
msgstr "no s'ha pogut analitzar «%s»"
-#: sequencer.c:2538
+#: sequencer.c:2561
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línia no vàlida %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2572
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "no es pot «%s» sense una comissió prèvia"
-#: sequencer.c:2635
+#: sequencer.c:2620 builtin/rebase.c:185
+#, c-format
+msgid "could not read '%s'."
+msgstr "no s'ha pogut llegir «%s»."
+
+#: sequencer.c:2658
msgid "cancelling a cherry picking in progress"
msgstr "s'està cancel·lant un «cherry pick» en curs"
-#: sequencer.c:2644
+#: sequencer.c:2667
msgid "cancelling a revert in progress"
msgstr "s'està cancel·lant la reversió en curs"
-#: sequencer.c:2690
+#: sequencer.c:2707
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "corregiu-ho usant «git rebase --edit-todo»."
-#: sequencer.c:2692
+#: sequencer.c:2709
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "full d'instruccions inusable: «%s»"
-#: sequencer.c:2697
+#: sequencer.c:2714
msgid "no commits parsed."
msgstr "no s'ha analitzat cap comissió."
-#: sequencer.c:2708
+#: sequencer.c:2725
msgid "cannot cherry-pick during a revert."
msgstr "no es pot fer «cherry pick» durant una reversió."
-#: sequencer.c:2710
+#: sequencer.c:2727
msgid "cannot revert during a cherry-pick."
msgstr "no es pot revertir durant un «cherry pick»."
-#: sequencer.c:2788
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "valor no vàlid per a %s: %s"
-
-#: sequencer.c:2897
+#: sequencer.c:2914
msgid "unusable squash-onto"
msgstr "«squash-onto» no usable"
-#: sequencer.c:2917
+#: sequencer.c:2934
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "full d'opcions mal format: «%s»"
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3029 sequencer.c:4875
msgid "empty commit set passed"
msgstr "conjunt de comissions buit passat"
-#: sequencer.c:3029
+#: sequencer.c:3046
msgid "revert is already in progress"
msgstr "una reversió ja està en curs"
-#: sequencer.c:3031
+#: sequencer.c:3048
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "intenteu «git revert (--continue | %s--abort | --quit)»"
-#: sequencer.c:3034
+#: sequencer.c:3051
msgid "cherry-pick is already in progress"
msgstr "un «cherry pick» ja està en curs"
-#: sequencer.c:3036
+#: sequencer.c:3053
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "intenteu «git cherry-pick (--continue | %s--abort | --quit)»"
-#: sequencer.c:3050
+#: sequencer.c:3067
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
-#: sequencer.c:3065
+#: sequencer.c:3082
msgid "could not lock HEAD"
msgstr "no s'ha pogut bloquejar HEAD"
-#: sequencer.c:3125 sequencer.c:4582
+#: sequencer.c:3142 sequencer.c:4585
msgid "no cherry-pick or revert in progress"
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3144 sequencer.c:3155
msgid "cannot resolve HEAD"
msgstr "no es pot resoldre HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3146 sequencer.c:3190
msgid "cannot abort from a branch yet to be born"
msgstr "no es pot avortar des d'una branca que encara ha de nàixer"
-#: sequencer.c:3159 builtin/grep.c:759
+#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
+#: builtin/grep.c:774
#, c-format
msgid "cannot open '%s'"
msgstr "no es pot obrir «%s»"
-#: sequencer.c:3161
+#: sequencer.c:3178
#, c-format
msgid "cannot read '%s': %s"
msgstr "no es pot llegir «%s»: %s"
-#: sequencer.c:3162
+#: sequencer.c:3179
msgid "unexpected end of file"
msgstr "final de fitxer inesperat"
-#: sequencer.c:3168
+#: sequencer.c:3185
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès"
-#: sequencer.c:3179
+#: sequencer.c:3196
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD"
-#: sequencer.c:3220
+#: sequencer.c:3237
msgid "no revert in progress"
msgstr "no hi ha cap reversió en curs"
-#: sequencer.c:3229
+#: sequencer.c:3246
msgid "no cherry-pick in progress"
msgstr "ni hi ha cap «cherry pick» en curs"
-#: sequencer.c:3239
+#: sequencer.c:3256
msgid "failed to skip the commit"
msgstr "s'ha produït un error en ometre la comissió"
-#: sequencer.c:3246
+#: sequencer.c:3263
msgid "there is nothing to skip"
msgstr "no hi ha res a ometre"
-#: sequencer.c:3249
+#: sequencer.c:3266
#, c-format
msgid ""
"have you committed already?\n"
@@ -8114,16 +8559,16 @@
"heu fet ja una comissió?\n"
"proveu «git %s --continue»"
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3428 sequencer.c:4476
msgid "cannot read HEAD"
msgstr "no es pot llegir HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3445
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "no s'ha pogut copiar «%s» a «%s»"
-#: sequencer.c:3436
+#: sequencer.c:3453
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8142,27 +8587,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3463
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "No s'ha pogut aplicar %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3470
#, c-format
msgid "Could not merge %.*s"
msgstr "No s'ha pogut fusionar %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no s'ha pogut copiar «%s» a «%s»"
-#: sequencer.c:3483
+#: sequencer.c:3499
#, c-format
msgid "Executing: %s\n"
msgstr "S'està executant: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3510
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8177,11 +8622,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3516
msgid "and made changes to the index and/or the working tree\n"
msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n"
-#: sequencer.c:3510
+#: sequencer.c:3522
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8197,92 +8642,91 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3571
+#: sequencer.c:3582
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom d'etiqueta no permès: «%.*s»"
-#: sequencer.c:3625
+#: sequencer.c:3655
msgid "writing fake root commit"
msgstr "s'està escrivint una comissió arrel falsa"
-#: sequencer.c:3630
+#: sequencer.c:3660
msgid "writing squash-onto"
msgstr "s'està escrivint «squash-onto»"
-#: sequencer.c:3714
+#: sequencer.c:3739
#, c-format
msgid "could not resolve '%s'"
msgstr "no s'ha pogut resoldre «%s»"
-#: sequencer.c:3747
+#: sequencer.c:3771
msgid "cannot merge without a current revision"
msgstr "no es pot fusionar sense una revisió actual"
-#: sequencer.c:3769
+#: sequencer.c:3793
#, c-format
msgid "unable to parse '%.*s'"
msgstr "no s'ha pogut analitzar «%.*s»"
-#: sequencer.c:3778
+#: sequencer.c:3802
#, c-format
msgid "nothing to merge: '%.*s'"
-msgstr "no hi ha res per fusionar «%.*s»"
+msgstr "no hi ha res per a fusionar «%.*s»"
-#: sequencer.c:3790
-#, fuzzy
+#: sequencer.c:3814
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-"no es pot executar la fusió del pop a la part superior d'una [arrel nova]"
+"no es pot executar la fusió «octopus» a la part superior d'una [arrel nova]"
-#: sequencer.c:3806
+#: sequencer.c:3869
#, c-format
msgid "could not get commit message of '%s'"
msgstr "no s'ha pogut llegir el missatge de comissió de «%s»"
-#: sequencer.c:3989
+#: sequencer.c:4013
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "no s'ha pogut fusionar «%.*s»"
-#: sequencer.c:4005
+#: sequencer.c:4029
msgid "merge: Unable to write new index file"
msgstr "fusió: no s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:4079
+#: sequencer.c:4110
msgid "Cannot autostash"
-msgstr "no es pot fer un «stash» automàticament"
+msgstr "No es pot fer un «stash» automàticament"
-#: sequencer.c:4082
+#: sequencer.c:4113
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Resposta de «stash» inesperada: «%s»"
-#: sequencer.c:4088
+#: sequencer.c:4119
#, c-format
msgid "Could not create directory for '%s'"
msgstr "No s'ha pogut crear el directori per a «%s»"
-#: sequencer.c:4091
+#: sequencer.c:4122
#, c-format
msgid "Created autostash: %s\n"
msgstr "S'ha creat un «stash» automàticament: %s\n"
-#: sequencer.c:4095
+#: sequencer.c:4124
msgid "could not reset --hard"
msgstr "no s'ha pogut fer reset --hard"
-#: sequencer.c:4120
+#: sequencer.c:4148
#, c-format
msgid "Applied autostash.\n"
msgstr "S'ha aplicat el «stash» automàticament.\n"
-#: sequencer.c:4132
+#: sequencer.c:4160
#, c-format
msgid "cannot store %s"
msgstr "no es pot emmagatzemar %s"
-#: sequencer.c:4135
+#: sequencer.c:4163
#, c-format
msgid ""
"%s\n"
@@ -8293,30 +8737,30 @@
"Els vostres canvis estan segurs en el «stash».\n"
"Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n"
-#: sequencer.c:4140
+#: sequencer.c:4168
msgid "Applying autostash resulted in conflicts."
msgstr "L'aplicació del «stash» automàticament ha donat conflictes."
-#: sequencer.c:4141
+#: sequencer.c:4169
msgid "Autostash exists; creating a new stash entry."
msgstr ""
"El «stash» automàtic ja existeix; s'està creant una entrada «stash» nova."
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4225
msgid "could not detach HEAD"
msgstr "no s'ha pogut separar HEAD"
-#: sequencer.c:4249
+#: sequencer.c:4240
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Aturat a HEAD\n"
-#: sequencer.c:4251
+#: sequencer.c:4242
#, c-format
msgid "Stopped at %s\n"
msgstr "Aturat a %s\n"
-#: sequencer.c:4259
+#: sequencer.c:4274
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8331,64 +8775,64 @@
"No s'ha pogut executar l'ordre «todo»\n"
"\n"
" %.*s\n"
-"S'ha reprogramat; per editar l'ordre abans de continuar, editeu primer\n"
+"S'ha reprogramat; per a editar l'ordre abans de continuar, editeu primer\n"
"la llista de tasques pendents:\n"
"\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4305
+#: sequencer.c:4320
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "S'està fent «rebase» (%d/%d)%s"
-#: sequencer.c:4351
+#: sequencer.c:4366
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Aturat a %s... %.*s\n"
-#: sequencer.c:4422
+#: sequencer.c:4436
#, c-format
msgid "unknown command %d"
msgstr "ordre %d desconeguda"
-#: sequencer.c:4481
+#: sequencer.c:4484
msgid "could not read orig-head"
msgstr "no s'ha pogut llegir orig-head"
-#: sequencer.c:4486
+#: sequencer.c:4489
msgid "could not read 'onto'"
msgstr "no s'ha pogut llegir «onto»"
-#: sequencer.c:4500
+#: sequencer.c:4503
#, c-format
msgid "could not update HEAD to %s"
msgstr "no s'ha pogut actualitzar HEAD a %s"
-#: sequencer.c:4560
+#: sequencer.c:4563
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "S'ha fet «rebase» i actualitzat %s amb èxit.\n"
-#: sequencer.c:4612
+#: sequencer.c:4615
msgid "cannot rebase: You have unstaged changes."
-msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
+msgstr "no es pot fer «rebase»: teniu canvis «unstaged»."
-#: sequencer.c:4621
+#: sequencer.c:4624
msgid "cannot amend non-existing commit"
msgstr "no es pot esmenar una comissió no existent"
-#: sequencer.c:4623
+#: sequencer.c:4626
#, c-format
msgid "invalid file: '%s'"
msgstr "fitxer no vàlid: «%s»"
-#: sequencer.c:4625
+#: sequencer.c:4628
#, c-format
msgid "invalid contents: '%s'"
msgstr "contingut no vàlid: «%s»"
-#: sequencer.c:4628
+#: sequencer.c:4631
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8398,86 +8842,93 @@
"Teniu canvis no comesos en el vostre arbre de treball. \n"
"Cometeu-los primer i després executeu «git rebase --continue» de nou."
-#: sequencer.c:4664 sequencer.c:4703
+#: sequencer.c:4667 sequencer.c:4706
#, c-format
msgid "could not write file: '%s'"
msgstr "no s'ha pogut escriure el fitxer: «%s»"
-#: sequencer.c:4719
+#: sequencer.c:4722
msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
+msgstr "no s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:4726
+#: sequencer.c:4732
msgid "could not commit staged changes."
msgstr "no s'han pogut cometre els canvis «staged»."
-#: sequencer.c:4846
+#: sequencer.c:4852
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no es pot fer «cherry pick» a %s"
-#: sequencer.c:4850
+#: sequencer.c:4856
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisió incorrecta"
-#: sequencer.c:4885
+#: sequencer.c:4891
msgid "can't revert as initial commit"
msgstr "no es pot revertir com a comissió inicial"
-#: sequencer.c:5362
+#: sequencer.c:5162 sequencer.c:5391
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "omet les comissions aplicades anteriorment %s"
+
+#: sequencer.c:5232 sequencer.c:5407
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "useu --reapply-cherry-picks per a incloure les comissions omeses"
+
+#: sequencer.c:5378
msgid "make_script: unhandled options"
msgstr "make_script: opcions no gestionades"
-#: sequencer.c:5365
+#: sequencer.c:5381
msgid "make_script: error preparing revisions"
msgstr "make_script: s'ha produït un error en preparar les revisions"
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5639 sequencer.c:5656
msgid "nothing to do"
msgstr "res a fer"
-#: sequencer.c:5651
+#: sequencer.c:5675
msgid "could not skip unnecessary pick commands"
msgstr "no s'han pogut ometre les ordres «picks» no necessàries"
-#: sequencer.c:5751
+#: sequencer.c:5775
msgid "the script was already rearranged."
msgstr "l'script ja estava endreçat."
-#: setup.c:133
+#: setup.c:134
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "«%s» està fora del repositori a «%s»"
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
"%s: no hi ha tal camí en l'arbre de treball.\n"
-"Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin "
-"localment."
+"Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin localment."
-#: setup.c:198
+#: setup.c:199
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-"argument ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de "
-"treball.\n"
+"argument ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de treball.\n"
"Useu «--» per a separar els camins de les revisions:\n"
"«git <ordre> [<revisió>...] -- [<fitxer>...]»"
-#: setup.c:264
+#: setup.c:265
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "l'opció «%s» ha d'aparèixer abans que els arguments opcionals"
-#: setup.c:283
+#: setup.c:284
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -8488,182 +8939,176 @@
"Useu «--» per a separar els camins de les revisions:\n"
"«git <ordre> [<revisió>...] -- [<fitxer>...]»"
-#: setup.c:419
+#: setup.c:420
msgid "unable to set up work tree using invalid config"
msgstr ""
"no s'ha pogut configurar un arbre de treball utilitzant una configuració no "
"vàlida"
-#: setup.c:423
+#: setup.c:424 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "aquesta operació s'ha d'executar en un arbre de treball"
-#: setup.c:661
+#: setup.c:723
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "S'esperava una versió de repositori de git <= %d, s'ha trobat %d"
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "s'han trobat extensions de repositori desconegudes:"
+#: setup.c:731
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "s'ha trobat una extensió de repositori desconeguda:"
+msgstr[1] "s'han trobat extensions de repositori desconegudes:"
-#: setup.c:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "el repositori és versió 0, però només s'han trobat extensions v1:"
+#: setup.c:745
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] ""
+"el repositori és versió 0, però només s'han trobat una extensió v1:"
+msgstr[1] "el repositori és versió 0, però només s'han trobat extensions v1:"
-#: setup.c:700
+#: setup.c:766
#, c-format
msgid "error opening '%s'"
msgstr "s'ha produït un error en obrir «%s»"
-#: setup.c:702
+#: setup.c:768
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "massa gran per a ser un fitxer .git: «%s»"
-#: setup.c:704
+#: setup.c:770
#, c-format
msgid "error reading %s"
msgstr "error en llegir %s"
-#: setup.c:706
+#: setup.c:772
#, c-format
msgid "invalid gitfile format: %s"
msgstr "format gitfile no vàlid: %s"
-#: setup.c:708
+#: setup.c:774
#, c-format
msgid "no path in gitfile: %s"
msgstr "sense camí al gitfile: %s"
-#: setup.c:710
+#: setup.c:776
#, c-format
msgid "not a git repository: %s"
msgstr "no és un repositori de git: %s"
-#: setup.c:812
+#: setup.c:878
#, c-format
msgid "'$%s' too big"
msgstr "«$%s» massa gran"
-#: setup.c:826
+#: setup.c:892
#, c-format
msgid "not a git repository: '%s'"
msgstr "no és un repositori de git: «%s»"
-#: setup.c:855 setup.c:857 setup.c:888
+#: setup.c:921 setup.c:923 setup.c:954
#, c-format
msgid "cannot chdir to '%s'"
msgstr "no es pot canviar de directori a «%s»"
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: setup.c:926 setup.c:982 setup.c:992 setup.c:1031 setup.c:1039
msgid "cannot come back to cwd"
msgstr "no es pot tornar al directori de treball actual"
-#: setup.c:987
+#: setup.c:1053
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "s'ha produït un error en fer stat a «%*s%s%s»"
-#: setup.c:1225
+#: setup.c:1296
msgid "Unable to read current working directory"
msgstr "No s'ha pogut llegir el directori de treball actual"
-#: setup.c:1234 setup.c:1240
+#: setup.c:1305 setup.c:1311
#, c-format
msgid "cannot change to '%s'"
msgstr "no es pot canviar a «%s»"
-#: setup.c:1245
+#: setup.c:1316
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "no és un repositori de git (ni cap dels directoris pares): %s"
-#: setup.c:1251
+#: setup.c:1322
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
"no és un repositori de git (ni cap pare fins al punt de muntatge %s)\n"
-"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
-"no està establert)."
+"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM no està establert)."
-#: setup.c:1370
+#: setup.c:1447
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
-"hi ha un problema amb el valor de mode de fitxer core.sharedRepository "
-"(0%.3o).\n"
-"El propietari dels fitxers sempre ha de tenir permisos de lectura i "
-"escriptura."
+"hi ha un problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n"
+"El propietari dels fitxers sempre ha de tenir permisos de lectura i escriptura."
-#: setup.c:1417
-msgid "open /dev/null or dup failed"
-msgstr "s'ha produït un error en obrir /dev/null o dup"
-
-#: setup.c:1432
+#: setup.c:1509
msgid "fork failed"
msgstr "el «fork» ha fallat"
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1514
msgid "setsid failed"
msgstr "«setsid» ha fallat"
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr ""
-
-#: sparse-index.c:156
-#, fuzzy
-msgid "unable to update cache-tree, staying full"
-msgstr "no s'ha pogut actualitzar l'arbre cau"
-
-#: sparse-index.c:239
+#: sparse-index.c:285
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
-msgstr ""
+msgstr "l'entrada d'índex és un directori, però no dispers (%08x)"
+
+#: split-index.c:9
+#, fuzzy
+msgid "cannot use split index with a sparse index"
+msgstr "no es pot utilitzar l'índex de divisió amb un índex dispers"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:852
+#: 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:860
+#: strbuf.c:861
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:862
+#: 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:869
+#: strbuf.c:870
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:871
+#: 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:877
+#: strbuf.c:878
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8671,85 +9116,86 @@
msgstr[1] "%u bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
+#: strbuf.c:880
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u byte/s"
msgstr[1] "%u bytes/s"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
+#: builtin/rebase.c:653
#, c-format
msgid "could not open '%s' for writing"
msgstr "no s'ha pogut obrir «%s» per a escriptura"
-#: strbuf.c:1177
+#: strbuf.c:1196
#, c-format
msgid "could not edit '%s'"
msgstr "no s'ha pogut editar «%s»"
-#: submodule-config.c:237
+#: submodule-config.c:238
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "s'està ignorant el nom de submòdul sospitós %s"
-#: submodule-config.c:304
+#: submodule-config.c:305
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "no es permeten els valors negatius a submodule.fetchjobs"
-#: submodule-config.c:402
+#: submodule-config.c:403
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-"s'està ignorant «%s» que pot interpretar-se com a una opció de línia d'ordres: %s"
+"s'està ignorant «%s» que pot interpretar-se com a una opció de línia "
+"d'ordres: %s"
-#: submodule-config.c:499
+#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
#, c-format
-msgid "invalid value for %s"
-msgstr "valor no vàlid per a %s"
+msgid "invalid value for '%s'"
+msgstr "valor no vàlid per a «%s»"
-#: submodule-config.c:766
+#: submodule-config.c:828
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
-#: submodule.c:114 submodule.c:143
+#: submodule.c:115 submodule.c:144
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes "
"de fusió"
-#: submodule.c:118 submodule.c:147
+#: submodule.c:119 submodule.c:148
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s"
-#: submodule.c:154
+#: submodule.c:155
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
-#: submodule.c:165
+#: submodule.c:166
msgid "staging updated .gitmodules failed"
msgstr "l'allistament del .gitmodules actualitzat ha fallat"
-#: submodule.c:328
+#: submodule.c:346
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "al submòdul sense popular «%s»"
-#: submodule.c:359
+#: submodule.c:377
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "L'especificació «%s» és en el submòdul «%.*s»"
-#: submodule.c:436
+#: submodule.c:454
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "argument incorrecte --ignore-submodules: %s"
-#: submodule.c:818
+#: submodule.c:866
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8758,50 +9204,62 @@
"El submòdul en la comissió %s al camí: «%s» col·lideix amb un submòdul amb "
"el mateix nom. Ometent-lo."
-#: submodule.c:921
+#: submodule.c:987
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "l'entrada del submòdul «%s» (%s) és a %s, no és una comissió"
-#: submodule.c:1006
+#: submodule.c:1069
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr ""
-"No s'ha pogut executar l'ordre «git rev-list <commits> --not --remotes -n 1» "
-"en el submòdul %s"
+"No s'ha pogut executar l'ordre «git rev-list <commits> --not --remotes -n 1»"
+" en el submòdul %s"
-#: submodule.c:1129
+#: submodule.c:1192
#, c-format
msgid "process for submodule '%s' failed"
msgstr "ha fallat el procés per al submòdul «%s»"
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
msgid "Failed to resolve HEAD as a valid ref."
msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida."
-#: submodule.c:1169
+#: submodule.c:1232
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "S'està pujant el submòdul «%s»\n"
-#: submodule.c:1172
+#: submodule.c:1235
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "No s'ha pogut pujar el submòdul «%s»\n"
-#: submodule.c:1464
+#: submodule.c:1567
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "S'està obtenint el submòdul %s%s\n"
-#: submodule.c:1498
+#: submodule.c:1589
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "No s'ha pogut accedir al submòdul «%s»\n"
-#: submodule.c:1653
+#: submodule.c:1618
+#, c-format, fuzzy
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "No s'ha pogut accedir al submòdul «%s» en els percentatges"
+
+#: submodule.c:1629
+#, c-format, fuzzy
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr ""
+"S'estan recollint els submòduls un percentatge de percentatges a les "
+"comissions"
+
+#: submodule.c:1849
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8810,61 +9268,63 @@
"Errors durant l'obtenció de submòduls:\n"
"%s"
-#: submodule.c:1678
+#: submodule.c:1874
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "«%s» no reconegut com un repositori git"
-#: submodule.c:1695
+#: submodule.c:1891
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "No s'ha pogut executar «git status --porcelain=2» en el submòdul %s"
-#: submodule.c:1736
+#: submodule.c:1932
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "«git status --porcelain=2» ha fallat en el submòdul %s"
-#: submodule.c:1811
+#: submodule.c:2007
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "no s'ha pogut iniciar «git status» al submòdul «%s»"
-#: submodule.c:1824
+#: submodule.c:2020
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "no s'ha pogut executar «git status» al submòdul «%s»"
-#: submodule.c:1839
+#: submodule.c:2037
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr "No s'ha pogut desassignar el paràmetre «core.worktree» al submòdul «%s»"
+msgstr ""
+"No s'ha pogut desassignar el paràmetre «core.worktree» al submòdul «%s»"
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:2064 submodule.c:2379
#, c-format
msgid "could not recurse into submodule '%s'"
-msgstr "s'ha produït un error en cercar recursivament al camí del submòdul «%s»"
+msgstr ""
+"s'ha produït un error en cercar recursivament al camí del submòdul «%s»"
-#: submodule.c:1887
+#: submodule.c:2086
msgid "could not reset submodule index"
msgstr "no s'ha pogut restablir l'índex del submòdul"
-#: submodule.c:1929
+#: submodule.c:2128
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "el submòdul «%s» té l'índex brut"
-#: submodule.c:1981
+#: submodule.c:2182
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "No s'ha pogut actualitzar el submòdul «%s»."
-#: submodule.c:2049
+#: submodule.c:2250
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "submodule git dir «%s» està dins git dir «%.*s»"
-#: submodule.c:2070
+#: submodule.c:2271
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8872,17 +9332,17 @@
"no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
"treball"
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2283 submodule.c:2343
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "no s'ha trobat el nom pel submòdul «%s»"
-#: submodule.c:2086
+#: submodule.c:2287
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "s'ha refusat moure «%s» a un directori git existent"
-#: submodule.c:2093
+#: submodule.c:2293
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8893,11 +9353,11 @@
"«%s» a\n"
"«%s»\n"
-#: submodule.c:2221
+#: submodule.c:2424
msgid "could not start ls-files in .."
msgstr "no s'ha pogut iniciar ls-files a .."
-#: submodule.c:2261
+#: submodule.c:2464
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
@@ -8910,7 +9370,7 @@
#: trailer.c:244
#, c-format
msgid "running trailer command '%s' failed"
-msgstr "l'execució de l'ordre de remolc «%s» ha fallat"
+msgstr "l'execució de l'ordre «trailer» «%s» ha fallat"
#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
#: trailer.c:570
@@ -8918,8 +9378,8 @@
msgid "unknown value '%s' for key '%s'"
msgstr "valor desconegut «%s» per a la clau «%s»"
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
+#: builtin/remote.c:328
#, c-format
msgid "more than one %s"
msgstr "més d'un %s"
@@ -8927,18 +9387,18 @@
#: trailer.c:743
#, c-format
msgid "empty trailer token in trailer '%.*s'"
-msgstr "testimoni de remolc buit en el remolc «%.*s»"
+msgstr "testimoni de «trailer» buit en el «trailer» «%.*s»"
#: trailer.c:763
#, c-format
msgid "could not read input file '%s'"
msgstr "no s'ha pogut llegir el fitxer d'entrada «%s»"
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
msgid "could not read from stdin"
msgstr "no s'ha pogut llegir des de stdin"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:760
#, c-format
msgid "could not stat %s"
msgstr "no s'ha pogut fer stat a %s"
@@ -9006,7 +9466,7 @@
msgid "error while running fast-import"
msgstr "error en executar la importació ràpida"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1254
#, c-format
msgid "could not read ref %s"
msgstr "no s'ha pogut llegir la referència %s"
@@ -9024,7 +9484,7 @@
msgid "invalid remote service path"
msgstr "el camí del servei remot no és vàlid"
-#: transport-helper.c:661 transport.c:1471
+#: transport-helper.c:661 transport.c:1496
msgid "operation not supported by protocol"
msgstr "opció no admesa pel protocol"
@@ -9033,189 +9493,181 @@
msgid "can't connect to subservice %s"
msgstr "no es pot connectar al subservei %s"
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:415
msgid "--negotiate-only requires protocol v2"
-msgstr ""
+msgstr "--negotiate-only requereix el protocol v2"
-#: transport-helper.c:755
-#, fuzzy
+#: transport-helper.c:758
msgid "'option' without a matching 'ok/error' directive"
-msgstr "'option' sense una directiva 'ok/error' coincident"
+msgstr "«option» sense una directiva «ok/error» coincident"
-#: transport-helper.c:798
-#, fuzzy, c-format
+#: transport-helper.c:801
+#, c-format
msgid "expected ok/error, helper said '%s'"
-msgstr "s'esperava un ajudant d'error/OK ha dit \"%s\""
+msgstr "s'esperava error/OK, l'ajudant ha dit «%s»"
-#: transport-helper.c:855
-#, fuzzy, c-format
+#: transport-helper.c:862
+#, c-format
msgid "helper reported unexpected status of %s"
-msgstr "l'ajudant ha informat d'un estat inesperat dels percentatges"
+msgstr "l'ajudant ha informat d'un estat inesperat de %s"
-#: transport-helper.c:938
-#, fuzzy, c-format
+#: transport-helper.c:945
+#, c-format
msgid "helper %s does not support dry-run"
-msgstr "els ajudants no donen suport a l'execució seca"
+msgstr "l'ajudant %s no admet dry-run"
-#: transport-helper.c:941
-#, fuzzy, c-format
+#: transport-helper.c:948
+#, c-format
msgid "helper %s does not support --signed"
-msgstr "els ajudants per cents no són compatibles --signed"
+msgstr "l'ajudant %s no admet --signed"
-#: transport-helper.c:944
-#, fuzzy, c-format
+#: transport-helper.c:951
+#, c-format
msgid "helper %s does not support --signed=if-asked"
-msgstr "l'ajudant per cents no admet --signed=if-asked"
+msgstr "l'ajudant %s no admet --signed=if-asked"
-#: transport-helper.c:949
-#, fuzzy, c-format
+#: transport-helper.c:956
+#, c-format
msgid "helper %s does not support --atomic"
-msgstr "els ajudants no admeten --atomic"
-
-#: transport-helper.c:953
-#, fuzzy, c-format
-msgid "helper %s does not support --%s"
-msgstr "els ajudants per cents no són compatibles --signed"
+msgstr "l'ajudant %s no admet --atomic"
#: transport-helper.c:960
-#, fuzzy, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "els ajudants no donen suport a «push-option»"
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "l'ajudant %s no admet --%s"
-#: transport-helper.c:1060
-#, fuzzy
+#: transport-helper.c:967
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "l'ajudant %s no admet «push-option»"
+
+#: transport-helper.c:1067
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-"remot-helper no permet prémer; es necessiten especificacions de referència"
+"remot-helper no permet pujar; es necessiten especificacions de referència"
-#: transport-helper.c:1065
-#, fuzzy, c-format
+#: transport-helper.c:1072
+#, c-format
msgid "helper %s does not support 'force'"
-msgstr "els ajudants no donen suport a «force»"
+msgstr "l'ajudant %s no admet «force»"
-#: transport-helper.c:1112
-#, fuzzy
+#: transport-helper.c:1119
msgid "couldn't run fast-export"
-msgstr "no s'ha pogut executar «fast-export»"
+msgstr "no s'ha pogut executar l'exportació ràpida"
-#: transport-helper.c:1117
-#, fuzzy
+#: transport-helper.c:1124
msgid "error while running fast-export"
msgstr "error en executar l'exportació ràpida"
-#: transport-helper.c:1142
-#, fuzzy, c-format
+#: transport-helper.c:1149
+#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch.\n"
msgstr ""
-"No hi ha referències en comú i no n'hi ha cap especificat. Potser hauríeu "
-"d'especificar una branca com ara «master»."
+"No hi ha referències en comú i no n'hi ha cap d'especificada.\n"
+"No es farà res. Potser hauríeu d'especificar una branca.\n"
-#: transport-helper.c:1224
-#, fuzzy, c-format
+#: transport-helper.c:1231
+#, c-format
msgid "unsupported object format '%s'"
-msgstr "objecte mal format a «%s»"
+msgstr "format d'objecte no suportat «%s»"
-#: transport-helper.c:1233
-#, fuzzy, c-format
+#: transport-helper.c:1240
+#, c-format
msgid "malformed response in ref list: %s"
-msgstr "resposta mal formada en la llista de referències"
+msgstr "resposta mal formada al llistat de referències: %s"
-#: transport-helper.c:1385
-#, fuzzy, c-format
+#: transport-helper.c:1392
+#, c-format
msgid "read(%s) failed"
-msgstr "ha fallat read(%)"
+msgstr "ha fallat la lectura(%s)"
-#: transport-helper.c:1412
-#, fuzzy, c-format
+#: transport-helper.c:1419
+#, c-format
msgid "write(%s) failed"
-msgstr "ha fallat l(%)"
+msgstr "ha fallat l'escriptura(%s)"
-#: transport-helper.c:1461
+#: transport-helper.c:1468
#, c-format
msgid "%s thread failed"
msgstr "%s ha fallat el fil"
-#: transport-helper.c:1465
-#, fuzzy, c-format
+#: transport-helper.c:1472
+#, c-format
msgid "%s thread failed to join: %s"
-msgstr "el fil per cents no s'ha pogut unir als percentatges"
+msgstr "el fil %s no s'ha pogut unir: %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1491 transport-helper.c:1495
#, c-format
msgid "can't start thread for copying data: %s"
-msgstr "no es pot iniciar el fil per copiar les dades: %s"
+msgstr "no es pot iniciar el fil per a copiar les dades: %s"
-#: transport-helper.c:1525
+#: transport-helper.c:1532
#, c-format
msgid "%s process failed to wait"
msgstr "el procés %s no ha pogut esperar"
-#: transport-helper.c:1529
+#: transport-helper.c:1536
#, c-format
msgid "%s process failed"
msgstr "el procés %s ha fallat"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1554 transport-helper.c:1563
msgid "can't start thread for copying data"
-msgstr "no es pot iniciar el fil per copiar dades"
+msgstr "no es pot iniciar el fil per a copiar dades"
#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "Canviaria la font de «%s» a «%s» de «%s»\n"
-#: transport.c:145
+#: transport.c:138
#, c-format
msgid "could not read bundle '%s'"
-msgstr "no s'ha pogut llegir el paquet «%s»"
+msgstr "no s'ha pogut llegir el farcell «%s»"
-#: transport.c:220
+#: transport.c:234
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: opció de profunditat no vàlida «%s»"
-#: transport.c:272
-#, fuzzy
+#: transport.c:289
msgid "see protocol.version in 'git help config' for more details"
-msgstr "vegeu protocol.version a «git help config» per a més detalls"
+msgstr "vegeu «protocol.version» a «git help config» per a més detalls"
-#: transport.c:273
-#, fuzzy
+#: transport.c:290
msgid "server options require protocol version 2 or later"
msgstr "les opcions del servidor requereixen el protocol versió 2 o posterior"
-#: transport.c:400
-#, fuzzy
+#: transport.c:418
msgid "server does not support wait-for-done"
-msgstr "El servidor no admet --deepen"
+msgstr "el servidor no admet «wait-for-done»"
-#: transport.c:751
-#, fuzzy
+#: transport.c:770
msgid "could not parse transport.color.* config"
msgstr "no s'ha pogut analitzar la configuració de transport.color.*"
-#: transport.c:826
-#, fuzzy
+#: transport.c:845
msgid "support for protocol v2 not implemented yet"
-msgstr "encara no s'ha implementat la implementació del protocol v2"
+msgstr ""
+"encara no s'ha implementat la compatibilitat amb la versió v2 del protocol"
-#: transport.c:960
-#, fuzzy, c-format
+#: transport.c:978
+#, c-format
msgid "unknown value for config '%s': %s"
-msgstr "valor desconegut per config «%s»%s"
+msgstr "valor desconegut per al config «%s»': %s"
-#: transport.c:1026
+#: transport.c:1044
#, c-format
msgid "transport '%s' not allowed"
msgstr "no es permet el transport «%s»"
-#: transport.c:1079
+#: transport.c:1093
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync ja no s'admet"
-#: transport.c:1181
+#: transport.c:1196
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9224,7 +9676,7 @@
"Els camins de submòdul següents contenen canvis que no\n"
"es poden trobar en cap remot:\n"
-#: transport.c:1185
+#: transport.c:1200
#, c-format
msgid ""
"\n"
@@ -9244,20 +9696,19 @@
"\n"
"\tgit push --recurse-submodules=on-demand\n"
"\n"
-"o canviar de directori al camí i useu\n"
+"o feu cd al camí i useu\n"
"\n"
"\tgit push\n"
"\n"
"per a pujar-los a un remot.\n"
-#: transport.c:1193
+#: transport.c:1208
msgid "Aborting."
msgstr "S'està avortant."
-#: transport.c:1340
-#, fuzzy
+#: transport.c:1354
msgid "failed to push all needed submodules"
-msgstr "no s'ha pogut prémer tots els submòduls necessaris"
+msgstr "no s'han pogut pujar tots els submòduls necessaris"
#: tree-walk.c:33
msgid "too-short tree object"
@@ -9275,47 +9726,43 @@
msgid "too-short tree file"
msgstr "fitxer d'arbre massa curt"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"agafar:\n"
+"Els canvis locals als fitxers següents se sobreescriurien per a agafar:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"agafar:\n"
+"Els canvis locals als fitxers següents se sobreescriurien per a agafar:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar:\n"
+"Els canvis locals als fitxers següents se sobreescriurien per a fusionar:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de fusionar."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar:\n"
+"Els canvis locals als fitxers següents se sobreescriurien per a fusionar:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9324,7 +9771,7 @@
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de %s."
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9333,7 +9780,7 @@
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -9342,47 +9789,52 @@
"En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"S'ha rebutjat suprimir el directori de treball actual:\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per a agafar:\n"
"%%sMoveu-los o elimineu-los abans de canviar de branca."
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien en agafar:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien en fusionar:\n"
"%%sMoveu-los o elimineu-los abans de fusionar."
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien en fusionar:\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9391,83 +9843,75 @@
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
"%%sMoveu-los o elimineu-los abans de %s."
-#: unpack-trees.c:148
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
-"%%s"
-
#: unpack-trees.c:154
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"agafar:\n"
-"%%sMoveu-los o elimineu-los abans de canviar de branca."
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
+"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:160
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
+"The following untracked working tree files would be overwritten by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per a agafar:\n"
+"%%sMoveu-los o elimineu-los abans de canviar de branca."
+
+#: unpack-trees.c:162
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per a agafar:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per a fusionar:\n"
"%%sMoveu-los o elimineu-los abans de fusionar."
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per a fusionar:\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"%s:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
"%%sMoveu-los o elimineu-los abans de %s."
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"%s:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "L'entrada «%s» encavalca amb «%s». No es pot vincular."
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -9476,78 +9920,75 @@
"No es pot actualitzar el submòdul:\n"
"%s"
-#: unpack-trees.c:180
-#, fuzzy, c-format
+#: unpack-trees.c:186
+#, c-format
msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
+"The following paths are not up to date and were left despite sparse patterns:\n"
"%s"
msgstr ""
-"Els camins següents no estan actualitzats i es van deixar a pesar que s'han "
-"dispersat els percentatges"
+"Els camins següents no estan actualitzats, i es van deixar, malgrat els patrons dispersos:\n"
+"%s"
-#: unpack-trees.c:182
-#, fuzzy, c-format
+#: unpack-trees.c:188
+#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
msgstr ""
-"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
+"Els camins següents no es fusionen, i es van deixar, malgrat els patrons dispersos:\n"
+"%s"
-#: unpack-trees.c:184
-#, fuzzy, c-format
+#: unpack-trees.c:190
+#, c-format
msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
+"The following paths were already present and thus not updated despite sparse patterns:\n"
"%s"
msgstr ""
-"Els camins següents ja estaven presents i, per tant, no s'han actualitzat "
-"malgrat els patrons escassos."
+"Els camins següents ja estaven presents i, per tant, no s'han actualitzat malgrat els patrons dispersos.:\n"
+"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "S'està avortant\n"
-#: unpack-trees.c:291
-#, fuzzy, c-format
+#: unpack-trees.c:297
+#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
msgstr ""
"Després de corregir els camins anteriors és possible que vulgueu executar "
-"`git sparse-checkout reapply`."
+"«git sparse-checkout reapply».\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "S'estan actualitzant els fitxers"
-#: unpack-trees.c:384
-#, fuzzy
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"colliding group is in the working tree:\n"
msgstr ""
-"els camins següents han xocat (p. ex. camins sensibles a majúscules i "
-"minúscules en un sistema de fitxers que no distingeix entre majúscules i "
-"minúscules) i només un del mateix grup de col·lisió es troba a l'arbre de "
-"treball"
+"els camins següents han col·lisionat (p. ex. camins sensibles a majúscules\n"
+"i minúscules en un sistema de fitxers que no distingeix entre majúscules i\n"
+"minúscules). Només un camí del mateix grup de col·lisió es troba a l'arbre\n"
+"de treball:\n"
-#: unpack-trees.c:1519
-#, fuzzy
+#: unpack-trees.c:1664
msgid "Updating index flags"
-msgstr "Actualitzant els indicadors d’índex"
+msgstr "Actualitzant els indicadors d'índex"
-#: unpack-trees.c:2608
+#: unpack-trees.c:2925
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
+"l'arbre de treball i la comissió no seguida tenen entrades duplicades: %s"
-#: upload-pack.c:1548
-#, fuzzy
+#: upload-pack.c:1579
msgid "expected flush after fetch arguments"
-msgstr "s'esperava una neteja després de les capacitats"
+msgstr "s'esperava una neteja després dels arguments del «fetch»"
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
@@ -9582,7 +10023,7 @@
msgid "Fetching objects"
msgstr "S'estan obtenint objectes"
-#: worktree.c:238 builtin/am.c:2151
+#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "s'ha produït un error en llegir «%s»"
@@ -9613,83 +10054,109 @@
msgid "'%s' does not point back to '%s'"
msgstr "«%s» no assenyala de tornada a «%s»"
-#: worktree.c:608
+#: worktree.c:600
msgid "not a directory"
msgstr "no és en un directori"
-#: worktree.c:617
+#: worktree.c:609
msgid ".git is not a file"
msgstr ".git no és un fitxer"
-#: worktree.c:619
+#: worktree.c:611
msgid ".git file broken"
msgstr "fitxer .git malmès"
-#: worktree.c:621
+#: worktree.c:613
msgid ".git file incorrect"
msgstr "fitxer .git malmès"
-#: worktree.c:727
+#: worktree.c:719
msgid "not a valid path"
msgstr "no és un camí vàlid"
-#: worktree.c:733
+#: worktree.c:725
msgid "unable to locate repository; .git is not a file"
msgstr "no s'ha pogut trobar el repositori; .git no és un fitxer"
-#: worktree.c:737
+#: worktree.c:729
msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "no s'ha pogut trobar el repositori; el fitxer .git no fa referència a un repositori"
+msgstr ""
+"no s'ha pogut trobar el repositori; el fitxer .git no fa referència a un "
+"repositori"
-#: worktree.c:741
+#: worktree.c:733
msgid "unable to locate repository; .git file broken"
msgstr "no s'ha pogut trobar el repositori; el fitxer .git està malmès"
-#: worktree.c:747
+#: worktree.c:739
msgid "gitdir unreadable"
msgstr "gitdir illegible"
-#: worktree.c:751
+#: worktree.c:743
msgid "gitdir incorrect"
msgstr "gitdir incorrecte"
-#: worktree.c:776
+#: worktree.c:768
msgid "not a valid directory"
msgstr "no és en un directori vàlid"
-#: worktree.c:782
+#: worktree.c:774
msgid "gitdir file does not exist"
msgstr "el fitxer gitdir no existeix"
-#: worktree.c:787 worktree.c:796
+#: worktree.c:779 worktree.c:788
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "no s'ha pogut llegir el fitxer gitdir (%s)"
-#: worktree.c:806
+#: worktree.c:798
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "lectura curta (s'esperaven %<PRIuMAX> bytes, llegits %<PRIuMAX>)"
-#: worktree.c:814
+#: worktree.c:806
msgid "invalid gitdir file"
msgstr "fitxer gitdir no vàlid"
-#: worktree.c:822
+#: worktree.c:814
msgid "gitdir file points to non-existent location"
msgstr "el fitxer gitdir indica una ubicació no existent"
-#: wrapper.c:197 wrapper.c:367
+#: worktree.c:830
+#, c-format, fuzzy
+msgid "unable to set %s in '%s'"
+msgstr "no s'han pogut establir els percentatges en «%s»"
+
+#: worktree.c:832
+#, c-format, fuzzy
+msgid "unable to unset %s in '%s'"
+msgstr "no s'han pogut establir els percentatges en '%s'"
+
+#: worktree.c:852
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "no s'ha pogut establir el paràmetre extensions.worktreeConfig"
+
+#: wrapper.c:161
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "no s'ha pogut fer setenv «%s»"
+
+#: wrapper.c:213
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no s'ha pogut crear «%s»"
+
+#: wrapper.c:215 wrapper.c:385
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "no s'ha pogut obrir «%s» per a lectura i escriptura"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:416 wrapper.c:683
#, c-format
msgid "unable to access '%s'"
msgstr "no s'ha pogut accedir a «%s»"
-#: wrapper.c:607
+#: wrapper.c:691
msgid "unable to get current working directory"
msgstr "no s'ha pogut obtenir el directori de treball actual"
@@ -9704,7 +10171,8 @@
#: wt-status.c:190 wt-status.c:222
#, c-format
msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr " (useu «git restore --source=%s --staged <fitxer>...» per a fer «unstage»)"
+msgstr ""
+" (useu «git restore --source=%s --staged <fitxer>...» per a fer «unstage»)"
#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
@@ -9724,11 +10192,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (useu «git rm <fitxer>...» per a senyalar resolució)"
-#: wt-status.c:211 wt-status.c:1075
+#: wt-status.c:211 wt-status.c:1140
msgid "Changes to be committed:"
msgstr "Canvis a cometre:"
-#: wt-status.c:234 wt-status.c:1084
+#: wt-status.c:234 wt-status.c:1149
msgid "Changes not staged for commit:"
msgstr "Canvis no «staged» per a cometre:"
@@ -9741,10 +10209,10 @@
msgstr " (useu «git add/rm <fitxer>...» per a actualitzar què es cometrà)"
#: wt-status.c:241
-msgid ""
-" (use \"git restore <file>...\" to discard changes in working directory)"
+msgid " (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (useu «git restore <file>...» per a descartar els canvis en el directori de treball)"
+" (useu «git restore <file>...» per a descartar canvis en el directori de "
+"treball)"
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
@@ -9754,7 +10222,7 @@
#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (useu «git %s <fitxer>...» per a incloure-ho en la comissió)"
+msgstr " (useu «git %s <fitxer>...» per a incloure'ls en la comissió)"
#: wt-status.c:266
msgid "both deleted:"
@@ -9828,22 +10296,22 @@
msgid "untracked content, "
msgstr "contingut no seguit, "
-#: wt-status.c:908
+#: wt-status.c:973
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "L'«stash» té actualment %d entrada"
msgstr[1] "L'«stash» té actualment %d entrades"
-#: wt-status.c:939
+#: wt-status.c:1004
msgid "Submodules changed but not updated:"
msgstr "Submòduls canviats però no actualitzats:"
-#: wt-status.c:941
+#: wt-status.c:1006
msgid "Submodule changes to be committed:"
msgstr "Canvis de submòdul a cometre:"
-#: wt-status.c:1023
+#: wt-status.c:1088
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9851,7 +10319,7 @@
"No modifiqueu ni elimineu la línia de dalt.\n"
"Tot el que hi ha a sota s'ignorarà."
-#: wt-status.c:1115
+#: wt-status.c:1180
#, c-format
msgid ""
"\n"
@@ -9862,108 +10330,115 @@
"S'ha trigat un %.2f segons a calcular els valors de la branca d'endavant i darrere.\n"
"Podeu utilitzar «--no-ahead-behind» per a evitar-ho.\n"
-#: wt-status.c:1145
+#: wt-status.c:1210
msgid "You have unmerged paths."
msgstr "Teniu camins sense fusionar."
-#: wt-status.c:1148
+#: wt-status.c:1213
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregleu els conflictes i executeu «git commit»)"
-#: wt-status.c:1150
+#: wt-status.c:1215
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (useu «git merge --abort» per a avortar la fusió)"
-#: wt-status.c:1154
+#: wt-status.c:1219
msgid "All conflicts fixed but you are still merging."
msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
-#: wt-status.c:1157
+#: wt-status.c:1222
msgid " (use \"git commit\" to conclude merge)"
msgstr " (useu «git commit» per a concloure la fusió)"
-#: wt-status.c:1166
+#: wt-status.c:1233
msgid "You are in the middle of an am session."
msgstr "Esteu enmig d'una sessió am."
-#: wt-status.c:1169
+#: wt-status.c:1236
msgid "The current patch is empty."
msgstr "El pedaç actual està buit."
-#: wt-status.c:1173
+#: wt-status.c:1241
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregleu els conflictes i després executeu «git am --continue»)"
-#: wt-status.c:1175
+#: wt-status.c:1243
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (useu «git am --skip» per a ometre aquest pedaç)"
-#: wt-status.c:1177
+#: wt-status.c:1246
+msgid " (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (useu «git am --allow-empty» per a enregistrar aquest pedaç com una "
+"comissió buida)"
+
+#: wt-status.c:1248
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (useu «git am --abort» per a restaurar la branca original)"
-#: wt-status.c:1310
+#: wt-status.c:1381
msgid "git-rebase-todo is missing."
msgstr "Manca git-rebase-todo."
-#: wt-status.c:1312
+#: wt-status.c:1383
msgid "No commands done."
msgstr "No s'ha fet cap ordre."
-#: wt-status.c:1315
-#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Última ordre feta (%d ordre feta):"
-msgstr[1] "Últimes ordres fetes (%d ordres fetes):"
+#: wt-status.c:1386
+#, c-format, fuzzy
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Darrera ordre feta (%<PRIuMAX> ordre feta):"
+msgstr[1] "Darrer ordre feta (%<PRIuMAX> ordres fetes):"
-#: wt-status.c:1326
+#: wt-status.c:1397
#, c-format
msgid " (see more in file %s)"
msgstr " (vegeu més en el fitxer %s)"
-#: wt-status.c:1331
+#: wt-status.c:1402
msgid "No commands remaining."
msgstr "No manca cap ordre."
-#: wt-status.c:1334
-#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Ordre següent a fer (manca %d ordre):"
-msgstr[1] "Ordres següents a fer (manquen %d ordres):"
+#: wt-status.c:1405
+#, c-format, fuzzy
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Següent ordre a fer (%<PRIuMAX> restant ordre):"
+msgstr[1] "Següent ordre a fer (%<PRIuMAX> ordres restants):"
-#: wt-status.c:1342
+#: wt-status.c:1413
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (useu «git rebase --edit-todo» per a veure i editar)"
-#: wt-status.c:1354
+#: wt-status.c:1425
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Actualment esteu fent «rebase» de la branca «%s» en «%s»."
-#: wt-status.c:1359
+#: wt-status.c:1430
msgid "You are currently rebasing."
msgstr "Actualment esteu fent «rebase»."
-#: wt-status.c:1372
+#: wt-status.c:1443
msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " (arregleu els conflictes i després executeu «git rebase --continue»)"
+msgstr ""
+" (arregleu els conflictes i després executeu «git rebase --continue»)"
-#: wt-status.c:1374
+#: wt-status.c:1445
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (useu «git rebase --skip» per a ometre aquest pedaç)"
-#: wt-status.c:1376
+#: wt-status.c:1447
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (useu «git rebase --abort» per a agafar la branca original)"
-#: wt-status.c:1383
+#: wt-status.c:1454
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu «git rebase --continue»)"
-#: wt-status.c:1387
+#: wt-status.c:1458
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9971,160 +10446,164 @@
"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
"«%s» en «%s»."
-#: wt-status.c:1392
+#: wt-status.c:1463
msgid "You are currently splitting a commit during a rebase."
msgstr "Actualment esteu dividint una comissió durant un «rebase»."
-#: wt-status.c:1395
+#: wt-status.c:1466
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Una vegada que el vostre directori de treball sigui net, executeu «git "
"rebase --continue»)"
-#: wt-status.c:1399
+#: wt-status.c:1470
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu editant una comissió mentre es fa «rebase» de la branca "
"«%s» en «%s»."
-#: wt-status.c:1404
+#: wt-status.c:1475
msgid "You are currently editing a commit during a rebase."
msgstr "Actualment esteu editant una comissió durant un «rebase»."
-#: wt-status.c:1407
+#: wt-status.c:1478
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (useu «git commit --amend» per a esmenar la comissió actual)"
-#: wt-status.c:1409
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: wt-status.c:1480
+msgid " (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (useu «git rebase --continue» una vegada que estigueu satisfet amb els "
"vostres canvis)"
-#: wt-status.c:1420
+#: wt-status.c:1491
msgid "Cherry-pick currently in progress."
msgstr "Hi ha «cherry pick» actualment en curs."
-#: wt-status.c:1423
+#: wt-status.c:1494
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Actualment esteu fent «cherry pick» a la comissió %s."
-#: wt-status.c:1430
+#: wt-status.c:1501
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (arregleu els conflictes i executeu «git cherry-pick --continue»)"
-#: wt-status.c:1433
+#: wt-status.c:1504
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (executeu «git cherry-pick --continue» per a continuar)"
-#: wt-status.c:1436
+#: wt-status.c:1507
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-" (tots els conflictes estan arreglats: executeu «git cherry-pick --"
-"continue»)"
+" (tots els conflictes estan arreglats: executeu «git cherry-pick "
+"--continue»)"
-#: wt-status.c:1438
+#: wt-status.c:1509
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (useu «git cherry-pick --skip» per a ometre aquest pedaç)"
-#: wt-status.c:1440
+#: wt-status.c:1511
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (useu «git cherry-pick --abort» per a cancel·lar l'operació de «cherry "
"pick»)"
-#: wt-status.c:1450
+#: wt-status.c:1521
msgid "Revert currently in progress."
msgstr "Una reversió està actualment en curs."
-#: wt-status.c:1453
+#: wt-status.c:1524
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Actualment esteu revertint la comissió %s."
-#: wt-status.c:1459
+#: wt-status.c:1530
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (arregleu els conflictes i executeu «git revert --continue»)"
-#: wt-status.c:1462
+#: wt-status.c:1533
msgid " (run \"git revert --continue\" to continue)"
msgstr " (executeu «git revert --continue» per a continuar)"
-#: wt-status.c:1465
+#: wt-status.c:1536
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu «git revert --continue»)"
-#: wt-status.c:1467
+#: wt-status.c:1538
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (useu «git revert --skip» per a ometre aquest pedaç)"
-#: wt-status.c:1469
+#: wt-status.c:1540
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (useu «git revert --abort» per a cancel·lar l'operació de reversió)"
-#: wt-status.c:1479
+#: wt-status.c:1550
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»."
-#: wt-status.c:1483
+#: wt-status.c:1554
msgid "You are currently bisecting."
msgstr "Actualment esteu bisecant."
-#: wt-status.c:1486
+#: wt-status.c:1557
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (useu «git bisect reset» per a tornar a la branca original)"
-#: wt-status.c:1497
-#, fuzzy, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "Esteu en una baixada del pagament amb un 1% d'arxius seguits presents."
+#: wt-status.c:1568
+msgid "You are in a sparse checkout."
+msgstr "Esteu en un «sparse-checkout»."
-#: wt-status.c:1736
+#: wt-status.c:1571
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"Esteu en un «sparse-checkout» amb un %d%% de fitxers seguits presents."
+
+#: wt-status.c:1815
msgid "On branch "
msgstr "En la branca "
-#: wt-status.c:1743
+#: wt-status.c:1822
msgid "interactive rebase in progress; onto "
msgstr "«rebase» interactiu en curs; sobre "
-#: wt-status.c:1745
+#: wt-status.c:1824
msgid "rebase in progress; onto "
msgstr "«rebase» en curs; sobre "
-#: wt-status.c:1750
+#: wt-status.c:1829
msgid "HEAD detached at "
msgstr "HEAD separat a "
-#: wt-status.c:1752
+#: wt-status.c:1831
msgid "HEAD detached from "
msgstr "HEAD separat des de "
-#: wt-status.c:1755
+#: wt-status.c:1834
msgid "Not currently on any branch."
msgstr "Actualment no s'és en cap branca."
-#: wt-status.c:1772
+#: wt-status.c:1851
msgid "Initial commit"
msgstr "Comissió inicial"
-#: wt-status.c:1773
+#: wt-status.c:1852
msgid "No commits yet"
msgstr "No s'ha fet cap comissió encara"
-#: wt-status.c:1787
+#: wt-status.c:1866
msgid "Untracked files"
msgstr "Fitxers no seguits"
-#: wt-status.c:1789
+#: wt-status.c:1868
msgid "Ignored files"
msgstr "Fitxers ignorats"
-#: wt-status.c:1793
+#: wt-status.c:1872
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10136,30 +10615,30 @@
"oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
"«git help status»)."
-#: wt-status.c:1799
+#: wt-status.c:1878
#, c-format
msgid "Untracked files not listed%s"
msgstr "Els fitxers no seguits no estan llistats%s"
-#: wt-status.c:1801
+#: wt-status.c:1880
msgid " (use -u option to show untracked files)"
msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
-#: wt-status.c:1807
+#: wt-status.c:1886
msgid "No changes"
msgstr "Sense canvis"
-#: wt-status.c:1812
+#: wt-status.c:1891
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "no hi ha canvis afegits a cometre (useu «git add» o «git commit -a»)\n"
-#: wt-status.c:1816
+#: wt-status.c:1895
#, c-format
msgid "no changes added to commit\n"
msgstr "no hi ha canvis afegits a cometre\n"
-#: wt-status.c:1820
+#: wt-status.c:1899
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -10168,227 +10647,233 @@
"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu «git add» "
"per a seguir-los)\n"
-#: wt-status.c:1824
+#: wt-status.c:1903
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n"
-#: wt-status.c:1828
+#: wt-status.c:1907
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"no hi ha res a cometre (creeu/copieu fitxers i useu «git add» per a seguir-"
"los)\n"
-#: wt-status.c:1832 wt-status.c:1838
+#: wt-status.c:1911 wt-status.c:1917
#, c-format
msgid "nothing to commit\n"
msgstr "no hi ha res a cometre\n"
-#: wt-status.c:1835
+#: wt-status.c:1914
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr ""
-"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
+msgstr "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
-#: wt-status.c:1840
+#: wt-status.c:1919
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "no hi ha res a cometre, l'arbre de treball està net\n"
-#: wt-status.c:1945
+#: wt-status.c:2024
msgid "No commits yet on "
msgstr "No s'ha fet cap comissió encara a "
-#: wt-status.c:1949
+#: wt-status.c:2028
msgid "HEAD (no branch)"
msgstr "HEAD (sense branca)"
-#: wt-status.c:1980
+#: wt-status.c:2059
msgid "different"
msgstr "diferent"
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2061 wt-status.c:2069
msgid "behind "
msgstr "darrere "
-#: wt-status.c:1985 wt-status.c:1988
+#: wt-status.c:2064 wt-status.c:2067
msgid "ahead "
msgstr "davant per "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2511
+#: wt-status.c:2605
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no es pot %s: Teniu canvis «unstaged»."
-#: wt-status.c:2517
+#: wt-status.c:2611
msgid "additionally, your index contains uncommitted changes."
msgstr "addicionalment, el vostre índex conté canvis sense cometre."
-#: wt-status.c:2519
+#: wt-status.c:2613
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
-#: compat/simple-ipc/ipc-unix-socket.c:178
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "no s'ha pogut enviar l'ordre IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:185
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "no s'ha pogut llegir la resposta IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:862
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "no s'ha pogut començar un fil «accept_thread» «%s»"
-#: compat/simple-ipc/ipc-unix-socket.c:874
-#, fuzzy, c-format
+#: compat/simple-ipc/ipc-unix-socket.c:904
+#, c-format
msgid "could not start worker[0] for '%s'"
-msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»"
+msgstr "no s'ha pogut iniciar el fil[0] per a «%s»"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:353
#, c-format
msgid "failed to unlink '%s'"
msgstr "s'ha produït un error en desenllaçar «%s»"
+#: compat/fsmonitor/fsm-listen-darwin.c:355
+#, fuzzy
+msgid "Unable to create FSEventStream."
+msgstr "No s'ha pogut crear el FSEventStream."
+
+#: compat/fsmonitor/fsm-listen-darwin.c:403
+#, fuzzy
+msgid "Failed to start the FSEventStream"
+msgstr "No s'ha pogut iniciar el FSEventStream"
+
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/add.c:61
-#, fuzzy, c-format
+#: builtin/add.c:63
+#, c-format
msgid "cannot chmod %cx '%s'"
-msgstr "no es pot canviar de directori a «%s»"
+msgstr "no es pot fer chmod %cx «%s»"
-#: builtin/add.c:99
+#: builtin/add.c:105
#, c-format
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:110 builtin/commit.c:299
msgid "updating files failed"
msgstr "s'ha produït un error en actualitzar els fitxers"
-#: builtin/add.c:114
+#: builtin/add.c:120
#, c-format
msgid "remove '%s'\n"
msgstr "elimina «%s»\n"
-#: builtin/add.c:198
+#: builtin/add.c:204
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:312 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "No s'ha pogut obrir «%s» per a escriptura."
-
-#: builtin/add.c:322
+#: builtin/add.c:325
msgid "Could not write patch"
msgstr "No s'ha pogut escriure el pedaç"
-#: builtin/add.c:325
+#: builtin/add.c:328
msgid "editing patch failed"
msgstr "l'edició del pedaç ha fallat"
-#: builtin/add.c:328
+#: builtin/add.c:331
#, c-format
msgid "Could not stat '%s'"
msgstr "No s'ha pogut fer stat a «%s»"
-#: builtin/add.c:330
+#: builtin/add.c:333
msgid "Empty patch. Aborted."
msgstr "El pedaç és buit. S'ha avortat."
-#: builtin/add.c:335
+#: builtin/add.c:339
#, c-format
msgid "Could not apply '%s'"
msgstr "No s'ha pogut aplicar «%s»"
-#: builtin/add.c:343
+#: builtin/add.c:347
msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr ""
-"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
+msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
-#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
-msgstr "fer una prova"
+msgstr "fes una prova"
-#: builtin/add.c:366
+#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "sigues detallat"
+
+#: builtin/add.c:370
msgid "interactive picking"
-msgstr "recull interactiu"
+msgstr "selecció interactiva"
-#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
-#: builtin/add.c:368
+#: builtin/add.c:372
msgid "edit current diff and apply"
msgstr "edita la diferència actual i aplica-la"
-#: builtin/add.c:369
+#: builtin/add.c:373
msgid "allow adding otherwise ignored files"
msgstr "permet afegir fitxers que d'altra manera s'ignoren"
-#: builtin/add.c:370
+#: builtin/add.c:374
msgid "update tracked files"
msgstr "actualitza els fitxers seguits"
-#: builtin/add.c:371
-#, fuzzy
+#: builtin/add.c:375
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "torna a normalitzar EOL dels fitxers seguits (implica -u)"
-#: builtin/add.c:372
+#: builtin/add.c:376
msgid "record only the fact that the path will be added later"
msgstr "registra només el fet que el camí s'afegirà més tard"
-#: builtin/add.c:373
+#: builtin/add.c:377
msgid "add changes from all tracked and untracked files"
msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
-#: builtin/add.c:376
+#: builtin/add.c:380
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:382
msgid "don't add, only refresh the index"
msgstr "no afegeixis, només actualitza l'índex"
-#: builtin/add.c:379
+#: builtin/add.c:383
msgid "just skip files which cannot be added because of errors"
msgstr "només omet els fitxers que no es poden afegir a causa d'errors"
-#: builtin/add.c:380
+#: builtin/add.c:384
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-"comproveu si els fitxers, fins i tot els absents, s'ignoren en fer una "
-"prova"
+"comprova si els fitxers, fins i tot els absents, s'ignoren en fer una prova"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "permet actualitzar entrada fora del con del «sparse-checkout»"
+
+#: builtin/add.c:387 builtin/update-index.c:1023
msgid "override the executable bit of the listed files"
-msgstr "passa per alt el bit executable dels fitxers llistats"
+msgstr "sobreescriu el bit executable dels fitxers llistats"
-#: builtin/add.c:384
+#: builtin/add.c:389
msgid "warn when adding an embedded repository"
msgstr "avisa'm quan s'afegeixi un repositori incrustat"
-#: builtin/add.c:386
-#, fuzzy
-msgid "backend for `git stash -p`"
-msgstr "backend per a «git stash -p»"
-
-#: builtin/add.c:404
+#: builtin/add.c:407
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10419,12 +10904,12 @@
"\n"
"Vegeu «git help submodule» per a més informació."
-#: builtin/add.c:432
+#: builtin/add.c:436
#, c-format
msgid "adding embedded git repository: %s"
msgstr "s'està afegint un repositori incrustat: %s"
-#: builtin/add.c:451
+#: builtin/add.c:456
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10434,51 +10919,27 @@
"Desactiveu aquest missatge executant\n"
"«git config advice.addIgnoredFile false»"
-#: builtin/add.c:460
+#: builtin/add.c:471
msgid "adding files failed"
msgstr "l'afegiment de fitxers ha fallat"
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run és incompatible amb --interactive/--patch"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file és incompatible amb --interactive/--patch"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file és incompatible amb --edit"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A i -u són mútuament incompatibles"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run"
-
-#: builtin/add.c:526
+#: builtin/add.c:534
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "el paràmetre --chmod «%s» ha de ser o -x o +x"
-#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file és incompatible amb els arguments de «pathspec»"
+#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
+#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "«%s» i l'especificació de camí no es poden usar juntes"
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul requereix --pathspec-from-file"
-
-#: builtin/add.c:555
+#: builtin/add.c:566
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "No s'ha especificat res, no s'ha afegit res.\n"
-#: builtin/add.c:557
+#: builtin/add.c:568
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10488,111 +10949,115 @@
"Desactiveu aquest missatge executant\n"
"«git config advice.addEmptyPathspec false»"
-#: builtin/am.c:364
+#: builtin/am.c:393
msgid "could not parse author script"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: builtin/am.c:454
+#: builtin/am.c:483
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "s'ha suprimit «%s» pel lligam applypatch-msg"
-#: builtin/am.c:496
+#: builtin/am.c:525
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línia d'entrada mal formada: «%s»."
-#: builtin/am.c:534
+#: builtin/am.c:563
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "S'ha produït un error en copiar les notes de «%s» a «%s»"
-#: builtin/am.c:560
+#: builtin/am.c:589
msgid "fseek failed"
msgstr "fseek ha fallat"
-#: builtin/am.c:748
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "no s'ha pogut analitzar el pedaç «%s»"
-#: builtin/am.c:813
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Només una sèrie de pedaços StGIT es pot aplicar a la vegada"
-#: builtin/am.c:861
+#: builtin/am.c:890
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:895 builtin/am.c:907
msgid "invalid Date line"
msgstr "línia Date no vàlida"
-#: builtin/am.c:873
+#: builtin/am.c:902
msgid "invalid timezone offset"
msgstr "desplaçament del fus horari no vàlid"
-#: builtin/am.c:966
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/am.c:971 builtin/clone.c:414
+#: builtin/am.c:1000 builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
msgstr "s'ha produït un error en crear el directori «%s»"
-#: builtin/am.c:976
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "S'ha produït un error en dividir els pedaços."
-#: builtin/am.c:1125
+#: builtin/am.c:1154
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quan hàgiu resolt aquest problema, executeu «%s --continue»."
-#: builtin/am.c:1126
+#: builtin/am.c:1155
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si preferiu ometre aquest pedaç, executeu «%s --skip» en lloc d'això."
-#: builtin/am.c:1127
+#: builtin/am.c:1160
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Per a enregistrar un pedaç buit com a comissió buida, executeu «%s --allow-"
+"empty»."
+
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-"Per a restaurar la branca original i deixar d'apedaçar, executeu «%s --"
-"abort»."
+"Per a restaurar la branca original i deixar d'apedaçar, executeu «%s "
+"--abort»."
-#: builtin/am.c:1222
-#, fuzzy
-msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+#: builtin/am.c:1257
+msgid ""
+"Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-"Pedaç enviat amb format=flux; es pot perdre espai al final de les línies."
+"Pedaç enviat amb format=flowed; es pot perdre l'espai al final de les "
+"línies."
-#: builtin/am.c:1250
-msgid "Patch is empty."
-msgstr "El pedaç està buit."
-
-#: builtin/am.c:1315
+#: builtin/am.c:1345
#, c-format
msgid "missing author line in commit %s"
msgstr "manca la línia d'autor en la comissió %s"
-#: builtin/am.c:1318
+#: builtin/am.c:1348
#, c-format
msgid "invalid ident line: %.*s"
msgstr "línia d'identitat no vàlida: %.*s"
-#: builtin/am.c:1537
+#: builtin/am.c:1567
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-"Al repositori li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
-"vies."
+"Al repositori li manquen els blobs necessaris per a retrocedir a una fusió "
+"de 3 vies."
-#: builtin/am.c:1539
+#: builtin/am.c:1569
msgid "Using index info to reconstruct a base tree..."
msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..."
-#: builtin/am.c:1558
+#: builtin/am.c:1588
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10600,100 +11065,114 @@
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
-#: builtin/am.c:1564
+#: builtin/am.c:1594
msgid "Falling back to patching base and 3-way merge..."
msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..."
-#: builtin/am.c:1590
+#: builtin/am.c:1620
msgid "Failed to merge in the changes."
msgstr "S'ha produït un error en fusionar els canvis."
-#: builtin/am.c:1622
+#: builtin/am.c:1652
msgid "applying to an empty history"
msgstr "s'està aplicant a una història buida"
-#: builtin/am.c:1674 builtin/am.c:1678
+#: builtin/am.c:1704 builtin/am.c:1708
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
-#: builtin/am.c:1696
+#: builtin/am.c:1726
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
-#.
-#: builtin/am.c:1706
+#: builtin/am.c:1736
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls "
"tots: "
-#: builtin/am.c:1752 builtin/commit.c:408
+#: builtin/am.c:1782 builtin/commit.c:410
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
-#: builtin/am.c:1756
+#: builtin/am.c:1786
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)"
-#: builtin/am.c:1796 builtin/am.c:1864
+#: builtin/am.c:1828
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "S'està ometent: %.*s"
+
+#: builtin/am.c:1833
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "S'està creant una comissió buida: %.*s"
+
+#: builtin/am.c:1837
+msgid "Patch is empty."
+msgstr "El pedaç està buit."
+
+#: builtin/am.c:1848 builtin/am.c:1917
#, c-format
msgid "Applying: %.*s"
msgstr "S'està aplicant: %.*s"
-#: builtin/am.c:1813
+#: builtin/am.c:1865
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/am.c:1819
+#: builtin/am.c:1871
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/am.c:1823
-#, fuzzy
+#: builtin/am.c:1875
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
-msgstr "Utilitzeu 'git am --show-current-patch=diff' per veure el pedaç fallit"
+msgstr ""
+"Useu «git am --show-current-patch=diff» per a veure el pedaç que ha fallat"
-#: builtin/am.c:1867
+#: builtin/am.c:1921
+msgid "No changes - recorded it as an empty commit."
+msgstr "No hi ha canvis - enregistrat com una comissió buida."
+
+#: builtin/am.c:1923
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
"Cap canvi - heu oblidat d'usar «git add»?\n"
-"Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n"
+"Si no hi ha res per a fer «stage», probablement alguna altra cosa ja ha\n"
"introduït els mateixos canvis; potser voleu ometre aquest pedaç."
-#: builtin/am.c:1874
+#: builtin/am.c:1931
msgid ""
"You still have unmerged paths in your index.\n"
-"You should 'git add' each file with resolved conflicts to mark them as "
-"such.\n"
+"You should 'git add' each file with resolved conflicts to mark them as such.\n"
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
"Encara teniu camins sense fusionar a l'índex.\n"
-"Heu de fer «git add» a cada fitxer amb conflictes resolts per a marcar-los "
-"com a tal.\n"
-"Podeu executar «git rm» en un fitxer per a acceptar «suprimit per ells» pel "
-"fitxer."
+"Heu de fer «git add» a cada fitxer amb conflictes resolts per a marcar-los com a tal.\n"
+"Podeu executar «git rm» en un fitxer per a acceptar «suprimit per ells» pel fitxer."
-#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
+#: builtin/reset.c:463
#, c-format
msgid "Could not parse object '%s'."
msgstr "No s'ha pogut analitzar l'objecte «%s»."
-#: builtin/am.c:2033
+#: builtin/am.c:2091 builtin/am.c:2167
msgid "failed to clean index"
msgstr "s'ha produït un error en netejar l'índex"
-#: builtin/am.c:2077
+#: builtin/am.c:2135
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10701,184 +11180,178 @@
"Sembla que heu mogut HEAD després de l'última fallada de «am».\n"
"No s'està rebobinant a ORIG_HEAD"
-#: builtin/am.c:2184
+#: builtin/am.c:2292
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Valor no vàlid per a --patch-format: %s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "les opcions «%s=%s» i «%s=%s» no es poden usar juntes"
-#: builtin/am.c:2226
-#, fuzzy, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr "Valor no vàlid per --show-current-patch%s"
-
-#: builtin/am.c:2230
-#, fuzzy, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s és incompatible amb --show-current-patch=%s"
-
-#: builtin/am.c:2261
+#: builtin/am.c:2323
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
-#: builtin/am.c:2262
+#: builtin/am.c:2324
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/am.c:2268
+#: builtin/am.c:2330
msgid "run interactively"
msgstr "executa interactivament"
-#: builtin/am.c:2270
+#: builtin/am.c:2332
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
-#: builtin/am.c:2272
+#: builtin/am.c:2334
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:646 builtin/stash.c:946
msgid "be quiet"
msgstr "silenciós"
-#: builtin/am.c:2275
-#, fuzzy
+#: builtin/am.c:2337
msgid "add a Signed-off-by trailer to the commit message"
-msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
+msgstr "afegeix un «trailer» tipus «Signed-off-by» al missatge de comissió"
-#: builtin/am.c:2278
+#: builtin/am.c:2340
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
-#: builtin/am.c:2280
+#: builtin/am.c:2342
msgid "pass -k flag to git-mailinfo"
msgstr "passa l'indicador -k a git-mailinfo"
-#: builtin/am.c:2282
+#: builtin/am.c:2344
msgid "pass -b flag to git-mailinfo"
msgstr "passa l'indicador -b a git-mailinfo"
-#: builtin/am.c:2284
+#: builtin/am.c:2346
msgid "pass -m flag to git-mailinfo"
msgstr "passa l'indicador -m a git-mailinfo"
-#: builtin/am.c:2286
+#: builtin/am.c:2348
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox"
-#: builtin/am.c:2289
+#: builtin/am.c:2351
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-"no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr"
+"no passis l'indicador --keep-cr a git-mailsplit independentment d'am.keepcr"
-#: builtin/am.c:2292
+#: builtin/am.c:2354
msgid "strip everything before a scissors line"
msgstr "elimina tot abans d'una línia de tisores"
-#: builtin/am.c:2294
-#, fuzzy
+#: builtin/am.c:2356
msgid "pass it through git-mailinfo"
-msgstr "passa-ho a través de git-apply"
+msgstr "passa-ho a través del git-mailinfo"
-#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306
-#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318
-#: builtin/am.c:2324
+#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
+#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
+#: builtin/am.c:2386
msgid "pass it through git-apply"
msgstr "passa-ho a través de git-apply"
-#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
+#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
+#: parse-options.h:348
msgid "n"
msgstr "n"
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
-#: builtin/verify-tag.c:38
+#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
+#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
+#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
+#: builtin/tag.c:480 builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2321
+#: builtin/am.c:2383
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
-#: builtin/am.c:2327
+#: builtin/am.c:2389
msgid "override error message when patch failure occurs"
-msgstr "passa per alt el missatge d'error si falla l'aplicació del pedaç"
+msgstr "sobreescriu el missatge d'error si falla l'aplicació del pedaç"
-#: builtin/am.c:2329
+#: builtin/am.c:2391
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/am.c:2332
+#: builtin/am.c:2394
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
-#: builtin/am.c:2335
+#: builtin/am.c:2397
msgid "skip the current patch"
msgstr "omet el pedaç actual"
-#: builtin/am.c:2338
-#, fuzzy
+#: builtin/am.c:2400
msgid "restore the original branch and abort the patching operation"
-msgstr "restaura la branca original i avorta l'operació d'apedaçament."
+msgstr "restaura la branca original i interromp l'operació d'apedaçament"
-#: builtin/am.c:2341
-#, fuzzy
+#: builtin/am.c:2403
msgid "abort the patching operation but keep HEAD where it is"
-msgstr "avorta l'operació de pedaç però manté HEAD on és."
+msgstr "interromp l'operació d'apedaçament però manté HEAD on és"
-#: builtin/am.c:2345
-#, fuzzy
+#: builtin/am.c:2407
msgid "show the patch being applied"
msgstr "mostra el pedaç que s'està aplicant"
-#: builtin/am.c:2350
+#: builtin/am.c:2411
+msgid "record the empty patch as an empty commit"
+msgstr "registra el pedaç buit com una comissió buida"
+
+#: builtin/am.c:2415
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
-#: builtin/am.c:2352
+#: builtin/am.c:2417
msgid "use current timestamp for author date"
-msgstr "usa el marc de temps actual per la data d'autor"
+msgstr "usa la marca de temps actual per a la data d'autor"
-#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
+#: builtin/revert.c:117 builtin/tag.c:461
msgid "key-id"
msgstr "ID de clau"
-#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2420 builtin/rebase.c:1128
msgid "GPG-sign commits"
msgstr "signa les comissions amb GPG"
-#: builtin/am.c:2358
+#: builtin/am.c:2423
+msgid "how to handle empty patches"
+msgstr "com gestionar les comissions buides"
+
+#: builtin/am.c:2426
msgid "(internal use for git-rebase)"
msgstr "(ús intern per a git-rebase)"
-#: builtin/am.c:2376
+#: builtin/am.c:2444
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 ""
-"Fa molt que l'opció -b/--binary no ha fet res, i\n"
+"Fa molt que l'opció -b/--binary no fa res, i\n"
"s'eliminarà. No l'useu més."
-#: builtin/am.c:2383
+#: builtin/am.c:2451
msgid "failed to read the index"
-msgstr "S'ha produït un error en llegir l'índex"
+msgstr "s'ha produït un error en llegir l'índex"
-#: builtin/am.c:2398
+#: builtin/am.c:2466
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"un directori de «rebase» anterior %s encara existeix però s'ha donat una "
"bústia."
-#: builtin/am.c:2422
+#: builtin/am.c:2490
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10887,12 +11360,11 @@
"S'ha trobat un directori %s extraviat.\n"
"Useu «git am --abort» per a eliminar-lo."
-#: builtin/am.c:2428
+#: builtin/am.c:2496
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Una operació de resolució no està en curs; no reprenem."
-#: builtin/am.c:2438
-#, fuzzy
+#: builtin/am.c:2506
msgid "interactive mode requires patches on the command line"
msgstr "el mode interactiu requereix pedaços a la línia d'ordres"
@@ -10900,177 +11372,158 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opcions>] [<pedaç>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "no s'ha pogut crear el fitxer d'arxiu «%s»"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "no s'ha pogut redirigir la sortida"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Remot sense URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de buidatge"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: %s NACK"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: error de protocol"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: s'esperava una neteja"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<comissió>]"
-#: builtin/bisect--helper.c:24
-#, fuzzy
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <goodterm> <badterm> [<term>]"
-
-#: builtin/bisect--helper.c:25
-#, fuzzy
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-bad | --term-new]"
-
#: builtin/bisect--helper.c:26
-#, fuzzy
msgid ""
-"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
-"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<paths>...]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<term> "
+"--term-{old,good}=<term>] [--no-checkout] [--first-parent] [<bad> "
+"[<good>...]] [--] [<paths>...]"
msgstr ""
-"git bisect--helper --bisect-start [---term-{oldgood}=<term> --term-{newbad}"
-"=<term>][--no-checkout] [<bad> [<good>]] [-] [<paths>]"
-
-#: builtin/bisect--helper.c:28
-#, fuzzy
-msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-clean-state"
+"git bisect--helper --bisect-start [--term-{new,bad}=<term> "
+"--term-{old,good}=<term>] [--no-checkout] [--first-parent] [<bad> "
+"[<good>...]] [--] [<paths>...]"
#: builtin/bisect--helper.c:29
-#, fuzzy
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr "git bisect--helper --bisect-reset [<comissió>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
#: builtin/bisect--helper.c:30
-#, fuzzy
msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr "git bisect--helper --bisect-reset [<comissió>]"
+msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
#: builtin/bisect--helper.c:31
-#, fuzzy
msgid "git bisect--helper --bisect-replay <filename>"
-msgstr "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-replay <filename>"
#: builtin/bisect--helper.c:32
-#, fuzzy
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr "git bisect--helper --bisect-reset [<comissió>]"
+msgstr "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-#: builtin/bisect--helper.c:107
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <ordre>..."
+
+#: builtin/bisect--helper.c:109
+#, c-format
msgid "cannot open file '%s' in mode '%s'"
-msgstr "no es pot copiar «%s» a «%s»"
+msgstr "no es pot obrir el fitxer «%s» en mode «%s»"
-#: builtin/bisect--helper.c:114
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:116
+#, c-format
msgid "could not write to file '%s'"
-msgstr "no s'ha pogut escriure el fitxer: «%s»"
+msgstr "no s'ha pogut escriure el fitxer «%s»"
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "no es pot obrir «%s» per a lectura"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "«%s» no és un terme vàlid"
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "no es pot usar l'ordre interna «%s» com a terme"
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "no es pot canviar el significat del terme «%s»"
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
-msgstr "useu dos termes distintes"
+msgstr "useu dos termes diferents"
-#: builtin/bisect--helper.c:193
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:210
+#, c-format
msgid "We are not bisecting.\n"
-msgstr "No estem bisecant."
+msgstr "No estem bisecant.\n"
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "«%s» no és una comissió vàlida"
-#: builtin/bisect--helper.c:210
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:227
+#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
-"no s'ha pogut comprovar l'original HEAD «%s». Proveu «git bisect reset "
+"no s'ha pogut agafar la HEAD original «%s». Proveu «git bisect reset "
"<commit>»."
-#: builtin/bisect--helper.c:254
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:271
+#, c-format
msgid "Bad bisect_write argument: %s"
-msgstr "Arguments de bisectriu incorrectes"
+msgstr "Argument «bisect_write» incorrecte: %s"
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "no s'ha pogut obtenir l'oid de la revisió «%s»"
-#: builtin/bisect--helper.c:271
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:288
+#, c-format
msgid "couldn't open the file '%s'"
msgstr "no s'ha pogut obrir el fitxer «%s»"
-#: builtin/bisect--helper.c:297
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:314
+#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
-msgstr "Ordre no vàlida esteu actualment en un percentatge/%s bisect"
+msgstr "Ordre no vàlida: esteu actualment en una bisecció %s/%s"
-#: builtin/bisect--helper.c:324
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:341
+#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-"Heu de donar-me com a mínim un per cents i un per cents de revisió. Podeu "
-"utilitzar «git bisectrius» i «git bisectris» per a això."
+"Heu de donar com a mínim un %s i una revisió %s.\n"
+"Podeu usar «git bisect %s» i «git bisect %s» per a això."
-#: builtin/bisect--helper.c:328
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:345
+#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
"You then need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-"Heu de començar per «git bisect start». \n"
-"Després heu de donar-me com a mínim un per cents i per cents revisió. Podeu "
-"utilitzar «git bisect %s» i «git bisect %s» per a això."
+"Heu de començar amb «git bisect start».\n"
+"Heu de donar com a mínim un %s i una revisió %s.\n"
+"Podeu usar «git bisect %s» i «git bisect %s» per a això."
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "bisecant amb només una comissió %s"
@@ -11078,25 +11531,24 @@
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "N'esteu segur [Y/n]? "
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "cap terme definit"
-#: builtin/bisect--helper.c:420
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:437
+#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr ""
-"Els seus actuals termes són percentatges per al vell Estat i percentatges "
-"per al nou Estat."
+"Els termes actuals són %s per a l'estat antic\n"
+"i %s per al nou estat.\n"
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11105,177 +11557,217 @@
"argument no vàlid %s per a «git bisect terms».\n"
"Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
-#, fuzzy
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
-msgstr "la configuració del passeig per revisions ha fallat"
+msgstr "la configuració del recorregut de revisions ha fallat\n"
-#: builtin/bisect--helper.c:519
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:536
+#, c-format
msgid "could not open '%s' for appending"
-msgstr "no s'ha pogut obrir «%s» per a lectura"
+msgstr "no s'ha pogut obrir «%s» per a afegir-hi"
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
-#, fuzzy
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "«%s» no és un terme vàlid"
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "opció no reconeguda: «%s»"
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "«%s» no sembla ser una revisió vàlida"
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
-msgstr "HEAD incorrecte - Cal un HEAD"
+msgstr "HEAD incorrecte - cal un HEAD"
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"l'agafament de «%s» ha fallat. Proveu «git bisect start <branca-vàlida>»."
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek"
-#: builtin/bisect--helper.c:735
-#, fuzzy
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "HEAD incorrecte - referència simbòlica estranya"
-#: builtin/bisect--helper.c:755
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:772
+#, c-format
msgid "invalid ref: '%s'"
-msgstr "ref '%s' no és vàlid"
+msgstr "referència no és vàlida: «%s»"
-#: builtin/bisect--helper.c:813
-#, fuzzy
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
-msgstr "Cal començar per «git bisect start»"
+msgstr "Cal començar per «git bisect start»\n"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Voleu que ho faci per vostè [Y/n]? "
-#: builtin/bisect--helper.c:842
-#, fuzzy
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
-msgstr "Si us plau crideu `--bisect-state` amb almenys un argument"
+msgstr "Executeu «--bisect-state» amb almenys un argument"
-#: builtin/bisect--helper.c:855
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:872
+#, c-format
msgid "'git bisect %s' can take only one argument."
-msgstr "«git bisect $TERM_BAD» pot acceptar només un argument."
+msgstr "«git bisect %s» només pot acceptar un argument."
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
+#, c-format
msgid "Bad rev input: %s"
-msgstr "Introducció de revisió errònia: $arg"
+msgstr "Entrada amb revisió errònia: %s"
-#: builtin/bisect--helper.c:887
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:904
+#, c-format
msgid "Bad rev input (not a commit): %s"
-msgstr "Introducció de revisió errònia: $arg"
+msgstr "Entrada de revisió errònia (no és una comissió): %s"
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "No estem bisecant."
-#: builtin/bisect--helper.c:969
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:986
+#, c-format
msgid "'%s'?? what are you talking about?"
-msgstr "?? de què parleu?"
+msgstr "«%s»? Què voleu dir?"
-#: builtin/bisect--helper.c:981
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:998
+#, c-format
msgid "cannot read file '%s' for replaying"
-msgstr "no es pot llegir $file per a reproducció"
+msgstr "no es pot llegir «%s» per a reproducció"
-#: builtin/bisect--helper.c:1054
-#, fuzzy
+#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#, c-format
+msgid "running %s\n"
+msgstr "s'està executant %s\n"
+
+#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+msgid "bisect run failed: no command provided."
+msgstr "ha fallat l'execució de bisect: no s'ha proporcionat cap ordre."
+
+#: builtin/bisect--helper.c:1166
+#, c-format
+msgid "unable to verify '%s' on good revision"
+msgstr "no s'ha pogut verificar «%s» en una bona revisió"
+
+#: builtin/bisect--helper.c:1172
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr "codi d'error de sortida %d per a una bona revisió"
+
+#: builtin/bisect--helper.c:1180
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"l'execució de la de bisecció ha fallat: codi de sortida %d de «%s» és < 0 o "
+">= 128"
+
+#: builtin/bisect--helper.c:1195
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "no es pot obrir «%s» per a escriptura"
+
+#: builtin/bisect--helper.c:1213
+msgid "bisect run cannot continue any more"
+msgstr "l'execució de la bisecció no pot continuar més"
+
+#: builtin/bisect--helper.c:1215
+#, c-format
+msgid "bisect run success"
+msgstr "execució de bisecció amb èxit"
+
+#: builtin/bisect--helper.c:1218
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "la bisecció ha trobat una primera comissió errònia"
+
+#: builtin/bisect--helper.c:1221
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"l'execució de la bisecció ha fallat: «git bisect--helper --bisect-state %s» "
+"ha sortit amb el codi d'error %d"
+
+#: builtin/bisect--helper.c:1253
msgid "reset the bisection state"
msgstr "restableix l'estat de la bisecció"
-#: builtin/bisect--helper.c:1056
-#, fuzzy
+#: builtin/bisect--helper.c:1255
msgid "check whether bad or good terms exist"
-msgstr "comprova si existeixen termes incorrectes o bons"
+msgstr "comprova si existeixen termes correctes o incorrectes"
-#: builtin/bisect--helper.c:1058
-#, fuzzy
+#: builtin/bisect--helper.c:1257
msgid "print out the bisect terms"
-msgstr "imprimeix els termes de la bisectriu"
+msgstr "imprimeix els termes de la bisecció"
-#: builtin/bisect--helper.c:1060
-#, fuzzy
+#: builtin/bisect--helper.c:1259
msgid "start the bisect session"
-msgstr "inicia la sessió bisect"
+msgstr "inicia la sessió bisecció"
-#: builtin/bisect--helper.c:1062
-#, fuzzy
+#: builtin/bisect--helper.c:1261
msgid "find the next bisection commit"
-msgstr "no es pot esmenar una comissió no existent"
+msgstr "troba la comissió de bisecció següent"
-#: builtin/bisect--helper.c:1064
-#, fuzzy
+#: builtin/bisect--helper.c:1263
msgid "mark the state of ref (or refs)"
-msgstr "marca l'estat de ref (o refs)"
+msgstr "marca l'estat de la referència o referències"
-#: builtin/bisect--helper.c:1066
-#, fuzzy
+#: builtin/bisect--helper.c:1265
msgid "list the bisection steps so far"
-msgstr "restableix l'estat de la bisecció"
+msgstr "mostra les passes de la bisecció fins ara"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1267
msgid "replay the bisection process from the given file"
-msgstr ""
+msgstr "torna a reproduir el procés de bisecció des del fitxer donat"
-#: builtin/bisect--helper.c:1070
-#, fuzzy
+#: builtin/bisect--helper.c:1269
msgid "skip some commits for checkout"
-msgstr "la branca o entrega a agafar"
+msgstr "omet algunes comissions en agafar"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1271
+msgid "visualize the bisection"
+msgstr "visualitza la bisecció"
+
+#: builtin/bisect--helper.c:1273
+msgid "use <cmd>... to automatically bisect"
+msgstr "useu <cmd>... per a fer una bisecció automàticament"
+
+#: builtin/bisect--helper.c:1275
msgid "no log for BISECT_WRITE"
msgstr "no hi ha registre per a BISECT_WRITE"
-#: builtin/bisect--helper.c:1087
-#, fuzzy
+#: builtin/bisect--helper.c:1290
msgid "--bisect-reset requires either no argument or a commit"
-msgstr "--bisect-reset no requereix cap argument ni una comissió"
+msgstr "--bisect-reset no requereix cap argument ni comissió"
-#: builtin/bisect--helper.c:1092
-#, fuzzy
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check requereix 2 o 3 arguments"
-
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1295
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms requereix 0 o 1 argument"
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1304
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next no requereix cap argument"
-#: builtin/bisect--helper.c:1118
-#, fuzzy
+#: builtin/bisect--helper.c:1315
msgid "--bisect-log requires 0 arguments"
-msgstr "--bisect-next no requereix cap argument"
+msgstr "--bisect-log no requereix cap argument"
-#: builtin/bisect--helper.c:1123
-#, fuzzy
+#: builtin/bisect--helper.c:1320
msgid "no logfile given"
-msgstr "Cap fitxer de registre donat"
+msgstr "no s'ha donat cap fitxer de registre"
#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
@@ -11285,180 +11777,149 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "s'esperava un color: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "ha d'acabar amb un color"
-#: builtin/blame.c:728
-#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "color «%s» no vàlid en «color.blame.repeatedLines»"
-
-#: builtin/blame.c:746
-msgid "invalid value for blame.coloring"
-msgstr "valor no vàlid per a «blame.coloring»"
-
-#: builtin/blame.c:845
+#: builtin/blame.c:842
#, c-format
msgid "cannot find revision %s to ignore"
-msgstr "no s'ha pogut trobar la revisió %s per ignorar"
+msgstr "no s'ha pogut trobar la revisió %s a ignorar"
-#: builtin/blame.c:867
-#, fuzzy
+#: builtin/blame.c:864
msgid "show blame entries as we find them, incrementally"
-msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment"
+msgstr "mostra les entrades «blame» mentre les trobem, incrementalment"
-#: builtin/blame.c:868
-#, fuzzy
+#: builtin/blame.c:865
msgid "do not show object names of boundary commits (Default: off)"
msgstr ""
-"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
+"no mostris els noms d'objectes de les comissions de frontera (per defecte: "
"desactivat)"
-#: builtin/blame.c:869
-#, fuzzy
+#: builtin/blame.c:866
msgid "do not treat root commits as boundaries (Default: off)"
msgstr ""
-"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
+"no tractis les comissions arrel com de frontera (per defecte: desactivat)"
-#: builtin/blame.c:870
-#, fuzzy
+#: builtin/blame.c:867
msgid "show work cost statistics"
-msgstr "Mostra les estadístiques de preu de treball"
+msgstr "mostra les estadístiques de preu de treball"
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
+#: builtin/remote.c:683 builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "força l'informe de progrés"
-#: builtin/blame.c:872
-#, fuzzy
+#: builtin/blame.c:869
msgid "show output score for blame entries"
-msgstr "Mostra la puntuació de sortida de les entrades «blame»"
+msgstr "mostra la puntuació de sortida de les entrades «blame»"
+
+#: builtin/blame.c:870
+msgid "show original filename (Default: auto)"
+msgstr "mostra el nom de fitxer original (per defecte: automàtic)"
+
+#: builtin/blame.c:871
+msgid "show original linenumber (Default: off)"
+msgstr "mostra el número de línia original (per defecte: desactivat)"
+
+#: builtin/blame.c:872
+msgid "show in a format designed for machine consumption"
+msgstr "presenta en un format dissenyat per a ser consumit per una màquina"
#: builtin/blame.c:873
-#, fuzzy
-msgid "show original filename (Default: auto)"
-msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
+msgid "show porcelain format with per-line commit information"
+msgstr "mostra en format de porcellana amb informació de comissió per línia"
#: builtin/blame.c:874
-#, fuzzy
-msgid "show original linenumber (Default: off)"
-msgstr "Mostra el número de línia original (Per defecte: desactivat)"
-
-#: builtin/blame.c:875
-#, fuzzy
-msgid "show in a format designed for machine consumption"
-msgstr "Presenta en un format dissenyat per consumpció per màquina"
-
-#: builtin/blame.c:876
-#, fuzzy
-msgid "show porcelain format with per-line commit information"
-msgstr "Mostra el format de porcellana amb informació de comissió per línia"
-
-#: builtin/blame.c:877
-#, fuzzy
msgid "use the same output mode as git-annotate (Default: off)"
msgstr ""
-"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
+"usa el mateix mode de sortida que git-annotate (per defecte: desactivat)"
+
+#: builtin/blame.c:875
+msgid "show raw timestamp (Default: off)"
+msgstr "mostra la marca de temps en cru (per defecte: desactivat)"
+
+#: builtin/blame.c:876
+msgid "show long commit SHA1 (Default: off)"
+msgstr "mostra l'SHA1 de comissió llarg (per defecte: desactivat)"
+
+#: builtin/blame.c:877
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "omet el nom d'autor i la marca de temps (per defecte: desactivat)"
#: builtin/blame.c:878
-#, fuzzy
-msgid "show raw timestamp (Default: off)"
-msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
-
-#: builtin/blame.c:879
-#, fuzzy
-msgid "show long commit SHA1 (Default: off)"
-msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
-
-#: builtin/blame.c:880
-#, fuzzy
-msgid "suppress author name and timestamp (Default: off)"
-msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"
-
-#: builtin/blame.c:881
-#, fuzzy
msgid "show author email instead of name (Default: off)"
msgstr ""
-"Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: "
+"mostra el correu electrònic de l'autor en comptes del nom (per defecte: "
"desactivat)"
-#: builtin/blame.c:882
-#, fuzzy
+#: builtin/blame.c:879
msgid "ignore whitespace differences"
-msgstr "Ignora les diferències d'espai en blanc"
+msgstr "ignora les diferències d'espai en blanc"
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:880 builtin/log.c:1857
msgid "rev"
msgstr "rev"
-#: builtin/blame.c:883
-#, fuzzy
+#: builtin/blame.c:880
msgid "ignore <rev> when blaming"
-msgstr "Ignora <rev> en culpar"
+msgstr "ignora <rev> en fer «blame»"
+
+#: builtin/blame.c:881
+msgid "ignore revisions from <file>"
+msgstr "ignora les revisions de <fitxer>"
+
+#: builtin/blame.c:882
+msgid "color redundant metadata from previous line differently"
+msgstr ""
+"acoloreix les metadades redundants de la línia anterior de manera diferent"
+
+#: builtin/blame.c:883
+msgid "color lines by age"
+msgstr "acoloreix les línies per antiguitat"
#: builtin/blame.c:884
-#, fuzzy
-msgid "ignore revisions from <file>"
-msgstr "Ignora les revisions de <file>"
+msgid "spend extra cycles to find better match"
+msgstr "gasta cicles extres per a trobar una coincidència millor"
#: builtin/blame.c:885
-#, fuzzy
-msgid "color redundant metadata from previous line differently"
-msgstr "color les metadades redundants de la línia anterior de manera diferent"
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr "usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
#: builtin/blame.c:886
-#, fuzzy
-msgid "color lines by age"
-msgstr "coloreja les línies per edat"
-
-#: builtin/blame.c:887
-#, fuzzy
-msgid "spend extra cycles to find better match"
-msgstr "Gasta cicles extres per a trobar una coincidència millor"
-
-#: builtin/blame.c:888
-#, fuzzy
-msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
-
-#: builtin/blame.c:889
-#, fuzzy
msgid "use <file>'s contents as the final image"
-msgstr "Usa els continguts de <fitxer> com a la imatge final"
+msgstr "usa els continguts de <fitxer> com a la imatge final"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:887 builtin/blame.c:888
msgid "score"
msgstr "puntuació"
-#: builtin/blame.c:890
-#, fuzzy
+#: builtin/blame.c:887
msgid "find line copies within and across files"
-msgstr "Troba còpies de línia dins i a través dels fitxers"
+msgstr "troba còpies de línia dins i a través dels fitxers"
-#: builtin/blame.c:891
-#, fuzzy
+#: builtin/blame.c:888
msgid "find line movements within and across files"
-msgstr "Troba moviments de línia dins i a través dels fitxers"
+msgstr "troba moviments de línia dins i a través dels fitxers"
-#: builtin/blame.c:892
+#: builtin/blame.c:889
msgid "range"
msgstr "rang"
-#: builtin/blame.c:893
-#, fuzzy
+#: builtin/blame.c:890
msgid "process only line range <start>,<end> or function :<funcname>"
-msgstr "Processa només el rang de línies n,m, comptant des d'1"
+msgstr "processa només el rang <start>,<end> o la funció :<funcname>"
-#: builtin/blame.c:945
+#: builtin/blame.c:949
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"no es pot usar --progress amb els formats --incremental o de porcellana"
@@ -11470,19 +11931,18 @@
#. among various forms of relative timestamps, but
#. your language may need more or fewer display
#. columns.
-#.
-#: builtin/blame.c:996
+#: builtin/blame.c:1000
msgid "4 years, 11 months ago"
msgstr "fa 4 anys i 11 mesos"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1116
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "el fitxer %s té només %lu línia"
msgstr[1] "el fitxer %s té només %lu línies"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1161
msgid "Blaming lines"
msgstr "S'està fent un «blame»"
@@ -11491,30 +11951,38 @@
msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]"
#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
#: builtin/branch.c:31
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<options>] [-l] [<pattern>...]"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..."
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>"
-#: builtin/branch.c:33
+#: builtin/branch.c:34
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<opcions>] (-c | -C) [<branca-antiga>] <branca-nova>"
-#: builtin/branch.c:34
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
-#: builtin/branch.c:35
+#: builtin/branch.c:36
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opcions>] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:165
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -11524,7 +11992,7 @@
" fusionat a «%s», però encara no\n"
" s'ha fusionat a HEAD."
-#: builtin/branch.c:158
+#: builtin/branch.c:169
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -11534,12 +12002,12 @@
" s'ha fusionat a «%s», encara que està\n"
" fusionada a HEAD."
-#: builtin/branch.c:172
+#: builtin/branch.c:183
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "No s'ha pogut trobar l'objecte de comissió de «%s»"
-#: builtin/branch.c:176
+#: builtin/branch.c:187
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -11548,115 +12016,115 @@
"La branca «%s» no està totalment fusionada.\n"
"Si esteu segur que la voleu suprimir, executeu «git branch -D %s»."
-#: builtin/branch.c:189
+#: builtin/branch.c:200
msgid "Update of config-file failed"
msgstr "L'actualització del fitxer de configuració ha fallat"
-#: builtin/branch.c:223
+#: builtin/branch.c:235
msgid "cannot use -a with -d"
msgstr "no es pot usar -a amb -d"
-#: builtin/branch.c:230
+#: builtin/branch.c:242
msgid "Couldn't look up commit object for HEAD"
msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
-#: builtin/branch.c:244
+#: builtin/branch.c:259
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "No es pot suprimir la branca «%s» agafada a «%s»"
-#: builtin/branch.c:259
+#: builtin/branch.c:274
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "no s'ha trobat la branca amb seguiment remot «%s»."
-#: builtin/branch.c:260
+#: builtin/branch.c:275
#, c-format
msgid "branch '%s' not found."
msgstr "no s'ha trobat la branca «%s»."
-#: builtin/branch.c:291
+#: builtin/branch.c:306
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:307
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "S'ha suprimit la branca %s (era %s).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:457 builtin/tag.c:64
msgid "unable to parse format string"
msgstr "no s'ha pogut analitzar la cadena de format"
-#: builtin/branch.c:471
+#: builtin/branch.c:488
msgid "could not resolve HEAD"
msgstr "no s'ha pogut resoldre HEAD"
-#: builtin/branch.c:477
+#: builtin/branch.c:494
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) apunta fora de refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:509
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "S'està fent «rebase» en la branca %s a %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:513
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branca %s s'està bisecant a %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:530
msgid "cannot copy the current branch while not on any."
msgstr "no es pot copiar branca actual mentre no s'és a cap."
-#: builtin/branch.c:515
+#: builtin/branch.c:532
msgid "cannot rename the current branch while not on any."
msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap."
-#: builtin/branch.c:526
+#: builtin/branch.c:543
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branca no vàlid: «%s»"
-#: builtin/branch.c:555
+#: builtin/branch.c:572
msgid "Branch rename failed"
msgstr "El canvi de nom de branca ha fallat"
-#: builtin/branch.c:557
+#: builtin/branch.c:574
msgid "Branch copy failed"
msgstr "La còpia de la branca ha fallat"
-#: builtin/branch.c:561
+#: builtin/branch.c:578
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "S'ha creat una còpia d'una branca mal anomenada «%s»"
-#: builtin/branch.c:564
+#: builtin/branch.c:581
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "S'ha canviat el nom de la branca mal anomenada «%s»"
-#: builtin/branch.c:570
+#: builtin/branch.c:587
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!"
-#: builtin/branch.c:579
+#: builtin/branch.c:596
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branca està canviada de nom, però l'actualització del fitxer de "
"configuració ha fallat"
-#: builtin/branch.c:581
+#: builtin/branch.c:598
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La branca està copiada, però l'actualització del fitxer de configuració ha "
"fallat"
-#: builtin/branch.c:597
+#: builtin/branch.c:614
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11667,256 +12135,267 @@
" %s\n"
"S'eliminaran les línies que comencin amb «%c».\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Opcions genèriques"
-#: builtin/branch.c:633
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
-msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font"
+msgstr "mostra el hash i l'assumpte, doneu dues vegades per a la branca font"
-#: builtin/branch.c:634
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "omet els missatges informatius"
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "configura el mode de seguiment (vegeu git-pull(1))"
+#: builtin/branch.c:656 builtin/checkout.c:1571
+#: builtin/submodule--helper.c:3077
+msgid "set branch tracking configuration"
+msgstr "estableix la configuració del seguiment de la branca"
-#: builtin/branch.c:637
+#: builtin/branch.c:659
msgid "do not use"
msgstr "no usar"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:661
msgid "upstream"
msgstr "font"
-#: builtin/branch.c:639
+#: builtin/branch.c:661
msgid "change the upstream info"
msgstr "canvia la informació de font"
-#: builtin/branch.c:640
-#, fuzzy
+#: builtin/branch.c:662
msgid "unset the upstream info"
msgstr "treu la informació de la font"
-#: builtin/branch.c:641
+#: builtin/branch.c:663
msgid "use colored output"
-msgstr "usa sortida colorada"
+msgstr "usa sortida amb colors"
-#: builtin/branch.c:642
+#: builtin/branch.c:664
msgid "act on remote-tracking branches"
msgstr "actua en branques amb seguiment remot"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:666 builtin/branch.c:668
msgid "print only branches that contain the commit"
msgstr "imprimeix només les branques que continguin la comissió"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:667 builtin/branch.c:669
msgid "print only branches that don't contain the commit"
msgstr "imprimeix només les branques que no continguin la comissió"
-#: builtin/branch.c:650
+#: builtin/branch.c:672
msgid "Specific git-branch actions:"
msgstr "Accions de git-branch específiques:"
-#: builtin/branch.c:651
+#: builtin/branch.c:673
msgid "list both remote-tracking and local branches"
msgstr "llista les branques amb seguiment remot i les locals"
-#: builtin/branch.c:653
+#: builtin/branch.c:675
msgid "delete fully merged branch"
msgstr "suprimeix la branca si està completament fusionada"
-#: builtin/branch.c:654
+#: builtin/branch.c:676
msgid "delete branch (even if not merged)"
msgstr "suprimeix la branca (encara que no estigui fusionada)"
-#: builtin/branch.c:655
+#: builtin/branch.c:677
msgid "move/rename a branch and its reflog"
msgstr "mou/canvia de nom una branca i el seu registre de referència"
-#: builtin/branch.c:656
+#: builtin/branch.c:678
msgid "move/rename a branch, even if target exists"
msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
-#: builtin/branch.c:657
+#: builtin/branch.c:679
msgid "copy a branch and its reflog"
msgstr "copia una branca i el seu registre de referència"
-#: builtin/branch.c:658
+#: builtin/branch.c:680
msgid "copy a branch, even if target exists"
msgstr "copia una branca, encara que el destí existeixi"
-#: builtin/branch.c:659
+#: builtin/branch.c:681
msgid "list branch names"
msgstr "llista els noms de branca"
-#: builtin/branch.c:660
+#: builtin/branch.c:682
msgid "show current branch name"
msgstr "mostra el nom de la branca actual"
-#: builtin/branch.c:661
+#: builtin/branch.c:683 builtin/submodule--helper.c:3075
msgid "create the branch's reflog"
msgstr "crea el registre de referència de la branca"
-#: builtin/branch.c:663
+#: builtin/branch.c:685
msgid "edit the description for the branch"
msgstr "edita la descripció de la branca"
-#: builtin/branch.c:664
+#: builtin/branch.c:686
msgid "force creation, move/rename, deletion"
msgstr "força creació, moviment/canvi de nom, supressió"
-#: builtin/branch.c:665
+#: builtin/branch.c:687
msgid "print only branches that are merged"
msgstr "imprimeix només les branques que s'han fusionat"
-#: builtin/branch.c:666
+#: builtin/branch.c:688
msgid "print only branches that are not merged"
msgstr "imprimeix només les branques que no s'han fusionat"
-#: builtin/branch.c:667
+#: builtin/branch.c:689
msgid "list branches in columns"
msgstr "llista les branques en columnes"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:476
msgid "object"
msgstr "objecte"
-#: builtin/branch.c:670
+#: builtin/branch.c:692
msgid "print only branches of the object"
msgstr "imprimeix només les branques de l'objecte"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
msgid "sorting and filtering are case insensitive"
msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:694 builtin/ls-files.c:667
+msgid "recurse through submodules"
+msgstr "inclou recursivament als submòduls"
+
+#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
+#: builtin/tag.c:481 builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format a usar en la sortida"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:718 builtin/clone.c:684
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column i --verbose són incompatibles"
+#: builtin/branch.c:739
+msgid ""
+"branch with --recurse-submodules can only be used if "
+"submodule.propagateBranches is enabled"
+msgstr ""
+"la branca amb --recurse-submodules només es pot utilitzar si "
+"submodule.propagateBranches està habilitat"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:741
+msgid "--recurse-submodules can only be used to create branches"
+msgstr "--recurse-submodules només es pot utilitzar per a crear branques"
+
+#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
msgid "branch name required"
msgstr "cal el nom de branca"
-#: builtin/branch.c:766
+#: builtin/branch.c:802
msgid "Cannot give description to detached HEAD"
msgstr "No es pot donar descripció a un HEAD separat"
-#: builtin/branch.c:771
+#: builtin/branch.c:807
msgid "cannot edit description of more than one branch"
msgstr "no es pot editar la descripció de més d'una branca"
-#: builtin/branch.c:778
+#: builtin/branch.c:814
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Encara no hi ha cap comissió en la branca «%s»."
-#: builtin/branch.c:781
+#: builtin/branch.c:817
#, c-format
msgid "No branch named '%s'."
msgstr "No hi ha cap branca amb nom «%s»."
-#: builtin/branch.c:796
+#: builtin/branch.c:832
msgid "too many branches for a copy operation"
msgstr "hi ha massa branques per a una operació de còpia"
-#: builtin/branch.c:805
+#: builtin/branch.c:841
msgid "too many arguments for a rename operation"
msgstr "hi ha massa arguments per a una operació de canvi de nom"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "too many arguments to set new upstream"
msgstr "hi ha massa arguments per a establir una nova font"
-#: builtin/branch.c:814
+#: builtin/branch.c:850
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
+"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap "
+"branca."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:853 builtin/branch.c:873
#, c-format
msgid "no such branch '%s'"
msgstr "no existeix la branca «%s»"
-#: builtin/branch.c:821
+#: builtin/branch.c:857
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branca «%s» no existeix"
-#: builtin/branch.c:834
+#: builtin/branch.c:867
msgid "too many arguments to unset upstream"
msgstr "hi ha massa arguments per a desassignar la font"
-#: builtin/branch.c:838
+#: builtin/branch.c:871
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"no s'ha pogut desassignar la font de HEAD perquè no assenyala cap branca."
-#: builtin/branch.c:844
+#: builtin/branch.c:877
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branca «%s» no té informació de font"
-#: builtin/branch.c:854
-#, fuzzy
+#: builtin/branch.c:890
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-"Les opcions -a i -r a «git branch» no prenen un nom de branca. Voleu usar -"
-"a|-r --list <pattern>?"
+"Les opcions -a i -r a «git branch» no prenen un nom de branca.\n"
+"Volíeu usar -a|-r --list <pattern>?"
-#: builtin/branch.c:858
+#: builtin/branch.c:894
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
-"L'opció --set-upstream ja no s'admet. En lloc seu, useu «--track» o «--set-"
+"l'opció --set-upstream ja no s'admet. En lloc seu, useu «--track» o «--set-"
"upstream-to»."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "versió de git:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() ha fallat amb l'error «%s» (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "informació del compilador: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
-msgstr "Informació de la libc: "
+msgstr "informació de la libc: "
-#: builtin/bugreport.c:80
-#, fuzzy
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
-msgstr "no és un repositori de git: %s"
+msgstr ""
+"no s'està executant en un repositori de git - no hi ha lligams a mostrar\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
-#: builtin/bugreport.c:97
-#, fuzzy
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11934,209 +12413,330 @@
"Please review the rest of the bug report below.\n"
"You can delete any lines you don't wish to share.\n"
msgstr ""
-"Gràcies per emplenar un informe d'error del Git! Responeu les següents "
-"preguntes per ajudar-nos a entendre el vostre problema. Què heu fet abans "
-"que passés l'error? (Pas per reproduir el vostre problema) Què espereu que "
-"passi? (Comportament explotat) Què ha passat? (Comportament real) Què és "
-"diferent entre el que s'esperava i què ha passat? Qualsevol altra cosa que "
-"vulgueu afegir Reviseu la resta de l'informe d'error de sota. Podeu eliminar "
-"qualsevol línia que vulgueu."
+"Gràcies per informar d'un error del Git!\n"
+"Responeu les preguntes en anglès per a ajudar-nos a entendre el problema.\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"
+"Reviseu la resta de l'informe d'error de sota.\n"
+"Podeu eliminar qualsevol línia que vulgueu.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "especifiqueu una destinació per al fitxer d'informe d'error"
-#: builtin/bugreport.c:138
-#, fuzzy
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
-msgstr "especifiqueu un sufix de format strftime per al nom de fitxer"
+msgstr "especifiqueu un sufix en format strftime per al nom de fitxer"
-#: builtin/bugreport.c:160
-#, fuzzy, c-format
+#: builtin/bugreport.c:132
+#, c-format
msgid "could not create leading directories for '%s'"
-msgstr "no s'han pogut crear els directoris inicials de «%s»"
+msgstr "no s'han pogut crear els directoris principals de «%s»"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Informació del sistema"
-#: builtin/bugreport.c:170
-#, fuzzy
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
-msgstr "no s'ha pogut bifurcar"
+msgstr "Habilita els lligams"
-#: builtin/bugreport.c:177
-#, fuzzy, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "no s'ha pogut crear el fitxer «%s»"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "no s'ha pogut escriure a %s"
-#: builtin/bugreport.c:190
-#, fuzzy, c-format
+#: builtin/bugreport.c:159
+#, c-format
msgid "Created new report at '%s'.\n"
-msgstr "S'ha netejat el directori «%s»\n"
+msgstr "S'ha creat un nou informe a «%s».\n"
#: builtin/bundle.c:15 builtin/bundle.c:23
-#, fuzzy
msgid "git bundle create [<options>] <file> <git-rev-list args>"
-msgstr "git pack create [<opcions>] <file> <git-rev-list args>"
+msgstr "git bundle create [<opcions>] <fitxer> <git-rev-list args>"
#: builtin/bundle.c:16 builtin/bundle.c:28
-#, fuzzy
msgid "git bundle verify [<options>] <file>"
-msgstr "git pack verify [<opcions>] <file>"
+msgstr "git bundle verify [<opcions>] <fitxer>"
#: builtin/bundle.c:17 builtin/bundle.c:33
-#, fuzzy
msgid "git bundle list-heads <file> [<refname>...]"
-msgstr "git pack list-heads <file> [<refname>]"
+msgstr "git bundle list-heads <fitxer> [<refname>...]"
#: builtin/bundle.c:18 builtin/bundle.c:38
-#, fuzzy
msgid "git bundle unbundle <file> [<refname>...]"
-msgstr "git bundle <file> [<refname>]"
+msgstr "git bundle unbundle <fitxer> [<refname>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3899
msgid "do not show progress meter"
msgstr "no mostris l'indicador de progrés"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
msgid "show progress meter"
msgstr "mostra l'indicador de progrés"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3903
msgid "show progress meter during object writing phase"
msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3906
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress quan l'indicador de progrés es mostra"
-#: builtin/bundle.c:76
-#, fuzzy
+#: builtin/bundle.c:74
msgid "specify bundle format version"
-msgstr "especifica la versió del format del paquet"
+msgstr "especifica la versió del format del farcell"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
-msgstr "Cal un repositori per a fer un farcell."
+msgstr "Cal un repositori per a crear un farcell."
-#: builtin/bundle.c:107
-#, fuzzy
+#: builtin/bundle.c:108
msgid "do not show bundle details"
-msgstr "no mostris els detalls del paquet"
+msgstr "no mostris els detalls del farcell"
-#: builtin/bundle.c:122
+#: builtin/bundle.c:127
#, c-format
msgid "%s is okay\n"
msgstr "%s està bé\n"
-#: builtin/bundle.c:163
+#: builtin/bundle.c:183
msgid "Need a repository to unbundle."
msgstr "Cal un repositori per a desfer un farcell."
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
+#: builtin/bundle.c:186
+msgid "Unbundling objects"
+msgstr "S'estan desagrupant objectes"
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:220 builtin/remote.c:1758
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subordre desconeguda: %s"
-#: builtin/cat-file.c:598
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
-msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
+#: builtin/cat-file.c:568
+msgid "flush is only for --buffer mode"
+msgstr "flush només és per al mode --buffer"
-#: builtin/cat-file.c:599
-#, fuzzy
-msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+#: builtin/cat-file.c:612
+msgid "empty command in input"
+msgstr "ordre buida en l'entrada"
-#: builtin/cat-file.c:620
-#, fuzzy
+#: builtin/cat-file.c:614
+#, c-format, fuzzy
+msgid "whitespace before command: '%s'"
+msgstr "espai en blanc abans de l'ordre: '%s'"
+
+#: builtin/cat-file.c:623
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s requereix arguments"
+
+#: builtin/cat-file.c:628
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s no accepta cap valor"
+
+#: builtin/cat-file.c:636
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "ordre desconeguda: «%s»"
+
+#: builtin/cat-file.c:795
msgid "only one batch option may be specified"
msgstr "només es pot especificar una opció per lots"
-#: builtin/cat-file.c:638
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
+#: builtin/cat-file.c:824
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <type> <object>"
-#: builtin/cat-file.c:639
-msgid "show object type"
-msgstr "mostra el tipus de l'objecte"
+#: builtin/cat-file.c:825
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git cat-file (-e | -p) <object>"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:826
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+
+#: builtin/cat-file.c:827
+msgid ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+
+#: builtin/cat-file.c:830
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+
+#: builtin/cat-file.c:836
+#, fuzzy
+msgid "Check object existence or emit object contents"
+msgstr "Comprova l'existència de l'objecte o emet el contingut de l'objecte"
+
+#: builtin/cat-file.c:838
+#, fuzzy
+msgid "check if <object> exists"
+msgstr "comprova si <object> existeix"
+
+#: builtin/cat-file.c:839
+#, fuzzy
+msgid "pretty-print <object> content"
+msgstr "empremta de <object> contingut"
+
+#: builtin/cat-file.c:841
+#, fuzzy
+msgid "Emit [broken] object attributes"
+msgstr "Emet els atributs de l'objecte objectbroken]"
+
+#: builtin/cat-file.c:842
+#, fuzzy
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr ""
+"mostra el tipus d'objecte (un de 'blob', 'tree', 'commit', 'tag', ...)"
+
+#: builtin/cat-file.c:843
msgid "show object size"
msgstr "mostra la mida de l'objecte"
-#: builtin/cat-file.c:642
-msgid "exit with zero when there's no error"
-msgstr "surt amb zero quan no hi ha error"
-
-#: builtin/cat-file.c:643
-msgid "pretty-print object's content"
-msgstr "imprimeix bellament el contingut de l'objecte"
-
-#: builtin/cat-file.c:645
-msgid "for blob objects, run textconv on object's content"
-msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
-
-#: builtin/cat-file.c:647
-msgid "for blob objects, run filters on object's content"
-msgstr ""
-"en els objectes de blob, executa els filtres en el contingut de l'objecte"
-
-#: builtin/cat-file.c:648
-msgid "blob"
-msgstr "blob"
-
-#: builtin/cat-file.c:649
-msgid "use a specific path for --textconv/--filters"
-msgstr "usa un camí específic per a --textconv/--filters"
-
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:845
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:847
+#, fuzzy
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr "Objectes lots sol·licitats a stdin (o --batch-all-objects)"
+
+#: builtin/cat-file.c:849
+#, fuzzy
+msgid "show full <object> or <rev> contents"
+msgstr "mostra el contingut complet de <object> o <rev>"
+
+#: builtin/cat-file.c:853
+#, fuzzy
+msgid "like --batch, but don't emit <contents>"
+msgstr "com --batch, però no emeti <contents>"
+
+#: builtin/cat-file.c:857
+#, fuzzy
+msgid "read commands from stdin"
+msgstr "llegeix les ordres de stdin"
+
+#: builtin/cat-file.c:861
+#, fuzzy
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr "amb --batch--check:: ignora stdin, bateja tots els objectes coneguts"
+
+#: builtin/cat-file.c:863
+#, fuzzy
+msgid "Change or optimize batch output"
+msgstr "Canvia o optimitza la sortida per lots"
+
+#: builtin/cat-file.c:864
msgid "buffer --batch output"
msgstr "posa la sortida de --batch en memòria intermèdia"
-#: builtin/cat-file.c:654
-msgid "show info and content of objects fed from the standard input"
-msgstr ""
-"mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
-
-#: builtin/cat-file.c:658
-msgid "show info about objects fed from the standard input"
-msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
-
-#: builtin/cat-file.c:662
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr ""
-"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
-
-#: builtin/cat-file.c:664
-msgid "show all objects with --batch or --batch-check"
-msgstr "mostra tots els objectes amb --batch o --batch-check"
-
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:866
#, fuzzy
-msgid "do not order --batch-all-objects output"
-msgstr "no ordenar la sortida --batch-all-objects"
+msgid "follow in-tree symlinks"
+msgstr "segueix els enllaços simbòlics en l'arbre"
+
+#: builtin/cat-file.c:868
+#, fuzzy
+msgid "do not order objects before emitting them"
+msgstr "no ordena objectes abans d'emetre'ls"
+
+#: builtin/cat-file.c:870
+#, fuzzy
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
+msgstr ""
+"Emet l'objecte (blob o arbre) amb conversió o filtre (stand-alone, o amb "
+"lot)"
+
+#: builtin/cat-file.c:872
+#, fuzzy
+msgid "run textconv on object's content"
+msgstr "executar textconv al contingut de l'objecte"
+
+#: builtin/cat-file.c:874
+#, fuzzy
+msgid "run filters on object's content"
+msgstr "executa els filtres al contingut de l'objecte"
+
+#: builtin/cat-file.c:875
+msgid "blob|tree"
+msgstr "blob|tree"
+
+#: builtin/cat-file.c:876
+#, fuzzy
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
+msgstr "useu un <path> per a (--textconv | --filters); No amb 'batch'"
+
+#: builtin/cat-file.c:894
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "«%s=<%s>» necessita «%s» o «%s»"
+
+#: builtin/cat-file.c:896
+msgid "path|tree-ish"
+msgstr "path|tree-ish"
+
+#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "%s requereix un mode batch"
+
+#: builtin/cat-file.c:921
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "«-%c» és incompatible amb el model batch"
+
+#: builtin/cat-file.c:924
+msgid "batch modes take no arguments"
+msgstr "el mode batch no accepta cap argument"
+
+#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "<rev> requerida amb «%s»"
+
+#: builtin/cat-file.c:938
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "<object> requerit amb «-%c»"
+
+#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429
+#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596
+#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965
+#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
+#: builtin/tag.c:592
+msgid "too many arguments"
+msgstr "hi ha massa arguments"
+
+#: builtin/cat-file.c:947
+#, c-format, fuzzy
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr ""
+"només es permeten dos arguments en el mode <type> <object>, no en un "
+"percentatge"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -12154,7 +12754,7 @@
msgid "use .gitattributes only from the index"
msgstr "usa .gitattributes només des de l'índex"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
msgid "read file names from stdin"
msgstr "llegeix els noms de fitxer de stdin"
@@ -12162,8 +12762,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
+#: builtin/worktree.c:565
msgid "suppress progress reporting"
msgstr "omet els informes de progrés"
@@ -12217,223 +12817,223 @@
msgstr "no hi ha contactes especificats"
#: builtin/checkout--worker.c:110
-#, fuzzy
msgid "git checkout--worker [<options>]"
-msgstr "git checkout [<opcions>] <branca>"
+msgstr "git checkout--worker [<opcions>]"
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
+#: builtin/worktree.c:808
msgid "string"
msgstr "cadena"
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
msgid "when creating files, prepend <string>"
msgstr "en crear fitxers, anteposa <cadena>"
-#: builtin/checkout-index.c:152
+#: builtin/checkout-index.c:184
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<opcions>] [--] [<fitxer>...]"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:201
msgid "stage should be between 1 and 3 or all"
msgstr "«stage» ha de ser entre 1 i 3 o all"
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:219
msgid "check out all files in the index"
msgstr "agafa tots els fitxers en l'índex"
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:221
+#, fuzzy
+msgid "do not skip files with skip-worktree set"
+msgstr "no ometis els fitxers amb el conjunt d'arbres de salt"
+
+#: builtin/checkout-index.c:222
msgid "force overwrite of existing files"
msgstr "força la sobreescriptura de fitxers existents"
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:224
msgid "no warning for existing files and files not in index"
msgstr ""
"cap advertència per a fitxers existents i fitxers que no siguin a l'índex"
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:226
msgid "don't checkout new files"
msgstr "no agafis fitxers nous"
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:228
msgid "update stat information in the index file"
msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
-#: builtin/checkout-index.c:198
+#: builtin/checkout-index.c:232
msgid "read list of paths from the standard input"
msgstr "llegeix la llista de camins des de l'entrada estàndard"
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:234
msgid "write the content to temporary files"
msgstr "escriu el contingut a fitxers temporals"
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:238
msgid "copy out the files from named stage"
msgstr "copia els fitxers des de «stage» amb nom"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:34
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<opcions>] <branca>"
-#: builtin/checkout.c:34
+#: builtin/checkout.c:35
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
-#: builtin/checkout.c:39
+#: builtin/checkout.c:40
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<options>] [<branch>]"
-#: builtin/checkout.c:44
+#: builtin/checkout.c:45
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<opcions>] [--source=<branca>] <fitxer>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:199 builtin/checkout.c:238
#, c-format
msgid "path '%s' does not have our version"
msgstr "el camí «%s» no té la nostra versió"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:201 builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have their version"
msgstr "el camí «%s» no té la seva versió"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:217
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "el camí «%s» no té totes les versions necessàries"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:271
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "el camí «%s» no té les versions necessàries"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:291
#, c-format
msgid "path '%s': cannot merge"
msgstr "camí «%s»: no es pot fusionar"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:307
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
-#: builtin/checkout.c:414
-#, fuzzy, c-format
+#: builtin/checkout.c:424
+#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
-msgstr[0] "Conflicte de fusió recreat en un 1%"
-msgstr[1] "Conflictes de fusió recreats en un 1%"
+msgstr[0] "Recreat un conflicte de fusió"
+msgstr[1] "Recreats %d conflictes de fusió"
-#: builtin/checkout.c:419
-#, fuzzy, c-format
+#: builtin/checkout.c:429
+#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
-msgstr[0] "Camí actualitzat d'un 1% des d'un 1%"
-msgstr[1] "Camins actualitzats a un 1% des d'un 1%"
+msgstr[0] "S'ha actualitzat %d camí des de %s"
+msgstr[1] "S'han actualitzat %d camins des de %s"
-#: builtin/checkout.c:426
+#: builtin/checkout.c:436
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "S'ha actualitzat un camí des de l'índex"
msgstr[1] "S'ha actualitzat %d camins des de l'índex"
-#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:469
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "«%s» no es pot usar amb actualització de camins"
-#: builtin/checkout.c:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "«%s» no es pot usar amb %s"
-
-#: builtin/checkout.c:469
+#: builtin/checkout.c:479
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"No es poden actualitzar els camins i canviar a la branca «%s» a la vegada."
-#: builtin/checkout.c:473
+#: builtin/checkout.c:483
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "no s'ha especificat ni «%s» ni «%s»"
-#: builtin/checkout.c:477
-#, fuzzy, c-format
+#: builtin/checkout.c:487
+#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "«%s» s'ha d'utilitzar quan no s'especifica «%s»"
-#: builtin/checkout.c:482 builtin/checkout.c:487
+#: builtin/checkout.c:492 builtin/checkout.c:497
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "«%s» o «%s» no poden utilitzar-se amb %s"
-#: builtin/checkout.c:563 builtin/checkout.c:570
+#: builtin/checkout.c:571 builtin/checkout.c:578
#, c-format
msgid "path '%s' is unmerged"
msgstr "el camí «%s» està sense fusionar"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:753
msgid "you need to resolve your current index first"
msgstr "heu de primer resoldre el vostre índex actual"
-#: builtin/checkout.c:793
-#, fuzzy, c-format
+#: builtin/checkout.c:809
+#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-"no es poden continuar amb els canvis «staged» als fitxers següents "
-"percentatges"
+"no es pot continuar amb els canvis «staged» als fitxers següents:\n"
+"%s"
-#: builtin/checkout.c:886
+#: builtin/checkout.c:902
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No es pot fer reflog per a «%s»: %s\n"
-#: builtin/checkout.c:928
+#: builtin/checkout.c:947
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "no s'ha pogut actualitzar HEAD"
-#: builtin/checkout.c:936
+#: builtin/checkout.c:955
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la branca «%s»\n"
-#: builtin/checkout.c:939
+#: builtin/checkout.c:958
#, c-format
msgid "Already on '%s'\n"
msgstr "Ja esteu en «%s»\n"
-#: builtin/checkout.c:943
+#: builtin/checkout.c:962
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "S'ha canviat i restablert a la branca «%s»\n"
-#: builtin/checkout.c:945 builtin/checkout.c:1376
+#: builtin/checkout.c:964 builtin/checkout.c:1398
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "S'ha canviat a la branca nova «%s»\n"
-#: builtin/checkout.c:947
+#: builtin/checkout.c:966
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "S'ha canviat a la branca «%s»\n"
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1017
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12456,7 +13056,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1023
+#: builtin/checkout.c:1042
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12483,29 +13083,28 @@
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1077
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1081
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: builtin/checkout.c:1124 builtin/checkout.c:1393
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de néixer"
-#: builtin/checkout.c:1184
-#, fuzzy, c-format
+#: builtin/checkout.c:1206
+#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-"\"%s\" podria ser tant un fitxer local com una branca de seguiment. Si us "
-"plau useu -- (i opcionalment --no-gues) per a desambiguar"
+"«%s» podria ser tant un fitxer local com una branca de seguiment.\n"
+"Useu -- (i opcionalment --no-guess) per a desambiguar-ho"
-#: builtin/checkout.c:1191
-#, fuzzy
+#: builtin/checkout.c:1213
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"
@@ -12516,93 +13115,100 @@
"one remote, e.g. the 'origin' remote, consider setting\n"
"checkout.defaultRemote=origin in your config."
msgstr ""
-"Si voleu comprovar una branca de seguiment remota p. ex. «origen» podeu fer-"
-"ho classificant completament el nom amb l'opció --track git checkout --track "
-"origin/<name> Si voleu tenir sempre agafades d'un ambigu <name> preferiu un "
-"remot p. ex. el paràmetre remot 'origin' considereu agafar."
-"defaultRemote=origin a la vostra configuració."
+"Si voleu agafar una branca de seguiment remota, p. ex. «origin», podeu\n"
+"fer-ho especificant el nom complet amb l'opció --track:\n"
+"\n"
+" git checkout --track origin/<nom>\n"
+"\n"
+"Si voleu que en agafar un branca amb un <nom> ambigu s'usi una branca\n"
+"remota, p. ex. «origin» al remot, considereu configurar l'opció\n"
+"checkout.defaultRemote=origin en la vostra configuració."
-#: builtin/checkout.c:1201
+#: builtin/checkout.c:1223
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "«%s» coincideixen múltiples (%d) branques de seguiment remotes"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1289
msgid "only one reference expected"
msgstr "només s'esperava una referència"
-#: builtin/checkout.c:1284
+#: builtin/checkout.c:1306
#, c-format
msgid "only one reference expected, %d given."
msgstr "s'esperava només una referència, s'han donat %d."
-#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
-#: builtin/checkout.c:1343 builtin/checkout.c:1709
+#: builtin/checkout.c:1365 builtin/checkout.c:1744
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
-#: builtin/checkout.c:1390
+#: builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "s'espera una branca, s'ha obtingut l'etiqueta «%s»"
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1415
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "s'espera una branca, s'ha obtingut la branca remota «%s»"
-#: builtin/checkout.c:1393 builtin/checkout.c:1401
+#: builtin/checkout.c:1417 builtin/checkout.c:1426
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "s'espera una branca, s'ha obtingut «%s»"
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1420
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "s'espera una branca, s'ha obtingut la comissió «%s»"
-#: builtin/checkout.c:1412
-#, fuzzy
+#: builtin/checkout.c:1429
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach "
+"option."
+msgstr ""
+"Si voleu desacoblar HEAD a la comissió, torneu-ho a provar amb l'opció "
+"--detach."
+
+#: builtin/checkout.c:1442
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-"no es pot canviar de branca mentre es fusiona «git merge --quit» o «git "
-"worktree add»."
+"no es pot canviar de branca mentre es fusiona\n"
+"Considereu usar «git merge --quit» o «git worktree add»."
-#: builtin/checkout.c:1416
-#, fuzzy
+#: builtin/checkout.c:1446
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-"no es pot canviar de branca al mig d'una sessió am Considereu \"git am --quit"
-"\" o \"git worktree add\"."
+"no es pot canviar de branca en mig d'una sessió «am»\n"
+"Considereu usar «git am --quit» o «git worktree add»."
-#: builtin/checkout.c:1420
-#, fuzzy
+#: builtin/checkout.c:1450
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-"no es pot canviar de branca mentre es rebase considera «git rebase --quit» o "
-"«git worktree add»."
+"no es pot canviar de branca mentre es fa «rebase»\n"
+"Considereu usar «git rebase --quit» o «git worktree add»."
-#: builtin/checkout.c:1424
-#, fuzzy
+#: builtin/checkout.c:1454
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-"no es pot canviar de branca mentre «cherry pick» considera «git cherry-pick "
-"--quit» o «git worktree add»."
+"no es pot canviar de branca mentre es fa «cherry-pick»\n"
+"Considereu usar «git cherry-pick --quit» o «git worktree add»."
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1458
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12610,140 +13216,123 @@
"no es pot canviar de branca mentre s'està revertint\n"
"Considereu «git revert --quit» o «git worktree add»."
-#: builtin/checkout.c:1432
-#, fuzzy
+#: builtin/checkout.c:1462
msgid "you are switching branch while bisecting"
-msgstr "s'està canviant la branca mentre es bisect"
+msgstr "s'està canviant la branca mentre es fa una bisecció"
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1469
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "«%s» no es pot usar amb canvi de branca"
-#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
+#: builtin/checkout.c:1495 builtin/checkout.c:1500
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» no es pot usar amb «%s»"
-#: builtin/checkout.c:1467
+#: builtin/checkout.c:1497
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "«%s» no pot prendre <start-point>"
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1505
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No es pot canviar la branca a la no comissió «%s»"
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1512
msgid "missing branch or commit argument"
msgstr "manca branca o argument de comissió"
-#: builtin/checkout.c:1525
+#: builtin/checkout.c:1555
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la branca nova"
-#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
msgid "style"
msgstr "estil"
-#: builtin/checkout.c:1527
-msgid "conflict style (merge or diff3)"
-msgstr "estil de conflicte (fusió o diff3)"
+#: builtin/checkout.c:1557
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "estil de conflicte (merge, diff3, o zdiff3)"
-#: builtin/checkout.c:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1569 builtin/worktree.c:560
msgid "detach HEAD at named commit"
msgstr "separa HEAD a la comissió anomenada"
-#: builtin/checkout.c:1540
-msgid "set upstream info for new branch"
-msgstr "estableix la informació de font de la branca nova"
-
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1574
msgid "force checkout (throw away local modifications)"
msgstr "agafa a la força (descarta qualsevol modificació local)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1576
msgid "new-branch"
msgstr "branca-nova"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1576
msgid "new unparented branch"
msgstr "branca òrfena nova"
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1578 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
-#: builtin/checkout.c:1549
+#: builtin/checkout.c:1581
msgid "do not check if another worktree is holding the given ref"
-msgstr "no comprovis si altre arbre de treball té la referència donada"
+msgstr "no comprovis si un altre arbre de treball té la referència donada"
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1594
msgid "checkout our version for unmerged files"
msgstr "agafa la versió nostra dels fitxers sense fusionar"
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1597
msgid "checkout their version for unmerged files"
msgstr "agafa la versió seva dels fitxers sense fusionar"
-#: builtin/checkout.c:1569
+#: builtin/checkout.c:1601
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de camí només a entrades disperses"
-#: builtin/checkout.c:1624
+#: builtin/checkout.c:1659
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c i --orphan són mútuament excloents"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "les opcions «-%c», «-%c», i «%s» no es poden usar juntes"
-#: builtin/checkout.c:1628
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p i --overlay són mútuament excloents"
-
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1700
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1705
#, c-format
msgid "missing branch name; try -%c"
msgstr "falta el nom de la branca; proveu -%c"
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1737
#, c-format
msgid "could not resolve %s"
msgstr "no es pot resoldre %s"
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1753
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1760
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta "
"comissió"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1764
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no accepta un argument de camí «%s»"
-#: builtin/checkout.c:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file és incompatible amb --detach"
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file és incompatible amb --patch"
-
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1789
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12751,73 +13340,71 @@
"git checkout: --ours/--theirs, --force i --merge són incompatibles en\n"
"agafar de l'índex."
-#: builtin/checkout.c:1759
+#: builtin/checkout.c:1794
msgid "you must specify path(s) to restore"
msgstr "heu d'especificar el camí o camins a restaurar"
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
+#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
+#: builtin/remote.c:173 builtin/submodule--helper.c:3038
+#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
+#: builtin/worktree.c:558
msgid "branch"
msgstr "branca"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1820
msgid "create and checkout a new branch"
msgstr "crea i agafa una branca nova"
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1822
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una branca"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1823
msgid "create reflog for new branch"
msgstr "crea un registre de referència per a la branca nova"
-#: builtin/checkout.c:1791
-#, fuzzy
+#: builtin/checkout.c:1825
msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "segon conjectura «git checkout <no-such-branch>» (per defecte)"
+msgstr "segona deducció «git checkout <no-such-branch>» (per defecte)"
-#: builtin/checkout.c:1792
+#: builtin/checkout.c:1826
msgid "use overlay mode (default)"
msgstr "utilitza el mode de superposició (per defecte)"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1874
msgid "create and switch to a new branch"
msgstr "crea i canvia a una branca nova"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1876
msgid "create/reset and switch to a branch"
msgstr "crea/restableix i canvia a una branca"
-#: builtin/checkout.c:1841
-#, fuzzy
+#: builtin/checkout.c:1878
msgid "second guess 'git switch <no-such-branch>'"
-msgstr "segon conjectura «git switch <no-such-branch>»"
+msgstr "segona deducció «git switch <no-such-branch>»"
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1880
msgid "throw away local modifications"
msgstr "descarta les modificacions locals"
-#: builtin/checkout.c:1877
-#, fuzzy
+#: builtin/checkout.c:1916
msgid "which tree-ish to checkout from"
-msgstr "de quin arbre agafar"
+msgstr "des de quin arbre agafar"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1918
msgid "restore the index"
msgstr "restaura l'índex"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1920
msgid "restore the working tree (default)"
msgstr "restaura l'arbre de treball (per defecte)"
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1922
msgid "ignore unmerged entries"
msgstr "ignora les entrades sense fusionar"
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1923
msgid "use overlay mode"
msgstr "utilitza el mode de superposició"
@@ -12852,7 +13439,15 @@
msgid "could not lstat %s\n"
msgstr "no s'ha pogut fer lstat %s\n"
-#: builtin/clean.c:302 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "S'ha rebutjat suprimir el directori de treball actual\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Es rebutjarà eliminar el directori de treball actual\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12865,7 +13460,7 @@
"foo - selecciona un ítem basat en un prefix únic\n"
" - (buit) no seleccionis res\n"
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12886,33 +13481,33 @@
"* - tria tots els ítems\n"
" - (buit) finalitza la selecció\n"
-#: builtin/clean.c:521 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Perdó (%s)?\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduïu els patrons a ignorar>> "
-#: builtin/clean.c:696
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ADVERTÈNCIA: No es poden trobar ítems que coincideixin amb: %s"
-#: builtin/clean.c:717
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Selecciona els ítems a suprimir"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Voleu eliminar %s [y/N]? "
-#: builtin/clean.c:789
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12930,60 +13525,60 @@
"help - aquesta pantalla\n"
"? - ajuda de selecció de l'avís"
-#: builtin/clean.c:825
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Eliminaria l'ítem següent:"
msgstr[1] "Eliminaria els ítems següents:"
-#: builtin/clean.c:841
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "No hi ha més fitxers a netejar; s'està sortint."
-#: builtin/clean.c:903
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "no imprimeixis els noms dels fitxers eliminats"
-#: builtin/clean.c:905
+#: builtin/clean.c:928
msgid "force"
msgstr "força"
-#: builtin/clean.c:906
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "neteja interactiva"
-#: builtin/clean.c:908
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
+#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "patró"
-#: builtin/clean.c:910
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "afegiu <patró> per a ignorar les regles"
-#: builtin/clean.c:911
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "elimina els fitxers ignorats, també"
-#: builtin/clean.c:913
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "elimina només els fitxers ignorats"
-#: builtin/clean.c:929
+#: builtin/clean.c:951
msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to"
+" clean"
msgstr ""
"clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; "
"refusant netejar"
-#: builtin/clean.c:932
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12991,376 +13586,378 @@
"clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; "
"refusant netejar"
-#: builtin/clean.c:944
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x i -X no es poden usar junts"
-#: builtin/clone.c:45
+#: builtin/clone.c:47
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcions>] [--] <repositori> [<directori>]"
-#: builtin/clone.c:96
-#, fuzzy
+#: builtin/clone.c:100
msgid "don't clone shallow repository"
-msgstr "per a clonar des d'un repositori local"
+msgstr "no clonis un repositori superficial"
-#: builtin/clone.c:98
+#: builtin/clone.c:102
msgid "don't create a checkout"
msgstr "no facis cap agafament"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "crea un repositori nu"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "create a mirror repository (implies bare)"
msgstr "crea un repositori mirall (implica bare)"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "to clone from a local repository"
msgstr "per a clonar des d'un repositori local"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "don't use local hardlinks, always copy"
msgstr "no usis enllaços durs locals, sempre copia"
-#: builtin/clone.c:109
+#: builtin/clone.c:113
msgid "setup as shared repository"
msgstr "configura com a repositori compartit"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "pathspec"
msgstr "especificació de camí"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
-#: builtin/clone.c:115
+#: builtin/clone.c:119
msgid "number of submodules cloned in parallel"
msgstr "nombre de submòduls clonats en paral·lel"
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:120 builtin/init-db.c:539
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:121 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "directori des del qual s'usaran les plantilles"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832
-#: builtin/submodule--helper.c:2337
+#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
msgid "reference repository"
msgstr "repositori de referència"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1834
-#: builtin/submodule--helper.c:2339
+#: builtin/clone.c:127 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2721
msgid "use --reference only while cloning"
msgstr "usa --reference només en clonar"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3967 builtin/repack.c:669
+#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nom"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usa <nom> en lloc d'«origin» per a seguir la font"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "agafa <branca> en lloc de la HEAD del remot"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863
-#: builtin/pull.c:208
+#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
+#: builtin/pull.c:212
msgid "depth"
msgstr "profunditat"
-#: builtin/clone.c:131
+#: builtin/clone.c:135
msgid "create a shallow clone of that depth"
-msgstr "crea un clon superficial de tal profunditat"
+msgstr "crea un clon superficial d'aquesta profunditat"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804
-#: builtin/pull.c:211
+#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
+#: builtin/pull.c:215
msgid "time"
-msgstr "hora"
+msgstr "data"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "create a shallow clone since a specific time"
-msgstr "crea un clon superficial des d'una hora específica"
+msgstr "crea un clon superficial des d'una data específica"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
msgid "revision"
msgstr "revisió"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1844
-#: builtin/submodule--helper.c:2353
+#: builtin/clone.c:141 builtin/submodule--helper.c:1897
+#: builtin/submodule--helper.c:2735
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
-#: builtin/clone.c:139
+#: builtin/clone.c:143
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-"no cloneu cap etiqueta, i feu que els «fetch» següents no els segueixen"
+"no cloneu cap etiqueta, i feu que els «fetch» següents no les segueixin"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "any cloned submodules will be shallow"
msgstr "qualsevol submòdul clonat serà superficial"
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:146 builtin/init-db.c:548
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:147 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
-#: builtin/clone.c:144
+#: builtin/clone.c:148
msgid "key=value"
msgstr "clau=valor"
-#: builtin/clone.c:145
+#: builtin/clone.c:149
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del repositori nou"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "específic al servidor"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "opció a transmetre"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
-#: builtin/push.c:585
+#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
+#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "usa només adreces IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
-#: builtin/push.c:587
+#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
+#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "usa només adreces IPv6"
-#: builtin/clone.c:154
-msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "qualsevol submòdul clonat utilitzarà la seva branca de seguiment remot"
+#: builtin/clone.c:158
+#, fuzzy
+msgid "apply partial clone filters to submodules"
+msgstr "Aplica els filtres de clonatge parcial als submòduls"
-#: builtin/clone.c:156
+#: builtin/clone.c:160
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr ""
+"qualsevol submòdul clonat utilitzarà la seva branca de seguiment remot"
+
+#: builtin/clone.c:162
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
"inicialitza el fitxer «sparse-checkout» per a incloure només els fitxers a "
"l'arrel"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"No s'ha pogut endevinar cap nom de directori.\n"
-"Especifiqueu un directori en la línia d'ordres"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:237
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:310
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:436
-#, fuzzy, c-format
+#: builtin/clone.c:328
+#, c-format
msgid "failed to start iterator over '%s'"
-msgstr "no s'ha pogut iniciar l'iterador per sobre de «%s»"
+msgstr "no s'ha pogut iniciar l'iterador sobre «%s»"
-#: builtin/clone.c:467
+#: builtin/clone.c:359
#, c-format
msgid "failed to create link '%s'"
msgstr "s'ha produït un error en crear l'enllaç «%s»"
-#: builtin/clone.c:471
+#: builtin/clone.c:363
#, c-format
msgid "failed to copy file to '%s'"
msgstr "s'ha produït un error en copiar el fitxer a «%s»"
-#: builtin/clone.c:476
+#: builtin/clone.c:368
#, c-format
msgid "failed to iterate over '%s'"
msgstr "no s'ha pogut iterar sobre «%s»"
-#: builtin/clone.c:503
+#: builtin/clone.c:395
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:517
-#, fuzzy
+#: builtin/clone.c:409
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
-"El clonatge ha tingut èxit però ha fallat. Podeu inspeccionar el que s'ha "
-"comprovat amb «git status» i tornar-ho a provar amb «git restore --"
-"source=HEAD /»"
+"El clonatge ha tingut èxit, però no s'ha pogut agafar.\n"
+"Podeu inspeccionar el que s'ha agafat amb «git status»\n"
+"i tornar-ho a provar amb «git restore --source=HEAD :/»\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:486
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No s'ha pogut trobar la branca remota %s per a clonar."
-#: builtin/clone.c:713
+#: builtin/clone.c:603
#, c-format
msgid "unable to update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:651
msgid "failed to initialize sparse-checkout"
msgstr "no s'ha pogut inicialitzar «sparse-checkout»"
-#: builtin/clone.c:784
+#: builtin/clone.c:674
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"la HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
"agafar.\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:709
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:894
+#: builtin/clone.c:793
msgid "unable to write parameters to config file"
msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
-#: builtin/clone.c:957
+#: builtin/clone.c:856
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:959
+#: builtin/clone.c:858
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:901
msgid "Too many arguments."
msgstr "Hi ha massa arguments."
-#: builtin/clone.c:1005
+#: builtin/clone.c:905 contrib/scalar/scalar.c:413
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un repositori per a clonar."
-#: builtin/clone.c:1018
+#: builtin/clone.c:918
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "les opcions --bare i --origin %s són incompatibles."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "les opcions «%s» i «%s %s» no es poden usar juntes"
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare i --separate-git-dir són incompatibles."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:935
#, c-format
msgid "repository '%s' does not exist"
msgstr "el repositori «%s» no existeix"
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: builtin/clone.c:939 builtin/fetch.c:2176
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és un nombre positiu"
-#: builtin/clone.c:1049
+#: builtin/clone.c:949
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "el camí destí «%s» ja existeix i no és un directori buit."
-#: builtin/clone.c:1055
+#: builtin/clone.c:955
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "el camí destí «%s» ja existeix i no és un directori buit."
-#: builtin/clone.c:1069
+#: builtin/clone.c:969
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball «%s» ja existeix."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
+#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no s'han pogut crear els directoris inicials de «%s»"
-#: builtin/clone.c:1089
+#: builtin/clone.c:989
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»"
-#: builtin/clone.c:1109
+#: builtin/clone.c:1009
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "S'està clonant al repositori nu «%s»...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1011
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "S'està clonant a «%s»...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1040
msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
+"clone --recursive is not compatible with both --reference and --reference-"
+"if-able"
msgstr ""
"clone --recursive no és compatible amb ambdós --reference i --reference-if-"
"able"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "«%s» no és un nom de remot vàlid"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1157
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1159
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1161
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1163
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1168
msgid "source repository is shallow, ignoring --local"
msgstr "el repositori font és superficial, s'està ignorant --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1173
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1185
+msgid "cannot clone from filtered bundle"
+msgstr "no es pot clonar des del farell filtrat"
+
+#: builtin/clone.c:1265 builtin/clone.c:1324
+msgid "remote transport reported error"
+msgstr "el transport remot ha informat d'un error"
+
+#: builtin/clone.c:1277 builtin/clone.c:1289
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branca remota %s no es troba en la font %s"
-#: builtin/clone.c:1348
+#: builtin/clone.c:1292
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un repositori buit."
@@ -13377,141 +13974,132 @@
msgstr "disposició a usar"
#: builtin/column.c:30
-#, fuzzy
msgid "maximum width"
-msgstr "Amplada màxima"
+msgstr "amplada màxima"
#: builtin/column.c:31
-#, fuzzy
msgid "padding space on left border"
-msgstr "Espai d'encoixinada en el marge esquerre"
+msgstr "espai de farciment al marge esquerre"
#: builtin/column.c:32
-#, fuzzy
msgid "padding space on right border"
-msgstr "Espai d'encoixinada en el marge dret"
+msgstr "espai de farciment al marge dret"
#: builtin/column.c:33
-#, fuzzy
msgid "padding space between columns"
-msgstr "Espai d'encoixinada entre columnes"
+msgstr "espai de farciment entre columnes"
#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr "--command ha de ser el primer argument"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+"git commit-graph verify [--object-dir <objdir>] [--shallow] "
+"[--[no-]progress]"
msgstr ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+"git commit-graph verify [--object-dir <objdir>] [--shallow] "
+"[--[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--"
-"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
-"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
+"git commit-graph write [--object-dir <objdir>] [--append] "
+"[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
+"[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split "
+"options>"
msgstr ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--"
-"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
-"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
+"git commit-graph write [--object-dir <objdir>] [--append] "
+"[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
+"[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split "
+"options>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "no s'ha pogut trobar el directori de l'objecte que coincideixi amb %s"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
msgid "dir"
msgstr "directori"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
-#, fuzzy
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
-msgstr "El directori d'objectes per a emmagatzemar el gràfic"
+msgstr "el directori d'objectes a emmagatzemar al graf"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
"si el graf de comissions està dividit només, verifica el fitxer de consell"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "No s'ha pogut obrir el graf de comissions «%s»"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "argument --split no reconegut, %s"
-#: builtin/commit-graph.c:155
-#, fuzzy, c-format
+#: builtin/commit-graph.c:150
+#, c-format
msgid "unexpected non-hex object ID: %s"
-msgstr ""
-"s'esperava un identificador d'objecte de vora amb brossa s'han obtingut "
-"percentatges d'escombraries"
+msgstr "ID de l'objecte no hexadecimal inesperat: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "no és un objecte vàlid: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
-msgstr "comença a caminar en totes les referències"
+msgstr "comença el recorregut en totes les referències"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "explora els índexs del paquet llistats per a stdin per a comissions"
-#: builtin/commit-graph.c:217
-#, fuzzy
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
-msgstr "comença a caminar a les comissions llistades per a stdin"
+msgstr "comença el recorregut per les comissions llistades per stdin"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr "inclou ja totes les comissions al fitxer del graf de comissions"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "habilita la computació per als camins canviats"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "permet escriure un fitxer de graf de comissions incrementals"
-#: builtin/commit-graph.c:228
-#, fuzzy
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "nombre màxim de comissions en un graf de comissions no basat"
+msgstr ""
+"nombre màxim de comissions en un graf de comissions separades sense base"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "ràtio màxima entre dos nivells d'un graf de comissions dividit"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
-msgstr "fes caducar els objectes més antics que l'hora i data donades"
+msgstr "fes caducar només els objectes més antics que l'hora i data donades"
-#: builtin/commit-graph.c:234
-#, fuzzy
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
-msgstr ""
-"S'estan calculant els canvis les rutes de la comissió en els filtres Bloom"
+msgstr "nombre màxim de canvis de camí en filtres Bloom a calcular"
-#: builtin/commit-graph.c:255
-#, fuzzy
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "usa com a màxim un dels --reachable --stdin-commits o --stdin-packs"
+msgstr "usa com a màxim un --reachable, --stdin-commits, o --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "S'estan recollint les comissions de l'entrada"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "subordre no reconeguda: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13525,70 +14113,65 @@
msgid "duplicate parent %s ignored"
msgstr "s'han ignorat el pare %s duplicat"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
#, c-format
msgid "not a valid object name %s"
msgstr "no és un nom d'objecte vàlid %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: ha fallat en obrir «%s»"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: ha fallat en llegir «%s»"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: ha fallat en tancar «%s»"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "pare"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "id d'un objecte de comissió pare"
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
+#: builtin/tag.c:455
msgid "message"
msgstr "missatge"
-#: builtin/commit-tree.c:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "missatge de comissió"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "llegeix el missatge de registre de comissió des d'un fitxer"
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "signa la comissió amb GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "ha de donar exactament un arbre"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: ha fallat en llegir"
-#: builtin/commit.c:41
+#: builtin/commit.c:43
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:48
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:53
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13598,7 +14181,7 @@
"deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n"
"podeu eliminar la comissió per complet amb «git reset HEAD^».\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:58
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13606,23 +14189,21 @@
" git commit --allow-empty\n"
"\n"
msgstr ""
-"El «cherry pick» previ està ara buit, possiblement a causa de resolució de "
-"conflictes.\n"
+"El «cherry pick» previ està ara buit, possiblement a causa de resolució de conflictes.\n"
"Si el voleu cometre de totes maneres, useu:\n"
"\n"
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:65
msgid "Otherwise, please use 'git rebase --skip'\n"
-msgstr "Altrament si us plau useu «git rebase --skip»\n"
+msgstr "Altrament, si us plau useu «git rebase --skip»\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:68
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
-msgstr "Altrament si us plau useu «git cherry-pick --skip»\n"
+msgstr "Altrament, si us plau useu «git cherry-pick --skip»\n"
-#: builtin/commit.c:69
-#, fuzzy
+#: builtin/commit.c:71
msgid ""
"and then use:\n"
"\n"
@@ -13634,77 +14215,79 @@
" git cherry-pick --skip\n"
"\n"
msgstr ""
-"i després utilitzeu git cherry-pick --continue per tornar a seleccionar les "
-"comissions restants. Si voleu ometre aquesta publicació utilitzeu git cherry-"
-"pick --skip"
+"i després utilitzeu:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"per a continuar seleccionant les comissions restants.\n"
+"Si voleu ometre aquesta comissió, useu:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:326
msgid "failed to unpack HEAD tree object"
msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file amb -a no té sentit"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:376
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense camí."
-#: builtin/commit.c:386
+#: builtin/commit.c:388
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
-#: builtin/commit.c:395
+#: builtin/commit.c:397
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:410
+#: builtin/commit.c:412
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
-#: builtin/commit.c:412
+#: builtin/commit.c:414
msgid "Failed to update main cache tree"
msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
msgid "unable to write new_index file"
msgstr "no s'ha pogut escriure el fitxer new_index"
-#: builtin/commit.c:489
+#: builtin/commit.c:491
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
-#: builtin/commit.c:491
+#: builtin/commit.c:493
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no es pot fer una comissió parcial durant un «cherry pick»."
-#: builtin/commit.c:493
+#: builtin/commit.c:495
msgid "cannot do a partial commit during a rebase."
msgstr "no es pot fer una comissió parcial durant un «rebase»."
-#: builtin/commit.c:501
+#: builtin/commit.c:503
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:520
+#: builtin/commit.c:522
msgid "unable to write temporary index file"
msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
-#: builtin/commit.c:618
+#: builtin/commit.c:620
#, c-format
msgid "commit '%s' lacks author header"
msgstr "a la comissió «%s» li manca la capçalera d'autor"
-#: builtin/commit.c:620
+#: builtin/commit.c:622
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "la comissió «%s» té una línia d'autor mal formada"
-#: builtin/commit.c:639
+#: builtin/commit.c:641
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:692
+#: builtin/commit.c:694
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13712,43 +14295,82 @@
"no es pot seleccionar un caràcter de comentari que\n"
"no sigui usat en el missatge de comissió actual"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut cercar la comissió %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:762 builtin/shortlog.c:417
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:764
msgid "could not read log from standard input"
msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard"
-#: builtin/commit.c:764
+#: builtin/commit.c:768
#, c-format
msgid "could not read log file '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
-#: builtin/commit.c:801
-#, fuzzy, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "no es pot combinar «--keep-base» amb «--root»"
+#: builtin/commit.c:805
+#, c-format
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "les opcions «%s» i «%s:%s» no es poden usar juntes"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:817 builtin/commit.c:833
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogut llegir SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:884
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
-#: builtin/commit.c:900
+#: builtin/commit.c:897
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Introduïu el missatge de comissió per als vostres canvis.\n"
+"S'ignoraran les línies que comencin amb «%c».\n"
+
+#: builtin/commit.c:899
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Introduïu el missatge de comissió dels vostres canvis.\n"
+"S'ignoraran les línies que comencin amb «%c». Un missatge de\n"
+"comissió buit avorta la comissió.\n"
+
+#: builtin/commit.c:903
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Introduïu el missatge de comissió pels vostres canvis. Es mantindran\n"
+"les línies que comencin amb «%c»; podeu eliminar-les si voleu.\n"
+
+#: builtin/commit.c:907
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Introduïu el missatge de comissió dels vostres canvis.\n"
+"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les vosaltres\n"
+"mateixos si voleu. Un missatge buit avorta la comissió.\n"
+
+#: builtin/commit.c:919
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13762,7 +14384,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:905
+#: builtin/commit.c:924
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13776,200 +14398,149 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"Introduïu el missatge de comissió dels vostres canvis.\n"
-"S'ignoraran les línies que comencin amb «%c». Un missatge de\n"
-"comissió buit avorta la comissió.\n"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Introduïu el missatge de comissió dels vostres canvis.\n"
-"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les "
-"vosaltres\n"
-"mateixos si voleu. Un missatge buit avorta la comissió.\n"
-
-#: builtin/commit.c:940
+#: builtin/commit.c:951
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:948
+#: builtin/commit.c:959
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:955
+#: builtin/commit.c:966
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:973
+#: builtin/commit.c:984
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:1018
-#, fuzzy
+#: builtin/commit.c:1029
msgid "unable to pass trailers to --trailers"
-msgstr "no s'ha pogut analitzar la capçalera de %s"
+msgstr "no s'han pogut passar els «trailers» a --trailers"
-#: builtin/commit.c:1058
+#: builtin/commit.c:1069
msgid "Error building trees"
-msgstr "Error en construir arbres"
+msgstr "Error en construir els arbres"
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: builtin/commit.c:1083 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Especifiqueu el missatge usant l'opció -m o l'opció -F.\n"
-#: builtin/commit.c:1116
+#: builtin/commit.c:1128
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author «%s» no és «Nom <adreça-electrònica>» i no coincideix amb\n"
"cap autor existent"
-#: builtin/commit.c:1130
+#: builtin/commit.c:1142
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Mode d'ignorància no vàlid «%s»"
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: builtin/commit.c:1160 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fitxers no seguits no vàlid «%s»"
-#: builtin/commit.c:1188
-msgid "--long and -z are incompatible"
-msgstr "--long i -z són incompatibles"
-
-#: builtin/commit.c:1219
-#, fuzzy
+#: builtin/commit.c:1231
msgid "You are in the middle of a merge -- cannot reword."
-msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
+msgstr "Esteu enmig d'una fusió -- no es pot fer «reword»."
-#: builtin/commit.c:1221
-#, fuzzy
+#: builtin/commit.c:1233
msgid "You are in the middle of a cherry-pick -- cannot reword."
-msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
+msgstr "Esteu enmig d'un «cherry pick» -- no es pot fer «reword»."
-#: builtin/commit.c:1224
-#, fuzzy, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "no es poden combinar les opcions d'aplicació amb les opcions de fusió"
+#: builtin/commit.c:1236
+#, c-format
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "les opcions de «reword» «%s» i camí «%s» no es poden usar juntes"
-#: builtin/commit.c:1226
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
+#: builtin/commit.c:1238
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "les opcions de «reword» «%s» i «%s» no es poden usar juntes"
-#: builtin/commit.c:1245
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "Usar ambdós --reset-author i --author no té sentit"
-
-#: builtin/commit.c:1254
+#: builtin/commit.c:1263
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1257
+#: builtin/commit.c:1266
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1259
+#: builtin/commit.c:1268
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
-#: builtin/commit.c:1261
+#: builtin/commit.c:1270
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Esteu enmig d'un «rebase» -- no es pot esmenar."
-#: builtin/commit.c:1264
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "Les opcions --squash i --fixup no es poden usar juntes"
-
-#: builtin/commit.c:1274
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "Només un de -c/-C/-F/--fixup es pot usar."
-
-#: builtin/commit.c:1276
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "L'opció -m no es pot combinar amb -c/-C/-F/."
-
-#: builtin/commit.c:1285
+#: builtin/commit.c:1290
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author només es pot usar amb -C, -c o --amend."
-#: builtin/commit.c:1303
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar."
-
-#: builtin/commit.c:1331
-#, fuzzy, c-format
+#: builtin/commit.c:1337
+#, c-format
msgid "unknown option: --fixup=%s:%s"
-msgstr "opció desconeguda: %s\n"
+msgstr "opció desconeguda: --fixup=%s:%s"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "els camins «%s ...» amb -a no tenen sentit"
-#: builtin/commit.c:1476 builtin/commit.c:1642
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "mostra la informació de «stash»"
-#: builtin/commit.c:1482 builtin/commit.c:1646
-#, fuzzy
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "calcula els valors complets endavant/darrere"
-#: builtin/commit.c:1484
+#: builtin/commit.c:1493
msgid "version"
msgstr "versió"
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:765
msgid "machine-readable output"
-msgstr "sortida llegible per màquina"
+msgstr "sortida llegible per una màquina"
-#: builtin/commit.c:1487 builtin/commit.c:1650
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
-#: builtin/commit.c:1490 builtin/commit.c:1653
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1493 builtin/commit.c:1656
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "
"defecte: all)"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13977,11 +14548,11 @@
"mostra els fitxers ignorats, modes opcionals: traditional, matching, no. "
"(Per defecte: traditional, matching, no.)"
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:197
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13989,207 +14560,205 @@
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "no detectis canvis de noms"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
-msgstr "detecta canvis de noms, i opcionalment estableix un índex de semblança"
+msgstr ""
+"detecta canvis de noms, i opcionalment estableix un índex de semblança"
-#: builtin/commit.c:1525
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"No s'admet la combinació d'arguments d'ignorància i de fitxers no seguits"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1624
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1624
msgid "override author for commit"
-msgstr "autor corregit de la comissió"
+msgstr "sobreescriu l'autor de la comissió"
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:551
msgid "date"
msgstr "data"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1625
msgid "override date for commit"
-msgstr "data corregida de la comissió"
+msgstr "sobreescriu la data de la comissió"
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:360 ref-filter.h:89
msgid "commit"
msgstr "comissió"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "reusa i edita el missatge de la comissió especificada"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
-#.
-#: builtin/commit.c:1621
-#, fuzzy
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
-msgstr "esmena la comissió anterior"
+msgstr "[(amend|reword):]commit"
-#: builtin/commit.c:1621
-#, fuzzy
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
-"usa el missatge formatat de «squash» automàtic per a corregir la comissió "
+"usa un missatge amb format de «squash» automàtic per a esmenar la comissió "
"especificada"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-"usa el missatge formatat de «squash» automàtic per a «squash» a la comissió "
-"especificada"
+"usa un missatge amb format de «squash» automàtic per a fer «squash» de la "
+"comissió especificada"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "l'autor de la comissió soc jo ara (s'usa amb -C/-c/--amend)"
-#: builtin/commit.c:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "remolc"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
-msgstr ""
+msgstr "afegeix un «trailer» personalitzat"
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
-#, fuzzy
+#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
-msgstr "afegeix Signed-off-by:"
+msgstr "afegeix un «trailer» tipus «Signed-off-by»"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1646
msgid "Commit contents options"
-msgstr "Opcions dels continguts de les comissions"
+msgstr "Opcions per al contingut de les comissions"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evita els lligams de precomissió i missatge de comissió"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1654
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1655
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "evita el lligam de post escriptura"
-#: builtin/commit.c:1662
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "està bé registrar un canvi amb missatge buit"
-#: builtin/commit.c:1737
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
-#: builtin/commit.c:1744
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1765
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: builtin/commit.c:1772
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n"
-#: builtin/commit.c:1777
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "S'està avortant la comissió; no heu editat el missatge.\n"
-#: builtin/commit.c:1788
-#, fuzzy, c-format
+#: builtin/commit.c:1803
+#, c-format
msgid "Aborting commit due to empty commit message body.\n"
-msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n"
+msgstr ""
+"S'està interrompent la comissió a causa d'un missatge de comissió buit.\n"
-#: builtin/commit.c:1824
-#, fuzzy
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
-"s'ha actualitzat el repositori però no s'ha pogut escriure el fitxer "
-"newindex. Comproveu que el disc no està ple i que la quota no s'ha excedit i "
-"després «git restitueix --staged /» per recuperar-se."
+"s'ha actualitzat el repositori, però no s'ha pogut escriure\n"
+" el fitxer «new_index». Comproveu que el disc no està ple i\n"
+"que la quota no s'ha excedit, i després, feu\n"
+"«git restore --staged :/» per a recuperar-lo."
#: builtin/config.c:11
msgid "git config [<options>]"
@@ -14307,6 +14876,10 @@
msgid "Type"
msgstr "Tipus"
+#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+msgid "type"
+msgstr "tipus"
+
#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "el valor té donat aquest tipus"
@@ -14358,30 +14931,28 @@
"d'ordres)"
#: builtin/config.c:166
-#, fuzzy
msgid "show scope of config (worktree, local, global, system, command)"
msgstr ""
-"mostra l'abast de la configuració (arbre de treball ordre local global del "
-"sistema)"
+"mostra l'abast de la configuració («worktree», «local», «global», «system», "
+"«command»)"
#: builtin/config.c:167 builtin/env--helper.c:45
msgid "value"
msgstr "valor"
#: builtin/config.c:167
-#, fuzzy
msgid "with --get, use default value when missing entry"
-msgstr "amb --get utilitza el valor per defecte quan falta una entrada"
+msgstr "amb --get utilitza el valor per defecte quan falti una entrada"
#: builtin/config.c:181
-#, fuzzy, c-format
+#, c-format
msgid "wrong number of arguments, should be %d"
-msgstr "el nombre d'arguments és erroni"
+msgstr "nombre d'arguments erroni, ha de ser %d"
#: builtin/config.c:183
-#, fuzzy, c-format
+#, c-format
msgid "wrong number of arguments, should be from %d to %d"
-msgstr "el nombre d'arguments hauria de passar d'un percentatge a un altre."
+msgstr "nombre d'arguments erroni, ha de ser %d a %d"
#: builtin/config.c:339
#, c-format
@@ -14392,7 +14963,8 @@
#, c-format
msgid "failed to format default config value: %s"
msgstr ""
-"s'ha produït un error en formatar el valor per defecte de la configuració: %s"
+"s'ha produït un error en formatar el valor per defecte de la configuració: "
+"%s"
#: builtin/config.c:441
#, c-format
@@ -14412,9 +14984,8 @@
msgstr "no s'admet escriure a stdin"
#: builtin/config.c:542
-#, fuzzy
msgid "writing config blobs is not supported"
-msgstr "no es poden escriure els blobs de configuració"
+msgstr "no s'ha admet l'escriptura de blobs de configuració"
#: builtin/config.c:627
#, c-format
@@ -14444,24 +15015,21 @@
msgstr "--blob només es pot usar dins d'un repositori git"
#: builtin/config.c:662
-#, fuzzy
msgid "--worktree can only be used inside a git repository"
-msgstr "--blob només es pot usar dins d'un repositori git"
+msgstr "--worktree només es pot usar dins d'un repositori git"
#: builtin/config.c:684
msgid "$HOME not set"
msgstr "$HOME no està establerta"
#: builtin/config.c:708
-#, fuzzy
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
"section in \"git help worktree\" for details"
msgstr ""
-"--worktree no es pot utilitzar amb múltiples arbres de treball tret que "
-"l'extensió de configuració worktreeConfig estigui habilitada. Llegiu la "
-"secció «CONFIGURATION FITXER» a «git help worktree» per als detalls"
+"--worktree no es pot utilitzar amb múltiples arbres de treball tret que\n"
+"l'extensió de configuració worktreeConfig estigui habilitada. Llegiu la secció «CONFIGURATION FILE» a «git help worktree» per a més detalls"
#: builtin/config.c:743
msgid "--get-color and variable type are incoherent"
@@ -14477,8 +15045,8 @@
#: builtin/config.c:767
msgid ""
-"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
-"list"
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and "
+"--list"
msgstr ""
"--show-origin només és aplicable a --get, --get-all, --get-regexp, i --list"
@@ -14487,9 +15055,8 @@
msgstr "--default només és aplicable a --get"
#: builtin/config.c:806
-#, fuzzy
msgid "--fixed-value only applies with 'value-pattern'"
-msgstr "--fixed-value només s'aplica amb 'value-pattern'"
+msgstr "--fixed-value només s'aplica amb «value-pattern»"
#: builtin/config.c:822
#, c-format
@@ -14527,10 +15094,6 @@
msgid "no such section: %s"
msgstr "no existeix la secció: %s"
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "imprimeix les mides en un format llegible pels humans"
@@ -14554,21 +15117,23 @@
msgstr "imprimeix els missatges de depuració a stderr"
#: builtin/credential-cache--daemon.c:316
-#, fuzzy
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr ""
-"credencial-cache-daemon no disponible; no hi ha compatibilitat amb sòcols "
-"unix"
+"credential-cache--daemon no disponible; no hi ha compatibilitat amb sòcols "
+"d'unix"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr ""
-"credencial-cache no disponible; no hi ha compatibilitat amb els sòcols d'unix"
+"credencial-cache no disponible; no hi ha compatibilitat amb els sòcols "
+"d'unix"
#: builtin/credential-store.c:66
-#, fuzzy, c-format
+#, c-format
msgid "unable to get credential storage lock in %d ms"
-msgstr "no s'ha pogut obtenir el directori de treball actual"
+msgstr ""
+"no s'ha pogut obtenir el bloqueig de l'emmagatzematge de credencials en %d "
+"ms"
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
@@ -14686,7 +15251,7 @@
#: builtin/describe.c:559
msgid "only follow first parent"
-msgstr "només segueix la primera mare"
+msgstr "només segueix el primer pare"
#: builtin/describe.c:562
msgid "only output exact matches"
@@ -14704,7 +15269,7 @@
msgid "do not consider tags matching <pattern>"
msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:595
msgid "show abbreviated commit object as fallback"
msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu"
@@ -14720,29 +15285,16 @@
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "annexa <marca> en l'arbre de treball brut (per defecte: «-broken»)"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long és incompatible amb --abbrev=0"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "No s'ha trobat cap nom, no es pot descriure res."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty és incompatible amb les comissions"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken és incompatible amb les comissions"
-
-#: builtin/diff-tree.c:155
-#, fuzzy
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "-p i --overlay són mútuament excloents"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "les opcions «%s» i de comissió no es poden usar juntes"
#: builtin/diff-tree.c:157
-#, fuzzy
msgid "--merge-base only works with two commits"
msgstr "--merge-base només funciona amb dues comissions"
@@ -14761,26 +15313,26 @@
msgid "%s...%s: no merge base"
msgstr "%s...%s: sense una base de fusió"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "No és un repositori de git"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:537 builtin/grep.c:700
#, c-format
msgid "invalid object '%s' given."
msgstr "s'ha donat un objecte no vàlid «%s»."
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "s'ha donat més de dos blobs: «%s»"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "s'ha donat l'objecte no gestionat «%s»."
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: múltiples bases de fusió, utilitzant %s"
@@ -14789,114 +15341,106 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "ha fallat: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "no es pot llegir l'objecte %s per l'enllaç simbòlic %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"els formats de diff combinats («-c» i «--cc») no s'admeten\n"
-"en el mode diff per directoris («-d» i «--dir-diff»)."
+"en el mode diff de directoris («-d» i «--dir-diff»)."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "s'han modificat ambdós fitxers: «%s» i «%s»."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "s'ha deixat un fitxer de l'arbre de treball."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "existeix un fitxer temporal a «%s»."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "podeu netejar o recuperar-los."
-#: builtin/difftool.c:700
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "ha fallat: %d"
+
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "usa «diff.guitool» en lloc de «diff.tool»"
-#: builtin/difftool.c:702
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "fes un diff de tot el directori"
-#: builtin/difftool.c:704
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "no preguntis abans d'executar l'eina diff"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "utilitza enllaços simbòlics en mode dir-diff"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:700
msgid "tool"
msgstr "eina"
-#: builtin/difftool.c:711
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "utilitza l'eina de diff especificada"
-#: builtin/difftool.c:713
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"imprimeix una llista de totes les eines diff que podeu usar amb «--tool»"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:706
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
"fes que «git-difftool» surti quan l'eina de diff invocada torna un codi de "
"sortida diferent de zero"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
-msgstr "especifiqueu una ordre personalitzada per veure diffs"
+msgstr "especifiqueu una ordre personalitzada per a veure diffs"
-#: builtin/difftool.c:720
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "passa-ho a «diff»"
-#: builtin/difftool.c:735
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool requereix worktree o --no-index"
-#: builtin/difftool.c:742
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff és incompatible amb --no-index"
-
#: builtin/difftool.c:745
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool and --extcmd són mútuament excloents"
-
-#: builtin/difftool.c:753
msgid "no <tool> given for --tool=<tool>"
msgstr "no s'ha proporcionat l'<eina> per a --tool=<eina>"
-#: builtin/difftool.c:760
+#: builtin/difftool.c:752
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no s'ha proporcionat l'<ordre> per a --extcmd=<ordre>"
@@ -14904,454 +15448,423 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <opcions> <env-var>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
-msgid "type"
-msgstr "tipus"
-
#: builtin/env--helper.c:46
-#, fuzzy
msgid "default for git_env_*(...) to fall back on"
-msgstr "per defecte per a gitenv*() per tornar-hi"
+msgstr "valor per defecte per a git_env_*(...) en cas d'absència"
#: builtin/env--helper.c:48
-#, fuzzy
msgid "be quiet only use git_env_*() value as exit code"
-msgstr "silenciós només utilitza el valor gitenv*() com a codi de sortida"
+msgstr "silenciós només utilitza el valor git_env_*() com a codi de sortida"
#: builtin/env--helper.c:67
-#, fuzzy, c-format
-msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
-msgstr "`--default' espera un valor booleà amb `-type=bool` no `%s`"
+#, c-format
+msgid ""
+"option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr "l'opció «--default» espera un valor booleà amb «--type=bool», no «%s»"
#: builtin/env--helper.c:82
-#, fuzzy, c-format
+#, c-format
msgid ""
-"option `--default' expects an unsigned long value with `--type=ulong`, not `"
-"%s`"
+"option `--default' expects an unsigned long value with `--type=ulong`, not "
+"`%s`"
msgstr ""
-"`--default' espera un valor llarg sense signe amb `-type=ulong` no `%s`"
+"l'opció «--default» espera un valor llarg sense signe amb «--type=ulong», no"
+" «%s»"
#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [opcions-de-llista-de-revisions]"
+msgid "git fast-export [<rev-list-opts>]"
+msgstr "git fast-export [<rev-list-opts>]"
-#: builtin/fast-export.c:868
-#, fuzzy
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
-"Error no es poden exportar les etiquetes niades a menys que s'especifiqui --"
-"mark-tags."
+"Error: no es poden exportar les etiquetes imbricades a menys que "
+"s'especifiqui --mark-tags."
-#: builtin/fast-export.c:1177
-#, fuzzy
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
-msgstr "--anonymize-map token no pot estar buit"
+msgstr "el testimoni de --anonymize-map no pot estar buit"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "mostra el progrés després de <n> objectes"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "selecciona la gestió de les etiquetes signades"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
-#: builtin/fast-export.c:1205
-#, fuzzy
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"selecciona la gestió dels missatges de publicació en una codificació "
"alternativa"
-#: builtin/fast-export.c:1208
-#, fuzzy
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
-msgstr "Bolca les marques a aquest fitxer"
+msgstr "bolca les marques a aquest fitxer"
-#: builtin/fast-export.c:1210
-#, fuzzy
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
-msgstr "Importa les marques d'aquest fitxer"
+msgstr "importa les marques d'aquest fitxer"
-#: builtin/fast-export.c:1214
-#, fuzzy
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
-msgstr "Importa marques d'aquest fitxer si existeix"
+msgstr "importa marques d'aquest fitxer si existeix"
-#: builtin/fast-export.c:1216
-#, fuzzy
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
-msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes"
+msgstr "fingeix un etiquetador quan en falti un a les etiquetes"
-#: builtin/fast-export.c:1218
-#, fuzzy
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
-msgstr "Imprimeix l'arbre complet de cada comissió"
+msgstr "imprimeix l'arbre complet de per a cada comissió"
-#: builtin/fast-export.c:1220
-#, fuzzy
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
-msgstr "Usa la característica done per a acabar el corrent"
+msgstr "usa la característica fet per a acabar el flux"
-#: builtin/fast-export.c:1221
-#, fuzzy
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
-msgstr "Omet l'emissió de dades de blob"
+msgstr "omet la sortida de dades de blob"
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1196 builtin/log.c:1860
msgid "refspec"
msgstr "especificació de referència"
-#: builtin/fast-export.c:1223
-#, fuzzy
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
-msgstr "Aplica l'especificació de referència a les referències exportades"
+msgstr "aplica l'especificació de referència a les referències exportades"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "anonimitza la sortida"
-#: builtin/fast-export.c:1225
-#, fuzzy
+#: builtin/fast-export.c:1199
msgid "from:to"
-msgstr "des de"
+msgstr "des de:a"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "converteix <from> a <to> en una sortida anònima"
-#: builtin/fast-export.c:1229
-#, fuzzy
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
-"Referència pares que no estan en flux d'exportació ràpida per identificador "
-"d'objecte"
+"referència els pares que no estan en flux d'exportació ràpida per "
+"identificador d'objecte"
-#: builtin/fast-export.c:1231
-#, fuzzy
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
-msgstr "Mostra els ID dels objectes originals dels blobs/commits"
+msgstr "mostra els ID dels objectes originals dels blobs i comissions"
-#: builtin/fast-export.c:1233
-#, fuzzy
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
-msgstr "Etiquetes amb els identificadors de marca"
+msgstr "marca les etiquetes amb els identificadors de marca"
-#: builtin/fast-export.c:1256
-#, fuzzy
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--trailer amb --only-input no té sentit"
-
-#: builtin/fast-export.c:1271
-#, fuzzy
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "No es poden passar tant --import-marks com --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
-#, fuzzy, c-format
+#: builtin/fast-import.c:3097
+#, c-format
msgid "Missing from marks for submodule '%s'"
-msgstr "Subjecting submodule '%s'"
+msgstr "Falten les marques «from» per al submòdul «%s»"
-#: builtin/fast-import.c:3090
-#, fuzzy, c-format
+#: builtin/fast-import.c:3099
+#, c-format
msgid "Missing to marks for submodule '%s'"
-msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»"
+msgstr "Falten les marques per al submòdul «%s»"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3234
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "S'esperava l'ordre «mark», s'ha rebut %s"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3239
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "S'esperava l'ordre «to», s'ha rebut «%s»"
-#: builtin/fast-import.c:3322
-#, fuzzy
+#: builtin/fast-import.c:3331
msgid "Expected format name:filename for submodule rewrite option"
msgstr ""
-"S'esperava un nom de fitxer de format per a l'opció de reescriptura de "
+"S'esperava el format «nom:nom de fitxer» per a l'opció de reescriptura de "
"submòdul"
-#: builtin/fast-import.c:3377
-#, fuzzy, c-format
+#: builtin/fast-import.c:3386
+#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr ""
"característica «%s» prohibida a l'entrada sense --allow-unsafe-features"
-#: builtin/fetch-pack.c:242
-#, fuzzy, c-format
+#: builtin/fetch-pack.c:246
+#, c-format
msgid "Lockfile created but not reported: %s"
-msgstr "Submòduls canviats però no actualitzats:"
-
-#: builtin/fetch.c:35
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr "git fetch [<opcions>] [<repositori> [<especificació-de-referència>...]]"
+msgstr "S'ha creat el fitxer de bloqueig però no s'ha informat: %s"
#: builtin/fetch.c:36
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+"git fetch [<opcions>] [<repositori> [<especificació-de-referència>...]]"
+
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opcions>] <grup>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opcions>] [(<repositori> | <grup>)...]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opcions>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:124
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel no pot ser negatiu"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:147 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "obtén de tots els remots"
-#: builtin/fetch.c:147 builtin/pull.c:245
-#, fuzzy
+#: builtin/fetch.c:149 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "estableix la font per a git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:151 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
-#: builtin/fetch.c:151
-#, fuzzy
+#: builtin/fetch.c:153
msgid "use atomic transaction to update references"
-msgstr "demana una transacció atòmica al costat remot"
+msgstr "usa una transacció atòmica per a actualitzar les referències"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:155 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "camí al qual pujar el paquet al costat remot"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
msgid "force overwrite of local reference"
msgstr "força la sobreescriptura de la referència local"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:158
msgid "fetch from multiple remotes"
msgstr "obtén de múltiples remots"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:160 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "obtén totes les etiquetes i tots els objectes associats"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
msgid "do not fetch all tags (--no-tags)"
msgstr "no obtinguis les etiquetes (--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:164
msgid "number of submodules fetched in parallel"
msgstr "nombre de submòduls obtinguts en paral·lel"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:166
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
+"modifica l'especificació de referència per a col·locar totes les referències"
+" dins de refs/prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:168 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot"
-#: builtin/fetch.c:168
-#, fuzzy
+#: builtin/fetch.c:170
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-"poda les etiquetes locals ja no a les remotes i el «clobber» ha canviat les "
-"etiquetes"
+"poda les etiquetes locals que ja no existeixen al remot i adjunta les "
+"etiquetes que han canviat"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
msgid "on-demand"
msgstr "sota demanda"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:172
msgid "control recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/fetch.c:175
-#, fuzzy
+#: builtin/fetch.c:177
msgid "write fetched references to the FETCH_HEAD file"
-msgstr "escriu l'arxiu a aquest fitxer"
+msgstr "escriu les referències obtingudes al fitxer FETCH_HEAD"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:178 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "retén el paquet baixat"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:180
msgid "allow updating of HEAD ref"
msgstr "permet l'actualització de la referència HEAD"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "aprofundeix la història d'un clon superficial"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:185 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
-msgstr "aprofundeix la història d'un clon superficial basat en temps"
+msgstr "aprofundeix la història d'un clon superficial basat en una data"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:191 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "converteix en un repositori complet"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:194
+#, fuzzy
+msgid "re-fetch without negotiating common commits"
+msgstr "tornar a capturar sense negociar comissions comunes"
+
+#: builtin/fetch.c:197
msgid "prepend this to submodule path output"
msgstr "anteposa això a la sortida de camí del submòdul"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:200
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que "
-"els fitxers de configuració)"
+"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que"
+" els fitxers de configuració)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:204 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "accepta les referències que actualitzin .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:205 builtin/pull.c:230
msgid "refmap"
msgstr "mapa de referències"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:206 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "específica l'obtenció del mapa de referències"
-#: builtin/fetch.c:208 builtin/pull.c:240
-#, fuzzy
+#: builtin/fetch.c:213 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "informa que només hi ha objectes abastables des d'aquest objecte"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:215
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
+"no obtinguis un fitxer de paquet; en canvi, mostra els avantpassats dels "
+"consells de negociació"
-#: builtin/fetch.c:213 builtin/fetch.c:215
-#, fuzzy
+#: builtin/fetch.c:218 builtin/fetch.c:220
msgid "run 'maintenance --auto' after fetching"
-msgstr "executa «gc --auto» després d'obtenir"
+msgstr "executa «maintenance --auto» després d'obtenir"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:222 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr ""
-"comprova si hi ha actualitzacions forçades a totes les branques actualitzades"
+"comprova si hi ha actualitzacions forçades a totes les branques "
+"actualitzades"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:224
msgid "write the commit-graph after fetching"
msgstr "escriu el graf de comissions després de recollir"
-#: builtin/fetch.c:221
-#, fuzzy
+#: builtin/fetch.c:226
msgid "accept refspecs from stdin"
-msgstr "llegeix les referències des de stdin"
+msgstr "llegeix les especificacions de referència des de stdin"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "No s'ha pogut trobar la referència HEAD remota"
+#: builtin/fetch.c:618
+msgid "couldn't find remote ref HEAD"
+msgstr "no s'ha pogut trobar la referència HEAD remota"
-#: builtin/fetch.c:757
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr "la configuració fetch.output conté un valor no vàlid %s"
-
-#: builtin/fetch.c:856
+#: builtin/fetch.c:893
#, c-format
msgid "object %s not found"
msgstr "objecte %s no trobat"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:897
msgid "[up to date]"
msgstr "[al dia]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
msgid "[rejected]"
msgstr "[rebutjat]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:911
msgid "can't fetch in current branch"
msgstr "no es pot obtenir en la branca actual"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:912
+msgid "checked out in another worktree"
+msgstr "s'ha agafat en un altre arbre de treball"
+
+#: builtin/fetch.c:922
msgid "[tag update]"
msgstr "[actualització d'etiqueta]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
+#: builtin/fetch.c:994
msgid "unable to update local ref"
msgstr "no s'ha pogut actualitzar la referència local"
-#: builtin/fetch.c:889
-#, fuzzy
+#: builtin/fetch.c:927
msgid "would clobber existing tag"
-msgstr "es tancaria l'etiqueta existent"
+msgstr "s'adjuntaria l'etiqueta existent"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:949
msgid "[new tag]"
msgstr "[etiqueta nova]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:952
msgid "[new branch]"
msgstr "[branca nova]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:955
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:994
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:999
msgid "non-fast-forward"
msgstr "sense avanç ràpid"
-#: builtin/fetch.c:1065
-#, fuzzy
+#: builtin/fetch.c:1102
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'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"L'obtenció normalment indica quines branques tenien una actualització "
-"forçada però aquesta comprovació s'ha desactivat. Per tornar a habilitar "
-"utilitzeu l'indicador «--show-forced-updates» o executeu «git config fetch."
-"showForcedUpdates true»."
+"en obtenir normalment indica quines branques tenien una actualització forçada,\n"
+"però aquesta comprovació s'ha desactivat. Per a tornar a habilitar-la, utilitzeu\n"
+"«--show-forced-updates» o executeu «git config fetch.showForcedUpdates true»"
-#: builtin/fetch.c:1069
-#, fuzzy, c-format
+#: builtin/fetch.c:1106
+#, c-format
msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
-"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
-"false'\n"
-" to avoid this check.\n"
+"it took %.2f seconds to check forced updates; you can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
+"to avoid this check\n"
msgstr ""
-"S'ha trigat segons de 9% a comprovar les actualitzacions forçoses. Podeu "
-"utilitzar «--no-show-forced-updates» o executar «git config fetch."
-"showForcedUpdates false» per evitar aquesta comprovació."
+"s'ha trigat %.2f segons a comprovar les actualitzacions forçades. Podeu\n"
+"utilitzar «--no-show-forced-updates» o executar «git config \n"
+"fetch.showForcedUpdates false» per a evitar aquesta comprovació.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1136
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1156
#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr ""
-"rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
+"s'ha rebutjat %s perquè no es permeten actualitzar les arrels superficials"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1259 builtin/fetch.c:1418
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1269
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15361,149 +15874,158 @@
" intenteu executar «git remote prune %s» per a eliminar\n"
" qualsevol branca antiga o conflictiva"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1377
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1378
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1421
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1422 builtin/remote.c:1153
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1446
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "S'està refusant obtenir en la branca actual %s d'un repositori no nu"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "s'ha rebutjat l'obtenció en la branca «%s» agafada a «%s»"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1466
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "L'opció «%s» amb valor «%s» no és vàlida per a %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "l'opció «%s» amb valor «%s» no és vàlida per a %s"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1469
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "S'ignora l'opció «%s» per a %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "s'ignora l'opció «%s» per a %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1496
+#, c-format
+msgid "the object %s does not exist"
+msgstr "l'objecte %s no existeix"
+
+#: builtin/fetch.c:1748
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "s'han detectat múltiples branques, incompatible amb --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1760
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"no s'ha pogut establir la font de HEAD a «%s» des de «%s» quan no assenyala "
+"cap branca."
+
+#: builtin/fetch.c:1773
msgid "not setting upstream for a remote remote-tracking branch"
msgstr ""
"no s'està configurant la font per a una branca remota amb seguiment remot"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1775
msgid "not setting upstream for a remote tag"
msgstr "no s'està configurant la font d'una etiqueta remota"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1777
msgid "unknown branch type"
msgstr "tipus de branca desconegut"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1779
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
"no s'ha trobat cap branca d'origen.\n"
-"Heu d'especificar exactament una branca amb l'opció --set-upstream."
+"heu d'especificar exactament una branca amb l'opció --set-upstream"
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1904 builtin/fetch.c:1967
#, c-format
msgid "Fetching %s\n"
msgstr "S'està obtenint %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1914 builtin/fetch.c:1969
#, c-format
-msgid "Could not fetch %s"
-msgstr "No s'ha pogut obtenir %s"
+msgid "could not fetch %s"
+msgstr "no s'ha pogut obtenir %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1926
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "no s'ha pogut obtenir «%s» (codi de sortida: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:2030
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
-"Cap repositori remot especificat. Especifiqueu un URL o\n"
-"un nom remot del qual es deuen obtenir les revisions noves."
+"no s'ha especificat cap repositori remot. Especifiqueu un URL o\n"
+"un nom remot del qual s'han d'obtenir les revisions noves"
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Necessiteu especificar un nom d'etiqueta."
+#: builtin/fetch.c:2066
+msgid "you need to specify a tag name"
+msgstr "necessiteu especificar un nom d'etiqueta"
-#: builtin/fetch.c:1995
-msgid "Negative depth in --deepen is not supported"
-msgstr "No s'admet una profunditat negativa en --deepen"
+#: builtin/fetch.c:2156
+#, fuzzy
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
+msgstr "--negotiate-only necessita un o més --negotiation-tip=*"
-#: builtin/fetch.c:1997
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen i --depth són mútuament excloents"
+#: builtin/fetch.c:2160
+msgid "negative depth in --deepen is not supported"
+msgstr "no s'admet una profunditat negativa en --deepen"
-#: builtin/fetch.c:2002
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth i --unshallow no es poden usar junts"
-
-#: builtin/fetch.c:2004
+#: builtin/fetch.c:2169
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un repositori complet no té sentit"
-#: builtin/fetch.c:2021
+#: builtin/fetch.c:2186
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un argument de repositori"
-#: builtin/fetch.c:2023
+#: builtin/fetch.c:2188
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
-#: builtin/fetch.c:2032
+#: builtin/fetch.c:2197
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "No existeix un remot ni un grup remot: %s"
+msgid "no such remote or remote group: %s"
+msgstr "no existeix un remot ni un grup remot: %s"
-#: builtin/fetch.c:2039
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Obtenir un grup i especificar referències no té sentit"
+#: builtin/fetch.c:2205
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "obtenir un grup i especificar referències no té sentit"
-#: builtin/fetch.c:2055
+#: builtin/fetch.c:2221
msgid "must supply remote when using --negotiate-only"
-msgstr ""
+msgstr "s'ha de subministrar el remot en usar --negotiate-only"
-#: builtin/fetch.c:2060
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr ""
+#: builtin/fetch.c:2226
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "el protocol no admet --negotiate-only, se surt"
-#: builtin/fetch.c:2079
+#: builtin/fetch.c:2246
msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialclone"
+"--filter can only be used with the remote configured in "
+"extensions.partialclone"
msgstr ""
-"--filter només es pot utilitzar amb el remot configurat en extensions."
-"partialclone"
+"--filter només es pot utilitzar amb el remot configurat en "
+"extensions.partialclone"
-#: builtin/fetch.c:2083
-#, fuzzy
+#: builtin/fetch.c:2250
msgid "--atomic can only be used when fetching from one remote"
-msgstr "L'opció --exec només es pot usar juntament amb --remote"
+msgstr "l'opció --atomic només es pot usar quan s'obté des d'un remot"
-#: builtin/fetch.c:2087
-#, fuzzy
+#: builtin/fetch.c:2254
msgid "--stdin can only be used when fetching from one remote"
-msgstr "L'opció --exec només es pot usar juntament amb --remote"
+msgstr "l'opció --stdin només es pot usar quan s'obté des d'un remot"
#: builtin/fmt-merge-msg.c:7
msgid ""
@@ -15511,23 +16033,27 @@
msgstr ""
"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr "emplena el registre amb <n> entrades del registre curt com a màxim"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "àlies per --log (en desús)"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "usa <text> com a inici de missatge"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "usa <nom> en lloc de la branca de destí real"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "fitxer del qual llegir"
@@ -15540,57 +16066,56 @@
msgstr "git for-each-ref [--points-at <objecte>]"
#: builtin/for-each-ref.c:12
-#, fuzzy
msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<comissió>]]"
+msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
#: builtin/for-each-ref.c:13
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
"git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr ""
"posa els marcadors de posició de forma adequada per a intèrprets d'ordres"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "posa els marcadors de posició entre cometes adequades per al perl"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "posa els marcadors de posició entre cometes adequades per al python"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "posa els marcadors de posició entre cometes adequades per al Tcl"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "mostra només <n> referències coincidents"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:42 builtin/tag.c:482
msgid "respect format colors"
msgstr "respecta els colors del format"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "imprimeix només les referències que assenyalin l'objecte donat"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "imprimeix només les referències que s'han fusionat"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "imprimeix només les referències que no s'han fusionat"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "imprimeix només les referències que continguin la comissió"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "imprimeix només les referències que no continguin la comissió"
@@ -15598,20 +16123,19 @@
msgid "git for-each-repo --config=<config> <command-args>"
msgstr "git for-each-repo --config=<config> <command-args>"
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
msgid "config"
msgstr "config"
-#: builtin/for-each-repo.c:38
-#, fuzzy
+#: builtin/for-each-repo.c:35
msgid "config key storing a list of repository paths"
msgstr "clau de configuració emmagatzemant una llista de camins de repositori"
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
msgid "missing --config=<config>"
msgstr "falta --config=<config>"
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
msgid "unknown"
msgstr "desconegut"
@@ -15627,233 +16151,361 @@
msgid "warning in %s %s: %s"
msgstr "avís en %s %s: %s"
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
#, c-format
msgid "broken link from %7s %s"
msgstr "enllaç trencat de %7s %s"
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
msgid "wrong object type in link"
msgstr "tipus d'objecte incorrecte en l'enllaç"
-#: builtin/fsck.c:151
-#, fuzzy, c-format
+#: builtin/fsck.c:152
+#, c-format
msgid ""
"broken link from %7s %s\n"
" to %7s %s"
-msgstr "enllaç trencat del 7% al 7%"
+msgstr ""
+"enllaç trencat des de %7s %s\n"
+" fins a %7s %s"
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
#, c-format
msgid "missing %s %s"
msgstr "manca %s %s"
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
#, c-format
msgid "unreachable %s %s"
msgstr "inabastable %s %s"
-#: builtin/fsck.c:310
-#, fuzzy, c-format
+#: builtin/fsck.c:311
+#, c-format
msgid "dangling %s %s"
-msgstr "per cent"
+msgstr "sense assignació %s %s"
-#: builtin/fsck.c:320
-#, fuzzy
+#: builtin/fsck.c:321
msgid "could not create lost-found"
-msgstr "no s'ha pogut crear el trobat perdut"
+msgstr "no s'ha pogut crear el trobat-perdut"
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
#, c-format
msgid "could not finish '%s'"
msgstr "no s'ha pogut finalitzar «%s»"
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
#, c-format
msgid "Checking %s"
msgstr "S'està comprovant %s"
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "S'està comprovant la connectivitat (%d objectes)"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
#, c-format
msgid "Checking %s %s"
msgstr "S'està comprovant %s %s"
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
msgid "broken links"
msgstr "enllaços trencats"
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
#, c-format
msgid "root %s"
msgstr "arrel %s"
-#: builtin/fsck.c:427
-#, fuzzy, c-format
+#: builtin/fsck.c:428
+#, c-format
msgid "tagged %s %s (%s) in %s"
-msgstr "percentatges marcats"
+msgstr "marcat %s %s (%s) a %s"
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: objecte corrupte o no trobat"
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: entrada de referència no vàlida %s"
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
#, c-format
msgid "Checking reflog %s->%s"
msgstr "S'està comprovant reflog %s->%s"
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: punter %s sha1 no vàlid"
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
#, c-format
msgid "%s: not a commit"
msgstr "%s: no és una comissió"
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
msgid "notice: No default references"
msgstr "avís: no hi ha referències per defecte"
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: el resum del camí no coincideix, trobat a: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objecte corrupte o no trobat: %s"
-#: builtin/fsck.c:618
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: l'objecte és de tipus desconegut «%s»: %s"
+
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: no s'ha pogut analitzar l'objecte: %s"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "fitxer sha1 malmès: %s"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "S'està comprovant el directori d'objecte"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "S'estan comprovant els directoris d'objecte"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "S'està comprovant l'enllaç %s"
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:710 builtin/index-pack.c:862
#, c-format
msgid "invalid %s"
msgstr "%s no vàlid"
-#: builtin/fsck.c:683
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s apunta a una cosa estranya (%s)"
-#: builtin/fsck.c:689
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: el HEAD separat no apunta a res"
-#: builtin/fsck.c:693
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "avís: %s apunta a una branca no nascuda (%s)"
-#: builtin/fsck.c:705
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "S'està comprovant l'arbre de la memòria cau"
-#: builtin/fsck.c:710
-#, fuzzy, c-format
+#: builtin/fsck.c:744
+#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
-msgstr "percentatges d'apuntador sha1 no vàlid a l'arbre de la memòria cau"
+msgstr "%s: apuntador sha1 no vàlid a l'arbre de la memòria cau"
-#: builtin/fsck.c:719
-#, fuzzy
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
-msgstr "no arbre en l'arbre de la memòria cau"
+msgstr "un no arbre en l'arbre de la memòria cau"
-#: builtin/fsck.c:750
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcions>] [<objecte>...]"
-#: builtin/fsck.c:756
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "mostra els objectes inabastables"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "mostra els objectes penjants"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "informa de les etiquetes"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "informa dels nodes d'arrel"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
-msgstr "fes els objectes d'índex nodes de cap"
+msgstr "fes dels objectes d'índex nodes cap"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
-msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
+msgstr "fes que els registres de referències siguin nodes cap (per defecte)"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "també considera els paquets i els objectes alternatius"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "comprova només la connectivitat"
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr "habilita la comprovació més estricta"
-#: builtin/fsck.c:766
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "escriu objectes penjants a .git/lost-found"
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "mostra el progrés"
-#: builtin/fsck.c:768
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "mostra els noms detallats dels objectes abastables"
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "S'estan comprovant els objectes"
-#: builtin/fsck.c:855
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s: falta l'objecte"
-#: builtin/fsck.c:866
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "paràmetre no vàlid: s'esperava sha1, s'ha obtingut «%s»"
+#: builtin/fsmonitor--daemon.c:13
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [<options>]"
+
+#: builtin/fsmonitor--daemon.c:14
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [<options>]"
+
+#: builtin/fsmonitor--daemon.c:15
+msgid "git fsmonitor--daemon stop"
+msgstr "git fsmonitor--daemon stop"
+
+#: builtin/fsmonitor--daemon.c:16
+msgid "git fsmonitor--daemon status"
+msgstr "git fsmonitor--daemon status"
+
+#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "el valor de «%s» està fora de rang: %d"
+
+#: builtin/fsmonitor--daemon.c:57
+#, c-format, fuzzy
+msgid "value of '%s' not bool or int: %d"
+msgstr "valor de \"%s\" no bool ni int: el percentatge"
+
+#: builtin/fsmonitor--daemon.c:99
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr "fsmonitor-daemon està veient '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:104
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr "fsmonitor-daemon no està vigilant «%s»\n"
+
+#: builtin/fsmonitor--daemon.c:170
+#, c-format, fuzzy
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "no s'ha pogut crear la galeta fsmonitor '%s'"
+
+#: builtin/fsmonitor--daemon.c:753
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr "fsmonitor: cookie_result '%d' != SEEN"
+
+#: builtin/fsmonitor--daemon.c:1187
+#, c-format, fuzzy
+msgid "could not start IPC thread pool on '%s'"
+msgstr "no s'ha pogut iniciar el grup de fils IPC a «%s»"
+
+#: builtin/fsmonitor--daemon.c:1199
+#, fuzzy
+msgid "could not start fsmonitor listener thread"
+msgstr "no s'ha pogut iniciar el fil d'oient del fsmonitor"
+
+#: builtin/fsmonitor--daemon.c:1297
+#, fuzzy
+msgid "could not initialize listener thread"
+msgstr "no s'ha pogut inicialitzar el fil d'oient"
+
+#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr "fsmonitor--daemon is already running «%s»"
+
+#: builtin/fsmonitor--daemon.c:1332
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr "s'està executant fsmonitor-daemon en «%s»\n"
+
+#: builtin/fsmonitor--daemon.c:1387
+#, c-format, fuzzy
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "s'està iniciant fsmonitor-daemon a «%s»"
+
+#: builtin/fsmonitor--daemon.c:1413
+#, fuzzy
+msgid "daemon failed to start"
+msgstr "el dimoni ha fallat en iniciar"
+
+#: builtin/fsmonitor--daemon.c:1416
+#, fuzzy
+msgid "daemon not online yet"
+msgstr "el dimoni encara no està en línia"
+
+#: builtin/fsmonitor--daemon.c:1419
+msgid "daemon terminated"
+msgstr "s'ha finalitzat el dimoni"
+
+#: builtin/fsmonitor--daemon.c:1429
+msgid "detach from console"
+msgstr "separat de la consola"
+
+#: builtin/fsmonitor--daemon.c:1432
+msgid "use <n> ipc worker threads"
+msgstr "usa <n> fils de treball ipc"
+
+#: builtin/fsmonitor--daemon.c:1435
+#, fuzzy
+msgid "max seconds to wait for background daemon startup"
+msgstr "màxim de segons a esperar a l'inici del dimoni de fons"
+
+#: builtin/fsmonitor--daemon.c:1449
+#, c-format, fuzzy
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "valor «ipc-threads» no vàlid (%)"
+
+#: builtin/fsmonitor--daemon.c:1464
+#, c-format, fuzzy
+msgid "Unhandled subcommand '%s'"
+msgstr "Subordre no gestionada '%s'"
+
+#: builtin/fsmonitor--daemon.c:1477
+#, fuzzy
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr "fsmonitor--daemon no és compatible amb aquesta plataforma"
+
#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<opcions>]"
@@ -15868,289 +16520,306 @@
msgid "failed to parse '%s' value '%s'"
msgstr "no s'ha pogut analitzar «%s» valor «%s»"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "no es pot fer stat en «%s»"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr "no es pot llegir «%s»"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
-"L'última execució de gc ha informat el següent. Corregiu\n"
-"la causa primordial i elimineu %s.\n"
+"L'última execució de gc ha informat el següent. Corregiu la causa\n"
+" principal i elimineu %s\n"
"No es realitzarà la neteja automàtica fins que s'elimini el fitxer.\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "poda objectes sense referència"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "habilita el mode de recollida d'escombraries automàtica"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
-msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"
+msgstr ""
+"força l'execució de gc encara que hi pugui haver un altre gc executant-se"
-#: builtin/gc.c:560
-#, fuzzy
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "reempaqueta tots els altres paquets excepte el paquet més gran"
-#: builtin/gc.c:576
-#, fuzzy, c-format
+#: builtin/gc.c:577
+#, c-format
msgid "failed to parse gc.logexpiry value %s"
-msgstr "no s'ha pogut analitzar el valor de gc.logexpiry dels percentatges"
+msgstr "no s'ha pogut analitzar el valor %s de gc.logexpiry"
-#: builtin/gc.c:587
-#, fuzzy, c-format
+#: builtin/gc.c:588
+#, c-format
msgid "failed to parse prune expiry value %s"
-msgstr "no s'ha pogut analitzar el valor de venciment de la poda per cent"
+msgstr "no s'ha pogut analitzar el valor de venciment de la poda %s"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"S'està empaquetant el repositori automàticament en el rerefons per a un "
"rendiment òptim.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
"S'està empaquetant automàticament el repositori per a un rendiment òptim.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vegeu «git help gc» per a neteja manual.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si no)"
+"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si "
+"no)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+"There are too many unreachable loose objects; run 'git prune' to remove "
+"them."
msgstr ""
-"Hi ha massa objectes solts inabastables; executeu «git prune» per a eliminar-"
-"los."
+"Hi ha massa objectes solts inabastables; executeu «git prune» per a "
+"eliminar-los."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "--no-schedule no està permès"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "argument --schedule no reconegut, «%s»"
-#: builtin/gc.c:869
-#, fuzzy
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
-msgstr "s'ha produït un error en escriure l'objecte de comissió"
+msgstr "s'ha produït un error en escriure el graf de comissions"
-#: builtin/gc.c:905
-#, fuzzy
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
-msgstr "s'ha produït un error en omplir els remots"
+msgstr "s'ha produït un error en preobtenir els remots"
#: builtin/gc.c:1022
-#, fuzzy
msgid "failed to start 'git pack-objects' process"
-msgstr "no s'ha pogut iniciar el pack-objects"
+msgstr "no s'ha pogut iniciar el procés «git pack-objects»"
#: builtin/gc.c:1039
-#, fuzzy
msgid "failed to finish 'git pack-objects' process"
-msgstr "no s'ha pogut finalitzar el pack-objects"
+msgstr "no s'ha pogut finalitzar el procés «git pack-objects»"
-#: builtin/gc.c:1091
-#, fuzzy
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
-msgstr "no s'han pogut netejar els percentatges multi-paquet"
+msgstr "no s'han pogut escriu l'índex del multipaquet"
-#: builtin/gc.c:1109
-#, fuzzy
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
-msgstr "l'índex múltiple és massa petit"
+msgstr "ha fallat el venciment de «git multi-pack-index expire»"
-#: builtin/gc.c:1170
-#, fuzzy
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
-msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s"
+msgstr "ha fallat l'execució de «git multi-pack-index repack»"
-#: builtin/gc.c:1179
-#, fuzzy
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
-"s'està ometent la tasca de reempaquetar incremental perquè core."
-"multiPackIndex està desactivat"
+"s'està ometent la tasca incremental-repack perquè core.multiPackIndex està "
+"desactivat"
-#: builtin/gc.c:1283
-#, fuzzy, c-format
+#: builtin/gc.c:1278
+#, c-format
msgid "lock file '%s' exists, skipping maintenance"
-msgstr "el fitxer de bloqueig «%s» existeix s'omet el manteniment"
+msgstr "el fitxer de bloqueig «%s» existeix, s'omet el manteniment"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "la tasca «%s» ha fallat"
-#: builtin/gc.c:1395
-#, fuzzy, c-format
+#: builtin/gc.c:1390
+#, c-format
msgid "'%s' is not a valid task"
-msgstr "«%s» no és un terme vàlid"
+msgstr "«%s» no és una tasca vàlida"
-#: builtin/gc.c:1400
-#, fuzzy, c-format
+#: builtin/gc.c:1395
+#, c-format
msgid "task '%s' cannot be selected multiple times"
-msgstr "«%s» no es pot usar amb %s"
+msgstr "la tasca «%s» no es pot seleccionar múltiples vegades"
-#: builtin/gc.c:1415
-#, fuzzy
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "executa les tasques basades en l'estat del repositori"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "freqüència"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "executa les tasques basant-se en freqüència"
-#: builtin/gc.c:1420
-#, fuzzy
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
-msgstr "no informeu sobre el progrés o altra informació sobre stderr"
+msgstr "no informeu sobre el progrés o altra informació as stderr"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
msgid "task"
msgstr "tasca"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "executa una tasca específica"
-#: builtin/gc.c:1439
-#, fuzzy
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "usa com a màxim un de --auto i --schedule=<frequency>"
+msgstr "usa com a màxim un entre --auto i --schedule=<frequency>"
-#: builtin/gc.c:1482
-#, fuzzy
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
-msgstr "no s'ha pogut executar «git status» a «%s»"
+msgstr "no s'ha pogut executar «git config»"
-#: builtin/gc.c:1547
-#, fuzzy, c-format
+#: builtin/gc.c:1629
+#, c-format
msgid "failed to expand path '%s'"
-msgstr "s'ha produït un error en crear el camí «%s»%s"
+msgstr "s'ha produït un error en expandir el camí «%s»"
-#: builtin/gc.c:1576
-#, fuzzy
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
-msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient."
+msgstr "s'ha produït un error en iniciar launchctl"
-#: builtin/gc.c:1613
-#, fuzzy, c-format
+#: builtin/gc.c:1769 builtin/gc.c:2237
+#, c-format
msgid "failed to create directories for '%s'"
-msgstr "s'ha produït un error en crear el directori «%s»"
+msgstr "s'ha produït un error en crear els directoris per a «%s»"
-#: builtin/gc.c:1674
-#, fuzzy, c-format
+#: builtin/gc.c:1796
+#, c-format
msgid "failed to bootstrap service %s"
-msgstr "s'ha produït un error en eliminar %s"
+msgstr "s'ha produït un error en arrencar el servei %s"
-#: builtin/gc.c:1745
-#, fuzzy
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
-msgstr "no s'han pogut crear els fitxers de sortida"
+msgstr "no s'han pogut crear un fitxer xml temporal"
-#: builtin/gc.c:1835
-#, fuzzy
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
-msgstr "s'ha produït un error en fer stat a %s"
+msgstr "s'ha produït un error en iniciar schtasks"
-#: builtin/gc.c:1879
-#, fuzzy
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"no s'ha pogut executar «crontab -l»; el vostre sistema podria no admetre "
"«cron»"
-#: builtin/gc.c:1896
-#, fuzzy
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"no s'ha pogut executar «crontab»; el vostre sistema podria no admetre «cron»"
-#: builtin/gc.c:1900
-#, fuzzy
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
-msgstr "s'ha produït un error en obrir «%s»"
+msgstr "s'ha produït un error en obrir stdin de «crontab»"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "«crontab» ha mort"
-#: builtin/gc.c:1976
-#, fuzzy
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "s'ha produït un error en iniciar systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "s'ha produït un error en executar systemctl"
+
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
+#: builtin/worktree.c:1024
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "s'ha produït un error en suprimir «%s»"
+
+#: builtin/gc.c:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "l'argument --scheduler no reconegut «%s»"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "ni els temporitzadors de systemd ni de crontab estan disponibles"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "el planificador %s no està disponible"
+
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
-msgstr "un altre procés és planificar el manteniment en segon pla"
+msgstr "un altre procés està planificant un manteniment en segon pla"
-#: builtin/gc.c:2000
-#, fuzzy
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<scheduler>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "planificador"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "planificador per a activar l'execució de manteniment del git"
+
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
-msgstr "no s'ha pogut afegir el fitxer de paquet «%s»"
+msgstr "no s'ha pogut afegir un repositori a la configuració global"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <subcommand> [<options>]"
-#: builtin/gc.c:2029
-#, fuzzy, c-format
+#: builtin/gc.c:2523
+#, c-format
msgid "invalid subcommand: %s"
-msgstr "comissió no vàlida %s"
+msgstr "subordre no vàlida: %s"
-#: builtin/grep.c:30
+#: builtin/grep.c:32
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:241
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: s'ha produït un error en crear fil: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:295
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
@@ -16158,368 +16827,363 @@
#. TRANSLATORS: %s is the configuration
#. variable for tweaking threads, currently
#. grep.threads
-#.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3150
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no s'admeten fils, s'ignorarà %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
#, c-format
msgid "unable to read tree (%s)"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:674
#, c-format
msgid "unable to grep from object of type %s"
msgstr "no es pot fer grep des d'un objecte de tipus %s"
-#: builtin/grep.c:739
+#: builtin/grep.c:754
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'opció «%c» espera un valor numèric"
-#: builtin/grep.c:838
+#: builtin/grep.c:852
msgid "search in index instead of in the work tree"
msgstr "cerca en l'índex en lloc de l'arbre de treball"
-#: builtin/grep.c:840
+#: builtin/grep.c:854
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:842
+#: builtin/grep.c:856
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:844
+#: builtin/grep.c:858
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant «.gitignore»"
-#: builtin/grep.c:846
+#: builtin/grep.c:860
msgid "recursively search in each submodule"
msgstr "cerca recursivament a cada submòdul"
-#: builtin/grep.c:849
+#: builtin/grep.c:863
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:851
+#: builtin/grep.c:865
msgid "case insensitive matching"
-msgstr "coincidència insensible a majúscula i minúscula"
+msgstr "coincidència no distingeix entre majúscules i minúscules"
-#: builtin/grep.c:853
+#: builtin/grep.c:867
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:855
+#: builtin/grep.c:869
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:857
+#: builtin/grep.c:871
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:860
+#: builtin/grep.c:874
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:862
+#: builtin/grep.c:876
msgid "search in subdirectories (default)"
msgstr "cerca als subdirectoris (per defecte)"
-#: builtin/grep.c:864
+#: builtin/grep.c:878
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:868
+#: builtin/grep.c:882
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX ampliades"
-#: builtin/grep.c:871
+#: builtin/grep.c:885
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:874
+#: builtin/grep.c:888
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:877
+#: builtin/grep.c:891
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "show column number of first match"
msgstr "mostra el nombre de columna de la primera coincidència"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:883
+#: builtin/grep.c:897
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:885
+#: builtin/grep.c:899
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:887
+#: builtin/grep.c:901
msgid "show only filenames instead of matching lines"
msgstr "mostra només els noms de fitxer en lloc de les línies coincidents"
-#: builtin/grep.c:889
+#: builtin/grep.c:903
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:892
+#: builtin/grep.c:906
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:894
+#: builtin/grep.c:908
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:897
+#: builtin/grep.c:911
msgid "show only matching parts of a line"
msgstr "mostra només les parts de coincidents de la línia"
-#: builtin/grep.c:899
+#: builtin/grep.c:913
msgid "show the number of matches instead of matching lines"
msgstr "mostra el nombre de coincidències en lloc de les línies coincidents"
-#: builtin/grep.c:900
+#: builtin/grep.c:914
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:902
+#: builtin/grep.c:916
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:904
+#: builtin/grep.c:918
msgid "show filename only once above matches from same file"
msgstr ""
"mostra el nom de fitxer només una vegada a dalt de les coincidències del "
"mateix fitxer"
-#: builtin/grep.c:907
+#: builtin/grep.c:921
msgid "show <n> context lines before and after matches"
msgstr "mostra <n> línies de context abans i després d'una coincidència"
-#: builtin/grep.c:910
+#: builtin/grep.c:924
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:912
+#: builtin/grep.c:926
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "use <n> worker threads"
msgstr "usa <n> fils de treball"
-#: builtin/grep.c:915
+#: builtin/grep.c:929
msgid "shortcut for -C NUM"
-msgstr "drecera per -C NUM"
+msgstr "drecera per a -C NUM"
-#: builtin/grep.c:918
+#: builtin/grep.c:932
msgid "show a line with the function name before matches"
msgstr "mostra una línia amb el nom de funció abans de les coincidències"
-#: builtin/grep.c:920
+#: builtin/grep.c:934
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:923
+#: builtin/grep.c:937
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:925
+#: builtin/grep.c:939
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:927
+#: builtin/grep.c:941
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:939
+#: builtin/grep.c:953
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:941
+#: builtin/grep.c:955
msgid "show only matches from files that match all patterns"
msgstr ""
"mostra només les coincidències dels fitxers que coincideixin amb tots els "
"patrons"
-#: builtin/grep.c:944
+#: builtin/grep.c:958
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:944
+#: builtin/grep.c:958
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:948
+#: builtin/grep.c:962
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:1014
+#: builtin/grep.c:1028
msgid "no pattern given"
msgstr "no s'ha donat cap patró"
-#: builtin/grep.c:1050
+#: builtin/grep.c:1064
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no es pot usar amb revisions"
-#: builtin/grep.c:1058
+#: builtin/grep.c:1072
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no s'ha pogut resoldre la revisió: %s"
-#: builtin/grep.c:1088
+#: builtin/grep.c:1102
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked no s'admet amb --recurse-submodules"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1106
msgid "invalid option combination, ignoring --threads"
msgstr "combinació d'opcions no vàlida, s'està ignorant --threads"
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1109 builtin/pack-objects.c:4084
msgid "no threads support, ignoring --threads"
msgstr "no s'admeten fils, s'ignorarà --threads"
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
-#: builtin/grep.c:1132
+#: builtin/grep.c:1146
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager només funciona en l'arbre de treball"
-#: builtin/grep.c:1158
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached o --untracked no es pot usar amb --no-index"
-
-#: builtin/grep.c:1161
-#, fuzzy
-msgid "--untracked cannot be used with --cached"
-msgstr "--cached o --untracked no es pot usar amb --no-index"
-
-#: builtin/grep.c:1167
-#, fuzzy
+#: builtin/grep.c:1179
msgid "--[no-]exclude-standard cannot be used for tracked contents"
-msgstr "--[no-]exclude-standard no es pot utilitzar per als continguts seguits"
+msgstr ""
+"--[no-]exclude-standard no es pot utilitzar per als continguts seguits"
-#: builtin/grep.c:1175
-#, fuzzy
+#: builtin/grep.c:1187
msgid "both --cached and trees are given"
-msgstr "es donen ambdós --cached i arbres"
+msgstr "ambdós --cached i arbres venen donats"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
-"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] "
-"[--] <fitxer>..."
+"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin]"
+" [--] <fitxer>..."
-#: builtin/hash-object.c:86
-msgid "git hash-object --stdin-paths"
-msgstr "git hash-object --stdin-paths"
-
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:97
msgid "object type"
msgstr "tipus d'objecte"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:98
msgid "write the object into the object database"
msgstr "escriu l'objecte a la base de dades d'objectes"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
msgstr "llegeix l'objecte des de stdin"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:102
msgid "store file as is without filters"
msgstr "emmagatzema el fitxer tal com és sense filtres"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:103
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"només suma qualsevol brossa aleatòria per a crear objectes malmesos per a "
"depurar al Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
msgstr "processa el fitxer com si fos d'aquest camí"
-#: builtin/help.c:47
+#: builtin/help.c:57
msgid "print all available commands"
msgstr "imprimeix totes les ordres disponibles"
-#: builtin/help.c:48
+#: builtin/help.c:60
+#, fuzzy
+msgid "show external commands in --all"
+msgstr "mostra les ordres externes a --all"
+
+#: builtin/help.c:61
+#, fuzzy
+msgid "show aliases in --all"
+msgstr "mostra els àlies a --all"
+
+#: builtin/help.c:62
msgid "exclude guides"
msgstr "exclou guies"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "imprimeix la llista de guies útils"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "imprimeix tots els noms de les variables de configuració"
-
-#: builtin/help.c:52
+#: builtin/help.c:63
msgid "show man page"
msgstr "mostra la pàgina de manual"
-#: builtin/help.c:53
+#: builtin/help.c:64
msgid "show manual in web browser"
msgstr "mostra la pàgina de manual en el navegador web"
-#: builtin/help.c:55
+#: builtin/help.c:66
msgid "show info page"
msgstr "mostra la pàgina d'informació"
-#: builtin/help.c:57
+#: builtin/help.c:68
msgid "print command description"
msgstr "imprimeix la descripció de l'ordre"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]"
+#: builtin/help.c:70
+msgid "print list of useful guides"
+msgstr "imprimeix la llista de guies útils"
-#: builtin/help.c:163
+#: builtin/help.c:72
+msgid "print all configuration variable names"
+msgstr "imprimeix tots els noms de les variables de configuració"
+
+#: builtin/help.c:84
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+
+#: builtin/help.c:201
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'ajuda no reconegut «%s»"
-#: builtin/help.c:190
+#: builtin/help.c:227
msgid "Failed to start emacsclient."
-msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient."
+msgstr "S'ha produït un error en iniciar emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:240
msgid "Failed to parse emacsclient version."
msgstr "S'ha produït un error en analitzar la versió d'emacsclient."
-#: builtin/help.c:211
+#: builtin/help.c:248
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versió d'emacsclient «%d» és massa vella (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
#, c-format
msgid "failed to exec '%s'"
msgstr "s'ha produït un error en executar «%s»"
-#: builtin/help.c:307
+#: builtin/help.c:344
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16528,7 +17192,7 @@
"«%s»: camí a un visualitzador de manuals no compatible.\n"
"Considereu usar «man.<eina>.cmd» en lloc d'això."
-#: builtin/help.c:319
+#: builtin/help.c:356
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16537,129 +17201,140 @@
"«%s»: ordre per a un visualitzador de manuals compatible.\n"
"Considereu usar «man.<eina>.path» en lloc d'això."
-#: builtin/help.c:436
+#: builtin/help.c:471
#, c-format
msgid "'%s': unknown man viewer."
msgstr "«%s»: visualitzador de manuals desconegut."
-#: builtin/help.c:453
+#: builtin/help.c:487
msgid "no man viewer handled the request"
msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
-#: builtin/help.c:461
+#: builtin/help.c:494
msgid "no info viewer handled the request"
msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
-#: builtin/help.c:520 builtin/help.c:531 git.c:348
+#: builtin/help.c:555 builtin/help.c:566 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "«%s» és un àlies de «%s»"
-#: builtin/help.c:534 git.c:380
-#, fuzzy, c-format
+#: builtin/help.c:569 git.c:380
+#, c-format
msgid "bad alias.%s string: %s"
-msgstr "àlies incorrecte.%s string%s"
+msgstr "cadena «alias.%s» incorrecte: %s"
-#: builtin/help.c:563 builtin/help.c:593
+#: builtin/help.c:611
+#, c-format, fuzzy
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "l'opció «%s» no pren cap argument que no sigui una opció"
+
+#: builtin/help.c:631
+#, fuzzy
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr ""
+"les opcions «--no-exexternal-commands|aliases with» només es poden utilitzar"
+" amb «--all»"
+
+#: builtin/help.c:643 builtin/help.c:671
#, c-format
msgid "usage: %s%s"
msgstr "ús: %s%s"
-#: builtin/help.c:577
-#, fuzzy
+#: builtin/help.c:666
msgid "'git help config' for more information"
-msgstr "'git help config' per a més informació"
+msgstr "«git help config» per a més informació"
-#: builtin/index-pack.c:222
+#: builtin/hook.c:10
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+
+#: builtin/hook.c:30
+msgid "silently ignore missing requested <hook-name>"
+msgstr "ignora silenciosament la sol·licitud <hook-name> perduda"
+
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "hi ha una discordança de tipus d'objecte a %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no es pot omplir %d octet"
-msgstr[1] "no es pot omplir %d octets"
+msgstr[1] "no es poden omplir %d octets"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "EOF prematur"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "error de lectura d'entrada"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "s'han usat més octets que hi havia disponibles"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:754
msgid "pack too large for current definition of off_t"
msgstr "paquet massa gran per a la definició actual d'off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "el paquet supera la mida màxima permesa"
-
-#: builtin/index-pack.c:343
+#: builtin/index-pack.c:329
#, c-format
-msgid "unable to create '%s'"
-msgstr "no s'ha pogut crear «%s»"
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "el paquet supera la mida màxima permesa (%s)"
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "no es pot obrir el fitxer de paquet «%s»"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "hi ha una discordança de signatura de paquet"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la versió de paquet %<PRIu32> no és compatible"
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:380
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s"
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:485
#, c-format
msgid "inflate returned %d"
msgstr "la inflació ha retornat %d"
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:534
msgid "offset value overflow for delta base object"
msgstr ""
"desbordament de valor de desplaçament per a l'objecte base de diferències"
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:542
msgid "delta base offset is out of bound"
msgstr "el desplaçament de base de diferències està fora de límits"
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:550
#, c-format
msgid "unknown object type %d"
msgstr "tipus d'objecte desconegut %d"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:581
msgid "cannot pread pack file"
msgstr "no es pot fer pread en el fitxer empaquetat"
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:583
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -16667,204 +17342,193 @@
msgstr[1] ""
"el final del fitxer empaquetat és prematur, manquen %<PRIuMAX> octets"
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:609
msgid "serious inflate inconsistency"
msgstr "hi ha una inconsistència seriosa d'inflació"
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
+#: builtin/index-pack.c:823 builtin/index-pack.c:832
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:757 builtin/pack-objects.c:290
+#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
#, c-format
msgid "unable to read %s"
msgstr "no s'ha pogut llegir %s"
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:821
#, c-format
msgid "cannot read existing object info %s"
msgstr "no es pot llegir la informació d'objecte existent %s"
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:829
#, c-format
msgid "cannot read existing object %s"
msgstr "no es pot llegir l'objecte existent %s"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:843
#, c-format
msgid "invalid blob object %s"
msgstr "objecte de blob no vàlid %s"
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:846 builtin/index-pack.c:865
msgid "fsck error in packed object"
msgstr "fsck error en un objecte empaquetat"
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:867
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "No tots els objectes fills de %s són abastables"
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:928 builtin/index-pack.c:975
msgid "failed to apply delta"
msgstr "s'ha produït un error en aplicar la diferència"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "S'estan rebent objectes"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "S'estan indexant objectes"
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "el paquet és malmès (discordança SHA1)"
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "no es pot fer fstat en el fitxer de paquet"
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "el paquet té brossa al seu final"
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "S'estan resolent les diferències"
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
#, c-format
msgid "unable to create thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "confusió més enllà de la bogeria"
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "s'ha completat amb %d objecte local"
msgstr[1] "s'ha completat amb %d objectes locals"
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)"
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "El paquet té %d diferència no resolta"
msgstr[1] "El paquet té %d diferències no resoltes"
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1423
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objecte local %s és malmès"
-#: builtin/index-pack.c:1446
-#, fuzzy, c-format
+#: builtin/index-pack.c:1445
+#, c-format
msgid "packfile name '%s' does not end with '.%s'"
-msgstr "el nom del fitxer de paquet «%s» no acaba amb «.pack»"
+msgstr "el nom del fitxer de paquet «%s» no acaba amb «.%s»"
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "no es pot escriure «%s» al fitxer «%s»"
-#: builtin/index-pack.c:1478
-#, fuzzy, c-format
+#: builtin/index-pack.c:1477
+#, c-format
msgid "cannot close written %s file '%s'"
-msgstr "no s'ha pogut tancar l'arxiu «%s» per escrit"
+msgstr "no s'ha pogut tancar el fitxer %s escrit «%s»"
-#: builtin/index-pack.c:1504
+#: builtin/index-pack.c:1494
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "no s'ha pogut canviar el nom del fitxer temporal «*.%s» a «%s»"
+
+#: builtin/index-pack.c:1519
msgid "error while closing pack file"
msgstr "error en tancar el fitxer empaquetat"
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "no es pot emmagatzemar el fitxer empaquetat"
-
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "no es pot emmagatzemar el fitxer d'índex"
-
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> incorrecte"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1648
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No es pot obrir el fitxer empaquetat existent «%s»"
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "No es pot obrir el fitxer d'índex de paquets existent de «%s»"
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1698
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "sense diferències: %d objecte"
msgstr[1] "sense diferències: %d objectes"
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1705
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longitud de cadena = %d: %lu objecte"
msgstr[1] "longitud de cadena = %d: %lu objectes"
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1748
msgid "Cannot come back to cwd"
msgstr "No es pot tornar al directori de treball actual"
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
+#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
#, c-format
msgid "bad %s"
msgstr "%s incorrecte"
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "algorisme hash desconegut «%s»"
-#: builtin/index-pack.c:1852
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin no es pot usar sense --stdin"
-
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1856
msgid "--stdin requires a git repository"
msgstr "--stdin requereix un repositori git"
-#: builtin/index-pack.c:1856
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format no es pot usar sense --stdin"
-
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1873
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "error fsck als objectes del paquet"
@@ -16908,100 +17572,95 @@
msgid "not copying templates from '%s': %s"
msgstr "no s'estan copiant plantilles de «%s»: %s"
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
#, c-format
msgid "invalid initial branch name: '%s'"
msgstr "nom de branca inicial no vàlid: «%s»"
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
#, c-format
msgid "unable to handle file type %d"
msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
#, c-format
msgid "unable to move %s to %s"
msgstr "no s'ha pogut moure %s a %s"
-#: builtin/init-db.c:372
-#, fuzzy
+#: builtin/init-db.c:373
msgid "attempt to reinitialize repository with different hash"
msgstr "s'ha intentat reinicialitzar el repositori amb un hash diferent"
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr "%s ja existeix"
-#: builtin/init-db.c:431
-#, fuzzy, c-format
+#: builtin/init-db.c:432
+#, c-format
msgid "re-init: ignored --initial-branch=%s"
-msgstr "reinicialització ignorada --initial-branch=%"
+msgstr "reinicialització: s'ha ignorat --initial-branch=%s"
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "S'ha reinicialitzat el repositori compartit existent del Git en %s%s\n"
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "S'ha reinicialitzat el repositori existent del Git en %s%s\n"
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "S'ha inicialitzat un repositori compartit buit del Git en %s%s\n"
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "S'ha inicialitzat un repositori buit del Git en %s%s\n"
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
+"[--shared[=<permissions>]] [<directory>]"
msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
-"shared[=<permisos>]] [<directori>]"
+"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] "
+"[--shared[=<permisos>]] [<directori>]"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
msgid "specify that the git repository is to be shared amongst several users"
-msgstr "especifica que el repositori de git es compartirà entre diversos usuaris"
+msgstr ""
+"especifica que el repositori de git es compartirà entre diversos usuaris"
-#: builtin/init-db.c:550
-#, fuzzy
+#: builtin/init-db.c:551
msgid "override the name of the initial branch"
-msgstr "passa per alt el bit executable dels fitxers llistats"
+msgstr "sobreescriu el nom de la branca inicial"
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
msgid "hash"
msgstr "hash"
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
msgid "specify the hash algorithm to use"
msgstr "especifiqueu l'algorisme de resum a usar"
-#: builtin/init-db.c:559
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir i --bare són mútuament excloents"
-
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgstr "no es pot mkdir %s"
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
#, c-format
msgid "cannot chdir to %s"
msgstr "no es pot canviar de directori a %s"
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17010,15 +17669,14 @@
"no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
"dir=<directori>)"
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No es pot accedir a l'arbre de treball «%s»"
-#: builtin/init-db.c:683
-#, fuzzy
+#: builtin/init-db.c:684
msgid "--separate-git-dir incompatible with bare repository"
-msgstr "--separate-git-dir és incompatible amb --bisect"
+msgstr "--separate-git-dir és incompatible amb un repositori nu"
#: builtin/interpret-trailers.c:16
msgid ""
@@ -17080,571 +17738,560 @@
msgid "no input file given for in-place editing"
msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ"
-#: builtin/log.c:59
+#: builtin/log.c:60
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
-#: builtin/log.c:60
+#: builtin/log.c:61
msgid "git show [<options>] <object>..."
msgstr "git show [<opcions>] <objecte>..."
-#: builtin/log.c:113
+#: builtin/log.c:114
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opció --decorate no vàlida: %s"
-#: builtin/log.c:180
+#: builtin/log.c:181
msgid "show source"
msgstr "mostra la font"
-#: builtin/log.c:181
-#, fuzzy
+#: builtin/log.c:182
msgid "use mail map file"
-msgstr "Usa el fitxer de mapa de correu"
+msgstr "usa el fitxer de mapa de correu"
-#: builtin/log.c:184
+#: builtin/log.c:185
msgid "only decorate refs that match <pattern>"
msgstr "només decora les referències que coincideixin amb <patró>"
-#: builtin/log.c:186
+#: builtin/log.c:187
msgid "do not decorate refs that match <pattern>"
msgstr "no decoris les referències que coincideixen amb <patró>"
-#: builtin/log.c:187
+#: builtin/log.c:188
msgid "decorate options"
msgstr "opcions de decoració"
-#: builtin/log.c:190
-#, fuzzy
+#: builtin/log.c:191
msgid ""
"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
msgstr ""
-"Traça l'evolució del rang de línia <start>,<end> or funcions :<funcname> in "
-"{8771193"
+"traça l'evolució del rang de línia <start>,<end> o funcions :<funcname> a "
+"<file>"
-#: builtin/log.c:213
-#, fuzzy
+#: builtin/log.c:214
msgid "-L<range>:<file> cannot be used with pathspec"
-msgstr "%s: %s no es pot usar amb %s"
+msgstr "-L<range>:<file> no es pot usar amb una especificació de camí"
-#: builtin/log.c:303
+#: builtin/log.c:322
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortida final: %d %s\n"
-#: builtin/log.c:568
+#: builtin/log.c:429
+#, fuzzy
+msgid "unable to create temporary object directory"
+msgstr "no s'ha pogut crear el directori temporal de l'objecte"
+
+#: builtin/log.c:599
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: fitxer incorrecte"
-#: builtin/log.c:583 builtin/log.c:673
+#: builtin/log.c:614 builtin/log.c:706
#, c-format
msgid "could not read object %s"
msgstr "no s'ha pogut llegir l'objecte %s"
-#: builtin/log.c:698
+#: builtin/log.c:731
#, c-format
msgid "unknown type: %d"
msgstr "tipus desconegut: %d"
-#: builtin/log.c:843
+#: builtin/log.c:880
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: cobertura no vàlida des del mode descripció"
-#: builtin/log.c:850
+#: builtin/log.c:887
msgid "format.headers without value"
msgstr "format.headers sense valor"
-#: builtin/log.c:979
+#: builtin/log.c:1016
#, c-format
msgid "cannot open patch file %s"
msgstr "no s'ha pogut obrir el fitxer de pedaç %s"
-#: builtin/log.c:996
+#: builtin/log.c:1033
msgid "need exactly one range"
msgstr "necessita exactament un interval"
-#: builtin/log.c:1006
+#: builtin/log.c:1043
msgid "not a range"
msgstr "no és un interval"
-#: builtin/log.c:1170
-#, fuzzy
+#: builtin/log.c:1207
msgid "cover letter needs email format"
-msgstr "la lletra de la portada necessita un format de correu electrònic"
+msgstr "la carta de presentació necessita un format de correu electrònic"
-#: builtin/log.c:1176
-#, fuzzy
+#: builtin/log.c:1213
msgid "failed to create cover-letter file"
-msgstr "no s'ha pogut crear el fitxer de portada"
+msgstr "s'ha produït un error en crear el fitxer de carta de presentació"
-#: builtin/log.c:1263
+#: builtin/log.c:1300
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1290
+#: builtin/log.c:1327
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1348
+#: builtin/log.c:1385
msgid "two output directories?"
msgstr "dos directoris de sortida?"
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
#, c-format
msgid "unknown commit %s"
msgstr "comissió desconeguda %s"
-#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida"
-#: builtin/log.c:1519
+#: builtin/log.c:1556
msgid "could not find exact merge base"
msgstr "no s'ha pogut trobar la base exacta de la fusió"
-#: builtin/log.c:1529
-#, fuzzy
+#: builtin/log.c:1566
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 ""
-"no s'ha pogut obtenir la font si voleu registrar la comissió base "
-"automàticament si us plau useu la branca git --set-upstream-to per al "
-"seguiment d'una branca remota. O podeu especificar la comissió base per --"
-"base=<base-commit-id> manualment"
+"no s'ha pogut obtenir la font, si voleu registrar la comissió base\n"
+"automàticament, useu git branch --set-upstream-to per a seguir una\n"
+"una branca remota. També podeu especificar la comissió base amb --base=<base-commit-id> manualment"
-#: builtin/log.c:1552
+#: builtin/log.c:1589
msgid "failed to find exact merge base"
msgstr "no s'ha pogut trobar la base exacta de la fusió"
-#: builtin/log.c:1569
+#: builtin/log.c:1606
msgid "base commit should be the ancestor of revision list"
msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions"
-#: builtin/log.c:1579
+#: builtin/log.c:1616
msgid "base commit shouldn't be in revision list"
msgstr "la comissió base no ha de ser en la llista de revisions"
-#: builtin/log.c:1637
+#: builtin/log.c:1674
msgid "cannot get patch id"
msgstr "no es pot obtenir l'id del pedaç"
-#: builtin/log.c:1700
-#, fuzzy
+#: builtin/log.c:1737
msgid "failed to infer range-diff origin of current series"
-msgstr "no s'ha pogut inferir l'interval-diferències"
+msgstr ""
+"no s'ha pogut inferir el rang de diferències d'origen de les sèries actuals"
-#: builtin/log.c:1702
-#, fuzzy, c-format
+#: builtin/log.c:1739
+#, c-format
msgid "using '%s' as range-diff origin of current series"
-msgstr "utilitzant «%s» com a origen de rang-diferencia de la sèrie actual"
+msgstr ""
+"utilitzant «%s» com a origen de rang de diferències de la sèrie actual"
-#: builtin/log.c:1746
+#: builtin/log.c:1783
msgid "use [PATCH n/m] even with a single patch"
msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç"
-#: builtin/log.c:1749
+#: builtin/log.c:1786
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:1753
+#: builtin/log.c:1790
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:1755
+#: builtin/log.c:1792
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:1757
+#: builtin/log.c:1794
msgid "use simple number sequence for output file names"
msgstr "usa una seqüència de números per als noms dels fitxers de sortida"
-#: builtin/log.c:1758
+#: builtin/log.c:1795
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:1759
+#: builtin/log.c:1796
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de «.patch»"
-#: builtin/log.c:1761
+#: builtin/log.c:1798
msgid "start numbering patches at <n> instead of 1"
msgstr "comença numerant els pedaços a <n> en lloc d'1"
-#: builtin/log.c:1762
+#: builtin/log.c:1799
msgid "reroll-count"
-msgstr ""
+msgstr "reroll-count"
-#: builtin/log.c:1763
+#: builtin/log.c:1800
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:1765
+#: builtin/log.c:1802
msgid "max length of output filename"
msgstr "mida màxima del nom del fitxer de sortida"
-#: builtin/log.c:1767
+#: builtin/log.c:1804
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "useu [RFC PATCH] en comptes de [PATCH]"
-#: builtin/log.c:1770
+#: builtin/log.c:1807
msgid "cover-from-description-mode"
msgstr "cover-from-description-mode"
-#: builtin/log.c:1771
+#: builtin/log.c:1808
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
-"genera parts d'una carta de presentació basant-se en la descripció d'una branca"
+"genera parts d'una carta de presentació basant-se en la descripció d'una "
+"branca"
-#: builtin/log.c:1773
+#: builtin/log.c:1810
msgid "use [<prefix>] instead of [PATCH]"
msgstr "useu [<prefix>] en comptes de [PATCH]"
-#: builtin/log.c:1776
+#: builtin/log.c:1813
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:1779
+#: builtin/log.c:1816
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:1782
+#: builtin/log.c:1819
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1784
+#: builtin/log.c:1821
msgid "output all-zero hash in From header"
msgstr "emet un hash de tots zeros en la capçalera From"
-#: builtin/log.c:1786
+#: builtin/log.c:1823
msgid "don't include a patch matching a commit upstream"
msgstr "no incloguis pedaços que coincideixin amb comissions a la font"
-#: builtin/log.c:1788
+#: builtin/log.c:1825
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
-#: builtin/log.c:1790
+#: builtin/log.c:1827
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1791
+#: builtin/log.c:1828
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1792
+#: builtin/log.c:1829
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1830 builtin/log.c:1831
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1793
+#: builtin/log.c:1830
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1794
+#: builtin/log.c:1831
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1795
+#: builtin/log.c:1832
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1796
+#: builtin/log.c:1833
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
-#: builtin/log.c:1798
+#: builtin/log.c:1835
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1799
+#: builtin/log.c:1836
msgid "make first mail a reply to <message-id>"
msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>"
-#: builtin/log.c:1800 builtin/log.c:1803
+#: builtin/log.c:1837 builtin/log.c:1840
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1801
+#: builtin/log.c:1838
msgid "attach the patch"
msgstr "adjunta el pedaç"
-#: builtin/log.c:1804
+#: builtin/log.c:1841
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1808
+#: builtin/log.c:1845
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1810
+#: builtin/log.c:1847
msgid "signature"
msgstr "signatura"
-#: builtin/log.c:1811
+#: builtin/log.c:1848
msgid "add a signature"
msgstr "afegeix una signatura"
-#: builtin/log.c:1812
+#: builtin/log.c:1849
msgid "base-commit"
msgstr "comissió base"
-#: builtin/log.c:1813
+#: builtin/log.c:1850
msgid "add prerequisite tree info to the patch series"
msgstr "afegeix la informació d'arbre requerida a la sèrie de pedaços"
-#: builtin/log.c:1816
+#: builtin/log.c:1853
msgid "add a signature from a file"
msgstr "afegeix una signatura des d'un fitxer"
-#: builtin/log.c:1817
+#: builtin/log.c:1854
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1819
+#: builtin/log.c:1856
msgid "show progress while generating patches"
msgstr "mostra el progrés durant la generació de pedaços"
-#: builtin/log.c:1821
+#: builtin/log.c:1858
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"mostra els canvis contra <rev> a la carta de presentació o a un sol pedaç"
-#: builtin/log.c:1824
-#, fuzzy
+#: builtin/log.c:1861
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-"mostra els canvis contra <refspec> a la lletra de la portada o a un sol pedaç"
+"mostra els canvis contra <refspec> a la carta de presentació o a un sol "
+"pedaç"
-#: builtin/log.c:1826 builtin/range-diff.c:28
+#: builtin/log.c:1863 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "percentatge pel qual la creació és ponderada"
-#: builtin/log.c:1913
+#: builtin/log.c:1953
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
-#: builtin/log.c:1928
-msgid "-n and -k are mutually exclusive"
-msgstr "-n i -k són mútuament excloents"
-
-#: builtin/log.c:1930
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc i -k són mútuament excloents"
-
-#: builtin/log.c:1938
+#: builtin/log.c:1978
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1940
+#: builtin/log.c:1980
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1942
+#: builtin/log.c:1982
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1964
-#, fuzzy
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "-b, -B i --detach són mútuament excloents"
+#: builtin/log.c:1984
+msgid "--remerge-diff does not make sense"
+msgstr "--remerge-diff no té sentit"
-#: builtin/log.c:2087
+#: builtin/log.c:2129
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff requereix --cover-letter o un sol pedaç"
-#: builtin/log.c:2091
+#: builtin/log.c:2133
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:2092
+#: builtin/log.c:2134
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff contra v%d:"
-#: builtin/log.c:2098
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor requereix --range-diff"
-
-#: builtin/log.c:2102
+#: builtin/log.c:2144
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff requereix --cover-letter o un sol pedaç"
-#: builtin/log.c:2110
-#, fuzzy
+#: builtin/log.c:2152
msgid "Range-diff:"
-msgstr "Diferència-interval"
+msgstr "Diferència de l'interval:"
-#: builtin/log.c:2111
-#, fuzzy, c-format
+#: builtin/log.c:2153
+#, c-format
msgid "Range-diff against v%d:"
-msgstr "Diferència de l'interval contra el v%d"
+msgstr "Diferència de l'interval contra el v%d:"
-#: builtin/log.c:2122
+#: builtin/log.c:2164
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
-#: builtin/log.c:2158
+#: builtin/log.c:2200
msgid "Generating patches"
msgstr "S'estan generant els pedaços"
-#: builtin/log.c:2202
-#, fuzzy
+#: builtin/log.c:2244
msgid "failed to create output files"
msgstr "no s'han pogut crear els fitxers de sortida"
-#: builtin/log.c:2261
+#: builtin/log.c:2304
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:2315
+#: builtin/log.c:2358
#, c-format
msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+"Could not find a tracked remote branch, please specify <upstream> "
+"manually.\n"
msgstr ""
"No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> "
"manualment.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opcions>] [<fitxer>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "separa els camins amb el caràcter NUL"
+
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "identifica l'estat de fitxer amb etiquetes"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usa lletres minúscules per als fitxers «assume unchanged»"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "usa lletres minúscules per als fitxers «fsmonitor clean»"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr ""
"mostra en la sortida els fitxers desats en la memòria cau (per defecte)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "mostra en la sortida els fitxers suprimits"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "mostra en la sortida els fitxers modificats"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "mostra en la sortida els altres fitxers"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "mostra en la sortida els fitxers ignorats"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "mostra en la sortida el nom d'objecte dels continguts «stage»"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "mostra només els noms dels directoris «other»"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "mostra els terminadors de línia dels fitxers"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "no mostris els directoris buits"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "mostra en la sortida els fitxers sense fusionar"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "mostra la informació de resolució de desfet"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "omet els fitxers coincidents amb el patró"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "llegeix els patrons des de <file>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "afegeix les exclusions estàndards de git"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "fes que la sortida sigui relativa al directori superior del projecte"
-#: builtin/ls-files.c:666
-msgid "recurse through submodules"
-msgstr "inclou recursivament als submòduls"
-
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si qualsevol <fitxer> no és en l'índex, tracta-ho com a error"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "arbre"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"pretén que els camins eliminats després de <arbre> encara siguin presents"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "mostra les dades de depuració"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "suprimeix les entrades duplicades"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "mostra els directoris dispersos en presència d'un índex dispers"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
-"git ls-remote [--heads] [--tags] [--refs]\n"
-" [--upload-pack=<executable>] [-q | --quiet]\n"
-" [--exit-code] [--get-url] [--symref]\n"
-" [<repositori> [<referències>...]]"
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "no imprimeixis l'URL remot"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
msgid "exec"
msgstr "executable"
@@ -17676,97 +18323,128 @@
msgid "show underlying ref in addition to the object pointed by it"
msgstr "mostra la referència subjacent a més de l'objecte que assenyali"
-#: builtin/ls-tree.c:30
+#: builtin/ls-tree.c:36
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<opcions>] <arbre> [<camí>...]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:54
+#, c-format, fuzzy
+msgid "could not get object info about '%s'"
+msgstr "no s'ha pogut obtenir la informació de l'objecte sobre «%s»"
+
+#: builtin/ls-tree.c:79
+#, c-format, fuzzy
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "format ls-tree dolent: l'element '%s' no comença amb '('"
+
+#: builtin/ls-tree.c:83
+#, c-format, fuzzy
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "format ls-tree dolent: l'element '%s' no acaba en ')'"
+
+#: builtin/ls-tree.c:109
+#, c-format, fuzzy
+msgid "bad ls-tree format: %%%.*s"
+msgstr "format incorrecte de ls-tree:%%.*s"
+
+#: builtin/ls-tree.c:336
msgid "only show trees"
msgstr "mostra només els arbres"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:338
msgid "recurse into subtrees"
msgstr "inclou recursivament als subarbres"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:340
msgid "show trees when recursing"
msgstr "mostra els arbres quan es treballa recursivament"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:343
msgid "terminate entries with NUL byte"
msgstr "acaba les entrades amb un octet NUL"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:344
msgid "include object size"
msgstr "mida de l'objecte d'inclusió"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
msgid "list only filenames"
msgstr "llista només els noms de fitxer"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:350
+#, fuzzy
+msgid "list only objects"
+msgstr "llista només els objectes"
+
+#: builtin/ls-tree.c:353
msgid "use full path names"
msgstr "usa els noms de camí complets"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:355
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"llista l'arbre sencer; no només el directori actual (implica --full-name)"
+#: builtin/ls-tree.c:391
+#, fuzzy
+msgid "--format can't be combined with other format-altering options"
+msgstr "--format no es pot combinar amb altres opcions d'alteració de format"
+
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
-#, fuzzy
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
-msgstr "git diff --no-index [<opcions>] <camí> <camí>"
+msgstr "git mailinfo [<options>] <msg> <patch> < mail >info"
#: builtin/mailinfo.c:58
-#, fuzzy
msgid "keep subject"
-msgstr "retén els objectes inabastables"
+msgstr "mantén l'assumpte"
#: builtin/mailinfo.c:60
msgid "keep non patch brackets in subject"
-msgstr ""
+msgstr "mantén els parèntesis que no són del pedaç en l'assumpte"
#: builtin/mailinfo.c:62
-#, fuzzy
msgid "copy Message-ID to the end of commit message"
-msgstr "edita el missatge de comissió"
+msgstr "copia el Message-ID al final del missatge de comissió"
#: builtin/mailinfo.c:64
msgid "re-code metadata to i18n.commitEncoding"
-msgstr ""
+msgstr "torna a codificar les metadades a i18n.commitEncoding"
#: builtin/mailinfo.c:67
msgid "disable charset re-coding of metadata"
-msgstr ""
+msgstr "inhabilita la recodificació del joc de caràcters de les metadades"
#: builtin/mailinfo.c:69
msgid "encoding"
-msgstr ""
+msgstr "codificació"
#: builtin/mailinfo.c:70
msgid "re-code metadata to this encoding"
-msgstr ""
+msgstr "recodifica les metadades en aquesta codificació"
#: builtin/mailinfo.c:72
msgid "use scissors"
-msgstr ""
+msgstr "usa les tisores"
#: builtin/mailinfo.c:73
-#, fuzzy
msgid "<action>"
-msgstr "acció"
+msgstr "<acció>"
#: builtin/mailinfo.c:74
msgid "action when quoted CR is found"
-msgstr ""
+msgstr "acció quan es troba un CR en una cita"
#: builtin/mailinfo.c:77
msgid "use headers in message's body"
-msgstr ""
+msgstr "utilitza les capçaleres en el cos del missatge"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:227
+#, fuzzy
+msgid "reading patches from stdin/tty..."
+msgstr "llegir pedaços de stdin/tty..."
+
+#: builtin/mailsplit.c:242
#, c-format
msgid "empty mbox: '%s'"
msgstr "mbox buit: «%s»"
@@ -17791,34 +18469,35 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <referència> [<comissió>]"
-#: builtin/merge-base.c:143
+#: builtin/merge-base.c:144
msgid "output all common ancestors"
msgstr "emet tots els avantpassats comuns"
-#: builtin/merge-base.c:145
+#: builtin/merge-base.c:146
msgid "find ancestors for a single n-way merge"
msgstr "troba els avantpassats per a una sola fusió d'n vies"
-#: builtin/merge-base.c:147
+#: builtin/merge-base.c:148
msgid "list revs not reachable from others"
msgstr "llista les revisions no abastables d'altres"
-#: builtin/merge-base.c:149
+#: builtin/merge-base.c:150
msgid "is the first one ancestor of the other?"
msgstr "és la primera un avantpassat de l'altre?"
-#: builtin/merge-base.c:151
+#: builtin/merge-base.c:152
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
-"troba on <comissió> s'ha bifurcat del registre de referències de <referència>"
+"troba on <comissió> s'ha bifurcat del registre de referències de "
+"<referència>"
#: builtin/merge-file.c:9
msgid ""
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
msgstr ""
-"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> "
-"<fitxer-original> <fitxer2>"
+"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1>"
+" <fitxer-original> <fitxer2>"
#: builtin/merge-file.c:35
msgid "send results to standard output"
@@ -17829,26 +18508,30 @@
msgstr "usa una fusió basada en diff3"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "usa una fusió basada en zealous diff3"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "en conflictes, usa la nostra versió"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "en conflictes, usa la seva versió"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "en conflictes, usa una versió d'unió"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "en conflictes, usa aquesta mida de marcador"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "no avisis de conflictes"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2"
@@ -17883,209 +18566,202 @@
msgid "Merging %s with %s\n"
msgstr "S'està fusionant %s amb %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opcions>] [<comissió>...]"
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "l'opció «m» requereix un valor"
-#: builtin/merge.c:146
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "l'opció «%s» requereix un valor"
-#: builtin/merge.c:199
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "No s'ha pogut trobar l'estratègia de fusió «%s».\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Les estratègies disponibles són:"
-#: builtin/merge.c:205
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Les estratègies personalitzades disponibles són:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "no mostris les estadístiques de diferència al final de la fusió"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "mostra les estadístiques de diferència al final de la fusió"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(sinònim de --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió "
-"de fusió"
+"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió"
+" de fusió"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "crea una única comissió en lloc de fusionar"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "realitza una comissió si la fusió té èxit (per defecte)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "edita el missatge abans de cometre"
-#: builtin/merge.c:271
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "permet l'avanç ràpid (per defecte)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "avorta si l'avanç ràpid no és possible"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1145 builtin/revert.c:114
msgid "strategy"
msgstr "estratègia"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "estratègia de fusió a usar"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "opció=valor"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "opció per a l'estratègia de fusió seleccionada"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "usa <nom> en lloc de destí real"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "avorta la fusió en curs actual"
-#: builtin/merge.c:292
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort però deixa l'índex i l'arbre de treball intactes"
-#: builtin/merge.c:294
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "continua la fusió en curs actual"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "permet fusionar històries no relacionades"
-#: builtin/merge.c:303
-#, fuzzy
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "evita els ganxos pre-combinació i missatge de comissió"
+msgstr "evita els lligams pre-merge-commit i commit-msg"
-#: builtin/merge.c:320
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "no s'ha pogut executar «stash»."
-#: builtin/merge.c:325
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "l'«stash» ha fallat"
-#: builtin/merge.c:330
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "no és un objecte vàlid: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "read-tree ha fallat"
-#: builtin/merge.c:400
-#, fuzzy
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
-msgstr " (res a fer «squash»)"
+msgstr "Ja està actualitzat. (res a fer «squash»)"
-#: builtin/merge.c:414
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "«%s» no assenyala una comissió"
-#: builtin/merge.c:602
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
-#: builtin/merge.c:728
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "No s'està gestionant res a part de la fusió de dos caps."
-#: builtin/merge.c:741
+#: builtin/merge.c:745
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opció desconeguda de merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "opció d'estratègia desconeguda: -X%s"
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "no s'ha pogut escriure %s"
-#: builtin/merge.c:812
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "No s'ha pogut llegir de «%s»"
-#: builtin/merge.c:821
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"No s'està cometent la fusió; useu «git commit» per a completar la fusió.\n"
-#: builtin/merge.c:827
-#, fuzzy
+#: builtin/merge.c:831
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
msgstr ""
-"Introduïu un missatge de comissió per explicar per què aquesta fusió és "
-"necessària especialment si fusiona una font actualitzada en una branca de "
-"tema."
+"Introduïu un missatge de comissió per a explicar per què aquesta fusió és\n"
+"necessària, especialment si es fusiona una branca amb funcionalitat nova.\n"
+"\n"
-#: builtin/merge.c:832
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Un missatge buit interromp la comissió.\n"
-#: builtin/merge.c:835
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18094,74 +18770,74 @@
"Les línies que comencen amb «%c» seran ignorades i un missatge buit "
"interromp la comissió.\n"
-#: builtin/merge.c:888
+#: builtin/merge.c:900
msgid "Empty commit message."
msgstr "El missatge de comissió és buit."
-#: builtin/merge.c:903
+#: builtin/merge.c:915
#, c-format
msgid "Wonderful.\n"
msgstr "Meravellós.\n"
-#: builtin/merge.c:964
+#: builtin/merge.c:976
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el "
"resultat.\n"
-#: builtin/merge.c:1003
+#: builtin/merge.c:1015
msgid "No current branch."
msgstr "No hi ha cap branca actual."
-#: builtin/merge.c:1005
+#: builtin/merge.c:1017
msgid "No remote for the current branch."
msgstr "No hi ha cap remot per a la branca actual."
-#: builtin/merge.c:1007
+#: builtin/merge.c:1019
msgid "No default upstream defined for the current branch."
msgstr "No hi ha cap font per defecte definida per a la branca actual."
-#: builtin/merge.c:1012
+#: builtin/merge.c:1024
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "No hi ha cap branca amb seguiment remot per a %s de %s"
-#: builtin/merge.c:1069
+#: builtin/merge.c:1081
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor incorrecte «%s» en l'entorn «%s»"
-#: builtin/merge.c:1172
+#: builtin/merge.c:1183
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "no és quelcom que puguem fusionar en %s: %s"
-#: builtin/merge.c:1206
+#: builtin/merge.c:1217
msgid "not something we can merge"
msgstr "no és quelcom que puguem fusionar"
-#: builtin/merge.c:1316
+#: builtin/merge.c:1330
msgid "--abort expects no arguments"
msgstr "--abort no espera cap argument"
-#: builtin/merge.c:1320
+#: builtin/merge.c:1334
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1352
msgid "--quit expects no arguments"
msgstr "--quit no espera cap argument"
-#: builtin/merge.c:1351
+#: builtin/merge.c:1365
msgid "--continue expects no arguments"
msgstr "--continue no espera cap argument"
-#: builtin/merge.c:1355
+#: builtin/merge.c:1369
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)."
-#: builtin/merge.c:1371
+#: builtin/merge.c:1385
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18169,7 +18845,7 @@
"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
"Cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1378
+#: builtin/merge.c:1392
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18177,142 +18853,121 @@
"No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
"Cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1381
+#: builtin/merge.c:1395
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)."
-#: builtin/merge.c:1395
-msgid "You cannot combine --squash with --no-ff."
-msgstr "No podeu combinar --squash amb --no-ff."
-
-#: builtin/merge.c:1397
-msgid "You cannot combine --squash with --commit."
-msgstr "No podeu combinar --squash amb --commit."
-
-#: builtin/merge.c:1413
+#: builtin/merge.c:1427
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"No hi ha una comissió especificada i merge.defaultToUpstream no està "
"establert."
-#: builtin/merge.c:1430
+#: builtin/merge.c:1444
msgid "Squash commit into empty head not supported yet"
msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
-#: builtin/merge.c:1432
+#: builtin/merge.c:1446
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1451
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - no és una cosa que puguem fusionar"
-#: builtin/merge.c:1439
+#: builtin/merge.c:1453
msgid "Can merge only exactly one commit into empty head"
msgstr "Es pot fusionar només una comissió a un HEAD buit"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1540
msgid "refusing to merge unrelated histories"
msgstr "s'està refusant fusionar històries no relacionades"
-#: builtin/merge.c:1539
+#: builtin/merge.c:1559
#, c-format
msgid "Updating %s..%s\n"
msgstr "S'estan actualitzant %s..%s\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1606
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "S'està intentant una fusió molt trivial en l'índex...\n"
-#: builtin/merge.c:1592
+#: builtin/merge.c:1613
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "No és possible avançar ràpidament, s'està avortant."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: builtin/merge.c:1671 builtin/merge.c:1737
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "S'està rebobinant l'arbre a la pristina...\n"
-#: builtin/merge.c:1655
+#: builtin/merge.c:1675
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "S'està intentant l'estratègia de fusió %s...\n"
-#: builtin/merge.c:1707
+#: builtin/merge.c:1727
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1729
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
-#: builtin/merge.c:1718
+#: builtin/merge.c:1739
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "S'està usant el %s per a preparar la resolució a mà.\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "S'està usant l'estratègia %s per a preparar la resolució a mà.\n"
-#: builtin/merge.c:1732
+#: builtin/merge.c:1753
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"La fusió automàtica ha sortit bé; s'ha aturat abans de cometre com s'havia "
"demanat\n"
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr ""
-
#: builtin/mktag.c:27
-#, fuzzy, c-format
+#, c-format
msgid "warning: tag input does not pass fsck: %s"
-msgstr "avís: «:include:» no s'admet: %s\n"
+msgstr "avís: l'entrada d'etiqueta no passa fsck: %s"
#: builtin/mktag.c:38
#, c-format
msgid "error: tag input does not pass fsck: %s"
-msgstr ""
+msgstr "error: l'entrada d'etiqueta no passa fsck: %s"
#: builtin/mktag.c:41
#, c-format
msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr ""
+msgstr "%d (FSCK_IGNORE?) no hauria d'activar mai aquesta crida de retorn"
#: builtin/mktag.c:56
-#, fuzzy, c-format
+#, c-format
msgid "could not read tagged object '%s'"
-msgstr "no s'ha pogut llegir l'objecte %s"
+msgstr "no s'ha pogut llegir l'objecte etiquetat «%s»"
#: builtin/mktag.c:59
-#, fuzzy, c-format
+#, c-format
msgid "object '%s' tagged as '%s', but is a '%s' type"
-msgstr "l'objecte %s és %s, no pas %s"
+msgstr "l'objecte «%s» s'ha etiquetat com a «%s», però és del tipus «%s»"
#: builtin/mktag.c:97
msgid "tag on stdin did not pass our strict fsck check"
-msgstr ""
+msgstr "l'etiqueta a stdin no ha passat la comprovació estricta del fsck"
#: builtin/mktag.c:100
-#, fuzzy
msgid "tag on stdin did not refer to a valid object"
-msgstr "%s no apunta a un objecte vàlid"
+msgstr "l'etiqueta a stdin no apunta a un objecte vàlid"
#: builtin/mktag.c:103 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
-
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "l'entrada és acabada amb NUL"
@@ -18326,56 +18981,60 @@
msgstr "permet la creació de més d'un arbre"
#: builtin/multi-pack-index.c:10
-#, fuzzy
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
msgstr ""
-"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-"size=<size>)"
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
-#: builtin/multi-pack-index.c:13
-#, fuzzy
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
-msgstr "git upload-pack [<opcions>] <directori>"
+msgstr "git multi-pack-index [<opcions>] verify"
-#: builtin/multi-pack-index.c:16
-#, fuzzy
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
-msgstr "git upload-pack [<opcions>] <directori>"
+msgstr "git multi-pack-index [<opcions>] expire"
-#: builtin/multi-pack-index.c:19
-#, fuzzy
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
-msgstr ""
-"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-"size=<size>)"
+msgstr "git multi-pack-index [<opcions>] repack [--batch-size=<mida>]"
-#: builtin/multi-pack-index.c:54
-#, fuzzy
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-"directori de l'objecte que conté el conjunt de parells packfile i pack-index"
+"directori de l'objecte que conté el conjunt de parells de fitxers i índexs "
+"de paquets"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
-msgstr ""
+msgstr "paquet preferit"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr ""
+"empaqueta per a reutilitzar quan es calcula un mapa de bits multipaquet"
-#: builtin/multi-pack-index.c:128
-#, fuzzy
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "escriu un map de bits multipaquet"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "escriu un índex multipaquet que contingui només els índexs donats"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr ""
+"instantània de referències per a seleccionar les comissions de mapa de bits"
+
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr ""
-"durant el reempaquetament dels fitxers de recollida de paquets de mida més "
-"petita en un lot que és més gran que aquesta mida"
-
-#: builtin/multi-pack-index.c:180
-#, fuzzy, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "subcomandes no reconeguts"
+"durant el reempaquetament, recull els fitxers de paquets de mida més petita "
+"en un lot que és més gran que aquesta mida"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
@@ -18405,118 +19064,123 @@
msgid "skip move/rename errors"
msgstr "omet els errors de moviment / canvi de nom"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "el destí «%s» no és un directori"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "origen incorrecte"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "no es pot moure un directori a dins d'ell mateix"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "no es pot moure un directori sobre un fitxer"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "el directori d'origen està buit"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "no està sota control de versions"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "en conflicte"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "el destí existeix"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "s'està sobreescrivint «%s»"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "No es pot sobreescriure"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "múltiples orígens per al mateix destí"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "el directori destí no existeix"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, origen=%s, destí=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "S'està canviant el nom de %s a %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
#, c-format
msgid "renaming '%s' failed"
msgstr "el canvi del nom de «%s» ha fallat"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:524
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opcions>] <comissió>..."
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:525
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opcions>] --all"
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<opcions>] --stdin"
+#: builtin/name-rev.c:526
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [<options>] --annotate-stdin"
-#: builtin/name-rev.c:524
-#, fuzzy
+#: builtin/name-rev.c:583
msgid "print only ref-based names (no object names)"
-msgstr "imprimeix només les branques de l'objecte"
+msgstr ""
+"imprimeix només els noms basats en referències (no els noms d'objecte)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:584
msgid "only use tags to name the commits"
msgstr "només usa les etiquetes per a anomenar les comissions"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:586
msgid "only use refs matching <pattern>"
msgstr "només usa les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:588
msgid "ignore refs matching <pattern>"
msgstr "ignora les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:590
msgid "list all commits reachable from all refs"
msgstr "llista totes les comissions abastables de totes les referències"
-#: builtin/name-rev.c:532
-msgid "read from stdin"
-msgstr "llegeix de stdin"
+#: builtin/name-rev.c:591
+msgid "deprecated: use annotate-stdin instead"
+msgstr "obsolet: useu annotate-stdin"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:592
+#, fuzzy
+msgid "annotate text from stdin"
+msgstr "anota el text de stdin"
+
+#: builtin/name-rev.c:593
msgid "allow to print `undefined` names (default)"
msgstr "permet imprimir els noms «undefined» (per defecte)"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:599
msgid "dereference tags in the input (internal use)"
msgstr "desreferencia les etiquetes en l'entrada (ús intern)"
@@ -18526,8 +19190,8 @@
#: builtin/notes.c:29
msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file>"
+" | (-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m "
"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
@@ -18539,8 +19203,8 @@
#: builtin/notes.c:31
msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> |"
+" (-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <referència-de-notes>] append [--allow-empty] [-m "
"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
@@ -18561,14 +19225,6 @@
"git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] "
"<referència-de-notes>"
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
-
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <referència-de-notes>] remove [<objecte>...]"
@@ -18629,119 +19285,107 @@
msgid "git notes prune [<options>]"
msgstr "git notes prune [<opcions>]"
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "Escriviu/editeu les notes per l'objecte següent:"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "no s'ha pogut iniciar «show» per a l'objecte «%s»"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "no s'ha pogut llegir la sortida de «show»"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
-msgstr "S'ha produït un error en finalitzar «show» per a l'objecte «%s»"
+msgstr "s'ha produït un error en finalitzar «show» per a l'objecte «%s»"
-#: builtin/notes.c:197
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr ""
"especifiqueu el contingut de la nota fent servir l'opció -m o l'opció -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "no s'ha pogut escriure l'objecte de nota"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "s'han deixat els continguts de la nota en %s"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:582
#, c-format
msgid "could not open or read '%s'"
msgstr "no s'ha pogut obrir o llegir «%s»"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "s'ha produït un error en llegir l'objecte «%s»."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "no es poden llegir les dades de node de l'objecte no de blob «%s»."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "línia d'entrada mal formada: «%s»."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»"
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
-#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
-msgid "too many arguments"
-msgstr "hi ha massa arguments"
-
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "no s'ha trobat cap nota per a l'objecte %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "anota els continguts com a cadena"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "anota els continguts en un fitxer"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "reusa i edita l'objecte de nota especificat"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "reusa l'objecte de nota especificat"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "permet l'emmagatzematge d'una nota buida"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "reemplaça les notes existents"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18750,45 +19394,44 @@
"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. "
"Useu «-f» per a sobreescriure les notes existents"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "S'està eliminant la nota de l'objecte %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "llegeix els objectes des de stdin"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
-#: builtin/notes.c:517
-#, fuzzy
+#: builtin/notes.c:515
msgid "too few arguments"
-msgstr "hi ha massa arguments"
+msgstr "massa pocs arguments"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
+" existing notes"
msgstr ""
"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. "
"Useu «-f» per a sobreescriure les notes existents"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "manquen notes a l'objecte font %s. No es pot copiar."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18797,598 +19440,583 @@
"Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre «edit».\n"
"Useu «git notes add -f -m/-F/-c/-C» en lloc d'això.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
"s'ha produït un error en eliminar l'arbre de treball de «git notes merge»"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "s'ha produït un error en llegir la referència NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "s'ha produït un error en finalitzar la fusió de notes"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estratègia de fusió de notes desconeguda %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Opcions generals"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Opcions de fusió"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+"resolve notes conflicts using the given strategy "
+"(manual/ours/theirs/union/cat_sort_uniq)"
msgstr ""
-"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
-"union/cat_sort_uniq)"
+"resol els conflictes de nota usant l'estratègia donada "
+"(manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "S'estan cometent les notes sense fusionar"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "S'està avortant la resolució de fusió de notes"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "avorta la fusió de notes"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no es pot combinar --commit, --abort i -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "cal especificar una referència de notes a fusionar"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy desconeguda: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "una fusió de notes a %s ja està en curs a %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"s'ha produït un error en emmagatzemar l'enllaç a la referència de notes "
"actual (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:880
#, c-format
msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
-"'git notes merge --commit', or abort the merge with 'git notes merge --"
-"abort'.\n"
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with"
+" 'git notes merge --commit', or abort the merge with 'git notes merge "
+"--abort'.\n"
msgstr ""
"La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i "
"cometeu el resultat amb «git notes merge --commit», o avorteu la fusió amb "
"«git notes merge --abort».\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:595
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "S'ha produït un error en resoldre «%s» com a referència vàlida."
-#: builtin/notes.c:900
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objecte %s no té cap nota\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "l'intent d'eliminar una nota no existent no és un error"
-#: builtin/notes.c:915
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
-#: builtin/notes.c:955
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "informa de notes podades"
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "referència de notes"
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1036 builtin/stash.c:1802
#, c-format
msgid "unknown subcommand: %s"
msgstr "subordre desconeguda: %s"
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < "
"<llista-de-objectes>]"
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < "
"<llista-de-objectes>]"
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:570
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
"pack %s"
msgstr ""
+"write_reuse_object: no s'ha pogut localitzar %s, s'esperava a la posició "
+"%<PRIuMAX> al paquet %s"
-#: builtin/pack-objects.c:448
-#, fuzzy, c-format
+#: builtin/pack-objects.c:578
+#, c-format
msgid "bad packed object CRC for %s"
-msgstr "objecte CRC mal empaquetat per a percentatges"
+msgstr "CRC de l'objecte empaquetat malmès per a %s"
-#: builtin/pack-objects.c:459
-#, fuzzy, c-format
+#: builtin/pack-objects.c:589
+#, c-format
msgid "corrupt packed object for %s"
-msgstr "objecte empaquetat corrupte durant els percentatges"
+msgstr "objecte empaquetat corrupte per a %s"
-#: builtin/pack-objects.c:590
-#, fuzzy, c-format
+#: builtin/pack-objects.c:720
+#, c-format
msgid "recursive delta detected for object %s"
-msgstr "delta recursiu detectat per a objectes percentuals"
+msgstr "diferència recursiva detectada per a l'objecte %s"
-#: builtin/pack-objects.c:801
-#, fuzzy, c-format
+#: builtin/pack-objects.c:939
+#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
-msgstr "s'esperava un objecte d'un 1% <PRIu32>"
+msgstr "ordenats %u objectes, s'esperaven %<PRIu32>"
-#: builtin/pack-objects.c:896
-#, fuzzy, c-format
+#: builtin/pack-objects.c:1034
+#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
-msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s"
+msgstr "objecte esperat a la posició %<PRIuMAX> al paquet %s"
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1158
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
-"a causa de pack.packSizeLimit"
+"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets"
+" a causa de pack.packSizeLimit"
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1171
msgid "Writing objects"
msgstr "S'estan escrivint els objectes"
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1243 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "s'ha produït un error en fer stat a %s"
-#: builtin/pack-objects.c:1141
-#, fuzzy, c-format
-msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
-msgstr "va escriure%<PRIu32> objectes mentre s'esperava un percentatge<PRIu32>"
+#: builtin/pack-objects.c:1276
+msgid "failed to write bitmap index"
+msgstr "s'ha produït un error en escriure l'índex de mapa de bits"
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1302
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "escrits %<PRIu32> objectes mentre s'esperaven %<PRIu32>"
+
+#: builtin/pack-objects.c:1544
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "
-"s'empaqueten"
+"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no"
+" s'empaqueten"
-#: builtin/pack-objects.c:1831
-#, fuzzy, c-format
+#: builtin/pack-objects.c:1992
+#, c-format
msgid "delta base offset overflow in pack for %s"
-msgstr "desplaçament de base delta desbordament en paquet de percentatges"
+msgstr "desbordament del desplaçament base de diferències en paquet per a %s"
-#: builtin/pack-objects.c:1840
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2001
+#, c-format
msgid "delta base offset out of bound for %s"
-msgstr "decalatge de base de delta fora d'enllaç per un percentatge"
+msgstr "desplaçament base de diferències fora dels límits per a %s"
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2282
msgid "Counting objects"
msgstr "S'estan comptant els objectes"
-#: builtin/pack-objects.c:2266
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2447
+#, c-format
msgid "unable to parse object header of %s"
-msgstr "no s'ha pogut analitzar la capçalera de l'objecte dels percentatges"
+msgstr "no s'ha pogut analitzar la capçalera de l'objecte de %s"
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
+#: builtin/pack-objects.c:2543
+#, c-format
msgid "object %s cannot be read"
-msgstr "no es poden llegir els objectes percentuals"
+msgstr "no es pot llegir l'objecte %s"
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
+#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
-msgstr "objecte%s longitud d'objecte inconsistent (%<PRIuMAX> vs%<PRIuMAX>)"
+msgstr ""
+"l'objecte %s té una longitud d'objecte inconsistent (%<PRIuMAX> vs "
+"%<PRIuMAX>)"
-#: builtin/pack-objects.c:2376
-#, fuzzy
+#: builtin/pack-objects.c:2557
msgid "suboptimal pack - out of memory"
msgstr "paquet subòptim - sense memòria"
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2872
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compressió de diferències usant fins a %d fils"
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3011
#, c-format
msgid "unable to pack objects reachable from tag %s"
-msgstr "no s'han pogut empaquetar els objectes abastables des de l'etiqueta %s"
+msgstr ""
+"no s'han pogut empaquetar els objectes abastables des de l'etiqueta %s"
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3097
msgid "Compressing objects"
msgstr "S'estan comprimint els objectes"
-#: builtin/pack-objects.c:2922
-#, fuzzy
+#: builtin/pack-objects.c:3103
msgid "inconsistency with delta count"
msgstr "inconsistència amb el comptador de diferències"
-#: builtin/pack-objects.c:3001
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3182
+#, c-format
msgid ""
-"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
-"hash> <uri>' (got '%s')"
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> "
+"<pack-hash> <uri>' (got '%s')"
msgstr ""
-"el valor de uppack.blobpackfileuri ha de ser de la forma '<object-hash> "
-"<pack-hash> <uri>' (gotat '%s')"
+"el valor de uploadpack.blobpackfileuri ha de tenir la forma «<object-hash> "
+"<pack-hash> <uri>» (s'ha rebut «%s»)"
-#: builtin/pack-objects.c:3004
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3185
+#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
-"l'objecte ja està configurat en un altre uploadpack.blobpackfileuri (gotat "
-"'%')"
+"l'objecte ja està configurat en un altre uploadpack.blobpackfileuri (s'ha "
+"rebut «%s»)"
-#: builtin/pack-objects.c:3039
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3220
+#, c-format
msgid "could not get type of object %s in pack %s"
-msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
+msgstr "no s'ha pogut obtenir el tipus de l'objecte %s al paquet %s"
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
+#: builtin/pack-objects.c:3373
+#, c-format
msgid "could not find pack '%s'"
-msgstr "no s'ha pogut finalitzar «%s»"
+msgstr "no s'ha pogut trobar el paquet «%s»"
-#: builtin/pack-objects.c:3218
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3416
+#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-"s'esperava un identificador d'objecte de vora amb brossa s'han obtingut "
-"percentatges d'escombraries"
+"s'esperava un identificador vora de l'objecte, s'ha rebut brossa:\n"
+" %s"
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3422
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-"s'esperava un ID d'objecte, s'ha rebut brossa:\n"
+"s'esperava un identificador d'objecte, s'ha rebut brossa:\n"
" %s"
-#: builtin/pack-objects.c:3322
-msgid "invalid value for --missing"
-msgstr "valor no vàlid per a --missing"
-
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
-#, fuzzy
+#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
msgid "cannot open pack index"
msgstr "no s'ha pogut obrir l'índex del paquet"
-#: builtin/pack-objects.c:3412
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3549
+#, c-format
msgid "loose object at %s could not be examined"
-msgstr "no s'han pogut examinar els objectes solts"
+msgstr "no s'ha pogut examinar l'objecte solt a %s"
-#: builtin/pack-objects.c:3498
-#, fuzzy
+#: builtin/pack-objects.c:3635
msgid "unable to force loose object"
msgstr "no s'ha pogut forçar l'objecte solt"
-#: builtin/pack-objects.c:3628
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3763
+#, c-format
msgid "not a rev '%s'"
-msgstr "no és una revisió \"%s\""
+msgstr "«%s» no és una revisió"
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
-msgstr "revisió incorrecte «%s»"
+msgstr "revisió incorrecta «%s»"
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3794
msgid "unable to add recent objects"
msgstr "no s'han pogut afegir els objectes recents"
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3847
#, c-format
msgid "unsupported index version %s"
msgstr "versió d'índex no compatible %s"
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3851
#, c-format
msgid "bad index version '%s'"
msgstr "versió d'índex incorrecta «%s»"
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3907
msgid "<version>[,<offset>]"
msgstr "<versió>[,<desplaçament>]"
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3908
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escriu el fitxer d'índex de paquet en la versió de format d'índex "
"especificada"
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3911
msgid "maximum size of each output pack file"
msgstr "mida màxima de cada fitxer empaquetat de sortida"
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3913
msgid "ignore borrowed objects from alternate object store"
-msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
+msgstr ""
+"ignora els objectes manllevats d'un emmagatzematge d'objectes alternatiu"
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3915
msgid "ignore packed objects"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3917
msgid "limit pack window by objects"
msgstr "limita la finestra d'empaquetament per objectes"
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3919
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limita la finestra d'empaquetament per memòria a més del límit d'objectes"
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3921
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"longitud màxima de la cadena de diferències permesa en el paquet resultant"
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3923
msgid "reuse existing deltas"
msgstr "reusa les diferències existents"
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3925
msgid "reuse existing objects"
msgstr "reusa els objectes existents"
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3927
msgid "use OFS_DELTA objects"
msgstr "usa objectes OFS_DELTA"
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3929
msgid "use threads when searching for best delta matches"
msgstr "usa fils en cercar les millores coincidències de diferències"
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3931
msgid "do not create an empty pack output"
msgstr "no creïs una emissió de paquet buida"
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3933
msgid "read revision arguments from standard input"
msgstr "llegeix els arguments de revisió des de l'entrada estàndard"
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3935
msgid "limit the objects to those that are not yet packed"
msgstr "limita els objectes als quals encara no s'hagin empaquetat"
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3938
msgid "include objects reachable from any reference"
msgstr "inclou els objectes abastables de qualsevol referència"
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3941
msgid "include objects referred by reflog entries"
msgstr ""
"inclou els objectes als quals facin referència les entrades del registre de "
"referències"
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3944
msgid "include objects referred to by the index"
msgstr "inclou els objectes als quals faci referència l'índex"
-#: builtin/pack-objects.c:3795
-#, fuzzy
+#: builtin/pack-objects.c:3947
msgid "read packs from stdin"
-msgstr "llegeix les actualitzacions des de stdin"
+msgstr "llegeix els paquets des de stdin"
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3949
msgid "output pack to stdout"
msgstr "emet el paquet a stdout"
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3951
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-"inclou els objectes d'etiqueta que facin referència als objectes a empaquetar"
+"inclou els objectes d'etiqueta que facin referència als objectes a "
+"empaquetar"
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3953
msgid "keep unreachable objects"
msgstr "retén els objectes inabastables"
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3955
msgid "pack loose unreachable objects"
msgstr "empaqueta els objectes inabastables solts"
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3957
msgid "unpack unreachable objects newer than <time>"
-msgstr "desempaqueta els objectes inabastables més nous que <hora>"
+msgstr "desempaqueta els objectes inabastables més nous que <data>"
-#: builtin/pack-objects.c:3808
-#, fuzzy
+#: builtin/pack-objects.c:3960
msgid "use the sparse reachability algorithm"
msgstr "utilitza l'algorisme d'accessibilitat dispers"
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3962
msgid "create thin packs"
msgstr "crea paquets prims"
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3964
msgid "create packs suitable for shallow fetches"
msgstr "crea paquets adequats per a les obtencions superficials"
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3966
msgid "ignore packs that have companion .keep file"
msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
-#: builtin/pack-objects.c:3816
-#, fuzzy
+#: builtin/pack-objects.c:3968
msgid "ignore this pack"
msgstr "ignora aquest paquet"
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3970
msgid "pack compression level"
msgstr "nivell de compressió de paquet"
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3972
msgid "do not hide commits by grafts"
msgstr "no amaguis les comissions per empelt"
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3974
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usa un índex de mapa de bits, si està disponible, per a accelerar el "
"recompte d'objectes"
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3976
msgid "write a bitmap index together with the pack index"
msgstr "escriu un índex de mapa de bits juntament amb l'índex de paquet"
-#: builtin/pack-objects.c:3828
-#, fuzzy
+#: builtin/pack-objects.c:3980
msgid "write a bitmap index if possible"
msgstr "escriu un índex de mapa de bits si és possible"
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3984
msgid "handling for missing objects"
msgstr "gestió dels objectes absents"
-#: builtin/pack-objects.c:3835
-#, fuzzy
+#: builtin/pack-objects.c:3987
msgid "do not pack objects in promisor packfiles"
-msgstr "no empaqueta els objectes als fitxers del paquet promisor"
+msgstr "empaquetis els objectes als fitxers de paquet «promisor»"
-#: builtin/pack-objects.c:3837
-#, fuzzy
+#: builtin/pack-objects.c:3989
msgid "respect islands during delta compression"
msgstr "respecta les illes durant la compressió delta"
-#: builtin/pack-objects.c:3839
-#, fuzzy
+#: builtin/pack-objects.c:3991
msgid "protocol"
msgstr "protocol"
-#: builtin/pack-objects.c:3840
-#, fuzzy
+#: builtin/pack-objects.c:3992
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
-msgstr "exclou qualsevol uppack.blobpackfileuri configurat amb aquest protocol"
-
-#: builtin/pack-objects.c:3873
-#, fuzzy, c-format
-msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-"la profunditat de la cadena delta és massa profunda forçant un percentatge"
+"exclou qualsevol uploadpack.blobpackfileuri configurat amb aquest protocol"
-#: builtin/pack-objects.c:3878
-#, fuzzy, c-format
+#: builtin/pack-objects.c:4027
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr "la profunditat de la cadena delta %d és massa profunda, forçant %d"
+
+#: builtin/pack-objects.c:4032
+#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
-msgstr "pack.deltaCacheLimit és massa alt forçant un percentatge"
+msgstr "pack.deltaCacheLimit és massa alt, forçant %d"
-#: builtin/pack-objects.c:3934
-#, fuzzy
+#: builtin/pack-objects.c:4088
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-"--max-pack-size no es pot utilitzar per construir un paquet per a la "
+"--max-pack-size no es pot utilitzar per a construir un paquet per a la "
"transferència"
-#: builtin/pack-objects.c:3936
-#, fuzzy
+#: builtin/pack-objects.c:4090
msgid "minimum pack size limit is 1 MiB"
msgstr "el límit mínim de mida del paquet és 1 MiB"
-#: builtin/pack-objects.c:3941
-#, fuzzy
+#: builtin/pack-objects.c:4095
msgid "--thin cannot be used to build an indexable pack"
-msgstr "--thin no es pot utilitzar per construir un paquet indexable"
+msgstr "--thin no es pot utilitzar per a construir un paquet indexable"
-#: builtin/pack-objects.c:3944
-#, fuzzy
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable i --unpack-unreachable són incompatibles"
-
-#: builtin/pack-objects.c:3950
-#, fuzzy
+#: builtin/pack-objects.c:4104
msgid "cannot use --filter without --stdout"
msgstr "no es pot utilitzar --filter sense --stdout"
-#: builtin/pack-objects.c:3952
-#, fuzzy
+#: builtin/pack-objects.c:4106
msgid "cannot use --filter with --stdin-packs"
-msgstr "no es pot utilitzar --filter sense --stdout"
+msgstr "no es pot utilitzar --filter sense --stdin-packs"
-#: builtin/pack-objects.c:3956
-#, fuzzy
+#: builtin/pack-objects.c:4110
msgid "cannot use internal rev list with --stdin-packs"
-msgstr "no es poden especificar noms de camí amb --stdin"
+msgstr "no es pot utilitzar la llista de revisió interna amb --stdin-packs"
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4169
msgid "Enumerating objects"
msgstr "S'estan enumerant els objectes"
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4210
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
"reused %<PRIu32>"
msgstr ""
-"Total %<PRIu32> (%<PRIu32> diferències), reusats %<PRIu32> (%<PRIu32> diferències), paquets "
-"reusats %<PRIu32>"
+"Total %<PRIu32> (%<PRIu32> diferències), reusats %<PRIu32> (%<PRIu32> "
+"diferències), paquets reusats %<PRIu32>"
#: builtin/pack-redundant.c:601
msgid ""
@@ -19398,6 +20026,11 @@
"and let us know you still use it by sending an e-mail\n"
"to <git@vger.kernel.org>. Thanks.\n"
msgstr ""
+"«git pack-redundant» està nominat per a la seva supressió.\n"
+"Si encara feu servir aquesta ordre, afegiu-hi l'opció\n"
+"addicional, «--i-still-use-this», a la línia d'ordres\n"
+"i feu-nos saber que encara l'useu enviant un correu electrònic\n"
+"a <git@vger.kernel.org>. Gràcies.\n"
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
@@ -19411,79 +20044,69 @@
msgid "prune loose refs (default)"
msgstr "poda les referències soltes (per defecte)"
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--progress] [--expire <hora>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <data>] [--] [<head>...]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "informa d'objectes podats"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
-msgstr "fes caducar els objectes més vells que <hora>"
+msgstr "fes caducar els objectes més antics que <data>"
-#: builtin/prune.c:138
-#, fuzzy
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
-msgstr "limita el trànsit d'objectes fora dels fitxers del paquet promisor"
+msgstr ""
+"limita el recorregut als objectes fora dels fitxers de paquet «promisor»"
-#: builtin/prune.c:152
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "no es pot podar en un repositori d'objectes preciosos"
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Valor no vàlid per a %s: %s"
-
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [<opcions>] [<repositori> [<especificació-de-referència>...]]"
+msgstr ""
+"git pull [<opcions>] [<repositori> [<especificació-de-referència>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Opcions relacionades amb fusionar"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorpora els canvis fent «rebase» en lloc de fusionar"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permet l'avanç ràpid"
-#: builtin/pull.c:167 parse-options.h:340
-#, fuzzy
-msgid "automatically stash/stash pop before and after"
-msgstr "«stash»/«stash» automàticament abans i després"
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "controla l'ús dels lligams pre-merge-commit i commit-msg"
-#: builtin/pull.c:183
+#: builtin/pull.c:171 parse-options.h:371
+msgid "automatically stash/stash pop before and after"
+msgstr "fes «stash» i «stash pop» automàticament abans i després"
+
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Opcions relacionades amb obtenir"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "força la sobreescriptura de la branca local"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "nombre de submòduls baixats en paral·lel"
-#: builtin/pull.c:317
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "Valor no vàlid per a pull.ff: %s"
-
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -19491,13 +20114,14 @@
"No hi ha cap candidat sobre el qual fer «rebase» entre les referències que "
"acabeu d'obtenir."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
+"No hi ha candidats per a fusionar entre les referències que acabeu "
+"d'obtenir."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19505,7 +20129,7 @@
"Generalment això vol dir que heu proveït una especificació de\n"
"referència de comodí que no tenia cap coincidència en el costat remot."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19516,43 +20140,44 @@
"Perquè aquest no és el remot configurat per defecte per a la vostra\n"
"branca actual, heu d'especificar una branca en la línia d'ordres."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:978
msgid "You are not currently on a branch."
msgstr "Actualment no sou en cap branca."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Especifiqueu sobre quina branca voleu fer «rebase»."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Especifiqueu amb quina branca voleu fusionar."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Vegeu git-pull(1) per a més informació."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:984
msgid "<remote>"
msgstr "<remot>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:374
msgid "<branch>"
msgstr "<branca>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:976
msgid "There is no tracking information for the current branch."
msgstr "No hi ha cap informació de seguiment per a la branca actual."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
-"amb:"
+"Si voleu establir la informació de seguiment per a aquesta branca, podeu "
+"fer-ho amb:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19561,58 +20186,57 @@
"La vostra configuració especifica fusionar amb la referència «%s»\n"
"del remot, però no s'ha obtingut tal referència."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "no s'ha pogut accedir a la comissió %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "s'està ignorant --verify-signatures en fer «rebase»"
-#: builtin/pull.c:930
+#: builtin/pull.c:969
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\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"
+"You can replace \"git config\" with \"git config --global\" to set a default\n"
"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Baixar sense especificar com conciliar branques divergents està\n"
-"desaconsellat. Podeu desactivar aquest missatge executant una de les\n"
-"següents ordres abans de la propera baixada:\n"
+"Teniu branques divergents i necessiteu especificar com reconciliar-les.\n"
+"Podeu fer-ho executant una de les ordres següents abans que torneu\n"
+"a fer una baixada:\n"
"\n"
-" git config pull.rebase false # merge (estratègia per defecte)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
-" git config pull.ff only # només fast-forward\n"
+" git config pull.ff only # fast-forward only\n"
"\n"
"Podeu reemplaçar «git config» per «git config --global» per a establir una\n"
"preferència per defecte per a tots els repositoris. Podeu també usar --rebase,\n"
-"--no-rebase o --ff-only en la línia d'ordres per sobreescriure el valor\n"
+"--no-rebase o --ff-only en la línia d'ordres per a sobreescriure el valor\n"
"per defecte configuració en aquesta execució.\n"
-#: builtin/pull.c:991
+#: builtin/pull.c:1047
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"S'està actualitzant una branca no nascuda amb canvis afegits a l'índex."
-#: builtin/pull.c:995
+#: builtin/pull.c:1051
msgid "pull with rebase"
msgstr "baixar fent «rebase»"
-#: builtin/pull.c:996
+#: builtin/pull.c:1052
msgid "please commit or stash them."
msgstr "cometeu-los o emmagatzemeu-los."
-#: builtin/pull.c:1021
+#: builtin/pull.c:1077
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19623,7 +20247,7 @@
"s'està avançant ràpidament el vostre arbre de treball des de\n"
"la comissió %s."
-#: builtin/pull.c:1027
+#: builtin/pull.c:1083
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19634,22 +20258,29 @@
"to recover."
msgstr ""
"No es pot avançar ràpidament el vostre arbre de treball.\n"
-"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida "
-"de\n"
+"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida de\n"
"$ git diff %s\n"
"executeu\n"
"$ git reset --hard\n"
"per a recuperar."
-#: builtin/pull.c:1042
+#: builtin/pull.c:1098
msgid "Cannot merge multiple branches into empty head."
msgstr "No es poden fusionar múltiples branques a un HEAD buit."
-#: builtin/pull.c:1046
+#: builtin/pull.c:1103
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot fer «rebase» sobre múltiples branques."
-#: builtin/pull.c:1067
+#: builtin/pull.c:1105
+msgid "Cannot fast-forward to multiple branches."
+msgstr "No es pot fer un avançament ràpid a branques múltiples."
+
+#: builtin/pull.c:1120
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Cal especificar com reconciliar les branques divergents."
+
+#: builtin/pull.c:1134
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"no es pot fer «rebase» amb modificacions als submòduls enregistrades "
@@ -19657,7 +20288,8 @@
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<opcions>] [<repositori> [<especificació-de-referència>...]]"
+msgstr ""
+"git push [<opcions>] [<repositori> [<especificació-de-referència>...]]"
#: builtin/push.c:111
msgid "tag shorthand without <tag>"
@@ -19673,8 +20305,7 @@
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
"\n"
-"Per a triar qualsevol opció permanentment, vegeu push.default a «git help "
-"config»."
+"Per a triar qualsevol opció permanentment, vegeu push.default a «git help config»."
#: builtin/push.c:167
#, c-format
@@ -19716,7 +20347,7 @@
"\n"
" git push %s HEAD:<nom-de-branca-remota>\n"
-#: builtin/push.c:194
+#: builtin/push.c:191
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -19729,13 +20360,20 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:202
+#: builtin/push.c:199
#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgid ""
+"The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"La branca actual %s té múltiples branques fonts, s'està refusant pujar."
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"No heu especificat cap especificació de referència a pujar, i push.default "
+"és «nothing»."
+
+#: builtin/push.c:243
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -19746,14 +20384,7 @@
"branca actual «%s», sense dir-me què pujar per a actualitzar\n"
"quina branca remota."
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"No heu especificat cap especificació de referència a pujar, i push.default "
-"és «nothing»."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19763,10 +20394,9 @@
"S'han rebutjat les actualitzacions perquè el punt de la vostra branca\n"
"actual està darrere de la seva branca remota corresponent. Integreu\n"
"els canvis remots (per exemple, «git pull ...») abans de pujar de nou.\n"
-"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més "
-"informació."
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació."
-#: builtin/push.c:273
+#: builtin/push.c:264
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -19777,10 +20407,9 @@
"està darrere de la seva branca remota corresponent. Agafeu aquesta\n"
"branca i integreu els canvis remots (per exemple, «git pull ...»)\n"
"abans de pujar de nou.\n"
-"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més "
-"informació."
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació."
-#: builtin/push.c:279
+#: builtin/push.c:270
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -19793,15 +20422,15 @@
"que ha pujat a la mateixa referència. Pot ser que primer vulgueu\n"
"integrar els canvis remots (per exemple, «git pull ...») abans de\n"
"pujar de nou.\n"
-"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més "
-"informació."
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació."
-#: builtin/push.c:286
+#: builtin/push.c:277
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot."
+"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el "
+"remot."
-#: builtin/push.c:289
+#: builtin/push.c:280
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -19809,124 +20438,117 @@
msgstr ""
"No podeu actualitzar una referència remota que assenyala un\n"
"objecte no de comissió, ni actualitzar una referència remota per\n"
-"fer que assenyali un objecte no de comissió, sense usar l'opció\n"
+"a fer que assenyali un objecte no de comissió, sense usar l'opció\n"
"«--force».\n"
-#: builtin/push.c:294
-#, fuzzy
+#: builtin/push.c:285
msgid ""
"Updates were rejected because the tip of the remote-tracking\n"
"branch has been updated since the last checkout. You may want\n"
"to integrate those changes locally (e.g., 'git pull ...')\n"
"before forcing an update.\n"
msgstr ""
-"S'han rebutjat les actualitzacions perquè el punt de la vostra branca\n"
-"actual està darrere de la seva branca remota corresponent. Integreu\n"
-"els canvis remots (per exemple, «git pull ...») abans de pujar de nou.\n"
-"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més "
-"informació."
+"S'han rebutjat les actualitzacions perquè el punt actual de la vostra\n"
+"branca està darrere de la seva branca remota corresponent. Integreu\n"
+"els canvis localment (per exemple, «git pull ...») abans de forçar\n"
+"una pujada.\n"
-#: builtin/push.c:364
+#: builtin/push.c:355
#, c-format
msgid "Pushing to %s\n"
msgstr "S'està pujant a %s\n"
-#: builtin/push.c:371
+#: builtin/push.c:362
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "s'ha produït un error en pujar algunes referències a «%s»"
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3377
msgid "repository"
msgstr "repositori"
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "puja totes les referències"
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "reflecteix totes les referències"
-#: builtin/push.c:557
+#: builtin/push.c:548
msgid "delete refs"
msgstr "suprimeix les referències"
-#: builtin/push.c:558
+#: builtin/push.c:549
msgid "push tags (can't be used with --all or --mirror)"
msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)"
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "força les actualitzacions"
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<nom-de-referència>:<esperat>"
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "requereix que el valor antic de la referència sigui d'aquest valor"
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "requereix que les actualitzacions remotes s'integrin localment"
-#: builtin/push.c:569
+#: builtin/push.c:560
msgid "control recursive pushing of submodules"
msgstr "controla la pujada recursiva dels submòduls"
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "usa el paquet prim"
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "programa que rep els paquets"
-#: builtin/push.c:573
+#: builtin/push.c:564
msgid "set upstream for git pull/status"
msgstr "estableix la font per a git pull/status"
-#: builtin/push.c:576
+#: builtin/push.c:567
msgid "prune locally removed refs"
msgstr "poda les referències eliminades localment"
-#: builtin/push.c:578
+#: builtin/push.c:569
msgid "bypass pre-push hook"
msgstr "evita el lligam de prepujada"
-#: builtin/push.c:579
+#: builtin/push.c:570
msgid "push missing but relevant tags"
msgstr "puja les etiquetes absents però rellevants"
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "signa la pujada amb GPG"
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "demana una transacció atòmica al costat remot"
-#: builtin/push.c:601
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete és incompatible amb --all, --mirror i --tags"
-
-#: builtin/push.c:603
+#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete no té sentit sense referències"
-#: builtin/push.c:623
+#: builtin/push.c:614
#, c-format
msgid "bad repository '%s'"
msgstr "repositori incorrecte «%s»"
-#: builtin/push.c:624
+#: builtin/push.c:615
msgid ""
"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
+"Either specify the URL from the command-line or configure a remote repository using\n"
"\n"
" git remote add <name> <url>\n"
"\n"
@@ -19935,8 +20557,7 @@
" git push <name>\n"
msgstr ""
"No hi ha cap destí de pujada configurat.\n"
-"Especifiqueu l'URL des de la línia d'ordres o bé configureu un repositori remot "
-"fent servir\n"
+"Especifiqueu l'URL des de la línia d'ordres o bé configureu un repositori remot fent servir\n"
"\n"
" git remote add <nom> <url>\n"
"\n"
@@ -19944,36 +20565,22 @@
"\n"
" git push <nom>\n"
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr "--all i --tags són incompatibles"
-
-#: builtin/push.c:641
+#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all no es pot combinar amb especificacions de referència"
-#: builtin/push.c:645
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror i --tags són incompatibles"
-
-#: builtin/push.c:647
+#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror no es pot combinar amb especificacions de referència"
-#: builtin/push.c:650
-msgid "--all and --mirror are incompatible"
-msgstr "--all i --mirror són incompatibles"
-
-#: builtin/push.c:657
+#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "les opcions de pujada no han de tenir caràcters de línia nova"
#: builtin/range-diff.c:9
-#, fuzzy
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
-"git range-diff [<opcions>] <old-base>..<old-tip> <new-base>.<new-tip>..<new-"
-"tip>."
+"git range-diff [<opcions>] <old-base>..<old-tip> <new-base>..<new-tip>"
#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
@@ -19988,29 +20595,25 @@
msgstr "utilitza colors simples de diff"
#: builtin/range-diff.c:32
-#, fuzzy
msgid "notes"
msgstr "notes"
#: builtin/range-diff.c:32
-#, fuzzy
msgid "passed to 'git log'"
-msgstr "passa a 'git log'"
+msgstr "passa-ho a «git log»"
#: builtin/range-diff.c:35
-#, fuzzy
msgid "only emit output related to the first range"
-msgstr "mostra només les comissions que no siguin en la primera branca"
+msgstr "emet només la sortida relacionada amb el primer interval"
#: builtin/range-diff.c:37
-#, fuzzy
msgid "only emit output related to the second range"
-msgstr "fes que la sortida sigui relativa al directori superior del projecte"
+msgstr "emet només la sortida relacionada amb el segon interval"
#: builtin/range-diff.c:60 builtin/range-diff.c:64
-#, fuzzy, c-format
+#, c-format
msgid "not a commit range: '%s'"
-msgstr "cap .. en rang: «%s»"
+msgstr "no és un rang de comissions: «%s»"
#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
@@ -20022,332 +20625,153 @@
#: builtin/read-tree.c:41
msgid ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
+" [-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
+" [-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "escriu l'índex resultant al <fitxer>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "només buida l'índex"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "S'està fusionant"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "realitza una fusió a més d'una lectura"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "fusió de 3 vies en presència d'afegiments i eliminacions"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "el mateix que -m, però descarta les entrades no fusionades"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<subdirectori>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "llegiu l'arbre a l'índex sota <subdirectori>/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "actualitza l'arbre de treball amb el resultat de fusió"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "permet que els fitxers explícitament ignorats se sobreescriguin"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "no comprovis l'arbre de treball després de fusionar"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "no actualitzis l'índex ni l'arbre de treball"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "omet l'aplicació del filtre d'agafament parcial"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "depura unpack-trees"
-#: builtin/read-tree.c:157
-#, fuzzy
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "suprimeix els missatges de retroacció"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:190
msgid "You need to resolve your current index first"
-msgstr "Primer heu de resoldre l'índex actual"
+msgstr "Primer heu de resoldre el vostre índex actual"
-#: builtin/rebase.c:35
-#, fuzzy
+#: builtin/rebase.c:36
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
msgstr ""
-"git rebase [-i] [opcions] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
-#: builtin/rebase.c:37
-#, fuzzy
+#: builtin/rebase.c:38
msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root "
+"[<branch>]"
msgstr ""
-"git rebase [-i] [opcions] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root "
+"[<branch>]"
-#: builtin/rebase.c:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "llista per a fer inestable: «%s»"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:231
#, c-format
msgid "could not create temporary %s"
msgstr "no s'ha pogut crear el fitxer temporal %s"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:237
msgid "could not mark as interactive"
msgstr "no s'ha pogut marcar com a interactiu"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:290
msgid "could not generate todo list"
msgstr "no s'ha pogut generar la llista per a fer"
-#: builtin/rebase.c:412
-#, fuzzy
+#: builtin/rebase.c:332
msgid "a base commit must be provided with --upstream or --onto"
msgstr "s'ha de proporcionar una comissió base amb --upstream o --onto"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opcions>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-#, fuzzy
-msgid "keep commits which start empty"
-msgstr "manté les comissions que comencen en blanc"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "permet les comissions amb missatges buits"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "fes «rebase» de les comissions de fusió"
-
-#: builtin/rebase.c:502
-#, fuzzy
-msgid "keep original branch points of cousins"
-msgstr "mantén els punts de branca originals dels cosins"
-
-#: builtin/rebase.c:504
-#, fuzzy
-msgid "move commits that begin with squash!/fixup!"
-msgstr "mou les comissions que comencen amb squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "signa les comissions"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "mostra un «diffstat» del que ha canviat a la font"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "continua el «rebase»"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "omet la comissió"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "edita la llista a fer"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "mostra el pedaç actual"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "escurça els ids de les comissions en la llista per a fer"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "expandeix els ids de les comissions en la llista per a fer"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "comprova la llista a fer"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "reorganitza les línies «fixup/pick»"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "expandeix les ordres exec en la llista per a fer"
-
-#: builtin/rebase.c:526
-#, fuzzy
-msgid "onto"
-msgstr "sobre"
-
-#: builtin/rebase.c:529
-#, fuzzy
-msgid "restrict-revision"
-msgstr "revisió restringida"
-
-#: builtin/rebase.c:529
-#, fuzzy
-msgid "restrict revision"
-msgstr "restringeix la revisió"
-
-#: builtin/rebase.c:531
-#, fuzzy
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-#, fuzzy
-msgid "squash onto"
-msgstr "carabassa a"
-
-#: builtin/rebase.c:534
-#, fuzzy
-msgid "the upstream commit"
-msgstr "la comissió principal"
-
-#: builtin/rebase.c:536
-#, fuzzy
-msgid "head-name"
-msgstr "nom-cap"
-
-#: builtin/rebase.c:536
-#, fuzzy
-msgid "head name"
-msgstr "nom del cap"
-
-#: builtin/rebase.c:541
-#, fuzzy
-msgid "rebase strategy"
-msgstr "estratègia de rebase"
-
-#: builtin/rebase.c:542
-#, fuzzy
-msgid "strategy-opts"
-msgstr "opcions estratègiques"
-
-#: builtin/rebase.c:543
-#, fuzzy
-msgid "strategy options"
-msgstr "opcions d'estratègia"
-
-#: builtin/rebase.c:544
-#, fuzzy
-msgid "switch-to"
-msgstr "canvia a"
-
-#: builtin/rebase.c:545
-#, fuzzy
-msgid "the branch or commit to checkout"
-msgstr "la branca o entrega a agafar"
-
-#: builtin/rebase.c:546
-#, fuzzy
-msgid "onto-name"
-msgstr "ont-name"
-
-#: builtin/rebase.c:546
-#, fuzzy
-msgid "onto name"
-msgstr "al nom"
-
-#: builtin/rebase.c:547
-#, fuzzy
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "l'ordre a executar"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-#, fuzzy
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "torna a planificar automàticament qualsevol `exec` que falli"
-
-#: builtin/rebase.c:566
-#, fuzzy
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cosins no té cap efecte sense --rebase-merges"
-
-#: builtin/rebase.c:582
-#, fuzzy, c-format
+#: builtin/rebase.c:391
+#, c-format
msgid "%s requires the merge backend"
-msgstr "%s requereix un «rebase» interactiu"
+msgstr "%s requereix un rerefons de fusió"
-#: builtin/rebase.c:625
-#, fuzzy, c-format
+#: builtin/rebase.c:433
+#, c-format
msgid "could not get 'onto': '%s'"
-msgstr "no s'ha pogut obtenir «onto» «%s»"
+msgstr "no s'ha pogut obtenir «onto»: «%s»"
-#: builtin/rebase.c:642
-#, fuzzy, c-format
+#: builtin/rebase.c:450
+#, c-format
msgid "invalid orig-head: '%s'"
-msgstr "orig-head '%s' no és vàlid"
+msgstr "orig-head no és vàlid: «%s»"
-#: builtin/rebase.c:667
-#, fuzzy, c-format
+#: builtin/rebase.c:475
+#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
-msgstr "s'ignorarà allowrerereautoupdate «%s» no vàlid"
+msgstr "s'ignora allow_rerere_autoupdate no vàlid: «%s»"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:600
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"You can instead skip this commit: run \"git rebase --skip\".\n"
-"To abort and get back to the state before \"git rebase\", run \"git rebase --"
-"abort\"."
+"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
msgstr ""
"Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n"
-"«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --"
-"continue».\n"
+"«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --continue».\n"
"Alternativament podeu ometre aquesta comissió: executeu «git rebase --skip».\n"
-"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», "
-"executeu «git rebase --abort»."
+"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», executeu «git rebase --abort»."
-#: builtin/rebase.c:896
-#, fuzzy, c-format
+#: builtin/rebase.c:685
+#, c-format
msgid ""
"\n"
"git encountered an error while preparing the patches to replay\n"
@@ -20357,19 +20781,26 @@
"\n"
"As a result, git cannot rebase them."
msgstr ""
-"git va trobar un error en preparar els pedaços per a tornar a reproduir "
-"aquests revisions per cent. Com a resultat git no pot refer-los."
+"\n"
+"git ha trobat un error en preparar els pedaços per a tornar a reproduir\n"
+"aquestes revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"Com a resultat, git no pot fer un «rebase» d'elles."
-#: builtin/rebase.c:1222
-#, fuzzy, c-format
-msgid ""
-"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
-"\"."
+#: builtin/rebase.c:836
+#, c-format
+msgid "could not switch to %s"
+msgstr "no s'ha pogut commutar a %s"
+
+#: builtin/rebase.c:952
+#, c-format
+msgid "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."
msgstr ""
-"no es reconeix el tipus buit «%s»; els valors vàlids són «drop» «keep» i "
-"«ask»."
+"tipus buit no reconegut «%s»; els valors vàlids són «drop», «keep» i «ask»."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:970
#, c-format
msgid ""
"%s\n"
@@ -20386,7 +20817,7 @@
" git rebase '<branca>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:986
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20394,202 +20825,184 @@
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
msgstr ""
-"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
-"amb:\n"
+"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho amb:\n"
"\n"
" git branch --set-upstream-to=%s/<branca> %s\n"
"\n"
-#: builtin/rebase.c:1286
-#, fuzzy
+#: builtin/rebase.c:1016
msgid "exec commands cannot contain newlines"
msgstr "les ordres exec no poden contenir línies noves"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:1020
msgid "empty exec command"
msgstr "ordre exec buida"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1051
msgid "rebase onto given branch instead of upstream"
msgstr "fes un «rebase» en la branca donada en comptes de la font"
-#: builtin/rebase.c:1321
-#, fuzzy
+#: builtin/rebase.c:1053
msgid "use the merge-base of upstream and branch as the current base"
msgstr "utilitza la base de fusió de la font i la branca com a base actual"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1055
msgid "allow pre-rebase hook to run"
msgstr "permet al lligam pre-rebase executar-se"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1057
msgid "be quiet. implies --no-stat"
msgstr "silenciós. Implica --no-stat"
-#: builtin/rebase.c:1331
-#, fuzzy
+#: builtin/rebase.c:1060
+msgid "display a diffstat of what changed upstream"
+msgstr "mostra un «diffstat» del que ha canviat a la font"
+
+#: builtin/rebase.c:1063
msgid "do not show diffstat of what changed upstream"
-msgstr "no mostris «diffstat» de quina font ha canviat"
+msgstr "no mostris «diffstat» del que ha canviat a la font"
-#: builtin/rebase.c:1334
-#, fuzzy
+#: builtin/rebase.c:1066
msgid "add a Signed-off-by trailer to each commit"
-msgstr "afegeix una línia signada per cada entrega"
+msgstr "afegeix un «trailer» tipus «Signed-off-by» a cada comissió"
-#: builtin/rebase.c:1337
-#, fuzzy
+#: builtin/rebase.c:1069
msgid "make committer date match author date"
-msgstr "Agrupa per «comitter» en comptes de per autor"
+msgstr "fes que la data del «comitter» coincideixi amb la data de l'autor"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1071
msgid "ignore author date and use current date"
msgstr "ignora la data de l'autor i utilitza la data actual"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1073
msgid "synonym of --reset-author-date"
msgstr "sinònim de --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1075 builtin/rebase.c:1079
msgid "passed to 'git apply'"
msgstr "passa-ho a «git apply»"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1077
msgid "ignore changes in whitespace"
msgstr "ignora els canvis d'espais en blanc"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1081 builtin/rebase.c:1084
msgid "cherry-pick all commits, even if unchanged"
msgstr "«cherry pick» totes les comissions, inclús les no canviades"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1086
msgid "continue"
msgstr "continua"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1089
msgid "skip current patch and continue"
msgstr "omet el pedaç actual i continua"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1091
msgid "abort and check out the original branch"
msgstr "interromp i agafa la branca original"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1094
msgid "abort but keep HEAD where it is"
msgstr "interromp però manté HEAD on és"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1095
msgid "edit the todo list during an interactive rebase"
msgstr "edita la llista de coses a fer durant un «rebase» interactiu"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1098
msgid "show the patch file being applied or merged"
msgstr "mostra el pedaç que s'està aplicant o fusionant"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1101
msgid "use apply strategies to rebase"
-msgstr "utilitza estratègies d'aplicació per fer «rebase»"
+msgstr "utilitza estratègies d'aplicació per a fer «rebase»"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1105
msgid "use merging strategies to rebase"
-msgstr "utilitza estratègies de fusió per fer «rebase»"
+msgstr "utilitza estratègies de fusió per a fer «rebase»"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1109
msgid "let the user edit the list of commits to rebase"
msgstr "permet a l'usuari editar la llista de comissions a fer «rebase»"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1113
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(EN DESÚS) intenta recrear fusions en lloc d'ignorar-les"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1118
msgid "how to handle commits that become empty"
msgstr "com gestionar les comissions que queden buides"
-#: builtin/rebase.c:1393
-#, fuzzy
+#: builtin/rebase.c:1121
+msgid "keep commits which start empty"
+msgstr "manté les comissions que comencen en blanc"
+
+#: builtin/rebase.c:1125
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "mou les comissions que comencen amb squash!/fixup! sota -i"
-#: builtin/rebase.c:1400
-#, fuzzy
+#: builtin/rebase.c:1132
msgid "add exec lines after each commit of the editable list"
-msgstr "afegeix línies d'exec després de cada publicació de la llista editable"
+msgstr "afegeix línies d'exec després de cada comissió de la llista editable"
-#: builtin/rebase.c:1404
-#, fuzzy
+#: builtin/rebase.c:1136
msgid "allow rebasing commits with empty messages"
-msgstr "permet tornar a basar les comissions amb missatges buits"
+msgstr "permet fer «rebase» de les comissions amb missatges buits"
-#: builtin/rebase.c:1408
-#, fuzzy
+#: builtin/rebase.c:1140
msgid "try to rebase merges instead of skipping them"
-msgstr "intenta fer «rebase» de les fusions en lloc d'omissió"
+msgstr "intenta fer «rebase» de les fusions en comptes d'ometre-les"
-#: builtin/rebase.c:1411
-#, fuzzy
+#: builtin/rebase.c:1143
msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "usa «merge-base --fork-point» per refinar la font"
+msgstr "usa «merge-base --fork-point» per a refinar la font"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1145
msgid "use the given merge strategy"
msgstr "utilitza l'estratègia de fusió donada"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1147 builtin/revert.c:115
msgid "option"
msgstr "opció"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1148
msgid "pass the argument through to the merge strategy"
msgstr "passa l'argument a l'estratègia de fusió"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1151
msgid "rebase all reachable commits up to the root(s)"
msgstr "fes «rebase» de totes les comissions accessibles fins a l'arrel"
-#: builtin/rebase.c:1424
-#, fuzzy
-msgid "apply all changes, even those already present upstream"
-msgstr "aplica tots els canvis fins i tot els que ja estan a la font principal"
+#: builtin/rebase.c:1154
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "torna a planificar automàticament qualsevol «exec» que falli"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1156
+msgid "apply all changes, even those already present upstream"
+msgstr "aplica tots els canvis, fins i tot els que ja estan a la font"
+
+#: builtin/rebase.c:1177
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Sembla que «git am» està en curs. No es pot fer «rebase»."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges està en desús. Utilitzeu --rebase-merges en "
-"lloc seu."
+#: builtin/rebase.c:1208
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges ha estat substituït per --rebase-merges"
-#: builtin/rebase.c:1488
-#, fuzzy
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "no es pot combinar «--keep-base» amb «--onto»"
-
-#: builtin/rebase.c:1490
-#, fuzzy
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "no es pot combinar «--keep-base» amb «--root»"
-
-#: builtin/rebase.c:1494
-#, fuzzy
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "no es pot combinar «--root» amb «--root»"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1230
msgid "No rebase in progress?"
msgstr "No hi ha un «rebase» en curs?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1234
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1269
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20597,17 +21010,17 @@
"Heu d'editar tots els conflictes de fusió i després\n"
"marcar-los com a resolts fent servir git add"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1287
msgid "could not discard worktree changes"
msgstr "no s'han pogut descartar els canvis de l'arbre de treball"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1308
#, c-format
msgid "could not move back to %s"
msgstr "no s'ha pogut tornar a %s"
-#: builtin/rebase.c:1620
-#, fuzzy, c-format
+#: builtin/rebase.c:1354
+#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"I wonder if you are in the middle of another rebase. If that is the\n"
@@ -20618,152 +21031,136 @@
"and run me again. I am stopping in case you still have something\n"
"valuable there.\n"
msgstr ""
-"Sembla que ja hi ha un directori per cent i em pregunto si està vostè enmig "
-"d'un altre rebase. Si és així, si us plau, provi-ho si no és així, si us "
-"plau inciti-me."
+"Sembla que ja exigeix un directori %s, i em pregunto\n"
+"si esteu enmig d'un altre «rebase». Si aquest és el cas, proveu\n"
+"\t%s\n"
+"Si no és cas\n"
+"\t%s\n"
+"i executeu aquesta ordre de nou. S'atura l'operació en cas que\n"
+"tingueu quelcom valuós.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1382
msgid "switch `C' expects a numerical value"
msgstr "«switch» «c» espera un valor numèric"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1424
#, c-format
msgid "Unknown mode: %s"
msgstr "Mode desconegut: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1463
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requereix --merge o --interactive"
-#: builtin/rebase.c:1759
-#, fuzzy
-msgid "cannot combine apply options with merge options"
-msgstr "no es poden combinar les opcions d'aplicació amb les opcions de fusió"
+#: builtin/rebase.c:1492
+msgid "apply options and merge options cannot be used together"
+msgstr "les opcions apply i merge no es poden usar juntes"
-#: builtin/rebase.c:1772
-#, fuzzy, c-format
+#: builtin/rebase.c:1505
+#, c-format
msgid "Unknown rebase backend: %s"
-msgstr "Rebase de system%s desconegut"
+msgstr "Rerefons de «rebase» desconegut: %s"
-#: builtin/rebase.c:1802
-#, fuzzy
+#: builtin/rebase.c:1534
msgid "--reschedule-failed-exec requires --exec or --interactive"
-msgstr "--reschedulo-failed-exec requereix --exec o --interactive"
+msgstr "--reschedule-failed-exec requereix --exec o --interactive"
-#: builtin/rebase.c:1822
-#, fuzzy
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "no es poden combinar «--preserve-merges» amb «--rebase-merges»"
-
-#: builtin/rebase.c:1826
-#, fuzzy
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"error no es pot combinar «--preserve-merges» amb «--reschedule-failed-exec»"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1565
#, c-format
msgid "invalid upstream '%s'"
msgstr "font no vàlida: «%s»"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1571
msgid "Could not create new root commit"
msgstr "No s'ha pogut crear una comissió arrel nova"
-#: builtin/rebase.c:1882
-#, fuzzy, c-format
+#: builtin/rebase.c:1597
+#, c-format
msgid "'%s': need exactly one merge base with branch"
-msgstr "'%s' necessita exactament una base de fusió amb branca"
+msgstr "«%s»: necessita exactament una base de fusió amb branca"
-#: builtin/rebase.c:1885
-#, fuzzy, c-format
+#: builtin/rebase.c:1600
+#, c-format
msgid "'%s': need exactly one merge base"
-msgstr "'%s' necessita exactament una base de fusió"
+msgstr "«%s»: necessita exactament una base de fusió"
-#: builtin/rebase.c:1893
-#, fuzzy, c-format
+#: builtin/rebase.c:1609
+#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "No apunta a una comissió vàlida «%s»"
-#: builtin/rebase.c:1921
-#, fuzzy, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal no existeix aquesta branca/commit «%s»"
+#: builtin/rebase.c:1636
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "no existeix aquesta branca o comissió «%s»"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
+#: builtin/submodule--helper.c:2477
#, c-format
msgid "No such ref: %s"
msgstr "No hi ha tal referència: %s"
-#: builtin/rebase.c:1940
-#, fuzzy
+#: builtin/rebase.c:1658
msgid "Could not resolve HEAD to a revision"
msgstr "No s'ha pogut resoldre HEAD a una revisió"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1679
msgid "Please commit or stash them."
msgstr "Cometeu-los o emmagatzemeu-los."
-#: builtin/rebase.c:1997
-#, c-format
-msgid "could not switch to %s"
-msgstr "no s'ha pogut commutar a %s"
-
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1714
msgid "HEAD is up to date."
msgstr "HEAD està al dia."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1716
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La branca actual %s està al dia.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1724
msgid "HEAD is up to date, rebase forced."
msgstr "La branca actual està al dia, «rebase» forçat."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1726
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "La branca actual %s està al dia; «rebase» forçat.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1734
msgid "The pre-rebase hook refused to rebase."
msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1741
#, c-format
msgid "Changes to %s:\n"
msgstr "Canvis a %s:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1744
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Canvis de %s a %s:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1769
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al "
"damunt...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1781
msgid "Could not detach HEAD"
msgstr "No s'ha pogut separar HEAD"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1790
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avanç ràpid %s a %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1276
+#: builtin/receive-pack.c:1263
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"
@@ -20794,7 +21191,7 @@
"per defecte, establiu la variable de configuració\n"
"«receive.denyCurrentBranch» a «refuse»."
-#: builtin/receive-pack.c:1296
+#: builtin/receive-pack.c:1283
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"
@@ -20816,163 +21213,205 @@
"\n"
"Per a silenciar aquest missatge, podeu establir-la a «refuse»."
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2476
msgid "quiet"
msgstr "silenciós"
-#: builtin/receive-pack.c:2493
-msgid "You must specify a directory."
-msgstr "Heu d'especificar un directori."
+#: builtin/receive-pack.c:2491
+msgid "you must specify a directory"
+msgstr "heu d'especificar un directori"
+
+#: builtin/reflog.c:9
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [<log-options>] [<ref>]"
+
+#: builtin/reflog.c:12
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]"
+msgstr ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]"
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
msgstr ""
-"git reflog expire [--expire=<hora>] [--expire-unreachable=<hora>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<referències>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
-#: builtin/reflog.c:22
-msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
-msgstr ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<referències>..."
-
-#: builtin/reflog.c:25
+#: builtin/reflog.c:21
msgid "git reflog exists <ref>"
msgstr "git reflog exists <referència>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
-#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "«%s» no és una marca de temps vàlida"
+#: builtin/reflog.c:197 builtin/reflog.c:211
+#, c-format, fuzzy
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "el codi de temps «%s» no és vàlid donat a «--%s»"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:240 builtin/reflog.c:359
+#, fuzzy
+msgid "do not actually prune any entries"
+msgstr "no practiquis cap entrada"
+
+#: builtin/reflog.c:243 builtin/reflog.c:362
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr "reescriu l'antic SHA1 amb el nou SHA1 de l'entrada que ara precedeix"
+
+#: builtin/reflog.c:246 builtin/reflog.c:365
+msgid "update the reference to the value of the top reflog entry"
+msgstr "actualitza la referència al valor de l'entrada de reflog superior"
+
+#: builtin/reflog.c:248 builtin/reflog.c:367
+#, fuzzy
+msgid "print extra information on screen"
+msgstr "imprimeix informació extra a la pantalla"
+
+#: builtin/reflog.c:249 builtin/reflog.c:253
+msgid "timestamp"
+msgstr "marca de temps"
+
+#: builtin/reflog.c:250
+#, fuzzy
+msgid "prune entries older than the specified time"
+msgstr "poda les entrades més antigues que el temps especificat"
+
+#: builtin/reflog.c:254
+#, fuzzy
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+"poda les entrades més antigues de <time> que no es poden accedir des de la "
+"punta actual de la branca"
+
+#: builtin/reflog.c:258
+#, fuzzy
+msgid "prune any reflog entries that point to broken commits"
+msgstr "poda qualsevol entrada de reflog que apunti a comissions trencades"
+
+#: builtin/reflog.c:259
+#, fuzzy
+msgid "process the reflogs of all references"
+msgstr "processa els reflogs de totes les referències"
+
+#: builtin/reflog.c:261
+#, fuzzy
+msgid "limits processing to reflogs from the current worktree only"
+msgstr "limita el processament a reflogs només de l'arbre de treball actual"
+
+#: builtin/reflog.c:294
#, c-format
msgid "Marking reachable objects..."
msgstr "S'estan marcant els objectes abastables..."
-#: builtin/reflog.c:647
-#, fuzzy, c-format
+#: builtin/reflog.c:338
+#, c-format
msgid "%s points nowhere!"
-msgstr "els percentatges no apunten enlloc!"
+msgstr "%s no apunta a enlloc"
-#: builtin/reflog.c:699
-#, fuzzy
+#: builtin/reflog.c:374
msgid "no reflog specified to delete"
-msgstr "no s'ha especificat cap registre de referència per suprimir"
+msgstr "no s'ha especificat cap registre de referència per a suprimir"
-#: builtin/reflog.c:708
-#, fuzzy, c-format
-msgid "not a reflog: %s"
-msgstr "no és un registre de referència"
-
-#: builtin/reflog.c:713
-#, fuzzy, c-format
-msgid "no reflog for '%s'"
-msgstr "cap registre de referència per a «%s»"
-
-#: builtin/reflog.c:759
+#: builtin/reflog.c:396
#, c-format
msgid "invalid ref format: %s"
msgstr "format de referència no vàlid: %s"
-#: builtin/reflog.c:768
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr "git reflog [ show | expire | delete | exists ]"
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] "
+"[--mirror=<fetch|push>] <name> <url>"
msgstr ""
-"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <nom> <url>"
+"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] "
+"[--mirror=<fetch|push>] <nom> <url>"
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <antic> <nou>"
+#: builtin/remote.c:20 builtin/remote.c:40
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <old> <new>"
-#: builtin/remote.c:20 builtin/remote.c:44
+#: builtin/remote.c:21 builtin/remote.c:45
msgid "git remote remove <name>"
msgstr "git remote remove <nom>"
-#: builtin/remote.c:21 builtin/remote.c:49
+#: builtin/remote.c:22 builtin/remote.c:50
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <nom>"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <nom>"
-#: builtin/remote.c:24
+#: builtin/remote.c:25
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]"
-#: builtin/remote.c:25
+#: builtin/remote.c:26
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <nom> <branca>..."
-#: builtin/remote.c:26 builtin/remote.c:75
+#: builtin/remote.c:27 builtin/remote.c:76
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <nom>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <nom> <url-nou> [<url-antic>]"
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <nom> <url-nou>"
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c:30 builtin/remote.c:83
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <nom> <url>"
-#: builtin/remote.c:34
+#: builtin/remote.c:35
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<opcions>] <nom> <url>"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <nom> <branca>..."
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <nom> <branca>..."
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<opcions>] <nom>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<opcions>] <nom>"
-#: builtin/remote.c:70
+#: builtin/remote.c:71
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<opcions>] [<grup> | <remot>]..."
-#: builtin/remote.c:99
+#: builtin/remote.c:100
#, c-format
msgid "Updating %s"
msgstr "S'està actualitzant %s"
-#: builtin/remote.c:131
+#: builtin/remote.c:102
+#, c-format
+msgid "Could not fetch %s"
+msgstr "No s'ha pogut obtenir %s"
+
+#: builtin/remote.c:132
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -20981,116 +21420,126 @@
"\t useu --mirror=fetch o\n"
"\t --mirror=push en lloc d'això"
-#: builtin/remote.c:148
+#: builtin/remote.c:149
#, c-format
msgid "unknown mirror argument: %s"
msgstr "argument de «mirror» desconegut: %s"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "fetch the remote branches"
msgstr "obtén les branques remotes"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "import all tags and associated objects when fetching"
msgstr "en obtenir, importa totes les etiquetes i tots els objectes"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "o no obtinguis cap etiqueta (--no-tags)"
-#: builtin/remote.c:171
+#: builtin/remote.c:172
msgid "branch(es) to track"
msgstr "branques a seguir"
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "master branch"
msgstr "branca mestra"
-#: builtin/remote.c:174
+#: builtin/remote.c:175
msgid "set up remote as a mirror to push to or fetch from"
msgstr "estableix el remot com a mirall al qual pujar o del qual obtenir"
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying a master branch makes no sense with --mirror"
msgstr "especificar una branca mestra no té sentit amb --mirror"
-#: builtin/remote.c:188
+#: builtin/remote.c:189
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"especificar les branques a seguir té sentit només amb miralls d'obtenció"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:196 builtin/remote.c:716
#, c-format
msgid "remote %s already exists."
msgstr "el remot %s ja existeix."
-#: builtin/remote.c:240
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "No s'ha pogut configurar la mestra «%s»"
-#: builtin/remote.c:355
+#: builtin/remote.c:323
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "no s'ha gestionat branch.%s.rebase=%s; assumint «true»"
+
+#: builtin/remote.c:367
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
"No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:461 builtin/remote.c:469
msgid "(matching)"
msgstr "(coincident)"
-#: builtin/remote.c:466
+#: builtin/remote.c:473
msgid "(delete)"
msgstr "(suprimir)"
-#: builtin/remote.c:655
-#, fuzzy, c-format
+#: builtin/remote.c:664
+#, c-format
msgid "could not set '%s'"
msgstr "no s'ha pogut establir «%s»"
-#: builtin/remote.c:660
-#, fuzzy, c-format
+#: builtin/remote.c:669
+#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
"\t%s:%d\n"
"now names the non-existent remote '%s'"
msgstr ""
-"La configuració dels percentatges és remota.pushDefault ins%d ara anomena "
-"els \"%s\" remots inexistents"
+"La configuració %s remote.pushDefault a:\n"
+"\t%s:%d\n"
+"ara anomena un remot no existent «%s»"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
#, c-format
msgid "No such remote: '%s'"
msgstr "No existeix el remot «%s»"
-#: builtin/remote.c:710
+#: builtin/remote.c:726
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "No s'ha pogut canviar el nom de la secció de configuració «%s» a «%s»"
-#: builtin/remote.c:730
+#: builtin/remote.c:746
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-"No s'està actualitzant l'especificació de referències d'obtenció no per "
-"defecte\n"
+"No s'està actualitzant l'especificació de referències d'obtenció no per defecte\n"
"\t%s\n"
"\tActualitzeu la configuració manualment si és necessari."
-#: builtin/remote.c:770
+#: builtin/remote.c:783
+#, fuzzy
+msgid "Renaming remote references"
+msgstr "Canviant el nom de les referències remotes"
+
+#: builtin/remote.c:794
#, c-format
msgid "deleting '%s' failed"
msgstr "la supressió de «%s» ha fallat"
-#: builtin/remote.c:804
+#: builtin/remote.c:832
#, c-format
msgid "creating '%s' failed"
msgstr "la creació de «%s» ha fallat"
-#: builtin/remote.c:882
+#: builtin/remote.c:912
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -21101,468 +21550,467 @@
"Nota: Una branca fora de la jerarquia refs/remotes/ no s'ha eliminat;\n"
"per a suprimir-la, useu:"
msgstr[1] ""
-"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han "
-"eliminat;\n"
+"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han eliminat;\n"
"per a suprimir-les, useu:"
-#: builtin/remote.c:896
+#: builtin/remote.c:926
#, c-format
msgid "Could not remove config section '%s'"
msgstr "No s'ha pogut eliminar la secció de configuració «%s»"
-#: builtin/remote.c:999
+#: builtin/remote.c:1034
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1037
msgid " tracked"
msgstr " seguit"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1039
msgid " stale (use 'git remote prune' to remove)"
msgstr " estancat (useu «git remote prune» per a eliminar)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1041
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1082
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1091
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "es fa «rebase» interactivament sobre el remot %s"
-#: builtin/remote.c:1058
-#, fuzzy, c-format
+#: builtin/remote.c:1093
+#, c-format
msgid "rebases interactively (with merges) onto remote %s"
-msgstr "rebases interactivament (amb fusions) en percentatges remots"
+msgstr "es fa «rebase» interactivament (amb fusions) sobre el remot %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1096
#, c-format
msgid "rebases onto remote %s"
msgstr "es fa «rebase» sobre el remot %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1100
#, c-format
msgid " merges with remote %s"
msgstr " es fusiona amb el remot %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1103
#, c-format
msgid "merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1106
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s i amb el remot %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1149
msgid "create"
msgstr "crea"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1152
msgid "delete"
msgstr "suprimeix"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1156
msgid "up to date"
msgstr "al dia"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1159
msgid "fast-forwardable"
msgstr "avanç ràpid possible"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1162
msgid "local out of date"
msgstr "local no actualitzat"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1169
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força a %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1172
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s puja a %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1176
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força a %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1179
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s puja a %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1247
msgid "do not query remotes"
msgstr "no consultis els remots"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1268
#, c-format
msgid "* remote %s"
msgstr "* remot %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1269
#, c-format
msgid " Fetch URL: %s"
msgstr " URL d'obtenció: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
msgid "(no URL)"
msgstr "(sense URL)"
#. TRANSLATORS: the colon ':' should align
#. with the one in " Fetch URL: %s"
#. translation.
-#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1284 builtin/remote.c:1286
#, c-format
msgid " Push URL: %s"
msgstr " URL de pujada: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
#, c-format
msgid " HEAD branch: %s"
msgstr " Branca de HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1288
msgid "(not queried)"
msgstr "(no consultat)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1290
msgid "(unknown)"
msgstr "(desconegut)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1294
#, c-format
-msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Branca de HEAD (la HEAD remot és ambigua, pot ser un dels següents):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1306
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branca remota:%s"
msgstr[1] " Branques remotes:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1309 builtin/remote.c:1335
msgid " (status not queried)"
msgstr " (estat no consultat)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1318
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branca local configurada per a «git pull»:"
msgstr[1] " Branques locals configurades per a «git pull»:"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1326
msgid " Local refs will be mirrored by 'git push'"
msgstr " «git push» reflectirà les referències locals"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1332
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Referència local configurada per a «git push»%s:"
msgstr[1] " Referències locals configurades per a «git push»%s:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1353
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "estableix refs/remotes/<nom>/HEAD segons el remot"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1355
msgid "delete refs/remotes/<name>/HEAD"
msgstr "suprimeix refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1369
msgid "Cannot determine remote HEAD"
msgstr "No es pot determinar la HEAD remota"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1371
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Múltiples branques de HEAD remotes. Trieu-ne una explícitament amb:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1381
#, c-format
msgid "Could not delete %s"
msgstr "No s'ha pogut suprimir %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1389
#, c-format
msgid "Not a valid ref: %s"
msgstr "No és una referència vàlida: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1391
#, c-format
msgid "Could not setup %s"
msgstr "No s'ha pogut configurar %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1409
#, c-format
msgid " %s will become dangling!"
msgstr " %s es tornarà penjant!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1410
#, c-format
msgid " %s has become dangling!"
msgstr " %s s'ha tornat penjant!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1419
#, c-format
msgid "Pruning %s"
msgstr "S'està podant %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1420
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1436
#, c-format
msgid " * [would prune] %s"
msgstr " * [podaria] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1439
#, c-format
msgid " * [pruned] %s"
msgstr " * [podat] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1484
msgid "prune remotes after fetching"
msgstr "poda els remots després d'obtenir-los"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
#, c-format
msgid "No such remote '%s'"
msgstr "No hi ha tal remot «%s»"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1566
msgid "add branch"
msgstr "afegeix branca"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1573
msgid "no remote specified"
msgstr "cap remot especificat"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1590
msgid "query push URLs rather than fetch URLs"
msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1592
msgid "return all URLs"
msgstr "retorna tots els URL"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1622
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "cap URL configurat per al remot «%s»"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1648
msgid "manipulate push URLs"
msgstr "manipula els URL de pujada"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1650
msgid "add URL"
msgstr "afegeix URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1652
msgid "delete URLs"
msgstr "suprimeix els URL"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1659
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no té sentit"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1700
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patró d'URL antic no vàlid: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1708
#, c-format
msgid "No such URL found: %s"
msgstr "No s'ha trobat tal URL: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1710
msgid "Will not delete all non-push URLs"
msgstr "No se suprimiran tots els URL no de pujada"
-#: builtin/repack.c:26
+#: builtin/remote.c:1727
+msgid "be verbose; must be placed before a subcommand"
+msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
+
+#: builtin/repack.c:29
msgid "git repack [<options>]"
msgstr "git repack [<opcions>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:34
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-"Els reempaquetaments incrementals són incompatibles amb els índexs de mapes "
-"de bits. Useu\n"
-"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack."
-"writebitmaps."
+"Els reempaquetaments incrementals són incompatibles amb els índexs de mapes de bits. Useu\n"
+"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack.writebitmaps."
-#: builtin/repack.c:198
-#, fuzzy
+#: builtin/repack.c:206
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-"no s'han pogut iniciar pack-objects per tornar a empaquetar els objectes "
-"«promissor»"
+"no s'ha pogut iniciar pack-objects per a tornar a empaquetar els objectes "
+"«promisor»"
-#: builtin/repack.c:270 builtin/repack.c:630
-#, fuzzy
+#: builtin/repack.c:280 builtin/repack.c:824
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-"reempaqueta S'esperen línies d'id. de l'objecte hexadecimal complet només "
-"des de pack-objects."
+"repack: s'esperen només línies amb l'id d'objecte hexadecimal complet des de"
+" pack-objects."
-#: builtin/repack.c:294
-#, fuzzy
+#: builtin/repack.c:304
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-"no s'ha pogut finalitzar el paquet d'objectes per tornar a empaquetar "
-"objectes promisor"
+"no s'ha pogut finalitzar pack-objects per a tornar a empaquetar els objectes"
+" «promisor»"
-#: builtin/repack.c:309
-#, fuzzy, c-format
+#: builtin/repack.c:319
+#, c-format
msgid "cannot open index for %s"
-msgstr "s'ha produït un error en obrir l'índex per «%s»"
+msgstr "no s'ha pogut obrir l'índex per a %s"
-#: builtin/repack.c:368
+#: builtin/repack.c:378
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr ""
+"el paquet %s és massa gran per a considerar-ho en progressió geomètrica"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
#, c-format
msgid "pack %s too large to roll up"
-msgstr ""
+msgstr "el paquet %s és massa gran per a enrotllar-lo"
-#: builtin/repack.c:460
+#: builtin/repack.c:503
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "no s'ha pogut obrir el fitxer temporal «%s» per a escriptura"
+
+#: builtin/repack.c:521
+msgid "could not close refs snapshot tempfile"
+msgstr ""
+"no s'ha pogut tancar el fitxer temporal amb la instantània de referències"
+
+#: builtin/repack.c:634
msgid "pack everything in a single pack"
msgstr "empaqueta-ho tot en un únic paquet"
-#: builtin/repack.c:462
+#: builtin/repack.c:636
msgid "same as -a, and turn unreachable objects loose"
msgstr "el mateix que -a, i solta els objectes inabastables"
-#: builtin/repack.c:465
+#: builtin/repack.c:639
msgid "remove redundant packs, and run git-prune-packed"
msgstr "elimina els paquets redundants, i executeu git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:641
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passa --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:469
+#: builtin/repack.c:643
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passa --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:471
+#: builtin/repack.c:645
msgid "do not run git-update-server-info"
msgstr "no executis git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:648
msgid "pass --local to git-pack-objects"
msgstr "passa --local a git-pack-objects"
-#: builtin/repack.c:476
+#: builtin/repack.c:650
msgid "write bitmap index"
msgstr "escriu índex de mapa de bits"
-#: builtin/repack.c:478
-#, fuzzy
+#: builtin/repack.c:652
msgid "pass --delta-islands to git-pack-objects"
-msgstr "passa --delta-illes a git-pack-objects"
+msgstr "passa --delta-islands a git-pack-objects"
-#: builtin/repack.c:479
+#: builtin/repack.c:653
msgid "approxidate"
msgstr "data aproximada"
-#: builtin/repack.c:480
+#: builtin/repack.c:654
msgid "with -A, do not loosen objects older than this"
-msgstr "amb -A, no soltis els objectes més vells que aquest"
+msgstr "amb -A, no soltis els objectes més antics que aquest"
-#: builtin/repack.c:482
+#: builtin/repack.c:656
msgid "with -a, repack unreachable objects"
msgstr "amb -a, reempaqueta els objectes inabastables"
-#: builtin/repack.c:484
+#: builtin/repack.c:658
msgid "size of the window used for delta compression"
msgstr "mida de la finestra que s'usa per a compressió de diferències"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:659 builtin/repack.c:665
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:486
+#: builtin/repack.c:660
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"el mateix que l'anterior, però limita la mida de memòria en lloc del nombre "
"d'entrades"
-#: builtin/repack.c:488
+#: builtin/repack.c:662
msgid "limits the maximum delta depth"
msgstr "limita la profunditat màxima de les diferències"
-#: builtin/repack.c:490
+#: builtin/repack.c:664
msgid "limits the maximum number of threads"
msgstr "limita el nombre màxim de fils"
-#: builtin/repack.c:492
+#: builtin/repack.c:666
msgid "maximum size of each packfile"
msgstr "mida màxima de cada fitxer de paquet"
-#: builtin/repack.c:494
+#: builtin/repack.c:668
msgid "repack objects in packs marked with .keep"
msgstr "reempaqueta els objectes en paquets marcats amb .keep"
-#: builtin/repack.c:496
-#, fuzzy
+#: builtin/repack.c:670
msgid "do not repack this pack"
-msgstr "no reempaqueta aquest paquet"
+msgstr "no reempaquetis aquest paquet"
-#: builtin/repack.c:498
+#: builtin/repack.c:672
msgid "find a geometric progression with factor <N>"
-msgstr ""
+msgstr "troba una progressió geomètrica amb el factor <N>"
-#: builtin/repack.c:508
+#: builtin/repack.c:674
+msgid "write a multi-pack index of the resulting packs"
+msgstr "escriu un índex multipaquet dels paquets resultants"
+
+#: builtin/repack.c:684
msgid "cannot delete packs in a precious-objects repo"
msgstr "no es poden suprimir paquets en un repositori d'objectes preciosos"
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable i -A són incompatibles"
-
-#: builtin/repack.c:527
-#, fuzzy
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--long és incompatible amb --abbrev=0"
-
-#: builtin/repack.c:639
-#, fuzzy
+#: builtin/repack.c:833
msgid "Nothing new to pack."
-msgstr "Res nou per empaquetar."
+msgstr "Res nou a empaquetar."
-#: builtin/repack.c:669
-#, fuzzy, c-format
+#: builtin/repack.c:863
+#, c-format
msgid "missing required file: %s"
-msgstr "falten els arguments per a %s"
+msgstr "falta el fitxer requerit: %s"
-#: builtin/repack.c:671
-#, fuzzy, c-format
+#: builtin/repack.c:865
+#, c-format
msgid "could not unlink: %s"
-msgstr "no s'ha pogut bloquejar «%s»"
+msgstr "no s'ha pogut desenllaçar: «%s»"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -21574,11 +22022,7 @@
#: builtin/replace.c:24
msgid "git replace [-f] --graft <commit> [<parent>...]"
-msgstr "git replace [-f] --graft <comissió> [<mare>...]"
-
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --convert-graft-file"
+msgstr "git replace [-f] --graft <comissió> [<parent>...]"
#: builtin/replace.c:26
msgid "git replace -d <object>..."
@@ -21589,127 +22033,114 @@
msgstr "git replace [--format=<format>] [-l [<patró>]]"
#: builtin/replace.c:90
-#, fuzzy, c-format
+#, c-format
msgid ""
"invalid replace format '%s'\n"
"valid formats are 'short', 'medium' and 'long'"
msgstr ""
-"format de substitució no vàlid «%s» els formats vàlids són «short» «medium» "
-"i «long»"
+"format de reemplaçament no vàlid «%s»\n"
+"els formats vàlids són «short» «medium» i «long»"
#: builtin/replace.c:125
-#, fuzzy, c-format
+#, c-format
msgid "replace ref '%s' not found"
-msgstr "no s'ha trobat la ref '%s'"
+msgstr "no s'ha trobat la referència de reemplaç '«%s»"
#: builtin/replace.c:141
-#, fuzzy, c-format
+#, c-format
msgid "Deleted replace ref '%s'"
msgstr "S'ha suprimit la referència «%s»"
#: builtin/replace.c:153
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid ref name"
-msgstr "'%s' no és un nom de referència vàlid"
+msgstr "«%s» no és un nom de referència vàlid"
#: builtin/replace.c:158
-#, fuzzy, c-format
+#, c-format
msgid "replace ref '%s' already exists"
-msgstr "reemplaça la referència «%s» ja existeix"
+msgstr "la referència de reemplaçament «%s» ja existeix"
#: builtin/replace.c:178
-#, fuzzy, c-format
+#, c-format
msgid ""
"Objects must be of the same type.\n"
"'%s' points to a replaced object of type '%s'\n"
"while '%s' points to a replacement object of type '%s'."
msgstr ""
-"Els objectes han de ser del mateix tipus. «%s» apunta a un objecte "
-"substituït del tipus «%s» mentre que «%s» apunta a un objecte de substitució "
-"del tipus «%s»."
+"Els objectes han de ser del mateix tipus.\n"
+"«%s» apunta a un objecte substituït del tipus «%s»\n"
+"mentre que «%s» apunta a un objecte de substitució del tipus «%s»."
#: builtin/replace.c:229
-#, fuzzy, c-format
+#, c-format
msgid "unable to open %s for writing"
-msgstr "no s'han pogut obrir els percentatges per escriure"
+msgstr "no s'ha pogut obrir %s per a escriptura"
#: builtin/replace.c:242
-#, fuzzy
msgid "cat-file reported failure"
-msgstr "error en el fitxer de gat"
+msgstr "cat-file ha informat d'un error"
#: builtin/replace.c:258
-#, fuzzy, c-format
+#, c-format
msgid "unable to open %s for reading"
-msgstr "no s'han pogut obrir els percentatges de lectura"
+msgstr "no s'ha pogut obrir %s per a lectura"
-#: builtin/replace.c:272
-#, fuzzy
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "no s'ha pogut engendrar el mktree"
-#: builtin/replace.c:276
-#, fuzzy
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "no s'ha pogut llegir des de mktree"
-#: builtin/replace.c:285
-#, fuzzy
+#: builtin/replace.c:284
msgid "mktree reported failure"
-msgstr "mktree ha fallat"
+msgstr "mktree ha informat d'una fallada"
-#: builtin/replace.c:289
-#, fuzzy
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree no ha retornat un nom d'objecte"
-#: builtin/replace.c:298
-#, fuzzy, c-format
+#: builtin/replace.c:297
+#, c-format
msgid "unable to fstat %s"
-msgstr "no s'han pogut fer fstat%s"
+msgstr "no s'ha pogut fer fstat %s"
-#: builtin/replace.c:303
-#, fuzzy
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "no s'ha pogut escriure l'objecte a la base de dades"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, fuzzy, c-format
-msgid "not a valid object name: '%s'"
-msgstr "no és un nom d'objecte vàlid «%s»"
-
-#: builtin/replace.c:326
-#, fuzzy, c-format
+#: builtin/replace.c:325
+#, c-format
msgid "unable to get object type for %s"
-msgstr "no s'ha pogut obtenir el tipus d'objecte per un percentatge"
+msgstr "no s'ha pogut obtenir el tipus d'objecte per a %s"
-#: builtin/replace.c:342
-#, fuzzy
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "l'edició del fitxer d'objecte ha fallat"
-#: builtin/replace.c:351
-#, fuzzy, c-format
+#: builtin/replace.c:350
+#, c-format
msgid "new object is the same as the old one: '%s'"
-msgstr "l'objecte nou és el mateix que l'antic «%s»"
+msgstr "l'objecte nou és el mateix que l'antic: «%s»"
-#: builtin/replace.c:384
-#, fuzzy, c-format
+#: builtin/replace.c:383
+#, c-format
msgid "could not parse %s as a commit"
-msgstr "no s'han pogut analitzar els percentatges com a comissió"
+msgstr "no s'ha pogut analitzar %s com a comissió"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "etiqueta de fusió incorrecta en la comissió «%s»"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "etiqueta de fusió mal formada en la comissió «%s»"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21718,293 +22149,273 @@
"la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; "
"useu --edit en lloc de --graft"
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "la comissió original «%s» té una signatura gpg"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "s'eliminarà la signatura en la comissió de reemplaçament!"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: «%s»"
-#: builtin/replace.c:488
-#, fuzzy, c-format
+#: builtin/replace.c:487
+#, c-format
msgid "graft for '%s' unnecessary"
-msgstr "empelt per '%s' innecessari"
+msgstr "«graft» per a «%s» innecessari"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "la comissió nova és la mateixa que l'antiga: «%s»"
-#: builtin/replace.c:527
-#, fuzzy, c-format
+#: builtin/replace.c:526
+#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
-msgstr "no s'han pogut convertir els següents percentatges d'empelt"
+msgstr ""
+"no s'han pogut convertir els següents «grafts»:\n"
+"%s"
+
+#: builtin/replace.c:547
+msgid "list replace refs"
+msgstr "llista les referències de reemplaçament"
#: builtin/replace.c:548
-msgid "list replace refs"
-msgstr "llista les referències reemplaçades"
+msgid "delete replace refs"
+msgstr "suprimeix les referències de reemplaçament"
#: builtin/replace.c:549
-msgid "delete replace refs"
-msgstr "suprimeix les referències reemplaçades"
-
-#: builtin/replace.c:550
msgid "edit existing object"
msgstr "edita un objecte existent"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
-msgstr "canvia les mares d'una comissió"
+msgstr "canvia els pares d'una comissió"
+
+#: builtin/replace.c:551
+msgid "convert existing graft file"
+msgstr "converteix el fitxer «graft» existent"
#: builtin/replace.c:552
-#, fuzzy
-msgid "convert existing graft file"
-msgstr "converteix el fitxer d'empelt existent"
-
-#: builtin/replace.c:553
msgid "replace the ref if it exists"
msgstr "reemplaça la referència si existeix"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "no imprimeixis bellament els continguts per a --edit"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "usa aquest format"
-#: builtin/replace.c:569
-#, fuzzy
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
-msgstr "no es pot utilitzar «--format» en no llistar"
+msgstr "no es pot utilitzar «--format» quan no s'està llistant"
-#: builtin/replace.c:577
-#, fuzzy
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "-f només té sentit quan s'escriu un reemplaçament"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw només té sentit amb --edit"
-#: builtin/replace.c:587
-#, fuzzy
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d necessita almenys un argument"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "nombre incorrecte d'arguments"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e necessita exactament un argument"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-g necessita almenys un argument"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file arguments"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "només es pot especificar un patró amb -l"
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-msgstr "git rerere [clear | forget <camí>... | status | remaining | diff | gc]"
+msgstr ""
+"git rerere [clear | forget <camí>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "registra les resolucions netes en l'índex"
-#: builtin/rerere.c:79
-#, fuzzy
+#: builtin/rerere.c:77
msgid "'git rerere forget' without paths is deprecated"
-msgstr "'git rererere oblid' sense camins està en desús"
+msgstr "«git rerere forget» sense camins està en desús"
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
#, c-format
msgid "unable to generate diff for '%s'"
-msgstr "s'ha pogut generar el diff per a «%s»"
+msgstr "no s'ha pogut generar el diff per a «%s»"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
-#: builtin/reset.c:33
-#, fuzzy
-msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr "git reset [-q] [<tree-ish>] [--] <pathspec>"
-
#: builtin/reset.c:34
-#, fuzzy
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
-#: builtin/reset.c:35
-#, fuzzy
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-msgstr "git reset --patch [<tree-ish>] [--] [<pathspec>]"
+msgstr "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "mixt"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "suau"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "dur"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "fusió"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "reteniment"
-#: builtin/reset.c:83
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "No teniu un HEAD vàlid."
-#: builtin/reset.c:85
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "S'ha produït un error en trobar l'arbre de HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "S'ha produït un error en cercar l'arbre de %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ara és a %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:304
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "No es pot fer un restabliment de %s enmig d'una fusió."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
+#: builtin/stash.c:693
msgid "be quiet, only report errors"
msgstr "sigues silenciós, només informa d'errors"
-#: builtin/reset.c:297
+#: builtin/reset.c:404
+msgid "skip refreshing the index after reset"
+msgstr "omet l'actualització de l'índex després de reiniciar"
+
+#: builtin/reset.c:406
msgid "reset HEAD and index"
msgstr "restableix HEAD i l'índex"
-#: builtin/reset.c:298
+#: builtin/reset.c:407
msgid "reset only HEAD"
msgstr "restableix només HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:409 builtin/reset.c:411
msgid "reset HEAD, index and working tree"
msgstr "restableix HEAD, l'índex i l'arbre de treball"
-#: builtin/reset.c:304
+#: builtin/reset.c:413
msgid "reset HEAD but keep local changes"
msgstr "restableix HEAD però retén els canvis locals"
-#: builtin/reset.c:310
+#: builtin/reset.c:419
msgid "record only the fact that removed paths will be added later"
msgstr "registra només el fet que els camins eliminats s'afegiran després"
-#: builtin/reset.c:344
+#: builtin/reset.c:452
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "S'ha produït un error en resoldre «%s» com a revisió vàlida."
-#: builtin/reset.c:352
+#: builtin/reset.c:460
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "S'ha produït un error en resoldre «%s» com a arbre vàlid."
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch és incompatible amb --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:479
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed amb camins està en desús; useu «git reset -- <camins>» en lloc "
"d'això."
-#: builtin/reset.c:373
+#: builtin/reset.c:481
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "No es pot restablir de %s amb camins."
-#: builtin/reset.c:388
+#: builtin/reset.c:496
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "el restabliment de %s no es permet en un repositori nu"
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "-N només es pot usar amb --mixed"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:527
msgid "Unstaged changes after reset:"
msgstr "Canvis «unstaged» després del restabliment:"
-#: builtin/reset.c:416
-#, fuzzy, c-format
+#: builtin/reset.c:530
+#, c-format, fuzzy
msgid ""
-"\n"
-"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
-"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
-"to make this the default.\n"
+"It took %.2f seconds to refresh the index after reset. You can use\n"
+"'--no-refresh' to avoid this."
msgstr ""
-"S'ha trigat segons de 4% a enumerar els canvis sense classificar després del "
-"reinici. Podeu utilitzar «--quiet» per evitar-ho. Establiu el paràmetre de "
-"configuració reset.quiet a cert per fer que això sigui el predeterminat."
+"Es van trigar un temps de,2f segons a actualitzar l'índex després de reiniciar. Pots utilitzar\n"
+".--no-refresh' per evitar això."
-#: builtin/reset.c:434
+#: builtin/reset.c:547
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió «%s»."
-#: builtin/reset.c:439
+#: builtin/reset.c:552
msgid "Could not write new index file."
msgstr "No s'ha pogut escriure el fitxer d'índex nou."
-#: builtin/rev-list.c:538
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "no es pot combinar --exclude-promisor-objects i --missing"
-
-#: builtin/rev-list.c:599
-msgid "object filtering requires --objects"
-msgstr "el filtratge d'objectes requereix --objects"
-
#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
#: builtin/rev-list.c:664
-#, fuzzy
-msgid "marked counting is incompatible with --objects"
-msgstr "el recompte marcat és incompatible amb --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "«marked counting» i «%s» no es poden usar junts"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -22022,6 +22433,18 @@
msgid "output in stuck long form"
msgstr "emet en forma llarga enganxada"
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "final prematur de l'entrada"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "no s'ha indicat cap cadena d'ús abans del separador «--»"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Cal una sola revisió"
+
#: builtin/rev-parse.c:552
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -22030,12 +22453,55 @@
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
-"git rev-parse --parseopt [<opcions>] -- [<arguments>...]\n"
-" o bé: git rev-parse --sq-quote [<argument>...]\n"
-" o bé: git rev-parse [<opcions>] [<argument>...]\n"
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+" o bé: git rev-parse --sq-quote [<arg>...]\n"
+" o bé: git rev-parse [<options>] [<arg>...]\n"
"\n"
-"Executeu «git rev-parse --parseopt -h» per a més informació sobre el primer "
-"ús."
+"Executeu «git rev-parse --parseopt -h» per a més informació sobre el primer ús."
+
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir requereix un argument"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "no és un directori git «%s»"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path requereix un argument"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n requereix un argument"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format requereix un argument"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "argument no vàlid per a --path-format: %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default requereix un argument"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix requereix un argument"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "mode desconegut per a --abbrev-ref: %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "mode desconegut per a --show-object-format: %s"
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
@@ -22109,17 +22575,21 @@
#: builtin/revert.c:127
msgid "preserve initially empty commits"
-msgstr "preserva les comissions inicialment buides"
+msgstr "conserva les comissions inicialment buides"
+
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "permet les comissions amb missatges buits"
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "retén les comissions redundants i buides"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "la reversió ha fallat"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "el «cherry pick» ha fallat"
@@ -22135,11 +22605,11 @@
"the following files have staged content different from both the\n"
"file and the HEAD:"
msgstr[0] ""
-"el fitxer següent té contingut «stage» diferent d'ambdós el\n"
-"fitxer i la HEAD:"
+"el fitxer següent té contingut «staged» diferent al fitxer\n"
+"i a HEAD:"
msgstr[1] ""
-"els fitxers següents tenen contingut «stage» diferent d'ambdós\n"
-"el fitxer i la HEAD:"
+"els fitxers següents tenen contingut «staged» diferent al fitxer\n"
+"i a HEAD:"
#: builtin/rm.c:213
msgid ""
@@ -22169,73 +22639,71 @@
msgstr[0] "el fitxer següent té modificacions locals:"
msgstr[1] "els fitxers següents tenen modificacions locals:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "no llistis els fitxers eliminats"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "només elimina de l'índex"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "passa per alt la comprovació d'actualitat"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "permet l'eliminació recursiva"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "surt amb estat zero encara que res hagi coincidit"
-#: builtin/rm.c:283
-#, fuzzy
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
-"No s'ha indicat cap especificació de camí. Quins fitxers haig de suprimir?"
+"No s'ha indicat cap especificació de camí. Quins fitxers s'han de suprimir?"
-#: builtin/rm.c:310
-#, fuzzy
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-"si us plau astaqueu els canvis a .gitmodules o feu un «stash» per continuar"
+"feu un «stage» dels canvis a .gitmodules o feu un «stash» per a continuar"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "no s'eliminarà «%s» recursivament sense -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: no s'ha pogut eliminar %s"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-"
-"pack=<paquet-del-git-receive>] [--verbose] [--thin] [--atomic] "
-"[<màquina>:]<directori> [<referència>...]\n"
-" --all i especificació <referència> explícita són mútuament excloents."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "nom del remot"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "usa el protocol RPC sense estat"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "llegeix les referències des de stdin"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "imprimeix l'estat des de l'ajudant remot"
@@ -22248,80 +22716,74 @@
msgstr "git log --pretty=short | git shortlog [<opcions>]"
#: builtin/shortlog.c:123
-#, fuzzy
msgid "using multiple --group options with stdin is not supported"
-msgstr "no s'admet escriure a stdin"
+msgstr "no s'admet l'ús de múltiples opcions --group amb stdin"
#: builtin/shortlog.c:133
-#, fuzzy
msgid "using --group=trailer with stdin is not supported"
-msgstr "no s'admet escriure a stdin"
+msgstr "no s'admet l'ús de --group=trailer amb stdin"
#: builtin/shortlog.c:323
-#, fuzzy, c-format
+#, c-format
msgid "unknown group type: %s"
-msgstr "tipus desconegut"
+msgstr "tipus de grup desconegut: %s"
#: builtin/shortlog.c:351
-#, fuzzy
msgid "group by committer rather than author"
-msgstr "Agrupa per «comitter» en comptes de per autor"
+msgstr "agrupa per «comitter» en comptes de per autor"
#: builtin/shortlog.c:354
msgid "sort output according to the number of commits per author"
msgstr "ordena la sortida segons el nombre de comissions per autor"
#: builtin/shortlog.c:356
-#, fuzzy
msgid "suppress commit descriptions, only provides commit count"
msgstr ""
-"Omet les descripcions de comissió, només proveeix el recompte de comissions"
+"omet les descripcions de les comissions, només proveeix el recompte de "
+"comissions"
#: builtin/shortlog.c:358
-#, fuzzy
msgid "show the email address of each author"
-msgstr "Mostra l'adreça electrònica de cada autor"
+msgstr "mostra l'adreça electrònica de cada autor"
#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
#: builtin/shortlog.c:360
-#, fuzzy
msgid "linewrap output"
-msgstr "Ajusta les línies de la sortida"
+msgstr "ajusta les línies de la sortida"
#: builtin/shortlog.c:362
-#, fuzzy
msgid "field"
msgstr "camp"
#: builtin/shortlog.c:363
-#, fuzzy
msgid "group by field"
-msgstr "Agrupa per camp"
+msgstr "agrupa per camp"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:395
msgid "too many arguments given outside repository"
msgstr "hi ha massa arguments donats fora del repositori"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<quan>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
-#: builtin/show-branch.c:17
+#: builtin/show-branch.c:18
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]"
+msgstr ""
+"git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]"
-#: builtin/show-branch.c:395
+#: builtin/show-branch.c:396
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
@@ -22397,12 +22859,6 @@
msgid "show <n> most recent ref-log entries starting at base"
msgstr "mostra les <n> entrades més recents començant a la base"
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog és incompatible amb --all, --remotes, --independent o --merge-base"
-
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "no s'ha donat cap branca, i HEAD no és vàlid"
@@ -22441,22 +22897,20 @@
msgstr "no es pot trobar la comissió %s (%s)"
#: builtin/show-index.c:21
-#, fuzzy
msgid "hash-algorithm"
-msgstr "<algorisme>"
+msgstr "algorisme de resum"
#: builtin/show-index.c:31
-#, fuzzy
msgid "Unknown hash algorithm"
-msgstr "variable «%s» desconeguda"
+msgstr "Algorisme de resum desconegut"
#: builtin/show-ref.c:12
msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
+"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
+"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
@@ -22496,98 +22950,163 @@
msgid "show refs from stdin that aren't in local repository"
msgstr "mostra les referències de stdin que no siguin en el repositori local"
-#: builtin/sparse-checkout.c:22
-#, fuzzy
+#: builtin/sparse-checkout.c:23
msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <opcions>"
+msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opcions>"
-#: builtin/sparse-checkout.c:46
-#, fuzzy
-msgid "git sparse-checkout list"
-msgstr "git sparse-checkout init [--cone]"
+#: builtin/sparse-checkout.c:61
+msgid "this worktree is not sparse"
+msgstr "aquest arbre de treball no és dispers"
-#: builtin/sparse-checkout.c:72
-#, fuzzy
+#: builtin/sparse-checkout.c:76
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-"aquest arbre de treball no és dispers (pot ser que el fitxer sparse-checkout "
-"no existeixi)"
+"aquest arbre de treball no és dispers (pot ser que el fitxer sparse-checkout"
+" no existeixi)"
-#: builtin/sparse-checkout.c:227
-#, fuzzy
+#: builtin/sparse-checkout.c:177
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"el directori «%s» conté fitxers no seguits, però no està en el con de "
+"sparse-checkout"
+
+#: builtin/sparse-checkout.c:185
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "s'ha produït un error en suprimir el directori «%s»"
+
+#: builtin/sparse-checkout.c:327
msgid "failed to create directory for sparse-checkout file"
msgstr "no s'ha pogut crear el directori per al fitxer sparse-checkout"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:366
#, fuzzy
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr ""
-"no s'ha pogut actualitzar el format del repositori per habilitar worktreeConfig"
+msgid "failed to initialize worktree config"
+msgstr "no s'ha pogut inicialitzar l'arbre de treball to"
-#: builtin/sparse-checkout.c:270
-#, fuzzy
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "no s'ha pogut establir el paràmetre extensions.worktreeConfig"
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "no s'ha pogut modificar la configuració de l'índex dispers"
-#: builtin/sparse-checkout.c:290
-#, fuzzy
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone]"
-
-#: builtin/sparse-checkout.c:310
-#, fuzzy
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
+#: builtin/sparse-checkout.c:847
msgid "initialize the sparse-checkout in cone mode"
msgstr "inicialitza el «sparse-checkout» en mode con"
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
+#: builtin/sparse-checkout.c:849
msgid "toggle the use of a sparse index"
-msgstr ""
+msgstr "commuta l'ús d'un índex dispers"
-#: builtin/sparse-checkout.c:340
-#, fuzzy
-msgid "failed to modify sparse-index config"
-msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s"
-
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:479
#, c-format
msgid "failed to open '%s'"
msgstr "s'ha produït un error en obrir «%s»"
-#: builtin/sparse-checkout.c:419
-#, fuzzy, c-format
+#: builtin/sparse-checkout.c:531
+#, c-format
msgid "could not normalize path %s"
-msgstr "no s'ha pogut normalitzar el camí"
+msgstr "no s'ha pogut normalitzar el camí %s"
-#: builtin/sparse-checkout.c:431
-#, fuzzy
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <patrons>)"
-
-#: builtin/sparse-checkout.c:456
-#, fuzzy, c-format
+#: builtin/sparse-checkout.c:560
+#, c-format
msgid "unable to unquote C-style string '%s'"
-msgstr "no s'ha pogut treure la cadena de l'estil C «%s»"
+msgstr "no s'ha pogut treure la cita a la cadena amb estil C «%s»"
-#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
-#, fuzzy
+#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
msgid "unable to load existing sparse-checkout patterns"
msgstr "no s'han pogut carregar els patrons de «sparse-checkout» existents"
-#: builtin/sparse-checkout.c:579
+#: builtin/sparse-checkout.c:619
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "els patrons de «sparse-checkout» existents no usen el mode con"
+
+#: builtin/sparse-checkout.c:707
+#, fuzzy
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr ""
+"executeu des del directori de nivell superior en mode que no sigui "
+"compatible"
+
+#: builtin/sparse-checkout.c:712
+#, fuzzy
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr ""
+"especifica els directoris en lloc dels patrons (sense barra inclinada)"
+
+#: builtin/sparse-checkout.c:714
+#, fuzzy
+msgid ""
+"specify directories rather than patterns. If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+"especifica els directoris en lloc dels patrons. Si el vostre directori "
+"comença amb un '!', passeu --skip-checks"
+
+#: builtin/sparse-checkout.c:716
+#, fuzzy
+msgid ""
+"specify directories rather than patterns. If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"especifica els directoris en lloc dels patrons. Si el vostre directori "
+"realment té alguna de '*?\\\\', passeu --skip-checks"
+
+#: builtin/sparse-checkout.c:732
+#, c-format, fuzzy
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with "
+"--skip-checks"
+msgstr ""
+"%%s' no és un directori; per tractar-lo com un directori de totes maneres, "
+"torneu a executar amb --skip-checks"
+
+#: builtin/sparse-checkout.c:734
+#, c-format, fuzzy
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"passa una barra d'inici abans dels camins com ara «%s» si voleu un sol "
+"fitxer (vegeu els problemes NO CONE al manual de git-sparse-checkout)."
+
+#: builtin/sparse-checkout.c:739
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+
+#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+#, fuzzy
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr ""
+"omet alguns controls de sanitat en els camins donats que podrien donar "
+"falsos positius"
+
+#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
msgid "read patterns from standard in"
msgstr "llegeix els patrons de l'entrada estàndard"
-#: builtin/sparse-checkout.c:594
-#, fuzzy
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout init [--cone]"
+#: builtin/sparse-checkout.c:760
+msgid "no sparse-checkout to add to"
+msgstr "no hi ha un sparse-checkout a afegir"
-#: builtin/sparse-checkout.c:613
-#, fuzzy
-msgid "git sparse-checkout disable"
-msgstr "git sparse-checkout init [--cone]"
+#: builtin/sparse-checkout.c:775
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
-#: builtin/sparse-checkout.c:644
+#: builtin/sparse-checkout.c:854
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"ha d'estar en un sparse-checkout per a tornar a aplicar patrons de dispersió"
+
+#: builtin/sparse-checkout.c:914
msgid "error while refreshing working directory"
msgstr "s'ha produït un error en actualitzar el directori de treball"
@@ -22600,12 +23119,10 @@
msgstr "git stash show [<opcions>] [<stash>]"
#: builtin/stash.c:26 builtin/stash.c:50
-#, fuzzy
msgid "git stash drop [-q|--quiet] [<stash>]"
msgstr "git stash drop [-q|--quiet] [<stash>]"
#: builtin/stash.c:27
-#, fuzzy
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
@@ -22613,28 +23130,24 @@
msgid "git stash branch <branchname> [<stash>]"
msgstr "git stash branch <nom-de-branca> [<stash>]"
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
-
#: builtin/stash.c:30
-#, fuzzy
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|-patch] [-k|-[no-]keep-index] [-q|--quiet] [-u|--include-"
-"untracked] [-a|-all] [-m|-message <message>] [--pathspec-from-file=<file> [--"
-"path-spec-file-nul]]"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n"
+" [--pathspec-from-file=<fitxer> [--pathspec-file-nul]]\n"
+" [--] [<pathspec>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<missatge>]"
#: builtin/stash.c:55
@@ -22659,6 +23172,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n"
" [--] [<pathspec>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<missatge>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22679,200 +23200,195 @@
msgstr "«%s» no és una referència vàlida"
#: builtin/stash.c:227
-#, fuzzy
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear amb paràmetres no està implementat"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
" %s -> %s\n"
" to make room.\n"
msgstr ""
+"AVÍS: El fitxer no seguit en el camí del fitxer seguit! S'està reanomenant\n"
+" %s -> %s\n"
+" per a fer-ne espai.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "no es pot aplicar un «stash» enmig d'una fusió"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "no s'ha pogut generar diff %s^!."
-#: builtin/stash.c:510
-#, fuzzy
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "no s'ha pogut desar l'arbre d'índex"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "no s'han pogut restaurar els fitxers no seguits des del «stash»"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "S'està fusionant %s amb %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "L'índex no estava «unstashed»."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "no s'han pogut restaurar els fitxers no seguits des del «stash»"
+
+#: builtin/stash.c:608 builtin/stash.c:695
msgid "attempt to recreate the index"
msgstr "intenta tornar a crear l'índex"
-#: builtin/stash.c:635
+#: builtin/stash.c:641
#, c-format
msgid "Dropped %s (%s)"
-msgstr "Descartat %s (%s)"
+msgstr "Descartada %s (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:644
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: no s'ha pogut descartar l'entrada «stash»"
-#: builtin/stash.c:651
+#: builtin/stash.c:657
#, c-format
msgid "'%s' is not a stash reference"
msgstr "«%s» no és una referència «stash»"
-#: builtin/stash.c:701
+#: builtin/stash.c:707
msgid "The stash entry is kept in case you need it again."
msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada."
-#: builtin/stash.c:724
+#: builtin/stash.c:730
msgid "No branch name specified"
msgstr "Cap nom de branca especificat"
-#: builtin/stash.c:808
-#, fuzzy
+#: builtin/stash.c:809
msgid "failed to parse tree"
-msgstr "s'ha produït un error en analitzar %s"
+msgstr "s'ha produït un error en analitzar l'arbre"
-#: builtin/stash.c:819
-#, fuzzy
+#: builtin/stash.c:820
msgid "failed to unpack trees"
-msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
+msgstr "s'ha produït un error en desempaquetar els arbres"
-#: builtin/stash.c:839
-#, fuzzy
+#: builtin/stash.c:840
msgid "include untracked files in the stash"
msgstr "inclou els fitxers no seguits a «stash»"
-#: builtin/stash.c:842
-#, fuzzy
+#: builtin/stash.c:843
msgid "only show untracked files in the stash"
-msgstr "inclou els fitxers no seguits a «stash»"
+msgstr "mostra només els fitxers no seguits a «stash»"
-#: builtin/stash.c:932 builtin/stash.c:969
+#: builtin/stash.c:930 builtin/stash.c:967
#, c-format
msgid "Cannot update %s with %s"
msgstr "No es pot actualitzar %s amb %s"
-#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
msgid "stash message"
msgstr "missatge «stash»"
-#: builtin/stash.c:960
+#: builtin/stash.c:958
msgid "\"git stash store\" requires one <commit> argument"
msgstr "«git stash store» requereix un argument <comissió>"
-#: builtin/stash.c:1175
+#: builtin/stash.c:1143
+msgid "No staged changes"
+msgstr "No hi ha canvis a «stage»"
+
+#: builtin/stash.c:1204
msgid "No changes selected"
msgstr "No hi ha canvis seleccionats"
-#: builtin/stash.c:1275
+#: builtin/stash.c:1304
msgid "You do not have the initial commit yet"
msgstr "Encara no teniu la comissió inicial"
-#: builtin/stash.c:1302
+#: builtin/stash.c:1331
msgid "Cannot save the current index state"
msgstr "No es pot desar l'estat d'índex actual"
-#: builtin/stash.c:1311
+#: builtin/stash.c:1340
msgid "Cannot save the untracked files"
msgstr "No es poden desar els fitxers no seguits"
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: builtin/stash.c:1351 builtin/stash.c:1370
msgid "Cannot save the current worktree state"
msgstr "No es pot desar l'estat d'arbre de treball actual"
-#: builtin/stash.c:1359
+#: builtin/stash.c:1361
+msgid "Cannot save the current staged state"
+msgstr "No es pot desar l'estat «stage» actual"
+
+#: builtin/stash.c:1398
msgid "Cannot record working tree state"
msgstr "No es pot registrar l'estat de l'arbre de treball"
-#: builtin/stash.c:1408
+#: builtin/stash.c:1447
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "No es poden usar --patch i --include-untracked o --all a la vegada"
-#: builtin/stash.c:1426
+#: builtin/stash.c:1458
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "No es poden usar --staged i --include-untracked o --all a la vegada"
+
+#: builtin/stash.c:1476
msgid "Did you forget to 'git add'?"
msgstr "Heu oblidat de fer «git add»?"
-#: builtin/stash.c:1441
+#: builtin/stash.c:1491
msgid "No local changes to save"
msgstr "No hi ha canvis locals a desar"
-#: builtin/stash.c:1448
+#: builtin/stash.c:1498
msgid "Cannot initialize stash"
msgstr "No es pot inicialitzar el magatzem"
-#: builtin/stash.c:1463
+#: builtin/stash.c:1513
msgid "Cannot save the current status"
msgstr "No es pot desar l'estat actual"
-#: builtin/stash.c:1468
+#: builtin/stash.c:1518
#, c-format
msgid "Saved working directory and index state %s"
msgstr "S'han desat el directori de treball i l'estat d'índex %s"
-#: builtin/stash.c:1558
+#: builtin/stash.c:1615
msgid "Cannot remove worktree changes"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1656 builtin/stash.c:1728
msgid "keep index"
msgstr "mantén l'índex"
-#: builtin/stash.c:1599 builtin/stash.c:1664
-#, fuzzy
-msgid "stash in patch mode"
-msgstr "stash en mode pedaç"
+#: builtin/stash.c:1658 builtin/stash.c:1730
+msgid "stash staged changes only"
+msgstr "fes «stash» només dels canvis «staged»"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1660 builtin/stash.c:1732
+msgid "stash in patch mode"
+msgstr "fes «stash» en mode pedaç"
+
+#: builtin/stash.c:1661 builtin/stash.c:1733
msgid "quiet mode"
msgstr "mode silenciós"
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:1663 builtin/stash.c:1735
msgid "include untracked files in stash"
msgstr "inclou els fitxers no seguits a «stash»"
-#: builtin/stash.c:1604 builtin/stash.c:1669
+#: builtin/stash.c:1665 builtin/stash.c:1737
msgid "include ignore files"
msgstr "inclou els fitxers ignorats"
-#: builtin/stash.c:1704
-#, fuzzy
-msgid ""
-"the stash.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"s'ha eliminat el suport «rebase.useBuiltin»! Per a més detalls vegeu la seva "
-"entrada a «git help config»."
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
-
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
@@ -22882,254 +23398,235 @@
msgid "prepend comment character and space to each line"
msgstr "anteposa el caràcter de comentari i un espai a cada línia"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424
+#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "S'espera un nom de referència ple, s'ha rebut %s"
-#: builtin/submodule--helper.c:64
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr "submodule--helper print-default-remote no pren cap argument"
-
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:103
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "no es pot despullar un component de l'url «%s»"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
-msgid "alternative anchor for relative paths"
-msgstr "àncora alternativa per als camins relatius"
-
-#: builtin/submodule--helper.c:415
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
-
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
-#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules"
-
-#: builtin/submodule--helper.c:525
-#, c-format
-msgid "Entering '%s'\n"
-msgstr "S'està entrant a «%s»\n"
-
-#: builtin/submodule--helper.c:528
-#, fuzzy, c-format
-msgid ""
-"run_command returned non-zero status for %s\n"
-"."
-msgstr ""
-"runcommand ha retornat un estat diferent de zero per als percentatges ."
-
-#: builtin/submodule--helper.c:550
-#, fuzzy, c-format
-msgid ""
-"run_command returned non-zero status while recursing in the nested "
-"submodules of %s\n"
-"."
-msgstr ""
-"runcommand ha retornat un estat diferent de zero mentre es repeteix als "
-"submòduls niats de percentatges ."
-
-#: builtin/submodule--helper.c:566
-#, fuzzy
-msgid "suppress output of entering each submodule command"
-msgstr "Omet la sortida en entrar l'ordre de cada submòdul"
-
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
-msgid "recurse into nested submodules"
-msgstr "inclou recursivament els submòduls imbricats"
-
-#: builtin/submodule--helper.c:573
-msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <ordre>"
-
-#: builtin/submodule--helper.c:600
+#: builtin/submodule--helper.c:213
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
-"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest repositori és "
-"el seu repositori font autoritzat."
+"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest repositori "
+"és el seu repositori font autoritzat."
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
+msgid "alternative anchor for relative paths"
+msgstr "àncora alternativa per als camins relatius"
+
+#: builtin/submodule--helper.c:418
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
+
+#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
+#: builtin/submodule--helper.c:640
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules"
+
+#: builtin/submodule--helper.c:528
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "S'està entrant a «%s»\n"
+
+#: builtin/submodule--helper.c:531
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command ha retornat un estat diferent de zero per a %s\n"
+"."
+
+#: builtin/submodule--helper.c:553
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested submodules of %s\n"
+"."
+msgstr ""
+"run_command ha retornat un estat diferent de zero mentre es treballava recursivament als submòduls imbricats de %s\n"
+"."
+
+#: builtin/submodule--helper.c:569
+msgid "suppress output of entering each submodule command"
+msgstr "omet la sortida en entrar a cada ordre del submòdul"
+
+#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1458
+msgid "recurse into nested submodules"
+msgstr "inclou recursivament els submòduls imbricats"
+
+#: builtin/submodule--helper.c:576
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <ordre>"
+
+#: builtin/submodule--helper.c:654
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "S'ha produït un error en registrar l'url per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:658
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n"
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:668
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"advertència: se suggereix el mode d'actualització per ordre per al submòdul "
"«%s»\n"
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:675
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"S'ha produït un error en registrar el mode d'actualització per al camí de "
"submòdul «%s»"
-#: builtin/submodule--helper.c:710
-#, fuzzy
+#: builtin/submodule--helper.c:697
msgid "suppress output for initializing a submodule"
-msgstr "Omet la sortida d'inicialitzar un submòdul"
+msgstr "omet la sortida en inicialitzar un submòdul"
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:702
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opcions>] [<camí>]"
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»"
+msgstr "no s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»"
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "no s'ha pogut resoldre la referència a HEAD dins del submòdul «%s»"
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
-#, fuzzy
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
msgid "suppress submodule status output"
-msgstr "Suprimeix la sortida de l'estat del submòdul"
+msgstr "suprimeix la sortida de l'estat del submòdul"
-#: builtin/submodule--helper.c:888
-#, fuzzy
+#: builtin/submodule--helper.c:875
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-"Utilitza la comissió emmagatzemada a l'índex en lloc de la emmagatzemada al "
-"submòdul HEAD"
+"utilitza la comissió emmagatzemada a l'índex en lloc de l'emmagatzemada al "
+"HEAD del submòdul"
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]"
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <camí>"
-#: builtin/submodule--helper.c:990
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:977
+#, c-format
msgid "* %s %s(blob)->%s(submodule)"
-msgstr "* el %s(blob)->%s(submòdul)"
+msgstr "* %s %s(blob)->%s(submòdul)"
+
+#: builtin/submodule--helper.c:980
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(submòdul)->%s(blob)"
#: builtin/submodule--helper.c:993
-#, fuzzy, c-format
-msgid "* %s %s(submodule)->%s(blob)"
-msgstr "* un %s per cents(submòdul)->%s(blob)"
-
-#: builtin/submodule--helper.c:1006
-#, fuzzy, c-format
+#, c-format
msgid "%s"
-msgstr "percentatges"
+msgstr "%s"
-#: builtin/submodule--helper.c:1056
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1043
+#, c-format
msgid "couldn't hash object from '%s'"
-msgstr "no s'ha pogut analitzar l'objecte «%s»"
+msgstr "no s'ha pogut fer el resum de l'objecte de «%s»"
-#: builtin/submodule--helper.c:1060
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1047
+#, c-format
msgid "unexpected mode %o\n"
-msgstr "mode inesperat $mod_dst"
+msgstr "mode inesperat %o\n"
-#: builtin/submodule--helper.c:1301
-#, fuzzy
+#: builtin/submodule--helper.c:1288
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
-"Utilitza la comissió emmagatzemada a l'índex en lloc de la emmagatzemada al "
-"submòdul HEAD"
+"utilitza la comissió emmagatzemada a l'índex en lloc de l'emmagatzemada al "
+"HEAD del submòdul"
-#: builtin/submodule--helper.c:1303
-#, fuzzy
-msgid "to compare the commit in the index with that in the submodule HEAD"
+#: builtin/submodule--helper.c:1290
+msgid "compare the commit in the index with that in the submodule HEAD"
msgstr ""
-"Utilitza la comissió emmagatzemada a l'índex en lloc de la emmagatzemada al "
-"submòdul HEAD"
+"compara la comissió emmagatzemada a l'índex en lloc de l'emmagatzemada al "
+"HEAD del submòdul"
-#: builtin/submodule--helper.c:1305
-#, fuzzy
+#: builtin/submodule--helper.c:1292
msgid "skip submodules with 'ignore_config' value set to 'all'"
-msgstr "omet els submòduls amb el valor «ignoreconfig» establert a «all»"
+msgstr "omet els submòduls amb el valor «ignore_config» establert a «all»"
-#: builtin/submodule--helper.c:1307
-#, fuzzy
+#: builtin/submodule--helper.c:1294
msgid "limit the summary size"
-msgstr "limita a caps"
+msgstr "limita la mida del resum"
-#: builtin/submodule--helper.c:1312
-#, fuzzy
+#: builtin/submodule--helper.c:1299
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
-msgstr "git submodule--helper init [<opcions>] [<camí>]"
+msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
-#: builtin/submodule--helper.c:1336
-#, fuzzy
+#: builtin/submodule--helper.c:1323
msgid "could not fetch a revision for HEAD"
-msgstr "no s'ha pogut separar HEAD"
+msgstr "no s'ha pogut obtenir una revisió per a HEAD"
-#: builtin/submodule--helper.c:1341
-#, fuzzy
-msgid "--cached and --files are mutually exclusive"
-msgstr "-n i -k són mútuament excloents"
-
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1384
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "S'està sincronitzant l'url del submòdul per a «%s»\n"
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1390
#, c-format
msgid "failed to register url for submodule path '%s'"
-msgstr "s'ha produït un error en registrar l'url per al camí del submòdul «%s»"
+msgstr ""
+"s'ha produït un error en registrar l'url per al camí del submòdul «%s»"
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1399
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
"s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»"
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1409
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»"
-#: builtin/submodule--helper.c:1486
-#, fuzzy
+#: builtin/submodule--helper.c:1456
msgid "suppress output of synchronizing submodule url"
-msgstr "Omet la sortida de la sincronització de l'url del submòdul"
+msgstr "omet la sortida de la sincronització de l'URL del submòdul"
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1463
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
-#: builtin/submodule--helper.c:1547
+#: builtin/submodule--helper.c:1513
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"L'arbre de treball de submòdul «%s» conté un directori .git\n"
-"(useu «rm -rf» si realment voleu eliminar-lo, incloent tota la seva història)"
+"L'arbre de treball del submòdul «%s» conté un directori .git. Aquest es "
+"reemplaçarà amb un fitxer a .git mitjançant l'ús d'«absorbgitdirs»."
-#: builtin/submodule--helper.c:1559
+#: builtin/submodule--helper.c:1530
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23138,209 +23635,225 @@
"L'arbre de treball del submòdul «%s» conté modificacions locals; useu «-f» "
"per a descartar-les"
-#: builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1538
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "S'ha esborrat el directori «%s»\n"
-#: builtin/submodule--helper.c:1569
+#: builtin/submodule--helper.c:1540
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul «%s»\n"
-#: builtin/submodule--helper.c:1580
+#: builtin/submodule--helper.c:1551
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "no s'ha pogut crear el directori de submòdul buit %s"
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1567
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "S'ha desregistrat el submòdul «%s» (%s) per al camí «%s»\n"
-#: builtin/submodule--helper.c:1625
-#, fuzzy
+#: builtin/submodule--helper.c:1596
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
-"Elimina els arbres de treball dels submòduls fins i tot si contenen canvis "
+"elimina els arbres de treball dels submòduls fins i tot si contenen canvis "
"locals"
-#: builtin/submodule--helper.c:1626
-#, fuzzy
+#: builtin/submodule--helper.c:1597
msgid "unregister all submodules"
-msgstr "Desregistra recursivament tots els submòduls"
+msgstr "desregistra tots els submòduls"
-#: builtin/submodule--helper.c:1631
+#: builtin/submodule--helper.c:1602
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]"
-#: builtin/submodule--helper.c:1645
+#: builtin/submodule--helper.c:1616
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Useu «--all» si realment voleu desinicialitzar tots els submòduls"
-#: builtin/submodule--helper.c:1714
-#, fuzzy
+#: builtin/submodule--helper.c:1665
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
"'--reference-if-able' instead of '--reference'."
msgstr ""
-"Un càlcul alternatiu d'un superprojecte no és vàlid. Per permetre que Git "
-"cloni sense una alternativa en aquest cas establiu submòdul."
-"alternateErrorStrategy a 'info' o clona equivalentment amb «--reference-if-"
-"able' en lloc de «--reference»."
+"Un càlcul alternatiu des d'un alternatiu d'un superprojecte no és vàlid.\n"
+"Per a permetre que Git cloni sense una alternativa en aquests casos, establiu\n"
+"submodule.alternateErrorStrategy a «info» o bé cloneu amb\n"
+"«--reference-if-able' en comptes de «--reference»."
-#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
+#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "el submòdul «%s» no pot afegir un alternatiu: %s"
-#: builtin/submodule--helper.c:1792
+#: builtin/submodule--helper.c:1749
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "No es reconeix el valor «%s» per a submodule.alternateErrorStrategy"
-#: builtin/submodule--helper.c:1799
+#: builtin/submodule--helper.c:1756
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation"
-#: builtin/submodule--helper.c:1823
-msgid "where the new submodule will be cloned to"
-msgstr "a on es clonarà el submòdul nou"
+#: builtin/submodule--helper.c:1781
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "s'ha rebutjat crear/usar «%s» en el directori git d'un altre submòdul"
#: builtin/submodule--helper.c:1826
-msgid "name of the new submodule"
-msgstr "nom del submòdul nou"
-
-#: builtin/submodule--helper.c:1829
-msgid "url where to clone the submodule from"
-msgstr "url del qual clonar el submòdul"
-
-#: builtin/submodule--helper.c:1837
-msgid "depth for shallow clones"
-msgstr "profunditat dels clons superficials"
-
-#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
-msgid "force cloning progress"
-msgstr "força el progrés del clonatge"
-
-#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351
-msgid "disallow cloning into non-empty directory"
-msgstr "no permetis clonar en un directori no buit"
-
-#: builtin/submodule--helper.c:1849
-#, fuzzy
-msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
-msgstr ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [---reference "
-"<repository>] [--name <name>] [--depth <] [---single-branch] --url <url> --"
-"path <path>"
-
-#: builtin/submodule--helper.c:1874
-#, fuzzy, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr "refusant crear/usar '%s' en el directori git d'un altre submòdul"
-
-#: builtin/submodule--helper.c:1885
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat"
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:1831
#, c-format
msgid "directory not empty: '%s'"
msgstr "directori no buit: «%s»"
-#: builtin/submodule--helper.c:1901
+#: builtin/submodule--helper.c:1843
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»"
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1876
+msgid "where the new submodule will be cloned to"
+msgstr "a on es clonarà el submòdul nou"
+
+#: builtin/submodule--helper.c:1879
+msgid "name of the new submodule"
+msgstr "nom del submòdul nou"
+
+#: builtin/submodule--helper.c:1882
+msgid "url where to clone the submodule from"
+msgstr "url del qual clonar el submòdul"
+
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
+msgid "depth for shallow clones"
+msgstr "profunditat dels clons superficials"
+
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
+#: builtin/submodule--helper.c:3376
+msgid "force cloning progress"
+msgstr "força el progrés del clonatge"
+
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
+msgid "disallow cloning into non-empty directory"
+msgstr "no permetis clonar en un directori no buit"
+
+#: builtin/submodule--helper.c:1903
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>]--url <url> --path <path>"
+msgstr ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>]--url <url> --path <path>"
+
+#: builtin/submodule--helper.c:1943
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Mode d'actualització «%s» no vàlid per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:1941
+#: builtin/submodule--helper.c:1947
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Mode d'actualització «%s» configurat no vàlid per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:2042
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "El camí de submòdul «%s» no està inicialitzat"
-#: builtin/submodule--helper.c:2046
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Potser voleu usar «update --init»?"
-#: builtin/submodule--helper.c:2076
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "S'està ometent el submòdul no fusionat %s"
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "S'està ometent el submòdul «%s»"
-#: builtin/submodule--helper.c:2255
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent"
-#: builtin/submodule--helper.c:2266
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant"
-#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574
-msgid "path into the working tree"
-msgstr "camí a l'arbre de treball"
-
-#: builtin/submodule--helper.c:2331
-msgid "path into the working tree, across nested submodule boundaries"
-msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats"
-
-#: builtin/submodule--helper.c:2335
-msgid "rebase, merge, checkout or none"
-msgstr "rebase, merge, checkout o none"
-
-#: builtin/submodule--helper.c:2341
-#, fuzzy
-msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
-
-#: builtin/submodule--helper.c:2344
-msgid "parallel jobs"
-msgstr "tasques paral·leles"
-
-#: builtin/submodule--helper.c:2346
-msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat"
-
-#: builtin/submodule--helper.c:2347
-msgid "don't print cloning progress"
-msgstr "no imprimeixis el progrés del clonatge"
-
-#: builtin/submodule--helper.c:2358
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update-clone [--prefix=<camí>] [<camí>...]"
-
#: builtin/submodule--helper.c:2371
-msgid "bad value for update parameter"
-msgstr "valor incorrecte per al paràmetre update"
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "No s'ha pogut agafar «%s» en el camí de submòdul «%s»"
-#: builtin/submodule--helper.c:2419
+#: builtin/submodule--helper.c:2375
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "No s'ha pogut fer «rebase» «%s» en el camí de submòdul «%s»"
+
+#: builtin/submodule--helper.c:2379
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "No s'ha pogut fusionar «%s» en el camí de submòdul «%s»"
+
+#: builtin/submodule--helper.c:2383
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "L'execució de «%s %s» ha fallat en el camí de submòdul «%s»"
+
+#: builtin/submodule--helper.c:2402
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Camí de submòdul «%s»: s'ha agafat «%s»\n"
+
+#: builtin/submodule--helper.c:2406
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Camí de submòdul «%s»: s'ha fet «rebase» en «%s»\n"
+
+#: builtin/submodule--helper.c:2410
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Camí de submòdul «%s»: s'ha fusionat en «%s»\n"
+
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "El camí de submòdul «%s»: '%s %s'\n"
+
+#: builtin/submodule--helper.c:2438
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"No s'ha pogut obtenir en el camí de submòdul «$%s»; s'està intentant obtenir"
+" directament %s:"
+
+#: builtin/submodule--helper.c:2447
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"S'ha obtingut en un camí de submòdul «%s», però no contenia %s. L'obtenció "
+"directa d'aquesta comissió ha fallat."
+
+#: builtin/submodule--helper.c:2481
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23349,94 +23862,288 @@
"La branca de submòdul (%s) està configurada per a heretar la branca del "
"superprojecte, però el superprojecte no és en cap branca"
-#: builtin/submodule--helper.c:2542
+#: builtin/submodule--helper.c:2499
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "no s'ha pogut obtenir el gestor del repositori pel submòdul «%s»"
-#: builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2588
+#, c-format, fuzzy
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr "No s'ha pogut trobar la revisió actual al camí del submòdul «%s»"
+
+#: builtin/submodule--helper.c:2599
+#, c-format, fuzzy
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "No s'ha pogut recuperar el camí del submòdul «%s»"
+
+#: builtin/submodule--helper.c:2604
+#, c-format, fuzzy
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr ""
+"No s'ha pogut trobar la revisió de percentatges en el camí del submòdul «%s»"
+
+#: builtin/submodule--helper.c:2640
+#, c-format, fuzzy
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "No s'ha pogut tornar a repetir al camí del submòdul «%s»"
+
+#: builtin/submodule--helper.c:2699
+msgid "force checkout updates"
+msgstr "força les actualitzacions"
+
+#: builtin/submodule--helper.c:2701
+msgid "initialize uninitialized submodules before update"
+msgstr "inicialitza els submòduls sense inicialitzar abans d'actualitzar"
+
+#: builtin/submodule--helper.c:2703
+#, fuzzy
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "utilitza SHA-1 de la branca de seguiment remota del submòdul"
+
+#: builtin/submodule--helper.c:2705
+#, fuzzy
+msgid "traverse submodules recursively"
+msgstr "traverteix els submòduls recursivament"
+
+#: builtin/submodule--helper.c:2707
+msgid "don't fetch new objects from the remote site"
+msgstr "no obtinguis els objectes nous del lloc remot"
+
+#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+msgid "path into the working tree"
+msgstr "camí a l'arbre de treball"
+
+#: builtin/submodule--helper.c:2713
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats"
+
+#: builtin/submodule--helper.c:2717
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout o none"
+
+#: builtin/submodule--helper.c:2723
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "crea un clon superficial truncat al nombre de revisions especificat"
+
+#: builtin/submodule--helper.c:2726
+msgid "parallel jobs"
+msgstr "tasques paral·leles"
+
+#: builtin/submodule--helper.c:2728
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat"
+
+#: builtin/submodule--helper.c:2729
+msgid "don't print cloning progress"
+msgstr "no imprimeixis el progrés del clonatge"
+
+#: builtin/submodule--helper.c:2741
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] "
+"[--[no-]recommend-shallow] [--reference <repository>] [--recursive] "
+"[--[no-]single-branch] [--] [<path>...]"
+msgstr ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] "
+"[--[no-]recommend-shallow] [--reference <repository>] [--recursive] "
+"[--[no-]single-branch] [--] [<path>...]"
+
+#: builtin/submodule--helper.c:2767
+msgid "bad value for update parameter"
+msgstr "valor incorrecte per al paràmetre update"
+
+#: builtin/submodule--helper.c:2893
msgid "recurse into submodules"
msgstr "inclou recursivament als submòduls"
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2899
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opcions>] [<camí>...]"
-#: builtin/submodule--helper.c:2637
+#: builtin/submodule--helper.c:2955
msgid "check if it is safe to write to the .gitmodules file"
msgstr "comprova si és segur escriure al fitxer .gitmodules"
-#: builtin/submodule--helper.c:2640
-#, fuzzy
+#: builtin/submodule--helper.c:2958
msgid "unset the config in the .gitmodules file"
-msgstr "no s'ha definit la configuració al fitxer .gitmodules"
+msgstr "desconfigura l'opció de configuració al fitxer .gitmodules"
-#: builtin/submodule--helper.c:2645
-#, fuzzy
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper config <name> [<value>]"
-msgstr "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <nom> [<valor>]"
-#: builtin/submodule--helper.c:2646
-#, fuzzy
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper config --unset <name>"
-msgstr "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <nom>"
-#: builtin/submodule--helper.c:2647
-msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper config --check-writeable"
-
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, fuzzy, sh-format
+#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
+#: builtin/submodule--helper.c:3395
msgid "please make sure that the .gitmodules file is in the working tree"
-msgstr "Assegureu-vos que el fitxer .gitmodules és a l'arbre de treball"
+msgstr "assegureu-vos que el fitxer .gitmodules és a l'arbre de treball"
-#: builtin/submodule--helper.c:2682
-#, fuzzy
+#: builtin/submodule--helper.c:3000
msgid "suppress output for setting url of a submodule"
-msgstr "Omet la sortida d'inicialitzar un submòdul"
+msgstr "omet la sortida en configurar un URL d'un submòdul"
-#: builtin/submodule--helper.c:2686
-#, fuzzy
+#: builtin/submodule--helper.c:3004
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
-msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
+msgstr "git submodule--helper set-url [--quiet] <path> <newurl>"
-#: builtin/submodule--helper.c:2719
-#, fuzzy
+#: builtin/submodule--helper.c:3037
msgid "set the default tracking branch to master"
-msgstr "mostra les branques amb seguiment remot"
+msgstr "estableix la branca de seguiment per defecte a «master»"
-#: builtin/submodule--helper.c:2721
-#, fuzzy
+#: builtin/submodule--helper.c:3039
msgid "set the default tracking branch"
-msgstr "mostra les branques amb seguiment remot"
+msgstr "estableix la branca de seguiment per defecte"
-#: builtin/submodule--helper.c:2725
-#, fuzzy
+#: builtin/submodule--helper.c:3043
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
-msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
+msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
-#: builtin/submodule--helper.c:2726
-#, fuzzy
+#: builtin/submodule--helper.c:3044
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
-msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
+msgstr ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
-#: builtin/submodule--helper.c:2733
-#, fuzzy
+#: builtin/submodule--helper.c:3051
msgid "--branch or --default required"
-msgstr "cal el nom de branca"
+msgstr "cal --branch o --default"
-#: builtin/submodule--helper.c:2736
+#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+msgid "print only error messages"
+msgstr "mostra només els missatges d'error"
+
+#: builtin/submodule--helper.c:3073
+msgid "force creation"
+msgstr "força la creació"
+
+#: builtin/submodule--helper.c:3081
#, fuzzy
-msgid "--branch and --default are mutually exclusive"
-msgstr "--deepen i --depth són mútuament excloents"
+msgid "show whether the branch would be created"
+msgstr "mostra si es crearà la branca"
-#: builtin/submodule--helper.c:2793 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3085
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] "
+"[-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] "
+"[-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"
+
+#: builtin/submodule--helper.c:3097
+#, c-format
+msgid "creating branch '%s'"
+msgstr "s'està creant la branca «%s»"
+
+#: builtin/submodule--helper.c:3155
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "S'està afegint el repositori existent a «%s» a l'índex\n"
+
+#: builtin/submodule--helper.c:3158
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "«%s» ja existeix i no és un repositori de git vàlid"
+
+#: builtin/submodule--helper.c:3171
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "S'ha trobat un directori de git per a «%s» localment amb els remots:\n"
+
+#: builtin/submodule--helper.c:3178
+#, c-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" %s\n"
+"use the '--force' option. If the local git directory is not the correct repo\n"
+"or you are unsure what this means choose another name with the '--name' option."
+msgstr ""
+"Si voleu reusar aquest directori de git local en comptes de clonar de nou de\n"
+" %s\n"
+"useu l'opció «--force». Si el directori de git local no és el repositori correcte\n"
+"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció «--name»."
+
+#: builtin/submodule--helper.c:3190
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "S'està reactivant el directori de git local per al submòdul «%s»\n"
+
+#: builtin/submodule--helper.c:3227
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "no s'ha pogut agafar el submòdul «%s»"
+
+#: builtin/submodule--helper.c:3266
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "S'ha produït un error en afegir el submòdul «%s»"
+
+#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
+#: builtin/submodule--helper.c:3283
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "S'ha produït un error en registrar el submòdul «%s»"
+
+#: builtin/submodule--helper.c:3339
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "«%s» ja existeix en l'índex"
+
+#: builtin/submodule--helper.c:3342
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "«%s» ja existeix en l'índex i no és submòdul"
+
+#: builtin/submodule--helper.c:3372
+msgid "branch of repository to add as submodule"
+msgstr "la branca del repositori a afegir com a submòdul"
+
+#: builtin/submodule--helper.c:3373
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "permet afegir un camí de submòdul que si no s'hagués ignorat"
+
+#: builtin/submodule--helper.c:3379
+msgid "borrow the objects from reference repositories"
+msgstr "manlleva els objectes dels repositoris de referències"
+
+#: builtin/submodule--helper.c:3381
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"estableix el nom del submòdul a la cadena donada en lloc de per defecte al "
+"seu camí"
+
+#: builtin/submodule--helper.c:3388
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<opcions>] [--] <repositori> [<camí>]"
+
+#: builtin/submodule--helper.c:3416
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"El camí relatiu només es pot usar des del nivell superior de l'arbre de "
+"treball"
+
+#: builtin/submodule--helper.c:3425
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "URL de repositori: «%s» ha de ser absolut o començar amb ./|../"
+
+#: builtin/submodule--helper.c:3460
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "«%s» no és un nom de submòdul vàlid"
+
+#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no admet --super-prefix"
-#: builtin/submodule--helper.c:2799
+#: builtin/submodule--helper.c:3526
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "«%s» no és una subordre vàlida de submodule--helper"
@@ -23461,54 +24168,49 @@
msgid "shorten ref output"
msgstr "escurça la sortida de referències"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "raó"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "raó de l'actualització"
-#: builtin/tag.c:25
-#, fuzzy
+#: builtin/tag.c:26
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <fitxer>]\n"
+" <tagname> [<head>]"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nom-d'etiqueta>..."
-#: builtin/tag.c:28
-#, fuzzy
+#: builtin/tag.c:29
msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
-"[<pattern>...]"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"
msgstr ""
-"git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] "
-"[--points-at <objecte>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<comissió>]] [<patró>...]"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
+" [--format=<format>] [--merged <comissió>] [--no-merged <comissió>] [<patró>...]"
-#: builtin/tag.c:30
+#: builtin/tag.c:31
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "tag '%s' not found."
msgstr "no s'ha trobat l'etiqueta «%s»."
-#: builtin/tag.c:135
+#: builtin/tag.c:136
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "S'ha suprimit l'etiqueta «%s» (era %s)\n"
-#: builtin/tag.c:170
+#: builtin/tag.c:171
#, c-format
msgid ""
"\n"
@@ -23521,169 +24223,149 @@
" %s\n"
"Les línies que comencin amb «%c» s'ignoraran.\n"
-#: builtin/tag.c:174
+#: builtin/tag.c:175
#, c-format
msgid ""
"\n"
"Write a message for tag:\n"
" %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you "
-"want to.\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
msgstr ""
"\n"
"Escriviu el missatge de l'etiqueta:\n"
" %s\n"
-"Les línies que comencin amb «%c» es retindran; podeu eliminar-les per vós "
-"mateix si voleu.\n"
+"Les línies que comencin amb «%c» es retindran; podeu eliminar-les per vós mateix si voleu.\n"
#: builtin/tag.c:241
msgid "unable to sign the tag"
msgstr "no s'ha pogut signar l'etiqueta"
#: builtin/tag.c:259
-#, fuzzy, c-format
+#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"already a tag. If you meant to tag the object that it points to, use:\n"
"\n"
"\tgit tag -f %s %s^{}"
msgstr ""
-"Heu creat una etiqueta niada. L'objecte al qual fa referència la vostra nova "
-"etiqueta ja és una etiqueta. Si voleu etiquetar l'objecte que apunta per "
-"utilitzar l'etiqueta git -f%s%s perds^{}"
+"Heu creat una etiqueta embrincada. L'objecte al qual fa referència la nova\n"
+"etiqueta ja és una etiqueta. Si voleu etiquetar l'objecte al qual apunta, useu:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
#: builtin/tag.c:275
msgid "bad object type."
msgstr "el tipus d'objecte és incorrecte."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "no hi ha cap missatge d'etiqueta?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "S'ha deixat el missatge de l'etiqueta en %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:445
msgid "list tag names"
msgstr "llista els noms d'etiqueta"
-#: builtin/tag.c:448
+#: builtin/tag.c:447
msgid "print <n> lines of each tag message"
msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
-#: builtin/tag.c:450
+#: builtin/tag.c:449
msgid "delete tags"
msgstr "suprimeix les etiquetes"
-#: builtin/tag.c:451
+#: builtin/tag.c:450
msgid "verify tags"
msgstr "verifica les etiquetes"
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "Tag creation options"
msgstr "Opcions de creació d'etiquetes"
-#: builtin/tag.c:455
+#: builtin/tag.c:454
msgid "annotated tag, needs a message"
msgstr "etiqueta anotada, necessita un missatge"
-#: builtin/tag.c:457
+#: builtin/tag.c:456
msgid "tag message"
msgstr "missatge d'etiqueta"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
msgid "force edit of tag message"
msgstr "força l'edició del missatge de l'etiqueta"
-#: builtin/tag.c:460
+#: builtin/tag.c:459
msgid "annotated and GPG-signed tag"
msgstr "etiqueta anotada i signada per GPG"
-#: builtin/tag.c:463
+#: builtin/tag.c:462
msgid "use another key to sign the tag"
msgstr "usa una altra clau per a signar l'etiqueta"
-#: builtin/tag.c:464
+#: builtin/tag.c:463
msgid "replace the tag if exists"
msgstr "reemplaça l'etiqueta si existeix"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:464 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "crea un registre de referències"
-#: builtin/tag.c:467
+#: builtin/tag.c:466
msgid "Tag listing options"
msgstr "Opcions de llistat d'etiquetes"
-#: builtin/tag.c:468
+#: builtin/tag.c:467
msgid "show tag list in columns"
msgstr "mostra la llista d'etiquetes en columnes"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that contain the commit"
msgstr "imprimeix només les etiquetes que continguin la comissió"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:469 builtin/tag.c:471
msgid "print only tags that don't contain the commit"
msgstr "imprimeix només les etiquetes que no continguin la comissió"
-#: builtin/tag.c:473
+#: builtin/tag.c:472
msgid "print only tags that are merged"
msgstr "imprimeix només les etiquetes que s'han fusionat"
-#: builtin/tag.c:474
+#: builtin/tag.c:473
msgid "print only tags that are not merged"
msgstr "imprimeix només les etiquetes que no s'han fusionat"
-#: builtin/tag.c:478
+#: builtin/tag.c:477
msgid "print only tags of the object"
msgstr "imprimeix només les etiquetes de l'objecte"
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column i -n són incompatibles"
+#: builtin/tag.c:559
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "l'opció «%s» només està permesa en mode de llista"
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "es permet l'opció -n només amb mode llista"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "es permet l'opció --contains només amb mode llista"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "es permet l'opció --no-contains només amb mode llista"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "es permet --points-at option només amb mode llista"
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "es permeten les opcions --merged i --no-merged només amb mode llista"
-
-#: builtin/tag.c:567
-msgid "only one -F or -m option is allowed."
-msgstr "només es permet una opció -F o -m."
-
-#: builtin/tag.c:592
+#: builtin/tag.c:598
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "«%s» no és un nom d'etiqueta vàlid."
-#: builtin/tag.c:597
+#: builtin/tag.c:603
#, c-format
msgid "tag '%s' already exists"
msgstr "l'etiqueta «%s» ja existeix"
-#: builtin/tag.c:628
+#: builtin/tag.c:634
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta «%s» actualitzada (era %s)\n"
+#: builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "el paquet supera la mida màxima permesa"
+
#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr "S'estan desempaquetant els objectes"
@@ -23693,226 +24375,220 @@
msgid "failed to create directory %s"
msgstr "s'ha produït un error en crear el directori %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "s'ha produït un error en crear el fitxer %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "s'ha produït un error en suprimir el fitxer %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "s'ha produït un error en suprimir el directori %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "S'està provant mtime en «%s» "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr ""
"la informació de stat de directori no canvia després d'afegir un fitxer nou"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"la informació de stat de directori no canvia després d'afegir un directori "
"nou"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr ""
"la informació de stat de directori canvia després d'actualitzar un fitxer"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"la informació de stat de directori canvia després d'afegir un fitxer dins "
"d'un subdirectori"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr ""
"la informació de stat de directori no canvia després de suprimir un fitxer"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr ""
-"la informació de stat de directori no canvia després de suprimir un directori"
+"la informació de stat de directori no canvia després de suprimir un "
+"directori"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " D'acord"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:993
msgid "continue refresh even when index needs update"
msgstr ""
"continua l'actualització encara que l'índex necessiti una actualització"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:996
msgid "refresh: ignore submodules"
msgstr "actualitza: ignora els submòduls"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:999
msgid "do not ignore new files"
msgstr "no ignoris els fitxers nous"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:1001
msgid "let files replace directories and vice-versa"
msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1003
msgid "notice files missing from worktree"
msgstr "tingues en compte els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:1005
msgid "refresh even if index contains unmerged entries"
msgstr "actualitza encara que l'índex contingui entrades no fusionades"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1008
msgid "refresh stat information"
msgstr "actualitza la informació d'estadístiques"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1012
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "com --refresh, però ignora el paràmetre assume-unchanged"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1016
msgid "<mode>,<object>,<path>"
msgstr "<mode>,<objecte>,<camí>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1017
msgid "add the specified entry to the index"
msgstr "afegeix l'entrada especificada a l'índex"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1027
msgid "mark files as \"not changing\""
msgstr "marca els fitxers com a «no canviant»"
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1030
msgid "clear assumed-unchanged bit"
msgstr "esborra el bit assumed-unchanged"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1033
msgid "mark files as \"index-only\""
msgstr "marca els fitxers com a «només índex»"
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1036
msgid "clear skip-worktree bit"
msgstr "esborra el bit skip-worktree"
-#: builtin/update-index.c:1022
-#, fuzzy
+#: builtin/update-index.c:1039
msgid "do not touch index-only entries"
-msgstr "no toquis entrades de només índex"
+msgstr "no toquis les entrades de només índex"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1041
msgid "add to index only; do not add content to object database"
msgstr ""
"només afegeix a l'índex; no afegeixis el contingut a la base de dades "
"d'objectes"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1043
msgid "remove named paths even if present in worktree"
msgstr ""
"elimina els camins anomenats encara que estiguin presents en l'arbre de "
"treball"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1045
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "amb --stdin: les línies d'entrada acaben amb octets nuls"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1047
msgid "read list of paths to be updated from standard input"
msgstr "llegeix la llista de camins a actualitzar des de l'entrada estàndard"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1051
msgid "add entries from standard input to the index"
msgstr "afegeix les entrades de l'entrada estàndard a l'índex"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1055
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "reemplena les «stage» #2 i #3 per als camins llistats"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1059
msgid "only update entries that differ from HEAD"
msgstr "només actualitza les entrades que difereixin de HEAD"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1063
msgid "ignore files missing from worktree"
msgstr "ignora els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1066
msgid "report actions to standard output"
msgstr "informa de les accions en la sortida estàndard"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1068
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1072
msgid "write index in this format"
msgstr "escriu l'índex en aquest format"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1074
msgid "enable or disable split index"
msgstr "habilita o inhabilita l'índex dividit"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1076
msgid "enable/disable untracked cache"
msgstr "habilita/inhabilita la memòria cau no seguida"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1078
msgid "test if the filesystem supports untracked cache"
msgstr "prova si el sistema de fitxers admet la memòria cau no seguida"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1080
msgid "enable untracked cache without testing the filesystem"
msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers"
-#: builtin/update-index.c:1065
-#, fuzzy
+#: builtin/update-index.c:1082
msgid "write out the index even if is not flagged as changed"
msgstr "escriu l'índex encara que no estigui marcat com a canviat"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1084
msgid "enable or disable file system monitor"
msgstr "habilita o inhabilita el monitor del sistema de fitxers"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1086
msgid "mark files as fsmonitor valid"
msgstr "marca els fitxers com a vàlids pel fsmonitor"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1089
msgid "clear fsmonitor valid bit"
msgstr "esborra el bit de validesa del fsmonitor"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1195
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment "
-"voleu habilitar l'índex dividit"
+"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment"
+" voleu habilitar l'índex dividit"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1204
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment "
-"voleu inhabilitar l'índex dividit"
+"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment"
+" voleu inhabilitar l'índex dividit"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1216
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23920,41 +24596,41 @@
"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
"realment voleu inhabilitar el cau no seguit"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1220
msgid "Untracked cache disabled"
msgstr "La memòria cau no seguida està inhabilitada"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1228
msgid ""
-"core.untrackedCache is set to false; remove or change it, if you really want "
-"to enable the untracked cache"
+"core.untrackedCache is set to false; remove or change it, if you really want"
+" to enable the untracked cache"
msgstr ""
"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
"realment voleu habilitar el cau no seguit"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1232
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "La memòria cau no seguida està habilitada per a «%s»"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1241
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor està establert a fals; establiu-lo a cert si realment voleu "
"habilitar fsmonitor"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1246
msgid "fsmonitor enabled"
msgstr "fsmonitor habilitat"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1250
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor està establert a cert; elimineu-lo si realment voleu "
"inhabilitar fsmonitor"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1254
msgid "fsmonitor disabled"
msgstr "fsmonitor inhabilitat"
@@ -23965,32 +24641,29 @@
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
-"git update-ref [<opcions>] <nom-de-referència> <valor-nou> [<valor-antic>]"
+"git update-ref [<opcions>] <nom-de-referència> <valor-nou> [<valor-"
+"antic>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opcions>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "suprimeix la referència"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "actualitza <nom de referència>, no la que apunti"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "stdin té arguments acabats amb NUL"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "llegeix les actualitzacions des de stdin"
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "actualitza els fitxers d'informació des de zero"
@@ -23999,20 +24672,20 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opcions>] <directori>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "surt immediatament després de l'anunci inicial de referència"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "serveix les info/refs per a git-http-backend"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"no intentis <directori>/.git/ si <directori> no és cap directori del Git"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interromp la transferència després de <n> segons d'inactivitat"
@@ -24048,43 +24721,42 @@
msgid "print tag contents"
msgstr "imprimeix els continguts de l'etiqueta"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<opcions>] <camí> [<commit-ish>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<opcions>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<opcions>] <camí>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <arbre de treball> <camí-nou>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opcions>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<opcions>] <arbre de treball>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [<path>...]"
+
+#: builtin/worktree.c:26
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <camí>"
-#: builtin/worktree.c:61 builtin/worktree.c:935
+#: builtin/worktree.c:76
#, c-format
-msgid "failed to delete '%s'"
-msgstr "s'ha produït un error en suprimir «%s»"
-
-#: builtin/worktree.c:74
-#, fuzzy, c-format
msgid "Removing %s/%s: %s"
-msgstr "S'està eliminant %s"
+msgstr "S'està eliminant %s/%s: %s"
#: builtin/worktree.c:149
msgid "report pruned working trees"
@@ -24092,7 +24764,7 @@
#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
-msgstr "fes caducar els arbres de treball més vells que <hora>"
+msgstr "fes caducar els arbres de treball més antics que <data>"
#: builtin/worktree.c:221
#, c-format
@@ -24100,239 +24772,257 @@
msgstr "«%s» ja existeix"
#: builtin/worktree.c:230
-#, fuzzy, c-format
+#, c-format
msgid "unusable worktree destination '%s'"
-msgstr "no s'ha pogut fer «stat» a «%s»"
+msgstr "destinació de l'arbre de treball no utilitzable «%s»"
#: builtin/worktree.c:235
-#, fuzzy, c-format
+#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
-"«%s» és un arbre de treball que manca però bloquejat; useu «add -f -f» per a "
-"sobreescriure o «unlock» i «prune» o «remove» per a netejar"
+"«%s» és un arbre de treball que manca però que està bloquejat;\n"
+"useu «%s -f -f» per a sobreescriure-ho, o «unlock» i «prune» o «remove» per a netejar"
#: builtin/worktree.c:237
-#, fuzzy, c-format
+#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use '%s -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-"'%s' és un arbre de treball que manca però ja està registrat; useu 'add -f' "
-"per sobreescriure o 'prune' o 'remove' per netejar"
+"manca «%s» però ja està registrat a l'arbre de treball;\n"
+"useu «%s» per a sobreescriure-ho, o «prune» o «remove» per a netejar"
-#: builtin/worktree.c:288
+#: builtin/worktree.c:248
+#, c-format, fuzzy
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr ""
+"no s'ha pogut copiar '%s' a '%s'; la comprovació de la dispersió pot no "
+"funcionar correctament"
+
+#: builtin/worktree.c:268
+#, c-format, fuzzy
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr ""
+"no s'ha pogut copiar la configuració de l'arbre de treball de «%s» a «%s»"
+
+#: builtin/worktree.c:280 builtin/worktree.c:285
+#, c-format, fuzzy
+msgid "failed to unset '%s' in '%s'"
+msgstr "no s'ha pogut desassignar «%s» a «%s»"
+
+#: builtin/worktree.c:356
#, c-format
msgid "could not create directory of '%s'"
msgstr "no s'ha pogut crear directori de «%s»"
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:378
+msgid "initializing"
+msgstr "s'està inicialitzant"
+
+#: builtin/worktree.c:492 builtin/worktree.c:498
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "S'està preparant l'arbre de treball (branca nova «%s»)"
-#: builtin/worktree.c:424
-#, fuzzy, c-format
+#: builtin/worktree.c:494
+#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-"Preparant l'arbre de treball (la branca de reestructuració \"%s\"; estava en "
-"percentatges)"
+"S'està preparant l'arbre de treball (s'està reiniciant la branca «%s»; "
+"estava a %s)"
-#: builtin/worktree.c:433
+#: builtin/worktree.c:503
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "S'està preparant l'arbre de treball (s'està agafant «%s»)"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:509
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "S'està preparant l'arbre de treball (HEAD %s separat)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:554
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:557
msgid "create a new branch"
msgstr "crea una branca nova"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:559
msgid "create or reset a branch"
msgstr "crea o restableix una branca"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:561
msgid "populate the new working tree"
msgstr "emplena l'arbre de treball nou"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:562
msgid "keep the new working tree locked"
msgstr "mantén l'arbre de treball nou bloquejat"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:564 builtin/worktree.c:809
+msgid "reason for locking"
+msgstr "raó per a bloquejar"
+
+#: builtin/worktree.c:567
msgid "set up tracking mode (see git-branch(1))"
msgstr "configura el mode de seguiment (vegeu git-branch(1))"
-#: builtin/worktree.c:496
+#: builtin/worktree.c:570
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-"prova de fer coincidir el nom de la branca nova amb una branca amb seguiment "
-"remot"
+"prova de fer coincidir el nom de la branca nova amb una branca amb seguiment"
+" remot"
-#: builtin/worktree.c:504
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B i --detach són mútuament excloents"
+#: builtin/worktree.c:584
+msgid "added with --lock"
+msgstr "afegit amb --lock"
-#: builtin/worktree.c:565
+#: builtin/worktree.c:646
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track només es pot usar si es crea una branca nova"
-#: builtin/worktree.c:682
+#: builtin/worktree.c:766
msgid "show extended annotations and reasons, if available"
-msgstr ""
+msgstr "mostra les anotacions esteses i les raons, si estan disponibles"
-#: builtin/worktree.c:684
-#, fuzzy
+#: builtin/worktree.c:768
msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr "fes caducar els arbres de treball més vells que <hora>"
+msgstr ""
+"afegeix l'anotació «prunable» als arbres de treball més antics que <data>"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:770
#, fuzzy
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "-p i --overlay són mútuament excloents"
+msgid "terminate records with a NUL character"
+msgstr "finalitza els registres amb un caràcter NUL"
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "raó per bloquejar"
-
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
+#: builtin/worktree.c:1052
#, c-format
msgid "'%s' is not a working tree"
msgstr "«%s» no és un arbre de treball"
-#: builtin/worktree.c:734 builtin/worktree.c:767
+#: builtin/worktree.c:823 builtin/worktree.c:856
msgid "The main working tree cannot be locked or unlocked"
msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal"
-#: builtin/worktree.c:739
+#: builtin/worktree.c:828
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "«%s» ja està bloquejat, raó: «%s»"
-#: builtin/worktree.c:741
+#: builtin/worktree.c:830
#, c-format
msgid "'%s' is already locked"
msgstr "«%s» ja està bloquejat"
-#: builtin/worktree.c:769
+#: builtin/worktree.c:858
#, c-format
msgid "'%s' is not locked"
msgstr "«%s» no està bloquejat"
-#: builtin/worktree.c:810
+#: builtin/worktree.c:899
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"els arbres de treball que contenen submòduls no es poden moure ni eliminar"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:907
msgid "force move even if worktree is dirty or locked"
msgstr ""
"força el moviment encara que l'arbre de treball estigui brut o bloquejat"
-#: builtin/worktree.c:841 builtin/worktree.c:965
+#: builtin/worktree.c:930 builtin/worktree.c:1054
#, c-format
msgid "'%s' is a main working tree"
msgstr "«%s» és un arbre de treball principal"
-#: builtin/worktree.c:846
+#: builtin/worktree.c:935
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "no s'ha pogut deduir el nom de destí des de «%s»"
-#: builtin/worktree.c:859
-#, fuzzy, c-format
+#: builtin/worktree.c:948
+#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-"no es pot moure un bloqueig de l'arbre de treball bloquejat el raon per cent "
-"utilitza «move -f -f» per substituir o desbloquejar primer"
+"no es pot moure un arbre de treball bloquejat, raó del bloqueig: %s\n"
+"useu primer «move -f -f» per a sobreescriure'l o desbloquejar-lo primer"
-#: builtin/worktree.c:861
-#, fuzzy
+#: builtin/worktree.c:950
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-"no es pot moure un arbre de treball bloquejat; useu primer «move -f -f» per "
-"sobreescriure o desbloquejar"
+"no es pot moure un arbre de treball bloquejat;\n"
+"useu primer «move -f -f» per a sobreescriure'l o desbloquejar-lo primer"
-#: builtin/worktree.c:864
+#: builtin/worktree.c:953
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "la validació ha fallat, no es pot moure l'arbre de treball: %s"
-#: builtin/worktree.c:869
+#: builtin/worktree.c:958
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "s'ha produït un error en moure «%s» a «%s»"
-#: builtin/worktree.c:915
+#: builtin/worktree.c:1004
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "no s'ha pogut executar «git status» a «%s»"
-#: builtin/worktree.c:919
-#, fuzzy, c-format
+#: builtin/worktree.c:1008
+#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-"'%s' conté fitxers modificats o no seguits useu --force per suprimir-los"
+"«%s» conté fitxers modificats o no seguits, useu --force per a suprimir-los"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:1013
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "no s'ha pogut executar «git status» a «%s», codi %d"
-#: builtin/worktree.c:947
+#: builtin/worktree.c:1036
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"força l'eliminació encara que l'arbre de treball estigui brut o bloquejat"
-#: builtin/worktree.c:970
-#, fuzzy, c-format
+#: builtin/worktree.c:1059
+#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-"no s'ha pogut eliminar un bloqueig de l'arbre de treball bloquejat perquè "
-"els raonadors utilitzen «remove -f -f» per substituir o desbloquejar primer"
+"no es pot suprimir un arbre de treball bloquejat, raó del bloqueig: %s\n"
+"useu primer «remove -f -f» per a sobreescriure'l o desbloquejar-lo"
-#: builtin/worktree.c:972
-#, fuzzy
+#: builtin/worktree.c:1061
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-"no es pot eliminar un arbre de treball bloquejat; useu primer «remove -f -f» "
-"per sobreescriure o desbloquejar"
+"no es pot suprimir un arbre de treball bloquejat;\n"
+"useu primer «remove -f -f» per a sobreescriure'l o desbloquejar-lo"
-#: builtin/worktree.c:975
-#, fuzzy, c-format
+#: builtin/worktree.c:1064
+#, c-format
msgid "validation failed, cannot remove working tree: %s"
-msgstr ""
-"la validació ha fallat no es poden eliminar els percentatges dels arbres de "
-"treball"
+msgstr "la validació ha fallat, no es pot suprmir l'arbre de treball: %s"
-#: builtin/worktree.c:999
-#, fuzzy, c-format
+#: builtin/worktree.c:1088
+#, c-format
msgid "repair: %s: %s"
-msgstr "%s no vàlid: «%s»"
+msgstr "repara: %s: %s"
-#: builtin/worktree.c:1002
-#, fuzzy, c-format
+#: builtin/worktree.c:1091
+#, c-format
msgid "error: %s: %s"
-msgstr "error en %s %s: %s"
+msgstr "error: %s: %s"
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -24351,19 +25041,20 @@
msgstr "només útil per a la depuració"
#: git.c:28
-#, fuzzy
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
-" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
msgstr ""
-"git [--version] [--help] [-C <path>] [-c <name>=<value>] [--exec-"
-"path[=<path>]] [---html-path] [---info-path] [--paginate | -P | --no-pager] "
-"[-git-dir=<-name]"
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
+" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+" <command> [<args>]"
#: git.c:36
msgid ""
@@ -24377,21 +25068,16 @@
"«git help <concepte>» per a llegir sobre una subordre o concepte\n"
"específic. Vegeu «git help git» per a una visió general del sistema."
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "no s'ha especificat un directori per --git-dir\n"
+msgid "no directory given for '%s' option\n"
+msgstr "no s'ha especificat un directori per a l'opció «%s»\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "no s'ha especificat un nom d'espai per --namespace\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "no s'ha especificat un directori per --work-tree\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
@@ -24403,14 +25089,9 @@
msgstr "-c espera una cadena de configuració\n"
#: git.c:260
-#, fuzzy, c-format
-msgid "no config key given for --config-env\n"
-msgstr "no s'ha especificat un directori per --work-tree\n"
-
-#: git.c:300
#, c-format
-msgid "no directory given for -C\n"
-msgstr "no s'ha especificat un directori per -C\n"
+msgid "no config key given for --config-env\n"
+msgstr "no s'ha indicat cap clau de configuració per a --config-env\n"
#: git.c:326
#, c-format
@@ -24418,9 +25099,9 @@
msgstr "opció desconeguda: %s\n"
#: git.c:375
-#, fuzzy, c-format
+#, c-format
msgid "while expanding alias '%s': '%s'"
-msgstr "en expandir l'àlies '%s' '%s'"
+msgstr "en expandir l'àlies «%s»: «%s»"
#: git.c:384
#, c-format
@@ -24428,42 +25109,42 @@
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
-"àlies «%s» canvia variables d'entorn. Podeu utilitzar «!git» a l'àlies per a "
-"fer-ho"
+"l'àlies «%s» canvia variables d'entorn.\n"
+"Podeu utilitzar «!git» a l'àlies per a fer-ho"
#: git.c:391
-#, fuzzy, c-format
+#, c-format
msgid "empty alias for %s"
-msgstr "àlies buit per a percentatges"
+msgstr "àlies buit per a %s"
#: git.c:394
#, c-format
msgid "recursive alias: %s"
msgstr "àlies recursiu: %s"
-#: git.c:476
+#: git.c:480
msgid "write failure on standard output"
msgstr "fallada d'escriptura en la sortida estàndard"
-#: git.c:478
+#: git.c:482
msgid "unknown write failure on standard output"
msgstr "fallada d'escriptura desconeguda en la sortida estàndard"
-#: git.c:480
+#: git.c:484
msgid "close failed on standard output"
msgstr "ha fallat el tancament en la sortida estàndard"
-#: git.c:833
-#, fuzzy, c-format
+#: git.c:838
+#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr "bucle d'àlies detectat expansió de «%s» no acaba%"
+msgstr "bucle d'àlies detectat expansió de «%s» no acaba:%s"
-#: git.c:883
-#, fuzzy, c-format
+#: git.c:888
+#, c-format
msgid "cannot handle %s as a builtin"
-msgstr "no es poden gestionar els percentatges com a integrat"
+msgstr "no es pot gestionar %s com a integrat"
-#: git.c:896
+#: git.c:901
#, c-format
msgid ""
"usage: %s\n"
@@ -24472,45 +25153,32 @@
"ús: %s\n"
"\n"
-#: git.c:916
-#, fuzzy, c-format
+#: git.c:921
+#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr "ha fallat l'expansió de l'àlies '%s'; '%s' no és una ordre git"
+msgstr "ha fallat l'expansió de l'àlies «%s»; «%s» no és una ordre git\n"
-#: git.c:928
+#: git.c:933
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "s'ha produït un error en executar l'ordre «%s»: %s\n"
-#: http-fetch.c:118
-#, fuzzy, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "l'argument a --packfile ha de ser un hash vàlid (té '%')"
-
#: http-fetch.c:128
-#, fuzzy
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "l'argument a --packfile ha de ser un resum vàlid (s'ha obtingut «%s»)"
+
+#: http-fetch.c:138
msgid "not a git repository"
-msgstr "No és un repositori de git"
-
-#: http-fetch.c:134
-#, fuzzy
-msgid "--packfile requires --index-pack-args"
-msgstr "--pathspec-file-nul requereix --pathspec-from-file"
-
-#: http-fetch.c:143
-#, fuzzy
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "-N només es pot usar amb --mixed"
+msgstr "no és un repositori de git"
#: t/helper/test-fast-rebase.c:141
-#, fuzzy
msgid "unhandled options"
-msgstr "make_script: opcions no gestionades"
+msgstr "opcions no gestionades"
#: t/helper/test-fast-rebase.c:146
-#, fuzzy
msgid "error preparing revisions"
-msgstr "make_script: s'ha produït un error en preparar les revisions"
+msgstr "s'ha produït un error en preparar les revisions"
#: t/helper/test-reach.c:154
#, c-format
@@ -24529,156 +25197,113 @@
msgid "exit immediately after advertising capabilities"
msgstr "surt immediatament després d'anunciar les funcionalitats"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:264
-#, fuzzy, c-format
-msgid "could not start server on: '%s'"
-msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:356
-#, fuzzy
-msgid "waitpid failed"
-msgstr "«setsid» ha fallat"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:406
-#, fuzzy
-msgid "daemon failed to start"
-msgstr "s'ha produït un error en fer stat a %s"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
-msgstr ""
+msgstr "test-helper simple-ipc is-active [<nom>] [<opcions>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
-msgstr ""
+msgstr "test-helper simple-ipc run-daemon [<nom>] [<fils>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
-msgstr ""
+msgstr "test-helper simple-ipc start-daemon [<nom>] [<fils>] [<max-wait>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
-msgstr ""
+msgstr "test-helper simple-ipc stop-daemon [<nom>] [<max-wait>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
-msgstr ""
+msgstr "test-helper simple-ipc send [<nom>] [<testimoni>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
-msgstr ""
+msgstr "test-helper simple-ipc sendbytes [<nom>] [<bytecount>] [<byte>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
msgstr ""
+"test-helper simple-ipc multiple [<nom>] [<fils>] [<bytecount>] "
+"[<batchsize>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
-msgstr ""
+msgstr "nom o nom de camí del sòcol de domini unix"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
-msgstr ""
+msgstr "nom del conducte amb nom"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
-msgstr ""
+msgstr "nombre de fils en el conjunt de fils del servidor"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
-msgstr ""
+msgstr "segons a esperar que el dimoni comenci o s'aturi"
-#: t/helper/test-simple-ipc.c:703
-#, fuzzy
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
-msgstr "nombre incorrecte d'arguments"
+msgstr "nombre d'octets"
-#: t/helper/test-simple-ipc.c:704
-#, fuzzy
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "nombre de peticions per fil"
-#: t/helper/test-simple-ipc.c:706
-#, fuzzy
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
-msgstr "octets"
+msgstr "octet"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
-msgstr ""
+msgstr "caràcter de llast"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
-msgstr ""
+msgstr "testimoni"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
-msgstr ""
+msgstr "testimoni d'ordre a enviar al servidor"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "valor negatiu per http.postbuffer; utilitzant el valor %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "No s'admet el control de delegació amb el cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "No s'admet la fixació de clau pública amb cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "No s'admet la fixació de clau pública amb cURL < 7.39.0"
-#: http.c:910
-#, fuzzy
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr "CURLSSLOPTNOREVOKE no està suportat amb cURL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE no està admès amb cURL < 7.44.0"
-#: http.c:989
-#, fuzzy
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Restriccions de protocol no compatibles amb cURL < 7.19.4"
-
-#: http.c:1132
-#, fuzzy, c-format
+#: http.c:1016
+#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr "El dorsal SSL «%s» no està implementat. Els dorsals SSL compatibles"
+msgstr "El rerefons SSL «%s» no està admès. Els rerefons SSL admesos:"
-#: http.c:1139
-#, fuzzy, c-format
+#: http.c:1023
+#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-"No s'ha pogut establir el dorsal SSL a «%s» s'ha construït cURL sense "
-"dorsals SSL"
+"No s'ha pogut establir el rerefons SSL a «%s»: cURL es va construir sense "
+"rerefons SSL"
-#: http.c:1143
-#, fuzzy, c-format
+#: http.c:1027
+#, c-format
msgid "Could not set SSL backend to '%s': already set"
-msgstr "No s'ha pogut establir el dorsal SSL a «%s» ja establert"
+msgstr "No s'ha pogut establir el rerefons SSL a «%s»: ja establert"
-#: http.c:2035
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24689,215 +25314,389 @@
" petició: %s\n"
" redirecció: %s"
-#: remote-curl.c:183
-#, fuzzy, c-format
+#: remote-curl.c:184
+#, c-format
msgid "invalid quoting in push-option value: '%s'"
-msgstr "cita no vàlida en el valor de l'opció d'empenta «%s»"
+msgstr "citació no vàlida en el valor de l'opció de pujada: «%s»"
-#: remote-curl.c:307
-#, fuzzy, c-format
+#: remote-curl.c:308
+#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr "oversinfo/refs no és vàlid és un repositori git?"
+msgstr "%sinfo/refs no vàlides: és un repositori git?"
-#: remote-curl.c:408
-#, fuzzy
+#: remote-curl.c:409
msgid "invalid server response; expected service, got flush packet"
msgstr ""
-"la resposta del servidor no és vàlida; el servei esperat ha rebut el paquet "
-"de neteja"
+"resposta del servidor no és vàlida; el servei esperat, ha rebut in paquet de"
+" neteja"
-#: remote-curl.c:439
-#, fuzzy, c-format
+#: remote-curl.c:440
+#, c-format
msgid "invalid server response; got '%s'"
msgstr "resposta del servidor no vàlida; s'ha obtingut «%s»"
-#: remote-curl.c:499
+#: remote-curl.c:500
#, c-format
msgid "repository '%s' not found"
msgstr "no s'ha trobat el repositori «%s»"
-#: remote-curl.c:503
+#: remote-curl.c:504
#, c-format
msgid "Authentication failed for '%s'"
msgstr "S'ha produït un error en autenticar per «%s»"
-#: remote-curl.c:507
+#: remote-curl.c:508
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "no es pot accedir a «%s» la configuració de http.pinnedPubkey :%s"
+
+#: remote-curl.c:512
#, c-format
msgid "unable to access '%s': %s"
msgstr "no s'ha pogut accedir a «%s»: %s"
-#: remote-curl.c:513
+#: remote-curl.c:518
#, c-format
msgid "redirecting to %s"
msgstr "s'està redirigint a %s"
-#: remote-curl.c:642
-#, fuzzy
+#: remote-curl.c:649
msgid "shouldn't have EOF when not gentle on EOF"
-msgstr "No hauria de tenir EOF quan no sigui suau al EOF"
+msgstr "no hauria de tenir EOF quan s'és lax amb els EOF"
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "el servidor remot ha enviat un separador sense estat"
+#: remote-curl.c:661
+msgid "remote server sent unexpected response end packet"
+msgstr "el servidor remot ha enviat un paquet de final de resposta inesperat"
-#: remote-curl.c:724
-#, fuzzy
+#: remote-curl.c:730
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"no s'han pogut rebobinar les dades de publicació rpc - proveu d'augmentar "
"http.postBuffer"
-#: remote-curl.c:754
-#, fuzzy, c-format
+#: remote-curl.c:759
+#, c-format
msgid "remote-curl: bad line length character: %.4s"
-msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s"
+msgstr "remote-curl: caràcter de longitud de línia erroni: %.4s"
-#: remote-curl.c:756
-#, fuzzy
+#: remote-curl.c:761
msgid "remote-curl: unexpected response end packet"
-msgstr "paquet final de resposta inesperat del remot"
+msgstr "remote-curl: paquet final de resposta inesperat"
-#: remote-curl.c:832
+#: remote-curl.c:837
#, c-format
msgid "RPC failed; %s"
msgstr "RPC ha fallat; %s"
-#: remote-curl.c:872
-#, fuzzy
+#: remote-curl.c:877
msgid "cannot handle pushes this big"
-msgstr "no es pot gestionar empènyer aquest gran"
+msgstr "no es pot gestionar pujades tan grans"
-#: remote-curl.c:987
-#, fuzzy, c-format
+#: remote-curl.c:990
+#, c-format
msgid "cannot deflate request; zlib deflate error %d"
-msgstr "no es pot desinflar la sol·licitud; zlib deflate error%d"
+msgstr "no es pot descomprimir la sol·licitud; error de deflate zlib %d"
-#: remote-curl.c:991
-#, fuzzy, c-format
+#: remote-curl.c:994
+#, c-format
msgid "cannot deflate request; zlib end error %d"
-msgstr "no es pot desinflar la sol·licitud; error final zlib percentatged"
+msgstr ""
+"no es pot descomprimir la sol·licitud; error de finalització de zlib %d"
-#: remote-curl.c:1041
-#, fuzzy, c-format
+#: remote-curl.c:1044
+#, c-format
msgid "%d bytes of length header were received"
-msgstr "s'han rebut bytes percentuals de la capçalera de longitud"
+msgstr "s'han rebut %d bytes de longitud de capçalera"
-#: remote-curl.c:1043
-#, fuzzy, c-format
+#: remote-curl.c:1046
+#, c-format
msgid "%d bytes of body are still expected"
-msgstr "encara s'esperen bytes de cos per cent"
+msgstr "encara s'esperen %d bytes del cos"
-#: remote-curl.c:1132
-#, fuzzy
+#: remote-curl.c:1135
msgid "dumb http transport does not support shallow capabilities"
msgstr "el transport ximple http no admet capacitats superficials"
-#: remote-curl.c:1147
-#, fuzzy
+#: remote-curl.c:1150
msgid "fetch failed."
-msgstr "el fetch ha fallat."
+msgstr "l'obtenció ha fallat."
-#: remote-curl.c:1193
-#, fuzzy
+#: remote-curl.c:1198
msgid "cannot fetch by sha1 over smart http"
-msgstr "no s’ha pogut obtenir per la sha1 a través de l’intel·ligent http"
+msgstr "no s'ha pogut obtenir per sha1 a través de l'http intel·ligent"
-#: remote-curl.c:1237 remote-curl.c:1243
-#, fuzzy, c-format
+#: remote-curl.c:1242 remote-curl.c:1248
+#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
-msgstr "error de protocol esperat sha/ref s'ha obtingut «%s»"
+msgstr "error de protocol: s'esperava sha/ref, s'ha obtingut «%s»"
-#: remote-curl.c:1255 remote-curl.c:1373
-#, fuzzy, c-format
+#: remote-curl.c:1260 remote-curl.c:1378
+#, c-format
msgid "http transport does not support %s"
-msgstr "El transport http no dóna suport als percentatges"
+msgstr "El transport http no admet %s"
-#: remote-curl.c:1291
-#, fuzzy
+#: remote-curl.c:1296
msgid "git-http-push failed"
msgstr "git-http-push ha fallat"
-#: remote-curl.c:1479
-#, fuzzy
+#: remote-curl.c:1485
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr "ús remot de curl git remote-curl <remote> [<url>]"
+msgstr "remote-curl: ús: git remote-curl <remote> [<url>]"
-#: remote-curl.c:1511
-#, fuzzy
+#: remote-curl.c:1517
msgid "remote-curl: error reading command stream from git"
-msgstr "error remot en llegir el flux d'ordres des de git"
+msgstr "remote-curl: error en llegir el flux d'ordres del git"
-#: remote-curl.c:1518
-#, fuzzy
+#: remote-curl.c:1524
msgid "remote-curl: fetch attempted without a local repo"
-msgstr "s'ha intentat recuperar el valor remot sense un repositori local"
+msgstr "remote-curl: s'ha intentat l'obtenció sense un dipòsit local"
-#: remote-curl.c:1559
-#, fuzzy, c-format
+#: remote-curl.c:1565
+#, c-format
msgid "remote-curl: unknown command '%s' from git"
-msgstr "comandament desconegut «%s» del git"
+msgstr "remote-curl: ordre «%s» desconeguda del git"
+
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "cal un directori de treball"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "no s'ha pogut trobar un arrel d'allistament"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
+#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "no s'ha pogut commutar a «%s»"
+
+#: contrib/scalar/scalar.c:179
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "no s'ha pogut configurar %s=%s"
+
+#: contrib/scalar/scalar.c:197
+msgid "could not configure log.excludeDecoration"
+msgstr "no s'ha pogut configurar log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:218
+msgid "Scalar enlistments require a worktree"
+msgstr "Els allistaments escalars requereixen un arbre de treball"
+
+#: contrib/scalar/scalar.c:310
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "el HEAD remot no és una branca: «%.*s»"
+
+#: contrib/scalar/scalar.c:316
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"no s'ha pogut obtenir el nom de la branca per defecte del remot; s'usa ela "
+"predeterminada localment"
+
+#: contrib/scalar/scalar.c:329
+msgid "failed to get default branch name"
+msgstr "s'ha produït un error en obtenir el nom de branca predeterminada"
+
+#: contrib/scalar/scalar.c:340
+msgid "failed to unregister repository"
+msgstr "s'ha produït un error en desregistrar el repositori"
+
+#: contrib/scalar/scalar.c:355
+msgid "failed to delete enlistment directory"
+msgstr "s'ha produït un error en suprimir l'allistament del directori"
+
+#: contrib/scalar/scalar.c:375
+msgid "branch to checkout after clone"
+msgstr "branca a agafar després de clonar"
+
+#: contrib/scalar/scalar.c:377
+msgid "when cloning, create full working directory"
+msgstr "quan es clona, crear un directori de treball complet"
+
+#: contrib/scalar/scalar.c:379
+msgid "only download metadata for the branch that will be checked out"
+msgstr "només baixa les metadades per a la branca que s'agafarà"
+
+#: contrib/scalar/scalar.c:384
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<opcions>] [--] <repo> [<dir>]"
+
+#: contrib/scalar/scalar.c:409
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "no es pot deduir el nom de l'arbre de treball de «%s»"
+
+#: contrib/scalar/scalar.c:418
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "el directori «%s» ja existeix"
+
+#: contrib/scalar/scalar.c:445
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "s'ha produït un error en obtenir la branca per defecte per a «%s»"
+
+#: contrib/scalar/scalar.c:456
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "no s'ha pogut configurar el remot a «%s»"
+
+#: contrib/scalar/scalar.c:465
+#, c-format
+msgid "could not configure '%s'"
+msgstr "no s'ha pogut configurar «%s»"
+
+#: contrib/scalar/scalar.c:468
+msgid "partial clone failed; attempting full clone"
+msgstr "ha fallat la clonació parcial; s'està intentant la clonació completa"
+
+#: contrib/scalar/scalar.c:472
+msgid "could not configure for full clone"
+msgstr "no s'ha pogut configurar per a una clonació completa"
+
+#: contrib/scalar/scalar.c:504
+msgid "`scalar list` does not take arguments"
+msgstr "«scalar list» no accepta arguments"
+
+#: contrib/scalar/scalar.c:517
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enlistment>]"
+
+#: contrib/scalar/scalar.c:544
+msgid "reconfigure all registered enlistments"
+msgstr "reconfigura tots els allistaments registrats"
+
+#: contrib/scalar/scalar.c:548
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enlistment>]"
+
+#: contrib/scalar/scalar.c:566
+msgid "--all or <enlistment>, but not both"
+msgstr "--all o <enlistment>, però no ambdós"
+
+#: contrib/scalar/scalar.c:581
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "no existeix un repositori de git a: «%s»"
+
+#: contrib/scalar/scalar.c:621
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <task> {<enlistment>]\n"
+"Tasques:\n"
+
+#: contrib/scalar/scalar.c:639
+#, c-format
+msgid "no such task: '%s'"
+msgstr "no existeix la tasca: «%s»"
+
+#: contrib/scalar/scalar.c:689
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+#: contrib/scalar/scalar.c:736
+msgid "scalar delete <enlistment>"
+msgstr "supressió de l'escalar <enlistment>"
+
+#: contrib/scalar/scalar.c:751
+msgid "refusing to delete current working directory"
+msgstr "s'ha rebutjat suprimir el directori de treball actual"
+
+#: contrib/scalar/scalar.c:766
+msgid "include Git version"
+msgstr "inclou la versió del Git"
+
+#: contrib/scalar/scalar.c:768
+msgid "include Git's build options"
+msgstr "inclou les opcions de construcció del Git"
+
+#: contrib/scalar/scalar.c:772
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:813
+msgid "-C requires a <directory>"
+msgstr "-C requereix un <directory>"
+
+#: contrib/scalar/scalar.c:815
+#, c-format
+msgid "could not change to '%s'"
+msgstr "no s'ha pogut canviar a «%s»"
+
+#: contrib/scalar/scalar.c:821
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c requereix un argument <key>=<value>"
+
+#: contrib/scalar/scalar.c:839
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Ordres:\n"
#: compat/compiler.h:26
-#, fuzzy
msgid "no compiler information available\n"
-msgstr "no hi ha informació disponible del compilador"
+msgstr "no hi ha informació disponible del compilador\n"
#: compat/compiler.h:38
-#, fuzzy
msgid "no libc information available\n"
-msgstr "mostra la informació de branca"
+msgstr "no hi ha informació disponible de libc\n"
-#: list-objects-filter-options.h:94
+#: list-objects-filter-options.h:126
msgid "args"
msgstr "arguments"
-#: list-objects-filter-options.h:95
+#: list-objects-filter-options.h:127
msgid "object filtering"
msgstr "filtratge d'objecte"
-#: parse-options.h:184
+#: parse-options.h:188
msgid "expiry-date"
msgstr "data-de-caducitat"
-#: parse-options.h:198
+#: parse-options.h:202
msgid "no-op (backward compatibility)"
msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
-#: parse-options.h:310
+#: parse-options.h:341
msgid "be more verbose"
msgstr "sigues més detallat"
-#: parse-options.h:312
+#: parse-options.h:343
msgid "be more quiet"
msgstr "sigues més discret"
-#: parse-options.h:318
-#, fuzzy
+#: parse-options.h:349
msgid "use <n> digits to display object names"
-msgstr "usa <n> xifres per presentar els SHA-1"
+msgstr "usa <n> xifres per a mostrar els noms d'objecte"
-#: parse-options.h:337
+#: parse-options.h:368
msgid "how to strip spaces and #comments from message"
msgstr "com suprimir els espais i #comentaris del missatge"
-#: parse-options.h:338
-#, fuzzy
+#: parse-options.h:369
msgid "read pathspec from file"
msgstr "llegeix l'especificació del camí del fitxer"
-#: parse-options.h:339
-#, fuzzy
+#: parse-options.h:370
msgid ""
-"with --pathspec-from-file, pathspec elements are separated with NUL character"
+"with --pathspec-from-file, pathspec elements are separated with NUL "
+"character"
msgstr ""
"amb --pathspec-from-file els elements d'especificació del camí estan "
-"separats amb caràcter NUL"
+"separats amb el caràcter NUL"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "key"
msgstr "clau"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "nom del camp en el qual ordenar"
@@ -24945,19 +25744,18 @@
msgstr "Llista, crea o suprimeix branques"
#: command-list.h:59
-#, fuzzy
msgid "Collect information for user to file a bug report"
-msgstr "Recopila la informació per a l'usuari per enviar un informe d'error"
+msgstr "Recopila la informació per a l'usuari per a enviar un informe d'error"
#: command-list.h:60
-#, fuzzy
msgid "Move objects and refs by archive"
msgstr "Mou els objectes i les referències per arxiu"
#: command-list.h:61
msgid "Provide content or type and size information for repository objects"
msgstr ""
-"Proveeix contingut o informació del tipus i mida per als objectes del repositori"
+"Proveeix contingut o informació del tipus i mida per als objectes del "
+"repositori"
#: command-list.h:62
msgid "Display gitattributes information"
@@ -24968,22 +25766,21 @@
msgstr "Depura gitignore / fitxers d'exclusió"
#: command-list.h:64
-#, fuzzy
msgid "Show canonical names and email addresses of contacts"
msgstr "Mostra els noms canònics i les adreces electròniques dels contactes"
#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Assegura que un nom de referència està ben format"
+
+#: command-list.h:66
msgid "Switch branches or restore working tree files"
msgstr "Canvia de branca o restaura els fitxers de l'arbre de treball"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "Copia fitxers des de l'índex a l'arbre de treball"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Assegura que un nom de referència està ben format"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "Troba les comissions que encara s'han d'aplicar a la font"
@@ -25025,33 +25822,29 @@
msgstr "Obté o estableix opcions de repositori o globals"
#: command-list.h:78
-#, fuzzy
msgid "Count unpacked number of objects and their disk consumption"
msgstr "Compta el nombre d'objectes desempaquetats i el seu consum de disc"
#: command-list.h:79
-#, fuzzy
msgid "Retrieve and store user credentials"
msgstr "Recupera i desa les credencials d'usuari"
#: command-list.h:80
-#, fuzzy
msgid "Helper to temporarily store passwords in memory"
-msgstr "Ajudant per emmagatzemar temporalment les contrasenyes a la memòria"
+msgstr "Ajudant per a emmagatzemar temporalment les contrasenyes en memòria"
#: command-list.h:81
msgid "Helper to store credentials on disk"
msgstr "Ajudant per a emmagatzemar credencials a disc"
#: command-list.h:82
-#, fuzzy
msgid "Export a single commit to a CVS checkout"
-msgstr "Exporta una sola entrega a una versió de CVS"
+msgstr "Exporta en una sola comissió a CVS checkout"
#: command-list.h:83
-#, fuzzy
msgid "Salvage your data out of another SCM people love to hate"
-msgstr "Estalvia les teves dades d'una altra gent de SCM que li agrada odiar"
+msgstr ""
+"Salveu les vostres dades d'un altre SMC al que la gent li agrada odiar"
#: command-list.h:84
msgid "A CVS server emulator for Git"
@@ -25064,7 +25857,7 @@
#: command-list.h:86
msgid "Give an object a human readable name based on an available ref"
msgstr ""
-"Dona un nom llegible per humans basant-se en les referències disponibles"
+"Dona un nom llegible per a humans basant-se en les referències disponibles"
#: command-list.h:87
msgid "Show changes between commits, commit and working tree, etc"
@@ -25080,7 +25873,6 @@
msgstr "Compara un arbre amb l'arbre de treball o l'índex"
#: command-list.h:90
-#, fuzzy
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
"Compara el contingut i el mode dels blobs trobats a través de dos objectes "
@@ -25092,7 +25884,7 @@
#: command-list.h:92
msgid "Git data exporter"
-msgstr "Explorador de dades del Git"
+msgstr "Exportador de dades del Git"
#: command-list.h:93
msgid "Backend for fast Git data importers"
@@ -25119,9 +25911,8 @@
msgstr "Mostra la informació en cada referència"
#: command-list.h:99
-#, fuzzy
msgid "Run a Git command on a list of repositories"
-msgstr "executa les tasques basades en l'estat del repositori"
+msgstr "Executa una ordre Git en una llista de repositoris"
#: command-list.h:100
msgid "Prepare patches for e-mail submission"
@@ -25136,7 +25927,6 @@
msgstr "Neteja els fitxers innecessaris i optimitza el repositori local"
#: command-list.h:103
-#, fuzzy
msgid "Extract commit ID from an archive created using git-archive"
msgstr "Extreu l'ID de la comissió d'un arxiu creat amb el git-archive"
@@ -25157,47 +25947,45 @@
msgstr "Mostra informació d'ajuda del Git"
#: command-list.h:108
+#, fuzzy
+msgid "Run git hooks"
+msgstr "Executa els ganxos del git"
+
+#: command-list.h:109
msgid "Server side implementation of Git over HTTP"
msgstr "Implementació al servidor del Git sobre HTTP"
-#: command-list.h:109
+#: command-list.h:110
msgid "Download from a remote Git repository via HTTP"
msgstr "Baixa des d'un repositori Git remot via HTTP"
-#: command-list.h:110
-#, fuzzy
-msgid "Push objects over HTTP/DAV to another repository"
-msgstr "Empeny objectes sobre HTTP/DAV a un altre repositori"
-
#: command-list.h:111
-#, fuzzy
-msgid "Send a collection of patches from stdin to an IMAP folder"
-msgstr ""
-"Envia una col·lecció de pedaços des de l'entrada estàndard a una carpeta IMAP"
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "Pujar objectes sobre HTTP/DAV a un altre repositori"
#: command-list.h:112
-#, fuzzy
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr ""
+"Envia una col·lecció de pedaços des de l'entrada estàndard a una carpeta "
+"IMAP"
+
+#: command-list.h:113
msgid "Build pack index file for an existing packed archive"
msgstr ""
"Construeix el fitxer d'índex del paquet per a un arxiu empaquetat existent"
-#: command-list.h:113
+#: command-list.h:114
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Crea un repositori de Git buit o reinicialitza un existent"
-#: command-list.h:114
-#, fuzzy
+#: command-list.h:115
msgid "Instantly browse your working repository in gitweb"
msgstr "Navegueu instantàniament pel vostre repositori de treball a gitweb"
-#: command-list.h:115
-#, fuzzy
-msgid "Add or parse structured information in commit messages"
-msgstr "Afegir o analitzar informació estructurada en missatges de publicació"
-
#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "El navegador de repositoris Git"
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+"Afegeix o analitza la informació estructurada en els missatges de comissió"
#: command-list.h:117
msgid "Show commit logs"
@@ -25216,75 +26004,63 @@
msgstr "Mostra els continguts d'un objecte de l'arbre"
#: command-list.h:121
-#, fuzzy
msgid "Extracts patch and authorship from a single e-mail message"
-msgstr "Extreu pedaç i autoria d'un sol missatge de correu electrònic"
+msgstr "Extreu el pedaç i l'autoria d'un sol missatge de correu electrònic"
#: command-list.h:122
-#, fuzzy
msgid "Simple UNIX mbox splitter program"
-msgstr "Programa de divisor mbox simple per a UNIX"
+msgstr "Programa de divisió mbox simple per a UNIX"
#: command-list.h:123
-#, fuzzy
msgid "Run tasks to optimize Git repository data"
-msgstr "Executa les tasques per optimitzar les dades del repositori Git"
+msgstr "Executa tasques per a optimitzar les dades del repositori Git"
#: command-list.h:124
msgid "Join two or more development histories together"
msgstr "Uneix dues o més històries de desenvolupament"
#: command-list.h:125
-#, fuzzy
msgid "Find as good common ancestors as possible for a merge"
msgstr "Troba els millors avantpassats comuns possibles per a una fusió"
#: command-list.h:126
-#, fuzzy
msgid "Run a three-way file merge"
msgstr "Executa una fusió de fitxers de tres vies"
#: command-list.h:127
-#, fuzzy
msgid "Run a merge for files needing merging"
msgstr "Executa una fusió per als fitxers que cal fusionar"
#: command-list.h:128
-#, fuzzy
msgid "The standard helper program to use with git-merge-index"
msgstr "El programa d'ajuda estàndard a utilitzar amb git-merge-index"
#: command-list.h:129
+msgid "Show three-way merge without touching index"
+msgstr "Mostra la fusió de tres vies sense tocar l'índex"
+
+#: command-list.h:130
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
"Executa eines de resolució de conflictes per a resoldre conflictes de fusió"
-#: command-list.h:130
-#, fuzzy
-msgid "Show three-way merge without touching index"
-msgstr "Mostra la fusió de tres vies sense l'índex tàctil"
-
#: command-list.h:131
-#, fuzzy
-msgid "Write and verify multi-pack-indexes"
-msgstr "Escriu i verifica els multi-índexs"
+msgid "Creates a tag object with extra validation"
+msgstr "Crea un objecte etiqueta amb validació addicional"
#: command-list.h:132
-#, fuzzy
-msgid "Creates a tag object with extra validation"
-msgstr "Crea un objecte etiqueta"
-
-#: command-list.h:133
-#, fuzzy
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Construeix un objecte en arbre a partir de text formatat amb ls-tree"
+#: command-list.h:133
+msgid "Write and verify multi-pack-indexes"
+msgstr "Escriu i verifica els índexs dels paquets multipaquet"
+
#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Mou o canvia de nom a un fitxer, directori o enllaç simbòlic"
#: command-list.h:135
-#, fuzzy
msgid "Find symbolic names for given revs"
msgstr "Cerca noms simbòlics per a les revisions donades"
@@ -25305,7 +26081,6 @@
msgstr "Troba fitxers empaquetats redundants"
#: command-list.h:140
-#, fuzzy
msgid "Pack heads and tags for efficient repository access"
msgstr ""
"Empaqueta els caps i les etiquetes per a un accés eficient al repositori"
@@ -25332,14 +26107,12 @@
"Actualitza les referències remotes juntament amb els objectes associats"
#: command-list.h:146
-#, fuzzy
msgid "Applies a quilt patchset onto the current branch"
-msgstr "Aplica un conjunt de pedaços cobert a la branca actual"
+msgstr "Aplica un conjunt de pedaços a la branca actual"
#: command-list.h:147
msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr ""
-"Compara dos rangs de comissions (p. ex. dues versions d'una branca)"
+msgstr "Compara dos rangs de comissions (p. ex. dues versions d'una branca)"
#: command-list.h:148
msgid "Reads tree information into the index"
@@ -25366,9 +26139,8 @@
msgstr "Empaqueta els objectes desempaquetats en un repositori"
#: command-list.h:154
-#, fuzzy
msgid "Create, list, delete refs to replace objects"
-msgstr "Crea una llista suprimeix les referències per substituir els objectes"
+msgstr "Crea, llista i esborra referències per a substituir objectes"
#: command-list.h:155
msgid "Generates a summary of pending changes"
@@ -25387,17 +26159,17 @@
msgstr "Restaura els fitxers de l'arbre de treball"
#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Reverteix comissions existents"
-
-#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
msgstr "Mostra les comissions en ordre topològic invers"
-#: command-list.h:161
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "Trieu i personalitzeu els paràmetres"
+#: command-list.h:161
+msgid "Revert some existing commits"
+msgstr "Reverteix comissions existents"
+
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr "Elimina fitxers de l'arbre de treball i de l'índex"
@@ -25411,50 +26183,51 @@
msgstr "Puja objectes sobre el protocol Git a un altre repositori"
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
-msgstr "Intèrpret d'ordres d'entrada restringit només per a accés SSH al Git"
-
-#: command-list.h:166
-msgid "Summarize 'git log' output"
-msgstr "Resumeix la sortida «git log»"
-
-#: command-list.h:167
-msgid "Show various types of objects"
-msgstr "Mostra diversos tipus d'objectes"
-
-#: command-list.h:168
-msgid "Show branches and their commits"
-msgstr "Mostra les branques i les seves comissions"
-
-#: command-list.h:169
-msgid "Show packed archive index"
-msgstr "Mostra l'índex d'arxius empaquetat"
-
-#: command-list.h:170
-msgid "List references in a local repository"
-msgstr "Llista les referències en un repositori local"
-
-#: command-list.h:171
msgid "Git's i18n setup code for shell scripts"
msgstr ""
"Codi de configuració i18n del Git per als scripts de l'intèrpret d'ordres"
-#: command-list.h:172
+#: command-list.h:166
msgid "Common Git shell script setup code"
msgstr "Codi de scripts de configuració comuns pel Git shell"
+#: command-list.h:167
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Intèrpret d'ordres d'entrada restringit només per a accés SSH al Git"
+
+#: command-list.h:168
+msgid "Summarize 'git log' output"
+msgstr "Resumeix la sortida «git log»"
+
+#: command-list.h:169
+msgid "Show various types of objects"
+msgstr "Mostra diversos tipus d'objectes"
+
+#: command-list.h:170
+msgid "Show branches and their commits"
+msgstr "Mostra les branques i les seves comissions"
+
+#: command-list.h:171
+msgid "Show packed archive index"
+msgstr "Mostra l'índex d'arxius empaquetat"
+
+#: command-list.h:172
+msgid "List references in a local repository"
+msgstr "Llista les referències en un repositori local"
+
#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
-msgstr "Inicialitza i modifica el «sparse-checkout»"
+#, fuzzy
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr "Redueix l'arbre de treball a un subconjunt de fitxers seguits"
#: command-list.h:174
-msgid "Stash the changes in a dirty working directory away"
-msgstr "Fes «stash» dels canvis en un directori de treball brut"
-
-#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Afegeix el contingut del fitxer a l'àrea de «staging»"
+#: command-list.h:175
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Fes «stash» dels canvis en un directori de treball brut"
+
#: command-list.h:176
msgid "Show the working tree status"
msgstr "Mostra l'estat de l'arbre de treball"
@@ -25499,12 +26272,14 @@
#: command-list.h:186
msgid "Update the object name stored in a ref safely"
msgstr ""
-"Actualitza el nom de l'objecte emmagatzemat en una referència de forma segura"
+"Actualitza el nom de l'objecte emmagatzemat en una referència de forma "
+"segura"
#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-"Actualitza el fitxer d'informació auxiliar per a ajudar als servidors ximples"
+"Actualitza el fitxer d'informació auxiliar per a ajudar als servidors "
+"ximples"
#: command-list.h:188
msgid "Send archive back to git-archive"
@@ -25531,68 +26306,68 @@
msgstr "Verifica la signatura GPG de les etiquetes"
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Interfície web del Git (interfície web pels repositoris Git)"
-
-#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "Mostra registres amb la diferència introduïda per cada comissió"
-#: command-list.h:196
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "Gestiona múltiples arbres de treball"
-#: command-list.h:197
+#: command-list.h:196
msgid "Create a tree object from the current index"
msgstr "Crea un objecte arbre des de l'índex actual"
-#: command-list.h:198
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "La definició d'atributs per camí"
-#: command-list.h:199
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Interfície i convencions de la línia d'ordres del Git"
-#: command-list.h:200
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "Un tutorial bàsic del Git per a desenvolupadors"
-#: command-list.h:201
+#: command-list.h:200
msgid "Providing usernames and passwords to Git"
msgstr "Proporcionar noms d'usuari i contrasenyes a Git"
-#: command-list.h:202
+#: command-list.h:201
msgid "Git for CVS users"
msgstr "Git per a usuaris del CVS"
-#: command-list.h:203
+#: command-list.h:202
msgid "Tweaking diff output"
msgstr "Ajustament de la sortida de diferències"
-#: command-list.h:204
+#: command-list.h:203
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Un conjunt mínim útil d'ordres diàries del Git"
-#: command-list.h:205
+#: command-list.h:204
msgid "Frequently asked questions about using Git"
msgstr "Preguntes freqüents sobre l'ús del Git"
-#: command-list.h:206
+#: command-list.h:205
msgid "A Git Glossary"
msgstr "Un glossari de Git"
-#: command-list.h:207
+#: command-list.h:206
msgid "Hooks used by Git"
msgstr "Lligams utilitzats pel Git"
-#: command-list.h:208
+#: command-list.h:207
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
+#: command-list.h:208
+msgid "The Git repository browser"
+msgstr "El navegador de repositoris Git"
+
#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
-msgstr ""
+msgstr "Assigna noms d'autor i comitent i/o adreces de correu electrònic"
#: command-list.h:210
msgid "Defining submodule properties"
@@ -25619,59 +26394,28 @@
msgstr "Muntant un repositori dins un altre"
#: command-list.h:216
-msgid "A tutorial introduction to Git: part two"
-msgstr "Un tutorial d'introducció al Git: segona part"
-
-#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "Un tutorial d'introducció al Git"
+#: command-list.h:217
+msgid "A tutorial introduction to Git: part two"
+msgstr "Un tutorial d'introducció al Git: segona part"
+
#: command-list.h:218
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interfície web del Git (interfície web pels repositoris Git)"
+
+#: command-list.h:219
msgid "An overview of recommended workflows with Git"
msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "ha fallat l'execució de bisect: no s'ha proporcionat cap ordre."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "s'està executant $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"el pas de bisecció ha fallat:\n"
-"el codi de sortida $res de «$command» és < 0 o bé >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "el pas de bisecció no pot continuar més"
-
-#: git-bisect.sh:111
-#, fuzzy, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"el pas de bisecció ha fallat:\n"
-"«bisect_state $state» ha sortit amb el codi d'error $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "pas de bisecció reeixit"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
"merge"
msgstr ""
-"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar"
+"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per"
+" a fusionar"
#: git-merge-octopus.sh:61
msgid "Automated merge did not work."
@@ -25679,7 +26423,7 @@
#: git-merge-octopus.sh:62
msgid "Should not be doing an octopus."
-msgstr "No s'ha de fer un pop."
+msgstr "No s'ha de fer un «octopus»."
#: git-merge-octopus.sh:73
#, sh-format
@@ -25706,564 +26450,47 @@
msgstr ""
"La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"El camí relatiu només es pot usar des del nivell superior de l'arbre de "
-"treball"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "URL de repositori: «$repo» ha de ser absolut o començar amb ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "«$sm_path» ja existeix en l'índex"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "«$sm_path» ja existeix en l'índex i no és submòdul"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "«$sm_path» no té una comissió agafada"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "S'està afegint el repositori existent a «$sm_path» a l'índex"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "«$sm_path» ja existeix i no és un repositori de git vàlid"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"S'ha trobat un directori de git per a «$sm_name» localment amb els remots:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-" $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Si voleu reusar aquest directori de git local en lloc de clonar de nou de\n"
-" $realrepo\n"
-"useu l'opció «--force». Si el directori de git local no és el repositori "
-"correcte\n"
-"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció «--"
-"name»."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr ""
-"S'està reactivant el directori de git local per al submòdul «$sm_name»."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "No s'ha pogut agafar el submòdul «$sm_path»"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "S'ha produït un error en afegir el submòdul «$sm_path»"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "S'ha produït un error en registrar el submòdul «$sm_path»"
-
-#: git-submodule.sh:568
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr ""
-"No s'ha pogut trobar la revisió actual en el camí de submòdul «$displaypath»"
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "No s'ha pogut obtenir en el camí de submòdul «$sm_path»"
-
-#: git-submodule.sh:583
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr ""
-"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
-"camí de submòdul «$sm_path»"
-
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"No s'ha pogut obtenir en el camí de submòdul «$displaypath»; s'està "
-"intentant obtenir directament $sha1:"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"S'ha obtingut en el camí de submòdul «$displaypath», però no contenia $sha1. "
-"L'obtenció directa d'aquella comissió ha fallat."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "No s'ha pogut agafar «$sha1» en el camí de submòdul «$displaypath»"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Camí de submòdul «$displaypath»: s'ha agafat «$sha1»"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"No s'ha pogut fer «rebase» «$sha1» en el camí de submòdul «$displaypath»"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Camí de submòdul «$displaypath»: s'ha fet «rebase» en «$sha1»"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "No s'ha pogut fusionar «$sha1» en el camí de submòdul «$displaypath»"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Camí de submòdul «$displaypath»: s'ha fusionat en «$sha1»"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"L'execució de «$command $sha1» ha fallat en el camí de submòdul "
-"«$displaypath»"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Camí de submòdul «$displaypath»: «$command $sha1»"
-
-#: git-submodule.sh:663
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr ""
-"S'ha produït un error en recórrer recursivament dins del camí de submòdul "
-"«$displaypath»"
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "S'ha aplicat l'«autostash»."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "No es pot emmagatzemar $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"L'aplicació del «stash» automàtic ha resultat en conflictes.\n"
-"Els vostres canvis estan segurs en el «stash».\n"
-"Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "S'està fent «rebase» ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Ordres:\n"
-" p, pick <comissió> = usa la comissió\n"
-" r, reword <comissió> = usa la comissió, però edita el missatge de comissió\n"
-" e, edit <comissió> = usa la comissió, però atura't per a esmenar\n"
-" s, squash <comissió> = usa la comissió, però fusiona-la a la comissió "
-"prèvia\n"
-" f, fixup <comissió> = com a «squash», però descarta el missatge de registre "
-"d'aquesta comissió\n"
-"x, exec <comissió> = executa l'ordre (la resta de la línia) usant "
-"l'intèrpret d'ordres\n"
-"d, drop <comissió> = elimina la comissió\n"
-"l, label <etiqueta> = etiqueta la HEAD actual amb un nom\n"
-"t, reset <etiqueta> = reinicia HEAD a una etiqueta \n"
-"m, merge [-C <comissió> | -c <comissió>] <etiqueta> [# <oneline>]\n"
-". crea una comissió de fusió usant el missatge de la comissió\n"
-". de fusió original (o línia única, si no hi ha cap comissió de fusió "
-"original\n"
-". especificada). Useu -c <comissió> per a reescriure el missatge de "
-"publicació.\n"
-"\n"
-"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Podeu esmenar la comissió ara, amb\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Una vegada que estigueu satisfet amb els vostres canvis, executeu\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: no és una comissió que es pugui triar"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nom de comissió no vàlid: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Avanç ràpid a $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "No es pot avançar ràpidament a $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "No es pot moure HEAD a $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "S'està refusant fer «squash» a una fusió: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Error en refer la fusió $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "No s'ha pogut triar $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Aquest és el missatge de comissió núm. ${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "El missatge de comissió núm. ${n} s'ometrà:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Això és una combinació d'$count comissió."
-msgstr[1] "Això és una combinació de $count comissions."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "No es pot escriure $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Això és una combinació de 2 comissions."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "No s'ha pogut aplicar $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"No s'ha pogut esmenar la comissió després de triar correctament $sha1... "
-"$rest\n"
-"Això és probablement a causa d'un missatge de comissió buit, o el lligam de\n"
-"precomissió ha fallat. Si el lligam de precomissió ha fallat, pot ser que\n"
-"necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
-"comissió."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "S'ha aturat a $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "No es pot fer «$squash_style» sense una comissió prèvia"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "S'està executant: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "L'execució ha fallat: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "i ha fet canvis a l'índex o l'arbre de treball"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Podeu arreglar el problema, i llavors executeu\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"L'execució ha tingut èxit: $rest\n"
-"però ha deixat canvis a l'índex o l'arbre de treball\n"
-"Cometeu o emmagatzemeu els vostres canvis, i llavors executeu\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Ordre desconeguda: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Corregiu-ho usant «git rebase --edit-todo»."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Teniu canvis «stage» en el vostre arbre de treball.\n"
-"Si aquests canvis són per fer «squash»\n"
-"a la comissió prèvia, executeu:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Si són per a formar una comissió nova, executeu:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"En ambdós casos, quan hàgiu terminat, continueu amb:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar "
-"la comissió"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Teniu canvis no comesos en el vostre arbre de treball. \n"
-"Primer cometeu-los i després executeu «git rebase --continue» de nou."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "No s'han pogut cometre els canvis «staged»."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "No s'ha pogut executar l'editor"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "No s'ha pogut agafar $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "No hi ha cap HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "No s'ha pogut crear el $state_dir temporal"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "No s'ha pogut marcar com a interactiu"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordre)"
-msgstr[1] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordres)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Tingueu en compte que les comissions buides estan comentades"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "No s'han pogut iniciar les comissions reescrites"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "ús: $dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:182
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"No es pot canviar de directori a $cdup, el nivell superior de l'arbre de "
"treball"
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:191 git-sh-setup.sh:198
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "fatal: no es pot usar $program_name sense un arbre de treball."
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:212
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "No es poden reescriure branques: Teniu canvis «unstaged»."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "No es pot baixar fent «rebase»: Teniu canvis «unstaged»."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:215
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "No es pot $action: Teniu canvis «unstaged»."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:226
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "No es pot $action: El vostre índex conté canvis sense cometre."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:228
msgid "Additionally, your index contains uncommitted changes."
msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:348
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:353
msgid "Unable to determine absolute path of git directory"
msgstr "No s'ha pogut determinar el camí absolut del directori de git"
@@ -26311,7 +26538,7 @@
"marked for applying."
msgstr ""
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
-"per aplicar-se."
+"per a aplicar-se."
#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
#: git-add--interactive.perl:1077
@@ -26320,7 +26547,7 @@
"marked for discarding."
msgstr ""
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
-"per descartar-se."
+"per a descartar-se."
#: git-add--interactive.perl:1114
#, perl-format
@@ -26345,7 +26572,7 @@
msgid "failed to open hunk edit file for reading: %s"
msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -26359,7 +26586,7 @@
"a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «stage» d'aquest tros o de cap altre restant del fitxer"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -26373,7 +26600,7 @@
"a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «stash» d'aquest tros o de cap altre restant del fitxer"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -26387,7 +26614,7 @@
"a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -26401,7 +26628,7 @@
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -26415,7 +26642,7 @@
"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -26429,7 +26656,7 @@
"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -26443,7 +26670,7 @@
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -26457,7 +26684,7 @@
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -26479,212 +26706,207 @@
"e - edita manualment el tros actual\n"
"? - mostra l'ajuda\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "Els trossos seleccionats no apliquen a l'índex\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "s'està ignorant %s no fusionat\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica el canvi de mode a l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica la supressió a l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica l'addició a l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica aquest tros a l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "No hi ha altres trossos on anar-hi\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Número no vàlid: «%s»\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Només %d tros disponible.\n"
msgstr[1] "Només %d trossos disponibles.\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "No hi ha cap altre tros a cercar\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Expressió regular de cerca mal formada %s: %s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "No hi ha trossos que coincideixin amb el patró donat\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Sense tros previ\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "No hi ha tros següent\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "No es pot dividir aquest tros\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Divideix en %d tros.\n"
msgstr[1] "Divideix en %d trossos.\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "No es pot editar aquest tros\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"revert - revert staged set of changes back to the HEAD version\n"
"patch - pick hunks and update selectively\n"
"diff - view diff between HEAD and index\n"
-"add untracked - add contents of untracked files to the staged set of "
-"changes\n"
+"add untracked - add contents of untracked files to the staged set of changes\n"
msgstr ""
"status - mostra els camins amb canvis\n"
-"update - afegeix l'estat de l'arbre de treball al conjunt de canvis "
-"«staged»\n"
+"update - afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»\n"
"revert - reverteix el conjunt de canvis de «staged» a la versió HEAD\n"
"patch - selecciona trossos i actualitza'ls selectivament\n"
"diff - mostra la diferència entre HEAD i l'índex\n"
-"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de "
-"canvis «staged»\n"
+"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de canvis «staged»\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "manca --"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "desconegut --patch mode: %s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argument %s no vàlid, s'esperava --"
-#: git-send-email.perl:138
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "la zona local difereix de GMT per un interval que no és de minuts\n"
-#: git-send-email.perl:145 git-send-email.perl:151
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "el desplaçament de la zona local és més gran o igual a 24 hores\n"
-#: git-send-email.perl:222
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
-msgstr ""
+msgstr "fatal: l'ordre «%s» ha mort amb el codi de sortida %d"
-#: git-send-email.perl:235
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'editor no ha sortit correctament, avortant-ho tot"
-#: git-send-email.perl:321
+#: git-send-email.perl:346
#, perl-format
-msgid ""
-"'%s' contains an intermediate version of the email you were composing.\n"
+msgid "'%s' contains an intermediate version of the email you were composing.\n"
msgstr "«%s» conté una versió intermèdia del correu que estàveu redactant.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "«%s.final» conté el correu redactat.\n"
-#: git-send-email.perl:419
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases és incompatible amb altres opcions\n"
-#: git-send-email.perl:493
-#, fuzzy
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
msgstr ""
-"fatal s'han trobat les opcions de configuració per a git-send-email es "
-"configura amb les opcions sendemail.* -noteu la 'e'. Establiu sendemail."
-"forbidSendmailVariables a false per desactivar aquesta comprovació."
+"fatal: s'han trobat opcions de configuració per a «sendmail»\n"
+"git-send-email està configurat amb les opcions sendemail.* - fixeu-vos en\n"
+"la «e». Establiu sendemail.forbidSendmailVariables a false per a desactivar\n"
+"la comprovació.\n"
-#: git-send-email.perl:498 git-send-email.perl:700
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "No es pot executar git format-patch des de fora del repositori\n"
-#: git-send-email.perl:501
-#, fuzzy
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
-"`batch-size` i `relogin` s'han d'especificar junts (a través de la línia "
-"d'ordres o l'opció de configuració)"
+"«batch-size» i «relogin» s'han d'especificar junts (a través de la línia "
+"d'ordres o l'opció de configuració)\n"
-#: git-send-email.perl:514
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Camp --suppress-cc desconegut: «%s»\n"
-#: git-send-email.perl:545
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Paràmetre --confirm desconegut: «%s»\n"
-#: git-send-email.perl:573
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "avís: no s'admet l'àlies de sendmail amb cometes: %s\n"
-#: git-send-email.perl:575
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "avís: «:include:» no s'admet: %s\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "avís: les redireccions «/file» ni «|pipe» no s'admeten: %s\n"
-#: git-send-email.perl:582
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "avís: no es pot reconèixer la línia sendmail: %s\n"
-#: git-send-email.perl:666
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -26694,17 +26916,17 @@
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
"El fitxer «%s» existeix, però també pot ser un rang de comissions\n"
-"per produir pedaços. Desambigüeu-ho...\n"
+"per a produir pedaços. Desambigüeu-ho...\n"
"\n"
" * Dient «./%s» si volíeu especificar un fitxer; o\n"
" * Proporcionant l'opció «--format-patch» si volíeu especificar un rang.\n"
-#: git-send-email.perl:687
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "S'ha produït un error en obrir el directori %s: %s"
-#: git-send-email.perl:720
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
@@ -26714,17 +26936,17 @@
"No s'han especificat fitxers de pedaç\n"
"\n"
-#: git-send-email.perl:733
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "Sense assumpte a %s?"
-#: git-send-email.perl:743
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "S'ha produït un error en obrir per escriptura %s: %s"
-#: git-send-email.perl:754
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -26738,27 +26960,27 @@
"\n"
"Esborreu el contingut del cos si no voleu enviar cap resum.\n"
-#: git-send-email.perl:778
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "S'ha produït un error en obrir %s: %s"
-#: git-send-email.perl:795
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "S'ha produït un error en obrir %s.final: %s"
-#: git-send-email.perl:838
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "El correu electrònic de resum està buit, s'omet\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:873
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Esteu segur que voleu usar <%s> [y/N]? "
-#: git-send-email.perl:928
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -26766,40 +26988,38 @@
"Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
"Encoding.\n"
-#: git-send-email.perl:933
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
-#: git-send-email.perl:941
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"\t%s\n"
-"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
-"want to send.\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
msgstr ""
"S'ha refusat a enviar perquè el pedaç\n"
"\t%s\n"
-"perquè la plantilla té l'assumpte «*** SUBJECT HERE ***». Passeu --force si "
-"realment voleu enviar-ho.\n"
+"perquè la plantilla té l'assumpte «*** SUBJECT HERE ***». Passeu --force si realment voleu enviar-ho.\n"
-#: git-send-email.perl:960
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
"A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?"
-#: git-send-email.perl:978
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: l'àlies «%s» s'expandeix a si mateix\n"
-#: git-send-email.perl:990
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha "
"cap)? "
-#: git-send-email.perl:1048 git-send-email.perl:1056
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "error: no s'ha pogut extreure una adreça vàlida de: %s\n"
@@ -26807,16 +27027,16 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1060
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Què cal fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): "
-#: git-send-email.perl:1377
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "el camí CA «%s» no existeix"
-#: git-send-email.perl:1460
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -26836,154 +27056,419 @@
" sendemail.confirm.\n"
"\n"
" Per a informació addicional, executeu «git send-email --help».\n"
-" Per mantenir el comportament actual, però silenciar aquest\n"
+" Per a mantenir el comportament actual, però silenciar aquest\n"
" missatge, executeu «git config --global sendemail.confirm auto».\n"
"\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1475
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[e]dita|[q]surt|[a]tot): "
-#: git-send-email.perl:1478
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "Requereix resposta en enviar el correu"
-#: git-send-email.perl:1506
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "El servidor SMTP requerit no està correctament definit."
-#: git-send-email.perl:1553
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "El servidor no admet STARTTLS! %s"
-#: git-send-email.perl:1558 git-send-email.perl:1562
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS ha fallat! %s"
-#: git-send-email.perl:1571
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i "
-"useu --smtp-debug."
+"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i"
+" useu --smtp-debug."
-#: git-send-email.perl:1589
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "S'ha produït un error en enviar %s\n"
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Simulació d'enviament %s\n"
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "Enviat %s\n"
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "Simulació de correcte. El registre diu:\n"
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "Correcte. El registre diu: \n"
-#: git-send-email.perl:1606
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1609
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Resultat: correcte\n"
-#: git-send-email.perl:1627
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "no es pot obrir el fitxer %s"
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1680
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) S'està afegint a: %s des de la línia «%s»\n"
-#: git-send-email.perl:1737
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(no mbox) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1772
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(cos) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1883
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no s'ha pogut executar «%s»"
-#: git-send-email.perl:1890
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) S'està afegint %s: %s des de: «%s»\n"
-#: git-send-email.perl:1894
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) s'ha produït un error en tancar el conducte «%s»"
-#: git-send-email.perl:1924
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "no es pot enviar el missatge en 7 bits"
-#: git-send-email.perl:1932
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "codificació de transferència no vàlida"
-#: git-send-email.perl:1966
-#, fuzzy, perl-format
-msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
-"%s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"fatal: %s: %s\n"
-"avís: no s'han enviat pedaços\n"
+#: git-send-email.perl:2099
+#, perl-format, fuzzy
+msgid "fatal: %s: rejected by %s hook\n"
+msgstr "fatal: percentatges: rebutjats per cents fatal"
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: git-send-email.perl:2111 git-send-email.perl:2164 git-send-email.perl:2174
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "no s'ha pogut obrir %s: %s\n"
-#: git-send-email.perl:1979
-#, fuzzy, perl-format
+#: git-send-email.perl:2114
+#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"warning: no patches were sent\n"
msgstr ""
-"fatal: %s: %s\n"
-"avís: no s'han enviat pedaços\n"
+"fatal: %s:%d té més de 998 caràcters\n"
+"avís: no s'ha enviat cap pedaç\n"
-#: git-send-email.perl:1997
+#: git-send-email.perl:2132
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2001
+#: git-send-email.perl:2136
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Esteu segur que voleu enviar %s? [y|N]: "
+#~ msgid "git archive --list"
+#~ msgstr "git archive --list"
+#, c-format
+#~ msgid "unknown value for --diff-merges: %s"
+#~ msgstr "valor desconegut per a --diff-merges: %s"
+
+#, c-format
+#~ msgid "invalid value '%s' for lsrefs.unborn"
+#~ msgstr "valor «%s» no vàlid per a «lsrefs.unborn»"
+
+#~ msgid "backend for `git stash -p`"
+#~ msgstr "rerefons per a «git stash -p»"
+
+#, c-format
+#~ msgid "Invalid value for --empty: %s"
+#~ msgstr "Valor no vàlid per a --empty: %s"
+
+#, c-format
+#~ msgid "Invalid value for --patch-format: %s"
+#~ msgstr "Valor no vàlid per a --patch-format: %s"
+
+#, c-format
+#~ msgid "Invalid value for --show-current-patch: %s"
+#~ msgstr "Valor no vàlid per --show-current-patch: %s"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | "
+#~ "--term-new]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | "
+#~ "--term-new]"
+
+#~ msgid "git bisect--helper --bisect-next"
+#~ msgstr "git bisect--helper --bisect-next"
+
+#~ msgid "git bisect--helper --bisect-visualize"
+#~ msgstr "git bisect--helper --bisect-visualize"
+
+#, c-format
+#~ msgid "invalid color '%s' in color.blame.repeatedLines"
+#~ msgstr "color «%s» no vàlid en «color.blame.repeatedLines»"
+
+#~ msgid "invalid value for blame.coloring"
+#~ msgstr "valor no vàlid per a «blame.coloring»"
+
+#~ msgid ""
+#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | "
+#~ "-p | <type> | --textconv | --filters) [--path=<path>] <object>"
+#~ msgstr ""
+#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | "
+#~ "-p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
+
+#~ msgid "show object type"
+#~ msgstr "mostra el tipus de l'objecte"
+
+#~ msgid "exit with zero when there's no error"
+#~ msgstr "surt amb zero quan no hi ha error"
+
+#~ msgid "show info and content of objects fed from the standard input"
+#~ msgstr ""
+#~ "mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
+
+#~ msgid "show info about objects fed from the standard input"
+#~ msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
+
+#~ msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#~ msgstr ""
+#~ "segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-"
+#~ "check)"
+
+#~ msgid "show all objects with --batch or --batch-check"
+#~ msgstr "mostra tots els objectes amb --batch o --batch-check"
+
+#~ msgid "do not order --batch-all-objects output"
+#~ msgstr "no ordenar la sortida de --batch-all-objects"
+
+#~ msgid "set up tracking mode (see git-pull(1))"
+#~ msgstr "configura el mode de seguiment (vegeu git-pull(1))"
+
+#~ msgid "Using both --reset-author and --author does not make sense"
+#~ msgstr "Usar ambdós --reset-author i --author no té sentit"
+
+#~ msgid "Options --squash and --fixup cannot be used together"
+#~ msgstr "Les opcions --squash i --fixup no es poden usar juntes"
+
+#~ msgid "Only one of -c/-C/-F/--fixup can be used."
+#~ msgstr "Només un de -c/-C/-F/--fixup es pot usar."
+
+#~ msgid "Option -m cannot be combined with -c/-C/-F."
+#~ msgstr "l'opció -m no es pot combinar amb -c/-C/-F/."
+
+#~ msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#~ msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar."
+
+#~ msgid "git count-objects [-v] [-H | --human-readable]"
+#~ msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#, c-format
+#~ msgid "configuration fetch.output contains invalid value %s"
+#~ msgstr "la configuració fetch.output conté un valor no vàlid %s"
+
+#~ msgid "--cached or --untracked cannot be used with --no-index"
+#~ msgstr "--cached o --untracked no es pot usar amb --no-index"
+
+#~ msgid "--untracked cannot be used with --cached"
+#~ msgstr "--untracked no es pot usar amb --cached"
+
+#~ msgid "git hash-object --stdin-paths"
+#~ msgstr "git hash-object --stdin-paths"
+
+#~ msgid "git help [-g|--guides]"
+#~ msgstr "git help [-g|--guides]"
+
+#~ msgid "git help [-c|--config]"
+#~ msgstr "git help [-c|--config]"
+
+#~ msgid "git mktag"
+#~ msgstr "git mktag"
+
+#~ msgid "git mktree [-z] [--missing] [--batch]"
+#~ msgstr "git mktree [-z] [--missing] [--batch]"
+
+#~ msgid "read from stdin"
+#~ msgstr "llegeix de stdin"
+
+#~ msgid "git notes merge --commit [-v | -q]"
+#~ msgstr "git notes merge --commit [-v | -q]"
+
+#~ msgid "git notes merge --abort [-v | -q]"
+#~ msgstr "git notes merge --abort [-v | -q]"
+
+#~ msgid "git notes get-ref"
+#~ msgstr "git notes get-ref"
+
+#~ msgid "invalid value for --missing"
+#~ msgstr "valor no vàlid per a --missing"
+
+#~ msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#~ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#, c-format
+#~ msgid "Invalid value for %s: %s"
+#~ msgstr "Valor no vàlid per a %s: %s"
+
+#, c-format
+#~ msgid "Invalid value for pull.ff: %s"
+#~ msgstr "Valor no vàlid per a pull.ff: %s"
+
+#~ msgid "git rebase --continue | --abort | --skip | --edit-todo"
+#~ msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+
+#, c-format
+#~ msgid "'%s' is not a valid timestamp"
+#~ msgstr "«%s» no és una marca de temps vàlida"
+
+#~ msgid "git reflog [ show | expire | delete | exists ]"
+#~ msgstr "git reflog [ show | expire | delete | exists ]"
+
+#~ msgid "git remote [-v | --verbose]"
+#~ msgstr "git remote [-v | --verbose]"
+
+#~ msgid "git replace [-f] --convert-graft-file"
+#~ msgstr "git replace [-f] --convert-graft-file"
+
+#, c-format
+#~ msgid ""
+#~ "\n"
+#~ "It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+#~ "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+#~ "to make this the default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "S'ha trigat %.2f segons a enumerar els canvis «unstaged» després del reinici.\n"
+#~ "Podeu utilitzar «--quiet» per a evitar-ho. Establiu el paràmetre de configuració\n"
+#~ "reset.quiet a true per a fer que aquesta configuració sigui predeterminada.\n"
+
+#~ msgid "git sparse-checkout list"
+#~ msgstr "git sparse-checkout list"
+
+#~ msgid "unable to upgrade repository format to enable worktreeConfig"
+#~ msgstr ""
+#~ "no s'ha pogut actualitzar el format del repositori per a habilitar "
+#~ "worktreeConfig"
+
+#~ msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+#~ msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#~ msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+#~ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#~ msgid "git sparse-checkout disable"
+#~ msgstr "git sparse-checkout disable"
+
+#~ msgid ""
+#~ "the stash.useBuiltin support has been removed!\n"
+#~ "See its entry in 'git help config' for details."
+#~ msgstr ""
+#~ "s'ha eliminat l'opció stash.useBuiltin.\n"
+#~ "Per a més detalls vegeu la seva entrada a «git help config»."
+
+#~ msgid "git stripspace [-s | --strip-comments]"
+#~ msgstr "git stripspace [-s | --strip-comments]"
+
+#~ msgid "git stripspace [-c | --comment-lines]"
+#~ msgstr "git stripspace [-c | --comment-lines]"
+
+#~ msgid "submodule--helper print-default-remote takes no arguments"
+#~ msgstr "submodule--helper print-default-remote no pren cap argument"
+
+#~ msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+#~ msgstr "git submodule--helper update-clone [--prefix=<camí>] [<camí>...]"
+
+#~ msgid "suppress output for update by rebase or merge"
+#~ msgstr "omet la sortida per les actualitzacions per «rebase» o fusió"
+
+#~ msgid "overrides update mode in case the repository is a fresh clone"
+#~ msgstr ""
+#~ "sobreescriu el mode d'actualització en cas que el repositori sigui un clon "
+#~ "nou"
+
+#~ msgid "depth for shallow fetch"
+#~ msgstr "profunditat per a les obtencions superficials"
+
+#~ msgid "sha1"
+#~ msgstr "sha1"
+
+#~ msgid "SHA1 expected by superproject"
+#~ msgstr "SHA1 esperat per superproject"
+
+#~ msgid "subsha1"
+#~ msgstr "subsha1"
+
+#~ msgid "SHA1 of submodule's HEAD"
+#~ msgstr "SHA1 del HEAD del submòdul"
+
+#~ msgid "git submodule--helper run-update-procedure [<options>] <path>"
+#~ msgstr "git submodule--helper run-update-procedure [<options>] <path>"
+
+#~ msgid "git submodule--helper config --check-writeable"
+#~ msgstr "git submodule--helper config --check-writeable"
+
+#~ msgid "git update-server-info [--force]"
+#~ msgstr "git update-server-info [--force]"
+
+#~ msgid "Initialize and modify the sparse-checkout"
+#~ msgstr "Inicialitza i modifica el «sparse-checkout»"
+
+#, sh-format
+#~ msgid ""
+#~ "Unable to find current ${remote_name}/${branch} revision in submodule path "
+#~ "'$sm_path'"
+#~ msgstr ""
+#~ "No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
+#~ "camí de submòdul «$sm_path»"
+
+#, sh-format
+#~ msgid "Failed to recurse into submodule path '$displaypath'"
+#~ msgstr ""
+#~ "S'ha produït un error en recórrer recursivament dins del camí de submòdul "
+#~ "«$displaypath»"
+
+#, perl-format
+#~ msgid ""
+#~ "fatal: %s: rejected by sendemail-validate hook\n"
+#~ "%s\n"
+#~ "warning: no patches were sent\n"
+#~ msgstr ""
+#~ "fatal: %s: rebutjat pel lligam sendemail-validate\n"
+#~ "%s\n"
+#~ "avís: no s'ha enviat cap pedaç\n"
diff --git a/po/de.po b/po/de.po
index cad96a0..ef04b54 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-05-23 18:32+0200\n"
+"POT-Creation-Date: 2022-04-13 14:52+0800\n"
+"PO-Revision-Date: 2022-04-10 15:07+0200\n"
"Last-Translator: Matthias Rüster <matthias.ruester@gmail.com>\n"
"Language-Team: Matthias Rüster <matthias.ruester@gmail.com>\n"
"Language: de\n"
@@ -17,235 +17,234 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 2.4.3\n"
+"X-Generator: Poedit 3.0.1\n"
-#: add-interactive.c:376
+#: add-interactive.c:382
#, c-format
msgid "Huh (%s)?"
msgstr "Wie bitte (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
+#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
+#: builtin/rebase.c:1671
msgid "could not read index"
msgstr "Index konnte nicht gelesen werden"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:590 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "Binär"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:648 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "Nichts"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:649 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "unverändert"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:686 git-add--interactive.perl:641
msgid "Update"
msgstr "Aktualisieren"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:703 add-interactive.c:891
#, c-format
msgid "could not stage '%s'"
msgstr "Konnte '%s' nicht zum Commit vormerken."
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
msgid "could not write index"
msgstr "konnte Index nicht schreiben"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:712 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d Pfad aktualisiert\n"
msgstr[1] "%d Pfade aktualisiert\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:730 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "Hinweis: %s ist nun unversioniert.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:765 git-add--interactive.perl:653
msgid "Revert"
msgstr "Revert"
-#: add-interactive.c:775
+#: add-interactive.c:781
msgid "Could not parse HEAD^{tree}"
msgstr "Konnte HEAD^{tree} nicht parsen."
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:819 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d Pfad wiederhergestellt\n"
msgstr[1] "%d Pfade wiederhergestellt\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:870 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Keine unversionierten Dateien.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:874 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Unversionierte Dateien hinzufügen"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:901 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d Pfad hinzugefügt\n"
msgstr[1] "%d Pfade hinzugefügt\n"
-#: add-interactive.c:925
+#: add-interactive.c:931
#, c-format
msgid "ignoring unmerged: %s"
msgstr "Ignoriere nicht zusammengeführte Datei: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Nur Binärdateien geändert.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Keine Änderungen.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:949 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Patch Aktualisierung"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:988 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Diff überprüfen"
-#: add-interactive.c:1010
+#: add-interactive.c:1016
msgid "show paths with changes"
msgstr "Zeige Pfade mit Änderungen"
-#: add-interactive.c:1012
+#: add-interactive.c:1018
msgid "add working tree state to the staged set of changes"
msgstr "Zustand des Arbeitsverzeichnisses zum Commit vormerken"
-#: add-interactive.c:1014
+#: add-interactive.c:1020
msgid "revert staged set of changes back to the HEAD version"
msgstr "Zum Commit vorgemerkte Änderungen auf HEAD-Version zurücksetzen"
-#: add-interactive.c:1016
+#: add-interactive.c:1022
msgid "pick hunks and update selectively"
msgstr "Blöcke und Änderung gezielt auswählen"
-#: add-interactive.c:1018
+#: add-interactive.c:1024
msgid "view diff between HEAD and index"
msgstr "Differenz zwischen HEAD und Index ansehen"
-#: add-interactive.c:1020
+#: add-interactive.c:1026
msgid "add contents of untracked files to the staged set of changes"
msgstr "Inhalte von unversionierten Dateien zum Commit vormerken"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1034 add-interactive.c:1083
msgid "Prompt help:"
msgstr "Hilfe für Eingaben:"
-#: add-interactive.c:1030
+#: add-interactive.c:1036
msgid "select a single item"
msgstr "Ein einzelnes Element auswählen"
-#: add-interactive.c:1032
+#: add-interactive.c:1038
msgid "select a range of items"
msgstr "Eine Reihe von Elementen auswählen"
-#: add-interactive.c:1034
+#: add-interactive.c:1040
msgid "select multiple ranges"
msgstr "Mehrere Reihen auswählen"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1042 add-interactive.c:1087
msgid "select item based on unique prefix"
msgstr "Element basierend auf eindeutigen Präfix auswählen"
-#: add-interactive.c:1038
+#: add-interactive.c:1044
msgid "unselect specified items"
msgstr "Angegebene Elemente abwählen"
-#: add-interactive.c:1040
+#: add-interactive.c:1046
msgid "choose all items"
msgstr "Alle Elemente auswählen"
-#: add-interactive.c:1042
+#: add-interactive.c:1048
msgid "(empty) finish selecting"
msgstr "(leer) Auswählen beenden"
-#: add-interactive.c:1079
+#: add-interactive.c:1085
msgid "select a numbered item"
msgstr "Ein nummeriertes Element auswählen"
-#: add-interactive.c:1083
+#: add-interactive.c:1089
msgid "(empty) select nothing"
msgstr "(leer) nichts auswählen"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** Befehle ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "Was nun"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "staged"
msgstr "zur Staging-Area hinzugefügt"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "unstaged"
msgstr "aus Staging-Area entfernt"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
+#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
+#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
+#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
#: git-add--interactive.perl:213
msgid "path"
msgstr "Pfad"
-#: add-interactive.c:1151
+#: add-interactive.c:1157
msgid "could not refresh index"
msgstr "Index konnte nicht aktualisiert werden"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Tschüss.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Ergänzung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
@@ -274,22 +273,22 @@
"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
"vormerken\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Modusänderung stashen [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Löschung stashen [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Ergänzung stashen [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? "
@@ -316,22 +315,22 @@
"a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Ergänzung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
@@ -361,22 +360,22 @@
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht aus Staging-"
"Area entfernen\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Modusänderung auf Index anwenden [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Löschung auf Index anwenden [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Ergänzung auf Index anwenden [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d%s,?]? "
@@ -406,26 +405,26 @@
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
"anwenden\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Ergänzung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
@@ -455,23 +454,23 @@
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
"Arbeitsverzeichnis verwerfen\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Ergänzung im Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
@@ -492,23 +491,23 @@
"a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Ergänzung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
@@ -554,24 +553,24 @@
msgid "could not parse colored hunk header '%.*s'"
msgstr "Konnte farbigen Block-Header '%.*s' nicht parsen."
-#: add-patch.c:420
+#: add-patch.c:431
msgid "could not parse diff"
-msgstr "Konnte Differenz nicht parsen."
+msgstr "konnte Diff nicht parsen"
-#: add-patch.c:439
+#: add-patch.c:450
msgid "could not parse colored diff"
-msgstr "Konnte farbige Differenz nicht parsen."
+msgstr "konnte farbigen Diff nicht parsen"
-#: add-patch.c:453
+#: add-patch.c:464
#, c-format
msgid "failed to run '%s'"
msgstr "'%s' konnte nicht ausgeführt werden"
-#: add-patch.c:612
+#: add-patch.c:618
msgid "mismatched output from interactive.diffFilter"
msgstr "nicht übereinstimmende Ausgabe von interactive.diffFilter"
-#: add-patch.c:613
+#: add-patch.c:619
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -579,7 +578,7 @@
"Der Filter muss eine Eins-zu-Eins-Beziehung\n"
"zwischen den Ein- und Ausgabe-Zeilen einhalten."
-#: add-patch.c:791
+#: add-patch.c:797
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -588,7 +587,7 @@
"Erwartete Kontextzeile #%d in\n"
"%.*s"
-#: add-patch.c:806
+#: add-patch.c:812
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -601,13 +600,13 @@
"\tendet nicht mit:\n"
"%.*s"
-#: add-patch.c:1082 git-add--interactive.perl:1115
+#: add-patch.c:1088 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n"
"Kurzanleitung.\n"
-#: add-patch.c:1086
+#: add-patch.c:1092
#, c-format
msgid ""
"---\n"
@@ -621,7 +620,7 @@
"Zeilen, die mit %c beginnen, werden entfernt.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1100 git-add--interactive.perl:1129
+#: add-patch.c:1106 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -632,13 +631,13 @@
"werden,\n"
"wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n"
-#: add-patch.c:1133
+#: add-patch.c:1139
msgid "could not parse hunk header"
-msgstr "Konnte Block-Header nicht parsen."
+msgstr "konnte Block-Header nicht parsen"
-#: add-patch.c:1178
+#: add-patch.c:1184
msgid "'git apply --cached' failed"
-msgstr "'git apply --cached' schlug fehl."
+msgstr "'git apply --cached' schlug fehl"
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input at this point.
@@ -652,27 +651,27 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1253 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n"
"Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?"
-#: add-patch.c:1290
+#: add-patch.c:1296
msgid "The selected hunks do not apply to the index!"
msgstr ""
"Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1304 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Nichts angewendet.\n"
-#: add-patch.c:1355
+#: add-patch.c:1361
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -696,73 +695,73 @@
"e - aktuellen Patch-Block manuell editieren\n"
"? - Hilfe anzeigen\n"
-#: add-patch.c:1517 add-patch.c:1527
+#: add-patch.c:1523 add-patch.c:1533
msgid "No previous hunk"
msgstr "Kein vorheriger Patch-Block"
-#: add-patch.c:1522 add-patch.c:1532
+#: add-patch.c:1528 add-patch.c:1538
msgid "No next hunk"
msgstr "Kein folgender Patch-Block"
-#: add-patch.c:1538
+#: add-patch.c:1544
msgid "No other hunks to goto"
msgstr "Keine anderen Patch-Blöcke verbleibend"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1555 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1556 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "zu welchem Patch-Block springen? "
-#: add-patch.c:1561
+#: add-patch.c:1567
#, c-format
msgid "Invalid number: '%s'"
msgstr "Ungültige Nummer: '%s'"
-#: add-patch.c:1566
+#: add-patch.c:1572
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar."
msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar."
-#: add-patch.c:1575
+#: add-patch.c:1581
msgid "No other hunks to search"
msgstr "Keine anderen Patch-Blöcke zum Durchsuchen"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1587 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "Suche nach regulärem Ausdruck? "
-#: add-patch.c:1596
+#: add-patch.c:1602
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s"
-#: add-patch.c:1613
+#: add-patch.c:1619
msgid "No hunk matches the given pattern"
msgstr "Kein Patch-Block entspricht dem angegebenen Muster"
-#: add-patch.c:1620
+#: add-patch.c:1626
msgid "Sorry, cannot split this hunk"
msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen"
-#: add-patch.c:1624
+#: add-patch.c:1630
#, c-format
msgid "Split into %d hunks."
msgstr "In %d Patch-Block aufgeteilt."
-#: add-patch.c:1628
+#: add-patch.c:1634
msgid "Sorry, cannot edit this hunk"
msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten"
-#: add-patch.c:1680
+#: add-patch.c:1686
msgid "'git apply' failed"
msgstr "'git apply' schlug fehl"
-#: advice.c:145
+#: advice.c:81
#, c-format
msgid ""
"\n"
@@ -771,43 +770,43 @@
"\n"
"Deaktivieren Sie diese Nachricht mit \"git config advice.%s false\""
-#: advice.c:161
+#: advice.c:97
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sHinweis: %.*s%s\n"
-#: advice.c:252
+#: advice.c:181
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien "
"haben."
-#: advice.c:254
+#: advice.c:183
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:256
+#: advice.c:185
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:258
+#: advice.c:187
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:260
+#: advice.c:189
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:262
+#: advice.c:191
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:270
+#: advice.c:199
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."
@@ -816,40 +815,49 @@
"dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
"und zu committen."
-#: advice.c:278
+#: advice.c:207
msgid "Exiting because of an unresolved conflict."
msgstr "Beende wegen unaufgelöstem Konflikt."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:212 builtin/merge.c:1388
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
-#: advice.c:285
+#: advice.c:214
msgid "Please, commit your changes before merging."
msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
-#: advice.c:286
+#: advice.c:215
msgid "Exiting because of unfinished merge."
msgstr "Beende wegen nicht abgeschlossenem Merge."
-#: advice.c:296
+#: advice.c:220
+msgid "Not possible to fast-forward, aborting."
+msgstr "Vorspulen nicht möglich, breche ab."
+
+#: advice.c:230
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"Die folgenden Pfadspezifikationen entsprachen keinem geeigneten Pfad, aber\n"
-"entsprechen Index-Einträgen außerhalb des aktuellen partiellen Checkouts:\n"
+"Die folgenden Pfade und/oder Pfadspezifikationen entsprachen keinem Pfad,\n"
+"der außerhalb Ihrer partiellen Checkout-Definition existierte, weshalb\n"
+"diese nicht im Index aktualisiert werden:\n"
-#: advice.c:303
+#: advice.c:237
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Deaktivieren oder verändern Sie die Regeln für partielle Checkouts, wenn Sie "
-"solche Einträge aktualisieren möchten."
+"Wenn Sie beabsichtigen, solche Einträge zu aktualisieren, versuchen Sie es\n"
+"mit einem der folgenden Schritte:\n"
+"* Verwenden Sie die Option --sparse.\n"
+"* Deaktivieren oder ändern Sie die Regeln für partielle Checkouts."
-#: advice.c:310
+#: advice.c:245
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -898,7 +906,7 @@
#: alias.c:51
msgid "unclosed quote"
-msgstr "Nicht geschlossene Anführungszeichen."
+msgstr "nicht geschlossene Anführungszeichen"
#: apply.c:70
#, c-format
@@ -910,72 +918,87 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject und --3way können nicht gemeinsam verwendet werden."
+#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
+#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
+#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
+#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
+#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
+#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
+#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
+#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
+#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
+#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
+#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
+#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
+#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
+#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
+#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
+#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
+#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
+#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
+#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
+#: builtin/worktree.c:779
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden"
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way kann nicht außerhalb eines Repositories verwendet werden"
+#: apply.c:141 apply.c:152 apply.c:155
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' außerhalb eines Repositories"
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index kann nicht außerhalb eines Repositories verwendet werden"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached kann nicht außerhalb eines Repositories verwendet werden"
-
-#: apply.c:800
+#: apply.c:807
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
-#: apply.c:809
+#: apply.c:816
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
-#: apply.c:883
+#: apply.c:890
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "konnte keinen Dateinamen in Zeile %d des Patches finden"
-#: apply.c:921
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile "
"%d"
-#: apply.c:927
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d"
-#: apply.c:928
+#: apply.c:935
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d"
-#: apply.c:933
+#: apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d"
-#: apply.c:962
+#: apply.c:969
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "Ungültiger Modus in Zeile %d: %s"
-#: apply.c:1281
+#: apply.c:1288
#, c-format
msgid "inconsistent header lines %d and %d"
-msgstr "Inkonsistente Kopfzeilen %d und %d."
+msgstr "inkonsistente Kopfzeilen %d und %d"
-#: apply.c:1371
+#: apply.c:1378
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -990,82 +1013,82 @@
"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
"%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
-#: apply.c:1384
+#: apply.c:1391
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile "
"%d)"
-#: apply.c:1480
+#: apply.c:1487
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: unerwartete Zeile: %.*s"
-#: apply.c:1549
+#: apply.c:1556
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
-#: apply.c:1752
+#: apply.c:1759
msgid "new file depends on old contents"
msgstr "neue Datei hängt von alten Inhalten ab"
-#: apply.c:1754
+#: apply.c:1761
msgid "deleted file still has contents"
msgstr "entfernte Datei hat noch Inhalte"
-#: apply.c:1788
+#: apply.c:1795
#, c-format
msgid "corrupt patch at line %d"
msgstr "fehlerhafter Patch bei Zeile %d"
-#: apply.c:1825
+#: apply.c:1832
#, c-format
msgid "new file %s depends on old contents"
msgstr "neue Datei %s hängt von alten Inhalten ab"
-#: apply.c:1827
+#: apply.c:1834
#, c-format
msgid "deleted file %s still has contents"
msgstr "entfernte Datei %s hat noch Inhalte"
-#: apply.c:1830
+#: apply.c:1837
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
+msgstr "** Warnung: Datei %s wird leer, aber ist nicht entfernt"
-#: apply.c:1977
+#: apply.c:1985
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
-#: apply.c:2014
+#: apply.c:2022
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "nicht erkannter Binär-Patch bei Zeile %d"
-#: apply.c:2176
+#: apply.c:2184
#, c-format
msgid "patch with only garbage at line %d"
msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
-#: apply.c:2262
+#: apply.c:2270
#, c-format
msgid "unable to read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: apply.c:2266
+#: apply.c:2274
#, c-format
msgid "unable to open or read %s"
msgstr "konnte %s nicht öffnen oder lesen"
-#: apply.c:2935
+#: apply.c:2943
#, c-format
msgid "invalid start of line: '%c'"
msgstr "Ungültiger Zeilenanfang: '%c'"
-#: apply.c:3056
+#: apply.c:3064
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -1073,12 +1096,12 @@
msgstr[1] ""
"Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
-#: apply.c:3068
+#: apply.c:3076
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden"
-#: apply.c:3074
+#: apply.c:3082
#, c-format
msgid ""
"while searching for:\n"
@@ -1087,502 +1110,501 @@
"bei der Suche nach:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3104
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "keine Daten in Binär-Patch für '%s'"
-#: apply.c:3104
+#: apply.c:3112
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"kann binären Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n"
"umgekehrten Patch-Block auf '%s'"
-#: apply.c:3151
+#: apply.c:3159
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"kann binären Patch auf '%s' nicht ohne eine vollständige Index-Zeile anwenden"
-#: apply.c:3162
+#: apply.c:3170
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
-"entspricht"
+"entspricht."
-#: apply.c:3170
+#: apply.c:3178
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "der Patch wird auf ein leeres '%s' angewendet, was aber nicht leer ist"
-#: apply.c:3188
+#: apply.c:3196
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "das erforderliche Postimage %s für '%s' kann nicht gelesen werden"
-#: apply.c:3201
+#: apply.c:3209
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
-#: apply.c:3208
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)"
-#: apply.c:3229
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
-#: apply.c:3352
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr "kann %s nicht auschecken"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
+#: setup.c:310
#, c-format
msgid "failed to read %s"
msgstr "Fehler beim Lesen von %s"
-#: apply.c:3412
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3449 apply.c:3721
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "Pfad %s wurde umbenannt/gelöscht"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3559 apply.c:3736
#, c-format
msgid "%s: does not exist in index"
msgstr "%s ist nicht im Index"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3568 apply.c:3744 apply.c:3960
#, c-format
msgid "%s: does not match index"
msgstr "%s entspricht nicht der Version im Index"
-#: apply.c:3571
+#: apply.c:3605
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
"Dem Repository fehlt der notwendige Blob, um einen 3-Wege-Merge "
"durchzuführen."
-#: apply.c:3574
+#: apply.c:3608
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Führe 3-Wege-Merge durch...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3624 apply.c:3628
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
-#: apply.c:3606
+#: apply.c:3640
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Fehler beim Durchführen des 3-Wege-Merges...\n"
-#: apply.c:3620
+#: apply.c:3654
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
-#: apply.c:3625
+#: apply.c:3659
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch auf '%s' sauber angewendet.\n"
-#: apply.c:3642
+#: apply.c:3676
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Ausweichen auf direkte Anwendung...\n"
-#: apply.c:3654
+#: apply.c:3688
msgid "removal patch leaves file contents"
msgstr "Lösch-Patch hinterlässt Dateiinhalte"
-#: apply.c:3727
+#: apply.c:3761
#, c-format
msgid "%s: wrong type"
msgstr "%s: falscher Typ"
-#: apply.c:3729
+#: apply.c:3763
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s ist vom Typ %o, erwartete %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
+#: read-cache.c:1399
#, c-format
msgid "invalid path '%s'"
msgstr "Ungültiger Pfad '%s'"
-#: apply.c:3952
+#: apply.c:3958
#, c-format
msgid "%s: already exists in index"
msgstr "%s ist bereits bereitgestellt"
-#: apply.c:3956
+#: apply.c:3962
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s existiert bereits im Arbeitsverzeichnis"
-#: apply.c:3976
+#: apply.c:3982
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)"
-#: apply.c:3981
+#: apply.c:3987
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s"
-#: apply.c:4001
+#: apply.c:4007
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
-#: apply.c:4005
+#: apply.c:4011
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: Patch konnte nicht angewendet werden"
-#: apply.c:4020
+#: apply.c:4026
#, c-format
msgid "Checking patch %s..."
-msgstr "Prüfe Patch %s ..."
+msgstr "Prüfe Patch %s..."
-#: apply.c:4112
+#: apply.c:4118
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "SHA-1 Information fehlt oder ist unbrauchbar für Submodul %s"
-#: apply.c:4119
+#: apply.c:4125
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet"
-#: apply.c:4122
+#: apply.c:4128
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
-#: apply.c:4131
+#: apply.c:4137
#, c-format
msgid "could not add %s to temporary index"
msgstr "konnte %s nicht zum temporären Index hinzufügen"
-#: apply.c:4141
+#: apply.c:4147
#, c-format
msgid "could not write temporary index to %s"
msgstr "konnte temporären Index nicht nach %s schreiben"
-#: apply.c:4279
+#: apply.c:4285
#, c-format
msgid "unable to remove %s from index"
msgstr "konnte %s nicht aus dem Index entfernen"
-#: apply.c:4313
+#: apply.c:4319
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "fehlerhafter Patch für Submodul %s"
-#: apply.c:4319
+#: apply.c:4325
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "konnte neu erstellte Datei '%s' nicht lesen"
-#: apply.c:4327
+#: apply.c:4333
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4339 apply.c:4484
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "Fehler beim Schreiben nach '%s'"
-#: apply.c:4380
+#: apply.c:4386
#, c-format
msgid "closing file '%s'"
msgstr "schließe Datei '%s'"
-#: apply.c:4450
+#: apply.c:4456
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
-#: apply.c:4548
+#: apply.c:4554
#, c-format
msgid "Applied patch %s cleanly."
-msgstr "Patch %s sauber angewendet"
+msgstr "Patch %s sauber angewendet."
-#: apply.c:4556
+#: apply.c:4562
msgid "internal error"
msgstr "interner Fehler"
-#: apply.c:4559
+#: apply.c:4565
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..."
msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..."
-#: apply.c:4570
+#: apply.c:4576
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4584
#, c-format
msgid "cannot open %s"
msgstr "kann '%s' nicht öffnen"
-#: apply.c:4592
+#: apply.c:4598
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Patch-Bereich #%d sauber angewendet."
-#: apply.c:4596
+#: apply.c:4602
#, c-format
msgid "Rejected hunk #%d."
msgstr "Patch-Block #%d zurückgewiesen."
-#: apply.c:4725
+#: apply.c:4731
#, c-format
msgid "Skipped patch '%s'."
msgstr "Patch '%s' ausgelassen."
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "nicht erkannte Eingabe"
+#: apply.c:4740
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Keine gültigen Patches in der Eingabe (erlauben mit \"--allow-empty\")"
-#: apply.c:4753
+#: apply.c:4761
msgid "unable to read index file"
msgstr "Konnte Index-Datei nicht lesen"
-#: apply.c:4910
+#: apply.c:4918
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kann Patch '%s' nicht öffnen: %s"
-#: apply.c:4937
+#: apply.c:4945
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "unterdrückte %d Whitespace-Fehler"
msgstr[1] "unterdrückte %d Whitespace-Fehler"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4951 apply.c:4966
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu."
msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu."
-#: apply.c:4951
+#: apply.c:4959
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet."
msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
-msgstr "Konnte neue Index-Datei nicht schreiben."
+msgstr "Konnte neue Index-Datei nicht schreiben"
-#: apply.c:4995
+#: apply.c:5003
msgid "don't apply changes matching the given path"
msgstr "keine Änderungen im angegebenen Pfad anwenden"
-#: apply.c:4998
+#: apply.c:5006
msgid "apply changes matching the given path"
msgstr "Änderungen nur im angegebenen Pfad anwenden"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5008 builtin/am.c:2379
msgid "num"
msgstr "Anzahl"
-#: apply.c:5001
+#: apply.c:5009
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
"entfernen"
-#: apply.c:5004
+#: apply.c:5012
msgid "ignore additions made by the patch"
msgstr "hinzugefügte Zeilen des Patches ignorieren"
-#: apply.c:5006
+#: apply.c:5014
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"statt den Patch anzuwenden, den \"diffstat\" für die Eingabe ausgegeben"
-#: apply.c:5010
+#: apply.c:5018
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
-#: apply.c:5012
+#: apply.c:5020
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
"statt den Patch anzuwenden, eine Zusammenfassung für die Eingabe ausgeben"
-#: apply.c:5014
+#: apply.c:5022
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
"statt den Patch anzuwenden, anzeigen ob der Patch angewendet werden kann"
-#: apply.c:5016
+#: apply.c:5024
msgid "make sure the patch is applicable to the current index"
msgstr ""
"sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
-#: apply.c:5018
+#: apply.c:5026
msgid "mark new files with `git add --intent-to-add`"
msgstr "neue Dateien mit `git add --intent-to-add` markieren"
-#: apply.c:5020
+#: apply.c:5028
msgid "apply a patch without touching the working tree"
msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
-#: apply.c:5022
+#: apply.c:5030
msgid "accept a patch that touches outside the working area"
msgstr ""
"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
-#: apply.c:5025
+#: apply.c:5033
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
-#: apply.c:5027
+#: apply.c:5035
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"versuche 3-Wege-Merge, weiche auf normalen Patch aus, wenn dies fehlschlägt"
-#: apply.c:5029
+#: apply.c:5037
msgid "build a temporary index based on embedded index information"
msgstr ""
"einen temporären Index, basierend auf den integrierten Index-Informationen, "
"erstellen"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5040 builtin/checkout-index.c:230
msgid "paths are separated with NUL character"
msgstr "Pfade sind getrennt durch NUL Zeichen"
-#: apply.c:5034
+#: apply.c:5042
msgid "ensure at least <n> lines of context match"
msgstr ""
"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
+#: builtin/rebase.c:1079
msgid "action"
msgstr "Aktion"
-#: apply.c:5036
+#: apply.c:5044
msgid "detect new or modified lines that have whitespace errors"
msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5047 apply.c:5050
msgid "ignore changes in whitespace when finding context"
msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
-#: apply.c:5045
+#: apply.c:5053
msgid "apply the patch in reverse"
msgstr "den Patch in umgekehrter Reihenfolge anwenden"
-#: apply.c:5047
+#: apply.c:5055
msgid "don't expect at least one line of context"
msgstr "keinen Kontext erwarten"
-#: apply.c:5049
+#: apply.c:5057
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
-#: apply.c:5051
+#: apply.c:5059
msgid "allow overlapping hunks"
msgstr "sich überlappende Patch-Blöcke erlauben"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "erweiterte Ausgaben"
-
-#: apply.c:5054
+#: apply.c:5062
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
-#: apply.c:5057
+#: apply.c:5065
msgid "do not trust the line counts in the hunk headers"
msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5067 builtin/am.c:2367
msgid "root"
msgstr "Wurzelverzeichnis"
-#: apply.c:5060
+#: apply.c:5068
msgid "prepend <root> to all filenames"
msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
-#: archive-tar.c:125 archive-zip.c:345
+#: apply.c:5071
+msgid "don't return error for empty patches"
+msgstr "keinen Fehler für leere Patches zurückgeben"
+
+#: archive-tar.c:125 archive-zip.c:346
#, c-format
msgid "cannot stream blob %s"
-msgstr "Kann Blob %s nicht streamen."
+msgstr "kann Blob %s nicht streamen"
-#: archive-tar.c:265 archive-zip.c:358
+#: archive-tar.c:265 archive-zip.c:359
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "Nicht unterstützter Dateimodus: 0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
-msgstr "Konnte '%s' Filter nicht starten."
+msgstr "konnte '%s' Filter nicht starten"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
-msgstr "Konnte Descriptor nicht umleiten."
+msgstr "konnte Descriptor nicht umleiten"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
-msgstr "'%s' Filter meldete Fehler."
+msgstr "'%s' Filter meldete Fehler"
-#: archive-zip.c:318
+#: archive-zip.c:319
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "Pfad ist kein gültiges UTF-8: %s"
-#: archive-zip.c:322
+#: archive-zip.c:323
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s"
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
#, c-format
msgid "deflate error (%d)"
msgstr "Fehler beim Komprimieren (%d)"
-#: archive-zip.c:603
+#: archive-zip.c:604
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "Timestamp zu groß für dieses System: %<PRIuMAX>"
@@ -1591,10 +1613,6 @@
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]"
-#: 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>...]"
@@ -1606,143 +1624,138 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:579
#, c-format
-msgid "cannot read %s"
-msgstr "Kann %s nicht lesen."
+msgid "cannot read '%s'"
+msgstr "kann '%s' nicht lesen"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
-#, c-format
-msgid "could not read '%s'"
-msgstr "Konnte '%s' nicht lesen"
-
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "Referenz nicht gefunden: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "Kein gültiger Objektname: %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "Kein Tree-Objekt: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
-msgstr "Aktuelles Arbeitsverzeichnis ist unversioniert."
+msgstr "aktuelles Arbeitsverzeichnis ist unversioniert"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Datei nicht gefunden: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "Keine reguläre Datei: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "Format"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "Archivformat"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1809
msgid "prefix"
msgstr "Präfix"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
+#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
msgid "file"
msgstr "Datei"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "unversionierte Datei zum Archiv hinzufügen"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "das Archiv in diese Datei schreiben"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "Komprimierungsgrad setzen"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "unterstützte Archivformate auflisten"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
+#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
msgid "repo"
msgstr "Repository"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "Archiv vom Remote-Repository <Repository> abrufen"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
msgid "command"
msgstr "Programm"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Unerwartete Option --remote"
-#: archive.c:581
-msgid "Option --exec can only be used together with --remote"
-msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden"
+#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
+#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
+#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
+#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
+#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
+#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "die Option '%s' erfordert '%s'"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Unerwartete Option --output"
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr ""
-"Die Optionen --add-file und --remote können nicht gemeinsam verwendet werden"
-
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Unbekanntes Archivformat '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument für Format '%s' nicht unterstützt: -%d"
@@ -1765,22 +1778,22 @@
"Verneinende Muster werden in Git-Attributen ignoriert.\n"
"Benutzen Sie '\\!' für führende Ausrufezeichen."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Ungültiger Inhalt bzgl. Anführungszeichen in Datei '%s': %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Keine binäre Suche mehr möglich!\n"
-#: bisect.c:766
+#: bisect.c:765
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s ist kein gültiger Commit-Name"
-#: bisect.c:791
+#: bisect.c:790
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1789,7 +1802,7 @@
"Die Merge-Basis %s ist fehlerhaft.\n"
"Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
-#: bisect.c:796
+#: bisect.c:795
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1798,7 +1811,7 @@
"Die Merge-Basis %s ist neu.\n"
"Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
-#: bisect.c:801
+#: bisect.c:800
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1807,7 +1820,7 @@
"Die Merge-Basis %s ist %s.\n"
"Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
-#: bisect.c:809
+#: bisect.c:808
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1818,7 +1831,7 @@
"git bisect kann in diesem Fall nicht richtig arbeiten.\n"
"Vielleicht verwechselten Sie %s und %s Commits?\n"
-#: bisect.c:822
+#: bisect.c:821
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1830,36 +1843,36 @@
"erste %s Commit zwischen %s und %s befindet.\n"
"Es wird dennoch fortgesetzt."
-#: bisect.c:861
+#: bisect.c:860
#, c-format
msgid "Bisecting: a merge base must be tested\n"
-msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n"
+msgstr "Binäre Suche: eine Merge-Basis muss geprüft werden\n"
-#: bisect.c:911
+#: bisect.c:910
#, c-format
msgid "a %s revision is needed"
msgstr "ein %s Commit wird benötigt"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:940
#, c-format
msgid "could not create file '%s'"
msgstr "konnte Datei '%s' nicht erstellen"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:986 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "Konnte Datei '%s' nicht lesen"
-#: bisect.c:1027
+#: bisect.c:1026
msgid "reading bisect refs failed"
msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
-#: bisect.c:1057
+#: bisect.c:1056
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s war sowohl %s als auch %s\n"
-#: bisect.c:1066
+#: bisect.c:1065
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1868,7 +1881,7 @@
"Kein testbarer Commit gefunden.\n"
"Vielleicht starteten Sie mit schlechten Pfad-Argumenten?\n"
-#: bisect.c:1095
+#: bisect.c:1094
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1878,151 +1891,183 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1100
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
-msgstr[0] "binäre Suche: danach noch %d Commit zum Testen übrig %s\n"
-msgstr[1] "binäre Suche: danach noch %d Commits zum Testen übrig %s\n"
+msgstr[0] "Binäre Suche: danach noch %d Commit zum Testen übrig %s\n"
+msgstr[1] "Binäre Suche: danach noch %d Commits zum Testen übrig %s\n"
-#: blame.c:2776
+#: blame.c:2773
msgid "--contents and --reverse do not blend well."
msgstr "--contents und --reverse funktionieren gemeinsam nicht."
-#: blame.c:2790
+#: blame.c:2787
msgid "cannot use --contents with final commit object name"
msgstr ""
"kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen"
-#: blame.c:2811
+#: blame.c:2808
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse und --first-parent zusammen erfordern die Angabe eines "
"endgültigen\n"
"Commits"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
+#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
+#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
+#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
+#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
-#: blame.c:2838
+#: blame.c:2835
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n"
"\"first-parent\"-Kette"
-#: blame.c:2849
+#: blame.c:2846
#, c-format
msgid "no such path %s in %s"
msgstr "Pfad %s nicht in %s gefunden"
-#: blame.c:2860
+#: blame.c:2857
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kann Blob %s für Pfad '%s' nicht lesen"
-#: branch.c:53
-#, c-format
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr ""
-"\n"
-"Nachdem Sie die Fehlerursache behoben haben, können Sie\n"
-"die Tracking-Informationen mit\n"
-"\"git branch --set-upstream-to=%s%s%s\"\n"
-"erneut setzen."
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Branch %s kann nicht sein eigener Upstream-Branch sein."
-
#: branch.c:93
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr "Branch '%s' folgt nun Remote-Branch '%s' von '%s' durch Rebase."
-
-#: branch.c:94
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "Branch '%s' folgt nun Remote-Branch '%s' von '%s'."
-
-#: branch.c:98
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "Branch '%s' folgt nun lokalem Branch '%s' durch Rebase."
-
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "Branch '%s' folgt nun lokalem Branch '%s'."
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
+msgstr ""
+"Upstream-Tracking-Konfiguration von mehreren Referenzen kann nicht vererbt "
+"werden, wenn ein Rebase angefordert wird"
#: branch.c:104
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr "Branch '%s' folgt nun Remote-Referenz '%s' durch Rebase."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "Branch %s nicht als sein eigener Upstream-Branch gesetzt"
-#: branch.c:105
+#: branch.c:160
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "Branch '%s' folgt nun Remote-Referenz '%s'."
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "Branch '%s' folgt nun '%s' durch Rebase."
-#: branch.c:109
+#: branch.c:161
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr "Branch '%s' folgt nun lokaler Referenz '%s' durch Rebase."
+msgid "branch '%s' set up to track '%s'."
+msgstr "Branch '%s' folgt nun '%s'."
-#: branch.c:110
+#: branch.c:164
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "Branch '%s' folgt nun lokaler Referenz '%s'."
+msgid "branch '%s' set up to track:"
+msgstr "Branch '%s' folgt nun:"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Konnte Konfiguration zu Upstream-Branch nicht schreiben."
+#: branch.c:176
+msgid "unable to write upstream branch configuration"
+msgstr "konnte Konfiguration zu Upstream-Branch nicht schreiben"
-#: branch.c:156
-#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
+#: branch.c:178
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
msgstr ""
-"Konfiguration zum Folgen von Branch nicht eingerichtet. Referenz %s ist "
-"mehrdeutig."
+"\n"
+"Nachdem Sie die Fehlerursache behoben haben, können Sie\n"
+"die Tracking-Informationen erneut setzen mit:"
-#: branch.c:189
+#: branch.c:219
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' ist kein gültiger Branchname."
-
-#: branch.c:208
-#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Branch '%s' existiert bereits."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen."
-
-#: branch.c:233
-#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "asked to inherit tracking from '%s', but no remote is set"
msgstr ""
-"Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein "
-"Branch."
+"Vererbung des Tracking von '%s' angefragt, aber es ist kein Remote-"
+"Repository gesetzt"
-#: branch.c:235
+#: branch.c:225
+#, c-format
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr ""
+"Vererbung des Tracking von '%s' angefragt, aber es ist keine Merge-"
+"Konfiguration gesetzt"
+
+#: branch.c:277
+#, c-format
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "kein Tracking: mehrdeutige Informationen für Referenz '%s'"
+
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading " " space around.
+#.
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#: branch.c:289 object-name.c:464
+#, c-format
+msgid " %s\n"
+msgstr " %s\n"
+
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#: branch.c:295
+#, c-format
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
+"Es gibt mehrere Remote-Repositories, deren Fetch-Refspecs der\n"
+"Remote-Tracking-Referenz '%s' zugeordnet sind:\n"
+"%s\n"
+"Das ist in der Regel ein Konfigurationsfehler.\n"
+"\n"
+"Um das Setzen von Tracking-Branches zu unterstützen,\n"
+"stellen Sie sicher, dass verschiedene Fetch-Refspecs der\n"
+"Remote-Repositories zu verschiedenen Tracking-Namensräumen\n"
+"zugeordnet werden."
+
+#: branch.c:344
+#, c-format
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' ist kein gültiger Branchname"
+
+#: branch.c:364
+#, c-format
+msgid "a branch named '%s' already exists"
+msgstr "Branch '%s' existiert bereits"
+
+#: branch.c:370
+#, c-format
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr ""
+"kann Aktualisierung des Branches '%s' nicht erzwingen, ausgecheckt in '%s'"
+
+#: branch.c:393
+#, c-format
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein Branch"
+
+#: branch.c:395
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "der angeforderte Upstream-Branch '%s' existiert nicht"
-#: branch.c:237
+#: branch.c:397
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -2043,125 +2088,145 @@
"\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n"
"zu konfigurieren."
-#: branch.c:281
+#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Ungültiger Objekt-Name: '%s'"
+msgid "not a valid object name: '%s'"
+msgstr "kein gültiger Objektname: '%s'"
-#: branch.c:301
+#: branch.c:465
#, c-format
-msgid "Ambiguous object name: '%s'."
+msgid "ambiguous object name: '%s'"
msgstr "mehrdeutiger Objekt-Name: '%s'"
-#: branch.c:306
+#: branch.c:470
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Ungültiger Branchpunkt: '%s'"
+msgid "not a valid branch point: '%s'"
+msgstr "ungültiger Branchpunkt: '%s'"
-#: branch.c:366
+#: branch.c:658
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "Submodul '%s': Submodul konnte nicht gefunden werden"
+
+#: branch.c:661
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
+msgstr ""
+"Sie können versuchen die Submodule mit 'git checkout %s && git submodule "
+"update --init' zu aktualisieren"
+
+#: branch.c:672 branch.c:698
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "Submodul '%s': kann Branch nicht erzeugen: '%s'"
+
+#: branch.c:730
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ist bereits in '%s' ausgecheckt"
-#: branch.c:389
+#: branch.c:755
#, c-format
msgid "HEAD of working tree %s is not updated"
-msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
+msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert"
-#: bundle.c:44
+#: bundle.c:45
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
msgstr "unbekannter Paket-Hash-Algorithmus: %s"
-#: bundle.c:48
+#: bundle.c:53
#, c-format
msgid "unknown capability '%s'"
msgstr "unbekannte Fähigkeit '%s'"
-#: bundle.c:74
+#: bundle.c:79
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
msgstr "'%s' sieht nicht wie eine v2 oder v3 Paketdatei aus"
-#: bundle.c:113
+#: bundle.c:118
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
+#: builtin/commit.c:865
#, c-format
msgid "could not open '%s'"
msgstr "Konnte '%s' nicht öffnen"
-#: bundle.c:198
+#: bundle.c:203
msgid "Repository lacks these prerequisite commits:"
msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
-#: bundle.c:201
+#: bundle.c:206
msgid "need a repository to verify a bundle"
-msgstr "Um ein Paket zu überprüfen wird ein Repository benötigt."
-
-#: bundle.c:257
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Das Paket enthält diese Referenz:"
-msgstr[1] "Das Paket enthält diese %d Referenzen:"
+msgstr "um ein Paket zu überprüfen wird ein Repository benötigt"
#: bundle.c:264
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Das Paket enthält diese Referenz:"
+msgstr[1] "Das Paket enthält diese %<PRIuMAX> Referenzen:"
+
+#: bundle.c:272
msgid "The bundle records a complete history."
msgstr "Das Paket speichert eine komplette Historie."
-#: bundle.c:266
+#: bundle.c:274
#, c-format
msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
msgstr[0] "Das Paket benötigt diese Referenz:"
-msgstr[1] "Das Paket benötigt diese %d Referenzen:"
+msgstr[1] "Das Paket benötigt diese %<PRIuMAX> Referenzen:"
-#: bundle.c:333
+#: bundle.c:350
msgid "unable to dup bundle descriptor"
-msgstr "Konnte dup für Descriptor des Pakets nicht ausführen."
+msgstr "konnte dup für Descriptor des Pakets nicht ausführen"
-#: bundle.c:340
+#: bundle.c:357
msgid "Could not spawn pack-objects"
msgstr "Konnte Paketobjekte nicht erstellen"
-#: bundle.c:351
+#: bundle.c:368
msgid "pack-objects died"
msgstr "Erstellung der Paketobjekte abgebrochen"
-#: bundle.c:400
+#: bundle.c:417
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
-#: bundle.c:504
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "nicht unterstützte Paket-Version %d"
-
-#: bundle.c:506
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "kann Paket-Version %d nicht mit Algorithmus %s schreiben"
-
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
-#: bundle.c:553
+#: bundle.c:548
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "nicht unterstützte Paket-Version %d"
+
+#: bundle.c:550
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "kann Paket-Version %d nicht mit Algorithmus %s schreiben"
+
+#: bundle.c:600
msgid "Refusing to create empty bundle."
msgstr "Erstellung eines leeren Pakets zurückgewiesen."
-#: bundle.c:563
+#: bundle.c:610
#, c-format
msgid "cannot create '%s'"
msgstr "kann '%s' nicht erstellen"
-#: bundle.c:588
+#: bundle.c:639
msgid "index-pack died"
msgstr "Erstellung der Paketindexdatei abgebrochen"
@@ -2184,12 +2249,12 @@
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "letzter Chunk hat nicht-Null ID %<PRIx32>"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "Ungültiger Farbwert: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:52
msgid "invalid hash version"
msgstr "ungültige Hash-Version"
@@ -2200,224 +2265,225 @@
#: commit-graph.c:355
#, c-format
msgid "commit-graph signature %X does not match signature %X"
-msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein."
+msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein"
#: commit-graph.c:362
#, c-format
msgid "commit-graph version %X does not match version %X"
-msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X überein."
+msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X überein"
#: commit-graph.c:369
#, c-format
msgid "commit-graph hash version %X does not match version %X"
-msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X überein."
+msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X überein"
#: commit-graph.c:386
#, c-format
msgid "commit-graph file is too small to hold %u chunks"
msgstr "Commit-Graph-Datei ist zu klein, um %u Chunks zu enthalten"
-#: commit-graph.c:482
+#: commit-graph.c:485
msgid "commit-graph has no base graphs chunk"
msgstr "Commit-Graph hat keinen Basis-Graph-Chunk"
-#: commit-graph.c:492
+#: commit-graph.c:495
msgid "commit-graph chain does not match"
-msgstr "Commit-Graph Verkettung stimmt nicht überein."
+msgstr "Commit-Graph Verkettung stimmt nicht überein"
-#: commit-graph.c:540
+#: commit-graph.c:543
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash"
-#: commit-graph.c:564
+#: commit-graph.c:567
msgid "unable to find all commit-graph files"
-msgstr "Konnte nicht alle Commit-Graph-Dateien finden."
+msgstr "konnte nicht alle Commit-Graph-Dateien finden"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:752 commit-graph.c:789
msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "Ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt."
+msgstr "ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt"
-#: commit-graph.c:766
+#: commit-graph.c:773
#, c-format
msgid "could not find commit %s"
-msgstr "Konnte Commit %s nicht finden."
+msgstr "konnte Commit %s nicht finden"
-#: commit-graph.c:799
+#: commit-graph.c:806
msgid "commit-graph requires overflow generation data but has none"
msgstr "Commit-Graph erfordert Überlaufgenerierungsdaten, aber hat keine"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
+#: builtin/clone.c:705
#, c-format
msgid "unable to parse commit %s"
-msgstr "Konnte Commit '%s' nicht parsen."
+msgstr "konnte Commit '%s' nicht parsen"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1373 builtin/pack-objects.c:3078
#, c-format
msgid "unable to get type of object %s"
-msgstr "Konnte Art von Objekt '%s' nicht bestimmen."
+msgstr "konnte Art von Objekt '%s' nicht bestimmen"
-#: commit-graph.c:1368
+#: commit-graph.c:1404
msgid "Loading known commits in commit graph"
msgstr "Lade bekannte Commits in Commit-Graph"
-#: commit-graph.c:1385
+#: commit-graph.c:1421
msgid "Expanding reachable commits in commit graph"
msgstr "Erweitere erreichbare Commits in Commit-Graph"
-#: commit-graph.c:1405
+#: commit-graph.c:1441
msgid "Clearing commit marks in commit graph"
msgstr "Lösche Commit-Markierungen in Commit-Graph"
-#: commit-graph.c:1424
+#: commit-graph.c:1460
msgid "Computing commit graph topological levels"
msgstr "Topologische Ebenen des Commit-Graph werden berechnet"
-#: commit-graph.c:1477
+#: commit-graph.c:1513
msgid "Computing commit graph generation numbers"
msgstr "Commit-Graph Generationsnummern berechnen"
-#: commit-graph.c:1558
+#: commit-graph.c:1598
msgid "Computing commit changed paths Bloom filters"
msgstr "Berechnung der Bloom-Filter für veränderte Pfade des Commits"
-#: commit-graph.c:1635
+#: commit-graph.c:1675
msgid "Collecting referenced commits"
msgstr "Sammle referenzierte Commits"
-#: commit-graph.c:1660
+#: commit-graph.c:1701
#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "Suche Commits für Commit-Graph in %d Paket"
-msgstr[1] "Suche Commits für Commit-Graph in %d Paketen"
-
-#: commit-graph.c:1673
-#, c-format
-msgid "error adding pack %s"
-msgstr "Fehler beim Hinzufügen von Paket %s."
-
-#: commit-graph.c:1677
-#, c-format
-msgid "error opening index for %s"
-msgstr "Fehler beim Öffnen des Index für %s."
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "Suche Commits für Commit-Graph in %<PRIuMAX> Paket"
+msgstr[1] "Suche Commits für Commit-Graph in %<PRIuMAX> Paketen"
#: commit-graph.c:1714
+#, c-format
+msgid "error adding pack %s"
+msgstr "Fehler beim Hinzufügen von Paket %s"
+
+#: commit-graph.c:1718
+#, c-format
+msgid "error opening index for %s"
+msgstr "Fehler beim Öffnen des Index für %s"
+
+#: commit-graph.c:1756
msgid "Finding commits for commit graph among packed objects"
msgstr "Suche Commits für Commit-Graph in gepackten Objekten"
-#: commit-graph.c:1732
+#: commit-graph.c:1774
msgid "Finding extra edges in commit graph"
msgstr "Suche zusätzliche Ränder in Commit-Graph"
-#: commit-graph.c:1781
+#: commit-graph.c:1823
msgid "failed to write correct number of base graph ids"
-msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs."
+msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
#, c-format
msgid "unable to create leading directories of %s"
-msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
+msgstr "konnte führende Verzeichnisse von '%s' nicht erstellen"
-#: commit-graph.c:1825
+#: commit-graph.c:1868
msgid "unable to create temporary graph layer"
msgstr "konnte temporäre Graphen-Schicht nicht erstellen"
-#: commit-graph.c:1830
+#: commit-graph.c:1873
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "konnte geteilte Zugriffsberechtigungen für '%s' nicht ändern"
-#: commit-graph.c:1887
+#: commit-graph.c:1930
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Schreibe Commit-Graph in %d Durchgang"
msgstr[1] "Schreibe Commit-Graph in %d Durchgängen"
-#: commit-graph.c:1923
+#: commit-graph.c:1967
msgid "unable to open commit-graph chain file"
msgstr "konnte Commit-Graph Chain-Datei nicht öffnen"
-#: commit-graph.c:1939
+#: commit-graph.c:1983
msgid "failed to rename base commit-graph file"
msgstr "konnte Basis-Commit-Graph-Datei nicht umbenennen"
-#: commit-graph.c:1959
+#: commit-graph.c:2004
msgid "failed to rename temporary commit-graph file"
msgstr "konnte temporäre Commit-Graph-Datei nicht umbenennen"
-#: commit-graph.c:2092
+#: commit-graph.c:2137
msgid "Scanning merged commits"
msgstr "Durchsuche zusammengeführte Commits"
-#: commit-graph.c:2136
+#: commit-graph.c:2181
msgid "Merging commit-graph"
msgstr "Zusammenführen von Commit-Graph"
-#: commit-graph.c:2244
+#: commit-graph.c:2289
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"versuche einen Commit-Graph zu schreiben, aber 'core.commitGraph' ist "
"deaktiviert"
-#: commit-graph.c:2351
+#: commit-graph.c:2396
msgid "too many commits to write graph"
msgstr "zu viele Commits zum Schreiben des Graphen"
-#: commit-graph.c:2449
+#: commit-graph.c:2494
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"die Commit-Graph-Datei hat eine falsche Prüfsumme und ist wahrscheinlich "
"beschädigt"
-#: commit-graph.c:2459
+#: commit-graph.c:2504
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "Commit-Graph hat fehlerhafte OID-Reihenfolge: %s dann %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2514 commit-graph.c:2529
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2521
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "konnte Commit %s von Commit-Graph nicht parsen"
-#: commit-graph.c:2494
+#: commit-graph.c:2539
msgid "Verifying commits in commit graph"
msgstr "Commit in Commit-Graph überprüfen"
-#: commit-graph.c:2509
+#: commit-graph.c:2554
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"Fehler beim Parsen des Commits %s von Objekt-Datenbank für Commit-Graph"
-#: commit-graph.c:2516
+#: commit-graph.c:2561
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"OID des Wurzelverzeichnisses für Commit %s in Commit-Graph ist %s != %s"
-#: commit-graph.c:2526
+#: commit-graph.c:2571
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "Commit-Graph Vorgänger-Liste für Commit %s ist zu lang"
-#: commit-graph.c:2535
+#: commit-graph.c:2580
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "Commit-Graph-Vorgänger für %s ist %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2594
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "Commit-Graph Vorgänger-Liste für Commit %s endet zu früh"
-#: commit-graph.c:2554
+#: commit-graph.c:2599
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2425,7 +2491,7 @@
"Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich "
"null"
-#: commit-graph.c:2558
+#: commit-graph.c:2603
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2433,29 +2499,29 @@
"Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst "
"null"
-#: commit-graph.c:2575
+#: commit-graph.c:2620
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "Commit-Graph Erstellung für Commit %s ist %<PRIuMAX> < %<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2626
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"Commit-Datum für Commit %s in Commit-Graph ist %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
+#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "konnte %s nicht parsen"
-#: commit.c:54
+#: commit.c:56
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s ist kein Commit!"
-#: commit.c:194
+#: commit.c:197
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2476,28 +2542,28 @@
"Sie können diese Meldung unterdrücken, indem Sie\n"
"\"git config advice.graftFileDeprecated false\" ausführen."
-#: commit.c:1237
+#: commit.c:1252
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s."
-#: commit.c:1241
+#: commit.c:1256
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s."
-#: commit.c:1244
+#: commit.c:1259
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s hat keine GPG-Signatur."
-#: commit.c:1247
+#: commit.c:1262
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n"
-#: commit.c:1501
+#: commit.c:1516
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"
@@ -2513,7 +2579,17 @@
msgid "memory exhausted"
msgstr "Speicher verbraucht"
-#: config.c:126
+#: compat/terminal.c:167
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+"kann nicht im Hintergrund fortgesetzt werden, bitte verwenden Sie 'fg', um "
+"fortzufahren"
+
+#: compat/terminal.c:168
+msgid "cannot restore terminal settings"
+msgstr "kann Terminaleinstellungen nicht wiederherstellen"
+
+#: config.c:143
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2529,350 +2605,377 @@
"überschritten.\n"
"Das könnte durch zirkulare Includes entstanden sein."
-#: config.c:142
+#: config.c:159
#, c-format
msgid "could not expand include path '%s'"
msgstr "Konnte Include-Pfad '%s' nicht erweitern."
-#: config.c:153
+#: config.c:170
msgid "relative config includes must come from files"
-msgstr "Relative Includes von Konfigurationen müssen aus Dateien kommen."
+msgstr "relative Includes von Konfigurationen müssen aus Dateien kommen"
-#: config.c:199
+#: config.c:219
msgid "relative config include conditionals must come from files"
msgstr ""
"Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden "
"müssen\n"
-"aus Dateien kommen."
+"aus Dateien kommen"
-#: config.c:396
+#: config.c:364
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"Remote-URLs können nicht in der Datei direkt oder indirekt einbezogen durch "
+"includeIf.hasconfig:remote.*.url konfiguriert werden"
+
+#: config.c:508
#, c-format
msgid "invalid config format: %s"
msgstr "ungültiges Konfigurationsformat: %s"
-#: config.c:400
+#: config.c:512
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "fehlender Name der Umgebungsvariable für Konfiguration '%.*s'"
-#: config.c:405
+#: config.c:517
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "fehlende Umgebungsvariable '%s' für Konfiguration '%.*s'"
-#: config.c:442
+#: config.c:553
#, c-format
msgid "key does not contain a section: %s"
msgstr "Schlüssel enthält keine Sektion: %s"
-#: config.c:448
+#: config.c:558
#, c-format
msgid "key does not contain variable name: %s"
msgstr "Schlüssel enthält keinen Variablennamen: %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:580 sequencer.c:2802
#, c-format
msgid "invalid key: %s"
msgstr "Ungültiger Schlüssel: %s"
-#: config.c:478
+#: config.c:585
#, c-format
msgid "invalid key (newline): %s"
msgstr "Ungültiger Schlüssel (neue Zeile): %s"
-#: config.c:511
+#: config.c:605
msgid "empty config key"
msgstr "leerer Konfigurationsschlüssel"
-#: config.c:529 config.c:541
+#: config.c:623 config.c:635
#, c-format
msgid "bogus config parameter: %s"
msgstr "Fehlerhafter Konfigurationsparameter: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:649 config.c:666 config.c:673 config.c:682
#, c-format
msgid "bogus format in %s"
msgstr "Fehlerhaftes Format in %s"
-#: config.c:622
+#: config.c:716
#, c-format
msgid "bogus count in %s"
msgstr "falsche Zählung in %s"
-#: config.c:626
+#: config.c:720
#, c-format
msgid "too many entries in %s"
msgstr "zu viele Einträge in %s"
-#: config.c:636
+#: config.c:730
#, c-format
msgid "missing config key %s"
msgstr "fehlender Konfigurationsschlüssel %s"
-#: config.c:644
+#: config.c:738
#, c-format
msgid "missing config value %s"
msgstr "fehlender Konfigurationswert %s"
-#: config.c:995
+#: config.c:1089
#, c-format
msgid "bad config line %d in blob %s"
msgstr "Ungültige Konfigurationszeile %d in Blob %s"
-#: config.c:999
+#: config.c:1093
#, c-format
msgid "bad config line %d in file %s"
msgstr "Ungültige Konfigurationszeile %d in Datei %s"
-#: config.c:1003
+#: config.c:1097
#, c-format
msgid "bad config line %d in standard input"
msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
-#: config.c:1007
+#: config.c:1101
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
-#: config.c:1011
+#: config.c:1105
#, c-format
msgid "bad config line %d in command line %s"
msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
-#: config.c:1015
+#: config.c:1109
#, c-format
msgid "bad config line %d in %s"
msgstr "Ungültige Konfigurationszeile %d in %s"
-#: config.c:1152
+#: config.c:1246
msgid "out of range"
msgstr "Außerhalb des Bereichs"
-#: config.c:1152
+#: config.c:1246
msgid "invalid unit"
msgstr "Ungültige Einheit"
-#: config.c:1153
+#: config.c:1247
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
-#: config.c:1163
+#: config.c:1257
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s"
-#: config.c:1166
+#: config.c:1260
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s"
-#: config.c:1169
+#: config.c:1263
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: "
"%s"
-#: config.c:1172
+#: config.c:1266
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: "
"%s"
-#: config.c:1175
+#: config.c:1269
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: "
"%s"
-#: config.c:1178
+#: config.c:1272
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s"
-#: config.c:1257
+#: config.c:1368
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "ungültiger Wert für Variable %s"
+
+#: config.c:1389
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "ignoriere unbekannte Komponente '%s' für core.fsync"
+
+#: config.c:1425
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "ungültiger boolescher Konfigurationswert '%s' für '%s'"
-#: config.c:1275
+#: config.c:1443
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
-#: config.c:1284
+#: config.c:1452
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
-#: config.c:1377
+#: config.c:1545
#, c-format
msgid "abbrev length out of range: %d"
msgstr "Länge für Abkürzung von Commit-IDs außerhalb des Bereichs: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1559 config.c:1570
#, c-format
msgid "bad zlib compression level %d"
msgstr "ungültiger zlib Komprimierungsgrad %d"
-#: config.c:1494
+#: config.c:1660
msgid "core.commentChar should only be one character"
msgstr "core.commentChar sollte nur ein Zeichen sein"
-#: config.c:1527
+#: config.c:1692
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "ignoriere unbekannten Wert '%s' für core.fsyncMethod"
+
+#: config.c:1698
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles is veraltet; nutzen Sie stattdessen core.fsync"
+
+#: config.c:1714
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "Ungültiger Modus für Objekterstellung: %s"
-#: config.c:1599
+#: config.c:1800
#, c-format
msgid "malformed value for %s"
-msgstr "Ungültiger Wert für %s."
+msgstr "ungültiger Wert für %s"
-#: config.c:1625
+#: config.c:1826
#, c-format
msgid "malformed value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: config.c:1626
+#: config.c:1827
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"Muss einer von diesen sein: nothing, matching, simple, upstream, current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1888 builtin/pack-objects.c:4078
#, c-format
msgid "bad pack compression level %d"
msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
-#: config.c:1809
+#: config.c:2014
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "Konnte Blob-Objekt '%s' für Konfiguration nicht laden."
-#: config.c:1812
+#: config.c:2017
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "Referenz '%s' zeigt auf keinen Blob."
-#: config.c:1829
+#: config.c:2035
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen."
-#: config.c:1874
+#: config.c:2080
#, c-format
msgid "failed to parse %s"
msgstr "Fehler beim Parsen von %s."
-#: config.c:1930
+#: config.c:2136
msgid "unable to parse command-line config"
msgstr ""
"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
-#: config.c:2294
+#: config.c:2512
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
-#: config.c:2468
+#: config.c:2686
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Ungültiger %s: '%s'"
-#: config.c:2513
+#: config.c:2731
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 "
"liegen."
-#: config.c:2559
+#: config.c:2763
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n"
"nicht parsen."
-#: config.c:2561
+#: config.c:2765
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
-#: config.c:2645
+#: config.c:2850
#, c-format
msgid "invalid section name '%s'"
msgstr "Ungültiger Sektionsname '%s'"
-#: config.c:2677
+#: config.c:2882
#, c-format
msgid "%s has multiple values"
msgstr "%s hat mehrere Werte"
-#: config.c:2706
+#: config.c:2911
#, c-format
msgid "failed to write new configuration file %s"
msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben."
-#: config.c:2958 config.c:3285
+#: config.c:3177 config.c:3518
#, c-format
msgid "could not lock config file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht sperren."
-#: config.c:2969
+#: config.c:3188
#, c-format
msgid "opening %s"
msgstr "Öffne %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:3225 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "Ungültiges Muster: %s"
-#: config.c:3031
+#: config.c:3250
#, c-format
msgid "invalid config file %s"
msgstr "Ungültige Konfigurationsdatei %s"
-#: config.c:3044 config.c:3298
+#: config.c:3263 config.c:3531
#, c-format
msgid "fstat on %s failed"
msgstr "fstat auf %s fehlgeschlagen"
-#: config.c:3055
+#: config.c:3274
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "mmap für '%s'(%s) fehlgeschlagen"
-#: config.c:3065 config.c:3303
+#: config.c:3284 config.c:3536
#, c-format
msgid "chmod on %s failed"
msgstr "chmod auf %s fehlgeschlagen"
-#: config.c:3150 config.c:3400
+#: config.c:3369 config.c:3633
#, c-format
msgid "could not write config file %s"
msgstr "Konnte Konfigurationsdatei %s nicht schreiben."
-#: config.c:3184
+#: config.c:3403
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' setzen."
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
#, c-format
msgid "could not unset '%s'"
msgstr "Konnte '%s' nicht aufheben."
-#: config.c:3276
+#: config.c:3509
#, c-format
msgid "invalid section name: %s"
msgstr "Ungültiger Sektionsname: %s"
-#: config.c:3443
+#: config.c:3676
#, c-format
msgid "missing value for '%s'"
msgstr "Fehlender Wert für '%s'"
@@ -2908,74 +3011,74 @@
msgid "expected flush after capabilities"
msgstr "Erwartete Flush nach Fähigkeiten."
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "Ignoriere Fähigkeiten nach der ersten Zeile '%s'."
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "Protokollfehler: unerwartetes capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "Protokollfehler: shallow SHA-1 erwartet, '%s' bekommen"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr ""
"Repository auf der Gegenseite kann keine unvollständige Historie (shallow) "
"enthalten"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "ungültiges Paket"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "Protokollfehler: unerwartetes '%s'"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "unbekanntes Objekt-Format '%s' vom Server angegeben"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "ungültige ls-refs Antwort: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "Flush nach Auflistung der Referenzen erwartet"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "Antwort-Endpaket nach Auflistung der Referenzen erwartet"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "Protokoll '%s' wird nicht unterstützt"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "kann SO_KEEPALIVE bei Socket nicht setzen"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Suche nach %s ..."
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "Fehler bei Suche nach %s (Port %s) (%s)."
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2984,7 +3087,7 @@
"Fertig.\n"
"Verbinde nach %s (Port %s) ... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2994,77 +3097,77 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "Fertig."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "Fehler bei der Suche nach %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "Unbekannter Port %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "Merkwürdigen Hostnamen '%s' blockiert."
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "Merkwürdigen Port '%s' blockiert."
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "Kann Proxy %s nicht starten."
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "kein Pfad angegeben; siehe 'git help pull' für eine gültige URL-Syntax"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "Zeilenumbruch ist in git:// Hosts und Repository-Pfaden verboten"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "SSH-Variante 'simple' unterstützt kein -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "SSH-Variante 'simple' unterstützt kein -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "Merkwürdigen Pfadnamen '%s' blockiert"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "kann Prozess nicht starten"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "Prüfe Konnektivität"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Konnte 'git rev-list' nicht ausführen"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "Fehler beim Schreiben nach rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "Fehler beim Schließen von rev-lists Standard-Eingabe"
@@ -3211,68 +3314,68 @@
msgid "refusing to work with credential missing protocol field"
msgstr "Weigerung, mit fehlendem Protokoll in Zugangsdaten zu arbeiten"
-#: credential.c:394
+#: credential.c:396
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "URL enthält Zeilenumbruch in der %s Komponente: %s"
-#: credential.c:438
+#: credential.c:440
#, c-format
msgid "url has no scheme: %s"
msgstr "URL hat kein Schema: %s"
-#: credential.c:511
+#: credential.c:513
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "URL mit Zugangsdaten konnte nicht geparst werden: %s"
-#: date.c:138
+#: date.c:139
msgid "in the future"
msgstr "in der Zukunft"
-#: date.c:144
+#: date.c:145
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "vor %<PRIuMAX> Sekunde"
msgstr[1] "vor %<PRIuMAX> Sekunden"
-#: date.c:151
+#: date.c:152
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "vor %<PRIuMAX> Minute"
msgstr[1] "vor %<PRIuMAX> Minuten"
-#: date.c:158
+#: date.c:159
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "vor %<PRIuMAX> Stunde"
msgstr[1] "vor %<PRIuMAX> Stunden"
-#: date.c:165
+#: date.c:166
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "vor %<PRIuMAX> Tag"
msgstr[1] "vor %<PRIuMAX> Tagen"
-#: date.c:171
+#: date.c:172
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "vor %<PRIuMAX> Woche"
msgstr[1] "vor %<PRIuMAX> Wochen"
-#: date.c:178
+#: date.c:179
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "vor %<PRIuMAX> Monat"
msgstr[1] "vor %<PRIuMAX> Monaten"
-#: date.c:189
+#: date.c:190
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -3280,14 +3383,14 @@
msgstr[1] "vor %<PRIuMAX> Jahren"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
+#: date.c:193
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s, und %<PRIuMAX> Monat"
msgstr[1] "%s, und %<PRIuMAX> Monaten"
-#: date.c:197 date.c:202
+#: date.c:198 date.c:203
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
@@ -3321,28 +3424,32 @@
msgid "Marked %d islands, done.\n"
msgstr "%d Delta-Islands markiert, fertig.\n"
-#: diff-merges.c:70
+#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
+#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
+#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
+#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
+#: builtin/pull.c:47 builtin/pull.c:321
#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "unbekannter Wert für --diff-merges: %s"
+msgid "invalid value for '%s': '%s'"
+msgstr "ungültiger Wert für '%s': '%s'"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base funktioniert nicht mit Bereichen"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base funktioniert nur mit Commits"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "konnte HEAD nicht bekommen"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "keine Merge-Basis gefunden"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "mehrere Merge-Basen gefunden"
@@ -3358,18 +3465,18 @@
"Kein Git-Repository. Nutzen Sie --no-index, um zwei Pfade außerhalb des "
"Arbeitsverzeichnisses zu vergleichen."
-#: diff.c:156
+#: diff.c:159
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
-#: diff.c:161
+#: diff.c:164
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Unbekannter \"dirstat\" Parameter '%s'\n"
-#: diff.c:297
+#: diff.c:300
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3377,7 +3484,7 @@
"\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', "
"'blocks', 'zebra', 'dimmed-zebra', 'plain'"
-#: diff.c:325
+#: diff.c:328
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3386,7 +3493,7 @@
"Unbekannter color-moved-ws Modus '%s', mögliche Werte sind 'ignore-space-"
"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-identation-change'"
-#: diff.c:333
+#: diff.c:336
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3394,12 +3501,12 @@
"color-moved-ws: allow-indentation-change kann nicht mit anderen\n"
"Whitespace-Modi kombiniert werden."
-#: diff.c:410
+#: diff.c:413
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.submodule': '%s'"
-#: diff.c:470
+#: diff.c:473
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3413,46 +3520,50 @@
msgid "external diff died, stopping at %s"
msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
-#: diff.c:4634
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#: diff.c:4677 parse-options.c:1114
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
msgstr ""
-"--name-only, --name-status, --check und -s schließen sich gegenseitig aus"
+"die Optionen '%s', '%s', '%s' und '%s' können nicht gemeinsam verwendet "
+"werden"
-#: diff.c:4637
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S und --find-object schließen sich gegenseitig aus"
+#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr ""
+"die Optionen '%s', '%s' und '%s' können nicht gemeinsam verwendet werden"
-#: diff.c:4640
+#: diff.c:4685
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+"die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden, nutzen "
+"Sie '%s' mit '%s'"
+
+#: diff.c:4689
+#, c-format
msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr ""
-"-G und --pickaxe-regex schließen sich gegenseitig aus. Benutzen Sie\n"
-"--pickaxe-regex mit -S."
+"die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden, nutzen "
+"Sie '%s' mit '%s' und '%s'"
-#: diff.c:4643
-msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr ""
-"--pickaxe-all und --find-object schließen sich gegenseitig aus. Benutzen\n"
-"Sie --pickaxe-all mit -G und -S."
-
-#: diff.c:4722
+#: diff.c:4769
msgid "--follow requires exactly one pathspec"
msgstr "--follow erfordert genau eine Pfadspezifikation"
-#: diff.c:4770
+#: diff.c:4823
#, c-format
msgid "invalid --stat value: %s"
msgstr "Ungültiger --stat Wert: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s erwartet einen numerischen Wert."
-#: diff.c:4807
+#: diff.c:4860
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3461,42 +3572,42 @@
"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4893
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "unbekannte Änderungsklasse '%c' in --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4917
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "unbekannter Wert nach ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4931
#, c-format
msgid "unable to resolve '%s'"
msgstr "konnte '%s' nicht auflösen"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4981 diff.c:4987
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s erwartet die Form <n>/<m>"
-#: diff.c:4998
+#: diff.c:4999
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s erwartet ein Zeichen, '%s' bekommen"
-#: diff.c:5019
+#: diff.c:5020
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "ungültiges --color-moved Argument: %s"
-#: diff.c:5038
+#: diff.c:5039
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "ungültiger Modus '%s' in --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5079
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3504,157 +3615,157 @@
"Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5115 diff.c:5135
#, c-format
msgid "invalid argument to %s"
msgstr "ungültiges Argument für %s"
-#: diff.c:5238
+#: diff.c:5239
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "ungültiger regulärer Ausdruck für -I gegeben: '%s'"
-#: diff.c:5287
+#: diff.c:5288
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
-#: diff.c:5343
+#: diff.c:5344
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "ungültiges --word-diff Argument: %s"
-#: diff.c:5379
+#: diff.c:5380
msgid "Diff output format options"
msgstr "Diff-Optionen zu Ausgabeformaten"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5382 diff.c:5388
msgid "generate patch"
msgstr "Patch erzeugen"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5385 builtin/log.c:180
msgid "suppress diff output"
msgstr "Ausgabe der Unterschiede unterdrücken"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5390 diff.c:5504 diff.c:5511
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5391 diff.c:5394
msgid "generate diffs with <n> lines context"
msgstr "Unterschiede mit <n> Zeilen des Kontextes erstellen"
-#: diff.c:5395
+#: diff.c:5396
msgid "generate the diff in raw format"
msgstr "Unterschiede im Rohformat erstellen"
-#: diff.c:5398
+#: diff.c:5399
msgid "synonym for '-p --raw'"
msgstr "Synonym für '-p --raw'"
-#: diff.c:5402
+#: diff.c:5403
msgid "synonym for '-p --stat'"
msgstr "Synonym für '-p --stat'"
-#: diff.c:5406
+#: diff.c:5407
msgid "machine friendly --stat"
msgstr "maschinenlesbare Ausgabe von --stat"
-#: diff.c:5409
+#: diff.c:5410
msgid "output only the last line of --stat"
msgstr "nur die letzte Zeile von --stat ausgeben"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5412 diff.c:5420
msgid "<param1,param2>..."
msgstr "<Parameter1,Parameter2>..."
-#: diff.c:5412
+#: diff.c:5413
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"die Verteilung des relativen Umfangs der Änderungen für jedes "
"Unterverzeichnis ausgeben"
-#: diff.c:5416
+#: diff.c:5417
msgid "synonym for --dirstat=cumulative"
msgstr "Synonym für --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5421
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..."
-#: diff.c:5424
+#: diff.c:5425
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
-#: diff.c:5427
+#: diff.c:5428
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und "
"Änderungen der Datei-Rechte"
-#: diff.c:5430
+#: diff.c:5431
msgid "show only names of changed files"
msgstr "nur Dateinamen der geänderten Dateien anzeigen"
-#: diff.c:5433
+#: diff.c:5434
msgid "show only names and status of changed files"
msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen"
-#: diff.c:5435
+#: diff.c:5436
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]"
-#: diff.c:5436
+#: diff.c:5437
msgid "generate diffstat"
msgstr "Zusammenfassung der Unterschiede erzeugen"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5439 diff.c:5442 diff.c:5445
msgid "<width>"
msgstr "<Breite>"
-#: diff.c:5439
+#: diff.c:5440
msgid "generate diffstat with a given width"
msgstr "Zusammenfassung der Unterschiede mit gegebener Breite erzeugen"
-#: diff.c:5442
+#: diff.c:5443
msgid "generate diffstat with a given name width"
msgstr "Zusammenfassung der Unterschiede mit gegebener Namens-Breite erzeugen"
-#: diff.c:5445
+#: diff.c:5446
msgid "generate diffstat with a given graph width"
msgstr "Zusammenfassung der Unterschiede mit gegebener Graph-Breite erzeugen"
-#: diff.c:5447
+#: diff.c:5448
msgid "<count>"
msgstr "<Anzahl>"
-#: diff.c:5448
+#: diff.c:5449
msgid "generate diffstat with limited lines"
msgstr "Zusammenfassung der Unterschiede mit begrenzten Zeilen erzeugen"
-#: diff.c:5451
+#: diff.c:5452
msgid "generate compact summary in diffstat"
msgstr "kompakte Zusammenstellung in Zusammenfassung der Unterschiede erzeugen"
-#: diff.c:5454
+#: diff.c:5455
msgid "output a binary diff that can be applied"
msgstr "eine binäre Differenz ausgeben, dass angewendet werden kann"
-#: diff.c:5457
+#: diff.c:5458
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "vollständige Objekt-Namen in den \"index\"-Zeilen anzeigen"
-#: diff.c:5459
+#: diff.c:5460
msgid "show colored diff"
msgstr "farbige Unterschiede anzeigen"
-#: diff.c:5460
+#: diff.c:5461
msgid "<kind>"
msgstr "<Art>"
-#: diff.c:5461
+#: diff.c:5462
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3662,7 +3773,7 @@
"Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
"Unterschieden hervorheben"
-#: diff.c:5464
+#: diff.c:5465
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3670,91 +3781,91 @@
"die Pfadnamen nicht verschleiern und NUL-Zeichen als Schlusszeichen in "
"Ausgabefeldern bei --raw oder --numstat nutzen"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
msgid "<prefix>"
msgstr "<Präfix>"
-#: diff.c:5468
+#: diff.c:5469
msgid "show the given source prefix instead of \"a/\""
msgstr "den gegebenen Quell-Präfix statt \"a/\" anzeigen"
-#: diff.c:5471
+#: diff.c:5472
msgid "show the given destination prefix instead of \"b/\""
msgstr "den gegebenen Ziel-Präfix statt \"b/\" anzeigen"
-#: diff.c:5474
+#: diff.c:5475
msgid "prepend an additional prefix to every line of output"
msgstr "einen zusätzlichen Präfix bei jeder Ausgabezeile voranstellen"
-#: diff.c:5477
+#: diff.c:5478
msgid "do not show any source or destination prefix"
msgstr "keine Quell- oder Ziel-Präfixe anzeigen"
-#: diff.c:5480
+#: diff.c:5481
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von Zeilen "
"anzeigen"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5485 diff.c:5490 diff.c:5495
msgid "<char>"
msgstr "<Zeichen>"
-#: diff.c:5485
+#: diff.c:5486
msgid "specify the character to indicate a new line instead of '+'"
msgstr "das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
-#: diff.c:5490
+#: diff.c:5491
msgid "specify the character to indicate an old line instead of '-'"
msgstr "das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
-#: diff.c:5495
+#: diff.c:5496
msgid "specify the character to indicate a context instead of ' '"
msgstr "das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
-#: diff.c:5498
+#: diff.c:5499
msgid "Diff rename options"
msgstr "Diff-Optionen zur Umbenennung"
-#: diff.c:5499
+#: diff.c:5500
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5501
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und "
"\"erstellen\""
-#: diff.c:5504
+#: diff.c:5505
msgid "detect renames"
msgstr "Umbenennungen erkennen"
-#: diff.c:5508
+#: diff.c:5509
msgid "omit the preimage for deletes"
msgstr "Preimage für Löschungen weglassen"
-#: diff.c:5511
+#: diff.c:5512
msgid "detect copies"
msgstr "Kopien erkennen"
-#: diff.c:5515
+#: diff.c:5516
msgid "use unmodified files as source to find copies"
msgstr "ungeänderte Dateien als Quelle zum Finden von Kopien nutzen"
-#: diff.c:5517
+#: diff.c:5518
msgid "disable rename detection"
msgstr "Erkennung von Umbenennungen deaktivieren"
-#: diff.c:5520
+#: diff.c:5521
msgid "use empty blobs as rename source"
msgstr "leere Blobs als Quelle von Umbenennungen nutzen"
-#: diff.c:5522
+#: diff.c:5523
msgid "continue listing the history of a file beyond renames"
msgstr "Auflistung der Historie einer Datei nach Umbenennung fortführen"
-#: diff.c:5525
+#: diff.c:5526
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3762,164 +3873,164 @@
"Erkennung von Umbenennungen und Kopien verhindern, wenn die Anzahl der Ziele "
"für Umbenennungen und Kopien das gegebene Limit überschreitet"
-#: diff.c:5527
+#: diff.c:5528
msgid "Diff algorithm options"
msgstr "Diff Algorithmus-Optionen"
-#: diff.c:5529
+#: diff.c:5530
msgid "produce the smallest possible diff"
msgstr "die kleinstmöglichen Änderungen erzeugen"
-#: diff.c:5532
+#: diff.c:5533
msgid "ignore whitespace when comparing lines"
msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren"
-#: diff.c:5535
+#: diff.c:5536
msgid "ignore changes in amount of whitespace"
msgstr "Änderungen bei der Anzahl von Whitespace ignorieren"
-#: diff.c:5538
+#: diff.c:5539
msgid "ignore changes in whitespace at EOL"
msgstr "Whitespace-Änderungen am Zeilenende ignorieren"
-#: diff.c:5541
+#: diff.c:5542
msgid "ignore carrier-return at the end of line"
msgstr "den Zeilenumbruch am Ende der Zeile ignorieren"
-#: diff.c:5544
+#: diff.c:5545
msgid "ignore changes whose lines are all blank"
msgstr "Änderungen in leeren Zeilen ignorieren"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
msgid "<regex>"
msgstr "<Regex>"
-#: diff.c:5547
+#: diff.c:5548
msgid "ignore changes whose all lines match <regex>"
msgstr ""
"Änderungen ignorieren, bei denen alle Zeilen mit <Regex> übereinstimmen"
-#: diff.c:5550
+#: diff.c:5551
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"Heuristik, um Grenzen der Änderungsblöcke für bessere Lesbarkeit zu "
"verschieben"
-#: diff.c:5553
+#: diff.c:5554
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "Änderungen durch Nutzung des Algorithmus \"Patience Diff\" erzeugen"
-#: diff.c:5557
+#: diff.c:5558
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "Änderungen durch Nutzung des Algorithmus \"Histogram Diff\" erzeugen"
-#: diff.c:5559
+#: diff.c:5560
msgid "<algorithm>"
msgstr "<Algorithmus>"
-#: diff.c:5560
+#: diff.c:5561
msgid "choose a diff algorithm"
msgstr "einen Algorithmus für Änderungen wählen"
-#: diff.c:5562
+#: diff.c:5563
msgid "<text>"
msgstr "<Text>"
-#: diff.c:5563
+#: diff.c:5564
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "Änderungen durch Nutzung des Algorithmus \"Anchored Diff\" erzeugen"
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5566 diff.c:5575 diff.c:5578
msgid "<mode>"
msgstr "<Modus>"
-#: diff.c:5566
+#: diff.c:5567
msgid "show word diff, using <mode> to delimit changed words"
msgstr "Wort-Änderungen zeigen, nutze <Modus>, um Wörter abzugrenzen"
-#: diff.c:5569
+#: diff.c:5570
msgid "use <regex> to decide what a word is"
msgstr "<Regex> nutzen, um zu entscheiden, was ein Wort ist"
-#: diff.c:5572
+#: diff.c:5573
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
-#: diff.c:5575
+#: diff.c:5576
msgid "moved lines of code are colored differently"
msgstr "verschobene Codezeilen sind andersfarbig"
-#: diff.c:5578
+#: diff.c:5579
msgid "how white spaces are ignored in --color-moved"
msgstr "wie Whitespaces in --color-moved ignoriert werden"
-#: diff.c:5581
+#: diff.c:5582
msgid "Other diff options"
msgstr "Andere Diff-Optionen"
-#: diff.c:5583
+#: diff.c:5584
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"wenn vom Unterverzeichnis aufgerufen, schließe Änderungen außerhalb aus und "
"zeige relative Pfade an"
-#: diff.c:5587
+#: diff.c:5588
msgid "treat all files as text"
msgstr "alle Dateien als Text behandeln"
-#: diff.c:5589
+#: diff.c:5590
msgid "swap two inputs, reverse the diff"
msgstr "die beiden Eingaben vertauschen und die Änderungen umkehren"
-#: diff.c:5591
+#: diff.c:5592
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
"mit Exit-Status 1 beenden, wenn Änderungen vorhanden sind, andernfalls mit 0"
-#: diff.c:5593
+#: diff.c:5594
msgid "disable all output of the program"
msgstr "alle Ausgaben vom Programm deaktivieren"
-#: diff.c:5595
+#: diff.c:5596
msgid "allow an external diff helper to be executed"
msgstr "erlaube die Ausführung eines externes Programms für Änderungen"
-#: diff.c:5597
+#: diff.c:5598
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"Führe externe Text-Konvertierungsfilter aus, wenn binäre Dateien vergleicht "
"werden"
-#: diff.c:5599
+#: diff.c:5600
msgid "<when>"
msgstr "<wann>"
-#: diff.c:5600
+#: diff.c:5601
msgid "ignore changes to submodules in the diff generation"
msgstr ""
"Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren"
-#: diff.c:5603
+#: diff.c:5604
msgid "<format>"
msgstr "<Format>"
-#: diff.c:5604
+#: diff.c:5605
msgid "specify how differences in submodules are shown"
msgstr "angeben, wie Unterschiede in Submodulen gezeigt werden"
-#: diff.c:5608
+#: diff.c:5609
msgid "hide 'git add -N' entries from the index"
msgstr "'git add -N' Einträge vom Index verstecken"
-#: diff.c:5611
+#: diff.c:5612
msgid "treat 'git add -N' entries as real in the index"
msgstr "'git add -N' Einträge im Index als echt behandeln"
-#: diff.c:5613
+#: diff.c:5614
msgid "<string>"
msgstr "<Zeichenkette>"
-#: diff.c:5614
+#: diff.c:5615
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3927,7 +4038,7 @@
"nach Unterschieden suchen, welche die Anzahl des Vorkommens der angegebenen "
"Zeichenkette verändern"
-#: diff.c:5617
+#: diff.c:5618
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3935,37 +4046,37 @@
"nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
"regulären Ausdrucks verändern"
-#: diff.c:5620
+#: diff.c:5621
msgid "show all changes in the changeset with -S or -G"
msgstr "alle Änderungen im Changeset mit -S oder -G anzeigen"
-#: diff.c:5623
+#: diff.c:5624
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"<Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck behandeln"
-#: diff.c:5626
+#: diff.c:5627
msgid "control the order in which files appear in the output"
msgstr ""
"die Reihenfolge kontrollieren, in der die Dateien in der Ausgabe erscheinen"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5628 diff.c:5631
msgid "<path>"
msgstr "<Pfad>"
-#: diff.c:5628
+#: diff.c:5629
msgid "show the change in the specified path first"
msgstr "die Änderung des angegebenen Pfades zuerst anzeigen"
-#: diff.c:5631
+#: diff.c:5632
msgid "skip the output to the specified path"
msgstr "überspringe die Ausgabe bis zum angegebenen Pfad"
-#: diff.c:5633
+#: diff.c:5634
msgid "<object-id>"
msgstr "<Objekt-ID>"
-#: diff.c:5634
+#: diff.c:5635
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3973,33 +4084,33 @@
"nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
"Objektes verändern"
-#: diff.c:5636
+#: diff.c:5637
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5638
msgid "select files by diff type"
msgstr "Dateien anhand der Art der Änderung wählen"
-#: diff.c:5639
+#: diff.c:5640
msgid "<file>"
msgstr "<Datei>"
-#: diff.c:5640
-msgid "Output to a specific file"
+#: diff.c:5641
+msgid "output to a specific file"
msgstr "Ausgabe zu einer bestimmten Datei"
-#: diff.c:6298
+#: diff.c:6321
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"genaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
"übersprungen."
-#: diff.c:6301
+#: diff.c:6324
msgid "only found copies from modified paths due to too many files."
msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden"
-#: diff.c:6304
+#: diff.c:6327
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -4012,7 +4123,7 @@
msgid "failed to read orderfile '%s'"
msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Führe Erkennung für ungenaue Umbenennung aus"
@@ -4043,41 +4154,49 @@
"Ihre Datei für den partiellen Checkout hat eventuell Probleme:\n"
"Muster '%s' wiederholt sich."
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr "deaktiviere Cone-Muster-Übereinstimmung"
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "kann %s nicht als exclude-Filter benutzen"
-#: dir.c:2351
+#: dir.c:2419
#, c-format
msgid "could not open directory '%s'"
msgstr "konnte Verzeichnis '%s' nicht öffnen"
-#: dir.c:2653
+#: dir.c:2721
msgid "failed to get kernel name and information"
msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
-#: dir.c:2777
+#: dir.c:2846
msgid "untracked cache is disabled on this system or location"
msgstr ""
"Cache für unversionierte Dateien ist auf diesem System oder\n"
"für dieses Verzeichnis deaktiviert"
-#: dir.c:3610
+#: dir.c:3119
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Konnte keinen Verzeichnisnamen erraten.\n"
+"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
+
+#: dir.c:3807
#, c-format
msgid "index file corrupt in repo %s"
msgstr "Index-Datei in Repository %s beschädigt"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3854 dir.c:3859
#, c-format
msgid "could not create directories for %s"
msgstr "Konnte Verzeichnisse für '%s' nicht erstellen"
-#: dir.c:3691
+#: dir.c:3888
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren"
@@ -4087,306 +4206,402 @@
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "Hinweis: Warte auf das Schließen der Datei durch Ihren Editor...%c"
-#: entry.c:176
+#: entry.c:179
msgid "Filtering content"
msgstr "Filtere Inhalt"
-#: entry.c:497
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "konnte Datei '%s' nicht lesen"
-#: environment.c:152
+#: environment.c:147
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "ungültiger Git-Namespace-Pfad \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "konnte GIT_DIR nicht zu '%s' setzen"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "zu viele Argumente angegeben, um %s auszuführen"
-#: fetch-pack.c:182
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: erwartete shallow-Liste"
-#: fetch-pack.c:185
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: erwartete ein Flush-Paket nach der shallow-Liste"
-#: fetch-pack.c:196
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen"
-#: fetch-pack.c:216
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
-#: fetch-pack.c:227
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "konnte nicht zum Remote schreiben"
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc benötigt multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:397 fetch-pack.c:1460
#, c-format
msgid "invalid shallow line: %s"
msgstr "ungültige shallow-Zeile: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:403 fetch-pack.c:1466
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ungültige unshallow-Zeile: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:405 fetch-pack.c:1468
#, c-format
msgid "object not found: %s"
msgstr "Objekt nicht gefunden: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:408 fetch-pack.c:1471
#, c-format
msgid "error in object: %s"
msgstr "Fehler in Objekt: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:410 fetch-pack.c:1473
#, c-format
msgid "no shallow found: %s"
msgstr "kein shallow-Objekt gefunden: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:413 fetch-pack.c:1477
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "shallow/unshallow erwartet, %s bekommen"
-#: fetch-pack.c:439
+#: fetch-pack.c:453
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s bekommen"
-#: fetch-pack.c:456
+#: fetch-pack.c:470
#, c-format
msgid "invalid commit %s"
msgstr "ungültiger Commit %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:501
msgid "giving up"
msgstr "gebe auf"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:514 progress.h:25
msgid "done"
msgstr "fertig"
-#: fetch-pack.c:512
+#: fetch-pack.c:526
#, c-format
msgid "got %s (%d) %s"
msgstr "%s (%d) %s bekommen"
-#: fetch-pack.c:548
+#: fetch-pack.c:562
#, c-format
msgid "Marking %s as complete"
msgstr "Markiere %s als vollständig"
-#: fetch-pack.c:763
+#: fetch-pack.c:784
#, c-format
msgid "already have %s (%s)"
msgstr "habe %s (%s) bereits"
-#: fetch-pack.c:849
+#: fetch-pack.c:870
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
-#: fetch-pack.c:857
+#: fetch-pack.c:878
msgid "protocol error: bad pack header"
msgstr "Protokollfehler: ungültiger Pack-Header"
-#: fetch-pack.c:951
+#: fetch-pack.c:974
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: konnte %s nicht starten"
-#: fetch-pack.c:957
+#: fetch-pack.c:980
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: ungültige index-pack Ausgabe"
-#: fetch-pack.c:974
+#: fetch-pack.c:997
#, c-format
msgid "%s failed"
msgstr "%s fehlgeschlagen"
-#: fetch-pack.c:976
+#: fetch-pack.c:999
msgid "error in sideband demultiplexer"
msgstr "Fehler in sideband demultiplexer"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1048
#, c-format
msgid "Server version is %.*s"
msgstr "Server-Version ist %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
+#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
+#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
+#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
#, c-format
msgid "Server supports %s"
msgstr "Server unterstützt %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1058
msgid "Server does not support shallow clients"
msgstr "Server unterstützt keine shallow-Clients"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1118
msgid "Server does not support --shallow-since"
msgstr "Server unterstützt kein --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1123
msgid "Server does not support --shallow-exclude"
msgstr "Server unterstützt kein --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1127
msgid "Server does not support --deepen"
msgstr "Server unterstützt kein --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1129
msgid "Server does not support this repository's object format"
msgstr "Server unterstützt das Objekt-Format dieses Repositories nicht"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1142
msgid "no common commits"
msgstr "keine gemeinsamen Commits"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
msgid "source repository is shallow, reject to clone."
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow), Klonen "
"zurückgewiesen."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1157 fetch-pack.c:1705
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: Abholen fehlgeschlagen."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1271
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "Algorithmen stimmen nicht überein: Client %s; Server %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1275
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "der Server unterstützt Algorithmus '%s' nicht"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1308
msgid "Server does not support shallow requests"
msgstr "Server unterstützt keine shallow-Anfragen"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1315
msgid "Server supports filter"
msgstr "Server unterstützt Filter"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1358 fetch-pack.c:2087
msgid "unable to write request to remote"
msgstr "konnte Anfrage nicht zum Remote schreiben"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1376
#, c-format
msgid "error reading section header '%s'"
msgstr "Fehler beim Lesen von Sektionskopf '%s'."
-#: fetch-pack.c:1353
+#: fetch-pack.c:1382
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' erwartet, '%s' empfangen"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1416
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "Unerwartete Acknowledgment-Zeile: '%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1421
#, c-format
msgid "error processing acks: %d"
msgstr "Fehler beim Verarbeiten von ACKS: %d"
-#: fetch-pack.c:1402
-msgid "expected packfile to be sent after 'ready'"
-msgstr "Erwartete Versand einer Packdatei nach 'ready'."
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1435
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "erwartete Versand einer Packdatei nach '%s'"
-#: fetch-pack.c:1404
-msgid "expected no other sections to be sent after no 'ready'"
-msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'."
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1441
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "erwartete keinen Versand anderer Sektionen nach keinem '%s'"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1482
#, c-format
msgid "error processing shallow info: %d"
msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1531
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref erwartet, '%s' bekommen"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1536
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "unerwartetes wanted-ref: '%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1541
#, c-format
msgid "error processing wanted refs: %d"
msgstr "Fehler beim Verarbeiten von wanted-refs: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1571
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: Antwort-Endpaket erwartet"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1983
msgid "no matching remote head"
msgstr "kein übereinstimmender Remote-Branch"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:2006 builtin/clone.c:587
msgid "remote did not send all necessary objects"
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2109
msgid "unexpected 'ready' from remote"
msgstr "unerwartetes 'ready' von Remote-Repository"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2132
#, c-format
msgid "no such remote ref %s"
msgstr "Remote-Referenz %s nicht gefunden"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2135
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
-#: gpg-interface.c:273
+#: fsmonitor-ipc.c:119
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: ungültiger Pfad '%s'"
+
+#: fsmonitor-ipc.c:125
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: nicht spezifizierter Fehler bei '%s'"
+
+#: fsmonitor-ipc.c:155
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon läuft nicht"
+
+#: fsmonitor-ipc.c:164
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "konnte '%s' Befehl nicht an fsmonitor--daemon senden"
+
+#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
+#: gpg-interface.c:1011
msgid "could not create temporary file"
msgstr "konnte temporäre Datei nicht erstellen"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:459
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:450
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile muss konfiguriert sein und für die Überprüfung "
+"der SSH-Signatur vorhanden sein"
+
+#: gpg-interface.c:479
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify wird für die Verifizierung der SSH-"
+"Signatur benötigt (verfügbar in openssh Version 8.2p1+)"
+
+#: gpg-interface.c:550
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "SSH-Signatursperrdatei konfiguriert, aber nicht gefunden: %s"
+
+#: gpg-interface.c:638
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "fehlerhafte/inkompatible Signatur '%s'"
+
+#: gpg-interface.c:815 gpg-interface.c:820
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "konnte SSH-Fingerabdruck für Schlüssel '%s' nicht bekommen"
+
+#: gpg-interface.c:843
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"entweder user.signingkey oder gpg.ssh.defaultKeyCommand muss konfiguriert "
+"sein"
+
+#: gpg-interface.c:865
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand war erfolgreich, gab aber keine Schlüssel zurück: "
+"%s %s"
+
+#: gpg-interface.c:871
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand fehlgeschlagen: %s %s"
+
+#: gpg-interface.c:966
msgid "gpg failed to sign the data"
msgstr "gpg beim Signieren der Daten fehlgeschlagen"
+#: gpg-interface.c:988
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey muss für die SSH-Signatur gesetzt sein"
+
+#: gpg-interface.c:999
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "Fehler beim Schreiben des SSH-Signaturschlüssels nach '%s'"
+
+#: gpg-interface.c:1017
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "Fehler beim Schreiben des SSH-Signaturschlüsselpuffers nach '%s'"
+
+#: gpg-interface.c:1035
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"\"ssh-keygen -Y sign\" wird für die SSH-Signatur benötigt (verfügbar in "
+"openssh Version 8.2p1+)"
+
+#: gpg-interface.c:1047
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "Fehler beim Lesen des SSH-Signaturdatenpuffers von '%s'"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "ungültige Farbe '%.*s' in log.graphColors ignoriert"
-#: grep.c:531
+#: grep.c:446
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4394,111 +4609,111 @@
"Angegebenes Muster enthält NULL Byte (über -f <Datei>). Das wird nur mit -"
"Punter PCRE v2 unterstützt."
-#: grep.c:1895
+#: grep.c:1859
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': konnte %s nicht lesen"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: grep.c:1923
+#: grep.c:1887
#, c-format
msgid "'%s': short read"
msgstr "'%s': read() zu kurz"
-#: help.c:23
+#: help.c:25
msgid "start a working area (see also: git help tutorial)"
msgstr "Arbeitsverzeichnis anlegen (siehe auch: git help tutorial)"
-#: help.c:24
+#: help.c:26
msgid "work on the current change (see also: git help everyday)"
msgstr "an aktuellen Änderungen arbeiten (siehe auch: git help everyday)"
-#: help.c:25
+#: help.c:27
msgid "examine the history and state (see also: git help revisions)"
msgstr "Historie und Status untersuchen (siehe auch: git help revisions)"
-#: help.c:26
+#: help.c:28
msgid "grow, mark and tweak your common history"
msgstr "Historie erweitern und bearbeiten"
-#: help.c:27
+#: help.c:29
msgid "collaborate (see also: git help workflows)"
msgstr "mit anderen zusammenarbeiten (siehe auch: git help workflows)"
-#: help.c:31
+#: help.c:33
msgid "Main Porcelain Commands"
msgstr "Hauptbefehle"
-#: help.c:32
+#: help.c:34
msgid "Ancillary Commands / Manipulators"
msgstr "Nebenbefehle / Manipulationen"
-#: help.c:33
+#: help.c:35
msgid "Ancillary Commands / Interrogators"
msgstr "Nebenbefehle / Abfragen"
-#: help.c:34
+#: help.c:36
msgid "Interacting with Others"
msgstr "mit anderen interagieren"
-#: help.c:35
+#: help.c:37
msgid "Low-level Commands / Manipulators"
msgstr "Systembefehle / Manipulationen"
-#: help.c:36
+#: help.c:38
msgid "Low-level Commands / Interrogators"
msgstr "Systembefehle / Abfragen"
-#: help.c:37
+#: help.c:39
msgid "Low-level Commands / Syncing Repositories"
msgstr "Systembefehle / Repositories synchronisieren"
-#: help.c:38
+#: help.c:40
msgid "Low-level Commands / Internal Helpers"
msgstr "Systembefehle / Interne Hilfsbefehle"
-#: help.c:300
+#: help.c:316
#, c-format
msgid "available git commands in '%s'"
msgstr "Vorhandene Git-Befehle in '%s'"
-#: help.c:307
+#: help.c:323
msgid "git commands available from elsewhere on your $PATH"
msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH"
-#: help.c:316
+#: help.c:332
msgid "These are common Git commands used in various situations:"
msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:"
-#: help.c:365 git.c:100
+#: help.c:382 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "Nicht unterstützte Art zur Befehlsauflistung '%s'."
-#: help.c:405
+#: help.c:422
msgid "The Git concept guides are:"
msgstr "Die Git-Konzeptanleitungen sind:"
-#: help.c:429
+#: help.c:446
+msgid "External commands"
+msgstr "Externe Befehle"
+
+#: help.c:468
+msgid "Command aliases"
+msgstr "Alias-Befehle"
+
+#: help.c:486
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
"Siehe 'git help <Befehl>', um mehr über einen spezifischen Unterbefehl zu "
"lesen."
-#: help.c:434
-msgid "External commands"
-msgstr "Externe Befehle"
-
-#: help.c:449
-msgid "Command aliases"
-msgstr "Alias-Befehle"
-
-#: help.c:527
+#: help.c:563
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4507,32 +4722,37 @@
"'%s' scheint ein git-Befehl zu sein, konnte aber\n"
"nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
-#: help.c:543 help.c:631
+#: help.c:585 help.c:682
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'."
-#: help.c:591
+#: help.c:633
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden."
-#: help.c:613
+#: help.c:655
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"WARNUNG: Sie haben Git-Befehl '%s' ausgeführt, welcher nicht existiert."
-#: help.c:618
+#: help.c:660
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten."
-#: help.c:623
+#: help.c:666
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Stattdessen '%s' ausführen (y/N)? "
+
+#: help.c:674
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Setze in %0.1f Sekunden fort unter der Annahme, dass Sie '%s' meinten."
-#: help.c:635
+#: help.c:686
msgid ""
"\n"
"The most similar command is"
@@ -4546,16 +4766,16 @@
"\n"
"Die ähnlichsten Befehle sind"
-#: help.c:675
+#: help.c:729
msgid "git version [<options>]"
msgstr "git version [<Optionen>]"
-#: help.c:730
+#: help.c:784
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:788
msgid ""
"\n"
"Did you mean this?"
@@ -4569,15 +4789,30 @@
"\n"
"Haben Sie eines von diesen gemeint?"
-#: ident.c:353
+#: hook.c:28
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Der '%s' Hook wurde ignoriert, weil er nicht als ausführbar markiert ist.\n"
+"Sie können diese Warnung mit `git config advice.ignoredHook false` "
+"deaktivieren."
+
+#: hook.c:87
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "Konnte Hook '%s' nicht starten\n"
+
+#: ident.c:354
msgid "Author identity unknown\n"
msgstr "Identität des Autors unbekannt\n"
-#: ident.c:356
+#: ident.c:357
msgid "Committer identity unknown\n"
msgstr "Identität des Commit-Erstellers unbekannt\n"
-#: ident.c:362
+#: ident.c:363
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -4603,71 +4838,71 @@
"Lassen Sie die Option \"--global\" weg, um die Identität nur\n"
"für dieses Repository zu setzen.\n"
-#: ident.c:397
+#: ident.c:398
msgid "no email was given and auto-detection is disabled"
msgstr "keine E-Mail angegeben und automatische Erkennung ist deaktiviert"
-#: ident.c:402
+#: ident.c:403
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "Konnte die E-Mail-Adresse nicht automatisch erkennen ('%s' erhalten)"
-#: ident.c:419
+#: ident.c:420
msgid "no name was given and auto-detection is disabled"
msgstr "kein Name angegeben und automatische Erkennung ist deaktiviert"
-#: ident.c:425
+#: ident.c:426
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "konnte Namen nicht automatisch erkennen ('%s' erhalten)"
-#: ident.c:433
+#: ident.c:434
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt."
-#: ident.c:439
+#: ident.c:440
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:455 builtin/commit.c:649
#, c-format
msgid "invalid date format: %s"
msgstr "Ungültiges Datumsformat: %s"
-#: list-objects-filter-options.c:83
+#: list-objects-filter-options.c:68
msgid "expected 'tree:<depth>'"
msgstr "'tree:<Tiefe>' erwartet"
-#: list-objects-filter-options.c:98
+#: list-objects-filter-options.c:83
msgid "sparse:path filters support has been dropped"
msgstr "Keine Unterstützung für sparse:path Filter mehr"
-#: list-objects-filter-options.c:105
+#: list-objects-filter-options.c:90
#, c-format
msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "'%s' für 'object:type=<Typ>' ist kein gültiger Objekttyp"
-#: list-objects-filter-options.c:124
+#: list-objects-filter-options.c:109
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "Ungültige filter-spec '%s'"
-#: list-objects-filter-options.c:140
+#: list-objects-filter-options.c:125
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr "Zeichen in sub-filter-spec muss maskiert werden: '%c'"
-#: list-objects-filter-options.c:182
+#: list-objects-filter-options.c:167
msgid "expected something after combine:"
msgstr "erwartete etwas nach 'combine:'"
-#: list-objects-filter-options.c:264
+#: list-objects-filter-options.c:249
msgid "multiple filter-specs cannot be combined"
msgstr "mehrere filter-specs können nicht kombiniert werden"
-#: list-objects-filter-options.c:376
+#: list-objects-filter-options.c:365
msgid "unable to upgrade repository format to support partial clone"
msgstr ""
"Repository-Format konnte nicht erweitert werden, um partielles Klonen zu "
@@ -4683,18 +4918,18 @@
msgid "unable to parse sparse filter data in %s"
msgstr "konnte partielle Filter-Daten in %s nicht parsen"
-#: list-objects.c:127
+#: list-objects.c:144
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
"Eintrag '%s' im Tree-Objekt %s hat Tree-Modus, aber ist kein Tree-Objekt"
-#: list-objects.c:140
+#: list-objects.c:157
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "Eintrag '%s' im Tree-Objekt %s hat Blob-Modus, aber ist kein Blob"
-#: list-objects.c:398
+#: list-objects.c:415
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "Konnte Root-Tree-Objekt für Commit %s nicht laden."
@@ -4724,12 +4959,12 @@
msgid "Unable to create '%s.lock': %s"
msgstr "Konnte '%s.lock' nicht erstellen: %s"
-#: ls-refs.c:37
+#: ls-refs.c:175
#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "ungültiger Wert '%s' für lsrefs.unborn"
+msgid "unexpected line: '%s'"
+msgstr "unerwartete Zeile: '%s'"
-#: ls-refs.c:167
+#: ls-refs.c:179
msgid "expected flush after ls-refs arguments"
msgstr "erwartete Flush nach Argumenten für die Auflistung der Referenzen"
@@ -4737,37 +4972,37 @@
msgid "quoted CRLF detected"
msgstr "angeführtes CRLF entdeckt"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "ungültige Aktion '%s' für '%s'"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1630 merge-recursive.c:1214
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)."
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1639 merge-recursive.c:1221
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)."
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1648 merge-recursive.c:1228
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "Fehler beim Merge von Submodul %s (Commits folgen keiner Merge-Basis)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1658 merge-ort.c:1666
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Hinweis: Spule Submodul %s vor zu %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1688
#, c-format
msgid "Failed to merge submodule %s"
msgstr "Fehler beim Zusammenführen von Submodul %s"
-#: merge-ort.c:1632
+#: merge-ort.c:1695
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4777,7 +5012,7 @@
"Auflösung des Merges vorhanden:\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1699 merge-recursive.c:1284
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4794,7 +5029,7 @@
"\n"
"hinzu, um diesen Vorschlag zu akzeptieren.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1712
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4804,21 +5039,21 @@
"sind vorhanden:\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1937 merge-recursive.c:1375
msgid "Failed to execute internal merge"
msgstr "Fehler bei Ausführung des internen Merges"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1942 merge-recursive.c:1380
#, c-format
msgid "Unable to add %s to database"
msgstr "Konnte %s nicht zur Datenbank hinzufügen"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1949 merge-recursive.c:1413
#, c-format
msgid "Auto-merging %s"
msgstr "automatischer Merge von %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2088 merge-recursive.c:2135
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4829,7 +5064,7 @@
"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
"Pfade dahin zu setzen: %s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2098 merge-recursive.c:2145
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4840,7 +5075,7 @@
"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
"zu setzen: %s"
-#: merge-ort.c:2087
+#: merge-ort.c:2156
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4851,7 +5086,7 @@
"ist; es wurde zu mehreren anderen Verzeichnissen umbenannt, ohne dass ein "
"Ziel die Mehrheit der Dateien erhält."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2310 merge-recursive.c:2481
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4860,25 +5095,25 @@
"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
"wurde."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2450 merge-recursive.c:3264
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
"Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das "
-"umbenannt wurde in %s; Verschiebe es nach %s."
+"umbenannt wurde in %s; verschiebe es nach %s."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2457 merge-recursive.c:3271
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
"Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines "
-"Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s."
+"Verzeichnisses, das umbenannt wurde in %s; verschiebe es nach %s."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2470 merge-recursive.c:3267
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4887,7 +5122,7 @@
"KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, "
"das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2478 merge-recursive.c:3274
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4897,13 +5132,13 @@
"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
"verschoben werden."
-#: merge-ort.c:2569
+#: merge-ort.c:2634
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"KONFLIKT (umbenennen/umbenennen): %s zu %s in %s umbenannt und zu %s in %s."
-#: merge-ort.c:2664
+#: merge-ort.c:2729
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4914,23 +5149,23 @@
"Inhaltskonflikte UND kollidiert mit einem anderen Pfad; dies kann zu "
"verschachtelten Konfliktmarkierungen führen."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2748 merge-ort.c:2772
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"KONFLIKT (umbenennen/löschen): %s zu %s in %s umbenannt, aber in %s gelöscht."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3261 merge-recursive.c:3025
#, c-format
msgid "cannot read object %s"
msgstr "kann Objekt %s nicht lesen"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3264 merge-recursive.c:3028
#, c-format
msgid "object %s is not a blob"
msgstr "Objekt %s ist kein Blob"
-#: merge-ort.c:3613
+#: merge-ort.c:3693
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4939,7 +5174,7 @@
"KONFLIKT (Datei/Verzeichnis): Verzeichnis im Weg von %s aus %s; stattdessen "
"nach %s verschieben."
-#: merge-ort.c:3689
+#: merge-ort.c:3770
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4949,7 +5184,7 @@
"Seite; beide wurden umbenannt, damit jeder irgendwo aufgezeichnet werden "
"kann."
-#: merge-ort.c:3696
+#: merge-ort.c:3777
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4959,24 +5194,24 @@
"Seite; eines der beiden wurde umbenannt, damit jeder irgendwo aufgezeichnet "
"werden kann."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3866 merge-recursive.c:3104
msgid "content"
msgstr "Inhalt"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3868 merge-recursive.c:3108
msgid "add/add"
msgstr "hinzufügen/hinzufügen"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3870 merge-recursive.c:3153
msgid "submodule"
msgstr "Submodul"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3872 merge-recursive.c:3154
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3916
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4985,7 +5220,7 @@
"KONFLIKT (ändern/löschen): %s gelöscht in %s und geändert in %s. Stand %s "
"von %s wurde im Arbeitsbereich gelassen."
-#: merge-ort.c:4120
+#: merge-ort.c:4212
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4997,13 +5232,13 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4586
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr ""
"Sammeln von Merge-Informationen für die Referenzen %s, %s, %s fehlgeschlagen"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3723
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -5013,109 +5248,109 @@
"überschrieben werden:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
msgid "Already up to date."
msgstr "Bereits aktuell."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(ungültiger Commit)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo für Pfad '%s' fehlgeschlagen; Merge wird abgebrochen."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo zur Aktualisierung für Pfad '%s' fehlgeschlagen;\n"
"Merge wird abgebrochen."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "Fehler beim Erstellen des Pfades '%s'%s"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:47
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kann Objekt %s '%s' nicht lesen"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "Blob erwartet für %s '%s'"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "Fehler beim Öffnen von '%s': %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Spule Submodul %s zu dem folgenden Commit vor:"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1239 merge-recursive.c:1252
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Spule Submodul %s vor"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Fehler beim Merge von Submodule %s (dem Merge nachfolgende Commits nicht "
"gefunden)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1280
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1281
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1293
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1437
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Fehler: Verweigere unversionierte Datei bei %s zu verlieren;\n"
"schreibe stattdessen nach %s."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5124,7 +5359,7 @@
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich gelassen."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1514
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5133,7 +5368,7 @@
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
"%s wurde im Arbeitsbereich gelassen."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1521
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5142,7 +5377,7 @@
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich bei %s gelassen."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5151,46 +5386,46 @@
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
"%s wurde im Arbeitsbereich bei %s gelassen."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "rename"
msgstr "umbenennen"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "renamed"
msgstr "umbenannt"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Verweigere geänderte Datei bei %s zu verlieren."
-#: merge-recursive.c:1605
+#: merge-recursive.c:1622
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg "
"ist."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1680
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
"%s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1711
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1716
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Verweigere unversionierte Datei bei %s zu verlieren; füge stattdessen %s "
"hinzu"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1743
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5199,18 +5434,18 @@
"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
"und \"%s\"->\"%s\" in Branch \"%s\"%s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1748
msgid " (left unresolved)"
msgstr " (bleibt unaufgelöst)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1840
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s "
"in %s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2103
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5223,7 +5458,7 @@
"wobei\n"
"keines dieser Ziele die Mehrheit der Dateien erhielt."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2237
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5232,81 +5467,81 @@
"KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n"
"Benenne Verzeichnis um %s->%s in %s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modify"
msgstr "ändern"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modified"
msgstr "geändert"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3131
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3184
#, c-format
msgid "Adding as %s instead"
msgstr "Füge stattdessen als %s hinzu"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3388
#, c-format
msgid "Removing %s"
msgstr "Entferne %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3411
msgid "file/directory"
msgstr "Datei/Verzeichnis"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3416
msgid "directory/file"
msgstr "Verzeichnis/Datei"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3423
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s "
"hinzu."
-#: merge-recursive.c:3415
+#: merge-recursive.c:3432
#, c-format
msgid "Adding %s"
msgstr "Füge %s hinzu"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3441
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3494
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3588
msgid "Merging:"
msgstr "Merge:"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3601
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden"
msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden"
-#: merge-recursive.c:3634
+#: merge-recursive.c:3651
msgid "merge returned no commit"
msgstr "Merge hat keinen Commit zurückgegeben"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3823
#, c-format
msgid "Could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Konnte Index nicht schreiben."
@@ -5314,138 +5549,174 @@
msgid "failed to read the cache"
msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
+#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: midx.c:74
+#: midx.c:79
msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr "multi-pack-index OID fanout hat die falsche Größe"
+msgstr "Multi-Pack-Index OID fanout hat die falsche Größe"
-#: midx.c:105
+#: midx.c:112
#, c-format
msgid "multi-pack-index file %s is too small"
-msgstr "multi-pack-index-Datei %s ist zu klein."
+msgstr "Multi-Pack-Index-Datei %s ist zu klein."
-#: midx.c:121
+#: midx.c:128
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-"multi-pack-index-Signatur 0x%08x stimmt nicht mit Signatur 0x%08x überein."
+"Multi-Pack-Index-Signatur 0x%08x stimmt nicht mit Signatur 0x%08x überein."
-#: midx.c:126
+#: midx.c:133
#, c-format
msgid "multi-pack-index version %d not recognized"
-msgstr "multi-pack-index-Version %d nicht erkannt."
+msgstr "Multi-Pack-Index-Version %d nicht erkannt."
-#: midx.c:131
+#: midx.c:138
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
-msgstr "multi-pack-index Hash-Version %u stimmt nicht mit Version %u überein"
+msgstr "Multi-Pack-Index Hash-Version %u stimmt nicht mit Version %u überein"
-#: midx.c:148
+#: midx.c:155
msgid "multi-pack-index missing required pack-name chunk"
-msgstr "multi-pack-index fehlt erforderlicher Pack-Namen Chunk"
+msgstr "Multi-Pack-Index fehlt erforderlicher Pack-Namen Chunk"
-#: midx.c:150
+#: midx.c:157
msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk"
+msgstr "Multi-Pack-Index fehlt erforderlicher OID fanout Chunk"
-#: midx.c:152
+#: midx.c:159
msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk"
+msgstr "Multi-Pack-Index fehlt erforderlicher OID lookup Chunk"
-#: midx.c:154
+#: midx.c:161
msgid "multi-pack-index missing required object offsets chunk"
-msgstr "multi-pack-index fehlt erforderlicher Objekt offset Chunk"
+msgstr "Multi-Pack-Index fehlt erforderlicher Objekt offset Chunk"
-#: midx.c:170
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr "Falsche Reihenfolge bei multi-pack-index Pack-Namen: '%s' vor '%s'"
+msgstr "Falsche Reihenfolge bei Multi-Pack-Index Pack-Namen: '%s' vor '%s'"
-#: midx.c:214
+#: midx.c:228
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)"
-#: midx.c:264
+#: midx.c:278
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-"multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein"
+"Multi-Pack-Index speichert einen 64-Bit Offset, aber off_t ist zu klein"
-#: midx.c:490
+#: midx.c:509
#, c-format
msgid "failed to add packfile '%s'"
msgstr "Fehler beim Hinzufügen von Packdatei '%s'"
-#: midx.c:496
+#: midx.c:515
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "Fehler beim Öffnen von pack-index '%s'"
-#: midx.c:564
+#: midx.c:583
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:911
msgid "cannot store reverse index file"
msgstr "kann Reverse-Index-Datei nicht speichern"
-#: midx.c:920
+#: midx.c:1009
+#, c-format
+msgid "could not parse line: %s"
+msgstr "Zeile konnte nicht geparst werden: %s"
+
+#: midx.c:1011
+#, c-format
+msgid "malformed line: %s"
+msgstr "fehlerhafte Zeile: %s"
+
+#: midx.c:1181
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr ""
-"ignoriere existierenden multi-pack-index; Prüfsumme stimmt nicht überein"
+"ignoriere existierenden Multi-Pack-Index; Prüfsumme stimmt nicht überein"
-#: midx.c:943
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Packdateien zum multi-pack-index hinzufügen"
+#: midx.c:1206
+msgid "could not load pack"
+msgstr "Paket konnte nicht geladen werden"
-#: midx.c:989
+#: midx.c:1212
#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
+msgid "could not open index for %s"
+msgstr "konnte Index für %s nicht öffnen"
-#: midx.c:1034
+#: midx.c:1223
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Packdateien zum Multi-Pack-Index hinzufügen"
+
+#: midx.c:1266
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "unbekanntes bevorzugtes Paket: '%s'"
-#: midx.c:1039
+#: midx.c:1311
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "bevorzugtes Paket %s ohne Objekte kann nicht ausgewählt werden"
+
+#: midx.c:1343
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
+
+#: midx.c:1389
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "bevorzugtes Paket '%s' ist abgelaufen"
-#: midx.c:1055
+#: midx.c:1402
msgid "no pack files to index."
msgstr "keine Packdateien zum Indizieren."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1409
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "Schreiben der Multi-Pack-Bitmap ohne Objekte abgelehnt"
+
+#: midx.c:1451
+msgid "could not write multi-pack bitmap"
+msgstr "Multi-Pack-Bitmap konnte nicht geschrieben werden"
+
+#: midx.c:1461
+msgid "could not write multi-pack-index"
+msgstr "Multi-Pack-Index konnte nicht geschrieben werden"
+
+#: midx.c:1520 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "Fehler beim Löschen von %s"
-#: midx.c:1166
+#: midx.c:1553
#, c-format
msgid "failed to clear multi-pack-index at %s"
-msgstr "Fehler beim Löschen des multi-pack-index bei %s"
+msgstr "Fehler beim Löschen des Multi-Pack-Index bei %s"
-#: midx.c:1225
+#: midx.c:1616
msgid "multi-pack-index file exists, but failed to parse"
-msgstr "multi-pack-index-Datei existiert, aber das Parsen schlug fehl"
+msgstr "Multi-Pack-Index-Datei existiert, aber das Parsen schlug fehl"
-#: midx.c:1233
+#: midx.c:1624
msgid "incorrect checksum"
msgstr "Prüfsumme nicht korrekt"
-#: midx.c:1236
+#: midx.c:1627
msgid "Looking for referenced packfiles"
msgstr "Suche nach referenzierten Pack-Dateien"
-#: midx.c:1251
+#: midx.c:1642
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5453,55 +5724,55 @@
"Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = "
"fanout[%d]"
-#: midx.c:1256
+#: midx.c:1647
msgid "the midx contains no oid"
msgstr "das midx enthält keine oid"
-#: midx.c:1265
+#: midx.c:1656
msgid "Verifying OID order in multi-pack-index"
-msgstr "Verifiziere OID-Reihenfolge im multi-pack-index"
+msgstr "Verifiziere OID-Reihenfolge im Multi-Pack-Index"
-#: midx.c:1274
+#: midx.c:1665
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "Ungültige oid lookup Reihenfolge: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1685
msgid "Sorting objects by packfile"
msgstr "Sortiere Objekte nach Pack-Datei"
-#: midx.c:1301
+#: midx.c:1692
msgid "Verifying object offsets"
msgstr "Überprüfe Objekt-Offsets"
-#: midx.c:1317
+#: midx.c:1708
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "Fehler beim Laden des Pack-Eintrags für oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1714
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "Fehler beim Laden des Pack-Index für Packdatei %s"
-#: midx.c:1332
+#: midx.c:1723
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "Falscher Objekt-Offset für oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1750
msgid "Counting referenced objects"
msgstr "Referenzierte Objekte zählen"
-#: midx.c:1367
+#: midx.c:1760
msgid "Finding and deleting unreferenced packfiles"
msgstr "Suchen und Löschen von unreferenzierten Pack-Dateien"
-#: midx.c:1558
+#: midx.c:1952
msgid "could not start pack-objects"
msgstr "Konnte 'pack-objects' nicht ausführen"
-#: midx.c:1578
+#: midx.c:1972
msgid "could not finish pack-objects"
msgstr "Konnte 'pack-objects' nicht beenden"
@@ -5520,7 +5791,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "Kann lazy_name Thread nicht beitreten: %s"
-#: notes-merge.c:277
+#: notes-merge.c:276
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -5535,7 +5806,7 @@
"Merge\n"
"von Notizen beginnen."
-#: notes-merge.c:284
+#: notes-merge.c:283
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)."
@@ -5565,279 +5836,350 @@
msgid "Bad %s value: '%s'"
msgstr "Ungültiger %s Wert: '%s'"
-#: object-file.c:526
+#: object-file.c:457
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"Objektverzeichnis %s existiert nicht; prüfe .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:515
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
-#: object-file.c:658
+#: object-file.c:589
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief"
-#: object-file.c:665
+#: object-file.c:596
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
-#: object-file.c:708
+#: object-file.c:639
msgid "unable to fdopen alternates lockfile"
msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen."
-#: object-file.c:726
+#: object-file.c:657
msgid "unable to read alternates file"
msgstr "Konnte \"alternates\"-Datei nicht lesen."
-#: object-file.c:733
+#: object-file.c:664
msgid "unable to move new alternates file into place"
msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen."
-#: object-file.c:768
+#: object-file.c:742
#, c-format
msgid "path '%s' does not exist"
msgstr "Pfad '%s' existiert nicht"
-#: object-file.c:789
+#: object-file.c:763
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"Referenziertes Repository '%s' wird noch nicht als verknüpftes\n"
"Arbeitsverzeichnis unterstützt."
-#: object-file.c:795
+#: object-file.c:769
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
-#: object-file.c:801
+#: object-file.c:775
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
-#: object-file.c:809
+#: object-file.c:783
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
"eingehängt."
-#: object-file.c:869
+#: object-file.c:814
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll"
+
+#: object-file.c:864
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
-#: object-file.c:1019
+#: object-file.c:1014
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
-#: object-file.c:1054
+#: object-file.c:1049
#, c-format
msgid "mmap failed%s"
msgstr "mmap fehlgeschlagen%s"
-#: object-file.c:1218
+#: object-file.c:1230
#, c-format
msgid "object file %s is empty"
msgstr "Objektdatei %s ist leer."
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1349 object-file.c:2588
#, c-format
msgid "corrupt loose object '%s'"
msgstr "Fehlerhaftes loses Objekt '%s'."
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1351 object-file.c:2592
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
-#: object-file.c:1397
+#: object-file.c:1473
+#, c-format
+msgid "unable to parse %s header"
+msgstr "Konnte %s Kopfbereich nicht parsen."
+
+#: object-file.c:1475
msgid "invalid object type"
msgstr "ungültiger Objekt-Typ"
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken."
-
-#: object-file.c:1484
+#: object-file.c:1486
#, c-format
msgid "unable to unpack %s header"
msgstr "Konnte %s Kopfbereich nicht entpacken."
#: object-file.c:1490
#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen."
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "Header für %s zu lang, überschreitet %d Bytes"
-#: object-file.c:1493
-#, c-format
-msgid "unable to parse %s header"
-msgstr "Konnte %s Kopfbereich nicht parsen."
-
-#: object-file.c:1717
+#: object-file.c:1720
#, c-format
msgid "failed to read object %s"
msgstr "Konnte Objekt %s nicht lesen."
-#: object-file.c:1721
+#: object-file.c:1724
#, c-format
msgid "replacement %s not found for %s"
msgstr "Ersetzung %s für %s nicht gefunden."
-#: object-file.c:1725
+#: object-file.c:1728
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt."
-#: object-file.c:1729
+#: object-file.c:1732
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt."
-#: object-file.c:1834
+#: object-file.c:1855
#, c-format
msgid "unable to write file %s"
msgstr "Konnte Datei %s nicht schreiben."
-#: object-file.c:1841
+#: object-file.c:1862
#, c-format
msgid "unable to set permission to '%s'"
msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
-#: object-file.c:1848
+#: object-file.c:1869
msgid "file write error"
msgstr "Fehler beim Schreiben einer Datei."
-#: object-file.c:1868
+#: object-file.c:1904
msgid "error when closing loose object file"
msgstr "Fehler beim Schließen der Datei für lose Objekte."
-#: object-file.c:1933
+#: object-file.c:1971
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"Unzureichende Berechtigung zum Hinzufügen eines Objektes zur Repository-"
"Datenbank %s"
-#: object-file.c:1935
+#: object-file.c:1973
msgid "unable to create temporary file"
msgstr "Konnte temporäre Datei nicht erstellen."
-#: object-file.c:1959
+#: object-file.c:1997
msgid "unable to write loose object file"
msgstr "Fehler beim Schreiben der Datei für lose Objekte."
-#: object-file.c:1965
+#: object-file.c:2003
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
-#: object-file.c:1969
+#: object-file.c:2007
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
-#: object-file.c:1973
+#: object-file.c:2011
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "Fehler wegen instabilen Objektquelldaten für %s"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:2022 builtin/pack-objects.c:1251
#, c-format
msgid "failed utime() on %s"
msgstr "Fehler beim Aufruf von utime() auf '%s'."
-#: object-file.c:2060
+#: object-file.c:2100
#, c-format
msgid "cannot read object for %s"
msgstr "Kann Objekt für %s nicht lesen."
-#: object-file.c:2111
+#: object-file.c:2151
msgid "corrupt commit"
msgstr "fehlerhafter Commit"
-#: object-file.c:2119
+#: object-file.c:2159
msgid "corrupt tag"
msgstr "fehlerhaftes Tag"
-#: object-file.c:2219
+#: object-file.c:2259
#, c-format
msgid "read error while indexing %s"
msgstr "Lesefehler beim Indizieren von '%s'."
-#: object-file.c:2222
+#: object-file.c:2262
#, c-format
msgid "short read while indexing %s"
msgstr "read() zu kurz beim Indizieren von '%s'."
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2335 object-file.c:2345
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: Fehler beim Einfügen in die Datenbank"
-#: object-file.c:2311
+#: object-file.c:2351
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: nicht unterstützte Dateiart"
-#: object-file.c:2335
+#: object-file.c:2375 builtin/fetch.c:1494
#, c-format
msgid "%s is not a valid object"
msgstr "%s ist kein gültiges Objekt"
-#: object-file.c:2337
+#: object-file.c:2377
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s ist kein gültiges '%s' Objekt"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2404
#, c-format
msgid "unable to open %s"
msgstr "kann %s nicht öffnen"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2599
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "Hash für %s stimmt nicht überein (%s erwartet)."
-#: object-file.c:2583
+#: object-file.c:2622
#, c-format
msgid "unable to mmap %s"
msgstr "Konnte mmap nicht auf %s ausführen."
-#: object-file.c:2588
+#: object-file.c:2628
#, c-format
msgid "unable to unpack header of %s"
msgstr "Konnte Kopfbereich von %s nicht entpacken."
-#: object-file.c:2594
+#: object-file.c:2633
#, c-format
msgid "unable to parse header of %s"
msgstr "Konnte Kopfbereich von %s nicht parsen."
-#: object-file.c:2605
+#: object-file.c:2644
#, c-format
msgid "unable to unpack contents of %s"
msgstr "Konnte Inhalt von %s nicht entpacken."
-#: object-name.c:480
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c:382
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [ungültiges Objekt]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c:407
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s Commit %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c:428
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s Tag %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#. "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c:439
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [ungültiger Tag, konnte es nicht parsen]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c:447
+#, c-format
+msgid "%s tree"
+msgstr "%s Tree"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c:453
+#, c-format
+msgid "%s blob"
+msgstr "%s Blob"
+
+#: object-name.c:569
#, c-format
msgid "short object ID %s is ambiguous"
msgstr "kurze Objekt-ID %s ist mehrdeutig"
-#: object-name.c:491
-msgid "The candidates are:"
-msgstr "Die Kandidaten sind:"
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c:591
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Die Kandidaten sind:\n"
+"%s"
-#: object-name.c:790
+#: object-name.c:888
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5862,22 +6204,22 @@
"indem Sie \"git config advice.objectNameWarning false\"\n"
"ausführen."
-#: object-name.c:910
+#: object-name.c:1008
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "Log für '%.*s' geht nur bis %s zurück"
-#: object-name.c:918
+#: object-name.c:1016
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "Log für '%.*s' hat nur %d Einträge"
-#: object-name.c:1696
+#: object-name.c:1794
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "Pfad '%s' befindet sich im Dateisystem, aber nicht in '%.*s'"
-#: object-name.c:1702
+#: object-name.c:1800
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
@@ -5886,12 +6228,12 @@
"Pfad '%s' existiert, aber nicht '%s'\n"
"Hinweis: Meinten Sie '%.*s:%s' auch bekannt als '%.*s:./%s'?"
-#: object-name.c:1711
+#: object-name.c:1809
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "Pfad '%s' existiert nicht in '%.*s'"
-#: object-name.c:1739
+#: object-name.c:1837
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
@@ -5900,7 +6242,7 @@
"Pfad '%s' ist im Index, aber nicht in Stufe %d\n"
"Hinweis: Meinten Sie ':%d:%s'?"
-#: object-name.c:1755
+#: object-name.c:1853
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
@@ -5909,23 +6251,28 @@
"Pfad '%s' ist im Index, aber nicht '%s'\n"
"Hinweis: Meinten Sie ':%d:%s' auch bekannt als ':%d:./%s'?"
-#: object-name.c:1763
+#: object-name.c:1861
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "Pfad '%s' existiert im Dateisystem, aber nicht im Index"
-#: object-name.c:1765
+#: object-name.c:1863
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "Pfad '%s' existiert nicht (weder im Dateisystem noch im Index)"
-#: object-name.c:1778
+#: object-name.c:1876
msgid "relative path syntax can't be used outside working tree"
msgstr ""
"Die Syntax für relative Pfade kann nicht außerhalb des Arbeitsverzeichnisses "
"benutzt werden."
-#: object-name.c:1916
+#: object-name.c:1901
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<Objekt>:<Pfad> benötigt, nur <Objekt> '%s' angegeben"
+
+#: object-name.c:2014
#, c-format
msgid "invalid object name '%.*s'."
msgstr "ungültiger Objektname '%.*s'."
@@ -5950,17 +6297,30 @@
msgid "unable to parse object: %s"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: object.c:283 object.c:295
+#: object.c:283 object.c:294
#, c-format
msgid "hash mismatch %s"
msgstr "Hash stimmt nicht mit %s überein."
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "Multi-Pack-Bitmap fehlt erforderlicher Reverse-Index"
+
+#: pack-bitmap.c:433
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: Paket konnte nicht geöffnet werden"
+
+#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
#, c-format
msgid "unable to get size of %s"
msgstr "Konnte Größe von %s nicht bestimmen."
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1937
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "konnte %s nicht in Paket %s bei Offset %<PRIuMAX> finden"
+
+#: pack-bitmap.c:1973 builtin/rev-list.c:91
#, c-format
msgid "unable to get disk usage of %s"
msgstr "konnte Festplattennutzung von %s nicht bekommen"
@@ -5990,132 +6350,137 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "Reverse-Index-Datei %s hat nicht unterstützte Hash-ID %<PRIu32>"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr ""
"Reverse-Index kann nicht gleichzeitig geschrieben und verifiziert werden"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "konnte nicht lesen: %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "Fehler beim lesbar machen von %s"
-#: pack-write.c:522
+#: pack-write.c:521
#, c-format
msgid "could not write '%s' promisor file"
msgstr "konnte Promisor-Datei '%s' nicht schreiben"
-#: packfile.c:625
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
-#: packfile.c:655
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "Packdatei %s kann nicht gemappt werden%s"
-#: packfile.c:1934
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)"
-#: packfile.c:1938
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "Option `%s' erwartet einen numerischen Wert."
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "Fehlerhaftes Ablaufdatum '%s'"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "Option `%s' erwartet \"always\", \"auto\" oder \"never\"."
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "fehlerhafter Objekt-Name '%s'"
-#: parse-options.c:38
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "Option `%s' erwartet \"%s\" oder \"%s\""
+
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s erfordert einen Wert."
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s ist inkompatibel mit %s."
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s: inkompatibel mit etwas anderem"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s erwartet keinen Wert"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s ist nicht verfügbar."
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
"%s erwartet einen nicht-negativen Integer-Wert mit einem optionalen k/m/g "
"Suffix"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "Mehrdeutige Option: %s (kann --%s%s oder --%s%s sein)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "Meinten Sie `--%s` (mit zwei Strichen)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "Alias für --%s"
-#: parse-options.c:879
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "Unbekannte Option: `%s'"
-#: parse-options.c:881
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "Unbekannter Schalter `%c'"
-#: parse-options.c:883
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "Unbekannte nicht-Ascii Option in String: `%s'"
-#: parse-options.c:907
+#: parse-options.c:920
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "Verwendung: %s"
@@ -6123,49 +6488,73 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " oder: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-NUM"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Es ist nur eine Angabe von 'attr:' erlaubt."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "Angabe von 'attr:' darf nicht leer sein"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "Ungültiger Attributname %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
"inkompatibel."
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6173,52 +6562,52 @@
"Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n"
"mit allen anderen Optionen."
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' und 'glob' sind inkompatibel"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s' liegt außerhalb des Repositories von '%s'"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (Kürzel: '%c')"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
"%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "Zeile enthält falsche Anführungszeichen: %s"
@@ -6239,7 +6628,7 @@
msgid "flush packet write failed"
msgstr "Flush beim Schreiben des Pakets fehlgeschlagen."
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "Protokollfehler: unmöglich lange Zeile"
@@ -6247,7 +6636,7 @@
msgid "packet write with format failed"
msgstr "Schreiben des Pakets mit Format fehlgeschlagen."
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"Schreiben des Pakets fehlgeschlagen - Daten überschreiten maximale Paketgröße"
@@ -6257,25 +6646,25 @@
msgid "packet write failed: %s"
msgstr "Schreiben des Pakets fehlgeschlagen: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "Lesefehler"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "Die Gegenseite hat unerwartet abgebrochen."
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "Protokollfehler: ungültiges Zeichen für Zeilenlänge: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "Protokollfehler: ungültige Zeilenlänge %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "Fehler am anderen Ende: %s"
@@ -6289,7 +6678,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "Kann Thread für lstat nicht erzeugen: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "Konnte --pretty Format nicht parsen."
@@ -6320,20 +6709,20 @@
msgid "Removing duplicate objects"
msgstr "Lösche doppelte Objekte"
-#: range-diff.c:78
+#: range-diff.c:68
msgid "could not start `log`"
msgstr "Konnte `log` nicht starten."
-#: range-diff.c:80
+#: range-diff.c:70
msgid "could not read `log` output"
msgstr "Konnte Ausgabe von `log` nicht lesen."
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:98 sequencer.c:5575
#, c-format
msgid "could not parse commit '%s'"
msgstr "Konnte Commit '%s' nicht parsen."
-#: range-diff.c:115
+#: range-diff.c:109
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6342,71 +6731,67 @@
"konnte erste Zeile der Ausgabe von `log` nicht parsen: fängt nicht mit "
"'commit ' an: '%s'"
-#: range-diff.c:140
+#: range-diff.c:132
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "Konnte Git-Header '%.*s' nicht parsen."
-#: range-diff.c:307
+#: range-diff.c:300
msgid "failed to generate diff"
msgstr "Fehler beim Generieren des Diffs."
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only und --right-only schließen sich gegenseitig aus"
-
-#: range-diff.c:562 range-diff.c:564
+#: range-diff.c:558 range-diff.c:560
#, c-format
msgid "could not parse log for '%s'"
msgstr "Konnte Log für '%s' nicht parsen."
-#: read-cache.c:710
+#: read-cache.c:737
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
"Dateialias '%s' wird nicht hinzugefügt ('%s' existiert bereits im Index)."
-#: read-cache.c:726
+#: read-cache.c:753
msgid "cannot create an empty blob in the object database"
msgstr "Kann keinen leeren Blob in die Objektdatenbank schreiben."
-#: read-cache.c:748
+#: read-cache.c:775
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s: Kann nur reguläre Dateien, symbolische Links oder Git-Verzeichnisse "
"hinzufügen."
-#: read-cache.c:753
+#: read-cache.c:780 builtin/submodule--helper.c:3359
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' hat keinen Commit ausgecheckt"
-#: read-cache.c:805
+#: read-cache.c:832
#, c-format
msgid "unable to index file '%s'"
msgstr "Konnte Datei '%s' nicht indizieren."
-#: read-cache.c:824
+#: read-cache.c:851
#, c-format
msgid "unable to add '%s' to index"
msgstr "Konnte '%s' nicht dem Index hinzufügen."
-#: read-cache.c:835
+#: read-cache.c:862
#, c-format
msgid "unable to stat '%s'"
msgstr "konnte '%s' nicht lesen"
-#: read-cache.c:1358
+#: read-cache.c:1404
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein"
-#: read-cache.c:1573
+#: read-cache.c:1619
msgid "Refresh index"
msgstr "Aktualisiere Index"
-#: read-cache.c:1705
+#: read-cache.c:1751
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6415,7 +6800,7 @@
"index.version gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: read-cache.c:1715
+#: read-cache.c:1761
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6424,143 +6809,147 @@
"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: read-cache.c:1771
+#: read-cache.c:1817
#, c-format
msgid "bad signature 0x%08x"
msgstr "Ungültige Signatur 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1820
#, c-format
msgid "bad index version %d"
msgstr "Ungültige Index-Version %d"
-#: read-cache.c:1783
+#: read-cache.c:1829
msgid "bad index file sha1 signature"
msgstr "Ungültige SHA1-Signatur der Index-Datei."
-#: read-cache.c:1817
+#: read-cache.c:1863
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "Index verwendet Erweiterung %.4s, welche wir nicht unterstützen."
-#: read-cache.c:1819
+#: read-cache.c:1865
#, c-format
msgid "ignoring %.4s extension"
msgstr "Ignoriere Erweiterung %.4s"
-#: read-cache.c:1856
+#: read-cache.c:1902
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "Unbekanntes Format für Index-Eintrag 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1918
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "Ungültiges Namensfeld im Index, in der Nähe von Pfad '%s'."
-#: read-cache.c:1929
+#: read-cache.c:1975
msgid "unordered stage entries in index"
msgstr "Ungeordnete Stage-Einträge im Index."
-#: read-cache.c:1932
+#: read-cache.c:1978
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "Mehrere Stage-Einträge für zusammengeführte Datei '%s'."
-#: read-cache.c:1935
+#: read-cache.c:1981
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "Ungeordnete Stage-Einträge für '%s'."
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
+#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
+#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
+#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
+#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
+#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
msgid "index file corrupt"
msgstr "Index-Datei beschädigt"
-#: read-cache.c:2185
+#: read-cache.c:2240
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
-#: read-cache.c:2198
+#: read-cache.c:2253
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
-#: read-cache.c:2231
+#: read-cache.c:2286
#, c-format
msgid "%s: index file open failed"
msgstr "%s: Öffnen der Index-Datei fehlgeschlagen."
-#: read-cache.c:2235
+#: read-cache.c:2290
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: Kann geöffneten Index nicht lesen."
-#: read-cache.c:2239
+#: read-cache.c:2294
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: Index-Datei ist kleiner als erwartet."
-#: read-cache.c:2243
+#: read-cache.c:2298
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: Konnte Index-Datei nicht mappen%s"
-#: read-cache.c:2286
+#: read-cache.c:2341
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "Kann Thread für load_index_extensions nicht erzeugen: %s"
-#: read-cache.c:2313
+#: read-cache.c:2368
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "Kann Thread für load_index_extensions nicht beitreten: %s"
-#: read-cache.c:2351
+#: read-cache.c:2414
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "Konnte geteilten Index '%s' nicht aktualisieren."
-#: read-cache.c:2398
+#: read-cache.c:2473
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s."
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3032
+msgid "cannot write split index for a sparse index"
+msgstr "kann aufgeteilten Index nicht für ein Sparse-Index schreiben"
+
+#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
#, c-format
msgid "could not close '%s'"
msgstr "Konnte '%s' nicht schließen."
-#: read-cache.c:3075
+#: read-cache.c:3157
msgid "failed to convert to a sparse-index"
msgstr "Konvertierung zu einem Sparse-Index fehlgeschlagen"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3228
#, c-format
msgid "could not stat '%s'"
msgstr "Konnte '%s' nicht lesen."
-#: read-cache.c:3159
+#: read-cache.c:3241
#, c-format
msgid "unable to open git dir: %s"
msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
-#: read-cache.c:3171
+#: read-cache.c:3253
#, c-format
msgid "unable to unlink: %s"
msgstr "Konnte '%s' nicht entfernen."
-#: read-cache.c:3200
+#: read-cache.c:3282
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
-#: read-cache.c:3349
+#: read-cache.c:3439
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: Kann nicht auf Stufe #0 wechseln."
@@ -6631,7 +7020,7 @@
". spezifiziert ist). Benutzen Sie -c <Commit> zum Bearbeiten der\n"
". Commit-Beschreibung.\n"
"\n"
-"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
+"Diese Zeilen können umsortiert werden; sie werden von oben nach unten\n"
"ausgeführt.\n"
#: rebase-interactive.c:66
@@ -6641,7 +7030,7 @@
msgstr[0] "Rebase von %s auf %s (%d Kommando)"
msgstr[1] "Rebase von %s auf %s (%d Kommandos)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6650,7 +7039,7 @@
"Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
"entfernen.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6658,7 +7047,7 @@
"\n"
"Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6672,7 +7061,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6682,14 +7071,14 @@
"Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
+#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
+#: builtin/rebase.c:191
#, c-format
msgid "could not write '%s'"
msgstr "Konnte '%s' nicht schreiben."
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "Konnte '%s' nicht schreiben."
@@ -6720,14 +7109,12 @@
"Warnungen zu ändern.\n"
"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "Konnte '%s' nicht lesen."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' wurde durch 'merges' ersetzt"
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2057
msgid "gone"
msgstr "entfernt"
@@ -6746,258 +7133,239 @@
msgid "ahead %d, behind %d"
msgstr "%d voraus, %d hinterher"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "Erwartetes Format: %%(color:<Farbe>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "nicht erkannte Farbe: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Positiver Wert erwartet refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Positiver Wert erwartet refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "nicht erkanntes %%(%s) Argument: %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) akzeptiert keine Argumente"
-#: ref-filter.c:339
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "nicht erkanntes %%(objectsize) Argument: %s"
-
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) akzeptiert keine Argumente"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) akzeptiert keine Argumente"
-#: ref-filter.c:372
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "nicht erkanntes %%(subject) Argument: %s"
-
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "%%(trailers:key=<Wert>) erwartet"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "unbekanntes %%(trailers) Argument: %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "Positiver Wert erwartet contents:lines=%s"
-#: ref-filter.c:426
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "nicht erkanntes %%(contents) Argument: %s"
-
-#: ref-filter.c:441
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "positiver Wert erwartet '%s' in %%(%s)"
-#: ref-filter.c:445
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "nicht erkanntes Argument '%s' in %%(%s)"
-
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "nicht erkannte E-Mail Option: %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "erwartetes Format: %%(align:<Breite>,<Position>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "nicht erkannte Position:%s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "nicht erkannte Breite:%s"
-#: ref-filter.c:517
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "nicht erkanntes %%(align) Argument: %s"
-
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "Positive Breitenangabe für %%(align) erwartet"
-#: ref-filter.c:543
+#: ref-filter.c:568
#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "nicht erkanntes %%(if) Argument: %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) akzeptiert keine Argumente"
-#: ref-filter.c:645
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "Fehlerhafter Feldname: %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "Unbekannter Feldname: %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"Kein Git-Repository, aber das Feld '%.*s' erfordert Zugriff auf Objektdaten."
-#: ref-filter.c:801
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format: %%(%s) Atom ohne ein %%(%s) Atom verwendet"
-#: ref-filter.c:865
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
-
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: %%(then) Atom mehr als einmal verwendet"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: %%(then) Atom nach %%(else) verwendet"
-#: ref-filter.c:897
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
-
-#: ref-filter.c:899
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
-
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
-msgstr "Format: %%(end) Atom mehr als einmal verwendet"
+msgstr "Format: %%(else) Atom mehr als einmal verwendet"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "Fehlerhafter Formatierungsstring %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "dieser Befehl lehnt Atom ab %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s kann nicht mit --python, --shell, --tcl verwendet werden"
+
+#: ref-filter.c:1707
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(kein Branch, Rebase von %s)"
-#: ref-filter.c:1624
+#: ref-filter.c:1710
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)"
-#: ref-filter.c:1627
+#: ref-filter.c:1713
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(kein Branch, binäre Suche begonnen bei %s)"
-#: ref-filter.c:1631
+#: ref-filter.c:1717
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD losgelöst bei %s)"
-#: ref-filter.c:1634
+#: ref-filter.c:1720
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD losgelöst von %s)"
-#: ref-filter.c:1637
+#: ref-filter.c:1723
msgid "(no branch)"
msgstr "(kein Branch)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1755 ref-filter.c:1973
#, c-format
msgid "missing object %s for %s"
msgstr "Objekt %s fehlt für %s"
-#: ref-filter.c:1679
+#: ref-filter.c:1765
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
-#: ref-filter.c:2064
+#: ref-filter.c:2156
#, c-format
msgid "malformed object at '%s'"
msgstr "fehlerhaftes Objekt bei '%s'"
-#: ref-filter.c:2153
+#: ref-filter.c:2246
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2251 refs.c:672
#, c-format
msgid "ignoring broken ref %s"
msgstr "Ignoriere fehlerhafte Referenz %s"
-#: ref-filter.c:2502
+#: ref-filter.c:2630
#, c-format
msgid "format: %%(end) atom missing"
msgstr "Format: %%(end) Atom fehlt"
-#: ref-filter.c:2596
+#: ref-filter.c:2741
#, c-format
msgid "malformed object name %s"
msgstr "missgebildeter Objektname %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2746
#, c-format
msgid "option `%s' must point to a commit"
msgstr "die Option `%s' muss auf einen Commit zeigen"
-#: refs.c:264
+#: reflog.c:407
+#, c-format
+msgid "not a reflog: %s"
+msgstr "Kein Reflog: %s"
+
+#: reflog.c:410
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "Kein Reflog für '%s'."
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s zeigt auf kein gültiges Objekt!"
-#: refs.c:566
+#: refs.c:561
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -7024,32 +7392,32 @@
"\n"
"\tgit branch -m <Name>\n"
-#: refs.c:588
+#: refs.c:583
#, c-format
msgid "could not retrieve `%s`"
msgstr "konnte `%s` nicht abrufen"
-#: refs.c:598
+#: refs.c:593
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "ungültiger Branchname: %s = %s"
-#: refs.c:674
+#: refs.c:670
#, c-format
msgid "ignoring dangling symref %s"
msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
-#: refs.c:922
+#: refs.c:919
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "Log für Referenz %s hat eine Lücke nach %s."
-#: refs.c:929
+#: refs.c:926
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "Log für Referenz %s unerwartet bei %s beendet."
-#: refs.c:994
+#: refs.c:991
#, c-format
msgid "log for %s is empty"
msgstr "Log für %s ist leer."
@@ -7059,48 +7427,48 @@
msgid "refusing to update ref with bad name '%s'"
msgstr "verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'"
-#: refs.c:1157
+#: refs.c:1164
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s"
-#: refs.c:2051
+#: refs.c:2059
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "mehrere Aktualisierungen für Referenz '%s' nicht erlaubt"
-#: refs.c:2131
+#: refs.c:2145
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
"verboten"
-#: refs.c:2142
+#: refs.c:2156
msgid "ref updates aborted by hook"
msgstr "Aktualisierungen von Referenzen durch Hook abgebrochen"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2264 refs.c:2294
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existiert; kann '%s' nicht erstellen"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2270 refs.c:2305
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "kann '%s' und '%s' nicht zur selben Zeit verarbeiten"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1295
#, c-format
msgid "could not remove reference %s"
msgstr "konnte Referenz %s nicht löschen"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1310 refs/packed-backend.c:1565
+#: refs/packed-backend.c:1575
#, c-format
msgid "could not delete reference %s: %s"
msgstr "konnte Referenz %s nicht entfernen: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1313 refs/packed-backend.c:1578
#, c-format
msgid "could not delete references: %s"
msgstr "konnte Referenzen nicht entfernen: %s"
@@ -7110,52 +7478,52 @@
msgid "invalid refspec '%s'"
msgstr "ungültige Refspec '%s'"
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
"Kürzel für Remote-Repository in der Konfiguration kann nicht mit '/' "
"beginnen: %s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "Mehr als ein receivepack-Befehl angegeben, benutze den ersten."
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "Mehr als ein uploadpack-Befehl angegeben, benutze den ersten."
-#: remote.c:590
+#: remote.c:698
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen."
-#: remote.c:594
+#: remote.c:702
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s folgt üblicherweise %s, nicht %s"
-#: remote.c:598
+#: remote.c:706
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s folgt sowohl %s als auch %s"
-#: remote.c:666
+#: remote.c:774
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "Schlüssel '%s' des Musters hatte kein '*'."
-#: remote.c:676
+#: remote.c:784
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "Wert '%s' des Musters hat kein '*'."
-#: remote.c:1083
+#: remote.c:1191
#, c-format
msgid "src refspec %s does not match any"
msgstr "Src-Refspec %s entspricht keiner Referenz."
-#: remote.c:1088
+#: remote.c:1196
#, c-format
msgid "src refspec %s matches more than one"
msgstr "Src-Refspec %s entspricht mehr als einer Referenz."
@@ -7164,7 +7532,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1211
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -7191,7 +7559,7 @@
"Keines hat funktioniert, sodass wir aufgegeben haben. Sie müssen die\n"
"Referenz mit vollqualifizierten Namen angeben."
-#: remote.c:1123
+#: remote.c:1231
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -7202,7 +7570,7 @@
"Meinten Sie, einen neuen Branch mittels Push nach\n"
"'%s:refs/heads/%s' zu erstellen?"
-#: remote.c:1128
+#: remote.c:1236
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -7213,7 +7581,7 @@
"Meinten Sie, einen neuen Tag mittels Push nach\n"
"'%s:refs/tags/%s' zu erstellen?"
-#: remote.c:1133
+#: remote.c:1241
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -7224,7 +7592,7 @@
"Meinten Sie, einen Tag für ein neues Tree-Objekt\n"
"mittels Push nach '%s:refs/tags/'%s' zu erstellen?"
-#: remote.c:1138
+#: remote.c:1246
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -7235,117 +7603,117 @@
"Meinten Sie, einen Tag für ein neues Blob-Objekt\n"
"mittels Push nach '%s:refs/tags/%s' zu erstellen?"
-#: remote.c:1174
+#: remote.c:1282
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s kann nicht zu Branch aufgelöst werden."
-#: remote.c:1185
+#: remote.c:1293
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "Konnte '%s' nicht löschen: Remote-Referenz existiert nicht."
-#: remote.c:1197
+#: remote.c:1305
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "Dst-Refspec %s entspricht mehr als einer Referenz."
-#: remote.c:1204
+#: remote.c:1312
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "Dst-Referenz %s empfängt von mehr als einer Quelle"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1833 remote.c:1940
msgid "HEAD does not point to a branch"
msgstr "HEAD zeigt auf keinen Branch"
-#: remote.c:1733
+#: remote.c:1842
#, c-format
msgid "no such branch: '%s'"
msgstr "Branch nicht gefunden: '%s'"
-#: remote.c:1736
+#: remote.c:1845
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
-#: remote.c:1742
+#: remote.c:1851
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
-#: remote.c:1757
+#: remote.c:1866
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
"Branch"
-#: remote.c:1769
+#: remote.c:1881
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: remote.c:1779
+#: remote.c:1891
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
-#: remote.c:1792
+#: remote.c:1904
msgid "push has no destination (push.default is 'nothing')"
msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
-#: remote.c:1814
+#: remote.c:1926
msgid "cannot resolve 'simple' push to a single destination"
msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
-#: remote.c:1943
+#: remote.c:2059
#, c-format
msgid "couldn't find remote ref %s"
msgstr "Konnte Remote-Referenz %s nicht finden."
-#: remote.c:1956
+#: remote.c:2072
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Ignoriere sonderbare Referenz '%s' lokal"
-#: remote.c:2119
+#: remote.c:2235
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
"Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
-#: remote.c:2123
+#: remote.c:2239
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
-#: remote.c:2126
+#: remote.c:2242
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n"
-#: remote.c:2130
+#: remote.c:2246
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n"
-#: remote.c:2133
+#: remote.c:2249
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (benutzen Sie \"%s\" für Details)\n"
-#: remote.c:2137
+#: remote.c:2253
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n"
msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n"
-#: remote.c:2143
+#: remote.c:2259
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
-#: remote.c:2146
+#: remote.c:2262
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -7355,12 +7723,12 @@
msgstr[1] ""
"Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
-#: remote.c:2154
+#: remote.c:2270
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
-#: remote.c:2157
+#: remote.c:2273
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -7375,13 +7743,13 @@
"Ihr Branch und '%s' sind divergiert,\n"
"und haben jeweils %d und %d unterschiedliche Commits.\n"
-#: remote.c:2167
+#: remote.c:2283
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
"zusammenzuführen)\n"
-#: remote.c:2359
+#: remote.c:2475
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "Kann erwarteten Objektnamen '%s' nicht parsen."
@@ -7414,131 +7782,121 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "Fehler beim Schreiben von '%s' (%s)."
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr "Flush bei '%s' fehlgeschlagen."
-#: rerere.c:487 rerere.c:1023
+#: rerere.c:487 rerere.c:1024
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "Konnte Konflikt-Blöcke in '%s' nicht parsen."
-#: rerere.c:668
+#: rerere.c:669
#, c-format
msgid "failed utime() on '%s'"
msgstr "Fehler beim Aufruf von utime() auf '%s'."
-#: rerere.c:678
+#: rerere.c:679
#, c-format
msgid "writing '%s' failed"
msgstr "Schreiben von '%s' fehlgeschlagen."
-#: rerere.c:698
+#: rerere.c:699
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "'%s' mit vorheriger Konfliktauflösung zum Commit vorgemerkt."
-#: rerere.c:737
+#: rerere.c:738
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "Konfliktauflösung für '%s' aufgezeichnet."
-#: rerere.c:772
+#: rerere.c:773
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "Konflikte in '%s' mit vorheriger Konfliktauflösung beseitigt."
-#: rerere.c:787
+#: rerere.c:788
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "Kann '%s' nicht löschen."
-#: rerere.c:791
+#: rerere.c:792
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "Preimage für '%s' aufgezeichnet."
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
+#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
#, c-format
msgid "could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: rerere.c:1041
+#: rerere.c:1042
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "Fehler beim Aktualisieren des Konflikt-Status in '%s'."
-#: rerere.c:1052 rerere.c:1059
+#: rerere.c:1053 rerere.c:1060
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "Keine aufgezeichnete Konfliktauflösung für '%s'."
-#: rerere.c:1061
+#: rerere.c:1062
#, c-format
msgid "cannot unlink '%s'"
msgstr "Kann '%s' nicht löschen."
-#: rerere.c:1071
+#: rerere.c:1072
#, c-format
msgid "Updated preimage for '%s'"
msgstr "Preimage für '%s' aktualisiert."
-#: rerere.c:1080
+#: rerere.c:1081
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Aufgezeichnete Konfliktauflösung für '%s' gelöscht.\n"
-#: rerere.c:1191
+#: rerere.c:1192
msgid "unable to open rr-cache directory"
msgstr "Konnte rr-cache Verzeichnis nicht öffnen."
-#: reset.c:42
+#: reset.c:112
msgid "could not determine HEAD revision"
msgstr "Konnte HEAD-Commit nicht bestimmen."
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:141 reset.c:147 sequencer.c:3696
#, c-format
msgid "failed to find tree of %s"
msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
-#: revision.c:2344
+#: revision.c:2358
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<Pack-Datei> wird nicht länger unterstützt"
-#: revision.c:2684
+#: revision.c:2712
msgid "your current branch appears to be broken"
msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
-#: revision.c:2687
+#: revision.c:2715
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
-#: revision.c:2893
+#: revision.c:2901
+msgid "object filtering requires --objects"
+msgstr "Das Filtern von Objekten erfordert --objects."
+
+#: revision.c:2918
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L unterstützt noch keine anderen Diff-Formate außer -p und -s"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "Öffnen von /dev/null fehlgeschlagen"
-
-#: run-command.c:1274
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "Konnte Thread für async nicht erzeugen: %s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Der '%s' Hook wurde ignoriert, weil er nicht als ausführbar markiert ist.\n"
-"Sie können diese Warnung mit `git config advice.ignoredHook false` "
-"deaktivieren."
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status."
@@ -7557,25 +7915,25 @@
msgid "failed to sign the push certificate"
msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack: konnte Fetch-Subprozess nicht abspalten"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "Push-Verhandlung fehlgeschlagen; fahre trotzdem mit dem Push fort"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr ""
"die Gegenseite unterstützt nicht den Hash-Algorithmus dieses Repositories"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr ""
"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7583,47 +7941,48 @@
"kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
"Versand (\"--signed push\") unterstützt"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "die Gegenseite unterstützt keine Push-Optionen"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen."
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "Konnte '%s' nicht löschen."
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "Konnte '%s' nicht löschen"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "Revert"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "Cherry-Pick"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "Rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "Unbekannte Aktion: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7631,54 +7990,84 @@
"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
"mit 'git add <Pfade>' oder 'git rm <Pfade>'"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
-"mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
-"'git commit' ein"
+"Lösen Sie alle Konflikte manuell auf, markieren Sie diese mit\n"
+"\"git add/rm <Pfadspezifikation>\" und führen Sie dann\n"
+"\"git cherry-pick --continue\" aus.\n"
+"Sie können stattdessen auch diesen Commit auslassen, indem\n"
+"Sie \"git cherry-pick --skip\" ausführen.\n"
+"Um abzubrechen und zurück zum Zustand vor \"git cherry-pick\" zu\n"
+"gelangen, führen Sie \"git cherry-pick --abort\" aus."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Lösen Sie alle Konflikte manuell auf, markieren Sie diese mit\n"
+"\"git add/rm <Pfadspezifikation>\" und führen Sie dann\n"
+"\"git revert --continue\" aus.\n"
+"Sie können stattdessen auch diesen Commit auslassen, indem\n"
+"Sie \"git revert --skip\" ausführen.\n"
+"Um abzubrechen und zurück zum Zustand vor \"git revert\" zu gelangen,\n"
+"führen Sie \"git revert --abort\" aus."
+
+#: sequencer.c:448 sequencer.c:3288
#, c-format
msgid "could not lock '%s'"
msgstr "Konnte '%s' nicht sperren"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
+#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
#, c-format
msgid "could not write to '%s'"
msgstr "Konnte nicht nach '%s' schreiben."
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "Konnte EOL nicht nach '%s' schreiben."
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3565
#, c-format
msgid "failed to finalize '%s'"
msgstr "Fehler beim Fertigstellen von '%s'."
-#: sequencer.c:486
+#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
+#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
+#, c-format
+msgid "could not read '%s'"
+msgstr "Konnte '%s' nicht lesen"
+
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr ""
"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: Vorspulen"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:615
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ungültiger \"cleanup\" Modus %s"
@@ -7686,65 +8075,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Konnte neue Index-Datei nicht schreiben"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "Konnte HEAD-Commit nicht auflösen."
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "Kein Schlüssel in '%.*s' vorhanden."
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "Konnte Anführungszeichen von '%s' nicht entfernen."
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
+#: builtin/am.c:849 builtin/rebase.c:699
#, c-format
msgid "could not open '%s' for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' bereits angegeben."
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben."
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' bereits angegeben."
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "Unbekannte Variable '%s'"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' fehlt."
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' fehlt."
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' fehlt."
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7775,11 +8164,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
-#: sequencer.c:1218
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7807,7 +8196,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7833,345 +8222,346 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1287
msgid "couldn't look up newly created commit"
msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-#: sequencer.c:1275
+#: sequencer.c:1289
msgid "could not parse newly created commit"
msgstr "Konnte neu erstellten Commit nicht analysieren."
-#: sequencer.c:1321
+#: sequencer.c:1336
msgid "unable to resolve HEAD after creating commit"
msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
-#: sequencer.c:1323
+#: sequencer.c:1338
msgid "detached HEAD"
msgstr "losgelöster HEAD"
-#: sequencer.c:1327
+#: sequencer.c:1342
msgid " (root-commit)"
msgstr " (Root-Commit)"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "could not parse HEAD"
msgstr "Konnte HEAD nicht parsen."
-#: sequencer.c:1350
+#: sequencer.c:1365
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s ist kein Commit!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "Konnte Commit von HEAD nicht analysieren."
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1425 sequencer.c:2310
msgid "unable to parse commit author"
msgstr "Konnte Commit-Autor nicht parsen."
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1469 sequencer.c:1589
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen."
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1500 sequencer.c:1532
#, c-format
msgid "invalid author identity '%s'"
msgstr "ungültige Autor-Identität '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1506
msgid "corrupt author: missing date information"
msgstr "unbrauchbarer Autor: Datumsinformationen fehlen"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
+#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "Fehler beim Schreiben des Commit-Objektes."
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "Konnte %s nicht aktualisieren."
-#: sequencer.c:1606
+#: sequencer.c:1621
#, c-format
msgid "could not parse commit %s"
msgstr "Konnte Commit %s nicht parsen."
-#: sequencer.c:1611
+#: sequencer.c:1626
#, c-format
msgid "could not parse parent commit %s"
msgstr "Konnte Eltern-Commit %s nicht parsen."
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1709 sequencer.c:1990
#, c-format
msgid "unknown command: %d"
msgstr "Unbekannter Befehl: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1751
msgid "This is the 1st commit message:"
msgstr "Das ist die erste Commit-Beschreibung:"
-#: sequencer.c:1737
+#: sequencer.c:1752
#, c-format
msgid "This is the commit message #%d:"
msgstr "Das ist Commit-Beschreibung #%d:"
-#: sequencer.c:1738
+#: sequencer.c:1753
msgid "The 1st commit message will be skipped:"
msgstr "Die erste Commit-Beschreibung wird übersprungen:"
-#: sequencer.c:1739
+#: sequencer.c:1754
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
-#: sequencer.c:1740
+#: sequencer.c:1755
#, c-format
msgid "This is a combination of %d commits."
msgstr "Das ist eine Kombination aus %d Commits."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1902 sequencer.c:1959
#, c-format
msgid "cannot write '%s'"
msgstr "kann '%s' nicht schreiben"
-#: sequencer.c:1934
+#: sequencer.c:1949
msgid "need a HEAD to fixup"
msgstr "benötige HEAD für fixup"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1951 sequencer.c:3592
msgid "could not read HEAD"
msgstr "Konnte HEAD nicht lesen"
-#: sequencer.c:1938
+#: sequencer.c:1953
msgid "could not read HEAD's commit message"
msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
-#: sequencer.c:1962
+#: sequencer.c:1977
#, c-format
msgid "could not read commit message of %s"
msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
-#: sequencer.c:2072
+#: sequencer.c:2087
msgid "your index file is unmerged."
msgstr "Ihre Index-Datei ist nicht zusammengeführt."
-#: sequencer.c:2079
+#: sequencer.c:2094
msgid "cannot fixup root commit"
msgstr "kann fixup nicht auf Root-Commit anwenden"
-#: sequencer.c:2098
+#: sequencer.c:2113
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2121 sequencer.c:2129
#, c-format
msgid "commit %s does not have parent %d"
msgstr "Commit %s hat keinen Eltern-Commit %d"
-#: sequencer.c:2120
+#: sequencer.c:2135
#, c-format
msgid "cannot get commit message for %s"
msgstr "Kann keine Commit-Beschreibung für %s bekommen."
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2154
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kann Eltern-Commit %s nicht parsen"
-#: sequencer.c:2205
+#: sequencer.c:2220
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' umbenennen."
-#: sequencer.c:2265
+#: sequencer.c:2280
#, c-format
msgid "could not revert %s... %s"
msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
-#: sequencer.c:2266
+#: sequencer.c:2281
#, c-format
msgid "could not apply %s... %s"
msgstr "Konnte %s... (%s) nicht anwenden"
-#: sequencer.c:2287
+#: sequencer.c:2302
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "Weglassen von %s %s -- Patch-Inhalte sind bereits im Upstream-Branch\n"
-#: sequencer.c:2345
+#: sequencer.c:2360
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: Fehler beim Lesen des Index"
-#: sequencer.c:2352
+#: sequencer.c:2368
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: Fehler beim Aktualisieren des Index"
-#: sequencer.c:2425
+#: sequencer.c:2448
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s akzeptiert keine Argumente: '%s'"
-#: sequencer.c:2434
+#: sequencer.c:2457
#, c-format
msgid "missing arguments for %s"
msgstr "Fehlende Argumente für %s."
-#: sequencer.c:2477
+#: sequencer.c:2500
#, c-format
msgid "could not parse '%s'"
msgstr "Konnte '%s' nicht parsen."
-#: sequencer.c:2538
+#: sequencer.c:2561
#, c-format
msgid "invalid line %d: %.*s"
msgstr "Ungültige Zeile %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2572
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
-#: sequencer.c:2635
+#: sequencer.c:2620 builtin/rebase.c:185
+#, c-format
+msgid "could not read '%s'."
+msgstr "Konnte '%s' nicht lesen."
+
+#: sequencer.c:2658
msgid "cancelling a cherry picking in progress"
msgstr "Abbrechen eines laufenden \"cherry-pick\""
-#: sequencer.c:2644
+#: sequencer.c:2667
msgid "cancelling a revert in progress"
msgstr "Abbrechen eines laufenden \"revert\""
-#: sequencer.c:2690
+#: sequencer.c:2707
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
"Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
-#: sequencer.c:2692
+#: sequencer.c:2709
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "Unbenutzbares Instruktionsblatt: '%s'"
-#: sequencer.c:2697
+#: sequencer.c:2714
msgid "no commits parsed."
msgstr "Keine Commits geparst."
-#: sequencer.c:2708
+#: sequencer.c:2725
msgid "cannot cherry-pick during a revert."
msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
-#: sequencer.c:2710
+#: sequencer.c:2727
msgid "cannot revert during a cherry-pick."
msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
-#: sequencer.c:2788
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "ungültiger Wert für %s: %s"
-
-#: sequencer.c:2897
+#: sequencer.c:2914
msgid "unusable squash-onto"
msgstr "unbenutzbares squash-onto"
-#: sequencer.c:2917
+#: sequencer.c:2934
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "fehlerhaftes Optionsblatt: '%s'"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3029 sequencer.c:4875
msgid "empty commit set passed"
msgstr "leere Menge von Commits übergeben"
-#: sequencer.c:3029
+#: sequencer.c:3046
msgid "revert is already in progress"
msgstr "\"revert\" ist bereits im Gange"
-#: sequencer.c:3031
+#: sequencer.c:3048
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3051
msgid "cherry-pick is already in progress"
msgstr "\"cherry-pick\" wird bereits durchgeführt"
-#: sequencer.c:3036
+#: sequencer.c:3053
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3067
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen"
-#: sequencer.c:3065
+#: sequencer.c:3082
msgid "could not lock HEAD"
msgstr "konnte HEAD nicht sperren"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3142 sequencer.c:4585
msgid "no cherry-pick or revert in progress"
msgstr "kein \"cherry-pick\" oder \"revert\" im Gange"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3144 sequencer.c:3155
msgid "cannot resolve HEAD"
msgstr "kann HEAD nicht auflösen"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3146 sequencer.c:3190
msgid "cannot abort from a branch yet to be born"
msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
+#: builtin/grep.c:774
#, c-format
msgid "cannot open '%s'"
msgstr "kann '%s' nicht öffnen"
-#: sequencer.c:3161
+#: sequencer.c:3178
#, c-format
msgid "cannot read '%s': %s"
msgstr "kann '%s' nicht lesen: %s"
-#: sequencer.c:3162
+#: sequencer.c:3179
msgid "unexpected end of file"
msgstr "unerwartetes Dateiende"
-#: sequencer.c:3168
+#: sequencer.c:3185
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
-#: sequencer.c:3179
+#: sequencer.c:3196
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD."
-#: sequencer.c:3220
+#: sequencer.c:3237
msgid "no revert in progress"
msgstr "kein Revert im Gange"
-#: sequencer.c:3229
+#: sequencer.c:3246
msgid "no cherry-pick in progress"
msgstr "kein \"cherry-pick\" im Gange"
-#: sequencer.c:3239
+#: sequencer.c:3256
msgid "failed to skip the commit"
msgstr "Überspringen des Commits fehlgeschlagen"
-#: sequencer.c:3246
+#: sequencer.c:3263
msgid "there is nothing to skip"
msgstr "nichts zum Überspringen vorhanden"
-#: sequencer.c:3249
+#: sequencer.c:3266
#, c-format
msgid ""
"have you committed already?\n"
@@ -8180,16 +8570,16 @@
"Haben Sie bereits committet?\n"
"Versuchen Sie \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3428 sequencer.c:4476
msgid "cannot read HEAD"
msgstr "kann HEAD nicht lesen"
-#: sequencer.c:3428
+#: sequencer.c:3445
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "konnte '%s' nicht nach '%s' kopieren"
-#: sequencer.c:3436
+#: sequencer.c:3453
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8208,27 +8598,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3463
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Konnte %s... (%.*s) nicht anwenden"
-#: sequencer.c:3453
+#: sequencer.c:3470
#, c-format
msgid "Could not merge %.*s"
msgstr "Konnte \"%.*s\" nicht zusammenführen"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "konnte '%s' nicht nach '%s' kopieren"
-#: sequencer.c:3483
+#: sequencer.c:3499
#, c-format
msgid "Executing: %s\n"
msgstr "Führe aus: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3510
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8244,11 +8634,11 @@
"\n"
"ausführen.\n"
-#: sequencer.c:3504
+#: sequencer.c:3516
msgid "and made changes to the index and/or the working tree\n"
msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n"
-#: sequencer.c:3510
+#: sequencer.c:3522
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8266,91 +8656,91 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3582
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "unerlaubter Beschriftungsname: '%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3655
msgid "writing fake root commit"
msgstr "unechten Root-Commit schreiben"
-#: sequencer.c:3650
+#: sequencer.c:3660
msgid "writing squash-onto"
msgstr "squash-onto schreiben"
-#: sequencer.c:3734
+#: sequencer.c:3739
#, c-format
msgid "could not resolve '%s'"
msgstr "konnte '%s' nicht auflösen"
-#: sequencer.c:3767
+#: sequencer.c:3771
msgid "cannot merge without a current revision"
msgstr "kann nicht ohne einen aktuellen Commit mergen"
-#: sequencer.c:3789
+#: sequencer.c:3793
#, c-format
msgid "unable to parse '%.*s'"
msgstr "konnte '%.*s' nicht parsen"
-#: sequencer.c:3798
+#: sequencer.c:3802
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nichts zum Zusammenführen: '%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3814
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
"Oktopus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgeführt werden"
-#: sequencer.c:3826
+#: sequencer.c:3869
#, c-format
msgid "could not get commit message of '%s'"
msgstr "konnte keine Commit-Beschreibung von '%s' bekommen"
-#: sequencer.c:4009
+#: sequencer.c:4013
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "konnte nicht einmal versuchen '%.*s' zu mergen"
-#: sequencer.c:4025
+#: sequencer.c:4029
msgid "merge: Unable to write new index file"
msgstr "merge: Konnte neue Index-Datei nicht schreiben."
-#: sequencer.c:4099
+#: sequencer.c:4110
msgid "Cannot autostash"
msgstr "Kann automatischen Stash nicht erzeugen"
-#: sequencer.c:4102
+#: sequencer.c:4113
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Unerwartete 'stash'-Antwort: '%s'"
-#: sequencer.c:4108
+#: sequencer.c:4119
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Konnte Verzeichnis für '%s' nicht erstellen"
-#: sequencer.c:4111
+#: sequencer.c:4122
#, c-format
msgid "Created autostash: %s\n"
msgstr "Automatischen Stash erzeugt: %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4124
msgid "could not reset --hard"
msgstr "konnte 'reset --hard' nicht ausführen"
-#: sequencer.c:4140
+#: sequencer.c:4148
#, c-format
msgid "Applied autostash.\n"
msgstr "Automatischen Stash angewendet.\n"
-#: sequencer.c:4152
+#: sequencer.c:4160
#, c-format
msgid "cannot store %s"
msgstr "kann %s nicht speichern"
-#: sequencer.c:4155
+#: sequencer.c:4163
#, c-format
msgid ""
"%s\n"
@@ -8361,29 +8751,29 @@
"Ihre Änderungen sind im Stash sicher.\n"
"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-#: sequencer.c:4160
+#: sequencer.c:4168
msgid "Applying autostash resulted in conflicts."
msgstr "Beim Anwenden des automatischen Stash traten Konflikte auf."
-#: sequencer.c:4161
+#: sequencer.c:4169
msgid "Autostash exists; creating a new stash entry."
msgstr "Automatischer Stash existiert; ein neuer Stash-Eintrag wird erstellt."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4225
msgid "could not detach HEAD"
msgstr "konnte HEAD nicht loslösen"
-#: sequencer.c:4248
+#: sequencer.c:4240
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Angehalten bei HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4242
#, c-format
msgid "Stopped at %s\n"
msgstr "Angehalten bei %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4274
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8405,60 +8795,60 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4320
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Rebase (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4366
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Angehalten bei %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4436
#, c-format
msgid "unknown command %d"
msgstr "Unbekannter Befehl %d"
-#: sequencer.c:4480
+#: sequencer.c:4484
msgid "could not read orig-head"
msgstr "Konnte orig-head nicht lesen."
-#: sequencer.c:4485
+#: sequencer.c:4489
msgid "could not read 'onto'"
msgstr "Konnte 'onto' nicht lesen."
-#: sequencer.c:4499
+#: sequencer.c:4503
#, c-format
msgid "could not update HEAD to %s"
msgstr "Konnte HEAD nicht auf %s aktualisieren."
-#: sequencer.c:4559
+#: sequencer.c:4563
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Erfolgreich Rebase ausgeführt und %s aktualisiert.\n"
-#: sequencer.c:4611
+#: sequencer.c:4615
msgid "cannot rebase: You have unstaged changes."
msgstr ""
"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
"vorgemerkt sind."
-#: sequencer.c:4620
+#: sequencer.c:4624
msgid "cannot amend non-existing commit"
msgstr "Kann nicht existierenden Commit nicht nachbessern."
-#: sequencer.c:4622
+#: sequencer.c:4626
#, c-format
msgid "invalid file: '%s'"
msgstr "Ungültige Datei: '%s'"
-#: sequencer.c:4624
+#: sequencer.c:4628
#, c-format
msgid "invalid contents: '%s'"
msgstr "Ungültige Inhalte: '%s'"
-#: sequencer.c:4627
+#: sequencer.c:4631
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8469,59 +8859,69 @@
"committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
"erneut aus."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4667 sequencer.c:4706
#, c-format
msgid "could not write file: '%s'"
msgstr "Konnte Datei nicht schreiben: '%s'"
-#: sequencer.c:4718
+#: sequencer.c:4722
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
-#: sequencer.c:4725
+#: sequencer.c:4732
msgid "could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#: sequencer.c:4845
+#: sequencer.c:4852
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
-#: sequencer.c:4849
+#: sequencer.c:4856
#, c-format
msgid "%s: bad revision"
msgstr "%s: ungültiger Commit"
-#: sequencer.c:4884
+#: sequencer.c:4891
msgid "can't revert as initial commit"
msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
-#: sequencer.c:5361
+#: sequencer.c:5162 sequencer.c:5391
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "zuvor angewendeten Commit %s übersprungen"
+
+#: sequencer.c:5232 sequencer.c:5407
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+"verwenden Sie --reapply-cherry-picks, um übersprungene Commits einzubeziehen"
+
+#: sequencer.c:5378
msgid "make_script: unhandled options"
msgstr "make_script: unbehandelte Optionen"
-#: sequencer.c:5364
+#: sequencer.c:5381
msgid "make_script: error preparing revisions"
msgstr "make_script: Fehler beim Vorbereiten der Commits"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5639 sequencer.c:5656
msgid "nothing to do"
msgstr "Nichts zu tun."
-#: sequencer.c:5650
+#: sequencer.c:5675
msgid "could not skip unnecessary pick commands"
msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen."
-#: sequencer.c:5750
+#: sequencer.c:5775
msgid "the script was already rearranged."
msgstr "Das Script wurde bereits umgeordnet."
-#: setup.c:133
+#: setup.c:135
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' liegt außerhalb des Repositories von '%s'"
-#: setup.c:185
+#: setup.c:187
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -8531,7 +8931,7 @@
"Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
"nicht existieren."
-#: setup.c:198
+#: setup.c:200
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8543,13 +8943,13 @@
"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
-#: setup.c:264
+#: setup.c:266
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
-"Die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind."
+"die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind"
-#: setup.c:283
+#: setup.c:285
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -8560,101 +8960,101 @@
"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
-#: setup.c:419
+#: setup.c:421
msgid "unable to set up work tree using invalid config"
msgstr ""
"Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten."
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:425 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden."
-#: setup.c:658
+#: setup.c:724
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
-#: setup.c:666
+#: setup.c:732
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "Unbekannte Repository-Erweiterung gefunden:"
msgstr[1] "Unbekannte Repository-Erweiterungen gefunden:"
-#: setup.c:680
+#: setup.c:746
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "Repository-Version ist 0, aber Erweiterung nur für v1 gefunden:"
msgstr[1] "Repository-Version ist 0, aber Erweiterungen nur für v1 gefunden:"
-#: setup.c:701
+#: setup.c:767
#, c-format
msgid "error opening '%s'"
msgstr "Fehler beim Öffnen von '%s'."
-#: setup.c:703
+#: setup.c:769
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "Zu groß, um eine .git-Datei zu sein: '%s'"
-#: setup.c:705
+#: setup.c:771
#, c-format
msgid "error reading %s"
msgstr "Fehler beim Lesen von '%s'."
-#: setup.c:707
+#: setup.c:773
#, c-format
msgid "invalid gitfile format: %s"
msgstr "Ungültiges gitfile-Format: %s"
-#: setup.c:709
+#: setup.c:775
#, c-format
msgid "no path in gitfile: %s"
msgstr "Kein Pfad in gitfile: %s"
-#: setup.c:711
+#: setup.c:777
#, c-format
msgid "not a git repository: %s"
msgstr "Kein Git-Repository: %s"
-#: setup.c:813
+#: setup.c:879
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' zu groß"
-#: setup.c:827
+#: setup.c:893
#, c-format
msgid "not a git repository: '%s'"
msgstr "Kein Git-Repository: '%s'"
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:922 setup.c:924 setup.c:955
#, c-format
msgid "cannot chdir to '%s'"
msgstr "Kann nicht in Verzeichnis '%s' wechseln."
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
msgid "cannot come back to cwd"
msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurückwechseln."
-#: setup.c:988
+#: setup.c:1054
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "Konnte '%*s%s%s' nicht lesen."
-#: setup.c:1231
+#: setup.c:1338
msgid "Unable to read current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
-#: setup.c:1240 setup.c:1246
+#: setup.c:1347 setup.c:1353
#, c-format
msgid "cannot change to '%s'"
msgstr "Kann nicht nach '%s' wechseln."
-#: setup.c:1251
+#: setup.c:1358
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "Kein Git-Repository (oder irgendeines der Elternverzeichnisse): %s"
-#: setup.c:1257
+#: setup.c:1364
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -8664,7 +9064,20 @@
"%s)\n"
"Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
-#: setup.c:1381
+#: setup.c:1374
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"unsicheres Repository ('%s' gehört jemand anderem)\n"
+"Um eine Ausnahme für dieses Repository hinzuzufügen, führen Sie aus:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#: setup.c:1502
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8673,69 +9086,61 @@
"Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
"Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "Öffnen von /dev/null oder dup fehlgeschlagen."
-
-#: setup.c:1445
+#: setup.c:1564
msgid "fork failed"
msgstr "fork fehlgeschlagen"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1569
msgid "setsid failed"
msgstr "setsid fehlgeschlagen"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "versuche partiellen Index ohne Cone-Modus zu benutzen"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "konnte Cache-Verzeichnis nicht aktualisieren, bleibt voll"
-
-#: sparse-index.c:263
+#: sparse-index.c:285
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "Index-Eintrag ist ein Verzeichnis, aber nicht partiell (%08x)"
+#: split-index.c:9
+msgid "cannot use split index with a sparse index"
+msgstr "kann aufgeteilten Index nicht mit einem Sparse-Index benutzen"
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:852
+#: 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:860
+#: strbuf.c:861
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:862
+#: 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:869
+#: strbuf.c:870
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:871
+#: 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:877
+#: strbuf.c:878
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8743,86 +9148,86 @@
msgstr[1] "%u Bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
+#: strbuf.c:880
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u Byte/s"
msgstr[1] "%u Bytes/s"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
+#: builtin/rebase.c:653
#, c-format
msgid "could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: strbuf.c:1177
+#: strbuf.c:1196
#, c-format
msgid "could not edit '%s'"
msgstr "Konnte '%s' nicht editieren."
-#: submodule-config.c:237
+#: submodule-config.c:238
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "Ignoriere verdächtigen Submodulnamen: %s"
-#: submodule-config.c:304
+#: submodule-config.c:305
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt."
-#: submodule-config.c:402
+#: submodule-config.c:403
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
"Ignoriere '%s', was als eine Befehlszeilenoption '%s' interpretiert werden "
"würde."
-#: submodule-config.c:499
+#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
#, c-format
-msgid "invalid value for %s"
-msgstr "Ungültiger Wert für %s"
+msgid "invalid value for '%s'"
+msgstr "ungültiger Wert für '%s'"
-#: submodule-config.c:766
+#: submodule-config.c:828
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
-#: submodule.c:114 submodule.c:143
+#: submodule.c:115 submodule.c:144
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n"
"Sie zuerst die Konflikte auf"
-#: submodule.c:118 submodule.c:147
+#: submodule.c:119 submodule.c:148
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
-#: submodule.c:154
+#: submodule.c:155
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
-#: submodule.c:165
+#: submodule.c:166
msgid "staging updated .gitmodules failed"
msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
-#: submodule.c:328
+#: submodule.c:346
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "In nicht ausgechecktem Submodul '%s'."
-#: submodule.c:359
+#: submodule.c:377
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
-#: submodule.c:436
+#: submodule.c:454
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "ungültiges --ignore-submodules Argument: %s"
-#: submodule.c:805
+#: submodule.c:866
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8831,12 +9236,12 @@
"Submodul in Commit %s beim Pfad: '%s' hat den gleichen Namen wie ein "
"Submodul. Wird übersprungen."
-#: submodule.c:908
+#: submodule.c:987
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit."
-#: submodule.c:993
+#: submodule.c:1069
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8845,36 +9250,46 @@
"Konnte 'git rev-list <Commits> --not --remotes -n 1' nicht in Submodul '%s' "
"ausführen."
-#: submodule.c:1116
+#: submodule.c:1192
#, c-format
msgid "process for submodule '%s' failed"
msgstr "Prozess für Submodul '%s' fehlgeschlagen"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
-#: submodule.c:1156
+#: submodule.c:1232
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Pushe Submodul '%s'\n"
-#: submodule.c:1159
+#: submodule.c:1235
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Kann Push für Submodul '%s' nicht ausführen\n"
-#: submodule.c:1451
+#: submodule.c:1567
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Anfordern des Submoduls %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1589
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Konnte nicht auf Submodul '%s' zugreifen\n"
-#: submodule.c:1640
+#: submodule.c:1618
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Konnte nicht auf Submodul '%s' beim Commit %s zugreifen\n"
+
+#: submodule.c:1629
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Anfordern des Submoduls %s%s beim Commit %s\n"
+
+#: submodule.c:1849
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8883,62 +9298,62 @@
"Fehler während des Anforderns der Submodule:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1874
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' nicht als Git-Repository erkannt"
-#: submodule.c:1682
+#: submodule.c:1891
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Konnte 'git status --porcelain=2' nicht in Submodul %s ausführen"
-#: submodule.c:1723
+#: submodule.c:1932
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' ist in Submodul %s fehlgeschlagen"
-#: submodule.c:1798
+#: submodule.c:2007
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
-#: submodule.c:1811
+#: submodule.c:2020
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
-#: submodule.c:1826
+#: submodule.c:2037
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben."
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:2064 submodule.c:2379
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
-#: submodule.c:1874
+#: submodule.c:2086
msgid "could not reset submodule index"
msgstr "konnte Index des Submoduls nicht zurücksetzen"
-#: submodule.c:1916
+#: submodule.c:2128
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "Submodul '%s' hat einen geänderten Index."
-#: submodule.c:1968
+#: submodule.c:2182
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submodule '%s' konnte nicht aktualisiert werden."
-#: submodule.c:2036
+#: submodule.c:2250
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
"Git-Verzeichnis des Submoduls '%s' ist im Git-Verzeichnis '%.*s' enthalten."
-#: submodule.c:2057
+#: submodule.c:2271
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8946,17 +9361,17 @@
"relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
"wird nicht unterstützt"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2283 submodule.c:2343
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "Konnte Name für Submodul '%s' nicht nachschlagen."
-#: submodule.c:2073
+#: submodule.c:2287
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "Verschieben von '%s' in ein existierendes Git-Verzeichnis verweigert."
-#: submodule.c:2080
+#: submodule.c:2293
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8967,11 +9382,11 @@
"'%s' nach\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2424
msgid "could not start ls-files in .."
msgstr "Konnte 'ls-files' nicht in .. starten"
-#: submodule.c:2248
+#: submodule.c:2464
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
@@ -8992,8 +9407,8 @@
msgid "unknown value '%s' for key '%s'"
msgstr "unbekannter Wert '%s' für Schlüssel %s"
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
+#: builtin/remote.c:328
#, c-format
msgid "more than one %s"
msgstr "mehr als ein %s"
@@ -9008,11 +9423,11 @@
msgid "could not read input file '%s'"
msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
msgid "could not read from stdin"
msgstr "konnte nicht von der Standard-Eingabe lesen"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:760
#, c-format
msgid "could not stat %s"
msgstr "Konnte '%s' nicht lesen"
@@ -9057,12 +9472,12 @@
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
msgstr ""
-"Unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n"
-"wahrscheinlich eine neuere Version von Git."
+"unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n"
+"wahrscheinlich eine neuere Version von Git"
#: transport-helper.c:220
msgid "this remote helper should implement refspec capability"
-msgstr "Dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren."
+msgstr "dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren"
#: transport-helper.c:287 transport-helper.c:429
#, c-format
@@ -9080,9 +9495,9 @@
#: transport-helper.c:520
msgid "error while running fast-import"
-msgstr "Fehler beim Ausführen von 'fast-import'."
+msgstr "Fehler beim Ausführen von 'fast-import'"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1254
#, c-format
msgid "could not read ref %s"
msgstr "konnte Referenz %s nicht lesen"
@@ -9101,7 +9516,7 @@
msgid "invalid remote service path"
msgstr "ungültiger Remote-Service Pfad."
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1496
msgid "operation not supported by protocol"
msgstr "die Operation wird von dem Protokoll nicht unterstützt"
@@ -9110,72 +9525,72 @@
msgid "can't connect to subservice %s"
msgstr "kann keine Verbindung zu Subservice %s herstellen"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:415
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only benötigt Protokoll v2"
-#: transport-helper.c:755
+#: transport-helper.c:758
msgid "'option' without a matching 'ok/error' directive"
msgstr "'option' ohne passende 'ok/error' Direktive"
-#: transport-helper.c:798
+#: transport-helper.c:801
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "erwartete ok/error, Remote-Helper gab '%s' aus"
-#: transport-helper.c:855
+#: transport-helper.c:862
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "Remote-Helper meldete unerwarteten Status von %s"
-#: transport-helper.c:938
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support dry-run"
msgstr "Remote-Helper %s unterstützt kein Trockenlauf"
-#: transport-helper.c:941
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed"
msgstr "Remote-Helper %s unterstützt kein --signed"
-#: transport-helper.c:944
+#: transport-helper.c:951
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "Remote-Helper %s unterstützt kein --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:956
#, c-format
msgid "helper %s does not support --atomic"
msgstr "Remote-Helper %s unterstützt kein --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:960
#, c-format
msgid "helper %s does not support --%s"
msgstr "Remote-Helper %s unterstützt kein --%s"
-#: transport-helper.c:960
+#: transport-helper.c:967
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "Remote-Helper %s unterstützt nicht 'push-option'"
-#: transport-helper.c:1060
+#: transport-helper.c:1067
msgid "remote-helper doesn't support push; refspec needed"
msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt"
-#: transport-helper.c:1065
+#: transport-helper.c:1072
#, c-format
msgid "helper %s does not support 'force'"
msgstr "Remote-Helper %s unterstützt kein 'force'."
-#: transport-helper.c:1112
+#: transport-helper.c:1119
msgid "couldn't run fast-export"
msgstr "Konnte \"fast-export\" nicht ausführen."
-#: transport-helper.c:1117
+#: transport-helper.c:1124
msgid "error while running fast-export"
msgstr "Fehler beim Ausführen von \"fast-export\"."
-#: transport-helper.c:1142
+#: transport-helper.c:1149
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9184,52 +9599,52 @@
"Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n"
"Vielleicht sollten Sie einen Branch angeben.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1231
#, c-format
msgid "unsupported object format '%s'"
msgstr "nicht unterstütztes Objekt-Format '%s'"
-#: transport-helper.c:1233
+#: transport-helper.c:1240
#, c-format
msgid "malformed response in ref list: %s"
msgstr "Ungültige Antwort in Referenzliste: %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1392
#, c-format
msgid "read(%s) failed"
msgstr "Lesen von %s fehlgeschlagen."
-#: transport-helper.c:1412
+#: transport-helper.c:1419
#, c-format
msgid "write(%s) failed"
msgstr "Schreiben von %s fehlgeschlagen."
-#: transport-helper.c:1461
+#: transport-helper.c:1468
#, c-format
msgid "%s thread failed"
msgstr "Thread %s fehlgeschlagen."
-#: transport-helper.c:1465
+#: transport-helper.c:1472
#, c-format
msgid "%s thread failed to join: %s"
msgstr "Fehler beim Beitreten zu Thread %s: %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1491 transport-helper.c:1495
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s"
-#: transport-helper.c:1525
+#: transport-helper.c:1532
#, c-format
msgid "%s process failed to wait"
msgstr "Fehler beim Warten von Prozess %s."
-#: transport-helper.c:1529
+#: transport-helper.c:1536
#, c-format
msgid "%s process failed"
msgstr "Prozess %s fehlgeschlagen"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1554 transport-helper.c:1563
msgid "can't start thread for copying data"
msgstr "Kann Thread zum Kopieren von Daten nicht starten."
@@ -9238,51 +9653,51 @@
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n"
-#: transport.c:145
+#: transport.c:138
#, c-format
msgid "could not read bundle '%s'"
msgstr "Konnte Paket '%s' nicht lesen."
-#: transport.c:223
+#: transport.c:234
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: ungültige depth Option '%s'"
-#: transport.c:275
+#: transport.c:289
msgid "see protocol.version in 'git help config' for more details"
msgstr "Siehe protocol.version in 'git help config' für weitere Informationen"
-#: transport.c:276
+#: transport.c:290
msgid "server options require protocol version 2 or later"
msgstr "Server-Optionen benötigen Protokoll-Version 2 oder höher"
-#: transport.c:403
+#: transport.c:418
msgid "server does not support wait-for-done"
msgstr "Server unterstützt nicht 'wait-for-done'"
-#: transport.c:755
+#: transport.c:770
msgid "could not parse transport.color.* config"
msgstr "Konnte transport.color.* Konfiguration nicht parsen."
-#: transport.c:830
+#: transport.c:845
msgid "support for protocol v2 not implemented yet"
msgstr "Unterstützung für Protokoll v2 noch nicht implementiert."
-#: transport.c:965
+#: transport.c:978
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "Unbekannter Wert für Konfiguration '%s': %s"
-#: transport.c:1031
+#: transport.c:1044
#, c-format
msgid "transport '%s' not allowed"
msgstr "Übertragungsart '%s' nicht erlaubt."
-#: transport.c:1084
+#: transport.c:1093
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync wird nicht länger unterstützt."
-#: transport.c:1187
+#: transport.c:1196
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9291,7 +9706,7 @@
"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
"Remote-Repository gefunden wurden:\n"
-#: transport.c:1191
+#: transport.c:1200
#, c-format
msgid ""
"\n"
@@ -9318,11 +9733,11 @@
"zum Versenden zu einem Remote-Repository.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1208
msgid "Aborting."
msgstr "Abbruch."
-#: transport.c:1346
+#: transport.c:1354
msgid "failed to push all needed submodules"
msgstr "Fehler beim Versand aller erforderlichen Submodule."
@@ -9342,7 +9757,7 @@
msgid "too-short tree file"
msgstr "zu kurze Tree-Datei"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9353,7 +9768,7 @@
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
"wechseln."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9363,7 +9778,7 @@
"überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9373,7 +9788,7 @@
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9383,7 +9798,7 @@
"überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9393,7 +9808,7 @@
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9402,7 +9817,7 @@
"Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -9412,7 +9827,16 @@
"Dateien in diesen Verzeichnissen verloren gehen:\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Löschen des aktuellen Arbeitsverzeichnisses verweigert:\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9422,7 +9846,7 @@
"den Checkout entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9433,7 +9857,7 @@
"Checkout entfernt werden:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9443,7 +9867,7 @@
"den Merge entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9454,7 +9878,7 @@
"Merge entfernt werden:\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9464,7 +9888,7 @@
"den %s entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9474,7 +9898,7 @@
"den %s entfernt werden:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9485,7 +9909,7 @@
"den Checkout überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9497,7 +9921,7 @@
"Checkout überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9507,7 +9931,7 @@
"den Merge überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9517,7 +9941,7 @@
"den Merge überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9527,7 +9951,7 @@
"den %s überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9538,12 +9962,12 @@
"%s überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -9552,7 +9976,7 @@
"Kann Submodul nicht aktualisieren:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -9563,7 +9987,7 @@
"übrig gelassen:\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9573,7 +9997,7 @@
"partieller Muster übrig gelassen:\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -9584,12 +10008,12 @@
"partieller Muster nicht aktualisiert:\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "Abbruch\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9598,11 +10022,11 @@
"Nachdem die obigen Pfade behoben sind, können Sie `git sparse-checkout "
"reapply` ausführen.\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "Aktualisiere Dateien"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -9612,17 +10036,17 @@
"auf einem case-insensitiven Dateisystem) und nur einer von der\n"
"selben Kollissionsgruppe ist im Arbeitsverzeichnis:\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1664
msgid "Updating index flags"
msgstr "Aktualisiere Index-Markierungen"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2925
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
"Arbeitsverzeichnis und unversionierter Commit haben doppelte Einträge: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1579
msgid "expected flush after fetch arguments"
msgstr "erwartete Flush nach Abrufen der Argumente"
@@ -9659,114 +10083,138 @@
msgid "Fetching objects"
msgstr "Anfordern der Objekte"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "Fehler beim Lesen von '%s'"
-#: worktree.c:303
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis."
-#: worktree.c:314
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "'%s' Datei enthält nicht den absoluten Pfad zum Arbeitsverzeichnis."
-#: worktree.c:326
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' existiert nicht."
-#: worktree.c:332
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' ist keine .git-Datei, Fehlercode %d"
-#: worktree.c:341
+#: worktree.c:342
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' zeigt nicht zurück auf '%s'"
-#: worktree.c:603
+#: worktree.c:600
msgid "not a directory"
msgstr "kein Verzeichnis"
-#: worktree.c:612
+#: worktree.c:609
msgid ".git is not a file"
msgstr ".git ist keine Datei"
-#: worktree.c:614
+#: worktree.c:611
msgid ".git file broken"
msgstr ".git-Datei kaputt"
-#: worktree.c:616
+#: worktree.c:613
msgid ".git file incorrect"
msgstr ".git-Datei fehlerhaft"
-#: worktree.c:722
+#: worktree.c:719
msgid "not a valid path"
msgstr "kein gültiger Pfad"
-#: worktree.c:728
+#: worktree.c:725
msgid "unable to locate repository; .git is not a file"
-msgstr "Konnte Repository nicht finden; .git ist keine Datei"
+msgstr "konnte Repository nicht finden; .git ist keine Datei"
-#: worktree.c:732
+#: worktree.c:729
msgid "unable to locate repository; .git file does not reference a repository"
msgstr ""
"konnte Repository nicht finden; .git-Datei referenziert kein Repository"
-#: worktree.c:736
+#: worktree.c:733
msgid "unable to locate repository; .git file broken"
msgstr "Konnte Repository nicht finden; .git-Datei ist kaputt"
-#: worktree.c:742
+#: worktree.c:739
msgid "gitdir unreadable"
msgstr "gitdir nicht lesbar"
-#: worktree.c:746
+#: worktree.c:743
msgid "gitdir incorrect"
msgstr "gitdir fehlerhaft"
-#: worktree.c:771
+#: worktree.c:768
msgid "not a valid directory"
msgstr "kein gültiges Verzeichnis"
-#: worktree.c:777
+#: worktree.c:774
msgid "gitdir file does not exist"
msgstr "gitdir-Datei existiert nicht"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:779 worktree.c:788
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "konnte gitdir-Datei nicht lesen (%s)"
-#: worktree.c:801
+#: worktree.c:798
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> gelesen)"
-#: worktree.c:809
+#: worktree.c:806
msgid "invalid gitdir file"
msgstr "ungültige gitdir-Datei"
-#: worktree.c:817
+#: worktree.c:814
msgid "gitdir file points to non-existent location"
msgstr "gitdir-Datei verweist auf nicht existierenden Ort"
-#: wrapper.c:197 wrapper.c:367
+#: worktree.c:830
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "konnte %s nicht in '%s' setzen"
+
+#: worktree.c:832
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "konnte %s nicht in '%s' aufheben"
+
+#: worktree.c:852
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "Einstellung für extensions.worktreeConfig konnte nicht gesetzt werden"
+
+#: wrapper.c:161
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "konnte '%s' nicht setzen"
+
+#: wrapper.c:213
+#, c-format
+msgid "unable to create '%s'"
+msgstr "konnte '%s' nicht erstellen"
+
+#: wrapper.c:215 wrapper.c:385
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "konnte '%s' nicht zum Lesen und Schreiben öffnen"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:416 wrapper.c:683
#, c-format
msgid "unable to access '%s'"
msgstr "konnte nicht auf '%s' zugreifen"
-#: wrapper.c:607
+#: wrapper.c:691
msgid "unable to get current working directory"
msgstr "konnte aktuelles Arbeitsverzeichnis nicht bekommen"
@@ -9809,11 +10257,11 @@
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1140
msgid "Changes to be committed:"
msgstr "Zum Commit vorgemerkte Änderungen:"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1149
msgid "Changes not staged for commit:"
msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
@@ -9921,22 +10369,22 @@
msgid "untracked content, "
msgstr "unversionierter Inhalt, "
-#: wt-status.c:958
+#: wt-status.c:973
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Ihr Stash hat gerade %d Eintrag"
msgstr[1] "Ihr Stash hat gerade %d Einträge"
-#: wt-status.c:989
+#: wt-status.c:1004
msgid "Submodules changed but not updated:"
msgstr "Submodule geändert, aber nicht aktualisiert:"
-#: wt-status.c:991
+#: wt-status.c:1006
msgid "Submodule changes to be committed:"
msgstr "Änderungen in Submodul zum Committen:"
-#: wt-status.c:1073
+#: wt-status.c:1088
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9944,7 +10392,7 @@
"Ändern oder entfernen Sie nicht die obige Zeile.\n"
"Alles unterhalb von ihr wird ignoriert."
-#: wt-status.c:1165
+#: wt-status.c:1180
#, c-format
msgid ""
"\n"
@@ -9956,114 +10404,121 @@
"berechnen.\n"
"Sie können '--no-ahead-behind' benutzen, um das zu verhindern.\n"
-#: wt-status.c:1195
+#: wt-status.c:1210
msgid "You have unmerged paths."
msgstr "Sie haben nicht zusammengeführte Pfade."
-#: wt-status.c:1198
+#: wt-status.c:1213
msgid " (fix conflicts and run \"git commit\")"
msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
-#: wt-status.c:1200
+#: wt-status.c:1215
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
-#: wt-status.c:1204
+#: wt-status.c:1219
msgid "All conflicts fixed but you are still merging."
msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
-#: wt-status.c:1207
+#: wt-status.c:1222
msgid " (use \"git commit\" to conclude merge)"
msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)"
-#: wt-status.c:1216
+#: wt-status.c:1233
msgid "You are in the middle of an am session."
msgstr "Eine \"am\"-Sitzung ist im Gange."
-#: wt-status.c:1219
+#: wt-status.c:1236
msgid "The current patch is empty."
msgstr "Der aktuelle Patch ist leer."
-#: wt-status.c:1223
+#: wt-status.c:1241
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
-#: wt-status.c:1225
+#: wt-status.c:1243
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1227
+#: wt-status.c:1246
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (benutzen Sie \"git am --allow-empty\", um den aktuellen Patch als leeren "
+"Commit zu speichern)"
+
+#: wt-status.c:1248
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
"wiederherzustellen)"
-#: wt-status.c:1360
+#: wt-status.c:1381
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo fehlt."
-#: wt-status.c:1362
+#: wt-status.c:1383
msgid "No commands done."
msgstr "Keine Befehle ausgeführt."
-#: wt-status.c:1365
+#: wt-status.c:1386
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):"
-msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):"
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Letzter Befehl erledigt (%<PRIuMAX> Befehl erledigt):"
+msgstr[1] "Letzte Befehle erledigt (%<PRIuMAX> Befehle erledigt):"
-#: wt-status.c:1376
+#: wt-status.c:1397
#, c-format
msgid " (see more in file %s)"
msgstr " (mehr Informationen in Datei %s)"
-#: wt-status.c:1381
+#: wt-status.c:1402
msgid "No commands remaining."
msgstr "Keine Befehle verbleibend."
-#: wt-status.c:1384
+#: wt-status.c:1405
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Nächster auszuführender Befehl (%d Befehle verbleibend):"
-msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):"
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Nächster auszuführender Befehl (%<PRIuMAX> Befehle verbleibend):"
+msgstr[1] "Nächste auszuführende Befehle (%<PRIuMAX> Befehle verbleibend):"
-#: wt-status.c:1392
+#: wt-status.c:1413
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
-#: wt-status.c:1404
+#: wt-status.c:1425
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'."
-#: wt-status.c:1409
+#: wt-status.c:1430
msgid "You are currently rebasing."
msgstr "Sie sind gerade beim Rebase."
-#: wt-status.c:1422
+#: wt-status.c:1443
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" "
"aus)"
-#: wt-status.c:1424
+#: wt-status.c:1445
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1426
+#: wt-status.c:1447
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch "
"auszuchecken)"
-#: wt-status.c:1433
+#: wt-status.c:1454
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
-#: wt-status.c:1437
+#: wt-status.c:1458
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -10071,174 +10526,174 @@
"Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
"'%s' im Gange ist."
-#: wt-status.c:1442
+#: wt-status.c:1463
msgid "You are currently splitting a commit during a rebase."
msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
-#: wt-status.c:1445
+#: wt-status.c:1466
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --"
"continue\" aus)"
-#: wt-status.c:1449
+#: wt-status.c:1470
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf "
"'%s'."
-#: wt-status.c:1454
+#: wt-status.c:1475
msgid "You are currently editing a commit during a rebase."
msgstr "Sie editieren gerade einen Commit während eines Rebase."
-#: wt-status.c:1457
+#: wt-status.c:1478
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
"nachzubessern)"
-#: wt-status.c:1459
+#: wt-status.c:1480
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen "
"abgeschlossen sind)"
-#: wt-status.c:1470
+#: wt-status.c:1491
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick zurzeit im Gange."
-#: wt-status.c:1473
+#: wt-status.c:1494
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
-#: wt-status.c:1480
+#: wt-status.c:1501
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue"
"\" aus)"
-#: wt-status.c:1483
+#: wt-status.c:1504
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (Führen Sie \"git cherry-pick --continue\" aus, um weiterzumachen)"
-#: wt-status.c:1486
+#: wt-status.c:1507
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
-#: wt-status.c:1488
+#: wt-status.c:1509
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr ""
" (benutzen Sie \"git cherry-pick --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1490
+#: wt-status.c:1511
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation "
"abzubrechen)"
-#: wt-status.c:1500
+#: wt-status.c:1521
msgid "Revert currently in progress."
msgstr "Revert zurzeit im Gange."
-#: wt-status.c:1503
+#: wt-status.c:1524
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Sie sind gerade beim Revert von Commit '%s'."
-#: wt-status.c:1509
+#: wt-status.c:1530
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
"aus)"
-#: wt-status.c:1512
+#: wt-status.c:1533
msgid " (run \"git revert --continue\" to continue)"
msgstr " (Führen Sie \"git revert --continue\", um weiterzumachen)"
-#: wt-status.c:1515
+#: wt-status.c:1536
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
-#: wt-status.c:1517
+#: wt-status.c:1538
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git revert --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1519
+#: wt-status.c:1540
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
-#: wt-status.c:1529
+#: wt-status.c:1550
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'."
-#: wt-status.c:1533
+#: wt-status.c:1554
msgid "You are currently bisecting."
msgstr "Sie sind gerade bei einer binären Suche."
-#: wt-status.c:1536
+#: wt-status.c:1557
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
"zurückzukehren)"
-#: wt-status.c:1547
+#: wt-status.c:1568
msgid "You are in a sparse checkout."
msgstr "Sie befinden sich in einem partiellen Checkout."
-#: wt-status.c:1550
+#: wt-status.c:1571
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
"Sie sind in einem partiellen Checkout mit %d%% vorhandenen versionierten "
"Dateien."
-#: wt-status.c:1794
+#: wt-status.c:1815
msgid "On branch "
msgstr "Auf Branch "
-#: wt-status.c:1801
+#: wt-status.c:1822
msgid "interactive rebase in progress; onto "
msgstr "interaktives Rebase im Gange; auf "
-#: wt-status.c:1803
+#: wt-status.c:1824
msgid "rebase in progress; onto "
msgstr "Rebase im Gange; auf "
-#: wt-status.c:1808
+#: wt-status.c:1829
msgid "HEAD detached at "
msgstr "HEAD losgelöst bei "
-#: wt-status.c:1810
+#: wt-status.c:1831
msgid "HEAD detached from "
msgstr "HEAD losgelöst von "
-#: wt-status.c:1813
+#: wt-status.c:1834
msgid "Not currently on any branch."
msgstr "Im Moment auf keinem Branch."
-#: wt-status.c:1830
+#: wt-status.c:1851
msgid "Initial commit"
msgstr "Initialer Commit"
-#: wt-status.c:1831
+#: wt-status.c:1852
msgid "No commits yet"
msgstr "Noch keine Commits"
-#: wt-status.c:1845
+#: wt-status.c:1866
msgid "Untracked files"
msgstr "Unversionierte Dateien"
-#: wt-status.c:1847
+#: wt-status.c:1868
msgid "Ignored files"
msgstr "Ignorierte Dateien"
-#: wt-status.c:1851
+#: wt-status.c:1872
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10249,32 +10704,32 @@
"'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n"
"neue Dateien selbstständig hinzuzufügen (siehe 'git help status')."
-#: wt-status.c:1857
+#: wt-status.c:1878
#, c-format
msgid "Untracked files not listed%s"
msgstr "Unversionierte Dateien nicht aufgelistet%s"
-#: wt-status.c:1859
+#: wt-status.c:1880
msgid " (use -u option to show untracked files)"
msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
-#: wt-status.c:1865
+#: wt-status.c:1886
msgid "No changes"
msgstr "Keine Änderungen"
-#: wt-status.c:1870
+#: wt-status.c:1891
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
"\"git commit -a\")\n"
-#: wt-status.c:1874
+#: wt-status.c:1895
#, c-format
msgid "no changes added to commit\n"
msgstr "keine Änderungen zum Commit vorgemerkt\n"
-#: wt-status.c:1878
+#: wt-status.c:1899
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -10283,232 +10738,243 @@
"nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
"(benutzen Sie \"git add\" zum Versionieren)\n"
-#: wt-status.c:1882
+#: wt-status.c:1903
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
-#: wt-status.c:1886
+#: wt-status.c:1907
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n"
"Sie \"git add\" zum Versionieren)\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1911 wt-status.c:1917
#, c-format
msgid "nothing to commit\n"
msgstr "nichts zu committen\n"
-#: wt-status.c:1893
+#: wt-status.c:1914
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
"anzuzeigen)\n"
-#: wt-status.c:1898
+#: wt-status.c:1919
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
-#: wt-status.c:2003
+#: wt-status.c:2024
msgid "No commits yet on "
msgstr "Noch keine Commits in "
-#: wt-status.c:2007
+#: wt-status.c:2028
msgid "HEAD (no branch)"
msgstr "HEAD (kein Branch)"
-#: wt-status.c:2038
+#: wt-status.c:2059
msgid "different"
msgstr "unterschiedlich"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2061 wt-status.c:2069
msgid "behind "
msgstr "hinterher "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2064 wt-status.c:2067
msgid "ahead "
msgstr "voraus "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2605
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
"%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind."
-#: wt-status.c:2575
+#: wt-status.c:2611
msgid "additionally, your index contains uncommitted changes."
msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
-#: wt-status.c:2577
+#: wt-status.c:2613
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
"%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "konnte IPC-Befehl nicht senden"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "konnte IPC-Antwort nicht lesen"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "konnte accept_thread nicht für '%s' starten"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "konnte worker[0] nicht für '%s' starten"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:353
#, c-format
msgid "failed to unlink '%s'"
msgstr "Konnte '%s' nicht entfernen."
+#: compat/fsmonitor/fsm-listen-darwin.c:355
+msgid "Unable to create FSEventStream."
+msgstr "Konnte FSEventStream nicht erstellen."
+
+#: compat/fsmonitor/fsm-listen-darwin.c:403
+msgid "Failed to start the FSEventStream"
+msgstr "Konnte FSEventStream nicht starten."
+
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/add.c:61
+#: builtin/add.c:63
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "kann chmod %cx '%s' nicht ausführen"
-#: builtin/add.c:99
+#: builtin/add.c:105
#, c-format
msgid "unexpected diff status %c"
msgstr "unerwarteter Differenz-Status %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:110 builtin/commit.c:299
msgid "updating files failed"
msgstr "Aktualisierung der Dateien fehlgeschlagen"
-#: builtin/add.c:114
+#: builtin/add.c:120
#, c-format
msgid "remove '%s'\n"
msgstr "lösche '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:204
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:312 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Konnte den Index nicht lesen"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-
-#: builtin/add.c:322
+#: builtin/add.c:325
msgid "Could not write patch"
msgstr "Konnte Patch nicht schreiben"
-#: builtin/add.c:325
+#: builtin/add.c:328
msgid "editing patch failed"
msgstr "Bearbeitung des Patches fehlgeschlagen"
-#: builtin/add.c:328
+#: builtin/add.c:331
#, c-format
msgid "Could not stat '%s'"
msgstr "Konnte Verzeichnis '%s' nicht lesen"
-#: builtin/add.c:330
+#: builtin/add.c:333
msgid "Empty patch. Aborted."
msgstr "Leerer Patch. Abgebrochen."
-#: builtin/add.c:335
+#: builtin/add.c:339
#, c-format
msgid "Could not apply '%s'"
msgstr "Konnte '%s' nicht anwenden."
-#: builtin/add.c:343
+#: builtin/add.c:347
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
"ignoriert:\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "Probelauf"
-#: builtin/add.c:366
+#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "erweiterte Ausgaben"
+
+#: builtin/add.c:370
msgid "interactive picking"
msgstr "interaktives Auswählen"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
msgid "select hunks interactively"
msgstr "Blöcke interaktiv auswählen"
-#: builtin/add.c:368
+#: builtin/add.c:372
msgid "edit current diff and apply"
msgstr "aktuelle Unterschiede editieren und anwenden"
-#: builtin/add.c:369
+#: builtin/add.c:373
msgid "allow adding otherwise ignored files"
msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
-#: builtin/add.c:370
+#: builtin/add.c:374
msgid "update tracked files"
msgstr "versionierte Dateien aktualisieren"
-#: builtin/add.c:371
+#: builtin/add.c:375
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
"erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert "
"-u)"
-#: builtin/add.c:372
+#: builtin/add.c:376
msgid "record only the fact that the path will be added later"
msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll"
-#: builtin/add.c:373
+#: builtin/add.c:377
msgid "add changes from all tracked and untracked files"
msgstr ""
"Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
-#: builtin/add.c:376
+#: builtin/add.c:380
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:382
msgid "don't add, only refresh the index"
msgstr "nichts hinzufügen, nur den Index aktualisieren"
-#: builtin/add.c:379
+#: builtin/add.c:383
msgid "just skip files which cannot be added because of errors"
msgstr ""
"Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden "
"konnten"
-#: builtin/add.c:380
+#: builtin/add.c:384
msgid "check if - even missing - files are ignored in dry run"
msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr ""
+"erlaube das Aktualisieren von Einträgen außerhalb des partiellen Checkouts "
+"im Cone-Modus"
+
+#: builtin/add.c:387 builtin/update-index.c:1023
msgid "override the executable bit of the listed files"
msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
-#: builtin/add.c:384
+#: builtin/add.c:389
msgid "warn when adding an embedded repository"
msgstr "warnen wenn eingebettetes Repository hinzugefügt wird"
-#: builtin/add.c:386
-msgid "backend for `git stash -p`"
-msgstr "Backend für `git stash -p`"
-
-#: builtin/add.c:404
+#: builtin/add.c:407
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10542,12 +11008,12 @@
"\n"
"Siehe \"git help submodule\" für weitere Informationen."
-#: builtin/add.c:432
+#: builtin/add.c:436
#, c-format
msgid "adding embedded git repository: %s"
msgstr "Füge eingebettetes Repository hinzu: %s"
-#: builtin/add.c:451
+#: builtin/add.c:456
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10557,52 +11023,28 @@
"Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:471
msgid "adding files failed"
msgstr "Hinzufügen von Dateien fehlgeschlagen"
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run und --interactive/--patch sind inkompatibel"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file und --interactive/--patch sind inkompatibel"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file und --edit sind inkompatibel"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A und -u sind zueinander inkompatibel"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden"
-
-#: builtin/add.c:526
+#: builtin/add.c:534
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file ist inkompatibel mit Pfadspezifikation-Argumenten"
+#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
+#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr ""
+"'%s' und Pfadspezifikation-Argumente können nicht gemeinsam verwendet werden"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul benötigt --pathspec-from-file"
-
-#: builtin/add.c:555
+#: builtin/add.c:566
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
-#: builtin/add.c:557
+#: builtin/add.c:568
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10612,116 +11054,119 @@
"Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:393
msgid "could not parse author script"
msgstr "konnte Autor-Skript nicht parsen"
-#: builtin/am.c:455
+#: builtin/am.c:483
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
-#: builtin/am.c:497
+#: builtin/am.c:525
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Fehlerhafte Eingabezeile: '%s'."
-#: builtin/am.c:535
+#: builtin/am.c:563
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
-#: builtin/am.c:561
+#: builtin/am.c:589
msgid "fseek failed"
msgstr "\"fseek\" fehlgeschlagen"
-#: builtin/am.c:749
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "konnte Patch '%s' nicht parsen"
-#: builtin/am.c:814
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden."
-#: builtin/am.c:862
+#: builtin/am.c:890
msgid "invalid timestamp"
msgstr "ungültiger Zeitstempel"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:895 builtin/am.c:907
msgid "invalid Date line"
msgstr "Ungültige \"Date\"-Zeile"
-#: builtin/am.c:874
+#: builtin/am.c:902
msgid "invalid timezone offset"
msgstr "Ungültiger Offset in der Zeitzone"
-#: builtin/am.c:967
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Patch-Formaterkennung fehlgeschlagen."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:1000 builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/am.c:977
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "Fehler beim Aufteilen der Patches."
-#: builtin/am.c:1126
+#: builtin/am.c:1154
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
"Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus."
-#: builtin/am.c:1127
+#: builtin/am.c:1155
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip"
"\" aus."
-#: builtin/am.c:1128
+#: builtin/am.c:1160
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Um den leeren Patch als einen leeren Commit zu speichern, führen Sie \"%s --"
+"allow-empty\" aus."
+
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Um den ursprünglichen Branch wiederherzustellen und die Anwendung der "
"Patches abzubrechen, führen Sie \"%s --abort\" aus."
-#: builtin/am.c:1223
+#: builtin/am.c:1257
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Patch mit format=flowed versendet; Leerzeichen am Ende von Zeilen könnte "
"verloren gehen."
-#: builtin/am.c:1251
-msgid "Patch is empty."
-msgstr "Patch ist leer."
-
-#: builtin/am.c:1316
+#: builtin/am.c:1345
#, c-format
msgid "missing author line in commit %s"
msgstr "Autor-Zeile fehlt in Commit %s"
-#: builtin/am.c:1319
+#: builtin/am.c:1348
#, c-format
msgid "invalid ident line: %.*s"
msgstr "Ungültige Identifikationszeile: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1567
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge "
"zurückzufallen."
-#: builtin/am.c:1540
+#: builtin/am.c:1569
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
-"nachzustellen ..."
+"nachzustellen..."
-#: builtin/am.c:1559
+#: builtin/am.c:1588
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10729,24 +11174,24 @@
"Haben Sie den Patch per Hand editiert?\n"
"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
-#: builtin/am.c:1565
+#: builtin/am.c:1594
msgid "Falling back to patching base and 3-way merge..."
-msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
+msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge..."
-#: builtin/am.c:1591
+#: builtin/am.c:1620
msgid "Failed to merge in the changes."
msgstr "Merge der Änderungen fehlgeschlagen."
-#: builtin/am.c:1623
+#: builtin/am.c:1652
msgid "applying to an empty history"
msgstr "auf leere Historie anwenden"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1704 builtin/am.c:1708
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Kann nicht fortsetzen: %s existiert nicht"
-#: builtin/am.c:1697
+#: builtin/am.c:1726
msgid "Commit Body is:"
msgstr "Commit-Beschreibung ist:"
@@ -10754,41 +11199,59 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1736
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1782 builtin/commit.c:410
msgid "unable to write index file"
-msgstr "Konnte Index-Datei nicht schreiben."
+msgstr "konnte Index-Datei nicht schreiben"
-#: builtin/am.c:1757
+#: builtin/am.c:1786
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1828
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Überspringe: %.*s"
+
+#: builtin/am.c:1833
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Erzeuge leeren Commit: %.*s"
+
+#: builtin/am.c:1837
+msgid "Patch is empty."
+msgstr "Patch ist leer."
+
+#: builtin/am.c:1848 builtin/am.c:1917
#, c-format
msgid "Applying: %.*s"
msgstr "Wende an: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1865
msgid "No changes -- Patch already applied."
msgstr "Keine Änderungen -- Patches bereits angewendet."
-#: builtin/am.c:1820
+#: builtin/am.c:1871
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1875
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Benutzen Sie 'git am --show-current-patch=diff', um den\n"
"fehlgeschlagenen Patch zu sehen"
-#: builtin/am.c:1868
+#: builtin/am.c:1921
+msgid "No changes - recorded it as an empty commit."
+msgstr "Keine Änderungen - wurde als leerer Commit gespeichert."
+
+#: builtin/am.c:1923
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10799,7 +11262,7 @@
"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
"auslassen."
-#: builtin/am.c:1875
+#: builtin/am.c:1931
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10809,20 +11272,20 @@
"Sie haben noch immer nicht zusammengeführte Pfade in Ihrem Index.\n"
"Sie sollten 'git add' für jede Datei mit aufgelösten Konflikten ausführen,\n"
"um diese als solche zu markieren.\n"
-"Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n"
+"Sie können `git rm` auf Dateien ausführen, um \"von denen gelöscht\" für\n"
"diese zu akzeptieren."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
+#: builtin/reset.c:463
#, c-format
msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
-#: builtin/am.c:2034
+#: builtin/am.c:2091 builtin/am.c:2167
msgid "failed to clean index"
msgstr "Fehler beim Bereinigen des Index"
-#: builtin/am.c:2078
+#: builtin/am.c:2135
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10830,160 +11293,160 @@
"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
"Keine Zurücksetzung zu ORIG_HEAD."
-#: builtin/am.c:2185
+#: builtin/am.c:2292
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Ungültiger Wert für --patch-format: %s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr ""
+"die Optionen '%s=%s' und '%s=%s' können nicht gemeinsam verwendet werden"
-#: builtin/am.c:2227
-#, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr "Ungültiger Wert für --show-current-patch: %s"
-
-#: builtin/am.c:2231
-#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s ist inkombatibel mit --show-current-patch=%s"
-
-#: builtin/am.c:2262
+#: builtin/am.c:2323
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2324
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2330
msgid "run interactively"
msgstr "interaktiv ausführen"
-#: builtin/am.c:2271
+#: builtin/am.c:2332
msgid "historical option -- no-op"
msgstr "historische Option -- kein Effekt"
-#: builtin/am.c:2273
+#: builtin/am.c:2334
msgid "allow fall back on 3way merging if needed"
msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:646 builtin/stash.c:946
msgid "be quiet"
msgstr "weniger Ausgaben"
-#: builtin/am.c:2276
+#: builtin/am.c:2337
msgid "add a Signed-off-by trailer to the commit message"
msgstr "eine Signed-off-by Zeile der Commit-Beschreibung hinzufügen"
-#: builtin/am.c:2279
+#: builtin/am.c:2340
msgid "recode into utf8 (default)"
msgstr "nach UTF-8 umkodieren (Standard)"
-#: builtin/am.c:2281
+#: builtin/am.c:2342
msgid "pass -k flag to git-mailinfo"
msgstr "-k an git-mailinfo übergeben"
-#: builtin/am.c:2283
+#: builtin/am.c:2344
msgid "pass -b flag to git-mailinfo"
msgstr "-b an git-mailinfo übergeben"
-#: builtin/am.c:2285
+#: builtin/am.c:2346
msgid "pass -m flag to git-mailinfo"
msgstr "-m an git-mailinfo übergeben"
-#: builtin/am.c:2287
+#: builtin/am.c:2348
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben"
-#: builtin/am.c:2290
+#: builtin/am.c:2351
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr"
-#: builtin/am.c:2293
+#: builtin/am.c:2354
msgid "strip everything before a scissors line"
msgstr "alles vor einer Scheren-Zeile entfernen"
-#: builtin/am.c:2295
+#: builtin/am.c:2356
msgid "pass it through git-mailinfo"
msgstr "an git-mailinfo weitergeben"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
+#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
+#: builtin/am.c:2386
msgid "pass it through git-apply"
msgstr "an git-apply übergeben"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
+#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
+#: parse-options.h:348
msgid "n"
msgstr "Anzahl"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
-#: builtin/verify-tag.c:38
+#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
+#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
+#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
+#: builtin/tag.c:480 builtin/verify-tag.c:38
msgid "format"
msgstr "Format"
-#: builtin/am.c:2322
+#: builtin/am.c:2383
msgid "format the patch(es) are in"
msgstr "Patch-Format"
-#: builtin/am.c:2328
+#: builtin/am.c:2389
msgid "override error message when patch failure occurs"
msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
-#: builtin/am.c:2330
+#: builtin/am.c:2391
msgid "continue applying patches after resolving a conflict"
msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
-#: builtin/am.c:2333
+#: builtin/am.c:2394
msgid "synonyms for --continue"
msgstr "Synonyme für --continue"
-#: builtin/am.c:2336
+#: builtin/am.c:2397
msgid "skip the current patch"
msgstr "den aktuellen Patch auslassen"
-#: builtin/am.c:2339
+#: builtin/am.c:2400
msgid "restore the original branch and abort the patching operation"
msgstr ""
"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
-#: builtin/am.c:2342
+#: builtin/am.c:2403
msgid "abort the patching operation but keep HEAD where it is"
msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen"
-#: builtin/am.c:2346
+#: builtin/am.c:2407
msgid "show the patch being applied"
msgstr "den Patch, der gerade angewendet wird, anzeigen"
-#: builtin/am.c:2351
+#: builtin/am.c:2411
+msgid "record the empty patch as an empty commit"
+msgstr "leerer Patch als leeren Commit gespeichert"
+
+#: builtin/am.c:2415
msgid "lie about committer date"
msgstr "Autor-Datum als Commit-Datum verwenden"
-#: builtin/am.c:2353
+#: builtin/am.c:2417
msgid "use current timestamp for author date"
msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
+#: builtin/revert.c:117 builtin/tag.c:461
msgid "key-id"
msgstr "GPG-Schlüsselkennung"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2420 builtin/rebase.c:1128
msgid "GPG-sign commits"
msgstr "Commits mit GPG signieren"
-#: builtin/am.c:2359
+#: builtin/am.c:2423
+msgid "how to handle empty patches"
+msgstr "wie leere Patches behandelt werden sollen"
+
+#: builtin/am.c:2426
msgid "(internal use for git-rebase)"
msgstr "(intern für git-rebase verwendet)"
-#: builtin/am.c:2377
+#: builtin/am.c:2444
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."
@@ -10991,16 +11454,16 @@
"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
"entfernt. Bitte verwenden Sie diese nicht mehr."
-#: builtin/am.c:2384
+#: builtin/am.c:2451
msgid "failed to read the index"
msgstr "Fehler beim Lesen des Index"
-#: builtin/am.c:2399
+#: builtin/am.c:2466
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben."
-#: builtin/am.c:2423
+#: builtin/am.c:2490
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -11009,11 +11472,11 @@
"Stray %s Verzeichnis gefunden.\n"
"Benutzen Sie \"git am --abort\", um es zu entfernen."
-#: builtin/am.c:2429
+#: builtin/am.c:2496
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
-#: builtin/am.c:2439
+#: builtin/am.c:2506
msgid "interactive mode requires patches on the command line"
msgstr "Interaktiver Modus benötigt Patches über die Kommandozeile"
@@ -11021,54 +11484,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<Optionen>] [<Patch>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "Konnte Archiv-Datei '%s' nicht erstellen."
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
-msgstr "Konnte Ausgabe nicht umleiten."
+msgstr "konnte Ausgabe nicht umleiten"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Externes Archiv ohne URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: ACK/NAK erwartet, Flush-Paket bekommen"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: Protokollfehler"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: erwartete eine Spülung (flush)"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<Commit>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <Begriff_gut> <Begriff_schlecht> "
-"[<Begriff>]"
-
-#: builtin/bisect--helper.c:25
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-
#: builtin/bisect--helper.c:26
msgid ""
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
@@ -11079,10 +11523,6 @@
"good}=<Begriff>] [--no-checkout] [--first-parent] [<schlecht> [<gut>...]] "
"[--] [<Pfade>...]"
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-next"
-
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
msgstr "git bisect--helper --bisect-state (bad|new) [<Commit>]"
@@ -11099,46 +11539,55 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<Commit>|<Bereich>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <Programm>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "kann Datei '%s' nicht im Modus '%s' öffnen"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "konnte nicht in Datei '%s' schreiben"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "Datei '%s' kann nicht zum Lesen geöffnet werden"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' ist kein gültiger Begriff"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "kann den eingebauten Befehl '%s' nicht als Begriff verwenden"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "kann die Bedeutung von dem Begriff '%s' nicht ändern"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "bitte verwenden Sie zwei verschiedene Begriffe"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "Keine binäre Suche im Gange.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' ist kein gültiger Commit"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11146,27 +11595,27 @@
"Konnte den ursprünglichen HEAD '%s' nicht auschecken.\n"
"Versuchen Sie 'git bisect reset <Commit>'."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Ungültiges \"bisect_write\" Argument: %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "konnte die OID der Revision '%s' nicht erhalten"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "konnte die Datei '%s' nicht öffnen"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Ungültiger Befehl: Sie sind gerade innerhalb einer binären %s/%s Suche"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -11175,7 +11624,7 @@
"Sie müssen mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
"Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen."
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11186,7 +11635,7 @@
"Danach müssen Sie mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
"Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen."
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "binäre Suche nur mit einem %s Commit"
@@ -11195,15 +11644,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Sind Sie sicher [Y/n]? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "keine Begriffe definiert"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11212,7 +11661,7 @@
"Ihre aktuellen Begriffe sind %s für den alten Zustand\n"
"und %s für den neuen Zustand.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11221,55 +11670,55 @@
"Ungültiges Argument %s für 'git bisect terms'.\n"
"Unterstützte Optionen sind: --term-good|--term-old und --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "konnte '%s' nicht zum Anhängen öffnen"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' ist kein gültiger Begriff"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "nicht erkannte Option: '%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' scheint kein gültiger Commit zu sein"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "ungültiger HEAD - HEAD wird benötigt"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"Auschecken von '%s' fehlgeschlagen. Versuchen Sie 'git bisect start "
"<gültiger-Branch>'."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
"binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "ungültiger HEAD - merkwürdige symbolische Referenz"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "ungültige Referenz: '%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Sie müssen mit \"git bisect start\" beginnen\n"
@@ -11277,104 +11726,160 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Wollen Sie, dass ich es für Sie mache [Y/n]? "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Bitte führen Sie `--bisect-state` mit mindestens einem Argument aus"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' kann nur ein Argument entgegennehmen."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Ungültige Referenz-Eingabe: %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Ungültige Referenz-Eingabe (kein Commit): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Keine binäre Suche im Gange."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "'%s'?? Was reden Sie da?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "kann Datei '%s' nicht für die Wiederholung lesen"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#, c-format
+msgid "running %s\n"
+msgstr "Ausführen von %s\n"
+
+#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+msgid "bisect run failed: no command provided."
+msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben."
+
+#: builtin/bisect--helper.c:1166
+#, c-format
+msgid "unable to verify '%s' on good revision"
+msgstr "konnte '%s' nicht für guten Commit überprüfen"
+
+#: builtin/bisect--helper.c:1172
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr "fehlerhafter Exit-Code %d für guten Commit"
+
+#: builtin/bisect--helper.c:1180
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "'bisect run' fehlgeschlagen: Exit-Code %d von '%s' ist < 0 oder >= 128"
+
+#: builtin/bisect--helper.c:1195
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "Datei '%s' kann nicht zum Schreiben geöffnet werden"
+
+#: builtin/bisect--helper.c:1213
+msgid "bisect run cannot continue any more"
+msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
+
+#: builtin/bisect--helper.c:1215
+#, c-format
+msgid "bisect run success"
+msgstr "'bisect run' erfolgreich ausgeführt"
+
+#: builtin/bisect--helper.c:1218
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "binäre Suche fand ersten schlechten Commit"
+
+#: builtin/bisect--helper.c:1221
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"'bisect run' fehlgeschlagen: 'git bisect--helper --bisect-state %s' mit "
+"Fehlercode %d beendet"
+
+#: builtin/bisect--helper.c:1253
msgid "reset the bisection state"
msgstr "den Zustand der binären Suche zurücksetzen"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1255
msgid "check whether bad or good terms exist"
msgstr "prüfen, ob Begriffe für gute und schlechte Commits existieren"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1257
msgid "print out the bisect terms"
msgstr "die Begriffe für die binäre Suche ausgeben"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1259
msgid "start the bisect session"
msgstr "Sitzung für binäre Suche starten"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1261
msgid "find the next bisection commit"
msgstr "nächsten Commit für die binäre Suche finden"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1263
msgid "mark the state of ref (or refs)"
msgstr "den Status der Referenz(en) markieren"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1265
msgid "list the bisection steps so far"
msgstr "die bisherigen Schritte der binären Suche auflisten"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1267
msgid "replay the bisection process from the given file"
msgstr "binäre Suche aus der angegebenen Datei wiederholen"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1269
msgid "skip some commits for checkout"
msgstr "einige Commits für das Auschecken überspringen"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1271
+msgid "visualize the bisection"
+msgstr "binäre Suche visualisieren"
+
+#: builtin/bisect--helper.c:1273
+msgid "use <cmd>... to automatically bisect"
+msgstr "verwende <Programm>... für die automatische binäre Suche"
+
+#: builtin/bisect--helper.c:1275
msgid "no log for BISECT_WRITE"
msgstr "kein Log für BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1290
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset benötigt entweder kein Argument oder ein Commit"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check benötigt 2 oder 3 Argumente"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1295
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms benötigt 0 oder 1 Argument"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1304
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next benötigt 0 Argumente"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1315
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log benötigt 0 Argumente"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1320
msgid "no logfile given"
msgstr "keine Log-Datei angegeben"
@@ -11386,155 +11891,148 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "erwarte eine Farbe: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "muss mit einer Farbe enden"
-#: builtin/blame.c:728
-#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "ungültige Farbe '%s' in color.blame.repeatedLines"
-
-#: builtin/blame.c:746
-msgid "invalid value for blame.coloring"
-msgstr "ungültiger Wert für blame.coloring"
-
-#: builtin/blame.c:845
+#: builtin/blame.c:842
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "konnte Commit %s zum Ignorieren nicht finden"
-#: builtin/blame.c:867
+#: builtin/blame.c:864
msgid "show blame entries as we find them, incrementally"
msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie finden"
-#: builtin/blame.c:868
+#: builtin/blame.c:865
msgid "do not show object names of boundary commits (Default: off)"
msgstr "keine Objektnamen für Grenz-Commits anzeigen (Standard: aus)"
-#: builtin/blame.c:869
+#: builtin/blame.c:866
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)"
-#: builtin/blame.c:870
+#: builtin/blame.c:867
msgid "show work cost statistics"
msgstr "Statistiken zum Arbeitsaufwand anzeigen"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
+#: builtin/remote.c:683 builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/blame.c:872
+#: builtin/blame.c:869
msgid "show output score for blame entries"
msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
-#: builtin/blame.c:873
+#: builtin/blame.c:870
msgid "show original filename (Default: auto)"
msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
-#: builtin/blame.c:874
+#: builtin/blame.c:871
msgid "show original linenumber (Default: off)"
msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
-#: builtin/blame.c:875
+#: builtin/blame.c:872
msgid "show in a format designed for machine consumption"
msgstr "Anzeige in einem Format für maschinelle Auswertung"
-#: builtin/blame.c:876
+#: builtin/blame.c:873
msgid "show porcelain format with per-line commit information"
msgstr ""
"Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
-#: builtin/blame.c:877
+#: builtin/blame.c:874
msgid "use the same output mode as git-annotate (Default: off)"
msgstr ""
"den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
-#: builtin/blame.c:878
+#: builtin/blame.c:875
msgid "show raw timestamp (Default: off)"
msgstr "unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
-#: builtin/blame.c:879
+#: builtin/blame.c:876
msgid "show long commit SHA1 (Default: off)"
msgstr "langen Commit-SHA1 anzeigen (Standard: aus)"
-#: builtin/blame.c:880
+#: builtin/blame.c:877
msgid "suppress author name and timestamp (Default: off)"
msgstr "den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
-#: builtin/blame.c:881
+#: builtin/blame.c:878
msgid "show author email instead of name (Default: off)"
msgstr ""
"statt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
-#: builtin/blame.c:882
+#: builtin/blame.c:879
msgid "ignore whitespace differences"
msgstr "Whitespace-Unterschiede ignorieren"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:880 builtin/log.c:1857
msgid "rev"
msgstr "Commit"
-#: builtin/blame.c:883
+#: builtin/blame.c:880
msgid "ignore <rev> when blaming"
msgstr "ignoriere <Commit> beim Ausführen von 'blame'"
-#: builtin/blame.c:884
+#: builtin/blame.c:881
msgid "ignore revisions from <file>"
msgstr "ignoriere Commits aus <Datei>"
-#: builtin/blame.c:885
+#: builtin/blame.c:882
msgid "color redundant metadata from previous line differently"
msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben"
-#: builtin/blame.c:886
+#: builtin/blame.c:883
msgid "color lines by age"
msgstr "Zeilen nach Alter einfärben"
-#: builtin/blame.c:887
+#: builtin/blame.c:884
msgid "spend extra cycles to find better match"
msgstr ""
"mehr Arbeitsschritte ausführen, um eine bessere Übereinstimmung zu finden"
-#: builtin/blame.c:888
+#: builtin/blame.c:885
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "Commits von <Datei> benutzen, statt \"git-rev-list\" aufzurufen"
-#: builtin/blame.c:889
+#: builtin/blame.c:886
msgid "use <file>'s contents as the final image"
msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:887 builtin/blame.c:888
msgid "score"
msgstr "Bewertung"
-#: builtin/blame.c:890
+#: builtin/blame.c:887
msgid "find line copies within and across files"
msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:891
+#: builtin/blame.c:888
msgid "find line movements within and across files"
msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:892
+#: builtin/blame.c:889
msgid "range"
msgstr "Bereich"
-#: builtin/blame.c:893
+#: builtin/blame.c:890
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
"nur Zeilen im Bereich <Start>,<Ende> oder Funktion :<Funktionsname> "
"verarbeiten"
-#: builtin/blame.c:945
+#: builtin/blame.c:949
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
@@ -11548,18 +12046,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:1000
msgid "4 years, 11 months ago"
msgstr "vor 4 Jahren und 11 Monaten"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1116
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "Datei %s hat nur %lu Zeile"
msgstr[1] "Datei %s hat nur %lu Zeilen"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1161
msgid "Blaming lines"
msgstr "Verarbeite Zeilen"
@@ -11568,30 +12066,38 @@
msgstr "git branch [<Optionen>] [-r | -a] [--merged] [--no-merged]"
#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<Optionen>] [-l] [-f] <Branchname> [<Startpunkt>]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr ""
+"git branch [<Optionen>] [-f] [--recurse-submodules] <Branchname> "
+"[<Startpunkt>]"
#: builtin/branch.c:31
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<Optionen>] [-l] [<Muster>...]"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..."
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>"
-#: builtin/branch.c:33
+#: builtin/branch.c:34
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<Optionen>] (-c | -C) [<alter-Branch>] <neuer-Branch>"
-#: builtin/branch.c:34
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<Optionen>] [-r | -a] [--points-at]"
-#: builtin/branch.c:35
+#: builtin/branch.c:36
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<Optionen>] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:165
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -11600,7 +12106,7 @@
"entferne Branch '%s', der zusammengeführt wurde mit\n"
" '%s', aber noch nicht mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:158
+#: builtin/branch.c:169
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -11609,12 +12115,12 @@
"entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n"
" '%s', obwohl er mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:172
+#: builtin/branch.c:183
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
-#: builtin/branch.c:176
+#: builtin/branch.c:187
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -11624,118 +12130,118 @@
"Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
"%s' aus."
-#: builtin/branch.c:189
+#: builtin/branch.c:200
msgid "Update of config-file failed"
msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
-#: builtin/branch.c:223
+#: builtin/branch.c:235
msgid "cannot use -a with -d"
msgstr "kann -a nicht mit -d benutzen"
-#: builtin/branch.c:230
+#: builtin/branch.c:242
msgid "Couldn't look up commit object for HEAD"
msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
-#: builtin/branch.c:244
+#: builtin/branch.c:259
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
-#: builtin/branch.c:259
+#: builtin/branch.c:274
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
-#: builtin/branch.c:260
+#: builtin/branch.c:275
#, c-format
msgid "branch '%s' not found."
msgstr "Branch '%s' nicht gefunden."
-#: builtin/branch.c:291
+#: builtin/branch.c:306
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:307
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:457 builtin/tag.c:64
msgid "unable to parse format string"
msgstr "Konnte Formatierungsstring nicht parsen."
-#: builtin/branch.c:471
+#: builtin/branch.c:488
msgid "could not resolve HEAD"
-msgstr "Konnte HEAD-Commit nicht auflösen."
+msgstr "konnte HEAD-Commit nicht auflösen"
-#: builtin/branch.c:477
+#: builtin/branch.c:494
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) wurde nicht unter \"refs/heads/\" gefunden!"
-#: builtin/branch.c:492
+#: builtin/branch.c:509
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Branch %s wird auf %s umgesetzt"
-#: builtin/branch.c:496
+#: builtin/branch.c:513
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Binäre Suche von Branch %s zu %s im Gange"
-#: builtin/branch.c:513
+#: builtin/branch.c:530
msgid "cannot copy the current branch while not on any."
msgstr ""
"Kann den aktuellen Branch nicht kopieren, solange Sie sich auf keinem "
"befinden."
-#: builtin/branch.c:515
+#: builtin/branch.c:532
msgid "cannot rename the current branch while not on any."
msgstr ""
"Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden."
-#: builtin/branch.c:526
+#: builtin/branch.c:543
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ungültiger Branchname: '%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:572
msgid "Branch rename failed"
msgstr "Umbenennung des Branches fehlgeschlagen"
-#: builtin/branch.c:557
+#: builtin/branch.c:574
msgid "Branch copy failed"
msgstr "Kopie des Branches fehlgeschlagen"
-#: builtin/branch.c:561
+#: builtin/branch.c:578
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Kopie eines falsch benannten Branches '%s' erstellt."
-#: builtin/branch.c:564
+#: builtin/branch.c:581
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "falsch benannten Branch '%s' umbenannt"
-#: builtin/branch.c:570
+#: builtin/branch.c:587
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!"
-#: builtin/branch.c:579
+#: builtin/branch.c:596
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
"fehlgeschlagen."
-#: builtin/branch.c:581
+#: builtin/branch.c:598
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"Branch wurde kopiert, aber die Aktualisierung der Konfigurationsdatei ist\n"
"fehlgeschlagen."
-#: builtin/branch.c:597
+#: builtin/branch.c:614
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11746,181 +12252,194 @@
" %s\n"
"Zeilen, die mit '%c' beginnen, werden entfernt.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Allgemeine Optionen"
-#: builtin/branch.c:633
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
-#: builtin/branch.c:634
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "Informationsmeldungen unterdrücken"
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))"
+#: builtin/branch.c:656 builtin/checkout.c:1571
+#: builtin/submodule--helper.c:3077
+msgid "set branch tracking configuration"
+msgstr "Branch-Tracking-Konfiguration setzen"
-#: builtin/branch.c:637
+#: builtin/branch.c:659
msgid "do not use"
msgstr "nicht verwenden"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:661
msgid "upstream"
msgstr "Upstream"
-#: builtin/branch.c:639
+#: builtin/branch.c:661
msgid "change the upstream info"
msgstr "Informationen zum Upstream-Branch ändern"
-#: builtin/branch.c:640
+#: builtin/branch.c:662
msgid "unset the upstream info"
msgstr "Informationen zum Upstream-Branch entfernen"
-#: builtin/branch.c:641
+#: builtin/branch.c:663
msgid "use colored output"
msgstr "farbige Ausgaben verwenden"
-#: builtin/branch.c:642
+#: builtin/branch.c:664
msgid "act on remote-tracking branches"
msgstr "auf Remote-Tracking-Branches wirken"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:666 builtin/branch.c:668
msgid "print only branches that contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit enthalten"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:667 builtin/branch.c:669
msgid "print only branches that don't contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten"
-#: builtin/branch.c:650
+#: builtin/branch.c:672
msgid "Specific git-branch actions:"
msgstr "spezifische Aktionen für \"git-branch\":"
-#: builtin/branch.c:651
+#: builtin/branch.c:673
msgid "list both remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches auflisten"
-#: builtin/branch.c:653
+#: builtin/branch.c:675
msgid "delete fully merged branch"
msgstr "vollständig zusammengeführten Branch entfernen"
-#: builtin/branch.c:654
+#: builtin/branch.c:676
msgid "delete branch (even if not merged)"
msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
-#: builtin/branch.c:655
+#: builtin/branch.c:677
msgid "move/rename a branch and its reflog"
msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
-#: builtin/branch.c:656
+#: builtin/branch.c:678
msgid "move/rename a branch, even if target exists"
msgstr ""
"einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:657
+#: builtin/branch.c:679
msgid "copy a branch and its reflog"
msgstr "einen Branch und dessen Reflog kopieren"
-#: builtin/branch.c:658
+#: builtin/branch.c:680
msgid "copy a branch, even if target exists"
msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:659
+#: builtin/branch.c:681
msgid "list branch names"
msgstr "Branchnamen auflisten"
-#: builtin/branch.c:660
+#: builtin/branch.c:682
msgid "show current branch name"
-msgstr "Zeige aktuellen Branch-Namen."
+msgstr "Zeige aktuellen Branchnamen."
-#: builtin/branch.c:661
+#: builtin/branch.c:683 builtin/submodule--helper.c:3075
msgid "create the branch's reflog"
msgstr "das Reflog des Branches erzeugen"
-#: builtin/branch.c:663
+#: builtin/branch.c:685
msgid "edit the description for the branch"
msgstr "die Beschreibung für den Branch bearbeiten"
-#: builtin/branch.c:664
+#: builtin/branch.c:686
msgid "force creation, move/rename, deletion"
msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
-#: builtin/branch.c:665
+#: builtin/branch.c:687
msgid "print only branches that are merged"
msgstr "nur zusammengeführte Branches ausgeben"
-#: builtin/branch.c:666
+#: builtin/branch.c:688
msgid "print only branches that are not merged"
msgstr "nur nicht zusammengeführte Branches ausgeben"
-#: builtin/branch.c:667
+#: builtin/branch.c:689
msgid "list branches in columns"
msgstr "Branches in Spalten auflisten"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:476
msgid "object"
msgstr "Objekt"
-#: builtin/branch.c:670
+#: builtin/branch.c:692
msgid "print only branches of the object"
msgstr "nur Branches von diesem Objekt ausgeben"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
msgid "sorting and filtering are case insensitive"
msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:694 builtin/ls-files.c:667
+msgid "recurse through submodules"
+msgstr "Rekursion in Submodulen durchführen"
+
+#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
+#: builtin/tag.c:481 builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "für die Ausgabe zu verwendendes Format"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:718 builtin/clone.c:684
msgid "HEAD not found below refs/heads!"
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column und --verbose sind inkompatibel"
+#: builtin/branch.c:739
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
+"Branch mit --recurse-submodules kann nur genutzt werden, wenn submodule."
+"propagateBranches aktiviert ist"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:741
+msgid "--recurse-submodules can only be used to create branches"
+msgstr "--recurse-submodules kann nur genutzt werden, um Branches zu erstellen"
+
+#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
msgid "branch name required"
msgstr "Branchname erforderlich"
-#: builtin/branch.c:766
+#: builtin/branch.c:802
msgid "Cannot give description to detached HEAD"
msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
-#: builtin/branch.c:771
+#: builtin/branch.c:807
msgid "cannot edit description of more than one branch"
msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
-#: builtin/branch.c:778
+#: builtin/branch.c:814
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Noch kein Commit in Branch '%s'."
-#: builtin/branch.c:781
+#: builtin/branch.c:817
#, c-format
msgid "No branch named '%s'."
msgstr "Branch '%s' nicht vorhanden."
-#: builtin/branch.c:796
+#: builtin/branch.c:832
msgid "too many branches for a copy operation"
msgstr "zu viele Branches für eine Kopieroperation angegeben"
-#: builtin/branch.c:805
+#: builtin/branch.c:841
msgid "too many arguments for a rename operation"
msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "too many arguments to set new upstream"
msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen"
-#: builtin/branch.c:814
+#: builtin/branch.c:850
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11928,34 +12447,34 @@
"Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
"keinen Branch zeigt."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:853 builtin/branch.c:873
#, c-format
msgid "no such branch '%s'"
msgstr "Branch '%s' nicht gefunden"
-#: builtin/branch.c:821
+#: builtin/branch.c:857
#, c-format
msgid "branch '%s' does not exist"
msgstr "Branch '%s' existiert nicht"
-#: builtin/branch.c:834
+#: builtin/branch.c:867
msgid "too many arguments to unset upstream"
msgstr ""
"zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu "
"entfernen"
-#: builtin/branch.c:838
+#: builtin/branch.c:871
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n"
"auf keinen Branch zeigt."
-#: builtin/branch.c:844
+#: builtin/branch.c:877
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: builtin/branch.c:854
+#: builtin/branch.c:890
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>?"
@@ -11964,7 +12483,7 @@
"verwendet werden.\n"
"Wollten Sie -a|-r --list <Muster> benutzen?"
-#: builtin/branch.c:858
+#: builtin/branch.c:894
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11972,32 +12491,32 @@
"Die '--set-upstream' Option wird nicht länger unterstützt.\n"
"Bitte benutzen Sie stattdessen '--track' oder '--set-upstream-to'."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "git Version:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() ist fehlgeschlagen mit Fehler '%s' (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "Compiler Info: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "libc Info: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "nicht in einem Git-Repository ausgeführt - keine Hooks zum Anzeigen\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <Datei>] [-s|--suffix <Format>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -12034,38 +12553,33 @@
"Bitte überprüfen Sie den restlichen Teil des Fehlerberichts unten.\n"
"Sie können jede Zeile löschen, die Sie nicht mitteilen möchten.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "Speicherort für die Datei des Fehlerberichts angeben"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "Dateiendung im strftime-Format für den Dateinamen angeben"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "konnte vorangehende Verzeichnisse für '%s' nicht erstellen"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "System Info"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Aktivierte Hooks"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "konnte keine neue Datei unter '%s' erstellen"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "konnte nicht nach %s schreiben"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Neuer Bericht unter '%s' erstellt.\n"
@@ -12086,140 +12600,254 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <Datei> [<Referenzname>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3899
msgid "do not show progress meter"
msgstr "keine Fortschrittsanzeige anzeigen"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
msgid "show progress meter"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3903
msgid "show progress meter during object writing phase"
msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3906
msgid "similar to --all-progress when progress meter is shown"
msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "Version des Paket-Formats angeben"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "Um ein Paket zu erstellen wird ein Repository benötigt."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:108
msgid "do not show bundle details"
msgstr "Keine Bundle-Details anzeigen"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:127
#, c-format
msgid "%s is okay\n"
msgstr "%s ist in Ordnung\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:183
msgid "Need a repository to unbundle."
msgstr "Zum Entpacken wird ein Repository benötigt."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
+#: builtin/bundle.c:186
+msgid "Unbundling objects"
+msgstr "Entpacken von Objekten"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:220 builtin/remote.c:1758
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
-#: builtin/cat-file.c:596
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
-msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
+#: builtin/cat-file.c:568
+msgid "flush is only for --buffer mode"
+msgstr "Flush ist nur für --buffer Modus"
-#: builtin/cat-file.c:597
-msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
-msgstr ""
-"git cat-file (--batch[=<Format>] | --batch-check[=<Format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
+#: builtin/cat-file.c:612
+msgid "empty command in input"
+msgstr "leerer Befehl in der Eingabe"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:614
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "Whitespace vor Befehl: '%s'"
+
+#: builtin/cat-file.c:623
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s benötigt Argumente"
+
+#: builtin/cat-file.c:628
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s braucht kein Argument"
+
+#: builtin/cat-file.c:636
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "unbekannter Befehl: '%s'"
+
+#: builtin/cat-file.c:795
msgid "only one batch option may be specified"
msgstr "Nur eine Batch-Option erlaubt."
-#: builtin/cat-file.c:636
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<Art> kann sein: blob, tree, commit, tag"
+#: builtin/cat-file.c:824
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <Typ> <Objekt>"
-#: builtin/cat-file.c:637
-msgid "show object type"
-msgstr "Objektart anzeigen"
+#: builtin/cat-file.c:825
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git cat-file (-e | -p) <Objekt>"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:826
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr "git cat-file (-t | -s) [--allow-unknown-type] <Objekt>"
+
+#: builtin/cat-file.c:827
+msgid ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+
+#: builtin/cat-file.c:830
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
+"git cat-file (--textconv | --filters)\n"
+" [<Commit>:<Pfad|Commit-Referenz> | --path=<Pfad|Commit-"
+"Referenz> <Commit>]"
+
+#: builtin/cat-file.c:836
+msgid "Check object existence or emit object contents"
+msgstr "Überprüfen von Objektexistenz oder Ausgeben von Objekt-Inhalten"
+
+#: builtin/cat-file.c:838
+msgid "check if <object> exists"
+msgstr "prüfe, ob <Objekt> vorhanden ist"
+
+#: builtin/cat-file.c:839
+msgid "pretty-print <object> content"
+msgstr "ansprechende Anzeige für <Objekt> Inhalt"
+
+#: builtin/cat-file.c:841
+msgid "Emit [broken] object attributes"
+msgstr "Ausgabe von [fehlerhaften] Objekt-Attributen"
+
+#: builtin/cat-file.c:842
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr "zeige Objekt-Typ (eines von 'blob', 'tree', 'commit', 'tag', ...)"
+
+#: builtin/cat-file.c:843
msgid "show object size"
msgstr "Objektgröße anzeigen"
-#: builtin/cat-file.c:640
-msgid "exit with zero when there's no error"
-msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
-
-#: builtin/cat-file.c:641
-msgid "pretty-print object's content"
-msgstr "ansprechende Anzeige des Objektinhaltes"
-
-#: builtin/cat-file.c:643
-msgid "for blob objects, run textconv on object's content"
-msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen"
-
-#: builtin/cat-file.c:645
-msgid "for blob objects, run filters on object's content"
-msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen"
-
-#: builtin/cat-file.c:646
-msgid "blob"
-msgstr "Blob"
-
-#: builtin/cat-file.c:647
-msgid "use a specific path for --textconv/--filters"
-msgstr "einen bestimmten Pfad für --textconv/--filters verwenden"
-
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:845
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s und -t mit beschädigten Objekten erlauben"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:847
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr ""
+"Batch-Objekte von Standard-Eingabe (oder --batch-all-objects) angefordert"
+
+#: builtin/cat-file.c:849
+msgid "show full <object> or <rev> contents"
+msgstr "vollständige Inhalte von <Objekt> oder <Commit> anzeigen"
+
+#: builtin/cat-file.c:853
+msgid "like --batch, but don't emit <contents>"
+msgstr "wie --batch, aber keine Ausgabe von <Inhalten>"
+
+#: builtin/cat-file.c:857
+msgid "read commands from stdin"
+msgstr "Befehle von der Standard-Eingabe lesen"
+
+#: builtin/cat-file.c:861
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr ""
+"mit --batch[-check]: ignoriert Standard-Eingabe, Stapelverarbeitung aller "
+"bekannten Objekte"
+
+#: builtin/cat-file.c:863
+msgid "Change or optimize batch output"
+msgstr "Ändern oder Optimieren der Batch-Ausgabe"
+
+#: builtin/cat-file.c:864
msgid "buffer --batch output"
msgstr "Ausgabe von --batch puffern"
-#: builtin/cat-file.c:652
-msgid "show info and content of objects fed from the standard input"
+#: builtin/cat-file.c:866
+msgid "follow in-tree symlinks"
+msgstr "folge symbolische Verknüpfungen in Verzeichnissen"
+
+#: builtin/cat-file.c:868
+msgid "do not order objects before emitting them"
+msgstr "Objekte nicht ordnen, bevor sie ausgegeben werden"
+
+#: builtin/cat-file.c:870
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
msgstr ""
-"Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-"
-"Eingabe"
+"Objekt (Blob oder Verzeichnis) mit Konvertierung oder Filter (eigenständig "
+"oder mit Batch) ausgeben"
-#: builtin/cat-file.c:656
-msgid "show info about objects fed from the standard input"
+#: builtin/cat-file.c:872
+msgid "run textconv on object's content"
+msgstr "eine Textkonvertierung auf Objekt-Inhalte ausführen"
+
+#: builtin/cat-file.c:874
+msgid "run filters on object's content"
+msgstr "Filter auf Objekt-Inhalte ausführen"
+
+#: builtin/cat-file.c:875
+msgid "blob|tree"
+msgstr "Blob|Verzeichnis"
+
+#: builtin/cat-file.c:876
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
msgstr ""
-"Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe"
+"nutzen Sie einen <Pfad> für (--textconv | --filters); Nicht mit 'batch'"
-#: builtin/cat-file.c:660
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr ""
-"symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit "
-"--batch oder --batch-check)"
+#: builtin/cat-file.c:894
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "'%s=<%s>' benötigt '%s' oder '%s'"
-#: builtin/cat-file.c:662
-msgid "show all objects with --batch or --batch-check"
-msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
+#: builtin/cat-file.c:896
+msgid "path|tree-ish"
+msgstr "Pfad|Commit-Referenz"
-#: builtin/cat-file.c:664
-msgid "do not order --batch-all-objects output"
-msgstr "Ausgabe von --batch-all-objects nicht ordnen"
+#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "'%s' erfordert einen Batch-Modus"
+
+#: builtin/cat-file.c:921
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "'%c' ist inkompatibel mit dem Batch-Modus"
+
+#: builtin/cat-file.c:924
+msgid "batch modes take no arguments"
+msgstr "Batch-Modi erwarten keine Argumente"
+
+#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "<Commit> benötigt mit '%s'"
+
+#: builtin/cat-file.c:938
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "<Objekt> benötigt mit '-%c'"
+
+#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429
+#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596
+#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965
+#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
+#: builtin/tag.c:592
+msgid "too many arguments"
+msgstr "zu viele Argumente"
+
+#: builtin/cat-file.c:947
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr "nur zwei Argumente im <Typ> <Objekt> Modus erlaubt, nicht %d"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -12237,7 +12865,7 @@
msgid "use .gitattributes only from the index"
msgstr "nur .gitattributes vom Index verwenden"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
msgid "read file names from stdin"
msgstr "Dateinamen von der Standard-Eingabe lesen"
@@ -12245,8 +12873,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
+#: builtin/worktree.c:565
msgid "suppress progress reporting"
msgstr "Fortschrittsanzeige unterdrücken"
@@ -12293,7 +12921,7 @@
#: builtin/check-mailmap.c:25
#, c-format
msgid "unable to parse contact: %s"
-msgstr "Konnte Kontakt '%s' nicht parsen."
+msgstr "konnte Kontakt nicht parsen: %s"
#: builtin/check-mailmap.c:48
msgid "no contacts specified"
@@ -12303,171 +12931,169 @@
msgid "git checkout--worker [<options>]"
msgstr "git checkout--worker [<Optionen>]"
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
+#: builtin/worktree.c:808
msgid "string"
msgstr "Zeichenkette"
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
msgid "when creating files, prepend <string>"
msgstr ""
"wenn Dateien erzeugt werden, stelle <Zeichenkette> dem Dateinamen voran"
-#: builtin/checkout-index.c:152
+#: builtin/checkout-index.c:184
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:201
msgid "stage should be between 1 and 3 or all"
msgstr "stage sollte zwischen 1 und 3 oder 'all' sein"
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:219
msgid "check out all files in the index"
msgstr "alle Dateien im Index auschecken"
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:221
+msgid "do not skip files with skip-worktree set"
+msgstr "Dateien mit gesetztem skip-worktree nicht überspringen"
+
+#: builtin/checkout-index.c:222
msgid "force overwrite of existing files"
msgstr "das Überschreiben bereits existierender Dateien erzwingen"
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:224
msgid "no warning for existing files and files not in index"
msgstr ""
"keine Warnung für existierende Dateien, und Dateien, die sich nicht im Index "
"befinden"
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:226
msgid "don't checkout new files"
msgstr "keine neuen Dateien auschecken"
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:228
msgid "update stat information in the index file"
msgstr "Dateiinformationen in der Index-Datei aktualisieren"
-#: builtin/checkout-index.c:198
+#: builtin/checkout-index.c:232
msgid "read list of paths from the standard input"
msgstr "eine Liste von Pfaden von der Standard-Eingabe lesen"
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:234
msgid "write the content to temporary files"
msgstr "den Inhalt in temporäre Dateien schreiben"
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:238
msgid "copy out the files from named stage"
msgstr "Dateien von dem benannten Stand kopieren"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:34
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<Optionen>] <Branch>"
-#: builtin/checkout.c:34
+#: builtin/checkout.c:35
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..."
-#: builtin/checkout.c:39
+#: builtin/checkout.c:40
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<Optionen>] [<Branch>]"
-#: builtin/checkout.c:44
+#: builtin/checkout.c:45
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<Optionen>] [--source=<Branch>] <Datei>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:199 builtin/checkout.c:238
#, c-format
msgid "path '%s' does not have our version"
-msgstr "Pfad '%s' hat nicht unsere Version."
+msgstr "Pfad '%s' hat nicht unsere Version"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:201 builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have their version"
-msgstr "Pfad '%s' hat nicht deren Version."
+msgstr "Pfad '%s' hat nicht deren Version"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:217
#, c-format
msgid "path '%s' does not have all necessary versions"
-msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
+msgstr "Pfad '%s' hat nicht alle notwendigen Versionen"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:271
#, c-format
msgid "path '%s' does not have necessary versions"
-msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
+msgstr "Pfad '%s' hat nicht die notwendigen Versionen"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:291
#, c-format
msgid "path '%s': cannot merge"
msgstr "Pfad '%s': kann nicht zusammenführen"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:307
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
-#: builtin/checkout.c:411
+#: builtin/checkout.c:424
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "%d Merge-Konflikt wieder erstellt"
msgstr[1] "%d Merge-Konflikte wieder erstellt"
-#: builtin/checkout.c:416
+#: builtin/checkout.c:429
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "%d Pfad von %s aktualisiert"
msgstr[1] "%d Pfade von %s aktualisiert"
-#: builtin/checkout.c:423
+#: builtin/checkout.c:436
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "%d Pfad vom Index aktualisiert"
msgstr[1] "%d Pfade vom Index aktualisiert"
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:469
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' kann nicht mit '%s' verwendet werden"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:479
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
-#: builtin/checkout.c:470
+#: builtin/checkout.c:483
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "Weder '%s' noch '%s' ist angegeben"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:487
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "'%s' kann nur genutzt werden, wenn '%s' nicht verwendet wird"
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:492 builtin/checkout.c:497
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' oder '%s' kann nicht mit %s verwendet werden"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:571 builtin/checkout.c:578
#, c-format
msgid "path '%s' is unmerged"
-msgstr "Pfad '%s' ist nicht zusammengeführt."
+msgstr "Pfad '%s' ist nicht zusammengeführt"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:753
msgid "you need to resolve your current index first"
msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
-#: builtin/checkout.c:788
+#: builtin/checkout.c:809
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12476,50 +13102,50 @@
"Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:902
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:947
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "Konnte HEAD nicht aktualisieren."
-#: builtin/checkout.c:931
+#: builtin/checkout.c:955
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:958
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:962
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:964 builtin/checkout.c:1398
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Zu neuem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:966
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Zu Branch '%s' gewechselt\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:1017
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12542,7 +13168,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1042
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12569,19 +13195,19 @@
" git branch <neuer-Branchname> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1077
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1081
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1124 builtin/checkout.c:1393
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1206
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12591,7 +13217,7 @@
"Bitte benutzen Sie -- (und optional --no-guess), um diese\n"
"eindeutig voneinander zu unterscheiden."
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1213
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"
@@ -12614,51 +13240,58 @@
"bevorzugen möchten, z.B. 'origin', können Sie die Einstellung\n"
"checkout.defaultRemote=origin in Ihrer Konfiguration setzen."
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1223
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' entspricht mehreren (%d) Remote-Tracking-Branches"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
msgid "only one reference expected"
msgstr "nur eine Referenz erwartet"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1306
#, c-format
msgid "only one reference expected, %d given."
msgstr "nur eine Referenz erwartet, %d gegeben."
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1365 builtin/checkout.c:1744
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "Ein Branch wird erwartet, Tag '%s' bekommen"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1415
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1417 builtin/checkout.c:1426
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "Ein Branch wird erwartet, '%s' bekommen"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1420
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "Ein Branch wird erwartet, Commit '%s' bekommen"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1429
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr ""
+"Wenn Sie HEAD bei dem Commit loslösen möchten, versuchen Sie es erneut mit "
+"der --detach Option."
+
+#: builtin/checkout.c:1442
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12666,7 +13299,7 @@
"Der Branch kann nicht während eines Merges gewechselt werden.\n"
"Ziehen Sie \"git merge --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12675,7 +13308,7 @@
"werden.\n"
"Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1450
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12684,7 +13317,7 @@
"werden.\n"
"Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12693,7 +13326,7 @@
"gewechselt werden.\n"
"Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1458
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12702,140 +13335,125 @@
"werden.\n"
"Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1462
msgid "you are switching branch while bisecting"
msgstr "Sie wechseln den Branch während einer binären Suche"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1469
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
+#: builtin/checkout.c:1495 builtin/checkout.c:1500
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1497
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' kann nicht <Startpunkt> bekommen"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1505
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1512
msgid "missing branch or commit argument"
msgstr "Branch- oder Commit-Argument fehlt"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1555
msgid "perform a 3-way merge with the new branch"
msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
msgid "style"
msgstr "Stil"
-#: builtin/checkout.c:1522
-msgid "conflict style (merge or diff3)"
-msgstr "Konfliktstil (merge oder diff3)"
+#: builtin/checkout.c:1557
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "Konfliktstil (merge, diff3 oder zdiff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1569 builtin/worktree.c:560
msgid "detach HEAD at named commit"
msgstr "HEAD bei benanntem Commit loslösen"
-#: builtin/checkout.c:1535
-msgid "set upstream info for new branch"
-msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
-
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1574
msgid "force checkout (throw away local modifications)"
msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new-branch"
msgstr "neuer Branch"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new unparented branch"
msgstr "neuer Branch ohne Eltern-Commit"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1578 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "ignorierte Dateien aktualisieren (Standard)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1581
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis "
"ausgecheckt wurde, deaktivieren"
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1594
msgid "checkout our version for unmerged files"
msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1597
msgid "checkout their version for unmerged files"
msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1601
msgid "do not limit pathspecs to sparse entries only"
msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1659
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c und --orphan schließen sich gegenseitig aus"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr ""
+"die Optionen '-%c', '-%c' und '%s' können nicht gemeinsam verwendet werden"
-#: builtin/checkout.c:1626
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p und --overlay schließen sich gegenseitig aus"
-
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1700
msgid "--track needs a branch name"
msgstr "--track benötigt ein Branchname"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1705
#, c-format
msgid "missing branch name; try -%c"
msgstr "kein Branchname; versuchen Sie -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1737
#, c-format
msgid "could not resolve %s"
msgstr "konnte %s nicht auflösen"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1753
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1760
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden."
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1764
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'"
-#: builtin/checkout.c:1736
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file und --detach sind inkompatibel"
-
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file und --patch sind inkompatibel"
-
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1789
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12843,71 +13461,71 @@
"git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
"Sie aus dem Index auschecken."
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1794
msgid "you must specify path(s) to restore"
msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben."
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
+#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
+#: builtin/remote.c:173 builtin/submodule--helper.c:3038
+#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
+#: builtin/worktree.c:558
msgid "branch"
msgstr "Branch"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1820
msgid "create and checkout a new branch"
msgstr "einen neuen Branch erzeugen und auschecken"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1822
msgid "create/reset and checkout a branch"
msgstr "einen Branch erstellen/umsetzen und auschecken"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1823
msgid "create reflog for new branch"
msgstr "das Reflog für den neuen Branch erzeugen"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1825
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1826
msgid "use overlay mode (default)"
msgstr "benutze Overlay-Modus (Standard)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1874
msgid "create and switch to a new branch"
msgstr "einen neuen Branch erzeugen und dahin wechseln"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1876
msgid "create/reset and switch to a branch"
msgstr "einen Branch erstellen/umsetzen und dahin wechseln"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1878
msgid "second guess 'git switch <no-such-branch>'"
msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1880
msgid "throw away local modifications"
msgstr "lokale Änderungen verwerfen"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1916
msgid "which tree-ish to checkout from"
msgstr "Von welcher Commit-Referenz ausgecheckt werden soll"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1918
msgid "restore the index"
msgstr "Index wiederherstellen"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1920
msgid "restore the working tree (default)"
msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1922
msgid "ignore unmerged entries"
msgstr "ignoriere nicht zusammengeführte Einträge"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1923
msgid "use overlay mode"
msgstr "benutze Overlay-Modus"
@@ -12942,7 +13560,15 @@
msgid "could not lstat %s\n"
msgstr "Konnte 'lstat' nicht für %s ausführen\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Das aktuelle Arbeitsverzeichnis zu löschen wird verweigert\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Das aktuelle Arbeitsverzeichnis zu löschen würde verweigert werden\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12955,7 +13581,7 @@
"foo - Element anhand eines eindeutigen Präfix auswählen\n"
" - (leer) nichts auswählen\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12976,33 +13602,33 @@
"* - alle Elemente auswählen\n"
" - (leer) Auswahl beenden\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Wie bitte (%s)?\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ignorier-Muster eingeben>> "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Wählen Sie Einträge zum Löschen"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "'%s' löschen [y/N]? "
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -13020,52 +13646,52 @@
"help - diese Meldung anzeigen\n"
"? - Hilfe zur Auswahl mittels Eingabe anzeigen"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Würde das folgende Element entfernen:"
msgstr[1] "Würde die folgenden Elemente entfernen:"
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Keine Dateien mehr zum Löschen, beende."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "keine Namen von gelöschten Dateien ausgeben"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "Aktion erzwingen"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "interaktives Clean"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "ganze Verzeichnisse löschen"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
+#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "Muster"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "auch ignorierte Dateien löschen"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "nur ignorierte Dateien löschen"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -13073,7 +13699,7 @@
"clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
"\"clean\" verweigert"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -13081,226 +13707,224 @@
"clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
"f gegeben; \"clean\" verweigert"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x und -X können nicht gemeinsam verwendet werden"
-#: builtin/clone.c:45
+#: builtin/clone.c:47
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
-#: builtin/clone.c:96
+#: builtin/clone.c:100
msgid "don't clone shallow repository"
msgstr "Repository mit unvollständiger Historie nicht klonen"
-#: builtin/clone.c:98
+#: builtin/clone.c:102
msgid "don't create a checkout"
msgstr "kein Auschecken"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "ein Bare-Repository erstellen"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "create a mirror repository (implies bare)"
msgstr "ein Spiegelarchiv erstellen (impliziert bare)"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "to clone from a local repository"
msgstr "von einem lokalen Repository klonen"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "don't use local hardlinks, always copy"
msgstr "lokal keine harten Verweise verwenden, immer Kopien"
-#: builtin/clone.c:109
+#: builtin/clone.c:113
msgid "setup as shared repository"
msgstr "als verteiltes Repository einrichten"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "pathspec"
msgstr "Pfadspezifikation"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "initialize submodules in the clone"
msgstr "Submodule im Klon initialisieren"
-#: builtin/clone.c:115
+#: builtin/clone.c:119
msgid "number of submodules cloned in parallel"
msgstr "Anzahl der parallel zu klonenden Submodule"
-#: builtin/clone.c:116 builtin/init-db.c:539
+#: builtin/clone.c:120 builtin/init-db.c:539
msgid "template-directory"
msgstr "Vorlagenverzeichnis"
-#: builtin/clone.c:117 builtin/init-db.c:540
+#: builtin/clone.c:121 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
msgid "reference repository"
msgstr "Repository referenzieren"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:127 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2721
msgid "use --reference only while cloning"
msgstr "--reference nur während des Klonens benutzen"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3967 builtin/repack.c:669
+#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "Name"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "use <name> instead of 'origin' to track upstream"
msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
+#: builtin/pull.c:212
msgid "depth"
msgstr "Tiefe"
-#: builtin/clone.c:131
+#: builtin/clone.c:135
msgid "create a shallow clone of that depth"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
+#: builtin/pull.c:215
msgid "time"
msgstr "Zeit"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "create a shallow clone since a specific time"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten "
"Zeit\n"
"erstellen"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
msgid "revision"
msgstr "Commit"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n"
"Ausschluss eines Commits vertiefen"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:141 builtin/submodule--helper.c:1897
+#: builtin/submodule--helper.c:2735
msgid "clone only one branch, HEAD or --branch"
msgstr "nur einen Branch klonen, HEAD oder --branch"
-#: builtin/clone.c:139
+#: builtin/clone.c:143
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "any cloned submodules will be shallow"
msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
-#: builtin/clone.c:142 builtin/init-db.c:548
+#: builtin/clone.c:146 builtin/init-db.c:548
msgid "gitdir"
msgstr ".git-Verzeichnis"
-#: builtin/clone.c:143 builtin/init-db.c:549
+#: builtin/clone.c:147 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
-#: builtin/clone.c:144
+#: builtin/clone.c:148
msgid "key=value"
msgstr "Schlüssel=Wert"
-#: builtin/clone.c:145
+#: builtin/clone.c:149
msgid "set config inside the new repository"
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "serverspezifisch"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "Option übertragen"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "nur IPv4-Adressen benutzen"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "nur IPv6-Adressen benutzen"
-#: builtin/clone.c:154
+#: builtin/clone.c:158
+msgid "apply partial clone filters to submodules"
+msgstr "partielle Klonfilter auf Submodule anwenden"
+
+#: builtin/clone.c:160
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "jedes geklonte Submodul nutzt seinen Remote-Tracking-Branch"
-#: builtin/clone.c:156
+#: builtin/clone.c:162
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
"Initialisiere Datei für partiellen Checkout, um nur Dateien im\n"
"Root-Verzeichnis einzubeziehen"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Konnte keinen Verzeichnisnamen erraten.\n"
-"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
-
-#: builtin/clone.c:345
+#: builtin/clone.c:237
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:310
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existiert und ist kein Verzeichnis"
-#: builtin/clone.c:436
+#: builtin/clone.c:328
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "Fehler beim Starten der Iteration über '%s'"
-#: builtin/clone.c:467
+#: builtin/clone.c:359
#, c-format
msgid "failed to create link '%s'"
msgstr "Konnte Verweis '%s' nicht erstellen"
-#: builtin/clone.c:471
+#: builtin/clone.c:363
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
-#: builtin/clone.c:476
+#: builtin/clone.c:368
#, c-format
msgid "failed to iterate over '%s'"
msgstr "Fehler beim Iterieren über '%s'"
-#: builtin/clone.c:503
+#: builtin/clone.c:395
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:409
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13310,107 +13934,103 @@
"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
"und das Auschecken mit 'git restore --source=HEAD :/' erneut versuchen.\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:486
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
-#: builtin/clone.c:713
+#: builtin/clone.c:603
#, c-format
msgid "unable to update %s"
msgstr "kann %s nicht aktualisieren"
-#: builtin/clone.c:761
+#: builtin/clone.c:651
msgid "failed to initialize sparse-checkout"
msgstr "Fehler beim Initialisieren vom partiellen Checkout."
-#: builtin/clone.c:784
+#: builtin/clone.c:674
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann "
"nicht ausgecheckt werden.\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:709
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
-#: builtin/clone.c:894
+#: builtin/clone.c:793
msgid "unable to write parameters to config file"
msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
-#: builtin/clone.c:957
+#: builtin/clone.c:856
msgid "cannot repack to clean up"
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
-#: builtin/clone.c:959
+#: builtin/clone.c:858
msgid "cannot unlink temporary alternates file"
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:901
msgid "Too many arguments."
msgstr "Zu viele Argumente."
-#: builtin/clone.c:1005
+#: builtin/clone.c:905 contrib/scalar/scalar.c:413
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
-#: builtin/clone.c:1018
+#: builtin/clone.c:918
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare und --origin %s sind inkompatibel."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "die Optionen '%s' und '%s %s' können nicht gemeinsam verwendet werden"
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare und --separate-git-dir sind inkompatibel."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:935
#, c-format
msgid "repository '%s' does not exist"
msgstr "Repository '%s' existiert nicht"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:939 builtin/fetch.c:2176
#, c-format
msgid "depth %s is not a positive number"
msgstr "Tiefe %s ist keine positive Zahl"
-#: builtin/clone.c:1049
+#: builtin/clone.c:949
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis."
-#: builtin/clone.c:1055
+#: builtin/clone.c:955
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr ""
"Pfad des Repositories '%s' existiert bereits und ist kein leeres Verzeichnis."
-#: builtin/clone.c:1069
+#: builtin/clone.c:969
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
+#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: builtin/clone.c:1089
+#: builtin/clone.c:989
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
-#: builtin/clone.c:1109
+#: builtin/clone.c:1009
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s' ...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1011
#, c-format
msgid "Cloning into '%s'...\n"
-msgstr "Klone nach '%s' ...\n"
+msgstr "Klone nach '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1040
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -13418,55 +14038,59 @@
"'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
"able"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' ist kein gültiger Name für ein Remote-Repository"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1157
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://"
"\"."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1159
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
"\"file://\"."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1161
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
"\"file://\"."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1163
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://"
"\"."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1168
msgid "source repository is shallow, ignoring --local"
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
"ignoriere --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1173
msgid "--local is ignored"
msgstr "--local wird ignoriert"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1185
+msgid "cannot clone from filtered bundle"
+msgstr "kann nicht von gefiltertem Bundle klonen"
+
+#: builtin/clone.c:1265 builtin/clone.c:1324
msgid "remote transport reported error"
msgstr "Remoteübertragung meldete Fehler"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1277 builtin/clone.c:1289
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1292
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
@@ -13502,14 +14126,14 @@
msgid "--command must be the first argument"
msgstr "--command muss an erster Stelle stehen"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <Objektverzeichnis>] [--shallow] [--"
"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13519,100 +14143,98 @@
"split[=<Strategie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <Anzahl>] [--[no-]progress] <Split-Optionen>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
msgid "dir"
msgstr "Verzeichnis"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "das Objektverzeichnis zum Speichern des Graphen"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
"Wenn der Commit-Graph aufgeteilt ist, nur die Datei an der Spitze überprüfen"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Konnte Commit-Graph '%s' nicht öffnen."
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "nicht erkanntes --split Argument, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "unerwartete nicht-hexadezimale Objekt-ID: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "ungültiges Objekt: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "Durchlauf auf allen Referenzen beginnen"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "Lauf bei Commits beginnen, die über die Standard-Eingabe gelistet sind"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr ""
"alle Commits einschließen, die sich bereits in der Commit-Graph-Datei "
"befinden"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "Berechnung für veränderte Pfade aktivieren"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "erlaube das Schreiben einer inkrementellen Commit-Graph-Datei"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
"maximale Anzahl von Commits in einem aufgeteilten Commit-Graph ohne Basis"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
"maximales Verhältnis zwischen zwei Ebenen eines aufgeteilten Commit-Graph"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "nur Objekte älter als angegebene Zeit verfallen lassen"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "maximale Anzahl der zu berechnenden Bloom-Filter für veränderte Pfade"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"benutzen Sie mindestens eine der folgenden Optionen: --reachable, --stdin-"
"commits, oder --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Sammle Commits von der Standard-Eingabe"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "Nicht erkannter Unterbefehl: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13626,70 +14248,65 @@
msgid "duplicate parent %s ignored"
msgstr "doppelter Vorgänger %s ignoriert"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
#, c-format
msgid "not a valid object name %s"
msgstr "Kein gültiger Objektname: %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: Fehler beim Öffnen von '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: Fehler beim Lesen von '%s'"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: Fehler beim Schließen von '%s'"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "Eltern-Commit"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "ID eines Eltern-Commit-Objektes."
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
+#: builtin/tag.c:455
msgid "message"
msgstr "Beschreibung"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "Commit-Beschreibung"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "Commit-Beschreibung von Datei lesen"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Commit mit GPG signieren"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "Brauche genau ein Tree-Objekt."
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: Fehler beim Lesen"
-#: builtin/commit.c:41
+#: builtin/commit.c:43
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:48
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:53
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13699,7 +14316,7 @@
"machen. Sie können Ihren Befehl mit --allow-empty wiederholen, oder diesen\n"
"Commit mit \"git reset HEAD^\" vollständig entfernen.\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:58
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13714,15 +14331,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:65
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Andernfalls benutzen Sie bitte 'git rebase --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:68
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Andernfalls benutzen Sie bitte 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:71
msgid ""
"and then use:\n"
"\n"
@@ -13744,74 +14361,70 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:326
msgid "failed to unpack HEAD tree object"
msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD."
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "Option --pathspec-from-file mit -a ist nicht sinnvoll."
-
-#: builtin/commit.c:374
+#: builtin/commit.c:376
msgid "No paths with --include/--only does not make sense."
msgstr "Keine Pfade mit der Option --include/--only ist nicht sinnvoll."
-#: builtin/commit.c:386
+#: builtin/commit.c:388
msgid "unable to create temporary index"
msgstr "Konnte temporären Index nicht erstellen."
-#: builtin/commit.c:395
+#: builtin/commit.c:397
msgid "interactive add failed"
msgstr "interaktives Hinzufügen fehlgeschlagen"
-#: builtin/commit.c:410
+#: builtin/commit.c:412
msgid "unable to update temporary index"
msgstr "Konnte temporären Index nicht aktualisieren."
-#: builtin/commit.c:412
+#: builtin/commit.c:414
msgid "Failed to update main cache tree"
msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
msgid "unable to write new_index file"
msgstr "Konnte new_index Datei nicht schreiben"
-#: builtin/commit.c:489
+#: builtin/commit.c:491
msgid "cannot do a partial commit during a merge."
msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist."
-#: builtin/commit.c:491
+#: builtin/commit.c:493
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
"Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist."
-#: builtin/commit.c:493
+#: builtin/commit.c:495
msgid "cannot do a partial commit during a rebase."
msgstr "kann keinen Teil-Commit durchführen, während ein Rebase im Gange ist."
-#: builtin/commit.c:501
+#: builtin/commit.c:503
msgid "cannot read the index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:520
+#: builtin/commit.c:522
msgid "unable to write temporary index file"
msgstr "Konnte temporäre Index-Datei nicht schreiben."
-#: builtin/commit.c:618
+#: builtin/commit.c:620
#, c-format
msgid "commit '%s' lacks author header"
msgstr "Commit '%s' fehlt Autor-Kopfbereich"
-#: builtin/commit.c:620
+#: builtin/commit.c:622
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
-#: builtin/commit.c:639
+#: builtin/commit.c:641
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
-#: builtin/commit.c:692
+#: builtin/commit.c:694
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13819,43 +14432,43 @@
"Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
"der aktuellen Commit-Beschreibung verwendet wird."
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
#, c-format
msgid "could not lookup commit %s"
msgstr "Konnte Commit %s nicht nachschlagen"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:762 builtin/shortlog.c:417
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:764
msgid "could not read log from standard input"
msgstr "Konnte Log nicht von Standard-Eingabe lesen."
-#: builtin/commit.c:764
+#: builtin/commit.c:768
#, c-format
msgid "could not read log file '%s'"
msgstr "Konnte Log-Datei '%s' nicht lesen"
-#: builtin/commit.c:801
+#: builtin/commit.c:805
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "-m kann nicht mit --fixup:%s kombiniert werden"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "die Optionen '%s' und '%s:%s' können nicht gemeinsam verwendet werden"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:817 builtin/commit.c:833
msgid "could not read SQUASH_MSG"
msgstr "Konnte SQUASH_MSG nicht lesen"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
msgid "could not read MERGE_MSG"
msgstr "Konnte MERGE_MSG nicht lesen"
-#: builtin/commit.c:880
+#: builtin/commit.c:884
msgid "could not write commit template"
msgstr "Konnte Commit-Vorlage nicht schreiben"
-#: builtin/commit.c:893
+#: builtin/commit.c:897
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13864,7 +14477,7 @@
"Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,\n"
"die mit '%c' beginnen, werden ignoriert.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:899
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13874,7 +14487,7 @@
"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:903
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13884,7 +14497,7 @@
"die mit '%c' beginnen, werden beibehalten; wenn Sie möchten, können Sie\n"
"diese entfernen.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:907
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13897,7 +14510,7 @@
"entfernen.\n"
"Eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:919
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13911,7 +14524,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"aus und versuchen Sie es erneut.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:924
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13925,182 +14538,154 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"aus und versuchen Sie es erneut.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:951
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:959
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:966
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommit-Ersteller: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:984
msgid "Cannot read index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1029
msgid "unable to pass trailers to --trailers"
msgstr "konnte Anhänge nicht an --trailers weitergeben"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1069
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1083 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
"Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1128
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem "
"vorhandenen Autor überein"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1142
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ungültiger ignored-Modus '%s'."
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1160 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
-#: builtin/commit.c:1195
-msgid "--long and -z are incompatible"
-msgstr "--long und -z sind inkompatibel"
-
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Ein Merge ist im Gange -- kann Umformulierung nicht durchführen."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1233
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "\"cherry-pick\" ist im Gange -- kann Umformulierung nicht durchführen."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1236
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
msgstr ""
-"Option für Umformulierung bei --fixup kann nicht mit Pfad '%s' kombiniert "
+"Umformulierungsoption von '%s' und Pfad '%s' können nicht gemeinsam "
+"verwendet werden"
+
+#: builtin/commit.c:1238
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr ""
+"Umformulierungsoption von '%s' und '%s' können nicht gemeinsam verwendet "
"werden"
-#: builtin/commit.c:1233
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"Umformulierungsoption von --fixup und --patch/--interactive/--all/--"
-"include/--only schließen sich gegenseitig aus"
-
-#: builtin/commit.c:1252
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "--reset-author und --author können nicht gemeinsam verwendet werden"
-
-#: builtin/commit.c:1261
+#: builtin/commit.c:1263
msgid "You have nothing to amend."
msgstr "Sie haben nichts zum Nachbessern."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1266
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Ein Merge ist im Gange -- Nachbesserung nicht möglich."
-#: builtin/commit.c:1266
+#: builtin/commit.c:1268
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "\"cherry-pick\" ist im Gange -- Nachbesserung nicht möglich."
-#: builtin/commit.c:1268
+#: builtin/commit.c:1270
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Ein Rebase ist im Gange -- Nachbesserung nicht möglich."
-#: builtin/commit.c:1271
-msgid "Options --squash and --fixup cannot be used together"
-msgstr ""
-"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden"
-
-#: builtin/commit.c:1281
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden."
-
-#: builtin/commit.c:1283
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "Die Option -m kann nicht mit -c/-C/-F kombiniert werden."
-
-#: builtin/commit.c:1292
+#: builtin/commit.c:1290
msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author kann nur mit -C, -c oder --amend verwendet werden"
+msgstr "--reset-author kann nur mit -C, -c oder --amend verwendet werden."
-#: builtin/commit.c:1310
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr ""
-"Es kann nur eine Option von --include/--only/--all/--interactive/--patch "
-"verwendet werden."
-
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "unbekannte Option: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "Pfade '%s ...' mit -a sind nicht sinnvoll"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "Status im Kurzformat anzeigen"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "Branchinformationen anzeigen"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "Stashinformationen anzeigen"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "voraus/hinterher-Werte berechnen"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "Version"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:765
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "Status im Langformat anzeigen (Standard)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "Einträge mit NUL-Zeichen abschließen"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
msgid "mode"
msgstr "Modus"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: "
"all)"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -14108,11 +14693,11 @@
"ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. "
"(Standard: traditional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:197
msgid "when"
msgstr "wann"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -14120,195 +14705,195 @@
"Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
"(Standard: all)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "unversionierte Dateien in Spalten auflisten"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "keine Umbenennungen ermitteln"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Nicht unterstützte Kombination von ignored und untracked-files Argumenten."
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
msgid "read message from file"
msgstr "Beschreibung von Datei lesen"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "Autor"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "Autor eines Commits überschreiben"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:551
msgid "date"
msgstr "Datum"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "Datum eines Commits überschreiben"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:360 ref-filter.h:89
msgid "commit"
msgstr "Commit"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]Commit"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"eine autosquash-formatierte Beschreibung zum Nachbessern/Umformulieren des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"eine autosquash-formatierte Beschreibung beim \"squash\" des angegebenen "
"Commits verwenden"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "Anhang"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "benutzerdefinierte Anhänge hinzufügen"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "eine Signed-off-by Zeile hinzufügen"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "angegebene Vorlagendatei verwenden"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "Bearbeitung des Commits erzwingen"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Optionen für Commit-Inhalt"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "alle geänderten Dateien committen"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "interaktives Hinzufügen von Dateien"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "interaktives Hinzufügen von Änderungen"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "nur die angegebenen Dateien committen"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "Hooks pre-commit und commit-msg umgehen"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "anzeigen, was committet werden würde"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "vorherigen Commit ändern"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "\"post-rewrite hook\" umgehen"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "Aufzeichnung einer leeren Änderung erlauben"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "Konnte MERGE_MODE nicht lesen"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Commit aufgrund leerer Commit-Beschreibung abgebrochen.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14433,6 +15018,10 @@
msgid "Type"
msgstr "Typ"
+#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+msgid "type"
+msgstr "Art"
+
#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "Wert ist mit diesem Typ angegeben"
@@ -14649,10 +15238,6 @@
msgid "no such section: %s"
msgstr "Sektion nicht gefunden: %s"
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "gibt Größenangaben in menschenlesbaren Format aus"
@@ -14682,7 +15267,7 @@
msgstr ""
"credential-cache--daemon nicht verfügbar; Unix-Socket wird nicht unterstützt"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache nicht verfügbar; Unix-Socket wird nicht unterstützt"
@@ -14825,7 +15410,7 @@
msgid "do not consider tags matching <pattern>"
msgstr "keine Tags betrachten, die <Muster> entsprechen"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:595
msgid "show abbreviated commit object as fallback"
msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
@@ -14844,25 +15429,14 @@
msgstr ""
"<Markierung> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken\")"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long und --abbrev=0 sind inkompatibel"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Keine Namen gefunden, kann nichts beschreiben."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty kann nicht mit Commits verwendet werden"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken kann nicht mit Commits verwendet werden"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin und --merge-base schließen sich gegenseitig aus"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "Option '%s' und Commit-Angaben können nicht gemeinsam verwendet werden"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
@@ -14883,26 +15457,26 @@
msgid "%s...%s: no merge base"
msgstr "%s...%s: keine Merge-Basis"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "Kein Git-Repository"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:537 builtin/grep.c:700
#, c-format
msgid "invalid object '%s' given."
msgstr "Objekt '%s' ist ungültig."
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "Mehr als zwei Blobs angegeben: '%s'"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "unbehandeltes Objekt '%s' angegeben"
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: mehrere Merge-Basen, nutze %s"
@@ -14911,115 +15485,106 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "fehlgeschlagen: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen."
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen."
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
-"Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n"
-"Diff-Modus('-d' und '--dir-diff') nicht unterstützt."
+"kombinierte Diff-Formate ('-c' und '--cc') werden im Verzeichnis-\n"
+"Diff-Modus ('-d' und '--dir-diff') nicht unterstützt."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "beide Dateien geändert: '%s' und '%s'."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "Datei im Arbeitsverzeichnis belassen."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "Es existieren temporäre Dateien in '%s'."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "Sie könnten diese aufräumen oder wiederherstellen."
-#: builtin/difftool.c:699
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "fehlgeschlagen: %d"
+
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "`diff.guitool` statt `diff.tool` benutzen"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "Diff über ganzes Verzeichnis ausführen"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:700
msgid "tool"
msgstr "Tool"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "das angegebene Diff-Tool benutzen"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:706
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
-"'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem "
-"Rückkehrwert\n"
-"verschieden 0 ausgeführt wurde"
+"'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem Exit-Code "
+"ungleich 0 ausgeführt wurde"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:710
msgid "passed to `diff`"
-msgstr "an 'diff' übergeben"
+msgstr "an `diff` übergeben"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool benötigt Arbeitsverzeichnis oder --no-index"
-#: builtin/difftool.c:741
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff kann nicht mit --no-index verwendet werden"
-
-#: builtin/difftool.c:744
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool und --extcmd schließen sich gegenseitig aus"
-
-#: builtin/difftool.c:752
+#: builtin/difftool.c:745
msgid "no <tool> given for --tool=<tool>"
msgstr "kein <Tool> für --tool=<Tool> angegeben"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:752
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
@@ -15027,10 +15592,6 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <Optionen> <Umgebungsvariable>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
-msgid "type"
-msgstr "Art"
-
#: builtin/env--helper.c:46
msgid "default for git_env_*(...) to fall back on"
msgstr "Standard für git_env_*(...), um darauf zurückzugreifen"
@@ -15043,7 +15604,7 @@
#, c-format
msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
msgstr ""
-"Option `--default' erwartet einen booleschen Wert bei `--type=bool', nicht `"
+"Option `--default' erwartet einen booleschen Wert bei `--type=bool`, nicht `"
"%s`"
#: builtin/env--helper.c:82
@@ -15056,262 +15617,256 @@
"type=ulong`, nicht `%s`"
#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [rev-list-opts]"
+msgid "git fast-export [<rev-list-opts>]"
+msgstr "git fast-export [<rev-list-opts>]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Fehler: Verschachtelte Tags können nicht exportiert werden, außer --mark-"
"tags wurde angegeben."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "Token für --anonymize-map kann nicht leer sein"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "Fortschritt nach <n> Objekten anzeigen"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "Behandlung von signierten Tags wählen"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"Auswählen der Behandlung von Commit-Beschreibungen bei wechselndem Encoding"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "Markierungen in diese Datei schreiben"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "Markierungen von dieser Datei importieren"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "Markierungen von dieser Datei importieren, wenn diese existiert"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr "einen Tag-Ersteller vortäuschen, wenn das Tag keinen hat"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "für jeden Commit das gesamte Verzeichnis ausgeben"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "Ausgabe von Blob-Daten überspringen"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1860
msgid "refspec"
msgstr "Refspec"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "Refspec auf exportierte Referenzen anwenden"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "Ausgabe anonymisieren"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "von:nach"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "konvertiere <von> zu <nach> in anonymisierter Ausgabe"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"Eltern, die nicht im Fast-Export-Stream sind, anhand ihrer Objekt-ID "
"referenzieren"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "originale Objekt-IDs von Blobs/Commits anzeigen"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "Tags mit Markierungs-IDs beschriften"
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map ohne --anonymize ist nicht sinnvoll"
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-"--import-marks und --import-marks-if-exists können nicht zusammen "
-"weitergegeben werden"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3097
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "Fehlende 'from'-Markierungen für Submodul '%s'"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3099
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "Fehlende 'to'-Markierungen für Submodul '%s'"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3234
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "'mark' Befehl erwartet, '%s' bekommen"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3239
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "'to' Befehl erwartet, '%s' bekommen"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3331
msgid "Expected format name:filename for submodule rewrite option"
msgstr "Format 'Name:Dateiname' für Submodul-Rewrite-Option erwartet"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3386
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "Feature '%s' verboten in Eingabe ohne Option --allow-unsafe-features"
-#: builtin/fetch-pack.c:242
+#: builtin/fetch-pack.c:246
#, c-format
msgid "Lockfile created but not reported: %s"
msgstr "Lock-Datei erstellt, aber nicht gemeldet: %s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<Optionen>] <Gruppe>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<Optionen>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:124
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel kann nicht negativ sein"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:147 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "fordert von allen Remote-Repositories an"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:149 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "Upstream für \"git pull/fetch\" setzen"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:151 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "an .git/FETCH_HEAD anhängen statt zu überschreiben"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:153
msgid "use atomic transaction to update references"
msgstr "atomare Transaktionen nutzen, um Referenzen zu aktualisieren"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:155 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
msgid "force overwrite of local reference"
msgstr "das Überschreiben einer lokalen Referenz erzwingen"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:158
msgid "fetch from multiple remotes"
msgstr "von mehreren Remote-Repositories anfordern"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:160 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "alle Tags und verbundene Objekte anfordern"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
msgid "do not fetch all tags (--no-tags)"
msgstr "nicht alle Tags anfordern (--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:164
msgid "number of submodules fetched in parallel"
msgstr "Anzahl der parallel anzufordernden Submodule"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:166
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
"Refspec verändern, damit alle Referenzen unter refs/prefetch/ platziert "
"werden"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:168 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository "
"befinden"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:170
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, "
"und geänderte Tags aktualisieren"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
msgid "on-demand"
msgstr "bei-Bedarf"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:172
msgid "control recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:177
msgid "write fetched references to the FETCH_HEAD file"
msgstr "schreibe angeforderte Referenzen in die FETCH_HEAD-Datei"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:178 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "heruntergeladenes Paket behalten"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:180
msgid "allow updating of HEAD ref"
msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:185 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) auf "
"Zeitbasis\n"
"vertiefen"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:191 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "zu einem vollständigen Repository konvertieren"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:194
+msgid "re-fetch without negotiating common commits"
+msgstr "erneutes Abrufen ohne Aushandeln gemeinsamer Commits"
+
+#: builtin/fetch.c:197
msgid "prepend this to submodule path output"
msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:200
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -15319,147 +15874,146 @@
"Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
"als Konfigurationsdateien)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:204 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:205 builtin/pull.c:230
msgid "refmap"
msgstr "Refmap"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:206 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "Refmap für 'fetch' angeben"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:213 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr ""
"ausgeben, dass wir nur Objekte haben, die von diesem Objekt aus erreichbar "
"sind"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:215
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
"keine Packdatei anfordern; stattdessen die Vorgänger der Verhandlungstipps "
"anzeigen"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:218 builtin/fetch.c:220
msgid "run 'maintenance --auto' after fetching"
msgstr "führe 'maintenance --auto' nach \"fetch\" aus"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:222 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "Prüfe auf erzwungene Aktualisierungen in allen aktualisierten Branches"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:224
msgid "write the commit-graph after fetching"
msgstr "Schreibe den Commit-Graph nach \"fetch\""
-#: builtin/fetch.c:221
+#: builtin/fetch.c:226
msgid "accept refspecs from stdin"
msgstr "akzeptiere Refspecs von der Standard-Eingabe"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Konnte Remote-Referenz von HEAD nicht finden."
+#: builtin/fetch.c:618
+msgid "couldn't find remote ref HEAD"
+msgstr "konnte Remote-Referenz von HEAD nicht finden"
-#: builtin/fetch.c:757
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
-
-#: builtin/fetch.c:856
+#: builtin/fetch.c:893
#, c-format
msgid "object %s not found"
msgstr "Objekt %s nicht gefunden"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:897
msgid "[up to date]"
msgstr "[aktuell]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
msgid "[rejected]"
msgstr "[zurückgewiesen]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:911
msgid "can't fetch in current branch"
msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:912
+msgid "checked out in another worktree"
+msgstr "in einem anderen Arbeitsverzeichnis ausgecheckt"
+
+#: builtin/fetch.c:922
msgid "[tag update]"
msgstr "[Tag Aktualisierung]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
+#: builtin/fetch.c:994
msgid "unable to update local ref"
msgstr "kann lokale Referenz nicht aktualisieren"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:927
msgid "would clobber existing tag"
msgstr "würde bestehende Tags verändern"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:949
msgid "[new tag]"
msgstr "[neues Tag]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:952
msgid "[new branch]"
msgstr "[neuer Branch]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:955
msgid "[new ref]"
msgstr "[neue Referenz]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:994
msgid "forced update"
msgstr "Aktualisierung erzwungen"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:999
msgid "non-fast-forward"
msgstr "kein Vorspulen"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1102
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'."
+"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 ""
"Normalerweise zeigt 'fetch' welche Branches eine erzwungene Aktualisierung\n"
"hatten, aber diese Überprüfung wurde deaktiviert. Um diese wieder zu\n"
"aktivieren, nutzen Sie die Option '--show-forced-updates' oder führen\n"
"Sie 'git config fetch.showForcedUpdates true' aus."
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1106
#, c-format
msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
"Es brauchte %.2f Sekunden, um erzwungene Aktualisierungen zu überprüfen.\n"
"Sie können die Option '--no-show-forced-updates' benutzen oder\n"
"'git config fetch.showForcedUpdates false' ausführen, um diese Überprüfung\n"
"zu umgehen.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1136
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1156
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr ""
"%s zurückgewiesen, da Root-Commits von Repositories mit unvollständiger\n"
"Historie (shallow) nicht aktualisiert werden dürfen."
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1259 builtin/fetch.c:1418
#, c-format
msgid "From %.*s\n"
msgstr "Von %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1269
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15468,143 +16022,147 @@
"Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n"
"'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen."
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1377
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s wird unreferenziert)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1378
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s wurde unreferenziert)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1421
msgid "[deleted]"
msgstr "[gelöscht]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1422 builtin/remote.c:1153
msgid "(none)"
msgstr "(nichts)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1446
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr ""
-"Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository "
-"wurde verweigert."
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "Anfordern in Branch '%s' verweigert, ausgecheckt in '%s'"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1466
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1469
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
msgstr "Option \"%s\" wird ignoriert für %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1496
+#, c-format
+msgid "the object %s does not exist"
+msgstr "das Objekt %s ist nicht vorhanden"
+
+#: builtin/fetch.c:1748
msgid "multiple branches detected, incompatible with --set-upstream"
-msgstr "Mehrere Branches erkannt, inkompatibel mit --set-upstream"
+msgstr "mehrere Branches erkannt, inkompatibel mit --set-upstream"
-#: builtin/fetch.c:1633
-msgid "not setting upstream for a remote remote-tracking branch"
-msgstr "Setze keinen Upstream für einen entfernten Remote-Tracking-Branch."
-
-#: builtin/fetch.c:1635
-msgid "not setting upstream for a remote tag"
-msgstr "Setze keinen Upstream für einen Tag eines Remote-Repositories."
-
-#: builtin/fetch.c:1637
-msgid "unknown branch type"
-msgstr "Unbekannter Branch-Typ"
-
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1760
+#, c-format
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
msgstr ""
-"Keinen Quell-Branch gefunden.\n"
-"Sie müssen bei der Option --set-upstream genau einen Branch angeben."
+"konnte keinen Upstream-Branch von HEAD auf '%s' von '%s' setzen, da dieser "
+"auf keinen Branch zeigt."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1773
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "setze keinen Upstream für einen entfernten Remote-Tracking-Branch"
+
+#: builtin/fetch.c:1775
+msgid "not setting upstream for a remote tag"
+msgstr "setze keinen Upstream für einen Tag eines Remote-Repositories"
+
+#: builtin/fetch.c:1777
+msgid "unknown branch type"
+msgstr "unbekannter Branch-Typ"
+
+#: builtin/fetch.c:1779
+msgid ""
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
+msgstr ""
+"kein Quell-Branch gefunden;\n"
+"Sie müssen bei der Option --set-upstream genau einen Branch angeben"
+
+#: builtin/fetch.c:1904 builtin/fetch.c:1967
#, c-format
msgid "Fetching %s\n"
msgstr "Fordere an von %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1914 builtin/fetch.c:1969
#, c-format
-msgid "Could not fetch %s"
-msgstr "Konnte nicht von %s anfordern"
+msgid "could not fetch %s"
+msgstr "konnte %s nicht anfordern"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1926
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "Konnte '%s' nicht anfordern (Exit-Code: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:2030
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
-"Kein Remote-Repository angegeben. Bitte geben Sie entweder eine URL\n"
+"kein Remote-Repository angegeben; bitte geben Sie entweder eine URL\n"
"oder den Namen des Remote-Repositories an, von welchem neue\n"
-"Commits angefordert werden sollen."
+"Commits angefordert werden sollen"
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Sie müssen den Namen des Tags angeben."
+#: builtin/fetch.c:2066
+msgid "you need to specify a tag name"
+msgstr "Sie müssen den Namen des Tags angeben"
-#: builtin/fetch.c:1994
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
-msgstr "--negotiate-only benötigt einen oder mehrere --negotiate-tip=*"
+#: builtin/fetch.c:2156
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
+msgstr "--negotiate-only benötigt einen oder mehrere --negotiation-tip=*"
-#: builtin/fetch.c:1998
-msgid "Negative depth in --deepen is not supported"
-msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
+#: builtin/fetch.c:2160
+msgid "negative depth in --deepen is not supported"
+msgstr "negative Tiefe wird von --deepen nicht unterstützt"
-#: builtin/fetch.c:2000
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen und --depth schließen sich gegenseitig aus"
-
-#: builtin/fetch.c:2005
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth und --unshallow können nicht gemeinsam verwendet werden"
-
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2169
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"--unshallow kann nicht in einem Repository mit vollständiger Historie "
"verwendet werden"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2186
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all akzeptiert kein Repository als Argument"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2188
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kann nicht mit Refspecs verwendet werden"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2197
#, c-format
-msgid "No such remote or remote group: %s"
+msgid "no such remote or remote group: %s"
msgstr "Remote-Repository (einzeln oder Gruppe) nicht gefunden: %s"
-#: builtin/fetch.c:2042
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2205
+msgid "fetching a group and specifying refspecs does not make sense"
msgstr ""
-"Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n"
-"von Refspecs verwendet werden."
+"das Abrufen einer Gruppe und die Angabe einer Pfadspezifikation ist nicht "
+"sinnvoll"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2221
msgid "must supply remote when using --negotiate-only"
msgstr "Remote wird benötigt, wenn --negotiate-only benutzt wird"
-#: builtin/fetch.c:2063
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Protokoll unterstützt --negotiate-only nicht, beende."
+#: builtin/fetch.c:2226
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "Protokoll unterstützt --negotiate-only nicht, beende"
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2246
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15612,13 +16170,13 @@
"--filter kann nur mit den Remote-Repositories verwendet werden,\n"
"die in extensions.partialclone konfiguriert sind"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2250
msgid "--atomic can only be used when fetching from one remote"
msgstr ""
"--atomic kann nur verwendet werden, wenn nur von einem Remote-Repository "
"abgefragt wird"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2254
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
"--stdin kann nur verwendet werden, wenn nur von einem Remote-Repository "
@@ -15631,23 +16189,27 @@
"git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file "
"<Datei>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr "Historie mit höchstens <n> Einträgen von \"shortlog\" hinzufügen"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "Alias für --log (veraltet)"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "Text"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "<Text> als Beschreibungsanfang verwenden"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "<Name> statt echten Ziel-Branch verwenden"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "Datei zum Einlesen"
@@ -15667,47 +16229,47 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<Objekt>]] [--no-contains [<Commit>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "Platzhalter als Shell-String formatieren"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "Platzhalter als Perl-String formatieren"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "Platzhalter als Python-String formatieren"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "Platzhalter als Tcl-String formatieren"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "nur <n> passende Referenzen anzeigen"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:42 builtin/tag.c:482
msgid "respect format colors"
msgstr "Formatfarben beachten"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "nur zusammengeführte Referenzen ausgeben"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "nur nicht zusammengeführte Referenzen ausgeben"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
@@ -15843,133 +16405,255 @@
msgid "notice: No default references"
msgstr "Notiz: Keine Standardreferenzen"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: Hash-Pfad stimmt nicht überein, gefunden bei: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: Objekt hat einen unbekannten Typ '%s': %s"
+
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: Objekt konnte nicht geparst werden: %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "Ungültige SHA1-Datei: %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "Prüfe Objekt-Verzeichnis"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "Prüfe Objekt-Verzeichnisse"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "Prüfe %s Verknüpfung"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:710 builtin/index-pack.c:862
#, c-format
msgid "invalid %s"
msgstr "Ungültiger Objekt-Typ %s"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s zeigt auf etwas seltsames (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: losgelöster HEAD zeigt auf nichts"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "Prüfe Cache-Verzeichnis"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "non-tree in Cache-Verzeichnis"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<Optionen>] [<Objekt>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "unerreichbare Objekte anzeigen"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "unreferenzierte Objekte anzeigen"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "Tags melden"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "Hauptwurzeln melden"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "ebenso Pakete und alternative Objekte betrachten"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "nur Konnektivität prüfen"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr "genauere Prüfung aktivieren"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Prüfe Objekte"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s: Objekt nicht vorhanden"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen"
+#: builtin/fsmonitor--daemon.c:13
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [<Optionen>]"
+
+#: builtin/fsmonitor--daemon.c:14
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [<Optionen>]"
+
+#: builtin/fsmonitor--daemon.c:15
+msgid "git fsmonitor--daemon stop"
+msgstr "git fsmonitor--daemon stop"
+
+#: builtin/fsmonitor--daemon.c:16
+msgid "git fsmonitor--daemon status"
+msgstr "git fsmonitor--daemon status"
+
+#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "Wert von '%s' außerhalb des Bereichs: %d"
+
+#: builtin/fsmonitor--daemon.c:57
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "Wert von '%s' ist nicht bool oder int: %d"
+
+#: builtin/fsmonitor--daemon.c:99
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr "fsmonitor-daemon beobachtet '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:104
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr "fsmonitor-daemon beobachtet '%s nicht'\n"
+
+#: builtin/fsmonitor--daemon.c:170
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "konnte fsmonitor Cookie '%s' nicht erstellen"
+
+#: builtin/fsmonitor--daemon.c:753
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr "fsmonitor: cookie_result '%d' != SEEN"
+
+#: builtin/fsmonitor--daemon.c:1187
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr "konnte IPC-Threadpool nicht unter '%s' starten"
+
+#: builtin/fsmonitor--daemon.c:1199
+msgid "could not start fsmonitor listener thread"
+msgstr "konnte Thread für fsmonitor listener nicht starten"
+
+#: builtin/fsmonitor--daemon.c:1297
+msgid "could not initialize listener thread"
+msgstr "konnte listener Thread nicht initialisieren"
+
+#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr "fsmonitor--daemon läuft bereits '%s'"
+
+#: builtin/fsmonitor--daemon.c:1332
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr "fsmonitor-daemon wird in '%s' ausgeführt\n"
+
+#: builtin/fsmonitor--daemon.c:1387
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "starte fsmonitor-daemon unter '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:1413
+msgid "daemon failed to start"
+msgstr "Fehler beim Starten des Daemons"
+
+#: builtin/fsmonitor--daemon.c:1416
+msgid "daemon not online yet"
+msgstr "Daemon ist noch nicht online"
+
+#: builtin/fsmonitor--daemon.c:1419
+msgid "daemon terminated"
+msgstr "Daemon beendet"
+
+#: builtin/fsmonitor--daemon.c:1429
+msgid "detach from console"
+msgstr "von der Konsole loslösen"
+
+#: builtin/fsmonitor--daemon.c:1432
+msgid "use <n> ipc worker threads"
+msgstr "<n> IPC-Arbeitsthreads benutzen"
+
+#: builtin/fsmonitor--daemon.c:1435
+msgid "max seconds to wait for background daemon startup"
+msgstr "maximale Sekunden, um auf Starten des Hintergrund-Daemons zu warten"
+
+#: builtin/fsmonitor--daemon.c:1449
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "ungültiger 'ipc-threads' Wert (%d)"
+
+#: builtin/fsmonitor--daemon.c:1464
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "Nicht behandelter Unterbefehl '%s'"
+
+#: builtin/fsmonitor--daemon.c:1477
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr "fsmonitor--daemon wird auf dieser Plattform nicht unterstützt"
+
#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<Optionen>]"
@@ -15984,21 +16668,16 @@
msgid "failed to parse '%s' value '%s'"
msgstr "Fehler beim Parsen von '%s' mit dem Wert '%s'"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "Kann '%s' nicht lesen"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr "kann '%s' nicht lesen"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
@@ -16010,58 +16689,58 @@
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "unreferenzierte Objekte entfernen"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "\"auto-gc\" Modus aktivieren"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr ""
"Ausführung von \"git gc\" erzwingen, selbst wenn ein anderes\n"
"\"git gc\" bereits ausgeführt wird"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "alle anderen Pakete, außer das größte Paket, neu packen"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry."
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Die Datenbank des Repositories wird für eine optimale Performance im\n"
"Hintergrund komprimiert.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
"Die Datenbank des Projektarchivs wird für eine optimale Performance "
"komprimiert.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16069,33 +16748,33 @@
"\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
"(benutzen Sie --force falls nicht)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um "
"diese zu löschen."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<Aufgabe>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "--no-schedule ist nicht erlaubt"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "nicht erkanntes --schedule Argument '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "Fehler beim Schreiben des Commit-Graph"
-#: builtin/gc.c:905
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "Vorabruf der Remote-Repositories fehlgeschlagen"
@@ -16107,152 +16786,192 @@
msgid "failed to finish 'git pack-objects' process"
msgstr "konnte 'git pack-objects' Prozess nicht beenden"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
-msgstr "Fehler beim Schreiben des multi-pack-index"
+msgstr "Fehler beim Schreiben des Multi-Pack-Index"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "Fehler beim Ausführen von 'git multi-pack-index expire'"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "Fehler beim Ausführen von 'git multi-pack-index repack'"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"Überspringen der Aufgabe 'incremental-repack', weil core.multiPackIndex "
"deaktiviert ist"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "Sperrdatei '%s' existiert, Wartung wird übersprungen"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "Aufgabe '%s' fehlgeschlagen"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' ist keine gültige Aufgabe"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "Aufgabe '%s' kann nicht mehrfach ausgewählt werden"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "Aufgaben abhängig vom Zustand des Repositories ausführen"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "Häufigkeit"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "Aufgaben abhängig von der Häufigkeit ausführen"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "zeige keinen Fortschritt oder andere Informationen über stderr"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
msgid "task"
msgstr "Aufgabe"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "eine bestimmte Aufgabe ausführen"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr ""
"nutzen Sie höchstens eine der Optionen --auto oder --schedule=<Häufigkeit>"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "Fehler beim Ausführen von 'git config'"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "Fehler beim Erweitern des Pfades '%s'"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "konnte launchctl nicht starten"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "Fehler beim Erstellen von Verzeichnissen für '%s'"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "Fehler beim Laden des Services %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "Fehler beim Erstellen der temporären XML-Datei"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "Fehler beim Starten von schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"Fehler beim Ausführen von 'crontab -l'; Ihr System unterstützt eventuell "
"'cron' nicht"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"Fehler beim Ausführen von 'crontab'; Ihr System unterstützt eventuell 'cron' "
"nicht"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "Fehler beim Öffnen der Standard-Eingabe von 'crontab'"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "'crontab' abgebrochen"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "Fehler beim Starten von systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "Fehler beim Ausführen von systemctl"
+
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
+#: builtin/worktree.c:1024
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "Fehler beim Löschen von '%s'"
+
+#: builtin/gc.c:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "nicht erkanntes --scheduler Argument '%s'"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "weder Timer von systemd, noch crontab ist verfügbar"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s Scheduler ist nicht verfügbar"
+
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr "ein anderer Prozess plant die Hintergrundwartung"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<Scheduler>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "Scheduler"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "Scheduler, um \"git maintenance run\" auzuführen"
+
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "Repository konnte nicht zur globalen Konfiguration hinzugefügt werden"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <Unterbefehl> [<Optionen>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "ungültiger Unterbefehl: %s"
-#: builtin/grep.c:30
+#: builtin/grep.c:32
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:241
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:295
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
@@ -16261,270 +16980,262 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3150
#, c-format
msgid "no threads support, ignoring %s"
msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
#, c-format
msgid "unable to read tree (%s)"
msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
-#: builtin/grep.c:658
+#: builtin/grep.c:674
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen"
-#: builtin/grep.c:738
+#: builtin/grep.c:754
#, c-format
msgid "switch `%c' expects a numerical value"
-msgstr "Schalter '%c' erwartet einen numerischen Wert"
+msgstr "Schalter `%c' erwartet einen numerischen Wert"
-#: builtin/grep.c:837
+#: builtin/grep.c:852
msgid "search in index instead of in the work tree"
msgstr "im Index statt im Arbeitsverzeichnis suchen"
-#: builtin/grep.c:839
+#: builtin/grep.c:854
msgid "find in contents not managed by git"
msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
-#: builtin/grep.c:841
+#: builtin/grep.c:856
msgid "search in both tracked and untracked files"
msgstr "in versionierten und unversionierten Dateien suchen"
-#: builtin/grep.c:843
+#: builtin/grep.c:858
msgid "ignore files specified via '.gitignore'"
msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
-#: builtin/grep.c:845
+#: builtin/grep.c:860
msgid "recursively search in each submodule"
msgstr "rekursive Suche in jedem Submodul"
-#: builtin/grep.c:848
+#: builtin/grep.c:863
msgid "show non-matching lines"
msgstr "Zeilen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:850
+#: builtin/grep.c:865
msgid "case insensitive matching"
msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
-#: builtin/grep.c:852
+#: builtin/grep.c:867
msgid "match patterns only at word boundaries"
msgstr "nur ganze Wörter suchen"
-#: builtin/grep.c:854
+#: builtin/grep.c:869
msgid "process binary files as text"
msgstr "binäre Dateien als Text verarbeiten"
-#: builtin/grep.c:856
+#: builtin/grep.c:871
msgid "don't match patterns in binary files"
msgstr "keine Muster in Binärdateien finden"
-#: builtin/grep.c:859
+#: builtin/grep.c:874
msgid "process binary files with textconv filters"
msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
-#: builtin/grep.c:861
+#: builtin/grep.c:876
msgid "search in subdirectories (default)"
msgstr "in Unterverzeichnissen suchen (Standard)"
-#: builtin/grep.c:863
+#: builtin/grep.c:878
msgid "descend at most <depth> levels"
msgstr "höchstens <Tiefe> Ebenen durchlaufen"
-#: builtin/grep.c:867
+#: builtin/grep.c:882
msgid "use extended POSIX regular expressions"
msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
-#: builtin/grep.c:870
+#: builtin/grep.c:885
msgid "use basic POSIX regular expressions (default)"
msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
-#: builtin/grep.c:873
+#: builtin/grep.c:888
msgid "interpret patterns as fixed strings"
msgstr "Muster als feste Zeichenketten interpretieren"
-#: builtin/grep.c:876
+#: builtin/grep.c:891
msgid "use Perl-compatible regular expressions"
msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
-#: builtin/grep.c:879
+#: builtin/grep.c:894
msgid "show line numbers"
msgstr "Zeilennummern anzeigen"
-#: builtin/grep.c:880
+#: builtin/grep.c:895
msgid "show column number of first match"
msgstr "Nummer der Spalte des ersten Treffers anzeigen"
-#: builtin/grep.c:881
+#: builtin/grep.c:896
msgid "don't show filenames"
msgstr "keine Dateinamen anzeigen"
-#: builtin/grep.c:882
+#: builtin/grep.c:897
msgid "show filenames"
msgstr "Dateinamen anzeigen"
-#: builtin/grep.c:884
+#: builtin/grep.c:899
msgid "show filenames relative to top directory"
msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
-#: builtin/grep.c:886
+#: builtin/grep.c:901
msgid "show only filenames instead of matching lines"
msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
-#: builtin/grep.c:888
+#: builtin/grep.c:903
msgid "synonym for --files-with-matches"
msgstr "Synonym für --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:906
msgid "show only the names of files without match"
msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:893
+#: builtin/grep.c:908
msgid "print NUL after filenames"
msgstr "NUL-Zeichen nach Dateinamen ausgeben"
-#: builtin/grep.c:896
+#: builtin/grep.c:911
msgid "show only matching parts of a line"
msgstr "nur übereinstimmende Teile der Zeile anzeigen"
-#: builtin/grep.c:898
+#: builtin/grep.c:913
msgid "show the number of matches instead of matching lines"
msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
-#: builtin/grep.c:899
+#: builtin/grep.c:914
msgid "highlight matches"
msgstr "Übereinstimmungen hervorheben"
-#: builtin/grep.c:901
+#: builtin/grep.c:916
msgid "print empty line between matches from different files"
msgstr ""
"eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben"
-#: builtin/grep.c:903
+#: builtin/grep.c:918
msgid "show filename only once above matches from same file"
msgstr ""
"den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser Datei "
"anzeigen"
-#: builtin/grep.c:906
+#: builtin/grep.c:921
msgid "show <n> context lines before and after matches"
msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:909
+#: builtin/grep.c:924
msgid "show <n> context lines before matches"
msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen"
-#: builtin/grep.c:911
+#: builtin/grep.c:926
msgid "show <n> context lines after matches"
msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:913
+#: builtin/grep.c:928
msgid "use <n> worker threads"
msgstr "<n> Threads benutzen"
-#: builtin/grep.c:914
+#: builtin/grep.c:929
msgid "shortcut for -C NUM"
msgstr "Kurzform für -C NUM"
-#: builtin/grep.c:917
+#: builtin/grep.c:932
msgid "show a line with the function name before matches"
msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen"
-#: builtin/grep.c:919
+#: builtin/grep.c:934
msgid "show the surrounding function"
msgstr "die umgebende Funktion anzeigen"
-#: builtin/grep.c:922
+#: builtin/grep.c:937
msgid "read patterns from file"
msgstr "Muster von einer Datei lesen"
-#: builtin/grep.c:924
+#: builtin/grep.c:939
msgid "match <pattern>"
msgstr "<Muster> finden"
-#: builtin/grep.c:926
+#: builtin/grep.c:941
msgid "combine patterns specified with -e"
msgstr "Muster kombinieren, die mit -e angegeben wurden"
-#: builtin/grep.c:938
+#: builtin/grep.c:953
msgid "indicate hit with exit status without output"
msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen"
-#: builtin/grep.c:940
+#: builtin/grep.c:955
msgid "show only matches from files that match all patterns"
msgstr ""
"nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "pager"
msgstr "Anzeigeprogramm"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "show matching files in the pager"
msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen"
-#: builtin/grep.c:947
+#: builtin/grep.c:962
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1028
msgid "no pattern given"
msgstr "Kein Muster angegeben."
-#: builtin/grep.c:1049
+#: builtin/grep.c:1064
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1072
#, c-format
msgid "unable to resolve revision: %s"
msgstr "Konnte Commit nicht auflösen: %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1102
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked zusammen mit --recurse-submodules wird nicht unterstützt"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1106
msgid "invalid option combination, ignoring --threads"
msgstr "Ungültige Kombination von Optionen, --threads wird ignoriert."
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1109 builtin/pack-objects.c:4084
msgid "no threads support, ignoring --threads"
msgstr "Keine Unterstützung für Threads, --threads wird ignoriert."
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ungültige Anzahl von Threads angegeben (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1146
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"--open-files-in-pager kann nur innerhalb des Arbeitsverzeichnisses verwendet "
"werden"
-#: builtin/grep.c:1157
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached und --untracked können nicht mit --no-index verwendet werden"
-
-#: builtin/grep.c:1160
-msgid "--untracked cannot be used with --cached"
-msgstr "--untracked kann nicht mit --cached verwendet werden"
-
-#: builtin/grep.c:1166
+#: builtin/grep.c:1179
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet "
"werden"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1187
msgid "both --cached and trees are given"
msgstr "--cached und \"Tree\"-Objekte angegeben"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16532,97 +17243,101 @@
"git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] "
"[--] <Datei>..."
-#: builtin/hash-object.c:86
-msgid "git hash-object --stdin-paths"
-msgstr "git hash-object --stdin-paths"
-
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:97
msgid "object type"
msgstr "Art des Objektes"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:98
msgid "write the object into the object database"
msgstr "das Objekt in die Objektdatenbank schreiben"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
msgstr "das Objekt von der Standard-Eingabe lesen"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:102
msgid "store file as is without filters"
msgstr "Datei wie sie ist speichern, ohne Filter"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:103
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"Hash über zufällige Daten, zur Erzeugung von beschädigten Objekten zur\n"
"Fehlersuche in Git, erzeugen"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre"
-#: builtin/help.c:47
+#: builtin/help.c:57
msgid "print all available commands"
msgstr "alle vorhandenen Befehle anzeigen"
-#: builtin/help.c:48
+#: builtin/help.c:60
+msgid "show external commands in --all"
+msgstr "zeige externe Befehle bei --all"
+
+#: builtin/help.c:61
+msgid "show aliases in --all"
+msgstr "zeige Aliase bei --all"
+
+#: builtin/help.c:62
msgid "exclude guides"
msgstr "Anleitungen ausschließen"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "Liste von allgemein verwendeten Anleitungen anzeigen"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "alle Namen der Konfigurationsvariablen ausgeben"
-
-#: builtin/help.c:52
+#: builtin/help.c:63
msgid "show man page"
msgstr "Handbuch anzeigen"
-#: builtin/help.c:53
+#: builtin/help.c:64
msgid "show manual in web browser"
msgstr "Handbuch in einem Webbrowser anzeigen"
-#: builtin/help.c:55
+#: builtin/help.c:66
msgid "show info page"
msgstr "Info-Seite anzeigen"
-#: builtin/help.c:57
+#: builtin/help.c:68
msgid "print command description"
msgstr "Beschreibung des Befehls ausgeben"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<Befehl>]"
+#: builtin/help.c:70
+msgid "print list of useful guides"
+msgstr "Liste von allgemein verwendeten Anleitungen anzeigen"
-#: builtin/help.c:163
+#: builtin/help.c:72
+msgid "print all configuration variable names"
+msgstr "alle Namen der Konfigurationsvariablen ausgeben"
+
+#: builtin/help.c:84
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<Befehl>]"
+
+#: builtin/help.c:201
#, c-format
msgid "unrecognized help format '%s'"
msgstr "nicht erkanntes Hilfeformat: %s"
-#: builtin/help.c:190
+#: builtin/help.c:227
msgid "Failed to start emacsclient."
msgstr "Konnte emacsclient nicht starten."
-#: builtin/help.c:203
+#: builtin/help.c:240
msgid "Failed to parse emacsclient version."
msgstr "Konnte Version des emacsclient nicht parsen."
-#: builtin/help.c:211
+#: builtin/help.c:248
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
#, c-format
msgid "failed to exec '%s'"
msgstr "Fehler beim Ausführen von '%s'"
-#: builtin/help.c:307
+#: builtin/help.c:344
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16631,7 +17346,7 @@
"'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
-#: builtin/help.c:319
+#: builtin/help.c:356
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16640,235 +17355,246 @@
"'%s': Programm für unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
-#: builtin/help.c:436
+#: builtin/help.c:471
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': unbekannter Handbuch-Betrachter."
-#: builtin/help.c:452
+#: builtin/help.c:487
msgid "no man viewer handled the request"
msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:459
+#: builtin/help.c:494
msgid "no info viewer handled the request"
msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:555 builtin/help.c:566 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
-msgstr "Für '%s' wurde der Alias '%s' angelegt."
+msgstr "'%s' ist ein Alias für '%s'"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:569 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "Ungültiger alias.%s String: %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:611
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "die Option '%s' akzeptiert keine anderen Nicht-Optionsargumente"
+
+#: builtin/help.c:631
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr ""
+"die Optionen '--no-[external-commands|aliases]' können nur mit '--all' "
+"verwendet werden"
+
+#: builtin/help.c:643 builtin/help.c:671
#, c-format
msgid "usage: %s%s"
msgstr "Verwendung: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:666
msgid "'git help config' for more information"
msgstr "'git help config' für weitere Informationen"
-#: builtin/index-pack.c:222
+#: builtin/hook.c:10
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr "git hook run [--ignore-missing] <Hook-Name> [-- <Hook-Argumente>]"
+
+#: builtin/hook.c:30
+msgid "silently ignore missing requested <hook-name>"
+msgstr "fehlende Anforderung <Hook-Name> stillschweigend ignorieren"
+
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "Objekt-Typen passen bei %s nicht zusammen"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "konnte erwartetes Objekt %s nicht empfangen"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kann %d Byte nicht lesen"
msgstr[1] "kann %d Bytes nicht lesen"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "zu frühes Dateiende"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "Fehler beim Lesen der Eingabe"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "verwendete mehr Bytes als verfügbar waren"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:754
msgid "pack too large for current definition of off_t"
msgstr "Paket ist zu groß für die aktuelle Definition von off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "Paket überschreitet die maximal erlaubte Größe"
-
-#: builtin/index-pack.c:343
+#: builtin/index-pack.c:329
#, c-format
-msgid "unable to create '%s'"
-msgstr "konnte '%s' nicht erstellen"
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "Paket überschreitet die maximal erlaubte Größe (%s)"
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "Kann Paketdatei '%s' nicht öffnen"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "Paketsignatur stimmt nicht überein"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "Paketversion %<PRIu32> nicht unterstützt"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:380
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:485
#, c-format
msgid "inflate returned %d"
msgstr "Dekomprimierung gab %d zurück"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:534
msgid "offset value overflow for delta base object"
msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:542
msgid "delta base offset is out of bound"
msgstr ""
"Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:550
#, c-format
msgid "unknown object type %d"
msgstr "Unbekannter Objekt-Typ %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:581
msgid "cannot pread pack file"
msgstr "Kann Paketdatei %s nicht lesen"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:583
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte"
msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:609
msgid "serious inflate inconsistency"
msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
+#: builtin/index-pack.c:823 builtin/index-pack.c:832
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
-#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
+#: builtin/index-pack.c:757 builtin/pack-objects.c:290
+#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
#, c-format
msgid "unable to read %s"
msgstr "kann %s nicht lesen"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:821
#, c-format
msgid "cannot read existing object info %s"
msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:829
#, c-format
msgid "cannot read existing object %s"
msgstr "Kann existierendes Objekt %s nicht lesen."
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:843
#, c-format
msgid "invalid blob object %s"
msgstr "ungültiges Blob-Objekt %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:846 builtin/index-pack.c:865
msgid "fsck error in packed object"
msgstr "fsck Fehler in gepacktem Objekt"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:867
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:928 builtin/index-pack.c:975
msgid "failed to apply delta"
msgstr "Konnte Dateiunterschied nicht anwenden"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Empfange Objekte"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Indiziere Objekte"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "kann Paketdatei nicht lesen"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "Paketende enthält nicht verwendbaren Inhalt"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Löse Unterschiede auf"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
#, c-format
msgid "unable to create thread: %s"
msgstr "kann Thread nicht erzeugen: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "Fehler beim Auflösen der Unterschiede"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "abgeschlossen mit %d lokalem Objekt"
msgstr[1] "abgeschlossen mit %d lokalen Objekten"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "unerwartete Prüfsumme für %s (Festplattenfehler?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "Paket hat %d unaufgelösten Unterschied"
msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
@@ -16878,56 +17604,53 @@
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1445
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "Name der Paketdatei '%s' endet nicht mit '.%s'"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "Kann %s Datei '%s' nicht schreiben."
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen."
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1494
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "konnte temporäre Datei '*.%s' nicht zu '%s' umbenennen"
+
+#: builtin/index-pack.c:1519
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "Kann Paketdatei nicht speichern"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "Kann Indexdatei nicht speichern"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1648
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1698
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "kein Unterschied: %d Objekt"
msgstr[1] "kein Unterschied: %d Objekte"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1705
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -16939,33 +17662,25 @@
msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
#, c-format
msgid "bad %s"
msgstr "%s ist ungültig"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "unbekannter Hash-Algorithmus '%s'"
-#: builtin/index-pack.c:1850
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin kann nicht ohne --stdin verwendet werden"
-
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1856
msgid "--stdin requires a git repository"
msgstr "--stdin erfordert ein Git-Repository"
-#: builtin/index-pack.c:1854
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format kann nicht mit --stdin verwendet werden"
-
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1873
msgid "--verify with no packfile name given"
msgstr "--verify wurde ohne Namen der Paketdatei angegeben"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "fsck Fehler beim Packen von Objekten"
@@ -17086,10 +17801,6 @@
msgid "specify the hash algorithm to use"
msgstr "den zu verwendenen Hash-Algorithmus angeben"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir und --bare schließen sich gegenseitig aus"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
@@ -17178,40 +17889,40 @@
msgid "no input file given for in-place editing"
msgstr "keine Datei zur direkten Bearbeitung angegeben"
-#: builtin/log.c:59
+#: builtin/log.c:60
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
-#: builtin/log.c:60
+#: builtin/log.c:61
msgid "git show [<options>] <object>..."
msgstr "git show [<Optionen>] <Objekt>..."
-#: builtin/log.c:113
+#: builtin/log.c:114
#, c-format
msgid "invalid --decorate option: %s"
msgstr "Ungültige Option für --decorate: %s"
-#: builtin/log.c:180
+#: builtin/log.c:181
msgid "show source"
msgstr "Quelle anzeigen"
-#: builtin/log.c:181
+#: builtin/log.c:182
msgid "use mail map file"
msgstr "\"mailmap\"-Datei verwenden"
-#: builtin/log.c:184
+#: builtin/log.c:185
msgid "only decorate refs that match <pattern>"
msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen"
-#: builtin/log.c:186
+#: builtin/log.c:187
msgid "do not decorate refs that match <pattern>"
msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen"
-#: builtin/log.c:187
+#: builtin/log.c:188
msgid "decorate options"
msgstr "decorate-Optionen"
-#: builtin/log.c:190
+#: builtin/log.c:191
msgid ""
"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
@@ -17219,90 +17930,94 @@
"Entwicklung der Zeilen vom Bereich <Start>,<Ende> oder Funktion :"
"<Funktionsname> in <Datei> verfolgen"
-#: builtin/log.c:213
+#: builtin/log.c:214
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<Bereich>:<Datei> kann nicht mit Pfadspezifikation verwendet werden"
-#: builtin/log.c:306
+#: builtin/log.c:322
#, c-format
msgid "Final output: %d %s\n"
msgstr "letzte Ausgabe: %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:429
+msgid "unable to create temporary object directory"
+msgstr "konnte temporäres Objektverzeichnis nicht erstellen"
+
+#: builtin/log.c:599
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ungültige Datei"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:614 builtin/log.c:706
#, c-format
msgid "could not read object %s"
msgstr "Konnte Objekt %s nicht lesen."
-#: builtin/log.c:701
+#: builtin/log.c:731
#, c-format
msgid "unknown type: %d"
msgstr "Unbekannter Typ: %d"
-#: builtin/log.c:846
+#: builtin/log.c:880
#, c-format
msgid "%s: invalid cover from description mode"
msgstr ""
"%s: Ungültiger Modus für Erstellung des Deckblattes aus der Beschreibung"
-#: builtin/log.c:853
+#: builtin/log.c:887
msgid "format.headers without value"
msgstr "format.headers ohne Wert"
-#: builtin/log.c:982
+#: builtin/log.c:1016
#, c-format
msgid "cannot open patch file %s"
msgstr "Kann Patch-Datei %s nicht öffnen"
-#: builtin/log.c:999
+#: builtin/log.c:1033
msgid "need exactly one range"
msgstr "Brauche genau einen Commit-Bereich."
-#: builtin/log.c:1009
+#: builtin/log.c:1043
msgid "not a range"
msgstr "Kein Commit-Bereich."
-#: builtin/log.c:1173
+#: builtin/log.c:1207
msgid "cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
-#: builtin/log.c:1179
+#: builtin/log.c:1213
msgid "failed to create cover-letter file"
msgstr "Fehler beim Erstellen der Datei für das Anschreiben."
-#: builtin/log.c:1266
+#: builtin/log.c:1300
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1327
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1385
msgid "two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
#, c-format
msgid "unknown commit %s"
msgstr "Unbekannter Commit %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-#: builtin/log.c:1522
+#: builtin/log.c:1556
msgid "could not find exact merge base"
msgstr "Konnte keine exakte Merge-Basis finden."
-#: builtin/log.c:1532
+#: builtin/log.c:1566
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"
@@ -17313,295 +18028,282 @@
"'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n"
"Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an."
-#: builtin/log.c:1555
+#: builtin/log.c:1589
msgid "failed to find exact merge base"
msgstr "Fehler beim Finden einer exakten Merge-Basis."
-#: builtin/log.c:1572
+#: builtin/log.c:1606
msgid "base commit should be the ancestor of revision list"
msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
-#: builtin/log.c:1582
+#: builtin/log.c:1616
msgid "base commit shouldn't be in revision list"
msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
-#: builtin/log.c:1640
+#: builtin/log.c:1674
msgid "cannot get patch id"
msgstr "kann Patch-Id nicht lesen"
-#: builtin/log.c:1703
+#: builtin/log.c:1737
msgid "failed to infer range-diff origin of current series"
msgstr "Fehler beim Ableiten des range-diff Ursprungs der aktuellen Serie"
-#: builtin/log.c:1705
+#: builtin/log.c:1739
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "nutze '%s' als range-diff Ursprung der aktuellen Serie"
-#: builtin/log.c:1749
+#: builtin/log.c:1783
msgid "use [PATCH n/m] even with a single patch"
msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
-#: builtin/log.c:1752
+#: builtin/log.c:1786
msgid "use [PATCH] even with multiple patches"
msgstr "[PATCH] auch mit mehreren Patches verwenden"
-#: builtin/log.c:1756
+#: builtin/log.c:1790
msgid "print patches to standard out"
msgstr "Ausgabe der Patches in Standard-Ausgabe"
-#: builtin/log.c:1758
+#: builtin/log.c:1792
msgid "generate a cover letter"
msgstr "ein Deckblatt erzeugen"
-#: builtin/log.c:1760
+#: builtin/log.c:1794
msgid "use simple number sequence for output file names"
msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
-#: builtin/log.c:1761
+#: builtin/log.c:1795
msgid "sfx"
msgstr "Dateiendung"
-#: builtin/log.c:1762
+#: builtin/log.c:1796
msgid "use <sfx> instead of '.patch'"
msgstr "<Dateiendung> statt '.patch' verwenden"
-#: builtin/log.c:1764
+#: builtin/log.c:1798
msgid "start numbering patches at <n> instead of 1"
msgstr "die Nummerierung der Patches bei <n> statt bei 1 beginnen"
-#: builtin/log.c:1765
+#: builtin/log.c:1799
msgid "reroll-count"
msgstr "Reroll-Anzahl"
-#: builtin/log.c:1766
+#: builtin/log.c:1800
msgid "mark the series as Nth re-roll"
msgstr "die Serie als n-te Fassung kennzeichnen"
-#: builtin/log.c:1768
+#: builtin/log.c:1802
msgid "max length of output filename"
msgstr "maximale Länge des Dateinamens für die Ausgabe"
-#: builtin/log.c:1770
+#: builtin/log.c:1804
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "[RFC PATCH] statt [PATCH] verwenden"
-#: builtin/log.c:1773
+#: builtin/log.c:1807
msgid "cover-from-description-mode"
msgstr "Modus für Erstellung des Deckblattes aus der Beschreibung"
-#: builtin/log.c:1774
+#: builtin/log.c:1808
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
"Erzeuge Teile des Deckblattes basierend auf der Beschreibung des Branches"
-#: builtin/log.c:1776
+#: builtin/log.c:1810
msgid "use [<prefix>] instead of [PATCH]"
msgstr "nutze [<Präfix>] statt [PATCH]"
-#: builtin/log.c:1779
+#: builtin/log.c:1813
msgid "store resulting files in <dir>"
msgstr "erzeugte Dateien in <Verzeichnis> speichern"
-#: builtin/log.c:1782
+#: builtin/log.c:1816
msgid "don't strip/add [PATCH]"
msgstr "[PATCH] nicht entfernen/hinzufügen"
-#: builtin/log.c:1785
+#: builtin/log.c:1819
msgid "don't output binary diffs"
msgstr "keine binären Unterschiede ausgeben"
-#: builtin/log.c:1787
+#: builtin/log.c:1821
msgid "output all-zero hash in From header"
msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
-#: builtin/log.c:1789
+#: builtin/log.c:1823
msgid "don't include a patch matching a commit upstream"
msgstr ""
"keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen"
-#: builtin/log.c:1791
+#: builtin/log.c:1825
msgid "show patch format instead of default (patch + stat)"
msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
-#: builtin/log.c:1793
+#: builtin/log.c:1827
msgid "Messaging"
msgstr "E-Mail-Einstellungen"
-#: builtin/log.c:1794
+#: builtin/log.c:1828
msgid "header"
msgstr "Header"
-#: builtin/log.c:1795
+#: builtin/log.c:1829
msgid "add email header"
msgstr "E-Mail-Header hinzufügen"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1830 builtin/log.c:1831
msgid "email"
msgstr "E-Mail"
-#: builtin/log.c:1796
+#: builtin/log.c:1830
msgid "add To: header"
msgstr "\"To:\"-Header hinzufügen"
-#: builtin/log.c:1797
+#: builtin/log.c:1831
msgid "add Cc: header"
msgstr "\"Cc:\"-Header hinzufügen"
-#: builtin/log.c:1798
+#: builtin/log.c:1832
msgid "ident"
msgstr "Ident"
-#: builtin/log.c:1799
+#: builtin/log.c:1833
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn "
"fehlend)"
-#: builtin/log.c:1801
+#: builtin/log.c:1835
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1802
+#: builtin/log.c:1836
msgid "make first mail a reply to <message-id>"
msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1837 builtin/log.c:1840
msgid "boundary"
msgstr "Grenze"
-#: builtin/log.c:1804
+#: builtin/log.c:1838
msgid "attach the patch"
msgstr "den Patch anhängen"
-#: builtin/log.c:1807
+#: builtin/log.c:1841
msgid "inline the patch"
msgstr "den Patch direkt in die Nachricht einfügen"
-#: builtin/log.c:1811
+#: builtin/log.c:1845
msgid "enable message threading, styles: shallow, deep"
msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
-#: builtin/log.c:1813
+#: builtin/log.c:1847
msgid "signature"
msgstr "Signatur"
-#: builtin/log.c:1814
+#: builtin/log.c:1848
msgid "add a signature"
msgstr "eine Signatur hinzufügen"
-#: builtin/log.c:1815
+#: builtin/log.c:1849
msgid "base-commit"
msgstr "Basis-Commit"
-#: builtin/log.c:1816
+#: builtin/log.c:1850
msgid "add prerequisite tree info to the patch series"
msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
-#: builtin/log.c:1819
+#: builtin/log.c:1853
msgid "add a signature from a file"
msgstr "eine Signatur aus einer Datei hinzufügen"
-#: builtin/log.c:1820
+#: builtin/log.c:1854
msgid "don't print the patch filenames"
msgstr "keine Dateinamen der Patches anzeigen"
-#: builtin/log.c:1822
+#: builtin/log.c:1856
msgid "show progress while generating patches"
msgstr "Forschrittsanzeige während der Erzeugung der Patches"
-#: builtin/log.c:1824
+#: builtin/log.c:1858
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"Änderungen gegenüber <Commit> im Deckblatt oder einzelnem Patch anzeigen"
-#: builtin/log.c:1827
+#: builtin/log.c:1861
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"Änderungen gegenüber <Refspec> im Deckblatt oder einzelnem Patch anzeigen"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1863 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
-#: builtin/log.c:1916
+#: builtin/log.c:1953
#, c-format
msgid "invalid ident line: %s"
msgstr "Ungültige Identifikationszeile: %s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n und -k schließen sich gegenseitig aus"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1978
msgid "--name-only does not make sense"
msgstr "--name-only kann nicht verwendet werden"
-#: builtin/log.c:1943
+#: builtin/log.c:1980
msgid "--name-status does not make sense"
msgstr "--name-status kann nicht verwendet werden"
-#: builtin/log.c:1945
+#: builtin/log.c:1982
msgid "--check does not make sense"
msgstr "--check kann nicht verwendet werden"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-"--stdout, --output und --output-directory schließen sich gegenseitig aus"
+#: builtin/log.c:1984
+msgid "--remerge-diff does not make sense"
+msgstr "--remerge-diff ist nicht sinnvoll"
-#: builtin/log.c:2089
+#: builtin/log.c:2129
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch"
-#: builtin/log.c:2093
+#: builtin/log.c:2133
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:2094
+#: builtin/log.c:2134
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff gegen v%d:"
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor erfordert --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2144
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch."
-#: builtin/log.c:2112
+#: builtin/log.c:2152
msgid "Range-diff:"
msgstr "Range-Diff:"
-#: builtin/log.c:2113
+#: builtin/log.c:2153
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-Diff gegen v%d:"
-#: builtin/log.c:2124
+#: builtin/log.c:2164
#, c-format
msgid "unable to read signature file '%s'"
msgstr "Konnte Signatur-Datei '%s' nicht lesen"
-#: builtin/log.c:2160
+#: builtin/log.c:2200
msgid "Generating patches"
msgstr "Erzeuge Patches"
-#: builtin/log.c:2204
+#: builtin/log.c:2244
msgid "failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
-#: builtin/log.c:2263
+#: builtin/log.c:2304
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2358
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17609,134 +18311,138 @@
"Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
"manuell an.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<Optionen>] [<Datei>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "Pfade durch NUL-Zeichen trennen"
+
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "den Dateistatus mit Tags anzeigen"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "Kleinbuchstaben für 'fsmonitor clean' Dateien verwenden"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "entfernte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "geänderte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "sonstige Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "ignorierte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr ""
"Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe "
"anzeigen"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "Zeilenenden von Dateien anzeigen"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "keine leeren Verzeichnisse anzeigen"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "'resolve-undo' Informationen anzeigen"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "Dateien auslassen, die einem Muster entsprechen"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "Muster, gelesen von <Datei>, ausschließen"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "Ausschlussmuster aus <Datei> lesen"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "Ausgabe relativ zum Projektverzeichnis"
-#: builtin/ls-files.c:666
-msgid "recurse through submodules"
-msgstr "Rekursion in Submodulen durchführen"
-
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr "als Fehler behandeln, wenn sich eine <Datei> nicht im Index befindet"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "Commit-Referenz"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch "
"vorhanden sind"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "Ausgaben zur Fehlersuche anzeigen"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "doppelte Einträge unterdrücken"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "zeige partielle Verzeichnisse, wenn ein partieller Index vorhanden ist"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<Programm>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<Repository> [<Referenzen>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<Repository> [<Referenzen>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "URL des Remote-Repositories nicht ausgeben"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
msgid "exec"
msgstr "Programm"
@@ -17770,44 +18476,73 @@
msgid "show underlying ref in addition to the object pointed by it"
msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen"
-#: builtin/ls-tree.c:30
+#: builtin/ls-tree.c:36
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<Optionen>] <Commit-Referenz> [<Pfad>...]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:54
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "konnte Objekt-Informationen über '%s' nicht bestimmen"
+
+#: builtin/ls-tree.c:79
+#, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "ungültiges ls-tree-Format: Element '%s' fängt nicht mit '(' an"
+
+#: builtin/ls-tree.c:83
+#, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "ungültiges ls-tree-Format: Element '%s' endet nicht mit ')'"
+
+#: builtin/ls-tree.c:109
+#, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr "ungültiges ls-tree-Format: %%%.*s"
+
+#: builtin/ls-tree.c:336
msgid "only show trees"
msgstr "nur Verzeichnisse anzeigen"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:338
msgid "recurse into subtrees"
msgstr "Rekursion in Unterverzeichnissen durchführen"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:340
msgid "show trees when recursing"
msgstr "Verzeichnisse bei Rekursion anzeigen"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:343
msgid "terminate entries with NUL byte"
msgstr "Einträge mit NUL-Byte abschließen"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:344
msgid "include object size"
msgstr "Objektgröße einschließen"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
msgid "list only filenames"
msgstr "nur Dateinamen auflisten"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:350
+msgid "list only objects"
+msgstr "nur Objekte auflisten"
+
+#: builtin/ls-tree.c:353
msgid "use full path names"
msgstr "vollständige Pfadnamen verwenden"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:355
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"das gesamte Verzeichnis auflisten; nicht nur das aktuelle Verzeichnis "
"(impliziert --full-name)"
+#: builtin/ls-tree.c:391
+msgid "--format can't be combined with other format-altering options"
+msgstr ""
+"--format kann nicht mit anderen formatändernden Optionen kombiniert werden"
+
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
@@ -17857,7 +18592,11 @@
msgid "use headers in message's body"
msgstr "nutze Header im Inhalt der Nachricht"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:227
+msgid "reading patches from stdin/tty..."
+msgstr "lese Patches von Standard-Eingabe/Terminal..."
+
+#: builtin/mailsplit.c:242
#, c-format
msgid "empty mbox: '%s'"
msgstr "Leere mbox: '%s'"
@@ -17882,23 +18621,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <Referenz> [<Commit>]"
-#: builtin/merge-base.c:143
+#: builtin/merge-base.c:144
msgid "output all common ancestors"
msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits"
-#: builtin/merge-base.c:145
+#: builtin/merge-base.c:146
msgid "find ancestors for a single n-way merge"
msgstr "Vorgänger-Commits für einen einzelnen n-Wege-Merge finden"
-#: builtin/merge-base.c:147
+#: builtin/merge-base.c:148
msgid "list revs not reachable from others"
msgstr "Commits auflisten, die nicht durch Andere erreichbar sind"
-#: builtin/merge-base.c:149
+#: builtin/merge-base.c:150
msgid "is the first one ancestor of the other?"
msgstr "ist der Erste ein Vorgänger-Commit des Anderen?"
-#: builtin/merge-base.c:151
+#: builtin/merge-base.c:152
msgid "find where <commit> forked from reflog of <ref>"
msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde"
@@ -17919,26 +18658,30 @@
msgstr "einen diff3 basierten Merge verwenden"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "einen eifrigen diff3 basierten Merge verwenden"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "bei Konflikten unsere Variante verwenden"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "bei Konflikten ihre Variante verwenden"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "bei Konflikten eine gemeinsame Variante verwenden"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "bei Konflikten diese Kennzeichnungslänge verwenden"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "keine Warnung bei Konflikten"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen"
@@ -17973,186 +18716,190 @@
msgid "Merging %s with %s\n"
msgstr "Führe %s mit %s zusammen\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<Optionen>] [<Commit>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
-msgstr "Schalter 'm' erfordert einen Wert."
+msgstr "Schalter `m' erfordert einen Wert."
-#: builtin/merge.c:146
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "Option `%s' erfordert einen Wert."
-#: builtin/merge.c:199
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Verfügbare Strategien sind:"
-#: builtin/merge.c:205
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Verfügbare benutzerdefinierte Strategien sind:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(Synonym für --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits "
"hinzufügen"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "einen einzelnen Commit erzeugen statt einen Merge durchzuführen"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "Bearbeitung der Beschreibung vor dem Commit"
-#: builtin/merge.c:271
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "Vorspulen erlauben (Standard)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "abbrechen, wenn kein Vorspulen möglich ist"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1145 builtin/revert.c:114
msgid "strategy"
msgstr "Strategie"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "zu verwendende Merge-Strategie"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "Option=Wert"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "Option für ausgewählte Merge-Strategie"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "<Name> statt echtem Ziel verwenden"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge abbrechen"
-#: builtin/merge.c:292
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen"
-#: builtin/merge.c:294
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge fortsetzen"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
-#: builtin/merge.c:303
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "Hooks pre-merge-commit und commit-msg umgehen"
-#: builtin/merge.c:320
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "Konnte \"stash\" nicht ausführen."
-#: builtin/merge.c:325
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "\"stash\" fehlgeschlagen"
-#: builtin/merge.c:330
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "kein gültiges Objekt: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "read-tree fehlgeschlagen"
-#: builtin/merge.c:400
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "Bereits auf dem neuesten Stand. (nichts für Squash-Merge vorhanden)"
-#: builtin/merge.c:414
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Squash Commit -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' zeigt auf keinen Commit"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Ungültiger branch.%s.mergeoptions String: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "Es wird nur der Merge von zwei Branches behandelt."
-#: builtin/merge.c:742
+#: builtin/merge.c:745
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Unbekannte Option für merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "unbekannte Strategie-Option: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "konnte %s nicht schreiben"
-#: builtin/merge.c:813
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "konnte nicht von '%s' lesen"
-#: builtin/merge.c:822
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge "
"abzuschließen.\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:831
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"
@@ -18163,11 +18910,11 @@
"Upstream-Branch mit einem Thema-Branch zusammenführt.\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18176,75 +18923,75 @@
"Zeilen, die mit '%c' beginnen, werden ignoriert,\n"
"und eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:900
msgid "Empty commit message."
msgstr "Leere Commit-Beschreibung"
-#: builtin/merge.c:904
+#: builtin/merge.c:915
#, c-format
msgid "Wonderful.\n"
msgstr "Wunderbar.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:976
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen "
"Sie dann das Ergebnis.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1015
msgid "No current branch."
msgstr "Sie befinden sich auf keinem Branch."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1017
msgid "No remote for the current branch."
msgstr "Kein Remote-Repository für den aktuellen Branch."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1019
msgid "No default upstream defined for the current branch."
msgstr ""
"Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1024
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Kein Remote-Tracking-Branch für %s von %s"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1081
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1183
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "nichts was wir in %s zusammenführen können: %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1217
msgid "not something we can merge"
msgstr "nichts was wir zusammenführen können"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1330
msgid "--abort expects no arguments"
msgstr "--abort akzeptiert keine Argumente"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1334
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1352
msgid "--quit expects no arguments"
msgstr "--quit erwartet keine Argumente"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1365
msgid "--continue expects no arguments"
msgstr "--continue erwartet keine Argumente"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1369
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1385
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18252,7 +18999,7 @@
"Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1392
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18260,100 +19007,84 @@
"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1395
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)."
-#: builtin/merge.c:1396
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Sie können --squash nicht mit --no-ff kombinieren."
-
-#: builtin/merge.c:1398
-msgid "You cannot combine --squash with --commit."
-msgstr "Sie können --squash nicht mit --commit kombinieren."
-
-#: builtin/merge.c:1414
+#: builtin/merge.c:1427
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
-#: builtin/merge.c:1431
+#: builtin/merge.c:1444
msgid "Squash commit into empty head not supported yet"
msgstr "Squash-Merge auf einen leeren Branch wird noch nicht unterstützt"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1446
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet "
"werden."
-#: builtin/merge.c:1438
+#: builtin/merge.c:1451
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nichts was wir zusammenführen können"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1453
msgid "Can merge only exactly one commit into empty head"
msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1540
msgid "refusing to merge unrelated histories"
msgstr "verweigere den Merge von nicht zusammenhängenden Historien"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1559
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aktualisiere %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1606
#, c-format
msgid "Trying really trivial in-index merge...\n"
-msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
+msgstr "Probiere wirklich trivialen \"in-index\"-Merge...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1613
#, c-format
msgid "Nope.\n"
msgstr "Nein.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "Vorspulen nicht möglich, breche ab."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1671 builtin/merge.c:1737
#, c-format
msgid "Rewinding the tree to pristine...\n"
-msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
+msgstr "Rücklauf des Verzeichnisses bis zum Ursprung...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1675
#, c-format
msgid "Trying merge strategy %s...\n"
-msgstr "Probiere Merge-Strategie %s ...\n"
+msgstr "Probiere Merge-Strategie %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1727
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1729
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1739
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Benutze die Strategie %s, um die Auflösung per Hand vorzubereiten.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1753
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"Automatischer Merge abgeschlossen; halte, wie gewünscht, vor dem Commit an\n"
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr "git mktag"
-
#: builtin/mktag.c:27
#, c-format
msgid "warning: tag input does not pass fsck: %s"
@@ -18392,10 +19123,6 @@
msgid "unable to write tag file"
msgstr "konnte Tag-Datei nicht schreiben"
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
-
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "Eingabe ist durch NUL-Zeichen abgeschlossen"
@@ -18409,47 +19136,58 @@
msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<Optionen>] write [--preferred-pack=<Paket>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<Optionen>] write [--preferred-pack=<Paket>][--refs-"
+"snapshot=<Pfad>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<Optionen>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<Optionen>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<Optionen>] repack [--batch-size=<Größe>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"Objekt-Verzeichnis, welches Paare von Packdateien und pack-index enthält"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "bevorzugtes Paket"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr ""
"Paket für die Wiederbenutzung, wenn eine Multi-Pack Bitmap berechnet wird"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "schreibe Multi-Pack-Bitmap"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "Multi-Pack-Index schreiben, der nur die gegebenen Indexe enthält"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "Referenzen-Snapshot, um Bitmap-Commits auszuwählen"
+
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr ""
-"Während des Umpackens, sammle Paket-Dateien von geringerer Größe in "
-"einenStapel, welcher größer ist als diese Größe"
-
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "Nicht erkannter Unterbefehl: %s"
+"während des Umpackens, sammle Paket-Dateien von geringerer Größe in einen "
+"Stapel, welcher größer ist als diese Größe"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
@@ -18480,117 +19218,121 @@
msgid "skip move/rename errors"
msgstr "Fehler beim Verschieben oder Umbenennen überspringen"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "Ziel '%s' ist kein Verzeichnis"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Prüfe Umbenennung von '%s' nach '%s'\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "ungültige Quelle"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "kann Verzeichnis nicht in sich selbst verschieben"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "kann Verzeichnis nicht über Datei verschieben"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "Quellverzeichnis ist leer"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "nicht unter Versionskontrolle"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "in Konflikt"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "Ziel existiert bereits"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "überschreibe '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Kann nicht überschreiben"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "mehrere Quellen für dasselbe Ziel"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "Zielverzeichnis existiert nicht"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, Quelle=%s, Ziel=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Benenne %s nach %s um\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
#, c-format
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:524
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<Optionen>] <Commit>..."
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:525
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<Optionen>] --all"
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<Optionen>] --stdin"
+#: builtin/name-rev.c:526
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [<Optionen>] --annotate-stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:583
msgid "print only ref-based names (no object names)"
msgstr "nur Referenzen-basierte Namen ausgeben (keine Objektnamen)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:584
msgid "only use tags to name the commits"
msgstr "nur Tags verwenden, um die Commits zu benennen"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:586
msgid "only use refs matching <pattern>"
msgstr "nur Referenzen verwenden, die <Muster> entsprechen"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:588
msgid "ignore refs matching <pattern>"
msgstr "ignoriere Referenzen die <Muster> entsprechen"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:590
msgid "list all commits reachable from all refs"
msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
-#: builtin/name-rev.c:532
-msgid "read from stdin"
-msgstr "von der Standard-Eingabe lesen"
+#: builtin/name-rev.c:591
+msgid "deprecated: use annotate-stdin instead"
+msgstr "veraltet: benutzen Sie stattdessen annotate-stdin"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:592
+msgid "annotate text from stdin"
+msgstr "annotiere Text von der Standard-Eingabe"
+
+#: builtin/name-rev.c:593
msgid "allow to print `undefined` names (default)"
msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:599
msgid "dereference tags in the input (internal use)"
msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
@@ -18634,14 +19376,6 @@
"git notes [--ref <Notiz-Referenz>] merge [-v | -q] [-s <Strategie>] <Notiz-"
"Referenz>"
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
-
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <Notiz-Referenz>] remove [<Objekt>...]"
@@ -18702,70 +19436,66 @@
msgid "git notes prune [<options>]"
msgstr "git notes prune [<Optionen>]"
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "Schreiben/Bearbeiten der Notizen für das folgende Objekt:"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "konnte 'show' für Objekt '%s' nicht starten"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "Konnte Ausgabe von 'show' nicht lesen."
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "konnte 'show' für Objekt '%s' nicht abschließen"
-#: builtin/notes.c:197
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr ""
"Bitte liefern Sie die Notiz-Inhalte unter Verwendung der Option -m oder -F."
-#: builtin/notes.c:206
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "Konnte Notiz-Objekt nicht schreiben"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "Die Notiz-Inhalte wurden in %s belassen."
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:582
#, c-format
msgid "could not open or read '%s'"
msgstr "konnte '%s' nicht öffnen oder lesen"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "Fehler beim Lesen des Objektes '%s'."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "Fehlerhafte Eingabezeile: '%s'."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
@@ -18773,50 +19503,43 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
"Ausführung von %s auf Notizen in %s (außerhalb von refs/notes/) "
"zurückgewiesen"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
-msgid "too many arguments"
-msgstr "Zu viele Argumente."
-
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "Keine Notiz für Objekt %s gefunden."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "Notizinhalte als Zeichenkette"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "Notizinhalte in einer Datei"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "Wiederverwendung des angegebenen Notiz-Objektes"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "Speichern leerer Notiz erlauben"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "existierende Notizen ersetzen"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18825,31 +19548,31 @@
"Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s "
"gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Überschreibe existierende Notizen für Objekt %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "Entferne Notiz für Objekt %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "Objekte von der Standard-Eingabe lesen"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"Konfiguration für <Befehl> zum Umschreiben von Commits laden (impliziert --"
"stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "zu wenige Argumente"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18858,12 +19581,12 @@
"Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. "
"Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18872,52 +19595,52 @@
"Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n"
"Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'."
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "Fehler beim Auflösen von NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "Fehler beim Abschließen der Zusammenführung der Notizen."
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "unbekannte Merge-Strategie '%s' für Notizen"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Allgemeine Optionen"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Merge-Optionen"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18925,49 +19648,49 @@
"löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "nicht zusammengeführte Notizen eintragen"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen "
"committet werden"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "Merge von Notizen abbrechen"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren."
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben."
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "Unbekannter Wert für -s/--strategy: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"Fehler beim Speichern der Verknüpfung zur aktuellen Notes-Referenz (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18979,41 +19702,41 @@
"commit',\n"
"oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:595
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-#: builtin/notes.c:900
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "Objekt %s hat keine Notiz\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler"
-#: builtin/notes.c:915
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "Objektnamen von der Standard-Eingabe lesen"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "nicht löschen, nur anzeigen"
-#: builtin/notes.c:955
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "gelöschte Notizen melden"
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "Notiz-Referenz"
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "Notizen von <Notiz-Referenz> verwenden"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1036 builtin/stash.c:1802
#, c-format
msgid "unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
@@ -19032,7 +19755,7 @@
"git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
"<Objektliste>]"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:570
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -19041,111 +19764,115 @@
"write_reuse_object: konnte %s nicht finden, erwartet bei Offset %<PRIuMAX> "
"in Paket %s"
-#: builtin/pack-objects.c:580
+#: builtin/pack-objects.c:578
#, c-format
msgid "bad packed object CRC for %s"
msgstr "Ungültiges CRC für gepacktes Objekt %s."
-#: builtin/pack-objects.c:591
+#: builtin/pack-objects.c:589
#, c-format
msgid "corrupt packed object for %s"
msgstr "Fehlerhaftes gepacktes Objekt für %s."
-#: builtin/pack-objects.c:722
+#: builtin/pack-objects.c:720
#, c-format
msgid "recursive delta detected for object %s"
msgstr "Rekursiver Unterschied für Objekt %s festgestellt."
-#: builtin/pack-objects.c:941
+#: builtin/pack-objects.c:939
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u Objekte geordnet, %<PRIu32> erwartet."
-#: builtin/pack-objects.c:1036
+#: builtin/pack-objects.c:1034
#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "Objekt beim Offset %<PRIuMAX> in Paket %s erwartet"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1158
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n"
"aufgetrennt."
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1171
msgid "Writing objects"
msgstr "Schreibe Objekte"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1243 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "Konnte '%s' nicht lesen"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1276
+msgid "failed to write bitmap index"
+msgstr "Fehler beim Schreiben des Bitmap-Index"
+
+#: builtin/pack-objects.c:1302
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren."
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1544
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-"
"Datei\n"
"geschrieben wurden."
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1992
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "\"delta base offset\" Überlauf in Paket für %s"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:2001
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "\"delta base offset\" liegt außerhalb des gültigen Bereichs für %s"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2282
msgid "Counting objects"
msgstr "Zähle Objekte"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2447
#, c-format
msgid "unable to parse object header of %s"
msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen."
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
+#: builtin/pack-objects.c:2543
#, c-format
msgid "object %s cannot be read"
msgstr "Objekt %s kann nicht gelesen werden."
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "Inkonsistente Objektlänge bei Objekt %s (%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2557
msgid "suboptimal pack - out of memory"
msgstr "ungünstiges Packet - Speicher voll"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2872
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Delta-Kompression verwendet bis zu %d Threads."
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3011
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "Konnte keine Objekte packen, die von Tag %s erreichbar sind."
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3097
msgid "Compressing objects"
msgstr "Komprimiere Objekte"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3103
msgid "inconsistency with delta count"
msgstr "Inkonsistenz mit der Anzahl von Deltas"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3182
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19154,7 +19881,7 @@
"Wert für uploadpack.blobpackfileuri muss in der Form '<Objekt-Hash> <Pack-"
"Hash> <URI>' vorliegen ('%s' erhalten)"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3185
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19162,17 +19889,18 @@
"Objekt bereits in einem anderen uploadpack.blobpackfileuri konfiguriert "
"('%s' erhalten)"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3220
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "konnte Typ von Objekt %s in Paket %s nicht bestimmen"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
+#: builtin/pack-objects.c:3373
#, c-format
msgid "could not find pack '%s'"
msgstr "Konnte Paket '%s' nicht finden"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3416
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -19181,7 +19909,7 @@
"erwartete Randobjekt-ID, erhielt nutzlose Daten:\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3422
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -19190,263 +19918,255 @@
"erwartete Objekt-ID, erhielt nutzlose Daten:\n"
" %s"
-#: builtin/pack-objects.c:3482
-msgid "invalid value for --missing"
-msgstr "ungültiger Wert für --missing"
-
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
msgid "cannot open pack index"
msgstr "kann Paketindex nicht öffnen"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3549
#, c-format
msgid "loose object at %s could not be examined"
msgstr "loses Objekt bei %s konnte nicht untersucht werden"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3635
msgid "unable to force loose object"
msgstr "konnte loses Objekt nicht erzwingen"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3763
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' ist kein Commit"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "ungültiger Commit '%s'"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3794
msgid "unable to add recent objects"
msgstr "konnte neuere Objekte nicht hinzufügen"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3847
#, c-format
msgid "unsupported index version %s"
msgstr "nicht unterstützte Index-Version %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3851
#, c-format
msgid "bad index version '%s'"
msgstr "ungültige Index-Version '%s'"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3907
msgid "<version>[,<offset>]"
msgstr "<Version>[,<Offset>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3908
msgid "write the pack index file in the specified idx format version"
msgstr ""
"die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3911
msgid "maximum size of each output pack file"
msgstr "maximale Größe für jede ausgegebene Paketdatei"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3913
msgid "ignore borrowed objects from alternate object store"
msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3915
msgid "ignore packed objects"
msgstr "gepackte Objekte ignorieren"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3917
msgid "limit pack window by objects"
msgstr "Paketfenster durch Objekte begrenzen"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3919
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3921
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"maximale Länge der erlaubten Differenzverkettung im resultierenden Paket"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3923
msgid "reuse existing deltas"
msgstr "existierende Unterschiede wiederverwenden"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3925
msgid "reuse existing objects"
msgstr "existierende Objekte wiederverwenden"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3927
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA Objekte verwenden"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3929
msgid "use threads when searching for best delta matches"
msgstr ""
"Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden "
"verwenden"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3931
msgid "do not create an empty pack output"
msgstr "keine leeren Pakete erzeugen"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3933
msgid "read revision arguments from standard input"
msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3935
msgid "limit the objects to those that are not yet packed"
msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3938
msgid "include objects reachable from any reference"
msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3941
msgid "include objects referred by reflog entries"
msgstr ""
"Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3944
msgid "include objects referred to by the index"
msgstr "Objekte einschließen, die vom Index referenziert werden"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3947
msgid "read packs from stdin"
msgstr "Pakete von der Standard-Eingabe lesen"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3949
msgid "output pack to stdout"
msgstr "Paket in die Standard-Ausgabe schreiben"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3951
msgid "include tag objects that refer to objects to be packed"
msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3953
msgid "keep unreachable objects"
msgstr "nicht erreichbare Objekte behalten"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3955
msgid "pack loose unreachable objects"
msgstr "nicht erreichbare lose Objekte packen"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3957
msgid "unpack unreachable objects newer than <time>"
msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3960
msgid "use the sparse reachability algorithm"
msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3962
msgid "create thin packs"
msgstr "dünnere Pakete erzeugen"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3964
msgid "create packs suitable for shallow fetches"
msgstr ""
"Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3966
msgid "ignore packs that have companion .keep file"
msgstr "Pakete ignorieren, die .keep Dateien haben"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3968
msgid "ignore this pack"
msgstr "dieses Paket ignorieren"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3970
msgid "pack compression level"
msgstr "Komprimierungsgrad für Paketierung"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3972
msgid "do not hide commits by grafts"
msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3974
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3976
msgid "write a bitmap index together with the pack index"
msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3980
msgid "write a bitmap index if possible"
msgstr "Bitmap-Index schreiben, wenn möglich"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3984
msgid "handling for missing objects"
msgstr "Behandlung für fehlende Objekte"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3987
msgid "do not pack objects in promisor packfiles"
msgstr ""
"keine Objekte aus Packdateien von partiell geklonten Remote-Repositories "
"packen"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3989
msgid "respect islands during delta compression"
msgstr "Delta-Islands bei Delta-Kompression beachten"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3991
msgid "protocol"
msgstr "Protokoll"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3992
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
"jegliche konfigurierte uploadpack.blobpackfileuri für dieses Protkoll "
"ausschließen"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4027
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "Tiefe für Verkettung von Unterschieden %d ist zu tief, erzwinge %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4032
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4088
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size kann nicht für die Erstellung eines Pakets für eine "
"Übertragung\n"
"benutzt werden."
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4090
msgid "minimum pack size limit is 1 MiB"
msgstr "Minimales Limit für die Paketgröße ist 1 MiB."
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4095
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
"--thin kann nicht benutzt werden, um ein indizierbares Paket zu erstellen."
#: builtin/pack-objects.c:4104
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel"
-
-#: builtin/pack-objects.c:4110
msgid "cannot use --filter without --stdout"
msgstr "Kann --filter nicht ohne --stdout benutzen."
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4106
msgid "cannot use --filter with --stdin-packs"
msgstr "kann --filter nicht mit --stdin-packs benutzen"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4110
msgid "cannot use internal rev list with --stdin-packs"
msgstr ""
"interne Commit-Liste kann nicht gemeinsam mit --stdin-packs verwendet werden"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4169
msgid "Enumerating objects"
msgstr "Objekte aufzählen"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4210
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19482,79 +20202,69 @@
msgid "prune loose refs (default)"
msgstr "lose Referenzen entfernen (Standard)"
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <Zeit>] [--] [<Branch>...]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "gelöschte Objekte melden"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "Objekte älter als <Zeit> verfallen lassen"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
"Traversierung auf Objekte außerhalb von Packdateien aus partiell geklonten "
"Remote-Repositories einschränken"
-#: builtin/prune.c:152
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Ungültiger Wert für %s: %s"
-
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Optionen bezogen auf Merge"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "Integration von Änderungen durch Rebase statt Merge"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "Vorspulen erlauben"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "Benutzung der pre-merge-commit und commit-msg Hooks kontrollieren"
+
+#: builtin/pull.c:171 parse-options.h:371
msgid "automatically stash/stash pop before and after"
msgstr "automatischer Stash/Stash-Pop davor und danach"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Optionen bezogen auf Fetch"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "das Überschreiben von lokalen Branches erzwingen"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
-#: builtin/pull.c:317
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "Ungültiger Wert für pull.ff: %s"
-
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -19562,14 +20272,14 @@
"Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
"angefordert wurden."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben "
"angefordert wurden."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19577,7 +20287,7 @@
"Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
"haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19589,38 +20299,39 @@
"Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
"der Befehlszeile angeben."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:978
msgid "You are not currently on a branch."
msgstr "Im Moment auf keinem Branch."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr ""
"Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen "
"möchten."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Siehe git-pull(1) für weitere Details."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:984
msgid "<remote>"
msgstr "<Remote-Repository>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:374
msgid "<branch>"
msgstr "<Branch>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:976
msgid "There is no tracking information for the current branch."
msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
@@ -19628,7 +20339,7 @@
"Sie\n"
"dies tun mit:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19638,22 +20349,22 @@
"des Remote-Repositories durchzuführen, aber diese Referenz\n"
"wurde nicht angefordert."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "Konnte nicht auf Commit '%s' zugreifen."
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "Ignoriere --verify-signatures für Rebase"
-#: builtin/pull.c:930
+#: builtin/pull.c:969
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
@@ -19663,12 +20374,12 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Es wird davon abgeraten zu Pullen, ohne anzugeben, wie mit abweichenden\n"
-"Branches umgegangen werden soll. Sie können diese Nachricht unterdrücken,\n"
-"indem Sie einen der folgenden Befehle ausführen, bevor der nächste Pull\n"
-"ausgeführt wird:\n"
+"Sie haben abweichende Branches und müssen angeben, wie mit diesen\n"
+"umgegangen werden soll.\n"
+"Sie können dies tun, indem Sie einen der folgenden Befehle vor dem\n"
+"nächsten Pull ausführen:\n"
"\n"
-" git config pull.rebase false # Merge (Standard-Strategie)\n"
+" git config pull.rebase false # Merge\n"
" git config pull.rebase true # Rebase\n"
" git config pull.ff only # ausschließlich Vorspulen\n"
"\n"
@@ -19677,21 +20388,21 @@
"Option --rebase, --no-rebase oder --ff-only auf der Kommandozeile nutzen,\n"
"um das konfigurierte Standardverhalten pro Aufruf zu überschreiben.\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1047
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit "
"vorgemerkt sind."
-#: builtin/pull.c:994
+#: builtin/pull.c:1051
msgid "pull with rebase"
msgstr "Pull mit Rebase"
-#: builtin/pull.c:995
+#: builtin/pull.c:1052
msgid "please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1077
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19701,7 +20412,7 @@
"\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
"Spule Ihr Arbeitsverzeichnis von Commit %s vor."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1083
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19718,15 +20429,25 @@
"$ git reset --hard\n"
"zur Wiederherstellung aus."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1098
msgid "Cannot merge multiple branches into empty head."
msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1103
msgid "Cannot rebase onto multiple branches."
msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1105
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Kann nicht zu mehreren Branches vorspulen."
+
+#: builtin/pull.c:1120
+msgid "Need to specify how to reconcile divergent branches."
+msgstr ""
+"Es muss angegeben werden, wie mit abweichenden Branches umgegangen werden "
+"sollen."
+
+#: builtin/pull.c:1134
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
@@ -19917,15 +20638,15 @@
msgid "failed to push some refs to '%s'"
msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3377
msgid "repository"
msgstr "Repository"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "alle Referenzen versenden"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "alle Referenzen spiegeln"
@@ -19937,19 +20658,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "Aktualisierung erzwingen"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<Referenzname>:<Erwartungswert>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "Aktualisierungen des Remote müssen lokal integriert werden"
@@ -19957,12 +20678,12 @@
msgid "control recursive pushing of submodules"
msgstr "rekursiven \"push\" von Submodulen steuern"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "kleinere Pakete verwenden"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "'receive pack' Programm"
@@ -19982,18 +20703,14 @@
msgid "push missing but relevant tags"
msgstr "fehlende, aber relevante Tags versenden"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "signiert \"push\" mit GPG"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "Referenzen atomar versenden"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete ist inkompatibel mit --all, --mirror und --tags"
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kann nur mit Referenzen verwendet werden"
@@ -20025,26 +20742,14 @@
"\n"
" git push <Name>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all und --tags sind inkompatibel"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all kann nicht mit Refspecs kombiniert werden"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror und --tags sind inkompatibel"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kann nicht mit Refspecs kombiniert werden"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all und --mirror sind inkompatibel"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben"
@@ -20099,87 +20804,86 @@
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<Präfix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> "
-"[<Commit-Referenz3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<Datei>] (--empty | "
+"<Commit-Referenz1> [<Commit-Referenz2> [<Commit-Referenz3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "resultierenden Index nach <Datei> schreiben"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "nur den Index leeren"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Merge"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "einen Merge, zusätzlich zum Lesen, ausführen"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "3-Wege-Merge, wenn kein Merge auf Dateiebene erforderlich ist"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "3-Wege-Merge bei Vorhandensein von hinzugefügten/entfernten Zeilen"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "genau wie -m, aber nicht zusammengeführte Einträge verwerfen"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<Unterverzeichnis>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "das Verzeichnis in den Index unter <Unterverzeichnis>/ lesen"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "explizit ignorierte Dateien zu überschreiben erlauben"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "das Arbeitsverzeichnis nach dem Merge nicht prüfen"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "Anwendung des Filters für partielles Auschecken überspringen"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "unpack-trees protokollieren"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "Rückmeldungen unterdrücken"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:190
msgid "You need to resolve your current index first"
msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
-#: builtin/rebase.c:35
+#: builtin/rebase.c:36
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -20187,205 +20891,51 @@
"git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis> | --"
"keep-base] [<Upstream> [<Branch>]]"
-#: builtin/rebase.c:37
+#: builtin/rebase.c:38
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] --"
"root [<Branch>]"
-#: builtin/rebase.c:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "Unbenutzbare TODO-Liste: '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:231
#, c-format
msgid "could not create temporary %s"
msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen."
-#: builtin/rebase.c:317
+#: builtin/rebase.c:237
msgid "could not mark as interactive"
msgstr "Markierung auf interaktiven Rebase fehlgeschlagen."
-#: builtin/rebase.c:370
+#: builtin/rebase.c:290
msgid "could not generate todo list"
msgstr "Konnte TODO-Liste nicht erzeugen."
-#: builtin/rebase.c:412
+#: builtin/rebase.c:332
msgid "a base commit must be provided with --upstream or --onto"
msgstr "Ein Basis-Commit muss mit --upstream oder --onto angegeben werden."
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<Optionen>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "behalte Commits, die leer beginnen"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "Commits mit leerer Beschreibung erlauben"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "Rebase auf Merge-Commits ausführen"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "originale Branch-Punkte der Cousins behalten"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "Commits verschieben, die mit squash!/fixup! beginnen"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "Commits signieren"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr ""
-"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "Rebase fortsetzen"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "Commit auslassen"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "die TODO-Liste bearbeiten"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "den aktuellen Patch anzeigen"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "Commit-IDs in der TODO-Liste verkürzen"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "Commit-IDs in der TODO-Liste erweitern"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "die TODO-Liste prüfen"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "fixup/squash-Zeilen umordnen"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "\"exec\"-Befehle in TODO-Liste einfügen"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "auf"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "Begrenzungscommit"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "Begrenzungscommit"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash onto"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "der Upstream-Commit"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-Name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "head-Name"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "Rebase-Strategie"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "Strategie-Optionen"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "Strategie-Optionen"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "wechseln zu"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "der Branch oder Commit zum Auschecken"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-Name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "onto-Name"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "Befehl"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "auszuführender Befehl"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:391
#, c-format
msgid "%s requires the merge backend"
msgstr "%s erfordert das Merge-Backend"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:433
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "Konnte 'onto' nicht bestimmen: '%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:450
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "Ungültiges orig-head: '%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:475
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "Ignoriere ungültiges allow_rerere_autoupdate: '%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:600
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20401,7 +20951,7 @@
"Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n"
"führen Sie \"git rebase --abort\" aus."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:685
#, c-format
msgid ""
"\n"
@@ -20421,16 +20971,21 @@
"Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n"
"ausführen."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:836
+#, c-format
+msgid "could not switch to %s"
+msgstr "Konnte nicht zu %s wechseln."
+
+#: builtin/rebase.c:952
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr ""
-"nicht erkannter leerer Typ '%s'; Gültige Werte sind \"drop\", \"keep\", und "
+"nicht erkannter leerer Typ '%s'; gültige Werte sind \"drop\", \"keep\", und "
"\"ask\"."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:970
#, c-format
msgid ""
"%s\n"
@@ -20448,7 +21003,7 @@
" git rebase '<Branch>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:986
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20462,188 +21017,186 @@
" git branch --set-upstream-to=%s/<Branch> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:1016
msgid "exec commands cannot contain newlines"
msgstr "\"exec\"-Befehle können keine neuen Zeilen enthalten"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:1020
msgid "empty exec command"
msgstr "Leerer \"exec\"-Befehl."
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1051
msgid "rebase onto given branch instead of upstream"
msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausführen"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1053
msgid "use the merge-base of upstream and branch as the current base"
msgstr "Nutze die Merge-Basis von Upstream und Branch als die aktuelle Basis"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1055
msgid "allow pre-rebase hook to run"
msgstr "Ausführung des pre-rebase-Hooks erlauben"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1057
msgid "be quiet. implies --no-stat"
msgstr "weniger Ausgaben (impliziert --no-stat)"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1060
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen"
+
+#: builtin/rebase.c:1063
msgid "do not show diffstat of what changed upstream"
msgstr ""
"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1066
msgid "add a Signed-off-by trailer to each commit"
msgstr "eine Signed-off-by Zeile zu jedem Commit hinzufügen"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1069
msgid "make committer date match author date"
msgstr "Datum des Commit-Erstellers soll mit Datum des Autors übereinstimmen"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1071
msgid "ignore author date and use current date"
msgstr "ignoriere Autor-Datum und nutze aktuelles Datum"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1073
msgid "synonym of --reset-author-date"
msgstr "Synonym für --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1075 builtin/rebase.c:1079
msgid "passed to 'git apply'"
msgstr "an 'git apply' übergeben"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1077
msgid "ignore changes in whitespace"
msgstr "Whitespace-Änderungen ignorieren"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1081 builtin/rebase.c:1084
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
"Cherry-Pick auf alle Commits ausführen, auch wenn diese unverändert sind"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1086
msgid "continue"
msgstr "fortsetzen"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1089
msgid "skip current patch and continue"
msgstr "den aktuellen Patch auslassen und fortfahren"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1091
msgid "abort and check out the original branch"
msgstr "abbrechen und den ursprünglichen Branch auschecken"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1094
msgid "abort but keep HEAD where it is"
msgstr "abbrechen, aber HEAD an aktueller Stelle belassen"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1095
msgid "edit the todo list during an interactive rebase"
msgstr "TODO-Liste während eines interaktiven Rebase bearbeiten"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1098
msgid "show the patch file being applied or merged"
msgstr "den Patch, der gerade angewendet oder zusammengeführt wird, anzeigen"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1101
msgid "use apply strategies to rebase"
msgstr "Strategien von 'git am' bei Rebase verwenden"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1105
msgid "use merging strategies to rebase"
msgstr "Merge-Strategien beim Rebase verwenden"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1109
msgid "let the user edit the list of commits to rebase"
msgstr "den Benutzer die Liste der Commits für den Rebase bearbeiten lassen"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1113
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(VERALTET) Versuche, Merges wiederherzustellen statt sie zu ignorieren"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1118
msgid "how to handle commits that become empty"
msgstr "wie sollen Commits behandelt werden, die leer werden"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1121
+msgid "keep commits which start empty"
+msgstr "behalte Commits, die leer beginnen"
+
+#: builtin/rebase.c:1125
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1132
msgid "add exec lines after each commit of the editable list"
msgstr "exec-Zeilen nach jedem Commit der editierbaren Liste hinzufügen"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1136
msgid "allow rebasing commits with empty messages"
msgstr "Rebase von Commits mit leerer Beschreibung erlauben"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1140
msgid "try to rebase merges instead of skipping them"
msgstr "versuchen, Rebase mit Merges auszuführen, statt diese zu überspringen"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1143
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "'merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1145
msgid "use the given merge strategy"
msgstr "angegebene Merge-Strategie verwenden"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1147 builtin/revert.c:115
msgid "option"
msgstr "Option"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1148
msgid "pass the argument through to the merge strategy"
msgstr "Argument zur Merge-Strategie durchreichen"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1151
msgid "rebase all reachable commits up to the root(s)"
msgstr "Rebase auf alle erreichbaren Commits bis zum Root-Commit ausführen"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1154
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen"
+
+#: builtin/rebase.c:1156
msgid "apply all changes, even those already present upstream"
msgstr ""
"alle Änderungen anwenden, auch jene, die bereits im Upstream-Branch "
"vorhanden sind"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1177
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "'git am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"'git rebase --preserve-merges' ist veraltet. Benutzen Sie stattdessen '--"
-"rebase-merges'."
+#: builtin/rebase.c:1208
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges wurde durch --rebase-merges ersetzt"
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "'--keep-base' kann nicht mit '--onto' kombiniert werden"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "'--keep-base' kann nicht mit '--root' kombiniert werden"
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "'--root' kann nicht mit '--fork-point' kombiniert werden"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1230
msgid "No rebase in progress?"
msgstr "Kein Rebase im Gange?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1234
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet "
"werden."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1269
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20651,16 +21204,16 @@
"Sie müssen alle Merge-Konflikte editieren und diese dann\n"
"mittels \"git add\" als aufgelöst markieren"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1287
msgid "could not discard worktree changes"
msgstr "Konnte Änderungen im Arbeitsverzeichnis nicht verwerfen."
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1308
#, c-format
msgid "could not move back to %s"
msgstr "Konnte nicht zu %s zurückgehen."
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1354
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20681,147 +21234,130 @@
"und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
"etwas Schützenswertes vorhanden ist.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1382
msgid "switch `C' expects a numerical value"
msgstr "Schalter `C' erwartet einen numerischen Wert."
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1424
#, c-format
msgid "Unknown mode: %s"
msgstr "Unbekannter Modus: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1463
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy erfordert --merge oder --interactive"
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
+#: builtin/rebase.c:1492
+msgid "apply options and merge options cannot be used together"
msgstr ""
-"Optionen für \"am\" können nicht mit Optionen für \"merge\" kombiniert "
-"werden."
+"Optionen für \"am\" und Optionen für \"merge\" können nicht gemeinsam "
+"verwendet werden"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1505
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Unbekanntes Rebase-Backend: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1534
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec erfordert --exec oder --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr ""
-"'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden."
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"Fehler: '--preserve-merges' kann nicht mit '--reschedule-failed-exec' "
-"kombiniert werden."
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1565
#, c-format
msgid "invalid upstream '%s'"
msgstr "Ungültiger Upstream '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1571
msgid "Could not create new root commit"
msgstr "Konnte neuen Root-Commit nicht erstellen."
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1597
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': benötige genau eine Merge-Basis mit dem Branch"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1600
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': benötige genau eine Merge-Basis"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1609
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "'%s' zeigt auf keinen gültigen Commit."
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1636
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal: Branch/Commit '%s' nicht gefunden"
+msgid "no such branch/commit '%s'"
+msgstr "Branch/Commit '%s' nicht gefunden"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
+#: builtin/submodule--helper.c:2477
#, c-format
msgid "No such ref: %s"
msgstr "Referenz nicht gefunden: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1658
msgid "Could not resolve HEAD to a revision"
msgstr "Konnte HEAD zu keinem Commit auflösen."
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1679
msgid "Please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: builtin/rebase.c:1997
-#, c-format
-msgid "could not switch to %s"
-msgstr "Konnte nicht zu %s wechseln."
-
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1714
msgid "HEAD is up to date."
msgstr "HEAD ist aktuell."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1716
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1724
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD ist aktuell, Rebase erzwungen."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1726
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Aktueller Branch %s ist auf dem neuesten Stand, Rebase erzwungen.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1734
msgid "The pre-rebase hook refused to rebase."
msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1741
#, c-format
msgid "Changes to %s:\n"
msgstr "Änderungen zu %s:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1744
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Änderungen von %s zu %s:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1769
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Zunächst wird der Branch zurückgespult, um Ihre Änderungen darauf neu "
"anzuwenden...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1781
msgid "Could not detach HEAD"
msgstr "Konnte HEAD nicht loslösen."
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1790
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Spule %s vor zu %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <Git-Verzeichnis>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1263
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"
@@ -20853,7 +21389,7 @@
"setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
"'refuse'."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1283
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"
@@ -20874,79 +21410,116 @@
"\n"
"Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2476
msgid "quiet"
msgstr "weniger Ausgaben"
-#: builtin/receive-pack.c:2492
-msgid "You must specify a directory."
-msgstr "Sie müssen ein Repository angeben."
+#: builtin/receive-pack.c:2491
+msgid "you must specify a directory"
+msgstr "Sie müssen ein Verzeichnis angeben"
+
+#: builtin/reflog.c:9
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [<log-Optionen>] [<Referenz>]"
+
+#: builtin/reflog.c:12
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
+msgstr ""
+"git reflog expire [--expire=<Zeit>] [--expire-unreachable=<Zeit>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<Referenzen>...]"
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
msgstr ""
-"git reflog expire [--expire=<Zeit>] [--expire-unreachable=<Zeit>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<Referenzen>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] "
+"<Referenz>@{<Spezifikation>}..."
-#: builtin/reflog.c:22
-msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
-msgstr ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<Referenzen>..."
-
-#: builtin/reflog.c:25
+#: builtin/reflog.c:21
msgid "git reflog exists <ref>"
msgstr "git reflog exists <Referenz>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:197 builtin/reflog.c:211
#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "'%s' ist kein gültiger Zeitstempel"
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "ungültiger Zeitstempel '%s' für '--%s'"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:240 builtin/reflog.c:359
+msgid "do not actually prune any entries"
+msgstr "Einträge nicht wirklich löschen"
+
+#: builtin/reflog.c:243 builtin/reflog.c:362
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr ""
+"den alten SHA1 mit dem neuen SHA1 des Eintrags, der ihm jetzt vorausgeht, "
+"umschreiben"
+
+#: builtin/reflog.c:246 builtin/reflog.c:365
+msgid "update the reference to the value of the top reflog entry"
+msgstr "den Verweis auf den Wert des obersten Reflog-Eintrags aktualisieren"
+
+#: builtin/reflog.c:248 builtin/reflog.c:367
+msgid "print extra information on screen"
+msgstr "gebe zusätzliche Informationen auf dem Bildschirm aus"
+
+#: builtin/reflog.c:249 builtin/reflog.c:253
+msgid "timestamp"
+msgstr "Zeitstempel"
+
+#: builtin/reflog.c:250
+msgid "prune entries older than the specified time"
+msgstr "lösche Einträge älter als die angegebene Zeit"
+
+#: builtin/reflog.c:254
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+"entferne Einträge älter als <Zeit>, die nicht von der aktuellen Spitze des "
+"Branches erreichbar sind"
+
+#: builtin/reflog.c:258
+msgid "prune any reflog entries that point to broken commits"
+msgstr "lösche alle Reflog-Einträge die auf einen fehlerhaften Commit zeigen"
+
+#: builtin/reflog.c:259
+msgid "process the reflogs of all references"
+msgstr "Reflogs von allen Referenzen verarbeiten"
+
+#: builtin/reflog.c:261
+msgid "limits processing to reflogs from the current worktree only"
+msgstr ""
+"Verarbeitung der Reflogs auf das aktuelle Arbeitsverzeichnis beschränken"
+
+#: builtin/reflog.c:294
#, c-format
msgid "Marking reachable objects..."
msgstr "Markiere nicht erreichbare Objekte..."
-#: builtin/reflog.c:647
+#: builtin/reflog.c:338
#, c-format
msgid "%s points nowhere!"
msgstr "%s zeigt auf nichts!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:374
msgid "no reflog specified to delete"
msgstr "Kein Reflog zum Löschen angegeben."
-#: builtin/reflog.c:708
-#, c-format
-msgid "not a reflog: %s"
-msgstr "Kein Reflog: %s"
-
-#: builtin/reflog.c:713
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "Kein Reflog für '%s'."
-
-#: builtin/reflog.c:759
+#: builtin/reflog.c:396
#, c-format
msgid "invalid ref format: %s"
msgstr "Ungültiges Format für Referenzen: %s"
-#: builtin/reflog.c:768
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr "git reflog [ show | expire | delete | exists ]"
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
@@ -20954,82 +21527,87 @@
"git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <Name> <URL>"
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <alt> <neu>"
+#: builtin/remote.c:20 builtin/remote.c:40
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <alt> <neu>"
-#: builtin/remote.c:20 builtin/remote.c:44
+#: builtin/remote.c:21 builtin/remote.c:45
msgid "git remote remove <name>"
msgstr "git remote remove <Name>"
-#: builtin/remote.c:21 builtin/remote.c:49
+#: builtin/remote.c:22 builtin/remote.c:50
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <Name>"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <Name>"
-#: builtin/remote.c:24
+#: builtin/remote.c:25
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | <Remote>)...]"
-#: builtin/remote.c:25
+#: builtin/remote.c:26
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <Name> <Branch>..."
-#: builtin/remote.c:26 builtin/remote.c:75
+#: builtin/remote.c:27 builtin/remote.c:76
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <Name>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]"
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <Name> <neueURL>"
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c:30 builtin/remote.c:83
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <Name> <URL>"
-#: builtin/remote.c:34
+#: builtin/remote.c:35
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<Optionen>] <Name> <URL>"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <Name> <Branch>..."
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <Name> <Branch>..."
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<Optionen>] <Name>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<Optionen>] <Name>"
-#: builtin/remote.c:70
+#: builtin/remote.c:71
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..."
-#: builtin/remote.c:99
+#: builtin/remote.c:100
#, c-format
msgid "Updating %s"
msgstr "Aktualisiere %s"
-#: builtin/remote.c:131
+#: builtin/remote.c:102
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Konnte nicht von %s anfordern"
+
+#: builtin/remote.c:132
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -21037,77 +21615,82 @@
"--mirror ist gefährlich und veraltet; bitte\n"
"\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push"
-#: builtin/remote.c:148
+#: builtin/remote.c:149
#, c-format
msgid "unknown mirror argument: %s"
msgstr "unbekanntes Argument für Option mirror: %s"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "fetch the remote branches"
msgstr "die Remote-Branches anfordern"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "import all tags and associated objects when fetching"
msgstr "alle Tags und verbundene Objekte beim Anfordern importieren"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "oder fordere gar keine Tags an (--no-tags)"
-#: builtin/remote.c:171
+#: builtin/remote.c:172
msgid "branch(es) to track"
msgstr "Branch(es) zur Übernahme"
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "master branch"
msgstr "Hauptbranch"
-#: builtin/remote.c:174
+#: builtin/remote.c:175
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
"Aufsetzen des Remote-Repositories als Spiegel-Repository für \"push\" und "
"\"fetch\""
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
"--mirror kann nicht mit der Angabe eines Hauptbranches verwendet werden"
-#: builtin/remote.c:188
+#: builtin/remote.c:189
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
"Spiegelarchiven verwendet werden"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:196 builtin/remote.c:716
#, c-format
msgid "remote %s already exists."
msgstr "externes Repository %s existiert bereits."
-#: builtin/remote.c:240
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten"
-#: builtin/remote.c:355
+#: builtin/remote.c:323
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "unbehandeltes branch.%s.rebase=%s; 'true' wird angenommen"
+
+#: builtin/remote.c:367
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:461 builtin/remote.c:469
msgid "(matching)"
msgstr "(übereinstimmend)"
-#: builtin/remote.c:466
+#: builtin/remote.c:473
msgid "(delete)"
msgstr "(lösche)"
-#: builtin/remote.c:655
+#: builtin/remote.c:664
#, c-format
msgid "could not set '%s'"
msgstr "konnte '%s' nicht setzen"
-#: builtin/remote.c:660
+#: builtin/remote.c:669
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -21118,17 +21701,17 @@
"\t%s:%d\n"
"benennt jetzt das nicht existierende Remote-Repository '%s'"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
#, c-format
msgid "No such remote: '%s'"
msgstr "Remote-Repository nicht gefunden: '%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:726
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
-#: builtin/remote.c:730
+#: builtin/remote.c:746
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -21139,17 +21722,21 @@
"\t%s\n"
"\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
-#: builtin/remote.c:770
+#: builtin/remote.c:783
+msgid "Renaming remote references"
+msgstr "Umbenennen von Remote-Referenzen"
+
+#: builtin/remote.c:794
#, c-format
msgid "deleting '%s' failed"
msgstr "Konnte '%s' nicht löschen"
-#: builtin/remote.c:804
+#: builtin/remote.c:832
#, c-format
msgid "creating '%s' failed"
msgstr "Konnte '%s' nicht erstellen"
-#: builtin/remote.c:882
+#: builtin/remote.c:912
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -21165,118 +21752,118 @@
"entfernt;\n"
"um diese zu entfernen, benutzen Sie:"
-#: builtin/remote.c:896
+#: builtin/remote.c:926
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
-#: builtin/remote.c:999
+#: builtin/remote.c:1034
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1037
msgid " tracked"
msgstr " gefolgt"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1039
msgid " stale (use 'git remote prune' to remove)"
msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1041
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1082
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1091
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "interaktiver Rebase auf Remote-Branch %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1093
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "interaktiver Rebase (mit Merges) auf Remote-Branch %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1096
#, c-format
msgid "rebases onto remote %s"
msgstr "Rebase auf Remote-Branch %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1100
#, c-format
msgid " merges with remote %s"
msgstr " führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1103
#, c-format
msgid "merges with remote %s"
msgstr "führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1106
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s und mit Remote-Branch %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1149
msgid "create"
msgstr "erstellt"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1152
msgid "delete"
msgstr "gelöscht"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1156
msgid "up to date"
msgstr "aktuell"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1159
msgid "fast-forwardable"
msgstr "vorspulbar"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1162
msgid "local out of date"
msgstr "lokal nicht aktuell"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1169
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s erzwingt Versandt nach %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1172
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s versendet nach %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1176
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s erzwingt Versand nach %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1179
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s versendet nach %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1247
msgid "do not query remotes"
msgstr "keine Abfrage von Remote-Repositories"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1268
#, c-format
msgid "* remote %s"
msgstr "* Remote-Repository %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1269
#, c-format
msgid " Fetch URL: %s"
msgstr " URL zum Abholen: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
msgid "(no URL)"
msgstr "(keine URL)"
@@ -21284,25 +21871,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1284 builtin/remote.c:1286
#, c-format
msgid " Push URL: %s"
msgstr " URL zum Versenden: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
#, c-format
msgid " HEAD branch: %s"
msgstr " Hauptbranch: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1288
msgid "(not queried)"
msgstr "(nicht abgefragt)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1290
msgid "(unknown)"
msgstr "(unbekannt)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1294
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -21310,162 +21897,166 @@
" Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
"sein):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1306
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Remote-Branch:%s"
msgstr[1] " Remote-Branches:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1309 builtin/remote.c:1335
msgid " (status not queried)"
msgstr " (Zustand nicht abgefragt)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1318
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokaler Branch konfiguriert für 'git pull':"
msgstr[1] " Lokale Branches konfiguriert für 'git pull':"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1326
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokale Referenzen werden von 'git push' gespiegelt"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1332
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:"
msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1353
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1355
msgid "delete refs/remotes/<name>/HEAD"
msgstr "entfernt refs/remotes/<Name>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1369
msgid "Cannot determine remote HEAD"
msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1371
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen "
"aus mit:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1381
#, c-format
msgid "Could not delete %s"
msgstr "Konnte %s nicht entfernen"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1389
#, c-format
msgid "Not a valid ref: %s"
msgstr "keine gültige Referenz: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1391
#, c-format
msgid "Could not setup %s"
msgstr "Konnte %s nicht einrichten"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1409
#, c-format
msgid " %s will become dangling!"
msgstr " %s wird unreferenziert!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1410
#, c-format
msgid " %s has become dangling!"
msgstr " %s wurde unreferenziert!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1419
#, c-format
msgid "Pruning %s"
msgstr "entferne veraltete Branches von %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1420
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1436
#, c-format
msgid " * [would prune] %s"
msgstr " * [würde veralteten Branch entfernen] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1439
#, c-format
msgid " * [pruned] %s"
msgstr "* [veralteten Branch entfernt] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1484
msgid "prune remotes after fetching"
msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
#, c-format
msgid "No such remote '%s'"
msgstr "Remote-Repository '%s' nicht gefunden"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1566
msgid "add branch"
msgstr "Branch hinzufügen"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1573
msgid "no remote specified"
msgstr "kein Remote-Repository angegeben"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1590
msgid "query push URLs rather than fetch URLs"
msgstr "nur URLs für Push ausgeben"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1592
msgid "return all URLs"
msgstr "alle URLs ausgeben"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1622
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
-#: builtin/remote.c:1621
+#: builtin/remote.c:1648
msgid "manipulate push URLs"
msgstr "URLs für \"push\" manipulieren"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1650
msgid "add URL"
msgstr "URL hinzufügen"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1652
msgid "delete URLs"
msgstr "URLs löschen"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1659
msgid "--add --delete doesn't make sense"
msgstr "--add und --delete können nicht gemeinsam verwendet werden"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1700
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ungültiges altes URL Format: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1708
#, c-format
msgid "No such URL found: %s"
msgstr "URL nicht gefunden: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1710
msgid "Will not delete all non-push URLs"
msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
-#: builtin/repack.c:26
+#: builtin/remote.c:1727
+msgid "be verbose; must be placed before a subcommand"
+msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
+
+#: builtin/repack.c:29
msgid "git repack [<options>]"
msgstr "git repack [<Optionen>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:34
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21474,148 +22065,153 @@
"--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n"
"Konfiguration."
-#: builtin/repack.c:198
+#: builtin/repack.c:206
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
"Remote-Repositories nicht starten."
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:280 builtin/repack.c:824
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Erwarte Zeilen mit vollständiger Hex-Objekt-ID nur von pack-objects."
-#: builtin/repack.c:294
+#: builtin/repack.c:304
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
"Remote-Repositories nicht abschließen."
-#: builtin/repack.c:309
+#: builtin/repack.c:319
#, c-format
msgid "cannot open index for %s"
msgstr "konnte Index für %s nicht öffnen"
-#: builtin/repack.c:368
+#: builtin/repack.c:378
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr ""
"Paket %s zu groß, um es bei der geometrischen Progression zu berücksichtigen"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
#, c-format
msgid "pack %s too large to roll up"
msgstr "Paket %s zu groß zum Aufrollen"
-#: builtin/repack.c:460
+#: builtin/repack.c:503
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "konnte temporäre Datei '%s' nicht zum Schreiben öffnen"
+
+#: builtin/repack.c:521
+msgid "could not close refs snapshot tempfile"
+msgstr "konnte temporäre Referenzen-Snapshot-Datei nicht schließen"
+
+#: builtin/repack.c:634
msgid "pack everything in a single pack"
msgstr "alles in eine einzige Pack-Datei packen"
-#: builtin/repack.c:462
+#: builtin/repack.c:636
msgid "same as -a, and turn unreachable objects loose"
msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
-#: builtin/repack.c:465
+#: builtin/repack.c:639
msgid "remove redundant packs, and run git-prune-packed"
msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen"
-#: builtin/repack.c:467
+#: builtin/repack.c:641
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "--no-reuse-delta an git-pack-objects übergeben"
-#: builtin/repack.c:469
+#: builtin/repack.c:643
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "--no-reuse-object an git-pack-objects übergeben"
-#: builtin/repack.c:471
+#: builtin/repack.c:645
msgid "do not run git-update-server-info"
msgstr "git-update-server-info nicht ausführen"
-#: builtin/repack.c:474
+#: builtin/repack.c:648
msgid "pass --local to git-pack-objects"
msgstr "--local an git-pack-objects übergeben"
-#: builtin/repack.c:476
+#: builtin/repack.c:650
msgid "write bitmap index"
msgstr "Bitmap-Index schreiben"
-#: builtin/repack.c:478
+#: builtin/repack.c:652
msgid "pass --delta-islands to git-pack-objects"
msgstr "--delta-islands an git-pack-objects übergeben"
-#: builtin/repack.c:479
+#: builtin/repack.c:653
msgid "approxidate"
msgstr "Datumsangabe"
-#: builtin/repack.c:480
+#: builtin/repack.c:654
msgid "with -A, do not loosen objects older than this"
msgstr "mit -A, keine Objekte älter als dieses Datum löschen"
-#: builtin/repack.c:482
+#: builtin/repack.c:656
msgid "with -a, repack unreachable objects"
msgstr "mit -a, nicht erreichbare Objekte neu packen"
-#: builtin/repack.c:484
+#: builtin/repack.c:658
msgid "size of the window used for delta compression"
msgstr "Größe des Fensters für die Delta-Kompression"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:659 builtin/repack.c:665
msgid "bytes"
msgstr "Bytes"
-#: builtin/repack.c:486
+#: builtin/repack.c:660
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"gleiches wie oben, aber die Speichergröße statt der Anzahl der Einträge "
"limitieren"
-#: builtin/repack.c:488
+#: builtin/repack.c:662
msgid "limits the maximum delta depth"
msgstr "die maximale Delta-Tiefe limitieren"
-#: builtin/repack.c:490
+#: builtin/repack.c:664
msgid "limits the maximum number of threads"
msgstr "maximale Anzahl von Threads limitieren"
-#: builtin/repack.c:492
+#: builtin/repack.c:666
msgid "maximum size of each packfile"
msgstr "maximale Größe für jede Paketdatei"
-#: builtin/repack.c:494
+#: builtin/repack.c:668
msgid "repack objects in packs marked with .keep"
msgstr ""
"Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
-#: builtin/repack.c:496
+#: builtin/repack.c:670
msgid "do not repack this pack"
msgstr "dieses Paket nicht neu packen"
-#: builtin/repack.c:498
+#: builtin/repack.c:672
msgid "find a geometric progression with factor <N>"
msgstr "eine geometrische Progression mit Faktor <N> finden"
-#: builtin/repack.c:508
+#: builtin/repack.c:674
+msgid "write a multi-pack index of the resulting packs"
+msgstr "ein Multi-Pack-Index des resultierenden Pakets schreiben"
+
+#: builtin/repack.c:684
msgid "cannot delete packs in a precious-objects repo"
msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable und -A sind inkompatibel"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric ist inkompatibel mit -A, -a"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:833
msgid "Nothing new to pack."
msgstr "Nichts Neues zum Packen."
-#: builtin/repack.c:669
+#: builtin/repack.c:863
#, c-format
msgid "missing required file: %s"
msgstr "benötigte Datei fehlt: %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:865
#, c-format
msgid "could not unlink: %s"
msgstr "konnte nicht löschen: %s"
@@ -21632,10 +22228,6 @@
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <Commit> [<Eltern-Commit>...]"
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --convert-graft-file"
-
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <Objekt>..."
@@ -21699,67 +22291,61 @@
msgid "unable to open %s for reading"
msgstr "konnte '%s' nicht zum Lesen öffnen"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "konnte mktree nicht ausführen"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "konnte nicht von mktree lesen"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "mktree meldete Fehler"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree lieferte keinen Objektnamen zurück"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "kann fstat auf %s nicht ausführen"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "konnte Objekt nicht in Datenbank schreiben"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "kein gültiger Objektname: '%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "konnte Objektart von %s nicht bestimmten"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "bearbeiten von Objektdatei fehlgeschlagen"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "neues Objekt ist dasselbe wie das alte: '%s'"
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "konnte %s nicht als Commit parsen"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "ungültiger Merge-Tag in Commit '%s'"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "fehlerhafter Merge-Tag in Commit '%s'"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21768,31 +22354,31 @@
"Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n"
"wird; benutzen Sie --edit statt --graft"
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "der originale Commit '%s' hat eine GPG-Signatur"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "die Signatur wird in dem Ersetzungs-Commit entfernt!"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "konnte Ersetzungs-Commit für '%s' nicht schreiben"
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "künstlicher Vorgänger (\"graft\") für '%s' nicht notwendig"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "neuer Commit ist derselbe wie der alte: '%s'"
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -21801,71 +22387,71 @@
"konnte die folgenden künstlichen Vorgänger (\"grafts\") nicht konvertieren:\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "ersetzende Referenzen auflisten"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "ersetzende Referenzen löschen"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "existierendes Objekt bearbeiten"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "Eltern-Commits eines Commits ändern"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "existierende Datei des künstlichen Vorgängers (\"graft\") konvertieren"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "die Referenz ersetzen, wenn sie existiert"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "das angegebene Format benutzen"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "--format kann nicht beim Auflisten verwendet werden"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "-f macht nur beim Schreiben einer Ersetzung Sinn"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw macht nur mit --edit Sinn"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d benötigt mindestens ein Argument"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "Ungültige Anzahl von Argumenten"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e benötigt genau ein Argument"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-g benötigt mindestens ein Argument"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file erwartet keine Argumente"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "Mit -l kann nur ein Muster angegeben werden"
@@ -21886,172 +22472,156 @@
msgid "unable to generate diff for '%s'"
msgstr "konnte kein Diff für '%s' generieren"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfadspezifikation>..."
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<Commit-"
"Referenz>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfadspezifikation>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "mixed"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "soft"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "hard"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "zusammenführen"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:83
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "Sie haben keinen gültigen HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ist jetzt bei %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:304
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Kann keinen '%s'-Reset durchführen, während ein Merge im Gange ist."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
+#: builtin/stash.c:693
msgid "be quiet, only report errors"
msgstr "weniger Ausgaben, nur Fehler melden"
-#: builtin/reset.c:297
+#: builtin/reset.c:404
+msgid "skip refreshing the index after reset"
+msgstr "Aktualisierung des Indexes nach dem Zurücksetzen überspringen"
+
+#: builtin/reset.c:406
msgid "reset HEAD and index"
msgstr "HEAD und Index umsetzen"
-#: builtin/reset.c:298
+#: builtin/reset.c:407
msgid "reset only HEAD"
msgstr "nur HEAD umsetzen"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:409 builtin/reset.c:411
msgid "reset HEAD, index and working tree"
msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
-#: builtin/reset.c:304
+#: builtin/reset.c:413
msgid "reset HEAD but keep local changes"
msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
-#: builtin/reset.c:310
+#: builtin/reset.c:419
msgid "record only the fact that removed paths will be added later"
msgstr "nur speichern, dass gelöschte Pfade später hinzugefügt werden sollen"
-#: builtin/reset.c:344
+#: builtin/reset.c:452
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Konnte '%s' nicht als gültigen Commit auflösen."
-#: builtin/reset.c:352
+#: builtin/reset.c:460
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Konnte '%s' nicht als gültiges \"Tree\"-Objekt auflösen."
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:479
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- "
"<Pfade>'."
-#: builtin/reset.c:373
+#: builtin/reset.c:481
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich."
-#: builtin/reset.c:388
+#: builtin/reset.c:496
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "'%s'-Reset ist in einem Bare-Repository nicht erlaubt"
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "-N kann nur mit --mixed benutzt werden"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:527
msgid "Unstaged changes after reset:"
msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
-#: builtin/reset.c:416
+#: builtin/reset.c:530
#, c-format
msgid ""
-"\n"
-"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
-"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
-"to make this the default.\n"
+"It took %.2f seconds to refresh the index after reset. You can use\n"
+"'--no-refresh' to avoid this."
msgstr ""
-"\n"
-"Es dauerte %.2f Sekunden, um über die nach einem Reset nicht zum Commit\n"
-"vorgemerkten Änderungen zu zählen. Sie können '--quiet' benutzen, um\n"
-"das zu verhindern. Setzen Sie die Konfigurationseinstellung reset.quiet\n"
-"auf \"true\", um das zum Standard zu machen.\n"
+"Es dauerte %.2f Sekunden, um den Index nach dem Zurücksetzen zu\n"
+"aktualisieren. Sie können '--no-refresh' verwenden, um dies zu\n"
+"vermeiden."
-#: builtin/reset.c:434
+#: builtin/reset.c:547
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
-#: builtin/reset.c:439
+#: builtin/reset.c:552
msgid "Could not write new index file."
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
-"--exclude-promisor-objects und --missing können nicht kombiniert werden."
-
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr "Das Filtern von Objekten erfordert --objects."
-
-#: builtin/rev-list.c:674
+#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
msgstr "rev-list unterstützt keine Anzeige von Notizen"
-#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "markiertes Zählen ist inkompatibel mit der Option --objects"
+#: builtin/rev-list.c:664
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "markiertes Zählen und '%s' können nicht gemeinsam verwendet werden"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -22215,15 +22785,19 @@
msgid "preserve initially empty commits"
msgstr "ursprüngliche, leere Commits erhalten"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "Commits mit leerer Beschreibung erlauben"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "redundante, leere Commits behalten"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "\"revert\" fehlgeschlagen"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" fehlgeschlagen"
@@ -22275,74 +22849,73 @@
msgstr[0] "die folgende Datei hat lokale Änderungen:"
msgstr[1] "die folgenden Dateien haben lokale Änderungen:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "keine gelöschten Dateien auflisten"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "nur aus dem Index entfernen"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "die \"up-to-date\" Prüfung überschreiben"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "rekursives Entfernen erlauben"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
"Es wurde keine Pfadspezifikation angegeben. Welche Dateien sollen entfernt "
"werden?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder\n"
"benutzen Sie \"stash\", um fortzufahren."
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "'%s' wird nicht ohne -r rekursiv entfernt"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: konnte %s nicht löschen"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<Host>:]<Verzeichnis> "
-"[<Referenz>...]\n"
-" --all und die explizite Angabe einer <Referenz> schließen sich gegenseitig "
-"aus."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<Host>:]<Verzeichnis> (--all | <Referenz>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "Name des Remote-Repositories"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "zustandsloses RPC-Protokoll verwenden"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "Referenzen von der Standard-Eingabe lesen"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "Status des Remote-Helpers ausgeben"
@@ -22400,27 +22973,27 @@
msgid "group by field"
msgstr "Gruppieren nach Feld"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:395
msgid "too many arguments given outside repository"
msgstr "zu viele Argumente außerhalb des Repositories angegeben"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<Wann>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
+" [--current] [--color[=<Wann>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
-#: builtin/show-branch.c:17
+#: builtin/show-branch.c:18
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]"
-#: builtin/show-branch.c:395
+#: builtin/show-branch.c:396
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
@@ -22497,13 +23070,6 @@
msgid "show <n> most recent ref-log entries starting at base"
msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen"
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog ist inkompatibel mit --all, --remotes, --independent oder --merge-"
-"base"
-
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "keine Branches angegeben, und HEAD ist ungültig"
@@ -22597,88 +23163,161 @@
"Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen "
"Repository befinden"
-#: builtin/sparse-checkout.c:22
+#: builtin/sparse-checkout.c:23
msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <Optionen>"
-#: builtin/sparse-checkout.c:46
-msgid "git sparse-checkout list"
-msgstr "git sparse-checkout list"
+#: builtin/sparse-checkout.c:61
+msgid "this worktree is not sparse"
+msgstr "dieses Arbeitsverzeichnis ist nicht partiell"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:76
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"dieses Arbeitsverzeichnis ist nicht partiell (Datei für partieller Checkout "
"existiert eventuell nicht)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:177
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"Verzeichnis '%s' enthält unversionierte Dateien, aber ist nicht innerhalb "
+"des partiellen Checkouts im Cone-Modus"
+
+#: builtin/sparse-checkout.c:185
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "Fehler beim Löschen des Verzeichnisses '%s'"
+
+#: builtin/sparse-checkout.c:327
msgid "failed to create directory for sparse-checkout file"
msgstr ""
"Fehler beim Erstellen eines Verzeichnisses für Datei eines partiellen "
"Checkouts"
-#: builtin/sparse-checkout.c:268
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr ""
-"Repository-Format konnte nicht erweitert werden, um worktreeConfig zu "
-"aktivieren"
+#: builtin/sparse-checkout.c:366
+msgid "failed to initialize worktree config"
+msgstr "Fehler beim Initialisieren der Arbeitsverzeichnis-Konfiguration"
-#: builtin/sparse-checkout.c:270
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "Einstellung für extensions.worktreeConfig konnte nicht gesetzt werden"
-
-#: builtin/sparse-checkout.c:290
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-
-#: builtin/sparse-checkout.c:310
-msgid "initialize the sparse-checkout in cone mode"
-msgstr "initialisiere den partiellen Checkout im Cone-Modus"
-
-#: builtin/sparse-checkout.c:312
-msgid "toggle the use of a sparse index"
-msgstr "die Nutzung des Sparse-Index umschalten"
-
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:411
msgid "failed to modify sparse-index config"
msgstr "Verändern der Konfiguration für Sparse-Index fehlgeschlagen"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
+#: builtin/sparse-checkout.c:847
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "initialisiere den partiellen Checkout im Cone-Modus"
+
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
+#: builtin/sparse-checkout.c:849
+msgid "toggle the use of a sparse index"
+msgstr "die Nutzung des Sparse-Index umschalten"
+
+#: builtin/sparse-checkout.c:479
#, c-format
msgid "failed to open '%s'"
msgstr "Fehler beim Öffnen von '%s'"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:531
#, c-format
msgid "could not normalize path %s"
msgstr "konnte Pfad '%s' nicht normalisieren"
-#: builtin/sparse-checkout.c:425
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <Muster>)"
-
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:560
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "konnte Anführungszeichen von C-Style Zeichenkette '%s' nicht entfernen"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
msgid "unable to load existing sparse-checkout patterns"
msgstr "konnte die existierenden Muster des partiellen Checkouts nicht laden"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:619
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr ""
+"existierenden Muster des partiellen Checkouts benutzen nicht den Cone-Modus"
+
+#: builtin/sparse-checkout.c:707
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr ""
+"bitte von der obersten Ebene des Arbeitsverzeichnisses im Nicht-Cone-Modus "
+"ausführen"
+
+#: builtin/sparse-checkout.c:712
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr "geben Sie Verzeichnisse statt Muster an (kein führender Schrägstich)"
+
+#: builtin/sparse-checkout.c:714
+msgid ""
+"specify directories rather than patterns. If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+"geben Sie Verzeichnisse statt Muster an. Wenn Ihr Verzeichnis mit '!' "
+"beginnt, geben Sie --skip-checks an"
+
+#: builtin/sparse-checkout.c:716
+msgid ""
+"specify directories rather than patterns. If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"geben Sie Verzeichnisse statt Muster an. Wenn Ihr Verzeichnis wirklich eines "
+"von '*?[]\\' enthält, geben Sie --skip-checks an"
+
+#: builtin/sparse-checkout.c:732
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr ""
+"'%s' ist kein Verzeichnis; um es trotzdem als Verzeichnis zu behandeln, "
+"führen Sie es mit --skip-checks erneut aus"
+
+#: builtin/sparse-checkout.c:734
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"übergeben Sie einen führenden Schrägstrich vor Pfaden wie '%s', wenn Sie "
+"eine einzelne Datei haben möchten (siehe NON-CONE PROBLEMS im git-sparse-"
+"checkout Handbuch)."
+
+#: builtin/sparse-checkout.c:739
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <Muster>)"
+
+#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr ""
+"überspringe einige Plausibilitätsprüfungen für die angegebenen Pfade, die zu "
+"falsch positiven Ergebnissen führen könnten"
+
+#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
msgid "read patterns from standard in"
msgstr "Muster von der Standard-Eingabe lesen"
-#: builtin/sparse-checkout.c:588
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:760
+msgid "no sparse-checkout to add to"
+msgstr "kein partieller Checkout zum Hinzufügen"
-#: builtin/sparse-checkout.c:607
-msgid "git sparse-checkout disable"
-msgstr "git sparse-checkout disable"
+#: builtin/sparse-checkout.c:775
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <Muster>)"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:854
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"muss sich in einem partiellen Checkout befinden, um Sparsity-Muster erneut "
+"anwenden zu können"
+
+#: builtin/sparse-checkout.c:914
msgid "error while refreshing working directory"
msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses."
@@ -22704,22 +23343,26 @@
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n"
" [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n"
" [--] [<Pfadspezifikation>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<Nachricht>]"
#: builtin/stash.c:55
@@ -22744,6 +23387,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n"
" [--] [<Pfadspezifikation>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<Nachricht>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22767,7 +23418,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear mit Parametern ist nicht implementiert"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22779,184 +23430,185 @@
" %s -> %s\n"
" um Platz zu schaffen.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "Kann Stash nicht anwenden, solange ein Merge im Gange ist"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "Konnte keinen Diff erzeugen %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "Konnte Index-Verzeichnis nicht speichern"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Führe %s mit %s zusammen"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "Index wurde nicht aus dem Stash zurückgeladen."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
+
+#: builtin/stash.c:608 builtin/stash.c:695
msgid "attempt to recreate the index"
msgstr "Versuche Index wiederherzustellen."
-#: builtin/stash.c:635
+#: builtin/stash.c:641
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s (%s) gelöscht"
-#: builtin/stash.c:638
+#: builtin/stash.c:644
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Konnte Stash-Eintrag nicht löschen"
-#: builtin/stash.c:651
+#: builtin/stash.c:657
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' ist keine Stash-Referenz"
-#: builtin/stash.c:701
+#: builtin/stash.c:707
msgid "The stash entry is kept in case you need it again."
msgstr ""
"Der Stash-Eintrag wird für den Fall behalten, dass Sie diesen nochmal "
"benötigen."
-#: builtin/stash.c:724
+#: builtin/stash.c:730
msgid "No branch name specified"
msgstr "Kein Branchname spezifiziert"
-#: builtin/stash.c:808
+#: builtin/stash.c:809
msgid "failed to parse tree"
msgstr "Parsen der Tree-Objekte fehlgeschlagen"
-#: builtin/stash.c:819
+#: builtin/stash.c:820
msgid "failed to unpack trees"
msgstr "Entpacken der Tree-Objekte fehlgeschlagen"
-#: builtin/stash.c:839
+#: builtin/stash.c:840
msgid "include untracked files in the stash"
msgstr "unversionierte Dateien in Stash einbeziehen"
-#: builtin/stash.c:842
+#: builtin/stash.c:843
msgid "only show untracked files in the stash"
msgstr "nur unversionierte Dateien im Stash anzeigen"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:930 builtin/stash.c:967
#, c-format
msgid "Cannot update %s with %s"
msgstr "Kann nicht %s mit %s aktualisieren."
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
msgid "stash message"
msgstr "Stash-Beschreibung"
-#: builtin/stash.c:957
+#: builtin/stash.c:958
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" erwartet ein Argument <Commit>"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1143
+msgid "No staged changes"
+msgstr "Keine Änderungen im Index"
+
+#: builtin/stash.c:1204
msgid "No changes selected"
msgstr "Keine Änderungen ausgewählt"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1304
msgid "You do not have the initial commit yet"
msgstr "Sie haben bisher noch keinen initialen Commit"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1331
msgid "Cannot save the current index state"
msgstr "Kann den aktuellen Zustand des Index nicht speichern"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1340
msgid "Cannot save the untracked files"
msgstr "Kann die unversionierten Dateien nicht speichern"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1351 builtin/stash.c:1370
msgid "Cannot save the current worktree state"
msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1361
+msgid "Cannot save the current staged state"
+msgstr "Kann den aktuellen Zustand des Index nicht speichern"
+
+#: builtin/stash.c:1398
msgid "Cannot record working tree state"
msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1447
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1458
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"Kann nicht gleichzeitig --staged und --include-untracked oder --all verwenden"
+
+#: builtin/stash.c:1476
msgid "Did you forget to 'git add'?"
msgstr "Haben Sie vielleicht 'git add' vergessen?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1491
msgid "No local changes to save"
msgstr "Keine lokalen Änderungen zum Speichern"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1498
msgid "Cannot initialize stash"
msgstr "Kann \"stash\" nicht initialisieren"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1513
msgid "Cannot save the current status"
msgstr "Kann den aktuellen Status nicht speichern"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1518
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert."
-#: builtin/stash.c:1554
+#: builtin/stash.c:1615
msgid "Cannot remove worktree changes"
msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1656 builtin/stash.c:1728
msgid "keep index"
msgstr "behalte Index"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1658 builtin/stash.c:1730
+msgid "stash staged changes only"
+msgstr "nur Änderungen stashen, die zum Commit vorgemerkt sind"
+
+#: builtin/stash.c:1660 builtin/stash.c:1732
msgid "stash in patch mode"
msgstr "Stash in Patch-Modus"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1661 builtin/stash.c:1733
msgid "quiet mode"
msgstr "weniger Ausgaben"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1663 builtin/stash.c:1735
msgid "include untracked files in stash"
msgstr "unversionierte Dateien in Stash einbeziehen"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1665 builtin/stash.c:1737
msgid "include ignore files"
msgstr "ignorierte Dateien einbeziehen"
-#: builtin/stash.c:1700
-msgid ""
-"the stash.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"Die Unterstützung für stash.useBuiltin wurde entfernt!\n"
-"Siehe dessen Eintrag in 'git help config' für Details."
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
-
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
@@ -22967,41 +23619,45 @@
msgid "prepend comment character and space to each line"
msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Vollständiger Referenzname erwartet, %s erhalten"
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr "'submodule--helper print-default-remote' erwartet keine Argumente."
-
-#: builtin/submodule--helper.c:101
+#: builtin/submodule--helper.c:103
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:213
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
+"Repository sein eigenes verbindliches Upstream-Repository ist."
+
+#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
msgid "alternative anchor for relative paths"
msgstr "Alternativer Anker für relative Pfade"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:418
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
+#: builtin/submodule--helper.c:640
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:528
#, c-format
msgid "Entering '%s'\n"
msgstr "Betrete '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:531
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -23010,7 +23666,7 @@
"run_command gab nicht-Null Status für '%s' zurück.\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:553
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -23022,187 +23678,173 @@
"nicht-Null Status zurück.\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:569
msgid "suppress output of entering each submodule command"
msgstr "Ausgaben beim Betreten eines Submodul-Befehls unterdrücken"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1458
msgid "recurse into nested submodules"
msgstr "Rekursion in verschachtelte Submodule durchführen"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:576
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
-"Repository sein eigenes verbindliches Upstream-Repository ist."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:654
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
"Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration."
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:658
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:668
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:675
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n"
"Konfiguration."
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:697
msgid "suppress output for initializing a submodule"
msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:702
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<Optionen>] [<Pfad>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflösen."
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul '%s'."
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
msgid "suppress submodule status output"
msgstr "Ausgabe des Submodul-Status unterdrücken"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:875
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
"den Commit benutzen, der im Index gespeichert ist, statt den im Submodul HEAD"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <Pfad>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:977
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodule)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:980
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodule)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:993
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1043
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "Hash eines Objektes von '%s' konnte nicht erzeugt werden"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1047
#, c-format
msgid "unexpected mode %o\n"
msgstr "unerwarteter Modus %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1288
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
"benutze den Commit, der im Index gespeichert ist, statt vom Submodul HEAD"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1290
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "den Commit aus dem Index mit dem im Submodul HEAD vergleichen"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1292
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
"überspringe Submodule, wo der 'ignore_config' Wert auf 'all' gesetzt ist"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1294
msgid "limit the summary size"
msgstr "Größe der Zusammenfassung begrenzen"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1299
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<Optionen>] [<Commit>] [--] [<Pfad>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1323
msgid "could not fetch a revision for HEAD"
msgstr "konnte keinen Commit für HEAD holen"
-#: builtin/submodule--helper.c:1342
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached und --files schließen sich gegenseitig aus"
-
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1384
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synchronisiere Submodul-URL für '%s'\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1390
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1399
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1409
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1456
msgid "suppress output of synchronizing submodule url"
msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1463
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1513
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"Arbeitsverzeichnis von Submodul in '%s' enthält ein .git-Verzeichnis\n"
-"(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n"
-"löschen möchten)"
+"Arbeitsverzeichnis von Submodul in '%s' enthält ein .git-Verzeichnis. Durch "
+"die Nutzung von \"absorbgitdirs\" wird dieses durch eine .git-Datei ersetzt."
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1530
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23211,49 +23853,49 @@
"Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n"
"verwenden Sie '-f', um diese zu verwerfen."
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1538
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Verzeichnis '%s' bereinigt.\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1540
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Konnte Arbeitsverzeichnis des Submoduls in '%s' nicht löschen.\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1551
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "Konnte kein leeres Verzeichnis für Submodul in '%s' erstellen."
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1567
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submodul '%s' (%s) für Pfad '%s' ausgetragen.\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1596
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen "
"vorliegen"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1597
msgid "unregister all submodules"
msgstr "alle Submodule austragen"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1602
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1616
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
"möchten."
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1665
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -23266,160 +23908,175 @@
"submodule.alternateErrorStrategy auf 'info' oder klone mit der Option\n"
"'--reference-if-able' statt '--reference'."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1749
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Wert '%s' für submodule.alternateErrorStrategy wird nicht erkannt"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1756
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Wert '%s' für submodule.alternateLocation wird nicht erkannt."
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1781
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"Erstellung/Benutzung von '%s' in einem anderen Submodul-Git-Verzeichnis\n"
"verweigert."
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1826
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen."
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1831
#, c-format
msgid "directory not empty: '%s'"
msgstr "Verzeichnis ist nicht leer: '%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1843
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1876
msgid "where the new submodule will be cloned to"
msgstr "Pfad für neues Submodul"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1879
msgid "name of the new submodule"
msgstr "Name des neuen Submoduls"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1882
msgid "url where to clone the submodule from"
msgstr "URL von der das Submodul geklont wird"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
msgid "depth for shallow clones"
msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
+#: builtin/submodule--helper.c:3376
msgid "force cloning progress"
msgstr "Fortschrittsanzeige beim Klonen erzwingen"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
msgid "disallow cloning into non-empty directory"
msgstr "Klonen in ein nicht leeres Verzeichnis verbieten"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1903
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference "
-"<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] --url "
-"<URL> --path <Pfad>"
+"<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] [--filter "
+"<filter-spec>] --url <URL> --path <Pfad>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1943
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s'."
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1947
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s' konfiguriert."
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Submodul-Pfad '%s' nicht initialisiert"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Meinten Sie vielleicht 'update --init'?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Überspringe nicht zusammengeführtes Submodul %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Überspringe Submodul '%s'"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
-msgid "path into the working tree"
-msgstr "Pfad zum Arbeitsverzeichnis"
+#: builtin/submodule--helper.c:2371
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Konnte '%s' nicht im Submodul-Pfad '%s' auschecken"
-#: builtin/submodule--helper.c:2347
-msgid "path into the working tree, across nested submodule boundaries"
+#: builtin/submodule--helper.c:2375
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Rebase von '%s' in Submodul-Pfad '%s' nicht möglich"
+
+#: builtin/submodule--helper.c:2379
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Merge von '%s' in Submodul-Pfad '%s' nicht möglich"
+
+#: builtin/submodule--helper.c:2383
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Ausführung von '%s %s' in Submodul-Pfad '%s' fehlgeschlagen"
+
+#: builtin/submodule--helper.c:2402
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Submodul-Pfad '%s': '%s' ausgecheckt\n"
+
+#: builtin/submodule--helper.c:2406
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Submodul-Pfad '%s': Rebase in '%s'\n"
+
+#: builtin/submodule--helper.c:2410
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Submodul-Pfad '%s': zusammengeführt in '%s'\n"
+
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Submodul-Pfad '%s': '%s %s'\n"
+
+#: builtin/submodule--helper.c:2438
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr ""
-"Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
+"Konnte \"fetch\" in Submodul-Pfad '%s' nicht ausführen; versuche %s direkt "
+"anzufordern:"
-#: builtin/submodule--helper.c:2351
-msgid "rebase, merge, checkout or none"
-msgstr "rebase, merge, checkout oder none"
-
-#: builtin/submodule--helper.c:2357
-msgid "create a shallow clone truncated to the specified number of revisions"
+#: builtin/submodule--helper.c:2447
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
msgstr ""
-"einen Klon mit unvollständiger Historie (shallow) erstellen, abgeschnitten "
-"bei der angegebenen Anzahl von Commits"
+"\"fetch\" in Submodul-Pfad '%s' ausgeführt, aber enthielt nicht %s. Direktes "
+"Anfordern dieses Commits ist fehlgeschlagen."
-#: builtin/submodule--helper.c:2360
-msgid "parallel jobs"
-msgstr "Parallele Ausführungen"
-
-#: builtin/submodule--helper.c:2362
-msgid "whether the initial clone should follow the shallow recommendation"
-msgstr ""
-"ob das initiale Klonen den Empfehlungen für eine unvollständige\n"
-"Historie (shallow) folgen soll"
-
-#: builtin/submodule--helper.c:2363
-msgid "don't print cloning progress"
-msgstr "keine Fortschrittsanzeige beim Klonen"
-
-#: builtin/submodule--helper.c:2374
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update-clone [--prefix=<Pfad>] [<Pfad>...]"
-
-#: builtin/submodule--helper.c:2387
-msgid "bad value for update parameter"
-msgstr "Fehlerhafter Wert für update Parameter"
-
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2481
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23428,106 +24085,212 @@
"Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n"
"zu erben, aber das Hauptprojekt befindet sich auf keinem Branch."
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2499
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "Konnte kein Repository-Handle für Submodul '%s' erhalten."
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2588
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr "Konnte aktuellen Commit nicht in Submodul-Pfad '%s' finden"
+
+#: builtin/submodule--helper.c:2599
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "Konnte \"fetch\" nicht in Submodul-Pfad '%s' ausführen"
+
+#: builtin/submodule--helper.c:2604
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr "Konnte %s Commit in Submodul-Pfad '%s' nicht finden"
+
+#: builtin/submodule--helper.c:2640
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
+
+#: builtin/submodule--helper.c:2699
+msgid "force checkout updates"
+msgstr "Checkout-Aktualisierungen erzwingen"
+
+#: builtin/submodule--helper.c:2701
+msgid "initialize uninitialized submodules before update"
+msgstr "initialisiere nicht-initialisierte Submodule vor dem Update"
+
+#: builtin/submodule--helper.c:2703
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "nutze SHA-1 von Remote-Tracking-Branch des Submoduls"
+
+#: builtin/submodule--helper.c:2705
+msgid "traverse submodules recursively"
+msgstr "Submodule rekursiv durchlaufen"
+
+#: builtin/submodule--helper.c:2707
+msgid "don't fetch new objects from the remote site"
+msgstr "keine neuen Objekte von Remote abrufen"
+
+#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+msgid "path into the working tree"
+msgstr "Pfad zum Arbeitsverzeichnis"
+
+#: builtin/submodule--helper.c:2713
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr ""
+"Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
+
+#: builtin/submodule--helper.c:2717
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout oder none"
+
+#: builtin/submodule--helper.c:2723
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr ""
+"einen Klon mit unvollständiger Historie (shallow) erstellen, abgeschnitten "
+"bei der angegebenen Anzahl von Commits"
+
+#: builtin/submodule--helper.c:2726
+msgid "parallel jobs"
+msgstr "Parallele Ausführungen"
+
+#: builtin/submodule--helper.c:2728
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr ""
+"ob das initiale Klonen den Empfehlungen für eine unvollständige\n"
+"Historie (shallow) folgen soll"
+
+#: builtin/submodule--helper.c:2729
+msgid "don't print cloning progress"
+msgstr "keine Fortschrittsanzeige beim Klonen"
+
+#: builtin/submodule--helper.c:2741
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+msgstr ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <Repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<Pfad>...]"
+
+#: builtin/submodule--helper.c:2767
+msgid "bad value for update parameter"
+msgstr "Fehlerhafter Wert für update Parameter"
+
+#: builtin/submodule--helper.c:2893
msgid "recurse into submodules"
msgstr "Rekursion in Submodule durchführen"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2899
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2955
msgid "check if it is safe to write to the .gitmodules file"
msgstr "prüfen, ob es sicher ist, in die Datei .gitmodules zu schreiben"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2958
msgid "unset the config in the .gitmodules file"
msgstr "Konfiguration in der .gitmodules-Datei entfernen"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <name> [<Wert>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <Name>"
-#: builtin/submodule--helper.c:2663
-msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper config --check-writeable"
-
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
+#: builtin/submodule--helper.c:3395
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"Bitte stellen Sie sicher, dass sich die Datei .gitmodules im "
"Arbeitsverzeichnis befindet."
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:3000
msgid "suppress output for setting url of a submodule"
msgstr "Ausgaben beim Setzen der URL eines Submoduls unterdrücken"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:3004
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <Pfad> <neue URL>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:3037
msgid "set the default tracking branch to master"
msgstr "Standard-Tracking-Branch auf master setzen"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:3039
msgid "set the default tracking branch"
msgstr "Standard-Tracking-Branch setzen"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:3043
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) [<Pfad>]"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:3044
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <Branch> <Pfad>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:3051
msgid "--branch or --default required"
msgstr "Option --branch oder --default erforderlich"
-#: builtin/submodule--helper.c:2752
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch und --default schließen sich gegenseitig aus"
+#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+msgid "print only error messages"
+msgstr "nur Fehlermeldungen ausgeben"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3073
+msgid "force creation"
+msgstr "erzwinge Erstellung"
+
+#: builtin/submodule--helper.c:3081
+msgid "show whether the branch would be created"
+msgstr "anzeigen, ob der Branch erzeugt werden würde"
+
+#: builtin/submodule--helper.c:3085
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <Name> <Start-oid> <Start-Name>"
+
+#: builtin/submodule--helper.c:3097
+#, c-format
+msgid "creating branch '%s'"
+msgstr "erstelle Branch '%s'"
+
+#: builtin/submodule--helper.c:3155
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Füge existierendes Repository in '%s' dem Index hinzu\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3158
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' existiert bereits und ist kein gültiges Git-Repository"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3171
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr ""
"Ein Git-Verzeichnis für '%s' wurde lokal gefunden mit den Remote-"
-"Repositories:"
+"Repositories:\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3178
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"Wenn Sie das lokale Git-Verzeichnis wiederverwenden wollen, anstatt erneut "
"von\n"
@@ -23535,40 +24298,85 @@
"zu klonen, benutzen Sie die Option '--force'. Wenn das lokale Git-"
"Verzeichnis\n"
"nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n"
-"wählen Sie einen anderen Namen mit der Option '--name'.\n"
+"wählen Sie einen anderen Namen mit der Option '--name'."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3190
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '%s'\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3227
#, c-format
msgid "unable to checkout submodule '%s'"
-msgstr "Kann Submodul '%s' nicht auschecken"
+msgstr "kann Submodul '%s' nicht auschecken"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "Branch des Repositories zum Auschecken beim Klonen"
+#: builtin/submodule--helper.c:3266
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Hinzufügen von Submodul '%s' fehlgeschlagen"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
+#: builtin/submodule--helper.c:3283
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Fehler beim Registrieren von Submodul '%s'"
+
+#: builtin/submodule--helper.c:3339
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' existiert bereits im Index"
+
+#: builtin/submodule--helper.c:3342
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' existiert bereits im Index und ist kein Submodul"
+
+#: builtin/submodule--helper.c:3372
+msgid "branch of repository to add as submodule"
+msgstr "Branch des Repositories zum Hinzufügen als Submodul"
+
+#: builtin/submodule--helper.c:3373
msgid "allow adding an otherwise ignored submodule path"
msgstr "das Hinzufügen eines andernfalls ignorierten Submodul-Pfads erlauben"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<Optionen>...] --url <URL> --path <Pfad> --"
-"name <Name>"
+#: builtin/submodule--helper.c:3379
+msgid "borrow the objects from reference repositories"
+msgstr "die Objekte von Referenz-Repositories ausleihen"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3381
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"legt den Namen des Submoduls auf die angegebene Zeichenkette fest, statt "
+"standardmäßig dessen Pfad zu nehmen"
+
+#: builtin/submodule--helper.c:3388
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<Optionen>] [--] <Repository> [<Pfad>]"
+
+#: builtin/submodule--helper.c:3416
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses "
+"benutzt werden."
+
+#: builtin/submodule--helper.c:3425
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "repo URL: '%s' muss absolut sein oder mit ./|../ beginnen"
+
+#: builtin/submodule--helper.c:3460
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' ist kein gültiger Submodul-Name"
+
+#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s unterstützt kein --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3526
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
@@ -23594,53 +24402,53 @@
msgid "shorten ref output"
msgstr "verkürzte Ausgabe der Referenzen"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "Grund"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "Grund für die Aktualisierung"
-#: builtin/tag.c:25
+#: builtin/tag.c:26
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>]\n"
-"\t\t<Tagname> [<Commit>]"
+"git tag [-a | -s | -u <Schlüssel-ID>] [-f] [-m <Beschreibung> | -F <Datei>]\n"
+" <Tagname> [<Commit>]"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid "git tag -d <tagname>..."
msgstr "git tag -d <Tagname>..."
-#: builtin/tag.c:28
+#: builtin/tag.c:29
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<Nummer>]] [--contains <Commit>] [--no-contains <Commit>] [--"
"points-at <Objekt>]\n"
-"\t\t[--format=<format>] [--merged <Commit>] [--no-merged <Commit>] "
+" [--format=<format>] [--merged <Commit>] [--no-merged <Commit>] "
"[<Muster>...]"
-#: builtin/tag.c:30
+#: builtin/tag.c:31
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<Format>] <Tagname>..."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "tag '%s' not found."
msgstr "Tag '%s' nicht gefunden."
-#: builtin/tag.c:135
+#: builtin/tag.c:136
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' gelöscht (war %s)\n"
-#: builtin/tag.c:170
+#: builtin/tag.c:171
#, c-format
msgid ""
"\n"
@@ -23653,7 +24461,7 @@
" %s\n"
"ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
-#: builtin/tag.c:174
+#: builtin/tag.c:175
#, c-format
msgid ""
"\n"
@@ -23690,134 +24498,115 @@
msgid "bad object type."
msgstr "ungültiger Objekt-Typ"
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "keine Tag-Beschreibung?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Die Tag-Beschreibung wurde in %s gelassen\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:445
msgid "list tag names"
msgstr "Tagnamen auflisten"
-#: builtin/tag.c:448
+#: builtin/tag.c:447
msgid "print <n> lines of each tag message"
msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
-#: builtin/tag.c:450
+#: builtin/tag.c:449
msgid "delete tags"
msgstr "Tags löschen"
-#: builtin/tag.c:451
+#: builtin/tag.c:450
msgid "verify tags"
msgstr "Tags überprüfen"
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "Tag creation options"
msgstr "Optionen für Erstellung von Tags"
-#: builtin/tag.c:455
+#: builtin/tag.c:454
msgid "annotated tag, needs a message"
msgstr "annotiertes Tag, benötigt eine Beschreibung"
-#: builtin/tag.c:457
+#: builtin/tag.c:456
msgid "tag message"
msgstr "Tag-Beschreibung"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
msgid "force edit of tag message"
msgstr "Bearbeitung der Tag-Beschreibung erzwingen"
-#: builtin/tag.c:460
+#: builtin/tag.c:459
msgid "annotated and GPG-signed tag"
msgstr "annotiertes und GPG-signiertes Tag"
-#: builtin/tag.c:463
+#: builtin/tag.c:462
msgid "use another key to sign the tag"
msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
-#: builtin/tag.c:464
+#: builtin/tag.c:463
msgid "replace the tag if exists"
msgstr "das Tag ersetzen, wenn es existiert"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:464 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "Reflog erstellen"
-#: builtin/tag.c:467
+#: builtin/tag.c:466
msgid "Tag listing options"
msgstr "Optionen für Auflistung der Tags"
-#: builtin/tag.c:468
+#: builtin/tag.c:467
msgid "show tag list in columns"
msgstr "Liste der Tags in Spalten anzeigen"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:469 builtin/tag.c:471
msgid "print only tags that don't contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
-#: builtin/tag.c:473
+#: builtin/tag.c:472
msgid "print only tags that are merged"
msgstr "nur Tags ausgeben, die gemerged wurden"
-#: builtin/tag.c:474
+#: builtin/tag.c:473
msgid "print only tags that are not merged"
msgstr "nur Tags ausgeben, die nicht gemerged wurden"
-#: builtin/tag.c:478
+#: builtin/tag.c:477
msgid "print only tags of the object"
msgstr "nur Tags von dem Objekt ausgeben"
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column und -n sind inkompatibel"
+#: builtin/tag.c:559
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "die Option '%s' ist nur im Listenmodus erlaubt"
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "die Option -n ist nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains ist nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "--no-contains ist nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "--points-at ist nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "--merged und --no-merged sind nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:567
-msgid "only one -F or -m option is allowed."
-msgstr "nur eine -F oder -m Option ist erlaubt."
-
-#: builtin/tag.c:592
+#: builtin/tag.c:598
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ist kein gültiger Tagname."
-#: builtin/tag.c:597
+#: builtin/tag.c:603
#, c-format
msgid "tag '%s' already exists"
msgstr "Tag '%s' existiert bereits"
-#: builtin/tag.c:628
+#: builtin/tag.c:634
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aktualisiert (war %s)\n"
+#: builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "Paket überschreitet die maximal erlaubte Größe"
+
#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr "Entpacke Objekte"
@@ -23827,230 +24616,225 @@
msgid "failed to create directory %s"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "Konnte Datei '%s' nicht erstellen"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "Konnte Datei '%s' nicht löschen"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "Konnte Verzeichnis '%s' nicht löschen"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Prüfe mtime in '%s' "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr ""
"Verzeichnisinformationen haben sich nach Hinzufügen einer neuen Datei nicht "
"geändert"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"Verzeichnisinformationen haben sich nach Hinzufügen eines neuen "
"Verzeichnisses nicht geändert"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr ""
"Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"Verzeichnisinformationen haben sich nach Hinzufügen einer Datei in ein "
"Unterverzeichnis geändert"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr ""
"Verzeichnisinformationen haben sich nach dem Löschen einer Datei nicht "
"geändert"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"Verzeichnisinformationen haben sich nach dem Löschen eines Verzeichnisses "
"nicht geändert"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:993
msgid "continue refresh even when index needs update"
msgstr ""
"Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:996
msgid "refresh: ignore submodules"
msgstr "Aktualisierung: ignoriert Submodule"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:999
msgid "do not ignore new files"
msgstr "keine neuen Dateien ignorieren"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:1001
msgid "let files replace directories and vice-versa"
msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1003
msgid "notice files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:1005
msgid "refresh even if index contains unmerged entries"
msgstr ""
"aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1008
msgid "refresh stat information"
msgstr "Dateiinformationen aktualisieren"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1012
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1016
msgid "<mode>,<object>,<path>"
msgstr "<Modus>,<Objekt>,<Pfad>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1017
msgid "add the specified entry to the index"
msgstr "den angegebenen Eintrag zum Commit vormerken"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1027
msgid "mark files as \"not changing\""
msgstr "diese Datei immer als unverändert betrachten"
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1030
msgid "clear assumed-unchanged bit"
msgstr "\"assumed-unchanged\"-Bit löschen"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1033
msgid "mark files as \"index-only\""
msgstr "Dateien als \"index-only\" markieren"
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1036
msgid "clear skip-worktree bit"
msgstr "\"skip-worktree\"-Bit löschen"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1039
msgid "do not touch index-only entries"
msgstr "\"index-only\" Einträge überspringen"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1041
msgid "add to index only; do not add content to object database"
msgstr ""
"die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-"
"Datenbank hinzugefügt"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1043
msgid "remove named paths even if present in worktree"
msgstr ""
"benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1045
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1047
msgid "read list of paths to be updated from standard input"
msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1051
msgid "add entries from standard input to the index"
msgstr "Einträge von der Standard-Eingabe zum Commit vormerken"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1055
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
"wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1059
msgid "only update entries that differ from HEAD"
msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1063
msgid "ignore files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1066
msgid "report actions to standard output"
msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1068
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1072
msgid "write index in this format"
msgstr "Index-Datei in diesem Format schreiben"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1074
msgid "enable or disable split index"
-msgstr "Splitting des Index aktivieren oder deaktivieren"
+msgstr "aufgeteilten Index aktivieren oder deaktivieren"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1076
msgid "enable/disable untracked cache"
msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1078
msgid "test if the filesystem supports untracked cache"
msgstr ""
"prüfen, ob das Dateisystem einen Cache für unversionierte Dateien unterstützt"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1080
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1082
msgid "write out the index even if is not flagged as changed"
msgstr "Index rausschreiben, auch wenn dieser nicht als geändert markiert ist"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1084
msgid "enable or disable file system monitor"
msgstr "Dateisystem-Monitor aktivieren oder deaktivieren"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1086
msgid "mark files as fsmonitor valid"
msgstr "Dateien als \"fsmonitor valid\" markieren"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1089
msgid "clear fsmonitor valid bit"
msgstr "\"fsmonitor valid\"-Bit löschen"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1195
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
"core.splitIndex ist auf 'false' gesetzt; entfernen oder ändern Sie dies,\n"
-"wenn sie wirklich das Splitting des Index aktivieren möchten"
+"wenn sie wirklich die Aufteilung des Index aktivieren möchten"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1204
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
"core.splitIndex ist auf 'true' gesetzt; entfernen oder ändern Sie dies,\n"
-"wenn Sie wirklich das Splitting des Index deaktivieren möchten"
+"wenn Sie wirklich die Aufteilung des Index deaktivieren möchten"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1216
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -24058,11 +24842,11 @@
"core.untrackedCache ist auf 'true' gesetzt; entfernen oder ändern Sie dies,\n"
"wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1220
msgid "Untracked cache disabled"
msgstr "Cache für unversionierte Dateien deaktiviert"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1228
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -24071,23 +24855,23 @@
"dies,\n"
"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1232
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1241
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor nicht gesetzt; setzen Sie es, wenn Sie den Dateisystem-"
"Monitor\n"
"wirklich aktivieren möchten"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1246
msgid "fsmonitor enabled"
msgstr "Dateisystem-Monitor aktiviert"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1250
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
@@ -24095,7 +24879,7 @@
"Monitor\n"
"wirklich deaktivieren möchten."
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1254
msgid "fsmonitor disabled"
msgstr "Dateisystem-Monitor deaktiviert"
@@ -24112,26 +24896,22 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<Optionen>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "diese Referenz löschen"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "<Referenzname> aktualisieren, nicht den Verweis"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "Aktualisierungen von der Standard-Eingabe lesen"
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "die Informationsdateien von Grund auf aktualisieren"
@@ -24140,21 +24920,21 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "nach einem einzigen Request/Response-Austausch beenden"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "direkt nach der initialen Angabe der Commits beenden"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "info/refs für git-http-backend übergeben"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis "
"ist"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
@@ -24190,277 +24970,286 @@
msgid "print tag contents"
msgstr "Tag-Inhalte ausgeben"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<Optionen>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<Optionen>] <Pfad>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<Optionen>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [<Pfad>...]"
+
+#: builtin/worktree.c:26
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <Pfad>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "Fehler beim Löschen von '%s'"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:76
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Entferne %s/%s: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "entfernte Arbeitsverzeichnisse ausgeben"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existiert bereits"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:230
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "nicht nutzbares Ziel des Arbeitsverzeichnisses '%s'"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:235
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
"'%s' ist ein fehlendes, aber gesperrtes Arbeitsverzeichnis;\n"
-"Benutzen Sie '%s -f -f' zum Überschreiben, oder 'unlock' und 'prune'\n"
-"oder 'remove' zum Löschen."
+"benutzen Sie '%s -f -f' zum Überschreiben, oder 'unlock' und 'prune'\n"
+"oder 'remove' zum Löschen"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:237
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use '%s -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
"'%s' ist ein fehlendes, aber bereits registriertes Arbeitsverzeichnis;\n"
-"Benutzen Sie '%s -f' zum Überschreiben, oder 'prune' oder 'remove' zum\n"
-"Löschen."
+"benutzen Sie '%s -f' zum Überschreiben, oder 'prune' oder 'remove' zum\n"
+"Löschen"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:248
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr ""
+"Fehler beim Kopieren von '%s' nach '%s'; partieller Checkout funktioniert "
+"möglicherweise nicht richtig"
+
+#: builtin/worktree.c:268
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr ""
+"Fehler beim Kopieren der Arbeitsverzeichniskonfiguration von '%s' nach '%s'"
+
+#: builtin/worktree.c:280 builtin/worktree.c:285
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "Fehler beim Aufheben von '%s' in '%s'"
+
+#: builtin/worktree.c:356
#, c-format
msgid "could not create directory of '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/worktree.c:308
+#: builtin/worktree.c:378
msgid "initializing"
msgstr "initialisiere"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:492 builtin/worktree.c:498
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:494
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:503
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:509
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:554
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"<Branch> auschecken, auch wenn dieser bereits in einem anderen "
"Arbeitsverzeichnis ausgecheckt ist"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:557
msgid "create a new branch"
msgstr "neuen Branch erstellen"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:559
msgid "create or reset a branch"
msgstr "Branch erstellen oder umsetzen"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:561
msgid "populate the new working tree"
msgstr "das neue Arbeitsverzeichnis auschecken"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:562
msgid "keep the new working tree locked"
msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:564 builtin/worktree.c:809
msgid "reason for locking"
msgstr "Sperrgrund"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:567
msgid "set up tracking mode (see git-branch(1))"
msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:570
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-"versuchen, eine Übereinstimmung des Branch-Namens mit einem\n"
+"versuchen, eine Übereinstimmung des Branchnamens mit einem\n"
"Remote-Tracking-Branch herzustellen"
-#: builtin/worktree.c:506
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B und --detach schließen sich gegenseitig aus"
-
-#: builtin/worktree.c:508
-msgid "--reason requires --lock"
-msgstr "--reason benötigt --lock"
-
-#: builtin/worktree.c:512
+#: builtin/worktree.c:584
msgid "added with --lock"
msgstr "mit --lock hinzugefügt"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:646
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
"--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird."
-#: builtin/worktree.c:691
+#: builtin/worktree.c:766
msgid "show extended annotations and reasons, if available"
msgstr "erweiterte Anmerkungen und Gründe anzeigen, falls vorhanden"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:768
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
"'prunable'-Anmerkung zu Arbeitsverzeichnissen älter als <Zeit> hinzufügen"
-#: builtin/worktree.c:702
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose und --porcelain schließen sich gegenseitig aus"
+#: builtin/worktree.c:770
+msgid "terminate records with a NUL character"
+msgstr "Einträge mit NUL-Zeichen abschließen"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
+#: builtin/worktree.c:1052
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' ist kein Arbeitsverzeichnis"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:823 builtin/worktree.c:856
msgid "The main working tree cannot be locked or unlocked"
msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
-#: builtin/worktree.c:748
+#: builtin/worktree.c:828
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ist bereits gesperrt, Grund: %s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:830
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ist bereits gesperrt"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:858
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' ist nicht gesperrt"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:899
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"Arbeitsverzeichnisse, die Submodule enthalten, können nicht verschoben oder\n"
"entfernt werden."
-#: builtin/worktree.c:827
+#: builtin/worktree.c:907
msgid "force move even if worktree is dirty or locked"
msgstr ""
"Verschieben erzwingen, auch wenn das Arbeitsverzeichnis geändert oder "
"gesperrt ist"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:930 builtin/worktree.c:1054
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' ist ein Hauptarbeitsverzeichnis"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:935
#, c-format
msgid "could not figure out destination name from '%s'"
-msgstr "Konnte Zielname aus '%s' nicht bestimmen."
+msgstr "konnte Zielname aus '%s' nicht bestimmen"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:948
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
"Kann kein gesperrtes Arbeitsverzeichnis verschieben, Sperrgrund: %s\n"
-"Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
-"das Arbeitsverzeichnis."
+"benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
+"das Arbeitsverzeichnis"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:950
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-"Kann kein gesperrtes Arbeitsverzeichnis verschieben.\n"
-"Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
-"das Arbeitsverzeichnis."
+"kann kein gesperrtes Arbeitsverzeichnis verschieben;\n"
+"benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
+"das Arbeitsverzeichnis"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:953
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:958
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "Fehler beim Verschieben von '%s' nach '%s'"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:1004
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "Fehler beim Ausführen von 'git status' auf '%s'"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:1008
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' enthält geänderte oder nicht versionierte Dateien, benutzen Sie --force "
"zum Löschen"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:1013
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "Fehler beim Ausführen von 'git status' auf '%s'. Code: %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:1036
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert oder gesperrt "
"ist"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:1059
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -24470,26 +25259,26 @@
"Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:981
+#: builtin/worktree.c:1061
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-"Kann kein gesperrtes Arbeitsverzeichnis löschen.\n"
-"Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
-"das Arbeitsverzeichnis."
+"kann kein gesperrtes Arbeitsverzeichnis löschen;\n"
+"benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
+"das Arbeitsverzeichnis"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:1064
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1088
#, c-format
msgid "repair: %s: %s"
msgstr "repariere: %s: %s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1091
#, c-format
msgid "error: %s: %s"
msgstr "Fehler: %s: %s"
@@ -24541,21 +25330,16 @@
"Konzept zu erfahren.\n"
"Benutzen Sie 'git help git' für einen Überblick des Systems."
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "Kein Verzeichnis für --git-dir angegeben.\n"
+msgid "no directory given for '%s' option\n"
+msgstr "kein Verzeichnis für Option '%s' angegeben\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "Kein Namespace für --namespace angegeben.\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "Kein Verzeichnis für --work-tree angegeben.\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
@@ -24571,11 +25355,6 @@
msgid "no config key given for --config-env\n"
msgstr "kein Konfigurationsschlüssel für --config-env angegeben\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "Kein Verzeichnis für -C angegeben.\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
@@ -24605,29 +25384,29 @@
msgid "recursive alias: %s"
msgstr "rekursiver Alias: %s"
-#: git.c:476
+#: git.c:480
msgid "write failure on standard output"
msgstr "Fehler beim Schreiben in die Standard-Ausgabe."
-#: git.c:478
+#: git.c:482
msgid "unknown write failure on standard output"
msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe."
-#: git.c:480
+#: git.c:484
msgid "close failed on standard output"
msgstr "Fehler beim Schließen der Standard-Ausgabe."
-#: git.c:833
+#: git.c:838
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "Alias-Schleife erkannt: Erweiterung von '%s' schließt nicht ab:%s"
-#: git.c:883
+#: git.c:888
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "Kann %s nicht als eingebauten Befehl behandeln."
-#: git.c:896
+#: git.c:901
#, c-format
msgid ""
"usage: %s\n"
@@ -24636,33 +25415,25 @@
"Verwendung: %s\n"
"\n"
-#: git.c:916
+#: git.c:921
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl\n"
-#: git.c:928
+#: git.c:933
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "Fehler beim Ausführen von Befehl '%s': %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr "Argument für --packfile muss ein gültiger Hash sein ('%s' erhalten)"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "kein Git-Repository"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile benötigt --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args kann nur mit --packfile benutzt werden"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "unbehandelte Optionen"
@@ -24688,65 +25459,31 @@
msgid "exit immediately after advertising capabilities"
msgstr "direkt nach Anzeige der angebotenen Fähigkeiten beenden"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "Socket/Pipe bereits in Benutzung: '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "konnte Server nicht starten auf: '%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "Daemon konnte nicht im Hintergrund erzeugt werden"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid fehlgeschlagen"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "Daemon ist noch nicht online"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "Fehler beim Starten des Daemons"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid ist verwirrt"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "Daemon ist noch nicht heruntergefahren"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<Name>] [<Optionen>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<Name>] [<Threads>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr "test-helper simple-ipc start-daemon [<Name>] [<Threads>] [<max-wait>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<Name>] [<max-wait>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<Name>] [<Token>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [<Name>] [<bytecount>] [<Byte>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24754,86 +25491,82 @@
"test-helper simple-ipc multiple [<Name>] [<Threads>] [<bytecount>] "
"[<batchsize>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "Name oder Pfadname des UNIX-Domain-Sockets"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "Name der benannten Pipe"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "Anzahl der Threads im Thread-Pool des Servers"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "Sekunden, um auf Starten oder Stoppen des Daemons zu warten"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "Anzahl von Bytes"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "Anzahl der Anfragen pro Thread"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "Byte"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "Ballast-Zeichen"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "Token"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "Befehlstoken, der an den Server gesendet werden soll"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Kontrolle über Delegation wird mit cURL < 7.22.0 nicht unterstützt"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
msgstr ""
-"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
-"nicht unterstützt."
+"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.39.0 nicht "
+"unterstützt"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE wird mit cURL < 7.44.0 nicht unterstützt."
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Protokollbeschränkungen werden mit cURL < 7.19.4 nicht unterstützt."
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Nicht unterstütztes SSL-Backend '%s'. Unterstützte SSL-Backends:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"Konnte SSL-Backend nicht zu '%s' setzen: cURL wurde ohne SSL-Backends gebaut."
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Konnte SSL-Backend nicht zu '%s' setzen: bereits gesetzt"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24844,140 +25577,331 @@
" gefragt nach: %s\n"
" umgeleitet: %s"
-#: remote-curl.c:183
+#: remote-curl.c:184
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "Ungültiges Quoting beim \"push-option\"-Wert: '%s'"
-#: remote-curl.c:307
+#: remote-curl.c:308
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs nicht gültig: Ist das ein Git-Repository?"
-#: remote-curl.c:408
+#: remote-curl.c:409
msgid "invalid server response; expected service, got flush packet"
msgstr "ungültige Antwort des Servers; Service erwartet, Flush-Paket bekommen"
-#: remote-curl.c:439
+#: remote-curl.c:440
#, c-format
msgid "invalid server response; got '%s'"
msgstr "ungültige Serverantwort; '%s' bekommen"
-#: remote-curl.c:499
+#: remote-curl.c:500
#, c-format
msgid "repository '%s' not found"
msgstr "Repository '%s' nicht gefunden"
-#: remote-curl.c:503
+#: remote-curl.c:504
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Authentifizierung fehlgeschlagen für '%s'"
-#: remote-curl.c:507
+#: remote-curl.c:508
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+"auf '%s' kann nicht mit Konfiguration http.pinnedPubkey zugegriffen werden: "
+"%s"
+
+#: remote-curl.c:512
#, c-format
msgid "unable to access '%s': %s"
msgstr "konnte nicht auf '%s' zugreifen: %s"
-#: remote-curl.c:513
+#: remote-curl.c:518
#, c-format
msgid "redirecting to %s"
msgstr "Umleitung nach %s"
-#: remote-curl.c:644
+#: remote-curl.c:649
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF"
-#: remote-curl.c:656
+#: remote-curl.c:661
msgid "remote server sent unexpected response end packet"
msgstr "Remote Server sendete unerwartetes Antwort-Endpaket"
-#: remote-curl.c:726
+#: remote-curl.c:730
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"konnte nicht RPC-POST-Daten zurückspulen - Versuchen Sie http.postBuffer zu "
"erhöhen"
-#: remote-curl.c:756
+#: remote-curl.c:759
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: ungültiges Zeichen für Zeilenlänge: %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:761
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: unerwartetes Antwort-Endpaket"
-#: remote-curl.c:834
+#: remote-curl.c:837
#, c-format
msgid "RPC failed; %s"
msgstr "RPC fehlgeschlagen; %s"
-#: remote-curl.c:874
+#: remote-curl.c:877
msgid "cannot handle pushes this big"
-msgstr "Kann solche großen Übertragungen nicht verarbeiten."
+msgstr "kann solche großen Übertragungen nicht verarbeiten"
-#: remote-curl.c:989
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
-msgstr "Kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d"
+msgstr "kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d"
-#: remote-curl.c:993
+#: remote-curl.c:994
#, c-format
msgid "cannot deflate request; zlib end error %d"
-msgstr "Kann Request nicht komprimieren; \"zlib end\"-Fehler %d"
+msgstr "kann Request nicht komprimieren; \"zlib end\"-Fehler %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1044
#, c-format
msgid "%d bytes of length header were received"
msgstr "%d Bytes des Längen-Headers wurden empfangen"
-#: remote-curl.c:1045
+#: remote-curl.c:1046
#, c-format
msgid "%d bytes of body are still expected"
msgstr "%d Bytes des Bodys werden noch erwartet"
-#: remote-curl.c:1134
+#: remote-curl.c:1135
msgid "dumb http transport does not support shallow capabilities"
msgstr "Dumb HTTP-Transport unterstützt keine shallow-Funktionen"
-#: remote-curl.c:1149
+#: remote-curl.c:1150
msgid "fetch failed."
msgstr "\"fetch\" fehlgeschlagen."
-#: remote-curl.c:1195
+#: remote-curl.c:1198
msgid "cannot fetch by sha1 over smart http"
-msgstr "Kann SHA-1 nicht über Smart-HTTP anfordern"
+msgstr "kann SHA-1 nicht über Smart-HTTP anfordern"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1242 remote-curl.c:1248
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1260 remote-curl.c:1378
#, c-format
msgid "http transport does not support %s"
msgstr "HTTP-Transport unterstützt nicht %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1296
msgid "git-http-push failed"
msgstr "\"git-http-push\" fehlgeschlagen"
-#: remote-curl.c:1481
+#: remote-curl.c:1485
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1517
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git"
-#: remote-curl.c:1520
+#: remote-curl.c:1524
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht"
-#: remote-curl.c:1561
+#: remote-curl.c:1565
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: Unbekannter Befehl '%s' von Git"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "Arbeitsverzeichnis benötigt"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "konnte Root-Verzeichnis für Eintragungen nicht finden"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
+#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "konnte nicht zu '%s' wechseln"
+
+#: contrib/scalar/scalar.c:179
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "konnte %s=%s nicht konfigurieren"
+
+#: contrib/scalar/scalar.c:197
+msgid "could not configure log.excludeDecoration"
+msgstr "konnte log.excludeDecoration nicht konfigurieren"
+
+#: contrib/scalar/scalar.c:218
+msgid "Scalar enlistments require a worktree"
+msgstr "Skalare Eintragungen erfordern ein Arbeitsverzeichnis"
+
+#: contrib/scalar/scalar.c:310
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "externer HEAD ist kein Branch: '%.*s'"
+
+#: contrib/scalar/scalar.c:316
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"Fehler beim Abfragen des Standard-Branchnamens vom Remote-Repository; nutze "
+"lokalen Standardwert"
+
+#: contrib/scalar/scalar.c:329
+msgid "failed to get default branch name"
+msgstr "Fehler beim Abfragen des Standard-Branchnamens"
+
+#: contrib/scalar/scalar.c:340
+msgid "failed to unregister repository"
+msgstr "Fehler beim Austragen des Repositories"
+
+#: contrib/scalar/scalar.c:355
+msgid "failed to delete enlistment directory"
+msgstr "Fehler beim Löschen des Eintragungs-Verzeichnisses"
+
+#: contrib/scalar/scalar.c:375
+msgid "branch to checkout after clone"
+msgstr "Branch, der nach dem Klonen ausgecheckt werden soll"
+
+#: contrib/scalar/scalar.c:377
+msgid "when cloning, create full working directory"
+msgstr "vollständiges Arbeitsverzeichnis beim Klonen erstellen"
+
+#: contrib/scalar/scalar.c:379
+msgid "only download metadata for the branch that will be checked out"
+msgstr "lade nur Metadaten des Branches herunter, der ausgecheckt wird"
+
+#: contrib/scalar/scalar.c:384
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
+
+#: contrib/scalar/scalar.c:409
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "konnte Name für Arbeitsverzeichnis nicht von '%s' ableiten"
+
+#: contrib/scalar/scalar.c:418
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "Verzeichnis '%s' existiert bereits"
+
+#: contrib/scalar/scalar.c:445
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "Fehler beim Abfragen des Default-Branches für '%s'"
+
+#: contrib/scalar/scalar.c:456
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "konnte Remote-Repository in '%s' nicht konfigurieren"
+
+#: contrib/scalar/scalar.c:465
+#, c-format
+msgid "could not configure '%s'"
+msgstr "konnte '%s' nicht konfigurieren"
+
+#: contrib/scalar/scalar.c:468
+msgid "partial clone failed; attempting full clone"
+msgstr "partielles Klonen fehlgeschlagen; versuche vollständiges Klonen"
+
+#: contrib/scalar/scalar.c:472
+msgid "could not configure for full clone"
+msgstr "konnte nicht für vollständiges Klonen konfigurieren"
+
+#: contrib/scalar/scalar.c:504
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` akzeptiert keine Argumente"
+
+#: contrib/scalar/scalar.c:517
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<Eintragung>]"
+
+#: contrib/scalar/scalar.c:544
+msgid "reconfigure all registered enlistments"
+msgstr "alle registrierten Eintragungen neu konfigurieren"
+
+#: contrib/scalar/scalar.c:548
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <Eintragung>]"
+
+#: contrib/scalar/scalar.c:566
+msgid "--all or <enlistment>, but not both"
+msgstr "--all oder <Eintragung>, aber nicht beides"
+
+#: contrib/scalar/scalar.c:581
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "Git-Repository entfernt in '%s'"
+
+#: contrib/scalar/scalar.c:621
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <Aufgabe> [<Eintragung>]\n"
+"Aufgaben:\n"
+
+#: contrib/scalar/scalar.c:639
+#, c-format
+msgid "no such task: '%s'"
+msgstr "Aufgabe nicht gefunden: '%s'"
+
+#: contrib/scalar/scalar.c:689
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<Eintragung>]"
+
+#: contrib/scalar/scalar.c:736
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <Eintragung>"
+
+#: contrib/scalar/scalar.c:751
+msgid "refusing to delete current working directory"
+msgstr "Löschen des aktuellen Arbeitsverzeichnisses wurde verweigert"
+
+#: contrib/scalar/scalar.c:766
+msgid "include Git version"
+msgstr "Git-Version einbeziehen"
+
+#: contrib/scalar/scalar.c:768
+msgid "include Git's build options"
+msgstr "Build-Optionen von Git einbeziehen"
+
+#: contrib/scalar/scalar.c:772
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:813
+msgid "-C requires a <directory>"
+msgstr "-C erfordert ein <Verzeichnis>"
+
+#: contrib/scalar/scalar.c:815
+#, c-format
+msgid "could not change to '%s'"
+msgstr "konnte nicht zu '%s' wechseln"
+
+#: contrib/scalar/scalar.c:821
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c benötigt ein <Schlüssel>=<Wert> Argument"
+
+#: contrib/scalar/scalar.c:839
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <Verzeichnis>] [-c <Schlüssel>=<Wert>] <Befehl> [<Optionen>]\n"
+"\n"
+"Befehle:\n"
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr "keine Compiler-Information verfügbar\n"
@@ -24986,54 +25910,54 @@
msgid "no libc information available\n"
msgstr "keine libc Informationen verfügbar\n"
-#: list-objects-filter-options.h:94
+#: list-objects-filter-options.h:126
msgid "args"
msgstr "Argumente"
-#: list-objects-filter-options.h:95
+#: list-objects-filter-options.h:127
msgid "object filtering"
msgstr "Filtern nach Objekten"
-#: parse-options.h:184
+#: parse-options.h:188
msgid "expiry-date"
msgstr "Verfallsdatum"
-#: parse-options.h:198
+#: parse-options.h:202
msgid "no-op (backward compatibility)"
msgstr "Kein Effekt (Rückwärtskompatibilität)"
-#: parse-options.h:310
+#: parse-options.h:341
msgid "be more verbose"
msgstr "erweiterte Ausgaben"
-#: parse-options.h:312
+#: parse-options.h:343
msgid "be more quiet"
msgstr "weniger Ausgaben"
-#: parse-options.h:318
+#: parse-options.h:349
msgid "use <n> digits to display object names"
msgstr "benutze <Anzahl> Ziffern zur Anzeige von Objektnamen"
-#: parse-options.h:337
+#: parse-options.h:368
msgid "how to strip spaces and #comments from message"
msgstr ""
"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
-#: parse-options.h:338
+#: parse-options.h:369
msgid "read pathspec from file"
msgstr "Pfadspezifikation aus einer Datei lesen"
-#: parse-options.h:339
+#: parse-options.h:370
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"Mit der Option --pathspec-from-file sind Pfade durch NUL-Zeichen getrennt"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "key"
msgstr "Schüssel"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "sortiere nach diesem Feld"
@@ -25110,17 +26034,17 @@
msgstr "Name und E-Mail-Adresse von Kontakten anzeigen"
#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Sicherstellen, dass ein Referenzname wohlgeformt ist"
+
+#: command-list.h:66
msgid "Switch branches or restore working tree files"
msgstr "Branches wechseln oder Dateien im Arbeitsverzeichnis wiederherstellen"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "Dateien von dem Index ins Arbeitsverzeichnis kopieren"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Sicherstellen, dass ein Referenzname wohlgeformt ist"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr ""
@@ -25291,45 +26215,45 @@
msgstr "Hilfsinformationen über Git anzeigen"
#: command-list.h:108
+msgid "Run git hooks"
+msgstr "Git-Hooks ausführen"
+
+#: command-list.h:109
msgid "Server side implementation of Git over HTTP"
msgstr "serverseitige Implementierung von Git über HTTP"
-#: command-list.h:109
+#: command-list.h:110
msgid "Download from a remote Git repository via HTTP"
msgstr "von einem Remote-Git-Repository über HTTP herunterladen"
-#: command-list.h:110
+#: command-list.h:111
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Objekte über HTTP/DAV zu einem anderen Repository übertragen"
-#: command-list.h:111
+#: command-list.h:112
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
"eine Sammlung von Patches von der Standard-Eingabe zu einem IMAP-Ordner "
"senden"
-#: command-list.h:112
+#: command-list.h:113
msgid "Build pack index file for an existing packed archive"
msgstr "Pack-Index-Datei für ein existierendes gepacktes Archiv erzeugen"
-#: command-list.h:113
+#: command-list.h:114
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
"ein leeres Git-Repository erstellen oder ein bestehendes neuinitialisieren"
-#: command-list.h:114
+#: command-list.h:115
msgid "Instantly browse your working repository in gitweb"
msgstr "Ihr aktuelles Repository sofort in gitweb betrachten"
-#: command-list.h:115
+#: command-list.h:116
msgid "Add or parse structured information in commit messages"
msgstr ""
"Strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen"
-#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "der Git-Repository-Browser"
-
#: command-list.h:117
msgid "Show commit logs"
msgstr "Commit-Historie anzeigen"
@@ -25381,26 +26305,26 @@
msgstr "das Standard-Hilfsprogramm für die Verwendung mit git-merge-index"
#: command-list.h:129
+msgid "Show three-way merge without touching index"
+msgstr "3-Wege-Merge anzeigen ohne den Index zu verändern"
+
+#: command-list.h:130
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
"Ausführen von Tools zur Auflösung von Merge-Konflikten zur Behebung dieser"
-#: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "3-Wege-Merge anzeigen ohne den Index zu verändern"
-
#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "multi-pack-indexes schreiben und überprüfen"
-
-#: command-list.h:132
msgid "Creates a tag object with extra validation"
msgstr "Erstellt ein Tag-Objekt mit zusätzlicher Validierung"
-#: command-list.h:133
+#: command-list.h:132
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Tree-Objekt aus ls-tree formattiertem Text erzeugen"
+#: command-list.h:133
+msgid "Write and verify multi-pack-indexes"
+msgstr "Multi-Pack-Indexe schreiben und überprüfen"
+
#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
@@ -25507,17 +26431,17 @@
msgstr "Dateien im Arbeitsverzeichnis wiederherstellen"
#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "einige bestehende Commits rückgängig machen"
-
-#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
msgstr "Commit-Objekte in umgekehrter chronologischer Ordnung auflisten"
-#: command-list.h:161
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "Parameter herauspicken und ändern"
+#: command-list.h:161
+msgid "Revert some existing commits"
+msgstr "einige bestehende Commits rückgängig machen"
+
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr "Dateien im Arbeitsverzeichnis und vom Index löschen"
@@ -25531,49 +26455,51 @@
msgstr "Objekte über das Git Protokoll zu einem anderen Repository übertragen"
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
-msgstr "Login-Shell beschränkt für Nur-Git SSH-Zugriff"
-
-#: command-list.h:166
-msgid "Summarize 'git log' output"
-msgstr "Ausgabe von 'git log' zusammenfassen"
-
-#: command-list.h:167
-msgid "Show various types of objects"
-msgstr "verschiedene Arten von Objekten anzeigen"
-
-#: command-list.h:168
-msgid "Show branches and their commits"
-msgstr "Branches und ihre Commits ausgeben"
-
-#: command-list.h:169
-msgid "Show packed archive index"
-msgstr "gepackten Archiv-Index anzeigen"
-
-#: command-list.h:170
-msgid "List references in a local repository"
-msgstr "Referenzen in einem lokales Repository auflisten"
-
-#: command-list.h:171
msgid "Git's i18n setup code for shell scripts"
msgstr "Gits i18n-Konfigurationscode für Shell-Skripte"
-#: command-list.h:172
+#: command-list.h:166
msgid "Common Git shell script setup code"
msgstr "allgemeiner Git Shell-Skript Konfigurationscode"
+#: command-list.h:167
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Login-Shell beschränkt für Nur-Git SSH-Zugriff"
+
+#: command-list.h:168
+msgid "Summarize 'git log' output"
+msgstr "Ausgabe von 'git log' zusammenfassen"
+
+#: command-list.h:169
+msgid "Show various types of objects"
+msgstr "verschiedene Arten von Objekten anzeigen"
+
+#: command-list.h:170
+msgid "Show branches and their commits"
+msgstr "Branches und ihre Commits ausgeben"
+
+#: command-list.h:171
+msgid "Show packed archive index"
+msgstr "gepackten Archiv-Index anzeigen"
+
+#: command-list.h:172
+msgid "List references in a local repository"
+msgstr "Referenzen in einem lokales Repository auflisten"
+
#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
-msgstr "Initialisiere und verändere den partiellen Checkout"
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr ""
+"Reduzieren Sie Ihr Arbeitsverzeichnis auf eine Teilmenge der versionierten "
+"Dateien"
#: command-list.h:174
-msgid "Stash the changes in a dirty working directory away"
-msgstr "Änderungen in einem Arbeitsverzeichnis aufbewahren"
-
-#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Dateiinhalte der Staging-Area hinzufügen"
+#: command-list.h:175
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Änderungen in einem Arbeitsverzeichnis aufbewahren"
+
#: command-list.h:176
msgid "Show the working tree status"
msgstr "den Zustand des Arbeitsverzeichnisses anzeigen"
@@ -25651,66 +26577,66 @@
msgstr "die GPG-Signatur von Tags prüfen"
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git Web Interface (Web-Frontend für Git-Repositories)"
-
-#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen"
-#: command-list.h:196
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "mehrere Arbeitsverzeichnisse verwalten"
-#: command-list.h:197
+#: command-list.h:196
msgid "Create a tree object from the current index"
msgstr "Tree-Objekt vom aktuellen Index erstellen"
-#: command-list.h:198
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "Definition von Attributen pro Pfad"
-#: command-list.h:199
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Git Kommandozeilenschnittstelle und Konventionen"
-#: command-list.h:200
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "eine Git Anleitung für Entwickler"
-#: command-list.h:201
+#: command-list.h:200
msgid "Providing usernames and passwords to Git"
msgstr "Bereitstellung von Benutzernamen und Passwörtern für Git"
-#: command-list.h:202
+#: command-list.h:201
msgid "Git for CVS users"
msgstr "Git für CVS Benutzer"
-#: command-list.h:203
+#: command-list.h:202
msgid "Tweaking diff output"
msgstr "Diff-Ausgabe optimieren"
-#: command-list.h:204
+#: command-list.h:203
msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
"ein kleine, nützliche Menge von Befehlen für die tägliche Verwendung von Git"
-#: command-list.h:205
+#: command-list.h:204
msgid "Frequently asked questions about using Git"
msgstr "Häufig gestellte Fragen über die Nutzung von Git"
-#: command-list.h:206
+#: command-list.h:205
msgid "A Git Glossary"
msgstr "ein Git-Glossar"
-#: command-list.h:207
+#: command-list.h:206
msgid "Hooks used by Git"
msgstr "von Git verwendete Hooks"
-#: command-list.h:208
+#: command-list.h:207
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
+#: command-list.h:208
+msgid "The Git repository browser"
+msgstr "der Git-Repository-Browser"
+
#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
msgstr "Autor/Commit-Ersteller und/oder E-Mail-Adressen zuordnen"
@@ -25740,52 +26666,21 @@
msgstr "Einbinden eines Repositories in ein anderes"
#: command-list.h:216
-msgid "A tutorial introduction to Git: part two"
-msgstr "eine einführende Anleitung zu Git: Teil zwei"
-
-#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "eine einführende Anleitung zu Git"
+#: command-list.h:217
+msgid "A tutorial introduction to Git: part two"
+msgstr "eine einführende Anleitung zu Git: Teil zwei"
+
#: command-list.h:218
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git Web Interface (Web-Frontend für Git-Repositories)"
+
+#: command-list.h:219
msgid "An overview of recommended workflows with Git"
msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "führe $command aus"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"'bisect run' fehlgeschlagen:\n"
-"Exit-Code $res von '$command' ist < 0 oder >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"'bisect run' fehlgeschlagen:\n"
-"'bisect-state $state' wurde mit Fehlerwert $res beendet"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "'bisect run' erfolgreich ausgeführt"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25827,540 +26722,58 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge."
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses "
-"benutzt werden."
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' ist bereits zum Commit vorgemerkt und ist kein Submodul"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' hat keinen Commit ausgecheckt"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
-
-#: git-submodule.sh:532
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden."
-
-#: git-submodule.sh:542
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen"
-
-#: git-submodule.sh:547
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr ""
-"Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
-"'$sm_path' nicht finden."
-
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen. Versuche "
-"$sha1 direkt anzufordern:"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
-"enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich"
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' "
-"fehlgeschlagen"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
-
-#: git-submodule.sh:627
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Automatischen Stash angewendet."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Kann $stash_sha1 nicht speichern."
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"Anwendung des automatischen Stash resultierte in Konflikten.\n"
-"Ihre Änderungen sind im Stash sicher.\n"
-"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Führe Rebase aus ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Befehle:\n"
-"p, pick <Commit> = Commit verwenden\n"
-"r, reword <Commit> = Commit verwenden, aber Commit-Beschreibung bearbeiten\n"
-"e, edit <Commit> = Commit verwenden, aber zum Nachbessern anhalten\n"
-"s, squash <Commit> = Commit verwenden, aber mit vorherigem Commit vereinen\n"
-"f, fixup <Commit> = wie \"squash\", aber diese Commit-Beschreibung "
-"verwerfen\n"
-"x, exec <Commit> = Befehl (Rest der Zeile) mittels Shell ausführen\n"
-"d, drop <Commit> = Commit entfernen\n"
-"l, label <Label> = aktuellen HEAD mit Label versehen\n"
-"t, reset <Label> = HEAD zu einem Label umsetzen\n"
-"m, merge [-C <Commit> | -c <Commit>] <Label> [# <eineZeile>]\n"
-". Merge-Commit mit der originalen Merge-Commit-Beschreibung erstellen\n"
-". (oder die eine Zeile, wenn keine originale Merge-Commit-"
-"Beschreibung\n"
-". spezifiziert ist). Benutzen Sie -c <Commit> zum Bearbeiten der\n"
-". Commit-Beschreibung.\n"
-"\n"
-"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
-"ausgeführt.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Sie können den Commit nun nachbessern mit:\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Sobald Sie mit Ihren Änderungen zufrieden sind, führen Sie aus:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: kein Commit der gepickt werden kann"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Ungültiger Commit-Name: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Kann ersetzenden SHA-1 des aktuellen Commits nicht schreiben"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Spule vor zu $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Kann nicht zu $sha1 vorspulen"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Kann HEAD nicht auf $first_parent setzen"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen."
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Fehler beim Wiederholen des Merges von $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Konnte $sha1 nicht picken"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Das ist Commit-Beschreibung #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Commit-Beschreibung #${n} wird ausgelassen:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Das ist eine Kombination aus $count Commit."
-msgstr[1] "Das ist eine Kombination aus $count Commits."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Kann $fixup_msg nicht schreiben"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Das ist eine Kombination aus 2 Commits."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Konnte $sha1... ($rest) nicht anwenden"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Konnte Commit nicht nachbessern, nachdem dieser verwendet wurde: $sha1... "
-"$rest\n"
-"Das passierte sehr wahrscheinlich wegen einer leeren Commit-Beschreibung, "
-"oder\n"
-"weil der pre-commit Hook fehlschlug. Falls der pre-commit Hook fehlschlug,\n"
-"sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern "
-"können."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Angehalten bei $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Kann nicht '$squash_style' ohne vorherigen Commit"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Führe aus: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Ausführung fehlgeschlagen: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert."
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Sie können das Problem beheben, und dann\n"
-"\n"
-"\tgit rebase --continue\n"
-"\n"
-"ausführen."
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Ausführung erfolgreich: $rest\n"
-"Aber Änderungen in Index oder Arbeitsverzeichnis verblieben.\n"
-"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\".\n"
-"Führen Sie dann aus:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Unbekannter Befehl: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausführen."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Konnte CHERRY_PICK_HEAD nicht löschen"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Es befinden sich zum Commit vorgemerkte Änderungen in Ihrem "
-"Arbeitsverzeichnis.\n"
-"Wenn diese Änderungen in den vorherigen Commit aufgenommen werden sollen,\n"
-"führen Sie aus:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Wenn daraus ein neuer Commit erzeugt werden soll, führen Sie aus:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"Im Anschluss führen Sie zum Fortfahren aus:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-"Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n"
-"finden"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Sie haben nicht committete Änderungen in Ihrem Arbeitsverzeichnis. Bitte\n"
-"committen Sie diese zuerst und führen Sie dann 'git rebase --continue' "
-"erneut\n"
-"aus."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Konnte Editor nicht ausführen."
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Konnte $switch_to nicht auschecken."
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Kein HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen."
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Konnte nicht als interaktiven Rebase markieren."
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)"
-msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Leere Commits sind auskommentiert."
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Konnte neu geschriebene Commits nicht initialisieren."
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "Verwendung: $dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:182
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"Konnte nicht in Verzeichnis $cdup wechseln, der obersten Ebene des\n"
"Arbeitsverzeichnisses."
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:191 git-sh-setup.sh:198
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
"fatal: $program_name kann ohne ein Arbeitsverzeichnis nicht verwendet werden."
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr ""
-"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt "
-"sind."
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:212
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Kann Branches nicht neu schreiben: Sie haben Änderungen, die nicht zum "
"Commit\n"
"vorgemerkt sind."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"Kann \"pull\" mit \"rebase\" nicht ausführen: Sie haben Änderungen, die "
-"nicht zum Commit vorgemerkt sind."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:215
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
"Kann $action nicht ausführen: Sie haben Änderungen, die nicht zum Commit\n"
"vorgemerkt sind."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Rebase nicht möglich: Die Staging-Area beinhaltet nicht committete "
-"Änderungen."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Kann \"pull\" mit \"rebase\" nicht ausführen: Die Staging-Area beinhaltet "
-"nicht committete Änderungen."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:226
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Kann $action nicht ausführen: Die Staging-Area beinhaltet nicht committete\n"
"Änderungen."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:228
msgid "Additionally, your index contains uncommitted changes."
msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:348
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Sie müssen den Befehl von der obersten Ebene des Arbeitsverzeichnisses "
"ausführen."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:353
msgid "Unable to determine absolute path of git directory"
-msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen."
+msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
#: git-add--interactive.perl:212
@@ -26441,7 +26854,7 @@
msgid "failed to open hunk edit file for reading: %s"
msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -26457,7 +26870,7 @@
"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
"vormerken"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -26471,7 +26884,7 @@
"a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -26485,7 +26898,7 @@
"a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -26502,7 +26915,7 @@
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
"anwenden"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -26519,7 +26932,7 @@
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
"Arbeitsverzeichnis verwerfen"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -26534,7 +26947,7 @@
"a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -26548,7 +26961,7 @@
"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -26562,7 +26975,7 @@
"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
"d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -26586,92 +26999,92 @@
"e - aktuellen Patch-Block manuell editieren\n"
"? - Hilfe anzeigen\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
"Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignoriere nicht zusammengeführte Datei: %s\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Modusänderung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Löschung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "Ergänzung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Diesen Patch-Block auf das Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "Keine anderen Patch-Blöcke verbleibend\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ungültige Nummer: '%s'\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n"
msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Kein vorheriger Patch-Block\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Kein folgender Patch-Block\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "In %d Patch-Block aufgeteilt.\n"
msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -26690,58 +27103,58 @@
"diff - Unterschiede zwischen HEAD und Index anzeigen\n"
"add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "-- fehlt"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "Unbekannter --patch Modus: %s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "ungültiges Argument %s, erwarte --"
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
"lokale Zeitzone unterscheidet sich von GMT nicht um ein Minutenintervall\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "lokaler Zeit-Offset größer oder gleich 24 Stunden\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "fatal: Befehl '%s' mit Exit-Code %d beendet"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
-msgstr "Der Editor wurde unsauber beendet, breche alles ab."
+msgstr "der Editor wurde unsauber beendet, breche alles ab"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"'%s' enthält eine Zwischenversion der E-Mail, die Sie gerade verfassen.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' enthält die verfasste E-Mail.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26753,52 +27166,52 @@
"Setzen Sie sendemail.forbidSendmailVariables auf 'false', um diese Prüfung "
"zu deaktivieren.\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
"Kann 'git format-patch' nicht außerhalb eines Repositories ausführen.\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
-"'batch-size' und 'relogin' müssen gemeinsam angegeben werden (über "
+"`batch-size` und `relogin` müssen gemeinsam angegeben werden (über "
"Kommandozeile\n"
"oder Konfigurationsoption)\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Unbekanntes --suppress-cc Feld: '%s'\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Unbekannte --confirm Einstellung: '%s'\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"Warnung: sendemail-Alias mit Anführungszeichen wird nicht unterstützt: %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "Warnung: `/file` oder `|pipe` Umleitung wird nicht unterstützt: %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -26809,18 +27222,18 @@
msgstr ""
"Datei '%s' existiert, aber es könnte auch der Bereich von Commits sein,\n"
"für den Patches erzeugt werden sollen. Bitte machen Sie dies eindeutig\n"
-"indem Sie ...\n"
+"indem Sie...\n"
"\n"
" * \"./%s\" angeben, wenn Sie eine Datei meinen, oder\n"
" * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
"meinen.\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Fehler beim Öffnen von %s: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
@@ -26830,17 +27243,17 @@
"Keine Patch-Dateien angegeben!\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "Keine Betreffzeile in %s?"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -26855,27 +27268,27 @@
"Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
"möchten.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Fehler beim Öffnen von %s: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Fehler beim Öffnen von %s.final: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "E-Mail mit Zusammenfassung ist leer, wird ausgelassen\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Sind Sie sich sicher, <%s> zu benutzen [y/N]? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -26883,11 +27296,11 @@
"Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n"
"Content-Transfer-Encoding.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -26901,22 +27314,22 @@
"an,\n"
"wenn Sie den Patch wirklich versenden wollen.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "An wen sollen die E-Mails versendet werden (wenn überhaupt jemand)?"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID zur Verwendung als In-Reply-To für die erste E-Mail (wenn eine "
"existiert)? "
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
@@ -26924,18 +27337,18 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
"Was soll mit dieser Adresse geschehen? (Beenden [q]|Löschen [d]|Bearbeiten "
"[e]): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA Pfad \"%s\" existiert nicht"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -26964,133 +27377,133 @@
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Diese E-Mail versenden? (Ja [y]|Nein [n]|Bearbeiten [e]|Beenden [q]|Alle "
"[a]): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
-msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich."
+msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert."
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Server unterstützt kein STARTTLS! %s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS fehlgeschlagen! %s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Konnte SMTP nicht korrekt initialisieren. Bitte prüfen Sie Ihre "
"Konfiguration\n"
"und benutzen Sie --smtp-debug."
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "Fehler beim Senden %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Probeversand %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "%s gesendet\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "Probeversand OK. Log enthält:\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "OK. Log enthält:\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Ergebnis: "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Ergebnis: OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "Kann Datei %s nicht öffnen"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Füge cc: hinzu: %s von Zeile '%s'\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Füge to: hinzu: %s von Zeile '%s'\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Füge cc: hinzu: %s von Zeile '%s'\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Füge cc: hinzu: %s von Zeile '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Konnte '%s' nicht ausführen"
-#: git-send-email.perl:1972
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Füge %s: %s hinzu von: '%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
-msgstr "Kann Nachricht nicht als 7bit versenden."
+msgstr "kann Nachricht nicht als 7bit versenden"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
-msgstr "Ungültiges Transfer-Encoding"
+msgstr "ungültiges Transfer-Encoding"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2100
#, perl-format
msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
+"fatal: %s: rejected by %s hook\n"
"%s\n"
"warning: no patches were sent\n"
msgstr ""
-"fatal: %s: zurückgewiesen durch 'sendemail-validate' Hook\n"
+"fatal: %s: zurückgewiesen von %s Hook\n"
"%s\n"
"Warnung: Es wurden keine Patches gesendet\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "konnte %s nicht öffnen: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2113
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -27099,13 +27512,13 @@
"fatal: %s:%d ist länger als 998 Zeichen\n"
"Warnung: Es wurden keine Patches gesendet\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2131
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2135
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
diff --git a/po/es.po b/po/es.po
index d7c555e..ced2eb6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-14 11:37-0500\n"
+"POT-Creation-Date: 2021-11-04 08:34+0800\n"
+"PO-Revision-Date: 2021-11-07 18:53-0500\n"
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
"Language-Team: CodeLabora <codelabora@gmail.com>\n"
"Language: es\n"
@@ -18,214 +18,214 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.0\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "¿Ahh (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "no se pudo leer índice"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binario"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "nada"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "sin cambios"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Actualizar"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "no se pudo poner en stage '%s'"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "no se pudo escribir índice"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "actualizada %d ruta\n"
msgstr[1] "actualizadas %d rutas\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s no es rastreado ahora.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry falló para la ruta '%s'"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Revertir"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "No se pudo analizar HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "revertida %d ruta\n"
msgstr[1] "revertidas %d rutas\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "No hay archivos sin rastrear.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Agregar no rastreados"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "agregada %d ruta\n"
msgstr[1] "agregadas %d rutas\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "ignorando lo no fusionado: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Solo cambiaron archivos binarios.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Sin cambios.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Actualización del parche"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Revisión de diff"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "mostrar rutas con cambios"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "agregar estado del árbol de trabajo al conjunto de cambios en stage"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "revertir conjunto de cambios en stage a la versión de HEAD"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "elegir fragmentos y actualizar de forma selectiva"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "ver diff entre HEAD e index"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr ""
"agregar contenidos de archivos sin rastrear al conjunto de cambios de stage"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "Mostrar ayuda:"
-#: add-interactive.c:1030
-msgid "select a single item"
-msgstr "selecciona un único objeto"
-
-#: add-interactive.c:1032
-msgid "select a range of items"
-msgstr "selecciona un rango de objetos"
-
#: add-interactive.c:1034
-msgid "select multiple ranges"
-msgstr "selecciona múltiples rangos"
+msgid "select a single item"
+msgstr "seleccionar un único objeto"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1036
+msgid "select a range of items"
+msgstr "seleccionar un rango de objetos"
+
+#: add-interactive.c:1038
+msgid "select multiple ranges"
+msgstr "seleccionar múltiples rangos"
+
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "seleccionar objeto basado en prefijo único"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "quitar objetos especificados"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "escoger todos los objetos"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(vacío) finalizar selección"
-#: add-interactive.c:1079
-msgid "select a numbered item"
-msgstr "selecciona un objeto numerado"
-
#: add-interactive.c:1083
-msgid "(empty) select nothing"
-msgstr "(vacío) selecciona nada"
+msgid "select a numbered item"
+msgstr "seleccionar un objeto numerado"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1087
+msgid "(empty) select nothing"
+msgstr "(vacío) no seleccionar nada"
+
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Comandos ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "Ahora qué"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "rastreado"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "no rastreado"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "ruta"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "no se pudo refrescar el índice"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Adiós.\n"
@@ -255,8 +255,8 @@
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr ""
-"Si el parche aplica limpiamente, el fragmento editado será marcado inmediatamente "
-"para el área de stage."
+"Si el parche aplica limpiamente, el fragmento editado será marcado "
+"inmediatamente para el área de stage."
#: add-patch.c:42
msgid ""
@@ -298,8 +298,8 @@
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr ""
-"Si el parche aplica limpiamente, el fragmento editado será marcado inmediatamente "
-"para hacer stash."
+"Si el parche aplica limpiamente, el fragmento editado será marcado "
+"inmediatamente para hacer stash."
#: add-patch.c:64
msgid ""
@@ -313,7 +313,8 @@
"n - no hacer stash a este fragmento\n"
"q - quit; no hacer stash a este fragmento o a ninguno de los restantes\n"
"a - hacer stash a este fragmento y a todos los posteriores en el archivo\n"
-"d - no hacer stash a este fragmento ni ninguno de los posteriores en el archivo\n"
+"d - no hacer stash a este fragmento ni ninguno de los posteriores en el "
+"archivo\n"
#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
@@ -340,8 +341,8 @@
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr ""
-"Si el parche aplica limpiamente, el fragmento editado será marcado inmediatamente "
-"para sacar del área de stage."
+"Si el parche aplica limpiamente, el fragmento editado será marcado "
+"inmediatamente para sacar del área de stage."
#: add-patch.c:88
msgid ""
@@ -353,10 +354,12 @@
msgstr ""
"y - sacar desde hunk del área de stage\n"
"n - no sacar este fragmento del area de stage\n"
-"q - quit; no sacar del area de stage este fragmento ni ninguno de los restantes\n"
-"a - sacar del area de stage este fragmento y todos los posteriores en el archivo\n"
-"d - no sacar del area de stage este fragmento ni ninguno de los posteriores en el "
+"q - quit; no sacar del area de stage este fragmento ni ninguno de los "
+"restantes\n"
+"a - sacar del area de stage este fragmento y todos los posteriores en el "
"archivo\n"
+"d - no sacar del area de stage este fragmento ni ninguno de los posteriores "
+"en el archivo\n"
#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
@@ -376,7 +379,7 @@
#: add-patch.c:106 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar este fragmetno al índice [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar este fragmento al índice [y,n,q,a,d%s,?]? "
#: add-patch.c:108 add-patch.c:176 add-patch.c:221
msgid ""
@@ -502,7 +505,8 @@
#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar este fragmento al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"¿Aplicar este fragmento al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
#: add-patch.c:179
msgid ""
@@ -591,7 +595,7 @@
#: add-patch.c:1082 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"
+msgstr "Modo de edición manual de hunk -- mira abajo para una guía rápida.\n"
#: add-patch.c:1086
#, c-format
@@ -614,7 +618,8 @@
"aborted and the hunk is left unchanged.\n"
msgstr ""
"Si esto no aplica de manera limpia, se te da la oportunidad de\n"
-"editar nuevamente. Si todas las líneas del fragmento son eliminadas, entonces\n"
+"editar nuevamente. Si todas las líneas del fragmento son eliminadas, "
+"entonces\n"
"la edición es abortada y el fragmento queda sin cambios.\n"
#: add-patch.c:1133
@@ -668,11 +673,12 @@
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
-"j - deja este fragmento sin decidir, ver el siguiente fragmento sin decisión\n"
-"J - deja este fragmento sin decidir, ver siguiente fragmento \n"
-"k - deja este fragmento sin decidir, ver fragmento previo sin decidir\n"
-"K - deja este fragmento sin decidir, ver fragmento anterior\n"
-"g - selecciona un fragmento a dónde ir\n"
+"j - dejar este fragmento sin decidir, ver el siguiente fragmento sin "
+"decisión\n"
+"J - dejar este fragmento sin decidir, ver siguiente fragmento \n"
+"k - dejar este fragmento sin decidir, ver fragmento previo sin decidir\n"
+"K - dejar este fragmento sin decidir, ver fragmento anterior\n"
+"g - seleccionar un fragmento a dónde ir\n"
"/ - buscar un fragmento que cumpla con el regex dado\n"
"s - separar el fragmento actual en más pequeños\n"
"e - editar manualmente el fragmento actual\n"
@@ -744,7 +750,7 @@
msgid "'git apply' failed"
msgstr "falló 'git apply'"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -753,38 +759,38 @@
"\n"
"Desactivar este mensaje con \"git config advice.%s false\""
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sayuda: %.*s%s\n"
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr "No es posible revertir porque tienes archivos sin fusionar."
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "No es posible %s porque tienes archivos sin fusionar."
-#: advice.c:270
+#: advice.c:196
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."
@@ -792,41 +798,48 @@
"Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n"
"como sea apropiado, para marcar la resolución y realizar un commit."
-#: advice.c:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "Saliendo porque existe un conflicto sin resolver."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "Por favor, realiza un commit antes de fusionar."
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "Saliendo por una fusión inconclusa."
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "No es posible hacer fast-forward, abortando."
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"El siguiente pathspecs no concuerda con ninguna ruta elegible, pero "
-"concuerda con\n"
-"entradas del índice fuera del checkout sparse actual:\n"
+"La siguiente ruta y/o pathspecs coinciden con rutas existentes\n"
+"fuera de su definición para sparse-checkout, por lo que no\n"
+"se actualizarán en el índice:\n"
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Deshabilitar o modificar las reglas de escasez si intenta actualizar dichas "
-"entradas."
+"Si desea actualizar esa entrada, intente lo siguiente:\n"
+"* Use la opción --sparse.\n"
+"* Deshabilite o modifique las reglas de escasez."
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1015,49 +1028,49 @@
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** peligro: el archivo %s está vacío pero no es borrado"
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "parche binario corrupto en la línea %d: %.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "parche binario no reconocido en la línea %d"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "parche que solo contiene basura en la línea %d"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "no es posible leer el enlace simbólico %s"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "no es posible abrir o leer %s"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "comienzo inválido de línea: '%c'"
-#: apply.c:3056
+#: apply.c:3057
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)."
msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)."
-#: apply.c:3068
+#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
@@ -1066,23 +1079,24 @@
"mientras se buscaba:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "data perdida en parche binario para '%s'"
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-"no se puede revertir-aplicar un parche binario sin el fragmento revertido a '%s'"
+"no se puede revertir-aplicar un parche binario sin el fragmento revertido a "
+"'%s'"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "no se puede aplicar el parche binario a '%s' sin un índice completo"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -1090,289 +1104,290 @@
"el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
"actuales."
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "el parche aplica a un '%s' vacío, pero este no lo esta"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "la postimagen necesaria %s para '%s' no se puede leer"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el parche binario no aplica para '%s'"
-#: apply.c:3208
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"el parche binario para '%s' crea un resultado incorrecto (esperando %s, se "
"obtuvo %s)"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el parche falló: %s:%ld"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "no se puede hacer checkout a %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "no se pudo leer %s"
-#: apply.c:3412
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "leyendo de '%s' tras un enlace simbólico"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "la ruta %s ha sido renombrada/suprimida"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existe en el índice"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "%s: no concuerda con el índice"
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
"el repositorio carece del blob necesario para realizar un merge de tres vías."
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Realizando un merge de tres vías...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "no se pueden leer los contenidos actuales de '%s'"
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Falló en realizar fusión de tres vías...\n"
-#: apply.c:3620
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Parche aplicado a '%s' con conflictos.\n"
-#: apply.c:3625
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Parche aplicado a '%s' limpiamente\n"
-#: apply.c:3642
+#: apply.c:3664
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Retrocediendo a la aplicación...\n"
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "parche de eliminación deja contenidos en el archivo"
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipo incorrecto"
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s tiene tipo %o, se esperaba %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "ruta inválida '%s'"
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ya existe en el índice"
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ya existe en el directorio de trabajo"
-#: apply.c:3976
+#: apply.c:3998
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"
-#: apply.c:3981
+#: apply.c:4003
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"
-#: apply.c:4001
+#: apply.c:4023
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "archivo afectado '%s' está tras un enlace simbólico"
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el parche no aplica"
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr "Revisando el parche %s..."
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "falta información del sha1 o es inútil para el submódulo %s"
-#: apply.c:4119
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
-#: apply.c:4122
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta información sha1 o es inútil (%s)."
-#: apply.c:4131
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "no se pudo añadir %s al índice temporal"
-#: apply.c:4141
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "no se pudo escribir un índice temporal para %s"
-#: apply.c:4279
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "no se puede eliminar %s del índice"
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "parche corrupto para el submódulo %s"
-#: apply.c:4319
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no es posible hacer stat en el archivo recién creado '%s'"
-#: apply.c:4327
+#: apply.c:4349
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"no es posible crear una copia de seguridad para el archivo recién creado %s"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no es posible agregar una entrada en el cache para %s"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr "falló escribir a '%s'"
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "cerrando archivo '%s'"
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no es posible escribir el archivo '%s' modo %o"
-#: apply.c:4548
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Parche %s aplicado limpiamente."
-#: apply.c:4556
+#: apply.c:4578
msgid "internal error"
msgstr "error interno"
-#: apply.c:4559
+#: apply.c:4581
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Aplicando parche %%s con %d rechazo..."
msgstr[1] "Aplicando parche %%s con %d rechazos..."
-#: apply.c:4570
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncando el nombre de archivo .rej a %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "no se puede abrir %s"
-#: apply.c:4592
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Hunk #%d aplicado limpiamente."
-#: apply.c:4596
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "Hunk #%d rechazado."
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "Parche '%s' saltado."
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
msgstr "input no reconocido"
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
msgstr "no es posible leer el archivo índice"
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no se puede abrir el parche '%s': %s"
-#: apply.c:4937
+#: apply.c:4959
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d error de espacios en blanco silenciado"
msgstr[1] "%d errores de espacios en blanco silenciados"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d línea agrega errores de espacios en blanco."
msgstr[1] "%d líneas agregan errores de espacios en blanco."
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1381,139 +1396,139 @@
msgstr[1] ""
"%d líneas aplicadas después de arreglar los errores de espacios en blanco."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr "No es posible escribir el archivo índice"
-#: apply.c:4995
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr "no aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:4998
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "num"
-#: apply.c:5001
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"
-#: apply.c:5004
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "ignorar adiciones hechas por el parche"
-#: apply.c:5006
+#: apply.c:5028
msgid "instead of applying the patch, output diffstat for the input"
msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada"
-#: apply.c:5010
+#: apply.c:5032
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostrar el número de líneas agregadas y eliminadas en notación decimal"
-#: apply.c:5012
+#: apply.c:5034
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada"
-#: apply.c:5014
+#: apply.c:5036
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lugar de aplicar el parche, ver si el parche es aplicable"
-#: apply.c:5016
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr "asegurar que el parche sea aplicable al índice actual"
-#: apply.c:5018
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "marca los nuevos archivos con `git add --intent-to-add`"
-#: apply.c:5020
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr "aplicar un parche sin tocar el árbol de trabajo"
-#: apply.c:5022
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr "aceptar un parche que toque fuera del área de trabajo"
-#: apply.c:5025
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "también aplicar el parche (usar con --stat/--summary/--check)"
-#: apply.c:5027
+#: apply.c:5049
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"intentar merge de tres vías, regresar al parche normal si el parche no aplica"
-#: apply.c:5029
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
msgstr ""
"construir un índice temporal basado en la información de índice incrustada"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "rutas están separadas con un carácter NULL"
-#: apply.c:5034
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr "asegurar que al menos <n> líneas del contexto concuerden"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "acción"
-#: apply.c:5036
+#: apply.c:5058
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"detectar líneas nuevas o modificadas que contienen errores de espacios en "
"blanco"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr ""
"ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
-#: apply.c:5045
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "aplicar el parche en reversa"
-#: apply.c:5047
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "no espera al menos una línea del contexto"
-#: apply.c:5049
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
-#: apply.c:5051
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "permitir solapamiento de hunks"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "ser verboso"
-#: apply.c:5054
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolerar nuevas líneas faltantes detectadas incorrectamente al final del "
"archivo"
-#: apply.c:5057
+#: apply.c:5079
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiar en el conteo de líneas en los headers del fragmento"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "raíz"
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "anteponer <root> a todos los nombres de archivos"
@@ -1585,152 +1600,151 @@
msgid "cannot read %s"
msgstr "no se puede leer %s"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "no se pudo leer '%s'"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "ruta especificada '%s' no concordó con ningún archivo"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "no existe el ref: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "nombre de objeto no válido: %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "no es un objeto tree: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "directorio de trabajo actual no rastreado"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Archivo no encontrado: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "No es un archivo regular: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "fmt"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "formato de crónica"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "prefijo"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "anteponer prefijo a cada ruta en la crónica"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "archivo"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "incluir archivos sin seguimiento a la crónica"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "escribe la crónica en este archivo"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "leer .gitattributes en el directorio de trabajo"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "reportar archivos en la crónica por stderr"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "configurar nivel de compresión"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "listar los formatos de crónica soportados"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "repo"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "obtener la crónica del repositorio remoto <repo>"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "comando"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "ruta para el comando git-upload-archive remoto"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Opción inesperada --remote"
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr "Opción --exec solo puede ser utilizada con --remote"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Opción inesperada --output"
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr "Opciones --add-file y --remote no pueden ser usadas juntas"
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Formato de crónica desconocido '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumento no soportado para formato '%s': -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s no es un nombre de atributo válido"
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s no permitido: %s:%d"
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1738,22 +1752,22 @@
"Los patrones negativos son ignorados en los atributos de git\n"
"Usa '\\!' para comenzar literalmente con exclamación."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Revisa las comillas en el archivo '%s': %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "¡No podemos biseccionar más!\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "No es un nombre de commit válido %s"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1762,7 +1776,7 @@
"La base de fusión %s está mal.\n"
"Esto quiere decir que el bug ha sido corregido entre %s y [%s].\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1771,7 +1785,7 @@
"La base de fusión %s es nueva.\n"
"Esta propiedad ha cambiado entre %s y [%s].\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1780,7 +1794,7 @@
"La base de fusión %s es %s.\n"
"Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1791,7 +1805,7 @@
"git bisect no puede trabajar bien en este caso.\n"
"¿Tal vez confundiste las revisiones %s y %s?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1803,36 +1817,36 @@
"%s.\n"
"Vamos a continuar de todas maneras."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Biseccionando: una base de fusión debe ser probada\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "una revisión %s es necesaria"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "no se pudo crear el archivo '%s'"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "no se pudo leer el archivo '%s'"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "falló leer las refs de bisect"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s fue tanto %s como %s\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1841,7 +1855,7 @@
"No se encontró commit que se pueda probar.\n"
"¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1851,7 +1865,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1871,11 +1885,12 @@
msgstr ""
"--reverse y --first-parent juntos requieren especificar el último commit"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "falló la configuración del recorrido de revisiones"
@@ -2065,8 +2080,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "header no reconocido %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "no se pudo abrir '%s'"
@@ -2124,7 +2139,7 @@
msgid "cannot write bundle version %d with algorithm %s"
msgstr "no se puede escribir la versión de paquete %d con el algoritmo %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento no reconocido: %s"
@@ -2166,7 +2181,7 @@
msgid "invalid color value: %.*s"
msgstr "color inválido: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "versión de hash inválida"
@@ -2211,192 +2226,192 @@
msgid "unable to find all commit-graph files"
msgstr "no es posible encontrar los archivos commit-graph"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "posición de commit inválida. commit-graph está probablemente corrupto"
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "no se pudo encontrar commit %s"
-#: commit-graph.c:799
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
"commit-graph requiere datos de generación de desbordamiento pero no tiene "
"ninguno"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "no es posible analizar el commit %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "incapaz de obtener el tipo de objeto: %s"
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "Cargando commits conocidos en commit graph"
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr "Expandiendo commits alcanzables en commit graph"
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "Limpiando marcas de commits en commit graph"
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "Calculando niveles topológicos de commit graph"
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "Calculando números de generación de commit graph"
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr "Calculando números de generación de commit graph"
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "Recolectando commits referenciados"
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Encontrando commits para commit graph en %d pack"
msgstr[1] "Encontrando commits para commit graph en %d packs"
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "error al agregar pack %s"
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "error al abrir index para %s"
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "Encontrando esquinas extra en commit graph"
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr "falló al escribir el número correcto de ids de base graph"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "no se pudo crear directorios principales para %s"
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "no es posible crear una capa de gráfico temporal"
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "no se pudo poner permisos compartidos a '%s'"
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Escribiendo commit graph en %d paso"
msgstr[1] "Escribiendo commit graph en %d pasos"
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "no se pudo abrir la cadena de archivos commit-graph"
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "no se pudo renombrar el archivo base commit-graph"
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr "falló al renombrar el archivo temporal commit-graph"
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "Escaneando commits fusionados"
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "Fusionando commit-graph"
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"intentando escribir un commit-graph, pero 'core.commitGraph' está "
"deshabilitado"
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "demasiados commits para escribir el gráfico"
-#: commit-graph.c:2449
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"el archivo de commit-graph tiene checksums incorrectos y probablemente está "
"corrupto"
-#: commit-graph.c:2459
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "falló al analizar commit %s para commit-graph"
-#: commit-graph.c:2494
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "Verificando commits en commit graph"
-#: commit-graph.c:2509
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"falló al analizar el commit %s de la base de datos de objetos para commit-"
"graph"
-#: commit-graph.c:2516
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "OID del árbol raíz para commit %s en commit-graph es %s != %s"
-#: commit-graph.c:2526
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "lista padre de commit-graph para commit %s es demasiada larga"
-#: commit-graph.c:2535
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "padre de commit-graph para %s es %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "lista de padres de commit-graph para commit %s termina prematuramente"
-#: commit-graph.c:2554
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2404,7 +2419,7 @@
"commit-graph tiene número de generación cero para %s, pero no cero en otro "
"lugar"
-#: commit-graph.c:2558
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2412,29 +2427,29 @@
"commit-graph tiene número de generación no cero para %s, pero cero en otro "
"lugar"
-#: commit-graph.c:2575
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "generación commit-graph para commit %s es %<PRIuMAX> < %<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"fecha de commit para commit %s en commit-graph es %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "no se puede analizar %s"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "¡%s %s no es un commit!"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2448,33 +2463,33 @@
"El soporte para <GIT_DIR>/info/grafts ha sido deprecado\n"
"y será eliminado en una versión futura de Git.\n"
"\n"
-"Por favor use \"git replace --convert-graft-file\"\n"
+"Por favor usa \"git replace --convert-graft-file\"\n"
"para convertir los grafts en refs.\n"
"\n"
-"Apapa este mensaje ejecutando\n"
+"Apaga este mensaje ejecutando\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1237
+#: commit.c:1239
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s."
-#: commit.c:1241
+#: commit.c:1243
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s no tiene una firma GPG."
-#: commit.c:1247
+#: commit.c:1249
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "El commit %s tiene una buena firma GPG por %s\n"
-#: commit.c:1501
+#: commit.c:1503
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"
@@ -2489,7 +2504,7 @@
msgid "memory exhausted"
msgstr "memoria agotada"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2504,36 +2519,36 @@
"\t%s\n"
"Esto puede ser causado por inclusiones circulares."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "no se pudo expandir rutas de inclusión '%s'"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "inclusiones de configuración relativas tienen que venir de archivos"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr ""
"la configuración relativa incluye condicionales que deben venir de archivos"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "formato config inválido: %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "falta el nombre de la variable de entorno para la configuración '%.*s'"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "falta la variable de entorno '%s' para la configuración '%.*s'"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "llave no contiene una sección: %s"
@@ -2543,298 +2558,298 @@
msgid "key does not contain variable name: %s"
msgstr "llave no contiene el nombre de variable: %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "llave inválida: %s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "llave inválida (nueva línea): %s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "clave de config vacía"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "parámetro de configuración malogrado: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "formato malogrado en %s"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "conteo malogrado en %s"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "demasiadas entradas en %s"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "llave de configuración faltante %s"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "valor de config faltante para %s"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "mala línea de config %d en el blob %s"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "mala línea de config %d en el archivo %s"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "mala línea de config %d en la entrada standard"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "mala línea de config %d en el submódulo-blob %s"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "mala línea de config %d en la línea de comando %s"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "mala línea de config %d en %s"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "fuera de rango"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "unidad inválida"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "mal valor de config numérico '%s' para '%s': %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "mal valor de config numérico '%s' para '%s' en el blob %s: %s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "mal valor de config numérico '%s' para '%s' en el archivo %s: %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "mal valor de config numérico '%s' para '%s' en la entrada standard: %s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"mal valor de config numérico '%s' para '%s' en el submódulo-blob %s: %s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"mal valor de config numérico '%s' para '%s' en la línea de comando %s: %s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "mal valor de config numérico '%s' para '%s' en %s: %s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "mal valor de config booleano '%s' para '%s'"
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "falló al expandir el directorio de usuario en: '%s'"
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' para '%s' no es una marca de tiempo válida"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "largo de abreviatura fuera de rango: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivel de compresión de zlib erróneo %d"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
-msgstr "core.commentChar debería tener solo un caracter"
+msgstr "core.commentChar debería tener solo un carácter"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "modo inválido de creación de objetos: %s"
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "valor malformado para %s"
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "valor malformado para %s: %s"
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "debe ser uno de nothing, matching, simple, upstream o current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "nivel de compresión de pack erróneo %d"
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "incapaz de cargar configuración de objeto blob '%s'"
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referencia '%s' no apunta a un blob"
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "no es posible resolver configuración de blob '%s'"
-#: config.c:1874
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "no se pudo analizar %s"
-#: config.c:1930
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "no es posible analizar la configuración de la línea de comando"
-#: config.c:2294
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"error desconocido ocurrió mientras se leían los archivos de configuración"
-#: config.c:2468
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s inválido: '%s'"
-#: config.c:2513
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
-#: config.c:2559
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "no es posible analizar '%s' de la configuración de la línea de comando"
-#: config.c:2561
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d"
-#: config.c:2645
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "nombre de sección inválido '%s'"
-#: config.c:2677
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s tiene múltiples valores"
-#: config.c:2706
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "falló al escribir nuevo archivo de configuración %s"
-#: config.c:2958 config.c:3285
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "no se pudo bloquear archivo de configuración %s"
-#: config.c:2969
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "abriendo %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "patrón inválido: %s"
-#: config.c:3031
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "archivo de configuración inválido: %s"
-#: config.c:3044 config.c:3298
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "fstat en %s falló"
-#: config.c:3055
+#: config.c:3043
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "no es posible hacer mmap '%s'%s"
-#: config.c:3065 config.c:3303
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "chmod en %s falló"
-#: config.c:3150 config.c:3400
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "no se pudo escribir el archivo de configuración %s"
-#: config.c:3184
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no se pudo configurar '%s' a '%s'"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "no se pudo desactivar '%s'"
-#: config.c:3276
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "nombre de sección inválido: %s"
-#: config.c:3443
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "valor faltante para '%s'"
@@ -2869,72 +2884,72 @@
msgid "expected flush after capabilities"
msgstr "se espera flush tras capacidades"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "ignorando capacidades tras primera línea '%s'"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "error de protocolo: capacidades imprevistas^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "el repositorio en el otro lado no puede ser superficial"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "paquete inválido"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "error de protocolo: '%s' inesperado"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "respuesta de ls-refs inválida: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "flush esperado tras listado de refs"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "se esperaba un paquete final luego del ref listing"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "protocolo '%s' no es soportado"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "no es posible configurar SO_KEEPALIVE en el socket"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Revisando %s... "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "no se puede revisar %s (puerto %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2943,7 +2958,7 @@
"hecho.\n"
"Conectando a %s (puerto %s) ... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2953,78 +2968,78 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "hecho."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "no es posible revisar %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "puerto desconocido %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "hostname extraño '%s' bloqueado"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "puerto extraño '%s' bloqueado"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "no se puede comenzar proxy %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-"no hay ruta especificada; vea 'git help pull' para sintaxis válida de url"
+"no hay ruta especificada; mira 'git help pull' para sintaxis válida de url"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "la nueva línea está prohibida en git://hosts y rutas de repositorio"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "variante 'simple' de ssh no soporta -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "variante 'simple' de ssh no soporta -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "variante ssh 'simple' no soporta configurar puerto"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "ruta extraña '%s' bloqueada"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "no es posible hacer fork"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Verificando conectividad"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "No se pudo ejecutar 'git rev-list'"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "falló escribir a rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "falló al cerrar la entrada standard de rev-list"
@@ -3169,17 +3184,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr "rehusando trabajar con campo protocolo faltante en la credencial"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "url contiene una nueva línea en su componente %s: %s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "url no tiene scheme: %s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "url de credencial no puede ser analizada: %s"
@@ -3281,23 +3296,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr "valor desconocido para --diff-merges: %s"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base no funciona con rangos"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base solo funciona con confirmaciones"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "no es posible obtener HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "no se encontró base de fusión"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "múltiples bases de fusión encontradas"
@@ -3310,20 +3325,20 @@
"Not a git repository. Use --no-index to compare two paths outside a working "
"tree"
msgstr ""
-"No es un repositorio git. Use --no-index para comparar dos paths fuera del "
+"No es un repositorio git. Usa --no-index para comparar dos paths fuera del "
"árbol de trabajo"
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Falló al analizar porcentaje de corte de dirstat '%s'\n"
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Parámetro '%s' de dirstat desconocido\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3331,7 +3346,7 @@
"opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3341,7 +3356,7 @@
"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
"change'"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3349,13 +3364,13 @@
"color-moved-ws: allow-indentation-change no puede ser combinado con otros "
"modos de espacios en blanco"
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valor para la variable de configuración 'diff.submodule' desconocido: '%s'"
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3364,49 +3379,49 @@
"Errores en la variable de config 'diff.dirstat' encontrados:\n"
"%s"
-#: diff.c:4282
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr "diff externo murió, deteniendo en %s"
-#: diff.c:4634
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
-#: diff.c:4637
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S y --find-object son mutuamente exclusivas"
-#: diff.c:4640
+#: diff.c:4648
msgid ""
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
msgstr ""
-"-G y --pickaxe-regex son mutuamente exclusivos, use --pickaxe-regex con -S"
+"-G y --pickaxe-regex son mutuamente exclusivos, usa --pickaxe-regex con -S"
-#: diff.c:4643
+#: diff.c:4651
msgid ""
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
msgstr ""
-"--pickaxe-all y --find-object son mutuamente exclusivas, use --pickaxe-all "
+"--pickaxe-all y --find-object son mutuamente exclusivas, usa --pickaxe-all "
"con -G y -S"
-#: diff.c:4722
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow requiere exactamente un pathspec"
-#: diff.c:4770
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "valor --stat inválido: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s espera un valor numérico"
-#: diff.c:4807
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3415,42 +3430,42 @@
"Falló al analizar parámetro de opción --dirstat/-X:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valor desconocido luego de ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "no se puede resolver '%s'"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s espera forma <n>/<m>"
-#: diff.c:4998
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s esperaba un char, se obtuvo '%s'"
-#: diff.c:5019
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "mal argumento --color-moved: %s"
-#: diff.c:5038
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "modo inválido '%s' en --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3458,159 +3473,159 @@
"opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
"\"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "argumento inválido para %s"
-#: diff.c:5238
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "regex inválido para -I: '%s'"
-#: diff.c:5287
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "falló al analizar parámetro de opción --submodule: '%s'"
-#: diff.c:5343
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mal argumento --word-diff: %s"
-#: diff.c:5379
+#: diff.c:5387
msgid "Diff output format options"
msgstr "Opciones de formato de salida para diff"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "generar parche"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "suprimir salida de diff"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
-msgstr "genera diffs con <n> líneas de contexto"
+msgstr "generar diffs con <n> líneas de contexto"
-#: diff.c:5395
+#: diff.c:5403
msgid "generate the diff in raw format"
-msgstr "genera el diff en formato raw"
+msgstr "generar el diff en formato raw"
-#: diff.c:5398
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "sinónimo para '-p --raw'"
-#: diff.c:5402
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "sinónimo para '-p --stat'"
-#: diff.c:5406
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "--stat amigable para máquina"
-#: diff.c:5409
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "mostrar solo la última línea para --stat"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5412
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-"muestra la distribución de cantidades de cambios relativas para cada "
+"mostrar la distribución de cantidades de cambios relativas para cada "
"subdirectorio"
-#: diff.c:5416
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "sinónimo para --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "sinonimo para --dirstat=archivos,param1,param2..."
+msgstr "sinónimo para --dirstat=archivos,param1,param2..."
-#: diff.c:5424
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-"advierte si cambios introducen conflictos de markers o errores de espacios "
+"advertir si cambios introducen conflictos de markers o errores de espacios "
"en blanco"
-#: diff.c:5427
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"resumen condensado de creaciones, cambios de nombres y cambios de modos"
-#: diff.c:5430
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "mostrar solo nombres de archivos cambiados"
-#: diff.c:5433
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "mostrar solo nombres y estados de archivos cambiados"
-#: diff.c:5435
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<ancho>[,<ancho-de-nombre>[,<cantidad>]]"
-#: diff.c:5436
+#: diff.c:5444
msgid "generate diffstat"
msgstr "generar diffstat"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<ancho>"
-#: diff.c:5439
-msgid "generate diffstat with a given width"
-msgstr "genera diffstat con un ancho dado"
-
-#: diff.c:5442
-msgid "generate diffstat with a given name width"
-msgstr "genera diffstat con un ancho de nombre dado"
-
-#: diff.c:5445
-msgid "generate diffstat with a given graph width"
-msgstr "genera diffstat con un ancho de graph dado"
-
#: diff.c:5447
+msgid "generate diffstat with a given width"
+msgstr "generar diffstat con un ancho dado"
+
+#: diff.c:5450
+msgid "generate diffstat with a given name width"
+msgstr "generar diffstat con un ancho de nombre dado"
+
+#: diff.c:5453
+msgid "generate diffstat with a given graph width"
+msgstr "generar diffstat con un ancho de graph dado"
+
+#: diff.c:5455
msgid "<count>"
msgstr "<cantidad>"
-#: diff.c:5448
+#: diff.c:5456
msgid "generate diffstat with limited lines"
-msgstr "genera diffstat con líneas limitadas"
+msgstr "generar diffstat con líneas limitadas"
-#: diff.c:5451
+#: diff.c:5459
msgid "generate compact summary in diffstat"
-msgstr "genera un resumen compacto de diffstat"
+msgstr "generar un resumen compacto de diffstat"
-#: diff.c:5454
+#: diff.c:5462
msgid "output a binary diff that can be applied"
-msgstr "muestra un diff binario que puede ser aplicado"
+msgstr "mostrar un diff binario que puede ser aplicado"
-#: diff.c:5457
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index"
"\""
-#: diff.c:5459
+#: diff.c:5467
msgid "show colored diff"
msgstr "mostrar diff colorido"
-#: diff.c:5460
+#: diff.c:5468
msgid "<kind>"
msgstr "<tipo>"
-#: diff.c:5461
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3618,7 +3633,7 @@
"resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
"'new' del diff"
-#: diff.c:5464
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3626,330 +3641,330 @@
"no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
"o --numstat"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<prefijo>"
-#: diff.c:5468
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
-#: diff.c:5471
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "mostrar el prefijo de destino dado en lugar de \"b/\""
-#: diff.c:5474
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "anteponer un prefijo adicional a cada línea mostrada"
-#: diff.c:5477
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "no mostrar ningún prefijo de fuente o destino"
-#: diff.c:5480
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-"muestra el contexto entre hunks de diff hasta el número especificado de "
+"mostrar el contexto entre hunks de diff hasta el número especificado de "
"líneas"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<char>"
-#: diff.c:5485
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
-msgstr "especifica el char para indicar una nueva línea en lugar de '+'"
-
-#: diff.c:5490
-msgid "specify the character to indicate an old line instead of '-'"
-msgstr "especifica el char para indicar una línea vieja en lugar de '-'"
-
-#: diff.c:5495
-msgid "specify the character to indicate a context instead of ' '"
-msgstr "especifica el char para indicar un contexto en lugar de ' '"
+msgstr "especificar el char para indicar una nueva línea en lugar de '+'"
#: diff.c:5498
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "especificar el char para indicar una línea vieja en lugar de '-'"
+
+#: diff.c:5503
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "especificar el char para indicar un contexto en lugar de ' '"
+
+#: diff.c:5506
msgid "Diff rename options"
msgstr "Opciones de diff rename"
-#: diff.c:5499
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "descomponer los cambios de reescritura en pares de borrar y crear"
-#: diff.c:5504
+#: diff.c:5512
msgid "detect renames"
msgstr "detectar renombrados"
-#: diff.c:5508
+#: diff.c:5516
msgid "omit the preimage for deletes"
-msgstr "omite la preimage para borrados"
+msgstr "omitir la preimage para borrados"
-#: diff.c:5511
+#: diff.c:5519
msgid "detect copies"
msgstr "detectar copias"
-#: diff.c:5515
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
-msgstr "usa archivos no modificados como fuente para encontrar copias"
-
-#: diff.c:5517
-msgid "disable rename detection"
-msgstr "deshabilita detección de renombrados"
-
-#: diff.c:5520
-msgid "use empty blobs as rename source"
-msgstr "usa blobs vacíos como fuente de renombramiento"
-
-#: diff.c:5522
-msgid "continue listing the history of a file beyond renames"
-msgstr ""
-"continua listando el historial de un archivo más allá de renombramientos"
+msgstr "usar archivos no modificados como fuente para encontrar copias"
#: diff.c:5525
+msgid "disable rename detection"
+msgstr "deshabilitar detección de renombrados"
+
+#: diff.c:5528
+msgid "use empty blobs as rename source"
+msgstr "usar blobs vacíos como fuente de renombramiento"
+
+#: diff.c:5530
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+"continuar listando el historial de un archivo más allá de renombramientos"
+
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-"previene detección de renombramientos/copias si el número de destinos para "
+"prevenir detección de renombramientos/copias si el número de destinos para "
"renombramientos/copias excede el límite dado"
-#: diff.c:5527
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "Opciones de algoritmos de diff"
-#: diff.c:5529
+#: diff.c:5537
msgid "produce the smallest possible diff"
-msgstr "produce el diff más pequeño posible"
+msgstr "producir el diff más pequeño posible"
-#: diff.c:5532
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "ignorar espacios en blanco cuando comparando líneas"
-#: diff.c:5535
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "ignorar cambios en la cantidad de líneas en blanco"
-#: diff.c:5538
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "ignorar cambios en espacios en blanco en EOL"
-#: diff.c:5541
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
-msgstr "ignora carrier-return al final de la línea"
+msgstr "ignorar carrier-return al final de la línea"
-#: diff.c:5544
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
-msgstr "ignora cambios cuyas líneas son todas en blanco"
+msgstr "ignorar cambios cuyas líneas son todas en blanco"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5547
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
-msgstr "ignora cambios cuyas líneas concuerdan con <regex>"
+msgstr "ignorar cambios cuyas líneas concuerdan con <regex>"
-#: diff.c:5550
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heurística para cambiar los límites de hunk para una fácil lectura"
-#: diff.c:5553
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera un diff usando algoritmo \"patience diff\""
-#: diff.c:5557
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera un diff usando algoritmo \"histogram diff\""
-#: diff.c:5559
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<algoritmo>"
-#: diff.c:5560
+#: diff.c:5568
msgid "choose a diff algorithm"
-msgstr "escoge un algoritmo para diff"
+msgstr "escoger un algoritmo para diff"
-#: diff.c:5562
+#: diff.c:5570
msgid "<text>"
msgstr "<texto>"
-#: diff.c:5563
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "genera un diff usando algoritmo \"anchored diff\""
+msgstr "generar un diff usando algoritmo \"anchored diff\""
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<modo>"
-#: diff.c:5566
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-"muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
+"mostrar diff por palabras usando <modo> para delimitar las palabras cambiadas"
-#: diff.c:5569
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
-msgstr "usa <regex> para decidir qué es una palabra"
+msgstr "usar <regex> para decidir qué es una palabra"
-#: diff.c:5572
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5575
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "líneas movidas de código están coloreadas diferente"
-#: diff.c:5578
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "como espacios en blanco son ignorados en --color-moved"
-#: diff.c:5581
+#: diff.c:5589
msgid "Other diff options"
msgstr "Otras opciones de diff"
-#: diff.c:5583
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-"cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "
+"cuando ejecutado desde un subdir, excluir cambios del exterior y muestra "
"paths relativos"
-#: diff.c:5587
+#: diff.c:5595
msgid "treat all files as text"
msgstr "tratar todos los archivos como texto"
-#: diff.c:5589
-msgid "swap two inputs, reverse the diff"
-msgstr "cambia dos inputs, invierte el diff"
-
-#: diff.c:5591
-msgid "exit with 1 if there were differences, 0 otherwise"
-msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
-
-#: diff.c:5593
-msgid "disable all output of the program"
-msgstr "deshabilita todo el salida del programa"
-
-#: diff.c:5595
-msgid "allow an external diff helper to be executed"
-msgstr "permite la ejecución de un diff helper externo"
-
#: diff.c:5597
-msgid "run external text conversion filters when comparing binary files"
-msgstr ""
-"ejecuta filtros de conversión de texto externos cuando comparando binarios"
+msgid "swap two inputs, reverse the diff"
+msgstr "cambiar dos inputs, invierte el diff"
#: diff.c:5599
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "terminar con 1 si hubieron diferencias, de lo contrario con 0"
+
+#: diff.c:5601
+msgid "disable all output of the program"
+msgstr "deshabilitar toda la salida del programa"
+
+#: diff.c:5603
+msgid "allow an external diff helper to be executed"
+msgstr "permitir la ejecución de un diff helper externo"
+
+#: diff.c:5605
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"ejecutar filtros de conversión de texto externos cuando comparando binarios"
+
+#: diff.c:5607
msgid "<when>"
msgstr "<cuando>"
-#: diff.c:5600
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorar cambios a submódulos en la generación de diff"
-#: diff.c:5603
+#: diff.c:5611
msgid "<format>"
msgstr "<formato>"
-#: diff.c:5604
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
-msgstr "especifica como son mostradas las diferencias en submódulos"
+msgstr "especificar como son mostradas las diferencias en submódulos"
-#: diff.c:5608
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "ocultar entradas 'git add -N' del índice"
-#: diff.c:5611
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
-msgstr "trata entradas 'git add -N' como reales en el índice"
+msgstr "tratar entradas 'git add -N' como reales en el índice"
-#: diff.c:5613
+#: diff.c:5621
msgid "<string>"
msgstr "<string>"
-#: diff.c:5614
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-"busca diferencias que cambien el número de ocurrencias del string "
+"buscar diferencias que cambien el número de ocurrencias del string "
"especificado"
-#: diff.c:5617
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-"busca por diferencias que cambien el número de ocurrencias del regex "
+"buscar diferencias que cambien el número de ocurrencias del regex "
"especificado"
-#: diff.c:5620
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "mostrar todos los cambios en el changeset con -S o -G"
-#: diff.c:5623
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"
-#: diff.c:5626
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "controlar el orden en el que los archivos aparecen en la salida"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<ruta>"
-#: diff.c:5628
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "mostrar el cambio en la ruta especificada primero"
-#: diff.c:5631
+#: diff.c:5639
msgid "skip the output to the specified path"
-msgstr "saltar el salida de la ruta especificada"
+msgstr "saltar la salida de la ruta especificada"
-#: diff.c:5633
+#: diff.c:5641
msgid "<object-id>"
msgstr "<id-de-objeto>"
-#: diff.c:5634
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-"busca diferencias que cambien el número de ocurrencias para el objeto "
+"buscar diferencias que cambien el número de ocurrencias para el objeto "
"especificado"
-#: diff.c:5636
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5645
msgid "select files by diff type"
-msgstr "selecciona archivos por tipo de diff"
+msgstr "seleccionar archivos por tipo de diff"
-#: diff.c:5639
+#: diff.c:5647
msgid "<file>"
msgstr "<archivo>"
-#: diff.c:5640
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "Output a un archivo específico"
-#: diff.c:6298
+#: diff.c:6306
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"detección exhaustiva de cambio de nombre fue saltada por haber demasiados "
"archivos."
-#: diff.c:6301
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr ""
"solo se encontraron copias de rutas modificadas por haber demasiados "
"archivos."
-#: diff.c:6304
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3962,7 +3977,7 @@
msgid "failed to read orderfile '%s'"
msgstr "falló al leer archivo de orden '%s'"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Realizando una detección de cambios de nombre inexacta"
@@ -4001,339 +4016,416 @@
msgid "cannot use %s as an exclude file"
msgstr "no se puede usar %s como archivo de exclusión"
-#: dir.c:2351
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "no se pudo abrir el directorio '%s'"
-#: dir.c:2653
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr "falló al conseguir el nombre y la información del kernel"
-#: dir.c:2777
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr "untracked cache está desactivado en este sistema o ubicación"
-#: dir.c:3610
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"No se pudo adivinar ningún nombre de directorio.\n"
+"Por favor especifica un directorio en la línea de comando"
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "archivo índice corrompido en repositorio %s"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "no se pudo crear directorios para %s"
-#: dir.c:3691
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"
-#: entry.c:176
+#: entry.c:177
msgid "Filtering content"
msgstr "Filtrando contenido"
-#: entry.c:497
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "no se pudo hacer stat en el archivo '%s'"
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "ruta de namespace de git mala \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "no se pudo configurar GIT_DIR a '%s'"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "demasiados argumentos para ejecutar %s"
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: lista de superficiales esperada"
-#: fetch-pack.c:185
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
"git fetch-pack: se esperaba un flush packet luego de la lista de "
"superficiales"
-#: fetch-pack.c:196
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"
-#: fetch-pack.c:216
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
-#: fetch-pack.c:227
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "no se puede escribir al remoto"
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requiere multi_ack_detailed"
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "línea shallow inválida: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línea unshallow inválida: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "objeto no encontrado: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "error en objeto: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "shallow no encontrado: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "se esperaba shallow/unshallow, se obtuvo %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "se obtuvo %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "commit inválido %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
msgstr "rindiéndose"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "listo"
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "se obtuvo %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "Marcando %s como completa"
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "ya se tiene %s (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no se puede ejecutar un demultiplexor de banda lateral"
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "error de protocolo: header de paquete erróneo"
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no se puede ejecutar %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: salida de index-pack no válida"
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "%s falló"
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "error en demultiplexor de banda lateral"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "Versión de servidor es %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "El servidor soporta %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "El servidor no soporta clientes superficiales"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "El servidor no soporta --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no soporta --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "El servidor no soporta --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr "El servidor no soporta el formato de objetos de este repositorio"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "no hay commits comunes"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "el repositorio fuente es superficial, rechazando clonado."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch falló."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "algoritmos no compatibles: cliente %s; servidor %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "el servidor no soporta el algoritmo '%s'"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "El servidor no soporta peticiones superficiales"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "El servidor soporta filtración"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "no se puede escribir request al remoto"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "error al leer header de sección '%s'"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "se esperaba '%s', se recibió '%s'"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "línea de confirmación inesperada: '%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "error al procesar acks: %d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr "se esperaba que el packfile fuera enviado luego del 'listo'"
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr "se esperaba que ninguna otra sección fuera enviada luego del 'listo'"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "error al procesar información de superficiales: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "se esperaba wanted-ref, se obtuvo '%s'"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inesperado: '%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "error al procesar refs deseadas: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: se esperaba un paquete final de respuesta"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "no concuerda el head remoto"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "remoto no mandó todos los objetos necesarios"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
msgstr "'listo' inesperado del remoto"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "no existe ref remota %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr "no se pudo crear archivo temporal"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "falló al escribir la firma separada para '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile necesita ser configurado y existe para "
+"verificación de firmas ssh"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify se necesita para la verficación de ssh "
+"(disponible en openssh versión 8.2p1+)"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "archivo de revocación de firmas ssh configurado pero no encontrado: %s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "firma mala/incompatible '%s'"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "error al conseguir la huella de ssh para la llave '%s'"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "user.signingkey o gpg.ssh.defaultKeyCommand necesitan ser configurados"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand exitoso pero no retornó ninguna llave: %s %s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand falló: %s %s"
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
msgstr "gpg falló al firmar los datos"
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey necesita ser configurado para firmar con ssh"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "falló al escribir la llave de firma para '%s'"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "falló al escribir el buffer para lla llave de firma para '%s'"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y signs se necesita para el firmado con ssh (disponible en "
+"openssh versión 8.2p1+)"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "falló al leer la firma ssh desde '%s'"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "ignorado color inválido '%.*s' en log.graphColors"
-#: grep.c:531
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4341,109 +4433,109 @@
"el patrón provisto contiene bytes NULL (vía -f <archivo>). Esto solo es "
"soportado con -P bajo PCRE v2"
-#: grep.c:1895
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': no es posible leer %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "falló al hacer stat en '%s'"
-#: grep.c:1923
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "'%s': lectura corta"
-#: help.c:23
-msgid "start a working area (see also: git help tutorial)"
-msgstr "comienza un área de trabajo (ver también: git help tutorial)"
-
#: help.c:24
-msgid "work on the current change (see also: git help everyday)"
-msgstr "trabaja en los cambios actuales (ver también: git help everyday)"
+msgid "start a working area (see also: git help tutorial)"
+msgstr "comenzar un área de trabajo (mira también: git help tutorial)"
#: help.c:25
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "examina el historial y el estado (ver también: git help revisions)"
+msgid "work on the current change (see also: git help everyday)"
+msgstr "trabajar en los cambios actuales (mira también: git help everyday)"
#: help.c:26
-msgid "grow, mark and tweak your common history"
-msgstr "crece, marca y ajusta tu historial común"
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "examinar el historial y el estado (mira también: git help revisions)"
#: help.c:27
-msgid "collaborate (see also: git help workflows)"
-msgstr "colabora (mira también: git help workflows)"
+msgid "grow, mark and tweak your common history"
+msgstr "crecer, marcar y ajustar tu historial común"
-#: help.c:31
+#: help.c:28
+msgid "collaborate (see also: git help workflows)"
+msgstr "colaborar (mira también: git help workflows)"
+
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Comandos de Porcelana principales"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Comandos auxiliares / Manipuladores"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Comandos auxiliares / Interrogadores"
-#: help.c:34
-msgid "Interacting with Others"
-msgstr "Interactuando con Otros"
-
#: help.c:35
+msgid "Interacting with Others"
+msgstr "Interactuar con Otros"
+
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Comandos de bajo nivel / Manipuladores"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Comandos de bajo nivel / Interrogadores"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Comandos de bajo nivel / Sincronización de repositorios"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Comandos de bajo nivel / Auxiliares internos"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "comandos disponibles de git en '%s'"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "tipo de listado de comandos no soportado '%s'"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Las guías de conceptos de Git son:"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos"
+msgstr "Mira 'git help <comando>' para leer sobre los subcomandos específicos"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Comandos externos"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Aliases de comando"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4452,31 +4544,36 @@
"'%s' parece ser un comando de git, pero no hemos\n"
"podido ejecutarlo. ¿Tal vez git-%s se ha roto?"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' no es un comando de git. Mira 'git --help'."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oh oh. Tu sistema no reporta ningún comando de Git."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Continuando asumiendo que quisiste decir '%s'."
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "Ejecutar '%s' en su lugar? (y/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Continuando en %0.1f segundos, asumiendo que quisiste decir '%s'."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4490,16 +4587,16 @@
"\n"
"Los comandos más similares son"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<opciones>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4513,6 +4610,15 @@
"\n"
"¿Quisiste decir alguno de estos?"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n"
+"Puedes desactivar esta advertencia con `git config advice.ignoredHook false`."
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Identidad del autor desconocido\n"
@@ -4575,7 +4681,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr "el nombre consiste solo de caracteres no permitidos: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "formato de fecha inválido: %s"
@@ -4656,7 +4762,7 @@
"No se puede crear '%s.lock': %s.\n"
"\n"
"Otro proceso git parece estar ejecutando en el repositorio, es decir\n"
-"un editor abierto con 'git commit'. Por favor asegúrese de que todos los "
+"un editor abierto con 'git commit'. Por favor asegúrate de que todos los "
"procesos\n"
"estén terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n"
"puede haber roto el repositorio antes:\n"
@@ -4672,7 +4778,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "valor inválido '%s' para lsrefs.unborn"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "línea inesperada: '%s'"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "se esperaba un flush luego de argumentos ls-refs"
@@ -4680,37 +4791,37 @@
msgid "quoted CRLF detected"
msgstr "CRLF con comillas detectado"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "mala acción '%s' para '%s'"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Falló al fusionar el submódulo %s (no revisado)"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Falló al fusionar el submódulo %s (commits no presentes)"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "Falló el fusionar submódulo %s (commits no siguen la base de fusión)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Nota: Fast-forward de submódulo %s a %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr "Falló al fusionar el submódulo %s"
-#: merge-ort.c:1632
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4720,7 +4831,7 @@
"fusión:\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4737,30 +4848,31 @@
"\n"
"el cual aceptará esta sugerencia.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
"%s"
msgstr ""
-"Falló al fusionar el submódulo %s, pero existen múltipes fusiones posibles:\n"
+"Falló al fusionar el submódulo %s, pero existen múltiples fusiones "
+"posibles:\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "Falló al ejecutar la fusión interna"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "No es posible agregar %s a la base de datos"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "Auto-fusionando %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4770,7 +4882,7 @@
"existente en %s se interpone con el cambio de nombres implícito, poniendo "
"la(s) siguiente(s) ruta(s) aquí: %s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4779,7 +4891,7 @@
"CONFLICTO (cambio de nombre de directorio implícito): No se puede mapear más "
"de una ruta para %s; cambio de nombre implícito intentó poner estas rutas: %s"
-#: merge-ort.c:2087
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4790,7 +4902,7 @@
"cambiar el nombre de %s; se le cambió el nombre a varios otros directorios, "
"sin que ningún destino obtuviera la mayoría de los archivos."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4799,7 +4911,7 @@
"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
"renombrado."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4808,7 +4920,7 @@
"Path actualizado: %s agregado en %s dentro de un directorio que fue "
"renombrado en %s; moviéndolo a %s."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4817,7 +4929,7 @@
"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
"renombrado en %s; moviéndolo a %s."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4826,7 +4938,7 @@
"CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "
"que fue renombrado en %s, sugerimos que debería ser movido a %s."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4836,13 +4948,13 @@
"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
"movido a %s."
-#: merge-ort.c:2569
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"CONFLICTO (renombrar / renombrar): %s renombrado a %s en %s y %s en %s."
-#: merge-ort.c:2664
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4853,24 +4965,24 @@
"->%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede "
"resultar en marcadores de conflicto anidados."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"CONFLICTO (renombrar / eliminar): %s renombrado a %s en %s, pero eliminado "
"en %s."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr "no se pudo leer el objeto %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr "objeto %s no es un blob"
-#: merge-ort.c:3613
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4879,7 +4991,7 @@
"CONFLICTO (archivo / directorio): directorio en el camino de %s de %s; "
"moviéndolo a %s en su lugar."
-#: merge-ort.c:3689
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4889,7 +5001,7 @@
"fueron renombrados para que cada uno pueda ser grabado en algún lugar "
"diferente."
-#: merge-ort.c:3696
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4899,24 +5011,24 @@
"ellos fue renombrado para que cada uno pueda ser grabado en algún lugar "
"diferente."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "contenido"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "agregar/agregar"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr "submódulo"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4925,7 +5037,7 @@
"CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. "
"Versión %s de %s restante en el árbol."
-#: merge-ort.c:4120
+#: merge-ort.c:4152
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4937,13 +5049,13 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr ""
"la recopilación de información de fusión falló para los árboles %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4953,106 +5065,106 @@
"merge:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr "Ya está actualizado."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(commit erróneo)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo falló al refrescar la ruta '%s'; abortando fusión."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "falló al crear la ruta '%s'%s"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Quitando %s para hacer espacio para un subdirectorio\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": ¿tal vez un conflicto D/F?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "rehusando perder el archivo no rastreado en '%s'"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no se puede leer el objeto %s '%s'"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "se esperaba blob para %s '%s'"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "falló al abrir '%s': %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "falló al crear el enlace simbólico '%s': %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "no sé qué hacer con %06o %s '%s'"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Haciendo fast-forward a submódulo %s hasta el siguiente commit:"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avance rápido en submódulo %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Falló al fusionar el submódulo %s (avance rápido no es posible)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Se encontró una posible solución de fusión para el submódulo:\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Falló al fusionar el submódulo %s (múltiples fusiones encontradas)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en "
"cambio."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5061,7 +5173,7 @@
"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Se dejó la versión %s de "
"%s en el árbol."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5070,7 +5182,7 @@
"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
"permanece en el árbol."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5079,7 +5191,7 @@
"CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "
"dejada en el árbol, en %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5088,44 +5200,44 @@
"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
"permanece en el árbol en %s."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "rename"
msgstr "renombrar"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "renombrado"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Rehusando perder el archivo sucio en %s"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Rehusando perder el archivo no rastreado en %s, incluso aunque se está "
"interponiendo."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1708
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s es un directorio en %s agregando como %s más bien"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5134,18 +5246,18 @@
"CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
"renombrar \"%s\"->\"%s\" en \"%s\"%s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " (dejado sin resolver)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1837
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "
"%s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5156,7 +5268,7 @@
"colocar %s porque el directorio %s fue renombrado a múltiples otros "
"directorios, sin ningún que contenga la mayoría de archivos."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5165,81 +5277,81 @@
"CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
"Renombrar directorio %s->%s en %s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modified"
msgstr "modificado"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Saltado %s (fusionado como existente)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "Agregando más bien como %s"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "Eliminando %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "archivo/directorio"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "directorio/archivo"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3420
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "
"%s"
-#: merge-recursive.c:3415
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "Agregando %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLICTO (add/add): Conflicto de merge en %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "falló la fusión de los árboles %s y %s"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "Fusionando:"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3598
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "se encontró %u ancestro común:"
msgstr[1] "se encontraron %u ancestros comunes:"
-#: merge-recursive.c:3634
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "la fusión no devolvió ningún commit"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "No se pudo analizar el objeto '%s'"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Incapaz de escribir el índice."
@@ -5247,196 +5359,228 @@
msgid "failed to read the cache"
msgstr "falló al leer la cache"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "no es posible escribir el archivo índice"
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr ""
"el abanico de OID de índice de paquetes múltiples es del tamaño incorrecto"
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "el archivo multi-pack-index %s es demasiado pequeño"
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x"
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "versión %d de multi-pack-index no reconocida"
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
"la versión de hash de índice de paquetes múltiples %u no coincide con la "
"versión %u"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr "a multi-pack-index le falta el conjunto pack-name requerido"
-#: midx.c:150
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "a multi-pack-index le falta el conjunto OID fanout requerido"
-#: midx.c:152
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "a multi-pack-index le falta el conjunto OID fanout requerido"
-#: midx.c:154
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "a multi-pack-index le falta el conjunto de offset del objeto requerido"
-#: midx.c:170
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"nombres de paquete de multi-pack-index fuera de orden: '%s' antes de '%s'"
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mal pack-int-id: %u (%u paquetes totales)"
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"multi-pack-index guarda un offset de 64-bit, pero off_t es demasiado pequeño"
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "falló al agregar packfile '%s'"
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "falló al abrir pack-index '%s'"
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "falló al ubicar objeto %d en packfile"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr "no se puede almacenar el archivo de índice inverso"
-#: midx.c:920
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "no se puede analizar línea: %s"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "línea mal formada: %s"
+
+#: midx.c:1159
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "ignorando el actual multi-pack-index; checksum no concuerda"
-#: midx.c:943
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "no se pudo cargar pack"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "no se puede abrir index para %s"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "Agregando packfiles a multi-pack-index"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "no se vió el pack-file que abandonar %s"
-
-#: midx.c:1034
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "pack preferido desconocido: '%s'"
-#: midx.c:1039
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "no se pueden seleccionar el paquete preferido %s sin objetos"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "no se vió el pack-file que abandonar %s"
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "pack de referencia '% s' ha expirado"
-#: midx.c:1055
+#: midx.c:1380
msgid "no pack files to index."
msgstr "no hay archivos pack para indexar."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "no se pudo escribir bitmap multi-paquete"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "no se pudo escribir multi-pack-index"
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "falló al borrar %s"
-#: midx.c:1166
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "falló al limpiar multi-pack-index en %s"
-#: midx.c:1225
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr ""
"el archivo de índice de paquetes múltiples existe, pero no se pudo analizar"
-#: midx.c:1233
+#: midx.c:1585
msgid "incorrect checksum"
msgstr "checksum incorrecto"
-#: midx.c:1236
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "Buscando packfiles referidos"
-#: midx.c:1251
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "el midx no contiene oid"
-#: midx.c:1265
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr "Verificando orden de OID en multi-pack-index"
-#: midx.c:1274
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "Ordenando objetos por packfile"
-#: midx.c:1301
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "Verificando offsets de objetos"
-#: midx.c:1317
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "fallo al cargar entrada pack para oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "falló al cargar el pack-index para packfile %s"
-#: midx.c:1332
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "Contando objetos no referenciados"
-#: midx.c:1367
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr "Encontrando y borrando packfiles sin referencias"
-#: midx.c:1558
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "no se pudo iniciar pack-objects"
-#: midx.c:1578
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "no se pudo finalizar pack-objects"
@@ -5462,7 +5606,7 @@
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-"No has concluido tu fusión preia de notas (%s existe).\n"
+"No has concluido tu fusión previa de notas (%s existe).\n"
"Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para "
"confirmar/abortar la fusión previa antes de comenzar una nueva fusión de "
"notas."
@@ -5496,262 +5640,262 @@
msgid "Bad %s value: '%s'"
msgstr "Valor erróneo para %s: '%s'"
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"directorio de objetos %s no existe; revisa .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
-#: object-file.c:658
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: ignorando espacios de objetos alternos, anidado demasiado profundo"
-#: object-file.c:665
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "incapaz de normalizar directorio de objetos: %s"
-#: object-file.c:708
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "no es posible hacer fdopen en lockfile alternos"
-#: object-file.c:726
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "no es posible leer el archivo de alternativos"
-#: object-file.c:733
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "no es posible mover el nuevo archivo de alternativos al lugar"
-#: object-file.c:768
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "ruta '%s' no existe"
-#: object-file.c:789
+#: object-file.c:722
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"repositorio de referencia '%s' como un checkout vinculado no es soportado "
"todavía."
-#: object-file.c:795
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "repositorio de referencia '%s' no es un repositorio local."
-#: object-file.c:801
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "repositorio de referencia '%s' es superficial (shallow)"
-#: object-file.c:809
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "repositorio de referencia '% s' está injertado"
-#: object-file.c:869
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "no se pudo encontrar el directorio de objetos concordante con %s"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "línea inválida mientras se analizaban refs alternas: %s"
-#: object-file.c:1019
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1008
#, c-format
msgid "mmap failed%s"
msgstr "mmap falló %s"
-#: object-file.c:1218
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "archivo de objeto %s está vacío"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objeto suelto corrupto '%s'"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "basura al final del objeto suelto '%s'"
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr "tipo de objeto inválido"
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "no es posible desempacar header %s con --allow-unknown-type"
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "incapaz de desempaquetar header %s"
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "no es posible analizar header %s con --allow-unknown-type"
-
-#: object-file.c:1493
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "incapaz de analizar header %s"
-#: object-file.c:1717
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "tipo de objeto inválido"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "incapaz de desempaquetar header %s"
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "cabecera para %s es muy larga, excede %d bytes"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "falló al leer objeto %s"
-#: object-file.c:1721
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "reemplazo %s no encontrado para %s"
-#: object-file.c:1725
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "objeto suelto %s (guardado en %s) está corrompido"
-#: object-file.c:1729
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "objeto empaquetado %s (guardado en %s) está corrompido"
-#: object-file.c:1834
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "no es posible escribir archivo %s"
-#: object-file.c:1841
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "no se pudo poner permisos a '%s'"
-#: object-file.c:1848
+#: object-file.c:1795
msgid "file write error"
msgstr "falló de escritura"
-#: object-file.c:1868
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "error al cerrar el archivo de objeto suelto"
-#: object-file.c:1933
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"permisos insuficientes para agregar un objeto a la base de datos del "
"repositorio %s"
-#: object-file.c:1935
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "no es posible crear un archivo temporal"
-#: object-file.c:1959
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "no es posible escribir el archivo de objeto suelto"
-#: object-file.c:1965
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "no es posible desinflar el objeto nuevo %s (%d)"
-#: object-file.c:1969
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd en objeto %s falló (%d)"
-#: object-file.c:1973
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "confundido por fuente de data de objetos inestable para %s"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "falló utime() en %s"
-#: object-file.c:2060
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "no se pudo leer el objeto para %s"
-#: object-file.c:2111
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "commit corrupto"
-#: object-file.c:2119
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "tag corrupto"
-#: object-file.c:2219
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "error de lectura al indexar %s"
-#: object-file.c:2222
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "lectura corta al indexar %s"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: falló al insertar en la base de datos"
-#: object-file.c:2311
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipo de archivo no soportado"
-#: object-file.c:2335
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "%s no es objeto válido"
-#: object-file.c:2337
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no es un objeto '%s' válido"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "no es posible abrir %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "hash no concuerda para %s (se esperaba %s)"
-#: object-file.c:2583
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "no es posible hacer mmap a %s"
-#: object-file.c:2588
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "incapaz de desempaquetar header de %s"
-#: object-file.c:2594
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "incapaz de analizar header de %s"
-#: object-file.c:2605
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "no es posible desempaquetar contenidos de %s"
@@ -5880,12 +6024,25 @@
msgid "hash mismatch %s"
msgstr "hash no concuerda %s"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "a multi-pack-index le falta un índice reveretido"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: no se pudo abrir el paquete"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "no se pudo obtener el tamaño de %s"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "no se pudo encontrar %s en paquete %s en el offset %<PRIuMAX>"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "no se puede obtener el uso de disco de %s"
@@ -5915,47 +6072,47 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "archivo reverse-index %s tiene un id de hash no soportado %<PRIu32>"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "no puede escribir y verificar el índice inverso"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "no se pudo hacer stat: %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "no pudo hacer %s legible"
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "no se pudo escribir el archivo promisor '%s'"
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes del final del paquete (¿.idx roto?)"
-#: packfile.c:655
+#: packfile.c:656
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "objeto %s no puede ser mapeado %s"
-#: packfile.c:1934
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"offset antes del comienzo del índice del paquete para %s (¿índice corrupto?)"
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"offset más allá del índice de fin de paquete para %s (¿índice truncado?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "opción `%s' espera un valor numérico"
@@ -5975,71 +6132,71 @@
msgid "malformed object name '%s'"
msgstr "nombre de objeto mal formado '%s'"
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s requiere un valor"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s es incompatible con %s"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s : incompatible con otra cosa"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s no toma valores"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s no está disponible"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "¿quisiste decir `--%s` (con dos guiones)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "alias de --%s"
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "opción `%s' desconocida"
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "switch desconocido `%c'"
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "opción desconocida en string no ascii: `%s'"
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
@@ -6047,49 +6204,73 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-NUM"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "No se pudo hacer que %s fuera escribible por el grupo"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"Carácter de escape '\\' no permitido como último carácter en el valor attr"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Solo se permite una única especificación 'attr'."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "la especificación attr no puede estar vacía"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "nombre de atributo %s inválido"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6097,54 +6278,54 @@
"la configuración global de 'literal' para patrones de ruta es incompatible "
"con las demás configuraciones globales de patrones de ruta"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "parámetro no válido para la magia de pathspec 'prefix'"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Magia de pathspec inválida '%.*s' en '%s'"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Falta ')' al final de la magia de pathspec en '%s'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Magia de pathspec '%c' no implementada en '%s'"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' y 'glob' son incompatibles"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s' está fuera del repositorio en '%s'"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (nemotécnico: '%c')"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: magia de pathspec no soportada por este comando: %s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
-msgstr "la línea está mál entrecomillada: %s"
+msgstr "la línea está mal entrecomillada: %s"
#: pkt-line.c:92
msgid "unable to write flush packet"
@@ -6162,7 +6343,7 @@
msgid "flush packet write failed"
msgstr "limpieza de escritura de paquetes falló"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "error de protocolo: línea imposiblemente larga"
@@ -6170,7 +6351,7 @@
msgid "packet write with format failed"
msgstr "escritura de paquetes con formato falló"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"
@@ -6179,25 +6360,25 @@
msgid "packet write failed: %s"
msgstr "escritura de paquetes falló: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "error de lectura"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "el remoto se colgó de manera inesperada"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
-msgstr "error de protocolo: mal caracter de largo de línea: %.4s"
+msgstr "error de protocolo: mal carácter de largo de línea: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "error de protocolo: mal largo de línea %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "error remoto: %s"
@@ -6211,21 +6392,21 @@
msgid "unable to create threaded lstat: %s"
msgstr "no es posible crear lstat hilado: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "incapaz de analizar el formato de --pretty"
#: promisor-remote.c:31
msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote: no se puede bifurcar el subproceso de recuperación"
+msgstr "promisor-remote: no se puede bifurcar el subproceso de fetch"
#: promisor-remote.c:38 promisor-remote.c:40
msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "proiso-remote: no se pudo escribir para recuperar el subproceso"
+msgstr "promisor-remote: no se pudo escribir al subproceso de fetch"
#: promisor-remote.c:44
msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr "promisor-remote: no se pudo cerrar stdin para recuperar el subproceso"
+msgstr "promisor-remote: no se pudo cerrar stdin al subproceso de fetch"
#: promisor-remote.c:54
#, c-format
@@ -6240,20 +6421,20 @@
msgid "Removing duplicate objects"
msgstr "Quitando objetos duplicados"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "no se pudo comenzar `log`"
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr "no se pudo leer salida de `log`"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr "no se pudo analizar commit '%s'"
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6262,12 +6443,12 @@
"no se pudo leer la primera línea de salida de `log`: no comienza con 'commit "
"': '%s'"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "no se puede analizar git header '%.*s'"
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "falló al generar diff"
@@ -6296,7 +6477,7 @@
"%s: solo se pueden agregar archivos regulares, symbolic links o git-"
"directories"
-#: read-cache.c:753
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' no tiene un commit checked out"
@@ -6316,16 +6497,16 @@
msgid "unable to stat '%s'"
msgstr "incapaz de hacer stat en '%s'"
-#: read-cache.c:1358
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' parece ser un directorio y un archivo a la vez"
-#: read-cache.c:1573
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "Refrescar index"
-#: read-cache.c:1705
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6334,7 +6515,7 @@
"index.version configurado, pero el valor no es válido.\n"
"Usando versión %i"
-#: read-cache.c:1715
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6343,143 +6524,143 @@
"GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
"Usando versión %i"
-#: read-cache.c:1771
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "mala firma 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "mala versión de índice %d"
-#: read-cache.c:1783
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "mala firma sha1 del archivo index"
-#: read-cache.c:1817
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "index usa la extensión %.4s, cosa que no entendemos"
-#: read-cache.c:1819
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr "ignorando extensión %.4s"
-#: read-cache.c:1856
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "formato de índice desconocido 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "campo nombre malformado en el índice, cerca de ruta '%s'"
-#: read-cache.c:1929
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "entradas en stage desordenadas en index"
-#: read-cache.c:1932
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "múltiples entradas de stage para archivo fusionado '%s'"
-#: read-cache.c:1935
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "entradas de stage desordenadas para '%s'"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "archivo índice corrompido"
-#: read-cache.c:2185
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "no es posible crear hilo load_cache_entries: %s"
-#: read-cache.c:2198
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "no es posible unir hilo load_cache_entries: %s"
-#: read-cache.c:2231
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s: falló al abrir el archivo index"
-#: read-cache.c:2235
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: no se puede hacer stat en el índice abierto"
-#: read-cache.c:2239
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: archivo index más pequeño de lo esperado"
-#: read-cache.c:2243
+#: read-cache.c:2267
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: no se pudo mapear el archivo index %s"
-#: read-cache.c:2286
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "no es posible crear hilo load_index_extensions: %s"
-#: read-cache.c:2313
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "no es posible unir hilo load_index_extensions: %s"
-#: read-cache.c:2351
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "no se pudo refrescar el índice compartido '%s'"
-#: read-cache.c:2398
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "index roto, se esperaba %s en %s, se obtuvo %s"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "no se pudo cerrar '%s'"
-#: read-cache.c:3075
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr "falló al convertir a un índice sparse"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "no se pudo hacer stat en '%s'"
-#: read-cache.c:3159
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "no es posible abrir el directorio de git: %s"
-#: read-cache.c:3171
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "no es posible eliminar el vinculo: %s"
-#: read-cache.c:3200
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "no se pudo arreglar bits de permisos en '%s'"
-#: read-cache.c:3349
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: no se puede eliminar hasta stage #0"
@@ -6536,13 +6717,13 @@
"\t, a menos que se use -C, en cuyo caso\n"
"\tmantiene solo el mensaje del commit; -c es lo mismo que -C\n"
"\tpero abre el editor\n"
-"x, exec <commit> = ejecuta comando (el resto de la línea) usando un shell\n"
+"x, exec <commit> = ejecutar comando (el resto de la línea) usando un shell\n"
"b, break = parar aquí (continuar rebase luego con 'git rebase --continue')\n"
"d, drop <commit> = eliminar commit\n"
"l, label <label> = poner label al HEAD actual con un nombre\n"
"t, reset <label> = reiniciar HEAD al label\n"
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". crea un commit de fusión usando el mensaje original de\n"
+". crear un commit de fusión usando el mensaje original de\n"
". fusión (o la línea de oneline, si no se especifica un mensaje\n"
". de commit). Use -c <commit> para reescribir el mensaje del commit.\n"
"\n"
@@ -6556,7 +6737,7 @@
msgstr[0] "Rebase %s en %s (%d comando)"
msgstr[1] "Rebase %s en %s (%d comandos)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6564,7 +6745,7 @@
"\n"
"No elimines ninguna línea. Usa 'drop' explícitamente para borrar un commit.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6572,7 +6753,7 @@
"\n"
"Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6586,7 +6767,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6596,14 +6777,14 @@
"Como sea, si quieres borrar todo, el rebase será abortado.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "no se pudo escribir '%s'"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "no se pudo escribir '%s'."
@@ -6627,20 +6808,18 @@
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
-"Para evitar este mensaje, use \"drop\" para eliminar de forma explícita un "
+"Para evitar este mensaje, usa \"drop\" para eliminar de forma explícita un "
"commit.\n"
"\n"
-"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
+"Usa 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
"advertencias.\n"
"Los posibles comportamientos son: ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "no se puede leer '%s'."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' es supercedido por 'merges'"
#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
@@ -6661,132 +6840,142 @@
msgid "ahead %d, behind %d"
msgstr "delante %d, detrás %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "formato esperado: %%(color:<color>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconocido: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valor entero esperado refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valor entero esperado refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argumento %%(%s) no reconocido: %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) no toma ningún argumento"
-#: ref-filter.c:339
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "argumento %%(objectsize) no reconocido: %s"
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) no toma argumentos"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no toma ningún argumento"
-#: ref-filter.c:372
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "argumento %%(subject) no reconocido: %s"
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "se esperaba %%(trailers:key=<value>)"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argumento %%(trailers) desconocido: %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:426
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argumento %%(contents) no reconocido: %s"
-#: ref-filter.c:441
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "argumento %%(raw) no reconocido: %s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "valor positivo esperado '%s' en %%(%s)"
-#: ref-filter.c:445
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "argumento '%s' no reconocido en %%(%s)"
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "opción de email desconocida: %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "formato esperado: %%(align:<ancho>,<posición>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "posición desconocida: %s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "ancho desconocido: %s"
-#: ref-filter.c:517
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argumento no reconocido para %%(align): %s"
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "se esperaba un ancho positivo con el átomo %%(align)"
-#: ref-filter.c:543
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argumento %%(if) no reconocido: %s"
-#: ref-filter.c:645
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) no toma ningún argumento"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "nombre mal formado de campo: %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "nombre de campo desconocido: %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
@@ -6794,126 +6983,136 @@
"no es un repositorio git, pero el campo '%.*s' requiere acceso a los datos "
"de objeto"
-#: ref-filter.c:801
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"
-#: ref-filter.c:865
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "formato: átomo %%(then) usado sin átomo %%(if)"
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "formato: átomo %%(then) usado más de una vez"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "formato: átomo %%(then) usado después de %%(else)"
-#: ref-filter.c:897
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"
-#: ref-filter.c:899
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "formato: átomo %%(else) usado más de una vez"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "formato de cadena mal formado %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "este comando rechaza el átomo %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s no se puede usar con --python, --shell, --tcl"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(no hay rama, rebasando %s)"
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(no hay rama, comenzando biseccón en %s)"
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD desacoplado en %s)"
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD desacoplado de %s)"
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "(sin rama)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "falta objeto %s para %s"
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer falló en %s para %s"
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto mal formado en '%s'"
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorando referencia con nombre roto %s"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorando referencia rota %s"
-#: ref-filter.c:2502
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta átomo %%(end)"
-#: ref-filter.c:2596
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "nombre de objeto mal formado %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "opción '%s' debe apuntar a un commit"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "¡%s no apunta a ningún objeto válido!"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6931,7 +7130,7 @@
"predeterminado\n"
"está sujeto a cambios. Para configurar el nombre de la rama inicial para "
"usar en todos\n"
-"de sus nuevos repositorios, reprimiendo esta advertencia, llame a:\n"
+"de sus nuevos repositorios, reprimiendo esta advertencia, llama a:\n"
"\n"
"\tgit config --global init.defaultBranch <nombre>\n"
"\n"
@@ -6941,81 +7140,81 @@
"\n"
"\tgit branch -m <nombre>\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "no se pudo recibir `%s`"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "nombre de rama inválido: %s = %s"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignorando referencia symbólica rota %s"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "log de ref %s tiene un vacío tras %s"
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "log de ref %s finalizado inesperadamente en %s"
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "log de %s está vacío"
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "rehusando actualizar ref con mal nombre '%s'"
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref falló para ref '%s': %s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "no se permiten múltiples actualizaciones para ref '%s'"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "ref updates abortados por el hook"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe; no se puede crear '%s'"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "no se pudo eliminar la referencia %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no se pudo eliminar la referencia %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "no se pudo eliminar las referencias: %s"
@@ -7304,7 +7503,7 @@
#: replace-object.c:82
#, c-format
msgid "replace depth too high for object %s"
-msgstr "profundiad de reemplazo demasiada para objeto %s"
+msgstr "profundidad de reemplazo demasiada para objeto %s"
#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
@@ -7319,7 +7518,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "hubieron errores mientras se escribía '%s' (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr "falló al hacer flush '%s'"
@@ -7364,8 +7563,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Preimagen grabada para '%s'"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "no se pudo crear el directorio '%s'"
@@ -7403,46 +7602,41 @@
msgid "could not determine HEAD revision"
msgstr "no se pudo determinar revisión HEAD"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr "falló al encontrar árbol de %s"
-#: revision.c:2344
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input es incompatible con --no-walk"
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<packfile> ya no es soportado"
-#: revision.c:2684
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk es incompatible con --unsorted-input"
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr "tu rama actual parece estar rota"
-#: revision.c:2687
+#: revision.c:2693
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "tu rama actual '%s' no tiene ningún commit todavía"
-#: revision.c:2893
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L no soporta todavía formatos de diff fuera de -p y -s"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "falló al abrir /dev/null"
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr "no es posible crear hilo async: %s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n"
-"Puedes desactivar esta advertencia con `git config advice.ignoredHook false`."
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
@@ -7462,24 +7656,24 @@
msgid "failed to sign the push certificate"
msgstr "falló al firmar el certificado de push"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr ""
"send-pack: no es posible bifurcar el proceso de búsqueda en un subproceso"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "negociación push falló; procediendo con el push de todas formas"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "el destino no soporta el algoritmo de hash de este repositorio"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "el final receptor no soporta push --signed"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7487,47 +7681,48 @@
"no se manda un certificado de push ya que el destino no soporta push firmado "
"(--signed)"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "el destino no soporta push atómico (--atomic)"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "el destino no soporta opciones de push"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mensaje de commit inválido, modo cleanup '%s'"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "no se pudo borrar '%s'"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "no se pudo eliminar '%s'"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "revertir"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "acción desconocida: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7535,53 +7730,75 @@
"después de resolver los conflictos, marca las rutas corregidas\n"
"con 'git add <rutas>' o 'git rm <rutas>'"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"tras resolver los conflictos, marca las rutas corregidas\n"
-"con 'git add <rutas>' o 'git rm <rutas>'\n"
-"y haz un commit del resultado con 'git commit'"
+"Luego de resolver los conflictos, márquelos con\n"
+"\"git add/rm <pathspec>\", luego ejecute\n"
+"\"git cherry-pick --continue\".\n"
+"O puede saltar este commit con \"git cherry-pick --skip\".\n"
+"Para abortar y regresar al estado anterior a \"git cherry-pick\",\n"
+"ejecute \"git cherry-pick --abort\"."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Tras resolver los conflictos, márquelos con\n"
+"\"git add/rm <pathspec>\", luego ejecute\n"
+"\"git revert --continue\".\n"
+"O puede saltar este commit con \"git revert --skip\".\n"
+"Para abortar y regresar al estado anterior a \"git revert\",\n"
+"ejecute \"git revert --abort\"."
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr "no se pudo bloquear '%s'"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "no se pudo escribir en '%s'"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "no se pudo escribir EOL en '%s'"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr "falló al finalizar '%s'"
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "tus cambios locales serán sobreescritos por %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "realiza un commit con tus cambios o haz un stash para proceder."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avance rápido"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modo cleanup inválido %s"
@@ -7589,65 +7806,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Incapaz de escribir el nuevo archivo índice"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "no es posible actualizar el árbol de caché"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "no se pudo resolver el commit de HEAD"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "no hay llave presente en '%.*s'"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "no es posible dequote valor de '%s'"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "no se pudo abrir '%s' para lectura"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "variable desconocida '%s'"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "falta 'GIT_AUTHOR_NAME'"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "falta 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "falta 'GIT_AUTHOR_DATE'"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7673,15 +7890,15 @@
"\n"
" git commit %s\n"
"\n"
-"en cambos casos, cuando acabes, continua con:\n"
+"en ambos casos, cuando acabes, continúa con:\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr "hook 'prepare-commit-msg' falló"
-#: sequencer.c:1218
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7708,7 +7925,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7732,343 +7949,348 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr "no se pudo revisar el commit recién creado"
-#: sequencer.c:1275
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr "no se pudo analizar el commit recién creado"
-#: sequencer.c:1321
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr "no se pudo resolver HEAD tras crear el commit"
-#: sequencer.c:1323
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr "HEAD desacoplado"
-#: sequencer.c:1327
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr " (commit-raíz)"
-#: sequencer.c:1348
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr "no se pudo analizar HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "¡HEAD %s no es un commit!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "no se pudo analizar el commit de HEAD"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr "no es posible analizar el autor del commit"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr "git write-tree falló al escribir el árbol"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "no se puede leer el mensaje del commit de '%s'"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr "identidad de autor inválida '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr "autor corrupto: falta información de fecha"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "falló al escribir el objeto commit"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "no se puede actualizar %s"
-#: sequencer.c:1606
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr "no se pudo analizar commit %s"
-#: sequencer.c:1611
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr "no se pudo analizar el commit padre %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr "comando desconocido: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr "Este es el mensaje del 1er commit:"
-#: sequencer.c:1737
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr "Este es el mensaje del commit #%d:"
-#: sequencer.c:1738
+#: sequencer.c:1755
msgid "The 1st commit message will be skipped:"
msgstr "El mensaje del 1er commit será saltado:"
-#: sequencer.c:1739
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El mensaje del commit #%d será saltado:"
-#: sequencer.c:1740
+#: sequencer.c:1757
#, c-format
msgid "This is a combination of %d commits."
msgstr "Esta es una combinación de %d commits."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
#, c-format
msgid "cannot write '%s'"
msgstr "no se puede escribir '%s'"
-#: sequencer.c:1934
+#: sequencer.c:1951
msgid "need a HEAD to fixup"
msgstr "se necesita un HEAD para arreglar"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1953 sequencer.c:3601
msgid "could not read HEAD"
msgstr "no se pudo leer HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1955
msgid "could not read HEAD's commit message"
msgstr "no se pudo leer el mensaje de commit de HEAD"
-#: sequencer.c:1962
+#: sequencer.c:1979
#, c-format
msgid "could not read commit message of %s"
msgstr "no se puede leer el mensaje del commit de %s"
-#: sequencer.c:2072
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr "tu archivo índice no está fusionado."
-#: sequencer.c:2079
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr "no se puede arreglar el commit raíz"
-#: sequencer.c:2098
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr "el commit %s no tiene un padre %d"
-#: sequencer.c:2120
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr "no se puede obtener el mensaje de commit para %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no se puede analizar el commit padre %s"
-#: sequencer.c:2205
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no se puede renombrar '%s' a '%s'"
-#: sequencer.c:2265
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr "no se pudo revertir %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr "no se pudo aplicar %s... %s"
-#: sequencer.c:2287
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "descartando $%s %s -- contenidos del parche ya están en upstream\n"
-#: sequencer.c:2345
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: falló al leer el índice"
-#: sequencer.c:2352
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: falló al refrescar el índice"
-#: sequencer.c:2425
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s no acepta argumentos: '%s'"
-#: sequencer.c:2434
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr "faltan argumentos para %s"
-#: sequencer.c:2477
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr "no se puede analizar '%s'"
-#: sequencer.c:2538
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línea inválida %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "no se puede '%s' sin un commit previo"
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "no se puede leer '%s'."
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr "cancelando cherry-pick en progreso"
-#: sequencer.c:2644
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr "cancelando revert en progreso"
-#: sequencer.c:2690
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
+msgstr "por favor arregla esto usando 'git rebase --edit-todo'."
-#: sequencer.c:2692
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "hoja de instrucciones inutilizable: '%s'"
-#: sequencer.c:2697
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr "ningún commit analizado."
-#: sequencer.c:2708
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr "no se puede realizar cherry-pick durante un revert."
-#: sequencer.c:2710
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr "no se puede realizar un revert durante un cherry-pick."
-#: sequencer.c:2788
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor inválido para %s: %s"
-#: sequencer.c:2897
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr "squash-onto inservible"
-#: sequencer.c:2917
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "hoja de opciones mal formada: '%s'"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr "conjunto de commits vacío entregado"
-#: sequencer.c:3029
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr "revert ya está en progreso"
-#: sequencer.c:3031
+#: sequencer.c:3050
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "intenta \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3053
msgid "cherry-pick is already in progress"
msgstr "cherry-pick ya está en progreso"
-#: sequencer.c:3036
+#: sequencer.c:3055
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "intenta \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3069
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no se pudo crear un directorio secuenciador '%s'"
-#: sequencer.c:3065
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr "no se pudo bloquear HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr "ningún cherry-pick o revert en progreso"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr "no se puede resolver HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
msgid "cannot abort from a branch yet to be born"
msgstr "no se puede abortar de una rama por nacer"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "no se puede abrir '%s'"
-#: sequencer.c:3161
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr "no se puede leer '%s': %s"
-#: sequencer.c:3162
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr "final de archivo inesperado"
-#: sequencer.c:3168
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "archivo HEAD '%s' guardado antes de cherry-pick está corrupto"
-#: sequencer.c:3179
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!"
-#: sequencer.c:3220
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr "no hay revert en progreso"
-#: sequencer.c:3229
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr "ningún cherry-pick en progreso"
-#: sequencer.c:3239
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr "falló al escribir el commit"
-#: sequencer.c:3246
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr "no hay nada que saltar"
-#: sequencer.c:3249
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
@@ -8077,16 +8299,16 @@
"¿ya has hecho el commit?\n"
"intenta \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr "no se puede leer HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:3436
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8105,27 +8327,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "No se pudo aplicar %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr "No se pudo fusionar %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:3483
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr "Ejecutando: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8140,11 +8362,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"
-#: sequencer.c:3510
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8161,90 +8383,90 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nombre de label ilegal: '%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr "escribiendo commit raíz falso"
-#: sequencer.c:3650
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr "escribiendo squash-onto"
-#: sequencer.c:3734
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr "no se pudo resolver '%s'"
-#: sequencer.c:3767
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr "no se puede fusionar sin una versión actual"
-#: sequencer.c:3789
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr "no se puede analizar '%.*s'"
-#: sequencer.c:3798
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nada para fusionar: '%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"
-#: sequencer.c:3826
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr "no se puede leer el mensaje del commit '%s'"
-#: sequencer.c:4009
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "ni se pudo intentar fusionar '%.*s'"
-#: sequencer.c:4025
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr "fusión: No se puede escribir el nuevo archivo índice"
-#: sequencer.c:4099
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr "No se puede ejecutar autostash"
-#: sequencer.c:4102
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Respuesta de stash inesperada: '%s'"
-#: sequencer.c:4108
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr "No se pudo crear el directorio para '%s'"
-#: sequencer.c:4111
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr "Autostash creado: %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr "no se pudo reset --hard"
-#: sequencer.c:4140
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr "Autostash aplicado.\n"
-#: sequencer.c:4152
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr "no se puede guardar %s"
-#: sequencer.c:4155
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -8256,29 +8478,29 @@
"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
"momento.\n"
-#: sequencer.c:4160
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr "Aplicar autostash resultó en conflictos."
-#: sequencer.c:4161
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr "Autostash existe; creando una nueva entrada stash."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr "no se pudo desacoplar HEAD"
-#: sequencer.c:4248
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Detenido en HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr "Detenido en %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8294,63 +8516,63 @@
"\n"
" %.*s\n"
"Ha sido reprogramado; Para editar el comando antes de continuar, por favor\n"
-"edite la lista de \"todo\" primero:\n"
+"edita la lista de \"todo\" primero:\n"
"\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Aplicando rebase (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Detenido en %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr "comando desconocido %d"
-#: sequencer.c:4480
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr "no se pudo leer orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr "no se pudo leer 'onto'"
-#: sequencer.c:4499
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr "no se pudo actualizar HEAD a %s"
-#: sequencer.c:4559
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n"
-#: sequencer.c:4611
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
-#: sequencer.c:4620
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr "no se puede arreglar un commit no existente"
-#: sequencer.c:4622
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr "archivo inválido: '%s'"
-#: sequencer.c:4624
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenido inválido: '%s'"
-#: sequencer.c:4627
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8361,50 +8583,59 @@
"un commit con estos\n"
"primero y luego ejecuta 'git rebase --continue' de nuevo."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr "no se pudo escribir el archivo: '%s'"
-#: sequencer.c:4718
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "no se pudo eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr "no se pudo realizar el commit con los cambios en el área de stage."
-#: sequencer.c:4845
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no se puede aplicar cherry-pick a un %s"
-#: sequencer.c:4849
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisión errónea"
-#: sequencer.c:4884
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr "no se puede revertir como commit inicial"
-#: sequencer.c:5361
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "se ha saltado el commit %s aplicado previamente"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "use --reapply-cherry-picks para incluir los commits saltados"
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr "make_script: opciones desconocidas"
-#: sequencer.c:5364
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr "make_script: error al preparar revisiones"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr "nada que hacer"
-#: sequencer.c:5650
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr "no se pudo saltar los comandos pick innecesarios"
-#: sequencer.c:5750
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr "este script ya fue reorganizado."
@@ -8420,7 +8651,7 @@
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
"%s: no existe la ruta en el árbol de trabajo.\n"
-"Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
+"Usa 'git <comando> -- <ruta>...' para especificar rutas que no existen "
"localmente."
#: setup.c:198
@@ -8432,7 +8663,7 @@
msgstr ""
"argumento ambiguo '%s': revisión desconocida o ruta fuera del árbol de "
"trabajo.\n"
-"Use '--' para separar las rutas de las revisiones, de esta manera:\n"
+"Usa '--' para separar las rutas de las revisiones, de esta manera:\n"
"'git <comando> [<revisión>...] -- [<archivo>...]'"
#: setup.c:264
@@ -8448,7 +8679,7 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
"argumento ambiguo '%s': ambos revisión y nombre de archivo\n"
-"Use '--' para separar rutas de revisiones, de esta manera:\n"
+"Usa '--' para separar rutas de revisiones, de esta manera:\n"
"'git <comando> [<revisión>...] -- [<archivo>...]'"
#: setup.c:419
@@ -8566,27 +8797,15 @@
"problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
"El dueño de los archivos tiene que tener permisos de lectura y escritura."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "falló al abrir /dev/null o hacer dup"
-
-#: setup.c:1445
+#: setup.c:1443
msgid "fork failed"
msgstr "falló fork"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr "falló setsid"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "intentando usar sparse-index sin modo cono"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "no es posible actualizar el cache del árbol, manteniendo full"
-
-#: sparse-index.c:263
+#: sparse-index.c:273
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "la entrada de índice es un directorio, pero no escazo (%08x)"
@@ -8643,13 +8862,13 @@
msgstr[0] "%u bytes/s"
msgstr[1] "%u bytes/s"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "no se pudo abrir '%s' para escritura"
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "no se pudo editar '%s'"
@@ -8675,7 +8894,7 @@
msgid "invalid value for %s"
msgstr "valor inválido para %s"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No se pudo actualizar la entrada %s de .gitmodules"
@@ -8683,7 +8902,7 @@
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-"No se puede cambiar .gitmodules no fusionados, primero resuelva los "
+"No se puede cambiar .gitmodules no fusionados, primero resuelve los "
"conflictos de fusión"
#: submodule.c:118 submodule.c:147
@@ -8700,22 +8919,22 @@
msgid "staging updated .gitmodules failed"
msgstr "falló realizar stage a los .gitmodules actualizados"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "en el submódulo no poblado '%s'"
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "mal argumento --ignore-submodules: %s"
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8724,12 +8943,12 @@
"Submódulo en el commit %s en la ruta: '%s' colisiona con un submódulo "
"llamado igual. Saltándolo."
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8738,36 +8957,36 @@
"No se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en "
"el submódulo %s"
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "proceso para submódulo '%s' falló"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Falló al resolver HEAD como un ref válido."
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Empujando submódulo '%s'\n"
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "No es posible hacer push al submódulo '%s'\n"
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Haciendo fetch al submódulo %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "No se pudo acceder al submódulo '%s'\n"
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8776,62 +8995,62 @@
"Errores durante el fetch del submódulo:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' no reconocido como un repositorio git"
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "No se pudo ejecutar 'git status --porcelain=2' en el submódulo %s"
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' falló en el submódulo %s"
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "no se pudo comenzar 'git status' en el submódulo '%s'"
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "no se pudo recursar en el submódulo '%s'"
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "no se pudo reiniciar el índice del submódulo"
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "submódulo '%s' tiene un índice corrupto"
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submódulo '%s' no pudo ser actualizado."
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
"directorio de git del submódulo '%s' está dentro del directorio de git '%.*s'"
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8839,17 +9058,17 @@
"relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
"soportado"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "no se pudo resolver el nombre para el submódulo '%s'"
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "rechazando mover '%s' dentro de un directorio git existente"
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8860,11 +9079,11 @@
"'%s' hacia\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "no se pudo comenzar ls-files en .."
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree devolvió un código %d inesperado"
@@ -8886,7 +9105,7 @@
msgstr "valor '%s' desconocido para la clave '%s'"
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "más de un %s"
@@ -8901,11 +9120,11 @@
msgid "could not read input file '%s'"
msgstr "no se pudo leer el archivo de entrada '%s'"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "no se pudo leer desde stdin"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "no se pudo hacer stat en %s"
@@ -8973,7 +9192,7 @@
msgid "error while running fast-import"
msgstr "error al ejecutar fast-import"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "no se pudo leer la referencia %s"
@@ -8991,7 +9210,7 @@
msgid "invalid remote service path"
msgstr "ruta de servicio remoto inválida"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "operación no soportada por protocolo"
@@ -9000,7 +9219,7 @@
msgid "can't connect to subservice %s"
msgstr "no se puede conectar al subservicio %s"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only requiere protocolo v2"
@@ -9013,59 +9232,59 @@
msgid "expected ok/error, helper said '%s'"
msgstr "se esperaba ok/error, helper dijo '%s'"
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "helper reportó estado inesperado de %s"
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "helper %s no soporta dry-run"
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "helper %s no soporta --signed"
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "helper %s no soporta --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "helper %s no soporta --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "helper %s no soporta --%s"
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "helper %s no soporta 'push-option'"
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper no soporta push; se necesita refspec"
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s no soporta 'force'"
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "no se pudo ejecutar fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "error al ejecutar fast-export"
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9074,52 +9293,52 @@
"No hay refs comunes y ninguno especificado; no se hace nada.\n"
"Tal vez deberías especificar un branch.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "formato de objeto no soportado '%s'"
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "respuesta malformada en lista de refs: %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) falló"
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) falló"
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "hilo %s falló"
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "hilo %s falló al unirse: %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "no se puede iniciar el hilo para copiar data: %s"
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "proceso %s falló al esperar"
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "proceso %s falló"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "no se puede iniciar hilo para copiar data"
@@ -9133,46 +9352,46 @@
msgid "could not read bundle '%s'"
msgstr "no se pudo leer el conjunto '%s'"
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: opción de profundidad inválida '%s'"
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
-msgstr "ver protocol.version en 'git help config' para más información"
+msgstr "mira protocol.version en 'git help config' para más información"
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "opciones del servidor requieren protocolo versión 2 o posterior"
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr "el servidor no soporta wait-for-done"
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "no se pudo analizar valor de configuración transport.color.*"
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "soporte para protocolo v2 no implementado todavía"
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor desconocido para configuración '%s': %s"
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "transporte '%s' no permitido"
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync ya no es soportado"
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9181,7 +9400,7 @@
"La siguiente ruta de submódulo contiene cambios que no\n"
"pueden ser encontrados en ningún remoto:\n"
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9208,11 +9427,11 @@
"para hacer un push al remoto.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr "Abortando."
-#: transport.c:1346
+#: transport.c:1344
msgid "failed to push all needed submodules"
msgstr "falló al hacer push a todos los submódulos necesarios"
@@ -9497,17 +9716,17 @@
"en un filesystem case-insensitive) y solo una del grupo\n"
"colisionando está en el árbol de trabajo:\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr "Actualizando flags del índice"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2772
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
"el árbol de trabajo y commits no monitoreados tienen entradas duplicadas: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr "se espera flush tras argumentos fetch"
@@ -9544,7 +9763,7 @@
msgid "Fetching objects"
msgstr "Haciendo fetch a objetos"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "falló al leer '%s'"
@@ -9645,17 +9864,27 @@
msgid "gitdir file points to non-existent location"
msgstr "archivo gitdir apunta a una ubicación inexistente"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "no se pudo establecer setenv '%s'"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no se puede crear '%s'"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "no se pudo abrir '%s' para lectura y escritura"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "no es posible acceder '%s'"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "no es posible obtener el directorio de trabajo actual"
@@ -9722,8 +9951,8 @@
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-" (confirmar o descartar el contenido sin seguimiento o modificado en los "
-"sub-módulos)"
+" (confirma o descarta el contenido sin seguimiento o modificado en los sub-"
+"módulos)"
#: wt-status.c:254
#, c-format
@@ -9823,7 +10052,7 @@
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
-"No modifique ni borre la línea de encima.\n"
+"No modifiques ni borres la línea de encima.\n"
"Todo lo que esté por abajo será ignorado."
#: wt-status.c:1165
@@ -10006,7 +10235,7 @@
#: wt-status.c:1490
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-" (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
+" (usa \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
#: wt-status.c:1500
msgid "Revert currently in progress."
@@ -10057,7 +10286,7 @@
#: wt-status.c:1550
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "Estas en un checkout de sparse con %d%% archivos rastreados presentes."
+msgstr "Estás en un checkout de sparse con %d%% archivos rastreados presentes."
#: wt-status.c:1794
msgid "On branch "
@@ -10108,7 +10337,7 @@
msgstr ""
"Tomó %.2f segundos enumerar los archivos no rastreados. 'status -uno'\n"
"puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n"
-"nuevos archivos tú mismo (vea 'git help status')."
+"nuevos archivos tú mismo (mira 'git help status')."
#: wt-status.c:1857
#, c-format
@@ -10208,25 +10437,25 @@
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr "no se pudo enviar el comando IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr "no se pudo leer la respuesta IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "no se pudo iniciar el accept_thread '%s'"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "no se pudo iniciar el worker[0] para '%s'"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "falló al desvincular '%s'"
@@ -10235,134 +10464,133 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opciones>] [--] <especificación-de-ruta>..."
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "no se puede aplicar chmod %cx '%s'"
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "diff status inesperado %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "falló la actualización de archivos"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "eliminar '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "Cambios fuera del área de stage tras refrescar el índice:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "No se pudo leer el índice"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "No se pudo abrir '%s' para escritura."
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "No se puede escribir el parche"
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "falló la edición del parche"
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "No se pudo hacer stat en '%s'"
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "Parche vacío. Abortado."
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "No se pudo aplicar '%s'"
-#: builtin/add.c:343
+#: builtin/add.c:351
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "dry run (ejecución en seco)"
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "selección interactiva"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "elegir fragmentos de forma interactiva"
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "editar diff actual y aplicar"
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "permitir agregar archivos que de otro modo se ignoren"
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "actualizar los archivos rastreados"
-#: builtin/add.c:371
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "grabar solo el hecho de que la ruta será agregada luego"
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr "agregar los cambios de todos los archivos con y sin seguimiento"
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignorar rutas eliminadas en el árbol de trabajo (lo mismo que --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "no agregar, solo actualizar el índice"
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr "saltar los archivos que no pueden ser agregados a causa de errores"
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"comprobar si los archivos - incluso los que faltan - se ignoran en dry run"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "permite actualizar entradas fuera del cono de sparse-checkout"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "sobrescribir el bit ejecutable de los archivos listados"
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "avisar cuando se agrega un repositorio incrustado"
-#: builtin/add.c:386
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "backend para `git stash -p`"
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10391,14 +10619,14 @@
"\n"
"\tgit rm --cached %s\n"
"\n"
-"Vea \"git help submodule\" para más información."
+"Mira \"git help submodule\" para más información."
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "agregando repositorio de git embebido: %s"
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10408,51 +10636,51 @@
"Desactiva este mensaje ejecutando\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "falló al agregar archivos"
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr "--dry-run es incompatible con --interactive/--patch"
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file es incompatible con --interactive/--patch"
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file es incompatible con --edit"
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A y -u son mutuamente incompatibles"
-#: builtin/add.c:522
+#: builtin/add.c:547
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"
-#: builtin/add.c:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "El parámetro '%s' para --chmod debe ser -x o +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file es incompatible con argumentos de pathspec"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul requiere --pathspec-from-file"
-#: builtin/add.c:555
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nada especificado, nada agregado.\n"
-#: builtin/add.c:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10462,111 +10690,110 @@
"Desactiva este mensage ejecutando\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "no se pudo analizar el script del autor"
-#: builtin/am.c:455
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' fue borrado por el hook de applypatch-msg"
-#: builtin/am.c:497
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línea de entrada mal formada: '%s'."
-#: builtin/am.c:535
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Falló al copiar notas de '%s' a '%s'"
-#: builtin/am.c:561
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "fallo de fseek"
-#: builtin/am.c:749
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "no se pudo analizar el parche '%s'"
-#: builtin/am.c:814
+#: builtin/am.c:815
msgid "Only one StGIT patch series can be applied at once"
msgstr "Solo un parche StGIT puede ser aplicado a la vez"
-#: builtin/am.c:862
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "timestamp inválido"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "línea Date inválida"
-#: builtin/am.c:874
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "offset de zona horaria inválido"
-#: builtin/am.c:967
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "Falló al detectar el formato del parche."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "falló al crear el directorio '%s'"
-#: builtin/am.c:977
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "Falló al dividir parches."
-#: builtin/am.c:1126
+#: builtin/am.c:1127
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"."
-#: builtin/am.c:1127
+#: builtin/am.c:1128
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"."
-#: builtin/am.c:1128
+#: builtin/am.c:1129
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-"Para restaurar la rama original y detener el parcheo, ejecutar \"%s --abort"
-"\"."
+"Para restaurar la rama original y detener el parcheo, ejecuta \"%s --abort\"."
-#: builtin/am.c:1223
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Parche enviado con format=flowed; espacios al final de las líneas tal vez "
"desaparezcan."
-#: builtin/am.c:1251
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "El parche está vacío."
-#: builtin/am.c:1316
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "falta línea de autor en commit %s"
-#: builtin/am.c:1319
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "línea de identificación no válida: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1539
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Repositorio carece de los blobs necesarios para retroceder en una fusión de "
"3 vías."
-#: builtin/am.c:1540
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
msgstr "Usando la información del índice para reconstruir un árbol base..."
-#: builtin/am.c:1559
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10574,24 +10801,24 @@
"¿Editaste el parche a mano?\n"
"No aplica a los blobs registrados en su índice."
-#: builtin/am.c:1565
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retrocediendo para parchar base y fusionar de 3 vías..."
-#: builtin/am.c:1591
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "Falló al fusionar los cambios."
-#: builtin/am.c:1623
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "aplicando a un historial vacío"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no se puede continuar: %s no existe."
-#: builtin/am.c:1697
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "Cuerpo de commit es:"
@@ -10599,37 +10826,37 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1708
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "¿Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "no es posible escribir el archivo índice"
-#: builtin/am.c:1757
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "Aplicando: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr "Sin cambios -- Parche ya aplicado."
-#: builtin/am.c:1820
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El parche falló en %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
-msgstr "Use 'git am --show-current-patch=diff' para ver el parche fallido"
+msgstr "Usa 'git am --show-current-patch=diff' para ver el parche fallido"
#: builtin/am.c:1868
msgid ""
@@ -10654,17 +10881,17 @@
"Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" "
"en él."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "No se pudo analizar el objeto '%s'."
-#: builtin/am.c:2034
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "falló al limpiar el índice"
-#: builtin/am.c:2078
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10672,190 +10899,190 @@
"Parece haber movido HEAD desde el último falló 'am'.\n"
"No rebobinando a ORIG_HEAD"
-#: builtin/am.c:2185
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor inválido para --patch-format: %s"
-#: builtin/am.c:2227
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Valor inválido para --show-current-patch: %s"
-#: builtin/am.c:2231
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s es incompatible con --show-current-patch=%s"
-#: builtin/am.c:2262
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opciones>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "ejecutar de manera interactiva"
-#: builtin/am.c:2271
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "opción histórica -- no-op"
-#: builtin/am.c:2273
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr "permitir retroceso en fusión de 3 vías si es necesario"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "ser silencioso"
-#: builtin/am.c:2276
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "agregar una línea \"Signed-off-by\" al mensaje del commit"
-#: builtin/am.c:2279
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "recodificar en utf8 (default)"
-#: builtin/am.c:2281
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "pasar flag -k a git-mailinfo"
-#: builtin/am.c:2283
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "pasar flag -b a git-mailinfo"
-#: builtin/am.c:2285
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "pasar flag -m a git-mailinfo"
-#: builtin/am.c:2287
+#: builtin/am.c:2289
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"
-#: builtin/am.c:2290
+#: builtin/am.c:2292
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"
-#: builtin/am.c:2293
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "descubrir todo antes de una línea de tijeras"
-#: builtin/am.c:2295
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
msgstr "pasarlo a través de git-mailinfo"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "pasarlo a través de git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "formato"
-#: builtin/am.c:2322
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "formato de los parches"
-#: builtin/am.c:2328
+#: builtin/am.c:2330
msgid "override error message when patch failure occurs"
msgstr "sobrescribir mensaje de error cuando fallos de parcheo ocurran"
-#: builtin/am.c:2330
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr "continuar aplicando los parches tras resolver conflictos"
-#: builtin/am.c:2333
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "sinónimos para --continue"
-#: builtin/am.c:2336
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "saltar el parche actual"
-#: builtin/am.c:2339
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
msgstr "restaurar la rama original y abortar la operación de parcheo"
-#: builtin/am.c:2342
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr "abortar la operación de parcheo pero mantener HEAD donde está"
-#: builtin/am.c:2346
+#: builtin/am.c:2348
msgid "show the patch being applied"
-msgstr "muestra el parche siendo aplicado"
+msgstr "mostrar el parche siendo aplicado"
-#: builtin/am.c:2351
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "mentir sobre la fecha del committer"
-#: builtin/am.c:2353
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr "usar el timestamp actual para la fecha del autor"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "firmar los commits con GPG"
-#: builtin/am.c:2359
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "(uso interno para git-rebase)"
-#: builtin/am.c:2377
+#: builtin/am.c:2379
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
"La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
-"será eliminada. Por favor no la use más."
+"será eliminada. Por favor no la uses más."
-#: builtin/am.c:2384
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "falló al leer el índice"
-#: builtin/am.c:2399
+#: builtin/am.c:2401
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "directorio de rebase previo %s todavía existe pero un mbox fue dado."
-#: builtin/am.c:2423
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
"Directorio extraviado %s encontrado.\n"
-"Use \"git am --abort\" para borrarlo."
+"Usa \"git am --abort\" para borrarlo."
-#: builtin/am.c:2429
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Operación de resolución no está en progreso, no vamos a continuar."
-#: builtin/am.c:2439
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "modo interactivo requiere parches en la línea de comando"
@@ -10863,44 +11090,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opciones>] [<parche>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "no se pudo crear el archivo de crónica '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "no se pudo redirigir la salida"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Remote sin URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: se esperaba ACK/NAK, se obtuvo flush packet"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: error de protocolo"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: se esperaba un flush"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<commit>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10939,46 +11157,59 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<rev>|<rango>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <cmd>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "no se puede abrir archivo '%s' en modo '%s'"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "no se pudo escribir al archivo '%s'"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "no se puede abrir archivo '%s' para lectura"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' no es un término válido"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "no se puede usar el comando nativo '%s' como un término"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "no se puede cambiar el significado del término '%s'"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
-msgstr "por favor use dos términos diferentes"
+msgstr "por favor usa dos términos diferentes"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "No estamos bisecando.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' no es un commit válido"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10986,27 +11217,27 @@
"no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset "
"<commit>'."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Mal argumento bisect_write: %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "no se pudo obtener el oid de la rev '%s'"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "no se pudo abrir el archivo '%s'"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Comando inválido: actualmente se encuentra en un bisect %s/%s"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -11015,7 +11246,7 @@
"Tienes que dar al menos una revisión %s y una %s.\n"
"Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso."
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11026,7 +11257,7 @@
"Después tienes que entregar al menos una revisión %s y una %s.\n"
"Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso."
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "haciendo bisect solo con un commit %s"
@@ -11035,15 +11266,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "¿Estás seguro [Y/n]? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "no hay términos definidos"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11052,7 +11283,7 @@
"Tus términos actuales son %s para el estado viejo\n"
"y %s para el estado nuevo.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11061,53 +11292,53 @@
"argumento inválido %s para 'git bisect terms'.\n"
"Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "la configuración del recorrido de revisiones falló\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "no se pudo abrir '%s' en modo append"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' no es un término válido"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "opción desconocida: '%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' no parece ser una revisión válida"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "mal HEAD - Necesito un HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-"error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'."
+"error al hacer checkout '%s'. Intenta 'git bisect start <rama-válida>'."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "no se bisecará en un árbol con cg-seek"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "mal HEAD - ref simbólico extraño"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "ref inválido: '%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Debes iniciar con \"git bisect start\"\n"
@@ -11115,104 +11346,150 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "¿Quieres que lo haga por ti [Y/n]? "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
-msgstr "Llame a `--bisect-state` con al menos un argumento"
+msgstr "Por favor llama a `--bisect-state` con al menos un argumento"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' solo puede tomar un argumento."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Mala entrada rev: %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Mala entrada rev (no es un commit): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "No estamos bisecando."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "¿¿'%s'?? ¿De qué estás hablando?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "no se puede leer '%s' para reproducir"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "bisect falló: no se proveyó comando."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "ejecutando %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "bisect falló: código de salida %d de '%s' es <0 o >=128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "no se pudo abrir archivo '%s' para escritura"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "bisect no puede seguir continuando"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "bisect exitoso"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "bisect encontró el primer mal commit"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"ejecución de bisect falló: 'git bisect--helper --bisect-state %s' terminó "
+"con código de error %d"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "reiniciar el estado de bisect"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "revisar si existen términos malos o buenos"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "imprimir los terms del bisect"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "comenzar la sesión de bisect"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "encontrar el siguiente commit de bisección"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "marcar el estado de ref (o refs)"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "listar los pasos de bisección hasta ahora"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "reproducir el proceso de bisección del archivo dado"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "saltar algunos commits para checkout"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "visualizar bisección"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "use <cmd>... para aplicar bisección automática."
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "no hay log para BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset requiere o un commit o ningún argumento"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check requiere 2 o 3 argumentos"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms requiere 0 o 1 argumentos"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next requiere 0 argumentos"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log requiere 0 argumentos"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "ningún logfile proporcionado"
@@ -11224,151 +11501,153 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<opciones-de-rev> están documentadas en git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "esperando un color: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "tiene que terminar con un color"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "color inválido '%s' en color.blame.repeatedLines"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "valor inválido para blame.coloring"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "no se pudo encontrar revisión %s para ignorar"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr "mostrar las entradas blame como las encontramos, incrementalmente"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr "no mostrar nombres de objetos de commits extremos (Default: off)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "no tratar commits raíces como extremos (Default: off)"
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "mostrar estadísticas de costo de trabajo"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "forzar el reporte de progreso"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "mostrar la puntuación de salida de las entradas de blame"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr "mostrar nombre original del archivo (Default: auto)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr "mostrar número de línea original (Default: off)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "mostrar en un formato diseñado para consumo de máquina"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr "mostrar en formato porcelana con información de commit por línea"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "usar el mismo modo de salida como git-annotate (Default: off)"
-#: builtin/blame.c:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "mostrar timestamp en formato raw (Default: off)"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "mostrar SHA1 del commit en formato largo (Default: off)"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr "suprimir nombre del autor y timestamp (Default: off)"
-#: builtin/blame.c:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr "mostrar el email del autor en cambio de su nombre (Default: off)"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "ignorar diferencias de espacios en blanco"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "rev"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "ignorar <rev> durante el blame"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "ignorar revisiones de <archivo>"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr "colorear metadata redundante de líneas previas de manera diferente"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "colorear líneas por edad"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr "ocupar más ciclos para encontrar mejores resultados"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr "use revisiones en <archivo> en lugar de llamar git-rev-list"
+msgstr "usar revisiones en <archivo> en lugar de llamar git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "usar contenido de <archivo> como imagen final"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "puntaje"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr "encontrar copias de líneas entre y a través de archivos"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr "encontrar movimientos de líneas entre y a través de archivos"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "rango"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
"procesar solo el rango de líneas <inicio>,<fin> o función :<nombre-de-"
"función>"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress no puede ser usado con --incremental o formatos de porcelana"
@@ -11381,18 +11660,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "hace 4 años, 11 meses"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "archivo %s tiene solo %lu línea"
msgstr[1] "archivo %s tiene solo %lu líneas"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "Blaming a líneas"
@@ -11493,78 +11772,78 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "Eliminada la rama %s (era %s).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "no es posible analizar el string de formato"
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "no se pudo resolver HEAD"
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) apunta fuera de refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Rama %s está siendo rebasada en %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Rama %s está siendo bisecada en %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "no se puede copiar la rama actual mientras no se está en ninguna."
-#: builtin/branch.c:515
+#: builtin/branch.c:516
msgid "cannot rename the current branch while not on any."
msgstr "no se puede renombrar la rama actual mientras no se está en ninguna."
-#: builtin/branch.c:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nombre de rama inválido: '%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "Cambio de nombre de rama fallido"
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "Duplicación de rama fallida"
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Copia creada de la rama malnombrada '%s'"
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Rama mal llamada '%s' renombrada"
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!"
-#: builtin/branch.c:579
+#: builtin/branch.c:580
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La rama está renombrada, pero falló la actualización del archivo de "
"configuración"
-#: builtin/branch.c:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La rama está copiada, pero falló la actualización del archivo de "
"configuración"
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11575,180 +11854,180 @@
"%s\n"
"Las líneas que comiencen con '%c' serán eliminadas.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "Opciones genéricas"
-#: builtin/branch.c:633
+#: builtin/branch.c:634
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostrar hash y tema, dar dos veces para rama upstream"
-#: builtin/branch.c:634
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "suprimir mensajes informativos"
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "configurando modo tracking (mirar git-pull(1))"
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr "no usar"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr "upstream"
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "cambiar info de upstream"
-#: builtin/branch.c:640
-msgid "unset the upstream info"
-msgstr "desconfigurando la info de upstream"
-
#: builtin/branch.c:641
+msgid "unset the upstream info"
+msgstr "desconfigurar la info de upstream"
+
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "usar salida con colores"
-#: builtin/branch.c:642
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "actuar en ramas de rastreo remoto"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "mostrar solo ramas que contengan el commit"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "mostrar solo ramas que no contengan el commit"
-#: builtin/branch.c:650
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "Acciones específicas de git-branch:"
-#: builtin/branch.c:651
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
-msgstr "listar ramas de remote-tracking y locales"
+msgstr "listar ramas de remote-tracking y locales"
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "borrar ramas totalmente fusionadas"
-#: builtin/branch.c:654
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "borrar rama (incluso si no está fusionada)"
-#: builtin/branch.c:655
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr "mover/renombrar una rama y su reflog"
-#: builtin/branch.c:656
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr "mover/renombrar una rama, incluso si el destino existe"
-#: builtin/branch.c:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "copiar una rama y su reflog"
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "copiar una rama, incluso si el destino existe"
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "listar nombres de ramas"
-#: builtin/branch.c:660
-msgid "show current branch name"
-msgstr "muestra el nombre de branch actual"
-
#: builtin/branch.c:661
-msgid "create the branch's reflog"
-msgstr "crea el reflog de la rama"
+msgid "show current branch name"
+msgstr "mostrar el nombre de branch actual"
-#: builtin/branch.c:663
-msgid "edit the description for the branch"
-msgstr "edita la descripción de la rama"
+#: builtin/branch.c:662
+msgid "create the branch's reflog"
+msgstr "crear el reflog de la rama"
#: builtin/branch.c:664
-msgid "force creation, move/rename, deletion"
-msgstr "fuerza la creación, movimiento/renombramiento, eliminación"
+msgid "edit the description for the branch"
+msgstr "editar la descripción de la rama"
#: builtin/branch.c:665
-msgid "print only branches that are merged"
-msgstr "muestra solo ramas que hayan sido fusionadas"
+msgid "force creation, move/rename, deletion"
+msgstr "forzar la creación, movimiento/renombramiento, eliminación"
#: builtin/branch.c:666
-msgid "print only branches that are not merged"
-msgstr "muestra solo ramas que no han sido fusionadas"
+msgid "print only branches that are merged"
+msgstr "mostrar solo ramas que hayan sido fusionadas"
#: builtin/branch.c:667
-msgid "list branches in columns"
-msgstr "muestra las ramas en columnas"
+msgid "print only branches that are not merged"
+msgstr "mostrar solo ramas que no han sido fusionadas"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:668
+msgid "list branches in columns"
+msgstr "mostrar las ramas en columnas"
+
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "objeto"
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "imprimir solo las ramas del objeto"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "ordenamiento y filtración son case-insensitive"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "formato para usar para el output"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "¡HEAD no encontrado dentro de refs/heads!"
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "--column y --verbose son incompatibles"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "se necesita el nombre de la rama"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "No se puede dar descripción al HEAD desacoplado"
-#: builtin/branch.c:771
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr "no se puede editar la descripción de más de una rama"
-#: builtin/branch.c:778
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aún no hay commits en la rama '%s'."
-#: builtin/branch.c:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "No hay ninguna rama llamada '%s'."
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "demasiadas ramas para una operación de duplicación"
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "demasiados argumentos para una operación de renombramiento"
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "demasiados argumentos para configurar un nuevo upstream"
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11756,32 +12035,32 @@
"no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
"rama."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "no hay tal rama '%s'"
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "la rama '%s' no existe"
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "demasiados argumentos para desconfigurar upstream"
-#: builtin/branch.c:838
+#: builtin/branch.c:840
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna "
"rama."
-#: builtin/branch.c:844
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Rama '%s' no tiene información de upstream"
-#: builtin/branch.c:854
+#: builtin/branch.c:856
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>?"
@@ -11789,41 +12068,41 @@
"Las opciones -a, y -r, de 'git branch' no toman un nombre de rama.\n"
"¿Quisiste usar: -a|-r --list <patrón>?"
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
-"la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--"
+"la opción '--set-upstream' ya no es soportada. Considera usar '--track' o '--"
"set-upstream-to' en cambio."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "versión de git:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() falló con error '%s' (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "información del compilador: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "información de libc: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "no ejecutado desde un repositorio git - no hay hooks para mostrar\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr ""
"git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11842,7 +12121,7 @@
"You can delete any lines you don't wish to share.\n"
msgstr ""
"¡Gracias por prepara un reporte de bug de Git!\n"
-"Por favor conteste las siguientes preguntas para ayudarnos a entender el "
+"Por favor contesta las siguientes preguntas para ayudarnos a entender el "
"problema.\n"
"\n"
"¿Qué hiciste antes de que sucediera el bug? (Pasos para reproducir el "
@@ -11850,7 +12129,7 @@
"\n"
"¿Qué esperabas que sucediera? (Comportamiento esperado)\n"
"\n"
-"¿Qué sucedio en lugar de eso? (Comportamiento real)\n"
+"¿Qué sucedió en lugar de eso? (Comportamiento real)\n"
"\n"
"¿Qué es diferente entre lo que esperabas y lo que pasó de verdad?\n"
"\n"
@@ -11859,39 +12138,34 @@
"Por favor revisa el resto del reporte abajo.\n"
"Puedes borrar cualquier línea que no desees compartir.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "especificar el destino para el archivo de reporte de bug"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr ""
"especificar el sufijo de formato de strftime para el nombre del archivo"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "no se pudo crear directorios principales para '%s'"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Información del sistema"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Hooks habilitados"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "no se pudo crear un archivo nuevo en '%s'"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "no es posible escribir en %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Crear un nuevo reporte en '%s'.\n"
@@ -11912,53 +12186,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "no mostrar medidor de progreso"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "mostrar medidor de progreso"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "especificar la versión del formato del paquete"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "Se necesita un repositorio para agrupar."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "no mostrar detalles del bundle"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "%s está bien\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr "Se necesita un repositorio para desagrupar."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Desagrupando objetos"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sub-comando desconocido: %s"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11966,7 +12240,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -11974,74 +12248,74 @@
"git cat-file (--batch[=<formato>] | --batch-check[=<formato>]) [--follow-"
"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "solo se puede especificar una opción batch"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipo> puede ser: blob, tree, commit, tag"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "mostrar el tipo del objeto"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "mostrar el tamaño del objeto"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "salir con cero cuando no haya error"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "realizar pretty-print del contenido del objeto"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr "para objetos blob, ejecuta filters en el contenido del objeto"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
-msgstr "use una ruta específica para --textconv/--filters"
+msgstr "usar una ruta específica para --textconv/--filters"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permita que -s y -t funcionen con objetos rotos o corruptos"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "salida buffer --batch"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr "mostrar info y content de los objetos alimentados por standard input"
-#: builtin/cat-file.c:656
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "mostrar info de los objetos alimentados por standard input"
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "mostrar todos los objetos con --batch o --batch-check"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
-msgstr "no ordenar el salida de --batch-all-objects"
+msgstr "no ordenar la salida de --batch-all-objects"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -12057,9 +12331,9 @@
#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
-msgstr "use .gitattributes solo desde el índice"
+msgstr "usar .gitattributes solo desde el índice"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "leer nombres de archivos de stdin"
@@ -12067,8 +12341,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "terminar registros de entrada y salida con un carácter NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "suprimir el reporte de progreso"
@@ -12126,11 +12400,10 @@
msgstr "git checkout--worker [<opciones>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr "string"
@@ -12283,11 +12556,11 @@
msgid "path '%s' is unmerged"
msgstr "ruta '%s' no está fusionada"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr "necesitas resolver tu índice actual primero"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12296,50 +12569,50 @@
"no se puede continuar con los cambios en stage en los siguientes archivos:\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:879
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No se puede hacer reflog para '%s': %s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD está ahora en"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "no es posible actualizar HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Reiniciar rama '%s'\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "Ya en '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Rama reiniciada y cambiada a '%s'\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Cambiado a nueva rama '%s'\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Cambiado a rama '%s'\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr " ... y %d más.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12362,7 +12635,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12389,28 +12662,28 @@
" git branch <nombre-de-rama> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "error interno en recorrido de revisiones"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "La posición previa de HEAD era"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr "Estás en una rama por nacer"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
"'%s' puede ser tanto un archivo local como una rama de rastreo.\n"
-"Por favor use -- (y opcionalmente --no-guess) para desambiguar"
+"Por favor usa -- (y opcionalmente --no-guess) para desambiguar"
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1184
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"
@@ -12430,51 +12703,51 @@
"un remoto particular, como 'origin', considera configurar\n"
"checkout.defaultRemote=origin en tu configuración."
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' concordó con múltiples (%d) ramas de rastreo remoto"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "solo una referencia esperada"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "solo una referencia esperada, %d entregadas."
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "referencia inválida: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referencia no es un árbol: %s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "se esperaba un branch, se obtuvo tag '%s'"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "se espera una rama, se obtuvo una rama remota '%s'"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "se esperaba branch, se obtuvo '%s'"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "se espera una rama, se obtuvo commit '%s'"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12482,7 +12755,7 @@
"no se puede cambiar de branch durante un merge\n"
"Considera \"git merge --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12490,7 +12763,7 @@
"no se puede cambiar de branch en medio de una sesión de am\n"
"Considera \"git am --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12498,7 +12771,7 @@
"no se puede cambiar de branch durante un rebase\n"
"Considera \"git rebase --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12506,7 +12779,7 @@
"no se puede cambiar de branch durante un cherry-pick\n"
"Considera \"git cherry-pick --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12514,137 +12787,137 @@
"no se puede cambiar de branch durante un revert\n"
"Considera \"git revert --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr "estás cambiando de rama durante un bisect"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "rutas no pueden ser usadas con cambios de rama"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no puede ser usado con cambios de ramas"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no puede ser usado con '%s'"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' no puede tomar <punto de partida>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1468
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No se puede cambiar rama a un '%s' sin commits"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "falta branch o commit como argumento"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr "realizar una fusión de tres vías con la rama nueva"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "estilo de conflictos (merge o diff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "desacoplar HEAD en el commit nombrado"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "configurar info de upstream para una rama nueva"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "forzar el checkout (descartar modificaciones locales)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "nueva-rama"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "nueva rama no emparentada"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "actualizar archivos ignorados (default)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1542
msgid "do not check if another worktree is holding the given ref"
msgstr "no averiguar si otro árbol de trabajo contiene la ref entregada"
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "hacer checkout a nuestra versión para archivos sin fusionar"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "hacer checkout a su versión para los archivos sin fusionar"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitar pathspecs a entradas escasas solamente"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c, -%c y --orphan son mutuamente exclusivas"
-#: builtin/checkout.c:1626
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p y --overlay son mutuamente exclusivas"
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track necesita el nombre de una rama"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "falta nombre de rama; prueba -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "no se pudo resolver %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "especificación de ruta inválida"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1725
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no toma un argumento de ruta '%s'"
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file es incompatible con --detach"
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file es incompatible con --patch"
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12652,71 +12925,71 @@
"git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
"se revisa fuera del índice."
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "debes especificar path(s) para restaurar"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "rama"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "crear y hacer checkout a una nueva rama"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "crear/reiniciar y hacer checkout a una rama"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "crear un reflog para una nueva rama"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)"
+msgstr "cuestionar opción 'git checkout <no-hay-tal-rama>' (default)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "usar modo overlay (default)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "crear y hacer switch a una nueva rama"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "crear/reiniciar y hacer switch a una rama"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
-msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'"
+msgstr "cuestionar opción 'git checkout <no-hay-tal-rama>'"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "descartar modificaciones locales"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "de qué árbol hacer el checkout"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "restaurar el índice"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "restaurar el árbol de trabajo (default)"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "ignorar entradas no fusionadas"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "usar modo overlay"
@@ -12760,8 +13033,8 @@
" - (empty) select nothing\n"
msgstr ""
"Ayuda de comandos:\n"
-"1 - selecciona un objeto por número\n"
-"foo - selecciona un objeto basado en un prefijo único\n"
+"1 - seleccionar un objeto por número\n"
+"foo - seleccionar un objeto basado en un prefijo único\n"
" - (vacío) no elegir nada\n"
#: builtin/clean.c:304 git-add--interactive.perl:602
@@ -12777,10 +13050,10 @@
" - (empty) finish selecting\n"
msgstr ""
"Ayuda de comandos:\n"
-"1 - selecciona un objeto único\n"
-"3-5 - selecciona un rango de objetos\n"
-"2-3,6-9 - selecciona múltiples rangos\n"
-"foo - selecciona un objeto basado en un prefijo único\n"
+"1 - seleccionar un objeto único\n"
+"3-5 - seleccionar un rango de objetos\n"
+"2-3,6-9 - seleccionar múltiples rangos\n"
+"foo - seleccionar un objeto basado en un prefijo único\n"
"-... - de-seleccionar objetos especificados\n"
"* - escoger todos los objetos\n"
" - (vacío) terminar selección\n"
@@ -12822,8 +13095,8 @@
"? - help for prompt selection"
msgstr ""
"clean - comenzar la limpieza\n"
-"filter by pattern - excluye objetos de la eliminación\n"
-"select by numbers - selecciona objetos a ser borrados por número\n"
+"filter by pattern - excluir objetos de la eliminación\n"
+"select by numbers - seleccionar objetos a ser borrados por número\n"
"ask each - confirmar cada eliminación (como \"rm -i\")\n"
"quit - parar limpieza\n"
"help - esta pantalla\n"
@@ -12856,8 +13129,8 @@
msgstr "borrar directorios completos"
#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "patrón"
@@ -12946,25 +13219,26 @@
msgid "directory from which templates will be used"
msgstr "directorio del cual los templates serán usados"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "repositorio de referencia"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
-msgstr "usa --reference solamente si estás clonando"
+msgstr "usar --reference solamente si estás clonando"
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nombre"
#: builtin/clone.c:125
msgid "use <name> instead of 'origin' to track upstream"
-msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
+msgstr "usar <nombre> en lugar de 'origin' para rastrear upstream"
#: builtin/clone.c:127
msgid "checkout <branch> instead of the remote's HEAD"
@@ -12974,7 +13248,7 @@
msgid "path to git-upload-pack on the remote"
msgstr "ruta para git-upload-pack en el remoto"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
#: builtin/pull.c:208
msgid "depth"
msgstr "profundidad"
@@ -12983,7 +13257,7 @@
msgid "create a shallow clone of that depth"
msgstr "crear un clon superficial de esa profundidad"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
#: builtin/pull.c:211
msgid "time"
msgstr "tiempo"
@@ -12993,7 +13267,7 @@
msgstr "crear un clon superficial desde el tiempo específico"
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022
msgid "revision"
msgstr "revisión"
@@ -13001,8 +13275,8 @@
msgid "deepen history of shallow clone, excluding rev"
msgstr "ahondar historia de clon superficial, excluyendo rev"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar solo una rama, HEAD o --branch"
@@ -13020,7 +13294,7 @@
#: builtin/clone.c:143 builtin/init-db.c:549
msgid "separate git dir from working tree"
-msgstr "separa git dir del árbol de trabajo"
+msgstr "separar git dir del árbol de trabajo"
#: builtin/clone.c:144
msgid "key=value"
@@ -13031,12 +13305,12 @@
msgstr "configurar config dentro del nuevo repositorio"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "específico-al-servidor"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "opción para trasmitir"
@@ -13059,50 +13333,42 @@
msgstr ""
"inicializar archivo sparse-checkout para incluir solo archivos en la raíz"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"No se pudo adivinar ningún nombre de directorio.\n"
-"Por favor especifique un directorio en la línea de comando"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe pero no es un directorio"
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "falló al iniciar el iterador sobre '%s'"
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "falló al crear link '%s'"
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falló al copiar archivo a '%s'"
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "falló al iterar sobre '%s'"
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "hecho.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13112,105 +13378,105 @@
"Puedes inspeccionar a qué se hizo checkout con 'git status'\n"
"y volver a intentarlo con 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No se pudo encontrar la rama remota %s para clonar."
-#: builtin/clone.c:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "incapaz de actualizar %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "falló al inicializar sparse-checkout"
-#: builtin/clone.c:784
+#: builtin/clone.c:668
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "no es posible realizar checkout en el árbol de trabajo"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "no es posible escribir parámetros al archivo config"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "no se puede reempaquetar para limpiar"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "no se puede desvincular archivo de alternos temporal"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Demasiados argumentos."
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "Tienes que especificar un repositorio para clonar."
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Las opciones --bare y --origin %s son incompatibles."
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare y --separate-git-dir son incompatibles."
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositorio '%s' no existe"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidad %s no es un número positivo"
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "la ruta del repositorio '%s' ya existe y no es un directorio vacío."
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "directorio de trabajo '%s' ya existe."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no se pudo crear directorios principales de '%s'"
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no se pudo crear un árbol de trabajo '%s'"
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonando en un repositorio vacío '%s'...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonando en '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -13218,48 +13484,48 @@
"clone --recursive no es compatible con --reference y --reference-if-able al "
"mismo tiempo"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' no es un nombre remoto válido"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-"--shallow-since es ignorado en clonaciones locales; use file:// en su lugar."
+"--shallow-since es ignorado en clonaciones locales; usa file:// en su lugar."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-"--shallow-exclude es ignorado en clonaciones locales; use file:// en su "
+"--shallow-exclude es ignorado en clonaciones locales; usa file:// en su "
"lugar."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter es ignorado en clonaciones locales; usa file:// en su lugar."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "repositorio fuente es superficial, ignorando --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local es ignorado"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr "transporte remoto reportó error"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Rama remota %s no encontrada en upstream %s"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "Pareces haber clonado un repositorio sin contenido."
@@ -13295,13 +13561,13 @@
msgid "--command must be the first argument"
msgstr "--command debe ser el primer argumento"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13311,93 +13577,91 @@
"split[=<estrategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opciones de split>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "no se pudo encontrar el directorio de objetos concordante con %s"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "dir"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "el directorio de objetos en que guardar el gráfico"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr "si el commit-graph está cortado, solo verifica el archivo tope"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "No se pudo abrir commit-graph '%s'"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "argumento --split no reconocido, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "ID de objeto no hex inesperado: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "no es un objeto válido: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "comenzar recorrido en todas las refs"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "escanear paquete de índices por stdin por commits"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "comenzar recorrido a los commits listados por stdin"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
-msgstr "incluye todos los commits que ya están en el archivo commit-graph"
+msgstr "incluir todos los commits que ya están en el archivo commit-graph"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "habilitar computación para rutas cambiadas"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "permitir escribir un archivo commit-graph incremental"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "número máximo de commits en un commit-graph sin base cortada"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "razón máxima entre dos niveles de corte de commit-graph"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "solo caducar objetos más viejos a una fecha dada"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "número máximo de cambios de ruta de filtro Bloom para computar"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs"
+msgstr "usa como máximo uno de --reachable, --stdin-commits, o --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Recolectando commits del input"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "subcomando desconocido: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13411,70 +13675,65 @@
msgid "duplicate parent %s ignored"
msgstr "padre duplicado %s ignorado"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "no es un nombre de objeto válido %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: falló al abrir '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: falló al leer '%s'"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: falló al cerrar '%s'"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "padre"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "id del objeto commit padre"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "mensaje"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "mensaje del commit"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "leer mensaje de commit desde un archivo"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Firmar commit con GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
-msgstr "tiene que dar exactamente un árbol"
+msgstr "hay que dar exactamente un árbol"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: falló al leer"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opciones>] [--] <especificación-de-ruta>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:52
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13484,7 +13743,7 @@
"vaciaría. Puedes repetir el comando con --allow-empty, o puedes eliminar\n"
"el commit completamente con \"git reset HEAD^\".\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13499,15 +13758,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Caso contrario, por favor usa 'git rebase --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Caso contrario, por favor usa 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13529,73 +13788,73 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "falló al desempaquetar objeto del árbol HEAD"
-#: builtin/commit.c:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file con -a no tiene sentido"
-#: builtin/commit.c:374
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only sin ruta no tiene sentido."
-#: builtin/commit.c:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "no es posible crear un índice temporal"
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "adición interactiva fallida"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "no es posible actualizar el índice temporal"
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "Falló al actualizar el árbol de caché principal"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr "no es posible escribir archivo new_index"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "no se puede realizar un commit parcial durante una fusión."
-#: builtin/commit.c:491
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no se puede realizar un commit parcial durante un cherry-pick."
-#: builtin/commit.c:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "no se puede realizar un commit parcial durante un rebase."
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "no se puede leer el índice"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "no es posible escribir el índice temporal"
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "commit '%s' requiere cabecera de autor"
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "el commit '%s' tiene una línea de autor mal formada"
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "parámetro --author mal formado"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13603,43 +13862,43 @@
"no es posible seleccionar un carácter de comentario que no sea usado\n"
"en el mensaje de commit actual"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "no se pudo revisar el commit %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(leyendo mensajes de logs desde standard input)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "no se pudo leer log desde standard input"
-#: builtin/commit.c:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "no se pudo leer el log '%s'"
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
msgid "cannot combine -m with --fixup:%s"
msgstr "no se puede combinar -m con --fixup:%s"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "no se pudo leer SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "no se pudo leer MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "no se pudo escribir el template del commit"
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13648,7 +13907,7 @@
"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
" líneas que comiencen con '%c' serán ignoradas.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13658,17 +13917,17 @@
" líneas que comiencen con '%c' serán ignoradas, y un mensaje\n"
" vacío aborta el commit.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:900
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be kept; you may remove them yourself if you want to.\n"
msgstr ""
"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
-" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n"
-" usted mismo si lo desea.\n"
+" líneas que comiencen con '%c' serán guardadas; puedes eliminarlas\n"
+" tú mismo si lo deseas.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13676,11 +13935,11 @@
"An empty message aborts the commit.\n"
msgstr ""
"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
-" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n"
-" usted mismo si lo desea.\n"
+" líneas que comiencen con '%c' serán guardadas; puedes eliminarlas\n"
+" tú mismo si lo deseas.\n"
"Un mensaje vacío aborta el commit.\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13689,12 +13948,12 @@
"and try again.\n"
msgstr ""
"\n"
-"Parece que está realizando una fusión.\n"
-"Si esto no es correcto, ejecute\n"
+"Parece que estás realizando una fusión.\n"
+"Si esto no es correcto, ejecuta\n"
"\tgit update-ref -d MERGE_HEAD\n"
"e intenta de nuevo.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13703,78 +13962,78 @@
"and try again.\n"
msgstr ""
"\n"
-"Parece que puede estar cometiendo una selección de cerezas.\n"
-"Si esto no es correcto, ejecute\n"
+"Parece que puedes estar cometiendo una selección de cerezas.\n"
+"Si esto no es correcto, ejecuta\n"
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"e intenta de nuevo.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sFecha: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommitter: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "No se puede leer el índice"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr "no se puede pasar trailers a --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Error al construir los árboles"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún "
"autor existente"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Modo de ignorancia inválido '%s'"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo inválido de archivos no rastreados '%s'"
-#: builtin/commit.c:1195
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "--long y -z son incompatibles"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Estás en medio de una fusión -- no puedes renombrar."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
-msgstr "Está en medio de un cherry-pick -- no se puede renombrar."
+msgstr "Estás en medio de un cherry-pick -- no se puede renombrar."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr "no se puede combinar opción de renombrar de --fixup con ruta '%s'"
-#: builtin/commit.c:1233
+#: builtin/commit.c:1234
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
@@ -13782,103 +14041,103 @@
"opción de refraseado de --fixup es mutuamente exclusiva con --patch/--"
"interactive/--all/--include/--only"
-#: builtin/commit.c:1252
+#: builtin/commit.c:1253
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambos --reset-author y --author no tiene sentido"
-#: builtin/commit.c:1261
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "No tienes nada que enmendar."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Estás en medio de una fusión -- no puedes enmendar."
-#: builtin/commit.c:1266
+#: builtin/commit.c:1265
msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "Está en medio de un cherry-pick -- no se puede enmendar."
+msgstr "Estás en medio de un cherry-pick -- no se puede enmendar."
-#: builtin/commit.c:1268
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Estás en medio de una fusión -- no puedes enmendar."
-#: builtin/commit.c:1271
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
-#: builtin/commit.c:1281
+#: builtin/commit.c:1280
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado."
-#: builtin/commit.c:1283
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "La opción -m no puede ser combinada con -c/-C/-F."
-#: builtin/commit.c:1292
+#: builtin/commit.c:1291
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author solo puede ser usada con -C, -c o --amend."
-#: builtin/commit.c:1310
+#: builtin/commit.c:1309
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Solo uno de --include/--only/--all/--interactive/--patch puede ser usado."
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "opción desconocida: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "paths '%s ...' con -a no tiene sentido"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "mostrar status de manera concisa"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "mostrar información de la rama"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "mostrar información del stash"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "calcular todos los valores delante/atrás"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
-msgstr "version"
+msgstr "versión"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "output en formato de máquina"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "mostrar status en formato largo (default)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "terminar entradas con NUL"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostrar archivos sin seguimiento, modos opcionales: all, normal, no. "
"(Predeterminado: all)"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13886,11 +14145,11 @@
"mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
"(Predeterminado: traditional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "cuando"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13898,202 +14157,202 @@
"ignorar cambios en submódulos, opcional cuando: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "listar en columnas los archivos sin seguimiento"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "no detectar renombrados"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "detectar renombrados, opcionalmente configurar similaridad de índice"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Combinación de argumentos de archivos ignorados y no rastreados no soportada"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
-msgstr "suprime summary tras un commit exitoso"
+msgstr "suprimir summary tras un commit exitoso"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "mostrar diff en el template del mensaje de commit"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Opciones para el mensaje del commit"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "leer mensaje desde un archivo"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
-msgstr "sobrescribe el autor del commit"
+msgstr "sobrescribir el autor del commit"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "fecha"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
-msgstr "sobrescribe la fecha del commit"
+msgstr "sobrescribir la fecha del commit"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr "confirmar"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "reusar y editar el mensaje de un commit específico"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "reusar el mensaje de un commit específico"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]commit"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
-"usar mensaje de formato autosquash para arreglar el amend/renombrado del "
+"usar mensaje de formato autosquash para arreglar el amend/renombrado del "
"commit especificado"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usar el mensaje de formato autosquash para realizar squash al commit "
"especificado"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "trailer"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "agregando trailer(s) personalizados"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
#: builtin/pull.c:145 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "agregar una línea Signed-off-by al final"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "usar archivo de template especificado"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "forzar la edición del commit"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "incluir status en el template del mensaje de commit"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Opciones para el contenido del commit"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "confirmar todos los archivos cambiados"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "agregar archivos específicos al índice para confirmar"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "agregar archivos interactivamente"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "agregar cambios interactivamente"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "solo confirmar archivos específicos"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "mostrar lo que sería incluido en el commit"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "enmendar commit previo"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
-msgstr "salta el gancho de postreescritura"
+msgstr "saltar el gancho de postreescritura"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "vale grabar un cambio vacío"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "vale grabar un cambio con un mensaje vacío"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Archivo MERGE_HEAD (%s) corrupto"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "no se pudo leer MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "no se pudo leer el mensaje de commit: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abortando commit debido que el mensaje está en blanco.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abortando commit; no se ha editado el mensaje.\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Abortando commit debido que el cuerpo del mensaje está en blanco.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
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 ""
"el repositorio ha sido actualizado, pero no se pudo escribir el archivo\n"
-"new_index. Verifique que el disco no esté lleno y la cuota no haya\n"
+"new_index. Verifica que el disco no esté lleno y la cuota no haya\n"
"sido superada, y luego \"git restore --staged :/\" para recuperar."
#: builtin/config.c:11
@@ -14192,7 +14451,7 @@
#: builtin/config.c:149
msgid "use string equality when comparing values to 'value-pattern'"
-msgstr "use la igualdad de cadenas al comparar valores con 'patrón de valor'"
+msgstr "usar la igualdad de cadenas al comparar valores con 'patrón de valor'"
#: builtin/config.c:150
msgid "open an editor"
@@ -14271,7 +14530,7 @@
#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
-msgstr "con --get, usa el valor por defecto cuando falta una entrada"
+msgstr "con --get, usar el valor por defecto cuando falta una entrada"
#: builtin/config.c:181
#, c-format
@@ -14357,7 +14616,7 @@
msgstr ""
"--worktree no puede ser usado con múltiples árboles de trabajo a menos que "
"la\n"
-"extensión worktreeConfig esté habilitada. Por favor lea \"CONFIGURATION FILE"
+"extensión worktreeConfig esté habilitada. Por favor lee \"CONFIGURATION FILE"
"\"\n"
"en \"git help worktree\" para más detalles"
@@ -14417,7 +14676,7 @@
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
"no se puede sobrescribir múltiples valores con un único valor\n"
-" Use una regexp, --add o --replace-all para cambiar %s."
+" Usa una regexp, --add o --replace-all para cambiar %s."
#: builtin/config.c:943 builtin/config.c:954
#, c-format
@@ -14454,7 +14713,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr "credential-cache--daemon no disponible; sin soporte de socket Unix"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache no disponible; sin soporte de socket Unix"
@@ -14516,7 +14775,7 @@
"However, there were unannotated tags: try --tags."
msgstr ""
"No hay tags anotados que puedan describir '%s'.\n"
-"Sin embargo, hubieron tags no anotados: intente --tags."
+"Sin embargo, hubieron tags no anotados: intenta --tags."
#: builtin/describe.c:428
#, c-format
@@ -14525,7 +14784,7 @@
"Try --always, or create some tags."
msgstr ""
"Ningún tag puede describir '%s'.\n"
-"Intente --always, o cree algunos tags."
+"Intenta --always, o crea algunos tags."
#: builtin/describe.c:458
#, c-format
@@ -14566,11 +14825,11 @@
#: builtin/describe.c:556
msgid "use any ref"
-msgstr "use cualquier ref"
+msgstr "usar cualquier ref"
#: builtin/describe.c:557
msgid "use any tag, even unannotated"
-msgstr "use cualquier tag, incluso los no anotados"
+msgstr "usar cualquier tag, incluso los no anotados"
#: builtin/describe.c:558
msgid "always use long format"
@@ -14649,13 +14908,13 @@
#: builtin/diff.c:376
#, c-format
msgid "%s...%s: no merge base"
-msgstr "%s...%s: se neceista una base de fusión"
+msgstr "%s...%s: se necesita una base de fusión"
#: builtin/diff.c:486
msgid "Not a git repository"
msgstr "No es un repositorio git"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "objeto '%s' entregado no es válido."
@@ -14679,114 +14938,114 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "falló: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "no se pudo leer el symlink %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "no se pudo leer el archivo symlink %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "no se pudo leer el objeto %s para el symlink %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"formatos combinados de diff ('-c' y '--cc') no soportados en\n"
"modo diff para directorio('-d' y '--dir-diff')."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "ambos archivos modificados: '%s' y '%s'."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "archivo del árbol de trabajo ha sido dejado."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "archivo temporal existe en '%s'."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "tal vez desees limpiar o recuperar estos."
-#: builtin/difftool.c:699
-msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr "use `diff.guitool` en lugar de `diff.tool`"
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "falló: %d"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:696
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "usar `diff.guitool` en lugar de `diff.tool`"
+
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "realizar un diff de todo el directorio"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "no mostrar antes de lanzar una herramienta de diff"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "usar enlaces simbólicos en modo dir-diff"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:706
msgid "tool"
msgstr "herramienta"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "usar la herramienta de diff especificada"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
"hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
"código de salida distinto de cero"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "especificar un comando personalizado para ver diffs"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "pasado a `diff`"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool requiere un árbol de trabajo o --no-index"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff es incompatible con --no-index"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool y --extcmd son mutuamente exclusivas"
-#: builtin/difftool.c:752
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no se ha entregado <comando> para --extcmd=<comando>"
@@ -14794,7 +15053,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <opciones> <env-var>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "tipo"
@@ -14823,98 +15082,98 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Error: No se puede exportar los tags anidados a menos que --mark-tags sea "
"especificado."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "token --anonymize-map no puede estar vacío"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "mostrar progreso después de <n> objetos"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "seleccionar el manejo de tags firmados"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr "volcar marcas a este archivo"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr "importar marcas de este archivo"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr "importar marcas de este archivo si existe"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr "falsificar un tagger cuando les falta uno"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr "mostrar todo el árbol para cada commit"
-#: builtin/fast-export.c:1220
-msgid "use the done feature to terminate the stream"
-msgstr "use el feature done para terminar el stream"
-
#: builtin/fast-export.c:1221
-msgid "skip output of blob data"
-msgstr "saltar el salida de data blob"
+msgid "use the done feature to terminate the stream"
+msgstr "usar el feature done para terminar el stream"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1222
+msgid "skip output of blob data"
+msgstr "saltar la salida de data blob"
+
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr "aplicar refspec para los refs exportados"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "anonimizar la salida"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "de:para"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "convertir <de> a <para> en output anonimizado"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"referir a los padres que no estén en fast-export stream por id de objeto"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr "mostrar ids de objetos originales para blobs/commits"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr "marcar tags con ids de mark"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "--anonymize-map sin --anonymize no tiene sentido"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "No se puede pasar ambos --import-marks y --import-marks-if-exists"
@@ -15088,17 +15347,17 @@
#: builtin/fetch.c:208 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
-msgstr "reporta que solo tenemos objetos alcanzables de este objeto"
+msgstr "reportar que solo tenemos objetos alcanzables de este objeto"
#: builtin/fetch.c:210
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
-"no realizar fecth al packfile; en lugar de eso, mostrar los ancestros de las "
+"no realizar fetch al packfile; en lugar de eso, mostrar los ancestros de las "
"puntas de negociación"
#: builtin/fetch.c:213 builtin/fetch.c:215
msgid "run 'maintenance --auto' after fetching"
-msgstr "ejecute 'maintenance --auto' después de buscar"
+msgstr "ejecutar 'maintenance --auto' después de buscar"
#: builtin/fetch.c:217 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
@@ -15116,73 +15375,73 @@
msgid "Couldn't find remote ref HEAD"
msgstr "No se pudo encontrar ref remota HEAD"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "la configuración fetch.output contiene el valor inválido %s"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "objeto %s no encontrado"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[actualizado]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[rechazado]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "no se puede traer en la rama actual"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[actualización de tag]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "no es posible actualizar el ref local"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "sobrescribiría tag existente"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[nuevo tag]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[nueva rama]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[nueva referencia]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "actualización forzada"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "avance no rápido"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
"flag or run 'git config fetch.showForcedUpdates true'."
msgstr ""
"Fetch normalmente incida qué branches han tenido un update forzado,\n"
-"pero esa validación ha sido deshabilitada. Para activarla de nuevo use '--"
+"pero esa validación ha sido deshabilitada. Para activarla de nuevo usa '--"
"show-forced-updates'\n"
-"o ejecute 'git config fetch.showForcedUpdates true'."
+"o ejecuta 'git config fetch.showForcedUpdates true'."
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -15195,80 +15454,85 @@
"false'\n"
"para evitar esta validación.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no envió todos los objetos necesarios\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1134
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "rechazado %s porque raíces superficiales no pueden ser actualizada"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "Desde %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-"algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
+"algunos refs locales no pudieron ser actualizados; intenta ejecutar\n"
" 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s se volverá colgante)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s se ha vuelto colgante)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[eliminado]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "(nada)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1417
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Valor \"%2$s\" de opción \"%1$s\" no es válido para %3$s"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opción \"%s\" es ignorada por %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "el objeto %s no existe"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "múltiples ramas detectadas, incompatible con --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "no configurar upstream para una rama de rastreo remoto"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "no configurar upstream para un tag remoto"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "tipo de branch desconocido"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -15276,79 +15540,79 @@
"no se encontró rama fuente.\n"
"tienes que especificar exactamente una rama con la opción --set-upstream."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "Extrayendo %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "No se pudo extraer %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "no se pudo hacer fetch a '%s' (código de salida: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-"No hay repositorio remoto especificado. Por favor, especifique un URL o un\n"
+"No hay repositorio remoto especificado. Por favor, especifica un URL o un\n"
"nombre remoto del cual las nuevas revisiones deben ser extraídas."
-#: builtin/fetch.c:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "Tienes que especificar un nombre de tag."
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2009
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only necesita uno o más --negotiate-tip=*"
-#: builtin/fetch.c:1998
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "Profundidad negativa en --deepen no soportada"
-#: builtin/fetch.c:2000
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen y --depth son mutuamente exclusivas"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth y --unshallow no pueden ser usadas juntas"
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow no tiene sentido en un repositorio completo"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no toma un argumento de repositorio"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no tiene sentido con refspecs"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No existe el remoto o grupo remoto: %s"
-#: builtin/fetch.c:2042
+#: builtin/fetch.c:2057
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Extraer un grupo y especificar refspecs no tiene sentido"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
msgstr "tiene que proveer un remoto cuando usa --negotiate-only"
-#: builtin/fetch.c:2063
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
msgstr "Protocolo no soporta --negotiate-only, saliendo."
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15356,11 +15620,11 @@
"--filter solo puede ser usado con el remoto configurado en extensions."
"partialclone"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic solo se puede usar cuando se busca desde un control remoto"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin solo se puede usar cuando se busca desde un control remoto"
@@ -15384,7 +15648,7 @@
#: builtin/fmt-merge-msg.c:25
msgid "use <text> as start of message"
-msgstr "use <text> como comienzo de mensaje"
+msgstr "usar <text> como comienzo de mensaje"
#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
@@ -15408,25 +15672,25 @@
#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for shells"
-msgstr "cite los marcadores de posición adecuadamente para los shells"
+msgstr "entrecomillar los marcadores de posición adecuadamente para los shells"
#: builtin/for-each-ref.c:32
msgid "quote placeholders suitably for perl"
-msgstr "cite los marcadores de posición adecuadamente para perl"
+msgstr "entrecomillar los marcadores de posición adecuadamente para perl"
#: builtin/for-each-ref.c:34
msgid "quote placeholders suitably for python"
-msgstr "cite los marcadores de posición adecuadamente para python"
+msgstr "entrecomillar los marcadores de posición adecuadamente para python"
#: builtin/for-each-ref.c:36
msgid "quote placeholders suitably for Tcl"
-msgstr "cite los marcadores de posición adecuadamente para Tcl"
+msgstr "entrecomillar los marcadores de posición adecuadamente para Tcl"
#: builtin/for-each-ref.c:39
msgid "show only <n> matched refs"
msgstr "mostrar solo <n> refs encontradas"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "respetar los colores de formato"
@@ -15582,129 +15846,139 @@
msgid "notice: No default references"
msgstr "aviso: No hay referencias por defecto"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: hash-path no concuerda, encontrado en: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objeto corrupto o no encontrado: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: objeto de tipo desconocido '%s':%s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: no se pudo analizar objeto: %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "mal sha1 de archivo: %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "Revisando directorio de objetos"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "Revisando objetos directorios"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "Revisando link %s"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "%s inválido"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s apunta a algo extraño (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: HEAD desacoplado no apunta a nada"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "aviso: %s apunta a un branch no nacido (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "Revisando el tree caché"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: puntero inválido sha1 en cache-tree"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr "non-tree en cache-tree"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opciones>] [<objeto>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "mostrar objetos inalcanzables"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "mostrar objetos colgantes"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "reportar tags"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "reportar nodos raíz"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr "hacer objetos índices cabezas de nodos"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr "hacer reflogs cabeza de nodos (default)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr "también considerar paquetes y objetos alternos"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "revisar solo conectividad"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "habilitar revisión más estricta"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr "escribir objetos colgantes en .git/lost-found"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "mostrar progreso"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "mostrar nombres verbosos de objetos alcanzables"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Revisando objetos"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr "%s: objeto faltante"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'"
@@ -15728,7 +16002,7 @@
msgid "cannot stat '%s'"
msgstr "no se puede hacer stat en '%s'"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "no se puede leer '%s'"
@@ -15737,13 +16011,13 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
"El último gc reportó lo siguiente. Por favor corrige la causa\n"
-"y elimine %s.\n"
+"y elimina %s\n"
"Limpieza automática no se realizará hasta que el archivo sea eliminado.\n"
"\n"
"%s"
@@ -15782,25 +16056,25 @@
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-"Auto empaquetado del repositorio en segundo plano para un performance "
+"Auto empaquetado del repositorio en segundo plano para un rendimiento "
"óptimo.\n"
#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
-msgstr "Auto empaquetado del repositorio para performance óptimo.\n"
+msgstr "Auto empaquetado del repositorio para rendimiento óptimo.\n"
#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr "Vea \"git help gc\" para limpieza manual.\n"
+msgstr "Mira \"git help gc\" para limpieza manual.\n"
#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force si no "
+"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (usa --force si no "
"es así)"
#: builtin/gc.c:705
@@ -15825,151 +16099,191 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "argumento --schedule no reconocido, '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr "no se pudo escribir el commit-graph"
-#: builtin/gc.c:905
+#: builtin/gc.c:904
msgid "failed to prefetch remotes"
msgstr "falló al hacer prefetch a los remotos"
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr "no se pudo iniciar el proceso 'git pack-objects'"
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr "no se pudo finalizar el proceso 'git pack-objects'"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr "no se pudo escribir el índice de paquetes múltiples"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr "'git multi-pack-index expire' falló"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr "'git multi-pack-index repack' falló"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"omitiendo la tarea de reempaquetado incremental porque core.multiPackIndex "
"está deshabilitado"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "el archivo de bloqueo '%s' existe, omitiendo el mantenimiento"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr "tarea '%s' falló"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' no es una tarea válida"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
-msgstr "tarea '%s' no puede ser seleccionada múltipes veces"
+msgstr "tarea '%s' no puede ser seleccionada múltiples veces"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr "ejecutar tareas basadas en el estado del repositorio"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
msgid "frequency"
msgstr "frecuencia"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr "ejecutar tareas basado en frecuencia"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr "no reportar progreso u otra información por medio de stderr"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
msgid "task"
msgstr "tarea"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr "ejecutar una tarea específica"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "usar como máximo una de --auto y --schedule=<frecuencia>"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr "no pudo ejecutar 'git config'"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr "falló al expandir la ruta '%s'"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr "falló al iniciar launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr "falló al crear directorios para '%s'"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr "falló al generar el servicio %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr "no se pudo crear el archivo temp xml"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr "no se pudo iniciar schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"no se pudo ejecutar 'crontab -l'; es posible que su sistema no soporte 'cron'"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"no se pudo ejecutar 'crontab'; es posible que su sistema no soporte 'cron'"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr "no se pudo abrir stdin de 'crontab'"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr "'crontab' murió"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "falló al iniciar systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "falló el ejecutar systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "falló al borrar '%s'"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "argumento --scheduler no reconocido '%s'"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "ni systemd ni crontab disponibles"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s planificador no disponible"
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
msgstr "otro proceso está programando el mantenimiento en segundo plano"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<planificador>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "planificador"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "planificador para iniciar git maintenance run"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr "no se pudo agregar el repositorio a la configuración global"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <subcomando> [<opciones>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr "subcomando no válido: %s"
@@ -15978,12 +16292,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: falló al crear el hilo: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "número inválido de hilos especificado (%d) para %s"
@@ -15992,266 +16306,266 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hay soporte para hilos, ignorando %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "no es posible leer el árbol (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "no es posible realizar grep del objeto de tipo %s"
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "switch `%c' espera un valor numérico"
-#: builtin/grep.c:837
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr "buscar en el índice en lugar del árbol de trabajo"
-#: builtin/grep.c:839
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "buscar en contenidos no manejados por git"
-#: builtin/grep.c:841
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "buscar en archivos rastreados y no rastreados"
-#: builtin/grep.c:843
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar archivos especificados vía '.gitignore'"
-#: builtin/grep.c:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "búsqueda recursiva en cada submódulo"
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "mostrar líneas que no concuerden"
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "búsqueda insensible a mayúsculas"
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "concordar patrón solo a los límites de las palabras"
-#: builtin/grep.c:854
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "procesar archivos binarios como texto"
-#: builtin/grep.c:856
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "no concordar patrones en archivos binarios"
-#: builtin/grep.c:859
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr "procesar archivos binarios con filtros textconv"
-#: builtin/grep.c:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "buscar en subdirectorios (default)"
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "descender como máximo <valor-de-profundiad> niveles"
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "usar expresiones regulares POSIX extendidas"
-#: builtin/grep.c:870
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expresiones regulares POSIX (default)"
-#: builtin/grep.c:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "interpretar patrones como strings fijos"
-#: builtin/grep.c:876
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "usar expresiones regulares compatibles con Perl"
-#: builtin/grep.c:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "mostrar números de línea"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "mostrar el número de columna de la primera coincidencia"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "no mostrar nombres de archivo"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "mostrar nombres de archivo"
-#: builtin/grep.c:884
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr "mostrar nombres de archivo relativos al directorio superior"
-#: builtin/grep.c:886
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
-#: builtin/grep.c:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "sinónimo para --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr "mostrar solo los nombres de archivos sin coincidencias"
-#: builtin/grep.c:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "imprimir NUL después del nombre de archivo"
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "mostrar solo las partes que concuerden de una línea"
-#: builtin/grep.c:898
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr "mostrar el número de concordancias en lugar de las líneas concordantes"
-#: builtin/grep.c:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "resaltar concordancias"
-#: builtin/grep.c:901
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos"
-#: builtin/grep.c:903
+#: builtin/grep.c:917
msgid "show filename only once above matches from same file"
msgstr ""
"mostrar el nombre de archivo solo una vez para concordancias en el mismo "
"archivo"
-#: builtin/grep.c:906
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "mostrar <n> líneas de contexto antes y después de la concordancia"
-#: builtin/grep.c:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "mostrar <n> líneas de contexto antes de las concordancias"
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "mostrar <n> líneas de context después de las concordancias"
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "usar <n> hilos de trabajo"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "atajo para -C NUM"
-#: builtin/grep.c:917
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr ""
"mostrar una línea con el nombre de la función antes de las concordancias"
-#: builtin/grep.c:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "mostrar la función circundante"
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "leer patrones del archivo"
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "concordar <patrón>"
-#: builtin/grep.c:926
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "combinar patrones especificados con -e"
-#: builtin/grep.c:938
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr "indicar concordancia con exit status sin output"
-#: builtin/grep.c:940
+#: builtin/grep.c:954
msgid "show only matches from files that match all patterns"
msgstr ""
"mostrar solo concordancias con archivos que concuerdan con todos los patrones"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "mostrar archivos concordantes en el paginador"
-#: builtin/grep.c:947
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "no se ha entregado ningún patrón"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no se puede usar con revs"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no es posible resolver revisión: %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked no es soportada con --recurse-submodules"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "combinación de opciones inválida, ignorando --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "no se soportan hilos, ignorando --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número inválido de hilos especificado (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager solo funciona en el árbol de trabajo"
-#: builtin/grep.c:1157
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached o --untracked no pueden ser usadas con --no-index"
-#: builtin/grep.c:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "--untracked no se puede usar con --cached"
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "ambos --cached y árboles han sido entregados"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16259,439 +16573,442 @@
"git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] "
"[--] <archivo>..."
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "tipo de objeto"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "escribir el objeto en la base de datos de objetos"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "leer el objeto de stdin"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "guardar el archivo tal cual sin filtros"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"solo realizar un hash a cualquier basura random para crear un objeto "
"corrupto para hacer debugging de Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "procesar el archivo como si fuera de esta ruta"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "mostrar todos los comandos disponibles"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "excluir las guias"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "mostrar una lista de guías útiles"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "imprimir todos los nombres de variables de configuración"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "mostrar la página del manual"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "mostrar la página del manual en un navegador web"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "mostrar la página de info"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "imprimir descripción del comando"
-#: 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:65
+msgid "print list of useful guides"
+msgstr "mostrar una lista de guías útiles"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "imprimir todos los nombres de variables de configuración"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "formato help no reconocido '%s'"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "Falló al iniciar emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "Falló al analizar la versión de emacsclient."
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versión '%d' de emacsclient es demasiada antigua (<22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "falló al ejecutar '%s'"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
"'%s': ruta para un visualizador del manual no soportado.\n"
-"Por favor considere usar 'man.<herramienta>.cmd'."
+"Por favor considera usar 'man.<herramienta>.cmd'."
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
"'%s': comando para man viewer soportado.\n"
-"Por favor considere usar 'man.<herramienta>.path."
+"Por favor considera usar 'man.<herramienta>.path."
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': visualizador de man desconocido."
-#: builtin/help.c:452
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "ningún visualizador de manual procesó la petición"
-#: builtin/help.c:459
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr "ningún visor de info manejó la petición"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' tiene el alias '%s'"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "mal alias.%s string: %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "esta opción no requiere argumentos"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "uso: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "'git help config' para más información"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "el tipo del objeto no concuerda en %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "no se recibió el objeto esperado %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objeto %s: tipo esperado %s, encontrado %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no se puede llenar %d byte"
msgstr[1] "no se pueden llenar %d bytes"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "EOF temprano"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "error al leer en input"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "se usaron más bytes de los disponibles"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "paquete demasiado grande para la definición actual de off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "paquete excede el máximo tamaño permitido"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "no se puede crear '%s'"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "no se puede abrir el archivo de paquete '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "firma del paquete no concuerda"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versión de paquete %<PRIu32> no soportada"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "inflate devolvió %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "valor de offset desbordado para el objeto base delta"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "offset de base delta está fuera de límites"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "tipo de objeto %d desconocido"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "no se puede hacer pread en el paquete"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante"
msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "inconsistencia seria en inflate"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "¡ COLISIÓN DE SHA1 ENCONTRADA CON %s !"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "no es posible leer %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "no se puede leer la información existente del objeto %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "no se puede leer el objeto existente %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "objeto blob %s inválido"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "error de fsck en el objeto empaquetado"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "No todos los objetos hijos de %s son alcanzables"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "falló al aplicar delta"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "Recibiendo objetos"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "Indexando objetos"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paquete está corrompido (SHA1 no concuerda)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "no se puede fstat al archivo de paquete"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "el paquete tiene basura al final"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusión más allá de la locura en parse_pack_objects()"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "Resolviendo deltas"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "no es posible crear hilo: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "confusión más allá de la locura"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "completado con %d objeto local"
msgstr[1] "completado con %d objetos locales"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Tail checksum para %s inesperada (¿corrupción de disco?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paquete tiene %d delta sin resolver"
msgstr[1] "paquete tiene %d deltas sin resolver"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no es posible desinflar el objeto adjunto (%d)"
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s está corrompido"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "no se puede escribir archivo '%2$s' de %1$s"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "no se puede cerrar el archivo escrito '%2$s' de %1$s"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "no se pudo renombrar el archivo temporal '*.%s' a '%s'"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "error mientras se cerraba el archivo paquete"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "no se puede guardar el archivo paquete"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "no se puede guardar el archivo índice"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mal pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No se puede abrir el archivo paquete existente '%s'"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "No se puede abrir el archivo índice del paquete para '%s'"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "no delta: %d objeto"
msgstr[1] "no delta: %d objetos"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "largo de cadena = %d: %lu objeto"
msgstr[1] "largo de cadena = %d: %lu objetos"
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "No se puede regresar a cwd"
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "mal %s"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "algoritmo hash desconocido '%s'"
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no puede ser usada sin --stdin"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin requiere un repositorio git"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format no se puede usar con --stdin"
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify no recibió ningún nombre de archivo de paquete"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "error de fsck en objetos paquete"
@@ -16799,7 +17116,7 @@
#: builtin/init-db.c:545
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-"especifica que el repositorio de git será compartido entre varios usuarios"
+"especificar que el repositorio de git será compartido entre varios usuarios"
#: builtin/init-db.c:551
msgid "override the name of the initial branch"
@@ -17067,11 +17384,11 @@
#: builtin/log.c:1749
msgid "use [PATCH n/m] even with a single patch"
-msgstr "use [PATCH n/m] incluso con un único parche"
+msgstr "usar [PATCH n/m] incluso con un único parche"
#: builtin/log.c:1752
msgid "use [PATCH] even with multiple patches"
-msgstr "use [PATCH] incluso con múltiples parches"
+msgstr "usar [PATCH] incluso con múltiples parches"
#: builtin/log.c:1756
msgid "print patches to standard out"
@@ -17092,7 +17409,7 @@
#: builtin/log.c:1762
msgid "use <sfx> instead of '.patch'"
-msgstr "use <sfx> en lugar de '.patch'"
+msgstr "usar <sfx> en lugar de '.patch'"
#: builtin/log.c:1764
msgid "start numbering patches at <n> instead of 1"
@@ -17112,7 +17429,7 @@
#: builtin/log.c:1770
msgid "use [RFC PATCH] instead of [PATCH]"
-msgstr "use [RFC PATCH] en lugar de [PATCH]"
+msgstr "usar [RFC PATCH] en lugar de [PATCH]"
#: builtin/log.c:1773
msgid "cover-from-description-mode"
@@ -17121,12 +17438,12 @@
#: builtin/log.c:1774
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
-"genera partes de una carta de presentación basado en la descripción de la "
+"generar partes de una carta de presentación basadas en la descripción de la "
"rama"
#: builtin/log.c:1776
msgid "use [<prefix>] instead of [PATCH]"
-msgstr "use [<prefijo>] en lugar de [PATCH]"
+msgstr "usar [<prefijo>] en lugar de [PATCH]"
#: builtin/log.c:1779
msgid "store resulting files in <dir>"
@@ -17146,7 +17463,7 @@
#: builtin/log.c:1789
msgid "don't include a patch matching a commit upstream"
-msgstr "no incluya un parche que coincida con un commit en upstream"
+msgstr "no incluir un parche que coincida con un commit en upstream"
#: builtin/log.c:1791
msgid "show patch format instead of default (patch + stat)"
@@ -17241,11 +17558,11 @@
#: builtin/log.c:1824
msgid "show changes against <rev> in cover letter or single patch"
-msgstr "muestra cambios contra <rev> en cover letter o en un solo parche"
+msgstr "mostrar cambios contra <rev> en cover letter o en un solo parche"
#: builtin/log.c:1827
msgid "show changes against <refspec> in cover letter or single patch"
-msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche"
+msgstr "mostrar cambios contra <refspec> en cover letter o en un solo parche"
#: builtin/log.c:1829 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
@@ -17332,134 +17649,138 @@
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-"No se pudo encontrar una rama remota rastreada, por favor especifique "
+"No se pudo encontrar una rama remota rastreada, por favor especifica "
"<upstream> manualmente.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opciones>] [<archivo>...]"
-#: builtin/ls-files.c:619
-msgid "identify the file status with tags"
-msgstr "identifique el estado del archivo con tags"
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "rutas están separadas con un carácter NULL"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:617
+msgid "identify the file status with tags"
+msgstr "identificar el estado del archivo con tags"
+
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr "mostrar archivos en caché en la salida (default)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "mostrar archivos borrados en la salida"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "mostrar archivos modificados en la salida"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "mostrar otros archivos en la salida"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "mostrar archivos ignorados en la salida"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr "mostrar nombre de objeto del contenido del área de stage en la salida"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr "mostrar archivos en el filesystem que necesiten ser borrados"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "mostrar solo nombres de 'otros' directorios"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "mostrar finales de línea de archivos"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "no mostrar directorios vacíos"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "mostrar archivos no fusionados en la salida"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "mostrar información resolver-deshacer"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "saltar archivos que concuerden con el patrón"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "excluir patrones leídos de <archivo>"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "leer patrones exclude del archivo <archivo>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr "leer patrones adicionales de exclusión por directorio en <archivo>"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "agregar las exclusiones standard de git"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "hacer la salida relativa al directorio principal del proyecto"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
msgstr "recurrir a través de submódulos"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "árbol-ismo"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"fingir que las rutas hayan sido borradas ya que todavía hay <árbol-ismos> "
"presentes"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "mostrar data de debug"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "suprimir entradas duplicadas"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repositorio> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repositorio> [<refs>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "no mostrar el URL remoto"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "ejecutar"
@@ -17577,7 +17898,7 @@
msgid "use headers in message's body"
msgstr "usar cabeceras en el cuerpo del mensaje"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "mbox vacío: '%s'"
@@ -17616,7 +17937,7 @@
#: builtin/merge-base.c:149
msgid "is the first one ancestor of the other?"
-msgstr "¿es el primer ancestro del otro?"
+msgstr "¿es el primero ancestro del otro?"
#: builtin/merge-base.c:151
msgid "find where <commit> forked from reflog of <ref>"
@@ -17693,144 +18014,144 @@
msgid "Merging %s with %s\n"
msgstr "Fusionando %s con %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opciones>] [<commit>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "opción `m' requiere un valor"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "opción `%s' requiere un valor"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "Estrategias disponibles son:"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "Estrategias personalizadas disponibles son:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:133
msgid "do not show a diffstat at the end of the merge"
msgstr "no mostrar un diffstat al final de la fusión"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:136
msgid "show a diffstat at the end of the merge"
msgstr "mostrar un diffstat al final de la fusión"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:139
msgid "(synonym to --stat)"
msgstr "(sinónimo para --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:142
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"agregar (como máximo <n>) entradas del shortlog al mensaje del commit de "
"fusión"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:148
msgid "create a single commit instead of doing a merge"
msgstr "crear un commit único en lugar de hacer una fusión"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:151
msgid "perform a commit if the merge succeeds (default)"
msgstr "realizar un commit si la fusión es exitosa (default)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:154
msgid "edit message before committing"
msgstr "editar mensaje antes de realizar commit"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "permitir fast-forward (default)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:161
msgid "abort if fast-forward is not possible"
msgstr "abortar si fast-forward no es posible"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:164
msgid "verify that the named commit has a valid GPG signature"
msgstr "verificar que el commit nombrado tenga una firma GPG válida"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "estrategia"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:169
msgid "merge strategy to use"
msgstr "estrategia de fusión para usar"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:172
msgid "option=value"
msgstr "opción=valor"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:173
msgid "option for selected merge strategy"
msgstr "opción para la estrategia de fusión seleccionada"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "fusionar mensaje de commit (para una fusión no fast-forward)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "abortar la fusión en progreso actual"
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "--abort pero no tocar el índice ni el árbol de trabajo"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "continuar la fusión en progreso actual"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:180
msgid "allow merging unrelated histories"
msgstr "permitir fusionar historias no relacionadas"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "no se pudo ejecutar stash."
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "stash falló"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "no es un objeto válido: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "lectura de árbol falló"
-#: builtin/merge.c:400
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
msgstr "Ya está actualizado. (nada para hacer squash)"
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Commit de squash -- no actualizando HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
@@ -17845,48 +18166,48 @@
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mal string branch.%s.mergeoptions: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "No manejando nada más que fusión de dos heads."
-#: builtin/merge.c:742
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opción desconocida para merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "opción de estrategia desconocida: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "no es posible escribir %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "No se pudo leer de '%s'"
-#: builtin/merge.c:822
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-"No se realiza commit de fusión; use 'git commit' para completar la fusión.\n"
+"No se realiza commit de fusión; usa 'git commit' para completar la fusión.\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:829
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
msgstr ""
-"Por favor ingrese un mensaje de commit que explique por qué es necesaria "
+"Por favor ingresa un mensaje de commit que explique por qué es necesaria "
"esta fusión,\n"
"especialmente si esto fusiona un upstream actualizado en una rama de "
"tópico.\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "Un mensaje vacío aborta el commit.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17895,74 +18216,74 @@
"Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
"el commit.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "Mensaje de commit vacío."
-#: builtin/merge.c:904
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "Maravilloso.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Fusión automática falló; arregle los conflictos y luego realice un commit "
"con el resultado.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "No rama actual."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "No hay remoto para la rama actual."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "Por defecto, no hay un upstream definido para la rama actual."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "No hay rama de rastreo remota para %s de %s"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor erróneo '%s' en el entorno '%s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "nada que podamos fusionar en %s: %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "nada que podamos fusionar"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort no espera argumentos"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit no espera argumentos"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue no espera argumentos"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17970,7 +18291,7 @@
"No has concluido la fusión (existe MERGE_HEAD).\n"
"Por favor, realiza un commit con los cambios antes de fusionar."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17978,89 +18299,85 @@
"No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
"Por favor, realiza un commit con los cambios antes de fusionar."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1386
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1396
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "No se puede combinar --squash con --no-ff."
-#: builtin/merge.c:1398
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "No se puede combinar --squash con --commit."
-#: builtin/merge.c:1414
+#: builtin/merge.c:1418
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"No hay commit especificado y merge.defaultToUpstream no está configurado."
-#: builtin/merge.c:1431
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr "Aplastar un commit a un head vacío no es soportado todavía"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1437
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nada que podamos fusionar"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1444
msgid "Can merge only exactly one commit into empty head"
msgstr "Solo se puede fusionar exactamente un commit en un head vacío"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "rehusando fusionar historias no relacionadas"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "Actualizando %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Intentando fusión en índice realmente trivial...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "No es posible hacer fast-forward, abortando."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rebobinando el árbol a original...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Intentando estrategia de fusión %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Fusionar con estrategia %s falló.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1732
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Usando estrategia %s para preparar resolución a mano.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -18095,15 +18412,15 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "objeto '%s' es etiquetado como '%s', pero es de tipo '%s'"
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr "etiqueta en stdin no pasó nuestro estricto control fsck"
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr "tag en stdin no se refería a un objeto válido"
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "incapaz de escribir el archivo de tag"
@@ -18124,35 +18441,51 @@
msgstr "permitir la creación de más de un árbol"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<opciones>] write [--preferred-pack=<pack>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<opciones>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<opciones>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<opciones>] repack [--batch-size=<tamaño>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"directorio de objetos conteniendo conjunto de pares de packfile y pack-index"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "pack preferido"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "pack para reuso cuando se calcula un bitmap de múltiples packs"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "escribir bitmap multi-pack"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "escribir el índice multi-pack que contenga los siguientes índices"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "referencia los snapshots para seleccionar los commits de bitmap"
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18160,11 +18493,6 @@
"durante el repack, recolectar los pack-files de tamaño menor en un batch que "
"sea más grande que este tamaño"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "subcomando desconocido: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<opciones>] <fuente>... <destino>"
@@ -18193,72 +18521,72 @@
msgid "skip move/rename errors"
msgstr "saltar errores de mover/renombrar"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destino '%s' no es un directorio"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Revisando cambio de nombre de '%s' a '%s'\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "mala fuente"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "no se puede mover un directorio en sí mismo"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "no se puede mover un directorio dentro de un archivo"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "directorio de fuente está vacío"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "no se encuentra bajo control de versiones"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "en conflicto"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "destino existe"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "sobrescribiendo '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "No se puede sobrescribir"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "múltiples fuentes para el mismo destino"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "el directorio de destino no existe"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, fuente=%s, destino=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renombrando %s a %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "renombrar '%s' falló"
@@ -18439,47 +18767,47 @@
msgid "failed to finish 'show' for object '%s'"
msgstr "falló la finalización de 'show' para el objeto '%s'"
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
-msgstr "por favor suministrar los contenidos de nota usando la opción -m o -F"
+msgstr "por favor suministra los contenidos de nota usando la opción -m o -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "incapaz de escribir el objeto de nota"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "los contenidos de nota han sido dejados en %s"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "no se pudo abrir o leer '%s'"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "falló al resolver '%s' como ref válida."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "falló al leer objeto '%s'."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "no se puede leer los datos de la nota de un objeto no blob '%s'."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "línea de entrada mal formada: '%s'."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "falló al copiar notas de '%s' a '%s'"
@@ -18487,147 +18815,147 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "rechazando %s notas en %s (fuera de refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
-msgstr "muchos argumentos"
+msgstr "demasiados argumentos"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "no se encontraron notas para objeto %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "contenidos de la nota como cadena"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "contenidos de la nota en un archivo"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "reutilizar y editar el objeto de nota especificado"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "reutilizar el objeto de nota especificado"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "permitir almacenar nota vacía"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "reemplazar notas existentes"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-"No se puede agregar notas. Se encontró notas existentes para objeto %s. Use "
+"No se puede agregar notas. Se encontró notas existentes para objeto %s. Usa "
"'-f' para sobrescribir las notas existentes"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Sobrescribiendo notas existentes para objeto %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "Quitando nota del objeto %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "leer objetos desde stdin"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "cargar configuración de reescritura para <comando> (implica --stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "demasiados pocos argumentos"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
"No se puede copiar notas. Se encontró notas existentes para el objeto %s. "
-"Use '-f' para sobrescribir las notas existentes"
+"Usa '-f' para sobrescribir las notas existentes"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "faltan notas en el objeto de fuente %s. No se puede copiar."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
"Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n"
-"Por favor use 'git notes add -f -m/-F/-c/-C' en cambio.\n"
+"Por favor usa 'git notes add -f -m/-F/-c/-C' en cambio.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "falló al borrar ref NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "falló al borrar ref NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "falló al leer ref NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "falló al resolver NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "falló al finalizar la fusión de notas"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estrategia de fusión de notas %s desconocida"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Opciones generales"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Opciones de fusión"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18635,92 +18963,92 @@
"resolver conflictos de notas usando la estrategia entregada (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Realizando commit a las notas no fusionadas"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"finalizar fusión de notas realizando un commit de las notas no fusionadas"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Abortando resolución de fusión de notas"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "abortar fusión de notas"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no se pueden mezclar --commit, --abort o -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "se debe especificar una ref de notas a fusionar"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "--strategy/-s desconocida: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "una fusión de notas en %s ya está en progreso en %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "falló al guardar un link para el ref de notas actual (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"'git notes merge --commit', or abort the merge with 'git notes merge --"
"abort'.\n"
msgstr ""
-"Fusión automática de notas falló. Arregle conflictos en %s y realice un "
-"commit con el resultado 'git notes merge --commit', o aborte la fusión con "
+"Fusión automática de notas falló. Arregla conflictos en %s y realiza un "
+"commit con el resultado 'git notes merge --commit', o aborta la fusión con "
"'git notes merge --abort'.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Falló al resolver '%s' como una ref válida."
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "El objeto %s no tiene notas\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr "intentar eliminar una nota no existente no es un error"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "leer nombres de objetos de standard input"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "no eliminar, solo mostrar"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "reportar notas recortadas"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "referencia-de-notas"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "usar notas desde <referencia-de-notas>"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "subcomando desconocido: %s"
@@ -18773,86 +19101,90 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "objeto esperado en el desplazamiento %<PRIuMAX> en el paquete %s"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"deshabilitando escritura bitmap, paquetes son divididos debido a pack."
"packSizeLimit"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "Escribiendo objetos"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "falló al iniciar %s"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "escribir un índice de bitmap"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"deshabilitando escritura bitmap, ya que algunos objetos no están siendo "
"empaquetados"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "overflow de offset de base de delta en paquete para %s"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "offset de base de delta está fuera de límites para %s"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "Contando objetos"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "incapaz de analizar header del objeto %s"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "objeto %s no puede ser leído"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "suboptimal pack - fuera de memoria"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compresión delta usando hasta %d hilos"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "no es posible empaquetar objetos alcanzables desde tag %s"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "Comprimiendo objetos"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "inconsistencia con la cuenta de delta"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18861,7 +19193,7 @@
"valor para uploadpack.blobpackfileuri tiene que ser de la forma '<hash-de-"
"objeto> <hash-de-pack> <uri>' (se tuvo '%s')"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -18869,17 +19201,18 @@
"objeto ya está configurado en otro uploadpack.blobpackfileuri (se obtuvo "
"'%s')"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "no se puede obtener el tipo de objeto %s en pack %s"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr "no se pudo encontrar pack '%s'"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18888,261 +19221,260 @@
"se esperaba ID de objeto al borde, se obtuvo basura:\n"
"%s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-"se esperaba ID de objeto, se obtuvo basuta:\n"
+"se esperaba ID de objeto, se obtuvo basura:\n"
"%s"
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "valor inválido para --missing"
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "no se puede abrir índice de paquetes"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "objeto suelto en %s no pudo ser examinado"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "incapaz de forzar que el objecto se suelte"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "no es una rev '%s'"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "mala revisión '%s'"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "incapaz de añadir objetos recientes"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "versión de índice no soportada %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "mala versión del índice '%s'"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "<versión>[,<offset>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escribir el índice de paquete en la versión de formato idx especificado"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "tamaño máximo de cada paquete resultante"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos prestados de otros almacenes de objetos"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "ignorar objetos empaquetados"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "limitar ventana de paquete por objetos"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr "limitar ventana de paquete por memoria en adición a límite de objetos"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "longitud máxima de cadena delta permitida en el paquete resultante"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "reusar deltas existentes"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr "usar hilos cuando se busque para mejores concordancias de delta"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "no crear un paquete resultante vacío"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "leer argumentos de revisión de standard input"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "limitar los objetos a aquellos que no hayan sido empaquetados todavía"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcanzables por cualquier referencia"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referidos por entradas de reflog"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "incluir objetos referidos por el índice"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr "leer packs de stdin"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "mostrar paquete en stdout"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr "incluir objetos tag que refieran a objetos a ser empaquetados"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "mantener objetos inalcanzables"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "empaquetar objetos sueltos inalcanzables"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "usar el algoritmo sparse reachability"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "crear paquetes delgados"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "crear paquetes adecuados para fetches superficiales"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "ignorar paquetes que tengan un archivo .keep acompañante"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "ignorar este paquete"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "nivel de compresión del paquete"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr "no ocultar commits por injertos"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usar un índice bitmap si está disponible para acelerar la cuenta de objetos"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "escribir un índice de bitmap junto al índice de paquete"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "escribir un índice de bitmap si es posible"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "manejo de objetos perdidos"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr "no se puede empaquetar objetos en packfiles promisores"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr "respetar islas durante la compresión delta"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "protocolo"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
-"excluyendo cualquier uploadpack.blobpackfileuri configurado con este "
-"protocolo"
+"excluir cualquier uploadpack.blobpackfileuri configurado con este protocolo"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "profundidad de cadena de delta %d es demasiada profunda, forzando %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit es demasiado grande, forzando %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size no puede ser usado para construir un paquete para "
"transferencia"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "tamaño mínimo del paquete es 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin no puede ser usado para construir un paquete indexable"
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "no se puede usar --filter sin --stdout"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
msgstr "no se puede usar --filter con --stdin-packs"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr "no se puede usar un lista interna de rev con --stdin-packs"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "Enumerando objetos"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19160,9 +19492,9 @@
"to <git@vger.kernel.org>. Thanks.\n"
msgstr ""
"'git pack-redundant' está nominado para su eliminación.\n"
-"Si todavía usa este comando, agregue una extra\n"
+"Si todavía usas este comando, agrega una extra\n"
"opción, '--i-still-use-this', en la línea de comando\n"
-"y háganos saber que todavía lo usa enviando un correo electrónico\n"
+"y háganos saber que todavía lo usas enviando un correo electrónico\n"
"a <git@vger.kernel.org>. Gracias.\n"
#: builtin/pack-refs.c:8
@@ -19197,7 +19529,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor"
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "no se puede recortar en un repositorio de objetos preciosos"
@@ -19223,11 +19555,11 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporar cambios por rebase en lugar de fusión"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permitir fast-forward"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:167 parse-options.h:339
msgid "automatically stash/stash pop before and after"
msgstr "ejecutar automáticamente stash/stash pop antes y después"
@@ -19280,7 +19612,7 @@
"una rama. Porque este no es el remoto configurado por default\n"
"para tu rama actual, tienes que especificar una rama en la línea de comando."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:456 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "No te encuentras actualmente en una rama."
@@ -19297,7 +19629,7 @@
msgstr "Ver git-pull(1) para detalles."
#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<remoto>"
@@ -19305,7 +19637,7 @@
msgid "<branch>"
msgstr "<rama>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:471 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "No hay información de rastreo para la rama actual."
@@ -19334,11 +19666,11 @@
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorando --verify-signatures para rebase"
-#: builtin/pull.c:930
+#: builtin/pull.c:936
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -19362,21 +19694,20 @@
"la preferencia en todos los repositorios. Puedes también pasar --rebase,\n"
"--no-rebase, o --ff-only en el comando para sobrescribir la configuración\n"
"por defecto en cada invocación.\n"
-"\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1010
msgid "Updating an unborn branch with changes added to the index."
msgstr "Actualizando una rama no nacida con cambios agregados al índice."
-#: builtin/pull.c:994
+#: builtin/pull.c:1014
msgid "pull with rebase"
msgstr "pull con rebase"
-#: builtin/pull.c:995
+#: builtin/pull.c:1015
msgid "please commit or stash them."
msgstr "por favor realiza un commit o un stash con ellos."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1040
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19387,7 +19718,7 @@
"realizando fast-forward al árbol de trabajo\n"
"desde commit %s."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1046
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19398,21 +19729,29 @@
"to recover."
msgstr ""
"No se puede realizar fast-forward en tu árbol de trabajo.\n"
-"Tras asegurarse que haya guardado todo lo preciado de la salida de\n"
+"Tras asegurarte que hayas guardado todo lo preciado de la salida de\n"
"$ git diff %s\n"
-",ejecute\n"
+",ejecuta\n"
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1061
msgid "Cannot merge multiple branches into empty head."
msgstr "No se puede fusionar múltiples ramas en un head vacío."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1066
msgid "Cannot rebase onto multiple branches."
msgstr "No se puede rebasar en múltiples ramas."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1068
+msgid "Cannot fast-forward to multiple branches."
+msgstr "No se puede hacer fast-forward en múltiples ramas."
+
+#: builtin/pull.c:1082
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Necesita especificar cómo reconciliar las ramas divergentes."
+
+#: builtin/pull.c:1096
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"no se puede rebasar con modificaciones de submódulos grabadas localmente"
@@ -19475,7 +19814,7 @@
msgstr ""
"Actualmente no estás en una rama.\n"
"Para hacer un push a la historia que lleva al estado actual\n"
-"(HEAD desacoplado), use\n"
+"(HEAD desacoplado), usa\n"
"\n"
"\tgit push %s HEAD:<nombre-de-rama-remota>\n"
@@ -19489,7 +19828,7 @@
msgstr ""
"La rama actual %s no tiene una rama upstream.\n"
"Para realizar un push de la rama actual y configurar el remoto como "
-"upstream, use\n"
+"upstream, usa\n"
"\n"
"\tgit push --set-upstream %s %s\n"
@@ -19536,10 +19875,10 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"Actualizaciones fueron rechazadas porque una punta de rama en el push está\n"
-"detrás de su contraparte remota. Verifique esta rama e integre los cambios "
+"detrás de su contraparte remota. Cambia a esta rama e integra los cambios "
"remotos\n"
"(ejem. 'git pull ...') antes de volver a hacer push.\n"
-"Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles."
+"Mira las 'Notes about fast-forwards' en 'git push --help' para más detalles."
#: builtin/push.c:270
msgid ""
@@ -19551,9 +19890,9 @@
msgstr ""
"Actualizaciones fueron rechazadas porque el remoto contiene trabajo que\n"
"no existe localmente. Esto es causado usualmente por otro repositorio\n"
-"realizando push a la misma ref. Quizás quiera integrar primero los cambios\n"
+"realizando push a la misma ref. Quizás quieras integrar primero los cambios\n"
"remotos (ej. 'git pull ...') antes de volver a hacer push.\n"
-"Vea 'Notes about fast-forwards' en 'git push --help' para detalles."
+"Mira 'Notes about fast-forwards' en 'git push --help' para detalles."
#: builtin/push.c:277
msgid "Updates were rejected because the tag already exists in the remote."
@@ -19579,7 +19918,7 @@
msgstr ""
"Las actualizaciones se rechazaron porque la punta de la rama de seguimiento\n"
"remoto se ha actualizado desde la última vez que se realizó checkout. Es "
-"posible que desee\n"
+"posible que desees\n"
"integrar esos cambios localmente (por ejemplo, 'git pull ...')\n"
"antes de forzar una actualización.\n"
@@ -19593,15 +19932,15 @@
msgid "failed to push some refs to '%s'"
msgstr "falló el push de algunas referencias a '%s'"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "repositorio"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "realizar push a todas las refs"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "realizar mirror a todas las refs"
@@ -19613,32 +19952,32 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "realizar push a tags (no puede ser usado con --all o --mirror)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "forzar actualizaciones"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<refname>:<expect>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
-msgstr "requiere que el valor viejo de ref sea este valor"
+msgstr "requerir que el valor viejo de ref sea este valor"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
-msgstr "requieren que las actualizaciones remotas se integren localmente"
+msgstr "requerir que las actualizaciones remotas se integren localmente"
#: builtin/push.c:560
msgid "control recursive pushing of submodules"
msgstr "controlar push recursivo de submódulos"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "usar empaquetado delgado"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "programa de recepción de paquetes"
@@ -19658,11 +19997,11 @@
msgid "push missing but relevant tags"
msgstr "realizar push de tags faltantes pero relevantes"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "Firmar con GPG el push"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "solicitar transacción atómica en el lado remoto"
@@ -19775,83 +20114,82 @@
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
-"prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
-"sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-"
-"ismo2> [<árbol-ismo3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "escribir índice resultante en <archivo>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "solo vaciar el índice"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Fusionando"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "realizar un merge en adición a una lectura"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "fusión de 3 vías si no se requiere ninguna fusión a nivel de archivo"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "fusión de 3 vías en presencia de adiciones y eliminaciones"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "igual que -m, pero descarta entradas sin fusionar"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<subdirectorio>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
-msgstr "lea el árbol en el índice bajo <subdirectorio>/"
+msgstr "leer el árbol en el índice bajo <subdirectorio>/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "actualiza el árbol de trabajo con el resultado de la fusión"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "permitir sobrescritura de archivos explícitamente ignorados"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "no revisar el árbol de trabajo tras fusionar"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "no actualizar el índice o el árbol de trabajo"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "saltar aplicación de filtro de sparse checkout"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "debug unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "suprimir mensajes de feedback"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "Necesitas resolver tu índice actual primero"
@@ -19873,193 +20211,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "lista de pendientes inutilizable: '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "no se pudo crear archivo temporal %s"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "no se pudo marcar como interactivo"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "no se pudo generar lista de pendientes"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "un commit base tiene que ser provisto con --upstream o --onto"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opciones>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "mantener commits que comiencen con vacío"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "permitir commits con mensajes vacíos"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "rebasar commits de fusión"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "mantener puntas de bifurcación originales de los primos"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "mover commits que comiencen con squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "firmar commits"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "mostrar un diffstat de lo que cambió en upstream"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "continuar rebase"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "saltar commit"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "editar la lista de pendientes"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "mostrar el parche actual"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "ids de commits cortos en la lista de pendientes"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "expandir ids de commits en la lista de pendientes"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "revisar la lista de pendientes"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "reordenar líneas fixup/squash"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "insertar comando exec en la lista de pendientes"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "sobre"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "restringir revision"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash a"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "el commit de upstream"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "nombre de head"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "estrategia de rebase"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "opciones de estrategia"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "cambiar a"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "la rama o commit para hacer checkout"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "sobre-nombre"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "sobre nombre"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "el comando para ejecutar"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "reprogramar automaticamente cualquier `exec` que falle"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "%s requiere un backend de fusión"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "no se pudo conseguir 'onto': '%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head inválido: '%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "ignorando inválido allow_rerere_autoupdate: '%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20067,14 +20256,14 @@
"To abort and get back to the state before \"git rebase\", run \"git rebase --"
"abort\"."
msgstr ""
-"Resuelva todos los conflictos manualmente ya sea con\n"
-"\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue"
+"Resuelve todos los conflictos manualmente ya sea con\n"
+"\"git add/rm <archivo_conflictivo>\", luego ejecuta \"git rebase --continue"
"\".\n"
"Si prefieres saltar este parche, ejecuta \"git rebase --skip\" .\n"
"Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git "
"rebase --abort\"."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -20093,7 +20282,7 @@
"\n"
"Como resultado, git no puede hacer rebase con ellos."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20102,7 +20291,7 @@
"tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y "
"\"ask\"."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -20119,7 +20308,7 @@
" git rebase '<rama>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20132,184 +20321,194 @@
" git branch --set-upstream-to=%s/<rama> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "comandos exec no pueden contener newlines"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "comando exec vacío"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "haciendo rebase sobre rama dada en lugar de upstream"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr "usar la base de fusión de upstream y la rama como base actual"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "permitir ejecutar hook pre-rebase"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "ser silencioso. implica --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "mostrar un diffstat de lo que cambió en upstream"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "no mostrar un diffstat de lo que cambió en upstream"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "agregar una línea \"Signed-off-by\" al mensaje de cada commit"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "hacer que la fecha del commit concuerde con la fecha de autoría"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "ignorar la fecha del autor y usar la fecha actual"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "sinónimo para --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "pasado a 'git apply'"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "ignorar cambios en espacios en blanco"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "cherry-pick todos los commits, incluso si no han cambiado"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "continuar"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "saltar el parche y continuar"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
-msgstr "aborta y revisa la rama original"
+msgstr "abortar y cambiar a la rama original"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
-msgstr "aborta pero mantiene HEAD donde está"
+msgstr "abortar pero mantiene HEAD donde está"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "editar la lista de pendientes durante el rebase interactivo"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
-msgstr "muestra el archivo parche siendo aplicado o fusionado"
+msgstr "mostrar el archivo parche siendo aplicado o fusionado"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "usar estrategias de apply para el rebase"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "usar estrategias de fusión para el rebase"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr "permitir al usuario editar la lista de commits para rebasar"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "como manejar commits que se vuelven vacíos"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "mantener commits que comiencen con vacío"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "mover commits que comiencen con squash!/fixup! bajo -i"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr "agregar líneas exec tras cada commit de la lista editable"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "permitir rebase de commits con mensajes vacíos"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "intentar rebase de fusiones en lugar de saltarlas"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "use 'merge-base --fork-point' para refinar upstream"
+msgstr "usar 'merge-base --fork-point' para refinar upstream"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "usar la estrategia de merge dada"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "opción"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "pasar el argumento para la estrategia de fusión"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "reprogramar automaticamente cualquier `exec` que falle"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr ""
"aplicar todos los cambios, incluso aquellos que ya están presentes en "
"upstream"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Parece que 'git am' está en progreso. No se puede rebasar."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges está deprecado. Use --rebase-merges en su lugar."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges fue reemplazado por --rebase-merges"
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "no se puede combinar '--keep-base' con '--onto'"
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr "no se puede combinar '--keep-base' con '--root'"
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
msgstr "no se puede combinar '--root' con '--fork-point'"
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "¿No hay rebase en progreso?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"La acción --edit-todo solo puede ser usada al rebasar interactivamente."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "No se puede leer el HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20317,16 +20516,16 @@
"Tienes que editar todos los conflictos de fusión y luego\n"
"marcarlos como resueltos usando git add"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "no se pudo descartar los cambios del árbol de trabajo"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "no se puede regresar a %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20347,144 +20546,133 @@
"y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n"
"algo de valor ahí.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "switch `C' espera un valor numérico"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Modo desconocido: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requiere --merge o --interactive"
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr "no se pueden combinar opciones de apply con opciones de merge"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Backend de rebase desconocido: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec requiere --exec o --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"error: no se puede combinar '--preserve-merges' con '--reschedule-failed-"
-"exec'"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "upstream inválido '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "No se pudo crear commit raíz nuevo"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': necesita exactamente una base de fusión con rama"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': necesita exactamente una base de fusión"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "No apunta a un commit válido '%s'"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal: no existe la rama/commit: '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "no existe la rama/commit: '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "No existe ref: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "No se pudo resolver HEAD a una revisión"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Por favor, confírmalos o guárdalos."
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "no se pudo cambiar a %s"
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD está actualizado."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La rama actual %s está actualizada.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD está actualizado, rebase forzado."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Rama actual %s está actualizada, rebase forzado.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "El hook pre-rebase rechazó el rebase."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "Cambios a %s:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Cambios desde %s a %s:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"En primer lugar, rebobinando HEAD para después reproducir tus cambios encima "
"de esta...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "No se puede desacoplar HEAD"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avance rápido de %s a %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1280
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"
@@ -20517,7 +20705,7 @@
"Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
"configura 'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1300
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"
@@ -20538,11 +20726,11 @@
"\n"
"Para suprimir este mensaje, puedes configurarlo en 'refuse'."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "silencioso"
-#: builtin/receive-pack.c:2492
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Se tiene que especificar un directorio."
@@ -20583,7 +20771,7 @@
msgid "%s points nowhere!"
msgstr "¡%s no apunta a ningún lado!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr "no reflog especificado para borrar"
@@ -20740,7 +20928,7 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "remoto %s ya existe."
@@ -20750,25 +20938,30 @@
msgid "Could not setup master '%s'"
msgstr "No se pudo configurar master '%s'"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branch.%s.rebase=%s no manejado; se asume 'true'"
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "No se pudo obtener el mapa de fetch para refspec %s"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(concordando)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(eliminar)"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "no se pudo configurar '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20779,17 +20972,17 @@
"\t%s:%d\n"
"ahora nombra al remoto inexistente '%s'"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "No existe el remoto '%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'"
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20798,19 +20991,19 @@
msgstr ""
"No se actualiza refspec de fetch no predeterminada\n"
"\t%s\n"
-"\tPor favor actualice la configuración manualmente si es necesario."
+"\tPor favor actualiza la configuración manualmente si es necesario."
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "borrar '%s' falló"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "crear '%s' falló"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20819,124 +21012,124 @@
"to delete them, use:"
msgstr[0] ""
"Nota: Una rama fuera de la jerarquía refs/remotes/ no fue eliminada;\n"
-"para borrarla, use:"
+"para borrarla, usa:"
msgstr[1] ""
"Nota: Algunas ramas fuera de la jerarquía refs/remotes/ no fueron "
"eliminadas;\n"
-"para borrarlas, use:"
+"para borrarlas, usa:"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "No se pudo borrar la sección de configuración '%s'"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nuevo (siguiente fetch se guardará en remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " rastreada"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
-msgstr " viejo (use 'git remote prune' para eliminar)"
+msgstr " viejo (usa 'git remote prune' para eliminar)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "inválido branch.%s.merge; no se puede rebasar en > 1 rama"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebasa interactivamente en remoto %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "rebasa interactivamente (con fusiones) en remoto %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "rebasa sobre el remoto %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " se fusiona con remoto %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "fusiona con remoto %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s y con el remoto %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "crear"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "borrar"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "actualizado"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "se puede realizar fast-forward"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "desactualizado local"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s fuerza a %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s publica a %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s fuerza a %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s publica a %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "no consultar remotos"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* remoto %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " URL para obtener: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(sin URL)"
@@ -20944,330 +21137,348 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " URL para publicar: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " Rama HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(no consultado)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(desconocido)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Rama HEAD (HEAD remoto es ambiguo, puede ser uno de los siguientes):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Rama remota:%s"
msgstr[1] " Ramas remotas:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (estado no consultado)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Rama local configurada para 'git pull':"
msgstr[1] " Ramas locales configuradas para 'git pull':"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " Las referencias locales serán reflejadas por 'git push'"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Referencia local configurada para 'git push'%s:"
msgstr[1] " Referencias locales configuradas para 'git push'%s:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "borrar refs/remotos/<nombre>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "No se puede determinar el HEAD remoto"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "No se pudo borrar %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "No es un ref válido: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "No se pudo configurar %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr " ¡%s se volverá colgante!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " ¡%s se ha vuelto colgante!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "Recortando %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * [se acortará] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " * [prune realizado] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "recortar remotos tras realizar fetch"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "No existe el remoto '%s'"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "agregar rama"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "no hay remotos especificados"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "consultar URLs de push en lugar de URLs de fetch"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "retornar todos los URLs"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "no hay URLs configurados para remoto '%s'"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "manipular URLs de push"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "agregar URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "borrar URLs"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no tiene sentido"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patrón de URL viejo inválido: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "No se encontró URL: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "No borrará todos los URLs no de push"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [<opciones>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-"Reempaquetados incrementales son incompatibles con índices bitmap. Use\n"
-"--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps."
+"Reempaquetados incrementales son incompatibles con índices bitmap. Usa\n"
+"--no-write-bitmap-index o deshabilita la configuración pack.writebitmaps."
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Esperando líneas de ID de objeto completas en hex solo desde pack-"
"objects."
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"no se puede finalizar pack-objects para reempaquetar objetos promisores"
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, c-format
msgid "cannot open index for %s"
msgstr "no se puede abrir index para %s"
-#: builtin/repack.c:368
+#: builtin/repack.c:371
#, c-format
msgid "pack %s too large to consider in geometric progression"
-msgstr "pack %s es muy grande para considerar en la progresión geométrica"
+msgstr ""
+"pack %s es demasiado grande para considerar en la progresión geométrica"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
#, c-format
msgid "pack %s too large to roll up"
-msgstr "pack %s es muy grande para hacer un roll up"
+msgstr "pack %s es demasiado grande para hacer un roll up"
-#: builtin/repack.c:460
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "no se pudo abrir %s para escritura"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "no se pudo cerrar snapshot de refs temporal"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "empaquetar todo en un único paquete"
-#: builtin/repack.c:462
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr "lo mismo que -a, y soltar objetos inalcanzables"
-#: builtin/repack.c:465
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "pasar --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:469
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "pasar --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:471
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "no ejecutar git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "pasar --local a git-pack-objects"
-#: builtin/repack.c:476
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "escribir un índice de bitmap"
-#: builtin/repack.c:478
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr "pasar --delta-islands a git-pack-objects"
-#: builtin/repack.c:479
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "approxidate"
-#: builtin/repack.c:480
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr "con -A, no perder objetos más antiguos que este"
-#: builtin/repack.c:482
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "con -a, reempaquetar objetos inalcanzables"
-#: builtin/repack.c:484
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "tamaño de la ventana usada para la compresión delta"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "bytes"
-#: builtin/repack.c:486
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"lo mismo que arriba, pero limita el tamaño de memoria en lugar del número de "
"entradas"
-#: builtin/repack.c:488
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "limita la profundidad máxima del delta"
-#: builtin/repack.c:490
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "limita el número máximo de hilos"
-#: builtin/repack.c:492
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "tamaño máximo de cada paquete"
-#: builtin/repack.c:494
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr "reempaquetar objetos en paquetes marcados con .keep"
-#: builtin/repack.c:496
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr "no reempaquetar este paquete"
-#: builtin/repack.c:498
+#: builtin/repack.c:666
msgid "find a geometric progression with factor <N>"
msgstr "encontrar una progresión geométrica con factor <N>"
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "escribir un índice multi-pack de los paquetes resultantes"
+
+#: builtin/repack.c:678
msgid "cannot delete packs in a precious-objects repo"
msgstr "no se pueden borrar paquetes en un repositorio de objetos preciosos"
-#: builtin/repack.c:512
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable y -A son incompatibles"
-#: builtin/repack.c:527
+#: builtin/repack.c:713
msgid "--geometric is incompatible with -A, -a"
msgstr "--geometric es incompatible con -A, -a"
-#: builtin/repack.c:639
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr "Nada nuevo para empaquetar."
-#: builtin/repack.c:669
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr "falta archivo requerido: %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr "no se pudo desvincular: %s"
@@ -21416,7 +21627,7 @@
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-"commit original '%s' contiene un mergetag '%s' que es descartado; use --edit "
+"commit original '%s' contiene un mergetag '%s' que es descartado; usa --edit "
"en lugar de --graft"
#: builtin/replace.c:469
@@ -21577,92 +21788,92 @@
msgid "keep"
msgstr "mantener"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "No hay un HEAD válido."
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "Falló al encontrar el árbol de HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "Falló al encontrar árbol de %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD está ahora en %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "No se puede realizar un reset %s en medio de una fusión."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "ser silencioso, solo reportar errores"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "reiniciar HEAD e índice"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "reiniciar solo HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "reiniciar HEAD, índice y árbol de trabajo"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "reiniciar HEAD pero mantener cambios locales"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr "grabar solo el hecho de que las rutas eliminadas serán agregadas luego"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Falló al resolver '%s' como una revisión válida."
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Falló al resolver '%s' como un árbol válido."
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch es incompatible con --{hard,mixed,soft}"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-"--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
+"--mixed con rutas ha sido deprecado; usa 'git reset -- <rutas>' en cambio."
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "No se puede hacer un reset %s con rutas."
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s reset no está permitido en un repositorio vacío"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr "-N solo puede ser usada con --mixed"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "Cambios fuera del área de stage tras el reset:"
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -21676,12 +21887,12 @@
"usar '--quiet' para evitar esto. Configura la opción reset.quiet a true\n"
"para volverlo en el default.\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "No se puede reiniciar el índice a la revisión '%s'."
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "No se puede escribir un nuevo archivo índice."
@@ -21741,7 +21952,7 @@
" or: git rev-parse --sq-quote [<arg>...]\n"
" or: git rev-parse [<opciones>] [<arg>...]\n"
"\n"
-"Ejecute \"git rev-parse --parseopt -h\" para más información sobre el primer "
+"Ejecuta \"git rev-parse --parseopt -h\" para más información sobre el primer "
"uso."
#: builtin/rev-parse.c:712
@@ -21786,7 +21997,7 @@
#: builtin/rev-parse.c:1023
#, c-format
msgid "unknown mode for --show-object-format: %s"
-msgstr "modo desconocidopara --show-object-format: %s"
+msgstr "modo desconocido para --show-object-format: %s"
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
@@ -21862,15 +22073,19 @@
msgid "preserve initially empty commits"
msgstr "preservar commits iniciales vacíos"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "permitir commits con mensajes vacíos"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "mantener commits redundantes, vacíos"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "falló al revertir"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "cherry-pick falló"
@@ -21920,71 +22135,71 @@
msgstr[0] "el siguiente archivo tiene modificaciones locales:"
msgstr[1] "los siguientes archivos tienen modificaciones locales:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "no listar archivos eliminados"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "solo eliminar del índice"
-#: builtin/rm.c:246
-msgid "override the up-to-date check"
-msgstr "salta el check de actualización"
-
#: builtin/rm.c:247
+msgid "override the up-to-date check"
+msgstr "saltar el check de actualización"
+
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "permitir eliminar de forma recursiva"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "salir con estado cero incluso si nada coincide"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "No se entregó un pathspec. ¿Qué archivos se deberían eliminar?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"por favor agrega tus cambios a .gitmodules al stage o realiza un stash para "
"proceder"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "no eliminando '%s' de manera recursiva sin -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: no es posible eliminar %s"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all y especificaciones <ref> explícitas son mutuamente exclusivas."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directorio> (--all | <ref>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "nombre remoto"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "usar protocolo RPC sin estado"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "leer refs de stdin"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "mostrar status del remote helper"
@@ -22041,21 +22256,21 @@
msgid "group by field"
msgstr "agrupar por campo"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "demasiados argumentos dados fuera del repositorio"
#: builtin/show-branch.c:13
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -22068,114 +22283,114 @@
msgstr[0] "ignorando %s; no se puede manejar más de %d ref"
msgstr[1] "ignorando %s; no se puede manejar más de %d refs"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "no hay refs que concuerden con %s"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "mostrar ramas locales y de rastreo remoto"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "mostrar ramas de rastreo remoto"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "colorear '*!+-' correspondiendo a la rama"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "mostrar <n> commits más tras encontrar el ancestro común"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "sinónimo de más=-1"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "suprimir strings de nombre"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "incluir la rama actual"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "nombrar commits con sus nombres de objeto"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "mostrar bases de fusión posibles"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr "mostrar refs inalcanzables por ningún otro ref"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "mostrar commits en orden topológico"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr "mostrar solo commits que no estén en la primera rama"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "mostrar fusiones alcanzables por solo una punta"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr "orden topológico, manteniendo el orden de fechas donde sea posible"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog no es compatible con --all, --remotes, --independent o --merge-base"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "no se dieron ramas, y el HEAD no es válido"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "opción --reflog necesita un nombre de rama"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "solo %d entrada puede ser mostrada a la vez."
msgstr[1] "solo %d entradas pueden ser mostradas a la vez."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "no existe el ref %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "no se puede manejar más de %d rev."
msgstr[1] "no se puede manejar más de %d revs."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' no es una ref válida."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "no se puede encontrar el commit %s (%s)"
@@ -22246,72 +22461,86 @@
"este árbol de trabajo no es sparse (archivo sparse-checkout tal vez no "
"existe)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"directorio '%s' contiene archivos no rastreados, pero no está en el cono de "
+"sparse-checkout"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "falló al borrar directorio '%s'"
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr "falló al crear directorio para el archivo sparse-checkout"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
"no es posible actualizar el formato de repositorio para habilitar "
"worktreeConfig"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr "falló al configurar opción extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr "inicializa el sparse-checkout en modo cono"
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
msgid "toggle the use of a sparse index"
msgstr "activar el uso de un índice sparse"
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
msgid "failed to modify sparse-index config"
msgstr "falló al modificar la configuración del índice sparse"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "falló al abrir '%s'"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr "no se pudo normalizar la ruta %s"
-#: builtin/sparse-checkout.c:425
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)"
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "no es posible dequote la cadena de estilo C '%s'"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr "no se pudo cargar patrones de sparse-checkout existentes"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "leer patrones de standard in"
-#: builtin/sparse-checkout.c:588
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:607
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "error al refrescar directorio de trabajo"
@@ -22347,7 +22576,7 @@
" [--pathspec-from-file=<archivo> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22377,6 +22606,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n"
" [--] [<pathspec>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<mensaje>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22400,7 +22637,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear con argumentos no está implementado"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22412,172 +22649,172 @@
" %s ->%s\n"
" Para hacer espacio.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "no se puede aplicar un stash en medio de un merge"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "¡no se pudo generar diff %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
-msgstr "conflictos en índice. Intente sin --index."
+msgstr "conflictos en índice. Intenta sin --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "no se pudo guardar el árbol de índice"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "no se pudo restaurar archivos no rastreados de la entrada stash"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Fusionando %s con %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "El índice no fue sacado de stash."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "no se pudo restaurar archivos no rastreados de la entrada stash"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "intento de recrear el índice"
-#: builtin/stash.c:635
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "Descartado %s (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: No se pudo borrar entrada stash"
-#: builtin/stash.c:651
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' no es una referencia stash"
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente."
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "No se especificó el nombre de la rama"
-#: builtin/stash.c:808
+#: builtin/stash.c:824
msgid "failed to parse tree"
msgstr "falló al analizar el árbol"
-#: builtin/stash.c:819
+#: builtin/stash.c:835
msgid "failed to unpack trees"
msgstr "falló al desempaquetar árboles"
-#: builtin/stash.c:839
+#: builtin/stash.c:855
msgid "include untracked files in the stash"
msgstr "incluir archivos no rastreados en el stash"
-#: builtin/stash.c:842
+#: builtin/stash.c:858
msgid "only show untracked files in the stash"
msgstr "solo mostrar archivos no rastreados en el stash"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "No se puede actualizar %s con %s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "mensaje de stash"
-#: builtin/stash.c:957
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" requiere un argumento <commit>"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "Sin cambios seleccionados"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "Aún no tienes un commit inicial"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "No se puede guardar el estado actual del índice"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "No se pueden guardar los archivos no rastreados"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "No se puede guardar el estado actual del árbol de trabajo"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "No se puede grabar el estado del árbol de trabajo"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "¿Olvidaste 'git add'?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "No hay cambios locales para guardar"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "No se puede inicializar stash"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "No se puede guardar el estado actual"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Directorio de trabajo y estado de índice %s guardados"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "No se pueden eliminar cambios del árbol de trabajo"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "mantener index"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "stash en modo patch"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "modo tranquilo"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "incluir archivos sin seguimiento en stash"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "incluir archivos ignorados"
-#: builtin/stash.c:1700
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgstr ""
"¡el soporte para stash.useBuiltin ha sido eliminado!\n"
-"Vea su entrada en 'git help config' para detalles."
+"Mira su entrada en 'git help config' para detalles."
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
@@ -22596,7 +22833,7 @@
msgid "prepend comment character and space to each line"
msgstr "anteponer carácter de comentario y espacio a cada línea"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
@@ -22610,27 +22847,35 @@
msgid "cannot strip one component off url '%s'"
msgstr "no se puede quitar un componente del url '%s'"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
+"su propio upstream autoritario."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
msgid "alternative anchor for relative paths"
msgstr "ancho alternativo para rutas relativas"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:410
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:520
#, c-format
msgid "Entering '%s'\n"
msgstr "Entrando '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:523
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22639,7 +22884,7 @@
"run_command devolvió estado no cero para %s\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:545
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22650,79 +22895,70 @@
"anidados de %s\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command"
msgstr "suprime la salida de inicializar cada comando de submódulo"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
msgid "recurse into nested submodules"
msgstr "recursar en submódulos anidados"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:568
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
-"su propio upstream autoritativo."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Falló al registrar el url para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Error al registrar el modo de actualización para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr "suprime la salida de inicializar un submódulo"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opciones>] [<path>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "no se pudo resolver ref de HEAD dentro del submódulo '%s'"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "falló al recursar en el submódulo '%s'"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
msgstr "suprimir salida del estado del submódulo"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -22730,109 +22966,109 @@
"usar el commit guardado en el índice en lugar del guardado en el submódulo "
"HEAD"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <ruta>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodule)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodule)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "no se pudo realizar hash del objeto '%s'"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "modo %o inesperado\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
"usar el commit guardado en el índice en lugar del guardado en el submódulo "
"HEAD"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr ""
"usar el commit guardado en el índice para comparar con el guardado en el "
"submódulo HEAD"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "omitir submódulos con el valor 'ignore_config' establecido en 'all'"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "limitar el tamaño de resumen"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "no se puede obtener la revisión para HEAD"
-#: builtin/submodule--helper.c:1342
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "--cached y --files son mutuamente exclusivos"
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Sincronizando url del submódulo para '%s'\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "falló al registrar el url para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "error al conseguir el remoto por defecto para el submódulo '%s'"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "error al actualizar el remoto para el submódulo '%s'"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr "suprime la salida de sincronizar el url del submódulo"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
-"El árbol de trabajo de submódulo '%s' contiene un directorio .git (use 'rm -"
+"El árbol de trabajo de submódulo '%s' contiene un directorio .git (usa 'rm -"
"rf' si realmente quieres eliminarlo incluyendo todo en su historia)"
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22841,46 +23077,46 @@
"El árbol de trabajo de submódulo '%s' contiene modificaciones locales; usa '-"
"f' para descartarlas"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Directorio '%s' limpiado\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "No se pudo eliminar el árbol de trabajo de submódulo '%s'\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "no se pudo crear directorio vacío de submódulo %s"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"quitar árboles de trabajo de submódulos incluso si contienen cambios locales"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
msgstr "quitar todos los submódulos"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Usa '--all' si realmente quieres desinicializar todos los submódulos"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22889,72 +23125,72 @@
msgstr ""
"Una alternativa calculada a partir de la alternativa de un superproyecto no "
"es válida.\n"
-"Para permitir que Git clone sin una alternativa en ese caso, establezca\n"
-"submodule.alternateErrorStrategy a 'info' o, de manera equivalente, clonar "
+"Para permitir que Git clone sin una alternativa en ese caso, establece\n"
+"submodule.alternateErrorStrategy a 'info' o, de manera equivalente, clona "
"con\n"
"'--reference-if-able' en lugar de '--reference'."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submódulo '%s' no puede agregar alterno: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1771
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "rechazando crear/usar '%s' en el directorio de git de otro submódulo"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1812
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "clonación de '%s' en la ruta de submódulo '%s' falló"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1817
#, c-format
msgid "directory not empty: '%s'"
msgstr "directorio no está vacío: '%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1829
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "no se pudo obtener el directorio de submódulo para '%s'"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
msgstr "a donde el nuevo submódulo será clonado"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr "nombre del nuevo submódulo"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
msgstr "url de dónde clonar el submódulo"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "profundidad para clones superficiales"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "forzar el proceso de clonación"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "no permitir clonar en directorios no vacíos"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22964,83 +23200,182 @@
"<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --"
"url <url> --path <ruta>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Ruta de submódulo '%s' no inicializada"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "¿Tal vez quieres usar 'update --init'?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Saltando submódulo %s no fusionado"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Saltando submódulo '%s'"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Falló al clonar '%s'. Reintento programado"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Falló al clonar '%s' una segunda vez, abortando"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "No es posible revisar '%s' en la ruta de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "No es posible ejecutar rebase a '%s' en la ruta de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Incapaz de fusionar '%s' en la ruta del submódulo '%s'"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Falló la ejecución de '%s %s' en la ruta de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Ruta de submódulo '%s': check out realizado a '%s'\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Ruta de submódulo '%s': rebasado a '%s'\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Ruta de submódulo '%s': fusionado en '%s'\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Ruta de submódulo '%s': '%s %s'\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"No es posible realizar fetch en la ruta de submódulo '%s'; intentando hacer "
+"un fetch directo de %s:"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Fetch realizado en la ruta de submódulo '%s', pero no contenía %s. Fetch "
+"directo del commit falló."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "ruta al árbol de trabajo"
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr "ruta al árbol de trabajo, a través de fronteras de submódulos anidados"
-#: builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "crea un clon superficial truncado al número especificado de revisiones"
-#: builtin/submodule--helper.c:2360
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "tareas paralelas"
-#: builtin/submodule--helper.c:2362
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "si el clon inicial debe seguir la recomendación de superficialidad"
-#: builtin/submodule--helper.c:2363
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "no mostrar el progreso de clonación"
-#: builtin/submodule--helper.c:2374
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]"
-#: builtin/submodule--helper.c:2387
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "mal valor para parámetro update"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr "suprime la salida para actualización por rebase o fusión"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "forzar actualizaciones de checkout"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "no recuperar objetos nuevos del sitio remoto"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+"sobreescribe el modo de actualización en caso de que el respositorio sea un "
+"clon fresco"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "profundidad para recuperación superficial"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 esperado para superproyecto"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 del submódulo de HEAD"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<options>] <path>"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23049,144 +23384,194 @@
"Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero "
"el superproyecto no está en ninguna rama"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "no se pudo conseguir un handle de repositorio para el submódulo '%s'"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr "recurrir a submódulos"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "revisar si es seguro escribir al archivo .gitmodules"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
-msgstr "desconfigura la opción en el archivo .gitmodules"
+msgstr "desconfigurar la opción en el archivo .gitmodules"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <nombre> [<valor>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nombre>"
-#: builtin/submodule--helper.c:2663
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"por favor asegúrate que el archivo .gitmodules esté en el árbol de trabajo"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
msgstr "suprime la salida de inicializar la url de un submódulo"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "configurar la rama de rastreo por defecto a master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "configurar la rama de rastreo por defecto"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ruta>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <rama> <ruta>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "--branch o --default requerido"
-#: builtin/submodule--helper.c:2752
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "--branch y --default son mutuamente exclusivos"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3037
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Agregando el repositorio existente en '%s' al índice\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3040
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' ya existe y no es un repositorio git válido"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3053
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr ""
-"Se encontró localmente un directorio git para '%s' con el(los) remoto(s):"
+"Se encontró localmente un directorio git para '%s' con el(los) remoto(s):\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3060
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
-"Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n"
+"Si quieres reusar este directorio git local en lugar de clonar nuevamente "
+"de\n"
" %s\n"
"usa la opción '--force'. Si el directorio git local no es el repositorio "
"correcto\n"
"o no estás seguro de lo que esto significa, escoge otro nombre con la opción "
-"'--name'.\n"
+"'--name'."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3072
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Reactivando directorio git local para el submódulo '%s'.\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3109
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "no es posible hacer checkout al submódulo '%s'"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "la rama del repositorio para hacer checkout durante clonado"
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Falló al agregar el submódulo '%s'"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Falló al registrar el submódulo '%s'"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' ya existe en el índice"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' ya existe en el índice y no es un submódulo"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "rama del repositorio para agregar como submódulo"
+
+#: builtin/submodule--helper.c:3254
msgid "allow adding an otherwise ignored submodule path"
-msgstr "permitir agregar una ruta de submódulo sino ignorada"
+msgstr "permitir agregar una ruta de submódulo que de otro modo se ignora"
-#: builtin/submodule--helper.c:2917
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "mostrar solo mensajes de error"
+
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "prestar los objetos de los repositorios de referencia"
+
+#: builtin/submodule--helper.c:3262
msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
msgstr ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <ruta> --"
-"name <nombre>"
+"configura el nombre del submódulo para el string dado en lugar de ir a la "
+"ruta por defecto"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<options>] [--] <repository> [<path>]"
+
+#: builtin/submodule--helper.c:3297
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"La ruta relativa solo se puede usar desde el nivel superior del árbol de "
+"trabajo"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "repo URL: '%s' debe ser absoluta o iniciar con ./|../"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' no es un nombre de submódulo válido"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no soporta --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' no es un comando submodule--helper válido"
@@ -23211,21 +23596,21 @@
msgid "shorten ref output"
msgstr "salida de referencia más corta"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "razón"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "razón de la actualización"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <archivo>]\n"
-"\t\t<nombre-tag> [<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+" <tagname> [<head>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
@@ -23235,13 +23620,13 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <objeto>]\n"
-"\t\t[--format=<formato>] [--merged <commit>] [--no-merged <commit>] "
-"[<patrón>...]"
+"points-at <object>]\n"
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"[<pattern>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
@@ -23306,130 +23691,130 @@
msgid "bad object type."
msgstr "tipo de objeto erróneo."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "¿sin mensaje de tag?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "El mensaje del tag ha sido dejado en %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "listar nombres de tags"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "imprimir <n> líneas de cada mensaje de tag"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "eliminar tags"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "verificar tags"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Opciones de creación de tags"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "tags anotadas necesitan un mensaje"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "mensaje de tag"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "forzar la edición del mensaje de tag"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "tag anotado y firmado con GPG"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "usar otra clave para firmar el tag"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "remplazar tag si existe"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "crear un reflog"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Opciones de listado de tag"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "mostrar lista de tags en columnas"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "mostrar solo tags que contengan el commit"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "mostrar solo tags que no contengan el commit"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "solo imprimir las tags que estén fusionadas"
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "solo imprimir las tags que no estén fusionadas"
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "solo imprimir tags del objeto"
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column y -n son incompatibles"
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr "opción -n solo es permitida en modo lista"
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
msgstr "opción --contains solo es permitido en modo lista"
-#: builtin/tag.c:552
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
msgstr "opción --no-contains solo es permitida en modo lista"
-#: builtin/tag.c:554
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
msgstr "opción --points-at solo es permitida en modo lista"
-#: builtin/tag.c:556
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "opciones --merged y --no-merged solo están permitidas en modo lista"
-#: builtin/tag.c:567
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "solo se permite una de las opciones, -m o -F."
-#: builtin/tag.c:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' no es un nombre de tag válido."
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "el tag '%s' ya existe"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualizada (era %s)\n"
@@ -23443,202 +23828,197 @@
msgid "failed to create directory %s"
msgstr "falló al crear directorio %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "falló al crear el archivo %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "falló al eliminar el archivo %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "falló al eliminar directorio %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Probando mtime en '%s' "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "info de estado del directorio no cambia tras agregar un nuevo archivo"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"info de estado del directorio no cambia tras agregar un nuevo directorio"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "info de estado del directorio cambia tras actualizar un archivo"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"info de estado del directorio cambia tras agregar un archivo dentro del "
"subdirectorio"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "info de estado del directorio no cambia tras borrar un archivo"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "info de estado del directorio no cambia tras borrar un directorio"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opciones>] [--] [<archivo>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr ""
"continuar refresh (refrescamiento) incluso cuando el índice necesita "
"actualización"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "refresh: ignora submódulos"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "no ignorar archivos nuevos"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "permitir que archivos remplacen directorios y viceversa"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "avisar de archivos faltando del árbol de trabajo"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "refrescar información de estado"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "como --refresh, pero ignora configuración assume-unchanged"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "<modo>,<objeto>,<ruta>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "agregar la entrada especificada al índice"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "marcar archivos como \"not changing\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "limpiar bit assumed-unchanged"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "marcar archivos como \"index-only\""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "limpiar bit skip-worktree"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr "no tocar entradas index-only"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr ""
"agregar solo al índice; no agregar contenido a la base de datos de objetos"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr ""
"eliminar rutas nombradas incluso si están presentes en el árbol de trabajo"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "con --stdin: las líneas de entrada son terminadas con bytes nulos"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "leer la lista de rutas que actualizar desde standard input"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "agregar entradas de standard input al índice"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repoblar stages #2 y #3 para las rutas listadas"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "solo actualizar entradas que difieran de HEAD"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "ignorar archivos faltantes en el árbol de trabajo"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "reportar acciones por standard output"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(para porcelanas) olvidar conflictos guardados sin resolución"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "escribir índice en este formato"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "activar o desactivar índice dividido"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "habilitar o deshabilitar caché no rastreado"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr "probar si el filesystem soporta caché no rastreado"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr "habilitar caché no rastreado sin probar el filesystem"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr "escribir el índice incluso si no está marcado como cambiado"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr "activar o desactivar monitor de sistema de archivos"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "marcar archivos como válidos para fsmonitor"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
-msgstr "limpia el bit de validación fsmonitor"
+msgstr "limpiar el bit de validación fsmonitor"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -23646,7 +24026,7 @@
"core.splitIndex está configurado en false; quítalo o cámbialo, si realmente "
"quieres habilitar el índice partido"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -23654,7 +24034,7 @@
"core.splitIndex está configurado en true; quítalo o cámbialo, si realmente "
"quieres deshabilitar el índice partido"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23662,11 +24042,11 @@
"core.untrackedCache está configurado en true; quítalo o cámbialo, si "
"realmente quieres deshabilitar el chaché no rastreado"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "Caché no rastreado deshabilitado"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -23674,29 +24054,29 @@
"core.untrackedCache está configurado en false; quítalo o cámbialo, si "
"realmente quieres habilitar el caché no rastreado"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Caché no rastreado habilitado para '%s'"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor no está configurado; actívalo si realmente quieres habilitar "
"fsmonitor"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "fsmonitor activado"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor está configurado; quítalo si realmente quieres deshabilitar "
"el fsmonitor"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "fsmonitor desactivado"
@@ -23714,21 +24094,21 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opciones>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "eliminar la referencia"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
-msgstr "actualiza <refname> no la a que apunta"
+msgstr "actualizar <refname> no la a que apunta"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "stdin tiene argumentos terminados en NUL"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
-msgstr "lee actualizaciones de stdin"
+msgstr "leer actualizaciones de stdin"
#: builtin/update-server-info.c:7
msgid "git update-server-info [--force]"
@@ -23736,25 +24116,25 @@
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
-msgstr "actualiza los archivos info desde cero"
+msgstr "actualizar los archivos info desde cero"
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opciones>] <directorio>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
-msgstr "sale después de un solo intercambio petición/respuesta"
+msgstr "salir después de un solo intercambio petición/respuesta"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "salir inmediatamente tras el anuncio inicial de ref"
-
-#: builtin/upload-pack.c:27
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "servir los info/refs para git-http-backend"
#: builtin/upload-pack.c:29
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "no probar <directorio>/.git/ si <directorio> no es un directorio Git"
+
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrumpir transferencia tras <n> segundos de inactividad"
@@ -23768,7 +24148,7 @@
#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
-msgstr "muestra la salida de status gpg en formato raw"
+msgstr "mostrar la salida de status gpg en formato raw"
#: builtin/verify-pack.c:59
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
@@ -23790,63 +24170,58 @@
msgid "print tag contents"
msgstr "imprimir contenido del tag"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<opciones>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<opciones>] <ruta>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <worktree> <nueva-ruta>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opciones>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<opciones>] <worktree>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <ruta>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "falló al borrar '%s'"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Eliminando %s/%s: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
-msgstr "reporta árboles de trabajo recortados"
+msgstr "reportar árboles de trabajo recortados"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "caducar árboles de trabajo más viejos a <tiempo>"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "'%s' ya existe"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "destino de worktree inutilizable '%s'"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23856,7 +24231,7 @@
"usa '%s -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para "
"limpiar"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23865,219 +24240,219 @@
"'%s' es un árbol de trabajo faltante pero ya registrado;\n"
"usa '%s -f' para sobreescribir, o 'prune' o 'remove' para limpiar"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "no se pudo crear directorio de '%s'"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr "inicializando"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Preparando árbol de trabajo (nueva rama '%s')"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"hacer checkout a <rama> incluso si ya hay checkout de ella en otro árbol de "
"trabajo"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "crear una nueva rama"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "crear o restablecer una rama"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "popular el nuevo árbol de trabajo"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "mantener el nuevo árbol de trabajo bloqueado"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr "razón para bloquear"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr "configurando modo tracking (mirar git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
"intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto"
-#: builtin/worktree.c:506
+#: builtin/worktree.c:507
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B, y --detach son mutuamente exclusivas"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:509
msgid "--reason requires --lock"
msgstr "--reason requiere --lock"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:513
msgid "added with --lock"
msgstr "agregado con --lock"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track solo puede ser usado si una nueva rama es creada"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:692
msgid "show extended annotations and reasons, if available"
msgstr "mostrar anotaciones ampliadas y motivos, si están disponibles"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:694
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
-"agregue la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>"
+"agregar la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>"
-#: builtin/worktree.c:702
+#: builtin/worktree.c:703
msgid "--verbose and --porcelain are mutually exclusive"
msgstr "--verbose and --porcelain son mutuamente exclusivas"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' no es un árbol de trabajo"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ya está bloqueado; razón: %s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ya está bloqueado"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' no está bloqueado"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"árboles de trabajo conteniendo submódulos no pueden ser movidos o eliminados"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' es un árbol de trabajo principal"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "no se pudo descubrir el nombre de destino de '%s'"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
"no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n"
-"use 'move -f -f' para forzar o desbloquear primero"
+"usa 'move -f -f' para forzar o desbloquear primero"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
"no se puede mover un árbol de trabajo bloqueado;\n"
-"use 'move -f -f' para forzar o desbloquear primero"
+"usa 'move -f -f' para forzar o desbloquear primero"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "falló validación, no se puede mover el árbol de trabajo: %s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "falló al mover '%s' a '%s'"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "falló al ejecutar 'git status' en '%s'"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-"'%s' contiene archivos modificados o no rastreados, use --force para borrarlo"
+"'%s' contiene archivos modificados o no rastreados, usa --force para borrarlo"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "no se pudo ejecutar 'git status' en '%s', código %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"forzar eliminación incluso si el árbol de trabajo está sucio o bloqueado"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
"no se puede eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n"
-"use 'remove -f -f' para forzar o desbloquear primero"
+"usa 'remove -f -f' para forzar o desbloquear primero"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
"no se pueden eliminar árbol de trabajo bloqueado;\n"
-"use 'remove -f -f' para forzar o desbloquear primero"
+"usa 'remove -f -f' para forzar o desbloquear primero"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "falló validación, no se puede eliminar árbol de trabajo: %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr "reparar: %s: %s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr "error: %s: %s"
@@ -24125,7 +24500,7 @@
"See 'git help git' for an overview of the system."
msgstr ""
"'git help -a' y 'git help -g' listan los subcomandos disponibles y algunas\n"
-"guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
+"guías de concepto. Consulta 'git help <command>' o 'git help <concepto>'\n"
"para leer sobre un subcomando o concepto específico.\n"
"Mira 'git help git' para una vista general del sistema."
@@ -24205,17 +24580,17 @@
msgid "close failed on standard output"
msgstr "cierre falló en standard output"
-#: git.c:833
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "bucle de alias detectado: expansión de '%s' no termina: %s"
-#: git.c:883
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "no se puede manejar %s como un builtin"
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -24226,12 +24601,12 @@
"\n"
"\n"
-#: git.c:916
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n"
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "falló al ejecutar comando '%s': %s\n"
@@ -24278,67 +24653,33 @@
msgid "exit immediately after advertising capabilities"
msgstr "salir inmediatamente tras anunciar capacidades"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "socket/pipe ya está en uso: '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "no se pudo iniciar el servidor en: '%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "no se puede generar demonio en el background"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "falló waitpid"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "demonio no está en línea todavía"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "falló al iniciar demonio"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid está confundido"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "demonio no se ha apagado todavía"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<nombre>] [<opciones>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<nombre>] [<hilos>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
"test-helper simple-ipc start-daemon [<nombre>] [<hilos>] [<espera-maxima>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<nombre>] [<espera-maxima>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<nombre>] [<token>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr ""
"test-helper simple-ipc sendbytes [<nombre>] [<cuenta de bytes>] [<byte>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24346,85 +24687,81 @@
"test-helper simple-ipc multiple [<nombre>] [<hilos>] [<cuenta de bytes>] "
"[<tamaño de batch>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "nombre o ruta de nombre de socket de dominio unix"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "nombre de named-pipe"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "número de hilos en el pool de hilos del servidor"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "segundos a esperar para que el dominio empiece o se detenga"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "número de bytes"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
-msgstr "númeor de peticiones por hilo"
+msgstr "número de peticiones por hilo"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "byte"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
-msgstr "caracter lastre"
+msgstr "carácter lastre"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "token"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
-msgstr "comando token para enviar al servidor"
+msgstr "token de comando para enviar al servidor"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "valor negativo para http.postbuffer; poniendo el default %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegación de control no es soportada con cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Fijación de llave pública no es soportada con cURL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Restricción de protocolo no soportada con cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"No se pudo configurar backend SSL a '%s': cURL fue construido sin backends "
"SSL"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "No se pudo configurar backend SSL para '%s': ya configurado"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24440,47 +24777,53 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr "quoting inválido en valor de push-option: '%s'"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs no es válido: ¿es este un repositorio git?"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"respuesta de servidor inválida; se esperaba servicio, se obtuvo un flush "
"packet"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "respuesta de servidor inválida; se obtuvo '%s'"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "repositorio '%s' no encontrado"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Autenticación falló para '%s'"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+"no es posible acceder a '%s' con la configuración http.pinnedPubkey: %s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "no es posible acceder a '%s': %s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "redirigiendo a %s"
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "no se debería tener EOF cuando no es laxo con EOF"
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr "el servidor remoto envió una respuesta de fin de paquete inesperada"
@@ -24489,83 +24832,83 @@
msgstr ""
"no es posible rebobinar rpc post data - intenta incrementar http.postBuffer"
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: mal carácter de largo de línea: %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: packet de respuesta final inesperado"
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "RPC falló; %s"
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "no se puede manejar pushes tan grandes"
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "no se puede desinflar el request; zlib deflate error %d"
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "no se puede desinflar el request; zlib end error %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "%d bytes de header de longitud fueron recibidos"
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "%d bytes de cuerpo se siguen esperando"
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "dump http transport no soporta capacidades superficiales"
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "fetch falló."
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "no se puede hacer fetch por sha1 sobre smart http"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "http transport no soporta %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "git-http-push falló"
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: uso: git remote-curl <remote> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: error al leer command stream de git"
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: fetch intentado sin un repositorio local"
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: comando '%s' desconocido de git"
@@ -24586,46 +24929,46 @@
msgid "object filtering"
msgstr "filtrado de objeto"
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr "fecha de caducidad"
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "no-op (compatibilidad con versiones anteriores)"
-#: parse-options.h:310
+#: parse-options.h:309
msgid "be more verbose"
msgstr "ser más verboso"
-#: parse-options.h:312
+#: parse-options.h:311
msgid "be more quiet"
msgstr "ser más callado"
-#: parse-options.h:318
+#: parse-options.h:317
msgid "use <n> digits to display object names"
-msgstr "use <n> cifras para mostrar los nombres de los objetos"
+msgstr "usar <n> cifras para mostrar los nombres de los objetos"
-#: parse-options.h:337
+#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
msgstr "cómo quitar espacios y #comentarios de mensajes"
-#: parse-options.h:338
+#: parse-options.h:337
msgid "read pathspec from file"
msgstr "leer pathspec de archivo"
-#: parse-options.h:339
+#: parse-options.h:338
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
-"con --pathspec-from-file, elementos de pathspec son separados con caracter "
+"con --pathspec-from-file, elementos de pathspec son separados con carácter "
"NUL"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "clave"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "nombre del campo por el cuál ordenar"
@@ -24637,7 +24980,7 @@
#: command-list.h:50
msgid "Add file contents to the index"
-msgstr "Agrega contenido de archivos al índice"
+msgstr "Agregar contenido de archivos al índice"
#: command-list.h:51
msgid "Apply a series of patches from a mailbox"
@@ -24661,7 +25004,7 @@
#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
-msgstr "Use la búsqueda binaria para encontrar el commit que introdujo el bug"
+msgstr "Usar la búsqueda binaria para encontrar el commit que introdujo el bug"
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
@@ -24670,7 +25013,7 @@
#: command-list.h:58
msgid "List, create, or delete branches"
-msgstr "Lista, crea, o borra ramas"
+msgstr "Listar, crear, o borrar ramas"
#: command-list.h:59
msgid "Collect information for user to file a bug report"
@@ -24701,7 +25044,7 @@
#: command-list.h:65
msgid "Switch branches or restore working tree files"
-msgstr "Cambia de rama o restaura archivos del árbol de trabajo"
+msgstr "Cambiar de rama o restaura archivos del árbol de trabajo"
#: command-list.h:66
msgid "Copy files from the index to the working tree"
@@ -24709,15 +25052,15 @@
#: command-list.h:67
msgid "Ensures that a reference name is well formed"
-msgstr "Asegura que un nombre de referencia esté bien formado"
+msgstr "Asegurar que un nombre de referencia esté bien formado"
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
-msgstr "Encuentra commits que falten aplicar en upstream"
+msgstr "Encontrar commits que falten aplicar en upstream"
#: command-list.h:69
msgid "Apply the changes introduced by some existing commits"
-msgstr "Aplica los cambios introducidos por algunos commits existentes"
+msgstr "Aplicar los cambios introducidos por algunos commits existentes"
#: command-list.h:70
msgid "Graphical alternative to git-commit"
@@ -24729,7 +25072,7 @@
#: command-list.h:72
msgid "Clone a repository into a new directory"
-msgstr "Clona un repositorio dentro de un nuevo directorio"
+msgstr "Clonar un repositorio dentro de un nuevo directorio"
#: command-list.h:73
msgid "Display data in columns"
@@ -24737,15 +25080,15 @@
#: command-list.h:74
msgid "Record changes to the repository"
-msgstr "Graba los cambios al repositorio"
+msgstr "Grabar los cambios al repositorio"
#: command-list.h:75
msgid "Write and verify Git commit-graph files"
-msgstr "Escribe y verifica los archivos commit-graph de Git"
+msgstr "Escribir y verificar los archivos commit-graph de Git"
#: command-list.h:76
msgid "Create a new commit object"
-msgstr "Crea un nuevo objeto commit"
+msgstr "Crear un nuevo objeto commit"
#: command-list.h:77
msgid "Get and set repository or global options"
@@ -24769,11 +25112,11 @@
#: command-list.h:82
msgid "Export a single commit to a CVS checkout"
-msgstr "Exporta un commit único a CVS checkout"
+msgstr "Exportar un commit único a CVS checkout"
#: command-list.h:83
msgid "Salvage your data out of another SCM people love to hate"
-msgstr "Salva tus datos de otro SCM que la gente adora odiar"
+msgstr "Salvar tus datos de otro SCM que la gente adora odiar"
#: command-list.h:84
msgid "A CVS server emulator for Git"
@@ -24791,20 +25134,20 @@
#: command-list.h:87
msgid "Show changes between commits, commit and working tree, etc"
-msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc"
+msgstr "Mostrar los cambios entre commits, commit y árbol de trabajo, etc"
#: command-list.h:88
msgid "Compares files in the working tree and the index"
-msgstr "Compara archivos del árbol de trabajo y del índice"
+msgstr "Comparar archivos del árbol de trabajo y del índice"
#: command-list.h:89
msgid "Compare a tree to the working tree or index"
-msgstr "Compara un árbol con el árbol de trabajo o índice"
+msgstr "Comparar un árbol con el árbol de trabajo o índice"
#: command-list.h:90
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
-"Compara el contenido y el modo de blobs encontrados a través de dos objetos "
+"Comparar el contenido y el modo de blobs encontrados a través de dos objetos "
"de árbol"
#: command-list.h:91
@@ -24821,11 +25164,11 @@
#: command-list.h:94
msgid "Download objects and refs from another repository"
-msgstr "Descarga objetos y referencias de otro repositorio"
+msgstr "Descargar objetos y referencias de otro repositorio"
#: command-list.h:95
msgid "Receive missing objects from another repository"
-msgstr "Descarga objetos faltantes de otro repositorio"
+msgstr "Descargar objetos faltantes de otro repositorio"
#: command-list.h:96
msgid "Rewrite branches"
@@ -24833,7 +25176,7 @@
#: command-list.h:97
msgid "Produce a merge commit message"
-msgstr "Produce un mensaje de commit de fusión"
+msgstr "Producir un mensaje de commit de fusión"
#: command-list.h:98
msgid "Output information on each ref"
@@ -24841,28 +25184,28 @@
#: command-list.h:99
msgid "Run a Git command on a list of repositories"
-msgstr "Ejecute un comando de Git en una lista de repositorios"
+msgstr "Ejecutar un comando de Git en una lista de repositorios"
#: command-list.h:100
msgid "Prepare patches for e-mail submission"
-msgstr "Prepara parches para ser enviados por e-mail"
+msgstr "Preparar parches para ser enviados por e-mail"
#: command-list.h:101
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
-"Verifica la conectividad y disponibilidad de los objetos en la base de datos"
+"Verificar la conectividad y disponibilidad de los objetos en la base de datos"
#: command-list.h:102
msgid "Cleanup unnecessary files and optimize the local repository"
-msgstr "Limpia archivos innecesarios y optimiza el repositorio local"
+msgstr "Limpiar archivos innecesarios y optimiza el repositorio local"
#: command-list.h:103
msgid "Extract commit ID from an archive created using git-archive"
-msgstr "Extrae el ID de commit de una crónica creada usando git-archive"
+msgstr "Extraer el ID de commit de una crónica creada usando git-archive"
#: command-list.h:104
msgid "Print lines matching a pattern"
-msgstr "Imprime las líneas que concuerden con el patrón"
+msgstr "Imprimir las líneas que concuerden con el patrón"
#: command-list.h:105
msgid "A portable graphical interface to Git"
@@ -24870,7 +25213,7 @@
#: command-list.h:106
msgid "Compute object ID and optionally creates a blob from a file"
-msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo"
+msgstr "Computar ID de objeto y, opcionalmente, crear un blob de un archivo"
#: command-list.h:107
msgid "Display help information about Git"
@@ -24882,11 +25225,11 @@
#: command-list.h:109
msgid "Download from a remote Git repository via HTTP"
-msgstr "Descarga de un repositorio Git remoto vía HTTP"
+msgstr "Descargar de un repositorio Git remoto vía HTTP"
#: command-list.h:110
msgid "Push objects over HTTP/DAV to another repository"
-msgstr "Empuja objetos por HTTP/DAV a otro repositorio"
+msgstr "Empujar objetos por HTTP/DAV a otro repositorio"
#: command-list.h:111
msgid "Send a collection of patches from stdin to an IMAP folder"
@@ -24894,11 +25237,11 @@
#: command-list.h:112
msgid "Build pack index file for an existing packed archive"
-msgstr "Construye un archivo de índice para una crónica empaquetada existente"
+msgstr "Construir un archivo de índice para una crónica empaquetada existente"
#: command-list.h:113
msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe"
+msgstr "Crear un repositorio de Git vacío o reinicia el que ya existe"
#: command-list.h:114
msgid "Instantly browse your working repository in gitweb"
@@ -24914,19 +25257,19 @@
#: command-list.h:117
msgid "Show commit logs"
-msgstr "Muestra los logs de los commits"
+msgstr "Mostrar los logs de los commits"
#: command-list.h:118
msgid "Show information about files in the index and the working tree"
-msgstr "Muestra información sobre archivos en el índice y el árbol de trabajo"
+msgstr "Mostrar información sobre archivos en el índice y el árbol de trabajo"
#: command-list.h:119
msgid "List references in a remote repository"
-msgstr "Lista referencias en un repositorio remoto"
+msgstr "Listar referencias en un repositorio remoto"
#: command-list.h:120
msgid "List the contents of a tree object"
-msgstr "Lista los contenidos de un objeto árbol"
+msgstr "Listar los contenidos de un objeto árbol"
#: command-list.h:121
msgid "Extracts patch and authorship from a single e-mail message"
@@ -24938,23 +25281,23 @@
#: command-list.h:123
msgid "Run tasks to optimize Git repository data"
-msgstr "Ejecute tareas para optimizar los datos del repositorio de Git"
+msgstr "Ejecutar tareas para optimizar los datos del repositorio de Git"
#: command-list.h:124
msgid "Join two or more development histories together"
-msgstr "Junta dos o más historiales de desarrollo juntos"
+msgstr "Juntar dos o más historiales de desarrollo juntos"
#: command-list.h:125
msgid "Find as good common ancestors as possible for a merge"
-msgstr "Encuentra ancestros tan buenos como posible para una fusión"
+msgstr "Encontrar ancestros tan buenos como posible para una fusión"
#: command-list.h:126
msgid "Run a three-way file merge"
-msgstr "Ejecuta una fusión de tres vías en un archivo"
+msgstr "Ejecutar una fusión de tres vías en un archivo"
#: command-list.h:127
msgid "Run a merge for files needing merging"
-msgstr "Ejecuta una fusión para archivos que la necesiten"
+msgstr "Ejecutar una fusión para archivos que la necesiten"
#: command-list.h:128
msgid "The standard helper program to use with git-merge-index"
@@ -24963,8 +25306,8 @@
#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
-"Ejecuta las herramientas de fusión de resolución de conflictos para resolver "
-"conflictos de fusión"
+"Ejecutar las herramientas de fusión de resolución de conflictos para "
+"resolver conflictos de fusión"
#: command-list.h:130
msgid "Show three-way merge without touching index"
@@ -24972,11 +25315,11 @@
#: command-list.h:131
msgid "Write and verify multi-pack-indexes"
-msgstr "Escribe y verifica archivos multi-pack-index"
+msgstr "Escribir y verificar archivos multi-pack-index"
#: command-list.h:132
msgid "Creates a tag object with extra validation"
-msgstr "Crea un objeto de etiqueta con validación adicional"
+msgstr "Crear un objeto de etiqueta con validación adicional"
#: command-list.h:133
msgid "Build a tree-object from ls-tree formatted text"
@@ -24984,7 +25327,7 @@
#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
-msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos"
+msgstr "Mover o cambiar el nombre a archivos, directorios o enlaces simbólicos"
#: command-list.h:135
msgid "Find symbolic names for given revs"
@@ -24992,7 +25335,7 @@
#: command-list.h:136
msgid "Add or inspect object notes"
-msgstr "Agrega o inspecciona notas de objeto"
+msgstr "Agregar o inspeccionar notas de objeto"
#: command-list.h:137
msgid "Import from and submit to Perforce repositories"
@@ -25000,15 +25343,15 @@
#: command-list.h:138
msgid "Create a packed archive of objects"
-msgstr "Crea una crónica de objetos empaquetada"
+msgstr "Crear una crónica de objetos empaquetada"
#: command-list.h:139
msgid "Find redundant pack files"
-msgstr "Encuentra archivos de paquete redundantes"
+msgstr "Encontrar archivos de paquete redundantes"
#: command-list.h:140
msgid "Pack heads and tags for efficient repository access"
-msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio"
+msgstr "Empaquetar heads y tags para un acceso eficiente al repositorio"
#: command-list.h:141
msgid "Compute unique ID for a patch"
@@ -25016,7 +25359,8 @@
#: command-list.h:142
msgid "Prune all unreachable objects from the object database"
-msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos"
+msgstr ""
+"Limpiar todos los objetos no alcanzables de la base de datos de objetos"
#: command-list.h:143
msgid "Remove extra objects that are already in pack files"
@@ -25024,27 +25368,27 @@
#: command-list.h:144
msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "Realiza un fetch e integra con otro repositorio o rama local"
+msgstr "Realizar un fetch e integra con otro repositorio o rama local"
#: command-list.h:145
msgid "Update remote refs along with associated objects"
-msgstr "Actualiza referencias remotas junto con sus objetos asociados"
+msgstr "Actualizar referencias remotas junto con sus objetos asociados"
#: command-list.h:146
msgid "Applies a quilt patchset onto the current branch"
-msgstr "Aplica un parche quilt en la rama actual"
+msgstr "Aplicar un parche quilt en la rama actual"
#: command-list.h:147
msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)"
+msgstr "Comparar dos rangos de commits (por ejemplo dos versions de un branch)"
#: command-list.h:148
msgid "Reads tree information into the index"
-msgstr "Lee información del árbol al índice"
+msgstr "Leer información del árbol al índice"
#: command-list.h:149
msgid "Reapply commits on top of another base tip"
-msgstr "Vuelve a aplicar commits en la punta de otra rama"
+msgstr "Volver a aplicar commits en la punta de otra rama"
#: command-list.h:150
msgid "Receive what is pushed into the repository"
@@ -25056,7 +25400,7 @@
#: command-list.h:152
msgid "Manage set of tracked repositories"
-msgstr "Gestiona un conjunto de repositorios rastreados"
+msgstr "Gestionar un conjunto de repositorios rastreados"
#: command-list.h:153
msgid "Pack unpacked objects in a repository"
@@ -25064,11 +25408,11 @@
#: command-list.h:154
msgid "Create, list, delete refs to replace objects"
-msgstr "Crea, lista, borra referencias para reemplazar objetos"
+msgstr "Crear, listar, borrar referencias para reemplazar objetos"
#: command-list.h:155
msgid "Generates a summary of pending changes"
-msgstr "Genera un resumen de cambios pendientes"
+msgstr "Generar un resumen de cambios pendientes"
#: command-list.h:156
msgid "Reuse recorded resolution of conflicted merges"
@@ -25076,7 +25420,7 @@
#: command-list.h:157
msgid "Reset current HEAD to the specified state"
-msgstr "Reinicia el HEAD actual a un estado específico"
+msgstr "Reiniciar el HEAD actual a un estado específico"
#: command-list.h:158
msgid "Restore working tree files"
@@ -25084,11 +25428,11 @@
#: command-list.h:159
msgid "Revert some existing commits"
-msgstr "Revierte algunos commits existentes"
+msgstr "Reviertir algunos commits existentes"
#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
-msgstr "Lista objetos commit en orden cronológico inverso"
+msgstr "Listar objetos commit en orden cronológico inverso"
#: command-list.h:161
msgid "Pick out and massage parameters"
@@ -25096,11 +25440,11 @@
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
-msgstr "Borra archivos del árbol de trabajo y del índice"
+msgstr "Borrar archivos del árbol de trabajo y del índice"
#: command-list.h:163
msgid "Send a collection of patches as emails"
-msgstr "Envía una colección de parches como e-mails"
+msgstr "Enviar una colección de parches como e-mails"
#: command-list.h:164
msgid "Push objects over Git protocol to another repository"
@@ -25116,7 +25460,7 @@
#: command-list.h:167
msgid "Show various types of objects"
-msgstr "Muestra varios tipos de objetos"
+msgstr "Mostrar varios tipos de objetos"
#: command-list.h:168
msgid "Show branches and their commits"
@@ -25140,7 +25484,7 @@
#: command-list.h:173
msgid "Initialize and modify the sparse-checkout"
-msgstr "Inicializa y modifica el sparse-checkout"
+msgstr "Inicializar y modificar el sparse-checkout"
#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
@@ -25148,11 +25492,11 @@
#: command-list.h:175
msgid "Add file contents to the staging area"
-msgstr "Agrega contenidos de un archivo al área de staging"
+msgstr "Agregar contenidos de un archivo al área de staging"
#: command-list.h:176
msgid "Show the working tree status"
-msgstr "Muestra el estado del árbol de trabajo"
+msgstr "Mostrar el estado del árbol de trabajo"
#: command-list.h:177
msgid "Remove unnecessary whitespace"
@@ -25160,7 +25504,7 @@
#: command-list.h:178
msgid "Initialize, update or inspect submodules"
-msgstr "Inicializa, actualiza o inspecciona submódulos"
+msgstr "Inicializar, actualizar o inspeccionar submódulos"
#: command-list.h:179
msgid "Bidirectional operation between a Subversion repository and Git"
@@ -25172,33 +25516,33 @@
#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
-msgstr "Lee, modifica y borra referencias simbólicas"
+msgstr "Leer, modificar y borrar referencias simbólicas"
#: command-list.h:182
msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Crea, lista, borra o verifica un objeto de tag firmado con GPG"
+msgstr "Crear, listar, borrar o verificar un objeto de tag firmado con GPG"
#: command-list.h:183
msgid "Creates a temporary file with a blob's contents"
-msgstr "Crea un archivo temporal con contenidos de un blob"
+msgstr "Crear un archivo temporal con contenidos de un blob"
#: command-list.h:184
msgid "Unpack objects from a packed archive"
-msgstr "Desempaqueta objetos de una crónica empaquetada"
+msgstr "Desempaquetar objetos de una crónica empaquetada"
#: command-list.h:185
msgid "Register file contents in the working tree to the index"
-msgstr "Registra contenidos de archivos en el árbol de trabajo al índice"
+msgstr "Registrar contenidos de archivos en el árbol de trabajo al índice"
#: command-list.h:186
msgid "Update the object name stored in a ref safely"
msgstr ""
-"Actualiza el nombre del objeto almacenado en una referencia de forma segura"
+"Actualizar el nombre del objeto almacenado en una referencia de forma segura"
#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-"Actualiza el archivo de información auxiliar para ayudar a los servidores "
+"Actualizar el archivo de información auxiliar para ayudar a los servidores "
"dumb"
#: command-list.h:188
@@ -25219,11 +25563,11 @@
#: command-list.h:192
msgid "Validate packed Git archive files"
-msgstr "Valida crónicas Git empaquetadas"
+msgstr "Validar crónicas Git empaquetadas"
#: command-list.h:193
msgid "Check the GPG signature of tags"
-msgstr "Verifica la firma GPG de etiquetas"
+msgstr "Verificar la firma GPG de etiquetas"
#: command-list.h:194
msgid "Git web interface (web frontend to Git repositories)"
@@ -25231,15 +25575,15 @@
#: command-list.h:195
msgid "Show logs with difference each commit introduces"
-msgstr "Muestra logs con las diferencias que cada commit introduce"
+msgstr "Mostrar logs con las diferencias que cada commit introduce"
#: command-list.h:196
msgid "Manage multiple working trees"
-msgstr "Gestiona múltiples árboles de trabajo"
+msgstr "Gestionar múltiples árboles de trabajo"
#: command-list.h:197
msgid "Create a tree object from the current index"
-msgstr "Crea un objeto árbol del índice actual"
+msgstr "Crear un objeto árbol del índice actual"
#: command-list.h:198
msgid "Defining attributes per path"
@@ -25283,7 +25627,7 @@
#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
-msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
+msgstr "Especificar de forma intencional archivos sin seguimiento a ignorar"
#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
@@ -25327,41 +25671,6 @@
msgid "An overview of recommended workflows with Git"
msgstr "Una visión general de flujos de trabajo recomendados con Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "bisect falló: no se proveyó comando."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "ejecutando $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"bisect falló:\n"
-"código de salida $res de '$command' es <0 o >=128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "bisect no puede seguir continuando"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"bisect run falló:\n"
-"'bisect-state $state' salió con el código de error $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "bisect exitoso"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25402,55 +25711,19 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Fusión simple no funcionó, intentando fusión automática."
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"La ruta relativa solo se puede usar desde el nivel superior del árbol de "
-"trabajo"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' ya existe en el índice"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' ya existe en el índice y no es un submódulo"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' no tiene un commit checked out"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Falló al agregar el submódulo '$sm_path'"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Falló al registrar el submódulo '$sm_path'"
-
-#: git-submodule.sh:532
+#: git-submodule.sh:401
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"No se pudo encontrar la revisión actual en la ruta de submódulo "
"'$displaypath'"
-#: git-submodule.sh:542
+#: git-submodule.sh:411
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'"
-#: git-submodule.sh:547
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25459,402 +25732,11 @@
"No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
"de submódulo '$sm_path'"
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"No es posible realizar fetch en la ruta de submódulo '$displaypath'; "
-"intentando hacer un fetch directo de $sha1:"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Fetch realizado en la ruta de submódulo '$displaypath', pero no contenía "
-"$sha1. Fetch directo del commit falló."
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'"
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"No es posible ejecutar rebase a '$sha1' en la ruta de submódulo "
-"'$displaypath'"
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Ruta de submódulo '$displaypath': rebasado a '$sha1'"
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'"
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Ruta de submódulo '$displaypath': fusionado en '$sha1'"
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Falló la ejecución de '$command $sha1' en la ruta de submódulo '$displaypath'"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
-
-#: git-submodule.sh:627
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Autostash aplicado."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "No se puede almacenar $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"Aplicar autostash resultó en conflictos.\n"
-"Tus cambios están seguros en el stash.\n"
-"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
-"momento.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Rebasando ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Comandos:\n"
-"p, pick <commit> = usar commit\n"
-"r, reword <commit> = usar commit, pero editar el mensaje de commit\n"
-"e, edit <commit> = usar commit, pero parar para un amend\n"
-"s, squash <commit> = usar commit, pero fusionarlo en el commit previo\n"
-"f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de "
-"este commit\n"
-"x, exec <commit> = ejecuta comando (el resto de la línea) usando un shell\n"
-"d, drop <commit> = eliminar commit\n"
-"l, label <label> = poner label al HEAD actual con un nombre\n"
-"t, reset <label> = reiniciar HEAD al label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". crea un commit de fusión usando el mensaje original de\n"
-". fusión (o la línea de oneline, si no se especifica un mensaje\n"
-". de commit). Use -c <commit> para reescribir el mensaje del commit.\n"
-"\n"
-"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
-"abajo.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Puedes enmendar el commit ahora, con\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Una vez que estés satisfecho con los cambios, ejecuta\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: no es un commit que pueda ser cogido"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nombre de commit inválido: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "No se puede escribir el remplazo sha1 del commit actual"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Avance rápido a $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "No se puede realizar avance rápido a $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "No se puede mover HEAD a $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Rehusando ejecutar squash en fusión: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Error al rehacer fusión $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "No se pudo coger $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Este es el mensaje del commit #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "El mensaje del commit #${n} será ignorado:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Esta es una combinación de $count commit."
-msgstr[1] "Esta es la combinación de $count commits."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "No se puede escribir $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Esto es una combinación de 2 commits."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "No se pudo aplicar $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"No se pudo corregir commit después de seleccionar exitosamente $sha1 ... "
-"$rest\n"
-"Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-"
-"commit\n"
-"ha fallado. Si el hook pre-commit falló, es posible que debas resolver el "
-"problema antes\n"
-"de que sea capaz de reformular el commit."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Detenido en $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "No se puede '$squash_style' sin un commit previo"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Ejecutando: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Ejecución fallida: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "y hizo cambios al índice y/o al árbol de trabajo"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Puedes corregir el problema y entonces ejecutar\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"La ejecución tuvo éxito: $rest\n"
-"Pero dejó cambios en el índice y/o en el árbol de trabajo\n"
-"Realiza un commit o stash con los cambios y, a continuación, ejecuta\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Comando desconocido: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "$head_name rebasado y actualizado satisfactoriamente."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "No se pudo eliminar CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Tienes cambios en el área de stage de tu árbol de trabajo.\n"
-"Si estos cambios están destinados a\n"
-"ser aplastados en el commit previo, ejecuta:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Si estos están destinados a ir en un nuevo commit, ejecuta:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"En ambos casos, cuando termines, continue con:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-"Error al tratar de encontrar la identidad del autor para remediar el commit"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n"
-"primero y entonces ejecuta 'git rebase --continue' de nuevo."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "No se pudo realizar el commit con los cambios en el área de stage."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "No se pudo ejecutar el editor"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "¿Sin HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "No se pudo crear $state_dir temporalmente"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "No se pudo marcar como interactivo"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
-msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Tenga en cuenta que los commits vacíos están comentados"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "No se pudo inicializar los commits reescritos"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -25872,55 +25754,32 @@
msgstr "fatal: $program_name no puede ser usado sin un árbol de trabajo."
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr ""
-"No se puede aplicar rebase: Tienes cambios que no están en el área de stage."
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"No se puede reescribir las ramas: Tienes cambios que no están en el área de "
"stage."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"No se puede aplicar pull con rebase: Tienes cambios que no están en el área "
-"de stage."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "No se puede $action: Tienes cambios que no están en el área de stage."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"No se puede hacer rebase: Tu índice contiene cambios que no están en un "
-"commit."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"No se puede hacer pull con rebase: Tu índice contiene cambios que no están "
-"en un commit."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "No se puede $action: El índice contiene cambios sin confirmar."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr "Adicionalmente, tu índice contiene cambios que no están en un commit."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Necesitas ejecutar este comando desde el nivel superior de tu árbol de "
"trabajo."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "Incapaz de determinar la ruta absoluta del directorio git"
@@ -25993,8 +25852,8 @@
"Lines starting with %s will be removed.\n"
msgstr ""
"---\n"
-"Para eliminar '%s' líneas, haga de ellas líneas ' ' (contexto).\n"
-"Para eliminar '%s' líneas, bórrelas.\n"
+"Para eliminar '%s' líneas, haz de ellas líneas ' ' (contexto).\n"
+"Para eliminar '%s' líneas, bórralas.\n"
"Líneas comenzando con %s serán eliminadas.\n"
#: git-add--interactive.perl:1143
@@ -26014,8 +25873,8 @@
"n - no aplicar stage a este fragmento\n"
"q - quit; no aplicar stage a este fragmento ni ninguno de los restantes\n"
"a - aplicar stage a este fragmento y a todos los posteriores en el archivo\n"
-"d - no aplicar stage a este fragmento ni a ninguno de los posteriores en este "
-"archivo"
+"d - no aplicar stage a este fragmento ni a ninguno de los posteriores en "
+"este archivo"
#: git-add--interactive.perl:1257
msgid ""
@@ -26029,7 +25888,8 @@
"n - no hacer stash a este fragmento\n"
"q - quit; no hacer stash a este fragmento ni a ninguno de los restantes\n"
"a - hacer stash a este fragmento y a todos los posteriores en el archivo\n"
-"d - no hacer stash a este fragmento ni ninguno de los posteriores en el archivo"
+"d - no hacer stash a este fragmento ni ninguno de los posteriores en el "
+"archivo"
#: git-add--interactive.perl:1263
msgid ""
@@ -26041,10 +25901,12 @@
msgstr ""
"y - sacar este fragmento del área de stage\n"
"n - no sacar este fragmento del area de stage\n"
-"q - quit; no sacar del area de stage este fragmento ni ninguno de los restantes\n"
-"a - sacar del area de stage este fragmento y todos los posteriores en el archivo\n"
-"d - no sacar del area de stage este fragmento ni ninguno de los posteriores en el "
-"archivo"
+"q - quit; no sacar del area de stage este fragmento ni ninguno de los "
+"restantes\n"
+"a - sacar del area de stage este fragmento y todos los posteriores en el "
+"archivo\n"
+"d - no sacar del area de stage este fragmento ni ninguno de los posteriores "
+"en el archivo"
#: git-add--interactive.perl:1269
msgid ""
@@ -26231,14 +26093,14 @@
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
-"status - muestra las rutas con cambios\n"
-"update - agrega el estado del árbol de trabajo al set de cambios en "
+"status - mostrar las rutas con cambios\n"
+"update - agregar el estado del árbol de trabajo al set de cambios en "
"el área de stage\n"
-"revert - revierte los cambios en el área de stage de regreso a la "
+"revert - revertir los cambios en el área de stage de regreso a la "
"versión HEAD\n"
-"patch - selecciona los hunks y actualiza de forma selectiva\n"
+"patch - seleccionar los hunks y actualiza de forma selectiva\n"
"diff - mirar la diff entre HEAD y el índice\n"
-"add untracked - agrega contenidos de archivos no rastreados al grupo de "
+"add untracked - agregar contenidos de archivos no rastreados al grupo de "
"cambios del area de stage\n"
#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
@@ -26298,9 +26160,9 @@
"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
msgstr ""
"fatal: opciones de configuración encontradas para 'sendmail'\n"
-"git-send-email está configurado con las opciones sendemail.* - tenga en "
-"cuenta la 'e'.\n"
-"Establezca sendemail.forbidSendmailVariables en false para deshabilitar esta "
+"git-send-email está configurado con las opciones sendemail.* - ten en cuenta "
+"la 'e'.\n"
+"Establece sendemail.forbidSendmailVariables en false para deshabilitar esta "
"verificación.\n"
#: git-send-email.perl:530 git-send-email.perl:746
@@ -26394,10 +26256,10 @@
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
"Líneas que comienzan en \"GIT:\" serán eliminadas.\n"
-"Considere incluir un diffstat global o una tabla de contenidos\n"
+"Considera incluir un diffstat global o una tabla de contenidos\n"
"para el parche que estás escribiendo.\n"
"\n"
-"Limpiar el contenido de body si no deseas mandar un resumen.\n"
+"Limpia el contenido de body si no deseas mandar un resumen.\n"
#: git-send-email.perl:826
#, perl-format
@@ -26562,7 +26424,7 @@
msgid "Result: OK\n"
msgstr "Resultado: OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "no se puede abrir el archivo %s"
@@ -26587,30 +26449,30 @@
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Agregando cc: %s de la línea '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no se pudo ejecutar '%s'"
-#: git-send-email.perl:1972
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Agregando %s: %s de: '%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) falló al cerrar el pipe a '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "no se puede mandar mensaje como 7bit"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "codificación de transferencia inválida"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2059
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -26621,12 +26483,12 @@
"%s\n"
"peligro: no se mandaron parches\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "no es posible abrir %s: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2072
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -26635,17 +26497,580 @@
"fatal: %s: %d es más grande que 998 caracteres\n"
"peligro: no se mandaron parches\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Saltando %s con el sufijo de backup '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "¿Realmente deseas mandar %s? [y|N]: "
+#, c-format
+#~ msgid ""
+#~ "The following pathspecs didn't match any eligible path, but they do match "
+#~ "index\n"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "Los siguientes pathspecs no concuerdan con ninguna ruta elegible, pero "
+#~ "concuerdan\n"
+#~ "con entradas del índice fuera del checkout sparse actual:\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr ""
+#~ "Deshabilitar o modificar las reglas de escasez si tienes intención de "
+#~ "actualizar dichas entradas."
+
+#, c-format
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "no se pudo configurar GIT_DIR a '%s'"
+
+#, c-format
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "no es posible desempacar header %s con --allow-unknown-type"
+
+#, c-format
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "no es posible analizar header %s con --allow-unknown-type"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "falló al abrir /dev/null"
+
+#~ 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 ""
+#~ "tras resolver los conflictos, marca las rutas corregidas\n"
+#~ "con 'git add <rutas>' o 'git rm <rutas>'\n"
+#~ "y haz un commit del resultado con 'git commit'"
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "falló al abrir /dev/null o hacer dup"
+
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "intentando usar sparse-index sin modo cono"
+
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "no es posible actualizar el cache del árbol, manteniendo full"
+
+#, c-format
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "No se pudo abrir '%s' para escritura."
+
+#, c-format
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "no se pudo crear el archivo de crónica '%s'"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]"
+
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check requiere 2 o 3 argumentos"
+
+#, c-format
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "no se pudo crear un archivo nuevo en '%s'"
+
+#, c-format
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree: falló al abrir '%s'"
+
+#, c-format
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "no se puede abrir el archivo de paquete '%s'"
+
+#~ msgid "cannot store pack file"
+#~ msgstr "no se puede guardar el archivo paquete"
+
+#~ msgid "cannot store index file"
+#~ msgstr "no se puede guardar el archivo índice"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "excluir patrones leídos de <archivo>"
+
+#, c-format
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "Opción desconocida para merge-recursive: -X%s"
+
+#, c-format
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "lista de pendientes inutilizable: '%s'"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<opciones>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "rebasar commits de fusión"
+
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "mantener puntas de bifurcación originales de los primos"
+
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "mover commits que comiencen con squash!/fixup!"
+
+#~ msgid "sign commits"
+#~ msgstr "firmar commits"
+
+#~ msgid "continue rebase"
+#~ msgstr "continuar rebase"
+
+#~ msgid "skip commit"
+#~ msgstr "saltar commit"
+
+#~ msgid "edit the todo list"
+#~ msgstr "editar la lista de pendientes"
+
+#~ msgid "show the current patch"
+#~ msgstr "mostrar el parche actual"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "ids de commits cortos en la lista de pendientes"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "expandir ids de commits en la lista de pendientes"
+
+#~ msgid "check the todo list"
+#~ msgstr "revisar la lista de pendientes"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "reordenar líneas fixup/squash"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "insertar comando exec en la lista de pendientes"
+
+#~ msgid "onto"
+#~ msgstr "sobre"
+
+#~ msgid "restrict-revision"
+#~ msgstr "restrict-revision"
+
+#~ msgid "restrict revision"
+#~ msgstr "restringir revisión"
+
+#~ msgid "squash-onto"
+#~ msgstr "squash-onto"
+
+#~ msgid "squash onto"
+#~ msgstr "squash a"
+
+#~ msgid "the upstream commit"
+#~ msgstr "el commit de upstream"
+
+#~ msgid "head-name"
+#~ msgstr "head-name"
+
+#~ msgid "head name"
+#~ msgstr "nombre de head"
+
+#~ msgid "rebase strategy"
+#~ msgstr "estrategia de rebase"
+
+#~ msgid "strategy-opts"
+#~ msgstr "strategy-opts"
+
+#~ msgid "strategy options"
+#~ msgstr "opciones de estrategia"
+
+#~ msgid "switch-to"
+#~ msgstr "cambiar a"
+
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "la rama o commit para hacer checkout"
+
+#~ msgid "onto-name"
+#~ msgstr "sobre-nombre"
+
+#~ msgid "onto name"
+#~ msgstr "sobre nombre"
+
+#~ msgid "cmd"
+#~ msgstr "cmd"
+
+#~ msgid "the command to run"
+#~ msgstr "el comando para ejecutar"
+
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'"
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "error: no se puede combinar '--preserve-merges' con '--reschedule-failed-"
+#~ "exec'"
+
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <ruta> "
+#~ "--name <nombre>"
+
+#, c-format
+#~ msgid "failed to create file %s"
+#~ msgstr "falló al crear el archivo %s"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "salir inmediatamente tras el anuncio inicial de ref"
+
+#, c-format
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "socket/pipe ya está en uso: '%s'"
+
+#, c-format
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "no se pudo iniciar el servidor en: '%s'"
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "no se puede generar demonio en el background"
+
+#~ msgid "waitpid failed"
+#~ msgstr "falló waitpid"
+
+#~ msgid "daemon not online yet"
+#~ msgstr "demonio no está en línea todavía"
+
+#~ msgid "daemon failed to start"
+#~ msgstr "falló al iniciar demonio"
+
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid está confundido"
+
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "demonio no se ha apagado todavía"
+
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "Restricción de protocolo no soportada con cURL < 7.19.4"
+
+#, sh-format
+#~ msgid "running $command"
+#~ msgstr "ejecutando $command"
+
+#, sh-format
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "'$sm_path' no tiene un commit checked out"
+
+#, sh-format
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
+
+#~ msgid "Applied autostash."
+#~ msgstr "Autostash aplicado."
+
+#, sh-format
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "No se puede almacenar $stash_sha1"
+
+#~ 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 ""
+#~ "Aplicar autostash resultó en conflictos.\n"
+#~ "Tus cambios están seguros en el stash.\n"
+#~ "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
+#~ "momento.\n"
+
+#, sh-format
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "Rebasando ($new_count/$total)"
+
+#~ msgid ""
+#~ "\n"
+#~ "Commands:\n"
+#~ "p, pick <commit> = use commit\n"
+#~ "r, reword <commit> = use commit, but edit the commit message\n"
+#~ "e, edit <commit> = use commit, but stop for amending\n"
+#~ "s, squash <commit> = use commit, but meld into previous commit\n"
+#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
+#~ "message\n"
+#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
+#~ "d, drop <commit> = remove commit\n"
+#~ "l, label <label> = label current HEAD with a name\n"
+#~ "t, reset <label> = reset HEAD to a label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". create a merge commit using the original merge commit's\n"
+#~ ". message (or the oneline, if no original merge commit was\n"
+#~ ". specified). Use -c <commit> to reword the commit message.\n"
+#~ "\n"
+#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Comandos:\n"
+#~ "p, pick <commit> = usar commit\n"
+#~ "r, reword <commit> = usar commit, pero editar el mensaje de commit\n"
+#~ "e, edit <commit> = usar commit, pero parar para un amend\n"
+#~ "s, squash <commit> = usar commit, pero fusionarlo en el commit previo\n"
+#~ "f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de "
+#~ "este commit\n"
+#~ "x, exec <commit> = ejecutar comando (el resto de la línea) usando un "
+#~ "shell\n"
+#~ "d, drop <commit> = eliminar commit\n"
+#~ "l, label <label> = poner label al HEAD actual con un nombre\n"
+#~ "t, reset <label> = reiniciar HEAD al label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". crear un commit de fusión usando el mensaje original de\n"
+#~ ". fusión (o la línea de oneline, si no se especifica un mensaje\n"
+#~ ". de commit). Usa -c <commit> para reescribir el mensaje del "
+#~ "commit.\n"
+#~ "\n"
+#~ "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
+#~ "abajo.\n"
+
+#, sh-format
+#~ msgid ""
+#~ "You can amend the commit now, with\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Once you are satisfied with your changes, run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Puedes enmendar el commit ahora, con\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Una vez que estés satisfecho con los cambios, ejecuta\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1: no es un commit que pueda ser cogido"
+
+#, sh-format
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "Nombre de commit inválido: $sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "No se puede escribir el remplazo sha1 del commit actual"
+
+#, sh-format
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "Avance rápido a $sha1"
+
+#, sh-format
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "No se puede realizar avance rápido a $sha1"
+
+#, sh-format
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "No se puede mover HEAD a $first_parent"
+
+#, sh-format
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "Rehusando ejecutar squash en fusión: $sha1"
+
+#, sh-format
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "Error al rehacer fusión $sha1"
+
+#, sh-format
+#~ msgid "Could not pick $sha1"
+#~ msgstr "No se pudo coger $sha1"
+
+#, sh-format
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "Este es el mensaje del commit #${n}:"
+
+#, sh-format
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "El mensaje del commit #${n} será ignorado:"
+
+#, sh-format
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "Esta es una combinación de $count commit."
+#~ msgstr[1] "Esta es la combinación de $count commits."
+
+#, sh-format
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "No se puede escribir $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "Esto es una combinación de 2 commits."
+
+#, sh-format
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "No se pudo aplicar $sha1... $rest"
+
+#, sh-format
+#~ msgid ""
+#~ "Could not amend commit after successfully picking $sha1... $rest\n"
+#~ "This is most likely due to an empty commit message, or the pre-commit "
+#~ "hook\n"
+#~ "failed. If the pre-commit hook failed, you may need to resolve the issue "
+#~ "before\n"
+#~ "you are able to reword the commit."
+#~ msgstr ""
+#~ "No se pudo corregir commit después de seleccionar exitosamente $sha1 ... "
+#~ "$rest\n"
+#~ "Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-"
+#~ "commit\n"
+#~ "ha fallado. Si el hook pre-commit falló, es posible que debas resolver el "
+#~ "problema antes\n"
+#~ "de que seas capaz de reformular el commit."
+
+#, sh-format
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "Detenido en $sha1_abbrev... $rest"
+
+#, sh-format
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "No se puede '$squash_style' sin un commit previo"
+
+#, sh-format
+#~ msgid "Executing: $rest"
+#~ msgstr "Ejecutando: $rest"
+
+#, sh-format
+#~ msgid "Execution failed: $rest"
+#~ msgstr "Ejecución fallida: $rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "y hizo cambios al índice y/o al árbol de trabajo"
+
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Puedes corregir el problema y entonces ejecutar\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid ""
+#~ "Execution succeeded: $rest\n"
+#~ "but left changes to the index and/or the working tree\n"
+#~ "Commit or stash your changes, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "La ejecución tuvo éxito: $rest\n"
+#~ "Pero dejó cambios en el índice y/o en el árbol de trabajo\n"
+#~ "Realiza un commit o stash con los cambios y, a continuación, ejecuta\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "Comando desconocido: $command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
+
+#, sh-format
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "$head_name rebasado y actualizado satisfactoriamente."
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "No se pudo eliminar CHERRY_PICK_HEAD"
+
+#, sh-format
+#~ msgid ""
+#~ "You have staged changes in your working tree.\n"
+#~ "If these changes are meant to be\n"
+#~ "squashed into the previous commit, run:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "If they are meant to go into a new commit, run:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "In both cases, once you're done, continue with:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+#~ msgstr ""
+#~ "Tienes cambios en el área de stage de tu árbol de trabajo.\n"
+#~ "Si estos cambios están destinados a\n"
+#~ "ser aplastados en el commit previo, ejecuta:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Si estos están destinados a ir en un nuevo commit, ejecuta:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "En ambos casos, cuando termines, continúa con:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr ""
+#~ "Error al tratar de encontrar la identidad del autor para remediar el "
+#~ "commit"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, "
+#~ "confírmalos\n"
+#~ "primero y entonces ejecuta 'git rebase --continue' de nuevo."
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "No se pudo realizar el commit con los cambios en el área de stage."
+
+#~ msgid "Could not execute editor"
+#~ msgstr "No se pudo ejecutar el editor"
+
+#, sh-format
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "¿Sin HEAD?"
+
+#, sh-format
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "No se pudo crear $state_dir temporalmente"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "No se pudo marcar como interactivo"
+
+#, sh-format
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
+#~ msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "Ten en cuenta que los commits vacíos están comentados"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "No se pudo inicializar los commits reescritos"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr ""
+#~ "No se puede aplicar rebase: Tienes cambios que no están en el área de "
+#~ "stage."
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr ""
+#~ "No se puede aplicar pull con rebase: Tienes cambios que no están en el "
+#~ "área de stage."
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "No se puede hacer rebase: Tu índice contiene cambios que no están en un "
+#~ "commit."
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "No se puede hacer pull con rebase: Tu índice contiene cambios que no "
+#~ "están en un commit."
+
#~ msgid "unable to write stateless separator packet"
#~ msgstr "no es posible escribir un paquete separador sin estado (stateless)"
diff --git a/po/fr.po b/po/fr.po
index 59481a7..7f3ace8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -51,6 +51,7 @@
# to prune | éliminer
# to push | pousser
# to rebase | rebaser
+# scheduler | planificateur
# trailers | lignes terminales
# repository | dépôt
# remote | distante (ou serveur distant)
@@ -58,6 +59,7 @@
# shallow | superficiel
# shell | interpréteur de commandes
# sparse | clairsemé
+# split (index) | index scindé
# stash | remisage
# to stash | remiser
# tag | étiquette
@@ -76,8 +78,8 @@
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-14 08:28+0200\n"
+"POT-Creation-Date: 2022-04-13 14:52+0800\n"
+"PO-Revision-Date: 2022-04-13 21:17+0200\n"
"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -85,238 +87,237 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"
-"X-Generator: Poedit 2.4.2\n"
+"X-Generator: Poedit 3.0.1\n"
-#: add-interactive.c:376
+#: add-interactive.c:382
#, c-format
msgid "Huh (%s)?"
msgstr "Hein (%s) ?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
+#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
+#: builtin/rebase.c:1671
msgid "could not read index"
msgstr "impossible de lire l'index"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:590 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binaire"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:648 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "rien"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:649 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "inchangé"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:686 git-add--interactive.perl:641
msgid "Update"
msgstr "Mise à jour"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:703 add-interactive.c:891
#, c-format
msgid "could not stage '%s'"
msgstr "impossible d'indexer '%s'"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
msgid "could not write index"
msgstr "impossible d'écrire l'index"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:712 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d chemin mis à jour\n"
msgstr[1] "%d chemins mis à jour\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:730 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "note : %s n'est plus suivi à présent.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:765 git-add--interactive.perl:653
msgid "Revert"
msgstr "Inverser"
-#: add-interactive.c:775
+#: add-interactive.c:781
msgid "Could not parse HEAD^{tree}"
msgstr "Impossible d'analyser HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:819 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d chemin inversé\n"
msgstr[1] "%d chemins inversés\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:870 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Aucun Fichier non suivi.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:874 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Ajouter un fichier non-suivi"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:901 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d chemin ajouté\n"
msgstr[1] "%d chemins ajoutés\n"
-#: add-interactive.c:925
+#: add-interactive.c:931
#, c-format
msgid "ignoring unmerged: %s"
msgstr "fichier non-fusionné ignoré : %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Seuls des fichiers binaires ont changé.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Aucune modification.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:949 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Mise à jour par patch"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:988 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Réviser la différence"
-#: add-interactive.c:1010
+#: add-interactive.c:1016
msgid "show paths with changes"
msgstr "afficher les chemins comprenant des modifications"
-#: add-interactive.c:1012
+#: add-interactive.c:1018
msgid "add working tree state to the staged set of changes"
msgstr ""
"ajouter l'état de l'arbre de travail à l'ensemble des modifications indexées"
-#: add-interactive.c:1014
+#: add-interactive.c:1020
msgid "revert staged set of changes back to the HEAD version"
msgstr "retourner l'ensemble de modifications indexées à la version HEAD"
-#: add-interactive.c:1016
+#: add-interactive.c:1022
msgid "pick hunks and update selectively"
msgstr "sélection et mise à jour individuelle des sections"
-#: add-interactive.c:1018
+#: add-interactive.c:1024
msgid "view diff between HEAD and index"
msgstr "visualiser les diffs entre HEAD et l'index"
-#: add-interactive.c:1020
+#: add-interactive.c:1026
msgid "add contents of untracked files to the staged set of changes"
msgstr ""
"ajouter le contenu des fichiers non-suivis à l'ensemble des modifications "
"indexées"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1034 add-interactive.c:1083
msgid "Prompt help:"
msgstr "Aide :"
-#: add-interactive.c:1030
+#: add-interactive.c:1036
msgid "select a single item"
msgstr "sélectionner un seul élément"
-#: add-interactive.c:1032
+#: add-interactive.c:1038
msgid "select a range of items"
msgstr "sélectionner une plage d'éléments"
-#: add-interactive.c:1034
+#: add-interactive.c:1040
msgid "select multiple ranges"
msgstr "sélectionner plusieurs plages"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1042 add-interactive.c:1087
msgid "select item based on unique prefix"
msgstr "sélectionner un élément basé sur une préfixe unique"
-#: add-interactive.c:1038
+#: add-interactive.c:1044
msgid "unselect specified items"
msgstr "désélectionner les éléments spécifiés"
-#: add-interactive.c:1040
+#: add-interactive.c:1046
msgid "choose all items"
msgstr "choisir tous les éléments"
-#: add-interactive.c:1042
+#: add-interactive.c:1048
msgid "(empty) finish selecting"
msgstr "(vide) arrêter de sélectionner"
-#: add-interactive.c:1079
+#: add-interactive.c:1085
msgid "select a numbered item"
msgstr "sélectionner un élément par son numéro"
-#: add-interactive.c:1083
+#: add-interactive.c:1089
msgid "(empty) select nothing"
msgstr "(vide) ne rien sélectionner"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "Et maintenant"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "staged"
msgstr "indexé"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "unstaged"
msgstr "non-indexé"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
+#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
+#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
+#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
#: git-add--interactive.perl:213
msgid "path"
msgstr "chemin"
-#: add-interactive.c:1151
+#: add-interactive.c:1157
msgid "could not refresh index"
msgstr "impossible de rafraîchir l'index"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Au revoir.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Indexer l'ajout [y,n,q,a,d%s,?] ? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Indexer cette section [y,n,q,a,d%s,?] ? "
@@ -343,22 +344,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:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Remiser l'ajout [y,n,q,a,d%s,?] ? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Remiser cette section [y,n,q,a,d%s,?] ? "
@@ -385,22 +386,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:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Désindexer l'ajout [y,n,q,a,d%s,?] ? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? "
@@ -427,22 +428,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:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer l'ajout à l'index [y,n,q,a,d%s,?] ? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? "
@@ -469,26 +470,26 @@
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner l'ajout dans l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? "
@@ -515,23 +516,23 @@
"a - supprimer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas supprimer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner l'ajout de l'index et de l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
@@ -551,27 +552,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:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d"
-"%s,?] ? "
+"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,"
+"d%s,?] ? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d"
-"%s,?] ? "
+"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,"
+"d%s,?] ? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
@@ -615,24 +616,24 @@
msgid "could not parse colored hunk header '%.*s'"
msgstr "impossible d'analyser l'entête coloré de section '%.*s'"
-#: add-patch.c:420
+#: add-patch.c:431
msgid "could not parse diff"
msgstr "impossible d'analyser la diff"
-#: add-patch.c:439
+#: add-patch.c:450
msgid "could not parse colored diff"
msgstr "impossible d'analyser la diff colorée"
-#: add-patch.c:453
+#: add-patch.c:464
#, c-format
msgid "failed to run '%s'"
msgstr "échec pour lancer '%s'"
-#: add-patch.c:612
+#: add-patch.c:618
msgid "mismatched output from interactive.diffFilter"
msgstr "sortie sans correspondance depuis interactive.diffFilter"
-#: add-patch.c:613
+#: add-patch.c:619
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -640,7 +641,7 @@
"Votre filtre doit maintenir une correspondance un-pour-un\n"
"entre les lignes en entrée et en sortie."
-#: add-patch.c:791
+#: add-patch.c:797
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -649,7 +650,7 @@
"ligne de contexte attendue #%d dans\n"
"%.*s"
-#: add-patch.c:806
+#: add-patch.c:812
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -662,12 +663,12 @@
"\tne se termine pas par :\n"
"%.*s"
-#: add-patch.c:1082 git-add--interactive.perl:1115
+#: add-patch.c:1088 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
-#: add-patch.c:1086
+#: add-patch.c:1092
#, c-format
msgid ""
"---\n"
@@ -681,7 +682,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:1100 git-add--interactive.perl:1129
+#: add-patch.c:1106 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -691,11 +692,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:1133
+#: add-patch.c:1139
msgid "could not parse hunk header"
msgstr "impossible d'analyser l'entête de section"
-#: add-patch.c:1178
+#: add-patch.c:1184
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' a échoué"
@@ -711,26 +712,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1253 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" "
"l'élimine !) [y|n] ? "
-#: add-patch.c:1290
+#: add-patch.c:1296
msgid "The selected hunks do not apply to the index!"
msgstr "Les sections sélectionnées ne s'applique pas à l'index !"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Les appliquer quand même à l'arbre de travail ? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1304 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Rien n'a été appliqué.\n"
-#: add-patch.c:1355
+#: add-patch.c:1361
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -752,73 +753,73 @@
"e - éditer manuellement la section actuelle\n"
"? - afficher l'aide\n"
-#: add-patch.c:1517 add-patch.c:1527
+#: add-patch.c:1523 add-patch.c:1533
msgid "No previous hunk"
msgstr "Pas de section précédente"
-#: add-patch.c:1522 add-patch.c:1532
+#: add-patch.c:1528 add-patch.c:1538
msgid "No next hunk"
msgstr "Pas de section suivante"
-#: add-patch.c:1538
+#: add-patch.c:1544
msgid "No other hunks to goto"
msgstr "Aucune autre section à atteindre"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1555 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "aller à quelle section (<ret> pour voir plus) ? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1556 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "aller à quelle section ? "
-#: add-patch.c:1561
+#: add-patch.c:1567
#, c-format
msgid "Invalid number: '%s'"
msgstr "Numéro invalide : '%s'"
-#: add-patch.c:1566
+#: add-patch.c:1572
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Désolé, %d seule section disponible."
msgstr[1] "Désolé, Seulement %d sections disponibles."
-#: add-patch.c:1575
+#: add-patch.c:1581
msgid "No other hunks to search"
msgstr "Aucune autre section à rechercher"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1587 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "rechercher la regex ? "
-#: add-patch.c:1596
+#: add-patch.c:1602
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Regex de recherche malformée %s : %s"
-#: add-patch.c:1613
+#: add-patch.c:1619
msgid "No hunk matches the given pattern"
msgstr "Aucune section ne correspond au motif donné"
-#: add-patch.c:1620
+#: add-patch.c:1626
msgid "Sorry, cannot split this hunk"
msgstr "Désolé, impossible de découper cette section"
-#: add-patch.c:1624
+#: add-patch.c:1630
#, c-format
msgid "Split into %d hunks."
msgstr "Découpée en %d sections."
-#: add-patch.c:1628
+#: add-patch.c:1634
msgid "Sorry, cannot edit this hunk"
msgstr "Désolé, impossible d'éditer cette section"
-#: add-patch.c:1680
+#: add-patch.c:1686
msgid "'git apply' failed"
msgstr "'git apply' a échoué"
-#: advice.c:145
+#: advice.c:81
#, c-format
msgid ""
"\n"
@@ -827,37 +828,37 @@
"\n"
"Désactivez ce message avec \"git config advice.%s false\""
-#: advice.c:161
+#: advice.c:97
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sastuce: %.*s%s\n"
-#: advice.c:252
+#: advice.c:181
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:254
+#: advice.c:183
msgid "Committing is not possible because you have unmerged files."
msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
-#: advice.c:256
+#: advice.c:185
msgid "Merging is not possible because you have unmerged files."
msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
-#: advice.c:258
+#: advice.c:187
msgid "Pulling is not possible because you have unmerged files."
msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
-#: advice.c:260
+#: advice.c:189
msgid "Reverting is not possible because you have unmerged files."
msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
-#: advice.c:262
+#: advice.c:191
#, 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:270
+#: advice.c:199
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."
@@ -865,41 +866,49 @@
"Corrigez-les puis lancez 'git add/rm <fichier>'\n"
"si nécessaire pour marquer la résolution et valider."
-#: advice.c:278
+#: advice.c:207
msgid "Exiting because of an unresolved conflict."
msgstr "Abandon à cause de conflit non résolu."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:212 builtin/merge.c:1388
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
-#: advice.c:285
+#: advice.c:214
msgid "Please, commit your changes before merging."
msgstr "Veuillez valider vos changements avant de fusionner."
-#: advice.c:286
+#: advice.c:215
msgid "Exiting because of unfinished merge."
msgstr "Abandon à cause d'une fusion non terminée."
-#: advice.c:296
+#: advice.c:220
+msgid "Not possible to fast-forward, aborting."
+msgstr "Pas possible d'avancer rapidement, abandon."
+
+#: advice.c:230
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"Les spécificateurs de chemin suivants n'ont trouvé aucune correspondance, "
-"mais correspondent\n"
-"dans les entrées d'index hors de l'extraction clairsemée actuelle :\n"
+"Les chemins ou spécificateurs de chemins suivants correspondent à des "
+"chemins\n"
+"qui existent hors de votre définition d'extraction clairsemée, et ne seront\n"
+"donc pas mis à jour dans l'index :\n"
-#: advice.c:303
+#: advice.c:237
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Désactiver ou modifier les règles de partialisation si vous allez mettre à "
-"jour de telles entrées."
+"Si vous souhaitez mettre à jour de telles entrées, essayez au choix :\n"
+"* d'utiliser l'option --sparse,\n"
+"* de désactiver ou modifier les règles de choix clairsemé."
-#: advice.c:310
+#: advice.c:245
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -962,75 +971,90 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "option d'ignorance d'espace non reconnue '%s'"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
+#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
+#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
+#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
+#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
+#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
+#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
+#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
+#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
+#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
+#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
+#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
+#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
+#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
+#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
+#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
+#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
+#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
+#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
+#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
+#: builtin/worktree.c:779
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble"
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way hors d'un dépôt"
+#: apply.c:141 apply.c:152 apply.c:155
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' hors d'un dépôt"
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index hors d'un dépôt"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached hors d'un dépôt"
-
-#: apply.c:800
+#: apply.c:807
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Impossible de préparer la regexp d'horodatage %s"
-#: apply.c:809
+#: apply.c:816
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec a retourné %d pour l'entrée : %s"
-#: apply.c:883
+#: apply.c:890
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "nom de fichier du patch introuvable à la ligne %d"
-#: apply.c:921
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
"ligne %d"
-#: apply.c:927
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
"à la ligne %d"
-#: apply.c:928
+#: apply.c:935
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
"à la ligne %d"
-#: apply.c:933
+#: apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
-#: apply.c:962
+#: apply.c:969
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "mode invalide dans la ligne %d : %s"
-#: apply.c:1281
+#: apply.c:1288
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "lignes d'entête inconsistantes %d et %d"
-#: apply.c:1371
+#: apply.c:1378
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -1045,93 +1069,93 @@
"information de nom de fichier manquante dans l'en-tête de git diff lors de "
"la suppression de %d composants de préfixe de chemin (ligne %d)"
-#: apply.c:1384
+#: apply.c:1391
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"
-#: apply.c:1480
+#: apply.c:1487
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recomptage : ligne inattendue : %.*s"
-#: apply.c:1549
+#: apply.c:1556
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
-#: apply.c:1752
+#: apply.c:1759
msgid "new file depends on old contents"
msgstr "le nouveau fichier dépend de contenus anciens"
-#: apply.c:1754
+#: apply.c:1761
msgid "deleted file still has contents"
msgstr "le fichier supprimé a encore du contenu"
-#: apply.c:1788
+#: apply.c:1795
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch corrompu à la ligne %d"
-#: apply.c:1825
+#: apply.c:1832
#, c-format
msgid "new file %s depends on old contents"
msgstr "le nouveau fichier %s dépend de contenus anciens"
-#: apply.c:1827
+#: apply.c:1834
#, c-format
msgid "deleted file %s still has contents"
msgstr "le fichier supprimé %s a encore du contenu"
-#: apply.c:1830
+#: apply.c:1837
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
-#: apply.c:1977
+#: apply.c:1985
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binaire corrompu à la ligne %d : %.*s"
-#: apply.c:2014
+#: apply.c:2022
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binaire non reconnu à la ligne %d"
-#: apply.c:2176
+#: apply.c:2184
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch totalement incompréhensible à la ligne %d"
-#: apply.c:2262
+#: apply.c:2270
#, c-format
msgid "unable to read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: apply.c:2266
+#: apply.c:2274
#, c-format
msgid "unable to open or read %s"
msgstr "ouverture ou lecture de %s impossible"
-#: apply.c:2935
+#: apply.c:2943
#, c-format
msgid "invalid start of line: '%c'"
msgstr "début de ligne invalide : '%c'"
-#: apply.c:3056
+#: apply.c:3064
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."
msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."
-#: apply.c:3068
+#: apply.c:3076
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
-#: apply.c:3074
+#: apply.c:3082
#, c-format
msgid ""
"while searching for:\n"
@@ -1140,499 +1164,498 @@
"pendant la recherche de :\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3104
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
-#: apply.c:3104
+#: apply.c:3112
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "
"inverse"
-#: apply.c:3151
+#: apply.c:3159
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
-#: apply.c:3162
+#: apply.c:3170
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
-#: apply.c:3170
+#: apply.c:3178
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide"
-#: apply.c:3188
+#: apply.c:3196
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue"
-#: apply.c:3201
+#: apply.c:3209
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: apply.c:3208
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
"trouvé)"
-#: apply.c:3229
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
-#: apply.c:3352
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
+#: setup.c:310
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
-#: apply.c:3412
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3449 apply.c:3721
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3559 apply.c:3736
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3568 apply.c:3744 apply.c:3960
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
-#: apply.c:3571
+#: apply.c:3605
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
"le dépôt n'a pas les blobs nécessaires pour effectuer une fusion à 3 points."
-#: apply.c:3574
+#: apply.c:3608
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Application d'une fusion à 3 points…\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3624 apply.c:3628
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "impossible de lire le contenu actuel de '%s'"
-#: apply.c:3606
+#: apply.c:3640
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Échec de l'application de la fusion à 3 points…\n"
-#: apply.c:3620
+#: apply.c:3654
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch %s appliqué avec des conflits.\n"
-#: apply.c:3625
+#: apply.c:3659
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch %s appliqué proprement.\n"
-#: apply.c:3642
+#: apply.c:3676
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Retour à une application directe…\n"
-#: apply.c:3654
+#: apply.c:3688
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: apply.c:3727
+#: apply.c:3761
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
-#: apply.c:3729
+#: apply.c:3763
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
+#: read-cache.c:1399
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
-#: apply.c:3952
+#: apply.c:3958
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: apply.c:3956
+#: apply.c:3962
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: apply.c:3976
+#: apply.c:3982
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
-#: apply.c:3981
+#: apply.c:3987
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
-#: apply.c:4001
+#: apply.c:4007
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-#: apply.c:4005
+#: apply.c:4011
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: apply.c:4020
+#: apply.c:4026
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: apply.c:4112
+#: apply.c:4118
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"l'information sha1 est manquante ou inutilisable pour le sous-module %s"
-#: apply.c:4119
+#: apply.c:4125
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"
-#: apply.c:4122
+#: apply.c:4128
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
-#: apply.c:4131
+#: apply.c:4137
#, c-format
msgid "could not add %s to temporary index"
msgstr "impossible d'ajouter %s à l'index temporaire"
-#: apply.c:4141
+#: apply.c:4147
#, c-format
msgid "could not write temporary index to %s"
msgstr "impossible d'écrire l'index temporaire dans %s"
-#: apply.c:4279
+#: apply.c:4285
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: apply.c:4313
+#: apply.c:4319
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: apply.c:4319
+#: apply.c:4325
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: apply.c:4327
+#: apply.c:4333
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"création du magasin de stockage pour le fichier nouvellement créé %s "
"impossible"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4339 apply.c:4484
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "échec de l'écriture dans '%s'"
-#: apply.c:4380
+#: apply.c:4386
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: apply.c:4450
+#: apply.c:4456
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: apply.c:4548
+#: apply.c:4554
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: apply.c:4556
+#: apply.c:4562
msgid "internal error"
msgstr "erreur interne"
-#: apply.c:4559
+#: apply.c:4565
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Application du patch %%s avec %d rejet..."
msgstr[1] "Application du patch %%s avec %d rejets..."
-#: apply.c:4570
+#: apply.c:4576
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4584
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
-#: apply.c:4592
+#: apply.c:4598
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: apply.c:4596
+#: apply.c:4602
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: apply.c:4725
+#: apply.c:4731
#, c-format
msgid "Skipped patch '%s'."
msgstr "Chemin '%s' non traité."
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "entrée non reconnue"
+#: apply.c:4740
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Pas de rustine valide sur l'entrée (permis avec \"--allow-empty\")"
-#: apply.c:4753
+#: apply.c:4761
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: apply.c:4910
+#: apply.c:4918
#, c-format
msgid "can't open patch '%s': %s"
msgstr "ouverture impossible du patch '%s' :%s"
-#: apply.c:4937
+#: apply.c:4945
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d erreur d'espace ignorée"
msgstr[1] "%d erreurs d'espace ignorées"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4951 apply.c:4966
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ligne a ajouté des erreurs d'espace."
msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
-#: apply.c:4951
+#: apply.c:4959
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."
msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: apply.c:4995
+#: apply.c:5003
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4998
+#: apply.c:5006
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5008 builtin/am.c:2379
msgid "num"
msgstr "num"
-#: apply.c:5001
+#: apply.c:5009
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: apply.c:5004
+#: apply.c:5012
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: apply.c:5006
+#: apply.c:5014
msgid "instead of applying the patch, output diffstat for the input"
msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
-#: apply.c:5010
+#: apply.c:5018
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
-#: apply.c:5012
+#: apply.c:5020
msgid "instead of applying the patch, output a summary for the input"
msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"
-#: apply.c:5014
+#: apply.c:5022
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
-#: apply.c:5016
+#: apply.c:5024
msgid "make sure the patch is applicable to the current index"
msgstr "s'assurer que le patch est applicable sur l'index actuel"
-#: apply.c:5018
+#: apply.c:5026
msgid "mark new files with `git add --intent-to-add`"
msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"
-#: apply.c:5020
+#: apply.c:5028
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: apply.c:5022
+#: apply.c:5030
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: apply.c:5025
+#: apply.c:5033
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)"
-#: apply.c:5027
+#: apply.c:5035
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"tenter une fusion à 3 points, revenir à un rustinage normal en cas d'échec"
-#: apply.c:5029
+#: apply.c:5037
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5040 builtin/checkout-index.c:230
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
-#: apply.c:5034
+#: apply.c:5042
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
+#: builtin/rebase.c:1079
msgid "action"
msgstr "action"
-#: apply.c:5036
+#: apply.c:5044
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
"d'espace"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5047 apply.c:5050
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: apply.c:5045
+#: apply.c:5053
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: apply.c:5047
+#: apply.c:5055
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: apply.c:5049
+#: apply.c:5057
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: apply.c:5051
+#: apply.c:5059
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "mode verbeux"
-
-#: apply.c:5054
+#: apply.c:5062
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolérer des erreurs de détection de retours chariot manquants en fin de "
"fichier"
-#: apply.c:5057
+#: apply.c:5065
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:5059 builtin/am.c:2306
+#: apply.c:5067 builtin/am.c:2367
msgid "root"
msgstr "racine"
-#: apply.c:5060
+#: apply.c:5068
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
-#: archive-tar.c:125 archive-zip.c:345
+#: apply.c:5071
+msgid "don't return error for empty patches"
+msgstr "ne pas renvoyer d'erreur pour les rustines vides"
+
+#: archive-tar.c:125 archive-zip.c:346
#, c-format
msgid "cannot stream blob %s"
msgstr "impossible de transmettre le blob %s en flux"
-#: archive-tar.c:265 archive-zip.c:358
+#: archive-tar.c:265 archive-zip.c:359
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "mode de fichier non supporté :0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "impossible de démarrer le filtre '%s'"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "impossible de rediriger un descripteur"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "le filtre '%s' a retourné une erreur"
-#: archive-zip.c:318
+#: archive-zip.c:319
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "le chemin n'est pas codé en UTF-8 valide : %s"
-#: archive-zip.c:322
+#: archive-zip.c:323
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s"
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
#, c-format
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
-#: archive-zip.c:603
+#: archive-zip.c:604
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>"
@@ -1641,10 +1664,6 @@
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>...]"
@@ -1656,143 +1675,138 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:579
#, c-format
-msgid "cannot read %s"
-msgstr "impossible de lire %s"
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "référence inexistante : %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "nom d'objet invalide : %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "objet arbre invalide : %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "l'arbre de travail actuel est non-suivi"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Fichier non trouvé : %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "'%s' n'est pas un fichier normal"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "fmt"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1809
msgid "prefix"
msgstr "préfixe"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
+#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
msgid "file"
msgstr "fichier"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "ajouter les fichiers non suivis à l'archive"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "écrire l'archive dans ce fichier"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "lire .gitattributes dans le répertoire de travail"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "afficher les fichiers archivés sur stderr"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "régler le niveau de compression"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
+#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
msgid "repo"
msgstr "dépôt"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
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:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
msgid "command"
msgstr "commande"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "chemin vers la commande distante git-upload-archive"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Option --remote inattendue"
-#: archive.c:581
-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:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
+#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
+#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
+#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
+#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
+#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "l'option '%s' requiert '%s'"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Option --output inattendue"
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr ""
-"Les options --add-file et --remote ne peuvent pas être utilisées ensemble"
-
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'archive inconnu '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument non supporté pour le format '%s' : -%d"
@@ -1815,22 +1829,22 @@
"Les motifs de négation sont ignorés dans les attributs git\n"
"Utilisez '\\!' pour un point d'exclamation littéral."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Contenu mal cité dans le fichier '%s' : %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Impossible de pousser la bissection plus loin !\n"
-#: bisect.c:766
+#: bisect.c:765
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s n'est pas un nom de commit valide"
-#: bisect.c:791
+#: bisect.c:790
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1839,7 +1853,7 @@
"La base de fusion %s est mauvaise.\n"
"Cela signifie que le bogue été corrigé entre %s et [%s].\n"
-#: bisect.c:796
+#: bisect.c:795
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1848,7 +1862,7 @@
"La base de fusion %s est nouvelle.\n"
"La propriété a changé entre %s et [%s].\n"
-#: bisect.c:801
+#: bisect.c:800
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1857,7 +1871,7 @@
"La base de fusion %s est %s.\n"
"Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
-#: bisect.c:809
+#: bisect.c:808
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1868,7 +1882,7 @@
"git bisect ne peut pas fonctionner correctement dans ce cas.\n"
"Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n"
-#: bisect.c:822
+#: bisect.c:821
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1880,36 +1894,36 @@
"et %s.\n"
"On continue tout de même."
-#: bisect.c:861
+#: bisect.c:860
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bissection : une base de fusion doit être testée\n"
-#: bisect.c:911
+#: bisect.c:910
#, c-format
msgid "a %s revision is needed"
msgstr "une révision %s est nécessaire"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:940
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:986 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "impossible de lire le fichier '%s'"
-#: bisect.c:1027
+#: bisect.c:1026
msgid "reading bisect refs failed"
msgstr "impossible de lire les références de bissection"
-#: bisect.c:1057
+#: bisect.c:1056
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s était à la fois %s et %s\n"
-#: bisect.c:1066
+#: bisect.c:1065
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1918,7 +1932,7 @@
"Aucun commit testable n'a été trouvé\n"
"Peut-être avez-vous démarré avec un mauvais arguement de chemin ?\n"
-#: bisect.c:1095
+#: bisect.c:1094
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1928,156 +1942,179 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1100
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bissection : %d révision à tester après ceci %s\n"
msgstr[1] "Bissection : %d révisions à tester après ceci %s\n"
-#: blame.c:2776
+#: blame.c:2773
msgid "--contents and --reverse do not blend well."
msgstr "--contents et --reverse ne font pas bon ménage."
-#: blame.c:2790
+#: blame.c:2787
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:2811
+#: blame.c:2808
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:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
+#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
+#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
+#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
+#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
-#: blame.c:2838
+#: blame.c:2835
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:2849
+#: blame.c:2846
#, c-format
msgid "no such path %s in %s"
msgstr "pas de chemin %s dans %s"
-#: blame.c:2860
+#: blame.c:2857
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "impossible de lire le blob %s pour le chemin %s"
-#: branch.c:53
-#, c-format
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr ""
-"\n"
-"Après correction de la cause de l'erreur, vous pouvez essayer de corriger\n"
-"l'information de suivi distant en invoquant\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "La branche %s ne peut pas être sa propre branche amont."
-
#: branch.c:93
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
msgstr ""
-"La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' "
-"en rebasant."
-
-#: branch.c:94
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr ""
-"La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis "
-"'%s'."
-
-#: branch.c:98
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
-"La branche '%s' est paramétrée pour suivre la branche locale '%'s en "
-"rebasant."
-
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'."
+"impossible d'hériter la configuration de suivi de référence amont depuis "
+"plusieurs références quand un rebasage est demandé"
#: branch.c:104
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "la branche %s ne peut pas être sa propre branche amont"
+
+#: branch.c:160
+#, c-format
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "la branche '%s' est paramétrée pour suivre '%s' en rebasant."
+
+#: branch.c:161
+#, c-format
+msgid "branch '%s' set up to track '%s'."
+msgstr "la branche '%s' est paramétrée pour suivre '%s'."
+
+#: branch.c:164
+#, c-format
+msgid "branch '%s' set up to track:"
+msgstr "la branche '%s' est paramétrée pour suivre :"
+
+#: branch.c:176
+msgid "unable to write upstream branch configuration"
+msgstr "échec de l'écriture de la configuration de branche amont"
+
+#: branch.c:178
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
msgstr ""
-"La branche '%s' est paramétrée pour suivre la référence distante '%s' en "
-"rebasant."
+"\n"
+"Après correction de la cause de l'erreur, vous pouvez essayer\n"
+"de corriger l'information de suivi distant en invoquant :"
-#: branch.c:105
+#: branch.c:219
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s'."
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr "héritage de suivi depuis '%s' demandé, mais pas de distant configuré"
-#: branch.c:109
+#: branch.c:225
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr ""
-"La branche '%s' est paramétrée pour suivre la référence locale '%s' en "
-"rebasant."
+"héritage de suivi depuis '%s' demandé, mais pas de configuration de fusion "
+"renseignée"
-#: branch.c:110
+#: branch.c:277
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s'."
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "pas de suivi : information ambiguë pour la référence '%s'"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Échec de l'écriture de la configuration de branche amont"
-
-#: branch.c:156
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading " " space around.
+#.
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#: branch.c:289 object-name.c:464
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Pas de suivi : information ambiguë pour la référence %s"
+msgid " %s\n"
+msgstr " %s\n"
-#: branch.c:189
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#: branch.c:295
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' n'est pas un nom de branche valide."
-
-#: branch.c:208
-#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Une branche nommée '%s' existe déjà."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Impossible de forcer la mise à jour de la branche courante."
-
-#: branch.c:233
-#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
msgstr ""
-"Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "
-"pas une branche."
+"Il y a plusieurs distants dont les spécificateurs de référence de\n"
+"récupération correspondent à la référence de suivi '%s' :\n"
+"%s\n"
+"C'est typiquement une erreur de configuration.\n"
+"\n"
+"Pour gérer le réglage des branches de suivi, assurez-vous\n"
+"que des réfspecs de récupération de distants différents\n"
+"correspondent à des espaces de nommage de suivi différents."
-#: branch.c:235
+#: branch.c:344
+#, c-format
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' n'est pas un nom de branche valide"
+
+#: branch.c:364
+#, c-format
+msgid "a branch named '%s' already exists"
+msgstr "Une branche nommée '%s' existe déjà"
+
+#: branch.c:370
+#, c-format
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr ""
+"impossible de forcer la mise à jour de la branche '%s' extraite dans '%s'"
+
+#: branch.c:393
+#, c-format
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"Impossible de configurer le suivi de branche ; le point de départ '%s' n'est "
+"pas une branche"
+
+#: branch.c:395
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branche amont demandée '%s' n'existe pas"
-#: branch.c:237
+#: branch.c:397
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -2097,125 +2134,145 @@
"sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"
"pour paramétrer le suivi distant en même temps que vous poussez."
-#: branch.c:281
+#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Nom d'objet invalide : '%s'."
+msgid "not a valid object name: '%s'"
+msgstr "nom d'objet invalide : '%s'"
-#: branch.c:301
+#: branch.c:465
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Nom d'objet ambigu : '%s'."
+msgid "ambiguous object name: '%s'"
+msgstr "Nom d'objet ambigu : '%s'"
-#: branch.c:306
+#: branch.c:470
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Point d'embranchement invalide : '%s'."
+msgid "not a valid branch point: '%s'"
+msgstr "point d'embranchement invalide : '%s'"
-#: branch.c:366
+#: branch.c:658
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "sous-module '%s' : impossible de trouver le sous-module"
+
+#: branch.c:661
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
+msgstr ""
+"Vous pouvez essayer de mettre à jour les sous-modules en utilisant 'git "
+"checkout %s && git submodule update --init'"
+
+#: branch.c:672 branch.c:698
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "sous-module '%s' : impossible de créer la branche '%s'"
+
+#: branch.c:730
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' est déjà extrait dans '%s'"
-#: branch.c:389
+#: branch.c:755
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
-#: bundle.c:44
+#: bundle.c:45
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
msgstr "algorithme d'empreinte du colis inconnu : %s"
-#: bundle.c:48
+#: bundle.c:53
#, c-format
msgid "unknown capability '%s'"
msgstr "capacité inconnue '%s'"
-#: bundle.c:74
+#: bundle.c:79
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
msgstr "'%s' ne semble pas être un fichier colis v2 our v3"
-#: bundle.c:113
+#: bundle.c:118
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
+#: builtin/commit.c:865
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: bundle.c:198
+#: bundle.c:203
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: bundle.c:201
+#: bundle.c:206
msgid "need a repository to verify a bundle"
msgstr "la vérification d'un colis requiert un dépôt"
-#: bundle.c:257
+#: bundle.c:264
#, c-format
msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Le colis contient cette référence :"
-msgstr[1] "Le colis contient ces %d références :"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Le colis contient cette référence :"
+msgstr[1] "Le colis contient ces %<PRIuMAX> références :"
-#: bundle.c:264
+#: bundle.c:272
msgid "The bundle records a complete history."
msgstr "Le colis enregistre l'historique complet."
-#: bundle.c:266
+#: bundle.c:274
#, c-format
msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Le colis exige cette référence :"
-msgstr[1] "Le colis exige ces %d références :"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Le colis exige cette référence :"
+msgstr[1] "Le colis exige ces %<PRIuMAX> références :"
-#: bundle.c:333
+#: bundle.c:350
msgid "unable to dup bundle descriptor"
msgstr "impossible de dupliquer le descripteur de liasse"
-#: bundle.c:340
+#: bundle.c:357
msgid "Could not spawn pack-objects"
msgstr "Impossible de créer des objets groupés"
-#: bundle.c:351
+#: bundle.c:368
msgid "pack-objects died"
msgstr "les objets groupés ont disparu"
-#: bundle.c:400
+#: bundle.c:417
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "la référence '%s' est exclue par les options de rev-list"
-#: bundle.c:504
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "version de colis non supportée %d"
-
-#: bundle.c:506
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "impossible d'écrire une version de colis %d avec l'algorithme %s"
-
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
-#: bundle.c:553
+#: bundle.c:548
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "version de colis non supportée %d"
+
+#: bundle.c:550
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "impossible d'écrire une version de colis %d avec l'algorithme %s"
+
+#: bundle.c:600
msgid "Refusing to create empty bundle."
msgstr "Refus de créer un colis vide."
-#: bundle.c:563
+#: bundle.c:610
#, c-format
msgid "cannot create '%s'"
msgstr "impossible de créer '%s'"
-#: bundle.c:588
+#: bundle.c:639
msgid "index-pack died"
msgstr "l'index de groupe a disparu"
@@ -2238,12 +2295,12 @@
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "la section finale a un id non nul %<PRIx32>"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "valeur invalide de couleur : %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:52
msgid "invalid hash version"
msgstr "version d'empreinte invalide"
@@ -2274,218 +2331,221 @@
msgid "commit-graph file is too small to hold %u chunks"
msgstr "le graphe de commit est trop petit pour contenir %u sections"
-#: commit-graph.c:482
+#: commit-graph.c:485
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:492
+#: commit-graph.c:495
msgid "commit-graph chain does not match"
msgstr "la chaîne de graphe de commit ne correspond pas"
-#: commit-graph.c:540
+#: commit-graph.c:543
#, 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:564
+#: commit-graph.c:567
msgid "unable to find all commit-graph files"
msgstr "impossible de trouver tous les fichiers du graphe de commit"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:752 commit-graph.c:789
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
"position de commit invalide. Le graphe de commit est vraisemblablement "
"corrompu"
-#: commit-graph.c:766
+#: commit-graph.c:773
#, c-format
msgid "could not find commit %s"
msgstr "impossible de trouver le commit %s"
-#: commit-graph.c:799
+#: commit-graph.c:806
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
"le graphe de commits requiert des données de génération de débordement mais "
"n'en contient pas"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
+#: builtin/clone.c:705
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1373 builtin/pack-objects.c:3078
#, c-format
msgid "unable to get type of object %s"
msgstr "impossible d'obtenir le type de l'objet %s"
-#: commit-graph.c:1368
+#: commit-graph.c:1404
msgid "Loading known commits in commit graph"
msgstr "Lecture des commits connus dans un graphe de commit"
-#: commit-graph.c:1385
+#: commit-graph.c:1421
msgid "Expanding reachable commits in commit graph"
msgstr "Expansion des commits joignables dans un graphe de commit"
-#: commit-graph.c:1405
+#: commit-graph.c:1441
msgid "Clearing commit marks in commit graph"
msgstr "Suppression les marques de commit dans le graphe de commits"
-#: commit-graph.c:1424
+#: commit-graph.c:1460
msgid "Computing commit graph topological levels"
msgstr "Calcul des niveaux topologiques du graphe de commits"
-#: commit-graph.c:1477
+#: commit-graph.c:1513
msgid "Computing commit graph generation numbers"
msgstr "Calcul des chiffres de génération du graphe de commits"
-#: commit-graph.c:1558
+#: commit-graph.c:1598
msgid "Computing commit changed paths Bloom filters"
msgstr "Calcul des filtres Bloom des chemins modifiés du commit"
-#: commit-graph.c:1635
+#: commit-graph.c:1675
msgid "Collecting referenced commits"
msgstr "Collecte des commits référencés"
-#: commit-graph.c:1660
+#: commit-graph.c:1701
#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet"
-msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets"
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] ""
+"Recherche de commits pour un graphe de commits dans %<PRIuMAX> paquet"
+msgstr[1] ""
+"Recherche de commits pour un graphe de commits dans %<PRIuMAX> paquets"
-#: commit-graph.c:1673
+#: commit-graph.c:1714
#, c-format
msgid "error adding pack %s"
msgstr "erreur à l'ajout du packet %s"
-#: commit-graph.c:1677
+#: commit-graph.c:1718
#, c-format
msgid "error opening index for %s"
msgstr "erreur à l'ouverture de l'index pour %s"
-#: commit-graph.c:1714
+#: commit-graph.c:1756
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:1732
+#: commit-graph.c:1774
msgid "Finding extra edges in commit graph"
msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"
-#: commit-graph.c:1781
+#: commit-graph.c:1823
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:1812 midx.c:911
+#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
#, 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:1825
+#: commit-graph.c:1868
msgid "unable to create temporary graph layer"
msgstr "impossible de créer une couche de graphe temporaire"
-#: commit-graph.c:1830
+#: commit-graph.c:1873
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "impossible de régler les droits partagés pour '%s'"
-#: commit-graph.c:1887
+#: commit-graph.c:1930
#, 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:1923
+#: commit-graph.c:1967
msgid "unable to open commit-graph chain file"
msgstr "impossible d'ouvrir le fichier de graphe de commit"
-#: commit-graph.c:1939
+#: commit-graph.c:1983
msgid "failed to rename base commit-graph file"
msgstr "échec du renommage du fichier de graphe de commits"
-#: commit-graph.c:1959
+#: commit-graph.c:2004
msgid "failed to rename temporary commit-graph file"
msgstr "impossible de renommer le fichier temporaire de graphe de commits"
-#: commit-graph.c:2092
+#: commit-graph.c:2137
msgid "Scanning merged commits"
msgstr "Analyse des commits de fusion"
-#: commit-graph.c:2136
+#: commit-graph.c:2181
msgid "Merging commit-graph"
msgstr "Fusion du graphe de commits"
-#: commit-graph.c:2244
+#: commit-graph.c:2289
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé"
-#: commit-graph.c:2351
+#: commit-graph.c:2396
msgid "too many commits to write graph"
msgstr "trop de commits pour écrire un graphe"
-#: commit-graph.c:2449
+#: commit-graph.c:2494
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:2459
+#: commit-graph.c:2504
#, 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:2469 commit-graph.c:2484
+#: commit-graph.c:2514 commit-graph.c:2529
#, 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:2476
+#: commit-graph.c:2521
#, 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:2494
+#: commit-graph.c:2539
msgid "Verifying commits in commit graph"
msgstr "Verification des commits dans le graphe de commits"
-#: commit-graph.c:2509
+#: commit-graph.c:2554
#, 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:2516
+#: commit-graph.c:2561
#, 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:2526
+#: commit-graph.c:2571
#, 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:2535
+#: commit-graph.c:2580
#, 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:2549
+#: commit-graph.c:2594
#, 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:2554
+#: commit-graph.c:2599
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2493,7 +2553,7 @@
"le graphe de commit a un numéro de génération nul pour le commit %s, mais "
"non-nul ailleurs"
-#: commit-graph.c:2558
+#: commit-graph.c:2603
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2501,32 +2561,32 @@
"le graphe de commit a un numéro de génération non-nul pour le commit %s, "
"mais nul ailleurs"
-#: commit-graph.c:2575
+#: commit-graph.c:2620
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
"la génération du graphe de commit pour le commit %s est %<PRIuMAX> < "
"%<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2626
#, 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:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
+#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
-#: commit.c:54
+#: commit.c:56
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s n'est pas un commit !"
-#: commit.c:194
+#: commit.c:197
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2546,27 +2606,27 @@
"Supprimez ce message en lançant\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1237
+#: commit.c:1252
#, 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:1241
+#: commit.c:1256
#, 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:1244
+#: commit.c:1259
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: commit.c:1247
+#: commit.c:1262
#, 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:1501
+#: commit.c:1516
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"
@@ -2582,7 +2642,17 @@
msgid "memory exhausted"
msgstr "plus de mémoire"
-#: config.c:126
+#: compat/terminal.c:167
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+"impossible de reprendre en arrière plan, veuillez utiliser 'fg' pour "
+"reprendre"
+
+#: compat/terminal.c:168
+msgid "cannot restore terminal settings"
+msgstr "impossible de restaurer les réglages du terminal"
+
+#: config.c:143
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2597,350 +2667,377 @@
"\t%s\n"
"possibilité d'inclusions multiples."
-#: config.c:142
+#: config.c:159
#, c-format
msgid "could not expand include path '%s'"
msgstr "expansion impossible du chemin d'inclusion '%s'"
-#: config.c:153
+#: config.c:170
msgid "relative config includes must come from files"
msgstr "les inclusions de configuration relatives doivent venir de fichiers"
-#: config.c:199
+#: config.c:219
msgid "relative config include conditionals must come from files"
msgstr ""
"les conditions d'inclusion de configuration relative doivent venir de "
"fichiers"
-#: config.c:396
+#: config.c:364
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"les URL distantes ne peuvent pas être configurées dans un fichier "
+"directement ou indirectement inclus par includeIf.hasconfig:remote.*.url"
+
+#: config.c:508
#, c-format
msgid "invalid config format: %s"
msgstr "format de config invalide : %s"
-#: config.c:400
+#: config.c:512
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "nom de variable d'environnement manquant pour le configuration '%.*s'"
-#: config.c:405
+#: config.c:517
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "variable d'environnement '%s' manquante pour le configuration '%.*s'"
-#: config.c:442
+#: config.c:553
#, c-format
msgid "key does not contain a section: %s"
msgstr "la clé ne contient pas de section: %s"
-#: config.c:448
+#: config.c:558
#, c-format
msgid "key does not contain variable name: %s"
msgstr "la clé ne contient pas de nom de variable : %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:580 sequencer.c:2802
#, c-format
msgid "invalid key: %s"
msgstr "clé invalide : %s"
-#: config.c:478
+#: config.c:585
#, c-format
msgid "invalid key (newline): %s"
msgstr "clé invalide (retour chariot) : %s"
-#: config.c:511
+#: config.c:605
msgid "empty config key"
msgstr "clé de configuration vide"
-#: config.c:529 config.c:541
+#: config.c:623 config.c:635
#, c-format
msgid "bogus config parameter: %s"
msgstr "paramètre de configuration mal formé: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:649 config.c:666 config.c:673 config.c:682
#, c-format
msgid "bogus format in %s"
msgstr "formatage mal formé dans %s"
-#: config.c:622
+#: config.c:716
#, c-format
msgid "bogus count in %s"
msgstr "compte faux dans %s"
-#: config.c:626
+#: config.c:720
#, c-format
msgid "too many entries in %s"
msgstr "trop d'entrées dans %s"
-#: config.c:636
+#: config.c:730
#, c-format
msgid "missing config key %s"
msgstr "clé de configuration %s manquante"
-#: config.c:644
+#: config.c:738
#, c-format
msgid "missing config value %s"
msgstr "valeur de config manquante %s"
-#: config.c:995
+#: config.c:1089
#, c-format
msgid "bad config line %d in blob %s"
msgstr "ligne %d de config incorrecte dans le blob %s"
-#: config.c:999
+#: config.c:1093
#, c-format
msgid "bad config line %d in file %s"
msgstr "ligne %d de config incorrecte dans le fichier %s"
-#: config.c:1003
+#: config.c:1097
#, c-format
msgid "bad config line %d in standard input"
msgstr "ligne %d de config incorrecte dans l'entrée standard"
-#: config.c:1007
+#: config.c:1101
#, 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:1011
+#: config.c:1105
#, 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:1015
+#: config.c:1109
#, c-format
msgid "bad config line %d in %s"
msgstr "ligne %d de config incorrecte dans %s"
-#: config.c:1152
+#: config.c:1246
msgid "out of range"
msgstr "hors plage"
-#: config.c:1152
+#: config.c:1246
msgid "invalid unit"
msgstr "unité invalide"
-#: config.c:1153
+#: config.c:1247
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
-#: config.c:1163
+#: config.c:1257
#, 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:1166
+#: config.c:1260
#, 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:1169
+#: config.c:1263
#, 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:1172
+#: config.c:1266
#, 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:1175
+#: config.c:1269
#, 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:1178
+#: config.c:1272
#, 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:1257
+#: config.c:1368
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "valeur invalide pour la variable %s"
+
+#: config.c:1389
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "ignore le composant core.fsync inconne '%s'"
+
+#: config.c:1425
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "valeur booléenne de configuration invalide '%s' pour '%s'"
-#: config.c:1275
+#: config.c:1443
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:1284
+#: config.c:1452
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' pour '%s' n'est pas un horodatage valide"
-#: config.c:1377
+#: config.c:1545
#, c-format
msgid "abbrev length out of range: %d"
msgstr "longueur d'abbrev hors plage : %d"
-#: config.c:1391 config.c:1402
+#: config.c:1559 config.c:1570
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:1494
+#: config.c:1660
msgid "core.commentChar should only be one character"
msgstr "core.commentChar ne devrait être qu'un unique caractère"
-#: config.c:1527
+#: config.c:1692
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "valeur inconnue '%s' de core.fsyncMethod"
+
+#: config.c:1698
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles est obsolète ; utilisez core.fsync à la place"
+
+#: config.c:1714
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1599
+#: config.c:1800
#, c-format
msgid "malformed value for %s"
msgstr "valeur mal formée pour %s"
-#: config.c:1625
+#: config.c:1826
#, c-format
msgid "malformed value for %s: %s"
msgstr "valeur mal formée pour %s : %s"
-#: config.c:1626
+#: config.c:1827
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "doit être parmi nothing, matching, simple, upstream ou current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1888 builtin/pack-objects.c:4078
#, c-format
msgid "bad pack compression level %d"
msgstr "niveau de compression du paquet %d"
-#: config.c:1809
+#: config.c:2014
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "impossible de charger l'objet blob de config '%s'"
-#: config.c:1812
+#: config.c:2017
#, 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:1829
+#: config.c:2035
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "impossible de résoudre le blob de config '%s'"
-#: config.c:1874
+#: config.c:2080
#, c-format
msgid "failed to parse %s"
msgstr "échec de l'analyse de %s"
-#: config.c:1930
+#: config.c:2136
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:2294
+#: config.c:2512
msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:2468
+#: config.c:2686
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: config.c:2513
+#: config.c:2731
#, 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:2559
+#: config.c:2763
#, 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:2561
+#: config.c:2765
#, 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:2645
+#: config.c:2850
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de section invalide '%s'"
-#: config.c:2677
+#: config.c:2882
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2706
+#: config.c:2911
#, c-format
msgid "failed to write new configuration file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:2958 config.c:3285
+#: config.c:3177 config.c:3518
#, c-format
msgid "could not lock config file %s"
msgstr "impossible de verrouiller le fichier de configuration %s"
-#: config.c:2969
+#: config.c:3188
#, c-format
msgid "opening %s"
msgstr "ouverture de %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:3225 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "motif invalide : %s"
-#: config.c:3031
+#: config.c:3250
#, c-format
msgid "invalid config file %s"
msgstr "fichier de configuration invalide %s"
-#: config.c:3044 config.c:3298
+#: config.c:3263 config.c:3531
#, c-format
msgid "fstat on %s failed"
msgstr "échec de fstat sur %s"
-#: config.c:3055
+#: config.c:3274
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "impossible de réaliser un mmap de '%s'%s"
-#: config.c:3065 config.c:3303
+#: config.c:3284 config.c:3536
#, c-format
msgid "chmod on %s failed"
msgstr "échec de chmod sur %s"
-#: config.c:3150 config.c:3400
+#: config.c:3369 config.c:3633
#, c-format
msgid "could not write config file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:3184
+#: config.c:3403
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossible de régler '%s' à '%s'"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
-#: config.c:3276
+#: config.c:3509
#, c-format
msgid "invalid section name: %s"
msgstr "nom de section invalide : %s"
-#: config.c:3443
+#: config.c:3676
#, c-format
msgid "missing value for '%s'"
msgstr "valeur manquante pour '%s'"
@@ -2975,72 +3072,72 @@
msgid "expected flush after capabilities"
msgstr "vidage attendu après les capacités"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "capacités ignorées après la première ligne '%s'"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "erreur de protocole : capabilities^{} inattendu"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "erreur de protocole : shallow sha-1 attendu, '%s' trouvé"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "le dépôt distant ne peut pas être superficiel"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "paquet invalide"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "erreur de protocole : '%s' attendu"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "format d'objet spécifié par le serveur inconnu '%s'"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "réponse à ls-ref invalide : %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "vidage attendu après le listage de références"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "paquet de fin de réponse attendu après le listage de références"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "le protocole '%s' n'est pas supporté"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "impossible de positionner SO_KEEPALIVE sur la socket"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Recherche de %s… "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "impossible de rechercher %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -3049,7 +3146,7 @@
"fait.\n"
"Connexion à %s (port %s)… "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -3059,80 +3156,80 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "fait."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "impossible de rechercher %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "port inconnu %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "nom d'hôte étrange '%s' bloqué"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "port étrange '%s' bloqué"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "impossible de démarrer un proxy %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe "
"d'URL valide"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr ""
"le retour chariot est interdit dans les hôtes git:// et les chemins de dépôt"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "la variante ssh 'simple' ne supporte pas -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "la variante ssh 'simple' ne supporte pas -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "chemin étrange '%s' bloqué"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "fork impossible"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Impossible de lancer 'git rev-list'"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "impossible d'écrire dans la rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "impossible de fermer l'entrée standard du rev-list"
@@ -3282,68 +3379,68 @@
msgstr ""
"refus de travailler avec un champ protocol manquant dans l'identification"
-#: credential.c:394
+#: 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:438
+#: credential.c:440
#, c-format
msgid "url has no scheme: %s"
msgstr "l'url n'a pas de schéma : %s"
-#: credential.c:511
+#: credential.c:513
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "impossible d'analyser l'url d'identification : %s"
-#: date.c:138
+#: date.c:139
msgid "in the future"
msgstr "dans le futur"
-#: date.c:144
+#: date.c:145
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "il y a %<PRIuMAX> seconde"
msgstr[1] "il y a %<PRIuMAX> secondes"
-#: date.c:151
+#: date.c:152
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "il y a %<PRIuMAX> minute"
msgstr[1] "il y a %<PRIuMAX> minutes"
-#: date.c:158
+#: date.c:159
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "il y a %<PRIuMAX> heure"
msgstr[1] "il y a %<PRIuMAX> heures"
-#: date.c:165
+#: date.c:166
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "il y a %<PRIuMAX> jour"
msgstr[1] "il y a %<PRIuMAX> jours"
-#: date.c:171
+#: date.c:172
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "il y a %<PRIuMAX> semaine"
msgstr[1] "il y a %<PRIuMAX> semaines"
-#: date.c:178
+#: date.c:179
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "il y a %<PRIuMAX> mois"
msgstr[1] "il y a %<PRIuMAX> mois"
-#: date.c:189
+#: date.c:190
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -3351,14 +3448,14 @@
msgstr[1] "%<PRIuMAX> ans"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
+#: date.c:193
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "il y a %s et %<PRIuMAX> mois"
msgstr[1] "il y a %s et %<PRIuMAX> mois"
-#: date.c:197 date.c:202
+#: date.c:198 date.c:203
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
@@ -3391,28 +3488,32 @@
msgid "Marked %d islands, done.\n"
msgstr "Marquage de %d îlots, fait.\n"
-#: diff-merges.c:70
+#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
+#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
+#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
+#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
+#: builtin/pull.c:47 builtin/pull.c:321
#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "valeur inconnue pour --diff-merges : %s"
+msgid "invalid value for '%s': '%s'"
+msgstr "valeur invalide pour '%s' : '%s'"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base ne fonctionne pas avec des plages"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base ne fonctionne qu'avec des commits"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "impossible d'acquérir HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "aucune base de fusion trouvée"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "bases multiples de fusion trouvées"
@@ -3428,18 +3529,18 @@
"Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "
"arbre de travail"
-#: diff.c:156
+#: diff.c:159
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
-#: diff.c:161
+#: diff.c:164
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paramètre dirstat inconnu '%s'\n"
-#: diff.c:297
+#: diff.c:300
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3447,7 +3548,7 @@
"le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
"'blocks', 'zebra', 'dimmed-zebra' ou 'plain'"
-#: diff.c:325
+#: diff.c:328
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3457,7 +3558,7 @@
"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
"change'"
-#: diff.c:333
+#: diff.c:336
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3465,13 +3566,13 @@
"color-moved-ws : allow-indentation-change ne peut pas être combiné avec "
"d'autres modes d'espace"
-#: diff.c:410
+#: diff.c:413
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-#: diff.c:470
+#: diff.c:473
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3485,45 +3586,48 @@
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:4634
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
-
-#: diff.c:4637
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S et --find-object sont mutuellement exclusifs"
-
-#: diff.c:4640
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4677 parse-options.c:1114
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
msgstr ""
-"-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-regex "
-"avec -S"
+"les options '%s', '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"
-#: diff.c:4643
-msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "les options '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"
+
+#: diff.c:4685
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
msgstr ""
-"--pickaxe-all et --find-object sont mutuellement exclusifs, utilisez --"
-"pickaxe-all avec -G et -S"
+"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
+"'%s' avec '%s'"
-#: diff.c:4722
+#: diff.c:4689
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
+"'%s' avec '%s' et '%s'"
+
+#: diff.c:4769
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:4770
+#: diff.c:4823
#, c-format
msgid "invalid --stat value: %s"
msgstr "valeur invalide de --stat : %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s attend une valeur numérique"
-#: diff.c:4807
+#: diff.c:4860
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3532,42 +3636,42 @@
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:4892
+#: diff.c:4893
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "classe de modification inconnue '%c' dans --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4917
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valeur inconnue après ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4931
#, c-format
msgid "unable to resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4981 diff.c:4987
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "forme <n>/<m> attendue par %s"
-#: diff.c:4998
+#: diff.c:4999
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "caractère attendu par %s, '%s' trouvé"
-#: diff.c:5019
+#: diff.c:5020
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "mauvais argument --color-moved : %s"
-#: diff.c:5038
+#: diff.c:5039
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "mode invalide '%s' dans --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5079
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3575,160 +3679,160 @@
"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
"\"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5115 diff.c:5135
#, c-format
msgid "invalid argument to %s"
msgstr "argument invalide pour %s"
-#: diff.c:5238
+#: diff.c:5239
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "regex invalide fournie à -I : '%s'"
-#: diff.c:5287
+#: diff.c:5288
#, 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:5343
+#: diff.c:5344
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mauvais argument pour --word-diff : %s"
-#: diff.c:5379
+#: diff.c:5380
msgid "Diff output format options"
msgstr "Options de format de sortie de diff"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5382 diff.c:5388
msgid "generate patch"
msgstr "générer la rustine"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5385 builtin/log.c:180
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5390 diff.c:5504 diff.c:5511
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5391 diff.c:5394
msgid "generate diffs with <n> lines context"
msgstr "générer les diffs avec <n> lignes de contexte"
-#: diff.c:5395
+#: diff.c:5396
msgid "generate the diff in raw format"
msgstr "générer le diff en format brut"
-#: diff.c:5398
+#: diff.c:5399
msgid "synonym for '-p --raw'"
msgstr "synonyme de '-p --raw'"
-#: diff.c:5402
+#: diff.c:5403
msgid "synonym for '-p --stat'"
msgstr "synonyme de '-p --stat'"
-#: diff.c:5406
+#: diff.c:5407
msgid "machine friendly --stat"
msgstr "--stat pour traitement automatique"
-#: diff.c:5409
+#: diff.c:5410
msgid "output only the last line of --stat"
msgstr "afficher seulement la dernière ligne de --stat"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5412 diff.c:5420
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5412
+#: diff.c:5413
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:5416
+#: diff.c:5417
msgid "synonym for --dirstat=cumulative"
msgstr "synonyme pour --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5421
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonyme pour --dirstat=files,param1,param2..."
-#: diff.c:5424
+#: diff.c:5425
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:5427
+#: diff.c:5428
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:5430
+#: diff.c:5431
msgid "show only names of changed files"
msgstr "n'afficher que les noms de fichiers modifiés"
-#: diff.c:5433
+#: diff.c:5434
msgid "show only names and status of changed files"
msgstr "n'afficher que les noms et les status des fichiers modifiés"
-#: diff.c:5435
+#: diff.c:5436
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
-#: diff.c:5436
+#: diff.c:5437
msgid "generate diffstat"
msgstr "générer un diffstat"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5439 diff.c:5442 diff.c:5445
msgid "<width>"
msgstr "<largeur>"
-#: diff.c:5439
+#: diff.c:5440
msgid "generate diffstat with a given width"
msgstr "générer un diffstat avec la largeur indiquée"
-#: diff.c:5442
+#: diff.c:5443
msgid "generate diffstat with a given name width"
msgstr "génerer un diffstat avec la largeur de nom indiquée"
-#: diff.c:5445
+#: diff.c:5446
msgid "generate diffstat with a given graph width"
msgstr "génerer un diffstat avec la largeur de graphe indiquée"
-#: diff.c:5447
+#: diff.c:5448
msgid "<count>"
msgstr "<compte>"
-#: diff.c:5448
+#: diff.c:5449
msgid "generate diffstat with limited lines"
msgstr "générer un diffstat avec des lignes limitées"
-#: diff.c:5451
+#: diff.c:5452
msgid "generate compact summary in diffstat"
msgstr "générer une résumé compact dans le diffstat"
-#: diff.c:5454
+#: diff.c:5455
msgid "output a binary diff that can be applied"
msgstr "produire un diff binaire qui peut être appliqué"
-#: diff.c:5457
+#: diff.c:5458
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:5459
+#: diff.c:5460
msgid "show colored diff"
msgstr "afficher un diff coloré"
-#: diff.c:5460
+#: diff.c:5461
msgid "<kind>"
msgstr "<sorte>"
-#: diff.c:5461
+#: diff.c:5462
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3736,7 +3840,7 @@
"surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
"'nouveau' dans le diff"
-#: diff.c:5464
+#: diff.c:5465
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3744,93 +3848,93 @@
"ne pas compresser les chemins et utiliser des NULs comme terminateurs de "
"champs dans --raw ou --numstat"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
msgid "<prefix>"
msgstr "<préfixe>"
-#: diff.c:5468
+#: diff.c:5469
msgid "show the given source prefix instead of \"a/\""
msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""
-#: diff.c:5471
+#: diff.c:5472
msgid "show the given destination prefix instead of \"b/\""
msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""
-#: diff.c:5474
+#: diff.c:5475
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:5477
+#: diff.c:5478
msgid "do not show any source or destination prefix"
msgstr "n'afficher aucun préfixe, ni de source, ni de destination"
-#: diff.c:5480
+#: diff.c:5481
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:5484 diff.c:5489 diff.c:5494
+#: diff.c:5485 diff.c:5490 diff.c:5495
msgid "<char>"
msgstr "<caractère>"
-#: diff.c:5485
+#: diff.c:5486
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:5490
+#: diff.c:5491
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:5495
+#: diff.c:5496
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:5498
+#: diff.c:5499
msgid "Diff rename options"
msgstr "Options de renommage de diff"
-#: diff.c:5499
+#: diff.c:5500
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5501
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:5504
+#: diff.c:5505
msgid "detect renames"
msgstr "détecter les renommages"
-#: diff.c:5508
+#: diff.c:5509
msgid "omit the preimage for deletes"
msgstr "supprimer la pré-image pour les suppressions"
-#: diff.c:5511
+#: diff.c:5512
msgid "detect copies"
msgstr "détecter les copies"
-#: diff.c:5515
+#: diff.c:5516
msgid "use unmodified files as source to find copies"
msgstr ""
"utiliser les fichiers non-modifiés comme sources pour trouver des copies"
-#: diff.c:5517
+#: diff.c:5518
msgid "disable rename detection"
msgstr "désactiver la détection de renommage"
-#: diff.c:5520
+#: diff.c:5521
msgid "use empty blobs as rename source"
msgstr "utiliser des blobs vides comme source de renommage"
-#: diff.c:5522
+#: diff.c:5523
msgid "continue listing the history of a file beyond renames"
msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"
-#: diff.c:5525
+#: diff.c:5526
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3838,165 +3942,165 @@
"empêcher la détection de renommage/copie si le nombre de cibles de renommage/"
"copie excède la limite indiquée"
-#: diff.c:5527
+#: diff.c:5528
msgid "Diff algorithm options"
msgstr "Options de l'algorithme de diff"
-#: diff.c:5529
+#: diff.c:5530
msgid "produce the smallest possible diff"
msgstr "produire le diff le plus petit possible"
-#: diff.c:5532
+#: diff.c:5533
msgid "ignore whitespace when comparing lines"
msgstr "ignorer les espaces lors de la comparaison de ligne"
-#: diff.c:5535
+#: diff.c:5536
msgid "ignore changes in amount of whitespace"
msgstr "ignorer des modifications du nombre d'espaces"
-#: diff.c:5538
+#: diff.c:5539
msgid "ignore changes in whitespace at EOL"
msgstr "ignorer des modifications d'espace en fin de ligne"
-#: diff.c:5541
+#: diff.c:5542
msgid "ignore carrier-return at the end of line"
msgstr "ignore le retour chariot en fin de ligne"
-#: diff.c:5544
+#: diff.c:5545
msgid "ignore changes whose lines are all blank"
msgstr "ignorer les modifications dont les lignes sont vides"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5547
+#: diff.c:5548
msgid "ignore changes whose all lines match <regex>"
msgstr "ignorer les modifications dont les lignes correspondent à <regex>"
-#: diff.c:5550
+#: diff.c:5551
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:5553
+#: diff.c:5554
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""
-#: diff.c:5557
+#: diff.c:5558
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
"générer un diff en utilisant l'algorithme de différence \"histogramme\""
-#: diff.c:5559
+#: diff.c:5560
msgid "<algorithm>"
msgstr "<algorithme>"
-#: diff.c:5560
+#: diff.c:5561
msgid "choose a diff algorithm"
msgstr "choisir un algorithme de différence"
-#: diff.c:5562
+#: diff.c:5563
msgid "<text>"
msgstr "<texte>"
-#: diff.c:5563
+#: diff.c:5564
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5566 diff.c:5575 diff.c:5578
msgid "<mode>"
msgstr "<mode>"
-#: diff.c:5566
+#: diff.c:5567
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:5569
+#: diff.c:5570
msgid "use <regex> to decide what a word is"
msgstr "utiliser <regex> pour décider ce qu'est un mot"
-#: diff.c:5572
+#: diff.c:5573
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5575
+#: diff.c:5576
msgid "moved lines of code are colored differently"
msgstr "les lignes déplacées sont colorées différemment"
-#: diff.c:5578
+#: diff.c:5579
msgid "how white spaces are ignored in --color-moved"
msgstr "comment les espaces sont ignorés dans --color-moved"
-#: diff.c:5581
+#: diff.c:5582
msgid "Other diff options"
msgstr "Autres options diff"
-#: diff.c:5583
+#: diff.c:5584
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:5587
+#: diff.c:5588
msgid "treat all files as text"
msgstr "traiter les fichiers comme texte"
-#: diff.c:5589
+#: diff.c:5590
msgid "swap two inputs, reverse the diff"
msgstr "échanger les entrées, inverser le diff"
-#: diff.c:5591
+#: diff.c:5592
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:5593
+#: diff.c:5594
msgid "disable all output of the program"
msgstr "désactiver tous les affichages du programme"
-#: diff.c:5595
+#: diff.c:5596
msgid "allow an external diff helper to be executed"
msgstr "autoriser l'exécution d'un assistant externe de diff"
-#: diff.c:5597
+#: diff.c:5598
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:5599
+#: diff.c:5600
msgid "<when>"
msgstr "<quand>"
-#: diff.c:5600
+#: diff.c:5601
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:5603
+#: diff.c:5604
msgid "<format>"
msgstr "<format>"
-#: diff.c:5604
+#: diff.c:5605
msgid "specify how differences in submodules are shown"
msgstr "spécifier comment les différences dans les sous-modules sont affichées"
-#: diff.c:5608
+#: diff.c:5609
msgid "hide 'git add -N' entries from the index"
msgstr "masquer les entrées 'git add -N' de l'index"
-#: diff.c:5611
+#: diff.c:5612
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:5613
+#: diff.c:5614
msgid "<string>"
msgstr "<chaîne>"
-#: diff.c:5614
+#: diff.c:5615
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -4004,7 +4108,7 @@
"rechercher les différences qui modifient le nombre d'occurrences de la "
"chaîne spécifiée"
-#: diff.c:5617
+#: diff.c:5618
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -4012,38 +4116,38 @@
"rechercher les différences qui modifient le nombre d'occurrences de la regex "
"spécifiée"
-#: diff.c:5620
+#: diff.c:5621
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:5623
+#: diff.c:5624
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"
-#: diff.c:5626
+#: diff.c:5627
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:5627 diff.c:5630
+#: diff.c:5628 diff.c:5631
msgid "<path>"
msgstr "<chemin>"
-#: diff.c:5628
+#: diff.c:5629
msgid "show the change in the specified path first"
msgstr "afficher la modification dans le chemin spécifié en premier"
-#: diff.c:5631
+#: diff.c:5632
msgid "skip the output to the specified path"
msgstr "sauter la sortie pour le chemin spécifié"
-#: diff.c:5633
+#: diff.c:5634
msgid "<object-id>"
msgstr "<id-objet>"
-#: diff.c:5634
+#: diff.c:5635
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -4051,35 +4155,35 @@
"rechercher les différences qui modifient le nombre d'occurrences de l'objet "
"indiqué"
-#: diff.c:5636
+#: diff.c:5637
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5638
msgid "select files by diff type"
msgstr "sélectionner les fichiers par types de diff"
-#: diff.c:5639
+#: diff.c:5640
msgid "<file>"
msgstr "<fichier>"
-#: diff.c:5640
-msgid "Output to a specific file"
-msgstr "Sortie vers un fichier spécifié"
+#: diff.c:5641
+msgid "output to a specific file"
+msgstr "sortie vers un fichier spécifique"
-#: diff.c:6298
+#: diff.c:6321
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"détection exhaustive de renommage annulée à cause d'un trop grand nombre de "
"fichiers."
-#: diff.c:6301
+#: diff.c:6324
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:6304
+#: diff.c:6327
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -4092,7 +4196,7 @@
msgid "failed to read orderfile '%s'"
msgstr "impossible de lire le fichier de commande '%s'"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Détection de renommage inexact en cours"
@@ -4124,39 +4228,47 @@
"votre fichier d'extraction partielle pourrait présenter des problèmes : le "
"motif '%s' est répété"
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr "désactivation de la correspondance de motif de cone"
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "impossible d'utiliser %s comme fichier d'exclusion"
-#: dir.c:2351
+#: dir.c:2419
#, c-format
msgid "could not open directory '%s'"
msgstr "impossible d'ouvrir le répertoire '%s'"
-#: dir.c:2653
+#: dir.c:2721
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:2777
+#: dir.c:2846
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:3610
+#: dir.c:3119
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Aucun nom de répertoire n'a pu être deviné\n"
+"Veuillez spécifier un répertoire dans la ligne de commande"
+
+#: dir.c:3807
#, c-format
msgid "index file corrupt in repo %s"
msgstr "fichier d'index corrompu dans le dépôt %s"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3854 dir.c:3859
#, c-format
msgid "could not create directories for %s"
msgstr "impossible de créer les répertoires pour %s"
-#: dir.c:3691
+#: dir.c:3888
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
@@ -4168,305 +4280,398 @@
"suggestion : en attente de la fermeture du fichier par votre éditeur de "
"texte…%c"
-#: entry.c:176
+#: entry.c:179
msgid "Filtering content"
msgstr "Filtrage du contenu"
-#: entry.c:497
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "impossible de stat le fichier '%s'"
-#: environment.c:152
+#: environment.c:147
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "espaces de nom de Git \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "impossible de régler GIT_DIR à '%s'"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "trop d'arguments pour lancer %s"
-#: fetch-pack.c:182
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack : liste superficielle attendue"
-#: fetch-pack.c:185
+#: fetch-pack.c:197
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:196
+#: fetch-pack.c:208
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:216
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#: fetch-pack.c:227
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "impossible d'écrire sur un distant"
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc nécessite multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:397 fetch-pack.c:1460
#, c-format
msgid "invalid shallow line: %s"
msgstr "ligne de superficiel invalide : %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:403 fetch-pack.c:1466
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ligne de fin de superficiel invalide : %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:405 fetch-pack.c:1468
#, c-format
msgid "object not found: %s"
msgstr "objet non trouvé : %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:408 fetch-pack.c:1471
#, c-format
msgid "error in object: %s"
msgstr "erreur dans l'objet : %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:410 fetch-pack.c:1473
#, c-format
msgid "no shallow found: %s"
msgstr "pas de superficiel trouvé : %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:413 fetch-pack.c:1477
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "superficiel/non superficiel attendu, %s trouvé"
-#: fetch-pack.c:439
+#: fetch-pack.c:453
#, c-format
msgid "got %s %d %s"
msgstr "réponse %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:470
#, c-format
msgid "invalid commit %s"
msgstr "commit invalide %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:501
msgid "giving up"
msgstr "abandon"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:514 progress.h:25
msgid "done"
msgstr "fait"
-#: fetch-pack.c:512
+#: fetch-pack.c:526
#, c-format
msgid "got %s (%d) %s"
msgstr "%s trouvé (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:562
#, c-format
msgid "Marking %s as complete"
msgstr "Marquage de %s comme terminé"
-#: fetch-pack.c:763
+#: fetch-pack.c:784
#, c-format
msgid "already have %s (%s)"
msgstr "%s déjà possédé (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:870
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
-#: fetch-pack.c:857
+#: fetch-pack.c:878
msgid "protocol error: bad pack header"
msgstr "erreur de protocole : mauvais entête de paquet"
-#: fetch-pack.c:951
+#: fetch-pack.c:974
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack : impossible de dupliquer %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:980
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack : sortie d'index de pack invalide"
-#: fetch-pack.c:974
+#: fetch-pack.c:997
#, c-format
msgid "%s failed"
msgstr "échec de %s"
-#: fetch-pack.c:976
+#: fetch-pack.c:999
msgid "error in sideband demultiplexer"
msgstr "erreur dans le démultiplexer latéral"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1048
#, c-format
msgid "Server version is %.*s"
msgstr "La version du serveur est %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
+#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
+#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
+#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
#, c-format
msgid "Server supports %s"
msgstr "Le serveur supporte %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1058
msgid "Server does not support shallow clients"
msgstr "Le serveur ne supporte les clients superficiels"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1118
msgid "Server does not support --shallow-since"
msgstr "Le receveur ne gère pas --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1123
msgid "Server does not support --shallow-exclude"
msgstr "Le receveur ne gère pas --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1127
msgid "Server does not support --deepen"
msgstr "Le receveur ne gère pas --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1129
msgid "Server does not support this repository's object format"
msgstr "Le serveur ne supporte pas ce format d'objets de ce dépôt"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1142
msgid "no common commits"
msgstr "pas de commit commun"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
msgid "source repository is shallow, reject to clone."
msgstr "le dépôt source est superficiel, clonage rejeté."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1157 fetch-pack.c:1705
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack : échec de le récupération."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1271
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "non-correspondance des algorithmes : client %s ; serveur %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1275
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "le serveur ne supporte pas l'algorithme '%s'"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1308
msgid "Server does not support shallow requests"
msgstr "Le serveur ne supporte pas les requêtes superficielles"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1315
msgid "Server supports filter"
msgstr "Le serveur supporte filter"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1358 fetch-pack.c:2087
msgid "unable to write request to remote"
msgstr "impossible d'écrire la requête sur le distant"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1376
#, c-format
msgid "error reading section header '%s'"
msgstr "erreur à la lecture de l'entête de section '%s'"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1382
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' attendu, '%s' reçu"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1416
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "ligne d'acquittement inattendue : '%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1421
#, c-format
msgid "error processing acks: %d"
msgstr "erreur lors du traitement des acquittements : %d"
-#: fetch-pack.c:1402
-msgid "expected packfile to be sent after 'ready'"
-msgstr "fichier paquet attendu à envoyer après 'ready'"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1435
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "fichier paquet attendu à envoyer après '%s'"
-#: fetch-pack.c:1404
-msgid "expected no other sections to be sent after no 'ready'"
-msgstr "aucune autre section attendue à envoyer après absence de 'ready'"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1441
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "aucune autre section attendue à envoyer après absence de '%s'"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1482
#, c-format
msgid "error processing shallow info: %d"
msgstr "erreur lors du traitement de l'information de superficialité : %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1531
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref attendu, '%s' trouvé"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1536
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inattendu : '%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1541
#, c-format
msgid "error processing wanted refs: %d"
msgstr "erreur lors du traitement des références voulues : %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1571
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack : paquet de fin de réponse attendu"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1983
msgid "no matching remote head"
msgstr "pas de HEAD distante correspondante"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:2006 builtin/clone.c:587
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2109
msgid "unexpected 'ready' from remote"
msgstr "'ready' inattendu depuis le distant"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2132
#, c-format
msgid "no such remote ref %s"
msgstr "référence distante inconnue %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2135
#, 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:273
+#: fsmonitor-ipc.c:119
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query : chemin invalide '%s'"
+
+#: fsmonitor-ipc.c:125
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query : erreur non spécifiée sur '%s'"
+
+#: fsmonitor-ipc.c:155
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon n'est pas en cours d'exécution"
+
+#: fsmonitor-ipc.c:164
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "impossible de lancer la commmand '%s' à fsmonitor--daemon"
+
+#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
+#: gpg-interface.c:1011
msgid "could not create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:459
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "impossible d'écrire la signature détachée dans '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:450
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile doit exister et être configuré pour la "
+"vérification de signature ssh"
+
+#: gpg-interface.c:479
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y -find-principals/verify est nécessaire pour la vérification de "
+"signature ssh (disponible depuis openssh version 8.2p1+)"
+
+#: gpg-interface.c:550
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "fichier de révocation de signature ssh configuré mais non trouvé : %s"
+
+#: gpg-interface.c:638
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "signature incompatible ou mauvaise '%s'"
+
+#: gpg-interface.c:815 gpg-interface.c:820
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "échec d'obtention de l'empreinte ssh pour la clé '%s'"
+
+#: gpg-interface.c:843
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "soit user.signingkey ou gpg.ssh.defaultKeyCommand doit être configuré"
+
+#: gpg-interface.c:865
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand a réussi mais n'a retourné aucune clé : %s %s"
+
+#: gpg-interface.c:871
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand a échoué : %s %s"
+
+#: gpg-interface.c:966
msgid "gpg failed to sign the data"
msgstr "gpg n'a pas pu signer les données"
+#: gpg-interface.c:988
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey doit être configuré pour pour signer avec ssh"
+
+#: gpg-interface.c:999
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "impossible d'écrire la clé de signature ssh dans '%s'"
+
+#: gpg-interface.c:1017
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "impossible d'écrire le tampon de la clé de signature ssh dans '%s'"
+
+#: gpg-interface.c:1035
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y signe est nécessaire pour pouvoir signer avec ssh (disponible "
+"dans openssh version 8.2p1+)"
+
+#: gpg-interface.c:1047
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "impossible de lire le tampon de données de signature ssh depuis '%s'"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
-#: grep.c:531
+#: grep.c:446
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4474,112 +4679,112 @@
"le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "
"supporté qu'avec -P avec PCRE v2"
-#: grep.c:1895
+#: grep.c:1859
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: grep.c:1923
+#: grep.c:1887
#, c-format
msgid "'%s': short read"
msgstr "'%s' : lecture tronquée"
-#: help.c:23
+#: help.c:25
msgid "start a working area (see also: git help tutorial)"
msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"
-#: help.c:24
+#: help.c:26
msgid "work on the current change (see also: git help everyday)"
msgstr ""
"travailler sur la modification actuelle (voir aussi : git help revisions)"
-#: help.c:25
+#: help.c:27
msgid "examine the history and state (see also: git help revisions)"
msgstr "examiner l'historique et l'état (voir aussi : git help revisions)"
-#: help.c:26
+#: help.c:28
msgid "grow, mark and tweak your common history"
msgstr "agrandir, marquer et modifier votre historique"
-#: help.c:27
+#: help.c:29
msgid "collaborate (see also: git help workflows)"
msgstr "collaborer (voir aussi : git help workflows)"
-#: help.c:31
+#: help.c:33
msgid "Main Porcelain Commands"
msgstr "Commandes Porcelaine Principales"
-#: help.c:32
+#: help.c:34
msgid "Ancillary Commands / Manipulators"
msgstr "Commandes Auxiliaires / Manipulateurs"
-#: help.c:33
+#: help.c:35
msgid "Ancillary Commands / Interrogators"
msgstr "Commandes Auxiliaires / Interrogateurs"
-#: help.c:34
+#: help.c:36
msgid "Interacting with Others"
msgstr "Interaction avec d'autres développeurs"
-#: help.c:35
+#: help.c:37
msgid "Low-level Commands / Manipulators"
msgstr "Commandes bas-niveau / Manipulateurs"
-#: help.c:36
+#: help.c:38
msgid "Low-level Commands / Interrogators"
msgstr "Commandes bas niveau / Interrogateurs"
-#: help.c:37
+#: help.c:39
msgid "Low-level Commands / Syncing Repositories"
msgstr "Commandes bas niveau / Synchronisation de dépôts"
-#: help.c:38
+#: help.c:40
msgid "Low-level Commands / Internal Helpers"
msgstr "Commandes bas niveau / Assistants internes"
-#: help.c:300
+#: help.c:316
#, c-format
msgid "available git commands in '%s'"
msgstr "commandes git disponibles dans '%s'"
-#: help.c:307
+#: help.c:323
msgid "git commands available from elsewhere on your $PATH"
msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
-#: help.c:316
+#: help.c:332
msgid "These are common Git commands used in various situations:"
msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
-#: help.c:365 git.c:100
+#: help.c:382 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "type de liste de commandes non supporté '%s'"
-#: help.c:405
+#: help.c:422
msgid "The Git concept guides are:"
msgstr "Les guides des concepts de Git sont :"
-#: help.c:429
+#: help.c:446
+msgid "External commands"
+msgstr "Commandes externes"
+
+#: help.c:468
+msgid "Command aliases"
+msgstr "Alias de commande"
+
+#: help.c:486
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:434
-msgid "External commands"
-msgstr "Commandes externes"
-
-#: help.c:449
-msgid "Command aliases"
-msgstr "Alias de commande"
-
-#: help.c:527
+#: help.c:563
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4588,33 +4793,38 @@
"'%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:543 help.c:631
+#: help.c:585 help.c:682
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."
-#: help.c:591
+#: help.c:633
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ahem. Votre système n'indique aucune commande Git."
-#: help.c:613
+#: help.c:655
#, 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:618
+#: help.c:660
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Continuons en supposant que vous avez voulu dire '%s'."
-#: help.c:623
+#: help.c:666
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Lancer '%s' à la place [y/N] ? "
+
+#: help.c:674
#, 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:635
+#: help.c:686
msgid ""
"\n"
"The most similar command is"
@@ -4628,16 +4838,16 @@
"\n"
"Les commandes les plus ressemblantes sont"
-#: help.c:675
+#: help.c:729
msgid "git version [<options>]"
msgstr "git version [<options>]"
-#: help.c:730
+#: help.c:784
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:788
msgid ""
"\n"
"Did you mean this?"
@@ -4651,15 +4861,30 @@
"\n"
"Vouliez-vous dire un de ceux-là ?"
-#: ident.c:353
+#: hook.c:28
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"
+"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "
+"false`."
+
+#: hook.c:87
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "impossible de démarrer le crochet '%s'\n"
+
+#: ident.c:354
msgid "Author identity unknown\n"
msgstr "Identité d'auteur inconnue\n"
-#: ident.c:356
+#: ident.c:357
msgid "Committer identity unknown\n"
msgstr "Indentité de validateur inconnue\n"
-#: ident.c:362
+#: ident.c:363
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -4685,72 +4910,72 @@
"Éliminez --global pour ne faire les réglages que dans ce dépôt.\n"
"\n"
-#: ident.c:397
+#: ident.c:398
msgid "no email was given and auto-detection is disabled"
msgstr "aucun courriel fourni et l'auto-détection est désactivée"
-#: ident.c:402
+#: ident.c:403
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)"
-#: ident.c:419
+#: ident.c:420
msgid "no name was given and auto-detection is disabled"
msgstr "aucun nom fourni et l'auto-détection est désactivée"
-#: ident.c:425
+#: ident.c:426
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)"
-#: ident.c:433
+#: ident.c:434
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "nom d'identifiant vide (pour <%s>) non permis"
-#: ident.c:439
+#: ident.c:440
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "le nom n'est constitué que de caractères interdits : %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:455 builtin/commit.c:649
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
-#: list-objects-filter-options.c:83
+#: list-objects-filter-options.c:68
msgid "expected 'tree:<depth>'"
msgstr "attendu : 'tree:<profondeur>'"
-#: list-objects-filter-options.c:98
+#: list-objects-filter-options.c:83
msgid "sparse:path filters support has been dropped"
msgstr "sparse : le support des filtres de chemin a été abandonné"
-#: list-objects-filter-options.c:105
+#: list-objects-filter-options.c:90
#, c-format
msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "'%s' pour 'object:type=<type>' n'est pas un type d'objet valide"
-#: list-objects-filter-options.c:124
+#: list-objects-filter-options.c:109
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "spécificateur de filtre invalide '%s'"
-#: list-objects-filter-options.c:140
+#: list-objects-filter-options.c:125
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr ""
"le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'"
-#: list-objects-filter-options.c:182
+#: list-objects-filter-options.c:167
msgid "expected something after combine:"
msgstr "quelque chose attendu après combine :"
-#: list-objects-filter-options.c:264
+#: list-objects-filter-options.c:249
msgid "multiple filter-specs cannot be combined"
msgstr "impossible de combiner des spécificateurs multiples de filtre"
-#: list-objects-filter-options.c:376
+#: list-objects-filter-options.c:365
msgid "unable to upgrade repository format to support partial clone"
msgstr ""
"impossible de mettre à jour le format de dépôt pour supporter les clones "
@@ -4766,19 +4991,19 @@
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
+#: list-objects.c:144
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
"l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"
-#: list-objects.c:140
+#: list-objects.c:157
#, 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:398
+#: list-objects.c:415
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "impossible de charger l'arbre racine pour le commit %s"
@@ -4807,12 +5032,12 @@
msgid "Unable to create '%s.lock': %s"
msgstr "Impossible de créer '%s.lock' : %s"
-#: ls-refs.c:37
+#: ls-refs.c:175
#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "valeur invalide '%s' pour lsrefs.unborn"
+msgid "unexpected line: '%s'"
+msgstr "ligne inattendue : '%s'"
-#: ls-refs.c:167
+#: ls-refs.c:179
msgid "expected flush after ls-refs arguments"
msgstr "vidage attendu après les arguments ls-refs"
@@ -4820,39 +5045,39 @@
msgid "quoted CRLF detected"
msgstr "CRLF citées détectées"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "action invalide '%s' pour '%s'"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1630 merge-recursive.c:1214
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Échec de la fusion du sous-module %s (non extrait)"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1639 merge-recursive.c:1221
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Échec de fusion du sous-module %s (commits non présents)"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1648 merge-recursive.c:1228
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Échec de la fusion du sous-module %s (les commits ne descendent pas de la "
"base de fusion)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1658 merge-ort.c:1666
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Note : Avance rapide du sous-module %s à %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1688
#, c-format
msgid "Failed to merge submodule %s"
msgstr "Échec de la fusion du sous-module %s"
-#: merge-ort.c:1632
+#: merge-ort.c:1695
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4862,7 +5087,7 @@
"existe :\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1699 merge-recursive.c:1284
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4879,7 +5104,7 @@
"\n"
"qui acceptera cette suggestion.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1712
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4889,21 +5114,21 @@
"existent :\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1937 merge-recursive.c:1375
msgid "Failed to execute internal merge"
msgstr "Échec à l'exécution de la fusion interne"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1942 merge-recursive.c:1380
#, c-format
msgid "Unable to add %s to database"
msgstr "Impossible d'ajouter %s à la base de données"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1949 merge-recursive.c:1413
#, c-format
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2088 merge-recursive.c:2135
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4912,7 +5137,7 @@
"CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "
"des renommages implicites de répertoire déplaçant les chemins suivants : %s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2098 merge-recursive.c:2145
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4921,7 +5146,7 @@
"CONFLIT (renommage implicite de répertoire) : impossible de transformer "
"plusieurs chemins sur %s ; les chemins concernés sont : %s"
-#: merge-ort.c:2087
+#: merge-ort.c:2156
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4932,7 +5157,7 @@
"parce que le répertoire a été renommé en plusieurs autres répertoires, sans "
"aucune destination récupérant la majorité des fichiers."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2310 merge-recursive.c:2481
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4941,7 +5166,7 @@
"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "
"renommé."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2450 merge-recursive.c:3264
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4950,7 +5175,7 @@
"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "
"en %s ; déplacé dans %s."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2457 merge-recursive.c:3271
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4959,7 +5184,7 @@
"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "
"renommé en %s ; déplacé dans %s."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2470 merge-recursive.c:3267
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4969,7 +5194,7 @@
"a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "
"vers %s."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2478 merge-recursive.c:3274
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4979,13 +5204,13 @@
"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "
"être déplacé vers %s."
-#: merge-ort.c:2569
+#: merge-ort.c:2634
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"CONFLIT (renommage/renommage) : %s renommé en %s dans %s et en %s dans %s."
-#: merge-ort.c:2664
+#: merge-ort.c:2729
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4996,24 +5221,24 @@
"des conflits de contenu ET entre en collision avec un autre chemin ; ceci "
"peut resulter en des marqueurs de conflit imbriqués."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2748 merge-ort.c:2772
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"CONFLIT (renommage/suppression) : Renommage de %s en %s dans %s mais "
"supprimé dans %s."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3261 merge-recursive.c:3025
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3264 merge-recursive.c:3028
#, c-format
msgid "object %s is not a blob"
msgstr "l'objet %s n'est pas un blob"
-#: merge-ort.c:3613
+#: merge-ort.c:3693
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -5022,7 +5247,7 @@
"CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; "
"déplacement dans %s à la place."
-#: merge-ort.c:3689
+#: merge-ort.c:3770
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -5031,7 +5256,7 @@
"CONFLIT (types différents) : %s a des types différents des deux côtés ; "
"renommé chacune de manière à pouvoir enregistrer les deux quelque part."
-#: merge-ort.c:3696
+#: merge-ort.c:3777
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -5041,24 +5266,24 @@
"renommé une d'entre elles de manière à pouvoir enregistrer les deux quelque "
"part."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3866 merge-recursive.c:3104
msgid "content"
msgstr "contenu"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3868 merge-recursive.c:3108
msgid "add/add"
msgstr "ajout/ajout"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3870 merge-recursive.c:3153
msgid "submodule"
msgstr "sous-module"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3872 merge-recursive.c:3154
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3916
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -5067,7 +5292,7 @@
"CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. "
"Version %s de %s laissée dans l'arbre."
-#: merge-ort.c:4120
+#: merge-ort.c:4212
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5079,12 +5304,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4586
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3723
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -5094,106 +5319,106 @@
"fusion :\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
msgid "Already up to date."
msgstr "Déjà à jour."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(mauvais commit)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "impossible de créer le chemin '%s' %s"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": peut-être un conflit D/F ?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "refus de perdre le fichier non suivi '%s'"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:47
#, c-format
msgid "cannot read object %s '%s'"
msgstr "impossible de lire l'objet %s '%s'"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob attendu pour %s '%s'"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "échec à l'ouverture de '%s' : %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "échec à la création du lien symbolique '%s' : %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "ne sait pas traiter %06o %s '%s'"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Avance rapide du sous-module %s au commit suivant :"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1239 merge-recursive.c:1252
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avance rapide du sous-module %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1280
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1281
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1293
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1437
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "
"place."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5202,7 +5427,7 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1514
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5211,7 +5436,7 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
"%s de %s laissée dans l'arbre."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1521
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5220,7 +5445,7 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre dans le fichier %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5229,61 +5454,61 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
"%s de %s laissée dans l'arbre dans le fichier %s."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "rename"
msgstr "renommage"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Refus de perdre le fichier modifié %s"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1622
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1680
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1711
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1716
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1743
#, c-format
msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+"\"%s\"->\"%s\" in \"%s\"%s"
msgstr ""
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1748
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1840
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
">'%s' dans %s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2103
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5294,7 +5519,7 @@
"parce que le répertoire %s a été renommé en plusieurs autres répertoires, "
"sans aucune destination récupérant la majorité des fichiers."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2237
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5303,80 +5528,80 @@
"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "
"Renommage de répertoire %s->%s dans %s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modified"
msgstr "modifié"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3131
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3184
#, c-format
msgid "Adding as %s instead"
msgstr "Ajout plutôt comme %s"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3388
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3411
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3416
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3423
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
-#: merge-recursive.c:3415
+#: merge-recursive.c:3432
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3441
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3494
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3588
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3601
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u ancêtre commun trouvé :"
msgstr[1] "%u ancêtres communs trouvés :"
-#: merge-recursive.c:3634
+#: merge-recursive.c:3651
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3823
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
@@ -5384,142 +5609,178 @@
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
+#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
-#: midx.c:74
+#: midx.c:79
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "l'étalement de l'OID d'index multi-paquet n'a pas la bonne taille"
-#: midx.c:105
+#: midx.c:112
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "le fichier d'index multi-paquet %s est trop petit"
-#: midx.c:121
+#: midx.c:128
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
"la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "
"0x%08x"
-#: midx.c:126
+#: midx.c:133
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "la version d'index multi-paquet %d n'est pas reconnue"
-#: midx.c:131
+#: midx.c:138
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
"la version d'empreinte d'index multi-paquet %u ne correspond pas à la "
"version %u"
-#: midx.c:148
+#: midx.c:155
msgid "multi-pack-index missing required pack-name chunk"
msgstr "index multi-paquet manque de tronçon de nom de paquet"
-#: midx.c:150
+#: midx.c:157
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"
-#: midx.c:152
+#: midx.c:159
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "index multi-paquet manque de tronçon de recherche OID requis"
-#: midx.c:154
+#: midx.c:161
msgid "multi-pack-index missing required object offsets chunk"
msgstr "index multi-paquet manque de tronçon de décalage d'objet requis"
-#: midx.c:170
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"
-#: midx.c:214
+#: midx.c:228
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mauvais pack-int-id : %u (%u paquets au total)"
-#: midx.c:264
+#: midx.c:278
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"l'index multi-paquet stock un décalage en 64-bit, mais off_t est trop petit"
-#: midx.c:490
+#: midx.c:509
#, c-format
msgid "failed to add packfile '%s'"
msgstr "échec de l'ajout du fichier paquet '%s'"
-#: midx.c:496
+#: midx.c:515
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "échec à l'ouverture du fichier paquet '%s'"
-#: midx.c:564
+#: midx.c:583
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "échec de localisation de l'objet %d dans le fichier paquet"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:911
msgid "cannot store reverse index file"
msgstr "impossible de stocker le fichier d'index inversé"
-#: midx.c:920
+#: midx.c:1009
+#, c-format
+msgid "could not parse line: %s"
+msgstr "impossible d'analyser la ligne : %s"
+
+#: midx.c:1011
+#, c-format
+msgid "malformed line: %s"
+msgstr "ligne malformée : %s"
+
+#: midx.c:1181
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr ""
"index multi-paquet existant ignoré ; non-concordance de la somme de contrôle"
-#: midx.c:943
+#: midx.c:1206
+msgid "could not load pack"
+msgstr "impossible de charger le paquet"
+
+#: midx.c:1212
+#, c-format
+msgid "could not open index for %s"
+msgstr "impossible d'ouvrir l'index pour %s"
+
+#: midx.c:1223
msgid "Adding packfiles to multi-pack-index"
msgstr "Ajout de fichiers paquet à un index multi-paquet"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "fichier paquet à éliminer %s non trouvé"
-
-#: midx.c:1034
+#: midx.c:1266
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "paquet préféré inconnu : %s"
-#: midx.c:1039
+#: midx.c:1311
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "impossible de sélectionner le paquet préféré %s avec aucun objet"
+
+#: midx.c:1343
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "fichier paquet à éliminer %s non trouvé"
+
+#: midx.c:1389
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "le paquet préféré '%s' est expiré"
-#: midx.c:1055
+#: midx.c:1402
msgid "no pack files to index."
msgstr "aucun fichier paquet à l'index."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1409
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "refus d'écrire le .bitmap multi-paquet sans aucun objet"
+
+#: midx.c:1451
+msgid "could not write multi-pack bitmap"
+msgstr "impossible d'écrire le bitmap multi-paquet"
+
+#: midx.c:1461
+msgid "could not write multi-pack-index"
+msgstr "échec de l'écriture de l'index de multi-paquet"
+
+#: midx.c:1520 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "échec de la suppression de %s"
-#: midx.c:1166
+#: midx.c:1553
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "échec du nettoyage de l'index de multi-paquet à %s"
-#: midx.c:1225
+#: midx.c:1616
msgid "multi-pack-index file exists, but failed to parse"
msgstr "le fichier d'index multi-paquet existe mais n'a pu être analysé"
-#: midx.c:1233
+#: midx.c:1624
msgid "incorrect checksum"
msgstr "somme de contrôle incorrecte"
-#: midx.c:1236
+#: midx.c:1627
msgid "Looking for referenced packfiles"
msgstr "Recherche de fichiers paquets référencés"
-#: midx.c:1251
+#: midx.c:1642
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5527,55 +5788,55 @@
"étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "
"étalement[%d]"
-#: midx.c:1256
+#: midx.c:1647
msgid "the midx contains no oid"
msgstr "le midx ne contient aucun oid"
-#: midx.c:1265
+#: midx.c:1656
msgid "Verifying OID order in multi-pack-index"
msgstr "Vérification de l'ordre des OID dans l'index multi-paquet"
-#: midx.c:1274
+#: midx.c:1665
#, 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:1294
+#: midx.c:1685
msgid "Sorting objects by packfile"
msgstr "Classement des objets par fichier paquet"
-#: midx.c:1301
+#: midx.c:1692
msgid "Verifying object offsets"
msgstr "Vérification des décalages des objets"
-#: midx.c:1317
+#: midx.c:1708
#, 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:1323
+#: midx.c:1714
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "impossible de lire le fichier paquet %s"
-#: midx.c:1332
+#: midx.c:1723
#, 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:1357
+#: midx.c:1750
msgid "Counting referenced objects"
msgstr "Comptage des objets référencés"
-#: midx.c:1367
+#: midx.c:1760
msgid "Finding and deleting unreferenced packfiles"
msgstr "Recherche et effacement des fichiers paquets non-référencés"
-#: midx.c:1558
+#: midx.c:1952
msgid "could not start pack-objects"
msgstr "impossible de démarrer le groupement d'objets"
-#: midx.c:1578
+#: midx.c:1972
msgid "could not finish pack-objects"
msgstr "impossible de finir le groupement d'objets"
@@ -5594,7 +5855,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "impossible de joindre le fil lazy_name : %s"
-#: notes-merge.c:277
+#: notes-merge.c:276
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -5605,7 +5866,7 @@
"Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' "
"pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."
-#: notes-merge.c:284
+#: notes-merge.c:283
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
@@ -5633,275 +5894,346 @@
msgid "Bad %s value: '%s'"
msgstr "Mauvaise valeur de %s : '%s'"
-#: object-file.c:526
+#: object-file.c:457
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:515
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "impossible de normaliser le chemin d'objet alternatif : %s"
-#: object-file.c:658
+#: object-file.c:589
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"
-#: object-file.c:665
+#: object-file.c:596
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "impossible de normaliser le répertoire d'objet : %s"
-#: object-file.c:708
+#: object-file.c:639
msgid "unable to fdopen alternates lockfile"
msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
-#: object-file.c:726
+#: object-file.c:657
msgid "unable to read alternates file"
msgstr "lecture du fichier d'alternatives impossible"
-#: object-file.c:733
+#: object-file.c:664
msgid "unable to move new alternates file into place"
msgstr "impossible de déplacer le nouveau fichier d'alternative"
-#: object-file.c:768
+#: object-file.c:742
#, c-format
msgid "path '%s' does not exist"
msgstr "le chemin '%s' n'existe pas"
-#: object-file.c:789
+#: object-file.c:763
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
"encore supporté."
-#: object-file.c:795
+#: object-file.c:769
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
-#: object-file.c:801
+#: object-file.c:775
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "le dépôt de référence '%s' est superficiel"
-#: object-file.c:809
+#: object-file.c:783
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
-#: object-file.c:869
+#: object-file.c:814
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "impossible de trouver le répertoire objet correspondant à %s"
+
+#: object-file.c:864
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
-#: object-file.c:1019
+#: object-file.c:1014
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1049
#, c-format
msgid "mmap failed%s"
msgstr "échec de mmap%s"
-#: object-file.c:1218
+#: object-file.c:1230
#, c-format
msgid "object file %s is empty"
msgstr "le fichier objet %s est vide"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1349 object-file.c:2588
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objet libre corrompu '%s'"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1351 object-file.c:2592
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "données incorrectes à la fin de l'objet libre '%s'"
-#: object-file.c:1397
+#: object-file.c:1473
+#, c-format
+msgid "unable to parse %s header"
+msgstr "impossible d'analyser l'entête %s"
+
+#: object-file.c:1475
msgid "invalid object type"
msgstr "type d'objet invalide"
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "impossible de dépaqueter l'entête %s avec --allow-unknown-type"
-
-#: object-file.c:1484
+#: object-file.c:1486
#, c-format
msgid "unable to unpack %s header"
msgstr "impossible de dépaqueter l'entête %s"
#: object-file.c:1490
#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "impossible d'analyser l'entête %s avec --allow-unknown-type"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "entête de %s trop long, attendu %d octets"
-#: object-file.c:1493
-#, c-format
-msgid "unable to parse %s header"
-msgstr "impossible d'analyser l'entête %s"
-
-#: object-file.c:1717
+#: object-file.c:1720
#, c-format
msgid "failed to read object %s"
msgstr "impossible de lire l'objet %s"
-#: object-file.c:1721
+#: object-file.c:1724
#, c-format
msgid "replacement %s not found for %s"
msgstr "remplacement %s non trouvé pour %s"
-#: object-file.c:1725
+#: object-file.c:1728
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "l'objet libre %s (stocké dans %s) est corrompu"
-#: object-file.c:1729
+#: object-file.c:1732
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
-#: object-file.c:1834
+#: object-file.c:1855
#, c-format
msgid "unable to write file %s"
msgstr "impossible d'écrire le fichier %s"
-#: object-file.c:1841
+#: object-file.c:1862
#, c-format
msgid "unable to set permission to '%s'"
msgstr "impossible de régler les droits de '%s'"
-#: object-file.c:1848
+#: object-file.c:1869
msgid "file write error"
msgstr "erreur d'écriture d'un fichier"
-#: object-file.c:1868
+#: object-file.c:1904
msgid "error when closing loose object file"
msgstr "erreur en fermeture du fichier d'objet esseulé"
-#: object-file.c:1933
+#: object-file.c:1971
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
-#: object-file.c:1935
+#: object-file.c:1973
msgid "unable to create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: object-file.c:1959
+#: object-file.c:1997
msgid "unable to write loose object file"
msgstr "impossible d'écrire le fichier d'objet esseulé"
-#: object-file.c:1965
+#: object-file.c:2003
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "impossible de compresser le nouvel objet %s (%d)"
-#: object-file.c:1969
+#: object-file.c:2007
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "échec de deflateEnd sur l'objet %s (%d)"
-#: object-file.c:1973
+#: object-file.c:2011
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "données de source d'objet instable pour %s"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:2022 builtin/pack-objects.c:1251
#, c-format
msgid "failed utime() on %s"
msgstr "échec de utime() sur %s"
-#: object-file.c:2060
+#: object-file.c:2100
#, c-format
msgid "cannot read object for %s"
msgstr "impossible de lire l'objet pour %s"
-#: object-file.c:2111
+#: object-file.c:2151
msgid "corrupt commit"
msgstr "commit corrompu"
-#: object-file.c:2119
+#: object-file.c:2159
msgid "corrupt tag"
msgstr "étiquette corrompue"
-#: object-file.c:2219
+#: object-file.c:2259
#, c-format
msgid "read error while indexing %s"
msgstr "erreur de lecture à l'indexation de %s"
-#: object-file.c:2222
+#: object-file.c:2262
#, c-format
msgid "short read while indexing %s"
msgstr "lecture tronquée pendant l'indexation de %s"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2335 object-file.c:2345
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s : échec de l'insertion dans la base de données"
-#: object-file.c:2311
+#: object-file.c:2351
#, c-format
msgid "%s: unsupported file type"
msgstr "%s : type de fichier non supporté"
-#: object-file.c:2335
+#: object-file.c:2375 builtin/fetch.c:1494
#, c-format
msgid "%s is not a valid object"
msgstr "%s n'est pas un objet valide"
-#: object-file.c:2337
+#: object-file.c:2377
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s n'est pas un objet '%s' valide"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2404
#, c-format
msgid "unable to open %s"
msgstr "impossible d'ouvrir %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2599
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "incohérence de hachage pour %s (%s attendu)"
-#: object-file.c:2583
+#: object-file.c:2622
#, c-format
msgid "unable to mmap %s"
msgstr "impossible de mmap %s"
-#: object-file.c:2588
+#: object-file.c:2628
#, c-format
msgid "unable to unpack header of %s"
msgstr "impossible de dépaqueter l'entête de %s"
-#: object-file.c:2594
+#: object-file.c:2633
#, c-format
msgid "unable to parse header of %s"
msgstr "impossible d'analyser l'entête de %s"
-#: object-file.c:2605
+#: object-file.c:2644
#, c-format
msgid "unable to unpack contents of %s"
msgstr "impossible de dépaqueter le contenu de %s"
-#: object-name.c:480
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c:382
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [mauvais objet]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c:407
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s commit %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c:428
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s étiquette %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#. "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c:439
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [mauvaise étiquette, impossible à analyser]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c:447
+#, c-format
+msgid "%s tree"
+msgstr "arbre %s"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c:453
+#, c-format
+msgid "%s blob"
+msgstr "blob %s"
+
+#: object-name.c:569
#, c-format
msgid "short object ID %s is ambiguous"
msgstr "l'id court d'objet %s est ambigu"
-#: object-name.c:491
-msgid "The candidates are:"
-msgstr "Les candidats sont :"
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c:591
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Les candidats sont :\n"
+"%s"
-#: object-name.c:790
+#: object-name.c:888
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5925,22 +6257,22 @@
"message\n"
"en lançant \"git config advice.objectNameWarning false\""
-#: object-name.c:910
+#: object-name.c:1008
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "le journal de '%.*s' ne remonte qu'à %s"
-#: object-name.c:918
+#: object-name.c:1016
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "le journal de '%.*s' n'a que %d entrées"
-#: object-name.c:1696
+#: object-name.c:1794
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "le chemin '%s' existe sur le disque, mais pas dans '%.*s'"
-#: object-name.c:1702
+#: object-name.c:1800
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
@@ -5949,12 +6281,12 @@
"le chemin '%s' existe, mais pas '%s'\n"
"conseil : peut-être vouliez-vous dire '%.*s:%s', soit '%.*s:./%s' ?"
-#: object-name.c:1711
+#: object-name.c:1809
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "le chemin '%s' n'existe pas dans '%.*s'"
-#: object-name.c:1739
+#: object-name.c:1837
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
@@ -5963,7 +6295,7 @@
"le chemin '%s' est dans l'index, mais pas à l'étape %d\n"
"conseil : vous vouliez peut-être dire ':%d:%s' ?"
-#: object-name.c:1755
+#: object-name.c:1853
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
@@ -5972,23 +6304,28 @@
"le chemin '%s' est dans l'index, mais pas '%s'\n"
"conseil : peut-être vouliez-vous dire ':%d:%s', soit '%d:./%s' ?"
-#: object-name.c:1763
+#: object-name.c:1861
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "le chemin '%s' existe sur le disque, mais pas dans l'index"
-#: object-name.c:1765
+#: object-name.c:1863
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)"
-#: object-name.c:1778
+#: object-name.c:1876
msgid "relative path syntax can't be used outside working tree"
msgstr ""
"la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de "
"travail"
-#: object-name.c:1916
+#: object-name.c:1901
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<objet>:<chemin> nécessaire, seul <objet> '%s' a été fourni"
+
+#: object-name.c:2014
#, c-format
msgid "invalid object name '%.*s'."
msgstr "nom d'objet invalide : '%.*s'."
@@ -6013,17 +6350,30 @@
msgid "unable to parse object: %s"
msgstr "impossible d'analyser l'objet : %s"
-#: object.c:283 object.c:295
+#: object.c:283 object.c:294
#, c-format
msgid "hash mismatch %s"
msgstr "incohérence de hachage %s"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "l'index inverse requis manque dans l'index multi-paquet"
+
+#: pack-bitmap.c:433
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index : impossible d'ouvrir le paquet"
+
+#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
#, c-format
msgid "unable to get size of %s"
msgstr "impossible de récupérer la taille de %s"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1937
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "impossible de trouver %s dans le paquet %s à l'offset %<PRIuMAX>"
+
+#: pack-bitmap.c:1973 builtin/rev-list.c:91
#, c-format
msgid "unable to get disk usage of %s"
msgstr "impossible de récupérer l'utilisation du disque de %s"
@@ -6053,130 +6403,135 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "le fichier d'index inverse %s a un id d'empreinte non géré %<PRIu32>"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "impossible de lire et vérifier à la fois l'index inverse"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "stat impossible de %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "échec de rendre %s lisible"
-#: pack-write.c:522
+#: pack-write.c:521
#, c-format
msgid "could not write '%s' promisor file"
msgstr "impossible d'écrire le fichier de prometteur '%s'"
-#: packfile.c:625
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-#: packfile.c:655
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "le fichier paquet %s ne peut être mmap%s"
-#: packfile.c:1934
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
-#: packfile.c:1938
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "l'option '%s' attend une valeur numérique"
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "date d'expiration malformée : '%s'"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\""
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
-#: parse-options.c:38
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "l'option '%s' attend \"%s\" ou \"%s\""
+
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s a besoin d'une valeur"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s est incompatible avec %s"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s est incompatible avec toute autre option"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s n'accepte aucune valeur"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s n'est pas disponible"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s attend une valeur entière non négative avec une suffixe k/m/g"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "alias pour --%s"
-#: parse-options.c:879
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "option inconnue « %s »"
-#: parse-options.c:881
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "bascule inconnue « %c »"
-#: parse-options.c:883
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "option non-ascii inconnue dans la chaîne : '%s'"
-#: parse-options.c:907
+#: parse-options.c:920
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
@@ -6184,51 +6539,75 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-NUM"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "Impossible de rendre %s inscriptible pour le groupe"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une "
"valeur d'attribut"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Une seule spécification 'attr:' est autorisée."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "un spécificateur d'attribut ne peut pas être vide"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "nom d'attribut invalide %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont "
"incompatibles"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6236,53 +6615,53 @@
"le réglage global de spécificateur de chemin 'literal' est incompatible avec "
"tous les autres réglages globaux de spécificateur de chemin"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s : 'literal' et 'glob' sont incompatibles"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s : '%s' est hors du dépôt à '%s'"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (mnémonique : '%c')"
-#: pathspec.c:552
+#: pathspec.c:551
#, 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:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "le chemin '%s' est au-delà d'un lien symbolique"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "la ligne est mal citée : %s"
@@ -6303,7 +6682,7 @@
msgid "flush packet write failed"
msgstr "échec de l'écriture du vidage de paquet"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "erreur de protocole : ligne impossiblement trop longue"
@@ -6311,7 +6690,7 @@
msgid "packet write with format failed"
msgstr "échec de l'écriture d'un paquet avec format"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale "
@@ -6322,25 +6701,25 @@
msgid "packet write failed: %s"
msgstr "échec de l'écriture d'un paquet : %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "erreur de lecture"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "l'hôte distant a fermé la connexion de manière inattendue"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "erreur de protocole : mauvaise longueur de ligne %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "erreur distante : %s"
@@ -6354,7 +6733,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "impossible de créer le lstat en fil : %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
@@ -6387,20 +6766,20 @@
msgid "Removing duplicate objects"
msgstr "Suppression des objets dupliqués"
-#: range-diff.c:78
+#: range-diff.c:68
msgid "could not start `log`"
msgstr "impossible de démarrer `log`"
-#: range-diff.c:80
+#: range-diff.c:70
msgid "could not read `log` output"
msgstr "impossible de lire la sortie de `log`"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:98 sequencer.c:5575
#, c-format
msgid "could not parse commit '%s'"
msgstr "impossible d'analyser le commit '%s'"
-#: range-diff.c:115
+#: range-diff.c:109
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6409,70 +6788,66 @@
"impossible d'analyser la première ligne de la sortie de `log` : ne commence "
"pas par 'commit' : '%s'"
-#: range-diff.c:140
+#: range-diff.c:132
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "impossible d'analyser l'entête git '%.*s'"
-#: range-diff.c:307
+#: range-diff.c:300
msgid "failed to generate diff"
msgstr "échec de la génération de diff"
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only et --right-only sont mutuellement exclusifs"
-
-#: range-diff.c:562 range-diff.c:564
+#: range-diff.c:558 range-diff.c:560
#, c-format
msgid "could not parse log for '%s'"
msgstr "impossible d'analyser le journal pour '%s'"
-#: read-cache.c:710
+#: read-cache.c:737
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "pas d'ajout d'alias de fichier '%s'(« %s » existe déjà dans l'index)"
-#: read-cache.c:726
+#: read-cache.c:753
msgid "cannot create an empty blob in the object database"
msgstr "impossible de créer un blob vide dans la base de donnée d'objets"
-#: read-cache.c:748
+#: read-cache.c:775
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des "
"répertoires git"
-#: read-cache.c:753
+#: read-cache.c:780 builtin/submodule--helper.c:3359
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' n'a pas de commit extrait"
-#: read-cache.c:805
+#: read-cache.c:832
#, c-format
msgid "unable to index file '%s'"
msgstr "indexation du fichier '%s' impossible"
-#: read-cache.c:824
+#: read-cache.c:851
#, c-format
msgid "unable to add '%s' to index"
msgstr "impossible d'ajouter '%s' à l'index"
-#: read-cache.c:835
+#: read-cache.c:862
#, c-format
msgid "unable to stat '%s'"
msgstr "fstat de '%s' impossible"
-#: read-cache.c:1358
+#: read-cache.c:1404
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' existe à la fois comme un fichier et un répertoire"
-#: read-cache.c:1573
+#: read-cache.c:1619
msgid "Refresh index"
msgstr "Rafraîchir l'index"
-#: read-cache.c:1705
+#: read-cache.c:1751
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6481,7 +6856,7 @@
"index.version renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1715
+#: read-cache.c:1761
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6490,143 +6865,147 @@
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1771
+#: read-cache.c:1817
#, c-format
msgid "bad signature 0x%08x"
msgstr "signature incorrecte 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1820
#, c-format
msgid "bad index version %d"
msgstr "mauvaise version d'index %d"
-#: read-cache.c:1783
+#: read-cache.c:1829
msgid "bad index file sha1 signature"
msgstr "mauvaise signature sha1 d'index"
-#: read-cache.c:1817
+#: read-cache.c:1863
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "l'index utilise l'extension %.4s qui n'est pas comprise"
-#: read-cache.c:1819
+#: read-cache.c:1865
#, c-format
msgid "ignoring %.4s extension"
msgstr "extension %.4s ignorée"
-#: read-cache.c:1856
+#: read-cache.c:1902
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "format d'entrée d'index inconnu 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1918
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "champ de nom malformé dans l'index, près du chemin '%s'"
-#: read-cache.c:1929
+#: read-cache.c:1975
msgid "unordered stage entries in index"
msgstr "entrées de préparation non ordonnées dans l'index"
-#: read-cache.c:1932
+#: read-cache.c:1978
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "entrées multiples de préparation pour le fichier fusionné '%s'"
-#: read-cache.c:1935
+#: read-cache.c:1981
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "entrées de préparation non ordonnées pour '%s'"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
+#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
+#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
+#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
+#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
+#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: read-cache.c:2185
+#: read-cache.c:2240
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "impossible de créer le fil load_cache_entries : %s"
-#: read-cache.c:2198
+#: read-cache.c:2253
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "impossible de joindre le fil load_cache_entries : %s"
-#: read-cache.c:2231
+#: read-cache.c:2286
#, c-format
msgid "%s: index file open failed"
msgstr "%s : l'ouverture du fichier d'index a échoué"
-#: read-cache.c:2235
+#: read-cache.c:2290
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s : impossible de faire un stat sur l'index ouvert"
-#: read-cache.c:2239
+#: read-cache.c:2294
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s : fichier d'index plus petit qu'attendu"
-#: read-cache.c:2243
+#: read-cache.c:2298
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s : impossible de mapper le fichier d'index%s"
-#: read-cache.c:2286
+#: read-cache.c:2341
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "impossible de créer le fil load_index_extensions : %s"
-#: read-cache.c:2313
+#: read-cache.c:2368
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "impossible de joindre le fil load_index_extensions : %s"
-#: read-cache.c:2351
+#: read-cache.c:2414
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "impossible de rafraîchir l'index partagé '%s'"
-#: read-cache.c:2398
+#: read-cache.c:2473
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "index cassé, %s attendu dans %s, %s obtenu"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3032
+msgid "cannot write split index for a sparse index"
+msgstr "impossible d'écrire un index scindé pour un index clairsemé"
+
+#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
#, c-format
msgid "could not close '%s'"
msgstr "impossible de fermer '%s'"
-#: read-cache.c:3075
+#: read-cache.c:3157
msgid "failed to convert to a sparse-index"
msgstr "échec de conversion d'un index clairsemé"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3228
#, c-format
msgid "could not stat '%s'"
msgstr "impossible de stat '%s'"
-#: read-cache.c:3159
+#: read-cache.c:3241
#, c-format
msgid "unable to open git dir: %s"
msgstr "impossible d'ouvrir le répertoire git : %s"
-#: read-cache.c:3171
+#: read-cache.c:3253
#, c-format
msgid "unable to unlink: %s"
msgstr "échec lors de l'unlink : %s"
-#: read-cache.c:3200
+#: read-cache.c:3282
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "impossible de régler les bits de droit de '%s'"
-#: read-cache.c:3349
+#: read-cache.c:3439
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s : impossible de revenir à l'étape 0"
@@ -6706,7 +7085,7 @@
msgstr[0] "Rebasage de %s sur %s (%d commande)"
msgstr[1] "Rebasage de %s sur %s (%d commandes)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6715,7 +7094,7 @@
"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
"commit.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6723,7 +7102,7 @@
"\n"
"Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6738,7 +7117,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6748,14 +7127,14 @@
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
+#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
+#: builtin/rebase.c:191
#, c-format
msgid "could not write '%s'"
msgstr "impossible d'écrire '%s'"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "impossible d'écrire '%s'."
@@ -6787,15 +7166,13 @@
"Les comportements disponibles sont : ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "impossible de lire '%s'."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s : 'preserve' a été remplacé par 'merges'"
# à priori on parle d'une branche ici
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2057
msgid "gone"
msgstr "disparue"
@@ -6814,258 +7191,239 @@
msgid "ahead %d, behind %d"
msgstr "en avance de %d, en retard de %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format attendu : %%(color:<couleur>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "couleur non reconnue : %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valeur entière attendue refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valeur entière attendue refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argument %%(%s) non reconnu : %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) n'accepte pas d'argument"
-#: ref-filter.c:339
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "argument %%(objectsize) non reconnu : %s"
-
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) n'accepte pas d'argument"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) n'accepte pas d'argument"
-#: ref-filter.c:372
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "argument %%(subject) non reconnu : %s"
-
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "%%(trailers:key=<value>) attendu"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argument %%(trailers) inconnu : %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valeur positive attendue contents:lines=%s"
-#: ref-filter.c:426
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "argument %%(contents) non reconnu : %s"
-
-#: ref-filter.c:441
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "valeur positive attendue '%s' dans %%(%s)"
-#: ref-filter.c:445
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "argument '%s' non reconnu dans %%(%s)"
-
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "option de courriel non reconnue : %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format attendu : %%(align:<largeur>,<position>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "position non reconnue : %s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "largeur non reconnue : %s"
-#: ref-filter.c:517
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "argument %%(align) non reconnu : %s"
-
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "valeur positive attendue avec l'atome %%(align)"
-#: ref-filter.c:543
+#: ref-filter.c:568
#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "argument %%(if) non reconnu : %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) n'accepte pas d'argument"
-#: ref-filter.c:645
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de champ malformé %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de champ inconnu : %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet"
-#: ref-filter.c:801
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format : atome %%(%s) utilisé sans un atome %%(%s)"
-#: ref-filter.c:865
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
-
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format : atome %%(then) utilisé plus d'une fois"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atome %%(then) utilisé après %%(else)"
-#: ref-filter.c:897
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
-
-#: ref-filter.c:899
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
-
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format : atome %%(else) utilisé plus d'une fois"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format : atome %%(end) utilisé sans atome correspondant"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "chaîne de formatage mal formée %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "cette commande rejette l'atome %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s ne peut pas être utilisé avec --python, --shell, --tcl"
+
+#: ref-filter.c:1707
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(aucune branche, rebasage de %s)"
-#: ref-filter.c:1624
+#: ref-filter.c:1710
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(aucune branche, rebasage de la HEAD détachée %s)"
-#: ref-filter.c:1627
+#: ref-filter.c:1713
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(aucune branche, bisect a démarré sur %s)"
-#: ref-filter.c:1631
+#: ref-filter.c:1717
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD détachée sur %s)"
-#: ref-filter.c:1634
+#: ref-filter.c:1720
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD détachée depuis %s)"
-#: ref-filter.c:1637
+#: ref-filter.c:1723
msgid "(no branch)"
msgstr "(aucune branche)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1755 ref-filter.c:1973
#, c-format
msgid "missing object %s for %s"
msgstr "objet manquant %s pour %s"
-#: ref-filter.c:1679
+#: ref-filter.c:1765
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "échec de parse_object_buffer sur %s pour %s"
-#: ref-filter.c:2064
+#: ref-filter.c:2156
#, c-format
msgid "malformed object at '%s'"
msgstr "objet malformé à '%s'"
-#: ref-filter.c:2153
+#: ref-filter.c:2246
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "réf avec un nom cassé %s ignoré"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2251 refs.c:672
#, c-format
msgid "ignoring broken ref %s"
msgstr "réf cassé %s ignoré"
-#: ref-filter.c:2502
+#: ref-filter.c:2630
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atome %%(end) manquant"
-#: ref-filter.c:2596
+#: ref-filter.c:2741
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2746
#, c-format
msgid "option `%s' must point to a commit"
msgstr "l'option '%s' doit pointer sur un commit"
-#: refs.c:264
+#: reflog.c:407
+#, c-format
+msgid "not a reflog: %s"
+msgstr "'%s' n'est pas un journal de références"
+
+#: reflog.c:410
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "pas de journal de références pour '%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:566
+#: refs.c:561
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -7090,32 +7448,32 @@
"\n"
"\tgit branch -m <nom>\n"
-#: refs.c:588
+#: refs.c:583
#, c-format
msgid "could not retrieve `%s`"
msgstr "impossible de récupérer `%s`"
-#: refs.c:598
+#: refs.c:593
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "nom de branche invalide : %s = %s"
-#: refs.c:674
+#: refs.c:670
#, c-format
msgid "ignoring dangling symref %s"
msgstr "symref pendant %s ignoré"
-#: refs.c:922
+#: refs.c:919
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "le journal pour la réf %s contient un trou après %s"
-#: refs.c:929
+#: refs.c:926
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"
-#: refs.c:994
+#: refs.c:991
#, c-format
msgid "log for %s is empty"
msgstr "le journal pour la réf %s est vide"
@@ -7125,46 +7483,46 @@
msgid "refusing to update ref with bad name '%s'"
msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"
-#: refs.c:1157
+#: refs.c:1164
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "échec de update_ref pour la réf '%s' : %s"
-#: refs.c:2051
+#: refs.c:2059
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "mises à jour multiples pour la réf '%s' non permises"
-#: refs.c:2131
+#: refs.c:2145
msgid "ref updates forbidden inside quarantine environment"
msgstr "mises à jour des références interdites en environnement de quarantaine"
-#: refs.c:2142
+#: refs.c:2156
msgid "ref updates aborted by hook"
msgstr "mises à jour des références annulées par le crochet"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2264 refs.c:2294
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe ; impossible de créer '%s'"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2270 refs.c:2305
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "impossible de traiter '%s' et '%s' en même temps"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1295
#, c-format
msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1310 refs/packed-backend.c:1565
+#: refs/packed-backend.c:1575
#, c-format
msgid "could not delete reference %s: %s"
msgstr "impossible de supprimer la référence %s : %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1313 refs/packed-backend.c:1578
#, c-format
msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s"
@@ -7174,52 +7532,52 @@
msgid "invalid refspec '%s'"
msgstr "spécificateur de réference invalide : '%s'"
-#: remote.c:351
+#: remote.c:402
#, 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:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "plus d'un receivepack fournis, utilisation du premier"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "plus d'un uploadpack fournis, utilisation du premier"
-#: remote.c:590
+#: remote.c:698
#, 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:594
+#: remote.c:702
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s suit habituellement %s, pas %s"
-#: remote.c:598
+#: remote.c:706
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s suit à la fois %s et %s"
-#: remote.c:666
+#: remote.c:774
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "la clé '%s' du modèle n'a pas de '*'"
-#: remote.c:676
+#: remote.c:784
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "la valeur '%s' du modèle n'a pas de '*'"
-#: remote.c:1083
+#: remote.c:1191
#, 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:1088
+#: remote.c:1196
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
@@ -7229,7 +7587,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1211
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -7253,7 +7611,7 @@
"Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "
"totalement qualifiée."
-#: remote.c:1123
+#: remote.c:1231
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -7264,7 +7622,7 @@
"Souhaitiez-vous créer une nouvelle branche en poussant sur\n"
"'%s:refs/heads/%s' ?"
-#: remote.c:1128
+#: remote.c:1236
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -7275,7 +7633,7 @@
"Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"
"'%s:refs/tags/%s' ?"
-#: remote.c:1133
+#: remote.c:1241
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -7286,7 +7644,7 @@
"Souhaitiez-vous créer un nouvel arbre en poussant sur\n"
"'%s:refs/tags/%s' ?"
-#: remote.c:1138
+#: remote.c:1246
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -7297,119 +7655,119 @@
"Souhaitiez-vous créer un nouveau blob en poussant sur\n"
"'%s:refs/tags/%s' ?"
-#: remote.c:1174
+#: remote.c:1282
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "'%s' ne peut pas être résolue comme une branche"
-#: remote.c:1185
+#: remote.c:1293
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "suppression de '%s' impossible : la référence distante n'existe pas"
-#: remote.c:1197
+#: remote.c:1305
#, 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:1204
+#: remote.c:1312
#, 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:1724 remote.c:1825
+#: remote.c:1833 remote.c:1940
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: remote.c:1733
+#: remote.c:1842
#, c-format
msgid "no such branch: '%s'"
msgstr "pas de branche '%s'"
-#: remote.c:1736
+#: remote.c:1845
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "aucune branche amont configurée pour la branche '%s'"
-#: remote.c:1742
+#: remote.c:1851
#, 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:1757
+#: remote.c:1866
#, 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:1769
+#: remote.c:1881
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branche '%s' n'a aucune branche distante de poussée"
-#: remote.c:1779
+#: remote.c:1891
#, 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:1792
+#: remote.c:1904
msgid "push has no destination (push.default is 'nothing')"
msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
-#: remote.c:1814
+#: remote.c:1926
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
"impossible de résoudre une poussée 'simple' pour une destination unique"
-#: remote.c:1943
+#: remote.c:2059
#, c-format
msgid "couldn't find remote ref %s"
msgstr "impossible de trouver la référence distante %s"
-#: remote.c:1956
+#: remote.c:2072
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Référence bizarre '%s' ignorée localement"
-#: remote.c:2119
+#: remote.c:2235
#, 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:2123
+#: remote.c:2239
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-#: remote.c:2126
+#: remote.c:2242
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Votre branche est à jour avec '%s'.\n"
-#: remote.c:2130
+#: remote.c:2246
#, 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:2133
+#: remote.c:2249
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (utilisez \"%s\" pour plus de détails)\n"
-#: remote.c:2137
+#: remote.c:2253
#, 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:2143
+#: remote.c:2259
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
-#: remote.c:2146
+#: remote.c:2262
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -7421,11 +7779,11 @@
"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
"en avance rapide.\n"
-#: remote.c:2154
+#: remote.c:2270
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-#: remote.c:2157
+#: remote.c:2273
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -7440,12 +7798,12 @@
"Votre branche et '%s' ont divergé,\n"
"et ont %d et %d commits différents chacune respectivement.\n"
-#: remote.c:2167
+#: remote.c:2283
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:2359
+#: remote.c:2475
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "impossible d'analyser le nom attendu d'objet '%s'"
@@ -7478,131 +7836,121 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "il y a eu des erreurs à l'écriture de '%s' (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr "échec du flush de '%s'"
-#: rerere.c:487 rerere.c:1023
+#: rerere.c:487 rerere.c:1024
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "impossible d'analyser la section en conflit dans '%s'"
-#: rerere.c:668
+#: rerere.c:669
#, c-format
msgid "failed utime() on '%s'"
msgstr "échec de utime() sur '%s'"
-#: rerere.c:678
+#: rerere.c:679
#, c-format
msgid "writing '%s' failed"
msgstr "échec de l'écriture de '%s'"
-#: rerere.c:698
+#: rerere.c:699
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "'%s' indexé en utilisant la résolution pré-existante."
-#: rerere.c:737
+#: rerere.c:738
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "Résolution enregistrée pour '%s'."
-#: rerere.c:772
+#: rerere.c:773
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "'%s' résolu en utilisant la résolution pré-existante."
-#: rerere.c:787
+#: rerere.c:788
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "impossible de délier '%s' qui est errant"
-#: rerere.c:791
+#: rerere.c:792
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "Pré-image enregistrée pour '%s'"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
+#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le répertoire '%s'"
-#: rerere.c:1041
+#: rerere.c:1042
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "échec de la mise à jour de l'état en conflit dans '%s'"
-#: rerere.c:1052 rerere.c:1059
+#: rerere.c:1053 rerere.c:1060
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "aucune résolution enregistrée pour '%s'"
-#: rerere.c:1061
+#: rerere.c:1062
#, c-format
msgid "cannot unlink '%s'"
msgstr "impossible de délier '%s'"
-#: rerere.c:1071
+#: rerere.c:1072
#, c-format
msgid "Updated preimage for '%s'"
msgstr "Pré-image mise à jour pour '%s'"
-#: rerere.c:1080
+#: rerere.c:1081
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Résolution pour '%s' oubliée\n"
-#: rerere.c:1191
+#: rerere.c:1192
msgid "unable to open rr-cache directory"
msgstr "impossible d'ouvrir le répertoire rr-cache"
-#: reset.c:42
+#: reset.c:112
msgid "could not determine HEAD revision"
msgstr "impossible de déterminer la révision HEAD"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:141 reset.c:147 sequencer.c:3696
#, c-format
msgid "failed to find tree of %s"
msgstr "impossible de trouver l'arbre de %s"
-#: revision.c:2344
+#: revision.c:2358
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<fichier-paquet> n'est plus géré"
-#: revision.c:2684
+#: revision.c:2712
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2687
+#: revision.c:2715
#, 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:2893
+#: revision.c:2901
+msgid "object filtering requires --objects"
+msgstr "le filtrage d'objet exige --objects"
+
+#: revision.c:2918
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "échec de l'ouverture de /dev/null"
-
-#: run-command.c:1274
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "impossible de créer un fil asynchrone : %s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"
-"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "
-"false`."
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
@@ -7623,24 +7971,24 @@
msgid "failed to sign the push certificate"
msgstr "impossible de signer le certificat de poussée"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack : impossible de créer un sous-processus de récupération"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr ""
"le négociation de poussée a échoué ; poursuite de la poussée de toute façon"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "le receveur ne gère pas l'algorithme d'empreinte de ce dépôt"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "le receveur ne gère pas les poussées avec --signed"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7648,47 +7996,48 @@
"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
"poussées avec --signed"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "le receveur ne gère pas les poussées avec --atomic"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "le receveur ne gère pas les options de poussées"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mode de nettoyage invalide de message de validation '%s'"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "impossible de supprimer '%s'"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "impossible de supprimer '%s'"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "revert"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "action inconnue : %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7696,53 +8045,81 @@
"après résolution des conflits, marquez les chemins corrigés\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"après résolution des conflits, marquez les chemins corrigés\n"
-"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
-"puis validez le résultat avec 'git commit'"
+"Après résolution des conflits, marquez-les avec\n"
+"\"git add/rm <spéc-de-réf>\", puis lancez\n"
+"\"git cherry-pick --continue\".\n"
+"Vous pouvez aussi sauter ce commit avec \"git cherry-pick --skip\".\n"
+"Pour arrêter et revenir à l'état antérieur à \"git cherry-pick\",,\n"
+"lancez \"git cherry-pick --abort\"."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Après résolution des conflits, marquez-les avec\n"
+"\"git add/rm <spéc-de-réf>\", puis lancez\n"
+"\"git revert --continue\".\n"
+"Vous pouvez aussi sauter ce commit avec \"git revert --skip\".\n"
+"Pour arrêter et revenir à l'état antérieur à \"git revert\",,\n"
+"lancez \"git revert --abort\"."
+
+#: sequencer.c:448 sequencer.c:3288
#, c-format
msgid "could not lock '%s'"
msgstr "impossible de verrouiller '%s'"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
+#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
#, c-format
msgid "could not write to '%s'"
msgstr "impossible d'écrire dans '%s'"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3565
#, c-format
msgid "failed to finalize '%s'"
msgstr "échec lors de la finalisation de '%s'"
-#: sequencer.c:486
+#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
+#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
+#, c-format
+msgid "could not read '%s'"
+msgstr "impossible de lire '%s'"
+
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "vos modifications locales seraient écrasées par %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "validez vos modifications ou les remiser pour continuer."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s : avance rapide"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:615
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
@@ -7750,65 +8127,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "impossible de mettre à jour l'arbre de cache"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "impossible de résoudre le commit HEAD"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "aucune clé présente dans '%.*s'"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "impossible de décoter la valeur de '%s'"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
+#: builtin/am.c:849 builtin/rebase.c:699
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' déjà fourni"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' déjà fourni"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "variable inconnue '%s'"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' manquant"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' manquant"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' manquant"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7837,11 +8214,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr "échec du crochet 'prepare-commit-msg'"
-#: sequencer.c:1218
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7870,7 +8247,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7896,344 +8273,345 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1287
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: sequencer.c:1275
+#: sequencer.c:1289
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: sequencer.c:1321
+#: sequencer.c:1336
msgid "unable to resolve HEAD after creating commit"
msgstr "impossible de résoudre HEAD après création du commit"
-#: sequencer.c:1323
+#: sequencer.c:1338
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: sequencer.c:1327
+#: sequencer.c:1342
msgid " (root-commit)"
msgstr " (commit racine)"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "could not parse HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1365
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s n'est pas un commit !"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1425 sequencer.c:2310
msgid "unable to parse commit author"
msgstr "impossible d'analyser l'auteur du commit"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1469 sequencer.c:1589
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1500 sequencer.c:1532
#, c-format
msgid "invalid author identity '%s'"
msgstr "identité d'auteur invalide '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1506
msgid "corrupt author: missing date information"
msgstr "auteur corrompu : information de date manquante"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
+#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "impossible de mettre à jour %s"
-#: sequencer.c:1606
+#: sequencer.c:1621
#, c-format
msgid "could not parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: sequencer.c:1611
+#: sequencer.c:1626
#, c-format
msgid "could not parse parent commit %s"
msgstr "impossible d'analyser le commit parent %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1709 sequencer.c:1990
#, c-format
msgid "unknown command: %d"
msgstr "commande inconnue : %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1751
msgid "This is the 1st commit message:"
msgstr "Ceci est le premier message de validation :"
-#: sequencer.c:1737
+#: sequencer.c:1752
#, c-format
msgid "This is the commit message #%d:"
msgstr "Ceci est le message de validation numéro %d :"
-#: sequencer.c:1738
+#: sequencer.c:1753
msgid "The 1st commit message will be skipped:"
msgstr "Le premier message de validation sera ignoré :"
-#: sequencer.c:1739
+#: sequencer.c:1754
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Le message de validation %d sera ignoré :"
-#: sequencer.c:1740
+#: sequencer.c:1755
#, c-format
msgid "This is a combination of %d commits."
msgstr "Ceci est la combinaison de %d commits."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1902 sequencer.c:1959
#, c-format
msgid "cannot write '%s'"
msgstr "impossible d'écrire '%s'"
-#: sequencer.c:1934
+#: sequencer.c:1949
msgid "need a HEAD to fixup"
msgstr "une HEAD est nécessaire à la correction"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1951 sequencer.c:3592
msgid "could not read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1953
msgid "could not read HEAD's commit message"
msgstr "impossible de lire le message de validation de HEAD"
-#: sequencer.c:1962
+#: sequencer.c:1977
#, c-format
msgid "could not read commit message of %s"
msgstr "impossible de lire le message de validation de %s"
-#: sequencer.c:2072
+#: sequencer.c:2087
msgid "your index file is unmerged."
msgstr "votre fichier d'index n'est pas fusionné."
-#: sequencer.c:2079
+#: sequencer.c:2094
msgid "cannot fixup root commit"
msgstr "impossible de réparer le commit racine"
-#: sequencer.c:2098
+#: sequencer.c:2113
#, 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:2106 sequencer.c:2114
+#: sequencer.c:2121 sequencer.c:2129
#, c-format
msgid "commit %s does not have parent %d"
msgstr "le commit %s n'a pas de parent %d"
-#: sequencer.c:2120
+#: sequencer.c:2135
#, 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:2139
+#: sequencer.c:2154
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:2205
+#: sequencer.c:2220
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossible de renommer '%s' en '%s'"
-#: sequencer.c:2265
+#: sequencer.c:2280
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2281
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:2287
+#: sequencer.c:2302
#, 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:2345
+#: sequencer.c:2360
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:2352
+#: sequencer.c:2368
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:2425
+#: sequencer.c:2448
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s n'accepte pas d'argument : '%s'"
-#: sequencer.c:2434
+#: sequencer.c:2457
#, c-format
msgid "missing arguments for %s"
msgstr "argument manquant pour %s"
-#: sequencer.c:2477
+#: sequencer.c:2500
#, c-format
msgid "could not parse '%s'"
msgstr "impossible d'analyser '%s'"
-#: sequencer.c:2538
+#: sequencer.c:2561
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2572
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "'%s' impossible avec le commit précédent"
-#: sequencer.c:2635
+#: sequencer.c:2620 builtin/rebase.c:185
+#, c-format
+msgid "could not read '%s'."
+msgstr "impossible de lire '%s'."
+
+#: sequencer.c:2658
msgid "cancelling a cherry picking in progress"
msgstr "annulation d'un picorage en cours"
-#: sequencer.c:2644
+#: sequencer.c:2667
msgid "cancelling a revert in progress"
msgstr "annulation d'un retour en cours"
-#: sequencer.c:2690
+#: sequencer.c:2707
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: sequencer.c:2692
+#: sequencer.c:2709
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:2697
+#: sequencer.c:2714
msgid "no commits parsed."
msgstr "aucun commit analysé."
-#: sequencer.c:2708
+#: sequencer.c:2725
msgid "cannot cherry-pick during a revert."
msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:2710
+#: sequencer.c:2727
msgid "cannot revert during a cherry-pick."
msgstr "impossible d'annuler un commit pendant un picorage."
-#: sequencer.c:2788
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "valeur invalide pour %s : %s"
-
-#: sequencer.c:2897
+#: sequencer.c:2914
msgid "unusable squash-onto"
msgstr "\"écrase-sur\" inutilisable"
-#: sequencer.c:2917
+#: sequencer.c:2934
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "feuille d'options malformée : %s"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3029 sequencer.c:4875
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:3029
+#: sequencer.c:3046
msgid "revert is already in progress"
msgstr "un retour est déjà en cours"
-#: sequencer.c:3031
+#: sequencer.c:3048
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3051
msgid "cherry-pick is already in progress"
msgstr "un picorage est déjà en cours"
-#: sequencer.c:3036
+#: sequencer.c:3053
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3067
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossible de créer le répertoire de séquenceur '%s'"
-#: sequencer.c:3065
+#: sequencer.c:3082
msgid "could not lock HEAD"
msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3142 sequencer.c:4585
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3144 sequencer.c:3155
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3146 sequencer.c:3190
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
+#: builtin/grep.c:774
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:3161
+#: sequencer.c:3178
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:3162
+#: sequencer.c:3179
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:3168
+#: sequencer.c:3185
#, 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:3179
+#: sequencer.c:3196
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:3220
+#: sequencer.c:3237
msgid "no revert in progress"
msgstr "pas de retour en cours"
-#: sequencer.c:3229
+#: sequencer.c:3246
msgid "no cherry-pick in progress"
msgstr "aucun picorage en cours"
-#: sequencer.c:3239
+#: sequencer.c:3256
msgid "failed to skip the commit"
msgstr "échec du saut de commit"
-#: sequencer.c:3246
+#: sequencer.c:3263
msgid "there is nothing to skip"
msgstr "il n'y a rien à sauter"
-#: sequencer.c:3249
+#: sequencer.c:3266
#, c-format
msgid ""
"have you committed already?\n"
@@ -8242,16 +8620,16 @@
"avez-vous déjà validé ?\n"
"essayez \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3428 sequencer.c:4476
msgid "cannot read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3445
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:3436
+#: sequencer.c:3453
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8270,27 +8648,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3463
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Impossible d'appliquer %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3470
#, c-format
msgid "Could not merge %.*s"
msgstr "Impossible de fusionner %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:3483
+#: sequencer.c:3499
#, c-format
msgid "Executing: %s\n"
msgstr "Exécution : %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3510
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8305,11 +8683,11 @@
"git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3516
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:3510
+#: sequencer.c:3522
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8326,91 +8704,91 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3582
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom de label illégal '%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3655
msgid "writing fake root commit"
msgstr "écriture d'un commit racine bidon"
-#: sequencer.c:3650
+#: sequencer.c:3660
msgid "writing squash-onto"
msgstr "écriture de 'écraser-sur'"
-#: sequencer.c:3734
+#: sequencer.c:3739
#, c-format
msgid "could not resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: sequencer.c:3767
+#: sequencer.c:3771
msgid "cannot merge without a current revision"
msgstr "impossible de fusionner avec une révision courante"
-#: sequencer.c:3789
+#: sequencer.c:3793
#, c-format
msgid "unable to parse '%.*s'"
msgstr "impossible d'analyser '%.*s'"
-#: sequencer.c:3798
+#: sequencer.c:3802
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "rien à fusionner : '%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3814
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:3826
+#: sequencer.c:3869
#, c-format
msgid "could not get commit message of '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:4009
+#: sequencer.c:4013
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "impossible de seulement essayer de fusionner '%.*s'"
-#: sequencer.c:4025
+#: sequencer.c:4029
msgid "merge: Unable to write new index file"
msgstr "fusion : Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:4099
+#: sequencer.c:4110
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: sequencer.c:4102
+#: sequencer.c:4113
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Réponse de remisage inattendue : '%s'"
-#: sequencer.c:4108
+#: sequencer.c:4119
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Impossible de créer le répertoire pour '%s'"
-#: sequencer.c:4111
+#: sequencer.c:4122
#, c-format
msgid "Created autostash: %s\n"
msgstr "Autoremisage créé : %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4124
msgid "could not reset --hard"
msgstr "impossible de réinitialiser --hard"
-#: sequencer.c:4140
+#: sequencer.c:4148
#, c-format
msgid "Applied autostash.\n"
msgstr "Autoremisage appliqué.\n"
-#: sequencer.c:4152
+#: sequencer.c:4160
#, c-format
msgid "cannot store %s"
msgstr "impossible de stocker %s"
-#: sequencer.c:4155
+#: sequencer.c:4163
#, c-format
msgid ""
"%s\n"
@@ -8421,30 +8799,30 @@
"Vos modifications sont à l'abri dans la remise.\n"
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-#: sequencer.c:4160
+#: sequencer.c:4168
msgid "Applying autostash resulted in conflicts."
msgstr "L'application du remisage automatique a créé des conflits."
-#: sequencer.c:4161
+#: sequencer.c:4169
msgid "Autostash exists; creating a new stash entry."
msgstr ""
"Un remisage automatique existe ; création d'une nouvelle entrée de remisage."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4225
msgid "could not detach HEAD"
msgstr "impossible de détacher HEAD"
-#: sequencer.c:4248
+#: sequencer.c:4240
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Arrêt à HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4242
#, c-format
msgid "Stopped at %s\n"
msgstr "Arrêté à %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4274
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8465,58 +8843,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4320
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Rebasage (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4366
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Arrêt à %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4436
#, c-format
msgid "unknown command %d"
msgstr "commande inconnue %d"
-#: sequencer.c:4480
+#: sequencer.c:4484
msgid "could not read orig-head"
msgstr "impossible de lire orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4489
msgid "could not read 'onto'"
msgstr "impossible de lire 'onto'"
-#: sequencer.c:4499
+#: sequencer.c:4503
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossible de mettre à jour HEAD sur %s"
-#: sequencer.c:4559
+#: sequencer.c:4563
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Rebasage et mise à jour de %s avec succès.\n"
-#: sequencer.c:4611
+#: sequencer.c:4615
msgid "cannot rebase: You have unstaged changes."
msgstr "impossible de rebaser : vous avez des modifications non indexées."
-#: sequencer.c:4620
+#: sequencer.c:4624
msgid "cannot amend non-existing commit"
msgstr "impossible de corriger un commit non-existant"
-#: sequencer.c:4622
+#: sequencer.c:4626
#, c-format
msgid "invalid file: '%s'"
msgstr "fichier invalide : '%s'"
-#: sequencer.c:4624
+#: sequencer.c:4628
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenu invalide : '%s'"
-#: sequencer.c:4627
+#: sequencer.c:4631
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8526,59 +8904,68 @@
"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:4663 sequencer.c:4702
+#: sequencer.c:4667 sequencer.c:4706
#, c-format
msgid "could not write file: '%s'"
msgstr "impossible d'écrire le fichier : '%s'"
-#: sequencer.c:4718
+#: sequencer.c:4722
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossible de supprimer CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4732
msgid "could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: sequencer.c:4845
+#: sequencer.c:4852
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:4849
+#: sequencer.c:4856
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:4884
+#: sequencer.c:4891
msgid "can't revert as initial commit"
msgstr "impossible d'annuler en tant que commit initial"
-#: sequencer.c:5361
+#: sequencer.c:5162 sequencer.c:5391
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "le commit %s appliqué précédemment a été sauté"
+
+#: sequencer.c:5232 sequencer.c:5407
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "utilisez --reapply-cherry-picks pour inclure les commits sautés"
+
+#: sequencer.c:5378
msgid "make_script: unhandled options"
msgstr "make_script : options non gérées"
-#: sequencer.c:5364
+#: sequencer.c:5381
msgid "make_script: error preparing revisions"
msgstr "make_script : erreur lors de la préparation des révisions"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5639 sequencer.c:5656
msgid "nothing to do"
msgstr "rien à faire"
-#: sequencer.c:5650
+#: sequencer.c:5675
msgid "could not skip unnecessary pick commands"
msgstr "impossible d'éviter les commandes de picorage non nécessaires"
-#: sequencer.c:5750
+#: sequencer.c:5775
msgid "the script was already rearranged."
msgstr "le script a déjà été réarrangé."
-#: setup.c:133
+#: setup.c:135
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' est hors du dépôt à '%s'"
-#: setup.c:185
+#: setup.c:187
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -8588,7 +8975,7 @@
"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
"n'existent pas localement."
-#: setup.c:198
+#: setup.c:200
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8599,14 +8986,14 @@
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:264
+#: setup.c:266
#, 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:283
+#: setup.c:285
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -8617,28 +9004,28 @@
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:419
+#: setup.c:421
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:423 builtin/rev-parse.c:895
+#: setup.c:425 builtin/rev-parse.c:895
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:658
+#: setup.c:724
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Version attendue du dépôt git <= %d, %d trouvée"
-#: setup.c:666
+#: setup.c:732
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "extension de dépôt inconnue trouvée :"
msgstr[1] "extensions de dépôt inconnues trouvées :"
-#: setup.c:680
+#: setup.c:746
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] ""
@@ -8646,75 +9033,75 @@
msgstr[1] ""
"la version du dépôt est 0, mais des extensions uniquement v1 trouvées :"
-#: setup.c:701
+#: setup.c:767
#, c-format
msgid "error opening '%s'"
msgstr "erreur à l'ouverture de '%s'"
-#: setup.c:703
+#: setup.c:769
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "trop gros pour être une fichier .git : '%s'"
-#: setup.c:705
+#: setup.c:771
#, c-format
msgid "error reading %s"
msgstr "erreur à la lecture de %s"
-#: setup.c:707
+#: setup.c:773
#, c-format
msgid "invalid gitfile format: %s"
msgstr "format de fichier git invalide : %s"
-#: setup.c:709
+#: setup.c:775
#, c-format
msgid "no path in gitfile: %s"
msgstr "aucun chemin dans le fichier git : %s"
-#: setup.c:711
+#: setup.c:777
#, c-format
msgid "not a git repository: %s"
msgstr "ce n'est pas un dépôt git : %s"
-#: setup.c:813
+#: setup.c:879
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' trop gros"
-#: setup.c:827
+#: setup.c:893
#, c-format
msgid "not a git repository: '%s'"
msgstr "ce n'est pas un dépôt git : '%s'"
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:922 setup.c:924 setup.c:955
#, c-format
msgid "cannot chdir to '%s'"
msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
msgid "cannot come back to cwd"
msgstr "impossible de revenir au répertoire de travail courant"
-#: setup.c:988
+#: setup.c:1054
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "échec du stat de '%*s%s%s'"
-#: setup.c:1231
+#: setup.c:1338
msgid "Unable to read current working directory"
msgstr "Impossible d'accéder au répertoire de travail courant"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1347 setup.c:1353
#, c-format
msgid "cannot change to '%s'"
msgstr "impossible de modifier en '%s'"
-#: setup.c:1251
+#: setup.c:1358
#, 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:1257
+#: setup.c:1364
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -8725,7 +9112,20 @@
"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"n'est pas défini)."
-#: setup.c:1381
+#: setup.c:1374
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"dépôt non sécurisé ('%s' appartient à quelqu'un d'autre)\n"
+"Pour ajouter une exception pour ce dépôt, lancez :\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#: setup.c:1502
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8735,69 +9135,61 @@
"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
"écriture."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "échec de l'ouverture ou au dup de /dev/null"
-
-#: setup.c:1445
+#: setup.c:1564
msgid "fork failed"
msgstr "échec de la bifurcation"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1569
msgid "setsid failed"
msgstr "échec du setsid"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "tentative d'utilisation de l'index partiel sans mode cone"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "impossible de mettre à jour l'arbre de cache, full conservé"
-
-#: sparse-index.c:263
+#: sparse-index.c:285
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "l'entrée d'index est un répertoire, mais pas clairsemé (%08x)"
+#: split-index.c:9
+msgid "cannot use split index with a sparse index"
+msgstr "impossible d'utiliser l'index scindé avec un index clairsemé"
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u Gio"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:852
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u Gio/s"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:860
+#: strbuf.c:861
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u Mio"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:862
+#: strbuf.c:863
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u Mio/s"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:869
+#: strbuf.c:870
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u Kio"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:871
+#: strbuf.c:872
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u Kio/s"
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:877
+#: strbuf.c:878
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8805,87 +9197,87 @@
msgstr[1] "%u octets"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
+#: strbuf.c:880
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u octet/s"
msgstr[1] "%u octets/s"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
+#: builtin/rebase.c:653
#, c-format
msgid "could not open '%s' for writing"
msgstr "impossible d'ouvrir '%s' en écriture"
-#: strbuf.c:1177
+#: strbuf.c:1196
#, c-format
msgid "could not edit '%s'"
msgstr "impossible d'éditer '%s'"
-#: submodule-config.c:237
+#: submodule-config.c:238
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "nom de sous-module suspicieux %s ignoré"
-#: submodule-config.c:304
+#: submodule-config.c:305
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchjobs"
-#: submodule-config.c:402
+#: submodule-config.c:403
#, 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
+#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
#, c-format
-msgid "invalid value for %s"
-msgstr "valeur invalide pour %s"
+msgid "invalid value for '%s'"
+msgstr "valeur invalide pour '%s'"
-#: submodule-config.c:766
+#: submodule-config.c:828
#, 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
+#: submodule.c:115 submodule.c:144
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
"d'abord"
-#: submodule.c:118 submodule.c:147
+#: submodule.c:119 submodule.c:148
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
# ici %s est un chemin
-#: submodule.c:154
+#: submodule.c:155
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
-#: submodule.c:165
+#: submodule.c:166
msgid "staging updated .gitmodules failed"
msgstr "échec de la mise en index du .gitmodules mis à jour"
-#: submodule.c:328
+#: submodule.c:346
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "dans le sous-module '%s' non populé"
-#: submodule.c:359
+#: submodule.c:377
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
-#: submodule.c:436
+#: submodule.c:454
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "mauvais argument --ignore-submodules : %s"
-#: submodule.c:805
+#: submodule.c:866
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8894,12 +9286,12 @@
"Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un "
"sous-module du même nom. Ignoré."
-#: submodule.c:908
+#: submodule.c:987
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"
-#: submodule.c:993
+#: submodule.c:1069
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8908,36 +9300,46 @@
"Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n "
"1' dans le sous-module %s"
-#: submodule.c:1116
+#: submodule.c:1192
#, c-format
msgid "process for submodule '%s' failed"
msgstr "le processus pour le sous-module '%s' a échoué"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
-#: submodule.c:1156
+#: submodule.c:1232
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Poussée du sous-module '%s'\n"
-#: submodule.c:1159
+#: submodule.c:1235
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Impossible de pousser le sous-module '%s'\n"
-#: submodule.c:1451
+#: submodule.c:1567
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Récupération du sous-module %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1589
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Impossible d'accéder au sous-module '%s'\n"
-#: submodule.c:1640
+#: submodule.c:1618
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Impossible d'accéder au sous-module '%s' au commit %s\n"
+
+#: submodule.c:1629
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Récupération du sous-module %s%s au commit %s\n"
+
+#: submodule.c:1849
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8946,63 +9348,63 @@
"Erreurs pendant la récupération du sous-module :\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1874
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' n'est pas reconnu comme dépôt git"
-#: submodule.c:1682
+#: submodule.c:1891
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "impossible de lancer 'git status --porcelain=2' dans le sous-module %s"
-#: submodule.c:1723
+#: submodule.c:1932
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' a échoué dans le sous-module %s"
-#: submodule.c:1798
+#: submodule.c:2007
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"
-#: submodule.c:1811
+#: submodule.c:2020
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
-#: submodule.c:1826
+#: submodule.c:2037
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Impossible de désactiver core.worktree dans le sous-module '%s'"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:2064 submodule.c:2379
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: submodule.c:1874
+#: submodule.c:2086
msgid "could not reset submodule index"
msgstr "impossible de réinitialiser l'index du sous-module"
-#: submodule.c:1916
+#: submodule.c:2128
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "le sous-module '%s' a un index sale"
-#: submodule.c:1968
+#: submodule.c:2182
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Le sous-module '%s' n'a pas pu être mis à jour."
-#: submodule.c:2036
+#: submodule.c:2250
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
"le répertoire git du sous-module '%s' est à l'intérieur du répertoire git "
"'%.*s'"
-#: submodule.c:2057
+#: submodule.c:2271
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -9010,17 +9412,17 @@
"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
"n'est pas supporté"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2283 submodule.c:2343
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "impossible de trouve le nom pour le sous-module '%s'"
-#: submodule.c:2073
+#: submodule.c:2287
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "refus de déplacer '%s' dans une répertoire git existant"
-#: submodule.c:2080
+#: submodule.c:2293
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -9031,11 +9433,11 @@
"'%s' sur\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2424
msgid "could not start ls-files in .."
msgstr "impossible de démarrer ls-files dans .."
-#: submodule.c:2248
+#: submodule.c:2464
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree a renvoyé un code de retour inattendu %d"
@@ -9056,8 +9458,8 @@
msgid "unknown value '%s' for key '%s'"
msgstr "valeur inconnue '%s' pour la clé '%s'"
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
+#: builtin/remote.c:328
#, c-format
msgid "more than one %s"
msgstr "plus d'un %s"
@@ -9072,11 +9474,11 @@
msgid "could not read input file '%s'"
msgstr "impossible de lire le fichier d'entrée '%s'"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
msgid "could not read from stdin"
msgstr "impossible de lire depuis l'entrée standard"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:760
#, c-format
msgid "could not stat %s"
msgstr "stat impossible de %s"
@@ -9145,7 +9547,7 @@
msgid "error while running fast-import"
msgstr "erreur au lancement de fast-import"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1254
#, c-format
msgid "could not read ref %s"
msgstr "impossible de lire la réf %s"
@@ -9165,7 +9567,7 @@
msgid "invalid remote service path"
msgstr "chemin de service distant invalide"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1496
msgid "operation not supported by protocol"
msgstr "option non supportée par le protocole"
@@ -9174,74 +9576,74 @@
msgid "can't connect to subservice %s"
msgstr "impossible de se connecter au sous-service %s"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:415
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only requiert le protocole v2"
-#: transport-helper.c:755
+#: transport-helper.c:758
msgid "'option' without a matching 'ok/error' directive"
msgstr "'option' sans directive 'ok/error' correspondante"
-#: transport-helper.c:798
+#: transport-helper.c:801
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "ok/error attendu, l'assistant a dit '%s'"
-#: transport-helper.c:855
+#: transport-helper.c:862
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "l'assistant a renvoyé un statut de retour inattendu %s"
-#: transport-helper.c:938
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support dry-run"
msgstr "l'assistant %s ne gère pas dry-run"
-#: transport-helper.c:941
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed"
msgstr "l'assistant %s ne gère pas --signed"
-#: transport-helper.c:944
+#: transport-helper.c:951
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "l'assistant %s ne gère pas --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:956
#, c-format
msgid "helper %s does not support --atomic"
msgstr "l'assistant %s ne gère pas --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:960
#, c-format
msgid "helper %s does not support --%s"
msgstr "l'assistant %s ne gère pas --%s"
-#: transport-helper.c:960
+#: transport-helper.c:967
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "l'assistant %s ne gère pas 'push-option'"
-#: transport-helper.c:1060
+#: transport-helper.c:1067
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:1065
+#: transport-helper.c:1072
#, c-format
msgid "helper %s does not support 'force'"
msgstr "l'assistant %s ne gère pas 'force'"
-#: transport-helper.c:1112
+#: transport-helper.c:1119
msgid "couldn't run fast-export"
msgstr "impossible de lancer fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1124
msgid "error while running fast-export"
msgstr "erreur au lancement de fast-export"
-#: transport-helper.c:1142
+#: transport-helper.c:1149
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9250,52 +9652,52 @@
"Aucune référence en commun et aucune spécfiée ; rien à faire.\n"
"Vous devriez peut-être spécifier une branche.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1231
#, c-format
msgid "unsupported object format '%s'"
msgstr "format d'objet non géré '%s'"
-#: transport-helper.c:1233
+#: transport-helper.c:1240
#, c-format
msgid "malformed response in ref list: %s"
msgstr "réponse malformée dans le liste de réfs : %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1392
#, c-format
msgid "read(%s) failed"
msgstr "échec de read(%s)"
-#: transport-helper.c:1412
+#: transport-helper.c:1419
#, c-format
msgid "write(%s) failed"
msgstr "échec de write(%s)"
-#: transport-helper.c:1461
+#: transport-helper.c:1468
#, c-format
msgid "%s thread failed"
msgstr "échec du fil d'exécution %s"
-#: transport-helper.c:1465
+#: transport-helper.c:1472
#, c-format
msgid "%s thread failed to join: %s"
msgstr "échec de jonction du fil d'exécution %s : %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1491 transport-helper.c:1495
#, 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:1525
+#: transport-helper.c:1532
#, c-format
msgid "%s process failed to wait"
msgstr "échec du processus %s pour l'attente"
-#: transport-helper.c:1529
+#: transport-helper.c:1536
#, c-format
msgid "%s process failed"
msgstr "échec du processus %s"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1554 transport-helper.c:1563
msgid "can't start thread for copying data"
msgstr "impossible de démarrer le fil d'exécution pour copier les données"
@@ -9304,51 +9706,51 @@
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
-#: transport.c:145
+#: transport.c:138
#, c-format
msgid "could not read bundle '%s'"
msgstr "impossible de lire la liasse '%s'"
-#: transport.c:223
+#: transport.c:234
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport : option de profondeur invalide '%s'"
-#: transport.c:275
+#: transport.c:289
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:276
+#: transport.c:290
msgid "server options require protocol version 2 or later"
msgstr "les options de serveur exigent une version 2 ou supérieure"
-#: transport.c:403
+#: transport.c:418
msgid "server does not support wait-for-done"
msgstr "le serveur ne prend pas en charge wait-for-done"
-#: transport.c:755
+#: transport.c:770
msgid "could not parse transport.color.* config"
msgstr "impossible d'analyser la configuration transport.color.*"
-#: transport.c:830
+#: transport.c:845
msgid "support for protocol v2 not implemented yet"
msgstr "le support du protocole v2 n'est pas encore implanté"
-#: transport.c:965
+#: transport.c:978
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valeur inconnue pour la config '%s' : %s"
-#: transport.c:1031
+#: transport.c:1044
#, c-format
msgid "transport '%s' not allowed"
msgstr "transport '%s' non permis"
-#: transport.c:1084
+#: transport.c:1093
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync n'est plus supporté"
-#: transport.c:1187
+#: transport.c:1196
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9357,7 +9759,7 @@
"Les chemins suivants de sous-module contiennent des modifications\n"
"qui ne peuvent être trouvées sur aucun distant :\n"
-#: transport.c:1191
+#: transport.c:1200
#, c-format
msgid ""
"\n"
@@ -9384,11 +9786,11 @@
"pour les pousser vers un serveur distant.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1208
msgid "Aborting."
msgstr "Abandon."
-#: transport.c:1346
+#: transport.c:1354
msgid "failed to push all needed submodules"
msgstr "échec de la poussée de tous les sous-modules nécessaires"
@@ -9408,7 +9810,7 @@
msgid "too-short tree file"
msgstr "fichier arbre trop court"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9419,7 +9821,7 @@
"%%sVeuillez valider ou remiser vos modifications avant de basculer de "
"branche."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9429,7 +9831,7 @@
"l'extraction :\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9439,7 +9841,7 @@
"fusion :\n"
"%%sVeuillez valider ou remiser vos modifications avant la fusion."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9449,7 +9851,7 @@
"fusion :\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9458,7 +9860,7 @@
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%sVeuillez valider ou remiser vos modifications avant %s."
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9467,7 +9869,7 @@
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -9477,7 +9879,16 @@
"contenus :\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"impossible de supprimer le répertoire de travail actuel :\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9487,7 +9898,7 @@
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9496,7 +9907,7 @@
"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9506,7 +9917,7 @@
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9515,7 +9926,7 @@
"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9525,7 +9936,7 @@
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9534,7 +9945,7 @@
"Les fichiers suivants non suivis seraient effacés par %s :\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9545,7 +9956,7 @@
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9555,7 +9966,7 @@
"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9565,7 +9976,7 @@
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9574,7 +9985,7 @@
"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9584,7 +9995,7 @@
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9593,12 +10004,12 @@
"Les fichiers suivants non suivis seraient écrasés par %s :\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -9607,7 +10018,7 @@
"Mise à jour impossible pour le sous-module :\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -9618,7 +10029,7 @@
"clairsemés :\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9628,7 +10039,7 @@
"motifs clairsemés :\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -9639,12 +10050,12 @@
"motifs clairsemés :\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "Abandon\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9653,11 +10064,11 @@
"Après correction des chemins ci-dessus, vous voulez peut-être lancer `git "
"sparse-checkout reapply`.\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "Mise à jour des fichiers"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -9667,17 +10078,17 @@
"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:1618
+#: unpack-trees.c:1664
msgid "Updating index flags"
msgstr "Mise à jour des drapeaux de l'index"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2925
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
"l'arbre de travail et le commit non suivi ont des entrées dupliquées : %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1579
msgid "expected flush after fetch arguments"
msgstr "vidage attendu après les arguments de récupération"
@@ -9714,118 +10125,142 @@
msgid "Fetching objects"
msgstr "Récupération des objets"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "échec de la lecture de '%s'"
-#: worktree.c:303
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
"'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"
-#: worktree.c:314
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre "
"de travail"
-#: worktree.c:326
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' n'existe pas"
-#: worktree.c:332
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
-#: worktree.c:341
+#: worktree.c:342
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' ne pointe pas en retour sur '%s'"
-#: worktree.c:603
+#: worktree.c:600
msgid "not a directory"
msgstr "pas un répertoire"
-#: worktree.c:612
+#: worktree.c:609
msgid ".git is not a file"
msgstr ".git n'est pas un fichier"
-#: worktree.c:614
+#: worktree.c:611
msgid ".git file broken"
msgstr "fichier .git cassé"
-#: worktree.c:616
+#: worktree.c:613
msgid ".git file incorrect"
msgstr "fichier .git incorrect"
-#: worktree.c:722
+#: worktree.c:719
msgid "not a valid path"
msgstr "pas un chemin valide"
-#: worktree.c:728
+#: worktree.c:725
msgid "unable to locate repository; .git is not a file"
msgstr "impossible de localiser le dépôt ; .git n'est pas un fichier"
-#: worktree.c:732
+#: worktree.c:729
msgid "unable to locate repository; .git file does not reference a repository"
msgstr ""
"impossible de localiser le dépôt ; .git ne fait pas référence à un dépôt"
-#: worktree.c:736
+#: worktree.c:733
msgid "unable to locate repository; .git file broken"
msgstr "impossible de localiser le dépôt ; fichier .git cassé"
-#: worktree.c:742
+#: worktree.c:739
msgid "gitdir unreadable"
msgstr "gitdir non lisible"
-#: worktree.c:746
+#: worktree.c:743
msgid "gitdir incorrect"
msgstr "gitdir incorrect"
-#: worktree.c:771
+#: worktree.c:768
msgid "not a valid directory"
msgstr "pas un répertoire valide"
-#: worktree.c:777
+#: worktree.c:774
msgid "gitdir file does not exist"
msgstr "le fichier gitdir n'existe pas"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:779 worktree.c:788
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "impossible de lire le fichier gitdir (%s)"
-#: worktree.c:801
+#: worktree.c:798
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr ""
"lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)"
-#: worktree.c:809
+#: worktree.c:806
msgid "invalid gitdir file"
msgstr "fichier gitdir invalide"
-#: worktree.c:817
+#: worktree.c:814
msgid "gitdir file points to non-existent location"
msgstr "le fichier gitdir pointe sur un endroit inexistant"
-#: wrapper.c:197 wrapper.c:367
+#: worktree.c:830
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "impossible de définir la clé %s dans '%s'"
+
+#: worktree.c:832
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "impossible de désinitialiser %s dans '%s'"
+
+#: worktree.c:852
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "échec de paramétrage extensions.worktreeConfig"
+
+#: wrapper.c:161
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "impossible de configurer l'environnement '%s'"
+
+#: wrapper.c:213
+#, c-format
+msgid "unable to create '%s'"
+msgstr "impossible de créer '%s'"
+
+#: wrapper.c:215 wrapper.c:385
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "impossible d'ouvrir '%s' en lecture/écriture"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:416 wrapper.c:683
#, c-format
msgid "unable to access '%s'"
msgstr "impossible d'accéder à '%s'"
-#: wrapper.c:607
+#: wrapper.c:691
msgid "unable to get current working directory"
msgstr "impossible d'accéder au répertoire de travail courant"
@@ -9862,11 +10297,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:1125
+#: wt-status.c:211 wt-status.c:1140
msgid "Changes to be committed:"
msgstr "Modifications qui seront validées :"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1149
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
@@ -9971,22 +10406,22 @@
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:958
+#: wt-status.c:973
#, 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:989
+#: wt-status.c:1004
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:991
+#: wt-status.c:1006
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:1073
+#: wt-status.c:1088
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9994,7 +10429,7 @@
"Ne touchez pas à la ligne ci-dessus.\n"
"Tout ce qui suit sera éliminé."
-#: wt-status.c:1165
+#: wt-status.c:1180
#, c-format
msgid ""
"\n"
@@ -10006,107 +10441,114 @@
"de la branche.\n"
"Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n"
-#: wt-status.c:1195
+#: wt-status.c:1210
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:1198
+#: wt-status.c:1213
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:1200
+#: wt-status.c:1215
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
-#: wt-status.c:1204
+#: wt-status.c:1219
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:1207
+#: wt-status.c:1222
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:1216
+#: wt-status.c:1233
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:1219
+#: wt-status.c:1236
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:1223
+#: wt-status.c:1241
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:1225
+#: wt-status.c:1243
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:1227
+#: wt-status.c:1246
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (utilisez \"git am --allow-empty\" pour enregistrer la rustine comme un "
+"commit vide)"
+
+#: wt-status.c:1248
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-#: wt-status.c:1360
+#: wt-status.c:1381
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo est manquant."
-#: wt-status.c:1362
+#: wt-status.c:1383
msgid "No commands done."
msgstr "Aucune commande réalisée."
-#: wt-status.c:1365
+#: wt-status.c:1386
#, 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) :"
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Dernière commande effectuée (%<PRIuMAX> commande effectuée) :"
+msgstr[1] "Dernières commandes effectuées (%<PRIuMAX> commandes effectuées) :"
-#: wt-status.c:1376
+#: wt-status.c:1397
#, c-format
msgid " (see more in file %s)"
msgstr " (voir plus dans le fichier %s)"
-#: wt-status.c:1381
+#: wt-status.c:1402
msgid "No commands remaining."
msgstr "Aucune commande restante."
-#: wt-status.c:1384
+#: wt-status.c:1405
#, 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) :"
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Prochaine commande à effectuer (%<PRIuMAX> commande restante) :"
+msgstr[1] "Prochaines commandes à effectuer (%<PRIuMAX> commandes restantes) :"
-#: wt-status.c:1392
+#: wt-status.c:1413
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
-#: wt-status.c:1404
+#: wt-status.c:1425
#, 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:1409
+#: wt-status.c:1430
msgid "You are currently rebasing."
msgstr "Vous êtes en train de rebaser."
-#: wt-status.c:1422
+#: wt-status.c:1443
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
-#: wt-status.c:1424
+#: wt-status.c:1445
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
-#: wt-status.c:1426
+#: wt-status.c:1447
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:1433
+#: wt-status.c:1454
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-#: wt-status.c:1437
+#: wt-status.c:1458
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -10114,163 +10556,163 @@
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
"de la branche '%s' sur '%s'."
-#: wt-status.c:1442
+#: wt-status.c:1463
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:1445
+#: wt-status.c:1466
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:1449
+#: wt-status.c:1470
#, 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:1454
+#: wt-status.c:1475
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:1457
+#: wt-status.c:1478
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-#: wt-status.c:1459
+#: wt-status.c:1480
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:1470
+#: wt-status.c:1491
msgid "Cherry-pick currently in progress."
msgstr "Picorage en cours."
-#: wt-status.c:1473
+#: wt-status.c:1494
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Vous êtes actuellement en train de picorer le commit %s."
-#: wt-status.c:1480
+#: wt-status.c:1501
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1483
+#: wt-status.c:1504
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (lancez \"git cherry-pick --continue\" pour continuer)"
-#: wt-status.c:1486
+#: wt-status.c:1507
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:1488
+#: wt-status.c:1509
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (utilisez \"git cherry-pick --skip\" pour sauter ce patch)"
-#: wt-status.c:1490
+#: wt-status.c:1511
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:1500
+#: wt-status.c:1521
msgid "Revert currently in progress."
msgstr "Rétablissement en cours."
-#: wt-status.c:1503
+#: wt-status.c:1524
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: wt-status.c:1509
+#: wt-status.c:1530
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: wt-status.c:1512
+#: wt-status.c:1533
msgid " (run \"git revert --continue\" to continue)"
msgstr " (lancez \"git revert --continue\" pour continuer)"
-#: wt-status.c:1515
+#: wt-status.c:1536
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: wt-status.c:1517
+#: wt-status.c:1538
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (utilisez \"git revert --skip\" pour sauter ce patch)"
-#: wt-status.c:1519
+#: wt-status.c:1540
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: wt-status.c:1529
+#: wt-status.c:1550
#, 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:1533
+#: wt-status.c:1554
msgid "You are currently bisecting."
msgstr "Vous êtes en cours de bissection."
-#: wt-status.c:1536
+#: wt-status.c:1557
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:1547
+#: wt-status.c:1568
msgid "You are in a sparse checkout."
msgstr "Vous êtes dans une extraction clairsemée."
-#: wt-status.c:1550
+#: wt-status.c:1571
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
"Vous êtes dans une extraction partielle avec %d %% de fichiers suivis "
"présents."
-#: wt-status.c:1794
+#: wt-status.c:1815
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1801
+#: wt-status.c:1822
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1803
+#: wt-status.c:1824
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1808
+#: wt-status.c:1829
msgid "HEAD detached at "
msgstr "HEAD détachée sur "
-#: wt-status.c:1810
+#: wt-status.c:1831
msgid "HEAD detached from "
msgstr "HEAD détachée depuis "
-#: wt-status.c:1813
+#: wt-status.c:1834
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1830
+#: wt-status.c:1851
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1831
+#: wt-status.c:1852
msgid "No commits yet"
msgstr "Aucun commit"
-#: wt-status.c:1845
+#: wt-status.c:1866
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1847
+#: wt-status.c:1868
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1851
+#: wt-status.c:1872
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10282,32 +10724,32 @@
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1857
+#: wt-status.c:1878
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1859
+#: wt-status.c:1880
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1865
+#: wt-status.c:1886
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1870
+#: wt-status.c:1891
#, 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:1874
+#: wt-status.c:1895
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1878
+#: wt-status.c:1899
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -10316,227 +10758,237 @@
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: wt-status.c:1882
+#: wt-status.c:1903
#, 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:1886
+#: wt-status.c:1907
#, 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:1890 wt-status.c:1896
+#: wt-status.c:1911 wt-status.c:1917
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1893
+#: wt-status.c:1914
#, 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:1898
+#: wt-status.c:1919
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:2003
+#: wt-status.c:2024
msgid "No commits yet on "
msgstr "Encore aucun commit sur "
-#: wt-status.c:2007
+#: wt-status.c:2028
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
-#: wt-status.c:2038
+#: wt-status.c:2059
msgid "different"
msgstr "différent"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2061 wt-status.c:2069
msgid "behind "
msgstr "derrière "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2064 wt-status.c:2067
msgid "ahead "
msgstr "devant "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2605
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "impossible de %s : vous avez des modifications non indexées."
-#: wt-status.c:2575
+#: wt-status.c:2611
msgid "additionally, your index contains uncommitted changes."
msgstr "de plus, votre index contient des modifications non validées."
-#: wt-status.c:2577
+#: wt-status.c:2613
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s impossible : votre index contient des modifications non validées."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "impossible de trouver le commit %"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "impossible de lire la réponse IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "impossible de démarrer accept_thread '%s'"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "impossible de démarrer worker[0] pour '%s'"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:353
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec pour délier '%s'"
+#: compat/fsmonitor/fsm-listen-darwin.c:355
+msgid "Unable to create FSEventStream."
+msgstr "impossible de créer FSEVEntStream."
+
+#: compat/fsmonitor/fsm-listen-darwin.c:403
+msgid "Failed to start the FSEventStream"
+msgstr "Échec de démarrage de FSEVEntStream"
+
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<options>] [--] <chemin>..."
-#: builtin/add.c:61
+#: builtin/add.c:63
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "impossible de chmod %cx '%s'"
-#: builtin/add.c:99
+#: builtin/add.c:105
#, c-format
msgid "unexpected diff status %c"
msgstr "état de diff inattendu %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:110 builtin/commit.c:299
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
-#: builtin/add.c:114
+#: builtin/add.c:120
#, c-format
msgid "remove '%s'\n"
msgstr "suppression de '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:204
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:312 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Impossible d'ouvrir '%s' en écriture."
-
-#: builtin/add.c:322
+#: builtin/add.c:325
msgid "Could not write patch"
msgstr "Impossible d'écrire le patch"
-#: builtin/add.c:325
+#: builtin/add.c:328
msgid "editing patch failed"
msgstr "échec de l'édition du patch"
-#: builtin/add.c:328
+#: builtin/add.c:331
#, c-format
msgid "Could not stat '%s'"
msgstr "Stat de '%s' impossible"
-#: builtin/add.c:330
+#: builtin/add.c:333
msgid "Empty patch. Aborted."
msgstr "Patch vide. Abandon."
-#: builtin/add.c:335
+#: builtin/add.c:339
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossible d'appliquer '%s'"
-#: builtin/add.c:343
+#: builtin/add.c:347
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:366
+#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "mode verbeux"
+
+#: builtin/add.c:370
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
-#: builtin/add.c:368
+#: builtin/add.c:372
msgid "edit current diff and apply"
msgstr "édition du diff actuel et application"
-#: builtin/add.c:369
+#: builtin/add.c:373
msgid "allow adding otherwise ignored files"
msgstr "permettre l'ajout de fichiers ignorés"
-#: builtin/add.c:370
+#: builtin/add.c:374
msgid "update tracked files"
msgstr "mettre à jour les fichiers suivis"
-#: builtin/add.c:371
+#: builtin/add.c:375
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
"renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
-#: builtin/add.c:372
+#: builtin/add.c:376
msgid "record only the fact that the path will be added later"
msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"
-#: builtin/add.c:373
+#: builtin/add.c:377
msgid "add changes from all tracked and untracked files"
msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
-#: builtin/add.c:376
+#: builtin/add.c:380
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:382
msgid "don't add, only refresh the index"
msgstr "ne pas ajouter, juste rafraîchir l'index"
-#: builtin/add.c:379
+#: builtin/add.c:383
msgid "just skip files which cannot be added because of errors"
msgstr ""
"sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
"d'erreurs"
-#: builtin/add.c:380
+#: builtin/add.c:384
msgid "check if - even missing - files are ignored in dry run"
msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr ""
+"permettre la mise à jour des entrées hors du cone d'extraction clairsemée"
+
+#: builtin/add.c:387 builtin/update-index.c:1023
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
-#: builtin/add.c:384
+#: builtin/add.c:389
msgid "warn when adding an embedded repository"
msgstr "avertir lors de l'ajout d'un dépôt embarqué"
-#: builtin/add.c:386
-msgid "backend for `git stash -p`"
-msgstr "backend pour `git stash -p`"
-
-#: builtin/add.c:404
+#: builtin/add.c:407
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10567,12 +11019,12 @@
"\n"
"Référez-vous à \"git help submodule\" pour plus d'information."
-#: builtin/add.c:432
+#: builtin/add.c:436
#, c-format
msgid "adding embedded git repository: %s"
msgstr "dépôt git embarqué ajouté : %s"
-#: builtin/add.c:451
+#: builtin/add.c:456
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10582,52 +11034,29 @@
"Éliminez ce message en lançant\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:471
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run est incompatible avec --interactive/--patch"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file est incompatible avec --interactive/--patch"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file est incompatible avec --edit"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A et -u sont mutuellement incompatibles"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
-
-#: builtin/add.c:526
+#: builtin/add.c:534
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
+#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
+#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr ""
+"'%s' et les arguments de spécificateur de chemin ne peuvent pas être "
+"utilisés ensemble"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul nécessite --pathspec-from-file"
-
-#: builtin/add.c:555
+#: builtin/add.c:566
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:557
+#: builtin/add.c:568
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10637,112 +11066,115 @@
"Éliminez ce message en lançant\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:393
msgid "could not parse author script"
msgstr "impossible d'analyser l'auteur du script"
-#: builtin/am.c:455
+#: builtin/am.c:483
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:497
+#: builtin/am.c:525
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:535
+#: builtin/am.c:563
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:561
+#: builtin/am.c:589
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:749
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:814
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"
-#: builtin/am.c:862
+#: builtin/am.c:890
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:895 builtin/am.c:907
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:874
+#: builtin/am.c:902
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:967
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:1000 builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:977
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1126
+#: builtin/am.c:1154
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
-#: builtin/am.c:1127
+#: builtin/am.c:1155
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
-#: builtin/am.c:1128
+#: builtin/am.c:1160
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Pour enregistrer la rustine vide comme un commit vide, lancez \"%s --allow-"
+"empty\"."
+
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
"abort\"."
-#: builtin/am.c:1223
+#: builtin/am.c:1257
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent "
"être perdus."
-#: builtin/am.c:1251
-msgid "Patch is empty."
-msgstr "Le patch actuel est vide."
-
-#: builtin/am.c:1316
+#: builtin/am.c:1345
#, c-format
msgid "missing author line in commit %s"
msgstr "ligne d'auteur manquante dans le commit %s"
-#: builtin/am.c:1319
+#: builtin/am.c:1348
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ligne d'identification invalide : %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1567
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
"points."
-#: builtin/am.c:1540
+#: builtin/am.c:1569
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
-#: builtin/am.c:1559
+#: builtin/am.c:1588
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10750,24 +11182,24 @@
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1565
+#: builtin/am.c:1594
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1591
+#: builtin/am.c:1620
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1623
+#: builtin/am.c:1652
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1704 builtin/am.c:1708
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1697
+#: builtin/am.c:1726
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
@@ -10775,40 +11207,58 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1736
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1782 builtin/commit.c:410
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1757
+#: builtin/am.c:1786
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1828
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Ignoré : %.*s"
+
+#: builtin/am.c:1833
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Création d'un commit vide : %.*s"
+
+#: builtin/am.c:1837
+msgid "Patch is empty."
+msgstr "Le patch actuel est vide."
+
+#: builtin/am.c:1848 builtin/am.c:1917
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1865
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1820
+#: builtin/am.c:1871
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "l'application de la rustine a échoué à %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1875
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec"
-#: builtin/am.c:1868
+#: builtin/am.c:1921
+msgid "No changes - recorded it as an empty commit."
+msgstr "aucune modification - enregistré comme un commit vide."
+
+#: builtin/am.c:1923
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10819,7 +11269,7 @@
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1875
+#: builtin/am.c:1931
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10832,17 +11282,17 @@
"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
"accepter son état."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
+#: builtin/reset.c:463
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2034
+#: builtin/am.c:2091 builtin/am.c:2167
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2078
+#: builtin/am.c:2135
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10850,160 +11300,159 @@
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2185
+#: builtin/am.c:2292
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Valeur invalide pour --patch-format : %s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "les options '%s=%s' et '%s=%s' ne peuvent pas être utilisées ensemble"
-#: builtin/am.c:2227
-#, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr "Valeur invalide pour --show-current-patch : %s"
-
-#: builtin/am.c:2231
-#, 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:2262
+#: builtin/am.c:2323
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2324
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2330
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2271
+#: builtin/am.c:2332
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2273
+#: builtin/am.c:2334
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:646 builtin/stash.c:946
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2276
+#: builtin/am.c:2337
msgid "add a Signed-off-by trailer to the commit message"
msgstr "ajouter une ligne terminale Signed-off-by au message de validation"
-#: builtin/am.c:2279
+#: builtin/am.c:2340
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2281
+#: builtin/am.c:2342
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2283
+#: builtin/am.c:2344
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2285
+#: builtin/am.c:2346
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2287
+#: builtin/am.c:2348
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:2290
+#: builtin/am.c:2351
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:2293
+#: builtin/am.c:2354
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2295
+#: builtin/am.c:2356
msgid "pass it through git-mailinfo"
msgstr "le passer à travers git-mailinfo"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
+#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
+#: builtin/am.c:2386
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
+#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
+#: parse-options.h:348
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
-#: builtin/verify-tag.c:38
+#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
+#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
+#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
+#: builtin/tag.c:480 builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2322
+#: builtin/am.c:2383
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2328
+#: builtin/am.c:2389
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:2330
+#: builtin/am.c:2391
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2333
+#: builtin/am.c:2394
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2336
+#: builtin/am.c:2397
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2339
+#: builtin/am.c:2400
msgid "restore the original branch and abort the patching operation"
msgstr "restaurer la branche originale et abandonner les applications de patch"
-#: builtin/am.c:2342
+#: builtin/am.c:2403
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:2346
+#: builtin/am.c:2407
msgid "show the patch being applied"
msgstr "afficher le patch en cours d'application"
-#: builtin/am.c:2351
+#: builtin/am.c:2411
+msgid "record the empty patch as an empty commit"
+msgstr "enregistrer la rustine vide comme un commit vide"
+
+#: builtin/am.c:2415
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2353
+#: builtin/am.c:2417
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
+#: builtin/revert.c:117 builtin/tag.c:461
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2420 builtin/rebase.c:1128
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2359
+#: builtin/am.c:2423
+msgid "how to handle empty patches"
+msgstr "comment gérer les rustines vides"
+
+#: builtin/am.c:2426
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2377
+#: builtin/am.c:2444
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."
@@ -11011,17 +11460,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:2384
+#: builtin/am.c:2451
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2399
+#: builtin/am.c:2466
#, 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:2423
+#: builtin/am.c:2490
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -11030,13 +11479,13 @@
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2429
+#: builtin/am.c:2496
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:2439
+#: builtin/am.c:2506
msgid "interactive mode requires patches on the command line"
msgstr "le mode interactif requiert des rustines sur la ligne de commande"
@@ -11044,54 +11493,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<options>] [<patch>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "création impossible du fichier d'archive '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "impossible de rediriger la sortie"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive : Dépôt distant sans URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive : ACK/NACK attendu, paquet de nettoyage reçu"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive : NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive : erreur de protocole"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive : vidage attendu"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<commit>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <terme-pour-bon> <terme-pour-mauvais> "
-"[<term>]"
-
-#: builtin/bisect--helper.c:25
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-
#: builtin/bisect--helper.c:26
msgid ""
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
@@ -11102,10 +11532,6 @@
"=<terme>][--no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] "
"[<chemins>...]"
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-next"
-
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
msgstr "git bisect--helper --bisect-state (bad|new) [<rév>]"
@@ -11122,46 +11548,55 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<rév>|<plage>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <cmd>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "impossible d'ouvrir le fichier '%s' en mode '%s'"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "impossible d'écrire le fichier '%s'"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "impossible d'ouvrir le fichier '%s' en lecture"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' n'est pas un terme valide"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "impossible d'utiliser la commande incluse '%s' comme terme"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "impossible de modifier la signification du terme '%s'"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "veuillez utiliser deux termes différents"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "Pas de bissection en cours.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' n'est pas un commit valide"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11169,27 +11604,27 @@
"échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset "
"<commit>'."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Mauvais argument pour bisect_write : %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "impossible d'obtenir l'oid de la révision '%s'"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "impossible d'ouvrir le fichier '%s'"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Commande invalide : vous êtes actuellement dans une bissection %s/%s"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -11198,7 +11633,7 @@
"Vous devez me donner au moins une révision %s et une révision %s.\n"
"Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela."
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11209,7 +11644,7 @@
"Puis vous devez me donner au moins une révision %s et une révision %s.\n"
"Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela."
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "bissection avec seulement un commit %s"
@@ -11218,15 +11653,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Confirmez-vous [Y/n] ? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "aucun terme défini"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11235,7 +11670,7 @@
"Vos termes actuels sont %s pour l'état ancien\n"
"et %s pour le nouvel état.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11245,53 +11680,53 @@
"Les options supportées sont : --term-good|--term-old et --term-bad|--term-"
"new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "échec de la préparation du parcours des révisions\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "impossible d'ouvrir '%s' en ajout"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' n'est pas un terme valide"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "option non reconnue : '%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' ne semble être une révision valide"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "mauvaise HEAD - j'ai besoin d'une HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"l'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "refus de bissecter sur un arbre 'cg-seeked'"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "mauvaise HEAD - référence symbolique douteuse"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "réference invalide : '%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Vous devez démarrer avec \"git bisect start\"\n"
@@ -11299,104 +11734,160 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Veuillez appeler `--bisect-state` avec au moins un argument"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' n'accepte qu'un seul argument."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Mauvaise révision en entrée : %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Mauvaise révision en entrée (pas un commit) : %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Pas de bissection en cours."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "'%s' ?? de quoi parlez-vous ?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "impossible de lire le fichier '%s' pour rejouer"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#, c-format
+msgid "running %s\n"
+msgstr "Lancement de %s\n"
+
+#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+msgid "bisect run failed: no command provided."
+msgstr "la bissection a échoué : aucune commande fournie."
+
+#: builtin/bisect--helper.c:1166
+#, c-format
+msgid "unable to verify '%s' on good revision"
+msgstr "impossible de vérifier '%s' sur une bonne révision"
+
+#: builtin/bisect--helper.c:1172
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr "code de sortie %d erroné pour une bonne révision"
+
+#: builtin/bisect--helper.c:1180
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "la bissection a échoué : le code retour %d de '%s' est < 0 ou >= 128"
+
+#: builtin/bisect--helper.c:1195
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "impossible d'ouvrir '%s' en écriture"
+
+#: builtin/bisect--helper.c:1213
+msgid "bisect run cannot continue any more"
+msgstr "la bissection ne peut plus continuer"
+
+#: builtin/bisect--helper.c:1215
+#, c-format
+msgid "bisect run success"
+msgstr "succès de la bissection"
+
+#: builtin/bisect--helper.c:1218
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "la bissection a trouvé le premier mauvais commit"
+
+#: builtin/bisect--helper.c:1221
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"la bissection a échoué : 'git bisect--helper --bisect-state %s' a retourné "
+"le code erreur %d"
+
+#: builtin/bisect--helper.c:1253
msgid "reset the bisection state"
msgstr "réinitialiser l'état de la bissection"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1255
msgid "check whether bad or good terms exist"
msgstr "vérifier si les termes bons ou mauvais existent"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1257
msgid "print out the bisect terms"
msgstr "afficher les termes de bissection"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1259
msgid "start the bisect session"
msgstr "démarrer une session de bissection"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1261
msgid "find the next bisection commit"
msgstr "trouver le prochain commit de bissection"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1263
msgid "mark the state of ref (or refs)"
msgstr "marquer l'état d'une références (ou plusieurs)"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1265
msgid "list the bisection steps so far"
msgstr "lister les étapes de bissection jusqu'ici"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1267
msgid "replay the bisection process from the given file"
msgstr "rejouer le processus de bissection depuis le fichier fourni"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1269
msgid "skip some commits for checkout"
msgstr "sauter certains commits pour l'extraction"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1271
+msgid "visualize the bisection"
+msgstr "visualiser la bissection"
+
+#: builtin/bisect--helper.c:1273
+msgid "use <cmd>... to automatically bisect"
+msgstr "utiliser <cmd>... pour bissecter automatiquement"
+
+#: builtin/bisect--helper.c:1275
msgid "no log for BISECT_WRITE"
msgstr "pas de journal pour BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1290
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset supporte soit aucun argument, soit un commit"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check exige 2 ou 3 arguments"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1295
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms exige 0 ou 1 argument"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1304
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next exige 0 argument"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1315
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log exige 0 argument"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1320
msgid "no logfile given"
msgstr "pas de fichier de log donné"
@@ -11408,159 +11899,152 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "couleur attendue : %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "doit finir avec une couleur"
-#: builtin/blame.c:728
-#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "couleur invalide '%s' dans color.blame.repeatedLines"
-
-#: builtin/blame.c:746
-msgid "invalid value for blame.coloring"
-msgstr "valeur invalide pour blame.coloring"
-
-#: builtin/blame.c:845
+#: builtin/blame.c:842
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "référence à ignorer %s introuvable"
-#: builtin/blame.c:867
+#: builtin/blame.c:864
msgid "show blame entries as we find them, incrementally"
msgstr ""
"montrer les éléments de blâme au fur et à mesure de leur découverte, de "
"manière incrémentale"
-#: builtin/blame.c:868
+#: builtin/blame.c:865
msgid "do not show object names of boundary commits (Default: off)"
msgstr ""
"ne pas montrer les noms des objets pour les commits de limite (Défaut : "
"désactivé)"
-#: builtin/blame.c:869
+#: builtin/blame.c:866
msgid "do not treat root commits as boundaries (Default: off)"
msgstr ""
"ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
-#: builtin/blame.c:870
+#: builtin/blame.c:867
msgid "show work cost statistics"
msgstr "montrer les statistiques de coût d'activité"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
+#: builtin/remote.c:683 builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/blame.c:872
+#: builtin/blame.c:869
msgid "show output score for blame entries"
msgstr "montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:873
+#: builtin/blame.c:870
msgid "show original filename (Default: auto)"
msgstr "montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:874
+#: builtin/blame.c:871
msgid "show original linenumber (Default: off)"
msgstr "montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:875
+#: builtin/blame.c:872
msgid "show in a format designed for machine consumption"
msgstr "afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:876
+#: builtin/blame.c:873
msgid "show porcelain format with per-line commit information"
msgstr "afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:877
+#: builtin/blame.c:874
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"
-#: builtin/blame.c:878
+#: builtin/blame.c:875
msgid "show raw timestamp (Default: off)"
msgstr "afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:879
+#: builtin/blame.c:876
msgid "show long commit SHA1 (Default: off)"
msgstr "afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:880
+#: builtin/blame.c:877
msgid "suppress author name and timestamp (Default: off)"
msgstr "supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"
-#: builtin/blame.c:881
+#: builtin/blame.c:878
msgid "show author email instead of name (Default: off)"
msgstr "afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)"
-#: builtin/blame.c:882
+#: builtin/blame.c:879
msgid "ignore whitespace differences"
msgstr "ignorer les différences d'espace"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:880 builtin/log.c:1857
msgid "rev"
msgstr "rév"
-#: builtin/blame.c:883
+#: builtin/blame.c:880
msgid "ignore <rev> when blaming"
msgstr "ignorer <rev> pendant le blâme"
-#: builtin/blame.c:884
+#: builtin/blame.c:881
msgid "ignore revisions from <file>"
msgstr "ignorer les révisions listées dans <fichier>"
-#: builtin/blame.c:885
+#: builtin/blame.c:882
msgid "color redundant metadata from previous line differently"
msgstr ""
"colorer différemment les métadonnées redondantes avec la ligne précédente"
-#: builtin/blame.c:886
+#: builtin/blame.c:883
msgid "color lines by age"
msgstr "colorier les lignes par âge"
-#: builtin/blame.c:887
+#: builtin/blame.c:884
msgid "spend extra cycles to find better match"
msgstr ""
"dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:888
+#: builtin/blame.c:885
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr ""
"utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:886
msgid "use <file>'s contents as the final image"
msgstr "utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:887 builtin/blame.c:888
msgid "score"
msgstr "score"
-#: builtin/blame.c:890
+#: builtin/blame.c:887
msgid "find line copies within and across files"
msgstr "trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:891
+#: builtin/blame.c:888
msgid "find line movements within and across files"
msgstr "trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:892
+#: builtin/blame.c:889
msgid "range"
msgstr "plage"
-#: builtin/blame.c:893
+#: builtin/blame.c:890
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
"traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-"
"de-fonction>"
-#: builtin/blame.c:945
+#: builtin/blame.c:949
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress ne peut pas être utilisé avec --incremental ou les formats "
@@ -11574,18 +12058,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:1000
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1116
#, 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:1157
+#: builtin/blame.c:1161
msgid "Blaming lines"
msgstr "Assignation de blâme aux lignes"
@@ -11594,32 +12078,40 @@
msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"
#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<options>] [-l] [-f] <nom-de-branche> [<point-de-départ>]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr ""
+"git branch [<options>] [-f] [--recurse-submodules] <nom-de-branche> [<point-"
+"de-départ>]"
#: builtin/branch.c:31
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<options>] [-l] [<motif>...]"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
"git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
-#: builtin/branch.c:33
+#: builtin/branch.c:34
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
"git branch [<options>] (-c | -C) [<ancienne-branche>] <nouvelle-branche>"
-#: builtin/branch.c:34
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<options>] [-r | -a] [--points-at]"
-#: builtin/branch.c:35
+#: builtin/branch.c:36
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<options>] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:165
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -11628,7 +12120,7 @@
"suppression de la branche '%s' qui a été fusionnée dans\n"
" '%s', mais pas dans HEAD."
-#: builtin/branch.c:158
+#: builtin/branch.c:169
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -11637,12 +12129,12 @@
"branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
" '%s', même si elle est fusionnée dans HEAD."
-#: builtin/branch.c:172
+#: builtin/branch.c:183
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Impossible de rechercher l'objet commit pour '%s'"
-#: builtin/branch.c:176
+#: builtin/branch.c:187
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -11651,115 +12143,115 @@
"La branche '%s' n'est pas totalement fusionnée.\n"
"Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'."
-#: builtin/branch.c:189
+#: builtin/branch.c:200
msgid "Update of config-file failed"
msgstr "Échec de la mise à jour du fichier de configuration"
-#: builtin/branch.c:223
+#: builtin/branch.c:235
msgid "cannot use -a with -d"
msgstr "impossible d'utiliser -a avec -d"
-#: builtin/branch.c:230
+#: builtin/branch.c:242
msgid "Couldn't look up commit object for HEAD"
msgstr "Impossible de rechercher l'objet commit pour HEAD"
-#: builtin/branch.c:244
+#: builtin/branch.c:259
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
-#: builtin/branch.c:259
+#: builtin/branch.c:274
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "branche de suivi '%s' non trouvée."
-#: builtin/branch.c:260
+#: builtin/branch.c:275
#, c-format
msgid "branch '%s' not found."
msgstr "branche '%s' non trouvée."
-#: builtin/branch.c:291
+#: builtin/branch.c:306
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:307
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:457 builtin/tag.c:64
msgid "unable to parse format string"
msgstr "impossible d'analyser la chaîne de format"
-#: builtin/branch.c:471
+#: builtin/branch.c:488
msgid "could not resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: builtin/branch.c:477
+#: builtin/branch.c:494
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) pointe hors de refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:509
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "La branche %s est en cours de rebasage sur %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:513
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branche %s est en cours de bissection sur %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:530
msgid "cannot copy the current branch while not on any."
msgstr "impossible de copier la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:515
+#: builtin/branch.c:532
msgid "cannot rename the current branch while not on any."
msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:526
+#: builtin/branch.c:543
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:572
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:557
+#: builtin/branch.c:574
msgid "Branch copy failed"
msgstr "Échec de copie de la branche"
-#: builtin/branch.c:561
+#: builtin/branch.c:578
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Création d'une copie d'une branche mal nommée '%s'"
-#: builtin/branch.c:564
+#: builtin/branch.c:581
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Renommage d'une branche mal nommée '%s'"
-#: builtin/branch.c:570
+#: builtin/branch.c:587
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
-#: builtin/branch.c:579
+#: builtin/branch.c:596
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branche est renommée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:581
+#: builtin/branch.c:598
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La branche est copiée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:597
+#: builtin/branch.c:614
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11770,180 +12262,193 @@
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:633
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
-#: builtin/branch.c:634
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "régler le mode de suivi (voir git-pull(1))"
+#: builtin/branch.c:656 builtin/checkout.c:1571
+#: builtin/submodule--helper.c:3077
+msgid "set branch tracking configuration"
+msgstr "règler la configuration des branches de suivi"
-#: builtin/branch.c:637
+#: builtin/branch.c:659
msgid "do not use"
msgstr "ne pas utiliser"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:661
msgid "upstream"
msgstr "amont"
-#: builtin/branch.c:639
+#: builtin/branch.c:661
msgid "change the upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:640
+#: builtin/branch.c:662
msgid "unset the upstream info"
msgstr "désactiver l'information amont"
-#: builtin/branch.c:641
+#: builtin/branch.c:663
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:642
+#: builtin/branch.c:664
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:666 builtin/branch.c:668
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:667 builtin/branch.c:669
msgid "print only branches that don't contain the commit"
msgstr "afficher seulement les branches qui ne contiennent pas le commit"
-#: builtin/branch.c:650
+#: builtin/branch.c:672
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:651
+#: builtin/branch.c:673
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:653
+#: builtin/branch.c:675
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:654
+#: builtin/branch.c:676
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:655
+#: builtin/branch.c:677
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:656
+#: builtin/branch.c:678
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:657
+#: builtin/branch.c:679
msgid "copy a branch and its reflog"
msgstr "copier une branche et son reflog"
-#: builtin/branch.c:658
+#: builtin/branch.c:680
msgid "copy a branch, even if target exists"
msgstr "copier une branche, même si la cible existe"
-#: builtin/branch.c:659
+#: builtin/branch.c:681
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:660
+#: builtin/branch.c:682
msgid "show current branch name"
msgstr "afficher le nom de la branche courante"
-#: builtin/branch.c:661
+#: builtin/branch.c:683 builtin/submodule--helper.c:3075
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:663
+#: builtin/branch.c:685
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:664
+#: builtin/branch.c:686
msgid "force creation, move/rename, deletion"
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
-#: builtin/branch.c:665
+#: builtin/branch.c:687
msgid "print only branches that are merged"
msgstr "afficher seulement les branches qui sont fusionnées"
-#: builtin/branch.c:666
+#: builtin/branch.c:688
msgid "print only branches that are not merged"
msgstr "afficher seulement les branches qui ne sont pas fusionnées"
-#: builtin/branch.c:667
+#: builtin/branch.c:689
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:476
msgid "object"
msgstr "objet"
-#: builtin/branch.c:670
+#: builtin/branch.c:692
msgid "print only branches of the object"
msgstr "afficher seulement les branches de l'objet"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
msgid "sorting and filtering are case insensitive"
msgstr "le tri et le filtrage sont non-sensibles à la casse"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:694 builtin/ls-files.c:667
+msgid "recurse through submodules"
+msgstr "parcourir récursivement les sous-modules"
+
+#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
+#: builtin/tag.c:481 builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format à utiliser pour la sortie"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:718 builtin/clone.c:684
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column et --verbose sont incompatibles"
+#: builtin/branch.c:739
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
+"brancher avec --recurse-submodules ne peut être utilisé que si submodule."
+"propagateBranches est activé"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:741
+msgid "--recurse-submodules can only be used to create branches"
+msgstr "--recurse-submodules ne peut être utilisé que pour créer des branches"
+
+#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:766
+#: builtin/branch.c:802
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:771
+#: builtin/branch.c:807
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:778
+#: builtin/branch.c:814
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:781
+#: builtin/branch.c:817
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:796
+#: builtin/branch.c:832
msgid "too many branches for a copy operation"
msgstr "trop de branches pour une opération de copie"
-#: builtin/branch.c:805
+#: builtin/branch.c:841
msgid "too many arguments for a rename operation"
msgstr "trop d'arguments pour une opération de renommage"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "too many arguments to set new upstream"
msgstr "trop d'arguments pour spécifier une branche amont"
-#: builtin/branch.c:814
+#: builtin/branch.c:850
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11951,32 +12456,32 @@
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
"aucune branche."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:853 builtin/branch.c:873
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:821
+#: builtin/branch.c:857
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:834
+#: builtin/branch.c:867
msgid "too many arguments to unset upstream"
msgstr "trop d'arguments pour désactiver un amont"
-#: builtin/branch.c:838
+#: builtin/branch.c:871
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:844
+#: builtin/branch.c:877
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:854
+#: builtin/branch.c:890
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>?"
@@ -11985,7 +12490,7 @@
"branche.\n"
"Vouliez-vous plutôt dire -a|-r --list <motif> ?"
-#: builtin/branch.c:858
+#: builtin/branch.c:894
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11993,32 +12498,32 @@
"l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-"
"upstream-to' à la place."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "version git ::\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "échec de uname() avec l'erreur '%s' (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "info compilateur : "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "info libc : "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "lancé hors d'un dépôt git - aucun crochet à montrer\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <fichier>] [-s|--suffix <format>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -12055,38 +12560,33 @@
"Veuillez relire le rapport de bogue ci-dessous.\n"
"Vous pouvez supprimer toute ligne que vous ne souhaitez pas envoyer.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "spécifier la destination du fichier de rapport de bogue"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "spécifier une suffixe au format strftime pour le nom de fichier"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "impossible de créer les répertoires de premier niveau pour '%s'"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Info système"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Crochets activés"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "impossible de créer un fichier nouveau à '%s'"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "impossible d'écrire dans %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Nouveau rapport créé à '%s'.\n"
@@ -12107,138 +12607,252 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3899
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3903
msgid "show progress meter during object writing phase"
msgstr "afficher la barre de progression durant la phase d'écrite des objets"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3906
msgid "similar to --all-progress when progress meter is shown"
msgstr "similaire à --all-progress quand la barre de progression est affichée"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "spécifier la version du format de colis"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "La création d'un colis requiert un dépôt."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:108
msgid "do not show bundle details"
msgstr "ne pas afficher les détails du colis"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:127
#, c-format
msgid "%s is okay\n"
msgstr "%s est correct\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:183
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "être verbeux : doit être placé avant une sous-commande"
+#: builtin/bundle.c:186
+msgid "Unbundling objects"
+msgstr "Dépaquetage d'objets"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:220 builtin/remote.c:1758
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sous-commande inconnue : %s"
-#: builtin/cat-file.c:596
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
-msgstr ""
-"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
-"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
+#: builtin/cat-file.c:568
+msgid "flush is only for --buffer mode"
+msgstr "flush n'est que pour le mode --buffer"
-#: builtin/cat-file.c:597
-msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
-msgstr ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
+#: builtin/cat-file.c:612
+msgid "empty command in input"
+msgstr "commande vide dans l'entrée"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:614
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "caractère espace devant la commande : '%s'"
+
+#: builtin/cat-file.c:623
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s nécessite des arguments"
+
+#: builtin/cat-file.c:628
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s n'accepte aucune argument"
+
+#: builtin/cat-file.c:636
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "commande inconnue : %s"
+
+#: builtin/cat-file.c:795
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:636
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<type> peut être : blob, tree, commit ou tag"
+#: builtin/cat-file.c:824
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <type> <objet>"
-#: builtin/cat-file.c:637
-msgid "show object type"
-msgstr "afficher le type de l'objet"
+#: builtin/cat-file.c:825
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git cat-file (-e | -p) <objet>"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:826
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objet>"
+
+#: builtin/cat-file.c:827
+msgid ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+
+#: builtin/cat-file.c:830
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<chemin|arbresque> | --path=<chemin|arbresque> <rev>]"
+
+#: builtin/cat-file.c:836
+msgid "Check object existence or emit object contents"
+msgstr "Vérifie l'existence d'un objet ou émettre le contenu de l'objet"
+
+#: builtin/cat-file.c:838
+msgid "check if <object> exists"
+msgstr "Vérification si <objet> existe"
+
+#: builtin/cat-file.c:839
+msgid "pretty-print <object> content"
+msgstr "affichage propre du contenu de <objet>"
+
+#: builtin/cat-file.c:841
+msgid "Emit [broken] object attributes"
+msgstr "Émet les attributs [broken] d'un objet"
+
+#: builtin/cat-file.c:842
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr "montrer le type de l'objet (parmi 'blob', 'tree', 'commit', 'tag' ...)"
+
+#: builtin/cat-file.c:843
msgid "show object size"
msgstr "afficher la taille de l'objet"
-#: builtin/cat-file.c:640
-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:641
-msgid "pretty-print object's content"
-msgstr "afficher avec mise en forme le contenu de l'objet"
-
-#: builtin/cat-file.c:643
-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:645
-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:646
-msgid "blob"
-msgstr "blob"
-
-#: builtin/cat-file.c:647
-msgid "use a specific path for --textconv/--filters"
-msgstr "utiliser un chemin spécifique pour --textconv/--filters"
-
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:845
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:650
+#: builtin/cat-file.c:847
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr "Traiter par lot les objets demandés sur stdin (ou --batch-all-objects)"
+
+#: builtin/cat-file.c:849
+msgid "show full <object> or <rev> contents"
+msgstr "afficher tout le contenu de <objet> ou <rev>"
+
+#: builtin/cat-file.c:853
+msgid "like --batch, but don't emit <contents>"
+msgstr "comme --batch, mais ne pas émettre <contenu>"
+
+#: builtin/cat-file.c:857
+msgid "read commands from stdin"
+msgstr "lire les commandes depuis l'entrée standard"
+
+#: builtin/cat-file.c:861
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr ""
+"avec --batch[-check] : ignore stdin, gère tous les objets connus par lots"
+
+#: builtin/cat-file.c:863
+msgid "Change or optimize batch output"
+msgstr "Changer ou optimiser la sortie de traitement"
+
+#: builtin/cat-file.c:864
msgid "buffer --batch output"
msgstr "bufferiser la sortie de --batch"
-#: builtin/cat-file.c:652
-msgid "show info and content of objects fed from the standard input"
+#: builtin/cat-file.c:866
+msgid "follow in-tree symlinks"
+msgstr "suivi des liens symboliques dans l'arbre"
+
+#: builtin/cat-file.c:868
+msgid "do not order objects before emitting them"
+msgstr "ne pas ordonner les objets avant de les émettre"
+
+#: builtin/cat-file.c:870
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
msgstr ""
-"afficher l'information et le contenu des objets passés en entrée standard"
+"Émet l'objet (blob ou arbre) avec une conversion ou un filtre (autonome ou "
+"en lot)"
-#: builtin/cat-file.c:656
-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:872
+msgid "run textconv on object's content"
+msgstr "lancer textconv sur le contenu de l'objet"
-#: builtin/cat-file.c:660
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: builtin/cat-file.c:874
+msgid "run filters on object's content"
+msgstr "lancer les filtres sur le contenu de l'objet"
+
+#: builtin/cat-file.c:875
+msgid "blob|tree"
+msgstr "blob|arbre"
+
+#: builtin/cat-file.c:876
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
msgstr ""
-"suivre les liens symbolique internes à la copie de travail (utilisé avec --"
-"batch ou --batch-check)"
+"utiliser un <chemin> spécifique pour (--textconv | --filters); pas pour les "
+"lots"
-#: builtin/cat-file.c:662
-msgid "show all objects with --batch or --batch-check"
-msgstr "montrer tous les objets avec --batch ou --batch-check"
+#: builtin/cat-file.c:894
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "'%s=<%s>' a besoin de '%s' ou '%s'"
-#: builtin/cat-file.c:664
-msgid "do not order --batch-all-objects output"
-msgstr "ne pas ordonner la sortie de --batch-all-objects"
+#: builtin/cat-file.c:896
+msgid "path|tree-ish"
+msgstr "blob|arbre-esque"
+
+#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "%s a besoin d'un mode par lots"
+
+#: builtin/cat-file.c:921
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "'-%c' est incompatible avec le mode par lots"
+
+#: builtin/cat-file.c:924
+msgid "batch modes take no arguments"
+msgstr "les modes par lot n'acceptent aucun argument"
+
+#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "<rev> nécessaire avec '%s'"
+
+#: builtin/cat-file.c:938
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "<objet> nécessaire avec '-%c'"
+
+#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429
+#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596
+#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965
+#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
+#: builtin/tag.c:592
+msgid "too many arguments"
+msgstr "trop d'arguments"
+
+#: builtin/cat-file.c:947
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr "deux arguments seulement permis dans le mode <type> <objet>, pas %d"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -12256,7 +12870,7 @@
msgid "use .gitattributes only from the index"
msgstr "utiliser .gitattributes seulement depuis l'index"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
msgid "read file names from stdin"
msgstr "lire les noms de fichier depuis l'entrée standard"
@@ -12265,8 +12879,8 @@
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
+#: builtin/worktree.c:565
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
@@ -12323,171 +12937,169 @@
msgid "git checkout--worker [<options>]"
msgstr "git checkout--worker [<options>]"
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
+#: builtin/worktree.c:808
msgid "string"
msgstr "chaîne"
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
msgid "when creating files, prepend <string>"
msgstr "lors de la création de fichiers, préfixer par <chaîne>"
-#: builtin/checkout-index.c:152
+#: builtin/checkout-index.c:184
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<options>] [--] [<fichier>...]"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:201
msgid "stage should be between 1 and 3 or all"
msgstr "stage doit valoir entre 1 et 3, ou all"
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:219
msgid "check out all files in the index"
msgstr "extraire tous les fichiers présents dans l'index"
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:221
+msgid "do not skip files with skip-worktree set"
+msgstr "ne pas sauter des fichiers avec un ensemble skip-worktree"
+
+#: builtin/checkout-index.c:222
msgid "force overwrite of existing files"
msgstr "forcer l'écrasement des fichiers existants"
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:224
msgid "no warning for existing files and files not in index"
msgstr ""
"pas d'avertissement pour les fichiers existants et les fichiers absents de "
"l'index"
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:226
msgid "don't checkout new files"
msgstr "ne pas extraire les nouveaux fichiers"
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:228
msgid "update stat information in the index file"
msgstr "mettre à jour l'information de stat dans le fichier d'index"
-#: builtin/checkout-index.c:198
+#: builtin/checkout-index.c:232
msgid "read list of paths from the standard input"
msgstr "lire la liste des chemins depuis l'entrée standard"
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:234
msgid "write the content to temporary files"
msgstr "écrire le contenu dans des fichiers temporaires"
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:238
msgid "copy out the files from named stage"
msgstr "copier les fichiers depuis l'index nommé"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:34
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<options>] <branche>"
-#: builtin/checkout.c:34
+#: builtin/checkout.c:35
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<options>] [<branche>] -- <fichier>..."
-#: builtin/checkout.c:39
+#: builtin/checkout.c:40
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<options>] <branche>"
-#: builtin/checkout.c:44
+#: builtin/checkout.c:45
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<options>] [--source=<branche>] <fichier>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:199 builtin/checkout.c:238
#, c-format
msgid "path '%s' does not have our version"
msgstr "le chemin '%s' n'a pas notre version"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:201 builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have their version"
msgstr "le chemin '%s' n'a pas leur version"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:217
#, 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:261
+#: builtin/checkout.c:271
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "le chemin '%s' n'a pas les versions nécessaires"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:291
#, c-format
msgid "path '%s': cannot merge"
msgstr "chemin '%s' : impossible de fusionner"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:307
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
-#: builtin/checkout.c:411
+#: builtin/checkout.c:424
#, 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:416
+#: builtin/checkout.c:429
#, 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:423
+#: builtin/checkout.c:436
#, 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:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:469
#, 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:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' ne peut pas être utilisé avec %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:479
#, 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:470
+#: builtin/checkout.c:483
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "ni '%s', ni '%s' spécifié"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:487
#, 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:479 builtin/checkout.c:484
+#: builtin/checkout.c:492 builtin/checkout.c:497
#, 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:558 builtin/checkout.c:565
+#: builtin/checkout.c:571 builtin/checkout.c:578
#, c-format
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:753
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:809
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12497,50 +13109,50 @@
"suivants :\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:902
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:947
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:955
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:958
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:962
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:964 builtin/checkout.c:1398
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:966
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:1017
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12563,7 +13175,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1042
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12592,19 +13204,19 @@
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1077
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1081
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1124 builtin/checkout.c:1393
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1206
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12613,7 +13225,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:1186
+#: builtin/checkout.c:1213
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"
@@ -12633,51 +13245,58 @@
"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
"votre config."
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1223
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
msgid "only one reference expected"
msgstr "une seule référence attendue"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1306
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1365 builtin/checkout.c:1744
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "branche attendue, mais étiquette '%s' reçue"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1415
#, 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:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1417 builtin/checkout.c:1426
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "une branche est attendue, mais '%s' a été reçue"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1420
#, 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:1407
+#: builtin/checkout.c:1429
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr ""
+"Si vous souhaitez détacher HEAD à ce commit, réessayez avec l'option --"
+"detach."
+
+#: builtin/checkout.c:1442
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12685,7 +13304,7 @@
"impossible de basculer de branche pendant une fusion\n"
"Envisagez \"git merge --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12693,7 +13312,7 @@
"impossible de basculer de branche pendant une session am\n"
"Envisagez \"git am --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1450
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12701,7 +13320,7 @@
"impossible de basculer de branche pendant un rebasage\n"
"Envisagez \"git rebase --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12709,7 +13328,7 @@
"impossible de basculer de branche pendant un picorage\n"
"Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1458
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12717,139 +13336,124 @@
"impossible de basculer de branche pendant un retour\n"
"Envisagez \"git revert --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1462
msgid "you are switching branch while bisecting"
msgstr "vous basculez de branche en cours de bissection"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1469
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
#, 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:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
+#: builtin/checkout.c:1495 builtin/checkout.c:1500
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1497
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' n'accepte pas <point-de-départ>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1505
#, 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:1477
+#: builtin/checkout.c:1512
msgid "missing branch or commit argument"
msgstr "argument de branche ou de commit manquant"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1555
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1522
-msgid "conflict style (merge or diff3)"
-msgstr "style de conflit (merge (fusion) ou diff3)"
+#: builtin/checkout.c:1557
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "style de conflit (merge (fusion), diff3 ou zdiff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1569 builtin/worktree.c:560
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1535
-msgid "set upstream info for new branch"
-msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1574
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1578 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1581
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:1557
+#: builtin/checkout.c:1594
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1597
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1601
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:1622
+#: builtin/checkout.c:1659
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c et --orphan sont mutuellement exclusifs"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr ""
+"les options '-%c', '-%c' et '%s' ne peuvent pas être utilisées ensemble"
-#: builtin/checkout.c:1626
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p et --overlay sont mutuellement exclusifs"
-
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1700
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1705
#, c-format
msgid "missing branch name; try -%c"
msgstr "nom de branche manquant ; essayez -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1737
#, c-format
msgid "could not resolve %s"
msgstr "impossible de résoudre %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1753
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1760
#, 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:1727
+#: builtin/checkout.c:1764
#, 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:1736
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file est incompatible avec --detach"
-
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file est incompatible avec --patch"
-
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1789
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12857,72 +13461,72 @@
"git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
"de l'extraction de l'index."
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1794
msgid "you must specify path(s) to restore"
msgstr "vous devez spécifier un ou des chemins à restaurer"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
+#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
+#: builtin/remote.c:173 builtin/submodule--helper.c:3038
+#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
+#: builtin/worktree.c:558
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1820
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1822
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1823
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1825
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
"essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1826
msgid "use overlay mode (default)"
msgstr "utiliser le mode de superposition (défaut)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1874
msgid "create and switch to a new branch"
msgstr "créer et basculer sur une nouvelle branche"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1876
msgid "create/reset and switch to a branch"
msgstr "créer/réinitialiser et basculer sur une branche"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1878
msgid "second guess 'git switch <no-such-branch>'"
msgstr "interpréter 'git switch <branche-inexistante>'"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1880
msgid "throw away local modifications"
msgstr "laisser tomber les modifications locales"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1916
msgid "which tree-ish to checkout from"
msgstr "de quel <arbre-esque> faire l'extraction"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1918
msgid "restore the index"
msgstr "restaurer l'index"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1920
msgid "restore the working tree (default)"
msgstr "restaurer l'arbre de travail (par défaut)"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1922
msgid "ignore unmerged entries"
msgstr "ignorer les entrées non-fusionnées"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1923
msgid "use overlay mode"
msgstr "utiliser le mode de superposition"
@@ -12957,7 +13561,15 @@
msgid "could not lstat %s\n"
msgstr "lstat de %s impossible\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Refus de supprimer le répertoire de travail actuel\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Refuserait de supprimer le répertoire de travail actuel\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12970,7 +13582,7 @@
"foo - sélectionner un élément par un préfixe unique\n"
" - (vide) ne rien sélectionner\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12991,33 +13603,33 @@
"* - choisir tous les éléments\n"
" - (vide) terminer la sélection\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hein (%s) ?\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Entrez les motifs à ignorer>> "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Sélectionner les éléments à supprimer"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Supprimer %s [y/N] ? "
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -13035,52 +13647,52 @@
"help - cet écran\n"
"? - aide pour la sélection en ligne"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
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:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Plus de fichier à nettoyer, sortie."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "ne pas afficher les noms des fichiers supprimés"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "forcer"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "nettoyage interactif"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
+#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "motif"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "ajouter <motif> aux règles ignore"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "supprimer les fichiers ignorés, aussi"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "supprimer seulement les fichiers ignorés"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -13088,7 +13700,7 @@
"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -13096,224 +13708,222 @@
"clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x et -X ne peuvent pas être utilisés ensemble"
-#: builtin/clone.c:45
+#: builtin/clone.c:47
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:96
+#: builtin/clone.c:100
msgid "don't clone shallow repository"
msgstr "ne pas cloner un dépôt superficiel"
-#: builtin/clone.c:98
+#: builtin/clone.c:102
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "créer un dépôt nu"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "create a mirror repository (implies bare)"
msgstr "créer un dépôt miroir (implique dépôt nu)"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "to clone from a local repository"
msgstr "pour cloner depuis un dépôt local"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "don't use local hardlinks, always copy"
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
-#: builtin/clone.c:109
+#: builtin/clone.c:113
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "pathspec"
msgstr "spécificateur de chemin"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:115
+#: builtin/clone.c:119
msgid "number of submodules cloned in parallel"
msgstr "nombre de sous-modules clonés en parallèle"
-#: builtin/clone.c:116 builtin/init-db.c:539
+#: builtin/clone.c:120 builtin/init-db.c:539
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:117 builtin/init-db.c:540
+#: builtin/clone.c:121 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:127 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2721
msgid "use --reference only while cloning"
msgstr "utiliser seulement --reference pour cloner"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3967 builtin/repack.c:669
+#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nom"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "use <name> instead of 'origin' to track upstream"
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
+#: builtin/pull.c:212
msgid "depth"
msgstr "profondeur"
-#: builtin/clone.c:131
+#: builtin/clone.c:135
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
+#: builtin/pull.c:215
msgid "time"
msgstr "heure"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "create a shallow clone since a specific time"
msgstr "créer un clone superficiel depuis une date spécifique"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
msgid "revision"
msgstr "révision"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"approfondir l'historique d'un clone superficiel en excluant une révision"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:141 builtin/submodule--helper.c:1897
+#: builtin/submodule--helper.c:2735
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
-#: builtin/clone.c:139
+#: builtin/clone.c:143
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"ne pas cloner les tags et indiquer aux récupérations futures de ne pas le "
"faire"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "any cloned submodules will be shallow"
msgstr "tous les sous-modules clonés seront superficiels"
-#: builtin/clone.c:142 builtin/init-db.c:548
+#: builtin/clone.c:146 builtin/init-db.c:548
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:143 builtin/init-db.c:549
+#: builtin/clone.c:147 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
-#: builtin/clone.c:144
+#: builtin/clone.c:148
msgid "key=value"
msgstr "clé=valeur"
-#: builtin/clone.c:145
+#: builtin/clone.c:149
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "spécifique au serveur"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "option à transmettre"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
-#: builtin/clone.c:154
+#: builtin/clone.c:158
+msgid "apply partial clone filters to submodules"
+msgstr "appliquer les filtres de clone partiel aux sous-modules"
+
+#: builtin/clone.c:160
msgid "any cloned submodules will use their remote-tracking branch"
msgstr ""
"tous les sous-modules clonés utiliseront leur branche de suivi à distance"
-#: builtin/clone.c:156
+#: builtin/clone.c:162
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
"initialiser le fichier d'extraction clairsemée pour n'inclure que les "
"fichiers à la racine"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Aucun nom de répertoire n'a pu être deviné\n"
-"Veuillez spécifier un répertoire dans la ligne de commande"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:237
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:310
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:436
+#: builtin/clone.c:328
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "échec du démarrage un itérateur sur '%s'"
-#: builtin/clone.c:467
+#: builtin/clone.c:359
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:471
+#: builtin/clone.c:363
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:476
+#: builtin/clone.c:368
#, c-format
msgid "failed to iterate over '%s'"
msgstr "échec de l'itération sur '%s'"
-#: builtin/clone.c:503
+#: builtin/clone.c:395
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:409
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13323,107 +13933,103 @@
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
"et réessayer avec 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:486
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:713
+#: builtin/clone.c:603
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:651
msgid "failed to initialize sparse-checkout"
msgstr "échec lors de l'initialisation l'extraction clairsemée"
-#: builtin/clone.c:784
+#: builtin/clone.c:674
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:816
+#: builtin/clone.c:709
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:894
+#: builtin/clone.c:793
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:957
+#: builtin/clone.c:856
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:959
+#: builtin/clone.c:858
msgid "cannot unlink temporary alternates file"
msgstr "impossible de délier le fichier temporaire alternates"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:901
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:1005
+#: builtin/clone.c:905 contrib/scalar/scalar.c:413
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:1018
+#: builtin/clone.c:918
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "les options --bare et --origin %s sont incompatibles."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "les options '%s' et '%s %s' ne peuvent pas être utilisées ensemble"
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare et --separate-git-dir sont incompatibles."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:935
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:939 builtin/fetch.c:2176
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:1049
+#: builtin/clone.c:949
#, 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:1055
+#: builtin/clone.c:955
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "le chemin du dépôt '%s' existe déjà et n'est pas un répertoire vide."
-#: builtin/clone.c:1069
+#: builtin/clone.c:969
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
+#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
#, 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:1089
+#: builtin/clone.c:989
#, 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:1109
+#: builtin/clone.c:1009
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1011
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1040
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -13431,50 +14037,54 @@
"clone --recursive n'est pas compatible avec à la fois --reference et --"
"reference-if-able"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' n'est pas un nom valide de distante"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1157
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:1231
+#: builtin/clone.c:1159
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:1233
+#: builtin/clone.c:1161
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:1235
+#: builtin/clone.c:1163
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:1240
+#: builtin/clone.c:1168
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1173
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1185
+msgid "cannot clone from filtered bundle"
+msgstr "impossible de cloner depuis un colis filtré"
+
+#: builtin/clone.c:1265 builtin/clone.c:1324
msgid "remote transport reported error"
msgstr "le transport distant a retourné une erreur"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1277 builtin/clone.c:1289
#, 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:1347
+#: builtin/clone.c:1292
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
@@ -13510,13 +14120,13 @@
msgid "--command must be the first argument"
msgstr "--command doit être le premier argument"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13526,96 +14136,94 @@
"split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <options de division>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "impossible de trouver le répertoire objet correspondant à %s"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
msgid "dir"
msgstr "répertoire"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "le répertoire d'objet où stocker le graphe"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
"si le graphe de commit est divisé, vérifier seulement le fichier sommet"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Impossible d'ouvrir le graphe de commit '%s'"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "argument de --split non reconnu, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "ID d'objet non hexadécimal inattendu : %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "objet invalide : %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "commencer le parcours à toutes les réfs"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "scanner les index compactés listés sur stdin à la recherche de commits"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "commencer le parcours aux commits listés sur stdin"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr ""
"inclure tous les commits déjà présents dans le fichier de graphe de commits"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "activer le calcul pour les chemins modifiés"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "permettre d'écrire un fichier incrémental de graphe de commit"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
"le nombre maximum de commits dans un graphe de commit divisé pas de base"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisé"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "ne faire expirer que les fichiers plus vieux qu'une date-time donnée"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "nombre maximum des filtres Bloom des chemins modifiés à calculer"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Collecte des commits depuis l'entrée"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "sous-commande non reconnue : %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13629,70 +14237,65 @@
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:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
#, c-format
msgid "not a valid object name %s"
msgstr "nom d'objet invalide %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree : échec à l'ouverture de '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree : échec de la lecture de '%s'"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree : échec de la fermeture de '%s'"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "parent"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "id d'un objet commit parent"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
+#: builtin/tag.c:455
msgid "message"
msgstr "message"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "message de validation"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "lire le message de validation depuis un fichier"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "exactement un arbre obligatoire"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree : échec de la lecture"
-#: builtin/commit.c:41
+#: builtin/commit.c:43
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<options>] [--] <spécification-de-chemin>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:48
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<options>] [--] <spécification-de-chemin>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:53
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13703,7 +14306,7 @@
"vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n"
"supprimer complètement le commit avec \"git reset HEAD^\".\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:58
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13718,15 +14321,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:65
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Sinon, veuillez utiliser 'git rebase --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:68
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Sinon, veuillez utiliser 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:71
msgid ""
"and then use:\n"
"\n"
@@ -13748,73 +14351,69 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:326
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:360
-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:374
+#: builtin/commit.c:376
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:386
+#: builtin/commit.c:388
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:395
+#: builtin/commit.c:397
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:410
+#: builtin/commit.c:412
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:412
+#: builtin/commit.c:414
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:489
+#: builtin/commit.c:491
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:491
+#: builtin/commit.c:493
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:493
+#: builtin/commit.c:495
msgid "cannot do a partial commit during a rebase."
msgstr "impossible de faire une validation partielle pendant un rebasage."
-#: builtin/commit.c:501
+#: builtin/commit.c:503
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:520
+#: builtin/commit.c:522
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:618
+#: builtin/commit.c:620
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
-#: builtin/commit.c:620
+#: builtin/commit.c:622
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
-#: builtin/commit.c:639
+#: builtin/commit.c:641
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:692
+#: builtin/commit.c:694
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13822,43 +14421,43 @@
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:762 builtin/shortlog.c:417
#, 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:760
+#: builtin/commit.c:764
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:764
+#: builtin/commit.c:768
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:801
+#: builtin/commit.c:805
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "impossible de combiner -m avec --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "les options '%s' et '%s.%s' ne peuvent pas être utilisées ensemble"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:817 builtin/commit.c:833
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:884
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:893
+#: builtin/commit.c:897
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13867,7 +14466,7 @@
"Veuillez saisir le message de validation pour vos modifications. Les lignes\n"
"commençant par '%c' seront ignorées.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:899
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13877,7 +14476,7 @@
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:903
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13888,7 +14487,7 @@
"par '%c' seront conservées ; vous pouvez les supprimer vous-même si vous le "
"souhaitez.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:907
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13899,7 +14498,7 @@
"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:915
+#: builtin/commit.c:919
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13913,7 +14512,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:924
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13927,178 +14526,153 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:951
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:959
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:966
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:984
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1029
msgid "unable to pass trailers to --trailers"
msgstr "impossible de passer les lignes finales à --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1069
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1083 builtin/tag.c:317
#, 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:1123
+#: builtin/commit.c:1128
#, 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:1137
+#: builtin/commit.c:1142
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Mode de fichier ignoré invalide '%s'"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1160 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1195
-msgid "--long and -z are incompatible"
-msgstr "--long et -z sont incompatibles"
-
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Vous êtes en pleine fusion -- impossible de reformuler."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1233
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "Vous êtes en plein picorage -- impossible de reformuler."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1236
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "impossible de combiner l'option reword de --fixup avec le chemin '%s'"
-
-#: builtin/commit.c:1233
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+msgid "reword option of '%s' and path '%s' cannot be used together"
msgstr ""
-"l'option reword de --fixup est mutuellement exclusive avec --patch/--"
-"interactive/--all/--include/--only"
+"l'option de reformulation de '%s' et le chemin '%s' ne peuvent pas être "
+"utilisés ensemble"
-#: builtin/commit.c:1252
-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:1238
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr ""
+"l'option de reformulation de '%s' et '%s' ne peuvent pas être utilisés "
+"ensemble"
-#: builtin/commit.c:1261
+#: builtin/commit.c:1263
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1266
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1266
+#: builtin/commit.c:1268
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:1268
+#: builtin/commit.c:1270
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)."
-#: builtin/commit.c:1271
-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:1281
-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:1283
-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:1292
+#: builtin/commit.c:1290
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:1310
-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:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "option inconnue : --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, 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:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "afficher l'état avec concision"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "afficher l'information de remisage"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "calcule les valeurs complètes en avance/en retard"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "version"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:765
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "afficher l'état en format long (par défaut)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
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:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -14106,11 +14680,11 @@
"afficher les fichiers ignorés, \"mode\" facultatif : traditional "
"(traditionnel), matching (correspondant), no. (Défaut : traditional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:197
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -14118,198 +14692,198 @@
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "ne pas détecter les renommages"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr ""
"détecter les renommages, en spécifiant optionnellement le facteur de "
"similarité"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
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:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:551
msgid "date"
msgstr "date"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:360 ref-filter.h:89
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]commit"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"utiliser un message au format autosquash pour corriger ou reformuler le "
"commit spécifié"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
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:1633
+#: builtin/commit.c:1635
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:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "ligne de fin"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "ajouter des lignes terminales personnaliser"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "ajouter une ligne terminale Signed-off-by"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "inclure l'état dans le modèle de message de validation"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, 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:1790
+#: builtin/commit.c:1792
#, 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:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr ""
"Abandon de la validation dû à un corps de message de validation vide.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14434,6 +15008,10 @@
msgid "Type"
msgstr "Type"
+#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+msgid "type"
+msgstr "type"
+
#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "ce type est assigné à la valeur"
@@ -14649,10 +15227,6 @@
msgid "no such section: %s"
msgstr "section inexistante : %s"
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "affiche les tailles dans un format humainement lisible"
@@ -14679,7 +15253,7 @@
msgstr ""
"credential-cache--daemon non disponible ; pas de gestion des sockets unix"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache non disponible ; pas de gestion des socket unix"
@@ -14824,7 +15398,7 @@
msgid "do not consider tags matching <pattern>"
msgstr "ne pas considérer les étiquettes correspondant à <motif>"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:595
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
@@ -14841,25 +15415,15 @@
msgstr ""
"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long et --abbrev=0 sont incompatibles"
-
#: 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:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken est incompatible avec les commits ou assimilés"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin et --merge-base sont mutuellement exclusifs"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr ""
+"l'option '%s' et des commit-esques ne peuvent pas être utilisées ensemble"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
@@ -14880,26 +15444,26 @@
msgid "%s...%s: no merge base"
msgstr "%s..%s: pas de base de fusion"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "Ce n'est pas un dépôt git"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:537 builtin/grep.c:700
#, c-format
msgid "invalid object '%s' given."
msgstr "objet spécifié '%s' invalide."
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "plus de deux blobs spécifiés : '%s'"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "objet non géré '%s' spécifié."
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s"
@@ -14908,113 +15472,105 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "échec : %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "impossible de lire le fichier symlink %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "impossible de lire l'objet %s pour le symlink %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"
"dans le mode de diff de répertoire ('-d' et '--dir-diff')."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "le fichier dans l'arbre de travail a été laissé."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "des fichiers temporaires existent dans '%s'."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
-#: builtin/difftool.c:699
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "échec : %d"
+
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "réalise un diff de répertoire complet"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "ne pas confirmer avant de lancer l'outil de diff"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "utiliser les liens symboliques en mode de diff de répertoire"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:700
msgid "tool"
msgstr "outil"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "utiliser l'outil de diff spécifié"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "afficher une liste des outils de diff utilisables avec `--tool`"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:706
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
-"non-nul"
+"de sortie non-nul"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "spécifier une commande personnalisée pour visualiser les différences"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "passé à `diff`"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool exige un arbre de travail ou --no-index"
-#: builtin/difftool.c:741
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff est incompatible avec --no-index"
-
-#: builtin/difftool.c:744
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
-
-#: builtin/difftool.c:752
+#: builtin/difftool.c:745
msgid "no <tool> given for --tool=<tool>"
msgstr "pas d'<outil> spécifié pour --tool=<outil>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:752
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
@@ -15022,10 +15578,6 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <options> <var d'env>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
-msgid "type"
-msgstr "type"
-
#: builtin/env--helper.c:46
msgid "default for git_env_*(...) to fall back on"
msgstr "valeur par défaut pour git_env_*(...) en cas d'absence"
@@ -15045,269 +15597,264 @@
#: builtin/env--helper.c:82
#, c-format
msgid ""
-"option `--default' expects an unsigned long value with `--type=ulong`, not `"
-"%s`"
+"option `--default' expects an unsigned long value with `--type=ulong`, not "
+"`%s`"
msgstr ""
"l'option `--default` attend une valeur entier long non signé avec `--"
"type=ulong`, pas `%s`"
#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [options-de-liste-de-révisions]"
+msgid "git fast-export [<rev-list-opts>]"
+msgstr "git fast-export [<options-de-liste-de-révisions>]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-"
"tags ne soit spécifié."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "le jeton --anonymize-map ne peut pas être vide"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "afficher la progression après <n> objets"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "sélectionner la gestion des étiquettes signées"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr ""
"sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"sélectionner la gestion des messages de validation dans un encodage "
"alternatif"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "enregistrer les marques dans ce fichier"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "importer les marques depuis ce fichier"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "importer les marques depuis ce fichier s'il existe"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "afficher l'arbre complet pour chaque commit"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "utiliser la fonction \"done\" pour terminer le flux"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "sauter l'affichage de données de blob"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1860
msgid "refspec"
msgstr "spécificateur de référence"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "appliquer le spécificateur de référence aux références exportées"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "anonymise la sortie"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "depuis:vers"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "convertit <depuis> en <vers> dans la sortie anonymisée"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"référencer les parents qui ne sont pas dans le flux d'export rapide par id "
"d'objet"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "afficher les ids d'objet originaux des blobs/commits"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "marquer les étiquettes avec des ids de marque"
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map n'a aucune signification sans --anonymize"
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-"Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3097
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "Champs from manquants pour le sous-module '%s'"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3099
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "Champs 'to' manquants pour le sous-module '%s'"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3234
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "Commande 'mark' attendue, %s trouvé"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3239
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "Commande 'to' attendue, %s trouvé"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3331
msgid "Expected format name:filename for submodule rewrite option"
msgstr ""
"Format attendu nom:<nom de fichier> pour l'option de réécriture de sous-"
"module"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3386
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr ""
"la fonctionnalité '%s' est interdite en entrée sans --allow-unsafe-features"
-#: builtin/fetch-pack.c:242
+#: builtin/fetch-pack.c:246
#, c-format
msgid "Lockfile created but not reported: %s"
msgstr "Fichier verrou créé mais non reporté : %s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<options>] <groupe>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:124
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel ne peut pas être négatif"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:147 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:149 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "définir la branche amont pour git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:151 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:153
msgid "use atomic transaction to update references"
msgstr "utiliser une transaction atomique pour mettre à jour les références"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:155 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
msgid "force overwrite of local reference"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:158
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:160 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:164
msgid "number of submodules fetched in parallel"
msgstr "nombre de sous-modules récupérés en parallèle"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:166
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
"modifier le spécificateur de référence pour placer les références dans refs/"
"prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:168 builtin/pull.c:202
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:168
+#: builtin/fetch.c:170
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:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:172
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:177
msgid "write fetched references to the FETCH_HEAD file"
msgstr "écrire les références récupérées dans le fichier FETCH_HEAD"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:178 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:180
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:185 builtin/pull.c:216
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:189 builtin/pull.c:221
+#: builtin/fetch.c:191 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:194
+msgid "re-fetch without negotiating common commits"
+msgstr "re-récupérer sans négocier les commits communs"
+
+#: builtin/fetch.c:197
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:200
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -15315,146 +15862,144 @@
"par défaut pour la récupération récursive de sous-modules (priorité plus "
"basse que les fichiers de config)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:204 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:205 builtin/pull.c:230
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:206 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "spécifier une correspondance de référence pour la récupération"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:213 builtin/pull.c:244
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:210
+#: builtin/fetch.c:215
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
"ne pas récupérer le fichier paquet ; à la place, afficher les ancêtres des "
"sommets de négociation"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:218 builtin/fetch.c:220
msgid "run 'maintenance --auto' after fetching"
msgstr "lancer 'maintenance --auto' après la récupération"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:222 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr ""
"vérifier les mises à jour forcées (forced-updates) sur toutes les branches "
"mises à jour"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:224
msgid "write the commit-graph after fetching"
msgstr "écrire le graphe de commits après le rapatriement"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:226
msgid "accept refspecs from stdin"
msgstr "lire les spécificateurs de référence depuis l'entrée standard"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#: builtin/fetch.c:618
+msgid "couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:757
-#, 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:856
+#: builtin/fetch.c:893
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:897
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:911
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:912
+msgid "checked out in another worktree"
+msgstr "extrait dans un autre arbre de travail"
+
+#: builtin/fetch.c:922
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
+#: builtin/fetch.c:994
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:927
msgid "would clobber existing tag"
msgstr "écraserait l'étiquette existante"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:949
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:952
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:955
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:994
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:999
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1102
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'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"Fetch indique normalement quelles branches ont subi une mise à jour forcée,\n"
+"fetch indique normalement quelles branches ont subi une mise à jour forcée,\n"
"mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n"
-"'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'."
+"'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'"
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1106
#, c-format
msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-"%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées.\n"
+"%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées ;\n"
"Vous pouvez utiliser '--no-show-forced-updates' ou lancer\n"
-"'git config fetch.showForcedUpdates false' pour éviter ceci.\n"
+"'git config fetch.showForcedUpdates false' pour éviter cette vérification\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1136
#, 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:1129
+#: builtin/fetch.c:1156
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les mises à jour de racines superficielles ne sont pas "
"permises"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1259 builtin/fetch.c:1418
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1269
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15463,138 +16008,144 @@
"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:1327
+#: builtin/fetch.c:1377
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1378
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1421
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1422 builtin/remote.c:1153
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1446
#, 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"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "refus de récupérer dans la branche '%s' extraite dans '%s'"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1466
#, 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"
+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:1406
+#: builtin/fetch.c:1469
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "L'option \"%s\" est ignorée pour %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "l'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1496
+#, c-format
+msgid "the object %s does not exist"
+msgstr "l'objet %s n'existe pas"
+
+#: builtin/fetch.c:1748
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "branches multiples détectées, imcompatible avec --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1760
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"impossible de régler la branche amont de HEAD à '%s' depuis '%s' qui ne "
+"pointe sur aucune branche."
+
+#: builtin/fetch.c:1773
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:1635
+#: builtin/fetch.c:1775
msgid "not setting upstream for a remote tag"
msgstr "dépôt amont non défini pour l'étiquette distante"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1777
msgid "unknown branch type"
msgstr "type de branche inconnu"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1779
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
"aucune branche source trouvée.\n"
-"Vous devez spécifier exactement une branche avec l'option --set-upstream."
+"Vous devez spécifier exactement une branche avec l'option --set-upstream"
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1904 builtin/fetch.c:1967
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1914 builtin/fetch.c:1969
#, c-format
-msgid "Could not fetch %s"
-msgstr "Impossible de récupérer %s"
+msgid "could not fetch %s"
+msgstr "impossible de récupérer %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1926
#, 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:1894
+#: builtin/fetch.c:2030
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
-"distant depuis lesquels les nouvelles révisions devraient être récupérées."
+"distant depuis lesquels les nouvelles révisions devraient être récupérées"
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Vous devez spécifier un nom d'étiquette."
+#: builtin/fetch.c:2066
+msgid "you need to specify a tag name"
+msgstr "Vous devez spécifier un nom d'étiquette"
-#: builtin/fetch.c:1994
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
-msgstr "--negotiate-only nécessite au moins un --negotiate-tip=*"
+#: builtin/fetch.c:2156
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
+msgstr "--negotiate-only nécessite au moins un --negotiation-tip=*"
-#: builtin/fetch.c:1998
-msgid "Negative depth in --deepen is not supported"
-msgstr "Une profondeur négative dans --deepen n'est pas supportée"
+#: builtin/fetch.c:2160
+msgid "negative depth in --deepen is not supported"
+msgstr "une profondeur négative dans --deepen n'est pas supportée"
-#: builtin/fetch.c:2000
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen et --depth sont mutuellement exclusifs"
-
-#: builtin/fetch.c:2005
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2169
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:2024
+#: builtin/fetch.c:2186
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2188
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:2035
+#: builtin/fetch.c:2197
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Distant ou groupe distant inexistant : %s"
+msgid "no such remote or remote group: %s"
+msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:2042
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2205
+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 "
+"la récupération d'un groupe avec des spécifications de référence n'a pas de "
"sens"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2221
msgid "must supply remote when using --negotiate-only"
msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only"
-#: builtin/fetch.c:2063
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon."
+#: builtin/fetch.c:2226
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon"
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2246
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15602,11 +16153,11 @@
"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
"extensions.partialclone"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2250
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic ne peut être utilisée qu'en récupérant depuis un seul distant"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2254
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin ne peut être utilisée qu'en récupérant depuis un seul distant"
@@ -15616,23 +16167,27 @@
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
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:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "alias pour --log (obsolète)"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "texte"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "utiliser <texte> comme début de message"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "utiliser <nom> au lieu de la branche cible reélle"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "fichier d'où lire"
@@ -15652,47 +16207,47 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "échapper les champs réservés pour les interpréteurs de commandes"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "échapper les champs réservés pour perl"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "échapper les champs réservés pour python"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "échapper les champs réservés pour compatibilité avec Tcl"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:42 builtin/tag.c:482
msgid "respect format colors"
msgstr "respecter les couleurs de formatage"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "afficher seulement les références pointant sur l'objet"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "afficher seulement les références qui sont fusionnées"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "afficher seulement les références qui ne sont pas fusionnées"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "afficher seulement les références qui contiennent le commit"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "afficher seulement les références qui ne contiennent pas le commit"
@@ -15828,134 +16383,256 @@
msgid "notice: No default references"
msgstr "note : pas de référence par défaut"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s : incohérence de hachage,trouvé à : %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s : objet corrompu ou manquant : %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s : l'objet a un type '%s' inconnu : %s"
+
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s : impossible d'analyser : %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "mauvais fichier de sha1 : %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "Vérification du répertoire d'objet"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "Vérification du lien %s"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:710 builtin/index-pack.c:862
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s pointe sur quelque chose bizarre (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s : la HEAD détachée ne pointe sur rien"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "note : %s pointe sur une branche non-née (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "Vérification de l'arbre cache"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s : pointer sha1 invalide dans l'arbre de cache"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "non-arbre dans l'arbre de cache"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<options>] [<objet>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "considérer les objets de l'index comme nœuds tête"
# translated from man page
-#: builtin/fsck.c:762
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "ne vérifier que la connectivité"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "afficher les noms étendus pour les objets inaccessibles"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Vérification des objets"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s : objet manquant"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé"
+#: builtin/fsmonitor--daemon.c:13
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [<options>]"
+
+#: builtin/fsmonitor--daemon.c:14
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [<options>]"
+
+#: builtin/fsmonitor--daemon.c:15
+msgid "git fsmonitor--daemon stop"
+msgstr "git fsmonitor--daemon stop"
+
+#: builtin/fsmonitor--daemon.c:16
+msgid "git fsmonitor--daemon status"
+msgstr "git fsmonitor--daemon status"
+
+#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "valeur de '%s' hors de gamme : %d"
+
+#: builtin/fsmonitor--daemon.c:57
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "la valeur de '%s' n'est ni bool ni int : %d"
+
+#: builtin/fsmonitor--daemon.c:99
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr "fsmonitor-daemon surveille '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:104
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr "fsmonitor-daemon ne surveille pas '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:170
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "impossible de créer le cookie fsmonitor '%s'"
+
+#: builtin/fsmonitor--daemon.c:753
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr "fsmonitor: cookie_result '%d' != SEEN"
+
+#: builtin/fsmonitor--daemon.c:1187
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr "impossible de démarrer le stock de fils IPC sur '%s'"
+
+#: builtin/fsmonitor--daemon.c:1199
+msgid "could not start fsmonitor listener thread"
+msgstr "impossible de démarrer le fil d'écoute fsmonitor"
+
+#: builtin/fsmonitor--daemon.c:1297
+msgid "could not initialize listener thread"
+msgstr "impossible de démarrer le fil d'écoute"
+
+#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr "fsmonitor--daemon exécute déjà '%s'"
+
+#: builtin/fsmonitor--daemon.c:1332
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr "lancement du fil fsmonitor-daemon dans '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:1387
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "démarrer fsmonitor-daemon dans '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:1413
+msgid "daemon failed to start"
+msgstr "échec du démarrage du daemon"
+
+#: builtin/fsmonitor--daemon.c:1416
+msgid "daemon not online yet"
+msgstr "le daemon n'est pas encore en ligne"
+
+#: builtin/fsmonitor--daemon.c:1419
+msgid "daemon terminated"
+msgstr "le daemon s'est terminé"
+
+#: builtin/fsmonitor--daemon.c:1429
+msgid "detach from console"
+msgstr "détacher de la console"
+
+#: builtin/fsmonitor--daemon.c:1432
+msgid "use <n> ipc worker threads"
+msgstr "utiliser <n> fils de travail ipc"
+
+#: builtin/fsmonitor--daemon.c:1435
+msgid "max seconds to wait for background daemon startup"
+msgstr "nombre max de secondes à attendre que le daemon démarre"
+
+#: builtin/fsmonitor--daemon.c:1449
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "valeur invalide de 'ipc-threads' (%d)"
+
+#: builtin/fsmonitor--daemon.c:1464
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "Sous-commande non-gérée '%s'"
+
+#: builtin/fsmonitor--daemon.c:1477
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr "fsmonitor--daemon non géré sur cette plateforme"
+
#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<options>]"
@@ -15970,82 +16647,77 @@
msgid "failed to parse '%s' value '%s'"
msgstr "échec de l'analyse de '%s' valeur '%s'"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "impossible de faire un stat de '%s'"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr "impossible de lire '%s'"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
"Le dernier lancement de gc a rapporté l'erreur suivante. Veuillez corriger\n"
-"la cause et supprimer %s.\n"
+"la cause et supprimer %s\n"
"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit "
"supprimé.\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "éliminer les objets non référencés"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "être plus consciencieux (durée de traitement allongée)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "activer le mode auto-gc"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr ""
"forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
"tourne déjà"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "recompacter tous les autres paquets excepté le plus gros paquet"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "impossible d'analyser gc.logexpiry %s"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "impossible d'analyser la valeur d'expiration d'élagage %s"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Compression automatique du dépôt en tâche de fond pour optimiser les "
"performances.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Compression du dépôt pour optimiser les performances.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16053,33 +16725,33 @@
"un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
"(utilisez --force si ce n'est pas le cas)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "
"supprimer."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "--no-schedule n'est pas accepté"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "argument de --schedule non reconnu, '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "échec de l'écriture du graphe de commits"
-#: builtin/gc.c:905
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "échec de la pré-récupération des distants"
@@ -16091,152 +16763,192 @@
msgid "failed to finish 'git pack-objects' process"
msgstr "impossible de finir le processus 'git pack-objects'"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "échec de l'écriture de l'index de multi-paquet"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "échec de 'git multi-pack-index expire'"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "échec de 'git multi-pack-index repack'"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "le fichier verrou '%s' existe, pas de maintenance"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "échec de la tâche '%s'"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' n'est pas une tâche valide"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "la tâche '%s' ne peut pas être sélectionnée plusieurs fois"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "lancer les tâches selon l'état du dépôt"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "fréquence"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "lancer les tâches selon une fréquence"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "ne pas afficher le progrès ou d'autres informations sur stderr"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
msgid "task"
msgstr "tâche"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "lancer une tâche spécifique"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "--auto et --schedule=<fréquence> sont mutuellement exclusifs"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "échec du lancement de 'git config'"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "impossible d'étendre le chemin '%s'"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "échec de démarrage de launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "échec de la création des répertoires pour '%s'"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "échec de l'amorçage du service %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "échec de création du fichier temporaire xml"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "échec du démarrage de schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir "
"'cron'"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir "
"'cron'"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "échec à l'ouverture de stdin de 'crontab'"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "'crontab' est mort"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "échec du démarrage de systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "échec pour lancer systemctl"
+
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
+#: builtin/worktree.c:1024
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "échec de la suppression de '%s'"
+
+#: builtin/gc.c:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "argument '%s' de --scheduler non reconnu"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "ni les minuteurs systemd ni crontab ne sont disponibles"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "le planificateur %s n'est pas disponible"
+
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr ""
"un autre processus est en train de programmer une maintenance en tâche de "
"fond"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<planificateur>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "planificateur"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "planificateur qui lancera les maintenances git"
+
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "échec de l'ajout du dépôt à la config globale"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <subcommand> [<options>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "sous-commande invalide : %s"
-#: builtin/grep.c:30
+#: builtin/grep.c:32
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:241
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep : échec de création du fil: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:295
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "nombre de fils spécifié invalide (%d) pour %s"
@@ -16245,270 +16957,262 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3150
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:674
#, 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:738
+#: builtin/grep.c:754
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend une valeur numérique"
-#: builtin/grep.c:837
+#: builtin/grep.c:852
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:839
+#: builtin/grep.c:854
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:841
+#: builtin/grep.c:856
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:843
+#: builtin/grep.c:858
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:845
+#: builtin/grep.c:860
msgid "recursively search in each submodule"
msgstr "rechercher récursivement dans chaque sous-module"
-#: builtin/grep.c:848
+#: builtin/grep.c:863
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:850
+#: builtin/grep.c:865
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:852
+#: builtin/grep.c:867
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:854
+#: builtin/grep.c:869
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:856
+#: builtin/grep.c:871
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:859
+#: builtin/grep.c:874
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:861
+#: builtin/grep.c:876
msgid "search in subdirectories (default)"
msgstr "rechercher dans les sous-répertoires (défaut)"
-#: builtin/grep.c:863
+#: builtin/grep.c:878
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:867
+#: builtin/grep.c:882
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:870
+#: builtin/grep.c:885
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:873
+#: builtin/grep.c:888
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:876
+#: builtin/grep.c:891
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:879
+#: builtin/grep.c:894
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:880
+#: builtin/grep.c:895
msgid "show column number of first match"
msgstr "afficher le numéro de colonne de la première correspondance"
-#: builtin/grep.c:881
+#: builtin/grep.c:896
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:882
+#: builtin/grep.c:897
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:884
+#: builtin/grep.c:899
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:886
+#: builtin/grep.c:901
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:888
+#: builtin/grep.c:903
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:906
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:893
+#: builtin/grep.c:908
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:896
+#: builtin/grep.c:911
msgid "show only matching parts of a line"
msgstr "n'afficher que les parties correspondantes d'une ligne"
-#: builtin/grep.c:898
+#: builtin/grep.c:913
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:899
+#: builtin/grep.c:914
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:901
+#: builtin/grep.c:916
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:903
+#: builtin/grep.c:918
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:906
+#: builtin/grep.c:921
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:909
+#: builtin/grep.c:924
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:911
+#: builtin/grep.c:926
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:913
+#: builtin/grep.c:928
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:914
+#: builtin/grep.c:929
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:917
+#: builtin/grep.c:932
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:919
+#: builtin/grep.c:934
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:922
+#: builtin/grep.c:937
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:924
+#: builtin/grep.c:939
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:926
+#: builtin/grep.c:941
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:938
+#: builtin/grep.c:953
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:940
+#: builtin/grep.c:955
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:943
+#: builtin/grep.c:958
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:947
+#: builtin/grep.c:962
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1028
msgid "no pattern given"
msgstr "aucun motif fourni"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1064
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:1057
+#: builtin/grep.c:1072
#, c-format
msgid "unable to resolve revision: %s"
msgstr "impossible de résoudre la révision : %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1102
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked non supportée avec --recurse-submodules"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1106
msgid "invalid option combination, ignoring --threads"
msgstr "option de combinaison invalide, ignore --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1109 builtin/pack-objects.c:4084
msgid "no threads support, ignoring --threads"
msgstr "pas de support des fils, ignore --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1146
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:1157
-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:1160
-msgid "--untracked cannot be used with --cached"
-msgstr "--untracked ne peut pas être utilisé avec --cached"
-
-#: builtin/grep.c:1166
+#: builtin/grep.c:1179
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:1174
+#: builtin/grep.c:1187
msgid "both --cached and trees are given"
msgstr "--cached et des arbres sont fournis en même temps"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16516,97 +17220,101 @@
"git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] "
"[--] <fichier>..."
-#: builtin/hash-object.c:86
-msgid "git hash-object --stdin-paths"
-msgstr "git hash-object --stdin-paths"
-
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:97
msgid "object type"
msgstr "type d'objet"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:98
msgid "write the object into the object database"
msgstr "écrire l'objet dans la base de donnée d'objets"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
msgstr "lire l'objet depuis l'entrée standard"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:102
msgid "store file as is without filters"
msgstr "stocker le fichier tel quel sans filtrage"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:103
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"juste hasher n'importe quel contenu pour créer des objets corrompus pour "
"debugger Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
msgstr "traiter le fichier comme s'il venait de ce chemin"
-#: builtin/help.c:47
+#: builtin/help.c:57
msgid "print all available commands"
msgstr "afficher toutes les commandes disponibles"
-#: builtin/help.c:48
+#: builtin/help.c:60
+msgid "show external commands in --all"
+msgstr "afficher les commandes externes dans --all"
+
+#: builtin/help.c:61
+msgid "show aliases in --all"
+msgstr "afficher les alias dans --all"
+
+#: builtin/help.c:62
msgid "exclude guides"
msgstr "exclure les guides"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "afficher une liste de guides utiles"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "afficher tous les noms de variables de configuration"
-
-#: builtin/help.c:52
+#: builtin/help.c:63
msgid "show man page"
msgstr "afficher la page de manuel"
-#: builtin/help.c:53
+#: builtin/help.c:64
msgid "show manual in web browser"
msgstr "afficher le manuel dans un navigateur web"
-#: builtin/help.c:55
+#: builtin/help.c:66
msgid "show info page"
msgstr "afficher la page info"
-#: builtin/help.c:57
+#: builtin/help.c:68
msgid "print command description"
msgstr "afficher la description de la commande"
-#: 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:70
+msgid "print list of useful guides"
+msgstr "afficher une liste de guides utiles"
-#: builtin/help.c:163
+#: builtin/help.c:72
+msgid "print all configuration variable names"
+msgstr "afficher tous les noms de variables de configuration"
+
+#: builtin/help.c:84
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<commande>]"
+
+#: builtin/help.c:201
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'aide non reconnu '%s'"
-#: builtin/help.c:190
+#: builtin/help.c:227
msgid "Failed to start emacsclient."
msgstr "Échec de démarrage d'emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:240
msgid "Failed to parse emacsclient version."
msgstr "Échec d'analyse de la version d'emacsclient."
-#: builtin/help.c:211
+#: builtin/help.c:248
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
#, c-format
msgid "failed to exec '%s'"
msgstr "échec de l'exécution de '%s'"
-#: builtin/help.c:307
+#: builtin/help.c:344
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16615,7 +17323,7 @@
"'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:319
+#: builtin/help.c:356
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16624,235 +17332,247 @@
"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:436
+#: builtin/help.c:471
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s' : visualiseur de manuel inconnu."
-#: builtin/help.c:452
+#: builtin/help.c:487
msgid "no man viewer handled the request"
msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
-#: builtin/help.c:459
+#: builtin/help.c:494
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:555 builtin/help.c:566 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' est un alias de '%s'"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:569 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "mauvais chaîne alias.%s : %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:611
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "l'option '%s' n'accepte pas d'argument sans option"
+
+#: builtin/help.c:631
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr ""
+"les options '--no-[external-commands|aliases]' ne peuvent être utilisées "
+"qu'avec '--all'"
+
+#: builtin/help.c:643 builtin/help.c:671
#, c-format
msgid "usage: %s%s"
msgstr "usage : %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:666
msgid "'git help config' for more information"
msgstr "'git help config' pour plus d'information"
-#: builtin/index-pack.c:222
+#: builtin/hook.c:10
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr ""
+"git hook run [--ignore-missing] <nom-de-crochet> [-- <arguments-de-crochet>]"
+
+#: builtin/hook.c:30
+msgid "silently ignore missing requested <hook-name>"
+msgstr "ignorer silencieusement le <nom-de-crochet> requis manquant"
+
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "type d'objet non correspondant à %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "objet attendu non reçu %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objet %s : type attendu %s, reçu %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "impossible de remplir %d octet"
msgstr[1] "impossible de remplir %d octets"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "fin de fichier prématurée"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "erreur de lecture sur l'entrée"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "plus d'octets utilisés que disponibles"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:754
msgid "pack too large for current definition of off_t"
msgstr "le paquet est trop grand pour la définition actuelle de off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "le paquet dépasse la taille maximale permise"
-
-#: builtin/index-pack.c:343
+#: builtin/index-pack.c:329
#, c-format
-msgid "unable to create '%s'"
-msgstr "impossible de créer '%s'"
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "le paquet dépasse la taille maximale permise (%s)"
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "impossible d'ouvrir le fichier paquet '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "la signature du paquet ne correspond pas"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la version de paquet %<PRIu32> non supportée"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:380
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:485
#, c-format
msgid "inflate returned %d"
msgstr "la décompression (inflate) a retourné %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:534
msgid "offset value overflow for delta base object"
msgstr "dépassement de la valeur d'offset pour l'objet delta de base"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:542
msgid "delta base offset is out of bound"
msgstr "l'objet delta de base est hors limite"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:550
#, c-format
msgid "unknown object type %d"
msgstr "type d'objet inconnu %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:581
msgid "cannot pread pack file"
msgstr "impossible de lire (pread) le fichier paquet"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:583
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu"
msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:609
msgid "serious inflate inconsistency"
msgstr "grave incohérence dans la décompression (inflate)"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
+#: builtin/index-pack.c:823 builtin/index-pack.c:832
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
-#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
+#: builtin/index-pack.c:757 builtin/pack-objects.c:290
+#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:821
#, c-format
msgid "cannot read existing object info %s"
msgstr "impossible de lire l'information existante de l'objet %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:829
#, c-format
msgid "cannot read existing object %s"
msgstr "impossible de lire l'objet existant %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:843
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:846 builtin/index-pack.c:865
msgid "fsck error in packed object"
msgstr "erreur de fsck dans l'objet empaqueté"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:867
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Tous les objets enfants de %s ne sont pas accessibles"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:928 builtin/index-pack.c:975
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "complété avec %d objet local"
msgstr[1] "complété avec %d objets locaux"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "le paquet a %d delta non résolu"
msgstr[1] "le paquet a %d deltas non résolus"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
@@ -16862,56 +17582,53 @@
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1445
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "le nom de fichier paquet '%s' ne se termine pas par '.%s'"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "impossible d'écrire le fichier %s '%s'"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "impossible de fermer le fichier %s écrit '%s'"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1494
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "impossible de renommer un fichier temporaire '*.%s' en '%s'"
+
+#: builtin/index-pack.c:1519
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "impossible de stocker le fichier paquet"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "impossible de stocker le fichier d'index"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1648
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1650
#, 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:1699
+#: builtin/index-pack.c:1698
#, 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:1706
+#: builtin/index-pack.c:1705
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -16923,33 +17640,25 @@
msgstr "Impossible de revenir au répertoire de travail courant"
#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "algorithme d'empreinte inconnu '%s'"
-#: builtin/index-pack.c:1850
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1856
msgid "--stdin requires a git repository"
msgstr "--stdin requiert un dépôt git"
-#: builtin/index-pack.c:1854
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format ne peut pas être utilisé avec --stdin"
-
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1873
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "erreur de fsck dans les objets paquets"
@@ -17070,10 +17779,6 @@
msgid "specify the hash algorithm to use"
msgstr "spécifier l'algorithme d'empreinte à utiliser"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir et --bare sont mutuellement exclusifs"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
@@ -17162,40 +17867,40 @@
msgid "no input file given for in-place editing"
msgstr "aucun fichier en entrée pour l'éditon sur place"
-#: builtin/log.c:59
+#: builtin/log.c:60
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
-#: builtin/log.c:60
+#: builtin/log.c:61
msgid "git show [<options>] <object>..."
msgstr "git show [<options>] <objet>..."
-#: builtin/log.c:113
+#: builtin/log.c:114
#, c-format
msgid "invalid --decorate option: %s"
msgstr "option --decorate invalide : %s"
-#: builtin/log.c:180
+#: builtin/log.c:181
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:181
+#: builtin/log.c:182
msgid "use mail map file"
msgstr "utiliser le fichier de correspondance de mail"
-#: builtin/log.c:184
+#: builtin/log.c:185
msgid "only decorate refs that match <pattern>"
msgstr "décorer seulement les références correspondant à <motif>"
-#: builtin/log.c:186
+#: builtin/log.c:187
msgid "do not decorate refs that match <pattern>"
msgstr "ne pas décorer les références correspondant à <motif>"
-#: builtin/log.c:187
+#: builtin/log.c:188
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:190
+#: builtin/log.c:191
msgid ""
"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
@@ -17203,90 +17908,94 @@
"tracer l'évolution d'une plage <début>,<fin> ou d'une fonction <nom-de-"
"fonction> dans <fichier>"
-#: builtin/log.c:213
+#: builtin/log.c:214
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr ""
"-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin"
-#: builtin/log.c:306
+#: builtin/log.c:322
#, c-format
msgid "Final output: %d %s\n"
-msgstr "Sortie finale : %d %s\n"
+msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:429
+msgid "unable to create temporary object directory"
+msgstr "impossible de créer un répertoire d'objets temporaire"
+
+#: builtin/log.c:599
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s : fichier incorrect"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:614 builtin/log.c:706
#, c-format
msgid "could not read object %s"
msgstr "impossible de lire l'objet %s"
-#: builtin/log.c:701
+#: builtin/log.c:731
#, c-format
msgid "unknown type: %d"
msgstr "type inconnu : %d"
-#: builtin/log.c:846
+#: builtin/log.c:880
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s : couverture invalide pour le mode de description"
-#: builtin/log.c:853
+#: builtin/log.c:887
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:982
+#: builtin/log.c:1016
#, c-format
msgid "cannot open patch file %s"
msgstr "impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:999
+#: builtin/log.c:1033
msgid "need exactly one range"
msgstr "exactement une plage nécessaire"
-#: builtin/log.c:1009
+#: builtin/log.c:1043
msgid "not a range"
msgstr "ceci n'est pas une plage"
-#: builtin/log.c:1173
+#: builtin/log.c:1207
msgid "cover letter needs email format"
msgstr "la lettre de motivation doit être au format courriel"
-#: builtin/log.c:1179
+#: builtin/log.c:1213
msgid "failed to create cover-letter file"
msgstr "échec de création du fichier de lettre de motivation"
-#: builtin/log.c:1266
+#: builtin/log.c:1300
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1327
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1385
msgid "two output directories?"
msgstr "deux répertoires de sortie ?"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
#, c-format
msgid "unknown commit %s"
msgstr "commit inconnu %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1547 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:1522
+#: builtin/log.c:1556
msgid "could not find exact merge base"
msgstr "impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1532
+#: builtin/log.c:1566
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"
@@ -17299,301 +18008,289 @@
"Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
"manuellement"
-#: builtin/log.c:1555
+#: builtin/log.c:1589
msgid "failed to find exact merge base"
msgstr "échec à trouver la base de fusion exacte"
-#: builtin/log.c:1572
+#: builtin/log.c:1606
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:1582
+#: builtin/log.c:1616
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:1640
+#: builtin/log.c:1674
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1703
+#: builtin/log.c:1737
msgid "failed to infer range-diff origin of current series"
msgstr ""
"échec d'inférence de l'origine de différence d'intervalles de la série "
"actuelle"
-#: builtin/log.c:1705
+#: builtin/log.c:1739
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr ""
"utilisation de '%s' comme une différence d'intervalle pour la série actuelle"
-#: builtin/log.c:1749
+#: builtin/log.c:1783
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1752
+#: builtin/log.c:1786
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1756
+#: builtin/log.c:1790
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1758
+#: builtin/log.c:1792
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1760
+#: builtin/log.c:1794
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:1761
+#: builtin/log.c:1795
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1762
+#: builtin/log.c:1796
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1764
+#: builtin/log.c:1798
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:1765
+#: builtin/log.c:1799
msgid "reroll-count"
msgstr "reroll-count"
-#: builtin/log.c:1766
+#: builtin/log.c:1800
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1768
+#: builtin/log.c:1802
msgid "max length of output filename"
msgstr "taille maximum du nom du fichier de sortie"
-#: builtin/log.c:1770
+#: builtin/log.c:1804
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
-#: builtin/log.c:1773
+#: builtin/log.c:1807
msgid "cover-from-description-mode"
msgstr "cover-from-description-mode"
-#: builtin/log.c:1774
+#: builtin/log.c:1808
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:1776
+#: builtin/log.c:1810
msgid "use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1779
+#: builtin/log.c:1813
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1782
+#: builtin/log.c:1816
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1785
+#: builtin/log.c:1819
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1787
+#: builtin/log.c:1821
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1789
+#: builtin/log.c:1823
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1791
+#: builtin/log.c:1825
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:1793
+#: builtin/log.c:1827
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1794
+#: builtin/log.c:1828
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1795
+#: builtin/log.c:1829
msgid "add email header"
msgstr "ajouter l'en-tête de courriel"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1830 builtin/log.c:1831
msgid "email"
msgstr "courriel"
-#: builtin/log.c:1796
+#: builtin/log.c:1830
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1797
+#: builtin/log.c:1831
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1798
+#: builtin/log.c:1832
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1799
+#: builtin/log.c:1833
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:1801
+#: builtin/log.c:1835
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1802
+#: builtin/log.c:1836
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1837 builtin/log.c:1840
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1804
+#: builtin/log.c:1838
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1807
+#: builtin/log.c:1841
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1811
+#: builtin/log.c:1845
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1813
+#: builtin/log.c:1847
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1814
+#: builtin/log.c:1848
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1815
+#: builtin/log.c:1849
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1816
+#: builtin/log.c:1850
msgid "add prerequisite tree info to the patch series"
msgstr "ajouter un arbre prérequis à la série de patchs"
-#: builtin/log.c:1819
+#: builtin/log.c:1853
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1820
+#: builtin/log.c:1854
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1822
+#: builtin/log.c:1856
msgid "show progress while generating patches"
msgstr ""
"afficher la barre de progression durant la phase de génération des patchs"
-#: builtin/log.c:1824
+#: builtin/log.c:1858
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:1827
+#: builtin/log.c:1861
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:1829 builtin/range-diff.c:28
+#: builtin/log.c:1863 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "pourcentage par lequel la création est pondérée"
-#: builtin/log.c:1916
+#: builtin/log.c:1953
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n et -k sont mutuellement exclusifs"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1978
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1943
+#: builtin/log.c:1980
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1945
+#: builtin/log.c:1982
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, et --output-directory sont mutuellement exclusifs"
+#: builtin/log.c:1984
+msgid "--remerge-diff does not make sense"
+msgstr "--remerge-diff n'a pas de sens"
-#: builtin/log.c:2089
+#: builtin/log.c:2129
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff requiert --cover-letter ou une rustine unique"
-#: builtin/log.c:2093
+#: builtin/log.c:2133
msgid "Interdiff:"
msgstr "Interdiff :"
-#: builtin/log.c:2094
+#: builtin/log.c:2134
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff contre v%d :"
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor requiert --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2144
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff requiert --cover-letter ou une rustine unique"
-#: builtin/log.c:2112
+#: builtin/log.c:2152
msgid "Range-diff:"
msgstr "Diff-intervalle :"
-#: builtin/log.c:2113
+#: builtin/log.c:2153
#, c-format
msgid "Range-diff against v%d:"
msgstr "Diff-intervalle contre v%d :"
-#: builtin/log.c:2124
+#: builtin/log.c:2164
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:2160
+#: builtin/log.c:2200
msgid "Generating patches"
msgstr "Génération des patchs"
-#: builtin/log.c:2204
+#: builtin/log.c:2244
msgid "failed to create output files"
msgstr "échec de création des fichiers en sortie"
-#: builtin/log.c:2263
+#: builtin/log.c:2304
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2358
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17601,132 +18298,136 @@
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "séparer les chemins par un caractère NUL"
+
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "identifier l'état de fichier avec les étiquettes"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
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:640
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "les motifs d'exclusion sont lus depuis <fichier>"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "lire les motifs d'exclusion depuis <fichier>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
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:659
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
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:666
-msgid "recurse through submodules"
-msgstr "parcourir récursivement les sous-modules"
-
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
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:669
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
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:672
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "afficher les données de débogage"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "supprimer les entrées dupliquées"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "afficher les répertoires clairsemés en présence d'un index clairsemé"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<dépôt> [<références>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<dépôt> [<réf>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "ne pas afficher les URL distantes"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
msgid "exec"
msgstr "exécutable"
@@ -17760,44 +18461,74 @@
msgid "show underlying ref in addition to the object pointed by it"
msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle"
-#: builtin/ls-tree.c:30
+#: builtin/ls-tree.c:36
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:54
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "impossible d'obtenir l'information d'objet pour '%s'"
+
+#: builtin/ls-tree.c:79
+#, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "mauvais format ls-tree : l'élément '%s' ne commence pas par '('"
+
+#: builtin/ls-tree.c:83
+#, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "mauvais format ls-tree : l'élément '%s' ne se termine pas ')'"
+
+#: builtin/ls-tree.c:109
+#, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr "mauvais format ls-tree : %%%.*s"
+
+#: builtin/ls-tree.c:336
msgid "only show trees"
msgstr "afficher seulement les arbres"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:338
msgid "recurse into subtrees"
msgstr "parcourir les sous-arbres"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:340
msgid "show trees when recursing"
msgstr "afficher les arbres en les parcourant"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:343
msgid "terminate entries with NUL byte"
msgstr "terminer les éléments avec un octet NUL"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:344
msgid "include object size"
msgstr "inclure la taille d'objet"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
msgid "list only filenames"
msgstr "afficher seulement les noms de fichiers"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:350
+msgid "list only objects"
+msgstr "ne lister que les objets"
+
+#: builtin/ls-tree.c:353
msgid "use full path names"
msgstr "utiliser les noms de chemins complets"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:355
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"afficher l'arbre entier ; pas seulement le répertoire courant (implique --"
"full-name)"
+#: builtin/ls-tree.c:391
+msgid "--format can't be combined with other format-altering options"
+msgstr ""
+"--format ne peut pas être combiné avec d'autres options de modification de "
+"format"
+
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
@@ -17847,7 +18578,11 @@
msgid "use headers in message's body"
msgstr "utiliser l'entête dans le corps de message"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:227
+msgid "reading patches from stdin/tty..."
+msgstr "lecture les mises à jour depuis l'entrée standard/la console..."
+
+#: builtin/mailsplit.c:242
#, c-format
msgid "empty mbox: '%s'"
msgstr "mbox vide : '%s'"
@@ -17872,23 +18607,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <référence> [<validation>]"
-#: builtin/merge-base.c:143
+#: builtin/merge-base.c:144
msgid "output all common ancestors"
msgstr "afficher tous les ancêtres communs"
-#: builtin/merge-base.c:145
+#: builtin/merge-base.c:146
msgid "find ancestors for a single n-way merge"
msgstr "trouver les ancêtres pour une fusion simple à n points"
-#: builtin/merge-base.c:147
+#: builtin/merge-base.c:148
msgid "list revs not reachable from others"
msgstr "afficher les révisions inaccessibles depuis les autres"
-#: builtin/merge-base.c:149
+#: builtin/merge-base.c:150
msgid "is the first one ancestor of the other?"
msgstr "est le premier ancêtre de l'autre ?"
-#: builtin/merge-base.c:151
+#: builtin/merge-base.c:152
msgid "find where <commit> forked from reflog of <ref>"
msgstr "trouver où <validation> a divergé du reflog de <référence>"
@@ -17909,26 +18644,30 @@
msgstr "utiliser une fusion basée sur diff3"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "utiliser une fusion basée sur un diff3 zélée"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "pour les conflits, utiliser notre version (our)"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "pour les conflits, utiliser leur version (their)"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "pour les conflits, utiliser l'ensemble des versions"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "pour les conflits, utiliser cette taille de marqueur"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "ne pas avertir à propos des conflits"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "définir les labels pour fichier1/fichier-orig/fichier2"
@@ -17963,186 +18702,190 @@
msgid "Merging %s with %s\n"
msgstr "Fusion de %s avec %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<options>] [<commit>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "le commutateur `m' a besoin d'une valeur"
-#: builtin/merge.c:146
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "le commutateur '%s' a besoin d'une valeur"
-#: builtin/merge.c:199
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Les stratégies disponibles sont :"
-#: builtin/merge.c:205
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "ne pas afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"ajouter (au plus <n>) éléments du journal court au message de validation de "
"la fusion"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "créer une validation unique au lieu de faire une fusion"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
-#: builtin/merge.c:271
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "vérifier que le commit nommé a une signature GPG valide"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1145 builtin/revert.c:114
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"message de validation de la fusion (pour une fusion sans avance rapide)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "utiliser <nom> au lieu de la cible réelle"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:292
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort mais laisser l'index et l'arbre de travail inchangés"
-#: builtin/merge.c:294
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "continuer la fusion en cours"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "permettre la fusion d'historiques sans rapport"
-#: builtin/merge.c:303
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg"
-#: builtin/merge.c:320
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "impossible de lancer le remisage."
-#: builtin/merge.c:325
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "échec du remisage"
-#: builtin/merge.c:330
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "pas un objet valide : %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "read-tree a échoué"
-#: builtin/merge.c:400
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "Déjà à jour. (rien à compresser)"
-#: builtin/merge.c:414
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Validation compressée -- HEAD non mise à jour\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:467
#, 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:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' ne pointe pas sur un commit"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:732
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:742
+#: builtin/merge.c:745
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Options inconnue pour merge-recursive : -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "option de stratégie inconnue : -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "impossible d'écrire %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "Impossible de lire depuis '%s'"
-#: builtin/merge.c:822
+#: builtin/merge.c:825
#, 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:828
+#: builtin/merge.c:831
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"
@@ -18154,11 +18897,11 @@
"branche de sujet.\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Un message vide abandonne la validation.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18167,74 +18910,74 @@
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
"abandonne la validation.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:900
msgid "Empty commit message."
msgstr "Message de validation vide."
-#: builtin/merge.c:904
+#: builtin/merge.c:915
#, c-format
msgid "Wonderful.\n"
msgstr "Merveilleux.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:976
#, 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:1004
+#: builtin/merge.c:1015
msgid "No current branch."
msgstr "Pas de branche courante."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1017
msgid "No remote for the current branch."
msgstr "Pas de branche distante pour la branche courante."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1019
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:1013
+#: builtin/merge.c:1024
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1081
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1183
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "pas possible de fusionner ceci dans %s : %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1217
msgid "not something we can merge"
msgstr "pas possible de fusionner ceci"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1330
msgid "--abort expects no arguments"
msgstr "--abort n'accepte pas d'argument"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1334
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:1339
+#: builtin/merge.c:1352
msgid "--quit expects no arguments"
msgstr "--quit n'accepte pas d'argument"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1365
msgid "--continue expects no arguments"
msgstr "--continue ne supporte aucun argument"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1369
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:1372
+#: builtin/merge.c:1385
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18242,7 +18985,7 @@
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1392
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18250,99 +18993,83 @@
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1395
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:1396
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-
-#: builtin/merge.c:1398
-msgid "You cannot combine --squash with --commit."
-msgstr "Vous ne pouvez pas combiner --squash avec --commit."
-
-#: builtin/merge.c:1414
+#: builtin/merge.c:1427
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:1431
+#: builtin/merge.c:1444
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:1433
+#: builtin/merge.c:1446
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:1438
+#: builtin/merge.c:1451
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1453
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:1521
+#: builtin/merge.c:1540
msgid "refusing to merge unrelated histories"
msgstr "refus de fusionner des historiques sans relation"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1559
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1606
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1613
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "Pas possible d'avancer rapidement, abandon."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1671 builtin/merge.c:1737
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1675
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1727
#, 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:1711
+#: builtin/merge.c:1729
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1739
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1753
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"La fusion automatique a réussi ; stoppée avant la validation comme demandé\n"
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr "git mktag"
-
#: builtin/mktag.c:27
#, c-format
msgid "warning: tag input does not pass fsck: %s"
@@ -18380,10 +19107,6 @@
msgid "unable to write tag file"
msgstr "impossible d'écrire le fichier d'étiquettes"
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
-
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "l'entrée se termine par NUL"
@@ -18397,36 +19120,52 @@
msgstr "autoriser la création de plus d'un arbre"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<options>] write [--preferred-pack=<paquet>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<options>] write [--preferred-pack=<paquet>][--refs-"
+"snapshot=<chemin>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<options>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<options>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<options>] repack [--batch-size=<taille>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"répertoire objet contenant un ensemble de paires de fichiers paquet et "
"d'index de paquet"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "paquet-préféré"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "paquet à réutiliser lors du calcul de bitmap de multi-paquet"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "écriture du bitmap de multi-paquet"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "écrire l'index multi-paquet ne contenant que les index fournis"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "instantané des réfs pour sélectionner les commits de bitmap"
+
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18434,11 +19173,6 @@
"pendant le repaquetage, collecter les fichiers paquet de plus petite taille "
"dans un lot plus grand que cette taille"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "sous-commande non reconnue : %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<options>] <source>... <destination>"
@@ -18467,119 +19201,123 @@
msgid "skip move/rename errors"
msgstr "sauter les erreurs de déplacement/renommage"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "la destination '%s' n'est pas un répertoire"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Vérification du renommage de '%s' en '%s'\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "mauvaise source"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "impossible de déplacer un répertoire dans lui-même"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "impossible de déplacer un répertoire sur un fichier"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "le répertoire source est vide"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "pas sous le contrôle de version"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "en conflit"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "la destination existe"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "écrasement de '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Impossible d'écraser"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "multiples sources pour la même destination"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "le répertoire de destination n'existe pas"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, source=%s, destination=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:524
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<options>] <validation>..."
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:525
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<options>] --all"
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<options>] --stdin"
+#: builtin/name-rev.c:526
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [<options>] --annotate-stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:583
msgid "print only ref-based names (no object names)"
msgstr ""
"afficher seulement les noms basés sur des références (pas de nom d'objet)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:584
msgid "only use tags to name the commits"
msgstr "utiliser seulement les étiquettes pour nommer les validations"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:586
msgid "only use refs matching <pattern>"
msgstr "utiliser seulement les références correspondant à <motif>"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:588
msgid "ignore refs matching <pattern>"
msgstr "ignorer les références correspondant à <motif>"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:590
msgid "list all commits reachable from all refs"
msgstr ""
"afficher toutes les validations accessibles depuis toutes les références"
-#: builtin/name-rev.c:532
-msgid "read from stdin"
-msgstr "lire depuis l'entrée standard"
+#: builtin/name-rev.c:591
+msgid "deprecated: use annotate-stdin instead"
+msgstr "obsolète : utilisez annotate-stdin à la place"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:592
+msgid "annotate text from stdin"
+msgstr "annoter le texte depuis l'entrée standard"
+
+#: builtin/name-rev.c:593
msgid "allow to print `undefined` names (default)"
msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:599
msgid "dereference tags in the input (internal use)"
msgstr "déréférencer les étiquettes en entrée (usage interne)"
@@ -18623,14 +19361,6 @@
"git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] "
"<références-notes>"
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
-
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <références-notes>] remove [<objet>...]"
@@ -18691,69 +19421,65 @@
msgid "git notes prune [<options>]"
msgstr "git notes prune [<options>]"
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "Écrire/éditer les notes pour l'objet suivant :"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "impossible de démarrer 'show' pour l'objet '%s'"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "impossible de lire la sortie de 'show'"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "impossible de finir 'show' pour l'objet '%s'"
-#: builtin/notes.c:197
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr "veuillez fournir le contenu de la note en utilisant l'option -m ou -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "impossible d'écrire l'objet note"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
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:576
+#: builtin/notes.c:240 builtin/tag.c:582
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "impossible de résoudre '%s' comme une référence valide."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "impossible de lire l'objet '%s'."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "impossible de lire les informations de note d'un objet non-blob '%s'."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "ligne en entrée malformée : '%s'."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "impossible de copier les notes de '%s' vers '%s'"
@@ -18761,48 +19487,41 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "refus de faire %s sur des notes dans %s (hors de refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
-msgid "too many arguments"
-msgstr "trop d'arguments"
-
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "pas de note trouvée pour l'objet %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "contenu de la note sous forme de chaîne"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "contenu de la note dans un fichier"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "réutiliser et éditer l'objet de note spécifié"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "réutiliser l'objet de note spécifié"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "permettre de stocker une note vide"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "remplacer les notes existantes"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18811,30 +19530,30 @@
"Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. "
"Utilisez '-f' pour écraser les notes existantes"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Écrasement des notes existantes pour l'objet %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "Suppression de la note pour l'objet %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "lire les objets depuis l'entrée standard"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"charger la configuration de réécriture pour <commande> (implique --stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "trop peu d'arguments"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18843,12 +19562,12 @@
"Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. "
"Utilisez '-f' pour écraser les notes existantes"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "notes manquantes sur l'objet source %s. Impossible de copier."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18857,52 +19576,52 @@
"Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"
"Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "échec de la suppression de la copie de travail 'git notes merge'"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "échec de la résolution de NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "impossible de finaliser la fusion de notes"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "stratégie de fusion de notes inconnue %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Options générales"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Options de fusion"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18910,47 +19629,47 @@
"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Validation des notes non fusionnées"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Abandon de la résolution de fusion des notes"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "abandonner la fusion de notes"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "vous devez spécifier une référence de notes à fusionner"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy inconnu : %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "une fusion de notes dans %s est déjà en cours avec %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"impossible de stocker le lien vers la référence actuelle aux notes (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18961,42 +19680,42 @@
"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:589
+#: builtin/notes.c:899 builtin/tag.c:595
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
-#: builtin/notes.c:900
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objet %s n'a pas de note\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr ""
"la tentative de suppression d'une note non existante n'est pas une erreur"
-#: builtin/notes.c:915
+#: builtin/notes.c:917
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:132 builtin/worktree.c:146
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
-#: builtin/notes.c:955
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "afficher les notes éliminées"
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "références-notes"
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1036 builtin/stash.c:1802
#, c-format
msgid "unknown subcommand: %s"
msgstr "sous-commande inconnue : %s"
@@ -19015,7 +19734,7 @@
"git pack-objects [options...] base-name [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:570
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -19024,111 +19743,115 @@
"write_reuse_object : impossible de localiser %s, attendu à l'offset "
"%<PRIuMAX> dans le paquet %s"
-#: builtin/pack-objects.c:580
+#: builtin/pack-objects.c:578
#, c-format
msgid "bad packed object CRC for %s"
msgstr "mauvais CRC d'objet empaqueté pour %s"
-#: builtin/pack-objects.c:591
+#: builtin/pack-objects.c:589
#, c-format
msgid "corrupt packed object for %s"
msgstr "objet empaqueté corrompu pour %s"
-#: builtin/pack-objects.c:722
+#: builtin/pack-objects.c:720
#, c-format
msgid "recursive delta detected for object %s"
msgstr "delta récursif détecté pour l'objet %s"
-#: builtin/pack-objects.c:941
+#: builtin/pack-objects.c:939
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u objets commandés, %<PRIu32> attendus"
-#: builtin/pack-objects.c:1036
+#: builtin/pack-objects.c:1034
#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "objet attendu à l'offset %<PRIuMAX> dans le paquet %s"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1158
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:1168
+#: builtin/pack-objects.c:1171
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1243 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "échec du stat de %s"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1276
+msgid "failed to write bitmap index"
+msgstr "écrire un index de bitmap"
+
+#: builtin/pack-objects.c:1302
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1544
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:1971
+#: builtin/pack-objects.c:1992
#, 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:1980
+#: builtin/pack-objects.c:2001
#, 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:2261
+#: builtin/pack-objects.c:2282
msgid "Counting objects"
msgstr "Décompte des objets"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2447
#, 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:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
+#: builtin/pack-objects.c:2543
#, c-format
msgid "object %s cannot be read"
msgstr "l'objet %s ne peut être lu"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
#, 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:2536
+#: builtin/pack-objects.c:2557
msgid "suboptimal pack - out of memory"
msgstr "paquet sous-optimal - mémoire insuffisante"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2872
#, 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:2990
+#: builtin/pack-objects.c:3011
#, 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:3076
+#: builtin/pack-objects.c:3097
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3103
msgid "inconsistency with delta count"
msgstr "inconsistance dans le compte de delta"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3182
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19137,7 +19860,7 @@
"la valeur de uploadpack.blobpackfileuri doit être de la forme '<empreinte-d-"
"objet> <empreinte-de-pack> <uri>' ('%s' reçu)"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3185
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19145,17 +19868,18 @@
"l'objet est déjà configuré dans un autre uploadpack.blobpackfileuri ('%s' "
"reçu)"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3220
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "impossible d'obtenir le type de l'objet %s dans le paquet %s"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
+#: builtin/pack-objects.c:3373
#, c-format
msgid "could not find pack '%s'"
msgstr "impossible de trouver le paquet '%s'"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3416
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -19164,7 +19888,7 @@
"ID d'objet de bord attendu, reçu des données illisibles :\n"
"%s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3422
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -19173,256 +19897,248 @@
"ID d'objet attendu, reçu des données illisibles :\n"
"%s"
-#: builtin/pack-objects.c:3482
-msgid "invalid value for --missing"
-msgstr "valeur invalide pour --missing"
-
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
msgid "cannot open pack index"
msgstr "impossible d'ouvrir l'index de paquet"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3549
#, 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:3658
+#: builtin/pack-objects.c:3635
msgid "unable to force loose object"
msgstr "impossible de forcer l'objet libre"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3763
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' n'est pas une révision"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "mauvaise révision '%s'"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3794
msgid "unable to add recent objects"
msgstr "impossible d'ajouter les objets récents"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3847
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3851
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3907
msgid "<version>[,<offset>]"
msgstr "<version>[,<décalage>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3908
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:3919
+#: builtin/pack-objects.c:3911
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3913
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3915
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3917
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3919
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:3929
+#: builtin/pack-objects.c:3921
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:3931
+#: builtin/pack-objects.c:3923
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3925
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3927
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3929
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:3939
+#: builtin/pack-objects.c:3931
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3933
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3935
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:3946
+#: builtin/pack-objects.c:3938
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3941
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:3952
+#: builtin/pack-objects.c:3944
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3947
msgid "read packs from stdin"
msgstr "lire les paquets depuis l'entrée standard"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3949
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3951
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:3961
+#: builtin/pack-objects.c:3953
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3955
msgid "pack loose unreachable objects"
msgstr "empaqueter les objets inaccessibles détachés"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3957
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3960
msgid "use the sparse reachability algorithm"
msgstr "utiliser l'algorithme de joignabilité creuse"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3962
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3964
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3966
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3968
msgid "ignore this pack"
msgstr "ignorer ce paquet"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3970
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3972
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3974
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:3984
+#: builtin/pack-objects.c:3976
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:3988
+#: builtin/pack-objects.c:3980
msgid "write a bitmap index if possible"
msgstr "écrire un index de bitmap si possible"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3984
msgid "handling for missing objects"
msgstr "gestion des objets manquants"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3987
msgid "do not pack objects in promisor packfiles"
msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3989
msgid "respect islands during delta compression"
msgstr "respecter les îlots pendant la compression des deltas"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3991
msgid "protocol"
msgstr "protocole"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3992
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "exclure tout uploadpack.blobpackfileuri configuré avec ce protocole"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4027
#, 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:4038
+#: builtin/pack-objects.c:4032
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit est trop grand, forcé à %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4088
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:4096
+#: builtin/pack-objects.c:4090
msgid "minimum pack size limit is 1 MiB"
msgstr "la taille limite minimale d'un paquet est 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4095
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:4104
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
-
-#: builtin/pack-objects.c:4110
msgid "cannot use --filter without --stdout"
msgstr "impossible d'utiliser --filter sans --stdout"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4106
msgid "cannot use --filter with --stdin-packs"
msgstr "impossible d'utiliser --filter avec --stdin-packs"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4110
msgid "cannot use internal rev list with --stdin-packs"
msgstr "impossible d'utiliser un liste interne de révisions avec --stdin-packs"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4169
msgid "Enumerating objects"
msgstr "Énumération des objets"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4210
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19457,77 +20173,67 @@
msgid "prune loose refs (default)"
msgstr "éliminer les références perdues (défaut)"
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "afficher les objets éliminés"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "faire expirer les objets plus vieux que <heure>"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs"
-#: builtin/prune.c:152
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Valeur invalide pour %s : %s"
-
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Options relatives à la fusion"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "contrôler l'utilisation des crochets pre-merge-commit et commit-msg"
+
+#: builtin/pull.c:171 parse-options.h:371
msgid "automatically stash/stash pop before and after"
msgstr "remiser et réappliquer automatiquement avant et après"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Options relatives au rapatriement"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "nombre de sous-modules tirés en parallèle"
-#: builtin/pull.c:317
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "Valeur invalide pour pull.ff : %s"
-
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -19535,14 +20241,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:447
+#: builtin/pull.c:451
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:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19550,7 +20256,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:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19562,43 +20268,44 @@
"configuration\n"
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:978
msgid "You are not currently on a branch."
msgstr "Vous n'êtes actuellement sur aucune branche."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Veuillez spécifier une branche avec laquelle fusionner."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:984
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:374
msgid "<branch>"
msgstr "<branche>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:976
msgid "There is no tracking information for the current branch."
msgstr "Pas d'information de suivi distant pour la branche actuelle."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
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:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19608,22 +20315,22 @@
"'%s'\n"
"du serveur distant, mais cette référence n'a pas été récupérée."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "impossible d'accéder le commit %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "--verify-signatures est ignoré pour un rebasage"
-#: builtin/pull.c:930
+#: builtin/pull.c:969
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
@@ -19633,8 +20340,8 @@
"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"
+"Vous avez des branches divergentes et vous devez spécifier comment\n"
+"les réconcilier. Vous pouvez le faire 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"
@@ -19646,21 +20353,21 @@
"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:990
+#: builtin/pull.c:1047
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:994
+#: builtin/pull.c:1051
msgid "pull with rebase"
msgstr "tirer avec un rebasage"
-#: builtin/pull.c:995
+#: builtin/pull.c:1052
msgid "please commit or stash them."
msgstr "veuillez les valider ou les remiser."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1077
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19671,7 +20378,7 @@
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1083
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19688,15 +20395,23 @@
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1098
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1103
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1105
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Impossible d'aller en avance rapide sur de multiples branches."
+
+#: builtin/pull.c:1120
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Besoin de spécifier comment réconcilier des branches divergentes."
+
+#: builtin/pull.c:1134
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"impossible de rebaser avec des modifications de sous-modules enregistrées "
@@ -19889,15 +20604,15 @@
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3377
msgid "repository"
msgstr "dépôt"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "pousser toutes les références"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "refléter toutes les références"
@@ -19910,19 +20625,19 @@
msgstr ""
"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<nom-de-ref>:<attendu>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
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:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "exiger des mises à jours distantes pour une intégration locale"
@@ -19930,12 +20645,12 @@
msgid "control recursive pushing of submodules"
msgstr "contrôler la poussée récursive des sous-modules"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
@@ -19955,18 +20670,14 @@
msgid "push missing but relevant tags"
msgstr "pousser les étiquettes manquantes mais pertinentes"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "signer la poussée avec GPG"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "demande une transaction atomique sur le serveur distant"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete est incompatible avec --all, --mirror et --tags"
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete n'a pas de sens sans aucune référence"
@@ -19998,26 +20709,14 @@
"\n"
" git push <nom>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all et --tags sont incompatibles"
-
#: builtin/push.c:632
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:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror et --tags sont incompatibles"
-
#: builtin/push.c:638
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:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all et --mirror sont incompatibles"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr ""
@@ -20074,87 +20773,87 @@
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
-"prefix=<préfixe>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
-"sparse-checkout] [--index-output=<fichier>] (--empty | <arbre-esque> [<arbre-"
-"esque 2> [<arbre-esque 3>]])"
+"prefix=<préfixe>) [-u | -i]] [--no-sparse-checkout] [--index-"
+"output=<fichier>] (--empty | <arbre-esque1> [<arbre-esque2> [<arbre-"
+"esque3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "écrire l'index résultant dans <fichier>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "juste vider l'index"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Fusion"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "effectuer une fusion en plus d'une lecture"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "fusion à 3 points si aucune fusion de niveau fichier n'est requise"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "fusion à 3 points en présence d'ajouts et suppressions"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "comme -m, mais annule les éléments non fusionnés"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<sous-répertoire>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "lire l'arbre dans l'index dans <sous-répertoire>/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "mettre à jour la copie de travail avec le résultat de la fusion"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "autoriser explicitement les fichiers ignorés à être écrasés"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "ne pas vérifier la copie de travail après la fusion"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "ne pas mettre à jour l'index ou la copie de travail"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "sauter l'application du filtre d'extraction creuse"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "déboguer unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "supprimer les messages d'information de suivi"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:190
msgid "You need to resolve your current index first"
msgstr "Vous devez d'abord résoudre votre index courant"
-#: builtin/rebase.c:35
+#: builtin/rebase.c:36
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -20162,204 +20861,51 @@
"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-"
"base] [<amont> [<branche>]]"
-#: builtin/rebase.c:37
+#: builtin/rebase.c:38
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:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "liste à faire inutilisable : '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:231
#, c-format
msgid "could not create temporary %s"
msgstr "impossible de créer un fichier temporaire %s"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:237
msgid "could not mark as interactive"
msgstr "impossible de marquer comme interactif"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:290
msgid "could not generate todo list"
msgstr "impossible de générer la liste à-faire"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:332
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:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<options>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "conserver les commits qui commencent vides"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "autoriser les validations avec des messages vides"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "rebaser les commits de fusion"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "conserver les points de branchement de cousins originaux"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "déplacer les commits qui commencent par squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "signer les commits"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "afficher un diffstat de ce qui a changé en amont"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "continuer le rebasage"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "sauter le commit"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "éditer la liste à-faire"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "afficher le patch courant"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "raccourcir les identifiants de commits dans la liste à-faire"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "étendre les identifiants de commit dans la liste à-faire"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "vérifier la liste à-faire"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "réarranger les lignes fixup/squash"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "insérer les commandes exec dans la liste à-faire"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "sur"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "restreindre la révision"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "écraser-sur"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "écraser sur"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "le commit amont"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "nom du head"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "nom du head"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "stratégie de rebasage"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "options de stratégie"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "options de stratégie"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "la branche ou le commit à extraire"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "sur-le-nom"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "sur le nom"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "la commande à lancer"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "re-planifier automatiquement tout `exec` qui échoue"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:391
#, c-format
msgid "%s requires the merge backend"
msgstr "%s requiert un moteur de fusion"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:433
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "impossible d'accéder 'onto' : '%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:450
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head invalide : '%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:475
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "allow_rerere_autoupdate invalide ignoré : '%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:600
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20373,7 +20919,7 @@
"arrêter\n"
"et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:685
#, c-format
msgid ""
"\n"
@@ -20392,16 +20938,21 @@
"\n"
"Résultat, git ne peut pas les rebaser."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:836
+#, c-format
+msgid "could not switch to %s"
+msgstr "impossible de basculer vers %s"
+
+#: builtin/rebase.c:952
#, c-format
msgid ""
-"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
-"\"."
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
+"\"ask\"."
msgstr ""
"type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), "
"\"keep\" (garder) et \"ask\" (demander)."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:970
#, c-format
msgid ""
"%s\n"
@@ -20418,7 +20969,7 @@
" git rebase '<branche>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:986
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20432,186 +20983,183 @@
" git branch --set-upstream-to=%s/<branche> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:1016
msgid "exec commands cannot contain newlines"
msgstr "les commandes exec ne peut pas contenir de retour à la ligne"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:1020
msgid "empty exec command"
msgstr "commande exec vide"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1051
msgid "rebase onto given branch instead of upstream"
msgstr "rebaser sur la branche %s au lieu de la branche amont"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1053
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:1323
+#: builtin/rebase.c:1055
msgid "allow pre-rebase hook to run"
msgstr "permettre le lancement du crochet pre-rebase"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1057
msgid "be quiet. implies --no-stat"
msgstr "être silencieux. implique --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1060
+msgid "display a diffstat of what changed upstream"
+msgstr "afficher un diffstat de ce qui a changé en amont"
+
+#: builtin/rebase.c:1063
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:1334
+#: builtin/rebase.c:1066
msgid "add a Signed-off-by trailer to each commit"
msgstr "ajouter une ligne Signed-off-by à chaque message de validation"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1069
msgid "make committer date match author date"
msgstr "mettre la date de validateur à la date auteur"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1071
msgid "ignore author date and use current date"
msgstr "ignorer la date d'auteur et utilise la date actuelle"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1073
msgid "synonym of --reset-author-date"
msgstr "synonyme pour --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1075 builtin/rebase.c:1079
msgid "passed to 'git apply'"
msgstr "passé jusqu'à git apply"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1077
msgid "ignore changes in whitespace"
msgstr "ignorer des modifications d'espaces"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1081 builtin/rebase.c:1084
msgid "cherry-pick all commits, even if unchanged"
msgstr "picorer tous les commits, même sans modifiant"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1086
msgid "continue"
msgstr "continuer"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1089
msgid "skip current patch and continue"
msgstr "sauter le patch courant et continuer"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1091
msgid "abort and check out the original branch"
msgstr "abandonner et extraire la branche d'origine"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1094
msgid "abort but keep HEAD where it is"
msgstr "abandonne mais garde HEAD où il est"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1095
msgid "edit the todo list during an interactive rebase"
msgstr "éditer la liste à faire lors d'un rebasage interactif"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1098
msgid "show the patch file being applied or merged"
msgstr "afficher le patch en cours d'application ou de fusion"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1101
msgid "use apply strategies to rebase"
msgstr "utiliser des stratégies d'application pour rebaser"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1105
msgid "use merging strategies to rebase"
msgstr "utiliser des stratégies de fusion pour rebaser"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1109
msgid "let the user edit the list of commits to rebase"
msgstr "laisser l'utilisateur éditer la liste des commits à rebaser"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1113
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:1386
+#: builtin/rebase.c:1118
msgid "how to handle commits that become empty"
msgstr "comment gérer les commits qui deviennent vides"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1121
+msgid "keep commits which start empty"
+msgstr "conserver les commits qui commencent vides"
+
+#: builtin/rebase.c:1125
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:1400
+#: builtin/rebase.c:1132
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:1404
+#: builtin/rebase.c:1136
msgid "allow rebasing commits with empty messages"
msgstr "autoriser les commits de rebasage avec des messages vides"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1140
msgid "try to rebase merges instead of skipping them"
msgstr "essayer de rebaser les fusions au lieu de les garder"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1143
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1145
msgid "use the given merge strategy"
msgstr "utiliser la stratégie de fusion indiquée"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1147 builtin/revert.c:115
msgid "option"
msgstr "option"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1148
msgid "pass the argument through to the merge strategy"
msgstr "passer les arguments jusqu'à la stratégie de fusion"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1151
msgid "rebase all reachable commits up to the root(s)"
msgstr "rebaser tous les objets inatteignables depuis les racines"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1154
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "re-planifier automatiquement tout `exec` qui échoue"
+
+#: builtin/rebase.c:1156
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:1442
+#: builtin/rebase.c:1177
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:1483
-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:1208
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges a été remplacé par --rebase-merges"
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "impossible de combiner '--keep-base' avec '--onto'"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "impossible de combiner '--keep-base' avec '--root'"
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "impossible de combiner '--root' avec '--fork-point'"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1230
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1234
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:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1269
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20619,16 +21167,16 @@
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1287
msgid "could not discard worktree changes"
msgstr "impossible de supprimer les changements de l'arbre de travail"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1308
#, c-format
msgid "could not move back to %s"
msgstr "impossible de revenir à %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1354
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20650,145 +21198,129 @@
"chose\n"
"d'important ici.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1382
msgid "switch `C' expects a numerical value"
msgstr "l'option `C' attend un valeur numérique"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1424
#, c-format
msgid "Unknown mode: %s"
msgstr "Mode inconnu : %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1463
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requiert --merge ou --interactive"
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
+#: builtin/rebase.c:1492
+msgid "apply options and merge options cannot be used together"
msgstr ""
-"impossible de combiner les options d'application avec les options de fusion"
+"Les options d'apply et celles de merge ne peuvent pas être utilisées ensemble"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1505
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Backend de rebasage inconnu : %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1534
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec requiert --exec ou --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"erreur : impossible de combiner '--preserve-merges' avec '--reschedule-"
-"failed-exec'"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1565
#, c-format
msgid "invalid upstream '%s'"
msgstr "amont invalide '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1571
msgid "Could not create new root commit"
msgstr "Impossible de créer un nouveau commit racine"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1597
#, 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:1885
+#: builtin/rebase.c:1600
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': exactement une base de fusion nécessaire"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1609
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Ne pointe pas sur une validation valide : '%s'"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1636
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal : pas de branche ou commit '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "pas de branche ou commit '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
+#: builtin/submodule--helper.c:2477
#, c-format
msgid "No such ref: %s"
msgstr "Référence inexistante : %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1658
msgid "Could not resolve HEAD to a revision"
msgstr "Impossible de résoudre le commit HEAD vers un révision"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1679
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: builtin/rebase.c:1997
-#, c-format
-msgid "could not switch to %s"
-msgstr "impossible de basculer vers %s"
-
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1714
msgid "HEAD is up to date."
msgstr "HEAD est à jour."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1716
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La branche courante %s est à jour.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1724
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD est à jour, rebasage forcé."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1726
#, 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:2028
+#: builtin/rebase.c:1734
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1741
#, c-format
msgid "Changes to %s:\n"
msgstr "Changements vers %s :\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1744
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Changements de %s sur %s :\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1769
#, 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:2072
+#: builtin/rebase.c:1781
msgid "Could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1790
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avance rapide de %s sur %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1263
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"
@@ -20818,7 +21350,7 @@
"Pour éliminer ce message et conserver le comportement par défaut,\n"
"réglez « receive.denyCurrentBranch » à 'refuse'."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1283
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"
@@ -20838,79 +21370,115 @@
"\n"
"Pour éliminer ce message, réglez-le à 'refuse'."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2476
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:2492
-msgid "You must specify a directory."
-msgstr "Vous devez spécifier un répertoire."
+#: builtin/receive-pack.c:2491
+msgid "you must specify a directory"
+msgstr "Vous devez spécifier un répertoire"
+
+#: builtin/reflog.c:9
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [<options-de-journal>] [<réf>]"
+
+#: builtin/reflog.c:12
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
+msgstr ""
+"git reflog expire [--expire=<temps>] [--expire-unreachable=<temps>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<réfs>...]"
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
msgstr ""
-"git reflog expire [--expire=<date>] [--expire-unreachable=<date>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<réferences>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <réf>@{<spécificateur>}..."
-#: builtin/reflog.c:22
-msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
-msgstr ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<références>..."
-
-#: builtin/reflog.c:25
+#: builtin/reflog.c:21
msgid "git reflog exists <ref>"
msgstr "git reflog exists <référence>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:197 builtin/reflog.c:211
#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "'%s' n'est pas un horodatage valide"
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "horodatage invalide '%s' fourni à '--%s'"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:240 builtin/reflog.c:359
+msgid "do not actually prune any entries"
+msgstr "ne pas réellement élaguer des entrées"
+
+#: builtin/reflog.c:243 builtin/reflog.c:362
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr ""
+"réécrire l'ancien SHA1 avec le nouveau SHA1 de l'entrée qui la précède "
+"maintenant"
+
+#: builtin/reflog.c:246 builtin/reflog.c:365
+msgid "update the reference to the value of the top reflog entry"
+msgstr ""
+"mettre à jour la référence avec la valeur de l'entrée en tête de reflog"
+
+#: builtin/reflog.c:248 builtin/reflog.c:367
+msgid "print extra information on screen"
+msgstr "Afficher de l'informations supplémentaires"
+
+#: builtin/reflog.c:249 builtin/reflog.c:253
+msgid "timestamp"
+msgstr "horodatage"
+
+#: builtin/reflog.c:250
+msgid "prune entries older than the specified time"
+msgstr "élaguer les entrées plus vieilles que <temps>"
+
+#: builtin/reflog.c:254
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+"élaguer les entrées plus anciennes que <temps> qui ne sont pas joignables "
+"depuis le sommet actuel de la branche"
+
+#: builtin/reflog.c:258
+msgid "prune any reflog entries that point to broken commits"
+msgstr "élaguer les entrées de reflog qui pointent sur des commits cassés"
+
+#: builtin/reflog.c:259
+msgid "process the reflogs of all references"
+msgstr "traiter les reflogs de toutes les références"
+
+#: builtin/reflog.c:261
+msgid "limits processing to reflogs from the current worktree only"
+msgstr "limite le traitement des reflogs seulement à l'arbre de travail actuel"
+
+#: builtin/reflog.c:294
#, c-format
msgid "Marking reachable objects..."
msgstr "Marquage des objets inaccessibles..."
-#: builtin/reflog.c:647
+#: builtin/reflog.c:338
#, c-format
msgid "%s points nowhere!"
msgstr "%s ne pointe nulle part !"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:374
msgid "no reflog specified to delete"
msgstr "pas de journal de références à supprimer spécifié"
-#: builtin/reflog.c:708
-#, c-format
-msgid "not a reflog: %s"
-msgstr "'%s' n'est pas un journal de références"
-
-#: builtin/reflog.c:713
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "pas de journal de références pour '%s'"
-
-#: builtin/reflog.c:759
+#: builtin/reflog.c:396
#, c-format
msgid "invalid ref format: %s"
msgstr "format de référence invalide : %s"
-#: builtin/reflog.c:768
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr "git reflog [ show | expire | delete | exists ]"
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
@@ -20918,83 +21486,88 @@
"git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <nom> <url>"
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <ancienne> <nouvelle>"
+#: builtin/remote.c:20 builtin/remote.c:40
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <ancien> <nouveau>"
-#: builtin/remote.c:20 builtin/remote.c:44
+#: builtin/remote.c:21 builtin/remote.c:45
msgid "git remote remove <name>"
msgstr "git remote remove <nom>"
-#: builtin/remote.c:21 builtin/remote.c:49
+#: builtin/remote.c:22 builtin/remote.c:50
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <nom>"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <nom>"
-#: builtin/remote.c:24
+#: builtin/remote.c:25
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<groupe> | "
"<distante>)...]"
-#: builtin/remote.c:25
+#: builtin/remote.c:26
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <nom> <branche>..."
-#: builtin/remote.c:26 builtin/remote.c:75
+#: builtin/remote.c:27 builtin/remote.c:76
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <nom>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]"
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <nom> <nouvelle-URL>"
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c:30 builtin/remote.c:83
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <nom> <url>"
-#: builtin/remote.c:34
+#: builtin/remote.c:35
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<options>] <nom> <URL>"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <nom> <branche>..."
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <nom> <branche>..."
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<options>] <nom>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<options>] <nom>"
-#: builtin/remote.c:70
+#: builtin/remote.c:71
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<options>] [<groupe> | <distante>]..."
-#: builtin/remote.c:99
+#: builtin/remote.c:100
#, c-format
msgid "Updating %s"
msgstr "Mise à jour de %s"
-#: builtin/remote.c:131
+#: builtin/remote.c:102
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Impossible de récupérer %s"
+
+#: builtin/remote.c:132
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -21002,78 +21575,83 @@
"--mirror est dangereux et obsolète ; merci\n"
"\t d'utiliser --mirror=fetch ou --mirror=push à la place"
-#: builtin/remote.c:148
+#: builtin/remote.c:149
#, c-format
msgid "unknown mirror argument: %s"
msgstr "argument miroir inconnu : %s"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "fetch the remote branches"
msgstr "rapatrier les branches distantes"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "import all tags and associated objects when fetching"
msgstr ""
"importer toutes les étiquettes et les objets associés lors du rapatriement"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "ou ne rapatrier aucune étiquette (--no-tags)"
-#: builtin/remote.c:171
+#: builtin/remote.c:172
msgid "branch(es) to track"
msgstr "branche(s) à suivre"
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "master branch"
msgstr "branche maîtresse"
-#: builtin/remote.c:174
+#: builtin/remote.c:175
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
"paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis"
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying a master branch makes no sense with --mirror"
msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror"
-#: builtin/remote.c:188
+#: builtin/remote.c:189
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
"rapatriement"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:196 builtin/remote.c:716
#, c-format
msgid "remote %s already exists."
msgstr "la distante %s existe déjà."
-#: builtin/remote.c:240
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "Impossible de paramétrer la maîtresse '%s'"
-#: builtin/remote.c:355
+#: builtin/remote.c:323
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branch.%s.rebase=%s non géré ; 'true' supposé"
+
+#: builtin/remote.c:367
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
"Impossible d'obtenir une correspondance distante pour la spécification de "
"référence %s"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:461 builtin/remote.c:469
msgid "(matching)"
msgstr "(correspond)"
-#: builtin/remote.c:466
+#: builtin/remote.c:473
msgid "(delete)"
msgstr "(supprimer)"
-#: builtin/remote.c:655
+#: builtin/remote.c:664
#, c-format
msgid "could not set '%s'"
msgstr "impossible d'assigner '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:669
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -21084,17 +21662,17 @@
"\t%s%d\n"
"nomme à présent le distant inexistant '%s'"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
#, c-format
msgid "No such remote: '%s'"
msgstr "Pas de serveur remote : '%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:726
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Impossible de renommer la section de configuration '%s' en '%s'"
-#: builtin/remote.c:730
+#: builtin/remote.c:746
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -21105,17 +21683,21 @@
"\t%s\n"
"\tVeuillez mettre à jour la configuration manuellement si nécessaire."
-#: builtin/remote.c:770
+#: builtin/remote.c:783
+msgid "Renaming remote references"
+msgstr "Renommage des références distantes"
+
+#: builtin/remote.c:794
#, c-format
msgid "deleting '%s' failed"
msgstr "échec de suppression de '%s'"
-#: builtin/remote.c:804
+#: builtin/remote.c:832
#, c-format
msgid "creating '%s' failed"
msgstr "échec de création de '%s'"
-#: builtin/remote.c:882
+#: builtin/remote.c:912
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -21130,118 +21712,118 @@
"supprimées ;\n"
"pour les supprimer, utilisez :"
-#: builtin/remote.c:896
+#: builtin/remote.c:926
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Impossible de supprimer la section de configuration '%s'"
-#: builtin/remote.c:999
+#: builtin/remote.c:1034
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1037
msgid " tracked"
msgstr " suivi"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1039
msgid " stale (use 'git remote prune' to remove)"
msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1041
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1082
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1091
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebase de manière interactive sur la distante %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1093
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "rebase de manière interactive (avec fusions) sur la distante %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1096
#, c-format
msgid "rebases onto remote %s"
msgstr "rebase sur la distante %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1100
#, c-format
msgid " merges with remote %s"
msgstr " fusionne avec la distante %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1103
#, c-format
msgid "merges with remote %s"
msgstr "fusionne avec la distante %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1106
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s et avec la distante %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1149
msgid "create"
msgstr "créer"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1152
msgid "delete"
msgstr "supprimer"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1156
msgid "up to date"
msgstr "à jour"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1159
msgid "fast-forwardable"
msgstr "peut être mis à jour en avance rapide"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1162
msgid "local out of date"
msgstr "le local n'est pas à jour"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1169
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s force vers %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1172
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s pousse vers %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1176
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s force vers %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1179
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s pousse vers %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1247
msgid "do not query remotes"
msgstr "ne pas interroger les distantes"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1268
#, c-format
msgid "* remote %s"
-msgstr "* distante %s"
+msgstr "* distant %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1269
#, c-format
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
msgid "(no URL)"
msgstr "(pas d'URL)"
@@ -21249,25 +21831,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1284 builtin/remote.c:1286
#, c-format
msgid " Push URL: %s"
msgstr " URL push : %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
#, c-format
msgid " HEAD branch: %s"
msgstr " Branche HEAD : %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1288
msgid "(not queried)"
msgstr "(non demandé)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1290
msgid "(unknown)"
msgstr "(inconnu)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1294
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -21275,162 +21857,166 @@
" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
"suivantes) :\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1306
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1309 builtin/remote.c:1335
msgid " (status not queried)"
msgstr " (état non demandé)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1318
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branche locale configurée pour 'git pull' :"
msgstr[1] " Branches locales configurées pour 'git pull' :"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1326
msgid " Local refs will be mirrored by 'git push'"
msgstr " Les références locales seront reflétées par 'git push'"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1332
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Référence locale configurée pour 'git push'%s :"
msgstr[1] " Références locales configurées pour 'git push'%s :"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1353
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1355
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1369
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1371
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
"explicitement avec :"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1381
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1389
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1391
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1409
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1410
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1419
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1420
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1436
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1439
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1484
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1566
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1573
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1590
msgid "query push URLs rather than fetch URLs"
msgstr "interroger les URLs de poussée plutôt que les URLs de récupération"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1592
msgid "return all URLs"
msgstr "retourner toutes les URLs"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1622
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "aucune URL configurée pour le dépôt distant '%s'"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1648
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1650
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1652
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1659
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1700
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1708
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1710
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/repack.c:26
+#: builtin/remote.c:1727
+msgid "be verbose; must be placed before a subcommand"
+msgstr "être verbeux : doit être placé avant une sous-commande"
+
+#: builtin/repack.c:29
msgid "git repack [<options>]"
msgstr "git repack [<options>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:34
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21439,147 +22025,152 @@
"Utilisez\n"
"--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
-#: builtin/repack.c:198
+#: builtin/repack.c:206
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:270 builtin/repack.c:630
+#: builtin/repack.c:280 builtin/repack.c:824
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:294
+#: builtin/repack.c:304
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:309
+#: builtin/repack.c:319
#, c-format
msgid "cannot open index for %s"
msgstr "impossible d'ouvrir l'index pour %s"
-#: builtin/repack.c:368
+#: builtin/repack.c:378
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr ""
"le paquet %s est trop gros pour être pris en compte dans un progression "
"géométrique"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
#, c-format
msgid "pack %s too large to roll up"
msgstr "le paquet %s est trop gros à enrouler"
-#: builtin/repack.c:460
+#: builtin/repack.c:503
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "impossible d'ouvrir le fichier temporaire %s en écriture"
+
+#: builtin/repack.c:521
+msgid "could not close refs snapshot tempfile"
+msgstr "impossible de fermer le fichier temporaire d'instantané des réfs"
+
+#: builtin/repack.c:634
msgid "pack everything in a single pack"
msgstr "empaqueter tout dans un seul paquet"
-#: builtin/repack.c:462
+#: builtin/repack.c:636
msgid "same as -a, and turn unreachable objects loose"
msgstr "identique à -a et transformer les objets inaccessibles en suspens"
-#: builtin/repack.c:465
+#: builtin/repack.c:639
msgid "remove redundant packs, and run git-prune-packed"
msgstr "supprimer les paquets redondants et lancer git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:641
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passer --no-reuse-delta à git-pack-objects"
-#: builtin/repack.c:469
+#: builtin/repack.c:643
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passer --no-reuse-object à git-pack-objects"
-#: builtin/repack.c:471
+#: builtin/repack.c:645
msgid "do not run git-update-server-info"
msgstr "ne pas lancer git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:648
msgid "pass --local to git-pack-objects"
msgstr "passer --local à git-pack-objects"
-#: builtin/repack.c:476
+#: builtin/repack.c:650
msgid "write bitmap index"
msgstr "écrire un index en bitmap"
-#: builtin/repack.c:478
+#: builtin/repack.c:652
msgid "pass --delta-islands to git-pack-objects"
msgstr "passer --delta-islands à git-pack-objects"
-#: builtin/repack.c:479
+#: builtin/repack.c:653
msgid "approxidate"
msgstr "date approximative"
-#: builtin/repack.c:480
+#: builtin/repack.c:654
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:482
+#: builtin/repack.c:656
msgid "with -a, repack unreachable objects"
msgstr "avec -a, repaquétiser les objets inaccessibles"
-#: builtin/repack.c:484
+#: builtin/repack.c:658
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:485 builtin/repack.c:491
+#: builtin/repack.c:659 builtin/repack.c:665
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:486
+#: builtin/repack.c:660
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:488
+#: builtin/repack.c:662
msgid "limits the maximum delta depth"
msgstr "limite la profondeur maximale des deltas"
-#: builtin/repack.c:490
+#: builtin/repack.c:664
msgid "limits the maximum number of threads"
msgstr "limite le nombre maximal de fils"
-#: builtin/repack.c:492
+#: builtin/repack.c:666
msgid "maximum size of each packfile"
msgstr "taille maximum de chaque fichier paquet"
-#: builtin/repack.c:494
+#: builtin/repack.c:668
msgid "repack objects in packs marked with .keep"
msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
-#: builtin/repack.c:496
+#: builtin/repack.c:670
msgid "do not repack this pack"
msgstr "ne pas rempaqueter ce paquet"
-#: builtin/repack.c:498
+#: builtin/repack.c:672
msgid "find a geometric progression with factor <N>"
msgstr "trouver une progression géométrique avec un facteur <N>"
-#: builtin/repack.c:508
+#: builtin/repack.c:674
+msgid "write a multi-pack index of the resulting packs"
+msgstr "écrire un index de multi-paquet des paquets résultants"
+
+#: builtin/repack.c:684
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:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable et -A sont incompatibles"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric est incompatible avec -A, -a"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:833
msgid "Nothing new to pack."
msgstr "Rien de neuf à empaqueter."
-#: builtin/repack.c:669
+#: builtin/repack.c:863
#, c-format
msgid "missing required file: %s"
msgstr "fichier nécessaire manquant : %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:865
#, c-format
msgid "could not unlink: %s"
msgstr "impossible de délier : '%s'"
@@ -21596,10 +22187,6 @@
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <commit> [<parent>...]"
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --convert-graft-file"
-
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <objet>..."
@@ -21662,67 +22249,61 @@
msgid "unable to open %s for reading"
msgstr "impossible d'ouvrir %s en écriture"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "impossible de lire depui mktree"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "mktree a échoué"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree n'a pas retourné de nom d'objet"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "fstat de %s impossible"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "impossible d'écrire l'objet dans la base de données"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "nom d'objet invalide : '%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "impossible d'obtenir le type de l'objet pour %s"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "échec de l'édition du fichier d'objet"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "le nouvel objet est identique à l'ancien : '%s'"
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "impossible d'analyser %s comme commit"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "mauvaise étiquette de fusion dans le commit '%s'"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "étiquette de fusion malformée dans le commit '%s'"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21731,31 +22312,31 @@
"le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; "
"utilisez --edit au lieu de --graft"
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "le commit original '%s' contient une signature GPG"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "la signature sera éliminée dans la validation de remplacement !"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "impossible d'écrire le commit de remplacement pour '%s'"
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "graft pour '%s' non nécessaire"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "le nouveau commit est identique à l'ancien : '%s'"
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -21764,71 +22345,71 @@
"impossible de convertir la(les) greffe(s) suivante(s) :\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "afficher les références de remplacement"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "supprimer les références de remplacement"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "éditer l'objet existant"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "modifier les parents d'un commit"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "convertir le fichier de greffe existant"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "remplacer la référence si elle existe"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "afficher sans mise en forme pour --edit"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "utiliser ce format"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "--format ne peut pas être utilisé sans lister"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "-f n'a de sens qu'en écrivant un remplacement"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw n'a de sens qu'avec l'option --edit"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d requiert au moins un argument"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "mauvais nombre d'arguments"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e requiert un seul argument"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-g requiert au moins un argument"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file ne supporte aucun argument"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "-l n'accepte qu'un motifs"
@@ -21850,174 +22431,158 @@
msgid "unable to generate diff for '%s'"
msgstr "échec de la génération de diff pour '%s'"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr ""
"git reset [-q] [<arbre ou apparenté>] [--] <spécificateur-de-chemin>..."
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-esque>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<arbre-esque>] [--] [<spéc.-de-chemin>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "mixed"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "soft"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "hard"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "merge"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:83
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "Vous n'avez pas une HEAD valide."
-#: builtin/reset.c:85
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "Impossible de trouver l'arbre pour HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "Impossible de trouver l'arbre pour %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD est maintenant à %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:304
#, 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:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
+#: builtin/stash.c:693
msgid "be quiet, only report errors"
msgstr "être silencieux, afficher seulement les erreurs"
-#: builtin/reset.c:297
+#: builtin/reset.c:404
+msgid "skip refreshing the index after reset"
+msgstr "sauter le rafraîchissement de l'index après la réinitialisation"
+
+#: builtin/reset.c:406
msgid "reset HEAD and index"
msgstr "réinitialiser HEAD et l'index"
-#: builtin/reset.c:298
+#: builtin/reset.c:407
msgid "reset only HEAD"
msgstr "réinitialiser seulement HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:409 builtin/reset.c:411
msgid "reset HEAD, index and working tree"
msgstr "réinitialiser HEAD, l'index et la copie de travail"
-#: builtin/reset.c:304
+#: builtin/reset.c:413
msgid "reset HEAD but keep local changes"
msgstr "réinitialiser HEAD mais garder les changements locaux"
-#: builtin/reset.c:310
+#: builtin/reset.c:419
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:344
+#: builtin/reset.c:452
#, 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:352
+#: builtin/reset.c:460
#, 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:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:479
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:373
+#: builtin/reset.c:481
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Impossible de faire un \"%s reset\" avec des chemins."
-#: builtin/reset.c:388
+#: builtin/reset.c:496
#, 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:392
-msgid "-N can only be used with --mixed"
-msgstr "-N ne peut être utilisé qu'avec --mixed"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:527
msgid "Unstaged changes after reset:"
msgstr "Modifications non indexées après reset :"
-#: builtin/reset.c:416
+#: builtin/reset.c:530
#, c-format
msgid ""
-"\n"
-"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
-"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
-"to make this the default.\n"
+"It took %.2f seconds to refresh the index after reset. You can use\n"
+"'--no-refresh' to avoid this."
msgstr ""
-"\n"
-"Les modifications non-indexées ont pris %.2f secondes à énumérer après "
-"reset.\n"
-"Vous pouvez utiliser '--quiet' pour éviter ce message. Réglez le paramètre "
-"de\n"
-"config reset.quiet à true pour avoir ce comportement en permanence.\n"
+"%.2f secondes ont été nécessaires pour rafraîchir l'index après la "
+"réinitialisation.\n"
+"Vous pouvez utiliser '--no-refresh' pour éviter ceci."
-#: builtin/reset.c:434
+#: builtin/reset.c:547
#, 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:439
+#: builtin/reset.c:552
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "impossible de combiner --exclude-promisor-objects et --missing"
-
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr "le filtrage d'objet exige --objects"
-
-#: builtin/rev-list.c:674
+#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
msgstr "rev-list ne supporte l'affichage des notes"
-#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "le comptage marqué est incompatible avec --objects"
+#: builtin/rev-list.c:664
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "le comptage marqué et '%s' ne peuvent pas être utilisés ensemble"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -22180,15 +22745,19 @@
msgid "preserve initially empty commits"
msgstr "préserver les validations vides initialement"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "autoriser les validations avec des messages vides"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "garder les validations redondantes, vides"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
@@ -22238,73 +22807,72 @@
msgstr[0] "le fichier suivant a des modifications locales :"
msgstr[1] "les fichiers suivants ont des modifications locales :"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "ne pas afficher les fichiers supprimés"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "supprimer seulement de l'index"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "outrepasser la vérification des fichiers à jour"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "autoriser la suppression récursive"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "sortir avec un état zéro même si rien ne correspondait"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
"Aucun spécificateur de chemin fourni. Quel fichier doit être supprimé ?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"veuillez indexer vos modifications de .gitmodules ou les remiser pour "
"continuer"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "pas de suppression récursive de '%s' sans -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm : impossible de supprimer %s"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<hôte>:]<répertoire> "
-"[<référence>...]\n"
-" --all et la spécification explicite de <référence> sont mutuellement "
-"exclusifs."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<hôte>:]<répertoire> (--all | <réf>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "nom distant"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "utiliser un protocole RPC sans état"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "lire les références depuis l'entrée standard"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "afficher les messages du greffon de protocole distant"
@@ -22364,27 +22932,27 @@
msgid "group by field"
msgstr "grouper par champ"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:395
msgid "too many arguments given outside repository"
msgstr "trop d'arguments fournis hors d'un dépôt"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-"git show-branch [-a | --all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<quand>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+" [--current] [--color[=<quand>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
-#: builtin/show-branch.c:17
+#: builtin/show-branch.c:18
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]"
-#: builtin/show-branch.c:395
+#: builtin/show-branch.c:396
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
@@ -22462,13 +23030,6 @@
msgstr ""
"afficher les <n> plus récents éléments de ref-log en commençant à la base"
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog est incompatible avec --all, --remotes, --independent et --merge-"
-"base"
-
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "aucune branche spécifiée, et HEAD est invalide"
@@ -22563,86 +23124,160 @@
"afficher les références de l'entrée standard qui ne sont pas dans le dépôt "
"local"
-#: builtin/sparse-checkout.c:22
+#: builtin/sparse-checkout.c:23
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:46
-msgid "git sparse-checkout list"
-msgstr "git sparse-checkout list"
+#: builtin/sparse-checkout.c:61
+msgid "this worktree is not sparse"
+msgstr "cet arbre de travail n'est pas clairsemé"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:76
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"cet arbre de travail n'est pas clairsemé (le fichier sparse-checkout "
"pourrait ne pas exister)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:177
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"le dossier '%s' contient des fichiers non-suivis, mais n'est pas dans le "
+"cone d'extraction clairsemée"
+
+#: builtin/sparse-checkout.c:185
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "échec de suppression du répertoire '%s'"
+
+#: builtin/sparse-checkout.c:327
msgid "failed to create directory for sparse-checkout file"
msgstr ""
"échec de la création du répertoire pour le fichier d'extraction clairsemée"
-#: builtin/sparse-checkout.c:268
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr ""
-"impossible de mettre à jour le format de dépôt pour activer worktreeConfig"
+#: builtin/sparse-checkout.c:366
+msgid "failed to initialize worktree config"
+msgstr "échec lors de l'initialisation de la configuration d'arbre de travail"
-#: builtin/sparse-checkout.c:270
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "échec de paramétrage extensions.worktreeConfig"
-
-#: builtin/sparse-checkout.c:290
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-
-#: builtin/sparse-checkout.c:310
-msgid "initialize the sparse-checkout in cone mode"
-msgstr "initialiser l'extraction clairsemée en mode cone"
-
-#: builtin/sparse-checkout.c:312
-msgid "toggle the use of a sparse index"
-msgstr "bascule l'utilisation d'index clairsemé"
-
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:411
msgid "failed to modify sparse-index config"
msgstr "impossible de modifier la configuration d'index clairsemé"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
+#: builtin/sparse-checkout.c:847
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "initialiser l'extraction clairsemée en mode cone"
+
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
+#: builtin/sparse-checkout.c:849
+msgid "toggle the use of a sparse index"
+msgstr "bascule l'utilisation d'index clairsemé"
+
+#: builtin/sparse-checkout.c:479
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:531
#, c-format
msgid "could not normalize path %s"
msgstr "impossible de normaliser le chemin '%s'"
-#: builtin/sparse-checkout.c:425
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)"
-
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:560
#, 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:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
msgid "unable to load existing sparse-checkout patterns"
msgstr "impossible de charger les motifs de l'extraction clairsemée existants"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:619
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr ""
+"les motifs de l'extraction clairsemée existants n'utilisent pas le mode cone"
+
+#: builtin/sparse-checkout.c:707
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr ""
+"veuillez lancer depuis le répertoire de niveau supérieur en mode non-cone"
+
+#: builtin/sparse-checkout.c:712
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr ""
+"spécifier les répertoires plutôt que les motifs (sans barre oblique au début)"
+
+#: builtin/sparse-checkout.c:714
+msgid ""
+"specify directories rather than patterns. If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+"spécifier les répertoires plutôt que les motifs. Si votre répertoire "
+"commence par un '!', passez --skip-checks"
+
+#: builtin/sparse-checkout.c:716
+msgid ""
+"specify directories rather than patterns. If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"spécifier les répertoires plutôt que les motifs. Si votre répertoire "
+"contient au moins caractère '*?[]\\\\', passez --skip-checks"
+
+#: builtin/sparse-checkout.c:732
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr ""
+"'%s' n'est pas un répertoire ; pour le traiter tout de même comme un "
+"répertoire, relancez avec --skip-checks"
+
+#: builtin/sparse-checkout.c:734
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"passez une barre oblique en préfixe de chemins tels que '%s' si vous voulez "
+"un seul fichier (voir PROBLÈMES DE NON-CONE dans la page de manuel de git-"
+"sparse-checkout)."
+
+#: builtin/sparse-checkout.c:739
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <motifs>)"
+
+#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr ""
+"sauter certaines vérifications sanitaires sur les chemins indiqués qui "
+"pourraient provoquer ds faux positifs"
+
+#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
msgid "read patterns from standard in"
msgstr "lire les motifs depuis l'entrée standard"
-#: builtin/sparse-checkout.c:588
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:760
+msgid "no sparse-checkout to add to"
+msgstr "aucun sparse-checkout auquel on peut ajouter"
-#: builtin/sparse-checkout.c:607
-msgid "git sparse-checkout disable"
-msgstr "git sparse-checkout disable"
+#: builtin/sparse-checkout.c:775
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <motifs>)"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:854
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"extraction clairsemée nécessaire pour pouvoir réappliquer les motifs de "
+"clairsemage"
+
+#: builtin/sparse-checkout.c:914
msgid "error while refreshing working directory"
msgstr "erreur lors du rafraîchissement du répertoire de travail"
@@ -22668,22 +23303,26 @@
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
" [--] [<spécificateur-de-chemin>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
#: builtin/stash.c:55
@@ -22708,6 +23347,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--] [<spécificateur-de-chemin>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22731,7 +23378,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear avec des arguments n'est pas implémenté"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22743,183 +23390,184 @@
" %s -> %s\n"
" pour faire de la place.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "impossible d'appliquer un remisage en cours de fusion"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "impossible de générer %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "conflits dans l'index. Essayez sans --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "impossible de sauvegarder l'arbre d'index"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Fusion de %s avec %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"
+
+#: builtin/stash.c:608 builtin/stash.c:695
msgid "attempt to recreate the index"
msgstr "tentative de recréer l'index"
-#: builtin/stash.c:635
+#: builtin/stash.c:641
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s supprimé (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:644
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s : Impossible de supprimer l'élément de stash"
-#: builtin/stash.c:651
+#: builtin/stash.c:657
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' n'est pas une référence de remisage"
-#: builtin/stash.c:701
+#: builtin/stash.c:707
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:724
+#: builtin/stash.c:730
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: builtin/stash.c:808
+#: builtin/stash.c:809
msgid "failed to parse tree"
msgstr "échec de l'analyse de l'arbre"
-#: builtin/stash.c:819
+#: builtin/stash.c:820
msgid "failed to unpack trees"
msgstr "échec du dépaquetage des arbres"
-#: builtin/stash.c:839
+#: builtin/stash.c:840
msgid "include untracked files in the stash"
msgstr "inclure les fichiers non suivis dans le remisage"
-#: builtin/stash.c:842
+#: builtin/stash.c:843
msgid "only show untracked files in the stash"
msgstr "ne montrer que les fichiers non suivis dans le remisage"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:930 builtin/stash.c:967
#, c-format
msgid "Cannot update %s with %s"
msgstr "Impossible de mettre à jour %s avec %s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
msgid "stash message"
msgstr "message pour le remisage"
-#: builtin/stash.c:957
+#: builtin/stash.c:958
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" exige un argument <commit>"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1143
+msgid "No staged changes"
+msgstr "Aucune modification indexée"
+
+#: builtin/stash.c:1204
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1304
msgid "You do not have the initial commit yet"
msgstr "Vous n'avez pas encore la validation initiale"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1331
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1340
msgid "Cannot save the untracked files"
msgstr "Impossible de sauver les fichiers non-suivis"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1351 builtin/stash.c:1370
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1361
+msgid "Cannot save the current staged state"
+msgstr "Impossible de sauver l'état actuel de l'index"
+
+#: builtin/stash.c:1398
msgid "Cannot record working tree state"
msgstr "Impossible d'enregistrer l'état de la copie de travail"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1447
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:1422
+#: builtin/stash.c:1458
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"Impossible d'utiliser --staged et --include-untracked ou --all en même temps"
+
+#: builtin/stash.c:1476
msgid "Did you forget to 'git add'?"
msgstr "Vous avez sûrement oublié 'git add' ?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1491
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1498
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1513
msgid "Cannot save the current status"
msgstr "Impossible de sauver l'état courant"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1518
#, 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:1554
+#: builtin/stash.c:1615
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1656 builtin/stash.c:1728
msgid "keep index"
msgstr "conserver l'index"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1658 builtin/stash.c:1730
+msgid "stash staged changes only"
+msgstr "remiser seulement les modifications indexées"
+
+#: builtin/stash.c:1660 builtin/stash.c:1732
msgid "stash in patch mode"
msgstr "remiser une mode rustine"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1661 builtin/stash.c:1733
msgid "quiet mode"
msgstr "mode silencieux"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1663 builtin/stash.c:1735
msgid "include untracked files in stash"
msgstr "inclure les fichiers non suivis dans la remise"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1665 builtin/stash.c:1737
msgid "include ignore files"
msgstr "inclure les fichiers ignorés"
-#: builtin/stash.c:1700
-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]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
-
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
@@ -22930,41 +23578,45 @@
msgid "prepend comment character and space to each line"
msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Nom de référence complet attendu, %s obtenu"
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr "submodule--helper print-default-remote n'accepte aucun argument"
-
-#: builtin/submodule--helper.c:101
+#: builtin/submodule--helper.c:103
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "impossible de supprimer un composant de l'URL '%s'"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:213
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
+"son propre amont d'autorité."
+
+#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:418
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
+#: builtin/submodule--helper.c:640
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:528
#, c-format
msgid "Entering '%s'\n"
msgstr "Entrée dans '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:531
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22973,7 +23625,7 @@
"run_command a retourné un statut non-nul pour %s\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:553
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22984,83 +23636,74 @@
"modules inclus de %s\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:569
msgid "suppress output of entering each submodule command"
msgstr ""
"supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1458
msgid "recurse into nested submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:576
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
-"son propre amont d'autorité."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:654
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:658
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:668
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"attention : nous vous suggérons de spécifier une commande de mode de mise à "
"jour pour le sous-module '%s'\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:675
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
"'%s'"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:697
msgid "suppress output for initializing a submodule"
msgstr "supprimer la sortie lors de l'initialisation d'un sous-module"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:702
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<options>] [<chemin>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
"chemin '%s'"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "impossible de résoudre HEAD dans le sous-module '%s'"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
msgid "suppress submodule status output"
msgstr "supprimer la sortie d'état du sous-module"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:875
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -23068,108 +23711,103 @@
"utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
"du sous-module"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper <nom> <chemin>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:977
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodule)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:980
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodule)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:993
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1043
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "impossible de calculer l'empreinte de l'objet depuis '%s'"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1047
#, c-format
msgid "unexpected mode %o\n"
msgstr "mode %o inattendu\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1288
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
"utiliser le commit stocké dans l'index au lieu de la HEAD du sous-module"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1290
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "comparer le commit dans l'index avec celui dans la HEAD du sous-module"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1292
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "sauter les sous-modules avec la valeur 'ignore_config' à 'all'"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1294
msgid "limit the summary size"
msgstr "limiter la taille du résumé"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1299
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<chemin>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1323
msgid "could not fetch a revision for HEAD"
msgstr "impossible de récupérer une révision pour HEAD"
-#: builtin/submodule--helper.c:1342
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached et --files sont mutuellement exclusifs"
-
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1384
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synchronisation de l'URL sous-module pour '%s'\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1390
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1399
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1409
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1456
msgid "suppress output of synchronizing submodule url"
msgstr ""
"supprimer la sortie lors de la synchronisation de l'URL d'un sous-module"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1463
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1513
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"L'arbre de travail du sous-module '%s' contient un répertoire .git (utilisez "
-"'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
-"historique)"
+"L'arbre de travail du sous-module '%s' contient un répertoire .git. Il sera "
+"remplacé par un fichier .git en utilisant absorbgitdirs."
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1530
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23178,48 +23816,48 @@
"L'arbre de travail du sous-module '%s' contient des modifications locales ; "
"utilisez '-f' pour les annuler"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1538
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Répertoire '%s' nettoyé\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1540
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1551
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "impossible de créer le répertoire vide du sous-module %s"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1567
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1596
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"éliminer les arbres de travail des sous-modules même s'ils contiennent des "
"modifications locales"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1597
msgid "unregister all submodules"
msgstr "désenregistrer tous les sous-modules"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1602
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1616
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1665
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -23231,156 +23869,172 @@
"submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n"
"clonez avec '--reference-if-able' au lieu de '--reference'."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1749
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1756
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1781
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1826
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1831
#, c-format
msgid "directory not empty: '%s'"
msgstr "le répertoire n'est pas vide : '%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1843
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "impossible de créer le répertoire de sous-module pour '%s'"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1876
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1879
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1882
msgid "url where to clone the submodule from"
-msgstr "URL depuis laquelle cloner le sous-module"
+msgstr "url depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
+#: builtin/submodule--helper.c:3376
msgid "force cloning progress"
msgstr "forcer l'affichage de la progression du clonage"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
msgid "disallow cloning into non-empty directory"
msgstr "interdire de cloner dans un répertoire non-vide"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1903
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
-msgstr ""
-"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
-"<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> "
-"--path <chemin>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
+msgstr "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] [--filter <spécificateur-de-filtre>]--url <url> --path <chemin>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1943
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1947
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Impossible de cloner '%s'. Réessai prévu"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
-msgid "path into the working tree"
-msgstr "chemin dans la copie de travail"
+#: builtin/submodule--helper.c:2371
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Impossible d'extraire '%s' dans le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:2347
-msgid "path into the working tree, across nested submodule boundaries"
+#: builtin/submodule--helper.c:2375
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Impossible de rebaser '%s' dans le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:2379
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Impossible de fusionner '%s' dans le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:2383
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "L'exécution de '%s %s' a échoué dans le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:2402
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Chemin de sous-module '%s' : '%s' extrait\n"
+
+#: builtin/submodule--helper.c:2406
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Chemin de sous-module '%s' : rebasé dans '%s'\n"
+
+#: builtin/submodule--helper.c:2410
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Chemin de sous-module '%s' : fusionné dans '%s'\n"
+
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Le chemin de sous-module '%s' : '%s %s'\n"
+
+#: builtin/submodule--helper.c:2438
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr ""
-"chemin dans la copie de travail, traversant les frontières de sous-modules"
+"Impossible de rapatrier dans le chemin de sous-module '%s' ; essai de "
+"rapatriement direct de %s :"
-#: builtin/submodule--helper.c:2351
-msgid "rebase, merge, checkout or none"
-msgstr "valeurs possibles : rebase, merge, checkout ou none"
+#: builtin/submodule--helper.c:2447
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Chemin de sous-module '%s' récupéré, mais il ne contenait pas %s. La "
+"récupération directe de ce commit a échoué."
-#: builtin/submodule--helper.c:2357
-msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr "créer un clone superficiel tronqué au nombre de révisions spécifié"
-
-#: builtin/submodule--helper.c:2360
-msgid "parallel jobs"
-msgstr "jobs parallèles"
-
-#: builtin/submodule--helper.c:2362
-msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "spécifie si le clonage initial doit être aussi superficiel"
-
-#: builtin/submodule--helper.c:2363
-msgid "don't print cloning progress"
-msgstr "ne pas afficher la progression du clonage"
-
-#: builtin/submodule--helper.c:2374
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]"
-
-#: builtin/submodule--helper.c:2387
-msgid "bad value for update parameter"
-msgstr "valeur invalide pour la mise à jour du paramètre"
-
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2481
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23389,147 +24043,302 @@
"La branche du sous-module %s est configurée pour hériter de la branche du "
"superprojet, mais le superprojet n'est sur aucune branche"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2499
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2588
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr ""
+"Impossible de trouver la révision actuelle dans le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:2599
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "Impossible de rapatrier dans le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:2604
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr ""
+"Impossible de trouver la révision %s dans le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:2640
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "Échec de la récursion dans le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:2699
+msgid "force checkout updates"
+msgstr "forcer les mises à jour d'extraction"
+
+#: builtin/submodule--helper.c:2701
+msgid "initialize uninitialized submodules before update"
+msgstr "initialiser les sous-modules non-initialisés avant la mise à jour"
+
+#: builtin/submodule--helper.c:2703
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "utiliser les SHA-1 de la branche de suivi distante du sous-module"
+
+#: builtin/submodule--helper.c:2705
+msgid "traverse submodules recursively"
+msgstr "traverser les sous-modules récursivement"
+
+#: builtin/submodule--helper.c:2707
+msgid "don't fetch new objects from the remote site"
+msgstr "ne pas récupérer les nouveaux objets depuis le site distant"
+
+#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+msgid "path into the working tree"
+msgstr "chemin dans la copie de travail"
+
+#: builtin/submodule--helper.c:2713
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr ""
+"chemin dans la copie de travail, traversant les frontières de sous-modules"
+
+#: builtin/submodule--helper.c:2717
+msgid "rebase, merge, checkout or none"
+msgstr "valeurs possibles : rebase, merge, checkout ou none"
+
+#: builtin/submodule--helper.c:2723
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "créer un clone superficiel tronqué au nombre de révisions spécifié"
+
+#: builtin/submodule--helper.c:2726
+msgid "parallel jobs"
+msgstr "jobs parallèles"
+
+#: builtin/submodule--helper.c:2728
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "spécifie si le clonage initial doit être aussi superficiel"
+
+#: builtin/submodule--helper.c:2729
+msgid "don't print cloning progress"
+msgstr "ne pas afficher la progression du clonage"
+
+#: builtin/submodule--helper.c:2741
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+msgstr ""
+"git submodule [--quiet] update [--init [--filter=<spécificateur-de-filtre>]] "
+"[--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--"
+"[no-]recommend-shallow] [--reference <dépôt>] [--recursive] [--[no-]single-"
+"branch] [--] [<chemin>...]"
+
+#: builtin/submodule--helper.c:2767
+msgid "bad value for update parameter"
+msgstr "valeur invalide pour la mise à jour du paramètre"
+
+#: builtin/submodule--helper.c:2893
msgid "recurse into submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2899
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<options>] [<chemin>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2955
msgid "check if it is safe to write to the .gitmodules file"
msgstr "vérifier si écrire dans le fichier .gitmodules est sur"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2958
msgid "unset the config in the .gitmodules file"
msgstr "désactiver la configuration dans le fichier .gitmodules"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config name [<valeur>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nom>"
-#: builtin/submodule--helper.c:2663
-msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper config --check-writeable"
-
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
+#: builtin/submodule--helper.c:3395
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:2698
+#: builtin/submodule--helper.c:3000
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:2702
+#: builtin/submodule--helper.c:3004
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:3037
msgid "set the default tracking branch to master"
msgstr "régler la branche de suivi par défaut à master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:3039
msgid "set the default tracking branch"
msgstr "régler la branche de suivi par défaut"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:3043
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <chemin>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:3044
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branche> "
"<chemin>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:3051
msgid "--branch or --default required"
msgstr "--branch ou --default requis"
-#: builtin/submodule--helper.c:2752
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch et --default sont mutuellement exclusifs"
+#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+msgid "print only error messages"
+msgstr "afficher seulement les messages d'erreur"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3073
+msgid "force creation"
+msgstr "forcer la création"
+
+#: builtin/submodule--helper.c:3081
+msgid "show whether the branch would be created"
+msgstr "afficher si la branche serait créée"
+
+#: builtin/submodule--helper.c:3085
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <nom> <oid-départ> <nom-de-départ>"
+
+#: builtin/submodule--helper.c:3097
+#, c-format
+msgid "creating branch '%s'"
+msgstr "création de la branche '%s'"
+
+#: builtin/submodule--helper.c:3155
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Ajout du dépôt existant à '%s' dans l'index\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3158
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' existe déjà et n'est pas un dépôt git valide"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3171
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "Un répertoire git pour '%s' est trouvé en local avec le(s) serveur(s) distant(s) :"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr ""
+"Un répertoire git pour '%s' est trouvé en local avec le(s) serveur(s) "
+"distant(s) :\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3178
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
-"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner depuis\n"
+"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner "
+"depuis\n"
" %s\n"
-"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt correct\n"
-"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'.\n"
+"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt "
+"correct\n"
+"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3190
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Réactivation du répertoire git local pour le sous-module '%s'\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3227
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "Impossible d'extraire le sous-module '%s'"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "la branche du dépôt à extraire lors du clonage"
+#: builtin/submodule--helper.c:3266
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Échec d'ajout du sous-module '%s'"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
+#: builtin/submodule--helper.c:3283
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Échec d'enregistrement du sous-module '%s'"
+
+#: builtin/submodule--helper.c:3339
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' existe déjà dans l'index"
+
+#: builtin/submodule--helper.c:3342
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' existe déjà dans l'index et n'est pas un sous-module"
+
+#: builtin/submodule--helper.c:3372
+msgid "branch of repository to add as submodule"
+msgstr "la branche du dépôt à ajouter comme sous-module"
+
+#: builtin/submodule--helper.c:3373
msgid "allow adding an otherwise ignored submodule path"
msgstr "permettre l'ajout des chemins de modules ignorés par ailleurs"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr "git submodule--helper add-clone [<options>...] --url <url> --path <chemin> --name <nom>"
+#: builtin/submodule--helper.c:3379
+msgid "borrow the objects from reference repositories"
+msgstr "emprunter les objets depuis des dépôts de références"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3381
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"configurer le nom du sous-module avec la chaîne fournie au lieu d'utiliser "
+"par défaut son chemin"
+
+#: builtin/submodule--helper.c:3388
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<options>] [--] <dépôt> [<chemin>]"
+
+#: builtin/submodule--helper.c:3416
+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"
+
+#: builtin/submodule--helper.c:3425
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "l'URL de dépôt : '%s' doit être absolu ou commencer par ./|../"
+
+#: builtin/submodule--helper.c:3460
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' n'est pas un nom valide de sous-module"
+
+#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s ne gère pas --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3526
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr "git symbolic-ref [<options>] nom [<référence>]"
+msgstr "git symbolic-ref [<options>] <nom> [<référence>]"
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
@@ -23548,53 +24357,53 @@
msgid "shorten ref output"
msgstr "raccourcir l'affichage de la référence"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "raison"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "raison de la mise à jour"
-#: builtin/tag.c:25
+#: builtin/tag.c:26
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <fichier>]\n"
-"\t\t<nom-étiquette> [<head>]"
-
-#: builtin/tag.c:27
-msgid "git tag -d <tagname>..."
-msgstr "git tag -d <nométiquette>..."
+"git tag [-a | -s | -u <id-clé>] [-f] [-m <msg> | -F <fichier>]\n"
+" <nom-d-étiquette> [<tête>]"
#: builtin/tag.c:28
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <nom-d-étiquette>..."
+
+#: builtin/tag.c:29
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <objet>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<motif>...]"
-#: builtin/tag.c:30
+#: builtin/tag.c:31
msgid "git tag -v [--format=<format>] <tagname>..."
-msgstr "git tag -v [--format=<format>] <nométiquette>..."
+msgstr "git tag -v [--format=<format>] <nom-d-étiquette>..."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "tag '%s' not found."
msgstr "étiquette '%s' non trouvée."
-#: builtin/tag.c:135
+#: builtin/tag.c:136
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
-#: builtin/tag.c:170
+#: builtin/tag.c:171
#, c-format
msgid ""
"\n"
@@ -23607,7 +24416,7 @@
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/tag.c:174
+#: builtin/tag.c:175
#, c-format
msgid ""
"\n"
@@ -23645,135 +24454,115 @@
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, 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:446
+#: builtin/tag.c:445
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
-#: builtin/tag.c:448
+#: builtin/tag.c:447
msgid "print <n> lines of each tag message"
msgstr "affiche <n> lignes de chaque message d'étiquette"
-#: builtin/tag.c:450
+#: builtin/tag.c:449
msgid "delete tags"
msgstr "supprimer des étiquettes"
-#: builtin/tag.c:451
+#: builtin/tag.c:450
msgid "verify tags"
msgstr "vérifier des étiquettes"
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "Tag creation options"
msgstr "Options de création de l'étiquette"
-#: builtin/tag.c:455
+#: builtin/tag.c:454
msgid "annotated tag, needs a message"
msgstr "étiquette annotée, nécessite un message"
-#: builtin/tag.c:457
+#: builtin/tag.c:456
msgid "tag message"
msgstr "message pour l'étiquette"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
msgid "force edit of tag message"
msgstr "forcer l'édition du message d'étiquetage"
-#: builtin/tag.c:460
+#: builtin/tag.c:459
msgid "annotated and GPG-signed tag"
msgstr "étiquette annotée et signée avec GPG"
-#: builtin/tag.c:463
+#: builtin/tag.c:462
msgid "use another key to sign the tag"
msgstr "utiliser une autre clé pour signer l'étiquette"
-#: builtin/tag.c:464
+#: builtin/tag.c:463
msgid "replace the tag if exists"
msgstr "remplacer l'étiquette si elle existe"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:464 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "créer un reflog"
-#: builtin/tag.c:467
+#: builtin/tag.c:466
msgid "Tag listing options"
msgstr "Options d'affichage des étiquettes"
-#: builtin/tag.c:468
+#: builtin/tag.c:467
msgid "show tag list in columns"
msgstr "afficher la liste des étiquettes sous forme de colonnes"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that contain the commit"
msgstr "afficher seulement les étiquettes qui contiennent la validation"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:469 builtin/tag.c:471
msgid "print only tags that don't contain the commit"
msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
-#: builtin/tag.c:473
+#: builtin/tag.c:472
msgid "print only tags that are merged"
msgstr "afficher seulement les étiquettes qui sont fusionnées"
-#: builtin/tag.c:474
+#: builtin/tag.c:473
msgid "print only tags that are not merged"
msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
-#: builtin/tag.c:478
+#: builtin/tag.c:477
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column et -n sont incompatibles"
+#: builtin/tag.c:559
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "l'option '%s' est autorisée seulement en mode de liste"
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "l'option -n est autorisée seulement en mode de liste"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "l'option --contains est autorisée seulement en mode de liste"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "l'option --no-contains est autorisée seulement en mode liste"
-
-#: builtin/tag.c:554
-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:556
-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:567
-msgid "only one -F or -m option is allowed."
-msgstr "une seule option -F ou -m est autorisée."
-
-#: builtin/tag.c:592
+#: builtin/tag.c:598
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:597
+#: builtin/tag.c:603
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:628
+#: builtin/tag.c:634
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
+#: builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "le paquet dépasse la taille maximale permise"
+
#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr "Dépaquetage des objets"
@@ -23783,225 +24572,220 @@
msgid "failed to create directory %s"
msgstr "échec de la création du répertoire %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "échec de la création du fichier %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "échec de la suppression du fichier %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "échec de la suppression du répertoire %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Test du mtime dans '%s' "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr ""
"l'information de stat du répertoire ne change pas après ajout d'un fichier"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"l'information de stat du répertoire ne change pas après ajout d'un répertoire"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr ""
"l'information de stat du répertoire change après mise à jour d'un fichier"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"l'information de stat du répertoire change après l'ajout d'un fichier dans "
"un sous-répertoire"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr ""
"l'information de stat du répertoire ne change pas après la suppression d'un "
"fichier<"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"l'information de stat du répertoire ne change pas après la suppression d'un "
"répertoire"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<options>] [--] [<fichier>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:993
msgid "continue refresh even when index needs update"
msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:996
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:999
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:1001
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1003
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:1005
msgid "refresh even if index contains unmerged entries"
msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1008
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1012
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1016
msgid "<mode>,<object>,<path>"
msgstr "<mode>, <objet>, <chemin>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1017
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1027
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1030
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1033
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1036
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1039
msgid "do not touch index-only entries"
msgstr "ne pas toucher aux entrées restreintes à l'index"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1041
msgid "add to index only; do not add content to object database"
msgstr ""
"ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
"données des objets"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1043
msgid "remove named paths even if present in worktree"
msgstr ""
"supprimer les chemins nommés même s'ils sont présents dans la copie de "
"travail"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1045
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1047
msgid "read list of paths to be updated from standard input"
msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1051
msgid "add entries from standard input to the index"
msgstr "ajouter les éléments depuis l'entrée standard à l'index"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1055
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1059
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1063
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1066
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1068
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1072
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1074
msgid "enable or disable split index"
-msgstr "activer ou désactiver l'index divisé"
+msgstr "activer ou désactiver l'index scindé"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1076
msgid "enable/disable untracked cache"
msgstr "activer ou désactiver le cache de non-suivis"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1078
msgid "test if the filesystem supports untracked cache"
msgstr "tester si le système de fichier supporte le cache de non-suivis"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1080
msgid "enable untracked cache without testing the filesystem"
msgstr "activer le cache de non-suivis sans tester le système de fichier"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1082
msgid "write out the index even if is not flagged as changed"
msgstr "écrire l'index même s'il n'est pas marqué comme modifié"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1084
msgid "enable or disable file system monitor"
msgstr ""
"activer ou désactiver la surveillance du système de fichier (fsmonitor)"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1086
msgid "mark files as fsmonitor valid"
msgstr "marquer les fichiers comme valides pour fsmonitor"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1089
msgid "clear fsmonitor valid bit"
msgstr "effacer le bit de validité fsmonitor"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1195
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
-"souhaitez vraiment activer l'index coupé"
+"souhaitez vraiment activer l'index scindé"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1204
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
-"souhaitez vraiment désactiver l'index coupé"
+"souhaitez vraiment désactiver l'index scindé"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1216
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -24009,11 +24793,11 @@
"core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous "
"souhaitez vraiment désactiver le cache des fichiers non-suivis"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1220
msgid "Untracked cache disabled"
msgstr "Le cache non suivi est désactivé"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1228
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -24021,29 +24805,29 @@
"core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous "
"souhaitez vraiment activer le cache des fichiers non-suivis"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1232
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Le cache non suivi est activé pour '%s'"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1241
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment "
"activer la surveillance du système de fichiers"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1246
msgid "fsmonitor enabled"
msgstr "fsmonitor activé"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1250
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous "
"souhaitez vraiment désactiver la surveillance du système de fichiers"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1254
msgid "fsmonitor disabled"
msgstr "fsmonitor désactivé"
@@ -24061,26 +24845,22 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<options>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "supprimer la référence"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
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:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "l'entrée standard a des arguments qui se terminent par NUL"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "lire les mises à jour depuis l'entrée standard"
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "mettre à jour les fichiers d'information à partir de zéro"
@@ -24089,20 +24869,20 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<options>] <répertoire>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "quitter après un unique échange requête/réponse"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "sortir immédiatement après l'annonce initiale des références"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "servir l'information et les références pour git-http-backend"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"ne pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire Git"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrompre le transfert après <n> secondes d'inactivité"
@@ -24138,63 +24918,62 @@
msgid "print tag contents"
msgstr "afficher le contenu de l'étiquette"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<options>] <chemin> [<commit>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<options>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<options>] <chemin>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<options>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<options>] <arbre-de-travail>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [<chemin>...]"
+
+#: builtin/worktree.c:26
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <chemin>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "échec de la suppression de '%s'"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:76
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Suppression de %s/%s : %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "afficher les arbres de travail éliminés"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "faire expirer les arbres de travail plus vieux que <temps>"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:230
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "arbre de travail destination '%s' inutilisable"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:235
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -24204,7 +24983,7 @@
"utilisez '%s -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' "
"pour corriger"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:237
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -24213,149 +24992,159 @@
"'%s' est un arbre de travail manquant mais déjà enregistré ;\n"
"utilisez '%s -f' pour passer outre, ou 'prune' ou 'remove' pour corriger"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:248
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr ""
+"échec de la copie de '%s' vers '%s' ; les extractions clairsemées pourraient "
+"ne pas fonctionner correctement"
+
+#: builtin/worktree.c:268
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr ""
+"impossible de copier la configuration d'arbre de travail de '%s' vers '%s'"
+
+#: builtin/worktree.c:280 builtin/worktree.c:285
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "échec de désinitialisation de '%s' dans '%s'"
+
+#: builtin/worktree.c:356
#, c-format
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:378
msgid "initializing"
msgstr "initialisation"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:492 builtin/worktree.c:498
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:494
#, 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:431
+#: builtin/worktree.c:503
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Préparation de l'arbre de travail (extraction de '%s')"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:509
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Préparation de l'arbre de travail (HEAD détachée %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:554
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:485
+#: builtin/worktree.c:557
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:559
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:561
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:562
msgid "keep the new working tree locked"
msgstr "conserver le verrou sur le nouvel arbre de travail"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:564 builtin/worktree.c:809
msgid "reason for locking"
msgstr "raison du verrouillage"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:567
msgid "set up tracking mode (see git-branch(1))"
msgstr "régler le mode de suivi (voir git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:570
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:506
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B et --detach sont mutuellement exclusifs"
-
-#: builtin/worktree.c:508
-msgid "--reason requires --lock"
-msgstr "--reason exige --lock"
-
-#: builtin/worktree.c:512
+#: builtin/worktree.c:584
msgid "added with --lock"
msgstr "ajouté avec --lock"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:646
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:691
+#: builtin/worktree.c:766
msgid "show extended annotations and reasons, if available"
msgstr "afficher les annotations étendues et les raisons, si disponible"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:768
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
"ajouter l'annotation 'prunable' aux arbres de travail plus vieux que <temps>"
-#: builtin/worktree.c:702
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose et --porcelain sont mutuellement exclusifs"
+#: builtin/worktree.c:770
+msgid "terminate records with a NUL character"
+msgstr "terminer les enregistrements par un caractère NUL"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
+#: builtin/worktree.c:1052
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' n'est pas une copie de travail"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:823 builtin/worktree.c:856
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:748
+#: builtin/worktree.c:828
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' est déjà verrouillé, car '%s'"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:830
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' est déjà verrouillé"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:858
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:899
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:827
+#: builtin/worktree.c:907
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:850 builtin/worktree.c:974
+#: builtin/worktree.c:930 builtin/worktree.c:1054
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' est un arbre de travail principal"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:935
#, 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:868
+#: builtin/worktree.c:948
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -24365,7 +25154,7 @@
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:950
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -24373,39 +25162,39 @@
"impossible de déplacer un arbre de travail verrouillé;\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:953
#, 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:878
+#: builtin/worktree.c:958
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "échec au déplacement de '%s' vers '%s'"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:1004
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "échec du lancement de 'git status' sur '%s'"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:1008
#, 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:933
+#: builtin/worktree.c:1013
#, 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:956
+#: builtin/worktree.c:1036
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:979
+#: builtin/worktree.c:1059
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -24415,7 +25204,7 @@
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:1061
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -24423,18 +25212,18 @@
"impossible de supprimer un arbre de travail verrouillé;\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:1064
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
"la validation a échoué, impossible de supprimer l'arbre de travail : %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1088
#, c-format
msgid "repair: %s: %s"
msgstr "réparation : %s : '%s'"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1091
#, c-format
msgid "error: %s: %s"
msgstr "erreur : %s : %s"
@@ -24487,21 +25276,16 @@
"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:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "aucun répertoire fourni pour --git-dir\n"
+msgid "no directory given for '%s' option\n"
+msgstr "aucun répertoire fourni pour l'option '%s'\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "aucun espace de nom fournit pour --namespace\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "aucun répertoire fourni pour --work-tree\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
@@ -24517,11 +25301,6 @@
msgid "no config key given for --config-env\n"
msgstr "aucune clé de configuration fournie pour --config-env\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "aucun répertoire fourni pour -C\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
@@ -24551,29 +25330,29 @@
msgid "recursive alias: %s"
msgstr "alias recursif : %s"
-#: git.c:476
+#: git.c:480
msgid "write failure on standard output"
msgstr "échec d'écriture sur la sortie standard"
-#: git.c:478
+#: git.c:482
msgid "unknown write failure on standard output"
msgstr "échec inconnu d'écriture sur la sortie standard"
-#: git.c:480
+#: git.c:484
msgid "close failed on standard output"
msgstr "échec de fermeture de la sortie standard"
-#: git.c:833
+#: git.c:838
#, 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:883
+#: git.c:888
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "impossible d'utiliser %s comme une fonction intégrée"
-#: git.c:896
+#: git.c:901
#, c-format
msgid ""
"usage: %s\n"
@@ -24582,34 +25361,26 @@
"usage : %s\n"
"\n"
-#: git.c:916
+#: git.c:921
#, 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:928
+#: git.c:933
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "échec au lancement de la commande '%s' : %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr "l'argument de --packfile doit être une empreinte valide ('%s' reçu)"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "pas un dépôt git"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile nécessite --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args ne peut être utilisé qu'avec --packfile"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "options non gérées"
@@ -24635,68 +25406,34 @@
msgid "exit immediately after advertising capabilities"
msgstr "sortir immédiatement après l'annonce des capacités"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "socket/pipe déjà en cours d'utilisation : '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "impossible de démarrer les serveur sur : '%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "échec du lancement d'un daemon en tâche de fond"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "échec du waitpid"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "daemon pas encore en ligne"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "échec du démarrage du daemon"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid est embrouillé"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "le daemon n'est pas encore arrêté"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc-is-active [<nom>] [<options>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<nom>] [<fils-d'exécution>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
"test-helper simple-ipc start-daemon [<nom>] [<fils-d'exécution>] [<attente-"
"max>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<nom>] [<attente-max>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<nom>] [<jeton>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr ""
"test-helper simple-ipc sendbytes [<nom>] [<nombre-d'octets>] [<octets>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24704,87 +25441,83 @@
"test-helper simple-ipc multiple [<nom>] [<fils-d'exécution>] [<nombre-"
"d'octets>] [<taille-de-lot>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "nom ou nom de chemin du socket unix"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "nom du pipe nommé"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr ""
"nombre de fils d'exécution dans le réservoir de fils d'exécution du serveur"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "nombre de secondes à attendre que le daemon démarre ou s'arrête"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "nombre d'octets"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "nombre de requêtes par fil d'exécution"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "octet"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "caractère ballast"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "jeton"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "jeton de commande à envoyer au serveur"
-#: http.c:399
+#: http.c:350
#, 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:420
+#: http.c:371
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: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:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE n'est pas supporté avec cuRL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Les restrictions de protocole ne sont pas supportés avec cuRL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :"
-#: http.c:1139
+#: http.c:1023
#, 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:1143
+#: http.c:1027
#, 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:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24795,140 +25528,330 @@
" demandé : %s\n"
" redirection : %s"
-#: remote-curl.c:183
+#: remote-curl.c:184
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "citation invalide dans la valeur push-option : '%s'"
-#: remote-curl.c:307
+#: remote-curl.c:308
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs n'est pas valide : est-ce bien un dépôt git ?"
-#: remote-curl.c:408
+#: remote-curl.c:409
msgid "invalid server response; expected service, got flush packet"
msgstr "réponse du serveur invalide ; service attendu, paquet de vidage reçu"
-#: remote-curl.c:439
+#: remote-curl.c:440
#, c-format
msgid "invalid server response; got '%s'"
msgstr "réponse du serveur invalide ; '%s' reçu"
-#: remote-curl.c:499
+#: remote-curl.c:500
#, c-format
msgid "repository '%s' not found"
msgstr "dépôt '%s' non trouvé"
-#: remote-curl.c:503
+#: remote-curl.c:504
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Échec d'authentification pour '%s'"
-#: remote-curl.c:507
+#: remote-curl.c:508
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+"impossible d'accéder à '%s' avec la configuration http.pinnedPubkey : %s"
+
+#: remote-curl.c:512
#, c-format
msgid "unable to access '%s': %s"
msgstr "impossible d'accéder à '%s' : %s"
-#: remote-curl.c:513
+#: remote-curl.c:518
#, c-format
msgid "redirecting to %s"
msgstr "redirection vers %s"
-#: remote-curl.c:644
+#: remote-curl.c:649
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "ne devrait pas recevoir OEF quand on n'est pas gentil sur EOF"
-#: remote-curl.c:656
+#: remote-curl.c:661
msgid "remote server sent unexpected response end packet"
msgstr "le serveur distant a envoyé un paquet de fin de réponse inattendu"
-#: remote-curl.c:726
+#: remote-curl.c:730
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"impossible de rembobiner le données post rpc - essayer d'augmenter http."
"postBuffer"
-#: remote-curl.c:756
+#: remote-curl.c:759
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl : mauvais caractère de longueur de ligne : %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:761
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl : paquet de fin de réponse inattendu"
-#: remote-curl.c:834
+#: remote-curl.c:837
#, c-format
msgid "RPC failed; %s"
msgstr "échec RPC ; %s"
-#: remote-curl.c:874
+#: remote-curl.c:877
msgid "cannot handle pushes this big"
msgstr "impossible de gérer des poussées aussi grosses"
-#: remote-curl.c:989
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "impossible de compresser la requête ; erreur de compression zlib %d"
-#: remote-curl.c:993
+#: remote-curl.c:994
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "impossible de compresser la requête ; erreur de fin zlib %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1044
#, c-format
msgid "%d bytes of length header were received"
msgstr "%d octets de longueur d'entête ont été reçus"
-#: remote-curl.c:1045
+#: remote-curl.c:1046
#, c-format
msgid "%d bytes of body are still expected"
msgstr "%d octets de corps sont encore attendus"
-#: remote-curl.c:1134
+#: remote-curl.c:1135
msgid "dumb http transport does not support shallow capabilities"
msgstr "le protocole http idiot ne supporte la capacité superficielle"
-#: remote-curl.c:1149
+#: remote-curl.c:1150
msgid "fetch failed."
msgstr "échec du récupération."
-#: remote-curl.c:1195
+#: remote-curl.c:1198
msgid "cannot fetch by sha1 over smart http"
msgstr "impossible de récupérer par sha1 sur http intelligent"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1242 remote-curl.c:1248
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1260 remote-curl.c:1378
#, c-format
msgid "http transport does not support %s"
msgstr "le transport http ne supporte pas %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1296
msgid "git-http-push failed"
msgstr "échec de git-http-push"
-#: remote-curl.c:1481
+#: remote-curl.c:1485
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: usage: git remote-curl <distant> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1517
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl : erreur de lecture du flux de commande depuis git"
-#: remote-curl.c:1520
+#: remote-curl.c:1524
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl : récupération tentée sans dépôt local"
-#: remote-curl.c:1561
+#: remote-curl.c:1565
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl : commande inconnue '%s' depuis git"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "répertoire de travail nécessaire"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "impossible de trouver la racine d'enrôlement"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
+#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "impossible de basculer vers '%s'"
+
+#: contrib/scalar/scalar.c:179
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "impossible de configurer %s=%s"
+
+#: contrib/scalar/scalar.c:197
+msgid "could not configure log.excludeDecoration"
+msgstr "impossible de configurer log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:218
+msgid "Scalar enlistments require a worktree"
+msgstr "Les enrôlements scalaires requièrent un arbre de travail"
+
+#: contrib/scalar/scalar.c:310
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "la HEAD distante n'est pas une branche : '%.*s'"
+
+#: contrib/scalar/scalar.c:316
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"échec de récupération de la branche par défaut depuis le distant ; "
+"utilisation de la valeur par défaut locale"
+
+#: contrib/scalar/scalar.c:329
+msgid "failed to get default branch name"
+msgstr "échec de l'obtention du nom de branche par défaut"
+
+#: contrib/scalar/scalar.c:340
+msgid "failed to unregister repository"
+msgstr "échec du désenregistrement du dépôt"
+
+#: contrib/scalar/scalar.c:355
+msgid "failed to delete enlistment directory"
+msgstr "échec de la suppression du répertoire d'enrôlement"
+
+#: contrib/scalar/scalar.c:375
+msgid "branch to checkout after clone"
+msgstr "branche à extraire après le clonage"
+
+#: contrib/scalar/scalar.c:377
+msgid "when cloning, create full working directory"
+msgstr "lors d'un clonage, créer un répertoire de travail complet"
+
+#: contrib/scalar/scalar.c:379
+msgid "only download metadata for the branch that will be checked out"
+msgstr "ne télécharger les méta-données que pour la branche qui sera extraite"
+
+#: contrib/scalar/scalar.c:384
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<options>] [--] <dépôt> [<répertoire>]"
+
+#: contrib/scalar/scalar.c:409
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "impossible de déduire le nom de l'arbre de travail depuis '%s'"
+
+#: contrib/scalar/scalar.c:418
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "le répertoire '%s' existe déjà"
+
+#: contrib/scalar/scalar.c:445
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "échec d'obtention de la branche par défaut pour '%s'"
+
+#: contrib/scalar/scalar.c:456
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "impossible de paramétrer le distant dans '%s'"
+
+#: contrib/scalar/scalar.c:465
+#, c-format
+msgid "could not configure '%s'"
+msgstr "impossible de configurer '%s'"
+
+#: contrib/scalar/scalar.c:468
+msgid "partial clone failed; attempting full clone"
+msgstr "échec du clonage partiel ; tentative de clonage complet"
+
+#: contrib/scalar/scalar.c:472
+msgid "could not configure for full clone"
+msgstr "impossible de configurer pour le clonage complet"
+
+#: contrib/scalar/scalar.c:504
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` n'accepte pas d'argument"
+
+#: contrib/scalar/scalar.c:517
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enrôlement>]"
+
+#: contrib/scalar/scalar.c:544
+msgid "reconfigure all registered enlistments"
+msgstr "reconfigurer tous les enrôlements enregistrés"
+
+#: contrib/scalar/scalar.c:548
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scala reconfigure [--all|<enrôlement>]"
+
+#: contrib/scalar/scalar.c:566
+msgid "--all or <enlistment>, but not both"
+msgstr "--all ou <enrôlement>, mais pas les deux"
+
+#: contrib/scalar/scalar.c:581
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "dépôt git parti dans '%s'"
+
+#: contrib/scalar/scalar.c:621
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <tâche> [<enrôlement>]\n"
+"Tâches :\n"
+
+#: contrib/scalar/scalar.c:639
+#, c-format
+msgid "no such task: '%s'"
+msgstr "pas de tâche : '%s'"
+
+#: contrib/scalar/scalar.c:689
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enrôlement>]"
+
+#: contrib/scalar/scalar.c:736
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enrôlement>"
+
+#: contrib/scalar/scalar.c:751
+msgid "refusing to delete current working directory"
+msgstr "refus de la suppression du répertoire de travail actuel"
+
+#: contrib/scalar/scalar.c:766
+msgid "include Git version"
+msgstr "inclure la version Git"
+
+#: contrib/scalar/scalar.c:768
+msgid "include Git's build options"
+msgstr "inclure les options de construction de Git"
+
+#: contrib/scalar/scalar.c:772
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:813
+msgid "-C requires a <directory>"
+msgstr "-C requiert un <répertoire>"
+
+#: contrib/scalar/scalar.c:815
+#, c-format
+msgid "could not change to '%s'"
+msgstr "échec de modification en '%s'"
+
+#: contrib/scalar/scalar.c:821
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c exige un argument <clé>=<valeur>"
+
+#: contrib/scalar/scalar.c:839
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <répertoire>] [-c <clé>=<valeur>] <commande> [<options>]\n"
+"\n"
+"Commandes :\n"
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr "aucune information de compilateur disponible\n"
@@ -24937,54 +25860,54 @@
msgid "no libc information available\n"
msgstr "aucune information de libc disponible\n"
-#: list-objects-filter-options.h:94
+#: list-objects-filter-options.h:126
msgid "args"
msgstr "args"
-#: list-objects-filter-options.h:95
+#: list-objects-filter-options.h:127
msgid "object filtering"
msgstr "filtrage d'objet"
-#: parse-options.h:184
+#: parse-options.h:188
msgid "expiry-date"
msgstr "date-d'expiration"
-#: parse-options.h:198
+#: parse-options.h:202
msgid "no-op (backward compatibility)"
msgstr "sans action (rétrocompatibilité)"
-#: parse-options.h:310
+#: parse-options.h:341
msgid "be more verbose"
msgstr "être plus verbeux"
-#: parse-options.h:312
+#: parse-options.h:343
msgid "be more quiet"
msgstr "être plus silencieux"
-#: parse-options.h:318
+#: parse-options.h:349
msgid "use <n> digits to display object names"
msgstr "utiliser <n> chiffres pour afficher les noms des objets"
-#: parse-options.h:337
+#: parse-options.h:368
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: parse-options.h:338
+#: parse-options.h:369
msgid "read pathspec from file"
msgstr "lire les spécificateurs de fichier depuis fichier"
-#: parse-options.h:339
+#: parse-options.h:370
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"avec --pathspec-from-file, les spécificateurs de chemin sont séparés par un "
"caractère NUL"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "key"
msgstr "clé"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
@@ -25059,17 +25982,17 @@
msgstr "Afficher les noms canoniques et les adresses courriel des contacts"
#: command-list.h:65
+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:66
msgid "Switch branches or restore working tree files"
msgstr "Basculer de branche ou restaurer la copie de travail"
-#: command-list.h:66
+#: command-list.h:67
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: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"
@@ -25238,43 +26161,43 @@
msgstr "Afficher l'information d'aide à propos de Git"
#: command-list.h:108
+msgid "Run git hooks"
+msgstr "Lance les crochets git"
+
+#: command-list.h:109
msgid "Server side implementation of Git over HTTP"
msgstr "Implantation côté serveur de Git sur HTTP"
-#: command-list.h:109
+#: command-list.h:110
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:110
+#: command-list.h:111
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:111
+#: command-list.h:112
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:112
+#: command-list.h:113
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:113
+#: command-list.h:114
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:114
+#: command-list.h:115
msgid "Instantly browse your working repository in gitweb"
msgstr "Naviguer instantanément votre dépôt de travail dans gitweb"
-#: command-list.h:115
+#: command-list.h:116
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:116
-msgid "The Git repository browser"
-msgstr "Le navigateur de dépôt Git"
-
#: command-list.h:117
msgid "Show commit logs"
msgstr "Afficher l'historique des validations"
@@ -25328,27 +26251,27 @@
msgstr "Le programme assistant standard à utiliser avec git-merge-index"
#: command-list.h:129
+msgid "Show three-way merge without touching index"
+msgstr "Afficher la fusion à trois points sans modifier l'index"
+
+#: command-list.h:130
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:130
-msgid "Show three-way merge without touching index"
-msgstr "Afficher la fusion à trois points sans modifier l'index"
-
#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Écrire et vérifier les index multi-paquet"
-
-#: command-list.h:132
msgid "Creates a tag object with extra validation"
msgstr "Créer un objet étiquette avec validation supplémentaire"
-#: command-list.h:133
+#: command-list.h:132
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Construire un objet arbre depuis une texte formaté comme ls-tree"
+#: command-list.h:133
+msgid "Write and verify multi-pack-indexes"
+msgstr "Écrire et vérifier les index multi-paquet"
+
#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique"
@@ -25452,17 +26375,17 @@
msgstr "Restaurer les fichiers l'arbre de travail"
#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Inverser des commits existants"
-
-#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
msgstr "Afficher les objets commit dans l'ordre chronologique inverse"
-#: command-list.h:161
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "Analyser et préparer les paramètres"
+#: command-list.h:161
+msgid "Revert some existing commits"
+msgstr "Inverser des commits existants"
+
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr "Supprimer des fichiers de la copie de travail et de l'index"
@@ -25476,49 +26399,49 @@
msgstr "Pousser les objets sur un autre dépôt via le protocole Git"
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
-msgstr "Shell de login restreint pour un accès SSH vers Git seulement"
-
-#: command-list.h:166
-msgid "Summarize 'git log' output"
-msgstr "Résumer la sortie de 'git log'"
-
-#: command-list.h:167
-msgid "Show various types of objects"
-msgstr "Afficher différents types d'objets"
-
-#: command-list.h:168
-msgid "Show branches and their commits"
-msgstr "Afficher les branches et leurs commits"
-
-#: command-list.h:169
-msgid "Show packed archive index"
-msgstr "Afficher l'index de l'archive empaquetée"
-
-#: command-list.h:170
-msgid "List references in a local repository"
-msgstr "Lister les références du dépôt local"
-
-#: command-list.h:171
msgid "Git's i18n setup code for shell scripts"
msgstr "Le code d'initialisation i18n pour les scripts shell"
-#: command-list.h:172
+#: command-list.h:166
msgid "Common Git shell script setup code"
msgstr "Le code d'initialisation commun aux scripts shell Git"
+#: command-list.h:167
+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:168
+msgid "Summarize 'git log' output"
+msgstr "Résumer la sortie de 'git log'"
+
+#: command-list.h:169
+msgid "Show various types of objects"
+msgstr "Afficher différents types d'objets"
+
+#: command-list.h:170
+msgid "Show branches and their commits"
+msgstr "Afficher les branches et leurs commits"
+
+#: command-list.h:171
+msgid "Show packed archive index"
+msgstr "Afficher l'index de l'archive empaquetée"
+
+#: command-list.h:172
+msgid "List references in a local repository"
+msgstr "Lister les références du dépôt local"
+
#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
-msgstr "Initialiser et modifier l'extraction clairsemée"
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr "Réduit votre arbre de travail à un sous-ensemble de fichiers suivis"
#: command-list.h:174
-msgid "Stash the changes in a dirty working directory away"
-msgstr "Remiser les modifications d'un répertoire de travail sale"
-
-#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Ajouter le contenu de fichiers à l'index"
+#: command-list.h:175
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Remiser les modifications d'un répertoire de travail sale"
+
#: command-list.h:176
msgid "Show the working tree status"
msgstr "Afficher l'état de la copie de travail"
@@ -25596,65 +26519,65 @@
msgstr "Vérifier la signature GPG d'étiquettes"
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Interface web de Git"
-
-#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "Afficher les journaux avec la différence que chaque commit introduit"
-#: command-list.h:196
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "Gérer des arbres de travail multiples"
-#: command-list.h:197
+#: 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:198
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: command-list.h:199
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Interface en ligne de commande et conventions de Git"
-#: command-list.h:200
+#: 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:201
+#: command-list.h:200
msgid "Providing usernames and passwords to Git"
msgstr "Fourniture des noms d'utilisateurs et des mots de passe à Git"
-#: command-list.h:202
+#: command-list.h:201
msgid "Git for CVS users"
msgstr "Git pour les utilisateurs de CVS"
-#: command-list.h:203
+#: command-list.h:202
msgid "Tweaking diff output"
msgstr "Bidouillage de la sortie diff"
-#: command-list.h:204
+#: command-list.h:203
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:205
+#: command-list.h:204
msgid "Frequently asked questions about using Git"
msgstr "Foire aux questions sur l'utilisation de Git"
-#: command-list.h:206
+#: command-list.h:205
msgid "A Git Glossary"
msgstr "Un glossaire Git"
-#: command-list.h:207
+#: command-list.h:206
msgid "Hooks used by Git"
msgstr "Crochets utilisés par Git"
-#: command-list.h:208
+#: command-list.h:207
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
+#: command-list.h:208
+msgid "The Git repository browser"
+msgstr "Le navigateur de dépôt Git"
+
#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
msgstr ""
@@ -25685,52 +26608,21 @@
msgstr "Montage d'un dépôt dans un autre dépôt"
#: command-list.h:216
-msgid "A tutorial introduction to Git: part two"
-msgstr "Une introduction pratique à Git : deuxième partie"
-
-#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "Une introduction pratique à Git"
+#: command-list.h:217
+msgid "A tutorial introduction to Git: part two"
+msgstr "Une introduction pratique à Git : deuxième partie"
+
#: command-list.h:218
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interface web de Git"
+
+#: command-list.h:219
msgid "An overview of recommended workflows with Git"
msgstr "Un aperçu des flux de travail recommandés avec Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "la bissection a échoué : aucune commande fournie."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "lancement de $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"la bissection a échoué :\n"
-"le code retour $res de '$command' est < 0 ou >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "la bissection ne peut plus continuer"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"la bissection a échoué :\n"
-"'bisect-state $state' a retourné le code erreur $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "succès de la bissection"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25771,523 +26663,50 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "La fusion simple a échoué, essai avec la fusion automatique."
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
-"travail"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "l'URL de dépôt : '$repo' doit être absolu ou commencer par ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' existe déjà dans l'index"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' n'a pas de commit extrait"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Échec d'ajout du sous-module '$sm_path'"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-
-#: git-submodule.sh:532
-#, 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:542
-#, 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:547
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr ""
-"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
-"chemin de sous-module '$sm_path'"
-
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai "
-"de rapatriement direct de $sha1 :"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas "
-"$sha1. La récupération directe de ce commit a échoué."
-
-#: git-submodule.sh:578
-#, 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:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-
-#: git-submodule.sh:583
-#, 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:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-
-#: git-submodule.sh:589
-#, 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:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-
-#: git-submodule.sh:595
-#, 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:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-
-#: git-submodule.sh:627
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Autoremisage appliqué."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Impossible de stocker $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"L'application de l'autoremisage a provoqué des conflits\n"
-"Vos modifications sont à l'abri dans la remise.\n"
-"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Rebasage ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Commandes :\n"
-" p, pick <commit> = utiliser le commit\n"
-" r, reword <commit> = utiliser le commit, mais reformuler son message\n"
-" e, edit <commit> = utiliser le commit, mais s'arrêter pour le modifier\n"
-" s, squash <commit> = utiliser le commit, mais le fusionner avec le "
-"précédent\n"
-" f, fixup <commit> = comme \"squash\", mais en éliminant son message\n"
-" x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n"
-" d, drop <commit> = supprimer le commit\n"
-" l, label <label> = étiqueter la HEAD courante avec un nom\n"
-" t, reset <label> = réinitialiser HEAD à label\n"
-" m, merge [-C <commit> | -c <commit>] <label> [# <uniligne>]\n"
-" créer un commit de fusion utilisant le message de fusion original\n"
-" (ou l'uniligne, si aucun commit de fusion n'a été spécifié).\n"
-" Utilisez -c <commit> pour reformuler le message de validation.\n"
-"\n"
-"Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Vous pouvez corriger le commit maintenant, avec\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"après avoir réalisé vos modifications, lancez\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1 n'est pas un commit qui peut être picorer"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nom de commit invalide : $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Avance rapide sur $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Avance rapide impossible sur $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Impossible de déplacer HEAD sur $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Refus d'écraser un commit de fusion: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Erreur lors de la réapplication de la fusion $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Impossible de picorer $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Ceci est le ${n}ième message de validation :"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Le message de validation ${n} sera ignoré :"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Ceci est la combinaison de $count commit."
-msgstr[1] "Ceci est la combinaison de $count commits."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Impossible d'écrire $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Ceci est la combinaison de 2 commits."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Impossible d'appliquer $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Impossible de corriger le commit après avoir réussi à picorer $sha1... "
-"$rest\n"
-"C'est probablement dû à un message de validation vide ou le crochet pre-"
-"commit\n"
-"a échoué. Si le crochet pre-commit a échoué, vous devez peut-être résoudre "
-"le\n"
-"problème avant de pouvoir reformuler le message du commit."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Arrêté à $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "'$squash_style' impossible avec le commit précédent"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Exécution : $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "L'exécution a échoué : $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "et a mis à jour l'index ou la copie de travail"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Vous pouvez corriger le problème, puis lancer\n"
-"\n"
-"git rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"L'exécution a réussi : $rest\n"
-"mais a laissé des modifications dans l'index ou la copie de travail\n"
-"Validez ou remisez vos modification, puis lancez\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Commande inconnue : $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Rebasage et mise à jour de $head_name avec succès."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Vous avez des modifications indexées dans votre copie de travail.\n"
-"Si ces modifications devaient être ajoutées\n"
-"dans le commit précédent, lancez :\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Si elles devaient aller dans un nouveau commit, lancez :\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"Dans les deux cas, une fois fini, continuez avec :\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-"Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Vous avez des modifications non validées dans votre copie de travail.\n"
-"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "impossible de valider les modifications indexées."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Impossible de lancer l'éditeur"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Impossible d'extraire $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Pas de HEAD ?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Impossible de créer un répertoire temporaire $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Impossible de marquer comme interactif"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
-msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Veuillez noter que les commits vides sont en commentaire"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Impossible d'initialiser les commits réécrits"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "usage : $dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:182
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"Impossible de se placer dans le répertoire $cdup, la racine de la copie de "
"travail"
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:191 git-sh-setup.sh:198
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "fatal : $program_name ne peut pas être utilisé sans copie de travail."
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Impossible de rebaser : vous avez des modifications non indexées."
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:212
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Impossible de réécrire les branches : vous avez des modifications non "
"indexées."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"impossible de tirer avec rebasage. Vous avez des modifications non indexées."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:215
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "$action est impossible : vous avez des modifications non indexées."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Impossible de rebaser : votre index contient des modifications non validées."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"impossible de tirer avec rebasage : votre index contient des modifications "
-"non validées."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:226
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"$action est impossible : votre index contient des modifications non validées."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:228
msgid "Additionally, your index contains uncommitted changes."
msgstr "De plus, votre index contient des modifications non validées."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:348
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Vous devez lancer cette commande depuis la racine de votre copie de travail."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:353
msgid "Unable to determine absolute path of git directory"
msgstr "Impossible de déterminer le chemin absolu du répertoire git"
@@ -26369,7 +26788,7 @@
msgid "failed to open hunk edit file for reading: %s"
msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -26383,7 +26802,7 @@
"a - indexer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas indexer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -26397,7 +26816,7 @@
"a - remiser cette section et toutes les suivantes de ce fichier\n"
"d - ne pas remiser cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -26411,7 +26830,7 @@
"a - désindexer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas désindexer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -26425,7 +26844,7 @@
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -26439,7 +26858,7 @@
"a - supprimer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas supprimer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -26453,7 +26872,7 @@
"a - éliminer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas éliminer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -26467,7 +26886,7 @@
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -26481,7 +26900,7 @@
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -26503,91 +26922,91 @@
"e - éditer manuellement la section actuelle\n"
"? - afficher l'aide\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "fichier non-fusionné ignoré : %s\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "Appliquer l'ajout dans l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "Aucune autre section à atteindre\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Nombre invalide : '%s'\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Désolé, %d seule section disponible.\n"
msgstr[1] "Désolé, Seulement %d sections disponibles.\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "Aucune autre section à rechercher\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Regex de recherche malformée %s : %s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "Aucune section ne correspond au motif donné\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Pas de section précédente\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Pas de section suivante\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "Désolé, impossible de découper cette section\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Découpée en %d section.\n"
msgstr[1] "Découpée en %d sections.\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "Désolé, impossible d'éditer cette section\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -26605,58 +27024,58 @@
"diff - visualiser les diff entre HEAD et l'index\n"
"add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "-- manquant"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "mode de --patch inconnu : %s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argument invalide %s, -- attendu"
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
"la zone locale diffère du GMT par un intervalle supérieur à une minute\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "fatal : la commande '%s' s'est interrompue avec le code %d"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'éditeur est sorti en erreur, abandon total"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"'%s' contient une version intermédiaire du courriel que vous composiez.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' contient le courriel composé.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases est incompatible avec d'autres options\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26668,11 +27087,11 @@
"Positionnez sendemail.forbidSendmailVariables à false pour désactiver cette "
"vérification.\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -26680,39 +27099,39 @@
"`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de "
"commande ou des options de configuration)\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Champ de --suppress-cc inconnu : '%s'\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Paramètre de --confirm inconnu : '%s'\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "attention : `:include:` n'est pas supporté : %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
"attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "attention : ligne sendmail non reconnue : %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -26727,12 +27146,12 @@
" * en indiquant \"./%s\" si vous désignez un fichier, ou\n"
" * en fournissant l'option --format-patch pour une plage.\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Échec à l'ouverture du répertoire %s : %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
@@ -26742,17 +27161,17 @@
"Aucun fichier patch spécifié !\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "Ligne de sujet non trouvée dans %s ?"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Impossible d'ouvrir %s en écriture : %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -26766,27 +27185,27 @@
"\n"
"Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Échec à l'ouverture de %s : %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Échec à l'ouverture de %s.final : %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "Le courriel de résumé étant vide, il a été ignoré\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -26794,11 +27213,11 @@
"Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
"Transfer-Encoding.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -26811,22 +27230,22 @@
"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
"vraiment envoyer.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal : l'alias '%s' se développe en lui-même\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en "
"a) ? "
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
@@ -26834,16 +27253,16 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Le chemin vers la CA \"%s\" n'existe pas"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -26870,130 +27289,130 @@
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Envoyer ce courriel ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll) : "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "Une réponse est nécessaire"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "Le serveur SMTP nécessaire n'est pas défini correctement."
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Le serveur ne supporte pas STARTTLS ! %s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "échec de STARTTLS ! %s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-"
"debug."
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "Échec de l'envoi de %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Envoi simulé de %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "%s envoyé\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "Simulation OK. Le journal indique :\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "OK. Le journal indique :\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Résultat : "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Résultat : OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "impossible d'ouvrir le fichier %s"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Impossible d'exécuter '%s'"
-#: git-send-email.perl:1972
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) échec de la fermeture du pipe vers '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "impossible d'envoyer un message comme 7bit"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "codage de transfert invalide"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2100
#, perl-format
msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
+"fatal: %s: rejected by %s hook\n"
"%s\n"
"warning: no patches were sent\n"
msgstr ""
-"fatal : %s : rejeté par le crochet sendemail-validate\n"
+"fatal : %s : rejeté par le crochet %s\n"
"%s\n"
"attention : aucun patch envoyé\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "impossible d'ouvrir %s :%s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2113
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -27002,13 +27421,666 @@
"fatal : %s : %d est plus long que 998 caractères \n"
"attention : aucun patch envoyé\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2131
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2135
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
+
+#, perl-format
+#~ msgid "fatal: %s: rejected by %s hook\n"
+#~ msgstr "fatal : %s : rejetée par le crocher %s\n"
+
+#~ msgid "git archive --list"
+#~ msgstr "git archive --list"
+
+#, c-format
+#~ msgid "unknown value for --diff-merges: %s"
+#~ msgstr "valeur inconnue pour --diff-merges : %s"
+
+#, c-format
+#~ msgid "invalid value '%s' for lsrefs.unborn"
+#~ msgstr "valeur invalide '%s' pour lsrefs.unborn"
+
+#~ msgid "backend for `git stash -p`"
+#~ msgstr "backend pour `git stash -p`"
+
+#, c-format
+#~ msgid "Invalid value for --empty: %s"
+#~ msgstr "Valeur invalide pour --empty : %s"
+
+#, c-format
+#~ msgid "Invalid value for --patch-format: %s"
+#~ msgstr "Valeur invalide pour --patch-format : %s"
+
+#, c-format
+#~ msgid "Invalid value for --show-current-patch: %s"
+#~ msgstr "Valeur invalide pour --show-current-patch : %s"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad "
+#~ "| --term-new]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad "
+#~ "| --term-new]"
+
+#~ msgid "git bisect--helper --bisect-next"
+#~ msgstr "git bisect--helper --bisect-next"
+
+#~ msgid "git bisect--helper --bisect-visualize"
+#~ msgstr "git bisect--helper --bisect-visualize"
+
+#, c-format
+#~ msgid "invalid color '%s' in color.blame.repeatedLines"
+#~ msgstr "couleur invalide '%s' dans color.blame.repeatedLines"
+
+#~ msgid "invalid value for blame.coloring"
+#~ msgstr "valeur invalide pour blame.coloring"
+
+#~ msgid ""
+#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e "
+#~ "| -p | <type> | --textconv | --filters) [--path=<path>] <object>"
+#~ msgstr ""
+#~ "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -"
+#~ "p | <type> | --textconv | --filters) [--path=<chemin>] <objet>"
+
+#~ msgid "show object type"
+#~ msgstr "afficher le type de l'objet"
+
+#~ msgid "exit with zero when there's no error"
+#~ msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
+
+#~ 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"
+
+#~ msgid "show info about objects fed from the standard input"
+#~ msgstr "afficher l'information des objets passés en entrée standard"
+
+#~ 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)"
+
+#~ msgid "show all objects with --batch or --batch-check"
+#~ msgstr "montrer tous les objets avec --batch ou --batch-check"
+
+#~ msgid "do not order --batch-all-objects output"
+#~ msgstr "ne pas ordonner la sortie de --batch-all-objects"
+
+#~ msgid "set up tracking mode (see git-pull(1))"
+#~ msgstr "régler le mode de suivi (voir git-pull(1))"
+
+#~ 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"
+
+#~ msgid "Options --squash and --fixup cannot be used together"
+#~ msgstr ""
+#~ "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
+
+#~ msgid "Only one of -c/-C/-F/--fixup can be used."
+#~ msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
+
+#~ msgid "Option -m cannot be combined with -c/-C/-F."
+#~ msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F."
+
+#~ 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."
+
+#~ msgid "git count-objects [-v] [-H | --human-readable]"
+#~ msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#, c-format
+#~ msgid "configuration fetch.output contains invalid value %s"
+#~ msgstr ""
+#~ "le paramètre de configuration fetch.output contient une valeur invalide %s"
+
+#~ msgid "--cached or --untracked cannot be used with --no-index"
+#~ msgstr ""
+#~ "--cached ou --untracked ne peuvent pas être utilisés avec --no-index"
+
+#~ msgid "--untracked cannot be used with --cached"
+#~ msgstr "--untracked ne peut pas être utilisé avec --cached"
+
+#~ msgid "git hash-object --stdin-paths"
+#~ msgstr "git hash-object --stdin-paths"
+
+#~ msgid "git help [-g|--guides]"
+#~ msgstr "git help [-g|--guides]"
+
+#~ msgid "git help [-c|--config]"
+#~ msgstr "git help [-c|--config]"
+
+#~ msgid "git mktag"
+#~ msgstr "git mktag"
+
+#~ msgid "git mktree [-z] [--missing] [--batch]"
+#~ msgstr "git mktree [-z] [--missing] [--batch]"
+
+#~ msgid "read from stdin"
+#~ msgstr "lire depuis l'entrée standard"
+
+#~ msgid "git notes merge --commit [-v | -q]"
+#~ msgstr "git notes merge --commit [-v | -q]"
+
+#~ msgid "git notes merge --abort [-v | -q]"
+#~ msgstr "git notes merge --abort [-v | -q]"
+
+#~ msgid "git notes get-ref"
+#~ msgstr "git notes get-ref"
+
+#~ msgid "invalid value for --missing"
+#~ msgstr "valeur invalide pour --missing"
+
+#~ msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#~ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#, c-format
+#~ msgid "Invalid value for %s: %s"
+#~ msgstr "Valeur invalide pour %s : %s"
+
+#, c-format
+#~ msgid "Invalid value for pull.ff: %s"
+#~ msgstr "Valeur invalide pour pull.ff : %s"
+
+#~ msgid "git rebase --continue | --abort | --skip | --edit-todo"
+#~ msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+
+#, c-format
+#~ msgid "'%s' is not a valid timestamp"
+#~ msgstr "'%s' n'est pas un horodatage valide"
+
+#~ msgid "git reflog [ show | expire | delete | exists ]"
+#~ msgstr "git reflog [ show | expire | delete | exists ]"
+
+#~ msgid "git remote [-v | --verbose]"
+#~ msgstr "git remote [-v | --verbose]"
+
+#~ msgid "git replace [-f] --convert-graft-file"
+#~ msgstr "git replace [-f] --convert-graft-file"
+
+#, c-format
+#~ msgid ""
+#~ "\n"
+#~ "It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+#~ "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+#~ "to make this the default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Les modifications non-indexées ont pris %.2f secondes à énumérer après "
+#~ "reset.\n"
+#~ "Vous pouvez utiliser '--quiet' pour éviter ce message. Réglez le "
+#~ "paramètre de\n"
+#~ "config reset.quiet à true pour avoir ce comportement en permanence.\n"
+
+#~ msgid "git sparse-checkout list"
+#~ msgstr "git sparse-checkout list"
+
+#~ msgid "unable to upgrade repository format to enable worktreeConfig"
+#~ msgstr ""
+#~ "impossible de mettre à jour le format de dépôt pour activer worktreeConfig"
+
+#~ msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+#~ msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#~ msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+#~ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#~ msgid "git sparse-checkout disable"
+#~ msgstr "git sparse-checkout disable"
+
+#~ 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."
+
+#~ msgid "git stripspace [-s | --strip-comments]"
+#~ msgstr "git stripspace [-s | --strip-comments]"
+
+#~ msgid "git stripspace [-c | --comment-lines]"
+#~ msgstr "git stripspace [-c | --comment-lines]"
+
+#~ msgid "submodule--helper print-default-remote takes no arguments"
+#~ msgstr "submodule--helper print-default-remote n'accepte aucun argument"
+
+#~ msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+#~ msgstr ""
+#~ "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]"
+
+#~ msgid "suppress output for update by rebase or merge"
+#~ msgstr ""
+#~ "supprimer la sortie lors de la mise à jour par un rebasage ou une fusion"
+
+#~ msgid "overrides update mode in case the repository is a fresh clone"
+#~ msgstr ""
+#~ "passer outre le mode mise à jour dans le cas où le dépôt est un clone "
+#~ "nouveau"
+
+#~ msgid "depth for shallow fetch"
+#~ msgstr "profondeur pour une récupération superficielle"
+
+#~ msgid "sha1"
+#~ msgstr "sha1"
+
+#~ msgid "SHA1 expected by superproject"
+#~ msgstr "SHA1 attendu par le super-projet"
+
+#~ msgid "subsha1"
+#~ msgstr "sous-sha1"
+
+#~ msgid "SHA1 of submodule's HEAD"
+#~ msgstr "SHA1 de la HEAD du sous-module"
+
+#~ msgid "git submodule--helper run-update-procedure [<options>] <path>"
+#~ msgstr "git submodule--helper run-update-procedure [<options>] <chemin>"
+
+#~ msgid "git submodule--helper config --check-writeable"
+#~ msgstr "git submodule--helper config --check-writeable"
+
+#~ msgid "git update-server-info [--force]"
+#~ msgstr "git update-server-info [--force]"
+
+#~ msgid "Initialize and modify the sparse-checkout"
+#~ msgstr "Initialiser et modifier l'extraction clairsemée"
+
+#, sh-format
+#~ msgid ""
+#~ "Unable to find current ${remote_name}/${branch} revision in submodule "
+#~ "path '$sm_path'"
+#~ msgstr ""
+#~ "Impossible de trouver la révision courante ${remote_name}/${branch} dans "
+#~ "le chemin de sous-module '$sm_path'"
+
+#, sh-format
+#~ msgid "Failed to recurse into submodule path '$displaypath'"
+#~ msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
+
+#~ msgid "--index outside a repository"
+#~ msgstr "--index hors d'un dépôt"
+
+#~ msgid "--cached outside a repository"
+#~ msgstr "--cached hors d'un dépôt"
+
+#~ msgid "unrecognized input"
+#~ msgstr "entrée non reconnue"
+
+#, c-format
+#~ msgid "cannot read %s"
+#~ msgstr "impossible de lire %s"
+
+#~ 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"
+
+#, c-format
+#~ msgid ""
+#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+#~ msgstr ""
+#~ "La branche '%s' est paramétrée pour suivre la branche distante '%s' de "
+#~ "'%s' en rebasant."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+#~ msgstr ""
+#~ "La branche '%s' est paramétrée pour suivre la branche distante '%s' "
+#~ "depuis '%s'."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+#~ msgstr ""
+#~ "La branche '%s' est paramétrée pour suivre la branche locale '%'s en "
+#~ "rebasant."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track local branch '%s'."
+#~ msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#~ msgstr ""
+#~ "La branche '%s' est paramétrée pour suivre la référence distante '%s' en "
+#~ "rebasant."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote ref '%s'."
+#~ msgstr ""
+#~ "La branche '%s' est paramétrée pour suivre la référence distante '%s'."
+
+#~ msgid "Cannot force update the current branch."
+#~ msgstr "Impossible de forcer la mise à jour de la branche courante."
+
+#, c-format
+#~ msgid "Not a valid object name: '%s'."
+#~ msgstr "Nom d'objet invalide : '%s'."
+
+#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#~ msgstr ""
+#~ "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
+
+#~ msgid "-G, -S and --find-object are mutually exclusive"
+#~ msgstr "-G, -S et --find-object sont mutuellement exclusifs"
+
+#~ msgid ""
+#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#~ msgstr ""
+#~ "-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-"
+#~ "regex avec -S"
+
+#~ msgid ""
+#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+#~ "with -G and -S"
+#~ msgstr ""
+#~ "--pickaxe-all et --find-object sont mutuellement exclusifs, utilisez --"
+#~ "pickaxe-all avec -G et -S"
+
+#~ msgid "--stateless-rpc requires multi_ack_detailed"
+#~ msgstr "--stateless-rpc nécessite multi_ack_detailed"
+
+#~ msgid "--left-only and --right-only are mutually exclusive"
+#~ msgstr "--left-only et --right-only sont mutuellement exclusifs"
+
+#, c-format
+#~ msgid "unrecognized %%(objectsize) argument: %s"
+#~ msgstr "argument %%(objectsize) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized %%(subject) argument: %s"
+#~ msgstr "argument %%(subject) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized %%(contents) argument: %s"
+#~ msgstr "argument %%(contents) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized %%(raw) argument: %s"
+#~ msgstr "argument %%(raw) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized argument '%s' in %%(%s)"
+#~ msgstr "argument '%s' non reconnu dans %%(%s)"
+
+#, c-format
+#~ msgid "unrecognized %%(align) argument: %s"
+#~ msgstr "argument %%(align) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized %%(if) argument: %s"
+#~ msgstr "argument %%(if) non reconnu : %s"
+
+#, c-format
+#~ msgid "format: %%(if) atom used without a %%(then) atom"
+#~ msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
+
+#, c-format
+#~ msgid "format: %%(then) atom used without an %%(if) atom"
+#~ msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
+
+#, c-format
+#~ msgid "format: %%(else) atom used without a %%(then) atom"
+#~ msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
+
+#~ msgid "--unsorted-input is incompatible with --no-walk"
+#~ msgstr "--unsorted-input est incompatible avec --no-walk"
+
+#~ msgid "--no-walk is incompatible with --unsorted-input"
+#~ msgstr "--no-walk est incompatible avec --unsorted-input"
+
+#~ msgid "--dry-run is incompatible with --interactive/--patch"
+#~ msgstr "--dry-run est incompatible avec --interactive/--patch"
+
+#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+#~ msgstr "--pathspec-from-file est incompatible avec --interactive/--patch"
+
+#~ msgid "--pathspec-from-file is incompatible with --edit"
+#~ msgstr "--pathspec-from-file est incompatible avec --edit"
+
+#~ msgid "-A and -u are mutually incompatible"
+#~ msgstr "-A et -u sont mutuellement incompatibles"
+
+#~ msgid "Option --ignore-missing can only be used together with --dry-run"
+#~ msgstr ""
+#~ "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-"
+#~ "run"
+
+#~ msgid "--pathspec-from-file is incompatible with pathspec arguments"
+#~ msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
+
+#~ msgid "--pathspec-file-nul requires --pathspec-from-file"
+#~ msgstr "--pathspec-file-nul nécessite --pathspec-from-file"
+
+#, 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"
+
+#~ msgid "--column and --verbose are incompatible"
+#~ msgstr "--column et --verbose sont incompatibles"
+
+#, c-format
+#~ msgid "'%s' cannot be used with %s"
+#~ msgstr "'%s' ne peut pas être utilisé avec %s"
+
+#~ msgid "set upstream info for new branch"
+#~ msgstr ""
+#~ "paramétrer les coordonnées de branche amont pour une nouvelle branche"
+
+#, c-format
+#~ msgid "-%c, -%c and --orphan are mutually exclusive"
+#~ msgstr "-%c, -%c et --orphan sont mutuellement exclusifs"
+
+#~ msgid "-p and --overlay are mutually exclusive"
+#~ msgstr "-p et --overlay sont mutuellement exclusifs"
+
+#~ msgid "--pathspec-from-file is incompatible with --detach"
+#~ msgstr "--pathspec-from-file est incompatible avec --detach"
+
+#~ msgid "--pathspec-from-file is incompatible with --patch"
+#~ msgstr "--pathspec-from-file est incompatible avec --patch"
+
+#, c-format
+#~ msgid "--bare and --origin %s options are incompatible."
+#~ msgstr "les options --bare et --origin %s sont incompatibles."
+
+#~ msgid "--bare and --separate-git-dir are incompatible."
+#~ msgstr "--bare et --separate-git-dir sont incompatibles."
+
+#~ msgid "--pathspec-from-file with -a does not make sense"
+#~ msgstr "--pathspec-from-file avec l'option -a n'a pas de sens"
+
+#, c-format
+#~ msgid "cannot combine -m with --fixup:%s"
+#~ msgstr "impossible de combiner -m avec --fixup:%s"
+
+#~ msgid "--long and -z are incompatible"
+#~ msgstr "--long et -z sont incompatibles"
+
+#, c-format
+#~ msgid "cannot combine reword option of --fixup with path '%s'"
+#~ msgstr ""
+#~ "impossible de combiner l'option reword de --fixup avec le chemin '%s'"
+
+#~ msgid ""
+#~ "reword option of --fixup is mutually exclusive with --patch/--"
+#~ "interactive/--all/--include/--only"
+#~ msgstr ""
+#~ "l'option reword de --fixup est mutuellement exclusive avec --patch/--"
+#~ "interactive/--all/--include/--only"
+
+#~ msgid "--long is incompatible with --abbrev=0"
+#~ msgstr "--long et --abbrev=0 sont incompatibles"
+
+#~ msgid "--dirty is incompatible with commit-ishes"
+#~ msgstr ""
+#~ "--dirty est incompatible avec la spécification de commits ou assimilés"
+
+#~ msgid "--broken is incompatible with commit-ishes"
+#~ msgstr "--broken est incompatible avec les commits ou assimilés"
+
+#~ msgid "--stdin and --merge-base are mutually exclusive"
+#~ msgstr "--stdin et --merge-base sont mutuellement exclusifs"
+
+#~ msgid "--dir-diff is incompatible with --no-index"
+#~ msgstr "--dir-diff est incompatible avec --no-index"
+
+#~ msgid "--gui, --tool and --extcmd are mutually exclusive"
+#~ msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
+
+#~ msgid "--anonymize-map without --anonymize does not make sense"
+#~ msgstr "--anonymize-map n'a aucune signification sans --anonymize"
+
+#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+#~ msgstr ""
+#~ "Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists"
+
+#, 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"
+
+#~ msgid "--deepen and --depth are mutually exclusive"
+#~ msgstr "--deepen et --depth sont mutuellement exclusifs"
+
+#~ msgid "--depth and --unshallow cannot be used together"
+#~ msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
+
+#~ msgid "--fix-thin cannot be used without --stdin"
+#~ msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
+
+#~ msgid "--object-format cannot be used with --stdin"
+#~ msgstr "--object-format ne peut pas être utilisé avec --stdin"
+
+#~ msgid "--separate-git-dir and --bare are mutually exclusive"
+#~ msgstr "--separate-git-dir et --bare sont mutuellement exclusifs"
+
+#~ msgid "-n and -k are mutually exclusive"
+#~ msgstr "-n et -k sont mutuellement exclusifs"
+
+#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+#~ msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
+
+#~ msgid "--stdout, --output, and --output-directory are mutually exclusive"
+#~ msgstr ""
+#~ "--stdout, --output, et --output-directory sont mutuellement exclusifs"
+
+#~ msgid "--creation-factor requires --range-diff"
+#~ msgstr "--creation-factor requiert --range-diff"
+
+#~ msgid "You cannot combine --squash with --no-ff."
+#~ msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
+
+#~ msgid "You cannot combine --squash with --commit."
+#~ msgstr "Vous ne pouvez pas combiner --squash avec --commit."
+
+#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+#~ msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
+
+#~ msgid "--delete is incompatible with --all, --mirror and --tags"
+#~ msgstr "--delete est incompatible avec --all, --mirror et --tags"
+
+#~ msgid "--all and --tags are incompatible"
+#~ msgstr "--all et --tags sont incompatibles"
+
+#~ msgid "--mirror and --tags are incompatible"
+#~ msgstr "--mirror et --tags sont incompatibles"
+
+#~ msgid "--all and --mirror are incompatible"
+#~ msgstr "--all et --mirror sont incompatibles"
+
+#~ msgid "cannot combine '--keep-base' with '--onto'"
+#~ msgstr "impossible de combiner '--keep-base' avec '--onto'"
+
+#~ msgid "cannot combine '--keep-base' with '--root'"
+#~ msgstr "impossible de combiner '--keep-base' avec '--root'"
+
+#~ msgid "cannot combine '--root' with '--fork-point'"
+#~ msgstr "impossible de combiner '--root' avec '--fork-point'"
+
+#~ msgid "cannot combine apply options with merge options"
+#~ msgstr ""
+#~ "impossible de combiner les options d'application avec les options de "
+#~ "fusion"
+
+#~ msgid "--keep-unreachable and -A are incompatible"
+#~ msgstr "--keep-unreachable et -A sont incompatibles"
+
+#~ msgid "--geometric is incompatible with -A, -a"
+#~ msgstr "--geometric est incompatible avec -A, -a"
+
+#~ msgid "--patch is incompatible with --{hard,mixed,soft}"
+#~ msgstr "--patch est incompatible avec --{hard,mixed,soft}"
+
+#~ msgid "-N can only be used with --mixed"
+#~ msgstr "-N ne peut être utilisé qu'avec --mixed"
+
+#~ msgid "cannot combine --exclude-promisor-objects and --missing"
+#~ msgstr "impossible de combiner --exclude-promisor-objects et --missing"
+
+#~ msgid "marked counting is incompatible with --objects"
+#~ msgstr "le comptage marqué est incompatible avec --objects"
+
+#~ msgid ""
+#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-"
+#~ "base"
+#~ msgstr ""
+#~ "--reflog est incompatible avec --all, --remotes, --independent et --merge-"
+#~ "base"
+
+#~ msgid "git sparse-checkout reapply"
+#~ msgstr "git sparse-checkout reapply"
+
+#~ msgid "--cached and --files are mutually exclusive"
+#~ msgstr "--cached et --files sont mutuellement exclusifs"
+
+#~ msgid "--branch and --default are mutually exclusive"
+#~ msgstr "--branch et --default sont mutuellement exclusifs"
+
+#~ msgid "--column and -n are incompatible"
+#~ msgstr "--column et -n sont incompatibles"
+
+#~ msgid "--contains option is only allowed in list mode"
+#~ msgstr "l'option --contains est autorisée seulement en mode de liste"
+
+#~ msgid "--no-contains option is only allowed in list mode"
+#~ msgstr "l'option --no-contains est autorisée seulement en mode liste"
+
+#~ msgid "--points-at option is only allowed in list mode"
+#~ msgstr "l'option --points-at est autorisée seulement en mode liste"
+
+#~ 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"
+
+#~ msgid "only one -F or -m option is allowed."
+#~ msgstr "une seule option -F ou -m est autorisée."
+
+#~ msgid "-b, -B, and --detach are mutually exclusive"
+#~ msgstr "-b, -B et --detach sont mutuellement exclusifs"
+
+#~ msgid "--reason requires --lock"
+#~ msgstr "--reason exige --lock"
+
+#~ msgid "--verbose and --porcelain are mutually exclusive"
+#~ msgstr "--verbose et --porcelain sont mutuellement exclusifs"
+
+#, c-format
+#~ msgid "no directory given for --git-dir\n"
+#~ msgstr "aucun répertoire fourni pour --git-dir\n"
+
+#, c-format
+#~ msgid "no directory given for --work-tree\n"
+#~ msgstr "aucun répertoire fourni pour --work-tree\n"
+
+#~ msgid "--packfile requires --index-pack-args"
+#~ msgstr "--packfile nécessite --index-pack-args"
+
+#~ msgid "--index-pack-args can only be used with --packfile"
+#~ msgstr "--index-pack-args ne peut être utilisé qu'avec --packfile"
diff --git a/po/git.pot b/po/git.pot
deleted file mode 100644
index fcd45ef..0000000
--- a/po/git.pot
+++ /dev/null
@@ -1,24755 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: add-interactive.c:376
-#, c-format
-msgid "Huh (%s)?"
-msgstr ""
-
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
-msgid "could not read index"
-msgstr ""
-
-#: add-interactive.c:584 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
-msgid "binary"
-msgstr ""
-
-#: add-interactive.c:642 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
-msgid "nothing"
-msgstr ""
-
-#: add-interactive.c:643 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
-msgid "unchanged"
-msgstr ""
-
-#: add-interactive.c:680 git-add--interactive.perl:641
-msgid "Update"
-msgstr ""
-
-#: add-interactive.c:697 add-interactive.c:885
-#, c-format
-msgid "could not stage '%s'"
-msgstr ""
-
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
-msgid "could not write index"
-msgstr ""
-
-#: add-interactive.c:706 git-add--interactive.perl:626
-#, c-format, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: add-interactive.c:724 git-add--interactive.perl:676
-#, c-format, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr ""
-
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr ""
-
-#: add-interactive.c:759 git-add--interactive.perl:653
-msgid "Revert"
-msgstr ""
-
-#: add-interactive.c:775
-msgid "Could not parse HEAD^{tree}"
-msgstr ""
-
-#: add-interactive.c:813 git-add--interactive.perl:629
-#, c-format, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: add-interactive.c:864 git-add--interactive.perl:693
-#, c-format
-msgid "No untracked files.\n"
-msgstr ""
-
-#: add-interactive.c:868 git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr ""
-
-#: add-interactive.c:895 git-add--interactive.perl:623
-#, c-format, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: add-interactive.c:925
-#, c-format
-msgid "ignoring unmerged: %s"
-msgstr ""
-
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
-#, c-format
-msgid "Only binary files changed.\n"
-msgstr ""
-
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
-#, c-format
-msgid "No changes.\n"
-msgstr ""
-
-#: add-interactive.c:943 git-add--interactive.perl:1379
-msgid "Patch update"
-msgstr ""
-
-#: add-interactive.c:982 git-add--interactive.perl:1792
-msgid "Review diff"
-msgstr ""
-
-#: add-interactive.c:1010
-msgid "show paths with changes"
-msgstr ""
-
-#: add-interactive.c:1012
-msgid "add working tree state to the staged set of changes"
-msgstr ""
-
-#: add-interactive.c:1014
-msgid "revert staged set of changes back to the HEAD version"
-msgstr ""
-
-#: add-interactive.c:1016
-msgid "pick hunks and update selectively"
-msgstr ""
-
-#: add-interactive.c:1018
-msgid "view diff between HEAD and index"
-msgstr ""
-
-#: add-interactive.c:1020
-msgid "add contents of untracked files to the staged set of changes"
-msgstr ""
-
-#: add-interactive.c:1028 add-interactive.c:1077
-msgid "Prompt help:"
-msgstr ""
-
-#: add-interactive.c:1030
-msgid "select a single item"
-msgstr ""
-
-#: add-interactive.c:1032
-msgid "select a range of items"
-msgstr ""
-
-#: add-interactive.c:1034
-msgid "select multiple ranges"
-msgstr ""
-
-#: add-interactive.c:1036 add-interactive.c:1081
-msgid "select item based on unique prefix"
-msgstr ""
-
-#: add-interactive.c:1038
-msgid "unselect specified items"
-msgstr ""
-
-#: add-interactive.c:1040
-msgid "choose all items"
-msgstr ""
-
-#: add-interactive.c:1042
-msgid "(empty) finish selecting"
-msgstr ""
-
-#: add-interactive.c:1079
-msgid "select a numbered item"
-msgstr ""
-
-#: add-interactive.c:1083
-msgid "(empty) select nothing"
-msgstr ""
-
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
-msgid "*** Commands ***"
-msgstr ""
-
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
-msgid "What now"
-msgstr ""
-
-#: add-interactive.c:1144 git-add--interactive.perl:213
-msgid "staged"
-msgstr ""
-
-#: add-interactive.c:1144 git-add--interactive.perl:213
-msgid "unstaged"
-msgstr ""
-
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
-#: git-add--interactive.perl:213
-msgid "path"
-msgstr ""
-
-#: add-interactive.c:1151
-msgid "could not refresh index"
-msgstr ""
-
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
-#, c-format
-msgid "Bye.\n"
-msgstr ""
-
-#: add-patch.c:34 git-add--interactive.perl:1431
-#, c-format, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:35 git-add--interactive.perl:1432
-#, c-format, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:36 git-add--interactive.perl:1433
-#, c-format, perl-format
-msgid "Stage addition [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:37 git-add--interactive.perl:1434
-#, c-format, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:39
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"staging."
-msgstr ""
-
-#: add-patch.c:42
-msgid ""
-"y - stage this hunk\n"
-"n - do not stage this hunk\n"
-"q - quit; do not stage this hunk or any of the remaining ones\n"
-"a - stage this hunk and all later hunks in the file\n"
-"d - do not stage this hunk or any of the later hunks in the file\n"
-msgstr ""
-
-#: add-patch.c:56 git-add--interactive.perl:1437
-#, c-format, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:57 git-add--interactive.perl:1438
-#, c-format, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:58 git-add--interactive.perl:1439
-#, c-format, perl-format
-msgid "Stash addition [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:59 git-add--interactive.perl:1440
-#, c-format, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:61
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"stashing."
-msgstr ""
-
-#: add-patch.c:64
-msgid ""
-"y - stash this hunk\n"
-"n - do not stash this hunk\n"
-"q - quit; do not stash this hunk or any of the remaining ones\n"
-"a - stash this hunk and all later hunks in the file\n"
-"d - do not stash this hunk or any of the later hunks in the file\n"
-msgstr ""
-
-#: add-patch.c:80 git-add--interactive.perl:1443
-#, c-format, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:81 git-add--interactive.perl:1444
-#, c-format, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:82 git-add--interactive.perl:1445
-#, c-format, perl-format
-msgid "Unstage addition [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:83 git-add--interactive.perl:1446
-#, c-format, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:85
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"unstaging."
-msgstr ""
-
-#: add-patch.c:88
-msgid ""
-"y - unstage this hunk\n"
-"n - do not unstage this hunk\n"
-"q - quit; do not unstage this hunk or any of the remaining ones\n"
-"a - unstage this hunk and all later hunks in the file\n"
-"d - do not unstage this hunk or any of the later hunks in the file\n"
-msgstr ""
-
-#: add-patch.c:103 git-add--interactive.perl:1449
-#, c-format, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:104 git-add--interactive.perl:1450
-#, c-format, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:105 git-add--interactive.perl:1451
-#, c-format, perl-format
-msgid "Apply addition to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:106 git-add--interactive.perl:1452
-#, c-format, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:108 add-patch.c:176 add-patch.c:221
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"applying."
-msgstr ""
-
-#: add-patch.c:111
-msgid ""
-"y - apply this hunk to index\n"
-"n - do not apply this hunk to index\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"a - apply this hunk and all later hunks in the file\n"
-"d - do not apply this hunk or any of the later hunks in the file\n"
-msgstr ""
-
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
-#, c-format, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
-#, c-format, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
-#, c-format, perl-format
-msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
-#, c-format, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:131 add-patch.c:154 add-patch.c:199
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"discarding."
-msgstr ""
-
-#: add-patch.c:134 add-patch.c:202
-msgid ""
-"y - discard this hunk from worktree\n"
-"n - do not discard this hunk from worktree\n"
-"q - quit; do not discard this hunk or any of the remaining ones\n"
-"a - discard this hunk and all later hunks in the file\n"
-"d - do not discard this hunk or any of the later hunks in the file\n"
-msgstr ""
-
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
-#, c-format, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
-#, c-format, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
-#, c-format, perl-format
-msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
-#, c-format, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:157
-msgid ""
-"y - discard this hunk from index and worktree\n"
-"n - do not discard this hunk from index and worktree\n"
-"q - quit; do not discard this hunk or any of the remaining ones\n"
-"a - discard this hunk and all later hunks in the file\n"
-"d - do not discard this hunk or any of the later hunks in the file\n"
-msgstr ""
-
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
-#, c-format, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
-#, c-format, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
-#, c-format, perl-format
-msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
-#, c-format, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:179
-msgid ""
-"y - apply this hunk to index and worktree\n"
-"n - do not apply this hunk to index and worktree\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"a - apply this hunk and all later hunks in the file\n"
-"d - do not apply this hunk or any of the later hunks in the file\n"
-msgstr ""
-
-#: add-patch.c:224
-msgid ""
-"y - apply this hunk to worktree\n"
-"n - do not apply this hunk to worktree\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"a - apply this hunk and all later hunks in the file\n"
-"d - do not apply this hunk or any of the later hunks in the file\n"
-msgstr ""
-
-#: add-patch.c:343
-#, c-format
-msgid "could not parse hunk header '%.*s'"
-msgstr ""
-
-#: add-patch.c:362 add-patch.c:366
-#, c-format
-msgid "could not parse colored hunk header '%.*s'"
-msgstr ""
-
-#: add-patch.c:420
-msgid "could not parse diff"
-msgstr ""
-
-#: add-patch.c:439
-msgid "could not parse colored diff"
-msgstr ""
-
-#: add-patch.c:453
-#, c-format
-msgid "failed to run '%s'"
-msgstr ""
-
-#: add-patch.c:612
-msgid "mismatched output from interactive.diffFilter"
-msgstr ""
-
-#: add-patch.c:613
-msgid ""
-"Your filter must maintain a one-to-one correspondence\n"
-"between its input and output lines."
-msgstr ""
-
-#: add-patch.c:791
-#, c-format
-msgid ""
-"expected context line #%d in\n"
-"%.*s"
-msgstr ""
-
-#: add-patch.c:806
-#, c-format
-msgid ""
-"hunks do not overlap:\n"
-"%.*s\n"
-"\tdoes not end with:\n"
-"%.*s"
-msgstr ""
-
-#: add-patch.c:1082 git-add--interactive.perl:1115
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr ""
-
-#: add-patch.c:1086
-#, c-format
-msgid ""
-"---\n"
-"To remove '%c' lines, make them ' ' lines (context).\n"
-"To remove '%c' lines, delete them.\n"
-"Lines starting with %c will be removed.\n"
-msgstr ""
-
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1100 git-add--interactive.perl:1129
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again. If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-
-#: add-patch.c:1133
-msgid "could not parse hunk header"
-msgstr ""
-
-#: add-patch.c:1178
-msgid "'git apply --cached' failed"
-msgstr ""
-
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#.
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-
-#: add-patch.c:1290
-msgid "The selected hunks do not apply to the index!"
-msgstr ""
-
-#: add-patch.c:1291 git-add--interactive.perl:1346
-msgid "Apply them to the worktree anyway? "
-msgstr ""
-
-#: add-patch.c:1298 git-add--interactive.perl:1349
-msgid "Nothing was applied.\n"
-msgstr ""
-
-#: add-patch.c:1355
-msgid ""
-"j - leave this hunk undecided, see next undecided hunk\n"
-"J - leave this hunk undecided, see next hunk\n"
-"k - leave this hunk undecided, see previous undecided hunk\n"
-"K - leave this hunk undecided, see previous hunk\n"
-"g - select a hunk to go to\n"
-"/ - search for a hunk matching the given regex\n"
-"s - split the current hunk into smaller hunks\n"
-"e - manually edit the current hunk\n"
-"? - print help\n"
-msgstr ""
-
-#: add-patch.c:1517 add-patch.c:1527
-msgid "No previous hunk"
-msgstr ""
-
-#: add-patch.c:1522 add-patch.c:1532
-msgid "No next hunk"
-msgstr ""
-
-#: add-patch.c:1538
-msgid "No other hunks to goto"
-msgstr ""
-
-#: add-patch.c:1549 git-add--interactive.perl:1606
-msgid "go to which hunk (<ret> to see more)? "
-msgstr ""
-
-#: add-patch.c:1550 git-add--interactive.perl:1608
-msgid "go to which hunk? "
-msgstr ""
-
-#: add-patch.c:1561
-#, c-format
-msgid "Invalid number: '%s'"
-msgstr ""
-
-#: add-patch.c:1566
-#, c-format
-msgid "Sorry, only %d hunk available."
-msgid_plural "Sorry, only %d hunks available."
-msgstr[0] ""
-msgstr[1] ""
-
-#: add-patch.c:1575
-msgid "No other hunks to search"
-msgstr ""
-
-#: add-patch.c:1581 git-add--interactive.perl:1661
-msgid "search for regex? "
-msgstr ""
-
-#: add-patch.c:1596
-#, c-format
-msgid "Malformed search regexp %s: %s"
-msgstr ""
-
-#: add-patch.c:1613
-msgid "No hunk matches the given pattern"
-msgstr ""
-
-#: add-patch.c:1620
-msgid "Sorry, cannot split this hunk"
-msgstr ""
-
-#: add-patch.c:1624
-#, c-format
-msgid "Split into %d hunks."
-msgstr ""
-
-#: add-patch.c:1628
-msgid "Sorry, cannot edit this hunk"
-msgstr ""
-
-#: add-patch.c:1680
-msgid "'git apply' failed"
-msgstr ""
-
-#: advice.c:145
-#, c-format
-msgid ""
-"\n"
-"Disable this message with \"git config advice.%s false\""
-msgstr ""
-
-#: advice.c:161
-#, c-format
-msgid "%shint: %.*s%s\n"
-msgstr ""
-
-#: advice.c:252
-msgid "Cherry-picking is not possible because you have unmerged files."
-msgstr ""
-
-#: advice.c:254
-msgid "Committing is not possible because you have unmerged files."
-msgstr ""
-
-#: advice.c:256
-msgid "Merging is not possible because you have unmerged files."
-msgstr ""
-
-#: advice.c:258
-msgid "Pulling is not possible because you have unmerged files."
-msgstr ""
-
-#: advice.c:260
-msgid "Reverting is not possible because you have unmerged files."
-msgstr ""
-
-#: advice.c:262
-#, c-format
-msgid "It is not possible to %s because you have unmerged files."
-msgstr ""
-
-#: advice.c:270
-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:278
-msgid "Exiting because of an unresolved conflict."
-msgstr ""
-
-#: advice.c:283 builtin/merge.c:1375
-msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr ""
-
-#: advice.c:285
-msgid "Please, commit your changes before merging."
-msgstr ""
-
-#: advice.c:286
-msgid "Exiting because of unfinished merge."
-msgstr ""
-
-#: advice.c:296
-#, c-format
-msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
-msgstr ""
-
-#: advice.c:303
-msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
-msgstr ""
-
-#: advice.c:310
-#, c-format
-msgid ""
-"Note: switching to '%s'.\n"
-"\n"
-"You are in 'detached HEAD' state. You can look around, make experimental\n"
-"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by switching back to a branch.\n"
-"\n"
-"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -c with the switch command. Example:\n"
-"\n"
-" git switch -c <new-branch-name>\n"
-"\n"
-"Or undo this operation with:\n"
-"\n"
-" git switch -\n"
-"\n"
-"Turn off this advice by setting config variable advice.detachedHead to "
-"false\n"
-"\n"
-msgstr ""
-
-#: alias.c:50
-msgid "cmdline ends with \\"
-msgstr ""
-
-#: alias.c:51
-msgid "unclosed quote"
-msgstr ""
-
-#: apply.c:70
-#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr ""
-
-#: apply.c:86
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr ""
-
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr ""
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr ""
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr ""
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr ""
-
-#: apply.c:800
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr ""
-
-#: apply.c:809
-#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr ""
-
-#: apply.c:883
-#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr ""
-
-#: apply.c:921
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr ""
-
-#: apply.c:927
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr ""
-
-#: apply.c:928
-#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr ""
-
-#: apply.c:933
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr ""
-
-#: apply.c:962
-#, c-format
-msgid "invalid mode on line %d: %s"
-msgstr ""
-
-#: apply.c:1281
-#, c-format
-msgid "inconsistent header lines %d and %d"
-msgstr ""
-
-#: apply.c:1371
-#, c-format
-msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
-msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apply.c:1384
-#, c-format
-msgid "git diff header lacks filename information (line %d)"
-msgstr ""
-
-#: apply.c:1480
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr ""
-
-#: apply.c:1549
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr ""
-
-#: apply.c:1752
-msgid "new file depends on old contents"
-msgstr ""
-
-#: apply.c:1754
-msgid "deleted file still has contents"
-msgstr ""
-
-#: apply.c:1788
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr ""
-
-#: apply.c:1825
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr ""
-
-#: apply.c:1827
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr ""
-
-#: apply.c:1830
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr ""
-
-#: apply.c:1977
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr ""
-
-#: apply.c:2014
-#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr ""
-
-#: apply.c:2176
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr ""
-
-#: apply.c:2262
-#, c-format
-msgid "unable to read symlink %s"
-msgstr ""
-
-#: apply.c:2266
-#, c-format
-msgid "unable to open or read %s"
-msgstr ""
-
-#: apply.c:2935
-#, c-format
-msgid "invalid start of line: '%c'"
-msgstr ""
-
-#: apply.c:3056
-#, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apply.c:3068
-#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr ""
-
-#: apply.c:3074
-#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
-
-#: apply.c:3096
-#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr ""
-
-#: apply.c:3104
-#, c-format
-msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
-msgstr ""
-
-#: apply.c:3151
-#, c-format
-msgid "cannot apply binary patch to '%s' without full index line"
-msgstr ""
-
-#: apply.c:3162
-#, c-format
-msgid ""
-"the patch applies to '%s' (%s), which does not match the current contents."
-msgstr ""
-
-#: apply.c:3170
-#, c-format
-msgid "the patch applies to an empty '%s' but it is not empty"
-msgstr ""
-
-#: apply.c:3188
-#, c-format
-msgid "the necessary postimage %s for '%s' cannot be read"
-msgstr ""
-
-#: apply.c:3201
-#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr ""
-
-#: apply.c:3208
-#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr ""
-
-#: apply.c:3229
-#, c-format
-msgid "patch failed: %s:%ld"
-msgstr ""
-
-#: apply.c:3352
-#, c-format
-msgid "cannot checkout %s"
-msgstr ""
-
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
-#: setup.c:308
-#, c-format
-msgid "failed to read %s"
-msgstr ""
-
-#: apply.c:3412
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr ""
-
-#: apply.c:3441 apply.c:3687
-#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr ""
-
-#: apply.c:3527 apply.c:3702
-#, c-format
-msgid "%s: does not exist in index"
-msgstr ""
-
-#: apply.c:3536 apply.c:3710 apply.c:3954
-#, c-format
-msgid "%s: does not match index"
-msgstr ""
-
-#: apply.c:3571
-msgid "repository lacks the necessary blob to perform 3-way merge."
-msgstr ""
-
-#: apply.c:3574
-#, c-format
-msgid "Performing three-way merge...\n"
-msgstr ""
-
-#: apply.c:3590 apply.c:3594
-#, c-format
-msgid "cannot read the current contents of '%s'"
-msgstr ""
-
-#: apply.c:3606
-#, c-format
-msgid "Failed to perform three-way merge...\n"
-msgstr ""
-
-#: apply.c:3620
-#, c-format
-msgid "Applied patch to '%s' with conflicts.\n"
-msgstr ""
-
-#: apply.c:3625
-#, c-format
-msgid "Applied patch to '%s' cleanly.\n"
-msgstr ""
-
-#: apply.c:3642
-#, c-format
-msgid "Falling back to direct application...\n"
-msgstr ""
-
-#: apply.c:3654
-msgid "removal patch leaves file contents"
-msgstr ""
-
-#: apply.c:3727
-#, c-format
-msgid "%s: wrong type"
-msgstr ""
-
-#: apply.c:3729
-#, c-format
-msgid "%s has type %o, expected %o"
-msgstr ""
-
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
-#, c-format
-msgid "invalid path '%s'"
-msgstr ""
-
-#: apply.c:3952
-#, c-format
-msgid "%s: already exists in index"
-msgstr ""
-
-#: apply.c:3956
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr ""
-
-#: apply.c:3976
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr ""
-
-#: apply.c:3981
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr ""
-
-#: apply.c:4001
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr ""
-
-#: apply.c:4005
-#, c-format
-msgid "%s: patch does not apply"
-msgstr ""
-
-#: apply.c:4020
-#, c-format
-msgid "Checking patch %s..."
-msgstr ""
-
-#: apply.c:4112
-#, c-format
-msgid "sha1 information is lacking or useless for submodule %s"
-msgstr ""
-
-#: apply.c:4119
-#, c-format
-msgid "mode change for %s, which is not in current HEAD"
-msgstr ""
-
-#: apply.c:4122
-#, c-format
-msgid "sha1 information is lacking or useless (%s)."
-msgstr ""
-
-#: apply.c:4131
-#, c-format
-msgid "could not add %s to temporary index"
-msgstr ""
-
-#: apply.c:4141
-#, c-format
-msgid "could not write temporary index to %s"
-msgstr ""
-
-#: apply.c:4279
-#, c-format
-msgid "unable to remove %s from index"
-msgstr ""
-
-#: apply.c:4313
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr ""
-
-#: apply.c:4319
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr ""
-
-#: apply.c:4327
-#, c-format
-msgid "unable to create backing store for newly created file %s"
-msgstr ""
-
-#: apply.c:4333 apply.c:4478
-#, c-format
-msgid "unable to add cache entry for %s"
-msgstr ""
-
-#: apply.c:4376 builtin/bisect--helper.c:525
-#, c-format
-msgid "failed to write to '%s'"
-msgstr ""
-
-#: apply.c:4380
-#, c-format
-msgid "closing file '%s'"
-msgstr ""
-
-#: apply.c:4450
-#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr ""
-
-#: apply.c:4548
-#, c-format
-msgid "Applied patch %s cleanly."
-msgstr ""
-
-#: apply.c:4556
-msgid "internal error"
-msgstr ""
-
-#: apply.c:4559
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apply.c:4570
-#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr ""
-
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
-#, c-format
-msgid "cannot open %s"
-msgstr ""
-
-#: apply.c:4592
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr ""
-
-#: apply.c:4596
-#, c-format
-msgid "Rejected hunk #%d."
-msgstr ""
-
-#: apply.c:4725
-#, c-format
-msgid "Skipped patch '%s'."
-msgstr ""
-
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr ""
-
-#: apply.c:4753
-msgid "unable to read index file"
-msgstr ""
-
-#: apply.c:4910
-#, c-format
-msgid "can't open patch '%s': %s"
-msgstr ""
-
-#: apply.c:4937
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apply.c:4943 apply.c:4958
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apply.c:4951
-#, c-format
-msgid "%d line applied after fixing whitespace errors."
-msgid_plural "%d lines applied after fixing whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
-msgid "Unable to write new index file"
-msgstr ""
-
-#: apply.c:4995
-msgid "don't apply changes matching the given path"
-msgstr ""
-
-#: apply.c:4998
-msgid "apply changes matching the given path"
-msgstr ""
-
-#: apply.c:5000 builtin/am.c:2318
-msgid "num"
-msgstr ""
-
-#: apply.c:5001
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr ""
-
-#: apply.c:5004
-msgid "ignore additions made by the patch"
-msgstr ""
-
-#: apply.c:5006
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr ""
-
-#: apply.c:5010
-msgid "show number of added and deleted lines in decimal notation"
-msgstr ""
-
-#: apply.c:5012
-msgid "instead of applying the patch, output a summary for the input"
-msgstr ""
-
-#: apply.c:5014
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr ""
-
-#: apply.c:5016
-msgid "make sure the patch is applicable to the current index"
-msgstr ""
-
-#: apply.c:5018
-msgid "mark new files with `git add --intent-to-add`"
-msgstr ""
-
-#: apply.c:5020
-msgid "apply a patch without touching the working tree"
-msgstr ""
-
-#: apply.c:5022
-msgid "accept a patch that touches outside the working area"
-msgstr ""
-
-#: apply.c:5025
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr ""
-
-#: apply.c:5027
-msgid "attempt three-way merge, fall back on normal patch if that fails"
-msgstr ""
-
-#: apply.c:5029
-msgid "build a temporary index based on embedded index information"
-msgstr ""
-
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
-msgid "paths are separated with NUL character"
-msgstr ""
-
-#: apply.c:5034
-msgid "ensure at least <n> lines of context match"
-msgstr ""
-
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
-#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
-msgid "action"
-msgstr ""
-
-#: apply.c:5036
-msgid "detect new or modified lines that have whitespace errors"
-msgstr ""
-
-#: apply.c:5039 apply.c:5042
-msgid "ignore changes in whitespace when finding context"
-msgstr ""
-
-#: apply.c:5045
-msgid "apply the patch in reverse"
-msgstr ""
-
-#: apply.c:5047
-msgid "don't expect at least one line of context"
-msgstr ""
-
-#: apply.c:5049
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr ""
-
-#: apply.c:5051
-msgid "allow overlapping hunks"
-msgstr ""
-
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr ""
-
-#: apply.c:5054
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr ""
-
-#: apply.c:5057
-msgid "do not trust the line counts in the hunk headers"
-msgstr ""
-
-#: apply.c:5059 builtin/am.c:2306
-msgid "root"
-msgstr ""
-
-#: apply.c:5060
-msgid "prepend <root> to all filenames"
-msgstr ""
-
-#: archive-tar.c:125 archive-zip.c:345
-#, c-format
-msgid "cannot stream blob %s"
-msgstr ""
-
-#: archive-tar.c:265 archive-zip.c:358
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr ""
-
-#: archive-tar.c:450
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr ""
-
-#: archive-tar.c:453
-msgid "unable to redirect descriptor"
-msgstr ""
-
-#: archive-tar.c:460
-#, c-format
-msgid "'%s' filter reported error"
-msgstr ""
-
-#: archive-zip.c:318
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr ""
-
-#: archive-zip.c:322
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr ""
-
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
-#, c-format
-msgid "deflate error (%d)"
-msgstr ""
-
-#: archive-zip.c:603
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr ""
-
-#: archive.c:14
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr ""
-
-#: archive.c:15
-msgid "git archive --list"
-msgstr ""
-
-#: archive.c:16
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr ""
-
-#: archive.c:17
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr ""
-
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr ""
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
-#, c-format
-msgid "could not read '%s'"
-msgstr ""
-
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr ""
-
-#: archive.c:451
-#, c-format
-msgid "no such ref: %.*s"
-msgstr ""
-
-#: archive.c:457
-#, c-format
-msgid "not a valid object name: %s"
-msgstr ""
-
-#: archive.c:470
-#, c-format
-msgid "not a tree object: %s"
-msgstr ""
-
-#: archive.c:482
-msgid "current working directory is untracked"
-msgstr ""
-
-#: archive.c:523
-#, c-format
-msgid "File not found: %s"
-msgstr ""
-
-#: archive.c:525
-#, c-format
-msgid "Not a regular file: %s"
-msgstr ""
-
-#: archive.c:552
-msgid "fmt"
-msgstr ""
-
-#: archive.c:552
-msgid "archive format"
-msgstr ""
-
-#: archive.c:553 builtin/log.c:1775
-msgid "prefix"
-msgstr ""
-
-#: archive.c:554
-msgid "prepend prefix to each pathname in the archive"
-msgstr ""
-
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
-msgid "file"
-msgstr ""
-
-#: archive.c:556
-msgid "add untracked file to archive"
-msgstr ""
-
-#: archive.c:559 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr ""
-
-#: archive.c:561
-msgid "read .gitattributes in working directory"
-msgstr ""
-
-#: archive.c:562
-msgid "report archived files on stderr"
-msgstr ""
-
-#: archive.c:564
-msgid "set compression level"
-msgstr ""
-
-#: archive.c:567
-msgid "list supported archive formats"
-msgstr ""
-
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
-msgid "repo"
-msgstr ""
-
-#: archive.c:570 builtin/archive.c:92
-msgid "retrieve the archive from remote repository <repo>"
-msgstr ""
-
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
-msgid "command"
-msgstr ""
-
-#: archive.c:572 builtin/archive.c:94
-msgid "path to the remote git-upload-archive command"
-msgstr ""
-
-#: archive.c:579
-msgid "Unexpected option --remote"
-msgstr ""
-
-#: archive.c:581
-msgid "Option --exec can only be used together with --remote"
-msgstr ""
-
-#: archive.c:583
-msgid "Unexpected option --output"
-msgstr ""
-
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr ""
-
-#: archive.c:607
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr ""
-
-#: archive.c:616
-#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr ""
-
-#: attr.c:202
-#, c-format
-msgid "%.*s is not a valid attribute name"
-msgstr ""
-
-#: attr.c:363
-#, c-format
-msgid "%s not allowed: %s:%d"
-msgstr ""
-
-#: attr.c:403
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
-msgstr ""
-
-#: bisect.c:489
-#, c-format
-msgid "Badly quoted content in file '%s': %s"
-msgstr ""
-
-#: bisect.c:699
-#, c-format
-msgid "We cannot bisect more!\n"
-msgstr ""
-
-#: bisect.c:766
-#, c-format
-msgid "Not a valid commit name %s"
-msgstr ""
-
-#: bisect.c:791
-#, c-format
-msgid ""
-"The merge base %s is bad.\n"
-"This means the bug has been fixed between %s and [%s].\n"
-msgstr ""
-
-#: bisect.c:796
-#, c-format
-msgid ""
-"The merge base %s is new.\n"
-"The property has changed between %s and [%s].\n"
-msgstr ""
-
-#: bisect.c:801
-#, c-format
-msgid ""
-"The merge base %s is %s.\n"
-"This means the first '%s' commit is between %s and [%s].\n"
-msgstr ""
-
-#: bisect.c:809
-#, c-format
-msgid ""
-"Some %s revs are not ancestors of the %s rev.\n"
-"git bisect cannot work properly in this case.\n"
-"Maybe you mistook %s and %s revs?\n"
-msgstr ""
-
-#: bisect.c:822
-#, c-format
-msgid ""
-"the merge base between %s and [%s] must be skipped.\n"
-"So we cannot be sure the first %s commit is between %s and %s.\n"
-"We continue anyway."
-msgstr ""
-
-#: bisect.c:861
-#, c-format
-msgid "Bisecting: a merge base must be tested\n"
-msgstr ""
-
-#: bisect.c:911
-#, c-format
-msgid "a %s revision is needed"
-msgstr ""
-
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
-#, c-format
-msgid "could not create file '%s'"
-msgstr ""
-
-#: bisect.c:987 builtin/merge.c:153
-#, c-format
-msgid "could not read file '%s'"
-msgstr ""
-
-#: bisect.c:1027
-msgid "reading bisect refs failed"
-msgstr ""
-
-#: bisect.c:1057
-#, c-format
-msgid "%s was both %s and %s\n"
-msgstr ""
-
-#: bisect.c:1066
-#, c-format
-msgid ""
-"No testable commit found.\n"
-"Maybe you started with bad path arguments?\n"
-msgstr ""
-
-#: bisect.c:1095
-#, c-format
-msgid "(roughly %d step)"
-msgid_plural "(roughly %d steps)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANSLATORS: the last %s will be replaced with "(roughly %d
-#. steps)" translation.
-#.
-#: bisect.c:1101
-#, c-format
-msgid "Bisecting: %d revision left to test after this %s\n"
-msgid_plural "Bisecting: %d revisions left to test after this %s\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: blame.c:2776
-msgid "--contents and --reverse do not blend well."
-msgstr ""
-
-#: blame.c:2790
-msgid "cannot use --contents with final commit object name"
-msgstr ""
-
-#: blame.c:2811
-msgid "--reverse and --first-parent together require specified latest commit"
-msgstr ""
-
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
-msgid "revision walk setup failed"
-msgstr ""
-
-#: blame.c:2838
-msgid ""
-"--reverse --first-parent together require range along first-parent chain"
-msgstr ""
-
-#: blame.c:2849
-#, c-format
-msgid "no such path %s in %s"
-msgstr ""
-
-#: blame.c:2860
-#, c-format
-msgid "cannot read blob %s for path %s"
-msgstr ""
-
-#: branch.c:53
-#, c-format
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr ""
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr ""
-
-#: branch.c:93
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr ""
-
-#: branch.c:94
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr ""
-
-#: branch.c:98
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
-
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr ""
-
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr ""
-
-#: branch.c:105
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr ""
-
-#: branch.c:109
-#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr ""
-
-#: branch.c:110
-#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr ""
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr ""
-
-#: branch.c:156
-#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr ""
-
-#: branch.c:189
-#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr ""
-
-#: branch.c:208
-#, c-format
-msgid "A branch named '%s' already exists."
-msgstr ""
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr ""
-
-#: branch.c:233
-#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr ""
-
-#: branch.c:235
-#, c-format
-msgid "the requested upstream branch '%s' does not exist"
-msgstr ""
-
-#: branch.c:237
-msgid ""
-"\n"
-"If you are planning on basing your work on an upstream\n"
-"branch that already exists at the remote, you may need to\n"
-"run \"git fetch\" to retrieve it.\n"
-"\n"
-"If you are planning to push out a new local branch that\n"
-"will track its remote counterpart, you may want to use\n"
-"\"git push -u\" to set the upstream config as you push."
-msgstr ""
-
-#: branch.c:281
-#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr ""
-
-#: branch.c:301
-#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr ""
-
-#: branch.c:306
-#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr ""
-
-#: branch.c:366
-#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr ""
-
-#: branch.c:389
-#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr ""
-
-#: bundle.c:44
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr ""
-
-#: bundle.c:48
-#, c-format
-msgid "unknown capability '%s'"
-msgstr ""
-
-#: bundle.c:74
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr ""
-
-#: bundle.c:113
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr ""
-
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
-#, c-format
-msgid "could not open '%s'"
-msgstr ""
-
-#: bundle.c:198
-msgid "Repository lacks these prerequisite commits:"
-msgstr ""
-
-#: bundle.c:201
-msgid "need a repository to verify a bundle"
-msgstr ""
-
-#: bundle.c:257
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bundle.c:264
-msgid "The bundle records a complete history."
-msgstr ""
-
-#: bundle.c:266
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bundle.c:333
-msgid "unable to dup bundle descriptor"
-msgstr ""
-
-#: bundle.c:340
-msgid "Could not spawn pack-objects"
-msgstr ""
-
-#: bundle.c:351
-msgid "pack-objects died"
-msgstr ""
-
-#: bundle.c:400
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr ""
-
-#: bundle.c:504
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr ""
-
-#: bundle.c:506
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr ""
-
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr ""
-
-#: bundle.c:553
-msgid "Refusing to create empty bundle."
-msgstr ""
-
-#: bundle.c:563
-#, c-format
-msgid "cannot create '%s'"
-msgstr ""
-
-#: bundle.c:588
-msgid "index-pack died"
-msgstr ""
-
-#: chunk-format.c:117
-msgid "terminating chunk id appears earlier than expected"
-msgstr ""
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr ""
-
-#: chunk-format.c:133
-#, c-format
-msgid "duplicate chunk ID %<PRIx32> found"
-msgstr ""
-
-#: chunk-format.c:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr ""
-
-#: color.c:329
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr ""
-
-#: commit-graph.c:204 midx.c:47
-msgid "invalid hash version"
-msgstr ""
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr ""
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr ""
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr ""
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr ""
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr ""
-
-#: commit-graph.c:482
-msgid "commit-graph has no base graphs chunk"
-msgstr ""
-
-#: commit-graph.c:492
-msgid "commit-graph chain does not match"
-msgstr ""
-
-#: commit-graph.c:540
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-
-#: commit-graph.c:564
-msgid "unable to find all commit-graph files"
-msgstr ""
-
-#: commit-graph.c:745 commit-graph.c:782
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr ""
-
-#: commit-graph.c:766
-#, c-format
-msgid "could not find commit %s"
-msgstr ""
-
-#: commit-graph.c:799
-msgid "commit-graph requires overflow generation data but has none"
-msgstr ""
-
-#: commit-graph.c:1075 builtin/am.c:1341
-#, c-format
-msgid "unable to parse commit %s"
-msgstr ""
-
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
-#, c-format
-msgid "unable to get type of object %s"
-msgstr ""
-
-#: commit-graph.c:1368
-msgid "Loading known commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:1385
-msgid "Expanding reachable commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:1405
-msgid "Clearing commit marks in commit graph"
-msgstr ""
-
-#: commit-graph.c:1424
-msgid "Computing commit graph topological levels"
-msgstr ""
-
-#: commit-graph.c:1477
-msgid "Computing commit graph generation numbers"
-msgstr ""
-
-#: commit-graph.c:1558
-msgid "Computing commit changed paths Bloom filters"
-msgstr ""
-
-#: commit-graph.c:1635
-msgid "Collecting referenced commits"
-msgstr ""
-
-#: commit-graph.c:1660
-#, 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:1673
-#, c-format
-msgid "error adding pack %s"
-msgstr ""
-
-#: commit-graph.c:1677
-#, c-format
-msgid "error opening index for %s"
-msgstr ""
-
-#: commit-graph.c:1714
-msgid "Finding commits for commit graph among packed objects"
-msgstr ""
-
-#: commit-graph.c:1732
-msgid "Finding extra edges in commit graph"
-msgstr ""
-
-#: commit-graph.c:1781
-msgid "failed to write correct number of base graph ids"
-msgstr ""
-
-#: commit-graph.c:1812 midx.c:911
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr ""
-
-#: commit-graph.c:1825
-msgid "unable to create temporary graph layer"
-msgstr ""
-
-#: commit-graph.c:1830
-#, c-format
-msgid "unable to adjust shared permissions for '%s'"
-msgstr ""
-
-#: commit-graph.c:1887
-#, 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:1923
-msgid "unable to open commit-graph chain file"
-msgstr ""
-
-#: commit-graph.c:1939
-msgid "failed to rename base commit-graph file"
-msgstr ""
-
-#: commit-graph.c:1959
-msgid "failed to rename temporary commit-graph file"
-msgstr ""
-
-#: commit-graph.c:2092
-msgid "Scanning merged commits"
-msgstr ""
-
-#: commit-graph.c:2136
-msgid "Merging commit-graph"
-msgstr ""
-
-#: commit-graph.c:2244
-msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
-msgstr ""
-
-#: commit-graph.c:2351
-msgid "too many commits to write graph"
-msgstr ""
-
-#: commit-graph.c:2449
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-
-#: commit-graph.c:2459
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr ""
-
-#: commit-graph.c:2469 commit-graph.c:2484
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr ""
-
-#: commit-graph.c:2476
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr ""
-
-#: commit-graph.c:2494
-msgid "Verifying commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:2509
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-
-#: commit-graph.c:2516
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr ""
-
-#: commit-graph.c:2526
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr ""
-
-#: commit-graph.c:2535
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr ""
-
-#: commit-graph.c:2549
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr ""
-
-#: commit-graph.c:2554
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-
-#: commit-graph.c:2558
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-
-#: commit-graph.c:2575
-#, c-format
-msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
-msgstr ""
-
-#: commit-graph.c:2581
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr ""
-
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
-#, c-format
-msgid "could not parse %s"
-msgstr ""
-
-#: commit.c:54
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr ""
-
-#: commit.c:194
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-
-#: commit.c:1237
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr ""
-
-#: commit.c:1241
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr ""
-
-#: commit.c:1244
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr ""
-
-#: commit.c:1247
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr ""
-
-#: commit.c:1501
-msgid ""
-"Warning: commit message did not conform to UTF-8.\n"
-"You may want to amend it after fixing the message, or set the config\n"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr ""
-
-#: config.c:126
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-
-#: config.c:142
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr ""
-
-#: config.c:153
-msgid "relative config includes must come from files"
-msgstr ""
-
-#: config.c:199
-msgid "relative config include conditionals must come from files"
-msgstr ""
-
-#: config.c:396
-#, c-format
-msgid "invalid config format: %s"
-msgstr ""
-
-#: config.c:400
-#, c-format
-msgid "missing environment variable name for configuration '%.*s'"
-msgstr ""
-
-#: config.c:405
-#, c-format
-msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr ""
-
-#: config.c:442
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr ""
-
-#: config.c:448
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr ""
-
-#: config.c:472 sequencer.c:2785
-#, c-format
-msgid "invalid key: %s"
-msgstr ""
-
-#: config.c:478
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr ""
-
-#: config.c:511
-msgid "empty config key"
-msgstr ""
-
-#: config.c:529 config.c:541
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr ""
-
-#: config.c:555 config.c:572 config.c:579 config.c:588
-#, c-format
-msgid "bogus format in %s"
-msgstr ""
-
-#: config.c:622
-#, c-format
-msgid "bogus count in %s"
-msgstr ""
-
-#: config.c:626
-#, c-format
-msgid "too many entries in %s"
-msgstr ""
-
-#: config.c:636
-#, c-format
-msgid "missing config key %s"
-msgstr ""
-
-#: config.c:644
-#, c-format
-msgid "missing config value %s"
-msgstr ""
-
-#: config.c:995
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr ""
-
-#: config.c:999
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr ""
-
-#: config.c:1003
-#, c-format
-msgid "bad config line %d in standard input"
-msgstr ""
-
-#: config.c:1007
-#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr ""
-
-#: config.c:1011
-#, c-format
-msgid "bad config line %d in command line %s"
-msgstr ""
-
-#: config.c:1015
-#, c-format
-msgid "bad config line %d in %s"
-msgstr ""
-
-#: config.c:1152
-msgid "out of range"
-msgstr ""
-
-#: config.c:1152
-msgid "invalid unit"
-msgstr ""
-
-#: config.c:1153
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr ""
-
-#: config.c:1163
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
-msgstr ""
-
-#: config.c:1166
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr ""
-
-#: config.c:1169
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
-msgstr ""
-
-#: config.c:1172
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
-msgstr ""
-
-#: config.c:1175
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
-msgstr ""
-
-#: config.c:1178
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr ""
-
-#: config.c:1257
-#, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr ""
-
-#: config.c:1275
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr ""
-
-#: config.c:1284
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr ""
-
-#: config.c:1377
-#, c-format
-msgid "abbrev length out of range: %d"
-msgstr ""
-
-#: config.c:1391 config.c:1402
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr ""
-
-#: config.c:1494
-msgid "core.commentChar should only be one character"
-msgstr ""
-
-#: config.c:1527
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr ""
-
-#: config.c:1599
-#, c-format
-msgid "malformed value for %s"
-msgstr ""
-
-#: config.c:1625
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr ""
-
-#: config.c:1626
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr ""
-
-#: config.c:1687 builtin/pack-objects.c:4084
-#, c-format
-msgid "bad pack compression level %d"
-msgstr ""
-
-#: config.c:1809
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr ""
-
-#: config.c:1812
-#, c-format
-msgid "reference '%s' does not point to a blob"
-msgstr ""
-
-#: config.c:1829
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr ""
-
-#: config.c:1874
-#, c-format
-msgid "failed to parse %s"
-msgstr ""
-
-#: config.c:1930
-msgid "unable to parse command-line config"
-msgstr ""
-
-#: config.c:2294
-msgid "unknown error occurred while reading the configuration files"
-msgstr ""
-
-#: config.c:2468
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr ""
-
-#: config.c:2513
-#, c-format
-msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
-msgstr ""
-
-#: config.c:2559
-#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr ""
-
-#: config.c:2561
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr ""
-
-#: config.c:2645
-#, c-format
-msgid "invalid section name '%s'"
-msgstr ""
-
-#: config.c:2677
-#, c-format
-msgid "%s has multiple values"
-msgstr ""
-
-#: config.c:2706
-#, c-format
-msgid "failed to write new configuration file %s"
-msgstr ""
-
-#: config.c:2958 config.c:3285
-#, c-format
-msgid "could not lock config file %s"
-msgstr ""
-
-#: config.c:2969
-#, c-format
-msgid "opening %s"
-msgstr ""
-
-#: config.c:3006 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr ""
-
-#: config.c:3031
-#, c-format
-msgid "invalid config file %s"
-msgstr ""
-
-#: config.c:3044 config.c:3298
-#, c-format
-msgid "fstat on %s failed"
-msgstr ""
-
-#: config.c:3055
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr ""
-
-#: config.c:3065 config.c:3303
-#, c-format
-msgid "chmod on %s failed"
-msgstr ""
-
-#: config.c:3150 config.c:3400
-#, c-format
-msgid "could not write config file %s"
-msgstr ""
-
-#: config.c:3184
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr ""
-
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
-#, c-format
-msgid "could not unset '%s'"
-msgstr ""
-
-#: config.c:3276
-#, c-format
-msgid "invalid section name: %s"
-msgstr ""
-
-#: config.c:3443
-#, c-format
-msgid "missing value for '%s'"
-msgstr ""
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr ""
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr ""
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr ""
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr ""
-
-#: connect.c:263
-#, c-format
-msgid "ignoring capabilities after first line '%s'"
-msgstr ""
-
-#: connect.c:284
-msgid "protocol error: unexpected capabilities^{}"
-msgstr ""
-
-#: connect.c:306
-#, c-format
-msgid "protocol error: expected shallow sha-1, got '%s'"
-msgstr ""
-
-#: connect.c:308
-msgid "repository on the other end cannot be shallow"
-msgstr ""
-
-#: connect.c:347
-msgid "invalid packet"
-msgstr ""
-
-#: connect.c:367
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr ""
-
-#: connect.c:497
-#, c-format
-msgid "unknown object format '%s' specified by server"
-msgstr ""
-
-#: connect.c:526
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr ""
-
-#: connect.c:530
-msgid "expected flush after ref listing"
-msgstr ""
-
-#: connect.c:533
-msgid "expected response end packet after ref listing"
-msgstr ""
-
-#: connect.c:666
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr ""
-
-#: connect.c:717
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr ""
-
-#: connect.c:757 connect.c:820
-#, c-format
-msgid "Looking up %s ... "
-msgstr ""
-
-#: connect.c:761
-#, c-format
-msgid "unable to look up %s (port %s) (%s)"
-msgstr ""
-
-#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-
-#: connect.c:787 connect.c:864
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
-msgid "done."
-msgstr ""
-
-#: connect.c:824
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr ""
-
-#: connect.c:830
-#, c-format
-msgid "unknown port %s"
-msgstr ""
-
-#: connect.c:967 connect.c:1299
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr ""
-
-#: connect.c:969
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr ""
-
-#: connect.c:979
-#, c-format
-msgid "cannot start proxy %s"
-msgstr ""
-
-#: connect.c:1050
-msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr ""
-
-#: connect.c:1190
-msgid "newline is forbidden in git:// hosts and repo paths"
-msgstr ""
-
-#: connect.c:1247
-msgid "ssh variant 'simple' does not support -4"
-msgstr ""
-
-#: connect.c:1259
-msgid "ssh variant 'simple' does not support -6"
-msgstr ""
-
-#: connect.c:1276
-msgid "ssh variant 'simple' does not support setting port"
-msgstr ""
-
-#: connect.c:1388
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr ""
-
-#: connect.c:1436
-msgid "unable to fork"
-msgstr ""
-
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
-msgid "Checking connectivity"
-msgstr ""
-
-#: connected.c:120
-msgid "Could not run 'git rev-list'"
-msgstr ""
-
-#: connected.c:144
-msgid "failed write to rev-list"
-msgstr ""
-
-#: connected.c:149
-msgid "failed to close rev-list's stdin"
-msgstr ""
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr ""
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr ""
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr ""
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr ""
-
-#: convert.c:280
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr ""
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr ""
-
-#: convert.c:295
-#, c-format
-msgid ""
-"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
-"%sLE (depending on the byte order) as working-tree-encoding."
-msgstr ""
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr ""
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr ""
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr ""
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr ""
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr ""
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr ""
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr ""
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr ""
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr ""
-
-#: convert.c:935
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr ""
-
-#: convert.c:1236
-msgid "true/false are no valid working-tree-encodings"
-msgstr ""
-
-#: convert.c:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr ""
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr ""
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr ""
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr ""
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr ""
-
-#: credential.c:394
-#, c-format
-msgid "url contains a newline in its %s component: %s"
-msgstr ""
-
-#: credential.c:438
-#, c-format
-msgid "url has no scheme: %s"
-msgstr ""
-
-#: credential.c:511
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr ""
-
-#: date.c:138
-msgid "in the future"
-msgstr ""
-
-#: date.c:144
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:151
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:158
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:165
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:171
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:178
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:189
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:197 date.c:202
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr ""
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr ""
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%s': %s"
-msgstr ""
-
-#: delta-islands.c:390
-#, c-format
-msgid "island regex from config has too many capture groups (max=%d)"
-msgstr ""
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr ""
-
-#: diff-merges.c:70
-#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr ""
-
-#: diff-lib.c:557
-msgid "--merge-base does not work with ranges"
-msgstr ""
-
-#: diff-lib.c:559
-msgid "--merge-base only works with commits"
-msgstr ""
-
-#: diff-lib.c:576
-msgid "unable to get HEAD"
-msgstr ""
-
-#: diff-lib.c:583
-msgid "no merge base found"
-msgstr ""
-
-#: diff-lib.c:585
-msgid "multiple merge bases found"
-msgstr ""
-
-#: diff-no-index.c:237
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr ""
-
-#: diff-no-index.c:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr ""
-
-#: diff.c:156
-#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr ""
-
-#: diff.c:161
-#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
-msgstr ""
-
-#: diff.c:297
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-
-#: diff.c:325
-#, c-format
-msgid ""
-"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
-"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
-msgstr ""
-
-#: diff.c:333
-msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other "
-"whitespace modes"
-msgstr ""
-
-#: diff.c:410
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr ""
-
-#: diff.c:470
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-
-#: diff.c:4282
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr ""
-
-#: diff.c:4634
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr ""
-
-#: diff.c:4637
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr ""
-
-#: diff.c:4640
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr ""
-
-#: diff.c:4643
-msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr ""
-
-#: diff.c:4722
-msgid "--follow requires exactly one pathspec"
-msgstr ""
-
-#: diff.c:4770
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr ""
-
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
-#, c-format
-msgid "%s expects a numerical value"
-msgstr ""
-
-#: diff.c:4807
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-
-#: diff.c:4892
-#, c-format
-msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr ""
-
-#: diff.c:4916
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr ""
-
-#: diff.c:4930
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr ""
-
-#: diff.c:4980 diff.c:4986
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr ""
-
-#: diff.c:4998
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr ""
-
-#: diff.c:5019
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr ""
-
-#: diff.c:5038
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr ""
-
-#: diff.c:5078
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-msgstr ""
-
-#: diff.c:5114 diff.c:5134
-#, c-format
-msgid "invalid argument to %s"
-msgstr ""
-
-#: diff.c:5238
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr ""
-
-#: diff.c:5287
-#, c-format
-msgid "failed to parse --submodule option parameter: '%s'"
-msgstr ""
-
-#: diff.c:5343
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr ""
-
-#: diff.c:5379
-msgid "Diff output format options"
-msgstr ""
-
-#: diff.c:5381 diff.c:5387
-msgid "generate patch"
-msgstr ""
-
-#: diff.c:5384 builtin/log.c:179
-msgid "suppress diff output"
-msgstr ""
-
-#: diff.c:5389 diff.c:5503 diff.c:5510
-msgid "<n>"
-msgstr ""
-
-#: diff.c:5390 diff.c:5393
-msgid "generate diffs with <n> lines context"
-msgstr ""
-
-#: diff.c:5395
-msgid "generate the diff in raw format"
-msgstr ""
-
-#: diff.c:5398
-msgid "synonym for '-p --raw'"
-msgstr ""
-
-#: diff.c:5402
-msgid "synonym for '-p --stat'"
-msgstr ""
-
-#: diff.c:5406
-msgid "machine friendly --stat"
-msgstr ""
-
-#: diff.c:5409
-msgid "output only the last line of --stat"
-msgstr ""
-
-#: diff.c:5411 diff.c:5419
-msgid "<param1,param2>..."
-msgstr ""
-
-#: diff.c:5412
-msgid ""
-"output the distribution of relative amount of changes for each sub-directory"
-msgstr ""
-
-#: diff.c:5416
-msgid "synonym for --dirstat=cumulative"
-msgstr ""
-
-#: diff.c:5420
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr ""
-
-#: diff.c:5424
-msgid "warn if changes introduce conflict markers or whitespace errors"
-msgstr ""
-
-#: diff.c:5427
-msgid "condensed summary such as creations, renames and mode changes"
-msgstr ""
-
-#: diff.c:5430
-msgid "show only names of changed files"
-msgstr ""
-
-#: diff.c:5433
-msgid "show only names and status of changed files"
-msgstr ""
-
-#: diff.c:5435
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr ""
-
-#: diff.c:5436
-msgid "generate diffstat"
-msgstr ""
-
-#: diff.c:5438 diff.c:5441 diff.c:5444
-msgid "<width>"
-msgstr ""
-
-#: diff.c:5439
-msgid "generate diffstat with a given width"
-msgstr ""
-
-#: diff.c:5442
-msgid "generate diffstat with a given name width"
-msgstr ""
-
-#: diff.c:5445
-msgid "generate diffstat with a given graph width"
-msgstr ""
-
-#: diff.c:5447
-msgid "<count>"
-msgstr ""
-
-#: diff.c:5448
-msgid "generate diffstat with limited lines"
-msgstr ""
-
-#: diff.c:5451
-msgid "generate compact summary in diffstat"
-msgstr ""
-
-#: diff.c:5454
-msgid "output a binary diff that can be applied"
-msgstr ""
-
-#: diff.c:5457
-msgid "show full pre- and post-image object names on the \"index\" lines"
-msgstr ""
-
-#: diff.c:5459
-msgid "show colored diff"
-msgstr ""
-
-#: diff.c:5460
-msgid "<kind>"
-msgstr ""
-
-#: diff.c:5461
-msgid ""
-"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
-"diff"
-msgstr ""
-
-#: diff.c:5464
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
-msgid "<prefix>"
-msgstr ""
-
-#: diff.c:5468
-msgid "show the given source prefix instead of \"a/\""
-msgstr ""
-
-#: diff.c:5471
-msgid "show the given destination prefix instead of \"b/\""
-msgstr ""
-
-#: diff.c:5474
-msgid "prepend an additional prefix to every line of output"
-msgstr ""
-
-#: diff.c:5477
-msgid "do not show any source or destination prefix"
-msgstr ""
-
-#: diff.c:5480
-msgid "show context between diff hunks up to the specified number of lines"
-msgstr ""
-
-#: diff.c:5484 diff.c:5489 diff.c:5494
-msgid "<char>"
-msgstr ""
-
-#: diff.c:5485
-msgid "specify the character to indicate a new line instead of '+'"
-msgstr ""
-
-#: diff.c:5490
-msgid "specify the character to indicate an old line instead of '-'"
-msgstr ""
-
-#: diff.c:5495
-msgid "specify the character to indicate a context instead of ' '"
-msgstr ""
-
-#: diff.c:5498
-msgid "Diff rename options"
-msgstr ""
-
-#: diff.c:5499
-msgid "<n>[/<m>]"
-msgstr ""
-
-#: diff.c:5500
-msgid "break complete rewrite changes into pairs of delete and create"
-msgstr ""
-
-#: diff.c:5504
-msgid "detect renames"
-msgstr ""
-
-#: diff.c:5508
-msgid "omit the preimage for deletes"
-msgstr ""
-
-#: diff.c:5511
-msgid "detect copies"
-msgstr ""
-
-#: diff.c:5515
-msgid "use unmodified files as source to find copies"
-msgstr ""
-
-#: diff.c:5517
-msgid "disable rename detection"
-msgstr ""
-
-#: diff.c:5520
-msgid "use empty blobs as rename source"
-msgstr ""
-
-#: diff.c:5522
-msgid "continue listing the history of a file beyond renames"
-msgstr ""
-
-#: diff.c:5525
-msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr ""
-
-#: diff.c:5527
-msgid "Diff algorithm options"
-msgstr ""
-
-#: diff.c:5529
-msgid "produce the smallest possible diff"
-msgstr ""
-
-#: diff.c:5532
-msgid "ignore whitespace when comparing lines"
-msgstr ""
-
-#: diff.c:5535
-msgid "ignore changes in amount of whitespace"
-msgstr ""
-
-#: diff.c:5538
-msgid "ignore changes in whitespace at EOL"
-msgstr ""
-
-#: diff.c:5541
-msgid "ignore carrier-return at the end of line"
-msgstr ""
-
-#: diff.c:5544
-msgid "ignore changes whose lines are all blank"
-msgstr ""
-
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
-msgid "<regex>"
-msgstr ""
-
-#: diff.c:5547
-msgid "ignore changes whose all lines match <regex>"
-msgstr ""
-
-#: diff.c:5550
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr ""
-
-#: diff.c:5553
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr ""
-
-#: diff.c:5557
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr ""
-
-#: diff.c:5559
-msgid "<algorithm>"
-msgstr ""
-
-#: diff.c:5560
-msgid "choose a diff algorithm"
-msgstr ""
-
-#: diff.c:5562
-msgid "<text>"
-msgstr ""
-
-#: diff.c:5563
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr ""
-
-#: diff.c:5565 diff.c:5574 diff.c:5577
-msgid "<mode>"
-msgstr ""
-
-#: diff.c:5566
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr ""
-
-#: diff.c:5569
-msgid "use <regex> to decide what a word is"
-msgstr ""
-
-#: diff.c:5572
-msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr ""
-
-#: diff.c:5575
-msgid "moved lines of code are colored differently"
-msgstr ""
-
-#: diff.c:5578
-msgid "how white spaces are ignored in --color-moved"
-msgstr ""
-
-#: diff.c:5581
-msgid "Other diff options"
-msgstr ""
-
-#: diff.c:5583
-msgid "when run from subdir, exclude changes outside and show relative paths"
-msgstr ""
-
-#: diff.c:5587
-msgid "treat all files as text"
-msgstr ""
-
-#: diff.c:5589
-msgid "swap two inputs, reverse the diff"
-msgstr ""
-
-#: diff.c:5591
-msgid "exit with 1 if there were differences, 0 otherwise"
-msgstr ""
-
-#: diff.c:5593
-msgid "disable all output of the program"
-msgstr ""
-
-#: diff.c:5595
-msgid "allow an external diff helper to be executed"
-msgstr ""
-
-#: diff.c:5597
-msgid "run external text conversion filters when comparing binary files"
-msgstr ""
-
-#: diff.c:5599
-msgid "<when>"
-msgstr ""
-
-#: diff.c:5600
-msgid "ignore changes to submodules in the diff generation"
-msgstr ""
-
-#: diff.c:5603
-msgid "<format>"
-msgstr ""
-
-#: diff.c:5604
-msgid "specify how differences in submodules are shown"
-msgstr ""
-
-#: diff.c:5608
-msgid "hide 'git add -N' entries from the index"
-msgstr ""
-
-#: diff.c:5611
-msgid "treat 'git add -N' entries as real in the index"
-msgstr ""
-
-#: diff.c:5613
-msgid "<string>"
-msgstr ""
-
-#: diff.c:5614
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"string"
-msgstr ""
-
-#: diff.c:5617
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"regex"
-msgstr ""
-
-#: diff.c:5620
-msgid "show all changes in the changeset with -S or -G"
-msgstr ""
-
-#: diff.c:5623
-msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr ""
-
-#: diff.c:5626
-msgid "control the order in which files appear in the output"
-msgstr ""
-
-#: diff.c:5627 diff.c:5630
-msgid "<path>"
-msgstr ""
-
-#: diff.c:5628
-msgid "show the change in the specified path first"
-msgstr ""
-
-#: diff.c:5631
-msgid "skip the output to the specified path"
-msgstr ""
-
-#: diff.c:5633
-msgid "<object-id>"
-msgstr ""
-
-#: diff.c:5634
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"object"
-msgstr ""
-
-#: diff.c:5636
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr ""
-
-#: diff.c:5637
-msgid "select files by diff type"
-msgstr ""
-
-#: diff.c:5639
-msgid "<file>"
-msgstr ""
-
-#: diff.c:5640
-msgid "Output to a specific file"
-msgstr ""
-
-#: diff.c:6298
-msgid "exhaustive rename detection was skipped due to too many files."
-msgstr ""
-
-#: diff.c:6301
-msgid "only found copies from modified paths due to too many files."
-msgstr ""
-
-#: diff.c:6304
-#, 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:1514
-msgid "Performing inexact rename detection"
-msgstr ""
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr ""
-
-#: dir.c:593
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr ""
-
-#: dir.c:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr ""
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr ""
-
-#: dir.c:820
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr ""
-
-#: dir.c:830
-msgid "disabling cone pattern matching"
-msgstr ""
-
-#: dir.c:1214
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr ""
-
-#: dir.c:2351
-#, c-format
-msgid "could not open directory '%s'"
-msgstr ""
-
-#: dir.c:2653
-msgid "failed to get kernel name and information"
-msgstr ""
-
-#: dir.c:2777
-msgid "untracked cache is disabled on this system or location"
-msgstr ""
-
-#: dir.c:3610
-#, c-format
-msgid "index file corrupt in repo %s"
-msgstr ""
-
-#: dir.c:3657 dir.c:3662
-#, c-format
-msgid "could not create directories for %s"
-msgstr ""
-
-#: dir.c:3691
-#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
-msgstr ""
-
-#: editor.c:74
-#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
-msgstr ""
-
-#: entry.c:176
-msgid "Filtering content"
-msgstr ""
-
-#: entry.c:497
-#, c-format
-msgid "could not stat file '%s'"
-msgstr ""
-
-#: environment.c:152
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr ""
-
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr ""
-
-#: exec-cmd.c:363
-#, c-format
-msgid "too many args to run %s"
-msgstr ""
-
-#: fetch-pack.c:182
-msgid "git fetch-pack: expected shallow list"
-msgstr ""
-
-#: fetch-pack.c:185
-msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr ""
-
-#: fetch-pack.c:196
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr ""
-
-#: fetch-pack.c:216
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr ""
-
-#: fetch-pack.c:227
-msgid "unable to write to remote"
-msgstr ""
-
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr ""
-
-#: fetch-pack.c:383 fetch-pack.c:1423
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr ""
-
-#: fetch-pack.c:389 fetch-pack.c:1429
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr ""
-
-#: fetch-pack.c:391 fetch-pack.c:1431
-#, c-format
-msgid "object not found: %s"
-msgstr ""
-
-#: fetch-pack.c:394 fetch-pack.c:1434
-#, c-format
-msgid "error in object: %s"
-msgstr ""
-
-#: fetch-pack.c:396 fetch-pack.c:1436
-#, c-format
-msgid "no shallow found: %s"
-msgstr ""
-
-#: fetch-pack.c:399 fetch-pack.c:1440
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr ""
-
-#: fetch-pack.c:439
-#, c-format
-msgid "got %s %d %s"
-msgstr ""
-
-#: fetch-pack.c:456
-#, c-format
-msgid "invalid commit %s"
-msgstr ""
-
-#: fetch-pack.c:487
-msgid "giving up"
-msgstr ""
-
-#: fetch-pack.c:500 progress.c:339
-msgid "done"
-msgstr ""
-
-#: fetch-pack.c:512
-#, c-format
-msgid "got %s (%d) %s"
-msgstr ""
-
-#: fetch-pack.c:548
-#, c-format
-msgid "Marking %s as complete"
-msgstr ""
-
-#: fetch-pack.c:763
-#, c-format
-msgid "already have %s (%s)"
-msgstr ""
-
-#: fetch-pack.c:849
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr ""
-
-#: fetch-pack.c:857
-msgid "protocol error: bad pack header"
-msgstr ""
-
-#: fetch-pack.c:951
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr ""
-
-#: fetch-pack.c:957
-msgid "fetch-pack: invalid index-pack output"
-msgstr ""
-
-#: fetch-pack.c:974
-#, c-format
-msgid "%s failed"
-msgstr ""
-
-#: fetch-pack.c:976
-msgid "error in sideband demultiplexer"
-msgstr ""
-
-#: fetch-pack.c:1019
-#, c-format
-msgid "Server version is %.*s"
-msgstr ""
-
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
-#, c-format
-msgid "Server supports %s"
-msgstr ""
-
-#: fetch-pack.c:1029
-msgid "Server does not support shallow clients"
-msgstr ""
-
-#: fetch-pack.c:1089
-msgid "Server does not support --shallow-since"
-msgstr ""
-
-#: fetch-pack.c:1094
-msgid "Server does not support --shallow-exclude"
-msgstr ""
-
-#: fetch-pack.c:1098
-msgid "Server does not support --deepen"
-msgstr ""
-
-#: fetch-pack.c:1100
-msgid "Server does not support this repository's object format"
-msgstr ""
-
-#: fetch-pack.c:1113
-msgid "no common commits"
-msgstr ""
-
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
-msgid "source repository is shallow, reject to clone."
-msgstr ""
-
-#: fetch-pack.c:1128 fetch-pack.c:1660
-msgid "git fetch-pack: fetch failed."
-msgstr ""
-
-#: fetch-pack.c:1242
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr ""
-
-#: fetch-pack.c:1246
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr ""
-
-#: fetch-pack.c:1279
-msgid "Server does not support shallow requests"
-msgstr ""
-
-#: fetch-pack.c:1286
-msgid "Server supports filter"
-msgstr ""
-
-#: fetch-pack.c:1329 fetch-pack.c:2043
-msgid "unable to write request to remote"
-msgstr ""
-
-#: fetch-pack.c:1347
-#, c-format
-msgid "error reading section header '%s'"
-msgstr ""
-
-#: fetch-pack.c:1353
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr ""
-
-#: fetch-pack.c:1387
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr ""
-
-#: fetch-pack.c:1392
-#, c-format
-msgid "error processing acks: %d"
-msgstr ""
-
-#: fetch-pack.c:1402
-msgid "expected packfile to be sent after 'ready'"
-msgstr ""
-
-#: fetch-pack.c:1404
-msgid "expected no other sections to be sent after no 'ready'"
-msgstr ""
-
-#: fetch-pack.c:1445
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr ""
-
-#: fetch-pack.c:1494
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr ""
-
-#: fetch-pack.c:1499
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr ""
-
-#: fetch-pack.c:1504
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr ""
-
-#: fetch-pack.c:1534
-msgid "git fetch-pack: expected response end packet"
-msgstr ""
-
-#: fetch-pack.c:1939
-msgid "no matching remote head"
-msgstr ""
-
-#: fetch-pack.c:1962 builtin/clone.c:697
-msgid "remote did not send all necessary objects"
-msgstr ""
-
-#: fetch-pack.c:2065
-msgid "unexpected 'ready' from remote"
-msgstr ""
-
-#: fetch-pack.c:2088
-#, c-format
-msgid "no such remote ref %s"
-msgstr ""
-
-#: fetch-pack.c:2091
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
-msgstr ""
-
-#: gpg-interface.c:273
-msgid "could not create temporary file"
-msgstr ""
-
-#: gpg-interface.c:276
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr ""
-
-#: gpg-interface.c:470
-msgid "gpg failed to sign the data"
-msgstr ""
-
-#: graph.c:98
-#, c-format
-msgid "ignored invalid color '%.*s' in log.graphColors"
-msgstr ""
-
-#: grep.c:531
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-
-#: grep.c:1895
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr ""
-
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
-#: builtin/rm.c:136
-#, c-format
-msgid "failed to stat '%s'"
-msgstr ""
-
-#: grep.c:1923
-#, c-format
-msgid "'%s': short read"
-msgstr ""
-
-#: help.c:23
-msgid "start a working area (see also: git help tutorial)"
-msgstr ""
-
-#: help.c:24
-msgid "work on the current change (see also: git help everyday)"
-msgstr ""
-
-#: help.c:25
-msgid "examine the history and state (see also: git help revisions)"
-msgstr ""
-
-#: help.c:26
-msgid "grow, mark and tweak your common history"
-msgstr ""
-
-#: help.c:27
-msgid "collaborate (see also: git help workflows)"
-msgstr ""
-
-#: help.c:31
-msgid "Main Porcelain Commands"
-msgstr ""
-
-#: help.c:32
-msgid "Ancillary Commands / Manipulators"
-msgstr ""
-
-#: help.c:33
-msgid "Ancillary Commands / Interrogators"
-msgstr ""
-
-#: help.c:34
-msgid "Interacting with Others"
-msgstr ""
-
-#: help.c:35
-msgid "Low-level Commands / Manipulators"
-msgstr ""
-
-#: help.c:36
-msgid "Low-level Commands / Interrogators"
-msgstr ""
-
-#: help.c:37
-msgid "Low-level Commands / Syncing Repositories"
-msgstr ""
-
-#: help.c:38
-msgid "Low-level Commands / Internal Helpers"
-msgstr ""
-
-#: help.c:300
-#, c-format
-msgid "available git commands in '%s'"
-msgstr ""
-
-#: help.c:307
-msgid "git commands available from elsewhere on your $PATH"
-msgstr ""
-
-#: help.c:316
-msgid "These are common Git commands used in various situations:"
-msgstr ""
-
-#: help.c:365 git.c:100
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr ""
-
-#: help.c:405
-msgid "The Git concept guides are:"
-msgstr ""
-
-#: help.c:429
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr ""
-
-#: help.c:434
-msgid "External commands"
-msgstr ""
-
-#: help.c:449
-msgid "Command aliases"
-msgstr ""
-
-#: help.c:527
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-
-#: help.c:543 help.c:631
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr ""
-
-#: help.c:591
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr ""
-
-#: help.c:613
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr ""
-
-#: help.c:618
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr ""
-
-#: help.c:623
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr ""
-
-#: help.c:635
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-msgstr[1] ""
-
-#: help.c:675
-msgid "git version [<options>]"
-msgstr ""
-
-#: help.c:730
-#, c-format
-msgid "%s: %s - %s"
-msgstr ""
-
-#: help.c:734
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ident.c:353
-msgid "Author identity unknown\n"
-msgstr ""
-
-#: ident.c:356
-msgid "Committer identity unknown\n"
-msgstr ""
-
-#: ident.c:362
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-" git config --global user.email \"you@example.com\"\n"
-" git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-
-#: ident.c:397
-msgid "no email was given and auto-detection is disabled"
-msgstr ""
-
-#: ident.c:402
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr ""
-
-#: ident.c:419
-msgid "no name was given and auto-detection is disabled"
-msgstr ""
-
-#: ident.c:425
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr ""
-
-#: ident.c:433
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr ""
-
-#: ident.c:439
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr ""
-
-#: ident.c:454 builtin/commit.c:647
-#, c-format
-msgid "invalid date format: %s"
-msgstr ""
-
-#: list-objects-filter-options.c:83
-msgid "expected 'tree:<depth>'"
-msgstr ""
-
-#: list-objects-filter-options.c:98
-msgid "sparse:path filters support has been dropped"
-msgstr ""
-
-#: list-objects-filter-options.c:105
-#, c-format
-msgid "'%s' for 'object:type=<type>' is not a valid object type"
-msgstr ""
-
-#: list-objects-filter-options.c:124
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr ""
-
-#: list-objects-filter-options.c:140
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr ""
-
-#: list-objects-filter-options.c:182
-msgid "expected something after combine:"
-msgstr ""
-
-#: list-objects-filter-options.c:264
-msgid "multiple filter-specs cannot be combined"
-msgstr ""
-
-#: list-objects-filter-options.c:376
-msgid "unable to upgrade repository format to support partial clone"
-msgstr ""
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr ""
-
-#: list-objects-filter.c:535
-#, 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:398
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr ""
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr ""
-
-#: ls-refs.c:37
-#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr ""
-
-#: ls-refs.c:167
-msgid "expected flush after ls-refs arguments"
-msgstr ""
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr ""
-
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
-#, c-format
-msgid "bad action '%s' for '%s'"
-msgstr ""
-
-#: merge-ort.c:1569 merge-recursive.c:1201
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr ""
-
-#: merge-ort.c:1578 merge-recursive.c:1208
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr ""
-
-#: merge-ort.c:1587 merge-recursive.c:1215
-#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr ""
-
-#: merge-ort.c:1597 merge-ort.c:1604
-#, c-format
-msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr ""
-
-#: merge-ort.c:1625
-#, c-format
-msgid "Failed to merge submodule %s"
-msgstr ""
-
-#: merge-ort.c:1632
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-
-#: merge-ort.c:1636 merge-recursive.c:1269
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-
-#: merge-ort.c:1649
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but multiple possible merges exist:\n"
-"%s"
-msgstr ""
-
-#: merge-ort.c:1868 merge-recursive.c:1358
-msgid "Failed to execute internal merge"
-msgstr ""
-
-#: merge-ort.c:1873 merge-recursive.c:1363
-#, c-format
-msgid "Unable to add %s to database"
-msgstr ""
-
-#: merge-ort.c:1880 merge-recursive.c:1396
-#, c-format
-msgid "Auto-merging %s"
-msgstr ""
-
-#: merge-ort.c:2019 merge-recursive.c:2118
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
-"implicit directory rename(s) putting the following path(s) there: %s."
-msgstr ""
-
-#: merge-ort.c:2029 merge-recursive.c:2128
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
-"implicit directory renames tried to put these paths there: %s"
-msgstr ""
-
-#: merge-ort.c:2087
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"majority of the files."
-msgstr ""
-
-#: merge-ort.c:2241 merge-recursive.c:2464
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-
-#: merge-ort.c:2385 merge-recursive.c:3247
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-
-#: merge-ort.c:2392 merge-recursive.c:3254
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-
-#: merge-ort.c:2405 merge-recursive.c:3250
-#, c-format
-msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-
-#: merge-ort.c:2413 merge-recursive.c:3257
-#, c-format
-msgid ""
-"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
-"was renamed in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-
-#: merge-ort.c:2569
-#, c-format
-msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
-msgstr ""
-
-#: merge-ort.c:2664
-#, c-format
-msgid ""
-"CONFLICT (rename involved in collision): rename of %s -> %s has content "
-"conflicts AND collides with another path; this may result in nested conflict "
-"markers."
-msgstr ""
-
-#: merge-ort.c:2683 merge-ort.c:2707
-#, c-format
-msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
-msgstr ""
-
-#: merge-ort.c:3182 merge-recursive.c:3008
-#, c-format
-msgid "cannot read object %s"
-msgstr ""
-
-#: merge-ort.c:3185 merge-recursive.c:3011
-#, c-format
-msgid "object %s is not a blob"
-msgstr ""
-
-#: merge-ort.c:3613
-#, c-format
-msgid ""
-"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
-"%s instead."
-msgstr ""
-
-#: merge-ort.c:3689
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed both "
-"of them so each can be recorded somewhere."
-msgstr ""
-
-#: merge-ort.c:3696
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed one "
-"of them so each can be recorded somewhere."
-msgstr ""
-
-#: merge-ort.c:3796 merge-recursive.c:3087
-msgid "content"
-msgstr ""
-
-#: merge-ort.c:3798 merge-recursive.c:3091
-msgid "add/add"
-msgstr ""
-
-#: merge-ort.c:3800 merge-recursive.c:3136
-msgid "submodule"
-msgstr ""
-
-#: merge-ort.c:3802 merge-recursive.c:3137
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr ""
-
-#: merge-ort.c:3833
-#, c-format
-msgid ""
-"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
-"of %s left in tree."
-msgstr ""
-
-#: merge-ort.c:4120
-#, c-format
-msgid ""
-"Note: %s not up to date and in way of checking out conflicted version; old "
-"copy renamed to %s"
-msgstr ""
-
-#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
-#. base, and 2-3) the trees for the two trees we're merging.
-#.
-#: merge-ort.c:4487
-#, c-format
-msgid "collecting merge info failed for trees %s, %s, %s"
-msgstr ""
-
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
-msgid "Already up to date."
-msgstr ""
-
-#: merge-recursive.c:352
-msgid "(bad commit)\n"
-msgstr ""
-
-#: merge-recursive.c:375
-#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr ""
-
-#: merge-recursive.c:384
-#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr ""
-
-#: merge-recursive.c:872
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr ""
-
-#: merge-recursive.c:883
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr ""
-
-#: merge-recursive.c:897 merge-recursive.c:916
-msgid ": perhaps a D/F conflict?"
-msgstr ""
-
-#: merge-recursive.c:906
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr ""
-
-#: merge-recursive.c:947 builtin/cat-file.c:41
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr ""
-
-#: merge-recursive.c:952
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr ""
-
-#: merge-recursive.c:977
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr ""
-
-#: merge-recursive.c:988
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr ""
-
-#: merge-recursive.c:993
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr ""
-
-#: merge-recursive.c:1223 merge-recursive.c:1235
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr ""
-
-#: merge-recursive.c:1226 merge-recursive.c:1238
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr ""
-
-#: merge-recursive.c:1261
-#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr ""
-
-#: merge-recursive.c:1265
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr ""
-
-#: merge-recursive.c:1266
-msgid "Found a possible merge resolution for the submodule:\n"
-msgstr ""
-
-#: merge-recursive.c:1278
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr ""
-
-#: merge-recursive.c:1420
-#, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr ""
-
-#: merge-recursive.c:1492
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-
-#: merge-recursive.c:1497
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
-msgstr ""
-
-#: merge-recursive.c:1504
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr ""
-
-#: merge-recursive.c:1509
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree at %s."
-msgstr ""
-
-#: merge-recursive.c:1544
-msgid "rename"
-msgstr ""
-
-#: merge-recursive.c:1544
-msgid "renamed"
-msgstr ""
-
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr ""
-
-#: merge-recursive.c:1605
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-
-#: merge-recursive.c:1663
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
-msgstr ""
-
-#: merge-recursive.c:1694
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr ""
-
-#: merge-recursive.c:1699
-#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr ""
-
-#: merge-recursive.c:1726
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
-msgstr ""
-
-#: merge-recursive.c:1731
-msgid " (left unresolved)"
-msgstr ""
-
-#: merge-recursive.c:1823
-#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
-msgstr ""
-
-#: merge-recursive.c:2086
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-
-#: merge-recursive.c:2220
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-
-#: merge-recursive.c:3075
-msgid "modify"
-msgstr ""
-
-#: merge-recursive.c:3075
-msgid "modified"
-msgstr ""
-
-#: merge-recursive.c:3114
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr ""
-
-#: merge-recursive.c:3167
-#, c-format
-msgid "Adding as %s instead"
-msgstr ""
-
-#: merge-recursive.c:3371
-#, c-format
-msgid "Removing %s"
-msgstr ""
-
-#: merge-recursive.c:3394
-msgid "file/directory"
-msgstr ""
-
-#: merge-recursive.c:3399
-msgid "directory/file"
-msgstr ""
-
-#: merge-recursive.c:3406
-#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr ""
-
-#: merge-recursive.c:3415
-#, c-format
-msgid "Adding %s"
-msgstr ""
-
-#: merge-recursive.c:3424
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr ""
-
-#: merge-recursive.c:3477
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr ""
-
-#: merge-recursive.c:3571
-msgid "Merging:"
-msgstr ""
-
-#: merge-recursive.c:3584
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: merge-recursive.c:3634
-msgid "merge returned no commit"
-msgstr ""
-
-#: merge-recursive.c:3799
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr ""
-
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
-msgid "Unable to write index."
-msgstr ""
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr ""
-
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
-msgid "unable to write new index file"
-msgstr ""
-
-#: midx.c:74
-msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr ""
-
-#: midx.c:105
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr ""
-
-#: midx.c:121
-#, c-format
-msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
-msgstr ""
-
-#: midx.c:126
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr ""
-
-#: midx.c:131
-#, c-format
-msgid "multi-pack-index hash version %u does not match version %u"
-msgstr ""
-
-#: midx.c:148
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr ""
-
-#: midx.c:150
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr ""
-
-#: midx.c:152
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr ""
-
-#: midx.c:154
-msgid "multi-pack-index missing required object offsets chunk"
-msgstr ""
-
-#: midx.c:170
-#, c-format
-msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr ""
-
-#: midx.c:214
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr ""
-
-#: midx.c:264
-msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr ""
-
-#: midx.c:490
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr ""
-
-#: midx.c:496
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr ""
-
-#: midx.c:564
-#, c-format
-msgid "failed to locate object %d in packfile"
-msgstr ""
-
-#: midx.c:880 builtin/index-pack.c:1533
-msgid "cannot store reverse index file"
-msgstr ""
-
-#: midx.c:920
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr ""
-
-#: midx.c:943
-msgid "Adding packfiles to multi-pack-index"
-msgstr ""
-
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr ""
-
-#: midx.c:1034
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr ""
-
-#: midx.c:1039
-#, c-format
-msgid "preferred pack '%s' is expired"
-msgstr ""
-
-#: midx.c:1055
-msgid "no pack files to index."
-msgstr ""
-
-#: midx.c:1135 builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr ""
-
-#: midx.c:1166
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr ""
-
-#: midx.c:1225
-msgid "multi-pack-index file exists, but failed to parse"
-msgstr ""
-
-#: midx.c:1233
-msgid "incorrect checksum"
-msgstr ""
-
-#: midx.c:1236
-msgid "Looking for referenced packfiles"
-msgstr ""
-
-#: midx.c:1251
-#, c-format
-msgid ""
-"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-msgstr ""
-
-#: midx.c:1256
-msgid "the midx contains no oid"
-msgstr ""
-
-#: midx.c:1265
-msgid "Verifying OID order in multi-pack-index"
-msgstr ""
-
-#: midx.c:1274
-#, c-format
-msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
-msgstr ""
-
-#: midx.c:1294
-msgid "Sorting objects by packfile"
-msgstr ""
-
-#: midx.c:1301
-msgid "Verifying object offsets"
-msgstr ""
-
-#: midx.c:1317
-#, c-format
-msgid "failed to load pack entry for oid[%d] = %s"
-msgstr ""
-
-#: midx.c:1323
-#, c-format
-msgid "failed to load pack-index for packfile %s"
-msgstr ""
-
-#: midx.c:1332
-#, c-format
-msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-msgstr ""
-
-#: midx.c:1357
-msgid "Counting referenced objects"
-msgstr ""
-
-#: midx.c:1367
-msgid "Finding and deleting unreferenced packfiles"
-msgstr ""
-
-#: midx.c:1558
-msgid "could not start pack-objects"
-msgstr ""
-
-#: midx.c:1578
-msgid "could not finish pack-objects"
-msgstr ""
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr ""
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr ""
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr ""
-
-#: notes-merge.c:277
-#, c-format
-msgid ""
-"You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
-"commit/abort the previous merge before you start a new notes merge."
-msgstr ""
-
-#: notes-merge.c:284
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr ""
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr ""
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr ""
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr ""
-
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#.
-#: notes-utils.c:145
-#, c-format
-msgid "Bad %s value: '%s'"
-msgstr ""
-
-#: object-file.c:526
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-
-#: object-file.c:584
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr ""
-
-#: object-file.c:658
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-
-#: object-file.c:665
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr ""
-
-#: object-file.c:708
-msgid "unable to fdopen alternates lockfile"
-msgstr ""
-
-#: object-file.c:726
-msgid "unable to read alternates file"
-msgstr ""
-
-#: object-file.c:733
-msgid "unable to move new alternates file into place"
-msgstr ""
-
-#: object-file.c:768
-#, c-format
-msgid "path '%s' does not exist"
-msgstr ""
-
-#: object-file.c:789
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-
-#: object-file.c:795
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr ""
-
-#: object-file.c:801
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr ""
-
-#: object-file.c:809
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr ""
-
-#: object-file.c:869
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
-#: object-file.c:1019
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
-
-#: object-file.c:1054
-#, c-format
-msgid "mmap failed%s"
-msgstr ""
-
-#: object-file.c:1218
-#, c-format
-msgid "object file %s is empty"
-msgstr ""
-
-#: object-file.c:1353 object-file.c:2548
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr ""
-
-#: object-file.c:1355 object-file.c:2552
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr ""
-
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr ""
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr ""
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-
-#: object-file.c:1493
-#, c-format
-msgid "unable to parse %s header"
-msgstr ""
-
-#: object-file.c:1717
-#, c-format
-msgid "failed to read object %s"
-msgstr ""
-
-#: object-file.c:1721
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr ""
-
-#: object-file.c:1725
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr ""
-
-#: object-file.c:1729
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr ""
-
-#: object-file.c:1834
-#, c-format
-msgid "unable to write file %s"
-msgstr ""
-
-#: object-file.c:1841
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr ""
-
-#: object-file.c:1848
-msgid "file write error"
-msgstr ""
-
-#: object-file.c:1868
-msgid "error when closing loose object file"
-msgstr ""
-
-#: object-file.c:1933
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-
-#: object-file.c:1935
-msgid "unable to create temporary file"
-msgstr ""
-
-#: object-file.c:1959
-msgid "unable to write loose object file"
-msgstr ""
-
-#: object-file.c:1965
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr ""
-
-#: object-file.c:1969
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr ""
-
-#: object-file.c:1973
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr ""
-
-#: object-file.c:1983 builtin/pack-objects.c:1237
-#, c-format
-msgid "failed utime() on %s"
-msgstr ""
-
-#: object-file.c:2060
-#, c-format
-msgid "cannot read object for %s"
-msgstr ""
-
-#: object-file.c:2111
-msgid "corrupt commit"
-msgstr ""
-
-#: object-file.c:2119
-msgid "corrupt tag"
-msgstr ""
-
-#: object-file.c:2219
-#, c-format
-msgid "read error while indexing %s"
-msgstr ""
-
-#: object-file.c:2222
-#, c-format
-msgid "short read while indexing %s"
-msgstr ""
-
-#: object-file.c:2295 object-file.c:2305
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr ""
-
-#: object-file.c:2311
-#, c-format
-msgid "%s: unsupported file type"
-msgstr ""
-
-#: object-file.c:2335
-#, c-format
-msgid "%s is not a valid object"
-msgstr ""
-
-#: object-file.c:2337
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr ""
-
-#: object-file.c:2364 builtin/index-pack.c:192
-#, c-format
-msgid "unable to open %s"
-msgstr ""
-
-#: object-file.c:2559 object-file.c:2612
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr ""
-
-#: object-file.c:2583
-#, c-format
-msgid "unable to mmap %s"
-msgstr ""
-
-#: object-file.c:2588
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr ""
-
-#: object-file.c:2594
-#, c-format
-msgid "unable to parse header of %s"
-msgstr ""
-
-#: object-file.c:2605
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr ""
-
-#: object-name.c:480
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr ""
-
-#: object-name.c:491
-msgid "The candidates are:"
-msgstr ""
-
-#: object-name.c:790
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-
-#: object-name.c:910
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr ""
-
-#: object-name.c:918
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr ""
-
-#: object-name.c:1696
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr ""
-
-#: object-name.c:1702
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-
-#: object-name.c:1711
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr ""
-
-#: object-name.c:1739
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-
-#: object-name.c:1755
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-
-#: object-name.c:1763
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr ""
-
-#: object-name.c:1765
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr ""
-
-#: object-name.c:1778
-msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-
-#: object-name.c:1916
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr ""
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr ""
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr ""
-
-#: object.c:250
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr ""
-
-#: object.c:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr ""
-
-#: object.c:283 object.c:295
-#, c-format
-msgid "hash mismatch %s"
-msgstr ""
-
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
-#, c-format
-msgid "unable to get size of %s"
-msgstr ""
-
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
-#, c-format
-msgid "unable to get disk usage of %s"
-msgstr ""
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr ""
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr ""
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr ""
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr ""
-
-#: pack-revindex.c:243
-#, c-format
-msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
-msgstr ""
-
-#: pack-write.c:250
-msgid "cannot both write and verify reverse index"
-msgstr ""
-
-#: pack-write.c:271
-#, c-format
-msgid "could not stat: %s"
-msgstr ""
-
-#: pack-write.c:283
-#, c-format
-msgid "failed to make %s readable"
-msgstr ""
-
-#: pack-write.c:522
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr ""
-
-#: packfile.c:625
-msgid "offset before end of packfile (broken .idx?)"
-msgstr ""
-
-#: packfile.c:655
-#, c-format
-msgid "packfile %s cannot be mapped%s"
-msgstr ""
-
-#: packfile.c:1934
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr ""
-
-#: packfile.c:1938
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr ""
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr ""
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr ""
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr ""
-
-#: parse-options-cb.c:132 parse-options-cb.c:149
-#, c-format
-msgid "malformed object name '%s'"
-msgstr ""
-
-#: parse-options.c:38
-#, c-format
-msgid "%s requires a value"
-msgstr ""
-
-#: parse-options.c:73
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr ""
-
-#: parse-options.c:78
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr ""
-
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
-#, c-format
-msgid "%s takes no value"
-msgstr ""
-
-#: parse-options.c:94
-#, c-format
-msgid "%s isn't available"
-msgstr ""
-
-#: parse-options.c:217
-#, c-format
-msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
-msgstr ""
-
-#: parse-options.c:386
-#, c-format
-msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
-msgstr ""
-
-#: parse-options.c:420 parse-options.c:428
-#, c-format
-msgid "did you mean `--%s` (with two dashes)?"
-msgstr ""
-
-#: parse-options.c:668 parse-options.c:988
-#, c-format
-msgid "alias of --%s"
-msgstr ""
-
-#: parse-options.c:879
-#, c-format
-msgid "unknown option `%s'"
-msgstr ""
-
-#: parse-options.c:881
-#, c-format
-msgid "unknown switch `%c'"
-msgstr ""
-
-#: parse-options.c:883
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr ""
-
-#: parse-options.c:907
-msgid "..."
-msgstr ""
-
-#: parse-options.c:926
-#, c-format
-msgid "usage: %s"
-msgstr ""
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:932
-#, c-format
-msgid " or: %s"
-msgstr ""
-
-#: parse-options.c:935
-#, c-format
-msgid " %s"
-msgstr ""
-
-#: parse-options.c:974
-msgid "-NUM"
-msgstr ""
-
-#: path.c:915
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr ""
-
-#: pathspec.c:151
-msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr ""
-
-#: pathspec.c:169
-msgid "Only one 'attr:' specification is allowed."
-msgstr ""
-
-#: pathspec.c:172
-msgid "attr spec must not be empty"
-msgstr ""
-
-#: pathspec.c:215
-#, c-format
-msgid "invalid attribute name %s"
-msgstr ""
-
-#: pathspec.c:280
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr ""
-
-#: pathspec.c:287
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-
-#: pathspec.c:327
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr ""
-
-#: pathspec.c:348
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr ""
-
-#: pathspec.c:353
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr ""
-
-#: pathspec.c:391
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr ""
-
-#: pathspec.c:450
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr ""
-
-#: pathspec.c:466
-#, c-format
-msgid "%s: '%s' is outside repository at '%s'"
-msgstr ""
-
-#: pathspec.c:542
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr ""
-
-#: pathspec.c:552
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr ""
-
-#: pathspec.c:619
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr ""
-
-#: pathspec.c:664
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr ""
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr ""
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr ""
-
-#: pkt-line.c:106
-msgid "unable to write response end packet"
-msgstr ""
-
-#: pkt-line.c:113
-msgid "flush packet write failed"
-msgstr ""
-
-#: pkt-line.c:153 pkt-line.c:265
-msgid "protocol error: impossibly long line"
-msgstr ""
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr ""
-
-#: pkt-line.c:204
-msgid "packet write failed - data exceeds max packet size"
-msgstr ""
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr ""
-
-#: pkt-line.c:328 pkt-line.c:329
-msgid "read error"
-msgstr ""
-
-#: pkt-line.c:339 pkt-line.c:340
-msgid "the remote end hung up unexpectedly"
-msgstr ""
-
-#: pkt-line.c:369 pkt-line.c:371
-#, c-format
-msgid "protocol error: bad line length character: %.4s"
-msgstr ""
-
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr ""
-
-#: pkt-line.c:413 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr ""
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr ""
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr ""
-
-#: pretty.c:988
-msgid "unable to parse --pretty format"
-msgstr ""
-
-#: promisor-remote.c:31
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr ""
-
-#: promisor-remote.c:38 promisor-remote.c:40
-msgid "promisor-remote: could not write to fetch subprocess"
-msgstr ""
-
-#: promisor-remote.c:44
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr ""
-
-#: promisor-remote.c:54
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr ""
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr ""
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr ""
-
-#: range-diff.c:78
-msgid "could not start `log`"
-msgstr ""
-
-#: range-diff.c:80
-msgid "could not read `log` output"
-msgstr ""
-
-#: range-diff.c:101 sequencer.c:5550
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr ""
-
-#: range-diff.c:115
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr ""
-
-#: range-diff.c:140
-#, c-format
-msgid "could not parse git header '%.*s'"
-msgstr ""
-
-#: range-diff.c:307
-msgid "failed to generate diff"
-msgstr ""
-
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr ""
-
-#: range-diff.c:562 range-diff.c:564
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr ""
-
-#: read-cache.c:710
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr ""
-
-#: read-cache.c:726
-msgid "cannot create an empty blob in the object database"
-msgstr ""
-
-#: read-cache.c:748
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr ""
-
-#: read-cache.c:753
-#, c-format
-msgid "'%s' does not have a commit checked out"
-msgstr ""
-
-#: read-cache.c:805
-#, c-format
-msgid "unable to index file '%s'"
-msgstr ""
-
-#: read-cache.c:824
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr ""
-
-#: read-cache.c:835
-#, c-format
-msgid "unable to stat '%s'"
-msgstr ""
-
-#: read-cache.c:1358
-#, c-format
-msgid "'%s' appears as both a file and as a directory"
-msgstr ""
-
-#: read-cache.c:1573
-msgid "Refresh index"
-msgstr ""
-
-#: read-cache.c:1705
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-
-#: read-cache.c:1715
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-
-#: read-cache.c:1771
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr ""
-
-#: read-cache.c:1774
-#, c-format
-msgid "bad index version %d"
-msgstr ""
-
-#: read-cache.c:1783
-msgid "bad index file sha1 signature"
-msgstr ""
-
-#: read-cache.c:1817
-#, c-format
-msgid "index uses %.4s extension, which we do not understand"
-msgstr ""
-
-#: read-cache.c:1819
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr ""
-
-#: read-cache.c:1856
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr ""
-
-#: read-cache.c:1872
-#, c-format
-msgid "malformed name field in the index, near path '%s'"
-msgstr ""
-
-#: read-cache.c:1929
-msgid "unordered stage entries in index"
-msgstr ""
-
-#: read-cache.c:1932
-#, c-format
-msgid "multiple stage entries for merged file '%s'"
-msgstr ""
-
-#: read-cache.c:1935
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr ""
-
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
-msgid "index file corrupt"
-msgstr ""
-
-#: read-cache.c:2185
-#, c-format
-msgid "unable to create load_cache_entries thread: %s"
-msgstr ""
-
-#: read-cache.c:2198
-#, c-format
-msgid "unable to join load_cache_entries thread: %s"
-msgstr ""
-
-#: read-cache.c:2231
-#, c-format
-msgid "%s: index file open failed"
-msgstr ""
-
-#: read-cache.c:2235
-#, c-format
-msgid "%s: cannot stat the open index"
-msgstr ""
-
-#: read-cache.c:2239
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr ""
-
-#: read-cache.c:2243
-#, c-format
-msgid "%s: unable to map index file%s"
-msgstr ""
-
-#: read-cache.c:2286
-#, c-format
-msgid "unable to create load_index_extensions thread: %s"
-msgstr ""
-
-#: read-cache.c:2313
-#, c-format
-msgid "unable to join load_index_extensions thread: %s"
-msgstr ""
-
-#: read-cache.c:2351
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr ""
-
-#: read-cache.c:2398
-#, c-format
-msgid "broken index, expect %s in %s, got %s"
-msgstr ""
-
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
-#, c-format
-msgid "could not close '%s'"
-msgstr ""
-
-#: read-cache.c:3075
-msgid "failed to convert to a sparse-index"
-msgstr ""
-
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
-#, c-format
-msgid "could not stat '%s'"
-msgstr ""
-
-#: read-cache.c:3159
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr ""
-
-#: read-cache.c:3171
-#, c-format
-msgid "unable to unlink: %s"
-msgstr ""
-
-#: read-cache.c:3200
-#, c-format
-msgid "cannot fix permission bits on '%s'"
-msgstr ""
-
-#: read-cache.c:3349
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr ""
-
-#: rebase-interactive.c:11
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-
-#: rebase-interactive.c:42
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n"
-" commit's log message, unless -C is used, in which case\n"
-" keep only this commit's message; -c is same as -C but\n"
-" opens the editor\n"
-"x, exec <command> = run command (the rest of the line) using shell\n"
-"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified); use -c <commit> to reword the commit message\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-
-#: rebase-interactive.c:66
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-" git rebase --continue\n"
-"\n"
-msgstr ""
-
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
-#, c-format
-msgid "could not write '%s'"
-msgstr ""
-
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
-#, c-format
-msgid "could not write '%s'."
-msgstr ""
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-
-#: rebase-interactive.c:203
-#, c-format
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
-#, c-format
-msgid "could not read '%s'."
-msgstr ""
-
-#: ref-filter.c:42 wt-status.c:2036
-msgid "gone"
-msgstr ""
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr ""
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr ""
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr ""
-
-#: ref-filter.c:230
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr ""
-
-#: ref-filter.c:232
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr ""
-
-#: ref-filter.c:254
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
-msgstr ""
-
-#: ref-filter.c:258
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr ""
-
-#: ref-filter.c:260
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr ""
-
-#: ref-filter.c:315
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr ""
-
-#: ref-filter.c:339
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr ""
-
-#: ref-filter.c:347
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr ""
-
-#: ref-filter.c:359
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr ""
-
-#: ref-filter.c:372
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr ""
-
-#: ref-filter.c:391
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr ""
-
-#: ref-filter.c:393
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr ""
-
-#: ref-filter.c:424
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr ""
-
-#: ref-filter.c:426
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr ""
-
-#: ref-filter.c:441
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr ""
-
-#: ref-filter.c:445
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr ""
-
-#: ref-filter.c:459
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr ""
-
-#: ref-filter.c:489
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr ""
-
-#: ref-filter.c:501
-#, c-format
-msgid "unrecognized position:%s"
-msgstr ""
-
-#: ref-filter.c:508
-#, c-format
-msgid "unrecognized width:%s"
-msgstr ""
-
-#: ref-filter.c:517
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr ""
-
-#: ref-filter.c:525
-#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr ""
-
-#: ref-filter.c:543
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr ""
-
-#: ref-filter.c:645
-#, c-format
-msgid "malformed field name: %.*s"
-msgstr ""
-
-#: ref-filter.c:672
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr ""
-
-#: ref-filter.c:676
-#, c-format
-msgid ""
-"not a git repository, but the field '%.*s' requires access to object data"
-msgstr ""
-
-#: ref-filter.c:801
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr ""
-
-#: ref-filter.c:865
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr ""
-
-#: ref-filter.c:867
-#, c-format
-msgid "format: %%(then) atom used more than once"
-msgstr ""
-
-#: ref-filter.c:869
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr ""
-
-#: ref-filter.c:897
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr ""
-
-#: ref-filter.c:899
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr ""
-
-#: ref-filter.c:901
-#, c-format
-msgid "format: %%(else) atom used more than once"
-msgstr ""
-
-#: ref-filter.c:916
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr ""
-
-#: ref-filter.c:973
-#, c-format
-msgid "malformed format string %s"
-msgstr ""
-
-#: ref-filter.c:1621
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr ""
-
-#: ref-filter.c:1624
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr ""
-
-#: ref-filter.c:1627
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr ""
-
-#: ref-filter.c:1631
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr ""
-
-#: ref-filter.c:1634
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr ""
-
-#: ref-filter.c:1637
-msgid "(no branch)"
-msgstr ""
-
-#: ref-filter.c:1669 ref-filter.c:1880
-#, c-format
-msgid "missing object %s for %s"
-msgstr ""
-
-#: ref-filter.c:1679
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr ""
-
-#: ref-filter.c:2064
-#, c-format
-msgid "malformed object at '%s'"
-msgstr ""
-
-#: ref-filter.c:2153
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr ""
-
-#: ref-filter.c:2158 refs.c:676
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr ""
-
-#: ref-filter.c:2502
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr ""
-
-#: ref-filter.c:2596
-#, c-format
-msgid "malformed object name %s"
-msgstr ""
-
-#: ref-filter.c:2601
-#, c-format
-msgid "option `%s' must point to a commit"
-msgstr ""
-
-#: refs.c:264
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr ""
-
-#: refs.c:566
-#, c-format
-msgid ""
-"Using '%s' as the name for the initial branch. This default branch name\n"
-"is subject to change. To configure the initial branch name to use in all\n"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-
-#: refs.c:588
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr ""
-
-#: refs.c:598
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr ""
-
-#: refs.c:674
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr ""
-
-#: refs.c:922
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr ""
-
-#: refs.c:929
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr ""
-
-#: refs.c:994
-#, c-format
-msgid "log for %s is empty"
-msgstr ""
-
-#: refs.c:1086
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr ""
-
-#: refs.c:1157
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr ""
-
-#: refs.c:2051
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr ""
-
-#: refs.c:2131
-msgid "ref updates forbidden inside quarantine environment"
-msgstr ""
-
-#: refs.c:2142
-msgid "ref updates aborted by hook"
-msgstr ""
-
-#: refs.c:2242 refs.c:2272
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr ""
-
-#: refs.c:2248 refs.c:2283
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr ""
-
-#: refs/files-backend.c:1228
-#, c-format
-msgid "could not remove reference %s"
-msgstr ""
-
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr ""
-
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
-#, c-format
-msgid "could not delete references: %s"
-msgstr ""
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr ""
-
-#: remote.c:351
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr ""
-
-#: remote.c:399
-msgid "more than one receivepack given, using the first"
-msgstr ""
-
-#: remote.c:407
-msgid "more than one uploadpack given, using the first"
-msgstr ""
-
-#: remote.c:590
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr ""
-
-#: remote.c:594
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr ""
-
-#: remote.c:598
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr ""
-
-#: remote.c:666
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr ""
-
-#: remote.c:676
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr ""
-
-#: remote.c:1083
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr ""
-
-#: remote.c:1088
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr ""
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#.
-#: remote.c:1103
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-" refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-
-#: remote.c:1123
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-
-#: remote.c:1128
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-
-#: remote.c:1133
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-
-#: remote.c:1138
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-
-#: remote.c:1174
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr ""
-
-#: remote.c:1185
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr ""
-
-#: remote.c:1197
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr ""
-
-#: remote.c:1204
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr ""
-
-#: remote.c:1724 remote.c:1825
-msgid "HEAD does not point to a branch"
-msgstr ""
-
-#: remote.c:1733
-#, c-format
-msgid "no such branch: '%s'"
-msgstr ""
-
-#: remote.c:1736
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr ""
-
-#: remote.c:1742
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr ""
-
-#: remote.c:1757
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr ""
-
-#: remote.c:1769
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr ""
-
-#: remote.c:1779
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr ""
-
-#: remote.c:1792
-msgid "push has no destination (push.default is 'nothing')"
-msgstr ""
-
-#: remote.c:1814
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr ""
-
-#: remote.c:1943
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr ""
-
-#: remote.c:1956
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr ""
-
-#: remote.c:2119
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr ""
-
-#: remote.c:2123
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr ""
-
-#: remote.c:2126
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr ""
-
-#: remote.c:2130
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr ""
-
-#: remote.c:2133
-#, c-format
-msgid " (use \"%s\" for details)\n"
-msgstr ""
-
-#: remote.c:2137
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2143
-msgid " (use \"git push\" to publish your local commits)\n"
-msgstr ""
-
-#: remote.c:2146
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2154
-msgid " (use \"git pull\" to update your local branch)\n"
-msgstr ""
-
-#: remote.c:2157
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2167
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr ""
-
-#: remote.c:2359
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr ""
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr ""
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr ""
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr ""
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr ""
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr ""
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr ""
-
-#: rerere.c:482
-#, c-format
-msgid "failed to flush '%s'"
-msgstr ""
-
-#: rerere.c:487 rerere.c:1023
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr ""
-
-#: rerere.c:668
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr ""
-
-#: rerere.c:678
-#, c-format
-msgid "writing '%s' failed"
-msgstr ""
-
-#: rerere.c:698
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr ""
-
-#: rerere.c:737
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr ""
-
-#: rerere.c:772
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr ""
-
-#: rerere.c:787
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr ""
-
-#: rerere.c:791
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr ""
-
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
-#, c-format
-msgid "could not create directory '%s'"
-msgstr ""
-
-#: rerere.c:1041
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr ""
-
-#: rerere.c:1052 rerere.c:1059
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr ""
-
-#: rerere.c:1061
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr ""
-
-#: rerere.c:1071
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr ""
-
-#: rerere.c:1080
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr ""
-
-#: rerere.c:1191
-msgid "unable to open rr-cache directory"
-msgstr ""
-
-#: reset.c:42
-msgid "could not determine HEAD revision"
-msgstr ""
-
-#: reset.c:69 reset.c:75 sequencer.c:3689
-#, c-format
-msgid "failed to find tree of %s"
-msgstr ""
-
-#: revision.c:2344
-msgid "--unpacked=<packfile> no longer supported"
-msgstr ""
-
-#: revision.c:2684
-msgid "your current branch appears to be broken"
-msgstr ""
-
-#: revision.c:2687
-#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr ""
-
-#: revision.c:2893
-msgid "-L does not yet support diff formats besides -p and -s"
-msgstr ""
-
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr ""
-
-#: run-command.c:1274
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr ""
-
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-
-#: send-pack.c:150
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr ""
-
-#: send-pack.c:152
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr ""
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr ""
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr ""
-
-#: send-pack.c:433
-msgid "send-pack: unable to fork off fetch subprocess"
-msgstr ""
-
-#: send-pack.c:455
-msgid "push negotiation failed; proceeding anyway with push"
-msgstr ""
-
-#: send-pack.c:526
-msgid "the receiving end does not support this repository's hash algorithm"
-msgstr ""
-
-#: send-pack.c:535
-msgid "the receiving end does not support --signed push"
-msgstr ""
-
-#: send-pack.c:537
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr ""
-
-#: send-pack.c:544
-msgid "the receiving end does not support --atomic push"
-msgstr ""
-
-#: send-pack.c:549
-msgid "the receiving end does not support push options"
-msgstr ""
-
-#: sequencer.c:196
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr ""
-
-#: sequencer.c:324
-#, c-format
-msgid "could not delete '%s'"
-msgstr ""
-
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
-#, c-format
-msgid "could not remove '%s'"
-msgstr ""
-
-#: sequencer.c:354
-msgid "revert"
-msgstr ""
-
-#: sequencer.c:356
-msgid "cherry-pick"
-msgstr ""
-
-#: sequencer.c:358
-msgid "rebase"
-msgstr ""
-
-#: sequencer.c:360
-#, c-format
-msgid "unknown action: %d"
-msgstr ""
-
-#: sequencer.c:419
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-
-#: sequencer.c:422
-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:435 sequencer.c:3271
-#, c-format
-msgid "could not lock '%s'"
-msgstr ""
-
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
-#, c-format
-msgid "could not write to '%s'"
-msgstr ""
-
-#: sequencer.c:442
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr ""
-
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr ""
-
-#: sequencer.c:486
-#, c-format
-msgid "your local changes would be overwritten by %s."
-msgstr ""
-
-#: sequencer.c:490
-msgid "commit your changes or stash them to proceed."
-msgstr ""
-
-#: sequencer.c:522
-#, c-format
-msgid "%s: fast-forward"
-msgstr ""
-
-#: sequencer.c:561 builtin/tag.c:609
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr ""
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#.
-#: sequencer.c:671
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr ""
-
-#: sequencer.c:685
-msgid "unable to update cache tree"
-msgstr ""
-
-#: sequencer.c:699
-msgid "could not resolve HEAD commit"
-msgstr ""
-
-#: sequencer.c:779
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr ""
-
-#: sequencer.c:790
-#, c-format
-msgid "unable to dequote value of '%s'"
-msgstr ""
-
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr ""
-
-#: sequencer.c:837
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr ""
-
-#: sequencer.c:842
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr ""
-
-#: sequencer.c:847
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr ""
-
-#: sequencer.c:851
-#, c-format
-msgid "unknown variable '%s'"
-msgstr ""
-
-#: sequencer.c:856
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr ""
-
-#: sequencer.c:858
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr ""
-
-#: sequencer.c:860
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr ""
-
-#: sequencer.c:925
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-
-#: sequencer.c:1212
-msgid "'prepare-commit-msg' hook failed"
-msgstr ""
-
-#: sequencer.c:1218
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-" git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
-msgstr ""
-
-#: sequencer.c:1231
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-" git config --global user.name \"Your Name\"\n"
-" git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
-msgstr ""
-
-#: sequencer.c:1273
-msgid "couldn't look up newly created commit"
-msgstr ""
-
-#: sequencer.c:1275
-msgid "could not parse newly created commit"
-msgstr ""
-
-#: sequencer.c:1321
-msgid "unable to resolve HEAD after creating commit"
-msgstr ""
-
-#: sequencer.c:1323
-msgid "detached HEAD"
-msgstr ""
-
-#: sequencer.c:1327
-msgid " (root-commit)"
-msgstr ""
-
-#: sequencer.c:1348
-msgid "could not parse HEAD"
-msgstr ""
-
-#: sequencer.c:1350
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr ""
-
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
-msgid "could not parse HEAD commit"
-msgstr ""
-
-#: sequencer.c:1410 sequencer.c:2295
-msgid "unable to parse commit author"
-msgstr ""
-
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
-msgid "git write-tree failed to write a tree"
-msgstr ""
-
-#: sequencer.c:1454 sequencer.c:1574
-#, c-format
-msgid "unable to read commit message from '%s'"
-msgstr ""
-
-#: sequencer.c:1485 sequencer.c:1517
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr ""
-
-#: sequencer.c:1491
-msgid "corrupt author: missing date information"
-msgstr ""
-
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
-msgid "failed to write commit object"
-msgstr ""
-
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
-#: t/helper/test-fast-rebase.c:217
-#, c-format
-msgid "could not update %s"
-msgstr ""
-
-#: sequencer.c:1606
-#, c-format
-msgid "could not parse commit %s"
-msgstr ""
-
-#: sequencer.c:1611
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr ""
-
-#: sequencer.c:1694 sequencer.c:1975
-#, c-format
-msgid "unknown command: %d"
-msgstr ""
-
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
-msgid "This is the 1st commit message:"
-msgstr ""
-
-#: sequencer.c:1737
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr ""
-
-#: sequencer.c:1738
-msgid "The 1st commit message will be skipped:"
-msgstr ""
-
-#: sequencer.c:1739
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr ""
-
-#: sequencer.c:1740
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr ""
-
-#: sequencer.c:1887 sequencer.c:1944
-#, c-format
-msgid "cannot write '%s'"
-msgstr ""
-
-#: sequencer.c:1934
-msgid "need a HEAD to fixup"
-msgstr ""
-
-#: sequencer.c:1936 sequencer.c:3582
-msgid "could not read HEAD"
-msgstr ""
-
-#: sequencer.c:1938
-msgid "could not read HEAD's commit message"
-msgstr ""
-
-#: sequencer.c:1962
-#, c-format
-msgid "could not read commit message of %s"
-msgstr ""
-
-#: sequencer.c:2072
-msgid "your index file is unmerged."
-msgstr ""
-
-#: sequencer.c:2079
-msgid "cannot fixup root commit"
-msgstr ""
-
-#: sequencer.c:2098
-#, c-format
-msgid "commit %s is a merge but no -m option was given."
-msgstr ""
-
-#: sequencer.c:2106 sequencer.c:2114
-#, c-format
-msgid "commit %s does not have parent %d"
-msgstr ""
-
-#: sequencer.c:2120
-#, 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:2139
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr ""
-
-#: sequencer.c:2205
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr ""
-
-#: sequencer.c:2265
-#, c-format
-msgid "could not revert %s... %s"
-msgstr ""
-
-#: sequencer.c:2266
-#, c-format
-msgid "could not apply %s... %s"
-msgstr ""
-
-#: sequencer.c:2287
-#, c-format
-msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr ""
-
-#: sequencer.c:2345
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr ""
-
-#: sequencer.c:2352
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr ""
-
-#: sequencer.c:2425
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr ""
-
-#: sequencer.c:2434
-#, c-format
-msgid "missing arguments for %s"
-msgstr ""
-
-#: sequencer.c:2477
-#, c-format
-msgid "could not parse '%s'"
-msgstr ""
-
-#: sequencer.c:2538
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr ""
-
-#: sequencer.c:2549
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr ""
-
-#: sequencer.c:2635
-msgid "cancelling a cherry picking in progress"
-msgstr ""
-
-#: sequencer.c:2644
-msgid "cancelling a revert in progress"
-msgstr ""
-
-#: sequencer.c:2690
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr ""
-
-#: sequencer.c:2692
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr ""
-
-#: sequencer.c:2697
-msgid "no commits parsed."
-msgstr ""
-
-#: sequencer.c:2708
-msgid "cannot cherry-pick during a revert."
-msgstr ""
-
-#: sequencer.c:2710
-msgid "cannot revert during a cherry-pick."
-msgstr ""
-
-#: sequencer.c:2788
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr ""
-
-#: sequencer.c:2897
-msgid "unusable squash-onto"
-msgstr ""
-
-#: sequencer.c:2917
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr ""
-
-#: sequencer.c:3012 sequencer.c:4868
-msgid "empty commit set passed"
-msgstr ""
-
-#: sequencer.c:3029
-msgid "revert is already in progress"
-msgstr ""
-
-#: sequencer.c:3031
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr ""
-
-#: sequencer.c:3034
-msgid "cherry-pick is already in progress"
-msgstr ""
-
-#: sequencer.c:3036
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr ""
-
-#: sequencer.c:3050
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr ""
-
-#: sequencer.c:3065
-msgid "could not lock HEAD"
-msgstr ""
-
-#: sequencer.c:3125 sequencer.c:4581
-msgid "no cherry-pick or revert in progress"
-msgstr ""
-
-#: sequencer.c:3127 sequencer.c:3138
-msgid "cannot resolve HEAD"
-msgstr ""
-
-#: sequencer.c:3129 sequencer.c:3173
-msgid "cannot abort from a branch yet to be born"
-msgstr ""
-
-#: sequencer.c:3159 builtin/grep.c:758
-#, c-format
-msgid "cannot open '%s'"
-msgstr ""
-
-#: sequencer.c:3161
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr ""
-
-#: sequencer.c:3162
-msgid "unexpected end of file"
-msgstr ""
-
-#: sequencer.c:3168
-#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr ""
-
-#: sequencer.c:3179
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr ""
-
-#: sequencer.c:3220
-msgid "no revert in progress"
-msgstr ""
-
-#: sequencer.c:3229
-msgid "no cherry-pick in progress"
-msgstr ""
-
-#: sequencer.c:3239
-msgid "failed to skip the commit"
-msgstr ""
-
-#: sequencer.c:3246
-msgid "there is nothing to skip"
-msgstr ""
-
-#: sequencer.c:3249
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-
-#: sequencer.c:3411 sequencer.c:4472
-msgid "cannot read HEAD"
-msgstr ""
-
-#: sequencer.c:3428
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr ""
-
-#: sequencer.c:3436
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-" git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-
-#: sequencer.c:3446
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr ""
-
-#: sequencer.c:3453
-#, c-format
-msgid "Could not merge %.*s"
-msgstr ""
-
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr ""
-
-#: sequencer.c:3483
-#, c-format
-msgid "Executing: %s\n"
-msgstr ""
-
-#: sequencer.c:3498
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
-msgstr ""
-
-#: sequencer.c:3504
-msgid "and made changes to the index and/or the working tree\n"
-msgstr ""
-
-#: sequencer.c:3510
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
-msgstr ""
-
-#: sequencer.c:3572
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr ""
-
-#: sequencer.c:3645
-msgid "writing fake root commit"
-msgstr ""
-
-#: sequencer.c:3650
-msgid "writing squash-onto"
-msgstr ""
-
-#: sequencer.c:3734
-#, c-format
-msgid "could not resolve '%s'"
-msgstr ""
-
-#: sequencer.c:3767
-msgid "cannot merge without a current revision"
-msgstr ""
-
-#: sequencer.c:3789
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr ""
-
-#: sequencer.c:3798
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr ""
-
-#: sequencer.c:3810
-msgid "octopus merge cannot be executed on top of a [new root]"
-msgstr ""
-
-#: sequencer.c:3826
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr ""
-
-#: sequencer.c:4009
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr ""
-
-#: sequencer.c:4025
-msgid "merge: Unable to write new index file"
-msgstr ""
-
-#: sequencer.c:4099
-msgid "Cannot autostash"
-msgstr ""
-
-#: sequencer.c:4102
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr ""
-
-#: sequencer.c:4108
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr ""
-
-#: sequencer.c:4111
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr ""
-
-#: sequencer.c:4115
-msgid "could not reset --hard"
-msgstr ""
-
-#: sequencer.c:4140
-#, c-format
-msgid "Applied autostash.\n"
-msgstr ""
-
-#: sequencer.c:4152
-#, c-format
-msgid "cannot store %s"
-msgstr ""
-
-#: sequencer.c:4155
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-
-#: sequencer.c:4160
-msgid "Applying autostash resulted in conflicts."
-msgstr ""
-
-#: sequencer.c:4161
-msgid "Autostash exists; creating a new stash entry."
-msgstr ""
-
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
-msgid "could not detach HEAD"
-msgstr ""
-
-#: sequencer.c:4248
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr ""
-
-#: sequencer.c:4250
-#, c-format
-msgid "Stopped at %s\n"
-msgstr ""
-
-#: sequencer.c:4258
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-" %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-" git rebase --edit-todo\n"
-" git rebase --continue\n"
-msgstr ""
-
-#: sequencer.c:4304
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr ""
-
-#: sequencer.c:4350
-#, c-format
-msgid "Stopped at %s... %.*s\n"
-msgstr ""
-
-#: sequencer.c:4421
-#, c-format
-msgid "unknown command %d"
-msgstr ""
-
-#: sequencer.c:4480
-msgid "could not read orig-head"
-msgstr ""
-
-#: sequencer.c:4485
-msgid "could not read 'onto'"
-msgstr ""
-
-#: sequencer.c:4499
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr ""
-
-#: sequencer.c:4559
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr ""
-
-#: sequencer.c:4611
-msgid "cannot rebase: You have unstaged changes."
-msgstr ""
-
-#: sequencer.c:4620
-msgid "cannot amend non-existing commit"
-msgstr ""
-
-#: sequencer.c:4622
-#, c-format
-msgid "invalid file: '%s'"
-msgstr ""
-
-#: sequencer.c:4624
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr ""
-
-#: sequencer.c:4627
-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:4663 sequencer.c:4702
-#, c-format
-msgid "could not write file: '%s'"
-msgstr ""
-
-#: sequencer.c:4718
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr ""
-
-#: sequencer.c:4725
-msgid "could not commit staged changes."
-msgstr ""
-
-#: sequencer.c:4845
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr ""
-
-#: sequencer.c:4849
-#, c-format
-msgid "%s: bad revision"
-msgstr ""
-
-#: sequencer.c:4884
-msgid "can't revert as initial commit"
-msgstr ""
-
-#: sequencer.c:5361
-msgid "make_script: unhandled options"
-msgstr ""
-
-#: sequencer.c:5364
-msgid "make_script: error preparing revisions"
-msgstr ""
-
-#: sequencer.c:5614 sequencer.c:5631
-msgid "nothing to do"
-msgstr ""
-
-#: sequencer.c:5650
-msgid "could not skip unnecessary pick commands"
-msgstr ""
-
-#: sequencer.c:5750
-msgid "the script was already rearranged."
-msgstr ""
-
-#: setup.c:133
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr ""
-
-#: setup.c:185
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-
-#: setup.c:198
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-
-#: setup.c:264
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr ""
-
-#: setup.c:283
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-
-#: setup.c:419
-msgid "unable to set up work tree using invalid config"
-msgstr ""
-
-#: setup.c:423 builtin/rev-parse.c:895
-msgid "this operation must be run in a work tree"
-msgstr ""
-
-#: setup.c:658
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr ""
-
-#: setup.c:666
-msgid "unknown repository extension found:"
-msgid_plural "unknown repository extensions found:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: setup.c:680
-msgid "repo version is 0, but v1-only extension found:"
-msgid_plural "repo version is 0, but v1-only extensions found:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: setup.c:701
-#, c-format
-msgid "error opening '%s'"
-msgstr ""
-
-#: setup.c:703
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr ""
-
-#: setup.c:705
-#, c-format
-msgid "error reading %s"
-msgstr ""
-
-#: setup.c:707
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr ""
-
-#: setup.c:709
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr ""
-
-#: setup.c:711
-#, c-format
-msgid "not a git repository: %s"
-msgstr ""
-
-#: setup.c:813
-#, c-format
-msgid "'$%s' too big"
-msgstr ""
-
-#: setup.c:827
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr ""
-
-#: setup.c:856 setup.c:858 setup.c:889
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr ""
-
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
-msgid "cannot come back to cwd"
-msgstr ""
-
-#: setup.c:988
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr ""
-
-#: setup.c:1231
-msgid "Unable to read current working directory"
-msgstr ""
-
-#: setup.c:1240 setup.c:1246
-#, c-format
-msgid "cannot change to '%s'"
-msgstr ""
-
-#: setup.c:1251
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr ""
-
-#: setup.c:1257
-#, 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:1381
-#, 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:1430
-msgid "open /dev/null or dup failed"
-msgstr ""
-
-#: setup.c:1445
-msgid "fork failed"
-msgstr ""
-
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
-msgid "setsid failed"
-msgstr ""
-
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr ""
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr ""
-
-#: sparse-index.c:263
-#, c-format
-msgid "index entry is a directory, but not sparse (%08x)"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:852
-#, c-format
-msgid "%u.%2.2u GiB/s"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:860
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:862
-#, c-format
-msgid "%u.%2.2u MiB/s"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:869
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:871
-#, c-format
-msgid "%u.%2.2u KiB/s"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:877
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr ""
-
-#: strbuf.c:1177
-#, c-format
-msgid "could not edit '%s'"
-msgstr ""
-
-#: submodule-config.c:237
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr ""
-
-#: submodule-config.c:304
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr ""
-
-#: submodule-config.c:402
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-
-#: submodule-config.c:499
-#, c-format
-msgid "invalid value for %s"
-msgstr ""
-
-#: submodule-config.c:766
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr ""
-
-#: submodule.c:114 submodule.c:143
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-
-#: submodule.c:118 submodule.c:147
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr ""
-
-#: submodule.c:154
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr ""
-
-#: submodule.c:165
-msgid "staging updated .gitmodules failed"
-msgstr ""
-
-#: submodule.c:328
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr ""
-
-#: submodule.c:359
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr ""
-
-#: submodule.c:436
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr ""
-
-#: submodule.c:805
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr ""
-
-#: submodule.c:908
-#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr ""
-
-#: submodule.c:993
-#, c-format
-msgid ""
-"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
-"submodule %s"
-msgstr ""
-
-#: submodule.c:1116
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr ""
-
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr ""
-
-#: submodule.c:1156
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr ""
-
-#: submodule.c:1159
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr ""
-
-#: submodule.c:1451
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr ""
-
-#: submodule.c:1485
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr ""
-
-#: submodule.c:1640
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-
-#: submodule.c:1665
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr ""
-
-#: submodule.c:1682
-#, c-format
-msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr ""
-
-#: submodule.c:1723
-#, c-format
-msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr ""
-
-#: submodule.c:1798
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr ""
-
-#: submodule.c:1811
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr ""
-
-#: submodule.c:1826
-#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr ""
-
-#: submodule.c:1853 submodule.c:2163
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr ""
-
-#: submodule.c:1874
-msgid "could not reset submodule index"
-msgstr ""
-
-#: submodule.c:1916
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr ""
-
-#: submodule.c:1968
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr ""
-
-#: submodule.c:2036
-#, c-format
-msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr ""
-
-#: submodule.c:2057
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr ""
-
-#: submodule.c:2069 submodule.c:2128
-#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr ""
-
-#: submodule.c:2073
-#, c-format
-msgid "refusing to move '%s' into an existing git dir"
-msgstr ""
-
-#: submodule.c:2080
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-
-#: submodule.c:2208
-msgid "could not start ls-files in .."
-msgstr ""
-
-#: submodule.c:2248
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr ""
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr ""
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr ""
-
-#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
-#: trailer.c:570
-#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr ""
-
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
-#, c-format
-msgid "more than one %s"
-msgstr ""
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr ""
-
-#: trailer.c:763
-#, c-format
-msgid "could not read input file '%s'"
-msgstr ""
-
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
-msgid "could not read from stdin"
-msgstr ""
-
-#: trailer.c:1024 wrapper.c:676
-#, c-format
-msgid "could not stat %s"
-msgstr ""
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr ""
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr ""
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr ""
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr ""
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr ""
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr ""
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr ""
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr ""
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr ""
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr ""
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr ""
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr ""
-
-#: transport-helper.c:549 transport-helper.c:1247
-#, c-format
-msgid "could not read ref %s"
-msgstr ""
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr ""
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr ""
-
-#: transport-helper.c:661 transport.c:1477
-msgid "operation not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr ""
-
-#: transport-helper.c:693 transport.c:400
-msgid "--negotiate-only requires protocol v2"
-msgstr ""
-
-#: transport-helper.c:755
-msgid "'option' without a matching 'ok/error' directive"
-msgstr ""
-
-#: transport-helper.c:798
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr ""
-
-#: transport-helper.c:855
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr ""
-
-#: transport-helper.c:938
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr ""
-
-#: transport-helper.c:941
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr ""
-
-#: transport-helper.c:944
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr ""
-
-#: transport-helper.c:949
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr ""
-
-#: transport-helper.c:953
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr ""
-
-#: transport-helper.c:960
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr ""
-
-#: transport-helper.c:1060
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr ""
-
-#: transport-helper.c:1065
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr ""
-
-#: transport-helper.c:1112
-msgid "couldn't run fast-export"
-msgstr ""
-
-#: transport-helper.c:1117
-msgid "error while running fast-export"
-msgstr ""
-
-#: transport-helper.c:1142
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch.\n"
-msgstr ""
-
-#: transport-helper.c:1224
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr ""
-
-#: transport-helper.c:1233
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr ""
-
-#: transport-helper.c:1385
-#, c-format
-msgid "read(%s) failed"
-msgstr ""
-
-#: transport-helper.c:1412
-#, c-format
-msgid "write(%s) failed"
-msgstr ""
-
-#: transport-helper.c:1461
-#, c-format
-msgid "%s thread failed"
-msgstr ""
-
-#: transport-helper.c:1465
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr ""
-
-#: transport-helper.c:1484 transport-helper.c:1488
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr ""
-
-#: transport-helper.c:1525
-#, c-format
-msgid "%s process failed to wait"
-msgstr ""
-
-#: transport-helper.c:1529
-#, c-format
-msgid "%s process failed"
-msgstr ""
-
-#: transport-helper.c:1547 transport-helper.c:1556
-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:223
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr ""
-
-#: transport.c:275
-msgid "see protocol.version in 'git help config' for more details"
-msgstr ""
-
-#: transport.c:276
-msgid "server options require protocol version 2 or later"
-msgstr ""
-
-#: transport.c:403
-msgid "server does not support wait-for-done"
-msgstr ""
-
-#: transport.c:755
-msgid "could not parse transport.color.* config"
-msgstr ""
-
-#: transport.c:830
-msgid "support for protocol v2 not implemented yet"
-msgstr ""
-
-#: transport.c:965
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr ""
-
-#: transport.c:1031
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr ""
-
-#: transport.c:1084
-msgid "git-over-rsync is no longer supported"
-msgstr ""
-
-#: transport.c:1187
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-
-#: transport.c:1191
-#, 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:1199
-msgid "Aborting."
-msgstr ""
-
-#: transport.c:1346
-msgid "failed to push all needed submodules"
-msgstr ""
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr ""
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr ""
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr ""
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr ""
-
-#: unpack-trees.c:115
-#, 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:117
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:120
-#, 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:122
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:125
-#, 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:127
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:132
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:136
-#, 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:138
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:141
-#, 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:143
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:146
-#, 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:148
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-
-#: unpack-trees.c:156
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:159
-#, 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:161
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:164
-#, 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:166
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:174
-#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr ""
-
-#: unpack-trees.c:177
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:180
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:182
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:184
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:264
-#, c-format
-msgid "Aborting\n"
-msgstr ""
-
-#: unpack-trees.c:291
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr ""
-
-#: unpack-trees.c:352
-msgid "Updating files"
-msgstr ""
-
-#: unpack-trees.c:384
-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:1618
-msgid "Updating index flags"
-msgstr ""
-
-#: unpack-trees.c:2718
-#, c-format
-msgid "worktree and untracked commit have duplicate entries: %s"
-msgstr ""
-
-#: upload-pack.c:1548
-msgid "expected flush after fetch arguments"
-msgstr ""
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr ""
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr ""
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr ""
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr ""
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr ""
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr ""
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr ""
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr ""
-
-#: worktree.c:236 builtin/am.c:2152
-#, c-format
-msgid "failed to read '%s'"
-msgstr ""
-
-#: worktree.c:303
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr ""
-
-#: worktree.c:314
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr ""
-
-#: worktree.c:326
-#, c-format
-msgid "'%s' does not exist"
-msgstr ""
-
-#: worktree.c:332
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr ""
-
-#: worktree.c:341
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr ""
-
-#: worktree.c:603
-msgid "not a directory"
-msgstr ""
-
-#: worktree.c:612
-msgid ".git is not a file"
-msgstr ""
-
-#: worktree.c:614
-msgid ".git file broken"
-msgstr ""
-
-#: worktree.c:616
-msgid ".git file incorrect"
-msgstr ""
-
-#: worktree.c:722
-msgid "not a valid path"
-msgstr ""
-
-#: worktree.c:728
-msgid "unable to locate repository; .git is not a file"
-msgstr ""
-
-#: worktree.c:732
-msgid "unable to locate repository; .git file does not reference a repository"
-msgstr ""
-
-#: worktree.c:736
-msgid "unable to locate repository; .git file broken"
-msgstr ""
-
-#: worktree.c:742
-msgid "gitdir unreadable"
-msgstr ""
-
-#: worktree.c:746
-msgid "gitdir incorrect"
-msgstr ""
-
-#: worktree.c:771
-msgid "not a valid directory"
-msgstr ""
-
-#: worktree.c:777
-msgid "gitdir file does not exist"
-msgstr ""
-
-#: worktree.c:782 worktree.c:791
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr ""
-
-#: worktree.c:801
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr ""
-
-#: worktree.c:809
-msgid "invalid gitdir file"
-msgstr ""
-
-#: worktree.c:817
-msgid "gitdir file points to non-existent location"
-msgstr ""
-
-#: wrapper.c:197 wrapper.c:367
-#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr ""
-
-#: wrapper.c:398 wrapper.c:599
-#, c-format
-msgid "unable to access '%s'"
-msgstr ""
-
-#: wrapper.c:607
-msgid "unable to get current working directory"
-msgstr ""
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr ""
-
-#: wt-status.c:187 wt-status.c:219
-msgid " (use \"git restore --staged <file>...\" to unstage)"
-msgstr ""
-
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr ""
-
-#: wt-status.c:193 wt-status.c:225
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr ""
-
-#: wt-status.c:197
-msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr ""
-
-#: wt-status.c:199 wt-status.c:203
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-
-#: wt-status.c:201
-msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr ""
-
-#: wt-status.c:211 wt-status.c:1125
-msgid "Changes to be committed:"
-msgstr ""
-
-#: wt-status.c:234 wt-status.c:1134
-msgid "Changes not staged for commit:"
-msgstr ""
-
-#: wt-status.c:238
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-
-#: wt-status.c:240
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-
-#: wt-status.c:241
-msgid ""
-" (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr ""
-
-#: wt-status.c:243
-msgid " (commit or discard the untracked or modified content in submodules)"
-msgstr ""
-
-#: wt-status.c:254
-#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr ""
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr ""
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr ""
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr ""
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr ""
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr ""
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr ""
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr ""
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr ""
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr ""
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr ""
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr ""
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr ""
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr ""
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr ""
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr ""
-
-#: wt-status.c:382
-msgid "new commits, "
-msgstr ""
-
-#: wt-status.c:384
-msgid "modified content, "
-msgstr ""
-
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr ""
-
-#: wt-status.c:958
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:989
-msgid "Submodules changed but not updated:"
-msgstr ""
-
-#: wt-status.c:991
-msgid "Submodule changes to be committed:"
-msgstr ""
-
-#: wt-status.c:1073
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-
-#: wt-status.c:1165
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
-msgstr ""
-
-#: wt-status.c:1195
-msgid "You have unmerged paths."
-msgstr ""
-
-#: wt-status.c:1198
-msgid " (fix conflicts and run \"git commit\")"
-msgstr ""
-
-#: wt-status.c:1200
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr ""
-
-#: wt-status.c:1204
-msgid "All conflicts fixed but you are still merging."
-msgstr ""
-
-#: wt-status.c:1207
-msgid " (use \"git commit\" to conclude merge)"
-msgstr ""
-
-#: wt-status.c:1216
-msgid "You are in the middle of an am session."
-msgstr ""
-
-#: wt-status.c:1219
-msgid "The current patch is empty."
-msgstr ""
-
-#: wt-status.c:1223
-msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr ""
-
-#: wt-status.c:1225
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr ""
-
-#: wt-status.c:1227
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr ""
-
-#: wt-status.c:1360
-msgid "git-rebase-todo is missing."
-msgstr ""
-
-#: wt-status.c:1362
-msgid "No commands done."
-msgstr ""
-
-#: wt-status.c:1365
-#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:1376
-#, c-format
-msgid " (see more in file %s)"
-msgstr ""
-
-#: wt-status.c:1381
-msgid "No commands remaining."
-msgstr ""
-
-#: wt-status.c:1384
-#, 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:1392
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr ""
-
-#: wt-status.c:1404
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr ""
-
-#: wt-status.c:1409
-msgid "You are currently rebasing."
-msgstr ""
-
-#: wt-status.c:1422
-msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr ""
-
-#: wt-status.c:1424
-msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr ""
-
-#: wt-status.c:1426
-msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr ""
-
-#: wt-status.c:1433
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr ""
-
-#: wt-status.c:1437
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-
-#: wt-status.c:1442
-msgid "You are currently splitting a commit during a rebase."
-msgstr ""
-
-#: wt-status.c:1445
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr ""
-
-#: wt-status.c:1449
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-
-#: wt-status.c:1454
-msgid "You are currently editing a commit during a rebase."
-msgstr ""
-
-#: wt-status.c:1457
-msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr ""
-
-#: wt-status.c:1459
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr ""
-
-#: wt-status.c:1470
-msgid "Cherry-pick currently in progress."
-msgstr ""
-
-#: wt-status.c:1473
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr ""
-
-#: wt-status.c:1480
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr ""
-
-#: wt-status.c:1483
-msgid " (run \"git cherry-pick --continue\" to continue)"
-msgstr ""
-
-#: wt-status.c:1486
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-
-#: wt-status.c:1488
-msgid " (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr ""
-
-#: wt-status.c:1490
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr ""
-
-#: wt-status.c:1500
-msgid "Revert currently in progress."
-msgstr ""
-
-#: wt-status.c:1503
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr ""
-
-#: wt-status.c:1509
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr ""
-
-#: wt-status.c:1512
-msgid " (run \"git revert --continue\" to continue)"
-msgstr ""
-
-#: wt-status.c:1515
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr ""
-
-#: wt-status.c:1517
-msgid " (use \"git revert --skip\" to skip this patch)"
-msgstr ""
-
-#: wt-status.c:1519
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr ""
-
-#: wt-status.c:1529
-#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr ""
-
-#: wt-status.c:1533
-msgid "You are currently bisecting."
-msgstr ""
-
-#: wt-status.c:1536
-msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr ""
-
-#: wt-status.c:1547
-msgid "You are in a sparse checkout."
-msgstr ""
-
-#: wt-status.c:1550
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr ""
-
-#: wt-status.c:1794
-msgid "On branch "
-msgstr ""
-
-#: wt-status.c:1801
-msgid "interactive rebase in progress; onto "
-msgstr ""
-
-#: wt-status.c:1803
-msgid "rebase in progress; onto "
-msgstr ""
-
-#: wt-status.c:1808
-msgid "HEAD detached at "
-msgstr ""
-
-#: wt-status.c:1810
-msgid "HEAD detached from "
-msgstr ""
-
-#: wt-status.c:1813
-msgid "Not currently on any branch."
-msgstr ""
-
-#: wt-status.c:1830
-msgid "Initial commit"
-msgstr ""
-
-#: wt-status.c:1831
-msgid "No commits yet"
-msgstr ""
-
-#: wt-status.c:1845
-msgid "Untracked files"
-msgstr ""
-
-#: wt-status.c:1847
-msgid "Ignored files"
-msgstr ""
-
-#: wt-status.c:1851
-#, 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 ""
-
-#: wt-status.c:1857
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr ""
-
-#: wt-status.c:1859
-msgid " (use -u option to show untracked files)"
-msgstr ""
-
-#: wt-status.c:1865
-msgid "No changes"
-msgstr ""
-
-#: wt-status.c:1870
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-
-#: wt-status.c:1874
-#, c-format
-msgid "no changes added to commit\n"
-msgstr ""
-
-#: wt-status.c:1878
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr ""
-
-#: wt-status.c:1882
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr ""
-
-#: wt-status.c:1886
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr ""
-
-#: wt-status.c:1890 wt-status.c:1896
-#, c-format
-msgid "nothing to commit\n"
-msgstr ""
-
-#: wt-status.c:1893
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr ""
-
-#: wt-status.c:1898
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr ""
-
-#: wt-status.c:2003
-msgid "No commits yet on "
-msgstr ""
-
-#: wt-status.c:2007
-msgid "HEAD (no branch)"
-msgstr ""
-
-#: wt-status.c:2038
-msgid "different"
-msgstr ""
-
-#: wt-status.c:2040 wt-status.c:2048
-msgid "behind "
-msgstr ""
-
-#: wt-status.c:2043 wt-status.c:2046
-msgid "ahead "
-msgstr ""
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr ""
-
-#: wt-status.c:2575
-msgid "additionally, your index contains uncommitted changes."
-msgstr ""
-
-#: wt-status.c:2577
-#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
-msgstr ""
-
-#: compat/simple-ipc/ipc-unix-socket.c:182
-msgid "could not send IPC command"
-msgstr ""
-
-#: compat/simple-ipc/ipc-unix-socket.c:189
-msgid "could not read IPC response"
-msgstr ""
-
-#: compat/simple-ipc/ipc-unix-socket.c:866
-#, c-format
-msgid "could not start accept_thread '%s'"
-msgstr ""
-
-#: compat/simple-ipc/ipc-unix-socket.c:878
-#, c-format
-msgid "could not start worker[0] for '%s'"
-msgstr ""
-
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr ""
-
-#: builtin/add.c:26
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr ""
-
-#: builtin/add.c:61
-#, c-format
-msgid "cannot chmod %cx '%s'"
-msgstr ""
-
-#: builtin/add.c:99
-#, c-format
-msgid "unexpected diff status %c"
-msgstr ""
-
-#: builtin/add.c:104 builtin/commit.c:297
-msgid "updating files failed"
-msgstr ""
-
-#: builtin/add.c:114
-#, c-format
-msgid "remove '%s'\n"
-msgstr ""
-
-#: builtin/add.c:198
-msgid "Unstaged changes after refreshing the index:"
-msgstr ""
-
-#: builtin/add.c:307 builtin/rev-parse.c:993
-msgid "Could not read the index"
-msgstr ""
-
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr ""
-
-#: builtin/add.c:322
-msgid "Could not write patch"
-msgstr ""
-
-#: builtin/add.c:325
-msgid "editing patch failed"
-msgstr ""
-
-#: builtin/add.c:328
-#, c-format
-msgid "Could not stat '%s'"
-msgstr ""
-
-#: builtin/add.c:330
-msgid "Empty patch. Aborted."
-msgstr ""
-
-#: builtin/add.c:335
-#, c-format
-msgid "Could not apply '%s'"
-msgstr ""
-
-#: builtin/add.c:343
-msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr ""
-
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
-msgid "dry run"
-msgstr ""
-
-#: builtin/add.c:366
-msgid "interactive picking"
-msgstr ""
-
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
-msgid "select hunks interactively"
-msgstr ""
-
-#: builtin/add.c:368
-msgid "edit current diff and apply"
-msgstr ""
-
-#: builtin/add.c:369
-msgid "allow adding otherwise ignored files"
-msgstr ""
-
-#: builtin/add.c:370
-msgid "update tracked files"
-msgstr ""
-
-#: builtin/add.c:371
-msgid "renormalize EOL of tracked files (implies -u)"
-msgstr ""
-
-#: builtin/add.c:372
-msgid "record only the fact that the path will be added later"
-msgstr ""
-
-#: builtin/add.c:373
-msgid "add changes from all tracked and untracked files"
-msgstr ""
-
-#: builtin/add.c:376
-msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr ""
-
-#: builtin/add.c:378
-msgid "don't add, only refresh the index"
-msgstr ""
-
-#: builtin/add.c:379
-msgid "just skip files which cannot be added because of errors"
-msgstr ""
-
-#: builtin/add.c:380
-msgid "check if - even missing - files are ignored in dry run"
-msgstr ""
-
-#: builtin/add.c:382 builtin/update-index.c:1006
-msgid "override the executable bit of the listed files"
-msgstr ""
-
-#: builtin/add.c:384
-msgid "warn when adding an embedded repository"
-msgstr ""
-
-#: builtin/add.c:386
-msgid "backend for `git stash -p`"
-msgstr ""
-
-#: builtin/add.c:404
-#, c-format
-msgid ""
-"You've added another git repository inside your current repository.\n"
-"Clones of the outer repository will not contain the contents of\n"
-"the embedded repository and will not know how to obtain it.\n"
-"If you meant to add a submodule, use:\n"
-"\n"
-"\tgit submodule add <url> %s\n"
-"\n"
-"If you added this path by mistake, you can remove it from the\n"
-"index with:\n"
-"\n"
-"\tgit rm --cached %s\n"
-"\n"
-"See \"git help submodule\" for more information."
-msgstr ""
-
-#: builtin/add.c:432
-#, c-format
-msgid "adding embedded git repository: %s"
-msgstr ""
-
-#: builtin/add.c:451
-msgid ""
-"Use -f if you really want to add them.\n"
-"Turn this message off by running\n"
-"\"git config advice.addIgnoredFile false\""
-msgstr ""
-
-#: builtin/add.c:460
-msgid "adding files failed"
-msgstr ""
-
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr ""
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr ""
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-
-#: builtin/add.c:526
-#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
-msgstr ""
-
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr ""
-
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr ""
-
-#: builtin/add.c:555
-#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr ""
-
-#: builtin/add.c:557
-msgid ""
-"Maybe you wanted to say 'git add .'?\n"
-"Turn this message off by running\n"
-"\"git config advice.addEmptyPathspec false\""
-msgstr ""
-
-#: builtin/am.c:365
-msgid "could not parse author script"
-msgstr ""
-
-#: builtin/am.c:455
-#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr ""
-
-#: builtin/am.c:497
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr ""
-
-#: builtin/am.c:535
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr ""
-
-#: builtin/am.c:561
-msgid "fseek failed"
-msgstr ""
-
-#: builtin/am.c:749
-#, c-format
-msgid "could not parse patch '%s'"
-msgstr ""
-
-#: builtin/am.c:814
-msgid "Only one StGIT patch series can be applied at once"
-msgstr ""
-
-#: builtin/am.c:862
-msgid "invalid timestamp"
-msgstr ""
-
-#: builtin/am.c:867 builtin/am.c:879
-msgid "invalid Date line"
-msgstr ""
-
-#: builtin/am.c:874
-msgid "invalid timezone offset"
-msgstr ""
-
-#: builtin/am.c:967
-msgid "Patch format detection failed."
-msgstr ""
-
-#: builtin/am.c:972 builtin/clone.c:414
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr ""
-
-#: builtin/am.c:977
-msgid "Failed to split patches."
-msgstr ""
-
-#: builtin/am.c:1126
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr ""
-
-#: builtin/am.c:1127
-#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr ""
-
-#: builtin/am.c:1128
-#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr ""
-
-#: builtin/am.c:1223
-msgid "Patch sent with format=flowed; space at the end of lines might be lost."
-msgstr ""
-
-#: builtin/am.c:1251
-msgid "Patch is empty."
-msgstr ""
-
-#: builtin/am.c:1316
-#, c-format
-msgid "missing author line in commit %s"
-msgstr ""
-
-#: builtin/am.c:1319
-#, c-format
-msgid "invalid ident line: %.*s"
-msgstr ""
-
-#: builtin/am.c:1538
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr ""
-
-#: builtin/am.c:1540
-msgid "Using index info to reconstruct a base tree..."
-msgstr ""
-
-#: builtin/am.c:1559
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-
-#: builtin/am.c:1565
-msgid "Falling back to patching base and 3-way merge..."
-msgstr ""
-
-#: builtin/am.c:1591
-msgid "Failed to merge in the changes."
-msgstr ""
-
-#: builtin/am.c:1623
-msgid "applying to an empty history"
-msgstr ""
-
-#: builtin/am.c:1675 builtin/am.c:1679
-#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr ""
-
-#: builtin/am.c:1697
-msgid "Commit Body is:"
-msgstr ""
-
-#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-#. in your translation. The program will only accept English
-#. input at this point.
-#.
-#: builtin/am.c:1707
-#, c-format
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr ""
-
-#: builtin/am.c:1753 builtin/commit.c:408
-msgid "unable to write index file"
-msgstr ""
-
-#: builtin/am.c:1757
-#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr ""
-
-#: builtin/am.c:1797 builtin/am.c:1865
-#, c-format
-msgid "Applying: %.*s"
-msgstr ""
-
-#: builtin/am.c:1814
-msgid "No changes -- Patch already applied."
-msgstr ""
-
-#: builtin/am.c:1820
-#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr ""
-
-#: builtin/am.c:1824
-msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
-msgstr ""
-
-#: builtin/am.c:1868
-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:1875
-msgid ""
-"You still have unmerged paths in your index.\n"
-"You should 'git add' each file with resolved conflicts to mark them as "
-"such.\n"
-"You might run `git rm` on a file to accept \"deleted by them\" for it."
-msgstr ""
-
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
-#, c-format
-msgid "Could not parse object '%s'."
-msgstr ""
-
-#: builtin/am.c:2034
-msgid "failed to clean index"
-msgstr ""
-
-#: builtin/am.c:2078
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr ""
-
-#: builtin/am.c:2185
-#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr ""
-
-#: builtin/am.c:2227
-#, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr ""
-
-#: builtin/am.c:2231
-#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr ""
-
-#: builtin/am.c:2262
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
-msgstr ""
-
-#: builtin/am.c:2263
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr ""
-
-#: builtin/am.c:2269
-msgid "run interactively"
-msgstr ""
-
-#: builtin/am.c:2271
-msgid "historical option -- no-op"
-msgstr ""
-
-#: builtin/am.c:2273
-msgid "allow fall back on 3way merging if needed"
-msgstr ""
-
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
-msgid "be quiet"
-msgstr ""
-
-#: builtin/am.c:2276
-msgid "add a Signed-off-by trailer to the commit message"
-msgstr ""
-
-#: builtin/am.c:2279
-msgid "recode into utf8 (default)"
-msgstr ""
-
-#: builtin/am.c:2281
-msgid "pass -k flag to git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2283
-msgid "pass -b flag to git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2285
-msgid "pass -m flag to git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2287
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr ""
-
-#: builtin/am.c:2290
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr ""
-
-#: builtin/am.c:2293
-msgid "strip everything before a scissors line"
-msgstr ""
-
-#: builtin/am.c:2295
-msgid "pass it through git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
-msgid "pass it through git-apply"
-msgstr ""
-
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
-msgid "n"
-msgstr ""
-
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
-#: builtin/verify-tag.c:38
-msgid "format"
-msgstr ""
-
-#: builtin/am.c:2322
-msgid "format the patch(es) are in"
-msgstr ""
-
-#: builtin/am.c:2328
-msgid "override error message when patch failure occurs"
-msgstr ""
-
-#: builtin/am.c:2330
-msgid "continue applying patches after resolving a conflict"
-msgstr ""
-
-#: builtin/am.c:2333
-msgid "synonyms for --continue"
-msgstr ""
-
-#: builtin/am.c:2336
-msgid "skip the current patch"
-msgstr ""
-
-#: builtin/am.c:2339
-msgid "restore the original branch and abort the patching operation"
-msgstr ""
-
-#: builtin/am.c:2342
-msgid "abort the patching operation but keep HEAD where it is"
-msgstr ""
-
-#: builtin/am.c:2346
-msgid "show the patch being applied"
-msgstr ""
-
-#: builtin/am.c:2351
-msgid "lie about committer date"
-msgstr ""
-
-#: builtin/am.c:2353
-msgid "use current timestamp for author date"
-msgstr ""
-
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
-msgid "key-id"
-msgstr ""
-
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
-msgid "GPG-sign commits"
-msgstr ""
-
-#: builtin/am.c:2359
-msgid "(internal use for git-rebase)"
-msgstr ""
-
-#: builtin/am.c:2377
-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:2384
-msgid "failed to read the index"
-msgstr ""
-
-#: builtin/am.c:2399
-#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
-msgstr ""
-
-#: builtin/am.c:2423
-#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
-msgstr ""
-
-#: builtin/am.c:2429
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr ""
-
-#: builtin/am.c:2439
-msgid "interactive mode requires patches on the command line"
-msgstr ""
-
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
-msgstr ""
-
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr ""
-
-#: builtin/archive.c:20
-msgid "could not redirect output"
-msgstr ""
-
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
-msgstr ""
-
-#: builtin/archive.c:61
-msgid "git archive: expected ACK/NAK, got a flush packet"
-msgstr ""
-
-#: builtin/archive.c:64
-#, c-format
-msgid "git archive: NACK %s"
-msgstr ""
-
-#: builtin/archive.c:65
-msgid "git archive: protocol error"
-msgstr ""
-
-#: builtin/archive.c:69
-msgid "git archive: expected a flush"
-msgstr ""
-
-#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr ""
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-
-#: builtin/bisect--helper.c:25
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
-"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<paths>...]"
-msgstr ""
-
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr ""
-
-#: builtin/bisect--helper.c:29
-msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr ""
-
-#: builtin/bisect--helper.c:30
-msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr ""
-
-#: builtin/bisect--helper.c:31
-msgid "git bisect--helper --bisect-replay <filename>"
-msgstr ""
-
-#: builtin/bisect--helper.c:32
-msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr ""
-
-#: builtin/bisect--helper.c:107
-#, c-format
-msgid "cannot open file '%s' in mode '%s'"
-msgstr ""
-
-#: builtin/bisect--helper.c:114
-#, c-format
-msgid "could not write to file '%s'"
-msgstr ""
-
-#: builtin/bisect--helper.c:155
-#, c-format
-msgid "'%s' is not a valid term"
-msgstr ""
-
-#: builtin/bisect--helper.c:159
-#, c-format
-msgid "can't use the builtin command '%s' as a term"
-msgstr ""
-
-#: builtin/bisect--helper.c:169
-#, c-format
-msgid "can't change the meaning of the term '%s'"
-msgstr ""
-
-#: builtin/bisect--helper.c:179
-msgid "please use two different terms"
-msgstr ""
-
-#: builtin/bisect--helper.c:195
-#, c-format
-msgid "We are not bisecting.\n"
-msgstr ""
-
-#: builtin/bisect--helper.c:203
-#, c-format
-msgid "'%s' is not a valid commit"
-msgstr ""
-
-#: builtin/bisect--helper.c:212
-#, c-format
-msgid ""
-"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
-msgstr ""
-
-#: builtin/bisect--helper.c:256
-#, c-format
-msgid "Bad bisect_write argument: %s"
-msgstr ""
-
-#: builtin/bisect--helper.c:261
-#, c-format
-msgid "couldn't get the oid of the rev '%s'"
-msgstr ""
-
-#: builtin/bisect--helper.c:273
-#, c-format
-msgid "couldn't open the file '%s'"
-msgstr ""
-
-#: builtin/bisect--helper.c:299
-#, c-format
-msgid "Invalid command: you're currently in a %s/%s bisect"
-msgstr ""
-
-#: builtin/bisect--helper.c:326
-#, c-format
-msgid ""
-"You need to give me at least one %s and %s revision.\n"
-"You can use \"git bisect %s\" and \"git bisect %s\" for that."
-msgstr ""
-
-#: builtin/bisect--helper.c:330
-#, c-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one %s and %s revision.\n"
-"You can use \"git bisect %s\" and \"git bisect %s\" for that."
-msgstr ""
-
-#: builtin/bisect--helper.c:350
-#, c-format
-msgid "bisecting only with a %s commit"
-msgstr ""
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#.
-#: builtin/bisect--helper.c:358
-msgid "Are you sure [Y/n]? "
-msgstr ""
-
-#: builtin/bisect--helper.c:419
-msgid "no terms defined"
-msgstr ""
-
-#: builtin/bisect--helper.c:422
-#, c-format
-msgid ""
-"Your current terms are %s for the old state\n"
-"and %s for the new state.\n"
-msgstr ""
-
-#: builtin/bisect--helper.c:432
-#, c-format
-msgid ""
-"invalid argument %s for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr ""
-
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
-msgid "revision walk setup failed\n"
-msgstr ""
-
-#: builtin/bisect--helper.c:521
-#, c-format
-msgid "could not open '%s' for appending"
-msgstr ""
-
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
-msgid "'' is not a valid term"
-msgstr ""
-
-#: builtin/bisect--helper.c:663
-#, c-format
-msgid "unrecognized option: '%s'"
-msgstr ""
-
-#: builtin/bisect--helper.c:667
-#, c-format
-msgid "'%s' does not appear to be a valid revision"
-msgstr ""
-
-#: builtin/bisect--helper.c:698
-msgid "bad HEAD - I need a HEAD"
-msgstr ""
-
-#: builtin/bisect--helper.c:713
-#, c-format
-msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr ""
-
-#: builtin/bisect--helper.c:734
-msgid "won't bisect on cg-seek'ed tree"
-msgstr ""
-
-#: builtin/bisect--helper.c:737
-msgid "bad HEAD - strange symbolic ref"
-msgstr ""
-
-#: builtin/bisect--helper.c:757
-#, c-format
-msgid "invalid ref: '%s'"
-msgstr ""
-
-#: builtin/bisect--helper.c:815
-msgid "You need to start by \"git bisect start\"\n"
-msgstr ""
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#.
-#: builtin/bisect--helper.c:826
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr ""
-
-#: builtin/bisect--helper.c:844
-msgid "Please call `--bisect-state` with at least one argument"
-msgstr ""
-
-#: builtin/bisect--helper.c:857
-#, c-format
-msgid "'git bisect %s' can take only one argument."
-msgstr ""
-
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
-#, c-format
-msgid "Bad rev input: %s"
-msgstr ""
-
-#: builtin/bisect--helper.c:889
-#, c-format
-msgid "Bad rev input (not a commit): %s"
-msgstr ""
-
-#: builtin/bisect--helper.c:921
-msgid "We are not bisecting."
-msgstr ""
-
-#: builtin/bisect--helper.c:971
-#, c-format
-msgid "'%s'?? what are you talking about?"
-msgstr ""
-
-#: builtin/bisect--helper.c:983
-#, c-format
-msgid "cannot read file '%s' for replaying"
-msgstr ""
-
-#: builtin/bisect--helper.c:1056
-msgid "reset the bisection state"
-msgstr ""
-
-#: builtin/bisect--helper.c:1058
-msgid "check whether bad or good terms exist"
-msgstr ""
-
-#: builtin/bisect--helper.c:1060
-msgid "print out the bisect terms"
-msgstr ""
-
-#: builtin/bisect--helper.c:1062
-msgid "start the bisect session"
-msgstr ""
-
-#: builtin/bisect--helper.c:1064
-msgid "find the next bisection commit"
-msgstr ""
-
-#: builtin/bisect--helper.c:1066
-msgid "mark the state of ref (or refs)"
-msgstr ""
-
-#: builtin/bisect--helper.c:1068
-msgid "list the bisection steps so far"
-msgstr ""
-
-#: builtin/bisect--helper.c:1070
-msgid "replay the bisection process from the given file"
-msgstr ""
-
-#: builtin/bisect--helper.c:1072
-msgid "skip some commits for checkout"
-msgstr ""
-
-#: builtin/bisect--helper.c:1074
-msgid "no log for BISECT_WRITE"
-msgstr ""
-
-#: builtin/bisect--helper.c:1089
-msgid "--bisect-reset requires either no argument or a commit"
-msgstr ""
-
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:1100
-msgid "--bisect-terms requires 0 or 1 argument"
-msgstr ""
-
-#: builtin/bisect--helper.c:1109
-msgid "--bisect-next requires 0 arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:1120
-msgid "--bisect-log requires 0 arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:1125
-msgid "no logfile given"
-msgstr ""
-
-#: builtin/blame.c:32
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr ""
-
-#: builtin/blame.c:37
-msgid "<rev-opts> are documented in git-rev-list(1)"
-msgstr ""
-
-#: builtin/blame.c:410
-#, c-format
-msgid "expecting a color: %s"
-msgstr ""
-
-#: builtin/blame.c:417
-msgid "must end with a color"
-msgstr ""
-
-#: builtin/blame.c:728
-#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr ""
-
-#: builtin/blame.c:746
-msgid "invalid value for blame.coloring"
-msgstr ""
-
-#: builtin/blame.c:845
-#, c-format
-msgid "cannot find revision %s to ignore"
-msgstr ""
-
-#: builtin/blame.c:867
-msgid "show blame entries as we find them, incrementally"
-msgstr ""
-
-#: builtin/blame.c:868
-msgid "do not show object names of boundary commits (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:869
-msgid "do not treat root commits as boundaries (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:870
-msgid "show work cost statistics"
-msgstr ""
-
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
-msgid "force progress reporting"
-msgstr ""
-
-#: builtin/blame.c:872
-msgid "show output score for blame entries"
-msgstr ""
-
-#: builtin/blame.c:873
-msgid "show original filename (Default: auto)"
-msgstr ""
-
-#: builtin/blame.c:874
-msgid "show original linenumber (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:875
-msgid "show in a format designed for machine consumption"
-msgstr ""
-
-#: builtin/blame.c:876
-msgid "show porcelain format with per-line commit information"
-msgstr ""
-
-#: builtin/blame.c:877
-msgid "use the same output mode as git-annotate (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:878
-msgid "show raw timestamp (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:879
-msgid "show long commit SHA1 (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:880
-msgid "suppress author name and timestamp (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:881
-msgid "show author email instead of name (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:882
-msgid "ignore whitespace differences"
-msgstr ""
-
-#: builtin/blame.c:883 builtin/log.c:1823
-msgid "rev"
-msgstr ""
-
-#: builtin/blame.c:883
-msgid "ignore <rev> when blaming"
-msgstr ""
-
-#: builtin/blame.c:884
-msgid "ignore revisions from <file>"
-msgstr ""
-
-#: builtin/blame.c:885
-msgid "color redundant metadata from previous line differently"
-msgstr ""
-
-#: builtin/blame.c:886
-msgid "color lines by age"
-msgstr ""
-
-#: builtin/blame.c:887
-msgid "spend extra cycles to find better match"
-msgstr ""
-
-#: builtin/blame.c:888
-msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr ""
-
-#: builtin/blame.c:889
-msgid "use <file>'s contents as the final image"
-msgstr ""
-
-#: builtin/blame.c:890 builtin/blame.c:891
-msgid "score"
-msgstr ""
-
-#: builtin/blame.c:890
-msgid "find line copies within and across files"
-msgstr ""
-
-#: builtin/blame.c:891
-msgid "find line movements within and across files"
-msgstr ""
-
-#: builtin/blame.c:892
-msgid "range"
-msgstr ""
-
-#: builtin/blame.c:893
-msgid "process only line range <start>,<end> or function :<funcname>"
-msgstr ""
-
-#: builtin/blame.c:945
-msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr ""
-
-#. TRANSLATORS: This string is used to tell us the
-#. maximum display width for a relative timestamp in
-#. "git blame" output. For C locale, "4 years, 11
-#. months ago", which takes 22 places, is the longest
-#. among various forms of relative timestamps, but
-#. your language may need more or fewer display
-#. columns.
-#.
-#: builtin/blame.c:996
-msgid "4 years, 11 months ago"
-msgstr ""
-
-#: builtin/blame.c:1112
-#, c-format
-msgid "file %s has only %lu line"
-msgid_plural "file %s has only %lu lines"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/blame.c:1157
-msgid "Blaming lines"
-msgstr ""
-
-#: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr ""
-
-#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr ""
-
-#: builtin/branch.c:31
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr ""
-
-#: builtin/branch.c:32
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
-msgstr ""
-
-#: builtin/branch.c:33
-msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
-msgstr ""
-
-#: builtin/branch.c:34
-msgid "git branch [<options>] [-r | -a] [--points-at]"
-msgstr ""
-
-#: builtin/branch.c:35
-msgid "git branch [<options>] [-r | -a] [--format]"
-msgstr ""
-
-#: builtin/branch.c:154
-#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
-msgstr ""
-
-#: builtin/branch.c:158
-#, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
-msgstr ""
-
-#: builtin/branch.c:172
-#, c-format
-msgid "Couldn't look up commit object for '%s'"
-msgstr ""
-
-#: builtin/branch.c:176
-#, c-format
-msgid ""
-"The branch '%s' is not fully merged.\n"
-"If you are sure you want to delete it, run 'git branch -D %s'."
-msgstr ""
-
-#: builtin/branch.c:189
-msgid "Update of config-file failed"
-msgstr ""
-
-#: builtin/branch.c:223
-msgid "cannot use -a with -d"
-msgstr ""
-
-#: builtin/branch.c:230
-msgid "Couldn't look up commit object for HEAD"
-msgstr ""
-
-#: builtin/branch.c:244
-#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr ""
-
-#: builtin/branch.c:259
-#, c-format
-msgid "remote-tracking branch '%s' not found."
-msgstr ""
-
-#: builtin/branch.c:260
-#, c-format
-msgid "branch '%s' not found."
-msgstr ""
-
-#: builtin/branch.c:291
-#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
-msgstr ""
-
-#: builtin/branch.c:292
-#, c-format
-msgid "Deleted branch %s (was %s).\n"
-msgstr ""
-
-#: builtin/branch.c:440 builtin/tag.c:63
-msgid "unable to parse format string"
-msgstr ""
-
-#: builtin/branch.c:471
-msgid "could not resolve HEAD"
-msgstr ""
-
-#: builtin/branch.c:477
-#, c-format
-msgid "HEAD (%s) points outside of refs/heads/"
-msgstr ""
-
-#: builtin/branch.c:492
-#, c-format
-msgid "Branch %s is being rebased at %s"
-msgstr ""
-
-#: builtin/branch.c:496
-#, c-format
-msgid "Branch %s is being bisected at %s"
-msgstr ""
-
-#: builtin/branch.c:513
-msgid "cannot copy the current branch while not on any."
-msgstr ""
-
-#: builtin/branch.c:515
-msgid "cannot rename the current branch while not on any."
-msgstr ""
-
-#: builtin/branch.c:526
-#, c-format
-msgid "Invalid branch name: '%s'"
-msgstr ""
-
-#: builtin/branch.c:555
-msgid "Branch rename failed"
-msgstr ""
-
-#: builtin/branch.c:557
-msgid "Branch copy failed"
-msgstr ""
-
-#: builtin/branch.c:561
-#, c-format
-msgid "Created a copy of a misnamed branch '%s'"
-msgstr ""
-
-#: builtin/branch.c:564
-#, c-format
-msgid "Renamed a misnamed branch '%s' away"
-msgstr ""
-
-#: builtin/branch.c:570
-#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
-msgstr ""
-
-#: builtin/branch.c:579
-msgid "Branch is renamed, but update of config-file failed"
-msgstr ""
-
-#: builtin/branch.c:581
-msgid "Branch is copied, but update of config-file failed"
-msgstr ""
-
-#: builtin/branch.c:597
-#, c-format
-msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
-msgstr ""
-
-#: builtin/branch.c:631
-msgid "Generic options"
-msgstr ""
-
-#: builtin/branch.c:633
-msgid "show hash and subject, give twice for upstream branch"
-msgstr ""
-
-#: builtin/branch.c:634
-msgid "suppress informational messages"
-msgstr ""
-
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
-msgstr ""
-
-#: builtin/branch.c:637
-msgid "do not use"
-msgstr ""
-
-#: builtin/branch.c:639 builtin/rebase.c:533
-msgid "upstream"
-msgstr ""
-
-#: builtin/branch.c:639
-msgid "change the upstream info"
-msgstr ""
-
-#: builtin/branch.c:640
-msgid "unset the upstream info"
-msgstr ""
-
-#: builtin/branch.c:641
-msgid "use colored output"
-msgstr ""
-
-#: builtin/branch.c:642
-msgid "act on remote-tracking branches"
-msgstr ""
-
-#: builtin/branch.c:644 builtin/branch.c:646
-msgid "print only branches that contain the commit"
-msgstr ""
-
-#: builtin/branch.c:645 builtin/branch.c:647
-msgid "print only branches that don't contain the commit"
-msgstr ""
-
-#: builtin/branch.c:650
-msgid "Specific git-branch actions:"
-msgstr ""
-
-#: builtin/branch.c:651
-msgid "list both remote-tracking and local branches"
-msgstr ""
-
-#: builtin/branch.c:653
-msgid "delete fully merged branch"
-msgstr ""
-
-#: builtin/branch.c:654
-msgid "delete branch (even if not merged)"
-msgstr ""
-
-#: builtin/branch.c:655
-msgid "move/rename a branch and its reflog"
-msgstr ""
-
-#: builtin/branch.c:656
-msgid "move/rename a branch, even if target exists"
-msgstr ""
-
-#: builtin/branch.c:657
-msgid "copy a branch and its reflog"
-msgstr ""
-
-#: builtin/branch.c:658
-msgid "copy a branch, even if target exists"
-msgstr ""
-
-#: builtin/branch.c:659
-msgid "list branch names"
-msgstr ""
-
-#: builtin/branch.c:660
-msgid "show current branch name"
-msgstr ""
-
-#: builtin/branch.c:661
-msgid "create the branch's reflog"
-msgstr ""
-
-#: builtin/branch.c:663
-msgid "edit the description for the branch"
-msgstr ""
-
-#: builtin/branch.c:664
-msgid "force creation, move/rename, deletion"
-msgstr ""
-
-#: builtin/branch.c:665
-msgid "print only branches that are merged"
-msgstr ""
-
-#: builtin/branch.c:666
-msgid "print only branches that are not merged"
-msgstr ""
-
-#: builtin/branch.c:667
-msgid "list branches in columns"
-msgstr ""
-
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
-msgid "object"
-msgstr ""
-
-#: builtin/branch.c:670
-msgid "print only branches of the object"
-msgstr ""
-
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
-msgid "sorting and filtering are case insensitive"
-msgstr ""
-
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
-#: builtin/verify-tag.c:38
-msgid "format to use for the output"
-msgstr ""
-
-#: builtin/branch.c:695 builtin/clone.c:794
-msgid "HEAD not found below refs/heads!"
-msgstr ""
-
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr ""
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
-msgid "branch name required"
-msgstr ""
-
-#: builtin/branch.c:766
-msgid "Cannot give description to detached HEAD"
-msgstr ""
-
-#: builtin/branch.c:771
-msgid "cannot edit description of more than one branch"
-msgstr ""
-
-#: builtin/branch.c:778
-#, c-format
-msgid "No commit on branch '%s' yet."
-msgstr ""
-
-#: builtin/branch.c:781
-#, c-format
-msgid "No branch named '%s'."
-msgstr ""
-
-#: builtin/branch.c:796
-msgid "too many branches for a copy operation"
-msgstr ""
-
-#: builtin/branch.c:805
-msgid "too many arguments for a rename operation"
-msgstr ""
-
-#: builtin/branch.c:810
-msgid "too many arguments to set new upstream"
-msgstr ""
-
-#: builtin/branch.c:814
-#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
-msgstr ""
-
-#: builtin/branch.c:817 builtin/branch.c:840
-#, c-format
-msgid "no such branch '%s'"
-msgstr ""
-
-#: builtin/branch.c:821
-#, c-format
-msgid "branch '%s' does not exist"
-msgstr ""
-
-#: builtin/branch.c:834
-msgid "too many arguments to unset upstream"
-msgstr ""
-
-#: builtin/branch.c:838
-msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr ""
-
-#: builtin/branch.c:844
-#, c-format
-msgid "Branch '%s' has no upstream information"
-msgstr ""
-
-#: builtin/branch.c:854
-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:858
-msgid ""
-"the '--set-upstream' option is no longer supported. Please use '--track' or "
-"'--set-upstream-to' instead."
-msgstr ""
-
-#: builtin/bugreport.c:15
-msgid "git version:\n"
-msgstr ""
-
-#: builtin/bugreport.c:21
-#, c-format
-msgid "uname() failed with error '%s' (%d)\n"
-msgstr ""
-
-#: builtin/bugreport.c:31
-msgid "compiler info: "
-msgstr ""
-
-#: builtin/bugreport.c:34
-msgid "libc info: "
-msgstr ""
-
-#: builtin/bugreport.c:80
-msgid "not run from a git repository - no hooks to show\n"
-msgstr ""
-
-#: builtin/bugreport.c:90
-msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
-msgstr ""
-
-#: builtin/bugreport.c:97
-msgid ""
-"Thank you for filling out a Git bug report!\n"
-"Please answer the following questions to help us understand your issue.\n"
-"\n"
-"What did you do before the bug happened? (Steps to reproduce your issue)\n"
-"\n"
-"What did you expect to happen? (Expected behavior)\n"
-"\n"
-"What happened instead? (Actual behavior)\n"
-"\n"
-"What's different between what you expected and what actually happened?\n"
-"\n"
-"Anything else you want to add:\n"
-"\n"
-"Please review the rest of the bug report below.\n"
-"You can delete any lines you don't wish to share.\n"
-msgstr ""
-
-#: builtin/bugreport.c:136
-msgid "specify a destination for the bugreport file"
-msgstr ""
-
-#: builtin/bugreport.c:138
-msgid "specify a strftime format suffix for the filename"
-msgstr ""
-
-#: builtin/bugreport.c:160
-#, c-format
-msgid "could not create leading directories for '%s'"
-msgstr ""
-
-#: builtin/bugreport.c:167
-msgid "System Info"
-msgstr ""
-
-#: builtin/bugreport.c:170
-msgid "Enabled Hooks"
-msgstr ""
-
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr ""
-
-#: builtin/bugreport.c:180
-#, c-format
-msgid "unable to write to %s"
-msgstr ""
-
-#: builtin/bugreport.c:190
-#, c-format
-msgid "Created new report at '%s'.\n"
-msgstr ""
-
-#: builtin/bundle.c:15 builtin/bundle.c:23
-msgid "git bundle create [<options>] <file> <git-rev-list args>"
-msgstr ""
-
-#: builtin/bundle.c:16 builtin/bundle.c:28
-msgid "git bundle verify [<options>] <file>"
-msgstr ""
-
-#: builtin/bundle.c:17 builtin/bundle.c:33
-msgid "git bundle list-heads <file> [<refname>...]"
-msgstr ""
-
-#: builtin/bundle.c:18 builtin/bundle.c:38
-msgid "git bundle unbundle <file> [<refname>...]"
-msgstr ""
-
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
-msgid "do not show progress meter"
-msgstr ""
-
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
-msgid "show progress meter"
-msgstr ""
-
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
-msgid "show progress meter during object writing phase"
-msgstr ""
-
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
-msgid "similar to --all-progress when progress meter is shown"
-msgstr ""
-
-#: builtin/bundle.c:76
-msgid "specify bundle format version"
-msgstr ""
-
-#: builtin/bundle.c:96
-msgid "Need a repository to create a bundle."
-msgstr ""
-
-#: builtin/bundle.c:109
-msgid "do not show bundle details"
-msgstr ""
-
-#: builtin/bundle.c:128
-#, c-format
-msgid "%s is okay\n"
-msgstr ""
-
-#: builtin/bundle.c:179
-msgid "Need a repository to unbundle."
-msgstr ""
-
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr ""
-
-#: builtin/bundle.c:213 builtin/remote.c:1731
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr ""
-
-#: builtin/cat-file.c:596
-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:597
-msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
-msgstr ""
-
-#: builtin/cat-file.c:618
-msgid "only one batch option may be specified"
-msgstr ""
-
-#: builtin/cat-file.c:636
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr ""
-
-#: builtin/cat-file.c:637
-msgid "show object type"
-msgstr ""
-
-#: builtin/cat-file.c:638
-msgid "show object size"
-msgstr ""
-
-#: builtin/cat-file.c:640
-msgid "exit with zero when there's no error"
-msgstr ""
-
-#: builtin/cat-file.c:641
-msgid "pretty-print object's content"
-msgstr ""
-
-#: builtin/cat-file.c:643
-msgid "for blob objects, run textconv on object's content"
-msgstr ""
-
-#: builtin/cat-file.c:645
-msgid "for blob objects, run filters on object's content"
-msgstr ""
-
-#: builtin/cat-file.c:646
-msgid "blob"
-msgstr ""
-
-#: builtin/cat-file.c:647
-msgid "use a specific path for --textconv/--filters"
-msgstr ""
-
-#: builtin/cat-file.c:649
-msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr ""
-
-#: builtin/cat-file.c:650
-msgid "buffer --batch output"
-msgstr ""
-
-#: builtin/cat-file.c:652
-msgid "show info and content of objects fed from the standard input"
-msgstr ""
-
-#: builtin/cat-file.c:656
-msgid "show info about objects fed from the standard input"
-msgstr ""
-
-#: builtin/cat-file.c:660
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr ""
-
-#: builtin/cat-file.c:662
-msgid "show all objects with --batch or --batch-check"
-msgstr ""
-
-#: builtin/cat-file.c:664
-msgid "do not order --batch-all-objects output"
-msgstr ""
-
-#: builtin/check-attr.c:13
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
-msgstr ""
-
-#: builtin/check-attr.c:14
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
-msgstr ""
-
-#: builtin/check-attr.c:21
-msgid "report all attributes set on file"
-msgstr ""
-
-#: builtin/check-attr.c:22
-msgid "use .gitattributes only from the index"
-msgstr ""
-
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
-msgid "read file names from stdin"
-msgstr ""
-
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
-msgid "terminate input and output records by a NUL character"
-msgstr ""
-
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
-msgid "suppress progress reporting"
-msgstr ""
-
-#: builtin/check-ignore.c:29
-msgid "show non-matching input paths"
-msgstr ""
-
-#: builtin/check-ignore.c:31
-msgid "ignore index when checking"
-msgstr ""
-
-#: builtin/check-ignore.c:165
-msgid "cannot specify pathnames with --stdin"
-msgstr ""
-
-#: builtin/check-ignore.c:168
-msgid "-z only makes sense with --stdin"
-msgstr ""
-
-#: builtin/check-ignore.c:170
-msgid "no path specified"
-msgstr ""
-
-#: builtin/check-ignore.c:174
-msgid "--quiet is only valid with a single pathname"
-msgstr ""
-
-#: builtin/check-ignore.c:176
-msgid "cannot have both --quiet and --verbose"
-msgstr ""
-
-#: builtin/check-ignore.c:179
-msgid "--non-matching is only valid with --verbose"
-msgstr ""
-
-#: builtin/check-mailmap.c:9
-msgid "git check-mailmap [<options>] <contact>..."
-msgstr ""
-
-#: builtin/check-mailmap.c:14
-msgid "also read contacts from stdin"
-msgstr ""
-
-#: builtin/check-mailmap.c:25
-#, c-format
-msgid "unable to parse contact: %s"
-msgstr ""
-
-#: builtin/check-mailmap.c:48
-msgid "no contacts specified"
-msgstr ""
-
-#: builtin/checkout--worker.c:110
-msgid "git checkout--worker [<options>]"
-msgstr ""
-
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
-msgid "string"
-msgstr ""
-
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
-msgid "when creating files, prepend <string>"
-msgstr ""
-
-#: builtin/checkout-index.c:152
-msgid "git checkout-index [<options>] [--] [<file>...]"
-msgstr ""
-
-#: builtin/checkout-index.c:169
-msgid "stage should be between 1 and 3 or all"
-msgstr ""
-
-#: builtin/checkout-index.c:187
-msgid "check out all files in the index"
-msgstr ""
-
-#: builtin/checkout-index.c:188
-msgid "force overwrite of existing files"
-msgstr ""
-
-#: builtin/checkout-index.c:190
-msgid "no warning for existing files and files not in index"
-msgstr ""
-
-#: builtin/checkout-index.c:192
-msgid "don't checkout new files"
-msgstr ""
-
-#: builtin/checkout-index.c:194
-msgid "update stat information in the index file"
-msgstr ""
-
-#: builtin/checkout-index.c:198
-msgid "read list of paths from the standard input"
-msgstr ""
-
-#: builtin/checkout-index.c:200
-msgid "write the content to temporary files"
-msgstr ""
-
-#: builtin/checkout-index.c:204
-msgid "copy out the files from named stage"
-msgstr ""
-
-#: builtin/checkout.c:33
-msgid "git checkout [<options>] <branch>"
-msgstr ""
-
-#: builtin/checkout.c:34
-msgid "git checkout [<options>] [<branch>] -- <file>..."
-msgstr ""
-
-#: builtin/checkout.c:39
-msgid "git switch [<options>] [<branch>]"
-msgstr ""
-
-#: builtin/checkout.c:44
-msgid "git restore [<options>] [--source=<branch>] <file>..."
-msgstr ""
-
-#: builtin/checkout.c:190 builtin/checkout.c:229
-#, c-format
-msgid "path '%s' does not have our version"
-msgstr ""
-
-#: builtin/checkout.c:192 builtin/checkout.c:231
-#, c-format
-msgid "path '%s' does not have their version"
-msgstr ""
-
-#: builtin/checkout.c:208
-#, c-format
-msgid "path '%s' does not have all necessary versions"
-msgstr ""
-
-#: builtin/checkout.c:261
-#, c-format
-msgid "path '%s' does not have necessary versions"
-msgstr ""
-
-#: builtin/checkout.c:278
-#, c-format
-msgid "path '%s': cannot merge"
-msgstr ""
-
-#: builtin/checkout.c:294
-#, c-format
-msgid "Unable to add merge result for '%s'"
-msgstr ""
-
-#: builtin/checkout.c:411
-#, c-format
-msgid "Recreated %d merge conflict"
-msgid_plural "Recreated %d merge conflicts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:416
-#, c-format
-msgid "Updated %d path from %s"
-msgid_plural "Updated %d paths from %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:423
-#, c-format
-msgid "Updated %d path from the index"
-msgid_plural "Updated %d paths from the index"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
-#, c-format
-msgid "'%s' cannot be used with updating paths"
-msgstr ""
-
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr ""
-
-#: builtin/checkout.c:466
-#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
-msgstr ""
-
-#: builtin/checkout.c:470
-#, c-format
-msgid "neither '%s' or '%s' is specified"
-msgstr ""
-
-#: builtin/checkout.c:474
-#, c-format
-msgid "'%s' must be used when '%s' is not specified"
-msgstr ""
-
-#: builtin/checkout.c:479 builtin/checkout.c:484
-#, c-format
-msgid "'%s' or '%s' cannot be used with %s"
-msgstr ""
-
-#: builtin/checkout.c:558 builtin/checkout.c:565
-#, c-format
-msgid "path '%s' is unmerged"
-msgstr ""
-
-#: builtin/checkout.c:734
-msgid "you need to resolve your current index first"
-msgstr ""
-
-#: builtin/checkout.c:788
-#, c-format
-msgid ""
-"cannot continue with staged changes in the following files:\n"
-"%s"
-msgstr ""
-
-#: builtin/checkout.c:881
-#, c-format
-msgid "Can not do reflog for '%s': %s\n"
-msgstr ""
-
-#: builtin/checkout.c:923
-msgid "HEAD is now at"
-msgstr ""
-
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
-msgid "unable to update HEAD"
-msgstr ""
-
-#: builtin/checkout.c:931
-#, c-format
-msgid "Reset branch '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:934
-#, c-format
-msgid "Already on '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:938
-#, c-format
-msgid "Switched to and reset branch '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:940 builtin/checkout.c:1371
-#, c-format
-msgid "Switched to a new branch '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:942
-#, c-format
-msgid "Switched to branch '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:993
-#, c-format
-msgid " ... and %d more.\n"
-msgstr ""
-
-#: builtin/checkout.c:999
-#, c-format
-msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:1018
-#, c-format
-msgid ""
-"If you want to keep it by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgid_plural ""
-"If you want to keep them by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:1053
-msgid "internal error in revision walk"
-msgstr ""
-
-#: builtin/checkout.c:1057
-msgid "Previous HEAD position was"
-msgstr ""
-
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
-msgid "You are on a branch yet to be born"
-msgstr ""
-
-#: builtin/checkout.c:1179
-#, 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:1186
-msgid ""
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
-"you can do so by fully qualifying the name with the --track option:\n"
-"\n"
-" git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-
-#: builtin/checkout.c:1196
-#, c-format
-msgid "'%s' matched multiple (%d) remote tracking branches"
-msgstr ""
-
-#: builtin/checkout.c:1262
-msgid "only one reference expected"
-msgstr ""
-
-#: builtin/checkout.c:1279
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr ""
-
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
-#, c-format
-msgid "invalid reference: %s"
-msgstr ""
-
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
-#, c-format
-msgid "reference is not a tree: %s"
-msgstr ""
-
-#: builtin/checkout.c:1385
-#, c-format
-msgid "a branch is expected, got tag '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1387
-#, c-format
-msgid "a branch is expected, got remote branch '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
-#, c-format
-msgid "a branch is expected, got '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1391
-#, c-format
-msgid "a branch is expected, got commit '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1407
-msgid ""
-"cannot switch branch while merging\n"
-"Consider \"git merge --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1411
-msgid ""
-"cannot switch branch in the middle of an am session\n"
-"Consider \"git am --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1415
-msgid ""
-"cannot switch branch while rebasing\n"
-"Consider \"git rebase --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1419
-msgid ""
-"cannot switch branch while cherry-picking\n"
-"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1423
-msgid ""
-"cannot switch branch while reverting\n"
-"Consider \"git revert --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1427
-msgid "you are switching branch while bisecting"
-msgstr ""
-
-#: builtin/checkout.c:1434
-msgid "paths cannot be used with switching branches"
-msgstr ""
-
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
-#, c-format
-msgid "'%s' cannot be used with switching branches"
-msgstr ""
-
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
-#, c-format
-msgid "'%s' cannot be used with '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1462
-#, c-format
-msgid "'%s' cannot take <start-point>"
-msgstr ""
-
-#: builtin/checkout.c:1470
-#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1477
-msgid "missing branch or commit argument"
-msgstr ""
-
-#: builtin/checkout.c:1520
-msgid "perform a 3-way merge with the new branch"
-msgstr ""
-
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
-msgid "style"
-msgstr ""
-
-#: builtin/checkout.c:1522
-msgid "conflict style (merge or diff3)"
-msgstr ""
-
-#: builtin/checkout.c:1534 builtin/worktree.c:488
-msgid "detach HEAD at named commit"
-msgstr ""
-
-#: builtin/checkout.c:1535
-msgid "set upstream info for new branch"
-msgstr ""
-
-#: builtin/checkout.c:1537
-msgid "force checkout (throw away local modifications)"
-msgstr ""
-
-#: builtin/checkout.c:1539
-msgid "new-branch"
-msgstr ""
-
-#: builtin/checkout.c:1539
-msgid "new unparented branch"
-msgstr ""
-
-#: builtin/checkout.c:1541 builtin/merge.c:301
-msgid "update ignored files (default)"
-msgstr ""
-
-#: builtin/checkout.c:1544
-msgid "do not check if another worktree is holding the given ref"
-msgstr ""
-
-#: builtin/checkout.c:1557
-msgid "checkout our version for unmerged files"
-msgstr ""
-
-#: builtin/checkout.c:1560
-msgid "checkout their version for unmerged files"
-msgstr ""
-
-#: builtin/checkout.c:1564
-msgid "do not limit pathspecs to sparse entries only"
-msgstr ""
-
-#: builtin/checkout.c:1622
-#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr ""
-
-#: builtin/checkout.c:1626
-msgid "-p and --overlay are mutually exclusive"
-msgstr ""
-
-#: builtin/checkout.c:1663
-msgid "--track needs a branch name"
-msgstr ""
-
-#: builtin/checkout.c:1668
-#, c-format
-msgid "missing branch name; try -%c"
-msgstr ""
-
-#: builtin/checkout.c:1700
-#, c-format
-msgid "could not resolve %s"
-msgstr ""
-
-#: builtin/checkout.c:1716
-msgid "invalid path specification"
-msgstr ""
-
-#: builtin/checkout.c:1723
-#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr ""
-
-#: builtin/checkout.c:1727
-#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1736
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr ""
-
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr ""
-
-#: builtin/checkout.c:1752
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
-msgstr ""
-
-#: builtin/checkout.c:1757
-msgid "you must specify path(s) to restore"
-msgstr ""
-
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
-msgid "branch"
-msgstr ""
-
-#: builtin/checkout.c:1784
-msgid "create and checkout a new branch"
-msgstr ""
-
-#: builtin/checkout.c:1786
-msgid "create/reset and checkout a branch"
-msgstr ""
-
-#: builtin/checkout.c:1787
-msgid "create reflog for new branch"
-msgstr ""
-
-#: builtin/checkout.c:1789
-msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr ""
-
-#: builtin/checkout.c:1790
-msgid "use overlay mode (default)"
-msgstr ""
-
-#: builtin/checkout.c:1835
-msgid "create and switch to a new branch"
-msgstr ""
-
-#: builtin/checkout.c:1837
-msgid "create/reset and switch to a branch"
-msgstr ""
-
-#: builtin/checkout.c:1839
-msgid "second guess 'git switch <no-such-branch>'"
-msgstr ""
-
-#: builtin/checkout.c:1841
-msgid "throw away local modifications"
-msgstr ""
-
-#: builtin/checkout.c:1875
-msgid "which tree-ish to checkout from"
-msgstr ""
-
-#: builtin/checkout.c:1877
-msgid "restore the index"
-msgstr ""
-
-#: builtin/checkout.c:1879
-msgid "restore the working tree (default)"
-msgstr ""
-
-#: builtin/checkout.c:1881
-msgid "ignore unmerged entries"
-msgstr ""
-
-#: builtin/checkout.c:1882
-msgid "use overlay mode"
-msgstr ""
-
-#: builtin/clean.c:29
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
-msgstr ""
-
-#: builtin/clean.c:33
-#, c-format
-msgid "Removing %s\n"
-msgstr ""
-
-#: builtin/clean.c:34
-#, c-format
-msgid "Would remove %s\n"
-msgstr ""
-
-#: builtin/clean.c:35
-#, c-format
-msgid "Skipping repository %s\n"
-msgstr ""
-
-#: builtin/clean.c:36
-#, c-format
-msgid "Would skip repository %s\n"
-msgstr ""
-
-#: builtin/clean.c:38
-#, c-format
-msgid "could not lstat %s\n"
-msgstr ""
-
-#: builtin/clean.c:300 git-add--interactive.perl:593
-#, c-format
-msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing\n"
-msgstr ""
-
-#: builtin/clean.c:304 git-add--interactive.perl:602
-#, c-format
-msgid ""
-"Prompt help:\n"
-"1 - select a single item\n"
-"3-5 - select a range of items\n"
-"2-3,6-9 - select multiple ranges\n"
-"foo - select item based on unique prefix\n"
-"-... - unselect specified items\n"
-"* - choose all items\n"
-" - (empty) finish selecting\n"
-msgstr ""
-
-#: builtin/clean.c:519 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
-msgstr ""
-
-#: builtin/clean.c:659
-#, c-format
-msgid "Input ignore patterns>> "
-msgstr ""
-
-#: builtin/clean.c:693
-#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
-msgstr ""
-
-#: builtin/clean.c:714
-msgid "Select items to delete"
-msgstr ""
-
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
-#, c-format
-msgid "Remove %s [y/N]? "
-msgstr ""
-
-#: builtin/clean.c:786
-msgid ""
-"clean - start cleaning\n"
-"filter by pattern - exclude items from deletion\n"
-"select by numbers - select items to be deleted by numbers\n"
-"ask each - confirm each deletion (like \"rm -i\")\n"
-"quit - stop cleaning\n"
-"help - this screen\n"
-"? - help for prompt selection"
-msgstr ""
-
-#: builtin/clean.c:822
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/clean.c:838
-msgid "No more files to clean, exiting."
-msgstr ""
-
-#: builtin/clean.c:900
-msgid "do not print names of files removed"
-msgstr ""
-
-#: builtin/clean.c:902
-msgid "force"
-msgstr ""
-
-#: builtin/clean.c:903
-msgid "interactive cleaning"
-msgstr ""
-
-#: builtin/clean.c:905
-msgid "remove whole directories"
-msgstr ""
-
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
-#: builtin/show-ref.c:179
-msgid "pattern"
-msgstr ""
-
-#: builtin/clean.c:907
-msgid "add <pattern> to ignore rules"
-msgstr ""
-
-#: builtin/clean.c:908
-msgid "remove ignored files, too"
-msgstr ""
-
-#: builtin/clean.c:910
-msgid "remove only ignored files"
-msgstr ""
-
-#: builtin/clean.c:925
-msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
-msgstr ""
-
-#: builtin/clean.c:928
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
-msgstr ""
-
-#: builtin/clean.c:940
-msgid "-x and -X cannot be used together"
-msgstr ""
-
-#: builtin/clone.c:45
-msgid "git clone [<options>] [--] <repo> [<dir>]"
-msgstr ""
-
-#: builtin/clone.c:96
-msgid "don't clone shallow repository"
-msgstr ""
-
-#: builtin/clone.c:98
-msgid "don't create a checkout"
-msgstr ""
-
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
-msgid "create a bare repository"
-msgstr ""
-
-#: builtin/clone.c:103
-msgid "create a mirror repository (implies bare)"
-msgstr ""
-
-#: builtin/clone.c:105
-msgid "to clone from a local repository"
-msgstr ""
-
-#: builtin/clone.c:107
-msgid "don't use local hardlinks, always copy"
-msgstr ""
-
-#: builtin/clone.c:109
-msgid "setup as shared repository"
-msgstr ""
-
-#: builtin/clone.c:111
-msgid "pathspec"
-msgstr ""
-
-#: builtin/clone.c:111
-msgid "initialize submodules in the clone"
-msgstr ""
-
-#: builtin/clone.c:115
-msgid "number of submodules cloned in parallel"
-msgstr ""
-
-#: builtin/clone.c:116 builtin/init-db.c:539
-msgid "template-directory"
-msgstr ""
-
-#: builtin/clone.c:117 builtin/init-db.c:540
-msgid "directory from which templates will be used"
-msgstr ""
-
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
-msgid "reference repository"
-msgstr ""
-
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
-msgid "use --reference only while cloning"
-msgstr ""
-
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
-msgid "name"
-msgstr ""
-
-#: builtin/clone.c:125
-msgid "use <name> instead of 'origin' to track upstream"
-msgstr ""
-
-#: builtin/clone.c:127
-msgid "checkout <branch> instead of the remote's HEAD"
-msgstr ""
-
-#: builtin/clone.c:129
-msgid "path to git-upload-pack on the remote"
-msgstr ""
-
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
-msgid "depth"
-msgstr ""
-
-#: builtin/clone.c:131
-msgid "create a shallow clone of that depth"
-msgstr ""
-
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
-msgid "time"
-msgstr ""
-
-#: builtin/clone.c:133
-msgid "create a shallow clone since a specific time"
-msgstr ""
-
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
-msgid "revision"
-msgstr ""
-
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
-msgid "deepen history of shallow clone, excluding rev"
-msgstr ""
-
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
-msgid "clone only one branch, HEAD or --branch"
-msgstr ""
-
-#: builtin/clone.c:139
-msgid "don't clone any tags, and make later fetches not to follow them"
-msgstr ""
-
-#: builtin/clone.c:141
-msgid "any cloned submodules will be shallow"
-msgstr ""
-
-#: builtin/clone.c:142 builtin/init-db.c:548
-msgid "gitdir"
-msgstr ""
-
-#: builtin/clone.c:143 builtin/init-db.c:549
-msgid "separate git dir from working tree"
-msgstr ""
-
-#: builtin/clone.c:144
-msgid "key=value"
-msgstr ""
-
-#: builtin/clone.c:145
-msgid "set config inside the new repository"
-msgstr ""
-
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
-msgid "server-specific"
-msgstr ""
-
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
-msgid "option to transmit"
-msgstr ""
-
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
-#: builtin/push.c:576
-msgid "use IPv4 addresses only"
-msgstr ""
-
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
-#: builtin/push.c:578
-msgid "use IPv6 addresses only"
-msgstr ""
-
-#: builtin/clone.c:154
-msgid "any cloned submodules will use their remote-tracking branch"
-msgstr ""
-
-#: builtin/clone.c:156
-msgid "initialize sparse-checkout file to include only files at root"
-msgstr ""
-
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-
-#: builtin/clone.c:345
-#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
-msgstr ""
-
-#: builtin/clone.c:418
-#, c-format
-msgid "%s exists and is not a directory"
-msgstr ""
-
-#: builtin/clone.c:436
-#, c-format
-msgid "failed to start iterator over '%s'"
-msgstr ""
-
-#: builtin/clone.c:467
-#, c-format
-msgid "failed to create link '%s'"
-msgstr ""
-
-#: builtin/clone.c:471
-#, c-format
-msgid "failed to copy file to '%s'"
-msgstr ""
-
-#: builtin/clone.c:476
-#, c-format
-msgid "failed to iterate over '%s'"
-msgstr ""
-
-#: builtin/clone.c:503
-#, c-format
-msgid "done.\n"
-msgstr ""
-
-#: builtin/clone.c:517
-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:594
-#, c-format
-msgid "Could not find remote branch %s to clone."
-msgstr ""
-
-#: builtin/clone.c:713
-#, c-format
-msgid "unable to update %s"
-msgstr ""
-
-#: builtin/clone.c:761
-msgid "failed to initialize sparse-checkout"
-msgstr ""
-
-#: builtin/clone.c:784
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr ""
-
-#: builtin/clone.c:816
-msgid "unable to checkout working tree"
-msgstr ""
-
-#: builtin/clone.c:894
-msgid "unable to write parameters to config file"
-msgstr ""
-
-#: builtin/clone.c:957
-msgid "cannot repack to clean up"
-msgstr ""
-
-#: builtin/clone.c:959
-msgid "cannot unlink temporary alternates file"
-msgstr ""
-
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
-msgid "Too many arguments."
-msgstr ""
-
-#: builtin/clone.c:1005
-msgid "You must specify a repository to clone."
-msgstr ""
-
-#: builtin/clone.c:1018
-#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr ""
-
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr ""
-
-#: builtin/clone.c:1035
-#, c-format
-msgid "repository '%s' does not exist"
-msgstr ""
-
-#: builtin/clone.c:1039 builtin/fetch.c:2014
-#, c-format
-msgid "depth %s is not a positive number"
-msgstr ""
-
-#: builtin/clone.c:1049
-#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
-msgstr ""
-
-#: builtin/clone.c:1055
-#, c-format
-msgid "repository path '%s' already exists and is not an empty directory."
-msgstr ""
-
-#: builtin/clone.c:1069
-#, c-format
-msgid "working tree '%s' already exists."
-msgstr ""
-
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
-#, c-format
-msgid "could not create leading directories of '%s'"
-msgstr ""
-
-#: builtin/clone.c:1089
-#, c-format
-msgid "could not create work tree dir '%s'"
-msgstr ""
-
-#: builtin/clone.c:1109
-#, c-format
-msgid "Cloning into bare repository '%s'...\n"
-msgstr ""
-
-#: builtin/clone.c:1111
-#, c-format
-msgid "Cloning into '%s'...\n"
-msgstr ""
-
-#: builtin/clone.c:1135
-msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
-msgstr ""
-
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr ""
-
-#: builtin/clone.c:1229
-msgid "--depth is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:1231
-msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:1233
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:1235
-msgid "--filter is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:1240
-msgid "source repository is shallow, ignoring --local"
-msgstr ""
-
-#: builtin/clone.c:1245
-msgid "--local is ignored"
-msgstr ""
-
-#: builtin/clone.c:1324 builtin/clone.c:1383
-msgid "remote transport reported error"
-msgstr ""
-
-#: builtin/clone.c:1336 builtin/clone.c:1344
-#, c-format
-msgid "Remote branch %s not found in upstream %s"
-msgstr ""
-
-#: builtin/clone.c:1347
-msgid "You appear to have cloned an empty repository."
-msgstr ""
-
-#: builtin/column.c:10
-msgid "git column [<options>]"
-msgstr ""
-
-#: builtin/column.c:27
-msgid "lookup config vars"
-msgstr ""
-
-#: builtin/column.c:28 builtin/column.c:29
-msgid "layout to use"
-msgstr ""
-
-#: builtin/column.c:30
-msgid "maximum width"
-msgstr ""
-
-#: builtin/column.c:31
-msgid "padding space on left border"
-msgstr ""
-
-#: builtin/column.c:32
-msgid "padding space on right border"
-msgstr ""
-
-#: builtin/column.c:33
-msgid "padding space between columns"
-msgstr ""
-
-#: builtin/column.c:51
-msgid "--command must be the first argument"
-msgstr ""
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--"
-"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
-"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
-msgstr ""
-
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr ""
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
-msgid "dir"
-msgstr ""
-
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
-msgid "the object directory to store the graph"
-msgstr ""
-
-#: builtin/commit-graph.c:83
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr ""
-
-#: builtin/commit-graph.c:106
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr ""
-
-#: builtin/commit-graph.c:142
-#, c-format
-msgid "unrecognized --split argument, %s"
-msgstr ""
-
-#: builtin/commit-graph.c:155
-#, c-format
-msgid "unexpected non-hex object ID: %s"
-msgstr ""
-
-#: builtin/commit-graph.c:160
-#, c-format
-msgid "invalid object: %s"
-msgstr ""
-
-#: builtin/commit-graph.c:213
-msgid "start walk at all refs"
-msgstr ""
-
-#: builtin/commit-graph.c:215
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
-
-#: builtin/commit-graph.c:217
-msgid "start walk at commits listed by stdin"
-msgstr ""
-
-#: builtin/commit-graph.c:219
-msgid "include all commits already in the commit-graph file"
-msgstr ""
-
-#: builtin/commit-graph.c:221
-msgid "enable computation for changed paths"
-msgstr ""
-
-#: builtin/commit-graph.c:224
-msgid "allow writing an incremental commit-graph file"
-msgstr ""
-
-#: builtin/commit-graph.c:228
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr ""
-
-#: builtin/commit-graph.c:230
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr ""
-
-#: builtin/commit-graph.c:232
-msgid "only expire files older than a given date-time"
-msgstr ""
-
-#: builtin/commit-graph.c:234
-msgid "maximum number of changed-path Bloom filters to compute"
-msgstr ""
-
-#: builtin/commit-graph.c:255
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr ""
-
-#: builtin/commit-graph.c:287
-msgid "Collecting commits from input"
-msgstr ""
-
-#: builtin/commit-tree.c:18
-msgid ""
-"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
-"<file>)...] <tree>"
-msgstr ""
-
-#: builtin/commit-tree.c:31
-#, c-format
-msgid "duplicate parent %s ignored"
-msgstr ""
-
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
-#, c-format
-msgid "not a valid object name %s"
-msgstr ""
-
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr ""
-
-#: builtin/commit-tree.c:96
-#, c-format
-msgid "git commit-tree: failed to read '%s'"
-msgstr ""
-
-#: builtin/commit-tree.c:98
-#, c-format
-msgid "git commit-tree: failed to close '%s'"
-msgstr ""
-
-#: builtin/commit-tree.c:111
-msgid "parent"
-msgstr ""
-
-#: builtin/commit-tree.c:112
-msgid "id of a parent commit object"
-msgstr ""
-
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
-msgid "message"
-msgstr ""
-
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
-msgid "commit message"
-msgstr ""
-
-#: builtin/commit-tree.c:118
-msgid "read commit log message from file"
-msgstr ""
-
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
-msgid "GPG sign commit"
-msgstr ""
-
-#: builtin/commit-tree.c:133
-msgid "must give exactly one tree"
-msgstr ""
-
-#: builtin/commit-tree.c:140
-msgid "git commit-tree: failed to read"
-msgstr ""
-
-#: builtin/commit.c:41
-msgid "git commit [<options>] [--] <pathspec>..."
-msgstr ""
-
-#: builtin/commit.c:46
-msgid "git status [<options>] [--] <pathspec>..."
-msgstr ""
-
-#: builtin/commit.c:51
-msgid ""
-"You asked to amend the most recent commit, but doing so would make\n"
-"it empty. You can repeat your command with --allow-empty, or you can\n"
-"remove the commit entirely with \"git reset HEAD^\".\n"
-msgstr ""
-
-#: builtin/commit.c:56
-msgid ""
-"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
-"If you wish to commit it anyway, use:\n"
-"\n"
-" git commit --allow-empty\n"
-"\n"
-msgstr ""
-
-#: builtin/commit.c:63
-msgid "Otherwise, please use 'git rebase --skip'\n"
-msgstr ""
-
-#: builtin/commit.c:66
-msgid "Otherwise, please use 'git cherry-pick --skip'\n"
-msgstr ""
-
-#: builtin/commit.c:69
-msgid ""
-"and then use:\n"
-"\n"
-" git cherry-pick --continue\n"
-"\n"
-"to resume cherry-picking the remaining commits.\n"
-"If you wish to skip this commit, use:\n"
-"\n"
-" git cherry-pick --skip\n"
-"\n"
-msgstr ""
-
-#: builtin/commit.c:324
-msgid "failed to unpack HEAD tree object"
-msgstr ""
-
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr ""
-
-#: builtin/commit.c:374
-msgid "No paths with --include/--only does not make sense."
-msgstr ""
-
-#: builtin/commit.c:386
-msgid "unable to create temporary index"
-msgstr ""
-
-#: builtin/commit.c:395
-msgid "interactive add failed"
-msgstr ""
-
-#: builtin/commit.c:410
-msgid "unable to update temporary index"
-msgstr ""
-
-#: builtin/commit.c:412
-msgid "Failed to update main cache tree"
-msgstr ""
-
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
-msgid "unable to write new_index file"
-msgstr ""
-
-#: builtin/commit.c:489
-msgid "cannot do a partial commit during a merge."
-msgstr ""
-
-#: builtin/commit.c:491
-msgid "cannot do a partial commit during a cherry-pick."
-msgstr ""
-
-#: builtin/commit.c:493
-msgid "cannot do a partial commit during a rebase."
-msgstr ""
-
-#: builtin/commit.c:501
-msgid "cannot read the index"
-msgstr ""
-
-#: builtin/commit.c:520
-msgid "unable to write temporary index file"
-msgstr ""
-
-#: builtin/commit.c:618
-#, c-format
-msgid "commit '%s' lacks author header"
-msgstr ""
-
-#: builtin/commit.c:620
-#, c-format
-msgid "commit '%s' has malformed author line"
-msgstr ""
-
-#: builtin/commit.c:639
-msgid "malformed --author parameter"
-msgstr ""
-
-#: builtin/commit.c:692
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
-msgstr ""
-
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
-#, c-format
-msgid "could not lookup commit %s"
-msgstr ""
-
-#: builtin/commit.c:758 builtin/shortlog.c:413
-#, c-format
-msgid "(reading log message from standard input)\n"
-msgstr ""
-
-#: builtin/commit.c:760
-msgid "could not read log from standard input"
-msgstr ""
-
-#: builtin/commit.c:764
-#, c-format
-msgid "could not read log file '%s'"
-msgstr ""
-
-#: builtin/commit.c:801
-#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr ""
-
-#: builtin/commit.c:813 builtin/commit.c:829
-msgid "could not read SQUASH_MSG"
-msgstr ""
-
-#: builtin/commit.c:820
-msgid "could not read MERGE_MSG"
-msgstr ""
-
-#: builtin/commit.c:880
-msgid "could not write commit template"
-msgstr ""
-
-#: builtin/commit.c:893
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored.\n"
-msgstr ""
-
-#: builtin/commit.c:895
-#, 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:899
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-msgstr ""
-
-#: builtin/commit.c:903
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-
-#: builtin/commit.c:915
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please run\n"
-"\tgit update-ref -d MERGE_HEAD\n"
-"and try again.\n"
-msgstr ""
-
-#: builtin/commit.c:920
-msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please run\n"
-"\tgit update-ref -d CHERRY_PICK_HEAD\n"
-"and try again.\n"
-msgstr ""
-
-#: builtin/commit.c:947
-#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
-msgstr ""
-
-#: builtin/commit.c:955
-#, c-format
-msgid "%sDate: %s"
-msgstr ""
-
-#: builtin/commit.c:962
-#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
-msgstr ""
-
-#: builtin/commit.c:980
-msgid "Cannot read index"
-msgstr ""
-
-#: builtin/commit.c:1025
-msgid "unable to pass trailers to --trailers"
-msgstr ""
-
-#: builtin/commit.c:1065
-msgid "Error building trees"
-msgstr ""
-
-#: builtin/commit.c:1079 builtin/tag.c:319
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
-msgstr ""
-
-#: builtin/commit.c:1123
-#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr ""
-
-#: builtin/commit.c:1137
-#, c-format
-msgid "Invalid ignored mode '%s'"
-msgstr ""
-
-#: builtin/commit.c:1155 builtin/commit.c:1448
-#, c-format
-msgid "Invalid untracked files mode '%s'"
-msgstr ""
-
-#: builtin/commit.c:1195
-msgid "--long and -z are incompatible"
-msgstr ""
-
-#: builtin/commit.c:1226
-msgid "You are in the middle of a merge -- cannot reword."
-msgstr ""
-
-#: builtin/commit.c:1228
-msgid "You are in the middle of a cherry-pick -- cannot reword."
-msgstr ""
-
-#: builtin/commit.c:1231
-#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr ""
-
-#: builtin/commit.c:1233
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-
-#: builtin/commit.c:1252
-msgid "Using both --reset-author and --author does not make sense"
-msgstr ""
-
-#: builtin/commit.c:1261
-msgid "You have nothing to amend."
-msgstr ""
-
-#: builtin/commit.c:1264
-msgid "You are in the middle of a merge -- cannot amend."
-msgstr ""
-
-#: builtin/commit.c:1266
-msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr ""
-
-#: builtin/commit.c:1268
-msgid "You are in the middle of a rebase -- cannot amend."
-msgstr ""
-
-#: builtin/commit.c:1271
-msgid "Options --squash and --fixup cannot be used together"
-msgstr ""
-
-#: builtin/commit.c:1281
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr ""
-
-#: builtin/commit.c:1283
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr ""
-
-#: builtin/commit.c:1292
-msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr ""
-
-#: builtin/commit.c:1310
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr ""
-
-#: builtin/commit.c:1338
-#, c-format
-msgid "unknown option: --fixup=%s:%s"
-msgstr ""
-
-#: builtin/commit.c:1352
-#, c-format
-msgid "paths '%s ...' with -a does not make sense"
-msgstr ""
-
-#: builtin/commit.c:1483 builtin/commit.c:1652
-msgid "show status concisely"
-msgstr ""
-
-#: builtin/commit.c:1485 builtin/commit.c:1654
-msgid "show branch information"
-msgstr ""
-
-#: builtin/commit.c:1487
-msgid "show stash information"
-msgstr ""
-
-#: builtin/commit.c:1489 builtin/commit.c:1656
-msgid "compute full ahead/behind values"
-msgstr ""
-
-#: builtin/commit.c:1491
-msgid "version"
-msgstr ""
-
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
-msgid "machine-readable output"
-msgstr ""
-
-#: builtin/commit.c:1494 builtin/commit.c:1660
-msgid "show status in long format (default)"
-msgstr ""
-
-#: builtin/commit.c:1497 builtin/commit.c:1663
-msgid "terminate entries with NUL"
-msgstr ""
-
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
-msgid "mode"
-msgstr ""
-
-#: builtin/commit.c:1500 builtin/commit.c:1666
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
-msgstr ""
-
-#: builtin/commit.c:1504
-msgid ""
-"show ignored files, optional modes: traditional, matching, no. (Default: "
-"traditional)"
-msgstr ""
-
-#: builtin/commit.c:1506 parse-options.h:193
-msgid "when"
-msgstr ""
-
-#: builtin/commit.c:1507
-msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
-msgstr ""
-
-#: builtin/commit.c:1509
-msgid "list untracked files in columns"
-msgstr ""
-
-#: builtin/commit.c:1510
-msgid "do not detect renames"
-msgstr ""
-
-#: builtin/commit.c:1512
-msgid "detect renames, optionally set similarity index"
-msgstr ""
-
-#: builtin/commit.c:1535
-msgid "Unsupported combination of ignored and untracked-files arguments"
-msgstr ""
-
-#: builtin/commit.c:1617
-msgid "suppress summary after successful commit"
-msgstr ""
-
-#: builtin/commit.c:1618
-msgid "show diff in commit message template"
-msgstr ""
-
-#: builtin/commit.c:1620
-msgid "Commit message options"
-msgstr ""
-
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
-msgid "read message from file"
-msgstr ""
-
-#: builtin/commit.c:1622
-msgid "author"
-msgstr ""
-
-#: builtin/commit.c:1622
-msgid "override author for commit"
-msgstr ""
-
-#: builtin/commit.c:1623 builtin/gc.c:550
-msgid "date"
-msgstr ""
-
-#: builtin/commit.c:1623
-msgid "override date for commit"
-msgstr ""
-
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
-msgid "commit"
-msgstr ""
-
-#: builtin/commit.c:1625
-msgid "reuse and edit message from specified commit"
-msgstr ""
-
-#: builtin/commit.c:1626
-msgid "reuse message from specified commit"
-msgstr ""
-
-#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
-#. and only translate <commit>.
-#.
-#: builtin/commit.c:1631
-msgid "[(amend|reword):]commit"
-msgstr ""
-
-#: builtin/commit.c:1631
-msgid ""
-"use autosquash formatted message to fixup or amend/reword specified commit"
-msgstr ""
-
-#: builtin/commit.c:1632
-msgid "use autosquash formatted message to squash specified commit"
-msgstr ""
-
-#: builtin/commit.c:1633
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
-msgstr ""
-
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr ""
-
-#: builtin/commit.c:1634
-msgid "add custom trailer(s)"
-msgstr ""
-
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
-msgid "add a Signed-off-by trailer"
-msgstr ""
-
-#: builtin/commit.c:1636
-msgid "use specified template file"
-msgstr ""
-
-#: builtin/commit.c:1637
-msgid "force edit of commit"
-msgstr ""
-
-#: builtin/commit.c:1639
-msgid "include status in commit message template"
-msgstr ""
-
-#: builtin/commit.c:1644
-msgid "Commit contents options"
-msgstr ""
-
-#: builtin/commit.c:1645
-msgid "commit all changed files"
-msgstr ""
-
-#: builtin/commit.c:1646
-msgid "add specified files to index for commit"
-msgstr ""
-
-#: builtin/commit.c:1647
-msgid "interactively add files"
-msgstr ""
-
-#: builtin/commit.c:1648
-msgid "interactively add changes"
-msgstr ""
-
-#: builtin/commit.c:1649
-msgid "commit only specified files"
-msgstr ""
-
-#: builtin/commit.c:1650
-msgid "bypass pre-commit and commit-msg hooks"
-msgstr ""
-
-#: builtin/commit.c:1651
-msgid "show what would be committed"
-msgstr ""
-
-#: builtin/commit.c:1664
-msgid "amend previous commit"
-msgstr ""
-
-#: builtin/commit.c:1665
-msgid "bypass post-rewrite hook"
-msgstr ""
-
-#: builtin/commit.c:1672
-msgid "ok to record an empty change"
-msgstr ""
-
-#: builtin/commit.c:1674
-msgid "ok to record a change with an empty message"
-msgstr ""
-
-#: builtin/commit.c:1750
-#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
-msgstr ""
-
-#: builtin/commit.c:1757
-msgid "could not read MERGE_MODE"
-msgstr ""
-
-#: builtin/commit.c:1778
-#, c-format
-msgid "could not read commit message: %s"
-msgstr ""
-
-#: builtin/commit.c:1785
-#, c-format
-msgid "Aborting commit due to empty commit message.\n"
-msgstr ""
-
-#: builtin/commit.c:1790
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr ""
-
-#: builtin/commit.c:1801
-#, c-format
-msgid "Aborting commit due to empty commit message body.\n"
-msgstr ""
-
-#: builtin/commit.c:1837
-msgid ""
-"repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full and quota is\n"
-"not exceeded, and then \"git restore --staged :/\" to recover."
-msgstr ""
-
-#: builtin/config.c:11
-msgid "git config [<options>]"
-msgstr ""
-
-#: builtin/config.c:109 builtin/env--helper.c:27
-#, c-format
-msgid "unrecognized --type argument, %s"
-msgstr ""
-
-#: builtin/config.c:121
-msgid "only one type at a time"
-msgstr ""
-
-#: builtin/config.c:130
-msgid "Config file location"
-msgstr ""
-
-#: builtin/config.c:131
-msgid "use global config file"
-msgstr ""
-
-#: builtin/config.c:132
-msgid "use system config file"
-msgstr ""
-
-#: builtin/config.c:133
-msgid "use repository config file"
-msgstr ""
-
-#: builtin/config.c:134
-msgid "use per-worktree config file"
-msgstr ""
-
-#: builtin/config.c:135
-msgid "use given config file"
-msgstr ""
-
-#: builtin/config.c:136
-msgid "blob-id"
-msgstr ""
-
-#: builtin/config.c:136
-msgid "read config from given blob object"
-msgstr ""
-
-#: builtin/config.c:137
-msgid "Action"
-msgstr ""
-
-#: builtin/config.c:138
-msgid "get value: name [value-pattern]"
-msgstr ""
-
-#: builtin/config.c:139
-msgid "get all values: key [value-pattern]"
-msgstr ""
-
-#: builtin/config.c:140
-msgid "get values for regexp: name-regex [value-pattern]"
-msgstr ""
-
-#: builtin/config.c:141
-msgid "get value specific for the URL: section[.var] URL"
-msgstr ""
-
-#: builtin/config.c:142
-msgid "replace all matching variables: name value [value-pattern]"
-msgstr ""
-
-#: builtin/config.c:143
-msgid "add a new variable: name value"
-msgstr ""
-
-#: builtin/config.c:144
-msgid "remove a variable: name [value-pattern]"
-msgstr ""
-
-#: builtin/config.c:145
-msgid "remove all matches: name [value-pattern]"
-msgstr ""
-
-#: builtin/config.c:146
-msgid "rename section: old-name new-name"
-msgstr ""
-
-#: builtin/config.c:147
-msgid "remove a section: name"
-msgstr ""
-
-#: builtin/config.c:148
-msgid "list all"
-msgstr ""
-
-#: builtin/config.c:149
-msgid "use string equality when comparing values to 'value-pattern'"
-msgstr ""
-
-#: builtin/config.c:150
-msgid "open an editor"
-msgstr ""
-
-#: builtin/config.c:151
-msgid "find the color configured: slot [default]"
-msgstr ""
-
-#: builtin/config.c:152
-msgid "find the color setting: slot [stdout-is-tty]"
-msgstr ""
-
-#: builtin/config.c:153
-msgid "Type"
-msgstr ""
-
-#: builtin/config.c:154 builtin/env--helper.c:43
-msgid "value is given this type"
-msgstr ""
-
-#: builtin/config.c:155
-msgid "value is \"true\" or \"false\""
-msgstr ""
-
-#: builtin/config.c:156
-msgid "value is decimal number"
-msgstr ""
-
-#: builtin/config.c:157
-msgid "value is --bool or --int"
-msgstr ""
-
-#: builtin/config.c:158
-msgid "value is --bool or string"
-msgstr ""
-
-#: builtin/config.c:159
-msgid "value is a path (file or directory name)"
-msgstr ""
-
-#: builtin/config.c:160
-msgid "value is an expiry date"
-msgstr ""
-
-#: builtin/config.c:161
-msgid "Other"
-msgstr ""
-
-#: builtin/config.c:162
-msgid "terminate values with NUL byte"
-msgstr ""
-
-#: builtin/config.c:163
-msgid "show variable names only"
-msgstr ""
-
-#: builtin/config.c:164
-msgid "respect include directives on lookup"
-msgstr ""
-
-#: builtin/config.c:165
-msgid "show origin of config (file, standard input, blob, command line)"
-msgstr ""
-
-#: builtin/config.c:166
-msgid "show scope of config (worktree, local, global, system, command)"
-msgstr ""
-
-#: builtin/config.c:167 builtin/env--helper.c:45
-msgid "value"
-msgstr ""
-
-#: builtin/config.c:167
-msgid "with --get, use default value when missing entry"
-msgstr ""
-
-#: builtin/config.c:181
-#, c-format
-msgid "wrong number of arguments, should be %d"
-msgstr ""
-
-#: builtin/config.c:183
-#, c-format
-msgid "wrong number of arguments, should be from %d to %d"
-msgstr ""
-
-#: builtin/config.c:339
-#, c-format
-msgid "invalid key pattern: %s"
-msgstr ""
-
-#: builtin/config.c:377
-#, c-format
-msgid "failed to format default config value: %s"
-msgstr ""
-
-#: builtin/config.c:441
-#, c-format
-msgid "cannot parse color '%s'"
-msgstr ""
-
-#: builtin/config.c:483
-msgid "unable to parse default color value"
-msgstr ""
-
-#: builtin/config.c:536 builtin/config.c:833
-msgid "not in a git directory"
-msgstr ""
-
-#: builtin/config.c:539
-msgid "writing to stdin is not supported"
-msgstr ""
-
-#: builtin/config.c:542
-msgid "writing config blobs is not supported"
-msgstr ""
-
-#: builtin/config.c:627
-#, c-format
-msgid ""
-"# This is Git's per-user configuration file.\n"
-"[user]\n"
-"# Please adapt and uncomment the following lines:\n"
-"#\tname = %s\n"
-"#\temail = %s\n"
-msgstr ""
-
-#: builtin/config.c:652
-msgid "only one config file at a time"
-msgstr ""
-
-#: builtin/config.c:658
-msgid "--local can only be used inside a git repository"
-msgstr ""
-
-#: builtin/config.c:660
-msgid "--blob can only be used inside a git repository"
-msgstr ""
-
-#: builtin/config.c:662
-msgid "--worktree can only be used inside a git repository"
-msgstr ""
-
-#: builtin/config.c:684
-msgid "$HOME not set"
-msgstr ""
-
-#: builtin/config.c:708
-msgid ""
-"--worktree cannot be used with multiple working trees unless the config\n"
-"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
-"section in \"git help worktree\" for details"
-msgstr ""
-
-#: builtin/config.c:743
-msgid "--get-color and variable type are incoherent"
-msgstr ""
-
-#: builtin/config.c:748
-msgid "only one action at a time"
-msgstr ""
-
-#: builtin/config.c:761
-msgid "--name-only is only applicable to --list or --get-regexp"
-msgstr ""
-
-#: builtin/config.c:767
-msgid ""
-"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
-"list"
-msgstr ""
-
-#: builtin/config.c:773
-msgid "--default is only applicable to --get"
-msgstr ""
-
-#: builtin/config.c:806
-msgid "--fixed-value only applies with 'value-pattern'"
-msgstr ""
-
-#: builtin/config.c:822
-#, c-format
-msgid "unable to read config file '%s'"
-msgstr ""
-
-#: builtin/config.c:825
-msgid "error processing config file(s)"
-msgstr ""
-
-#: builtin/config.c:835
-msgid "editing stdin is not supported"
-msgstr ""
-
-#: builtin/config.c:837
-msgid "editing blobs is not supported"
-msgstr ""
-
-#: builtin/config.c:851
-#, c-format
-msgid "cannot create configuration file %s"
-msgstr ""
-
-#: builtin/config.c:864
-#, c-format
-msgid ""
-"cannot overwrite multiple values with a single value\n"
-" Use a regexp, --add or --replace-all to change %s."
-msgstr ""
-
-#: builtin/config.c:943 builtin/config.c:954
-#, c-format
-msgid "no such section: %s"
-msgstr ""
-
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr ""
-
-#: builtin/count-objects.c:100
-msgid "print sizes in human readable format"
-msgstr ""
-
-#: builtin/credential-cache--daemon.c:227
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-
-#: builtin/credential-cache--daemon.c:276
-msgid "print debugging messages to stderr"
-msgstr ""
-
-#: builtin/credential-cache--daemon.c:316
-msgid "credential-cache--daemon unavailable; no unix socket support"
-msgstr ""
-
-#: builtin/credential-cache.c:154
-msgid "credential-cache unavailable; no unix socket support"
-msgstr ""
-
-#: builtin/credential-store.c:66
-#, c-format
-msgid "unable to get credential storage lock in %d ms"
-msgstr ""
-
-#: builtin/describe.c:26
-msgid "git describe [<options>] [<commit-ish>...]"
-msgstr ""
-
-#: builtin/describe.c:27
-msgid "git describe [<options>] --dirty"
-msgstr ""
-
-#: builtin/describe.c:63
-msgid "head"
-msgstr ""
-
-#: builtin/describe.c:63
-msgid "lightweight"
-msgstr ""
-
-#: builtin/describe.c:63
-msgid "annotated"
-msgstr ""
-
-#: builtin/describe.c:277
-#, c-format
-msgid "annotated tag %s not available"
-msgstr ""
-
-#: builtin/describe.c:281
-#, c-format
-msgid "tag '%s' is externally known as '%s'"
-msgstr ""
-
-#: builtin/describe.c:328
-#, c-format
-msgid "no tag exactly matches '%s'"
-msgstr ""
-
-#: builtin/describe.c:330
-#, c-format
-msgid "No exact match on refs or tags, searching to describe\n"
-msgstr ""
-
-#: builtin/describe.c:397
-#, c-format
-msgid "finished search at %s\n"
-msgstr ""
-
-#: builtin/describe.c:424
-#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
-msgstr ""
-
-#: builtin/describe.c:428
-#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
-msgstr ""
-
-#: builtin/describe.c:458
-#, c-format
-msgid "traversed %lu commits\n"
-msgstr ""
-
-#: builtin/describe.c:461
-#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
-msgstr ""
-
-#: builtin/describe.c:529
-#, c-format
-msgid "describe %s\n"
-msgstr ""
-
-#: builtin/describe.c:532
-#, c-format
-msgid "Not a valid object name %s"
-msgstr ""
-
-#: builtin/describe.c:540
-#, c-format
-msgid "%s is neither a commit nor blob"
-msgstr ""
-
-#: builtin/describe.c:554
-msgid "find the tag that comes after the commit"
-msgstr ""
-
-#: builtin/describe.c:555
-msgid "debug search strategy on stderr"
-msgstr ""
-
-#: builtin/describe.c:556
-msgid "use any ref"
-msgstr ""
-
-#: builtin/describe.c:557
-msgid "use any tag, even unannotated"
-msgstr ""
-
-#: builtin/describe.c:558
-msgid "always use long format"
-msgstr ""
-
-#: builtin/describe.c:559
-msgid "only follow first parent"
-msgstr ""
-
-#: builtin/describe.c:562
-msgid "only output exact matches"
-msgstr ""
-
-#: builtin/describe.c:564
-msgid "consider <n> most recent tags (default: 10)"
-msgstr ""
-
-#: builtin/describe.c:566
-msgid "only consider tags matching <pattern>"
-msgstr ""
-
-#: builtin/describe.c:568
-msgid "do not consider tags matching <pattern>"
-msgstr ""
-
-#: builtin/describe.c:570 builtin/name-rev.c:535
-msgid "show abbreviated commit object as fallback"
-msgstr ""
-
-#: builtin/describe.c:571 builtin/describe.c:574
-msgid "mark"
-msgstr ""
-
-#: builtin/describe.c:572
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr ""
-
-#: builtin/describe.c:575
-msgid "append <mark> on broken working tree (default: \"-broken\")"
-msgstr ""
-
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr ""
-
-#: builtin/describe.c:622
-msgid "No names found, cannot describe anything."
-msgstr ""
-
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr ""
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr ""
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr ""
-
-#: builtin/diff-tree.c:157
-msgid "--merge-base only works with two commits"
-msgstr ""
-
-#: builtin/diff.c:92
-#, c-format
-msgid "'%s': not a regular file or symlink"
-msgstr ""
-
-#: builtin/diff.c:259
-#, c-format
-msgid "invalid option: %s"
-msgstr ""
-
-#: builtin/diff.c:376
-#, c-format
-msgid "%s...%s: no merge base"
-msgstr ""
-
-#: builtin/diff.c:486
-msgid "Not a git repository"
-msgstr ""
-
-#: builtin/diff.c:532 builtin/grep.c:684
-#, c-format
-msgid "invalid object '%s' given."
-msgstr ""
-
-#: builtin/diff.c:543
-#, c-format
-msgid "more than two blobs given: '%s'"
-msgstr ""
-
-#: builtin/diff.c:548
-#, c-format
-msgid "unhandled object '%s' given."
-msgstr ""
-
-#: builtin/diff.c:582
-#, c-format
-msgid "%s...%s: multiple merge bases, using %s"
-msgstr ""
-
-#: builtin/difftool.c:31
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
-msgstr ""
-
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr ""
-
-#: builtin/difftool.c:303
-#, c-format
-msgid "could not read symlink %s"
-msgstr ""
-
-#: builtin/difftool.c:305
-#, c-format
-msgid "could not read symlink file %s"
-msgstr ""
-
-#: builtin/difftool.c:313
-#, c-format
-msgid "could not read object %s for symlink %s"
-msgstr ""
-
-#: builtin/difftool.c:413
-msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
-msgstr ""
-
-#: builtin/difftool.c:637
-#, c-format
-msgid "both files modified: '%s' and '%s'."
-msgstr ""
-
-#: builtin/difftool.c:639
-msgid "working tree file has been left."
-msgstr ""
-
-#: builtin/difftool.c:650
-#, c-format
-msgid "temporary files exist in '%s'."
-msgstr ""
-
-#: builtin/difftool.c:651
-msgid "you may want to cleanup or recover these."
-msgstr ""
-
-#: builtin/difftool.c:699
-msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr ""
-
-#: builtin/difftool.c:701
-msgid "perform a full-directory diff"
-msgstr ""
-
-#: builtin/difftool.c:703
-msgid "do not prompt before launching a diff tool"
-msgstr ""
-
-#: builtin/difftool.c:708
-msgid "use symlinks in dir-diff mode"
-msgstr ""
-
-#: builtin/difftool.c:709
-msgid "tool"
-msgstr ""
-
-#: builtin/difftool.c:710
-msgid "use the specified diff tool"
-msgstr ""
-
-#: builtin/difftool.c:712
-msgid "print a list of diff tools that may be used with `--tool`"
-msgstr ""
-
-#: builtin/difftool.c:715
-msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
-msgstr ""
-
-#: builtin/difftool.c:718
-msgid "specify a custom command for viewing diffs"
-msgstr ""
-
-#: builtin/difftool.c:719
-msgid "passed to `diff`"
-msgstr ""
-
-#: builtin/difftool.c:734
-msgid "difftool requires worktree or --no-index"
-msgstr ""
-
-#: builtin/difftool.c:741
-msgid "--dir-diff is incompatible with --no-index"
-msgstr ""
-
-#: builtin/difftool.c:744
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr ""
-
-#: builtin/difftool.c:752
-msgid "no <tool> given for --tool=<tool>"
-msgstr ""
-
-#: builtin/difftool.c:759
-msgid "no <cmd> given for --extcmd=<cmd>"
-msgstr ""
-
-#: builtin/env--helper.c:6
-msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
-msgstr ""
-
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
-msgid "type"
-msgstr ""
-
-#: builtin/env--helper.c:46
-msgid "default for git_env_*(...) to fall back on"
-msgstr ""
-
-#: builtin/env--helper.c:48
-msgid "be quiet only use git_env_*() value as exit code"
-msgstr ""
-
-#: builtin/env--helper.c:67
-#, c-format
-msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
-msgstr ""
-
-#: builtin/env--helper.c:82
-#, c-format
-msgid ""
-"option `--default' expects an unsigned long value with `--type=ulong`, not `"
-"%s`"
-msgstr ""
-
-#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr ""
-
-#: builtin/fast-export.c:868
-msgid "Error: Cannot export nested tags unless --mark-tags is specified."
-msgstr ""
-
-#: builtin/fast-export.c:1177
-msgid "--anonymize-map token cannot be empty"
-msgstr ""
-
-#: builtin/fast-export.c:1197
-msgid "show progress after <n> objects"
-msgstr ""
-
-#: builtin/fast-export.c:1199
-msgid "select handling of signed tags"
-msgstr ""
-
-#: builtin/fast-export.c:1202
-msgid "select handling of tags that tag filtered objects"
-msgstr ""
-
-#: builtin/fast-export.c:1205
-msgid "select handling of commit messages in an alternate encoding"
-msgstr ""
-
-#: builtin/fast-export.c:1208
-msgid "dump marks to this file"
-msgstr ""
-
-#: builtin/fast-export.c:1210
-msgid "import marks from this file"
-msgstr ""
-
-#: builtin/fast-export.c:1214
-msgid "import marks from this file if it exists"
-msgstr ""
-
-#: builtin/fast-export.c:1216
-msgid "fake a tagger when tags lack one"
-msgstr ""
-
-#: builtin/fast-export.c:1218
-msgid "output full tree for each commit"
-msgstr ""
-
-#: builtin/fast-export.c:1220
-msgid "use the done feature to terminate the stream"
-msgstr ""
-
-#: builtin/fast-export.c:1221
-msgid "skip output of blob data"
-msgstr ""
-
-#: builtin/fast-export.c:1222 builtin/log.c:1826
-msgid "refspec"
-msgstr ""
-
-#: builtin/fast-export.c:1223
-msgid "apply refspec to exported refs"
-msgstr ""
-
-#: builtin/fast-export.c:1224
-msgid "anonymize output"
-msgstr ""
-
-#: builtin/fast-export.c:1225
-msgid "from:to"
-msgstr ""
-
-#: builtin/fast-export.c:1226
-msgid "convert <from> to <to> in anonymized output"
-msgstr ""
-
-#: builtin/fast-export.c:1229
-msgid "reference parents which are not in fast-export stream by object id"
-msgstr ""
-
-#: builtin/fast-export.c:1231
-msgid "show original object ids of blobs/commits"
-msgstr ""
-
-#: builtin/fast-export.c:1233
-msgid "label tags with mark ids"
-msgstr ""
-
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr ""
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-
-#: builtin/fast-import.c:3088
-#, c-format
-msgid "Missing from marks for submodule '%s'"
-msgstr ""
-
-#: builtin/fast-import.c:3090
-#, c-format
-msgid "Missing to marks for submodule '%s'"
-msgstr ""
-
-#: builtin/fast-import.c:3225
-#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr ""
-
-#: builtin/fast-import.c:3230
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr ""
-
-#: builtin/fast-import.c:3322
-msgid "Expected format name:filename for submodule rewrite option"
-msgstr ""
-
-#: builtin/fast-import.c:3377
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr ""
-
-#: builtin/fetch-pack.c:242
-#, c-format
-msgid "Lockfile created but not reported: %s"
-msgstr ""
-
-#: builtin/fetch.c:35
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr ""
-
-#: builtin/fetch.c:36
-msgid "git fetch [<options>] <group>"
-msgstr ""
-
-#: builtin/fetch.c:37
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
-msgstr ""
-
-#: builtin/fetch.c:38
-msgid "git fetch --all [<options>]"
-msgstr ""
-
-#: builtin/fetch.c:122
-msgid "fetch.parallel cannot be negative"
-msgstr ""
-
-#: builtin/fetch.c:145 builtin/pull.c:185
-msgid "fetch from all remotes"
-msgstr ""
-
-#: builtin/fetch.c:147 builtin/pull.c:245
-msgid "set upstream for git pull/fetch"
-msgstr ""
-
-#: builtin/fetch.c:149 builtin/pull.c:188
-msgid "append to .git/FETCH_HEAD instead of overwriting"
-msgstr ""
-
-#: builtin/fetch.c:151
-msgid "use atomic transaction to update references"
-msgstr ""
-
-#: builtin/fetch.c:153 builtin/pull.c:191
-msgid "path to upload pack on remote end"
-msgstr ""
-
-#: builtin/fetch.c:154
-msgid "force overwrite of local reference"
-msgstr ""
-
-#: builtin/fetch.c:156
-msgid "fetch from multiple remotes"
-msgstr ""
-
-#: builtin/fetch.c:158 builtin/pull.c:195
-msgid "fetch all tags and associated objects"
-msgstr ""
-
-#: builtin/fetch.c:160
-msgid "do not fetch all tags (--no-tags)"
-msgstr ""
-
-#: builtin/fetch.c:162
-msgid "number of submodules fetched in parallel"
-msgstr ""
-
-#: builtin/fetch.c:164
-msgid "modify the refspec to place all refs within refs/prefetch/"
-msgstr ""
-
-#: builtin/fetch.c:166 builtin/pull.c:198
-msgid "prune remote-tracking branches no longer on remote"
-msgstr ""
-
-#: builtin/fetch.c:168
-msgid "prune local tags no longer on remote and clobber changed tags"
-msgstr ""
-
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
-msgid "on-demand"
-msgstr ""
-
-#: builtin/fetch.c:170
-msgid "control recursive fetching of submodules"
-msgstr ""
-
-#: builtin/fetch.c:175
-msgid "write fetched references to the FETCH_HEAD file"
-msgstr ""
-
-#: builtin/fetch.c:176 builtin/pull.c:206
-msgid "keep downloaded pack"
-msgstr ""
-
-#: builtin/fetch.c:178
-msgid "allow updating of HEAD ref"
-msgstr ""
-
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
-msgid "deepen history of shallow clone"
-msgstr ""
-
-#: builtin/fetch.c:183 builtin/pull.c:212
-msgid "deepen history of shallow repository based on time"
-msgstr ""
-
-#: builtin/fetch.c:189 builtin/pull.c:221
-msgid "convert to a complete repository"
-msgstr ""
-
-#: builtin/fetch.c:192
-msgid "prepend this to submodule path output"
-msgstr ""
-
-#: builtin/fetch.c:195
-msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
-msgstr ""
-
-#: builtin/fetch.c:199 builtin/pull.c:224
-msgid "accept refs that update .git/shallow"
-msgstr ""
-
-#: builtin/fetch.c:200 builtin/pull.c:226
-msgid "refmap"
-msgstr ""
-
-#: builtin/fetch.c:201 builtin/pull.c:227
-msgid "specify fetch refmap"
-msgstr ""
-
-#: builtin/fetch.c:208 builtin/pull.c:240
-msgid "report that we have only objects reachable from this object"
-msgstr ""
-
-#: builtin/fetch.c:210
-msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
-msgstr ""
-
-#: builtin/fetch.c:213 builtin/fetch.c:215
-msgid "run 'maintenance --auto' after fetching"
-msgstr ""
-
-#: builtin/fetch.c:217 builtin/pull.c:243
-msgid "check for forced-updates on all updated branches"
-msgstr ""
-
-#: builtin/fetch.c:219
-msgid "write the commit-graph after fetching"
-msgstr ""
-
-#: builtin/fetch.c:221
-msgid "accept refspecs from stdin"
-msgstr ""
-
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr ""
-
-#: builtin/fetch.c:757
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr ""
-
-#: builtin/fetch.c:856
-#, c-format
-msgid "object %s not found"
-msgstr ""
-
-#: builtin/fetch.c:860
-msgid "[up to date]"
-msgstr ""
-
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
-msgid "[rejected]"
-msgstr ""
-
-#: builtin/fetch.c:874
-msgid "can't fetch in current branch"
-msgstr ""
-
-#: builtin/fetch.c:884
-msgid "[tag update]"
-msgstr ""
-
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
-msgid "unable to update local ref"
-msgstr ""
-
-#: builtin/fetch.c:889
-msgid "would clobber existing tag"
-msgstr ""
-
-#: builtin/fetch.c:911
-msgid "[new tag]"
-msgstr ""
-
-#: builtin/fetch.c:914
-msgid "[new branch]"
-msgstr ""
-
-#: builtin/fetch.c:917
-msgid "[new ref]"
-msgstr ""
-
-#: builtin/fetch.c:956
-msgid "forced update"
-msgstr ""
-
-#: builtin/fetch.c:961
-msgid "non-fast-forward"
-msgstr ""
-
-#: builtin/fetch.c:1065
-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:1069
-#, c-format
-msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
-"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
-"false'\n"
-" to avoid this check.\n"
-msgstr ""
-
-#: builtin/fetch.c:1101
-#, c-format
-msgid "%s did not send all necessary objects\n"
-msgstr ""
-
-#: builtin/fetch.c:1129
-#, c-format
-msgid "rejected %s because shallow roots are not allowed to be updated"
-msgstr ""
-
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
-#, c-format
-msgid "From %.*s\n"
-msgstr ""
-
-#: builtin/fetch.c:1228
-#, 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:1327
-#, c-format
-msgid " (%s will become dangling)"
-msgstr ""
-
-#: builtin/fetch.c:1328
-#, c-format
-msgid " (%s has become dangling)"
-msgstr ""
-
-#: builtin/fetch.c:1360
-msgid "[deleted]"
-msgstr ""
-
-#: builtin/fetch.c:1361 builtin/remote.c:1118
-msgid "(none)"
-msgstr ""
-
-#: builtin/fetch.c:1384
-#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr ""
-
-#: builtin/fetch.c:1403
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr ""
-
-#: builtin/fetch.c:1406
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr ""
-
-#: builtin/fetch.c:1618
-msgid "multiple branches detected, incompatible with --set-upstream"
-msgstr ""
-
-#: builtin/fetch.c:1633
-msgid "not setting upstream for a remote remote-tracking branch"
-msgstr ""
-
-#: builtin/fetch.c:1635
-msgid "not setting upstream for a remote tag"
-msgstr ""
-
-#: builtin/fetch.c:1637
-msgid "unknown branch type"
-msgstr ""
-
-#: builtin/fetch.c:1639
-msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
-msgstr ""
-
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
-#, c-format
-msgid "Fetching %s\n"
-msgstr ""
-
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
-#, c-format
-msgid "Could not fetch %s"
-msgstr ""
-
-#: builtin/fetch.c:1790
-#, c-format
-msgid "could not fetch '%s' (exit code: %d)\n"
-msgstr ""
-
-#: builtin/fetch.c:1894
-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:1930
-msgid "You need to specify a tag name."
-msgstr ""
-
-#: builtin/fetch.c:1994
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
-msgstr ""
-
-#: builtin/fetch.c:1998
-msgid "Negative depth in --deepen is not supported"
-msgstr ""
-
-#: builtin/fetch.c:2000
-msgid "--deepen and --depth are mutually exclusive"
-msgstr ""
-
-#: builtin/fetch.c:2005
-msgid "--depth and --unshallow cannot be used together"
-msgstr ""
-
-#: builtin/fetch.c:2007
-msgid "--unshallow on a complete repository does not make sense"
-msgstr ""
-
-#: builtin/fetch.c:2024
-msgid "fetch --all does not take a repository argument"
-msgstr ""
-
-#: builtin/fetch.c:2026
-msgid "fetch --all does not make sense with refspecs"
-msgstr ""
-
-#: builtin/fetch.c:2035
-#, c-format
-msgid "No such remote or remote group: %s"
-msgstr ""
-
-#: builtin/fetch.c:2042
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr ""
-
-#: builtin/fetch.c:2058
-msgid "must supply remote when using --negotiate-only"
-msgstr ""
-
-#: builtin/fetch.c:2063
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr ""
-
-#: builtin/fetch.c:2082
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialclone"
-msgstr ""
-
-#: builtin/fetch.c:2086
-msgid "--atomic can only be used when fetching from one remote"
-msgstr ""
-
-#: builtin/fetch.c:2090
-msgid "--stdin can only be used when fetching from one remote"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:7
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:18
-msgid "populate log with at most <n> entries from shortlog"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:21
-msgid "alias for --log (deprecated)"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:24
-msgid "text"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:25
-msgid "use <text> as start of message"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:26
-msgid "file to read from"
-msgstr ""
-
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
-msgstr ""
-
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
-msgstr ""
-
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
-msgstr ""
-
-#: builtin/for-each-ref.c:13
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-msgstr ""
-
-#: builtin/for-each-ref.c:30
-msgid "quote placeholders suitably for shells"
-msgstr ""
-
-#: builtin/for-each-ref.c:32
-msgid "quote placeholders suitably for perl"
-msgstr ""
-
-#: builtin/for-each-ref.c:34
-msgid "quote placeholders suitably for python"
-msgstr ""
-
-#: builtin/for-each-ref.c:36
-msgid "quote placeholders suitably for Tcl"
-msgstr ""
-
-#: builtin/for-each-ref.c:39
-msgid "show only <n> matched refs"
-msgstr ""
-
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
-msgid "respect format colors"
-msgstr ""
-
-#: builtin/for-each-ref.c:44
-msgid "print only refs which points at the given object"
-msgstr ""
-
-#: builtin/for-each-ref.c:46
-msgid "print only refs that are merged"
-msgstr ""
-
-#: builtin/for-each-ref.c:47
-msgid "print only refs that are not merged"
-msgstr ""
-
-#: builtin/for-each-ref.c:48
-msgid "print only refs which contain the commit"
-msgstr ""
-
-#: builtin/for-each-ref.c:49
-msgid "print only refs which don't contain the commit"
-msgstr ""
-
-#: builtin/for-each-repo.c:9
-msgid "git for-each-repo --config=<config> <command-args>"
-msgstr ""
-
-#: builtin/for-each-repo.c:34
-msgid "config"
-msgstr ""
-
-#: builtin/for-each-repo.c:35
-msgid "config key storing a list of repository paths"
-msgstr ""
-
-#: builtin/for-each-repo.c:43
-msgid "missing --config=<config>"
-msgstr ""
-
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
-msgid "unknown"
-msgstr ""
-
-#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:78 builtin/fsck.c:100
-#, c-format
-msgid "error in %s %s: %s"
-msgstr ""
-
-#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:94
-#, c-format
-msgid "warning in %s %s: %s"
-msgstr ""
-
-#: builtin/fsck.c:124 builtin/fsck.c:127
-#, c-format
-msgid "broken link from %7s %s"
-msgstr ""
-
-#: builtin/fsck.c:136
-msgid "wrong object type in link"
-msgstr ""
-
-#: builtin/fsck.c:152
-#, c-format
-msgid ""
-"broken link from %7s %s\n"
-" to %7s %s"
-msgstr ""
-
-#: builtin/fsck.c:264
-#, c-format
-msgid "missing %s %s"
-msgstr ""
-
-#: builtin/fsck.c:291
-#, c-format
-msgid "unreachable %s %s"
-msgstr ""
-
-#: builtin/fsck.c:311
-#, c-format
-msgid "dangling %s %s"
-msgstr ""
-
-#: builtin/fsck.c:321
-msgid "could not create lost-found"
-msgstr ""
-
-#: builtin/fsck.c:332
-#, c-format
-msgid "could not finish '%s'"
-msgstr ""
-
-#: builtin/fsck.c:349
-#, c-format
-msgid "Checking %s"
-msgstr ""
-
-#: builtin/fsck.c:387
-#, c-format
-msgid "Checking connectivity (%d objects)"
-msgstr ""
-
-#: builtin/fsck.c:406
-#, c-format
-msgid "Checking %s %s"
-msgstr ""
-
-#: builtin/fsck.c:411
-msgid "broken links"
-msgstr ""
-
-#: builtin/fsck.c:420
-#, c-format
-msgid "root %s"
-msgstr ""
-
-#: builtin/fsck.c:428
-#, c-format
-msgid "tagged %s %s (%s) in %s"
-msgstr ""
-
-#: builtin/fsck.c:457
-#, c-format
-msgid "%s: object corrupt or missing"
-msgstr ""
-
-#: builtin/fsck.c:482
-#, c-format
-msgid "%s: invalid reflog entry %s"
-msgstr ""
-
-#: builtin/fsck.c:496
-#, c-format
-msgid "Checking reflog %s->%s"
-msgstr ""
-
-#: builtin/fsck.c:530
-#, c-format
-msgid "%s: invalid sha1 pointer %s"
-msgstr ""
-
-#: builtin/fsck.c:537
-#, c-format
-msgid "%s: not a commit"
-msgstr ""
-
-#: builtin/fsck.c:591
-msgid "notice: No default references"
-msgstr ""
-
-#: builtin/fsck.c:606
-#, c-format
-msgid "%s: object corrupt or missing: %s"
-msgstr ""
-
-#: builtin/fsck.c:619
-#, c-format
-msgid "%s: object could not be parsed: %s"
-msgstr ""
-
-#: builtin/fsck.c:639
-#, c-format
-msgid "bad sha1 file: %s"
-msgstr ""
-
-#: builtin/fsck.c:654
-msgid "Checking object directory"
-msgstr ""
-
-#: builtin/fsck.c:657
-msgid "Checking object directories"
-msgstr ""
-
-#: builtin/fsck.c:672
-#, c-format
-msgid "Checking %s link"
-msgstr ""
-
-#: builtin/fsck.c:677 builtin/index-pack.c:864
-#, c-format
-msgid "invalid %s"
-msgstr ""
-
-#: builtin/fsck.c:684
-#, c-format
-msgid "%s points to something strange (%s)"
-msgstr ""
-
-#: builtin/fsck.c:690
-#, c-format
-msgid "%s: detached HEAD points at nothing"
-msgstr ""
-
-#: builtin/fsck.c:694
-#, c-format
-msgid "notice: %s points to an unborn branch (%s)"
-msgstr ""
-
-#: builtin/fsck.c:706
-msgid "Checking cache tree"
-msgstr ""
-
-#: builtin/fsck.c:711
-#, c-format
-msgid "%s: invalid sha1 pointer in cache-tree"
-msgstr ""
-
-#: builtin/fsck.c:720
-msgid "non-tree in cache-tree"
-msgstr ""
-
-#: builtin/fsck.c:751
-msgid "git fsck [<options>] [<object>...]"
-msgstr ""
-
-#: builtin/fsck.c:757
-msgid "show unreachable objects"
-msgstr ""
-
-#: builtin/fsck.c:758
-msgid "show dangling objects"
-msgstr ""
-
-#: builtin/fsck.c:759
-msgid "report tags"
-msgstr ""
-
-#: builtin/fsck.c:760
-msgid "report root nodes"
-msgstr ""
-
-#: builtin/fsck.c:761
-msgid "make index objects head nodes"
-msgstr ""
-
-#: builtin/fsck.c:762
-msgid "make reflogs head nodes (default)"
-msgstr ""
-
-#: builtin/fsck.c:763
-msgid "also consider packs and alternate objects"
-msgstr ""
-
-#: builtin/fsck.c:764
-msgid "check only connectivity"
-msgstr ""
-
-#: builtin/fsck.c:765 builtin/mktag.c:75
-msgid "enable more strict checking"
-msgstr ""
-
-#: builtin/fsck.c:767
-msgid "write dangling objects in .git/lost-found"
-msgstr ""
-
-#: builtin/fsck.c:768 builtin/prune.c:134
-msgid "show progress"
-msgstr ""
-
-#: builtin/fsck.c:769
-msgid "show verbose names for reachable objects"
-msgstr ""
-
-#: builtin/fsck.c:828 builtin/index-pack.c:262
-msgid "Checking objects"
-msgstr ""
-
-#: builtin/fsck.c:856
-#, c-format
-msgid "%s: object missing"
-msgstr ""
-
-#: builtin/fsck.c:867
-#, c-format
-msgid "invalid parameter: expected sha1, got '%s'"
-msgstr ""
-
-#: builtin/gc.c:39
-msgid "git gc [<options>]"
-msgstr ""
-
-#: builtin/gc.c:93
-#, c-format
-msgid "Failed to fstat %s: %s"
-msgstr ""
-
-#: builtin/gc.c:129
-#, c-format
-msgid "failed to parse '%s' value '%s'"
-msgstr ""
-
-#: builtin/gc.c:487 builtin/init-db.c:57
-#, c-format
-msgid "cannot stat '%s'"
-msgstr ""
-
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr ""
-
-#: builtin/gc.c:503
-#, c-format
-msgid ""
-"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
-"Automatic cleanup will not be performed until the file is removed.\n"
-"\n"
-"%s"
-msgstr ""
-
-#: builtin/gc.c:551
-msgid "prune unreferenced objects"
-msgstr ""
-
-#: builtin/gc.c:553
-msgid "be more thorough (increased runtime)"
-msgstr ""
-
-#: builtin/gc.c:554
-msgid "enable auto-gc mode"
-msgstr ""
-
-#: builtin/gc.c:557
-msgid "force running gc even if there may be another gc running"
-msgstr ""
-
-#: builtin/gc.c:560
-msgid "repack all other packs except the largest pack"
-msgstr ""
-
-#: builtin/gc.c:576
-#, c-format
-msgid "failed to parse gc.logexpiry value %s"
-msgstr ""
-
-#: builtin/gc.c:587
-#, c-format
-msgid "failed to parse prune expiry value %s"
-msgstr ""
-
-#: builtin/gc.c:607
-#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
-msgstr ""
-
-#: builtin/gc.c:609
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
-msgstr ""
-
-#: builtin/gc.c:610
-#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr ""
-
-#: builtin/gc.c:650
-#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
-msgstr ""
-
-#: builtin/gc.c:705
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr ""
-
-#: builtin/gc.c:715
-msgid ""
-"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
-msgstr ""
-
-#: builtin/gc.c:745
-msgid "--no-schedule is not allowed"
-msgstr ""
-
-#: builtin/gc.c:750
-#, c-format
-msgid "unrecognized --schedule argument '%s'"
-msgstr ""
-
-#: builtin/gc.c:869
-msgid "failed to write commit-graph"
-msgstr ""
-
-#: builtin/gc.c:905
-msgid "failed to prefetch remotes"
-msgstr ""
-
-#: builtin/gc.c:1022
-msgid "failed to start 'git pack-objects' process"
-msgstr ""
-
-#: builtin/gc.c:1039
-msgid "failed to finish 'git pack-objects' process"
-msgstr ""
-
-#: builtin/gc.c:1091
-msgid "failed to write multi-pack-index"
-msgstr ""
-
-#: builtin/gc.c:1109
-msgid "'git multi-pack-index expire' failed"
-msgstr ""
-
-#: builtin/gc.c:1170
-msgid "'git multi-pack-index repack' failed"
-msgstr ""
-
-#: builtin/gc.c:1179
-msgid ""
-"skipping incremental-repack task because core.multiPackIndex is disabled"
-msgstr ""
-
-#: builtin/gc.c:1283
-#, c-format
-msgid "lock file '%s' exists, skipping maintenance"
-msgstr ""
-
-#: builtin/gc.c:1313
-#, c-format
-msgid "task '%s' failed"
-msgstr ""
-
-#: builtin/gc.c:1395
-#, c-format
-msgid "'%s' is not a valid task"
-msgstr ""
-
-#: builtin/gc.c:1400
-#, c-format
-msgid "task '%s' cannot be selected multiple times"
-msgstr ""
-
-#: builtin/gc.c:1415
-msgid "run tasks based on the state of the repository"
-msgstr ""
-
-#: builtin/gc.c:1416
-msgid "frequency"
-msgstr ""
-
-#: builtin/gc.c:1417
-msgid "run tasks based on frequency"
-msgstr ""
-
-#: builtin/gc.c:1420
-msgid "do not report progress or other information over stderr"
-msgstr ""
-
-#: builtin/gc.c:1421
-msgid "task"
-msgstr ""
-
-#: builtin/gc.c:1422
-msgid "run a specific task"
-msgstr ""
-
-#: builtin/gc.c:1439
-msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr ""
-
-#: builtin/gc.c:1482
-msgid "failed to run 'git config'"
-msgstr ""
-
-#: builtin/gc.c:1547
-#, c-format
-msgid "failed to expand path '%s'"
-msgstr ""
-
-#: builtin/gc.c:1576
-msgid "failed to start launchctl"
-msgstr ""
-
-#: builtin/gc.c:1613
-#, c-format
-msgid "failed to create directories for '%s'"
-msgstr ""
-
-#: builtin/gc.c:1674
-#, c-format
-msgid "failed to bootstrap service %s"
-msgstr ""
-
-#: builtin/gc.c:1745
-msgid "failed to create temp xml file"
-msgstr ""
-
-#: builtin/gc.c:1835
-msgid "failed to start schtasks"
-msgstr ""
-
-#: builtin/gc.c:1879
-msgid "failed to run 'crontab -l'; your system might not support 'cron'"
-msgstr ""
-
-#: builtin/gc.c:1896
-msgid "failed to run 'crontab'; your system might not support 'cron'"
-msgstr ""
-
-#: builtin/gc.c:1900
-msgid "failed to open stdin of 'crontab'"
-msgstr ""
-
-#: builtin/gc.c:1942
-msgid "'crontab' died"
-msgstr ""
-
-#: builtin/gc.c:1976
-msgid "another process is scheduling background maintenance"
-msgstr ""
-
-#: builtin/gc.c:2000
-msgid "failed to add repo to global config"
-msgstr ""
-
-#: builtin/gc.c:2010
-msgid "git maintenance <subcommand> [<options>]"
-msgstr ""
-
-#: builtin/gc.c:2029
-#, c-format
-msgid "invalid subcommand: %s"
-msgstr ""
-
-#: builtin/grep.c:30
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
-msgstr ""
-
-#: builtin/grep.c:223
-#, c-format
-msgid "grep: failed to create thread: %s"
-msgstr ""
-
-#: builtin/grep.c:277
-#, c-format
-msgid "invalid number of threads specified (%d) for %s"
-msgstr ""
-
-#. TRANSLATORS: %s is the configuration
-#. variable for tweaking threads, currently
-#. grep.threads
-#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
-#, c-format
-msgid "no threads support, ignoring %s"
-msgstr ""
-
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
-#, c-format
-msgid "unable to read tree (%s)"
-msgstr ""
-
-#: builtin/grep.c:658
-#, c-format
-msgid "unable to grep from object of type %s"
-msgstr ""
-
-#: builtin/grep.c:738
-#, c-format
-msgid "switch `%c' expects a numerical value"
-msgstr ""
-
-#: builtin/grep.c:837
-msgid "search in index instead of in the work tree"
-msgstr ""
-
-#: builtin/grep.c:839
-msgid "find in contents not managed by git"
-msgstr ""
-
-#: builtin/grep.c:841
-msgid "search in both tracked and untracked files"
-msgstr ""
-
-#: builtin/grep.c:843
-msgid "ignore files specified via '.gitignore'"
-msgstr ""
-
-#: builtin/grep.c:845
-msgid "recursively search in each submodule"
-msgstr ""
-
-#: builtin/grep.c:848
-msgid "show non-matching lines"
-msgstr ""
-
-#: builtin/grep.c:850
-msgid "case insensitive matching"
-msgstr ""
-
-#: builtin/grep.c:852
-msgid "match patterns only at word boundaries"
-msgstr ""
-
-#: builtin/grep.c:854
-msgid "process binary files as text"
-msgstr ""
-
-#: builtin/grep.c:856
-msgid "don't match patterns in binary files"
-msgstr ""
-
-#: builtin/grep.c:859
-msgid "process binary files with textconv filters"
-msgstr ""
-
-#: builtin/grep.c:861
-msgid "search in subdirectories (default)"
-msgstr ""
-
-#: builtin/grep.c:863
-msgid "descend at most <depth> levels"
-msgstr ""
-
-#: builtin/grep.c:867
-msgid "use extended POSIX regular expressions"
-msgstr ""
-
-#: builtin/grep.c:870
-msgid "use basic POSIX regular expressions (default)"
-msgstr ""
-
-#: builtin/grep.c:873
-msgid "interpret patterns as fixed strings"
-msgstr ""
-
-#: builtin/grep.c:876
-msgid "use Perl-compatible regular expressions"
-msgstr ""
-
-#: builtin/grep.c:879
-msgid "show line numbers"
-msgstr ""
-
-#: builtin/grep.c:880
-msgid "show column number of first match"
-msgstr ""
-
-#: builtin/grep.c:881
-msgid "don't show filenames"
-msgstr ""
-
-#: builtin/grep.c:882
-msgid "show filenames"
-msgstr ""
-
-#: builtin/grep.c:884
-msgid "show filenames relative to top directory"
-msgstr ""
-
-#: builtin/grep.c:886
-msgid "show only filenames instead of matching lines"
-msgstr ""
-
-#: builtin/grep.c:888
-msgid "synonym for --files-with-matches"
-msgstr ""
-
-#: builtin/grep.c:891
-msgid "show only the names of files without match"
-msgstr ""
-
-#: builtin/grep.c:893
-msgid "print NUL after filenames"
-msgstr ""
-
-#: builtin/grep.c:896
-msgid "show only matching parts of a line"
-msgstr ""
-
-#: builtin/grep.c:898
-msgid "show the number of matches instead of matching lines"
-msgstr ""
-
-#: builtin/grep.c:899
-msgid "highlight matches"
-msgstr ""
-
-#: builtin/grep.c:901
-msgid "print empty line between matches from different files"
-msgstr ""
-
-#: builtin/grep.c:903
-msgid "show filename only once above matches from same file"
-msgstr ""
-
-#: builtin/grep.c:906
-msgid "show <n> context lines before and after matches"
-msgstr ""
-
-#: builtin/grep.c:909
-msgid "show <n> context lines before matches"
-msgstr ""
-
-#: builtin/grep.c:911
-msgid "show <n> context lines after matches"
-msgstr ""
-
-#: builtin/grep.c:913
-msgid "use <n> worker threads"
-msgstr ""
-
-#: builtin/grep.c:914
-msgid "shortcut for -C NUM"
-msgstr ""
-
-#: builtin/grep.c:917
-msgid "show a line with the function name before matches"
-msgstr ""
-
-#: builtin/grep.c:919
-msgid "show the surrounding function"
-msgstr ""
-
-#: builtin/grep.c:922
-msgid "read patterns from file"
-msgstr ""
-
-#: builtin/grep.c:924
-msgid "match <pattern>"
-msgstr ""
-
-#: builtin/grep.c:926
-msgid "combine patterns specified with -e"
-msgstr ""
-
-#: builtin/grep.c:938
-msgid "indicate hit with exit status without output"
-msgstr ""
-
-#: builtin/grep.c:940
-msgid "show only matches from files that match all patterns"
-msgstr ""
-
-#: builtin/grep.c:943
-msgid "pager"
-msgstr ""
-
-#: builtin/grep.c:943
-msgid "show matching files in the pager"
-msgstr ""
-
-#: builtin/grep.c:947
-msgid "allow calling of grep(1) (ignored by this build)"
-msgstr ""
-
-#: builtin/grep.c:1013
-msgid "no pattern given"
-msgstr ""
-
-#: builtin/grep.c:1049
-msgid "--no-index or --untracked cannot be used with revs"
-msgstr ""
-
-#: builtin/grep.c:1057
-#, c-format
-msgid "unable to resolve revision: %s"
-msgstr ""
-
-#: builtin/grep.c:1087
-msgid "--untracked not supported with --recurse-submodules"
-msgstr ""
-
-#: builtin/grep.c:1091
-msgid "invalid option combination, ignoring --threads"
-msgstr ""
-
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
-msgid "no threads support, ignoring --threads"
-msgstr ""
-
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
-#, c-format
-msgid "invalid number of threads specified (%d)"
-msgstr ""
-
-#: builtin/grep.c:1131
-msgid "--open-files-in-pager only works on the worktree"
-msgstr ""
-
-#: builtin/grep.c:1157
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr ""
-
-#: builtin/grep.c:1160
-msgid "--untracked cannot be used with --cached"
-msgstr ""
-
-#: builtin/grep.c:1166
-msgid "--[no-]exclude-standard cannot be used for tracked contents"
-msgstr ""
-
-#: builtin/grep.c:1174
-msgid "both --cached and trees are given"
-msgstr ""
-
-#: builtin/hash-object.c:85
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
-msgstr ""
-
-#: builtin/hash-object.c:86
-msgid "git hash-object --stdin-paths"
-msgstr ""
-
-#: builtin/hash-object.c:98
-msgid "object type"
-msgstr ""
-
-#: builtin/hash-object.c:99
-msgid "write the object into the object database"
-msgstr ""
-
-#: builtin/hash-object.c:101
-msgid "read the object from stdin"
-msgstr ""
-
-#: builtin/hash-object.c:103
-msgid "store file as is without filters"
-msgstr ""
-
-#: builtin/hash-object.c:104
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
-msgstr ""
-
-#: builtin/hash-object.c:105
-msgid "process file as it were from this path"
-msgstr ""
-
-#: builtin/help.c:47
-msgid "print all available commands"
-msgstr ""
-
-#: builtin/help.c:48
-msgid "exclude guides"
-msgstr ""
-
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr ""
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr ""
-
-#: builtin/help.c:52
-msgid "show man page"
-msgstr ""
-
-#: builtin/help.c:53
-msgid "show manual in web browser"
-msgstr ""
-
-#: builtin/help.c:55
-msgid "show info page"
-msgstr ""
-
-#: builtin/help.c:57
-msgid "print command description"
-msgstr ""
-
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr ""
-
-#: builtin/help.c:163
-#, c-format
-msgid "unrecognized help format '%s'"
-msgstr ""
-
-#: builtin/help.c:190
-msgid "Failed to start emacsclient."
-msgstr ""
-
-#: builtin/help.c:203
-msgid "Failed to parse emacsclient version."
-msgstr ""
-
-#: builtin/help.c:211
-#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
-msgstr ""
-
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
-#, c-format
-msgid "failed to exec '%s'"
-msgstr ""
-
-#: builtin/help.c:307
-#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
-msgstr ""
-
-#: builtin/help.c:319
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
-msgstr ""
-
-#: builtin/help.c:436
-#, c-format
-msgid "'%s': unknown man viewer."
-msgstr ""
-
-#: builtin/help.c:452
-msgid "no man viewer handled the request"
-msgstr ""
-
-#: builtin/help.c:459
-msgid "no info viewer handled the request"
-msgstr ""
-
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
-#, c-format
-msgid "'%s' is aliased to '%s'"
-msgstr ""
-
-#: builtin/help.c:531 git.c:380
-#, c-format
-msgid "bad alias.%s string: %s"
-msgstr ""
-
-#: builtin/help.c:561 builtin/help.c:591
-#, c-format
-msgid "usage: %s%s"
-msgstr ""
-
-#: builtin/help.c:575
-msgid "'git help config' for more information"
-msgstr ""
-
-#: builtin/index-pack.c:222
-#, c-format
-msgid "object type mismatch at %s"
-msgstr ""
-
-#: builtin/index-pack.c:242
-#, c-format
-msgid "did not receive expected object %s"
-msgstr ""
-
-#: builtin/index-pack.c:245
-#, c-format
-msgid "object %s: expected type %s, found %s"
-msgstr ""
-
-#: builtin/index-pack.c:295
-#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:305
-msgid "early EOF"
-msgstr ""
-
-#: builtin/index-pack.c:306
-msgid "read error on input"
-msgstr ""
-
-#: builtin/index-pack.c:318
-msgid "used more bytes than were available"
-msgstr ""
-
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
-msgid "pack too large for current definition of off_t"
-msgstr ""
-
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr ""
-
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:363
-msgid "pack signature mismatch"
-msgstr ""
-
-#: builtin/index-pack.c:365
-#, c-format
-msgid "pack version %<PRIu32> unsupported"
-msgstr ""
-
-#: builtin/index-pack.c:381
-#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
-msgstr ""
-
-#: builtin/index-pack.c:487
-#, c-format
-msgid "inflate returned %d"
-msgstr ""
-
-#: builtin/index-pack.c:536
-msgid "offset value overflow for delta base object"
-msgstr ""
-
-#: builtin/index-pack.c:544
-msgid "delta base offset is out of bound"
-msgstr ""
-
-#: builtin/index-pack.c:552
-#, c-format
-msgid "unknown object type %d"
-msgstr ""
-
-#: builtin/index-pack.c:583
-msgid "cannot pread pack file"
-msgstr ""
-
-#: builtin/index-pack.c:585
-#, c-format
-msgid "premature end of pack file, %<PRIuMAX> byte missing"
-msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:611
-msgid "serious inflate inconsistency"
-msgstr ""
-
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
-msgstr ""
-
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
-#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
-#, c-format
-msgid "unable to read %s"
-msgstr ""
-
-#: builtin/index-pack.c:823
-#, c-format
-msgid "cannot read existing object info %s"
-msgstr ""
-
-#: builtin/index-pack.c:831
-#, c-format
-msgid "cannot read existing object %s"
-msgstr ""
-
-#: builtin/index-pack.c:845
-#, c-format
-msgid "invalid blob object %s"
-msgstr ""
-
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
-msgid "fsck error in packed object"
-msgstr ""
-
-#: builtin/index-pack.c:869
-#, c-format
-msgid "Not all child objects of %s are reachable"
-msgstr ""
-
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
-msgid "failed to apply delta"
-msgstr ""
-
-#: builtin/index-pack.c:1160
-msgid "Receiving objects"
-msgstr ""
-
-#: builtin/index-pack.c:1160
-msgid "Indexing objects"
-msgstr ""
-
-#: builtin/index-pack.c:1194
-msgid "pack is corrupted (SHA1 mismatch)"
-msgstr ""
-
-#: builtin/index-pack.c:1199
-msgid "cannot fstat packfile"
-msgstr ""
-
-#: builtin/index-pack.c:1202
-msgid "pack has junk at the end"
-msgstr ""
-
-#: builtin/index-pack.c:1214
-msgid "confusion beyond insanity in parse_pack_objects()"
-msgstr ""
-
-#: builtin/index-pack.c:1237
-msgid "Resolving deltas"
-msgstr ""
-
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
-#, c-format
-msgid "unable to create thread: %s"
-msgstr ""
-
-#: builtin/index-pack.c:1281
-msgid "confusion beyond insanity"
-msgstr ""
-
-#: builtin/index-pack.c:1287
-#, c-format
-msgid "completed with %d local object"
-msgid_plural "completed with %d local objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1299
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr ""
-
-#: builtin/index-pack.c:1303
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1327
-#, c-format
-msgid "unable to deflate appended object (%d)"
-msgstr ""
-
-#: builtin/index-pack.c:1423
-#, c-format
-msgid "local object %s is corrupt"
-msgstr ""
-
-#: builtin/index-pack.c:1444
-#, c-format
-msgid "packfile name '%s' does not end with '.%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1468
-#, c-format
-msgid "cannot write %s file '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1476
-#, c-format
-msgid "cannot close written %s file '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1502
-msgid "error while closing pack file"
-msgstr ""
-
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr ""
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr ""
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr ""
-
-#: builtin/index-pack.c:1649
-#, c-format
-msgid "Cannot open existing pack file '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1651
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1699
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1706
-#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1748
-msgid "Cannot come back to cwd"
-msgstr ""
-
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
-#, c-format
-msgid "bad %s"
-msgstr ""
-
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
-#, c-format
-msgid "unknown hash algorithm '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1850
-msgid "--fix-thin cannot be used without --stdin"
-msgstr ""
-
-#: builtin/index-pack.c:1852
-msgid "--stdin requires a git repository"
-msgstr ""
-
-#: builtin/index-pack.c:1854
-msgid "--object-format cannot be used with --stdin"
-msgstr ""
-
-#: builtin/index-pack.c:1869
-msgid "--verify with no packfile name given"
-msgstr ""
-
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
-msgid "fsck error in pack objects"
-msgstr ""
-
-#: builtin/init-db.c:63
-#, c-format
-msgid "cannot stat template '%s'"
-msgstr ""
-
-#: builtin/init-db.c:68
-#, c-format
-msgid "cannot opendir '%s'"
-msgstr ""
-
-#: builtin/init-db.c:80
-#, c-format
-msgid "cannot readlink '%s'"
-msgstr ""
-
-#: builtin/init-db.c:82
-#, c-format
-msgid "cannot symlink '%s' '%s'"
-msgstr ""
-
-#: builtin/init-db.c:88
-#, c-format
-msgid "cannot copy '%s' to '%s'"
-msgstr ""
-
-#: builtin/init-db.c:92
-#, c-format
-msgid "ignoring template %s"
-msgstr ""
-
-#: builtin/init-db.c:123
-#, c-format
-msgid "templates not found in %s"
-msgstr ""
-
-#: builtin/init-db.c:138
-#, c-format
-msgid "not copying templates from '%s': %s"
-msgstr ""
-
-#: builtin/init-db.c:263
-#, c-format
-msgid "invalid initial branch name: '%s'"
-msgstr ""
-
-#: builtin/init-db.c:354
-#, c-format
-msgid "unable to handle file type %d"
-msgstr ""
-
-#: builtin/init-db.c:357
-#, c-format
-msgid "unable to move %s to %s"
-msgstr ""
-
-#: builtin/init-db.c:373
-msgid "attempt to reinitialize repository with different hash"
-msgstr ""
-
-#: builtin/init-db.c:397 builtin/init-db.c:400
-#, c-format
-msgid "%s already exists"
-msgstr ""
-
-#: builtin/init-db.c:432
-#, c-format
-msgid "re-init: ignored --initial-branch=%s"
-msgstr ""
-
-#: builtin/init-db.c:463
-#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
-msgstr ""
-
-#: builtin/init-db.c:464
-#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
-msgstr ""
-
-#: builtin/init-db.c:468
-#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
-msgstr ""
-
-#: builtin/init-db.c:469
-#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
-msgstr ""
-
-#: builtin/init-db.c:518
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
-msgstr ""
-
-#: builtin/init-db.c:544
-msgid "permissions"
-msgstr ""
-
-#: builtin/init-db.c:545
-msgid "specify that the git repository is to be shared amongst several users"
-msgstr ""
-
-#: builtin/init-db.c:551
-msgid "override the name of the initial branch"
-msgstr ""
-
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
-msgid "hash"
-msgstr ""
-
-#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
-msgid "specify the hash algorithm to use"
-msgstr ""
-
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr ""
-
-#: builtin/init-db.c:591 builtin/init-db.c:596
-#, c-format
-msgid "cannot mkdir %s"
-msgstr ""
-
-#: builtin/init-db.c:600 builtin/init-db.c:655
-#, c-format
-msgid "cannot chdir to %s"
-msgstr ""
-
-#: builtin/init-db.c:627
-#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
-msgstr ""
-
-#: builtin/init-db.c:679
-#, c-format
-msgid "Cannot access work tree '%s'"
-msgstr ""
-
-#: builtin/init-db.c:684
-msgid "--separate-git-dir incompatible with bare repository"
-msgstr ""
-
-#: builtin/interpret-trailers.c:16
-msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
-msgstr ""
-
-#: builtin/interpret-trailers.c:95
-msgid "edit files in place"
-msgstr ""
-
-#: builtin/interpret-trailers.c:96
-msgid "trim empty trailers"
-msgstr ""
-
-#: builtin/interpret-trailers.c:99
-msgid "where to place the new trailer"
-msgstr ""
-
-#: builtin/interpret-trailers.c:101
-msgid "action if trailer already exists"
-msgstr ""
-
-#: builtin/interpret-trailers.c:103
-msgid "action if trailer is missing"
-msgstr ""
-
-#: builtin/interpret-trailers.c:105
-msgid "output only the trailers"
-msgstr ""
-
-#: builtin/interpret-trailers.c:106
-msgid "do not apply config rules"
-msgstr ""
-
-#: builtin/interpret-trailers.c:107
-msgid "join whitespace-continued values"
-msgstr ""
-
-#: builtin/interpret-trailers.c:108
-msgid "set parsing options"
-msgstr ""
-
-#: builtin/interpret-trailers.c:110
-msgid "do not treat --- specially"
-msgstr ""
-
-#: builtin/interpret-trailers.c:112
-msgid "trailer(s) to add"
-msgstr ""
-
-#: builtin/interpret-trailers.c:123
-msgid "--trailer with --only-input does not make sense"
-msgstr ""
-
-#: builtin/interpret-trailers.c:133
-msgid "no input file given for in-place editing"
-msgstr ""
-
-#: builtin/log.c:59
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
-msgstr ""
-
-#: builtin/log.c:60
-msgid "git show [<options>] <object>..."
-msgstr ""
-
-#: builtin/log.c:113
-#, c-format
-msgid "invalid --decorate option: %s"
-msgstr ""
-
-#: builtin/log.c:180
-msgid "show source"
-msgstr ""
-
-#: builtin/log.c:181
-msgid "use mail map file"
-msgstr ""
-
-#: builtin/log.c:184
-msgid "only decorate refs that match <pattern>"
-msgstr ""
-
-#: builtin/log.c:186
-msgid "do not decorate refs that match <pattern>"
-msgstr ""
-
-#: builtin/log.c:187
-msgid "decorate options"
-msgstr ""
-
-#: builtin/log.c:190
-msgid ""
-"trace the evolution of line range <start>,<end> or function :<funcname> in "
-"<file>"
-msgstr ""
-
-#: builtin/log.c:213
-msgid "-L<range>:<file> cannot be used with pathspec"
-msgstr ""
-
-#: builtin/log.c:306
-#, c-format
-msgid "Final output: %d %s\n"
-msgstr ""
-
-#: builtin/log.c:571
-#, c-format
-msgid "git show %s: bad file"
-msgstr ""
-
-#: builtin/log.c:586 builtin/log.c:676
-#, c-format
-msgid "could not read object %s"
-msgstr ""
-
-#: builtin/log.c:701
-#, c-format
-msgid "unknown type: %d"
-msgstr ""
-
-#: builtin/log.c:846
-#, c-format
-msgid "%s: invalid cover from description mode"
-msgstr ""
-
-#: builtin/log.c:853
-msgid "format.headers without value"
-msgstr ""
-
-#: builtin/log.c:982
-#, c-format
-msgid "cannot open patch file %s"
-msgstr ""
-
-#: builtin/log.c:999
-msgid "need exactly one range"
-msgstr ""
-
-#: builtin/log.c:1009
-msgid "not a range"
-msgstr ""
-
-#: builtin/log.c:1173
-msgid "cover letter needs email format"
-msgstr ""
-
-#: builtin/log.c:1179
-msgid "failed to create cover-letter file"
-msgstr ""
-
-#: builtin/log.c:1266
-#, c-format
-msgid "insane in-reply-to: %s"
-msgstr ""
-
-#: builtin/log.c:1293
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
-msgstr ""
-
-#: builtin/log.c:1351
-msgid "two output directories?"
-msgstr ""
-
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
-#, c-format
-msgid "unknown commit %s"
-msgstr ""
-
-#: builtin/log.c:1513 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:1522
-msgid "could not find exact merge base"
-msgstr ""
-
-#: builtin/log.c:1532
-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:1555
-msgid "failed to find exact merge base"
-msgstr ""
-
-#: builtin/log.c:1572
-msgid "base commit should be the ancestor of revision list"
-msgstr ""
-
-#: builtin/log.c:1582
-msgid "base commit shouldn't be in revision list"
-msgstr ""
-
-#: builtin/log.c:1640
-msgid "cannot get patch id"
-msgstr ""
-
-#: builtin/log.c:1703
-msgid "failed to infer range-diff origin of current series"
-msgstr ""
-
-#: builtin/log.c:1705
-#, c-format
-msgid "using '%s' as range-diff origin of current series"
-msgstr ""
-
-#: builtin/log.c:1749
-msgid "use [PATCH n/m] even with a single patch"
-msgstr ""
-
-#: builtin/log.c:1752
-msgid "use [PATCH] even with multiple patches"
-msgstr ""
-
-#: builtin/log.c:1756
-msgid "print patches to standard out"
-msgstr ""
-
-#: builtin/log.c:1758
-msgid "generate a cover letter"
-msgstr ""
-
-#: builtin/log.c:1760
-msgid "use simple number sequence for output file names"
-msgstr ""
-
-#: builtin/log.c:1761
-msgid "sfx"
-msgstr ""
-
-#: builtin/log.c:1762
-msgid "use <sfx> instead of '.patch'"
-msgstr ""
-
-#: builtin/log.c:1764
-msgid "start numbering patches at <n> instead of 1"
-msgstr ""
-
-#: builtin/log.c:1765
-msgid "reroll-count"
-msgstr ""
-
-#: builtin/log.c:1766
-msgid "mark the series as Nth re-roll"
-msgstr ""
-
-#: builtin/log.c:1768
-msgid "max length of output filename"
-msgstr ""
-
-#: builtin/log.c:1770
-msgid "use [RFC PATCH] instead of [PATCH]"
-msgstr ""
-
-#: builtin/log.c:1773
-msgid "cover-from-description-mode"
-msgstr ""
-
-#: builtin/log.c:1774
-msgid "generate parts of a cover letter based on a branch's description"
-msgstr ""
-
-#: builtin/log.c:1776
-msgid "use [<prefix>] instead of [PATCH]"
-msgstr ""
-
-#: builtin/log.c:1779
-msgid "store resulting files in <dir>"
-msgstr ""
-
-#: builtin/log.c:1782
-msgid "don't strip/add [PATCH]"
-msgstr ""
-
-#: builtin/log.c:1785
-msgid "don't output binary diffs"
-msgstr ""
-
-#: builtin/log.c:1787
-msgid "output all-zero hash in From header"
-msgstr ""
-
-#: builtin/log.c:1789
-msgid "don't include a patch matching a commit upstream"
-msgstr ""
-
-#: builtin/log.c:1791
-msgid "show patch format instead of default (patch + stat)"
-msgstr ""
-
-#: builtin/log.c:1793
-msgid "Messaging"
-msgstr ""
-
-#: builtin/log.c:1794
-msgid "header"
-msgstr ""
-
-#: builtin/log.c:1795
-msgid "add email header"
-msgstr ""
-
-#: builtin/log.c:1796 builtin/log.c:1797
-msgid "email"
-msgstr ""
-
-#: builtin/log.c:1796
-msgid "add To: header"
-msgstr ""
-
-#: builtin/log.c:1797
-msgid "add Cc: header"
-msgstr ""
-
-#: builtin/log.c:1798
-msgid "ident"
-msgstr ""
-
-#: builtin/log.c:1799
-msgid "set From address to <ident> (or committer ident if absent)"
-msgstr ""
-
-#: builtin/log.c:1801
-msgid "message-id"
-msgstr ""
-
-#: builtin/log.c:1802
-msgid "make first mail a reply to <message-id>"
-msgstr ""
-
-#: builtin/log.c:1803 builtin/log.c:1806
-msgid "boundary"
-msgstr ""
-
-#: builtin/log.c:1804
-msgid "attach the patch"
-msgstr ""
-
-#: builtin/log.c:1807
-msgid "inline the patch"
-msgstr ""
-
-#: builtin/log.c:1811
-msgid "enable message threading, styles: shallow, deep"
-msgstr ""
-
-#: builtin/log.c:1813
-msgid "signature"
-msgstr ""
-
-#: builtin/log.c:1814
-msgid "add a signature"
-msgstr ""
-
-#: builtin/log.c:1815
-msgid "base-commit"
-msgstr ""
-
-#: builtin/log.c:1816
-msgid "add prerequisite tree info to the patch series"
-msgstr ""
-
-#: builtin/log.c:1819
-msgid "add a signature from a file"
-msgstr ""
-
-#: builtin/log.c:1820
-msgid "don't print the patch filenames"
-msgstr ""
-
-#: builtin/log.c:1822
-msgid "show progress while generating patches"
-msgstr ""
-
-#: builtin/log.c:1824
-msgid "show changes against <rev> in cover letter or single patch"
-msgstr ""
-
-#: builtin/log.c:1827
-msgid "show changes against <refspec> in cover letter or single patch"
-msgstr ""
-
-#: builtin/log.c:1829 builtin/range-diff.c:28
-msgid "percentage by which creation is weighted"
-msgstr ""
-
-#: builtin/log.c:1916
-#, c-format
-msgid "invalid ident line: %s"
-msgstr ""
-
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:1941
-msgid "--name-only does not make sense"
-msgstr ""
-
-#: builtin/log.c:1943
-msgid "--name-status does not make sense"
-msgstr ""
-
-#: builtin/log.c:1945
-msgid "--check does not make sense"
-msgstr ""
-
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:2089
-msgid "--interdiff requires --cover-letter or single patch"
-msgstr ""
-
-#: builtin/log.c:2093
-msgid "Interdiff:"
-msgstr ""
-
-#: builtin/log.c:2094
-#, c-format
-msgid "Interdiff against v%d:"
-msgstr ""
-
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr ""
-
-#: builtin/log.c:2104
-msgid "--range-diff requires --cover-letter or single patch"
-msgstr ""
-
-#: builtin/log.c:2112
-msgid "Range-diff:"
-msgstr ""
-
-#: builtin/log.c:2113
-#, c-format
-msgid "Range-diff against v%d:"
-msgstr ""
-
-#: builtin/log.c:2124
-#, c-format
-msgid "unable to read signature file '%s'"
-msgstr ""
-
-#: builtin/log.c:2160
-msgid "Generating patches"
-msgstr ""
-
-#: builtin/log.c:2204
-msgid "failed to create output files"
-msgstr ""
-
-#: builtin/log.c:2263
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
-msgstr ""
-
-#: builtin/log.c:2317
-#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr ""
-
-#: builtin/ls-files.c:563
-msgid "git ls-files [<options>] [<file>...]"
-msgstr ""
-
-#: builtin/ls-files.c:619
-msgid "identify the file status with tags"
-msgstr ""
-
-#: builtin/ls-files.c:621
-msgid "use lowercase letters for 'assume unchanged' files"
-msgstr ""
-
-#: builtin/ls-files.c:623
-msgid "use lowercase letters for 'fsmonitor clean' files"
-msgstr ""
-
-#: builtin/ls-files.c:625
-msgid "show cached files in the output (default)"
-msgstr ""
-
-#: builtin/ls-files.c:627
-msgid "show deleted files in the output"
-msgstr ""
-
-#: builtin/ls-files.c:629
-msgid "show modified files in the output"
-msgstr ""
-
-#: builtin/ls-files.c:631
-msgid "show other files in the output"
-msgstr ""
-
-#: builtin/ls-files.c:633
-msgid "show ignored files in the output"
-msgstr ""
-
-#: builtin/ls-files.c:636
-msgid "show staged contents' object name in the output"
-msgstr ""
-
-#: builtin/ls-files.c:638
-msgid "show files on the filesystem that need to be removed"
-msgstr ""
-
-#: builtin/ls-files.c:640
-msgid "show 'other' directories' names only"
-msgstr ""
-
-#: builtin/ls-files.c:642
-msgid "show line endings of files"
-msgstr ""
-
-#: builtin/ls-files.c:644
-msgid "don't show empty directories"
-msgstr ""
-
-#: builtin/ls-files.c:647
-msgid "show unmerged files in the output"
-msgstr ""
-
-#: builtin/ls-files.c:649
-msgid "show resolve-undo information"
-msgstr ""
-
-#: builtin/ls-files.c:651
-msgid "skip files matching pattern"
-msgstr ""
-
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr ""
-
-#: builtin/ls-files.c:657
-msgid "read additional per-directory exclude patterns in <file>"
-msgstr ""
-
-#: builtin/ls-files.c:659
-msgid "add the standard git exclusions"
-msgstr ""
-
-#: builtin/ls-files.c:663
-msgid "make the output relative to the project top directory"
-msgstr ""
-
-#: builtin/ls-files.c:666
-msgid "recurse through submodules"
-msgstr ""
-
-#: builtin/ls-files.c:668
-msgid "if any <file> is not in the index, treat this as an error"
-msgstr ""
-
-#: builtin/ls-files.c:669
-msgid "tree-ish"
-msgstr ""
-
-#: builtin/ls-files.c:670
-msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr ""
-
-#: builtin/ls-files.c:672
-msgid "show debugging data"
-msgstr ""
-
-#: builtin/ls-files.c:674
-msgid "suppress duplicate entries"
-msgstr ""
-
-#: builtin/ls-remote.c:9
-msgid ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
-msgstr ""
-
-#: builtin/ls-remote.c:60
-msgid "do not print remote URL"
-msgstr ""
-
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
-msgid "exec"
-msgstr ""
-
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
-msgid "path of git-upload-pack on the remote host"
-msgstr ""
-
-#: builtin/ls-remote.c:66
-msgid "limit to tags"
-msgstr ""
-
-#: builtin/ls-remote.c:67
-msgid "limit to heads"
-msgstr ""
-
-#: builtin/ls-remote.c:68
-msgid "do not show peeled tags"
-msgstr ""
-
-#: builtin/ls-remote.c:70
-msgid "take url.<base>.insteadOf into account"
-msgstr ""
-
-#: builtin/ls-remote.c:73
-msgid "exit with exit code 2 if no matching refs are found"
-msgstr ""
-
-#: builtin/ls-remote.c:76
-msgid "show underlying ref in addition to the object pointed by it"
-msgstr ""
-
-#: builtin/ls-tree.c:30
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr ""
-
-#: builtin/ls-tree.c:128
-msgid "only show trees"
-msgstr ""
-
-#: builtin/ls-tree.c:130
-msgid "recurse into subtrees"
-msgstr ""
-
-#: builtin/ls-tree.c:132
-msgid "show trees when recursing"
-msgstr ""
-
-#: builtin/ls-tree.c:135
-msgid "terminate entries with NUL byte"
-msgstr ""
-
-#: builtin/ls-tree.c:136
-msgid "include object size"
-msgstr ""
-
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
-msgid "list only filenames"
-msgstr ""
-
-#: builtin/ls-tree.c:143
-msgid "use full path names"
-msgstr ""
-
-#: builtin/ls-tree.c:145
-msgid "list entire tree; not just current directory (implies --full-name)"
-msgstr ""
-
-#. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
-msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
-msgstr ""
-
-#: builtin/mailinfo.c:58
-msgid "keep subject"
-msgstr ""
-
-#: builtin/mailinfo.c:60
-msgid "keep non patch brackets in subject"
-msgstr ""
-
-#: builtin/mailinfo.c:62
-msgid "copy Message-ID to the end of commit message"
-msgstr ""
-
-#: builtin/mailinfo.c:64
-msgid "re-code metadata to i18n.commitEncoding"
-msgstr ""
-
-#: builtin/mailinfo.c:67
-msgid "disable charset re-coding of metadata"
-msgstr ""
-
-#: builtin/mailinfo.c:69
-msgid "encoding"
-msgstr ""
-
-#: builtin/mailinfo.c:70
-msgid "re-code metadata to this encoding"
-msgstr ""
-
-#: builtin/mailinfo.c:72
-msgid "use scissors"
-msgstr ""
-
-#: builtin/mailinfo.c:73
-msgid "<action>"
-msgstr ""
-
-#: builtin/mailinfo.c:74
-msgid "action when quoted CR is found"
-msgstr ""
-
-#: builtin/mailinfo.c:77
-msgid "use headers in message's body"
-msgstr ""
-
-#: builtin/mailsplit.c:241
-#, c-format
-msgid "empty mbox: '%s'"
-msgstr ""
-
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr ""
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr ""
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr ""
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr ""
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr ""
-
-#: builtin/merge-base.c:143
-msgid "output all common ancestors"
-msgstr ""
-
-#: builtin/merge-base.c:145
-msgid "find ancestors for a single n-way merge"
-msgstr ""
-
-#: builtin/merge-base.c:147
-msgid "list revs not reachable from others"
-msgstr ""
-
-#: builtin/merge-base.c:149
-msgid "is the first one ancestor of the other?"
-msgstr ""
-
-#: builtin/merge-base.c:151
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr ""
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr ""
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr ""
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr ""
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr ""
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-msgstr ""
-
-#: builtin/merge-file.c:44
-msgid "for conflicts, use this marker size"
-msgstr ""
-
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
-msgstr ""
-
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
-msgstr ""
-
-#: builtin/merge-recursive.c:47
-#, c-format
-msgid "unknown option %s"
-msgstr ""
-
-#: builtin/merge-recursive.c:53
-#, c-format
-msgid "could not parse object '%s'"
-msgstr ""
-
-#: builtin/merge-recursive.c:57
-#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/merge-recursive.c:65
-msgid "not handling anything other than two heads merge."
-msgstr ""
-
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr ""
-
-#: builtin/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr ""
-
-#: builtin/merge.c:58
-msgid "git merge [<options>] [<commit>...]"
-msgstr ""
-
-#: builtin/merge.c:123
-msgid "switch `m' requires a value"
-msgstr ""
-
-#: builtin/merge.c:146
-#, c-format
-msgid "option `%s' requires a value"
-msgstr ""
-
-#: builtin/merge.c:199
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr ""
-
-#: builtin/merge.c:200
-#, c-format
-msgid "Available strategies are:"
-msgstr ""
-
-#: builtin/merge.c:205
-#, c-format
-msgid "Available custom strategies are:"
-msgstr ""
-
-#: builtin/merge.c:256 builtin/pull.c:133
-msgid "do not show a diffstat at the end of the merge"
-msgstr ""
-
-#: builtin/merge.c:259 builtin/pull.c:136
-msgid "show a diffstat at the end of the merge"
-msgstr ""
-
-#: builtin/merge.c:260 builtin/pull.c:139
-msgid "(synonym to --stat)"
-msgstr ""
-
-#: builtin/merge.c:262 builtin/pull.c:142
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr ""
-
-#: builtin/merge.c:265 builtin/pull.c:148
-msgid "create a single commit instead of doing a merge"
-msgstr ""
-
-#: builtin/merge.c:267 builtin/pull.c:151
-msgid "perform a commit if the merge succeeds (default)"
-msgstr ""
-
-#: builtin/merge.c:269 builtin/pull.c:154
-msgid "edit message before committing"
-msgstr ""
-
-#: builtin/merge.c:271
-msgid "allow fast-forward (default)"
-msgstr ""
-
-#: builtin/merge.c:273 builtin/pull.c:161
-msgid "abort if fast-forward is not possible"
-msgstr ""
-
-#: builtin/merge.c:277 builtin/pull.c:164
-msgid "verify that the named commit has a valid GPG signature"
-msgstr ""
-
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
-msgid "strategy"
-msgstr ""
-
-#: builtin/merge.c:279 builtin/pull.c:169
-msgid "merge strategy to use"
-msgstr ""
-
-#: builtin/merge.c:280 builtin/pull.c:172
-msgid "option=value"
-msgstr ""
-
-#: builtin/merge.c:281 builtin/pull.c:173
-msgid "option for selected merge strategy"
-msgstr ""
-
-#: builtin/merge.c:283
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr ""
-
-#: builtin/merge.c:290
-msgid "abort the current in-progress merge"
-msgstr ""
-
-#: builtin/merge.c:292
-msgid "--abort but leave index and working tree alone"
-msgstr ""
-
-#: builtin/merge.c:294
-msgid "continue the current in-progress merge"
-msgstr ""
-
-#: builtin/merge.c:296 builtin/pull.c:180
-msgid "allow merging unrelated histories"
-msgstr ""
-
-#: builtin/merge.c:303
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr ""
-
-#: builtin/merge.c:320
-msgid "could not run stash."
-msgstr ""
-
-#: builtin/merge.c:325
-msgid "stash failed"
-msgstr ""
-
-#: builtin/merge.c:330
-#, c-format
-msgid "not a valid object: %s"
-msgstr ""
-
-#: builtin/merge.c:352 builtin/merge.c:369
-msgid "read-tree failed"
-msgstr ""
-
-#: builtin/merge.c:400
-msgid "Already up to date. (nothing to squash)"
-msgstr ""
-
-#: builtin/merge.c:414
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr ""
-
-#: builtin/merge.c:464
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr ""
-
-#: builtin/merge.c:515
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr ""
-
-#: builtin/merge.c:603
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr ""
-
-#: builtin/merge.c:729
-msgid "Not handling anything other than two heads merge."
-msgstr ""
-
-#: builtin/merge.c:742
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr ""
-
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
-#, c-format
-msgid "unable to write %s"
-msgstr ""
-
-#: builtin/merge.c:813
-#, c-format
-msgid "Could not read from '%s'"
-msgstr ""
-
-#: builtin/merge.c:822
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr ""
-
-#: builtin/merge.c:828
-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:833
-msgid "An empty message aborts the commit.\n"
-msgstr ""
-
-#: builtin/merge.c:836
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-
-#: builtin/merge.c:889
-msgid "Empty commit message."
-msgstr ""
-
-#: builtin/merge.c:904
-#, c-format
-msgid "Wonderful.\n"
-msgstr ""
-
-#: builtin/merge.c:965
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr ""
-
-#: builtin/merge.c:1004
-msgid "No current branch."
-msgstr ""
-
-#: builtin/merge.c:1006
-msgid "No remote for the current branch."
-msgstr ""
-
-#: builtin/merge.c:1008
-msgid "No default upstream defined for the current branch."
-msgstr ""
-
-#: builtin/merge.c:1013
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr ""
-
-#: builtin/merge.c:1070
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr ""
-
-#: builtin/merge.c:1173
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr ""
-
-#: builtin/merge.c:1207
-msgid "not something we can merge"
-msgstr ""
-
-#: builtin/merge.c:1317
-msgid "--abort expects no arguments"
-msgstr ""
-
-#: builtin/merge.c:1321
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr ""
-
-#: builtin/merge.c:1339
-msgid "--quit expects no arguments"
-msgstr ""
-
-#: builtin/merge.c:1352
-msgid "--continue expects no arguments"
-msgstr ""
-
-#: builtin/merge.c:1356
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr ""
-
-#: builtin/merge.c:1372
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-
-#: builtin/merge.c:1379
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-
-#: builtin/merge.c:1382
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr ""
-
-#: builtin/merge.c:1396
-msgid "You cannot combine --squash with --no-ff."
-msgstr ""
-
-#: builtin/merge.c:1398
-msgid "You cannot combine --squash with --commit."
-msgstr ""
-
-#: builtin/merge.c:1414
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr ""
-
-#: builtin/merge.c:1431
-msgid "Squash commit into empty head not supported yet"
-msgstr ""
-
-#: builtin/merge.c:1433
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr ""
-
-#: builtin/merge.c:1438
-#, c-format
-msgid "%s - not something we can merge"
-msgstr ""
-
-#: builtin/merge.c:1440
-msgid "Can merge only exactly one commit into empty head"
-msgstr ""
-
-#: builtin/merge.c:1521
-msgid "refusing to merge unrelated histories"
-msgstr ""
-
-#: builtin/merge.c:1540
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr ""
-
-#: builtin/merge.c:1587
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr ""
-
-#: builtin/merge.c:1594
-#, c-format
-msgid "Nope.\n"
-msgstr ""
-
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr ""
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr ""
-
-#: builtin/merge.c:1657
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr ""
-
-#: builtin/merge.c:1709
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr ""
-
-#: builtin/merge.c:1711
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr ""
-
-#: builtin/merge.c:1721
-#, c-format
-msgid "Using the %s strategy to prepare resolving by hand.\n"
-msgstr ""
-
-#: builtin/merge.c:1735
-#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr ""
-
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr ""
-
-#: builtin/mktag.c:27
-#, c-format
-msgid "warning: tag input does not pass fsck: %s"
-msgstr ""
-
-#: builtin/mktag.c:38
-#, c-format
-msgid "error: tag input does not pass fsck: %s"
-msgstr ""
-
-#: builtin/mktag.c:41
-#, c-format
-msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr ""
-
-#: builtin/mktag.c:56
-#, c-format
-msgid "could not read tagged object '%s'"
-msgstr ""
-
-#: builtin/mktag.c:59
-#, c-format
-msgid "object '%s' tagged as '%s', but is a '%s' type"
-msgstr ""
-
-#: builtin/mktag.c:97
-msgid "tag on stdin did not pass our strict fsck check"
-msgstr ""
-
-#: builtin/mktag.c:100
-msgid "tag on stdin did not refer to a valid object"
-msgstr ""
-
-#: builtin/mktag.c:103 builtin/tag.c:243
-msgid "unable to write tag file"
-msgstr ""
-
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr ""
-
-#: builtin/mktree.c:154
-msgid "input is NUL terminated"
-msgstr ""
-
-#: builtin/mktree.c:155 builtin/write-tree.c:26
-msgid "allow missing objects"
-msgstr ""
-
-#: builtin/mktree.c:156
-msgid "allow creation of more than one tree"
-msgstr ""
-
-#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr ""
-
-#: builtin/multi-pack-index.c:13
-msgid "git multi-pack-index [<options>] verify"
-msgstr ""
-
-#: builtin/multi-pack-index.c:16
-msgid "git multi-pack-index [<options>] expire"
-msgstr ""
-
-#: builtin/multi-pack-index.c:19
-msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
-msgstr ""
-
-#: builtin/multi-pack-index.c:54
-msgid "object directory containing set of packfile and pack-index pairs"
-msgstr ""
-
-#: builtin/multi-pack-index.c:69
-msgid "preferred-pack"
-msgstr ""
-
-#: builtin/multi-pack-index.c:70
-msgid "pack for reuse when computing a multi-pack bitmap"
-msgstr ""
-
-#: builtin/multi-pack-index.c:128
-msgid ""
-"during repack, collect pack-files of smaller size into a batch that is "
-"larger than this size"
-msgstr ""
-
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr ""
-
-#: builtin/mv.c:18
-msgid "git mv [<options>] <source>... <destination>"
-msgstr ""
-
-#: builtin/mv.c:83
-#, c-format
-msgid "Directory %s is in index and no submodule?"
-msgstr ""
-
-#: builtin/mv.c:85
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-
-#: builtin/mv.c:103
-#, c-format
-msgid "%.*s is in index"
-msgstr ""
-
-#: builtin/mv.c:125
-msgid "force move/rename even if target exists"
-msgstr ""
-
-#: builtin/mv.c:127
-msgid "skip move/rename errors"
-msgstr ""
-
-#: builtin/mv.c:170
-#, c-format
-msgid "destination '%s' is not a directory"
-msgstr ""
-
-#: builtin/mv.c:181
-#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
-msgstr ""
-
-#: builtin/mv.c:185
-msgid "bad source"
-msgstr ""
-
-#: builtin/mv.c:188
-msgid "can not move directory into itself"
-msgstr ""
-
-#: builtin/mv.c:191
-msgid "cannot move directory over file"
-msgstr ""
-
-#: builtin/mv.c:200
-msgid "source directory is empty"
-msgstr ""
-
-#: builtin/mv.c:225
-msgid "not under version control"
-msgstr ""
-
-#: builtin/mv.c:227
-msgid "conflicted"
-msgstr ""
-
-#: builtin/mv.c:230
-msgid "destination exists"
-msgstr ""
-
-#: builtin/mv.c:238
-#, c-format
-msgid "overwriting '%s'"
-msgstr ""
-
-#: builtin/mv.c:241
-msgid "Cannot overwrite"
-msgstr ""
-
-#: builtin/mv.c:244
-msgid "multiple sources for the same target"
-msgstr ""
-
-#: builtin/mv.c:246
-msgid "destination directory does not exist"
-msgstr ""
-
-#: builtin/mv.c:253
-#, c-format
-msgid "%s, source=%s, destination=%s"
-msgstr ""
-
-#: builtin/mv.c:274
-#, c-format
-msgid "Renaming %s to %s\n"
-msgstr ""
-
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
-#, c-format
-msgid "renaming '%s' failed"
-msgstr ""
-
-#: builtin/name-rev.c:465
-msgid "git name-rev [<options>] <commit>..."
-msgstr ""
-
-#: builtin/name-rev.c:466
-msgid "git name-rev [<options>] --all"
-msgstr ""
-
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
-msgstr ""
-
-#: builtin/name-rev.c:524
-msgid "print only ref-based names (no object names)"
-msgstr ""
-
-#: builtin/name-rev.c:525
-msgid "only use tags to name the commits"
-msgstr ""
-
-#: builtin/name-rev.c:527
-msgid "only use refs matching <pattern>"
-msgstr ""
-
-#: builtin/name-rev.c:529
-msgid "ignore refs matching <pattern>"
-msgstr ""
-
-#: builtin/name-rev.c:531
-msgid "list all commits reachable from all refs"
-msgstr ""
-
-#: builtin/name-rev.c:532
-msgid "read from stdin"
-msgstr ""
-
-#: builtin/name-rev.c:533
-msgid "allow to print `undefined` names (default)"
-msgstr ""
-
-#: builtin/name-rev.c:539
-msgid "dereference tags in the input (internal use)"
-msgstr ""
-
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
-msgstr ""
-
-#: builtin/notes.c:29
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
-msgstr ""
-
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr ""
-
-#: builtin/notes.c:31
-msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
-msgstr ""
-
-#: builtin/notes.c:32
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr ""
-
-#: builtin/notes.c:33
-msgid "git notes [--ref <notes-ref>] show [<object>]"
-msgstr ""
-
-#: builtin/notes.c:34
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
-msgstr ""
-
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr ""
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr ""
-
-#: builtin/notes.c:37
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
-msgstr ""
-
-#: builtin/notes.c:38
-msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
-msgstr ""
-
-#: builtin/notes.c:39
-msgid "git notes [--ref <notes-ref>] get-ref"
-msgstr ""
-
-#: builtin/notes.c:44
-msgid "git notes [list [<object>]]"
-msgstr ""
-
-#: builtin/notes.c:49
-msgid "git notes add [<options>] [<object>]"
-msgstr ""
-
-#: builtin/notes.c:54
-msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr ""
-
-#: builtin/notes.c:55
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
-msgstr ""
-
-#: builtin/notes.c:60
-msgid "git notes append [<options>] [<object>]"
-msgstr ""
-
-#: builtin/notes.c:65
-msgid "git notes edit [<object>]"
-msgstr ""
-
-#: builtin/notes.c:70
-msgid "git notes show [<object>]"
-msgstr ""
-
-#: builtin/notes.c:75
-msgid "git notes merge [<options>] <notes-ref>"
-msgstr ""
-
-#: builtin/notes.c:76
-msgid "git notes merge --commit [<options>]"
-msgstr ""
-
-#: builtin/notes.c:77
-msgid "git notes merge --abort [<options>]"
-msgstr ""
-
-#: builtin/notes.c:82
-msgid "git notes remove [<object>]"
-msgstr ""
-
-#: builtin/notes.c:87
-msgid "git notes prune [<options>]"
-msgstr ""
-
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr ""
-
-#: builtin/notes.c:97
-msgid "Write/edit the notes for the following object:"
-msgstr ""
-
-#: builtin/notes.c:150
-#, c-format
-msgid "unable to start 'show' for object '%s'"
-msgstr ""
-
-#: builtin/notes.c:154
-msgid "could not read 'show' output"
-msgstr ""
-
-#: builtin/notes.c:162
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
-msgstr ""
-
-#: builtin/notes.c:197
-msgid "please supply the note contents using either -m or -F option"
-msgstr ""
-
-#: builtin/notes.c:206
-msgid "unable to write note object"
-msgstr ""
-
-#: builtin/notes.c:208
-#, c-format
-msgid "the note contents have been left in %s"
-msgstr ""
-
-#: builtin/notes.c:242 builtin/tag.c:576
-#, c-format
-msgid "could not open or read '%s'"
-msgstr ""
-
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
-#, c-format
-msgid "failed to resolve '%s' as a valid ref."
-msgstr ""
-
-#: builtin/notes.c:265
-#, c-format
-msgid "failed to read object '%s'."
-msgstr ""
-
-#: builtin/notes.c:268
-#, c-format
-msgid "cannot read note data from non-blob object '%s'."
-msgstr ""
-
-#: builtin/notes.c:309
-#, c-format
-msgid "malformed input line: '%s'."
-msgstr ""
-
-#: builtin/notes.c:324
-#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
-msgstr ""
-
-#. TRANSLATORS: the first %s will be replaced by a git
-#. notes command: 'add', 'merge', 'remove', etc.
-#.
-#: builtin/notes.c:356
-#, c-format
-msgid "refusing to %s notes in %s (outside of refs/notes/)"
-msgstr ""
-
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
-msgid "too many arguments"
-msgstr ""
-
-#: builtin/notes.c:389 builtin/notes.c:678
-#, c-format
-msgid "no note found for object %s."
-msgstr ""
-
-#: builtin/notes.c:410 builtin/notes.c:576
-msgid "note contents as a string"
-msgstr ""
-
-#: builtin/notes.c:413 builtin/notes.c:579
-msgid "note contents in a file"
-msgstr ""
-
-#: builtin/notes.c:416 builtin/notes.c:582
-msgid "reuse and edit specified note object"
-msgstr ""
-
-#: builtin/notes.c:419 builtin/notes.c:585
-msgid "reuse specified note object"
-msgstr ""
-
-#: builtin/notes.c:422 builtin/notes.c:588
-msgid "allow storing empty note"
-msgstr ""
-
-#: builtin/notes.c:423 builtin/notes.c:496
-msgid "replace existing notes"
-msgstr ""
-
-#: builtin/notes.c:448
-#, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
-msgstr ""
-
-#: builtin/notes.c:463 builtin/notes.c:544
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
-msgstr ""
-
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
-#, c-format
-msgid "Removing note for object %s\n"
-msgstr ""
-
-#: builtin/notes.c:497
-msgid "read objects from stdin"
-msgstr ""
-
-#: builtin/notes.c:499
-msgid "load rewriting config for <command> (implies --stdin)"
-msgstr ""
-
-#: builtin/notes.c:517
-msgid "too few arguments"
-msgstr ""
-
-#: builtin/notes.c:538
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
-msgstr ""
-
-#: builtin/notes.c:550
-#, c-format
-msgid "missing notes on source object %s. Cannot copy."
-msgstr ""
-
-#: builtin/notes.c:603
-#, c-format
-msgid ""
-"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
-"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
-msgstr ""
-
-#: builtin/notes.c:698
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
-msgstr ""
-
-#: builtin/notes.c:700
-msgid "failed to delete ref NOTES_MERGE_REF"
-msgstr ""
-
-#: builtin/notes.c:702
-msgid "failed to remove 'git notes merge' worktree"
-msgstr ""
-
-#: builtin/notes.c:722
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
-msgstr ""
-
-#: builtin/notes.c:724
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
-msgstr ""
-
-#: builtin/notes.c:726
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
-msgstr ""
-
-#: builtin/notes.c:739
-msgid "failed to resolve NOTES_MERGE_REF"
-msgstr ""
-
-#: builtin/notes.c:742
-msgid "failed to finalize notes merge"
-msgstr ""
-
-#: builtin/notes.c:768
-#, c-format
-msgid "unknown notes merge strategy %s"
-msgstr ""
-
-#: builtin/notes.c:784
-msgid "General options"
-msgstr ""
-
-#: builtin/notes.c:786
-msgid "Merge options"
-msgstr ""
-
-#: builtin/notes.c:788
-msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
-msgstr ""
-
-#: builtin/notes.c:790
-msgid "Committing unmerged notes"
-msgstr ""
-
-#: builtin/notes.c:792
-msgid "finalize notes merge by committing unmerged notes"
-msgstr ""
-
-#: builtin/notes.c:794
-msgid "Aborting notes merge resolution"
-msgstr ""
-
-#: builtin/notes.c:796
-msgid "abort notes merge"
-msgstr ""
-
-#: builtin/notes.c:807
-msgid "cannot mix --commit, --abort or -s/--strategy"
-msgstr ""
-
-#: builtin/notes.c:812
-msgid "must specify a notes ref to merge"
-msgstr ""
-
-#: builtin/notes.c:836
-#, c-format
-msgid "unknown -s/--strategy: %s"
-msgstr ""
-
-#: builtin/notes.c:873
-#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
-msgstr ""
-
-#: builtin/notes.c:876
-#, c-format
-msgid "failed to store link to current notes ref (%s)"
-msgstr ""
-
-#: builtin/notes.c:878
-#, c-format
-msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
-"'git notes merge --commit', or abort the merge with 'git notes merge --"
-"abort'.\n"
-msgstr ""
-
-#: builtin/notes.c:897 builtin/tag.c:589
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr ""
-
-#: builtin/notes.c:900
-#, c-format
-msgid "Object %s has no note\n"
-msgstr ""
-
-#: builtin/notes.c:912
-msgid "attempt to remove non-existent note is not an error"
-msgstr ""
-
-#: builtin/notes.c:915
-msgid "read object names from the standard input"
-msgstr ""
-
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
-msgid "do not remove, show only"
-msgstr ""
-
-#: builtin/notes.c:955
-msgid "report pruned notes"
-msgstr ""
-
-#: builtin/notes.c:998
-msgid "notes-ref"
-msgstr ""
-
-#: builtin/notes.c:999
-msgid "use notes from <notes-ref>"
-msgstr ""
-
-#: builtin/notes.c:1034 builtin/stash.c:1735
-#, c-format
-msgid "unknown subcommand: %s"
-msgstr ""
-
-#: builtin/pack-objects.c:182
-msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
-msgstr ""
-
-#: builtin/pack-objects.c:183
-msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
-msgstr ""
-
-#: builtin/pack-objects.c:572
-#, c-format
-msgid ""
-"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
-"pack %s"
-msgstr ""
-
-#: builtin/pack-objects.c:580
-#, c-format
-msgid "bad packed object CRC for %s"
-msgstr ""
-
-#: builtin/pack-objects.c:591
-#, c-format
-msgid "corrupt packed object for %s"
-msgstr ""
-
-#: builtin/pack-objects.c:722
-#, c-format
-msgid "recursive delta detected for object %s"
-msgstr ""
-
-#: builtin/pack-objects.c:941
-#, c-format
-msgid "ordered %u objects, expected %<PRIu32>"
-msgstr ""
-
-#: builtin/pack-objects.c:1036
-#, c-format
-msgid "expected object at offset %<PRIuMAX> in pack %s"
-msgstr ""
-
-#: builtin/pack-objects.c:1155
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr ""
-
-#: builtin/pack-objects.c:1168
-msgid "Writing objects"
-msgstr ""
-
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
-#, c-format
-msgid "failed to stat %s"
-msgstr ""
-
-#: builtin/pack-objects.c:1281
-#, c-format
-msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
-msgstr ""
-
-#: builtin/pack-objects.c:1523
-msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr ""
-
-#: builtin/pack-objects.c:1971
-#, c-format
-msgid "delta base offset overflow in pack for %s"
-msgstr ""
-
-#: builtin/pack-objects.c:1980
-#, c-format
-msgid "delta base offset out of bound for %s"
-msgstr ""
-
-#: builtin/pack-objects.c:2261
-msgid "Counting objects"
-msgstr ""
-
-#: builtin/pack-objects.c:2426
-#, c-format
-msgid "unable to parse object header of %s"
-msgstr ""
-
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
-#, c-format
-msgid "object %s cannot be read"
-msgstr ""
-
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
-#, c-format
-msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
-msgstr ""
-
-#: builtin/pack-objects.c:2536
-msgid "suboptimal pack - out of memory"
-msgstr ""
-
-#: builtin/pack-objects.c:2851
-#, c-format
-msgid "Delta compression using up to %d threads"
-msgstr ""
-
-#: builtin/pack-objects.c:2990
-#, c-format
-msgid "unable to pack objects reachable from tag %s"
-msgstr ""
-
-#: builtin/pack-objects.c:3076
-msgid "Compressing objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3082
-msgid "inconsistency with delta count"
-msgstr ""
-
-#: builtin/pack-objects.c:3161
-#, c-format
-msgid ""
-"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
-"hash> <uri>' (got '%s')"
-msgstr ""
-
-#: builtin/pack-objects.c:3164
-#, c-format
-msgid ""
-"object already configured in another uploadpack.blobpackfileuri (got '%s')"
-msgstr ""
-
-#: builtin/pack-objects.c:3199
-#, c-format
-msgid "could not get type of object %s in pack %s"
-msgstr ""
-
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
-#, c-format
-msgid "could not find pack '%s'"
-msgstr ""
-
-#: builtin/pack-objects.c:3378
-#, c-format
-msgid ""
-"expected edge object ID, got garbage:\n"
-" %s"
-msgstr ""
-
-#: builtin/pack-objects.c:3384
-#, c-format
-msgid ""
-"expected object ID, got garbage:\n"
-" %s"
-msgstr ""
-
-#: builtin/pack-objects.c:3482
-msgid "invalid value for --missing"
-msgstr ""
-
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
-msgid "cannot open pack index"
-msgstr ""
-
-#: builtin/pack-objects.c:3572
-#, c-format
-msgid "loose object at %s could not be examined"
-msgstr ""
-
-#: builtin/pack-objects.c:3658
-msgid "unable to force loose object"
-msgstr ""
-
-#: builtin/pack-objects.c:3788
-#, c-format
-msgid "not a rev '%s'"
-msgstr ""
-
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
-#, c-format
-msgid "bad revision '%s'"
-msgstr ""
-
-#: builtin/pack-objects.c:3819
-msgid "unable to add recent objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3872
-#, c-format
-msgid "unsupported index version %s"
-msgstr ""
-
-#: builtin/pack-objects.c:3876
-#, c-format
-msgid "bad index version '%s'"
-msgstr ""
-
-#: builtin/pack-objects.c:3915
-msgid "<version>[,<offset>]"
-msgstr ""
-
-#: builtin/pack-objects.c:3916
-msgid "write the pack index file in the specified idx format version"
-msgstr ""
-
-#: builtin/pack-objects.c:3919
-msgid "maximum size of each output pack file"
-msgstr ""
-
-#: builtin/pack-objects.c:3921
-msgid "ignore borrowed objects from alternate object store"
-msgstr ""
-
-#: builtin/pack-objects.c:3923
-msgid "ignore packed objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3925
-msgid "limit pack window by objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3927
-msgid "limit pack window by memory in addition to object limit"
-msgstr ""
-
-#: builtin/pack-objects.c:3929
-msgid "maximum length of delta chain allowed in the resulting pack"
-msgstr ""
-
-#: builtin/pack-objects.c:3931
-msgid "reuse existing deltas"
-msgstr ""
-
-#: builtin/pack-objects.c:3933
-msgid "reuse existing objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3935
-msgid "use OFS_DELTA objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3937
-msgid "use threads when searching for best delta matches"
-msgstr ""
-
-#: builtin/pack-objects.c:3939
-msgid "do not create an empty pack output"
-msgstr ""
-
-#: builtin/pack-objects.c:3941
-msgid "read revision arguments from standard input"
-msgstr ""
-
-#: builtin/pack-objects.c:3943
-msgid "limit the objects to those that are not yet packed"
-msgstr ""
-
-#: builtin/pack-objects.c:3946
-msgid "include objects reachable from any reference"
-msgstr ""
-
-#: builtin/pack-objects.c:3949
-msgid "include objects referred by reflog entries"
-msgstr ""
-
-#: builtin/pack-objects.c:3952
-msgid "include objects referred to by the index"
-msgstr ""
-
-#: builtin/pack-objects.c:3955
-msgid "read packs from stdin"
-msgstr ""
-
-#: builtin/pack-objects.c:3957
-msgid "output pack to stdout"
-msgstr ""
-
-#: builtin/pack-objects.c:3959
-msgid "include tag objects that refer to objects to be packed"
-msgstr ""
-
-#: builtin/pack-objects.c:3961
-msgid "keep unreachable objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3963
-msgid "pack loose unreachable objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3965
-msgid "unpack unreachable objects newer than <time>"
-msgstr ""
-
-#: builtin/pack-objects.c:3968
-msgid "use the sparse reachability algorithm"
-msgstr ""
-
-#: builtin/pack-objects.c:3970
-msgid "create thin packs"
-msgstr ""
-
-#: builtin/pack-objects.c:3972
-msgid "create packs suitable for shallow fetches"
-msgstr ""
-
-#: builtin/pack-objects.c:3974
-msgid "ignore packs that have companion .keep file"
-msgstr ""
-
-#: builtin/pack-objects.c:3976
-msgid "ignore this pack"
-msgstr ""
-
-#: builtin/pack-objects.c:3978
-msgid "pack compression level"
-msgstr ""
-
-#: builtin/pack-objects.c:3980
-msgid "do not hide commits by grafts"
-msgstr ""
-
-#: builtin/pack-objects.c:3982
-msgid "use a bitmap index if available to speed up counting objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3984
-msgid "write a bitmap index together with the pack index"
-msgstr ""
-
-#: builtin/pack-objects.c:3988
-msgid "write a bitmap index if possible"
-msgstr ""
-
-#: builtin/pack-objects.c:3992
-msgid "handling for missing objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3995
-msgid "do not pack objects in promisor packfiles"
-msgstr ""
-
-#: builtin/pack-objects.c:3997
-msgid "respect islands during delta compression"
-msgstr ""
-
-#: builtin/pack-objects.c:3999
-msgid "protocol"
-msgstr ""
-
-#: builtin/pack-objects.c:4000
-msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
-msgstr ""
-
-#: builtin/pack-objects.c:4033
-#, c-format
-msgid "delta chain depth %d is too deep, forcing %d"
-msgstr ""
-
-#: builtin/pack-objects.c:4038
-#, c-format
-msgid "pack.deltaCacheLimit is too high, forcing %d"
-msgstr ""
-
-#: builtin/pack-objects.c:4094
-msgid "--max-pack-size cannot be used to build a pack for transfer"
-msgstr ""
-
-#: builtin/pack-objects.c:4096
-msgid "minimum pack size limit is 1 MiB"
-msgstr ""
-
-#: builtin/pack-objects.c:4101
-msgid "--thin cannot be used to build an indexable pack"
-msgstr ""
-
-#: builtin/pack-objects.c:4104
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr ""
-
-#: builtin/pack-objects.c:4110
-msgid "cannot use --filter without --stdout"
-msgstr ""
-
-#: builtin/pack-objects.c:4112
-msgid "cannot use --filter with --stdin-packs"
-msgstr ""
-
-#: builtin/pack-objects.c:4116
-msgid "cannot use internal rev list with --stdin-packs"
-msgstr ""
-
-#: builtin/pack-objects.c:4175
-msgid "Enumerating objects"
-msgstr ""
-
-#: builtin/pack-objects.c:4212
-#, c-format
-msgid ""
-"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
-"reused %<PRIu32>"
-msgstr ""
-
-#: builtin/pack-redundant.c:601
-msgid ""
-"'git pack-redundant' is nominated for removal.\n"
-"If you still use this command, please add an extra\n"
-"option, '--i-still-use-this', on the command line\n"
-"and let us know you still use it by sending an e-mail\n"
-"to <git@vger.kernel.org>. Thanks.\n"
-msgstr ""
-
-#: builtin/pack-refs.c:8
-msgid "git pack-refs [<options>]"
-msgstr ""
-
-#: builtin/pack-refs.c:16
-msgid "pack everything"
-msgstr ""
-
-#: builtin/pack-refs.c:17
-msgid "prune loose refs (default)"
-msgstr ""
-
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr ""
-
-#: builtin/prune.c:14
-msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
-msgstr ""
-
-#: builtin/prune.c:133
-msgid "report pruned objects"
-msgstr ""
-
-#: builtin/prune.c:136
-msgid "expire objects older than <time>"
-msgstr ""
-
-#: builtin/prune.c:138
-msgid "limit traversal to objects outside promisor packfiles"
-msgstr ""
-
-#: builtin/prune.c:152
-msgid "cannot prune in a precious-objects repo"
-msgstr ""
-
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr ""
-
-#: builtin/pull.c:67
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr ""
-
-#: builtin/pull.c:123
-msgid "control for recursive fetching of submodules"
-msgstr ""
-
-#: builtin/pull.c:127
-msgid "Options related to merging"
-msgstr ""
-
-#: builtin/pull.c:130
-msgid "incorporate changes by rebasing rather than merging"
-msgstr ""
-
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
-msgid "allow fast-forward"
-msgstr ""
-
-#: builtin/pull.c:167 parse-options.h:340
-msgid "automatically stash/stash pop before and after"
-msgstr ""
-
-#: builtin/pull.c:183
-msgid "Options related to fetching"
-msgstr ""
-
-#: builtin/pull.c:193
-msgid "force overwrite of local branch"
-msgstr ""
-
-#: builtin/pull.c:201
-msgid "number of submodules pulled in parallel"
-msgstr ""
-
-#: builtin/pull.c:317
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr ""
-
-#: builtin/pull.c:445
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
-msgstr ""
-
-#: builtin/pull.c:447
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
-msgstr ""
-
-#: builtin/pull.c:448
-msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
-msgstr ""
-
-#: builtin/pull.c:451
-#, c-format
-msgid ""
-"You asked to pull from the remote '%s', but did not specify\n"
-"a branch. Because this is not the default configured remote\n"
-"for your current branch, you must specify a branch on the command line."
-msgstr ""
-
-#: builtin/pull.c:456 builtin/rebase.c:1248
-msgid "You are not currently on a branch."
-msgstr ""
-
-#: builtin/pull.c:458 builtin/pull.c:473
-msgid "Please specify which branch you want to rebase against."
-msgstr ""
-
-#: builtin/pull.c:460 builtin/pull.c:475
-msgid "Please specify which branch you want to merge with."
-msgstr ""
-
-#: builtin/pull.c:461 builtin/pull.c:476
-msgid "See git-pull(1) for details."
-msgstr ""
-
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
-msgid "<remote>"
-msgstr ""
-
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
-msgid "<branch>"
-msgstr ""
-
-#: builtin/pull.c:471 builtin/rebase.c:1246
-msgid "There is no tracking information for the current branch."
-msgstr ""
-
-#: builtin/pull.c:480
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
-msgstr ""
-
-#: builtin/pull.c:485
-#, c-format
-msgid ""
-"Your configuration specifies to merge with the ref '%s'\n"
-"from the remote, but no such ref was fetched."
-msgstr ""
-
-#: builtin/pull.c:596
-#, c-format
-msgid "unable to access commit %s"
-msgstr ""
-
-#: builtin/pull.c:902
-msgid "ignoring --verify-signatures for rebase"
-msgstr ""
-
-#: builtin/pull.c:930
-msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
-"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
-" git config pull.rebase true # rebase\n"
-" git config pull.ff only # fast-forward only\n"
-"\n"
-"You can replace \"git config\" with \"git config --global\" to set a "
-"default\n"
-"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
-"or --ff-only on the command line to override the configured default per\n"
-"invocation.\n"
-msgstr ""
-
-#: builtin/pull.c:990
-msgid "Updating an unborn branch with changes added to the index."
-msgstr ""
-
-#: builtin/pull.c:994
-msgid "pull with rebase"
-msgstr ""
-
-#: builtin/pull.c:995
-msgid "please commit or stash them."
-msgstr ""
-
-#: builtin/pull.c:1020
-#, c-format
-msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
-msgstr ""
-
-#: builtin/pull.c:1026
-#, c-format
-msgid ""
-"Cannot fast-forward your working tree.\n"
-"After making sure that you saved anything precious from\n"
-"$ git diff %s\n"
-"output, run\n"
-"$ git reset --hard\n"
-"to recover."
-msgstr ""
-
-#: builtin/pull.c:1041
-msgid "Cannot merge multiple branches into empty head."
-msgstr ""
-
-#: builtin/pull.c:1045
-msgid "Cannot rebase onto multiple branches."
-msgstr ""
-
-#: builtin/pull.c:1065
-msgid "cannot rebase with locally recorded submodule modifications"
-msgstr ""
-
-#: builtin/push.c:19
-msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr ""
-
-#: builtin/push.c:111
-msgid "tag shorthand without <tag>"
-msgstr ""
-
-#: builtin/push.c:119
-msgid "--delete only accepts plain target ref names"
-msgstr ""
-
-#: builtin/push.c:164
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
-msgstr ""
-
-#: builtin/push.c:167
-#, c-format
-msgid ""
-"The upstream branch of your current branch does not match\n"
-"the name of your current branch. To push to the upstream branch\n"
-"on the remote, use\n"
-"\n"
-" git push %s HEAD:%s\n"
-"\n"
-"To push to the branch of the same name on the remote, use\n"
-"\n"
-" git push %s HEAD\n"
-"%s"
-msgstr ""
-
-#: builtin/push.c:182
-#, c-format
-msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
-"\n"
-" git push %s HEAD:<name-of-remote-branch>\n"
-msgstr ""
-
-#: builtin/push.c:191
-#, c-format
-msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
-"\n"
-" git push --set-upstream %s %s\n"
-msgstr ""
-
-#: builtin/push.c:199
-#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr ""
-
-#: builtin/push.c:217
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-
-#: builtin/push.c:243
-#, c-format
-msgid ""
-"You are pushing to remote '%s', which is not the upstream of\n"
-"your current branch '%s', without telling me what to push\n"
-"to update which remote branch."
-msgstr ""
-
-#: builtin/push.c:258
-msgid ""
-"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Integrate the remote changes (e.g.\n"
-"'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-
-#: builtin/push.c:264
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and integrate the remote changes\n"
-"(e.g. 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-
-#: builtin/push.c:270
-msgid ""
-"Updates were rejected because the remote contains work that you do\n"
-"not have locally. This is usually caused by another repository pushing\n"
-"to the same ref. You may want to first integrate the remote changes\n"
-"(e.g., 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-
-#: builtin/push.c:277
-msgid "Updates were rejected because the tag already exists in the remote."
-msgstr ""
-
-#: builtin/push.c:280
-msgid ""
-"You cannot update a remote ref that points at a non-commit object,\n"
-"or update a remote ref to make it point at a non-commit object,\n"
-"without using the '--force' option.\n"
-msgstr ""
-
-#: builtin/push.c:285
-msgid ""
-"Updates were rejected because the tip of the remote-tracking\n"
-"branch has been updated since the last checkout. You may want\n"
-"to integrate those changes locally (e.g., 'git pull ...')\n"
-"before forcing an update.\n"
-msgstr ""
-
-#: builtin/push.c:355
-#, c-format
-msgid "Pushing to %s\n"
-msgstr ""
-
-#: builtin/push.c:362
-#, c-format
-msgid "failed to push some refs to '%s'"
-msgstr ""
-
-#: builtin/push.c:544
-msgid "repository"
-msgstr ""
-
-#: builtin/push.c:545 builtin/send-pack.c:189
-msgid "push all refs"
-msgstr ""
-
-#: builtin/push.c:546 builtin/send-pack.c:191
-msgid "mirror all refs"
-msgstr ""
-
-#: builtin/push.c:548
-msgid "delete refs"
-msgstr ""
-
-#: builtin/push.c:549
-msgid "push tags (can't be used with --all or --mirror)"
-msgstr ""
-
-#: builtin/push.c:552 builtin/send-pack.c:192
-msgid "force updates"
-msgstr ""
-
-#: builtin/push.c:553 builtin/send-pack.c:204
-msgid "<refname>:<expect>"
-msgstr ""
-
-#: builtin/push.c:554 builtin/send-pack.c:205
-msgid "require old value of ref to be at this value"
-msgstr ""
-
-#: builtin/push.c:557 builtin/send-pack.c:208
-msgid "require remote updates to be integrated locally"
-msgstr ""
-
-#: builtin/push.c:560
-msgid "control recursive pushing of submodules"
-msgstr ""
-
-#: builtin/push.c:561 builtin/send-pack.c:199
-msgid "use thin pack"
-msgstr ""
-
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
-msgid "receive pack program"
-msgstr ""
-
-#: builtin/push.c:564
-msgid "set upstream for git pull/status"
-msgstr ""
-
-#: builtin/push.c:567
-msgid "prune locally removed refs"
-msgstr ""
-
-#: builtin/push.c:569
-msgid "bypass pre-push hook"
-msgstr ""
-
-#: builtin/push.c:570
-msgid "push missing but relevant tags"
-msgstr ""
-
-#: builtin/push.c:572 builtin/send-pack.c:193
-msgid "GPG sign the push"
-msgstr ""
-
-#: builtin/push.c:574 builtin/send-pack.c:200
-msgid "request atomic transaction on remote side"
-msgstr ""
-
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr ""
-
-#: builtin/push.c:594
-msgid "--delete doesn't make sense without any refs"
-msgstr ""
-
-#: builtin/push.c:614
-#, c-format
-msgid "bad repository '%s'"
-msgstr ""
-
-#: builtin/push.c:615
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-" git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-" git push <name>\n"
-msgstr ""
-
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr ""
-
-#: builtin/push.c:632
-msgid "--all can't be combined with refspecs"
-msgstr ""
-
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr ""
-
-#: builtin/push.c:638
-msgid "--mirror can't be combined with refspecs"
-msgstr ""
-
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr ""
-
-#: builtin/push.c:648
-msgid "push options must not have new line characters"
-msgstr ""
-
-#: builtin/range-diff.c:9
-msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
-msgstr ""
-
-#: builtin/range-diff.c:10
-msgid "git range-diff [<options>] <old-tip>...<new-tip>"
-msgstr ""
-
-#: builtin/range-diff.c:11
-msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
-msgstr ""
-
-#: builtin/range-diff.c:30
-msgid "use simple diff colors"
-msgstr ""
-
-#: builtin/range-diff.c:32
-msgid "notes"
-msgstr ""
-
-#: builtin/range-diff.c:32
-msgid "passed to 'git log'"
-msgstr ""
-
-#: builtin/range-diff.c:35
-msgid "only emit output related to the first range"
-msgstr ""
-
-#: builtin/range-diff.c:37
-msgid "only emit output related to the second range"
-msgstr ""
-
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
-#, c-format
-msgid "not a commit range: '%s'"
-msgstr ""
-
-#: builtin/range-diff.c:74
-msgid "single arg format must be symmetric range"
-msgstr ""
-
-#: builtin/range-diff.c:89
-msgid "need two commit ranges"
-msgstr ""
-
-#: builtin/read-tree.c:41
-msgid ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
-msgstr ""
-
-#: builtin/read-tree.c:124
-msgid "write resulting index to <file>"
-msgstr ""
-
-#: builtin/read-tree.c:127
-msgid "only empty the index"
-msgstr ""
-
-#: builtin/read-tree.c:129
-msgid "Merging"
-msgstr ""
-
-#: builtin/read-tree.c:131
-msgid "perform a merge in addition to a read"
-msgstr ""
-
-#: builtin/read-tree.c:133
-msgid "3-way merge if no file level merging required"
-msgstr ""
-
-#: builtin/read-tree.c:135
-msgid "3-way merge in presence of adds and removes"
-msgstr ""
-
-#: builtin/read-tree.c:137
-msgid "same as -m, but discard unmerged entries"
-msgstr ""
-
-#: builtin/read-tree.c:138
-msgid "<subdirectory>/"
-msgstr ""
-
-#: builtin/read-tree.c:139
-msgid "read the tree into the index under <subdirectory>/"
-msgstr ""
-
-#: builtin/read-tree.c:142
-msgid "update working tree with merge result"
-msgstr ""
-
-#: builtin/read-tree.c:144
-msgid "gitignore"
-msgstr ""
-
-#: builtin/read-tree.c:145
-msgid "allow explicitly ignored files to be overwritten"
-msgstr ""
-
-#: builtin/read-tree.c:148
-msgid "don't check the working tree after merging"
-msgstr ""
-
-#: builtin/read-tree.c:149
-msgid "don't update the index or the work tree"
-msgstr ""
-
-#: builtin/read-tree.c:151
-msgid "skip applying sparse checkout filter"
-msgstr ""
-
-#: builtin/read-tree.c:153
-msgid "debug unpack-trees"
-msgstr ""
-
-#: builtin/read-tree.c:157
-msgid "suppress feedback messages"
-msgstr ""
-
-#: builtin/read-tree.c:188
-msgid "You need to resolve your current index first"
-msgstr ""
-
-#: builtin/rebase.c:35
-msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
-"[<upstream> [<branch>]]"
-msgstr ""
-
-#: builtin/rebase.c:37
-msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
-msgstr ""
-
-#: builtin/rebase.c:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr ""
-
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr ""
-
-#: builtin/rebase.c:311
-#, c-format
-msgid "could not create temporary %s"
-msgstr ""
-
-#: builtin/rebase.c:317
-msgid "could not mark as interactive"
-msgstr ""
-
-#: builtin/rebase.c:370
-msgid "could not generate todo list"
-msgstr ""
-
-#: builtin/rebase.c:412
-msgid "a base commit must be provided with --upstream or --onto"
-msgstr ""
-
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr ""
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr ""
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr ""
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr ""
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr ""
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr ""
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr ""
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr ""
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr ""
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr ""
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr ""
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr ""
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr ""
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr ""
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr ""
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr ""
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr ""
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr ""
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr ""
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr ""
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr ""
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr ""
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr ""
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr ""
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr ""
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr ""
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr ""
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr ""
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr ""
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr ""
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr ""
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr ""
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr ""
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr ""
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr ""
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr ""
-
-#: builtin/rebase.c:582
-#, c-format
-msgid "%s requires the merge backend"
-msgstr ""
-
-#: builtin/rebase.c:625
-#, c-format
-msgid "could not get 'onto': '%s'"
-msgstr ""
-
-#: builtin/rebase.c:642
-#, c-format
-msgid "invalid orig-head: '%s'"
-msgstr ""
-
-#: builtin/rebase.c:667
-#, c-format
-msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
-msgstr ""
-
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
-msgid ""
-"Resolve all conflicts manually, mark them as resolved with\n"
-"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
-"You can instead skip this commit: run \"git rebase --skip\".\n"
-"To abort and get back to the state before \"git rebase\", run \"git rebase --"
-"abort\"."
-msgstr ""
-
-#: builtin/rebase.c:896
-#, c-format
-msgid ""
-"\n"
-"git encountered an error while preparing the patches to replay\n"
-"these revisions:\n"
-"\n"
-" %s\n"
-"\n"
-"As a result, git cannot rebase them."
-msgstr ""
-
-#: builtin/rebase.c:1222
-#, c-format
-msgid ""
-"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
-"\"."
-msgstr ""
-
-#: builtin/rebase.c:1240
-#, c-format
-msgid ""
-"%s\n"
-"Please specify which branch you want to rebase against.\n"
-"See git-rebase(1) for details.\n"
-"\n"
-" git rebase '<branch>'\n"
-"\n"
-msgstr ""
-
-#: builtin/rebase.c:1256
-#, c-format
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-" git branch --set-upstream-to=%s/<branch> %s\n"
-"\n"
-msgstr ""
-
-#: builtin/rebase.c:1286
-msgid "exec commands cannot contain newlines"
-msgstr ""
-
-#: builtin/rebase.c:1290
-msgid "empty exec command"
-msgstr ""
-
-#: builtin/rebase.c:1319
-msgid "rebase onto given branch instead of upstream"
-msgstr ""
-
-#: builtin/rebase.c:1321
-msgid "use the merge-base of upstream and branch as the current base"
-msgstr ""
-
-#: builtin/rebase.c:1323
-msgid "allow pre-rebase hook to run"
-msgstr ""
-
-#: builtin/rebase.c:1325
-msgid "be quiet. implies --no-stat"
-msgstr ""
-
-#: builtin/rebase.c:1331
-msgid "do not show diffstat of what changed upstream"
-msgstr ""
-
-#: builtin/rebase.c:1334
-msgid "add a Signed-off-by trailer to each commit"
-msgstr ""
-
-#: builtin/rebase.c:1337
-msgid "make committer date match author date"
-msgstr ""
-
-#: builtin/rebase.c:1339
-msgid "ignore author date and use current date"
-msgstr ""
-
-#: builtin/rebase.c:1341
-msgid "synonym of --reset-author-date"
-msgstr ""
-
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
-msgid "passed to 'git apply'"
-msgstr ""
-
-#: builtin/rebase.c:1345
-msgid "ignore changes in whitespace"
-msgstr ""
-
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
-msgid "cherry-pick all commits, even if unchanged"
-msgstr ""
-
-#: builtin/rebase.c:1354
-msgid "continue"
-msgstr ""
-
-#: builtin/rebase.c:1357
-msgid "skip current patch and continue"
-msgstr ""
-
-#: builtin/rebase.c:1359
-msgid "abort and check out the original branch"
-msgstr ""
-
-#: builtin/rebase.c:1362
-msgid "abort but keep HEAD where it is"
-msgstr ""
-
-#: builtin/rebase.c:1363
-msgid "edit the todo list during an interactive rebase"
-msgstr ""
-
-#: builtin/rebase.c:1366
-msgid "show the patch file being applied or merged"
-msgstr ""
-
-#: builtin/rebase.c:1369
-msgid "use apply strategies to rebase"
-msgstr ""
-
-#: builtin/rebase.c:1373
-msgid "use merging strategies to rebase"
-msgstr ""
-
-#: builtin/rebase.c:1377
-msgid "let the user edit the list of commits to rebase"
-msgstr ""
-
-#: builtin/rebase.c:1381
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr ""
-
-#: builtin/rebase.c:1386
-msgid "how to handle commits that become empty"
-msgstr ""
-
-#: builtin/rebase.c:1393
-msgid "move commits that begin with squash!/fixup! under -i"
-msgstr ""
-
-#: builtin/rebase.c:1400
-msgid "add exec lines after each commit of the editable list"
-msgstr ""
-
-#: builtin/rebase.c:1404
-msgid "allow rebasing commits with empty messages"
-msgstr ""
-
-#: builtin/rebase.c:1408
-msgid "try to rebase merges instead of skipping them"
-msgstr ""
-
-#: builtin/rebase.c:1411
-msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr ""
-
-#: builtin/rebase.c:1413
-msgid "use the given merge strategy"
-msgstr ""
-
-#: builtin/rebase.c:1415 builtin/revert.c:115
-msgid "option"
-msgstr ""
-
-#: builtin/rebase.c:1416
-msgid "pass the argument through to the merge strategy"
-msgstr ""
-
-#: builtin/rebase.c:1419
-msgid "rebase all reachable commits up to the root(s)"
-msgstr ""
-
-#: builtin/rebase.c:1424
-msgid "apply all changes, even those already present upstream"
-msgstr ""
-
-#: builtin/rebase.c:1442
-msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr ""
-
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr ""
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr ""
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr ""
-
-#: builtin/rebase.c:1497
-msgid "No rebase in progress?"
-msgstr ""
-
-#: builtin/rebase.c:1501
-msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr ""
-
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
-msgid "Cannot read HEAD"
-msgstr ""
-
-#: builtin/rebase.c:1536
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
-msgstr ""
-
-#: builtin/rebase.c:1555
-msgid "could not discard worktree changes"
-msgstr ""
-
-#: builtin/rebase.c:1574
-#, c-format
-msgid "could not move back to %s"
-msgstr ""
-
-#: builtin/rebase.c:1620
-#, c-format
-msgid ""
-"It seems that there is already a %s directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t%s\n"
-"If that is not the case, please\n"
-"\t%s\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there.\n"
-msgstr ""
-
-#: builtin/rebase.c:1648
-msgid "switch `C' expects a numerical value"
-msgstr ""
-
-#: builtin/rebase.c:1690
-#, c-format
-msgid "Unknown mode: %s"
-msgstr ""
-
-#: builtin/rebase.c:1729
-msgid "--strategy requires --merge or --interactive"
-msgstr ""
-
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr ""
-
-#: builtin/rebase.c:1772
-#, c-format
-msgid "Unknown rebase backend: %s"
-msgstr ""
-
-#: builtin/rebase.c:1802
-msgid "--reschedule-failed-exec requires --exec or --interactive"
-msgstr ""
-
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr ""
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-
-#: builtin/rebase.c:1850
-#, c-format
-msgid "invalid upstream '%s'"
-msgstr ""
-
-#: builtin/rebase.c:1856
-msgid "Could not create new root commit"
-msgstr ""
-
-#: builtin/rebase.c:1882
-#, c-format
-msgid "'%s': need exactly one merge base with branch"
-msgstr ""
-
-#: builtin/rebase.c:1885
-#, c-format
-msgid "'%s': need exactly one merge base"
-msgstr ""
-
-#: builtin/rebase.c:1893
-#, c-format
-msgid "Does not point to a valid commit '%s'"
-msgstr ""
-
-#: builtin/rebase.c:1921
-#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr ""
-
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
-#, c-format
-msgid "No such ref: %s"
-msgstr ""
-
-#: builtin/rebase.c:1940
-msgid "Could not resolve HEAD to a revision"
-msgstr ""
-
-#: builtin/rebase.c:1961
-msgid "Please commit or stash them."
-msgstr ""
-
-#: builtin/rebase.c:1997
-#, c-format
-msgid "could not switch to %s"
-msgstr ""
-
-#: builtin/rebase.c:2008
-msgid "HEAD is up to date."
-msgstr ""
-
-#: builtin/rebase.c:2010
-#, c-format
-msgid "Current branch %s is up to date.\n"
-msgstr ""
-
-#: builtin/rebase.c:2018
-msgid "HEAD is up to date, rebase forced."
-msgstr ""
-
-#: builtin/rebase.c:2020
-#, c-format
-msgid "Current branch %s is up to date, rebase forced.\n"
-msgstr ""
-
-#: builtin/rebase.c:2028
-msgid "The pre-rebase hook refused to rebase."
-msgstr ""
-
-#: builtin/rebase.c:2035
-#, c-format
-msgid "Changes to %s:\n"
-msgstr ""
-
-#: builtin/rebase.c:2038
-#, c-format
-msgid "Changes from %s to %s:\n"
-msgstr ""
-
-#: builtin/rebase.c:2063
-#, c-format
-msgid "First, rewinding head to replay your work on top of it...\n"
-msgstr ""
-
-#: builtin/rebase.c:2072
-msgid "Could not detach HEAD"
-msgstr ""
-
-#: builtin/rebase.c:2081
-#, c-format
-msgid "Fast-forwarded %s to %s.\n"
-msgstr ""
-
-#: builtin/receive-pack.c:34
-msgid "git receive-pack <git-dir>"
-msgstr ""
-
-#: builtin/receive-pack.c:1275
-msgid ""
-"By default, updating the current branch in a non-bare repository\n"
-"is denied, because it will make the index and work tree inconsistent\n"
-"with what you pushed, and will require 'git reset --hard' to match\n"
-"the work tree to HEAD.\n"
-"\n"
-"You can set the 'receive.denyCurrentBranch' configuration variable\n"
-"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
-"its current branch; however, this is not recommended unless you\n"
-"arranged to update its work tree to match what you pushed in some\n"
-"other way.\n"
-"\n"
-"To squelch this message and still keep the default behaviour, set\n"
-"'receive.denyCurrentBranch' configuration variable to 'refuse'."
-msgstr ""
-
-#: builtin/receive-pack.c:1295
-msgid ""
-"By default, deleting the current branch is denied, because the next\n"
-"'git clone' won't result in any file checked out, causing confusion.\n"
-"\n"
-"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
-"'warn' or 'ignore' in the remote repository to allow deleting the\n"
-"current branch, with or without a warning message.\n"
-"\n"
-"To squelch this message, you can set it to 'refuse'."
-msgstr ""
-
-#: builtin/receive-pack.c:2478
-msgid "quiet"
-msgstr ""
-
-#: builtin/receive-pack.c:2492
-msgid "You must specify a directory."
-msgstr ""
-
-#: builtin/reflog.c:17
-msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
-msgstr ""
-
-#: builtin/reflog.c:22
-msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
-msgstr ""
-
-#: builtin/reflog.c:25
-msgid "git reflog exists <ref>"
-msgstr ""
-
-#: builtin/reflog.c:568 builtin/reflog.c:573
-#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr ""
-
-#: builtin/reflog.c:609
-#, c-format
-msgid "Marking reachable objects..."
-msgstr ""
-
-#: builtin/reflog.c:647
-#, c-format
-msgid "%s points nowhere!"
-msgstr ""
-
-#: builtin/reflog.c:699
-msgid "no reflog specified to delete"
-msgstr ""
-
-#: builtin/reflog.c:708
-#, c-format
-msgid "not a reflog: %s"
-msgstr ""
-
-#: builtin/reflog.c:713
-#, c-format
-msgid "no reflog for '%s'"
-msgstr ""
-
-#: builtin/reflog.c:759
-#, c-format
-msgid "invalid ref format: %s"
-msgstr ""
-
-#: builtin/reflog.c:768
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr ""
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr ""
-
-#: builtin/remote.c:18
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
-msgstr ""
-
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr ""
-
-#: builtin/remote.c:20 builtin/remote.c:44
-msgid "git remote remove <name>"
-msgstr ""
-
-#: builtin/remote.c:21 builtin/remote.c:49
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
-msgstr ""
-
-#: builtin/remote.c:22
-msgid "git remote [-v | --verbose] show [-n] <name>"
-msgstr ""
-
-#: builtin/remote.c:23
-msgid "git remote prune [-n | --dry-run] <name>"
-msgstr ""
-
-#: builtin/remote.c:24
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
-msgstr ""
-
-#: builtin/remote.c:25
-msgid "git remote set-branches [--add] <name> <branch>..."
-msgstr ""
-
-#: builtin/remote.c:26 builtin/remote.c:75
-msgid "git remote get-url [--push] [--all] <name>"
-msgstr ""
-
-#: builtin/remote.c:27 builtin/remote.c:80
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
-msgstr ""
-
-#: builtin/remote.c:28 builtin/remote.c:81
-msgid "git remote set-url --add <name> <newurl>"
-msgstr ""
-
-#: builtin/remote.c:29 builtin/remote.c:82
-msgid "git remote set-url --delete <name> <url>"
-msgstr ""
-
-#: builtin/remote.c:34
-msgid "git remote add [<options>] <name> <url>"
-msgstr ""
-
-#: builtin/remote.c:54
-msgid "git remote set-branches <name> <branch>..."
-msgstr ""
-
-#: builtin/remote.c:55
-msgid "git remote set-branches --add <name> <branch>..."
-msgstr ""
-
-#: builtin/remote.c:60
-msgid "git remote show [<options>] <name>"
-msgstr ""
-
-#: builtin/remote.c:65
-msgid "git remote prune [<options>] <name>"
-msgstr ""
-
-#: builtin/remote.c:70
-msgid "git remote update [<options>] [<group> | <remote>]..."
-msgstr ""
-
-#: builtin/remote.c:99
-#, c-format
-msgid "Updating %s"
-msgstr ""
-
-#: builtin/remote.c:131
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
-msgstr ""
-
-#: builtin/remote.c:148
-#, c-format
-msgid "unknown mirror argument: %s"
-msgstr ""
-
-#: builtin/remote.c:164
-msgid "fetch the remote branches"
-msgstr ""
-
-#: builtin/remote.c:166
-msgid "import all tags and associated objects when fetching"
-msgstr ""
-
-#: builtin/remote.c:169
-msgid "or do not fetch any tag at all (--no-tags)"
-msgstr ""
-
-#: builtin/remote.c:171
-msgid "branch(es) to track"
-msgstr ""
-
-#: builtin/remote.c:172
-msgid "master branch"
-msgstr ""
-
-#: builtin/remote.c:174
-msgid "set up remote as a mirror to push to or fetch from"
-msgstr ""
-
-#: builtin/remote.c:186
-msgid "specifying a master branch makes no sense with --mirror"
-msgstr ""
-
-#: builtin/remote.c:188
-msgid "specifying branches to track makes sense only with fetch mirrors"
-msgstr ""
-
-#: builtin/remote.c:195 builtin/remote.c:700
-#, c-format
-msgid "remote %s already exists."
-msgstr ""
-
-#: builtin/remote.c:240
-#, c-format
-msgid "Could not setup master '%s'"
-msgstr ""
-
-#: builtin/remote.c:355
-#, c-format
-msgid "Could not get fetch map for refspec %s"
-msgstr ""
-
-#: builtin/remote.c:454 builtin/remote.c:462
-msgid "(matching)"
-msgstr ""
-
-#: builtin/remote.c:466
-msgid "(delete)"
-msgstr ""
-
-#: builtin/remote.c:655
-#, c-format
-msgid "could not set '%s'"
-msgstr ""
-
-#: builtin/remote.c:660
-#, c-format
-msgid ""
-"The %s configuration remote.pushDefault in:\n"
-"\t%s:%d\n"
-"now names the non-existent remote '%s'"
-msgstr ""
-
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
-#, c-format
-msgid "No such remote: '%s'"
-msgstr ""
-
-#: builtin/remote.c:710
-#, c-format
-msgid "Could not rename config section '%s' to '%s'"
-msgstr ""
-
-#: builtin/remote.c:730
-#, c-format
-msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
-msgstr ""
-
-#: builtin/remote.c:770
-#, c-format
-msgid "deleting '%s' failed"
-msgstr ""
-
-#: builtin/remote.c:804
-#, c-format
-msgid "creating '%s' failed"
-msgstr ""
-
-#: builtin/remote.c:882
-msgid ""
-"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
-"to delete it, use:"
-msgid_plural ""
-"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
-"to delete them, use:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:896
-#, c-format
-msgid "Could not remove config section '%s'"
-msgstr ""
-
-#: builtin/remote.c:999
-#, c-format
-msgid " new (next fetch will store in remotes/%s)"
-msgstr ""
-
-#: builtin/remote.c:1002
-msgid " tracked"
-msgstr ""
-
-#: builtin/remote.c:1004
-msgid " stale (use 'git remote prune' to remove)"
-msgstr ""
-
-#: builtin/remote.c:1006
-msgid " ???"
-msgstr ""
-
-#: builtin/remote.c:1047
-#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
-msgstr ""
-
-#: builtin/remote.c:1056
-#, c-format
-msgid "rebases interactively onto remote %s"
-msgstr ""
-
-#: builtin/remote.c:1058
-#, c-format
-msgid "rebases interactively (with merges) onto remote %s"
-msgstr ""
-
-#: builtin/remote.c:1061
-#, c-format
-msgid "rebases onto remote %s"
-msgstr ""
-
-#: builtin/remote.c:1065
-#, c-format
-msgid " merges with remote %s"
-msgstr ""
-
-#: builtin/remote.c:1068
-#, c-format
-msgid "merges with remote %s"
-msgstr ""
-
-#: builtin/remote.c:1071
-#, c-format
-msgid "%-*s and with remote %s\n"
-msgstr ""
-
-#: builtin/remote.c:1114
-msgid "create"
-msgstr ""
-
-#: builtin/remote.c:1117
-msgid "delete"
-msgstr ""
-
-#: builtin/remote.c:1121
-msgid "up to date"
-msgstr ""
-
-#: builtin/remote.c:1124
-msgid "fast-forwardable"
-msgstr ""
-
-#: builtin/remote.c:1127
-msgid "local out of date"
-msgstr ""
-
-#: builtin/remote.c:1134
-#, c-format
-msgid " %-*s forces to %-*s (%s)"
-msgstr ""
-
-#: builtin/remote.c:1137
-#, c-format
-msgid " %-*s pushes to %-*s (%s)"
-msgstr ""
-
-#: builtin/remote.c:1141
-#, c-format
-msgid " %-*s forces to %s"
-msgstr ""
-
-#: builtin/remote.c:1144
-#, c-format
-msgid " %-*s pushes to %s"
-msgstr ""
-
-#: builtin/remote.c:1212
-msgid "do not query remotes"
-msgstr ""
-
-#: builtin/remote.c:1239
-#, c-format
-msgid "* remote %s"
-msgstr ""
-
-#: builtin/remote.c:1240
-#, c-format
-msgid " Fetch URL: %s"
-msgstr ""
-
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
-msgid "(no URL)"
-msgstr ""
-
-#. TRANSLATORS: the colon ':' should align
-#. with the one in " Fetch URL: %s"
-#. translation.
-#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
-#, c-format
-msgid " Push URL: %s"
-msgstr ""
-
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
-#, c-format
-msgid " HEAD branch: %s"
-msgstr ""
-
-#: builtin/remote.c:1259
-msgid "(not queried)"
-msgstr ""
-
-#: builtin/remote.c:1261
-msgid "(unknown)"
-msgstr ""
-
-#: builtin/remote.c:1265
-#, c-format
-msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
-msgstr ""
-
-#: builtin/remote.c:1277
-#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1280 builtin/remote.c:1306
-msgid " (status not queried)"
-msgstr ""
-
-#: builtin/remote.c:1289
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1297
-msgid " Local refs will be mirrored by 'git push'"
-msgstr ""
-
-#: builtin/remote.c:1303
-#, c-format
-msgid " Local ref configured for 'git push'%s:"
-msgid_plural " Local refs configured for 'git push'%s:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1324
-msgid "set refs/remotes/<name>/HEAD according to remote"
-msgstr ""
-
-#: builtin/remote.c:1326
-msgid "delete refs/remotes/<name>/HEAD"
-msgstr ""
-
-#: builtin/remote.c:1341
-msgid "Cannot determine remote HEAD"
-msgstr ""
-
-#: builtin/remote.c:1343
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
-msgstr ""
-
-#: builtin/remote.c:1353
-#, c-format
-msgid "Could not delete %s"
-msgstr ""
-
-#: builtin/remote.c:1361
-#, c-format
-msgid "Not a valid ref: %s"
-msgstr ""
-
-#: builtin/remote.c:1363
-#, c-format
-msgid "Could not setup %s"
-msgstr ""
-
-#: builtin/remote.c:1381
-#, c-format
-msgid " %s will become dangling!"
-msgstr ""
-
-#: builtin/remote.c:1382
-#, c-format
-msgid " %s has become dangling!"
-msgstr ""
-
-#: builtin/remote.c:1392
-#, c-format
-msgid "Pruning %s"
-msgstr ""
-
-#: builtin/remote.c:1393
-#, c-format
-msgid "URL: %s"
-msgstr ""
-
-#: builtin/remote.c:1409
-#, c-format
-msgid " * [would prune] %s"
-msgstr ""
-
-#: builtin/remote.c:1412
-#, c-format
-msgid " * [pruned] %s"
-msgstr ""
-
-#: builtin/remote.c:1457
-msgid "prune remotes after fetching"
-msgstr ""
-
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
-#, c-format
-msgid "No such remote '%s'"
-msgstr ""
-
-#: builtin/remote.c:1539
-msgid "add branch"
-msgstr ""
-
-#: builtin/remote.c:1546
-msgid "no remote specified"
-msgstr ""
-
-#: builtin/remote.c:1563
-msgid "query push URLs rather than fetch URLs"
-msgstr ""
-
-#: builtin/remote.c:1565
-msgid "return all URLs"
-msgstr ""
-
-#: builtin/remote.c:1595
-#, c-format
-msgid "no URLs configured for remote '%s'"
-msgstr ""
-
-#: builtin/remote.c:1621
-msgid "manipulate push URLs"
-msgstr ""
-
-#: builtin/remote.c:1623
-msgid "add URL"
-msgstr ""
-
-#: builtin/remote.c:1625
-msgid "delete URLs"
-msgstr ""
-
-#: builtin/remote.c:1632
-msgid "--add --delete doesn't make sense"
-msgstr ""
-
-#: builtin/remote.c:1673
-#, c-format
-msgid "Invalid old URL pattern: %s"
-msgstr ""
-
-#: builtin/remote.c:1681
-#, c-format
-msgid "No such URL found: %s"
-msgstr ""
-
-#: builtin/remote.c:1683
-msgid "Will not delete all non-push URLs"
-msgstr ""
-
-#: builtin/repack.c:26
-msgid "git repack [<options>]"
-msgstr ""
-
-#: builtin/repack.c:31
-msgid ""
-"Incremental repacks are incompatible with bitmap indexes. Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
-msgstr ""
-
-#: builtin/repack.c:198
-msgid "could not start pack-objects to repack promisor objects"
-msgstr ""
-
-#: builtin/repack.c:270 builtin/repack.c:630
-msgid "repack: Expecting full hex object ID lines only from pack-objects."
-msgstr ""
-
-#: builtin/repack.c:294
-msgid "could not finish pack-objects to repack promisor objects"
-msgstr ""
-
-#: builtin/repack.c:309
-#, c-format
-msgid "cannot open index for %s"
-msgstr ""
-
-#: builtin/repack.c:368
-#, c-format
-msgid "pack %s too large to consider in geometric progression"
-msgstr ""
-
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
-#, c-format
-msgid "pack %s too large to roll up"
-msgstr ""
-
-#: builtin/repack.c:460
-msgid "pack everything in a single pack"
-msgstr ""
-
-#: builtin/repack.c:462
-msgid "same as -a, and turn unreachable objects loose"
-msgstr ""
-
-#: builtin/repack.c:465
-msgid "remove redundant packs, and run git-prune-packed"
-msgstr ""
-
-#: builtin/repack.c:467
-msgid "pass --no-reuse-delta to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:469
-msgid "pass --no-reuse-object to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:471
-msgid "do not run git-update-server-info"
-msgstr ""
-
-#: builtin/repack.c:474
-msgid "pass --local to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:476
-msgid "write bitmap index"
-msgstr ""
-
-#: builtin/repack.c:478
-msgid "pass --delta-islands to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:479
-msgid "approxidate"
-msgstr ""
-
-#: builtin/repack.c:480
-msgid "with -A, do not loosen objects older than this"
-msgstr ""
-
-#: builtin/repack.c:482
-msgid "with -a, repack unreachable objects"
-msgstr ""
-
-#: builtin/repack.c:484
-msgid "size of the window used for delta compression"
-msgstr ""
-
-#: builtin/repack.c:485 builtin/repack.c:491
-msgid "bytes"
-msgstr ""
-
-#: builtin/repack.c:486
-msgid "same as the above, but limit memory size instead of entries count"
-msgstr ""
-
-#: builtin/repack.c:488
-msgid "limits the maximum delta depth"
-msgstr ""
-
-#: builtin/repack.c:490
-msgid "limits the maximum number of threads"
-msgstr ""
-
-#: builtin/repack.c:492
-msgid "maximum size of each packfile"
-msgstr ""
-
-#: builtin/repack.c:494
-msgid "repack objects in packs marked with .keep"
-msgstr ""
-
-#: builtin/repack.c:496
-msgid "do not repack this pack"
-msgstr ""
-
-#: builtin/repack.c:498
-msgid "find a geometric progression with factor <N>"
-msgstr ""
-
-#: builtin/repack.c:508
-msgid "cannot delete packs in a precious-objects repo"
-msgstr ""
-
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr ""
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr ""
-
-#: builtin/repack.c:639
-msgid "Nothing new to pack."
-msgstr ""
-
-#: builtin/repack.c:669
-#, c-format
-msgid "missing required file: %s"
-msgstr ""
-
-#: builtin/repack.c:671
-#, c-format
-msgid "could not unlink: %s"
-msgstr ""
-
-#: builtin/replace.c:22
-msgid "git replace [-f] <object> <replacement>"
-msgstr ""
-
-#: builtin/replace.c:23
-msgid "git replace [-f] --edit <object>"
-msgstr ""
-
-#: builtin/replace.c:24
-msgid "git replace [-f] --graft <commit> [<parent>...]"
-msgstr ""
-
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr ""
-
-#: builtin/replace.c:26
-msgid "git replace -d <object>..."
-msgstr ""
-
-#: builtin/replace.c:27
-msgid "git replace [--format=<format>] [-l [<pattern>]]"
-msgstr ""
-
-#: builtin/replace.c:90
-#, c-format
-msgid ""
-"invalid replace format '%s'\n"
-"valid formats are 'short', 'medium' and 'long'"
-msgstr ""
-
-#: builtin/replace.c:125
-#, c-format
-msgid "replace ref '%s' not found"
-msgstr ""
-
-#: builtin/replace.c:141
-#, c-format
-msgid "Deleted replace ref '%s'"
-msgstr ""
-
-#: builtin/replace.c:153
-#, c-format
-msgid "'%s' is not a valid ref name"
-msgstr ""
-
-#: builtin/replace.c:158
-#, c-format
-msgid "replace ref '%s' already exists"
-msgstr ""
-
-#: builtin/replace.c:178
-#, c-format
-msgid ""
-"Objects must be of the same type.\n"
-"'%s' points to a replaced object of type '%s'\n"
-"while '%s' points to a replacement object of type '%s'."
-msgstr ""
-
-#: builtin/replace.c:229
-#, c-format
-msgid "unable to open %s for writing"
-msgstr ""
-
-#: builtin/replace.c:242
-msgid "cat-file reported failure"
-msgstr ""
-
-#: builtin/replace.c:258
-#, c-format
-msgid "unable to open %s for reading"
-msgstr ""
-
-#: builtin/replace.c:272
-msgid "unable to spawn mktree"
-msgstr ""
-
-#: builtin/replace.c:276
-msgid "unable to read from mktree"
-msgstr ""
-
-#: builtin/replace.c:285
-msgid "mktree reported failure"
-msgstr ""
-
-#: builtin/replace.c:289
-msgid "mktree did not return an object name"
-msgstr ""
-
-#: builtin/replace.c:298
-#, c-format
-msgid "unable to fstat %s"
-msgstr ""
-
-#: builtin/replace.c:303
-msgid "unable to write object to database"
-msgstr ""
-
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr ""
-
-#: builtin/replace.c:326
-#, c-format
-msgid "unable to get object type for %s"
-msgstr ""
-
-#: builtin/replace.c:342
-msgid "editing object file failed"
-msgstr ""
-
-#: builtin/replace.c:351
-#, c-format
-msgid "new object is the same as the old one: '%s'"
-msgstr ""
-
-#: builtin/replace.c:384
-#, c-format
-msgid "could not parse %s as a commit"
-msgstr ""
-
-#: builtin/replace.c:416
-#, c-format
-msgid "bad mergetag in commit '%s'"
-msgstr ""
-
-#: builtin/replace.c:418
-#, c-format
-msgid "malformed mergetag in commit '%s'"
-msgstr ""
-
-#: builtin/replace.c:430
-#, c-format
-msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
-msgstr ""
-
-#: builtin/replace.c:469
-#, c-format
-msgid "the original commit '%s' has a gpg signature"
-msgstr ""
-
-#: builtin/replace.c:470
-msgid "the signature will be removed in the replacement commit!"
-msgstr ""
-
-#: builtin/replace.c:480
-#, c-format
-msgid "could not write replacement commit for: '%s'"
-msgstr ""
-
-#: builtin/replace.c:488
-#, c-format
-msgid "graft for '%s' unnecessary"
-msgstr ""
-
-#: builtin/replace.c:492
-#, c-format
-msgid "new commit is the same as the old one: '%s'"
-msgstr ""
-
-#: builtin/replace.c:527
-#, c-format
-msgid ""
-"could not convert the following graft(s):\n"
-"%s"
-msgstr ""
-
-#: builtin/replace.c:548
-msgid "list replace refs"
-msgstr ""
-
-#: builtin/replace.c:549
-msgid "delete replace refs"
-msgstr ""
-
-#: builtin/replace.c:550
-msgid "edit existing object"
-msgstr ""
-
-#: builtin/replace.c:551
-msgid "change a commit's parents"
-msgstr ""
-
-#: builtin/replace.c:552
-msgid "convert existing graft file"
-msgstr ""
-
-#: builtin/replace.c:553
-msgid "replace the ref if it exists"
-msgstr ""
-
-#: builtin/replace.c:555
-msgid "do not pretty-print contents for --edit"
-msgstr ""
-
-#: builtin/replace.c:556
-msgid "use this format"
-msgstr ""
-
-#: builtin/replace.c:569
-msgid "--format cannot be used when not listing"
-msgstr ""
-
-#: builtin/replace.c:577
-msgid "-f only makes sense when writing a replacement"
-msgstr ""
-
-#: builtin/replace.c:581
-msgid "--raw only makes sense with --edit"
-msgstr ""
-
-#: builtin/replace.c:587
-msgid "-d needs at least one argument"
-msgstr ""
-
-#: builtin/replace.c:593
-msgid "bad number of arguments"
-msgstr ""
-
-#: builtin/replace.c:599
-msgid "-e needs exactly one argument"
-msgstr ""
-
-#: builtin/replace.c:605
-msgid "-g needs at least one argument"
-msgstr ""
-
-#: builtin/replace.c:611
-msgid "--convert-graft-file takes no argument"
-msgstr ""
-
-#: builtin/replace.c:617
-msgid "only one pattern can be given with -l"
-msgstr ""
-
-#: builtin/rerere.c:13
-msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-msgstr ""
-
-#: builtin/rerere.c:58
-msgid "register clean resolutions in index"
-msgstr ""
-
-#: builtin/rerere.c:77
-msgid "'git rerere forget' without paths is deprecated"
-msgstr ""
-
-#: builtin/rerere.c:111
-#, c-format
-msgid "unable to generate diff for '%s'"
-msgstr ""
-
-#: builtin/reset.c:32
-msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-msgstr ""
-
-#: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr ""
-
-#: builtin/reset.c:34
-msgid ""
-"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
-msgstr ""
-
-#: builtin/reset.c:35
-msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-msgstr ""
-
-#: builtin/reset.c:41
-msgid "mixed"
-msgstr ""
-
-#: builtin/reset.c:41
-msgid "soft"
-msgstr ""
-
-#: builtin/reset.c:41
-msgid "hard"
-msgstr ""
-
-#: builtin/reset.c:41
-msgid "merge"
-msgstr ""
-
-#: builtin/reset.c:41
-msgid "keep"
-msgstr ""
-
-#: builtin/reset.c:83
-msgid "You do not have a valid HEAD."
-msgstr ""
-
-#: builtin/reset.c:85
-msgid "Failed to find tree of HEAD."
-msgstr ""
-
-#: builtin/reset.c:91
-#, c-format
-msgid "Failed to find tree of %s."
-msgstr ""
-
-#: builtin/reset.c:116
-#, c-format
-msgid "HEAD is now at %s"
-msgstr ""
-
-#: builtin/reset.c:195
-#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
-msgstr ""
-
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
-msgid "be quiet, only report errors"
-msgstr ""
-
-#: builtin/reset.c:297
-msgid "reset HEAD and index"
-msgstr ""
-
-#: builtin/reset.c:298
-msgid "reset only HEAD"
-msgstr ""
-
-#: builtin/reset.c:300 builtin/reset.c:302
-msgid "reset HEAD, index and working tree"
-msgstr ""
-
-#: builtin/reset.c:304
-msgid "reset HEAD but keep local changes"
-msgstr ""
-
-#: builtin/reset.c:310
-msgid "record only the fact that removed paths will be added later"
-msgstr ""
-
-#: builtin/reset.c:344
-#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
-msgstr ""
-
-#: builtin/reset.c:352
-#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
-msgstr ""
-
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr ""
-
-#: builtin/reset.c:371
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
-msgstr ""
-
-#: builtin/reset.c:373
-#, c-format
-msgid "Cannot do %s reset with paths."
-msgstr ""
-
-#: builtin/reset.c:388
-#, c-format
-msgid "%s reset is not allowed in a bare repository"
-msgstr ""
-
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr ""
-
-#: builtin/reset.c:413
-msgid "Unstaged changes after reset:"
-msgstr ""
-
-#: builtin/reset.c:416
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
-"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
-"to make this the default.\n"
-msgstr ""
-
-#: builtin/reset.c:434
-#, c-format
-msgid "Could not reset index file to revision '%s'."
-msgstr ""
-
-#: builtin/reset.c:439
-msgid "Could not write new index file."
-msgstr ""
-
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
-
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr ""
-
-#: builtin/rev-list.c:674
-msgid "rev-list does not support display of notes"
-msgstr ""
-
-#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr ""
-
-#: builtin/rev-parse.c:409
-msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
-msgstr ""
-
-#: builtin/rev-parse.c:414
-msgid "keep the `--` passed as an arg"
-msgstr ""
-
-#: builtin/rev-parse.c:416
-msgid "stop parsing after the first non-option argument"
-msgstr ""
-
-#: builtin/rev-parse.c:419
-msgid "output in stuck long form"
-msgstr ""
-
-#: builtin/rev-parse.c:438
-msgid "premature end of input"
-msgstr ""
-
-#: builtin/rev-parse.c:442
-msgid "no usage string given before the `--' separator"
-msgstr ""
-
-#: builtin/rev-parse.c:548
-msgid "Needed a single revision"
-msgstr ""
-
-#: builtin/rev-parse.c:552
-msgid ""
-"git rev-parse --parseopt [<options>] -- [<args>...]\n"
-" or: git rev-parse --sq-quote [<arg>...]\n"
-" or: git rev-parse [<options>] [<arg>...]\n"
-"\n"
-"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
-msgstr ""
-
-#: builtin/rev-parse.c:712
-msgid "--resolve-git-dir requires an argument"
-msgstr ""
-
-#: builtin/rev-parse.c:715
-#, c-format
-msgid "not a gitdir '%s'"
-msgstr ""
-
-#: builtin/rev-parse.c:739
-msgid "--git-path requires an argument"
-msgstr ""
-
-#: builtin/rev-parse.c:749
-msgid "-n requires an argument"
-msgstr ""
-
-#: builtin/rev-parse.c:763
-msgid "--path-format requires an argument"
-msgstr ""
-
-#: builtin/rev-parse.c:769
-#, c-format
-msgid "unknown argument to --path-format: %s"
-msgstr ""
-
-#: builtin/rev-parse.c:776
-msgid "--default requires an argument"
-msgstr ""
-
-#: builtin/rev-parse.c:782
-msgid "--prefix requires an argument"
-msgstr ""
-
-#: builtin/rev-parse.c:851
-#, c-format
-msgid "unknown mode for --abbrev-ref: %s"
-msgstr ""
-
-#: builtin/rev-parse.c:1023
-#, c-format
-msgid "unknown mode for --show-object-format: %s"
-msgstr ""
-
-#: builtin/revert.c:24
-msgid "git revert [<options>] <commit-ish>..."
-msgstr ""
-
-#: builtin/revert.c:25
-msgid "git revert <subcommand>"
-msgstr ""
-
-#: builtin/revert.c:30
-msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr ""
-
-#: builtin/revert.c:31
-msgid "git cherry-pick <subcommand>"
-msgstr ""
-
-#: builtin/revert.c:72
-#, c-format
-msgid "option `%s' expects a number greater than zero"
-msgstr ""
-
-#: builtin/revert.c:92
-#, c-format
-msgid "%s: %s cannot be used with %s"
-msgstr ""
-
-#: builtin/revert.c:102
-msgid "end revert or cherry-pick sequence"
-msgstr ""
-
-#: builtin/revert.c:103
-msgid "resume revert or cherry-pick sequence"
-msgstr ""
-
-#: builtin/revert.c:104
-msgid "cancel revert or cherry-pick sequence"
-msgstr ""
-
-#: builtin/revert.c:105
-msgid "skip current commit and continue"
-msgstr ""
-
-#: builtin/revert.c:107
-msgid "don't automatically commit"
-msgstr ""
-
-#: builtin/revert.c:108
-msgid "edit the commit message"
-msgstr ""
-
-#: builtin/revert.c:111
-msgid "parent-number"
-msgstr ""
-
-#: builtin/revert.c:112
-msgid "select mainline parent"
-msgstr ""
-
-#: builtin/revert.c:114
-msgid "merge strategy"
-msgstr ""
-
-#: builtin/revert.c:116
-msgid "option for merge strategy"
-msgstr ""
-
-#: builtin/revert.c:125
-msgid "append commit name"
-msgstr ""
-
-#: builtin/revert.c:127
-msgid "preserve initially empty commits"
-msgstr ""
-
-#: builtin/revert.c:129
-msgid "keep redundant, empty commits"
-msgstr ""
-
-#: builtin/revert.c:237
-msgid "revert failed"
-msgstr ""
-
-#: builtin/revert.c:250
-msgid "cherry-pick failed"
-msgstr ""
-
-#: builtin/rm.c:20
-msgid "git rm [<options>] [--] <file>..."
-msgstr ""
-
-#: builtin/rm.c:208
-msgid ""
-"the following file has staged content different from both the\n"
-"file and the HEAD:"
-msgid_plural ""
-"the following files have staged content different from both the\n"
-"file and the HEAD:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/rm.c:213
-msgid ""
-"\n"
-"(use -f to force removal)"
-msgstr ""
-
-#: builtin/rm.c:217
-msgid "the following file has changes staged in the index:"
-msgid_plural "the following files have changes staged in the index:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/rm.c:221 builtin/rm.c:230
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
-msgstr ""
-
-#: builtin/rm.c:227
-msgid "the following file has local modifications:"
-msgid_plural "the following files have local modifications:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/rm.c:244
-msgid "do not list removed files"
-msgstr ""
-
-#: builtin/rm.c:245
-msgid "only remove from the index"
-msgstr ""
-
-#: builtin/rm.c:246
-msgid "override the up-to-date check"
-msgstr ""
-
-#: builtin/rm.c:247
-msgid "allow recursive removal"
-msgstr ""
-
-#: builtin/rm.c:249
-msgid "exit with a zero status even if nothing matched"
-msgstr ""
-
-#: builtin/rm.c:283
-msgid "No pathspec was given. Which files should I remove?"
-msgstr ""
-
-#: builtin/rm.c:310
-msgid "please stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-
-#: builtin/rm.c:331
-#, c-format
-msgid "not removing '%s' recursively without -r"
-msgstr ""
-
-#: builtin/rm.c:379
-#, c-format
-msgid "git rm: unable to remove %s"
-msgstr ""
-
-#: builtin/send-pack.c:20
-msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
-msgstr ""
-
-#: builtin/send-pack.c:188
-msgid "remote name"
-msgstr ""
-
-#: builtin/send-pack.c:201
-msgid "use stateless RPC protocol"
-msgstr ""
-
-#: builtin/send-pack.c:202
-msgid "read refs from stdin"
-msgstr ""
-
-#: builtin/send-pack.c:203
-msgid "print status from remote helper"
-msgstr ""
-
-#: builtin/shortlog.c:16
-msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr ""
-
-#: builtin/shortlog.c:17
-msgid "git log --pretty=short | git shortlog [<options>]"
-msgstr ""
-
-#: builtin/shortlog.c:123
-msgid "using multiple --group options with stdin is not supported"
-msgstr ""
-
-#: builtin/shortlog.c:133
-msgid "using --group=trailer with stdin is not supported"
-msgstr ""
-
-#: builtin/shortlog.c:323
-#, c-format
-msgid "unknown group type: %s"
-msgstr ""
-
-#: builtin/shortlog.c:351
-msgid "group by committer rather than author"
-msgstr ""
-
-#: builtin/shortlog.c:354
-msgid "sort output according to the number of commits per author"
-msgstr ""
-
-#: builtin/shortlog.c:356
-msgid "suppress commit descriptions, only provides commit count"
-msgstr ""
-
-#: builtin/shortlog.c:358
-msgid "show the email address of each author"
-msgstr ""
-
-#: builtin/shortlog.c:359
-msgid "<w>[,<i1>[,<i2>]]"
-msgstr ""
-
-#: builtin/shortlog.c:360
-msgid "linewrap output"
-msgstr ""
-
-#: builtin/shortlog.c:362
-msgid "field"
-msgstr ""
-
-#: builtin/shortlog.c:363
-msgid "group by field"
-msgstr ""
-
-#: builtin/shortlog.c:391
-msgid "too many arguments given outside repository"
-msgstr ""
-
-#: builtin/show-branch.c:13
-msgid ""
-"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
-msgstr ""
-
-#: builtin/show-branch.c:17
-msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr ""
-
-#: builtin/show-branch.c:395
-#, c-format
-msgid "ignoring %s; cannot handle more than %d ref"
-msgid_plural "ignoring %s; cannot handle more than %d refs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/show-branch.c:548
-#, c-format
-msgid "no matching refs with %s"
-msgstr ""
-
-#: builtin/show-branch.c:645
-msgid "show remote-tracking and local branches"
-msgstr ""
-
-#: builtin/show-branch.c:647
-msgid "show remote-tracking branches"
-msgstr ""
-
-#: builtin/show-branch.c:649
-msgid "color '*!+-' corresponding to the branch"
-msgstr ""
-
-#: builtin/show-branch.c:651
-msgid "show <n> more commits after the common ancestor"
-msgstr ""
-
-#: builtin/show-branch.c:653
-msgid "synonym to more=-1"
-msgstr ""
-
-#: builtin/show-branch.c:654
-msgid "suppress naming strings"
-msgstr ""
-
-#: builtin/show-branch.c:656
-msgid "include the current branch"
-msgstr ""
-
-#: builtin/show-branch.c:658
-msgid "name commits with their object names"
-msgstr ""
-
-#: builtin/show-branch.c:660
-msgid "show possible merge bases"
-msgstr ""
-
-#: builtin/show-branch.c:662
-msgid "show refs unreachable from any other ref"
-msgstr ""
-
-#: builtin/show-branch.c:664
-msgid "show commits in topological order"
-msgstr ""
-
-#: builtin/show-branch.c:667
-msgid "show only commits not on the first branch"
-msgstr ""
-
-#: builtin/show-branch.c:669
-msgid "show merges reachable from only one tip"
-msgstr ""
-
-#: builtin/show-branch.c:671
-msgid "topologically sort, maintaining date order where possible"
-msgstr ""
-
-#: builtin/show-branch.c:674
-msgid "<n>[,<base>]"
-msgstr ""
-
-#: builtin/show-branch.c:675
-msgid "show <n> most recent ref-log entries starting at base"
-msgstr ""
-
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-
-#: builtin/show-branch.c:735
-msgid "no branches given, and HEAD is not valid"
-msgstr ""
-
-#: builtin/show-branch.c:738
-msgid "--reflog option needs one branch name"
-msgstr ""
-
-#: builtin/show-branch.c:741
-#, c-format
-msgid "only %d entry can be shown at one time."
-msgid_plural "only %d entries can be shown at one time."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/show-branch.c:745
-#, c-format
-msgid "no such ref %s"
-msgstr ""
-
-#: builtin/show-branch.c:831
-#, c-format
-msgid "cannot handle more than %d rev."
-msgid_plural "cannot handle more than %d revs."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/show-branch.c:835
-#, c-format
-msgid "'%s' is not a valid ref."
-msgstr ""
-
-#: builtin/show-branch.c:838
-#, c-format
-msgid "cannot find commit %s (%s)"
-msgstr ""
-
-#: builtin/show-index.c:21
-msgid "hash-algorithm"
-msgstr ""
-
-#: builtin/show-index.c:31
-msgid "Unknown hash algorithm"
-msgstr ""
-
-#: builtin/show-ref.c:12
-msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
-msgstr ""
-
-#: builtin/show-ref.c:13
-msgid "git show-ref --exclude-existing[=<pattern>]"
-msgstr ""
-
-#: builtin/show-ref.c:162
-msgid "only show tags (can be combined with heads)"
-msgstr ""
-
-#: builtin/show-ref.c:163
-msgid "only show heads (can be combined with tags)"
-msgstr ""
-
-#: builtin/show-ref.c:164
-msgid "stricter reference checking, requires exact ref path"
-msgstr ""
-
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
-msgid "show the HEAD reference, even if it would be filtered out"
-msgstr ""
-
-#: builtin/show-ref.c:171
-msgid "dereference tags into object IDs"
-msgstr ""
-
-#: builtin/show-ref.c:173
-msgid "only show SHA1 hash using <n> digits"
-msgstr ""
-
-#: builtin/show-ref.c:177
-msgid "do not print results to stdout (useful with --verify)"
-msgstr ""
-
-#: builtin/show-ref.c:179
-msgid "show refs from stdin that aren't in local repository"
-msgstr ""
-
-#: builtin/sparse-checkout.c:22
-msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
-msgstr ""
-
-#: builtin/sparse-checkout.c:46
-msgid "git sparse-checkout list"
-msgstr ""
-
-#: builtin/sparse-checkout.c:72
-msgid "this worktree is not sparse (sparse-checkout file may not exist)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:227
-msgid "failed to create directory for sparse-checkout file"
-msgstr ""
-
-#: builtin/sparse-checkout.c:268
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr ""
-
-#: builtin/sparse-checkout.c:270
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr ""
-
-#: builtin/sparse-checkout.c:290
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr ""
-
-#: builtin/sparse-checkout.c:310
-msgid "initialize the sparse-checkout in cone mode"
-msgstr ""
-
-#: builtin/sparse-checkout.c:312
-msgid "toggle the use of a sparse index"
-msgstr ""
-
-#: builtin/sparse-checkout.c:340
-msgid "failed to modify sparse-index config"
-msgstr ""
-
-#: builtin/sparse-checkout.c:361
-#, c-format
-msgid "failed to open '%s'"
-msgstr ""
-
-#: builtin/sparse-checkout.c:413
-#, c-format
-msgid "could not normalize path %s"
-msgstr ""
-
-#: builtin/sparse-checkout.c:425
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:450
-#, c-format
-msgid "unable to unquote C-style string '%s'"
-msgstr ""
-
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
-msgid "unable to load existing sparse-checkout patterns"
-msgstr ""
-
-#: builtin/sparse-checkout.c:573
-msgid "read patterns from standard in"
-msgstr ""
-
-#: builtin/sparse-checkout.c:588
-msgid "git sparse-checkout reapply"
-msgstr ""
-
-#: builtin/sparse-checkout.c:607
-msgid "git sparse-checkout disable"
-msgstr ""
-
-#: builtin/sparse-checkout.c:638
-msgid "error while refreshing working directory"
-msgstr ""
-
-#: builtin/stash.c:24 builtin/stash.c:40
-msgid "git stash list [<options>]"
-msgstr ""
-
-#: builtin/stash.c:25 builtin/stash.c:45
-msgid "git stash show [<options>] [<stash>]"
-msgstr ""
-
-#: builtin/stash.c:26 builtin/stash.c:50
-msgid "git stash drop [-q|--quiet] [<stash>]"
-msgstr ""
-
-#: builtin/stash.c:27
-msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
-msgstr ""
-
-#: builtin/stash.c:28 builtin/stash.c:65
-msgid "git stash branch <branchname> [<stash>]"
-msgstr ""
-
-#: builtin/stash.c:30
-msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
-" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
-" [--] [<pathspec>...]]"
-msgstr ""
-
-#: builtin/stash.c:34 builtin/stash.c:87
-msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-" [-u|--include-untracked] [-a|--all] [<message>]"
-msgstr ""
-
-#: builtin/stash.c:55
-msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
-msgstr ""
-
-#: builtin/stash.c:60
-msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
-msgstr ""
-
-#: builtin/stash.c:75
-msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
-msgstr ""
-
-#: builtin/stash.c:80
-msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
-" [--] [<pathspec>...]]"
-msgstr ""
-
-#: builtin/stash.c:130
-#, c-format
-msgid "'%s' is not a stash-like commit"
-msgstr ""
-
-#: builtin/stash.c:150
-#, c-format
-msgid "Too many revisions specified:%s"
-msgstr ""
-
-#: builtin/stash.c:164
-msgid "No stash entries found."
-msgstr ""
-
-#: builtin/stash.c:178
-#, c-format
-msgid "%s is not a valid reference"
-msgstr ""
-
-#: builtin/stash.c:227
-msgid "git stash clear with arguments is unimplemented"
-msgstr ""
-
-#: builtin/stash.c:431
-#, c-format
-msgid ""
-"WARNING: Untracked file in way of tracked file! Renaming\n"
-" %s -> %s\n"
-" to make room.\n"
-msgstr ""
-
-#: builtin/stash.c:492
-msgid "cannot apply a stash in the middle of a merge"
-msgstr ""
-
-#: builtin/stash.c:503
-#, c-format
-msgid "could not generate diff %s^!."
-msgstr ""
-
-#: builtin/stash.c:510
-msgid "conflicts in index. Try without --index."
-msgstr ""
-
-#: builtin/stash.c:516
-msgid "could not save index tree"
-msgstr ""
-
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr ""
-
-#: builtin/stash.c:539
-#, c-format
-msgid "Merging %s with %s"
-msgstr ""
-
-#: builtin/stash.c:549
-msgid "Index was not unstashed."
-msgstr ""
-
-#: builtin/stash.c:591 builtin/stash.c:689
-msgid "attempt to recreate the index"
-msgstr ""
-
-#: builtin/stash.c:635
-#, c-format
-msgid "Dropped %s (%s)"
-msgstr ""
-
-#: builtin/stash.c:638
-#, c-format
-msgid "%s: Could not drop stash entry"
-msgstr ""
-
-#: builtin/stash.c:651
-#, c-format
-msgid "'%s' is not a stash reference"
-msgstr ""
-
-#: builtin/stash.c:701
-msgid "The stash entry is kept in case you need it again."
-msgstr ""
-
-#: builtin/stash.c:724
-msgid "No branch name specified"
-msgstr ""
-
-#: builtin/stash.c:808
-msgid "failed to parse tree"
-msgstr ""
-
-#: builtin/stash.c:819
-msgid "failed to unpack trees"
-msgstr ""
-
-#: builtin/stash.c:839
-msgid "include untracked files in the stash"
-msgstr ""
-
-#: builtin/stash.c:842
-msgid "only show untracked files in the stash"
-msgstr ""
-
-#: builtin/stash.c:929 builtin/stash.c:966
-#, c-format
-msgid "Cannot update %s with %s"
-msgstr ""
-
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
-msgid "stash message"
-msgstr ""
-
-#: builtin/stash.c:957
-msgid "\"git stash store\" requires one <commit> argument"
-msgstr ""
-
-#: builtin/stash.c:1171
-msgid "No changes selected"
-msgstr ""
-
-#: builtin/stash.c:1271
-msgid "You do not have the initial commit yet"
-msgstr ""
-
-#: builtin/stash.c:1298
-msgid "Cannot save the current index state"
-msgstr ""
-
-#: builtin/stash.c:1307
-msgid "Cannot save the untracked files"
-msgstr ""
-
-#: builtin/stash.c:1318 builtin/stash.c:1327
-msgid "Cannot save the current worktree state"
-msgstr ""
-
-#: builtin/stash.c:1355
-msgid "Cannot record working tree state"
-msgstr ""
-
-#: builtin/stash.c:1404
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr ""
-
-#: builtin/stash.c:1422
-msgid "Did you forget to 'git add'?"
-msgstr ""
-
-#: builtin/stash.c:1437
-msgid "No local changes to save"
-msgstr ""
-
-#: builtin/stash.c:1444
-msgid "Cannot initialize stash"
-msgstr ""
-
-#: builtin/stash.c:1459
-msgid "Cannot save the current status"
-msgstr ""
-
-#: builtin/stash.c:1464
-#, c-format
-msgid "Saved working directory and index state %s"
-msgstr ""
-
-#: builtin/stash.c:1554
-msgid "Cannot remove worktree changes"
-msgstr ""
-
-#: builtin/stash.c:1593 builtin/stash.c:1658
-msgid "keep index"
-msgstr ""
-
-#: builtin/stash.c:1595 builtin/stash.c:1660
-msgid "stash in patch mode"
-msgstr ""
-
-#: builtin/stash.c:1596 builtin/stash.c:1661
-msgid "quiet mode"
-msgstr ""
-
-#: builtin/stash.c:1598 builtin/stash.c:1663
-msgid "include untracked files in stash"
-msgstr ""
-
-#: builtin/stash.c:1600 builtin/stash.c:1665
-msgid "include ignore files"
-msgstr ""
-
-#: builtin/stash.c:1700
-msgid ""
-"the stash.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr ""
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr ""
-
-#: builtin/stripspace.c:37
-msgid "skip and remove all lines starting with comment character"
-msgstr ""
-
-#: builtin/stripspace.c:40
-msgid "prepend comment character and space to each line"
-msgstr ""
-
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
-#, c-format
-msgid "Expecting a full ref name, got %s"
-msgstr ""
-
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr ""
-
-#: builtin/submodule--helper.c:101
-#, c-format
-msgid "cannot strip one component off url '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
-msgid "alternative anchor for relative paths"
-msgstr ""
-
-#: builtin/submodule--helper.c:416
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr ""
-
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
-#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:526
-#, c-format
-msgid "Entering '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:529
-#, c-format
-msgid ""
-"run_command returned non-zero status for %s\n"
-"."
-msgstr ""
-
-#: builtin/submodule--helper.c:551
-#, c-format
-msgid ""
-"run_command returned non-zero status while recursing in the nested "
-"submodules of %s\n"
-"."
-msgstr ""
-
-#: builtin/submodule--helper.c:567
-msgid "suppress output of entering each submodule command"
-msgstr ""
-
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
-msgid "recurse into nested submodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:574
-msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
-msgstr ""
-
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-
-#: builtin/submodule--helper.c:668
-#, c-format
-msgid "Failed to register url for submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:672
-#, c-format
-msgid "Submodule '%s' (%s) registered for path '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:682
-#, c-format
-msgid "warning: command update mode suggested for submodule '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:689
-#, c-format
-msgid "Failed to register update mode for submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:711
-msgid "suppress output for initializing a submodule"
-msgstr ""
-
-#: builtin/submodule--helper.c:716
-msgid "git submodule--helper init [<options>] [<path>]"
-msgstr ""
-
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
-#, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:837
-#, c-format
-msgid "could not resolve HEAD ref inside the submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
-#, c-format
-msgid "failed to recurse into submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
-msgid "suppress submodule status output"
-msgstr ""
-
-#: builtin/submodule--helper.c:889
-msgid ""
-"use commit stored in the index instead of the one stored in the submodule "
-"HEAD"
-msgstr ""
-
-#: builtin/submodule--helper.c:895
-msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
-msgstr ""
-
-#: builtin/submodule--helper.c:919
-msgid "git submodule--helper name <path>"
-msgstr ""
-
-#: builtin/submodule--helper.c:991
-#, c-format
-msgid "* %s %s(blob)->%s(submodule)"
-msgstr ""
-
-#: builtin/submodule--helper.c:994
-#, c-format
-msgid "* %s %s(submodule)->%s(blob)"
-msgstr ""
-
-#: builtin/submodule--helper.c:1007
-#, c-format
-msgid "%s"
-msgstr ""
-
-#: builtin/submodule--helper.c:1057
-#, c-format
-msgid "couldn't hash object from '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1061
-#, c-format
-msgid "unexpected mode %o\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:1302
-msgid "use the commit stored in the index instead of the submodule HEAD"
-msgstr ""
-
-#: builtin/submodule--helper.c:1304
-msgid "compare the commit in the index with that in the submodule HEAD"
-msgstr ""
-
-#: builtin/submodule--helper.c:1306
-msgid "skip submodules with 'ignore_config' value set to 'all'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1308
-msgid "limit the summary size"
-msgstr ""
-
-#: builtin/submodule--helper.c:1313
-msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
-msgstr ""
-
-#: builtin/submodule--helper.c:1337
-msgid "could not fetch a revision for HEAD"
-msgstr ""
-
-#: builtin/submodule--helper.c:1342
-msgid "--cached and --files are mutually exclusive"
-msgstr ""
-
-#: builtin/submodule--helper.c:1409
-#, c-format
-msgid "Synchronizing submodule url for '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:1415
-#, c-format
-msgid "failed to register url for submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1429
-#, c-format
-msgid "failed to get the default remote for submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1440
-#, c-format
-msgid "failed to update remote for submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1487
-msgid "suppress output of synchronizing submodule url"
-msgstr ""
-
-#: builtin/submodule--helper.c:1494
-msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
-msgstr ""
-
-#: builtin/submodule--helper.c:1548
-#, c-format
-msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
-msgstr ""
-
-#: builtin/submodule--helper.c:1560
-#, c-format
-msgid ""
-"Submodule work tree '%s' contains local modifications; use '-f' to discard "
-"them"
-msgstr ""
-
-#: builtin/submodule--helper.c:1568
-#, c-format
-msgid "Cleared directory '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:1570
-#, c-format
-msgid "Could not remove submodule work tree '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:1581
-#, c-format
-msgid "could not create empty submodule directory %s"
-msgstr ""
-
-#: builtin/submodule--helper.c:1597
-#, c-format
-msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:1626
-msgid "remove submodule working trees even if they contain local changes"
-msgstr ""
-
-#: builtin/submodule--helper.c:1627
-msgid "unregister all submodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:1632
-msgid ""
-"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
-msgstr ""
-
-#: builtin/submodule--helper.c:1646
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:1690
-msgid ""
-"An alternate computed from a superproject's alternate is invalid.\n"
-"To allow Git to clone without an alternate in such a case, set\n"
-"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
-"'--reference-if-able' instead of '--reference'."
-msgstr ""
-
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
-#, c-format
-msgid "submodule '%s' cannot add alternate: %s"
-msgstr ""
-
-#: builtin/submodule--helper.c:1768
-#, c-format
-msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
-msgstr ""
-
-#: builtin/submodule--helper.c:1775
-#, c-format
-msgid "Value '%s' for submodule.alternateLocation is not recognized"
-msgstr ""
-
-#: builtin/submodule--helper.c:1800
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr ""
-
-#: builtin/submodule--helper.c:1841
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr ""
-
-#: builtin/submodule--helper.c:1846
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1858
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
-msgid "where the new submodule will be cloned to"
-msgstr ""
-
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
-msgid "name of the new submodule"
-msgstr ""
-
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
-msgid "url where to clone the submodule from"
-msgstr ""
-
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
-msgid "depth for shallow clones"
-msgstr ""
-
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
-msgid "force cloning progress"
-msgstr ""
-
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
-msgid "disallow cloning into non-empty directory"
-msgstr ""
-
-#: builtin/submodule--helper.c:1916
-msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
-msgstr ""
-
-#: builtin/submodule--helper.c:1953
-#, c-format
-msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1957
-#, c-format
-msgid "Invalid update mode '%s' configured for submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2058
-#, c-format
-msgid "Submodule path '%s' not initialized"
-msgstr ""
-
-#: builtin/submodule--helper.c:2062
-msgid "Maybe you want to use 'update --init'?"
-msgstr ""
-
-#: builtin/submodule--helper.c:2092
-#, c-format
-msgid "Skipping unmerged submodule %s"
-msgstr ""
-
-#: builtin/submodule--helper.c:2121
-#, c-format
-msgid "Skipping submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2271
-#, c-format
-msgid "Failed to clone '%s'. Retry scheduled"
-msgstr ""
-
-#: builtin/submodule--helper.c:2282
-#, c-format
-msgid "Failed to clone '%s' a second time, aborting"
-msgstr ""
-
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
-msgid "path into the working tree"
-msgstr ""
-
-#: builtin/submodule--helper.c:2347
-msgid "path into the working tree, across nested submodule boundaries"
-msgstr ""
-
-#: builtin/submodule--helper.c:2351
-msgid "rebase, merge, checkout or none"
-msgstr ""
-
-#: builtin/submodule--helper.c:2357
-msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr ""
-
-#: builtin/submodule--helper.c:2360
-msgid "parallel jobs"
-msgstr ""
-
-#: builtin/submodule--helper.c:2362
-msgid "whether the initial clone should follow the shallow recommendation"
-msgstr ""
-
-#: builtin/submodule--helper.c:2363
-msgid "don't print cloning progress"
-msgstr ""
-
-#: builtin/submodule--helper.c:2374
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr ""
-
-#: builtin/submodule--helper.c:2387
-msgid "bad value for update parameter"
-msgstr ""
-
-#: builtin/submodule--helper.c:2435
-#, c-format
-msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
-msgstr ""
-
-#: builtin/submodule--helper.c:2558
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2591
-msgid "recurse into submodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:2597
-msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr ""
-
-#: builtin/submodule--helper.c:2653
-msgid "check if it is safe to write to the .gitmodules file"
-msgstr ""
-
-#: builtin/submodule--helper.c:2656
-msgid "unset the config in the .gitmodules file"
-msgstr ""
-
-#: builtin/submodule--helper.c:2661
-msgid "git submodule--helper config <name> [<value>]"
-msgstr ""
-
-#: builtin/submodule--helper.c:2662
-msgid "git submodule--helper config --unset <name>"
-msgstr ""
-
-#: builtin/submodule--helper.c:2663
-msgid "git submodule--helper config --check-writeable"
-msgstr ""
-
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
-msgid "please make sure that the .gitmodules file is in the working tree"
-msgstr ""
-
-#: builtin/submodule--helper.c:2698
-msgid "suppress output for setting url of a submodule"
-msgstr ""
-
-#: builtin/submodule--helper.c:2702
-msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
-msgstr ""
-
-#: builtin/submodule--helper.c:2735
-msgid "set the default tracking branch to master"
-msgstr ""
-
-#: builtin/submodule--helper.c:2737
-msgid "set the default tracking branch"
-msgstr ""
-
-#: builtin/submodule--helper.c:2741
-msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
-msgstr ""
-
-#: builtin/submodule--helper.c:2742
-msgid ""
-"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
-msgstr ""
-
-#: builtin/submodule--helper.c:2749
-msgid "--branch or --default required"
-msgstr ""
-
-#: builtin/submodule--helper.c:2752
-msgid "--branch and --default are mutually exclusive"
-msgstr ""
-
-#: builtin/submodule--helper.c:2815
-#, c-format
-msgid "Adding existing repo at '%s' to the index\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:2818
-#, c-format
-msgid "'%s' already exists and is not a valid git repo"
-msgstr ""
-
-#: builtin/submodule--helper.c:2828
-#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr ""
-
-#: builtin/submodule--helper.c:2833
-#, c-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-" %s\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:2842
-#, c-format
-msgid "Reactivating local git directory for submodule '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:2875
-#, c-format
-msgid "unable to checkout submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr ""
-
-#: builtin/submodule--helper.c:2910
-msgid "allow adding an otherwise ignored submodule path"
-msgstr ""
-
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
-#, c-format
-msgid "%s doesn't support --super-prefix"
-msgstr ""
-
-#: builtin/submodule--helper.c:2991
-#, c-format
-msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr ""
-
-#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr ""
-
-#: builtin/symbolic-ref.c:9
-msgid "git symbolic-ref -d [-q] <name>"
-msgstr ""
-
-#: builtin/symbolic-ref.c:42
-msgid "suppress error message for non-symbolic (detached) refs"
-msgstr ""
-
-#: builtin/symbolic-ref.c:43
-msgid "delete symbolic ref"
-msgstr ""
-
-#: builtin/symbolic-ref.c:44
-msgid "shorten ref output"
-msgstr ""
-
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
-msgid "reason"
-msgstr ""
-
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
-msgid "reason of the update"
-msgstr ""
-
-#: builtin/tag.c:25
-msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
-msgstr ""
-
-#: builtin/tag.c:27
-msgid "git tag -d <tagname>..."
-msgstr ""
-
-#: builtin/tag.c:28
-msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
-"[<pattern>...]"
-msgstr ""
-
-#: builtin/tag.c:30
-msgid "git tag -v [--format=<format>] <tagname>..."
-msgstr ""
-
-#: builtin/tag.c:100
-#, c-format
-msgid "tag '%s' not found."
-msgstr ""
-
-#: builtin/tag.c:135
-#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
-msgstr ""
-
-#: builtin/tag.c:170
-#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be ignored.\n"
-msgstr ""
-
-#: builtin/tag.c:174
-#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you "
-"want to.\n"
-msgstr ""
-
-#: builtin/tag.c:241
-msgid "unable to sign the tag"
-msgstr ""
-
-#: builtin/tag.c:259
-#, c-format
-msgid ""
-"You have created a nested tag. The object referred to by your new tag is\n"
-"already a tag. If you meant to tag the object that it points to, use:\n"
-"\n"
-"\tgit tag -f %s %s^{}"
-msgstr ""
-
-#: builtin/tag.c:275
-msgid "bad object type."
-msgstr ""
-
-#: builtin/tag.c:328
-msgid "no tag message?"
-msgstr ""
-
-#: builtin/tag.c:335
-#, c-format
-msgid "The tag message has been left in %s\n"
-msgstr ""
-
-#: builtin/tag.c:446
-msgid "list tag names"
-msgstr ""
-
-#: builtin/tag.c:448
-msgid "print <n> lines of each tag message"
-msgstr ""
-
-#: builtin/tag.c:450
-msgid "delete tags"
-msgstr ""
-
-#: builtin/tag.c:451
-msgid "verify tags"
-msgstr ""
-
-#: builtin/tag.c:453
-msgid "Tag creation options"
-msgstr ""
-
-#: builtin/tag.c:455
-msgid "annotated tag, needs a message"
-msgstr ""
-
-#: builtin/tag.c:457
-msgid "tag message"
-msgstr ""
-
-#: builtin/tag.c:459
-msgid "force edit of tag message"
-msgstr ""
-
-#: builtin/tag.c:460
-msgid "annotated and GPG-signed tag"
-msgstr ""
-
-#: builtin/tag.c:463
-msgid "use another key to sign the tag"
-msgstr ""
-
-#: builtin/tag.c:464
-msgid "replace the tag if exists"
-msgstr ""
-
-#: builtin/tag.c:465 builtin/update-ref.c:505
-msgid "create a reflog"
-msgstr ""
-
-#: builtin/tag.c:467
-msgid "Tag listing options"
-msgstr ""
-
-#: builtin/tag.c:468
-msgid "show tag list in columns"
-msgstr ""
-
-#: builtin/tag.c:469 builtin/tag.c:471
-msgid "print only tags that contain the commit"
-msgstr ""
-
-#: builtin/tag.c:470 builtin/tag.c:472
-msgid "print only tags that don't contain the commit"
-msgstr ""
-
-#: builtin/tag.c:473
-msgid "print only tags that are merged"
-msgstr ""
-
-#: builtin/tag.c:474
-msgid "print only tags that are not merged"
-msgstr ""
-
-#: builtin/tag.c:478
-msgid "print only tags of the object"
-msgstr ""
-
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr ""
-
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:567
-msgid "only one -F or -m option is allowed."
-msgstr ""
-
-#: builtin/tag.c:592
-#, c-format
-msgid "'%s' is not a valid tag name."
-msgstr ""
-
-#: builtin/tag.c:597
-#, c-format
-msgid "tag '%s' already exists"
-msgstr ""
-
-#: builtin/tag.c:628
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
-msgstr ""
-
-#: builtin/unpack-objects.c:504
-msgid "Unpacking objects"
-msgstr ""
-
-#: builtin/update-index.c:84
-#, c-format
-msgid "failed to create directory %s"
-msgstr ""
-
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr ""
-
-#: builtin/update-index.c:108
-#, c-format
-msgid "failed to delete file %s"
-msgstr ""
-
-#: builtin/update-index.c:115 builtin/update-index.c:221
-#, c-format
-msgid "failed to delete directory %s"
-msgstr ""
-
-#: builtin/update-index.c:140
-#, c-format
-msgid "Testing mtime in '%s' "
-msgstr ""
-
-#: builtin/update-index.c:154
-msgid "directory stat info does not change after adding a new file"
-msgstr ""
-
-#: builtin/update-index.c:167
-msgid "directory stat info does not change after adding a new directory"
-msgstr ""
-
-#: builtin/update-index.c:180
-msgid "directory stat info changes after updating a file"
-msgstr ""
-
-#: builtin/update-index.c:191
-msgid "directory stat info changes after adding a file inside subdirectory"
-msgstr ""
-
-#: builtin/update-index.c:202
-msgid "directory stat info does not change after deleting a file"
-msgstr ""
-
-#: builtin/update-index.c:215
-msgid "directory stat info does not change after deleting a directory"
-msgstr ""
-
-#: builtin/update-index.c:222
-msgid " OK"
-msgstr ""
-
-#: builtin/update-index.c:591
-msgid "git update-index [<options>] [--] [<file>...]"
-msgstr ""
-
-#: builtin/update-index.c:976
-msgid "continue refresh even when index needs update"
-msgstr ""
-
-#: builtin/update-index.c:979
-msgid "refresh: ignore submodules"
-msgstr ""
-
-#: builtin/update-index.c:982
-msgid "do not ignore new files"
-msgstr ""
-
-#: builtin/update-index.c:984
-msgid "let files replace directories and vice-versa"
-msgstr ""
-
-#: builtin/update-index.c:986
-msgid "notice files missing from worktree"
-msgstr ""
-
-#: builtin/update-index.c:988
-msgid "refresh even if index contains unmerged entries"
-msgstr ""
-
-#: builtin/update-index.c:991
-msgid "refresh stat information"
-msgstr ""
-
-#: builtin/update-index.c:995
-msgid "like --refresh, but ignore assume-unchanged setting"
-msgstr ""
-
-#: builtin/update-index.c:999
-msgid "<mode>,<object>,<path>"
-msgstr ""
-
-#: builtin/update-index.c:1000
-msgid "add the specified entry to the index"
-msgstr ""
-
-#: builtin/update-index.c:1010
-msgid "mark files as \"not changing\""
-msgstr ""
-
-#: builtin/update-index.c:1013
-msgid "clear assumed-unchanged bit"
-msgstr ""
-
-#: builtin/update-index.c:1016
-msgid "mark files as \"index-only\""
-msgstr ""
-
-#: builtin/update-index.c:1019
-msgid "clear skip-worktree bit"
-msgstr ""
-
-#: builtin/update-index.c:1022
-msgid "do not touch index-only entries"
-msgstr ""
-
-#: builtin/update-index.c:1024
-msgid "add to index only; do not add content to object database"
-msgstr ""
-
-#: builtin/update-index.c:1026
-msgid "remove named paths even if present in worktree"
-msgstr ""
-
-#: builtin/update-index.c:1028
-msgid "with --stdin: input lines are terminated by null bytes"
-msgstr ""
-
-#: builtin/update-index.c:1030
-msgid "read list of paths to be updated from standard input"
-msgstr ""
-
-#: builtin/update-index.c:1034
-msgid "add entries from standard input to the index"
-msgstr ""
-
-#: builtin/update-index.c:1038
-msgid "repopulate stages #2 and #3 for the listed paths"
-msgstr ""
-
-#: builtin/update-index.c:1042
-msgid "only update entries that differ from HEAD"
-msgstr ""
-
-#: builtin/update-index.c:1046
-msgid "ignore files missing from worktree"
-msgstr ""
-
-#: builtin/update-index.c:1049
-msgid "report actions to standard output"
-msgstr ""
-
-#: builtin/update-index.c:1051
-msgid "(for porcelains) forget saved unresolved conflicts"
-msgstr ""
-
-#: builtin/update-index.c:1055
-msgid "write index in this format"
-msgstr ""
-
-#: builtin/update-index.c:1057
-msgid "enable or disable split index"
-msgstr ""
-
-#: builtin/update-index.c:1059
-msgid "enable/disable untracked cache"
-msgstr ""
-
-#: builtin/update-index.c:1061
-msgid "test if the filesystem supports untracked cache"
-msgstr ""
-
-#: builtin/update-index.c:1063
-msgid "enable untracked cache without testing the filesystem"
-msgstr ""
-
-#: builtin/update-index.c:1065
-msgid "write out the index even if is not flagged as changed"
-msgstr ""
-
-#: builtin/update-index.c:1067
-msgid "enable or disable file system monitor"
-msgstr ""
-
-#: builtin/update-index.c:1069
-msgid "mark files as fsmonitor valid"
-msgstr ""
-
-#: builtin/update-index.c:1072
-msgid "clear fsmonitor valid bit"
-msgstr ""
-
-#: builtin/update-index.c:1175
-msgid ""
-"core.splitIndex is set to false; remove or change it, if you really want to "
-"enable split index"
-msgstr ""
-
-#: builtin/update-index.c:1184
-msgid ""
-"core.splitIndex is set to true; remove or change it, if you really want to "
-"disable split index"
-msgstr ""
-
-#: builtin/update-index.c:1196
-msgid ""
-"core.untrackedCache is set to true; remove or change it, if you really want "
-"to disable the untracked cache"
-msgstr ""
-
-#: builtin/update-index.c:1200
-msgid "Untracked cache disabled"
-msgstr ""
-
-#: builtin/update-index.c:1208
-msgid ""
-"core.untrackedCache is set to false; remove or change it, if you really want "
-"to enable the untracked cache"
-msgstr ""
-
-#: builtin/update-index.c:1212
-#, c-format
-msgid "Untracked cache enabled for '%s'"
-msgstr ""
-
-#: builtin/update-index.c:1220
-msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
-msgstr ""
-
-#: builtin/update-index.c:1224
-msgid "fsmonitor enabled"
-msgstr ""
-
-#: builtin/update-index.c:1227
-msgid ""
-"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
-msgstr ""
-
-#: builtin/update-index.c:1231
-msgid "fsmonitor disabled"
-msgstr ""
-
-#: builtin/update-ref.c:10
-msgid "git update-ref [<options>] -d <refname> [<old-val>]"
-msgstr ""
-
-#: builtin/update-ref.c:11
-msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
-msgstr ""
-
-#: builtin/update-ref.c:12
-msgid "git update-ref [<options>] --stdin [-z]"
-msgstr ""
-
-#: builtin/update-ref.c:500
-msgid "delete the reference"
-msgstr ""
-
-#: builtin/update-ref.c:502
-msgid "update <refname> not the one it points to"
-msgstr ""
-
-#: builtin/update-ref.c:503
-msgid "stdin has NUL-terminated arguments"
-msgstr ""
-
-#: builtin/update-ref.c:504
-msgid "read updates from stdin"
-msgstr ""
-
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr ""
-
-#: builtin/update-server-info.c:15
-msgid "update the info files from scratch"
-msgstr ""
-
-#: builtin/upload-pack.c:11
-msgid "git upload-pack [<options>] <dir>"
-msgstr ""
-
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
-msgid "quit after a single request/response exchange"
-msgstr ""
-
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr ""
-
-#: builtin/upload-pack.c:27
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr ""
-
-#: builtin/upload-pack.c:29
-msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr ""
-
-#: builtin/verify-commit.c:19
-msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr ""
-
-#: builtin/verify-commit.c:68
-msgid "print commit contents"
-msgstr ""
-
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
-msgid "print raw gpg status output"
-msgstr ""
-
-#: builtin/verify-pack.c:59
-msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
-msgstr ""
-
-#: builtin/verify-pack.c:70
-msgid "verbose"
-msgstr ""
-
-#: builtin/verify-pack.c:72
-msgid "show statistics only"
-msgstr ""
-
-#: builtin/verify-tag.c:18
-msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
-msgstr ""
-
-#: builtin/verify-tag.c:36
-msgid "print tag contents"
-msgstr ""
-
-#: builtin/worktree.c:18
-msgid "git worktree add [<options>] <path> [<commit-ish>]"
-msgstr ""
-
-#: builtin/worktree.c:19
-msgid "git worktree list [<options>]"
-msgstr ""
-
-#: builtin/worktree.c:20
-msgid "git worktree lock [<options>] <path>"
-msgstr ""
-
-#: builtin/worktree.c:21
-msgid "git worktree move <worktree> <new-path>"
-msgstr ""
-
-#: builtin/worktree.c:22
-msgid "git worktree prune [<options>]"
-msgstr ""
-
-#: builtin/worktree.c:23
-msgid "git worktree remove [<options>] <worktree>"
-msgstr ""
-
-#: builtin/worktree.c:24
-msgid "git worktree unlock <path>"
-msgstr ""
-
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr ""
-
-#: builtin/worktree.c:74
-#, c-format
-msgid "Removing %s/%s: %s"
-msgstr ""
-
-#: builtin/worktree.c:147
-msgid "report pruned working trees"
-msgstr ""
-
-#: builtin/worktree.c:149
-msgid "expire working trees older than <time>"
-msgstr ""
-
-#: builtin/worktree.c:219
-#, c-format
-msgid "'%s' already exists"
-msgstr ""
-
-#: builtin/worktree.c:228
-#, c-format
-msgid "unusable worktree destination '%s'"
-msgstr ""
-
-#: builtin/worktree.c:233
-#, c-format
-msgid ""
-"'%s' is a missing but locked worktree;\n"
-"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
-msgstr ""
-
-#: builtin/worktree.c:235
-#, c-format
-msgid ""
-"'%s' is a missing but already registered worktree;\n"
-"use '%s -f' to override, or 'prune' or 'remove' to clear"
-msgstr ""
-
-#: builtin/worktree.c:286
-#, c-format
-msgid "could not create directory of '%s'"
-msgstr ""
-
-#: builtin/worktree.c:308
-msgid "initializing"
-msgstr ""
-
-#: builtin/worktree.c:420 builtin/worktree.c:426
-#, c-format
-msgid "Preparing worktree (new branch '%s')"
-msgstr ""
-
-#: builtin/worktree.c:422
-#, c-format
-msgid "Preparing worktree (resetting branch '%s'; was at %s)"
-msgstr ""
-
-#: builtin/worktree.c:431
-#, c-format
-msgid "Preparing worktree (checking out '%s')"
-msgstr ""
-
-#: builtin/worktree.c:437
-#, c-format
-msgid "Preparing worktree (detached HEAD %s)"
-msgstr ""
-
-#: builtin/worktree.c:482
-msgid "checkout <branch> even if already checked out in other worktree"
-msgstr ""
-
-#: builtin/worktree.c:485
-msgid "create a new branch"
-msgstr ""
-
-#: builtin/worktree.c:487
-msgid "create or reset a branch"
-msgstr ""
-
-#: builtin/worktree.c:489
-msgid "populate the new working tree"
-msgstr ""
-
-#: builtin/worktree.c:490
-msgid "keep the new working tree locked"
-msgstr ""
-
-#: builtin/worktree.c:492 builtin/worktree.c:729
-msgid "reason for locking"
-msgstr ""
-
-#: builtin/worktree.c:495
-msgid "set up tracking mode (see git-branch(1))"
-msgstr ""
-
-#: builtin/worktree.c:498
-msgid "try to match the new branch name with a remote-tracking branch"
-msgstr ""
-
-#: builtin/worktree.c:506
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:508
-msgid "--reason requires --lock"
-msgstr ""
-
-#: builtin/worktree.c:512
-msgid "added with --lock"
-msgstr ""
-
-#: builtin/worktree.c:574
-msgid "--[no-]track can only be used if a new branch is created"
-msgstr ""
-
-#: builtin/worktree.c:691
-msgid "show extended annotations and reasons, if available"
-msgstr ""
-
-#: builtin/worktree.c:693
-msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr ""
-
-#: builtin/worktree.c:702
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
-#, c-format
-msgid "'%s' is not a working tree"
-msgstr ""
-
-#: builtin/worktree.c:743 builtin/worktree.c:776
-msgid "The main working tree cannot be locked or unlocked"
-msgstr ""
-
-#: builtin/worktree.c:748
-#, c-format
-msgid "'%s' is already locked, reason: %s"
-msgstr ""
-
-#: builtin/worktree.c:750
-#, c-format
-msgid "'%s' is already locked"
-msgstr ""
-
-#: builtin/worktree.c:778
-#, c-format
-msgid "'%s' is not locked"
-msgstr ""
-
-#: builtin/worktree.c:819
-msgid "working trees containing submodules cannot be moved or removed"
-msgstr ""
-
-#: builtin/worktree.c:827
-msgid "force move even if worktree is dirty or locked"
-msgstr ""
-
-#: builtin/worktree.c:850 builtin/worktree.c:974
-#, c-format
-msgid "'%s' is a main working tree"
-msgstr ""
-
-#: builtin/worktree.c:855
-#, c-format
-msgid "could not figure out destination name from '%s'"
-msgstr ""
-
-#: builtin/worktree.c:868
-#, 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:870
-msgid ""
-"cannot move a locked working tree;\n"
-"use 'move -f -f' to override or unlock first"
-msgstr ""
-
-#: builtin/worktree.c:873
-#, c-format
-msgid "validation failed, cannot move working tree: %s"
-msgstr ""
-
-#: builtin/worktree.c:878
-#, c-format
-msgid "failed to move '%s' to '%s'"
-msgstr ""
-
-#: builtin/worktree.c:924
-#, c-format
-msgid "failed to run 'git status' on '%s'"
-msgstr ""
-
-#: builtin/worktree.c:928
-#, c-format
-msgid "'%s' contains modified or untracked files, use --force to delete it"
-msgstr ""
-
-#: builtin/worktree.c:933
-#, c-format
-msgid "failed to run 'git status' on '%s', code %d"
-msgstr ""
-
-#: builtin/worktree.c:956
-msgid "force removal even if worktree is dirty or locked"
-msgstr ""
-
-#: builtin/worktree.c:979
-#, 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:981
-msgid ""
-"cannot remove a locked working tree;\n"
-"use 'remove -f -f' to override or unlock first"
-msgstr ""
-
-#: builtin/worktree.c:984
-#, c-format
-msgid "validation failed, cannot remove working tree: %s"
-msgstr ""
-
-#: builtin/worktree.c:1008
-#, c-format
-msgid "repair: %s: %s"
-msgstr ""
-
-#: builtin/worktree.c:1011
-#, c-format
-msgid "error: %s: %s"
-msgstr ""
-
-#: builtin/write-tree.c:15
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
-msgstr ""
-
-#: builtin/write-tree.c:28
-msgid "<prefix>/"
-msgstr ""
-
-#: builtin/write-tree.c:29
-msgid "write tree object for a subdirectory <prefix>"
-msgstr ""
-
-#: builtin/write-tree.c:31
-msgid "only useful for debugging"
-msgstr ""
-
-#: git.c:28
-msgid ""
-"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
-" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
-" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-" <command> [<args>]"
-msgstr ""
-
-#: git.c:36
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"See 'git help git' for an overview of the system."
-msgstr ""
-
-#: git.c:188
-#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr ""
-
-#: git.c:202
-#, c-format
-msgid "no namespace given for --namespace\n"
-msgstr ""
-
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr ""
-
-#: git.c:230
-#, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr ""
-
-#: git.c:252
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr ""
-
-#: git.c:260
-#, c-format
-msgid "no config key given for --config-env\n"
-msgstr ""
-
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr ""
-
-#: git.c:326
-#, c-format
-msgid "unknown option: %s\n"
-msgstr ""
-
-#: git.c:375
-#, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr ""
-
-#: git.c:384
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-
-#: git.c:391
-#, c-format
-msgid "empty alias for %s"
-msgstr ""
-
-#: git.c:394
-#, c-format
-msgid "recursive alias: %s"
-msgstr ""
-
-#: git.c:476
-msgid "write failure on standard output"
-msgstr ""
-
-#: git.c:478
-msgid "unknown write failure on standard output"
-msgstr ""
-
-#: git.c:480
-msgid "close failed on standard output"
-msgstr ""
-
-#: git.c:833
-#, c-format
-msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr ""
-
-#: git.c:883
-#, c-format
-msgid "cannot handle %s as a builtin"
-msgstr ""
-
-#: git.c:896
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-
-#: git.c:916
-#, c-format
-msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr ""
-
-#: git.c:928
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr ""
-
-#: http-fetch.c:118
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr ""
-
-#: http-fetch.c:128
-msgid "not a git repository"
-msgstr ""
-
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr ""
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr ""
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr ""
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr ""
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr ""
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr ""
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr ""
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:682
-msgid "test-helper simple-ipc is-active [<name>] [<options>]"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:683
-msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:684
-msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:685
-msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:686
-msgid "test-helper simple-ipc send [<name>] [<token>]"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:687
-msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:688
-msgid ""
-"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:696
-msgid "name or pathname of unix domain socket"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:698
-msgid "named-pipe name"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:700
-msgid "number of threads in server thread pool"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:701
-msgid "seconds to wait for daemon to start or stop"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:703
-msgid "number of bytes"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:704
-msgid "number of requests per thread"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:706
-msgid "byte"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:706
-msgid "ballast character"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:707
-msgid "token"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:707
-msgid "command token to send to the server"
-msgstr ""
-
-#: http.c:399
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr ""
-
-#: http.c:420
-msgid "Delegation control is not supported with cURL < 7.22.0"
-msgstr ""
-
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr ""
-
-#: http.c:910
-msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr ""
-
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr ""
-
-#: http.c:1132
-#, c-format
-msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr ""
-
-#: http.c:1139
-#, c-format
-msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
-msgstr ""
-
-#: http.c:1143
-#, c-format
-msgid "Could not set SSL backend to '%s': already set"
-msgstr ""
-
-#: http.c:2034
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-" asked for: %s\n"
-" redirect: %s"
-msgstr ""
-
-#: remote-curl.c:183
-#, c-format
-msgid "invalid quoting in push-option value: '%s'"
-msgstr ""
-
-#: remote-curl.c:307
-#, c-format
-msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr ""
-
-#: remote-curl.c:408
-msgid "invalid server response; expected service, got flush packet"
-msgstr ""
-
-#: remote-curl.c:439
-#, c-format
-msgid "invalid server response; got '%s'"
-msgstr ""
-
-#: remote-curl.c:499
-#, c-format
-msgid "repository '%s' not found"
-msgstr ""
-
-#: remote-curl.c:503
-#, c-format
-msgid "Authentication failed for '%s'"
-msgstr ""
-
-#: remote-curl.c:507
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr ""
-
-#: remote-curl.c:513
-#, c-format
-msgid "redirecting to %s"
-msgstr ""
-
-#: remote-curl.c:644
-msgid "shouldn't have EOF when not gentle on EOF"
-msgstr ""
-
-#: remote-curl.c:656
-msgid "remote server sent unexpected response end packet"
-msgstr ""
-
-#: remote-curl.c:726
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
-msgstr ""
-
-#: remote-curl.c:756
-#, c-format
-msgid "remote-curl: bad line length character: %.4s"
-msgstr ""
-
-#: remote-curl.c:758
-msgid "remote-curl: unexpected response end packet"
-msgstr ""
-
-#: remote-curl.c:834
-#, c-format
-msgid "RPC failed; %s"
-msgstr ""
-
-#: remote-curl.c:874
-msgid "cannot handle pushes this big"
-msgstr ""
-
-#: remote-curl.c:989
-#, c-format
-msgid "cannot deflate request; zlib deflate error %d"
-msgstr ""
-
-#: remote-curl.c:993
-#, c-format
-msgid "cannot deflate request; zlib end error %d"
-msgstr ""
-
-#: remote-curl.c:1043
-#, c-format
-msgid "%d bytes of length header were received"
-msgstr ""
-
-#: remote-curl.c:1045
-#, c-format
-msgid "%d bytes of body are still expected"
-msgstr ""
-
-#: remote-curl.c:1134
-msgid "dumb http transport does not support shallow capabilities"
-msgstr ""
-
-#: remote-curl.c:1149
-msgid "fetch failed."
-msgstr ""
-
-#: remote-curl.c:1195
-msgid "cannot fetch by sha1 over smart http"
-msgstr ""
-
-#: remote-curl.c:1239 remote-curl.c:1245
-#, c-format
-msgid "protocol error: expected sha/ref, got '%s'"
-msgstr ""
-
-#: remote-curl.c:1257 remote-curl.c:1375
-#, c-format
-msgid "http transport does not support %s"
-msgstr ""
-
-#: remote-curl.c:1293
-msgid "git-http-push failed"
-msgstr ""
-
-#: remote-curl.c:1481
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr ""
-
-#: remote-curl.c:1513
-msgid "remote-curl: error reading command stream from git"
-msgstr ""
-
-#: remote-curl.c:1520
-msgid "remote-curl: fetch attempted without a local repo"
-msgstr ""
-
-#: remote-curl.c:1561
-#, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr ""
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr ""
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr ""
-
-#: list-objects-filter-options.h:94
-msgid "args"
-msgstr ""
-
-#: list-objects-filter-options.h:95
-msgid "object filtering"
-msgstr ""
-
-#: parse-options.h:184
-msgid "expiry-date"
-msgstr ""
-
-#: parse-options.h:198
-msgid "no-op (backward compatibility)"
-msgstr ""
-
-#: parse-options.h:310
-msgid "be more verbose"
-msgstr ""
-
-#: parse-options.h:312
-msgid "be more quiet"
-msgstr ""
-
-#: parse-options.h:318
-msgid "use <n> digits to display object names"
-msgstr ""
-
-#: parse-options.h:337
-msgid "how to strip spaces and #comments from message"
-msgstr ""
-
-#: parse-options.h:338
-msgid "read pathspec from file"
-msgstr ""
-
-#: parse-options.h:339
-msgid ""
-"with --pathspec-from-file, pathspec elements are separated with NUL character"
-msgstr ""
-
-#: ref-filter.h:99
-msgid "key"
-msgstr ""
-
-#: ref-filter.h:99
-msgid "field name to sort on"
-msgstr ""
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-
-#: command-list.h:50
-msgid "Add file contents to the index"
-msgstr ""
-
-#: command-list.h:51
-msgid "Apply a series of patches from a mailbox"
-msgstr ""
-
-#: command-list.h:52
-msgid "Annotate file lines with commit information"
-msgstr ""
-
-#: command-list.h:53
-msgid "Apply a patch to files and/or to the index"
-msgstr ""
-
-#: command-list.h:54
-msgid "Import a GNU Arch repository into Git"
-msgstr ""
-
-#: command-list.h:55
-msgid "Create an archive of files from a named tree"
-msgstr ""
-
-#: command-list.h:56
-msgid "Use binary search to find the commit that introduced a bug"
-msgstr ""
-
-#: command-list.h:57
-msgid "Show what revision and author last modified each line of a file"
-msgstr ""
-
-#: command-list.h:58
-msgid "List, create, or delete branches"
-msgstr ""
-
-#: command-list.h:59
-msgid "Collect information for user to file a bug report"
-msgstr ""
-
-#: command-list.h:60
-msgid "Move objects and refs by archive"
-msgstr ""
-
-#: command-list.h:61
-msgid "Provide content or type and size information for repository objects"
-msgstr ""
-
-#: command-list.h:62
-msgid "Display gitattributes information"
-msgstr ""
-
-#: command-list.h:63
-msgid "Debug gitignore / exclude files"
-msgstr ""
-
-#: command-list.h:64
-msgid "Show canonical names and email addresses of contacts"
-msgstr ""
-
-#: command-list.h:65
-msgid "Switch branches or restore working tree files"
-msgstr ""
-
-#: command-list.h:66
-msgid "Copy files from the index to the working tree"
-msgstr ""
-
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr ""
-
-#: command-list.h:68
-msgid "Find commits yet to be applied to upstream"
-msgstr ""
-
-#: command-list.h:69
-msgid "Apply the changes introduced by some existing commits"
-msgstr ""
-
-#: command-list.h:70
-msgid "Graphical alternative to git-commit"
-msgstr ""
-
-#: command-list.h:71
-msgid "Remove untracked files from the working tree"
-msgstr ""
-
-#: command-list.h:72
-msgid "Clone a repository into a new directory"
-msgstr ""
-
-#: command-list.h:73
-msgid "Display data in columns"
-msgstr ""
-
-#: command-list.h:74
-msgid "Record changes to the repository"
-msgstr ""
-
-#: command-list.h:75
-msgid "Write and verify Git commit-graph files"
-msgstr ""
-
-#: command-list.h:76
-msgid "Create a new commit object"
-msgstr ""
-
-#: command-list.h:77
-msgid "Get and set repository or global options"
-msgstr ""
-
-#: command-list.h:78
-msgid "Count unpacked number of objects and their disk consumption"
-msgstr ""
-
-#: command-list.h:79
-msgid "Retrieve and store user credentials"
-msgstr ""
-
-#: command-list.h:80
-msgid "Helper to temporarily store passwords in memory"
-msgstr ""
-
-#: command-list.h:81
-msgid "Helper to store credentials on disk"
-msgstr ""
-
-#: command-list.h:82
-msgid "Export a single commit to a CVS checkout"
-msgstr ""
-
-#: command-list.h:83
-msgid "Salvage your data out of another SCM people love to hate"
-msgstr ""
-
-#: command-list.h:84
-msgid "A CVS server emulator for Git"
-msgstr ""
-
-#: command-list.h:85
-msgid "A really simple server for Git repositories"
-msgstr ""
-
-#: command-list.h:86
-msgid "Give an object a human readable name based on an available ref"
-msgstr ""
-
-#: command-list.h:87
-msgid "Show changes between commits, commit and working tree, etc"
-msgstr ""
-
-#: command-list.h:88
-msgid "Compares files in the working tree and the index"
-msgstr ""
-
-#: command-list.h:89
-msgid "Compare a tree to the working tree or index"
-msgstr ""
-
-#: command-list.h:90
-msgid "Compares the content and mode of blobs found via two tree objects"
-msgstr ""
-
-#: command-list.h:91
-msgid "Show changes using common diff tools"
-msgstr ""
-
-#: command-list.h:92
-msgid "Git data exporter"
-msgstr ""
-
-#: command-list.h:93
-msgid "Backend for fast Git data importers"
-msgstr ""
-
-#: command-list.h:94
-msgid "Download objects and refs from another repository"
-msgstr ""
-
-#: command-list.h:95
-msgid "Receive missing objects from another repository"
-msgstr ""
-
-#: command-list.h:96
-msgid "Rewrite branches"
-msgstr ""
-
-#: command-list.h:97
-msgid "Produce a merge commit message"
-msgstr ""
-
-#: command-list.h:98
-msgid "Output information on each ref"
-msgstr ""
-
-#: command-list.h:99
-msgid "Run a Git command on a list of repositories"
-msgstr ""
-
-#: command-list.h:100
-msgid "Prepare patches for e-mail submission"
-msgstr ""
-
-#: command-list.h:101
-msgid "Verifies the connectivity and validity of the objects in the database"
-msgstr ""
-
-#: command-list.h:102
-msgid "Cleanup unnecessary files and optimize the local repository"
-msgstr ""
-
-#: command-list.h:103
-msgid "Extract commit ID from an archive created using git-archive"
-msgstr ""
-
-#: command-list.h:104
-msgid "Print lines matching a pattern"
-msgstr ""
-
-#: command-list.h:105
-msgid "A portable graphical interface to Git"
-msgstr ""
-
-#: command-list.h:106
-msgid "Compute object ID and optionally creates a blob from a file"
-msgstr ""
-
-#: command-list.h:107
-msgid "Display help information about Git"
-msgstr ""
-
-#: command-list.h:108
-msgid "Server side implementation of Git over HTTP"
-msgstr ""
-
-#: command-list.h:109
-msgid "Download from a remote Git repository via HTTP"
-msgstr ""
-
-#: command-list.h:110
-msgid "Push objects over HTTP/DAV to another repository"
-msgstr ""
-
-#: command-list.h:111
-msgid "Send a collection of patches from stdin to an IMAP folder"
-msgstr ""
-
-#: command-list.h:112
-msgid "Build pack index file for an existing packed archive"
-msgstr ""
-
-#: command-list.h:113
-msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr ""
-
-#: command-list.h:114
-msgid "Instantly browse your working repository in gitweb"
-msgstr ""
-
-#: command-list.h:115
-msgid "Add or parse structured information in commit messages"
-msgstr ""
-
-#: command-list.h:116
-msgid "The Git repository browser"
-msgstr ""
-
-#: command-list.h:117
-msgid "Show commit logs"
-msgstr ""
-
-#: command-list.h:118
-msgid "Show information about files in the index and the working tree"
-msgstr ""
-
-#: command-list.h:119
-msgid "List references in a remote repository"
-msgstr ""
-
-#: command-list.h:120
-msgid "List the contents of a tree object"
-msgstr ""
-
-#: command-list.h:121
-msgid "Extracts patch and authorship from a single e-mail message"
-msgstr ""
-
-#: command-list.h:122
-msgid "Simple UNIX mbox splitter program"
-msgstr ""
-
-#: command-list.h:123
-msgid "Run tasks to optimize Git repository data"
-msgstr ""
-
-#: command-list.h:124
-msgid "Join two or more development histories together"
-msgstr ""
-
-#: command-list.h:125
-msgid "Find as good common ancestors as possible for a merge"
-msgstr ""
-
-#: command-list.h:126
-msgid "Run a three-way file merge"
-msgstr ""
-
-#: command-list.h:127
-msgid "Run a merge for files needing merging"
-msgstr ""
-
-#: command-list.h:128
-msgid "The standard helper program to use with git-merge-index"
-msgstr ""
-
-#: command-list.h:129
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr ""
-
-#: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr ""
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr ""
-
-#: command-list.h:132
-msgid "Creates a tag object with extra validation"
-msgstr ""
-
-#: command-list.h:133
-msgid "Build a tree-object from ls-tree formatted text"
-msgstr ""
-
-#: command-list.h:134
-msgid "Move or rename a file, a directory, or a symlink"
-msgstr ""
-
-#: command-list.h:135
-msgid "Find symbolic names for given revs"
-msgstr ""
-
-#: command-list.h:136
-msgid "Add or inspect object notes"
-msgstr ""
-
-#: command-list.h:137
-msgid "Import from and submit to Perforce repositories"
-msgstr ""
-
-#: command-list.h:138
-msgid "Create a packed archive of objects"
-msgstr ""
-
-#: command-list.h:139
-msgid "Find redundant pack files"
-msgstr ""
-
-#: command-list.h:140
-msgid "Pack heads and tags for efficient repository access"
-msgstr ""
-
-#: command-list.h:141
-msgid "Compute unique ID for a patch"
-msgstr ""
-
-#: command-list.h:142
-msgid "Prune all unreachable objects from the object database"
-msgstr ""
-
-#: command-list.h:143
-msgid "Remove extra objects that are already in pack files"
-msgstr ""
-
-#: command-list.h:144
-msgid "Fetch from and integrate with another repository or a local branch"
-msgstr ""
-
-#: command-list.h:145
-msgid "Update remote refs along with associated objects"
-msgstr ""
-
-#: command-list.h:146
-msgid "Applies a quilt patchset onto the current branch"
-msgstr ""
-
-#: command-list.h:147
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr ""
-
-#: command-list.h:148
-msgid "Reads tree information into the index"
-msgstr ""
-
-#: command-list.h:149
-msgid "Reapply commits on top of another base tip"
-msgstr ""
-
-#: command-list.h:150
-msgid "Receive what is pushed into the repository"
-msgstr ""
-
-#: command-list.h:151
-msgid "Manage reflog information"
-msgstr ""
-
-#: command-list.h:152
-msgid "Manage set of tracked repositories"
-msgstr ""
-
-#: command-list.h:153
-msgid "Pack unpacked objects in a repository"
-msgstr ""
-
-#: command-list.h:154
-msgid "Create, list, delete refs to replace objects"
-msgstr ""
-
-#: command-list.h:155
-msgid "Generates a summary of pending changes"
-msgstr ""
-
-#: command-list.h:156
-msgid "Reuse recorded resolution of conflicted merges"
-msgstr ""
-
-#: command-list.h:157
-msgid "Reset current HEAD to the specified state"
-msgstr ""
-
-#: command-list.h:158
-msgid "Restore working tree files"
-msgstr ""
-
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr ""
-
-#: command-list.h:160
-msgid "Lists commit objects in reverse chronological order"
-msgstr ""
-
-#: command-list.h:161
-msgid "Pick out and massage parameters"
-msgstr ""
-
-#: command-list.h:162
-msgid "Remove files from the working tree and from the index"
-msgstr ""
-
-#: command-list.h:163
-msgid "Send a collection of patches as emails"
-msgstr ""
-
-#: command-list.h:164
-msgid "Push objects over Git protocol to another repository"
-msgstr ""
-
-#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
-msgstr ""
-
-#: command-list.h:166
-msgid "Summarize 'git log' output"
-msgstr ""
-
-#: command-list.h:167
-msgid "Show various types of objects"
-msgstr ""
-
-#: command-list.h:168
-msgid "Show branches and their commits"
-msgstr ""
-
-#: command-list.h:169
-msgid "Show packed archive index"
-msgstr ""
-
-#: command-list.h:170
-msgid "List references in a local repository"
-msgstr ""
-
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr ""
-
-#: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr ""
-
-#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
-msgstr ""
-
-#: command-list.h:174
-msgid "Stash the changes in a dirty working directory away"
-msgstr ""
-
-#: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr ""
-
-#: command-list.h:176
-msgid "Show the working tree status"
-msgstr ""
-
-#: command-list.h:177
-msgid "Remove unnecessary whitespace"
-msgstr ""
-
-#: command-list.h:178
-msgid "Initialize, update or inspect submodules"
-msgstr ""
-
-#: command-list.h:179
-msgid "Bidirectional operation between a Subversion repository and Git"
-msgstr ""
-
-#: command-list.h:180
-msgid "Switch branches"
-msgstr ""
-
-#: command-list.h:181
-msgid "Read, modify and delete symbolic refs"
-msgstr ""
-
-#: command-list.h:182
-msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr ""
-
-#: command-list.h:183
-msgid "Creates a temporary file with a blob's contents"
-msgstr ""
-
-#: command-list.h:184
-msgid "Unpack objects from a packed archive"
-msgstr ""
-
-#: command-list.h:185
-msgid "Register file contents in the working tree to the index"
-msgstr ""
-
-#: command-list.h:186
-msgid "Update the object name stored in a ref safely"
-msgstr ""
-
-#: command-list.h:187
-msgid "Update auxiliary info file to help dumb servers"
-msgstr ""
-
-#: command-list.h:188
-msgid "Send archive back to git-archive"
-msgstr ""
-
-#: command-list.h:189
-msgid "Send objects packed back to git-fetch-pack"
-msgstr ""
-
-#: command-list.h:190
-msgid "Show a Git logical variable"
-msgstr ""
-
-#: command-list.h:191
-msgid "Check the GPG signature of commits"
-msgstr ""
-
-#: command-list.h:192
-msgid "Validate packed Git archive files"
-msgstr ""
-
-#: command-list.h:193
-msgid "Check the GPG signature of tags"
-msgstr ""
-
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr ""
-
-#: command-list.h:195
-msgid "Show logs with difference each commit introduces"
-msgstr ""
-
-#: command-list.h:196
-msgid "Manage multiple working trees"
-msgstr ""
-
-#: command-list.h:197
-msgid "Create a tree object from the current index"
-msgstr ""
-
-#: command-list.h:198
-msgid "Defining attributes per path"
-msgstr ""
-
-#: command-list.h:199
-msgid "Git command-line interface and conventions"
-msgstr ""
-
-#: command-list.h:200
-msgid "A Git core tutorial for developers"
-msgstr ""
-
-#: command-list.h:201
-msgid "Providing usernames and passwords to Git"
-msgstr ""
-
-#: command-list.h:202
-msgid "Git for CVS users"
-msgstr ""
-
-#: command-list.h:203
-msgid "Tweaking diff output"
-msgstr ""
-
-#: command-list.h:204
-msgid "A useful minimum set of commands for Everyday Git"
-msgstr ""
-
-#: command-list.h:205
-msgid "Frequently asked questions about using Git"
-msgstr ""
-
-#: command-list.h:206
-msgid "A Git Glossary"
-msgstr ""
-
-#: command-list.h:207
-msgid "Hooks used by Git"
-msgstr ""
-
-#: command-list.h:208
-msgid "Specifies intentionally untracked files to ignore"
-msgstr ""
-
-#: command-list.h:209
-msgid "Map author/committer names and/or E-Mail addresses"
-msgstr ""
-
-#: command-list.h:210
-msgid "Defining submodule properties"
-msgstr ""
-
-#: command-list.h:211
-msgid "Git namespaces"
-msgstr ""
-
-#: command-list.h:212
-msgid "Helper programs to interact with remote repositories"
-msgstr ""
-
-#: command-list.h:213
-msgid "Git Repository Layout"
-msgstr ""
-
-#: command-list.h:214
-msgid "Specifying revisions and ranges for Git"
-msgstr ""
-
-#: command-list.h:215
-msgid "Mounting one repository inside another"
-msgstr ""
-
-#: command-list.h:216
-msgid "A tutorial introduction to Git: part two"
-msgstr ""
-
-#: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr ""
-
-#: command-list.h:218
-msgid "An overview of recommended workflows with Git"
-msgstr ""
-
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr ""
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr ""
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr ""
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr ""
-
-#: git-merge-octopus.sh:46
-msgid ""
-"Error: Your local changes to the following files would be overwritten by "
-"merge"
-msgstr ""
-
-#: git-merge-octopus.sh:61
-msgid "Automated merge did not work."
-msgstr ""
-
-#: git-merge-octopus.sh:62
-msgid "Should not be doing an octopus."
-msgstr ""
-
-#: git-merge-octopus.sh:73
-#, sh-format
-msgid "Unable to find common commit with $pretty_name"
-msgstr ""
-
-#: git-merge-octopus.sh:77
-#, sh-format
-msgid "Already up to date with $pretty_name"
-msgstr ""
-
-#: git-merge-octopus.sh:89
-#, sh-format
-msgid "Fast-forwarding to: $pretty_name"
-msgstr ""
-
-#: git-merge-octopus.sh:97
-#, sh-format
-msgid "Trying simple merge with $pretty_name"
-msgstr ""
-
-#: git-merge-octopus.sh:102
-msgid "Simple merge did not work, trying automatic merge."
-msgstr ""
-
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr ""
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr ""
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr ""
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:532
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:542
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:547
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr ""
-
-#: git-submodule.sh:627
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr ""
-
-#: git-sh-setup.sh:89 git-sh-setup.sh:94
-#, sh-format
-msgid "usage: $dashless $USAGE"
-msgstr ""
-
-#: git-sh-setup.sh:191
-#, sh-format
-msgid "Cannot chdir to $cdup, the toplevel of the working tree"
-msgstr ""
-
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
-#, sh-format
-msgid "fatal: $program_name cannot be used without a working tree."
-msgstr ""
-
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:224
-msgid "Cannot rewrite branches: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:230
-#, sh-format
-msgid "Cannot $action: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:249
-#, sh-format
-msgid "Cannot $action: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:253
-msgid "Additionally, your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:373
-msgid "You need to run this command from the toplevel of the working tree."
-msgstr ""
-
-#: git-sh-setup.sh:378
-msgid "Unable to determine absolute path of git directory"
-msgstr ""
-
-#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
-#, perl-format
-msgid "%12s %12s %s"
-msgstr ""
-
-#: git-add--interactive.perl:632
-#, perl-format
-msgid "touched %d path\n"
-msgid_plural "touched %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-add--interactive.perl:1056
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for staging."
-msgstr ""
-
-#: git-add--interactive.perl:1059
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for stashing."
-msgstr ""
-
-#: git-add--interactive.perl:1062
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for unstaging."
-msgstr ""
-
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for applying."
-msgstr ""
-
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for discarding."
-msgstr ""
-
-#: git-add--interactive.perl:1114
-#, perl-format
-msgid "failed to open hunk edit file for writing: %s"
-msgstr ""
-
-#: git-add--interactive.perl:1121
-#, perl-format
-msgid ""
-"---\n"
-"To remove '%s' lines, make them ' ' lines (context).\n"
-"To remove '%s' lines, delete them.\n"
-"Lines starting with %s will be removed.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1143
-#, perl-format
-msgid "failed to open hunk edit file for reading: %s"
-msgstr ""
-
-#: git-add--interactive.perl:1251
-msgid ""
-"y - stage this hunk\n"
-"n - do not stage this hunk\n"
-"q - quit; do not stage this hunk or any of the remaining ones\n"
-"a - stage this hunk and all later hunks in the file\n"
-"d - do not stage this hunk or any of the later hunks in the file"
-msgstr ""
-
-#: git-add--interactive.perl:1257
-msgid ""
-"y - stash this hunk\n"
-"n - do not stash this hunk\n"
-"q - quit; do not stash this hunk or any of the remaining ones\n"
-"a - stash this hunk and all later hunks in the file\n"
-"d - do not stash this hunk or any of the later hunks in the file"
-msgstr ""
-
-#: git-add--interactive.perl:1263
-msgid ""
-"y - unstage this hunk\n"
-"n - do not unstage this hunk\n"
-"q - quit; do not unstage this hunk or any of the remaining ones\n"
-"a - unstage this hunk and all later hunks in the file\n"
-"d - do not unstage this hunk or any of the later hunks in the file"
-msgstr ""
-
-#: git-add--interactive.perl:1269
-msgid ""
-"y - apply this hunk to index\n"
-"n - do not apply this hunk to index\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"a - apply this hunk and all later hunks in the file\n"
-"d - do not apply this hunk or any of the later hunks in the file"
-msgstr ""
-
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
-msgid ""
-"y - discard this hunk from worktree\n"
-"n - do not discard this hunk from worktree\n"
-"q - quit; do not discard this hunk or any of the remaining ones\n"
-"a - discard this hunk and all later hunks in the file\n"
-"d - do not discard this hunk or any of the later hunks in the file"
-msgstr ""
-
-#: git-add--interactive.perl:1281
-msgid ""
-"y - discard this hunk from index and worktree\n"
-"n - do not discard this hunk from index and worktree\n"
-"q - quit; do not discard this hunk or any of the remaining ones\n"
-"a - discard this hunk and all later hunks in the file\n"
-"d - do not discard this hunk or any of the later hunks in the file"
-msgstr ""
-
-#: git-add--interactive.perl:1287
-msgid ""
-"y - apply this hunk to index and worktree\n"
-"n - do not apply this hunk to index and worktree\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"a - apply this hunk and all later hunks in the file\n"
-"d - do not apply this hunk or any of the later hunks in the file"
-msgstr ""
-
-#: git-add--interactive.perl:1299
-msgid ""
-"y - apply this hunk to worktree\n"
-"n - do not apply this hunk to worktree\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"a - apply this hunk and all later hunks in the file\n"
-"d - do not apply this hunk or any of the later hunks in the file"
-msgstr ""
-
-#: git-add--interactive.perl:1314
-msgid ""
-"g - select a hunk to go to\n"
-"/ - search for a hunk matching the given regex\n"
-"j - leave this hunk undecided, see next undecided hunk\n"
-"J - leave this hunk undecided, see next hunk\n"
-"k - leave this hunk undecided, see previous undecided hunk\n"
-"K - leave this hunk undecided, see previous hunk\n"
-"s - split the current hunk into smaller hunks\n"
-"e - manually edit the current hunk\n"
-"? - print help\n"
-msgstr ""
-
-#: git-add--interactive.perl:1345
-msgid "The selected hunks do not apply to the index!\n"
-msgstr ""
-
-#: git-add--interactive.perl:1360
-#, perl-format
-msgid "ignoring unmerged: %s\n"
-msgstr ""
-
-#: git-add--interactive.perl:1479
-#, perl-format
-msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1480
-#, perl-format
-msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1481
-#, perl-format
-msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1482
-#, perl-format
-msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1599
-msgid "No other hunks to goto\n"
-msgstr ""
-
-#: git-add--interactive.perl:1617
-#, perl-format
-msgid "Invalid number: '%s'\n"
-msgstr ""
-
-#: git-add--interactive.perl:1622
-#, perl-format
-msgid "Sorry, only %d hunk available.\n"
-msgid_plural "Sorry, only %d hunks available.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-add--interactive.perl:1657
-msgid "No other hunks to search\n"
-msgstr ""
-
-#: git-add--interactive.perl:1674
-#, perl-format
-msgid "Malformed search regexp %s: %s\n"
-msgstr ""
-
-#: git-add--interactive.perl:1684
-msgid "No hunk matches the given pattern\n"
-msgstr ""
-
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
-msgid "No previous hunk\n"
-msgstr ""
-
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
-msgid "No next hunk\n"
-msgstr ""
-
-#: git-add--interactive.perl:1730
-msgid "Sorry, cannot split this hunk\n"
-msgstr ""
-
-#: git-add--interactive.perl:1736
-#, perl-format
-msgid "Split into %d hunk.\n"
-msgid_plural "Split into %d hunks.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-add--interactive.perl:1746
-msgid "Sorry, cannot edit this hunk\n"
-msgstr ""
-
-#. TRANSLATORS: please do not translate the command names
-#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
-msgid ""
-"status - show paths with changes\n"
-"update - add working tree state to the staged set of changes\n"
-"revert - revert staged set of changes back to the HEAD version\n"
-"patch - pick hunks and update selectively\n"
-"diff - view diff between HEAD and index\n"
-"add untracked - add contents of untracked files to the staged set of "
-"changes\n"
-msgstr ""
-
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
-msgid "missing --"
-msgstr ""
-
-#: git-add--interactive.perl:1866
-#, perl-format
-msgid "unknown --patch mode: %s"
-msgstr ""
-
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
-#, perl-format
-msgid "invalid argument %s, expecting --"
-msgstr ""
-
-#: git-send-email.perl:129
-msgid "local zone differs from GMT by a non-minute interval\n"
-msgstr ""
-
-#: git-send-email.perl:136 git-send-email.perl:142
-msgid "local time offset greater than or equal to 24 hours\n"
-msgstr ""
-
-#: git-send-email.perl:214
-#, perl-format
-msgid "fatal: command '%s' died with exit code %d"
-msgstr ""
-
-#: git-send-email.perl:227
-msgid "the editor exited uncleanly, aborting everything"
-msgstr ""
-
-#: git-send-email.perl:316
-#, perl-format
-msgid ""
-"'%s' contains an intermediate version of the email you were composing.\n"
-msgstr ""
-
-#: git-send-email.perl:321
-#, perl-format
-msgid "'%s.final' contains the composed email.\n"
-msgstr ""
-
-#: git-send-email.perl:450
-msgid "--dump-aliases incompatible with other options\n"
-msgstr ""
-
-#: git-send-email.perl:525
-msgid ""
-"fatal: found configuration options for 'sendmail'\n"
-"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
-"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
-msgstr ""
-
-#: git-send-email.perl:530 git-send-email.perl:746
-msgid "Cannot run git format-patch from outside a repository\n"
-msgstr ""
-
-#: git-send-email.perl:533
-msgid ""
-"`batch-size` and `relogin` must be specified together (via command-line or "
-"configuration option)\n"
-msgstr ""
-
-#: git-send-email.perl:546
-#, perl-format
-msgid "Unknown --suppress-cc field: '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:577
-#, perl-format
-msgid "Unknown --confirm setting: '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:617
-#, perl-format
-msgid "warning: sendmail alias with quotes is not supported: %s\n"
-msgstr ""
-
-#: git-send-email.perl:619
-#, perl-format
-msgid "warning: `:include:` not supported: %s\n"
-msgstr ""
-
-#: git-send-email.perl:621
-#, perl-format
-msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
-msgstr ""
-
-#: git-send-email.perl:626
-#, perl-format
-msgid "warning: sendmail line is not recognized: %s\n"
-msgstr ""
-
-#: git-send-email.perl:711
-#, perl-format
-msgid ""
-"File '%s' exists but it could also be the range of commits\n"
-"to produce patches for. Please disambiguate by...\n"
-"\n"
-" * Saying \"./%s\" if you mean a file; or\n"
-" * Giving --format-patch option if you mean a range.\n"
-msgstr ""
-
-#: git-send-email.perl:732
-#, perl-format
-msgid "Failed to opendir %s: %s"
-msgstr ""
-
-#: git-send-email.perl:767
-msgid ""
-"\n"
-"No patch files specified!\n"
-"\n"
-msgstr ""
-
-#: git-send-email.perl:780
-#, perl-format
-msgid "No subject line in %s?"
-msgstr ""
-
-#: git-send-email.perl:791
-#, perl-format
-msgid "Failed to open for writing %s: %s"
-msgstr ""
-
-#: git-send-email.perl:802
-msgid ""
-"Lines beginning in \"GIT:\" will be removed.\n"
-"Consider including an overall diffstat or table of contents\n"
-"for the patch you are writing.\n"
-"\n"
-"Clear the body content if you don't wish to send a summary.\n"
-msgstr ""
-
-#: git-send-email.perl:826
-#, perl-format
-msgid "Failed to open %s: %s"
-msgstr ""
-
-#: git-send-email.perl:843
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr ""
-
-#: git-send-email.perl:886
-msgid "Summary email is empty, skipping it\n"
-msgstr ""
-
-#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
-#, perl-format
-msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr ""
-
-#: git-send-email.perl:990
-msgid ""
-"The following files are 8bit, but do not declare a Content-Transfer-"
-"Encoding.\n"
-msgstr ""
-
-#: git-send-email.perl:995
-msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr ""
-
-#: git-send-email.perl:1003
-#, perl-format
-msgid ""
-"Refusing to send because the patch\n"
-"\t%s\n"
-"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
-"want to send.\n"
-msgstr ""
-
-#: git-send-email.perl:1022
-msgid "To whom should the emails be sent (if anyone)?"
-msgstr ""
-
-#: git-send-email.perl:1040
-#, perl-format
-msgid "fatal: alias '%s' expands to itself\n"
-msgstr ""
-
-#: git-send-email.perl:1052
-msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
-msgstr ""
-
-#: git-send-email.perl:1114 git-send-email.perl:1122
-#, perl-format
-msgid "error: unable to extract a valid address from: %s\n"
-msgstr ""
-
-#. TRANSLATORS: Make sure to include [q] [d] [e] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-send-email.perl:1126
-msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
-msgstr ""
-
-#: git-send-email.perl:1446
-#, perl-format
-msgid "CA path \"%s\" does not exist"
-msgstr ""
-
-#: git-send-email.perl:1529
-msgid ""
-" The Cc list above has been expanded by additional\n"
-" addresses found in the patch commit message. By default\n"
-" send-email prompts before sending whenever this occurs.\n"
-" This behavior is controlled by the sendemail.confirm\n"
-" configuration setting.\n"
-"\n"
-" For additional information, run 'git send-email --help'.\n"
-" To retain the current behavior, but squelch this message,\n"
-" run 'git config --global sendemail.confirm auto'.\n"
-"\n"
-msgstr ""
-
-#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-send-email.perl:1544
-msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-msgstr ""
-
-#: git-send-email.perl:1547
-msgid "Send this email reply required"
-msgstr ""
-
-#: git-send-email.perl:1581
-msgid "The required SMTP server is not properly defined."
-msgstr ""
-
-#: git-send-email.perl:1628
-#, perl-format
-msgid "Server does not support STARTTLS! %s"
-msgstr ""
-
-#: git-send-email.perl:1633 git-send-email.perl:1637
-#, perl-format
-msgid "STARTTLS failed! %s"
-msgstr ""
-
-#: git-send-email.perl:1646
-msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
-msgstr ""
-
-#: git-send-email.perl:1664
-#, perl-format
-msgid "Failed to send %s\n"
-msgstr ""
-
-#: git-send-email.perl:1667
-#, perl-format
-msgid "Dry-Sent %s\n"
-msgstr ""
-
-#: git-send-email.perl:1667
-#, perl-format
-msgid "Sent %s\n"
-msgstr ""
-
-#: git-send-email.perl:1669
-msgid "Dry-OK. Log says:\n"
-msgstr ""
-
-#: git-send-email.perl:1669
-msgid "OK. Log says:\n"
-msgstr ""
-
-#: git-send-email.perl:1688
-msgid "Result: "
-msgstr ""
-
-#: git-send-email.perl:1691
-msgid "Result: OK\n"
-msgstr ""
-
-#: git-send-email.perl:1709
-#, perl-format
-msgid "can't open file %s"
-msgstr ""
-
-#: git-send-email.perl:1756 git-send-email.perl:1776
-#, perl-format
-msgid "(mbox) Adding cc: %s from line '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:1762
-#, perl-format
-msgid "(mbox) Adding to: %s from line '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:1819
-#, perl-format
-msgid "(non-mbox) Adding cc: %s from line '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:1854
-#, perl-format
-msgid "(body) Adding cc: %s from line '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:1965
-#, perl-format
-msgid "(%s) Could not execute '%s'"
-msgstr ""
-
-#: git-send-email.perl:1972
-#, perl-format
-msgid "(%s) Adding %s: %s from: '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:1976
-#, perl-format
-msgid "(%s) failed to close pipe to '%s'"
-msgstr ""
-
-#: git-send-email.perl:2006
-msgid "cannot send message as 7bit"
-msgstr ""
-
-#: git-send-email.perl:2014
-msgid "invalid transfer encoding"
-msgstr ""
-
-#: git-send-email.perl:2051
-#, perl-format
-msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
-"%s\n"
-"warning: no patches were sent\n"
-msgstr ""
-
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
-#, perl-format
-msgid "unable to open %s: %s\n"
-msgstr ""
-
-#: git-send-email.perl:2064
-#, perl-format
-msgid ""
-"fatal: %s:%d is longer than 998 characters\n"
-"warning: no patches were sent\n"
-msgstr ""
-
-#: git-send-email.perl:2082
-#, perl-format
-msgid "Skipping %s with backup suffix '%s'.\n"
-msgstr ""
-
-#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
-#, perl-format
-msgid "Do you really want to send %s? [y|N]: "
-msgstr ""
diff --git a/po/id.po b/po/id.po
index 7db807a..76284fe 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
+"POT-Creation-Date: 2022-04-13 14:52+0800\n"
"PO-Revision-Date: 2021-08-14 09:35+0700\n"
"Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
"Language-Team: Indonesian\n"
@@ -17,244 +17,243 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: add-interactive.c:376
+#: add-interactive.c:382
#, c-format
msgid "Huh (%s)?"
-msgstr "Huh (%s)"
+msgstr "Huh (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
+#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
+#: builtin/rebase.c:1671
msgid "could not read index"
msgstr "tidak dapat membaca indeks"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:590 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "biner"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:648 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "tidak ada"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:649 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "tak berubah"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:686 git-add--interactive.perl:641
msgid "Update"
msgstr "Perbarui"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:703 add-interactive.c:891
#, c-format
msgid "could not stage '%s'"
msgstr "tidak dapat menggelar '%s'"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
msgid "could not write index"
msgstr "tidak dapat menulis indeks"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:712 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d jalur diperbarui\n"
msgstr[1] "%d jalur diperbarui\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:730 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "catatan: %s sekarang tak terlacak.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry gagal untuk jalur '%s'"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:765 git-add--interactive.perl:653
msgid "Revert"
msgstr "Kembalikan"
-#: add-interactive.c:775
+#: add-interactive.c:781
msgid "Could not parse HEAD^{tree}"
msgstr "Tidak dapat menguraikan HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:819 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d jalur dikembalikan\n"
msgstr[1] "%d jalur dikembalikan\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:870 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Tidak ada berkas tak terlacak.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:874 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Tambahkan tak terlacak"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:901 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d jalur ditambahkan\n"
msgstr[1] "%d jalur ditambahkan\n"
-#: add-interactive.c:925
+#: add-interactive.c:931
#, c-format
msgid "ignoring unmerged: %s"
msgstr "mengabaikan tak tergabung: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Hanya berkas biner yang berubah.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Tidak ada perubahan.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:949 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Pembaruan tambalan"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:988 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Tinjau diff"
-#: add-interactive.c:1010
+#: add-interactive.c:1016
msgid "show paths with changes"
msgstr "perlihatkan jalur dengan perubahan"
-#: add-interactive.c:1012
+#: add-interactive.c:1018
msgid "add working tree state to the staged set of changes"
msgstr "tambahkan keadaan pohon kerja ke set perubahan yang tergelar"
-#: add-interactive.c:1014
+#: add-interactive.c:1020
msgid "revert staged set of changes back to the HEAD version"
msgstr "kembalikan set perubahan yang tergelar kembali ke versi HEAD"
-#: add-interactive.c:1016
+#: add-interactive.c:1022
msgid "pick hunks and update selectively"
-msgstr "ambil hunk dan perbarui secara selektif"
+msgstr "ambil bingkah dan perbarui secara selektif"
-#: add-interactive.c:1018
+#: add-interactive.c:1024
msgid "view diff between HEAD and index"
msgstr "lihat diff antara HEAD dan indeks"
-#: add-interactive.c:1020
+#: add-interactive.c:1026
msgid "add contents of untracked files to the staged set of changes"
msgstr "tambahkan isi berkas tak terlacak ke set perubahan yang tergelar"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1034 add-interactive.c:1083
msgid "Prompt help:"
msgstr "Permintaan bantuan:"
-#: add-interactive.c:1030
+#: add-interactive.c:1036
msgid "select a single item"
msgstr "pilih satu item"
-#: add-interactive.c:1032
+#: add-interactive.c:1038
msgid "select a range of items"
msgstr "pilih kisaran item"
-#: add-interactive.c:1034
+#: add-interactive.c:1040
msgid "select multiple ranges"
msgstr "pilih banyak kisaran"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1042 add-interactive.c:1087
msgid "select item based on unique prefix"
msgstr "pilih item berdasarkan prefiks unik"
-#: add-interactive.c:1038
+#: add-interactive.c:1044
msgid "unselect specified items"
msgstr "batal pilih item yang disebutkan"
-#: add-interactive.c:1040
+#: add-interactive.c:1046
msgid "choose all items"
msgstr "pilih semua item"
-#: add-interactive.c:1042
+#: add-interactive.c:1048
msgid "(empty) finish selecting"
msgstr "(kosong) sudah memilih"
-#: add-interactive.c:1079
+#: add-interactive.c:1085
msgid "select a numbered item"
msgstr "pilih item bernomor"
-#: add-interactive.c:1083
+#: add-interactive.c:1089
msgid "(empty) select nothing"
msgstr "(empty) tidak pilih apapun"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** Perintah ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "Apa sekarang"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "staged"
msgstr "tergelar"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "unstaged"
msgstr "tak tergelar"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
+#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
+#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
+#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
#: git-add--interactive.perl:213
msgid "path"
msgstr "jalur"
-#: add-interactive.c:1151
+#: add-interactive.c:1157
msgid "could not refresh index"
msgstr "tidak dapat menyegarkan indeks"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Sampai jumpa.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Gelar perubahan mode [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Gelar penghapusan [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Gelar penambahan [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Gelar hunk ini [y,n,q,a,d%s,?]? "
+msgstr "Gelar bingkah ini [y,n,q,a,d%s,?]? "
#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk digelar."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk digelar."
#: add-patch.c:42
msgid ""
@@ -264,39 +263,39 @@
"a - stage this hunk and all later hunks in the file\n"
"d - do not stage this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - gelar hunk ini\n"
-"n - jangan gelar hunk ini\n"
-"q - keluar; jangan gelar hunk ini atau yang sisanya\n"
-"a - gelar hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan gelar hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - gelar bingkah ini\n"
+"n - jangan gelar bingkah ini\n"
+"q - keluar; jangan gelar bingkah ini atau yang sisanya\n"
+"a - gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan gelar bingkah ini atau bingkah selanjutnya dalam berkas\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Stase perubahan mode [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Stase penghapusan [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Stase penambahan [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Stase hunk ini [y,n,q,a,d%s,?]? "
+msgstr "Stase bingkah ini [y,n,q,a,d%s,?]? "
#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk distase."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk distase."
#: add-patch.c:64
msgid ""
@@ -306,39 +305,39 @@
"a - stash this hunk and all later hunks in the file\n"
"d - do not stash this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - stase hunk ini\n"
-"n - jangan stase hunk ini\n"
-"q - keluar; jangan stase hunk ini atau yang sisanya\n"
-"a - stase hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan stase hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - stase bingkah ini\n"
+"n - jangan stase bingkah ini\n"
+"q - keluar; jangan stase bingkah ini atau yang sisanya\n"
+"a - stase bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan stase bingkah ini atau bingkah selanjutnya dalam berkas\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Batal gelar perubahan mode [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Batal gelar penghapusan [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Batal gelar penambahan [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Batal gelar hunk ini [y,n,q,a,d%s,?]? "
+msgstr "Batal gelar bingkah ini [y,n,q,a,d%s,?]? "
#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk dibatalgelarkan."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk dibatalgelarkan."
#: add-patch.c:88
msgid ""
@@ -348,39 +347,39 @@
"a - unstage this hunk and all later hunks in the file\n"
"d - do not unstage this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - batal gelar hunk ini\n"
-"n - jangan batal gelar hunk ini\n"
-"q - keluar; jangan batal gelar hunk ini atau yang sisanya\n"
-"a - batal gelar hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan batal gelar hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - batal gelar bingkah ini\n"
+"n - jangan batal gelar bingkah ini\n"
+"q - keluar; jangan batal gelar bingkah ini atau yang sisanya\n"
+"a - batal gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan batal gelar bingkah ini atau bingkah selanjutnya dalam berkas\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Terapkan perubahan mode ke indeks [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Terapkan penghapusan ke indeks [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Terapkan penambahan ke indeks [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Terapkan hunk ini ke indeks [y,n,q,a,d%s,?]? "
+msgstr "Terapkan bingkah ini ke indeks [y,n,q,a,d%s,?]? "
#: add-patch.c:108 add-patch.c:176 add-patch.c:221
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk diterapkan."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk diterapkan."
#: add-patch.c:111
msgid ""
@@ -390,43 +389,43 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - terapkan hunk ini ke indeks\n"
-"n - jangan terapkan hunk ini ke indeks\n"
-"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"
-"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - terapkan bingkah ini ke indeks\n"
+"n - jangan terapkan bingkah ini ke indeks\n"
+"q - keluar; jangan terapkan bingkah ini atau yang sisanya\n"
+"a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Buang perubahan mode dari pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Buang penghapusan dari pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Buang penambahan dari pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Buang hunk ini dari pohon kerja [y,n,q,a,d%s,?]? "
+msgstr "Buang bingkah ini dari pohon kerja [y,n,q,a,d%s,?]? "
#: add-patch.c:131 add-patch.c:154 add-patch.c:199
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk dibuang."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk dibuang."
#: add-patch.c:134 add-patch.c:202
msgid ""
@@ -436,31 +435,31 @@
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - buang hunk ini dari pohon kerja\n"
-"n - jangan buang hunk ini dari pohon kerja\n"
-"q - keluar; jangan buang hunk ini atau yang sisanya\n"
-"a - buang hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan buang hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - buang bingkah ini dari pohon kerja\n"
+"n - jangan buang bingkah ini dari pohon kerja\n"
+"q - keluar; jangan buang bingkah ini atau yang sisanya\n"
+"a - buang hunk ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan buang hunk ini atau bingkah selanjutnya dalam berkas\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Buang perubahan mode dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Buang penghapusan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Buang penambahan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Buang hunk ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
+msgstr "Buang bingkah ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
#: add-patch.c:157
msgid ""
@@ -470,31 +469,31 @@
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - buang hunk ini dari indeks dan pohon kerja\n"
-"n - jangan buang hunk ini dari indeks dan pohon kerja\n"
-"q - keluar; jangan buang hunk ini atau yang sisanya\n"
-"a - buang hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan buang hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - buang bingkah ini dari indeks dan pohon kerja\n"
+"n - jangan buang bingkah ini dari indeks dan pohon kerja\n"
+"q - keluar; jangan buang bingkah ini atau yang sisanya\n"
+"a - buang bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan buang bingkah ini atau bingkah selanjutnya dalam berkas\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Terapkan perubahan mode ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Terapkan penghapusan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Terapkan penambahan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Terapkan hunk ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
+msgstr "Terapkan bingkah ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
#: add-patch.c:179
msgid ""
@@ -504,11 +503,11 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - terapkan hunk ini ke indeks dan pohon kerja\n"
-"n - jangan terapkan hunk ini ke indeks dan pohon kerja\n"
-"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"
-"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - terapkan bingkah ini ke indeks dan pohon kerja\n"
+"n - jangan terapkan bingkah ini ke indeks dan pohon kerja\n"
+"q - keluar; jangan terapkan bingkah ini atau yang sisanya\n"
+"a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n"
#: add-patch.c:224
msgid ""
@@ -518,40 +517,40 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - terapkan hunk ini ke pohon kerja\n"
-"n - jangan terapkan hunk ini ke pohon kerja\n"
-"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"
-"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - terapkan bingkah ini ke pohon kerja\n"
+"n - jangan terapkan bingkah ini ke pohon kerja\n"
+"q - keluar; jangan terapkan bingkah ini atau yang sisanya\n"
+"a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n"
#: add-patch.c:343
#, c-format
msgid "could not parse hunk header '%.*s'"
-msgstr "tidak dapat menguraikan kepala hunk '%.*s'"
+msgstr "tidak dapat menguraikan kepala bingkah '%.*s'"
#: add-patch.c:362 add-patch.c:366
#, c-format
msgid "could not parse colored hunk header '%.*s'"
-msgstr "tidak dapat menguraikan kepala hunk berwarna '%.*s'"
+msgstr "tidak dapat menguraikan kepala bingkah berwarna '%.*s'"
-#: add-patch.c:420
+#: add-patch.c:431
msgid "could not parse diff"
msgstr "tidak dapat menguraikan diff"
-#: add-patch.c:439
+#: add-patch.c:450
msgid "could not parse colored diff"
msgstr "tidak dapat menguraikan diff berwarna"
-#: add-patch.c:453
+#: add-patch.c:464
#, c-format
msgid "failed to run '%s'"
msgstr "gagal menjalankan '%s'"
-#: add-patch.c:612
+#: add-patch.c:618
msgid "mismatched output from interactive.diffFilter"
msgstr "keluaran tak cocok dari interactive.diffFilter"
-#: add-patch.c:613
+#: add-patch.c:619
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -559,7 +558,7 @@
"Saringan Anda haru menjaga korespondensi satu-satu antara masukannya\n"
"dan baris keluaran."
-#: add-patch.c:791
+#: add-patch.c:797
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -568,7 +567,7 @@
"baris konteks #%d diharapkan dalam\n"
"%.*s"
-#: add-patch.c:806
+#: add-patch.c:812
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -576,16 +575,16 @@
"\tdoes not end with:\n"
"%.*s"
msgstr ""
-"hunk tidak tumpang tindih:\n"
+"bingkah tidak tumpang tindih:\n"
"%.*s\n"
"tidak berakhir dengan:\n"
"%.*s"
-#: add-patch.c:1082 git-add--interactive.perl:1115
+#: add-patch.c:1088 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Mode sunting hunk manual -- lihat dibawah untuk panduan cepat.\n"
+msgstr "Mode sunting bingkah manual -- lihat dibawah untuk panduan cepat.\n"
-#: add-patch.c:1086
+#: add-patch.c:1092
#, c-format
msgid ""
"---\n"
@@ -599,21 +598,21 @@
"Baris yang diawali dengan %c akan dihapus.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1100 git-add--interactive.perl:1129
+#: add-patch.c:1106 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
"Jika itu tidak diterapkan dengan bersih, Anda akan diberikan kesempatan\n"
-"untuk menyunting lagi. Jika semua baris dalam hunk dihapus, suntingan\n"
-"dibatalkan dan hunk tetap tidak berubah.\n"
+"untuk menyunting lagi. Jika semua baris dalam bingkah dihapus, suntingan\n"
+"dibatalkan dan bingkah tetap tidak berubah.\n"
-#: add-patch.c:1133
+#: add-patch.c:1139
msgid "could not parse hunk header"
-msgstr "tidak dapat menguraikan kepala hunk"
+msgstr "tidak dapat menguraikan kepala bingkah"
-#: add-patch.c:1178
+#: add-patch.c:1184
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' gagal"
@@ -629,26 +628,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1253 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-"Hunk Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" buang!) "
-"[y/n]?"
+"Bingkah Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" "
+"buang!) [y/n]?"
-#: add-patch.c:1290
+#: add-patch.c:1296
msgid "The selected hunks do not apply to the index!"
-msgstr "Hunk yang dipilih tidak diterapkan ke indeks!"
+msgstr "Bingkah yang dipilih tidak diterapkan ke indeks!"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Tetap terapkan itu ke pohon kerja? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1304 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Tidak ada yang diterapkan.\n"
-#: add-patch.c:1355
+#: add-patch.c:1361
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -660,155 +659,171 @@
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
-"j - biarkan hunk ini ragu, lihat hunk ragu berikutnya\n"
-"J - biarkan hunk ini ragu, lihat hunk berikutnya\n"
-"k - biarkan hunk ini ragu, lihat hunk ragu sebelumnya\n"
-"K - biarkan hunk ini ragu, lihat hunk sebelumnya\n"
-"g - pilih satu hunk untuk dikunjungi\n"
-"/ - cari satu hunk yang cocok dengan regex yang diberikan\n"
-"s - belah hunk saat ini ke dalam hunk yang lebih kecil\n"
-"e - sunting hunk saat ini secara manual\n"
+"j - biarkan bingkah ini ragu, lihat bingkah ragu berikutnya\n"
+"J - biarkan bingkah ini ragu, lihat bingkah berikutnya\n"
+"k - biarkan bingkah ini ragu, lihat bingkah ragu sebelumnya\n"
+"K - biarkan bingkah ini ragu, lihat bingkah sebelumnya\n"
+"g - pilih satu bingkah untuk dikunjungi\n"
+"/ - cari satu bingkah yang cocok dengan regex yang diberikan\n"
+"s - belah bingkah saat ini ke dalam bingkah yang lebih kecil\n"
+"e - sunting bingkah saat ini secara manual\n"
"? - cetak bantuan\n"
-#: add-patch.c:1517 add-patch.c:1527
+#: add-patch.c:1523 add-patch.c:1533
msgid "No previous hunk"
-msgstr "Tidak ada hunk sebelumnya"
+msgstr "Tidak ada bingkah sebelumnya"
-#: add-patch.c:1522 add-patch.c:1532
+#: add-patch.c:1528 add-patch.c:1538
msgid "No next hunk"
-msgstr "Tidak ada hunk selanjutnya"
+msgstr "Tidak ada bingkah selanjutnya"
-#: add-patch.c:1538
+#: add-patch.c:1544
msgid "No other hunks to goto"
-msgstr "Tidak ada hunk lainnya untuk dikunjungi"
+msgstr "Tidak ada bingkah lainnya untuk dikunjungi"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1555 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
-msgstr "pergi ke hunk yang mana (<ret> untuk lihat lebih)? "
+msgstr "pergi ke bingkah yang mana (<ret> untuk lihat lebih)? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1556 git-add--interactive.perl:1610
msgid "go to which hunk? "
-msgstr "pergi ke hunk yang mana?"
+msgstr "pergi ke bingkah yang mana?"
-#: add-patch.c:1561
+#: add-patch.c:1567
#, c-format
msgid "Invalid number: '%s'"
msgstr "Angka tidak valid: '%s'"
-#: add-patch.c:1566
+#: add-patch.c:1572
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
-msgstr[0] "Maaf, hanya %d hunk yang tersedia."
-msgstr[1] "Maaf, hanya %d hunk yang tersedia."
+msgstr[0] "Maaf, hanya %d bingkah yang tersedia."
+msgstr[1] "Maaf, hanya %d bingkah yang tersedia."
-#: add-patch.c:1575
+#: add-patch.c:1581
msgid "No other hunks to search"
-msgstr "Tidak ada hunk lainnya untuk dicari"
+msgstr "Tidak ada bingkah lainnya untuk dicari"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1587 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "cari untuk regex? "
-#: add-patch.c:1596
+#: add-patch.c:1602
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "regexp pencarian %s cacat: %s"
-#: add-patch.c:1613
+#: add-patch.c:1619
msgid "No hunk matches the given pattern"
-msgstr "Tidak ada hunk yang cocok dengan pola yang diberikan"
+msgstr "Tidak ada bingkah yang cocok dengan pola yang diberikan"
-#: add-patch.c:1620
+#: add-patch.c:1626
msgid "Sorry, cannot split this hunk"
-msgstr "Maaf, tidak dapat membelah hunk ini"
+msgstr "Maaf, tidak dapat membelah bingkah ini"
-#: add-patch.c:1624
+#: add-patch.c:1630
#, c-format
msgid "Split into %d hunks."
-msgstr "Terbelah ke dalam %d hunk."
+msgstr "Terbelah ke dalam %d bingkah."
-#: add-patch.c:1628
+#: add-patch.c:1634
msgid "Sorry, cannot edit this hunk"
-msgstr "Maaf, tidak dapat menyunting hunk ini"
+msgstr "Maaf, tidak dapat menyunting bingkah ini"
-#: add-patch.c:1680
+#: add-patch.c:1686
msgid "'git apply' failed"
msgstr "'git apply' gagal"
-#: advice.c:145
+#: advice.c:81
#, c-format
msgid ""
"\n"
"Disable this message with \"git config advice.%s false\""
msgstr ""
+"\n"
+"Nonaktifkan pesan ini dengan \"git config advice.%s false\""
-#: advice.c:161
+#: advice.c:97
#, c-format
msgid "%shint: %.*s%s\n"
-msgstr ""
+msgstr "%shint: %.*s%s\n"
-#: advice.c:252
+#: advice.c:181
msgid "Cherry-picking is not possible because you have unmerged files."
-msgstr ""
+msgstr "Pemetikan ceri tidak mungkin sebab Anda punya berkas tak tergabung."
-#: advice.c:254
+#: advice.c:183
msgid "Committing is not possible because you have unmerged files."
-msgstr ""
+msgstr "Pengkomitan tidak mungkin sebab Anda punya berkas tak tergabung."
-#: advice.c:256
+#: advice.c:185
msgid "Merging is not possible because you have unmerged files."
-msgstr ""
+msgstr "Penggabungan tidak mungkin sebab Anda punya berkas tak tergabung."
-#: advice.c:258
+#: advice.c:187
msgid "Pulling is not possible because you have unmerged files."
-msgstr ""
+msgstr "Penarikan tidak mungkin sebab Anda punya berkas tak tergabung."
-#: advice.c:260
+#: advice.c:189
msgid "Reverting is not possible because you have unmerged files."
-msgstr ""
+msgstr "Pembalikkan tidak mungkin sebab Anda punya berkas tak tergabung."
-#: advice.c:262
+#: advice.c:191
#, c-format
msgid "It is not possible to %s because you have unmerged files."
-msgstr ""
+msgstr "Tidak mungkin untuk %s sebab Anda punya berkas tak tergabung."
-#: advice.c:270
+#: advice.c:199
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 ""
+"Perbaiki di dalam pohon kerja, lalu gunakan 'git add/rm <berkas>'\n"
+"sebagaimana mestinya untuk menandai resolusi dan membuat sebuah komit."
-#: advice.c:278
+#: advice.c:207
msgid "Exiting because of an unresolved conflict."
-msgstr ""
+msgstr "Keluar karena sebuah konflik tak terselesaikan."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:212 builtin/merge.c:1388
msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr ""
+msgstr "Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada)."
-#: advice.c:285
+#: advice.c:214
msgid "Please, commit your changes before merging."
-msgstr ""
+msgstr "Mohon komit perubahan Anda sebelum menggabungkan."
-#: advice.c:286
+#: advice.c:215
msgid "Exiting because of unfinished merge."
-msgstr ""
+msgstr "Keluar karena penggabungan belum selesai."
-#: advice.c:296
+#: advice.c:220
+msgid "Not possible to fast-forward, aborting."
+msgstr "Tidak mungkin untuk maju cepat, batalkan."
+
+#: advice.c:230
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
+"Jalur dan/atau spek jalur berikut cocok dengan jalur yang ada\n"
+"di luar definisi checkout tipis Anda, jadi tidak akan diperbarui\n"
+"di dalam indeks:\n"
-#: advice.c:303
+#: advice.c:237
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
+"Jika Anda berniat memperbarui entri tersebut, coba salah satu dari:\n"
+"* Gunakan opsi --sparse\n"
+"* Nonaktifkan atau modifikasi aturan kejarangan."
-#: advice.c:310
+#: advice.c:245
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -830,87 +845,126 @@
"false\n"
"\n"
msgstr ""
+"Catatan: berganti ke '%s'.\n"
+"\n"
+"Anda berada dalam keadaan 'HEAD terpisah'. Anda dapat melihat-lihat, "
+"membuat\n"
+"perubahan eksperimental and komit, dan Anda dapat membuang komit apa saja "
+"yang\n"
+"Anda buat di dalam keadaan ini tanpa mempengaruhi cabang apapun dengan "
+"bergantinkembali ke sebuah cabang.\n"
+"\n"
+"Jika Anda ingin membuat cabang baru untuk menyimpan komit yang Anda buat, "
+"Anda\n"
+"dapat melakukannya (sekarang atau nanti) dengan:\n"
+"\n"
+" git switch -c <nama cabang baru>\n"
+"\n"
+"Atau batalkan operasi ini dengan:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Matikan saran ini dengan menyetel variabel konfigurasi advice.detachedHead "
+"ke false\n"
+"\n"
#: alias.c:50
msgid "cmdline ends with \\"
-msgstr ""
+msgstr "baris perintah diakhiri dengan \\"
#: alias.c:51
msgid "unclosed quote"
-msgstr ""
+msgstr "tanda kutip tak ditutup"
#: apply.c:70
#, c-format
msgid "unrecognized whitespace option '%s'"
-msgstr ""
+msgstr "opsi spasi putih tidak dikenal '%s'"
#: apply.c:86
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
-msgstr ""
+msgstr "opsi abai spasi putih tidak dikenal '%s'"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr ""
+#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
+#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
+#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
+#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
+#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
+#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
+#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
+#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
+#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
+#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
+#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
+#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
+#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
+#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
+#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
+#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
+#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
+#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
+#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
+#: builtin/worktree.c:779
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "Opsi '%s' dan '%s' tidak dapat digunakan bersamaan"
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr ""
+#: apply.c:141 apply.c:152 apply.c:155
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' di luar repositori"
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr ""
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr ""
-
-#: apply.c:800
+#: apply.c:807
#, c-format
msgid "Cannot prepare timestamp regexp %s"
-msgstr ""
+msgstr "Tidak dapat menyiapkan ekspresi reguler stempel waktu %s"
-#: apply.c:809
+#: apply.c:816
#, c-format
msgid "regexec returned %d for input: %s"
-msgstr ""
+msgstr "regexec kembalikan %d untuk input: %s"
-#: apply.c:883
+#: apply.c:890
#, c-format
msgid "unable to find filename in patch at line %d"
-msgstr ""
-
-#: apply.c:921
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr ""
-
-#: apply.c:927
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr ""
+msgstr "tidak dapat menemukan nama berkas dalam tambalan pada baris %d"
#: apply.c:928
#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr "git apply: git-diff jelek - berharap /dev/null, dapat %s pada baris %d"
+
+#: apply.c:934
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+"git apply: git-diff jelek - nama berkas baru tidak konsisten pada baris %d"
+
+#: apply.c:935
+#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
+"git apply: git-diff jelek - nama berkas lama tidak konsisten pada baris %d"
-#: apply.c:933
+#: apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr ""
+msgstr "git apply: git-diff jelek - berharap /dev/null pada baris %d"
-#: apply.c:962
+#: apply.c:969
#, c-format
msgid "invalid mode on line %d: %s"
-msgstr ""
+msgstr "mode tidak valid pada baris %d: %s"
-#: apply.c:1281
+#: apply.c:1288
#, c-format
msgid "inconsistent header lines %d and %d"
-msgstr ""
+msgstr "kepala baris %d dan %d tidak konsisten"
-#: apply.c:1371
+#: apply.c:1378
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -919,587 +973,595 @@
"git diff header lacks filename information when removing %d leading pathname "
"components (line %d)"
msgstr[0] ""
+"kepala git diff kekurangan informasi nama berkas ketika menghapus %d "
+"komponen nama jalur terkemuka (baris %d)"
msgstr[1] ""
+"kepala git diff kekurangan informasi nama berkas ketika menghapus %d "
+"komponen nama jalur terkemuka (baris %d)"
-#: apply.c:1384
+#: apply.c:1391
#, c-format
msgid "git diff header lacks filename information (line %d)"
-msgstr ""
+msgstr "kepala git diff kekurangan informasi nama berkas (baris %d)"
-#: apply.c:1480
+#: apply.c:1487
#, c-format
msgid "recount: unexpected line: %.*s"
-msgstr ""
+msgstr "recount: baris tidak diharapkan: %.*s"
-#: apply.c:1549
+#: apply.c:1556
#, c-format
msgid "patch fragment without header at line %d: %.*s"
-msgstr ""
+msgstr "pecahan tambalan tanpa kepala pada baris %d: %.*s"
-#: apply.c:1752
+#: apply.c:1759
msgid "new file depends on old contents"
-msgstr ""
+msgstr "berkas baru bergantung pada konten yang lama"
-#: apply.c:1754
+#: apply.c:1761
msgid "deleted file still has contents"
-msgstr ""
+msgstr "berkas terhapus masih ada konten"
-#: apply.c:1788
+#: apply.c:1795
#, c-format
msgid "corrupt patch at line %d"
-msgstr ""
+msgstr "tambalan rusak pada baris %d"
-#: apply.c:1825
+#: apply.c:1832
#, c-format
msgid "new file %s depends on old contents"
-msgstr ""
+msgstr "berkas baru %s bergantung pada konten yang lama"
-#: apply.c:1827
+#: apply.c:1834
#, c-format
msgid "deleted file %s still has contents"
-msgstr ""
+msgstr "berkas yang dihapus %s masih ada konten"
-#: apply.c:1830
+#: apply.c:1837
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
-msgstr ""
+msgstr "** peringatan: berkas %s menjadi kosong tetapi tidak dihapus"
-#: apply.c:1977
+#: apply.c:1985
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
-msgstr ""
+msgstr "tambalan biner rusak pada baris %d: %.*s"
-#: apply.c:2014
+#: apply.c:2022
#, c-format
msgid "unrecognized binary patch at line %d"
-msgstr ""
+msgstr "tambalan biner tidak dikenal pada baris %d"
-#: apply.c:2176
+#: apply.c:2184
#, c-format
msgid "patch with only garbage at line %d"
-msgstr ""
+msgstr "tambal dengan hanya sampah pada baris %d"
-#: apply.c:2262
+#: apply.c:2270
#, c-format
msgid "unable to read symlink %s"
-msgstr ""
+msgstr "tidak dapat membaca tautan simbolik %s"
-#: apply.c:2266
+#: apply.c:2274
#, c-format
msgid "unable to open or read %s"
-msgstr ""
+msgstr "tidak dapat membuka atau membaca %s"
-#: apply.c:2935
+#: apply.c:2943
#, c-format
msgid "invalid start of line: '%c'"
-msgstr ""
+msgstr "awal baris tidak valid: '%c'"
-#: apply.c:3056
+#: apply.c:3064
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bingkah #%d berhasil pada %d (ganti %d baris)."
+msgstr[1] "Bingkah #%d berhasil pada %d (ganti %d baris)."
-#: apply.c:3068
+#: apply.c:3076
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr ""
+msgstr "Konteks dikurangi menjadi (%ld/%ld) untuk terapkan pecahan pada %d"
-#: apply.c:3074
+#: apply.c:3082
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-
-#: apply.c:3096
-#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr ""
+"ketika mencari:\n"
+"%.*s"
#: apply.c:3104
#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "data tambalan biner hilang untuk '%s'"
+
+#: apply.c:3112
+#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
+"tidak dapat menerapkan balik tambalan biner tanpa membalikkan bingkah ke '%s'"
-#: apply.c:3151
+#: apply.c:3159
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
-msgstr ""
+msgstr "tidak dapat menerapkan tambalan biner ke '%s' tanpa baris indeks penuh"
-#: apply.c:3162
+#: apply.c:3170
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
+"tambalan diterapkan ke '%s' (%s), yang tidak cocok dengan konten saat ini."
-#: apply.c:3170
+#: apply.c:3178
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
-msgstr ""
+msgstr "tambalan diterapkan ke '%s' kosong tapi tidak kosong"
-#: apply.c:3188
+#: apply.c:3196
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
-msgstr ""
+msgstr "pascacitra %s yang diperlukan untuk '%s' tidak dapat dibaca"
-#: apply.c:3201
+#: apply.c:3209
#, c-format
msgid "binary patch does not apply to '%s'"
-msgstr ""
+msgstr "tambalan biner tidak dapat diterapkan ke '%s'"
-#: apply.c:3208
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
+"tambalan biner ke '%s' membuat hasil yang salah (diharapkan %s, dapat %s)"
-#: apply.c:3229
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
-msgstr ""
+msgstr "tambalan gagal: %s:%ld"
-#: apply.c:3352
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
-msgstr ""
+msgstr "tidak dapat men-checkout %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
+#: setup.c:310
#, c-format
msgid "failed to read %s"
-msgstr ""
+msgstr "gagal membaca %s"
-#: apply.c:3412
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
-msgstr ""
+msgstr "membaca dari '%s' diluar tautan simbolik"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3449 apply.c:3721
#, c-format
msgid "path %s has been renamed/deleted"
-msgstr ""
+msgstr "jalus %s sudah dinamai ulang/dihapus"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3559 apply.c:3736
#, c-format
msgid "%s: does not exist in index"
-msgstr ""
+msgstr "%s: tidak ada di indeks"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3568 apply.c:3744 apply.c:3960
#, c-format
msgid "%s: does not match index"
-msgstr ""
+msgstr "%s: tidak cocok dengan indeks"
-#: apply.c:3571
+#: apply.c:3605
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
+"repositori kekurangan blob yang diperlukan untuk melakukan penggabungan 3 "
+"arah."
-#: apply.c:3574
+#: apply.c:3608
#, c-format
msgid "Performing three-way merge...\n"
-msgstr ""
+msgstr "Melakukan penggabungan 3 arah...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3624 apply.c:3628
#, c-format
msgid "cannot read the current contents of '%s'"
-msgstr ""
+msgstr "tidak dapat membaca konten saat ini dari '%s'"
-#: apply.c:3606
+#: apply.c:3640
#, c-format
msgid "Failed to perform three-way merge...\n"
-msgstr ""
-
-#: apply.c:3620
-#, c-format
-msgid "Applied patch to '%s' with conflicts.\n"
-msgstr ""
-
-#: apply.c:3625
-#, c-format
-msgid "Applied patch to '%s' cleanly.\n"
-msgstr ""
-
-#: apply.c:3642
-#, c-format
-msgid "Falling back to direct application...\n"
-msgstr ""
+msgstr "Gagal melakukan penggabungan 3 arah...\n"
#: apply.c:3654
-msgid "removal patch leaves file contents"
-msgstr ""
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Tambalan diterapkan ke '%s' dengan konflik.\n"
-#: apply.c:3727
+#: apply.c:3659
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Tambalan diterapkan ke '%s' dengan rapi.\n"
+
+#: apply.c:3676
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Mundur ke penerapan langsung...\n"
+
+#: apply.c:3688
+msgid "removal patch leaves file contents"
+msgstr "tambalan penghapusan meninggalkan isi berkas"
+
+#: apply.c:3761
#, c-format
msgid "%s: wrong type"
-msgstr ""
+msgstr "%s: salah tipe"
-#: apply.c:3729
+#: apply.c:3763
#, c-format
msgid "%s has type %o, expected %o"
-msgstr ""
+msgstr "%s bertipe %o, diharapkan %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
+#: read-cache.c:1399
#, c-format
msgid "invalid path '%s'"
-msgstr ""
+msgstr "jalur tidak valid '%s'"
-#: apply.c:3952
+#: apply.c:3958
#, c-format
msgid "%s: already exists in index"
-msgstr ""
+msgstr "%s: sudah ada di indeks"
-#: apply.c:3956
+#: apply.c:3962
#, c-format
msgid "%s: already exists in working directory"
-msgstr ""
+msgstr "%s: sudah ada di direktori kerja"
-#: apply.c:3976
+#: apply.c:3982
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr ""
+msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o)"
-#: apply.c:3981
+#: apply.c:3987
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr ""
+msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o) dari %s"
-#: apply.c:4001
+#: apply.c:4007
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
-msgstr ""
+msgstr "berkas yang terpengaruh '%s' diluar tautan simbolik"
-#: apply.c:4005
+#: apply.c:4011
#, c-format
msgid "%s: patch does not apply"
-msgstr ""
+msgstr "%s: tambalan tak diterapkan"
-#: apply.c:4020
+#: apply.c:4026
#, c-format
msgid "Checking patch %s..."
-msgstr ""
+msgstr "Memeriksa tambalan %s..."
-#: apply.c:4112
+#: apply.c:4118
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
-msgstr ""
+msgstr "informasi sha1 kurang atau tidak berguna untuk submodul %s"
-#: apply.c:4119
+#: apply.c:4125
#, c-format
msgid "mode change for %s, which is not in current HEAD"
-msgstr ""
+msgstr "perubahan mode untuk %s, yang bukan dalam HEAD saat ini"
-#: apply.c:4122
+#: apply.c:4128
#, c-format
msgid "sha1 information is lacking or useless (%s)."
-msgstr ""
+msgstr "informasi sha1 kurang atau tidak berguna (%s)"
-#: apply.c:4131
+#: apply.c:4137
#, c-format
msgid "could not add %s to temporary index"
-msgstr ""
+msgstr "tidak dapat menambahkan %s ke indeks sementara"
-#: apply.c:4141
+#: apply.c:4147
#, c-format
msgid "could not write temporary index to %s"
-msgstr ""
+msgstr "tidak dapat menulis indeks sementara ke %s"
-#: apply.c:4279
+#: apply.c:4285
#, c-format
msgid "unable to remove %s from index"
-msgstr ""
-
-#: apply.c:4313
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr ""
+msgstr "tidak dapat menghapus %s dari indeks"
#: apply.c:4319
#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr ""
+msgid "corrupt patch for submodule %s"
+msgstr "tambalan rusak untuk submodul %s"
-#: apply.c:4327
+#: apply.c:4325
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "tidak dapat men-stat berkas yang baru dibuat '%s'"
+
+#: apply.c:4333
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
+"tidak dapat membuat simpanan pendukung untuk berkas yang baru dibuat %s"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4339 apply.c:4484
#, c-format
msgid "unable to add cache entry for %s"
-msgstr ""
+msgstr "tidak dapat menambahkan entri tembolok untuk %s"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
-msgstr ""
+msgstr "gagal menulis ke '%s'"
-#: apply.c:4380
+#: apply.c:4386
#, c-format
msgid "closing file '%s'"
-msgstr ""
+msgstr "menutup berkas '%s'"
-#: apply.c:4450
+#: apply.c:4456
#, c-format
msgid "unable to write file '%s' mode %o"
-msgstr ""
+msgstr "tidak dapat menulis berkas '%s' mode %o"
-#: apply.c:4548
+#: apply.c:4554
#, c-format
msgid "Applied patch %s cleanly."
-msgstr ""
+msgstr "Tambalan %s diterapkan dengan rapi."
-#: apply.c:4556
+#: apply.c:4562
msgid "internal error"
-msgstr ""
+msgstr "kesalahan internal"
-#: apply.c:4559
+#: apply.c:4565
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Menerapkan tambalan %%s dengan %d penolakan..."
+msgstr[1] "Menerapkan tambalan %%s dengan %d penolakan..."
-#: apply.c:4570
+#: apply.c:4576
#, c-format
msgid "truncating .rej filename to %.*s.rej"
-msgstr ""
+msgstr "memotong nama berkas .rej ke %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4584
#, c-format
msgid "cannot open %s"
-msgstr ""
+msgstr "tidak dapat membuka %s"
-#: apply.c:4592
+#: apply.c:4598
#, c-format
msgid "Hunk #%d applied cleanly."
-msgstr ""
+msgstr "Bingkah #%d diterapkan dengan rapi."
-#: apply.c:4596
+#: apply.c:4602
#, c-format
msgid "Rejected hunk #%d."
-msgstr ""
+msgstr "Bingkah #%d ditolak."
-#: apply.c:4725
+#: apply.c:4731
#, c-format
msgid "Skipped patch '%s'."
+msgstr "Tambalan '%s' dilewatkan."
+
+#: apply.c:4740
+msgid "No valid patches in input (allow with \"--allow-empty\")"
msgstr ""
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr ""
-
-#: apply.c:4753
+#: apply.c:4761
msgid "unable to read index file"
-msgstr ""
+msgstr "tidak dapa membaca berkas indeks"
-#: apply.c:4910
+#: apply.c:4918
#, c-format
msgid "can't open patch '%s': %s"
-msgstr ""
+msgstr "tidak dapat membuka tambalan '%s': %s"
-#: apply.c:4937
+#: apply.c:4945
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d kesalahan spasi putih dipadamkan"
+msgstr[1] "%d kesalahan spasi putih dipadamkan"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4951 apply.c:4966
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d baris menambahkan kesalahan spasi putih."
+msgstr[1] "%d baris menambahkan kesalahan spasi putih."
-#: apply.c:4951
+#: apply.c:4959
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."
+msgstr[1] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
-msgstr ""
+msgstr "Tidak dapat menulis berkas indeks baru"
-#: apply.c:4995
+#: apply.c:5003
msgid "don't apply changes matching the given path"
-msgstr ""
-
-#: apply.c:4998
-msgid "apply changes matching the given path"
-msgstr ""
-
-#: apply.c:5000 builtin/am.c:2318
-msgid "num"
-msgstr ""
-
-#: apply.c:5001
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr ""
-
-#: apply.c:5004
-msgid "ignore additions made by the patch"
-msgstr ""
+msgstr "jangan terapkan perubahan yang cocok dengan jalur yang diberikan"
#: apply.c:5006
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr ""
+msgid "apply changes matching the given path"
+msgstr "terapkan perubahan yang cocok dengan jalur yang diberikan"
-#: apply.c:5010
-msgid "show number of added and deleted lines in decimal notation"
-msgstr ""
+#: apply.c:5008 builtin/am.c:2379
+msgid "num"
+msgstr "jumlah"
+
+#: apply.c:5009
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "hapus <jumlah> garis miring terkemuka dari jalur diff tradisional"
#: apply.c:5012
-msgid "instead of applying the patch, output a summary for the input"
-msgstr ""
+msgid "ignore additions made by the patch"
+msgstr "abaikan penambahan yang dibuat oleh tambalan"
#: apply.c:5014
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr ""
-
-#: apply.c:5016
-msgid "make sure the patch is applicable to the current index"
-msgstr ""
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "daripada menerapkan tambalan, keluarkan diffstat untuk masukan"
#: apply.c:5018
-msgid "mark new files with `git add --intent-to-add`"
+msgid "show number of added and deleted lines in decimal notation"
msgstr ""
+"perlihatkan jumlah baris yang ditambahkan dan dihapuskan dalam notasi desimal"
#: apply.c:5020
-msgid "apply a patch without touching the working tree"
-msgstr ""
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "daripada menerapkan tambalan, keluarkan ringkasan untuk masukan"
#: apply.c:5022
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "daripada menerapkan tambalan, lihat jika tambalan bisa diterapkan"
+
+#: apply.c:5024
+msgid "make sure the patch is applicable to the current index"
+msgstr "pastikan tambalan bisa diterapkan ke indeks saat ini"
+
+#: apply.c:5026
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "tandai berkas baru dengan `git add --intent-to-add`"
+
+#: apply.c:5028
+msgid "apply a patch without touching the working tree"
+msgstr "terapkan sebuah tambalan tanpa menyentuh pohon kerja"
+
+#: apply.c:5030
msgid "accept a patch that touches outside the working area"
-msgstr ""
+msgstr "terima sebuah tambalan yang menyentuh di luar area kerja"
-#: apply.c:5025
+#: apply.c:5033
msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr ""
+msgstr "juga terapkan tambalan (gunakan dengan --stat/--summary/--check)"
-#: apply.c:5027
+#: apply.c:5035
msgid "attempt three-way merge, fall back on normal patch if that fails"
-msgstr ""
+msgstr "coba penggabungan tiga arah, mundur ke penambalan normal jika gagal"
-#: apply.c:5029
+#: apply.c:5037
msgid "build a temporary index based on embedded index information"
-msgstr ""
+msgstr "bangun sebuah indeks sementara berdasarkan informasi indeks tertanam"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5040 builtin/checkout-index.c:230
msgid "paths are separated with NUL character"
-msgstr ""
+msgstr "jalur dipisahkan dengan karakter NUL"
-#: apply.c:5034
+#: apply.c:5042
msgid "ensure at least <n> lines of context match"
-msgstr ""
+msgstr "pastikan setidaknya <n> baris dari konteks cocokan"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
+#: builtin/rebase.c:1079
msgid "action"
-msgstr ""
+msgstr "aksi"
-#: apply.c:5036
+#: apply.c:5044
msgid "detect new or modified lines that have whitespace errors"
-msgstr ""
+msgstr "deteksi baris baru atau yang diubah yang ada kesalahan spasi putih"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5047 apply.c:5050
msgid "ignore changes in whitespace when finding context"
-msgstr ""
+msgstr "abaikan perubahan spasi putih ketika menemukan konteks"
-#: apply.c:5045
+#: apply.c:5053
msgid "apply the patch in reverse"
-msgstr ""
+msgstr "terapkan tambalan terbalik"
-#: apply.c:5047
+#: apply.c:5055
msgid "don't expect at least one line of context"
-msgstr ""
-
-#: apply.c:5049
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr ""
-
-#: apply.c:5051
-msgid "allow overlapping hunks"
-msgstr ""
-
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr ""
-
-#: apply.c:5054
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr ""
+msgstr "jangan harap setidaknya satu baris konteks"
#: apply.c:5057
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "tinggalkan bingkah yang ditolak pada berkas *.rej yang bersesuaian"
+
+#: apply.c:5059
+msgid "allow overlapping hunks"
+msgstr "perbolehkan bingkah yang tumpang tindih"
+
+#: apply.c:5062
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "tolerir baris baru hilang yang salah dideteksi pada akhir berkas"
+
+#: apply.c:5065
msgid "do not trust the line counts in the hunk headers"
-msgstr ""
+msgstr "jangan percaya hitungan baris pada kepala bingkah"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5067 builtin/am.c:2367
msgid "root"
-msgstr ""
+msgstr "akar"
-#: apply.c:5060
+#: apply.c:5068
msgid "prepend <root> to all filenames"
-msgstr ""
+msgstr "tambahkan <akar> di depan semua nama berkas"
-#: archive-tar.c:125 archive-zip.c:345
+#: apply.c:5071
+msgid "don't return error for empty patches"
+msgstr "jangan kembalikan kesalahan untuk tambalan kosong"
+
+#: archive-tar.c:125 archive-zip.c:346
#, c-format
msgid "cannot stream blob %s"
-msgstr ""
+msgstr "tidak dapat mengaruskan blob %s"
-#: archive-tar.c:265 archive-zip.c:358
+#: archive-tar.c:265 archive-zip.c:359
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr ""
+msgstr "mode berkas tidak didukung: 0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
-msgstr ""
+msgstr "tidak dapat memulai saringan '%s'"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
-msgstr ""
+msgstr "tidak dapat mengalihkan pendeskripsi"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
-msgstr ""
+msgstr "saringan '%s' melaporkan kesalahan"
-#: archive-zip.c:318
+#: archive-zip.c:319
#, c-format
msgid "path is not valid UTF-8: %s"
-msgstr ""
+msgstr "jalur bukan UTF-8 valid: %s"
-#: archive-zip.c:322
+#: archive-zip.c:323
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr ""
+msgstr "jalur terlalu panjang (%d karakter, SHA1: %s): %s"
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
#, c-format
msgid "deflate error (%d)"
-msgstr ""
+msgstr "kesalahan deflasi (%d)"
-#: archive-zip.c:603
+#: archive-zip.c:604
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr ""
+msgstr "stempel waktu terlalu besar untuk sistem ini: %<PRIuMAX>"
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<opsi>] <mirip pohon> [<jalur>...]"
-#: 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>...]"
@@ -1511,142 +1573,138 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repo> [--exec <perintah>] --list"
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:579
#, c-format
-msgid "cannot read %s"
-msgstr "Tidak dapat membaca %s"
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "tidak dapat membaca '%s'"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "spek jalur '%s' tidak cocok dengan berkas apapun"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "tidak ada referensi seperti: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "bukan nama objek valid: %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "bukan objek pohon: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "direktori kerja saat ini tak terlacak"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Berkas tidak ditemukan: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "Bukan berkas reguler: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "fmt"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "format arsip"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1809
msgid "prefix"
msgstr "prefiks"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
+#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
msgid "file"
msgstr "berkas"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "tambahkan berkas tak terlacak ke arsip"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "tulis arsip ke berkas ini"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "baca .gitattributes dalam direktori kerja"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "laporkan berkas terarsip ke error standar"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "setel level kompresi"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "daftar format arsip yang didukung"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
+#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
msgid "repo"
msgstr "repositori"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "ambil arsip dari repositori remote <repo>"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
msgid "command"
msgstr "perintah"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "jalur ke perintah git-upload-archive remote"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Opsi --remote tak diharapkan"
-#: archive.c:581
-msgid "Option --exec can only be used together with --remote"
-msgstr "Opsi --exec hanya dapat digunakan bersamaan dengan --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
+#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
+#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
+#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
+#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
+#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "opsi `%s' butuh '%s'"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Opsi --output tak diharapkan"
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Opsi --add-file dan --remote tidak dapat digunakan bersamaan"
-
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format arsip tidak dikenal '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumen tidak didukung untuk format '%s': -%d"
@@ -1667,22 +1725,22 @@
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Kontent terkutip jelek dalam berkas '%s': %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Kami tidak dapat membagi dua lagi!\n"
-#: bisect.c:766
+#: bisect.c:765
#, c-format
msgid "Not a valid commit name %s"
msgstr "Bukan sebuah nama komit yang valid %s"
-#: bisect.c:791
+#: bisect.c:790
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1691,7 +1749,7 @@
"Dasar penggabungan %s jelek.\n"
"Ini berarti bug telah diperbaiki antara %s dan [%s].\n"
-#: bisect.c:796
+#: bisect.c:795
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1700,7 +1758,7 @@
"Dasar penggabungan %s baru.\n"
"Properti telah berubah antara %s dan [%s].\n"
-#: bisect.c:801
+#: bisect.c:800
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1709,7 +1767,7 @@
"Dasar penggabungan %s adalah %s.\n"
"Ini berarti komit '%s' pertama adalah di antara %s dan [%s].\n"
-#: bisect.c:809
+#: bisect.c:808
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1720,7 +1778,7 @@
"git bisect tidak dapat bekerja dengan benar pada kasus ini.\n"
"Mungkin Anda salah mengira revisi %s dan %s?\n"
-#: bisect.c:822
+#: bisect.c:821
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1731,36 +1789,36 @@
"Jadi kami tidak dapat yakin komit %s pertama di antara %s dan %s.\n"
"Kami tetap lanjutkan."
-#: bisect.c:861
+#: bisect.c:860
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Membagi dua: dasar penggabungan harus diuji\n"
-#: bisect.c:911
+#: bisect.c:910
#, c-format
msgid "a %s revision is needed"
msgstr "sebuah revisi %s diperlukan"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:940
#, c-format
msgid "could not create file '%s'"
msgstr "tidak dapat membuat berkas '%s'"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:986 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "tidak dapat membaca berkas '%s'"
-#: bisect.c:1027
+#: bisect.c:1026
msgid "reading bisect refs failed"
msgstr "gagal membaca berkas referensi bagi dua"
-#: bisect.c:1057
+#: bisect.c:1056
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s sama-sama %s dan %s\n"
-#: bisect.c:1066
+#: bisect.c:1065
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1769,7 +1827,7 @@
"Tidak ada komit yang bisa diuji ditemukan.\n"
"Mungkin Anda mulai dengan argumen jalur jelek?\n"
-#: bisect.c:1095
+#: bisect.c:1094
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1779,139 +1837,170 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1100
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Membagi dua: %d revisi tersisa untuk diuji setelah ini %s\n"
msgstr[1] "Membagi dua: %d revisi tersisa untuk diuji setelah ini %s\n"
-#: blame.c:2776
+#: blame.c:2773
msgid "--contents and --reverse do not blend well."
msgstr "--contents dan --reverse tidak dapat dipadu dengan baik."
-#: blame.c:2790
+#: blame.c:2787
msgid "cannot use --contents with final commit object name"
msgstr "tidak dapat menggunakan --contents dengan nama objek komit final"
-#: blame.c:2811
+#: blame.c:2808
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
+#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
+#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
+#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
+#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "persiapan jalan revisi gagal"
-#: blame.c:2838
+#: blame.c:2835
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent bersama-sama butuh rentang bersama rantai induk "
"pertama"
-#: blame.c:2849
+#: blame.c:2846
#, c-format
msgid "no such path %s in %s"
msgstr "tidak ada jalur seperti %s di %s"
-#: blame.c:2860
+#: blame.c:2857
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "tidak dapat membaca blob %s untuk jalur %s"
-#: branch.c:53
-#, c-format
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr ""
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr ""
-
#: branch.c:93
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
msgstr ""
-
-#: branch.c:94
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr ""
-
-#: branch.c:98
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
-
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr ""
+"tidak dapat mewariskan konfigurasi pelacakan hulu banyak referensi ketika "
+"pendasaran ulang diminta"
#: branch.c:104
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr ""
+msgid "not setting branch '%s' as its own upstream"
+msgstr "tidak menyetel '%s' sebagai hulunya"
-#: branch.c:105
+#: branch.c:160
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr ""
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "cabang '%s' disiapkan untuk melacak '%s' oleh pendasaran ulang."
-#: branch.c:109
+#: branch.c:161
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr ""
+msgid "branch '%s' set up to track '%s'."
+msgstr "cabang '%s' disiapkan untuk melacak '%s'."
-#: branch.c:110
+#: branch.c:164
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr ""
+msgid "branch '%s' set up to track:"
+msgstr "cabang '%s' disiapkan untuk melacak:"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr ""
+#: branch.c:176
+msgid "unable to write upstream branch configuration"
+msgstr "tidak dapat menulis konfigurasi cabang hulu"
-#: branch.c:156
+#: branch.c:178
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
+msgstr ""
+"\n"
+"Setelah memperbaiki penyebab kesalahan Anda dapat mencoba memperbaiki\n"
+"informasi pelacakan remote dengan menjalankan:"
+
+#: branch.c:219
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
+msgid "asked to inherit tracking from '%s', but no remote is set"
msgstr ""
+"diminta mewariskan pelacakan dari '%s', tetapi tidak ada remote yang disetel"
-#: branch.c:189
+#: branch.c:225
#, c-format
-msgid "'%s' is not a valid branch name."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr ""
+"diminta mewariskan pelacakan dari '%s', tetapi tidak ada konfigurasi "
+"penggabungan yang disetel"
-#: branch.c:208
+#: branch.c:277
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr ""
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "tak melacak: informasi ambigu untuk referensi '%s'"
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr ""
-
-#: branch.c:233
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading " " space around.
+#.
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#: branch.c:289 object-name.c:464
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid " %s\n"
msgstr ""
-#: branch.c:235
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#: branch.c:295
+#, c-format
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
+
+#: branch.c:344
+#, c-format
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' bukan nama cabang valid"
+
+#: branch.c:364
+#, c-format
+msgid "a branch named '%s' already exists"
+msgstr "sebuah cabang bernama '%s' sudah ada"
+
+#: branch.c:370
+#, c-format
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "tidak dapat memperbarui paksa cabang '%s' yang ter-check out pada '%s'"
+
+#: branch.c:393
+#, c-format
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"tidak dapat menyiapkan informasi pelacakan; titik awal '%s' bukan sebuah "
+"cabang"
+
+#: branch.c:395
#, c-format
msgid "the requested upstream branch '%s' does not exist"
-msgstr ""
+msgstr "cabang hulu yang diminta '%s' tidak ada"
-#: branch.c:237
+#: branch.c:397
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1923,127 +2012,147 @@
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:281
+#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr ""
+msgid "not a valid object name: '%s'"
+msgstr "bukan nama objek valid: '%s'"
-#: branch.c:301
+#: branch.c:465
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr ""
+msgid "ambiguous object name: '%s'"
+msgstr "nama objek ambigu: '%s'"
-#: branch.c:306
+#: branch.c:470
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr ""
+msgid "not a valid branch point: '%s'"
+msgstr "bukan sebuah titik cabang valid: '%s'"
-#: branch.c:366
+#: branch.c:658
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "submodul '%s': tidak dapat menemukan submodul"
+
+#: branch.c:661
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
+msgstr ""
+"Anda dapat mencoba memperbarui submodul dengan 'git checkout %s && git "
+"submodule update --init'"
+
+#: branch.c:672 branch.c:698
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "submodul '%s': tidak dapat membuat cabang '%s'"
+
+#: branch.c:730
#, c-format
msgid "'%s' is already checked out at '%s'"
-msgstr ""
+msgstr "'%s' sudah di-checkout pada '%s'"
-#: branch.c:389
+#: branch.c:755
#, c-format
msgid "HEAD of working tree %s is not updated"
-msgstr ""
+msgstr "HEAD dari pohon kerja %s tidak diperbarui"
-#: bundle.c:44
+#: bundle.c:45
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
-msgstr ""
+msgstr "algoritma hash bundel tidak dikenal: %s"
-#: bundle.c:48
+#: bundle.c:53
#, c-format
msgid "unknown capability '%s'"
-msgstr ""
+msgstr "kapabilitas '%s' tidak dikenal"
-#: bundle.c:74
+#: bundle.c:79
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr ""
+msgstr "'%s' tidak terlihat seperti berkas bundel v2 atau v3"
-#: bundle.c:113
+#: bundle.c:118
#, c-format
msgid "unrecognized header: %s%s (%d)"
-msgstr ""
+msgstr "kepala tidak dikenal: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
+#: builtin/commit.c:865
#, c-format
msgid "could not open '%s'"
-msgstr ""
+msgstr "tidak dapat membuka '%s'"
-#: bundle.c:198
+#: bundle.c:203
msgid "Repository lacks these prerequisite commits:"
-msgstr ""
+msgstr "Repositori kekurangan komit prasyarat berikut:"
-#: bundle.c:201
+#: bundle.c:206
msgid "need a repository to verify a bundle"
-msgstr ""
-
-#: bundle.c:257
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "perlu sebuah repositori untuk verifikasi bundel"
#: bundle.c:264
-msgid "The bundle records a complete history."
-msgstr ""
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Bundel berisi referensi ini:"
+msgstr[1] "Bundel berisi %<PRIuMAX> referensi berikut:"
-#: bundle.c:266
+#: bundle.c:272
+msgid "The bundle records a complete history."
+msgstr "Bundel merekam riwayat penuh."
+
+#: bundle.c:274
#, c-format
msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] ""
-msgstr[1] ""
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Bundel membutuhkan referensi ini:"
+msgstr[1] "Bundel membutuhkan %<PRIuMAX> referensi berikut:"
-#: bundle.c:333
+#: bundle.c:350
msgid "unable to dup bundle descriptor"
-msgstr ""
+msgstr "tidak dapat men-dup pendeskripsi bundel"
-#: bundle.c:340
+#: bundle.c:357
msgid "Could not spawn pack-objects"
-msgstr ""
+msgstr "Tidak dapat menghidupkan pack-objects"
-#: bundle.c:351
+#: bundle.c:368
msgid "pack-objects died"
-msgstr ""
+msgstr "pack-objects mati"
-#: bundle.c:400
+#: bundle.c:417
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
-msgstr ""
+msgstr "referensi '%s' dikecualikan oleh opsi rev-list"
-#: bundle.c:504
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr ""
-
-#: bundle.c:506
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr ""
-
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
#, c-format
msgid "unrecognized argument: %s"
-msgstr ""
+msgstr "argumen tidak dikenal: %s"
-#: bundle.c:553
+#: bundle.c:548
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "versi bundle %d tidak didukung"
+
+#: bundle.c:550
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "tidak dapat menulis versi bundel %d dengan algoritma %s"
+
+#: bundle.c:600
msgid "Refusing to create empty bundle."
-msgstr ""
+msgstr "Menolak memuat bundel kosong."
-#: bundle.c:563
+#: bundle.c:610
#, c-format
msgid "cannot create '%s'"
-msgstr ""
+msgstr "tidak dapat membuat '%s'"
-#: bundle.c:588
+#: bundle.c:639
msgid "index-pack died"
-msgstr ""
+msgstr "index-pack mati"
#: chunk-format.c:117
msgid "terminating chunk id appears earlier than expected"
@@ -2064,12 +2173,12 @@
msgid "final chunk has non-zero id %<PRIx32>"
msgstr ""
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:52
msgid "invalid hash version"
msgstr ""
@@ -2097,234 +2206,235 @@
msgid "commit-graph file is too small to hold %u chunks"
msgstr ""
-#: commit-graph.c:482
+#: commit-graph.c:485
msgid "commit-graph has no base graphs chunk"
msgstr ""
-#: commit-graph.c:492
+#: commit-graph.c:495
msgid "commit-graph chain does not match"
msgstr ""
-#: commit-graph.c:540
+#: commit-graph.c:543
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr ""
-#: commit-graph.c:564
+#: commit-graph.c:567
msgid "unable to find all commit-graph files"
msgstr ""
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:752 commit-graph.c:789
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
-#: commit-graph.c:766
+#: commit-graph.c:773
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:799
+#: commit-graph.c:806
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
+#: builtin/clone.c:705
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1373 builtin/pack-objects.c:3078
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:1368
+#: commit-graph.c:1404
msgid "Loading known commits in commit graph"
msgstr ""
-#: commit-graph.c:1385
+#: commit-graph.c:1421
msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: commit-graph.c:1405
+#: commit-graph.c:1441
msgid "Clearing commit marks in commit graph"
msgstr ""
-#: commit-graph.c:1424
+#: commit-graph.c:1460
msgid "Computing commit graph topological levels"
msgstr ""
-#: commit-graph.c:1477
+#: commit-graph.c:1513
msgid "Computing commit graph generation numbers"
msgstr ""
-#: commit-graph.c:1558
+#: commit-graph.c:1598
msgid "Computing commit changed paths Bloom filters"
msgstr ""
-#: commit-graph.c:1635
+#: commit-graph.c:1675
msgid "Collecting referenced commits"
msgstr ""
-#: commit-graph.c:1660
+#: commit-graph.c:1701
#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1673
+#: commit-graph.c:1714
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:1677
+#: commit-graph.c:1718
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:1714
+#: commit-graph.c:1756
msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: commit-graph.c:1732
+#: commit-graph.c:1774
msgid "Finding extra edges in commit graph"
msgstr ""
-#: commit-graph.c:1781
+#: commit-graph.c:1823
msgid "failed to write correct number of base graph ids"
msgstr ""
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:1825
+#: commit-graph.c:1868
msgid "unable to create temporary graph layer"
msgstr ""
-#: commit-graph.c:1830
+#: commit-graph.c:1873
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr ""
-#: commit-graph.c:1887
+#: commit-graph.c:1930
#, 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:1923
+#: commit-graph.c:1967
msgid "unable to open commit-graph chain file"
msgstr ""
-#: commit-graph.c:1939
+#: commit-graph.c:1983
msgid "failed to rename base commit-graph file"
msgstr ""
-#: commit-graph.c:1959
+#: commit-graph.c:2004
msgid "failed to rename temporary commit-graph file"
msgstr ""
-#: commit-graph.c:2092
+#: commit-graph.c:2137
msgid "Scanning merged commits"
msgstr ""
-#: commit-graph.c:2136
+#: commit-graph.c:2181
msgid "Merging commit-graph"
msgstr ""
-#: commit-graph.c:2244
+#: commit-graph.c:2289
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
-#: commit-graph.c:2351
+#: commit-graph.c:2396
msgid "too many commits to write graph"
msgstr ""
-#: commit-graph.c:2449
+#: commit-graph.c:2494
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:2459
+#: commit-graph.c:2504
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2514 commit-graph.c:2529
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: commit-graph.c:2476
+#: commit-graph.c:2521
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
-#: commit-graph.c:2494
+#: commit-graph.c:2539
msgid "Verifying commits in commit graph"
msgstr ""
-#: commit-graph.c:2509
+#: commit-graph.c:2554
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:2516
+#: commit-graph.c:2561
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:2526
+#: commit-graph.c:2571
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:2535
+#: commit-graph.c:2580
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:2549
+#: commit-graph.c:2594
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:2554
+#: commit-graph.c:2599
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:2558
+#: commit-graph.c:2603
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:2575
+#: commit-graph.c:2620
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
-#: commit-graph.c:2581
+#: commit-graph.c:2626
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
+#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:54
+#: commit.c:56
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:194
+#: commit.c:197
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2336,27 +2446,27 @@
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1237
+#: commit.c:1252
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1241
+#: commit.c:1256
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1244
+#: commit.c:1259
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1247
+#: commit.c:1262
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1501
+#: commit.c:1516
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"
@@ -2367,7 +2477,15 @@
msgid "memory exhausted"
msgstr ""
-#: config.c:126
+#: compat/terminal.c:167
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+
+#: compat/terminal.c:168
+msgid "cannot restore terminal settings"
+msgstr ""
+
+#: config.c:143
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2382,343 +2500,370 @@
"\t%s\n"
"Ini mungkin disebabkan oleh include sirkular."
-#: config.c:142
+#: config.c:159
#, c-format
msgid "could not expand include path '%s'"
msgstr "tidak dapat menjabarkan jalur include '%s'"
-#: config.c:153
+#: config.c:170
msgid "relative config includes must come from files"
msgstr "include konfigurasi relatif harus dari berkas"
-#: config.c:199
+#: config.c:219
msgid "relative config include conditionals must come from files"
msgstr "kondisional include konfigurasi relative harus dari berkas"
-#: config.c:396
+#: config.c:364
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"URL remote tidak dapat dikonfigurasikan langsung di dalam berkas maupun "
+"dimasukkan secara tidak langsung oleh includeIf.hasconfig:remote.*.url"
+
+#: config.c:508
#, c-format
msgid "invalid config format: %s"
msgstr "format konfigurasi tidak valid: %s"
-#: config.c:400
+#: config.c:512
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "nama variabel lingkungan untuk konfigurasi hilang '%.*s'"
-#: config.c:405
+#: config.c:517
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "variabel lingkungan '%s' untuk konfigurasi '%.*s'"
-#: config.c:442
+#: config.c:553
#, c-format
msgid "key does not contain a section: %s"
msgstr "kunci tidak berisi bagian: %s"
-#: config.c:448
+#: config.c:558
#, c-format
msgid "key does not contain variable name: %s"
msgstr "kunci tidak berisi nama variabel: %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:580 sequencer.c:2802
#, c-format
msgid "invalid key: %s"
msgstr "kunci tidak valid: %s"
-#: config.c:478
+#: config.c:585
#, c-format
msgid "invalid key (newline): %s"
msgstr "kunci tidak valid (barisbaru): %s"
-#: config.c:511
+#: config.c:605
msgid "empty config key"
msgstr "kunci konfigurasi kosong"
-#: config.c:529 config.c:541
+#: config.c:623 config.c:635
#, c-format
msgid "bogus config parameter: %s"
msgstr "parameter konfigurasi gadungan: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:649 config.c:666 config.c:673 config.c:682
#, c-format
msgid "bogus format in %s"
msgstr "format gadungan dalam %s"
-#: config.c:622
+#: config.c:716
#, c-format
msgid "bogus count in %s"
msgstr "hitungan gadungan dalam %s"
-#: config.c:626
+#: config.c:720
#, c-format
msgid "too many entries in %s"
msgstr "terlalu banyak entri di %s"
-#: config.c:636
+#: config.c:730
#, c-format
msgid "missing config key %s"
msgstr "kunci konfigurasi %s hilang"
-#: config.c:644
+#: config.c:738
#, c-format
msgid "missing config value %s"
msgstr "nilai konfigurasi %s hilang"
-#: config.c:995
+#: config.c:1089
#, c-format
msgid "bad config line %d in blob %s"
msgstr "baris konfigurasi %d jelek dalam blob %s"
-#: config.c:999
+#: config.c:1093
#, c-format
msgid "bad config line %d in file %s"
msgstr "baris konfigurasi %d jelek dalam berkas %s"
-#: config.c:1003
+#: config.c:1097
#, c-format
msgid "bad config line %d in standard input"
msgstr "baris konfigurasi %d jelek pada masukan standar"
-#: config.c:1007
+#: config.c:1101
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "baris konfigurasi %d jelek dalam blob submodul %s"
-#: config.c:1011
+#: config.c:1105
#, c-format
msgid "bad config line %d in command line %s"
msgstr "baris konfigurasi %d jelek pada baris perintah %s"
-#: config.c:1015
+#: config.c:1109
#, c-format
msgid "bad config line %d in %s"
msgstr "baris konfigurasi %d jelek dalam %s"
-#: config.c:1152
+#: config.c:1246
msgid "out of range"
msgstr "di luar rentang"
-#: config.c:1152
+#: config.c:1246
msgid "invalid unit"
msgstr "satuan tidak valid"
-#: config.c:1153
+#: config.c:1247
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s': %s"
-#: config.c:1163
+#: config.c:1257
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam blob %s: %s"
-#: config.c:1166
+#: config.c:1260
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam berkas %s: %s"
-#: config.c:1169
+#: config.c:1263
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"nilai konfigurasi numerik '%s' jelek untuk '%s' pada masukan standar: %s"
-#: config.c:1172
+#: config.c:1266
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"nilai konfigurasi numerik '%s' jelek untuk '%s' dalam blob submodul %s: %s"
-#: config.c:1175
+#: config.c:1269
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"nilai konfigurasi numerik '%s' jelek untuk '%s' pada baris perintah %s: %s"
-#: config.c:1178
+#: config.c:1272
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam %s: %s"
-#: config.c:1257
+#: config.c:1368
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "nilai tidak valid untuk variabel %s"
+
+#: config.c:1389
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "mengabaikan komponen core.fsync tidak dikenal '%s'"
+
+#: config.c:1425
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "nilai konfigurasi boolean '%s' jelek untuk '%s'"
-#: config.c:1275
+#: config.c:1443
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "gagal menjabarkan direktori pengguna di: '%s'"
-#: config.c:1284
+#: config.c:1452
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' untuk '%s' bukan stempel waktu valid"
-#: config.c:1377
+#: config.c:1545
#, c-format
msgid "abbrev length out of range: %d"
msgstr "panjang singkatan di luar rentang: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1559 config.c:1570
#, c-format
msgid "bad zlib compression level %d"
msgstr "level kompresi zlib jelek %d"
-#: config.c:1494
+#: config.c:1660
msgid "core.commentChar should only be one character"
msgstr "core.commentChar harusnya hanya satu karakter"
-#: config.c:1527
+#: config.c:1692
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "mengabaikan nilai core.fsyncMethod tidak dikenal '%s'"
+
+#: config.c:1698
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles usang; gunakan core.fsync sebagai gantinya"
+
+#: config.c:1714
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode tidak valid untuk pembuatan objek: %s"
-#: config.c:1599
+#: config.c:1800
#, c-format
msgid "malformed value for %s"
msgstr "nilai rusak untuk %s"
-#: config.c:1625
+#: config.c:1826
#, c-format
msgid "malformed value for %s: %s"
msgstr "nilai rusak untuk %s: %s"
-#: config.c:1626
+#: config.c:1827
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "harus salah satu dari nothing, matching, simple, upstream atau current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1888 builtin/pack-objects.c:4078
#, c-format
msgid "bad pack compression level %d"
msgstr "level kompresi pak jelek %d"
-#: config.c:1809
+#: config.c:2014
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "tidak dapat memuat objek blob konfigurasi '%s'"
-#: config.c:1812
+#: config.c:2017
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referensi '%s' tidak menunjuk pada sebuah blob"
-#: config.c:1829
+#: config.c:2035
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "tidak dapat menguraikan blob konfigurasi '%s'"
-#: config.c:1874
+#: config.c:2080
#, c-format
msgid "failed to parse %s"
msgstr "gagal menguraikan %s"
-#: config.c:1930
+#: config.c:2136
msgid "unable to parse command-line config"
msgstr "gagal menguraikan konfigurasi baris perintah"
-#: config.c:2294
+#: config.c:2512
msgid "unknown error occurred while reading the configuration files"
msgstr "error tidak diketahui ketika membaca berkas konfigurasi"
-#: config.c:2468
+#: config.c:2686
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s tidak valid: '%s'"
-#: config.c:2513
+#: config.c:2731
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "nilai splitIndex.maxPercentChange '%d' harusnya diantara 0 dan 100"
-#: config.c:2559
+#: config.c:2763
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "tidak dapat menguraikan '%s' dari konfigurasi baris perintah"
-#: config.c:2561
+#: config.c:2765
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variabel konfigurasi '%s' jelek dalam berkas '%s' pada baris %d"
-#: config.c:2645
+#: config.c:2850
#, c-format
msgid "invalid section name '%s'"
msgstr "nama bagian '%s' tidak valid"
-#: config.c:2677
+#: config.c:2882
#, c-format
msgid "%s has multiple values"
msgstr "%s punya banyak nilai"
-#: config.c:2706
+#: config.c:2911
#, c-format
msgid "failed to write new configuration file %s"
msgstr "gagal menulis berkas konfigurasi baru %s"
-#: config.c:2958 config.c:3285
+#: config.c:3177 config.c:3518
#, c-format
msgid "could not lock config file %s"
msgstr "tidak dapat mengunci berkas konfigurasi %s"
-#: config.c:2969
+#: config.c:3188
#, c-format
msgid "opening %s"
msgstr "membuka %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:3225 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "pola tidak valid: %s"
-#: config.c:3031
+#: config.c:3250
#, c-format
msgid "invalid config file %s"
msgstr "berkas konfigurasi %s tidak valid"
-#: config.c:3044 config.c:3298
+#: config.c:3263 config.c:3531
#, c-format
msgid "fstat on %s failed"
msgstr "fstat pada %s gagal"
-#: config.c:3055
+#: config.c:3274
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "tidak dapat me-mmap '%s'%s"
-#: config.c:3065 config.c:3303
+#: config.c:3284 config.c:3536
#, c-format
msgid "chmod on %s failed"
msgstr "chmod pada %s gagal"
-#: config.c:3150 config.c:3400
+#: config.c:3369 config.c:3633
#, c-format
msgid "could not write config file %s"
msgstr "tidak dapat menulis berkas konfigurasi %s"
-#: config.c:3184
+#: config.c:3403
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "tidak dapat menyetel '%s' ke '%s'"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
#, c-format
msgid "could not unset '%s'"
msgstr "tidak dapat mem-batal setel '%s'"
-#: config.c:3276
+#: config.c:3509
#, c-format
msgid "invalid section name: %s"
msgstr "nama bagian tidak valid: %s"
-#: config.c:3443
+#: config.c:3676
#, c-format
msgid "missing value for '%s'"
msgstr "nilai hilang untuk '%s'"
#: connect.c:61
msgid "the remote end hung up upon initial contact"
-msgstr ""
+msgstr "remote berakhir menggantung saat kontak pertama"
#: connect.c:63
msgid ""
@@ -2727,174 +2872,183 @@
"Please make sure you have the correct access rights\n"
"and the repository exists."
msgstr ""
+"Tidak dapat membaca dari repositori remote.\n"
+"\n"
+"Mohon pastikan Anda punya hak akses yang benar dan repositori ada."
#: connect.c:81
#, c-format
msgid "server doesn't support '%s'"
-msgstr ""
+msgstr "peladen tidak mendukung '%s'"
#: connect.c:118
#, c-format
msgid "server doesn't support feature '%s'"
-msgstr ""
+msgstr "peladen tidak mendukung fitur '%s'"
#: connect.c:129
msgid "expected flush after capabilities"
-msgstr ""
+msgstr "bilasan diharapkan setelah kemampuan"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
-msgstr ""
+msgstr "mengabaikan kemampuan setelah baris pertama '%s'"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
-msgstr ""
-
-#: connect.c:306
-#, c-format
-msgid "protocol error: expected shallow sha-1, got '%s'"
-msgstr ""
+msgstr "kesalahan protokol: capabilities^{} tidak diharapkan"
#: connect.c:308
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "kesalahan protokol: sha-1 dangkal diharapkan, dapat '%s'"
+
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
-msgstr ""
+msgstr "repositori pada ujung lainnya tidak boleh dangkal"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
-msgstr ""
+msgstr "paket tidak valid"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
-msgstr ""
+msgstr "kesalahan protokol: '%s' tidak diharapkan"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
-msgstr ""
+msgstr "format objek tidak dikenal '%s' disebutkan oleh peladen"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
-msgstr ""
+msgstr "jawaban ls-refs tidak valid: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
-msgstr ""
+msgstr "bilasan diharapkan setelah penyebutan referensi"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
-msgstr ""
+msgstr "jawaban akhir paket diharapkan setelah penyebutan referensi"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
-msgstr ""
+msgstr "protokol '%s' tidak didukung"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
-msgstr ""
+msgstr "tidak dapat menyetel SO_KEEPALIVE pada soket"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
-msgstr ""
+msgstr "Mencari %s ... "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
-msgstr ""
+msgstr "tidak dapat mencari %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
+"selesai.\n"
+"Menghubungkan ke %s (port %s) ... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
"%s"
msgstr ""
+"tidak dapat menghubungkan ke %s:\n"
+"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
-msgstr ""
+msgstr "selesai."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
-msgstr ""
+msgstr "tidak dapat mencari %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
-msgstr ""
+msgstr "port tidak dikenal %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
-msgstr ""
+msgstr "nama host aneh '%s' diblokir"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
-msgstr ""
+msgstr "port aneh '%s' diblokir"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
-msgstr ""
+msgstr "tidak dapat memulai proksi %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
+"tidak ada jalur yang disebutkan; lihat 'git help pull' untuk sintaks url "
+"yang valid"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
-msgstr ""
+msgstr "baris baru dilarang di host git:// dan jalur repositori"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
-msgstr ""
+msgstr "varian ssh 'simple' tidak mendukung -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
-msgstr ""
+msgstr "varian ssh 'simple' tidak mendukung -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
-msgstr ""
+msgstr "varian ssh 'simple' tidak mendukung penyetelan port"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
-msgstr ""
+msgstr "nama jalur aneh '%s' diblokir"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
-msgstr ""
+msgstr "tidak dapat menggarpu"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
-msgstr ""
+msgstr "Memeriksa konektivitas"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
-msgstr ""
+msgstr "Tidak dapat menjalankan 'git rev-list'"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
-msgstr ""
+msgstr "gagal menulis ke rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
-msgstr ""
+msgstr "gagal menutup masukan standar rev-list"
#: convert.c:183
#, c-format
@@ -3026,88 +3180,88 @@
msgid "refusing to work with credential missing protocol field"
msgstr ""
-#: credential.c:394
+#: credential.c:396
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr ""
-#: credential.c:438
+#: credential.c:440
#, c-format
msgid "url has no scheme: %s"
msgstr ""
-#: credential.c:511
+#: credential.c:513
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr ""
-#: date.c:138
+#: date.c:139
msgid "in the future"
-msgstr ""
+msgstr "di masa depan"
-#: date.c:144
+#: date.c:145
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%<PRIuMAX> detik yang lalu"
+msgstr[1] "%<PRIuMAX> detik yang lalu"
-#: date.c:151
+#: date.c:152
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%<PRIuMAX> menit yang lalu"
+msgstr[1] "%<PRIuMAX> menit yang lalu"
-#: date.c:158
+#: date.c:159
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%<PRIuMAX> jam yang lalu"
+msgstr[1] "%<PRIuMAX> jam yang lalu"
-#: date.c:165
+#: date.c:166
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%<PRIuMAX> hari yang lalu"
+msgstr[1] "%<PRIuMAX> hari yang lalu"
-#: date.c:171
+#: date.c:172
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%<PRIuMAX> minggu yang lalu"
+msgstr[1] "%<PRIuMAX> minggu yang lalu"
-#: date.c:178
+#: date.c:179
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%<PRIuMAX> bulan yang lalu"
+msgstr[1] "%<PRIuMAX> bulan yang lalu"
-#: date.c:189
+#: date.c:190
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%<PRIuMAX> tahun"
+msgstr[1] "%<PRIuMAX> tahun"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
+#: date.c:193
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s, %<PRIuMAX> bulan yang lalu"
+msgstr[1] "%s, %<PRIuMAX> bulan yang lalu"
-#: date.c:197 date.c:202
+#: date.c:198 date.c:203
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%<PRIuMAX> tahun yang lalu"
+msgstr[1] "%<PRIuMAX> tahun yang lalu"
#: delta-islands.c:272
msgid "Propagating island marks"
@@ -3133,28 +3287,32 @@
msgid "Marked %d islands, done.\n"
msgstr ""
-#: diff-merges.c:70
+#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
+#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
+#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
+#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
+#: builtin/pull.c:47 builtin/pull.c:321
#, c-format
-msgid "unknown value for --diff-merges: %s"
+msgid "invalid value for '%s': '%s'"
msgstr ""
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr ""
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr ""
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr ""
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr ""
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr ""
@@ -3168,17 +3326,17 @@
"tree"
msgstr ""
-#: diff.c:156
+#: diff.c:159
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Gagal mengurai persentase potongan dirstat '%s'\n"
-#: diff.c:161
+#: diff.c:164
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Parameter dirstat tidak ditketahui '%s'\n"
-#: diff.c:297
+#: diff.c:300
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3186,7 +3344,7 @@
"Setelan warna berpindah harus salah satu dari 'no', 'default', 'blocks', "
"'dimmed-zebra', 'plain'"
-#: diff.c:325
+#: diff.c:328
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3196,7 +3354,7 @@
"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
"change'"
-#: diff.c:333
+#: diff.c:336
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3204,12 +3362,12 @@
"color-moved-ws: allow-indentation-change tidak dapat digabungkan dengan mode "
"spasi yang lainnya"
-#: diff.c:410
+#: diff.c:413
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'"
-#: diff.c:470
+#: diff.c:473
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3223,44 +3381,46 @@
msgid "external diff died, stopping at %s"
msgstr "diff eksternal mati, berhenti pada %s"
-#: diff.c:4634
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check dan -s saling eksklusif"
+#: diff.c:4677 parse-options.c:1114
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "Opsi '%s', '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
-#: diff.c:4637
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S dan --find-object saling eksklusif"
+#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "Opsi '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
-#: diff.c:4640
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4685
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
msgstr ""
-"-G dan --pickaxe-regex saling eksklusif, gunakan --pickaxe-regex dengan -S"
+"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s'"
-#: diff.c:4643
+#: diff.c:4689
+#, c-format
msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr ""
-"--pickaxe-all dan --find-object saling eksklusif, gunakan --pickaxe-all "
-"dengan -G dan -S"
+"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' "
+"dan '%s'"
-#: diff.c:4722
+#: diff.c:4769
msgid "--follow requires exactly one pathspec"
msgstr "--follow butuh tepatnya satu spek jalur"
-#: diff.c:4770
+#: diff.c:4823
#, c-format
msgid "invalid --stat value: %s"
msgstr "nilai --stat tidak valid: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s harap nilai numerik"
-#: diff.c:4807
+#: diff.c:4860
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3269,42 +3429,42 @@
"Gagal menguraikan parameter opsi --dirstat/-X:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4893
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "kelas perubahan '%c' tidak dikenal dalam --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4917
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4931
#, c-format
msgid "unable to resolve '%s'"
msgstr "tidak dapat menguraikan '%s'"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4981 diff.c:4987
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s butuh bentuk <n>/<m>"
-#: diff.c:4998
+#: diff.c:4999
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s butuh sebuah karakter, dapat '%s'"
-#: diff.c:5019
+#: diff.c:5020
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "argumen --color-moved jelek: %s"
-#: diff.c:5038
+#: diff.c:5039
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "mode tidak valid '%s' dalam --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5079
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3312,162 +3472,162 @@
"opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan "
"\"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5115 diff.c:5135
#, c-format
msgid "invalid argument to %s"
msgstr "argumen tidak valid ke %s"
-#: diff.c:5238
+#: diff.c:5239
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "regex tidak valid diberikan ke -I: '%s'"
-#: diff.c:5287
+#: diff.c:5288
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "gagal menguraikan parameter opsi --submodule: '%s'"
-#: diff.c:5343
+#: diff.c:5344
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "argumen --word-diff jelek: %s"
-#: diff.c:5379
+#: diff.c:5380
msgid "Diff output format options"
msgstr "Opsi format keluaran diff"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5382 diff.c:5388
msgid "generate patch"
msgstr "buat tambalan"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5385 builtin/log.c:180
msgid "suppress diff output"
msgstr "sembunyikan keluaran diff"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5390 diff.c:5504 diff.c:5511
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5391 diff.c:5394
msgid "generate diffs with <n> lines context"
msgstr "buat diff dengan <n> baris konteks"
-#: diff.c:5395
+#: diff.c:5396
msgid "generate the diff in raw format"
msgstr "buat diff dalam format mentah"
-#: diff.c:5398
+#: diff.c:5399
msgid "synonym for '-p --raw'"
msgstr "sinonim untuk '-p --raw'"
-#: diff.c:5402
+#: diff.c:5403
msgid "synonym for '-p --stat'"
msgstr "sinonim untuk '-p --stat'"
-#: diff.c:5406
+#: diff.c:5407
msgid "machine friendly --stat"
msgstr "--stat yang ramah mesin"
-#: diff.c:5409
+#: diff.c:5410
msgid "output only the last line of --stat"
msgstr "keluarkan hanya baris terakhir --stat"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5412 diff.c:5420
msgid "<param1,param2>..."
msgstr "<parameter 1,parameter 2>..."
-#: diff.c:5412
+#: diff.c:5413
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"keluarkan distribusi jumlah perubahan relatif untuk setiap subdirektori"
-#: diff.c:5416
+#: diff.c:5417
msgid "synonym for --dirstat=cumulative"
msgstr "sinonim untuk --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5421
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinonim untuk --dirstat=files,param1,param2..."
-#: diff.c:5424
+#: diff.c:5425
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"peringatkan bila perubahan memasukkan penanda konflik atau kesalahan spasi"
-#: diff.c:5427
+#: diff.c:5428
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"ringkasan singkat seperti pembuatan, penggantian nama dan perubahan mode"
-#: diff.c:5430
+#: diff.c:5431
msgid "show only names of changed files"
msgstr "perlihatkan hanya nama berkas yang berubah"
-#: diff.c:5433
+#: diff.c:5434
msgid "show only names and status of changed files"
msgstr "perlihatkan hanya nama dan status berkas yang berubah"
-#: diff.c:5435
+#: diff.c:5436
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<lebar>[,<nama lebar>[,<hitungan>]]"
-#: diff.c:5436
+#: diff.c:5437
msgid "generate diffstat"
msgstr "buat diffstat"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5439 diff.c:5442 diff.c:5445
msgid "<width>"
msgstr "<lebar>"
-#: diff.c:5439
+#: diff.c:5440
msgid "generate diffstat with a given width"
msgstr "buat diffstat dengan lebar yang diberikan"
-#: diff.c:5442
+#: diff.c:5443
msgid "generate diffstat with a given name width"
msgstr "buat diffstat dengan nama lebar yang diberikan"
-#: diff.c:5445
+#: diff.c:5446
msgid "generate diffstat with a given graph width"
msgstr "buat diffstat dengan lebar grafik yang diberikan"
-#: diff.c:5447
+#: diff.c:5448
msgid "<count>"
msgstr "<hitungan>"
-#: diff.c:5448
+#: diff.c:5449
msgid "generate diffstat with limited lines"
msgstr "buat diffstat dengan baris yang terbatas"
-#: diff.c:5451
+#: diff.c:5452
msgid "generate compact summary in diffstat"
msgstr "buat ringkasan singkat dalam diffstat"
-#: diff.c:5454
+#: diff.c:5455
msgid "output a binary diff that can be applied"
msgstr "keluarkan diff biner yang dapat diterapkan"
-#: diff.c:5457
+#: diff.c:5458
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "perlihatkan objek pra- dan pasca-citra penuh pada baris \"index\""
-#: diff.c:5459
+#: diff.c:5460
msgid "show colored diff"
msgstr "perlihatkan diff berwarna"
-#: diff.c:5460
+#: diff.c:5461
msgid "<kind>"
msgstr "<tipe>"
-#: diff.c:5461
+#: diff.c:5462
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
"soroti kesalahan spasi dalam baris 'context', 'old' atau 'new' dalam diff"
-#: diff.c:5464
+#: diff.c:5465
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3475,91 +3635,91 @@
"jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran "
"pada --raw atau --numstat"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
msgid "<prefix>"
msgstr "<prefiks>"
-#: diff.c:5468
+#: diff.c:5469
msgid "show the given source prefix instead of \"a/\""
msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\""
-#: diff.c:5471
+#: diff.c:5472
msgid "show the given destination prefix instead of \"b/\""
msgstr "perlihatkan prefiks tujuan daripada \"b/\""
-#: diff.c:5474
+#: diff.c:5475
msgid "prepend an additional prefix to every line of output"
msgstr "tambah depan prefiks tambahan pada setiap baris keluaran"
-#: diff.c:5477
+#: diff.c:5478
msgid "do not show any source or destination prefix"
msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun"
-#: diff.c:5480
+#: diff.c:5481
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-"perlihatkan konteks diantara hunk diff hingga jumlah baris yang disebutkan"
+"perlihatkan konteks diantara bingkah diff hingga jumlah baris yang disebutkan"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5485 diff.c:5490 diff.c:5495
msgid "<char>"
msgstr "<karakter>"
-#: diff.c:5485
+#: diff.c:5486
msgid "specify the character to indicate a new line instead of '+'"
msgstr "sebutkan karakter yang menandai baris baru daripada '+'"
-#: diff.c:5490
+#: diff.c:5491
msgid "specify the character to indicate an old line instead of '-'"
msgstr "sebutkan karakter yang menandai baris lama daripada '-'"
-#: diff.c:5495
+#: diff.c:5496
msgid "specify the character to indicate a context instead of ' '"
msgstr "sebutkan karakter yang menandai konteks daripada ' '"
-#: diff.c:5498
+#: diff.c:5499
msgid "Diff rename options"
msgstr "Opsi penamaan ulang diff"
-#: diff.c:5499
+#: diff.c:5500
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5501
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"pisahkan perubahan penulisan ulang penuh kedalam pasangan penghapusan dan "
"pembuatan"
-#: diff.c:5504
+#: diff.c:5505
msgid "detect renames"
msgstr "deteksi penamaan ulang"
-#: diff.c:5508
+#: diff.c:5509
msgid "omit the preimage for deletes"
msgstr "lewati pracitra untuk penghapusan"
-#: diff.c:5511
+#: diff.c:5512
msgid "detect copies"
msgstr "deteksi penyalinan"
-#: diff.c:5515
+#: diff.c:5516
msgid "use unmodified files as source to find copies"
msgstr ""
"gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan"
-#: diff.c:5517
+#: diff.c:5518
msgid "disable rename detection"
msgstr "nonaktifkan deteksi penamaan ulang"
-#: diff.c:5520
+#: diff.c:5521
msgid "use empty blobs as rename source"
msgstr "gunakan blob kosong sebagai sumber penamaan ulang"
-#: diff.c:5522
+#: diff.c:5523
msgid "continue listing the history of a file beyond renames"
msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang"
-#: diff.c:5525
+#: diff.c:5526
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3567,231 +3727,232 @@
"cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan "
"ulang/penyalinan melebihi batas yang diberikan"
-#: diff.c:5527
+#: diff.c:5528
msgid "Diff algorithm options"
msgstr "Opsi algoritma diff"
-#: diff.c:5529
+#: diff.c:5530
msgid "produce the smallest possible diff"
msgstr "hasilkan diff yang paling kecil yang dimungkinkan"
-#: diff.c:5532
+#: diff.c:5533
msgid "ignore whitespace when comparing lines"
msgstr "abaikan spasi saat membandingkan baris"
-#: diff.c:5535
+#: diff.c:5536
msgid "ignore changes in amount of whitespace"
msgstr "abaikan perubahan dalam jumlah spasi"
-#: diff.c:5538
+#: diff.c:5539
msgid "ignore changes in whitespace at EOL"
msgstr "abaikan perubahan spasi pada EOL"
-#: diff.c:5541
+#: diff.c:5542
msgid "ignore carrier-return at the end of line"
msgstr "abaikan kembalian-kurir pada akhir baris"
-#: diff.c:5544
+#: diff.c:5545
msgid "ignore changes whose lines are all blank"
msgstr "abaikan perubahan yang semua baris kosong"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5547
+#: diff.c:5548
msgid "ignore changes whose all lines match <regex>"
msgstr "abaikan perubahan yang semua baris cocok dengan <regex>"
-#: diff.c:5550
+#: diff.c:5551
msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr "heuristik untuk geser perbatasan hunk diff untuk pembacaan yang mudah"
+msgstr ""
+"heuristik untuk geser perbatasan bingkah diff untuk pembacaan yang mudah"
-#: diff.c:5553
+#: diff.c:5554
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "buat diff menggunakan algoritma \"diff sabar\""
-#: diff.c:5557
+#: diff.c:5558
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "buat diff menggunakan algoritma \"diff histogram\""
-#: diff.c:5559
+#: diff.c:5560
msgid "<algorithm>"
msgstr "<algoritma>"
-#: diff.c:5560
+#: diff.c:5561
msgid "choose a diff algorithm"
msgstr "pilih algoritma diff"
-#: diff.c:5562
+#: diff.c:5563
msgid "<text>"
msgstr "<teks>"
-#: diff.c:5563
+#: diff.c:5564
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "buat diff menggunakan algoritma \"diff terlabuh\""
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5566 diff.c:5575 diff.c:5578
msgid "<mode>"
msgstr "<mode>"
-#: diff.c:5566
+#: diff.c:5567
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"perlihatkan diff kata, menggunakan <mode> untuk batasi kata yang berubah"
-#: diff.c:5569
+#: diff.c:5570
msgid "use <regex> to decide what a word is"
msgstr "gunakan <regex> untuk menentukan apa itu kata"
-#: diff.c:5572
+#: diff.c:5573
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "sama dengan --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5575
+#: diff.c:5576
msgid "moved lines of code are colored differently"
msgstr "baris kode yang berpindah diwarnai berbeda"
-#: diff.c:5578
+#: diff.c:5579
msgid "how white spaces are ignored in --color-moved"
msgstr "bagaimana spasi diabaikan di --color-moved"
-#: diff.c:5581
+#: diff.c:5582
msgid "Other diff options"
msgstr "Opsi diff yang lainnya"
-#: diff.c:5583
+#: diff.c:5584
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"ketika dijalankan dari subdirektori, kecualikan perubahan diluar dan "
"perlihatkan jalur relatif"
-#: diff.c:5587
+#: diff.c:5588
msgid "treat all files as text"
msgstr "perlakukan semua berkas sebagai teks"
-#: diff.c:5589
+#: diff.c:5590
msgid "swap two inputs, reverse the diff"
msgstr "tukar dua masukkan, balikkan diff"
-#: diff.c:5591
+#: diff.c:5592
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "keluar dengan 1 jika ada perbedaan, selain itu 0"
-#: diff.c:5593
+#: diff.c:5594
msgid "disable all output of the program"
msgstr "nonaktifkan semua keluaran program"
-#: diff.c:5595
+#: diff.c:5596
msgid "allow an external diff helper to be executed"
msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi"
-#: diff.c:5597
+#: diff.c:5598
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"jalankan saringan konversi teks eksternal ketika membandingkan berkas biner"
-#: diff.c:5599
+#: diff.c:5600
msgid "<when>"
msgstr "<kapan>"
-#: diff.c:5600
+#: diff.c:5601
msgid "ignore changes to submodules in the diff generation"
msgstr "abaikan perubahan submodul dalam pembuatan diff"
-#: diff.c:5603
+#: diff.c:5604
msgid "<format>"
msgstr "<format>"
-#: diff.c:5604
+#: diff.c:5605
msgid "specify how differences in submodules are shown"
msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan"
-#: diff.c:5608
+#: diff.c:5609
msgid "hide 'git add -N' entries from the index"
msgstr "sembunyikan entri 'git add -N' dari indeks"
-#: diff.c:5611
+#: diff.c:5612
msgid "treat 'git add -N' entries as real in the index"
msgstr "perlakukan entri 'git add -N' sebagai nyata dalam indeks"
-#: diff.c:5613
+#: diff.c:5614
msgid "<string>"
msgstr "<untai>"
-#: diff.c:5614
+#: diff.c:5615
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "cari perbedaan yang mengubah jumlah kemunculan untai yang disebutkan"
-#: diff.c:5617
+#: diff.c:5618
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "cari perbedaan yang mengubah jumlah kemunculan regex yang disebutkan"
-#: diff.c:5620
+#: diff.c:5621
msgid "show all changes in the changeset with -S or -G"
msgstr "perlihatkan semua perubahan dalam set perubahan dengan -S atau -G"
-#: diff.c:5623
+#: diff.c:5624
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"perlakukan <string> di -S sebagai ekspresi reguler POSIX yang diperluas"
-#: diff.c:5626
+#: diff.c:5627
msgid "control the order in which files appear in the output"
msgstr "kontrol urutan berkas yang muncul dalam keluaran"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5628 diff.c:5631
msgid "<path>"
msgstr "<jalur>"
-#: diff.c:5628
+#: diff.c:5629
msgid "show the change in the specified path first"
msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu"
-#: diff.c:5631
+#: diff.c:5632
msgid "skip the output to the specified path"
msgstr "lewati keluaran ke jalur yang disebutkan"
-#: diff.c:5633
+#: diff.c:5634
msgid "<object-id>"
msgstr "<id objek>"
-#: diff.c:5634
+#: diff.c:5635
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "cari perubahan yang mengubah jumlah kemunculan objek yang disebutkan"
-#: diff.c:5636
+#: diff.c:5637
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5638
msgid "select files by diff type"
msgstr "pilih berkas oleh tipe diff"
-#: diff.c:5639
+#: diff.c:5640
msgid "<file>"
msgstr "<berkas>"
-#: diff.c:5640
-msgid "Output to a specific file"
-msgstr "Keluarkan ke berkas yang disebutkan"
+#: diff.c:5641
+msgid "output to a specific file"
+msgstr "keluarkan ke berkas yang disebutkan"
-#: diff.c:6298
+#: diff.c:6321
msgid "exhaustive rename detection was skipped due to too many files."
msgstr "deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas."
-#: diff.c:6301
+#: diff.c:6324
msgid "only found copies from modified paths due to too many files."
msgstr ""
"hanya ditemukan salinan dari jalur yang berubah karena terlalu banyak berkas."
-#: diff.c:6304
+#: diff.c:6327
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3804,7 +3965,7 @@
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr ""
@@ -3833,39 +3994,47 @@
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr ""
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:2351
+#: dir.c:2419
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2653
+#: dir.c:2721
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2777
+#: dir.c:2846
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3610
+#: dir.c:3119
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Nama direktori tidak dapat ditebak.\n"
+"Mohon sebutkan direktori pada baris perintah"
+
+#: dir.c:3807
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3657 dir.c:3662
+#: dir.c:3854 dir.c:3859
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3691
+#: dir.c:3888
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
@@ -3875,304 +4044,399 @@
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: entry.c:176
+#: entry.c:179
msgid "Filtering content"
msgstr ""
-#: entry.c:497
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr ""
-#: environment.c:152
+#: environment.c:147
#, c-format
msgid "bad git namespace path \"%s\""
msgstr ""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr ""
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr ""
-#: fetch-pack.c:182
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
-msgstr ""
+msgstr "git fetch-pack: daftar dangkal diharapkan"
-#: fetch-pack.c:185
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr ""
+msgstr "git fetch-pack: sebuah paket bilasan diharapkan setelah daftar dangkal"
-#: fetch-pack.c:196
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr ""
+msgstr "git fetch-pack: ACK/NAK diharapkan, dapat paket bilasan"
-#: fetch-pack.c:216
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr ""
+msgstr "git fetch-pack: ACK/NAK diharapkan, dapat '%s'"
-#: fetch-pack.c:227
+#: fetch-pack.c:239
msgid "unable to write to remote"
-msgstr ""
+msgstr "tidak dapat menulis ke remote"
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr ""
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:397 fetch-pack.c:1460
#, c-format
msgid "invalid shallow line: %s"
-msgstr ""
+msgstr "baris dangkal tidak valid: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:403 fetch-pack.c:1466
#, c-format
msgid "invalid unshallow line: %s"
-msgstr ""
+msgstr "baris dangkal-balik tidak valid: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:405 fetch-pack.c:1468
#, c-format
msgid "object not found: %s"
-msgstr ""
+msgstr "object tidak ditemukan: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:408 fetch-pack.c:1471
#, c-format
msgid "error in object: %s"
-msgstr ""
+msgstr "kesalahan dalam objek: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:410 fetch-pack.c:1473
#, c-format
msgid "no shallow found: %s"
-msgstr ""
+msgstr "tidak ada dangkal yang ditemukan: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:413 fetch-pack.c:1477
#, c-format
msgid "expected shallow/unshallow, got %s"
-msgstr ""
+msgstr "dangkal/dangkal-balik diharapkan, dapat %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:453
#, c-format
msgid "got %s %d %s"
-msgstr ""
+msgstr "dapat %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:470
#, c-format
msgid "invalid commit %s"
-msgstr ""
+msgstr "komit tidak valid %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:501
msgid "giving up"
-msgstr ""
+msgstr "menyerah"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:514 progress.h:25
msgid "done"
-msgstr ""
+msgstr "selesai"
-#: fetch-pack.c:512
+#: fetch-pack.c:526
#, c-format
msgid "got %s (%d) %s"
-msgstr ""
+msgstr "dapat %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:562
#, c-format
msgid "Marking %s as complete"
-msgstr ""
+msgstr "Menandai %s sebagai lengkap"
-#: fetch-pack.c:763
+#: fetch-pack.c:784
#, c-format
msgid "already have %s (%s)"
-msgstr ""
+msgstr "sudah punya %s (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:870
msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr ""
+msgstr "fetch-pack: tidak dapat menggarpu pemultipleks-balik pita samping"
-#: fetch-pack.c:857
+#: fetch-pack.c:878
msgid "protocol error: bad pack header"
-msgstr ""
-
-#: fetch-pack.c:951
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr ""
-
-#: fetch-pack.c:957
-msgid "fetch-pack: invalid index-pack output"
-msgstr ""
+msgstr "kesalahan protokol: kepala pak jelek"
#: fetch-pack.c:974
#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: tidak dapat menggarpu %s"
+
+#: fetch-pack.c:980
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: keluaran index-pack tidak valid"
+
+#: fetch-pack.c:997
+#, c-format
msgid "%s failed"
-msgstr ""
+msgstr "%s gagal"
-#: fetch-pack.c:976
+#: fetch-pack.c:999
msgid "error in sideband demultiplexer"
-msgstr ""
+msgstr "kesalahan dalam pemultipleks-balik pita samping"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1048
#, c-format
msgid "Server version is %.*s"
-msgstr ""
+msgstr "Versi peladen %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
+#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
+#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
+#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
#, c-format
msgid "Server supports %s"
-msgstr ""
+msgstr "Peladen mendukung %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1058
msgid "Server does not support shallow clients"
-msgstr ""
+msgstr "Peladen tidak mendukung klien dangkal"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1118
msgid "Server does not support --shallow-since"
-msgstr ""
+msgstr "Peladen tidak mendukung --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1123
msgid "Server does not support --shallow-exclude"
-msgstr ""
+msgstr "Peladen tidak mendukung --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1127
msgid "Server does not support --deepen"
-msgstr ""
+msgstr "Peladen tidak mendukung --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1129
msgid "Server does not support this repository's object format"
-msgstr ""
+msgstr "Peladen tidak mendukung objek format repositori ini"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1142
msgid "no common commits"
-msgstr ""
+msgstr "tidak ada komit umum"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
msgid "source repository is shallow, reject to clone."
-msgstr ""
+msgstr "repositori sumber dangkal, menolak mengkloning."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1157 fetch-pack.c:1705
msgid "git fetch-pack: fetch failed."
-msgstr ""
+msgstr "git fetch-pack: pengambilan gagal."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1271
#, c-format
msgid "mismatched algorithms: client %s; server %s"
-msgstr ""
+msgstr "algoritma tidak cocok: klien %s; peladen %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1275
#, c-format
msgid "the server does not support algorithm '%s'"
-msgstr ""
+msgstr "peladen tidak mendukung algoritma '%s'"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1308
msgid "Server does not support shallow requests"
-msgstr ""
+msgstr "Peladen tidak mendukung permintaan dangkal"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1315
msgid "Server supports filter"
-msgstr ""
+msgstr "Peladen mendukung saringan"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1358 fetch-pack.c:2087
msgid "unable to write request to remote"
-msgstr ""
+msgstr "tidak dapat menulis permintaan kepada remote"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1376
#, c-format
msgid "error reading section header '%s'"
-msgstr ""
+msgstr "kesalahan membaca kepala seksi '%s'"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1382
#, c-format
msgid "expected '%s', received '%s'"
-msgstr ""
+msgstr "diharapkan '%s', diterima '%s'"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1416
#, c-format
msgid "unexpected acknowledgment line: '%s'"
-msgstr ""
+msgstr "baris pengakuan tidak diharapkan: %s"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1421
#, c-format
msgid "error processing acks: %d"
-msgstr ""
+msgstr "kesalahan memproses ack: %d"
-#: fetch-pack.c:1402
-msgid "expected packfile to be sent after 'ready'"
-msgstr ""
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1435
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "berkas pak diharapkan dikirim setelah '%s'"
-#: fetch-pack.c:1404
-msgid "expected no other sections to be sent after no 'ready'"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1441
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
msgstr ""
+"tidak ada bagian lainnya yang diharapkan dikirim setelah tidak ada '%s'"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1482
#, c-format
msgid "error processing shallow info: %d"
-msgstr ""
+msgstr "gagal memproses info dangkal: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1531
#, c-format
msgid "expected wanted-ref, got '%s'"
-msgstr ""
+msgstr "wanted-ref diharapkan, dapat '%s'"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1536
#, c-format
msgid "unexpected wanted-ref: '%s'"
-msgstr ""
+msgstr "wanted-ref tidak diharapkan: '%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1541
#, c-format
msgid "error processing wanted refs: %d"
-msgstr ""
+msgstr "kesalahan memproses referensi yang diminta: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1571
msgid "git fetch-pack: expected response end packet"
-msgstr ""
+msgstr "git fetch-pack: paket jawaban akhir diharapkan"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1983
msgid "no matching remote head"
-msgstr ""
+msgstr "tidak ada kepala remote yang cocok"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:2006 builtin/clone.c:587
msgid "remote did not send all necessary objects"
-msgstr ""
+msgstr "remote tidak mengirim semua objek yang dibutuhkan"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2109
msgid "unexpected 'ready' from remote"
-msgstr ""
+msgstr "'ready' tidak diharapkan dari remote"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2132
#, c-format
msgid "no such remote ref %s"
-msgstr ""
+msgstr "tidak ada referensi remote seperti %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2135
#, c-format
msgid "Server does not allow request for unadvertised object %s"
+msgstr "Peladen tidak memperbolehkan permintaan untuk objek tak diiklankan %s"
+
+#: fsmonitor-ipc.c:119
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
msgstr ""
-#: gpg-interface.c:273
+#: fsmonitor-ipc.c:125
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr ""
+
+#: fsmonitor-ipc.c:155
+msgid "fsmonitor--daemon is not running"
+msgstr ""
+
+#: fsmonitor-ipc.c:164
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr ""
+
+#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
+#: gpg-interface.c:1011
msgid "could not create temporary file"
-msgstr ""
+msgstr "tidak dapat membuat berkas sementara"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:459
#, c-format
msgid "failed writing detached signature to '%s'"
-msgstr ""
+msgstr "gagal menulis tandatangan terlepas ke '%s'"
-#: gpg-interface.c:470
-msgid "gpg failed to sign the data"
+#: gpg-interface.c:450
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
msgstr ""
+"gpg.ssh.allowedSignersFile perlu dikonfigurasi dan ada untuk verifikasi "
+"tandatangan ssh"
+
+#: gpg-interface.c:479
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify diperlukan untuk verifikasi tandatangan "
+"ssh (tersedia di openssh versi 8.2p1+)"
+
+#: gpg-interface.c:550
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+"berkas pencabutan penandatanganan ssh terkonfigurasi tapi tidak ada: %s"
+
+#: gpg-interface.c:638
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "tanda tangan '%s' jelek/tidak kompatibel"
+
+#: gpg-interface.c:815 gpg-interface.c:820
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "gagal mendapatkan sidik jari ssh untuk kunci '%s'"
+
+#: gpg-interface.c:843
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"baik user.signingkey atau gpg.ssh.defaultKeyCommand perlu dikonfigurasi"
+
+#: gpg-interface.c:865
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand sukses tapi tidak mengembalikan kunci: %s %s"
+
+#: gpg-interface.c:871
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand gagal: %s %s"
+
+#: gpg-interface.c:966
+msgid "gpg failed to sign the data"
+msgstr "gpg gagal menandatangani data"
+
+#: gpg-interface.c:988
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey perlu disetel untuk penandatanganan ssh"
+
+#: gpg-interface.c:999
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "gagal menulis kunci penandatanganan ssh ke '%s'"
+
+#: gpg-interface.c:1017
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "gagal menulis penyangga kunci penandatanganan ssh ke '%s'"
+
+#: gpg-interface.c:1035
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y sign diperlukan untuk penandatanganan ssh (tersedia di "
+"openssh versi 8.2p1+)"
+
+#: gpg-interface.c:1047
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "gagal membaca penyangga data penandatanganan ssh dari '%s'"
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
-msgstr ""
+msgstr "warna tidak valid '%.*s' diabaikan di log.graphColors"
-#: grep.c:531
+#: grep.c:446
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4180,109 +4444,109 @@
"pola yang diberikan berisi bita NULL (via -f <berkas>). Hal ini hanya "
"didukung dengan -P di bawah PCRE v2"
-#: grep.c:1895
+#: grep.c:1859
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': tidak dapat membaca %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "gagal men-stat '%s'"
-#: grep.c:1923
+#: grep.c:1887
#, c-format
msgid "'%s': short read"
msgstr "'%s': baca pendek"
-#: help.c:23
+#: help.c:25
msgid "start a working area (see also: git help tutorial)"
msgstr "mulai area kerja (lihat pula: git help tutorial)"
-#: help.c:24
+#: help.c:26
msgid "work on the current change (see also: git help everyday)"
msgstr "bekerja pada perubahan saat ini (lihat pula: git help everyday)"
-#: help.c:25
+#: help.c:27
msgid "examine the history and state (see also: git help revisions)"
msgstr "periksa riwayat dan keadaan (lihat pula: git help revisions)"
-#: help.c:26
+#: help.c:28
msgid "grow, mark and tweak your common history"
msgstr "tumbuhkan, tandai, dan cubit riwayat umum Anda"
-#: help.c:27
+#: help.c:29
msgid "collaborate (see also: git help workflows)"
msgstr "kolaborasi (lihat pula: git help workflows)"
-#: help.c:31
+#: help.c:33
msgid "Main Porcelain Commands"
msgstr "Perintah Porselen Utama"
-#: help.c:32
+#: help.c:34
msgid "Ancillary Commands / Manipulators"
msgstr "Perintah Tambahan / Peubah"
-#: help.c:33
+#: help.c:35
msgid "Ancillary Commands / Interrogators"
msgstr "Perintah Tambahan / Pemeriksa"
-#: help.c:34
+#: help.c:36
msgid "Interacting with Others"
msgstr "Berinteraksi dengan yang Lain"
-#: help.c:35
+#: help.c:37
msgid "Low-level Commands / Manipulators"
msgstr "Perintah Tingkat Rendah / Peubah"
-#: help.c:36
+#: help.c:38
msgid "Low-level Commands / Interrogators"
msgstr "Perintah Tingkat Rendah / Pemeriksa"
-#: help.c:37
+#: help.c:39
msgid "Low-level Commands / Syncing Repositories"
msgstr "Perintah Tingkat Rendah / Sinkronisasi Repositori"
-#: help.c:38
+#: help.c:40
msgid "Low-level Commands / Internal Helpers"
msgstr "Perintah Tingak Rendah / Pembantu Internal"
-#: help.c:300
+#: help.c:316
#, c-format
msgid "available git commands in '%s'"
msgstr "perintah git yang tersedia di '%s'"
-#: help.c:307
+#: help.c:323
msgid "git commands available from elsewhere on your $PATH"
msgstr "perintah git yang tersedia dari tempat lain pada $PATH Anda"
-#: help.c:316
+#: help.c:332
msgid "These are common Git commands used in various situations:"
msgstr "Berikut ini perintah Git umum yang digunakan dalam beragam situasi:"
-#: help.c:365 git.c:100
+#: help.c:382 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "tipe daftar perintah '%s' tidak didukung"
-#: help.c:405
+#: help.c:422
msgid "The Git concept guides are:"
msgstr "Panduan konsep Git adalah:"
-#: help.c:429
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Lihat 'git help <perintah>' untuk baca tentang subperintah spesifik"
-
-#: help.c:434
+#: help.c:446
msgid "External commands"
msgstr "Perintah eksternal"
-#: help.c:449
+#: help.c:468
msgid "Command aliases"
msgstr "Alias perintah"
-#: help.c:527
+#: help.c:486
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Lihat 'git help <perintah>' untuk baca tentang subperintah spesifik"
+
+#: help.c:563
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4291,31 +4555,36 @@
"'%s' sepertinya perintah git, tetapi kami tidak dapat\n"
"menjalankannya. Mungkin git-%s rusak?"
-#: help.c:543 help.c:631
+#: help.c:585 help.c:682
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' bukan perintah git. Lihat 'git --help'."
-#: help.c:591
+#: help.c:633
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Eh oh. Sistem Anda melaporkan tidak ada perintah Git sama sekali."
-#: help.c:613
+#: help.c:655
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "PERINGATAN: Anda memanggil perintah Git bernama '%s' yang tidak ada."
-#: help.c:618
+#: help.c:660
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Melanjutkan di bawah asumsi bahwa maksud Anda '%s'."
-#: help.c:623
+#: help.c:666
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Jalankan '%s' sebagai gantinya [y/N]?"
+
+#: help.c:674
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Melanjutkan dalam %0.1f detik, mengasumsikan bahwa maksud Anda '%s'."
-#: help.c:635
+#: help.c:686
msgid ""
"\n"
"The most similar command is"
@@ -4329,16 +4598,16 @@
"\n"
"Perintah paling mirip adalah"
-#: help.c:675
+#: help.c:729
msgid "git version [<options>]"
msgstr "git version [<opsi>]"
-#: help.c:730
+#: help.c:784
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:788
msgid ""
"\n"
"Did you mean this?"
@@ -4352,15 +4621,30 @@
"\n"
"Mungkin maksud Anda salah satu dari yang ini?"
-#: ident.c:353
+#: hook.c:28
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Kait '%s' diabaikan karena tidak disetel sebagai dapat dieksekusi.\n"
+"Anda dapat menonaktifkan peringatan ini dengan `git config advice."
+"ignoredHook false`."
+
+#: hook.c:87
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "Tidak dapat memulai kait '%s'\n"
+
+#: ident.c:354
msgid "Author identity unknown\n"
-msgstr ""
+msgstr "Identitas pengarang tidak dikenal\n"
-#: ident.c:356
+#: ident.c:357
msgid "Committer identity unknown\n"
-msgstr ""
+msgstr "Identitas pengkomit tidak dikenal\n"
-#: ident.c:362
+#: ident.c:363
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -4374,72 +4658,83 @@
"Omit --global to set the identity only in this repository.\n"
"\n"
msgstr ""
+"\n"
+"*** Mohon beri tahu saya siapa Anda.\n"
+"\n"
+"Jalankan\n"
+"\n"
+" git config --global user.email \"anda@example.com\"\n"
+" git config --global user.name \"Nama Anda\"\n"
+"\n"
+"untuk menyetel identitas asali akun Anda.\n"
+"Abaikan --global untuk menyetel identitas hanya di dalam repositori ini.\n"
+"\n"
-#: ident.c:397
+#: ident.c:398
msgid "no email was given and auto-detection is disabled"
-msgstr ""
+msgstr "tidak ada email yang diberikan dan deteksi otomatis dimatikan"
-#: ident.c:402
+#: ident.c:403
#, c-format
msgid "unable to auto-detect email address (got '%s')"
-msgstr ""
+msgstr "tidak dapat mendeteksi otomatis alamat email (dapat '%s')"
-#: ident.c:419
+#: ident.c:420
msgid "no name was given and auto-detection is disabled"
-msgstr ""
+msgstr "tidak ada nama yang diberikan dan deteksi otomatis dimatikan"
-#: ident.c:425
+#: ident.c:426
#, c-format
msgid "unable to auto-detect name (got '%s')"
-msgstr ""
+msgstr "tidak dapat mendeteksi otomatis nama (dapat '%s')"
-#: ident.c:433
+#: ident.c:434
#, c-format
msgid "empty ident name (for <%s>) not allowed"
-msgstr ""
+msgstr "nama identitas kosong (untuk <%s>) tidak diperbolehkan"
-#: ident.c:439
+#: ident.c:440
#, c-format
msgid "name consists only of disallowed characters: %s"
-msgstr ""
+msgstr "nama hanya terdiri dari karakter yang tidak diperbolehkan: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:455 builtin/commit.c:649
#, c-format
msgid "invalid date format: %s"
-msgstr ""
+msgstr "format tanggal tidak valid: %s"
-#: list-objects-filter-options.c:83
+#: list-objects-filter-options.c:68
msgid "expected 'tree:<depth>'"
msgstr ""
-#: list-objects-filter-options.c:98
+#: list-objects-filter-options.c:83
msgid "sparse:path filters support has been dropped"
msgstr ""
-#: list-objects-filter-options.c:105
+#: list-objects-filter-options.c:90
#, c-format
msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr ""
-#: list-objects-filter-options.c:124
+#: list-objects-filter-options.c:109
#, c-format
msgid "invalid filter-spec '%s'"
msgstr ""
-#: list-objects-filter-options.c:140
+#: list-objects-filter-options.c:125
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr ""
-#: list-objects-filter-options.c:182
+#: list-objects-filter-options.c:167
msgid "expected something after combine:"
msgstr ""
-#: list-objects-filter-options.c:264
+#: list-objects-filter-options.c:249
msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: list-objects-filter-options.c:376
+#: list-objects-filter-options.c:365
msgid "unable to upgrade repository format to support partial clone"
msgstr ""
@@ -4453,17 +4748,17 @@
msgid "unable to parse sparse filter data in %s"
msgstr ""
-#: list-objects.c:127
+#: list-objects.c:144
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
-#: list-objects.c:140
+#: list-objects.c:157
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr ""
-#: list-objects.c:398
+#: list-objects.c:415
#, c-format
msgid "unable to load root tree for commit %s"
msgstr ""
@@ -4485,12 +4780,12 @@
msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: ls-refs.c:37
+#: ls-refs.c:175
#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
+msgid "unexpected line: '%s'"
msgstr ""
-#: ls-refs.c:167
+#: ls-refs.c:179
msgid "expected flush after ls-refs arguments"
msgstr ""
@@ -4498,44 +4793,48 @@
msgid "quoted CRLF detected"
msgstr ""
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr ""
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1630 merge-recursive.c:1214
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
-msgstr ""
+msgstr "Gagal menggabungkan submodul %s (tidak di-checkout)"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1639 merge-recursive.c:1221
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
-msgstr ""
+msgstr "Gagal menggabungkan submodul %s (komit tidak ada)"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1648 merge-recursive.c:1228
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
+"Gagal menggabungkan submodul %s (komit tidak mengikuti dasar penggabungan)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1658 merge-ort.c:1666
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr ""
+msgstr "Catatan: Memaju-cepat submodul %s ke %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1688
#, c-format
msgid "Failed to merge submodule %s"
-msgstr ""
+msgstr "Gagal menggabungkan submodul %s"
-#: merge-ort.c:1632
+#: merge-ort.c:1695
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
"%s\n"
msgstr ""
+"Gagal menggabungkan submodul %s, tetapi sebuah penyelesaian penggabungan "
+"yang mungkin ada:\n"
+"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1699 merge-recursive.c:1284
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4545,633 +4844,747 @@
"\n"
"which will accept this suggestion.\n"
msgstr ""
+"Jika benar, cukup misalkan tambahkan ke indeks dengan menggunakan:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"yang akan menerima saran ini.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1712
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
"%s"
msgstr ""
+"Gagal menggabungkan submodul %s, tetapi ada banyak penggabungan yang "
+"mungkin:\n"
+"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1937 merge-recursive.c:1375
msgid "Failed to execute internal merge"
-msgstr ""
+msgstr "Gagal menjalankan penggabungan internal"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1942 merge-recursive.c:1380
#, c-format
msgid "Unable to add %s to database"
-msgstr ""
+msgstr "Tidak dapat menambahkan %s ke basis data"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1949 merge-recursive.c:1413
#, c-format
msgid "Auto-merging %s"
-msgstr ""
+msgstr "Menggabungkan otomatis %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2088 merge-recursive.c:2135
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
+"KONFLIK (penamaan ulang direktori implisit): Berkas/direktori yang sudah ada "
+"pada %s saat penamaan ulang direktori menempatkan jalur berikut di sana: %s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2098 merge-recursive.c:2145
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
+"KONFLIK (penamaan ulang direktori implisit): Tidak dapat memetakan lebih "
+"dari satu jalur ke %s; penamaan ulang direktori implisit mencoba menempatkan "
+"jalur tersebut di sana: %s"
-#: merge-ort.c:2087
+#: merge-ort.c:2156
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
"renamed to multiple other directories, with no destination getting a "
"majority of the files."
msgstr ""
+"KONFLIK (pemecahan penamaan ulang direktori): Tidak jelas kemana menamakan "
+"ulang %s; itu dinamai ulang ke banyak direktori lainnya, dengan tiada tujuan "
+"mendapatkan mayoritas berkas."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2310 merge-recursive.c:2481
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
+"PERINGATAN: Menghindari menerapkan penamaan ulang %s -> %s ke %s, karena %s-"
+"nya sendiri dinamai ulang."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2450 merge-recursive.c:3264
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
+"Jalur diperbarui: %s menambahkan %s di dalam sebuah direktori yang dinamai "
+"ulang di %s; memindahkan ke %s."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2457 merge-recursive.c:3271
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
+"Jalur diperbarui: %s dinamai ulang ke %s di %s, di dalam sebuah direktori "
+"yang dinamai ulang di %s; memindahkan ke %s."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2470 merge-recursive.c:3267
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
+"KONFLIK (lokasi berkas): %s menambahkan %s di dalam sebuah direktori yang "
+"dinamai ulang di %s, menyarankan mungkin dipindahkan ke %s."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2478 merge-recursive.c:3274
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
+"KONFLIK (lokasi berkas): %s dinamai ulang ke %s di %s, di dalam sebuah "
+"direktori yang dinamai ulang di %s, menyarankan mungkin dipindahkan ke %s. "
-#: merge-ort.c:2569
+#: merge-ort.c:2634
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
+"KONFLIK (penamaan ulang/penamaan ulang): %s dinamai ulang ke %s di %s dan ke "
+"%s di %s."
-#: merge-ort.c:2664
+#: merge-ort.c:2729
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
"conflicts AND collides with another path; this may result in nested conflict "
"markers."
msgstr ""
+"KONFLIK (penamaan ulang terlibat di dalam tabrakan): penamaan ulang %s -> %s "
+"punya konflik konten DAN bertabrakan dengan jalur yang lain; ini mungkin "
+"menghasilkan penanda konflik bersarang."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2748 merge-ort.c:2772
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
+"KONFLIK (penamaan ulang/penghapusan): %s dinamai ulang ke %s di %s, tetapi "
+"dihapus di %s."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3261 merge-recursive.c:3025
#, c-format
msgid "cannot read object %s"
-msgstr ""
+msgstr "tidak dapat membaca objek %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3264 merge-recursive.c:3028
#, c-format
msgid "object %s is not a blob"
-msgstr ""
+msgstr "objek %s bukanlah sebuah blob"
-#: merge-ort.c:3613
+#: merge-ort.c:3693
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr ""
+"KONFLIK (berkas/direktori): direktori di jalan %s dari %s; memindahkan ke %s "
+"sebagai gantinya."
-#: merge-ort.c:3689
+#: merge-ort.c:3770
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
"of them so each can be recorded somewhere."
msgstr ""
+"KONFLIK (tipe berbeda): %s punya tipe berbeda pada setiap sisi; kedua-duanya "
+"dinamai ulang sehingga masing-masing dapat direkam di suatu tempat."
-#: merge-ort.c:3696
+#: merge-ort.c:3777
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
"of them so each can be recorded somewhere."
msgstr ""
+"KONFLIK (tipe berbeda): %s punya tipe berbeda pada setiap sisi; salah "
+"satunya dinamai ulang sehingga masing-masing dapat direkam di suatu tempat."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3866 merge-recursive.c:3104
msgid "content"
-msgstr ""
+msgstr "konten"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3868 merge-recursive.c:3108
msgid "add/add"
-msgstr ""
+msgstr "penambahan/penambahan"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3870 merge-recursive.c:3153
msgid "submodule"
-msgstr ""
+msgstr "submodul"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3872 merge-recursive.c:3154
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr ""
+msgstr "KONFLIK (%s): Konflik penggabungan di %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3916
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"of %s left in tree."
msgstr ""
+"KONFLIK (pengubahan/penghapusan): %s dihapus di %s dan diubah di %s. Versi "
+"%s dari %s ditinggalkan di dalam pohon."
-#: merge-ort.c:4120
+#: merge-ort.c:4212
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
"copy renamed to %s"
msgstr ""
+"Catatan: %s tidak terbaru dan dalam men-checkout versi berkonflik; salinan "
+"lama dinamai ulang ke %s"
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4586
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
-msgstr ""
+msgstr "pengumpulan info penggabungan gagal untuk pohon %s, %s, dan %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3723
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
+"Perubahan lokal Anda terhadap berkas berikut akan ditimpa oleh "
+"penggabungan:\n"
+" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
msgid "Already up to date."
msgstr "Sudah terbaru."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
-msgstr ""
+msgstr "(komit jelek)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr ""
+msgstr "add_cacheinfo gagal untuk jalur '%s'; penggabungan dibatalkan."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
+"add_cacheinfo gagal menyegarkan untuk jalur '%s'; penggabungan dibatalkan."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
-msgstr ""
+msgstr "gagal membuat jalur '%s'%s"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
-msgstr ""
+msgstr "Menghapus %s untuk membuat ruang untuk subdirektori\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
-msgstr ""
+msgstr ": mungkin konflik direktori/berkas?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
-msgstr ""
+msgstr "menolak menghilangkan berkas tak terlacak pada '%s'"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:47
#, c-format
msgid "cannot read object %s '%s'"
-msgstr ""
+msgstr "tidak dapat membaca objek %s '%s'"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
-msgstr ""
+msgstr "blob diharapkan untuk %s '%s'"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
-msgstr ""
+msgstr "gagal membuka '%s': %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
-msgstr ""
+msgstr "gagal menautkan simbolik '%s': %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
-msgstr ""
+msgstr "tidak tahu apa yang dilakukan dengan %06o %s '%s'"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr ""
+msgstr "Memaju-cepat submodul %s ke komit berikut:"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1239 merge-recursive.c:1252
#, c-format
msgid "Fast-forwarding submodule %s"
-msgstr ""
+msgstr "Memaju-cepat submodul %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
+"Gagal menggabungkan submodul %s (penggabungan komit berikutnya tidak "
+"ditemukan)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1280
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr ""
+msgstr "Gagal menggabungkan submodul %s (bukan maju-cepat)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1281
msgid "Found a possible merge resolution for the submodule:\n"
-msgstr ""
+msgstr "Sebuah resolusi penggabungan yang mungkin ditemukan untuk submodul:\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1293
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr ""
+msgstr "Gagal menggabungkan submodul %s (banyak penggabungan ditemukan)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1437
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
+"Kesalahan: Menolak menghilangkan berkas tak terlacak pada %s; menulis ke %s "
+"sebagai gantinya."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
+"KONFLIK (%s/penghapusan): %s dihapus di %s dan %s di %s. Versi %s dari %s "
+"ditinggalkan di dalam pohon."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1514
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
+"KONFLIK (%s/penghapusan): %s dihapus di %s dan %s ke %s di %s. Versi %s dari "
+"%s ditinggalkan di dalam pohon."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1521
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
+"KONFLIK (%s/penghapusan): %s dihapus di %s dan %s di %s. Versi %s dari %s "
+"ditinggalkan di dalam pohon pada %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr ""
+"KONFLIK (%s/penghapusan): %s dihapus di %s dan %s ke %s di %s. Versi %s dari "
+"%s ditinggalkan di dalam pohon pada %s."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "rename"
-msgstr ""
+msgstr "penamaan ulang"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "renamed"
-msgstr ""
+msgstr "dinamai ulang"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
#, c-format
msgid "Refusing to lose dirty file at %s"
-msgstr ""
+msgstr "Menolak menghilangkan berkas kotor pada %s"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1622
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
+"Menolak menghilangkan berkas tak terlacak pada %s, bahkan jika itu berjalan."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1680
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
+"KONFLIK (penamaan ulang/penambahan): Penamaan ulang %s-%s di %s. %s "
+"ditambahkan di %s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1711
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
+"%s adalah sebuah direktori dalam %s menambahkan sebagai %s sebagai gantinya"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1716
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
+"Menolak menghilangkan berkas tak terlacak pada %s; menambahkan sebagai %s "
+"sebagai gantinya"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1743
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
+"KONFLIK (penamaan ulang/penamaan ulang): Penamaan ulang \"%s\"->\"%s\" di "
+"dalam cabang \"%s\" penamaan ulang \"%s\"->\"%s\" di \"%s\"%s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1748
msgid " (left unresolved)"
-msgstr ""
+msgstr " dibiarkan tak diselesaikan"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1840
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
+"KONFLIK (penamaan ulang/penamaan ulang): Penamaan ulang %s->%s di %s. "
+"Penamaan ulang %s->%s di %s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2103
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"directory %s was renamed to multiple other directories, with no destination "
"getting a majority of the files."
msgstr ""
+"KONFLIK (pemecahan penamaan ulang direktori): Tidak jelas dimana untuk "
+"menempatkan %s karena direktori %s dinamai ulang ke banyak direktori "
+"lainnya, dengan tidak ada tujuan yang mendapatkan mayoritas berkas."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2237
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
+"KONFLIK (penamaan ulang/penamaan ulang): Penamaan ulang direktori %s->%s di "
+"%s. Penamaan ulang %s->%s di %s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modify"
-msgstr ""
+msgstr "ubah"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modified"
-msgstr ""
+msgstr "diubah"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3131
#, c-format
msgid "Skipped %s (merged same as existing)"
-msgstr ""
+msgstr "%s dilewatkan (digabungkan sama seperti yang ada)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3184
#, c-format
msgid "Adding as %s instead"
-msgstr ""
+msgstr "Menambahkan sebagai %s sebagai gantinya"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3388
#, c-format
msgid "Removing %s"
-msgstr ""
+msgstr "Menghapus %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3411
msgid "file/directory"
-msgstr ""
+msgstr "berkas/direktori"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3416
msgid "directory/file"
-msgstr ""
+msgstr "direktori/berkas"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3423
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
+"KONFLIK (%s): Ada direktori dengan nama %s di %s. Menambahakn %s sebagai %s"
-#: merge-recursive.c:3415
+#: merge-recursive.c:3432
#, c-format
msgid "Adding %s"
-msgstr ""
+msgstr "Menambahkan %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3441
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr ""
+msgstr "KONFLIK (penambahan/penambahan): Konflik penggabungan di %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3494
#, c-format
msgid "merging of trees %s and %s failed"
-msgstr ""
+msgstr "penggabungan pohon %s dan %s gagal"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3588
msgid "Merging:"
-msgstr ""
+msgstr "Menggabungkan:"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3601
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%u leluhur umum ditemukan:"
+msgstr[1] "%u leluhur umum ditemukan:"
-#: merge-recursive.c:3634
+#: merge-recursive.c:3651
msgid "merge returned no commit"
-msgstr ""
+msgstr "penggabungan tidak mengembalikan komit"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3823
#, c-format
msgid "Could not parse object '%s'"
-msgstr ""
+msgstr "Tidak dapat menguraikan objek '%s'"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
+#: builtin/stash.c:489
msgid "Unable to write index."
-msgstr ""
+msgstr "Tidak dapat menulis indeks."
#: merge.c:41
msgid "failed to read the cache"
-msgstr ""
+msgstr "gagal membaca tembolok"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
+#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
+#: builtin/stash.c:269
msgid "unable to write new index file"
-msgstr ""
+msgstr "gagal menulis berkas indeks baru"
-#: midx.c:74
+#: midx.c:79
msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr ""
+msgstr "OID kipas-keluar indeks multipak salah ukuran"
-#: midx.c:105
+#: midx.c:112
#, c-format
msgid "multi-pack-index file %s is too small"
-msgstr ""
+msgstr "berkas indeks multipak %s terlalu kecil"
-#: midx.c:121
+#: midx.c:128
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
+"tanda tangan indeks multipak 0x%08x tidak cocok dengan tanda tangan 0x%08x"
-#: midx.c:126
+#: midx.c:133
#, c-format
msgid "multi-pack-index version %d not recognized"
-msgstr ""
+msgstr "versi indeks multipak %d tidak dikenal"
-#: midx.c:131
+#: midx.c:138
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
-msgstr ""
+msgstr "versi hash indeks multipak %u tidak cocok dengan versi %u"
-#: midx.c:148
+#: midx.c:155
msgid "multi-pack-index missing required pack-name chunk"
-msgstr ""
+msgstr "indeks multipak kehilangan bingkah pack-name yang diperlukan"
-#: midx.c:150
+#: midx.c:157
msgid "multi-pack-index missing required OID fanout chunk"
-msgstr ""
+msgstr "indeks multipak kehilangan bingkah OID kipas keluar yang diperlukan"
-#: midx.c:152
+#: midx.c:159
msgid "multi-pack-index missing required OID lookup chunk"
-msgstr ""
+msgstr "indeks multipak kehilangan bingkah pencarian OID yang diperlukan"
-#: midx.c:154
+#: midx.c:161
msgid "multi-pack-index missing required object offsets chunk"
-msgstr ""
+msgstr "indeks multipak kehilangan bingkah offset objek yang diperlukan"
-#: midx.c:170
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr ""
+msgstr "nama pak indeks multipak tidak berurutan: '%s' sebelum '%s'"
-#: midx.c:214
+#: midx.c:228
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
-msgstr ""
+msgstr "pack-int-id jelek: %u (total pak %u)"
-#: midx.c:264
+#: midx.c:278
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr ""
+msgstr "indeks multipak simpan offset 64-bit, tapi off_t terlalu kecil"
-#: midx.c:490
+#: midx.c:509
#, c-format
msgid "failed to add packfile '%s'"
-msgstr ""
+msgstr "gagal menambah berkas pak '%s'"
-#: midx.c:496
+#: midx.c:515
#, c-format
msgid "failed to open pack-index '%s'"
-msgstr ""
+msgstr "gagal membuka indeks pak '%s'"
-#: midx.c:564
+#: midx.c:583
#, c-format
msgid "failed to locate object %d in packfile"
-msgstr ""
+msgstr "gagal melokasi objek %d di dalam berkas pak"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:911
msgid "cannot store reverse index file"
msgstr "tidak dapat menyimpan berkas indeks balik"
-#: midx.c:920
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr ""
-
-#: midx.c:943
-msgid "Adding packfiles to multi-pack-index"
-msgstr ""
-
-#: midx.c:989
+#: midx.c:1009
#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr ""
+msgid "could not parse line: %s"
+msgstr "tidak dapat menguraikan baris: %s"
-#: midx.c:1034
+#: midx.c:1011
+#, c-format
+msgid "malformed line: %s"
+msgstr "baris jelek '%s'."
+
+#: midx.c:1181
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "abaikan indeks multipak yang sudah ada; checksum tidak cocok"
+
+#: midx.c:1206
+msgid "could not load pack"
+msgstr "tidak dapat memuat pak"
+
+#: midx.c:1212
+#, c-format
+msgid "could not open index for %s"
+msgstr "tidak dapat membuka indeks untuk %s"
+
+#: midx.c:1223
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Menambahkan berkas pak ke indeks multipak"
+
+#: midx.c:1266
#, c-format
msgid "unknown preferred pack: '%s'"
-msgstr ""
+msgstr "pak yang disukai tidak dikenal: '%s'"
-#: midx.c:1039
+#: midx.c:1311
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "tidak dapat memilih pak yang disukai %s tanpa objek"
+
+#: midx.c:1343
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "tidak melihat berkas pak %s untuk dijeblokkan"
+
+#: midx.c:1389
#, c-format
msgid "preferred pack '%s' is expired"
-msgstr ""
+msgstr "pak yang disukai '%s' kadaluarsa"
-#: midx.c:1055
+#: midx.c:1402
msgid "no pack files to index."
-msgstr ""
+msgstr "tidak ada berkas pak untuk diindeks."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1409
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "menolak menulis .bitmap multipak tanpa objek apapun"
+
+#: midx.c:1451
+msgid "could not write multi-pack bitmap"
+msgstr "tidak dapat menulis bitmap multipak"
+
+#: midx.c:1461
+msgid "could not write multi-pack-index"
+msgstr "gagal menulis indeks multipak"
+
+#: midx.c:1520 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "gagal menghapus %s"
-#: midx.c:1166
+#: midx.c:1553
#, c-format
msgid "failed to clear multi-pack-index at %s"
-msgstr ""
+msgstr "gagal membersihkan indeks multipak pada %s"
-#: midx.c:1225
+#: midx.c:1616
msgid "multi-pack-index file exists, but failed to parse"
-msgstr ""
+msgstr "berkas indeks multipak ada, tetapi gagal diurai"
-#: midx.c:1233
+#: midx.c:1624
msgid "incorrect checksum"
-msgstr ""
+msgstr "checksum salah"
-#: midx.c:1236
+#: midx.c:1627
msgid "Looking for referenced packfiles"
-msgstr ""
+msgstr "Mencari berkas pak yang direferensikan"
-#: midx.c:1251
+#: midx.c:1642
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
+"kipas-keluar oid tidak berurutan: fanout[%d] =%<PRIx32> > %<PRIx32> = "
+"fanout[%d]"
-#: midx.c:1256
+#: midx.c:1647
msgid "the midx contains no oid"
-msgstr ""
+msgstr "midx tidak berisi oid"
-#: midx.c:1265
+#: midx.c:1656
msgid "Verifying OID order in multi-pack-index"
-msgstr ""
+msgstr "Memverifikasi urutan OID di dalam indeks multipak"
-#: midx.c:1274
+#: midx.c:1665
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
-msgstr ""
+msgstr "urutan pencarian oid tidak berurutan: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1685
msgid "Sorting objects by packfile"
-msgstr ""
+msgstr "Mengurutkan objek oleh berkas pak"
-#: midx.c:1301
+#: midx.c:1692
msgid "Verifying object offsets"
-msgstr ""
+msgstr "Memverifikasi offset objek"
-#: midx.c:1317
+#: midx.c:1708
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
-msgstr ""
+msgstr "gagal memuat entri pak untuk oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1714
#, c-format
msgid "failed to load pack-index for packfile %s"
-msgstr ""
+msgstr "gagal memuat indeks pak untuk berkas pak %s"
-#: midx.c:1332
+#: midx.c:1723
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-msgstr ""
+msgstr "offset objek salah untuk oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1750
msgid "Counting referenced objects"
-msgstr ""
+msgstr "Menghitung objek tereferensi"
-#: midx.c:1367
+#: midx.c:1760
msgid "Finding and deleting unreferenced packfiles"
-msgstr ""
+msgstr "Mencari dan menghapus berkas pak tak tereferensi"
-#: midx.c:1558
+#: midx.c:1952
msgid "could not start pack-objects"
-msgstr ""
+msgstr "tidak dapat memulai pack-objects"
-#: midx.c:1578
+#: midx.c:1972
msgid "could not finish pack-objects"
-msgstr ""
+msgstr "tidak dapat menyelesaikan pack-objects"
#: name-hash.c:542
#, c-format
@@ -5188,7 +5601,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr ""
-#: notes-merge.c:277
+#: notes-merge.c:276
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -5196,7 +5609,7 @@
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-#: notes-merge.c:284
+#: notes-merge.c:283
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
@@ -5224,271 +5637,340 @@
msgid "Bad %s value: '%s'"
msgstr ""
-#: object-file.c:526
+#: object-file.c:457
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: object-file.c:584
+#: object-file.c:515
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: object-file.c:658
+#: object-file.c:589
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: object-file.c:665
+#: object-file.c:596
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
-#: object-file.c:708
+#: object-file.c:639
msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: object-file.c:726
+#: object-file.c:657
msgid "unable to read alternates file"
msgstr ""
-#: object-file.c:733
+#: object-file.c:664
msgid "unable to move new alternates file into place"
msgstr ""
-#: object-file.c:768
+#: object-file.c:742
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: object-file.c:789
+#: object-file.c:763
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: object-file.c:795
+#: object-file.c:769
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: object-file.c:801
+#: object-file.c:775
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: object-file.c:809
+#: object-file.c:783
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: object-file.c:869
+#: object-file.c:814
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr ""
+
+#: object-file.c:864
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: object-file.c:1019
+#: object-file.c:1014
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: object-file.c:1054
+#: object-file.c:1049
#, c-format
msgid "mmap failed%s"
msgstr ""
-#: object-file.c:1218
+#: object-file.c:1230
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1349 object-file.c:2588
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1351 object-file.c:2592
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: object-file.c:1397
+#: object-file.c:1473
+#, c-format
+msgid "unable to parse %s header"
+msgstr ""
+
+#: object-file.c:1475
msgid "invalid object type"
msgstr ""
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-
-#: object-file.c:1484
+#: object-file.c:1486
#, c-format
msgid "unable to unpack %s header"
msgstr ""
#: object-file.c:1490
#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
+msgid "header for %s too long, exceeds %d bytes"
msgstr ""
-#: object-file.c:1493
-#, c-format
-msgid "unable to parse %s header"
-msgstr ""
-
-#: object-file.c:1717
+#: object-file.c:1720
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: object-file.c:1721
+#: object-file.c:1724
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: object-file.c:1725
+#: object-file.c:1728
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1729
+#: object-file.c:1732
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1834
+#: object-file.c:1855
#, c-format
msgid "unable to write file %s"
msgstr ""
-#: object-file.c:1841
+#: object-file.c:1862
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: object-file.c:1848
+#: object-file.c:1869
msgid "file write error"
msgstr ""
-#: object-file.c:1868
+#: object-file.c:1904
msgid "error when closing loose object file"
msgstr ""
-#: object-file.c:1933
+#: object-file.c:1971
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: object-file.c:1935
+#: object-file.c:1973
msgid "unable to create temporary file"
msgstr ""
-#: object-file.c:1959
+#: object-file.c:1997
msgid "unable to write loose object file"
msgstr ""
-#: object-file.c:1965
+#: object-file.c:2003
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: object-file.c:1969
+#: object-file.c:2007
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: object-file.c:1973
+#: object-file.c:2011
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:2022 builtin/pack-objects.c:1251
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: object-file.c:2060
+#: object-file.c:2100
#, c-format
msgid "cannot read object for %s"
msgstr ""
-#: object-file.c:2111
+#: object-file.c:2151
msgid "corrupt commit"
msgstr ""
-#: object-file.c:2119
+#: object-file.c:2159
msgid "corrupt tag"
msgstr ""
-#: object-file.c:2219
+#: object-file.c:2259
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: object-file.c:2222
+#: object-file.c:2262
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2335 object-file.c:2345
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: object-file.c:2311
+#: object-file.c:2351
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: object-file.c:2335
+#: object-file.c:2375 builtin/fetch.c:1494
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: object-file.c:2337
+#: object-file.c:2377
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2404
#, c-format
msgid "unable to open %s"
msgstr "tidak dapat membuka %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2599
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: object-file.c:2583
+#: object-file.c:2622
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: object-file.c:2588
+#: object-file.c:2628
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: object-file.c:2594
+#: object-file.c:2633
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: object-file.c:2605
+#: object-file.c:2644
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
-#: object-name.c:480
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c:382
+#, c-format
+msgid "%s [bad object]"
+msgstr ""
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c:407
+#, c-format
+msgid "%s commit %s - %s"
+msgstr ""
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c:428
+#, c-format
+msgid "%s tag %s - %s"
+msgstr ""
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#. "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c:439
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr ""
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c:447
+#, c-format
+msgid "%s tree"
+msgstr ""
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c:453
+#, c-format
+msgid "%s blob"
+msgstr ""
+
+#: object-name.c:569
#, c-format
msgid "short object ID %s is ambiguous"
msgstr ""
-#: object-name.c:491
-msgid "The candidates are:"
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c:591
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
msgstr ""
-#: object-name.c:790
+#: object-name.c:888
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5501,62 +5983,67 @@
"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: object-name.c:910
+#: object-name.c:1008
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr ""
-#: object-name.c:918
+#: object-name.c:1016
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr ""
-#: object-name.c:1696
+#: object-name.c:1794
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr ""
-#: object-name.c:1702
+#: object-name.c:1800
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
msgstr ""
-#: object-name.c:1711
+#: object-name.c:1809
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr ""
-#: object-name.c:1739
+#: object-name.c:1837
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
"hint: Did you mean ':%d:%s'?"
msgstr ""
-#: object-name.c:1755
+#: object-name.c:1853
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
msgstr ""
-#: object-name.c:1763
+#: object-name.c:1861
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr ""
-#: object-name.c:1765
+#: object-name.c:1863
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr ""
-#: object-name.c:1778
+#: object-name.c:1876
msgid "relative path syntax can't be used outside working tree"
msgstr ""
-#: object-name.c:1916
+#: object-name.c:1901
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr ""
+
+#: object-name.c:2014
#, c-format
msgid "invalid object name '%.*s'."
msgstr ""
@@ -5581,17 +6068,30 @@
msgid "unable to parse object: %s"
msgstr ""
-#: object.c:283 object.c:295
+#: object.c:283 object.c:294
#, c-format
msgid "hash mismatch %s"
msgstr ""
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr ""
+
+#: pack-bitmap.c:433
+msgid "load_reverse_index: could not open pack"
+msgstr ""
+
+#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
#, c-format
msgid "unable to get size of %s"
msgstr ""
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1937
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr ""
+
+#: pack-bitmap.c:1973 builtin/rev-list.c:91
#, c-format
msgid "unable to get disk usage of %s"
msgstr ""
@@ -5621,129 +6121,134 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr ""
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr ""
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr ""
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr ""
-#: pack-write.c:522
+#: pack-write.c:521
#, c-format
msgid "could not write '%s' promisor file"
msgstr ""
-#: packfile.c:625
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:655
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr ""
-#: packfile.c:1934
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1938
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr ""
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr ""
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr ""
-#: parse-options.c:38
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr ""
+
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr ""
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr ""
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr ""
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr ""
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr ""
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr ""
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr ""
-#: parse-options.c:879
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr ""
-#: parse-options.c:881
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr ""
-#: parse-options.c:883
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: parse-options.c:907
+#: parse-options.c:920
msgid "..."
msgstr ""
-#: parse-options.c:926
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr ""
@@ -5751,97 +6256,121 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:970
+#, c-format
+msgid "%*s%s"
+msgstr ""
+
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:974
+#: parse-options.c:1040
msgid "-NUM"
msgstr ""
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr ""
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr ""
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr ""
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr ""
@@ -5862,7 +6391,7 @@
msgid "flush packet write failed"
msgstr ""
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr ""
@@ -5870,7 +6399,7 @@
msgid "packet write with format failed"
msgstr ""
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
@@ -5879,25 +6408,25 @@
msgid "packet write failed: %s"
msgstr ""
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr ""
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr ""
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr ""
@@ -5911,7 +6440,7 @@
msgid "unable to create threaded lstat: %s"
msgstr ""
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr ""
@@ -5940,238 +6469,238 @@
msgid "Removing duplicate objects"
msgstr ""
-#: range-diff.c:78
+#: range-diff.c:68
msgid "could not start `log`"
msgstr ""
-#: range-diff.c:80
+#: range-diff.c:70
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:98 sequencer.c:5575
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
-#: range-diff.c:115
+#: range-diff.c:109
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
"'%s'"
msgstr ""
-#: range-diff.c:140
+#: range-diff.c:132
#, c-format
msgid "could not parse git header '%.*s'"
msgstr ""
-#: range-diff.c:307
+#: range-diff.c:300
msgid "failed to generate diff"
msgstr ""
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr ""
-
-#: range-diff.c:562 range-diff.c:564
+#: range-diff.c:558 range-diff.c:560
#, c-format
msgid "could not parse log for '%s'"
msgstr ""
-#: read-cache.c:710
+#: read-cache.c:737
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
-#: read-cache.c:726
+#: read-cache.c:753
msgid "cannot create an empty blob in the object database"
msgstr ""
-#: read-cache.c:748
+#: read-cache.c:775
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: read-cache.c:753
+#: read-cache.c:780 builtin/submodule--helper.c:3359
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr ""
-#: read-cache.c:805
+#: read-cache.c:832
#, c-format
msgid "unable to index file '%s'"
msgstr ""
-#: read-cache.c:824
+#: read-cache.c:851
#, c-format
msgid "unable to add '%s' to index"
msgstr ""
-#: read-cache.c:835
+#: read-cache.c:862
#, c-format
msgid "unable to stat '%s'"
msgstr ""
-#: read-cache.c:1358
+#: read-cache.c:1404
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: read-cache.c:1573
+#: read-cache.c:1619
msgid "Refresh index"
msgstr ""
-#: read-cache.c:1705
+#: read-cache.c:1751
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1715
+#: read-cache.c:1761
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1771
+#: read-cache.c:1817
#, c-format
msgid "bad signature 0x%08x"
msgstr ""
-#: read-cache.c:1774
+#: read-cache.c:1820
#, c-format
msgid "bad index version %d"
msgstr ""
-#: read-cache.c:1783
+#: read-cache.c:1829
msgid "bad index file sha1 signature"
msgstr ""
-#: read-cache.c:1817
+#: read-cache.c:1863
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: read-cache.c:1819
+#: read-cache.c:1865
#, c-format
msgid "ignoring %.4s extension"
msgstr ""
-#: read-cache.c:1856
+#: read-cache.c:1902
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr ""
-#: read-cache.c:1872
+#: read-cache.c:1918
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1929
+#: read-cache.c:1975
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1932
+#: read-cache.c:1978
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: read-cache.c:1935
+#: read-cache.c:1981
#, c-format
msgid "unordered stage entries for '%s'"
msgstr ""
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
+#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
+#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
+#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
+#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
+#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
msgid "index file corrupt"
msgstr ""
-#: read-cache.c:2185
+#: read-cache.c:2240
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2198
+#: read-cache.c:2253
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2231
+#: read-cache.c:2286
#, c-format
msgid "%s: index file open failed"
msgstr ""
-#: read-cache.c:2235
+#: read-cache.c:2290
#, c-format
msgid "%s: cannot stat the open index"
msgstr ""
-#: read-cache.c:2239
+#: read-cache.c:2294
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
-#: read-cache.c:2243
+#: read-cache.c:2298
#, c-format
msgid "%s: unable to map index file%s"
msgstr ""
-#: read-cache.c:2286
+#: read-cache.c:2341
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2313
+#: read-cache.c:2368
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2351
+#: read-cache.c:2414
#, c-format
msgid "could not freshen shared index '%s'"
msgstr ""
-#: read-cache.c:2398
+#: read-cache.c:2473
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3032
+msgid "cannot write split index for a sparse index"
+msgstr ""
+
+#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:3075
+#: read-cache.c:3157
msgid "failed to convert to a sparse-index"
msgstr ""
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3228
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:3159
+#: read-cache.c:3241
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:3171
+#: read-cache.c:3253
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: read-cache.c:3200
+#: read-cache.c:3282
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: read-cache.c:3349
+#: read-cache.c:3439
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr ""
@@ -6182,12 +6711,16 @@
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
+"Anda dapat memperbaiki ini dengan 'git rebase --edit-todo' lalu jalankan "
+"'git rebase --continue'.\n"
+"Atau Anda dapat membatalkan pendasaran ulang dengan 'git rebase --abort'.\n"
#: rebase-interactive.c:33
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
+"setelan %s tidak dikenal untuk opsi rebase.missingCommitsCheck. Abaikan."
#: rebase-interactive.c:42
msgid ""
@@ -6213,27 +6746,55 @@
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
+"\n"
+"Perintah:\n"
+"p, pick <komit> = gunakan komit\n"
+"r, reword <komit> = gunakan komit, tapi sunting pesan komit\n"
+"e, edit <komit> = gunakan komit, tapi berhenti untuk amandemen\n"
+"s, squash <komit> = gunakan komit, tapi lebur ke komit sebelumnya\n"
+"f, fixup [-C | -c] <komit> = seperti \"squash\" tapi hanya pertahankan\n"
+" pesan komit sebelumnya, kecuali -C digunakan, dimana\n"
+" hanya pertahankan pesan komit ini; -c sama dengan -C "
+"tapi\n"
+" buka penyuntingx, exec <perintah> = jalankan perintah "
+"(sisa baris) menggunakan cangkang\n"
+"b, break = berhenti disini (lanjutkan pendasaran ulang nanti dengan 'git "
+"rebase --continue')\n"
+"d, drop <komit> = hapus komit\n"
+"l, label <label> = tandai HEAD saat ini dengan nama\n"
+"t, reset <label> = setel ulang HEAD ke sebuah label\n"
+"m, merge [-C <komit> | -c <komit>] <label> [# <satu baris>]\n"
+". buat komit penggabungan dengan pesan komit penggabungan asli\n"
+". (atau satu baris, jika tidak ada komit penggabungan asli yang\n"
+". disebutkan); gunakan -c <komit> untuk menulis ulang pesan komit\n"
+"\n"
+"Baris diatas dapat disusun ulang; hal itu dieksekusi dari atas ke bawah.\n"
#: rebase-interactive.c:66
#, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dasarkan ulang %s kepada %s (%d perintah)"
+msgstr[1] "Dasarkan ulang %s kepada %s (%d perintah)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
+"\n"
+"Jangan hapus baris apapun. Gunakan 'drop' secara eksplisit untuk menghapus "
+"komit.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
+"\n"
+"Jika Anda menghapus sebaris disini KOMIT TERSEBUT AKAN HILANG.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6241,25 +6802,35 @@
" git rebase --continue\n"
"\n"
msgstr ""
+"\n"
+"Anda sedang menyunting berkas todo dari pendasaran ulang interaktif yang "
+"sedang berjalan.\n"
+"Untuk melanjutkan pendasaran ulang setelah menyunting, jalankan:\n"
+" git rebase --continue\n"
+"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
+"\n"
+"Bagaimanapun, jika Anda menghapus semuanya, pendasaran ulang akan "
+"dibatalkan.\n"
+"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
+#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
+#: builtin/rebase.c:191
#, c-format
msgid "could not write '%s'"
-msgstr ""
+msgstr "tidak dapat menulis '%s'"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
-msgstr ""
+msgstr "tidak dapat menulis '%s'."
#: rebase-interactive.c:196
#, c-format
@@ -6267,6 +6838,8 @@
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
+"Peringatan: beberapa komit mungkin sudah tidak sengaja dihapus.\n"
+"Komit terhapus (terbaru ke terlama):\n"
#: rebase-interactive.c:203
#, c-format
@@ -6278,15 +6851,19 @@
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
+"Untuk menghindari pesan ini, gunakan \"drop\" untuk menghapus sebuah komit "
+"eksplisit.\n"
+"Gunakan 'git config rebase.missingCommitsCheck untuk' mengganti tingkat "
+"peringatan.\n"
+"Kelakuan yang mungkin adalah: ignore, warn, error.\n"
+"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr ""
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' digantikan oleh 'merges'"
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2057
msgid "gone"
msgstr ""
@@ -6305,257 +6882,238 @@
msgid "ahead %d, behind %d"
msgstr ""
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr ""
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:260
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:339
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr ""
-
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:372
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr ""
-
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr ""
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:426
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr ""
-
-#: ref-filter.c:441
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr ""
-#: ref-filter.c:445
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr ""
-
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr ""
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr ""
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:517
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr ""
-
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:543
+#: ref-filter.c:568
#, c-format
-msgid "unrecognized %%(if) argument: %s"
+msgid "%%(rest) does not take arguments"
msgstr ""
-#: ref-filter.c:645
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:801
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
msgstr ""
-#: ref-filter.c:865
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr ""
-
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:897
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr ""
-
-#: ref-filter.c:899
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr ""
-
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr ""
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr ""
+
+#: ref-filter.c:1707
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: ref-filter.c:1624
+#: ref-filter.c:1710
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: ref-filter.c:1627
+#: ref-filter.c:1713
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
-#: ref-filter.c:1631
+#: ref-filter.c:1717
#, c-format
msgid "(HEAD detached at %s)"
msgstr ""
-#: ref-filter.c:1634
+#: ref-filter.c:1720
#, c-format
msgid "(HEAD detached from %s)"
msgstr ""
-#: ref-filter.c:1637
+#: ref-filter.c:1723
msgid "(no branch)"
msgstr ""
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1755 ref-filter.c:1973
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1679
+#: ref-filter.c:1765
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:2064
+#: ref-filter.c:2156
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:2153
+#: ref-filter.c:2246
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2251 refs.c:672
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
-#: ref-filter.c:2502
+#: ref-filter.c:2630
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2596
+#: ref-filter.c:2741
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: ref-filter.c:2601
+#: ref-filter.c:2746
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
-#: refs.c:264
+#: reflog.c:407
+#, c-format
+msgid "not a reflog: %s"
+msgstr "bukan sebuah log referensi: %s"
+
+#: reflog.c:410
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "tidak ada log referensi untuk '%s'"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
-msgstr ""
+msgstr "%s tidak menunjuk ke sebuah objek valid!"
-#: refs.c:566
+#: refs.c:561
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6569,135 +7127,147 @@
"\n"
"\tgit branch -m <name>\n"
msgstr ""
+"Menggunakan '%s' sebagai nama cabang awal. Nama cabang asali ini dapat\n"
+"berubah. Untuk menyetel nama cabang awal untuk digunakan pada semua\n"
+"repositori baru Anda, dimana akan mematikan peringatan ini, panggil:\n"
+"\n"
+"\tgit config --global init.defaultBranch <nama>\n"
+"\n"
+"Nama-nama yang umumnya dipilih selain 'master' adalah 'main', 'trunk' dan\n"
+"'development'. Cabang yang baru saja dibuat bisa dinamai ulang lewat "
+"perintah\n"
+"ini:\n"
+"\n"
+"\tgit branch -m <nama>\n"
-#: refs.c:588
+#: refs.c:583
#, c-format
msgid "could not retrieve `%s`"
-msgstr ""
+msgstr "tidak dapat mengambil `%s`"
-#: refs.c:598
+#: refs.c:593
#, c-format
msgid "invalid branch name: %s = %s"
-msgstr ""
+msgstr "nama cabang tidak valid: %s = %s"
-#: refs.c:674
+#: refs.c:670
#, c-format
msgid "ignoring dangling symref %s"
-msgstr ""
+msgstr "abaikan referensi simbolik teruntai %s"
-#: refs.c:922
+#: refs.c:919
#, c-format
msgid "log for ref %s has gap after %s"
-msgstr ""
+msgstr "log untuk referensi %s ada celah setelah %s"
-#: refs.c:929
+#: refs.c:926
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
-msgstr ""
+msgstr "log untuk referensi %s sayangnya berakhir pada %s"
-#: refs.c:994
+#: refs.c:991
#, c-format
msgid "log for %s is empty"
-msgstr ""
+msgstr "log untuk %s kosong"
#: refs.c:1086
#, c-format
msgid "refusing to update ref with bad name '%s'"
-msgstr ""
+msgstr "menolak memperbarui referensi dengan nama jelek '%s'"
-#: refs.c:1157
+#: refs.c:1164
#, c-format
msgid "update_ref failed for ref '%s': %s"
-msgstr ""
+msgstr "update_ref gagal untuk referensi '%s': %s"
-#: refs.c:2051
+#: refs.c:2059
#, c-format
msgid "multiple updates for ref '%s' not allowed"
-msgstr ""
+msgstr "pembaruan berlipat untuk referensi '%s' tidak diperbolehkan"
-#: refs.c:2131
+#: refs.c:2145
msgid "ref updates forbidden inside quarantine environment"
-msgstr ""
+msgstr "pembaruan referensi tidak diperbolehkan di dalam lingkungan karantina"
-#: refs.c:2142
+#: refs.c:2156
msgid "ref updates aborted by hook"
-msgstr ""
+msgstr "pembaruan referensi dihentikan oleh kait"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2264 refs.c:2294
#, c-format
msgid "'%s' exists; cannot create '%s'"
-msgstr ""
+msgstr "'%s' ada; tidak dapat membuat '%s'"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2270 refs.c:2305
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
-msgstr ""
+msgstr "tidak dapat memproses '%s' dan '%s' pada waktu yang bersamaan"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1295
#, c-format
msgid "could not remove reference %s"
-msgstr ""
+msgstr "tidak dapat menghapus referensi %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1310 refs/packed-backend.c:1565
+#: refs/packed-backend.c:1575
#, c-format
msgid "could not delete reference %s: %s"
-msgstr ""
+msgstr "tidak dapat menghapus referensi %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1313 refs/packed-backend.c:1578
#, c-format
msgid "could not delete references: %s"
-msgstr ""
+msgstr "tidak dapat menghapus referensi: %s"
#: refspec.c:170
#, c-format
msgid "invalid refspec '%s'"
-msgstr ""
+msgstr "spek referensi tidak valid '%s'"
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "pintasan konfigurasi remote tidak dapat diawali dengan '/': %s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "lebih dari satu paket terima diberikan, gunakan yang pertama"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "lebih dari satu paket unggah diberikan, gunakan yang pertama"
-#: remote.c:590
+#: remote.c:698
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "tidak dapat mengambil baik %s dan %s ke %s"
-#: remote.c:594
+#: remote.c:702
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s biasanya melacak %s, bukan %s"
-#: remote.c:598
+#: remote.c:706
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s melacak baik %s dan %s"
-#: remote.c:666
+#: remote.c:774
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "kunci '%s' dari pola tidak ada '*'"
-#: remote.c:676
+#: remote.c:784
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "nilai '%s' dari pola tidak ada '*'"
-#: remote.c:1083
+#: remote.c:1191
#, c-format
msgid "src refspec %s does not match any"
msgstr "spek referensi sumber %s tidak cocok dengan apapun"
-#: remote.c:1088
+#: remote.c:1196
#, c-format
msgid "src refspec %s matches more than one"
msgstr "spek referensi sumber %s cocok dengan lebih dari satu"
@@ -6706,7 +7276,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1211
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6730,7 +7300,7 @@
"Kedua-duanya tidak bekerja, jadi kami menyerah. Anda harus kualifikasi\n"
"penuh referensi."
-#: remote.c:1123
+#: remote.c:1231
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6741,7 +7311,7 @@
"Apakah maksud Anda buat cabang baru dengan mendorong ke\n"
"'%s:refs/heads/%s'?"
-#: remote.c:1128
+#: remote.c:1236
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6752,7 +7322,7 @@
"Apakah maksud Anda buat tag baru dengan mendorong ke\n"
"'%s:refs/tags/%s'?"
-#: remote.c:1133
+#: remote.c:1241
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6763,7 +7333,7 @@
"Apakah maksud Anda tag pohon dengan mendorong ke\n"
"'%s:refs/tags/%s'?"
-#: remote.c:1138
+#: remote.c:1246
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6774,114 +7344,114 @@
"Apakah maksud Anda tag blob baru dengan mendorong ke\n"
"'%s:refs/tags/%s'?"
-#: remote.c:1174
+#: remote.c:1282
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s tidak dapat diselesaikan ke cabang"
-#: remote.c:1185
+#: remote.c:1293
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "tidak dapat menghapus '%s': referensi remote tidak ada"
-#: remote.c:1197
+#: remote.c:1305
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "spek referensi tujuan %s cocok dengan lebih dari satu"
-#: remote.c:1204
+#: remote.c:1312
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "referensi tujuan %s menerima dari lebih dari satu sumber"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1833 remote.c:1940
msgid "HEAD does not point to a branch"
msgstr "HEAD tidak menunjuk ke cabang"
-#: remote.c:1733
+#: remote.c:1842
#, c-format
msgid "no such branch: '%s'"
msgstr "tidak ada cabang seperti: '%s'"
-#: remote.c:1736
+#: remote.c:1845
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "tidak ada hulu yang terkonfigurasi untuk cabang '%s'"
-#: remote.c:1742
+#: remote.c:1851
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "cabang hulu '%s' tidak disimpan sebagai cabang pelacak remote"
-#: remote.c:1757
+#: remote.c:1866
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "tujuan dorong '%s' pada remote '%s' tidak ada cabang pelacak lokal"
-#: remote.c:1769
+#: remote.c:1881
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "cabang '%s' tidak ada remote untuk didorong"
-#: remote.c:1779
+#: remote.c:1891
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "spek referensi dorong untuk '%s' tidak termasuk '%s'"
-#: remote.c:1792
+#: remote.c:1904
msgid "push has no destination (push.default is 'nothing')"
msgstr "dorong tidak ada tujuan (push.default yaitu 'nothing')"
-#: remote.c:1814
+#: remote.c:1926
msgid "cannot resolve 'simple' push to a single destination"
msgstr "tidak dapat menyelesaikan dorongan 'sederhana' ke satu tujuan"
-#: remote.c:1943
+#: remote.c:2059
#, c-format
msgid "couldn't find remote ref %s"
msgstr "tidak dapat menemukan referensi remote %s"
-#: remote.c:1956
+#: remote.c:2072
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Abaikan referensi lucu '%s' secara lokal"
-#: remote.c:2119
+#: remote.c:2235
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Cabang Anda didasarkan pada '%s', tapi hulu sudah tiada.\n"
-#: remote.c:2123
+#: remote.c:2239
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (gunakan \"git branch --unset-upstream\" untuk perbaiki)\n"
-#: remote.c:2126
+#: remote.c:2242
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Cabang Anda mutakhir dengan '%s'.\n"
-#: remote.c:2130
+#: remote.c:2246
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Cabang Anda dan '%s' merujuk pada komit yang berbeda.\n"
-#: remote.c:2133
+#: remote.c:2249
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (gunakan \"%s\" untuk selengkapnya)\n"
-#: remote.c:2137
+#: remote.c:2253
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2143
+#: remote.c:2259
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (gunakan \"git push\" untuk terbitkan komit lokal Anda)\n"
-#: remote.c:2146
+#: remote.c:2262
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6889,11 +7459,11 @@
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2154
+#: remote.c:2270
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (gunakan \"git pull\" untuk perbarui cabang lokal Anda)\n"
-#: remote.c:2157
+#: remote.c:2273
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6904,11 +7474,11 @@
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2167
+#: remote.c:2283
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (gunakan \"git pull\" untuk gabungkan cabang remote ke milik Anda)\n"
-#: remote.c:2359
+#: remote.c:2475
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "tidak dapat mengurai nama object yang diharapkan '%s'"
@@ -6930,335 +7500,364 @@
#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
-msgstr ""
+msgstr "MERGE_RR rusak"
#: rerere.c:248 rerere.c:253
msgid "unable to write rerere record"
-msgstr ""
+msgstr "tidak dapat menulis rekaman rerere"
#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
-msgstr ""
+msgstr "ada kesalahan saat menulis '%s' (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
-msgstr ""
+msgstr "gagal membilas '%s'"
-#: rerere.c:487 rerere.c:1023
+#: rerere.c:487 rerere.c:1024
#, c-format
msgid "could not parse conflict hunks in '%s'"
-msgstr ""
+msgstr "tidak dapat mengurai bingkah konflik di '%s'"
-#: rerere.c:668
+#: rerere.c:669
#, c-format
msgid "failed utime() on '%s'"
-msgstr ""
+msgstr "utime() gagal pada '%s'"
-#: rerere.c:678
+#: rerere.c:679
#, c-format
msgid "writing '%s' failed"
-msgstr ""
+msgstr "gagal menulis '%s'"
-#: rerere.c:698
+#: rerere.c:699
#, c-format
msgid "Staged '%s' using previous resolution."
-msgstr ""
+msgstr "'%s' digelarkan menggunakan resolusi sebelumnya."
-#: rerere.c:737
+#: rerere.c:738
#, c-format
msgid "Recorded resolution for '%s'."
-msgstr ""
+msgstr "Resolusi direkam untuk '%s'."
-#: rerere.c:772
+#: rerere.c:773
#, c-format
msgid "Resolved '%s' using previous resolution."
-msgstr ""
+msgstr "'%s' diselesaikan menggunakan resolusi sebelumnya."
-#: rerere.c:787
+#: rerere.c:788
#, c-format
msgid "cannot unlink stray '%s'"
-msgstr ""
+msgstr "tidak dapat batal taut simpangan '%s'"
-#: rerere.c:791
+#: rerere.c:792
#, c-format
msgid "Recorded preimage for '%s'"
-msgstr ""
+msgstr "Pracitra direkam untuk '%s'"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
+#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
#, c-format
msgid "could not create directory '%s'"
-msgstr ""
+msgstr "tidak dapat membuat direktori '%s'"
-#: rerere.c:1041
+#: rerere.c:1042
#, c-format
msgid "failed to update conflicted state in '%s'"
-msgstr ""
+msgstr "gagal memperbarui keadaan konflik di '%s'"
-#: rerere.c:1052 rerere.c:1059
+#: rerere.c:1053 rerere.c:1060
#, c-format
msgid "no remembered resolution for '%s'"
-msgstr ""
+msgstr "tidak ada resolusi yang diingat untuk '%s'"
-#: rerere.c:1061
+#: rerere.c:1062
#, c-format
msgid "cannot unlink '%s'"
-msgstr ""
+msgstr "tidak dapat batal taut '%s'"
-#: rerere.c:1071
+#: rerere.c:1072
#, c-format
msgid "Updated preimage for '%s'"
-msgstr ""
+msgstr "Pracitra diperbarui untuk '%s'"
-#: rerere.c:1080
+#: rerere.c:1081
#, c-format
msgid "Forgot resolution for '%s'\n"
-msgstr ""
+msgstr "Resolusi dilupakan untuk '%s'\n"
-#: rerere.c:1191
+#: rerere.c:1192
msgid "unable to open rr-cache directory"
-msgstr ""
+msgstr "tidak dapat membuka direktori rr-cache"
-#: reset.c:42
+#: reset.c:112
msgid "could not determine HEAD revision"
msgstr "tidak dapat menentukan revisi HEAD"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:141 reset.c:147 sequencer.c:3696
#, c-format
msgid "failed to find tree of %s"
msgstr "gagal menemukan pohon %s"
-#: revision.c:2344
+#: revision.c:2358
msgid "--unpacked=<packfile> no longer supported"
-msgstr ""
+msgstr "--unpacked=<berkas pak> tidak didukung lagi"
-#: revision.c:2684
+#: revision.c:2712
msgid "your current branch appears to be broken"
-msgstr ""
+msgstr "sepertinya cabang Anda saat ini rusak"
-#: revision.c:2687
+#: revision.c:2715
#, c-format
msgid "your current branch '%s' does not have any commits yet"
-msgstr ""
+msgstr "cabang Anda saat ini '%s' belum memiliki komit apapun"
-#: revision.c:2893
+#: revision.c:2901
+msgid "object filtering requires --objects"
+msgstr "penyaringan objek memerlukan --objects"
+
+#: revision.c:2918
msgid "-L does not yet support diff formats besides -p and -s"
-msgstr ""
+msgstr "-L belum mendukung format diff selain -p dan -s"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr ""
-
-#: run-command.c:1274
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr ""
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
-msgstr ""
+msgstr "paket bilas tidak diharapkan ketika membaca status pembongkaran remote"
#: send-pack.c:152
#, c-format
msgid "unable to parse remote unpack status: %s"
-msgstr ""
+msgstr "tidak dapat menguraikan status pembongkaran remote: %s"
#: send-pack.c:154
#, c-format
msgid "remote unpack failed: %s"
-msgstr ""
+msgstr "pembongkaran remote gagal: %s"
#: send-pack.c:378
msgid "failed to sign the push certificate"
-msgstr ""
+msgstr "gagal menandatangani sertifikat dorong"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
-msgstr ""
+msgstr "send-pack: tidak dapat menggarpu subproses pengambilan"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
-msgstr ""
+msgstr "negosiasi pendorongan gagal; langsung dilanjutkan dengan mendorong"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
-msgstr ""
-
-#: send-pack.c:535
-msgid "the receiving end does not support --signed push"
-msgstr ""
+msgstr "ujung penerima tidak mendukung algoritma hash repositori ini"
#: send-pack.c:537
+msgid "the receiving end does not support --signed push"
+msgstr "ujung penerima tidak mendukung dorongan --signed"
+
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
+"tidak mengirim sertifikat pendorongan karena ujung penerima tidak mendukung "
+"dorongan --signed"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
-msgstr ""
+msgstr "ujung penerima tidak mendukung dorongan --atomic"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
-msgstr ""
+msgstr "ujung penerima tidak mendukung opsi dorong"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
-msgstr ""
+msgstr "mode pembersihan pesan komit tidak valid '%s'"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
-msgstr ""
+msgstr "tidak dapat menghapus '%s'"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
-msgstr ""
+msgstr "tidak dapat menghapus '%s'"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
-msgstr ""
+msgstr "balik"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
-msgstr ""
+msgstr "petik ceri"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
-msgstr ""
+msgstr "dasar ulang"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
-msgstr ""
+msgstr "aksi tidak dikenal: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
+"setelah menyelesaikan konflik, tandai jalur yang terkoreksi\n"
+"dengan 'git add <jalur>' atau 'git rm <jalur>'"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
+"Setelah menyelesaikan konflik, tandai dengan\n"
+"\"git add/rm <spek jalur\", lalu jalankan\n"
+"\"git cherry-pick --continue\".\n"
+"Atau Anda dapat melewati komit ini dengan \"git cherry-pick --skip\".\n"
+"Untuk membatalkan dan kembali ke keadaan sebelum \"git cherry-pick\",\n"
+"jalankan \"git cherry-pick --abort\"."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Setelah menyelesaikan konflik, tandai dengan\n"
+"\"git add/rm <spek jalur>\", lalu jalankan\n"
+"\"git revert --continue\".\n"
+"Atau Anda dapat melewati komit ini dengan \"git revert --skip\".\n"
+"Untuk membatalkan dan kembali ke keadaan sebelum \"git revert\",\n"
+"jalankan \"git revert --abort\"."
+
+#: sequencer.c:448 sequencer.c:3288
#, c-format
msgid "could not lock '%s'"
-msgstr ""
+msgstr "tidak dapat mengunci '%s'"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
+#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
#, c-format
msgid "could not write to '%s'"
-msgstr ""
+msgstr "tidak dapat menulis ke '%s'"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
-msgstr ""
+msgstr "tidak dapat menulis akhir baris ke '%s'"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3565
#, c-format
msgid "failed to finalize '%s'"
-msgstr ""
+msgstr "gagal mengakhiri '%s'"
-#: sequencer.c:486
+#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
+#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
+#, c-format
+msgid "could not read '%s'"
+msgstr "tidak dapat membaca '%s'"
+
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
-msgstr ""
+msgstr "perubahan lokal Anda akan ditimpa oleh %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
-msgstr ""
+msgstr "komit perubahan Anda atau stase untuk melanjutkan."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
-msgstr ""
+msgstr "%s: maju-cepat"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:615
#, c-format
msgid "Invalid cleanup mode %s"
-msgstr ""
+msgstr "Mode pembersihan tidak valid %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
-msgstr ""
-
-#: sequencer.c:685
-msgid "unable to update cache tree"
-msgstr ""
+msgstr "%s: Tidak dapat menulis berkas indeks baru"
#: sequencer.c:699
-msgid "could not resolve HEAD commit"
-msgstr ""
+msgid "unable to update cache tree"
+msgstr "tidak dapat memperbarui pohon tembolok"
-#: sequencer.c:779
+#: sequencer.c:713
+msgid "could not resolve HEAD commit"
+msgstr "tidak dapat menguraikan komit HEAD"
+
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
-msgstr ""
+msgstr "tidak ada kunci yang ada di pada '%.*s'"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
-msgstr ""
+msgstr "tidak dapat membatal-kutip nilai dari '%s'"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
+#: builtin/am.c:849 builtin/rebase.c:699
#, c-format
msgid "could not open '%s' for reading"
-msgstr ""
-
-#: sequencer.c:837
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr ""
-
-#: sequencer.c:842
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr ""
-
-#: sequencer.c:847
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr ""
+msgstr "tidak dapat membuka '%s' untuk dibaca"
#: sequencer.c:851
-#, c-format
-msgid "unknown variable '%s'"
-msgstr ""
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' sudah diberikan"
#: sequencer.c:856
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' sudah diberikan"
+
+#: sequencer.c:861
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' sudah diberikan"
+
+#: sequencer.c:865
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "variabel tidak dikenal '%s'"
+
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr ""
+msgstr "'GIT_AUTHOR_NAME' hilang"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr ""
+msgstr "'GIT_AUTHOR_EMAIL' hilang"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr ""
+msgstr "'GIT_AUTHOR_DATE' hilang"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7274,12 +7873,24 @@
"\n"
" git rebase --continue\n"
msgstr ""
+"Anda punya perubahan tergelar di dalam pohon kerja Anda.\n"
+"Apabila perubahan tersebut dimaksudkan untuk dilumat ke komit sebelumnya, "
+"jalankan:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Apabila dimaksudkan untuk masuk ke komit baru, jalankan:\n"
+"\n"
+" git commit %s\n"
+"Pada kedua kasus tersebut, setelah selesai, lanjutkan dengan:\n"
+"\n"
+" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
-msgstr ""
+msgstr "kait 'prepare-commit-msg' gagal"
-#: sequencer.c:1218
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7293,8 +7904,19 @@
"\n"
" git commit --amend --reset-author\n"
msgstr ""
+"Nama dan email Anda dikonfigurasikan otomatis berdasarkan nama pengguna\n"
+"dan nama host Anda. Periksa jika itu benar. Anda dapat mematikan pesan\n"
+"ini dengan menyetel secara eksplisit. Jalankan perintah berikut dan ikuti\n"
+"petunjuk di dalam penyunting untuk menyunting berkas konfigurasi Anda:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"Setelah itu, Anda dapat memperbaiki identitas yang digunakan untuk komit\n"
+"ini dengan:\n"
+"\n"
+" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7307,360 +7929,376 @@
"\n"
" git commit --amend --reset-author\n"
msgstr ""
+"Nama dan email Anda dikonfigurasikan otomatis berdasarkan nama pengguna\n"
+"dan nama host Anda. Periksa jika itu benar. Anda dapat mematikan pesan\n"
+"ini dengan menyetel secara eksplisit:\n"
+"\n"
+" git config --global user.name \"Nama Anda\"\n"
+" git config --global user.email anda@example.com\n"
+"\n"
+"Setelah itu, Anda dapat memperbaiki identitas yang digunakan untuk komit\n"
+"ini dengan:\n"
+"\n"
+" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1287
msgid "couldn't look up newly created commit"
-msgstr ""
+msgstr "tidak dapat mencari komit yang baru saja dibuat"
-#: sequencer.c:1275
+#: sequencer.c:1289
msgid "could not parse newly created commit"
-msgstr ""
+msgstr "tidak dapat menguraikan komit yang baru saja dibuat"
-#: sequencer.c:1321
+#: sequencer.c:1336
msgid "unable to resolve HEAD after creating commit"
-msgstr ""
+msgstr "tidak dapat menguraikan HEAD setelah membuat komit"
-#: sequencer.c:1323
+#: sequencer.c:1338
msgid "detached HEAD"
-msgstr ""
+msgstr "HEAD terpisah"
-#: sequencer.c:1327
+#: sequencer.c:1342
msgid " (root-commit)"
-msgstr ""
+msgstr " (komit-akar)"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "could not parse HEAD"
-msgstr ""
+msgstr "tidak dapat menguraikan HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1365
#, c-format
msgid "HEAD %s is not a commit!"
-msgstr ""
+msgstr "HEAD %s bukan sebuah komit!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
msgid "could not parse HEAD commit"
-msgstr ""
+msgstr "tidak dapat menguraikan komit HEAD"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1425 sequencer.c:2310
msgid "unable to parse commit author"
-msgstr ""
+msgstr "tidak dapat menguraikan pengarang komit"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
-msgstr ""
+msgstr "git write-tree gagal menulis sebuah pohon"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1469 sequencer.c:1589
#, c-format
msgid "unable to read commit message from '%s'"
-msgstr ""
+msgstr "tidak dapat membaca pesan komit dari '%s'"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1500 sequencer.c:1532
#, c-format
msgid "invalid author identity '%s'"
-msgstr ""
+msgstr "identitas pengarang tidak valid '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1506
msgid "corrupt author: missing date information"
-msgstr ""
+msgstr "pengarang rusak: informasi tanggal hilang"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
+#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
-msgstr ""
+msgstr "gagal menulis objek komit"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
-msgstr ""
+msgstr "tidak dapat memperbarui %s"
-#: sequencer.c:1606
+#: sequencer.c:1621
#, c-format
msgid "could not parse commit %s"
-msgstr ""
+msgstr "tidak dapat menguraikan komit %s"
-#: sequencer.c:1611
+#: sequencer.c:1626
#, c-format
msgid "could not parse parent commit %s"
-msgstr ""
+msgstr "tidak dapat menguraikan komit induk %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1709 sequencer.c:1990
#, c-format
msgid "unknown command: %d"
-msgstr ""
+msgstr "perintah tidak dikenal: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1751
msgid "This is the 1st commit message:"
-msgstr ""
+msgstr "Ini komit pertama:"
-#: sequencer.c:1737
+#: sequencer.c:1752
#, c-format
msgid "This is the commit message #%d:"
-msgstr ""
+msgstr "Ini komit ke-%d:"
-#: sequencer.c:1738
+#: sequencer.c:1753
msgid "The 1st commit message will be skipped:"
-msgstr ""
+msgstr "Pesan komit pertama akan dilewati:"
-#: sequencer.c:1739
+#: sequencer.c:1754
#, c-format
msgid "The commit message #%d will be skipped:"
-msgstr ""
+msgstr "Pesan komit ke-%d akan dilewati"
-#: sequencer.c:1740
+#: sequencer.c:1755
#, c-format
msgid "This is a combination of %d commits."
-msgstr ""
+msgstr "Ini kombinasi dari %d komit."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1902 sequencer.c:1959
#, c-format
msgid "cannot write '%s'"
-msgstr ""
+msgstr "tidak dapat menulis '%s'"
-#: sequencer.c:1934
+#: sequencer.c:1949
msgid "need a HEAD to fixup"
-msgstr ""
+msgstr "butuh sebuah HEAD untuk memperbaiki"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1951 sequencer.c:3592
msgid "could not read HEAD"
-msgstr ""
+msgstr "tidak dapat membaca HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1953
msgid "could not read HEAD's commit message"
-msgstr ""
+msgstr "tidak dapat membaca pesan komit HEAD"
-#: sequencer.c:1962
+#: sequencer.c:1977
#, c-format
msgid "could not read commit message of %s"
-msgstr ""
+msgstr "tidak dapat membaca pesan komit %s"
-#: sequencer.c:2072
+#: sequencer.c:2087
msgid "your index file is unmerged."
-msgstr ""
+msgstr "berkas indeks Anda tak tergabung."
-#: sequencer.c:2079
+#: sequencer.c:2094
msgid "cannot fixup root commit"
-msgstr ""
+msgstr "tidak dapat memperbaiki komit akar"
-#: sequencer.c:2098
+#: sequencer.c:2113
#, c-format
msgid "commit %s is a merge but no -m option was given."
-msgstr ""
+msgstr "komit %s adalah penggabungan tetapi opsi -m tidak diberikan."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2121 sequencer.c:2129
#, c-format
msgid "commit %s does not have parent %d"
-msgstr ""
+msgstr "komit %s tidak punya induk %d"
-#: sequencer.c:2120
+#: sequencer.c:2135
#, c-format
msgid "cannot get commit message for %s"
-msgstr ""
+msgstr "tidak dapat mendapatkan pesan komit untuk %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2154
#, c-format
msgid "%s: cannot parse parent commit %s"
-msgstr ""
+msgstr "%s: tidak dapat menguraikan komit induk %s"
-#: sequencer.c:2205
+#: sequencer.c:2220
#, c-format
msgid "could not rename '%s' to '%s'"
-msgstr ""
+msgstr "tidak dapat menamai ulang '%s' ke '%s'"
-#: sequencer.c:2265
+#: sequencer.c:2280
#, c-format
msgid "could not revert %s... %s"
-msgstr ""
+msgstr "tidak dapat membalikkan %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2281
#, c-format
msgid "could not apply %s... %s"
-msgstr ""
+msgstr "tidak dapat menerapkan %s... %s"
-#: sequencer.c:2287
+#: sequencer.c:2302
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr ""
+msgstr "menjatuhkan %s %s -- isi tambalan sudah di hulu\n"
-#: sequencer.c:2345
+#: sequencer.c:2360
#, c-format
msgid "git %s: failed to read the index"
-msgstr ""
+msgstr "git %s: gagal membaca indeks"
-#: sequencer.c:2352
+#: sequencer.c:2368
#, c-format
msgid "git %s: failed to refresh the index"
-msgstr ""
+msgstr "git %s: gagal menyegarkan indeks"
-#: sequencer.c:2425
+#: sequencer.c:2448
#, c-format
msgid "%s does not accept arguments: '%s'"
-msgstr ""
+msgstr "%s tidak menerima argumen: '%s'"
-#: sequencer.c:2434
+#: sequencer.c:2457
#, c-format
msgid "missing arguments for %s"
-msgstr ""
+msgstr "argumen hilang untuk %s"
-#: sequencer.c:2477
+#: sequencer.c:2500
#, c-format
msgid "could not parse '%s'"
-msgstr ""
+msgstr "tidak dapat menguraikan '%s'"
-#: sequencer.c:2538
+#: sequencer.c:2561
#, c-format
msgid "invalid line %d: %.*s"
-msgstr ""
+msgstr "baris %d tidak valid: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2572
#, c-format
msgid "cannot '%s' without a previous commit"
-msgstr ""
+msgstr "tidak dapat '%s' tanpa komit sebelumnya"
-#: sequencer.c:2635
+#: sequencer.c:2620 builtin/rebase.c:185
+#, c-format
+msgid "could not read '%s'."
+msgstr "tidak dapat membaca '%s'."
+
+#: sequencer.c:2658
msgid "cancelling a cherry picking in progress"
-msgstr ""
+msgstr "membatalkan pemetikan ceri yang sedang berlangsung"
-#: sequencer.c:2644
+#: sequencer.c:2667
msgid "cancelling a revert in progress"
-msgstr ""
+msgstr "membatalkan pembalikkan yang sedang berlangsung"
-#: sequencer.c:2690
+#: sequencer.c:2707
msgid "please fix this using 'git rebase --edit-todo'."
-msgstr ""
+msgstr "mohon perbaiki menggunakan 'git rebase --edit-todo'."
-#: sequencer.c:2692
+#: sequencer.c:2709
#, c-format
msgid "unusable instruction sheet: '%s'"
-msgstr ""
+msgstr "lembar perintah tidak dapat digunakan: '%s'"
-#: sequencer.c:2697
+#: sequencer.c:2714
msgid "no commits parsed."
-msgstr ""
+msgstr "tidak ada komit yang diuraikan."
-#: sequencer.c:2708
+#: sequencer.c:2725
msgid "cannot cherry-pick during a revert."
-msgstr ""
+msgstr "tidak dapat memetik ceri selama pembalikkan."
-#: sequencer.c:2710
+#: sequencer.c:2727
msgid "cannot revert during a cherry-pick."
-msgstr ""
+msgstr "tidak dapat membalikkan selama petik ceri."
-#: sequencer.c:2788
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr ""
-
-#: sequencer.c:2897
+#: sequencer.c:2914
msgid "unusable squash-onto"
-msgstr ""
+msgstr "squash-onto tidak dapat digunakan"
-#: sequencer.c:2917
+#: sequencer.c:2934
#, c-format
msgid "malformed options sheet: '%s'"
-msgstr ""
+msgstr "lembar opsi jelek: '%s'"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3029 sequencer.c:4875
msgid "empty commit set passed"
-msgstr ""
+msgstr "himpunan komit kosong dilewatkan"
-#: sequencer.c:3029
+#: sequencer.c:3046
msgid "revert is already in progress"
-msgstr ""
+msgstr "pembalikkan sudah berjalan"
-#: sequencer.c:3031
+#: sequencer.c:3048
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr ""
+msgstr "coba \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3051
msgid "cherry-pick is already in progress"
-msgstr ""
+msgstr "pemetikan ceri sudah berjalan"
-#: sequencer.c:3036
+#: sequencer.c:3053
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr ""
+msgstr "coba \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3067
#, c-format
msgid "could not create sequencer directory '%s'"
-msgstr ""
+msgstr "tidak dapat membuat direktori pembaris '%s'"
-#: sequencer.c:3065
+#: sequencer.c:3082
msgid "could not lock HEAD"
-msgstr ""
+msgstr "tidak dapat mengunci HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3142 sequencer.c:4585
msgid "no cherry-pick or revert in progress"
-msgstr ""
+msgstr "tidak ada pemetikan ceri atau pembalikkan yang sedang berjalan"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3144 sequencer.c:3155
msgid "cannot resolve HEAD"
-msgstr ""
+msgstr "tidak dapat menguraikan HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3146 sequencer.c:3190
msgid "cannot abort from a branch yet to be born"
-msgstr ""
+msgstr "tidak dapat membatalkan dari cabang yang belum lahir"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
+#: builtin/grep.c:774
#, c-format
msgid "cannot open '%s'"
-msgstr ""
+msgstr "tidak dapat membuka '%s'"
-#: sequencer.c:3161
+#: sequencer.c:3178
#, c-format
msgid "cannot read '%s': %s"
-msgstr ""
-
-#: sequencer.c:3162
-msgid "unexpected end of file"
-msgstr ""
-
-#: sequencer.c:3168
-#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr ""
+msgstr "tidak dapat membaca '%s': %s"
#: sequencer.c:3179
+msgid "unexpected end of file"
+msgstr "akhir berkas tidak diharapkan"
+
+#: sequencer.c:3185
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "berkas HEAD pra-petik-ceri yang tersimpan '%s' rusak"
+
+#: sequencer.c:3196
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
+"Sepertinya Anda sudah memindahkan HEAD. Tidak memutar ulang, periksa HEAD "
+"Anda!"
-#: sequencer.c:3220
+#: sequencer.c:3237
msgid "no revert in progress"
-msgstr ""
-
-#: sequencer.c:3229
-msgid "no cherry-pick in progress"
-msgstr ""
-
-#: sequencer.c:3239
-msgid "failed to skip the commit"
-msgstr ""
+msgstr "tidak ada pembalikkan yang sedang berjalan"
#: sequencer.c:3246
-msgid "there is nothing to skip"
-msgstr ""
+msgid "no cherry-pick in progress"
+msgstr "tidak ada pemetikan ceri yang sedang berjalan"
-#: sequencer.c:3249
+#: sequencer.c:3256
+msgid "failed to skip the commit"
+msgstr "gagal melewati komit"
+
+#: sequencer.c:3263
+msgid "there is nothing to skip"
+msgstr "tidak ada yang dilewati"
+
+#: sequencer.c:3266
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
+"sudahkah Anda komit?\n"
+"coba \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3428 sequencer.c:4476
msgid "cannot read HEAD"
-msgstr ""
+msgstr "tidak dapat membaca HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3445
#, c-format
msgid "unable to copy '%s' to '%s'"
-msgstr ""
+msgstr "tidak dapat menyalin '%s' ke '%s'"
-#: sequencer.c:3436
+#: sequencer.c:3453
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7671,28 +8309,35 @@
"\n"
" git rebase --continue\n"
msgstr ""
+"Anda dapat mengubah komit sekarang, dengan\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Setelah Anda puas dengan perubahan Anda, jalankan\n"
+"\n"
+" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3463
#, c-format
msgid "Could not apply %s... %.*s"
-msgstr ""
+msgstr "Tidak dapat menerapkan %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3470
#, c-format
msgid "Could not merge %.*s"
-msgstr ""
+msgstr "Tidak dapat menggabungkan %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
-msgstr ""
+msgstr "tidak dapat menyalin '%s' ke '%s'"
-#: sequencer.c:3483
+#: sequencer.c:3499
#, c-format
msgid "Executing: %s\n"
-msgstr ""
+msgstr "Mengeksekusi: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3510
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7701,12 +8346,17 @@
" git rebase --continue\n"
"\n"
msgstr ""
+"eksekusi gagal: %s\n"
+"%sAnda dapat memperbaiki masalah, lalu jalankan\n"
+"\n"
+" git rebase --continue\n"
+"\n"
-#: sequencer.c:3504
+#: sequencer.c:3516
msgid "and made changes to the index and/or the working tree\n"
-msgstr ""
+msgstr "dan buat perubahan ke indeks dan/atau pohon kerja\n"
-#: sequencer.c:3510
+#: sequencer.c:3522
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7716,121 +8366,130 @@
" git rebase --continue\n"
"\n"
msgstr ""
+"eksekusi berhasil: %s\n"
+"tapi meninggalkan perubahan ke indeks dan/atau pohon kerja\n"
+"Komit atau stase perubahan Anda, lalu jalankan\n"
+"\n"
+" git rebase --continue\n"
+"\n"
-#: sequencer.c:3572
+#: sequencer.c:3582
#, c-format
msgid "illegal label name: '%.*s'"
-msgstr ""
+msgstr "nama label ilegal: '%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3655
msgid "writing fake root commit"
-msgstr ""
+msgstr "menulis komit akar palsu"
-#: sequencer.c:3650
+#: sequencer.c:3660
msgid "writing squash-onto"
-msgstr ""
+msgstr "menulis squash-onto"
-#: sequencer.c:3734
+#: sequencer.c:3739
#, c-format
msgid "could not resolve '%s'"
-msgstr ""
+msgstr "tidak dapat menguraikan '%s'"
-#: sequencer.c:3767
+#: sequencer.c:3771
msgid "cannot merge without a current revision"
-msgstr ""
+msgstr "tidak dapat menggabungkan tanpa revisi saat ini"
-#: sequencer.c:3789
+#: sequencer.c:3793
#, c-format
msgid "unable to parse '%.*s'"
-msgstr ""
+msgstr "tidak dapat menguraikan '%.*s'"
-#: sequencer.c:3798
+#: sequencer.c:3802
#, c-format
msgid "nothing to merge: '%.*s'"
-msgstr ""
+msgstr "tidak ada yang digabungkan: '%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3814
msgid "octopus merge cannot be executed on top of a [new root]"
-msgstr ""
+msgstr "penggabungan gurita tidak dapat dieksekusi di atas sebuah [akar baru]"
-#: sequencer.c:3826
+#: sequencer.c:3869
#, c-format
msgid "could not get commit message of '%s'"
-msgstr ""
+msgstr "tidak dapat mendapatkan pesan komit dari '%s'"
-#: sequencer.c:4009
+#: sequencer.c:4013
#, c-format
msgid "could not even attempt to merge '%.*s'"
-msgstr ""
+msgstr "bahkan tidak dapat mencoba menggabungkan '%.*s'"
-#: sequencer.c:4025
+#: sequencer.c:4029
msgid "merge: Unable to write new index file"
-msgstr ""
+msgstr "merge: Tidak dapat menulis berkas indeks baru"
-#: sequencer.c:4099
+#: sequencer.c:4110
msgid "Cannot autostash"
-msgstr ""
+msgstr "Tidak dapat menstase otomatis"
-#: sequencer.c:4102
+#: sequencer.c:4113
#, c-format
msgid "Unexpected stash response: '%s'"
-msgstr ""
+msgstr "Respons stase tidak diharapkan: '%s'"
-#: sequencer.c:4108
+#: sequencer.c:4119
#, c-format
msgid "Could not create directory for '%s'"
-msgstr ""
+msgstr "Tidak dapat membuat direktori untuk '%s'"
-#: sequencer.c:4111
+#: sequencer.c:4122
#, c-format
msgid "Created autostash: %s\n"
-msgstr ""
+msgstr "Stase otomatis dibuat: %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4124
msgid "could not reset --hard"
-msgstr ""
+msgstr "tidak dapat reset --hard"
-#: sequencer.c:4140
+#: sequencer.c:4148
#, c-format
msgid "Applied autostash.\n"
-msgstr ""
+msgstr "Stase otomatis diterapkan.\n"
-#: sequencer.c:4152
+#: sequencer.c:4160
#, c-format
msgid "cannot store %s"
-msgstr ""
+msgstr "tidak dapat menyimpan %s"
-#: sequencer.c:4155
+#: sequencer.c:4163
#, c-format
msgid ""
"%s\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
+"%s\n"
+"Perubahan Anda aman di dalam stase.\n"
+"Anda dapat menjalankan \"git stash pop\" atau \"git stash drop\" kapanpun.\n"
-#: sequencer.c:4160
+#: sequencer.c:4168
msgid "Applying autostash resulted in conflicts."
-msgstr ""
+msgstr "Menerapkan stase otomatis menghasilkan konflik."
-#: sequencer.c:4161
+#: sequencer.c:4169
msgid "Autostash exists; creating a new stash entry."
-msgstr ""
+msgstr "Stase otomatis sudah ada; membuat entri stase baru."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4225
msgid "could not detach HEAD"
-msgstr ""
+msgstr "tidak dapat melepas HEAD"
-#: sequencer.c:4248
+#: sequencer.c:4240
#, c-format
msgid "Stopped at HEAD\n"
-msgstr ""
+msgstr "Berhenti pada HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4242
#, c-format
msgid "Stopped at %s\n"
-msgstr ""
+msgstr "Berhenti pada %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4274
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7842,400 +8501,438 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
msgstr ""
+"Tidak dapat mengeksekusi perintah todo\n"
+"\n"
+" %.*s\n"
+"Itu sudah dijadwalkan ulang; Untuk menyunting perintah sebelum melanjutkan,\n"
+"mohon sunting daftar todo terlebih dahulu:\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4320
#, c-format
msgid "Rebasing (%d/%d)%s"
-msgstr ""
+msgstr "Mendasarkan ulang (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4366
#, c-format
msgid "Stopped at %s... %.*s\n"
-msgstr ""
+msgstr "Berhenti pada %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4436
#, c-format
msgid "unknown command %d"
-msgstr ""
+msgstr "perintah tidak dikenal %d"
-#: sequencer.c:4480
+#: sequencer.c:4484
msgid "could not read orig-head"
-msgstr ""
+msgstr "tidak dapat membaca orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4489
msgid "could not read 'onto'"
-msgstr ""
+msgstr "tidak dapat membaca 'onto'"
-#: sequencer.c:4499
+#: sequencer.c:4503
#, c-format
msgid "could not update HEAD to %s"
-msgstr ""
+msgstr "tidak dapat memperbarui HEAD ke %s"
-#: sequencer.c:4559
+#: sequencer.c:4563
#, c-format
msgid "Successfully rebased and updated %s.\n"
-msgstr ""
+msgstr "%s didasarkan ulang dan diperbarui dengan sukses.\n"
-#: sequencer.c:4611
+#: sequencer.c:4615
msgid "cannot rebase: You have unstaged changes."
-msgstr ""
-
-#: sequencer.c:4620
-msgid "cannot amend non-existing commit"
-msgstr ""
-
-#: sequencer.c:4622
-#, c-format
-msgid "invalid file: '%s'"
-msgstr ""
+msgstr "tidak dapat mendasarkan ulang: Anda punya perubahan tak tergelar."
#: sequencer.c:4624
+msgid "cannot amend non-existing commit"
+msgstr "tidak dapat mengubah komit yang tidak ada"
+
+#: sequencer.c:4626
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "berkas tidak valid: '%s'"
+
+#: sequencer.c:4628
#, c-format
msgid "invalid contents: '%s'"
-msgstr ""
+msgstr "konten tidak valid: '%s'"
-#: sequencer.c:4627
+#: sequencer.c:4631
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
+"\n"
+"Anda punya perubahan tak tergelar di dalam pohon kerja Anda. Mohon komit\n"
+"terlebih dahulu dan jalankan 'git rebase --continue' lagi."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4667 sequencer.c:4706
#, c-format
msgid "could not write file: '%s'"
-msgstr ""
+msgstr "tidak dapat menulis berkas: '%s'"
-#: sequencer.c:4718
+#: sequencer.c:4722
msgid "could not remove CHERRY_PICK_HEAD"
-msgstr ""
+msgstr "tidak dapat menghapus CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4732
msgid "could not commit staged changes."
-msgstr ""
+msgstr "tidak dapat mengkomit perubahan tergelar."
-#: sequencer.c:4845
+#: sequencer.c:4852
#, c-format
msgid "%s: can't cherry-pick a %s"
-msgstr ""
+msgstr "%s: tidak dapat memetik ceri sebuah %s"
-#: sequencer.c:4849
+#: sequencer.c:4856
#, c-format
msgid "%s: bad revision"
-msgstr ""
+msgstr "%s: revisi jelek"
-#: sequencer.c:4884
+#: sequencer.c:4891
msgid "can't revert as initial commit"
-msgstr ""
+msgstr "tidak dapat membalikkan sebagai komit awal"
-#: sequencer.c:5361
+#: sequencer.c:5162 sequencer.c:5391
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "melewatkan komit yang sudah diterapkan sebelumnya %s"
+
+#: sequencer.c:5232 sequencer.c:5407
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "gunakan --reapply-cherry-picks untuk memasukkan komit yang terlewat"
+
+#: sequencer.c:5378
msgid "make_script: unhandled options"
-msgstr ""
+msgstr "make_script: opsi tak ditangani"
-#: sequencer.c:5364
+#: sequencer.c:5381
msgid "make_script: error preparing revisions"
-msgstr ""
+msgstr "make_script: kesalahan membuat revisi"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5639 sequencer.c:5656
msgid "nothing to do"
-msgstr ""
+msgstr "tidak ada yang dilakukan"
-#: sequencer.c:5650
+#: sequencer.c:5675
msgid "could not skip unnecessary pick commands"
-msgstr ""
+msgstr "tidak dapat melewatkan perintah pick yang tidak perlu"
-#: sequencer.c:5750
+#: sequencer.c:5775
msgid "the script was already rearranged."
-msgstr ""
+msgstr "skrip sudah ditata ulang."
-#: setup.c:133
+#: setup.c:135
#, c-format
msgid "'%s' is outside repository at '%s'"
-msgstr ""
+msgstr "'%s' di luar repositori pada '%s'"
-#: setup.c:185
+#: setup.c:187
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
+"%s: tidak ada jalur di pohon kerja.\n"
+"Gunakan 'git <perintah> -- <jalur>...' untuk menyebutkan jalur yang tidak ada secara lokal."
-#: setup.c:198
+#: setup.c:200
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
+"argumen ambigu '%s': revisi tidak dikenal atau jalur tidak ada di dalam pohon "
+"kerja.\n"
+"Gunakan '--' untuk memisahkan jalur dari revisi, seperti ini:\n"
+"'git <perintah> [<revisi>...] -- [<berkas>...]'"
-#: setup.c:264
+#: setup.c:266
#, c-format
msgid "option '%s' must come before non-option arguments"
-msgstr ""
+msgstr "opsi '%s' harus ada sebelum argumen bukan opsi"
-#: setup.c:283
+#: setup.c:285
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
+"argumen ambigu '%s': kedua-duanya revisi dan nama berkas\n"
+"Gunakan '--' untuk memisahkan jalur dari revisi, seperti ini:\n"
+"'git <perintah> [<revisi>...] -- [<berkas>]'"
-#: setup.c:419
+#: setup.c:421
msgid "unable to set up work tree using invalid config"
-msgstr ""
+msgstr "tidak dapat memasang pohon kerja menggunakan konfigurasi tidak valid"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:425 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
-msgstr ""
+msgstr "operasi ini harus dijalankan di dalam pohon kerja"
-#: setup.c:658
+#: setup.c:724
#, c-format
msgid "Expected git repo version <= %d, found %d"
-msgstr ""
+msgstr "Versi repositori git diharapkan <= %d, dapat %d"
-#: setup.c:666
+#: setup.c:732
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ekstensi repositori tidak dikenal ditemukan:"
+msgstr[1] "ekstensi repositori tidak dikenal ditemukan:"
-#: setup.c:680
+#: setup.c:746
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "versi repositori 0, tetapi ekstensi hanya v1 ditemukan:"
+msgstr[1] "versi repositori 0, tetapi ekstensi hanya v1 ditemukan:"
-#: setup.c:701
+#: setup.c:767
#, c-format
msgid "error opening '%s'"
-msgstr ""
+msgstr "kesalahan membuka '%s'"
-#: setup.c:703
+#: setup.c:769
#, c-format
msgid "too large to be a .git file: '%s'"
-msgstr ""
+msgstr "terlalu besar untuk jadi berkas .git: '%s'"
-#: setup.c:705
+#: setup.c:771
#, c-format
msgid "error reading %s"
-msgstr ""
+msgstr "kesalahan membaca %s"
-#: setup.c:707
+#: setup.c:773
#, c-format
msgid "invalid gitfile format: %s"
-msgstr ""
+msgstr "format gitfile tidak valid: %s"
-#: setup.c:709
+#: setup.c:775
#, c-format
msgid "no path in gitfile: %s"
-msgstr ""
+msgstr "tidak ada jalur di dalam gitfile: %s"
-#: setup.c:711
+#: setup.c:777
#, c-format
msgid "not a git repository: %s"
-msgstr ""
+msgstr "bukan sebuah repositori git: %s"
-#: setup.c:813
+#: setup.c:879
#, c-format
msgid "'$%s' too big"
-msgstr ""
+msgstr "'$%s' terlalu besar"
-#: setup.c:827
+#: setup.c:893
#, c-format
msgid "not a git repository: '%s'"
-msgstr ""
+msgstr "bukan sebuah repositori git: '%s'"
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:922 setup.c:924 setup.c:955
#, c-format
msgid "cannot chdir to '%s'"
-msgstr ""
+msgstr "tidak dapat chdir ke '%s'"
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
msgid "cannot come back to cwd"
-msgstr ""
+msgstr "tidak dapat kembali ke cwd"
-#: setup.c:988
+#: setup.c:1054
#, c-format
msgid "failed to stat '%*s%s%s'"
-msgstr ""
+msgstr "gagal men-stat '%*s%s%s'"
-#: setup.c:1231
+#: setup.c:1338
msgid "Unable to read current working directory"
-msgstr ""
+msgstr "tidak dapat membaca direktori kerja saat ini"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1347 setup.c:1353
#, c-format
msgid "cannot change to '%s'"
-msgstr ""
+msgstr "tidak dapat berganti ke '%s'"
-#: setup.c:1251
+#: setup.c:1358
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
-msgstr ""
+msgstr "bukan sebuah repositori git (atau direktori induk apapun): %s"
-#: setup.c:1257
+#: setup.c:1364
#, 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 ""
+"bukan sebuah repositori git (atau induk apapun hingga ke titik pasang %s)\n"
+"Berhenti pada perbatasan sistem berkas (GIT_DISCOVERY_ACROSS_FILESYSTEM tidak disetel)."
-#: setup.c:1381
+#: setup.c:1374
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"repositori tidak aman ('%s' dimiliki oleh orang lain)\n"
+"Untuk menambahkan pengecualian untuk direktori ini, panggil:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#: setup.c:1502
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
+"masalah dengan nilai mode berkas core.sharedRepository (0%.3o).\n"
+"Pemilik berkas harus selalu punya perizinan baca dan tulis."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr ""
-
-#: setup.c:1445
+#: setup.c:1564
msgid "fork failed"
-msgstr ""
+msgstr "penggarpuan gagal"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1569
msgid "setsid failed"
-msgstr ""
+msgstr "setsid gagal"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr ""
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr ""
-
-#: sparse-index.c:263
+#: sparse-index.c:285
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
-msgstr ""
+msgstr "entri indeks adalah direktori, tapi bukan tipis (%08x)"
+
+#: split-index.c:9
+msgid "cannot use split index with a sparse index"
+msgstr "tidak dapat menggunakan indeks terpisah dengan indeks tipis"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u.%2.2u GiB"
-msgstr ""
+msgstr "%u.%2.2u gibibita"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:852
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB/s"
-msgstr ""
+msgstr "%u.%2.2u gibibita/detik"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:860
+#: strbuf.c:861
#, c-format
msgid "%u.%2.2u MiB"
-msgstr ""
+msgstr "%u.%2.2u mebibita"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:862
+#: strbuf.c:863
#, c-format
msgid "%u.%2.2u MiB/s"
-msgstr ""
+msgstr "%u.%2.2u mebibita/detik"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:869
+#: strbuf.c:870
#, c-format
msgid "%u.%2.2u KiB"
-msgstr ""
+msgstr "%u.%2.2u kibibita"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:871
+#: strbuf.c:872
#, c-format
msgid "%u.%2.2u KiB/s"
-msgstr ""
+msgstr "%u.%2.2u kibibita/detik"
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:877
+#: strbuf.c:878
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%u bita"
+msgstr[1] "%u bita"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
+#: strbuf.c:880
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%u bita/detik"
+msgstr[1] "%u bita/detik"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
+#: builtin/rebase.c:653
#, c-format
msgid "could not open '%s' for writing"
-msgstr ""
+msgstr "tidak dapat membuka '%s' untuk ditulis"
-#: strbuf.c:1177
+#: strbuf.c:1196
#, c-format
msgid "could not edit '%s'"
-msgstr ""
+msgstr "tidak dapat menyunting '%s'"
-#: submodule-config.c:237
+#: submodule-config.c:238
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "abaikan nama submodul dicurigai: %s"
-#: submodule-config.c:304
+#: submodule-config.c:305
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "nilai negatif tidak diperbolehkan untuk submodule.fetchjobs"
-#: submodule-config.c:402
+#: submodule-config.c:403
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr "abaikan '%s' yang mungkin ditafsirkan sebagai opsi baris perintah: %s"
-#: submodule-config.c:499
+#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
#, c-format
-msgid "invalid value for %s"
-msgstr "nilai tidak valid untuk %s"
+msgid "invalid value for '%s'"
+msgstr "nilai tidak valid untuk '%s'"
-#: submodule-config.c:766
+#: submodule-config.c:828
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Tidak dapat memperbarui entri .gitmodules %s"
-#: submodule.c:114 submodule.c:143
+#: submodule.c:115 submodule.c:144
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Tidak dapat mengubah .gitmodules yang tak tergabung, selesaikan konflik "
"penggabungan terlebih dahulu"
-#: submodule.c:118 submodule.c:147
+#: submodule.c:119 submodule.c:148
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Tidak dapat menemukan bagian .gitmodules dimana path=%s"
-#: submodule.c:154
+#: submodule.c:155
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Tidak dapat menghapus entri .gitmodules untuk %s"
-#: submodule.c:165
+#: submodule.c:166
msgid "staging updated .gitmodules failed"
msgstr "gagal menggelar .gitmodules terbarui"
-#: submodule.c:328
+#: submodule.c:346
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "dalam submodul tak terisi '%s'"
-#: submodule.c:359
+#: submodule.c:377
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Spek jalur '%s' di dalam submodul '%.*s'"
-#: submodule.c:436
+#: submodule.c:454
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "argumen --ignore-submodules jelek: %s"
-#: submodule.c:805
+#: submodule.c:866
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8244,12 +8941,12 @@
"Submodul dalam komit %s pada jalur '%s' bertabrakan dengan submodul yang "
"bernama sama. Melewati itu."
-#: submodule.c:908
+#: submodule.c:987
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "entri submodul '%s' (%s) adalah %s, bukan komit"
-#: submodule.c:993
+#: submodule.c:1069
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8258,36 +8955,46 @@
"Tidak dapat menjalankan perintah 'git rev-list <komit> --not --remotes -n 1' "
"dalam submodul %s"
-#: submodule.c:1116
+#: submodule.c:1192
#, c-format
msgid "process for submodule '%s' failed"
msgstr "proses untuk submodul '%s' gagal"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Gagal menguraikan HEAD sebagai referensi valid."
-#: submodule.c:1156
+#: submodule.c:1232
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Mendorong submodul '%s'\n"
-#: submodule.c:1159
+#: submodule.c:1235
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Tidak dapat mendorong submodul '%s'\n"
-#: submodule.c:1451
+#: submodule.c:1567
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Mengambil submodul %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1589
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Tidak dapat mengakses submodul '%s'\n"
-#: submodule.c:1640
+#: submodule.c:1618
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Tidak dapat mengakses submodul '%s' pada komit %s\n"
+
+#: submodule.c:1629
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Mengambil submodul %s%s pada komit %s\n"
+
+#: submodule.c:1849
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8296,61 +9003,61 @@
"Kesalahan saat pengambilan submodul:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1874
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' tak dikenal sebagai repositori git"
-#: submodule.c:1682
+#: submodule.c:1891
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Tidak dapat menjalankan 'git status --porcelain=2' dalam submodul %s"
-#: submodule.c:1723
+#: submodule.c:1932
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' gagal dalam submodul %s"
-#: submodule.c:1798
+#: submodule.c:2007
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "Tidak dalat memulai 'git status' dalam submodul '%s'"
-#: submodule.c:1811
+#: submodule.c:2020
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "tidak dapat menjalankan 'git status' dalam submodul '%s'"
-#: submodule.c:1826
+#: submodule.c:2037
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Tidak dapat batal setel setelan core.worktree dalam submodul '%s'"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:2064 submodule.c:2379
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "tidak dapat rekursi ke dalam submodul '%s'"
-#: submodule.c:1874
+#: submodule.c:2086
msgid "could not reset submodule index"
msgstr "tidak dapat reset indeks submodul"
-#: submodule.c:1916
+#: submodule.c:2128
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "submodul '%s' punya indeks kotor"
-#: submodule.c:1968
+#: submodule.c:2182
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submodul '%s' tidak dapat diperbarui."
-#: submodule.c:2036
+#: submodule.c:2250
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "direktori submodul git '%s' di dalam direktori git '%.*s'"
-#: submodule.c:2057
+#: submodule.c:2271
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8358,17 +9065,17 @@
"relocate_gitdir untuk submodul '%s' dengan lebih dari satu pohon kerja tidak "
"didukung"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2283 submodule.c:2343
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "tidak dapat mencari nama untuk submodul '%s'"
-#: submodule.c:2073
+#: submodule.c:2287
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "menolak memindahkan '%s' ke dalam direktori git yang ada"
-#: submodule.c:2080
+#: submodule.c:2293
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8379,11 +9086,11 @@
"'%s' ke\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2424
msgid "could not start ls-files in .."
msgstr "tidak dapat memulai ls-files dalam .."
-#: submodule.c:2248
+#: submodule.c:2464
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree kembalikan kode kembali %d yang tak diharapkan"
@@ -8391,62 +9098,62 @@
#: symlinks.c:244
#, c-format
msgid "failed to lstat '%s'"
-msgstr ""
+msgstr "gagal men-lstat '%s'"
#: trailer.c:244
#, c-format
msgid "running trailer command '%s' failed"
-msgstr ""
+msgstr "gagal menjalankan perintah trailer '%s'"
#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
#: trailer.c:570
#, c-format
msgid "unknown value '%s' for key '%s'"
-msgstr ""
+msgstr "nilai tidak dikenal '%s' untuk kunci '%s'"
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
+#: builtin/remote.c:328
#, c-format
msgid "more than one %s"
-msgstr ""
+msgstr "lebih dari satu %s"
#: trailer.c:743
#, c-format
msgid "empty trailer token in trailer '%.*s'"
-msgstr ""
+msgstr "token trailer kosong dalam trailer '%.*s'"
#: trailer.c:763
#, c-format
msgid "could not read input file '%s'"
-msgstr ""
+msgstr "tidak dapat membaca berkas masukan '%s'"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
msgid "could not read from stdin"
-msgstr ""
+msgstr "tidak dapat membaca dari masukan standar"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:760
#, c-format
msgid "could not stat %s"
-msgstr ""
+msgstr "tidak dapat membaca %s"
#: trailer.c:1026
#, c-format
msgid "file %s is not a regular file"
-msgstr ""
+msgstr "berkas %s bukan sebuah berkas reguler"
#: trailer.c:1028
#, c-format
msgid "file %s is not writable by user"
-msgstr ""
+msgstr "berkas %s tidak dapat ditulis oleh pengguna"
#: trailer.c:1040
msgid "could not open temporary file"
-msgstr ""
+msgstr "tidak dapat membuka berkas sementara"
#: trailer.c:1080
#, c-format
msgid "could not rename temporary file to %s"
-msgstr ""
+msgstr "tidak dapat menamai ulang berkas sementara ke %s"
#: transport-helper.c:62 transport-helper.c:91
msgid "full write to remote helper failed"
@@ -8490,7 +9197,7 @@
msgid "error while running fast-import"
msgstr ""
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1254
#, c-format
msgid "could not read ref %s"
msgstr ""
@@ -8508,7 +9215,7 @@
msgid "invalid remote service path"
msgstr ""
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1496
msgid "operation not supported by protocol"
msgstr ""
@@ -8517,124 +9224,124 @@
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:415
msgid "--negotiate-only requires protocol v2"
msgstr ""
-#: transport-helper.c:755
+#: transport-helper.c:758
msgid "'option' without a matching 'ok/error' directive"
msgstr ""
-#: transport-helper.c:798
+#: transport-helper.c:801
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: transport-helper.c:855
+#: transport-helper.c:862
#, c-format
msgid "helper reported unexpected status of %s"
msgstr ""
-#: transport-helper.c:938
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support dry-run"
msgstr ""
-#: transport-helper.c:941
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed"
msgstr ""
-#: transport-helper.c:944
+#: transport-helper.c:951
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: transport-helper.c:949
+#: transport-helper.c:956
#, c-format
msgid "helper %s does not support --atomic"
msgstr ""
-#: transport-helper.c:953
+#: transport-helper.c:960
#, c-format
msgid "helper %s does not support --%s"
msgstr ""
-#: transport-helper.c:960
+#: transport-helper.c:967
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr ""
-#: transport-helper.c:1060
+#: transport-helper.c:1067
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:1065
+#: transport-helper.c:1072
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
-#: transport-helper.c:1112
+#: transport-helper.c:1119
msgid "couldn't run fast-export"
msgstr ""
-#: transport-helper.c:1117
+#: transport-helper.c:1124
msgid "error while running fast-export"
msgstr ""
-#: transport-helper.c:1142
+#: transport-helper.c:1149
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch.\n"
msgstr ""
-#: transport-helper.c:1224
+#: transport-helper.c:1231
#, c-format
msgid "unsupported object format '%s'"
msgstr ""
-#: transport-helper.c:1233
+#: transport-helper.c:1240
#, c-format
msgid "malformed response in ref list: %s"
msgstr ""
-#: transport-helper.c:1385
+#: transport-helper.c:1392
#, c-format
msgid "read(%s) failed"
msgstr ""
-#: transport-helper.c:1412
+#: transport-helper.c:1419
#, c-format
msgid "write(%s) failed"
msgstr ""
-#: transport-helper.c:1461
+#: transport-helper.c:1468
#, c-format
msgid "%s thread failed"
msgstr ""
-#: transport-helper.c:1465
+#: transport-helper.c:1472
#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1491 transport-helper.c:1495
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1525
+#: transport-helper.c:1532
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1529
+#: transport-helper.c:1536
#, c-format
msgid "%s process failed"
msgstr ""
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1554 transport-helper.c:1563
msgid "can't start thread for copying data"
msgstr ""
@@ -8643,58 +9350,58 @@
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: transport.c:145
+#: transport.c:138
#, c-format
msgid "could not read bundle '%s'"
msgstr ""
-#: transport.c:223
+#: transport.c:234
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:275
+#: transport.c:289
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: transport.c:276
+#: transport.c:290
msgid "server options require protocol version 2 or later"
msgstr ""
-#: transport.c:403
+#: transport.c:418
msgid "server does not support wait-for-done"
msgstr ""
-#: transport.c:755
+#: transport.c:770
msgid "could not parse transport.color.* config"
msgstr ""
-#: transport.c:830
+#: transport.c:845
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:965
+#: transport.c:978
#, c-format
msgid "unknown value for config '%s': %s"
msgstr ""
-#: transport.c:1031
+#: transport.c:1044
#, c-format
msgid "transport '%s' not allowed"
msgstr ""
-#: transport.c:1084
+#: transport.c:1093
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1187
+#: transport.c:1196
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:1191
+#: transport.c:1200
#, c-format
msgid ""
"\n"
@@ -8710,11 +9417,11 @@
"\n"
msgstr ""
-#: transport.c:1199
+#: transport.c:1208
msgid "Aborting."
msgstr ""
-#: transport.c:1346
+#: transport.c:1354
msgid "failed to push all needed submodules"
msgstr ""
@@ -8734,106 +9441,113 @@
msgid "too-short tree file"
msgstr ""
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, 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:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\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 merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, 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:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:142
#, 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:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, 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:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, 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:148
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-
#: unpack-trees.c:154
#, c-format
msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:160
+#, c-format
+msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8841,47 +9555,47 @@
"%%s"
msgstr ""
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, 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:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, 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:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -8889,14 +9603,14 @@
"%s"
msgstr ""
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
msgstr ""
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -8904,41 +9618,41 @@
"%s"
msgstr ""
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
msgstr ""
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr ""
-#: unpack-trees.c:384
+#: unpack-trees.c:390
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:1618
+#: unpack-trees.c:1664
msgid "Updating index flags"
msgstr ""
-#: unpack-trees.c:2718
+#: unpack-trees.c:2925
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
-#: upload-pack.c:1548
+#: upload-pack.c:1579
msgid "expected flush after fetch arguments"
-msgstr ""
+msgstr "bilasan diharapkan setelah argumen pengambilan"
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
@@ -8973,114 +9687,138 @@
msgid "Fetching objects"
msgstr ""
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "gagal membaca '%s'"
-#: worktree.c:303
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "'%s' pada pohon kerja utama bukan direktori repositori"
-#: worktree.c:314
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "berkas '%s' tidak berisi jalur absolut ke lokasi pohon kerja"
-#: worktree.c:326
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' tidak ada"
-#: worktree.c:332
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' bukan berkas .git, kode error %d"
-#: worktree.c:341
+#: worktree.c:342
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' tidak menunjuk kembali ke '%s'"
-#: worktree.c:603
+#: worktree.c:600
msgid "not a directory"
msgstr "bukan direktori"
-#: worktree.c:612
+#: worktree.c:609
msgid ".git is not a file"
msgstr ".git bukan berkas"
-#: worktree.c:614
+#: worktree.c:611
msgid ".git file broken"
msgstr "berkas .git rusak"
-#: worktree.c:616
+#: worktree.c:613
msgid ".git file incorrect"
msgstr "berkas .git salah"
-#: worktree.c:722
+#: worktree.c:719
msgid "not a valid path"
msgstr "bukan jalur valid"
-#: worktree.c:728
+#: worktree.c:725
msgid "unable to locate repository; .git is not a file"
msgstr "tidak dapat menempatkan repositori; .git bukan berkas"
-#: worktree.c:732
+#: worktree.c:729
msgid "unable to locate repository; .git file does not reference a repository"
msgstr ""
"tidak dapat menempatkan repositori; berkas .git tidak merujuk repositori"
-#: worktree.c:736
+#: worktree.c:733
msgid "unable to locate repository; .git file broken"
msgstr "tidak dapat menempatkan repositori; berkas .git rusak"
-#: worktree.c:742
+#: worktree.c:739
msgid "gitdir unreadable"
msgstr "gitdir tidak dapat dibaca"
-#: worktree.c:746
+#: worktree.c:743
msgid "gitdir incorrect"
msgstr "gitdir salah"
-#: worktree.c:771
+#: worktree.c:768
msgid "not a valid directory"
msgstr "bukan direktori valid"
-#: worktree.c:777
+#: worktree.c:774
msgid "gitdir file does not exist"
msgstr "berkas gitdir tidak ada"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:779 worktree.c:788
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "tidak dapat membaca berkas gitdir (%s)"
-#: worktree.c:801
+#: worktree.c:798
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "baca singkat (diharapkan %<PRIuMAX> bita, terbaca %<PRIuMAX>)"
-#: worktree.c:809
+#: worktree.c:806
msgid "invalid gitdir file"
msgstr "berkas gitdir tidak valid"
-#: worktree.c:817
+#: worktree.c:814
msgid "gitdir file points to non-existent location"
msgstr "berkas gitdir menunjuk ke lokasi yang tidak ada"
-#: wrapper.c:197 wrapper.c:367
+#: worktree.c:830
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "tidak dapat menyetel %s di '%s'"
+
+#: worktree.c:832
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "tidak dapat menyetel balik %s di '%s'"
+
+#: worktree.c:852
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "gagal menyetel setelan extensions.worktreeConfig"
+
+#: wrapper.c:161
+#, c-format
+msgid "could not setenv '%s'"
+msgstr ""
+
+#: wrapper.c:213
+#, c-format
+msgid "unable to create '%s'"
+msgstr "tidak dapat membuat '%s'"
+
+#: wrapper.c:215 wrapper.c:385
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:416 wrapper.c:683
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:607
+#: wrapper.c:691
msgid "unable to get current working directory"
msgstr ""
@@ -9117,11 +9855,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (gunakan \"git rm <berkas>\" untuk menandai penyelesaian)"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1140
msgid "Changes to be committed:"
msgstr "Perubahan yang akan dikomit:"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1149
msgid "Changes not staged for commit:"
msgstr "Perubahan yang tidak digelar untuk komit:"
@@ -9225,22 +9963,22 @@
msgid "untracked content, "
msgstr "konten yang tak dilacak, "
-#: wt-status.c:958
+#: wt-status.c:973
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Simpanan Anda saat ini ada %d entri"
msgstr[1] "Simpanan Anda saat ini ada %d entri"
-#: wt-status.c:989
+#: wt-status.c:1004
msgid "Submodules changed but not updated:"
msgstr "Submodul berubah tapi tak diperbarui:"
-#: wt-status.c:991
+#: wt-status.c:1006
msgid "Submodule changes to be committed:"
msgstr "Perubahan submodul yang akan dikomit:"
-#: wt-status.c:1073
+#: wt-status.c:1088
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9248,7 +9986,7 @@
"Jangan ubah atau hapus baris diatas.\n"
"Semua dibawahnya akan diabaikan."
-#: wt-status.c:1165
+#: wt-status.c:1180
#, c-format
msgid ""
"\n"
@@ -9259,266 +9997,273 @@
"Butuh %.2f detik untuk menghitung cabang di depan/di belakang nilai.\n"
"Anda bisa gunakan '--no-ahead-behind' untuk menghindari hal tersebut.\n"
-#: wt-status.c:1195
+#: wt-status.c:1210
msgid "You have unmerged paths."
msgstr "Anda punya jalur yang tak tergabung."
-#: wt-status.c:1198
+#: wt-status.c:1213
msgid " (fix conflicts and run \"git commit\")"
msgstr " (selesaikan konflik dan jalankan \"git commit\")"
-#: wt-status.c:1200
+#: wt-status.c:1215
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (gunakan \"git merge --abort\" untuk membatalkan penggabungan)"
-#: wt-status.c:1204
+#: wt-status.c:1219
msgid "All conflicts fixed but you are still merging."
msgstr "Semua konflik sudah selesai tapi Anda masih menggabungkan."
-#: wt-status.c:1207
+#: wt-status.c:1222
msgid " (use \"git commit\" to conclude merge)"
msgstr " (gunakan \"git commit\" untuk mengakhiri penggabungan)"
-#: wt-status.c:1216
+#: wt-status.c:1233
msgid "You are in the middle of an am session."
msgstr "Anda berada ditengah-tengah sesi am."
-#: wt-status.c:1219
+#: wt-status.c:1236
msgid "The current patch is empty."
msgstr "Jalur saat ini kosong"
-#: wt-status.c:1223
+#: wt-status.c:1241
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (selesaikan konflik lalu jalankan \"git am --continue\")"
-#: wt-status.c:1225
+#: wt-status.c:1243
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (gunakan \"git am --skip\" untuk lewati tambalan ini)"
-#: wt-status.c:1227
+#: wt-status.c:1246
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (gunakan \"git am --allow-empty\" untuk merekam tambalan ini sebagai komit "
+"kosong)"
+
+#: wt-status.c:1248
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (gunakan \"git am --abort\" untuk mengembalikan cabang asal)"
-#: wt-status.c:1360
+#: wt-status.c:1381
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo hilang."
-#: wt-status.c:1362
+#: wt-status.c:1383
msgid "No commands done."
msgstr "Tidak ada perintah selesai."
-#: wt-status.c:1365
+#: wt-status.c:1386
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Perintah yang selesai (%d perintah):"
-msgstr[1] "Perintah yang selesai (%d perintah):"
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Perintah yang selesai (%<PRIuMAX> perintah):"
+msgstr[1] "Perintah yang selesai (%<PRIuMAX> perintah):"
-#: wt-status.c:1376
+#: wt-status.c:1397
#, c-format
msgid " (see more in file %s)"
msgstr " (lihat lebih lanjut di berkas %s)"
-#: wt-status.c:1381
+#: wt-status.c:1402
msgid "No commands remaining."
msgstr "Tidak ada perintah yang tersisa."
-#: wt-status.c:1384
+#: wt-status.c:1405
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Perintah berikutnya (%d perintah tersisa):"
-msgstr[1] "Perintah berikutnya (%d perintah tersisa):"
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Perintah berikutnya (%<PRIuMAX> perintah tersisa):"
+msgstr[1] "Perintah berikutnya (%<PRIuMAX> perintah tersisa):"
-#: wt-status.c:1392
+#: wt-status.c:1413
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (gunakan \"git rebase --edit-todo\" untuk lihat dan sunting)"
-#: wt-status.c:1404
+#: wt-status.c:1425
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Anda sedang mendasarkan ulang cabang '%s' pada '%s'."
-#: wt-status.c:1409
+#: wt-status.c:1430
msgid "You are currently rebasing."
msgstr "Anda sedang mendasarkan ulang."
-#: wt-status.c:1422
+#: wt-status.c:1443
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (selesaikan konflik lalu jalankan \"git rebase --continue\")"
-#: wt-status.c:1424
+#: wt-status.c:1445
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (gunakan \"git rebase --skip\" untuk lewati tambalan ini)"
-#: wt-status.c:1426
+#: wt-status.c:1447
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (gunakan \"git rebase --abort\" untuk check out cabang asal)"
-#: wt-status.c:1433
+#: wt-status.c:1454
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (semua konflik sudah selesai: jalankan \"git rebase --continue\")"
-#: wt-status.c:1437
+#: wt-status.c:1458
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Anda sedang membelah komit saat mendasarkan ulang cabang '%s' pada '%s'."
-#: wt-status.c:1442
+#: wt-status.c:1463
msgid "You are currently splitting a commit during a rebase."
msgstr "Anda sedang membelah komit saat mendasarkan ulang."
-#: wt-status.c:1445
+#: wt-status.c:1466
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Setelah direktori kerja Anda bersih, jalankan \"git rebase --continue\")"
-#: wt-status.c:1449
+#: wt-status.c:1470
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Anda sedang menyunting komit saat mendasarkan ulang cabang '%s' pada '%s'."
-#: wt-status.c:1454
+#: wt-status.c:1475
msgid "You are currently editing a commit during a rebase."
msgstr "Anda sedang menyunting komit saat mendasarkan ulang."
-#: wt-status.c:1457
+#: wt-status.c:1478
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (gunakan \"git commit --amend\" untuk mengubah komit saat ini)"
-#: wt-status.c:1459
+#: wt-status.c:1480
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (gunakan \"git rebase --continue\" begitu Anda puas dengan perubahan Anda)"
-#: wt-status.c:1470
+#: wt-status.c:1491
msgid "Cherry-pick currently in progress."
msgstr "Petik ceri sedang berjalan."
-#: wt-status.c:1473
+#: wt-status.c:1494
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Anda sedang memetik ceri komit %s."
-#: wt-status.c:1480
+#: wt-status.c:1501
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (selesaikan konflik dan jalankan \"git cherry-pick --continue\")"
-#: wt-status.c:1483
+#: wt-status.c:1504
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (jalankan \"git cherry-pick --continue\" untuk melanjutkan)"
-#: wt-status.c:1486
+#: wt-status.c:1507
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (semua konflik sudah selesai: jalankan \"git cherry-pick --continue\")"
-#: wt-status.c:1488
+#: wt-status.c:1509
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (gunakan \"git cherry-pick --skip\" untuk lewati tambalan ini)"
-#: wt-status.c:1490
+#: wt-status.c:1511
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (gunakan \"git cherry-pick --abort\" untuk membatalkan operasi petik ceri)"
-#: wt-status.c:1500
+#: wt-status.c:1521
msgid "Revert currently in progress."
msgstr "Pengembalian sedang berjalang."
-#: wt-status.c:1503
+#: wt-status.c:1524
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Anda sedang mengembalikan komit %s."
-#: wt-status.c:1509
+#: wt-status.c:1530
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (selesaikan konflik dan jalankan \"git revert --continue\")"
-#: wt-status.c:1512
+#: wt-status.c:1533
msgid " (run \"git revert --continue\" to continue)"
msgstr " (jalankan \"git revert --continue\" untuk melanjutkan)"
-#: wt-status.c:1515
+#: wt-status.c:1536
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (semua konflik sudah selesai: jalankan \"git revert --continue\")"
-#: wt-status.c:1517
+#: wt-status.c:1538
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (gunakan \"git revert --skip\" untuk lewati tambalan ini)"
-#: wt-status.c:1519
+#: wt-status.c:1540
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (gunakan \"git revert --abort\" untuk membatalkan operasi pengembalian)"
-#: wt-status.c:1529
+#: wt-status.c:1550
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Anda sedang membagi dua, dimulai dari cabang '%s'."
-#: wt-status.c:1533
+#: wt-status.c:1554
msgid "You are currently bisecting."
msgstr "Anda sedang membagi dua."
-#: wt-status.c:1536
+#: wt-status.c:1557
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (gunakan \"git bisect reset\" untuk kembali ke cabang asal)"
-#: wt-status.c:1547
+#: wt-status.c:1568
msgid "You are in a sparse checkout."
msgstr "Anda berada dalam checkout tipis."
-#: wt-status.c:1550
+#: wt-status.c:1571
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr "Anda berada dalam checkout tipis dengan %d%% berkas terlacak ada."
-#: wt-status.c:1794
+#: wt-status.c:1815
msgid "On branch "
msgstr "Pada cabang "
-#: wt-status.c:1801
+#: wt-status.c:1822
msgid "interactive rebase in progress; onto "
msgstr "sedang mendasarkan ulang interaktif; ke "
-#: wt-status.c:1803
+#: wt-status.c:1824
msgid "rebase in progress; onto "
msgstr "sedang mendasarkan ulang; ke "
-#: wt-status.c:1808
+#: wt-status.c:1829
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1810
+#: wt-status.c:1831
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1813
+#: wt-status.c:1834
msgid "Not currently on any branch."
msgstr "Tidak sedang berada pada cabang apapun."
-#: wt-status.c:1830
+#: wt-status.c:1851
msgid "Initial commit"
msgstr "Komit awal"
-#: wt-status.c:1831
+#: wt-status.c:1852
msgid "No commits yet"
msgstr "Tidak ada komit"
-#: wt-status.c:1845
+#: wt-status.c:1866
msgid "Untracked files"
msgstr "Berkas tak terlacak"
-#: wt-status.c:1847
+#: wt-status.c:1868
msgid "Ignored files"
msgstr "Berkas yang diabaikan"
-#: wt-status.c:1851
+#: wt-status.c:1872
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9529,32 +10274,32 @@
"mungkin bisa mempercepat, tapi Anda harus berhati-hati jangan sampai lupa\n"
"untuk tambahkan berkas baru sendiri (lihat 'git help status')."
-#: wt-status.c:1857
+#: wt-status.c:1878
#, c-format
msgid "Untracked files not listed%s"
msgstr "Berkas tak terlacak yang tak disebutkan%s"
-#: wt-status.c:1859
+#: wt-status.c:1880
msgid " (use -u option to show untracked files)"
msgstr " (gunakan opsi -u untuk melihat berkas yang tak terlacak)"
-#: wt-status.c:1865
+#: wt-status.c:1886
msgid "No changes"
msgstr "Tidak ada perubahan"
-#: wt-status.c:1870
+#: wt-status.c:1891
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"tidak ada perubahan untuk dikomit (gunakan \"git add\" dan/atau \"git commit "
"-a\")\n"
-#: wt-status.c:1874
+#: wt-status.c:1895
#, c-format
msgid "no changes added to commit\n"
msgstr "tidak ada perubahan untuk dikomit\n"
-#: wt-status.c:1878
+#: wt-status.c:1899
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9563,220 +10308,229 @@
"tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada(gunakan "
"\"git add\" untuk lacak)\n"
-#: wt-status.c:1882
+#: wt-status.c:1903
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada\n"
-#: wt-status.c:1886
+#: wt-status.c:1907
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"tidak ada yang dikomit (buat/salin berkas dan gunakan \"git add\" untuk "
"lacak)\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1911 wt-status.c:1917
#, c-format
msgid "nothing to commit\n"
msgstr "tidak ada yang dikomit\n"
-#: wt-status.c:1893
+#: wt-status.c:1914
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "tidak ada yang dikomit (gunakan -u untuk lihat berkas tak terlacak)\n"
-#: wt-status.c:1898
+#: wt-status.c:1919
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "tidak ada yang dikomit, pohon kerja bersih\n"
-#: wt-status.c:2003
+#: wt-status.c:2024
msgid "No commits yet on "
msgstr "Tidak ada komit apapun pada "
-#: wt-status.c:2007
+#: wt-status.c:2028
msgid "HEAD (no branch)"
msgstr "HEAD (tanpa cabang)"
-#: wt-status.c:2038
+#: wt-status.c:2059
msgid "different"
msgstr "berbeda"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2061 wt-status.c:2069
msgid "behind "
msgstr "di belakang "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2064 wt-status.c:2067
msgid "ahead "
msgstr "di depan "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2605
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "tidak dapat %s: Anda punya perubahan yang tidak digelar."
-#: wt-status.c:2575
+#: wt-status.c:2611
msgid "additionally, your index contains uncommitted changes."
msgstr "juga indeks Anda berisi perubahan yang belum dikomit."
-#: wt-status.c:2577
+#: wt-status.c:2613
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "tidak dapat %s: indeks Anda berisi perubahan yang belum dikomit."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:353
#, c-format
msgid "failed to unlink '%s'"
+msgstr "gagal menghapus tautan '%s'"
+
+#: compat/fsmonitor/fsm-listen-darwin.c:355
+msgid "Unable to create FSEventStream."
+msgstr ""
+
+#: compat/fsmonitor/fsm-listen-darwin.c:403
+msgid "Failed to start the FSEventStream"
msgstr ""
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opsi>] [--] <pathspec>..."
-#: builtin/add.c:61
+#: builtin/add.c:63
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "tidak dapat chmod %cx '%s'"
-#: builtin/add.c:99
+#: builtin/add.c:105
#, c-format
msgid "unexpected diff status %c"
msgstr "status diff tak diharapkan %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:110 builtin/commit.c:299
msgid "updating files failed"
msgstr "gagal memperbarui berkas"
-#: builtin/add.c:114
+#: builtin/add.c:120
#, c-format
msgid "remove '%s'\n"
msgstr "hapus '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:204
msgid "Unstaged changes after refreshing the index:"
msgstr "Perubahan tak tergelar setelah menyegarkan indeks:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:312 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Tidak dapat membaca indeks"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Tidak dapat membuka '%s' untuk ditulis."
-
-#: builtin/add.c:322
+#: builtin/add.c:325
msgid "Could not write patch"
msgstr "Tidak dapat menulis tambalan"
-#: builtin/add.c:325
+#: builtin/add.c:328
msgid "editing patch failed"
msgstr "Gagal menyunting tambalan"
-#: builtin/add.c:328
+#: builtin/add.c:331
#, c-format
msgid "Could not stat '%s'"
msgstr "Tidak dapat men-stat '%s'"
-#: builtin/add.c:330
+#: builtin/add.c:333
msgid "Empty patch. Aborted."
msgstr "Tambalan kosong. Dibatalkan."
-#: builtin/add.c:335
+#: builtin/add.c:339
#, c-format
msgid "Could not apply '%s'"
msgstr "Tidak dapat terapkan '%s'"
-#: builtin/add.c:343
+#: builtin/add.c:347
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Jalur berikut diabaikan oleh salah satu dari berkas .gitignore Anda:\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "latihan"
-#: builtin/add.c:366
+#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "jadi berkata-kata"
+
+#: builtin/add.c:370
msgid "interactive picking"
msgstr "pengambilan interaktif"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
msgid "select hunks interactively"
msgstr "pilih bingkah secara interaktif"
-#: builtin/add.c:368
+#: builtin/add.c:372
msgid "edit current diff and apply"
msgstr "sunting diff saat ini dan terapkan"
-#: builtin/add.c:369
+#: builtin/add.c:373
msgid "allow adding otherwise ignored files"
msgstr "perbolehkan tambah berkas yang diabaikan"
-#: builtin/add.c:370
+#: builtin/add.c:374
msgid "update tracked files"
msgstr "perbarui berkas terlacak"
-#: builtin/add.c:371
+#: builtin/add.c:375
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "normalisasi ulang EOL berkas terlacak (menyiratkan -u)"
-#: builtin/add.c:372
+#: builtin/add.c:376
msgid "record only the fact that the path will be added later"
msgstr "rekam hanya fakta bahwa jalur akan ditambahkan nanti"
-#: builtin/add.c:373
+#: builtin/add.c:377
msgid "add changes from all tracked and untracked files"
msgstr "tambahkan perubahan dari semua berkas terlacak dan tak terlacak"
-#: builtin/add.c:376
+#: builtin/add.c:380
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "abaikan jalur yang terhapus dari pohon kerja (sama dengan --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:382
msgid "don't add, only refresh the index"
msgstr "jangan tambahkan, hanya segarkan indeks"
-#: builtin/add.c:379
+#: builtin/add.c:383
msgid "just skip files which cannot be added because of errors"
msgstr "hanya lewatkan berkas yang tidak dapat ditambah karena error"
-#: builtin/add.c:380
+#: builtin/add.c:384
msgid "check if - even missing - files are ignored in dry run"
msgstr "periksa bahwa berkas yang - bahkan hilang - diabaikan dalam latihan"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "perbolehkan perbarui entri di luar kerucut checkout tipis"
+
+#: builtin/add.c:387 builtin/update-index.c:1023
msgid "override the executable bit of the listed files"
msgstr "timpa bit yang dapat dieksekusi dari berkas terdaftar"
-#: builtin/add.c:384
+#: builtin/add.c:389
msgid "warn when adding an embedded repository"
msgstr "peringatkan ketika menambahkan repositori tertanam"
-#: builtin/add.c:386
-msgid "backend for `git stash -p`"
-msgstr "tulang belakang untuk `git stash -p`"
-
-#: builtin/add.c:404
+#: builtin/add.c:407
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9807,12 +10561,12 @@
"\n"
"Lihat \"git help submodule\" untuk selengkapnya."
-#: builtin/add.c:432
+#: builtin/add.c:436
#, c-format
msgid "adding embedded git repository: %s"
msgstr "menambahkan repositori git tertanam: %s"
-#: builtin/add.c:451
+#: builtin/add.c:456
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -9822,51 +10576,27 @@
"Matikan pesan ini dengan menjalankan\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:471
msgid "adding files failed"
msgstr "gagal menambahkan berkas"
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run tidak kompatibel dengan --interactive/--patch"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file tidak kompatibel dengan --interactive/--patch"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file tidak kompatibel dengan --edit"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A dan -u saling tak kompatibel"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Opsi --ignore-missing hanya dapat digunakan bersama dengan --dry-run"
-
-#: builtin/add.c:526
+#: builtin/add.c:534
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod param '%s' harus berupa -x atau +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file tidak kompatibel dengan argumen pathspec"
+#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
+#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "'%s' dan argumen spek jalur tidak dapat digunakan bersamaan"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul butuh --pathspec-from-file"
-
-#: builtin/add.c:555
+#: builtin/add.c:566
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Tidak ada yang disebutkan, tidak ada yang ditambahkan.\n"
-#: builtin/add.c:557
+#: builtin/add.c:568
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -9876,431 +10606,460 @@
"Matikan pesan ini dengan menjalankan\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:393
msgid "could not parse author script"
-msgstr ""
+msgstr "tidak dapat mengurai skrip pengarang"
-#: builtin/am.c:455
+#: builtin/am.c:483
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr ""
+msgstr "'%s' dihapus oleh kail applypatch-msg"
-#: builtin/am.c:497
+#: builtin/am.c:525
#, c-format
msgid "Malformed input line: '%s'."
-msgstr ""
+msgstr "Baris masukan salah format: '%s'."
-#: builtin/am.c:535
+#: builtin/am.c:563
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
-msgstr ""
+msgstr "Gagal menyalin catatan dari '%s' ke '%s'"
-#: builtin/am.c:561
+#: builtin/am.c:589
msgid "fseek failed"
-msgstr ""
+msgstr "fseek gagal"
-#: builtin/am.c:749
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
-msgstr ""
+msgstr "tidak dapat mengurai tambalan '%s'"
-#: builtin/am.c:814
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
-msgstr ""
+msgstr "Hanya satu rangkaian tambalan StGIT yang bisa diterapkan sekaligus"
-#: builtin/am.c:862
+#: builtin/am.c:890
msgid "invalid timestamp"
-msgstr ""
+msgstr "stempel waktu tidak valid"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:895 builtin/am.c:907
msgid "invalid Date line"
-msgstr ""
+msgstr "baris Date tidak valid"
-#: builtin/am.c:874
+#: builtin/am.c:902
msgid "invalid timezone offset"
-msgstr ""
+msgstr "offset zona waktu tidak valid"
-#: builtin/am.c:967
+#: builtin/am.c:995
msgid "Patch format detection failed."
-msgstr ""
+msgstr "Pendeteksian format tambalan gagal."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:1000 builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
-msgstr ""
+msgstr "gagal membuat direktori '%s'"
-#: builtin/am.c:977
+#: builtin/am.c:1005
msgid "Failed to split patches."
-msgstr ""
+msgstr "Gagal memecah tambalan."
-#: builtin/am.c:1126
+#: builtin/am.c:1154
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr ""
+msgstr "Saat Anda sudah menyelesaikan masalah ini, jalankan \"%s --continue\"."
-#: builtin/am.c:1127
+#: builtin/am.c:1155
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
+"Jika Anda lebih suka melewati tambalan ini, jalankan \"%s --skip\" sebagai "
+"gantinya."
-#: builtin/am.c:1128
+#: builtin/am.c:1160
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Untuk merekam tambalan kosong sebagai komit kosong, jalankan \"%s --allow-"
+"empty\"."
+
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
+"Untuk mengembalikan cabang yang asli dan berhenti menambal, jalankan \"%s --"
+"abort\""
-#: builtin/am.c:1223
+#: builtin/am.c:1257
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
+"Tambalan dikirimkan dengan format=flowed; spasi pada akhir baris mungkin "
+"hilang."
-#: builtin/am.c:1251
-msgid "Patch is empty."
-msgstr ""
-
-#: builtin/am.c:1316
+#: builtin/am.c:1345
#, c-format
msgid "missing author line in commit %s"
-msgstr ""
+msgstr "baris pengarang hilang dalam komit %s"
-#: builtin/am.c:1319
+#: builtin/am.c:1348
#, c-format
msgid "invalid ident line: %.*s"
-msgstr ""
+msgstr "baris identitas tidak valid: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1567
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
+"Repositori kekurangan blob yang diperlukan untuk mundur ke penggabungan 3 "
+"arah."
-#: builtin/am.c:1540
+#: builtin/am.c:1569
msgid "Using index info to reconstruct a base tree..."
-msgstr ""
+msgstr "Menggunakan info indeks untuk membangun ulang sebuah pohon dasar..."
-#: builtin/am.c:1559
+#: builtin/am.c:1588
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
+"Apakah Anda menyunting tambalan Anda?\n"
+"Itu tidak diterapkan ke blob yang direkam dalam indeksnya."
-#: builtin/am.c:1565
+#: builtin/am.c:1594
msgid "Falling back to patching base and 3-way merge..."
-msgstr ""
+msgstr "Mundur ke penambalan dasar dan penggabungan 3 arah..."
-#: builtin/am.c:1591
+#: builtin/am.c:1620
msgid "Failed to merge in the changes."
-msgstr ""
+msgstr "Gagal menggabungkan perubahan."
-#: builtin/am.c:1623
+#: builtin/am.c:1652
msgid "applying to an empty history"
-msgstr ""
+msgstr "menerapkan ke sebuah riwayat kosong"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1704 builtin/am.c:1708
#, c-format
msgid "cannot resume: %s does not exist."
-msgstr ""
+msgstr "tidak dapat melanjutkan: %s tidak ada."
-#: builtin/am.c:1697
+#: builtin/am.c:1726
msgid "Commit Body is:"
-msgstr ""
+msgstr "Badan komit adalah:"
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1736
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
+"Terapkan? [y]a/[n] tidak/[e] sunting/[v] lihat tambalan/terim[a] semua: "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1782 builtin/commit.c:410
msgid "unable to write index file"
-msgstr ""
+msgstr "tidak dapat menulis berkas indeks"
-#: builtin/am.c:1757
+#: builtin/am.c:1786
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr ""
+msgstr "Indeks kotor: tidak dapat menerapkan tambalan (kotor: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1828
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Melewatkan: %.*s"
+
+#: builtin/am.c:1833
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Membuat sebuah komit kosong: %.*s"
+
+#: builtin/am.c:1837
+msgid "Patch is empty."
+msgstr "Tambalan kosong."
+
+#: builtin/am.c:1848 builtin/am.c:1917
#, c-format
msgid "Applying: %.*s"
-msgstr ""
+msgstr "Menerapkan: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1865
msgid "No changes -- Patch already applied."
-msgstr ""
+msgstr "Tidak ada perubahan -- tambalan sudah diterapkan"
-#: builtin/am.c:1820
+#: builtin/am.c:1871
#, c-format
msgid "Patch failed at %s %.*s"
-msgstr ""
+msgstr "Penambalan gagal pada %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1875
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
+"Gunakan 'git am --show-current-patch=diff' untuk melihat tambalan yang gagal"
-#: builtin/am.c:1868
+#: builtin/am.c:1921
+msgid "No changes - recorded it as an empty commit."
+msgstr "Tidak ada perubahan - direkam sebagai komit kosong."
+
+#: builtin/am.c:1923
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 ""
+"Tidak ada perubahan - apakah Anda lupa untuk menggunakan 'git add'?\n"
+"Jika tidak ada lagi yang diterapkan, sepertinya sesuatu yang lain sudah \n"
+"memasukkan perubahan yang sama; mungkin Anda ingin melewatkan tambalan ini."
-#: builtin/am.c:1875
+#: builtin/am.c:1931
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"such.\n"
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
+"Anda masih punya jalur yang belum digabung pada indeks Anda.\n"
+"Anda harus 'git add' setiap berkas dengan konflik terselesai untuk "
+"menandainya.\n"
+"Anda mungkin jalankan `git rm` pada berkas untuk menerima \"penghapusan oleh "
+"mereka\" untuk itu."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
+#: builtin/reset.c:463
#, c-format
msgid "Could not parse object '%s'."
msgstr "Tidak dapat mengurai objek '%s'."
-#: builtin/am.c:2034
+#: builtin/am.c:2091 builtin/am.c:2167
msgid "failed to clean index"
-msgstr ""
+msgstr "gagal membersihkan indeks"
-#: builtin/am.c:2078
+#: builtin/am.c:2135
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
+"Sepertinya Anda telah memindahkan HEAD sejak kegagalan 'am' terakhir.\n"
+"Tidak memutar ulang ke ORIG_HEAD"
-#: builtin/am.c:2185
+#: builtin/am.c:2292
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr ""
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "Opsi '%s=%s' dan '%s=%s' tidak dapat digunakan bersamaan"
-#: builtin/am.c:2227
-#, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr ""
-
-#: builtin/am.c:2231
-#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr ""
-
-#: builtin/am.c:2262
+#: builtin/am.c:2323
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
-msgstr ""
+msgstr "git am [<opsi>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2324
msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr ""
-
-#: builtin/am.c:2269
-msgid "run interactively"
-msgstr ""
-
-#: builtin/am.c:2271
-msgid "historical option -- no-op"
-msgstr ""
-
-#: builtin/am.c:2273
-msgid "allow fall back on 3way merging if needed"
-msgstr ""
-
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
-msgid "be quiet"
-msgstr ""
-
-#: builtin/am.c:2276
-msgid "add a Signed-off-by trailer to the commit message"
-msgstr ""
-
-#: builtin/am.c:2279
-msgid "recode into utf8 (default)"
-msgstr ""
-
-#: builtin/am.c:2281
-msgid "pass -k flag to git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2283
-msgid "pass -b flag to git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2285
-msgid "pass -m flag to git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2287
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr ""
-
-#: builtin/am.c:2290
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr ""
-
-#: builtin/am.c:2293
-msgid "strip everything before a scissors line"
-msgstr ""
-
-#: builtin/am.c:2295
-msgid "pass it through git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
-msgid "pass it through git-apply"
-msgstr ""
-
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
-msgid "n"
-msgstr ""
-
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
-#: builtin/verify-tag.c:38
-msgid "format"
-msgstr ""
-
-#: builtin/am.c:2322
-msgid "format the patch(es) are in"
-msgstr ""
-
-#: builtin/am.c:2328
-msgid "override error message when patch failure occurs"
-msgstr ""
+msgstr "git am [<opsi>] (--continue | --skip | --abort)"
#: builtin/am.c:2330
-msgid "continue applying patches after resolving a conflict"
-msgstr ""
+msgid "run interactively"
+msgstr "jalankan secara interaktif"
-#: builtin/am.c:2333
-msgid "synonyms for --continue"
-msgstr ""
+#: builtin/am.c:2332
+msgid "historical option -- no-op"
+msgstr "opsi bersejarah -- no-op"
-#: builtin/am.c:2336
-msgid "skip the current patch"
-msgstr ""
+#: builtin/am.c:2334
+msgid "allow fall back on 3way merging if needed"
+msgstr "perbolehkan mundur ke penggabungan 3 arah jika diperlukan"
-#: builtin/am.c:2339
-msgid "restore the original branch and abort the patching operation"
-msgstr ""
+#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:646 builtin/stash.c:946
+msgid "be quiet"
+msgstr "jadi senyap"
+
+#: builtin/am.c:2337
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "tambahkan trailer Signed-off-by kepada pesan komit"
+
+#: builtin/am.c:2340
+msgid "recode into utf8 (default)"
+msgstr "koding ulang ke dalam utf8 (asali)"
#: builtin/am.c:2342
-msgid "abort the patching operation but keep HEAD where it is"
-msgstr ""
+msgid "pass -k flag to git-mailinfo"
+msgstr "lewatkan opsi -k ke git-mailinfo"
+
+#: builtin/am.c:2344
+msgid "pass -b flag to git-mailinfo"
+msgstr "lewatkan opsi -b ke git-mailinfo"
#: builtin/am.c:2346
-msgid "show the patch being applied"
-msgstr ""
+msgid "pass -m flag to git-mailinfo"
+msgstr "lewatkan opsi -m ke git-mailinfo"
+
+#: builtin/am.c:2348
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "lewatkan opsi --keep-cr ke git-mailsplit untuk format mbox"
#: builtin/am.c:2351
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+"jangan lewatkan opsi --keep-cr ke git-mailsplit tak bergantung pada am.keepcr"
+
+#: builtin/am.c:2354
+msgid "strip everything before a scissors line"
+msgstr "copot semuanya sebelum garis gunting"
+
+#: builtin/am.c:2356
+msgid "pass it through git-mailinfo"
+msgstr "lewatkannya melalui git-mailinfo"
+
+#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
+#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
+#: builtin/am.c:2386
+msgid "pass it through git-apply"
+msgstr "lewatkannya melalui git-apply"
+
+#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
+#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
+#: parse-options.h:348
+msgid "n"
+msgstr "n"
+
+#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
+#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
+#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
+#: builtin/tag.c:480 builtin/verify-tag.c:38
+msgid "format"
+msgstr "format"
+
+#: builtin/am.c:2383
+msgid "format the patch(es) are in"
+msgstr "format tambalan yang ada di"
+
+#: builtin/am.c:2389
+msgid "override error message when patch failure occurs"
+msgstr "timpa pesan error ketika kegagalan penambalan terjadi"
+
+#: builtin/am.c:2391
+msgid "continue applying patches after resolving a conflict"
+msgstr "lanjutkan penerapan tambalan setelah menyelesaikan konflik"
+
+#: builtin/am.c:2394
+msgid "synonyms for --continue"
+msgstr "sinonim untuk --continue"
+
+#: builtin/am.c:2397
+msgid "skip the current patch"
+msgstr "lewati tambalan saat ini"
+
+#: builtin/am.c:2400
+msgid "restore the original branch and abort the patching operation"
+msgstr "kembalikan cabang asli dan batalkan operasi penambalan"
+
+#: builtin/am.c:2403
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "batalkan operasi penambalan tetapi simpan HEAD dimanapun itu"
+
+#: builtin/am.c:2407
+msgid "show the patch being applied"
+msgstr "perlihatkan tambalan yang diterapkan"
+
+#: builtin/am.c:2411
+msgid "record the empty patch as an empty commit"
+msgstr "rekam tambalan kosong sebagai komit kosong"
+
+#: builtin/am.c:2415
msgid "lie about committer date"
-msgstr ""
+msgstr "berbohong soal tanggal pengkomit"
-#: builtin/am.c:2353
+#: builtin/am.c:2417
msgid "use current timestamp for author date"
-msgstr ""
+msgstr "gunakan stempel waktu saat ini untuk tanggal pengarang"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
+#: builtin/revert.c:117 builtin/tag.c:461
msgid "key-id"
-msgstr ""
+msgstr "key-id"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2420 builtin/rebase.c:1128
msgid "GPG-sign commits"
-msgstr ""
+msgstr "tandatangani komit dengan GPG"
-#: builtin/am.c:2359
+#: builtin/am.c:2423
+msgid "how to handle empty patches"
+msgstr "bagaimana cara menangani tambalan kosong"
+
+#: builtin/am.c:2426
msgid "(internal use for git-rebase)"
-msgstr ""
+msgstr "(penggunaan internal untuk git-rebase)"
-#: builtin/am.c:2377
+#: builtin/am.c:2444
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 ""
+"Opsi -b/--binary telah menjadi no-op untuk waktu yang lama, dan\n"
+"itu akan dihapus. Mohon jangan gunakan itu lagi."
-#: builtin/am.c:2384
+#: builtin/am.c:2451
msgid "failed to read the index"
-msgstr ""
+msgstr "gagal membaca indeks"
-#: builtin/am.c:2399
+#: builtin/am.c:2466
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
+"direktori pendasaran ulang sebelumnya %s masih ada tapi mbox diberikan."
-#: builtin/am.c:2423
+#: builtin/am.c:2490
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
+"Direktori menyimpang %s ditemukan.\n"
+"Gunakan \"git am --abort\" untuk menghapusnya."
-#: builtin/am.c:2429
+#: builtin/am.c:2496
msgid "Resolve operation not in progress, we are not resuming."
-msgstr ""
+msgstr "Operasi penguraian tidak berjalan, kami tidak melanjutkan."
-#: builtin/am.c:2439
+#: builtin/am.c:2506
msgid "interactive mode requires patches on the command line"
-msgstr ""
+msgstr "mode interaktif butuh tambalan pada baris perintah"
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
-msgstr ""
+msgstr "git apply [<opsi>] [<tambalan>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr ""
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
-msgstr ""
+msgstr "tidak dapat mengalihkan keluaran"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
-msgstr ""
+msgstr "git archive: Remote tanpa URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
-msgstr ""
+msgstr "git archive: ACK/NAK diharapkan, dapat paket bilasan"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
-msgstr ""
+msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
-msgstr ""
+msgstr "git archive: kesalahan protokol"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
-msgstr ""
-
-#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr "git bisect--helper --bisect-reset [<komit>]"
+msgstr "git archive: sebuah bilasan diharapkan"
#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <istilah bagus> <istilah jelek> "
-"[<istilah>]"
-
-#: builtin/bisect--helper.c:25
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<komit>]"
#: builtin/bisect--helper.c:26
msgid ""
@@ -10312,10 +11071,6 @@
"good}=<istilah>] [--no-checkout] [--first-parent] [<jelek> [<bagus>...]] "
"[--] [<jalur>...]"
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-next"
-
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
msgstr "git bisect--helper --bisect-state (bad|new) [<revisi>]"
@@ -10332,73 +11087,82 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<revisi>|<rentang>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <perintah>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "tidak dapat membuka berkas '%s' dalam mode '%s'"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "tidak dapat menulis ke berkas '%s'"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "tidak dapat membuka berkas '%s' untuk dibaca"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' bukan istilah yang valid"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "tidak dapat menggunakan perintah bawaan '%s' sebagai istilah"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "tidak dapat mengubah makna istilah '%s'"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "mohon gunakan dua istilah yang berbeda"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "Kami tidak sedang membagi dua.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' bukan sebuah komit yang valid"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
"tidak dapat men-checkout HEAD asli '%s'. Coba 'git bisect reset <komit>'."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "argument bisect_write jelek: %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "tidak dapat mendapatkan oid revisi '%s'"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "tidak dapat membuka berkas '%s'"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Perintah tidak valid: sekarang Anda berada dalam pembagian dua %s/%s"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10407,7 +11171,7 @@
"Anda perlu berikan saya setidaknya satu revisi %s dan %s.\n"
"Untuk itu Anda dapat menggunakan \"git bisect %s\" dan \"git bisect %s\"."
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10418,7 +11182,7 @@
"Lalu Anda perlu berikan saya setidaknya satu revisi %s dan %s.\n"
"Untuk itu Anda dapat menggunakan \"git bisect %s\" dan \"git bisect %s\"."
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "membagi dua hanya dengan sebuah komit %s"
@@ -10427,15 +11191,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Anda yakin [Y/n]?"
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "tidak ada istilah yang didefinisikan"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10444,7 +11208,7 @@
"Istilah Anda saat ini adalah %s untuk keadaan lama\n"
"dan %s untuk keadaan baru.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10453,52 +11217,52 @@
"argumen %s tidak valid untuk 'git bisect terms'.\n"
"Opsi yang didukung adalah: --term-good|--term-old dan --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "setup jalan revisi gagal\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "tidak dapat membuka '%s' untuk menambahkan"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' bukan istilah yang valid"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "opsi tidak dikenal: '%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' sepertinya bukan revisi valid"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "HEAD jelek - saya butuh HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "gagal men-checkout '%s'. Coba 'git bisect start <cabang valid>'."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "tidak akan membagi dua pada pohon yang di-cg-seek"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "HEAD jelek - referensi simbolik aneh"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "referensi tidak valid: '%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Anda perlu memulai dengan \"git bisect start\"\n"
@@ -10506,104 +11270,160 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Anda ingin saya melakukannya untuk Anda [Y/n]"
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Mohon panggil `--bisect-state` dengan setidaknya satu argumen"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' hanya dapat mengambil satu argumen."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Masukan revisi jelek: %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Masukan revisi jelek (bukan sebuah komit): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Kami tidak sedang membagi dua."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "'%s'?? Anda bilang tentang apa?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "tidak dapat membuka berkas '%s' untuk memainkan ulang"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#, c-format
+msgid "running %s\n"
+msgstr "menjalankan %s\n"
+
+#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+msgid "bisect run failed: no command provided."
+msgstr "bisect run gagal: tidak ada perintah yang diberikan"
+
+#: builtin/bisect--helper.c:1166
+#, c-format
+msgid "unable to verify '%s' on good revision"
+msgstr "tidak dapat memverifikasi '%s' pada revisi bagus"
+
+#: builtin/bisect--helper.c:1172
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr "kode keluar gadungan %d untuk revisi bagu"
+
+#: builtin/bisect--helper.c:1180
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "bisect run gagal: kode keluar %d dari '%s' < 0 atau >= 128"
+
+#: builtin/bisect--helper.c:1195
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "tidak dapat membuka berkas '%s' untuk ditulis"
+
+#: builtin/bisect--helper.c:1213
+msgid "bisect run cannot continue any more"
+msgstr "bisect run tidak dapat dilanjutkan lagi"
+
+#: builtin/bisect--helper.c:1215
+#, c-format
+msgid "bisect run success"
+msgstr "bisect run sukses"
+
+#: builtin/bisect--helper.c:1218
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "pembagian dua menemukan komit jelek pertama"
+
+#: builtin/bisect--helper.c:1221
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"bisect run gagal: 'git bisect--helper --bisect-state %s' keluar dengan kode "
+"keluar %d"
+
+#: builtin/bisect--helper.c:1253
msgid "reset the bisection state"
msgstr "setel ulang keadaan pembagian dua"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1255
msgid "check whether bad or good terms exist"
msgstr "periksa apakah ada istilah jelek atau bagus"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1257
msgid "print out the bisect terms"
msgstr "cetak istilah pembagian dua"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1259
msgid "start the bisect session"
msgstr "mulai sesi pembagian dua"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1261
msgid "find the next bisection commit"
msgstr "temukan komit pembagian dua berikutnya"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1263
msgid "mark the state of ref (or refs)"
msgstr "tandai keadaan referensi"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1265
msgid "list the bisection steps so far"
msgstr "daftar langkah pembagian dua sejauh ini"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1267
msgid "replay the bisection process from the given file"
msgstr "mainkan ulang proses pembagian dua dari berkas yang diberikan"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1269
msgid "skip some commits for checkout"
msgstr "lewati beberapa komit untuk checkout"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1271
+msgid "visualize the bisection"
+msgstr "visualisasikan pembagian dua"
+
+#: builtin/bisect--helper.c:1273
+msgid "use <cmd>... to automatically bisect"
+msgstr "gunakan <cmd>... untuk bagi dua otomatis."
+
+#: builtin/bisect--helper.c:1275
msgid "no log for BISECT_WRITE"
msgstr "tidak ada log untuk BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1290
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset butuh baik tanpa argumen atau sebuah komit"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check butuh 2 atau 3 argumen"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1295
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms butuh 0 atau 1 argumen"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1304
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next butuh 0 argumen"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1315
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log butuh 0 argumen"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1320
msgid "no logfile given"
msgstr "tidak ada berkas log yang diberikan"
@@ -10615,149 +11435,142 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<opsi revisi> didokumentasikan dalam git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "mengharapkan warna: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "harus berakhir dengan warna"
-#: builtin/blame.c:728
-#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "warna tidak valid '%s' pada color.blame.repeatedLines"
-
-#: builtin/blame.c:746
-msgid "invalid value for blame.coloring"
-msgstr "nilai tidak valid untuk blame.coloring"
-
-#: builtin/blame.c:845
+#: builtin/blame.c:842
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "tidak dapat menemukan revisi %s untuk diabaikan"
-#: builtin/blame.c:867
+#: builtin/blame.c:864
msgid "show blame entries as we find them, incrementally"
msgstr "perlihatkan entri penyalahan seperti yang kami temukan secara bertahap"
-#: builtin/blame.c:868
+#: builtin/blame.c:865
msgid "do not show object names of boundary commits (Default: off)"
msgstr "jangan perlihatkan nama objek dari komit perbatasan (asali: off)"
-#: builtin/blame.c:869
+#: builtin/blame.c:866
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "jangan perlakukan komit akar sebagai perbatasan (asali: off)"
-#: builtin/blame.c:870
+#: builtin/blame.c:867
msgid "show work cost statistics"
msgstr "perlihatkan statistik biaya usaha"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
+#: builtin/remote.c:683 builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "paksa laporkan perkembangan"
-#: builtin/blame.c:872
+#: builtin/blame.c:869
msgid "show output score for blame entries"
msgstr "perlihatkan nilai keluaran untuk entri penyalahan"
-#: builtin/blame.c:873
+#: builtin/blame.c:870
msgid "show original filename (Default: auto)"
msgstr "perlihatkan nama berkas asli (asali: auto)"
-#: builtin/blame.c:874
+#: builtin/blame.c:871
msgid "show original linenumber (Default: off)"
msgstr "perlihatkan nomor baris asli (asali: off)"
-#: builtin/blame.c:875
+#: builtin/blame.c:872
msgid "show in a format designed for machine consumption"
msgstr "perlihatkan dalam format yang didesain untuk konsumsi mesin"
-#: builtin/blame.c:876
+#: builtin/blame.c:873
msgid "show porcelain format with per-line commit information"
msgstr "perlihatkan format porselen dengan informasi komit per baris"
-#: builtin/blame.c:877
+#: builtin/blame.c:874
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "gunakan mode keluaran yang sama dengan git-annotate (asali: off)"
-#: builtin/blame.c:878
+#: builtin/blame.c:875
msgid "show raw timestamp (Default: off)"
msgstr "perlihatkan stempel waktu mentah (asali: off)"
-#: builtin/blame.c:879
+#: builtin/blame.c:876
msgid "show long commit SHA1 (Default: off)"
msgstr "perlihatkan SHA1 komit panjang (asali: off)"
-#: builtin/blame.c:880
+#: builtin/blame.c:877
msgid "suppress author name and timestamp (Default: off)"
msgstr "sembunyikan nama pengarang dan stempel waktu (asali: off)"
-#: builtin/blame.c:881
+#: builtin/blame.c:878
msgid "show author email instead of name (Default: off)"
msgstr "perlihatkan email pengarang daripada nama (asali: off)"
-#: builtin/blame.c:882
+#: builtin/blame.c:879
msgid "ignore whitespace differences"
msgstr "abaikan perbedaan spasi putih"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:880 builtin/log.c:1857
msgid "rev"
msgstr "revisi"
-#: builtin/blame.c:883
+#: builtin/blame.c:880
msgid "ignore <rev> when blaming"
msgstr "abaikan <revisi> ketika menyalahkan"
-#: builtin/blame.c:884
+#: builtin/blame.c:881
msgid "ignore revisions from <file>"
msgstr "abaikan revisi dari <berkas>"
-#: builtin/blame.c:885
+#: builtin/blame.c:882
msgid "color redundant metadata from previous line differently"
msgstr "metadata warna berlebihan dari baris sebelumnya secara berbeda"
-#: builtin/blame.c:886
+#: builtin/blame.c:883
msgid "color lines by age"
msgstr "warnai baris oleh umur"
-#: builtin/blame.c:887
+#: builtin/blame.c:884
msgid "spend extra cycles to find better match"
msgstr "perlihatkan siklus ekstra untuk menemukan cocokan yang lebih baik"
-#: builtin/blame.c:888
+#: builtin/blame.c:885
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "gunakan revisi dari <berkas> daripada memanggil git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:886
msgid "use <file>'s contents as the final image"
msgstr "gunakan konten <berkas> sebagai citra final"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:887 builtin/blame.c:888
msgid "score"
msgstr "nilai"
-#: builtin/blame.c:890
+#: builtin/blame.c:887
msgid "find line copies within and across files"
msgstr "temukan salinan baris di dalam dan di seluruh berkas"
-#: builtin/blame.c:891
+#: builtin/blame.c:888
msgid "find line movements within and across files"
msgstr "temukan gerakan baris di dalam dan di seluruh baris"
-#: builtin/blame.c:892
+#: builtin/blame.c:889
msgid "range"
msgstr "rentang"
-#: builtin/blame.c:893
+#: builtin/blame.c:890
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "hanya proses rentang baris <awal>,<akhir> atau fungsi :<nama fungsi>"
-#: builtin/blame.c:945
+#: builtin/blame.c:949
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress tidak dapat digunakan dengan --incremental atau format porselen"
@@ -10770,18 +11583,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:1000
msgid "4 years, 11 months ago"
msgstr "4 tahun, 11 bulan yang lalu"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1116
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "berkas %s hanya punya %lu baris"
msgstr[1] "berkas %s hanya punya %lu baris"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1161
msgid "Blaming lines"
msgstr "Menyalahkan baris"
@@ -10790,30 +11603,37 @@
msgstr "git branch [<opsi>] [-r | -a] [--merged] [--no-merged]"
#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<opsi>] [-l] [-f] <nama-cabang> [<titik-awal>]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr ""
+"git branch [<opsi>] [-f] [--recurse-submodules] <nama-cabang> [<titik-awal>]"
#: builtin/branch.c:31
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<opsi>] [-l] [<pola>...]"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<opsi> [-r] (-d | -D) <nama-cabang>...]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<opsi>] (-m | -M) [<cabang-lama>] <cabang-baru>"
-#: builtin/branch.c:33
+#: builtin/branch.c:34
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<opsi>] (-c | -C) [<cabang-lama>] <cabang-baru>"
-#: builtin/branch.c:34
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<opsi>] [-r | -a] [--points-at]"
-#: builtin/branch.c:35
+#: builtin/branch.c:36
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opsi>] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:165
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -10822,7 +11642,7 @@
"menghapus cabang '%s' yang sudah digabungkan ke\n"
" '%s', tapi belum digabungkan ke HEAD."
-#: builtin/branch.c:158
+#: builtin/branch.c:169
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -10831,12 +11651,12 @@
"tidak menghapus cabang '%s' yang belum digabungkan ke\n"
" '%s', walaupun tergabung ke HEAD."
-#: builtin/branch.c:172
+#: builtin/branch.c:183
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Tidak dapat mencari objek komit untuk '%s'"
-#: builtin/branch.c:176
+#: builtin/branch.c:187
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -10845,111 +11665,111 @@
"Cabang '%s' belum sepenuhnya tergabung.\n"
"Kalau Anda yakin ingin menghapus itu, jalankan 'git branch -D %s'."
-#: builtin/branch.c:189
+#: builtin/branch.c:200
msgid "Update of config-file failed"
msgstr "Pembaruan berkas konfigurasi gagal"
-#: builtin/branch.c:223
+#: builtin/branch.c:235
msgid "cannot use -a with -d"
msgstr "tidak dapat gunakan -a dengan -d"
-#: builtin/branch.c:230
+#: builtin/branch.c:242
msgid "Couldn't look up commit object for HEAD"
msgstr "Tidak dapat mencari objek komit untuk HEAD"
-#: builtin/branch.c:244
+#: builtin/branch.c:259
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Tidak dapat menghapus cabang '%s' yang ter-checkout pada '%s'"
-#: builtin/branch.c:259
+#: builtin/branch.c:274
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "cabang pelacak remote '%s' tidak ditemukan."
-#: builtin/branch.c:260
+#: builtin/branch.c:275
#, c-format
msgid "branch '%s' not found."
msgstr "cabang '%s' tidak ditemukan."
-#: builtin/branch.c:291
+#: builtin/branch.c:306
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Cabang pelacak remote %s (yaitu %s) dihapus.\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:307
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Cabang %s (yaitu %s) dihapus.\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:457 builtin/tag.c:64
msgid "unable to parse format string"
msgstr "tidak dapat menguraikan untai format"
-#: builtin/branch.c:471
+#: builtin/branch.c:488
msgid "could not resolve HEAD"
msgstr "tidak dapat menguraikan HEAD"
-#: builtin/branch.c:477
+#: builtin/branch.c:494
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) merujuk diluar refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:509
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Cabang %s sedang didasarkan ulang pada %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:513
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Cabang %s sedang dibagi dua pada %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:530
msgid "cannot copy the current branch while not on any."
msgstr "tidak dapat menyalin cabang saat ini ketika tidak ada."
-#: builtin/branch.c:515
+#: builtin/branch.c:532
msgid "cannot rename the current branch while not on any."
msgstr "tidak dapat mengganti nama cabang saat ini ketika tidak ada."
-#: builtin/branch.c:526
+#: builtin/branch.c:543
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nama cabang tidak valid: '%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:572
msgid "Branch rename failed"
msgstr "Penggantian nama cabang gagal"
-#: builtin/branch.c:557
+#: builtin/branch.c:574
msgid "Branch copy failed"
msgstr "Penyalinan cabang gagal"
-#: builtin/branch.c:561
+#: builtin/branch.c:578
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Salinan cabang salah nama '%s' dibuat"
-#: builtin/branch.c:564
+#: builtin/branch.c:581
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Cabang salah nama '%s' berganti nama"
-#: builtin/branch.c:570
+#: builtin/branch.c:587
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Cabang berganti nama ke %s, tapi HEAD tidak diperbarui!"
-#: builtin/branch.c:579
+#: builtin/branch.c:596
msgid "Branch is renamed, but update of config-file failed"
msgstr "Cabang berganti nama, tapi pembaruan berkas konfigurasi gagal"
-#: builtin/branch.c:581
+#: builtin/branch.c:598
msgid "Branch is copied, but update of config-file failed"
msgstr "Cabang disalin, tapi pembaruan berkas konfigurasi gagal"
-#: builtin/branch.c:597
+#: builtin/branch.c:614
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -10960,180 +11780,193 @@
" %s\n"
"Baris yang diawali dengan '%c' akan dicopot.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Opsi generik"
-#: builtin/branch.c:633
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "perlihatkan hash dan subjek, berikan dua kali untuk cabang hulu"
-#: builtin/branch.c:634
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "sembunyikan pesan informasi"
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "pasang mode pelacakan (lihat git-pull(1))"
+#: builtin/branch.c:656 builtin/checkout.c:1571
+#: builtin/submodule--helper.c:3077
+msgid "set branch tracking configuration"
+msgstr "setel konfigurasi pelacakan cabang"
-#: builtin/branch.c:637
+#: builtin/branch.c:659
msgid "do not use"
msgstr "jangan gunakan"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:661
msgid "upstream"
msgstr "hulu"
-#: builtin/branch.c:639
+#: builtin/branch.c:661
msgid "change the upstream info"
msgstr "ubah info hulu"
-#: builtin/branch.c:640
+#: builtin/branch.c:662
msgid "unset the upstream info"
msgstr "batal-setel info hulu"
-#: builtin/branch.c:641
+#: builtin/branch.c:663
msgid "use colored output"
msgstr "gunakan keluaran berwarna"
-#: builtin/branch.c:642
+#: builtin/branch.c:664
msgid "act on remote-tracking branches"
msgstr "lakukan pada cabang pelacak remote"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:666 builtin/branch.c:668
msgid "print only branches that contain the commit"
msgstr "cetak hanya cabang yang berisi komit"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:667 builtin/branch.c:669
msgid "print only branches that don't contain the commit"
msgstr "cetak hanya cabang yang tak berisi komit"
-#: builtin/branch.c:650
+#: builtin/branch.c:672
msgid "Specific git-branch actions:"
msgstr "Aksi git-branch spesifik:"
-#: builtin/branch.c:651
+#: builtin/branch.c:673
msgid "list both remote-tracking and local branches"
msgstr "sebut baik cabang pelacak remote dan cabang lokal"
-#: builtin/branch.c:653
+#: builtin/branch.c:675
msgid "delete fully merged branch"
msgstr "hapus cabang yang tergabung sepenuhnya"
-#: builtin/branch.c:654
+#: builtin/branch.c:676
msgid "delete branch (even if not merged)"
msgstr "hapus cabang (walaupun tak tergabung)"
-#: builtin/branch.c:655
+#: builtin/branch.c:677
msgid "move/rename a branch and its reflog"
msgstr "pindah/ganti nama cabang dan reflog-nya"
-#: builtin/branch.c:656
+#: builtin/branch.c:678
msgid "move/rename a branch, even if target exists"
msgstr "pindah/ganti nama cabang, walaupun target ada"
-#: builtin/branch.c:657
+#: builtin/branch.c:679
msgid "copy a branch and its reflog"
msgstr "salin cabang dan reflog-nya"
-#: builtin/branch.c:658
+#: builtin/branch.c:680
msgid "copy a branch, even if target exists"
msgstr "salin cabang, walapun target ada"
-#: builtin/branch.c:659
+#: builtin/branch.c:681
msgid "list branch names"
msgstr "sebut nama cabang"
-#: builtin/branch.c:660
+#: builtin/branch.c:682
msgid "show current branch name"
msgstr "perlihatkan nama cabang saat ini"
-#: builtin/branch.c:661
+#: builtin/branch.c:683 builtin/submodule--helper.c:3075
msgid "create the branch's reflog"
msgstr "buat reflog cabang"
-#: builtin/branch.c:663
+#: builtin/branch.c:685
msgid "edit the description for the branch"
msgstr "sunting deskripsi cabang"
-#: builtin/branch.c:664
+#: builtin/branch.c:686
msgid "force creation, move/rename, deletion"
msgstr "paksa buat, pindah/ganti nama, hapus"
-#: builtin/branch.c:665
+#: builtin/branch.c:687
msgid "print only branches that are merged"
msgstr "cetak hanya cabang yang tergabung"
-#: builtin/branch.c:666
+#: builtin/branch.c:688
msgid "print only branches that are not merged"
msgstr "cetak hanya cabang yang tak tergabung"
-#: builtin/branch.c:667
+#: builtin/branch.c:689
msgid "list branches in columns"
msgstr "sebut cabang dalam kolom"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:476
msgid "object"
msgstr "objek"
-#: builtin/branch.c:670
+#: builtin/branch.c:692
msgid "print only branches of the object"
msgstr "cetak hanya cabang objek"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
msgid "sorting and filtering are case insensitive"
msgstr "pengurutan dan penyaringan tak peka kapital"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:694 builtin/ls-files.c:667
+msgid "recurse through submodules"
+msgstr "rekursi melalui submodul"
+
+#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
+#: builtin/tag.c:481 builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format yang digunakan untuk keluaran"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:718 builtin/clone.c:684
msgid "HEAD not found below refs/heads!"
msgstr "HEAD tidak ditemukan di bawah refs/heads!"
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column dan --verbose tidak kompatibel"
+#: builtin/branch.c:739
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
+"cabang dengan --recurse-submodules hanya dapat digunakan jika submodule."
+"propagateBranches diaktifkan"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:741
+msgid "--recurse-submodules can only be used to create branches"
+msgstr "--recurse-submodules hanya dapat digunakan untuk membuat cabang"
+
+#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
msgid "branch name required"
msgstr "nama cabang diperlukan"
-#: builtin/branch.c:766
+#: builtin/branch.c:802
msgid "Cannot give description to detached HEAD"
msgstr "Tidak dapat memberikan deskripsi ke HEAD terpisah"
-#: builtin/branch.c:771
+#: builtin/branch.c:807
msgid "cannot edit description of more than one branch"
msgstr "tidak dapat menyunting deskripsi lebih dari satu cabang"
-#: builtin/branch.c:778
+#: builtin/branch.c:814
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Belum ada komit pada cabang '%s'."
-#: builtin/branch.c:781
+#: builtin/branch.c:817
#, c-format
msgid "No branch named '%s'."
msgstr "Tidak ada cabang bernama '%s'."
-#: builtin/branch.c:796
+#: builtin/branch.c:832
msgid "too many branches for a copy operation"
msgstr "terlalu banyak cabang untuk operasi penyalinan"
-#: builtin/branch.c:805
+#: builtin/branch.c:841
msgid "too many arguments for a rename operation"
msgstr "terlalu banyak argumen untuk operasi penggantian nama"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "too many arguments to set new upstream"
msgstr "terlalu banyak argumen untuk menyetel hulu baru"
-#: builtin/branch.c:814
+#: builtin/branch.c:850
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11141,32 +11974,32 @@
"tidak dapat menyetel hulu HEAD ke %s ketika itu tak menunjuk pada cabang "
"apapun."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:853 builtin/branch.c:873
#, c-format
msgid "no such branch '%s'"
msgstr "tidak ada cabang '%s'"
-#: builtin/branch.c:821
+#: builtin/branch.c:857
#, c-format
msgid "branch '%s' does not exist"
msgstr "cabang '%s' tidak ada"
-#: builtin/branch.c:834
+#: builtin/branch.c:867
msgid "too many arguments to unset upstream"
msgstr "terlalu banyak argumen untuk batal-setel hulu"
-#: builtin/branch.c:838
+#: builtin/branch.c:871
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"tidak dapat membatal-setel hulu HEAD ketika itu tak menunjuk pada cabang "
"apapun."
-#: builtin/branch.c:844
+#: builtin/branch.c:877
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Cabang '%s' tidak ada informasi hulu"
-#: builtin/branch.c:854
+#: builtin/branch.c:890
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>?"
@@ -11174,7 +12007,7 @@
"Opsi -a dan -r tidak mengambil nama cabang.\n"
"Mungkin maksud Anda gunakan: -a|-r --list <pola>?"
-#: builtin/branch.c:858
+#: builtin/branch.c:894
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11182,32 +12015,32 @@
"opsi '--set-upstream' tidak lagi didukung. Mohon gunakan '--track' atau '--"
"set-upstream-to' sebagai gantinya."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr ""
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr ""
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr ""
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr ""
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr ""
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr ""
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11226,183 +12059,300 @@
"You can delete any lines you don't wish to share.\n"
msgstr ""
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr ""
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr ""
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr ""
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr ""
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr ""
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr ""
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr ""
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr ""
#: builtin/bundle.c:15 builtin/bundle.c:23
msgid "git bundle create [<options>] <file> <git-rev-list args>"
-msgstr ""
+msgstr "git bundle create [<opsi>] <berkas> <argumen git-rev-list>"
#: builtin/bundle.c:16 builtin/bundle.c:28
msgid "git bundle verify [<options>] <file>"
-msgstr ""
+msgstr "git bundle verify [<opsi>] <berkas>"
#: builtin/bundle.c:17 builtin/bundle.c:33
msgid "git bundle list-heads <file> [<refname>...]"
-msgstr ""
+msgstr "git bundle list-heads <berkas> [<nama referensi>...]"
#: builtin/bundle.c:18 builtin/bundle.c:38
msgid "git bundle unbundle <file> [<refname>...]"
-msgstr ""
+msgstr "git bundle unbundle <berkas> [<nama referensi>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3899
msgid "do not show progress meter"
-msgstr ""
+msgstr "jangan perlihatkan meteran perkembangan"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
msgid "show progress meter"
-msgstr ""
+msgstr "perlihatkan meteran perkembangan"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3903
msgid "show progress meter during object writing phase"
-msgstr ""
+msgstr "perlihatkan meteran perkembangan saat fase penulisan objek"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3906
msgid "similar to --all-progress when progress meter is shown"
-msgstr ""
+msgstr "sama seperti --all-progress ketika meteran perkembangan diperlihatkan"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
-msgstr ""
+msgstr "sebutkan versi format bundel"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
-msgstr ""
+msgstr "Perlu sebuah repositori untuk membuat bundel."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:108
msgid "do not show bundle details"
-msgstr ""
+msgstr "jangan perlihatkan detail bundel"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:127
#, c-format
msgid "%s is okay\n"
-msgstr ""
+msgstr "%s oke \n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:183
msgid "Need a repository to unbundle."
-msgstr ""
+msgstr "Perlu sebuah repositori untuk membongkar bundel."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr ""
+#: builtin/bundle.c:186
+msgid "Unbundling objects"
+msgstr "Membongkar bundel objek"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:220 builtin/remote.c:1758
#, c-format
msgid "Unknown subcommand: %s"
-msgstr ""
+msgstr "Subperintah tidak dikenal: %s"
-#: builtin/cat-file.c:596
-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:568
+msgid "flush is only for --buffer mode"
+msgstr "bilas hanya untuk mode --buffer"
-#: builtin/cat-file.c:597
-msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
-msgstr ""
+#: builtin/cat-file.c:612
+msgid "empty command in input"
+msgstr "perintah kosong pada masukan"
-#: builtin/cat-file.c:618
-msgid "only one batch option may be specified"
-msgstr ""
+#: builtin/cat-file.c:614
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "spasi sebelum perintah: '%s'"
+
+#: builtin/cat-file.c:623
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s butuh sebuah argumen"
+
+#: builtin/cat-file.c:628
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s tidak mengambil argumen"
#: builtin/cat-file.c:636
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr ""
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "perintah tidak dikenal: '%s'"
-#: builtin/cat-file.c:637
-msgid "show object type"
-msgstr ""
+#: builtin/cat-file.c:795
+msgid "only one batch option may be specified"
+msgstr "hanya satu opsi setumpuk yang mungkin disebutkan"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:824
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <tipe> <objek>"
+
+#: builtin/cat-file.c:825
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git cat-file (-e | -p) <objek>"
+
+#: builtin/cat-file.c:826
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objek>"
+
+#: builtin/cat-file.c:827
+msgid ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+
+#: builtin/cat-file.c:830
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
+"git cat-file (--textconv | --filters)\n"
+" [<revisi>:<jalur|mirip-pohon> | --path=<jalur|mirip-pohon>] "
+"<revisi>"
+
+#: builtin/cat-file.c:836
+msgid "Check object existence or emit object contents"
+msgstr "Periksa keberadaan objek atau keluarkan isi objek"
+
+#: builtin/cat-file.c:838
+msgid "check if <object> exists"
+msgstr "periksa jika <objek> ada"
+
+#: builtin/cat-file.c:839
+msgid "pretty-print <object> content"
+msgstr "cetak-cantik isi <objek>"
+
+#: builtin/cat-file.c:841
+msgid "Emit [broken] object attributes"
+msgstr "Keluarkan atribut objek [rusak]"
+
+#: builtin/cat-file.c:842
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr "perlihatkan tipe objek (salah satu dari 'blob', 'commit', 'tag', ...)"
+
+#: builtin/cat-file.c:843
msgid "show object size"
-msgstr ""
+msgstr "perlihatkan ukuran objek"
-#: builtin/cat-file.c:640
-msgid "exit with zero when there's no error"
-msgstr ""
-
-#: builtin/cat-file.c:641
-msgid "pretty-print object's content"
-msgstr ""
-
-#: builtin/cat-file.c:643
-msgid "for blob objects, run textconv on object's content"
-msgstr ""
-
-#: builtin/cat-file.c:645
-msgid "for blob objects, run filters on object's content"
-msgstr ""
-
-#: builtin/cat-file.c:646
-msgid "blob"
-msgstr ""
-
-#: builtin/cat-file.c:647
-msgid "use a specific path for --textconv/--filters"
-msgstr ""
-
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:845
msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr ""
+msgstr "perbolehkan -s dan -t bekerja dengan objek rusak"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:847
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr "Objek batch diminta pada masukan standar (atau --batch-all-objects)"
+
+#: builtin/cat-file.c:849
+msgid "show full <object> or <rev> contents"
+msgstr "perlihatkan isi <objek> atau <revisi> penuh"
+
+#: builtin/cat-file.c:853
+msgid "like --batch, but don't emit <contents>"
+msgstr "seperti --batch, tapi jangan keluarkan <isi>"
+
+#: builtin/cat-file.c:857
+msgid "read commands from stdin"
+msgstr "baca perintah dari masukan standar"
+
+#: builtin/cat-file.c:861
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr ""
+"dengan --batch[-check]: abaikan masukan standar, batch semua objek yang "
+"dikenal"
+
+#: builtin/cat-file.c:863
+msgid "Change or optimize batch output"
+msgstr "Ubah atau optimalkan keluaran batch"
+
+#: builtin/cat-file.c:864
msgid "buffer --batch output"
-msgstr ""
+msgstr "sannga keluaran --batch"
-#: builtin/cat-file.c:652
-msgid "show info and content of objects fed from the standard input"
-msgstr ""
+#: builtin/cat-file.c:866
+msgid "follow in-tree symlinks"
+msgstr "ikuti tautan simbolik dalam pohon"
-#: builtin/cat-file.c:656
-msgid "show info about objects fed from the standard input"
-msgstr ""
+#: builtin/cat-file.c:868
+msgid "do not order objects before emitting them"
+msgstr "jangan urutkan objek sebelum dikeluarkan"
-#: builtin/cat-file.c:660
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: builtin/cat-file.c:870
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
msgstr ""
+"Keluarkan objek (blob atau pohon) dengan konversi atau saringan (berdiri "
+"sendiri atau dengan batch)"
-#: builtin/cat-file.c:662
-msgid "show all objects with --batch or --batch-check"
-msgstr ""
+#: builtin/cat-file.c:872
+msgid "run textconv on object's content"
+msgstr "jalankan textconv pada isi objek"
-#: builtin/cat-file.c:664
-msgid "do not order --batch-all-objects output"
+#: builtin/cat-file.c:874
+msgid "run filters on object's content"
+msgstr "jalankan penyaring pada isi objek"
+
+#: builtin/cat-file.c:875
+msgid "blob|tree"
+msgstr "blob|tree"
+
+#: builtin/cat-file.c:876
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
+msgstr "gunakan <jalur> untuk (--textconv | --filters); tidak dengan 'batch'"
+
+#: builtin/cat-file.c:894
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "'%s=<%s>' butuh '%s' atau '%s'"
+
+#: builtin/cat-file.c:896
+msgid "path|tree-ish"
+msgstr "jalur|mirip-pohon"
+
+#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "opsi '%s' butuh sebuah mode batch"
+
+#: builtin/cat-file.c:921
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "'-%c' tidak kompatibel dengan mode batch"
+
+#: builtin/cat-file.c:924
+msgid "batch modes take no arguments"
+msgstr "mode batch tidak mengambil argumen"
+
+#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "<revisi> diperlukan dengan '%s'"
+
+#: builtin/cat-file.c:938
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "<objek> diperlukan dengan '-%c'"
+
+#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429
+#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596
+#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965
+#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
+#: builtin/tag.c:592
+msgid "too many arguments"
+msgstr "terlalu banyak argumen"
+
+#: builtin/cat-file.c:947
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
msgstr ""
+"hanya dua argumen yang diperbolehkan di dalam mode <tipe> <objek>, bukan %d"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -11420,7 +12370,7 @@
msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
msgid "read file names from stdin"
msgstr ""
@@ -11428,8 +12378,8 @@
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
+#: builtin/worktree.c:565
msgid "suppress progress reporting"
msgstr ""
@@ -11486,169 +12436,167 @@
msgid "git checkout--worker [<options>]"
msgstr ""
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
+#: builtin/worktree.c:808
msgid "string"
msgstr ""
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/checkout-index.c:152
+#: builtin/checkout-index.c:184
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:201
msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:219
msgid "check out all files in the index"
msgstr ""
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:221
+msgid "do not skip files with skip-worktree set"
+msgstr ""
+
+#: builtin/checkout-index.c:222
msgid "force overwrite of existing files"
msgstr ""
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:224
msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:226
msgid "don't checkout new files"
msgstr ""
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:228
msgid "update stat information in the index file"
msgstr ""
-#: builtin/checkout-index.c:198
+#: builtin/checkout-index.c:232
msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:234
msgid "write the content to temporary files"
msgstr ""
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:238
msgid "copy out the files from named stage"
msgstr ""
-#: builtin/checkout.c:33
+#: builtin/checkout.c:34
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<opsi>] <cabang>"
-#: builtin/checkout.c:34
+#: builtin/checkout.c:35
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opsi>] [<cabang>] -- <berkas>..."
-#: builtin/checkout.c:39
+#: builtin/checkout.c:40
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<opsi>] [<cabang>]"
-#: builtin/checkout.c:44
+#: builtin/checkout.c:45
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<opsi>] [--source=<cabang>] <berkas>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:199 builtin/checkout.c:238
#, c-format
msgid "path '%s' does not have our version"
msgstr "jalur '%s' tidak punya versi kami"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:201 builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have their version"
msgstr "jalur '%s' tidak punya versi mereka"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:217
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "jalur '%s' tidak punya semua versi yang diperlukan"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:271
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "jalur '%s' tidak punya versi yang diperlukan"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:291
#, c-format
msgid "path '%s': cannot merge"
msgstr "jalur '%s': tidak dapat gabung"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:307
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Tidak dapat menambahkan hasil penggabungan untuk '%s'"
-#: builtin/checkout.c:411
+#: builtin/checkout.c:424
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "Konflik penggabungan %d dibuat ulang"
msgstr[1] "Konflik penggabungan %d dibuat ulang"
-#: builtin/checkout.c:416
+#: builtin/checkout.c:429
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "%d jalur diperbarui dari %s"
msgstr[1] "%d jalur diperbarui dari %s"
-#: builtin/checkout.c:423
+#: builtin/checkout.c:436
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "%d jalur diperbarui dari indeks"
msgstr[1] "%d jalur diperbarui dari indeks"
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:469
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' tidak dapat digunakan untuk memperbarui jalur"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' tidak dapat digunakan untuk %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:479
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Tidak dapat memperbarui jalur dan mengganti ke cabang '%s' dalam waktu yang "
"bersamaan."
-#: builtin/checkout.c:470
+#: builtin/checkout.c:483
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "baik '%s' atau '%s' tidak disebutkan"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:487
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "'%s' harus disebutkan ketika '%s' tidak disebutkan"
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:492 builtin/checkout.c:497
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' atau '%s' tidak dapat digunakan untuk %s"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:571 builtin/checkout.c:578
#, c-format
msgid "path '%s' is unmerged"
msgstr "jalur '%s' tak tergabung"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:753
msgid "you need to resolve your current index first"
msgstr "Anda perlu selesaikan dulu indeks Anda saat ini"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:809
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11658,50 +12606,50 @@
"berikut:\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:902
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:947
msgid "HEAD is now at"
msgstr "HEAD sekarang berada di"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "tidak dapat memperbarui HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:955
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Ganti ulang cabang '%s'\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:958
#, c-format
msgid "Already on '%s'\n"
msgstr "Sudah berada pada '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:962
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Ganti ke dan ganti cabang '%s'\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:964 builtin/checkout.c:1398
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Ganti ke cabang baru '%s'\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:966
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Ganti ke cabang '%s'\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:1017
#, c-format
msgid " ... and %d more.\n"
msgstr "... dan %d lainnya.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11724,7 +12672,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1042
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11747,19 +12695,19 @@
"saat yang tepat untuk dilakukan dengan:\n"
"git branch <nama-cabang-baru> %s\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1077
msgid "internal error in revision walk"
msgstr "kesalahan internal dalam jalan revisi"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1081
msgid "Previous HEAD position was"
msgstr "Posisi HEAD sebelumnya adalah"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1124 builtin/checkout.c:1393
msgid "You are on a branch yet to be born"
msgstr "Anda berada pada cabang yang belum lahir"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1206
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11768,7 +12716,7 @@
"'%s' bisa jadi berkas lokal dan cabang pelacak.\n"
"Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi"
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1213
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"
@@ -11788,51 +12736,56 @@
"seperti remote 'origin', pertimbangkan untuk menyetel\n"
"checkout.defaultRemote=origin di konfigurasi Anda"
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1223
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' cocok dengan banyak (%d) cabang pelacak remote"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
msgid "only one reference expected"
msgstr "hanya satu referensi yang diharapkan"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1306
#, c-format
msgid "only one reference expected, %d given."
msgstr "hanya satu referensi yang diharapkan, %d diberikan"
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
#, c-format
msgid "invalid reference: %s"
msgstr "referensi tidak valid: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1365 builtin/checkout.c:1744
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensi bukan pohon: %s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "sebuah cabang diharapkan, dapat tag '%s'"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1415
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "sebuah cabang diharapkan, dapat cabang remote '%s'"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1417 builtin/checkout.c:1426
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "sebuah cabang diharapkan, dapat '%s'"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1420
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "sebuah cabang diharapkan, dapat komit '%s'"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1429
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr "Jika Anda ingin lepas HEAD pada komit, coba lagi dengan opsi --detach."
+
+#: builtin/checkout.c:1442
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11841,7 +12794,7 @@
"Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add"
"\"."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11849,7 +12802,7 @@
"tidak dapat mengganti cabang di tengah sesi am\n"
"Pertimbangkan untuk menggunakan \"git am --quit\" atau \"git worktree add\"."
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1450
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11858,7 +12811,7 @@
"Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add"
"\"."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11867,7 +12820,7 @@
"Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git "
"worktree add\"."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1458
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11876,138 +12829,122 @@
"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree add"
"\"."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1462
msgid "you are switching branch while bisecting"
msgstr "Anda mengganti cabang saat pembagian dua"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1469
msgid "paths cannot be used with switching branches"
msgstr "jalur tidak dapat digunakan dengan mengganti cabang"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' tidak dapat digunakan dengan mengganti cabang"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
+#: builtin/checkout.c:1495 builtin/checkout.c:1500
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' tidak dapat digunakan dengan '%s'"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1497
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' tidak bisa mengambil <titik-awal>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1505
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Tidak dapat mengganti cabang ke bukan komit '%s'"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1512
msgid "missing branch or commit argument"
msgstr "kehilangan argumen cabang atau komit"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1555
msgid "perform a 3-way merge with the new branch"
msgstr "lakukan penggabungan 3 arah dengan cabang baru"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
msgid "style"
msgstr "gaya"
-#: builtin/checkout.c:1522
-msgid "conflict style (merge or diff3)"
-msgstr "gaya konflik (merge atau diff3)"
+#: builtin/checkout.c:1557
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "gaya konflik (merge, diff3, atau zdiff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1569 builtin/worktree.c:560
msgid "detach HEAD at named commit"
msgstr "lepas HEAD pada komit bernama"
-#: builtin/checkout.c:1535
-msgid "set upstream info for new branch"
-msgstr "setel info hulu untuk cabang baru"
-
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1574
msgid "force checkout (throw away local modifications)"
msgstr "paksa checkout (buang modifikasi lokal)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new-branch"
msgstr "cabang baru"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new unparented branch"
msgstr "cabang baru tanpa induk"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1578 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "perbarui berkas yang diabaikan (default)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1581
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"jangan periksa jika pohon kerja yang lain mempunyai referensi yang diberikan"
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1594
msgid "checkout our version for unmerged files"
msgstr "checkout versi kami untuk berkas yang tak tergabung"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1597
msgid "checkout their version for unmerged files"
msgstr "checkout versi mereka untuk berkas yang tak tergabung"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1601
msgid "do not limit pathspecs to sparse entries only"
msgstr "jangan batasi jalur spek hanya ke entri tipis"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1659
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c dan --orphan saling eksklusif"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "opsi '-%c', '-%c', dan '%s' tidak dapat digunakan bersamaan"
-#: builtin/checkout.c:1626
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p dan --overlay saling eksklusif"
-
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1700
msgid "--track needs a branch name"
msgstr "--track butuh nama cabang"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1705
#, c-format
msgid "missing branch name; try -%c"
msgstr "kehilangan nama cabang; coba -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1737
#, c-format
msgid "could not resolve %s"
msgstr "tidak dapat menyelesaikan %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1753
msgid "invalid path specification"
msgstr "spesifikasi jalur tidak valid"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1760
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' bukanlah commit dan cabang '%s' tidak dapat dibuat dari itu"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1764
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach tidak mengambil argumen jalur '%s'"
-#: builtin/checkout.c:1736
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file tidak kompatible dengan --detach"
-
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file tidak kompatibel dengan --patch"
-
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1789
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12015,71 +12952,71 @@
"git checkout: --ours/--theirs, --force dan --merge tidak kompatibel saat\n"
"men-checkout index"
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1794
msgid "you must specify path(s) to restore"
msgstr "Anda harus sebutkan jalur untuk dipulihkan"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
+#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
+#: builtin/remote.c:173 builtin/submodule--helper.c:3038
+#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
+#: builtin/worktree.c:558
msgid "branch"
msgstr "cabang"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1820
msgid "create and checkout a new branch"
msgstr "buat dan checkout cabang baru"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1822
msgid "create/reset and checkout a branch"
msgstr "buat/setel ulang dan checkout cabang"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1823
msgid "create reflog for new branch"
msgstr "buat reflog untuk cabang baru"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1825
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "tebakan kedua 'git checkout <tidak-ada-cabang-seperti-itu>' (default)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1826
msgid "use overlay mode (default)"
msgstr "gunakan mode hamparan (default)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1874
msgid "create and switch to a new branch"
msgstr "buat dan ganti ke cabang baru"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1876
msgid "create/reset and switch to a branch"
msgstr "buat/setel ulang dan ganti ke cabang"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1878
msgid "second guess 'git switch <no-such-branch>'"
msgstr "tebakan kedua 'git switch <tidak-ada-cabang-seperti-itu>'"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1880
msgid "throw away local modifications"
msgstr "buang modifikasi lokal"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1916
msgid "which tree-ish to checkout from"
msgstr "mana mirip-cabang untuk di-checkout"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1918
msgid "restore the index"
msgstr "pulihkan indeks"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1920
msgid "restore the working tree (default)"
msgstr "pulihkan pohon kerja (default)"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1922
msgid "ignore unmerged entries"
msgstr "abaikan entri yang tak tergabung"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1923
msgid "use overlay mode"
msgstr "gunakan mode hamparan"
@@ -12114,7 +13051,15 @@
msgid "could not lstat %s\n"
msgstr "tidak dapat me-lstat %s\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Menolak menghapus direktori kerja saat ini\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Akan menolak menghapus direktori kerja saat ini\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12127,7 +13072,7 @@
"foo - pilih item berdasarkan prefiks unik\n"
" - (kosong) tidak pilih apa-apa\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12148,33 +13093,33 @@
"* - pilih semua item\n"
" - (kosong) selesai memilih\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Huh (%s)?\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Masukkan pola pengabaian>> "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "PERINGATAN: Tidak dapat menemukan item yang cocok dengan: %s"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Pilih item untuk dihapus"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Hapus %s [y/N]? "
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12192,52 +13137,52 @@
"help - layar ini\n"
"? - bantuan untuk bisik pemilihan"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Akan menghapus item berikut:"
msgstr[1] "Akan menghapus item berikut:"
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Tidak ada lagi berkas untuk dibersihkan, keluar."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "jangan cetak nama berkas yang dihapus"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "paksa"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "pembersihan interaktif"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "hapus keseluruhan direktori"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
+#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "pola"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "tambahkan <pola> ke aturan pengabaian"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "juga hapus berkas terabaikan"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "hanya hapus berkas terabaikan"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12245,7 +13190,7 @@
"clean.requireForce disetel ke true dan baik -i, -n, atau -f tidak diberikan; "
"menolak membersihkan"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12253,219 +13198,217 @@
"clean.requireForce asal ke true dan baik -i, -n, atau -f tidak diberikan; "
"menolak membersihkan"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x dan -X tidak dapat digunakan bersamaan"
-#: builtin/clone.c:45
+#: builtin/clone.c:47
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opsi>] [--] <repo> [<direktori>]"
-#: builtin/clone.c:96
+#: builtin/clone.c:100
msgid "don't clone shallow repository"
msgstr "jangan kloning repositori dangkal"
-#: builtin/clone.c:98
+#: builtin/clone.c:102
msgid "don't create a checkout"
msgstr "jangan buat checkout"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "buat repositori bare"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "create a mirror repository (implies bare)"
msgstr "buat repositori cermin (implikasikan bare)"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "to clone from a local repository"
msgstr "kloning dari repositori lokal"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "don't use local hardlinks, always copy"
msgstr "jangan gunakan tautan keras lokal, selalu salin"
-#: builtin/clone.c:109
+#: builtin/clone.c:113
msgid "setup as shared repository"
msgstr "siapkan sebagai repositori berbagi"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "pathspec"
msgstr "spek jalur"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "initialize submodules in the clone"
msgstr "inisialisasi submodul dalam klon"
-#: builtin/clone.c:115
+#: builtin/clone.c:119
msgid "number of submodules cloned in parallel"
msgstr "jumlah submodul yang diklon secara paralel"
-#: builtin/clone.c:116 builtin/init-db.c:539
+#: builtin/clone.c:120 builtin/init-db.c:539
msgid "template-directory"
msgstr "direktori templat"
-#: builtin/clone.c:117 builtin/init-db.c:540
+#: builtin/clone.c:121 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "direktori dimana templat akan digunakan"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
msgid "reference repository"
msgstr "repositori rujukan"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:127 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2721
msgid "use --reference only while cloning"
msgstr "gunakan --reference hanya pada saat kloning"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3967 builtin/repack.c:669
+#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nama"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "use <name> instead of 'origin' to track upstream"
msgstr "gunakan <nama> daripada 'origin' untuk lacak hulu"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checkout <cabang> daripada HEAD remote"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "path to git-upload-pack on the remote"
msgstr "jalur ke git-upload-pack pada remote"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
+#: builtin/pull.c:212
msgid "depth"
msgstr "kedalaman"
-#: builtin/clone.c:131
+#: builtin/clone.c:135
msgid "create a shallow clone of that depth"
msgstr "buat klon dangkal sedalam kedalaman tersebut"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
+#: builtin/pull.c:215
msgid "time"
msgstr "waktu"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "create a shallow clone since a specific time"
msgstr "buat klon dangkal sejak waktu yang disebutkan"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
msgid "revision"
msgstr "revisi"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "perdalam riwayat klon dangkal, tidak termasuk rev"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:141 builtin/submodule--helper.c:1897
+#: builtin/submodule--helper.c:2735
msgid "clone only one branch, HEAD or --branch"
msgstr "klon hanya satu cabang, HEAD atau --branch"
-#: builtin/clone.c:139
+#: builtin/clone.c:143
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "jangan klon tag apapun, dan buat pengambilan nanti tidak mengikutinya"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "any cloned submodules will be shallow"
msgstr "submodul yang diklon akan dangkal"
-#: builtin/clone.c:142 builtin/init-db.c:548
+#: builtin/clone.c:146 builtin/init-db.c:548
msgid "gitdir"
msgstr "direktori git"
-#: builtin/clone.c:143 builtin/init-db.c:549
+#: builtin/clone.c:147 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "pisahkan direktori git dari pohon kerja"
-#: builtin/clone.c:144
+#: builtin/clone.c:148
msgid "key=value"
msgstr "kunci=nilai"
-#: builtin/clone.c:145
+#: builtin/clone.c:149
msgid "set config inside the new repository"
msgstr "setel konfigurasi di dalam repositori baru"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "spesifik ke server"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "opsi untuk transmisi"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "gunakan hanya alamat IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "gunakan hanya alamat IPv6"
-#: builtin/clone.c:154
+#: builtin/clone.c:158
+msgid "apply partial clone filters to submodules"
+msgstr "terapkan saringan kloning parsial ke submodul"
+
+#: builtin/clone.c:160
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "submodul yang diklon akan menggunakan cabang yang melacak remotenya"
-#: builtin/clone.c:156
+#: builtin/clone.c:162
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
"inisialisasi berkas checkout tipis agar memasukkan hanya berkas pada akar"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Nama direktori tidak dapat ditebak.\n"
-"Mohon sebutkan direktori pada baris perintah"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:237
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Tidak dapat menambahkan alternatif untuk '%s': %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:310
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s ada dan bukan direktori"
-#: builtin/clone.c:436
+#: builtin/clone.c:328
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "gagal memulai iterator pada '%s'"
-#: builtin/clone.c:467
+#: builtin/clone.c:359
#, c-format
msgid "failed to create link '%s'"
msgstr "gagal membuat tautan '%s'"
-#: builtin/clone.c:471
+#: builtin/clone.c:363
#, c-format
msgid "failed to copy file to '%s'"
msgstr "gagal menyalin berkas ke '%s'"
-#: builtin/clone.c:476
+#: builtin/clone.c:368
#, c-format
msgid "failed to iterate over '%s'"
msgstr "gagal iterasi pada '%s'"
-#: builtin/clone.c:503
+#: builtin/clone.c:395
#, c-format
msgid "done.\n"
msgstr "selesai.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:409
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12475,105 +13418,101 @@
"Anda dapat periksa apa yang dicheckout dengan 'git status'\n"
"dan coba lagi dengan 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:486
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Tidak dapat menemukan cabang remote %s untuk diklon."
-#: builtin/clone.c:713
+#: builtin/clone.c:603
#, c-format
msgid "unable to update %s"
msgstr "tidak dapat memperbarui %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:651
msgid "failed to initialize sparse-checkout"
msgstr "gagal menginisalisasi checkout tipis"
-#: builtin/clone.c:784
+#: builtin/clone.c:674
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"HEAD remote merujuk pada ref yang tidak ada, tidak dapat men-checkout.\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:709
msgid "unable to checkout working tree"
msgstr "tidak dapat men-checkout pohon kerja"
-#: builtin/clone.c:894
+#: builtin/clone.c:793
msgid "unable to write parameters to config file"
msgstr "tidak dapat menulis parameter ke berkas konfigurasi"
-#: builtin/clone.c:957
+#: builtin/clone.c:856
msgid "cannot repack to clean up"
msgstr "tidak dapat memaket ulang untuk pembersihan"
-#: builtin/clone.c:959
+#: builtin/clone.c:858
msgid "cannot unlink temporary alternates file"
msgstr "tidak dapat batal-taut berkas alternatif sementara"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:901
msgid "Too many arguments."
msgstr "Terlalu banyak argumen."
-#: builtin/clone.c:1005
+#: builtin/clone.c:905 contrib/scalar/scalar.c:413
msgid "You must specify a repository to clone."
msgstr "Anda harus sebutkan repositori untuk diklon."
-#: builtin/clone.c:1018
+#: builtin/clone.c:918
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare dan --origin %s tidak kompatibel."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "opsi '%s' dan '%s %s' tidak dapat digunakan bersamaan"
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare dan --separate-git-dir tidak kompatibel."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:935
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositori '%s' tidak ada"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:939 builtin/fetch.c:2176
#, c-format
msgid "depth %s is not a positive number"
msgstr "kedalaman %s bukan bilangan positif"
-#: builtin/clone.c:1049
+#: builtin/clone.c:949
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "jalur tujuan '%s' sudah ada dan bukan direktori kosong"
-#: builtin/clone.c:1055
+#: builtin/clone.c:955
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "jalur repositori '%s' sudah ada dan bukan direktori kosong"
-#: builtin/clone.c:1069
+#: builtin/clone.c:969
#, c-format
msgid "working tree '%s' already exists."
msgstr "pohon kerja '%s' sudah ada."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
+#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "tidak dapat membuat direktori pendahulu '%s'"
-#: builtin/clone.c:1089
+#: builtin/clone.c:989
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "tidak dapat membuat direktori pohon kerja '%s'"
-#: builtin/clone.c:1109
+#: builtin/clone.c:1009
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Kloning ke repositori bare '%s'...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1011
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Kloning ke '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1040
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -12581,47 +13520,51 @@
"clone --recursive tidak kompatibel dengan baik --reference dan --reference-"
"if-able"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' bukan nama remote yang valid"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1157
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth diabaikan di klon lokal; gunakan file:// sebagai gantinya."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1159
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since diabaikan di klon lokal; gunakan file:// sebagai gantinya."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1161
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude diabaikan di klon lokal; gunakan file:// sebagai gantinya."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1163
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter diabaikan di klon lokal; gunakan file:// sebagai gantinya."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1168
msgid "source repository is shallow, ignoring --local"
msgstr "repositori sumber dangkal, abaikan --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1173
msgid "--local is ignored"
msgstr "--local diabaikan"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1185
+msgid "cannot clone from filtered bundle"
+msgstr "tidak dapat mengkloning dari bundel tersaring"
+
+#: builtin/clone.c:1265 builtin/clone.c:1324
msgid "remote transport reported error"
msgstr "transportasi remote melaporkan kesalahan"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1277 builtin/clone.c:1289
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Cabang remote %s tidak ditemukan di hulu %s"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1292
msgid "You appear to have cloned an empty repository."
msgstr "Anda tampaknya mengklon repositori kosong."
@@ -12657,180 +13600,175 @@
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
msgstr ""
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr ""
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
msgid "dir"
msgstr ""
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr ""
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr ""
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr ""
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr ""
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr ""
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr ""
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr ""
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr ""
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr ""
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr ""
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr ""
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
"<file>)...] <tree>"
msgstr ""
+"git commit-tree [(-p <induk>)...] [-S[<id kunci>]] [(-m <pesan>)...] [(-F "
+"<berkas>)...] <pohon>"
#: builtin/commit-tree.c:31
#, c-format
msgid "duplicate parent %s ignored"
-msgstr ""
+msgstr "induk duplikat %s diabaikan"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
#, c-format
msgid "not a valid object name %s"
-msgstr ""
+msgstr "bukan nama objek valid %s"
-#: builtin/commit-tree.c:93
+#: builtin/commit-tree.c:94
#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr ""
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: gagal membaca '%s'"
#: builtin/commit-tree.c:96
#, c-format
-msgid "git commit-tree: failed to read '%s'"
-msgstr ""
-
-#: builtin/commit-tree.c:98
-#, c-format
msgid "git commit-tree: failed to close '%s'"
-msgstr ""
+msgstr "git commit-tree: gagal menutup '%s'"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
-msgstr ""
+msgstr "induk"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
-msgstr ""
+msgstr "id objek komit induk"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
+#: builtin/tag.c:455
msgid "message"
-msgstr ""
+msgstr "pesan"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
-msgstr ""
+msgstr "pesan komit"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
-msgstr ""
+msgstr "baca pesan log komit dari berkas"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
-msgstr ""
+msgstr "Tandatangani komit dengan GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
-msgstr ""
+msgstr "harus berikan tepat satu pohon"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
-msgstr ""
+msgstr "git commit-tree: gagal membaca"
-#: builtin/commit.c:41
+#: builtin/commit.c:43
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opsi>] [--] <spek jalur>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:48
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opsi>] [--] <spek jalur>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:53
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -12841,7 +13779,7 @@
"dengan --allow-empty, atau Anda dapat menghapus keseluruhan komit\n"
"dengan \"git reset HEAD^\".\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:58
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -12855,15 +13793,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:65
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Selain itu, gunakan 'git rebase --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:68
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Selain itu, gunakan 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:71
msgid ""
"and then use:\n"
"\n"
@@ -12884,73 +13822,69 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:326
msgid "failed to unpack HEAD tree object"
msgstr "gagal membuka objek pohon HEAD"
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file dengan -a tidak masuk akal"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:376
msgid "No paths with --include/--only does not make sense."
msgstr "Tanpa jalur dengan --include/--only tidak masuk akal."
-#: builtin/commit.c:386
+#: builtin/commit.c:388
msgid "unable to create temporary index"
msgstr "tidak dapat membuat indeks sementara"
-#: builtin/commit.c:395
+#: builtin/commit.c:397
msgid "interactive add failed"
msgstr "penambahan interaktif gagal"
-#: builtin/commit.c:410
+#: builtin/commit.c:412
msgid "unable to update temporary index"
msgstr "tidak dapat memperbarui indeks sementara"
-#: builtin/commit.c:412
+#: builtin/commit.c:414
msgid "Failed to update main cache tree"
msgstr "gagal memperbarui tembolok pohon utama"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
msgid "unable to write new_index file"
msgstr "tidak dapat menulis berkas new_index"
-#: builtin/commit.c:489
+#: builtin/commit.c:491
msgid "cannot do a partial commit during a merge."
msgstr "tidak dapat melakukan komit sebagian selama penggabungan."
-#: builtin/commit.c:491
+#: builtin/commit.c:493
msgid "cannot do a partial commit during a cherry-pick."
msgstr "tidak dapat melakukan komit sebagian selama pemetikan ceri."
-#: builtin/commit.c:493
+#: builtin/commit.c:495
msgid "cannot do a partial commit during a rebase."
msgstr "tidak dapat melakukan komit sebagian selama pendasaran ulang."
-#: builtin/commit.c:501
+#: builtin/commit.c:503
msgid "cannot read the index"
msgstr "tidak dapat membaca indeks"
-#: builtin/commit.c:520
+#: builtin/commit.c:522
msgid "unable to write temporary index file"
msgstr "tidak dapat menulis berkas indeks sementara"
-#: builtin/commit.c:618
+#: builtin/commit.c:620
#, c-format
msgid "commit '%s' lacks author header"
msgstr "komit '%s' kurang kepala pengarang"
-#: builtin/commit.c:620
+#: builtin/commit.c:622
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "komit '%s' ada baris pengarang cacat"
-#: builtin/commit.c:639
+#: builtin/commit.c:641
msgid "malformed --author parameter"
msgstr "parameter --author cacat"
-#: builtin/commit.c:692
+#: builtin/commit.c:694
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -12958,43 +13892,43 @@
"tidak dapat memilih karakter komentar yang tidak terpakai\n"
"dalam pesan komit saat ini"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
#, c-format
msgid "could not lookup commit %s"
msgstr "tidak dapat mencari komit %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:762 builtin/shortlog.c:417
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(baca pesan log dari standar masukan)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:764
msgid "could not read log from standard input"
msgstr "tidak dapat membaca log dari standar masukan"
-#: builtin/commit.c:764
+#: builtin/commit.c:768
#, c-format
msgid "could not read log file '%s'"
msgstr "tidak dapat membaca berkas log '%s'"
-#: builtin/commit.c:801
+#: builtin/commit.c:805
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "tidak dapat menggabungkan -m dengan --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "opsi '%s' dan '%s:%s' tidak dapat digunakan bersamaan"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:817 builtin/commit.c:833
msgid "could not read SQUASH_MSG"
msgstr "tidak dapat membaca SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
msgid "could not read MERGE_MSG"
msgstr "tidak dapat membaca MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:884
msgid "could not write commit template"
msgstr "tidak dapat menulis templat komit"
-#: builtin/commit.c:893
+#: builtin/commit.c:897
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13003,7 +13937,7 @@
"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
"dengan '%c' akan diabaikan.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:899
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13012,7 +13946,7 @@
"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
"dengan '%c' akan diabaikan, dan pesan kosong batalkan komit.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:903
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13021,7 +13955,7 @@
"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:907
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13032,7 +13966,7 @@
"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n"
"Pesan kosong batalkan komit.\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:919
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13046,7 +13980,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"dan coba lagi.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:924
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13060,175 +13994,147 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"dan coba lagi.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:951
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sPengarang: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:959
#, c-format
msgid "%sDate: %s"
msgstr "%sTanggal: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:966
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sPengkomit: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:984
msgid "Cannot read index"
msgstr "Tidak dapat membaca indeks"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1029
msgid "unable to pass trailers to --trailers"
msgstr "tidak dapat melewatkan trailer ke --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1069
msgid "Error building trees"
msgstr "Kesalahan membangun pohon"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1083 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Mohon berikan pesan baik dengan opsi -m atau -F.\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1128
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' bukan 'Nama <email>' dan tidak cocok dengan pengarang yang ada"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1142
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Mode terabaikan '%s' tidak valid"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1160 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode berkas tak terlacak '%s' tidak valid"
-#: builtin/commit.c:1195
-msgid "--long and -z are incompatible"
-msgstr "--long dan -z tidak kompatibel"
-
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Anda berada di tengah penggabungan -- tidak dapat menulis ulang."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1233
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat menulis ulang."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1236
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr ""
-"tidak dapat menggabungkan opsi penulisan ulang --fixup dengan jalur '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "opsi reword '%s' dan jalur '%s' tidak dapat digunakan bersamaan"
-#: builtin/commit.c:1233
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
+#: builtin/commit.c:1238
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "opsi reword '%s' dan '%s' tidak dapat digunakan bersamaan"
-#: builtin/commit.c:1252
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "Menggunakan baik --reset-author dan --author tidak masuk akal"
-
-#: builtin/commit.c:1261
+#: builtin/commit.c:1263
msgid "You have nothing to amend."
msgstr "Anda tidak punya apapun untuk diubah."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1266
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Anda berada di tengah penggabungan -- tidak dapat mengubah."
-#: builtin/commit.c:1266
+#: builtin/commit.c:1268
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat mengubah."
-#: builtin/commit.c:1268
+#: builtin/commit.c:1270
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Anda berada di tengah pendasaran ulang -- tidak dapat mengubah."
-#: builtin/commit.c:1271
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "Opsi --squash dan --fixup tidak dapat digunakan bersamaan"
-
-#: builtin/commit.c:1281
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "Hanya salah satu dari -c/-C/-F/--fixup yang dapat digunakan."
-
-#: builtin/commit.c:1283
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "Opsi -m tidak dapat digabung dengan -c/-C/-F."
-
-#: builtin/commit.c:1292
+#: builtin/commit.c:1290
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author hanya dapat digunakan dengan -C, -c atau --amend."
-#: builtin/commit.c:1310
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr ""
-"Hanya salah satu dari --include/--only/--all/--interactive/--patch yang "
-"dapat digunakan."
-
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
-msgstr ""
+msgstr "opsi tidak dikenal: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "jalur '%s ...' dengan -a tidak masuk akal"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "perlihatkan status dengan ringkas"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "perlihatkan informasi cabang"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "perlihatkan informasi stase"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "hitung nilai didepan/dibelakang penuh"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "versi"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:765
msgid "machine-readable output"
msgstr "keluaran yang dapat dibaca mesin"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "perlihatkan status dalam format panjang (asali)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "akhiri entri dengan NUL"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"perlihatkan berkas tak terlacak, mode opsional: all, normal, no. (Asali: all)"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13236,11 +14142,11 @@
"perlihatkan berkas terabaikan, mode opsional: traditional, matching, no. "
"(Asali: traditional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:197
msgid "when"
msgstr "bila"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13248,192 +14154,192 @@
"abaikan perubahan submodul, bila opsional: all, dirty, untracked. (Asali: "
"all)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "sebut berkas tak terlacak dalam kolom"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "jangan deteksi penggantian nama"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "deteksi penggantian nama, setel indeks kemiripan secara opsional"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Kombinasi argumen berkas terabaikan dan tak terlacak tidak didukung"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "sembunyikan rangkuman setelah komit berhasil"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "perlihatkan diff dalam templat pesan komit"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Opsi pesan komit"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
msgid "read message from file"
msgstr "Baca pesan dari berkas"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "pengarang"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "timpa pengarang komit"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:551
msgid "date"
msgstr "tangal"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "timpa tanggal komit"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:360 ref-filter.h:89
msgid "commit"
msgstr "komit"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "gunakan kembali dan sunting pesan dari komit tersebut"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "gunakan kembali pesan dari komit tersebut"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]komit"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"gunakan pesan terformat autosquash untuk perbaiki atau ubah/tulis ulang "
"komit yang disebutkan"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr "gunakan pesan terformat autosquash untuk lumat komit tersebut"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "komit sekarang dikarang olehku (gunakan dengan -C/-c/--amend)"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
-msgstr ""
+msgstr "trailer"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
-msgstr ""
+msgstr "tambahkan trailer kustom"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "tambahkan trailer Signed-off-by"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "gunakan templat berkas tersebut"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "paksa sunting komit"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "masukkan status dalam templat pesaan komit"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Opsi isi komit"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "komit semua berkas terubah"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "tambahakn berkas tersebut ke indeks untuk dikomit"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "tambah berkas secara interaktif"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "tambah perubahan secara interaktif"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "hanya komit berkas tersebut"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
-msgstr "lewati hook pre-commit dan commit-msg"
+msgstr "lewati kail pre-commit dan commit-msg"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "perlihatkan apa yang akan dikomit"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "ubah komit sebelumnya"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
-msgstr "lewati hook post-rewrite"
+msgstr "lewati kail post-rewrite"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "ok merekam perubahan kosong"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "ok merekam perubahan dengan pesan kosong"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Berkas MERGE_HEAD (%s) rusak"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "tidak dapat membaca MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "tidak dapat membaca pesan komit: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Batalkan komit karena pesan komit kosong.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Batalkan komit; Anda tidak menyunting pesan.\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Batalkan komit karena badan pesan komit kosong.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -13556,6 +14462,10 @@
msgid "Type"
msgstr "Tipe"
+#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+msgid "type"
+msgstr "tipe"
+
#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "Nilai diberikan tipe ini"
@@ -13769,13 +14679,9 @@
msgid "no such section: %s"
msgstr "tidak ada bagian seperti: %s"
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr ""
-
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
-msgstr ""
+msgstr "cetak ukuran dalam format yang bisa dibaca manusia"
#: builtin/credential-cache--daemon.c:227
#, c-format
@@ -13794,7 +14700,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr ""
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr ""
@@ -13937,7 +14843,7 @@
msgid "do not consider tags matching <pattern>"
msgstr "jangan pertimbangkan tag yang cocok dengan <pola>"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:595
msgid "show abbreviated commit object as fallback"
msgstr "perlihatkan objek komit singkat sebagai langkah terakhir"
@@ -13953,25 +14859,14 @@
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "tambahkan <tanda> pada direktori kerja rusak (asali: \"-broken\")"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long tidak kompatibel dengan --abbrev=0"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Tidak ada nama yang ditemukan, tidak dapat menjelaskan apapun."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty tidak kompatibel dengan mirip-komit"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken tidak kompatibel dengan mirip-komit"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin dan --merge-base saling eksklusif"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "opsi '%s' dan mirip-komit tidak dapat digunakan bersamaan"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
@@ -13992,148 +14887,140 @@
msgid "%s...%s: no merge base"
msgstr "%s...%s: tidak ada dasar penggabungan"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "bukan repositori git"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:537 builtin/grep.c:700
#, c-format
msgid "invalid object '%s' given."
msgstr "objek yang diberikan '%s' tidak valid"
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "lebih dari dua blob diberikan: '%s'"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "objek tak tertangani '%s' diberikan"
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: banyak dasar penggabungan, menggunakan %s"
#: builtin/difftool.c:31
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
-msgstr ""
+msgstr "git difftool [<opsi>] [<komit> [<komit>]] [--] [<jalur>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr ""
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
-msgstr ""
+msgstr "tidak dapat membaca tautan simbolik %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
-msgstr ""
+msgstr "tidak dapat membaca berkas tautan simbolik %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
-msgstr ""
+msgstr "tidak dapat membaca objek %s untuk symlink %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
+"format diff tergabung ('-c' dan '--cc') tidak didukung dalam\n"
+"mode diff direktori ('-d' dan '--dir-diff')."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
-msgstr ""
+msgstr "kedua berkas berubah: '%s' dan '%s'."
+
+#: builtin/difftool.c:628
+msgid "working tree file has been left."
+msgstr "berkas pohon kerja telah ditinggalkan."
#: builtin/difftool.c:639
-msgid "working tree file has been left."
-msgstr ""
-
-#: builtin/difftool.c:650
#, c-format
msgid "temporary files exist in '%s'."
-msgstr ""
+msgstr "berkas sementara ada di '%s'."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
-msgstr ""
+msgstr "mungkin Anda ingin membersihkan atau memulihkan itu."
+
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "gagal: %d"
+
+#: builtin/difftool.c:690
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "gunakan `diff.guitool` daripada `diff.tool`"
+
+#: builtin/difftool.c:692
+msgid "perform a full-directory diff"
+msgstr "lakukan diff direktori penuh"
+
+#: builtin/difftool.c:694
+msgid "do not prompt before launching a diff tool"
+msgstr "jangan bisiki sebelum meluncurkan alat diff"
#: builtin/difftool.c:699
-msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr ""
+msgid "use symlinks in dir-diff mode"
+msgstr "gunakan tautan simbolik dalam mode diff direktori"
+
+#: builtin/difftool.c:700
+msgid "tool"
+msgstr "alat"
#: builtin/difftool.c:701
-msgid "perform a full-directory diff"
-msgstr ""
+msgid "use the specified diff tool"
+msgstr "gunakan alat diff yang disebutkan"
#: builtin/difftool.c:703
-msgid "do not prompt before launching a diff tool"
-msgstr ""
-
-#: builtin/difftool.c:708
-msgid "use symlinks in dir-diff mode"
-msgstr ""
-
-#: builtin/difftool.c:709
-msgid "tool"
-msgstr ""
-
-#: builtin/difftool.c:710
-msgid "use the specified diff tool"
-msgstr ""
-
-#: builtin/difftool.c:712
msgid "print a list of diff tools that may be used with `--tool`"
-msgstr ""
+msgstr "cetak daftar alat diff yang bisa digunakan dengan `--tool`"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:706
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
+"buat 'git-difftool' keluar ketika alat diff yang dijalankan mengembalikan "
+"kode keluar bukan nol"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
-msgstr ""
+msgstr "sebutkan perintah kustom untuk melihat diff"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:710
msgid "passed to `diff`"
-msgstr ""
+msgstr "dilewatkan ke `diff`"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
-msgstr ""
+msgstr "difftool butuh pohon kerja atau --no-index"
-#: builtin/difftool.c:741
-msgid "--dir-diff is incompatible with --no-index"
-msgstr ""
-
-#: builtin/difftool.c:744
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr ""
+#: builtin/difftool.c:745
+msgid "no <tool> given for --tool=<tool>"
+msgstr "tidak ada <alat> yang diberikan untuk --tool=<alat>"
#: builtin/difftool.c:752
-msgid "no <tool> given for --tool=<tool>"
-msgstr ""
-
-#: builtin/difftool.c:759
msgid "no <cmd> given for --extcmd=<cmd>"
-msgstr ""
+msgstr "tidak ada <perintah> yang diberikan untuk --extcmd=<perintah>"
#: builtin/env--helper.c:6
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr ""
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
-msgid "type"
-msgstr ""
-
#: builtin/env--helper.c:46
msgid "default for git_env_*(...) to fall back on"
msgstr ""
@@ -14155,245 +15042,246 @@
msgstr ""
#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr ""
+msgid "git fast-export [<rev-list-opts>]"
+msgstr "git fast-export [<opsi rev-list>]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
+"Kesalahan: Tidak dapat mengekspor tag bersarang kecuali jika --mark-tags "
+"disebutkan."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
-msgstr ""
+msgstr "token --anonymize-map tidak bisa kosong"
+
+#: builtin/fast-export.c:1171
+msgid "show progress after <n> objects"
+msgstr "perlihatkan perkembangan setelah <n> objek"
+
+#: builtin/fast-export.c:1173
+msgid "select handling of signed tags"
+msgstr "pilih penanganan tag bertandatangan"
+
+#: builtin/fast-export.c:1176
+msgid "select handling of tags that tag filtered objects"
+msgstr "pilih penanganan tag yang men-tag objek tersaring"
+
+#: builtin/fast-export.c:1179
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "pilih penanganan pesan komit dalam pengkodean alternatif"
+
+#: builtin/fast-export.c:1182
+msgid "dump marks to this file"
+msgstr "buang tanda ke berkas ini"
+
+#: builtin/fast-export.c:1184
+msgid "import marks from this file"
+msgstr "impor tanda dari berkas ini"
+
+#: builtin/fast-export.c:1188
+msgid "import marks from this file if it exists"
+msgstr "impor tanda dari berkas ini jika ada"
+
+#: builtin/fast-export.c:1190
+msgid "fake a tagger when tags lack one"
+msgstr "palsukan pen-tag ketika tidak ada pada tag"
+
+#: builtin/fast-export.c:1192
+msgid "output full tree for each commit"
+msgstr "keluarkan pohon penuh untuk setiap komit"
+
+#: builtin/fast-export.c:1194
+msgid "use the done feature to terminate the stream"
+msgstr "gunakan fitur selesai untuk mengakhiri arus"
+
+#: builtin/fast-export.c:1195
+msgid "skip output of blob data"
+msgstr "lewati keluaran data blob"
+
+#: builtin/fast-export.c:1196 builtin/log.c:1860
+msgid "refspec"
+msgstr "spek referensi"
#: builtin/fast-export.c:1197
-msgid "show progress after <n> objects"
-msgstr ""
+msgid "apply refspec to exported refs"
+msgstr "terapkan spek referensi ke referensi terekspor"
+
+#: builtin/fast-export.c:1198
+msgid "anonymize output"
+msgstr "anonimkan keluaran"
#: builtin/fast-export.c:1199
-msgid "select handling of signed tags"
-msgstr ""
+msgid "from:to"
+msgstr "dari:ke"
-#: builtin/fast-export.c:1202
-msgid "select handling of tags that tag filtered objects"
-msgstr ""
+#: builtin/fast-export.c:1200
+msgid "convert <from> to <to> in anonymized output"
+msgstr "ubah <dari> ke <ke> pada keluaran teranonim"
+
+#: builtin/fast-export.c:1203
+msgid "reference parents which are not in fast-export stream by object id"
+msgstr "referensikan induk yang tidak ada dalam arus fast-export oleh id objek"
#: builtin/fast-export.c:1205
-msgid "select handling of commit messages in an alternate encoding"
-msgstr ""
-
-#: builtin/fast-export.c:1208
-msgid "dump marks to this file"
-msgstr ""
-
-#: builtin/fast-export.c:1210
-msgid "import marks from this file"
-msgstr ""
-
-#: builtin/fast-export.c:1214
-msgid "import marks from this file if it exists"
-msgstr ""
-
-#: builtin/fast-export.c:1216
-msgid "fake a tagger when tags lack one"
-msgstr ""
-
-#: builtin/fast-export.c:1218
-msgid "output full tree for each commit"
-msgstr ""
-
-#: builtin/fast-export.c:1220
-msgid "use the done feature to terminate the stream"
-msgstr ""
-
-#: builtin/fast-export.c:1221
-msgid "skip output of blob data"
-msgstr ""
-
-#: builtin/fast-export.c:1222 builtin/log.c:1826
-msgid "refspec"
-msgstr ""
-
-#: builtin/fast-export.c:1223
-msgid "apply refspec to exported refs"
-msgstr ""
-
-#: builtin/fast-export.c:1224
-msgid "anonymize output"
-msgstr ""
-
-#: builtin/fast-export.c:1225
-msgid "from:to"
-msgstr ""
-
-#: builtin/fast-export.c:1226
-msgid "convert <from> to <to> in anonymized output"
-msgstr ""
-
-#: builtin/fast-export.c:1229
-msgid "reference parents which are not in fast-export stream by object id"
-msgstr ""
-
-#: builtin/fast-export.c:1231
msgid "show original object ids of blobs/commits"
-msgstr ""
+msgstr "perlihatkan id objek asli dari blob/komit"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
-msgstr ""
+msgstr "label tag dengan id tanda"
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr ""
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3097
#, c-format
msgid "Missing from marks for submodule '%s'"
-msgstr ""
+msgstr "Kehilangan tanda dari untuk submodul '%s'"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3099
#, c-format
msgid "Missing to marks for submodule '%s'"
-msgstr ""
+msgstr "Kehilangan tanda ke untuk submodul '%s'"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3234
#, c-format
msgid "Expected 'mark' command, got %s"
-msgstr ""
+msgstr "Perintah 'mark' diharapkan, dapat %s"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3239
#, c-format
msgid "Expected 'to' command, got %s"
-msgstr ""
+msgstr "Perintah 'to' diharapkan, dapat %s"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3331
msgid "Expected format name:filename for submodule rewrite option"
msgstr ""
+"Format nama:nama berkas diharapkan untuk operasi penulisan ulang submodul"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3386
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr ""
+msgstr "fitur '%s' dilarang dalam input tanpa --allow-unsafe-features"
-#: builtin/fetch-pack.c:242
+#: builtin/fetch-pack.c:246
#, c-format
msgid "Lockfile created but not reported: %s"
-msgstr ""
+msgstr "Berkas kunci dibuat tetapi tidak dilaporkan: %s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opsi>] [<repositori> [<spek referensi>...]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opsi>] <grup>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opsi>] [(<repositori> | <grup>)]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opsi>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:124
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel tidak dapat bernilai negatif"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:147 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "ambil dari semua remote"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:149 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "setel hulu untuk git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:151 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "tambah ke .git/FETCH_HEAD daripada timpa"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:153
msgid "use atomic transaction to update references"
msgstr ""
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:155 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "jalur ke paket unggah pada sisi remote"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
msgid "force overwrite of local reference"
msgstr "paksa timpa referensi lokal"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:158
msgid "fetch from multiple remotes"
msgstr "ambil dari banyak remote"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:160 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "ambil semua tag dan objek yang bersesuaian"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
msgid "do not fetch all tags (--no-tags)"
msgstr "jangan ambil semua tag (--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:164
msgid "number of submodules fetched in parallel"
msgstr "jumlah submodul yang diambil secara bersamaan"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:166
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
+"modifikasi spek referensi untuk tempatkan semua referensi di dalam refs/"
+"prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:168 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "buang cabang pelacak remote yang tidak ada pada remote"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:170
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "buang tag lokal yang tidak ada pada remote dan klob tag yang berubah"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
msgid "on-demand"
msgstr "sesuai permintaan"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:172
msgid "control recursive fetching of submodules"
msgstr "kontrol pengambilan submodul rekursif"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:177
msgid "write fetched references to the FETCH_HEAD file"
msgstr "tulis referensi yang diambil ke berkas FETCH_HEAD"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:178 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "simpan paket yang diunduh"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:180
msgid "allow updating of HEAD ref"
msgstr "bolehkan perbarui referensi HEAD"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "perdalam riwayat klon dangkal"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:185 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "perdalam riwayat repositori dangkal berdasarkan waktu"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:191 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "ubah ke repositori penuh"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:194
+msgid "re-fetch without negotiating common commits"
+msgstr ""
+
+#: builtin/fetch.c:197
msgid "prepend this to submodule path output"
msgstr "tambahkan ini ke jalur keluaran submodul"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:200
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -14401,142 +15289,143 @@
"default untuk ambil submodul secara rekursif (prioritas lebih rendah "
"dariberkas konfigurasi)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:204 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "terima referensi yang memperbarui .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:205 builtin/pull.c:230
msgid "refmap"
msgstr "peta referensi"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:206 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "sebutkan ambil peta referensi"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:213 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr ""
"laporkan bahwa kami hanya punya object yang bisa dicapai dari objek ini"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:215
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
+"jangan ambil berkas pak; sebagai gantinya cetak leluhur dari ujung negosiasi"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:218 builtin/fetch.c:220
msgid "run 'maintenance --auto' after fetching"
msgstr "lakukan 'maintenance --auto' setelah pengambilan"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:222 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "periksa pembaruan terpaksa pada semua cabang"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:224
msgid "write the commit-graph after fetching"
msgstr "tulis grafik komit setelah pengambilan"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:226
msgid "accept refspecs from stdin"
msgstr "terima spek referensi dari masukan standar"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#: builtin/fetch.c:618
+msgid "couldn't find remote ref HEAD"
msgstr "tidak dapat menemukan referensi remote HEAD"
-#: builtin/fetch.c:757
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr "konfigurasi fetch.output berisi nilai tidak valid %s"
-
-#: builtin/fetch.c:856
+#: builtin/fetch.c:893
#, c-format
msgid "object %s not found"
msgstr "objek %s tidak ditemukan"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:897
msgid "[up to date]"
msgstr "[terkini]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
msgid "[rejected]"
msgstr "[tertolak]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:911
msgid "can't fetch in current branch"
msgstr "tidak dapat mengambil di cabang saat ini"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:912
+msgid "checked out in another worktree"
+msgstr "ter-check out di dalam pohon kerja lainnya"
+
+#: builtin/fetch.c:922
msgid "[tag update]"
msgstr "[pembaruan tag]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
+#: builtin/fetch.c:994
msgid "unable to update local ref"
msgstr "tidak dapat memperbarui referensi lokal"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:927
msgid "would clobber existing tag"
msgstr "akan klob tag yang ada"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:949
msgid "[new tag]"
msgstr "[tag baru]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:952
msgid "[new branch]"
msgstr "[cabang baru]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:955
msgid "[new ref]"
msgstr "[referensi baru]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:994
msgid "forced update"
msgstr "pembaruan terpaksa"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:999
msgid "non-fast-forward"
msgstr "bukan-maju-cepat"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1102
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'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"Ambil secara normal mengindikasikan cabang mana ada pembaruan terpaksa,\n"
-"tapi pemeriksaan tersebut dinonaktifkan. Untuk aktifkan kembali, gunakan\n"
-"'--show-forced-updates' atau jalankan 'git config fetch.showForcedUpdates "
-"true'."
+"fetch secara normal mengindikasikan cabang mana ada pembaruan terpaksa,\n"
+"tapi pemeriksaan tersebut sudah dinonaktifkan. Untuk aktifkan kembali, "
+"gunakan\n"
+"bendera '--show-forced-updates' atau jalankan 'git config fetch."
+"showForcedUpdates true'."
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1106
#, c-format
msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-"Butuh waktu %2.f detik untuk periksa pembaruan terpaksa. Anda dapat\n"
+"Butuh waktu %2.f detik untuk memeriksa pembaruan terpaksa; Anda dapat\n"
"menggunakan '--no-show-forced-updates' atau jalankan\n"
"'git config fetch.showForcedUpdates false'\n"
-" untuk menghindari pemeriksaan ini.\n"
+"untuk menghindari pemeriksaan ini.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1136
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s tidak mengirim semua objek yang diperlukan\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1156
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1259 builtin/fetch.c:1418
#, c-format
msgid "From %.*s\n"
msgstr "Dari %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1269
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14545,136 +15434,142 @@
"beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n"
" 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1377
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s akan menjadi terjuntai)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1378
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s telah menjadi terjuntai)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1421
msgid "[deleted]"
msgstr "[dihapus]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1422 builtin/remote.c:1153
msgid "(none)"
msgstr "(tidak ada)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1446
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Tolak mengambil ke cabang saat ini %s dari repositori non-bare"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "menolak mengambil ke dalam cabang '%s' yang ter-checkout pada '%s'"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1466
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "Opsi \"%s\" nilai \"%s\" tidak valid untuk %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "opsi \"%s\" nilai \"%s\" tidak valid untuk %s"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1469
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "Opsi \"%s\" diabaikan untuk %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "opsi \"%s\" diabaikan untuk %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1496
+#, c-format
+msgid "the object %s does not exist"
+msgstr "objek '%s' tidak ada"
+
+#: builtin/fetch.c:1748
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1760
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"tidak dapat menyetel hulu HEAD ke %s dari '%s' ketika itu tak menunjuk pada "
+"cabang apapun."
+
+#: builtin/fetch.c:1773
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "tidak setel hulu untuk cabang remote pelacak remote"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1775
msgid "not setting upstream for a remote tag"
msgstr "tidak setel hulu untuk tag remote"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1777
msgid "unknown branch type"
msgstr "tipe cabang tidak diketahui"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1779
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
-"cabang sumber tidak ditemukan.\n"
+"cabang sumber tidak ditemukan;\n"
"Anda harus sebutkan tepat satu cabang dengan opsi --set-upstream."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1904 builtin/fetch.c:1967
#, c-format
msgid "Fetching %s\n"
msgstr "Mengambil %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1914 builtin/fetch.c:1969
#, c-format
-msgid "Could not fetch %s"
-msgstr "Tidak dapat mengambil %s"
+msgid "could not fetch %s"
+msgstr "tidak dapat mengambil %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1926
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "tidak dapat mengambil '%s' (kode keluar: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:2030
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
-"Repositori remot tidak disebutkan. Mohon sebutkan baik URL atau nama\n"
-"cabang yang mana revisi baru sebaiknya diambil."
+"repositori remote tidak disebutkan; mohon sebutkan baik URL atau nama\n"
+"remote yang mana revisi baru sebaiknya diambil"
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Anda perlu sebutkan nama tag"
+#: builtin/fetch.c:2066
+msgid "you need to specify a tag name"
+msgstr "Anda perlu sebutkan sebuah nama tag"
-#: builtin/fetch.c:1994
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
-msgstr "--negotiate-only perlu satu atau lebih --negotiate-tip=*"
+#: builtin/fetch.c:2156
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
+msgstr "--negotiate-only perlu satu atau lebih --negotiation-tip=*"
-#: builtin/fetch.c:1998
-msgid "Negative depth in --deepen is not supported"
-msgstr "Kedalaman negatif di --deepen tidak didukung"
+#: builtin/fetch.c:2160
+msgid "negative depth in --deepen is not supported"
+msgstr "kedalaman negatif pada --deepen tidak didukung"
-#: builtin/fetch.c:2000
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen dan --depth saling eksklusif"
-
-#: builtin/fetch.c:2005
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth dan --unshallow tidak dapat digunakan bersamaan"
-
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2169
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow pada repositori penuh tidak masuk akal"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2186
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tidak mengambil argumen repositori"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2188
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all tidak masuk akal dengan spek referensi"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2197
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "tidak ada remote atau grup remote seperti itu: %s"
+msgid "no such remote or remote group: %s"
+msgstr "tidak ada remote atau grup remote seperti: %s"
-#: builtin/fetch.c:2042
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Ambil grup dan sebutkan spek referensi tidak masuk akal"
+#: builtin/fetch.c:2205
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "mengambil sebuah grup dan menyebutkan spek referensi tidak masuk akal"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2221
msgid "must supply remote when using --negotiate-only"
-msgstr ""
+msgstr "harus suplai remote ketika menggunakan --negotiate-only"
-#: builtin/fetch.c:2063
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr ""
+#: builtin/fetch.c:2226
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "protokol tidak mendukung --negotiate-only, keluar."
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2246
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14682,11 +15577,11 @@
"--filter hanya dapat digunakan dengan remote yang terkonfigurasi di "
"extensions.partialclone"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2250
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2254
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote"
@@ -14695,23 +15590,27 @@
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr ""
@@ -14731,47 +15630,47 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:42 builtin/tag.c:482
msgid "respect format colors"
msgstr ""
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr ""
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr ""
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr ""
@@ -14793,28 +15692,28 @@
#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
msgid "unknown"
-msgstr ""
+msgstr "tidak dikenal"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
#: builtin/fsck.c:78 builtin/fsck.c:100
#, c-format
msgid "error in %s %s: %s"
-msgstr ""
+msgstr "kesalahan pada %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
#: builtin/fsck.c:94
#, c-format
msgid "warning in %s %s: %s"
-msgstr ""
+msgstr "peringatan pada %s %s: %s"
#: builtin/fsck.c:124 builtin/fsck.c:127
#, c-format
msgid "broken link from %7s %s"
-msgstr ""
+msgstr "tautan rusak dari %7s %s"
#: builtin/fsck.c:136
msgid "wrong object type in link"
-msgstr ""
+msgstr "tipe objek salah dalam tautan"
#: builtin/fsck.c:152
#, c-format
@@ -14822,475 +15721,647 @@
"broken link from %7s %s\n"
" to %7s %s"
msgstr ""
+"tautan rusak dari %7s %s\n"
+" ke %7s %s"
#: builtin/fsck.c:264
#, c-format
msgid "missing %s %s"
-msgstr ""
+msgstr "kehilangan %s %s"
#: builtin/fsck.c:291
#, c-format
msgid "unreachable %s %s"
-msgstr ""
+msgstr "tidak dapat dicapai %s %s"
#: builtin/fsck.c:311
#, c-format
msgid "dangling %s %s"
-msgstr ""
+msgstr "teruntai %s %s"
#: builtin/fsck.c:321
msgid "could not create lost-found"
-msgstr ""
+msgstr "tidak dapat membuat lost-found"
#: builtin/fsck.c:332
#, c-format
msgid "could not finish '%s'"
-msgstr ""
+msgstr "tidak dapat menyelesaikan '%s'"
#: builtin/fsck.c:349
#, c-format
msgid "Checking %s"
-msgstr ""
+msgstr "Memeriksa %s"
#: builtin/fsck.c:387
#, c-format
msgid "Checking connectivity (%d objects)"
-msgstr ""
+msgstr "Memerika konektivitas (%d objek)"
#: builtin/fsck.c:406
#, c-format
msgid "Checking %s %s"
-msgstr ""
+msgstr "Memeriksa %s %s"
#: builtin/fsck.c:411
msgid "broken links"
-msgstr ""
+msgstr "tautan rusak"
#: builtin/fsck.c:420
#, c-format
msgid "root %s"
-msgstr ""
+msgstr "akar %s"
#: builtin/fsck.c:428
#, c-format
msgid "tagged %s %s (%s) in %s"
-msgstr ""
+msgstr "ter-tag %s %s (%s) di %s"
#: builtin/fsck.c:457
#, c-format
msgid "%s: object corrupt or missing"
-msgstr ""
+msgstr "%s: objek rusak atau hilang"
#: builtin/fsck.c:482
#, c-format
msgid "%s: invalid reflog entry %s"
-msgstr ""
+msgstr "%s: entri log referensi tidak valid %s"
#: builtin/fsck.c:496
#, c-format
msgid "Checking reflog %s->%s"
-msgstr ""
+msgstr "Memeriksa log referensi %s->%s"
#: builtin/fsck.c:530
#, c-format
msgid "%s: invalid sha1 pointer %s"
-msgstr ""
+msgstr "%s: penunjuk sha1 tidak valid %s"
#: builtin/fsck.c:537
#, c-format
msgid "%s: not a commit"
-msgstr ""
+msgstr "%s: bukan sebuah komit"
#: builtin/fsck.c:591
msgid "notice: No default references"
+msgstr "catatan: Tidak ada referensi asali"
+
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
msgstr ""
-#: builtin/fsck.c:606
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
-msgstr ""
+msgstr "%s: objek rusak atau hilang: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: objek bertipe tidak dikenal '%s': %s"
+
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
-msgstr ""
+msgstr "%s: objek tidak dapat diuraikan: %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
-msgstr ""
+msgstr "sha1 berkas jelek: %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:686
msgid "Checking object directory"
-msgstr ""
+msgstr "Memeriksa direktori objek"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:689
msgid "Checking object directories"
-msgstr ""
+msgstr "Memeriksa direktori objek"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
-msgstr ""
+msgstr "Memeriksa tautan %s"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:710 builtin/index-pack.c:862
#, c-format
msgid "invalid %s"
msgstr "%s tidak valid"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
-msgstr ""
+msgstr "%s menunjuk ke sesuatu yang aneh (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
-msgstr ""
+msgstr "%s: HEAD terpisah tidak menunjuk ke apapun"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
-msgstr ""
+msgstr "catatan: %s menunjuk ke cabang yang belum lahir (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:739
msgid "Checking cache tree"
-msgstr ""
+msgstr "Memeriksa pohon tembolok"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
-msgstr ""
+msgstr "%s: penunjuk sha1 tidak valid pada pohon tembolok"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
-msgstr ""
+msgstr "bukan pohon pada pohon tembolok"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
-msgstr ""
+msgstr "git fsck [<opsi>] [<objek>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:790
msgid "show unreachable objects"
-msgstr ""
+msgstr "perlihatkan objek yang tak dapat dicapai"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:791
msgid "show dangling objects"
-msgstr ""
+msgstr "perlihatkan objek teruntai"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:792
msgid "report tags"
-msgstr ""
+msgstr "laporkan tag"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:793
msgid "report root nodes"
-msgstr ""
+msgstr "laporkan simpul akar"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
-msgstr ""
+msgstr "buat objek indeks simpul kepala"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
-msgstr ""
+msgstr "buat log referensi simpul kepala (asali)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
-msgstr ""
+msgstr "juga pertimbangkan pak dan objek alternatif"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:797
msgid "check only connectivity"
-msgstr ""
+msgstr "hanya periksa konektivitas"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:75
msgid "enable more strict checking"
-msgstr ""
+msgstr "aktifkan pemeriksaan lebih ketat"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
-msgstr ""
+msgstr "tulis objek teruntai dalam .git/lost-found"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
-msgstr ""
+msgstr "perlihatkan perkembangan"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
-msgstr ""
+msgstr "perlihatkan nama lantung untuk objek yang dapat dicapai"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Memeriksa objek"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
-msgstr ""
+msgstr "%s: objek hilang"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "parameter tidak valid: sha1 diharapkan, dapat '%s'"
+
+#: builtin/fsmonitor--daemon.c:13
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:14
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:15
+msgid "git fsmonitor--daemon stop"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:16
+msgid "git fsmonitor--daemon status"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:57
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:99
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:104
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:170
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:753
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1187
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1199
+msgid "could not start fsmonitor listener thread"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1297
+msgid "could not initialize listener thread"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1332
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1387
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1413
+msgid "daemon failed to start"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1416
+msgid "daemon not online yet"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1419
+msgid "daemon terminated"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1429
+msgid "detach from console"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1432
+msgid "use <n> ipc worker threads"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1435
+msgid "max seconds to wait for background daemon startup"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1449
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1464
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1477
+msgid "fsmonitor--daemon not supported on this platform"
msgstr ""
#: builtin/gc.c:39
msgid "git gc [<options>]"
-msgstr ""
+msgstr "git gc [<opsi>]"
#: builtin/gc.c:93
#, c-format
msgid "Failed to fstat %s: %s"
-msgstr ""
+msgstr "Gagal men-fstat %s: %s"
#: builtin/gc.c:129
#, c-format
msgid "failed to parse '%s' value '%s'"
-msgstr ""
+msgstr "gagal menguraikan nilai '%s' '%s'"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
-msgstr ""
+msgstr "tidak dapat men-stat '%s'"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr ""
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
+"Aksi gc terakhir melaporkan berikut. Mohon koreksi akar masalah\n"
+"dan hapus %s\n"
+"Pembersihan otomatis tidak akan dilakukan sampai berkas dihapus.\n"
+"\n"
+"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
-msgstr ""
-
-#: builtin/gc.c:553
-msgid "be more thorough (increased runtime)"
-msgstr ""
+msgstr "pangkas objek tak tereferensi"
#: builtin/gc.c:554
+msgid "be more thorough (increased runtime)"
+msgstr "jadi lebih cermat (waktu yang dijalankan bertambah)"
+
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
-msgstr ""
+msgstr "aktifkan mode gc otomatis"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
-msgstr ""
+msgstr "paksa jalankan gc bahkan jika mungkin ada gc lain yang berjalan"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
-msgstr ""
+msgstr "pak ulang semua pak yang lain kecuali pak terbesar"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
-msgstr ""
+msgstr "gagal menguraikan nilai gc.logexpiry %s"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
-msgstr ""
+msgstr "gagal menguraikan nilai pangkas kadaluarsa %s"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
-msgstr ""
-
-#: builtin/gc.c:609
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
-msgstr ""
+msgstr "Mempak otomatis repositori di latar belakang untuk performa optimal.\n"
#: builtin/gc.c:610
#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr ""
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "Mempak otomatis repositori untuk performa optimal.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:611
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "Lihat \"git help gc\" untuk pembenahan manual.\n"
+
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
+"gc sudah berjalan pada mesin '%s' pid %<PRIuMAX> (gunakan --force jika tidak)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
+"Ada terlalu banyak objek longgar yang tak dapat dicapai; jalankan 'git "
+"prune' untuk menghapusnya."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<tugas>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
-msgstr ""
+msgstr "--no-schedule tidak diperbolehkan"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
-msgstr ""
+msgstr "argumen --schedule tidak dikenal '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
-msgstr ""
+msgstr "gagal menulis grafik komit"
-#: builtin/gc.c:905
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
-msgstr ""
+msgstr "gagal mem-praambil remote"
#: builtin/gc.c:1022
msgid "failed to start 'git pack-objects' process"
-msgstr ""
+msgstr "gagal memulai proses 'git pack-objects'"
#: builtin/gc.c:1039
msgid "failed to finish 'git pack-objects' process"
-msgstr ""
+msgstr "gagal menyelesaikan proses 'git pack-objects'"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
-msgstr ""
+msgstr "gagal menulis indeks multipak"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
-msgstr ""
+msgstr "'git multi-pack-index expire' gagal"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
-msgstr ""
+msgstr "'git multi-pack-index repack' gagal"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
+"melewatkan tugas pengepakan tambahan karena core.multiPackIndex dinonaktifkan"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
-msgstr ""
+msgstr "berkas kunci '%s' ada, melewatkan pemeliharaan"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
-msgstr ""
+msgstr "tugas '%s' gagal"
+
+#: builtin/gc.c:1390
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' bukan tugas yang valid"
#: builtin/gc.c:1395
#, c-format
-msgid "'%s' is not a valid task"
-msgstr ""
-
-#: builtin/gc.c:1400
-#, c-format
msgid "task '%s' cannot be selected multiple times"
-msgstr ""
+msgstr "tugas '%s' tidak dapat dipilih berulang kali"
+
+#: builtin/gc.c:1410
+msgid "run tasks based on the state of the repository"
+msgstr "jalankan tugas berdasarkan keadaan repositori"
+
+#: builtin/gc.c:1411
+msgid "frequency"
+msgstr "frekuensi"
+
+#: builtin/gc.c:1412
+msgid "run tasks based on frequency"
+msgstr "jalankan tugas berdasarkan frekuensi"
#: builtin/gc.c:1415
-msgid "run tasks based on the state of the repository"
-msgstr ""
-
-#: builtin/gc.c:1416
-msgid "frequency"
-msgstr ""
-
-#: builtin/gc.c:1417
-msgid "run tasks based on frequency"
-msgstr ""
-
-#: builtin/gc.c:1420
msgid "do not report progress or other information over stderr"
msgstr ""
+"jangan laporkan perkembangan atau informasi lainnya ke kesalahan standar"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
msgid "task"
-msgstr ""
+msgstr "tugas"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
msgid "run a specific task"
-msgstr ""
+msgstr "jalankan tugas spesifik"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr ""
+msgstr "gunakan paling banyak satu dari --auto dan --schedule=<frekuensi>"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
-msgstr ""
+msgstr "gagal menjalankan 'git config'"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
-msgstr ""
+msgstr "gagal memperluas jalur '%s'"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
-msgstr ""
+msgstr "gagal menjalankan launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
-msgstr ""
+msgstr "gagal membuat direktori untuk '%s'"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
-msgstr ""
+msgstr "gagal men-tali-botkan layanan %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
-msgstr ""
+msgstr "gagal membuat berkas xml sementara"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
-msgstr ""
+msgstr "gagal menjalankan schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
+"gagal menjalankan 'crontab -l'; sistem Anda mungkin tidak mendukung 'cron'"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
+"gagal menjalankan 'crontab'; sistem Anda mungkin tidak mendukung 'cron'"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
-msgstr ""
+msgstr "gagal membuka masukan standar dari 'crontab'"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
msgid "'crontab' died"
-msgstr ""
+msgstr "'crontab' mati"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "gagal memulai systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "gagal menjalankan systemctl"
+
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
+#: builtin/worktree.c:1024
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "gagal menghapus '%s'"
+
+#: builtin/gc.c:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "argumen --scheduler tidak dikenal '%s'"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "baik pewaktu systemd atau crontab tidak tersedia"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "penjadwal %s tidak tersedia"
+
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
-msgstr ""
+msgstr "proses lainnya sedang menjadwalkan peme"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<penjadwal>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "penjadwal"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "penjadwal untuk memicu git maintenance run"
+
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
-msgstr ""
+msgstr "gagal menambahkan repositori ke konfigurasi global"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
-msgstr ""
+msgstr "git maintenance <subperintah> [<opsi>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
-msgstr ""
+msgstr "subperintah tidak valid: %s"
-#: builtin/grep.c:30
+#: builtin/grep.c:32
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opsi>] [-e] <pola> [<revisi>...] [[--] <pola>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:241
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: gagal membuat utas: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:295
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "jumlah utas yang diberikan (%d) tidak valid untuk %s"
@@ -15299,357 +16370,356 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3150
#, c-format
msgid "no threads support, ignoring %s"
msgstr "tidak ada dukungan utas, abaikan %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
#, c-format
msgid "unable to read tree (%s)"
msgstr "tidak dapat membaca pohon (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:674
#, c-format
msgid "unable to grep from object of type %s"
msgstr "tidak dapan men-grep dari objek dengan tipe %s"
-#: builtin/grep.c:738
+#: builtin/grep.c:754
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "saklar '%c' mengharapkan nilai numerik"
-#: builtin/grep.c:837
+#: builtin/grep.c:852
msgid "search in index instead of in the work tree"
msgstr "cari dalam index daripada dalam pohon kerja"
-#: builtin/grep.c:839
+#: builtin/grep.c:854
msgid "find in contents not managed by git"
msgstr "temukan dalam konten yang tak dikelola oleh git"
-#: builtin/grep.c:841
+#: builtin/grep.c:856
msgid "search in both tracked and untracked files"
msgstr "cari dalam berkas terlacak dan tak terlacak"
-#: builtin/grep.c:843
+#: builtin/grep.c:858
msgid "ignore files specified via '.gitignore'"
msgstr "abaikan berkas yang disebutkan via '.gitignore'"
-#: builtin/grep.c:845
+#: builtin/grep.c:860
msgid "recursively search in each submodule"
msgstr "cari secara rekursif dalam setiap submodul"
-#: builtin/grep.c:848
+#: builtin/grep.c:863
msgid "show non-matching lines"
msgstr "perlihatkan baris nir-cocok"
-#: builtin/grep.c:850
+#: builtin/grep.c:865
msgid "case insensitive matching"
msgstr "pencocokan tak peka kapital"
-#: builtin/grep.c:852
+#: builtin/grep.c:867
msgid "match patterns only at word boundaries"
msgstr "cocokkan pola hanya pada batas kata"
-#: builtin/grep.c:854
+#: builtin/grep.c:869
msgid "process binary files as text"
msgstr "proses berkas biner sebagai teks"
-#: builtin/grep.c:856
+#: builtin/grep.c:871
msgid "don't match patterns in binary files"
msgstr "jangan cocokkan pola pada berkas biner"
-#: builtin/grep.c:859
+#: builtin/grep.c:874
msgid "process binary files with textconv filters"
msgstr "proses berkas biner dengan saringan textconv"
-#: builtin/grep.c:861
+#: builtin/grep.c:876
msgid "search in subdirectories (default)"
msgstr "cari dalam subdirektori (asali)"
-#: builtin/grep.c:863
+#: builtin/grep.c:878
msgid "descend at most <depth> levels"
msgstr "turun paling banyak <kedalaman> tingkat"
-#: builtin/grep.c:867
+#: builtin/grep.c:882
msgid "use extended POSIX regular expressions"
msgstr "gunakan ekspresi reguler POSIX diperpanjang"
-#: builtin/grep.c:870
+#: builtin/grep.c:885
msgid "use basic POSIX regular expressions (default)"
msgstr "gunakan ekspresi reguler POSIX dasar (asali)"
-#: builtin/grep.c:873
+#: builtin/grep.c:888
msgid "interpret patterns as fixed strings"
msgstr "tafsirkan pola sebagai untai tetap"
-#: builtin/grep.c:876
+#: builtin/grep.c:891
msgid "use Perl-compatible regular expressions"
msgstr "gunakan ekspresi reguler kompatibel dengan Perl"
-#: builtin/grep.c:879
+#: builtin/grep.c:894
msgid "show line numbers"
msgstr "perlihatkan nomor baris"
-#: builtin/grep.c:880
+#: builtin/grep.c:895
msgid "show column number of first match"
msgstr "perlihatkan nomor kolom cocokan pertama"
-#: builtin/grep.c:881
+#: builtin/grep.c:896
msgid "don't show filenames"
msgstr "jangan perlihatkan nama berkas"
-#: builtin/grep.c:882
+#: builtin/grep.c:897
msgid "show filenames"
msgstr "perlihatkan nama berkas"
-#: builtin/grep.c:884
+#: builtin/grep.c:899
msgid "show filenames relative to top directory"
msgstr "perlihatkan nama berkas relatif terhadap direktori puncak"
-#: builtin/grep.c:886
+#: builtin/grep.c:901
msgid "show only filenames instead of matching lines"
msgstr "hanya perlihatkan nama berkas daripada baris yang cocok"
-#: builtin/grep.c:888
+#: builtin/grep.c:903
msgid "synonym for --files-with-matches"
msgstr "sinonim untuk --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:906
msgid "show only the names of files without match"
msgstr "hanya perlihatkan nama berkas tanpa cocok"
-#: builtin/grep.c:893
+#: builtin/grep.c:908
msgid "print NUL after filenames"
msgstr "cetak NUL setelah nama berkas"
-#: builtin/grep.c:896
+#: builtin/grep.c:911
msgid "show only matching parts of a line"
msgstr "hanya perlihatkan bagian cocokan baris"
-#: builtin/grep.c:898
+#: builtin/grep.c:913
msgid "show the number of matches instead of matching lines"
msgstr "perlihatkan jumlah cocokan daripada baris yang cocok"
-#: builtin/grep.c:899
+#: builtin/grep.c:914
msgid "highlight matches"
msgstr "sorot cocokan"
-#: builtin/grep.c:901
+#: builtin/grep.c:916
msgid "print empty line between matches from different files"
msgstr "cetak baris kosong di antara cocokan dari berkas yang berbeda"
-#: builtin/grep.c:903
+#: builtin/grep.c:918
msgid "show filename only once above matches from same file"
msgstr ""
"perlihatkan nama berkas hanya sekali di atas cocokan dari berkas yang sama"
-#: builtin/grep.c:906
+#: builtin/grep.c:921
msgid "show <n> context lines before and after matches"
msgstr "perlihatkan <n> baris konteks sebelum dan sesudah cocokan"
-#: builtin/grep.c:909
+#: builtin/grep.c:924
msgid "show <n> context lines before matches"
msgstr "perlihatkan <n> baris konteks sebelum cocokan"
-#: builtin/grep.c:911
+#: builtin/grep.c:926
msgid "show <n> context lines after matches"
msgstr "perlihatkan <n> baris konteks setelah cocokan"
-#: builtin/grep.c:913
+#: builtin/grep.c:928
msgid "use <n> worker threads"
msgstr "gunakan <n> utas pekerja"
-#: builtin/grep.c:914
+#: builtin/grep.c:929
msgid "shortcut for -C NUM"
msgstr "pintasan untuk -C NUM"
-#: builtin/grep.c:917
+#: builtin/grep.c:932
msgid "show a line with the function name before matches"
msgstr "perlihatkan sebuah baris dengan nama fungsi sebelum cocokan"
-#: builtin/grep.c:919
+#: builtin/grep.c:934
msgid "show the surrounding function"
msgstr "perlihatkan fungsi di sekitar"
-#: builtin/grep.c:922
+#: builtin/grep.c:937
msgid "read patterns from file"
msgstr "baca pola dari berkas"
-#: builtin/grep.c:924
+#: builtin/grep.c:939
msgid "match <pattern>"
msgstr "cocokkan <pola>"
-#: builtin/grep.c:926
+#: builtin/grep.c:941
msgid "combine patterns specified with -e"
msgstr "kombinasikan pola yang disebutkan dengan -e"
-#: builtin/grep.c:938
+#: builtin/grep.c:953
msgid "indicate hit with exit status without output"
msgstr "tunjukkan kena dengan status keluar tanpa keluaran"
-#: builtin/grep.c:940
+#: builtin/grep.c:955
msgid "show only matches from files that match all patterns"
msgstr "hanya perlihatkan cocokan dari berkas yang cocok dengan semua pola"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "pager"
msgstr "penghalaman"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "show matching files in the pager"
msgstr "perlihatkan berkas yang cocok dalam penghalaman"
-#: builtin/grep.c:947
+#: builtin/grep.c:962
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "perbolehkan pemanggilan grep(1) (diabaikan oleh bangunan ini)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1028
msgid "no pattern given"
msgstr "tidak ada pola yang diberikan"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1064
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index atau --untracked tidak dapat digunakan dengan revisi"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1072
#, c-format
msgid "unable to resolve revision: %s"
msgstr "tidak dapat menguraikan revisi: %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1102
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked tidak didukung dengan --recurse-submodules"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1106
msgid "invalid option combination, ignoring --threads"
msgstr "kombinasi opsi tidak valid, abaikan --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1109 builtin/pack-objects.c:4084
msgid "no threads support, ignoring --threads"
msgstr "tidak ada dukungan utas, abaikan --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "jumlah utas tersebut (%d) tidak valid"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1146
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager hanya bekerja pada pohon kerja"
-#: builtin/grep.c:1157
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached atau --untracked tidak dapat digunakan dengan --no-index"
-
-#: builtin/grep.c:1160
-msgid "--untracked cannot be used with --cached"
-msgstr "--untracked tidak dapat digunakan dengan --cached"
-
-#: builtin/grep.c:1166
+#: builtin/grep.c:1179
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard tidak dapat digunakan untuk konten terlacak"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1187
msgid "both --cached and trees are given"
msgstr "baik --cached dan pohon diberikan"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
+"git hash-object [-t <tipe>] [-w] [--path=<berkas> | --no-filters] [--stdin] "
+"[--] <berkas>..."
-#: builtin/hash-object.c:86
-msgid "git hash-object --stdin-paths"
-msgstr ""
+#: builtin/hash-object.c:97
+msgid "object type"
+msgstr "tipe objek"
#: builtin/hash-object.c:98
-msgid "object type"
-msgstr ""
-
-#: builtin/hash-object.c:99
msgid "write the object into the object database"
-msgstr ""
+msgstr "tulis objek ke dalam basis data objek"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
-msgstr ""
+msgstr "baca objek dari masukan standar"
+
+#: builtin/hash-object.c:102
+msgid "store file as is without filters"
+msgstr "simpan berkas apa adanya tanpa penyaring"
#: builtin/hash-object.c:103
-msgid "store file as is without filters"
-msgstr ""
-
-#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
+"hanya hash sampah acak apapun untuk membuat objek rusak demi menirkutukan Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
-msgstr ""
+msgstr "proses berkas seperti dari jalur ini"
-#: builtin/help.c:47
+#: builtin/help.c:57
msgid "print all available commands"
msgstr "cetak semua perintah yang tersedia"
-#: builtin/help.c:48
+#: builtin/help.c:60
+msgid "show external commands in --all"
+msgstr "perlihatkan perintah eksternal dalam --all"
+
+#: builtin/help.c:61
+msgid "show aliases in --all"
+msgstr "perlihatkan alias pada --all"
+
+#: builtin/help.c:62
msgid "exclude guides"
msgstr "kecualikan panduan"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "cetak daftar panduan berguna"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "cetak semua nama variabel konfigurasi"
-
-#: builtin/help.c:52
+#: builtin/help.c:63
msgid "show man page"
msgstr "perlihatkan halaman man"
-#: builtin/help.c:53
+#: builtin/help.c:64
msgid "show manual in web browser"
msgstr "perlihatkan manual dalam penjelajah web"
-#: builtin/help.c:55
+#: builtin/help.c:66
msgid "show info page"
msgstr "perlihatkan halaman info"
-#: builtin/help.c:57
+#: builtin/help.c:68
msgid "print command description"
msgstr "perlihatkan deskripsi perintah"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/help.c:70
+msgid "print list of useful guides"
+msgstr "cetak daftar panduan berguna"
-#: builtin/help.c:163
+#: builtin/help.c:72
+msgid "print all configuration variable names"
+msgstr "cetak semua nama variabel konfigurasi"
+
+#: builtin/help.c:84
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<perintah>]"
+
+#: builtin/help.c:201
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format bantuan tidak dikenal '%s'"
-#: builtin/help.c:190
+#: builtin/help.c:227
msgid "Failed to start emacsclient."
msgstr "gagal menjalankan emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:240
msgid "Failed to parse emacsclient version."
msgstr "gagal menguraikan versi emacsclient."
-#: builtin/help.c:211
+#: builtin/help.c:248
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "versi emacsclient '%d' terlalu usang (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
#, c-format
msgid "failed to exec '%s'"
msgstr "gagal menjalankan '%s'"
-#: builtin/help.c:307
+#: builtin/help.c:344
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -15658,7 +16728,7 @@
"'%s': jalur untuk pembaca man yang tidak didukung.\n"
"Mohon gunakan 'man.<tool>.cmd' sebagai gantinya."
-#: builtin/help.c:319
+#: builtin/help.c:356
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -15667,234 +16737,243 @@
"'%s': cmd untuk pembaca man yang didukung.\n"
"Mohon gunakan 'man.<tool>.path' sebagai gantinya."
-#: builtin/help.c:436
+#: builtin/help.c:471
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': pembaca man tidak dikenal"
-#: builtin/help.c:452
+#: builtin/help.c:487
msgid "no man viewer handled the request"
msgstr "tidak ada pembaca man yang menangani permintaan"
-#: builtin/help.c:459
+#: builtin/help.c:494
msgid "no info viewer handled the request"
msgstr "tidak ada pembaca info yang menangani permintaan"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:555 builtin/help.c:566 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' dialiaskan ke '%s'"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:569 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "untai alias.%s jelek: %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:611
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "opsi '%s' tidak mengambil argumen bukan opsi"
+
+#: builtin/help.c:631
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr ""
+
+#: builtin/help.c:643 builtin/help.c:671
#, c-format
msgid "usage: %s%s"
msgstr "penggunaan: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:666
msgid "'git help config' for more information"
msgstr "'git help config' untuk informasi lebih lanjut"
-#: builtin/index-pack.c:222
+#: builtin/hook.c:10
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr ""
+
+#: builtin/hook.c:30
+msgid "silently ignore missing requested <hook-name>"
+msgstr ""
+
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "tipe objek tidak cocok pada %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "tidak menerima objek yang diharapkan %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objek %s: yang diharapkan %s, yang didapat %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "EOF awal"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "kesalahan baca pada masukan"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "gunakan lebih banyak pita dari pada yang tersedia"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:754
msgid "pack too large for current definition of off_t"
msgstr "paket terlalu besar untuk definisi off_t saat ini"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "paket melebihi ukuran maksimum yang diperbolehkan"
-
-#: builtin/index-pack.c:343
+#: builtin/index-pack.c:329
#, c-format
-msgid "unable to create '%s'"
-msgstr "tidak dapat membuat '%s'"
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "paket melebihi ukuran maksimum yang diperbolehkan (%s)"
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "tidak dapat membuka berkas paket '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "tanda tangan paket tidak cocok"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versi paket %<PRIu32> tidak didukung"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:380
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paket ada objek jelek pada offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:485
#, c-format
msgid "inflate returned %d"
msgstr "inflate mengembalikan %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:534
msgid "offset value overflow for delta base object"
msgstr "nilai offset meluap untuk objek basis delta"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:542
msgid "delta base offset is out of bound"
msgstr "offset basis delta di luar jangkauan"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:550
#, c-format
msgid "unknown object type %d"
msgstr "tipe objek tidak diketahui %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:581
msgid "cannot pread pack file"
msgstr "tidak dapat pread berkas paket"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:583
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:609
msgid "serious inflate inconsistency"
msgstr "inkonsistensi inflate serius"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
+#: builtin/index-pack.c:823 builtin/index-pack.c:832
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "TUMBUKAN SHA1 DITEMUKAN DENGAN %s !"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
-#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
+#: builtin/index-pack.c:757 builtin/pack-objects.c:290
+#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
#, c-format
msgid "unable to read %s"
msgstr "tidak dapat membaca %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:821
#, c-format
msgid "cannot read existing object info %s"
msgstr "tidak dapat membaca info objek yang ada %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:829
#, c-format
msgid "cannot read existing object %s"
msgstr "tidak dapat membaca objek yang ada %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:843
#, c-format
msgid "invalid blob object %s"
msgstr "objek blob tidak valid %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:846 builtin/index-pack.c:865
msgid "fsck error in packed object"
msgstr "kesalahan fsck dalam objek terpaket"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:867
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Tidak semua objek anak dari %s bisa dicapai"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:928 builtin/index-pack.c:975
msgid "failed to apply delta"
msgstr "gagal menerapkan delta"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Menerima objek"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Mengindeks objek"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paket rusak (SHA1 tidak cocok)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "tidak dapat fstat berkas paket"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "paket memiliki sampah pada ujung"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "bingung di luar kegilaan di parse_pack_objects()"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Menguraikan delta"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
#, c-format
msgid "unable to create thread: %s"
msgstr "tidak dapat membuat utas: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "bingung di luar kegilaan"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Checksum ekor tidak diharapkan untuk %s (kerusakan disk?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "tidak dapat menggemboskan objek tertambah (%d)"
@@ -15904,56 +16983,53 @@
msgid "local object %s is corrupt"
msgstr "objek lokal %s rusak"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1445
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "nama berkas paket '%s' tidak diakhiri dengan '.%s'"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "tidak dapat menulis %s berkas '%s'"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "tidak dapat menutup %s berkas tertulis '%s'"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1494
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "tidak dapat menamai ulang berkas sementara '*.%s' ke '%s'"
+
+#: builtin/index-pack.c:1519
msgid "error while closing pack file"
msgstr "kesalahan menutup berkas paket"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "tidak dapat menyimpan berkas paket"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "tidak dapat menyimpan berkas indeks"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> jelek"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1648
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "tidak dapat membuka berkas paket yang ada '%s'"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "tidak dapat membuka berkas indeks paket untuk '%s'"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1698
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1705
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -15965,33 +17041,25 @@
msgstr "tidak dapat kembali ke direktori kerja saat ini"
#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
#, c-format
msgid "bad %s"
msgstr "%s jelek"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "algoritma hash tak dikenal '%s'"
-#: builtin/index-pack.c:1850
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin tidak dapat digunakan tanpa --stdin"
-
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1856
msgid "--stdin requires a git repository"
msgstr "--stdin memerlukan repositori git"
-#: builtin/index-pack.c:1854
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format tidak dapat digunakan dengan --stdin"
-
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1873
msgid "--verify with no packfile name given"
msgstr "--verify tanpa nama berkas paket diberikan"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "kesalahan fsck dalam objek paket"
@@ -16113,10 +17181,6 @@
msgid "specify the hash algorithm to use"
msgstr "tentukan algoritma hash yang akan digunakan"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir dan --bare saling eksklusif"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
@@ -16203,40 +17267,40 @@
msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/log.c:59
+#: builtin/log.c:60
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opsi>] [<rentang revisi>] [[--] <jalur>...]"
-#: builtin/log.c:60
+#: builtin/log.c:61
msgid "git show [<options>] <object>..."
msgstr "git show [<opsi>] <objek>..."
-#: builtin/log.c:113
+#: builtin/log.c:114
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opsi --decorate tidak valid: %s"
-#: builtin/log.c:180
+#: builtin/log.c:181
msgid "show source"
msgstr "perlihatkan sumber"
-#: builtin/log.c:181
+#: builtin/log.c:182
msgid "use mail map file"
msgstr "gunakan berkas peta surat"
-#: builtin/log.c:184
+#: builtin/log.c:185
msgid "only decorate refs that match <pattern>"
msgstr "hanya dekorasi referensi yang cocok dengan <pola>"
-#: builtin/log.c:186
+#: builtin/log.c:187
msgid "do not decorate refs that match <pattern>"
msgstr "jangan dekorasi referensi yang cocok dengan <pola>"
-#: builtin/log.c:187
+#: builtin/log.c:188
msgid "decorate options"
msgstr "opsi dekorasi"
-#: builtin/log.c:190
+#: builtin/log.c:191
msgid ""
"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
@@ -16244,89 +17308,93 @@
"lacak evolusi rentang baris <awal>,<akhir> atau fungsi :<nama fungsi> dalam "
"<berkas>"
-#: builtin/log.c:213
+#: builtin/log.c:214
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<rentang>:<berkas> tidak dapat digunakan dengan spek jalur"
-#: builtin/log.c:306
+#: builtin/log.c:322
#, c-format
msgid "Final output: %d %s\n"
msgstr "Keluaran terakhir: %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:429
+msgid "unable to create temporary object directory"
+msgstr "tidak dapat membuat direktori objek sementara"
+
+#: builtin/log.c:599
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: berkas jelek"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:614 builtin/log.c:706
#, c-format
msgid "could not read object %s"
msgstr "tidak dapat membaca objek %s"
-#: builtin/log.c:701
+#: builtin/log.c:731
#, c-format
msgid "unknown type: %d"
msgstr "tipe tidak dikenal: %d"
-#: builtin/log.c:846
+#: builtin/log.c:880
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: sampul tidak valid dari mode deskripsi"
-#: builtin/log.c:853
+#: builtin/log.c:887
msgid "format.headers without value"
msgstr "format.headers tanpa nilai"
-#: builtin/log.c:982
+#: builtin/log.c:1016
#, c-format
msgid "cannot open patch file %s"
msgstr "tidak dapat membuka berkas tambalan %s"
-#: builtin/log.c:999
+#: builtin/log.c:1033
msgid "need exactly one range"
msgstr "butuh tepatnya satu rentang"
-#: builtin/log.c:1009
+#: builtin/log.c:1043
msgid "not a range"
msgstr "bukan sebuah rentang"
-#: builtin/log.c:1173
+#: builtin/log.c:1207
msgid "cover letter needs email format"
msgstr "sampul surat butuh format email"
-#: builtin/log.c:1179
+#: builtin/log.c:1213
msgid "failed to create cover-letter file"
msgstr "gagal membuat berkas sampul surat"
-#: builtin/log.c:1266
+#: builtin/log.c:1300
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to gila: %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1327
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opsi>] [<sejak> | <rentang revisi>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1385
msgid "two output directories?"
msgstr "dua direktori keluaran?"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
#, c-format
msgid "unknown commit %s"
msgstr "komit tidak dikenal %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "gagal menguraikan '%s' sebagai referensi valid"
-#: builtin/log.c:1522
+#: builtin/log.c:1556
msgid "could not find exact merge base"
msgstr "tidak dapat menemukan dasar penggabungan eksak"
-#: builtin/log.c:1532
+#: builtin/log.c:1566
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"
@@ -16338,292 +17406,280 @@
"Atau Anda dapat menyebutkan dasar komit secara manual dengan --base=<id "
"dasar komit>"
-#: builtin/log.c:1555
+#: builtin/log.c:1589
msgid "failed to find exact merge base"
msgstr "tidak dapat menemukan dasar penggabungan eksak"
-#: builtin/log.c:1572
+#: builtin/log.c:1606
msgid "base commit should be the ancestor of revision list"
msgstr "dasar komit seharusnya menjadi leluhur daftar revisi"
-#: builtin/log.c:1582
+#: builtin/log.c:1616
msgid "base commit shouldn't be in revision list"
msgstr "dasar komit tidak seharusnya dalam daftar revisi"
-#: builtin/log.c:1640
+#: builtin/log.c:1674
msgid "cannot get patch id"
msgstr "tidak dapat mendapatkan id tambalan"
-#: builtin/log.c:1703
+#: builtin/log.c:1737
msgid "failed to infer range-diff origin of current series"
msgstr "gagal menduga asal range-diff dari seri saat ini"
-#: builtin/log.c:1705
+#: builtin/log.c:1739
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "menggunakan '%s' sebagai asal range-diff dari seri saat ini"
-#: builtin/log.c:1749
+#: builtin/log.c:1783
msgid "use [PATCH n/m] even with a single patch"
msgstr "gunakan [PATCH n/m] bahkan dengan satu tambalan"
-#: builtin/log.c:1752
+#: builtin/log.c:1786
msgid "use [PATCH] even with multiple patches"
msgstr "gunakan [PATCH] bahkan dengan banyak tambalan"
-#: builtin/log.c:1756
+#: builtin/log.c:1790
msgid "print patches to standard out"
msgstr "cetak tambalan ke keluaran standar"
-#: builtin/log.c:1758
+#: builtin/log.c:1792
msgid "generate a cover letter"
msgstr "buat sampul surat"
-#: builtin/log.c:1760
+#: builtin/log.c:1794
msgid "use simple number sequence for output file names"
msgstr "gunakan urutan bilangan sederhana untuk keluarkan nama berkas"
-#: builtin/log.c:1761
+#: builtin/log.c:1795
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1762
+#: builtin/log.c:1796
msgid "use <sfx> instead of '.patch'"
msgstr "gunakan <akhiran> daripada '.patch'"
-#: builtin/log.c:1764
+#: builtin/log.c:1798
msgid "start numbering patches at <n> instead of 1"
msgstr "mulai menomorkan tambalan pada <n> daripada 1"
-#: builtin/log.c:1765
+#: builtin/log.c:1799
msgid "reroll-count"
msgstr ""
-#: builtin/log.c:1766
+#: builtin/log.c:1800
msgid "mark the series as Nth re-roll"
msgstr "tandai seri sebagai gulung ulang ke-N"
-#: builtin/log.c:1768
+#: builtin/log.c:1802
msgid "max length of output filename"
msgstr "panjang nama berkas keluaran maksimum"
-#: builtin/log.c:1770
+#: builtin/log.c:1804
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "gunakan [RFC PATCH] daripada [PATCH]"
-#: builtin/log.c:1773
+#: builtin/log.c:1807
msgid "cover-from-description-mode"
msgstr "cover-from-description-mode"
-#: builtin/log.c:1774
+#: builtin/log.c:1808
msgid "generate parts of a cover letter based on a branch's description"
msgstr "buat bagian dari sampul surat berdasarkan deskripsi cabang"
-#: builtin/log.c:1776
+#: builtin/log.c:1810
msgid "use [<prefix>] instead of [PATCH]"
msgstr "gunakan [<prefix>] daripada [PATCH]"
-#: builtin/log.c:1779
+#: builtin/log.c:1813
msgid "store resulting files in <dir>"
msgstr "simpan hasil berkas di <direktori>"
-#: builtin/log.c:1782
+#: builtin/log.c:1816
msgid "don't strip/add [PATCH]"
msgstr "jangan copot/tambah [PATCH]"
-#: builtin/log.c:1785
+#: builtin/log.c:1819
msgid "don't output binary diffs"
msgstr "jangan keluarkan diff biner"
-#: builtin/log.c:1787
+#: builtin/log.c:1821
msgid "output all-zero hash in From header"
msgstr "keluarkan hash semua-nol di kepala From"
-#: builtin/log.c:1789
+#: builtin/log.c:1823
msgid "don't include a patch matching a commit upstream"
msgstr "jangan termasuk tambalan yang cocok dengan komit hulu"
-#: builtin/log.c:1791
+#: builtin/log.c:1825
msgid "show patch format instead of default (patch + stat)"
msgstr "perlihatkan format tambalan daripada asali (tambalan + stat)"
-#: builtin/log.c:1793
+#: builtin/log.c:1827
msgid "Messaging"
msgstr "Perpesanan"
-#: builtin/log.c:1794
+#: builtin/log.c:1828
msgid "header"
msgstr "kepala"
-#: builtin/log.c:1795
+#: builtin/log.c:1829
msgid "add email header"
msgstr "tambahkan kepala email"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1830 builtin/log.c:1831
msgid "email"
msgstr "email"
-#: builtin/log.c:1796
+#: builtin/log.c:1830
msgid "add To: header"
msgstr "tambahkan kepala To:"
-#: builtin/log.c:1797
+#: builtin/log.c:1831
msgid "add Cc: header"
msgstr "tambahkan kepala Cc:"
-#: builtin/log.c:1798
+#: builtin/log.c:1832
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1799
+#: builtin/log.c:1833
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"setel alamat From ke <identitas> (atau identitas pengkomit jika tidak ada)"
-#: builtin/log.c:1801
+#: builtin/log.c:1835
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1802
+#: builtin/log.c:1836
msgid "make first mail a reply to <message-id>"
msgstr "buat surat pertama balasan ke <id pesan>"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1837 builtin/log.c:1840
msgid "boundary"
msgstr "perbatasan"
-#: builtin/log.c:1804
+#: builtin/log.c:1838
msgid "attach the patch"
msgstr "lampirkan tambalan"
-#: builtin/log.c:1807
+#: builtin/log.c:1841
msgid "inline the patch"
msgstr "bariskan tambalan"
-#: builtin/log.c:1811
+#: builtin/log.c:1845
msgid "enable message threading, styles: shallow, deep"
msgstr "aktifkan utasan pesan, gaya: shallow, deep"
-#: builtin/log.c:1813
+#: builtin/log.c:1847
msgid "signature"
msgstr "tanda tangan"
-#: builtin/log.c:1814
+#: builtin/log.c:1848
msgid "add a signature"
msgstr "tambah tanda tangan"
-#: builtin/log.c:1815
+#: builtin/log.c:1849
msgid "base-commit"
msgstr "dasar komit"
-#: builtin/log.c:1816
+#: builtin/log.c:1850
msgid "add prerequisite tree info to the patch series"
msgstr "tambahkan info pohon prasyarat ke seri tambalan"
-#: builtin/log.c:1819
+#: builtin/log.c:1853
msgid "add a signature from a file"
msgstr "tambahkan tandatangan dari berkas"
-#: builtin/log.c:1820
+#: builtin/log.c:1854
msgid "don't print the patch filenames"
msgstr "jangan cetak nama berkas tambalan"
-#: builtin/log.c:1822
+#: builtin/log.c:1856
msgid "show progress while generating patches"
msgstr "perlihatkan perkembangan ketika membuat tambalan"
-#: builtin/log.c:1824
+#: builtin/log.c:1858
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"perlihatkan perubahan terhadap <revisi> di sampul surat atau satu tambalan"
-#: builtin/log.c:1827
+#: builtin/log.c:1861
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"perlihatkan perubahan terhadap <spek referensi> di sampul surat atau satu "
"tambalan"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1863 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "persentase dimana pembuatan tertimbang"
-#: builtin/log.c:1916
+#: builtin/log.c:1953
#, c-format
msgid "invalid ident line: %s"
msgstr "baris identitas tidak valid: %s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n dan -k saling eksklusif"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc dan -k saling eksklusif"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1978
msgid "--name-only does not make sense"
msgstr "--name-only tidak masuk akal"
-#: builtin/log.c:1943
+#: builtin/log.c:1980
msgid "--name-status does not make sense"
msgstr "--name-status tidak masuk akal"
-#: builtin/log.c:1945
+#: builtin/log.c:1982
msgid "--check does not make sense"
msgstr "--check tidak masuk akal"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, dan --output-directory saling eksklusif"
+#: builtin/log.c:1984
+msgid "--remerge-diff does not make sense"
+msgstr "--remerge-diff tidak masuk akal"
-#: builtin/log.c:2089
+#: builtin/log.c:2129
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff butuh --cover-letter atau satu tambalan"
-#: builtin/log.c:2093
+#: builtin/log.c:2133
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:2094
+#: builtin/log.c:2134
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff terhadap v%d:"
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor butuh --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2144
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff butuh --cover-letter atau satu tambalan"
-#: builtin/log.c:2112
+#: builtin/log.c:2152
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:2113
+#: builtin/log.c:2153
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff terhadap v%d:"
-#: builtin/log.c:2124
+#: builtin/log.c:2164
#, c-format
msgid "unable to read signature file '%s'"
msgstr "tidak dapat membaca berkas tanda tangan '%s'"
-#: builtin/log.c:2160
+#: builtin/log.c:2200
msgid "Generating patches"
msgstr "Membuat tambalan"
-#: builtin/log.c:2204
+#: builtin/log.c:2244
msgid "failed to create output files"
msgstr "tidak dapat membuat berkas keluaran"
-#: builtin/log.c:2263
+#: builtin/log.c:2304
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<hulu> [<kepala> [<batas>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2358
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -16631,192 +17687,231 @@
"Tidak dapat menemukan cabang remote terlacak, mohon sebutkan <hulu>\n"
"secara manual.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
-msgstr ""
+msgstr "git ls-files [<opsi>] [<berkas>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "pisahkan jalur dengan karakter NUL"
+
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
-msgstr ""
+msgstr "identifikasi status berkas dengan tag"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
-msgstr ""
+msgstr "gunakan huruf kecil untuk berkas 'asumsikan tak berubah'"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
-msgstr ""
+msgstr "gunakan huruf kecil untuk berkas 'fsmonitor bersih'"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
-msgstr ""
+msgstr "perlihatkan berkas tertembolok di dalam keluaran (asali)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
-msgstr ""
+msgstr "perlihatkan berkas yang dihapus di dalam keluaran"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
-msgstr ""
+msgstr "perlihatkan berkas yang berubah di dalam keluaran"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
msgid "show other files in the output"
-msgstr ""
+msgstr "perlihatkan berkas lainnya di dalam keluaran"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
-msgstr ""
+msgstr "perlihatkan berkas terabaikan di dalam keluaran"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
-msgstr ""
+msgstr "perlihatkan nama objek dari konten tergelar di dalam keluaran"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
-msgstr ""
+msgstr "perlihatkan berkas pada sistem berkas yang perlu dihapus"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
-msgstr ""
+msgstr "hanya perlihatkan nama direktori 'lainnya'"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
msgid "show line endings of files"
-msgstr ""
+msgstr "perlihatkan akhiran baris berkas"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
-msgstr ""
+msgstr "jangan perlihatkan direktori kosong"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
-msgstr ""
+msgstr "perlihatkan berkas tak tergabung di dalam keluaran"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
-msgstr ""
+msgstr "perlihatkan informasi resolve-undo"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
-msgstr ""
+msgstr "lewati berkas yang cocok dengan pola"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr ""
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "baca pola pengecualian dari <berkas>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
-msgstr ""
+msgstr "baca pola pengecualian tambahan per direktor dalam <berkas>"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
-msgstr ""
+msgstr "tambahkan pengecualian git standar"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
-msgstr ""
-
-#: builtin/ls-files.c:666
-msgid "recurse through submodules"
-msgstr ""
-
-#: builtin/ls-files.c:668
-msgid "if any <file> is not in the index, treat this as an error"
-msgstr ""
+msgstr "buat keluaran relatif terhadap direktori puncak proyek"
#: builtin/ls-files.c:669
-msgid "tree-ish"
+msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
+"jika <berkas> apapun tidak berada di indeks, perlakukan sebagai kesalahan"
#: builtin/ls-files.c:670
+msgid "tree-ish"
+msgstr "mirip-pohon"
+
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr ""
+msgstr "berpura-pura bahwa jalur yang dihapus sejak <mirip-pohon> masih ada"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
msgid "show debugging data"
-msgstr ""
+msgstr "perlihatkan data penirkutuan"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
-msgstr ""
+msgstr "hapus entri duplikat"
+
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "perlihatkan direktori tipis di hadapan indeks tipis"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repositori> [<referensi>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
-msgstr ""
+msgstr "jangan cetak URL remote"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
msgid "exec"
-msgstr ""
+msgstr "exec"
#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
-msgstr ""
+msgstr "jalur git-upload-pack pada host remote"
#: builtin/ls-remote.c:66
msgid "limit to tags"
-msgstr ""
+msgstr "batasi ke tag"
#: builtin/ls-remote.c:67
msgid "limit to heads"
-msgstr ""
+msgstr "batasi ke kepala"
#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
-msgstr ""
+msgstr "jangan perlihatkan tag terkupas"
#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
-msgstr ""
+msgstr "perhitungkan url.<dasar>.insteadOf"
#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
+"keluar dengan kode keluar 2 jika tidak ada referensi yang cocok ditemukan"
#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
-msgstr ""
+msgstr "perlihatkan referensi pokok selain objek yang ditunjuk olehnya"
-#: builtin/ls-tree.c:30
+#: builtin/ls-tree.c:36
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr ""
+msgstr "git ls-tree [<opsi>] <mirip-pohon> [<jalur>...]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:54
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "tidak dapat mendapatkan info objek tentang '%s'"
+
+#: builtin/ls-tree.c:79
+#, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "format ls-tree jelek: elemen '%s' tidak dimulai dengan '('"
+
+#: builtin/ls-tree.c:83
+#, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "format ls-tree jelek: elemen '%s' tidak diakhiri dengan ')'"
+
+#: builtin/ls-tree.c:109
+#, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr "format ls-tree jelek: %%%.*s"
+
+#: builtin/ls-tree.c:336
msgid "only show trees"
-msgstr ""
+msgstr "hanya perlihatkan pohon"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:338
msgid "recurse into subtrees"
-msgstr ""
+msgstr "rekursi ke dalam subpohon"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:340
msgid "show trees when recursing"
-msgstr ""
+msgstr "perlihatkan pohon ketika rekursi"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:343
msgid "terminate entries with NUL byte"
-msgstr ""
+msgstr "akhiri entri dengan bita NUL"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:344
msgid "include object size"
-msgstr ""
+msgstr "masukkan ukuran objek"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
msgid "list only filenames"
-msgstr ""
+msgstr "hanya daftar nama berkas"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:350
+msgid "list only objects"
+msgstr "hanya daftar objek"
+
+#: builtin/ls-tree.c:353
msgid "use full path names"
-msgstr ""
+msgstr "gunakan nama berkas lengkap"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:355
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
+"daftar pohon keseluruhan; bukan hanya direktori saat ini (menyiratkan --full-"
+"name)"
+
+#: builtin/ls-tree.c:391
+msgid "--format can't be combined with other format-altering options"
+msgstr "--format tidak dapat digabungkan opsi pengubah format lainnya"
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
@@ -16867,50 +17962,54 @@
msgid "use headers in message's body"
msgstr ""
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:227
+msgid "reading patches from stdin/tty..."
+msgstr ""
+
+#: builtin/mailsplit.c:242
#, c-format
msgid "empty mbox: '%s'"
msgstr ""
#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr ""
+msgstr "git merge-base [-a | --all] <komit> <komit>..."
#: builtin/merge-base.c:33
msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr ""
+msgstr "git merge-base [-a | --all] --octopus <komit>..."
#: builtin/merge-base.c:34
msgid "git merge-base --independent <commit>..."
-msgstr ""
+msgstr "git merge-base --independent <komit>..."
#: builtin/merge-base.c:35
msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr ""
+msgstr "git merge-base --is-ancestor <komit> <komit>"
#: builtin/merge-base.c:36
msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr ""
+msgstr "git merge-base --fork-point <referensi> [<komit>]"
-#: builtin/merge-base.c:143
+#: builtin/merge-base.c:144
msgid "output all common ancestors"
-msgstr ""
+msgstr "keluarkan semua leluhur umum"
-#: builtin/merge-base.c:145
+#: builtin/merge-base.c:146
msgid "find ancestors for a single n-way merge"
-msgstr ""
+msgstr "temukan leluhur untuk sebuah penggabungan n-arah"
-#: builtin/merge-base.c:147
+#: builtin/merge-base.c:148
msgid "list revs not reachable from others"
-msgstr ""
+msgstr "daftarkan revisi yang tak terjangkau dari yang lainnya"
-#: builtin/merge-base.c:149
+#: builtin/merge-base.c:150
msgid "is the first one ancestor of the other?"
-msgstr ""
+msgstr "apakah yang pertama leluhur yang lain?"
-#: builtin/merge-base.c:151
+#: builtin/merge-base.c:152
msgid "find where <commit> forked from reflog of <ref>"
-msgstr ""
+msgstr "temukan dimana <komit> digarpu dari log referensi <referensi>"
#: builtin/merge-file.c:9
msgid ""
@@ -16927,26 +18026,30 @@
msgstr ""
#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
+msgid "use a zealous diff3 based merge"
msgstr ""
#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
+msgid "for conflicts, use our version"
msgstr ""
#: builtin/merge-file.c:41
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr ""
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr ""
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr ""
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr ""
@@ -16981,184 +18084,188 @@
msgid "Merging %s with %s\n"
msgstr ""
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opsi>] [<komit>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "tombol `m' butuh sebuah nilai"
-#: builtin/merge.c:146
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "opsi `%s' butuh sebuah nilai"
-#: builtin/merge.c:199
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Tidak dapat menemukan strategi penggabungan '%s'.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Strategi yang tersedia:"
-#: builtin/merge.c:205
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Strategi kustom yang tersedia:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "jangan perlihatkan diffstat pada akhir penggabungan"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "perlihatkan diffstat pada akhir penggabungan"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(sinonim untuk --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"tambah (paling banyak <n>) entri dari log pendek ke pesan komit penggabungan"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "buat satu komit daripada melakukan penggabungan"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "lakukan komit jika penggabungan sukses (asali)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "sunting pesan sebelum komit"
-#: builtin/merge.c:271
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "perbolehkan maju cepat (asali)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "batalkan jika maju cepat tidak dimungkinkan"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "periksa bahwa komit bernama punya tandatangan GPG yang valid"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1145 builtin/revert.c:114
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "strategi penggabungan yang digunakan"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "opsi=nilai"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "opsi untuk strategi penggabungan yang dipilih"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "pesan komit penggabungan (untuk penggabungan bukan maju cepat)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "gunakan <nama> daripada target sebenarnya"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "batalkan penggabungan yang sedang berlangsung saat ini"
-#: builtin/merge.c:292
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort tapi biarkan indeks dan pohon kerja"
-#: builtin/merge.c:294
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "lanjutkan penggabungan yang sedang berlangsung saat ini"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "perbolehkan penggabungan riwayat yang tak terkait"
-#: builtin/merge.c:303
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "lewati hook pre-merge-commit dan commit-msg"
+msgstr "lewati kail pre-merge-commit dan commit-msg"
-#: builtin/merge.c:320
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "tidak dapat menjalankan stase."
-#: builtin/merge.c:325
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "stase gagal"
-#: builtin/merge.c:330
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "bukan objek valid: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "read-tree gagal"
-#: builtin/merge.c:400
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "Sudah diperbarui. (tidak ada yang bisa dilumat)"
-#: builtin/merge.c:414
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Lumat komit -- tak perbarui HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Tidak ada pesan komit -- tak perbarui HEAD\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' tidak menunjuk pada sebuah komit"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Untai branch.%s.mergeoptions jelek: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "Tak tangani apapun selain penggabungan dua kepala."
-#: builtin/merge.c:742
+#: builtin/merge.c:745
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opsi merge-recursive tak dikenal: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "opsi strategi tidak dikenal: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "tidak dapat menulis %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "Tidak dapat membaca dari '%s'"
-#: builtin/merge.c:822
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Tak mengkomit penggabungan; gunakan 'git commit' untuk menyelesaikan "
"penggabungan.\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:831
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"
@@ -17168,11 +18275,11 @@
"diperlukan, khususnya jika itu menggabungkan hulu terbarui ke cabang\n"
"topik.\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Pesan kosong membatalkan komit.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17181,72 +18288,72 @@
"Baris yang diawali dengan '%c' akan diabaikan, dan pesan kosong batalkan\n"
"komit.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:900
msgid "Empty commit message."
msgstr "Pesan komit kosong"
-#: builtin/merge.c:904
+#: builtin/merge.c:915
#, c-format
msgid "Wonderful.\n"
msgstr "Luar biasa.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:976
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "Penggabungan otomatis gagal; selesaikan konflik lalu komit hasilnya.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1015
msgid "No current branch."
msgstr "Tidak ada cabang saat ini."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1017
msgid "No remote for the current branch."
msgstr "Tidak ada remote untuk cabang saat ini."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1019
msgid "No default upstream defined for the current branch."
msgstr "Tidak ada hulu asali yang ditentukan untuk cabang saat ini."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1024
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Tidak ada cabang pelacak remote untuk %s dari %s"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1081
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Nilai jelek '%s' dalam lingkungan '%s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1183
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "bukan sesuatu yang kami bisa gabungkan di %s: %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1217
msgid "not something we can merge"
msgstr "bukan sesuatu yang kami bisa gabungkan"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1330
msgid "--abort expects no arguments"
msgstr "--abort harap tanpa argumen"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1334
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Tidak ada penggabungan yang bisa dibatalkan (MERGE_HEAD hilang)."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1352
msgid "--quit expects no arguments"
msgstr "--quit harap tanpa argumen"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1365
msgid "--continue expects no arguments"
msgstr "--continue harap tanpa argumen"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1369
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Tidak ada penggabungan yang sedang berlangsung (MERGE_HEAD hilang)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1385
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17254,7 +18361,7 @@
"Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada).\n"
"Mohon komit perubahan Anda sebelum Anda gabungkan."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1392
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17262,99 +18369,83 @@
"Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada).\n"
"Mohon komit perubahan Anda sebelum Anda gabungkan."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1395
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada)."
-#: builtin/merge.c:1396
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Anda tidak dapat menggabungkan --squash dengan --no-ff."
-
-#: builtin/merge.c:1398
-msgid "You cannot combine --squash with --commit."
-msgstr "Anda tidak dapat menggabungkan --squash dengan --commit"
-
-#: builtin/merge.c:1414
+#: builtin/merge.c:1427
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Tidak ada komit yang disebutkan dan merge.defaultToUpstream tidak disetel."
-#: builtin/merge.c:1431
+#: builtin/merge.c:1444
msgid "Squash commit into empty head not supported yet"
msgstr "Lumat komit ke kepala kosong belum didukung"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1446
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Komit nir maju cepat tidak masuk akal ke kepala kosong"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1451
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - bukan sesuatu yang kami bisa gabungkan"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1453
msgid "Can merge only exactly one commit into empty head"
msgstr "Hanya bisa menggabungkan tepantnya satu komit ke kepala kosong"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1540
msgid "refusing to merge unrelated histories"
msgstr "menolak menggabungkan riwayat tak terkait"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1559
#, c-format
msgid "Updating %s..%s\n"
msgstr "Memperbarui %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1606
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Mencoba penggabungan dalam indeks yang sangat sepele\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1613
#, c-format
msgid "Nope.\n"
msgstr "Tidak.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "Tidak mungkin untuk maju cepat, batalkan."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1671 builtin/merge.c:1737
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Memutar ulang pohon ke asli...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1675
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Mencoba strategi penggabungan %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1727
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Tidak ada strategi yang menangani penggabungan.\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1729
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Penggabungan dengan strategi %s gagal.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1739
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Menggunakan strategi %s untuk menyiapkan penyelesaian dengan tangan.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1753
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"Penggabungan otomatis berjalan baik; berhenti sebelum mengkomit seperti yang "
"diminta\n"
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr ""
-
#: builtin/mktag.c:27
#, c-format
msgid "warning: tag input does not pass fsck: %s"
@@ -17392,10 +18483,6 @@
msgid "unable to write tag file"
msgstr ""
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr ""
-
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr ""
@@ -17409,43 +18496,56 @@
msgstr ""
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
msgstr ""
+"git multi-pack-index [<opsi>] write [--preferred-pack=<pak>] [--refs-"
+"snapshot=<jalur>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
-msgstr ""
+msgstr "git multi-pack-index [<opsi>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
-msgstr ""
+msgstr "git multi-pack-index [<opsi>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
-msgstr ""
+msgstr "git multi-pack-index [<opsi>] repack [--batch-size=<ukuran>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
-msgstr ""
+msgstr "direktori objek berisi set berkas pak dan pasangan pak-indeks"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
-msgstr ""
+msgstr "pak pilihan"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
-msgstr ""
+msgstr "pak untuk digunakan ulang saat menghitung bitmap multipak"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "tulis bitmap multipak"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "tulis indeks multipak yang hanya berisi indeks yang diberikan"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "potret referensi untuk memilih komit bitmap"
+
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr ""
-
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr ""
+"selama pengepakan ulang, kumpulkan berkas pak berukuran lebih kecil ke dalam "
+"sebuah batch yang lebih besar dari ukuran ini"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
@@ -17474,117 +18574,121 @@
msgid "skip move/rename errors"
msgstr "lewati kesalahan pindah/ganti nama"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "tujuan '%s' bukan direktori"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Memeriksa penamaan ulang '%s' ke '%s'\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "sumber jelek"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "tidak dapat memindahkan direktori ke dirinya sendiri"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "tidak dapat memindahkan direktori ke berkas"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "direktori asal kosong"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "bukan dalam kontrol versi"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "terkonflik"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "tujuan ada"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "menimpa '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Tidak dapat menimpa"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "banyak asal untuk target yang sama"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "direktori tujuan tidak ada"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, source=%s, destination=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Mengganti nama %s ke %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
#, c-format
msgid "renaming '%s' failed"
msgstr "gagal mengganti nama '%s'"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:524
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:525
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
+#: builtin/name-rev.c:526
+msgid "git name-rev [<options>] --annotate-stdin"
msgstr ""
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:583
msgid "print only ref-based names (no object names)"
msgstr ""
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:584
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:586
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:588
msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:590
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:532
-msgid "read from stdin"
+#: builtin/name-rev.c:591
+msgid "deprecated: use annotate-stdin instead"
msgstr ""
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:592
+msgid "annotate text from stdin"
+msgstr ""
+
+#: builtin/name-rev.c:593
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:599
msgid "dereference tags in the input (internal use)"
msgstr ""
@@ -17597,393 +18701,394 @@
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
msgstr ""
+"git notes [--ref <referensi catatan>] add [-f] [--allow-empty] [-m <pesan | -"
+"F <berkas> | (-c | -C) <objek>] [<objek>]"
#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
+"git notes [--ref <referensi catatan>] copy [-f] <objek asal> <objek tujuan>"
#: builtin/notes.c:31
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
msgstr ""
+"git notes [--ref <referensi catatan>] append [--alow-empty] [-m <pesan> | -F "
+"<berkas> | (-c | -C) <objek>] [<objek>]"
#: builtin/notes.c:32
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr ""
+msgstr "git notes [--ref <referensi catatan>] edit [--allow-empty] [<objek>]"
#: builtin/notes.c:33
msgid "git notes [--ref <notes-ref>] show [<object>]"
-msgstr ""
+msgstr "git notes [--ref <referensi catatan>] show [<objek>]"
#: builtin/notes.c:34
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
-
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr ""
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr ""
+"git notes [--ref <referensi catatan>] merge [-v | -q] [-s <strategi>] "
+"<referensi catatan> "
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
-msgstr ""
+msgstr "git notes [--ref <referensi catatan>] remove [<objek>...]"
#: builtin/notes.c:38
msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
-msgstr ""
+msgstr "git notes [--ref <referensi catatan>] prune [-n] [-v]"
#: builtin/notes.c:39
msgid "git notes [--ref <notes-ref>] get-ref"
-msgstr ""
+msgstr "git notes [--ref <referensi catatan>] get-ref"
#: builtin/notes.c:44
msgid "git notes [list [<object>]]"
-msgstr ""
+msgstr "git notes [list [<objek>]]"
#: builtin/notes.c:49
msgid "git notes add [<options>] [<object>]"
-msgstr ""
+msgstr "git notes add [<opsi>] [<objek>]"
#: builtin/notes.c:54
msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr ""
+msgstr "git notes copy [<opsi>] <objek asal> <objek tujuan>"
#: builtin/notes.c:55
msgid "git notes copy --stdin [<from-object> <to-object>]..."
-msgstr ""
+msgstr "git notes copy --stdin [<objek asal> <objek tujuan>]..."
#: builtin/notes.c:60
msgid "git notes append [<options>] [<object>]"
-msgstr ""
+msgstr "git notes append [<opsi>] [<objek>]"
#: builtin/notes.c:65
msgid "git notes edit [<object>]"
-msgstr ""
+msgstr "git notes edit [<objek>]"
#: builtin/notes.c:70
msgid "git notes show [<object>]"
-msgstr ""
+msgstr "git notes show [<objek>]"
#: builtin/notes.c:75
msgid "git notes merge [<options>] <notes-ref>"
-msgstr ""
+msgstr "git notes merge [<opsi>] <referensi catatan>"
#: builtin/notes.c:76
msgid "git notes merge --commit [<options>]"
-msgstr ""
+msgstr "git notes merge --commit [<opsi>]"
#: builtin/notes.c:77
msgid "git notes merge --abort [<options>]"
-msgstr ""
+msgstr "git notes merge --abort [<opsi>]"
#: builtin/notes.c:82
msgid "git notes remove [<object>]"
-msgstr ""
+msgstr "git notes remove [<objek>]"
#: builtin/notes.c:87
msgid "git notes prune [<options>]"
-msgstr ""
-
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr ""
+msgstr "git notes prune [<opsi>]"
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
-msgstr ""
+msgstr "Tulis/sunting catatan untuk objek berikut:"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
-msgstr ""
+msgstr "tidak dapat memulai 'show' untuk objek '%s'"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
-msgstr ""
+msgstr "tidak dapat membaca keluaran 'show'"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
-msgstr ""
+msgstr "gagal menyelesaikan 'show' untuk objek '%s'"
-#: builtin/notes.c:197
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
-msgstr ""
+msgstr "mohon berikan isi catatan baik menggunakan opsi -m ataupun -F"
+
+#: builtin/notes.c:203
+msgid "unable to write note object"
+msgstr "tidak dapat menulis objek catatan"
#: builtin/notes.c:206
-msgid "unable to write note object"
-msgstr ""
-
-#: builtin/notes.c:208
#, c-format
msgid "the note contents have been left in %s"
-msgstr ""
+msgstr "isi catatan telah ditinggalkan di %s"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:582
#, c-format
msgid "could not open or read '%s'"
-msgstr ""
+msgstr "tidak dapat membuka atau membaca '%s'"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
-msgstr ""
+msgstr "gagal menguraikan '%s' sebagai sebuah referensi valid."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
-msgstr ""
+msgstr "gagal membaca objek '%s'."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
-msgstr ""
+msgstr "gagal membaca data catatan dari objek bukan blob '%s'."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
-msgstr ""
+msgstr "baris masukan jelek: '%s'."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
-msgstr ""
+msgstr "gagal menyalin catatan dari '%s' ke '%s'"
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
-msgstr ""
+msgstr "gagal men-%s catatan di %s (di luar refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
-msgid "too many arguments"
-msgstr ""
-
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
-msgstr ""
+msgstr "tidak ada catatan yang ditemukan untuk objek %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
-msgstr ""
+msgstr "isi catatan sebagai sebuah untai"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
-msgstr ""
+msgstr "isi catatan di dalam berkas"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
-msgstr ""
+msgstr "gunakan ulang dan sunting objek catatan yang disebutkan"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
-msgstr ""
+msgstr "gunakan ulang objek catatan yang disebutkan"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
-msgstr ""
+msgstr "perbolehkan menyimpan catatan kosong"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
-msgstr ""
+msgstr "timpa catatan yang sudah ada"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
+"Tidak dapat menambahkan catatan. Catatan yang sudah ada ditemukan untuk "
+"objek %s. Gunakan '-f' untuk menimpa catatan yang sudah ada"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
-msgstr ""
+msgstr "Menimpa catatan yang sudah ada untuk objek %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
-msgstr ""
+msgstr "Menghapus catatan untuk objek %s\n"
+
+#: builtin/notes.c:495
+msgid "read objects from stdin"
+msgstr "baca objek dari masukan standar"
#: builtin/notes.c:497
-msgid "read objects from stdin"
-msgstr ""
-
-#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
+"muat konfigurasi penulisan ulang untuk <perintah> (menyiratkan --stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
-msgstr ""
+msgstr "argumen terlalu sedikit"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
+"Tidak dapat menyalin catatan. Catatan yang sudah ada ditemukan untuk %s. "
+"Gunakan '-f' untuk menimpa catatan yang sudah ada"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
-msgstr ""
+msgstr "catatan hilang pada objek sumber %s. Tidak dapat menyalin."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
+"Opsi -m/-F/-c/-C sudah usang untuk subperintah 'edit.\n"
+"'Mohon gunakan 'git notes add -f -m/-F/-c/-C' sebagai gantinya.\n"
+
+#: builtin/notes.c:696
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "gagal menghapus referensi NOTES_MERGE_PARTIAL"
#: builtin/notes.c:698
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
-msgstr ""
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "gagal menghapus referensi NOTES_MERGE_REF"
#: builtin/notes.c:700
-msgid "failed to delete ref NOTES_MERGE_REF"
-msgstr ""
-
-#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
-msgstr ""
+msgstr "gagal menghapus pohon kerja 'git notes merge'"
+
+#: builtin/notes.c:720
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "gagal membaca referensi NOTES_MERGE_PARTIAL"
#: builtin/notes.c:722
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
-msgstr ""
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "gagal menemukan komit dari NOTES_MERGE_PARTIAL."
#: builtin/notes.c:724
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
-msgstr ""
-
-#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
-msgstr ""
+msgstr "gagal menguraikan komit dari NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
-msgstr ""
+msgstr "gagal menguraikan NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
-msgstr ""
+msgstr "gagal menyelesaikan penggabungan catatan"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
-msgstr ""
+msgstr "strategi penggabungan catatan %s tidak dikenal"
+
+#: builtin/notes.c:782
+msgid "General options"
+msgstr "Opsi umum"
#: builtin/notes.c:784
-msgid "General options"
-msgstr ""
+msgid "Merge options"
+msgstr "Opsi penggabungan"
#: builtin/notes.c:786
-msgid "Merge options"
-msgstr ""
-
-#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
+"selesaikan konflik catatan menggunakan strategi yang diberikan (manual/ours/"
+"theirs/union/cat_sort_uniq)"
+
+#: builtin/notes.c:788
+msgid "Committing unmerged notes"
+msgstr "Mengkomitkan catatan tak tergabung"
#: builtin/notes.c:790
-msgid "Committing unmerged notes"
-msgstr ""
-
-#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
+"selesaikan penggabungan catatan dengan mengkomitkan catatan tak tergabung"
+
+#: builtin/notes.c:792
+msgid "Aborting notes merge resolution"
+msgstr "Membatalkan resolusi penggabungan catatan"
#: builtin/notes.c:794
-msgid "Aborting notes merge resolution"
-msgstr ""
-
-#: builtin/notes.c:796
msgid "abort notes merge"
-msgstr ""
+msgstr "batalkan penggabungan catatan"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
-msgstr ""
+msgstr "tidak dapat mencampurkan --commit, --abort atau -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
-msgstr ""
+msgstr "harus menyebutkan sebuah referensi catatan untuk digabungkan"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
-msgstr ""
+msgstr "-s/--strategy tidak dikenal: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
-msgstr ""
-
-#: builtin/notes.c:876
-#, c-format
-msgid "failed to store link to current notes ref (%s)"
-msgstr ""
+msgstr "sebuah penggabungan catatan ke %s sudah berjalan pada %s"
#: builtin/notes.c:878
#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "gagal menyimpan tautan ke referensi catatan saat ini (%s)"
+
+#: builtin/notes.c:880
+#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"'git notes merge --commit', or abort the merge with 'git notes merge --"
"abort'.\n"
msgstr ""
+"Penggabungan catatan otomatis gagal. Selesaikan konflik dalam %s dan komit "
+"hasilnya dengan 'git notes merge --commit', atau batalkan penggabungan "
+"dengan 'git notes merge --abort'.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:595
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
-msgstr ""
+msgstr "Gagal menguraikan '%s' sebagai referensi valid."
-#: builtin/notes.c:900
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
-msgstr ""
+msgstr "Objek %s tidak punya catatan\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
-msgstr ""
+msgstr "mencoba menghapus catatan yang tidak ada bukanlah sebuah kesalahan"
-#: builtin/notes.c:915
+#: builtin/notes.c:917
msgid "read object names from the standard input"
-msgstr ""
+msgstr "baca nama objek dari masukan standar"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
msgid "do not remove, show only"
-msgstr ""
+msgstr "jangan hapus, hanya perlihatkan"
-#: builtin/notes.c:955
+#: builtin/notes.c:957
msgid "report pruned notes"
-msgstr ""
+msgstr "laporkan catatan terpangkas"
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
msgid "notes-ref"
-msgstr ""
+msgstr "referensi catatan"
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
-msgstr ""
+msgstr "gunakan catatan dari <referensi catatan>"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1036 builtin/stash.c:1802
#, c-format
msgid "unknown subcommand: %s"
-msgstr ""
+msgstr "subperintah tidak dikenal: %s"
#: builtin/pack-objects.c:182
msgid ""
@@ -17995,389 +19100,386 @@
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:570
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
"pack %s"
msgstr ""
-#: builtin/pack-objects.c:580
+#: builtin/pack-objects.c:578
#, c-format
msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/pack-objects.c:591
+#: builtin/pack-objects.c:589
#, c-format
msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/pack-objects.c:722
+#: builtin/pack-objects.c:720
#, c-format
msgid "recursive delta detected for object %s"
msgstr ""
-#: builtin/pack-objects.c:941
+#: builtin/pack-objects.c:939
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1036
+#: builtin/pack-objects.c:1034
#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr ""
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1158
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1171
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1243 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr ""
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1276
+msgid "failed to write bitmap index"
+msgstr ""
+
+#: builtin/pack-objects.c:1302
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1544
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1992
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:2001
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2282
msgid "Counting objects"
msgstr ""
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2447
#, c-format
msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
+#: builtin/pack-objects.c:2543
#, c-format
msgid "object %s cannot be read"
msgstr ""
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2557
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2872
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3011
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3097
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3103
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3182
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
"hash> <uri>' (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3185
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3220
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr ""
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
+#: builtin/pack-objects.c:3373
#, c-format
msgid "could not find pack '%s'"
msgstr ""
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3416
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3422
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3482
-msgid "invalid value for --missing"
-msgstr ""
-
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
msgid "cannot open pack index"
msgstr ""
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3549
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3635
msgid "unable to force loose object"
msgstr ""
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3763
#, c-format
msgid "not a rev '%s'"
msgstr ""
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr ""
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3794
msgid "unable to add recent objects"
msgstr ""
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3847
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3851
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3907
msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3908
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3911
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3913
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3915
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3917
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3919
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3921
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3923
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3925
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3927
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3929
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3931
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3933
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3935
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3938
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3941
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3944
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3947
msgid "read packs from stdin"
msgstr ""
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3949
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3951
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3953
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3955
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3957
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3960
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3962
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3964
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3966
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3968
msgid "ignore this pack"
msgstr ""
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3970
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3972
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3974
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3976
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3980
msgid "write a bitmap index if possible"
msgstr ""
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3984
msgid "handling for missing objects"
msgstr ""
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3987
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3989
msgid "respect islands during delta compression"
msgstr ""
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3991
msgid "protocol"
msgstr ""
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3992
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4027
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4032
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4088
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4090
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4095
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
#: builtin/pack-objects.c:4104
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr ""
-
-#: builtin/pack-objects.c:4110
msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4106
msgid "cannot use --filter with --stdin-packs"
msgstr ""
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4110
msgid "cannot use internal rev list with --stdin-packs"
msgstr ""
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4169
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4210
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18405,77 +19507,67 @@
msgid "prune loose refs (default)"
msgstr ""
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr ""
-
#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr ""
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/prune.c:152
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr ""
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Nilai tidak valid untuk %s: %s"
-
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<opsi>] [<repositori> [<spek referensi>]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "kontrol pengambilan rekursif submodul"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Opsi yang berkaitan dengan penggabungan"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "masukkan perubahan dengan pendasaran ulang daripada penggabungan"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "perbolehkan maju cepat"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "kontrol penggunaan kail pre-merge-commit dan commit-msg"
+
+#: builtin/pull.c:171 parse-options.h:371
msgid "automatically stash/stash pop before and after"
msgstr "stash/stash pop otomatis sebelum dan sesudah"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Opsi yang berkaitan dengan pengambilan"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "paksa timpa cabang lokal"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "nomor submodul ditarik dalam paralel"
-#: builtin/pull.c:317
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "Nilai tidak valid untuk pull.ff: %s"
-
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -18483,14 +19575,14 @@
"Tidak ada kandidat untuk didasarkan ulang diantara referensi yang baru saja "
"Anda ambil."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Tidak ada kandidat untuk digabungkan diantara referensi yang baru sajaAnda "
"ambil."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -18498,7 +19590,7 @@
"Umumnya itu berarti Anda memberikan spek referensi wildcard yang tidak\n"
"cocok pada ujung remote."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -18509,43 +19601,44 @@
"satu cabang. Oleh karena ini bukan remote terkonfigurasi asali untuk\n"
"cabang Anda saat ini, Anda harus sebutkan satu cabang pada baris perintah."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:978
msgid "You are not currently on a branch."
msgstr "Anda tidak berada pada sebuah cabang."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Mohon sebutkan cabang mana yang Anda ingin didasarkan ulang."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Mohon sebutkan cabang mana yang Anda ingin digabungkan."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Lihat git-pull(1) untuk selengkapnya."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:984
msgid "<remote>"
msgstr "<remote>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:374
msgid "<branch>"
msgstr "<cabang>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:976
msgid "There is no tracking information for the current branch."
msgstr "Tidak ada informasi pelacakan untuk cabang saat ini."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Jika Anda ingin menyetel informasi pelacakan untuk cabang ini Anda bisa "
"melakukannya dengan:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -18554,22 +19647,22 @@
"Konfigurasi Anda menyebutkan untuk menggabungkan dengan referensi '%s'\n"
"dari remote, tapi tidak ada referensi seperti itu yang diambil."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "Tidak dapat mengakses komit %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "mengabaikan --verify-signatures untuk pendasaran ulang"
-#: builtin/pull.c:930
+#: builtin/pull.c:969
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
@@ -18579,34 +19672,36 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Menarik tanpa menyebutkan cara merujukkan cabang yang berlainan tidak\n"
-"disarankan. Anda dapat mematikan pesan ini dengan menjalankan salah\n"
-"satu perintah berikut sebelum penarikan berikutnya:\n"
+"Anda punya cabang-cabang yang berlainan dan perlu menyebutkan cara\n"
+"merujukkannya.\n"
+"Anda dapat melakukannya dengan menjalankan salah satu perintah berikut\n"
+"suatu saat sebelum penarikan berikutnya:\n"
"\n"
-" git config pull.rebase false # penggabungan (strategi asali)\n"
+" git config pull.rebase false # penggabungan\n"
" git config pull.rebase true # pendasaran ulang\n"
" git config pull.ff only # hanya maju cepat\n"
"\n"
"Anda dapat mengganti \"git config\" dengan \"git config --global\" untuk\n"
-"menyetel pilihan asali untuk semua repositori. Anda juga dapat melewatkan\n"
+"menyetel preferensi asali untuk semua repositori. Anda juga dapat "
+"melewatkan\n"
"--rebase, --no-rebase, atau --ff-only pada baris perintah untuk menimpa\n"
"asali terkonfigurasi untuk setiap invokasi.\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1047
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Memperbarui cabang yang belum lahir dengan perubahan yang ditambahkan ke "
"indeks."
-#: builtin/pull.c:994
+#: builtin/pull.c:1051
msgid "pull with rebase"
msgstr "tarik dengan pendasaran ulang"
-#: builtin/pull.c:995
+#: builtin/pull.c:1052
msgid "please commit or stash them."
msgstr "mohon komit atau stase itu."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1077
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -18616,7 +19711,7 @@
"fetch memperbarui kepala cabang saat ini.\n"
"memajukan-cepat pohon kerja Anda dari komit %s."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1083
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -18633,15 +19728,23 @@
"$ git reset --hard\n"
"untuk memulihkan."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1098
msgid "Cannot merge multiple branches into empty head."
msgstr "Tidak dapat menggabungkan banyak cabang ke kepala kosong."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1103
msgid "Cannot rebase onto multiple branches."
msgstr "Tidak dapat mendasarkan ulang pada banyak cabang."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1105
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Tidak dapat maju cepat ke banyak cabang."
+
+#: builtin/pull.c:1120
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Perlu sebutkan cara merujukkan cabang yang berlainan."
+
+#: builtin/pull.c:1134
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"tidak dapat mendasarkan ulang dengan modifikasi submodul yang terekam lokal."
@@ -18817,15 +19920,15 @@
msgid "failed to push some refs to '%s'"
msgstr "gagal dorong beberapa referensi ke '%s'"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3377
msgid "repository"
msgstr "repositori"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "dorong semua referensi"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "cermin semua referensi"
@@ -18837,19 +19940,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "dorong tag (tidak dapat digunakan dengan --all atau --mirror)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "paksa pembaruan"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<nama referensi>:<harapan>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "memerlukan nilai lama referensi berada pada nilai saat ini"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "memerlukan pembaruan remote diintegrasikan ke lokal"
@@ -18857,12 +19960,12 @@
msgid "control recursive pushing of submodules"
msgstr "kontrol dorong rekursif submodul"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "gunakan paket tipis"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "program terima paket"
@@ -18876,24 +19979,20 @@
#: builtin/push.c:569
msgid "bypass pre-push hook"
-msgstr "lewati kait pra-dorong"
+msgstr "lewati kail pra-dorong"
#: builtin/push.c:570
msgid "push missing but relevant tags"
msgstr "dorong tag yang hilang tapi relevan"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "Tandatangan GPG dorong"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "minta transaksi atomik pada sisi remote"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete tidak kompatibel dengan --all, --mirror dan --tags "
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete tidak masuk akal tanpa referensi"
@@ -18925,26 +20024,14 @@
"\n"
" git push <nama>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all dan --tags tidak kompatibel"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all tidak dapat digabung dengan spek referensi"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror dan --tags tidak kompatibel"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror tidak dapat digabungkan dengan spek referensi"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all dan --mirror tidak kompatibel"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "opsi dorong harus tidak ada karakter baris baru"
@@ -18997,83 +20084,88 @@
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefiks>) [-u | -i]] [--no-sparse-checkout] [--index-"
+"output=<berkas>] (--empty | <mirip-pohon 1> [<mirip-pohon 2> <mirip-pohon "
+"3>])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
-msgstr ""
+msgstr "tulis indeks yang dihasilkan ke <berkas>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
-msgstr ""
+msgstr "hanya kosongkan indeks"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
-msgstr ""
+msgstr "Menggabungkan"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
-msgstr ""
+msgstr "lakukan penggabungan selain pembacaan"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr ""
+"penggabungan 3 arah jika tidak ada penggabungan level berkas yang dibutuhkan"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
-msgstr ""
+msgstr "penggabungan 3 arah dengan kehadiran penambahan dan penghapusan"
+
+#: builtin/read-tree.c:129
+msgid "same as -m, but discard unmerged entries"
+msgstr "sama seperti -m, tapi buang entri tak tergabung"
+
+#: builtin/read-tree.c:130
+msgid "<subdirectory>/"
+msgstr "<subdirektori>/"
+
+#: builtin/read-tree.c:131
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "baca pohon ke dalam indeks pada <subdirektori>/"
+
+#: builtin/read-tree.c:134
+msgid "update working tree with merge result"
+msgstr "perbarui pohon kerja dengan hasil penggabungan"
+
+#: builtin/read-tree.c:136
+msgid "gitignore"
+msgstr "gitignore"
#: builtin/read-tree.c:137
-msgid "same as -m, but discard unmerged entries"
-msgstr ""
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "perbolehkan berkas yang diabaikan secara eksplisit untuk ditimpa"
-#: builtin/read-tree.c:138
-msgid "<subdirectory>/"
-msgstr ""
+#: builtin/read-tree.c:140
+msgid "don't check the working tree after merging"
+msgstr "jangan periksa pohon kerja setelah penggabungan"
-#: builtin/read-tree.c:139
-msgid "read the tree into the index under <subdirectory>/"
-msgstr ""
+#: builtin/read-tree.c:141
+msgid "don't update the index or the work tree"
+msgstr "jangan perbarui indeks atau pohon kerja"
-#: builtin/read-tree.c:142
-msgid "update working tree with merge result"
-msgstr ""
-
-#: builtin/read-tree.c:144
-msgid "gitignore"
-msgstr ""
+#: builtin/read-tree.c:143
+msgid "skip applying sparse checkout filter"
+msgstr "lewatkan penerapan saringan checkout tipis"
#: builtin/read-tree.c:145
-msgid "allow explicitly ignored files to be overwritten"
-msgstr ""
-
-#: builtin/read-tree.c:148
-msgid "don't check the working tree after merging"
-msgstr ""
+msgid "debug unpack-trees"
+msgstr "nirkutukan unpack-trees"
#: builtin/read-tree.c:149
-msgid "don't update the index or the work tree"
-msgstr ""
-
-#: builtin/read-tree.c:151
-msgid "skip applying sparse checkout filter"
-msgstr ""
-
-#: builtin/read-tree.c:153
-msgid "debug unpack-trees"
-msgstr ""
-
-#: builtin/read-tree.c:157
msgid "suppress feedback messages"
-msgstr ""
+msgstr "matikan pesan umpan balik"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:190
msgid "You need to resolve your current index first"
-msgstr ""
+msgstr "Anda perlu menguraikan indeks Anda saat ini dulu"
-#: builtin/rebase.c:35
+#: builtin/rebase.c:36
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -19081,204 +20173,51 @@
"git rebase [-i] [opsi] [--exec <perintah>] [--onto <basis baru> | --keep-"
"base][<hulu> [<cabang>]]"
-#: builtin/rebase.c:37
+#: builtin/rebase.c:38
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [opsi] [--exec <perintah>] [--onto <basis baru>] --root "
"[<cabang>]"
-#: builtin/rebase.c:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "daftar todo tidak dapat digunakan: '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:231
#, c-format
msgid "could not create temporary %s"
msgstr "tidak dapat membuat %s sementara"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:237
msgid "could not mark as interactive"
msgstr "tidak dapat menandai sebagai interaktif"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:290
msgid "could not generate todo list"
msgstr "tidak dapat membuat daftar todo"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:332
msgid "a base commit must be provided with --upstream or --onto"
msgstr "basis komit harus diberikan dengan --upstream atau --onto"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opsi>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "simpan komit yang dimulai kosong"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "perbolehkan komit dengan pesan kosong"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "dasarkan ulang komit penggabungan"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "simpan titik cabang sepupu asal "
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "pindahkan komit yang diawali dengan squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "tandatangani komit"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "perlihatkan diffstat apa yang berubah di hulu"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "lanjutkan pendasaran ulang"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "lewatkan komit"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "sunting daftar todo"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "perlihatkan tambalan saat ini"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "pendekkan id komit dalam daftar todo"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "jabarkan id komit dalam daftar todo"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "periksa daftar todo"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "susun ulang baris fixup/squash"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "masukkan perintah exec ke dalam daftar todo"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "ke"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "batasi revisi"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "lumat ke"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "komit hulu"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "nama kepala"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "strategi pendasaran"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "opsi strategi"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "cabang atau komit untuk di-checkout"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "nama ke"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "perintah untuk dijalankan"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "jadwal ulang otomatis `exec` apa saja yang gagal"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins tidak ada efek tanpa --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:391
#, c-format
msgid "%s requires the merge backend"
msgstr "%s butuh tulang belakang penggabungan"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:433
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "tidak dapat mendapatkan 'ke': '%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:450
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head tidak valid: '%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:475
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "abaikan allow_rerere_autoupdate yang tak valid: '%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:600
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19293,7 +20232,7 @@
"Untuk membatalkan dan kembali ke kondisi sebelum \"git rebase\",jalankan "
"\"git rebase --abort\"."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:685
#, c-format
msgid ""
"\n"
@@ -19312,7 +20251,12 @@
"\n"
"Hasilnya git tidak dapat mendasarkan ulang itu."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:836
+#, c-format
+msgid "could not switch to %s"
+msgstr "tidak dapat mengganti ke %s"
+
+#: builtin/rebase.c:952
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -19321,7 +20265,7 @@
"tipe kosong tak dikenali '%s'; nilai yang valid adalah \"drop\", \"keep\", "
"dan \"ask\"."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:970
#, c-format
msgid ""
"%s\n"
@@ -19338,7 +20282,7 @@
" git rebase '<cabang>'.\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:986
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -19351,183 +20295,181 @@
" git branch --set-upstream-to=%s/<cabang> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:1016
msgid "exec commands cannot contain newlines"
msgstr "perintah exec tidak dapat berisi baris baru"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:1020
msgid "empty exec command"
msgstr "perintah exec kosong"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1051
msgid "rebase onto given branch instead of upstream"
msgstr "dasarkan ulang kepada cabang yang diberikan daripada hulu"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1053
msgid "use the merge-base of upstream and branch as the current base"
msgstr "gunakan merge-base hulu dan cabang sebagai dasar saat ini"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1055
msgid "allow pre-rebase hook to run"
-msgstr "perbolehkan hook pre-rebase untuk dijalankan"
+msgstr "perbolehkan kail pre-rebase untuk dijalankan"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1057
msgid "be quiet. implies --no-stat"
msgstr "diam. menyiratkan --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1060
+msgid "display a diffstat of what changed upstream"
+msgstr "perlihatkan diffstat apa yang berubah di hulu"
+
+#: builtin/rebase.c:1063
msgid "do not show diffstat of what changed upstream"
msgstr "jangan perlihatkan diffstat apa yang berubah di hulu"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1066
msgid "add a Signed-off-by trailer to each commit"
msgstr "tambahkan trailer Signed-off-by ke setiap komit"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1069
msgid "make committer date match author date"
msgstr "jadikan tanggal pengkomit sama dengan tanggal pengarang"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1071
msgid "ignore author date and use current date"
msgstr "abaikan tanggal pengarang dan gunakan tanggal saat ini"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1073
msgid "synonym of --reset-author-date"
msgstr "sinonim dari --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1075 builtin/rebase.c:1079
msgid "passed to 'git apply'"
msgstr "lewatkan ke 'git apply'"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1077
msgid "ignore changes in whitespace"
msgstr "abaikan perubahan spasi"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1081 builtin/rebase.c:1084
msgid "cherry-pick all commits, even if unchanged"
msgstr "petik ceri semua komit, bahkan jika tak berubah"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1086
msgid "continue"
msgstr "lanjutkan"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1089
msgid "skip current patch and continue"
msgstr "lewatkan tambalan saat ini dan lanjutkan"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1091
msgid "abort and check out the original branch"
msgstr "hentikan dan check out cabang asli"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1094
msgid "abort but keep HEAD where it is"
msgstr "hentikan tapi simpan HEAD dimana itu berada"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1095
msgid "edit the todo list during an interactive rebase"
msgstr "sunting daftar todo selama pendasaran ulang interaktif"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1098
msgid "show the patch file being applied or merged"
msgstr "perlihatkan berkas tambalan yang sedang diterapkan atau digabungkan"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1101
msgid "use apply strategies to rebase"
msgstr "gunakan strategi penerapan ke pendasaran ulang"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1105
msgid "use merging strategies to rebase"
msgstr "gunakan strategi penggabungan ke pendasaran ulang"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1109
msgid "let the user edit the list of commits to rebase"
msgstr "biarkan pengguna menyunting daftar komit untuk didasarkan ulang"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1113
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(USANG) coba buat ulang penggabungan daripada abaikan itu"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1118
msgid "how to handle commits that become empty"
msgstr "bagaimana cara menangani komit yang menjadi kosong"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1121
+msgid "keep commits which start empty"
+msgstr "simpan komit yang dimulai kosong"
+
+#: builtin/rebase.c:1125
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "pindahakan komit yang diawali dengan squash!/fixup! di bawah -i"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1132
msgid "add exec lines after each commit of the editable list"
msgstr ""
"tambahkan baris exec setelah setiap komit dari daftar yang bisa disunting"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1136
msgid "allow rebasing commits with empty messages"
msgstr "perbolehkan mendasarkan ulang komit dengan pesan kosong"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1140
msgid "try to rebase merges instead of skipping them"
msgstr "coba mendasarkan ulang penggabungan daripada melewatkan itu"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1143
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "gunakan 'merge-base --fork-point' untuk menyaring hulu"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1145
msgid "use the given merge strategy"
msgstr "gunakan strategi penggabungan yang diberikan"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1147 builtin/revert.c:115
msgid "option"
msgstr "opsi"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1148
msgid "pass the argument through to the merge strategy"
msgstr "lewatkan argumen ke strategi penggabungan"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1151
msgid "rebase all reachable commits up to the root(s)"
msgstr "dasarkan ulang semua komit yang bisa dicapai hingga ke akar"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1154
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "jadwal ulang otomatis `exec` apa saja yang gagal"
+
+#: builtin/rebase.c:1156
msgid "apply all changes, even those already present upstream"
msgstr "terapkan semua perubahan, bahkan yang sudah ada di hulu"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1177
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Sepertinya 'git am' sedang berjalan. Tidak dapat mendasarkan ulang"
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges usang. Gunakan --rebase-merges sebagai gantinya."
+#: builtin/rebase.c:1208
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges digantikan oleh --rebase-merges"
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "tidak dapat menggabungkan '--keep-base' dengan '--onto'"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "tidak dapat menggabungkan '--keep-base' dengan '--root'"
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "tidak dapat menggabungkan '--root' dengan '--fork-point'"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1230
msgid "No rebase in progress?"
msgstr "Tidak ada pendasaran ulang yang sedang berjalan?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1234
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Aksi --edit-todo hanya dapat digunakan selama pendasaran ulang interaktif."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Tidak dapat membaca HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1269
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -19535,16 +20477,16 @@
"Anda harus menyunting semua konflik penggabungan lalu\n"
"tandai itu sebagai terselesaikan menggunakan git add"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1287
msgid "could not discard worktree changes"
msgstr "tidak dapat menyingkirkan perubahan pohon kerja"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1308
#, c-format
msgid "could not move back to %s"
msgstr "tidak dapt memindahkan kembali ke %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1354
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -19565,144 +20507,128 @@
"dan jalankan saya lagi. Saya berhenti seandainya Anda masih punya\n"
"sesuatu yang berharga di sana.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1382
msgid "switch `C' expects a numerical value"
msgstr "tombol `C' harap nilai numerik"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1424
#, c-format
msgid "Unknown mode: %s"
msgstr "Mode tidak dikenal: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1463
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy butuh --merge atau --interactive"
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "tidak dapat menggabungkan opsi penerapan dengan opsi penggabungan"
+#: builtin/rebase.c:1492
+msgid "apply options and merge options cannot be used together"
+msgstr "opsi apply dan opsi merge tidak dapat digunakan bersamaan"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1505
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Tulang belakang pendasaran ulang tidak dikenal: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1534
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec butuh --exec atau --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "tidak dapat menggabungkan '--preserve-merges' dengan '--rebase-merges'"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"error: tidak dapat menggabungkan '--preserve-merges' dengan '--reschedule-"
-"failed-exec'"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1565
#, c-format
msgid "invalid upstream '%s'"
msgstr "hulu tidak valid '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1571
msgid "Could not create new root commit"
msgstr "tidak dapat membuat komit akar baru"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1597
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': butuh tepatnya satu dasar penggabungan dengan cabang"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1600
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': butuh tepatnya satu dasar penggabungan"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1609
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Tidak menunjuk pada komit yang valid '%s'"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1636
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal: tidak ada cabang/komit seperti '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "tidak ada cabang/komit seperti '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
+#: builtin/submodule--helper.c:2477
#, c-format
msgid "No such ref: %s"
msgstr "Tidak ada referensi seperti: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1658
msgid "Could not resolve HEAD to a revision"
msgstr "Tidak dapat menguraikan HEAD ke sebuah revisi"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1679
msgid "Please commit or stash them."
msgstr "Mohon komit atau stase itu."
-#: builtin/rebase.c:1997
-#, c-format
-msgid "could not switch to %s"
-msgstr "tidak dapat mengganti ke %s"
-
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1714
msgid "HEAD is up to date."
msgstr "HEAD terbaru."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1716
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Cabang saat ini %s terbaru.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1724
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD terbaru, pendasaran ulang dipaksa."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1726
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Cabang saat ini %s terbaru, pendasaran ulang dipaksa.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1734
msgid "The pre-rebase hook refused to rebase."
-msgstr "Hook pre-rebase menolak mendasarkan ulang."
+msgstr "Kail pre-rebase menolak mendasarkan ulang."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1741
#, c-format
msgid "Changes to %s:\n"
msgstr "Perubahan unuk %s:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1744
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Perubahan dari %s ke %s:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1769
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Pertama, memutar ulang kepala untuk memainkan ulang karya Anda diatas "
"itu...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1781
msgid "Could not detach HEAD"
msgstr "Tidak dapat melepas HEAD"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1790
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Maju-cepat %s ke %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
-msgstr ""
+msgstr "git receive-pack <direktori git>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1263
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"
@@ -19718,8 +20644,20 @@
"To squelch this message and still keep the default behaviour, set\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
+"Secara asali, memperbarui cabang saat ini di dalam repositori non-bare\n"
+"tidak diperbolehkan, karena akan membuat indeks dan pohon kerja inkonsisten\n"
+"dengan yang Anda dorong, dan akan memerlukan 'git reset --hard' untuk\n"
+"mencocokkan pohon kerja dengan HEAD.\n"
+"\n"
+"Anda dapat menyetel variabel konfigurasi 'receive.denyCurrentBranch' ke\n"
+"'ignore' atau 'warn' di repositori remote untuk memperbolehkan dorong ke\n"
+"cabang saat itu; tetapi tidak disarankan kecuali Anda dapat memperbarui\n"
+"pohon kerjanya agar cocok dengan apa yang Anda dorong dengan cara lain.\n"
+"\n"
+"Untuk mematikan pesan ini dan tetap menjaga kebiasaan asali, setel\n"
+"variabel konfigurasi 'receive.denyCurrentBranch' ke 'refuse'."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1283
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"
@@ -19730,75 +20668,121 @@
"\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
+"Secara asali, menghapus cabang saat ini tidak diperbolehkan, karena\n"
+"'git clone' selanjutnya tidak berujung pada berkas apapun ter-checkout,\n"
+"dan mengakibatkan kebingungan.\n"
+"Anda dapat menyetel variabel konfigurasi 'receive.denyDeleteCurrent' ke\n"
+"'warn' atau 'ignore' di dalam repositori remote untuk memperbolehkan\n"
+"menghapus cabang saat ini, dengan atau tanpa pesan peringatan.\n"
+"\n"
+"Untuk mematikan pesan ini, Anda dapat menyetelnya ke 'refuse'."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2476
msgid "quiet"
-msgstr ""
+msgstr "diam"
-#: builtin/receive-pack.c:2492
-msgid "You must specify a directory."
+#: builtin/receive-pack.c:2491
+msgid "you must specify a directory"
+msgstr "Anda harus menyebutkan sebuah direktori"
+
+#: builtin/reflog.c:9
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git remote [show] [<opsi log>] [<referensi>]"
+
+#: builtin/reflog.c:12
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
msgstr ""
+"git reflog expire [--expire=<waktu>] [--expire-unreachable=<waktu>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<referensi>...]"
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
msgstr ""
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <referensi>@{<penyebut>}..."
-#: builtin/reflog.c:22
-msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
-msgstr ""
-
-#: builtin/reflog.c:25
+#: builtin/reflog.c:21
msgid "git reflog exists <ref>"
-msgstr ""
+msgstr "git reflog exists <referensi>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:197 builtin/reflog.c:211
#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr ""
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "stempel waktu tidak valid '%s' diberikan ke '--%s'"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:240 builtin/reflog.c:359
+msgid "do not actually prune any entries"
+msgstr "jangan benar-benar pangkas entri apapun"
+
+#: builtin/reflog.c:243 builtin/reflog.c:362
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr "tulis ulang SHA1 lama dengan SHA1 baru dari entri yang mendahuluinya"
+
+#: builtin/reflog.c:246 builtin/reflog.c:365
+msgid "update the reference to the value of the top reflog entry"
+msgstr "perbarui referensi ke nilai dari entri log referensi atas"
+
+#: builtin/reflog.c:248 builtin/reflog.c:367
+msgid "print extra information on screen"
+msgstr "cetak informasi tambahan pada layar"
+
+#: builtin/reflog.c:249 builtin/reflog.c:253
+msgid "timestamp"
+msgstr "stempel"
+
+#: builtin/reflog.c:250
+msgid "prune entries older than the specified time"
+msgstr "pangkas entri yang lebih tua dari waktu yang disebutkan"
+
+#: builtin/reflog.c:254
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+"pangkas entri yang lebih tua dari <waktu> yang tak terjangkau dari ujung "
+"cabang saat ini"
+
+#: builtin/reflog.c:258
+msgid "prune any reflog entries that point to broken commits"
+msgstr "pangkas entri reflog apapun yang menunjuk ke komit yang rusak"
+
+#: builtin/reflog.c:259
+msgid "process the reflogs of all references"
+msgstr "proses reflog semua referensi"
+
+#: builtin/reflog.c:261
+msgid "limits processing to reflogs from the current worktree only"
+msgstr "batasi pemrosesan ke hanya log referensi dari pohon kerja saat ini"
+
+#: builtin/reflog.c:294
#, c-format
msgid "Marking reachable objects..."
-msgstr ""
+msgstr "Menandai objek yang bisa dicapai..."
-#: builtin/reflog.c:647
+#: builtin/reflog.c:338
#, c-format
msgid "%s points nowhere!"
-msgstr ""
+msgstr "%s tidak menunjuk ke apapun!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:374
msgid "no reflog specified to delete"
-msgstr ""
+msgstr "tidak ada log referensi yang disebutkan untuk dihapus"
-#: builtin/reflog.c:708
-#, c-format
-msgid "not a reflog: %s"
-msgstr ""
-
-#: builtin/reflog.c:713
-#, c-format
-msgid "no reflog for '%s'"
-msgstr ""
-
-#: builtin/reflog.c:759
+#: builtin/reflog.c:396
#, c-format
msgid "invalid ref format: %s"
-msgstr ""
+msgstr "format referensi tidak valid: %s"
-#: builtin/reflog.c:768
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr ""
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
@@ -19806,82 +20790,87 @@
"git remote add [-t <cabang>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <nama> <url>"
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <lama> <baru>"
+#: builtin/remote.c:20 builtin/remote.c:40
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <lama> <baru>"
-#: builtin/remote.c:20 builtin/remote.c:44
+#: builtin/remote.c:21 builtin/remote.c:45
msgid "git remote remove <name>"
msgstr "git remote remove <nama>"
-#: builtin/remote.c:21 builtin/remote.c:49
+#: builtin/remote.c:22 builtin/remote.c:50
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <nama> (-a | --auto | -d | --delete | <cabang>)"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <nama>"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <nama>"
-#: builtin/remote.c:24
+#: builtin/remote.c:25
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remote>)...]"
-#: builtin/remote.c:25
+#: builtin/remote.c:26
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <nama> <cabang>..."
-#: builtin/remote.c:26 builtin/remote.c:75
+#: builtin/remote.c:27 builtin/remote.c:76
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <nama>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <nama> <url baru> [<url lama>]"
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <nama> <url baru>"
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c:30 builtin/remote.c:83
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <nama> <url>"
-#: builtin/remote.c:34
+#: builtin/remote.c:35
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<opsi>] <nama> <url>"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <nama> <cabang>"
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <nama> <cabang>"
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<opsi>] <nama>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<opsi>] <nama>"
-#: builtin/remote.c:70
+#: builtin/remote.c:71
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<opsi>] [<group> | <remote>]..."
-#: builtin/remote.c:99
+#: builtin/remote.c:100
#, c-format
msgid "Updating %s"
msgstr "Memperbarui %s"
-#: builtin/remote.c:131
+#: builtin/remote.c:102
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Tidak dapat mengambil %s"
+
+#: builtin/remote.c:132
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -19889,72 +20878,77 @@
"--mirror berbahaya dan usang; mohon gunakan --mirror=fetch\n"
"\t atau --mirror=push sebagai gantinya"
-#: builtin/remote.c:148
+#: builtin/remote.c:149
#, c-format
msgid "unknown mirror argument: %s"
msgstr "argumen mirror tidak dikenal: %s"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "fetch the remote branches"
msgstr "ambil cabang remote"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "import all tags and associated objects when fetching"
msgstr "impor semua tag dan objek yang terkait ketika mengambil"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "atau jangan mengambil tag apapun (--no-tags)"
-#: builtin/remote.c:171
+#: builtin/remote.c:172
msgid "branch(es) to track"
msgstr "cabang untuk dilacak"
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "master branch"
msgstr "cabang master"
-#: builtin/remote.c:174
+#: builtin/remote.c:175
msgid "set up remote as a mirror to push to or fetch from"
msgstr "atur remote sebagai cermin untuk didorong atau diambil"
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying a master branch makes no sense with --mirror"
msgstr "menyebutkan cabang master tidak masuk akal dengan --mirror"
-#: builtin/remote.c:188
+#: builtin/remote.c:189
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "menyebutkan cabang untuk dilacak hanya masuk akal dengan cermin ambil"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:196 builtin/remote.c:716
#, c-format
msgid "remote %s already exists."
msgstr "remote %s sudah ada"
-#: builtin/remote.c:240
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "Tidak dapat mengatur master '%s'"
-#: builtin/remote.c:355
+#: builtin/remote.c:323
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branch.%s.rebase=%s tak tertangani; diasumsikan 'true'"
+
+#: builtin/remote.c:367
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Tidak dapat mendapatkan peta pengambilan untuk spek referensi %s"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:461 builtin/remote.c:469
msgid "(matching)"
msgstr "(sepadan)"
-#: builtin/remote.c:466
+#: builtin/remote.c:473
msgid "(delete)"
msgstr "(hapus)"
-#: builtin/remote.c:655
+#: builtin/remote.c:664
#, c-format
msgid "could not set '%s'"
msgstr "tidak dapat menyetel '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:669
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -19965,17 +20959,17 @@
"\t%s:%d\n"
"sekarang menamai remote yang tiada '%s'"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
#, c-format
msgid "No such remote: '%s'"
msgstr "Tidak ada remote seperti: '%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:726
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Tidak dapat menamai ulang bagian konfigurasi '%s' ke '%s'"
-#: builtin/remote.c:730
+#: builtin/remote.c:746
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -19986,17 +20980,21 @@
"\t%s\n"
"\tMohon perbarui konfigurasi secara manual bila diperlukan."
-#: builtin/remote.c:770
+#: builtin/remote.c:783
+msgid "Renaming remote references"
+msgstr "Menamai ulang referensi remote"
+
+#: builtin/remote.c:794
#, c-format
msgid "deleting '%s' failed"
msgstr "menghapus '%s' gagal"
-#: builtin/remote.c:804
+#: builtin/remote.c:832
#, c-format
msgid "creating '%s' failed"
msgstr "membuat '%s' gagal"
-#: builtin/remote.c:882
+#: builtin/remote.c:912
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20010,120 +21008,120 @@
"Catatan: Beberapa cabang diluar hierarki refs/remotes tidak dihapus;\n"
"untuk menghapus itu, gunakan:"
-#: builtin/remote.c:896
+#: builtin/remote.c:926
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Tidak dapat menghapus bagian konfigurasi '%s'"
-#: builtin/remote.c:999
+#: builtin/remote.c:1034
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " baru (pengambilan berikutnya akan simpan di remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1037
msgid " tracked"
msgstr " dilacak"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1039
msgid " stale (use 'git remote prune' to remove)"
msgstr " basi (gunakan 'git remote prune' untuk hapus)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1041
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1082
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
"branch.%s.merge tidak valid; tidak dapat mendasarkan ulang ke lebih dari "
"satu cabang"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1091
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "dasarkan ulang secara interaktif ke remote %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1093
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "dasarkan ulang secara interaktif (dengan penggabungan) ke remote %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1096
#, c-format
msgid "rebases onto remote %s"
msgstr "dasarkan ulang ke remote %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1100
#, c-format
msgid " merges with remote %s"
msgstr " gabungkan dengan remote %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1103
#, c-format
msgid "merges with remote %s"
msgstr "gabungkan dengan remote %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1106
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s dan dengan remote %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1149
msgid "create"
msgstr "buat"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1152
msgid "delete"
msgstr "hapus"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1156
msgid "up to date"
msgstr "terbaru"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1159
msgid "fast-forwardable"
msgstr "bisa dimaju cepat"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1162
msgid "local out of date"
msgstr "lokal kuno"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1169
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s memaksa untuk %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1172
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s mendorong ke %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1176
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s memaksa untuk %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1179
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s mendorong ke %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1247
msgid "do not query remotes"
msgstr "jangan tanyakan remote"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1268
#, c-format
msgid "* remote %s"
msgstr "* remote %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1269
#, c-format
msgid " Fetch URL: %s"
msgstr " URL pengambilan: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
msgid "(no URL)"
msgstr "(tidak ada URL)"
@@ -20131,326 +21129,340 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1284 builtin/remote.c:1286
#, c-format
msgid " Push URL: %s"
msgstr " URL pendorongan: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
#, c-format
msgid " HEAD branch: %s"
msgstr " Cabang HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1288
msgid "(not queried)"
msgstr "(tidak ditanyakan)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1290
msgid "(unknown)"
msgstr "(tidak diketahui)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1294
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Cabang HEAD (HEAD remote ambigu, bisa jadi salah satu dari yang berikut):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1306
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Cabang remote:%s"
msgstr[1] " Cabang remote:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1309 builtin/remote.c:1335
msgid " (status not queried)"
msgstr " (status tidak ditanyakan)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1318
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Cabang lokal dikonfigurasi untuk 'git pull':"
msgstr[1] " Cabang lokal dikonfigurasi untuk 'git pull':"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1326
msgid " Local refs will be mirrored by 'git push'"
msgstr " Referensi lokal yang akan dicerminkan oleh 'git push'"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1332
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Referensi lokal dikonfigurasi untuk 'git push'%s:"
msgstr[1] " Referensi lokal dikonfigurasi untuk 'git push'%s:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1353
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "setel refs/remotes/<nama>/HEAD tergantung remote"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1355
msgid "delete refs/remotes/<name>/HEAD"
msgstr "hapus refs/remotes/<nama>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1369
msgid "Cannot determine remote HEAD"
msgstr "Tidak dapat menentukan HEAD remote"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1371
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Banyak cabang HEAD remote. Mohon pilih satu secara eksplisit dengan:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1381
#, c-format
msgid "Could not delete %s"
msgstr "Tidak dapat menghapus %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1389
#, c-format
msgid "Not a valid ref: %s"
msgstr "Bukan referensi valid: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1391
#, c-format
msgid "Could not setup %s"
msgstr "Tidak dapat mengatur %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1409
#, c-format
msgid " %s will become dangling!"
msgstr " %s akan menjadi teruntai!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1410
#, c-format
msgid " %s has become dangling!"
msgstr " %s telah menjadi teruntai!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1419
#, c-format
msgid "Pruning %s"
msgstr "Memangkas %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1420
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1436
#, c-format
msgid " * [would prune] %s"
msgstr " * [akan pangkas] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1439
#, c-format
msgid " * [pruned] %s"
msgstr " * [dipangkas] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1484
msgid "prune remotes after fetching"
msgstr "pangkas remote setelah pengambilan"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
#, c-format
msgid "No such remote '%s'"
msgstr "Tidak ada remote seperti '%s'"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1566
msgid "add branch"
msgstr "tambah cabang"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1573
msgid "no remote specified"
msgstr "tidak ada remote yang disebutkan"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1590
msgid "query push URLs rather than fetch URLs"
msgstr "tanyakan URL pendorongan daripada URL pengambilan"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1592
msgid "return all URLs"
msgstr "kembalikan semua URL"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1622
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "tidak ada URL yang dikonfigurasi untuk remote '%s'"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1648
msgid "manipulate push URLs"
msgstr "manipulasi URL pendorongan"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1650
msgid "add URL"
msgstr "tambah URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1652
msgid "delete URLs"
msgstr "hapus URL"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1659
msgid "--add --delete doesn't make sense"
msgstr "--add --delete tidak masuk akal"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1700
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "pola URL lama tidak valid: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1708
#, c-format
msgid "No such URL found: %s"
msgstr "Tidak ada URL yang ditemukan seperti: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1710
msgid "Will not delete all non-push URLs"
msgstr "Tidak akan hapus semua URL non-dorong"
-#: builtin/repack.c:26
-msgid "git repack [<options>]"
-msgstr ""
+#: builtin/remote.c:1727
+msgid "be verbose; must be placed before a subcommand"
+msgstr "jadi lebih bertele-tele; harus ditempatkan sebelum subperintah"
-#: builtin/repack.c:31
+#: builtin/repack.c:29
+msgid "git repack [<options>]"
+msgstr "git repack [<opsi>]"
+
+#: builtin/repack.c:34
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
+"Pengepakan ulang tambahan tidak kompatibel dengan indeks bitmap. Gunakan\n"
+" --no-write-bitmap-index atau nonaktifkan konfigurasi pack.writebitmaps."
-#: builtin/repack.c:198
+#: builtin/repack.c:206
msgid "could not start pack-objects to repack promisor objects"
-msgstr ""
+msgstr "tidak dapat memulai pack-objects untuk mengepak ulang objek pejanji"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:280 builtin/repack.c:824
msgid "repack: Expecting full hex object ID lines only from pack-objects."
-msgstr ""
+msgstr "repack: Mengharapkan baris ID objek hex penuh hanya dari pack-objects."
-#: builtin/repack.c:294
+#: builtin/repack.c:304
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
+"tidak dapat menyelesaikan pack-objects untuk mengepak ulang objek pejanji"
-#: builtin/repack.c:309
+#: builtin/repack.c:319
#, c-format
msgid "cannot open index for %s"
-msgstr ""
+msgstr "tidak dapat membuka indeks untuk %s"
-#: builtin/repack.c:368
+#: builtin/repack.c:378
#, c-format
msgid "pack %s too large to consider in geometric progression"
-msgstr ""
+msgstr "pak %s terlalu besar untuk dipertimbangkan dalam deret geometri"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
#, c-format
msgid "pack %s too large to roll up"
-msgstr ""
+msgstr "pak %s terlalu besar untuk digulung"
-#: builtin/repack.c:460
+#: builtin/repack.c:503
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "tidak dapat membuka berkas sementara '%s' untuk ditulis"
+
+#: builtin/repack.c:521
+msgid "could not close refs snapshot tempfile"
+msgstr "tidak dapat menutup berkas sementara jepretan referensi"
+
+#: builtin/repack.c:634
msgid "pack everything in a single pack"
-msgstr ""
+msgstr "pak semuanya dalam satu pak"
-#: builtin/repack.c:462
+#: builtin/repack.c:636
msgid "same as -a, and turn unreachable objects loose"
-msgstr ""
-
-#: builtin/repack.c:465
-msgid "remove redundant packs, and run git-prune-packed"
-msgstr ""
-
-#: builtin/repack.c:467
-msgid "pass --no-reuse-delta to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:469
-msgid "pass --no-reuse-object to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:471
-msgid "do not run git-update-server-info"
-msgstr ""
-
-#: builtin/repack.c:474
-msgid "pass --local to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:476
-msgid "write bitmap index"
-msgstr ""
-
-#: builtin/repack.c:478
-msgid "pass --delta-islands to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:479
-msgid "approxidate"
-msgstr ""
-
-#: builtin/repack.c:480
-msgid "with -A, do not loosen objects older than this"
-msgstr ""
-
-#: builtin/repack.c:482
-msgid "with -a, repack unreachable objects"
-msgstr ""
-
-#: builtin/repack.c:484
-msgid "size of the window used for delta compression"
-msgstr ""
-
-#: builtin/repack.c:485 builtin/repack.c:491
-msgid "bytes"
-msgstr ""
-
-#: builtin/repack.c:486
-msgid "same as the above, but limit memory size instead of entries count"
-msgstr ""
-
-#: builtin/repack.c:488
-msgid "limits the maximum delta depth"
-msgstr ""
-
-#: builtin/repack.c:490
-msgid "limits the maximum number of threads"
-msgstr ""
-
-#: builtin/repack.c:492
-msgid "maximum size of each packfile"
-msgstr ""
-
-#: builtin/repack.c:494
-msgid "repack objects in packs marked with .keep"
-msgstr ""
-
-#: builtin/repack.c:496
-msgid "do not repack this pack"
-msgstr ""
-
-#: builtin/repack.c:498
-msgid "find a geometric progression with factor <N>"
-msgstr ""
-
-#: builtin/repack.c:508
-msgid "cannot delete packs in a precious-objects repo"
-msgstr ""
-
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr ""
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr ""
+msgstr "sama seperti -a, dan jadikan objek yang tak dapat dicapai longgar"
#: builtin/repack.c:639
-msgid "Nothing new to pack."
-msgstr ""
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "hapus pak berlebihan, dan jalankan git-prune-packed"
-#: builtin/repack.c:669
+#: builtin/repack.c:641
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "lewatkan --no-reuse-delta ke git-pack-objects"
+
+#: builtin/repack.c:643
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "lewatkan --no-reuse-object ke git-pack-objects"
+
+#: builtin/repack.c:645
+msgid "do not run git-update-server-info"
+msgstr "jangan jalankan git-update-server-info"
+
+#: builtin/repack.c:648
+msgid "pass --local to git-pack-objects"
+msgstr "lewatkan --local ke git-pack-objects"
+
+#: builtin/repack.c:650
+msgid "write bitmap index"
+msgstr "tulis indeks bitmap"
+
+#: builtin/repack.c:652
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "lewatkan --delta-islands ke git-pack-objects"
+
+#: builtin/repack.c:653
+msgid "approxidate"
+msgstr "tanggal aproksimasi"
+
+#: builtin/repack.c:654
+msgid "with -A, do not loosen objects older than this"
+msgstr "dengan -A, jangan longgarkan objek lebih lama dari ini"
+
+#: builtin/repack.c:656
+msgid "with -a, repack unreachable objects"
+msgstr "dengan -a, pak ulang objek yang tak dapat dicapai"
+
+#: builtin/repack.c:658
+msgid "size of the window used for delta compression"
+msgstr "ukuran jendela yang digunakan untuk kompresi delta"
+
+#: builtin/repack.c:659 builtin/repack.c:665
+msgid "bytes"
+msgstr "bita"
+
+#: builtin/repack.c:660
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+"sama seperti yang diatas, tetapi batasi penggunaan memori daripada hitungan "
+"entri"
+
+#: builtin/repack.c:662
+msgid "limits the maximum delta depth"
+msgstr "batasi kedalaman delta maksimum"
+
+#: builtin/repack.c:664
+msgid "limits the maximum number of threads"
+msgstr "batasi jumlah utas maksimum"
+
+#: builtin/repack.c:666
+msgid "maximum size of each packfile"
+msgstr "ukuran maksimum setiap berkas pak"
+
+#: builtin/repack.c:668
+msgid "repack objects in packs marked with .keep"
+msgstr "pak ulang objek dalam pak yang ditandai dengan .keep"
+
+#: builtin/repack.c:670
+msgid "do not repack this pack"
+msgstr "jangan pak ulang pak ini"
+
+#: builtin/repack.c:672
+msgid "find a geometric progression with factor <N>"
+msgstr "temukan deret geometri dengan faktor <N>"
+
+#: builtin/repack.c:674
+msgid "write a multi-pack index of the resulting packs"
+msgstr "tulis indeks multipak dari pak yang dihasilkan"
+
+#: builtin/repack.c:684
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "tidak dapat menghapus pak dalam repositori objek berharga"
+
+#: builtin/repack.c:833
+msgid "Nothing new to pack."
+msgstr "Tidak ada yang baru untuk dipak."
+
+#: builtin/repack.c:863
#, c-format
msgid "missing required file: %s"
-msgstr ""
+msgstr "berkas yang diperlukan hilang: %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:865
#, c-format
msgid "could not unlink: %s"
-msgstr ""
+msgstr "tidak dapat membatal taut: %s"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -20464,10 +21476,6 @@
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr ""
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr ""
-
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr ""
@@ -20525,169 +21533,163 @@
msgid "unable to open %s for reading"
msgstr ""
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr ""
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr ""
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr ""
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr ""
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr ""
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr ""
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr ""
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr ""
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr ""
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr ""
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr ""
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr ""
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr ""
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr ""
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr ""
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr ""
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr ""
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr ""
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr ""
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr ""
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr ""
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr ""
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr ""
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr ""
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr ""
@@ -20708,196 +21710,181 @@
msgid "unable to generate diff for '%s'"
msgstr ""
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<komit>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<mirip-pohon>] [--] <spek jalur>..."
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<mirip-pohon>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<mirip-pohon>] [--] [<pathspec>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "campuran"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "lunak"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "keras"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "gabungan"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "simpan"
-#: builtin/reset.c:83
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "Anda tidak punya HEAD yang valid."
-#: builtin/reset.c:85
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "Gagal menemukan pohon HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "Gagal menemukan pohon dari %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD sekarang pada %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:304
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Tidak dapat lakukan reset %s di tengah-tengah penggabungan."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
+#: builtin/stash.c:693
msgid "be quiet, only report errors"
msgstr "diam, hanya laporkan kesalahan"
-#: builtin/reset.c:297
+#: builtin/reset.c:404
+msgid "skip refreshing the index after reset"
+msgstr ""
+
+#: builtin/reset.c:406
msgid "reset HEAD and index"
msgstr "setel ulang HEAD dan indeks"
-#: builtin/reset.c:298
+#: builtin/reset.c:407
msgid "reset only HEAD"
msgstr "hanya setel ulang HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:409 builtin/reset.c:411
msgid "reset HEAD, index and working tree"
msgstr "setel ulang HEAD, indeks dan pohon kerja"
-#: builtin/reset.c:304
+#: builtin/reset.c:413
msgid "reset HEAD but keep local changes"
msgstr "setel ulang HEAD tapi simpan perubahan lokal"
-#: builtin/reset.c:310
+#: builtin/reset.c:419
msgid "record only the fact that removed paths will be added later"
msgstr "hanya rekam fakta bahwa jalur yang terhapus akan ditambahkan nanti"
-#: builtin/reset.c:344
+#: builtin/reset.c:452
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Gagal menguraikan '%s' sebagai revisi yang valid."
-#: builtin/reset.c:352
+#: builtin/reset.c:460
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Gagal menguraikan '%s' sebagaikan pohon yang valid."
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch tidak kompatibel dengan --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:479
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed dengan jalur usang; sebagai gantinya gunakan 'git reset --<jalur>'."
-#: builtin/reset.c:373
+#: builtin/reset.c:481
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Tidak dapat lakukan reset %s dengan jalur."
-#: builtin/reset.c:388
+#: builtin/reset.c:496
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "Reset %s tidak diperbolehkan dalam repositori bare"
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "-N hanya dapat digunakan dengan --mixed"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:527
msgid "Unstaged changes after reset:"
msgstr "Perubahan tak tergelar setelah setel ulang:"
-#: builtin/reset.c:416
+#: builtin/reset.c:530
#, c-format
msgid ""
-"\n"
-"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
-"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
-"to make this the default.\n"
+"It took %.2f seconds to refresh the index after reset. You can use\n"
+"'--no-refresh' to avoid this."
msgstr ""
-"\n"
-"Butuh %.2f detik untuk daftar perubahan tak tergelar setelah setel ulang.\n"
-"Anda dapat menggunakan '--quiet' untuk hindari hal ini. Setel konfigurasi\n"
-"reset.quiet ke true untuk membuat hal tersebut asali.\n"
+"Butuh %.2f detik untuk menyegarkan indeks setelah penyetelan ulang.\n"
+"Anda bisa gunakan '--no-refresh' untuk menghindari hal tersebut."
-#: builtin/reset.c:434
+#: builtin/reset.c:547
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Tidak dapat menyetel ulang berkas indeks ke revisi '%s'."
-#: builtin/reset.c:439
+#: builtin/reset.c:552
msgid "Could not write new index file."
msgstr "Tidak dapat menulis berkas indeks baru."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
-
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr ""
-
-#: builtin/rev-list.c:674
+#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
-msgstr ""
+msgstr "rev-list tidak mendukung penampilan catatan"
-#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr ""
+#: builtin/rev-list.c:664
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "hitungan tertanda dan '%s' tidak dapat digunakan bersamaan."
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
-msgstr ""
+msgstr "git rev-parse --parseopt [<opsi>] -- [<argumen>...]"
#: builtin/rev-parse.c:414
msgid "keep the `--` passed as an arg"
-msgstr ""
+msgstr "tetap `--` dilewatkan sebagai argumen"
#: builtin/rev-parse.c:416
msgid "stop parsing after the first non-option argument"
-msgstr ""
+msgstr "hentikan penguraian setelah argumen non-opsi pertama"
#: builtin/rev-parse.c:419
msgid "output in stuck long form"
-msgstr ""
+msgstr "keluarkan dalam bentuk lengket panjang"
#: builtin/rev-parse.c:438
msgid "premature end of input"
-msgstr ""
+msgstr "akhir masukan prematur"
#: builtin/rev-parse.c:442
msgid "no usage string given before the `--' separator"
-msgstr ""
+msgstr "tidak ada untai penggunaan yang diberikan sebelum pemisah `--'"
#: builtin/rev-parse.c:548
msgid "Needed a single revision"
-msgstr ""
+msgstr "Butuh satu revisi"
#: builtin/rev-parse.c:552
msgid ""
@@ -20907,50 +21894,55 @@
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
+"git rev-parse --parseopt [<opsi>] -- [<argumen>...]\n"
+" atau: git rev-parse --sq-quote [<argumen>...]\n"
+" atau: git rev-parse [<opsi>] [<argumen>...]\n"
+"Jalankan \"git rev-parse --parseopt -h\" untuk informasi lebih lanjut pada "
+"penggunaan pertama."
#: builtin/rev-parse.c:712
msgid "--resolve-git-dir requires an argument"
-msgstr ""
+msgstr "--resolve-git-dir butuh sebuah argumen"
#: builtin/rev-parse.c:715
#, c-format
msgid "not a gitdir '%s'"
-msgstr ""
+msgstr "bukan sebuah gitdir '%s'"
#: builtin/rev-parse.c:739
msgid "--git-path requires an argument"
-msgstr ""
+msgstr "--git-path buth sebuah argumen"
#: builtin/rev-parse.c:749
msgid "-n requires an argument"
-msgstr ""
+msgstr "-n butuh sebuah argumen"
#: builtin/rev-parse.c:763
msgid "--path-format requires an argument"
-msgstr ""
+msgstr "--path-format butuh sebuah argumen"
#: builtin/rev-parse.c:769
#, c-format
msgid "unknown argument to --path-format: %s"
-msgstr ""
+msgstr "argumen ke --path-format tidak dikenal: %s"
#: builtin/rev-parse.c:776
msgid "--default requires an argument"
-msgstr ""
+msgstr "--default butuh sebuah argumen"
#: builtin/rev-parse.c:782
msgid "--prefix requires an argument"
-msgstr ""
+msgstr "--prefix butuh sebuah argumen"
#: builtin/rev-parse.c:851
#, c-format
msgid "unknown mode for --abbrev-ref: %s"
-msgstr ""
+msgstr "mode untuk --abbrev-ref tidak dikenal: %s"
#: builtin/rev-parse.c:1023
#, c-format
msgid "unknown mode for --show-object-format: %s"
-msgstr ""
+msgstr "mode untuk --show-object-format tidak dikenal: %s"
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
@@ -21026,15 +22018,19 @@
msgid "preserve initially empty commits"
msgstr "pertahankan komit kosong awal"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "perbolehkan komit dengan pesan kosong"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "simpan komit kosong mubazir"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "pembalikan gagal"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "pemetikan ceri gagal"
@@ -21084,69 +22080,73 @@
msgstr[0] "berkas berikut punya modifikasi lokal:"
msgstr[1] "berkas berikut punya modifikasi lokal:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "jangan daftar berkas terhapus"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "hanya hapus dari indeks"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "timpa pemeriksaan terbaru"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "perbolehkan penghapusan rekursif"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "keluar dengan nol bahkan jika tidak ada yang cocok"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
"Tidak ada spek jalur yang diberikan. Berkas mana yang harusnya saya hapus?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"mohon gelar perubahan Anda ke .gitmodules atau stase itu untuk melanjutkan"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "tidak menghapus '%s' secara rekursif tanpa -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: tidak dapat menghapus %s"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>\n"
+"] [--verbose] [--thin] [--atomic]\n"
+" [<tuan rumah>:]<direktori> (--all | <referensi>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
-msgstr ""
+msgstr "nama remote"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
-msgstr ""
+msgstr "gunakan protokol RPC nirkeadaan"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
-msgstr ""
+msgstr "baca referensi dari masukan standar"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
-msgstr ""
+msgstr "cetak status dari pembantu remote"
#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
@@ -21201,27 +22201,27 @@
msgid "group by field"
msgstr "kelompokkan oleh bidang"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:395
msgid "too many arguments given outside repository"
msgstr "terlalu banyak argumen diberikan di luar repositori"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<kapan>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<revisi> | <glob>)...]"
+" [--current] [--color[=<kapan>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<revisi> | <glob>)...]"
-#: builtin/show-branch.c:17
+#: builtin/show-branch.c:18
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<dasar>]] [--list] [<referensi>]"
-#: builtin/show-branch.c:395
+#: builtin/show-branch.c:396
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
@@ -21298,13 +22298,6 @@
msgid "show <n> most recent ref-log entries starting at base"
msgstr "perlihatkan <n> entri ref-log terkini dimulai dari dasar"
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog tidak kompatibel dengan --all, --remotes, --independent atau --"
-"merge-base"
-
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "tidak ada cabang yang diberikan, dan HEAD tidak valid"
@@ -21396,84 +22389,155 @@
"perlihatkan referensi dari masukan standar yang tidak ada dalam repositori "
"lokal"
-#: builtin/sparse-checkout.c:22
+#: builtin/sparse-checkout.c:23
msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
-msgstr ""
+msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opsi>"
-#: builtin/sparse-checkout.c:46
-msgid "git sparse-checkout list"
-msgstr ""
+#: builtin/sparse-checkout.c:61
+msgid "this worktree is not sparse"
+msgstr "pohon kerja ini bukan tipis"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:76
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
-msgstr ""
+msgstr "pohon kerja ini bukan tipis (berkas sparse-checkout mungkin tidak ada)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:177
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"directori '%s' berisi berkas tak teracak, tapi tidak di dalam kerucut sparse-"
+"checkout"
+
+#: builtin/sparse-checkout.c:185
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "gagal menghapus direktori '%s'"
+
+#: builtin/sparse-checkout.c:327
msgid "failed to create directory for sparse-checkout file"
-msgstr ""
+msgstr "gagal membuat direktori untuk berkas sparse-checkout"
-#: builtin/sparse-checkout.c:268
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr ""
+#: builtin/sparse-checkout.c:366
+msgid "failed to initialize worktree config"
+msgstr "gagal menginisialisasi konfigurasi pohon kerja"
-#: builtin/sparse-checkout.c:270
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr ""
-
-#: builtin/sparse-checkout.c:290
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr ""
-
-#: builtin/sparse-checkout.c:310
-msgid "initialize the sparse-checkout in cone mode"
-msgstr ""
-
-#: builtin/sparse-checkout.c:312
-msgid "toggle the use of a sparse index"
-msgstr ""
-
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:411
msgid "failed to modify sparse-index config"
-msgstr ""
+msgstr "gagal memodifikasi konfigurasi sparse-index"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
+#: builtin/sparse-checkout.c:847
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "inisialisasi checkout tipis dalam mode kerucut"
+
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
+#: builtin/sparse-checkout.c:849
+msgid "toggle the use of a sparse index"
+msgstr "gunakan indeks tipis"
+
+#: builtin/sparse-checkout.c:479
#, c-format
msgid "failed to open '%s'"
-msgstr ""
+msgstr "gagal membuka '%s'"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:531
#, c-format
msgid "could not normalize path %s"
-msgstr ""
+msgstr "tidak dapat menormalkan jalur %s"
-#: builtin/sparse-checkout.c:425
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:560
#, c-format
msgid "unable to unquote C-style string '%s'"
-msgstr ""
+msgstr "tidak dapat membatal-kutip untai gaya C '%s'"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
msgid "unable to load existing sparse-checkout patterns"
-msgstr ""
+msgstr "tidak dapat memuat pola checkout tipis yang sudah ada"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:619
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "pola checkout tipis yang sudah ada tidak menggunakan mode kerucut"
+
+#: builtin/sparse-checkout.c:707
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr "mohon jalankan dari direktori tingkat atas pada mode bukan kerucut"
+
+#: builtin/sparse-checkout.c:712
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr "sebutkan direktori daripada pola (tanpa garis miring terdepan)"
+
+#: builtin/sparse-checkout.c:714
+msgid ""
+"specify directories rather than patterns. If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+"sebutkan direktori daripada pola. Jika direktori Anda dimulai dengan '!', "
+"lewatkan --skip-checks"
+
+#: builtin/sparse-checkout.c:716
+msgid ""
+"specify directories rather than patterns. If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"sebutkan direktori daripada pola. Jika direktori Anda benar-benar berisi "
+"salah satu dari '*?[]\\', lewatkan --skip-checks"
+
+#: builtin/sparse-checkout.c:732
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr ""
+"'%s' bukan sebuah direktori; untuk perlakukan juga sebagai direktori, "
+"jalankan ulang dengan --skip-checks"
+
+#: builtin/sparse-checkout.c:734
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"lewatkan sebuah garis miring terdepan sebelum jalur seperti '%s' jika Anda "
+"ingin sebuah berkas (lihat NON-CONE PROBLEMS dalam manual git-sparse-"
+"checkout)."
+
+#: builtin/sparse-checkout.c:739
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <pola>)"
+
+#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr ""
+"lewati beberapa pemeriksaan kewarasan pada jalur yang diberikan yang mana "
+"dapat memberikan positif palsu"
+
+#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
msgid "read patterns from standard in"
-msgstr ""
+msgstr "baca pola dari masukan standar"
-#: builtin/sparse-checkout.c:588
-msgid "git sparse-checkout reapply"
-msgstr ""
+#: builtin/sparse-checkout.c:760
+msgid "no sparse-checkout to add to"
+msgstr "tidak ada checkout tipis untuk ditambahkan"
-#: builtin/sparse-checkout.c:607
-msgid "git sparse-checkout disable"
+#: builtin/sparse-checkout.c:775
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <pola>)"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:854
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"harus berada di dalam checkout tipis untuk menerapkan ulang pola kejarangan"
+
+#: builtin/sparse-checkout.c:914
msgid "error while refreshing working directory"
-msgstr ""
+msgstr "kesalahan saat menyegarkan direktori kerja"
#: builtin/stash.c:24 builtin/stash.c:40
msgid "git stash list [<options>]"
@@ -21497,23 +22561,25 @@
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-" [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n"
-" [--pathspec-from-file=<berkas> [--pathspec-file-nul]]\n"
-" [--] [<spek jalur>...]]"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index]\n"
+" [-q|--quiet] [-u|--include-untracked] [-a|--all]\n"
+" [-m|--message <pesan>] [--pathspec-from-file=<berkas>\n"
+" [--pathspec-file-nul]] [--] [<spek jalur>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-" [-u|--include-untracked] [-a|--all] [<pesan>]"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index]\n"
+" [-q|--quiet] [-u|--include-untracked] [-a|--all] [<pesan>]"
#: builtin/stash.c:55
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
@@ -21537,6 +22603,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n"
" [--] [<spek jalur>...]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<pesan>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -21560,7 +22634,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear dengan argument tak diimplementasikan"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -21572,183 +22646,185 @@
" %s -> %s\n"
" untuk buat ruang.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "tidak dapat menerapkan stase di tengah-tengah penggabungan"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "tidak dapat membuat diff %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "konflik dalam indeks. Coba tanpa --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "tidak dapat menyimpan pohon indeks"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "tidak dapat mengembalikan berkas tak terlacak dari stase"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Menggabungkan %s dengan %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "Indeks tak dibatal-stasekan."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "tidak dapat mengembalikan berkas tak terlacak dari stase"
+
+#: builtin/stash.c:608 builtin/stash.c:695
msgid "attempt to recreate the index"
msgstr "coba membuat ulang indeks"
-#: builtin/stash.c:635
+#: builtin/stash.c:641
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s (%s) dijatuhkan"
-#: builtin/stash.c:638
+#: builtin/stash.c:644
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Tidak dapat menjatuhkan entri stase"
-#: builtin/stash.c:651
+#: builtin/stash.c:657
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' bukan referensi stase"
-#: builtin/stash.c:701
+#: builtin/stash.c:707
msgid "The stash entry is kept in case you need it again."
msgstr "Entri stase disimpan jika Anda butuh itu lagi."
-#: builtin/stash.c:724
+#: builtin/stash.c:730
msgid "No branch name specified"
msgstr "Tidak ada nama cabang yang disebutkan"
-#: builtin/stash.c:808
+#: builtin/stash.c:809
msgid "failed to parse tree"
msgstr "gagal menguraikan pohon"
-#: builtin/stash.c:819
+#: builtin/stash.c:820
msgid "failed to unpack trees"
msgstr "gagal membongkar pohon"
-#: builtin/stash.c:839
+#: builtin/stash.c:840
msgid "include untracked files in the stash"
msgstr "masukkan berkas tak terlacak ke dalam stase"
-#: builtin/stash.c:842
+#: builtin/stash.c:843
msgid "only show untracked files in the stash"
msgstr "hanya perlihatkan berkas tak terlacak dalam stase"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:930 builtin/stash.c:967
#, c-format
msgid "Cannot update %s with %s"
msgstr "Tidak dapat memperbarui %s dengan %s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
msgid "stash message"
msgstr "pesan stase"
-#: builtin/stash.c:957
+#: builtin/stash.c:958
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" butuh satu argumen <komit>"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1143
+msgid "No staged changes"
+msgstr "Tidak ada perubahan yang tergelar"
+
+#: builtin/stash.c:1204
msgid "No changes selected"
msgstr "Tidak ada perubahan yang dipilih"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1304
msgid "You do not have the initial commit yet"
msgstr "Anda belum punya komit awal"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1331
msgid "Cannot save the current index state"
msgstr "Tidak dapat menyimpan keadaan indeks saat ini"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1340
msgid "Cannot save the untracked files"
msgstr "Tidak dapat menyimpan berkas tak terlacak"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1351 builtin/stash.c:1370
msgid "Cannot save the current worktree state"
msgstr "Tidak dapat menyimpang keadaan pohon kerja saat ini"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1361
+msgid "Cannot save the current staged state"
+msgstr "Tidak dapat menyimpan keadaan tergelar saat ini"
+
+#: builtin/stash.c:1398
msgid "Cannot record working tree state"
msgstr "Tidak dapat merekam keadaan pohon kerja"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1447
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Tidak dapat menggunakan --patch dan --include-untracked atau --all pada "
"waktu yang bersamaan"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1458
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"Tidak dapat menggunakan --staged dan --include-untracked atau --all pada "
+"waktu yang bersamaan"
+
+#: builtin/stash.c:1476
msgid "Did you forget to 'git add'?"
msgstr "Anda lupa untuk 'git add'?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1491
msgid "No local changes to save"
msgstr "Tidak ada perubahan lokal untuk disimpan"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1498
msgid "Cannot initialize stash"
msgstr "Tidak dapat menginisialisasi stase"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1513
msgid "Cannot save the current status"
msgstr "Tidak dapat menyimpan status saat ini"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1518
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Direktori kerja dan keadaan indeks %s disimpan"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1615
msgid "Cannot remove worktree changes"
msgstr "Tidak dapat menghapus perubahaan pohon kerja"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1656 builtin/stash.c:1728
msgid "keep index"
msgstr "jaga indeks"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1658 builtin/stash.c:1730
+msgid "stash staged changes only"
+msgstr "hanya stase perubahan tergelar"
+
+#: builtin/stash.c:1660 builtin/stash.c:1732
msgid "stash in patch mode"
msgstr "stase dalam mode tambalan"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1661 builtin/stash.c:1733
msgid "quiet mode"
msgstr "mode hening"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1663 builtin/stash.c:1735
msgid "include untracked files in stash"
msgstr "masukkan berkas tak terlacak ke dalam stase"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1665 builtin/stash.c:1737
msgid "include ignore files"
msgstr "masukkan berkas ignore"
-#: builtin/stash.c:1700
-msgid ""
-"the stash.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"Dukungan untuk stash.useBuiltin sudah dihapus!\n"
-"Lihat entri itu di 'git help config' untuk selengkapnya."
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr ""
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr ""
-
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
@@ -21757,42 +22833,45 @@
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Mengharapkan nama referensi penuh, dapat %s"
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr "submodule--helper print-default-remote tidak membutuhkan argumen"
-
-#: builtin/submodule--helper.c:101
+#: builtin/submodule--helper.c:103
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "tidak dapat mencopot satu komponen dari url '%s'"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:213
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah "
+"hulu otoritatif tersendiri."
+
+#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
msgid "alternative anchor for relative paths"
msgstr "jangkar alternatif untuk jalur relatif"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:418
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<jalur>] [<jalur>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
+#: builtin/submodule--helper.c:640
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr ""
-"Tidak ada url yang ditemukan untuk jalur submodul '%s' dalam .gitmodules"
+msgstr "Tidak ada url yang ditemukan untuk jalur submodul '%s' di .gitmodules"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:528
#, c-format
msgid "Entering '%s'\n"
msgstr "Memasuki '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:531
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -21801,7 +22880,7 @@
"run_command mengembalikan status bukan nol untuk %s\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:553
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -21812,77 +22891,68 @@
"bersarang %s\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:569
msgid "suppress output of entering each submodule command"
msgstr "sembunyikan keluaran memasuki setiap perintah submodul"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1458
msgid "recurse into nested submodules"
msgstr "rekursi ke dalam submodul bersarang"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:576
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr ""
"git submodule--helper foreach [--quiet] [--recursive] [--] [<perintah>]"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah "
-"hulu otoritatif tersendiri."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:654
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Gagal mendaftarkan url untuk jalur submodul '%s'"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:658
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submodul '%s' (%s) didaftarkan untuk jalur '%s'\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:668
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "peringatan: perintah mode pembaruan disarankan untuk submodul '%s'\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:675
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Gagal mendaftarkan mode pembaruan untuk jalur submodul '%s'"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:697
msgid "suppress output for initializing a submodule"
msgstr "sembunyikan keluaran menginisialisasi submodul"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:702
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opsi>] [<jalur>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "tidak ada pemetaan submodul ditemukan di .gitmodules untuk jalur '%s'"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "tidak dapat menguraikan referensi HEAD di dalam submodul '%s'"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "gagal merekursi ke dalam submodul '%s'"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
msgid "suppress submodule status output"
msgstr "sembunyikan keluaran status submodul"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:875
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -21890,105 +22960,101 @@
"gunakan komit yang disimpan di dalam indeks daripada yang disimpan di dalam "
"HEAD"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<jalur>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <jalur>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:977
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodul)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:980
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodul)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:993
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1043
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "tidak dapat hash objek dari '%s'"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1047
#, c-format
msgid "unexpected mode %o\n"
msgstr "mode tidak diharapkan %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1288
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "gunakan komit yang disimpan di dalam indeks daripada HEAD submodul"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1290
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "bandingkan komit di dalam indeks dengan yang di dalam HEAD submodul"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1292
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "lewatkan submodul dengan nilai 'ignore_config' disetel ke 'all'"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1294
msgid "limit the summary size"
msgstr "batasi ukuran ringkasan"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1299
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<opsi>] [<commit>] -- [<jalur>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1323
msgid "could not fetch a revision for HEAD"
msgstr "tidak dapat mengambil revisi untuk HEAD"
-#: builtin/submodule--helper.c:1342
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached dan --files saling eksklusif"
-
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1384
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Mensinkronisasi url submodul untuk '%s'\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1390
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "gagal mendaftarkan url untuk jalur submodul '%s'"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1399
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "gagal mendapatkan remote asali untuk submodul '%s'"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1409
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "gagal memperbarui remote untuk submodul '%s'"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1456
msgid "suppress output of synchronizing submodule url"
msgstr "sembunyikan keluaran mensinkronisasi url submodul"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1463
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1513
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"Pohon kerja submodul '%s' berisi direktori .git (gunakan 'rm -rf' bila Anda "
-"benar-benar ingin menghapus itu termasuk semua riwayatnya)"
+"Pohon kerja submodul '%s' berisi direktori .git. Ini akan diganti dengan "
+"berkas .git oleh dengan menggunakan absorbgitdirs."
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1530
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -21997,46 +23063,46 @@
"Pohon kerja submodul '%s' berisi modifikasi lokal; gunakan '-f' untuk "
"menyingkirkan itu"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1538
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Direktori '%s' dibersihkan\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1540
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Tidak dapat menghapus pohon kerja submodul '%s'\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1551
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "tidak dapat membuat direktori submodul kosong %s"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1567
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submodul '%s' (%s) tak terdaftar untuk jalur '%s'\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1596
msgid "remove submodule working trees even if they contain local changes"
msgstr "hapus pohon kerja submodul bahkan jika itu berisi perubahan lokal"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1597
msgid "unregister all submodules"
msgstr "batal daftar semua submodul"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1602
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<jalur>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1616
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Gunakan '--all' jika Anda benar-benar ingin deinisialisasi semua submodul"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1665
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22048,153 +23114,173 @@
" itu, setel submodule.alternateErrorStrategy ke 'info' atau yang sama,\n"
"kloning degan '--reference-if-able' daripada '--reference'."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submodul '%s' tidak dapat menambahkan pengganti: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1749
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1756
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1781
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"menolak membuat/menggunakan '%s' di dalam direktori git submodul yang lain"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1826
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1831
#, c-format
msgid "directory not empty: '%s'"
msgstr "direktori tidak kosong: '%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1843
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1876
msgid "where the new submodule will be cloned to"
msgstr "di mana submodul baru akan dikloning"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1879
msgid "name of the new submodule"
msgstr "nama submodul baru"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1882
msgid "url where to clone the submodule from"
msgstr "url di mana submodul dikloning"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
msgid "depth for shallow clones"
msgstr "kedalaman untuk kloning dangkal"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
+#: builtin/submodule--helper.c:3376
msgid "force cloning progress"
msgstr "paksa perkembangan kloning"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
msgid "disallow cloning into non-empty directory"
msgstr "tak perbolehkan kloning ke dalam direktori bukan kosong"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1903
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<jalur>] [--quiet] [--reference "
-"<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] --url "
-"<url> --path <jalur>"
+"<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] [--"
+"filter <spek filter>] --url <url> --path <jalur>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1943
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1947
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Jalur submodul '%s' tidak diinisialisasi"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Mungkin Anda ingin menggunakan 'update --init'?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Melewati submodul tak tergabung %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Melewati submodul '%s'"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Gagal mengkloning '%s'. Percobaan ulang dijadwalkan"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Gagal mengkloning '%s' untuk kedua kalinya, batalkan"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
-msgid "path into the working tree"
-msgstr "jalur ke dalam pohon kerja"
+#: builtin/submodule--helper.c:2371
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Tidak dapat men-checkout '%s' pada jalur submodul '%s'"
-#: builtin/submodule--helper.c:2347
-msgid "path into the working tree, across nested submodule boundaries"
-msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang"
+#: builtin/submodule--helper.c:2375
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Gagal mendasarkan ulang '%s' pada jalur submodul '%s'"
-#: builtin/submodule--helper.c:2351
-msgid "rebase, merge, checkout or none"
-msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali"
+#: builtin/submodule--helper.c:2379
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Tidak dapat menggabungkan '%s' pada jalur submodul '%s'"
-#: builtin/submodule--helper.c:2357
-msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr "buat klon dangkal terpotong hingga sejumlah revisi yang disebutkan"
+#: builtin/submodule--helper.c:2383
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Eksekusi '%s %s' gagal di jalur submodul '%s'"
-#: builtin/submodule--helper.c:2360
-msgid "parallel jobs"
-msgstr "pekerjaan paralel"
+#: builtin/submodule--helper.c:2402
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Jalur submodul '%s': ter-checkout '%s'\n"
-#: builtin/submodule--helper.c:2362
-msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "apakah klon awal seharusnya mengikuti rekomendasi dangkal"
+#: builtin/submodule--helper.c:2406
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Jalur submodul '%s: terdasarkan ulang ke '%s''\n"
-#: builtin/submodule--helper.c:2363
-msgid "don't print cloning progress"
-msgstr "jangan cetak perkembangan pengkloningan"
+#: builtin/submodule--helper.c:2410
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Jalur submodul '%s': tergabung dalam '%s'\n"
-#: builtin/submodule--helper.c:2374
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update-clone [--prefix=<jalur>] [<jalur>...]"
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Jalur submodul '%s': '%s %s'\n"
-#: builtin/submodule--helper.c:2387
-msgid "bad value for update parameter"
-msgstr "nilai jelek untuk parameter pembaruan"
+#: builtin/submodule--helper.c:2438
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"Tidak dapat mengambil di dalam jalur submodul '%s'; mencoba mengambil "
+"langsung %s:"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2447
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Terambil di dalam jalur submodul '%s', tetapi itu tidak berisi %s. "
+"Pengambilan langsung komit tersebut gagal."
+
+#: builtin/submodule--helper.c:2481
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22203,212 +23289,352 @@
"Cabang submodul (%s) dikonfigurasikan untuk mewarisi cabang dari proyek "
"super, tapi proyek super tidak pada cabang apapun"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2499
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2588
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr "Tidak dapat menemukan revisi saat ini pada jalur submodul '%s'"
+
+#: builtin/submodule--helper.c:2599
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "Tidak dapat mengambil pada jalur submodul '%s'"
+
+#: builtin/submodule--helper.c:2604
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr "Tidak dapat menemukan revisi %s pada jalur submodul '%s'"
+
+#: builtin/submodule--helper.c:2640
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "Gagal merekursi ke dalam submodul '%s'"
+
+#: builtin/submodule--helper.c:2699
+msgid "force checkout updates"
+msgstr "paksa pembaruan checkout"
+
+#: builtin/submodule--helper.c:2701
+msgid "initialize uninitialized submodules before update"
+msgstr "inisialisasi submodul yang belum diinisialisasi sebelum pembaruan"
+
+#: builtin/submodule--helper.c:2703
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "gunakan SHA-1 dari cabang pelacak remote submodul"
+
+#: builtin/submodule--helper.c:2705
+msgid "traverse submodules recursively"
+msgstr ""
+
+#: builtin/submodule--helper.c:2707
+msgid "don't fetch new objects from the remote site"
+msgstr "jangan ambil objek baru dari situs remote"
+
+#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+msgid "path into the working tree"
+msgstr "jalur ke dalam pohon kerja"
+
+#: builtin/submodule--helper.c:2713
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang"
+
+#: builtin/submodule--helper.c:2717
+msgid "rebase, merge, checkout or none"
+msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali"
+
+#: builtin/submodule--helper.c:2723
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "buat klon dangkal terpotong hingga sejumlah revisi yang disebutkan"
+
+#: builtin/submodule--helper.c:2726
+msgid "parallel jobs"
+msgstr "pekerjaan paralel"
+
+#: builtin/submodule--helper.c:2728
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "apakah klon awal seharusnya mengikuti rekomendasi dangkal"
+
+#: builtin/submodule--helper.c:2729
+msgid "don't print cloning progress"
+msgstr "jangan cetak perkembangan pengkloningan"
+
+#: builtin/submodule--helper.c:2741
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2767
+msgid "bad value for update parameter"
+msgstr "nilai jelek untuk parameter pembaruan"
+
+#: builtin/submodule--helper.c:2893
msgid "recurse into submodules"
msgstr "rekursi ke dalam submodul"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2899
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2955
msgid "check if it is safe to write to the .gitmodules file"
msgstr "periksa apakah itu aman untuk menulis ke berkas .gitmodules"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2958
msgid "unset the config in the .gitmodules file"
msgstr "batal setel konfigurasi dalam berkas .gitmodules"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <nama> [<nilai>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nama>"
-#: builtin/submodule--helper.c:2663
-msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper config --check-writeable"
-
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
+#: builtin/submodule--helper.c:3395
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "mohom pastikan berkas .gitmodules di dalam pohon kerja"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:3000
msgid "suppress output for setting url of a submodule"
msgstr "sembunyikan keluaran penyetelan url submodule"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:3004
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <jalur> <url baru>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:3037
msgid "set the default tracking branch to master"
msgstr "setel cabang pelacak asali ke master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:3039
msgid "set the default tracking branch"
msgstr "setel cabang pelacak asali"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:3043
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <jalur>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:3044
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <cabang> <jalur>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:3051
msgid "--branch or --default required"
msgstr "--branch atau --default dibutuhkan"
-#: builtin/submodule--helper.c:2752
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch dan --default saling eksklusif"
+#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+msgid "print only error messages"
+msgstr "hanya cetak pesan kesalahan"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3073
+msgid "force creation"
+msgstr "paksa pembuatan"
+
+#: builtin/submodule--helper.c:3081
+msgid "show whether the branch would be created"
+msgstr "perlihatkan apabila cabang akan dibuat"
+
+#: builtin/submodule--helper.c:3085
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <nama> <oid awal> <nama awal>"
+
+#: builtin/submodule--helper.c:3097
+#, c-format
+msgid "creating branch '%s'"
+msgstr "membuat cabang '%s'"
+
+#: builtin/submodule--helper.c:3155
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Menambahkan repo yang sudah ada pada '%s' ke indeks\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3158
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' sudah ada dan bukan repo git valid"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3171
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "Sebuah direktori git untuk '%s' ditemukan lokal dengan remote:"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "Sebuah direktori git untuk '%s' ditemukan lokal dengan remote:\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3178
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"Jika Anda ingin menggunakan ulang direktori git lokal ini daripada "
"mengkloning lagi dari\n"
" %s\n"
-"gynakan opsi '--force'. Jika direktori git lokal bukan repo yang benar\n"
-"atau Anda tidak yakin apa maksudnya, pilih nama yang lain dengan opsi "
-"'--name'.\n"
+"gunakan opsi '--force'. Jika direktori git lokal bukan repo yang benar\n"
+"atau Anda tidak yakin apa maksudnya, pilih nama yang lain dengan opsi '--"
+"name'."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3190
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Mengaktifkan ulang direktori git lokal untuk submodul '%s'\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3227
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "Tidak dapat men-checkout submodul '%s'"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "cabang repositori untuk di-checkout saat kloning"
+#: builtin/submodule--helper.c:3266
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Tidak dapat menambahkan submodul '%s'"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
+#: builtin/submodule--helper.c:3283
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Gagal mendaftarkan jalur submodul '%s'"
+
+#: builtin/submodule--helper.c:3339
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' sudah ada di dalam indeks"
+
+#: builtin/submodule--helper.c:3342
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' sudah ada di dalam indeks dan bukan submodul"
+
+#: builtin/submodule--helper.c:3372
+msgid "branch of repository to add as submodule"
+msgstr "cabang repositori untuk ditambahkan sebagai submodul"
+
+#: builtin/submodule--helper.c:3373
msgid "allow adding an otherwise ignored submodule path"
msgstr "perbolehkan menambah jalur submodul yang diabaikan"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<opsi>...] --url <url> --path <path> "
-"--name <nama>"
+#: builtin/submodule--helper.c:3379
+msgid "borrow the objects from reference repositories"
+msgstr "pinjam objek dari repositori referensi"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3381
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"setel nama submodul ke untai yang diberikan daripada diasalkan ke jalurnya"
+
+#: builtin/submodule--helper.c:3388
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<opsi>] [--] <repositori> [<jalur>]"
+
+#: builtin/submodule--helper.c:3416
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "Jalur relatif hanya dapat digunakan dari level atas dari pohon kerja"
+
+#: builtin/submodule--helper.c:3425
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "URL repo: '%s' harus absolut atau diawali dengan ./|../"
+
+#: builtin/submodule--helper.c:3460
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' bukan nama submodul yang valid"
+
+#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s tidak mendukung --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3526
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' bukan subperintah submodule--helper valid"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr ""
+msgstr "git symbolic-ref [<opsi>] <nama> [<referensi>]"
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
-msgstr ""
+msgstr "git symbolic-ref -d [-q] <nama>"
#: builtin/symbolic-ref.c:42
msgid "suppress error message for non-symbolic (detached) refs"
-msgstr ""
+msgstr "matikan pesan kesalahan untuk referensi non-simbolik (terlepas)"
#: builtin/symbolic-ref.c:43
msgid "delete symbolic ref"
-msgstr ""
+msgstr "hapus referensi simbolik"
#: builtin/symbolic-ref.c:44
msgid "shorten ref output"
-msgstr ""
+msgstr "pendekkan keluaran referensi"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
-msgstr ""
+msgstr "alasan"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
-msgstr ""
+msgstr "alasan pembaruan"
-#: builtin/tag.c:25
+#: builtin/tag.c:26
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <id kunci>] [-f] [-m <pesan | -F <berkas>]\n"
-"\t\t<nama tag> [<kepala>]"
+" <nama tag> [<kepala>]"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nama tag>..."
-#: builtin/tag.c:28
+#: builtin/tag.c:29
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<angka>]] [--contains <komit>] [--no-contains <komit>] [--"
"points-at <objek>]\n"
-"\t\t[--format=<format>] [--merged <komit>] [--no-merged <komit>] [<pola>...]"
+" [--format=<format>] [--merged <komit>] [--no-merged <komit>] "
+"[<pola>...]"
-#: builtin/tag.c:30
+#: builtin/tag.c:31
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format]<format>] <nama tag>..."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "tag '%s' not found."
msgstr "tag '%s' tidak ditemukan."
-#: builtin/tag.c:135
+#: builtin/tag.c:136
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' (yaitu %s) dihapus\n"
-#: builtin/tag.c:170
+#: builtin/tag.c:171
#, c-format
msgid ""
"\n"
@@ -22421,7 +23647,7 @@
" %s\n"
"Baris yang diawali dengan '%c' akan diabaikan.\n"
-#: builtin/tag.c:174
+#: builtin/tag.c:175
#, c-format
msgid ""
"\n"
@@ -22458,412 +23684,398 @@
msgid "bad object type."
msgstr "tipe objek jelek."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "tidak ada pesan tag?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Pesan tag dibiarkan di %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:445
msgid "list tag names"
msgstr "daftarkan nama tag"
-#: builtin/tag.c:448
+#: builtin/tag.c:447
msgid "print <n> lines of each tag message"
msgstr "cetak <n> baris dari setiap pesan tag"
-#: builtin/tag.c:450
+#: builtin/tag.c:449
msgid "delete tags"
msgstr "hapus tag"
-#: builtin/tag.c:451
+#: builtin/tag.c:450
msgid "verify tags"
msgstr "verifikasi tag"
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "Tag creation options"
msgstr "Opsi pembuatan tag"
-#: builtin/tag.c:455
+#: builtin/tag.c:454
msgid "annotated tag, needs a message"
msgstr "tag bercatat, butuh sebuah pesan"
-#: builtin/tag.c:457
+#: builtin/tag.c:456
msgid "tag message"
msgstr "pesan tag"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
msgid "force edit of tag message"
msgstr "paksa sunting pesan tag"
-#: builtin/tag.c:460
+#: builtin/tag.c:459
msgid "annotated and GPG-signed tag"
msgstr "tag bercatat dan bertandatangan GPG"
-#: builtin/tag.c:463
+#: builtin/tag.c:462
msgid "use another key to sign the tag"
msgstr "gunakan kunci yang lain untuk menandatangani tag"
-#: builtin/tag.c:464
+#: builtin/tag.c:463
msgid "replace the tag if exists"
msgstr "ganti tag jika ada"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:464 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "buat log referensi"
-#: builtin/tag.c:467
+#: builtin/tag.c:466
msgid "Tag listing options"
msgstr "Opsi daftar tag"
-#: builtin/tag.c:468
+#: builtin/tag.c:467
msgid "show tag list in columns"
msgstr "perlihatkan daftar tag dalam kolom"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that contain the commit"
msgstr "hanya cetak tag yang berisi komit"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:469 builtin/tag.c:471
msgid "print only tags that don't contain the commit"
msgstr "hanya cetak tag yang tidak berisi komit"
-#: builtin/tag.c:473
+#: builtin/tag.c:472
msgid "print only tags that are merged"
msgstr "hanya cetak tag yang tergabung"
-#: builtin/tag.c:474
+#: builtin/tag.c:473
msgid "print only tags that are not merged"
msgstr "hanya cetak tag yang tak tergabung"
-#: builtin/tag.c:478
+#: builtin/tag.c:477
msgid "print only tags of the object"
msgstr "hanya cetak tag dari objek"
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column dan -n tidak kompatibel"
+#: builtin/tag.c:559
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "opsi '%s' hanya diperbolehkan dalam mode daftar"
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "opsi -n hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "opsi --contains hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "opsi --no-contains hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "opsi --points-at hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "opsi --merged dan --no-merged hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:567
-msgid "only one -F or -m option is allowed."
-msgstr "hanya satu opsi -F atau -m yang diperbolehkan."
-
-#: builtin/tag.c:592
+#: builtin/tag.c:598
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' bukan nama tag yang valid."
-#: builtin/tag.c:597
+#: builtin/tag.c:603
#, c-format
msgid "tag '%s' already exists"
msgstr "tag '%s' sudah ada"
-#: builtin/tag.c:628
+#: builtin/tag.c:634
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' diperbarui (yaitu %s)\n"
+#: builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "paket melebihi ukuran maksimum yang diperbolehkan"
+
#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
-msgstr ""
+msgstr "Membongkar objek"
#: builtin/update-index.c:84
#, c-format
msgid "failed to create directory %s"
-msgstr ""
+msgstr "gagal membuat direktori %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr ""
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
-msgstr ""
+msgstr "gagal menghapus berkas %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
-msgstr ""
+msgstr "gagal menghapus direktori %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
-msgstr ""
+msgstr "Menguji mtime di '%s' "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
-msgstr ""
+msgstr "info stat direktori tidak berubah setelah menambahkan berkas baru"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
-msgstr ""
+msgstr "info stat direktori tidak berubah setelah menambahkan direktori baru"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
-msgstr ""
+msgstr "info stat direktori berubah setelah memperbarui berkas"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
+"info stat direktori berubah setelah menambahkan berkas di dalam subdirektori"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
-msgstr ""
+msgstr "info stat direktori tidak berubah setelah menghapus berkas"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
-msgstr ""
+msgstr "info stat direktori tidak berubah setelah menghapus direktori"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
-msgstr ""
+msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
-msgstr ""
+msgstr "git update-index [<opsi>] [--] [<berkas>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:993
msgid "continue refresh even when index needs update"
-msgstr ""
+msgstr "lanjutkan penyegaran bahkan ketika indeks perlu diperbarui"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:996
msgid "refresh: ignore submodules"
-msgstr ""
-
-#: builtin/update-index.c:982
-msgid "do not ignore new files"
-msgstr ""
-
-#: builtin/update-index.c:984
-msgid "let files replace directories and vice-versa"
-msgstr ""
-
-#: builtin/update-index.c:986
-msgid "notice files missing from worktree"
-msgstr ""
-
-#: builtin/update-index.c:988
-msgid "refresh even if index contains unmerged entries"
-msgstr ""
-
-#: builtin/update-index.c:991
-msgid "refresh stat information"
-msgstr ""
-
-#: builtin/update-index.c:995
-msgid "like --refresh, but ignore assume-unchanged setting"
-msgstr ""
+msgstr "refresh: abaikan submodul"
#: builtin/update-index.c:999
-msgid "<mode>,<object>,<path>"
-msgstr ""
+msgid "do not ignore new files"
+msgstr "jangan abaikan berkas baru"
-#: builtin/update-index.c:1000
-msgid "add the specified entry to the index"
-msgstr ""
+#: builtin/update-index.c:1001
+msgid "let files replace directories and vice-versa"
+msgstr "biarkan berkas menggantikan direktori dan sebaliknya"
-#: builtin/update-index.c:1010
-msgid "mark files as \"not changing\""
-msgstr ""
+#: builtin/update-index.c:1003
+msgid "notice files missing from worktree"
+msgstr "catat berkas hilang dari pohon kerja"
-#: builtin/update-index.c:1013
-msgid "clear assumed-unchanged bit"
-msgstr ""
+#: builtin/update-index.c:1005
+msgid "refresh even if index contains unmerged entries"
+msgstr "segarkan bahkan jika indeks berisi entri tak tergabung"
+
+#: builtin/update-index.c:1008
+msgid "refresh stat information"
+msgstr "segarkan informasi stat"
+
+#: builtin/update-index.c:1012
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "seperti --refresh, tapi abaikan setelan assume-unchanged"
#: builtin/update-index.c:1016
-msgid "mark files as \"index-only\""
-msgstr ""
+msgid "<mode>,<object>,<path>"
+msgstr "<mode>,<objek>,<jalur>"
-#: builtin/update-index.c:1019
-msgid "clear skip-worktree bit"
-msgstr ""
+#: builtin/update-index.c:1017
+msgid "add the specified entry to the index"
+msgstr "tambahkan entri yang disebutkan ke indeks"
-#: builtin/update-index.c:1022
-msgid "do not touch index-only entries"
-msgstr ""
-
-#: builtin/update-index.c:1024
-msgid "add to index only; do not add content to object database"
-msgstr ""
-
-#: builtin/update-index.c:1026
-msgid "remove named paths even if present in worktree"
-msgstr ""
-
-#: builtin/update-index.c:1028
-msgid "with --stdin: input lines are terminated by null bytes"
-msgstr ""
+#: builtin/update-index.c:1027
+msgid "mark files as \"not changing\""
+msgstr "tandai berkas sebagai \"not changing\""
#: builtin/update-index.c:1030
+msgid "clear assumed-unchanged bit"
+msgstr "bersihkan bita assumed-unchanged"
+
+#: builtin/update-index.c:1033
+msgid "mark files as \"index-only\""
+msgstr "tandai berkas sebagai \"index-only\""
+
+#: builtin/update-index.c:1036
+msgid "clear skip-worktree bit"
+msgstr "bersihkan bita skip-worktree"
+
+#: builtin/update-index.c:1039
+msgid "do not touch index-only entries"
+msgstr "jangan sentuh entri index-only"
+
+#: builtin/update-index.c:1041
+msgid "add to index only; do not add content to object database"
+msgstr "hanya tambahkan ke indeks; jangan tambahkan konten ke basis data objek"
+
+#: builtin/update-index.c:1043
+msgid "remove named paths even if present in worktree"
+msgstr "hapus jalur bernama bahkan jika ada dalam pohon kerja"
+
+#: builtin/update-index.c:1045
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "dengan --stdin: baris masukan diakhiri dengan bita null"
+
+#: builtin/update-index.c:1047
msgid "read list of paths to be updated from standard input"
-msgstr ""
-
-#: builtin/update-index.c:1034
-msgid "add entries from standard input to the index"
-msgstr ""
-
-#: builtin/update-index.c:1038
-msgid "repopulate stages #2 and #3 for the listed paths"
-msgstr ""
-
-#: builtin/update-index.c:1042
-msgid "only update entries that differ from HEAD"
-msgstr ""
-
-#: builtin/update-index.c:1046
-msgid "ignore files missing from worktree"
-msgstr ""
-
-#: builtin/update-index.c:1049
-msgid "report actions to standard output"
-msgstr ""
+msgstr "baca daftar jalur yang akan diperbarui dari masukan standar"
#: builtin/update-index.c:1051
-msgid "(for porcelains) forget saved unresolved conflicts"
-msgstr ""
+msgid "add entries from standard input to the index"
+msgstr "tambahkan entri dari masukan standar ke indeks"
#: builtin/update-index.c:1055
-msgid "write index in this format"
-msgstr ""
-
-#: builtin/update-index.c:1057
-msgid "enable or disable split index"
-msgstr ""
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "populasi ulang tahapan #2 dan #3 untuk jalur yang terdaftar"
#: builtin/update-index.c:1059
-msgid "enable/disable untracked cache"
-msgstr ""
-
-#: builtin/update-index.c:1061
-msgid "test if the filesystem supports untracked cache"
-msgstr ""
+msgid "only update entries that differ from HEAD"
+msgstr "hanya perbarui entri yang berbeda dari HEAD"
#: builtin/update-index.c:1063
-msgid "enable untracked cache without testing the filesystem"
-msgstr ""
+msgid "ignore files missing from worktree"
+msgstr "abaikan berkas yang hilang dari pohon kerja"
-#: builtin/update-index.c:1065
-msgid "write out the index even if is not flagged as changed"
-msgstr ""
+#: builtin/update-index.c:1066
+msgid "report actions to standard output"
+msgstr "laporkan aksi ke keluaran standar"
-#: builtin/update-index.c:1067
-msgid "enable or disable file system monitor"
-msgstr ""
-
-#: builtin/update-index.c:1069
-msgid "mark files as fsmonitor valid"
-msgstr ""
+#: builtin/update-index.c:1068
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(untuk porselen) lupakan konflik tak terselesaikan yang disimpan"
#: builtin/update-index.c:1072
-msgid "clear fsmonitor valid bit"
-msgstr ""
+msgid "write index in this format"
+msgstr "tulis indeks dalam format ini"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1074
+msgid "enable or disable split index"
+msgstr "aktifkan atau nonaktifkan indeks terpisah"
+
+#: builtin/update-index.c:1076
+msgid "enable/disable untracked cache"
+msgstr "aktifkan/nonaktifkan tembolok tak terlacak"
+
+#: builtin/update-index.c:1078
+msgid "test if the filesystem supports untracked cache"
+msgstr "uji jika sistem berkas mendukung tembolok tak terlacak"
+
+#: builtin/update-index.c:1080
+msgid "enable untracked cache without testing the filesystem"
+msgstr "aktifkan tembolok tak terlacak tanpa menguji sistem berkas"
+
+#: builtin/update-index.c:1082
+msgid "write out the index even if is not flagged as changed"
+msgstr "tulis indeks bahkan jika tidak dianggap berubah"
+
+#: builtin/update-index.c:1084
+msgid "enable or disable file system monitor"
+msgstr "aktifkan atau nonaktifkan monitor sistem berkas"
+
+#: builtin/update-index.c:1086
+msgid "mark files as fsmonitor valid"
+msgstr "tandai berkas sebagai fsmonitor valid"
+
+#: builtin/update-index.c:1089
+msgid "clear fsmonitor valid bit"
+msgstr "bersihkan bita fsmonitor valid"
+
+#: builtin/update-index.c:1195
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
+"core.splitIndex disetel ke false; hapus atau ubah, jika Anda benar-benar "
+"ingin mengaktifkan indeks terpisah"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1204
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
+"core.splitIndex disetel ke true; hapus atau ubah, jika Anda benar-benar "
+"ingin menonaktifkan indeks terpisah"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1216
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
+"core.untrackedCache disetel ke true; hapus atau ubah, jika Anda benar-benar "
+"ingin menonaktifkan tembolok tak terlacak"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1220
msgid "Untracked cache disabled"
-msgstr ""
+msgstr "Tembolok tak terlacak dinonaktifkan"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1228
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
+"core.untrackedCache disetel ke false; hapus atau ubah, jika Anda benar-benar "
+"ingin mengaktifkan tembolok tak terlacak"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1232
#, c-format
msgid "Untracked cache enabled for '%s'"
-msgstr ""
+msgstr "Tembolok tak terlacak diaktifkan untuk '%s'"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1241
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
+"core.fsmonitor tak disetel; setel jika Anda benar-benar ingin mengaktifkan "
+"fsmonitor"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1246
msgid "fsmonitor enabled"
-msgstr ""
+msgstr "fsmonitor diaktifkan"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1250
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
+"core.fsmonitor disetel; hapus jika Anda benar-benar ingin menonaktifkan "
+"fsmonitor"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1254
msgid "fsmonitor disabled"
-msgstr ""
+msgstr "fsmonitor dinonaktifkan"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
-msgstr ""
+msgstr "git update-ref [<opsi>] -d <nama referensi> [<nilai lama>]"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
+"git update-ref [<opsi>] <nama referensi> <nilai baru> [<nilai lama>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
-msgstr ""
+msgstr "git update-ref [<opsi>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
-msgstr ""
+msgstr "hapus referensi"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
-msgstr ""
+msgstr "perbarui <nama referensi> bukan yang ditunjuknya"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
-msgstr ""
+msgstr "stdin punya argumen yang diakhiri dengan NUL"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
-msgstr ""
-
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr ""
+msgstr "baca pembaruan dari masukan standar"
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
@@ -22871,343 +24083,368 @@
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
-msgstr ""
+msgstr "git upload-pack [<opsi>] <direktori>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
-msgstr ""
+msgstr "keluar setelah pertukaran permintaan/jawaban tunggal"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr ""
-
-#: builtin/upload-pack.c:27
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr ""
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "layani info/referensi untuk git-http-backend"
#: builtin/upload-pack.c:29
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "jangan coba <direktori>.git/ jika <direktori> bukan direktori Git"
+
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr ""
+msgstr "interupsi transfer setelah <n> detik niraktivitas"
#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr ""
+msgstr "git verify-commit [-v | --verbose] <komit>..."
#: builtin/verify-commit.c:68
msgid "print commit contents"
-msgstr ""
+msgstr "cetak isi komit"
#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
-msgstr ""
+msgstr "cetak keluaran status gpg mentah"
#: builtin/verify-pack.c:59
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
-msgstr ""
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pak>..."
#: builtin/verify-pack.c:70
msgid "verbose"
-msgstr ""
+msgstr "bertele-tele"
#: builtin/verify-pack.c:72
msgid "show statistics only"
-msgstr ""
+msgstr "hanya perlihatkan statistik"
#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
-msgstr ""
+msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
#: builtin/verify-tag.c:36
msgid "print tag contents"
-msgstr ""
-
-#: builtin/worktree.c:18
-msgid "git worktree add [<options>] <path> [<commit-ish>]"
-msgstr ""
+msgstr "cetak isi tag"
#: builtin/worktree.c:19
-msgid "git worktree list [<options>]"
-msgstr ""
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<opsi>] <jalur> [<mirip komit>]"
#: builtin/worktree.c:20
-msgid "git worktree lock [<options>] <path>"
-msgstr ""
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<opsi>]"
#: builtin/worktree.c:21
-msgid "git worktree move <worktree> <new-path>"
-msgstr ""
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<opsi>] <jalur>"
#: builtin/worktree.c:22
-msgid "git worktree prune [<options>]"
-msgstr ""
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <pohon kerja> <jalur baru>"
#: builtin/worktree.c:23
-msgid "git worktree remove [<options>] <worktree>"
-msgstr ""
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<opsi>]"
#: builtin/worktree.c:24
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<opsi>] <pohon kerja>"
+
+#: builtin/worktree.c:25
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [<jalur>...]"
+
+#: builtin/worktree.c:26
msgid "git worktree unlock <path>"
-msgstr ""
+msgstr "git worktree unlock <jalur>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr ""
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:76
#, c-format
msgid "Removing %s/%s: %s"
-msgstr ""
-
-#: builtin/worktree.c:147
-msgid "report pruned working trees"
-msgstr ""
+msgstr "Menghapus %s/%s: %s"
#: builtin/worktree.c:149
-msgid "expire working trees older than <time>"
-msgstr ""
+msgid "report pruned working trees"
+msgstr "laporkan pohon kerja terpangkas"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:151
+msgid "expire working trees older than <time>"
+msgstr "kadaluarsakan pohon kerja yang lebih tua dari <waktu>"
+
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
-msgstr ""
+msgstr "'%s' sudah ada"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:230
#, c-format
msgid "unusable worktree destination '%s'"
-msgstr ""
+msgstr "tujuan pohon kerja '%s' tidak dapat diguanakan"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:235
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
+"'%s' adalah pohon kerja hilang tapi terkunci;\n"
+"gunakan '%s -f -f' untuk menimpa, atau 'unlock' dan 'prune' atau 'remove' "
+"untuk membersihkan"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:237
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use '%s -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
+"'%s' adalah pohon kerja hilang tapi telah didaftarkan;\n"
+"gunakan '%s -f' untuk menimpa, atau 'prune' atau 'remove' untuk membersihkan"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:248
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr ""
+"gagal menyalin '%s' ke '%s'; checkout tipis mungkin tidak bekerja dengan baik"
+
+#: builtin/worktree.c:268
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr "Gagal menyalin konfigurasi pohon kerja dari '%s' ke '%s'"
+
+#: builtin/worktree.c:280 builtin/worktree.c:285
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "gagal menyetel balik '%s' di '%s'"
+
+#: builtin/worktree.c:356
#, c-format
msgid "could not create directory of '%s'"
-msgstr ""
+msgstr "tidak dapat membuat direktori '%s'"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:378
msgid "initializing"
-msgstr ""
+msgstr "menginisialisasi"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:492 builtin/worktree.c:498
#, c-format
msgid "Preparing worktree (new branch '%s')"
-msgstr ""
+msgstr "Menyiapkan pohon kerja (cabang baru '%s')"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:494
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
+"Menyiapkan pohon kerja (menyetel ulang cabang '%s'; sebelumnya pada %s)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:503
#, c-format
msgid "Preparing worktree (checking out '%s')"
-msgstr ""
+msgstr "Menyiapkan pohon kerja (men-checkout '%s')"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:509
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
-msgstr ""
+msgstr "Menyiapkan pohon kerja (HEAD terpisah %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:554
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
+"checkout <cabang> bahkan jika sudah di-checkout pada pohon kerja lainnya"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:557
msgid "create a new branch"
-msgstr ""
+msgstr "buat sebuah cabang baru"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:559
msgid "create or reset a branch"
-msgstr ""
+msgstr "buat atau setel ulang sebuah cabang"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:561
msgid "populate the new working tree"
-msgstr ""
+msgstr "isikan pohon kerja baru"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:562
msgid "keep the new working tree locked"
-msgstr ""
+msgstr "tetap pohon kerja baru terkunci"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:564 builtin/worktree.c:809
msgid "reason for locking"
-msgstr ""
+msgstr "alasan penguncian"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:567
msgid "set up tracking mode (see git-branch(1))"
-msgstr ""
+msgstr "pasang mode pelacakan (lihat git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:570
msgid "try to match the new branch name with a remote-tracking branch"
-msgstr ""
+msgstr "coba cocokkan nama cabang baru dengan sebuah cabang pelacakan remote"
-#: builtin/worktree.c:506
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:508
-msgid "--reason requires --lock"
-msgstr ""
-
-#: builtin/worktree.c:512
+#: builtin/worktree.c:584
msgid "added with --lock"
-msgstr ""
+msgstr "tambahkan dengan --lock"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:646
msgid "--[no-]track can only be used if a new branch is created"
-msgstr ""
+msgstr "--[no-]track hanya dapat digunakan jika cabang baru dibuat"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:766
msgid "show extended annotations and reasons, if available"
msgstr ""
-#: builtin/worktree.c:693
+#: builtin/worktree.c:768
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
+"tambahkan anotasi 'dapat dipangkas' ke pohon kerja lebih tua dari <time>"
-#: builtin/worktree.c:702
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr ""
+#: builtin/worktree.c:770
+msgid "terminate records with a NUL character"
+msgstr "akhiri rekaman dengan karakter NUL"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
+#: builtin/worktree.c:1052
#, c-format
msgid "'%s' is not a working tree"
-msgstr ""
+msgstr "'%s' bukan sebuah pohon kerja"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:823 builtin/worktree.c:856
msgid "The main working tree cannot be locked or unlocked"
-msgstr ""
+msgstr "Pohon kerja utama tidak dapat dikunci atau dibuka kunci"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:828
#, c-format
msgid "'%s' is already locked, reason: %s"
-msgstr ""
+msgstr "'%s' sudah terkunci, alasan: %s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:830
#, c-format
msgid "'%s' is already locked"
-msgstr ""
+msgstr "'%s' sudah terkunci"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:858
#, c-format
msgid "'%s' is not locked"
-msgstr ""
+msgstr "'%s' tidak terkunci"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:899
msgid "working trees containing submodules cannot be moved or removed"
-msgstr ""
+msgstr "pohon kerja yang berisi submodul tidak dapat dipindahkan atau dihapus"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:907
msgid "force move even if worktree is dirty or locked"
-msgstr ""
+msgstr "paksa pindah bahkan jika pohon kerja kotor atau terkunci"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:930 builtin/worktree.c:1054
#, c-format
msgid "'%s' is a main working tree"
-msgstr ""
+msgstr "'%s' adalah pohon kerja utama"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:935
#, c-format
msgid "could not figure out destination name from '%s'"
-msgstr ""
+msgstr "tidak dapat menebak nama tujuan dari '%s'"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:948
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
+"tidak dapat memindahkan pohon kerja terkunci, alasan penguncian: %s\n"
+"gunakan 'move -f -f' untuk memaksakan atau membuka kunci terlebih dahulu"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:950
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
+"tidak dapat memindahkan pohon kerja terkunci;\n"
+"gunakan 'move -f -f' untuk memaksakan atau membuka kunci terlebih dahulu"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:953
#, c-format
msgid "validation failed, cannot move working tree: %s"
-msgstr ""
+msgstr "validasi gagal, tidak dapat memindahkan pohon kerja: %s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:958
#, c-format
msgid "failed to move '%s' to '%s'"
-msgstr ""
+msgstr "gagal memindahkan '%s' ke '%s'"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:1004
#, c-format
msgid "failed to run 'git status' on '%s'"
-msgstr ""
+msgstr "tidak dapat menjalankan 'git status' pada '%s'"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:1008
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
+"'%s' berisi berkas termodifikasi atau tak terlacak, gunakan --force untuk "
+"menghapus"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:1013
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
-msgstr ""
+msgstr "gagal menjalankan 'git status' pada '%s', kode %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:1036
msgid "force removal even if worktree is dirty or locked"
-msgstr ""
+msgstr "paksa penghapusan bahkan jika pohon kerja kotor atau terkunci"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:1059
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
+"tidak dapat menghapus pohon kerja terkunci, alasan penguncian: %s\n"
+"gunakan 'remove -f -f' untuk memaksakan atau buka kunci terlebih dahulu"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:1061
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
+"tidak dapat menghapus pohon kerja terkunci;\n"
+"gunakan 'remove -f -f' untuk memaksakan atau buka kunci terlebih dahulu"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:1064
#, c-format
msgid "validation failed, cannot remove working tree: %s"
-msgstr ""
+msgstr "validasi gagal, tidak dapat menghapus pohon kerja: %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1088
#, c-format
msgid "repair: %s: %s"
-msgstr ""
+msgstr "perbaikan: %s: %s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1091
#, c-format
msgid "error: %s: %s"
-msgstr ""
+msgstr "kesalahan: %s: %s"
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
-msgstr ""
+msgstr "git write-tree [--missing-ok] [--prefix=<prefiks>/]"
#: builtin/write-tree.c:28
msgid "<prefix>/"
-msgstr ""
+msgstr "<prefiks>/"
#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
-msgstr ""
+msgstr "tulis objek pohon untuk subdirektori <prefiks>"
#: builtin/write-tree.c:31
msgid "only useful for debugging"
-msgstr ""
+msgstr "hanya berguna untuk penirkutuan"
#: git.c:28
msgid ""
@@ -23219,6 +24456,14 @@
" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
msgstr ""
+"git [--version] [--help] [-C <jalur>] [-c <nama>=<nilai>]\n"
+" [--exec-path[=<jalur>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<jalur>] [--work-tree=<jalur>] [--namespace=<nama>]\n"
+" [--super-prefix=<jalur>] [--config-env=<nama>=<variabel "
+"lingkungan>]\n"
+" <perintah> [<argumen>]"
#: git.c:36
msgid ""
@@ -23227,51 +24472,45 @@
"to read about a specific subcommand or concept.\n"
"See 'git help git' for an overview of the system."
msgstr ""
+"'git help -a' dan 'git help -g' daftar subperintah tersedia dan beberapa\n"
+"panduan konsep. Lihat 'git help <perintah>' atau 'git help <konsep>'\n"
+"untuk baca tentang perintah atau konsep spesifik.\n"
+"Lihat 'git help git' untuk gambaran tentang sistem."
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr ""
+msgid "no directory given for '%s' option\n"
+msgstr "tidak ada direktori yang diberikan untuk opsi '%s'\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
-msgstr ""
-
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr ""
+msgstr "tidak ada ruang nama yang diberikan untuk --namespace\n"
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
-msgstr ""
+msgstr "tidak ada prefiks yang diberikan untuk --super-prefix\n"
#: git.c:252
#, c-format
msgid "-c expects a configuration string\n"
-msgstr ""
+msgstr "-c mengharapkan sebuah untai konfigurasi\n"
#: git.c:260
#, c-format
msgid "no config key given for --config-env\n"
-msgstr ""
-
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr ""
+msgstr "tidak ada kunci konfigurasi yang diberikan untuk --config-env\n"
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
-msgstr ""
+msgstr "opsi tidak dikenal: %s\n"
#: git.c:375
#, c-format
msgid "while expanding alias '%s': '%s'"
-msgstr ""
+msgstr "ketika memperluas alias '%s': '%s'"
#: git.c:384
#, c-format
@@ -23279,73 +24518,69 @@
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
+"alias '%s' merubah variabel lingkungan.\n"
+"Anda dapat menggunakan '!git' dalam alias untuk melakukannya."
#: git.c:391
#, c-format
msgid "empty alias for %s"
-msgstr ""
+msgstr "alias kosong untuk %s"
#: git.c:394
#, c-format
msgid "recursive alias: %s"
-msgstr ""
-
-#: git.c:476
-msgid "write failure on standard output"
-msgstr ""
-
-#: git.c:478
-msgid "unknown write failure on standard output"
-msgstr ""
+msgstr "alias rekursif: %s"
#: git.c:480
-msgid "close failed on standard output"
-msgstr ""
+msgid "write failure on standard output"
+msgstr "kegagalan menulis pada keluaran standar"
-#: git.c:833
+#: git.c:482
+msgid "unknown write failure on standard output"
+msgstr "kegagal menulis tidak diketahui pada keluaran standar"
+
+#: git.c:484
+msgid "close failed on standard output"
+msgstr "penutupan gagal pada keluaran standar"
+
+#: git.c:838
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr ""
+msgstr "putaran alias terdeteksi: perluasan '%s' tidak berhenti:%s"
-#: git.c:883
+#: git.c:888
#, c-format
msgid "cannot handle %s as a builtin"
-msgstr ""
+msgstr "tidak dapat menangani %s sebagai bawaan"
-#: git.c:896
+#: git.c:901
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
+"penggunaan: %s\n"
+"\n"
-#: git.c:916
+#: git.c:921
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr ""
+msgstr "perluasan alias '%s' gagal; '%s' bukan sebuah perintah git\n"
-#: git.c:928
+#: git.c:933
#, c-format
msgid "failed to run command '%s': %s\n"
-msgstr ""
+msgstr "gagal menjalankan perintah '%s': %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr ""
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr ""
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr ""
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr ""
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr ""
@@ -23371,147 +24606,109 @@
msgid "exit immediately after advertising capabilities"
msgstr ""
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr ""
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr ""
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr ""
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr ""
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr ""
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr ""
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr ""
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr ""
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr ""
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr ""
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
msgstr ""
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr ""
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -23519,138 +24716,320 @@
" redirect: %s"
msgstr ""
-#: remote-curl.c:183
+#: remote-curl.c:184
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr ""
-#: remote-curl.c:307
+#: remote-curl.c:308
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr ""
-#: remote-curl.c:408
+#: remote-curl.c:409
msgid "invalid server response; expected service, got flush packet"
msgstr ""
-#: remote-curl.c:439
+#: remote-curl.c:440
#, c-format
msgid "invalid server response; got '%s'"
msgstr ""
-#: remote-curl.c:499
+#: remote-curl.c:500
#, c-format
msgid "repository '%s' not found"
msgstr ""
-#: remote-curl.c:503
+#: remote-curl.c:504
#, c-format
msgid "Authentication failed for '%s'"
msgstr ""
-#: remote-curl.c:507
+#: remote-curl.c:508
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+
+#: remote-curl.c:512
#, c-format
msgid "unable to access '%s': %s"
msgstr ""
-#: remote-curl.c:513
+#: remote-curl.c:518
#, c-format
msgid "redirecting to %s"
msgstr ""
-#: remote-curl.c:644
+#: remote-curl.c:649
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
-#: remote-curl.c:656
+#: remote-curl.c:661
msgid "remote server sent unexpected response end packet"
msgstr ""
-#: remote-curl.c:726
+#: remote-curl.c:730
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
-#: remote-curl.c:756
+#: remote-curl.c:759
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr ""
-#: remote-curl.c:758
+#: remote-curl.c:761
msgid "remote-curl: unexpected response end packet"
msgstr ""
-#: remote-curl.c:834
+#: remote-curl.c:837
#, c-format
msgid "RPC failed; %s"
msgstr ""
-#: remote-curl.c:874
+#: remote-curl.c:877
msgid "cannot handle pushes this big"
msgstr ""
-#: remote-curl.c:989
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
-#: remote-curl.c:993
+#: remote-curl.c:994
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
-#: remote-curl.c:1043
+#: remote-curl.c:1044
#, c-format
msgid "%d bytes of length header were received"
msgstr ""
-#: remote-curl.c:1045
+#: remote-curl.c:1046
#, c-format
msgid "%d bytes of body are still expected"
msgstr ""
-#: remote-curl.c:1134
+#: remote-curl.c:1135
msgid "dumb http transport does not support shallow capabilities"
msgstr ""
-#: remote-curl.c:1149
+#: remote-curl.c:1150
msgid "fetch failed."
msgstr ""
-#: remote-curl.c:1195
+#: remote-curl.c:1198
msgid "cannot fetch by sha1 over smart http"
msgstr ""
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1242 remote-curl.c:1248
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1260 remote-curl.c:1378
#, c-format
msgid "http transport does not support %s"
msgstr ""
-#: remote-curl.c:1293
+#: remote-curl.c:1296
msgid "git-http-push failed"
msgstr ""
-#: remote-curl.c:1481
+#: remote-curl.c:1485
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
-#: remote-curl.c:1513
+#: remote-curl.c:1517
msgid "remote-curl: error reading command stream from git"
msgstr ""
-#: remote-curl.c:1520
+#: remote-curl.c:1524
msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
-#: remote-curl.c:1561
+#: remote-curl.c:1565
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr ""
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
+#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#, c-format
+msgid "could not switch to '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:179
+#, c-format
+msgid "could not configure %s=%s"
+msgstr ""
+
+#: contrib/scalar/scalar.c:197
+msgid "could not configure log.excludeDecoration"
+msgstr ""
+
+#: contrib/scalar/scalar.c:218
+msgid "Scalar enlistments require a worktree"
+msgstr ""
+
+#: contrib/scalar/scalar.c:310
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:316
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+
+#: contrib/scalar/scalar.c:329
+msgid "failed to get default branch name"
+msgstr ""
+
+#: contrib/scalar/scalar.c:340
+msgid "failed to unregister repository"
+msgstr ""
+
+#: contrib/scalar/scalar.c:355
+msgid "failed to delete enlistment directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:375
+msgid "branch to checkout after clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:377
+msgid "when cloning, create full working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:379
+msgid "only download metadata for the branch that will be checked out"
+msgstr ""
+
+#: contrib/scalar/scalar.c:384
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:409
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:418
+#, c-format
+msgid "directory '%s' exists already"
+msgstr ""
+
+#: contrib/scalar/scalar.c:445
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:456
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:465
+#, c-format
+msgid "could not configure '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:468
+msgid "partial clone failed; attempting full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:472
+msgid "could not configure for full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:504
+msgid "`scalar list` does not take arguments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:517
+msgid "scalar register [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:544
+msgid "reconfigure all registered enlistments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:548
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:566
+msgid "--all or <enlistment>, but not both"
+msgstr ""
+
+#: contrib/scalar/scalar.c:581
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:621
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+
+#: contrib/scalar/scalar.c:639
+#, c-format
+msgid "no such task: '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:689
+msgid "scalar unregister [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:736
+msgid "scalar delete <enlistment>"
+msgstr ""
+
+#: contrib/scalar/scalar.c:751
+msgid "refusing to delete current working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:766
+msgid "include Git version"
+msgstr ""
+
+#: contrib/scalar/scalar.c:768
+msgid "include Git's build options"
+msgstr ""
+
+#: contrib/scalar/scalar.c:772
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:813
+msgid "-C requires a <directory>"
+msgstr ""
+
+#: contrib/scalar/scalar.c:815
+#, c-format
+msgid "could not change to '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:821
+msgid "-c requires a <key>=<value> argument"
+msgstr ""
+
+#: contrib/scalar/scalar.c:839
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr ""
@@ -23659,52 +25038,52 @@
msgid "no libc information available\n"
msgstr ""
-#: list-objects-filter-options.h:94
+#: list-objects-filter-options.h:126
msgid "args"
msgstr ""
-#: list-objects-filter-options.h:95
+#: list-objects-filter-options.h:127
msgid "object filtering"
msgstr ""
-#: parse-options.h:184
+#: parse-options.h:188
msgid "expiry-date"
msgstr ""
-#: parse-options.h:198
+#: parse-options.h:202
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:310
+#: parse-options.h:341
msgid "be more verbose"
msgstr ""
-#: parse-options.h:312
+#: parse-options.h:343
msgid "be more quiet"
msgstr ""
-#: parse-options.h:318
+#: parse-options.h:349
msgid "use <n> digits to display object names"
msgstr ""
-#: parse-options.h:337
+#: parse-options.h:368
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: parse-options.h:338
+#: parse-options.h:369
msgid "read pathspec from file"
msgstr ""
-#: parse-options.h:339
+#: parse-options.h:370
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "key"
msgstr ""
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr ""
@@ -23773,15 +25152,15 @@
msgstr ""
#: command-list.h:65
-msgid "Switch branches or restore working tree files"
+msgid "Ensures that a reference name is well formed"
msgstr ""
#: command-list.h:66
-msgid "Copy files from the index to the working tree"
+msgid "Switch branches or restore working tree files"
msgstr ""
#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
+msgid "Copy files from the index to the working tree"
msgstr ""
#: command-list.h:68
@@ -23945,39 +25324,39 @@
msgstr ""
#: command-list.h:108
-msgid "Server side implementation of Git over HTTP"
+msgid "Run git hooks"
msgstr ""
#: command-list.h:109
-msgid "Download from a remote Git repository via HTTP"
+msgid "Server side implementation of Git over HTTP"
msgstr ""
#: command-list.h:110
-msgid "Push objects over HTTP/DAV to another repository"
+msgid "Download from a remote Git repository via HTTP"
msgstr ""
#: command-list.h:111
-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:112
-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:113
-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:114
-msgid "Instantly browse your working repository in gitweb"
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
#: command-list.h:115
-msgid "Add or parse structured information in commit messages"
+msgid "Instantly browse your working repository in gitweb"
msgstr ""
#: command-list.h:116
-msgid "The Git repository browser"
+msgid "Add or parse structured information in commit messages"
msgstr ""
#: command-list.h:117
@@ -24029,25 +25408,25 @@
msgstr ""
#: command-list.h:129
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr ""
-
-#: command-list.h:130
msgid "Show three-way merge without touching index"
msgstr ""
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
+#: command-list.h:130
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
-#: command-list.h:132
+#: command-list.h:131
msgid "Creates a tag object with extra validation"
msgstr ""
-#: command-list.h:133
+#: command-list.h:132
msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
+#: command-list.h:133
+msgid "Write and verify multi-pack-indexes"
+msgstr ""
+
#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
@@ -24149,17 +25528,17 @@
msgstr ""
#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr ""
-
-#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
msgstr ""
-#: command-list.h:161
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr ""
+#: command-list.h:161
+msgid "Revert some existing commits"
+msgstr ""
+
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr ""
@@ -24173,47 +25552,47 @@
msgstr ""
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
-msgstr ""
-
-#: command-list.h:166
-msgid "Summarize 'git log' output"
-msgstr ""
-
-#: command-list.h:167
-msgid "Show various types of objects"
-msgstr ""
-
-#: command-list.h:168
-msgid "Show branches and their commits"
-msgstr ""
-
-#: command-list.h:169
-msgid "Show packed archive index"
-msgstr ""
-
-#: command-list.h:170
-msgid "List references in a local repository"
-msgstr ""
-
-#: command-list.h:171
msgid "Git's i18n setup code for shell scripts"
msgstr ""
-#: command-list.h:172
+#: command-list.h:166
msgid "Common Git shell script setup code"
msgstr ""
+#: command-list.h:167
+msgid "Restricted login shell for Git-only SSH access"
+msgstr ""
+
+#: command-list.h:168
+msgid "Summarize 'git log' output"
+msgstr ""
+
+#: command-list.h:169
+msgid "Show various types of objects"
+msgstr ""
+
+#: command-list.h:170
+msgid "Show branches and their commits"
+msgstr ""
+
+#: command-list.h:171
+msgid "Show packed archive index"
+msgstr ""
+
+#: command-list.h:172
+msgid "List references in a local repository"
+msgstr ""
+
#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
+msgid "Reduce your working tree to a subset of tracked files"
msgstr ""
#: command-list.h:174
-msgid "Stash the changes in a dirty working directory away"
+msgid "Add file contents to the staging area"
msgstr ""
#: command-list.h:175
-msgid "Add file contents to the staging area"
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
#: command-list.h:176
@@ -24289,65 +25668,65 @@
msgstr ""
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr ""
-
-#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr ""
-#: command-list.h:196
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr ""
-#: command-list.h:197
+#: command-list.h:196
msgid "Create a tree object from the current index"
msgstr ""
-#: command-list.h:198
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr ""
-#: command-list.h:199
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr ""
-#: command-list.h:200
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr ""
-#: command-list.h:201
+#: command-list.h:200
msgid "Providing usernames and passwords to Git"
msgstr ""
-#: command-list.h:202
+#: command-list.h:201
msgid "Git for CVS users"
msgstr ""
-#: command-list.h:203
+#: command-list.h:202
msgid "Tweaking diff output"
msgstr ""
-#: command-list.h:204
+#: command-list.h:203
msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
-#: command-list.h:205
+#: command-list.h:204
msgid "Frequently asked questions about using Git"
msgstr ""
-#: command-list.h:206
+#: command-list.h:205
msgid "A Git Glossary"
msgstr ""
-#: command-list.h:207
+#: command-list.h:206
msgid "Hooks used by Git"
msgstr ""
-#: command-list.h:208
+#: command-list.h:207
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
+#: command-list.h:208
+msgid "The Git repository browser"
+msgstr ""
+
#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
msgstr ""
@@ -24377,48 +25756,21 @@
msgstr ""
#: command-list.h:216
-msgid "A tutorial introduction to Git: part two"
-msgstr ""
-
-#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr ""
+#: command-list.h:217
+msgid "A tutorial introduction to Git: part two"
+msgstr ""
+
#: command-list.h:218
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr ""
+
+#: command-list.h:219
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr ""
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr ""
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr ""
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr ""
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -24457,439 +25809,44 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr ""
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr ""
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr ""
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:532
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:542
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:547
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr ""
-
-#: git-submodule.sh:627
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr ""
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr ""
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:182
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:191 git-sh-setup.sh:198
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:212
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:215
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:226
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:228
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:348
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:353
msgid "Unable to determine absolute path of git directory"
msgstr ""
@@ -24957,7 +25914,7 @@
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -24966,7 +25923,7 @@
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -24975,7 +25932,7 @@
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -24984,7 +25941,7 @@
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -24993,7 +25950,7 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -25002,7 +25959,7 @@
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -25011,7 +25968,7 @@
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -25020,7 +25977,7 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -25029,7 +25986,7 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -25042,90 +25999,90 @@
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr ""
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -25136,103 +26093,109 @@
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
-msgstr ""
+msgstr "zona lokal berbeda dari GMT oleh selang non-menit\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
-msgstr ""
+msgstr "offset waktu lokal lebih dari atau sama dengan 24 jam\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
-msgstr ""
+msgstr "fatal: perintah '%s' mati dengan kode keluar %d"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
-msgstr ""
+msgstr "penyunting keluar dengan kotor, membatalkan semua"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
-msgstr ""
+msgstr "'%s' berisi versi menengah dari email yang Anda buat.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
-msgstr ""
+msgstr "'%s.final' berisi email yang dibuat.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
-msgstr ""
+msgstr "--dump-aliases tidak kompatibel dengan opsi yang lain\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
msgstr ""
+"fatal: opsi konfigurasi untuk 'sendmail' ditemukan\n"
+"git-send-email dikonfigurasikan dengan opsi sendemail.* - catat 'e'.\n"
+"Setel sendemail.forbidSendmailVariables ke false untuk menonaktifkan "
+"pemeriksaan ini.\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
-msgstr ""
+msgstr "tidak dapat menjalankan git format-patch diluar repositori\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
+"`batch-size` dan `relogin` harus disebutkan bersamaan (lewat baris perintah "
+"atau opsi konfigurasi)\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
-msgstr ""
+msgstr "Bidang --suppress-cc tidak dikenal: '%s'\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
-msgstr ""
+msgstr "Setelan --confirm tidak dikenal: '%s'\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
-msgstr ""
+msgstr "peringatan: alias sendmail dengan kutipan tidak didukung: %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
-msgstr ""
+msgstr "peringatan: `:include:` tidak didukung: %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
-msgstr ""
+msgstr "peringatan: pengalihan `/file` atau `|pipe` tidak didukung: %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
-msgstr ""
+msgstr "peringatan: baris sendmail tidak dikenal: %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -25241,30 +26204,38 @@
" * Saying \"./%s\" if you mean a file; or\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
+"Berkas '%s' ada tetapi bisa jadi itu rentang komit\n"
+"untuk membuat tambalan. Mohon disambiguasi dengan...\n"
+"\n"
+" * Sebutkan \"./%s\" jika maksud Anda sebuah berkas; atau\n"
+" * Berikan opsi --format-patch jika maksud Anda sebuah rentang.\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
-msgstr ""
+msgstr "Gagal membuka direktori %s: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
+"\n"
+"Tidak ada berkas tambalan yang disebutkan!\n"
+"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
-msgstr ""
+msgstr "Tidak ada baris subjek di %s?"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
-msgstr ""
+msgstr "Gagal membuka untuk menulis %s: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -25272,38 +26243,44 @@
"\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
+"Baris yang diawali dengan \"GIT:\" akan dihapus.\n"
+"Pertimbangkan memasukkan diffstat keseluruhan atau daftar isi\n"
+"untuk tambalan yang Anda tulis.\n"
+"\n"
+"Bersihkan konten badan jika Anda tidak ingin mengirimkan rangkuman.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
-msgstr ""
+msgstr "Gagal membuka %s: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
-msgstr ""
+msgstr "Gagal membuka %s.final: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
-msgstr ""
+msgstr "Surel rangkuman kosong, lewati\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr ""
+msgstr "Anda yakin ingin menggunakan <%s> [y/N]? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
+"Berkas berikut 8bit, tetapi tidak menyebutkan Content-Transfer-Encoding.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr ""
+msgstr "Pengkodean 8bit apa yang harus saya sebut [UTF-8]? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -25311,38 +26288,45 @@
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
"want to send.\n"
msgstr ""
+"Menolak mengirim karena tambalan\n"
+"\t%s\n"
+"punya subjek templat '*** SUBJECT HERE ***'. Lewatkan --force jika Anda "
+"benar-benar ingin mengirim.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
-msgstr ""
+msgstr "Kepada siapa surel harus dikirim (jika ada)?"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
-msgstr ""
+msgstr "fatal: alias '%s' diperluas ke dirinya sendiri\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
+"Message-ID yang akan digunakan sebagai In-Reply-To untuk surel pertama (jika "
+"ada)?"
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
-msgstr ""
+msgstr "kesalahan: tidak dapat mengekstrak alamat yang valid dari: %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
+"Apa yang Anda lakukan dengan alamat ini? ([q] keluar|[d] jatuh|[e] sunting): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
-msgstr ""
+msgstr "Jalur CA \"%s\" tidak ada"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -25355,161 +26339,157 @@
" run 'git config --global sendemail.confirm auto'.\n"
"\n"
msgstr ""
+" Daftar Cc diatas telah diperluas oleh alamat tambahan\n"
+" yang ditemukan dalam pesan komit tambalan. Secara asali\n"
+" send-email membisiki sebelum mengirim ketika ini terjadi.\n"
+" Perilaku ini dikontrol oleh setelan konfigurasi sendemail.confirm.\n"
+"\n"
+" Untuk informasi lebih lanjut, jalankan 'git send-email --help'.\n"
+" Untuk menjaga perilaku saat ini, tetapi mematikan pesan ini,\n"
+" jalankan 'git config --global sendemail.confirm auto'.\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-msgstr ""
+msgstr "Kirim surel ini? ([y]a|[n] tidak|[e] sunting|[q] keluar|semu[a]): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
-msgstr ""
+msgstr "Balasan kirim surel ini diperlukan"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
-msgstr ""
-
-#: git-send-email.perl:1628
-#, perl-format
-msgid "Server does not support STARTTLS! %s"
-msgstr ""
-
-#: git-send-email.perl:1633 git-send-email.perl:1637
-#, perl-format
-msgid "STARTTLS failed! %s"
-msgstr ""
-
-#: git-send-email.perl:1646
-msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
-msgstr ""
+msgstr "Peladen SMTP yang diperlukan tidak dijelaskan dengan baik."
#: git-send-email.perl:1664
#, perl-format
-msgid "Failed to send %s\n"
-msgstr ""
+msgid "Server does not support STARTTLS! %s"
+msgstr "Peladen tidak mendukung STARTTLS! %s"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1669 git-send-email.perl:1673
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "STARTTLS gagal! %s"
+
+#: git-send-email.perl:1682
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+"Tidak dapat menginisialisasi SMTP dengan benar. Periksa konfigurasi dan "
+"gunakan --smtp-debug."
+
+#: git-send-email.perl:1700
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "Gagal mengirim %s\n"
+
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
-msgstr ""
+msgstr "Terkirim-kering %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
-msgstr ""
+msgstr "Terkirim %s\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
-msgstr ""
+msgstr "OK-kering. Log berkata:\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
-msgstr ""
+msgstr "OK. Log berkata:\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
-msgstr ""
+msgstr "Hasil: "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
-msgstr ""
+msgstr "Hasil: OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
-msgstr ""
+msgstr "tidak dapat membuka berkas %s"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
-msgstr ""
+msgstr "(mbox) Menambahkan cc: %s dari baris '%s'\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
-msgstr ""
+msgstr "(mbox) Menambahkan to: %s dari baris '%s'\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
-msgstr ""
+msgstr "(non-mbox) Menambahkan cc: %s dari baris '%s'\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
-msgstr ""
+msgstr "(body) Menambahkan cc: %s dari baris '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
-msgstr ""
+msgstr "(%s) Tidak dapat menjalankan '%s'"
-#: git-send-email.perl:1972
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
-msgstr ""
+msgstr "(%s) Menambahkan %s: %s dari: '%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
-msgstr ""
+msgstr "(%s) gagal menutup pipa ke '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
-msgstr ""
+msgstr "tidak dapat mengirim pesan sebagai 7bit"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
-msgstr ""
+msgstr "pengkodean transfer tidak valid"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2100
#, perl-format
msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
+"fatal: %s: rejected by %s hook\n"
"%s\n"
"warning: no patches were sent\n"
msgstr ""
+"fatal: %s: ditolak oleh kail %s\n"
+"%s\n"
+"peringatan: tidak ada tambalan yang dikirimkan\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
#, perl-format
msgid "unable to open %s: %s\n"
-msgstr ""
+msgstr "tidak dapat membuka %s: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2113
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"warning: no patches were sent\n"
msgstr ""
+"fatal: %s:%d lebih panjang dari 998 karakter\n"
+"peringatan: tidak ada tambalan yang dikirimkan\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2131
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
-msgstr ""
+msgstr "Melewati %s dengan akhiran cadangan '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2135
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
-msgstr ""
-
-#~ msgid "git merge --abort"
-#~ msgstr "git merge --abort"
-
-#~ msgid "git merge --continue"
-#~ msgstr "git merge --continue"
-
-#~ msgid "git stash clear"
-#~ msgstr "git stash clear"
-
-#~ msgid "Already up to date. Yeeah!"
-#~ msgstr "Sudah terbaru. Ya!"
-
-#~ msgid ""
-#~ "the rebase.useBuiltin support has been removed!\n"
-#~ "See its entry in 'git help config' for details."
-#~ msgstr ""
-#~ "dukungan untuk rebase.useBuiltin sudah dihapus!\n"
-#~ "Lihat entri itu di 'git help config' untuk selengkapnya."
+msgstr "Anda benar-benar ingin mengirim %s? [y|N]: "
diff --git a/po/it.po b/po/it.po
index 02a8c2b..c315608 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2994,7 +2994,7 @@
#: connected.c:120
msgid "Could not run 'git rev-list'"
-msgstr "Impossibile eseguire 'git-rev-list'"
+msgstr "Impossibile eseguire 'git rev-list'"
#: connected.c:144
msgid "failed write to rev-list"
@@ -18722,7 +18722,7 @@
#: builtin/pull.c:894
msgid "ignoring --verify-signatures for rebase"
-msgstr "ignoro --verify-signature per il rebase"
+msgstr "ignoro --verify-signatures per il rebase"
#: builtin/pull.c:954
msgid "Updating an unborn branch with changes added to the index."
@@ -20073,7 +20073,7 @@
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
"--mirror è pericoloso e deprecato; per favore\n"
-"\t usa invece --mirror-fetch o --mirror-push"
+"\t usa invece --mirror=fetch o --mirror=push"
#: builtin/remote.c:148
#, c-format
diff --git a/po/ko.po b/po/ko.po
index 766d460..5d190e5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1946,7 +1946,7 @@
#: fetch-pack.c:1048
msgid "Server does not support --shallow-since"
-msgstr "서버에서 --shallow-signed 옵션을 지원하지 않습니다"
+msgstr "서버에서 --shallow-since 옵션을 지원하지 않습니다"
#: fetch-pack.c:1052
msgid "Server does not support --shallow-exclude"
@@ -8384,7 +8384,7 @@
#: builtin/config.c:156
msgid "with --get, use default value when missing entry"
-msgstr "--wget 옵션에서, 해당 항목이 없으면 기본값을 사용합니다"
+msgstr "--get 옵션에서, 해당 항목이 없으면 기본값을 사용합니다"
#: builtin/config.c:332
#, c-format
@@ -12800,7 +12800,7 @@
#: builtin/remote.c:145
#, c-format
msgid "unknown mirror argument: %s"
-msgstr "알 수 없는 --mirror 옵션 인자: %s"
+msgstr "알 수 없는 mirror 옵션 인자: %s"
#: builtin/remote.c:161
msgid "fetch the remote branches"
@@ -13879,7 +13879,7 @@
#: builtin/show-branch.c:634
msgid "synonym to more=-1"
-msgstr "--more=-1 옵션과 동일"
+msgstr "more=-1 옵션과 동일"
#: builtin/show-branch.c:635
msgid "suppress naming strings"
@@ -17858,7 +17858,7 @@
msgstr ""
" 위의 Cc 목록은 패치 커밋 메시지에 들어 있는 추가 주소로\n"
" 확장됩니다. 기본값으로 확장되기 전에 send-email에서\n"
-" 물어봅니다. 이런 동작은 sendmail.confirm 설정에서\n"
+" 물어봅니다. 이런 동작은 sendemail.confirm 설정에서\n"
" 조정할 수 있습니다.\n"
"\n"
" 정보를 더 보려면, 'git send-email --help'를 실행하십시오.\n"
diff --git a/po/pl.po b/po/pl.po
index 6bb665e..0ec127e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -58,58 +58,58 @@
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-02-26 22:09+0800\n"
-"PO-Revision-Date: 2021-02-27 17:10+0100\n"
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"PO-Revision-Date: 2021-11-03 11:38+0100\n"
"Last-Translator: Arusekk <arek_koz@o2.pl>\n"
"Language-Team: Polish\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10"
-" || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 20.12.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 21.08.2\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Hę (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
-#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
-#: builtin/rebase.c:1963
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "nie można odczytać indeksu"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binarne"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "nic"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "brak zmian"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Aktualizacja"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "nie można przygotować „%s”"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "nie można zapisać indeksu"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
@@ -117,27 +117,27 @@
msgstr[1] "zaktualizowano %d ścieżki\n"
msgstr[2] "zaktualizowano %d ścieżek\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "uwaga: %s jest teraz nieśledzony.\n"
-#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry nie powiodło się na ścieżce „%s”"
# odwoływanie / wycofywanie
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Odwracanie"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "Nie można przetworzyć HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
@@ -145,16 +145,16 @@
msgstr[1] "odwrócono %d ścieżki\n"
msgstr[2] "odwrócono %d ścieżek\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Brak nieśledzonych plików.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Dodaj nieśledzone"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
@@ -162,124 +162,125 @@
msgstr[1] "dodano %d ścieżki\n"
msgstr[2] "dodano %d ścieżek\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "pomijanie niescalonego: %s"
-#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Zmiany tylko w plikach binarnych.\n"
-#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Brak zmian.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Aktualizacja łatki"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Przejrzyj zmiany"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "pokaż ścieżkę ze zmianami"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "dodaj stan drzewa roboczego do przygotowanego zestawu zmian"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "przywróć przygotowany zestaw zmian do wersji HEAD"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "wybierz skrawki i zaktualizuj wybiórczo"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "wyświetl różnice między HEAD i indeksem"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr "dodaj zawartość nieśledzonych plików do przygotowanego zestawu zmian"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "Pomoc do zachęty:"
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "wybierz pojedynczy element"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "wybierz zakres elementów"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "wybierz wiele zakresów"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "wybierz element na podstawie jednoznacznego początku"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "odznacz podane elementy"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "wybierz wszystkie elementy"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(puste) zakończ zaznaczanie"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "wybierz kolejny element"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "(puste) nic nie wybieraj"
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Polecenia ***"
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "Co teraz"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "przygotowane"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "nieprzygotowane"
-#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
-#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
-#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "ścieżka"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "nie można odświeżyć indeksu"
-#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Do zobaczenia.\n"
@@ -581,34 +582,34 @@
"a - zastosuj ten skrawek i wszystkie kolejne w tym pliku\n"
"d - nie stosuj tego skrawka ani żadnych kolejnych w tym pliku\n"
-#: add-patch.c:342
+#: add-patch.c:343
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "nie można przetworzyć nagłówka skrawka „%.*s”"
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "nie można przetworzyć nagłówka kolorowego skrawka „%.*s”"
-#: add-patch.c:419
+#: add-patch.c:420
msgid "could not parse diff"
msgstr "nie można przetworzyć różnic"
-#: add-patch.c:438
+#: add-patch.c:439
msgid "could not parse colored diff"
msgstr "nie można przetworzyć kolorowych różnic"
-#: add-patch.c:452
+#: add-patch.c:453
#, c-format
msgid "failed to run '%s'"
msgstr "nie można wykonać „%s”"
-#: add-patch.c:611
+#: add-patch.c:612
msgid "mismatched output from interactive.diffFilter"
msgstr "błędne wyjście z interactive.diffFilter"
-#: add-patch.c:612
+#: add-patch.c:613
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -616,7 +617,7 @@
"Twój filtr musi zachować odpowiedniość jeden do jednego\n"
"między wierszami z wejścia i wyjścia."
-#: add-patch.c:790
+#: add-patch.c:791
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -625,7 +626,7 @@
"oczekiwano wiersza kontekstu nr %d w\n"
"%.*s"
-#: add-patch.c:805
+#: add-patch.c:806
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -638,11 +639,11 @@
"\tnie kończy się na:\n"
"%.*s"
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Tryb ręcznej edycji skrawka — zobacz szybki przewodnik na dole.\n"
-#: add-patch.c:1085
+#: add-patch.c:1086
#, c-format
msgid ""
"---\n"
@@ -656,7 +657,7 @@
"Wiersze zaczynające się od %c zostaną usunięte.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -666,11 +667,11 @@
"zmienić. Jeśli wszystkie wiersze skrawka zostaną usunięte, edycja\n"
"będzie przerwana, a skrawek niezmieniony.\n"
-#: add-patch.c:1132
+#: add-patch.c:1133
msgid "could not parse hunk header"
msgstr "nie można przetworzyć nagłówka skrawka"
-#: add-patch.c:1177
+#: add-patch.c:1178
msgid "'git apply --cached' failed"
msgstr "„git apply --cached” nie powiodło się"
@@ -686,26 +687,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1246 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Zmieniony skrawek się nie stosuje. Edytować ponownie (odpowiedź „nie” go "
"porzuci!) [y/n]? "
-#: add-patch.c:1289
+#: add-patch.c:1290
msgid "The selected hunks do not apply to the index!"
msgstr "Wybrane skrawki nie stosują się do indeksu!"
-#: add-patch.c:1290 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "Zastosować je do drzewa roboczego mimo to? "
-#: add-patch.c:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "Nic nie zastosowano.\n"
-#: add-patch.c:1354
+#: add-patch.c:1355
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -729,32 +730,32 @@
"e - ręcznie zmień bieżący skrawek\n"
"? - wypisz pomoc\n"
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
msgid "No previous hunk"
msgstr "Nie ma poprzedniego skrawka"
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
msgid "No next hunk"
msgstr "Nie ma następnego skrawka"
-#: add-patch.c:1537
+#: add-patch.c:1538
msgid "No other hunks to goto"
msgstr "Nie ma innych skrawków do przejścia"
-#: add-patch.c:1548 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "przejść do którego skrawka (<enter> aby zobaczyć więcej)? "
-#: add-patch.c:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "przejść do którego skrawka? "
-#: add-patch.c:1560
+#: add-patch.c:1561
#, c-format
msgid "Invalid number: '%s'"
msgstr "Nieprawidłowa liczba: „%s”"
-#: add-patch.c:1565
+#: add-patch.c:1566
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
@@ -762,41 +763,41 @@
msgstr[1] "Niestety dostępne są tylko %d skrawki."
msgstr[2] "Niestety dostępnych jest tylko %d skrawków."
-#: add-patch.c:1574
+#: add-patch.c:1575
msgid "No other hunks to search"
msgstr "Nie ma innych skrawków do wyszukania"
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "wyszukaj wyrażenie regularne? "
-#: add-patch.c:1595
+#: add-patch.c:1596
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Nieprawidłowe wyrażenie regularne %s: %s"
-#: add-patch.c:1612
+#: add-patch.c:1613
msgid "No hunk matches the given pattern"
msgstr "Żaden skrawek nie pasuje do podanego wzorca"
-#: add-patch.c:1619
+#: add-patch.c:1620
msgid "Sorry, cannot split this hunk"
msgstr "Niestety nie można podzielić tego skrawka"
-#: add-patch.c:1623
+#: add-patch.c:1624
#, c-format
msgid "Split into %d hunks."
msgstr "Podzielono na %d skrawków."
-#: add-patch.c:1627
+#: add-patch.c:1628
msgid "Sorry, cannot edit this hunk"
msgstr "Niestety nie można zmienić tego skrawka"
-#: add-patch.c:1679
+#: add-patch.c:1680
msgid "'git apply' failed"
msgstr "„git apply” nie powiodło się"
-#: advice.c:143
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -805,37 +806,37 @@
"\n"
"Wyłącz ten komunikat przez „git config advice.%s false”"
-#: advice.c:159
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%spodpowiedź: %.*s%s\n"
-#: advice.c:250
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Dobieranie nie jest możliwe, ponieważ istnieją niescalone pliki."
-#: advice.c:252
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr "Składanie nie jest możliwe, ponieważ istnieją niescalone pliki."
-#: advice.c:254
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr "Scalanie jest możliwe, ponieważ istnieją niescalone pliki."
-#: advice.c:256
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr "Zaciąganie jest możliwe, ponieważ istnieją niescalone pliki."
-#: advice.c:258
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr "Odwracanie jest możliwe, ponieważ istnieją niescalone pliki."
-#: advice.c:260
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Nie można wykonać %s, ponieważ istnieją niescalone pliki."
-#: advice.c:268
+#: advice.c:196
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."
@@ -843,23 +844,48 @@
"Napraw je w drzewie roboczym, i użyj odpowiednio „git add/rm <plik>”,\n"
"aby oznaczyć rozwiązanie i złożyć zapis."
-#: advice.c:276
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "Wyjście z powodu nierozwiązanego konfliktu."
-#: advice.c:281 builtin/merge.c:1370
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Nie zwieńczono scalania (MERGE_HEAD istnieje)."
-#: advice.c:283
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "Złóż swoje zmiany przez scalaniem."
-#: advice.c:284
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "Wyjście z powodu niedokończonego scalania."
-#: advice.c:290
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Nie da się przewinąć, przerywanie."
+
+#: advice.c:227
+#, c-format
+msgid ""
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
+msgstr ""
+"Następujące ścieżki dopasowano do ścieżek istniejących poza\n"
+"definicją rzadkiego wybrania, więc nie zostaną zaktualizowane\n"
+"w indeksie:\n"
+
+#: advice.c:234
+msgid ""
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
+msgstr ""
+"Jeśli chcesz zaktualizować takie elementy, spróbuj jednego z poniższych:\n"
+"* Użyj opcji --sparse.\n"
+"* Wyłącz lub zmień zasady rzadkości."
+
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -911,83 +937,79 @@
msgid "unclosed quote"
msgstr "niezamknięty cudzysłów"
-#: apply.c:69
+#: apply.c:70
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "Nierozpoznana opcja z białych znaków: „%s”"
-#: apply.c:85
+#: apply.c:86
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "nierozpoznana opcja ignorowania z białych znaków: „%s”"
-#: apply.c:135
+#: apply.c:136
msgid "--reject and --3way cannot be used together."
msgstr "--reject i --3way wykluczają się."
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached i --3way wykluczają się."
-
-#: apply.c:140
+#: apply.c:139
msgid "--3way outside a repository"
msgstr "--3way poza repozytorium"
-#: apply.c:151
+#: apply.c:150
msgid "--index outside a repository"
msgstr "--index poza repozytorium"
-#: apply.c:154
+#: apply.c:153
msgid "--cached outside a repository"
msgstr "--cached poza repozytorium"
-#: apply.c:801
+#: apply.c:800
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Nie można przygotować wyrażenia regularnego znacznika czasu %s"
-#: apply.c:810
+#: apply.c:809
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec zwrócił %d dla wejścia: %s"
-#: apply.c:884
+#: apply.c:883
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "nie znaleziono nazwy pliku w łatce w wierszu %d"
-#: apply.c:922
+#: apply.c:921
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: zły git-diff — oczekiwano /dev/null, znaleziono %s w wierszu %d"
-#: apply.c:928
+#: apply.c:927
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: zły git-diff — niespójna nowa nazwa pliku w wierszu %d"
-#: apply.c:929
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: zły git-diff — niespójna stara nazwa pliku w wierszu %d"
-#: apply.c:934
+#: apply.c:933
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: zły git-diff — oczekiwano /dev/null w wierszu %d"
-#: apply.c:963
+#: apply.c:962
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "błędny tryb w wierszu %d: %s"
-#: apply.c:1282
+#: apply.c:1281
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "niespójne wiersze nagłówka %d i %d"
-#: apply.c:1372
+#: apply.c:1371
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -1005,45 +1027,45 @@
"w nagłówku git diff brakuje informacji o nazwach plików po usunięciu %d "
"wiodących komponentów ścieżki (wiersz %d)"
-#: apply.c:1385
+#: apply.c:1384
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "w nagłówku git diff brakuje informacji o nazwie pliku (wiersz %d)"
-#: apply.c:1481
+#: apply.c:1480
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "przeliczanie: nieoczekiwany wiersz: %.*s"
-#: apply.c:1550
+#: apply.c:1549
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment łatki bez nagłówka w wierszu %d: %.*s"
-#: apply.c:1753
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "nowy plik zależy od starej zawartości"
-#: apply.c:1755
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "usunięty plik nadal ma zawartość"
-#: apply.c:1789
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "uszkodzona łatka w wierszu %d"
-#: apply.c:1826
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "nowy plik %s zależy od starej zawartości"
-#: apply.c:1828
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "usunięty plik %s nadal ma zawartość"
-#: apply.c:1831
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** ostrzeżenie: plik %s staje się pusty, ale nie jest usunięty"
@@ -1155,7 +1177,7 @@
msgid "cannot checkout %s"
msgstr "nie można wybrać %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 pack-revindex.c:213
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
@@ -1166,182 +1188,186 @@
msgid "reading from '%s' beyond a symbolic link"
msgstr "czytanie z „%s” przechodzącego przez dowiązanie"
-#: apply.c:3442 apply.c:3685
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "ścieżka %s została przeniesiona/usunięta"
-#: apply.c:3528 apply.c:3700
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: brak w indeksie"
-#: apply.c:3537 apply.c:3708 apply.c:3952
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "%s: nie pasuje do indeksu"
-#: apply.c:3572
-msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr ""
-"w repozytorium brakuje blobu, potrzebnego żeby uciec się do trójstronnego "
-"scalania."
+#: apply.c:3593
+msgid "repository lacks the necessary blob to perform 3-way merge."
+msgstr "w repozytorium brakuje blobu koniecznego do trójstronnego scalania."
-#: apply.c:3575
+#: apply.c:3596
#, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "Uciekanie się do trójstronnego scalania...\n"
+msgid "Performing three-way merge...\n"
+msgstr "Trójstronne scalanie...\n"
-#: apply.c:3591 apply.c:3595
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "nie można odczytać bieżącej zawartości „%s”"
-#: apply.c:3607
+#: apply.c:3628
#, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "Nie można uciec się do trójstronnego scalania...\n"
+msgid "Failed to perform three-way merge...\n"
+msgstr "Nie można wykonać trójstronnego scalania...\n"
-#: apply.c:3621
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Zastosowano łatkę do „%s” z konfliktami\n"
-#: apply.c:3626
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Gładko zastosowano łatkę do „%s”.\n"
-#: apply.c:3652
+#: apply.c:3664
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Uciekanie się do bezpośredniego zastosowania...\n"
+
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "łatka usuwająca pozostawia zawartość pliku"
-#: apply.c:3725
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "%s: nieprawidłowy rodzaj"
-#: apply.c:3727
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s jest rodzaju %o, oczekiwano %o"
-#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
-#: read-cache.c:1313
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "nieprawidłowa ścieżka „%s”"
-#: apply.c:3950
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "%s: już widnieje w indeksie"
-#: apply.c:3954
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: już istnieje w katalogu roboczym"
-#: apply.c:3974
+#: apply.c:3998
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nowy tryb (%o) %s nie pasuje do starego trybu (%o)"
-#: apply.c:3979
+#: apply.c:4003
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nowy tryb (%o) %s nie pasuje do starego trybu (%o) %s"
-#: apply.c:3999
+#: apply.c:4023
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "dotknięty plik „%s” jest pod dowiązaniem"
-#: apply.c:4003
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: łatka się nie stosuje"
-#: apply.c:4018
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr "Sprawdzanie łatki %s..."
-#: apply.c:4110
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
-msgstr "brakuje informacji SHA-1 lub jest bezużyteczna w pod-module %s"
+msgstr "brakuje informacji SHA-1 lub jest bezużyteczna w podmodule %s"
-#: apply.c:4117
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "zmiana trybu w %s, który nie jest w bieżącym HEAD"
-#: apply.c:4120
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "brakuje informacji SHA-1 lub jest bezużyteczna (%s)."
-#: apply.c:4129
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "nie można dodać %s do indeksu tymczasowego"
-#: apply.c:4139
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "nie można zapisać indeksu tymczasowego w %s"
-#: apply.c:4277
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "nie można usunąć %s z indeksu"
-#: apply.c:4311
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
-msgstr "uszkodzona łatka pod-modułu %s"
+msgstr "uszkodzona łatka podmodułu %s"
-#: apply.c:4317
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "nie można wykonać stat na nowo utworzonym pliku „%s”"
-#: apply.c:4325
+#: apply.c:4349
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "nie można utworzyć wspierającego składu dla nowo utworzonego pliku %s"
-#: apply.c:4331 apply.c:4476
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "nie można dodać %s do pamięci podręcznej"
-#: apply.c:4374 builtin/bisect--helper.c:523
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr "nie można pisać do „%s”"
-#: apply.c:4378
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "zamykanie pliku „%s”"
-#: apply.c:4448
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "nie można ustawić w pliku „%s” trybu %o"
-#: apply.c:4546
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Gładko zastosowano łatkę %s."
-#: apply.c:4554
+#: apply.c:4578
msgid "internal error"
msgstr "wewnętrzny błąd"
-#: apply.c:4557
+#: apply.c:4581
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
@@ -1349,45 +1375,45 @@
msgstr[1] "Stosowanie łatki %%s z %d odrzuceniami..."
msgstr[2] "Stosowanie łatki %%s z %d odrzuceniami..."
-#: apply.c:4568
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "ucinanie nazwy pliku .rej do %.*s.rej"
-#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "nie można otworzyć %s"
-#: apply.c:4590
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Skrawek nr %d gładko zastosowany."
-#: apply.c:4594
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "Odrzucono skrawek nr %d."
-#: apply.c:4718
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "Pominięto łatkę „%s”."
-#: apply.c:4726
+#: apply.c:4755
msgid "unrecognized input"
msgstr "nierozpoznawane wejście"
-#: apply.c:4746
+#: apply.c:4775
msgid "unable to read index file"
msgstr "nie można odczytać pliku indeksu"
-#: apply.c:4903
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "nie można otworzyć łatki „%s”: %s"
-#: apply.c:4930
+#: apply.c:4959
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
@@ -1395,7 +1421,7 @@
msgstr[1] "zduszono %d błędy białych znaków"
msgstr[2] "zduszono %d błędów białych znaków"
-#: apply.c:4936 apply.c:4951
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -1403,7 +1429,7 @@
msgstr[1] "%d wiersze dodają błędy białych znaków."
msgstr[2] "%d wierszy dodaje błędy białych znaków."
-#: apply.c:4944
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1411,132 +1437,135 @@
msgstr[1] "Zastosowano %d wiersze po naprawieniu błędów białych znaków."
msgstr[2] "Zastosowano %d wierszy po naprawieniu błędów białych znaków."
-#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr "Nie można zapisać nowego pliku indeksu"
-#: apply.c:4988
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr "nie stosuj zmian pasujących do podanej ścieżki"
-#: apply.c:4991
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "zastosuj zmiany pasujące do podanej ścieżki"
-#: apply.c:4993 builtin/am.c:2266
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "ile"
-#: apply.c:4994
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "usuń <ile> początkowych ukośników z tradycyjnych ścieżek diff"
-#: apply.c:4997
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "ignoruj wstawienia wykonywane przez łatkę"
-#: apply.c:4999
+#: apply.c:5028
msgid "instead of applying the patch, output diffstat for the input"
msgstr "zamiast stosować łatkę, wypisz statystyki różnic dla wejścia"
-#: apply.c:5003
+#: apply.c:5032
msgid "show number of added and deleted lines in decimal notation"
msgstr "pokazuj liczbę dodanych i usuniętych wierszy w systemie dziesiętnym"
-#: apply.c:5005
+#: apply.c:5034
msgid "instead of applying the patch, output a summary for the input"
msgstr "zamiast stosować łatkę, wypisz podsumowanie dla wejścia"
-#: apply.c:5007
+#: apply.c:5036
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "zamiast stosować łatkę, zobacz, czy się stosuje"
-#: apply.c:5009
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr "upewnij się, że łatka ma zastosowanie do bieżącego indeksu"
-#: apply.c:5011
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "oznacz nowe pliki przez „git add --intent-to-add”"
-#: apply.c:5013
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr "zastosuj łatkę bez dotykania drzewa roboczego"
-#: apply.c:5015
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr "przyjmuj łatkę, która wychodzi poza obszar roboczy"
-#: apply.c:5018
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "zastosuj też łatkę (do użycia z --stat/--summary/--check)"
-#: apply.c:5020
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "spróbuj trójstronnego scalania, jeśli łatka się nie stosuje"
+#: apply.c:5049
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr ""
+"spróbuj trójstronnego scalania, uciekając się do normalnego łatania, jeśli "
+"tamto zawiedzie"
-#: apply.c:5022
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
msgstr "zbuduj tymczasowy indeks oparty o wbudowane informacje indeksu"
-#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "ścieżki są rozdzielone znakiem NUL"
-#: apply.c:5027
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr "zapewnij przynajmniej <n> wierszy dopasowanego kontekstu"
-#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "działanie"
-#: apply.c:5029
+#: apply.c:5058
msgid "detect new or modified lines that have whitespace errors"
msgstr "wykryj nowe i zmienione wiersze, które mają błędy białych znaków"
-#: apply.c:5032 apply.c:5035
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr "ignoruj zmiany w białych znakach przy znajdywaniu kontekstu"
-#: apply.c:5038
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "zastosuj łatkę na odwrót"
-#: apply.c:5040
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "nie oczekuj przynajmniej jednego wiersza kontekstu"
-#: apply.c:5042
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "zostaw odrzucone skrawki w odpowiednich plikach *.rej"
-#: apply.c:5044
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "zezwól, by skrawki na siebie nachodziły"
-#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
-#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
-#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "więcej komunikatów"
-#: apply.c:5047
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"toleruj nieprawidłowo wykryte brakujące znaki końca wiersza na końcu pliku"
-#: apply.c:5050
+#: apply.c:5079
msgid "do not trust the line counts in the hunk headers"
msgstr "nie ufaj liczbie wierszy w nagłówkach skrawków"
-#: apply.c:5052 builtin/am.c:2254
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "korzeń"
-#: apply.c:5053
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "dodaj <korzeń> przed wszystkimi nazwami plików"
@@ -1574,7 +1603,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "ścieżka za długa (%d znaków, SHA-1: %s): %s"
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
#, c-format
msgid "deflate error (%d)"
msgstr "błąd kompresji (%d)"
@@ -1603,156 +1632,156 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repozytorium> [--exec <polecenie>] --list"
-#: archive.c:192
+#: archive.c:188
#, c-format
msgid "cannot read %s"
msgstr "nie można odczytać %s"
-#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
-#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
-#: builtin/merge.c:1139
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "nie można odczytać „%s”"
-#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "ścieżka „%s” nie pasuje do żadnych plików"
-#: archive.c:454
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "nie ma takiej referencji: %*.s"
-#: archive.c:460
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "nieprawidłowa nazwa obiektu: %s"
-#: archive.c:473
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "nie jest obiektem drzewa: %s"
-#: archive.c:485
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "bieżący katalog roboczy jest nieśledzony"
-#: archive.c:526
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Nie znaleziono pliku: %s"
-#: archive.c:528
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "Nie jest zwykłym plikiem: %s"
-#: archive.c:555
+#: archive.c:551
msgid "fmt"
msgstr "fmt"
-#: archive.c:555
+#: archive.c:551
msgid "archive format"
msgstr "format archiwum"
-#: archive.c:556 builtin/log.c:1764
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "prefiks"
-#: archive.c:557
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "dodaj prefiks przed każdą ścieżką w archiwum"
-#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
-#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "plik"
-#: archive.c:559
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "dodaj nieśledzony plik do archiwum"
-#: archive.c:562 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "zapisz archiwum do tego pliku"
-#: archive.c:564
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "przeczytaj .gitattributes w katalogu roboczym"
-#: archive.c:565
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "zgłaszaj zarchiwizowane pliki na standardowe wyjście diagnostyczne"
-#: archive.c:567
+#: archive.c:563
msgid "set compression level"
msgstr "ustaw stopień kompresji"
-#: archive.c:570
+#: archive.c:566
msgid "list supported archive formats"
msgstr "wypisz wspierane formaty archiwów"
-#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
-#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "repozytorium"
-#: archive.c:573 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "pobierz archiwum ze zdalnego <repozytorium>"
-#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "polecenie"
-#: archive.c:575 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "ścieżka do zdalnego polecenia git-upload-archive"
-#: archive.c:582
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Nieoczekiwana opcja --remote"
-#: archive.c:584
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
-msgstr "Opcja --exec może być użyta tylko z --remote"
+msgstr "Opcji --exec można użyć tylko z --remote"
-#: archive.c:586
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Nieoczekiwana opcja --output"
-#: archive.c:588
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr "Opcje --add-file i --remote się wykluczają"
-#: archive.c:610
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Nieznany format archiwum „%s”"
-#: archive.c:619
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument niewspierany w formacie „%s”: -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%*.s nie jest prawidłową nazwą atrybutu"
-#: attr.c:359
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s niedozwolone: %s:%d"
-#: attr.c:399
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1760,22 +1789,22 @@
"Negatywne wzorce są pomijane w atrybutach gita\n"
"Użyj „\\!” dla dosłownego początkowego wykrzyknika."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Źle zacytowana zawartość w pliku „%s”: %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Nie można już przeszukiwać!\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "Nieprawidłowa nazwa zapisu %s"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1784,7 +1813,7 @@
"Podstawa scalania %s jest zła.\n"
"To znaczy, że błąd naprawiono pomiędzy %s i [%s].\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1793,7 +1822,7 @@
"Podstawa scalenia %s jest nowa.\n"
"Właściwość zmieniła się między %s i [%s].\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1802,7 +1831,7 @@
"Podstawa scalania %s jest %s.\n"
"To znaczy, że pierwszy zapis „%s” jest pomiędzy %s i [%s].\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1813,7 +1842,7 @@
"git bisect nie może w tym przypadku działać poprawnie.\n"
"Może pomylono rewizje %s i %s?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1824,36 +1853,36 @@
"Nie możemy być więc pewni, że pierwszy zapis %s jest między %s i %s.\n"
"Kontynuowanie mimo to."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Przeszukiwanie: podstawa scalenia musi być sprawdzona\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "potrzebna jest rewizja %s"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "nie można utworzyć pliku „%s”"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "nie można odczytać pliku „%s”"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "nie można odczytać referencji przeszukiwania"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s był jednocześnie %s i %s\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1862,7 +1891,7 @@
"Nie znaleziono sprawdzalnego zapisu.\n"
"Może zaczęto ze złymi argumentami ścieżek?\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1873,7 +1902,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1881,39 +1910,40 @@
msgstr[1] "Przeszukiwanie: pozostały %d rewizje do sprawdzenia %s\n"
msgstr[2] "Przeszukiwanie: pozostało %d rewizji do sprawdzenia %s\n"
-#: blame.c:2777
+#: blame.c:2776
msgid "--contents and --reverse do not blend well."
msgstr "--contents i --reverse się wykluczają."
-#: blame.c:2791
+#: blame.c:2790
msgid "cannot use --contents with final commit object name"
msgstr "--contents i nazwa obiektu ostatniego zapisu wykluczają się"
-#: blame.c:2812
+#: blame.c:2811
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse i --first-parent razem wymagają podanego ostatniego zapisu"
-#: blame.c:2821 bundle.c:213 ref-filter.c:2202 remote.c:2041 sequencer.c:2146
-#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
-#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
-#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "nie udało się przygotować przejścia rewizji"
-#: blame.c:2839
+#: blame.c:2838
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent razem wymagają zakresu wzdłuż łańcucha pierwszych "
"rodziców"
-#: blame.c:2850
+#: blame.c:2849
#, c-format
msgid "no such path %s in %s"
msgstr "nie ma ścieżki %s w %s"
-#: blame.c:2861
+#: blame.c:2860
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "nie można odczytać blobu %s ścieżki %s"
@@ -2053,51 +2083,51 @@
msgid "Not a valid branch point: '%s'."
msgstr "Nieprawidłowy punkt rozgałęzienia: „%s”."
-#: branch.c:365
+#: branch.c:366
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "„%s” jest już wybrana w „%s”"
-#: branch.c:388
+#: branch.c:389
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "nie zaktualizowano HEAD drzewa roboczego %s"
-#: bundle.c:41
+#: bundle.c:44
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
msgstr "nierozpoznany algorytm skrótu wiązki: %s"
-#: bundle.c:45
+#: bundle.c:48
#, c-format
msgid "unknown capability '%s'"
msgstr "nieznana zdolność (capability) „%s”"
-#: bundle.c:71
+#: bundle.c:74
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
msgstr "„%s” nie wygląda jak plik wiązki v2 ani v3"
-#: bundle.c:110
+#: bundle.c:113
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "nierozpoznany nagłówek: %s%s (%d)"
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
-#: builtin/commit.c:814
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "nie można otworzyć „%s”"
-#: bundle.c:189
+#: bundle.c:198
msgid "Repository lacks these prerequisite commits:"
msgstr "W repozytorium brakuje tych wymaganych zapisów:"
-#: bundle.c:192
+#: bundle.c:201
msgid "need a repository to verify a bundle"
msgstr "należy podać repozytorium, aby sprawdzić wiązkę"
-#: bundle.c:243
+#: bundle.c:257
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
@@ -2105,11 +2135,11 @@
msgstr[1] "Wiązka zawiera te %d referencje:"
msgstr[2] "Wiązka zawiera tych %d referencji:"
-#: bundle.c:250
+#: bundle.c:264
msgid "The bundle records a complete history."
msgstr "Wiązka zapisuje pełną historię."
-#: bundle.c:252
+#: bundle.c:266
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
@@ -2117,176 +2147,173 @@
msgstr[1] "Wiązka potrzebuje tych %d referencji:"
msgstr[2] "Wiązka potrzebuje tych %d referencji:"
-#: bundle.c:319
+#: bundle.c:333
msgid "unable to dup bundle descriptor"
msgstr "nie można wykonać dup deskryptora wiązki"
-#: bundle.c:326
+#: bundle.c:340
msgid "Could not spawn pack-objects"
msgstr "Nie można uruchomić pack-objects"
-#: bundle.c:337
+#: bundle.c:351
msgid "pack-objects died"
msgstr "pack-objects padł"
-#: bundle.c:386
+#: bundle.c:400
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referencja „%s” jest wyłączona przez opcje listy rewizji"
-#: bundle.c:490
+#: bundle.c:504
#, c-format
msgid "unsupported bundle version %d"
msgstr "nieobsługiwana wersja wiązki %d"
-#: bundle.c:492
+#: bundle.c:506
#, c-format
msgid "cannot write bundle version %d with algorithm %s"
msgstr "nie można zapisać wersji wiązki %d z algorytmem %s"
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "nierozpoznany argument: %s"
-#: bundle.c:539
+#: bundle.c:553
msgid "Refusing to create empty bundle."
msgstr "Odmawiam utworzenia pustej wiązki."
-#: bundle.c:549
+#: bundle.c:563
#, c-format
msgid "cannot create '%s'"
msgstr "nie można utworzyć „%s”"
-#: bundle.c:574
+#: bundle.c:588
msgid "index-pack died"
msgstr "index-pack padł"
+#: chunk-format.c:117
+msgid "terminating chunk id appears earlier than expected"
+msgstr "kończący identyfikator kawałka występuje przedwcześnie"
+
+#: chunk-format.c:126
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "nieprawidłowe przesunięcie(a) kawałka %<PRIx64> i %<PRIx64>"
+
+#: chunk-format.c:133
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "znaleziono podwójny identyfikator kawałka %<PRIx32>"
+
+#: chunk-format.c:147
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "końcowy kawałek ma niezerowy identyfikator %<PRIx32>"
+
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "nieprawidłowa wartość koloru: %.*s"
-#: commit-graph.c:198 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "nieprawidłowa wersja skrótu"
-#: commit-graph.c:219
-msgid "repository contains replace objects; skipping commit-graph"
-msgstr "repozytorium zawiera obiekty zamienne; pomijanie grafu zapisów"
-
-#: commit-graph.c:228
-msgid "repository contains (deprecated) grafts; skipping commit-graph"
-msgstr "repozytorium zawiera (przestarzałe) szczepki; pomijanie grafu zapisów"
-
-#: commit-graph.c:233
-msgid "repository is shallow; skipping commit-graph"
-msgstr "źródłowe repozytorium jest płytkie, pomijanie grafu zapisów"
-
-#: commit-graph.c:264
+#: commit-graph.c:262
msgid "commit-graph file is too small"
msgstr "plik grafu zapisów jest za mały"
-#: commit-graph.c:329
+#: commit-graph.c:355
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "podpis grafu zapisów %X nie zgadza się z podpisem %X"
-#: commit-graph.c:336
+#: commit-graph.c:362
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "wersja grafu zapisów %X nie zgadza się z wersją %X"
-#: commit-graph.c:343
+#: commit-graph.c:369
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "wersja skrótu grafu zapisów %X nie zgadza się z wersją %X"
-#: commit-graph.c:360
+#: commit-graph.c:386
#, c-format
msgid "commit-graph file is too small to hold %u chunks"
msgstr "plik grafu zapisów jest za mały, żeby przechować %u kawałków"
-#: commit-graph.c:379
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "nieprawidłowe przesunięcie kawałka grafu zapisów %08x%08x"
-
-#: commit-graph.c:465
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "identyfikator kawałka grafu zapisów %08x pojawia się wiele razy"
-
-#: commit-graph.c:531
+#: commit-graph.c:482
msgid "commit-graph has no base graphs chunk"
msgstr "graf zapisów nie ma podstawowego kawałka grafów"
-#: commit-graph.c:541
+#: commit-graph.c:492
msgid "commit-graph chain does not match"
msgstr "łańcuch grafu zapisów się nie zgadza"
-#: commit-graph.c:589
+#: commit-graph.c:540
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr "nieprawidłowy łańcuch grafu zapisów: wiersz „%s” nie jest skrótem"
-#: commit-graph.c:613
+#: commit-graph.c:564
msgid "unable to find all commit-graph files"
msgstr "nie znaleziono wszystkich plików grafu zapisów"
-#: commit-graph.c:794 commit-graph.c:831
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
"nieprawidłowa pozycja zapisu. Graf zapisów jest prawdopodobnie uszkodzony"
-#: commit-graph.c:815
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "nie znaleziono zapisu %s"
-#: commit-graph.c:848
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr "graf zapisów wymaga danych przepełnionych pokoleń, ale ich nie ma"
-#: commit-graph.c:1121 builtin/am.c:1292
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "nie można przeanalizować zapisu %s"
-#: commit-graph.c:1378 builtin/pack-objects.c:2872
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "nie można uzyskać rodzaju obiektu %s"
-#: commit-graph.c:1409
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "Ładowanie znanych zapisów w graf zapisów"
-#: commit-graph.c:1426
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr "Rozwijanie osiągalnych zapisów w grafie zapisów"
-#: commit-graph.c:1446
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "Czyszczenie znamion zapisów w grafie zapisów"
-#: commit-graph.c:1465
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "Obliczanie topologicznych poziomów grafu zapisów"
-#: commit-graph.c:1518
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "Obliczanie numerów pokoleń grafu zapisów"
-#: commit-graph.c:1599
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr "Obliczanie filtrów Blooma zmienionych ścieżek zapisu"
-#: commit-graph.c:1676
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "Zbieranie wspominanych zapisów"
-#: commit-graph.c:1701
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
@@ -2294,44 +2321,44 @@
msgstr[1] "Znajdywanie zapisów do grafu zapisów w %d paczkach"
msgstr[2] "Znajdywanie zapisów do grafu zapisów w %d paczkach"
-#: commit-graph.c:1714
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "błąd przy dodawaniu paczki %s"
-#: commit-graph.c:1718
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "błąd otwierania indeksu dla %s"
-#: commit-graph.c:1755
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr "Znajdywanie zapisów do grafu zapisów wśród spakowanych obiektów"
-#: commit-graph.c:1773
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "Znajdywanie dodatkowych krawędzi w grafie zapisów"
-#: commit-graph.c:1821
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr ""
"nie można zapisać prawidłowej liczby podstawowych identyfikatorów grafu"
-#: commit-graph.c:1863 midx.c:819
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "nie można utworzyć wiodących katalogów %s"
-#: commit-graph.c:1876
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "nie można utworzyć tymczasowej warstwy grafu"
-#: commit-graph.c:1881
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "nie można dostroić współdzielonych uprawnień „%s”"
-#: commit-graph.c:1966
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
@@ -2339,86 +2366,86 @@
msgstr[1] "Wypisywanie grafu zapisów w %d przebiegach"
msgstr[2] "Wypisywanie grafu zapisów w %d przebiegach"
-#: commit-graph.c:2011
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "nie można otworzyć pliku łańcucha grafu zapisów"
-#: commit-graph.c:2027
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "nie można zmienić nazwy podstawowego pliku grafu zapisów"
-#: commit-graph.c:2047
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr "nie można zmienić nazwy tymczasowego pliku grafu zapisów"
-#: commit-graph.c:2180
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "Skanowanie scalonych zapisów"
-#: commit-graph.c:2224
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "Scalanie grafu zapisów"
-#: commit-graph.c:2331
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr "próba wypisania grafu zapisów, ale „core.commitGraph” jest wyłączone"
-#: commit-graph.c:2438
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "za dużo zapisów, by wypisać graf"
-#: commit-graph.c:2536
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"plik grafu zapisów ma nieprawidłową sumę kontrolną i jest prawdopodobnie "
"uszkodzony"
-#: commit-graph.c:2546
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "graf zapisów ma nieprawidłową kolejność OID: %s i wtedy %s"
-#: commit-graph.c:2556 commit-graph.c:2571
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "graf zapisów ma nieprawidłową wartość fanout: fanout[%d] = %u != %u"
-#: commit-graph.c:2563
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "nie można przetworzyć zapisu %s z grafu zapisów"
-#: commit-graph.c:2581
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "Sprawdzanie zapisów w grafie zapisów"
-#: commit-graph.c:2596
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"nie można przetworzyć zapisu %s z bazy danych obiektów do grafu zapisów"
-#: commit-graph.c:2603
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "OID korzenia drzewa w zapisie %s w grafie zapisów to %s != %s"
-#: commit-graph.c:2613
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "lista rodziców grafu zapisów zapisu %s jest za długa"
-#: commit-graph.c:2622
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "rodzic grafu zapisów zapisu %s to %s != %s"
-#: commit-graph.c:2636
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "lista rodziców grafu zapisów zapisu %s kończy się przedwcześnie"
-#: commit-graph.c:2641
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2426,7 +2453,7 @@
"graf zapisów ma numer pokolenia zerowy w zapisie %s, ale niezerowy gdzie "
"indziej"
-#: commit-graph.c:2645
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2434,29 +2461,29 @@
"graf zapisów ma numer pokolenia niezerowy w zapisie %s, ale zerowy gdzie "
"indziej"
-#: commit-graph.c:2662
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "pokolenie grafu zapisów zapisu %s to %<PRIuMAX> < %<PRIuMAX>"
-#: commit-graph.c:2668
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"data złożenia w zapisie %s w grafie zapisów to %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "nie można przetworzyć „%s”"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s nie jest zapisem!"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2476,27 +2503,27 @@
"Wyłącz ten komunikat uruchamiając\n"
"„git config advice.graftFileDeprecated false”"
-#: commit.c:1223
+#: commit.c:1239
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Zapis %s ma niezaufany podpis GPG rzekomo od %s."
-#: commit.c:1227
+#: commit.c:1243
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Zapis %s ma zły podpis GPG rzekomo od %s."
-#: commit.c:1230
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Zapis %s nie ma podpisu GPG."
-#: commit.c:1233
+#: commit.c:1249
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Zapis %s ma dobry podpis GPG od %s\n"
-#: commit.c:1487
+#: commit.c:1503
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"
@@ -2511,7 +2538,7 @@
msgid "memory exhausted"
msgstr "pamięć wyczerpana"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2526,35 +2553,35 @@
"\t%s\n"
"Może to być spowodowane cyklicznymi załączeniami."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "nie można rozwinąć ścieżki załączeń (include) „%s”"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "względne załączenia konfiguracji muszą pochodzić z plików"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr "względne warunkowe załączenia konfiguracji muszą pochodzić z plików"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "nieprawidłowy format ustawień: %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "brak nazwy zmiennej środowiska dla ustawienia „%.*s”"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "brak zmiennej środowiska „%s” dla ustawienia „%.*s”"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "klucz nie zawiera rozdziału: %s"
@@ -2564,298 +2591,298 @@
msgid "key does not contain variable name: %s"
msgstr "klucz nie zawiera nazwy zmiennej: %s"
-#: config.c:472 sequencer.c:2588
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "nieprawidłowy klucz: %s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "błędny klucz (nowy wiersz): %s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "pusty klucz ustawień"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "fałszywy parametr konfiguracji: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "fałszywy format %s"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "fałszywy licznik w %s"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "za dużo wpisów w %s"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "brak klucza ustawień %s"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "brakująca wartość ustawienia %s"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "zły wiersz konfiguracji %d w blobie %s"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "zły wiersz konfiguracji %d w pliku %s"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "zły wiersz konfiguracji %d na standardowym wejściu"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
-msgstr "zły wiersz konfiguracji %d w blobie pod-modułu %s"
+msgstr "zły wiersz konfiguracji %d w blobie podmodułu %s"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "zły wiersz konfiguracji %d w wierszu poleceń %s"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "zły wiersz konfiguracji %d w %s"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "poza zakresem"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "nieprawidłowa jednostka"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "zła liczbowa wartość konfiguracji „%s” dla „%s”: %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "zła liczbowa wartość konfiguracji „%s” dla „%s” w blobie %s: %s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "zła liczbowa wartość konfiguracji „%s” dla „%s” w pliku %s: %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"zła liczbowa wartość konfiguracji „%s” dla „%s” na standardowym wejściu: %s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-"zła liczbowa wartość konfiguracji „%s” dla „%s” w blobie pod-modułu %s: %s"
+"zła liczbowa wartość konfiguracji „%s” dla „%s” w blobie podmodułu %s: %s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"zła liczbowa wartość konfiguracji „%s” dla „%s” w wierszu poleceń %s: %s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "zła liczbowa wartość konfiguracji „%s” dla „%s” w %s: %s"
-#: config.c:1194
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "zła logiczna wartość konfiguracji „%s” w „%s”"
-#: config.c:1289
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "nie można rozwinąć katalogu użytkownika w: „%s”"
-#: config.c:1298
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "„%s” do „%s” nie jest prawidłowym znacznikiem czasu"
-#: config.c:1391
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "długość skrótu poza zakresem: %d"
-#: config.c:1405 config.c:1416
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "zły stopień kompresji zlib %d"
-#: config.c:1508
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "core.commentChar powinno być tylko jednym znakiem"
-#: config.c:1541
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "nieprawidłowy tryb utworzenia obiektu: %s"
-#: config.c:1613
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "nieprawidłowa wartość %s"
-#: config.c:1639
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "nieprawidłowa wartość %s: %s"
-#: config.c:1640
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "musi być jednym z nothing, matching, simple, upstream lub current"
-#: config.c:1701 builtin/pack-objects.c:3666
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "zły stopień kompresji paczki %d"
-#: config.c:1823
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "nie można wczytać konfiguracyjnego obiektu blobu „%s”"
-#: config.c:1826
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referencja „%s” nie wskazuje blobu"
-#: config.c:1843
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "nie można rozwiązać blobu konfiguracji „%s”"
-#: config.c:1873
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "nie można przetworzyć %s"
-#: config.c:1927
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "nie można przeanalizować konfiguracji wiersza poleceń"
-#: config.c:2290
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr "wystąpił nieznany błąd podczas odczytywania plików konfiguracyjnych"
-#: config.c:2464
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Nieprawidłowy %s: „%s”"
-#: config.c:2509
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "wartość splitIndex.maxPercentChange „%d” powinna być pomiędzy 0 a 100"
-#: config.c:2555
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "nie można przetworzyć „%s” z konfiguracji wiersza poleceń"
-#: config.c:2557
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "zła zmienna konfiguracji „%s” w pliku „%s” w wierszu %d"
-#: config.c:2641
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "nieprawidłowa nazwa rozdziału „%s”"
-#: config.c:2673
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s ma wiele wartości"
-#: config.c:2702
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "nie można zapisać nowego pliku konfiguracyjnego %s"
-#: config.c:2954 config.c:3280
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "nie można zablokować pliku konfiguracyjnego %s"
-#: config.c:2965
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "otwieranie %s"
-#: config.c:3002 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "nieprawidłowy wzorzec: %s"
-#: config.c:3027
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "nieprawidłowy plik konfiguracyjny %s"
-#: config.c:3040 config.c:3293
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "fstat na %s nie powiódł się"
-#: config.c:3051
+#: config.c:3043
#, c-format
-msgid "unable to mmap '%s'"
-msgstr "nie można wykonać mmap „%s”"
+msgid "unable to mmap '%s'%s"
+msgstr "nie można wykonać mmap „%s”%s"
-#: config.c:3060 config.c:3298
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "chmod na %s nie powiodło się"
-#: config.c:3145 config.c:3395
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "nie można zapisać pliku konfiguracji %s"
-#: config.c:3179
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "nie można ustawić „%s” na „%s”"
-#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "nie można usunąć ustawienia „%s”"
-#: config.c:3271
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "nieprawidłowa nazwa rozdziału: %s"
-#: config.c:3438
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "brakująca wartość „%s”"
@@ -2890,72 +2917,72 @@
msgid "expected flush after capabilities"
msgstr "oczekiwano wypróżnienia po możliwościach (capabilities)"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "pomijanie możliwości (capabilities) po pierwszym wierszu „%s”"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "błąd protokołu: nieoczekiwane możliwości capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "błąd protokołu: oczekiwano płytkiego SHA-1, otrzymano „%s”"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "repozytorium po drugiej stronie nie może być płytkie"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "nieprawidłowy pakiet"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "błąd protokołu: nieoczekiwane „%s”"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "serwer podał nieznany format obiektu „%s”"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "nieprawidłowa odpowiedź ls-refs: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "oczekiwano wypróżnienia po wypisaniu referencji"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "oczekiwano pakietu końca odpowiedzi po wypisaniu referencji"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "protokół „%s” jest niewspierany"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "nie można ustawić w gnieździe SO_KEEPALIVE"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Odnajdywanie %s ... "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "nie można odnaleźć %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2964,7 +2991,7 @@
"gotowe.\n"
"Łączenie z %s (port %s) ... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2974,93 +3001,94 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "gotowe."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "nie odnaleziono %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "nieznany port %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "zablokowano dziwną nazwę hosta „%s”"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "zablokowano dziwny port „%s”"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "nie można uruchomić pośrednika %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"nie podano ścieżki; zobacz składnię prawidłowych adresów w „git help pull”"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr ""
-"nie można użyć znaku nowego wiersza w adresach git:// i ścieżkach repozytoriów"
+"nie można użyć znaku nowego wiersza w adresach git:// i ścieżkach "
+"repozytoriów"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "wariant SSH „simple” nie wspiera -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "wariant SSH „simple” nie wspiera -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "wariant SSH „simple” nie wspiera ustawiania portu"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "zablokowano dziwną ścieżkę „%s”"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "nie można wykonać fork"
-#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Sprawdzanie spójności"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Nie można wykonać „git rev-list”"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "nie można zapisać do rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "nie można zamknąć wejścia rev-list"
-#: convert.c:194
+#: convert.c:183
#, c-format
msgid "illegal crlf_action %d"
msgstr "błędne działanie crlf_action %d"
-#: convert.c:207
+#: convert.c:196
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "CRLFy zostałyby zastąpione LFami w %s"
-#: convert.c:209
+#: convert.c:198
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
@@ -3069,12 +3097,12 @@
"CRLFy zostaną zastąpione LFami %s.\n"
"Plik zachowa swoje pierwotne końce wiersza w katalogu roboczym"
-#: convert.c:217
+#: convert.c:206
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "LFy zostałyby zastąpione CRLFami w %s"
-#: convert.c:219
+#: convert.c:208
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
@@ -3083,12 +3111,12 @@
"LFy zostaną zastąpione CRLFami %s.\n"
"Plik zachowa swoje pierwotne końce wiersza w katalogu roboczym"
-#: convert.c:284
+#: convert.c:273
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "Znacznik kolejności bajtów zabroniony, jeśli „%s” zakodowano jako %s"
-#: convert.c:291
+#: convert.c:280
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
@@ -3097,12 +3125,12 @@
"Plik „%s” zawiera znacznik kolejności bajtów (BOM). Użyj UTF-%.*s jako "
"kodowania drzewa roboczego."
-#: convert.c:304
+#: convert.c:293
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "Znacznik kolejności bajtów wymagany, jeśli „%s” zakodowano jako %s"
-#: convert.c:306
+#: convert.c:295
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -3111,50 +3139,50 @@
"W pliku „%s” brakuje znacznika kolejności bajtów (BOM). Użyj UTF-%sBE lub "
"UTF-%sLE (zależnie od kolejności bajtów) jako kodowania drzewa roboczego."
-#: convert.c:419 convert.c:490
+#: convert.c:408 convert.c:479
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "nie można przekodować „%s” z %s na %s"
-#: convert.c:462
+#: convert.c:451
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "kodowanie „%s” z %s na %s i z powrotem nie jest tym samym"
-#: convert.c:665
+#: convert.c:654
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "nie można wykonać fork, by uruchomić zewnętrzny filtr „%s”"
-#: convert.c:685
+#: convert.c:674
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "nie można nakarmić wejściem zewnętrznego filtra „%s”"
-#: convert.c:692
+#: convert.c:681
#, c-format
msgid "external filter '%s' failed %d"
msgstr "zewnętrzny filtr „%s” nie powiódł się %d"
-#: convert.c:727 convert.c:730
+#: convert.c:716 convert.c:719
#, c-format
msgid "read from external filter '%s' failed"
msgstr "odczyt z zewnętrznego filtra „%s” nie powiódł się"
-#: convert.c:733 convert.c:788
+#: convert.c:722 convert.c:777
#, c-format
msgid "external filter '%s' failed"
msgstr "zewnętrzny filtr „%s” nie powiódł się"
-#: convert.c:837
+#: convert.c:826
msgid "unexpected filter type"
msgstr "nieoczekiwany rodzaj filtra"
-#: convert.c:848
+#: convert.c:837
msgid "path name too long for external filter"
msgstr "ścieżka zewnętrznego filtra za długa"
-#: convert.c:940
+#: convert.c:935
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -3163,16 +3191,16 @@
"zewnętrzny filtr „%s” nie jest już dostępny, chociaż nie wszystkie ścieżki "
"zostały przefiltrowane"
-#: convert.c:1240
+#: convert.c:1236
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false nie są prawidłowymi kodowaniami drzewa roboczego"
-#: convert.c:1428 convert.c:1462
+#: convert.c:1416 convert.c:1449
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: filtr czyszczenia „%s” zawiódł"
-#: convert.c:1508
+#: convert.c:1492
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: filtr smarowania %s zawiódł"
@@ -3190,17 +3218,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr "odmawiam pracy z poświadczeniem bez pola protokołu"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "adres URL zawiera znak nowego wiersza w komponencie %s: %s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "adres URL nie ma schematu: %s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "nie można przetworzyć poświadczenia adresu URL: %s"
@@ -3312,31 +3340,31 @@
msgid "unknown value for --diff-merges: %s"
msgstr "nierozpoznana wartość --diff-merges: %s"
-#: diff-lib.c:534
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base nie działa z zakresami"
-#: diff-lib.c:536
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base działa tylko z zapisami"
-#: diff-lib.c:553
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "nie można uzyskać HEAD"
-#: diff-lib.c:560
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "nie znaleziono podstawy scalenia"
-#: diff-lib.c:562
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "znaleziono wiele podstaw scalenia"
-#: diff-no-index.c:238
+#: diff-no-index.c:237
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<opcje>] <ścieżka> <ścieżka>"
-#: diff-no-index.c:263
+#: diff-no-index.c:262
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
"tree"
@@ -3344,17 +3372,17 @@
"To nie jest repozytorium gita. Użyj --no-index, aby porównać dwie ścieżki "
"poza drzewem roboczym"
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Nie można przetworzyć procentu odcięcia dirstat „%s”\n"
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Nieznany parametr dirstat „%s”\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3362,7 +3390,7 @@
"ustawienie kolorowania przeniesień musi być jednym z „no”, „default”, "
"„blocks”, „zebra”, „dimmed-zebra” czy „plain”"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3372,7 +3400,7 @@
"change”, „ignore-space-at-eol”, „ignore-all-space”, „allow-indentation-"
"change”"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3380,12 +3408,12 @@
"color-moved-ws: allow-indentation-change nie może być łączone z innymi "
"trybami białych znaków"
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Nierozpoznana wartość zmiennej konfiguracji „diff.submodule”: „%s”"
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3394,35 +3422,47 @@
"Znaleziono błędy w zmiennej konfiguracji „diff.dirstat”:\n"
"%s"
-#: diff.c:4276
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr "zewnętrzny diff padł, zatrzymano na %s"
-#: diff.c:4628
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check i -s się wykluczają"
-#: diff.c:4631
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S i --find-object się wykluczają"
-#: diff.c:4710
+#: diff.c:4648
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr "-G i --pickaxe-regex się wykluczają, użyj --pickaxe-regex z -S"
+
+#: diff.c:4651
+msgid ""
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"with -G and -S"
+msgstr ""
+"--pickaxe-all i --find-object się wykluczają, użyj --pickaxe-all z -G i -S"
+
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow wymaga dokładnie jednej ścieżki"
-#: diff.c:4758
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "nieprawidłowa wartość --stat: %s"
-#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s oczekuje wartości liczbowej"
-#: diff.c:4795
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3431,197 +3471,197 @@
"Nie można przetworzyć parametru opcji --dirstat/-X:\n"
"%s"
-#: diff.c:4880
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "nieznana klasa zmian „%c” w --diff-filter=%s"
-#: diff.c:4904
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "nieznana wartość po ws-error-highlight=%.*s"
-#: diff.c:4918
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "nie można rozwiązać „%s”"
-#: diff.c:4968 diff.c:4974
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s oczekuje postaci <n>/<m>"
-#: diff.c:4986
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s oczekuje znaku, otrzymano „%s”"
-#: diff.c:5007
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "zły argument --color-moved: %s"
-#: diff.c:5026
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "nieprawidłowy tryb „%s” w --color-moved-ws"
-#: diff.c:5066
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"opcja diff-algorithm przyjmuje „myers”, „minimal”, „patience” i „histogram”"
-#: diff.c:5102 diff.c:5122
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "nieprawidłowy argument do %s"
-#: diff.c:5226
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "w -I podano nieprawidłowe wyrażenie regularne: „%s”"
-#: diff.c:5275
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "nie można przetworzyć parametru opcji --submodule: „%s”"
-#: diff.c:5331
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "zły argument --word-diff: %s"
-#: diff.c:5367
+#: diff.c:5387
msgid "Diff output format options"
msgstr "Opcje formatu wyjściowego różnic"
-#: diff.c:5369 diff.c:5375
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "wygeneruj łatkę"
-#: diff.c:5372 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "nie wypisuj różnic"
-#: diff.c:5377 diff.c:5491 diff.c:5498
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5378 diff.c:5381
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr "wygeneruj różnice z <n> wierszami kontekstu"
-#: diff.c:5383
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr "wygeneruj różnice w surowym formacie"
-#: diff.c:5386
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "synonim do „-p --raw”"
-#: diff.c:5390
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "synonim do „-p --stat”"
-#: diff.c:5394
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "--stat czytelne dla maszyny"
-#: diff.c:5397
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "wypisz tylko ostatni wiersz --stat"
-#: diff.c:5399 diff.c:5407
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5400
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "wypisz rozkład względnej ilości zmian w każdym podkatalogu"
-#: diff.c:5404
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "zamiennik na --dirstat=cumulative"
-#: diff.c:5408
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonim do --dirstat=files,param1,param2..."
-#: diff.c:5412
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"ostrzegaj, jeśli zmiany wprowadzają znaczniki konfliktów lub błędy białych "
"znaków"
-#: diff.c:5415
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr "zwarte podsumowanie takie jak utworzenia czy zmiany nazw i trybów"
-#: diff.c:5418
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "pokazuj tylko nazwy zmienionych plików"
-#: diff.c:5421
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "pokazuj tylko nazwy i stan zmienionych plików"
-#: diff.c:5423
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<szerokość>[,<szerokość-nazwy>[,<liczba>]]"
-#: diff.c:5424
+#: diff.c:5444
msgid "generate diffstat"
msgstr "wygeneruj statystyki różnic"
-#: diff.c:5426 diff.c:5429 diff.c:5432
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<szerokość>"
-#: diff.c:5427
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr "wygeneruj statystyki różnic o podanej szerokości"
-#: diff.c:5430
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr "wygeneruj statystyki różnic o podanej szerokości nazw"
-#: diff.c:5433
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr "wygeneruj statystyki różnic o podanej szerokości grafu"
-#: diff.c:5435
+#: diff.c:5455
msgid "<count>"
msgstr "<liczba>"
-#: diff.c:5436
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr "wygeneruj statystyki różnic o ograniczonych wierszach"
-#: diff.c:5439
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr "wygeneruj zwięzłe podsumowanie w statystykach różnic"
-#: diff.c:5442
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr "wypisz binarne różnice, które mogą być zastosowane"
-#: diff.c:5445
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"pokaż pełne nazwy obiektów wstępnego i końcowego obrazu w wierszach „index”"
-#: diff.c:5447
+#: diff.c:5467
msgid "show colored diff"
msgstr "pokaż kolorowe różnice"
-#: diff.c:5448
+#: diff.c:5468
msgid "<kind>"
msgstr "<rodzaj>"
-#: diff.c:5449
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3629,94 +3669,94 @@
"podświetl błędy białych znaków w rodzaju wierszy różnic: „context”, „old” "
"lub „new”"
-#: diff.c:5452
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
"nie męcz ścieżek i użyj znaków NUL do rozdzielenia pól w --raw lub --numstat"
-#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<prefiks>"
-#: diff.c:5456
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "pokaż podany prefiks źródła zamiast „a/”"
-#: diff.c:5459
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "pokaż podany prefiks celu zamiast „b/”"
-#: diff.c:5462
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "dodatkowy prefiks do dodania przed każdym wierszem wyjścia"
-#: diff.c:5465
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "nie pokazuj żadnego prefiksu źródła ani celu"
-#: diff.c:5468
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr "pokaż kontekst między skrawkami różnic do podanej liczby wierszy"
-#: diff.c:5472 diff.c:5477 diff.c:5482
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<znak>"
-#: diff.c:5473
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr "podaj znak wskazujący nowy wiersz zamiast „+”"
-#: diff.c:5478
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr "podaj znak wskazujący stary wiersz zamiast „-”"
-#: diff.c:5483
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr "podaj znak wskazujący kontekst zamiast odstępu „ ”"
-#: diff.c:5486
+#: diff.c:5506
msgid "Diff rename options"
msgstr "Opcje zmiany nazw różnic"
-#: diff.c:5487
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5488
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "rozbij zmiany zupełnego przepisania na pary usunięć i utworzeń"
-#: diff.c:5492
+#: diff.c:5512
msgid "detect renames"
msgstr "wykrywaj zmiany nazw"
-#: diff.c:5496
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr "omiń wstępny obraz przy usunięciach"
-#: diff.c:5499
+#: diff.c:5519
msgid "detect copies"
msgstr "wykrywaj kopie"
-#: diff.c:5503
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
msgstr "użyj niezmodyfikowanych plików jako źródła do znalezienia kopii"
-#: diff.c:5505
+#: diff.c:5525
msgid "disable rename detection"
msgstr "wyłącz wykrywanie zmian nazw"
-#: diff.c:5508
+#: diff.c:5528
msgid "use empty blobs as rename source"
msgstr "użyj pustych blobów jako źródła zmiany nazwy"
-#: diff.c:5510
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr "kontynuuj wypisywanie historii pliku poza zmianami nazw"
-#: diff.c:5513
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3724,165 +3764,165 @@
"powstrzymaj wykrywanie zmian nazw i kopii, jeśli liczba zmian nazw / kopii "
"przekracza podaną granicę"
-#: diff.c:5515
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "Opcje algorytmu różnic"
-#: diff.c:5517
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr "wyprodukuj najmniejsze możliwe różnice"
-#: diff.c:5520
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "ignoruj zmiany w białych znakach przy porównywaniu plików"
-#: diff.c:5523
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "ignoruj zmiany w liczbie białych znaków"
-#: diff.c:5526
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "ignoruj zmiany w białych znakach na końcu wiersza"
-#: diff.c:5529
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr "ignoruj powrót karetki (CR) na końcu wiersza"
-#: diff.c:5532
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr "ignoruj zmiany, których wszystkie wiersze są puste"
-#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<wyr-reg>"
-#: diff.c:5535
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr "ignoruj zmiany, których wszystkie wiersze pasują do <wyr-reg>"
-#: diff.c:5538
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"heurystyka do przesunięcia granic skrawków różnic, aby ułatwić czytanie"
-#: diff.c:5541
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "wygeneruj różnice używając algorytmu „cierpliwych różnic”"
-#: diff.c:5545
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "wygeneruj różnice używając algorytmu „histogramu różnic”"
-#: diff.c:5547
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<algorytm>"
-#: diff.c:5548
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr "wybierz algorytm różnic"
-#: diff.c:5550
+#: diff.c:5570
msgid "<text>"
msgstr "<tekst>"
-#: diff.c:5551
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "wygeneruj różnice używając algorytmu „zakotwiczonych różnic”"
-#: diff.c:5553 diff.c:5562 diff.c:5565
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<tryb>"
-#: diff.c:5554
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr "pokaż różnice słów, używając <trybu> do rozdzielenia zmienionych słów"
-#: diff.c:5557
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
msgstr "użyj <wyr-reg>, aby zdecydować, czym jest słowo"
-#: diff.c:5560
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "równoważne --word-diff=color --word-diff-regex=<wyr-reg>"
-#: diff.c:5563
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "przeniesione wiersze kodu są kolorowane inaczej"
-#: diff.c:5566
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "jak są ignorowane białe znaki w --color-moved"
-#: diff.c:5569
+#: diff.c:5589
msgid "Other diff options"
msgstr "Inne opcje różnic"
-#: diff.c:5571
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"kiedy uruchomione z podkatalogu, pomiń zmiany poza nim i pokaż względne "
"ścieżki"
-#: diff.c:5575
+#: diff.c:5595
msgid "treat all files as text"
msgstr "traktuj wszystkie pliki jako tekstowe"
-#: diff.c:5577
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr "zamień dwa wejścia, odwróć różnice"
-#: diff.c:5579
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "wyjdź z 1 jeśli nie ma różnic, 0 w przeciwnym wypadku"
-#: diff.c:5581
+#: diff.c:5601
msgid "disable all output of the program"
msgstr "wyłącz całe wyjście programu"
-#: diff.c:5583
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr "pozwól wykonać zewnętrzny pomocnik różnic"
-#: diff.c:5585
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"wykonaj zewnętrzne filtry konwersji tekstu przy porównywaniu plików binarnych"
-#: diff.c:5587
+#: diff.c:5607
msgid "<when>"
msgstr "<kiedy>"
-#: diff.c:5588
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
-msgstr "ignoruj zmiany w pod-modułach przy generowaniu różnic"
+msgstr "ignoruj zmiany w podmodułach przy generowaniu różnic"
-#: diff.c:5591
+#: diff.c:5611
msgid "<format>"
msgstr "<format>"
-#: diff.c:5592
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
-msgstr "podaj, jak będą pokazywane różnice w pod-modułach"
+msgstr "podaj, jak będą pokazywane różnice w podmodułach"
-#: diff.c:5596
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "ukryj elementy „git add -N” z indeksu"
-#: diff.c:5599
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr "traktuj elementy „git add -N” jako prawdziwe w indeksie"
-#: diff.c:5601
+#: diff.c:5621
msgid "<string>"
msgstr "<łańcuch>"
-#: diff.c:5602
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "szukaj różnic, które zmieniają liczbę wystąpień podanego łańcucha"
-#: diff.c:5605
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3890,67 +3930,67 @@
"szukaj różnic, które zmieniają liczbę wystąpień podanego wyrażenia "
"regularnego"
-#: diff.c:5608
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "pokaż wszystkie zmiany w zestawie z -S lub -G"
-#: diff.c:5611
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "traktuj <łańcuch> w -S jako rozszerzone wyrażenie regularne POSIX"
-#: diff.c:5614
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "ustaw kolejność, w jakiej pliki pojawią się na wyjściu"
-#: diff.c:5615 diff.c:5618
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<ścieżka>"
-#: diff.c:5616
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "pokaż najpierw zmianę w podanej ścieżce"
-#: diff.c:5619
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr "pomiń wyjście do podanej ścieżki"
-#: diff.c:5621
+#: diff.c:5641
msgid "<object-id>"
msgstr "<id-obiektu>"
-#: diff.c:5622
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "szukaj różnic, które zmieniają liczbę wystąpień podanego obiektu"
-#: diff.c:5624
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5625
+#: diff.c:5645
msgid "select files by diff type"
msgstr "wybierz pliki według rodzaju różnic"
-#: diff.c:5627
+#: diff.c:5647
msgid "<file>"
msgstr "<plik>"
-#: diff.c:5628
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "Wyjście do podanego pliku"
-#: diff.c:6285
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6306
+msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
-"pominięto wykrywanie niedokładnych zmian nazw z powodu zbyt wielu plików."
+"pominięto wyczerpujące wykrywanie zmian nazw z powodu zbyt wielu plików."
-#: diff.c:6288
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr ""
"znaleziono kopie tylko ze zmienionych ścieżek z powodu zbyt wielu plików."
-#: diff.c:6291
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3962,7 +4002,7 @@
msgid "failed to read orderfile '%s'"
msgstr "nie można odczytać pliku kolejności „%s”"
-#: diffcore-rename.c:555
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Wykrywanie niedokładnych zmian nazw"
@@ -3971,65 +4011,73 @@
msgid "No such path '%s' in the diff"
msgstr "W różnicy nie ma ścieżki „%s”"
-#: dir.c:578
+#: dir.c:593
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr "ścieżka „%s” nie pasuje do żadnych plików znanych gitowi"
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "nierozpoznany wzorzec: %s"
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "nierozpoznany antywzorzec: „%s”"
-#: dir.c:809
+#: dir.c:820
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
"twój plik rzadkiego wybrania może mieć problemy: wzorzec „%s” jest powtórzony"
-#: dir.c:819
+#: dir.c:830
msgid "disabling cone pattern matching"
msgstr "wyłączanie stożkowego dopasowania wzorca"
-#: dir.c:1198
+#: dir.c:1214
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "nie można użyć %s jako pliku wyłączeń"
-#: dir.c:2305
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "nie można otworzyć katalogu „%s”"
-#: dir.c:2605
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr "nie można uzyskać nazwy i informacji jądra"
-#: dir.c:2729
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr "pamięć o nieśledzonych jest wyłączona w tym systemie lub położeniu"
-#: dir.c:3537
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Nie można zgadnąć nazwy katalogu.\n"
+"Podaj katalog w wierszu poleceń"
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "uszkodzony plik indeksu w repozytorium %s"
-#: dir.c:3582 dir.c:3587
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "nie można utworzyć katalogów dla %s"
-#: dir.c:3616
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "nie można zmigrować katalogu gita z „%s” do „%s”"
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "wskazówka: Czekanie, aż edytor zamknie plik...%c"
@@ -4038,288 +4086,371 @@
msgid "Filtering content"
msgstr "Filtrowanie zawartości"
-#: entry.c:478
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "nie można wykonać stat na pliku „%s”"
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "zła ścieżka przestrzeni nazw gita „%s”"
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "nie można ustawić GIT_DIR na „%s”"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "za dużo argumentów, aby wykonać %s"
-#: fetch-pack.c:177
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: oczekiwano listy shallow"
-#: fetch-pack.c:180
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: oczekiwano pakietu wypróżnienia po płytkiej liście"
-#: fetch-pack.c:191
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: oczekiwano ACK/NAK, otrzymano pakiet wypróżnienia"
-#: fetch-pack.c:211
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: oczekiwano ACK/NAK, otrzymano „%s”"
-#: fetch-pack.c:222
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "nie można pisać do zdalnego repozytorium"
-#: fetch-pack.c:283
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc wymaga multi_ack_detailed"
-#: fetch-pack.c:378 fetch-pack.c:1400
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "nieprawidłowy wiersz shallow: %s"
-#: fetch-pack.c:384 fetch-pack.c:1406
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "nieprawidłowy wiersz unshallow: %s"
-#: fetch-pack.c:386 fetch-pack.c:1408
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "nie znaleziono obiektu: %s"
-#: fetch-pack.c:389 fetch-pack.c:1411
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "błąd w obiekcie: %s"
-#: fetch-pack.c:391 fetch-pack.c:1413
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "nie znaleziono shallow: %s"
-#: fetch-pack.c:394 fetch-pack.c:1417
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "oczekiwano shallow/unshallow, otrzymano %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "dostałem %s %d %s"
-#: fetch-pack.c:451
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "nieprawidłowy zapis %s"
-#: fetch-pack.c:482
+#: fetch-pack.c:498
msgid "giving up"
msgstr "poddaję się"
-#: fetch-pack.c:495 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "gotowe"
-#: fetch-pack.c:507
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "dostałem %s (%d) %s"
-#: fetch-pack.c:543
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "Oznaczam %s jako gotowe"
-#: fetch-pack.c:758
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "już mam %s (%s)"
-#: fetch-pack.c:821
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: nie można uruchomić rozdzielania pasma bocznego"
-#: fetch-pack.c:829
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "błąd protokołu: zły nagłówek paczki"
-#: fetch-pack.c:913
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: nie można uruchomić %s"
-#: fetch-pack.c:931
+#: fetch-pack.c:968
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: nieprawidłowe wyjście index-pack"
+
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "%s nie powiodło się"
-#: fetch-pack.c:933
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "błąd rozdzielania pasma bocznego"
-#: fetch-pack.c:976
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "Wersja serwera to %.*s"
-#: fetch-pack.c:984 fetch-pack.c:990 fetch-pack.c:993 fetch-pack.c:999
-#: fetch-pack.c:1003 fetch-pack.c:1007 fetch-pack.c:1011 fetch-pack.c:1015
-#: fetch-pack.c:1019 fetch-pack.c:1023 fetch-pack.c:1027 fetch-pack.c:1031
-#: fetch-pack.c:1037 fetch-pack.c:1043 fetch-pack.c:1048 fetch-pack.c:1053
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "Serwer wspiera %s"
-#: fetch-pack.c:986
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "Serwer nie wspiera płytkich klientów"
-#: fetch-pack.c:1046
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "Serwer nie wspiera --shallow-since"
-#: fetch-pack.c:1051
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "Serwer nie wspiera --shallow-exclude"
-#: fetch-pack.c:1055
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "Serwer nie wspiera --deepen"
-#: fetch-pack.c:1057
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr "Serwer nie wspiera formatu obiektów z tego repozytorium"
-#: fetch-pack.c:1070
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "brak wspólnych zapisów"
-#: fetch-pack.c:1082 fetch-pack.c:1622
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+msgid "source repository is shallow, reject to clone."
+msgstr "źródłowe repozytorium jest płytkie, odmowa klonowania."
+
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: pobieranie nie powiodło się."
-#: fetch-pack.c:1208
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "niezgodne algorytmy: klient %s; serwer %s"
-#: fetch-pack.c:1212
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "serwer nie wspiera algorytmu „%s”"
-#: fetch-pack.c:1232
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "Serwer nie wspiera płytkich żądań"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "Serwer wspiera filtrowanie"
-#: fetch-pack.c:1278
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "nie można pisać żądania do zdalnej maszyny"
-#: fetch-pack.c:1296
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "błąd odczytu nagłówka rozdziału „%s”"
-#: fetch-pack.c:1302
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "oczekiwano „%s”, odebrano „%s”"
-#: fetch-pack.c:1363
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "nieoczekiwany wiersz potwierdzenia: „%s”"
-#: fetch-pack.c:1368
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "błąd przetwarzania potwierdzeń: %d"
-#: fetch-pack.c:1378
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr "oczekiwano pliku paczki wysłanego po „ready”"
-#: fetch-pack.c:1380
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr "nie oczekiwano innych rozdziałów wysłanych po braku „ready”"
-#: fetch-pack.c:1422
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "błąd przetwarzania płytkich informacji: %d"
-#: fetch-pack.c:1469
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "oczekiwano wanted-ref, otrzymano %s"
-#: fetch-pack.c:1474
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "nieoczekiwana wanted-ref: „%s”"
-#: fetch-pack.c:1479
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "błąd przetwarzania chcianych referencji: %d"
-#: fetch-pack.c:1509
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: oczekiwano pakietu końca odpowiedzi"
-#: fetch-pack.c:1891
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "brak pasującego zdalnego czoła"
-#: fetch-pack.c:1914 builtin/clone.c:693
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "zdalna maszyna nie przysłała wszystkich potrzebnych obiektów"
-#: fetch-pack.c:1941
+#: fetch-pack.c:2075
+msgid "unexpected 'ready' from remote"
+msgstr "nieoczekiwane „ready” od zdalnej maszyny"
+
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "nie ma takiej zdalnej referencji %s"
-#: fetch-pack.c:1944
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Serwer nie pozwala na żądanie o nieogłoszony obiekt %s"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr "nie można utworzyć pliku tymczasowego"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "nie można zapisać oddzielonego podpisu do „%s”"
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile musi być ustawiony i istnieć, aby sprawdzać "
+"podpisy ssh"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"potrzeba ssh-keygen -Y find-principals/verify, aby sprawdzać podpisy ssh "
+"(dostępne w wersji openssh 8.2p1+)"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "ustawiono plik odwołania podpisów ssh, ale go nie znaleziono: %s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "zły/niekompatybilny podpis „%s”"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "nie można zdobyć odcisku klucza ssh „%s”"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "należy ustawić user.signingkey lub gpg.ssh.defaultKeyCommand"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand powiodło się, ale nie zwróciło żadnych kluczy: %s "
+"%s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand zawiodło: %s %s"
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
msgstr "gpg nie może podpisać danych"
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "do podpisywania ssh potrzeba user.signingkey"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "nie można zapisać klucza podpisującego ssh do „%s”"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "nie można zapisać buforu klucza podpisującego ssh do „%s”"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"do podpisywania ssh wymagany jest podpis ssh-keygen -Y (dostępne od wersji "
+"openssh 8.2p1+)"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "nie można odczytać bufora danych podpisu ssh z „%s”"
+
#: graph.c:98
#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "ignoruj nieprawidłowy kolor „%.*s” w log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "pominięto nieprawidłowy kolor „%.*s” w log.graphColors"
-#: grep.c:543
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4327,110 +4458,110 @@
"podany wzorzec zawiera znak NUL (przez -f <plik>). To jest wspierane tylko z "
"-P pod PCRE v2"
-#: grep.c:1906
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "„%s”: nie można przeczytać %s"
-#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
-#: builtin/rm.c:135
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "nie można wykonać stat na „%s”'"
-#: grep.c:1934
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "„%s”: przeczytano mniej niż powinno być"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "przyszykuj obszar do pracy (zobacz też: git help tutorial)"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr "pracuj nad bieżącą zmianą (zobacz też: git help everyday)"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr "badaj historię i stan (zobacz też: git help revisions)"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "poszerzaj, oznaczaj i dostosowuj wspólną historię"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "współpracuj (zobacz też: git help workflows)"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Główne porcelanowe polecenia"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Polecenia pomocnicze / manipulatory"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Polecenia pomocnicze / odpytywanie"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "Interakcje z innymi"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Polecenia niskopoziomowe / manipulatory"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Polecenia niskopoziomowe / odpytywanie"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Polecenia niskopoziomowe / synchronizacja repozytoriów"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Polecenia niskopoziomowe / wewnętrzne pomocniki"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "dostępne polecenia gita w „%s”"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "polecenia gita dostępne gdzie indziej w ścieżce $PATH"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "Oto częste polecenia Gita używane w różnych sytuacjach:"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "nieobsługiwany rodzaj spisu poleceń „%s”"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Podręczniki pojęć Gita to:"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
"Zobacz „git help <polecenie>”, aby przeczytać o konkretnym pod-poleceniu"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Zewnętrzne polecenia"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Skróty poleceń"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4439,31 +4570,36 @@
"„%s” wydaje się być poleceniem gita, ale nie udało się\n"
"go wykonać. Może git-%s się zepsuł?"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: „%s” nie jest poleceniem gita. Zobacz „git --help”."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "O jejciu. Twój system w ogóle nie zgłasza żadnych poleceń gita."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "Ostrzeżenie: Wywołano polecenie Gita „%s”, które nie istnieje."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Zakładam dalej, że chodziło o „%s”."
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "Wykonać zamiast tego „%s”? (y/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Kontynuowanie za %0.1f sekundy, zakładam, że chodziło o „%s”."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4480,16 +4616,16 @@
"\n"
"Najpodobniejsze polecenia to"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<opcje>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4506,6 +4642,15 @@
"\n"
"Czy chodziło o któreś z tych?"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Skrypt repozytorium „%s” został zignorowany, bo nie jest wykonywalny.\n"
+"Możesz wyłączyć to ostrzeżenie przez „git config advice.ignoredHook false”."
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Nieznana tożsamość autora\n"
@@ -4568,47 +4713,52 @@
msgid "name consists only of disallowed characters: %s"
msgstr "nazwisko składa się wyłącznie z niedozwolonych znaków: %s"
-#: ident.c:454 builtin/commit.c:634
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "nieprawidłowy format daty: %s"
-#: list-objects-filter-options.c:81
+#: list-objects-filter-options.c:83
msgid "expected 'tree:<depth>'"
msgstr "oczekiwano „tree:<głębokość>”"
-#: list-objects-filter-options.c:96
+#: list-objects-filter-options.c:98
msgid "sparse:path filters support has been dropped"
msgstr "wsparcie filtrów sparse:path zostało porzucone"
-#: list-objects-filter-options.c:109
+#: list-objects-filter-options.c:105
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "„%s” do „object:type=<typ>” nie jest prawidłowym typem obiektu"
+
+#: list-objects-filter-options.c:124
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "nieprawidłowy filtr: %s"
-#: list-objects-filter-options.c:125
+#: list-objects-filter-options.c:140
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr "trzeba zacytować znak w podfiltrze: „%c”"
-#: list-objects-filter-options.c:167
+#: list-objects-filter-options.c:182
msgid "expected something after combine:"
msgstr "oczekiwano czegoś po combine:"
-#: list-objects-filter-options.c:249
+#: list-objects-filter-options.c:264
msgid "multiple filter-specs cannot be combined"
msgstr "nie można łączyć podania wielu filtrów"
-#: list-objects-filter-options.c:361
+#: list-objects-filter-options.c:376
msgid "unable to upgrade repository format to support partial clone"
msgstr "nie można podnieść formatu repozytorium, aby wspierać częściowy klon"
-#: list-objects-filter.c:492
+#: list-objects-filter.c:532
#, c-format
msgid "unable to access sparse blob in '%s'"
msgstr "brak dostępu do rzadkiego bloba w „%s”"
-#: list-objects-filter.c:495
+#: list-objects-filter.c:535
#, c-format
msgid "unable to parse sparse filter data in %s"
msgstr "nie można przetworzyć danych rzadkiego filtra w %s"
@@ -4623,7 +4773,7 @@
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "element „%s” drzewa %s ma tryb blobu, ale nie jest blobem"
-#: list-objects.c:375
+#: list-objects.c:398
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "nie można wczytać drzewa korzenia dla zapisu %s"
@@ -4657,45 +4807,59 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "nieprawidłowa wartość „%s” lsrefs.unborn"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "nieoczekiwany wiersz: „%s”"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "oczekiwano wypróżnienia po argumentach ls-refs"
-#: merge-ort.c:855 merge-recursive.c:1191
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr "wykryto zacytowany CRLF"
+
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "złe działanie „%s” w „%s”"
+
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Nie można scalić pod-modułu %s (nie wybrano)"
+msgstr "Nie można scalić podmodułu %s (nie wybrano)"
-#: merge-ort.c:864 merge-recursive.c:1198
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Nie można scalić pod-modułu %s (brak zapisów)"
+msgstr "Nie można scalić podmodułu %s (brak zapisów)"
-#: merge-ort.c:873 merge-recursive.c:1205
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "Nie można scalić pod-modułu %s (zapisy nie śledzą podstawy scalania)"
+msgstr "Nie można scalić podmodułu %s (zapisy nie śledzą podstawy scalania)"
-#: merge-ort.c:883 merge-ort.c:890
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr "Uwaga: Przewinięcie pod-modułu %s do %s"
+msgstr "Uwaga: Przewinięcie podmodułu %s do %s"
-#: merge-ort.c:911
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
-msgstr "Nie można scalić pod-modułu %s"
+msgstr "Nie można scalić podmodułu %s"
-#: merge-ort.c:918
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
"%s\n"
msgstr ""
-"Nie można scalić pod-modułu %s, ale istnieje możliwe rozwiązanie:\n"
+"Nie można scalić podmodułu %s, ale istnieje możliwe rozwiązanie:\n"
"%s\n"
-#: merge-ort.c:922 merge-recursive.c:1259
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4712,30 +4876,30 @@
"\n"
"które przyjmie tylko tę sugestię.\n"
-#: merge-ort.c:935
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
"%s"
msgstr ""
-"Nie można scalić pod-modułu %s, ale istnieją możliwe scalenia:\n"
+"Nie można scalić podmodułu %s, ale istnieją możliwe scalenia:\n"
"%s"
-#: merge-ort.c:1094 merge-recursive.c:1341
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "Nie można wykonać wewnętrznego scalenia"
-#: merge-ort.c:1099 merge-recursive.c:1346
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "Nie można dodać %s do bazy danych"
-#: merge-ort.c:1106 merge-recursive.c:1378
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "Auto-scalanie %s"
-#: merge-ort.c:1245 merge-recursive.c:2100
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4744,7 +4908,7 @@
"KONFLIKT (domyślna zmiana nazwy katalogu): Istniejący plik/katalog %s "
"zawadza domyślnej zmianie nazwy wstawiając tam następujące ścieżki: %s."
-#: merge-ort.c:1255 merge-recursive.c:2110
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4754,7 +4918,7 @@
"jednej ścieżki do %s; domyślna zmiana nazwy próbowała wstawić tam "
"następujące ścieżki: %s"
-#: merge-ort.c:1438
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4762,10 +4926,10 @@
"majority of the files."
msgstr ""
"KONFLIKT (podział zmiany nazwy katalogu): Nie ma pewności, jak zmienić nazwę "
-"%s; jego nazwa została zmieniona na wiele innych katalogów, a "
-"żaden z celów nie dostał większości plików."
+"%s; jego nazwa została zmieniona na wiele innych katalogów, a żaden z celów "
+"nie dostał większości plików."
-#: merge-ort.c:1604 merge-recursive.c:2447
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4774,7 +4938,7 @@
"Ostrzeżenie: unikam zastosowania zmiany nazwy %s -> %s na %s, bo %s sam "
"zmienił nazwę."
-#: merge-ort.c:1748 merge-recursive.c:3215
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4783,7 +4947,7 @@
"Zaktualizowano ścieżkę: %s dodano w %s w katalogu, którego nazwa została "
"zmieniona w %s; przenoszenie go do %s."
-#: merge-ort.c:1755 merge-recursive.c:3222
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4792,7 +4956,7 @@
"Zaktualizowano ścieżkę: zmieniono nazwę %s na %s w %s w katalogu, którego "
"nazwa została zmieniona w %s; przenoszenie go do %s."
-#: merge-ort.c:1768 merge-recursive.c:3218
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4801,7 +4965,7 @@
"KONFLIKT (położenie pliku): %s dodano w %s w katalogu, którego nazwa została "
"zmieniona w %s, co sugeruje, że być może powinien trafić do %s."
-#: merge-ort.c:1776 merge-recursive.c:3225
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4811,14 +4975,14 @@
"którego nazwa została zmieniona w %s, co sugeruje, że być może powinien "
"trafić do %s."
-#: merge-ort.c:1919
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
-"KONFLIKT (zmiana nazwy/zmiana nazwy): zmieniono nazwę %s na %s w %s, a na %s"
-" w %s."
+"KONFLIKT (zmiana nazwy/zmiana nazwy): zmieniono nazwę %s na %s w %s, a na %s "
+"w %s."
-#: merge-ort.c:2014
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4826,18 +4990,27 @@
"markers."
msgstr ""
"KONFLIKT (zmiana nazwy związana z kolizją): zmiana nazwy %s -> %s miała "
-"konflikty zawartości A TAKŻE koliduje z inną ścieżką; może to skutkować"
-" zagnieżdżonymi "
-"znacznikami konfliktu."
+"konflikty zawartości A TAKŻE koliduje z inną ścieżką; może to skutkować "
+"zagnieżdżonymi znacznikami konfliktu."
-#: merge-ort.c:2033 merge-ort.c:2057
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
-"KONFLIKT (zmiana nazwy/usunięcie): zmieniono nazwę %s na %s w %s, ale"
-" skasowano w %s."
+"KONFLIKT (zmiana nazwy/usunięcie): zmieniono nazwę %s na %s w %s, ale "
+"skasowano w %s."
-#: merge-ort.c:2683
+#: merge-ort.c:3212 merge-recursive.c:3022
+#, c-format
+msgid "cannot read object %s"
+msgstr "nie można odczytać obiektu %s"
+
+#: merge-ort.c:3215 merge-recursive.c:3025
+#, c-format
+msgid "object %s is not a blob"
+msgstr "obiekt %s nie jest blobem"
+
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4846,42 +5019,42 @@
"KONFLIKT (plik/katalog): katalog zawadza %s z %s; zamiast tego przenoszenie "
"do %s."
-#: merge-ort.c:2756
+#: merge-ort.c:3721
#, c-format
msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
"of them so each can be recorded somewhere."
msgstr ""
"KONFLIKT (różne typy): %s był różnego typu z każdej strony; zmieniono nazwę "
-"%s "
-"z nich, więc każdy może być gdzieś odnotowany."
+"obu, by każdy mógł być gdzieś odnotowany."
-#: merge-ort.c:2760
-msgid "both"
-msgstr "obu"
+#: merge-ort.c:3728
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"KONFLIKT (różne typy): %s był różnego typu z każdej strony; zmieniono nazwę "
+"jednego, by każdy mógł być gdzieś odnotowany."
-#: merge-ort.c:2760
-msgid "one"
-msgstr "jednej"
-
-#: merge-ort.c:2855 merge-recursive.c:3052
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "zawartość"
-#: merge-ort.c:2857 merge-recursive.c:3056
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "dodano/dodano"
-#: merge-ort.c:2859 merge-recursive.c:3101
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
-msgstr "pod-moduł"
+msgstr "podmoduł"
-#: merge-ort.c:2861 merge-recursive.c:3102
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Konflikt scalania w %s"
-#: merge-ort.c:2886
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4890,15 +5063,24 @@
"KONFLIKT (zmiana/usunięcie): %s usunięto w %s a zmieniono w %s. Wersja %s "
"pliku %s pozostaje w drzewie."
+#: merge-ort.c:4152
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+"Uwaga: %s nieaktualne i zawadza wybraniu skonfliktowanej wersji; nazwa "
+"starej kopii zmieniona na %s"
+
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:3354
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "nie można zebrać informacji o scaleniu w drzewach %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4908,107 +5090,106 @@
"scalenie:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3436
-#, c-format
-msgid "Already up to date!"
-msgstr "Już aktualne!"
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+msgid "Already up to date."
+msgstr "Już aktualne."
-#: merge-recursive.c:356
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(zły zapis)\n"
-#: merge-recursive.c:379
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo nie powiodło się na ścieżce „%s”; przerywanie scalania."
-#: merge-recursive.c:388
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo nie udało się odświeżyć na ścieżce „%s”; przerywanie scalania."
-#: merge-recursive.c:874
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "nie można utworzyć ścieżki „%s”%s"
-#: merge-recursive.c:885
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Usuwanie %s, aby zrobić miejsce na podkatalog\n"
-#: merge-recursive.c:899 merge-recursive.c:918
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": Może konflikt plik/katalog?"
-#: merge-recursive.c:908
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "Odmawiam utraty nieśledzonego pliku w „%s”"
-#: merge-recursive.c:949 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "nie można odczytać obiektu %s „%s”"
-#: merge-recursive.c:954
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "oczekiwano blobu w %s „%s”"
-#: merge-recursive.c:979
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "nie można otworzyć „%s”: %s"
-#: merge-recursive.c:990
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "nie można dowiązać „%s”: „%s”"
-#: merge-recursive.c:995
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "nie wiem, co zrobić z %06o %s „%s”"
-#: merge-recursive.c:1213 merge-recursive.c:1225
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Przewinięcie pod-modułu %s do następującego zapisu:"
+msgstr "Przewinięcie podmodułu %s do następującego zapisu:"
-#: merge-recursive.c:1216 merge-recursive.c:1228
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
-msgstr "Przewinięcie pod-modułu %s"
+msgstr "Przewinięcie podmodułu %s"
-#: merge-recursive.c:1251
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr "Nie można scalić pod-modułu %s (nie znaleziono scalenia po zapisie)"
+msgstr "Nie można scalić podmodułu %s (nie znaleziono scalenia po zapisie)"
-#: merge-recursive.c:1255
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Nie można scalić pod-modułu %s (nie przewija się)"
+msgstr "Nie można scalić podmodułu %s (nie przewija się)"
-#: merge-recursive.c:1256
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
-msgstr "Znaleziono możliwe rozwiązanie scalenia dla pod-modułu:\n"
+msgstr "Znaleziono możliwe rozwiązanie scalenia dla podmodułu:\n"
-#: merge-recursive.c:1268
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "Nie można scalić pod-modułu %s (znaleziono wiele scaleń)"
+msgstr "Nie można scalić podmodułu %s (znaleziono wiele scaleń)"
-#: merge-recursive.c:1402
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Błąd: Odmawiam utraty nieśledzonego pliku w %s; zamiast tego zapisywanie do "
"%s."
-#: merge-recursive.c:1474
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5017,7 +5198,7 @@
"KONFLIKT (%s/usunięcie): %s usunięto w %s a %s w %s. Wersja %s pliku %s "
"pozostaje w drzewie."
-#: merge-recursive.c:1479
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5026,7 +5207,7 @@
"KONFLIKT (%s/usunięcie): %s usunięto w %s a %s do %s w %s. Wersja %s pliku "
"%s pozostaje w drzewie."
-#: merge-recursive.c:1486
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5035,7 +5216,7 @@
"KONFLIKT (%s/usunięcie): %s usunięto w %s a %s w %s. Wersja %s pliku %s "
"pozostaje w drzewie na %s."
-#: merge-recursive.c:1491
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5044,42 +5225,42 @@
"KONFLIKT (%s/usunięcie): %s usunięto w %s a %s do %s w %s. Wersja %s pliku "
"%s pozostaje w drzewie na %s."
-#: merge-recursive.c:1526
+#: merge-recursive.c:1558
msgid "rename"
msgstr "zmiana nazwy"
-#: merge-recursive.c:1526
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "zmieniono nazwę"
-#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Odmawiam utraty brudnego pliku w %s"
-#: merge-recursive.c:1587
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "Odmawiam utraty nieśledzonego pliku w %s, mimo że nie zawadza."
-#: merge-recursive.c:1645
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"KONFLIKT (zmiana nazwy/dodanie): Zmiana nazwy %s->%s w %s. Dodano %s w %s"
-#: merge-recursive.c:1676
+#: merge-recursive.c:1708
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s jest katalogiem w %s dodawanie zamiast tego jako %s"
-#: merge-recursive.c:1681
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Odmawiam utraty nieśledzonego pliku w %s; dodawanie zamiast tego jako %s"
-#: merge-recursive.c:1708
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5088,18 +5269,18 @@
"KONFLIKT (zmiana nazwy/zmiana nazwy): Zmiana nazwy „%s”->„%s” w gałęzi „%s” "
"zmiana nazwy „%s”->„%s” w „%s”%s"
-#: merge-recursive.c:1713
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " (nierozwiązane)"
-#: merge-recursive.c:1805
+#: merge-recursive.c:1837
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (zmiana nazwy/zmiana nazwy): Zmiana nazwy %s->%s w %s. Zmiana nazwy "
"%s->%s w %s"
-#: merge-recursive.c:2068
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5110,7 +5291,7 @@
"%s, bo nazwa katalogu %s została zmieniona na wiele innych katalogów, a "
"żaden z celów nie dostał większości plików."
-#: merge-recursive.c:2202
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5119,72 +5300,62 @@
"KONFLIKT (zmiana nazwy/zmiana nazwy): Zmiana nazwy katalogu %s->%s w %s. "
"Zmiana nazwy katalogu %s->%s w %s"
-#: merge-recursive.c:2973
-#, c-format
-msgid "cannot read object %s"
-msgstr "nie można odczytać obiektu %s"
-
-#: merge-recursive.c:2976
-#, c-format
-msgid "object %s is not a blob"
-msgstr "obiekt %s nie jest blobem"
-
-#: merge-recursive.c:3040
+#: merge-recursive.c:3089
msgid "modify"
msgstr "zmiana"
-#: merge-recursive.c:3040
+#: merge-recursive.c:3089
msgid "modified"
msgstr "zmieniono"
-#: merge-recursive.c:3079
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Pominięto %s (scalono tak samo jak istniejące)"
-#: merge-recursive.c:3132
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "Dodawanie zamiast tego jako %s"
-#: merge-recursive.c:3339
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "Usuwanie %s"
-#: merge-recursive.c:3362
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "plik/katalog"
-#: merge-recursive.c:3367
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "katalog/plik"
-#: merge-recursive.c:3374
+#: merge-recursive.c:3420
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "KONFLIKT (%s): Jest już katalog o nazwie %s w %s. Dodawanie %s jako %s"
-#: merge-recursive.c:3383
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "Dodawanie %s"
-#: merge-recursive.c:3392
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "KONFLIKT (dodanie/dodanie): Konflikt scalania w %s"
-#: merge-recursive.c:3445
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "nie można scalić drzew %s i %s"
-#: merge-recursive.c:3539
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "Scalanie:"
-#: merge-recursive.c:3552
+#: merge-recursive.c:3598
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
@@ -5192,17 +5363,17 @@
msgstr[1] "znaleziono %u wspólnych przodków:"
msgstr[2] "znaleziono %u wspólnych przodków:"
-#: merge-recursive.c:3602
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "scalenie nie zwróciło żadnych zapisów"
-#: merge-recursive.c:3758
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "Nie można przetworzyć obiektu „%s”"
-#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
-#: builtin/stash.c:471
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Nie można zapisać indeksu."
@@ -5210,189 +5381,240 @@
msgid "failed to read the cache"
msgstr "nie można odczytać pamięci podręcznej"
-#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
-#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
-#: builtin/stash.c:265
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "nie można zapisać nowego pliku indeksu"
-#: midx.c:80
+#: midx.c:78
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "fanout OID indeksu wielu paczek ma nieprawidłowy rozmiar"
+
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "plik indeksu wielu paczek %s jest za mały"
-#: midx.c:96
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "podpis indeksu wielu paczek 0x%08x nie zgadza się z podpisem 0x%08x"
-#: midx.c:101
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "nie rozpoznano wersji %d indeksu wielu paczek"
-#: midx.c:106
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "wersja skrótu indeksu wielu paczek %u nie zgadza się z wersją %u"
-#: midx.c:123
-msgid "invalid chunk offset (too large)"
-msgstr "nieprawidłowe przesunięcie kawałka (za duże)"
-
-#: midx.c:147
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr "kończący identyfikator indeksu wielu paczek występuje przedwcześnie"
-
-#: midx.c:160
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
"w indeksie wielu paczek brakuje wymaganego kawałka nazwy paczki (pack-name)"
-#: midx.c:162
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "w indeksie wielu paczek brakuje wymaganego kawałka fanout OID"
-#: midx.c:164
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "w indeksie wielu paczek brakuje wymaganego kawałka odnajdywania OID"
-#: midx.c:166
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "w indeksie wielu paczek brakuje wymaganego kawałka przesunięć obiektów"
-#: midx.c:180
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "nazwy paczek indeksu wielu paczek poza kolejnością: „%s” przed „%s”"
-#: midx.c:223
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "złe pack-int-id: %u (razem %u paczek)"
-#: midx.c:273
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"indeks wielu paczek przechowuje 64-bitowe przesunięcie, ale off_t jest za "
"małe"
-#: midx.c:480
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "nie można dodać pliku paczki „%s”"
-#: midx.c:486
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "nie można otworzyć indeksu paczki „%s”"
-#: midx.c:546
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "nie można odnaleźć obiektu %d w pliku paczki"
-#: midx.c:846
+#: midx.c:892
+msgid "cannot store reverse index file"
+msgstr "nie można zapisać pliku odwrotnego indeksu"
+
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "nie można przetworzyć wiersza: %s"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "uszkodzony wiersz: %s"
+
+#: midx.c:1159
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "pomijanie istniejącego multi-pack-index; niezgodność sum kontrolnych"
+
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "nie można załadować paczki"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "nie można otworzyć indeksu dla %s"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "Dodawanie plików paczek do indeksu wielu paczek"
-#: midx.c:879
+#: midx.c:1244
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "nieznana paczka preferowana: %s"
+
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "nie można wybierać preferowanej paczki %s bez obiektów"
+
+#: midx.c:1321
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "nie widać pliku paczki %s do porzucenia"
-#: midx.c:931
+#: midx.c:1367
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "paczka preferowana „%s” wygasła"
+
+#: midx.c:1380
msgid "no pack files to index."
msgstr "brak plików paczek do zaindeksowania."
-#: midx.c:982
-msgid "Writing chunks to multi-pack-index"
-msgstr "Zapisywanie kawałków do indeksu wielu paczek"
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "nie można zapisać bitmapy wielu paczek"
-#: midx.c:1060
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "nie można zapisać indeksu wielu paczek"
+
+#: midx.c:1486 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "nie można usunąć %s"
+
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "nie można wyczyścić indeksu wielu paczek w %s"
-#: midx.c:1116
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr "plik indeksu wielu paczek istnieje, ale nie udało się go przetworzyć"
-#: midx.c:1124
+#: midx.c:1585
+msgid "incorrect checksum"
+msgstr "nieprawidłowa suma kontrolna"
+
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "Szukanie wskazywanych plików paczek"
-#: midx.c:1139
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"fanout oid poza kolejnością: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1144
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "midx nie zawiera oid"
-#: midx.c:1153
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr "Weryfikowanie zamówienia OID w indeksie wielu paczek"
-#: midx.c:1162
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "odnajdywanie oid poza kolejnością: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1182
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "Sortowanie obiektów według plików paczek"
-#: midx.c:1189
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "Weryfikowanie przesunięć obiektów"
-#: midx.c:1205
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "nie można wczytać elementu paczki w oid[%d] = %s"
-#: midx.c:1211
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "nie można wczytać indeksu paczki z pliku paczki %s"
-#: midx.c:1220
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
"nieprawidłowe przesunięcie obiektu w oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1245
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "Zliczanie osiągalnych obiektów"
-#: midx.c:1255
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr "Znajdywanie i usuwanie niewskazywanych plików paczek"
-#: midx.c:1446
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "nie można uruchomić pack-objects"
-#: midx.c:1466
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "nie można zakończyć pack-objects"
-#: name-hash.c:538
+#: name-hash.c:542
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "nie można utworzyć wątku lazy_dir: %s"
-#: name-hash.c:560
+#: name-hash.c:564
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "nie można utworzyć wątku lazy_name: %s"
-#: name-hash.c:566
+#: name-hash.c:570
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "nie można dołączyć do wątku lazy_name: %s"
@@ -5436,274 +5658,275 @@
msgid "Bad %s value: '%s'"
msgstr "Zła wartość %s: „%s”"
-#: object-file.c:480
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "katalog obiektów %s nie istnieje; sprawdź .git/objects/info/alternates"
-#: object-file.c:531
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "nie można znormalizować ścieżki alternatywnego obiektu: %s"
-#: object-file.c:603
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
"%s: ignorowanie alternatywnych magazynów obiektów, zagnieżdżenie za głębokie"
-#: object-file.c:610
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "nie można znormalizować katalogu obiektu: %s"
-#: object-file.c:653
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "nie można wykonać fdopen na pliku blokady alternatywnych obiektów"
-#: object-file.c:671
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "nie można odczytać pliku alternatywnych obiektów"
-#: object-file.c:678
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "nie można przenieść na miejsce nowego pliku alternatywnych obiektów"
-#: object-file.c:713
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "ścieżka „%s” nie istnieje"
-#: object-file.c:734
+#: object-file.c:722
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"repozytorium odniesienia „%s” jako łączone wybranie nie jest jeszcze "
"wspierane."
-#: object-file.c:740
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "repozytorium odniesienia „%s” nie jest lokalnym repozytorium."
-#: object-file.c:746
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "repozytorium odniesienia „%s” jest płytkie"
-#: object-file.c:754
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "repozytorium odniesienia „%s” jest szczepione"
-#: object-file.c:814
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "nie znaleziono katalogu obiektów pasującego do „%s”"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "błędny wiersz przy przetwarzaniu alternatywnych referencji: %s"
-#: object-file.c:964
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "próba mmap %<PRIuMAX> ponad ograniczeniem %<PRIuMAX>"
-#: object-file.c:985
-msgid "mmap failed"
-msgstr "mmap nie powiodło się"
+#: object-file.c:1008
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap nie powiodło się%s"
-#: object-file.c:1149
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "plik obiektu %s jest pusty"
-#: object-file.c:1284 object-file.c:2477
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "uszkodzony wolny obiekt „%s”"
-#: object-file.c:1286 object-file.c:2481
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "śmieci na końcu wolnego obiektu „%s”"
-#: object-file.c:1328
-msgid "invalid object type"
-msgstr "zły rodzaj obiektu"
-
-#: object-file.c:1412
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "nie można rozpakować nagłówka %s z --allow-unknown-type"
-
-#: object-file.c:1415
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "nie można rozpakować nagłówka %s"
-
-#: object-file.c:1421
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "nie można przetworzyć nagłówka %s z --allow-unknown-type"
-
-#: object-file.c:1424
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "nie można przetworzyć nagłówka %s"
-#: object-file.c:1651
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "zły rodzaj obiektu"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "nie można rozpakować nagłówka %s"
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "nagłówek %s za długi, przekracza %d bajtów"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "nie można odczytać obiektu %s"
-#: object-file.c:1655
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "nie znaleziono zastępstwa %s dla %s"
-#: object-file.c:1659
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "wolny obiekt %s (przechowywany w %s) jest uszkodzony"
-#: object-file.c:1663
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "spakowany obiekt %s (przechowywany w %s) jest uszkodzony"
-#: object-file.c:1768
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "nie można zapisać pliku %s"
-#: object-file.c:1775
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "nie można ustawić uprawnień na „%s”"
-#: object-file.c:1782
+#: object-file.c:1795
msgid "file write error"
msgstr "błąd zapisu pliku"
-#: object-file.c:1802
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "błąd podczas zamykania pliku wolnego obiektu"
-#: object-file.c:1867
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"niewystarczające uprawnienia, aby dodać obiekt do bazy danych repozytorium %s"
-#: object-file.c:1869
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "nie można utworzyć tymczasowego pliku"
-#: object-file.c:1893
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "nie można zapisać pliku wolnego obiektu"
-#: object-file.c:1899
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "nie można skompresować nowego obiektu %s (%d)"
-#: object-file.c:1903
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd w obiekcie %s nie powiodło się (%d)"
-#: object-file.c:1907
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "zamieszanie przez dane źródłowe niestabilnego obiektu dla %s"
-#: object-file.c:1917 builtin/pack-objects.c:1097
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "nie można wykonać utime() na %s"
-#: object-file.c:1994
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "nie można odczytać obiektu do %s"
-#: object-file.c:2045
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "uszkodzony zapis"
-#: object-file.c:2053
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "uszkodzony tag"
-#: object-file.c:2153
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "błąd odczytu podczas indeksowania %s"
-#: object-file.c:2156
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "przeczytano mniej niż oczekiwano przy indeksowaniu %s"
-#: object-file.c:2229 object-file.c:2239
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: nie można wstawić do bazy danych"
-#: object-file.c:2245
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: niewspierany typ pliku"
-#: object-file.c:2269
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "%s nie jest prawidłowym obiektem"
-#: object-file.c:2271
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s nie jest prawidłowym obiektem „%s”"
-#: object-file.c:2298 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "nie można otworzyć %s"
-#: object-file.c:2488 object-file.c:2541
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "niezgodne skróty %s (oczekiwano %s)"
-#: object-file.c:2512
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "nie można wykonać mmap %s"
-#: object-file.c:2517
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "nie można rozpakować nagłówka %s"
-#: object-file.c:2523
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "nie można przetworzyć nagłówka %s"
-#: object-file.c:2534
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "nie można rozpakować zawartości %s"
-#: object-name.c:486
+#: object-name.c:480
#, c-format
msgid "short object ID %s is ambiguous"
msgstr "krótki identyfikator %s jest niejednoznaczny"
-#: object-name.c:497
+#: object-name.c:491
msgid "The candidates are:"
msgstr "Kandydaci to:"
-#: object-name.c:796
+#: object-name.c:790
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5727,22 +5950,22 @@
"Sprawdź te referencje i może je usuń. Wyłącz ten komunikat za pomocą\n"
"„git config advice.objectNameWarning false”"
-#: object-name.c:916
+#: object-name.c:910
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "dziennik „%.*s” sięga tylko %s"
-#: object-name.c:924
+#: object-name.c:918
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "dziennik „%.*s” ma tylko %d wpisów"
-#: object-name.c:1702
+#: object-name.c:1696
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "ścieżka „%s” istnieje na dysku, ale nie w „%.*s”"
-#: object-name.c:1708
+#: object-name.c:1702
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
@@ -5751,12 +5974,12 @@
"ścieżka „%s” istnieje, ale nie „%s”\n"
"wskazówka: Czy chodziło o „%.*s:%s” czyli „%.*s:./%s”?"
-#: object-name.c:1717
+#: object-name.c:1711
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "ścieżka „%s” nie istnieje w „%.*s”"
-#: object-name.c:1745
+#: object-name.c:1739
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
@@ -5765,7 +5988,7 @@
"ścieżka „%s” jest w indeksie, ale nie na etapie %d\n"
"wskazówka: Czy chodziło o „:%d:%s”?"
-#: object-name.c:1761
+#: object-name.c:1755
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
@@ -5774,21 +5997,21 @@
"ścieżka „%s” jest w indeksie, ale nie „%s”\n"
"wskazówka: Czy chodziło o „:%d:%s” czyli „:%d:./%s”?"
-#: object-name.c:1769
+#: object-name.c:1763
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "ścieżka „%s” istnieje na dysku, ale nie w indeksie"
-#: object-name.c:1771
+#: object-name.c:1765
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "ścieżka „%s” nie istnieje (ani na dysku, ani w indeksie)"
-#: object-name.c:1784
+#: object-name.c:1778
msgid "relative path syntax can't be used outside working tree"
-msgstr "składnia ścieżki względnej nie może być użyta poza drzewem roboczym"
+msgstr "składni ścieżki względnej nie można użyć poza drzewem roboczym"
-#: object-name.c:1922
+#: object-name.c:1916
#, c-format
msgid "invalid object name '%.*s'."
msgstr "nieprawidłowa nazwa obiektu: „%.*s”."
@@ -5803,91 +6026,109 @@
msgid "object %s is a %s, not a %s"
msgstr "obiekt %s to %s, nie %s"
-#: object.c:233
+#: object.c:250
#, c-format
msgid "object %s has unknown type id %d"
msgstr "obiekt %s ma nieznany identyfikator rodzaju %d"
-#: object.c:246
+#: object.c:263
#, c-format
msgid "unable to parse object: %s"
msgstr "nie można przetworzyć obiektu: %s"
-#: object.c:266 object.c:278
+#: object.c:283 object.c:295
#, c-format
msgid "hash mismatch %s"
msgstr "niezgodne skróty %s"
-#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "w bitmapie wielu paczek brakuje wymaganego odwrotnego indeksu"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: nie można otworzyć paczki"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "nie można uzyskać rozmiaru %s"
-#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "nie znaleziono %s w paczce %s na pozycji %<PRIuMAX>"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "nie można uzyskać użycia dysku %s"
-#: pack-revindex.c:220
+#: pack-revindex.c:221
#, c-format
msgid "reverse-index file %s is too small"
msgstr "plik odwrotnego indeksu %s jest za mały"
-#: pack-revindex.c:225
+#: pack-revindex.c:226
#, c-format
msgid "reverse-index file %s is corrupt"
msgstr "plik odwrotnego indeksu %s jest uszkodzony"
-#: pack-revindex.c:233
+#: pack-revindex.c:234
#, c-format
msgid "reverse-index file %s has unknown signature"
msgstr "plik odwrotnego indeksu %s ma nieznaną sygnaturę"
-#: pack-revindex.c:237
+#: pack-revindex.c:238
#, c-format
msgid "reverse-index file %s has unsupported version %<PRIu32>"
msgstr "plik odwrotnego indeksu %s ma niewspieraną wersję %<PRIu32>"
-#: pack-revindex.c:242
+#: pack-revindex.c:243
#, c-format
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr ""
"plik odwrotnego indeksu %s ma niewspierany identyfikator skrótu %<PRIu32>"
-#: pack-write.c:236
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "nie można i zapisać, i sprawdzić odwrotnego indeksu"
-#: pack-write.c:257
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "nie można wykonać stat: %s"
-#: pack-write.c:269
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "nie można dodać praw do odczytu %s"
-#: pack-write.c:502
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "nie można pisać do obiecującego pliku „%s”"
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr "pozycja przed końcem pliku paczki (zepsuty .idx?)"
-#: packfile.c:1934
+#: packfile.c:656
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "nie można wykonać mapowania pliku paczki %s%s"
+
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "pozycja przed początkiem indeksu paczki dla %s (uszkodzony indeks?)"
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "pozycja za końcem indeksu paczki dla %s (ucięty indeks?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "opcja „%s” oczekuje wartości liczbowej"
@@ -5907,72 +6148,72 @@
msgid "malformed object name '%s'"
msgstr "nieprawidłowa nazwa obiektu „%s”"
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s wymaga wartości"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s i %s się wykluczają"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s : wyklucza się z czymś innym"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s nie przyjmuje wartości"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s niedostępny"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
"%s oczekuje nieujemnej wartości całkowitej z nieobowiązkowym sufiksem k/m/g"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "niejednoznaczna opcja: %s (może być --%s%s or --%s%s)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "czy chodziło o „--%s” (z dwoma myślnikami)?"
-#: parse-options.c:666 parse-options.c:971
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "synonim do --%s"
-#: parse-options.c:862
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "nieznana opcja „%s”"
-#: parse-options.c:864
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "nieznany przełącznik „%c”"
-#: parse-options.c:866
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "nieznana opcja spoza zakresu ASCII w łańcuchu: „%s”"
-#: parse-options.c:890
+#: parse-options.c:919
msgid "..."
msgstr "..."
-#: parse-options.c:909
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "użycie: %s"
@@ -5980,47 +6221,71 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:915
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " lub: %s"
-#: parse-options.c:918
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:957
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-ILE"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "Nie można pozwolić grupie zapisywać do %s"
-#: pathspec.c:130
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Znak ucieczki „\\” niedozwolony jako ostatni znak w wartości atrybutu"
-#: pathspec.c:148
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Wolno użyć tylko jednego „attr:”."
-#: pathspec.c:151
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "atrybut nie może być pusty"
-#: pathspec.c:194
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "błędna nazwa atrybutu %s"
-#: pathspec.c:259
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "globalne ustawienia ścieżek „glob” i „noglob” się wykluczają"
-#: pathspec.c:266
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6028,51 +6293,51 @@
"globalne ustawienia ścieżek „literal” i wszystkie inne globalne wykluczają "
"się"
-#: pathspec.c:306
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "nieprawidłowy parametr magicznej ścieżki „prefix:”"
-#: pathspec.c:327
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Nieprawidłowy magiczny numer ścieżki „%.*s” w „%s”"
-#: pathspec.c:332
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Brakujący „)” pod koniec magicznej ścieżki w „%s”"
-#: pathspec.c:370
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Niezaimplementowany magiczny numer ścieżki „%c” w „%s”"
-#: pathspec.c:429
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: „literal” i „glob” się wykluczają"
-#: pathspec.c:445
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: „%s” jest poza repozytorium w „%s”"
-#: pathspec.c:521
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (skrót: '%c')"
-#: pathspec.c:531
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: magiczna ścieżka niewspierana przez to polecenie: %s"
-#: pathspec.c:598
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "ścieżka „%s” przechodzi przez dowiązanie"
-#: pathspec.c:643
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "wiersz jest źle zacytowany: %s"
@@ -6086,14 +6351,14 @@
msgstr "nie można zapisać pakietu oddzielającego"
#: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "nie można zapisać bezstanowego pakietu separatora"
+msgid "unable to write response end packet"
+msgstr "nie można zapisać pakietu końca odpowiedzi"
#: pkt-line.c:113
msgid "flush packet write failed"
msgstr "nie można zapisać pakietu wypróżnienia"
-#: pkt-line.c:153 pkt-line.c:239
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "błąd protokołu: niemożliwie długi wiersz"
@@ -6101,88 +6366,93 @@
msgid "packet write with format failed"
msgstr "nie można zapisać pakietu z formatem"
-#: pkt-line.c:203
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"zapis pakietu nie powiódł się — dane przekraczają maksymalny rozmiar pakietu"
-#: pkt-line.c:210 pkt-line.c:217
-msgid "packet write failed"
-msgstr "nie można zapisać pakietu"
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "nie można zapisać pakietu: %s"
-#: pkt-line.c:302
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "błąd odczytu"
-#: pkt-line.c:310
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "zdalna maszyna nieoczekiwanie się rozłączyła"
-#: pkt-line.c:338
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "błąd protokołu: zły znak długości wiersza: %.4s"
-#: pkt-line.c:352 pkt-line.c:357
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "błąd protokołu: zła długość wiersza %d"
-#: pkt-line.c:373 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "błąd serwera: %s"
-#: preload-index.c:119
+#: preload-index.c:125
msgid "Refreshing index"
msgstr "Odświeżanie indeksu"
-#: preload-index.c:138
+#: preload-index.c:144
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "nie można utworzyć wątkowanego lstat: %s"
-#: pretty.c:984
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "nie można przetworzyć formatu --pretty"
-#: promisor-remote.c:30
+#: promisor-remote.c:31
msgid "promisor-remote: unable to fork off fetch subprocess"
msgstr "promisor-remote: nie można oddzielić pod-procesu pobierania"
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
msgid "promisor-remote: could not write to fetch subprocess"
msgstr "promisor-remote: nie można zapisać do pod-procesu pobierania"
-#: promisor-remote.c:41
+#: promisor-remote.c:44
msgid "promisor-remote: could not close stdin to fetch subprocess"
msgstr ""
"promisor-remote: nie można zamknąć standardowego wejścia do pod-procesu "
"pobierania"
-#: promisor-remote.c:53
+#: promisor-remote.c:54
#, c-format
msgid "promisor remote name cannot begin with '/': %s"
msgstr "obiecująca zdalna nazwa nie może zaczynać się od „/”: %s"
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: oczekiwano wypróżnienia po argumentach"
+
#: prune-packed.c:35
msgid "Removing duplicate objects"
msgstr "Usuwanie zduplikowanych obiektów"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "nie można uruchomić „log”"
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr "nie można odczytać wyjścia „log”"
-#: range-diff.c:101 sequencer.c:5318
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr "nie można przetworzyć zapisu „%s”"
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6191,68 +6461,68 @@
"nie można przetworzyć pierwszego wiersza wyjścia „log”: nie zaczynał się od "
"„zapis”: „%s”"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "nie można przetworzyć nagłówka gita „%.*s”"
-#: range-diff.c:306
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "nie można wygenerować różnic"
-#: range-diff.c:558
+#: range-diff.c:559
msgid "--left-only and --right-only are mutually exclusive"
msgstr "--left-only i --right-only się wykluczają"
-#: range-diff.c:561 range-diff.c:563
+#: range-diff.c:562 range-diff.c:564
#, c-format
msgid "could not parse log for '%s'"
msgstr "nie można przetworzyć dziennika do „%s”"
-#: read-cache.c:682
+#: read-cache.c:710
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "nie dodam skrótu pliku „%s” („%s” już widnieje w indeksie)"
-#: read-cache.c:698
+#: read-cache.c:726
msgid "cannot create an empty blob in the object database"
msgstr "nie można utworzyć pustego blobu w bazie danych obiektów"
-#: read-cache.c:720
+#: read-cache.c:748
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr "%s: można dodać tylko zwykłe pliki, dowiązania i katalogi gita"
-#: read-cache.c:725
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "„%s” nie ma wybranego zapisu"
-#: read-cache.c:777
+#: read-cache.c:805
#, c-format
msgid "unable to index file '%s'"
msgstr "nie można zaindeksować pliku „%s”"
-#: read-cache.c:796
+#: read-cache.c:824
#, c-format
msgid "unable to add '%s' to index"
msgstr "nie można dodać „%s” do indeksu"
-#: read-cache.c:807
+#: read-cache.c:835
#, c-format
msgid "unable to stat '%s'"
msgstr "nie można wykonać stat na „%s”"
-#: read-cache.c:1318
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "„%s” widnieje jako i plik, i katalog"
-#: read-cache.c:1524
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "Odśwież indeks"
-#: read-cache.c:1639
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6261,7 +6531,7 @@
"ustawiono index.version, ale wartość jest nieprawidłowa.\n"
"Używanie wersji %i"
-#: read-cache.c:1649
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6270,139 +6540,143 @@
"ustawiono GIT_INDEX_VERSION, ale wartość jest nieprawidłowa.\n"
"Używanie wersji %i"
-#: read-cache.c:1705
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "zły podpis 0x%08x"
-#: read-cache.c:1708
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "zła wersja indeksu %d"
-#: read-cache.c:1717
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "zły skrót SHA-1 pliku indeksu"
-#: read-cache.c:1747
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "indeks używa rozszerzenia %.4s, którego nie rozumiemy"
-#: read-cache.c:1749
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr "pomijanie rozszerzenia %.4s"
-#: read-cache.c:1786
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "nieznany format elementu indeksu 0x%08x"
-#: read-cache.c:1802
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "nieprawidłowe pole nazwy w indeksie, blisko ścieżki „%s”"
-#: read-cache.c:1859
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "nieuporządkowane elementy przygotowane w indeksie"
-#: read-cache.c:1862
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "wiele elementów w przygotowaniu dla scalonego pliku „%s”"
-#: read-cache.c:1865
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "nieuporządkowane elementy przygotowane w „%s”"
-#: read-cache.c:1971 read-cache.c:2262 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
-#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
-#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
-#: builtin/submodule--helper.c:332
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "uszkodzony plik indeksu"
-#: read-cache.c:2115
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "nie można utworzyć wątku load_cache_entries: %s"
-#: read-cache.c:2128
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "nie można dołączyć do wątku load_cache_entries: %s"
-#: read-cache.c:2161
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s: nie można otworzyć pliku indeksu"
-#: read-cache.c:2165
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: nie można wykonać stat na otwartym indeksie"
-#: read-cache.c:2169
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: plik indeksu mniejszy niż oczekiwano"
-#: read-cache.c:2173
+#: read-cache.c:2267
#, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: nie można wykonać mapowania pliku indeksu"
+msgid "%s: unable to map index file%s"
+msgstr "%s: nie można wykonać mapowania pliku indeksu%s"
-#: read-cache.c:2215
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "nie można utworzyć wątku load_index_extensions: %s"
-#: read-cache.c:2242
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "nie można złączyć wątku load_index_extensions: %s"
-#: read-cache.c:2274
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "nie można odświeżyć wspólnego indeksu „%s”"
-#: read-cache.c:2321
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "zepsuty indeks, oczekiwano %s w %s, otrzymano %s"
-#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "nie można zamknąć „%s”"
-#: read-cache.c:3120 sequencer.c:2487 sequencer.c:4239
+#: read-cache.c:3108
+msgid "failed to convert to a sparse-index"
+msgstr "nie można przekształcić w rzadki indeks"
+
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "nie można wykonać stat na „%s”"
-#: read-cache.c:3133
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "nie można otworzyć katalogu gita: %s"
-#: read-cache.c:3145
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "nie można wykonać unlink: „%s”"
-#: read-cache.c:3170
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "nie można naprawić bitów uprawnień w „%s”"
-#: read-cache.c:3319
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: nie można zrzucić do etapu nr 0"
@@ -6431,7 +6705,10 @@
"r, reword <commit> = use commit, but edit the commit message\n"
"e, edit <commit> = use commit, but stop for amending\n"
"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n"
+" commit's log message, unless -C is used, in which case\n"
+" keep only this commit's message; -c is same as -C but\n"
+" opens the editor\n"
"x, exec <command> = run command (the rest of the line) using shell\n"
"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
"d, drop <commit> = remove commit\n"
@@ -6440,7 +6717,7 @@
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
". create a merge commit using the original merge commit's\n"
". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
+". specified); use -c <commit> to reword the commit message\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
@@ -6450,7 +6727,11 @@
"r, reword <zapis> = użyj zapisu, ale przeredaguj jego komunikat\n"
"e, edit <zapis> = użyj zapisu, ale zatrzymaj się, żeby go poprawić\n"
"s, squash <zapis> = użyj zapisu, ale połącz go z poprzednim (spłaszcz)\n"
-"f, fixup <zapis> = jak „squash”, ale odrzuć komunikat tego zapisu\n"
+"f, fixup [-C | -c] <zapis> = jak „squash”, ale odrzuć komunikat tego "
+"zapisu,\n"
+" chyba że użyto -C, wtedy zachowaj tylko komunikat tego "
+"zapisu;\n"
+" -c jest jak -C ale otwiera edytor\n"
"x, exec <polecenie> = wykonaj polecenie (resztę wiersza) w powłoce\n"
"b, break = zatrzymaj się tu (kontynuuj przestawianie przez „git rebase --"
"continue”)\n"
@@ -6458,12 +6739,14 @@
"l, label <etykietka> = nazwij bieżące HEAD\n"
"t, reset <etykietka> = zresetuj HEAD do etykietki\n"
"m, merge [-C <zapis> | -c <zapis>] <etykietka> [# <wiersz>]\n"
-". utwórz zapis scalenia używając pierwotnego komunikatu scalenia\n"
-". (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia.\n"
-". Użyj -c <zapis>, aby przeredagować komunikat zapisu.\n"
+". utwórz zapis scalenia używając pierwotnego komunikatu <zapisu> "
+"scalenia\n"
+". (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia);\n"
+". użyj -c <zapis>, aby przeredagować komunikat zapisu\n"
+"\n"
"Kolejność wierszy może być zmieniona; są wykonywane z góry na dół.\n"
-#: rebase-interactive.c:63
+#: rebase-interactive.c:66
#, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
@@ -6471,7 +6754,7 @@
msgstr[1] "Przestawianie %s na %s (%d polecenia)"
msgstr[2] "Przestawianie %s na %s (%d poleceń)"
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6479,7 +6762,7 @@
"\n"
"Nie usuwaj żadnego wiersza. Użyj jawnie „drop”, żeby usunąć wpis.\n"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6487,7 +6770,7 @@
"\n"
"Jeśli usuniesz tutaj wiersz, TEN ZAPIS BĘDZIE STRACONY.\n"
-#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6501,7 +6784,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6511,19 +6794,19 @@
"Jeśli jednak usuniesz wszystko, przestawianie zostanie przerwane.\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
-#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "nie można pisać do „%s”"
-#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
-#: builtin/rebase.c:254
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "nie można pisać do „%s”."
-#: rebase-interactive.c:193
+#: rebase-interactive.c:196
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
@@ -6532,7 +6815,7 @@
"Ostrzeżenie: niektóre zapisy mogły zostać omyłkowo porzucone.\n"
"Porzucone zapisy (od najnowszych do najstarszych):\n"
-#: rebase-interactive.c:200
+#: rebase-interactive.c:203
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -6548,14 +6831,12 @@
"Możliwe zachowania to: ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
-#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
-#: builtin/rebase.c:266
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "nie można odczytać „%s”."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: „preserve” zostało uogólnione do „merges”"
-#: ref-filter.c:42 wt-status.c:1975
+#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
msgstr "nie ma"
@@ -6574,127 +6855,142 @@
msgid "ahead %d, behind %d"
msgstr "do przodu %d, w tyle %d"
-#: ref-filter.c:169
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "oczekiwany format: %%(color:<kolor>)"
-#: ref-filter.c:171
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
-msgstr "nierozpoznany kolor: %%(kolor:%s)"
+msgstr "nierozpoznany kolor: %%(color:%s)"
-#: ref-filter.c:193
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Oczekiwano wartości całkowitej refname:lstrip=%s"
-#: ref-filter.c:197
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Oczekiwano wartości całkowitej refname:rstrip=%s"
-#: ref-filter.c:199
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "nierozpoznany argument %%(%s): %s"
-#: ref-filter.c:254
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) nie przyjmuje argumentów"
-#: ref-filter.c:276
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "nierozpoznany argument %%(objectsize): %s"
-#: ref-filter.c:284
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) nie przyjmuje argumentów"
-#: ref-filter.c:296
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) nie przyjmuje argumentów"
-#: ref-filter.c:309
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "nierozpoznany argument %%(subject): %s"
-#: ref-filter.c:330
+#: ref-filter.c:396
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "oczekiwano %%(trailers:key=<wartość>)"
+
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "nieznany argument %%(trailers): %s"
-#: ref-filter.c:363
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "oczekiwano wartości dodatniej contents:lines=%s"
-#: ref-filter.c:365
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "nierozpoznany argument %%(contents): %s"
-#: ref-filter.c:380
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "nierozpoznany argument %%(raw): %s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "oczekiwano wartości dodatniej „%s” w %%(%s)"
-#: ref-filter.c:384
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "nierozpoznany argument „%s” w %%(%s)"
-#: ref-filter.c:398
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "nierozpoznawana opcja e-mail: %s"
-#: ref-filter.c:428
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "oczekiwany format: %%(align:<szerokość>,<pozycja>)"
-#: ref-filter.c:440
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "nierozpoznawana pozycja:%s"
-#: ref-filter.c:447
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "nierozpoznawana szerokość:%s"
-#: ref-filter.c:456
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "nierozpoznany argument %%(align): %s"
-#: ref-filter.c:464
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "oczekiwano dodatniej szerokości z atomem %%(align)"
-#: ref-filter.c:482
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "nierozpoznany argument %%(if): %s"
-#: ref-filter.c:584
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) nie przyjmuje argumentów"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "nieprawidłowa nazwa pola %.*s"
-#: ref-filter.c:611
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "nieznana nazwa pola: %.*s"
-#: ref-filter.c:615
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
@@ -6702,126 +6998,136 @@
"to nie jest repozytorium gita, ale pole „%.*s” wymaga dostępu do danych "
"obiektów"
-#: ref-filter.c:739
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: atom %%(if) użyty bez atomu %%(then)"
-#: ref-filter.c:802
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: atom %%(then) użyty bez atomu %%(if)"
-#: ref-filter.c:804
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: atom %%(then) użyty więcej niż raz"
-#: ref-filter.c:806
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atom %%(then) użyty po %%(else)"
-#: ref-filter.c:834
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: atom %%(else) użyty bez atomu %%(if)"
-#: ref-filter.c:836
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: atom %%(else) użyty bez atomu %%(then)"
-#: ref-filter.c:838
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: atom %%(else) użyty więcej niż raz"
-#: ref-filter.c:853
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: atom %%(end) użyty bez odpowiadającego atomu"
-#: ref-filter.c:910
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "nieprawidłowy format %s"
-#: ref-filter.c:1551
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "to polecenie odrzuca atom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s, --python, --shell i --tcl się wykluczają"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(brak gałęzi, przestawianie %s)"
-#: ref-filter.c:1554
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(brak gałęzi, przestawianie odłączonego HEAD %s)"
-#: ref-filter.c:1557
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(brak gałęzi, przeszukiwanie rozpoczęte od %s)"
-#: ref-filter.c:1561
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD odłączone na %s)"
-#: ref-filter.c:1564
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD odłączone od %s)"
-#: ref-filter.c:1567
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "(brak gałęzi)"
-#: ref-filter.c:1599 ref-filter.c:1808
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "brakujący obiekt %s do %s"
-#: ref-filter.c:1609
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer nie powiodło się na %s do %s"
-#: ref-filter.c:1992
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "uszkodzony obiekt w „%s”"
-#: ref-filter.c:2081
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorowanie referencji z zepsutą nazwą %s"
-#: ref-filter.c:2086 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorowanie zepsutej referencji %s"
-#: ref-filter.c:2426
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: brakuje atomu %%(end)"
-#: ref-filter.c:2525
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "nieprawidłowa nazwa obiektu %s"
-#: ref-filter.c:2530
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "opcja „%s” musi wskazywać na zapis"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s nie wskazuje na prawidłowy obiekt!"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6847,81 +7153,81 @@
"\n"
"\tgit branch -m <nazwa>\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "nie można odebrać „%s”"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "nieprawidłowa nazwa gałęzi: %s = %s"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignorowanie wiszącej referencji symbolicznej %s"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "dziennik referencji %s ma lukę po %s"
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "dziennik referencji %s nieoczekiwanie się skończył na %s"
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "dziennik dla %s jest pusty"
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "odmawiam zaktualizowania referencji ze złą nazwą „%s”"
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref nie powiodło się dla referencji „%s”: %s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "wiele aktualizacji referencji „%s” niedozwolone"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr "aktualizacje referencji zabronione w środowisku kwarantanny"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "aktualizacje referencji przerwane przez skrypt repozytorium"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "„%s” istnieje; nie można utworzyć „%s”"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "nie można przetworzyć jednocześnie „%s” i „%s”"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "nie można usunąć referencji %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "nie można usunąć referencji %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "nie można usunąć referencji: %s"
@@ -7229,7 +7535,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "wystąpiły błędy przy zapisywaniu „%s” (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr "nie można wypróżnić „%s”'"
@@ -7274,8 +7580,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Zapamiętano wstępny obraz „%s”"
-#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "nie można utworzyć katalogu „%s”"
@@ -7313,122 +7619,126 @@
msgid "could not determine HEAD revision"
msgstr "nie można ustalić rewizji HEAD"
-#: reset.c:70 reset.c:76 sequencer.c:3468
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr "nie znaleziono drzewa %s"
-#: revision.c:2338
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input i --no-walk się wykluczają"
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<plik-paczki> nie jest już wspierany"
-#: revision.c:2668
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk i --unsorted-input się wykluczają"
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr "twoja obecna gałąź wydaje się być uszkodzona"
-#: revision.c:2671
+#: revision.c:2693
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "twoja obecna gałąź „%s” nie ma jeszcze żadnych zapisów"
-#: revision.c:2877
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L nie wspiera jeszcze formatów różnic oprócz -p i -s"
-#: run-command.c:767
-msgid "open /dev/null failed"
-msgstr "otwarcie /dev/null nie powiodło się"
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr "nie można utworzyć asynchronicznego wątku: %s"
-#: run-command.c:1338
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Skrypt repozytorium „%s” został zignorowany, bo nie jest wykonywalny.\n"
-"Możesz wyłączyć to ostrzeżenie przez „git config advice.ignoredHook false”."
-
-#: send-pack.c:146
+#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"nieoczekiwany pakiet wypróżnienia podczas odczytu stanu zdalnego rozpakowania"
-#: send-pack.c:148
+#: send-pack.c:152
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "nie można przetworzyć zdalnego stanu rozpakowania: %s"
-#: send-pack.c:150
+#: send-pack.c:154
#, c-format
msgid "remote unpack failed: %s"
msgstr "zdalne rozpakowanie nie powiodło się: %s"
-#: send-pack.c:374
+#: send-pack.c:378
msgid "failed to sign the push certificate"
msgstr "nie można podpisać certyfikatu wypychania"
-#: send-pack.c:467
+#: send-pack.c:435
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: nie można oddzielić pod-procesu pobierania"
+
+#: send-pack.c:457
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "negocjacja przekazania nie powiodła się; przekazywanie mimo to"
+
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "odbierający koniec nie wspiera algorytmu skrótu tego repozytorium"
-#: send-pack.c:476
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
-msgstr "odbierający koniec nie wspiera podpisanych wypchnięć"
+msgstr "odbierający koniec nie wspiera wypchnięć --signed"
-#: send-pack.c:478
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
"nie wysyłanie certyfikatu wypchnięcia, bo odbierający koniec nie wspiera "
-"podpisanego wypychania"
+"wypychnięć --signed"
-#: send-pack.c:490
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
-msgstr "odbierający koniec nie wspiera atomowych wypchnięć"
+msgstr "odbierający koniec nie wspiera wypchnięć --atomic"
-#: send-pack.c:495
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "odbierający koniec nie wspiera opcji wypychania"
-#: sequencer.c:195
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "nieprawidłowy tryb czyszczenia komunikatu zapisu „%s”"
-#: sequencer.c:323
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "nie można usunąć „%s”"
-#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "nie można usunąć „%s”"
-#: sequencer.c:353
+#: sequencer.c:355
msgid "revert"
msgstr "odwracanie"
-#: sequencer.c:355
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "dobieranie"
-#: sequencer.c:357
+#: sequencer.c:359
msgid "rebase"
msgstr "przestawianie"
-#: sequencer.c:359
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "nieznane działanie: %d"
-#: sequencer.c:418
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7436,53 +7746,75 @@
"po rozwiązaniu konfliktów oznacz poprawione ścieżki\n"
"z „git add <ścieżki>” lub „git rm <ścieżki>”"
-#: sequencer.c:421
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"po rozwiązaniu konfliktów oznacz poprawione ścieżki\n"
-"z „git add <ścieżki>” lub „git rm <ścieżki>”\n"
-"i złóż wynik za pomocą „git commit”"
+"Po rozwiązaniu konfliktów, oznacz je przez\n"
+"„git add/rm <ścieżki>” i wykonaj\n"
+"„git cherry-pick --continue”.\n"
+"Możesz zamiast tego pominąć ten zapis przez „git cherry-pick --skip”.\n"
+"Aby przerwać i powrócić do stanu sprzed „git cherry-pick”,\n"
+"wykonaj „git cherry-pick --abort”."
-#: sequencer.c:434 sequencer.c:3070
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Po rozwiązaniu konfliktów, oznacz je przez\n"
+"„git add/rm <ścieżki>” i wykonaj\n"
+"„git revert --continue”.\n"
+"Możesz zamiast tego pominąć ten zapis przez „git revert --skip”.\n"
+"Aby przerwać i powrócić do stanu sprzed „git revert”,\n"
+"wykonaj „git revert --abort”."
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr "nie można zablokować „%s”"
-#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
-#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "nie można pisać do „%s”"
-#: sequencer.c:441
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "nie można pisać końca wiersza do „%s”"
-#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
-#: sequencer.c:3353
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr "nie można sfinalizować „%s”"
-#: sequencer.c:485
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "twoje lokalne zmiany zostaną nadpisane przez %s."
-#: sequencer.c:489
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "złóż swoje zmiany lub dodaj do schowka, aby kontynuować."
-#: sequencer.c:521
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: przewijanie"
-#: sequencer.c:560 builtin/tag.c:598
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Nieprawidłowy tryb czyszczenia %s"
@@ -7490,65 +7822,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:670
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Nie można zapisać nowego pliku indeksu"
-#: sequencer.c:684
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "nie można zaktualizować drzewa pamięci podręcznej"
-#: sequencer.c:698
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "nie można rozwiązać zapisu HEAD"
-#: sequencer.c:778
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "nie ma żadnego klucza w „%.*s”"
-#: sequencer.c:789
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "nie można odcytować wartości „%s”"
-#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "nie można otworzyć „%s” do odczytu"
-#: sequencer.c:836
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "już podano „GIT_AUTHOR_NAME”"
-#: sequencer.c:841
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "już podano „GIT_AUTHOR_EMAIL”"
-#: sequencer.c:846
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "już podano „GIT_AUTHOR_DATE”"
-#: sequencer.c:850
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "nieznana zmienna „%s”"
-#: sequencer.c:855
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "brak „GIT_AUTHOR_NAME”"
-#: sequencer.c:857
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "brak „GIT_AUTHOR_EMAIL”"
-#: sequencer.c:859
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "brak „GIT_AUTHOR_DATE”"
-#: sequencer.c:924
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7577,11 +7909,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1211
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr "skrypt „prepare-commit-msg” się nie powiódł"
-#: sequencer.c:1217
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7609,7 +7941,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1230
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7634,340 +7966,350 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1272
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr "nie odnaleziono nowo utworzonego zapisu"
-#: sequencer.c:1274
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr "nie można przetworzyć nowo utworzonego zapisu"
-#: sequencer.c:1320
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr "nie można rozwiązać HEAD po utworzeniu zapisu"
-#: sequencer.c:1322
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr "oddzielone HEAD"
-#: sequencer.c:1326
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr " (zapis-korzeń)"
-#: sequencer.c:1347
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr "nie można przetworzyć HEAD"
-#: sequencer.c:1349
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s nie jest zapisem!"
-#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "nie można przetworzyć zapisu HEAD"
-#: sequencer.c:1409 sequencer.c:2108
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr "nie można przetworzyć autora zapisu %s"
-#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr "git write-tree nie może zapisać drzewa"
-#: sequencer.c:1453 sequencer.c:1573
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "nie można odczytać komunikatu zapisu z „%s”"
-#: sequencer.c:1484 sequencer.c:1516
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr "nieprawidłowa tożsamość autora „%s”"
-#: sequencer.c:1490
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr "uszkodzony autor: brakuje informacji o dacie"
-#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
-#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "nie można zapisać obiektu zapisu"
-#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "nie można zaktualizować „%s”"
-#: sequencer.c:1605
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr "nie można przetworzyć zapisu %s"
-#: sequencer.c:1610
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr "nie można przetworzyć zapisu rodzica %s"
-#: sequencer.c:1693 sequencer.c:1804
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr "nieznane pod-polecenie: %d"
-#: sequencer.c:1751 sequencer.c:1776
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "To jest połączenie %d zapisów."
-
-#: sequencer.c:1761
-msgid "need a HEAD to fixup"
-msgstr "potrzeba HEAD do naprawienia"
-
-#: sequencer.c:1763 sequencer.c:3380
-msgid "could not read HEAD"
-msgstr "nie można odczytać HEAD"
-
-#: sequencer.c:1765
-msgid "could not read HEAD's commit message"
-msgstr "nie można odczytać komunikatu zapisu czoła HEAD"
-
-#: sequencer.c:1771
-#, c-format
-msgid "cannot write '%s'"
-msgstr "nie można pisać do „%s”"
-
-#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr "To jest komunikat pierwszego zapisu:"
-#: sequencer.c:1786
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "nie można odczytać komunikatu zapisu %s"
-
-#: sequencer.c:1793
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr "To jest komunikat zapisu nr %d:"
-#: sequencer.c:1799
+#: sequencer.c:1755
+msgid "The 1st commit message will be skipped:"
+msgstr "Komunikat pierwszego zapisu zostanie pominięty:"
+
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Komunikat zapisu nr %d zostanie pominięty:"
-#: sequencer.c:1887
+#: sequencer.c:1757
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "To jest połączenie %d zapisów."
+
+#: sequencer.c:1904 sequencer.c:1961
+#, c-format
+msgid "cannot write '%s'"
+msgstr "nie można pisać do „%s”"
+
+#: sequencer.c:1951
+msgid "need a HEAD to fixup"
+msgstr "potrzeba HEAD do naprawienia"
+
+#: sequencer.c:1953 sequencer.c:3601
+msgid "could not read HEAD"
+msgstr "nie można odczytać HEAD"
+
+#: sequencer.c:1955
+msgid "could not read HEAD's commit message"
+msgstr "nie można odczytać komunikatu zapisu czoła HEAD"
+
+#: sequencer.c:1979
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "nie można odczytać komunikatu zapisu %s"
+
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr "plik indeksu jest niescalony."
-#: sequencer.c:1894
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr "nie można poprawić zapisu korzenia"
-#: sequencer.c:1913
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "zapis %s jest scaleniem, a nie podano opcji -m."
-#: sequencer.c:1921 sequencer.c:1929
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr "zapis %s nie ma rodzica %d"
-#: sequencer.c:1935
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr "nie można uzyskać komunikatu zapisu dla %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1954
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: nie można przetworzyć rodzica zapisu %s"
-#: sequencer.c:2019
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "nie można zmienić nazwy „%s” na „%s”"
-#: sequencer.c:2079
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr "nie można odwrócić %s... %s"
-#: sequencer.c:2080
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr "nie można zastosować %s... %s"
-#: sequencer.c:2100
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "gubienie %s %s — zawartość łatki już wcielona w głównym nurcie\n"
-#: sequencer.c:2158
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: nie można odczytać indeksu"
-#: sequencer.c:2165
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: nie można odświeżyć indeksu"
-#: sequencer.c:2242
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s nie przyjmuje argumentów: „%s”"
-#: sequencer.c:2251
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr "brakujące argumenty dla %s"
-#: sequencer.c:2282
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr "nie można przetworzyć „%s”"
-#: sequencer.c:2343
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr "nieprawidłowy wiersz %d: %.*s"
-#: sequencer.c:2354
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "nie można użyć „%s” bez poprzedniego zapisu"
-#: sequencer.c:2440
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "nie można odczytać „%s”."
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr "przerywanie trwającego dobierania"
-#: sequencer.c:2449
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr "przerywanie trwającego odwracania"
-#: sequencer.c:2493
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "napraw to używając „git rebase --edit-todo”."
-#: sequencer.c:2495
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "plik z instrukcjami się nie nadaje: „%s”"
-#: sequencer.c:2500
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr "nie przetworzono żadnego zapisu."
-#: sequencer.c:2511
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr "nie można dobierać w czasie odwracania."
-#: sequencer.c:2513
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr "nie można odwrócić w czasie dobierania."
-#: sequencer.c:2591
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr "nieprawidłowa wartość %s: %s"
-#: sequencer.c:2698
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr "spłaszcz-na się nie nadaje"
-#: sequencer.c:2718
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "nieprawidłowy plik opcji: „%s”"
-#: sequencer.c:2811 sequencer.c:4644
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr "podano pusty zbiór zapisów"
-#: sequencer.c:2828
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr "już trwa dobieranie"
-#: sequencer.c:2830
+#: sequencer.c:3050
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "spróbuj „git revert (--continue | %s--abort | --quit)”"
-#: sequencer.c:2833
+#: sequencer.c:3053
msgid "cherry-pick is already in progress"
msgstr "już trwa dobieranie"
-#: sequencer.c:2835
+#: sequencer.c:3055
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "spróbuj „git cherry-pick (--continue | %s--abort | --quit)”"
-#: sequencer.c:2849
+#: sequencer.c:3069
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "nie można utworzyć katalogu sekwencjonowania „%s”"
-#: sequencer.c:2864
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr "nie można zablokować HEAD"
-#: sequencer.c:2924 sequencer.c:4379
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr "nie trwa dobieranie ani odwracanie"
-#: sequencer.c:2926 sequencer.c:2937
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr "nie można rozwiązać HEAD"
-#: sequencer.c:2928 sequencer.c:2972
+#: sequencer.c:3148 sequencer.c:3192
msgid "cannot abort from a branch yet to be born"
msgstr "nie można przerwać z gałęzi, która dopiero ma powstać"
-#: sequencer.c:2958 builtin/grep.c:757
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "nie można otworzyć „%s”"
-#: sequencer.c:2960
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr "nie można odczytać „%s”: %s"
-#: sequencer.c:2961
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr "nieoczekiwany koniec pliku"
-#: sequencer.c:2967
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "zapisany plik HEAD sprzed dobierania „%s” jest uszkodzony"
-#: sequencer.c:2978
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Wydaje się, że czoło HEAD się przesunęło.\n"
"Nie cofam, sprawdź swoje HEAD!"
-#: sequencer.c:3019
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr "nie trwa żadne odwracanie"
-#: sequencer.c:3028
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr "nie trwa żadne dobieranie"
-#: sequencer.c:3038
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr "nie udało się pominąć zapisu"
-#: sequencer.c:3045
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr "nie ma nic do pominięcia"
-#: sequencer.c:3048
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
@@ -7976,16 +8318,16 @@
"zapis już złożony?\n"
"spróbuj „git %s --continue”"
-#: sequencer.c:3210 sequencer.c:4271
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr "nie można odczytać HEAD"
-#: sequencer.c:3227
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "nie można skopiować „%s” do „%s”"
-#: sequencer.c:3235
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8004,27 +8346,27 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3245
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Nie można zastosować %s... %.*s"
-#: sequencer.c:3252
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr "Nie można scalić %.*s"
-#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "nie można skopiować „%s” do „%s”"
-#: sequencer.c:3282
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr "Wykonywanie: %s\n"
-#: sequencer.c:3297
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8039,11 +8381,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3303
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr "i pozostały zmiany w indeksie i/lub drzewie roboczym\n"
-#: sequencer.c:3309
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8060,90 +8402,90 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3370
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nieprawidłowa nazwa etykietki „%.*s”"
-#: sequencer.c:3424
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr "zapisywanie fałszywego zapisu korzenia"
-#: sequencer.c:3429
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr "zapisywanie spłaszcz-na"
-#: sequencer.c:3513
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr "nie można rozwiązać „%s”"
-#: sequencer.c:3546
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr "nie można scalić bez bieżącej rewizji"
-#: sequencer.c:3568
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr "nie można przetworzyć „%.*s”"
-#: sequencer.c:3577
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nic do scalenia: „%.*s”"
-#: sequencer.c:3589
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "nie można wykonać ośmiorniczego scalenia na szczycie [nowego korzenia]"
-#: sequencer.c:3605
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr "nie można uzyskać komunikatu zapisu „%s”"
-#: sequencer.c:3788
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "nie można nawet spróbować scalić „%.*s”"
-#: sequencer.c:3804
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr "scalanie: Nie można zapisać nowego pliku indeksu"
-#: sequencer.c:3878
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr "Nie można automatycznie dodać do schowka"
-#: sequencer.c:3881
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Nieoczekiwana odpowiedź schowka: „%s”"
-#: sequencer.c:3887
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Nie można utworzyć katalogu dla „%s”"
-#: sequencer.c:3890
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr "Automatycznie zapisano w schowku: %s\n"
-#: sequencer.c:3894
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr "nie można zresetować --hard"
-#: sequencer.c:3919
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr "Zastosowano zmiany z automatycznego schowka.\n"
-#: sequencer.c:3931
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr "nie można zapisać %s"
-#: sequencer.c:3934
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -8154,30 +8496,30 @@
"Twoje zmiany są bezpieczne w schowku.\n"
"Możesz w każdej chwili wykonać „git stash pop” lub „git stash drop”.\n"
-#: sequencer.c:3939
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr "Stosowanie zmian z automatycznego schowka spowodowało konflikty."
-#: sequencer.c:3940
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr ""
"W schowku istnieje automatyczny wpis; tworzenie nowego wpisu w schowku."
-#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr "nie można odłączyć HEAD"
-#: sequencer.c:4048
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Zatrzymano przy HEAD\n"
-#: sequencer.c:4050
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr "Zatrzymano przy %s\n"
-#: sequencer.c:4058
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8198,58 +8540,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4104
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Przestawianie (%d/%d)%s"
-#: sequencer.c:4149
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Zatrzymano na %s... %.*s\n"
-#: sequencer.c:4220
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr "nieznane polecenie %d"
-#: sequencer.c:4279
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr "nie można odczytać pierwotnego czoła"
-#: sequencer.c:4284
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr "nie można odczytać „onto”"
-#: sequencer.c:4298
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr "nie można zapisać HEAD do %s"
-#: sequencer.c:4358
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Pomyślnie przestawiono i zaktualizowano %s.\n"
-#: sequencer.c:4391
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr "nie można przestawić: Masz nieprzygotowane zmiany."
-#: sequencer.c:4400
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr "nie można poprawić nieistniejącego obiektu"
-#: sequencer.c:4402
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr "nieprawidłowy plik: „%s”"
-#: sequencer.c:4404
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr "nieprawidłowa zawartość: „%s”"
-#: sequencer.c:4407
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8259,50 +8601,59 @@
"Masz niezłożone zmiany w drzewie roboczym. Najpierw je złóż\n"
"i wtedy ponownie wykonaj „git rebase --continue”."
-#: sequencer.c:4443 sequencer.c:4482
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr "nie można zapisać pliku: „%s”"
-#: sequencer.c:4498
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "nie można usunąć CHERRY_PICK_HEAD"
-#: sequencer.c:4505
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr "nie udało się złożyć zmian ze schowka."
-#: sequencer.c:4621
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: nie można dobrać %s"
-#: sequencer.c:4625
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr "%s: zła rewizja"
-#: sequencer.c:4660
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr "nie można odwrócić jako pierwszy zapis"
-#: sequencer.c:5137
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "pominięto uprzednio zastosowany zapis %s"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "użyj --reapply-cherry-picks, by uwzględnić pominięte zapisy"
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr "make_script: nieobsłużone opcje"
-#: sequencer.c:5140
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr "make_script: błąd przygotowania rewizji"
-#: sequencer.c:5382 sequencer.c:5399
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr "nic do zrobienia"
-#: sequencer.c:5418
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr "nie można pominąć niepotrzebnych poleceń pick"
-#: sequencer.c:5512
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr "kolejność skryptu została już zmieniona."
@@ -8353,92 +8704,98 @@
msgstr ""
"nie można ustawić drzewa roboczego przy użyciu nieprawidłowej konfiguracji"
-#: setup.c:423
+#: setup.c:423 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "to działanie musi być wykonane w drzewie roboczym"
-#: setup.c:661
+#: setup.c:658
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Oczekiwano wersji repozytorium gita <= %d, znaleziono %d"
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "znaleziono nieznane rozszerzenia repozytorium:"
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "znaleziono nieznane rozszerzenie repozytorium:"
+msgstr[1] "znaleziono nieznane rozszerzenia repozytorium:"
+msgstr[2] "znaleziono nieznane rozszerzenia repozytorium:"
-#: setup.c:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "wersja repozytorium to 0, ale znaleziono rozszerzenia typowe dla v1"
+#: setup.c:680
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "wersja repozytorium to 0, ale znaleziono rozszerzenie typowe dla v1"
+msgstr[1] "wersja repozytorium to 0, ale znaleziono rozszerzenia typowe dla v1"
+msgstr[2] "wersja repozytorium to 0, ale znaleziono rozszerzenia typowe dla v1"
-#: setup.c:700
+#: setup.c:701
#, c-format
msgid "error opening '%s'"
msgstr "nie można otworzyć „%s”"
-#: setup.c:702
+#: setup.c:703
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "za duży jak na plik .git: „%s”"
-#: setup.c:704
+#: setup.c:705
#, c-format
msgid "error reading %s"
msgstr "błąd odczytu %s"
-#: setup.c:706
+#: setup.c:707
#, c-format
msgid "invalid gitfile format: %s"
msgstr "nieprawidłowy format pliku gitfile: %s"
-#: setup.c:708
+#: setup.c:709
#, c-format
msgid "no path in gitfile: %s"
-msgstr "brak ścieżki w pliku gitfile %s"
+msgstr "brak ścieżki w pliku gitfile: %s"
-#: setup.c:710
+#: setup.c:711
#, c-format
msgid "not a git repository: %s"
msgstr "to nie jest repozytorium gita: %s"
-#: setup.c:812
+#: setup.c:813
#, c-format
msgid "'$%s' too big"
msgstr "„$%s” za duże"
-#: setup.c:826
+#: setup.c:827
#, c-format
msgid "not a git repository: '%s'"
msgstr "to nie jest repozytorium gita: „%s”"
-#: setup.c:855 setup.c:857 setup.c:888
+#: setup.c:856 setup.c:858 setup.c:889
#, c-format
msgid "cannot chdir to '%s'"
msgstr "nie można wejść do „%s”"
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
msgid "cannot come back to cwd"
msgstr "nie można wrócić do cwd"
-#: setup.c:987
+#: setup.c:988
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "nie można wykonać stat na „%*s%s%s”"
-#: setup.c:1225
+#: setup.c:1231
msgid "Unable to read current working directory"
msgstr "Nie można odczytać obecnego katalogu roboczego"
-#: setup.c:1234 setup.c:1240
+#: setup.c:1240 setup.c:1246
#, c-format
msgid "cannot change to '%s'"
msgstr "nie można zmienić na „%s”"
-#: setup.c:1245
+#: setup.c:1251
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "to nie jest repozytorium gita (ani żaden z katalogów nadrzędnych): %s"
-#: setup.c:1251
+#: setup.c:1257
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -8449,7 +8806,7 @@
"Zatrzymano na granicy systemu plików (nie ustawiono "
"GIT_DISCOVERY_ACROSS_FILESYSTEM)."
-#: setup.c:1362
+#: setup.c:1381
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8458,56 +8815,57 @@
"problem z wartością trybu pliku core.sharedRepository (0%.3o).\n"
"Właściciel plików musi zawsze mieć prawa do odczytu i zapisu."
-#: setup.c:1409
-msgid "open /dev/null or dup failed"
-msgstr "otwarcie /dev/null lub dup() nie powiodło się"
-
-#: setup.c:1424
+#: setup.c:1443
msgid "fork failed"
msgstr "fork nie powiódł się"
-#: setup.c:1429
+#: setup.c:1448
msgid "setsid failed"
msgstr "setsid nie powiodło się"
+#: sparse-index.c:273
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "element indeksu jest katalogiem, ale nie rzadkim (%08x)"
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:848
+#: strbuf.c:850
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:850
+#: strbuf.c:852
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u GiB/s"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:858
+#: strbuf.c:860
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:860
+#: strbuf.c:862
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u MiB/s"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:867
+#: strbuf.c:869
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:869
+#: strbuf.c:871
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u KiB/s"
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:875
+#: strbuf.c:877
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8516,7 +8874,7 @@
msgstr[2] "%u bajtów"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:877
+#: strbuf.c:879
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
@@ -8524,13 +8882,13 @@
msgstr[1] "%u bajty/s"
msgstr[2] "%u bajtów/s"
-#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "nie można otworzyć „%s” do zapisywania"
-#: strbuf.c:1175
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "nie można edytować „%s”"
@@ -8538,7 +8896,7 @@
#: submodule-config.c:237
#, c-format
msgid "ignoring suspicious submodule name: %s"
-msgstr "ignorowanie podejrzanej nazwy pod-modułu: %s"
+msgstr "ignorowanie podejrzanej nazwy podmodułu: %s"
#: submodule-config.c:304
msgid "negative values not allowed for submodule.fetchjobs"
@@ -8555,7 +8913,7 @@
msgid "invalid value for %s"
msgstr "nieprawidłowa wartość %s"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Nie można zaktualizować wpisu .gitmodules %s"
@@ -8578,155 +8936,155 @@
msgid "staging updated .gitmodules failed"
msgstr "przygotowanie zaktualizowanego .gitmodules nie powiodło się"
-#: submodule.c:327
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "w niezapełnionym pod-module „%s”"
-
#: submodule.c:358
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Ścieżka „%s” jest w pod-module „%.*s”"
+msgid "in unpopulated submodule '%s'"
+msgstr "w niezapełnionym podmodule „%s”"
-#: submodule.c:435
+#: submodule.c:389
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Ścieżka „%s” jest w podmodule „%.*s”"
+
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "zły argument --ignore-submodules: %s"
-#: submodule.c:817
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr ""
-"Pod-moduł w zapisie %s w ścieżce „%s” zderzył się z pod-modułem o tej samej "
+"Pod-moduł w zapisie %s w ścieżce „%s” zderzył się z podmodułem o tej samej "
"nazwie. Pomijanie."
-#: submodule.c:920
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "element pod-modułu „%s” (%s) nie jest zapisem, jest rodzaju %s"
+msgstr "element podmodułu „%s” (%s) nie jest zapisem, jest rodzaju %s"
-#: submodule.c:1005
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr ""
"Nie można wykonać polecenia „git rev-list <zapisy> --not --remotes -n 1” w "
-"pod-module %s"
+"podmodule %s"
-#: submodule.c:1128
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
-msgstr "proces dla pod-modułu „%s” nie powiódł się"
+msgstr "proces dla podmodułu „%s” nie powiódł się"
-#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Nie można rozwiązać HEAD jako prawidłowej referencji."
-#: submodule.c:1168
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
-msgstr "Wypychanie pod-modułu „%s”\n"
+msgstr "Wypychanie podmodułu „%s”\n"
-#: submodule.c:1171
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
-msgstr "Nie można wypchnąć pod-modułu „%s”\n"
+msgstr "Nie można wypchnąć podmodułu „%s”\n"
-#: submodule.c:1463
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
-msgstr "Pobieranie pod-modułu %s%s\n"
+msgstr "Pobieranie podmodułu %s%s\n"
-#: submodule.c:1497
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
-msgstr "Nie można się dostać do pod-modułu „%s”\n"
+msgstr "Nie można się dostać do podmodułu „%s”\n"
-#: submodule.c:1652
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
"%s"
msgstr ""
-"Błędy podczas pobierania pod-modułów:\n"
+"Błędy podczas pobierania podmodułów:\n"
"%s"
-#: submodule.c:1677
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "nie rozpoznano „%s” jako repozytorium gita"
-#: submodule.c:1694
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr "Nie można wykonać „git status --porcelain=2” w pod-module %s"
+msgstr "Nie można wykonać „git status --porcelain=2” w podmodule %s"
-#: submodule.c:1735
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr "„git status --porcelain=2” nie powiódł się w pod-module %s"
-
-#: submodule.c:1810
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr "nie można uruchomić „git status” w pod-module „%s”"
-
-#: submodule.c:1823
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr "nie można wykonać „git status” w pod-module „%s”"
+msgstr "„git status --porcelain=2” nie powiódł się w podmodule %s"
#: submodule.c:1838
#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr "Nie można usunąć ustawienia core.worktree w pod-module „%s”"
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "nie można uruchomić „git status” w podmodule „%s”"
-#: submodule.c:1865 submodule.c:2175
+#: submodule.c:1851
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "nie można wykonać „git status” w podmodule „%s”"
+
+#: submodule.c:1868
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Nie można usunąć ustawienia core.worktree w podmodule „%s”"
+
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
-msgstr "nie można zejść do pod-modułu „%s”"
+msgstr "nie można zejść do podmodułu „%s”"
-#: submodule.c:1886
+#: submodule.c:1917
msgid "could not reset submodule index"
-msgstr "nie można zresetować indeksu pod-modułu"
+msgstr "nie można zresetować indeksu podmodułu"
-#: submodule.c:1928
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
-msgstr "pod-moduł „%s” ma brudny indeks"
+msgstr "podmoduł „%s” ma brudny indeks"
-#: submodule.c:1980
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
-msgstr "Nie można zaktualizować pod-modułu „%s”."
+msgstr "Nie można zaktualizować podmodułu „%s”."
-#: submodule.c:2048
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr "katalog gita pod-modułu „%s” jest w katalogu gita „%.*s”"
+msgstr "katalog gita podmodułu „%s” jest w katalogu gita „%.*s”"
-#: submodule.c:2069
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-"relocate_gitdir dla pod-modułu „%s” z ponad jednym drzewem roboczym "
+"relocate_gitdir dla podmodułu „%s” z ponad jednym drzewem roboczym "
"niewspierane"
-#: submodule.c:2081 submodule.c:2140
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
-msgstr "nie odnaleziono nazwy pod-modułu „%s”"
+msgstr "nie odnaleziono nazwy podmodułu „%s”"
-#: submodule.c:2085
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "odmawiam przeniesienia „%s” do istniejącego katalogu gita"
-#: submodule.c:2092
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8737,65 +9095,71 @@
"„%s” do\n"
"„%s”\n"
-#: submodule.c:2220
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "nie można uruchomić ls-files w .."
-#: submodule.c:2260
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree zwróciło nieoczekiwany kod wyjścia %d"
-#: trailer.c:236
+#: symlinks.c:244
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "nie można wykonać lstat na „%s”'"
+
+#: trailer.c:244
#, c-format
msgid "running trailer command '%s' failed"
msgstr "wykonanie polecenia końcówki „%s” nie powiodło się"
-#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551
-#: trailer.c:555
+#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
+#: trailer.c:570
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "nierozpoznana wartość „%s” klucza „%s”"
-#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "więcej niż jeden %s"
-#: trailer.c:728
+#: trailer.c:743
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "pusty klucz w końcówce „%.*s”"
-#: trailer.c:748
+#: trailer.c:763
#, c-format
msgid "could not read input file '%s'"
msgstr "nie można odczytać pliku „%s”"
-#: trailer.c:751 builtin/mktag.c:91
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "nie można czytać ze standardowego wejścia"
-#: trailer.c:1009 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "nie można wykonać stat na %s"
-#: trailer.c:1011
+#: trailer.c:1026
#, c-format
msgid "file %s is not a regular file"
msgstr "plik %s nie jest zwykłym plikiem"
-#: trailer.c:1013
+#: trailer.c:1028
#, c-format
msgid "file %s is not writable by user"
msgstr "plik %s nie może być zapisany przez użytkownika"
-#: trailer.c:1025
+#: trailer.c:1040
msgid "could not open temporary file"
msgstr "nie można otworzyć pliku tymczasowego"
-#: trailer.c:1065
+#: trailer.c:1080
#, c-format
msgid "could not rename temporary file to %s"
msgstr "nie można zmienić nazwy pliku tymczasowego na %s"
@@ -8845,7 +9209,7 @@
msgid "error while running fast-import"
msgstr "błąd wykonywania fast-import"
-#: transport-helper.c:549 transport-helper.c:1237
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "nie można odczytać referencji %s"
@@ -8863,7 +9227,7 @@
msgid "invalid remote service path"
msgstr "nieprawidłowa ścieżka zdalnej usługi"
-#: transport-helper.c:661 transport.c:1447
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "operacja niewspierana przez protokół"
@@ -8872,68 +9236,72 @@
msgid "can't connect to subservice %s"
msgstr "nie można połączyć z pod-usługą %s"
-#: transport-helper.c:745
+#: transport-helper.c:693 transport.c:404
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only wymaga protokołu v2"
+
+#: transport-helper.c:755
msgid "'option' without a matching 'ok/error' directive"
msgstr "„option” bez pasującej dyrektywy „ok/error”"
-#: transport-helper.c:788
+#: transport-helper.c:798
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "oczekiwano ok/error pomocnik powiedział „%s”"
-#: transport-helper.c:845
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "pomocnik zwrócił nieoczekiwany stan %s"
-#: transport-helper.c:928
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "pomocnik %s nie wspiera wykonania na sucho (dry-run)"
-#: transport-helper.c:931
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "pomocnik %s nie wspiera --signed"
-#: transport-helper.c:934
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "pomocnik %s nie wspiera --signed=if-asked"
-#: transport-helper.c:939
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "pomocnik %s nie wspiera --atomic"
-#: transport-helper.c:943
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "pomocnik %s nie wspiera --%s"
-#: transport-helper.c:950
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "pomocnik %s nie wspiera „push-option”"
-#: transport-helper.c:1050
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr "zdalny pomocnik nie wspiera wypychania; potrzeba referencji"
-#: transport-helper.c:1055
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr "pomocnik %s nie wspiera „force”"
-#: transport-helper.c:1102
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "nie można wykonać fast-export"
-#: transport-helper.c:1107
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "błąd wykonywania fast-export"
-#: transport-helper.c:1132
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8942,52 +9310,52 @@
"Brak wspólnych referencji lub żadnych nie podano; brak działania.\n"
"Pewnie należy podać jakąś gałąź.\n"
-#: transport-helper.c:1214
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "niewspierany format obiektu „%s”"
-#: transport-helper.c:1223
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "nieprawidłowa odpowiedź na liście referencji: %s"
-#: transport-helper.c:1375
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) nie powiodło się"
-#: transport-helper.c:1402
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) nie powiodło się"
-#: transport-helper.c:1451
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "wątek %s nie powiódł się"
-#: transport-helper.c:1455
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "wątek %s nie może się złączyć: %s"
-#: transport-helper.c:1474 transport-helper.c:1478
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "nie można uruchomić wątku do kopiowania danych: %s"
-#: transport-helper.c:1515
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "procesowi %s nie udało się zaczekać"
-#: transport-helper.c:1519
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "proces %s nie powiódł się"
-#: transport-helper.c:1537 transport-helper.c:1546
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "nie można uruchomić wątku do kopiowania danych"
@@ -9001,51 +9369,55 @@
msgid "could not read bundle '%s'"
msgstr "nie można odczytać wiązki „%s”"
-#: transport.c:220
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: nieprawidłowa opcja głębokości „%s”"
-#: transport.c:269
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr "więcej szczegółów pod protocol.version w „git help config”"
-#: transport.c:270
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "opcje serwera wymagają wersji protokołu 2 lub późniejszej"
-#: transport.c:727
+#: transport.c:407
+msgid "server does not support wait-for-done"
+msgstr "serwer nie wspiera wait-for-done"
+
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "nie można przetworzyć ustawienia transport.color.*"
-#: transport.c:802
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "wsparcie dla protokołu v2 jeszcze niezaimplementowane"
-#: transport.c:936
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "nierozpoznana wartość klucza „%s”: %s"
-#: transport.c:1002
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "transport „%s” niedozwolony"
-#: transport.c:1055
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync nie jest już wspierany"
-#: transport.c:1157
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-"Następujące ścieżki pod-modułów zawierają zmiany, których nie można\n"
+"Następujące ścieżki podmodułów zawierają zmiany, których nie można\n"
"znaleźć w żadnym zdalnym repozytorium:\n"
-#: transport.c:1161
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9072,13 +9444,13 @@
"żeby wypchnąć je do zdalnego repozytorium.\n"
"\n"
-#: transport.c:1169
+#: transport.c:1197
msgid "Aborting."
msgstr "Przerywanie."
-#: transport.c:1316
+#: transport.c:1344
msgid "failed to push all needed submodules"
-msgstr "nie można wypchnąć wszystkich potrzebnych zagnieżdżonych pod-modułów"
+msgstr "nie można wypchnąć wszystkich potrzebnych zagnieżdżonych podmodułów"
#: tree-walk.c:33
msgid "too-short tree object"
@@ -9096,7 +9468,7 @@
msgid "too-short tree file"
msgstr "za krótki plik drzewa"
-#: unpack-trees.c:113
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9105,7 +9477,7 @@
"Wybranie gałęzi nadpisałoby lokalne zmiany w następujących plikach:\n"
"%%sZłóż swoje zmiany lub dodaj do schowka zanim zmienisz gałąź."
-#: unpack-trees.c:115
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9114,7 +9486,7 @@
"Wybranie nadpisałoby lokalne zmiany w następujących plikach:\n"
"%%s"
-#: unpack-trees.c:118
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9123,7 +9495,7 @@
"Scalenie nadpisałoby zmiany w następujących plikach:\n"
"%%sZłóż swoje zmiany lub dodaj do schowka zanim je scalisz."
-#: unpack-trees.c:120
+#: unpack-trees.c:122
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9133,7 +9505,7 @@
"scalenie:\n"
"%%s"
-#: unpack-trees.c:123
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9142,7 +9514,7 @@
"%s nadpisałoby zmiany w następujących plikach:\n"
"%%sZłóż swoje zmiany lub dodaj do schowka zanim wykonasz %s."
-#: unpack-trees.c:125
+#: unpack-trees.c:127
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9151,7 +9523,7 @@
"Twoje lokalne zmiany do następujących plików zostaną zastąpione przez %s:\n"
"%%s"
-#: unpack-trees.c:130
+#: unpack-trees.c:132
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -9160,7 +9532,7 @@
"Aktualizowanie następujących katalogów postradałoby nieśledzone pliki:\n"
"%s"
-#: unpack-trees.c:134
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9169,7 +9541,7 @@
"Wybranie usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%sPrzenieś je lub usuń przed przełączeniem gałęzi."
-#: unpack-trees.c:136
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9179,7 +9551,7 @@
"wybranie:\n"
"%%s"
-#: unpack-trees.c:139
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9188,7 +9560,7 @@
"Scalenie usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%sPrzenieś je lub usuń przed scalaniem."
-#: unpack-trees.c:141
+#: unpack-trees.c:143
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9198,7 +9570,7 @@
"scalenie:\n"
"%%s"
-#: unpack-trees.c:144
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9207,7 +9579,7 @@
"%s usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%sPrzenieś je lub usuń przed %s."
-#: unpack-trees.c:146
+#: unpack-trees.c:148
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9216,7 +9588,7 @@
"Następujące nieśledzone pliki drzewa roboczego zostałyby usunięte przez %s:\n"
"%%s"
-#: unpack-trees.c:152
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9226,7 +9598,7 @@
"Wybranie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%sPrzenieś je lub usuń przed przełączeniem gałęzi."
-#: unpack-trees.c:154
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9236,7 +9608,7 @@
"Wybranie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%s"
-#: unpack-trees.c:157
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9245,7 +9617,7 @@
"Scalenie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%sPrzenieś je lub usuń przed scalaniem."
-#: unpack-trees.c:159
+#: unpack-trees.c:161
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9254,7 +9626,7 @@
"Scalenie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9263,7 +9635,7 @@
"%s nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%sPrzenieś je lub usuń przed %s."
-#: unpack-trees.c:164
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9272,21 +9644,21 @@
"%s nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%s"
-#: unpack-trees.c:172
+#: unpack-trees.c:174
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Element „%s” pokrywa się z „%s”. Nie można związać."
-#: unpack-trees.c:175
+#: unpack-trees.c:177
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-"Nie można zaktualizować pod-modułu:\n"
+"Nie można zaktualizować podmodułu:\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:180
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -9296,7 +9668,7 @@
"Następujące ścieżki nie są aktualne i zostały mimo rzadkich wzorców:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:182
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9305,7 +9677,7 @@
"Następujące ścieżki są niescalone i zostały mimo rzadkich wzorców:\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:184
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -9316,12 +9688,12 @@
"wzorców:\n"
"%s"
-#: unpack-trees.c:262
+#: unpack-trees.c:264
#, c-format
msgid "Aborting\n"
msgstr "Przerywanie\n"
-#: unpack-trees.c:289
+#: unpack-trees.c:291
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9330,11 +9702,11 @@
"Po naprawieniu powyższych ścieżek możesz chcieć wykonać „git sparse-checkout "
"reapply”.\n"
-#: unpack-trees.c:350
+#: unpack-trees.c:352
msgid "Updating files"
msgstr "Aktualizowanie plików"
-#: unpack-trees.c:382
+#: unpack-trees.c:384
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -9344,11 +9716,16 @@
"liter w systemie plików, który wielkości nie rozróżnia) i tylko jedna\n"
"z grupy jest w drzewie roboczym:\n"
-#: unpack-trees.c:1498
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr "Aktualizowanie flag indeksu"
-#: upload-pack.c:1543
+#: unpack-trees.c:2772
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr "drzewo robocze i nieśledzony zapis mają podwójne elementy: %s"
+
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr "oczekiwano wypróżnienia po argumentach pobrania"
@@ -9385,114 +9762,124 @@
msgid "Fetching objects"
msgstr "Pobieranie obiektów"
-#: worktree.c:238 builtin/am.c:2103
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "nie można odczytać „%s”"
-#: worktree.c:304
+#: worktree.c:303
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "„%s” w głównym drzewie roboczym nie jest katalogiem repozytorium"
-#: worktree.c:315
+#: worktree.c:314
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"plik „%s” nie zawiera ścieżki bezwzględnej do położenia drzewa roboczego"
-#: worktree.c:327
+#: worktree.c:326
#, c-format
msgid "'%s' does not exist"
msgstr "„%s” nie istnieje"
-#: worktree.c:333
+#: worktree.c:332
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "„%s” nie jest plikiem .git, kod błędu %d"
-#: worktree.c:342
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "„%s” nie wskazuje z powrotem na „%s”"
-#: worktree.c:608
+#: worktree.c:603
msgid "not a directory"
msgstr "nie jest katalogiem"
-#: worktree.c:617
+#: worktree.c:612
msgid ".git is not a file"
msgstr ".git nie jest plikiem"
-#: worktree.c:619
+#: worktree.c:614
msgid ".git file broken"
msgstr "plik .git zepsuty"
-#: worktree.c:621
+#: worktree.c:616
msgid ".git file incorrect"
msgstr "plik .git nieprawidłowy"
-#: worktree.c:727
+#: worktree.c:722
msgid "not a valid path"
msgstr "nieprawidłowa ścieżka"
-#: worktree.c:733
+#: worktree.c:728
msgid "unable to locate repository; .git is not a file"
msgstr "nie odnaleziono repozytorium; .git nie jest plikiem"
-#: worktree.c:737
+#: worktree.c:732
msgid "unable to locate repository; .git file does not reference a repository"
msgstr "nie odnaleziono repozytorium; plik .git nie odnosi się do repozytorium"
-#: worktree.c:741
+#: worktree.c:736
msgid "unable to locate repository; .git file broken"
msgstr "nie odnaleziono repozytorium; plik .git zepsuty"
-#: worktree.c:747
+#: worktree.c:742
msgid "gitdir unreadable"
msgstr "katalog gita nie do odczytania"
-#: worktree.c:751
+#: worktree.c:746
msgid "gitdir incorrect"
msgstr "katalog gita nieprawidłowy"
-#: worktree.c:776
+#: worktree.c:771
msgid "not a valid directory"
msgstr "nie jest prawidłowym katalogiem"
-#: worktree.c:782
+#: worktree.c:777
msgid "gitdir file does not exist"
msgstr "plik gitdir nie istnieje"
-#: worktree.c:787 worktree.c:796
+#: worktree.c:782 worktree.c:791
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "nie można odczytać pliku gitdir (%s)"
-#: worktree.c:806
+#: worktree.c:801
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "przykrótki odczyt (oczekiwano %<PRIuMAX> bajtów, odczytano %<PRIuMAX>)"
-#: worktree.c:814
+#: worktree.c:809
msgid "invalid gitdir file"
msgstr "nieprawidłowy plik gitdir"
-#: worktree.c:822
+#: worktree.c:817
msgid "gitdir file points to non-existent location"
msgstr "plik gitdir wskazuje nieistniejące położenie"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "nie można ustawić setenv „%s”"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "nie można utworzyć „%s”"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "nie można otworzyć „%s” do odczytu i zapisu"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "brak dostępu do „%s”"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "Nie można uzyskać obecnego katalogu roboczego"
@@ -9525,11 +9912,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (użyj „git rm <plik>...” aby zaznaczyć rozwiązanie)"
-#: wt-status.c:211 wt-status.c:1072
+#: wt-status.c:211 wt-status.c:1125
msgid "Changes to be committed:"
msgstr "Zmiany do złożenia:"
-#: wt-status.c:234 wt-status.c:1081
+#: wt-status.c:234 wt-status.c:1134
msgid "Changes not staged for commit:"
msgstr "Zmiany nie przygotowane do złożenia:"
@@ -9549,7 +9936,7 @@
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
-msgstr " (złóż lub odrzuć nieśledzoną lub zmienioną zawartość pod-modułów)"
+msgstr " (złóż lub odrzuć nieśledzoną lub zmienioną zawartość podmodułów)"
#: wt-status.c:254
#, c-format
@@ -9628,7 +10015,7 @@
msgid "untracked content, "
msgstr "nieśledzona zawartość, "
-#: wt-status.c:905
+#: wt-status.c:958
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
@@ -9636,15 +10023,15 @@
msgstr[1] "W schowku są obecnie %d elementy"
msgstr[2] "W schowku jest obecnie %d elementów"
-#: wt-status.c:936
+#: wt-status.c:989
msgid "Submodules changed but not updated:"
msgstr "Pod-moduły zmienione, ale nie zaktualizowane:"
-#: wt-status.c:938
+#: wt-status.c:991
msgid "Submodule changes to be committed:"
-msgstr "Zmiany w pod-modułach do złożenia:"
+msgstr "Zmiany w podmodułach do złożenia:"
-#: wt-status.c:1020
+#: wt-status.c:1073
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9652,7 +10039,7 @@
"Nie zmieniaj ani nie usuwaj wiersza powyżej.\n"
"Wszystko po nim będzie pominięte."
-#: wt-status.c:1112
+#: wt-status.c:1165
#, c-format
msgid ""
"\n"
@@ -9663,55 +10050,55 @@
"Obliczenie wartości gałęzi przed/w tyle zajęło %.2f sekund.\n"
"Możesz użyć „--no-ahead-behind”, aby tego uniknąć.\n"
-#: wt-status.c:1142
+#: wt-status.c:1195
msgid "You have unmerged paths."
msgstr "Masz niescalone ścieżki."
-#: wt-status.c:1145
+#: wt-status.c:1198
msgid " (fix conflicts and run \"git commit\")"
msgstr " (napraw konflikty i wykonaj „git commit”)"
-#: wt-status.c:1147
+#: wt-status.c:1200
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (użyj „git merge --abort”, aby przerwać scalanie)"
-#: wt-status.c:1151
+#: wt-status.c:1204
msgid "All conflicts fixed but you are still merging."
msgstr "Wszystkie konflikty naprawione, ale wciąż trwa scalanie."
-#: wt-status.c:1154
+#: wt-status.c:1207
msgid " (use \"git commit\" to conclude merge)"
msgstr " (użyj „git commit”, żeby zwieńczyć scalanie)"
-#: wt-status.c:1163
+#: wt-status.c:1216
msgid "You are in the middle of an am session."
msgstr "Jesteś w trakcie sesji am."
-#: wt-status.c:1166
+#: wt-status.c:1219
msgid "The current patch is empty."
msgstr "Obecna ścieżka jest pusta."
-#: wt-status.c:1170
+#: wt-status.c:1223
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (napraw konflikty i wykonaj „git am --continue”)"
-#: wt-status.c:1172
+#: wt-status.c:1225
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (użyj „git am --skip” aby pominąć tę łatkę)"
-#: wt-status.c:1174
+#: wt-status.c:1227
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (użyj „git am --abort”, aby przywrócić pierwotną gałąź)"
-#: wt-status.c:1307
+#: wt-status.c:1360
msgid "git-rebase-todo is missing."
msgstr "brakuje git-rebase-todo."
-#: wt-status.c:1309
+#: wt-status.c:1362
msgid "No commands done."
msgstr "Nie wykonano żadnych poleceń."
-#: wt-status.c:1312
+#: wt-status.c:1365
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
@@ -9719,16 +10106,16 @@
msgstr[1] "Ostatnie polecenia wykonane (wykonano %d polecenia):"
msgstr[2] "Ostatnie polecenia wykonane (wykonano %d poleceń):"
-#: wt-status.c:1323
+#: wt-status.c:1376
#, c-format
msgid " (see more in file %s)"
msgstr " (zobacz więcej w pliku %s)"
-#: wt-status.c:1328
+#: wt-status.c:1381
msgid "No commands remaining."
msgstr "Brak pozostałych poleceń."
-#: wt-status.c:1331
+#: wt-status.c:1384
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
@@ -9736,186 +10123,190 @@
msgstr[1] "Następne polecenia do wykonania (pozostały %d polecenia):"
msgstr[2] "Następne polecenia do wykonania (pozostało %d poleceń):"
-#: wt-status.c:1339
+#: wt-status.c:1392
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (użyj „git rebase --edit-todo”, aby wyświetlić i edytować)"
-#: wt-status.c:1351
+#: wt-status.c:1404
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Przestawiasz właśnie gałąź „%s” na „%s”."
-#: wt-status.c:1356
+#: wt-status.c:1409
msgid "You are currently rebasing."
msgstr "Jesteś w trakcie przestawiania."
-#: wt-status.c:1369
+#: wt-status.c:1422
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (napraw konflikty i wykonaj „git rebase --continue”)"
-#: wt-status.c:1371
+#: wt-status.c:1424
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (użyj „git rebase --skip” aby pominąć tę łatkę)"
-#: wt-status.c:1373
+#: wt-status.c:1426
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (użyj „git rebase --abort”, aby wybrać pierwotną gałąź)"
-#: wt-status.c:1380
+#: wt-status.c:1433
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (wszystkie konflikty naprawione: wykonaj „git rebase --continue”)"
-#: wt-status.c:1384
+#: wt-status.c:1437
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "Dzielisz właśnie zapis podczas przestawiania gałęzi „%s” na „%s”."
-#: wt-status.c:1389
+#: wt-status.c:1442
msgid "You are currently splitting a commit during a rebase."
msgstr "Dzielisz właśnie zapis podczas przestawiania."
-#: wt-status.c:1392
+#: wt-status.c:1445
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Kiedy katalog roboczy będzie czysty, wykonaj „git rebase --continue”)"
-#: wt-status.c:1396
+#: wt-status.c:1449
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "Edytujesz właśnie zapis podczas przestawiania gałęzi „%s” na „%s”."
-#: wt-status.c:1401
+#: wt-status.c:1454
msgid "You are currently editing a commit during a rebase."
msgstr "Edytujesz właśnie zapis podczas przestawiania."
-#: wt-status.c:1404
+#: wt-status.c:1457
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (użyj „git commit --amend”, aby poprawić bieżący zapis)"
-#: wt-status.c:1406
+#: wt-status.c:1459
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (użyj „git rebase --continue”, kiedy zadowolisz się swoimi zmianami)"
-#: wt-status.c:1417
+#: wt-status.c:1470
msgid "Cherry-pick currently in progress."
msgstr "Trwa właśnie dobieranie."
-#: wt-status.c:1420
+#: wt-status.c:1473
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Dobierasz właśnie zapis %s."
-#: wt-status.c:1427
+#: wt-status.c:1480
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (napraw konflikty i wykonaj „git cherry-pick --continue”)"
-#: wt-status.c:1430
+#: wt-status.c:1483
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (wykonaj „git cherry-pick --continue”, aby kontynuować)"
-#: wt-status.c:1433
+#: wt-status.c:1486
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (wszystkie konflikty naprawione: wykonaj „git cherry-pick --continue”)"
-#: wt-status.c:1435
+#: wt-status.c:1488
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (użyj „git cherry-pick --skip”, aby pominąć tę łatkę)"
-#: wt-status.c:1437
+#: wt-status.c:1490
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (użyj „git cherry-pick --abort”, aby przerwać dobieranie)"
-#: wt-status.c:1447
+#: wt-status.c:1500
msgid "Revert currently in progress."
msgstr "Trwa właśnie odwracanie."
-#: wt-status.c:1450
+#: wt-status.c:1503
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Odwracasz właśnie zapis %s."
-#: wt-status.c:1456
+#: wt-status.c:1509
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (napraw konflikty i wykonaj „git revert --continue”)"
-#: wt-status.c:1459
+#: wt-status.c:1512
msgid " (run \"git revert --continue\" to continue)"
msgstr " (wykonaj „git revert --continue”, aby kontynuować)"
-#: wt-status.c:1462
+#: wt-status.c:1515
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (wszystkie konflikty naprawione: wykonaj „git revert --continue”)"
-#: wt-status.c:1464
+#: wt-status.c:1517
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (użyj „git revert --skip” aby pominąć tę łatkę)"
-#: wt-status.c:1466
+#: wt-status.c:1519
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (użyj „git revert --abort”, aby przerwać odwracanie)"
-#: wt-status.c:1476
+#: wt-status.c:1529
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Jesteś w trakcie przeszukiwania, począwszy od gałęzi „%s”."
-#: wt-status.c:1480
+#: wt-status.c:1533
msgid "You are currently bisecting."
msgstr "Jesteś w trakcie przeszukiwania."
-#: wt-status.c:1483
+#: wt-status.c:1536
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (użyj „git bisect reset”, aby powrócić na pierwotną gałąź)"
-#: wt-status.c:1494
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "Jesteś w rzadkim wybraniu."
+
+#: wt-status.c:1550
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr "Jesteś w rzadkim wybraniu z obecnym %d%% śledzonych plików."
-#: wt-status.c:1733
+#: wt-status.c:1794
msgid "On branch "
msgstr "Na gałęzi "
-#: wt-status.c:1740
+#: wt-status.c:1801
msgid "interactive rebase in progress; onto "
msgstr "trwa interaktywne przestawianie na "
-#: wt-status.c:1742
+#: wt-status.c:1803
msgid "rebase in progress; onto "
msgstr "trwa przestawianie na "
-#: wt-status.c:1747
+#: wt-status.c:1808
msgid "HEAD detached at "
msgstr "HEAD odłączone na "
-#: wt-status.c:1749
+#: wt-status.c:1810
msgid "HEAD detached from "
msgstr "HEAD odłączone od "
-#: wt-status.c:1752
+#: wt-status.c:1813
msgid "Not currently on any branch."
msgstr "Nie jesteś na żadnej gałęzi."
-#: wt-status.c:1769
+#: wt-status.c:1830
msgid "Initial commit"
msgstr "Pierwszy zapis"
-#: wt-status.c:1770
+#: wt-status.c:1831
msgid "No commits yet"
msgstr "Jeszcze nie ma zapisów"
-#: wt-status.c:1784
+#: wt-status.c:1845
msgid "Untracked files"
msgstr "Nieśledzone pliki"
-#: wt-status.c:1786
+#: wt-status.c:1847
msgid "Ignored files"
msgstr "Ignorowane pliki"
-#: wt-status.c:1790
+#: wt-status.c:1851
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9926,30 +10317,30 @@
"może to przyspieszyć, ale musisz wtedy pilnować dodawania\n"
"nowych plików (zobacz „git help status”)."
-#: wt-status.c:1796
+#: wt-status.c:1857
#, c-format
msgid "Untracked files not listed%s"
msgstr "Nie wypisano nieśledzonych plików%s"
-#: wt-status.c:1798
+#: wt-status.c:1859
msgid " (use -u option to show untracked files)"
msgstr " (użyj opcji -u, aby pokazać nieśledzone pliki)"
-#: wt-status.c:1804
+#: wt-status.c:1865
msgid "No changes"
msgstr "Brak zmian"
-#: wt-status.c:1809
+#: wt-status.c:1870
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "brak zmian dodanych do zapisu (użyj „git add” i/lub „git commit -a”)\n"
-#: wt-status.c:1813
+#: wt-status.c:1874
#, c-format
msgid "no changes added to commit\n"
msgstr "brak zmian dodanych do zapisu\n"
-#: wt-status.c:1817
+#: wt-status.c:1878
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9958,67 +10349,85 @@
"nie dodano nic do złożenia, ale są nieśledzone pliki (użyj „git add”, aby "
"śledzić)\n"
-#: wt-status.c:1821
+#: wt-status.c:1882
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "nie dodano nic do złożenia, ale są nieśledzone pliki\n"
-#: wt-status.c:1825
+#: wt-status.c:1886
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "nic do złożenia (utwórz/wkopiuj pliki i użyj „git add”, aby śledzić)\n"
-#: wt-status.c:1829 wt-status.c:1835
+#: wt-status.c:1890 wt-status.c:1896
#, c-format
msgid "nothing to commit\n"
msgstr "nic do złożenia\n"
-#: wt-status.c:1832
+#: wt-status.c:1893
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "nic do złożenia (użyj -u, aby pokazać nieśledzone pliki)\n"
-#: wt-status.c:1837
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nic do złożenia, drzewo robocze czyste\n"
-#: wt-status.c:1942
+#: wt-status.c:2003
msgid "No commits yet on "
msgstr "Jeszcze nie ma zapisów na "
-#: wt-status.c:1946
+#: wt-status.c:2007
msgid "HEAD (no branch)"
msgstr "HEAD (brak gałęzi)"
-#: wt-status.c:1977
+#: wt-status.c:2038
msgid "different"
msgstr "różne"
-#: wt-status.c:1979 wt-status.c:1987
+#: wt-status.c:2040 wt-status.c:2048
msgid "behind "
msgstr "wstecz "
-#: wt-status.c:1982 wt-status.c:1985
+#: wt-status.c:2043 wt-status.c:2046
msgid "ahead "
msgstr "do przodu "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2507
+#: wt-status.c:2569
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "nie można wykonać %s: masz nieprzygotowane zmiany."
-#: wt-status.c:2513
+#: wt-status.c:2575
msgid "additionally, your index contains uncommitted changes."
msgstr "dodatkowo, twój indeks zawiera nieoddane zmiany."
-#: wt-status.c:2515
+#: wt-status.c:2577
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "nie można wykonać %s: Twój indeks zawiera niezłożone zmiany."
-#: compat/precompose_utf8.c:58 builtin/clone.c:457
+#: compat/simple-ipc/ipc-unix-socket.c:183
+msgid "could not send IPC command"
+msgstr "nie można wysłać polecenia IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:190
+msgid "could not read IPC response"
+msgstr "nie można odczytać odpowiedzi IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:870
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "nie można uruchomić accept_thread „%s”"
+
+#: compat/simple-ipc/ipc-unix-socket.c:882
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "nie można uruchomić worker[0] do „%s”"
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "nie można wykonać unlink na „%s”"
@@ -10027,131 +10436,130 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opcje>] [--] <ścieżka>..."
-#: builtin/add.c:58
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "nie można wykonać chmod %cx „%s”"
-#: builtin/add.c:96
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "niespodziewany stan diff %c"
-#: builtin/add.c:101 builtin/commit.c:285
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "aktualizacja plików nie powiodła się"
-#: builtin/add.c:111
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "usuń „%s”\n"
-#: builtin/add.c:186
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "Wycofane zmiany po odświeżeniu indeksu:"
-#: builtin/add.c:280 builtin/rev-parse.c:991
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Nie można odczytać indeksu"
-#: builtin/add.c:291
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Nie można otworzyć „%s” do zapisywania."
-
-#: builtin/add.c:295
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "Nie można zapisać łatki"
-#: builtin/add.c:298
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "edycja łatki nie powiodła się"
-#: builtin/add.c:301
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "Nie można wykonać stat na „%s”"
-#: builtin/add.c:303
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "Pusta łatka. Przerwano."
-#: builtin/add.c:308
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "Nie można zastosować „%s”"
-#: builtin/add.c:316
+#: builtin/add.c:351
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Poniższe ścieżki są ignorowane przez jeden z plików .gitignore:\n"
-#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "na sucho"
-#: builtin/add.c:339
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "interaktywne wybieranie"
-#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "wybierz skrawki interaktywnie"
-#: builtin/add.c:341
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "zmień bieżące różnice i zastosuj"
-#: builtin/add.c:342
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "pozwól na dodawanie inaczej ignorowanych plików"
-#: builtin/add.c:343
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "aktualizuj śledzone pliki"
-#: builtin/add.c:344
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "znormalizuj ponownie końce wierszy w śledzonych plikach (zakłada -u)"
-#: builtin/add.c:345
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "zapisz tylko, że ścieżka zostanie dodana później"
-#: builtin/add.c:346
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr "dodaj zmiany z plików śledzonych i nieśledzonych"
-#: builtin/add.c:349
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "pomiń ścieżki usunięte w drzewie roboczym (to samo, co --no-all)"
-#: builtin/add.c:351
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "nie dodawaj, tylko odśwież indeks"
-#: builtin/add.c:352
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr "po prostu pomiń pliki, których nie można dodać z powodu błędów"
-#: builtin/add.c:353
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr "sprawdź na sucho, czy pliki o takich ścieżkach byłyby ignorowane"
-#: builtin/add.c:355 builtin/update-index.c:1004
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "pozwól aktualizować elementy poza stożkiem rzadkiego wybrania"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "wymuś bit wykonywalności podanych plików"
-#: builtin/add.c:357
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "ostrzegaj przed dodawaniem wbudowanego repozytorium"
-#: builtin/add.c:359
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "silnik do „git stash -p”"
-#: builtin/add.c:377
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10171,7 +10579,7 @@
"Dodano inne repozytorium wewnątrz bieżącego repozytorium.\n"
"Klony zewnętrznego repozytorium nie będą zawierać zawartości\n"
"zawartego repozytorium i nie będą wiedziały, jak ją uzyskać.\n"
-"Jeśli chodziło o dodanie pod-modułu, użyj:\n"
+"Jeśli chodziło o dodanie podmodułu, użyj:\n"
"\n"
"\tgit submodule add <url> %s\n"
"\n"
@@ -10182,12 +10590,12 @@
"\n"
"Więcej informacji w „git help submodule”."
-#: builtin/add.c:405
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "dodawanie wbudowanego repozytorium gita: %s"
-#: builtin/add.c:424
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10197,47 +10605,51 @@
"Wyłącz ten komunikat wykonując\n"
"„git config advice.addIgnoredFile false”"
-#: builtin/add.c:433
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "dodawanie plików nie powiodło się"
-#: builtin/add.c:461 builtin/commit.c:345
+#: builtin/add.c:513
+msgid "--dry-run is incompatible with --interactive/--patch"
+msgstr "--dry-run i --interactive/--patch się wykluczają"
+
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file i --interactive/--patch się wykluczają"
-#: builtin/add.c:478
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file i --edit się wykluczają"
-#: builtin/add.c:490
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A i -u się wykluczają"
-#: builtin/add.c:493
+#: builtin/add.c:547
msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Opcja --ignore-missing może być użyta tylko z --dry-run"
+msgstr "Opcji --ignore-missing można użyć tylko z --dry-run"
-#: builtin/add.c:497
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "parametr --chmod „%s” musi być „-x” albo „+x”"
-#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
-#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file i argumenty ze ścieżkami się wykluczają"
-#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
-#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul wymaga --pathspec-from-file"
-#: builtin/add.c:526
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nic nie podano, nic nie dodano.\n"
-#: builtin/add.c:528
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10247,110 +10659,110 @@
"Wyłącz ten komunikat wykonując\n"
"„git config advice.addEmptyPathspec false”"
-#: builtin/am.c:352
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "nie można przetworzyć skryptu autorstwa"
-#: builtin/am.c:436
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "skrypt applypatch-msg usunął „%s”"
-#: builtin/am.c:478
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Uszkodzony wiersz wejścia: „%s”."
-#: builtin/am.c:516
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Nie można skopiować uwag z „%s” do „%s”"
-#: builtin/am.c:542
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "fseek nie powiodło się"
-#: builtin/am.c:730
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "nie można przetworzyć łatki „%s”"
-#: builtin/am.c:795
+#: builtin/am.c:815
msgid "Only one StGIT patch series can be applied at once"
msgstr "Tylko jedna seria łatek StGIT może być nałożona jednocześnie"
-#: builtin/am.c:843
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "nieprawidłowy znacznik czasu"
-#: builtin/am.c:848 builtin/am.c:860
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "nieprawidłowy wiersz Date"
-#: builtin/am.c:855
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "nieprawidłowe przesunięcie strefy czasowej"
-#: builtin/am.c:948
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "Nie można wykryć formatu łatki."
-#: builtin/am.c:953 builtin/clone.c:410
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "nie można utworzyć katalogu „%s”"
-#: builtin/am.c:958
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "Nie można rozdzielić łatek."
-#: builtin/am.c:1089
+#: builtin/am.c:1127
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Kiedy rozwiążesz problem, wykonaj „%s --continue”."
-#: builtin/am.c:1090
+#: builtin/am.c:1128
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Jeśli wolisz pominąć tę łatkę, wykonaj zamiast tego „%s --skip”."
-#: builtin/am.c:1091
+#: builtin/am.c:1129
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Aby przywrócić pierwotną gałąź i przerwać łatanie, uruchom „%s --abort”."
-#: builtin/am.c:1174
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Wysłano łatkę z formatem=flowed; odstępy na końcach wierszy mogą zostać "
"stracone."
-#: builtin/am.c:1202
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "Łatka jest pusta."
-#: builtin/am.c:1267
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "brakuje wiersza autorstwa w zapisie %s"
-#: builtin/am.c:1270
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "błędny wiersz tożsamości: %.*s"
-#: builtin/am.c:1489
+#: builtin/am.c:1539
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"W repozytorium brakuje blobów, potrzebnych żeby uciec się do trójstronnego "
"scalania."
-#: builtin/am.c:1491
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
msgstr "Używanie informacji z indeksu do odtworzenia drzewa podstawy..."
-#: builtin/am.c:1510
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10358,24 +10770,24 @@
"Czy łatka była zmieniana ręcznie?\n"
"Nie stosuje się do plików zapisanych w swoim indeksie."
-#: builtin/am.c:1516
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr "Uciekanie się do podstawy łatania i trójstronnego scalania..."
-#: builtin/am.c:1542
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "Nie można scalić zmian."
-#: builtin/am.c:1574
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "stosowanie na pustej historii"
-#: builtin/am.c:1626 builtin/am.c:1630
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "nie można wznowić: %s nie istnieje."
-#: builtin/am.c:1648
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "Zawartość zapisu to:"
@@ -10383,41 +10795,41 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1658
+#: builtin/am.c:1708
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Zastosować? tak [y]/[n]ie/[e]dycja/wyświetl łatkę [v]/za[a]kceptuj "
"wszystkie: "
-#: builtin/am.c:1704 builtin/commit.c:395
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "nie można zapisać pliku indeksu"
-#: builtin/am.c:1708
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Brudny indeks: nie można zastosować łatek (brudny: %s)"
-#: builtin/am.c:1748 builtin/am.c:1816
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "Stosowanie: %.*s"
-#: builtin/am.c:1765
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr "Brak zmian -- łatka już zastosowana."
-#: builtin/am.c:1771
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Łatanie nie powiodło się przy %s %.*s"
-#: builtin/am.c:1775
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "Użyj „git am --show-current-patch=diff”, aby zobaczyć zawodną łatkę"
-#: builtin/am.c:1819
+#: builtin/am.c:1868
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10427,7 +10839,7 @@
"Jeśli nic nie zostało do przygotowania, jest szansa, że coś innego\n"
"już wprowadziło te same zmiany; możesz chcieć pominąć tę łatkę."
-#: builtin/am.c:1826
+#: builtin/am.c:1875
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10440,17 +10852,17 @@
"Możesz chcieć wykonać „git rm” na pliku, aby zaakceptować na nim „usunięcie "
"przez nich”."
-#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "Nie można przetworzyć obiektu „%s”."
-#: builtin/am.c:1985
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "nie można wyczyścić indeksu"
-#: builtin/am.c:2029
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10458,156 +10870,160 @@
"Wydaje się, że HEAD się przesunęło od ostatniego niepowodzenia „am”.\n"
"Nie cofanie do ORIG_HEAD"
-#: builtin/am.c:2136
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Nieprawidłowa wartość --patch-format: %s"
-#: builtin/am.c:2178
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Nieprawidłowa wartość --show-current-patch: %s"
-#: builtin/am.c:2182
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s i --show-current-patch=%s się wykluczają"
-#: builtin/am.c:2213
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opcje>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcje>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "uruchom interaktywnie"
-#: builtin/am.c:2222
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "opcja historyczna — nic nie robi"
-#: builtin/am.c:2224
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr "zezwól na uciekanie się do trójstronnego scalania, jeśli potrzebne"
-#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
-#: builtin/repack.c:334 builtin/stash.c:882
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "mniej komunikatów"
-#: builtin/am.c:2227
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "dodaj końcówkę Signed-off-by do komunikatu zapisu"
-#: builtin/am.c:2230
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "przekoduj na utf8 (domyślnie)"
-#: builtin/am.c:2232
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "przekaż flagę -k do git-mailinfo"
-#: builtin/am.c:2234
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "przekaż flagę -b do git-mailinfo"
-#: builtin/am.c:2236
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "przekaż flagę -m do git-mailinfo"
-#: builtin/am.c:2238
+#: builtin/am.c:2289
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "przekaż flagę --keep-cr do git-mailsplit przy formacie mbox"
-#: builtin/am.c:2241
+#: builtin/am.c:2292
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"nie przekazuj flagi --keep-cr do git-mailsplit, niezależnie od am.keepcr"
-#: builtin/am.c:2244
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "odetnij wszystko przed wierszem nożyczek"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2297
+msgid "pass it through git-mailinfo"
+msgstr "przepuść przez git-mailinfo"
+
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "przepuść przez git-apply"
-#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
-#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
-#: parse-options.h:316
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
-#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2270
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "format, w którym są łatki"
-#: builtin/am.c:2276
+#: builtin/am.c:2330
msgid "override error message when patch failure occurs"
msgstr "zastąp komunikat błędu, kiedy wystąpi błąd łatania"
-#: builtin/am.c:2278
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr "kontynuuj stosowanie łatek po rozwiązaniu konfliktu"
-#: builtin/am.c:2281
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "zamienniki dla --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "pomiń obecną ścieżkę"
-#: builtin/am.c:2287
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
msgstr "przywróć pierwotną gałąź i przerwij łatanie"
-#: builtin/am.c:2290
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr "przerwij operację łatania, ale zostaw HEAD, gdzie jest"
-#: builtin/am.c:2294
+#: builtin/am.c:2348
msgid "show the patch being applied"
msgstr "pokaż właśnie stosowaną łatkę"
-#: builtin/am.c:2299
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "zmyśl datę zapisu"
-#: builtin/am.c:2301
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr "użyj bieżącego znacznika czasu jako daty utworzenia"
-#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
-#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "id-klucza"
-#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "podpisuj zapisy GPG"
-#: builtin/am.c:2307
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "(użycie wewnętrzne w git-rebase)"
-#: builtin/am.c:2325
+#: builtin/am.c:2379
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."
@@ -10615,17 +11031,17 @@
"Opcja -b/--binary nic nie robi od dłuższego czasu i zostanie\n"
"usunięta. Nie używaj jej już."
-#: builtin/am.c:2332
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "nie można odczytać indeksu"
-#: builtin/am.c:2347
+#: builtin/am.c:2401
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"poprzedni katalog przestawiania %s nadal istnieje, ale podano skrzynkę mbox."
-#: builtin/am.c:2371
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10634,11 +11050,11 @@
"Znaleziono bezpański katalog %s.\n"
"Użyj „git am --abort” aby go usunąć."
-#: builtin/am.c:2377
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Nie trwa operacja rozwiązywania, nie wznawiamy."
-#: builtin/am.c:2387
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "tryb interaktywny wymaga łatek w wierszu poleceń"
@@ -10646,46 +11062,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opcje>] [<łatka>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "nie można utworzyć pliku archiwum „%s”"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "nie można przekierować wyjścia"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Zdalne repozytorium bez adresu"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: oczekiwano ACK/NAK, otrzymano pakiet wypróżnienia"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: błąd protokołu"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: oczekiwano wypróżnienia"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<zapis>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <dobre_określenie> <złe_określenie> "
-"[<określenie>]"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10724,73 +11129,86 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<rewizja>|<zakres>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <polecenie>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "nie można otworzyć pliku „%s” w trybie „%s”"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "nie można pisać do pliku „%s”"
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "nie można otworzyć pliku „%s” do czytania"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "„%s” nie jest prawidłowym sformułowaniem"
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "nie można użyć wbudowanego polecenia „%s” jako sformułowania"
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "nie można zmienić znaczenia sformułowania „%s”"
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "użyj dwóch różnych sformułowań"
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "Teraz nie przeszukujemy.\n"
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "„%s” nie jest prawidłowym zapisem"
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
"nie można wybrać pierwotnego HEAD „%s”. Spróbuj „git bisect reset <zapis>”."
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Błędny argument bisect_write: %s"
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "nie można uzyskać oid rewizji „%s”"
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "nie można otworzyć pliku „%s”"
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Nieprawidłowe polecenie: przeszukujesz teraz %s/%s"
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10799,7 +11217,7 @@
"Wtedy podaj przynajmniej jedną rewizję %s i jedną %s.\n"
"Możesz użyć do tego „git bisect %s” i „git bisect %s”."
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10810,7 +11228,7 @@
"Wtedy podaj przynajmniej jedną rewizję %s i jedną %s.\n"
"Możesz użyć do tego „git bisect %s” i „git bisect %s”."
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "przeszukiwanie tylko z zapisem %s"
@@ -10819,15 +11237,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Czy na pewno [Y/n]? "
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "nie zdefiniowano sformułowań"
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10836,7 +11254,7 @@
"Bieżące sformułowania to %s na stary stan\n"
"i %s na nowy stan.\n"
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10845,54 +11263,54 @@
"nieprawidłowy argument %s do „git bisect terms”.\n"
"Wspierane opcje to: --term-good | --term-old i --term-bad | --term-new."
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "nie udało się przygotować przejścia rewizji\n"
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "nie można otworzyć „%s” do dopisywania"
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "„” nie jest prawidłowym sformułowaniem"
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "nierozpoznana opcja: „%s”"
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "„%s” nie wydaje się być prawidłową rewizją"
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "złe HEAD — potrzeba HEAD"
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"wybieranie „%s” nie powiodło się. Spróbuj „git bisect start <prawidłowa-"
"gałąź>”."
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "nie przeszukam na drzewie cg-seek'owanym"
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "złe HEAD — dziwna referencja symboliczna"
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "nieprawidłowa referencja: „%s”"
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Musisz rozpocząć przez „git bisect start”\n"
@@ -10900,99 +11318,151 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Chcesz, żeby to teraz zrobić [Y/n]? "
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Wywołaj „--bisect-state” z przynajmniej jednym argumentem"
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "„git bisect %s” przyjmuje tylko jeden argument."
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Błędne wejście rev: %s"
-#: builtin/bisect--helper.c:912
+#: builtin/bisect--helper.c:904
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Błędne wejście rev (nie jest zapisem): %s"
+
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Teraz nie przeszukujemy."
-#: builtin/bisect--helper.c:962
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "„%s”?? o czym ty w ogóle mówisz?"
-#: builtin/bisect--helper.c:974
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "nie można odczytać „%s” do odtwarzania"
-#: builtin/bisect--helper.c:1047
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "przeszukanie nie powiodło się: nie podano polecenia."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "wykonywanie %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"przeszukanie nie powiodło się: kod wyjścia %d z „%s” jest < 0 lub >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "nie można otworzyć pliku „%s” do zapisywania"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "przeszukanie nie może już kontynuować"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "przeszukanie pomyślne"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "przeszukiwanie znalazło pierwszy zły zapis"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"przeszukanie nie powiodło się: „git bisect--helper --bisect-state %s” "
+"zakończył się z kodem błędu %d"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "zresetuj stan przeszukiwania"
-#: builtin/bisect--helper.c:1049
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "sprawdź, czy istnieją złe lub dobre określenia"
-#: builtin/bisect--helper.c:1051
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "wypisz tylko określenia przeszukiwania"
-#: builtin/bisect--helper.c:1053
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "rozpocznij sesję przeszukiwania"
-#: builtin/bisect--helper.c:1055
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "znajdź kolejny zapis do przeszukiwania"
-#: builtin/bisect--helper.c:1057
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "oznacz stan referencji"
-#: builtin/bisect--helper.c:1059
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "wypisz dotychczasowe kroki przeszukiwania"
-#: builtin/bisect--helper.c:1061
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "odtwórz proces przeszukiwania z podanego pliku"
-#: builtin/bisect--helper.c:1063
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "pomiń niektóre zapisy do wybrania"
-#: builtin/bisect--helper.c:1065
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "wizualizuj przeszukiwanie"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "użyj <polecenia>... do automatycznego przeszukiwania."
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "brak dziennika do BISECT_WRITE"
-#: builtin/bisect--helper.c:1080
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset wymaga jako argumentu albo niczego albo zapisu"
-#: builtin/bisect--helper.c:1085
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check wymaga 2 albo 3 argumentów"
-
-#: builtin/bisect--helper.c:1091
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms wymaga maksymalnie jednego argumentu"
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next wymaga braku argumentów"
-#: builtin/bisect--helper.c:1111
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log wymaga braku argumentów"
-#: builtin/bisect--helper.c:1116
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "nie podano pliku dziennika"
@@ -11004,149 +11474,151 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<opcje-rewizji> są opisane w git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "oczekiwano koloru: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "musi się kończyć kolorem"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "błędny kolor „%s” w color.blame.repeatedLines"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "nieprawidłowa wartość blame.coloring"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "nie znaleziono rewizji %s do pominięcia"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr "pokaż elementy oskarżenia w miarę znajdywania, przyrostowo"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr "nie pokazuj nazw obiektów w brzegowych zapisach (domyślnie wyłączone)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "nie traktuj zapisów-korzeni jako granic (domyślnie wyłączone)"
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "pokaż statystyki kosztu pracy"
-#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
-#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "wymuś zgłaszanie postępu"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "pokaż wynik wyjściowy elementów oskarżenia"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr "pokazuj pierwotną nazwę pliku (Domyślnie: automatycznie)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr "pokaż pierwotny numer wiersza (domyślnie wyłączone)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "pokaż w formacie zaprojektowanym do przetwarzania maszynowego"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr "pokaż w porcelanowym formacie z informacją o zapisie w każdym wierszu"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "użyj tego samego trybu wyjścia, co git-annotate (domyślnie wyłączone)"
-#: builtin/blame.c:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "pokaż surowy znacznik czasu (domyślnie wyłączone)"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "pokaż długie SHA-1 zapisu (domyślnie wyłączone)"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr "nie wypisuj nazwiska autora i znacznika czasu (domyślnie wyłączone)"
-#: builtin/blame.c:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr "pokaż adres e-mail autora zamiast nazwiska (domyślnie wyłączone)"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "ignoruj różnice w białych znakach"
-#: builtin/blame.c:883 builtin/log.c:1812
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "rewizja"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "pomiń <rewizję> przy obwinianiu"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "pomiń rewizje z <pliku>"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr "koloruj inaczej zbędne metadane z poprzedniego wiersza"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "koloruj wiersze według wieku"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr "poświęć dodatkowe cykle, aby znaleźć lepsze dopasowanie"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "użyj rewizji z <pliku> zamiast wołać git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "użyj zawartości <pliku> jako ostatecznego obrazu"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "wynik"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr "znajdź kopie wierszy w plikach i pomiędzy nimi"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr "znajdź ruchy wierszy w plikach i pomiędzy nimi"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "zakres"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "przetwórz tylko zakres <start>,<end> lub funkcję :<nazwa-funkcji>"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "nie można użyć --progress z --incremental ani formatami porcelanowymi"
@@ -11158,11 +11630,11 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "4 lata, 11 miesięcy temu"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -11170,7 +11642,7 @@
msgstr[1] "plik %s ma tylko %lu wiersze"
msgstr[2] "plik %s ma tylko %lu wierszy"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "Obwinianie wierszy"
@@ -11271,77 +11743,77 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "Usunięto gałąź %s (wskazywała %s).\n"
-#: builtin/branch.c:438 builtin/tag.c:61
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "nie można przetworzyć łańcucha formatu"
-#: builtin/branch.c:469
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "nie można rozwiązać HEAD"
-#: builtin/branch.c:475
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) wskazuje poza refs/heads/"
-#: builtin/branch.c:490
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Gałąź %s jest przestawiana na %s"
-#: builtin/branch.c:494
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Gałąź %s jest przeszukiwana w %s"
-#: builtin/branch.c:511
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "nie można skopiować bieżącej gałęzi, gdy nie ma żadnej bieżącej."
-#: builtin/branch.c:513
+#: builtin/branch.c:516
msgid "cannot rename the current branch while not on any."
msgstr "nie można zmienić nazwy bieżącej gałęzi, gdy nie ma żadnej bieżącej."
-#: builtin/branch.c:524
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nieprawidłowa nazwa gałęzi: „%s”"
-#: builtin/branch.c:553
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "Zmiana nazwy gałęzi nie powiodła się"
-#: builtin/branch.c:555
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "Kopiowanie gałęzi nie powiodło się"
-#: builtin/branch.c:559
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Skopiowano źle nazwaną gałąź „%s”"
-#: builtin/branch.c:562
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Poprawiono nazwę gałęzi „%s”"
-#: builtin/branch.c:568
+#: builtin/branch.c:571
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Nazwa gałęzi zmieniona na %s, ale czoło HEAD nie jest zaktualizowane!"
-#: builtin/branch.c:577
+#: builtin/branch.c:580
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Zmieniono nazwę gałęzi, ale aktualizacja pliku konfiguracyjnego nie powiodła "
"się"
-#: builtin/branch.c:579
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"Skopiowano gałąź, ale aktualizacja pliku konfiguracyjnego nie powiodła się"
-#: builtin/branch.c:595
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11352,180 +11824,180 @@
" %s\n"
"Wiersze zaczynające się od „%c” zostaną wycięte.\n"
-#: builtin/branch.c:629
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "Opcje ogólne"
-#: builtin/branch.c:631
+#: builtin/branch.c:634
msgid "show hash and subject, give twice for upstream branch"
msgstr "pokaż skrót i temat; podaj dwukrotnie, aby wypisać gałąź nadrzędną"
-#: builtin/branch.c:632
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "pomiń komunikaty informacyjne"
-#: builtin/branch.c:633
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "ustaw tryb śledzenia (zobacz git-pull(1))"
-#: builtin/branch.c:635
+#: builtin/branch.c:638
msgid "do not use"
msgstr "nie używaj"
-#: builtin/branch.c:637 builtin/rebase.c:534
+#: builtin/branch.c:640
msgid "upstream"
msgstr "zdalne-repozytorium"
-#: builtin/branch.c:637
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "zmień gałąź nadrzędną"
-#: builtin/branch.c:638
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr "usuń informacje o gałęzi nadrzędnej"
-#: builtin/branch.c:639
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "użyj kolorowego wyjścia"
-#: builtin/branch.c:640
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "działaj na gałęziach śledzących"
-#: builtin/branch.c:642 builtin/branch.c:644
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "wypisz tylko gałęzie zawierające ten zapis"
-#: builtin/branch.c:643 builtin/branch.c:645
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "wypisz tylko gałęzie nie zawierające tego zapisu"
-#: builtin/branch.c:648
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "Działania typowe dla git-branch:"
-#: builtin/branch.c:649
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr "wypisz i śledzące i lokalne gałęzie"
-#: builtin/branch.c:651
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "usuń całkowicie scaloną gałąź"
-#: builtin/branch.c:652
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "usuń gałąź (nawet niescaloną)"
-#: builtin/branch.c:653
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr "przenieś gałąź i jej dziennik referencji / zmień ich nazwę"
-#: builtin/branch.c:654
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr "przenieś gałąź / zmień jej nazwę, nawet jeśli cel istnieje"
-#: builtin/branch.c:655
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "skopiuj gałąź i jej dziennik referencji"
-#: builtin/branch.c:656
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "skopiuj gałąź, nawet jeśli cel istnieje"
-#: builtin/branch.c:657
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "wypisz nazwy gałęzi"
-#: builtin/branch.c:658
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr "pokaż nazwę bieżącej gałęzi"
-#: builtin/branch.c:659
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr "utwórz dziennik referencji gałęzi"
-#: builtin/branch.c:661
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr "edytuj opis gałęzi"
-#: builtin/branch.c:662
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr "wymuś utworzenie, przeniesienie/zmianę nazwy, usunięcie"
-#: builtin/branch.c:663
+#: builtin/branch.c:666
msgid "print only branches that are merged"
msgstr "wypisz tylko scalone gałęzie"
-#: builtin/branch.c:664
+#: builtin/branch.c:667
msgid "print only branches that are not merged"
msgstr "wypisz tylko niescalone gałęzie"
-#: builtin/branch.c:665
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr "wypisz gałęzie w kolumnach"
-#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:466
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "obiekt"
-#: builtin/branch.c:668
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "wypisz tylko gałęzie obiektu"
-#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "sortowanie i filtrowanie nie uwzględniają wielkości liter"
-#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format do użycia na wyjściu"
-#: builtin/branch.c:693 builtin/clone.c:790
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "nie znaleziono HEAD w refs/heads!"
-#: builtin/branch.c:717
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose się wykluczają"
-#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "wymagana nazwa gałęzi"
-#: builtin/branch.c:764
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "Nie można nadać opisu odłączonemu HEAD"
-#: builtin/branch.c:769
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr "nie można edytować opisu więcej niż jednej gałęzi"
-#: builtin/branch.c:776
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Jeszcze nie ma zapisów na gałęzi „%s”."
-#: builtin/branch.c:779
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "Nie ma gałęzi „%s”."
-#: builtin/branch.c:794
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "za dużo gałęzi do operacji kopiowania"
-#: builtin/branch.c:803
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "za dużo argumentów do operacji zmiany nazwy"
-#: builtin/branch.c:808
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "za dużo argumentów do ustawienia nadrzędnej gałęzi"
-#: builtin/branch.c:812
+#: builtin/branch.c:816
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11533,32 +12005,32 @@
"nie można ustawić gałęzi nadrzędnej HEAD na %s, kiedy nie wskazuje ono na "
"gałąź."
-#: builtin/branch.c:815 builtin/branch.c:838
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "nie ma takiej gałęzi „%s”"
-#: builtin/branch.c:819
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "gałąź „%s” nie istnieje"
-#: builtin/branch.c:832
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "za dużo argumentów do usunięcia nadrzędnej gałęzi"
-#: builtin/branch.c:836
+#: builtin/branch.c:840
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"nie można usunąć ustawienia gałęzi nadrzędnej HEAD, kiedy nie wskazuje ono "
"żadnej gałęzi."
-#: builtin/branch.c:842
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Gałąź „%s” nie ma informacji o gałęzi nadrzędnej"
-#: builtin/branch.c:852
+#: builtin/branch.c:856
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>?"
@@ -11566,7 +12038,7 @@
"Opcje -a i -r do „git branch” nie przyjmują nazwy gałęzi.\n"
"Czy chodziło o: -a | -r --list <wzorzec>?"
-#: builtin/branch.c:856
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11574,32 +12046,32 @@
"opcja „--set-upstream” jest przestarzała i nie jest już wspierana. Użyj "
"zamiast tego „--track” lub ”--set-upstream-to”."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "wersja gita:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() zawiodło z błędem „%s” (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "informacje o kompilacji: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "informacje o bibliotece libc: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "nie uruchomiono z repozytorium gita — brak skryptów do pokazania\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <plik>] [-s|--suffix <format>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11633,38 +12105,33 @@
"Przejrzyj resztę zgłoszenia błędu poniżej.\n"
"Możesz usunąć wiersze, którymi nie chcesz się dzielić.\n"
-#: builtin/bugreport.c:135
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "podaj cel pliku ze zgłoszeniem błędu"
-#: builtin/bugreport.c:137
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "podaj sufiks w formacie strftime do nazwy pliku"
-#: builtin/bugreport.c:159
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "nie można utworzyć wiodących katalogów „%s”"
-#: builtin/bugreport.c:166
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Informacje o systemie"
-#: builtin/bugreport.c:169
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Włączone skrypty Gita"
-#: builtin/bugreport.c:176
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "nie można utworzyć nowego pliku w „%s”"
-
-#: builtin/bugreport.c:179
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "nie można pisać do %s"
-#: builtin/bugreport.c:189
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Utworzono nowe zgłoszenie w „%s”.\n"
@@ -11685,27 +12152,27 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <plik> [<referencja>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3495
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "nie pokazuj wskaźnika postępu"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3497
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "pokazuj wskaźnik postępu"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3499
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "pokaż miernik postępu podczas fazy zapisywania obiektów"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3502
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr "podobne do --all-progress, kiedy pokazany jest wskaźnik postępu"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "podaj wersję formatu wiązki"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "Należy podać repozytorium, aby utworzyć wiązkę."
@@ -11713,25 +12180,25 @@
msgid "do not show bundle details"
msgstr "nie pokazuj szczegółów wiązki"
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "%s jest w porządku\n"
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr "Potrzebne repozytorium do podzielenia."
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "więcej komunikatów; musi być umieszczone przed pod-poleceniem"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Rozpakowywanie obiektów"
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Nieznane pod-polecenie: %s"
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11739,7 +12206,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <rodzaj> | --textconv | --filters) [--path=<ścieżka>] <obiekt>"
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -11747,73 +12214,73 @@
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "można podać tylko jedną opcję wsadową „batch”"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<rodzaj> może być jednym z: blob, tree, commit, tag"
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "pokaż typ obiektu"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "pokaż rozmiar obiektu"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "zwróć zero, kiedy nie ma błędu"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "ładnie wypisz zawartość obiektu"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr "dla obiektów blob, wykonaj textconv na zawartości obiektu"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr "dla obiektów blob, wykonaj filtry na zawartości obiektu"
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr "użyj podanej ścieżki do --textconv/--filters"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "zezwól, aby -s i -t działały z uszkodzonymi obiektami"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "buforuj wyjście --batch"
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr ""
"pokaż informacje i zawartość obiektów pobranych ze standardowego wejścia"
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "pokaż informacje o obiektach pobranych ze standardowego wejścia"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"podążaj za dowiązaniami w drzewie (do użycia z --batch lub --batch-check)"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "pokaż wszystkie obiekty z --batch lub --batch-check"
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
msgstr "nie porządkuj wyjścia --batch-all-objects"
@@ -11833,7 +12300,7 @@
msgid "use .gitattributes only from the index"
msgstr "użyj .gitattributes tylko z indeksu"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "wczytaj nazwy plików ze standardowego wejścia"
@@ -11841,8 +12308,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "zakończ wpisy wejścia i wyjścia znakiem NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
-#: builtin/worktree.c:489
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "nie zgłaszaj postępu"
@@ -11854,27 +12321,27 @@
msgid "ignore index when checking"
msgstr "pomiń indeks przy sprawdzaniu"
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:165
msgid "cannot specify pathnames with --stdin"
msgstr "nie można podać ścieżek z --stdin"
-#: builtin/check-ignore.c:166
+#: builtin/check-ignore.c:168
msgid "-z only makes sense with --stdin"
msgstr "-z ma sens tylko z --stdin"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:170
msgid "no path specified"
msgstr "nie podano ścieżki"
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:174
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet ma sens tylko z pojedynczą ścieżką"
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:176
msgid "cannot have both --quiet and --verbose"
msgstr "--quiet i --verbose się wykluczają"
-#: builtin/check-ignore.c:177
+#: builtin/check-ignore.c:179
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching ma sens tylko z --verbose"
@@ -11895,6 +12362,22 @@
msgid "no contacts specified"
msgstr "nie podano kontaktów"
+#: builtin/checkout--worker.c:110
+msgid "git checkout--worker [<options>]"
+msgstr "git checkout--worker [<opcje>]"
+
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "string"
+msgstr "łańcuch"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "przy tworzeniu plików, dodaj <łańcuch> z przodu"
+
#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<opcje>] [--] [<plik>...]"
@@ -11903,96 +12386,85 @@
msgid "stage should be between 1 and 3 or all"
msgstr "przygotowanie powinno być pomiędzy 1 a 3 lub „all”"
-#: builtin/checkout-index.c:186
+#: builtin/checkout-index.c:187
msgid "check out all files in the index"
msgstr "wybierz wszystkie pliki z indeksu"
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:188
msgid "force overwrite of existing files"
msgstr "wymuś nadpisanie istniejących plików"
-#: builtin/checkout-index.c:189
+#: builtin/checkout-index.c:190
msgid "no warning for existing files and files not in index"
msgstr "nie ostrzegaj przed istniejącymi plikami i plikami nie w indeksie"
-#: builtin/checkout-index.c:191
+#: builtin/checkout-index.c:192
msgid "don't checkout new files"
msgstr "nie wybieraj nowych plików"
-#: builtin/checkout-index.c:193
+#: builtin/checkout-index.c:194
msgid "update stat information in the index file"
msgstr "zaktualizuj informacje stat w pliku indeksu"
-#: builtin/checkout-index.c:197
+#: builtin/checkout-index.c:198
msgid "read list of paths from the standard input"
msgstr "odczytaj listę ścieżek ze standardowego wejścia"
-#: builtin/checkout-index.c:199
+#: builtin/checkout-index.c:200
msgid "write the content to temporary files"
msgstr "zapisz zawartość do plików tymczasowych"
-#: builtin/checkout-index.c:200 builtin/column.c:31
-#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
-#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
-#: builtin/worktree.c:717
-msgid "string"
-msgstr "ciąg znaków"
-
-#: builtin/checkout-index.c:201
-msgid "when creating files, prepend <string>"
-msgstr "przy tworzeniu plików, dodaj <łańcuch> z przodu"
-
-#: builtin/checkout-index.c:203
+#: builtin/checkout-index.c:204
msgid "copy out the files from named stage"
msgstr "wykopiuj pliki z nazwanego przygotowania"
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<opcje>] <gałąź>"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opcje>] [<gałąź>] -- <plik>..."
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<opcje>] <gałąź>"
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<opcje>] [--source=<gałąź>] <plik>..."
-#: builtin/checkout.c:188 builtin/checkout.c:227
+#: builtin/checkout.c:190 builtin/checkout.c:229
#, c-format
msgid "path '%s' does not have our version"
msgstr "ścieżka „%s” nie ma „naszej” wersji"
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:192 builtin/checkout.c:231
#, c-format
msgid "path '%s' does not have their version"
msgstr "ścieżka „%s” nie ma „ich” wersji"
-#: builtin/checkout.c:206
+#: builtin/checkout.c:208
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "ścieżka „%s” nie ma wszystkich potrzebnych wersji"
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "ścieżka „%s” nie ma potrzebnych wersji"
-#: builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "path '%s': cannot merge"
msgstr "ścieżka „%s”: nie można scalić"
-#: builtin/checkout.c:291
+#: builtin/checkout.c:294
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Nie można dodać wyniku scalenia dla „%s”"
-#: builtin/checkout.c:396
+#: builtin/checkout.c:411
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
@@ -12000,7 +12472,7 @@
msgstr[1] "Odtworzono %d konflikty scalenia"
msgstr[2] "Odtworzono %d konfliktów scalenia"
-#: builtin/checkout.c:401
+#: builtin/checkout.c:416
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
@@ -12008,7 +12480,7 @@
msgstr[1] "Zaktualizowano %d ścieżki z %s"
msgstr[2] "Zaktualizowano %d ścieżek z %s"
-#: builtin/checkout.c:408
+#: builtin/checkout.c:423
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
@@ -12016,48 +12488,48 @@
msgstr[1] "Zaktualizowano %d ścieżki z indeksu"
msgstr[2] "Zaktualizowano %d ścieżek z indeksu"
-#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
-#: builtin/checkout.c:441
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
+#: builtin/checkout.c:456
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "Nie można użyć „%s” przy aktualizowaniu ścieżek"
-#: builtin/checkout.c:444 builtin/checkout.c:447
+#: builtin/checkout.c:459 builtin/checkout.c:462
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "„%s” i %s wykluczają się"
-#: builtin/checkout.c:451
+#: builtin/checkout.c:466
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Nie można jednocześnie zaktualizować ścieżek i przełączyć na gałąź „%s”."
-#: builtin/checkout.c:455
+#: builtin/checkout.c:470
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "nie podano ani „%s” ani „%s”"
-#: builtin/checkout.c:459
+#: builtin/checkout.c:474
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "należy użyć „%s”, jeśli nie podano „%s”"
-#: builtin/checkout.c:464 builtin/checkout.c:469
+#: builtin/checkout.c:479 builtin/checkout.c:484
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "nie można użyć „%s” ani „%s” z %s"
-#: builtin/checkout.c:543 builtin/checkout.c:550
+#: builtin/checkout.c:558 builtin/checkout.c:565
#, c-format
msgid "path '%s' is unmerged"
msgstr "ścieżka „%s” jest niescalona"
-#: builtin/checkout.c:718
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr "musisz najpierw rozwiązać bieżący indeks"
-#: builtin/checkout.c:772
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12066,50 +12538,50 @@
"nie można kontynuować z przygotowanymi zmianami w następujących plikach:\n"
"%s"
-#: builtin/checkout.c:865
+#: builtin/checkout.c:879
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "nie można wykonać reflog na „%s”: %s\n"
-#: builtin/checkout.c:907
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD wskazuje teraz na"
-#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "nie można zaktualizować HEAD"
-#: builtin/checkout.c:915
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Zresetuj gałąź „%s”\n"
-#: builtin/checkout.c:918
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "Już jesteś na „%s”\n"
-#: builtin/checkout.c:922
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Przełączono na gałąź „%s” i zresetowano ją\n"
-#: builtin/checkout.c:924 builtin/checkout.c:1355
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Przełączono na nową gałąź „%s”\n"
-#: builtin/checkout.c:926
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Przełączono na gałąź „%s”\n"
-#: builtin/checkout.c:977
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d innych.\n"
-#: builtin/checkout.c:983
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12137,7 +12609,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1002
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12170,19 +12642,19 @@
" git branch <nazwa-nowej-gałęzi> %s\n"
"\n"
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "wewnętrzny błąd w przechodzeniu rewizji"
-#: builtin/checkout.c:1041
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "Poprzednim wskazaniem HEAD było"
-#: builtin/checkout.c:1081 builtin/checkout.c:1350
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr "Jesteś na gałęzi, która dopiero ma powstać"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12191,7 +12663,7 @@
"„%s” może być jednocześnie lokalnym plikiem i gałęzią śledzącą.\n"
"Użyj -- (i opcjonalnie --no-guess), żeby ujednoznacznić"
-#: builtin/checkout.c:1170
+#: builtin/checkout.c:1184
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"
@@ -12211,51 +12683,51 @@
"<nazw> preferowały jedno zdalne repozytorium, rozważ ustawienie\n"
"checkout.defaultRemote=origin w swoich ustawieniach."
-#: builtin/checkout.c:1180
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "„%s” pasuje do wielu (%d) gałęzi śledzących"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "oczekiwano tylko jednej referencji"
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "oczekiwano tylko jednej referencji, podano %d."
-#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "nieprawidłowa referencja: %s"
-#: builtin/checkout.c:1322 builtin/checkout.c:1688
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "referencja nie jest drzewem: %s"
-#: builtin/checkout.c:1369
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "oczekiwano gałęzi, otrzymano tag „%s”"
-#: builtin/checkout.c:1371
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "oczekiwano gałęzi, otrzymano zdalną gałąź „%s”"
-#: builtin/checkout.c:1372 builtin/checkout.c:1380
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "oczekiwano gałęzi, otrzymano „%s”"
-#: builtin/checkout.c:1375
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "oczekiwano gałęzi, otrzymano zapis „%s”"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12263,7 +12735,7 @@
"Nie można przełączyć gałęzi w trakcie scalania\n"
"Rozważ „git merge --quit” lub „git worktree add”."
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12271,7 +12743,7 @@
"Nie można przełączyć gałęzi w trakcie sesji am\n"
"Rozważ „git am --quit” lub „git worktree add”."
-#: builtin/checkout.c:1399
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12279,7 +12751,7 @@
"Nie można przełączyć gałęzi w trakcie przestawiania\n"
"Rozważ „git rebase --quit” lub „git worktree add”."
-#: builtin/checkout.c:1403
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12287,7 +12759,7 @@
"Nie można przełączyć gałęzi w trakcie dobierania\n"
"Rozważ „git cherry-pick --quit” lub „git worktree add”."
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12295,137 +12767,137 @@
"Nie można przełączyć gałęzi w trakcie odwracania\n"
"Rozważ „git revert --quit” lub „git worktree add”."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr "zmiana gałęzi w trakcie przeszukiwania"
-#: builtin/checkout.c:1418
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "ścieżki nie mogą być podane z przełączaniem gałęzi"
-#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
-msgstr "„%s” nie może być użyte z przełączaniem gałęzi"
+msgstr "„%s” nie można użyć z przełączaniem gałęzi"
-#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
-#: builtin/checkout.c:1444 builtin/checkout.c:1449
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "„%s” i „%s” wykluczają się"
-#: builtin/checkout.c:1446
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "„%s” nie może przyjąć <punktu-startowego>"
-#: builtin/checkout.c:1454
+#: builtin/checkout.c:1468
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Nie można przełączyć gałęzi na nie-zapis „%s”"
-#: builtin/checkout.c:1461
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "brakuje argumentu gałęzi lub zapisu"
-#: builtin/checkout.c:1504
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr "dokonaj trójstronnego scalenia z nową gałęzią"
-#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style"
msgstr "styl"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "styl konfliktów (merge lub diff3)"
-#: builtin/checkout.c:1518 builtin/worktree.c:486
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "odłącz HEAD na podanym zapisie"
-#: builtin/checkout.c:1519
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "ustaw gałąź nadrzędną nowej gałęzi"
-#: builtin/checkout.c:1521
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "wymuś wybranie (wyrzuć lokalne zmiany)"
-#: builtin/checkout.c:1523
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "nowa-gałąź"
-#: builtin/checkout.c:1523
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "nowa gałąź bez rodzica"
-#: builtin/checkout.c:1525 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "aktualizuj ignorowane pliki (domyślnie)"
-#: builtin/checkout.c:1528
+#: builtin/checkout.c:1542
msgid "do not check if another worktree is holding the given ref"
msgstr "nie sprawdzaj, czy inne drzewo robocze trzyma podaną referencję"
-#: builtin/checkout.c:1541
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "wybierz „naszą” wersję niescalonych plików"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "wybierz „ich” wersję niescalonych plików"
-#: builtin/checkout.c:1548
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr "nie ograniczaj ścieżek tylko do rzadkich elementów"
-#: builtin/checkout.c:1603
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c, -%c i --orphan się wykluczają"
-#: builtin/checkout.c:1607
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p i --overlay się wykluczają"
-#: builtin/checkout.c:1644
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track potrzebuje nazwy gałęzi"
-#: builtin/checkout.c:1649
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "brakuje nazwy gałęzi; spróbuj -%c"
-#: builtin/checkout.c:1681
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "nie można rozwiązać %s"
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "nieprawidłowa ścieżka"
-#: builtin/checkout.c:1704
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "„%s” nie jest zapisem, a nie można z niego utworzyć gałęzi „%s”"
-#: builtin/checkout.c:1708
+#: builtin/checkout.c:1725
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach nie przyjmuje argumentu ścieżki „%s”"
-#: builtin/checkout.c:1717
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file i --detach się wykluczają"
-#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file i --patch się wykluczają"
-#: builtin/checkout.c:1733
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12433,70 +12905,71 @@
"git checkout: --ours/--theirs, --force i --merge się wykluczają, gdy\n"
"wybieranie z indeksu."
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "musisz podać ścieżkę (ścieżki) do przywrócenia"
-#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
-#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
-#: builtin/worktree.c:484
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "gałąź"
-#: builtin/checkout.c:1765
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "utwórz i wybierz nową gałąź"
-#: builtin/checkout.c:1767
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "utwórz/zresetuj i wybierz gałąź"
-#: builtin/checkout.c:1768
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "utwórz dziennik referencji nowej gałęzi"
-#: builtin/checkout.c:1770
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "spróbuj zgadnąć „git checkout <nieistniejąca-gałąź>” (domyślnie)"
-#: builtin/checkout.c:1771
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "użyj trybu nakładki (domyślnie)"
-#: builtin/checkout.c:1816
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "utwórz i przełącz na nową gałąź"
-#: builtin/checkout.c:1818
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "utwórz/zresetuj i przełącz na gałąź"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
msgstr "spróbuj zgadnąć „git switch <nieistniejąca-gałąź>”"
-#: builtin/checkout.c:1822
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "wyrzuć lokalne zmiany"
-#: builtin/checkout.c:1856
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "z którego drzewa wybrać"
-#: builtin/checkout.c:1858
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "przywróć indeks"
-#: builtin/checkout.c:1860
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "przywróć drzewo robocze (domyślnie)"
-#: builtin/checkout.c:1862
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "pomiń niescalone elementy"
-#: builtin/checkout.c:1863
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "użyj trybu nakładki"
@@ -12526,17 +12999,12 @@
msgid "Would skip repository %s\n"
msgstr "Pominięto by repozytorium %s\n"
-#: builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "nie można usunąć %s"
-
#: builtin/clean.c:38
#, c-format
msgid "could not lstat %s\n"
msgstr "nie można wykonać lstat na %s\n"
-#: builtin/clean.c:302 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12549,7 +13017,7 @@
"foo - wybierz element po unikatowym początku\n"
" - (puste) nic nie wybiera\n"
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12570,33 +13038,33 @@
"* - wybierz wszystko\n"
" - (puste) zakończ zaznaczanie\n"
-#: builtin/clean.c:521 git-add--interactive.perl:568
+#: builtin/clean.c:519 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hę (%s)?\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Wprowadź wzorce ignorowania>> "
-#: builtin/clean.c:696
+#: builtin/clean.c:693
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "Ostrzeżenie: Nie znaleziono elementów pasujących do: %s"
-#: builtin/clean.c:717
+#: builtin/clean.c:714
msgid "Select items to delete"
msgstr "Wybierz elementy do skasowania"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:755
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Usunąć %s [y/N]? "
-#: builtin/clean.c:789
+#: builtin/clean.c:786
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12614,53 +13082,53 @@
"help - ten ekran\n"
"? - pomoc do zachęty wyboru"
-#: builtin/clean.c:825
+#: builtin/clean.c:822
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Usunięto by następujący element:"
msgstr[1] "Usunięto by następujące elementy:"
msgstr[2] "Usunięto by następujące elementy:"
-#: builtin/clean.c:841
+#: builtin/clean.c:838
msgid "No more files to clean, exiting."
msgstr "Brak plików do wyczyszczenia, wyjście."
-#: builtin/clean.c:903
+#: builtin/clean.c:900
msgid "do not print names of files removed"
msgstr "nie wypisuj nazw usuwanym plików"
-#: builtin/clean.c:905
+#: builtin/clean.c:902
msgid "force"
msgstr "wymuś"
-#: builtin/clean.c:906
+#: builtin/clean.c:903
msgid "interactive cleaning"
msgstr "interaktywne czyszczenie"
-#: builtin/clean.c:908
+#: builtin/clean.c:905
msgid "remove whole directories"
msgstr "usuwaj całe katalogi"
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "wzorzec"
-#: builtin/clean.c:910
+#: builtin/clean.c:907
msgid "add <pattern> to ignore rules"
msgstr "dodaj <wzorzec> do reguł ignorowania"
-#: builtin/clean.c:911
+#: builtin/clean.c:908
msgid "remove ignored files, too"
msgstr "usuń też ignorowane pliki"
-#: builtin/clean.c:913
+#: builtin/clean.c:910
msgid "remove only ignored files"
msgstr "usuń tylko ignorowane pliki"
-#: builtin/clean.c:929
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12668,7 +13136,7 @@
"clean.requireForce ustawione na true, a nie podano -i, -n ani -f; odmawiam "
"czyszczenia"
-#: builtin/clean.c:932
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12676,7 +13144,7 @@
"clean.requireForce to domyślnie true, a nie podano -i, -n ani -f; odmawiam "
"czyszczenia"
-#: builtin/clean.c:944
+#: builtin/clean.c:940
msgid "-x and -X cannot be used together"
msgstr "-x i -X wykluczają się"
@@ -12684,208 +13152,206 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcje>] [--] <repozytorium> [<katalog>]"
-#: builtin/clone.c:94
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "nie klonuj płytkiego repozytorium"
+
+#: builtin/clone.c:98
msgid "don't create a checkout"
msgstr "nie wybieraj plików"
-#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "utwórz suche repozytorium"
-#: builtin/clone.c:99
+#: builtin/clone.c:103
msgid "create a mirror repository (implies bare)"
msgstr "utwórz lustrzane repozytorium (zakłada suche)"
-#: builtin/clone.c:101
+#: builtin/clone.c:105
msgid "to clone from a local repository"
msgstr "aby sklonować z lokalnego repozytorium"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "don't use local hardlinks, always copy"
msgstr "nie używaj twardych dowiązań, zawsze kopiuj"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "setup as shared repository"
msgstr "ustaw jako repozytorium dzielone"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "pathspec"
msgstr "ścieżka"
-#: builtin/clone.c:107
-msgid "initialize submodules in the clone"
-msgstr "zainicjuj pod-moduły w klonie"
-
#: builtin/clone.c:111
-msgid "number of submodules cloned in parallel"
-msgstr "liczba pod-modułów klonowanych równolegle"
+msgid "initialize submodules in the clone"
+msgstr "zainicjuj podmoduły w klonie"
-#: builtin/clone.c:112 builtin/init-db.c:552
+#: builtin/clone.c:115
+msgid "number of submodules cloned in parallel"
+msgstr "liczba podmodułów klonowanych równolegle"
+
+#: builtin/clone.c:116 builtin/init-db.c:539
msgid "template-directory"
msgstr "katalog-szablonów"
-#: builtin/clone.c:113 builtin/init-db.c:553
+#: builtin/clone.c:117 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "katalog, z którego zostaną użyte szablony"
-#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
-#: builtin/submodule--helper.c:2336
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "repozytorium odniesienia"
-#: builtin/clone.c:119 builtin/submodule--helper.c:1833
-#: builtin/submodule--helper.c:2338
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr "użyj --reference tylko podczas klonowania"
-#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
+#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nazwa"
-#: builtin/clone.c:121
+#: builtin/clone.c:125
msgid "use <name> instead of 'origin' to track upstream"
msgstr "użyj <nazwy> zamiast „origin”, żeby śledzić zdalne repozytorium"
-#: builtin/clone.c:123
+#: builtin/clone.c:127
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "wybierz <gałąź> zamiast zdalnego HEAD"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "path to git-upload-pack on the remote"
msgstr "ścieżka do git-upload-pack na zdalnej maszynie"
-#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr "głębokość"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "create a shallow clone of that depth"
msgstr "utwórz płytki klon o tej głębokości"
-#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr "czas"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "create a shallow clone since a specific time"
msgstr "utwórz płytki klon od podanego czasu"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
+#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "rewizja"
-#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "pogłęb historię płytkiego klonu pomijając rewizję"
-#: builtin/clone.c:133 builtin/submodule--helper.c:1843
-#: builtin/submodule--helper.c:2352
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "sklonuj tylko jedną gałąź, HEAD lub --branch"
-#: builtin/clone.c:135
+#: builtin/clone.c:139
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"nie klonuj żadnych tagów, i spraw, by późniejsze pobrania za nimi nie "
"podążały"
-#: builtin/clone.c:137
+#: builtin/clone.c:141
msgid "any cloned submodules will be shallow"
-msgstr "wszystkie sklonowane pod-moduły będą płytkie"
+msgstr "wszystkie sklonowane podmoduły będą płytkie"
-#: builtin/clone.c:138 builtin/init-db.c:561
+#: builtin/clone.c:142 builtin/init-db.c:548
msgid "gitdir"
msgstr "katalog-gita"
-#: builtin/clone.c:139 builtin/init-db.c:562
+#: builtin/clone.c:143 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "oddziel katalog gita od drzewa roboczego"
-#: builtin/clone.c:140
+#: builtin/clone.c:144
msgid "key=value"
msgstr "klucz=wartość"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "set config inside the new repository"
msgstr "ustaw konfigurację w nowym repozytorium"
-#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "zależne-od-serwera"
-#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "nadaj opcję"
-#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
-#: builtin/push.c:585
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "używaj tylko adresów IPv4"
-#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
-#: builtin/push.c:587
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "używaj tylko adresów IPv6"
-#: builtin/clone.c:150
+#: builtin/clone.c:154
msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "wszystkie sklonowane pod-moduły będą używały swoich gałęzi śledzących"
+msgstr "wszystkie sklonowane podmoduły będą używały swoich gałęzi śledzących"
-#: builtin/clone.c:152
+#: builtin/clone.c:156
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
"zainicjuj plik rzadkiego wybrania, żeby zawierał tylko pliki w korzeniu"
-#: builtin/clone.c:288
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Nie można zgadnąć nazwy katalogu.\n"
-"Podaj katalog w wierszu poleceń"
-
-#: builtin/clone.c:341
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Nie można dodać alternatywnego obiektu do „%s”: %s\n"
-#: builtin/clone.c:414
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s istnieje i nie jest katalogiem"
-#: builtin/clone.c:432
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "nie można rozpocząć iteracji po „%s”"
-#: builtin/clone.c:463
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "nie można utworzyć dowiązania „%s”"
-#: builtin/clone.c:467
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "nie można skopiować pliku do „%s”"
-#: builtin/clone.c:472
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "nie można iterować po „%s”"
-#: builtin/clone.c:499
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "gotowe.\n"
-#: builtin/clone.c:513
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12895,149 +13361,153 @@
"Możesz zobaczyć, co zostało wybrane w „git status”\n"
"i ponowić przez „git restore --source=HEAD :/”\n"
-#: builtin/clone.c:590
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Nie znaleziono zdalnej gałęzi %s do sklonowania."
-#: builtin/clone.c:709
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "nie można zaktualizować %s"
-#: builtin/clone.c:757
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "nie można zainicjować rzadkiego wybrania"
-#: builtin/clone.c:780
+#: builtin/clone.c:668
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "zdalne HEAD wskazuje nieistniejącą referencję, nie można wybrać.\n"
-#: builtin/clone.c:812
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "nie można wybrać drzewa roboczego"
-#: builtin/clone.c:887
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "nie można zapisać parametrów do pliku konfiguracyjnego"
-#: builtin/clone.c:950
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "nie można przepakować, żeby posprzątać"
-#: builtin/clone.c:952
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "nie można wykonać unlink na tymczasowym pliku alternatywnych położeń"
-#: builtin/clone.c:993 builtin/receive-pack.c:2493
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Zbyt dużo argumentów."
-#: builtin/clone.c:997
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "Musisz określić repozytorium do sklonowania."
-#: builtin/clone.c:1010
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "opcje --bare i --origin %s wykluczają się."
-#: builtin/clone.c:1013
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir się wykluczają."
-#: builtin/clone.c:1026
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "repozytorium „%s” nie istnieje"
-#: builtin/clone.c:1030 builtin/fetch.c:1951
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "głębokość %s nie jest liczbą dodatnią"
-#: builtin/clone.c:1040
+#: builtin/clone.c:934
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "docelowa ścieżka „%s” już istnieje i nie jest pustym katalogiem."
-#: builtin/clone.c:1046
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "ścieżka repozytorium „%s” już istnieje i nie jest pustym katalogiem."
-#: builtin/clone.c:1060
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "drzewo robocze „%s” już istnieje."
-#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
-#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "nie można utworzyć wiodących katalogów „%s”"
-#: builtin/clone.c:1080
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "nie można utworzyć katalogu drzewa roboczego „%s”"
-#: builtin/clone.c:1100
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonowanie do suchego repozytorium „%s”...\n"
-#: builtin/clone.c:1102
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonowanie do „%s”...\n"
-#: builtin/clone.c:1126
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive nie pasuje do --reference ani do --reference-if-able"
-#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "„%s” nie jest prawidłową nazwą zdalnego repozytorium"
-#: builtin/clone.c:1211
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth jest ignorowana w lokalnych klonach; użyj zamiast tego file://"
-#: builtin/clone.c:1213
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since jest ignorowana w lokalnych klonach; użyj zamiast tego "
"file://"
-#: builtin/clone.c:1215
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude jest ignorowane w lokalnych klonach; użyj zamiast tego "
"file://"
-#: builtin/clone.c:1217
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"--filter jest ignorowany w lokalnych klonach; użyj zamiast tego file://"
-#: builtin/clone.c:1220
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "źródłowe repozytorium jest płytkie, ignorowanie --local"
-#: builtin/clone.c:1225
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local jest ignorowane"
-#: builtin/clone.c:1315 builtin/clone.c:1323
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "zdalny transport zgłosił błąd"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Nie znaleziono zdalnej gałęzi %s w repozytorium %s"
-#: builtin/clone.c:1326
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "Wygląda na to, że sklonowano puste repozytorium."
@@ -13054,33 +13524,33 @@
msgstr "układ do użycia"
#: builtin/column.c:30
-msgid "Maximum width"
-msgstr "Maksymalna szerokość"
+msgid "maximum width"
+msgstr "maksymalna szerokość"
#: builtin/column.c:31
-msgid "Padding space on left border"
-msgstr "Wyrównawczy odstęp przy lewej krawędzi"
+msgid "padding space on left border"
+msgstr "wyrównawczy odstęp przy lewej krawędzi"
#: builtin/column.c:32
-msgid "Padding space on right border"
-msgstr "Wyrównawczy odstęp przy prawej krawędzi"
+msgid "padding space on right border"
+msgstr "wyrównawczy odstęp przy prawej krawędzi"
#: builtin/column.c:33
-msgid "Padding space between columns"
-msgstr "Wyrównawczy odstęp między kolumnami"
+msgid "padding space between columns"
+msgstr "wyrównawczy odstęp między kolumnami"
#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr "--command musi być pierwszym argumentem"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <katalog-obiektów>] [--shallow] [--"
"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13090,94 +13560,92 @@
"split[=<strategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opcje podziału>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "nie znaleziono katalogu obiektów pasującego do „%s”"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "katalog"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "katalog obiektów do przechowania grafu"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr "jeśli graf zapisów jest podzielony, zweryfikuj tylko plik czubka"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Nie można otworzyć grafu zapisów „%s”"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "nierozpoznany argument --split, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "nieoczekiwany nieszesnastkowy identyfikator obiektu: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "nieprawidłowy obiekt: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "zacznij przechodzenie po wszystkich referencjach"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "przeskanuj indeksy paczek wymienione na wejściu dla zapisów"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "zacznij przechodzenie od zapisów wypisanych na standardowym wejściu"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr "uwzględnij wszystkie zapisy już w pliku grafu zapisów"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "włącz obliczanie zmienionych ścieżek"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "pozwól zapisać przyrostowy plik grafu zapisów"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "maksymalna liczba zapisów w niepodstawowym rozdzieleniu grafu zapisów"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
"maksymalny stosunek pomiędzy dwoma poziomami rozdzielonego grafu zapisów"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "wygaś tylko obiekty starsze niż podany czas"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "maksymalna liczba filtrów Blooma zmienionych ścieżek do obliczenia"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "--reachable, --stdin-commits i --stdin-packs wykluczają się"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Zbieranie zapisów z wejścia"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "nieznane pod-polecenie: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13191,70 +13659,65 @@
msgid "duplicate parent %s ignored"
msgstr "zignorowano powtórzonego rodzica %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "nieprawidłowa nazwa obiektu %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: nie można otworzyć „%s”"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: nie można odczytać „%s”"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: nie można zamknąć „%s”"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "rodzic"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "identyfikator obiektu zapisu rodzica"
-#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
-#: builtin/tag.c:445
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "komunikat"
-#: builtin/commit-tree.c:115 builtin/commit.c:1504
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "komunikat zapisu"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "odczytaj komunikat dziennika zapisu z pliku"
-#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "podpisz zapis GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "należy podać tylko jedno drzewo"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: nie można odczytać"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opcje>] [--] <ścieżka>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opcje>] [--] <ścieżka>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:52
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13264,7 +13727,7 @@
"Możesz powtórzyć polecenie z --allow-empty, lub usunąć ten zapis\n"
"całkowicie przez „git reset HEAD^”.\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13279,15 +13742,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "W przeciwnym wypadku użyj „git rebase --skip”\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "W przeciwnym wypadku użyj „git cherry-pick --skip”\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13309,73 +13772,73 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:312
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "nie można rozpakować obiektu drzewa HEAD"
-#: builtin/commit.c:348
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file i -a wykluczają się"
-#: builtin/commit.c:361
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "Brak ścieżek z --include/--only nie ma sensu."
-#: builtin/commit.c:373
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "nie można utworzyć tymczasowego indeksu"
-#: builtin/commit.c:382
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "interaktywne dodawanie nie powiodło się"
-#: builtin/commit.c:397
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "nie można zaktualizować tymczasowego indeksu"
-#: builtin/commit.c:399
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "Nie można zaktualizować głównego drzewa pamięci podręcznej"
-#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr "nie można zapisać pliku new_index"
-#: builtin/commit.c:476
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "nie można złożyć częściowego zapisu w czasie scalania."
-#: builtin/commit.c:478
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr "nie można złożyć częściowego zapisu w czasie dobierania."
-#: builtin/commit.c:480
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "nie można złożyć częściowego zapisu w czasie przestawiania."
-#: builtin/commit.c:488
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "nie można odczytać indeksu"
-#: builtin/commit.c:507
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "nie można zapisać tymczasowego pliku indeksu"
-#: builtin/commit.c:605
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "zapis „%s” nie ma nagłówka autora"
-#: builtin/commit.c:607
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "zapis „%s” ma nieprawidłowy wiersz autorstwa"
-#: builtin/commit.c:626
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "nieprawidłowy parametr --author"
-#: builtin/commit.c:679
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13383,38 +13846,81 @@
"nie można wybrać znaku komentarza, który nie jest użyty\n"
"w bieżącym komunikacie zapisu"
-#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "nie odnaleziono zapisu %s"
-#: builtin/commit.c:729 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(czytanie komunikatu dziennika ze standardowego wejścia)\n"
-#: builtin/commit.c:731
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "nie można odczytać dziennika ze standardowego wejścia"
-#: builtin/commit.c:735
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "nie można odczytać pliku dziennika „%s”"
-#: builtin/commit.c:766 builtin/commit.c:782
+#: builtin/commit.c:802
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "-m i --fixup się wykluczają:%s"
+
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "nie można odczytać SQUASH_MSG"
-#: builtin/commit.c:773
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "nie czytaj MERGE_MSG"
-#: builtin/commit.c:833
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "nie można zapisać szablonu zapisu"
-#: builtin/commit.c:853
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
+"od „%c” będą ignorowane.\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
+"od „%c” będą ignorowane, a pusty komunikat przerwie zapis.\n"
+
+#: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
+"od „%c” będą zachowane; możesz je sam(a) usunąć, jeśli chcesz.\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
+"od „%c” będą zachowane; możesz je sam(a) usunąć, jeśli chcesz.\n"
+"Pusty komunikat przerwie zapis.\n"
+
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13428,7 +13934,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"i spróbuj ponownie.\n"
-#: builtin/commit.c:858
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13442,165 +13948,175 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"i spróbuj ponownie.\n"
-#: builtin/commit.c:868
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
-"od „%c” będą ignorowane, a pusty komunikat przerwie zapis.\n"
-
-#: builtin/commit.c:876
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
-"od „%c” będą zachowane; możesz je sam(a) usunąć, jeśli chcesz.\n"
-"Pusty komunikat przerwie zapis.\n"
-
-#: builtin/commit.c:893
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:901
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:908
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sSkładający: %.*s <%.*s>"
-#: builtin/commit.c:926
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "Nie można odczytać indeksu"
-#: builtin/commit.c:997
+#: builtin/commit.c:1026
+msgid "unable to pass trailers to --trailers"
+msgstr "nie można przekazać końcówek do --trailers"
+
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Błąd budowania drzew"
-#: builtin/commit.c:1011 builtin/tag.c:308
+#: builtin/commit.c:1080 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Należy podać komunikat przy użyciu opcji -m lub -F.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author „%s” nie jest postaci „Nazwa <e-mail>” i nie pasuje do istniejących "
"twórców"
-#: builtin/commit.c:1069
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Nieprawidłowy tryb pomijanych plików „%s”"
-#: builtin/commit.c:1087 builtin/commit.c:1331
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Nieprawidłowy tryb nieśledzonych plików „%s”"
-#: builtin/commit.c:1127
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "--long i -z się wykluczają"
-#: builtin/commit.c:1171
+#: builtin/commit.c:1227
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "Jesteś w trakcie scalania — nie można przeredagować."
+
+#: builtin/commit.c:1229
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "Jesteś w trakcie dobierania — nie można przeredagować."
+
+#: builtin/commit.c:1232
+#, c-format
+msgid "cannot combine reword option of --fixup with path '%s'"
+msgstr "nie można łączyć opcji przeredagowania w --fixup ze ścieżką „%s”"
+
+#: builtin/commit.c:1234
+msgid ""
+"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
+"all/--include/--only"
+msgstr ""
+"opcja przeredagowania w --fixup i --patch/--interactive/--all/--include/--"
+"only się wykluczają"
+
+#: builtin/commit.c:1253
msgid "Using both --reset-author and --author does not make sense"
msgstr "Użycie jednoczenie --reset-author i --author nie ma sensu"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "Nie masz nic do poprawienia."
-#: builtin/commit.c:1183
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Jesteś w trakcie scalania — nie można poprawiać."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1265
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Jesteś w trakcie dobierania — nie można poprawiać."
-#: builtin/commit.c:1187
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Jesteś w trakcie przestawiania — nie można poprawiać."
-#: builtin/commit.c:1190
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opcje --squash i --fixup się wykluczają"
-#: builtin/commit.c:1200
+#: builtin/commit.c:1280
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "-c, -C, -F i --fixup się wykluczają."
-#: builtin/commit.c:1202
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Opcje -m, -c, -C i -F się wykluczają."
-#: builtin/commit.c:1211
+#: builtin/commit.c:1291
msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author może być użyte tylko z -C, -c lub --amend."
+msgstr "--reset-author można użyć tylko z -C, -c lub --amend."
-#: builtin/commit.c:1229
+#: builtin/commit.c:1309
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "--include, --only, --all, --interactive i --patch się wykluczają."
-#: builtin/commit.c:1235
+#: builtin/commit.c:1337
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "nieznana opcja: --fixup=%s:%s"
+
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "ścieżki „%s ...” z -a nie mają sensu"
-#: builtin/commit.c:1366 builtin/commit.c:1527
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "pokaż stan zwięźle"
-#: builtin/commit.c:1368 builtin/commit.c:1529
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "pokaż informacje o gałęzi"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "pokaż informacje o schowku"
-#: builtin/commit.c:1372 builtin/commit.c:1531
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "oblicz pełne wartości przed/w tyle"
-#: builtin/commit.c:1374
+#: builtin/commit.c:1493
msgid "version"
msgstr "wersja"
-#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
-#: builtin/worktree.c:679
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "wyjście czytelne dla maszyny"
-#: builtin/commit.c:1377 builtin/commit.c:1535
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "pokazuj stan w długim formacie (domyślnie)"
-#: builtin/commit.c:1380 builtin/commit.c:1538
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "rozdziel elementy znakiem NUL"
-#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode"
msgstr "tryb"
-#: builtin/commit.c:1383 builtin/commit.c:1541
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"pokaż nieśledzone pliki, dodatkowe tryby: all, normal, no. (domyślnie all)"
-#: builtin/commit.c:1387
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13608,186 +14124,207 @@
"pokaż pomijane pliki, dodatkowe tryby: traditional, matching, no. (domyślnie "
"traditional)"
-#: builtin/commit.c:1389 parse-options.h:192
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "kiedy"
-#: builtin/commit.c:1390
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-"pomiń zmiany w pod-modułach, możliwe <kiedy>: all, dirty, untracked. "
+"pomiń zmiany w podmodułach, możliwe <kiedy>: all, dirty, untracked. "
"(domyślnie all)"
-#: builtin/commit.c:1392
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "wypisz nieśledzone pliki w kolumnach"
-#: builtin/commit.c:1393
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "nie wykrywaj zmian nazw"
-#: builtin/commit.c:1395
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "wykryj zmiany nazw, opcjonalnie ustaw wskaźnik podobieństwa"
-#: builtin/commit.c:1415
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Niewspierane połączenie argumentów o plikach nieśledzonych i pomijanych"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "pomiń podsumowanie po udanym zapisie"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "pokaż różnice w szablonie komunikatu zapisu"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Opcje komunikatu zapisu"
-#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "odczytaj komunikat z pliku"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1624
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "nadpisz autora w zapisie"
-#: builtin/commit.c:1503 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "data"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "nadpisz datę zapisu"
-#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
-#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
msgid "commit"
msgstr "zapis"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "użyj komunikatu jak w podanym zapisie i edytuj go"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "użyj komunikatu jak w podanym zapisie"
-#: builtin/commit.c:1507
-msgid "use autosquash formatted message to fixup specified commit"
-msgstr ""
-"użyj komunikatu automatycznego spłaszczania, mówiącego, aby naprawić podany "
-"zapis"
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+#: builtin/commit.c:1633
+msgid "[(amend|reword):]commit"
+msgstr "[(amend|reword):]zapis"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1633
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
+msgstr ""
+"użyj komunikatu automatycznego spłaszczania, mówiącego, aby poprawić/"
+"przeredagować podany zapis"
+
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"użyj komunikatu automatycznego spłaszczania, mówiącego, aby spłaszczyć "
"podany zapis"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "ten zapis jest teraz mojego autorstwa (do użycia z -C/-c/--amend)"
-#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "końcówka"
+
+#: builtin/commit.c:1636
+msgid "add custom trailer(s)"
+msgstr "dodaj niestandardowe końcówki"
+
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "dodaj końcówkę Signed-off-by"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "użyj określonego pliku szablonu"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "wymuś edycję zapisu"
-#: builtin/commit.c:1514
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "uwzględnij status w szablonie komunikatu zapisu"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Opcje zawartości zapisu"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "złóż wszystkie zmienione pliki"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "dodaj podane pliki do indeksu do złożenia"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "interaktywnie dodaj pliki"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "interaktywnie dodaj zmiany"
-#: builtin/commit.c:1524
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "złóż tylko podane pliki"
-#: builtin/commit.c:1525
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "omiń skrypty pre-commit i commit-msg"
-#: builtin/commit.c:1526
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "pokaż, co byłoby złożone"
-#: builtin/commit.c:1539
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "popraw poprzedni zapis"
-#: builtin/commit.c:1540
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "omiń skrypt post-rewrite"
-#: builtin/commit.c:1547
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "pozwól złożyć pustą zmianę"
-#: builtin/commit.c:1549
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "pozwól złożyć zmianę z pustym komunikatem"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Uszkodzony plik MERGE_HEAD (%s)"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "nie można odczytać MERGE_MODE"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "nie można odczytać komunikatu zapisu: %s"
-#: builtin/commit.c:1657
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Przerwano składanie z powodu pustego komunikatu zapisu.\n"
-#: builtin/commit.c:1662
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Przerywanie zapisu; nie wpisano komunikatu.\n"
-#: builtin/commit.c:1696
+#: builtin/commit.c:1803
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "Przerwano składanie z powodu pustej treści komunikatu zapisu.\n"
+
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14039,15 +14576,15 @@
#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
-msgstr "--local może być użyty tylko w repozytorium gita"
+msgstr "--local można użyć tylko w repozytorium gita"
#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
-msgstr "--blob może być użyty tylko w repozytorium gita"
+msgstr "--blob można użyć tylko w repozytorium gita"
#: builtin/config.c:662
msgid "--worktree can only be used inside a git repository"
-msgstr "--worktree może być użyte tylko w repozytorium gita"
+msgstr "--worktree można użyć tylko w repozytorium gita"
#: builtin/config.c:684
msgid "$HOME not set"
@@ -14134,7 +14671,7 @@
msgid "print sizes in human readable format"
msgstr "wypisz rozmiary w formacie czytelnym dla człowieka"
-#: builtin/credential-cache--daemon.c:226
+#: builtin/credential-cache--daemon.c:227
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -14147,15 +14684,15 @@
"\n"
"\tchmod 0700 %s"
-#: builtin/credential-cache--daemon.c:275
+#: builtin/credential-cache--daemon.c:276
msgid "print debugging messages to stderr"
msgstr "wypisuj informacje diagnostyczne na stderr"
-#: builtin/credential-cache--daemon.c:315
+#: builtin/credential-cache--daemon.c:316
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr "credential-cache--daemon niedostępny; brak wsparcia dla gniazd uniksa"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache niedostępna; brak wsparcia dla gniazd uniksa"
@@ -14356,7 +14893,7 @@
msgid "Not a git repository"
msgstr "To nie jest repozytorium gita"
-#: builtin/diff.c:532 builtin/grep.c:682
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "podano nieprawidłowy obiekt „%s”."
@@ -14376,56 +14913,56 @@
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: wiele podstaw scalenia, używanie %s"
-#: builtin/difftool.c:30
+#: builtin/difftool.c:31
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opcje>] [<zapis> [<zapis>]] [--] [<ścieżka>...]"
-#: builtin/difftool.c:260
-#, c-format
-msgid "failed: %d"
-msgstr "nie powiodło się: %d"
-
-#: builtin/difftool.c:302
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "nie można odczytać dowiązania symbolicznego %s"
-#: builtin/difftool.c:304
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "nie można odczytać pliku dowiązania symbolicznego %s"
-#: builtin/difftool.c:312
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "nie można odczytać obiektu %s dowiązania symbolicznego %s"
-#: builtin/difftool.c:412
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"złączone formaty różnic („-c” i „--cc”) nie są wspierane w\n"
"trybie różnic katalogu („-d” i „--dir-diff”)."
-#: builtin/difftool.c:633
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "oba pliki zmienione: „%s” i „%s”."
-#: builtin/difftool.c:635
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "plik z drzewem roboczym został opuszczony."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "istnieją tymczasowe pliki w „%s”."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "możesz chcieć je wyczyścić lub odzyskać."
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "nie powiodło się: %d"
+
#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "użyj „diff.guitool” zamiast „diff.tool”"
@@ -14456,7 +14993,7 @@
#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
"niech „git-difftool” wyjdzie, kiedy wywołane narzędzie różnic zwróci "
@@ -14470,23 +15007,23 @@
msgid "passed to `diff`"
msgstr "przekazywane do „diff”"
-#: builtin/difftool.c:731
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool wymaga drzewa roboczego lub --no-index"
-#: builtin/difftool.c:738
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff i --no-index się wykluczają"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool i --extcmd się wykluczają"
-#: builtin/difftool.c:749
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "nie podano <narzędzia> do --tool=<narzędzie>"
-#: builtin/difftool.c:756
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "nie podano <polecenia> do --extcmd=<polecenie>"
@@ -14494,7 +15031,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <opcje> <zmienna-środ>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "rodzaj"
@@ -14525,111 +15062,111 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [opcje-listy-rewizji]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Błąd: Nie można wyeksportować zagnieżdżonych tagów, jeśli nie podano --mark-"
"tags."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "żeton --anonymize-map nie może być pusty"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "pokaż wskaźnik postępu po <n> obiektach"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "wybierz traktowanie podpisanych tagów"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "wybierz traktowanie tagów przypisanych do filtrowanych obiektów"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr "wybierz traktowanie komunikatów zapisów w alternatywnym kodowaniu"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr "zrzuć znaczniki to tego pliku"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr "wczytaj znaczniki z tego pliku"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr "wczytaj znaczniki z tego pliku, jeśli istnieje"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr "zmyśl tagującego w tagach, które go nie mają"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr "wypisz pełne drzewo dla każdego zapisu"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
msgid "use the done feature to terminate the stream"
msgstr "użyj funkcji done, żeby zakończyć strumień"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
msgid "skip output of blob data"
msgstr "pomiń wypisywanie danych binarnych"
-#: builtin/fast-export.c:1222 builtin/log.c:1815
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr "referencja"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr "zastosuj referencję do wyeksportowanych referencji"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "anonimizuj wyjście"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "od:do"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "zamień <z> na <na> w zanonimizowanym wyjściu"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"odwołaj się do rodziców, którzy nie są w strumieniu szybkiego eksportu, "
"według identyfikatora obiektu"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr "pokaż pierwotne identyfikatory obiektów blobów/zapisów"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr "oznacz tagi identyfikatorami znaczników"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize nie ma sensu bez --anonymize"
+msgstr "--anonymize-map nie ma sensu bez --anonymize"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "Nie można przekazać i --import-marks i --import-marks-if-exists"
#: builtin/fast-import.c:3088
#, c-format
msgid "Missing from marks for submodule '%s'"
-msgstr "Brakujące znaczniki od z pod-modułu „%s”"
+msgstr "Brakujące znaczniki od z podmodułu „%s”"
#: builtin/fast-import.c:3090
#, c-format
msgid "Missing to marks for submodule '%s'"
-msgstr "Brakujące znaczniki do z pod-modułu „%s”"
+msgstr "Brakujące znaczniki do z podmodułu „%s”"
#: builtin/fast-import.c:3225
#, c-format
@@ -14643,8 +15180,7 @@
#: builtin/fast-import.c:3322
msgid "Expected format name:filename for submodule rewrite option"
-msgstr ""
-"W opcji przeredagowania pod-modułu oczekiwano formatu nazwa:nazwa-pliku"
+msgstr "W opcji przeredagowania podmodułu oczekiwano formatu nazwa:nazwa-pliku"
#: builtin/fast-import.c:3377
#, c-format
@@ -14672,199 +15208,209 @@
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opcje>]"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:122
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel nie może być ujemne"
-#: builtin/fetch.c:143 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "pobierz ze wszystkich zdalnych repozytoriów"
-#: builtin/fetch.c:145 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "ustaw gałąź nadrzędną do git pull/fetch"
-#: builtin/fetch.c:147 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "dopisz do .git/FETCH_HEAD zamiast nadpisywać"
-#: builtin/fetch.c:149
+#: builtin/fetch.c:151
msgid "use atomic transaction to update references"
msgstr "zażądaj atomowej transakcji do aktualizacji referencji"
-#: builtin/fetch.c:151 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "ścieżka do wysyłania paczki po zdalnej stronie"
-#: builtin/fetch.c:152
+#: builtin/fetch.c:154
msgid "force overwrite of local reference"
msgstr "wymuś nadpisanie lokalnej referencji"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
msgid "fetch from multiple remotes"
msgstr "pobierz z wielu zdalnych repozytoriów"
-#: builtin/fetch.c:156 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "pobierz wszystkie tagi i powiązane obiekty"
-#: builtin/fetch.c:158
+#: builtin/fetch.c:160
msgid "do not fetch all tags (--no-tags)"
msgstr "nie pobieraj wszystkich tagów (--no-tags)"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
msgid "number of submodules fetched in parallel"
-msgstr "liczba pod-modułów pobieranych równolegle"
+msgstr "liczba podmodułów pobieranych równolegle"
-#: builtin/fetch.c:162 builtin/pull.c:198
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+"zmień podaną referencję, aby umieścić wszystkie referencje w refs/prefetch/"
+
+#: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "przytnij gałęzie śledzące usunięte ze zdalnego repozytorium"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:168
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"przytnij lokalne tagi, których już nie ma w zdalnym repozytorium, i nadpisz "
"zmienione tagi"
-#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:170
msgid "control recursive fetching of submodules"
-msgstr "steruj rekurencyjnym pobieraniem pod-modułów"
+msgstr "steruj rekurencyjnym pobieraniem podmodułów"
-#: builtin/fetch.c:171
+#: builtin/fetch.c:175
msgid "write fetched references to the FETCH_HEAD file"
msgstr "zapisz pobrane referencje do pliku FETCH_HEAD"
-#: builtin/fetch.c:172 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "zachowaj pobraną paczkę"
-#: builtin/fetch.c:174
+#: builtin/fetch.c:178
msgid "allow updating of HEAD ref"
msgstr "zezwól na aktualizację referencji HEAD"
-#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "pogłęb historię płytkiego klonu"
-#: builtin/fetch.c:179 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "pogłęb historię płytkiego repozytorium według czasu"
-#: builtin/fetch.c:185 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "przekształć w pełne repozytorium"
-#: builtin/fetch.c:188
+#: builtin/fetch.c:192
msgid "prepend this to submodule path output"
-msgstr "dodaj to przed wyjściem ścieżki pod-modułu"
+msgstr "dodaj to przed wyjściem ścieżki podmodułu"
-#: builtin/fetch.c:191
+#: builtin/fetch.c:195
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-"domyślnie w rekurencyjnym pobieraniu pod-modułów (niższy priorytet niż pliki "
+"domyślnie w rekurencyjnym pobieraniu podmodułów (niższy priorytet niż pliki "
"konfiguracji)"
-#: builtin/fetch.c:195 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "przyjmuj referencje, które aktualizują .git/shallow"
-#: builtin/fetch.c:196 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap"
msgstr "mapowanie"
-#: builtin/fetch.c:197 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "podaj mapę referencji do pobrania"
-#: builtin/fetch.c:204 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "zgłaszaj, że mamy tylko obiekty osiągalne z tego obiektu"
-#: builtin/fetch.c:207 builtin/fetch.c:209
+#: builtin/fetch.c:210
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr ""
+"nie pobieraj pliku paczki; zamiast tego wypisz przodków czubków negocjacji"
+
+#: builtin/fetch.c:213 builtin/fetch.c:215
msgid "run 'maintenance --auto' after fetching"
msgstr "wykonaj „maintenance --auto” po pobraniu"
-#: builtin/fetch.c:211 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr ""
"sprawdź na wszystkich zaktualizowanych gałęziach, czy wystąpiły wymuszone "
"aktualizacje"
-#: builtin/fetch.c:213
+#: builtin/fetch.c:219
msgid "write the commit-graph after fetching"
msgstr "wypisz graf zapisów po pobraniu"
-#: builtin/fetch.c:215
+#: builtin/fetch.c:221
msgid "accept refspecs from stdin"
msgstr "przyjmuj referencje ze standardowego wejścia"
-#: builtin/fetch.c:526
+#: builtin/fetch.c:586
msgid "Couldn't find remote ref HEAD"
msgstr "Nie znaleziono zdalnej referencji HEAD"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "ustawienie fetch.output zawiera nieprawidłową wartość %s"
-#: builtin/fetch.c:796
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "nie znaleziono obiektu %s"
-#: builtin/fetch.c:800
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[aktualne]"
-#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[odrzucono]"
-#: builtin/fetch.c:814
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "nie można pobrać na bieżącej gałęzi"
-#: builtin/fetch.c:824
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[aktualizacja tagu]"
-#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
-#: builtin/fetch.c:896
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "nie można zaktualizować lokalnej referencji"
-#: builtin/fetch.c:829
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "nadpisałoby istniejący tag"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[nowy tag]"
-#: builtin/fetch.c:854
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[nowa gałąź]"
-#: builtin/fetch.c:857
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[nowa referencja]"
-#: builtin/fetch.c:896
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "wymuszona aktualizacja"
-#: builtin/fetch.c:901
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "nieprzewinięte"
-#: builtin/fetch.c:1005
+#: builtin/fetch.c:1070
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"
@@ -14875,7 +15421,7 @@
"użyj flagi „--show-forced-updates” lub wykonaj\n"
"„git fetch.showForcedUpdates true”."
-#: builtin/fetch.c:1009
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14888,22 +15434,22 @@
"false”\n"
" aby uniknąć tego sprawdzenia.\n"
-#: builtin/fetch.c:1041
+#: builtin/fetch.c:1105
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s nie wysłał wszystkich potrzebnych obiektów\n"
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1134
#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "odrzucanie %s, bo nie można aktualizować płytkich korzeni"
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr "odrzucanie %s, bo nie dozwolono aktualizowania płytkich korzeni"
-#: builtin/fetch.c:1146 builtin/fetch.c:1297
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "Z %.*s\n"
-#: builtin/fetch.c:1168
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14912,56 +15458,61 @@
"nie można zaktualizować niektórych lokalnych referencji;\n"
" spróbuj wykonać „git remote prune %s”, aby usunąć stare niepasujące gałęzie"
-#: builtin/fetch.c:1267
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s będzie wiszący)"
-#: builtin/fetch.c:1268
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s stał się wiszący)"
-#: builtin/fetch.c:1300
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[usunięto]"
-#: builtin/fetch.c:1301 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "(brak)"
-#: builtin/fetch.c:1324
+#: builtin/fetch.c:1398
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Odmawiam pobrania na bieżącą gałąź %s nie-suchego repozytorium"
-#: builtin/fetch.c:1343
+#: builtin/fetch.c:1417
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "W opcji „%s” wartość „%s” jest nieprawidłowa przy %s"
-#: builtin/fetch.c:1346
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opcja „%s” jest ignorowana przez %s\n"
-#: builtin/fetch.c:1558
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "obiekt „%s” nie istnieje"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "wykryto wiele gałęzi, wyklucza się to z --set-upstream"
-#: builtin/fetch.c:1573
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "nie ustawiam gałęzi nadrzędnej w gałęzi śledzącej"
-#: builtin/fetch.c:1575
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "nie ustawiam głównego nurtu w zdalnym tagu"
-#: builtin/fetch.c:1577
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "nieznany rodzaj gałęzi"
-#: builtin/fetch.c:1579
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -14969,22 +15520,22 @@
"nie znaleziono gałęzi źródłowej.\n"
"należy podać dokładnie jedną gałąź z opcją --set-upstream."
-#: builtin/fetch.c:1708 builtin/fetch.c:1771
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "Pobieranie %s\n"
-#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Nie można pobrać %s"
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "nie można pobrać „%s” (kod wyjścia: %d)\n"
-#: builtin/fetch.c:1834
+#: builtin/fetch.c:1909
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14992,44 +15543,56 @@
"Nie ustawiono zdalnego repozytorium. Podaj adres URL lub\n"
"nazwę zdalnego repozytorium, z którego mają być pobrane nowe rewizje."
-#: builtin/fetch.c:1870
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "Musisz określić nazwę tagu."
-#: builtin/fetch.c:1935
+#: builtin/fetch.c:2009
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only wymaga jednego lub wielu --negotiate-tip=*"
+
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "ujemna głębokość w --deepen nie jest wspierana"
-#: builtin/fetch.c:1937
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepend i --depth się wykluczają"
+msgstr "--deepen i --depth się wykluczają"
-#: builtin/fetch.c:1942
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow wykluczają się"
-#: builtin/fetch.c:1944
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow w pełnym repozytorium nie ma sensu"
-#: builtin/fetch.c:1961
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all nie przyjmuje argumentów z repozytoriów"
-#: builtin/fetch.c:1963
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr "--all i referencje się wykluczają"
-#: builtin/fetch.c:1972
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Nie ma takiego zdalnego repozytorium ani ich grupy: %s"
-#: builtin/fetch.c:1979
+#: builtin/fetch.c:2057
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "pobieranie grupy i podanie referencji nie ma sensu"
-#: builtin/fetch.c:1997
+#: builtin/fetch.c:2073
+msgid "must supply remote when using --negotiate-only"
+msgstr "należy podać zdalne repozytorium przy --negotiate-only"
+
+#: builtin/fetch.c:2078
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr "Protokół nie wspiera --negotiate-only, wyjście."
+
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15037,12 +15600,12 @@
"można użyć --filter tylko ze zdalnym repozytorium ustawionym w extensions."
"partialclone"
-#: builtin/fetch.c:2001
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr ""
"można użyć --atomic tylko przy pobieraniu z jednego zdalnego repozytorium"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
"można użyć --stdin tylko przy pobieraniu z jednego zdalnego repozytorium"
@@ -15089,47 +15652,47 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<zapis>]] [--no-contains [<zapis>]]"
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for shells"
msgstr "użyj cytowania jak w powłokach"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
msgid "quote placeholders suitably for perl"
msgstr "użyj cytowania jak w perlu"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
msgid "quote placeholders suitably for python"
msgstr "użyj cytowania jak w pythonie"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
msgid "quote placeholders suitably for Tcl"
msgstr "użyj cytowania jak w Tclu"
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
msgid "show only <n> matched refs"
msgstr "pokazuj tylko <n> pasujących referencji"
-#: builtin/for-each-ref.c:39 builtin/tag.c:472
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "uszanuj kolory formatu"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
msgid "print only refs which points at the given object"
msgstr "wypisz tylko referencje wskazujące ten obiekt"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
msgid "print only refs that are merged"
msgstr "wypisz tylko scalone referencje"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
msgid "print only refs that are not merged"
msgstr "wypisz tylko niescalone referencje"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
msgid "print only refs which contain the commit"
msgstr "wypisz tylko referencje zawierające ten zapis"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
msgid "print only refs which don't contain the commit"
msgstr "wypisz tylko referencje nie zawierające tego zapisu"
@@ -15137,44 +15700,44 @@
msgid "git for-each-repo --config=<config> <command-args>"
msgstr "git for-each-repo --config=<konfiguracja> <argumenty-polecenia>"
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
msgid "config"
msgstr "konfiguracja"
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
msgid "config key storing a list of repository paths"
msgstr "klucz konfiguracji przechowujący listę ścieżek repozytoriów"
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
msgid "missing --config=<config>"
msgstr "brakuje --config=<konfiguracja>"
-#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
msgid "unknown"
msgstr "nieznane"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:83 builtin/fsck.c:103
+#: builtin/fsck.c:78 builtin/fsck.c:100
#, c-format
msgid "error in %s %s: %s"
msgstr "błąd w %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:97
+#: builtin/fsck.c:94
#, c-format
msgid "warning in %s %s: %s"
msgstr "ostrzeżenie w %s %s:%s"
-#: builtin/fsck.c:126 builtin/fsck.c:129
+#: builtin/fsck.c:124 builtin/fsck.c:127
#, c-format
msgid "broken link from %7s %s"
msgstr "zepsute łącze z %7s %s"
-#: builtin/fsck.c:138
+#: builtin/fsck.c:136
msgid "wrong object type in link"
msgstr "zły rodzaj obiektu w łączu"
-#: builtin/fsck.c:154
+#: builtin/fsck.c:152
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -15183,211 +15746,221 @@
"zepsute łącze z %7s %s\n"
" do %7s %s"
-#: builtin/fsck.c:265
+#: builtin/fsck.c:264
#, c-format
msgid "missing %s %s"
msgstr "brakujący %s %s"
-#: builtin/fsck.c:292
+#: builtin/fsck.c:291
#, c-format
msgid "unreachable %s %s"
msgstr "nieosiągalny %s %s"
-#: builtin/fsck.c:312
+#: builtin/fsck.c:311
#, c-format
msgid "dangling %s %s"
msgstr "wiszące %s %s"
-#: builtin/fsck.c:322
+#: builtin/fsck.c:321
msgid "could not create lost-found"
msgstr "nie można utworzyć biura obiektów znalezionych"
-#: builtin/fsck.c:333
+#: builtin/fsck.c:332
#, c-format
msgid "could not finish '%s'"
msgstr "nie można zakończyć „%s”"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:349
#, c-format
msgid "Checking %s"
msgstr "Sprawdzanie %s"
-#: builtin/fsck.c:388
+#: builtin/fsck.c:387
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Sprawdzanie spójności (%d obiektów)"
-#: builtin/fsck.c:407
+#: builtin/fsck.c:406
#, c-format
msgid "Checking %s %s"
msgstr "Sprawdzanie %s %s"
-#: builtin/fsck.c:412
+#: builtin/fsck.c:411
msgid "broken links"
msgstr "zepsute łącza"
-#: builtin/fsck.c:421
+#: builtin/fsck.c:420
#, c-format
msgid "root %s"
msgstr "korzeń %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:428
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "otagowano %s %s (%s) w %s"
-#: builtin/fsck.c:458
+#: builtin/fsck.c:457
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: brakujący lub uszkodzony obiekt"
-#: builtin/fsck.c:483
+#: builtin/fsck.c:482
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: nieprawidłowy element dziennika referencji %s"
-#: builtin/fsck.c:497
+#: builtin/fsck.c:496
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Sprawdzanie dziennika referencji %s->%s"
-#: builtin/fsck.c:531
+#: builtin/fsck.c:530
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: nieprawidłowy wskaźnik SHA-1 %s"
-#: builtin/fsck.c:538
+#: builtin/fsck.c:537
#, c-format
msgid "%s: not a commit"
msgstr "%s: nie jest zapisem"
-#: builtin/fsck.c:592
+#: builtin/fsck.c:591
msgid "notice: No default references"
msgstr "uwaga: Brak domyślnych referencji"
-#: builtin/fsck.c:607
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: konflikt skrótów ścieżek, znaleziono w: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: brakujący lub uszkodzony obiekt: %s"
-#: builtin/fsck.c:620
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: obiekt jest nieznanego rodzaju „%s”: %s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: nie można przetworzyć obiektu: %s"
-#: builtin/fsck.c:640
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "zły plik SHA-1: %s"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "Sprawdzanie katalogu obiektów"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "Sprawdzanie katalogów obiektów"
-#: builtin/fsck.c:673
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "Sprawdzanie połączenia %s"
-#: builtin/fsck.c:678 builtin/index-pack.c:865
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "błędny %s"
-#: builtin/fsck.c:685
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s wskazuje na coś dziwnego (%s)"
-#: builtin/fsck.c:691
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: oddzielone HEAD niczego nie wskazuje"
-#: builtin/fsck.c:695
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "uwaga: %s wskazuje nienarodzoną gałąź (%s)"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "Sprawdzanie drzewa pamięci podręcznej"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: nieprawidłowy wskaźnik SHA-1 w drzewie pamięci podręcznej"
-#: builtin/fsck.c:721
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr "nie-drzewo w drzewie pamięci podręcznej"
-#: builtin/fsck.c:752
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcje>] [<obiekt>...]"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "pokazuj nieosiągalne obiekty"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "pokaż wiszące obiekty"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "zgłaszaj tagi"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "zgłaszaj węzły korzenia"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr "dodaj obiekty indeksu do naczelnych węzłów"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr "dodaj dzienniki referencji do węzłów naczelnych (domyślnie)"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr "przejrzyj też paczki i obiekty alternatywne"
-#: builtin/fsck.c:765
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "sprawdź tylko spójność"
-#: builtin/fsck.c:766 builtin/mktag.c:78
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "włącz ściślejsze sprawdzanie"
-#: builtin/fsck.c:768
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr "zapisz wiszące obiekty w .git/lost-found"
-#: builtin/fsck.c:769 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "pokazuj postęp"
-#: builtin/fsck.c:770
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "pokaż rozwlekłe nazwy osiągalnych obiektów"
-#: builtin/fsck.c:829 builtin/index-pack.c:261
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Sprawdzanie obiektów"
-#: builtin/fsck.c:857
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr "%s: brakujący obiekt"
-#: builtin/fsck.c:868
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "nieprawidłowy parametr: oczekiwano SHA-1, otrzymano „%s”"
@@ -15406,12 +15979,12 @@
msgid "failed to parse '%s' value '%s'"
msgstr "nie można przetworzyć wartości „%s” „%s”"
-#: builtin/gc.c:487 builtin/init-db.c:58
+#: builtin/gc.c:487 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "nie można wykonać stat na „%s”"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "nie można odczytać „%s”"
@@ -15420,13 +15993,13 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
"Ostatnie wykonanie gc zgłosiło, co następuje. Napraw główną przyczynę\n"
-"i usuń %s.\n"
+"i usuń %s\n"
"Automatyczne czyszczenie nie zostanie przeprowadzone, póki ten plik nie "
"zniknie.\n"
"\n"
@@ -15506,151 +16079,191 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "nierozpoznany argument --schedule „%s”"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr "nie można wypisać grafu zapisów"
-#: builtin/gc.c:914
-msgid "failed to fill remotes"
-msgstr "nie można wypełnić zdalnych repozytoriów"
+#: builtin/gc.c:904
+msgid "failed to prefetch remotes"
+msgstr "nie można pobrać zdalnych repozytoriów z wyprzedzeniem"
-#: builtin/gc.c:1037
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr "nie można uruchomić procesu „git pack-objects”"
-#: builtin/gc.c:1054
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr "nie można ukończyć procesu „git pack-objects”"
-#: builtin/gc.c:1106
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr "nie można zapisać indeksu wielu paczek"
-#: builtin/gc.c:1124
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr "„git multi-pack-index expire” nie powiodło się"
-#: builtin/gc.c:1185
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr "„git multi-pack-index repack” nie powiodło się"
-#: builtin/gc.c:1194
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"pomijanie zadania przyrostowego przepakowania, bo core.multiPackIndex jest "
"wyłączone"
-#: builtin/gc.c:1298
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "istnieje plik blokady „%s”, pomijanie porządków"
-#: builtin/gc.c:1328
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr "zadanie „%s” nie powiodło się"
-#: builtin/gc.c:1410
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr "„%s” nie jest prawidłowym zadaniem"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "nie można wybrać wiele razy zadania „%s”"
-#: builtin/gc.c:1430
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr "uruchamiaj zadania w oparciu o stan repozytorium"
-#: builtin/gc.c:1431
+#: builtin/gc.c:1409
msgid "frequency"
msgstr "częstotliwość"
-#: builtin/gc.c:1432
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr "uruchamiaj zadania w oparciu o częstotliwość"
-#: builtin/gc.c:1435
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr ""
"nie zgłaszaj postępu ani innych informacji na standardowe wyjście "
"diagnostyczne"
-#: builtin/gc.c:1436
+#: builtin/gc.c:1414
msgid "task"
msgstr "zadanie"
-#: builtin/gc.c:1437
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr "uruchom konkretne zadanie"
-#: builtin/gc.c:1454
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "--auto i --schedule=<frequency> się wykluczają"
-#: builtin/gc.c:1497
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr "nie można wykonać „git config”"
-#: builtin/gc.c:1562
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr "nie można rozwinąć ścieżki „%s”"
-#: builtin/gc.c:1591
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr "nie można uruchomić launchctl"
-#: builtin/gc.c:1628
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr "nie można utworzyć katalogów na „%s”"
-#: builtin/gc.c:1689
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr "nie można wydostać usługi %s"
-#: builtin/gc.c:1760
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr "nie można utworzyć tymczasowego pliku XML"
-#: builtin/gc.c:1850
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr "nie można uruchomić schtasks"
-#: builtin/gc.c:1894
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr "nie można wykonać „crontab -l”; ten system może nie wspierać crona"
-#: builtin/gc.c:1911
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "nie można wykonać „crontab”; ten system może nie wspierać crona"
-#: builtin/gc.c:1915
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr "nie można otworzyć standardowego wejścia „crontab”"
-#: builtin/gc.c:1956
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr "„crontab” padł"
-#: builtin/gc.c:1990
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "nie można uruchomić systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "nie można wykonać systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "nie można skasować „%s”"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "nierozpoznany argument --scheduler „%s”"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "nie jest dostępny ani crontab, ani wyzwalacze systemd"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "planista %s nie jest dostępny"
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
msgstr "inny proces planuje porządki w tle"
-#: builtin/gc.c:2009
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<planista>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "planista"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "planista do wyzwolenia sprzątania repozytorium"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr "nie można dodać repozytorium do globalnej konfiguracji"
-#: builtin/gc.c:2019
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <pod-polecenie> [<opcje>]"
-#: builtin/gc.c:2038
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr "nieprawidłowe pod-polecenie: %s"
@@ -15659,12 +16272,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opcje>] [-e] <wzorzec> [<rewizja>...] [[--] <ścieżka>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: nie można utworzyć wątku: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "podano nieprawidłową liczbę wątków (%d) do %s"
@@ -15673,262 +16286,262 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1792
-#: builtin/pack-objects.c:2944
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "brak obsługi wątków, ignorowanie %s"
-#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "nie można odczytać drzewa (%s)"
-#: builtin/grep.c:656
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "nie można przeprowadzić grep z obiektu rodzaju %s"
-#: builtin/grep.c:737
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "przełącznik „%c” oczekuje wartości liczbowej"
-#: builtin/grep.c:836
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr "wyszukaj w indeksie zamiast w drzewie roboczym"
-#: builtin/grep.c:838
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "znajdź w zawartości nie zarządzanej przez gita"
-#: builtin/grep.c:840
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "szukaj i w plikach śledzonych i nieśledzonych"
-#: builtin/grep.c:842
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "pomiń pliki wymienione w „.gitignore”"
-#: builtin/grep.c:844
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
-msgstr "wyszukaj rekurencyjnie w każdym pod-module"
+msgstr "wyszukaj rekurencyjnie w każdym podmodule"
-#: builtin/grep.c:847
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "pokaż niepasujące wiersze"
-#: builtin/grep.c:849
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "ignorowanie wielkości liter przy dopasowaniu"
-#: builtin/grep.c:851
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "dopasuj wzorce tylko na brzegach słów"
-#: builtin/grep.c:853
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "przetwarzaj pliki binarne jako tekst"
-#: builtin/grep.c:855
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "nie dopasowuj wzorców w plikach binarnych"
-#: builtin/grep.c:858
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr "przetwarzaj pliki binarne filtrami textconv"
-#: builtin/grep.c:860
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "wyszukaj w pod-katalogach (domyślnie)"
-#: builtin/grep.c:862
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "zejdź o co najwyżej <głębokość> poziomów"
-#: builtin/grep.c:866
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "użyj rozszerzonych wyrażeń regularnych POSIX"
-#: builtin/grep.c:869
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "użyj podstawowych wyrażeń regularnych POSIX (domyślnie)"
-#: builtin/grep.c:872
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "interpretuj wzorce jako stałe łańcuchy"
-#: builtin/grep.c:875
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "użyj wyrażeń regularnych kompatybilnych z Perlem"
-#: builtin/grep.c:878
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "pokaż numery wierszy"
-#: builtin/grep.c:879
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "pokaż numer kolumny pierwszego dopasowania"
-#: builtin/grep.c:880
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "nie pokazuj nazw plików"
-#: builtin/grep.c:881
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "pokaż nazwy plików"
-#: builtin/grep.c:883
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr "pokaż nazwy plików względem głównego katalogu"
-#: builtin/grep.c:885
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "pokazuj tylko nazwy plików zamiast pasujących wierszy"
-#: builtin/grep.c:887
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "zamiennik na --files-with-matches"
-#: builtin/grep.c:890
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr "pokazuj tylko nazwy plików bez trafień"
-#: builtin/grep.c:892
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "wypisuj NUL po nazwach plików"
-#: builtin/grep.c:895
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "pokaż tylko pasujące fragmenty wiersza"
-#: builtin/grep.c:897
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr "pokaż liczbę dopasowań zamiast pasujących wierszy"
-#: builtin/grep.c:898
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "podświetl dopasowania"
-#: builtin/grep.c:900
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr "wypisz pusty wiersz pomiędzy dopasowaniami z różnych plików"
-#: builtin/grep.c:902
+#: builtin/grep.c:917
msgid "show filename only once above matches from same file"
msgstr "pokaż nazwę pliku tylko raz nad dopasowaniami z jednego pliku"
-#: builtin/grep.c:905
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "pokaż <n> wierszy kontekstu przed dopasowaniami i po nich"
-#: builtin/grep.c:908
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "pokaż <n> wierszy kontekstu przed dopasowaniami"
-#: builtin/grep.c:910
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "pokaż <n> wierszy kontekstu po dopasowaniach"
-#: builtin/grep.c:912
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "użyj <n> wątków roboczych"
-#: builtin/grep.c:913
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "skrót na -C ILE"
-#: builtin/grep.c:916
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr "pokaż wiersz z nazwą funkcji przed dopasowaniami"
-#: builtin/grep.c:918
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "pokaż okalającą funkcję"
-#: builtin/grep.c:921
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "wczytaj wzorce z pliku"
-#: builtin/grep.c:923
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "dopasuj <wzorzec>"
-#: builtin/grep.c:925
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "łącz wzorce podane przez -e"
-#: builtin/grep.c:937
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr "zgłoś trafienie kodem wyjścia bez wypisywania"
-#: builtin/grep.c:939
+#: builtin/grep.c:954
msgid "show only matches from files that match all patterns"
msgstr "pokaż tylko dopasowania z plików, które pasują do wszystkich wzorców"
-#: builtin/grep.c:942
+#: builtin/grep.c:957
msgid "pager"
msgstr "czytnik"
-#: builtin/grep.c:942
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "pokaż pasujące pliki w czytniku"
-#: builtin/grep.c:946
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "pozwól wykonać grep(1) (ignorowane w tej wersji)"
-#: builtin/grep.c:1012
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "nie podano wzorca"
-#: builtin/grep.c:1048
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index i --untracked wykluczają się z rewizjami"
-#: builtin/grep.c:1056
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "nie można rozwiązać rewizji: %s"
-#: builtin/grep.c:1086
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked niewspierane z --recurse-submodules"
-#: builtin/grep.c:1090
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "nieprawidłowe połączenie opcji, pomijanie --threads"
-#: builtin/grep.c:1093 builtin/pack-objects.c:3672
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "brak obsługi wątków, ignorowanie --threads"
-#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "podano nieprawidłową liczbę wątków (%d)"
-#: builtin/grep.c:1130
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager działa tylko w drzewie roboczym"
-#: builtin/grep.c:1156
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached i --untracked wykluczają się z --no-index"
-#: builtin/grep.c:1159
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "--untracked i --cached się wykluczają"
-#: builtin/grep.c:1165
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "Nie można użyć --[no-]exclude-standard do śledzonej zawartości"
-#: builtin/grep.c:1173
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "podano jednocześnie --cached i drzewa"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -15936,97 +16549,109 @@
"git hash-object [-t <rodzaj>] [-w] [--path=<ścieżka> | --no-filters] [--"
"stdin] [--] <plik>..."
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "rodzaj obiektu"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "zapisz obiekt do bazy danych obiektu"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "wczytaj obiekt ze standardowego wejścia"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "przechowaj plik jak jest, bez filtrów"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"skróć po prostu jakieś losowe śmieci, żeby utworzyć uszkodzone obiekty do "
"odpluskwiania Gita"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "przetwórz plik, jakby był z tej ścieżki"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "wypisz wszystkie dostępne polecenia"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "pomiń przewodniki"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "wypisz listę przydatnych podręczników"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "wypisz wszystkie nazwy zmiennych konfiguracji"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "pokaż podręcznik użytkowania"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "pokaż podręcznik w przeglądarce"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "pokaż stronę podręcznika info"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "wypisz opis polecenia"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<polecenie>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "wypisz listę przydatnych podręczników"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "wypisz wszystkie nazwy zmiennych konfiguracji"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<polecenie>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "nierozpoznany format pomocy „%s”"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "Nie można uruchomić emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "Nie można przetworzyć wersji emacsclienta."
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "wersja emacsclienta „%d” za stara (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "nie można wykonać „%s”"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16035,7 +16660,7 @@
"„%s”: ścieżka do niewspieranego czytnika podręcznika.\n"
"Rozważ zamiast tego użycie „man.<narzędzie>.cmd”."
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16044,35 +16669,39 @@
"„%s”: polecenie niewspieranego czytnika podręcznika.\n"
"Rozważ zamiast tego użycie „man.<narzędzie>.path”."
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "„%s”: nieznany czytnik podręcznika."
-#: builtin/help.c:453
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "żaden czytnik podręcznika nie obsłużył żądania"
-#: builtin/help.c:461
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr "żaden czytnik podręcznika info nie obsłużył żądania"
-#: builtin/help.c:520 builtin/help.c:531 git.c:340
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "„%s” jest skrótem na „%s”"
-#: builtin/help.c:534 git.c:372
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "zły łańcuch alias.%s: %s"
-#: builtin/help.c:563 builtin/help.c:593
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "ta opcja nie przyjmuje innych argumentów"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "użycie: %s%s"
-#: builtin/help.c:577
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "więcej informacji w „git help config”"
@@ -16111,7 +16740,7 @@
msgid "used more bytes than were available"
msgstr "użyto więcej bajtów niż było dostępnych"
-#: builtin/index-pack.c:324 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "paczka za duża na obecną definicję off_t"
@@ -16119,53 +16748,43 @@
msgid "pack exceeds maximum allowed size"
msgstr "paczka przekracza maksymalny dozwolony rozmiar"
-#: builtin/index-pack.c:342
-#, c-format
-msgid "unable to create '%s'"
-msgstr "nie można utworzyć „%s”"
-
-#: builtin/index-pack.c:348
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "nie można otworzyć pliku paczki „%s”"
-
-#: builtin/index-pack.c:362
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "niezgodność podpisu paczki"
-#: builtin/index-pack.c:364
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "wersja paczki %<PRIu32> niewspierana"
-#: builtin/index-pack.c:382
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paczka ma zły obiekt na pozycji %<PRIuMAX>: %s"
-#: builtin/index-pack.c:488
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "dekompresja zwróciła %d"
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "przepełnienie wartości przesunięcia dla obiektu podstawowego delty"
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "podstawowe przesunięcie delty jest poza zakresem"
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "nieznany typ obiektu %d"
-#: builtin/index-pack.c:584
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "nie można wykonać pread na pliku paczki"
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -16173,88 +16792,88 @@
msgstr[1] "przedwczesny koniec pliku paczki, brakuje %<PRIuMAX> bajtów"
msgstr[2] "przedwczesny koniec pliku paczki, brakuje %<PRIuMAX> bajtów"
-#: builtin/index-pack.c:612
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "poważna niespójność dekompresji"
-#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787
-#: builtin/index-pack.c:826 builtin/index-pack.c:835
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "ZNALEZIONO KOLIZJĘ SHA1 Z %s !"
-#: builtin/index-pack.c:760 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "nie można odczytać %s"
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "nie można odczytać informacji istniejącego obiektu %s"
-#: builtin/index-pack.c:832
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "nie można odczytać istniejącego obiektu %s"
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "nieprawidłowy obiekt blob %s"
-#: builtin/index-pack.c:849 builtin/index-pack.c:868
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "błąd fsck w spakowanym obiekcie"
-#: builtin/index-pack.c:870
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nie wszystkie obiekty potomne %s są osiągalne"
-#: builtin/index-pack.c:931 builtin/index-pack.c:978
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "nie można zastosować delty"
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "Pobieranie obiektów"
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "Indeksowanie obiektów"
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paczka jest uszkodzona (różnica w SHA1)"
-#: builtin/index-pack.c:1200
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "nie można wykonać fstat na pliku paczki"
-#: builtin/index-pack.c:1203
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "paczka ma śmieci na końcu"
-#: builtin/index-pack.c:1215
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "dezorientacja ponad szaleństwo w parse_pack_objects()"
-#: builtin/index-pack.c:1238
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "Rozwiązywanie delt"
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "nie można utworzyć wątku: %s"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "dezorientacja ponad szaleństwo"
-#: builtin/index-pack.c:1288
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
@@ -16262,12 +16881,12 @@
msgstr[1] "wykonano z %d lokalnymi obiektami"
msgstr[2] "wykonano z %d lokalnymi obiektami"
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Nieoczekiwana końcowa suma kontrolna %s (uszkodzenie dysku?)"
-#: builtin/index-pack.c:1304
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
@@ -16275,63 +16894,56 @@
msgstr[1] "paczka ma %d nierozwiązane delty"
msgstr[2] "paczka ma %d nierozwiązanych delt"
-#: builtin/index-pack.c:1328
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "nie można skompresować dodanego obiektu (%d)"
-#: builtin/index-pack.c:1424
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalny obiekt %s jest uszkodzony"
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "nazwa pliku paczki „%s” nie kończy się na „.%s”"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "nie można zapisać pliku %s „%s”"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "nie można zamknąć zapisanego pliku %s „%s”"
-#: builtin/index-pack.c:1503
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "nie można zmienić nazwy pliku tymczasowego „*.%s” na „%s”"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "błąd podczas zamykania pliku paczki"
-#: builtin/index-pack.c:1517
-msgid "cannot store pack file"
-msgstr "nie można zapisać pliku paczki"
-
-#: builtin/index-pack.c:1525
-msgid "cannot store index file"
-msgstr "nie można zapisać pliku indeksu"
-
-#: builtin/index-pack.c:1534
-msgid "cannot store reverse index file"
-msgstr "nie można zapisać pliku odwrotnego indeksu"
-
-#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "zła wartość pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Nie można otworzyć istniejącego pliku paczki „%s”"
-#: builtin/index-pack.c:1652
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Nie można otworzyć istniejącego pliku idx paczki dla „%s”"
-#: builtin/index-pack.c:1700
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
@@ -16339,7 +16951,7 @@
msgstr[1] "nie delta: %d obiekty"
msgstr[2] "nie delta: %d obiektów"
-#: builtin/index-pack.c:1707
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -16347,131 +16959,131 @@
msgstr[1] "długość łańcucha = %d: %lu obiekty"
msgstr[2] "długość łańcucha = %d: %lu obiektów"
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "Nie można wrócić do cwd"
-#: builtin/index-pack.c:1803 builtin/index-pack.c:1806
-#: builtin/index-pack.c:1822 builtin/index-pack.c:1826
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "błędny %s"
-#: builtin/index-pack.c:1832 builtin/init-db.c:392 builtin/init-db.c:625
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "nieznany algorytm skrótu „%s”"
-#: builtin/index-pack.c:1851
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin i --stdin wykluczają się"
-#: builtin/index-pack.c:1853
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin wymaga repozytorium gita"
-#: builtin/index-pack.c:1855
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format i --stdin wykluczają się"
+msgstr "--object-format i --stdin się wykluczają"
-#: builtin/index-pack.c:1870
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify bez podanej nazwy pliku paczki"
-#: builtin/index-pack.c:1936 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "błąd fsck w obiektach paczek"
-#: builtin/init-db.c:64
+#: builtin/init-db.c:63
#, c-format
msgid "cannot stat template '%s'"
msgstr "nie można wykonać stat na szablonie „%s”"
-#: builtin/init-db.c:69
+#: builtin/init-db.c:68
#, c-format
msgid "cannot opendir '%s'"
msgstr "nie można otworzyć katalogu „%s”"
-#: builtin/init-db.c:81
+#: builtin/init-db.c:80
#, c-format
msgid "cannot readlink '%s'"
msgstr "nie można wykonać readlink na „%s”"
-#: builtin/init-db.c:83
+#: builtin/init-db.c:82
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "nie można wykonać symlink na „%s” „%s”"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "nie można skopiować „%s” do „%s”"
-#: builtin/init-db.c:93
+#: builtin/init-db.c:92
#, c-format
msgid "ignoring template %s"
msgstr "pomijanie szablonu %s"
-#: builtin/init-db.c:124
+#: builtin/init-db.c:123
#, c-format
msgid "templates not found in %s"
msgstr "nie znaleziono szablonów w %s"
-#: builtin/init-db.c:139
+#: builtin/init-db.c:138
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "nie kopiowanie szablonów z „%s”: %s"
-#: builtin/init-db.c:275
+#: builtin/init-db.c:263
#, c-format
msgid "invalid initial branch name: '%s'"
msgstr "nieprawidłowa początkowa nazwa gałęzi: „%s”"
-#: builtin/init-db.c:367
+#: builtin/init-db.c:354
#, c-format
msgid "unable to handle file type %d"
msgstr "nie można obsłużyć typu pliku %d"
-#: builtin/init-db.c:370
+#: builtin/init-db.c:357
#, c-format
msgid "unable to move %s to %s"
msgstr "nie można przenieść %s do %s"
-#: builtin/init-db.c:386
+#: builtin/init-db.c:373
msgid "attempt to reinitialize repository with different hash"
msgstr "próba ponownego zainicjowania repozytorium innym skrótem"
-#: builtin/init-db.c:410 builtin/init-db.c:413
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr "%s już istnieje"
-#: builtin/init-db.c:445
+#: builtin/init-db.c:432
#, c-format
msgid "re-init: ignored --initial-branch=%s"
msgstr "re-init: pominięto --initial-branch=%s"
-#: builtin/init-db.c:476
+#: builtin/init-db.c:463
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Przeinicjowano istniejące współdzielone repozytorium Gita w %s%s\n"
-#: builtin/init-db.c:477
+#: builtin/init-db.c:464
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Przeinicjowano istniejące repozytorium Gita w %s%s\n"
-#: builtin/init-db.c:481
+#: builtin/init-db.c:468
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Zainicjowano puste współdzielone repozytorium Gita w %s%s\n"
-#: builtin/init-db.c:482
+#: builtin/init-db.c:469
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Zainicjowano puste repozytorium Gita w %s%s\n"
-#: builtin/init-db.c:531
+#: builtin/init-db.c:518
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -16479,42 +17091,42 @@
"git init [-q | --quiet] [--bare] [--template=<katalog-szablonu>] [--"
"shared[=<uprawnienia>]] [<katalog>]"
-#: builtin/init-db.c:557
+#: builtin/init-db.c:544
msgid "permissions"
msgstr "uprawnienia"
-#: builtin/init-db.c:558
+#: builtin/init-db.c:545
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
"podaj, że repozytorium gita ma być współdzielone pomiędzy użytkownikami"
-#: builtin/init-db.c:564
+#: builtin/init-db.c:551
msgid "override the name of the initial branch"
msgstr "wymuś nazwę początkowej gałęzi"
-#: builtin/init-db.c:565 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
msgid "hash"
msgstr "skrót"
-#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
msgid "specify the hash algorithm to use"
msgstr "podaj algorytm skrótu do użycia"
-#: builtin/init-db.c:573
+#: builtin/init-db.c:560
msgid "--separate-git-dir and --bare are mutually exclusive"
msgstr "--separate-git-dir i --bare się wykluczają"
-#: builtin/init-db.c:602 builtin/init-db.c:607
+#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgstr "nie można utworzyć katalogu %s"
-#: builtin/init-db.c:611 builtin/init-db.c:666
+#: builtin/init-db.c:600 builtin/init-db.c:655
#, c-format
msgid "cannot chdir to %s"
msgstr "nie można wejść do %s"
-#: builtin/init-db.c:638
+#: builtin/init-db.c:627
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -16523,12 +17135,12 @@
"%s (lub --work-tree=<katalog>) niedozwolone bez podania %s (lub --git-"
"dir=<katalog>)"
-#: builtin/init-db.c:690
+#: builtin/init-db.c:679
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Nie można dostać się do drzewa roboczego „%s”"
-#: builtin/init-db.c:695
+#: builtin/init-db.c:684
msgid "--separate-git-dir incompatible with bare repository"
msgstr "--separate-git-dir i suche repozytorium się wykluczają"
@@ -16580,17 +17192,13 @@
msgid "do not treat --- specially"
msgstr "nie traktuj specjalnie ---"
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "końcówka"
-
#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "końcówka(-i) do dodania"
#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
-msgstr "--trailer i --only-input wykluczają się"
+msgstr "--trailer i --only-input się wykluczają"
#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
@@ -16641,85 +17249,85 @@
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<zakres>:<plik> i ścieżki się wykluczają"
-#: builtin/log.c:303
+#: builtin/log.c:306
#, c-format
msgid "Final output: %d %s\n"
msgstr "Ostateczne wyjście: %d %s\n"
-#: builtin/log.c:566
+#: builtin/log.c:571
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: zły plik"
-#: builtin/log.c:581 builtin/log.c:671
+#: builtin/log.c:586 builtin/log.c:676
#, c-format
msgid "could not read object %s"
msgstr "nie można odczytać obiektu %s"
-#: builtin/log.c:696
+#: builtin/log.c:701
#, c-format
msgid "unknown type: %d"
msgstr "nieznany rodzaj: %d"
-#: builtin/log.c:841
+#: builtin/log.c:846
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: nieprawidłowy tryb listu motywacyjnego z opisu"
-#: builtin/log.c:848
+#: builtin/log.c:853
msgid "format.headers without value"
msgstr "format.headers bez wartości"
-#: builtin/log.c:977
+#: builtin/log.c:982
#, c-format
msgid "cannot open patch file %s"
msgstr "nie można otworzyć pliku łatki %s"
-#: builtin/log.c:994
+#: builtin/log.c:999
msgid "need exactly one range"
msgstr "potrzeba dokładnie jednego zakresu"
-#: builtin/log.c:1004
+#: builtin/log.c:1009
msgid "not a range"
msgstr "to nie jest zakres"
-#: builtin/log.c:1168
+#: builtin/log.c:1173
msgid "cover letter needs email format"
msgstr "list motywacyjny wymaga formatu e-mail"
-#: builtin/log.c:1174
+#: builtin/log.c:1179
msgid "failed to create cover-letter file"
msgstr "nie można utworzyć pliku z listem motywacyjnym"
-#: builtin/log.c:1261
+#: builtin/log.c:1266
#, c-format
msgid "insane in-reply-to: %s"
msgstr "szalone in-reply-to: %s"
-#: builtin/log.c:1288
+#: builtin/log.c:1293
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcje>] [<od-kiedy> | <zakres-rewizji>]"
-#: builtin/log.c:1346
+#: builtin/log.c:1351
msgid "two output directories?"
msgstr "dwa katalogi wyjściowe?"
-#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
#, c-format
msgid "unknown commit %s"
msgstr "nieznany zapis %s"
-#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "nie można rozwiązać „%s” jako prawidłowej referencji"
-#: builtin/log.c:1517
+#: builtin/log.c:1522
msgid "could not find exact merge base"
msgstr "nie znaleziono dokładnej podstawy scalania"
-#: builtin/log.c:1527
+#: builtin/log.c:1532
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"
@@ -16730,288 +17338,292 @@
"zdalną gałąź.\n"
"Albo możesz podać zapis podstawy ręcznie przez --base=<id-zapisu-podstawy>"
-#: builtin/log.c:1550
+#: builtin/log.c:1555
msgid "failed to find exact merge base"
msgstr "nie znaleziono dokładnej podstawy scalania"
-#: builtin/log.c:1567
+#: builtin/log.c:1572
msgid "base commit should be the ancestor of revision list"
msgstr "podstawowy zapis powinien być przodkiem listy rewizji"
-#: builtin/log.c:1577
+#: builtin/log.c:1582
msgid "base commit shouldn't be in revision list"
msgstr "podstawowy zapis nie powinien być na liście rewizji"
-#: builtin/log.c:1635
+#: builtin/log.c:1640
msgid "cannot get patch id"
msgstr "nie można uzyskać identyfikatora łatki"
-#: builtin/log.c:1692
+#: builtin/log.c:1703
msgid "failed to infer range-diff origin of current series"
msgstr "nie można wywnioskować źródła różnic zakresów z bieżącej serii"
-#: builtin/log.c:1694
+#: builtin/log.c:1705
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "użycie „%s” jako źródła różnic zakresów z bieżącej serii"
-#: builtin/log.c:1738
+#: builtin/log.c:1749
msgid "use [PATCH n/m] even with a single patch"
msgstr "użyj [PATCH n/m] nawet przy pojedynczej łatce"
-#: builtin/log.c:1741
+#: builtin/log.c:1752
msgid "use [PATCH] even with multiple patches"
msgstr "użyj [PATCH] nawet przy wielu łatkach"
-#: builtin/log.c:1745
+#: builtin/log.c:1756
msgid "print patches to standard out"
msgstr "wypisz łatki na standardowe wyjście"
-#: builtin/log.c:1747
+#: builtin/log.c:1758
msgid "generate a cover letter"
msgstr "wygeneruj list motywacyjny"
-#: builtin/log.c:1749
+#: builtin/log.c:1760
msgid "use simple number sequence for output file names"
msgstr "użyj tylko numerów w nazwach wynikowych plików"
-#: builtin/log.c:1750
+#: builtin/log.c:1761
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1751
+#: builtin/log.c:1762
msgid "use <sfx> instead of '.patch'"
msgstr "użyj <sfx> zamiast „.patch”"
-#: builtin/log.c:1753
+#: builtin/log.c:1764
msgid "start numbering patches at <n> instead of 1"
msgstr "zacznij numerować łatki od <n> zamiast od 1"
-#: builtin/log.c:1755
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr "liczba-podejść"
+
+#: builtin/log.c:1766
msgid "mark the series as Nth re-roll"
msgstr "oznacz serię jako N-te podejście"
-#: builtin/log.c:1757
+#: builtin/log.c:1768
msgid "max length of output filename"
msgstr "maksymalna długość nazwy wynikowego pliku"
-#: builtin/log.c:1759
+#: builtin/log.c:1770
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "użyj [RFC PATCH] zamiast [PATCH]"
-#: builtin/log.c:1762
+#: builtin/log.c:1773
msgid "cover-from-description-mode"
msgstr "tryb-listu-z-opisu"
-#: builtin/log.c:1763
+#: builtin/log.c:1774
msgid "generate parts of a cover letter based on a branch's description"
msgstr "wygeneruj części listu motywacyjnego w oparciu o opis gałęzi"
-#: builtin/log.c:1765
+#: builtin/log.c:1776
msgid "use [<prefix>] instead of [PATCH]"
msgstr "użyj [<prefiksu>] zamiast [PATCH]"
-#: builtin/log.c:1768
+#: builtin/log.c:1779
msgid "store resulting files in <dir>"
msgstr "zachowaj wynikowe pliki w <katalogu>"
-#: builtin/log.c:1771
+#: builtin/log.c:1782
msgid "don't strip/add [PATCH]"
msgstr "nie usuwaj/nie dodawaj [PATCH]"
-#: builtin/log.c:1774
+#: builtin/log.c:1785
msgid "don't output binary diffs"
msgstr "nie wypisuj binarnych różnic"
-#: builtin/log.c:1776
+#: builtin/log.c:1787
msgid "output all-zero hash in From header"
msgstr "wypisz skrót z samych zer w nagłówku Od"
-#: builtin/log.c:1778
+#: builtin/log.c:1789
msgid "don't include a patch matching a commit upstream"
msgstr "nie uwzględniaj łatki pasującej do już istniejącego zapisu"
-#: builtin/log.c:1780
+#: builtin/log.c:1791
msgid "show patch format instead of default (patch + stat)"
msgstr "pokaż format łatki zamiast domyślnego (łatka + statystyki)"
-#: builtin/log.c:1782
+#: builtin/log.c:1793
msgid "Messaging"
msgstr "Wiadomości"
-#: builtin/log.c:1783
+#: builtin/log.c:1794
msgid "header"
msgstr "nagłówek"
-#: builtin/log.c:1784
+#: builtin/log.c:1795
msgid "add email header"
msgstr "dodaj nagłówek e-maila"
-#: builtin/log.c:1785 builtin/log.c:1786
+#: builtin/log.c:1796 builtin/log.c:1797
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1785
+#: builtin/log.c:1796
msgid "add To: header"
msgstr "dodaj pole Do:"
-#: builtin/log.c:1786
+#: builtin/log.c:1797
msgid "add Cc: header"
msgstr "dodaj pole DW:"
-#: builtin/log.c:1787
+#: builtin/log.c:1798
msgid "ident"
msgstr "tożsamość"
-#: builtin/log.c:1788
+#: builtin/log.c:1799
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"ustaw adres Od na <tożsamość> (lub tożsamość składającego, jeśli nie podano)"
-#: builtin/log.c:1790
+#: builtin/log.c:1801
msgid "message-id"
msgstr "id-wiadomości"
-#: builtin/log.c:1791
+#: builtin/log.c:1802
msgid "make first mail a reply to <message-id>"
msgstr "niech pierwszy list będzie odpowiedzią na <id-wiadomości>"
-#: builtin/log.c:1792 builtin/log.c:1795
+#: builtin/log.c:1803 builtin/log.c:1806
msgid "boundary"
msgstr "granica/boundary"
-#: builtin/log.c:1793
+#: builtin/log.c:1804
msgid "attach the patch"
msgstr "załącz łatkę"
-#: builtin/log.c:1796
+#: builtin/log.c:1807
msgid "inline the patch"
msgstr "umieść łatkę w treści"
-#: builtin/log.c:1800
+#: builtin/log.c:1811
msgid "enable message threading, styles: shallow, deep"
msgstr "zezwól na wątkowanie komunikatów, style: shallow, deep"
-#: builtin/log.c:1802
+#: builtin/log.c:1813
msgid "signature"
msgstr "podpis"
-#: builtin/log.c:1803
+#: builtin/log.c:1814
msgid "add a signature"
msgstr "dodaj podpis"
-#: builtin/log.c:1804
+#: builtin/log.c:1815
msgid "base-commit"
msgstr "zapis-podstawy"
-#: builtin/log.c:1805
+#: builtin/log.c:1816
msgid "add prerequisite tree info to the patch series"
msgstr "dodaj informacje o wymaganym początkowym drzewie do serii łatek"
-#: builtin/log.c:1808
+#: builtin/log.c:1819
msgid "add a signature from a file"
msgstr "dodaj podpis z pliku"
-#: builtin/log.c:1809
+#: builtin/log.c:1820
msgid "don't print the patch filenames"
msgstr "nie wypisuj nazw plików łatek"
-#: builtin/log.c:1811
+#: builtin/log.c:1822
msgid "show progress while generating patches"
msgstr "pokaż postęp podczas generowania łatek"
-#: builtin/log.c:1813
+#: builtin/log.c:1824
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"pokaż zmiany względem <rewizji> w liście motywacyjnym lub pojedynczej łatce"
-#: builtin/log.c:1816
+#: builtin/log.c:1827
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"pokaż zmiany względem <referencji> w liście motywacyjnym lub pojedynczej "
"łatce"
-#: builtin/log.c:1818
+#: builtin/log.c:1829 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "procent, według jakiego ważone jest tworzenie"
-#: builtin/log.c:1904
+#: builtin/log.c:1916
#, c-format
msgid "invalid ident line: %s"
msgstr "błędny wiersz tożsamości: %s"
-#: builtin/log.c:1919
+#: builtin/log.c:1931
msgid "-n and -k are mutually exclusive"
msgstr "-n i -k się wykluczają"
-#: builtin/log.c:1921
+#: builtin/log.c:1933
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc i -k się wykluczają"
-#: builtin/log.c:1929
+#: builtin/log.c:1941
msgid "--name-only does not make sense"
msgstr "--name-only nie ma sensu"
-#: builtin/log.c:1931
+#: builtin/log.c:1943
msgid "--name-status does not make sense"
msgstr "--name-status nie ma sensu"
-#: builtin/log.c:1933
+#: builtin/log.c:1945
msgid "--check does not make sense"
msgstr "--check nie ma sensu"
-#: builtin/log.c:1955
+#: builtin/log.c:1967
msgid "--stdout, --output, and --output-directory are mutually exclusive"
msgstr "--stdout, --output i --output-directory się wykluczają"
-#: builtin/log.c:2078
+#: builtin/log.c:2089
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff wymaga --cover-letter lub pojedynczej łatki"
-#: builtin/log.c:2082
+#: builtin/log.c:2093
msgid "Interdiff:"
msgstr "Różnice w różnicach:"
-#: builtin/log.c:2083
+#: builtin/log.c:2094
#, c-format
msgid "Interdiff against v%d:"
msgstr "Różnice w różnicach względem v%d:"
-#: builtin/log.c:2089
+#: builtin/log.c:2100
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor wymaga --range-diff"
-#: builtin/log.c:2093
+#: builtin/log.c:2104
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff wymaga --cover-letter lub pojedynczej łatki"
-#: builtin/log.c:2101
+#: builtin/log.c:2112
msgid "Range-diff:"
msgstr "Różnice zakresów:"
-#: builtin/log.c:2102
+#: builtin/log.c:2113
#, c-format
msgid "Range-diff against v%d:"
msgstr "Różnice zakresów względem v%d:"
-#: builtin/log.c:2113
+#: builtin/log.c:2124
#, c-format
msgid "unable to read signature file '%s'"
msgstr "nie można odczytać pliku podpisu „%s”"
-#: builtin/log.c:2149
+#: builtin/log.c:2160
msgid "Generating patches"
msgstr "Generowanie łatek"
-#: builtin/log.c:2193
+#: builtin/log.c:2204
msgid "failed to create output files"
msgstr "nie można utworzyć plików wyjściowych"
-#: builtin/log.c:2252
+#: builtin/log.c:2263
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<nadrzędna> [<czoło> [<limit>]]]"
-#: builtin/log.c:2306
+#: builtin/log.c:2317
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17019,130 +17631,134 @@
"Nie znaleziono śledzonej zdalnej gałęzi, podaj ręcznie <zdalne-"
"repozytorium>.\n"
-#: builtin/ls-files.c:486
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opcje>] [<plik>...]"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "rozdziel ścieżki znakiem NUL"
+
+#: builtin/ls-files.c:617
msgid "identify the file status with tags"
msgstr "opisz stan pliku tagami"
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "użyj małych liter do plików o „założonej niezmienności”"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "użyj małych liter do plików „prawidłowo monitorowanych”"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr "pokaż w wyjściu zapamiętane pliki (domyślnie)"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "pokaż w wyjściu usunięte pliki"
-#: builtin/ls-files.c:552
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "pokaż w wyjściu zmienione pliki"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "pokazuj pliki innego typu w wyjściu"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "pokaż w wyjściu ignorowane pliki"
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr "pokaż w wyjściu nazwę obiektu przygotowanej zawartości"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr "pokaż pliki w systemie plików, które należy skasować"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "pokaż tylko nazwy nieśledzonych katalogów"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "pokaż zakończenia wierszy w plikach"
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "nie pokazuj pustych katalogów"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "pokaż niescalone pliki w wyjściu"
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "pokaż informacje o resolve-undo"
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "pomiń pliki spełniające kryteria"
-#: builtin/ls-files.c:577
-msgid "exclude patterns are read from <file>"
-msgstr "wzorce wyłączające czytane są z <pliku>"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "wczytaj wzorce wyłączeń z <pliku>"
-#: builtin/ls-files.c:580
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
"odczytaj dodatkowe wzorce wyłączające z poszczególnych katalogów w <pliku>"
-#: builtin/ls-files.c:582
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "dodaj standardowe wyjątki gita"
-#: builtin/ls-files.c:586
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "podawaj wyjście względem głównego katalogu projektu"
-#: builtin/ls-files.c:589
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
-msgstr "schodź do pod-modułów"
+msgstr "schodź do podmodułów"
-#: builtin/ls-files.c:591
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "jeśli którykolwiek <plik> nie jest w indeksie, potraktuj to jako błąd"
-#: builtin/ls-files.c:592
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "drzewo"
-#: builtin/ls-files.c:593
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "udawaj, że ścieżki usunięte po <drzewie> są nadal obecne"
-#: builtin/ls-files.c:595
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "pokaż dane diagnostyczne"
-#: builtin/ls-files.c:597
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "ukryj podwójne wpisy"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<program>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repozytorium> [<referencje>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repozytorium> [<referencje>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "nie wyświetlaj adresu repozytorium"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "program"
@@ -17184,7 +17800,7 @@
#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
-msgstr "schodź do pod-modułów"
+msgstr "schodź do podmodułów"
#: builtin/ls-tree.c:132
msgid "show trees when recursing"
@@ -17210,7 +17826,56 @@
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "wypisz całe drzewo; nie tylko bieżący katalog (zakłada --full-name)"
-#: builtin/mailsplit.c:241
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<opcje>] <komunikat> <łatka> < list >info"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "zachowaj temat"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr "zachowaj w temacie nawiasy oprócz PATCH"
+
+#: builtin/mailinfo.c:62
+msgid "copy Message-ID to the end of commit message"
+msgstr "skopiuj ID listu (Message-ID) z końcówki komunikatu zapisu"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr "przekoduj metadane na i18n.commitEncoding"
+
+#: builtin/mailinfo.c:67
+msgid "disable charset re-coding of metadata"
+msgstr "wyłącz przekodowywanie zestawów znaków w metadanych"
+
+#: builtin/mailinfo.c:69
+msgid "encoding"
+msgstr "kodowanie"
+
+#: builtin/mailinfo.c:70
+msgid "re-code metadata to this encoding"
+msgstr "przekoduj metadane na to kodowanie"
+
+#: builtin/mailinfo.c:72
+msgid "use scissors"
+msgstr "użyj nożyczek"
+
+#: builtin/mailinfo.c:73
+msgid "<action>"
+msgstr "<działanie>"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr "działanie po znalezieniu cytowanego powrotu karetki (CRa)"
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr "użyj nagłówków w treści listu"
+
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "pusta skrzynka mbox: „%s”"
@@ -17327,191 +17992,183 @@
msgid "Merging %s with %s\n"
msgstr "Scalanie %s z %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opcje>] [<zapis>...]"
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "przełącznik „m” wymaga wartości"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "opcja „%s” wymaga wartości"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Nie znaleziono strategii scalania „%s”.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "Dostępne strategie:"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "Dostępne niestandardowe strategie:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "nie pokazuj statystyk różnic pod koniec scalenia"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "pokaż statystyki różnic pod koniec scalenia"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(synonim do --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"dodaj (co najwyżej <n>) wpisy z krótkiego dziennika do komunikatu zapisu "
"scalenia"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "utwórz pojedynczy zapis zamiast scalać"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "złóż zapis, jeśli scalenie się powiedzie (domyślnie)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing"
msgstr "edytuj komunikat przed złożeniem"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "zezwól na przewijanie (domyślne)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "przerwij, jeśli przewinięcie nie jest możliwe"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "zweryfikuj, czy podany zapis ma prawidłowy podpis GPG"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "strategia"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "strategia scalania"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value"
msgstr "opcja=wartość"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "opcja wybranej strategii scalania"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "komunikat zapisu scalenia (do nieprzewiniętego scalenia)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "przerwij bieżące trwające scalanie"
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "jak --abort, ale zostaw w spokoju indeks i drzewo robocze"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "kontynuuj bieżące trwające scalanie"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "zezwól na scalenie niepowiązanych historii"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "omiń skrypty pre-merge-commit i commit-msg"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "nie można wykonać dodania do schowka."
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "dodanie zmian do schowka nie powiodło się"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "nieprawidłowy obiekt: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "read-tree nie powiodło się"
-#: builtin/merge.c:399
-msgid " (nothing to squash)"
-msgstr " (nic do spłaszczenia)"
+#: builtin/merge.c:401
+msgid "Already up to date. (nothing to squash)"
+msgstr "Już aktualne. (nic do spłaszczenia)"
-#: builtin/merge.c:410
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Spłaszczony zapis — nie aktualizowanie HEAD\n"
-#: builtin/merge.c:460
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Brak komunikatu scalenia — nie aktualizowanie HEAD\n"
-#: builtin/merge.c:511
+#: builtin/merge.c:515
#, c-format
msgid "'%s' does not point to a commit"
msgstr "„%s” nie wskazuje na zapis"
-#: builtin/merge.c:598
+#: builtin/merge.c:603
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Zły łańcuch branch.%s.mergeoptions: %s"
-#: builtin/merge.c:724
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "Nie rozpatrywanie niczego poza scalaniem dwóch czół."
-#: builtin/merge.c:737
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Nieznana opcja merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "nieznana opcja strategii: -X%s"
-#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "nie można zapisać %s"
-#: builtin/merge.c:808
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "Nie można odczytać „%s”"
-#: builtin/merge.c:817
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "Nie składanie scalenia; użyj „git commit”, aby ukończyć scalanie.\n"
-#: builtin/merge.c:823
+#: builtin/merge.c:829
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"
@@ -17521,11 +18178,11 @@
"zwłaszcza jeśli scala zaktualizowaną gałąź nadrzędną z gałęzią tematyczną.\n"
"\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "Pusty komunikat przerywa zapis.\n"
-#: builtin/merge.c:831
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17534,73 +18191,73 @@
"Wiersze zaczynające się od „%c” będą ignorowane, a pusty komunikat\n"
"przerwie zapis.\n"
-#: builtin/merge.c:884
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "Pusty komunikat zapisu."
-#: builtin/merge.c:899
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "Wspaniale.\n"
-#: builtin/merge.c:960
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Automatyczne scalanie nie powiodło się; napraw konflikty i złóż wynik.\n"
-#: builtin/merge.c:999
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "Nie ma bieżącej gałęzi."
-#: builtin/merge.c:1001
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "Bieżąca gałąź nie ma zdalnego repozytorium."
-#: builtin/merge.c:1003
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "Nie zdefiniowano gałęzi nadrzędnej wobec bieżącej."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Brak gałęzi śledzącej dla %s z %s"
-#: builtin/merge.c:1065
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Błędna wartość „%s” w środowisku „%s”"
-#: builtin/merge.c:1168
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "to nie jest coś, co można scalić w %s: %s"
-#: builtin/merge.c:1202
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "to nie jest coś, co można scalić"
-#: builtin/merge.c:1312
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort nie przyjmuje argumentów"
-#: builtin/merge.c:1316
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Nie ma scalenia, które można by przerwać (brak MERGE_HEAD)."
-#: builtin/merge.c:1334
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit nie przyjmuje argumentów"
-#: builtin/merge.c:1347
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue nie przyjmuje argumentów"
-#: builtin/merge.c:1351
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Nie trwa żadne scalenie (brak MERGE_HEAD)."
-#: builtin/merge.c:1367
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17608,7 +18265,7 @@
"Nie zwieńczono scalania (MERGE_HEAD istnieje).\n"
"Złóż swoje zmiany przed scaleniem."
-#: builtin/merge.c:1374
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17616,96 +18273,84 @@
"Nie zwieńczono dobierania (CHERRY_PICK_HEAD istnieje).\n"
"Złóż swoje zmiany przed scaleniem."
-#: builtin/merge.c:1377
+#: builtin/merge.c:1386
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Nie zwieńczono dobierania (CHERRY_PICK_HEAD istnieje)."
-#: builtin/merge.c:1391
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "--squash i --no-ff się wykluczają."
-#: builtin/merge.c:1393
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "--squash i --commit się wykluczają."
-#: builtin/merge.c:1409
+#: builtin/merge.c:1418
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Nie podano zapisu, a nie ustawiono merge.defaultToUpstream."
-#: builtin/merge.c:1426
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr "Spłaszczenie zapisu w puste czoło nie jest jeszcze wspierane"
-#: builtin/merge.c:1428
+#: builtin/merge.c:1437
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Nieprzewinięty zapis nie ma sensu przy pustym czele (HEAD) gałęzi"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s — nie jest czymś, co możemy scalić"
-#: builtin/merge.c:1435
+#: builtin/merge.c:1444
msgid "Can merge only exactly one commit into empty head"
msgstr "Można scalić tylko dokładnie jeden zapis w puste czoło"
-#: builtin/merge.c:1516
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "odmawiam scalenia niepowiązanych historii"
-#: builtin/merge.c:1525
-msgid "Already up to date."
-msgstr "Już aktualne."
-
-#: builtin/merge.c:1535
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aktualizowanie %s..%s\n"
-#: builtin/merge.c:1581
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Próba naprawdę trywialnego scalenia w indeksie...\n"
-#: builtin/merge.c:1588
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "O nie.\n"
-#: builtin/merge.c:1613
-msgid "Already up to date. Yeeah!"
-msgstr "Już aktualne. Hurra!"
-
-#: builtin/merge.c:1619
-msgid "Not possible to fast-forward, aborting."
-msgstr "Nie da się przewinąć, przerywanie."
-
-#: builtin/merge.c:1647 builtin/merge.c:1712
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Cofanie drzewa do nieskalanego stanu...\n"
-#: builtin/merge.c:1651
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Próba strategii scalania %s...\n"
-#: builtin/merge.c:1703
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Żadna strategia scalania nie podołała temu scalaniu.\n"
-#: builtin/merge.c:1705
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Scalanie ze strategią %s nie powiodło się.\n"
-#: builtin/merge.c:1714
+#: builtin/merge.c:1732
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Użycie %s, żeby przygotować ręczne rozwiązywanie.\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "Użycie strategii %s, żeby przygotować ręczne rozwiązywanie.\n"
-#: builtin/merge.c:1728
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -17716,41 +18361,41 @@
msgid "git mktag"
msgstr "git mktag"
-#: builtin/mktag.c:30
+#: builtin/mktag.c:27
#, c-format
msgid "warning: tag input does not pass fsck: %s"
msgstr "ostrzeżenie: wejście tagu nie przechodzi sprawdzenia fsck: %s"
-#: builtin/mktag.c:41
+#: builtin/mktag.c:38
#, c-format
msgid "error: tag input does not pass fsck: %s"
msgstr "błąd: wejście tagu nie przechodzi sprawdzenia fsck: %s"
-#: builtin/mktag.c:44
+#: builtin/mktag.c:41
#, c-format
msgid "%d (FSCK_IGNORE?) should never trigger this callback"
msgstr "%d (FSCK_IGNORE?) nie powinno nigdy wyzwolić tej funkcji zwrotnej"
-#: builtin/mktag.c:59
+#: builtin/mktag.c:56
#, c-format
msgid "could not read tagged object '%s'"
msgstr "nie można odczytać otagowanego obiektu „%s”"
-#: builtin/mktag.c:62
+#: builtin/mktag.c:59
#, c-format
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "obiekt „%s” otagowany jako „%s”, ale jest rodzaju „%s”"
-#: builtin/mktag.c:99
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr ""
"tag na standardowym wejściu nie przeszedł naszego ścisłego sprawdzenia fsck"
-#: builtin/mktag.c:102
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr "tag na standardowym wejściu nie odnosił się do prawidłowego obiektu"
-#: builtin/mktag.c:105 builtin/tag.c:232
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "nie można zapisać pliku tagu"
@@ -17770,19 +18415,51 @@
msgid "allow creation of more than one tree"
msgstr "pozwól na tworzenie więcej niż jednego drzewa"
-#: builtin/multi-pack-index.c:9
+#: builtin/multi-pack-index.c:10
msgid ""
-"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-"size=<size>)"
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
msgstr ""
-"git multi-pack-index [<opcje>] (write|verify|expire|repack --batch-"
-"size=<rozmiar>)"
+"git multi-pack-index [<opcje>] write [--preferred-pack=<paczka>][--refs-"
+"snapshot=<ścieżka>]"
-#: builtin/multi-pack-index.c:26
+#: builtin/multi-pack-index.c:14
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<opcje>] verify"
+
+#: builtin/multi-pack-index.c:17
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [<opcje>] expire"
+
+#: builtin/multi-pack-index.c:20
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr "git multi-pack-index [<opcje>] repack [--batch-size=<rozmiar>]"
+
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "katalog obiektu ze zbiorem par pliku paczki i indeksu paczki"
-#: builtin/multi-pack-index.c:29
+#: builtin/multi-pack-index.c:98
+msgid "preferred-pack"
+msgstr "preferowana-paczka"
+
+#: builtin/multi-pack-index.c:99
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr "paczka do ponownego użycia przy obliczaniu bitmapy wielu paczek"
+
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "zapisz bitmapę wielu paczek"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "zapisz indeks wielu paczek tylko z podanymi indeksami"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "obraz referencji do zaznaczania zapisów bitmapy"
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -17790,22 +18467,6 @@
"podczas przepakowania zbierz pliki paczek mniejszego rozmiaru w porcję "
"większą niż ten rozmiar"
-#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431
-#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598
-#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963
-#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575
-msgid "too many arguments"
-msgstr "za dużo argumentów"
-
-#: builtin/multi-pack-index.c:60
-msgid "--batch-size option is only for 'repack' subcommand"
-msgstr "opcja --batch-size jest tylko do pod-polecenia „repack”"
-
-#: builtin/multi-pack-index.c:69
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "nieznane pod-polecenie: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<opcje>] <źródło>... <cel>"
@@ -17813,7 +18474,7 @@
#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
-msgstr "Katalog %s jest w indeksie i brak pod-modułu?"
+msgstr "Katalog %s jest w indeksie i brak podmodułu?"
#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
@@ -17833,72 +18494,72 @@
msgid "skip move/rename errors"
msgstr "pomiń błędy przenoszenia/zmiany nazwy"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "cel „%s” nie jest katalogiem"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Sprawdzanie zmiany nazwy „%s” na „%s”\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "złe źródło"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "nie można przenieść katalogu do niego samego"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "nie można przesunąć katalogu na plik"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "katalog źródłowy jest pusty"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "nie podlega kontroli wersji"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "skonfliktowane"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "cel istnieje"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "nadpisywanie „%s”"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Nie można nadpisać"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "wiele źródeł do tego samego celu"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "katalog docelowy nie istnieje"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, źródło=%s, cel=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Zmiana nazwy z %s na %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "nie można zmienić nazwy „%s”"
@@ -18076,47 +18737,47 @@
msgid "failed to finish 'show' for object '%s'"
msgstr "nie można ukończyć „show” na obiekcie „%s”"
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr "należy podać zawartość notatki przy użyciu opcji -m lub -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "nie można zapisać obiektu uwagi"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "pozostawiono zawartość uwagi w %s"
-#: builtin/notes.c:242 builtin/tag.c:565
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "nie można otworzyć lub odczytać „%s”"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "nie można rozwiązać „%s” jako prawidłowej referencji."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "nie można odczytać obiektu „%s”."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "nie można odczytać danych uwagi z obiektu „%s” niebędącego blobem."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "uszkodzony wiersz wejścia: „%s”."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "nie można skopiować uwag z „%s” do „%s”"
@@ -18124,41 +18785,48 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "notes %s: odmawiam wykonania w %s (poza refs/notes/)"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
+msgid "too many arguments"
+msgstr "za dużo argumentów"
+
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "brak uwag do obiektu %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "zawartość uwagi jako łańcuch"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "zawartość uwag w pliku"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "użyj ponownie i edytuj podany obiekt uwagi"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "odrzuć podany obiekt węzła"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "pozwól zachować pustą uwagę"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "zastąp istniejące uwagi"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18167,29 +18835,29 @@
"Nie można dodać uwag. Znaleziono istniejące uwagi do obiektu %s. Użyj „-f”, "
"aby nadpisać istniejące uwagi"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Nadpisywanie istniejących uwag do obiektu %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "Usuwanie uwagi do obiektu %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "wczytaj obiekty ze standardowego wejścia"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "wczytaj ustawienia przepisywania dla <polecenia> (zakłada --stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "za mało argumentów"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18198,12 +18866,12 @@
"Nie można skopiować uwag. Znaleziono istniejące uwagi do obiektu %s. Użyj „-"
"f”, aby nadpisać istniejące uwagi"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "brakuje uwag do obiektu źródłowego %s. Nie można skopiować."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18212,52 +18880,52 @@
"Opcje -m/-F/-c/-C są przestarzałe w pod-poleceniu „edit”.\n"
"użyj zamiast tego „git notes add -f -m/-F/-c/-C”.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "nie można usunąć referencji NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "nie można usunąć referencji NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "nie można usunąć drzewa roboczego „git notes merge”"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "nie można odczytać referencji NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "nie znaleziono zapisu z NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "nie można przetworzyć zapisu z NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "nie można rozwiązać NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "nie można zwieńczyć scalenia uwag"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "nieznana strategia scalenia uwag %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Opcje ogólne"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Opcje scalania"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18265,46 +18933,46 @@
"rozwiąż konflikty uwag używając podanej strategii (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Składanie niescalonych uwag"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "zwieńcz scalenie uwag składając niescalone uwagi"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Przerywanie rozwiązania scalenia uwag"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "przerwij scalanie uwag"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort i -s/--strategy wykluczają się"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "należy podać referencję uwag do scalenia"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "nieznana wartość -s/--strategy: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "scalenie uwag do %s już trwa w %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "nie można zapisać dowiązania do bieżącej referencji uwag (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18315,60 +18983,60 @@
"wynik przez „git notes merge --commit”, lub przerwij scalanie przez „git "
"notes merge --abort”.\n"
-#: builtin/notes.c:897 builtin/tag.c:578
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Nie można rozwiązać „%s” jako prawidłowej referencji."
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "Obiekt %s nie ma uwag\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr "próba usunięcia nieistniejącej uwagi nie jest błędem"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "odczytaj nazwy obiektów ze standardowego wejścia"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "nie usuwaj, tylko pokaż"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "zgłaszaj przycięte uwagi"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "ref-uwagi"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "użyj uwag z <referencja-uwagi>"
-#: builtin/notes.c:1034 builtin/stash.c:1671
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "nieznana podkomenda: %s"
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<opcje>...] [< <lista-referencji> | < <lista-"
"obiektów>]"
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<opcje>...] <baza> [< <lista-referencji> | < <lista-"
"obiektów>]"
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18377,107 +19045,111 @@
"write_reuse_object: nie odnaleziono %s, oczekiwano na pozycji %<PRIuMAX> w "
"paczce %s"
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
#, c-format
msgid "bad packed object CRC for %s"
msgstr "zły CRC spakowanego obiektu dla %s"
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
#, c-format
msgid "corrupt packed object for %s"
msgstr "uszkodzony spakowany obiekt dla %s"
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
#, c-format
msgid "recursive delta detected for object %s"
msgstr "wykryto rekurencyjną deltę dla obiektu %s"
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "zamówiono %u obiektów, oczekiwano %<PRIu32>"
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "oczekiwano obiektu na pozycji %<PRIuMAX> w paczce %s"
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"wyłączone zapisywanie bitmapy, paczki są dzielone według pack.packSizeLimit"
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "Zapisywanie obiektów"
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "nie można wykonać stat na „%s”"
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "nie można zapisać indeksu bitmapy"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "wypisano %<PRIu32> obiektów, a oczekiwano %<PRIu32>"
-#: builtin/pack-objects.c:1358
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "wyłączanie zapisywania bitmapy, niektóre obiekty nie są pakowane"
-#: builtin/pack-objects.c:1806
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "przepełnienie podstawowego przesunięcia delty w paczce w %s"
-#: builtin/pack-objects.c:1815
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "podstawowe przesunięcie delty poza zakresem w %s"
-#: builtin/pack-objects.c:2096
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "Zliczanie obiektów"
-#: builtin/pack-objects.c:2241
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "nie można przetworzyć nagłówka obiektu %s"
-#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
-#: builtin/pack-objects.c:2337
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "nie można odczytać obiektu %s"
-#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "niespójna długość obiektu %s (%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2351
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "nieoptymalna paczka — brak pamięci"
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Kompresja delt z użyciem do %d wątków"
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "nie można spakować obiektów osiągalnych z tagu %s"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "Kompresowanie obiektów"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "niespójność z liczbą delt"
-#: builtin/pack-objects.c:2976
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18486,14 +19158,25 @@
"wartość uploadpack.blobpackfileuri musi być postaci „<skrót-obiektu> <skrót-"
"paczki> <uri>” (otrzymano „%s”)"
-#: builtin/pack-objects.c:2979
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
"już ustawiono obiekt w innym uploadpack.blobpackfileuri (otrzymano „%s”)"
-#: builtin/pack-objects.c:3008
+#: builtin/pack-objects.c:3212
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr "nie można uzyskać rodzaju obiektu %s w paczce %s"
+
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "nie znaleziono paczki „%s”"
+
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18502,7 +19185,7 @@
"oczekiwano identyfikatora obiektu krawędzi, otrzymano śmieci:\n"
"%s"
-#: builtin/pack-objects.c:3014
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -18511,235 +19194,247 @@
"oczekiwano identyfikatora obiektu, otrzymano śmieci:\n"
"%s"
-#: builtin/pack-objects.c:3112
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "nieprawidłowa wartość --missing"
-#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "nie można otworzyć indeksu paczki"
-#: builtin/pack-objects.c:3202
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "nie można przebadać wolnego obiektu w %s"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "nie można wymusić wolnego obiektu"
-#: builtin/pack-objects.c:3380
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "nie jest rewizją „%s”"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "zła rewizja „%s”"
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "nie można dodać ostatnich obiektów"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "nieobsługiwana wersja indeksu %s"
-#: builtin/pack-objects.c:3465
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "zła wersja indeksu „%s”"
-#: builtin/pack-objects.c:3503
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "<wersja>[,<pozycja>]"
-#: builtin/pack-objects.c:3504
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr "zapisz plik indeksu paczek w podanej wersji formatu indeksu"
-#: builtin/pack-objects.c:3507
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "maksymalny rozmiar pojedynczego wyjściowego pliku paczki"
-#: builtin/pack-objects.c:3509
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "pomiń pożyczone obiekty z alternatywnych zbiorów obiektów"
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "ignoruj spakowane obiekty"
-#: builtin/pack-objects.c:3513
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "ogranicz okno paczki w obiektach"
-#: builtin/pack-objects.c:3515
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr "ogranicz okno paczki w pamięci oprócz limitu w obiektach"
-#: builtin/pack-objects.c:3517
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "maksymalna długość łańcucha delt dopuszczona w wynikowej paczce"
-#: builtin/pack-objects.c:3519
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "użyj ponownie istniejących delt"
-#: builtin/pack-objects.c:3521
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "użyj ponownie istniejących obiektów"
-#: builtin/pack-objects.c:3523
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "użyj obiektów OFS_DELTA"
-#: builtin/pack-objects.c:3525
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr "użyj wątków przy wyszukiwaniu najlepiej dopasowanych delt"
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "nie można utworzyć pustej paczki na wyjściu"
-#: builtin/pack-objects.c:3529
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "odczytaj argumenty rewizji ze standardowego wejścia"
-#: builtin/pack-objects.c:3531
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "ogranicz obiekty do jeszcze nie spakowanych"
-#: builtin/pack-objects.c:3534
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr "uwzględnij obiekty osiągalne z dowolnej referencji"
-#: builtin/pack-objects.c:3537
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr "uwzględnij obiekty z odniesieniami z wpisów dziennika referencji"
-#: builtin/pack-objects.c:3540
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "uwzględnij obiekty z odniesieniami z indeksu"
-#: builtin/pack-objects.c:3543
+#: builtin/pack-objects.c:3924
+msgid "read packs from stdin"
+msgstr "wczytaj paczki ze standardowego wejścia"
+
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "wypisz paczkę na standardowe wyjście"
-#: builtin/pack-objects.c:3545
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr "uwzględnij obiekty tagów odnoszące się do pakowanych obiektów"
-#: builtin/pack-objects.c:3547
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "zachowaj nieosiągalne obiekty"
-#: builtin/pack-objects.c:3549
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "spakuj luźnie nieosiągalne obiekty"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "rozpakuj nieosiągalne obiekty nowsze niż <czas>"
-#: builtin/pack-objects.c:3554
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "użyj rzadkiego algorytmu osiągalności"
-#: builtin/pack-objects.c:3556
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "twórz wąskie paczki"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "utwórz paczki odpowiednie do płytkich pobrań"
-#: builtin/pack-objects.c:3560
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "pomiń paczki, którym towarzyszy plik .keep"
-#: builtin/pack-objects.c:3562
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "pomiń tę paczkę"
-#: builtin/pack-objects.c:3564
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "stopień kompresji paczki"
-#: builtin/pack-objects.c:3566
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr "nie ukrywaj przeszczepionych zapisów"
-#: builtin/pack-objects.c:3568
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"użyj indeksu bitmapy, jeśli dostępny, żeby przyspieszyć zliczanie obiektów"
-#: builtin/pack-objects.c:3570
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "zapisz indeks bitmapy razem z indeksem paczek"
-#: builtin/pack-objects.c:3574
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "zapisz indeks bitmapy jeśli możliwe"
-#: builtin/pack-objects.c:3578
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "traktowanie brakujących obiektów"
-#: builtin/pack-objects.c:3581
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr "nie pakuj obiektów w obiecujące pliki paczek"
-#: builtin/pack-objects.c:3583
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr "uszanuj wyspy podczas kompresji delt"
-#: builtin/pack-objects.c:3585
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "protokół"
-#: builtin/pack-objects.c:3586
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "wyłącz w tym protokole wszystkie ustawione uploadpack.blobpackfileuri"
-#: builtin/pack-objects.c:3617
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "łańcuch delt za głęboki: %d, wymuszanie %d"
-#: builtin/pack-objects.c:3622
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit za wysoki, wymuszanie %d"
-#: builtin/pack-objects.c:3676
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "nie można użyć --max-pack-size do budowania paczki do przesyłu"
-#: builtin/pack-objects.c:3678
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "minimalna granica rozmiaru paczki to 1 MiB"
-#: builtin/pack-objects.c:3683
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr "nie można użyć --thin, aby zbudować indeksowalną paczkę"
-#: builtin/pack-objects.c:3686
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable i --unpack-unreachable się wykluczają"
-#: builtin/pack-objects.c:3692
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "nie można użyć --filter bez --stdout"
-#: builtin/pack-objects.c:3752
+#: builtin/pack-objects.c:4081
+msgid "cannot use --filter with --stdin-packs"
+msgstr "--filter i --stdin-packs się wykluczają"
+
+#: builtin/pack-objects.c:4085
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr "nie można użyć listy wewnętrznych rewizji z --stdin-packs"
+
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "Wymienianie obiektów"
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18794,7 +19489,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr "ogranicz przejście do obiektów poza obiecującymi plikami paczek"
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "nie można przyciąć repozytorium o cennych obiektach"
@@ -18807,55 +19502,59 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<opcje>] [<repozytorium> [<referencja>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
-msgstr "sterowanie rekurencyjnym pobieraniem pod-modułów"
+msgstr "sterowanie rekurencyjnym pobieraniem podmodułów"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Opcje związane ze scalaniem"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "wciel zmiany przez przestawienie, a nie scalanie"
-#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "zezwól na przewijanie"
-#: builtin/pull.c:167 parse-options.h:339
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "steruj użyciem skryptów pre-merge-commit i commit-msg"
+
+#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after"
msgstr "automatycznie dodaj zmiany do schowka przed i przywróć je po"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Opcje związane z pobieraniem"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "wymuś nadpisanie lokalnej gałęzi"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
-msgstr "liczba pod-modułów zaciąganych równolegle"
+msgstr "liczba podmodułów zaciąganych równolegle"
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Nieprawidłowa wartość pull.ff: %s"
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "Wśród właśnie pobranych referencji nie ma kandydata na przestawianie."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "Wśród właśnie pobranych referencji nie ma kandydatów na scalanie."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -18863,7 +19562,7 @@
"Zwykle oznacza to, że podano referencję z globem bez dopasowań\n"
"po zdalnej stronie."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -18874,43 +19573,43 @@
"gałęzi. Ponieważ nie jest to domyślne ustawione repozytorium zdalne\n"
"dla bieżącej gałęzi, musisz podać gałąź w wierszu poleceń."
-#: builtin/pull.c:456 builtin/rebase.c:1253
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "Nie jesteś obecnie w gałęzi."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Podaj, względem jakiej gałęzi przestawić."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Podaj, z jaką gałęzią scalić."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Więcej szczegółów w git-pull(1)."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1259
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<zdalne-repozytorium>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>"
msgstr "<gałąź>"
-#: builtin/pull.c:471 builtin/rebase.c:1251
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "Bieżąca gałąź nie ma informacji o śledzeniu."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Jeśli chcesz ustawić informacje o śledzeniu w tej gałęzi, możesz to zrobić "
"przez:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -18919,20 +19618,20 @@
"Konfiguracja podaje, żeby scalić z referencją „%s”\n"
"ze zdalnego repozytorium, ale nie pobrano stamtąd żadnej takiej."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "brak dostępu do zapisu %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "pomijanie --verify-signatures przy przestawianiu"
-#: builtin/pull.c:930
+#: builtin/pull.c:942
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -18944,9 +19643,9 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Odradza się zaciągania bez podania, jak pogodzić rozbieżne gałęzie.\n"
-"Można uciszyć ten komunikat wykonując jedno z poniższych\n"
-"poleceń kiedyś przed następnym zaciągnięciem:\n"
+"Gałęzie są rozbieżne i należy podać, jak je pogodzić.\n"
+"Można to zrobić wykonując jedno z poniższych poleceń kiedyś przed\n"
+"następnym zaciągnięciem:\n"
"\n"
" git config pull.rebase false # scalenie (domyślna strategia)\n"
" git config pull.rebase true # przestawienie\n"
@@ -18957,19 +19656,19 @@
"lub --ff-only w wierszu poleceń, aby zmienić ustawione zachowanie\n"
"w jednym wywołaniu.\n"
-#: builtin/pull.c:991
+#: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index."
msgstr "Aktualizowanie nienarodzonej gałęzi o zmiany dodane do indeksu."
-#: builtin/pull.c:995
+#: builtin/pull.c:1020
msgid "pull with rebase"
msgstr "zaciągnij z przestawieniem"
-#: builtin/pull.c:996
+#: builtin/pull.c:1021
msgid "please commit or stash them."
msgstr "złóż je lub dodaj do schowka."
-#: builtin/pull.c:1021
+#: builtin/pull.c:1046
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -18980,7 +19679,7 @@
"przewijanie drzewa roboczego\n"
"z zapisu %s."
-#: builtin/pull.c:1027
+#: builtin/pull.c:1052
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -18997,17 +19696,25 @@
"$ git reset --hard\n"
"by się pozbierać."
-#: builtin/pull.c:1042
+#: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head."
msgstr "Nie można scalić wielu gałęzi w puste czoło."
-#: builtin/pull.c:1046
+#: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches."
msgstr "Nie można przestawić na wiele gałęzi."
-#: builtin/pull.c:1067
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Nie można przewinąć na wiele gałęzi."
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Należy podać, jak godzić rozbieżne gałęzie."
+
+#: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications"
-msgstr "nie można przestawić z lokalnie zapisanymi zmianami pod-modułów"
+msgstr "nie można przestawić z lokalnie zapisanymi zmianami podmodułów"
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
@@ -19068,7 +19775,7 @@
"\n"
" git push %s HEAD:<nazwa-zdalnej-gałęzi>\n"
-#: builtin/push.c:194
+#: builtin/push.c:191
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -19082,12 +19789,19 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:202
+#: builtin/push.c:199
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "Bieżąca gałąź %s ma wiele gałęzi nadrzędnych, odmawiam wypchnięcia."
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Nie podano żadnych referencji do wypchnięcia, a push.default ma wartość "
+"„nothing”."
+
+#: builtin/push.c:243
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -19098,14 +19812,7 @@
"bieżącej gałęzi „%s”, bez podania, co wypchnąć i na jaką\n"
"zdalną gałąź."
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"Nie podano żadnych referencji do wypchnięcia, a push.default ma wartość "
-"„nothing”."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19117,7 +19824,7 @@
"„git pull ...”) przed kolejnym wypchnięciem.\n"
"Zobacz szczegóły w „Uwadze o przewijaniu” w „git push --help”."
-#: builtin/push.c:273
+#: builtin/push.c:264
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -19129,7 +19836,7 @@
"zdalne zmiany (np. „git pull ...”) przed kolejnym wypchnięciem.\n"
"Zobacz szczegóły w „Uwadze o przewijaniu” w „git push --help”."
-#: builtin/push.c:279
+#: builtin/push.c:270
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -19143,12 +19850,12 @@
"zintegrować zdalne zmiany (np. „git pull ...”) przed kolejnym wypchnięciem.\n"
"Zobacz szczegóły w „Uwadze o przewijaniu” w „git push --help”."
-#: builtin/push.c:286
+#: builtin/push.c:277
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Aktualizacje zostały odrzucone, bo tag już istnieje w zdalnym repozytorium."
-#: builtin/push.c:289
+#: builtin/push.c:280
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -19158,7 +19865,7 @@
"nie będący zapisem, ani sprawić, żeby wskazywała na taki obiekt,\n"
"chyba że użyjesz opcji „--force”.\n"
-#: builtin/push.c:294
+#: builtin/push.c:285
msgid ""
"Updates were rejected because the tip of the remote-tracking\n"
"branch has been updated since the last checkout. You may want\n"
@@ -19170,103 +19877,103 @@
"zintegrować te zmiany lokalnie (np. „git pull ...”)\n"
"przed wymuszeniem wypchnięcia.\n"
-#: builtin/push.c:364
+#: builtin/push.c:355
#, c-format
msgid "Pushing to %s\n"
msgstr "Wypychanie do %s\n"
-#: builtin/push.c:371
+#: builtin/push.c:362
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "nie można wypchnąć niektórych referencji do „%s”"
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "repozytorium"
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "wypchnij wszystkie referencje"
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "odwzoruj wszystkie referencje"
-#: builtin/push.c:557
+#: builtin/push.c:548
msgid "delete refs"
msgstr "usuń referencje"
-#: builtin/push.c:558
+#: builtin/push.c:549
msgid "push tags (can't be used with --all or --mirror)"
-msgstr "wypchnij tagi (nie może być użyte z --all ani --mirror)"
+msgstr "wypchnij tagi (nie można użyć z --all ani --mirror)"
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "wymuszone aktualizacje"
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<referencja>:<oczekiwana>"
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "wymagaj, żeby stara wartość referencji wskazywała tę wartość"
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "wymagaj, by zdalne aktualizacje były wcielone lokalnie"
-#: builtin/push.c:569
+#: builtin/push.c:560
msgid "control recursive pushing of submodules"
-msgstr "steruj rekurencyjnym wypychaniem pod-modułów"
+msgstr "steruj rekurencyjnym wypychaniem podmodułów"
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "użyj wąskiej paczki"
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "program do odbierania paczek"
-#: builtin/push.c:573
+#: builtin/push.c:564
msgid "set upstream for git pull/status"
msgstr "ustaw gałąź nadrzędną do git pull/status"
-#: builtin/push.c:576
+#: builtin/push.c:567
msgid "prune locally removed refs"
msgstr "przytnij lokalnie usunięte referencje"
-#: builtin/push.c:578
+#: builtin/push.c:569
msgid "bypass pre-push hook"
msgstr "omiń skrypt pre-push"
-#: builtin/push.c:579
+#: builtin/push.c:570
msgid "push missing but relevant tags"
msgstr "wypchnij brakujące, ale mające związek tagi"
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "podpisz wypchnięcie GPG"
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "zażądaj atomowej transakcji po stronie zdalnej"
-#: builtin/push.c:601
+#: builtin/push.c:592
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete wyklucza się z --all, --mirror i --tags"
-#: builtin/push.c:603
+#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete nie ma sensu bez żadnych referencji"
-#: builtin/push.c:623
+#: builtin/push.c:614
#, c-format
msgid "bad repository '%s'"
msgstr "złe repozytorium „%s”"
-#: builtin/push.c:624
+#: builtin/push.c:615
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -19288,27 +19995,27 @@
"\n"
" git push <nazwa>\n"
-#: builtin/push.c:639
+#: builtin/push.c:630
msgid "--all and --tags are incompatible"
msgstr "--all i --tags się wykluczają"
-#: builtin/push.c:641
+#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
-msgstr "--all i referencje wykluczają się"
+msgstr "--all i referencje się wykluczają"
-#: builtin/push.c:645
+#: builtin/push.c:636
msgid "--mirror and --tags are incompatible"
msgstr "--mirror i --tags się wykluczają"
-#: builtin/push.c:647
+#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror i referencje wykluczają się"
+msgstr "--mirror i referencje się wykluczają"
-#: builtin/push.c:650
+#: builtin/push.c:641
msgid "--all and --mirror are incompatible"
msgstr "--all i --mirror się wykluczają"
-#: builtin/push.c:657
+#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "opcje wypychania nie mogą zawierać znaków końca wiersza"
@@ -19326,10 +20033,6 @@
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git range-diff [<opcje>] <podstawa> <stary-czubek> <nowy-czubek>"
-#: builtin/range-diff.c:28
-msgid "Percentage by which creation is weighted"
-msgstr "Procent, według jakiego ważone jest tworzenie"
-
#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr "użyj prostych kolorów zmian"
@@ -19366,82 +20069,82 @@
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<plik>] (--empty | <drzewo1> [<drzewo2> [<drzewo3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefiks>) [-u | -i]] [--no-sparse-checkout] [--index-output=<plik>] "
+"(--empty | <drzewo1> [<drzewo2> [<drzewo3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "zapisz wynikowy indeks w <pliku>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "tylko opróżnij indeks"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Scalanie"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "dokonaj scalenia oprócz odczytu"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "trójstronne scalanie jeśli nie trzeba scalać na poziomie plików"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "trójstronne scalanie w obecności dodań i usunięć"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "to samo, co -m, ale odrzuć niescalone elementy"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<podkatalog>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "wczytaj drzewo do indeksu w <podkatalogu>/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "zaktualizuj drzewo robocze wynikiem scalenia"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "zezwól na nadpisywanie jawnie ignorowanych plików"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "nie sprawdzaj drzewa roboczego po scaleniu"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "nie aktualizuj indeksu ani drzewa roboczego"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "pomiń stosowanie filtru rzadkiego wybrania"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "odpluskwianie unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "pomiń komunikaty zwrotne"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "Musisz najpierw rozwiązać bieżący indeks"
@@ -19464,193 +20167,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "lista zadań do zrobienia się nie nadaje: „%s”"
-
-#: builtin/rebase.c:312
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "nie można utworzyć tymczasowego %s"
-#: builtin/rebase.c:318
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "nie można oznaczyć jako interaktywne"
-#: builtin/rebase.c:371
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "nie można wygenerować listy zadań do zrobienia"
-#: builtin/rebase.c:413
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "zapis podstawy należy podać z --upstream lub --onto"
-#: builtin/rebase.c:482
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opcje>]"
-
-#: builtin/rebase.c:495 builtin/rebase.c:1394
-msgid "keep commits which start empty"
-msgstr "zachowaj zapisy, które zaczynają puste"
-
-#: builtin/rebase.c:499 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "pozwól na zapisy z pustymi komunikatami"
-
-#: builtin/rebase.c:501
-msgid "rebase merge commits"
-msgstr "przestawiaj zapisy scaleń"
-
-#: builtin/rebase.c:503
-msgid "keep original branch points of cousins"
-msgstr "zachowaj pierwotne rozgałęzienia kuzynów"
-
-#: builtin/rebase.c:505
-msgid "move commits that begin with squash!/fixup!"
-msgstr "przenieś zapisy, które zaczynają się od squash!/fixup!"
-
-#: builtin/rebase.c:506
-msgid "sign commits"
-msgstr "podpisuj zapisy"
-
-#: builtin/rebase.c:508 builtin/rebase.c:1333
-msgid "display a diffstat of what changed upstream"
-msgstr "wyświetl statystyki zmian nadrzędnych"
-
-#: builtin/rebase.c:510
-msgid "continue rebase"
-msgstr "kontynuuj przestawianie"
-
-#: builtin/rebase.c:512
-msgid "skip commit"
-msgstr "pomiń zapis"
-
-#: builtin/rebase.c:513
-msgid "edit the todo list"
-msgstr "edytuj listę zadań do zrobienia"
-
-#: builtin/rebase.c:515
-msgid "show the current patch"
-msgstr "pokaż bieżącą łatkę"
-
-#: builtin/rebase.c:518
-msgid "shorten commit ids in the todo list"
-msgstr "skróć identyfikatory zapisów na liście zadań do zrobienia"
-
-#: builtin/rebase.c:520
-msgid "expand commit ids in the todo list"
-msgstr "rozwiń identyfikatory zapisów na liście zadań do zrobienia"
-
-#: builtin/rebase.c:522
-msgid "check the todo list"
-msgstr "sprawdź listę zadań do zrobienia"
-
-#: builtin/rebase.c:524
-msgid "rearrange fixup/squash lines"
-msgstr "zmień kolejność wierszy fixup/squash"
-
-#: builtin/rebase.c:526
-msgid "insert exec commands in todo list"
-msgstr "wstaw polecenia exec na listę zadań do zrobienia"
-
-#: builtin/rebase.c:527
-msgid "onto"
-msgstr "na"
-
-#: builtin/rebase.c:530
-msgid "restrict-revision"
-msgstr "ogranicz-rewizję"
-
-#: builtin/rebase.c:530
-msgid "restrict revision"
-msgstr "ogranicz rewizję"
-
-#: builtin/rebase.c:532
-msgid "squash-onto"
-msgstr "spłaszcz-na"
-
-#: builtin/rebase.c:533
-msgid "squash onto"
-msgstr "spłaszcz na"
-
-#: builtin/rebase.c:535
-msgid "the upstream commit"
-msgstr "zapis głównego nurtu"
-
-#: builtin/rebase.c:537
-msgid "head-name"
-msgstr "nazwa-czoła"
-
-#: builtin/rebase.c:537
-msgid "head name"
-msgstr "nazwa czoła"
-
-#: builtin/rebase.c:542
-msgid "rebase strategy"
-msgstr "strategia przestawiania"
-
-#: builtin/rebase.c:543
-msgid "strategy-opts"
-msgstr "opcje-strategii"
-
-#: builtin/rebase.c:544
-msgid "strategy options"
-msgstr "opcje strategii"
-
-#: builtin/rebase.c:545
-msgid "switch-to"
-msgstr "przełącz-na"
-
-#: builtin/rebase.c:546
-msgid "the branch or commit to checkout"
-msgstr "gałąź lub zapis do wybrania"
-
-#: builtin/rebase.c:547
-msgid "onto-name"
-msgstr "nazwa-na"
-
-#: builtin/rebase.c:547
-msgid "onto name"
-msgstr "nazwa rewizji „na”"
-
-#: builtin/rebase.c:548
-msgid "cmd"
-msgstr "polecenie"
-
-#: builtin/rebase.c:548
-msgid "the command to run"
-msgstr "polecenie do wykonania"
-
-#: builtin/rebase.c:551 builtin/rebase.c:1427
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "automatycznie przeplanuj każdy nieudany „exec”"
-
-#: builtin/rebase.c:567
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins nic nie robi bez --rebase-merges"
-
-#: builtin/rebase.c:583
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "%s wymaga silnika scalenia"
-#: builtin/rebase.c:626
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "nie można uzyskać „onto”: „%s”"
-#: builtin/rebase.c:643
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "nieprawidłowe pierwotne czoło: „%s”"
-#: builtin/rebase.c:668
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "pomijanie błędnego allow_rerere_autoupdate: „%s”"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19664,7 +20218,7 @@
"Aby przerwać i powrócić do stanu sprzed „git rebase”, wykonaj „git rebase --"
"abort”."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -19683,7 +20237,7 @@
"\n"
"Z tego powodu git nie może ich przestawić."
-#: builtin/rebase.c:1227
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -19692,7 +20246,7 @@
"nierozpoznany pusty rodzaj „%s”; prawidłowe wartości to „drop”, „keep” i "
"„ask”."
-#: builtin/rebase.c:1245
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -19709,7 +20263,7 @@
" git rebase '<gałąź>'\n"
"\n"
-#: builtin/rebase.c:1261
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -19722,191 +20276,192 @@
" git branch --set-upstream-to=%s/<gałąź> %s\n"
"\n"
-#: builtin/rebase.c:1291
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "polecenia exec nie mogą zawierać znaków nowego wiersza"
-#: builtin/rebase.c:1295
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "puste polecenie exec"
-#: builtin/rebase.c:1324
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "przestaw na podaną gałąź zamiast na główny nurt"
-#: builtin/rebase.c:1326
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr "użyj podstawy scalania głównego nurtu i gałęzi jako bieżącej podstawy"
-#: builtin/rebase.c:1328
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "pozwól wykonać skrypt pre-rebase"
-#: builtin/rebase.c:1330
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "bądź cicho. zakłada --no-stat"
-#: builtin/rebase.c:1336
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "wyświetl statystyki zmian nadrzędnych"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "nie pokazuj statystyk różnic ze zmian głównego nurtu"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "dodaj końcówkę Signed-off-by do każdego zapisu"
-#: builtin/rebase.c:1342
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "ustaw datę złożenia na datę utworzenia"
-#: builtin/rebase.c:1344
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "pomiń datę utworzenia i użyj bieżącej"
-#: builtin/rebase.c:1346
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "zamiennik na --reset-author-date"
-#: builtin/rebase.c:1348 builtin/rebase.c:1352
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "przekaż do „git apply”"
-#: builtin/rebase.c:1350
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "ignoruj zmiany w białych znakach"
-#: builtin/rebase.c:1354 builtin/rebase.c:1357
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "dobierz wszystkie zapisy, nawet jeśli niezmienione"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "kontynuuj"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "pomiń obecną łatkę i kontynuuj"
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "przerwij i wybierz pierwotną gałąź"
-#: builtin/rebase.c:1367
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "przerwij, ale zostaw HEAD, gdzie jest"
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "edytuj listę zadań do zrobienia podczas interaktywnego przestawiania"
-#: builtin/rebase.c:1371
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "pokaż plik łatki właśnie stosowanej lub scalanej"
-#: builtin/rebase.c:1374
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "użyj strategii stosowania do przestawiania"
-#: builtin/rebase.c:1378
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "użyj strategii scalania do przestawiania"
-#: builtin/rebase.c:1382
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr "pozwól użytkownikowi edytować listę zapisów do przestawienia"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(PRZESTARZAŁE) spróbuj odtworzyć scalenia zamiast je pomijać"
-#: builtin/rebase.c:1391
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "jak traktować zapisy, które staną się puste"
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "zachowaj zapisy, które zaczynają puste"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "przenieś zapisy, które zaczynają się od squash!/fixup! pod -i"
-#: builtin/rebase.c:1405
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr "dodaj wiersz exec po każdym zapisie z edytowalnej listy"
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "pozwól przestawiać zapisy z pustymi komunikatami"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "spróbuj przestawić scalenia zamiast je pomijać"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "użyj „git merge-base --fork-point”, aby poprawić gałąź nadrzędną"
+msgstr "użyj „merge-base --fork-point”, aby poprawić gałąź nadrzędną"
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "użyj podanej strategii scalania"
-#: builtin/rebase.c:1420 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "opcja"
-#: builtin/rebase.c:1421
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "przekaż argument do strategii scalania"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "przestaw wszystkie osiągalne zapisy aż do korzenia"
-#: builtin/rebase.c:1429
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "automatycznie przeplanuj każdy nieudany „exec”"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr "zastosuj wszystkie zmiany, nawet te już obecne w głównym nurcie"
-#: builtin/rebase.c:1446
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"wsparcie rebase.useBuiltin zostało usunięte!\n"
-"Zobacz szczegóły pod jego opisem w „git help config”."
-
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Wygląda, że trwa „git am”. Nie można przestawić."
-#: builtin/rebase.c:1493
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges jest przestarzałe. Użyj zamiast tego --rebase-"
-"merges."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges zostało zastąpione --rebase-merges"
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "„--keep-base” i „--onto” się wykluczają."
+msgstr "„--keep-base” i „--onto” się wykluczają"
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
-msgstr "„--keep-base” i „--root” się wykluczają."
+msgstr "„--keep-base” i „--root” się wykluczają"
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
-msgstr "„--keep-base” i „--fork-point” się wykluczają."
+msgstr "„--root” i „--fork-point” się wykluczają"
-#: builtin/rebase.c:1507
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Nie trwa żadne przestawianie?"
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-"Akcja --edit-todo może być użyta tylko podczas interaktywnego przestawiania."
+"Działania --edit-todo można użyć tylko podczas interaktywnego przestawiania."
-#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Nie można odczytać HEAD"
-#: builtin/rebase.c:1546
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -19914,16 +20469,16 @@
"Musisz edytować wszystkie konflikty scalania\n"
"i oznaczyć je jako rozwiązane przy pomocy git add"
-#: builtin/rebase.c:1565
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "nie można odrzucić zmian w drzewie roboczym"
-#: builtin/rebase.c:1584
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "nie można cofnąć do %s"
-#: builtin/rebase.c:1630
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -19944,140 +20499,131 @@
"i wykonaj mnie ponownie. Przerywam na wypadek, gdyby było tam\n"
"coś cennego.\n"
-#: builtin/rebase.c:1658
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "przełącznik „C” oczekuje wartości liczbowej"
-#: builtin/rebase.c:1700
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Nieznany tryb: %s"
-#: builtin/rebase.c:1739
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy wymaga --merge lub --interactive"
-#: builtin/rebase.c:1769
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr "nie można łączyć opcji stosowania z opcjami scalania"
-#: builtin/rebase.c:1782
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Nieznany silnik przestawiania: %s"
-#: builtin/rebase.c:1812
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
-msgstr "--reschedule-failed wymaga --exec lub --interactive"
+msgstr "--reschedule-failed-exec wymaga --exec lub --interactive"
-#: builtin/rebase.c:1832
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "„--preserve-merges” i „--rebase-merges” się wykluczają"
-
-#: builtin/rebase.c:1836
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr "błąd: „--preserve-merges” i „--reschedule-failed-exec” się wykluczają"
-
-#: builtin/rebase.c:1860
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "nieprawidłowa gałąź nadrzędna „%s”"
-#: builtin/rebase.c:1866
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "Nie można utworzyć nowego zapisu korzenia"
-#: builtin/rebase.c:1892
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "„%s”: potrzeba dokładnie jednej podstawy scalania z gałęzią"
-#: builtin/rebase.c:1895
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "„%s”: potrzeba dokładnie jednej podstawy scalania"
-#: builtin/rebase.c:1903
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Nie wskazuje na prawidłowy zapis „%s”"
-#: builtin/rebase.c:1931
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "błąd krytyczny: brak gałęzi/zapisu „%s”"
+msgid "no such branch/commit '%s'"
+msgstr "brak gałęzi/zapisu „%s”"
-#: builtin/rebase.c:1939 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2414
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "Nie ma takiej referencji: %s"
-#: builtin/rebase.c:1950
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "Nie można rozwiązać HEAD do rewizji"
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Złóż je lub dodaj do schowka."
-#: builtin/rebase.c:2007
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "nie można przełączyć na %s"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD jest aktualne."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Obecna gałąź %s jest aktualna.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD jest aktualne, wymuszono przestawianie."
-#: builtin/rebase.c:2030
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Bieżąca gałąź %s jest aktualna, wymuszono przestawianie.\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "Skrypt pre-rebase odmówił przestawiania."
-#: builtin/rebase.c:2045
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "Zmiany w %s:\n"
-#: builtin/rebase.c:2048
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Zmiany z %s na %s:\n"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "Najpierw cofanie czoła gałęzi, aby odtworzyć na nim pracę...\n"
-#: builtin/rebase.c:2082
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "Nie można odłączyć HEAD"
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Przewinięto %s do %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <katalog-gita>"
-#: builtin/receive-pack.c:1276
+#: builtin/receive-pack.c:1280
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"
@@ -20107,7 +20653,7 @@
"Aby wyciszyć tę wiadomość i utrzymać domyślne zachowanie, ustaw\n"
"wartość konfiguracji „receive.denyCurrentBranch” na „refuse”."
-#: builtin/receive-pack.c:1296
+#: builtin/receive-pack.c:1300
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"
@@ -20127,7 +20673,7 @@
"\n"
"Żeby wyciszyć ten komunikat, możesz ustawić ją na „refuse”."
-#: builtin/receive-pack.c:2481
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "cicho"
@@ -20172,7 +20718,7 @@
msgid "%s points nowhere!"
msgstr "%s nigdzie nie wskazuje!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr "nie podano dziennika referencji do skasowania"
@@ -20328,7 +20874,7 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "podanie gałęzi do śledzenia ma sens tylko ze zwierciadłami pobierania"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "zdalne repozytorium %s już istnieje."
@@ -20338,25 +20884,30 @@
msgid "Could not setup master '%s'"
msgstr "Nie można ustawić głównej gałęzi „%s”"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "nierozpoznane branch.%s.rebase=%s; zakładam „true”"
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Nie można pobrać mapy do referencji %s"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(pasujące)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(usunięcie)"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "nie można ustawić „%s”"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20367,17 +20918,17 @@
"\t%s:%d\n"
"wskazuje teraz nieistniejące zdalne repozytorium „%s”"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "Nie ma takiego zdalnego repozytorium: „%s”"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Nie można zmienić nazwy rozdziału konfiguracji „%s” na „%s”"
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20388,17 +20939,17 @@
"\t%s\n"
"\tJeśli to konieczne, zaktualizuj ustawienia ręcznie."
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "nie można usunąć „%s”"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "nie można utworzyć „%s”"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20415,118 +20966,118 @@
"Uwaga: nie usuwam gałęzi poza hierarchią refs/remotes/;\n"
"aby je usunąć, użyj:"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Nie można usunąć rozdziału konfiguracji „%s”"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nowe (następne pobranie zapisze w remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " śledzone"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " zastała (użyj „git remote prune”, aby usunąć)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "złe branch.%s.merge; nie można przestawiać na > 1 gałąź"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "przestawia interaktywnie na zdalne repozytorium %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "przestawia interaktywnie (ze scaleniami) na zdalne repozytorium %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "przestawia się na zdalne repozytorium %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " scala się ze zdalnym repozytorium %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "scala się ze zdalnym repozytorium %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s i ze zdalnym repozytorium %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "utwórz"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "usuń"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "aktualne"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "przewijalne"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "lokalna nieaktualna"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s wymusza na %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s wypycha na %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s wymusza na %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s wypycha na %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "nie odpytuj zdalnych repozytoriów"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* zdalne repozytorium %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " Adres do pobierania: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(brak adresu URL)"
@@ -20534,25 +21085,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " Adres do wypychania: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " gałąź HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(nie odpytano)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(nieznane)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -20560,7 +21111,7 @@
" gałąź HEAD (zdalne HEAD jest niejednoznaczne, może być jednym z "
"następujących):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -20568,22 +21119,22 @@
msgstr[1] " Zdalne gałęzie:%s"
msgstr[2] " Zdalne gałęzie:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (nie odpytano stanu)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokalna gałąź ustawiona do „git pull”:"
msgstr[1] " Lokalne gałęzie ustawione do „git pull”:"
msgstr[2] " Lokalne gałęzie ustawione do „git pull”:"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokalne referencje będą odzwierciedlane przez „git push”"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
@@ -20591,132 +21142,136 @@
msgstr[1] " Lokalne referencje ustawione do „git push”%s:"
msgstr[2] " Lokalne referencje ustawione do „git push”%s:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "ustaw refs/remotes/<nazwa>/HEAD według zdalnego repozytorium"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "usuń refs/remotes/<nazwa>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "Nie można ustalić zdalnego HEAD"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Wiele gałęzi HEAD. Wybierz jedną jawnie przez:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "Nie można usunąć %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "Nieprawidłowa referencja: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "Nie można ustawić %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr " %s będzie wiszący!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " %s stał się wiszący!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "Przycinanie %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "Adres URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * [przycięto by] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " * [przycięto] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "przytnij zdalne repozytoria po pobraniu"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "Nie ma takiego zdalnego repozytorium „%s”"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "dodaj gałąź"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "nie podano zdalnego repozytorium"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "operuj na adresach wypychania zamiast pobierania"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "zwróć wszystkie adresy URL"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "zdalne repozytorium „%s” nie ma skonfigurowanych adresów"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "operuj na adresach wypychania"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "dodaj adres URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "usuń adresy URL"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add --delete nie ma sensu"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Nieprawidłowy stary wzorzec adresu: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "Nie znaleziono takiego adresu URL: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "Nie skasuje wszystkich adresów nie do wypychania"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "więcej komunikatów; musi być umieszczone przed pod-poleceniem"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [<opcje>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20724,118 +21279,154 @@
"Przyrostowe przepakowania są niekompatybilne z indeksami bitmap. Użyj\n"
"--no-write-bitmap-index lub wyłącz konfigurację pack.writebitmaps."
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr "nie można uruchomić pack-objects, żeby przepakować obiecujące obiekty"
-#: builtin/repack.c:270 builtin/repack.c:446
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Oczekiwano tylko wierszy z pełnych szesnastkowych identyfikatorów "
"obiektów z pack-objects."
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr "nie można ukończyć pack-objects, żeby przepakować obiecujące obiekty"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
+#, c-format
+msgid "cannot open index for %s"
+msgstr "nie można otworzyć indeksu dla %s"
+
+#: builtin/repack.c:371
+#, c-format
+msgid "pack %s too large to consider in geometric progression"
+msgstr "paczka %s za duża do rozważania w postępie geometrycznym"
+
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "paczka %s za duża do zwiększenia"
+
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "nie można otworzyć tymczasowego pliku %s do zapisywania"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "nie można zamknąć pliku tymczasowego obrazu referencji"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "spakuj wszystko w jedną paczkę"
-#: builtin/repack.c:324
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr "to samo, co -a, i zamień nieosiągalne obiekty w luźne"
-#: builtin/repack.c:327
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr "usuń zbędne paczki i wykonaj git-prune-packed"
-#: builtin/repack.c:329
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "przekaż --no-reuse-delta do git-pack-objects"
-#: builtin/repack.c:331
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "przekaż --no-reuse-object do git-pack-objects"
-#: builtin/repack.c:333
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "nie wykonuj git-update-server-info"
-#: builtin/repack.c:336
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "przekaż --local do git-pack-objects"
-#: builtin/repack.c:338
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "zapisz indeks bitmapy"
-#: builtin/repack.c:340
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr "przekaż --delta-islands do git-pack-objects"
-#: builtin/repack.c:341
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "przybliżona-data"
-#: builtin/repack.c:342
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr "z -A, nie luzuj obiektów starszych niż podana data"
-#: builtin/repack.c:344
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "z -a przepakuj wszystkie nieosiągalne obiekty"
-#: builtin/repack.c:346
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "rozmiar okna użytego do kompresji delt"
-#: builtin/repack.c:347 builtin/repack.c:353
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "bajty"
-#: builtin/repack.c:348
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr "jak wyżej, ale ogranicz rozmiar pamięci zamiast liczby elementów"
-#: builtin/repack.c:350
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "ogranicza maksymalną głębokość delty"
-#: builtin/repack.c:352
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "ogranicza maksymalną liczbę wątków"
-#: builtin/repack.c:354
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "maksymalny rozmiar pojedynczego pliku paczki"
-#: builtin/repack.c:356
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr "przepakuj obiekty w paczki oznaczone przez .keep"
-#: builtin/repack.c:358
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr "nie przepakowuj tej paczki"
-#: builtin/repack.c:368
+#: builtin/repack.c:666
+msgid "find a geometric progression with factor <N>"
+msgstr "znajdź postęp geometryczny z czynnikiem <N>"
+
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "zapisz indeks wielu paczek wynikowych paczek"
+
+#: builtin/repack.c:678
msgid "cannot delete packs in a precious-objects repo"
msgstr "nie można usuwać paczek w repozytorium o cennych obiektach"
-#: builtin/repack.c:372
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable i -A się wykluczają"
-#: builtin/repack.c:455
+#: builtin/repack.c:713
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--geometric i -A, -a się wykluczają"
+
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr "Nic nowego do spakowania."
-#: builtin/repack.c:485
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr "brakuje wymaganego pliku: %s"
-#: builtin/repack.c:487
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr "nie można usunąć przez unlink: %s"
@@ -21093,15 +21684,15 @@
msgstr ""
"git rerere [clear | forget <ścieżka>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "zarejestruj gładkie rozwiązania w indeksie"
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
msgid "'git rerere forget' without paths is deprecated"
msgstr "„git rerere forget” bez ścieżek jest przestarzałe"
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "nie można wygenerować różnic dla „%s”"
@@ -21145,93 +21736,93 @@
msgid "keep"
msgstr "zachowaj"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "HEAD jest nieprawidłowe."
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "Nie znaleziono drzewa HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "Nie znaleziono drzewa %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD wskazuje teraz %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Nie można wykonać resetu %s podczas scalania."
-#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
-#: builtin/stash.c:685
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "mniej komunikatów, wypisuj tylko błędy"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "zresetuj HEAD i indeks"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "zresetuj tylko HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "zresetuj HEAD, indeks i drzewo robocze"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "zresetuj HEAD, ale zachowaj lokalne zmiany"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr "zapisz tylko, że usunięte ścieżki zostaną dodane później"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Nie można rozwiązać „%s” jako prawidłowej rewizji."
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Nie można rozwiązać „%s” jako prawidłowego drzewa."
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch i --{hard,mixed,soft} się wykluczają"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed ze ścieżkami jest przestarzałe; użyj zamiast tego „git reset -- "
"<ścieżki>”."
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Nie można wykonać resetu %s ze ścieżkami."
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "resetowanie %s nie jest dozwolone w suchym repozytorium"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
-msgstr "-N może być użyte tylko z --mixed"
+msgstr "-N można użyć tylko z --mixed"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "Nieprzygotowane zmiany po resecie:"
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -21244,28 +21835,28 @@
"Możesz użyć „--quiet”, żeby tego uniknąć. Ustaw konfigurację reset.quiet\n"
"na true, aby było to domyślne.\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Nie można zresetować pliku indeksu do rewizji „%s”."
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "Nie można zapisać nowego pliku indeksu."
-#: builtin/rev-list.c:534
+#: builtin/rev-list.c:541
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "--exclude-promisor-objects i --missing się wykluczają"
-#: builtin/rev-list.c:595
+#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr "filtrowanie obiektów wymaga --objects"
-#: builtin/rev-list.c:651
+#: builtin/rev-list.c:674
msgid "rev-list does not support display of notes"
msgstr "rev-list nie wspiera wyświetlania uwag"
-#: builtin/rev-list.c:656
+#: builtin/rev-list.c:679
msgid "marked counting is incompatible with --objects"
msgstr "znaczone zliczanie i --objects się wykluczają"
@@ -21285,6 +21876,18 @@
msgid "output in stuck long form"
msgstr "wypisz w zbitej długiej postaci"
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "przedwczesny koniec wejścia"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "brak opisu użycia przed separatorem „--”"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Potrzeba pojedynczej rewizji"
+
#: builtin/rev-parse.c:552
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -21300,6 +21903,50 @@
"Wykonaj „git rev-parse --parseopt -h”, aby uzyskać więcej informacji o "
"pierwszym użyciu."
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir wymaga argumentu"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "nie jest katalogiem gita „%s”"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path wymaga argumentu"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n wymaga argumentu"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format wymaga argumentu"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "nieznany argument do --path-format: %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default wymaga argumentu"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix wymaga argumentu"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "nieznany tryb do --abbrev-ref: %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "nieznany tryb do --show-object-format: %s"
+
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
msgstr "git revert [<opcje>] <zmiana>..."
@@ -21324,7 +21971,7 @@
#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
-msgstr "%s: %s i %s wykluczają się"
+msgstr "%s: %s i %s się wykluczają"
#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
@@ -21374,23 +22021,27 @@
msgid "preserve initially empty commits"
msgstr "zachowaj początkowo puste zapisy"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "pozwól na zapisy z pustymi komunikatami"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "zachowaj zbędne puste zapisy"
-#: builtin/revert.c:239
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "odwrócenie nie powiodło się"
-#: builtin/revert.c:252
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "dobieranie nie powiodło się"
-#: builtin/rm.c:19
+#: builtin/rm.c:20
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<opcje>] [--] <plik>..."
-#: builtin/rm.c:207
+#: builtin/rm.c:208
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -21407,7 +22058,7 @@
"następujące pliki ma przygotowaną zawartość różną i od pliku\n"
"i od HEAD:"
-#: builtin/rm.c:212
+#: builtin/rm.c:213
msgid ""
"\n"
"(use -f to force removal)"
@@ -21415,14 +22066,14 @@
"\n"
"(użyj -f, by wymusić usunięcie)"
-#: builtin/rm.c:216
+#: builtin/rm.c:217
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "następujący plik ma zmiany przygotowane w indeksie:"
msgstr[1] "następujące pliki mają zmiany przygotowane w indeksie:"
msgstr[2] "następujące pliki mają zmiany przygotowane w indeksie:"
-#: builtin/rm.c:220 builtin/rm.c:229
+#: builtin/rm.c:221 builtin/rm.c:230
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -21430,77 +22081,77 @@
"\n"
"(użyj --cached, aby zachować plik, lub -f, by wymusić usunięcie)"
-#: builtin/rm.c:226
+#: builtin/rm.c:227
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "następujący plik ma lokalne zmiany:"
msgstr[1] "następujące pliki mają lokalne zmiany:"
msgstr[2] "następujące pliki mają lokalne zmiany:"
-#: builtin/rm.c:243
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "nie wypisuj usuniętych plików"
-#: builtin/rm.c:244
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "tylko usuń z indeksu"
-#: builtin/rm.c:245
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "wyłącz sprawdzenie aktualności"
-#: builtin/rm.c:246
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "zezwól na usuwanie rekurencyjne"
-#: builtin/rm.c:248
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "zwróć zero, nawet jeśli nic nie dopasowano"
-#: builtin/rm.c:282
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "Nie podano żadnych ścieżek. Które pliki usunąć?"
-#: builtin/rm.c:305
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"przygotuj swoje zmiany w .gitmodules lub dodaj do schowka, aby kontynuować"
-#: builtin/rm.c:323
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "nie usuwanie „%s” rekurencyjne bez -r"
-#: builtin/rm.c:362
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: nie można usunąć %s"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<katalog> "
-"[<referencja>...]\n"
-" --all i podanie konkretnych <referencji> wykluczają się."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<katalog> (--all | <referencja>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "nazwa zdalnego repozytorium"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "użyj bezstanowego protokołu RPC"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "wczytaj referencje ze standardowego wejścia"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "wypisuj stan zdalnego pomocnika"
@@ -21557,21 +22208,22 @@
msgid "group by field"
msgstr "grupuj według pola"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "podano zbyt wiele argumentów poza repozytorium"
#: builtin/show-branch.c:13
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<kiedy>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rewizja> | <glob>)...]"
+" [--current] [--color[=<kiedy>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rewizja> | "
+"<glob>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21586,91 +22238,91 @@
msgstr[1] "pomijanie %s; nie można obsłużyć więcej niż %d referencji"
msgstr[2] "pomijanie %s; nie można obsłużyć więcej niż %d referencji"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "brak pasujących referencji z %s"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "pokaż śledzące i lokalne gałęzie"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "wypisz gałęzie śledzące"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "koloruj „*!+-” odpowiednio do gałęzi"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "pokaż <n> dodatkowych zapisów po wspólnym przodku"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "zamiennik na more=-1"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "ukryj nazwy"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "uwzględnij bieżącą gałąź"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "nazwij zapisy ich nazwami obiektów"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "pokaż możliwe podstawy scalenia"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr "pokaż referencje nieosiągalne z żadnej innej"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "pokaż zapisy w kolejności topologicznej"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr "pokaż tylko zapisy spoza pierwszej gałęzi"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "pokaż scalenia osiągalne z tylko jednego czubka"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr "posortuj topologicznie, zachowując kolejność dat, gdzie się da"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<podstawa>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
"pokaż <n> najświeższych elementów dziennika referencji poczynając od podstawy"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog wyklucza się z --all, --remotes, --independent lub --merge-base"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "nie podano gałęzi, a HEAD jest nieprawidłowe"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "opcja --reflog potrzebuje nazwy gałęzi"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
@@ -21678,12 +22330,12 @@
msgstr[1] "można pokazać tylko %d elementy na raz."
msgstr[2] "można pokazać tylko %d elementów na raz."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "nie ma takiej referencji %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
@@ -21691,12 +22343,12 @@
msgstr[1] "nie można obsłużyć więcej niż %d rewizji."
msgstr[2] "nie można obsłużyć więcej niż %d rewizji."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "„%s” nie jest prawidłową referencją."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "nie odnaleziono zapisu %s (%s)"
@@ -21756,103 +22408,121 @@
"pokaż referencje ze standardowego wejścia, których nie ma w lokalnym "
"repozytorium"
-#: builtin/sparse-checkout.c:21
+#: builtin/sparse-checkout.c:22
msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opcje>"
-#: builtin/sparse-checkout.c:45
+#: builtin/sparse-checkout.c:46
msgid "git sparse-checkout list"
msgstr "git sparse-checkout list"
-#: builtin/sparse-checkout.c:71
+#: builtin/sparse-checkout.c:72
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"to drzewo robocze nie jest rzadkie (plik rzadkiego wybrania może nie istnieć)"
-#: builtin/sparse-checkout.c:223
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"katalog „%s” zawiera nieśledzone pliki, ale jest poza stożkiem rzadkiego "
+"wybrania"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "nie można usunąć katalogu „%s”"
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr "nie można utworzyć katalogu dla pliku rzadkiego wybrania"
-#: builtin/sparse-checkout.c:264
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr "nie można podnieść formatu repozytorium, aby włączyć worktreeConfig"
-#: builtin/sparse-checkout.c:266
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr "nie można ustawić konfiguracji extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:283
-msgid "git sparse-checkout init [--cone]"
-msgstr "git sparse-checkout init [--cone]"
+#: builtin/sparse-checkout.c:384
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:302
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr "zainicjuj rzadkie wybranie w trybie stożka"
-#: builtin/sparse-checkout.c:339
+#: builtin/sparse-checkout.c:406
+msgid "toggle the use of a sparse index"
+msgstr "przełącz użycie rzadkiego indeksu"
+
+#: builtin/sparse-checkout.c:434
+msgid "failed to modify sparse-index config"
+msgstr "nie można zmienić ustawień rzadkiego indeksu"
+
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "nie można otworzyć „%s”"
-#: builtin/sparse-checkout.c:396
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr "nie można unormować ścieżki %s"
-#: builtin/sparse-checkout.c:408
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <wzorce>)"
-#: builtin/sparse-checkout.c:433
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "nie można odcytować łańcucha w stylu C „%s”"
-#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr "nie można załadować istniejących wzorców rzadkiego wybrania"
-#: builtin/sparse-checkout.c:556
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "wczytaj wzorce ze standardowego wejścia"
-#: builtin/sparse-checkout.c:571
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:590
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:618
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "błąd podczas odświeżania katalogu roboczego"
-#: builtin/stash.c:22 builtin/stash.c:38
+#: builtin/stash.c:24 builtin/stash.c:40
msgid "git stash list [<options>]"
msgstr "git stash list [<opcje>]"
-#: builtin/stash.c:23 builtin/stash.c:43
+#: builtin/stash.c:25 builtin/stash.c:45
msgid "git stash show [<options>] [<stash>]"
msgstr "git stash show [<opcje>] [<schowek>]"
-#: builtin/stash.c:24 builtin/stash.c:48
+#: builtin/stash.c:26 builtin/stash.c:50
msgid "git stash drop [-q|--quiet] [<stash>]"
msgstr "git stash drop [-q|--quiet] [<schowek>]"
-#: builtin/stash.c:25
+#: builtin/stash.c:27
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<schowek>]"
-#: builtin/stash.c:26 builtin/stash.c:63
+#: builtin/stash.c:28 builtin/stash.c:65
msgid "git stash branch <branchname> [<stash>]"
msgstr "git stash branch <gałąź> [<schowek>]"
-#: builtin/stash.c:27 builtin/stash.c:68
-msgid "git stash clear"
-msgstr "git stash clear"
-
-#: builtin/stash.c:28
+#: builtin/stash.c:30
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
@@ -21864,7 +22534,7 @@
" [--pathspec-from-file=<plik> [--pathspec-file-nul]]\n"
" [--] [<ścieżka>...]]"
-#: builtin/stash.c:32 builtin/stash.c:85
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -21872,19 +22542,19 @@
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<komunikat>]"
-#: builtin/stash.c:53
+#: builtin/stash.c:55
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<schowek>]"
-#: builtin/stash.c:58
+#: builtin/stash.c:60
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<schowek>]"
-#: builtin/stash.c:73
+#: builtin/stash.c:75
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
msgstr "git stash store [-m|--message <komunikat>] [-q|--quiet] <zapis>"
-#: builtin/stash.c:78
+#: builtin/stash.c:80
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
@@ -21894,30 +22564,38 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <komunikat>]\n"
" [--] [<ścieżka>...]]"
-#: builtin/stash.c:128
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<komunikat>]"
+
+#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "„%s” nie jest zapisem ze zmianami ze schowka"
-#: builtin/stash.c:148
+#: builtin/stash.c:150
#, c-format
msgid "Too many revisions specified:%s"
msgstr "Podano za dużo rewizji: %s"
-#: builtin/stash.c:162
+#: builtin/stash.c:164
msgid "No stash entries found."
msgstr "Brak zmian w schowku."
-#: builtin/stash.c:176
+#: builtin/stash.c:178
#, c-format
msgid "%s is not a valid reference"
msgstr "%s nie jest prawidłową referencją."
-#: builtin/stash.c:225
+#: builtin/stash.c:227
msgid "git stash clear with arguments is unimplemented"
msgstr "nie zaimplementowano parametrów w git stash clear"
-#: builtin/stash.c:429
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -21928,150 +22606,166 @@
" %s -> %s\n"
" aby zwolnić miejsce.\n"
-#: builtin/stash.c:490
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "nie można zastosować zmian ze schowka podczas scalania"
-#: builtin/stash.c:501
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "nie można wygenerować zmian %s^!."
-#: builtin/stash.c:508
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "konflikty w indeksie. Spróbuj bez --index."
-#: builtin/stash.c:514
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "nie można zapisać drzewa indeksu"
-#: builtin/stash.c:523
-msgid "could not restore untracked files from stash"
-msgstr "nie można przywrócić nieśledzonych plików ze schowka"
-
-#: builtin/stash.c:537
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Scalanie %s z %s"
-#: builtin/stash.c:547
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "Indeks nie został wyjęty ze schowka."
-#: builtin/stash.c:589 builtin/stash.c:687
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "nie można przywrócić nieśledzonych plików ze schowka"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "spróbuj odtworzyć indeks"
-#: builtin/stash.c:633
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "Porzucono %s (%s)"
-#: builtin/stash.c:636
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Nie można porzucić wpisu ze schowka"
-#: builtin/stash.c:649
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "„%s” nie wskazuje na zmiany ze schowka"
-#: builtin/stash.c:699
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr "Wpis pozostaje w schowku w razie, gdyby miał być znów potrzebny."
-#: builtin/stash.c:722
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "Nie określono nazwy gałęzi"
-#: builtin/stash.c:866 builtin/stash.c:903
+#: builtin/stash.c:824
+msgid "failed to parse tree"
+msgstr "nie można przetworzyć drzewa"
+
+#: builtin/stash.c:835
+msgid "failed to unpack trees"
+msgstr "nie można rozpakować drzew"
+
+#: builtin/stash.c:855
+msgid "include untracked files in the stash"
+msgstr "uwzględnij nieśledzone pliki w schowku"
+
+#: builtin/stash.c:858
+msgid "only show untracked files in the stash"
+msgstr "pokaż tylko nieśledzone pliki w schowku"
+
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "Nie można zaktualizować %s o %s"
-#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "komunikat skrytki"
-#: builtin/stash.c:894
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "„git stash store” wymaga jednego argumentu z <zapisem>"
-#: builtin/stash.c:1109
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "Nie wybrano zmian"
-#: builtin/stash.c:1209
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "Nie masz jeszcze początkowego zapisu"
-#: builtin/stash.c:1236
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "Nie można zapisać bieżącego stanu indeksu"
-#: builtin/stash.c:1245
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "Nie można zapisać nieśledzonych plików"
-#: builtin/stash.c:1256 builtin/stash.c:1265
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "Nie można zapisać bieżącego stanu drzewa roboczego"
-#: builtin/stash.c:1293
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "Nie można zapisać stanu drzewa roboczego"
-#: builtin/stash.c:1342
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Nie można jednocześnie użyć --patch i --include-untracked lub --all"
-#: builtin/stash.c:1358
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "Czyżby zabrakło „git add”?"
-#: builtin/stash.c:1373
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "Brak lokalnych zmian do zapisania"
-#: builtin/stash.c:1380
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "Nie można zainicjować schowka"
-#: builtin/stash.c:1395
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "Nie można zachować bieżącego stanu"
-#: builtin/stash.c:1400
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Zapisano katalog roboczy i stan indeksu %s"
-#: builtin/stash.c:1490
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "Nie można usunąć zmian w drzewie roboczym"
-#: builtin/stash.c:1529 builtin/stash.c:1594
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "zachowaj indeks"
-#: builtin/stash.c:1531 builtin/stash.c:1596
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "dodaj do schowka w trybie łatki"
-#: builtin/stash.c:1532 builtin/stash.c:1597
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "tryb cichy"
-#: builtin/stash.c:1534 builtin/stash.c:1599
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "uwzględnij nieśledzone pliki w schowku"
-#: builtin/stash.c:1536 builtin/stash.c:1601
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "uwzględnij pomijane pliki"
-#: builtin/stash.c:1636
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -22095,73 +22789,21 @@
msgid "prepend comment character and space to each line"
msgstr "dodaj znak komentarza i odstęp przed każdym wierszem"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Oczekiwano pełnej nazwy referencji, otrzymano %s"
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
msgid "submodule--helper print-default-remote takes no arguments"
msgstr "submodule--helper print-default-remote nie przyjmuje argumentów"
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "nie można odciąć jednego komponentu z adresu „%s”"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
-msgid "alternative anchor for relative paths"
-msgstr "alternatywne zakotwiczenie ścieżek względnych"
-
-#: builtin/submodule--helper.c:415
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper list [--prefix=<ścieżka>] [<ścieżka>...]"
-
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:652
-#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr "Nie znaleziono adresu dla ścieżki pod-modułu „%s” w .gitmodules"
-
-#: builtin/submodule--helper.c:524
-#, c-format
-msgid "Entering '%s'\n"
-msgstr "Otwieranie „%s”\n"
-
-#: builtin/submodule--helper.c:527
-#, c-format
-msgid ""
-"run_command returned non-zero status for %s\n"
-"."
-msgstr ""
-"run_command zwróciło niezerowy kod wyjścia z %s\n"
-"."
-
-#: builtin/submodule--helper.c:549
-#, c-format
-msgid ""
-"run_command returned non-zero status while recursing in the nested "
-"submodules of %s\n"
-"."
-msgstr ""
-"run_command zwróciło niezerowy kod wyjścia podczas przechodzenia "
-"zagnieżdżonych pod-modułów %s\n"
-"."
-
-#: builtin/submodule--helper.c:565
-msgid "suppress output of entering each submodule command"
-msgstr "powstrzymaj wyjście przy podawaniu każdego polecenia pod-modułu"
-
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
-#: builtin/submodule--helper.c:1487
-msgid "recurse into nested submodules"
-msgstr "schodź do zagnieżdżonych pod-modułów"
-
-#: builtin/submodule--helper.c:572
-msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <polecenie>"
-
-#: builtin/submodule--helper.c:599
+#: builtin/submodule--helper.c:211
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -22170,207 +22812,259 @@
"nie odnaleziono konfiguracji „%s”. Zakładam, że to repozytorium jest samo "
"sobie nadrzędnym."
-#: builtin/submodule--helper.c:666
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+msgid "alternative anchor for relative paths"
+msgstr "alternatywne zakotwiczenie ścieżek względnych"
+
+#: builtin/submodule--helper.c:410
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<ścieżka>] [<ścieżka>...]"
+
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Nie znaleziono adresu dla ścieżki podmodułu „%s” w .gitmodules"
+
+#: builtin/submodule--helper.c:520
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Otwieranie „%s”\n"
+
+#: builtin/submodule--helper.c:523
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command zwróciło niezerowy kod wyjścia z %s\n"
+"."
+
+#: builtin/submodule--helper.c:545
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"run_command zwróciło niezerowy kod wyjścia podczas przechodzenia "
+"zagnieżdżonych podmodułów %s\n"
+"."
+
+#: builtin/submodule--helper.c:561
+msgid "suppress output of entering each submodule command"
+msgstr "powstrzymaj wyjście przy podawaniu każdego polecenia podmodułu"
+
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
+msgid "recurse into nested submodules"
+msgstr "schodź do zagnieżdżonych podmodułów"
+
+#: builtin/submodule--helper.c:568
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <polecenie>"
+
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
-msgstr "Nie można zarejestrować adresu do ścieżki pod-modułu „%s”"
+msgstr "Nie można zarejestrować adresu do ścieżki podmodułu „%s”"
-#: builtin/submodule--helper.c:670
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
-msgstr "Zarejestrowano pod-moduł „%s” (%s) w „%s”\n"
+msgstr "Zarejestrowano podmoduł „%s” (%s) w „%s”\n"
-#: builtin/submodule--helper.c:680
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-"ostrzeżenie: zaproponowano tryb aktualizowania polecenia w pod-module „%s”\n"
+"ostrzeżenie: zaproponowano tryb aktualizowania polecenia w podmodule „%s”\n"
-#: builtin/submodule--helper.c:687
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
-msgstr "Nie można zarejestrować trybu aktualizacji do ścieżki pod-modułu „%s”"
+msgstr "Nie można zarejestrować trybu aktualizacji do ścieżki podmodułu „%s”"
-#: builtin/submodule--helper.c:709
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
-msgstr "powstrzymaj wyjście przy inicjalizacji pod-modułu"
+msgstr "powstrzymaj wyjście przy inicjalizacji podmodułu"
-#: builtin/submodule--helper.c:714
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opcje>] [<ścieżka>]"
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr "nie znaleziono w .gitmodules przypisania pod-modułów dla ścieżki „%s”"
+msgstr "nie znaleziono w .gitmodules przypisania podmodułów dla ścieżki „%s”"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
-msgstr "nie można rozwiązać referencji HEAD w pod-module „%s”"
+msgstr "nie można rozwiązać referencji HEAD w podmodule „%s”"
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
-msgstr "Nie można zejść do pod-modułu „%s”"
+msgstr "Nie można zejść do podmodułu „%s”"
-#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
-msgstr "powstrzymaj wyjście stanu pod-modułów"
+msgstr "powstrzymaj wyjście stanu podmodułów"
-#: builtin/submodule--helper.c:887
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
-msgstr "użyj zapisu z indeksu zamiast tego z HEAD pod-modułu"
+msgstr "użyj zapisu z indeksu zamiast tego z HEAD podmodułu"
-#: builtin/submodule--helper.c:893
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ścieżka>...]"
-#: builtin/submodule--helper.c:917
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <ścieżka>"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
-msgstr "* %s %s(blob)->%s(pod-moduł)"
+msgstr "* %s %s(blob)->%s(podmoduł)"
-#: builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
-msgstr "* %s %s(pod-moduł)->%s(blob)"
+msgstr "* %s %s(podmoduł)->%s(blob)"
-#: builtin/submodule--helper.c:1005
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "nie można skrócić obiektu z „%s”"
-#: builtin/submodule--helper.c:1059
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "nieoczekiwany tryb %o\n"
-#: builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
-msgstr "użyj zapisu z indeksu zamiast z HEAD pod-modułu"
+msgstr "użyj zapisu z indeksu zamiast z HEAD podmodułu"
-#: builtin/submodule--helper.c:1302
-msgid "to compare the commit in the index with that in the submodule HEAD"
-msgstr "aby porównać zapis w indeksie z tym z HEAD pod-modułu"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "porównaj zapis w indeksie z tym z HEAD podmodułu"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
-msgstr "pomiń pod-moduły z wartością „ignore_config” ustawioną na „all”"
+msgstr "pomiń podmoduły z wartością „ignore_config” ustawioną na „all”"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "ogranicz rozmiar podsumowania"
-#: builtin/submodule--helper.c:1311
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<opcje>] [<zapis>] [--] [<ścieżka>]"
-#: builtin/submodule--helper.c:1335
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "nie można pobrać rewizji dla HEAD"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "--cached i --files się wykluczają"
-#: builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
-msgstr "Synchronizowanie adresu URL pod-modułu w „%s”\n"
+msgstr "Synchronizowanie adresu URL podmodułu w „%s”\n"
-#: builtin/submodule--helper.c:1413
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
-msgstr "nie można zarejestrować adresu do ścieżki pod-modułu „%s”"
+msgstr "nie można zarejestrować adresu do ścieżki podmodułu „%s”"
-#: builtin/submodule--helper.c:1427
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
-msgstr "nie można uzyskać domyślnego zdalnego repozytorium pod-modułu „%s”"
+msgstr "nie można uzyskać domyślnego zdalnego repozytorium podmodułu „%s”"
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
-msgstr "nie można zaktualizować zdalnego repozytorium pod-modułu „%s”"
+msgstr "nie można zaktualizować zdalnego repozytorium podmodułu „%s”"
-#: builtin/submodule--helper.c:1485
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
-msgstr "powstrzymaj wyjście przy synchronizacji adresu pod-modułu"
+msgstr "powstrzymaj wyjście przy synchronizacji adresu podmodułu"
-#: builtin/submodule--helper.c:1492
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<ścieżka>]"
-#: builtin/submodule--helper.c:1546
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
-"Drzewo robocze pod-modułu „%s” zawiera katalog .git (użyj „rm -rf” jeśli na "
+"Drzewo robocze podmodułu „%s” zawiera katalog .git (użyj „rm -rf” jeśli na "
"pewno chcesz je usunąć wraz z całą jego historią)"
-#: builtin/submodule--helper.c:1558
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-"Drzewo robocze pod-modułu „%s” zawiera lokalne zmiany; użyj „-f”, aby je "
+"Drzewo robocze podmodułu „%s” zawiera lokalne zmiany; użyj „-f”, aby je "
"odrzucić"
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Wyczyszczono katalog „%s”\n"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
-msgstr "Nie można usunąć drzewa roboczego pod-modułu „%s”\n"
+msgstr "Nie można usunąć drzewa roboczego podmodułu „%s”\n"
-#: builtin/submodule--helper.c:1579
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
-msgstr "nie można utworzyć pustego katalogu pod-modułu „%s”"
+msgstr "nie można utworzyć pustego katalogu podmodułu „%s”"
-#: builtin/submodule--helper.c:1595
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
-msgstr "Wyrejestrowano pod-moduł „%s” (%s) ze ścieżki „%s”\n"
+msgstr "Wyrejestrowano podmoduł „%s” (%s) ze ścieżki „%s”\n"
-#: builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
-msgstr "usuń drzewa robocze pod-modułów, nawet jeśli zawierają lokalne zmiany"
+msgstr "usuń drzewa robocze podmodułów, nawet jeśli zawierają lokalne zmiany"
-#: builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
-msgstr "wyrejestruj wszystkie pod-moduły"
+msgstr "wyrejestruj wszystkie podmoduły"
-#: builtin/submodule--helper.c:1630
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ścieżka>...]]"
-#: builtin/submodule--helper.c:1644
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Użyj „--all” jeśli na pewno chcesz odinicjalizować wszystkie podmoduły."
-#: builtin/submodule--helper.c:1713
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22382,47 +23076,68 @@
"submodule.alternateErrorStrategy na „info” lub, równoważnie, sklonuj\n"
"z „--reference-if-able” zamiast „--reference”."
-#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
-msgstr "pod-moduł „%s” nie może dodać alternatywnego położenia: %s"
+msgstr "podmoduł „%s” nie może dodać alternatywnego położenia: %s"
-#: builtin/submodule--helper.c:1791
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"Wartość „%s” dla submodule.alternateErrorStrategy nie jest rozpoznawana"
-#: builtin/submodule--helper.c:1798
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Wartość „%s” dla submodule.alternateLocation nie jest rozpoznawana"
-#: builtin/submodule--helper.c:1822
+#: builtin/submodule--helper.c:1771
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "odmawiam utworzenia/użyj „%s” w katalogu gita innego podmodułu"
+
+#: builtin/submodule--helper.c:1812
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "klonowanie „%s” do ścieżki podmodułu „%s” nie powiodło się"
+
+#: builtin/submodule--helper.c:1817
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "katalog nie jest pusty: „%s”"
+
+#: builtin/submodule--helper.c:1829
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "nie można uzyskać katalogu podmodułu dla „%s”"
+
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
-msgstr "dokąd zostanie sklonowany nowy pod-moduł"
+msgstr "dokąd zostanie sklonowany nowy podmoduł"
-#: builtin/submodule--helper.c:1825
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
-msgstr "nazwa nowego pod-modułu"
+msgstr "nazwa nowego podmodułu"
-#: builtin/submodule--helper.c:1828
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
-msgstr "adres, skąd sklonować pod-moduł"
+msgstr "adres, skąd sklonować podmoduł"
-#: builtin/submodule--helper.c:1836
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "głębokość płytkich klonów"
-#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "wymuś postęp klonowania"
-#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "nie pozwól sklonować do niepustego katalogu"
-#: builtin/submodule--helper.c:1848
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22432,189 +23147,373 @@
"<repozytorium>] [--name <nazwa>] [--depth <głębokość>] [--single-branch] --"
"url <adres> --path <ścieżka>"
-#: builtin/submodule--helper.c:1873
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr "odmawiam utworzenia/użyj „%s” w katalogu gita innego pod-modułu"
-
-#: builtin/submodule--helper.c:1884
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "klonowanie „%s” do ścieżki pod-modułu „%s” nie powiodło się"
-
-#: builtin/submodule--helper.c:1888
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "katalog nie jest pusty: „%s”"
-
-#: builtin/submodule--helper.c:1900
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "nie można uzyskać katalogu pod-modułu dla „%s”"
-
-#: builtin/submodule--helper.c:1936
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr "Nieprawidłowy tryb aktualizacji „%s” do ścieżki pod-modułu „%s”"
+msgstr "Nieprawidłowy tryb aktualizacji „%s” do ścieżki podmodułu „%s”"
-#: builtin/submodule--helper.c:1940
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-"Nieprawidłowy tryb aktualizacji „%s” ustawiony w ścieżce pod-modułu „%s”"
+"Nieprawidłowy tryb aktualizacji „%s” ustawiony w ścieżce podmodułu „%s”"
-#: builtin/submodule--helper.c:2041
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
-msgstr "Ścieżka pod-modułu „%s” niezainicjowana"
+msgstr "Ścieżka podmodułu „%s” niezainicjowana"
-#: builtin/submodule--helper.c:2045
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "Może chcesz użyć „update --init”?"
-#: builtin/submodule--helper.c:2075
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
-msgstr "Pomijanie niescalonego pod-modułu %s"
+msgstr "Pomijanie niescalonego podmodułu %s"
-#: builtin/submodule--helper.c:2104
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
-msgstr "Pomijanie pod-modułu „%s”"
+msgstr "Pomijanie podmodułu „%s”"
-#: builtin/submodule--helper.c:2254
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Nie można sklonować „%s”. Zaplanowano ponowienie"
-#: builtin/submodule--helper.c:2265
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Nie można sklonować „%s” drugi raz, przerywanie"
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Nie można wybrać „%s” w ścieżce podmodułu „%s”"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Nie można przestawić „%s” w ścieżce podmodułu „%s”"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Nie można scalić „%s” w ścieżce podmodułu „%s”"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Wykonanie „%s %s” nie powiodło się w ścieżce podmodułu „%s”"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Ścieżka podmodułu „%s”: wybrano „%s”\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Ścieżka podmodułu „%s”: przestawiono na „%s”\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Ścieżka podmodułu „%s”: scalono w „%s”\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Ścieżka podmodułu „%s”: „%s %s”\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"Nie można pobrać w ścieżce podmodułu „%s”; próba bezpośredniego pobrania %s:"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Pobrano w ścieżce podmodułu „%s”, ale nie zawierał on %s. Bezpośrednie "
+"pobieranie tego zapisu nie powiodło się."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "ścieżka w drzewie roboczym"
-#: builtin/submodule--helper.c:2330
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
-msgstr "ścieżka w drzewie roboczym, przez granice zagnieżdżonych pod-modułów"
+msgstr "ścieżka w drzewie roboczym, przez granice zagnieżdżonych podmodułów"
-#: builtin/submodule--helper.c:2334
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout lub none"
-#: builtin/submodule--helper.c:2340
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "utwórz płytki klon ucięty do podanej liczby rewizji"
-#: builtin/submodule--helper.c:2343
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "równoległe zadania"
-#: builtin/submodule--helper.c:2345
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "czy początkowy klon powinien zgadzać się z zaleceniem płytkości"
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "nie wypisuj postępu klonowania"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<ścieżka>] [<ścieżka>...]"
-#: builtin/submodule--helper.c:2370
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "zła wartość parametru aktualizacji"
-#: builtin/submodule--helper.c:2418
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr "powstrzymaj wyjście przy aktualizacje przez przestawienie lub scalenie"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "wymuś aktualizacje wybrania"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "nie pobieraj nowych obiektów ze zdalnego miejsca"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr "wymusza tryb aktualizacji, jeśli repozytorium jest świeżym klonem"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "głębokość płytkiego pobrania"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 oczekiwane przez projekt nadrzędny"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "pod-sha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 czoła (HEAD) podmodułu"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<opcje>] <ścieżka>"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-"Gałąź pod-modułu (%s) ustawiono, by dziedziczyła gałąź z nad-projektu, ale "
+"Gałąź podmodułu (%s) ustawiono, by dziedziczyła gałąź z nad-projektu, ale "
"nad-projekt nie jest na żadnej gałęzi"
-#: builtin/submodule--helper.c:2541
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
-msgstr "nie można uzyskać uchwytu repozytorium pod-modułu dla „%s”"
+msgstr "nie można uzyskać uchwytu repozytorium podmodułu dla „%s”"
-#: builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
-msgstr "schodź do pod-modułów"
+msgstr "schodź do podmodułów"
-#: builtin/submodule--helper.c:2580
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opcje>] [<ścieżka>...]"
-#: builtin/submodule--helper.c:2636
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "sprawdź, czy bezpiecznie jest zapisać plik .gitmodules"
-#: builtin/submodule--helper.c:2639
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
msgstr "usuń konfigurację z pliku .gitmodules"
-#: builtin/submodule--helper.c:2644
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <nazwa> [<wartość>]"
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nazwa>"
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2665 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "upewnij się, że plik .gitmodules jest w drzewie roboczym"
-#: builtin/submodule--helper.c:2681
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
-msgstr "powstrzymaj wyjście przy ustawianiu adresu pod-modułu"
+msgstr "powstrzymaj wyjście przy ustawianiu adresu podmodułu"
-#: builtin/submodule--helper.c:2685
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <ścieżka> <nowy-adres>"
-#: builtin/submodule--helper.c:2718
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "ustaw domyślną gałąź śledzącą na master"
-#: builtin/submodule--helper.c:2720
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "ustaw domyślną gałąź śledzącą"
-#: builtin/submodule--helper.c:2724
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ścieżka>"
-#: builtin/submodule--helper.c:2725
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gałąź> <ścieżka>"
-#: builtin/submodule--helper.c:2732
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "wymagane --branch lub --default"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "--branch i --default się wykluczają"
-#: builtin/submodule--helper.c:2792 git.c:441 git.c:714
+#: builtin/submodule--helper.c:3037
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "Dodawanie istniejącego repozytorium z „%s” do indeksu\n"
+
+#: builtin/submodule--helper.c:3040
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "„%s” już istnieje i nie jest prawidłowym repozytorium gita"
+
+#: builtin/submodule--helper.c:3053
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr ""
+"Katalog gita podmodułu „%s” znaleziono lokalnie na zdalnych repozytoriach:\n"
+
+#: builtin/submodule--helper.c:3060
+#, c-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" %s\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
+msgstr ""
+"Jeśli chcesz ponownie użyć tego lokalnego katalogu gita zamiast ponownie "
+"klonować z\n"
+" %s\n"
+"użyj opcji „--force”. Jeśli lokalny katalog gita nie leży w prawidłowym "
+"repozytorium\n"
+"lub nie jesteś pewien, co to znaczy, wybierz inną nazwę za pomocą opcji „--"
+"name”."
+
+#: builtin/submodule--helper.c:3072
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "Reaktywacja lokalnego katalogu gita w podmodule „%s”\n"
+
+#: builtin/submodule--helper.c:3109
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "nie można wybrać podmodułu „%s”"
+
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Nie można dodać podmodułu „%s”"
+
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Nie można zarejestrować podmodułu „%s”"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "„%s” już widnieje w indeksie"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "„%s” już widnieje w indeksie i nie jest podmodułem"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "gałąź repozytorium do dodania jako podmoduł"
+
+#: builtin/submodule--helper.c:3254
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "pozwól dodać normalnie ignorowaną ścieżkę podmodułu"
+
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "wypisz tylko komunikaty błędów"
+
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "pożycz obiekty z repozytoriów odniesienia"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"ustawia nazwę podmodułu na podany ciąg zamiast używać domyślnie jego ścieżki"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<opcje>] [--] <repozytorium> [<ścieżka>]"
+
+#: builtin/submodule--helper.c:3297
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "Ścieżki względnej można użyć tylko ze szczytu drzewa roboczego"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr ""
+"URL repozytorium: „%s” musi być ścieżką bezwzględną lub zaczynać się "
+"od ./|../"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "„%s” nie jest prawidłową nazwą podmodułu"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s nie wspiera --super-prefix"
-#: builtin/submodule--helper.c:2798
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "„%s” nie jest prawidłowym pod-poleceniem submodule--helper"
@@ -22627,33 +23526,33 @@
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <nazwa>"
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "nie wypisuj błędów przy nie-symbolicznych (odłączonych) referencjach"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
msgid "delete symbolic ref"
msgstr "usuń referencję symboliczną"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
msgid "shorten ref output"
msgstr "skróć wyjściową referencję"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "powód"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "powód aktualizacji"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <id-klucza>] [-f] [-m <komunikat> | -F <plik>]\n"
-"\t\t<tag> [<czoło>]"
+" <tag> [<czoło>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
@@ -22663,29 +23562,29 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<num>]] [--contains <zapis>] [--no-contains <zapis>] [--"
"points-at <obiekt>]\n"
-"\t\t[--format=<format>] [--merged <zapis>] [--no-merged <zapis>] "
+" [--format=<format>] [--merged <zapis>] [--no-merged <zapis>] "
"[<wzorzec>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nazwa-tagu>..."
-#: builtin/tag.c:89
+#: builtin/tag.c:100
#, c-format
msgid "tag '%s' not found."
msgstr "nie znaleziono tagu „%s”."
-#: builtin/tag.c:124
+#: builtin/tag.c:135
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Usunięto tag „%s” (wskazywał %s)\n"
-#: builtin/tag.c:159
+#: builtin/tag.c:170
#, c-format
msgid ""
"\n"
@@ -22698,7 +23597,7 @@
" %s\n"
"Wiersze zaczynające się od „%c” zostaną zignorowane.\n"
-#: builtin/tag.c:163
+#: builtin/tag.c:174
#, c-format
msgid ""
"\n"
@@ -22713,11 +23612,11 @@
"Wiersze zaczynające się od „%c” będą zachowane; możesz je sam(a) usunąć, "
"jeśli chcesz.\n"
-#: builtin/tag.c:230
+#: builtin/tag.c:241
msgid "unable to sign the tag"
msgstr "nie można podpisać tagu"
-#: builtin/tag.c:248
+#: builtin/tag.c:259
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -22730,139 +23629,139 @@
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:264
+#: builtin/tag.c:275
msgid "bad object type."
msgstr "zły rodzaj obiektu."
-#: builtin/tag.c:317
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "brak komunikatu tagu?"
-#: builtin/tag.c:324
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Pozostawiono komunikat tagu w %s\n"
-#: builtin/tag.c:435
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "wypisz nazwy tagów"
-#: builtin/tag.c:437
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "wypisz <n> wierszy każdego komunikatu tagu"
-#: builtin/tag.c:439
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "usuń tagi"
-#: builtin/tag.c:440
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "weryfikuj tagi"
-#: builtin/tag.c:442
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Opcje tworzenia tagów"
-#: builtin/tag.c:444
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "opisz tag, potrzebuje komunikatu"
-#: builtin/tag.c:446
+#: builtin/tag.c:455
msgid "tag message"
msgstr "wiadomość tagu"
-#: builtin/tag.c:448
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "wymuś edycję komunikatu tagu"
-#: builtin/tag.c:449
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "tag opisany i podpisany GPG"
-#: builtin/tag.c:452
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "użyj innego klucza do podpisania tagu"
-#: builtin/tag.c:453
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "zamień tag, jeśli istnieje"
-#: builtin/tag.c:454 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "utwórz dziennik referencji"
-#: builtin/tag.c:456
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Opcje wypisywania tagów"
-#: builtin/tag.c:457
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "pokaż listę tagów w kolumnach"
-#: builtin/tag.c:458 builtin/tag.c:460
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "wypisz tylko tagi zawierające ten zapis"
-#: builtin/tag.c:459 builtin/tag.c:461
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "wypisz tylko tagi nie zawierające tego zapisu"
-#: builtin/tag.c:462
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "wypisz tylko scalone tagi"
-#: builtin/tag.c:463
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "wypisz tylko niescalone tagi"
-#: builtin/tag.c:467
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "wypisz tylko tagi tego obiektu"
-#: builtin/tag.c:515
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column i -n się wykluczają"
-#: builtin/tag.c:537
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
-msgstr "opcja -n może być użyta tylko w trybie wymieniania"
+msgstr "opcji -n można użyć tylko w trybie wymieniania"
-#: builtin/tag.c:539
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
-msgstr "opcja --contains może być użyta tylko w trybie wymieniania"
+msgstr "opcji --contains można użyć tylko w trybie wymieniania"
-#: builtin/tag.c:541
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
-msgstr "opcja --no-contains może być użyta tylko w trybie wymieniania"
+msgstr "opcji --no-contains można użyć tylko w trybie wymieniania"
-#: builtin/tag.c:543
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
-msgstr "opcja --points-at może być użyta tylko w trybie wymieniania"
+msgstr "opcji --points-at można użyć tylko w trybie wymieniania"
-#: builtin/tag.c:545
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "opcje --merged i --no-merged mogą być użyte tylko w trybie wymieniania"
-#: builtin/tag.c:556
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "-F i -m się wykluczają."
-#: builtin/tag.c:581
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s” nie jest prawidłową nazwą tagu."
-#: builtin/tag.c:586
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "tag „%s” już istnieje"
-#: builtin/tag.c:617
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Zaktualizowano tag „%s” (wskazywał %s)\n"
-#: builtin/unpack-objects.c:502
+#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr "Rozpakowywanie obiektów"
@@ -22871,56 +23770,51 @@
msgid "failed to create directory %s"
msgstr "nie można utworzyć katalogu %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "nie można utworzyć pliku %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "nie można usunąć pliku %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "nie można usunąć katalogu %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Sprawdzanie czasu modyfikacji „%s” "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "informacje stat katalogu nie zmieniają się po dodaniu nowego pliku"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "informacje stat katalogu nie zmieniają się po dodaniu nowego katalogu"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "informacje stat katalogu zmieniają się po zaktualizowaniu pliku"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"informacje stat katalogu zmieniają się po usunięciu pliku w podkatalogu"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "informacje stat katalogu nie zmieniają się po usunięciu pliku"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "informacje stat katalogu nie zmieniają się po usunięciu katalogu"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opcje>] [--] [<plik>...]"
@@ -22930,7 +23824,7 @@
#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
-msgstr "odświeżanie: ignoruj pod-moduły"
+msgstr "odświeżanie: ignoruj podmoduły"
#: builtin/update-index.c:980
msgid "do not ignore new files"
@@ -23135,19 +24029,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opcje>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "usuń referencję"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "zaktualizuj <referencję>, a nie tę, na którą wskazuje"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "wejście ma argumenty rozdzielone NULami"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "wczytaj aktualizacje ze standardowego wejścia"
@@ -23163,19 +24057,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opcje>] <katalog>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "wyjdź po pojedynczej wymianie żądania/odpowiedzi"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "wyjdź natychmiast po początkowym ogłoszeniu referencji"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "zaserwuj informacje/referencje do git-http-backend"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "nie sprawdzaj <katalog>/.git/ jeśli <katalog> nie jest katalogiem Gita"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "przerwij przesyłanie po <n> sekundach nieaktywności"
@@ -23211,63 +24105,58 @@
msgid "print tag contents"
msgstr "wypisz zawartość tagu"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<opcje>] <ścieżka> [<zapis>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<opcje>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<opcje>] <ścieżka>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <drzewo-robocze> <nowa-ścieżka>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opcje>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<opcje>] <drzewo-robocze>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <ścieżka>"
-#: builtin/worktree.c:61 builtin/worktree.c:933
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "nie można skasować „%s”"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Usuwanie %s/%s: %s"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr "zgłaszaj przycięte drzewa robocze"
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "wygaś drzewa robocze starsze niż <czas>"
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "„%s” już istnieje"
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "cel drzewa roboczego „%s” nie nadaje się do użytku"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23277,7 +24166,7 @@
"użyj „%s -f -f”, aby wymusić, lub „unlock” i „prune” lub „remove”, aby "
"wyczyścić"
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23286,129 +24175,140 @@
"„%s” jest brakującym, ale już zarejestrowanym drzewem roboczym;\n"
"użyj „%s -f”, aby wymusić, bądź „prune” lub „remove”, aby wyczyścić"
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "nie można utworzyć katalogu „%s”"
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "inicjowanie"
+
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Przygotowywanie drzewa roboczego (nowa gałąź „%s”)"
-#: builtin/worktree.c:424
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Przygotowywanie drzewa roboczego (resetowanie gałęzi „%s”; była na %s)"
-#: builtin/worktree.c:433
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Przygotowywanie drzewa roboczego (wybieranie „%s”)"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Przygotowywanie drzewa roboczego (oddzielone HEAD %s)"
-#: builtin/worktree.c:480
+#: builtin/worktree.c:483
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "wybierz <gałąź> nawet jeśli już jest wybrana w innym drzewie roboczym"
-#: builtin/worktree.c:483
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "utwórz nową gałąź"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "utwórz lub zresetuj gałąź"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "wypełnij nowe drzewo robocze"
-#: builtin/worktree.c:488
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "pozostaw nowe drzewo robocze zablokowane"
-#: builtin/worktree.c:491
-msgid "set up tracking mode (see git-branch(1))"
-msgstr "ustaw tryb śledzenia (zobacz git-branch(1))"
-
-#: builtin/worktree.c:494
-msgid "try to match the new branch name with a remote-tracking branch"
-msgstr "spróbuj dopasować nazwę nowej gałęzi do gałęzi śledzącej"
-
-#: builtin/worktree.c:502
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B i --detach się wykluczają"
-
-#: builtin/worktree.c:563
-msgid "--[no-]track can only be used if a new branch is created"
-msgstr "--[no-]track można użyć tylko przy tworzeniu nowej gałęzi"
-
-#: builtin/worktree.c:680
-msgid "show extended annotations and reasons, if available"
-msgstr "pokaż rozszerzone adnotacje i powody, jeśli dostępne"
-
-#: builtin/worktree.c:682
-msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr "oznacz drzewa robocze starsze niż <czas> jako „do przycięcia”"
-
-#: builtin/worktree.c:691
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose i --porcelain się wykluczają"
-
-#: builtin/worktree.c:718
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr "powód blokady"
-#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
-#: builtin/worktree.c:961
+#: builtin/worktree.c:496
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "ustaw tryb śledzenia (zobacz git-branch(1))"
+
+#: builtin/worktree.c:499
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "spróbuj dopasować nazwę nowej gałęzi do gałęzi śledzącej"
+
+#: builtin/worktree.c:507
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-b, -B i --detach się wykluczają"
+
+#: builtin/worktree.c:509
+msgid "--reason requires --lock"
+msgstr "--reason wymaga --lock"
+
+#: builtin/worktree.c:513
+msgid "added with --lock"
+msgstr "dodane przez --lock"
+
+#: builtin/worktree.c:575
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "--[no-]track można użyć tylko przy tworzeniu nowej gałęzi"
+
+#: builtin/worktree.c:692
+msgid "show extended annotations and reasons, if available"
+msgstr "pokaż rozszerzone adnotacje i powody, jeśli dostępne"
+
+#: builtin/worktree.c:694
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr "oznacz drzewa robocze starsze niż <czas> jako „do przycięcia”"
+
+#: builtin/worktree.c:703
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose i --porcelain się wykluczają"
+
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "„%s” nie jest drzewem roboczym"
-#: builtin/worktree.c:732 builtin/worktree.c:765
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr "Główne drzewo robocze nie może być blokowane ani odblokowywane"
-#: builtin/worktree.c:737
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "„%s” już jest zablokowany, powód: %s"
-#: builtin/worktree.c:739
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "„%s” już jest zablokowany"
-#: builtin/worktree.c:767
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "„%s” nie jest zablokowany"
-#: builtin/worktree.c:808
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
-msgstr ""
-"nie można przenosić ani usuwać drzew roboczych zawierających pod-moduły"
+msgstr "nie można przenosić ani usuwać drzew roboczych zawierających podmoduły"
-#: builtin/worktree.c:816
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr ""
"wymuś przeniesienie, nawet jeśli drzewo robocze jest brudne lub zablokowane"
-#: builtin/worktree.c:839 builtin/worktree.c:963
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "„%s” jest głównym drzewem roboczym"
-#: builtin/worktree.c:844
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "nie można uzyskać nazwy celu z „%s”"
-#: builtin/worktree.c:857
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -23417,7 +24317,7 @@
"nie można przenieść zablokowanego drzewa roboczego, powód blokady: %s\n"
"użyj „move -f -f”, żeby to wymusić lub najpierw odblokować"
-#: builtin/worktree.c:859
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -23425,38 +24325,38 @@
"nie można przenieść zablokowanego drzewa roboczego;\n"
"użyj „move -f -f”, żeby to wymusić lub najpierw odblokować"
-#: builtin/worktree.c:862
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "sprawdzenie nie powiodło się, nie można przenieść drzewa roboczego: %s"
-#: builtin/worktree.c:867
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "nie można przenieść „%s” do „%s”"
-#: builtin/worktree.c:913
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "nie można wykonać „git status” na „%s”"
-#: builtin/worktree.c:917
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"„%s” zawiera zmienione lub nieśledzone pliki, użyj --force, aby skasować"
-#: builtin/worktree.c:922
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "nie można wykonać „git status” na „%s”, kod %d"
-#: builtin/worktree.c:945
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"wymuś usunięcie, nawet jeśli drzewo robocze jest brudne lub zablokowane"
-#: builtin/worktree.c:968
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -23465,7 +24365,7 @@
"nie można usunąć zablokowanego drzewa roboczego, powód blokady: %s\n"
"użyj „remove -f -f”, żeby to wymusić lub najpierw odblokować"
-#: builtin/worktree.c:970
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -23473,17 +24373,17 @@
"nie można usunąć zablokowanego drzewa roboczego;\n"
"użyj „remove -f -f”, żeby to wymusić lub najpierw odblokować"
-#: builtin/worktree.c:973
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "sprawdzenie nie powiodło się, nie można usunąć drzewa roboczego: %s"
-#: builtin/worktree.c:997
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr "naprawa: %s: %s"
-#: builtin/worktree.c:1000
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr "błąd: %s: %s"
@@ -23504,40 +24404,6 @@
msgid "only useful for debugging"
msgstr "przydatne tylko do odpluskwiania"
-#: http-fetch.c:114
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "argument --packfile musi być prawidłowym skrótem (otrzymano „%s”)"
-
-#: http-fetch.c:122
-msgid "not a git repository"
-msgstr "to nie jest repozytorium gita"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "nieprzetworzone opcje"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "błąd w przygotowywaniu rewizji"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "zapis %s nie jest oznaczony jako osiągalny"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "za dużo zapisów oznaczono jako osiągalne"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<opcje>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "wyjdź natychmiast po początkowym ogłoszeniu możliwości"
-
#: git.c:28
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
@@ -23549,12 +24415,12 @@
" <command> [<args>]"
msgstr ""
"git [--version] [--help] [-C <ścieżka>] [-c <nazwa>=<wartość>]\n"
-" [--exec-path[=<ścieżka>]] [--html-path] [--man-path]"
-" [--info-path]\n"
+" [--exec-path[=<ścieżka>]] [--html-path] [--man-path] [--info-"
+"path]\n"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
-" [--git-dir=<ścieżka>] [--work-tree=<ścieżka>] [--namespace=<nazwa"
-">]\n"
+" [--git-dir=<ścieżka>] [--work-tree=<ścieżka>] [--"
+"namespace=<nazwa>]\n"
" [--super-prefix=<ścieżka>] [--config-env=<nazwa>=<zmśrod>]\n"
" <polecenie> [<argumenty>]"
@@ -23597,22 +24463,27 @@
msgid "-c expects a configuration string\n"
msgstr "-c oczekuje łańcucha konfiguracji\n"
-#: git.c:292
+#: git.c:260
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "nie podano klucza ustawień do --config-env\n"
+
+#: git.c:300
#, c-format
msgid "no directory given for -C\n"
msgstr "nie podano katalogu do -C\n"
-#: git.c:318
+#: git.c:326
#, c-format
msgid "unknown option: %s\n"
msgstr "nieznana opcja: %s\n"
-#: git.c:367
+#: git.c:375
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "podczas rozszerzania skrótu „%s”: „%s”"
-#: git.c:376
+#: git.c:384
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -23621,39 +24492,39 @@
"skrót „%s” zmienia zmienne środowiska.\n"
"Aby to zrobić, możesz użyć w skrócie „!git”"
-#: git.c:383
+#: git.c:391
#, c-format
msgid "empty alias for %s"
msgstr "pusty skrót dla %s"
-#: git.c:386
+#: git.c:394
#, c-format
msgid "recursive alias: %s"
msgstr "rekurencyjny skrót: %s"
-#: git.c:468
+#: git.c:476
msgid "write failure on standard output"
msgstr "błąd wypisywania na standardowe wyjście"
-#: git.c:470
+#: git.c:478
msgid "unknown write failure on standard output"
msgstr "nieznany błąd wypisywania na standardowe wyjście"
-#: git.c:472
+#: git.c:480
msgid "close failed on standard output"
msgstr "nie można zamknąć standardowego wyjścia"
-#: git.c:823
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "wykryto pętlę skrótów: rozwijanie „%s” nie kończy się: %s"
-#: git.c:873
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "nie można obsłużyć %s jako polecenia wbudowanego"
-#: git.c:886
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -23662,54 +24533,166 @@
"użycie: %s\n"
"\n"
-#: git.c:906
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"rozwinięcie skrótu „%s” nie powiodło się; „%s” nie jest poleceniem gita\n"
-#: git.c:918
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "nie można wykonać polecenia „%s”: %s\n"
-#: http.c:399
+#: http-fetch.c:118
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "argument --packfile musi być prawidłowym skrótem (otrzymano „%s”)"
+
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "to nie jest repozytorium gita"
+
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr "--packfile wymaga --index-pack-args"
+
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "--index-pack-args można użyć tylko z --packfile"
+
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "nieprzetworzone opcje"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "błąd w przygotowywaniu rewizji"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "zapis %s nie jest oznaczony jako osiągalny"
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr "za dużo zapisów oznaczono jako osiągalne"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<opcje>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "wyjdź natychmiast po początkowym ogłoszeniu możliwości"
+
+#: t/helper/test-simple-ipc.c:581
+msgid "test-helper simple-ipc is-active [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active [<nazwa>] [<opcje>]"
+
+#: t/helper/test-simple-ipc.c:582
+msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon [<nazwa>] [<wątki>]"
+
+#: t/helper/test-simple-ipc.c:583
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr ""
+"test-helper simple-ipc start-daemon [<nazwa>] [<wątki>] [<maks-czekanie>]"
+
+#: t/helper/test-simple-ipc.c:584
+msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon [<nazwa>] [<maks-czekanie>]"
+
+#: t/helper/test-simple-ipc.c:585
+msgid "test-helper simple-ipc send [<name>] [<token>]"
+msgstr "test-helper simple-ipc send [<nazwa>] [<polecenie>]"
+
+#: t/helper/test-simple-ipc.c:586
+msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
+msgstr ""
+"test-helper simple-ipc sendbytes [<nazwa>] [<liczba-bajtów>] [<bajt>]"
+
+#: t/helper/test-simple-ipc.c:587
+msgid ""
+"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple [<nazwa>] [<wątki>] [<liczba-bajtów>] "
+"[<rozmiar-wsadu>]"
+
+#: t/helper/test-simple-ipc.c:595
+msgid "name or pathname of unix domain socket"
+msgstr "nazwa lub ścieżka do gniazda domeny uniksowej"
+
+#: t/helper/test-simple-ipc.c:597
+msgid "named-pipe name"
+msgstr "nazwa nazwanego potoku"
+
+#: t/helper/test-simple-ipc.c:599
+msgid "number of threads in server thread pool"
+msgstr "liczba wątków w poletku wątków serwera"
+
+#: t/helper/test-simple-ipc.c:600
+msgid "seconds to wait for daemon to start or stop"
+msgstr "sekundy do odczekania przy włączaniu lub wyłączaniu demona"
+
+#: t/helper/test-simple-ipc.c:602
+msgid "number of bytes"
+msgstr "liczba bajtów"
+
+#: t/helper/test-simple-ipc.c:603
+msgid "number of requests per thread"
+msgstr "liczba żądań na wątek"
+
+#: t/helper/test-simple-ipc.c:605
+msgid "byte"
+msgstr "bajt"
+
+#: t/helper/test-simple-ipc.c:605
+msgid "ballast character"
+msgstr "znak balastowy"
+
+#: t/helper/test-simple-ipc.c:606
+msgid "token"
+msgstr "polecenie"
+
+#: t/helper/test-simple-ipc.c:606
+msgid "command token to send to the server"
+msgstr "polecenie do wysłania na serwer"
+
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "ujemna wartość http.postbuffer; użycie domyślnej %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Kontrola powierzania niewspierana z cURLem < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Klucz publiczny niewspierany z cURLem < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Przypinanie kluczy publicznych niewspierane z cURLem < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE niewspierane z cURLem < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Ograniczenia protokołów niewspierane z cURLem < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Niewspierany silnik SSL „%s”. Wspierane silniki SSL:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr "Nie można ustawić silnika SSL na „%s”: cURL zbudowano bez silników SSL"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Nie można ustawić silnika SSL na „%s”: już ustawiono"
-#: http.c:2025
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -23725,133 +24708,138 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr "nieprawidłowe cytowanie w wartości opcji wypchnięcia: „%s”"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs nieprawidłowe: czy to jest repozytorium gita?"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"nieprawidłowa odpowiedź serwera; oczekiwano usługi, otrzymano pakiet "
"wypróżnienia"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "nieprawidłowa odpowiedź serwera; otrzymano „%s”"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "nie znaleziono repozytorium „%s”"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Uwierzytelnienie nie powiodło się dla „%s”"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "nie można dostać się do „%s” z ustawieniem http.pinnedPubkey: %s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "brak dostępu do „%s”: %s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "przekierowanie do %s"
-#: remote-curl.c:642
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
"nie powinno być końca pliku, kiedy koniec pliku nie jest gładko obsługiwany"
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "zdalna maszyna wysłała bezstanowy separator"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "zdalny serwer wysłał nieoczekiwany pakiet końca odpowiedzi"
-#: remote-curl.c:724
+#: remote-curl.c:726
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"nie można cofnąć danych formularza rpc — spróbuj zwiększyć http.postBuffer"
-#: remote-curl.c:754
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: zły znak długości wiersza: %.4s"
-#: remote-curl.c:756
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: nieoczekiwany pakiet końca odpowiedzi"
-#: remote-curl.c:832
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "wywołanie RPC nie powiodło się; %s"
-#: remote-curl.c:872
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "nie można obsłużyć tak dużych wypchnięć"
-#: remote-curl.c:987
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "nie można skompresować żądania; błąd deflate zlib %d"
-#: remote-curl.c:991
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "nie można skompresować żądania; błąd end zlib %d"
-#: remote-curl.c:1041
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "otrzymano nagłówek długości %d bajtów"
-#: remote-curl.c:1043
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "nadal oczekuję na %d bajtów ciała"
-#: remote-curl.c:1132
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "tępy transport http nie wspiera płytkich możliwości"
-#: remote-curl.c:1147
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "pobieranie nie powiodło się."
-#: remote-curl.c:1193
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "nie można pobrać SHA-1 przez inteligentne http"
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "błąd protokołu: oczekiwano SHA/referencji, otrzymano „%s”"
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "transport http nie wspiera %s"
-#: remote-curl.c:1291
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "git-http-push nie powiodło się"
-#: remote-curl.c:1479
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: użycie: git remote-curl <zdalne-repozytorium> [<adres>]"
-#: remote-curl.c:1511
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: błąd odczytu strumienia poleceń od gita"
-#: remote-curl.c:1518
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: próba pobrania bez lokalnego repozytorium"
-#: remote-curl.c:1559
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: nieznane polecenie „%s” z gita"
@@ -23864,11 +24852,11 @@
msgid "no libc information available\n"
msgstr "brak dostępnych informacji o bibliotece standardowej\n"
-#: list-objects-filter-options.h:91
+#: list-objects-filter-options.h:94
msgid "args"
msgstr "argumenty"
-#: list-objects-filter-options.h:92
+#: list-objects-filter-options.h:95
msgid "object filtering"
msgstr "filtrowanie obiektów"
@@ -23880,36 +24868,36 @@
msgid "no-op (backward compatibility)"
msgstr "nic nie robi (kompatybilność wsteczna)"
-#: parse-options.h:309
+#: parse-options.h:308
msgid "be more verbose"
msgstr "więcej komunikatów"
-#: parse-options.h:311
+#: parse-options.h:310
msgid "be more quiet"
msgstr "mniej komunikatów"
-#: parse-options.h:317
+#: parse-options.h:316
msgid "use <n> digits to display object names"
msgstr "użyj <n> cyfr, aby wyświetlić nazwy obiektów"
-#: parse-options.h:336
+#: parse-options.h:335
msgid "how to strip spaces and #comments from message"
msgstr "jak usuwać odstępy i #komentarze z komunikatu"
-#: parse-options.h:337
+#: parse-options.h:336
msgid "read pathspec from file"
msgstr "wczytaj ścieżki z pliku"
-#: parse-options.h:338
+#: parse-options.h:337
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "przy --pathspec-from-file ścieżki są rozdzielone znakiem NUL"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "klucz"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "nazwa pola, według którego należy posortować"
@@ -24441,7 +25429,7 @@
#: command-list.h:178
msgid "Initialize, update or inspect submodules"
-msgstr "Zainicjuj, zaktualizuj lub zbadaj pod-moduły"
+msgstr "Zainicjuj, zaktualizuj lub zbadaj podmoduły"
#: command-list.h:179
msgid "Bidirectional operation between a Subversion repository and Git"
@@ -24570,7 +25558,7 @@
#: command-list.h:210
msgid "Defining submodule properties"
-msgstr "Definiowanie właściwości pod-modułów"
+msgstr "Definiowanie właściwości podmodułów"
#: command-list.h:211
msgid "Git namespaces"
@@ -24604,41 +25592,6 @@
msgid "An overview of recommended workflows with Git"
msgstr "Przegląd zalecanych przepływów pracy z Gitem"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "przeszukanie nie powiodło się: nie podano polecenia."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "wykonywanie $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"przeszukanie nie powiodło się:\n"
-"kod wyjścia $res z „$command” jest <0 lub >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "przeszukanie nie może już kontynuować"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"przeszukanie nie powiodło się:\n"
-"„bisect-state $state” zakończyło się z kodem błędu $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "przeszukanie pomyślne"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -24677,98 +25630,17 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Proste scalenie nie zadziałało, próba automatycznego scalenia."
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "Ścieżka względna może być użyta tylko ze szczytu drzewa roboczego"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-"URL repozytorium: „$repo” musi być ścieżką bezwzględną lub zaczynać się "
-"od ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "„$sm_path” już widnieje w indeksie"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "„$sm_path” już widnieje w indeksie i nie jest pod-modułem"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "„$sm_path” nie ma wybranego zapisu"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Dodawanie istniejącego repozytorium z „$sm_path” do indeksu"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "„$sm_path” już istnieje i nie jest prawidłowym repozytorium gita"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"Katalog gita podmodułu „$sm_name” znaleziono lokalnie na zdalnych "
-"repozytoriach:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-" $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Jeśli chcesz ponownie użyć tego lokalnego katalogu gita zamiast ponownie "
-"klonować z\n"
-" $realrepo\n"
-"użyj opcji „--force”. Jeśli lokalny katalog gita nie leży w prawidłowym "
-"repozytorium\n"
-"lub nie jesteś pewien, co to znaczy, wybierz inną nazwę za pomocą opcji „--"
-"name”."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Reaktywacja lokalnego katalogu gita w podmodule „$sm_name”."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Nie można wybrać podmodułu „$sm_path”"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Nie można dodać podmodułu „$sm_path”"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Nie można zarejestrować podmodułu „$sm_path”"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Nie znaleziono aktualnej rewizji w ścieżce podmodułu „$displaypath”"
-#: git-submodule.sh:578
+#: git-submodule.sh:411
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Nie można pobrać w ścieżce podmodułu „$sm_path”"
-#: git-submodule.sh:583
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -24777,395 +25649,10 @@
"Nie znaleziono aktualnej rewizji ${remote_name}/${branch} w ścieżce pod-"
"modułu „$sm_path”"
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Nie można pobrać w ścieżce podmodułu „$displaypath”; próba bezpośredniego "
-"pobrania $sha1:"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Pobrano w ścieżce podmodułu „$displaypath”, ale nie zawierał $sha1. "
-"Bezpośrednie pobieranie tego zapisu nie powiodło się."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Nie można wybrać „$sha1” w ścieżce podmodułu „$displaypath”"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Ścieżka podmodułu „$displaypath”: wybrano „$sha1”"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Nie można przestawić „$sha1” w ścieżce podmodułu „$displaypath”"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Ścieżka podmodułu „$displaypath”: przestawiono na „$sha1”"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Nie można scalić „$sha1” w ścieżce podmodułu „$displaypath”"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Ścieżka podmodułu „$displaypath”: scalono w „$sha1”"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Wykonanie „$command $sha1” nie powiodło się w ścieżce podmodułu "
-"„$displaypath”"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Ścieżka podmodułu „$displaypath”: „$command $sha1”"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "Nie można zejść do ścieżki pod-modułu „$displaypath”"
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Zastosowano zmiany z automatycznego schowka."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Nie można zachować $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"Stosowanie zmian z automatycznej skrytki spowodowało konflikty.\n"
-"Twoje zmiany są bezpieczne w schowku.\n"
-"Możesz w każdej chwili wykonać „git stash pop” lub „git stash drop”.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Przestawianie ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Polecenia:\n"
-"p, pick <zapis> = dobierz zapis\n"
-"r, reword <zapis> = użyj zapisu, ale przeredaguj jego komunikat\n"
-"e, edit <zapis> = użyj zapisu, ale zatrzymaj się, żeby go poprawić\n"
-"s, squash <zapis> = użyj zapisu, ale połącz go z poprzednim (spłaszcz)\n"
-"f, fixup <zapis> = jak „squash”, ale odrzuć komunikat tego zapisu\n"
-"x, exec <polecenie> = wykonaj polecenie (resztę wiersza) w powłoce\n"
-"d, drop <zapis> = usuń zapis\n"
-"l, label <etykietka> = nazwij bieżące HEAD\n"
-"t, reset <etykietka> = zresetuj HEAD do etykietki\n"
-"m, merge [-C <zapis> | -c <zapis>] <etykietka> [# <wiersz>]\n"
-". utwórz zapis scalenia używając pierwotnego komunikatu scalenia\n"
-". (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia.\n"
-". Użyj -c <zapis>, aby przeredagować komunikat zapisu.\n"
-"Kolejność wierszy może być zmieniona; są wykonywane z góry na dół.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Możesz teraz poprawić zapis przez\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Kiedy zadowolisz się swoimi zmianami, wykonaj\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: nie jest to zapis, który można dobrać"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nieprawidłowa nazwa zapisu: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Nie można wpisać zamiennego sha1 bieżącego zapisu"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Przewinięcie do $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Nie można przewinąć do $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Nie można przesunąć HEAD na $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Odmawiam spłaszczenia scalenia: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Błąd ponowienia scalenia $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Nie można dobrać $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "To jest komunikat zapisu nr ${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Komunikat zapisu nr ${n} zostanie pominięty:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "To jest połączenie $count zapisu."
-msgstr[1] "To jest połączenie $count zapisów."
-msgstr[2] "To jest połączenie $count zapisów."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Nie można zapisać $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "To jest połączenie dwóch zapisów."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Nie można zastosować $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Nie udało się poprawić zapisu po pomyślnym dobraniu $sha1... $rest\n"
-"Jest to najpewniej spowodowane pustym komunikatem zapisu, albo "
-"niepowodzeniem\n"
-"skryptu pre-commit. Jeśli to on zawiódł, być może trzeba naprawić ten "
-"problem zanim\n"
-"uda się przeredagować zapis."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Zatrzymano na $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Nie można użyć „$squash_style” bez poprzedniego zapisu"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Wykonywanie: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Wykonywanie nie powiodło się: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "i pozostały zmiany w indeksie i/lub drzewie roboczym"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Możesz naprawić problem i uruchomić\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Wykonanie powiodło się: $rest\n"
-"ale pozostały zmiany w indeksie i/lub drzewie roboczym.\n"
-"Złóż swoje zmiany lub dodaj do schowka, i wtedy wykonaj:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Nieznane polecenie: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Napraw to używając „git rebase --edit-todo”."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Pomyślnie przestawiono i zaktualizowano $head_name."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Nie można usunąć CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"W drzewie roboczym są przygotowane zmiany.\n"
-"Jeśli mają być one spłaszczone\n"
-"z poprzednim zapisem, wykonaj:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Jeśli mają się znaleźć w nowym zapisie, wykonaj:\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"W obu przypadkach po zakończeniu, kontynuuj przez:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Błąd podczas próby znalezienia tożsamości autora w poprawionym zapisie"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Masz niezłożone zmiany w drzewie roboczym. Najpierw je złóż\n"
-"i wtedy ponownie wykonaj „git rebase --continue”."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Nie udało się złożyć zmian ze schowka."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Nie można uruchomić edytora"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Nie można wybrać $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Brak HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Nie można utworzyć tymczasowego $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Nie można oznaczyć jako interaktywne"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Przestawianie $shortrevisions na $shortonto ($todocount polecenie)"
-msgstr[1] "Przestawianie $shortrevisions na $shortonto ($todocount polecenia)"
-msgstr[2] "Przestawianie $shortrevisions na $shortonto ($todocount poleceń)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Zważ, że puste zapisy są wykomentowane"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Nie można zainicjować przerobionych zapisów"
+msgstr "Nie można zejść do ścieżki podmodułu „$displaypath”"
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
@@ -25180,48 +25667,31 @@
#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "krytyczny błąd: nie można użyć $program_name bez drzewa roboczego."
+msgstr "błąd krytyczny: nie można użyć $program_name bez drzewa roboczego."
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Nie można przestawić: Masz nieprzygotowane zmiany."
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Nie można przerobić gałęzi: Masz nieprzygotowane zmiany."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Nie można zaciągnąć z przestawieniem: Masz nieprzygotowane zmiany."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "Nie można wykonać $action: Masz nieprzygotowane zmiany."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "Nie można przestawić: Twój indeks zawiera niezłożone zmiany."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Nie można zaciągnąć z przestawieniem: Twój indeks zawiera niezłożone zmiany."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "Nie można wykonać $action: Twój indeks zawiera niezłożone zmiany."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr "Dodatkowo, twój indeks zawiera niezłożone zmiany."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Musisz uruchomić to polecenie ze szczytu drzewa roboczego."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "Nie można określić bezwzględnej ścieżki katalogu gita"
@@ -25561,34 +26031,39 @@
msgid "invalid argument %s, expecting --"
msgstr "nieprawidłowy argument %s, oczekiwano --"
-#: git-send-email.perl:138
+#: git-send-email.perl:129
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "lokalna strefa różni się od GMT o odstęp niepodzielny przez minutę\n"
-#: git-send-email.perl:145 git-send-email.perl:151
+#: git-send-email.perl:136 git-send-email.perl:142
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "przesunięcie czasu lokalnego większe lub równe 24 godzin\n"
-#: git-send-email.perl:223 git-send-email.perl:229
+#: git-send-email.perl:214
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr "błąd krytyczny: polecenie „%s” zakończyło się z kodem wyjścia %d"
+
+#: git-send-email.perl:227
msgid "the editor exited uncleanly, aborting everything"
msgstr "edytor nie wyszedł gładko, przerywanie wszystkiego"
-#: git-send-email.perl:312
+#: git-send-email.perl:316
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "„%s” zawiera pośrednią wersję listu e-mail, który pisałeś/-aś.\n"
-#: git-send-email.perl:317
+#: git-send-email.perl:321
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "„%s.final” zawiera napisany list e-mail.\n"
-#: git-send-email.perl:410
+#: git-send-email.perl:450
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases i inne opcje się wykluczają\n"
-#: git-send-email.perl:484
+#: git-send-email.perl:525
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -25599,11 +26074,11 @@
"Ustaw sendemail.forbidSendmailVariables na false, aby wyłączyć to "
"sprawdzenie.\n"
-#: git-send-email.perl:489 git-send-email.perl:691
+#: git-send-email.perl:530 git-send-email.perl:746
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Nie można wykonać git format-patch poza repozytorium\n"
-#: git-send-email.perl:492
+#: git-send-email.perl:533
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -25611,37 +26086,37 @@
"„batch-size” i „relogin” muszą być podane razem (z wiersza poleceń lub opcji "
"konfiguracji)\n"
-#: git-send-email.perl:505
+#: git-send-email.perl:546
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Nieznane pole --suppress-cc: „%s”\n"
-#: git-send-email.perl:536
+#: git-send-email.perl:577
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Nieznane ustawienie --confirm: „%s”\n"
-#: git-send-email.perl:564
+#: git-send-email.perl:617
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "ostrzeżenie: skrót sendmaila z cudzysłowami niewspierany: %s\n"
-#: git-send-email.perl:566
+#: git-send-email.perl:619
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "ostrzeżenie: „:include:” niewspierane: %s\n"
-#: git-send-email.perl:568
+#: git-send-email.perl:621
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "ostrzeżenie: przekierowania „/plik” i „|potok” niewspierane: %s\n"
-#: git-send-email.perl:573
+#: git-send-email.perl:626
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "ostrzeżenie: nie rozpoznano wiersza sendmaila: %s\n"
-#: git-send-email.perl:657
+#: git-send-email.perl:711
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -25656,21 +26131,12 @@
" * mówiąc „./%s” jeśli masz na myśli plik; lub\n"
" * podając opcję --format-patch jeśli masz na myśli zakres.\n"
-#: git-send-email.perl:678
+#: git-send-email.perl:732
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Nie można wykonać opendir na %s: %s"
-#: git-send-email.perl:702
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"błąd krytyczny: %s: %s\n"
-"ostrzeżenie: nie wysłano żadnych łatek\n"
-
-#: git-send-email.perl:713
+#: git-send-email.perl:767
msgid ""
"\n"
"No patch files specified!\n"
@@ -25680,17 +26146,17 @@
"Nie podano plików łatek!\n"
"\n"
-#: git-send-email.perl:726
+#: git-send-email.perl:780
#, perl-format
msgid "No subject line in %s?"
msgstr "Brak wiersza tematu w %s?"
-#: git-send-email.perl:736
+#: git-send-email.perl:791
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Nie można otworzyć %s do zapisu: %s"
-#: git-send-email.perl:747
+#: git-send-email.perl:802
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -25704,27 +26170,27 @@
"\n"
"Wyczyść zawartość treści, jeśli chcesz wysłać podsumowanie.\n"
-#: git-send-email.perl:771
+#: git-send-email.perl:826
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Nie można otworzyć %s: %s"
-#: git-send-email.perl:788
+#: git-send-email.perl:843
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Nie można otworzyć %s.final: %s"
-#: git-send-email.perl:831
+#: git-send-email.perl:886
msgid "Summary email is empty, skipping it\n"
msgstr "Podsumowanie listu e-mail jest puste, pomijanie\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:866
+#: git-send-email.perl:935
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Czy na pewno użyć <%s> [y/N]? "
-#: git-send-email.perl:921
+#: git-send-email.perl:990
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -25732,11 +26198,11 @@
"Następujące pliki są ośmiobitowe, ale nie deklarują kodowania Content-"
"Transfer-Encoding.\n"
-#: git-send-email.perl:926
+#: git-send-email.perl:995
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Jakie ośmiobitowe kodowanie zadeklarować [UTF-8]? "
-#: git-send-email.perl:934
+#: git-send-email.perl:1003
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -25749,22 +26215,22 @@
"ma temat z szablonu „*** SUBJECT HERE ***”. Przekaż --force, jeśli naprawdę "
"chcesz to wysłać.\n"
-#: git-send-email.perl:953
+#: git-send-email.perl:1022
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Do kogo mają być wysłane listy e-mail (jeśli w ogóle)?"
-#: git-send-email.perl:971
+#: git-send-email.perl:1040
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "błąd krytyczny: skrót „%s” rozwija się do siebie samego\n"
-#: git-send-email.perl:983
+#: git-send-email.perl:1052
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID do użycia w In-Reply-To w pierwszym liście e-mail (jeśli w "
"ogóle)? "
-#: git-send-email.perl:1041 git-send-email.perl:1049
+#: git-send-email.perl:1114 git-send-email.perl:1122
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "błąd: nie można wydobyć prawidłowego adresu z: %s\n"
@@ -25772,16 +26238,16 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1053
+#: git-send-email.perl:1126
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Co zrobić z tym adresem? (wyjdź [q] | porzuć [d] | [e]dytuj): "
-#: git-send-email.perl:1370
+#: git-send-email.perl:1446
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "ścieżka CA „%s” nie istnieje"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1529
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -25808,135 +26274,773 @@
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1468
+#: git-send-email.perl:1544
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Wysłać ten list e-mail? (tak [y]|[n]ie|[e]dytuj|wyjdź [q]|wszystkie [a]):"
-#: git-send-email.perl:1471
+#: git-send-email.perl:1547
msgid "Send this email reply required"
msgstr "Wyślij ten list e-mail z wymaganą odpowiedzią"
-#: git-send-email.perl:1499
+#: git-send-email.perl:1581
msgid "The required SMTP server is not properly defined."
msgstr "Wymagany serwer SMTP nie jest prawidłowo zdefiniowany."
-#: git-send-email.perl:1546
+#: git-send-email.perl:1628
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Serwer nie wspiera STARTTLS! %s"
-#: git-send-email.perl:1551 git-send-email.perl:1555
+#: git-send-email.perl:1633 git-send-email.perl:1637
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "nie można wykonać STARTTLS! %s"
-#: git-send-email.perl:1564
+#: git-send-email.perl:1646
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Nie można prawidłowo zainicjować SMTP. Sprawdź konfigurację i użyj --smtp-"
"debug."
-#: git-send-email.perl:1582
+#: git-send-email.perl:1664
#, perl-format
msgid "Failed to send %s\n"
msgstr "Nie można wysłać %s\n"
-#: git-send-email.perl:1585
+#: git-send-email.perl:1667
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Wysłano na sucho %s\n"
-#: git-send-email.perl:1585
+#: git-send-email.perl:1667
#, perl-format
msgid "Sent %s\n"
msgstr "Wysłano %s\n"
-#: git-send-email.perl:1587
+#: git-send-email.perl:1669
msgid "Dry-OK. Log says:\n"
msgstr "OK na sucho. Dziennik mówi:\n"
-#: git-send-email.perl:1587
+#: git-send-email.perl:1669
msgid "OK. Log says:\n"
msgstr "OK. Dziennik mówi:\n"
-#: git-send-email.perl:1599
+#: git-send-email.perl:1688
msgid "Result: "
msgstr "Wynik:"
-#: git-send-email.perl:1602
+#: git-send-email.perl:1691
msgid "Result: OK\n"
msgstr "Wynik: OK\n"
-#: git-send-email.perl:1620
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "nie można otworzyć pliku %s"
-#: git-send-email.perl:1667 git-send-email.perl:1687
+#: git-send-email.perl:1756 git-send-email.perl:1776
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Dodawanie DW: %s z wiersza „%s”\n"
-#: git-send-email.perl:1673
+#: git-send-email.perl:1762
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Dodawanie Do: %s z wiersza „%s”\n"
-#: git-send-email.perl:1730
+#: git-send-email.perl:1819
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(nie mbox) Dodawanie DW: %s z wiersza „%s”\n"
-#: git-send-email.perl:1765
+#: git-send-email.perl:1854
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(treść) Dodawanie DW: %s z wiersza „%s”\n"
-#: git-send-email.perl:1876
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Nie można wykonać „%s”"
-#: git-send-email.perl:1883
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Dodawanie %s: %s z: „%s”\n"
-#: git-send-email.perl:1887
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) nie można zamknąć potoku do „%s”"
-#: git-send-email.perl:1917
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "nie można wysłać wiadomości jako siedmiobitowej"
-#: git-send-email.perl:1925
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "nieprawidłowe kodowanie przesyłu"
-#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028
+#: git-send-email.perl:2059
+#, perl-format
+msgid ""
+"fatal: %s: rejected by sendemail-validate hook\n"
+"%s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"błąd krytyczny: %s: odrzucone przez skrypt sendemail-validate\n"
+"%s\n"
+"ostrzeżenie: nie wysłano żadnych łatek\n"
+
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "nie można otworzyć %s: %s\n"
-#: git-send-email.perl:1969
+#: git-send-email.perl:2072
#, perl-format
-msgid "%s: patch contains a line longer than 998 characters"
-msgstr "%s: łatka zawiera wiersz dłuższy niż 998 znaków"
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"błąd krytyczny: %s:%d ma więcej niż 998 znaków\n"
+"ostrzeżenie: nie wysłano żadnych łatek\n"
-#: git-send-email.perl:1986
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Pomijanie %s z zapasowym sufiksem „%s”.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1990
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Czy na pewno wysłać %s? [y | N]: "
+#, c-format
+#~ msgid ""
+#~ "The following pathspecs didn't match any eligible path, but they do match "
+#~ "index\n"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "Następujące ścieżki nie pasują do żadnej nadającej się ścieżki, ale "
+#~ "pasują do elementów\n"
+#~ "indeksu spoza bieżącego rzadkiego wybrania:\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr ""
+#~ "Wyłącz lub zmień zasady rzadkości jeśli zamierzasz zmieniać takie "
+#~ "elementy."
+
+#, c-format
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "nie można ustawić GIT_DIR na „%s”"
+
+#, c-format
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "nie można rozpakować nagłówka %s z --allow-unknown-type"
+
+#, c-format
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "nie można przetworzyć nagłówka %s z --allow-unknown-type"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "otwarcie /dev/null nie powiodło się"
+
+#~ msgid ""
+#~ "after resolving the conflicts, mark the corrected paths\n"
+#~ "with 'git add <paths>' or 'git rm <paths>'\n"
+#~ "and commit the result with 'git commit'"
+#~ msgstr ""
+#~ "po rozwiązaniu konfliktów oznacz poprawione ścieżki\n"
+#~ "z „git add <ścieżki>” lub „git rm <ścieżki>”\n"
+#~ "i złóż wynik za pomocą „git commit”"
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "otwarcie /dev/null lub dup() nie powiodło się"
+
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "próba użycia rzadkiego indeksu bez trybu stożka"
+
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "nie można zaktualizować drzewa pamięci podręcznej, pozostaje pełne"
+
+#, c-format
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "Nie można otworzyć „%s” do zapisywania."
+
+#, c-format
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "nie można utworzyć pliku archiwum „%s”"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-next-check <dobre_określenie> "
+#~ "<złe_określenie> [<określenie>]"
+
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check wymaga 2 albo 3 argumentów"
+
+#, c-format
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "nie można utworzyć nowego pliku w „%s”"
+
+#, c-format
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree: nie można otworzyć „%s”"
+
+#, c-format
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "nie można otworzyć pliku paczki „%s”"
+
+#~ msgid "cannot store pack file"
+#~ msgstr "nie można zapisać pliku paczki"
+
+#~ msgid "cannot store index file"
+#~ msgstr "nie można zapisać pliku indeksu"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "wzorce wyłączające czytane są z <pliku>"
+
+#, c-format
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "Nieznana opcja merge-recursive: -X%s"
+
+#, c-format
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "lista zadań do zrobienia się nie nadaje: „%s”"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<opcje>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "przestawiaj zapisy scaleń"
+
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "zachowaj pierwotne rozgałęzienia kuzynów"
+
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "przenieś zapisy, które zaczynają się od squash!/fixup!"
+
+#~ msgid "sign commits"
+#~ msgstr "podpisuj zapisy"
+
+#~ msgid "continue rebase"
+#~ msgstr "kontynuuj przestawianie"
+
+#~ msgid "skip commit"
+#~ msgstr "pomiń zapis"
+
+#~ msgid "edit the todo list"
+#~ msgstr "edytuj listę zadań do zrobienia"
+
+#~ msgid "show the current patch"
+#~ msgstr "pokaż bieżącą łatkę"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "skróć identyfikatory zapisów na liście zadań do zrobienia"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "rozwiń identyfikatory zapisów na liście zadań do zrobienia"
+
+#~ msgid "check the todo list"
+#~ msgstr "sprawdź listę zadań do zrobienia"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "zmień kolejność wierszy fixup/squash"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "wstaw polecenia exec na listę zadań do zrobienia"
+
+#~ msgid "onto"
+#~ msgstr "na"
+
+#~ msgid "restrict-revision"
+#~ msgstr "ogranicz-rewizję"
+
+#~ msgid "restrict revision"
+#~ msgstr "ogranicz rewizję"
+
+#~ msgid "squash-onto"
+#~ msgstr "spłaszcz-na"
+
+#~ msgid "squash onto"
+#~ msgstr "spłaszcz na"
+
+#~ msgid "the upstream commit"
+#~ msgstr "zapis głównego nurtu"
+
+#~ msgid "head-name"
+#~ msgstr "nazwa-czoła"
+
+#~ msgid "head name"
+#~ msgstr "nazwa czoła"
+
+#~ msgid "rebase strategy"
+#~ msgstr "strategia przestawiania"
+
+#~ msgid "strategy-opts"
+#~ msgstr "opcje-strategii"
+
+#~ msgid "strategy options"
+#~ msgstr "opcje strategii"
+
+#~ msgid "switch-to"
+#~ msgstr "przełącz-na"
+
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "gałąź lub zapis do wybrania"
+
+#~ msgid "onto-name"
+#~ msgstr "nazwa-na"
+
+#~ msgid "onto name"
+#~ msgstr "nazwa rewizji „na”"
+
+#~ msgid "cmd"
+#~ msgstr "polecenie"
+
+#~ msgid "the command to run"
+#~ msgstr "polecenie do wykonania"
+
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "--[no-]rebase-cousins nic nie robi bez --rebase-merges"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "„--preserve-merges” i „--rebase-merges” się wykluczają"
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "błąd: „--preserve-merges” i „--reschedule-failed-exec” się wykluczają"
+
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr ""
+#~ "git submodule--helper add-clone [<opcje>...] --url <url> --path <ścieżka> "
+#~ "--name <nazwa>"
+
+#, c-format
+#~ msgid "failed to create file %s"
+#~ msgstr "nie można utworzyć pliku %s"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "wyjdź natychmiast po początkowym ogłoszeniu referencji"
+
+#, c-format
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "gniazdo/potok już w użyciu: „%s”"
+
+#, c-format
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "nie można włączyć serwera na: „%s”"
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "nie można uruchomić demona w tle"
+
+#~ msgid "waitpid failed"
+#~ msgstr "waitpid nie powiodło się"
+
+#~ msgid "daemon not online yet"
+#~ msgstr "demon jeszcze nie odpowiada"
+
+#~ msgid "daemon failed to start"
+#~ msgstr "demon się nie włączył"
+
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid jest w szoku"
+
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "demon jeszcze się nie wyłączył"
+
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "Ograniczenia protokołów niewspierane z cURLem < 7.19.4"
+
+#, sh-format
+#~ msgid "running $command"
+#~ msgstr "wykonywanie $command"
+
+#, sh-format
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "„$sm_path” nie ma wybranego zapisu"
+
+#, sh-format
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "Ścieżka podmodułu „$displaypath”: „$command $sha1”"
+
+#~ msgid "Applied autostash."
+#~ msgstr "Zastosowano zmiany z automatycznego schowka."
+
+#, sh-format
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "Nie można zachować $stash_sha1"
+
+#~ msgid ""
+#~ "Applying autostash resulted in conflicts.\n"
+#~ "Your changes are safe in the stash.\n"
+#~ "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+#~ msgstr ""
+#~ "Stosowanie zmian z automatycznej skrytki spowodowało konflikty.\n"
+#~ "Twoje zmiany są bezpieczne w schowku.\n"
+#~ "Możesz w każdej chwili wykonać „git stash pop” lub „git stash drop”.\n"
+
+#, sh-format
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "Przestawianie ($new_count/$total)"
+
+#~ msgid ""
+#~ "\n"
+#~ "Commands:\n"
+#~ "p, pick <commit> = use commit\n"
+#~ "r, reword <commit> = use commit, but edit the commit message\n"
+#~ "e, edit <commit> = use commit, but stop for amending\n"
+#~ "s, squash <commit> = use commit, but meld into previous commit\n"
+#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
+#~ "message\n"
+#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
+#~ "d, drop <commit> = remove commit\n"
+#~ "l, label <label> = label current HEAD with a name\n"
+#~ "t, reset <label> = reset HEAD to a label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". create a merge commit using the original merge commit's\n"
+#~ ". message (or the oneline, if no original merge commit was\n"
+#~ ". specified). Use -c <commit> to reword the commit message.\n"
+#~ "\n"
+#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Polecenia:\n"
+#~ "p, pick <zapis> = dobierz zapis\n"
+#~ "r, reword <zapis> = użyj zapisu, ale przeredaguj jego komunikat\n"
+#~ "e, edit <zapis> = użyj zapisu, ale zatrzymaj się, żeby go poprawić\n"
+#~ "s, squash <zapis> = użyj zapisu, ale połącz go z poprzednim (spłaszcz)\n"
+#~ "f, fixup <zapis> = jak „squash”, ale odrzuć komunikat tego zapisu\n"
+#~ "x, exec <polecenie> = wykonaj polecenie (resztę wiersza) w powłoce\n"
+#~ "d, drop <zapis> = usuń zapis\n"
+#~ "l, label <etykietka> = nazwij bieżące HEAD\n"
+#~ "t, reset <etykietka> = zresetuj HEAD do etykietki\n"
+#~ "m, merge [-C <zapis> | -c <zapis>] <etykietka> [# <wiersz>]\n"
+#~ ". utwórz zapis scalenia używając pierwotnego komunikatu scalenia\n"
+#~ ". (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia.\n"
+#~ ". Użyj -c <zapis>, aby przeredagować komunikat zapisu.\n"
+#~ "Kolejność wierszy może być zmieniona; są wykonywane z góry na dół.\n"
+
+#, sh-format
+#~ msgid ""
+#~ "You can amend the commit now, with\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Once you are satisfied with your changes, run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Możesz teraz poprawić zapis przez\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Kiedy zadowolisz się swoimi zmianami, wykonaj\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1: nie jest to zapis, który można dobrać"
+
+#, sh-format
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "Nieprawidłowa nazwa zapisu: $sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "Nie można wpisać zamiennego sha1 bieżącego zapisu"
+
+#, sh-format
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "Przewinięcie do $sha1"
+
+#, sh-format
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "Nie można przewinąć do $sha1"
+
+#, sh-format
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "Nie można przesunąć HEAD na $first_parent"
+
+#, sh-format
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "Odmawiam spłaszczenia scalenia: $sha1"
+
+#, sh-format
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "Błąd ponowienia scalenia $sha1"
+
+#, sh-format
+#~ msgid "Could not pick $sha1"
+#~ msgstr "Nie można dobrać $sha1"
+
+#, sh-format
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "To jest komunikat zapisu nr ${n}:"
+
+#, sh-format
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "Komunikat zapisu nr ${n} zostanie pominięty:"
+
+#, sh-format
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "To jest połączenie $count zapisu."
+#~ msgstr[1] "To jest połączenie $count zapisów."
+#~ msgstr[2] "To jest połączenie $count zapisów."
+
+#, sh-format
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "Nie można zapisać $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "To jest połączenie dwóch zapisów."
+
+#, sh-format
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "Nie można zastosować $sha1... $rest"
+
+#, sh-format
+#~ msgid ""
+#~ "Could not amend commit after successfully picking $sha1... $rest\n"
+#~ "This is most likely due to an empty commit message, or the pre-commit "
+#~ "hook\n"
+#~ "failed. If the pre-commit hook failed, you may need to resolve the issue "
+#~ "before\n"
+#~ "you are able to reword the commit."
+#~ msgstr ""
+#~ "Nie udało się poprawić zapisu po pomyślnym dobraniu $sha1... $rest\n"
+#~ "Jest to najpewniej spowodowane pustym komunikatem zapisu, albo "
+#~ "niepowodzeniem\n"
+#~ "skryptu pre-commit. Jeśli to on zawiódł, być może trzeba naprawić ten "
+#~ "problem zanim\n"
+#~ "uda się przeredagować zapis."
+
+#, sh-format
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "Zatrzymano na $sha1_abbrev... $rest"
+
+#, sh-format
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "Nie można użyć „$squash_style” bez poprzedniego zapisu"
+
+#, sh-format
+#~ msgid "Executing: $rest"
+#~ msgstr "Wykonywanie: $rest"
+
+#, sh-format
+#~ msgid "Execution failed: $rest"
+#~ msgstr "Wykonywanie nie powiodło się: $rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "i pozostały zmiany w indeksie i/lub drzewie roboczym"
+
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Możesz naprawić problem i uruchomić\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid ""
+#~ "Execution succeeded: $rest\n"
+#~ "but left changes to the index and/or the working tree\n"
+#~ "Commit or stash your changes, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Wykonanie powiodło się: $rest\n"
+#~ "ale pozostały zmiany w indeksie i/lub drzewie roboczym.\n"
+#~ "Złóż swoje zmiany lub dodaj do schowka, i wtedy wykonaj:\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "Nieznane polecenie: $command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "Napraw to używając „git rebase --edit-todo”."
+
+#, sh-format
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "Pomyślnie przestawiono i zaktualizowano $head_name."
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "Nie można usunąć CHERRY_PICK_HEAD"
+
+#, sh-format
+#~ msgid ""
+#~ "You have staged changes in your working tree.\n"
+#~ "If these changes are meant to be\n"
+#~ "squashed into the previous commit, run:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "If they are meant to go into a new commit, run:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "In both cases, once you're done, continue with:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+#~ msgstr ""
+#~ "W drzewie roboczym są przygotowane zmiany.\n"
+#~ "Jeśli mają być one spłaszczone\n"
+#~ "z poprzednim zapisem, wykonaj:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Jeśli mają się znaleźć w nowym zapisie, wykonaj:\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "W obu przypadkach po zakończeniu, kontynuuj przez:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr ""
+#~ "Błąd podczas próby znalezienia tożsamości autora w poprawionym zapisie"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "Masz niezłożone zmiany w drzewie roboczym. Najpierw je złóż\n"
+#~ "i wtedy ponownie wykonaj „git rebase --continue”."
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "Nie udało się złożyć zmian ze schowka."
+
+#~ msgid "Could not execute editor"
+#~ msgstr "Nie można uruchomić edytora"
+
+#, sh-format
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "Nie można wybrać $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "Brak HEAD?"
+
+#, sh-format
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "Nie można utworzyć tymczasowego $state_dir"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "Nie można oznaczyć jako interaktywne"
+
+#, sh-format
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] ""
+#~ "Przestawianie $shortrevisions na $shortonto ($todocount polecenie)"
+#~ msgstr[1] ""
+#~ "Przestawianie $shortrevisions na $shortonto ($todocount polecenia)"
+#~ msgstr[2] "Przestawianie $shortrevisions na $shortonto ($todocount poleceń)"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "Zważ, że puste zapisy są wykomentowane"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "Nie można zainicjować przerobionych zapisów"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr "Nie można przestawić: Masz nieprzygotowane zmiany."
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr "Nie można zaciągnąć z przestawieniem: Masz nieprzygotowane zmiany."
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr "Nie można przestawić: Twój indeks zawiera niezłożone zmiany."
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "Nie można zaciągnąć z przestawieniem: Twój indeks zawiera niezłożone "
+#~ "zmiany."
+
+#~ msgid "--cached and --3way cannot be used together."
+#~ msgstr "--cached i --3way wykluczają się."
+
+#~ msgid "repository contains replace objects; skipping commit-graph"
+#~ msgstr "repozytorium zawiera obiekty zamienne; pomijanie grafu zapisów"
+
+#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
+#~ msgstr ""
+#~ "repozytorium zawiera (przestarzałe) szczepki; pomijanie grafu zapisów"
+
+#~ msgid "repository is shallow; skipping commit-graph"
+#~ msgstr "źródłowe repozytorium jest płytkie, pomijanie grafu zapisów"
+
+#, c-format
+#~ msgid "commit-graph improper chunk offset %08x%08x"
+#~ msgstr "nieprawidłowe przesunięcie kawałka grafu zapisów %08x%08x"
+
+#, c-format
+#~ msgid "commit-graph chunk id %08x appears multiple times"
+#~ msgstr "identyfikator kawałka grafu zapisów %08x pojawia się wiele razy"
+
+#~ msgid "both"
+#~ msgstr "obu"
+
+#~ msgid "one"
+#~ msgstr "jednej"
+
+#, c-format
+#~ msgid "Already up to date!"
+#~ msgstr "Już aktualne!"
+
+#~ msgid "invalid chunk offset (too large)"
+#~ msgstr "nieprawidłowe przesunięcie kawałka (za duże)"
+
+#~ msgid "Writing chunks to multi-pack-index"
+#~ msgstr "Zapisywanie kawałków do indeksu wielu paczek"
+
+#~ msgid "unable to write stateless separator packet"
+#~ msgstr "nie można zapisać bezstanowego pakietu separatora"
+
+#~ msgid "git merge --abort"
+#~ msgstr "git merge --abort"
+
+#~ msgid "git merge --continue"
+#~ msgstr "git merge --continue"
+
+#~ msgid "Already up to date. Yeeah!"
+#~ msgstr "Już aktualne. Hurra!"
+
+#~ msgid "--batch-size option is only for 'repack' subcommand"
+#~ msgstr "opcja --batch-size jest tylko do pod-polecenia „repack”"
+
+#~ msgid "Percentage by which creation is weighted"
+#~ msgstr "Procent, według jakiego ważone jest tworzenie"
+
+#~ msgid ""
+#~ "the rebase.useBuiltin support has been removed!\n"
+#~ "See its entry in 'git help config' for details."
+#~ msgstr ""
+#~ "wsparcie rebase.useBuiltin zostało usunięte!\n"
+#~ "Zobacz szczegóły pod jego opisem w „git help config”."
+
+#~ msgid "git stash clear"
+#~ msgstr "git stash clear"
+
+#~ msgid "remote server sent stateless separator"
+#~ msgstr "zdalna maszyna wysłała bezstanowy separator"
+
+#, perl-format
+#~ msgid "%s: patch contains a line longer than 998 characters"
+#~ msgstr "%s: łatka zawiera wiersz dłuższy niż 998 znaków"
+
#~ msgid "rev-list died"
#~ msgstr "rev-list padło"
@@ -25999,7 +27103,7 @@
#~ msgstr "zbyt mało argumentów"
#~ msgid "Recurse into nested submodules"
-#~ msgstr "Schodź do zagnieżdżonych pod-modułów"
+#~ msgstr "Schodź do zagnieżdżonych podmodułów"
#~ msgid "too many params"
#~ msgstr "zbyt wiele parametrów"
@@ -26153,13 +27257,13 @@
#~ "the following submodules (or one of their nested submodules)\n"
#~ "use a .git directory:"
#~ msgstr[0] ""
-#~ "następujący pod-moduł (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "następujący podmoduł (lub jeden z jego zagnieżdżonych podmodułów)\n"
#~ "używa katalogu .git:"
#~ msgstr[1] ""
-#~ "następujące pod-moduły (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "następujące podmoduły (lub jeden z jego zagnieżdżonych podmodułów)\n"
#~ "używają katalogu .git:"
#~ msgstr[2] ""
-#~ "następujące pod-moduły (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "następujące podmoduły (lub jeden z jego zagnieżdżonych podmodułów)\n"
#~ "używają katalogu .git:"
#~ msgid "push|fetch"
@@ -26171,9 +27275,6 @@
#~ msgid "print only names (no SHA-1)"
#~ msgstr "wypisz same nazwy (bez SHA-1)"
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<opcje>] <komunikat> HEAD <zapis>"
-
#~ msgid "standard output, or directory, which one?"
#~ msgstr "standardowe wyjście, lub katalog — które?"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index b09f162..3214253 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,11 +1,14 @@
# Portugal's Portuguese translations for Git package.
-# Copyright (C) 2021 Daniel Santos <hello@brighterdan.com>
+# Copyright (C) 2020-2022 Daniel Santos <dacs.git@brilhante.top>
+# Copyright (C) 2016-2017 Vasco Almeida <vascomalmeida@sapo.pt>
+# Copyright (C) 2012 Marco Sousa <marcomsousa AT gmail.com>
# This file is distributed under the same license as the Git package.
# Contributors:
-# - Daniel Santos <hello@brighterdan.com>
+# - Daniel Santos <dacs.git@brilhante.top>
+#
# Past Contributors:
# - Marco Sousa <marcomsousa AT gmail.com>
-# - Vasco Almeida <vascomalmeida@sapo.pt>, 2016, 2017.
+# - Vasco Almeida <vascomalmeida@sapo.pt>
#
# Git glossary for Portuguese translators
#
@@ -13,23 +16,23 @@
# ---------------------------------+--------------------------------------
# 3-way merge | tri-junção
# abbreviate | abreviar
-# alternate object database | base dados de objetos alternativa
+# alternate object database | base dados de objetos alternativos
# amend | emendar
-# ancestor | antepassado
+# ancestor | antecessor
# annotated tag | etiqueta anotada
# archive | arquivo
# backing store | armazenamento-backup
# backward compatibility | retrocompatibilidade
-# bare repository | repositório nú
-# bisect | bisetar
-# blame | blame
+# bare repository | repositório nu
+# bisect | bisseção
+# blame | culpar
# blob object | objeto-blob
-# branch | ramo
+# branch | ramo
# bug | bug
-# bundle | conjunto
-# bypass | desviar
+# bundle | arquivo-pacote
+# bypass | contornar
# cache | cenário
-# chain | corrente
+# chain | série
# changeset | memória
# checkout | observar
# checksum | checksum
@@ -38,15 +41,15 @@
# clean | limpa
# clone | clone
# commit | memorizar
+# commit-graph | grafo-memória
# commit message | mensagem de memória
# commit object | objeto de memória
-# commit-ish (also committish) | mnemónica
+# commit-ish | mnemónica
# committer | memorizador
# conflict | conflito
-# core Git | núcleo-Git
# cover letter | carta de apresentação
# DAG | DAG
-# dangling object | objeto perdido
+# dangling object | objeto suspenso
# detached HEAD | HEAD desanexada
# directory | pasta
# dirty | suja
@@ -54,10 +57,11 @@
# fanout | fanout
# fast-forward | avanço
# fetch | buscar
-# file system | sistema de ficheiro
+# file system | sistema de ficheiros
# fixup | consertar
-# fork | ramificar
+# fork | forqueadura
# Git archive | repositório
+# gitdir | pasta-git
# gitfile | ficheiro-git
# grafts | enxertos
# hash | hash
@@ -69,12 +73,15 @@
# index | cenário
# index entry | entrada do cenário
# init | inicializar
+# label | rótulo
# loose object | objeto solto
# loose refs | refs soltas
# mark | marca
# master | master
-# merge | junção
+# merge | junção
# mergetag | etiqueta-junção
+# mirror repository | repositório-espelho
+# multi-pack | multi-pacote
# object | objeto
# object database | base dados de objeto
# object name | nome de objeto
@@ -98,7 +105,7 @@
# pull | agarrar
# push | atirar
# range | intervalo
-# reachable | acessível
+# reachable | alcançável
# rebase | rebasear
# record | registo
# ref | ref
@@ -108,15 +115,17 @@
# remote-tracking branch | ramo remoto de monitorização
# replace object | objeto-substituto
# replace ref | ref-substituto
-# replay | replay
+# replay | refazer
# repo | repo
# repository | repositório
# reset | restabelecer
# resolve | resolver
+# restore | restaurar
# revert | reverter
# revision | revisão
# rewind | rebobinar
# root commit | memória-raiz
+# scheduler | agendador
# SCM | SCM
# SHA-1 | SHA-1
# shallow repository | repositório superficial
@@ -142,9 +151,10 @@
# tree | árvore
# tree object | objeto-árvore
# tree-ish (also treeish) | arvoredo
+# unbundle | desarquivar
# unmerged | por juntar
# unpack | desempacotar
-# unreachable object | objeto inacessível
+# unreachable object | objeto inalcançável
# unstage | desencenar
# upstream | upstream
# upstream branch | ramo-upstream
@@ -158,12 +168,13 @@
#
# English | Portuguese
# ---------------------------------+--------------------------------------
-# apply | submeter
+# apply | aplicar
# ahead | à frente
+# bad | inválido
+# batch | (em) lote
# bind | vincular
# broken | quebrado
# call | chamar
-# chain | série
# change | alteração
# clobber | encobrir
# config file | ficheiro config
@@ -173,15 +184,15 @@
# debug | depurar
# default | predefinido
# deflate | esvaziar
-# delete | apagar
+# delete | eliminar
# deprecated | obsoleto
-# dry-run | dry-run
+# dry-run | simulação
# edit | modificação
# embedded | embutido
# feature | feição
# fix | corrigir
# given | fornecido
-# handle | pega
+# handle | lidar
# in progress | em curso
# inflate | insuflar
# named | denominado
@@ -189,12 +200,17 @@
# not supported | insustentado
# mainline | principal
# mismatch | sem correspondência
+# offset | deslocamento
# overflow | transbordo
+# overwrite | sobrescrever
# parse | processar
# path | caminho
+# print | mostrar
+# recurse | recursar
# register | registar
# regular expression | expressão comum
# repack | reempacotar
+# require | exige
# save | guardar
# set | definir
# shell | shell
@@ -207,278 +223,270 @@
# template | modelo
# timestamp | carimbo cronológico
# token | token
-# unset | desdefinir
+# unset | indefinir
# untrack | desmonitorizar
-#
+# usage: | uso:
+# whitespace | espaço-em-branco
+#
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
+"POT-Creation-Date: 2022-04-13 14:52+0800\n"
"PO-Revision-Date: 2020-10-14 11:43+0100\n"
-"Last-Translator: Daniel Santos <hello@brighterdan.com>\n"
-"Language-Team: Git L10N Português <https://github.com/git-l10n-pt-PT/>\n"
+"Last-Translator: Daniel Santos <dacs.git@brilhante.top>\n"
+"Language-Team: Git L10N Português <https://codeberg.org/git-pt/Git-PO-pt_PT/"
+">\n"
"Language: pt-PT\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: add-interactive.c:376
-#, fuzzy, c-format
+#: add-interactive.c:382
+#, c-format
msgid "Huh (%s)?"
msgstr "O quê (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
+#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
+#: builtin/rebase.c:1671
msgid "could not read index"
-msgstr "incapaz de ler index"
+msgstr "incapaz de ler cenário"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:590 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binário"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:648 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "nada"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:649 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "inalterado"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:686 git-add--interactive.perl:641
msgid "Update"
msgstr "Atualizar"
-#: add-interactive.c:697 add-interactive.c:885
-#, fuzzy, c-format
+#: add-interactive.c:703 add-interactive.c:891
+#, c-format
msgid "could not stage '%s'"
-msgstr "incapaz de stage '%s'"
+msgstr "incapaz de encenar '%s'"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
-#, fuzzy
+#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
msgid "could not write index"
-msgstr "incapaz de escrever index"
+msgstr "incapaz de escrever cenário"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:712 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "actualizou %d path\n"
msgstr[1] "actualizou %d paths\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:730 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
-msgstr "nota: %s agora está por seguir.\n"
+msgstr "nota: %s ficou desmonitorizado.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry falhou para path '%s'"
+msgstr "make_cache_entry falhou para caminho '%s'"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:765 git-add--interactive.perl:653
msgid "Revert"
msgstr "Reverter"
-#: add-interactive.c:775
-#, fuzzy
+#: add-interactive.c:781
msgid "Could not parse HEAD^{tree}"
msgstr "Incapaz de parse HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:819 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "reverti %d path\n"
msgstr[1] "reverti %d paths\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:870 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
-msgstr "Nenhuns ficheiros untracked.\n"
+msgstr "Nenhuns ficheiros desmonitorizados.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:874 git-add--interactive.perl:687
msgid "Add untracked"
-msgstr "Adiciona untracked"
+msgstr "Adicionar desmonitorizados"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:901 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "adicionei %d path\n"
msgstr[1] "adicionei %d paths\n"
-#: add-interactive.c:925
-#, fuzzy, c-format
+#: add-interactive.c:931
+#, c-format
msgid "ignoring unmerged: %s"
msgstr "ignorando unmerged: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
-msgstr "Apenas ficheiros binários mudaram.\n"
+msgstr "Apenas alterados ficheiros binários.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
-msgstr "Sem modificação.\n"
+msgstr "Sem alterações.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:949 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Atualizar patch"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:988 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Rever diff"
-#: add-interactive.c:1010
-#, fuzzy
-msgid "show paths with changes"
-msgstr "mostrar paths modificados"
-
-#: add-interactive.c:1012
-msgid "add working tree state to the staged set of changes"
-msgstr "adicionar estado de working tree para conjunto das modificações staged"
-
-#: add-interactive.c:1014
-msgid "revert staged set of changes back to the HEAD version"
-msgstr "reverter conjunto das modificações staged de volta para a versão HEAD"
-
#: add-interactive.c:1016
-#, fuzzy
+msgid "show paths with changes"
+msgstr "mostrar caminhos modificados"
+
+#: add-interactive.c:1018
+msgid "add working tree state to the staged set of changes"
+msgstr ""
+"adicionar estado de árvore-trabalho para conjunto de modificações encenadas"
+
+#: add-interactive.c:1020
+msgid "revert staged set of changes back to the HEAD version"
+msgstr ""
+"reverter conjunto de modificações encenadas de volta para a versão HEAD"
+
+#: add-interactive.c:1022
msgid "pick hunks and update selectively"
msgstr "apanha os pedaços e atualiza seletivamente"
-#: add-interactive.c:1018
-#, fuzzy
+#: add-interactive.c:1024
msgid "view diff between HEAD and index"
-msgstr "ver diff entre HEAD e índex"
+msgstr "ver diff entre HEAD e cenário"
-#: add-interactive.c:1020
+#: add-interactive.c:1026
msgid "add contents of untracked files to the staged set of changes"
msgstr ""
-"adiciona conteúdo de ficheiros untracked para conjunto das modificações "
-"staged"
+"adicionar conteúdo de ficheiros desmonitorizados para conjunto de "
+"modificações encenadas"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1034 add-interactive.c:1083
msgid "Prompt help:"
msgstr "Prompt ajuda:"
-#: add-interactive.c:1030
-#, fuzzy
+#: add-interactive.c:1036
msgid "select a single item"
msgstr "seleciona um único item"
-#: add-interactive.c:1032
-#, fuzzy
+#: add-interactive.c:1038
msgid "select a range of items"
msgstr "seleciona um conjunto de items"
-#: add-interactive.c:1034
-#, fuzzy
+#: add-interactive.c:1040
msgid "select multiple ranges"
msgstr "seleciona múltiplos conjuntos"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1042 add-interactive.c:1087
msgid "select item based on unique prefix"
msgstr "seleciona item tendo base o prefixo único"
-#: add-interactive.c:1038
-#, fuzzy
+#: add-interactive.c:1044
msgid "unselect specified items"
msgstr "tira a seleção de items especificados"
-#: add-interactive.c:1040
+#: add-interactive.c:1046
msgid "choose all items"
msgstr "escolhe todos items"
-#: add-interactive.c:1042
+#: add-interactive.c:1048
msgid "(empty) finish selecting"
msgstr "(vazio) acaba de selecionar"
-#: add-interactive.c:1079
+#: add-interactive.c:1085
msgid "select a numbered item"
msgstr "seleciona item numerado"
-#: add-interactive.c:1083
+#: add-interactive.c:1089
msgid "(empty) select nothing"
msgstr "(vazio) seleciona nada"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** Comandos ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "E agora"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "staged"
-msgstr "staged"
+msgstr "encenado"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "unstaged"
-msgstr "unstaged"
+msgstr "desencenado"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
+#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
+#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
+#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
#: git-add--interactive.perl:213
msgid "path"
-msgstr "path"
+msgstr "caminho"
-#: add-interactive.c:1151
-#, fuzzy
+#: add-interactive.c:1157
msgid "could not refresh index"
-msgstr "incapaz de reactualizar o index"
+msgstr "incapaz de refrescar cenário"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Adeus.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
-#, fuzzy, c-format, perl-format
+#: add-patch.c:34 git-add--interactive.perl:1433
+#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Stage modo de modificação [y,n,q,a,d%s,?]? "
+msgstr "Modifica modo à encenação [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
-#, fuzzy, c-format, perl-format
+#: add-patch.c:35 git-add--interactive.perl:1434
+#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Eliminação stage [y,n,q,a,d%s,?]? "
+msgstr "Elimina à encenação [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
-#, fuzzy, c-format, perl-format
+#: add-patch.c:36 git-add--interactive.perl:1435
+#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
-msgstr "Adição stage [y,n,q,a,d%s,?]? "
+msgstr "Adiciona à encenação [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
-#, fuzzy, c-format, perl-format
+#: add-patch.c:37 git-add--interactive.perl:1436
+#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Stage este pedaço [y,n,q,a,d%s,?]? "
+msgstr "Encena este pedaço [y,n,q,a,d%s,?]? "
#: add-patch.c:39
-#, fuzzy
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr ""
-"Se o patch submete-se corretamente, o pedaço editado será marcado para stage "
-"imediatamente."
+"Se o remendo aplica-se corretamente, o pedaço editado será marcado para "
+"encenação imediatamente."
#: add-patch.c:42
-#, fuzzy
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -486,43 +494,42 @@
"a - stage this hunk and all later hunks in the file\n"
"d - do not stage this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - stage este pedaço\n"
-"n - o stage deste pedaço será retirado\n"
-"q - sair; retirar de stage este pedaço e qualquer um dos que permaneçam\n"
-"a - stage este pedaço e qualquer próximo pedaço neste ficheiro\n"
-"d - retirar o stage deste pedaço e qualquer próximo pedaço neste ficheiro\n"
+"y - encenar este pedaço\n"
+"n - deixar por encenar este pedaço\n"
+"q - sair; deixar por encenar este pedaço ou qualquer um dos que permaneçam\n"
+"a - encenar este pedaço e qualquer próximo pedaço neste ficheiro\n"
+"d - deixar por encenar este pedaço ou qualquer próximo pedaço neste "
+"ficheiro\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
-#, fuzzy, c-format, perl-format
+#: add-patch.c:56 git-add--interactive.perl:1439
+#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Esconder modo de modificação [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
-#, fuzzy, c-format, perl-format
+#: add-patch.c:57 git-add--interactive.perl:1440
+#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Eliminação da arrumação [y,n,q,a,d%s,?]? "
+msgstr "Eliminação de esconderijo [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
-#, fuzzy, c-format, perl-format
+#: add-patch.c:58 git-add--interactive.perl:1441
+#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
-msgstr "Adição da arrumação [y,n,q,a,d%s,?]? "
+msgstr "Adição da esconderijo [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
-#, fuzzy, c-format, perl-format
+#: add-patch.c:59 git-add--interactive.perl:1442
+#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Esconde este pedaço [y,n,q,a,d%s,?]? "
#: add-patch.c:61
-#, fuzzy
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr ""
-"Se o patch submete-se corretamente, o pedaço editado será marcado para "
-"arrumação imediatamente."
+"Se o remendo aplica-se corretamente, o pedaço editado será marcado para "
+"esconder-se imediatamente."
#: add-patch.c:64
-#, fuzzy
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -530,43 +537,42 @@
"a - stash this hunk and all later hunks in the file\n"
"d - do not stash this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - arrumar este pedaço\n"
-"n - mostrar este pedaço\n"
-"q - sair; mostrar este pedaço e qualquer outro restante\n"
-"a - arrumar este pedaço e qualquer próximo deste ficheiro\n"
-"d - mostrar este pedaço e qualquer próximo deste ficheiro\n"
+"y - esconder este pedaço\n"
+"n - deixar por esconder este pedaço\n"
+"q - sair; deixar por esconder este pedaço ou qualquer um dos que permaneçama "
+"- esconder este pedaço e todos próximos pedaços deste ficheiro\n"
+"d - deixar por esconder este pedaço ou qualquer próximo pedaço deste "
+"ficheiro\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
-#, fuzzy, c-format, perl-format
+#: add-patch.c:80 git-add--interactive.perl:1445
+#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Unstage modo de modificação [y,n,q,a,d%s,?]? "
+msgstr "Modifica modo à desencenação [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
-#, fuzzy, c-format, perl-format
+#: add-patch.c:81 git-add--interactive.perl:1446
+#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Eliminação do unstage [y,n,q,a,d%s,?]? "
+msgstr "Elimina à deencenação [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
-#, fuzzy, c-format, perl-format
+#: add-patch.c:82 git-add--interactive.perl:1447
+#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
-msgstr "Adição do unstage [y,n,q,a,d%s,?]? "
+msgstr "Adiciona à desencenação [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
-#, fuzzy, c-format, perl-format
+#: add-patch.c:83 git-add--interactive.perl:1448
+#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Unstage este pedaço [y,n,q,a,d%s,?]? "
+msgstr "Desencena este pedaço [y,n,q,a,d%s,?]? "
#: add-patch.c:85
-#, fuzzy
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr ""
-"Se patch submete-se corretamente, o pedaço editado será imediatamente "
-"marcado para unstage."
+"Se remendo aplica-se corretamente, o pedaço editado será imediatamente "
+"marcado para desencenação."
#: add-patch.c:88
-#, fuzzy
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -574,44 +580,43 @@
"a - unstage this hunk and all later hunks in the file\n"
"d - do not unstage this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - unstage este pedaço\n"
-"n - o unstage deste pedaço será retirado\n"
-"q - sair; retirar de unstage este pedaço e qualquer outro restante\n"
-"a - unstage este pedaço e todos próximos pedaços deste ficheiro\n"
-"d - retirar este pedaço da arrumação e qualquer próximo pedaço deste "
+"y - desencena este pedaço\n"
+"n - deixar de desencenar este pedaço\n"
+"q - sair; deixar de desencenar este pedaço ou qualquer um dos que "
+"permaneçam\n"
+"a - desencena este pedaço e todos próximos pedaços deste ficheiro\n"
+"d - deixar de desencenar este pedaço ou qualquer próximo pedaço deste "
"ficheiro\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
-#, fuzzy, c-format, perl-format
+#: add-patch.c:103 git-add--interactive.perl:1451
+#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "Submeter modo de modificação para index [y,n,q,a,d%s,?]? "
+msgstr "Submeter modificação de modo para cenário [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
-#, fuzzy, c-format, perl-format
+#: add-patch.c:104 git-add--interactive.perl:1452
+#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Submeter eliminação para index [y,n,q,a,d%s,?]? "
+msgstr "Submeter eliminação para cenário [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
-#, fuzzy, c-format, perl-format
+#: add-patch.c:105 git-add--interactive.perl:1453
+#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
-msgstr "Submeter adição para index [y,n,q,a,d%s,?]? "
+msgstr "Submeter adição para cenário [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
-#, fuzzy, c-format, perl-format
+#: add-patch.c:106 git-add--interactive.perl:1454
+#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Submeter este pedaço para index [y,n,q,a,d%s,?]? "
+msgstr "Submeter este pedaço para cenário [y,n,q,a,d%s,?]? "
#: add-patch.c:108 add-patch.c:176 add-patch.c:221
-#, fuzzy
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
msgstr ""
-"Se o patch aplica-se corretamente, o pedaço editado será marcado para a "
+"Se o remendo aplica-se corretamente, o pedaço editado será marcado para a "
"submissão imediatamente."
#: add-patch.c:111
-#, fuzzy
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -619,47 +624,46 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - submeter este pedaço para index\n"
-"n - declinar este pedaço para index\n"
-"q - sair; declinar este pedaço e qualquer outro restante\n"
-"a - submeter este pedaço e qualquer próximo deste ficheiro\n"
-"d - declinar este pedaço e qualquer próximo deste ficheiro\n"
+"y - submeter este pedaço para cenário\n"
+"n - deixar por submeter este pedaço para cenário\n"
+"q - sair; deixar por submeter este pedaço ou qualquer um dos que permaneçam\n"
+"a - submeter este pedaço e qualquer próximo pedaço neste ficheiro\n"
+"d - deixar por submeter este pedaço ou qualquer próximo pedaço neste "
+"ficheiro\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
-#, fuzzy, c-format, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar modo de modificação da worktree [y,n,q,a,d%s,?]? "
-
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
-#, fuzzy, c-format, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar eliminação da worktree [y,n,q,a,d%s,?]? "
-
-#: add-patch.c:128 git-add--interactive.perl:1457
+#: add-patch.c:126 git-add--interactive.perl:1457
#: git-add--interactive.perl:1475
-#, fuzzy, c-format, perl-format
-msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar adição da worktree [y,n,q,a,d%s,?]? "
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar modo de modificação de árvore-trabalho [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
+#: add-patch.c:127 git-add--interactive.perl:1458
#: git-add--interactive.perl:1476
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar eliminação de árvore-trabalho [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
+#, c-format, perl-format
+msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar adição de árvore-trabalho [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
+#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar este pedaço da worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar este pedaço de árvore-trabalho [y,n,q,a,d%s,?]? "
#: add-patch.c:131 add-patch.c:154 add-patch.c:199
-#, fuzzy
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
msgstr ""
-"Se o patch aplica-se corretamente, o pedaço editado será marcado para ser "
+"Se o remendo aplica-se corretamente, o pedaço editado será marcado para ser "
"descartado imediatamente."
#: add-patch.c:134 add-patch.c:202
-#, fuzzy
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -667,34 +671,36 @@
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - descartar este pedaço de worktree\n"
-"n - aceitar este pedaço de worktree\n"
-"q - sair; aceitar este pedaço e qualquer outro restante\n"
-"a - descartar este pedaço e qualquer próximo deste ficheiro\n"
-"d - aceitar este pedaço e qualquer próximo deste ficheiro\n"
+"y - descartar este pedaço de árvore-trabalho\n"
+"n - deixar por descartar este pedaço de árvore-trabalho\n"
+"q - sair; deixar por descartar este pedaço ou qualquer um dos que "
+"permaneçam\n"
+"a - descartar este pedaço e qualquer próximo pedaço neste ficheiro\n"
+"d - deixar por descartar este pedaço e qualquer próximo pedaço neste "
+"ficheiro\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
-#, fuzzy, c-format, perl-format
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
+#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar modo de modificação de index e worktree [y,n,q,a,d%s,?]?"
+msgstr ""
+"Descartar modificação de modo de cenário e árvore-trabalho [y,n,q,a,d%s,?]?"
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
-#, fuzzy, c-format, perl-format
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
+#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar eliminação de index e worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar eliminação de cenário e árvore-trabalho [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
-#, fuzzy, c-format, perl-format
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
+#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar adição de index e worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar adição de cenário e árvore-trabalho [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
-#, fuzzy, c-format, perl-format
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
+#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar este pedaço de index e worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar este pedaço de cenário e árvore-trabalho [y,n,q,a,d%s,?]? "
#: add-patch.c:157
-#, fuzzy
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -702,34 +708,36 @@
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - descartar este pedaço de index e worktree\n"
-"n - aceitar este pedaço de index e worktree\n"
-"q - sair; aceitar este pedaço e qualquer outro restante\n"
-"a - descartar este pedaço e qualquer próximo deste ficheiro\n"
-"d - aceitar este pedaço e qualquer próximo deste ficheiro\n"
+"y - descartar este pedaço de cenário e árvore-trabalho\n"
+"n - deixar por descartar este pedaço de cenário e árvore-trabalho\n"
+"q - sair; deixar por descartar este pedaço ou qualquer um dos que "
+"permaneçam\n"
+"a - descartar este pedaço e qualquer próximo neste ficheiro\n"
+"d - deixar por descartar este pedaço ou qualquer próximo pedaço neste "
+"ficheiro\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
-#, fuzzy, c-format, perl-format
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
+#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Submeter modo de modificação para index e worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Submeter modificação de modo para cenário e árvore-trabalho [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
-#, fuzzy, c-format, perl-format
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
+#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Submeter eliminação para index e worktree [y,n,q,a,d%s,?]? "
+msgstr "Submeter eliminação para cenário e árvore-trabalho [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
-#, fuzzy, c-format, perl-format
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
+#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Submeter adição para index e worktree [y,n,q,a,d%s,?]? "
+msgstr "Submeter adição para cenário e árvore-trabalho [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
-#, fuzzy, c-format, perl-format
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
+#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Submeter este pedaço para index e worktree [y,n,q,a,d%s,?]? "
+msgstr "Submeter este pedaço para cenário e árvore-trabalho [y,n,q,a,d%s,?]? "
#: add-patch.c:179
-#, fuzzy
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -737,14 +745,14 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - submeter este pedaço para index e worktree\n"
-"n - declinar este pedaço para index e worktree\n"
-"q - sair; declinar este pedaço e qualquer outro restante\n"
-"a - submeter este pedaço e qualquer próximo deste ficheiro\n"
-"d - declinar este pedaço e qualquer próximo deste ficheiro\n"
+"y - submeter este pedaço para cenário e árvore-trabalho\n"
+"n - deixar por submeter este pedaço para cenário e árvore-trabalho\n"
+"q - sair; deixar por submeter este pedaço ou qualquer um dos que permaneçam\n"
+"a - submeter este pedaço e qualquer próximo pedaço neste ficheiro\n"
+"d - deixar por submeter este pedaço ou qualquer próximo pedaço neste "
+"ficheiro\n"
#: add-patch.c:224
-#, fuzzy
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -752,51 +760,50 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - submeter este pedaço para worktree\n"
-"n - declinar este pedaço para worktree\n"
-"q - sair; declinar este pedaço e qualquer outro restantes\n"
-"a - submeter este pedaço e qualquer próximo deste ficheiro\n"
-"d - declinar este pedaço e qualquer próximo deste ficheiro\n"
+"y - submeter este pedaço para árvore-trabalho\n"
+"n - deixar por submeter este pedaço para árvore-trabalho\n"
+"q - sair; deixar por submeter este pedaço ou qualquer um dos que permaneçam\n"
+"a - submeter este pedaço e qualquer próximo pedaço neste ficheiro\n"
+"d - deixar por submeter este pedaço ou qualquer próximo pedaço neste "
+"ficheiro\n"
#: add-patch.c:343
-#, fuzzy, c-format
+#, c-format
msgid "could not parse hunk header '%.*s'"
-msgstr "incapaz de analisar início de pedaço '%s'"
+msgstr "incapaz de processar início de pedaço '%.*s'"
#: add-patch.c:362 add-patch.c:366
-#, fuzzy, c-format
+#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "incapaz de analisar início de pedaço colorido '%.*s'"
-#: add-patch.c:420
-#, fuzzy
+#: add-patch.c:431
msgid "could not parse diff"
msgstr "incapaz de analisar diff"
-#: add-patch.c:439
-#, fuzzy
+#: add-patch.c:450
msgid "could not parse colored diff"
msgstr "incapaz de analisar diff colorido"
-#: add-patch.c:453
-#, fuzzy, c-format
+#: add-patch.c:464
+#, c-format
msgid "failed to run '%s'"
msgstr "falhou executar '%s'"
-#: add-patch.c:612
+#: add-patch.c:618
msgid "mismatched output from interactive.diffFilter"
msgstr "sem match de output de interactive.diffFilter"
-#: add-patch.c:613
+#: add-patch.c:619
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
msgstr ""
"O teu filtro tem de manter uma correspondência exata\n"
-"entre seu input e linhas output."
+"entre sua entrada e linhas de saída."
-#: add-patch.c:791
-#, fuzzy, c-format
+#: add-patch.c:797
+#, c-format
msgid ""
"expected context line #%d in\n"
"%.*s"
@@ -804,7 +811,7 @@
"linha de contexto esperada #%d em\n"
"%.*s"
-#: add-patch.c:806
+#: add-patch.c:812
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -817,12 +824,12 @@
"\ttermina sem:\n"
"%.*s"
-#: add-patch.c:1082 git-add--interactive.perl:1115
+#: add-patch.c:1088 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Modo de edição manual de pedaço -- ver final para guia rápido.\n"
-#: add-patch.c:1086
-#, fuzzy, c-format
+#: add-patch.c:1092
+#, c-format
msgid ""
"---\n"
"To remove '%c' lines, make them ' ' lines (context).\n"
@@ -835,22 +842,21 @@
"Linhas começadas com %c serão removidas.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1100 git-add--interactive.perl:1129
+#: add-patch.c:1106 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
-"Se falha na submissão correta, ser-lhe-á dada nova oportunidade para\n"
+"Se falha na aplicação correta, ser-lhe-á dada nova oportunidade para\n"
"editar. Se todas as linhas deste pedaço forem removidas, então a edição\n"
"é abortada e este pedaço é deixado inalterado.\n"
-#: add-patch.c:1133
-#, fuzzy
+#: add-patch.c:1139
msgid "could not parse hunk header"
msgstr "incapaz interpretar início de pedaço"
-#: add-patch.c:1178
+#: add-patch.c:1184
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' falhou"
@@ -866,28 +872,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1253 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Problema na submissão de pedaço editado. Editar de novo (responder \"n\" "
"para \"não\" descarta!) [y/n]? "
-#: add-patch.c:1290
-#, fuzzy
+#: add-patch.c:1296
msgid "The selected hunks do not apply to the index!"
-msgstr "Submissão incorreta de pedaços selecionados para index!"
+msgstr "Os pedaços selecionados submetem-se para o cenário de maneira nenhuma!"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
-msgstr "Submetê-los para worktree mesmo assim? "
+msgstr "Submetê-los para árvore-trabalho mesmo assim? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1304 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Nada foi submetido.\n"
-#: add-patch.c:1355
-#, fuzzy
+#: add-patch.c:1361
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -909,77 +913,73 @@
"e - editar manualmente o pedaço atual\n"
"? - mostrar ajuda\n"
-#: add-patch.c:1517 add-patch.c:1527
-#, fuzzy
+#: add-patch.c:1523 add-patch.c:1533
msgid "No previous hunk"
msgstr "Sem pedaço anterior"
-#: add-patch.c:1522 add-patch.c:1532
-#, fuzzy
+#: add-patch.c:1528 add-patch.c:1538
msgid "No next hunk"
msgstr "Sem próximo pedaço"
-#: add-patch.c:1538
+#: add-patch.c:1544
msgid "No other hunks to goto"
msgstr "Sem qualquer outro pedaço"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1555 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "ir para qual pedaço (<ret> para ver mais)? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1556 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "ir para qual pedaço? "
-#: add-patch.c:1561
-#, fuzzy, c-format
+#: add-patch.c:1567
+#, c-format
msgid "Invalid number: '%s'"
msgstr "Número inválido: '%s'"
-#: add-patch.c:1566
-#, fuzzy, c-format
+#: add-patch.c:1572
+#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Lamento, apenas %d pedaço disponível."
msgstr[1] "Lamento, apenas %d pedaços disponíveis."
-#: add-patch.c:1575
+#: add-patch.c:1581
msgid "No other hunks to search"
msgstr "Sem outro pedaço a procurar"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1587 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "procurar por regex? "
-#: add-patch.c:1596
-#, fuzzy, c-format
+#: add-patch.c:1602
+#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Pesquisa regexp deformada %s: %s"
-#: add-patch.c:1613
-#, fuzzy
+#: add-patch.c:1619
msgid "No hunk matches the given pattern"
msgstr "Sem pedaço correspondente ao padrão fornecido"
-#: add-patch.c:1620
+#: add-patch.c:1626
msgid "Sorry, cannot split this hunk"
msgstr "Lamento, incapaz de dividir este pedaço"
-#: add-patch.c:1624
-#, fuzzy, c-format
+#: add-patch.c:1630
+#, c-format
msgid "Split into %d hunks."
msgstr "Dividir em %d pedaços."
-#: add-patch.c:1628
+#: add-patch.c:1634
msgid "Sorry, cannot edit this hunk"
msgstr "Lamento, incapaz de editar este pedaço"
-#: add-patch.c:1680
-#, fuzzy
+#: add-patch.c:1686
msgid "'git apply' failed"
msgstr "'git apply' falhou"
-#: advice.c:145
+#: advice.c:81
#, c-format
msgid ""
"\n"
@@ -988,75 +988,81 @@
"\n"
"Desative este mensagem com \"git config advice.%s false\""
-#: advice.c:161
-#, fuzzy, c-format
+#: advice.c:97
+#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sdica: %.*s%s\n"
-#: advice.c:252
+#: advice.c:181
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Cherry-picking é impossível porque tem ficheiros em separado."
-#: advice.c:254
+#: advice.c:183
msgid "Committing is not possible because you have unmerged files."
msgstr "Cometer é impossível porque tem ficheiros em separado."
-#: advice.c:256
+#: advice.c:185
msgid "Merging is not possible because you have unmerged files."
msgstr "Juntar é impossível porque tem ficheiros em separado."
-#: advice.c:258
+#: advice.c:187
msgid "Pulling is not possible because you have unmerged files."
msgstr "Puxar é impossível porque tem ficheiros em separado."
-#: advice.c:260
+#: advice.c:189
msgid "Reverting is not possible because you have unmerged files."
msgstr "Reverter é impossível porque tem ficheiros em separado."
-#: advice.c:262
+#: advice.c:191
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "É impossível fazer %s porque tem ficheiros em separado."
-#: advice.c:270
+#: advice.c:199
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
-"Corrija-os em worktree, e use 'git add/rm <ficheiro>' apropriadamente\n"
-"para marcar resolução e fazer uma memória."
+"Conserte-os na árvore-trabalho, e usa 'git add/rm <ficheiro>'\n"
+"apropriadamente para marcar resolução e fazer uma memória."
-#: advice.c:278
+#: advice.c:207
msgid "Exiting because of an unresolved conflict."
msgstr "Saindo devido a conflito por resolver."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:212 builtin/merge.c:1388
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "O teu juntar ficou por concluir (MERGE_HEAD presente)."
-#: advice.c:285
+#: advice.c:214
msgid "Please, commit your changes before merging."
msgstr "Por favor, memoriza as tuas modificações antes de juntar."
-#: advice.c:286
+#: advice.c:215
msgid "Exiting because of unfinished merge."
msgstr "Saindo devido a juntar inacabado."
-#: advice.c:296
+#: advice.c:220
+msgid "Not possible to fast-forward, aborting."
+msgstr "Impossível fazer avanço, abortando."
+
+#: advice.c:230
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-#: advice.c:303
+#: advice.c:237
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-#: advice.c:310
-#, fuzzy, c-format
+#: advice.c:245
+#, c-format
msgid ""
"Note: switching to '%s'.\n"
"\n"
@@ -1079,14 +1085,14 @@
msgstr ""
"Nota: trocando para '%s'.\n"
"\n"
-"Está em 'HEAD solta'. Podes olhar, fazer mudanças experimentais e\n"
+"Estás em 'HEAD desanexada'. Podes olhar, fazer mudanças experimentais e\n"
"memorizá-las, e, neste estado, podes descartar qualquer memória que faças\n"
-"sem interferir em qualquer ramo fazendo um switch de ramos.\n"
+"sem impactar qualquer ramo fazendo uma troca de volta para um ramo.\n"
"\n"
"Se queres criar um novo ramo para reter as memórias que criaste, podes\n"
-"fazer (agora ou mais tarde) usando -c com o comando switch. Exemplo:\n"
+"fazê-lo (agora ou mais tarde) usando -c com o comando switch. Exemplo:\n"
"\n"
-" git switch -c <novo-nome-de-branch>\n"
+" git switch -c <novo-nome-de-ramo>\n"
"\n"
"Ou desfazer esta operação com:\n"
"\n"
@@ -1097,7 +1103,6 @@
"\n"
#: alias.c:50
-#, fuzzy
msgid "cmdline ends with \\"
msgstr "cmdline termina com \\"
@@ -1115,73 +1120,88 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opção de ignorar whitespace desconhecida '%s'"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject e --3way só podem ser usados separadamente."
+#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
+#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
+#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
+#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
+#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
+#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
+#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
+#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
+#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
+#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
+#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
+#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
+#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
+#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
+#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
+#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
+#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
+#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
+#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
+#: builtin/worktree.c:779
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "opções '%s' e '%s' incapaz serem usadas juntas"
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way fora de um repositório"
+#: apply.c:141 apply.c:152 apply.c:155
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' fora de um repositório"
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index fora de um repositório"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached fora de repositório"
-
-#: apply.c:800
+#: apply.c:807
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Incapaz preparar timestamp de regexp %s"
-#: apply.c:809
+#: apply.c:816
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec devolveu %d para input: %s"
-#: apply.c:883
+#: apply.c:890
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "incapaz de encontrar o nome do ficheiro no patch da linha %d"
-#: apply.c:921
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff incorreto - esperava /dev/null, tive %s na linha %d"
-#: apply.c:927
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff incorreto - novo nome de ficheiro inconsistente na linha "
"%d"
-#: apply.c:928
+#: apply.c:935
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff incorreto - antigo nome de ficheiro inconsistente na "
"linha %d"
-#: apply.c:933
+#: apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff incorreto - esperava /dev/null na linha %d"
-#: apply.c:962
-#, fuzzy, c-format
+#: apply.c:969
+#, c-format
msgid "invalid mode on line %d: %s"
msgstr "modo inválido na linha %d: %s"
-#: apply.c:1281
+#: apply.c:1288
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "linhas de cabeçalho %d e %d inconsistentes"
-#: apply.c:1371
+#: apply.c:1378
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -1196,92 +1216,92 @@
"cabeçalho do git diff falta informação de nome de ficheiro quando removendo "
"%d componentes do pathname (linha %d)"
-#: apply.c:1384
+#: apply.c:1391
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "cabeçalho do git diff falta informação de nome de ficheiro (linha %d)"
-#: apply.c:1480
+#: apply.c:1487
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recontagem: linha inesperada: %.*s"
-#: apply.c:1549
+#: apply.c:1556
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s"
-#: apply.c:1752
+#: apply.c:1759
msgid "new file depends on old contents"
msgstr "novo ficheiro depende de conteúdos antigos"
-#: apply.c:1754
+#: apply.c:1761
msgid "deleted file still has contents"
msgstr "ficheiro eliminado ainda tem conteúdos"
-#: apply.c:1788
+#: apply.c:1795
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch roto na linha %d"
-#: apply.c:1825
+#: apply.c:1832
#, c-format
msgid "new file %s depends on old contents"
msgstr "novo ficheiro %s depende de conteúdos antigos"
-#: apply.c:1827
+#: apply.c:1834
#, c-format
msgid "deleted file %s still has contents"
msgstr "ficheiro apagado %s ainda tem conteúdos"
-#: apply.c:1830
+#: apply.c:1837
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** aviso: ficheiro %s fica vazio e mantêm-se"
-#: apply.c:1977
+#: apply.c:1985
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binário roto na linha %d: %.*s"
-#: apply.c:2014
+#: apply.c:2022
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binário irreconhecível na linha %d"
-#: apply.c:2176
+#: apply.c:2184
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch com apenas lixo na linha %d"
-#: apply.c:2262
+#: apply.c:2270
#, c-format
msgid "unable to read symlink %s"
msgstr "incapaz de ler ligação simbólica %s"
-#: apply.c:2266
+#: apply.c:2274
#, c-format
msgid "unable to open or read %s"
msgstr "incapaz de abrir ou ler %s"
-#: apply.c:2935
+#: apply.c:2943
#, c-format
msgid "invalid start of line: '%c'"
msgstr "início de linha inválido: '%c'"
-#: apply.c:3056
+#: apply.c:3064
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Pedaço #%d apareceu em %d (%d offset de linha)."
msgstr[1] "Pedaço #%d apareceu em %d (%d offset de linhas)."
-#: apply.c:3068
+#: apply.c:3076
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexto reduzido a (%ld/%ld) para submeter fragmento em %d"
-#: apply.c:3074
+#: apply.c:3082
#, c-format
msgid ""
"while searching for:\n"
@@ -1290,500 +1310,493 @@
"procurando por:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3104
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "faltando patch binário para '%s'"
-#: apply.c:3104
+#: apply.c:3112
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "incapaz submeter-inversamente patch binário sem pedaço inverso a '%s'"
-#: apply.c:3151
+#: apply.c:3159
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
-msgstr "incapaz submeter patch binário a '%s' sem a linha completa de index"
+msgstr ""
+"incapaz submeter remendo binário a '%s' sem a linha completa para cenário"
-#: apply.c:3162
+#: apply.c:3170
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"o patch submete-se a '%s' (%s), que corresponde a conteúdo actual nenhum."
-#: apply.c:3170
+#: apply.c:3178
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "o patch submete-se a um '%s' vazio mas tem conteúdo"
-#: apply.c:3188
+#: apply.c:3196
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "incapaz ler a postimage necessária %s para '%s'"
-#: apply.c:3201
+#: apply.c:3209
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "path binário submete-se a '%s' de maneira nenhuma"
-#: apply.c:3208
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"patch binário para '%s' cria resultado incorreto (esperei %s, recebi %s)"
-#: apply.c:3229
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch falhou: %s:%ld"
-#: apply.c:3352
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
-msgstr "incapaz de checkout %s"
+msgstr "incapaz de observar %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
+#: setup.c:310
#, c-format
msgid "failed to read %s"
msgstr "falha a ler %s"
-#: apply.c:3412
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lendo '%s' além de uma ligação simbólica"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3449 apply.c:3721
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "path %s mudou de nome ou foi eliminado"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3559 apply.c:3736
#, c-format
msgid "%s: does not exist in index"
-msgstr "%s: tem inexistência no index"
+msgstr "%s: tem inexistência no cenário"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3568 apply.c:3744 apply.c:3960
#, c-format
msgid "%s: does not match index"
-msgstr "%s: no index há correspondência nenhuma"
+msgstr "%s: no cenário há correspondência nenhuma"
-#: apply.c:3571
-#, fuzzy
+#: apply.c:3605
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "repositório falta o blob necessário para recorrer à tri-junção."
-#: apply.c:3574
-#, fuzzy, c-format
+#: apply.c:3608
+#, c-format
msgid "Performing three-way merge...\n"
-msgstr "A recorrer a integração com 3 pontos...\n"
+msgstr "Realizando tri-junção...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3624 apply.c:3628
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "incapaz ler conteúdo atual de '%s'"
-#: apply.c:3606
-#, fuzzy, c-format
+#: apply.c:3640
+#, c-format
msgid "Failed to perform three-way merge...\n"
-msgstr "Falha a recorrer a integração com 3 pontos...\n"
-
-#: apply.c:3620
-#, c-format
-msgid "Applied patch to '%s' with conflicts.\n"
-msgstr "Patch aplicado a '%s' com conflitos.\n"
-
-#: apply.c:3625
-#, c-format
-msgid "Applied patch to '%s' cleanly.\n"
-msgstr "Patch aplicado a '%s' com sucesso.\n"
-
-#: apply.c:3642
-#, fuzzy, c-format
-msgid "Falling back to direct application...\n"
-msgstr "A recorrer a integração com 3 pontos...\n"
+msgstr "Falha a fazer tri-junção...\n"
#: apply.c:3654
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Remendo aplicado a '%s' com conflitos.\n"
+
+#: apply.c:3659
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Remendo aplicado corretamente a '%s'.\n"
+
+#: apply.c:3676
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Recorrendo a aplicação direta...\n"
+
+#: apply.c:3688
msgid "removal patch leaves file contents"
msgstr "patch de remoção deixa conteúdos no ficheiro"
-#: apply.c:3727
+#: apply.c:3761
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipo errado"
-#: apply.c:3729
+#: apply.c:3763
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s é do tipo %o, esperado %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
+#: read-cache.c:1399
#, c-format
msgid "invalid path '%s'"
msgstr "caminho inválido '%s'"
-#: apply.c:3952
+#: apply.c:3958
#, c-format
msgid "%s: already exists in index"
-msgstr "%s: já existe no índice"
+msgstr "%s: já existe no cenário"
-#: apply.c:3956
+#: apply.c:3962
#, c-format
msgid "%s: already exists in working directory"
-msgstr "%s: já existe no diretório de trabalho"
+msgstr "%s: já existe na pasta-trabalho"
-#: apply.c:3976
+#: apply.c:3982
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "novo modo (%o) de %s é incorrespondente ao modo antigo (%o)"
-#: apply.c:3981
+#: apply.c:3987
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "novo modo (%o) de %s é incorrespondente ao modo antigo (%o) de %s"
-#: apply.c:4001
+#: apply.c:4007
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "o ficheiro afetado '%s' é indicado por uma ligação simbólica"
-#: apply.c:4005
+#: apply.c:4011
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patch submete-se de maneira nenhuma"
-#: apply.c:4020
+#: apply.c:4026
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4112
+#: apply.c:4118
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "sha1 tem falta informação ou é inútil para o submódulo %s"
-#: apply.c:4119
+#: apply.c:4125
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "alteração de modo para %s, que está fora da HEAD atual"
-#: apply.c:4122
+#: apply.c:4128
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "informação de sha1 está faltando ou é inútil (%s)."
-#: apply.c:4131
+#: apply.c:4137
#, c-format
msgid "could not add %s to temporary index"
-msgstr "incapaz adicionar %s ao índex temporário"
+msgstr "incapaz adicionar %s ao cenário temporário"
-#: apply.c:4141
+#: apply.c:4147
#, c-format
msgid "could not write temporary index to %s"
-msgstr "incapaz escrever index temporário para %s"
+msgstr "incapaz escrever o cenário temporário para %s"
-#: apply.c:4279
+#: apply.c:4285
#, c-format
msgid "unable to remove %s from index"
-msgstr "impossível remover %s de index"
-
-#: apply.c:4313
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "patch corrompido no submódulo %s"
+msgstr "incapaz remover %s de cenário"
#: apply.c:4319
#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "remendo corrompido no submódulo %s"
+
+#: apply.c:4325
+#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "incapaz obter estatutário de ficheiro recém-criado '%s'"
-#: apply.c:4327
+#: apply.c:4333
#, c-format
msgid "unable to create backing store for newly created file %s"
-msgstr "incapaz criar armazenamento de backup para ficheiro recém-criado %s"
+msgstr "incapaz criar armazenamento-backup para ficheiro recém-criado %s"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4339 apply.c:4484
#, c-format
msgid "unable to add cache entry for %s"
-msgstr "incapaz adicionar entrada de cache para %s"
+msgstr "incapaz adicionar entrada de cenário para %s"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "falha a escrever para '%s'"
-#: apply.c:4380
+#: apply.c:4386
#, c-format
msgid "closing file '%s'"
msgstr "fechando ficheiro '%s'"
-#: apply.c:4450
+#: apply.c:4456
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "incapaz escrever ficheiro '%s' com modo %o"
-#: apply.c:4548
+#: apply.c:4554
#, c-format
msgid "Applied patch %s cleanly."
-msgstr "Patch %s aplicado com sucesso."
+msgstr "Remendo %s aplicado corretamente."
-#: apply.c:4556
+#: apply.c:4562
msgid "internal error"
msgstr "erro interno"
-#: apply.c:4559
+#: apply.c:4565
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "A aplicar patch %%s com %d rejeição..."
msgstr[1] "A aplicar patch %%s com %d rejeições..."
-#: apply.c:4570
+#: apply.c:4576
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "a truncar o nome do ficheiro .rej em %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4584
#, c-format
msgid "cannot open %s"
msgstr "incapaz abrir %s"
-#: apply.c:4592
+#: apply.c:4598
#, c-format
msgid "Hunk #%d applied cleanly."
-msgstr "Excerto nº%d aplicado com sucesso."
+msgstr "Excerto #%d aplicado corretamente."
-#: apply.c:4596
+#: apply.c:4602
#, c-format
msgid "Rejected hunk #%d."
-msgstr "Excerto nº%d rejeitado."
+msgstr "Excerto #%d rejeitado."
-#: apply.c:4725
+#: apply.c:4731
#, c-format
msgid "Skipped patch '%s'."
-msgstr "Patch '%s' ignorado."
+msgstr "Remendo '%s' ignorado."
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "input desconhecido"
+#: apply.c:4740
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr ""
-#: apply.c:4753
+#: apply.c:4761
msgid "unable to read index file"
-msgstr "incapaz ler ficheiro index"
+msgstr "incapaz ler ficheiro de cenário"
-#: apply.c:4910
+#: apply.c:4918
#, c-format
msgid "can't open patch '%s': %s"
msgstr "incapaz abrir patch '%s': %s"
-#: apply.c:4937
+#: apply.c:4945
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d erro de espaço em branco reprimido"
msgstr[1] "%d erros de espaço em branco reprimidos"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4951 apply.c:4966
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d linha adiciona erros de espaço em branco."
msgstr[1] "%d linhas adicionam erros de espaço em branco."
-#: apply.c:4951
+#: apply.c:4959
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d linha aplicada depois de corrigir erros de espaço em branco."
msgstr[1] "%d linhas aplicadas depois de corrigir erros de espaço em branco."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
-msgstr "Incapaz de escrever novo ficheiro index"
+msgstr "Incapaz de escrever novo ficheiro de cenário"
-#: apply.c:4995
+#: apply.c:5003
msgid "don't apply changes matching the given path"
msgstr ""
"submeter de maneira nenhuma alterações correspondentes a path fornecido"
-#: apply.c:4998
+#: apply.c:5006
msgid "apply changes matching the given path"
msgstr "submeter alterações correspondentes a path fornecido"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5008 builtin/am.c:2379
msgid "num"
msgstr "num"
-#: apply.c:5001
+#: apply.c:5009
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional"
-#: apply.c:5004
+#: apply.c:5012
msgid "ignore additions made by the patch"
msgstr "ignorar adições feitas pelo patch"
-#: apply.c:5006
+#: apply.c:5014
msgid "instead of applying the patch, output diffstat for the input"
msgstr "invés aplicada patch, output diffstat para "
-#: apply.c:5010
+#: apply.c:5018
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostrar número de linhas adicionadas e removidas em notação decimal"
-#: apply.c:5012
+#: apply.c:5020
msgid "instead of applying the patch, output a summary for the input"
msgstr "em vez de aplicar o patch, mostrar um resumo da entrada"
-#: apply.c:5014
+#: apply.c:5022
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado"
-#: apply.c:5016
+#: apply.c:5024
msgid "make sure the patch is applicable to the current index"
-msgstr "garantir que o patch pode ser aplicado ao índice atual"
+msgstr "garante que o remendo é aplicável em cenário atual"
-#: apply.c:5018
+#: apply.c:5026
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:5020
+#: apply.c:5028
msgid "apply a patch without touching the working tree"
-msgstr "aplicar um patch sem tocar na árvore de trabalho"
+msgstr "aplicar um remendo sem tocar na árvore-trabalho"
-#: apply.c:5022
+#: apply.c:5030
msgid "accept a patch that touches outside the working area"
-msgstr "aceitar patches que alteram ficheiros fora da área de trabalho"
+msgstr "aceitar remendo que alteram ficheiros fora da área-trabalho"
-#: apply.c:5025
+#: apply.c:5033
msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "aplicar o patch também (use com --stat/--summary/--check)"
+msgstr "submeter o remendo também (usa com --stat/--summary/--check)"
-#: apply.c:5027
-#, fuzzy
+#: apply.c:5035
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr "tentar tri-junção se um patch submete-se de maneira nenhuma"
-#: apply.c:5029
+#: apply.c:5037
msgid "build a temporary index based on embedded index information"
msgstr ""
-"construir um índice temporário baseado na informação incorporada do índice"
+"construir um cenário temporário baseado na informação incorporada de cenário"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5040 builtin/checkout-index.c:230
msgid "paths are separated with NUL character"
-msgstr "os caminhos estão separados por caracteres NUL"
+msgstr "caminhos estão separados por caractere NUL"
-#: apply.c:5034
+#: apply.c:5042
msgid "ensure at least <n> lines of context match"
-msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
+msgstr "garantir que pelo menos <n> linhas de contexto correspondam"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
+#: builtin/rebase.c:1079
msgid "action"
msgstr "ação"
-#: apply.c:5036
+#: apply.c:5044
msgid "detect new or modified lines that have whitespace errors"
msgstr "detetar linhas novas ou modificadas que tenham espaços em branco"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5047 apply.c:5050
msgid "ignore changes in whitespace when finding context"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: apply.c:5045
+#: apply.c:5053
msgid "apply the patch in reverse"
msgstr "aplicar o patch em reverso"
-#: apply.c:5047
+#: apply.c:5055
msgid "don't expect at least one line of context"
msgstr "conta com linha de contexto nenhuma"
-#: apply.c:5049
+#: apply.c:5057
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixar os pedaços rejeitados nos respetivos ficheiros *.rej"
-#: apply.c:5051
+#: apply.c:5059
msgid "allow overlapping hunks"
msgstr "permitir a sobreposição de pedaços"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "ser verboso"
-
-#: apply.c:5054
+#: apply.c:5062
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-"tolerar deteções incorretas de falta de nova linha no final do ficheiro"
+"tolerar detecções incorretas de falta de nova linha no final do ficheiro"
-#: apply.c:5057
+#: apply.c:5065
msgid "do not trust the line counts in the hunk headers"
msgstr "desconfia da contagem de linhas nos headers de pedaços"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5067 builtin/am.c:2367
msgid "root"
msgstr "raiz"
-#: apply.c:5060
+#: apply.c:5068
msgid "prepend <root> to all filenames"
msgstr "preceder <root> a todos os nomes de ficheiro"
-#: archive-tar.c:125 archive-zip.c:345
-#, fuzzy, c-format
+#: apply.c:5071
+msgid "don't return error for empty patches"
+msgstr ""
+
+#: archive-tar.c:125 archive-zip.c:346
+#, c-format
msgid "cannot stream blob %s"
msgstr "incapaz streamar blob %s"
-#: archive-tar.c:265 archive-zip.c:358
-#, fuzzy, c-format
+#: archive-tar.c:265 archive-zip.c:359
+#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "modo de ficheiro fora de suporte: 0%o (SHA1: %s)"
-#: archive-tar.c:450
-#, fuzzy, c-format
+#: archive-tar.c:447
+#, c-format
msgid "unable to start '%s' filter"
msgstr "incapaz iniciar filtro '%s'"
-#: archive-tar.c:453
-#, fuzzy
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "incapaz redirecionar descritor"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr ""
-#: archive-zip.c:318
+#: archive-zip.c:319
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr ""
-#: archive-zip.c:322
+#: archive-zip.c:323
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr ""
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
#, c-format
msgid "deflate error (%d)"
msgstr "erro ao compactar (%d)"
-#: archive-zip.c:603
+#: archive-zip.c:604
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr ""
+msgstr "carimbo cronológico demasiado grande para este sistema: %<PRIuMAX>"
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<opções>] <árvore-etc> [<caminho>...]"
-
-#: archive.c:15
-msgid "git archive --list"
-msgstr "git archive --list"
+msgstr "git archive [<opções>] <arvoredo> [<caminho>...]"
#: archive.c:16
msgid ""
@@ -1796,146 +1809,138 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repo> [--exec <cmd>] --list"
-#: archive.c:188
-#, fuzzy, c-format
-msgid "cannot read %s"
-msgstr "incapaz ler %s"
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:579
#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "incapaz ler '%s'"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "especificador de path '%s' correspondeu a ficheiro nenhum"
-#: archive.c:451
-#, fuzzy, c-format
+#: archive.c:450
+#, c-format
msgid "no such ref: %.*s"
msgstr "ref inexistente: %.*s"
-#: archive.c:457
-#, fuzzy, c-format
+#: archive.c:456
+#, c-format
msgid "not a valid object name: %s"
msgstr "nome de objeto inválido: %s"
-#: archive.c:470
-#, fuzzy, c-format
+#: archive.c:469
+#, c-format
msgid "not a tree object: %s"
msgstr "é objeto árvore nenhum: %s"
-#: archive.c:482
-#, fuzzy
+#: archive.c:481
msgid "current working directory is untracked"
-msgstr "pasta de trabalho atual está por seguir"
+msgstr "pasta-trabalho atual está desmonitorizada"
-#: archive.c:523
-#, fuzzy, c-format
+#: archive.c:522
+#, c-format
msgid "File not found: %s"
msgstr "ficheiro por encontrar: %s"
-#: archive.c:525
-#, fuzzy, c-format
+#: archive.c:524
+#, c-format
msgid "Not a regular file: %s"
msgstr "É ficheiro normal nenhum: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "fmt"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "formato do arquivo"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1809
msgid "prefix"
msgstr "prefixo"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
+#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
msgid "file"
msgstr "ficheiro"
-#: archive.c:556
-#, fuzzy
+#: archive.c:555
msgid "add untracked file to archive"
-msgstr "adiciona ficheiro por seguir a arquivo"
+msgstr "adiciona ficheiro desmonitorizado a arquivo"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "escreve arquivo para este ficheiro"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
-msgstr "ler .gitattributes do diretório de trabalho"
+msgstr "ler .gitattributes da pasta-trabalho"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
-msgstr "listar ficheiros arquivados para stderr"
+msgstr "reportar, na saída de erro padrão, ficheiro arquivados"
-#: archive.c:564
-#, fuzzy
+#: archive.c:563
msgid "set compression level"
-msgstr "nível de compactação do pacote"
+msgstr "definir nível de compressão"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "listar formatos de arquivo suportados"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
+#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
msgid "repo"
msgstr "repo"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
-msgstr "obter o arquivo a partir do repositório remoto <repo>"
+msgstr "obter o arquivo de repositório remoto <repo>"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
msgid "command"
msgstr "comando"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "caminho para o comando git-upload-archive no remoto"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Opção inesperada --remote"
-#: archive.c:581
-msgid "Option --exec can only be used together with --remote"
-msgstr "Opção --exec apenas pode ser usada com --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
+#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
+#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
+#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
+#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
+#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "opção '%s' exige '%s'"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Opção inesperada --output"
-#: archive.c:585
-#, fuzzy
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Opções --add-file e --remote podem nada ser usadas juntas"
-
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
-msgstr "Formato de arquivo desconhecido '%s'"
+msgstr "Formato de arquivo '%s' desconhecido"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumento por ser suportado para formato '%s': -%d"
@@ -1946,9 +1951,9 @@
msgstr "%.*s é nome de atributo inválido"
#: attr.c:363
-#, fuzzy, c-format
+#, c-format
msgid "%s not allowed: %s:%d"
-msgstr "falha ao aplicar o patch: %s:%ld"
+msgstr "%s proibido: %s:%d"
#: attr.c:403
msgid ""
@@ -1958,60 +1963,60 @@
"Os padrões negativos são ignorados nos atributos do git\n"
"Use '\\!' para uma exclamação literal à esquerda."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Conteúdo incorretamente citado no ficheiro '%s': %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
-msgstr "Conseguimos bisectar mais nenhum!\n"
+msgstr "Conseguimos bissetar mais nada!\n"
-#: bisect.c:766
+#: bisect.c:765
#, c-format
msgid "Not a valid commit name %s"
-msgstr "Nome de commit inválido %s"
+msgstr "Nome de memória inválido %s"
-#: bisect.c:791
+#: bisect.c:790
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-"A base de integração %s é má (bad).\n"
-"Significa que o bug foi corrigido entre %s e [%s].\n"
+"A base de junção %s é má.\n"
+"Isto significa que o bug foi corrigido entre %s e [%s].\n"
-#: bisect.c:796
+#: bisect.c:795
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-"A base de integração %s é nova (new).\n"
-"A propriedade foi mudada entre %s e [%s].\n"
+"A base de junção %s é nova.\n"
+"A propriedade foi alterada entre %s e [%s].\n"
-#: bisect.c:801
+#: bisect.c:800
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-"A base de integração %s é %s.\n"
-"Significa que o primeiro commit '%s' está entre %s e [%s].\n"
+"A base de junção %s é %s.\n"
+"Significa que o primeira memória '%s' está entre %s e [%s].\n"
-#: bisect.c:809
+#: bisect.c:808
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"git bisect cannot work properly in this case.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-"Algumas revisões %s são sucessores da revisão %s.\n"
-"git bisect pode funcionar incorretamente nesta situação.\n"
-"Talvez tenhas confundido revisões %s e %s?\n"
+"Algumas revs %s são antecessores de nenhuma rev %s.\n"
+"git bisect funciona incorretamente nesta situação.\n"
+"Talvez tenhas confundido as revs %s e %s?\n"
-#: bisect.c:822
+#: bisect.c:821
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -2019,48 +2024,48 @@
"We continue anyway."
msgstr ""
"a base de junção entre %s e [%s] tem de ser saltada.\n"
-"Portanto temos incerteza quanto a o primeiro commit %s estar entre %s e %s.\n"
-"Continuemos de qualquer maneira."
+"Portanto temos incerteza quanto à primeira memória %s estar entre %s e %s.\n"
+"Continuemos de qualquer das maneiras."
-#: bisect.c:861
+#: bisect.c:860
#, c-format
msgid "Bisecting: a merge base must be tested\n"
-msgstr "A bissetar: uma base de integração tem de ser testada\n"
+msgstr "Bissetando: uma base de junção tem de ser testada\n"
-#: bisect.c:911
+#: bisect.c:910
#, c-format
msgid "a %s revision is needed"
msgstr "precisa-se de uma revisão %s"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:940
#, c-format
msgid "could not create file '%s'"
msgstr "incapaz criar ficheiro '%s'"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:986 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "incapaz ler ficheiro '%s'"
-#: bisect.c:1027
+#: bisect.c:1026
msgid "reading bisect refs failed"
-msgstr "falha ao ler referências bissetadas"
+msgstr "falhou ler refs de bisseção"
-#: bisect.c:1057
+#: bisect.c:1056
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s era %s e %s em simultâneo\n"
-#: bisect.c:1066
-#, fuzzy, c-format
+#: bisect.c:1065
+#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path arguments?\n"
msgstr ""
-"Nenhum commit testável encontrado.\n"
-"Talvez tenha começado com parâmetros de caminho incorretos?\n"
+"Nenhuma memória testável encontrada.\n"
+"Talvez tenha começado com argumentos de caminho incorretos?\n"
-#: bisect.c:1095
+#: bisect.c:1094
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -2070,144 +2075,178 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1100
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
-msgstr[0] "A bissetar: falta %d revisão para testar depois desta %s\n"
-msgstr[1] "A bissetar: faltam %d revisões para testar depois desta %s\n"
+msgstr[0] "Bissetando: falta %d revisão para testar depois desta %s\n"
+msgstr[1] "Bissetando: faltam %d revisões para testar depois desta %s\n"
-#: blame.c:2776
+#: blame.c:2773
msgid "--contents and --reverse do not blend well."
msgstr "--contents e --reverse são imiscíveis."
-#: blame.c:2790
+#: blame.c:2787
msgid "cannot use --contents with final commit object name"
-msgstr "usar --contents com nome de objeto commit final é impossível"
+msgstr "incapaz usar --contents com nome de objeto de memória final"
-#: blame.c:2811
+#: blame.c:2808
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-"--reverse e --first-parent juntos requer que se especifique o último commit"
+"--reverse e --first-parent juntos exige que se especifique a última memória"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
+#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
+#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
+#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
+#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "falha ao configurar percurso de revisões"
-#: blame.c:2838
+#: blame.c:2835
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-"--reverse --first-parent juntos requer intervalo ao longo do primeiro-pai"
+"--reverse --first-parent juntos requer intervalo ao longo da série primeiro-"
+"parente"
-#: blame.c:2849
+#: blame.c:2846
#, c-format
msgid "no such path %s in %s"
msgstr "path %s inexistente em %s"
-#: blame.c:2860
+#: blame.c:2857
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "incapaz ler blob %s para path %s"
-#: branch.c:53
+#: branch.c:93
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
+msgstr ""
+"incapaz de herdar configuração de monitorização de upstream de múltiplas "
+"refs quando é pedido um rebase"
+
+#: branch.c:104
#, c-format
+msgid "not setting branch '%s' as its own upstream"
+msgstr "deixando por definir ramo '%s' como o seu próprio upstream"
+
+#: branch.c:160
+#, c-format
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "ramo '%s' configurado para monitorizar '%s' por rebaseamento."
+
+#: branch.c:161
+#, c-format
+msgid "branch '%s' set up to track '%s'."
+msgstr "ramo '%s' configurado para monitorizar '%s'."
+
+#: branch.c:164
+#, c-format
+msgid "branch '%s' set up to track:"
+msgstr "ramo '%s' configurado para monitorizar:"
+
+#: branch.c:176
+msgid "unable to write upstream branch configuration"
+msgstr "incapaz de escrever configuração de ramo upstream"
+
+#: branch.c:178
msgid ""
"\n"
"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"the remote tracking information by invoking:"
msgstr ""
"\n"
-"Após resolver a causa do erro, pode tentar corrigir\n"
-"o ramo remoto que deve ser seguido, invocando\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"Após consertar a causa do erro, podes tentar consertar\n"
+"a informação de monitorização de remoto, invocando:"
-#: branch.c:67
+#: branch.c:219
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Indefinindo ramo %s como seu próprio upstream."
-
-#: branch.c:93
-#, fuzzy, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s por rebase."
-
-#: branch.c:94
-#, fuzzy, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s."
-
-#: branch.c:98
-#, fuzzy, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "Ramo %s configurado para seguir o ramo local %s por rebase."
-
-#: branch.c:99
-#, fuzzy, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "Ramo %s configurado para seguir o ramo local %s."
-
-#: branch.c:104
-#, fuzzy, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr "Ramo %s configurado para seguir a referência remota %s por rebase."
-
-#: branch.c:105
-#, fuzzy, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "Ramo %s configurado para seguir a referência remota %s."
-
-#: branch.c:109
-#, fuzzy, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr "Ramo %s configurado para seguir a referência local %s por rebase."
-
-#: branch.c:110
-#, fuzzy, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "Ramo %s configurado para seguir a referência local %s."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Incapaz de escrever configuração de ramo upstream"
-
-#: branch.c:156
-#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Incapaz de seguir: informação ambígua para ref %s"
-
-#: branch.c:189
-#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' é um nome inválido para ramo."
-
-#: branch.c:208
-#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Já existe um ramo designado '%s'."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Incapaz de forçar a atualização do ramo atual."
-
-#: branch.c:233
-#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "asked to inherit tracking from '%s', but no remote is set"
msgstr ""
-"Impossível configurar informação sobre seguir; o ponto inicial '%s' é ramo "
-"nenhum."
+"foi pedido para herdar a monitorização de '%s', mas o remoto está por definir"
-#: branch.c:235
+#: branch.c:225
+#, c-format
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr ""
+"foi pedido para herdar a monitorização de '%s', mas a configuração de junção "
+"está por definir"
+
+#: branch.c:277
+#, c-format
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "por monitorizar: informação ambígua para ref '%s'"
+
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading " " space around.
+#.
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#: branch.c:289 object-name.c:464
+#, c-format
+msgid " %s\n"
+msgstr " %s\n"
+
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#: branch.c:295
+#, c-format
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
+"Há múltiplos remotos que os espetro-refs de busca corresponde à\n"
+"ref remota de monitorização '%s':\n"
+"%s\n"
+"Isto tipicamente é um erro de configuração.\n"
+"\n"
+"Para sustentar definir ramos de monitorização, assegura\n"
+"que diferentes espetro-refs remotos de busca,\n"
+"correspondam a diferentes namespaces de monitorização."
+
+#: branch.c:344
+#, c-format
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' é um nome inválido para ramo"
+
+#: branch.c:364
+#, c-format
+msgid "a branch named '%s' already exists"
+msgstr "já existe um ramo designado '%s'"
+
+#: branch.c:370
+#, c-format
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "incapaz forçar atualização de ramo '%s' observado em '%s'"
+
+#: branch.c:393
+#, c-format
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"incapaz configurar informação de monitorização; o ponto inicial '%s' é ramo "
+"nenhum"
+
+#: branch.c:395
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "o ramo upstream solicitado '%s' é inexistente"
-#: branch.c:237
+#: branch.c:397
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -2219,426 +2258,437 @@
"\"git push -u\" to set the upstream config as you push."
msgstr ""
"\n"
-"Se pretende efetuar rebase do seu trabalho sobre um ramo\n"
-"a montante que já existe no remoto, pode ser necessário\n"
-"executar \"git fetch\" para obtê-lo.\n"
+"Se pretendes basear teu trabalho sobre um ramo upstream\n"
+"existente no remoto, poderás ter de executar \"git fetch\"\n"
+"para obtê-lo.\n"
"\n"
-"Se pretende atirar um novo ramo local que irá seguir\n"
-"o seu homólogo remoto, pode usar \"git push -u\" para configurar\n"
-"o respetivo ramo a montante, ao mesmo tempo que publica."
+"Se pretendes atirar um novo ramo local que monitorizará\n"
+"seu homólogo remoto, poderás usar \"git push -u\" para\n"
+"definir a config upstream, enquanto atiras."
-#: branch.c:281
+#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Nome de objeto inválido: '%s'."
+msgid "not a valid object name: '%s'"
+msgstr "nome de objeto inválido: '%s'"
-#: branch.c:301
+#: branch.c:465
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Nome de objeto ambíguo: '%s'."
+msgid "ambiguous object name: '%s'"
+msgstr "nome de objeto ambíguo: '%s'"
-#: branch.c:306
+#: branch.c:470
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Ponto no ramo inválido: '%s'."
+msgid "not a valid branch point: '%s'"
+msgstr "ponto de ramo inválido: '%s'"
-#: branch.c:366
+#: branch.c:658
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "submódulo '%s': incapaz encontrar submódulo"
+
+#: branch.c:661
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
+msgstr ""
+
+#: branch.c:672 branch.c:698
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "submódulo '%s': incapaz criar ramo '%s'"
+
+#: branch.c:730
#, c-format
msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' foi já extraído em '%s'"
+msgstr "'%s' já está observado em '%s'"
-#: branch.c:389
+#: branch.c:755
#, c-format
msgid "HEAD of working tree %s is not updated"
-msgstr "HEAD da working tree %s está desatualizada"
+msgstr "HEAD da árvore-trabalho %s está desatualizada"
-#: bundle.c:44
-#, fuzzy, c-format
+#: bundle.c:45
+#, c-format
msgid "unrecognized bundle hash algorithm: %s"
-msgstr "algoritmo hash de bundle irreconhecível: %s"
+msgstr "algoritmo hash de arquivo-pacote irreconhecível: %s"
-#: bundle.c:48
-#, fuzzy, c-format
+#: bundle.c:53
+#, c-format
msgid "unknown capability '%s'"
msgstr "capacidade desconhecida '%s'"
-#: bundle.c:74
-#, fuzzy, c-format
+#: bundle.c:79
+#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' parece-se com ficheiro bundle v2 ou v3 nenhum"
+msgstr "'%s' parece-se com ficheiro arquivo-pacote v2 ou v3 nenhum"
-#: bundle.c:113
+#: bundle.c:118
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "cabeçalho irreconhecível: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
+#: builtin/commit.c:865
#, c-format
msgid "could not open '%s'"
msgstr "incapaz abrir '%s'"
-#: bundle.c:198
+#: bundle.c:203
msgid "Repository lacks these prerequisite commits:"
-msgstr "Falta ao repositório estes pré-requisitos de commits:"
+msgstr "Falta ao repositório estas memórias de pré-requisito:"
-#: bundle.c:201
-#, fuzzy
+#: bundle.c:206
msgid "need a repository to verify a bundle"
-msgstr "é preciso repositório para verificar um bundle."
-
-#: bundle.c:257
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "O bundle contém esta referência:"
-msgstr[1] "O bundle contém estas %d referências:"
+msgstr "é preciso repositório para verificar um arquivo-pacote"
#: bundle.c:264
-msgid "The bundle records a complete history."
-msgstr "O pacote regista um histórico completo."
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "O arquivo-pacote contém esta ref:"
+msgstr[1] "O arquivo-pacote contém estas %<PRIuMAX> refs:"
-#: bundle.c:266
+#: bundle.c:272
+msgid "The bundle records a complete history."
+msgstr "O arquivo-pacote regista um histórico completo."
+
+#: bundle.c:274
#, c-format
msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "O bundle requer esta referência:"
-msgstr[1] "O bundle requer estas %d referências:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "O arquivo-pacote exige esta ref:"
+msgstr[1] "O arquivo-pacote exige estas %<PRIuMAX> refs:"
-#: bundle.c:333
-#, fuzzy
+#: bundle.c:350
msgid "unable to dup bundle descriptor"
-msgstr "incapaz de dup descritor de bundle"
+msgstr "incapaz de dup descritor de arquivo-pacote"
-#: bundle.c:340
+#: bundle.c:357
msgid "Could not spawn pack-objects"
-msgstr "Impossível gerar pack-objects"
+msgstr "Incapaz spawn objetos-pacote"
-#: bundle.c:351
+#: bundle.c:368
msgid "pack-objects died"
-msgstr "pack-objects terminaram inesperadamente"
+msgstr "objetos-pacote terminaram inesperadamente"
-#: bundle.c:400
+#: bundle.c:417
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
-msgstr "a referência '%s' é excluída pelas opções de rev-list"
+msgstr "ref '%s' é excluída pelas opções de rev-list"
-#: bundle.c:504
-#, fuzzy, c-format
-msgid "unsupported bundle version %d"
-msgstr "fora de suporte versão bundle %d"
-
-#: bundle.c:506
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr ""
-
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento irreconhecível: %s"
-#: bundle.c:553
-msgid "Refusing to create empty bundle."
-msgstr "Criação de bundle vazio recusada."
+#: bundle.c:548
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "versão arquivo-pacote %d insustentada"
-#: bundle.c:563
+#: bundle.c:550
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "incapaz escrever versão arquivo-pacote %d com algoritmo %s"
+
+#: bundle.c:600
+msgid "Refusing to create empty bundle."
+msgstr "Criação de arquivo-pacote vazio recusada."
+
+#: bundle.c:610
#, c-format
msgid "cannot create '%s'"
msgstr "incapaz criar '%s'"
-#: bundle.c:588
+#: bundle.c:639
msgid "index-pack died"
msgstr "index-pack terminou inesperadamente"
#: chunk-format.c:117
msgid "terminating chunk id appears earlier than expected"
-msgstr ""
+msgstr "fim de id de fragmento aparace mais cedo do que esperado"
#: chunk-format.c:126
#, c-format
msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr ""
+msgstr "deslocamento(s) de fragmento %<PRIx64> e %<PRIx64> inapropriados"
#: chunk-format.c:133
#, c-format
msgid "duplicate chunk ID %<PRIx32> found"
-msgstr ""
+msgstr "encontrei ID de fragmento %<PRIx32> duplicado"
#: chunk-format.c:147
#, c-format
msgid "final chunk has non-zero id %<PRIx32>"
-msgstr ""
+msgstr "fragmento final tem id %<PRIx32> diferente de zero"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "valor de cor inválido: %.*s"
-#: commit-graph.c:204 midx.c:47
-#, fuzzy
+#: commit-graph.c:204 midx.c:52
msgid "invalid hash version"
-msgstr "especificação de caminho inválida"
+msgstr "versão de hash inválida"
#: commit-graph.c:262
msgid "commit-graph file is too small"
-msgstr ""
+msgstr "ficheiro grafo-memória é demasiado pequeno"
#: commit-graph.c:355
-#, fuzzy, c-format
+#, c-format
msgid "commit-graph signature %X does not match signature %X"
-msgstr "assinatura commit-graph %X corresponde a assinatura %X nenhuma"
+msgstr "assinatura de grafo-memória %X corresponde a assinatura %X nenhuma"
#: commit-graph.c:362
-#, fuzzy, c-format
+#, c-format
msgid "commit-graph version %X does not match version %X"
-msgstr "commit-graph versão %X corresponde a versão %X nenhuma"
+msgstr "grafo-memória versão %X corresponde a versão %X nenhuma"
#: commit-graph.c:369
#, c-format
msgid "commit-graph hash version %X does not match version %X"
-msgstr ""
+msgstr "versão de hash de grafo-memória %X corresponde a nenhuma versão %X"
#: commit-graph.c:386
#, c-format
msgid "commit-graph file is too small to hold %u chunks"
-msgstr ""
+msgstr "ficheiro grafo-memória é demasiado pequeno para ter %u fragmentos"
-#: commit-graph.c:482
+#: commit-graph.c:485
msgid "commit-graph has no base graphs chunk"
-msgstr ""
+msgstr "grafo-memória tem nenhuns fragmentos de base de grafos"
-#: commit-graph.c:492
+#: commit-graph.c:495
msgid "commit-graph chain does not match"
-msgstr ""
+msgstr "série grafo-memória tem correspondência nenhuma"
-#: commit-graph.c:540
+#: commit-graph.c:543
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
+msgstr "série grafo-memória inválida: linha '%s' é hash nenhum"
-#: commit-graph.c:564
-#, fuzzy
+#: commit-graph.c:567
msgid "unable to find all commit-graph files"
-msgstr "incapaz de encontrar todos ficheiros commit-graph"
+msgstr "incapaz de encontrar todos ficheiros grafo-memória"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:752 commit-graph.c:789
msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr ""
+msgstr "posição de memória inválida. provavelmente grafo-memória está rompido"
-#: commit-graph.c:766
-#, fuzzy, c-format
+#: commit-graph.c:773
+#, c-format
msgid "could not find commit %s"
-msgstr "incapaz encontrar commit %s"
+msgstr "incapaz encontrar memória %s"
-#: commit-graph.c:799
+#: commit-graph.c:806
msgid "commit-graph requires overflow generation data but has none"
-msgstr ""
+msgstr "grafo-memória exige informação de geração de overflow mas tem nenhuma"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
+#: builtin/clone.c:705
#, c-format
msgid "unable to parse commit %s"
-msgstr "incapaz analisar commit %s"
+msgstr "incapaz processar memória %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
-#, fuzzy, c-format
+#: commit-graph.c:1373 builtin/pack-objects.c:3078
+#, c-format
msgid "unable to get type of object %s"
msgstr "incapaz obter tipo de objeto %s"
-#: commit-graph.c:1368
+#: commit-graph.c:1404
msgid "Loading known commits in commit graph"
-msgstr ""
+msgstr "Carregando memórias conhecidas em grafo de memória"
-#: commit-graph.c:1385
+#: commit-graph.c:1421
msgid "Expanding reachable commits in commit graph"
-msgstr ""
+msgstr "Expandindo memórias alcançáveis em grafo de memória"
-#: commit-graph.c:1405
+#: commit-graph.c:1441
msgid "Clearing commit marks in commit graph"
-msgstr ""
+msgstr "Limpando marcas de memórias em grafo de memória"
-#: commit-graph.c:1424
+#: commit-graph.c:1460
msgid "Computing commit graph topological levels"
-msgstr ""
+msgstr "Processando níveis topológicos de grafo de memória"
-#: commit-graph.c:1477
+#: commit-graph.c:1513
msgid "Computing commit graph generation numbers"
-msgstr ""
+msgstr "Processando geração de números de grafo de memória"
-#: commit-graph.c:1558
+#: commit-graph.c:1598
msgid "Computing commit changed paths Bloom filters"
-msgstr ""
+msgstr "Processando mudança de caminhos de memória de filtros de Bloom"
-#: commit-graph.c:1635
-#, fuzzy
+#: commit-graph.c:1675
msgid "Collecting referenced commits"
-msgstr "Recolhendo commits referênciados"
+msgstr "Recolhendo memórias referenciadas"
-#: commit-graph.c:1660
+#: commit-graph.c:1701
#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "Encontrando memórias para grafo de memória em %<PRIuMAX> pacote"
+msgstr[1] "Encontrando memórias para grafo de memória em %<PRIuMAX> pacotes"
-#: commit-graph.c:1673
-#, fuzzy, c-format
+#: commit-graph.c:1714
+#, c-format
msgid "error adding pack %s"
msgstr "error adicionando pacote %s"
-#: commit-graph.c:1677
+#: commit-graph.c:1718
#, c-format
msgid "error opening index for %s"
-msgstr ""
+msgstr "erro ao abrir cenário para %s"
-#: commit-graph.c:1714
+#: commit-graph.c:1756
msgid "Finding commits for commit graph among packed objects"
-msgstr ""
+msgstr "Encontrando, entre objetos de pacote, memórias para grafo de memória"
-#: commit-graph.c:1732
+#: commit-graph.c:1774
msgid "Finding extra edges in commit graph"
-msgstr ""
+msgstr "Encontrando pontas extra em grafo de memória"
-#: commit-graph.c:1781
+#: commit-graph.c:1823
msgid "failed to write correct number of base graph ids"
-msgstr ""
+msgstr "falhou ao escrever números corretos em ids de base grafo"
-#: commit-graph.c:1812 midx.c:911
-#, fuzzy, c-format
+#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
+#, c-format
msgid "unable to create leading directories of %s"
msgstr "incapaz criar as pastas superiores a %s"
-#: commit-graph.c:1825
-#, fuzzy
+#: commit-graph.c:1868
msgid "unable to create temporary graph layer"
msgstr "incapaz criar camada de grafo temporária"
-#: commit-graph.c:1830
-#, fuzzy, c-format
+#: commit-graph.c:1873
+#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "incapaz de ajustar permissão partilhada para '%s'"
-#: commit-graph.c:1887
+#: commit-graph.c:1930
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Escrevendo grafo de memória em %d passagem"
+msgstr[1] "Escrevendo grafo de memória em %d passagens"
-#: commit-graph.c:1923
-#, fuzzy
+#: commit-graph.c:1967
msgid "unable to open commit-graph chain file"
-msgstr "incapaz abrir ficheiro commit-graph chain"
+msgstr "incapaz abrir ficheiro de série de grafo-memória"
-#: commit-graph.c:1939
+#: commit-graph.c:1983
msgid "failed to rename base commit-graph file"
-msgstr ""
+msgstr "falhou renomear ficheiro grafo-memória base"
-#: commit-graph.c:1959
-#, fuzzy
+#: commit-graph.c:2004
msgid "failed to rename temporary commit-graph file"
-msgstr "falha a renomear ficheiro commit-graph temporário"
+msgstr "falha a renomear ficheiro grafo-memória temporário"
-#: commit-graph.c:2092
-#, fuzzy
+#: commit-graph.c:2137
msgid "Scanning merged commits"
-msgstr "A adicionar %s integrado"
+msgstr "Procurando memórias de junção"
-#: commit-graph.c:2136
+#: commit-graph.c:2181
msgid "Merging commit-graph"
-msgstr ""
+msgstr "Juntando grafo-memória"
-#: commit-graph.c:2244
+#: commit-graph.c:2289
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
+"tentando escrever um grafo-memória, mas 'core.commitGraph' está desativado"
-#: commit-graph.c:2351
-#, fuzzy
+#: commit-graph.c:2396
msgid "too many commits to write graph"
-msgstr "demasiados commits para escrever grafo"
-
-#: commit-graph.c:2449
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-
-#: commit-graph.c:2459
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr ""
-
-#: commit-graph.c:2469 commit-graph.c:2484
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr ""
-
-#: commit-graph.c:2476
-#, fuzzy, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "incapaz analisar commit %s de commit-graph"
+msgstr "demasiadas memórias para escrever grafo"
#: commit-graph.c:2494
-msgid "Verifying commits in commit graph"
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
+"ficheiro grafo-memória tem checksum incorreto e provavelmente está rompido"
-#: commit-graph.c:2509
+#: commit-graph.c:2504
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "grafo-memória tem ordem de OID incorreta: %s e depois %s"
+
+#: commit-graph.c:2514 commit-graph.c:2529
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "grafo-memória tem valor de fanout incorreto: fanout[%d] = %u != %u"
+
+#: commit-graph.c:2521
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "incapaz processar memória %s de grafo-memória"
+
+#: commit-graph.c:2539
+msgid "Verifying commits in commit graph"
+msgstr "Verificando memórias em grafo de memória"
+
+#: commit-graph.c:2554
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:2516
+#: commit-graph.c:2561
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:2526
+#: commit-graph.c:2571
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:2535
+#: commit-graph.c:2580
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:2549
+#: commit-graph.c:2594
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:2554
+#: commit-graph.c:2599
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:2558
+#: commit-graph.c:2603
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:2575
+#: commit-graph.c:2620
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
-#: commit-graph.c:2581
+#: commit-graph.c:2626
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
+#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "incapaz analisar %s"
-#: commit.c:54
+#: commit.c:56
#, c-format
msgid "%s %s is not a commit!"
-msgstr "%s %s é commit nenhum!"
+msgstr "%s %s é memória nenhuma!"
-#: commit.c:194
+#: commit.c:197
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2649,43 +2699,59 @@
"Turn this message off by running\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
+"Sustento a <GIT_DIR>/info/grafts está obsoleto\n"
+"e será removido em versões futuras de Git.\n"
+"\n"
+"Por favor, usa \"git replace --convert-graft-file\"\n"
+"para converter excertos em refs de substituição.\n"
+"\n"
+"Desliga esta mensagem executando\n"
+"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1237
+#: commit.c:1252
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Commit %s tem assinatura GPG desconfiada, alegadamente por %s."
-#: commit.c:1241
+#: commit.c:1256
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Commit %s tem assinatura GPG incorreta, alegadamente por %s."
-#: commit.c:1244
+#: commit.c:1259
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s tem assinatura GPG nenhuma."
-#: commit.c:1247
+#: commit.c:1262
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Commit %s tem assinatura correta, por %s\n"
-#: commit.c:1501
+#: commit.c:1516
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 ""
-"aviso: a mensagem de commit é inconforme com UTF-8.\n"
-"Podes querer emendá-lo depois de corrigir a mensagem, ou definir a\n"
-"variável de config i18n.commitencoding com a codificação que o teu\n"
+"Aviso: mensagem de memória é incompatível com UTF-8.\n"
+"Podes querer emendá-lo depois de corrigires a mensagem, ou definir a\n"
+"variável de config i18n.commitencoding para a codificação que o teu\n"
"projeto usa.\n"
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "memória esgotada"
-#: config.c:126
+#: compat/terminal.c:167
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+
+#: compat/terminal.c:168
+msgid "cannot restore terminal settings"
+msgstr "incapaz restaurar definições de terminal"
+
+#: config.c:143
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2695,349 +2761,372 @@
"This might be due to circular includes."
msgstr ""
-#: config.c:142
-#, fuzzy, c-format
+#: config.c:159
+#, c-format
msgid "could not expand include path '%s'"
msgstr "incapaz de expandir include path '%s'"
-#: config.c:153
-#, fuzzy
+#: config.c:170
msgid "relative config includes must come from files"
msgstr ""
"configuração relativa com inclusão condicional deve provir de ficheiros"
-#: config.c:199
+#: config.c:219
msgid "relative config include conditionals must come from files"
msgstr ""
"configuração relativa com inclusão condicional deve provir de ficheiros"
-#: config.c:396
-#, fuzzy, c-format
-msgid "invalid config format: %s"
-msgstr "formato de ref inválido: %s"
+#: config.c:364
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
-#: config.c:400
+#: config.c:508
+#, c-format
+msgid "invalid config format: %s"
+msgstr "formato de config inválido: %s"
+
+#: config.c:512
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr ""
-#: config.c:405
+#: config.c:517
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr ""
-#: config.c:442
-#, fuzzy, c-format
+#: config.c:553
+#, c-format
msgid "key does not contain a section: %s"
msgstr "chave contém secção nenhuma: %s"
-#: config.c:448
+#: config.c:558
#, c-format
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:472 sequencer.c:2785
+#: config.c:580 sequencer.c:2802
#, c-format
msgid "invalid key: %s"
msgstr "chave inválida: %s"
-#: config.c:478
+#: config.c:585
#, c-format
msgid "invalid key (newline): %s"
msgstr ""
-#: config.c:511
+#: config.c:605
msgid "empty config key"
msgstr ""
-#: config.c:529 config.c:541
-#, fuzzy, c-format
+#: config.c:623 config.c:635
+#, c-format
msgid "bogus config parameter: %s"
-msgstr "parâmetros insuficientes"
+msgstr "parâmetro config falso: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
-#, fuzzy, c-format
+#: config.c:649 config.c:666 config.c:673 config.c:682
+#, c-format
msgid "bogus format in %s"
msgstr "formato falso em %s"
-#: config.c:622
-#, fuzzy, c-format
+#: config.c:716
+#, c-format
msgid "bogus count in %s"
msgstr "contagem falsa em %s"
-#: config.c:626
+#: config.c:720
#, c-format
msgid "too many entries in %s"
-msgstr ""
+msgstr "demasiadas entradas em %s"
-#: config.c:636
-#, fuzzy, c-format
+#: config.c:730
+#, c-format
msgid "missing config key %s"
-msgstr "ficheiro config inválido %s"
+msgstr "faltando chave config %s"
-#: config.c:644
+#: config.c:738
#, c-format
msgid "missing config value %s"
-msgstr ""
+msgstr "faltando valor config %s"
-#: config.c:995
+#: config.c:1089
#, c-format
msgid "bad config line %d in blob %s"
msgstr "linha de configuração %d incorreta no blob %s"
-#: config.c:999
+#: config.c:1093
#, c-format
msgid "bad config line %d in file %s"
msgstr "linha de configuração %d incorreta no ficheiro %s"
-#: config.c:1003
+#: config.c:1097
#, c-format
msgid "bad config line %d in standard input"
msgstr "linha de configuração %d incorreta na entrada padrão"
-#: config.c:1007
+#: config.c:1101
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "linha de configuração %d incorreta no submódulo-blob %s"
-#: config.c:1011
+#: config.c:1105
#, c-format
msgid "bad config line %d in command line %s"
msgstr "linha de configuração %d incorreta na linha de comandos %s"
-#: config.c:1015
+#: config.c:1109
#, c-format
msgid "bad config line %d in %s"
msgstr "linha de configuração %d incorreta em %s"
-#: config.c:1152
+#: config.c:1246
msgid "out of range"
msgstr "fora de intervalo"
-#: config.c:1152
+#: config.c:1246
msgid "invalid unit"
msgstr "unidade inválida"
-#: config.c:1153
+#: config.c:1247
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"
+msgstr "valor numérico de config '%s' inválido para '%s': %s"
-#: config.c:1163
+#: config.c:1257
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "valor numérico '%s' da configuração '%s' incorreto no blob %s: %s"
-#: config.c:1166
+#: config.c:1260
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: %s"
-#: config.c:1169
+#: config.c:1263
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"valor numérico '%s' da configuração '%s' incorreto na entrada padrão: %s"
-#: config.c:1172
+#: config.c:1266
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: %s"
-#: config.c:1175
+#: config.c:1269
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"valor numérico '%s' da configuração '%s' incorreto na linha de comandos %s: "
"%s"
-#: config.c:1178
+#: config.c:1272
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "valor numérico '%s' da configuração '%s' incorreto em %s: %s"
-#: config.c:1257
-#, fuzzy, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"
+#: config.c:1368
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "valor inválido para variável %s"
-#: config.c:1275
+#: config.c:1389
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr ""
+
+#: config.c:1425
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "valor booleano de config '%s' inválido para '%s'"
+
+#: config.c:1443
#, c-format
msgid "failed to expand user dir in: '%s'"
-msgstr "falha ao expandir diretório de utilizador em: '%s'"
+msgstr "falhou ao expandir pasta de utilizador em: '%s'"
-#: config.c:1284
+#: config.c:1452
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' em '%s' é carimbo de data/hora inválido"
-#: config.c:1377
+#: config.c:1545
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
-#: config.c:1391 config.c:1402
+#: config.c:1559 config.c:1570
#, c-format
msgid "bad zlib compression level %d"
msgstr "nível de compressão zlib %d incorreto"
-#: config.c:1494
+#: config.c:1660
msgid "core.commentChar should only be one character"
msgstr ""
-#: config.c:1527
+#: config.c:1692
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr ""
+
+#: config.c:1698
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr ""
+
+#: config.c:1714
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "modo inválido para criação de objeto: %s"
-#: config.c:1599
-#, fuzzy, c-format
+#: config.c:1800
+#, c-format
msgid "malformed value for %s"
-msgstr "valor desformado para %s"
+msgstr "valor malformado para %s"
-#: config.c:1625
-#, fuzzy, c-format
+#: config.c:1826
+#, c-format
msgid "malformed value for %s: %s"
-msgstr ": %s"
+msgstr "valor malformado para %s: %s"
-#: config.c:1626
+#: config.c:1827
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1888 builtin/pack-objects.c:4078
#, c-format
msgid "bad pack compression level %d"
msgstr "nível de compactação do pacote %d incorreto"
-#: config.c:1809
-#, fuzzy, c-format
+#: config.c:2014
+#, c-format
msgid "unable to load config blob object '%s'"
-msgstr "incapaz carregar objeto blob config '%s'"
+msgstr "incapaz carregar config de objeto-blob '%s'"
-#: config.c:1812
-#, fuzzy, c-format
+#: config.c:2017
+#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referência '%s' aponta para blob nenhum"
-#: config.c:1829
-#, fuzzy, c-format
+#: config.c:2035
+#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "incapaz resolver blog config '%s'"
-#: config.c:1874
-#, fuzzy, c-format
+#: config.c:2080
+#, c-format
msgid "failed to parse %s"
-msgstr "falha a analisar %s"
+msgstr "falhou processar %s"
-#: config.c:1930
+#: config.c:2136
msgid "unable to parse command-line config"
msgstr "incapaz analisar config de linha de comandos"
-#: config.c:2294
+#: config.c:2512
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"
-#: config.c:2468
+#: config.c:2686
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Inválido %s: '%s'"
-#: config.c:2513
+#: config.c:2731
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "o valor '%d' de splitIndex.maxPercentChange deve estar entre 0 e 100"
-#: config.c:2559
+#: config.c:2763
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "incapaz analisar '%s' da configuração de linha de comandos"
-#: config.c:2561
+#: config.c:2765
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d"
-#: config.c:2645
-#, fuzzy, c-format
+#: config.c:2850
+#, c-format
msgid "invalid section name '%s'"
-msgstr "conteúdo inválido: '%s'"
+msgstr "nome de seção '%s' inválido"
-#: config.c:2677
+#: config.c:2882
#, c-format
msgid "%s has multiple values"
msgstr "%s tem múltiplos valores"
-#: config.c:2706
-#, fuzzy, c-format
+#: config.c:2911
+#, c-format
msgid "failed to write new configuration file %s"
msgstr "falha a escrever novo ficheiro configuração %s"
-#: config.c:2958 config.c:3285
-#, fuzzy, c-format
+#: config.c:3177 config.c:3518
+#, c-format
msgid "could not lock config file %s"
msgstr "incapaz trancar ficheiro config %s"
-#: config.c:2969
-#, fuzzy, c-format
+#: config.c:3188
+#, c-format
msgid "opening %s"
msgstr "abrindo %s"
-#: config.c:3006 builtin/config.c:361
-#, fuzzy, c-format
+#: config.c:3225 builtin/config.c:361
+#, c-format
msgid "invalid pattern: %s"
msgstr "padrão inválido: %s"
-#: config.c:3031
-#, fuzzy, c-format
+#: config.c:3250
+#, c-format
msgid "invalid config file %s"
msgstr "ficheiro config inválido %s"
-#: config.c:3044 config.c:3298
+#: config.c:3263 config.c:3531
#, c-format
msgid "fstat on %s failed"
msgstr "fstat em %s falhou"
-#: config.c:3055
-#, fuzzy, c-format
+#: config.c:3274
+#, c-format
msgid "unable to mmap '%s'%s"
msgstr "incapaz mmap '%s'%s"
-#: config.c:3065 config.c:3303
-#, fuzzy, c-format
+#: config.c:3284 config.c:3536
+#, c-format
msgid "chmod on %s failed"
msgstr "chmod em %s falhou"
-#: config.c:3150 config.c:3400
-#, fuzzy, c-format
+#: config.c:3369 config.c:3633
+#, c-format
msgid "could not write config file %s"
msgstr "incapaz escrever ficheiro config %s"
-#: config.c:3184
+#: config.c:3403
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "incapaz definir '%s' como '%s'"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
#, c-format
msgid "could not unset '%s'"
-msgstr "incapaz desdefinir '%s'"
+msgstr "incapaz indefinir '%s'"
-#: config.c:3276
+#: config.c:3509
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3443
+#: config.c:3676
#, c-format
msgid "missing value for '%s'"
msgstr ""
#: connect.c:61
-#, fuzzy
msgid "the remote end hung up upon initial contact"
-msgstr "O remoto desligou após contacto inicial"
+msgstr "o lado remoto desligou após contacto inicial"
#: connect.c:63
msgid ""
@@ -3052,12 +3141,12 @@
"e que o repositório existe."
#: connect.c:81
-#, fuzzy, c-format
+#, c-format
msgid "server doesn't support '%s'"
msgstr "servidor tem fora de suporte '%s'"
#: connect.c:118
-#, fuzzy, c-format
+#, c-format
msgid "server doesn't support feature '%s'"
msgstr "servidor tem fora suporte a característica '%s'"
@@ -3065,80 +3154,80 @@
msgid "expected flush after capabilities"
msgstr ""
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr ""
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr ""
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr ""
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr ""
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr ""
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "objeto desconhecido '%s' pelo formato em servidor."
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr ""
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr ""
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr ""
-#: connect.c:666
-#, fuzzy, c-format
+#: connect.c:670
+#, c-format
msgid "protocol '%s' is not supported"
msgstr "protocolo '%s' é insustentado"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr ""
-#: connect.c:761
-#, fuzzy, c-format
+#: connect.c:765
+#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "incapaz procurar %s (porta %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
-#: connect.c:787 connect.c:864
-#, fuzzy, c-format
+#: connect.c:791 connect.c:868
+#, c-format
msgid ""
"unable to connect to %s:\n"
"%s"
@@ -3147,80 +3236,78 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
-#, fuzzy
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "concluído."
-#: connect.c:824
-#, fuzzy, c-format
+#: connect.c:828
+#, c-format
msgid "unable to look up %s (%s)"
msgstr "incapaz procurar %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr ""
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr ""
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr ""
-#: connect.c:979
-#, fuzzy, c-format
+#: connect.c:983
+#, c-format
msgid "cannot start proxy %s"
msgstr "incapaz começar proxy %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
+"caminho nenhum especificado; vê 'git help pull' para sintaxe de url válida"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
-msgstr ""
+msgstr "parágrafo é proibido em hosts git:// e caminhos repo"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: connect.c:1276
-#, fuzzy
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh variant 'simple' insustenta definir porta"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr ""
-#: connect.c:1436
-#, fuzzy
+#: connect.c:1440
msgid "unable to fork"
-msgstr "incapaz de aforquilhar"
+msgstr "incapaz de forquear"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "A verificar conectividade"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Impossível executar 'git rev-list'"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "falhou escrever para rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "falha ao fechar entrada padrão de rev-list"
@@ -3230,18 +3317,18 @@
msgstr ""
#: convert.c:196
-#, fuzzy, c-format
+#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "CRLF será substituído por LF em %s."
#: convert.c:198
-#, fuzzy, c-format
+#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
"CRLF será substituído por LF em %s.\n"
-"O final de linha original será mantido no ficheiro da sua árvore de trabalho."
+"O ficheiro da tua árvore-trabalho terá o final de linha original mantido"
#: convert.c:206
#, c-format
@@ -3249,13 +3336,13 @@
msgstr "LF será substituído por CRLF em %s."
#: convert.c:208
-#, fuzzy, c-format
+#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
"LF será substituído por CRLF em %s.\n"
-"O final de linha original será mantido no ficheiro da sua árvore de trabalho."
+"O ficheiro da tua árvore-trabalho terá o final de linha original mantido"
#: convert.c:273
#, c-format
@@ -3282,9 +3369,9 @@
msgstr ""
#: convert.c:408 convert.c:479
-#, fuzzy, c-format
+#, c-format
msgid "failed to encode '%s' from %s to %s"
-msgstr "falha ao copiar notas de '%s' para '%s'"
+msgstr "falhou codificar '%s' de %s para %s"
#: convert.c:451
#, c-format
@@ -3292,17 +3379,17 @@
msgstr ""
#: convert.c:654
-#, fuzzy, c-format
+#, c-format
msgid "cannot fork to run external filter '%s'"
-msgstr "incapaz aforquilhar para correr filtro externo '%s'"
+msgstr "incapaz forquear para correr filtro externo '%s'"
#: convert.c:674
-#, fuzzy, c-format
+#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "incapaz introduzir input para filtro externo '%s'"
#: convert.c:681
-#, fuzzy, c-format
+#, c-format
msgid "external filter '%s' failed %d"
msgstr "filtro externo '%s' falhou %d"
@@ -3312,7 +3399,7 @@
msgstr ""
#: convert.c:722 convert.c:777
-#, fuzzy, c-format
+#, c-format
msgid "external filter '%s' failed"
msgstr "filtro externo '%s' falhou"
@@ -3338,12 +3425,12 @@
#: convert.c:1416 convert.c:1449
#, c-format
msgid "%s: clean filter '%s' failed"
-msgstr ""
+msgstr "%s: filtro de limpeza '%s' falhou"
#: convert.c:1492
-#, fuzzy, c-format
+#, c-format
msgid "%s: smudge filter %s failed"
-msgstr "falha ao atualizar os ficheiros"
+msgstr "%s: filtro de mancha %s falhou"
#: credential.c:96
#, c-format
@@ -3358,97 +3445,97 @@
msgid "refusing to work with credential missing protocol field"
msgstr ""
-#: credential.c:394
+#: credential.c:396
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr ""
-#: credential.c:438
-#, fuzzy, c-format
+#: credential.c:440
+#, c-format
msgid "url has no scheme: %s"
msgstr "Remoto inexistente: %s"
-#: credential.c:511
-#, fuzzy, c-format
+#: credential.c:513
+#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "incapaz analisar url credencial: %s"
-#: date.c:138
+#: date.c:139
msgid "in the future"
msgstr "no futuro"
-#: date.c:144
-#, fuzzy, c-format
+#: date.c:145
+#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "há %lu segundo"
-msgstr[1] "há %lu segundos"
+msgstr[0] "à %<PRIuMAX> segundo"
+msgstr[1] "à %<PRIuMAX> segundos"
-#: date.c:151
-#, fuzzy, c-format
+#: date.c:152
+#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "há %lu minuto"
-msgstr[1] "há %lu minutos"
+msgstr[0] "à %<PRIuMAX> minuto"
+msgstr[1] "à %<PRIuMAX> minutos"
-#: date.c:158
-#, fuzzy, c-format
+#: date.c:159
+#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "há %lu hora"
-msgstr[1] "há %lu horas"
+msgstr[0] "à %<PRIuMAX> hora"
+msgstr[1] "à %<PRIuMAX> horas"
-#: date.c:165
-#, fuzzy, c-format
+#: date.c:166
+#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "há %lu dia"
-msgstr[1] "há %lu dias"
+msgstr[0] "à %<PRIuMAX> dia"
+msgstr[1] "à %<PRIuMAX> dias"
-#: date.c:171
-#, fuzzy, c-format
+#: date.c:172
+#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "há %lu semana"
-msgstr[1] "há %lu semanas"
+msgstr[0] "à %<PRIuMAX> semana"
+msgstr[1] "à %<PRIuMAX> semanas"
-#: date.c:178
-#, fuzzy, c-format
+#: date.c:179
+#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "há %lu mês"
-msgstr[1] "há %lu meses"
+msgstr[0] "à %<PRIuMAX> mês"
+msgstr[1] "à %<PRIuMAX> meses"
-#: date.c:189
-#, fuzzy, c-format
+#: date.c:190
+#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%lu ano"
-msgstr[1] "%lu anos"
+msgstr[0] "%<PRIuMAX> ano"
+msgstr[1] "%<PRIuMAX> anos"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
-#, fuzzy, c-format
+#: date.c:193
+#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "há %s e %lu mês"
-msgstr[1] "há %s e %lu meses"
+msgstr[0] "à %s, %<PRIuMAX> mês"
+msgstr[1] "à %s, %<PRIuMAX> meses"
-#: date.c:197 date.c:202
-#, fuzzy, c-format
+#: date.c:198 date.c:203
+#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "há %lu ano"
-msgstr[1] "há %lu anos"
+msgstr[0] "à %<PRIuMAX> ano"
+msgstr[1] "à %<PRIuMAX> anos"
#: delta-islands.c:272
msgid "Propagating island marks"
msgstr ""
#: delta-islands.c:290
-#, fuzzy, c-format
+#, c-format
msgid "bad tree object %s"
-msgstr "objeto árvore"
+msgstr "objeto de árvore %s inválido"
#: delta-islands.c:334
#, c-format
@@ -3465,36 +3552,38 @@
msgid "Marked %d islands, done.\n"
msgstr ""
-#: diff-merges.c:70
-#, fuzzy, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "valor desconhecido '%s' da chave '%s'"
+#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
+#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
+#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
+#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
+#: builtin/pull.c:47 builtin/pull.c:321
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "valor inválido para '%s': '%s'"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
-msgstr ""
+msgstr "--merge-base é incompatível com intervalos"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
-msgstr ""
+msgstr "--merge-base apenas funciona com memórias"
-#: diff-lib.c:576
-#, fuzzy
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "incapaz obter HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr ""
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr ""
#: diff-no-index.c:237
-#, fuzzy
msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git worktree add [<opções>] <caminho> [<ramo>]"
+msgstr "git diff --no-index [<opções>] <caminho> <caminho>"
#: diff-no-index.c:262
msgid ""
@@ -3502,41 +3591,41 @@
"tree"
msgstr ""
-#: diff.c:156
+#: diff.c:159
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Falha ao analisar percentagem limite de dirstat '%s'\n"
-#: diff.c:161
+#: diff.c:164
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Parâmetro de dirstat desconhecido '%s'\n"
-#: diff.c:297
+#: diff.c:300
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
-#: diff.c:325
+#: diff.c:328
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
-#: diff.c:333
+#: diff.c:336
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr ""
-#: diff.c:410
+#: diff.c:413
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Valor desconhecido na variável de configuração 'diff.submodule': '%s'"
-#: diff.c:470
+#: diff.c:473
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3550,587 +3639,564 @@
msgid "external diff died, stopping at %s"
msgstr "o diff externo terminou inesperadamente, interrompido em %s"
-#: diff.c:4634
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check e -s são mutuamente exclusivos"
+#: diff.c:4677 parse-options.c:1114
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "opções '%s', '%s', '%s' e '%s' incapaz serem usadas juntas"
-#: diff.c:4637
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr ""
+#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "opções '%s', '%s' e '%s' incapaz serem usadas juntas"
-#: diff.c:4640
+#: diff.c:4685
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "opções '%s' e '%s' incapaz serem usadas juntas, usa '%s' com '%s'"
+
+#: diff.c:4689
+#, c-format
msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr ""
+"opções '%s' e '%s' incapaz serem usadas juntas, usa '%s' com '%s' e '%s'"
-#: diff.c:4643
-msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr ""
-
-#: diff.c:4722
+#: diff.c:4769
msgid "--follow requires exactly one pathspec"
-msgstr "--follow requer exatamente um único especificador de caminho"
+msgstr "--follow exige exatamente um espetro-caminho"
-#: diff.c:4770
-#, fuzzy, c-format
+#: diff.c:4823
+#, c-format
msgid "invalid --stat value: %s"
-msgstr "valor de cor inválido: %.*s"
+msgstr "valor --stat inválido: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr ""
-#: diff.c:4807
+#: diff.c:4860
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-"Falha ao analisar parâmetro da opção --dirstat/-X:\n"
+"Falha ao processar parâmetro de opção --dirstat/-X:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4893
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr ""
+msgstr "classe de mudança '%c' desconhecida em --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4917
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4930
-#, fuzzy, c-format
+#: diff.c:4931
+#, c-format
msgid "unable to resolve '%s'"
msgstr "incapaz resolver '%s'"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4981 diff.c:4987
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:4998
+#: diff.c:4999
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:5019
-#, fuzzy, c-format
+#: diff.c:5020
+#, c-format
msgid "bad --color-moved argument: %s"
msgstr "argumento incorreto --color-moved: %s"
-#: diff.c:5038
-#, fuzzy, c-format
+#: diff.c:5039
+#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "objeto inválido '%s' fornecido."
+msgstr "modo inválido '%s' em --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5079
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5115 diff.c:5135
#, c-format
msgid "invalid argument to %s"
msgstr ""
-#: diff.c:5238
+#: diff.c:5239
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr ""
-#: diff.c:5287
-#, fuzzy, c-format
+#: diff.c:5288
+#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
-msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
+msgstr "Falha a processar parâmetro da opção --submodule: '%s'"
-#: diff.c:5343
+#: diff.c:5344
#, c-format
msgid "bad --word-diff argument: %s"
-msgstr ""
+msgstr "argumento --word-diff incorrecto: %s"
-#: diff.c:5379
+#: diff.c:5380
msgid "Diff output format options"
msgstr ""
-#: diff.c:5381 diff.c:5387
-#, fuzzy
+#: diff.c:5382 diff.c:5388
msgid "generate patch"
-msgstr "incorporar o patch"
+msgstr "gerar remendo"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5385 builtin/log.c:180
msgid "suppress diff output"
-msgstr "suprimir saída do diff"
+msgstr "suprimir saída de diff"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5390 diff.c:5504 diff.c:5511
msgid "<n>"
-msgstr ""
+msgstr "<n>"
-#: diff.c:5390 diff.c:5393
-#, fuzzy
+#: diff.c:5391 diff.c:5394
msgid "generate diffs with <n> lines context"
-msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
+msgstr "gerar diffs com <n> linhas de contexto"
-#: diff.c:5395
+#: diff.c:5396
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5398
+#: diff.c:5399
msgid "synonym for '-p --raw'"
-msgstr ""
+msgstr "sinónimo de '-p --raw'"
-#: diff.c:5402
+#: diff.c:5403
msgid "synonym for '-p --stat'"
-msgstr ""
+msgstr "sinónimo de '-p --stat'"
-#: diff.c:5406
-#, fuzzy
+#: diff.c:5407
msgid "machine friendly --stat"
-msgstr "saída inteligível por máquina"
+msgstr "--stat amigável à máquina"
-#: diff.c:5409
+#: diff.c:5410
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5411 diff.c:5419
+#: diff.c:5412 diff.c:5420
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5412
+#: diff.c:5413
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
+"mostrar a distribuição relativa da quantidade de alterações para cada "
+"subpasta"
-#: diff.c:5416
-#, fuzzy
+#: diff.c:5417
msgid "synonym for --dirstat=cumulative"
msgstr "sinónimo de --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5421
msgid "synonym for --dirstat=files,param1,param2..."
-msgstr ""
+msgstr "sinónimo de --dirstat=files,param1,param2..."
-#: diff.c:5424
+#: diff.c:5425
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
+"avisar se alterações introduzem marcas de conflito ou erros de espaços-em-"
+"branco"
-#: diff.c:5427
+#: diff.c:5428
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: diff.c:5430
+#: diff.c:5431
msgid "show only names of changed files"
msgstr ""
-#: diff.c:5433
+#: diff.c:5434
msgid "show only names and status of changed files"
msgstr ""
-#: diff.c:5435
+#: diff.c:5436
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5436
-#, fuzzy
+#: diff.c:5437
msgid "generate diffstat"
-msgstr "diff status inesperado %c"
+msgstr "gerar diffstat"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5439 diff.c:5442 diff.c:5445
msgid "<width>"
msgstr ""
-#: diff.c:5439
+#: diff.c:5440
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5442
+#: diff.c:5443
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5445
+#: diff.c:5446
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5447
+#: diff.c:5448
msgid "<count>"
msgstr ""
-#: diff.c:5448
+#: diff.c:5449
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5451
+#: diff.c:5452
msgid "generate compact summary in diffstat"
msgstr ""
-#: diff.c:5454
+#: diff.c:5455
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5457
+#: diff.c:5458
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5459
-#, fuzzy
-msgid "show colored diff"
-msgstr "mostrar ficheiros ignorados"
-
#: diff.c:5460
+msgid "show colored diff"
+msgstr "mostrar diff colorida"
+
+#: diff.c:5461
msgid "<kind>"
msgstr ""
-#: diff.c:5461
+#: diff.c:5462
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5464
+#: diff.c:5465
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
-#, fuzzy
+#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
msgid "<prefix>"
-msgstr "<prefixo>/"
+msgstr "<prefixo>"
-#: diff.c:5468
+#: diff.c:5469
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5471
+#: diff.c:5472
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5474
-#, fuzzy
+#: diff.c:5475
msgid "prepend an additional prefix to every line of output"
-msgstr "preceder o nomebase do projeto pai na saída"
+msgstr "preceder com um prefixo adicional em todas as linhas da saída"
-#: diff.c:5477
+#: diff.c:5478
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5480
-#, fuzzy
+#: diff.c:5481
msgid "show context between diff hunks up to the specified number of lines"
-msgstr "criar um clone raso, truncado ao número especificado de revisões"
-
-#: diff.c:5484 diff.c:5489 diff.c:5494
-msgid "<char>"
msgstr ""
+"mostrar contexto entre diff de pedaços até ao número de linhas especificado"
-#: diff.c:5485
+#: diff.c:5485 diff.c:5490 diff.c:5495
+msgid "<char>"
+msgstr "<caractere>"
+
+#: diff.c:5486
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5490
+#: diff.c:5491
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5495
+#: diff.c:5496
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5498
+#: diff.c:5499
msgid "Diff rename options"
msgstr ""
-#: diff.c:5499
-#, fuzzy
-msgid "<n>[/<m>]"
-msgstr "<n>[,<base>]"
-
#: diff.c:5500
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5501
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5504
-#, fuzzy
+#: diff.c:5505
msgid "detect renames"
msgstr "detetar renomeações"
-#: diff.c:5508
+#: diff.c:5509
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5511
+#: diff.c:5512
msgid "detect copies"
msgstr ""
-#: diff.c:5515
+#: diff.c:5516
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5517
-#, fuzzy
+#: diff.c:5518
msgid "disable rename detection"
-msgstr "Deteção de mudança de nome inexata em curso"
+msgstr "desativar detecção de renomeação"
-#: diff.c:5520
+#: diff.c:5521
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5522
+#: diff.c:5523
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5525
+#: diff.c:5526
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5527
+#: diff.c:5528
msgid "Diff algorithm options"
msgstr ""
-#: diff.c:5529
+#: diff.c:5530
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5532
+#: diff.c:5533
msgid "ignore whitespace when comparing lines"
msgstr ""
-#: diff.c:5535
+#: diff.c:5536
msgid "ignore changes in amount of whitespace"
msgstr ""
-#: diff.c:5538
+#: diff.c:5539
msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: diff.c:5541
+#: diff.c:5542
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5544
+#: diff.c:5545
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
msgid "<regex>"
msgstr ""
-#: diff.c:5547
+#: diff.c:5548
msgid "ignore changes whose all lines match <regex>"
msgstr ""
-#: diff.c:5550
+#: diff.c:5551
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: diff.c:5553
+#: diff.c:5554
msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: diff.c:5557
+#: diff.c:5558
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: diff.c:5559
+#: diff.c:5560
msgid "<algorithm>"
msgstr ""
-#: diff.c:5560
+#: diff.c:5561
msgid "choose a diff algorithm"
msgstr ""
-#: diff.c:5562
-#, fuzzy
-msgid "<text>"
-msgstr "texto"
-
#: diff.c:5563
+msgid "<text>"
+msgstr "<texto>"
+
+#: diff.c:5564
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: diff.c:5565 diff.c:5574 diff.c:5577
-#, fuzzy
+#: diff.c:5566 diff.c:5575 diff.c:5578
msgid "<mode>"
-msgstr "modo"
+msgstr "<modo>"
-#: diff.c:5566
+#: diff.c:5567
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: diff.c:5569
+#: diff.c:5570
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5572
+#: diff.c:5573
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5575
+#: diff.c:5576
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5578
+#: diff.c:5579
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5581
+#: diff.c:5582
msgid "Other diff options"
msgstr ""
-#: diff.c:5583
+#: diff.c:5584
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5587
-#, fuzzy
+#: diff.c:5588
msgid "treat all files as text"
-msgstr "processar ficheiros binários como texto"
+msgstr "tratar todos ficheiros como texto"
-#: diff.c:5589
+#: diff.c:5590
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5591
+#: diff.c:5592
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5593
+#: diff.c:5594
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5595
+#: diff.c:5596
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5597
+#: diff.c:5598
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5599
-#, fuzzy
-msgid "<when>"
-msgstr "quando"
-
#: diff.c:5600
-#, fuzzy
-msgid "ignore changes to submodules in the diff generation"
-msgstr ""
-"ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
-"(Predefinição: all)"
+msgid "<when>"
+msgstr "<quando>"
-#: diff.c:5603
-#, fuzzy
-msgid "<format>"
-msgstr "formato"
+#: diff.c:5601
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignorar alterações em submódulo na geração de diff"
#: diff.c:5604
+msgid "<format>"
+msgstr "<formato>"
+
+#: diff.c:5605
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5608
+#: diff.c:5609
msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: diff.c:5611
+#: diff.c:5612
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5613
-#, fuzzy
-msgid "<string>"
-msgstr "cadeia"
-
#: diff.c:5614
+msgid "<string>"
+msgstr "<string>"
+
+#: diff.c:5615
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5617
+#: diff.c:5618
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5620
-#, fuzzy
+#: diff.c:5621
msgid "show all changes in the changeset with -S or -G"
-msgstr "mostrar ficheiros com correspondências no paginador"
+msgstr "mostrar todas as alterações em memória com -S ou -G"
-#: diff.c:5623
-#, fuzzy
+#: diff.c:5624
msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "usar expressões regulares estendidas do POSIX"
+msgstr "tratar <string> em -S como expressão comum estendida de POSIX"
-#: diff.c:5626
-#, fuzzy
+#: diff.c:5627
msgid "control the order in which files appear in the output"
-msgstr "mostrar outros ficheiros na saída"
+msgstr "controlar a ordem em que os ficheiro aparecem na saída"
-#: diff.c:5627 diff.c:5630
-#, fuzzy
+#: diff.c:5628 diff.c:5631
msgid "<path>"
-msgstr "path"
+msgstr "<caminho>"
-#: diff.c:5628
-#, fuzzy
+#: diff.c:5629
msgid "show the change in the specified path first"
msgstr ""
"escrever o ficheiro de índice do pacote na versão de formato especificada"
-#: diff.c:5631
-#, fuzzy
+#: diff.c:5632
msgid "skip the output to the specified path"
-msgstr "Repor a HEAD atual no estado especificado"
-
-#: diff.c:5633
-#, fuzzy
-msgid "<object-id>"
-msgstr "objeto"
+msgstr "ignorar saída para caminho especificado"
#: diff.c:5634
+msgid "<object-id>"
+msgstr "<id-objeto>"
+
+#: diff.c:5635
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5636
+#: diff.c:5637
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5637
+#: diff.c:5638
msgid "select files by diff type"
msgstr ""
-#: diff.c:5639
-#, fuzzy
-msgid "<file>"
-msgstr "ficheiro"
-
#: diff.c:5640
-#, fuzzy
-msgid "Output to a specific file"
-msgstr "submeter somente os ficheiros especificados"
+msgid "<file>"
+msgstr "<ficheiro>"
-#: diff.c:6298
-#, fuzzy
+#: diff.c:5641
+msgid "output to a specific file"
+msgstr "saída para um ficheiro específico"
+
+#: diff.c:6321
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"detecção de renomeação exaustiva foi ignorada devido a demasiados ficheiros."
-#: diff.c:6301
+#: diff.c:6324
msgid "only found copies from modified paths due to too many files."
msgstr ""
"só foram encontradas cópias de caminhos modificados devido a demasiados "
"ficheiros."
-#: diff.c:6304
+#: diff.c:6327
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -4142,28 +4208,28 @@
msgid "failed to read orderfile '%s'"
msgstr "falha ao ler ficheiro de comando '%s'"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
-msgstr "Deteção de mudança de nome inexata em curso"
+msgstr "Realizando detecção de renomeação inexata"
#: diffcore-rotate.c:29
-#, fuzzy, c-format
+#, c-format
msgid "No such path '%s' in the diff"
-msgstr "path %s inexistente em %s"
+msgstr "path %s inexistente em diff"
#: dir.c:593
-#, fuzzy, c-format
+#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-"especificador de path '%s' correspondeu a ficheiro nenhum conhecido pelo git"
+"espetro-caminho '%s' correspondeu a ficheiro(s) nenhum(s) conhecido pelo git"
#: dir.c:733 dir.c:762 dir.c:775
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "padrão irreconhecível: '%s'"
#: dir.c:790 dir.c:804
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "por reconhecer padrão negativo: '%s'"
@@ -4172,40 +4238,47 @@
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
-msgstr ""
+msgstr "desativando correspondência de padrão em cone"
-#: dir.c:1214
-#, fuzzy, c-format
+#: dir.c:1212
+#, c-format
msgid "cannot use %s as an exclude file"
msgstr "incapaz usar %s como ficheiro de exclusão"
-#: dir.c:2351
-#, fuzzy, c-format
+#: dir.c:2419
+#, c-format
msgid "could not open directory '%s'"
msgstr "incapaz abrir pasta '%s'"
-#: dir.c:2653
+#: dir.c:2721
msgid "failed to get kernel name and information"
msgstr "falha ao obter nome e informação do kernel"
-#: dir.c:2777
-#, fuzzy
+#: dir.c:2846
msgid "untracked cache is disabled on this system or location"
-msgstr "cache untracked está desativada neste sistema ou localização."
+msgstr "cenário desmonitorizado está desativado neste sistema ou localização"
-#: dir.c:3610
+#: dir.c:3119
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Incapaz adivinhar nome de pasta.\n"
+"Por favor especifique uma pasta na linha de comandos"
+
+#: dir.c:3807
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3657 dir.c:3662
+#: dir.c:3854 dir.c:3859
#, c-format
msgid "could not create directories for %s"
msgstr "incapaz criar pasta para %s"
-#: dir.c:3691
+#: dir.c:3888
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "incapaz migrar pasta git de '%s' para '%s'"
@@ -4215,424 +4288,498 @@
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: entry.c:176
-#, fuzzy
+#: entry.c:179
msgid "Filtering content"
-msgstr "imprimir conteúdo da tag"
+msgstr "Filtrando conteúdo"
-#: entry.c:497
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "incapaz de stat o ficheiro '%s'"
-#: environment.c:152
+#: environment.c:147
#, c-format
msgid "bad git namespace path \"%s\""
msgstr ""
-#: environment.c:334
-#, fuzzy, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "incapaz definir GIT_DIR para '%s'"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr ""
-#: fetch-pack.c:182
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: esperado lista rasa"
+msgstr "git fetch-pack: esperado lista superficial"
-#: fetch-pack.c:185
-#, fuzzy
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr "git fetch-pack: esperado pacote flush após lista rasa"
+msgstr "git fetch-pack: esperado pacote flush após lista superficial"
-#: fetch-pack.c:196
-#, fuzzy
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
+msgstr "git fetch-pack: esperado ACK/NAK, obtive um pacote flush"
-#: fetch-pack.c:216
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
+msgstr "git fetch-pack: esperado ACK/NAK, obtive '%s'"
-#: fetch-pack.c:227
-#, fuzzy
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "incapaz escrever para remoto"
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc requer multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:397 fetch-pack.c:1460
#, c-format
msgid "invalid shallow line: %s"
-msgstr "linha rasa inválida: %s"
+msgstr "linha superficial inválida: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:403 fetch-pack.c:1466
#, c-format
msgid "invalid unshallow line: %s"
-msgstr "linha por aprofundar inválida: %s"
+msgstr "linha não-aprofunda inválida: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:405 fetch-pack.c:1468
#, c-format
msgid "object not found: %s"
-msgstr "objeto perdido: %s"
+msgstr "objeto por encontrar: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:408 fetch-pack.c:1471
#, c-format
msgid "error in object: %s"
msgstr "erro no objeto: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:410 fetch-pack.c:1473
#, c-format
msgid "no shallow found: %s"
-msgstr "shallow por encontrar: %s"
+msgstr "nenhum superficial encontrado: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:413 fetch-pack.c:1477
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "esperado shallow/unshallow, recebi %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:453
#, c-format
msgid "got %s %d %s"
-msgstr "obteve-se %s %d %s"
+msgstr "obtive %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:470
#, c-format
msgid "invalid commit %s"
-msgstr "commit inválido %s"
+msgstr "memória inválida %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:501
msgid "giving up"
-msgstr "a desistir"
+msgstr "desistindo"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:514 progress.h:25
msgid "done"
msgstr "concluído"
-#: fetch-pack.c:512
+#: fetch-pack.c:526
#, c-format
msgid "got %s (%d) %s"
-msgstr "obteve-se %s (%d) %s"
+msgstr "obtive %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:562
#, c-format
msgid "Marking %s as complete"
-msgstr "Marcado %s como completo"
+msgstr "Marcando %s como completo"
-#: fetch-pack.c:763
+#: fetch-pack.c:784
#, c-format
msgid "already have %s (%s)"
-msgstr "já se tem %s (%s)"
+msgstr "já tenho %s (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:870
msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: incapaz de aforquilhar demultiplexer sideband"
+msgstr "fetch-pack: incapaz de forquear demultiplexer sideband"
-#: fetch-pack.c:857
+#: fetch-pack.c:878
msgid "protocol error: bad pack header"
-msgstr ""
-
-#: fetch-pack.c:951
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: incapaz de aforquilhar %s"
-
-#: fetch-pack.c:957
-msgid "fetch-pack: invalid index-pack output"
-msgstr ""
+msgstr "erro de protocolo: cabeçalho de pacote inválido"
#: fetch-pack.c:974
#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: incapaz de forquear %s"
+
+#: fetch-pack.c:980
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: saída de cenário-pacote inválido"
+
+#: fetch-pack.c:997
+#, c-format
msgid "%s failed"
msgstr "%s falhou"
-#: fetch-pack.c:976
+#: fetch-pack.c:999
msgid "error in sideband demultiplexer"
msgstr "erro em demultiplexer sideband"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1048
#, c-format
msgid "Server version is %.*s"
-msgstr "A versão do servidor é %.*s"
+msgstr "Versão de servidor é %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
-#, fuzzy, c-format
+#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
+#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
+#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
+#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
+#, c-format
msgid "Server supports %s"
-msgstr "O servidor suporta side-band"
+msgstr "Servidor sustenta %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1058
msgid "Server does not support shallow clients"
-msgstr "Servidor insustenta clientes shallow"
+msgstr "Servidor insustenta clientes superficiais"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1118
msgid "Server does not support --shallow-since"
msgstr "Servidor insustenta --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1123
msgid "Server does not support --shallow-exclude"
msgstr "Servidor insustenta --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1127
msgid "Server does not support --deepen"
msgstr "Servidor insustenta --deepen"
-#: fetch-pack.c:1100
-#, fuzzy
+#: fetch-pack.c:1129
msgid "Server does not support this repository's object format"
msgstr "Servidor insustenta formato de objeto deste repositório"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1142
msgid "no common commits"
-msgstr "commits comuns nenhuns"
+msgstr "memórias comuns nenhumas"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
-#, fuzzy
+#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
msgid "source repository is shallow, reject to clone."
-msgstr "o repositório de origem é raso, --local ignorado"
+msgstr "repositório de origem é superficial, rejeito clonar."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1157 fetch-pack.c:1705
msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: falha ao obter."
+msgstr "git fetch-pack: busca falhou."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1271
#, c-format
msgid "mismatched algorithms: client %s; server %s"
-msgstr ""
+msgstr "algoritmos sem correspondência: cliente %s; servidor %s"
-#: fetch-pack.c:1246
-#, fuzzy, c-format
+#: fetch-pack.c:1275
+#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "o servidor insustenta algoritmo '%s'"
-#: fetch-pack.c:1279
-#, fuzzy
+#: fetch-pack.c:1308
msgid "Server does not support shallow requests"
msgstr "Servidor insustenta pedidos shallow"
-#: fetch-pack.c:1286
-#, fuzzy
+#: fetch-pack.c:1315
msgid "Server supports filter"
msgstr "Servidor sustenta filtro"
-#: fetch-pack.c:1329 fetch-pack.c:2043
-#, fuzzy
+#: fetch-pack.c:1358 fetch-pack.c:2087
msgid "unable to write request to remote"
msgstr "incapaz escrever pedidos para remoto"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1376
#, c-format
msgid "error reading section header '%s'"
-msgstr ""
+msgstr "erro lendo cabeçalho de secção '%s'"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1382
#, c-format
msgid "expected '%s', received '%s'"
-msgstr ""
+msgstr "esperado '%s', recebi '%s'"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1416
#, c-format
msgid "unexpected acknowledgment line: '%s'"
-msgstr ""
+msgstr "linha de confirmação inesperada: '%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1421
#, c-format
msgid "error processing acks: %d"
-msgstr ""
+msgstr "erro processando acks: %d"
-#: fetch-pack.c:1402
-msgid "expected packfile to be sent after 'ready'"
-msgstr ""
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1435
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "esperado que ficheiro-pacote seja enviado depois de '%s'"
-#: fetch-pack.c:1404
-msgid "expected no other sections to be sent after no 'ready'"
-msgstr ""
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1441
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "esperar enviar outras secções apenas depois de '%s'"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1482
#, c-format
msgid "error processing shallow info: %d"
-msgstr ""
+msgstr "erro processando info superficial: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1531
#, c-format
msgid "expected wanted-ref, got '%s'"
-msgstr ""
+msgstr "esperado wanted-ref, recebi '%s'"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1536
#, c-format
msgid "unexpected wanted-ref: '%s'"
-msgstr ""
+msgstr "wanted-ref inesperada: '%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1541
#, c-format
msgid "error processing wanted refs: %d"
-msgstr ""
+msgstr "erro processando wanted-refs: %d"
-#: fetch-pack.c:1534
-#, fuzzy
+#: fetch-pack.c:1571
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: esperado pacote fim de resposta"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1983
msgid "no matching remote head"
msgstr "corresponde a remote head nenhuma"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:2006 builtin/clone.c:587
msgid "remote did not send all necessary objects"
msgstr "remoto faltou enviar todos objetos necessários"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2109
msgid "unexpected 'ready' from remote"
-msgstr ""
+msgstr "'ready' inesperado de remoto"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2132
#, c-format
msgid "no such remote ref %s"
msgstr "referência remota %s inexistente"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2135
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Servidor proíbe pedido de objeto por anunciar %s"
-#: gpg-interface.c:273
+#: fsmonitor-ipc.c:119
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr ""
+
+#: fsmonitor-ipc.c:125
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr ""
+
+#: fsmonitor-ipc.c:155
+msgid "fsmonitor--daemon is not running"
+msgstr ""
+
+#: fsmonitor-ipc.c:164
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "incapaz enviar comando '%s' para fsmonitor--daemon"
+
+#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
+#: gpg-interface.c:1011
msgid "could not create temporary file"
msgstr "incapaz criar ficheiro temporário"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:459
#, c-format
msgid "failed writing detached signature to '%s'"
-msgstr "falha ao escrever assinatura destacada em '%s'"
+msgstr "falhou ao escrever assinatura destacada em '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:450
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+
+#: gpg-interface.c:479
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+
+#: gpg-interface.c:550
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+
+#: gpg-interface.c:638
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "assinatura '%s' incorreta/incompatível"
+
+#: gpg-interface.c:815 gpg-interface.c:820
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "obtenção de fingerprint ssh para chave '%s' falhou"
+
+#: gpg-interface.c:843
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+
+#: gpg-interface.c:865
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+
+#: gpg-interface.c:871
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr ""
+
+#: gpg-interface.c:966
msgid "gpg failed to sign the data"
msgstr "gpg falhou assinar os dados"
+#: gpg-interface.c:988
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr ""
+
+#: gpg-interface.c:999
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "falhou escrita de chave de assinatura ssh para '%s'"
+
+#: gpg-interface.c:1017
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "falhou escrita de buffer de chave de assinatura ssh para '%s'"
+
+#: gpg-interface.c:1035
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+
+#: gpg-interface.c:1047
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "falhou leitura de buffer de data de assinatura ssh de '%s'"
+
#: graph.c:98
-#, fuzzy, c-format
+#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "ignorar cor inválida '%.*s' em log.graphColors"
-#: grep.c:531
+#: grep.c:446
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
msgstr ""
-#: grep.c:1895
+#: grep.c:1859
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': incapaz ler %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:1923
+#: grep.c:1887
#, c-format
msgid "'%s': short read"
msgstr "'%s': leitura truncada"
-#: help.c:23
-msgid "start a working area (see also: git help tutorial)"
-msgstr "iniciar uma área de trabalho (consulte também: git help tutorial)"
-
-#: help.c:24
-msgid "work on the current change (see also: git help everyday)"
-msgstr "trabalhar na alteração atual (consulte também: git help everyday)"
-
#: help.c:25
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "examinar o histórico e estado (consulte também: git help revisions)"
+msgid "start a working area (see also: git help tutorial)"
+msgstr "iniciar uma área-trabalho (vê também: git help tutorial)"
#: help.c:26
-msgid "grow, mark and tweak your common history"
-msgstr "aumentar, marcar e ajustar o seu histórico comum"
+msgid "work on the current change (see also: git help everyday)"
+msgstr "trabalhar na alteração atual (vê também: git help everyday)"
#: help.c:27
-msgid "collaborate (see also: git help workflows)"
-msgstr "colaborar (consulte também: git help workflows)"
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "examinar o histórico e estado (vê também: git help revisions)"
-#: help.c:31
+#: help.c:28
+msgid "grow, mark and tweak your common history"
+msgstr "aumentar, marcar e ajustar teu histórico comum"
+
+#: help.c:29
+msgid "collaborate (see also: git help workflows)"
+msgstr "colaborar (vê também: git help workflows)"
+
+#: help.c:33
msgid "Main Porcelain Commands"
msgstr ""
-#: help.c:32
+#: help.c:34
msgid "Ancillary Commands / Manipulators"
msgstr ""
-#: help.c:33
+#: help.c:35
msgid "Ancillary Commands / Interrogators"
msgstr ""
-#: help.c:34
+#: help.c:36
msgid "Interacting with Others"
msgstr ""
-#: help.c:35
+#: help.c:37
msgid "Low-level Commands / Manipulators"
msgstr ""
-#: help.c:36
+#: help.c:38
msgid "Low-level Commands / Interrogators"
msgstr ""
-#: help.c:37
+#: help.c:39
msgid "Low-level Commands / Syncing Repositories"
msgstr ""
-#: help.c:38
+#: help.c:40
msgid "Low-level Commands / Internal Helpers"
msgstr ""
-#: help.c:300
+#: help.c:316
#, c-format
msgid "available git commands in '%s'"
-msgstr "comandos do git disponível em '%s'"
+msgstr "comandos de git disponíveis em '%s'"
-#: help.c:307
+#: help.c:323
msgid "git commands available from elsewhere on your $PATH"
msgstr "comandos do git disponíveis noutras localizações em $PATH"
-#: help.c:316
+#: help.c:332
msgid "These are common Git commands used in various situations:"
msgstr "Estes são comandos do Git comuns usados em diversas situações:"
-#: help.c:365 git.c:100
-#, fuzzy, c-format
+#: help.c:382 git.c:100
+#, c-format
msgid "unsupported command listing type '%s'"
-msgstr "insustento para listagem tipo comandos '%s'"
+msgstr "insustentado para listagem tipo comandos '%s'"
-#: help.c:405
-#, fuzzy
+#: help.c:422
msgid "The Git concept guides are:"
msgstr "Os guias comuns do Git:"
-#: help.c:429
+#: help.c:446
+msgid "External commands"
+msgstr "Comandos externos"
+
+#: help.c:468
+msgid "Command aliases"
+msgstr "Aliases de comando"
+
+#: help.c:486
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
-#: help.c:434
-#, fuzzy
-msgid "External commands"
-msgstr "a executar $command"
-
-#: help.c:449
-msgid "Command aliases"
-msgstr ""
-
-#: help.c:527
+#: help.c:563
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4641,31 +4788,36 @@
"'%s' parece ser comando git, mas incapaz executá-lo.\n"
"Talvez git-%s esteja danificado?"
-#: help.c:543 help.c:631
+#: help.c:585 help.c:682
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' é comando git nenhum. Vê 'git --help'."
-#: help.c:591
+#: help.c:633
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Carago. Teu sistema reporta comandos Git nenhuns."
-#: help.c:613
-#, fuzzy, c-format
+#: help.c:655
+#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "AVISO: Chamou comando Git designado '%s', que é inexistente."
-#: help.c:618
+#: help.c:660
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
-#: help.c:623
+#: help.c:666
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr ""
+
+#: help.c:674
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-#: help.c:635
+#: help.c:686
msgid ""
"\n"
"The most similar command is"
@@ -4675,17 +4827,16 @@
msgstr[0] ""
msgstr[1] ""
-#: help.c:675
-#, fuzzy
+#: help.c:729
msgid "git version [<options>]"
-msgstr "git column [<opções>]"
+msgstr "git version [<opções>]"
-#: help.c:730
+#: help.c:784
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:788
msgid ""
"\n"
"Did you mean this?"
@@ -4699,15 +4850,27 @@
"\n"
"Queria dizer deste?"
-#: ident.c:353
+#: hook.c:28
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+
+#: hook.c:87
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "Incapaz iniciar gancho '%s'\n"
+
+#: ident.c:354
msgid "Author identity unknown\n"
msgstr ""
-#: ident.c:356
+#: ident.c:357
msgid "Committer identity unknown\n"
msgstr ""
-#: ident.c:362
+#: ident.c:363
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -4722,109 +4885,109 @@
"\n"
msgstr ""
"\n"
-"*** Por favor diga que é.\n"
+"*** Por favor, diz-me quem és.\n"
"\n"
-"Execute\n"
+"Executa\n"
"\n"
" git config --global user.email \"eu@exemplo.com\"\n"
" git config --global user.name \"Meu Nome\"\n"
"\n"
-"para definir a identidade predefinida da sua conta.\n"
-"Omita --global para definir a identidade apenas neste repositório.\n"
+"para definir a identidade predefinida da tua conta.\n"
+"Omite --global para definir a identidade apenas neste repositório.\n"
"\n"
-#: ident.c:397
+#: ident.c:398
msgid "no email was given and auto-detection is disabled"
msgstr "foi dado email nenhum e deteção automática está desativada"
-#: ident.c:402
+#: ident.c:403
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "incapaz auto-detetar endereço de e-mail (recebi '%s')"
-#: ident.c:419
+#: ident.c:420
msgid "no name was given and auto-detection is disabled"
msgstr "foi dado nome nenhum e deteção automática está desativada"
-#: ident.c:425
+#: ident.c:426
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "incapaz auto-detetar nome (recebi '%s')"
-#: ident.c:433
+#: ident.c:434
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "nome de identação vazio (para <%s>) proíbido"
-#: ident.c:439
+#: ident.c:440
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "nome consiste apenas de caracteres proíbidos: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:455 builtin/commit.c:649
#, c-format
msgid "invalid date format: %s"
msgstr "formato de data inválido: %s"
-#: list-objects-filter-options.c:83
+#: list-objects-filter-options.c:68
msgid "expected 'tree:<depth>'"
msgstr ""
-#: list-objects-filter-options.c:98
+#: list-objects-filter-options.c:83
msgid "sparse:path filters support has been dropped"
msgstr ""
-#: list-objects-filter-options.c:105
-#, fuzzy, c-format
+#: list-objects-filter-options.c:90
+#, c-format
msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "'%s' para 'object:type=<type>' é um tipo de objecto inválido"
-#: list-objects-filter-options.c:124
+#: list-objects-filter-options.c:109
#, c-format
msgid "invalid filter-spec '%s'"
msgstr ""
-#: list-objects-filter-options.c:140
+#: list-objects-filter-options.c:125
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr ""
-#: list-objects-filter-options.c:182
+#: list-objects-filter-options.c:167
msgid "expected something after combine:"
msgstr ""
-#: list-objects-filter-options.c:264
+#: list-objects-filter-options.c:249
msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: list-objects-filter-options.c:376
+#: list-objects-filter-options.c:365
msgid "unable to upgrade repository format to support partial clone"
msgstr ""
#: list-objects-filter.c:532
-#, fuzzy, c-format
+#, c-format
msgid "unable to access sparse blob in '%s'"
msgstr "incapaz acessar blob sparse em '%s'"
#: list-objects-filter.c:535
-#, fuzzy, c-format
+#, c-format
msgid "unable to parse sparse filter data in %s"
msgstr "incapaz analisar dados de filtro sparse em %s"
-#: list-objects.c:127
+#: list-objects.c:144
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
-#: list-objects.c:140
+#: list-objects.c:157
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr ""
-#: list-objects.c:398
-#, fuzzy, c-format
+#: list-objects.c:415
+#, c-format
msgid "unable to load root tree for commit %s"
-msgstr "incapaz carregar raiz de árvore para commit %s"
+msgstr "incapaz carregar raiz de árvore para memória %s"
#: lockfile.c:152
#, c-format
@@ -4850,12 +5013,12 @@
msgid "Unable to create '%s.lock': %s"
msgstr "Incapaz de criar '%s.lock': %s"
-#: ls-refs.c:37
+#: ls-refs.c:175
#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr ""
+msgid "unexpected line: '%s'"
+msgstr "linha inesperada: '%s'"
-#: ls-refs.c:167
+#: ls-refs.c:179
msgid "expected flush after ls-refs arguments"
msgstr ""
@@ -4863,44 +5026,44 @@
msgid "quoted CRLF detected"
msgstr ""
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
-#, fuzzy, c-format
+#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
+#, c-format
msgid "bad action '%s' for '%s'"
msgstr "ação inválida '%s' para '%s'"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1630 merge-recursive.c:1214
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1639 merge-recursive.c:1221
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1648 merge-recursive.c:1228
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1658 merge-ort.c:1666
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr ""
+msgstr "Nota: Avançando submódulo %s para %s"
-#: merge-ort.c:1625
-#, fuzzy, c-format
+#: merge-ort.c:1688
+#, c-format
msgid "Failed to merge submodule %s"
-msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
+msgstr "Juntar submódulo %s falhou"
-#: merge-ort.c:1632
+#: merge-ort.c:1695
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
"%s\n"
msgstr ""
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1699 merge-recursive.c:1284
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4911,42 +5074,42 @@
"which will accept this suggestion.\n"
msgstr ""
-#: merge-ort.c:1649
+#: merge-ort.c:1712
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
"%s"
msgstr ""
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1937 merge-recursive.c:1375
msgid "Failed to execute internal merge"
-msgstr "Falha ao executar integração interna"
+msgstr "Falha ao executar junção interna"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1942 merge-recursive.c:1380
#, c-format
msgid "Unable to add %s to database"
msgstr "Incapaz de adicionar %s à base de dados"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1949 merge-recursive.c:1413
#, c-format
msgid "Auto-merging %s"
-msgstr "A integrar automaticamente %s"
+msgstr "Juntando automaticamente %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2088 merge-recursive.c:2135
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2098 merge-recursive.c:2145
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: merge-ort.c:2087
+#: merge-ort.c:2156
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4954,49 +5117,48 @@
"majority of the files."
msgstr ""
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2310 merge-recursive.c:2481
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2450 merge-recursive.c:3264
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2457 merge-recursive.c:3271
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2470 merge-recursive.c:3267
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2478 merge-recursive.c:3274
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-ort.c:2569
-#, fuzzy, c-format
+#: merge-ort.c:2634
+#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
-"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
-"%s->%s em %s"
+"CONFLITO (renomear/renomear): %s renomeado para %s em %s e para %s em %s."
-#: merge-ort.c:2664
+#: merge-ort.c:2729
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -5004,71 +5166,70 @@
"markers."
msgstr ""
-#: merge-ort.c:2683 merge-ort.c:2707
-#, fuzzy, c-format
+#: merge-ort.c:2748 merge-ort.c:2772
+#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
-"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
-"%s"
+"CONFLITO (renomear/apagar): %s renomeado para %s em %s, mas apagado em %s."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3261 merge-recursive.c:3025
#, c-format
msgid "cannot read object %s"
msgstr "incapaz ler objeto %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3264 merge-recursive.c:3028
#, c-format
msgid "object %s is not a blob"
msgstr "objeto %s é blob nenhum"
-#: merge-ort.c:3613
+#: merge-ort.c:3693
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr ""
-#: merge-ort.c:3689
+#: merge-ort.c:3770
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
"of them so each can be recorded somewhere."
msgstr ""
-#: merge-ort.c:3696
+#: merge-ort.c:3777
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
"of them so each can be recorded somewhere."
msgstr ""
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3866 merge-recursive.c:3104
msgid "content"
msgstr "conteúdo"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3868 merge-recursive.c:3108
msgid "add/add"
msgstr "adicionar/adicionar"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3870 merge-recursive.c:3153
msgid "submodule"
msgstr "submódulo"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3872 merge-recursive.c:3154
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLITO (%s): conflito de integração em %s"
+msgstr "CONFLITO (%s): Conflito de junção em %s"
-#: merge-ort.c:3833
-#, fuzzy, c-format
+#: merge-ort.c:3916
+#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"of %s left in tree."
msgstr ""
-"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
-"deixada na árvore."
+"CONFLITO (modificar/apagar): %s apagado em %s e modificado em %s. Versão %s "
+"de %s deixada na árvore."
-#: merge-ort.c:4120
+#: merge-ort.c:4212
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5078,120 +5239,120 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4586
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr ""
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
-#, fuzzy, c-format
+#: merge-ort-wrappers.c:13 merge-recursive.c:3723
+#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
-"integrar:\n"
-"%%s"
+"Tuas alterações locais para os seguintes ficheiros seriam sobrescritas ao "
+"juntar:\n"
+" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
-#, fuzzy
+#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
msgid "Already up to date."
msgstr "Já está atualizado."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
-msgstr "(commit incorreto)\n"
+msgstr "(memória incorreta)\n"
-#: merge-recursive.c:375
-#, fuzzy, c-format
+#: merge-recursive.c:381
+#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "addinfo_cache falhou no caminho '%s'"
+msgstr "add_cacheinfo falhou para caminho '%s'; abortando junção."
-#: merge-recursive.c:384
-#, fuzzy, c-format
+#: merge-recursive.c:390
+#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "addinfo_cache falhou no caminho '%s'"
+msgstr "add_cacheinfo falhou a refrescar para caminho '%s'; abortando junção."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
-msgstr "falha ao criar o caminho '%s'%s"
+msgstr "falhou criar caminho '%s'%s"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
-msgstr "A remover %s para criar espaço para o subdiretório\n"
+msgstr "Removendo %s para criar espaço para subpasta\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": talvez um conflito D/F?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
-msgstr "recusando perder ficheiro untracked em '%s'"
+msgstr "recusando perder ficheiro desmonitorizado em '%s'"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:47
#, c-format
msgid "cannot read object %s '%s'"
msgstr "incapaz ler objeto %s '%s'"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "falhou ao abrir '%s': %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "falha ao criar a ligação simbólica '%s': %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "desconheço que fazer com %06o %s '%s'"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr ""
+msgstr "Avançando submódulo %s para a seguinte memória:"
-#: merge-recursive.c:1226 merge-recursive.c:1238
-#, fuzzy, c-format
+#: merge-recursive.c:1239 merge-recursive.c:1252
+#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avançando submódulo %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1265
+#: merge-recursive.c:1280
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr ""
+msgstr "Falhou ao juntar submódulo %s (diferente de avanço)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1281
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: merge-recursive.c:1278
+#: merge-recursive.c:1293
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: merge-recursive.c:1420
-#, fuzzy, c-format
+#: merge-recursive.c:1437
+#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-"Erro: Recusando perder ficheiro untracked de '%s'; escrevendo invés para %s"
+"Erro: Recusando perder ficheiro desmonitorizado em '%s'; invés escrevendo "
+"para %s"
-#: merge-recursive.c:1492
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5200,7 +5361,7 @@
"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
"deixada na árvore."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1514
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5209,7 +5370,7 @@
"CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s "
"de %s deixada na árvore."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1521
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5218,7 +5379,7 @@
"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
"deixada na árvore em %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5227,43 +5388,44 @@
"CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s "
"de %s deixada na árvore em %s."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "rename"
-msgstr "mudar nome"
+msgstr "renomear"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "renamed"
msgstr "nome mudado"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
-#, fuzzy, c-format
+#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
+#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Recusando perder ficheiro sujo de %s"
-#: merge-recursive.c:1605
-#, fuzzy, c-format
+#: merge-recursive.c:1622
+#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-"Recusando perder ficheiro untracked de %s, apesar de este estar no caminho."
+"Recusando perder ficheiro desmonitorizado em %s, apesar de estar no caminho."
-#: merge-recursive.c:1663
-#, fuzzy, c-format
+#: merge-recursive.c:1680
+#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
"%s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1711
#, c-format
msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s é um diretório em %s adicionando %s no seu lugar"
+msgstr "%s é um pasta em %s adicionando como %s invés"
-#: merge-recursive.c:1699
-#, fuzzy, c-format
+#: merge-recursive.c:1716
+#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s invés"
+msgstr ""
+"Recusando perder ficheiro desmonitorizado em %s; invés adicionando como %s"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1743
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5272,18 +5434,18 @@
"CONFLITO (mudar nome/mudar nome): Mudar o nome \"%s\"->\"%s\" no ramo \"%s\" "
"mudar o nome \"%s\"->\"%s\" em \"%s\"%s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1748
msgid " (left unresolved)"
msgstr " (por resolver)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1840
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
"%s->%s em %s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2103
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5291,8 +5453,8 @@
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2220
-#, fuzzy, c-format
+#: merge-recursive.c:2237
+#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
@@ -5300,307 +5462,336 @@
"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
"%s->%s em %s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modified"
msgstr "modificado"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3131
#, c-format
msgid "Skipped %s (merged same as existing)"
-msgstr "%s ignorado (integrado é igual ao existente)"
+msgstr "%s saltado (junto é igual ao existente)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3184
#, c-format
msgid "Adding as %s instead"
msgstr "A adicionar como %s, em alternativa."
-#: merge-recursive.c:3371
+#: merge-recursive.c:3388
#, c-format
msgid "Removing %s"
-msgstr "A remover %s"
+msgstr "Removendo %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3411
msgid "file/directory"
-msgstr "ficheiro/diretório"
+msgstr "ficheiro/pasta"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3416
msgid "directory/file"
-msgstr "diretório/ficheiro"
+msgstr "pasta/ficheiro"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3423
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr ""
-"CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s"
+msgstr "CONFLITO (%s): Há uma pasta designada %s em %s. Adicionando %s como %s"
-#: merge-recursive.c:3415
+#: merge-recursive.c:3432
#, c-format
msgid "Adding %s"
msgstr "A adicionar %s"
-#: merge-recursive.c:3424
-#, fuzzy, c-format
+#: merge-recursive.c:3441
+#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "CONFLITO (%s): conflito de integração em %s"
+msgstr "CONFLITO (add/add): Conflito de junção em %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3494
#, c-format
msgid "merging of trees %s and %s failed"
-msgstr "falha ao integrar as árvores %s e %s"
+msgstr "falha ao juntar árvores %s e %s"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3588
msgid "Merging:"
-msgstr "A integrar:"
+msgstr "Juntando:"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3601
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u antecessor comum encontrado:"
msgstr[1] "%u antecessores comuns encontrados:"
-#: merge-recursive.c:3634
+#: merge-recursive.c:3651
msgid "merge returned no commit"
-msgstr "junção retornou commit nenhum"
+msgstr "junção retornou memória nenhuma"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3823
#, c-format
msgid "Could not parse object '%s'"
msgstr "Incapaz de analisar objeto '%s'"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
+#: builtin/stash.c:489
msgid "Unable to write index."
-msgstr "Incapaz de escrever no index."
+msgstr "Incapaz de escrever cenário."
#: merge.c:41
msgid "failed to read the cache"
-msgstr "falha ao ler a cache"
+msgstr "falhou ao ler o cenário"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
+#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
+#: builtin/stash.c:269
msgid "unable to write new index file"
-msgstr "incapaz escrever novo ficheiro index"
+msgstr "incapaz escrever ficheiro de cenário novo"
-#: midx.c:74
-#, fuzzy
+#: midx.c:79
msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr "versão %d de multi-pack-index é irreconhecível"
+msgstr ""
-#: midx.c:105
+#: midx.c:112
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
-#: midx.c:121
+#: midx.c:128
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: midx.c:126
+#: midx.c:133
#, c-format
msgid "multi-pack-index version %d not recognized"
-msgstr "versão %d de multi-pack-index é irreconhecível"
+msgstr "versão %d de multi-pack-index irreconhecível"
-#: midx.c:131
+#: midx.c:138
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
-#: midx.c:148
+#: midx.c:155
msgid "multi-pack-index missing required pack-name chunk"
-msgstr ""
+msgstr "multi-pack-index em falta exigia fragmento nome-pacote"
-#: midx.c:150
+#: midx.c:157
msgid "multi-pack-index missing required OID fanout chunk"
-msgstr ""
+msgstr "multi-pack-index em falta exigia OID de fanout de fragmento"
-#: midx.c:152
+#: midx.c:159
msgid "multi-pack-index missing required OID lookup chunk"
-msgstr ""
+msgstr "multi-pack-index em falta exigia OID de procura de fragmento"
-#: midx.c:154
+#: midx.c:161
msgid "multi-pack-index missing required object offsets chunk"
-msgstr ""
+msgstr "multi-pack-index em falta exigia fragmento de deslocamentos de objeto"
-#: midx.c:170
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:214
+#: midx.c:228
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:264
+#: midx.c:278
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:490
+#: midx.c:509
#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
-#: midx.c:496
+#: midx.c:515
#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
-#: midx.c:564
+#: midx.c:583
#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
-#: midx.c:880 builtin/index-pack.c:1533
-#, fuzzy
+#: midx.c:911
msgid "cannot store reverse index file"
-msgstr "incapaz guardar ficheiro index"
+msgstr "incapaz guardar ficheiro de cenário reverso"
-#: midx.c:920
+#: midx.c:1009
+#, c-format
+msgid "could not parse line: %s"
+msgstr "incapaz processar linha: %s"
+
+#: midx.c:1011
+#, c-format
+msgid "malformed line: %s"
+msgstr "linha malformada: %s"
+
+#: midx.c:1181
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "ignorando multi-pack-index existente; checksum diferente"
-#: midx.c:943
+#: midx.c:1206
+msgid "could not load pack"
+msgstr "incapaz carregar pacote"
+
+#: midx.c:1212
+#, c-format
+msgid "could not open index for %s"
+msgstr "incapaz abrir cenário para %s"
+
+#: midx.c:1223
msgid "Adding packfiles to multi-pack-index"
msgstr ""
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr ""
-
-#: midx.c:1034
+#: midx.c:1266
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr ""
-#: midx.c:1039
-#, fuzzy, c-format
+#: midx.c:1311
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "incapaz selecionar pacote preferido %s sem objetos"
+
+#: midx.c:1343
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:1389
+#, c-format
msgid "preferred pack '%s' is expired"
-msgstr "o repositório de referência '%s' está enxertado"
+msgstr "pacote preferencial '%s' expirou"
-#: midx.c:1055
-#, fuzzy
+#: midx.c:1402
msgid "no pack files to index."
-msgstr "pack files nenhuns para index."
+msgstr "pack files nenhuns para cenário."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1409
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "apenas posso escrever multi-pacote .bitmap com objetos"
+
+#: midx.c:1451
+msgid "could not write multi-pack bitmap"
+msgstr "incapaz escrever multi-pacote bitmap"
+
+#: midx.c:1461
+msgid "could not write multi-pack-index"
+msgstr "incapaz escrever multi-pacote-index"
+
+#: midx.c:1520 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "falha ao remover %s"
-#: midx.c:1166
+#: midx.c:1553
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: midx.c:1225
+#: midx.c:1616
msgid "multi-pack-index file exists, but failed to parse"
msgstr ""
-#: midx.c:1233
+#: midx.c:1624
msgid "incorrect checksum"
msgstr "checksum incorreto"
-#: midx.c:1236
+#: midx.c:1627
msgid "Looking for referenced packfiles"
msgstr ""
-#: midx.c:1251
+#: midx.c:1642
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:1256
+#: midx.c:1647
msgid "the midx contains no oid"
msgstr ""
-#: midx.c:1265
+#: midx.c:1656
msgid "Verifying OID order in multi-pack-index"
msgstr ""
-#: midx.c:1274
+#: midx.c:1665
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:1294
+#: midx.c:1685
msgid "Sorting objects by packfile"
msgstr ""
-#: midx.c:1301
+#: midx.c:1692
msgid "Verifying object offsets"
msgstr ""
-#: midx.c:1317
-#, fuzzy, c-format
+#: midx.c:1708
+#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "falhou carregar entrada pack para oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1714
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: midx.c:1332
+#: midx.c:1723
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: midx.c:1357
-#, fuzzy
+#: midx.c:1750
msgid "Counting referenced objects"
msgstr "Contando objetos referenciados"
-#: midx.c:1367
+#: midx.c:1760
msgid "Finding and deleting unreferenced packfiles"
msgstr ""
-#: midx.c:1558
-#, fuzzy
+#: midx.c:1952
msgid "could not start pack-objects"
msgstr "incapaz de começar pack-objects"
-#: midx.c:1578
-#, fuzzy
+#: midx.c:1972
msgid "could not finish pack-objects"
msgstr "incapaz de terminar pack-objects"
#: name-hash.c:542
-#, fuzzy, c-format
+#, c-format
msgid "unable to create lazy_dir thread: %s"
-msgstr "incapaz criar thread lazy_dir: %s"
+msgstr "incapaz criar fio lazy_dir: %s"
#: name-hash.c:564
-#, fuzzy, c-format
+#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "incapaz criar thread lazy_name: %s"
#: name-hash.c:570
-#, fuzzy, c-format
+#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "incapaz juntar a thread lazy_name: %s"
-#: notes-merge.c:277
+#: notes-merge.c:276
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-"Ficou por concluír a anterior junção de notas (%s existe).\n"
+"Ficou por concluir a anterior junção de notas (%s existe).\n"
"Por favor, usa 'git notes merge --commit' ou 'git notes merge --abort' para "
-"commitar/abortar a junção anterior antes de começares uma nova junção de "
+"memorizar/abortar a junção anterior antes de começares uma nova junção de "
"notas."
-#: notes-merge.c:284
+#: notes-merge.c:283
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Ficou por concluír a tua junção de notas (%s existe)."
@@ -5608,7 +5799,7 @@
#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-"Impossível commit notas de árvore que estejam por iniciar/por referênciar"
+"incapaz memorizar notas de árvore que estejam por iniciar/por referenciar"
#: notes-utils.c:105
#, c-format
@@ -5629,281 +5820,343 @@
msgid "Bad %s value: '%s'"
msgstr "Valor incorreto de %s: '%s'"
-#: object-file.c:526
+#: object-file.c:457
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: object-file.c:584
-#, fuzzy, c-format
+#: object-file.c:515
+#, c-format
msgid "unable to normalize alternate object path: %s"
-msgstr "incapaz normalizar path de objeto alternativo: %s"
+msgstr "incapaz normalizar caminho de objeto alternativo: %s"
-#: object-file.c:658
+#: object-file.c:589
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: object-file.c:665
-#, fuzzy, c-format
+#: object-file.c:596
+#, c-format
msgid "unable to normalize object directory: %s"
msgstr "incapaz normalizar pasta de objeto: %s"
-#: object-file.c:708
-#, fuzzy
+#: object-file.c:639
msgid "unable to fdopen alternates lockfile"
msgstr "incapaz de fdopen lockfile alternativo"
-#: object-file.c:726
-#, fuzzy
+#: object-file.c:657
msgid "unable to read alternates file"
msgstr "incapaz ler ficheiro alternativo"
-#: object-file.c:733
-#, fuzzy
+#: object-file.c:664
msgid "unable to move new alternates file into place"
msgstr "incapaz mover novo ficheiro alternativo para o sítio"
-#: object-file.c:768
+#: object-file.c:742
#, c-format
msgid "path '%s' does not exist"
msgstr "caminho '%s' é inexistente"
-#: object-file.c:789
+#: object-file.c:763
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-"repositório referência '%s' como uma checkout ligada ainda é insustentado."
+"repositório referência '%s' como uma observação ligada ainda é insustentado."
-#: object-file.c:795
+#: object-file.c:769
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "repositório referência '%s' é repositório local nenhum."
-#: object-file.c:801
+#: object-file.c:775
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "o repositório de referência '%s' é raso"
-#: object-file.c:809
+#: object-file.c:783
#, c-format
msgid "reference repository '%s' is grafted"
-msgstr "o repositório de referência '%s' está enxertado"
+msgstr "repositório de referência '%s' está enxertado"
-#: object-file.c:869
+#: object-file.c:814
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "incapaz encontrar pasta objeto correspondendo %s"
+
+#: object-file.c:864
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: object-file.c:1019
+#: object-file.c:1014
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: object-file.c:1054
-#, fuzzy, c-format
+#: object-file.c:1049
+#, c-format
msgid "mmap failed%s"
msgstr "mmap falhou%s"
-#: object-file.c:1218
+#: object-file.c:1230
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: object-file.c:1353 object-file.c:2548
-#, fuzzy, c-format
+#: object-file.c:1349 object-file.c:2588
+#, c-format
msgid "corrupt loose object '%s'"
msgstr "objeto solto '%s' corrupto"
-#: object-file.c:1355 object-file.c:2552
-#, fuzzy, c-format
+#: object-file.c:1351 object-file.c:2592
+#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "lixo no fim de objeto solto '%s'"
-#: object-file.c:1397
-#, fuzzy
-msgid "invalid object type"
-msgstr "tipo de objeto incorreto."
-
-#: object-file.c:1481
+#: object-file.c:1473
#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
+msgid "unable to parse %s header"
+msgstr "incapaz processar cabeçalho %s"
-#: object-file.c:1484
-#, fuzzy, c-format
+#: object-file.c:1475
+msgid "invalid object type"
+msgstr "tipo de objeto inválido"
+
+#: object-file.c:1486
+#, c-format
msgid "unable to unpack %s header"
msgstr "incapaz desempacotar cabeçalho %s"
#: object-file.c:1490
#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
+msgid "header for %s too long, exceeds %d bytes"
msgstr ""
-#: object-file.c:1493
-#, fuzzy, c-format
-msgid "unable to parse %s header"
-msgstr "incapaz processar cabeçalho %s"
-
-#: object-file.c:1717
-#, fuzzy, c-format
+#: object-file.c:1720
+#, c-format
msgid "failed to read object %s"
-msgstr "falha ao ler o objeto '%s'."
+msgstr "falhou ler objeto %s"
-#: object-file.c:1721
-#, fuzzy, c-format
+#: object-file.c:1724
+#, c-format
msgid "replacement %s not found for %s"
msgstr "%s substituto, por encontrar para %s"
-#: object-file.c:1725
+#: object-file.c:1728
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1729
+#: object-file.c:1732
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1834
-#, fuzzy, c-format
+#: object-file.c:1855
+#, c-format
msgid "unable to write file %s"
msgstr "incapaz escrever ficheiro %s"
-#: object-file.c:1841
-#, fuzzy, c-format
+#: object-file.c:1862
+#, c-format
msgid "unable to set permission to '%s'"
msgstr "incapaz definir permissão para '%s'"
-#: object-file.c:1848
+#: object-file.c:1869
msgid "file write error"
msgstr ""
-#: object-file.c:1868
+#: object-file.c:1904
msgid "error when closing loose object file"
msgstr ""
-#: object-file.c:1933
+#: object-file.c:1971
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: object-file.c:1935
-#, fuzzy
+#: object-file.c:1973
msgid "unable to create temporary file"
msgstr "incapaz criar ficheiro temporário"
-#: object-file.c:1959
-#, fuzzy
+#: object-file.c:1997
msgid "unable to write loose object file"
msgstr "incapaz escrever ficheiro objeto solto"
-#: object-file.c:1965
-#, fuzzy, c-format
+#: object-file.c:2003
+#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "incapaz esvaziar objeto novo %s (%d)"
-#: object-file.c:1969
-#, fuzzy, c-format
+#: object-file.c:2007
+#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd em objeto %s falhou (%d)"
-#: object-file.c:1973
+#: object-file.c:2011
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:2022 builtin/pack-objects.c:1251
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: object-file.c:2060
-#, fuzzy, c-format
+#: object-file.c:2100
+#, c-format
msgid "cannot read object for %s"
msgstr "incapaz ler objeto para %s"
-#: object-file.c:2111
-#, fuzzy
+#: object-file.c:2151
msgid "corrupt commit"
-msgstr "substituir autor do commit"
+msgstr "memória de Git rota"
-#: object-file.c:2119
-#, fuzzy
+#: object-file.c:2159
msgid "corrupt tag"
-msgstr "mostrar tags"
+msgstr "etiqueta rota"
-#: object-file.c:2219
+#: object-file.c:2259
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: object-file.c:2222
-#, fuzzy, c-format
+#: object-file.c:2262
+#, c-format
msgid "short read while indexing %s"
msgstr "leitura curta enquanto indexando %s"
-#: object-file.c:2295 object-file.c:2305
-#, fuzzy, c-format
+#: object-file.c:2335 object-file.c:2345
+#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: falhou inserir na base de dados"
-#: object-file.c:2311
-#, fuzzy, c-format
+#: object-file.c:2351
+#, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipo ficheiro insustentado"
-#: object-file.c:2335
-#, fuzzy, c-format
+#: object-file.c:2375 builtin/fetch.c:1494
+#, c-format
msgid "%s is not a valid object"
msgstr "%s é objeto inválido"
-#: object-file.c:2337
+#: object-file.c:2377
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s é um objeto inválido '%s'"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2404
#, c-format
msgid "unable to open %s"
msgstr "incapaz abrir %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2599
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: object-file.c:2583
-#, fuzzy, c-format
+#: object-file.c:2622
+#, c-format
msgid "unable to mmap %s"
msgstr "incapaz mmap %s"
-#: object-file.c:2588
-#, fuzzy, c-format
+#: object-file.c:2628
+#, c-format
msgid "unable to unpack header of %s"
msgstr "incapaz desempacotar cabeçalho de %s"
-#: object-file.c:2594
-#, fuzzy, c-format
+#: object-file.c:2633
+#, c-format
msgid "unable to parse header of %s"
msgstr "incapaz processar cabeçalho de %s"
-#: object-file.c:2605
-#, fuzzy, c-format
+#: object-file.c:2644
+#, c-format
msgid "unable to unpack contents of %s"
msgstr "incapaz desempacotar conteúdo de %s"
-#: object-name.c:480
-#, fuzzy, c-format
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c:382
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [objeto inválido]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c:407
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "memória %s %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c:428
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "etiqueta %s %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#. "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c:439
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [tag inválida, incapaz de processá-la]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c:447
+#, c-format
+msgid "%s tree"
+msgstr "árvore %s"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c:453
+#, c-format
+msgid "%s blob"
+msgstr "blob %s"
+
+#: object-name.c:569
+#, c-format
msgid "short object ID %s is ambiguous"
-msgstr "SHA1 curto %s é ambíguo"
+msgstr "ID curto de objeto %s é ambíguo"
-#: object-name.c:491
-msgid "The candidates are:"
-msgstr "Os candidatos são:"
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c:591
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Os candidatos são:\n"
+"%s"
-#: object-name.c:790
-#, fuzzy
+#: object-name.c:888
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5925,76 +6178,78 @@
"examine estas refs e talvez apague-as. Desative esta mensagem\n"
"executando \"git config advice.objectNameWarning false\""
-#: object-name.c:910
+#: object-name.c:1008
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr ""
-#: object-name.c:918
+#: object-name.c:1016
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr ""
-#: object-name.c:1696
-#, fuzzy, c-format
+#: object-name.c:1794
+#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
+msgstr "caminho '%s' existe em disco, mas é inexistente em '%.*s'"
-#: object-name.c:1702
+#: object-name.c:1800
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
msgstr ""
-#: object-name.c:1711
-#, fuzzy, c-format
+#: object-name.c:1809
+#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "caminho '%s' é inexistente em '%.*s'"
-#: object-name.c:1739
+#: object-name.c:1837
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
"hint: Did you mean ':%d:%s'?"
msgstr ""
-#: object-name.c:1755
+#: object-name.c:1853
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
msgstr ""
-#: object-name.c:1763
+#: object-name.c:1861
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr ""
-#: object-name.c:1765
-#, fuzzy, c-format
+#: object-name.c:1863
+#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "caminho '%s' é inexistente (quer no disco quer no index)"
+msgstr "caminho '%s' é inexistente (quer no disco quer no cenário)"
-#: object-name.c:1778
-#, fuzzy
+#: object-name.c:1876
msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-"Os caminhos relativos só podem ser usados a partir do topo da árvore de "
-"trabalho"
+msgstr "caminhos relativos proibidos serem usados fora da árvore-trabalho"
-#: object-name.c:1916
-#, fuzzy, c-format
+#: object-name.c:1901
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr ""
+
+#: object-name.c:2014
+#, c-format
msgid "invalid object name '%.*s'."
-msgstr "Nome de objeto inválido: '%s'."
+msgstr "nome de objeto inválido: '%.*s'."
#: object.c:53
-#, fuzzy, c-format
+#, c-format
msgid "invalid object type \"%s\""
-msgstr "objeto blob inválido %s"
+msgstr "tipo de objeto inválido \"%s\""
#: object.c:173
-#, fuzzy, c-format
+#, c-format
msgid "object %s is a %s, not a %s"
msgstr "objeto %s é %s, é %s nenhum(a)"
@@ -6008,20 +6263,33 @@
msgid "unable to parse object: %s"
msgstr "incapaz analisar objeto: %s"
-#: object.c:283 object.c:295
+#: object.c:283 object.c:294
#, c-format
msgid "hash mismatch %s"
msgstr ""
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
-#, fuzzy, c-format
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr ""
+
+#: pack-bitmap.c:433
+msgid "load_reverse_index: could not open pack"
+msgstr ""
+
+#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
+#, c-format
msgid "unable to get size of %s"
msgstr "incapaz obter tamanho de %s"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
-#, fuzzy, c-format
+#: pack-bitmap.c:1937
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "incapaz encontrar %s em pacote %s no deslocamento %<PRIuMAX>"
+
+#: pack-bitmap.c:1973 builtin/rev-list.c:91
+#, c-format
msgid "unable to get disk usage of %s"
-msgstr "incapaz obter tamanho de %s"
+msgstr "incapaz obter utilização em disco de %s"
#: pack-revindex.c:221
#, c-format
@@ -6048,180 +6316,208 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr ""
-#: pack-write.c:250
-#, fuzzy
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
-msgstr "incapaz ler o index"
+msgstr "incapaz escrever e também verificar cenário reverso"
-#: pack-write.c:271
-#, fuzzy, c-format
+#: pack-write.c:270
+#, c-format
msgid "could not stat: %s"
-msgstr "incapaz obter estatutário %s"
+msgstr "incapaz stat: %s"
-#: pack-write.c:283
-#, fuzzy, c-format
+#: pack-write.c:282
+#, c-format
msgid "failed to make %s readable"
-msgstr "falha a analisar %s"
+msgstr "falhou fazer %s legível"
-#: pack-write.c:522
-#, fuzzy, c-format
+#: pack-write.c:521
+#, c-format
msgid "could not write '%s' promisor file"
msgstr "incapaz escrever ficheiro promissor '%s'"
-#: packfile.c:625
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"
-#: packfile.c:655
-#, fuzzy, c-format
+#: packfile.c:657
+#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "ficheiro-pacote %s incapaz ser mapeado%s"
-#: packfile.c:1934
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset antes do início do índice do pacote %s (índice corrompido?)"
-#: packfile.c:1938
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr ""
-#: parse-options-cb.c:41
-#, fuzzy, c-format
+#: parse-options-cb.c:42
+#, c-format
msgid "malformed expiration date '%s'"
msgstr "data de prazo de validade malformada '%s'"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "nome do objeto malformado '%s'"
-#: parse-options.c:38
-#, fuzzy, c-format
-msgid "%s requires a value"
-msgstr "a opção '%s' requer um valor"
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr ""
-#: parse-options.c:73
-#, fuzzy, c-format
+#: parse-options.c:58
+#, c-format
+msgid "%s requires a value"
+msgstr "%s exige um valor"
+
+#: parse-options.c:93
+#, c-format
msgid "%s is incompatible with %s"
msgstr "%s é incompatível com %s"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr ""
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
-#, fuzzy, c-format
+#: parse-options.c:112 parse-options.c:116
+#, c-format
msgid "%s takes no value"
-msgstr "%s tem múltiplos valores"
+msgstr "%s leva valor nenhum"
-#: parse-options.c:94
-#, fuzzy, c-format
+#: parse-options.c:114
+#, c-format
msgid "%s isn't available"
msgstr "%s está indisponível"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr ""
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr ""
-#: parse-options.c:879
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr ""
-#: parse-options.c:881
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr ""
-#: parse-options.c:883
-#, fuzzy, c-format
+#: parse-options.c:896
+#, c-format
msgid "unknown non-ascii option in string: `%s'"
-msgstr "Definidição --confirm desconhecida: '%s'"
+msgstr "opção não-ascii desconhecida em string: `%s'"
-#: parse-options.c:907
+#: parse-options.c:920
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
-msgstr "utilização: %s"
+msgstr "uso: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " ou: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:970
+#, c-format
+msgid "%*s%s"
+msgstr ""
+
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-NUM"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "Incapaz de fazer %s escrevível ao grupo"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Carácter de escape '\\' é proíbido como último carácter no valor attr"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Só se pode especificar um 'attr:'."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "attr spec tem de ter algum conteúdo"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "nome de atributo inválido %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"as definições globais 'glob' e 'noglob' de especificador de caminho "
"(pathspec) são incompatíveis"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6229,143 +6525,136 @@
"a definição global de especificador de caminho 'literal' é incompatível com "
"todas as outras definições globais de especificador de caminho (pathspec)"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
+msgstr "parâmetro inválido para magia de espetro-caminho 'prefix'"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Mágica do especificador de caminho '%.*s' inválida em '%s'"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Falta um ')' no final da mágica do especificador de caminho em '%s'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Por implementar, magic pathspec '%c' em '%s'"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' e 'glob' são incompatíveis"
-#: pathspec.c:466
-#, fuzzy, c-format
+#: pathspec.c:465
+#, c-format
msgid "%s: '%s' is outside repository at '%s'"
-msgstr "%s: '%s' está fora do repositório em '%s'"
+msgstr "%s: '%s' está fora do repositório de '%s'"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (mnemónica: '%c')"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: magic pathspec insustentado por este comando: %s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "o especificador de caminho '%s' é indicado por uma ligação simbólica"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr ""
#: pkt-line.c:92
-#, fuzzy
msgid "unable to write flush packet"
msgstr "incapaz escrever pacote flush"
#: pkt-line.c:99
-#, fuzzy
msgid "unable to write delim packet"
msgstr "incapaz escrever pacote delim"
#: pkt-line.c:106
-#, fuzzy
msgid "unable to write response end packet"
msgstr "incapaz escrever pacote fim de resposta"
#: pkt-line.c:113
-#, fuzzy
msgid "flush packet write failed"
msgstr "escrita de pacote flush falhou"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr ""
#: pkt-line.c:169 pkt-line.c:171
-#, fuzzy
msgid "packet write with format failed"
msgstr "escrita de pacote com formato falhou"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
#: pkt-line.c:222
-#, fuzzy, c-format
+#, c-format
msgid "packet write failed: %s"
-msgstr "escrita de pacote falhou"
+msgstr "escrita de pacote falhou: %s"
-#: pkt-line.c:328 pkt-line.c:329
-#, fuzzy
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
-msgstr "erro do programa"
+msgstr "erro de leitura"
-#: pkt-line.c:339 pkt-line.c:340
-#, fuzzy
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
-msgstr "O remoto desligou após contacto inicial"
+msgstr "o lado remoto desligou inesperadamente"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "erro remoto: %s"
#: preload-index.c:125
-#, fuzzy
msgid "Refreshing index"
-msgstr "Refrescando index"
+msgstr "Refrescando cenário"
#: preload-index.c:144
-#, fuzzy, c-format
+#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "incapaz criar thread de lstat: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
-msgstr "incapaz analisar formato de --pretty"
+msgstr "incapaz processar formato de --pretty"
#: promisor-remote.c:31
msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr ""
+msgstr "promisor-remote: incapaz de forquear subprocesso buscar"
#: promisor-remote.c:38 promisor-remote.c:40
msgid "promisor-remote: could not write to fetch subprocess"
-msgstr ""
+msgstr "promisor-remote: incapaz de escrever para subprocesso buscar"
#: promisor-remote.c:44
msgid "promisor-remote: could not close stdin to fetch subprocess"
msgstr ""
+"promisor-remote: incapaz de fechar entrada padrão para subprocesso buscar"
#: promisor-remote.c:54
#, c-format
@@ -6373,277 +6662,271 @@
msgstr ""
#: protocol-caps.c:103
-#, fuzzy
msgid "object-info: expected flush after arguments"
-msgstr "--continue supõe argumento nenhum"
+msgstr ""
#: prune-packed.c:35
msgid "Removing duplicate objects"
msgstr "A remover objetos duplicados"
-#: range-diff.c:78
-#, fuzzy
+#: range-diff.c:68
msgid "could not start `log`"
msgstr "incapaz começar `log`"
-#: range-diff.c:80
-#, fuzzy
+#: range-diff.c:70
msgid "could not read `log` output"
msgstr "incapaz ler output de `log`"
-#: range-diff.c:101 sequencer.c:5550
-#, fuzzy, c-format
+#: range-diff.c:98 sequencer.c:5575
+#, c-format
msgid "could not parse commit '%s'"
-msgstr "incapaz analisar commit '%s'"
+msgstr "incapaz processar memória '%s'"
-#: range-diff.c:115
+#: range-diff.c:109
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
"'%s'"
msgstr ""
-#: range-diff.c:140
-#, fuzzy, c-format
+#: range-diff.c:132
+#, c-format
msgid "could not parse git header '%.*s'"
-msgstr "incapaz analisar cabeçalho git '%.*s'"
+msgstr "incapaz processar cabeçalho git '%.*s'"
-#: range-diff.c:307
+#: range-diff.c:300
msgid "failed to generate diff"
msgstr ""
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr ""
-
-#: range-diff.c:562 range-diff.c:564
-#, fuzzy, c-format
+#: range-diff.c:558 range-diff.c:560
+#, c-format
msgid "could not parse log for '%s'"
-msgstr "incapaz analisar log para '%s'"
+msgstr "incapaz processar registo para '%s'"
-#: read-cache.c:710
-#, fuzzy, c-format
+#: read-cache.c:737
+#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr "%s: já existe no índice"
+msgstr "adicionarei nenhuma alias de ficheiro '%s' ('%s' já existe em cenário)"
-#: read-cache.c:726
+#: read-cache.c:753
msgid "cannot create an empty blob in the object database"
msgstr ""
-#: read-cache.c:748
+#: read-cache.c:775
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: read-cache.c:753
-#, fuzzy, c-format
+#: read-cache.c:780 builtin/submodule--helper.c:3359
+#, c-format
msgid "'%s' does not have a commit checked out"
-msgstr "'%s' tem commit checked out nenhum"
+msgstr "'%s' tem memória nenhuma em observação"
-#: read-cache.c:805
-#, fuzzy, c-format
+#: read-cache.c:832
+#, c-format
msgid "unable to index file '%s'"
-msgstr "incapaz indexar ficheiro '%s'"
+msgstr "incapaz encenar ficheiro '%s'"
-#: read-cache.c:824
-#, fuzzy, c-format
+#: read-cache.c:851
+#, c-format
msgid "unable to add '%s' to index"
-msgstr "incapaz adicionar %s a index"
+msgstr "incapaz adicionar '%s' a cenário"
-#: read-cache.c:835
-#, fuzzy, c-format
+#: read-cache.c:862
+#, c-format
msgid "unable to stat '%s'"
-msgstr "incapaz obter estatutário de '%s'"
+msgstr "incapaz de stat '%s'"
-#: read-cache.c:1358
-#, fuzzy, c-format
+#: read-cache.c:1404
+#, c-format
msgid "'%s' appears as both a file and as a directory"
-msgstr "'%s' aparece ambo como ficheiro e como pasta"
+msgstr "'%s' aparece quer como ficheiro quer como pasta"
-#: read-cache.c:1573
-#, fuzzy
+#: read-cache.c:1619
msgid "Refresh index"
-msgstr "Refresca index"
+msgstr "Refresca cenário"
-#: read-cache.c:1705
+#: read-cache.c:1751
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"index.version definido, mas com valor inválido.\n"
-"A usar a versão %i"
+"Usando versão %i"
-#: read-cache.c:1715
+#: read-cache.c:1761
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"GIT_INDEX_VERSION definido, mas com valor inválido.\n"
-"A usar a versão %i"
+"Usando versão %i"
-#: read-cache.c:1771
+#: read-cache.c:1817
#, c-format
msgid "bad signature 0x%08x"
msgstr ""
-#: read-cache.c:1774
-#, fuzzy, c-format
+#: read-cache.c:1820
+#, c-format
msgid "bad index version %d"
-msgstr "versão de índice '%s' incorreta"
+msgstr "versão de cenário %d inválida"
-#: read-cache.c:1783
+#: read-cache.c:1829
msgid "bad index file sha1 signature"
msgstr ""
-#: read-cache.c:1817
+#: read-cache.c:1863
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: read-cache.c:1819
-#, fuzzy, c-format
+#: read-cache.c:1865
+#, c-format
msgid "ignoring %.4s extension"
-msgstr "modelo %s ignorado"
+msgstr "ignorando extensão %.4s"
-#: read-cache.c:1856
-#, fuzzy, c-format
+#: read-cache.c:1902
+#, c-format
msgid "unknown index entry format 0x%08x"
-msgstr "formato de %.*s desconhecido %s"
+msgstr "formato de entrada do cenário 0x%08x desconhecido"
-#: read-cache.c:1872
+#: read-cache.c:1918
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1929
+#: read-cache.c:1975
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1932
-#, fuzzy, c-format
+#: read-cache.c:1978
+#, c-format
msgid "multiple stage entries for merged file '%s'"
-msgstr "multíplas entradas de estágio para ficheiro juntado '%s'"
+msgstr "múltiplas entradas de cenário para ficheiro juntado '%s'"
-#: read-cache.c:1935
-#, fuzzy, c-format
+#: read-cache.c:1981
+#, c-format
msgid "unordered stage entries for '%s'"
-msgstr "entradas de estágio desordenadas para '%s'"
+msgstr "entradas de cenário desordenadas para '%s'"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
+#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
+#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
+#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
+#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
+#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
msgid "index file corrupt"
-msgstr ""
+msgstr "ficheiro de cenário rompido"
-#: read-cache.c:2185
-#, fuzzy, c-format
+#: read-cache.c:2240
+#, c-format
msgid "unable to create load_cache_entries thread: %s"
-msgstr "incapaz criar thread load_cache_entries: %s"
+msgstr "incapaz criar fio load_cache_entries: %s"
-#: read-cache.c:2198
-#, fuzzy, c-format
+#: read-cache.c:2253
+#, c-format
msgid "unable to join load_cache_entries thread: %s"
-msgstr "incapaz juntar a thread load_cache_entries: %s"
+msgstr "incapaz juntar a fio load_cache_entries: %s"
-#: read-cache.c:2231
-#, fuzzy, c-format
+#: read-cache.c:2286
+#, c-format
msgid "%s: index file open failed"
-msgstr "falha ao adicionar ficheiros"
+msgstr "%s: abertura de ficheiro de cenário falhou"
-#: read-cache.c:2235
-#, fuzzy, c-format
+#: read-cache.c:2290
+#, c-format
msgid "%s: cannot stat the open index"
-msgstr "%s: incapaz obter estatutário de index aberto"
+msgstr "%s: incapaz de stat o cenário aberto"
-#: read-cache.c:2239
+#: read-cache.c:2294
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
-#: read-cache.c:2243
-#, fuzzy, c-format
+#: read-cache.c:2298
+#, c-format
msgid "%s: unable to map index file%s"
-msgstr "%s: incapaz mapear ficheiro index%s"
+msgstr "%s: incapaz mapear ficheiro de cenário%s"
-#: read-cache.c:2286
-#, fuzzy, c-format
+#: read-cache.c:2341
+#, c-format
msgid "unable to create load_index_extensions thread: %s"
-msgstr "incapaz criar thread load_index_extensions: %s"
+msgstr "incapaz criar fio load_index_extensions: %s"
-#: read-cache.c:2313
-#, fuzzy, c-format
+#: read-cache.c:2368
+#, c-format
msgid "unable to join load_index_extensions thread: %s"
-msgstr "incapaz juntar a thread load_index_extensions: %s"
+msgstr "incapaz juntar a fio load_index_extensions: %s"
-#: read-cache.c:2351
-#, fuzzy, c-format
+#: read-cache.c:2414
+#, c-format
msgid "could not freshen shared index '%s'"
-msgstr "incapaz refrescar index partilhado '%s'"
+msgstr "incapaz refrescar cenário partilhado '%s'"
-#: read-cache.c:2398
+#: read-cache.c:2473
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3032
+msgid "cannot write split index for a sparse index"
+msgstr "incapaz escrever cenário dividido de um cenário disperso"
+
+#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
#, c-format
msgid "could not close '%s'"
msgstr "incapaz fechar '%s'"
-#: read-cache.c:3075
+#: read-cache.c:3157
msgid "failed to convert to a sparse-index"
msgstr ""
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
-#, fuzzy, c-format
+#: read-cache.c:3228
+#, c-format
msgid "could not stat '%s'"
-msgstr "incapaz obter estatutário '%s'"
+msgstr "incapaz de stat '%s'"
-#: read-cache.c:3159
+#: read-cache.c:3241
#, c-format
msgid "unable to open git dir: %s"
msgstr "incapaz abrir pasta git: %s"
-#: read-cache.c:3171
+#: read-cache.c:3253
#, c-format
msgid "unable to unlink: %s"
-msgstr "incapaz deslinkar: %s"
+msgstr "incapaz de unlink: %s"
-#: read-cache.c:3200
-#, fuzzy, c-format
+#: read-cache.c:3282
+#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "incapaz arranjar bits de permissão em '%s'"
-#: read-cache.c:3349
-#, fuzzy, c-format
+#: read-cache.c:3439
+#, c-format
msgid "%s: cannot drop to stage #0"
-msgstr "%s: incapaz baixar para estágio #0"
+msgstr "%s: incapaz cair para cenário #0"
#: rebase-interactive.c:11
-#, fuzzy
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-"Pode corrí-lo com 'git rebase --edit-todo' e depois executar 'git rebase --"
-"continue'.\n"
+"Podes consertar isto com 'git rebase --edit-todo' e depois executar 'git "
+"rebase --continue'.\n"
+"Ou podes abortar o rebase com 'git rebase --abort'.\n"
#: rebase-interactive.c:33
-#, fuzzy, c-format
+#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-"Definição $check_level desconhecida da opção rebase.missingCommitsCheck. "
-"Ignorado."
+"definição %s desconhecida da opção rebase.missingCommitsCheck. Ignorando."
#: rebase-interactive.c:42
-#, fuzzy
msgid ""
"\n"
"Commands:\n"
@@ -6669,32 +6952,44 @@
msgstr ""
"\n"
"Comandos:\n"
-" p, pick = usar commit\n"
-" r, reword = usar commit, mas editar a mensagem de commit\n"
-" e, edit = usar commit, mas parar para emendar\n"
-" s, squash = usar commit, mas fundir com o commit anterior\n"
-" f, fixup = como \"squash\", mas descartar a mensagem deste commit\n"
-" x, exec = executar o comando (o resto da linha) usando a shell\n"
-" d, drop = remover commit\n"
+"p, pick <memória> = usar memória\n"
+"r, reword <memória> = usar memória, mas editar a mensagem de memória\n"
+"e, edit <memória> = usar memória, mas parar para emendar\n"
+"s, squash <memória> = usar memória, mas fundir com a memória anterior\n"
+"f, fixup [-C | -c] <memória> = como \"squash\", mas mantém apenas a\n"
+" mensagem de registo da memória anterior, a menos que\n"
+" -C seja usada, e neste caso mantém apenas esta mensagem\n"
+" de memória; -c é o mesmo que -C mas abre o editor\n"
+"x, exec <comando> = executar o comando (o resto da linha) usando a shell\n"
+"b, break = parar aqui (continuar rebase mais tarde com 'git rebase --"
+"continue')\n"
+"d, drop <memória> = remover memória\n"
+"l, label <rótulo> = rotular HEAD atual com um nome\n"
+"t, reset <rótulo> = restabelecer HEAD a um rótulo\n"
+"n, merge [-C <memória> | -c <memória>] <rótulo> [# <oneline>]\n"
+". criar uma memória de junção usando a mensagem de memória\n"
+". original (ou oneline, se nenhuma memória de junção for\n"
+". especificada); usa -c <memória> para refrasear a mensagem\n"
+". de memória\n"
"\n"
"Estas linhas pode ser reordenadas; são executadas de cima para baixo.\n"
#: rebase-interactive.c:66
-#, fuzzy, c-format
+#, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)"
-msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)"
+msgstr[0] "Rebasear %s sobre %s (%d comando)"
+msgstr[1] "Rebasear %s sobre %s (%d comandos)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
"\n"
-"Remove linha nenhuma. Usa explicitamente 'drop' para remover um commit.\n"
+"Remove linha nenhuma. Usa explicitamente 'drop' para remover uma memória.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6702,7 +6997,7 @@
"\n"
"Se remover uma linha daqui AQUELE COMMIT SERÁ PERDIDO.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6716,7 +7011,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6726,29 +7021,29 @@
"No entanto, se remover tudo, o rebase será abortado.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
-#, fuzzy, c-format
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
+#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
+#: builtin/rebase.c:191
+#, c-format
msgid "could not write '%s'"
msgstr "incapaz escrever '%s'"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
-#, fuzzy, c-format
+#: rebase-interactive.c:119
+#, c-format
msgid "could not write '%s'."
msgstr "incapaz escrever '%s'."
#: rebase-interactive.c:196
-#, fuzzy, c-format
+#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
-"Aviso: alguns commits podem ter sido descartados acidentalmente.\n"
-"Commits descartados (mais novo para o mais velho):\n"
+"Aviso: algumas memórias podem ter sido descartadas acidentalmente.\n"
+"Memórias descartadas (de nova para mais velha):\n"
#: rebase-interactive.c:203
-#, fuzzy, c-format
+#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
@@ -6757,21 +7052,19 @@
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
-"Para evitar esta mensagem, use \"drop\" para remover um commit "
+"Para evitar esta mensagem, usa \"drop\" para remover uma memória "
"explicitamente.\n"
"\n"
-"Use 'git config rebase.missingCommitsCheck' para mudar o nível de avisos.\n"
-"O comportamentos possíveis são: ignore, warn, error.\n"
+"Usa 'git config rebase.missingCommitsCheck' para mudar o nível de avisos.\n"
+"Comportamentos possíveis são: ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "incapaz ler '%s'."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr ""
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2057
msgid "gone"
msgstr "desapareceu"
@@ -6790,258 +7083,238 @@
msgid "ahead %d, behind %d"
msgstr "à frente %d, atrás %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "formato esperado: %%(color:<cor>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "cor desconhecida: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "valor inteiro esperado refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valor inteiro esperado refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argumento %%(%s) desconhecido: %s"
-#: ref-filter.c:315
-#, fuzzy, c-format
+#: ref-filter.c:320
+#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) leva argumentos nenhuns"
-#: ref-filter.c:339
-#, fuzzy, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "argumento %%(objectsize) desconhecido: %s"
-
-#: ref-filter.c:347
-#, fuzzy, c-format
+#: ref-filter.c:352
+#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) leva argumentos nenhuns"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) leva argumentos nenhuns"
-#: ref-filter.c:372
-#, fuzzy, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "argumento %%(subject) desconhecido: %s"
-
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr ""
-#: ref-filter.c:393
-#, fuzzy, c-format
+#: ref-filter.c:398
+#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argumento %%(trailers) desconhecido: %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:426
+#: ref-filter.c:458
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "argumento %%(contents) desconhecido: %s"
-
-#: ref-filter.c:441
-#, fuzzy, c-format
msgid "positive value expected '%s' in %%(%s)"
-msgstr "valor positivo esperado contents:lines=%s"
+msgstr "valor positivo esperado '%s' em %%(%s)"
-#: ref-filter.c:445
-#, fuzzy, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "argumento '%s' desconhecido em %%(%s)"
-
-#: ref-filter.c:459
-#, fuzzy, c-format
+#: ref-filter.c:476
+#, c-format
msgid "unrecognized email option: %s"
msgstr "opção de email desconhecida: %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "formato esperado: %%(align:<largura>,<posição>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "posição desconhecida: %s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "largura desconhecida: %s"
-#: ref-filter.c:517
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "argumento %%(align) desconhecido: %s"
-
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
-msgstr "largura positiva esperada com o átomo %%(algn)"
+msgstr "largura positiva esperada com o átomo %%(align)"
-#: ref-filter.c:543
+#: ref-filter.c:568
#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "argumento %%(if) desconhecido: %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) leva argumentos nenhuns"
-#: ref-filter.c:645
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
-msgstr "nome de ficheiro malformado: %.*s"
+msgstr "nome em campo malformado: %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "nome do campo desconhecido: %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:801
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "formato: átomo %%(if) utilizado sem átomo %%(then) correspondente"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "formatar: átomo %%(%s) usado sem átomo %%(%s)"
-#: ref-filter.c:865
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "formato: átomo %%(then) utilizado sem átomo %%(if) correspondente"
-
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "formato: átomo %%(then) utilizado mais que uma vez"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "formato: átomo %%(then) utilizado depois de %%(else)"
-#: ref-filter.c:897
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "formato: átomo %%(else) utilizado sem átomo %%(if) correspondente"
-
-#: ref-filter.c:899
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "formato: átomo %%(else) utilizado sem átomo %%(then) correspondente"
-
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "formato: átomo %%(else) utilizado mais que uma vez"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "formato: átomo %%(end) utilizado sem átomo correspondente"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "formato de string %s malformado"
-#: ref-filter.c:1621
-#, fuzzy, c-format
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr ""
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s incapaz ser usado com --python, --shell, --tcl"
+
+#: ref-filter.c:1707
+#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ramo nenhum, rebaseando %s)"
-#: ref-filter.c:1624
-#, fuzzy, c-format
+#: ref-filter.c:1710
+#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(ramo nenhum, rebaseando HEAD solta %s)"
+msgstr "(ramo nenhum, rebaseando HEAD desanexada %s)"
-#: ref-filter.c:1627
-#, fuzzy, c-format
+#: ref-filter.c:1713
+#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ramo nenhum, bisseção iniciada em %s)"
-#: ref-filter.c:1631
+#: ref-filter.c:1717
#, c-format
msgid "(HEAD detached at %s)"
-msgstr "(HEAD destacada em %s)"
+msgstr "(HEAD desanexada em %s)"
-#: ref-filter.c:1634
+#: ref-filter.c:1720
#, c-format
msgid "(HEAD detached from %s)"
-msgstr "(HEAD destacada de %s)"
+msgstr "(HEAD desanexada de %s)"
-#: ref-filter.c:1637
-#, fuzzy
+#: ref-filter.c:1723
msgid "(no branch)"
msgstr "(ramo nenhum)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1755 ref-filter.c:1973
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1679
+#: ref-filter.c:1765
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "falha ao invocar parse_object_buffer sobre %s de %s"
-#: ref-filter.c:2064
+#: ref-filter.c:2156
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto malformado em '%s'"
-#: ref-filter.c:2153
+#: ref-filter.c:2246
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorando ref com nome quebrado %s"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2251 refs.c:672
#, c-format
msgid "ignoring broken ref %s"
-msgstr "a referência %s danificada foi ignorada"
+msgstr "ref quebrada %s está a ser ignorada"
-#: ref-filter.c:2502
+#: ref-filter.c:2630
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta átomo %%(end)"
-#: ref-filter.c:2596
+#: ref-filter.c:2741
#, c-format
msgid "malformed object name %s"
msgstr "nome de objeto malformado %s"
-#: ref-filter.c:2601
-#, fuzzy, c-format
+#: ref-filter.c:2746
+#, c-format
msgid "option `%s' must point to a commit"
-msgstr "opção '%s' tem apontar para um commit"
+msgstr "opção `%s' tem de apontar para uma memória"
-#: refs.c:264
-#, fuzzy, c-format
+#: reflog.c:407
+#, c-format
+msgid "not a reflog: %s"
+msgstr "reflog inválido: %s"
+
+#: reflog.c:410
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "reflog nenhum para '%s'"
+
+#: refs.c:262
+#, c-format
msgid "%s does not point to a valid object!"
-msgstr "'%s' aponta para objeto válido nenhum!"
+msgstr "%s aponta para objeto inválido!"
-#: refs.c:566
+#: refs.c:561
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -7056,81 +7329,81 @@
"\tgit branch -m <name>\n"
msgstr ""
-#: refs.c:588
-#, fuzzy, c-format
+#: refs.c:583
+#, c-format
msgid "could not retrieve `%s`"
-msgstr "incapaz recuperar '%s'"
+msgstr "incapaz resgatar `%s`"
-#: refs.c:598
-#, fuzzy, c-format
+#: refs.c:593
+#, c-format
msgid "invalid branch name: %s = %s"
msgstr "Nome de ramo inválido: %s = %s"
-#: refs.c:674
-#, fuzzy, c-format
+#: refs.c:670
+#, c-format
msgid "ignoring dangling symref %s"
-msgstr "a referência %s danificada foi ignorada"
+msgstr "ignorando ref-simbólica suspensa %s"
-#: refs.c:922
+#: refs.c:919
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:929
+#: refs.c:926
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:994
+#: refs.c:991
#, c-format
msgid "log for %s is empty"
msgstr ""
#: refs.c:1086
-#, fuzzy, c-format
+#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "recusando atualizar ref com nome inválido '%s'"
-#: refs.c:1157
+#: refs.c:1164
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: refs.c:2051
-#, fuzzy, c-format
+#: refs.c:2059
+#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "atualizações múltiplas para ref '%s' proíbidas"
-#: refs.c:2131
+#: refs.c:2145
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs.c:2142
+#: refs.c:2156
msgid "ref updates aborted by hook"
msgstr ""
-#: refs.c:2242 refs.c:2272
-#, fuzzy, c-format
+#: refs.c:2264 refs.c:2294
+#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe; incapaz criar '%s'"
-#: refs.c:2248 refs.c:2283
-#, fuzzy, c-format
+#: refs.c:2270 refs.c:2305
+#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "incapaz processar '%s' e '%s' ao mesmo tempo"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1295
#, c-format
msgid "could not remove reference %s"
msgstr "incapaz remover referência %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1310 refs/packed-backend.c:1565
+#: refs/packed-backend.c:1575
#, c-format
msgid "could not delete reference %s: %s"
msgstr "incapaz apagar referência %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1313 refs/packed-backend.c:1578
#, c-format
msgid "could not delete references: %s"
msgstr "incapaz apagar referências: %s"
@@ -7140,50 +7413,50 @@
msgid "invalid refspec '%s'"
msgstr ""
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr ""
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr ""
-#: remote.c:590
+#: remote.c:698
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Incapaz buscar ambos %s e %s para %s"
-#: remote.c:594
+#: remote.c:702
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s geralmente segue %s, invés de %s"
-#: remote.c:598
+#: remote.c:706
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s segue %s e %s em simultâneo"
-#: remote.c:666
+#: remote.c:774
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: remote.c:676
+#: remote.c:784
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: remote.c:1083
-#, fuzzy, c-format
+#: remote.c:1191
+#, c-format
msgid "src refspec %s does not match any"
-msgstr "src refspec %s corresponde a nenhum"
+msgstr "espetro-ref src %s com nenhuma correspondência"
-#: remote.c:1088
+#: remote.c:1196
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
@@ -7192,7 +7465,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1211
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -7206,7 +7479,7 @@
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-#: remote.c:1123
+#: remote.c:1231
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -7214,7 +7487,7 @@
"'%s:refs/heads/%s'?"
msgstr ""
-#: remote.c:1128
+#: remote.c:1236
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -7222,7 +7495,7 @@
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1133
+#: remote.c:1241
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -7230,7 +7503,7 @@
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1138
+#: remote.c:1246
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -7238,131 +7511,127 @@
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1174
-#, fuzzy, c-format
+#: remote.c:1282
+#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s incapaz ser resolvido para ramo"
-#: remote.c:1185
-#, fuzzy, c-format
+#: remote.c:1293
+#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "incapaz apagar '%s': ref remoto é inexistente"
-#: remote.c:1197
+#: remote.c:1305
#, c-format
msgid "dst refspec %s matches more than one"
msgstr ""
-#: remote.c:1204
+#: remote.c:1312
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
-#: remote.c:1724 remote.c:1825
+#: remote.c:1833 remote.c:1940
msgid "HEAD does not point to a branch"
msgstr "HEAD aponta para ramo nenhum"
-#: remote.c:1733
+#: remote.c:1842
#, c-format
msgid "no such branch: '%s'"
msgstr "ramo inexistente: '%s'"
-#: remote.c:1736
+#: remote.c:1845
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "configurado upstream nenhum para ramo '%s'"
-#: remote.c:1742
+#: remote.c:1851
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "incapaz gravar ramo upstream '%s' como ramo remote-tracking"
+msgstr "incapaz gravar ramo upstream '%s' como ramo remoto de monitorização"
-#: remote.c:1757
+#: remote.c:1866
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-"destino de atirar '%s' em remoto '%s' tem ramo de tracking local nenhum"
+"destino de atirar '%s' em remoto '%s' tem nenhum ramo de monitorização local"
-#: remote.c:1769
+#: remote.c:1881
#, c-format
msgid "branch '%s' has no remote for pushing"
-msgstr "ramo '%s' tem remoto para atirar nenhum"
+msgstr "ramo '%s' tem nenhum remoto para atirar"
-#: remote.c:1779
+#: remote.c:1891
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
-msgstr "refspecs de atirar para '%s'incluí '%s' nenhum"
+msgstr "espetro-ref de atirar para '%s' incluí '%s' nenhum"
-#: remote.c:1792
+#: remote.c:1904
msgid "push has no destination (push.default is 'nothing')"
-msgstr "publicação sem destino (push.default é 'nothing')"
+msgstr "atirar sem destino (push.default é 'nothing')"
-#: remote.c:1814
+#: remote.c:1926
msgid "cannot resolve 'simple' push to a single destination"
msgstr "incapaz resolver atiro 'simple' para destino único"
-#: remote.c:1943
-#, fuzzy, c-format
+#: remote.c:2059
+#, c-format
msgid "couldn't find remote ref %s"
msgstr "incapaz encontrar ref remoto %s"
-#: remote.c:1956
+#: remote.c:2072
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: remote.c:2119
+#: remote.c:2235
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "A base do seu ramo é '%s', mas o ramo a montante desapareceu.\n"
+msgstr "Teu ramo é baseado em '%s', mas o upstream desapareceu.\n"
-#: remote.c:2123
+#: remote.c:2239
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " (use \"git branch --unset-upstream\" para corrigir)\n"
+msgstr " (usa \"git branch --unset-upstream\" para consertar)\n"
-#: remote.c:2126
-#, fuzzy, c-format
+#: remote.c:2242
+#, c-format
msgid "Your branch is up to date with '%s'.\n"
-msgstr "O seu ramo está atualizado com '%s'.\n"
+msgstr "Teu ramo está atualizado com '%s'.\n"
-#: remote.c:2130
-#, fuzzy, c-format
+#: remote.c:2246
+#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "O seu ramo está à frente de '%s' por %d commit.\n"
+msgstr "Teu ramo e '%s' referem-se a memórias diferentes.\n"
-#: remote.c:2133
+#: remote.c:2249
#, c-format
msgid " (use \"%s\" for details)\n"
-msgstr ""
+msgstr " (para detalhes usa \"%s\")\n"
-#: remote.c:2137
+#: remote.c:2253
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "O seu ramo está à frente de '%s' por %d commit.\n"
-msgstr[1] "O seu ramo está à frente de '%s' por %d commits.\n"
+msgstr[0] "Teu ramo está à frente de '%s' por %d memória.\n"
+msgstr[1] "Teu ramo está à frente de '%s' por %d memórias.\n"
-#: remote.c:2143
+#: remote.c:2259
msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " (use \"git push\" para publicar os commits locais)\n"
+msgstr " (usa \"git push\" para publicar tuas memórias locais)\n"
-#: remote.c:2146
+#: remote.c:2262
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-"O seu ramo está atrás de '%s' por %d commit, podendo ser atualizado com "
-"avanço rápido.\n"
-msgstr[1] ""
-"O seu ramo está atrás de '%s' por %d commits, podendo ser atualizado com "
-"avanço rápido.\n"
+msgstr[0] "Teu ramo está atrás de '%s' por %d memória, e pode ser avançado.\n"
+msgstr[1] "Teu ramo está atrás de '%s' por %d memórias, e pode ser avançado.\n"
-#: remote.c:2154
+#: remote.c:2270
msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " (use \"git pull\" para atualizar o seu ramo local)\n"
+msgstr " (usa \"git pull\" para atualizar teu ramo local)\n"
-#: remote.c:2157
+#: remote.c:2273
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -7371,183 +7640,172 @@
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
-"O seu ramo e '%s' divergiram,\n"
-"tendo cada um %d e %d commit diferente, respetivamente.\n"
+"Teu ramo e '%s' divergiram,\n"
+"tendo cada um %d e %d memória diferente, respetivamente.\n"
msgstr[1] ""
-"O seu ramo e '%s' divergiram,\n"
-"tendo cada um %d e %d commits diferentes, respetivamente.\n"
+"Teu ramo e '%s' divergiram,\n"
+"tendo cada um %d e %d memórias diferentes, respetivamente.\n"
-#: remote.c:2167
+#: remote.c:2283
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n"
+msgstr " (usa \"git pull\" para juntar o ramo remoto no teu)\n"
-#: remote.c:2359
-#, fuzzy, c-format
+#: remote.c:2475
+#, c-format
msgid "cannot parse expected object name '%s'"
-msgstr "incapaz analisar nome de objeto esperado '%s'"
+msgstr "incapaz processar nome de objeto esperado '%s'"
#: replace-object.c:21
-#, fuzzy, c-format
+#, c-format
msgid "bad replace ref name: %s"
msgstr "substituição de nome de ref inválida: %s"
#: replace-object.c:30
-#, fuzzy, c-format
+#, c-format
msgid "duplicate replace ref: %s"
msgstr "substituição duplicada de ref: %s"
#: replace-object.c:82
-#, fuzzy, c-format
+#, c-format
msgid "replace depth too high for object %s"
-msgstr "substituir a tag se esta existir"
+msgstr "substituir profundidade demasiado funda para objeto %s"
#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
-msgstr ""
+msgstr "MERGE_RR rompido"
#: rerere.c:248 rerere.c:253
-#, fuzzy
msgid "unable to write rerere record"
msgstr "incapaz escrever registro rerere"
#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
-msgstr ""
+msgstr "houve erros enquanto escrevia '%s' (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr ""
-#: rerere.c:487 rerere.c:1023
-#, fuzzy, c-format
+#: rerere.c:487 rerere.c:1024
+#, c-format
msgid "could not parse conflict hunks in '%s'"
-msgstr "incapaz analisar pedaços conflituosos em '%s'"
+msgstr "incapaz processar pedaços de conflito em '%s'"
-#: rerere.c:668
+#: rerere.c:669
#, c-format
msgid "failed utime() on '%s'"
-msgstr ""
+msgstr "falhou utime() em '%s'"
-#: rerere.c:678
+#: rerere.c:679
#, c-format
msgid "writing '%s' failed"
-msgstr ""
+msgstr "escrita de '%s' falhou"
-#: rerere.c:698
+#: rerere.c:699
#, c-format
msgid "Staged '%s' using previous resolution."
-msgstr ""
+msgstr "Encenei '%s' usando resolução anterior."
-#: rerere.c:737
+#: rerere.c:738
#, c-format
msgid "Recorded resolution for '%s'."
-msgstr ""
+msgstr "Guardei resolução para '%s'."
-#: rerere.c:772
+#: rerere.c:773
#, c-format
msgid "Resolved '%s' using previous resolution."
-msgstr ""
+msgstr "Resolvi '%s' usando resolução anterior."
-#: rerere.c:787
-#, fuzzy, c-format
+#: rerere.c:788
+#, c-format
msgid "cannot unlink stray '%s'"
-msgstr "incapaz deslinkar o perdido '%s'"
+msgstr "incapaz unlink o perdido '%s'"
-#: rerere.c:791
+#: rerere.c:792
#, c-format
msgid "Recorded preimage for '%s'"
-msgstr ""
+msgstr "Guardei pré-imagem para '%s'"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
+#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
#, c-format
msgid "could not create directory '%s'"
msgstr "incapaz criar pasta '%s'"
-#: rerere.c:1041
-#, fuzzy, c-format
+#: rerere.c:1042
+#, c-format
msgid "failed to update conflicted state in '%s'"
-msgstr "falha ao criar a ligação '%s'"
+msgstr "falhou atualizar estado conflituoso em '%s'"
-#: rerere.c:1052 rerere.c:1059
-#, fuzzy, c-format
+#: rerere.c:1053 rerere.c:1060
+#, c-format
msgid "no remembered resolution for '%s'"
-msgstr "a faltar a lembrança da solução para '%s'"
+msgstr "a faltar a lembrança da resolução para '%s'"
-#: rerere.c:1061
-#, fuzzy, c-format
+#: rerere.c:1062
+#, c-format
msgid "cannot unlink '%s'"
-msgstr "incapaz de deslinkar '%s'"
+msgstr "incapaz de unlink '%s'"
-#: rerere.c:1071
+#: rerere.c:1072
#, c-format
msgid "Updated preimage for '%s'"
-msgstr ""
+msgstr "Actualizei pré-imagem para '%s'"
-#: rerere.c:1080
-#, fuzzy, c-format
+#: rerere.c:1081
+#, c-format
msgid "Forgot resolution for '%s'\n"
-msgstr "Está esquecida resolução para '%s'\n"
+msgstr "Esqueci resolução para '%s'\n"
-#: rerere.c:1191
-#, fuzzy
+#: rerere.c:1192
msgid "unable to open rr-cache directory"
msgstr "incapaz abrir pasta rr-cache"
-#: reset.c:42
-#, fuzzy
+#: reset.c:112
msgid "could not determine HEAD revision"
msgstr "incapaz determinar revisão de HEAD"
-#: reset.c:69 reset.c:75 sequencer.c:3689
-#, fuzzy, c-format
+#: reset.c:141 reset.c:147 sequencer.c:3696
+#, c-format
msgid "failed to find tree of %s"
-msgstr "Falha ao procurar árvore de %s."
+msgstr "falhou encontrar árvore de %s"
-#: revision.c:2344
+#: revision.c:2358
msgid "--unpacked=<packfile> no longer supported"
-msgstr ""
+msgstr "--unpacked=<ficheiro-pacote> insustentado"
-#: revision.c:2684
+#: revision.c:2712
msgid "your current branch appears to be broken"
-msgstr "o ramo atual parece estar danificado"
+msgstr "teu ramo atual parece estar danificado"
-#: revision.c:2687
+#: revision.c:2715
#, c-format
msgid "your current branch '%s' does not have any commits yet"
-msgstr "teu ramo atual '%s' ainda contém commits nenhuns"
+msgstr "teu ramo atual '%s' tem memórias nenhumas, por enquanto"
-#: revision.c:2893
+#: revision.c:2901
+msgid "object filtering requires --objects"
+msgstr ""
+
+#: revision.c:2918
msgid "-L does not yet support diff formats besides -p and -s"
-msgstr ""
+msgstr "-L apenas sustenta formatos diff com -p ou -s"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "falha ao abrir /dev/null"
-
-#: run-command.c:1274
-#, fuzzy, c-format
-msgid "cannot create async thread: %s"
-msgstr "incapaz criar thread assíncrona: %s"
-
-#: run-command.c:1344
+#: run-command.c:1262
#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
+msgid "cannot create async thread: %s"
+msgstr "incapaz criar fio assíncrono: %s"
#: send-pack.c:150
-#, fuzzy
msgid "unexpected flush packet while reading remote unpack status"
-msgstr "flush de pacotes inesperado enquanto lendo unpack status remoto"
+msgstr "pacote flush inesperado enquanto lendo status dê descompactação remoto"
#: send-pack.c:152
#, c-format
msgid "unable to parse remote unpack status: %s"
-msgstr "incapaz analisar unpack status remota: %s"
+msgstr "incapaz processar status de descompactação remota: %s"
#: send-pack.c:154
#, c-format
@@ -7556,198 +7814,222 @@
#: send-pack.c:378
msgid "failed to sign the push certificate"
-msgstr "falha ao assinar o certificado de publicação"
+msgstr "falha ao assinar o certificado de atiro"
-#: send-pack.c:433
-#, fuzzy
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
-msgstr "fetch-pack: incapaz de aforquilhar %s"
+msgstr "send-pack: incapaz de forquear subprocesso buscar"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
-msgstr ""
+msgstr "falhou negociação de atiro; mesmo assim continuando com atiro"
-#: send-pack.c:526
-#, fuzzy
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
-msgstr "o recetor insustenta algoritmo hash deste repositório"
-
-#: send-pack.c:535
-msgid "the receiving end does not support --signed push"
-msgstr "o recetor insustenta atiro --signed"
+msgstr "o lado receptor insustenta algoritmo hash deste repositório"
#: send-pack.c:537
+msgid "the receiving end does not support --signed push"
+msgstr "o lado receptor insustenta atiro com --signed"
+
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-"certificado de atiro por enviar uma vez que o recetor insustenta atirocom --"
-"signed"
+"certificado de atiro por enviar uma vez que o lado receptor insustenta atiro "
+"com --signed"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
-msgstr "o recetor insustenta atiro com --atomic"
+msgstr "o lado receptor insustenta atiro com --atomic"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
-msgstr "o recetor insustenta opções de atiro"
+msgstr "o lado receptor insustenta opções de atiro"
-#: sequencer.c:196
-#, fuzzy, c-format
+#: sequencer.c:197
+#, c-format
msgid "invalid commit message cleanup mode '%s'"
-msgstr "Modo de limpeza inválido %s"
+msgstr "mensagem de memória de modo de limpeza '%s' inválida"
-#: sequencer.c:324
-#, fuzzy, c-format
+#: sequencer.c:325
+#, c-format
msgid "could not delete '%s'"
msgstr "incapaz de apagar '%s'"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "incapaz remover '%s'"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "reverter"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
-msgstr "cherry-pick"
+msgstr "apanha"
-#: sequencer.c:358
-#, fuzzy
+#: sequencer.c:359
msgid "rebase"
-msgstr "rebase -i"
+msgstr "rebase"
-#: sequencer.c:360
-#, fuzzy, c-format
+#: sequencer.c:361
+#, c-format
msgid "unknown action: %d"
-msgstr "Ação desconhecida: %d"
+msgstr "ação desconhecida: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-"depois de resolver os conflitos, marque os caminhos corrigidos\n"
+"depois de resolver os conflitos, marca os caminhos corrigidos\n"
"com 'git add <caminhos>' ou 'git rm <caminhos>'"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"depois de resolver os conflitos, marque os caminhos corrigidos\n"
-"com 'git add <caminhos>' ou 'git rm <caminhos>'\n"
-"e submeta o resultado com 'git commit'"
+"Depois de resolver os conflitos, marca-os com\n"
+"\"git add/rm <espetro-caminho>\", depois executa\n"
+"\"git cherry-pick --continue\".\n"
+"Podes invés saltar esta memória com \"git cherry-pick --skip\".\n"
+"Para abortar e voltar ao estado anterior a \"git cherry-pick\",\n"
+"executa \"git cherry-pick --abort\"."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Depois de resolver os conflitos, marca-os com\n"
+"\"git add/rm <espetro-caminho>\", depois executa\n"
+"\"git revert --continue\".\n"
+"Podes invés saltar esta memória com \"git revert --skip\".\n"
+"Para abortar e voltar ao estado anterior a \"git revert\",\n"
+"executa \"git revert --abort\"."
+
+#: sequencer.c:448 sequencer.c:3288
#, c-format
msgid "could not lock '%s'"
-msgstr "incapaz bloquear '%s'"
+msgstr "incapaz trancar '%s'"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
+#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
#, c-format
msgid "could not write to '%s'"
msgstr "incapaz escrever em '%s'"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
-msgstr "incapaz escrever fim de linha em '%s'"
+msgstr "incapaz escrever eol em '%s'"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
-#, fuzzy, c-format
+#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3565
+#, c-format
msgid "failed to finalize '%s'"
-msgstr "falha ao finalizar '%s'."
+msgstr "falhou finalizar '%s'"
-#: sequencer.c:486
+#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
+#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
+#, c-format
+msgid "could not read '%s'"
+msgstr "incapaz ler '%s'"
+
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
-msgstr "as suas alterações locais serão substituídas ao %s."
+msgstr "tuas alterações locais serão sobrescritas ao %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
-msgstr "submeta ou esconda as suas alterações para continuar."
+msgstr "memoriza tuas alterações ou esconde-as para continuar."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
-msgstr "%s: avanço rápido"
+msgstr "%s: avanço"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:615
#, c-format
msgid "Invalid cleanup mode %s"
-msgstr "Modo de limpeza inválido %s"
+msgstr "Modo de limpeza %s inválido"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
-msgstr "%s: Incapaz de escrever novo ficheiro index"
-
-#: sequencer.c:685
-#, fuzzy
-msgid "unable to update cache tree"
-msgstr "incapaz atualizar árvore de cache"
+msgstr "%s: Incapaz de escrever novo ficheiro de cenário"
#: sequencer.c:699
-#, fuzzy
+msgid "unable to update cache tree"
+msgstr "incapaz atualizar árvore de cenário"
+
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "incapaz resolver memória HEAD"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
-msgstr ""
+msgstr "nenhuma chave presente em '%.*s'"
-#: sequencer.c:790
-#, fuzzy, c-format
+#: sequencer.c:804
+#, c-format
msgid "unable to dequote value of '%s'"
-msgstr "incapaz retirar valor, da citação '%s'"
+msgstr "incapaz retirar citação de valor de '%s'"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
+#: builtin/am.c:849 builtin/rebase.c:699
#, c-format
msgid "could not open '%s' for reading"
msgstr "incapaz abrir '%s' para leitura"
-#: sequencer.c:837
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr ""
-
-#: sequencer.c:842
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr ""
-
-#: sequencer.c:847
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr ""
-
#: sequencer.c:851
-#, c-format
-msgid "unknown variable '%s'"
-msgstr ""
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' já foi dado"
#: sequencer.c:856
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' já foi dado"
+
+#: sequencer.c:861
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' já foi dado"
+
+#: sequencer.c:865
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "variável '%s' desconhecida"
+
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr ""
+msgstr "faltando 'GIT_AUTHOR_NAME'"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr ""
+msgstr "faltando 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr ""
+msgstr "faltando 'GIT_AUTHOR_DATE'"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7763,24 +8045,24 @@
"\n"
" git rebase --continue\n"
msgstr ""
-"tem alterações preparadas na árvore de trabalho\n"
-"Se tenciona esmagar estas alterações no commit anterior, execute:\n"
+"tens alterações encenadas na tua árvore-trabalho\n"
+"Se tencionas esmagar estas alterações para a memória anterior, executa:\n"
"\n"
" git commit --amend %s\n"
"\n"
-"Se tenciona pô-las num novo commit, execute:\n"
+"Se tencionas pô-las numa nova memória, executa:\n"
"\n"
" git commit %s\n"
"\n"
-"Em ambos os casos, quando estiver pronto, continue com:\n"
+"Em ambos os casos, quando estiver pronto, continua com:\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
-msgstr ""
+msgstr "gancho 'prepare-commit-msg' falhou"
-#: sequencer.c:1218
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7794,19 +8076,20 @@
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"O seu nome e endereço de e-mail foram configurados automaticamente com base\n"
-"no seu nome de utilizador e nome de máquina. Verifique se estão corretos.\n"
-"Pode suprimir esta mensagem configurando-os explicitamente. Execute\n"
-"o seguinte comando e siga as instruções no editor para editar\n"
+"Teu nome e endereço de email foram configurados automaticamente com base\n"
+"no teu nome de utilizador e nome de máquina. Por favor, verifica se estão\n"
+"corretos.\n"
+"Podes suprimir esta mensagem configurando-os explicitamente. Executa\n"
+"o comando seguinte e segue as instruções no editor para editar\n"
"o ficheiro de configuração:\n"
"\n"
" git config --global --edit\n"
"\n"
-"Após fazer isto, pode corrigir a identidade usada neste commit com:\n"
+"Após fazer isto, podes corrigir a identidade usada nesta memória com:\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7819,381 +8102,375 @@
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"O seu nome e endereço de e-mail foram configurados automaticamente com base\n"
-"no seu nome de utilizador e nome de máquina. Verifique se estão corretos.\n"
-"Pode suprimir esta mensagem configurando-os explicitamente:\n"
+"Teu nome e endereço de email foram configurados automaticamente com base\n"
+"no teu nome de utilizador e nome de máquina. Por favor, verifica se estão\n"
+"corretos.\n"
+"Podes suprimir esta mensagem configurando-os explicitamente:\n"
"\n"
-" git config --global user.name \"O Seu Nome\"\n"
-" git config --global user.email utilizador@exemplo.com\n"
+" git config --global user.name \"Meu Nome\"\n"
+" git config --global user.email eu@exemplo.com\n"
"\n"
-"Após fazer isto, pode corrigir a identidade usada neste commit com:\n"
+"Após fazer isto, podes corrigir a identidade usada nesta memória com:\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1287
msgid "couldn't look up newly created commit"
msgstr "incapaz consultar memória recém-criada"
-#: sequencer.c:1275
+#: sequencer.c:1289
msgid "could not parse newly created commit"
-msgstr "incapaz analisar memória recém-criada"
+msgstr "incapaz processar memória recém-criada"
-#: sequencer.c:1321
-#, fuzzy
+#: sequencer.c:1336
msgid "unable to resolve HEAD after creating commit"
msgstr "incapaz resolver HEAD após criar memória"
-#: sequencer.c:1323
+#: sequencer.c:1338
msgid "detached HEAD"
-msgstr "HEAD destacada"
+msgstr "HEAD desanexada"
-#: sequencer.c:1327
+#: sequencer.c:1342
msgid " (root-commit)"
-msgstr " (commit-raiz)"
+msgstr " (memória-raiz)"
-#: sequencer.c:1348
-#, fuzzy
+#: sequencer.c:1363
msgid "could not parse HEAD"
msgstr "incapaz processar HEAD"
-#: sequencer.c:1350
-#, fuzzy, c-format
+#: sequencer.c:1365
+#, c-format
msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s é commit nenhum!"
+msgstr "HEAD %s é memória nenhuma!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
msgid "could not parse HEAD commit"
-msgstr "incapaz analisar commit HEAD"
+msgstr "incapaz processar memória HEAD"
-#: sequencer.c:1410 sequencer.c:2295
-#, fuzzy
+#: sequencer.c:1425 sequencer.c:2310
msgid "unable to parse commit author"
-msgstr "incapaz processar autor de commit"
+msgstr "incapaz processar autor de memória"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
-msgstr ""
+msgstr "git write-tree falhou a escrever uma árvore"
-#: sequencer.c:1454 sequencer.c:1574
-#, fuzzy, c-format
+#: sequencer.c:1469 sequencer.c:1589
+#, c-format
msgid "unable to read commit message from '%s'"
-msgstr "incapaz ler mensagem de commit de '%s'"
+msgstr "incapaz ler mensagem de memória de '%s'"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1500 sequencer.c:1532
#, c-format
msgid "invalid author identity '%s'"
-msgstr ""
+msgstr "identidade de autor '%s' inválida"
-#: sequencer.c:1491
+#: sequencer.c:1506
msgid "corrupt author: missing date information"
-msgstr ""
+msgstr "author rompido: faltando informação de data"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
+#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
-msgstr ""
+msgstr "falhou escrever objeto de memória"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "incapaz atualizar %s"
-#: sequencer.c:1606
-#, fuzzy, c-format
+#: sequencer.c:1621
+#, c-format
msgid "could not parse commit %s"
-msgstr "incapaz processar commit %s"
+msgstr "incapaz processar memória %s"
-#: sequencer.c:1611
-#, fuzzy, c-format
+#: sequencer.c:1626
+#, c-format
msgid "could not parse parent commit %s"
-msgstr "incapaz processar commit parente %s"
+msgstr "incapaz processar memória parente %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1709 sequencer.c:1990
#, c-format
msgid "unknown command: %d"
msgstr "comando desconhecido: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1751
msgid "This is the 1st commit message:"
-msgstr "Esta é a 1ª mensagem de commit:"
+msgstr "Esta é a 1ª mensagem de memória:"
-#: sequencer.c:1737
+#: sequencer.c:1752
#, c-format
msgid "This is the commit message #%d:"
-msgstr "Esta é a mensagem de commit nº%d:"
+msgstr "Esta é a mensagem de memória #%d:"
-#: sequencer.c:1738
+#: sequencer.c:1753
msgid "The 1st commit message will be skipped:"
-msgstr "A 1ª mensagem de commit será ignorada:"
+msgstr "A 1ª mensagem de memória será saltada:"
-#: sequencer.c:1739
+#: sequencer.c:1754
#, c-format
msgid "The commit message #%d will be skipped:"
-msgstr "A mensagem de commit #%d será ignorada:"
+msgstr "A mensagem de memória #%d será saltada:"
-#: sequencer.c:1740
+#: sequencer.c:1755
#, c-format
msgid "This is a combination of %d commits."
-msgstr "Isto é a combinação de %d commits."
+msgstr "Isto é a combinação de %d memórias."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1902 sequencer.c:1959
#, c-format
msgid "cannot write '%s'"
msgstr "incapaz escrever '%s'"
-#: sequencer.c:1934
+#: sequencer.c:1949
msgid "need a HEAD to fixup"
-msgstr "necessária uma HEAD para fixup"
+msgstr "necessário uma HEAD para consertar"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1951 sequencer.c:3592
msgid "could not read HEAD"
msgstr "incapaz ler HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1953
msgid "could not read HEAD's commit message"
-msgstr "incapaz ler mensagem de commit de HEAD"
+msgstr "incapaz ler mensagem de memória de HEAD"
-#: sequencer.c:1962
+#: sequencer.c:1977
#, c-format
msgid "could not read commit message of %s"
-msgstr "incapaz ler mensagem de commit de %s"
+msgstr "incapaz ler mensagem de memória de %s"
-#: sequencer.c:2072
+#: sequencer.c:2087
msgid "your index file is unmerged."
-msgstr "teu ficheiro índex está por juntar."
+msgstr "teu ficheiro de cenário está por juntar."
-#: sequencer.c:2079
-#, fuzzy
+#: sequencer.c:2094
msgid "cannot fixup root commit"
-msgstr "incapaz consertar commit raíz"
+msgstr "incapaz consertar memória-raiz"
-#: sequencer.c:2098
+#: sequencer.c:2113
#, c-format
msgid "commit %s is a merge but no -m option was given."
-msgstr "commit %s é uma junção mas foi fornecido opção -m nenhuma."
+msgstr "memória %s é uma junção mas foi fornecida opção -m nenhuma."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2121 sequencer.c:2129
#, c-format
msgid "commit %s does not have parent %d"
-msgstr "commit %s tem parente %d nenhum"
+msgstr "memória %s tem parente %d nenhum"
-#: sequencer.c:2120
+#: sequencer.c:2135
#, c-format
msgid "cannot get commit message for %s"
-msgstr "incapaz obter mensagem de commit para %s"
+msgstr "incapaz obter mensagem de memória para %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2154
#, c-format
msgid "%s: cannot parse parent commit %s"
-msgstr "%s: incapaz processar commit parente %s"
+msgstr "%s: incapaz processar memória parente %s"
-#: sequencer.c:2205
+#: sequencer.c:2220
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "incapaz renomear '%s' para '%s'"
-#: sequencer.c:2265
+#: sequencer.c:2280
#, c-format
msgid "could not revert %s... %s"
msgstr "incapaz reverter %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2281
#, c-format
msgid "could not apply %s... %s"
msgstr "incapaz aplicar %s... %s"
-#: sequencer.c:2287
+#: sequencer.c:2302
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr ""
+msgstr "largando %s %s -- conteúdo de remendo já em upstream\n"
-#: sequencer.c:2345
+#: sequencer.c:2360
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: ler cenário falhou"
-#: sequencer.c:2352
+#: sequencer.c:2368
#, c-format
msgid "git %s: failed to refresh the index"
-msgstr "git %s: falha ao atualizar o índice"
+msgstr "git %s: falha ao atualizar o cenário"
-#: sequencer.c:2425
-#, fuzzy, c-format
+#: sequencer.c:2448
+#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s rejeita argumentos: '%s'"
-#: sequencer.c:2434
+#: sequencer.c:2457
#, c-format
msgid "missing arguments for %s"
-msgstr ""
+msgstr "faltando argumentos para %s"
-#: sequencer.c:2477
-#, fuzzy, c-format
+#: sequencer.c:2500
+#, c-format
msgid "could not parse '%s'"
msgstr "incapaz processar '%s'"
-#: sequencer.c:2538
+#: sequencer.c:2561
#, c-format
msgid "invalid line %d: %.*s"
msgstr "linha %d inválida: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2572
#, c-format
msgid "cannot '%s' without a previous commit"
-msgstr "incapaz '%s' sem um commit anterior"
+msgstr "incapaz '%s' sem uma memória anterior"
-#: sequencer.c:2635
-#, fuzzy
+#: sequencer.c:2620 builtin/rebase.c:185
+#, c-format
+msgid "could not read '%s'."
+msgstr "incapaz ler '%s'."
+
+#: sequencer.c:2658
msgid "cancelling a cherry picking in progress"
-msgstr "cancelando um cherry picking em curso"
+msgstr "cancelando uma apanha em curso"
-#: sequencer.c:2644
-#, fuzzy
+#: sequencer.c:2667
msgid "cancelling a revert in progress"
msgstr "cancelando uma reversão em curso"
-#: sequencer.c:2690
+#: sequencer.c:2707
msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "corrija-o usando 'git rebase --edit-todo'."
+msgstr "por favor, conserta-o usando 'git rebase --edit-todo'."
-#: sequencer.c:2692
+#: sequencer.c:2709
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "folha de instruções inutilizável: '%s'"
-#: sequencer.c:2697
+#: sequencer.c:2714
msgid "no commits parsed."
-msgstr "commits nenhuns analisados."
+msgstr "memórias nenhumas processadas."
-#: sequencer.c:2708
+#: sequencer.c:2725
msgid "cannot cherry-pick during a revert."
msgstr "incapaz apanhar durante uma reversão."
-#: sequencer.c:2710
+#: sequencer.c:2727
msgid "cannot revert during a cherry-pick."
msgstr "incapaz reverter durante uma apanha."
-#: sequencer.c:2788
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "valor inválido para %s: %s"
-
-#: sequencer.c:2897
+#: sequencer.c:2914
msgid "unusable squash-onto"
-msgstr ""
+msgstr "esmagar-sobre inutilizável"
-#: sequencer.c:2917
+#: sequencer.c:2934
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "folha de opções malformada: '%s'"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3029 sequencer.c:4875
msgid "empty commit set passed"
-msgstr "o conjunto de commits especificado está vazio"
+msgstr "passou conjunto de memórias vazias"
-#: sequencer.c:3029
-#, fuzzy
+#: sequencer.c:3046
msgid "revert is already in progress"
-msgstr "cherry-pick ou revert em curso"
+msgstr "reversão já está em curso"
-#: sequencer.c:3031
-#, fuzzy, c-format
+#: sequencer.c:3048
+#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
+msgstr "tenta \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
-#, fuzzy
+#: sequencer.c:3051
msgid "cherry-pick is already in progress"
-msgstr "cherry-pick ou revert em curso"
+msgstr "apanha já está em curso"
-#: sequencer.c:3036
-#, fuzzy, c-format
+#: sequencer.c:3053
+#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
+msgstr "tenta \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3067
#, c-format
msgid "could not create sequencer directory '%s'"
-msgstr "incapaz criar pasta do sequenciador '%s'"
+msgstr "incapaz criar pasta de sequenciador '%s'"
-#: sequencer.c:3065
+#: sequencer.c:3082
msgid "could not lock HEAD"
-msgstr "incapaz bloquear HEAD"
+msgstr "incapaz trancar HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3142 sequencer.c:4585
msgid "no cherry-pick or revert in progress"
-msgstr "sem cherry-pick ou revert em curso"
+msgstr "em curso nenhuma apanha e nenhuma reversão"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3144 sequencer.c:3155
msgid "cannot resolve HEAD"
msgstr "incapaz resolver HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3146 sequencer.c:3190
msgid "cannot abort from a branch yet to be born"
msgstr "incapaz abortar de um ramo ainda por nascer"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
+#: builtin/grep.c:774
#, c-format
msgid "cannot open '%s'"
msgstr "incapaz abrir '%s'"
-#: sequencer.c:3161
+#: sequencer.c:3178
#, c-format
msgid "cannot read '%s': %s"
msgstr "incapaz ler '%s': %s"
-#: sequencer.c:3162
+#: sequencer.c:3179
msgid "unexpected end of file"
-msgstr ""
+msgstr "fim de ficheiro inesperado"
-#: sequencer.c:3168
+#: sequencer.c:3185
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido"
+msgstr "ficheiro HEAD guardado de pre-cherry-pick '%s' está rompido"
-#: sequencer.c:3179
+#: sequencer.c:3196
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr "Parece que moveste a HEAD. Recusando rebobinar, verifique a tua HEAD!"
+msgstr "Parece que moveste a HEAD. Recusando rebobinar, verifica a tua HEAD!"
-#: sequencer.c:3220
-#, fuzzy
+#: sequencer.c:3237
msgid "no revert in progress"
msgstr "em curso reversão nenhuma"
-#: sequencer.c:3229
-#, fuzzy
-msgid "no cherry-pick in progress"
-msgstr "cherry-pick nenhum em curso"
-
-#: sequencer.c:3239
-msgid "failed to skip the commit"
-msgstr ""
-
#: sequencer.c:3246
-msgid "there is nothing to skip"
-msgstr ""
+msgid "no cherry-pick in progress"
+msgstr "em curso apanha nenhuma"
-#: sequencer.c:3249
+#: sequencer.c:3256
+msgid "failed to skip the commit"
+msgstr "falhou saltar memória"
+
+#: sequencer.c:3263
+msgid "there is nothing to skip"
+msgstr "há nada a saltar"
+
+#: sequencer.c:3266
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
+"já memorizaste?\n"
+"tenta \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3428 sequencer.c:4476
msgid "cannot read HEAD"
msgstr "incapaz ler HEAD"
-#: sequencer.c:3428
-#, fuzzy, c-format
+#: sequencer.c:3445
+#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "incapaz copiar '%s' para '%s'"
-#: sequencer.c:3436
-#, fuzzy, c-format
+#: sequencer.c:3453
+#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
@@ -8203,35 +8480,35 @@
"\n"
" git rebase --continue\n"
msgstr ""
-"Pode emendar o commit agora, com\n"
+"Podes emendar a memória agora, com\n"
"\n"
" git commit --amend %s\n"
"\n"
-"Assim que estiver satisfeito com as alterações, execute\n"
+"Assim que estiveres satisfeito com as tuas alterações, executa\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
-#, fuzzy, c-format
+#: sequencer.c:3463
+#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Incapaz aplicar %s... %.*s"
-#: sequencer.c:3453
-#, fuzzy, c-format
+#: sequencer.c:3470
+#, c-format
msgid "Could not merge %.*s"
msgstr "Incapaz juntar %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "incapaz copiar '%s' para '%s'"
-#: sequencer.c:3483
-#, fuzzy, c-format
+#: sequencer.c:3499
+#, c-format
msgid "Executing: %s\n"
-msgstr "A executar: %s\n"
+msgstr "Executando: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3510
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8241,16 +8518,16 @@
"\n"
msgstr ""
"a execução falhou: %s\n"
-"%sPode corrigir o problema e executar\n"
+"%sPode corrigir o problema, e depois executar\n"
"\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3516
msgid "and made changes to the index and/or the working tree\n"
-msgstr "e fez alterações ao índice e/ou à árvore de trabalho\n"
+msgstr "e fiz alterações ao cenário e/ou à árvore-trabalho\n"
-#: sequencer.c:3510
+#: sequencer.c:3522
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8260,135 +8537,130 @@
" git rebase --continue\n"
"\n"
msgstr ""
-"Executado com sucesso: %s\n"
-"mas deixou alterações no índice e/ou na árvore de trabalho\n"
-"Submeta ou esconda as alterações e execute\n"
+"executado com sucesso: %s\n"
+"mas ficaram alterações no cenário e/ou na árvore-trabalho\n"
+"Memoriza ou esconde tuas alterações, e depois executa\n"
"\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
-#, fuzzy, c-format
+#: sequencer.c:3582
+#, c-format
msgid "illegal label name: '%.*s'"
-msgstr "nome de ficheiro malformado: %.*s"
+msgstr "nome de rótulo ilegal: '%.*s'"
-#: sequencer.c:3645
-#, fuzzy
+#: sequencer.c:3655
msgid "writing fake root commit"
-msgstr "escrevendo commit de raíz falso"
+msgstr "escrevendo memória de raiz falsa"
-#: sequencer.c:3650
+#: sequencer.c:3660
msgid "writing squash-onto"
-msgstr ""
+msgstr "escrevendo esmagar-sobre"
-#: sequencer.c:3734
-#, fuzzy, c-format
+#: sequencer.c:3739
+#, c-format
msgid "could not resolve '%s'"
msgstr "incapaz resolver '%s'"
-#: sequencer.c:3767
-#, fuzzy
+#: sequencer.c:3771
msgid "cannot merge without a current revision"
-msgstr "incapaz juntar sem uma revisão currente"
+msgstr "apenas pode juntar com uma revisão atual"
-#: sequencer.c:3789
-#, fuzzy, c-format
+#: sequencer.c:3793
+#, c-format
msgid "unable to parse '%.*s'"
msgstr "incapaz processar '%.*s'"
-#: sequencer.c:3798
-#, fuzzy, c-format
+#: sequencer.c:3802
+#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nada a juntar: '%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3814
msgid "octopus merge cannot be executed on top of a [new root]"
-msgstr ""
+msgstr "incapaz de executar junção polvinho em cima de [nova raiz]"
-#: sequencer.c:3826
-#, fuzzy, c-format
+#: sequencer.c:3869
+#, c-format
msgid "could not get commit message of '%s'"
-msgstr "incapaz obter mensagem de commit de '%s'"
+msgstr "incapaz obter mensagem de memória de '%s'"
-#: sequencer.c:4009
-#, fuzzy, c-format
+#: sequencer.c:4013
+#, c-format
msgid "could not even attempt to merge '%.*s'"
-msgstr "incapaz de tentar juntar '%.*s'"
+msgstr "também fui incapaz de juntar '%.*s'"
-#: sequencer.c:4025
-#, fuzzy
+#: sequencer.c:4029
msgid "merge: Unable to write new index file"
-msgstr "merge: Incapaz de escrever novo ficheiro index"
+msgstr "merge: Incapaz de escrever novo ficheiro de cenário"
-#: sequencer.c:4099
+#: sequencer.c:4110
msgid "Cannot autostash"
-msgstr "Incapaz de arrumar automaticamente (autostash)"
+msgstr "Incapaz de esconder automaticamente (autostash)"
-#: sequencer.c:4102
-#, fuzzy, c-format
+#: sequencer.c:4113
+#, c-format
msgid "Unexpected stash response: '%s'"
-msgstr "Resposta de squash inexperada: '%s'"
+msgstr "Resposta de esconder inesperada: '%s'"
-#: sequencer.c:4108
-#, fuzzy, c-format
+#: sequencer.c:4119
+#, c-format
msgid "Could not create directory for '%s'"
-msgstr "Incapaz de criar a pasta para '%s'"
+msgstr "Incapaz de criar pasta para '%s'"
-#: sequencer.c:4111
-#, fuzzy, c-format
+#: sequencer.c:4122
+#, c-format
msgid "Created autostash: %s\n"
msgstr "Criado autostash: %s\n"
-#: sequencer.c:4115
-#, fuzzy
+#: sequencer.c:4124
msgid "could not reset --hard"
-msgstr "incapaz repor --hard"
+msgstr "incapaz restabelecer com --hard"
-#: sequencer.c:4140
-#, fuzzy, c-format
+#: sequencer.c:4148
+#, c-format
msgid "Applied autostash.\n"
msgstr "Autostash aplicado.\n"
-#: sequencer.c:4152
+#: sequencer.c:4160
#, c-format
msgid "cannot store %s"
msgstr "incapaz guardar %s"
-#: sequencer.c:4155
-#, fuzzy, c-format
+#: sequencer.c:4163
+#, c-format
msgid ""
"%s\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
"%s\n"
-"As suas alterações estão guardadas na pilha.\n"
-"Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
+"Tuas alterações estão seguras no esconderijo.\n"
+"Podes executar \"git stash pop\" ou \"git stash drop\" quando quiseres.\n"
-#: sequencer.c:4160
-#, fuzzy
+#: sequencer.c:4168
msgid "Applying autostash resulted in conflicts."
-msgstr "Patch aplicado a '%s' com conflitos."
+msgstr "Aplicando autostash resultou em conflitos."
-#: sequencer.c:4161
+#: sequencer.c:4169
msgid "Autostash exists; creating a new stash entry."
-msgstr ""
+msgstr "Existe autostash; criando uma nova entrada de esconderijo."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4225
msgid "could not detach HEAD"
-msgstr "incapaz soltar HEAD"
+msgstr "incapaz desanexar HEAD"
-#: sequencer.c:4248
-#, fuzzy, c-format
+#: sequencer.c:4240
+#, c-format
msgid "Stopped at HEAD\n"
-msgstr "Parou no HEAD\n"
+msgstr "Parou em HEAD\n"
-#: sequencer.c:4250
-#, fuzzy, c-format
+#: sequencer.c:4242
+#, c-format
msgid "Stopped at %s\n"
-msgstr "Parou a %s... %.*s\n"
+msgstr "Parou em %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4274
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8401,148 +8673,157 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:4304
+#: sequencer.c:4320
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr ""
-#: sequencer.c:4350
+#: sequencer.c:4366
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Parou no %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4436
#, c-format
msgid "unknown command %d"
msgstr "comando desconhecido %d"
-#: sequencer.c:4480
+#: sequencer.c:4484
msgid "could not read orig-head"
msgstr "incapaz ler orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4489
msgid "could not read 'onto'"
msgstr "incapaz ler 'onto'"
-#: sequencer.c:4499
+#: sequencer.c:4503
#, c-format
msgid "could not update HEAD to %s"
msgstr "incapaz atualizar HEAD para %s"
-#: sequencer.c:4559
-#, fuzzy, c-format
+#: sequencer.c:4563
+#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "O %s foi rebaseado e atualizado com sucesso.\n"
-#: sequencer.c:4611
+#: sequencer.c:4615
msgid "cannot rebase: You have unstaged changes."
-msgstr "incapaz rebasear: tem alterações despreparadas."
+msgstr "incapaz rebasear: tem alterações desencenadas."
-#: sequencer.c:4620
+#: sequencer.c:4624
msgid "cannot amend non-existing commit"
-msgstr "incapaz emendar commit inexistente"
+msgstr "incapaz emendar memória inexistente"
-#: sequencer.c:4622
+#: sequencer.c:4626
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:4624
+#: sequencer.c:4628
#, c-format
msgid "invalid contents: '%s'"
msgstr "conteúdo inválido: '%s'"
-#: sequencer.c:4627
+#: sequencer.c:4631
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"\n"
-"Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n"
-"e execute 'git rebase --continue' de novo."
+"Tens alterações por memorizar na tua árvore-trabalho. Por favor, memoriza-"
+"as\n"
+"primeiro e executa 'git rebase --continue' de novo."
-#: sequencer.c:4663 sequencer.c:4702
-#, fuzzy, c-format
+#: sequencer.c:4667 sequencer.c:4706
+#, c-format
msgid "could not write file: '%s'"
msgstr "incapaz escrever ficheiro: '%s'"
-#: sequencer.c:4718
+#: sequencer.c:4722
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "incapaz remover CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4732
msgid "could not commit staged changes."
-msgstr "incapaz commit alterações preparadas."
+msgstr "incapaz memorizar alterações encenadas."
-#: sequencer.c:4845
+#: sequencer.c:4852
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: incapaz apanhar um %s"
-#: sequencer.c:4849
+#: sequencer.c:4856
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisão incorreta"
-#: sequencer.c:4884
+#: sequencer.c:4891
msgid "can't revert as initial commit"
-msgstr "incapaz reverter como commit inicial"
+msgstr "incapaz reverter como memória inicial"
-#: sequencer.c:5361
+#: sequencer.c:5162 sequencer.c:5391
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "saltei memória previamente aplicada %s"
+
+#: sequencer.c:5232 sequencer.c:5407
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+
+#: sequencer.c:5378
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:5364
+#: sequencer.c:5381
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:5614 sequencer.c:5631
-#, fuzzy
+#: sequencer.c:5639 sequencer.c:5656
msgid "nothing to do"
msgstr "nada a fazer"
-#: sequencer.c:5650
-#, fuzzy
+#: sequencer.c:5675
msgid "could not skip unnecessary pick commands"
msgstr "incapaz de saltar comandos pick desnecessários"
-#: sequencer.c:5750
+#: sequencer.c:5775
msgid "the script was already rearranged."
msgstr ""
-#: setup.c:133
-#, fuzzy, c-format
+#: setup.c:135
+#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "%s está fora do repositório em '%s'"
-#: setup.c:185
+#: setup.c:187
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-"%s: sem tal path na working tree.\n"
-"Use 'git <comando> -- <path>...' para especificar caminhos inexistentes "
+"%s: sem tal caminho na working tree.\n"
+"Usa 'git <comando> -- <path>...' para especificar caminhos inexistentes "
"localmente."
-#: setup.c:198
+#: setup.c:200
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-"argumento ambíguo '%s': revisão desconhecida ou path fora da working tree.\n"
-"Usa '--' para separar paths de revisões, assim:\n"
+"argumento ambíguo '%s': revisão desconhecida ou caminho fora de árvore-"
+"trabalho.\n"
+"Usa '--' para separar caminhos das revisões, assim:\n"
"'git <comando> [<revisão>...] -- [<ficheiro>...]'"
-#: setup.c:264
-#, fuzzy, c-format
+#: setup.c:266
+#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "opção '%s' tem de vir antes argumentos diferentes de opção"
-#: setup.c:283
+#: setup.c:285
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -8550,118 +8831,123 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
"argumento ambíguo '%s': revisão e nome de ficheiro\n"
-"Use '--' para separar caminhos de revisões, assim:\n"
+"Usa '--' para separar caminhos de revisões, assim:\n"
"'git <comando> [<revisão>...] -- [<ficheiro>...]'"
-#: setup.c:419
-#, fuzzy
+#: setup.c:421
msgid "unable to set up work tree using invalid config"
-msgstr "incapaz preparar work tree usando config inválido"
+msgstr "incapaz preparar árvore-trabalho usando config inválida"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:425 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr ""
-#: setup.c:658
+#: setup.c:724
#, c-format
msgid "Expected git repo version <= %d, found %d"
-msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d"
+msgstr "Esperava versão do repositório git <= %d, encontrei %d"
-#: setup.c:666
-#, fuzzy
+#: setup.c:732
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "extensão de repositório desconhecida encontrada:"
msgstr[1] "extensões de repositório desconhecidas encontradas:"
-#: setup.c:680
-#, fuzzy
+#: setup.c:746
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "versão de repo é 0, mas encontrou-se extensão vi-only:"
msgstr[1] "versão de repo é 0, mas encontrou-se extensões vi-only:"
-#: setup.c:701
+#: setup.c:767
#, c-format
msgid "error opening '%s'"
msgstr ""
-#: setup.c:703
-#, fuzzy, c-format
+#: setup.c:769
+#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "demasiado grande para ser um ficheiro .git: '%s'"
-#: setup.c:705
-#, fuzzy, c-format
+#: setup.c:771
+#, c-format
msgid "error reading %s"
msgstr "erro lendo %s"
-#: setup.c:707
-#, fuzzy, c-format
+#: setup.c:773
+#, c-format
msgid "invalid gitfile format: %s"
-msgstr "formato de data inválido: %s"
+msgstr "formato de ficheiro-git inválido: %s"
-#: setup.c:709
-#, fuzzy, c-format
+#: setup.c:775
+#, c-format
msgid "no path in gitfile: %s"
-msgstr "gitfile sem path: %s"
+msgstr "ficheiro-git sem caminho: %s"
-#: setup.c:711
-#, fuzzy, c-format
+#: setup.c:777
+#, c-format
msgid "not a git repository: %s"
msgstr "é repositório git nenhum: %s"
-#: setup.c:813
+#: setup.c:879
#, c-format
msgid "'$%s' too big"
msgstr ""
-#: setup.c:827
-#, fuzzy, c-format
+#: setup.c:893
+#, c-format
msgid "not a git repository: '%s'"
msgstr "é repositório git nenhum: '%s'"
-#: setup.c:856 setup.c:858 setup.c:889
-#, fuzzy, c-format
+#: setup.c:922 setup.c:924 setup.c:955
+#, c-format
msgid "cannot chdir to '%s'"
msgstr "incapaz chdir para '%s'"
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
-#, fuzzy
+#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
msgid "cannot come back to cwd"
msgstr "incapaz de voltar para cwd"
-#: setup.c:988
+#: setup.c:1054
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: setup.c:1231
+#: setup.c:1338
msgid "Unable to read current working directory"
-msgstr "Incapaz de ler pasta atual de trabalho"
+msgstr "Incapaz de ler pasta-trabalho atual"
-#: setup.c:1240 setup.c:1246
-#, fuzzy, c-format
+#: setup.c:1347 setup.c:1353
+#, c-format
msgid "cannot change to '%s'"
msgstr "incapaz mudar para '%s'"
-#: setup.c:1251
-#, fuzzy, c-format
+#: setup.c:1358
+#, c-format
msgid "not a git repository (or any of the parent directories): %s"
-msgstr "é repositório git nenhum (ou em pastas parente nenhuma): %s"
+msgstr "é repositório git nenhum (ou qualquer pasta parente): %s"
-#: setup.c:1257
-#, fuzzy, c-format
+#: setup.c:1364
+#, 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 ""
-"é repositório git nenhum (ou em pai nenhum até ao ponto de montagem %s)\n"
+"é repositório git nenhum (ou em nenhum parente até ao ponto de montagem %s)\n"
"Parando na fronteira do sistema de ficheiros "
"(GIT_DISCOVERY_ACROSS_FILESYSTEM indefinido)."
-#: setup.c:1381
-#, fuzzy, c-format
+#: setup.c:1374
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+
+#: setup.c:1502
+#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
@@ -8669,209 +8955,207 @@
"Problema com o valor core.sharedRepository modo de ficheiro (0%.3o).\n"
"O dono dos ficheiros tem de ter sempre permissões de leitura e escrita."
-#: setup.c:1430
-#, fuzzy
-msgid "open /dev/null or dup failed"
-msgstr "falha ao abrir /dev/null"
-
-#: setup.c:1445
-#, fuzzy
+#: setup.c:1564
msgid "fork failed"
-msgstr "falha ao invocar fseek"
+msgstr "falhou forqueadura"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1569
msgid "setsid failed"
msgstr ""
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr ""
-
-#: sparse-index.c:176
-#, fuzzy
-msgid "unable to update cache-tree, staying full"
-msgstr "incapaz atualizar árvore de cache"
-
-#: sparse-index.c:263
+#: sparse-index.c:285
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr ""
+#: split-index.c:9
+msgid "cannot use split index with a sparse index"
+msgstr "incapaz usar cenário dividido com um cenário disperso"
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u.%2.2u GiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:852
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:860
+#: strbuf.c:861
#, c-format
msgid "%u.%2.2u MiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:862
+#: strbuf.c:863
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:869
+#: strbuf.c:870
#, c-format
msgid "%u.%2.2u KiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:871
+#: strbuf.c:872
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:877
-#, fuzzy, c-format
+#: strbuf.c:878
+#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
-msgstr[0] "bytes"
-msgstr[1] "bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
-#, fuzzy, c-format
+#: strbuf.c:880
+#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
-msgstr[0] "bytes"
-msgstr[1] "bytes"
+msgstr[0] "%u byte/s"
+msgstr[1] "%u bytes/s"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
+#: builtin/rebase.c:653
#, c-format
msgid "could not open '%s' for writing"
msgstr "incapaz abrir '%s' para escrita"
-#: strbuf.c:1177
-#, fuzzy, c-format
+#: strbuf.c:1196
+#, c-format
msgid "could not edit '%s'"
msgstr "incapaz editar '%s'"
-#: submodule-config.c:237
-#, fuzzy, c-format
+#: submodule-config.c:238
+#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "ignorando nome suspeito de submódulo: %s"
-#: submodule-config.c:304
-#, fuzzy
+#: submodule-config.c:305
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "é proíbido valores negativos para submodule.fetchjobs"
-#: submodule-config.c:402
+#: submodule-config.c:403
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: submodule-config.c:499
+#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
#, c-format
-msgid "invalid value for %s"
-msgstr ""
+msgid "invalid value for '%s'"
+msgstr "valor inválido para '%s'"
-#: submodule-config.c:766
+#: submodule-config.c:828
#, c-format
msgid "Could not update .gitmodules entry %s"
-msgstr "Incapaz de atualizar entrada de .gitmodules %s"
+msgstr "Incapaz de atualizar entrada %s de .gitmodules"
-#: submodule.c:114 submodule.c:143
+#: submodule.c:115 submodule.c:144
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-"Incapaz de alterar .gitmodules por juntar, resolve os conflitos de junção "
-"primeiro"
+"Incapaz de alterar .gitmodules por juntar, resolve primeiro os conflitos de "
+"junção"
-#: submodule.c:118 submodule.c:147
+#: submodule.c:119 submodule.c:148
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Secção de .gitmodules cujo path=%s por encontrar"
-#: submodule.c:154
+#: submodule.c:155
#, c-format
msgid "Could not remove .gitmodules entry for %s"
-msgstr "Incapaz de remover a entrada de .gitmodules para %s"
+msgstr "Incapaz de remover a entrada %s de .gitmodules"
-#: submodule.c:165
+#: submodule.c:166
msgid "staging updated .gitmodules failed"
-msgstr "falha ao preparar .gitmodules atualizado"
+msgstr "encenação atualizada .gitmodules falhou"
-#: submodule.c:328
-#, fuzzy, c-format
+#: submodule.c:346
+#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "em submódulo despopulado '%s'"
-#: submodule.c:359
+#: submodule.c:377
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
+msgstr "Espetro-caminho '%s' está no submódulo '%.*s'"
-#: submodule.c:436
-#, fuzzy, c-format
+#: submodule.c:454
+#, c-format
msgid "bad --ignore-submodules argument: %s"
-msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
+msgstr ""
-#: submodule.c:805
+#: submodule.c:866
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr ""
-#: submodule.c:908
-#, fuzzy, c-format
+#: submodule.c:987
+#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "entrada submódulo '%s' (%s) é um(a) %s, não um commit"
+msgstr "entrada submódulo '%s' (%s) é um(a) %s, não uma memória"
-#: submodule.c:993
-#, fuzzy, c-format
+#: submodule.c:1069
+#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr ""
-"Incapaz executar comando 'git rev-list <commits> --not --remotes -n 1' "
-"emsubmódulo %s"
+"Incapaz executar comando 'git rev-list <memórias> --not --remotes -n 1' em "
+"submódulo %s"
-#: submodule.c:1116
-#, fuzzy, c-format
+#: submodule.c:1192
+#, c-format
msgid "process for submodule '%s' failed"
-msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
+msgstr "processo para submódulo '%s' falhou"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Falha ao resolver HEAD numa referência válida."
+msgstr "Falhou ao resolver HEAD como uma ref válida."
-#: submodule.c:1156
-#, fuzzy, c-format
+#: submodule.c:1232
+#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Atirando submódulo '%s'\n"
-#: submodule.c:1159
-#, fuzzy, c-format
+#: submodule.c:1235
+#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Impossível enviar submódulo '%s'\n"
-#: submodule.c:1451
-#, fuzzy, c-format
+#: submodule.c:1567
+#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Buscando submódulo %s%s\n"
-#: submodule.c:1485
-#, fuzzy, c-format
+#: submodule.c:1589
+#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Submódulo '%s' inacessível\n"
-#: submodule.c:1640
-#, fuzzy, c-format
+#: submodule.c:1618
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Incapaz de aceder submódulo '%s' em memória %s\n"
+
+#: submodule.c:1629
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Buscando submódulo %s%s em memória %s\n"
+
+#: submodule.c:1849
+#, c-format
msgid ""
"Errors during submodule fetch:\n"
"%s"
@@ -8879,94 +9163,94 @@
"Erros na busca do submódulo:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1874
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' é irreconhecível como um repositório git"
-#: submodule.c:1682
-#, fuzzy, c-format
+#: submodule.c:1891
+#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr "Incapaz executar 'git status' no submódulo '%s'"
+msgstr "Incapaz executar 'git status --porcelain=2' no submódulo %s"
-#: submodule.c:1723
-#, fuzzy, c-format
+#: submodule.c:1932
+#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr "'git status --porcelain=2' falhou no submódulo '%s'"
+msgstr "'git status --porcelain=2' falhou no submódulo %s"
-#: submodule.c:1798
+#: submodule.c:2007
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "incapaz iniciar 'git status' no submódulo '%s'"
-#: submodule.c:1811
+#: submodule.c:2020
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "incapaz executar 'git status' no submódulo '%s'"
-#: submodule.c:1826
-#, fuzzy, c-format
+#: submodule.c:2037
+#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr "Incapaz de remover a definição core.worktree em submódulo '%s'"
+msgstr "Incapaz de indefinir core.worktree em submódulo '%s'"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:2064 submodule.c:2379
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "incapaz percorrer recursivamente o submódulo '%s'"
-#: submodule.c:1874
-#, fuzzy
+#: submodule.c:2086
msgid "could not reset submodule index"
-msgstr "incapaz repor index de submódulo"
+msgstr "incapaz de restabelecer cenário de submódulo"
-#: submodule.c:1916
+#: submodule.c:2128
#, c-format
msgid "submodule '%s' has dirty index"
-msgstr "o submódulo '%s' tem índice sujo"
+msgstr "submódulo '%s' tem cenário sujo"
-#: submodule.c:1968
-#, fuzzy, c-format
+#: submodule.c:2182
+#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submódulo '%s' incapaz de ser atualizado."
-#: submodule.c:2036
+#: submodule.c:2250
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
-#: submodule.c:2057
+#: submodule.c:2271
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-"relocate_gitdir para submodúlo '%s' com mais que uma worktree é insustentado"
+"relocate_gitdir para submódulo '%s' com mais que uma árvore-trabalho é "
+"insustentado"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2283 submodule.c:2343
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "incapaz procurar nome para submódulo '%s'"
-#: submodule.c:2073
+#: submodule.c:2287
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr ""
-#: submodule.c:2080
+#: submodule.c:2293
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' to\n"
"'%s'\n"
msgstr ""
-"A migrar diretório git de '%s%s' de\n"
+"Migrando pasta git de '%s%s' de\n"
"'%s' para\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2424
msgid "could not start ls-files in .."
msgstr "incapaz iniciar ls-files em .."
-#: submodule.c:2248
+#: submodule.c:2464
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree retornou código de retorno inesperado %d"
@@ -8987,8 +9271,8 @@
msgid "unknown value '%s' for key '%s'"
msgstr "valor desconhecido '%s' para chave '%s'"
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
+#: builtin/remote.c:328
#, c-format
msgid "more than one %s"
msgstr "mais do que um %s"
@@ -9003,14 +9287,14 @@
msgid "could not read input file '%s'"
msgstr "incapaz ler ficheiro de entrada '%s'"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
msgid "could not read from stdin"
msgstr "incapaz ler da entrada padrão"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:760
#, c-format
msgid "could not stat %s"
-msgstr "incapaz obter estatutário %s"
+msgstr "incapaz stat %s"
#: trailer.c:1026
#, c-format
@@ -9032,12 +9316,11 @@
msgstr "incapaz renomear ficheiro temporário para %s"
#: transport-helper.c:62 transport-helper.c:91
-#, fuzzy
msgid "full write to remote helper failed"
-msgstr "imprimir estado do programa auxiliar remoto"
+msgstr "escrita completa para ajudante remoto falhou"
#: transport-helper.c:145
-#, fuzzy, c-format
+#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "incapaz de encontrar helper remoto para '%s'"
@@ -9062,12 +9345,11 @@
msgstr ""
#: transport-helper.c:417
-#, fuzzy, c-format
+#, c-format
msgid "%s also locked %s"
msgstr "%s também trancou %s"
#: transport-helper.c:497
-#, fuzzy
msgid "couldn't run fast-import"
msgstr "incapaz executar fast-import"
@@ -9075,13 +9357,13 @@
msgid "error while running fast-import"
msgstr ""
-#: transport-helper.c:549 transport-helper.c:1247
-#, fuzzy, c-format
+#: transport-helper.c:549 transport-helper.c:1254
+#, c-format
msgid "could not read ref %s"
msgstr "incapaz de ler ref %s"
#: transport-helper.c:594
-#, fuzzy, c-format
+#, c-format
msgid "unknown response to connect: %s"
msgstr "resposta de conexão desconhecida: %s"
@@ -9093,8 +9375,7 @@
msgid "invalid remote service path"
msgstr ""
-#: transport-helper.c:661 transport.c:1477
-#, fuzzy
+#: transport-helper.c:661 transport.c:1496
msgid "operation not supported by protocol"
msgstr "opção insustentado pelo protocolo"
@@ -9103,189 +9384,188 @@
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:415
msgid "--negotiate-only requires protocol v2"
msgstr ""
-#: transport-helper.c:755
+#: transport-helper.c:758
msgid "'option' without a matching 'ok/error' directive"
msgstr ""
-#: transport-helper.c:798
+#: transport-helper.c:801
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: transport-helper.c:855
-#, fuzzy, c-format
+#: transport-helper.c:862
+#, c-format
msgid "helper reported unexpected status of %s"
msgstr "helper reportou código de status inesperado de %s"
-#: transport-helper.c:938
-#, fuzzy, c-format
+#: transport-helper.c:945
+#, c-format
msgid "helper %s does not support dry-run"
msgstr "helper %s insustenta dry-run"
-#: transport-helper.c:941
-#, fuzzy, c-format
+#: transport-helper.c:948
+#, c-format
msgid "helper %s does not support --signed"
msgstr "helper %s insustenta --signed"
-#: transport-helper.c:944
-#, fuzzy, c-format
+#: transport-helper.c:951
+#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "helper %s insustenta --signed=if-asked"
-#: transport-helper.c:949
-#, fuzzy, c-format
+#: transport-helper.c:956
+#, c-format
msgid "helper %s does not support --atomic"
msgstr "helper %s insustenta --atomic"
-#: transport-helper.c:953
-#, fuzzy, c-format
+#: transport-helper.c:960
+#, c-format
msgid "helper %s does not support --%s"
msgstr "helper %s insustenta --%s"
-#: transport-helper.c:960
-#, fuzzy, c-format
+#: transport-helper.c:967
+#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "helper %s insustenta 'push-option'"
-#: transport-helper.c:1060
+#: transport-helper.c:1067
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:1065
-#, fuzzy, c-format
+#: transport-helper.c:1072
+#, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s insustenta 'force'"
-#: transport-helper.c:1112
-#, fuzzy
+#: transport-helper.c:1119
msgid "couldn't run fast-export"
msgstr "incapaz executar fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1124
msgid "error while running fast-export"
msgstr ""
-#: transport-helper.c:1142
+#: transport-helper.c:1149
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch.\n"
msgstr ""
+"Sem refs em comum e nenhuma especificada; fazendo nada.\n"
+"Talvez devas especificar um ramo.\n"
-#: transport-helper.c:1224
-#, fuzzy, c-format
+#: transport-helper.c:1231
+#, c-format
msgid "unsupported object format '%s'"
-msgstr "objeto malformado em '%s'"
+msgstr "formato de objeto '%s' insustentado"
-#: transport-helper.c:1233
-#, fuzzy, c-format
+#: transport-helper.c:1240
+#, c-format
msgid "malformed response in ref list: %s"
msgstr "resposta em lista de ref malformada: %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1392
#, c-format
msgid "read(%s) failed"
msgstr ""
-#: transport-helper.c:1412
+#: transport-helper.c:1419
#, c-format
msgid "write(%s) failed"
msgstr ""
-#: transport-helper.c:1461
+#: transport-helper.c:1468
#, c-format
msgid "%s thread failed"
msgstr ""
-#: transport-helper.c:1465
+#: transport-helper.c:1472
#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1491 transport-helper.c:1495
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1525
+#: transport-helper.c:1532
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1529
+#: transport-helper.c:1536
#, c-format
msgid "%s process failed"
msgstr ""
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1554 transport-helper.c:1563
msgid "can't start thread for copying data"
msgstr ""
#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Iria definir o ramo a montante de '%s' como '%s' de '%s'\n"
+msgstr "Iria definir upstream de '%s' para '%s' de '%s'\n"
-#: transport.c:145
-#, fuzzy, c-format
+#: transport.c:138
+#, c-format
msgid "could not read bundle '%s'"
-msgstr "incapaz ler conjunto '%s'"
+msgstr "incapaz ler arquivo-pacote '%s'"
-#: transport.c:223
+#: transport.c:234
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transporte: opção de profundidade '%s' inválida"
-#: transport.c:275
+#: transport.c:289
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: transport.c:276
+#: transport.c:290
msgid "server options require protocol version 2 or later"
msgstr ""
-#: transport.c:403
-#, fuzzy
+#: transport.c:418
msgid "server does not support wait-for-done"
-msgstr "Servidor insustenta --deepen"
+msgstr "Servidor insustenta wait-for-done"
-#: transport.c:755
-#, fuzzy
+#: transport.c:770
msgid "could not parse transport.color.* config"
msgstr "incapaz processar config transport.color.*"
-#: transport.c:830
+#: transport.c:845
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:965
-#, fuzzy, c-format
+#: transport.c:978
+#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor para config '%s' desconhecido: %s"
-#: transport.c:1031
-#, fuzzy, c-format
+#: transport.c:1044
+#, c-format
msgid "transport '%s' not allowed"
msgstr "transport '%s' proibido"
-#: transport.c:1084
+#: transport.c:1093
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1187
+#: transport.c:1196
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-"Os seguintes paths de submódulo contêm alterações que\n"
+"Os seguintes caminhos de submódulo contêm alterações que\n"
"puderam ser encontradas em remoto nenhum:\n"
-#: transport.c:1191
+#: transport.c:1200
#, c-format
msgid ""
"\n"
@@ -9301,25 +9581,24 @@
"\n"
msgstr ""
"\n"
-"Por favor tente\n"
+"Por favor tenta\n"
"\n"
"\tgit push --recurse-submodules=on-demand\n"
"\n"
-"ou cd para o caminho e use\n"
+"ou cd para o caminho e usa\n"
"\n"
"\tgit push\n"
"\n"
-"para publicá-las no remoto.\n"
+"para atirá-los para um remoto.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1208
msgid "Aborting."
msgstr "Abortado."
-#: transport.c:1346
-#, fuzzy
+#: transport.c:1354
msgid "failed to push all needed submodules"
-msgstr "Falha ao adicionar o submódulo '$sm_path'"
+msgstr "falhou ao atirar todos os submódulos necessários"
#: tree-walk.c:33
msgid "too-short tree object"
@@ -9337,197 +9616,215 @@
msgid "too-short tree file"
msgstr "ficheiro de árvore demasiado curto"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, 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 ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
-"extrair:\n"
-"%%sSubmeta as suas alterações ou esconda-as antes de trocar de ramo."
+"Tuas alterações locais nos seguintes ficheiros seriam sobrescritas ao fazer "
+"observação:\n"
+"%%sPor favor, memoriza as tuas alterações ou esconda-as antes de fazer troca "
+"de ramos."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
-"extrair:\n"
+"Tuas alterações locais nos seguintes ficheiros seriam sobrescritas ao fazer "
+"observação:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, 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 ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
-"integrar:\n"
-"%%sSubmeta as suas alterações ou esconda-as antes de integrar."
+"Tuas alterações locais nos seguintes ficheiros seriam sobrescritas ao fazer "
+"junção:\n"
+"%%sPor favor, memoriza as tuas alterações ou esconda-as antes de fazer "
+"junção."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
-"integrar:\n"
+"Tuas alterações locais nos seguintes ficheiros seriam sobrescritas ao fazer "
+"junção:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, 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 ""
-"As tuas alterações locais aos seguintes ficheiros seriam substituídas por "
+"Tuas alterações locais nos seguintes ficheiros seriam sobrescritas ao fazer "
"%s:\n"
-"%%sPor favor, faz commit ou stash às alterações antes de fazer %s."
+"%%sPor favor, memoriza as tuas alterações ou esconde-as antes de fazer %s."
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas por "
+"Tuas alterações locais nos seguintes ficheiros seriam sobrescritas ao fazer "
"%s:\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-"Atualizar as seguintes pastas fará perder os seus ficheiros por seguir:\n"
+"Atualizando as seguintes pastas fará perder seus ficheiros "
+"desmonitorizados:\n"
"%s"
-#: unpack-trees.c:136
-#, 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 ""
-"Os seguintes ficheiros por seguir da worktree seriam removidos no checkout:\n"
-"%%sPor favor, move ou remove-os antes de trocar de ramos."
-
#: unpack-trees.c:138
#, c-format
msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Recusando remover a pasta-trabalho actual:\n"
+"%s"
+
+#: unpack-trees.c:142
+#, 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 ""
+"Os seguintes ficheiros desmonitorizados da árvore-trabalho seriam removidos "
+"ao fazer observação:\n"
+"%%sPor favor, move ou remove-os antes de fazer troca de ramos."
+
+#: unpack-trees.c:144
+#, c-format
+msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam removidos no checkout:\n"
+"Os seguintes ficheiros desmonitorizados da árvore-trabalho seriam removidos "
+"ao fazer observação:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam removidos por uma "
-"junção:\n"
-"%%sPor favor, move ou remove-os antes da junção."
+"Os seguintes ficheiros desmonitorizados da árvore-trabalho seriam removidos "
+"ao fazer junção:\n"
+"%%sPor favor, move ou remove-os antes de fazer junção."
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam removidos pela junção:\n"
+"Os seguintes ficheiros desmonitorizados da árvore-trabalho seriam removidos "
+"ao fazer junção:\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam removidos por %s:\n"
+"Os seguintes ficheiros desmonitorizados da árvore-trabalho seriam removidos "
+"ao fazer %s:\n"
"%%sPor favor, move ou remove-os antes de fazer %s."
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-"Os seguintes ficheiros por seguir da árvore de trabalho seriam removidos por "
-"%s:\n"
+"Os seguintes ficheiros desmonitorizados da árvore-trabalho seriam removidos "
+"ao fazer %s:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-"Os seguintes ficheiros por seguir da árvore de trabalho seriam substituídos "
-"por um checkout:\n"
-"%%sPor favor, move ou remove-os antes de trocar de ramos."
+"Os seguintes ficheiros desmonitorizados da árvore-trabalho seriam "
+"sobrescritos ao observar:\n"
+"%%sPor favor, move ou remove-os antes de fazer troca de ramos."
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%s"
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por "
-"checkout:\n"
+"Os seguintes ficheiros desmonitorizados da árvore-trabalho seriam "
+"sobrescritos ao fazer observação:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por "
-"junção:\n"
-"%%sPor favor, move ou remove-os antes de juntares."
+"Os seguintes ficheiros desmonitorizados da árvore-trabalho seriam "
+"sobrescritos ao fazer junção:\n"
+"%%sPor favor, move ou remove-os antes de fazer junção."
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por "
-"junção:\n"
+"Os seguintes ficheiros desmonitorizados da árvore-trabalho seriam "
+"sobrescritos ao fazer junção:\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por %s:\n"
+"Os seguintes ficheiros desmonitorizados da árvore-trabalho seriam "
+"sobrescritos ao fazer %s:\n"
"%%sPor favor, move ou remove-os antes de fazer %s."
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por %s:\n"
+"Os seguintes ficheiros desmonitorizados da árvore-trabalho seriam "
+"sobrescritos ao fazer %s:\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Entrada '%s' sobrepõe-se a '%s'. Impossível vincular."
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -9536,7 +9833,7 @@
"Impossível atualizar submódulo:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -9544,8 +9841,8 @@
"%s"
msgstr ""
-#: unpack-trees.c:182
-#, fuzzy, c-format
+#: unpack-trees.c:188
+#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
@@ -9554,7 +9851,7 @@
"patterns:\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -9562,43 +9859,41 @@
"%s"
msgstr ""
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "A abortar\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
msgstr ""
-#: unpack-trees.c:352
-#, fuzzy
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "Atualizando ficheiros"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
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:1618
-#, fuzzy
+#: unpack-trees.c:1664
msgid "Updating index flags"
msgstr "Atualizando flags de cenário"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2925
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
-#: upload-pack.c:1548
+#: upload-pack.c:1579
msgid "expected flush after fetch arguments"
-msgstr ""
+msgstr "esperado flush após argumentos de busca"
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
@@ -9630,196 +9925,210 @@
msgstr "segmento de caminho '..' inválido"
#: walker.c:170
-#, fuzzy
msgid "Fetching objects"
msgstr "Buscando objetos"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "falha ao ler '%s'"
-#: worktree.c:303
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:314
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:326
-#, fuzzy, c-format
+#: worktree.c:327
+#, c-format
msgid "'%s' does not exist"
msgstr "'%s' é inexistente"
-#: worktree.c:332
-#, fuzzy, c-format
+#: worktree.c:333
+#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' é ficheiro .git nenhum, código de erro %d"
-#: worktree.c:341
-#, fuzzy, c-format
+#: worktree.c:342
+#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' aponta para algo diferente de '%s'"
-#: worktree.c:603
-#, fuzzy
+#: worktree.c:600
msgid "not a directory"
msgstr "é pasta nenhuma"
-#: worktree.c:612
-#, fuzzy
+#: worktree.c:609
msgid ".git is not a file"
-msgstr "git show %s: ficheiro incorreto"
+msgstr ".git é ficheiro nenhum"
-#: worktree.c:614
+#: worktree.c:611
msgid ".git file broken"
msgstr ""
-#: worktree.c:616
+#: worktree.c:613
msgid ".git file incorrect"
msgstr ""
-#: worktree.c:722
+#: worktree.c:719
msgid "not a valid path"
msgstr ""
-#: worktree.c:728
-#, fuzzy
+#: worktree.c:725
msgid "unable to locate repository; .git is not a file"
-msgstr "incapaz localizar repositório; .git é diferente de ficheiro"
+msgstr "incapaz localizar repositório; .git é ficheiro nenhum"
-#: worktree.c:732
-#, fuzzy
+#: worktree.c:729
msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "incapaz localizar repositório; .git é diferente de ficheiro"
+msgstr ""
+"incapaz localizar repositório; ficheiro .git referência repositório nenhum"
-#: worktree.c:736
-#, fuzzy
+#: worktree.c:733
msgid "unable to locate repository; .git file broken"
-msgstr "incapaz localizar repositório; .git está quebrado"
+msgstr "incapaz localizar repositório; ficheiro .git está quebrado"
-#: worktree.c:742
+#: worktree.c:739
msgid "gitdir unreadable"
-msgstr ""
+msgstr "incapaz ler pasta-git"
-#: worktree.c:746
+#: worktree.c:743
msgid "gitdir incorrect"
-msgstr ""
+msgstr "past-git incorreta"
-#: worktree.c:771
+#: worktree.c:768
msgid "not a valid directory"
-msgstr ""
+msgstr "pasta inválida"
-#: worktree.c:777
-#, fuzzy
+#: worktree.c:774
msgid "gitdir file does not exist"
-msgstr "ficheiro gitdir é inexistente"
+msgstr "ficheiro de pasta-git é inexistente"
-#: worktree.c:782 worktree.c:791
-#, fuzzy, c-format
+#: worktree.c:779 worktree.c:788
+#, c-format
msgid "unable to read gitdir file (%s)"
-msgstr "incapaz ler ficheiro gitdir (%s)"
+msgstr "incapaz ler ficheiro de pasta-git (%s)"
-#: worktree.c:801
+#: worktree.c:798
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr ""
-#: worktree.c:809
-#, fuzzy
+#: worktree.c:806
msgid "invalid gitdir file"
-msgstr "linha de Data inválida"
+msgstr "ficheiro de pasta-git inválido"
-#: worktree.c:817
-#, fuzzy
+#: worktree.c:814
msgid "gitdir file points to non-existent location"
-msgstr ""
-"A remover worktrees/%s: o ficheiro gitdir aponta para uma localização "
-"inexistente"
+msgstr "ficheiro de pasta-git aponta para localização inexistente"
-#: wrapper.c:197 wrapper.c:367
+#: worktree.c:830
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "incapaz definir %s em '%s'"
+
+#: worktree.c:832
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "incapaz de indefinir %s em '%s'"
+
+#: worktree.c:852
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr ""
+
+#: wrapper.c:161
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "incapaz setenv '%s'"
+
+#: wrapper.c:213
+#, c-format
+msgid "unable to create '%s'"
+msgstr "incapaz criar '%s'"
+
+#: wrapper.c:215 wrapper.c:385
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "incapaz abrir '%s' para leitura e escrita"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:416 wrapper.c:683
#, c-format
msgid "unable to access '%s'"
msgstr "incapaz aceder '%s'"
-#: wrapper.c:607
+#: wrapper.c:691
msgid "unable to get current working directory"
-msgstr "incapaz obter pasta atual de trabalho"
+msgstr "incapaz obter pasta-trabalho atual"
#: wt-status.c:158
msgid "Unmerged paths:"
-msgstr "Paths por juntar:"
+msgstr "Caminhos por juntar:"
#: wt-status.c:187 wt-status.c:219
-#, fuzzy
msgid " (use \"git restore --staged <file>...\" to unstage)"
-msgstr " (use \"git reset %s <ficheiro>...\" para despreparar)"
+msgstr " (usa \"git restore --staged <ficheiro>...\" para desencenar)"
#: wt-status.c:190 wt-status.c:222
-#, fuzzy, c-format
+#, c-format
msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr " (use \"git reset %s <ficheiro>...\" para despreparar)"
+msgstr ""
+" (usa \"git restore --source=%s --staged <ficheiro>...\" para desencenar)"
#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " (use \"git rm --cached <ficheiro>...\" para despreparar)"
+msgstr " (usa \"git rm --cached <ficheiro>...\" para desencenar)"
#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " (use \"git add <ficheiro>...\" para marcar como resolvido)"
+msgstr " (usa \"git add <ficheiro>...\" para marcar como resolvido)"
#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-" (use \"git add/rm <ficheiro>...\" conforme apropriado para marcar como "
+" (usa \"git add/rm <ficheiro>...\" conforme apropriado para marcar como "
"resolvido)"
#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)"
+msgstr " (usa \"git rm <ficheiro>...\" para marcar como resolvido)"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1140
msgid "Changes to be committed:"
-msgstr "Alterações para serem submetidas:"
+msgstr "Alterações para serem memorizadas:"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1149
msgid "Changes not staged for commit:"
-msgstr "Alterações por preparar para commit:"
+msgstr "Alterações por encenar para memória:"
#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " (use \"git add <ficheiro>...\" para atualizar o que será submetido)"
+msgstr " (usa \"git add <ficheiro>...\" para atualizar o que será memorizado)"
#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-" (use \"git add/rm <ficheiro>...\" para atualizar o que será submetido)"
+" (usa \"git add/rm <ficheiro>...\" para atualizar o que será memorizado)"
#: wt-status.c:241
-#, fuzzy
msgid ""
" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (use \"git checkout -- <ficheiro>...\" para descartar alterações no "
-"diretório de trabalho)"
+" (usa \"git restore <ficheiro>...\" para descartar alterações da pasta-"
+"trabalho)"
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-" (faz commit ou descarta o conteúdo por seguir ou modificado nos submódulos)"
+" (memoriza ou descarta os desmonitorizados ou o conteúdo modificado de "
+"submódulos)"
#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (use \"git %s <ficheiro>...\" para incluir no que será submetido)"
+msgstr " (usa \"git %s <ficheiro>...\" para incluir o que será memorizado)"
#: wt-status.c:266
msgid "both deleted:"
@@ -9867,7 +10176,7 @@
#: wt-status.c:296
msgid "renamed:"
-msgstr "nome mudado:"
+msgstr "renomeado:"
#: wt-status.c:298
msgid "typechange:"
@@ -9883,7 +10192,7 @@
#: wt-status.c:382
msgid "new commits, "
-msgstr "novos commits, "
+msgstr "novas memórias, "
#: wt-status.c:384
msgid "modified content, "
@@ -9891,25 +10200,24 @@
#: wt-status.c:386
msgid "untracked content, "
-msgstr "conteúdo por seguir, "
+msgstr "conteúdo desmonitorizado, "
-#: wt-status.c:958
-#, fuzzy, c-format
+#: wt-status.c:973
+#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Está a rebasear neste momento."
-msgstr[1] "Está a rebasear neste momento."
+msgstr[0] "Teu esconderijo neste momento tem %d entrada"
+msgstr[1] "Teu esconderijo neste momento tem %d entradas"
-#: wt-status.c:989
+#: wt-status.c:1004
msgid "Submodules changed but not updated:"
msgstr "Submódulos alterados mas desatualizados:"
-#: wt-status.c:991
+#: wt-status.c:1006
msgid "Submodule changes to be committed:"
-msgstr "Alterações em submódulos para serem submetidas:"
+msgstr "Alterações em submódulos para serem memorizadas:"
-#: wt-status.c:1073
-#, fuzzy
+#: wt-status.c:1088
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9917,549 +10225,549 @@
"Deixe estar a linha acima.\n"
"Tudo abaixo será ignorado."
-#: wt-status.c:1165
+#: wt-status.c:1180
#, c-format
msgid ""
"\n"
"It took %.2f seconds to compute the branch ahead/behind values.\n"
"You can use '--no-ahead-behind' to avoid this.\n"
msgstr ""
+"\n"
+"Demorou %.2f segundos para processar os valores à frente e atrás do ramo.\n"
+"Para evitar isto, podes usar '--no-ahead-behind'.\n"
-#: wt-status.c:1195
+#: wt-status.c:1210
msgid "You have unmerged paths."
-msgstr "Tens paths por juntar."
+msgstr "Tens caminhos por juntar."
-#: wt-status.c:1198
+#: wt-status.c:1213
msgid " (fix conflicts and run \"git commit\")"
-msgstr " (corrija os conflitos e execute \"git commit\")"
+msgstr " (corrige conflitos e executa \"git commit\")"
-#: wt-status.c:1200
+#: wt-status.c:1215
msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " (use \"git am --abort\" para abortar a integração)"
-
-#: wt-status.c:1204
-msgid "All conflicts fixed but you are still merging."
-msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar."
-
-#: wt-status.c:1207
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " (use \"git commit\" para concluir a integração)"
-
-#: wt-status.c:1216
-msgid "You are in the middle of an am session."
-msgstr "Sessão am em curso."
+msgstr " (usa \"git merge --abort\" para abortar a junção)"
#: wt-status.c:1219
+msgid "All conflicts fixed but you are still merging."
+msgstr "Todos os conflitos foram corrigidos mas ainda estás juntando."
+
+#: wt-status.c:1222
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (usa \"git commit\" para concluir a junção)"
+
+#: wt-status.c:1233
+msgid "You are in the middle of an am session."
+msgstr "Estás no meio de uma sessão am."
+
+#: wt-status.c:1236
msgid "The current patch is empty."
-msgstr "O patch atual está vazio."
+msgstr "O remendo atual está vazio."
-#: wt-status.c:1223
+#: wt-status.c:1241
msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr " (corrija os conflitos e execute \"git am --continue\")"
+msgstr " (corrige os conflitos e executa \"git am --continue\")"
-#: wt-status.c:1225
+#: wt-status.c:1243
msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " (use \"git am --skip\" para ignorar este patch)"
+msgstr " (usa \"git am --skip\" para ignorar este remendo)"
-#: wt-status.c:1227
+#: wt-status.c:1246
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (usa \"git am --allow-empty\" para gravar este remendo como uma memória "
+"vazia)"
+
+#: wt-status.c:1248
msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " (use \"git am --abort\" para restaurar o ramo original)"
+msgstr " (usa \"git am --abort\" para restaurar o ramo original)"
-#: wt-status.c:1360
+#: wt-status.c:1381
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo está faltando."
-#: wt-status.c:1362
+#: wt-status.c:1383
msgid "No commands done."
msgstr "Comando nenhum concluído."
-#: wt-status.c:1365
+#: wt-status.c:1386
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Último comando concluído (%d comando concluído):"
-msgstr[1] "Últimos comandos concluídos (%d comandos concluídos):"
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Último comando concluído (%<PRIuMAX> comando concluído):"
+msgstr[1] "Últimos comandos concluídos (%<PRIuMAX> comandos concluídos):"
-#: wt-status.c:1376
+#: wt-status.c:1397
#, c-format
msgid " (see more in file %s)"
-msgstr " (veja mais no ficheiro %s)"
+msgstr " (vê mais no ficheiro %s)"
-#: wt-status.c:1381
+#: wt-status.c:1402
msgid "No commands remaining."
-msgstr "Nenhum comando por concluir."
+msgstr "Faltando comando nenhum."
-#: wt-status.c:1384
+#: wt-status.c:1405
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Próximo comando a executar (%d comando restante):"
-msgstr[1] "Próximos comandos a executar (%d comandos restantes):"
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Próximo comando a executar (%<PRIuMAX> comando restante):"
+msgstr[1] "Próximos comandos a executar (%<PRIuMAX> comandos restantes):"
-#: wt-status.c:1392
+#: wt-status.c:1413
msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)"
+msgstr " (usa \"git rebase --edit-todo\" para visualizar e editar)"
-#: wt-status.c:1404
+#: wt-status.c:1425
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Está a realizar rebase do ramo '%s' sobre '%s'."
+msgstr "Estás rebaseando ramo '%s' sobre '%s'."
-#: wt-status.c:1409
+#: wt-status.c:1430
msgid "You are currently rebasing."
-msgstr "Está a rebasear neste momento."
+msgstr "Estás rebaseando neste momento."
-#: wt-status.c:1422
+#: wt-status.c:1443
msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " (corrija os conflitos e execute \"git rebase --continue\")"
+msgstr " (corrige os conflitos e executa \"git rebase --continue\")"
-#: wt-status.c:1424
+#: wt-status.c:1445
msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " (use \"git rebase --skip\" para ignorar este patch)"
+msgstr " (usa \"git rebase --skip\" para ignorar este remendo)"
-#: wt-status.c:1426
+#: wt-status.c:1447
msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"
+msgstr " (usa \"git rebase --abort\" para observar o ramo original)"
-#: wt-status.c:1433
+#: wt-status.c:1454
msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr ""
-" (todos os conflitos foram corrigidos: execute \"git rebase --continue\")"
+msgstr " (todos conflitos corrigidos: executa \"git rebase --continue\")"
-#: wt-status.c:1437
+#: wt-status.c:1458
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' "
-"sobre '%s'."
+msgstr "Estás dividindo uma memória enquanto rebaseas ramo '%s' sobre '%s'."
-#: wt-status.c:1442
+#: wt-status.c:1463
msgid "You are currently splitting a commit during a rebase."
-msgstr "Está a dividir um commit durante um rebase."
+msgstr "Está dividindo uma memória durante um rebaseamento."
-#: wt-status.c:1445
+#: wt-status.c:1466
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-" (Assim que o diretório de trabalho estiver limpo, execute \"git rebase --"
-"continue\")"
+" (Assim que a pasta-trabalho estiver limpa, executa \"git rebase --continue"
+"\")"
-#: wt-status.c:1449
+#: wt-status.c:1470
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre "
-"'%s'."
+msgstr "Estás a editar uma memória enquanto rebaseas o ramo '%s' sobre '%s'."
-#: wt-status.c:1454
+#: wt-status.c:1475
msgid "You are currently editing a commit during a rebase."
-msgstr "Está a editar um commit durante um rebase."
+msgstr "Está a editar uma memória durante um rebaseamento."
-#: wt-status.c:1457
+#: wt-status.c:1478
msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " (use \"git commit --amend\" para emendar o commit atual)"
+msgstr " (usa \"git commit --amend\" para emendar a memória atual)"
-#: wt-status.c:1459
+#: wt-status.c:1480
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-" (use \"git rebase --continue\" assim que estiver satisfeito com as "
+" (usa \"git rebase --continue\" assim que estiveres satisfeito com as tuas "
"alterações)"
-#: wt-status.c:1470
-#, fuzzy
+#: wt-status.c:1491
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick atualmente em curso"
-#: wt-status.c:1473
+#: wt-status.c:1494
#, c-format
msgid "You are currently cherry-picking commit %s."
-msgstr "Está a realizar cherry-pick do commit %s."
+msgstr "Estás apanhando memória %s."
-#: wt-status.c:1480
+#: wt-status.c:1501
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")"
+msgstr " (corrige conflitos e executa \"git cherry-pick --continue\")"
-#: wt-status.c:1483
-#, fuzzy
+#: wt-status.c:1504
msgid " (run \"git cherry-pick --continue\" to continue)"
-msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")"
+msgstr " (executa \"git cherry-pick --continue\" para continuar)"
-#: wt-status.c:1486
+#: wt-status.c:1507
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-" (todos os conflitos foram corrigidos: execute \"git cherry-pick --continue"
-"\")"
-
-#: wt-status.c:1488
-#, fuzzy
-msgid " (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr " (use \"git am --skip\" para ignorar este patch)"
-
-#: wt-status.c:1490
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr ""
-" (use \"git cherry-pick --abort\" para cancelar a operação de cherry-pick)"
-
-#: wt-status.c:1500
-#, fuzzy
-msgid "Revert currently in progress."
-msgstr "abortar integração em curso"
-
-#: wt-status.c:1503
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Está a reverter o commit %s neste comento."
+msgstr " (todos conflitos corrigidos: executa \"git cherry-pick --continue\")"
#: wt-status.c:1509
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " (corrija dos conflitos e execute \"git revert --continue\")"
+msgid " (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr " (usa \"git cherry-pick --skip\" para saltar este remendo)"
-#: wt-status.c:1512
-#, fuzzy
-msgid " (run \"git revert --continue\" to continue)"
-msgstr " (corrija dos conflitos e execute \"git revert --continue\")"
+#: wt-status.c:1511
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " (usa \"git cherry-pick --abort\" para cancelar a operação apanhar)"
-#: wt-status.c:1515
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr ""
-" (todos os conflitos foram corrigidos: execute \"git revert --continue\")"
+#: wt-status.c:1521
+msgid "Revert currently in progress."
+msgstr "Reversão atualmente em curso."
-#: wt-status.c:1517
-#, fuzzy
-msgid " (use \"git revert --skip\" to skip this patch)"
-msgstr " (use \"git rebase --skip\" para ignorar este patch)"
-
-#: wt-status.c:1519
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " (use \"git rever --abort\" para cancelar a operação de reversão)"
-
-#: wt-status.c:1529
+#: wt-status.c:1524
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Está a bissetar, iniciado a partir do ramo '%s'."
+msgid "You are currently reverting commit %s."
+msgstr "Estás atualmente revertendo memória %s."
+
+#: wt-status.c:1530
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (corrige os conflitos e executa \"git revert --continue\")"
#: wt-status.c:1533
-msgid "You are currently bisecting."
-msgstr "Está a bissetar neste momento."
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " (executa \"git revert --continue\" para continuar)"
#: wt-status.c:1536
-msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " (use \"git bisect reset\" para voltar ao ramo original)"
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " (todos conflitos corrigidos: executa \"git revert --continue\")"
-#: wt-status.c:1547
-#, fuzzy
-msgid "You are in a sparse checkout."
-msgstr "Estás num checkout disperso."
+#: wt-status.c:1538
+msgid " (use \"git revert --skip\" to skip this patch)"
+msgstr " (usa \"git revert --skip\" para ignorar este remendo)"
+
+#: wt-status.c:1540
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " (usa \"git revert --abort\" para cancelar a operação de reversão)"
#: wt-status.c:1550
#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Estás bissetando, iniciado no ramo '%s'."
+
+#: wt-status.c:1554
+msgid "You are currently bisecting."
+msgstr "Estás bissetando neste momento."
+
+#: wt-status.c:1557
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (usa \"git bisect reset\" para voltar ao ramo original)"
+
+#: wt-status.c:1568
+msgid "You are in a sparse checkout."
+msgstr "Estás numa observação dispersa."
+
+#: wt-status.c:1571
+#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
-#: wt-status.c:1794
+#: wt-status.c:1815
msgid "On branch "
-msgstr "No ramo "
+msgstr "Em ramo "
-#: wt-status.c:1801
+#: wt-status.c:1822
msgid "interactive rebase in progress; onto "
msgstr "rebase interativo em curso; sobre "
-#: wt-status.c:1803
+#: wt-status.c:1824
msgid "rebase in progress; onto "
msgstr "rebase em curso; sobre "
-#: wt-status.c:1808
+#: wt-status.c:1829
msgid "HEAD detached at "
-msgstr "HEAD destacada em "
+msgstr "HEAD desanexada em "
-#: wt-status.c:1810
+#: wt-status.c:1831
msgid "HEAD detached from "
-msgstr "HEAD destacada de "
+msgstr "HEAD desanexada de "
-#: wt-status.c:1813
+#: wt-status.c:1834
msgid "Not currently on any branch."
msgstr "Atualmente em ramo nenhum."
-#: wt-status.c:1830
+#: wt-status.c:1851
msgid "Initial commit"
msgstr "Memória inicial"
-#: wt-status.c:1831
-#, fuzzy
+#: wt-status.c:1852
msgid "No commits yet"
-msgstr "Ainda commits nenhuns"
+msgstr "Ainda sem memórias"
-#: wt-status.c:1845
+#: wt-status.c:1866
msgid "Untracked files"
-msgstr "Ficheiros por seguir"
+msgstr "Ficheiros desmonitorizados"
-#: wt-status.c:1847
+#: wt-status.c:1868
msgid "Ignored files"
msgstr "Ficheiros ignorados"
-#: wt-status.c:1851
+#: wt-status.c:1872
#, 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 ""
-"A enumeração dos ficheiros por controlar demorou %.2f segundos.\n"
-"'status -uno' pode-o acelerar, mas tens de te lembrar de adicionares\n"
+"A enumeração dos ficheiros desmonitorizados demorou %.2f segundos.\n"
+"'status -uno' pode acelerá-lo, mas tens de te lembrar de adicionar\n"
"os novos ficheiros (vê 'git help status')."
-#: wt-status.c:1857
+#: wt-status.c:1878
#, c-format
msgid "Untracked files not listed%s"
-msgstr "Ficheiros por seguir fora da listagem%s"
+msgstr "Ficheiros desmonitorizados fora da listagem%s"
-#: wt-status.c:1859
+#: wt-status.c:1880
msgid " (use -u option to show untracked files)"
-msgstr " (usa opção -u para mostrar ficheiros por seguir)"
+msgstr " (usa opção -u para mostrar ficheiros desmonitorizados)"
-#: wt-status.c:1865
+#: wt-status.c:1886
msgid "No changes"
msgstr "Sem alterações"
-#: wt-status.c:1870
+#: wt-status.c:1891
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-"foi adicionado a commit alteração nenhuma (usa \"git add\" e/ou \"git commit "
-"-a\")\n"
+"foi adicionado a memória alteração nenhuma (usa \"git add\" e/ou \"git "
+"commit -a\")\n"
-#: wt-status.c:1874
+#: wt-status.c:1895
#, c-format
msgid "no changes added to commit\n"
-msgstr "foi adicionado a commit alteração nenhuma\n"
+msgstr "foi adicionado a memória alteração nenhuma\n"
-#: wt-status.c:1878
+#: wt-status.c:1899
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-"nada adicionado para commit mas há ficheiros por seguir presentes (usa(\"git "
-"add\" para seguir)\n"
+"nada adicionado a memória mas há ficheiros desmonitorizados presentes (usa "
+"\"git add\" para monitorizar)\n"
-#: wt-status.c:1882
+#: wt-status.c:1903
#, c-format
msgid "nothing added to commit but untracked files present\n"
-msgstr "nada adicionado para commit mas ficheiros por seguir presentes\n"
+msgstr ""
+"nada adicionado a memória mas há ficheiros desmonitorizados presentes\n"
-#: wt-status.c:1886
+#: wt-status.c:1907
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "nada a commit (cria/copia ficheiros e usa \"git add\" para seguir)\n"
+msgstr ""
+"nada a memorizar (cria/copia ficheiros e usa \"git add\" para monitorizar)\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1911 wt-status.c:1917
#, c-format
msgid "nothing to commit\n"
-msgstr "nada a commit\n"
+msgstr "nada a memorizar\n"
-#: wt-status.c:1893
+#: wt-status.c:1914
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "nada a commit (use -u para mostrar ficheiros por seguir)\n"
+msgstr "nada a memorizar (usa -u para mostrar ficheiros desmonitorizados)\n"
-#: wt-status.c:1898
+#: wt-status.c:1919
#, c-format
msgid "nothing to commit, working tree clean\n"
-msgstr "nada a commitar, worktree limpa\n"
+msgstr "nada a memorizar, árvore-trabalho limpa\n"
-#: wt-status.c:2003
-#, fuzzy
+#: wt-status.c:2024
msgid "No commits yet on "
msgstr "Memórias nenhumas em "
-#: wt-status.c:2007
+#: wt-status.c:2028
msgid "HEAD (no branch)"
msgstr "HEAD (ramo nenhum)"
-#: wt-status.c:2038
+#: wt-status.c:2059
msgid "different"
msgstr "diferente"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2061 wt-status.c:2069
msgid "behind "
msgstr "atrás "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2064 wt-status.c:2067
msgid "ahead "
msgstr "à frente "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2605
#, c-format
msgid "cannot %s: You have unstaged changes."
-msgstr "incapaz efetuar %s: Tens alterações despreparadas."
+msgstr "incapaz efetuar %s: Tens alterações desencenadas."
-#: wt-status.c:2575
+#: wt-status.c:2611
msgid "additionally, your index contains uncommitted changes."
-msgstr "além disso, teu index contém alterações por memorizar."
+msgstr "além disso, teu cenário contém alterações por memorizar."
-#: wt-status.c:2577
+#: wt-status.c:2613
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
-msgstr "incapaz efetuar %s: teu index contém alterações por memorizar."
+msgstr "incapaz efetuar %s: Teu cenário contém alterações por memorizar."
-#: compat/simple-ipc/ipc-unix-socket.c:182
-#, fuzzy
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
-msgstr "incapaz encontrar commit %s"
+msgstr "incapaz enviar comando IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:189
-#, fuzzy
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
-msgstr "incapaz de ler ref %s"
+msgstr "incapaz de ler resposta IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:878
-#, fuzzy, c-format
+#: compat/simple-ipc/ipc-unix-socket.c:904
+#, c-format
msgid "could not start worker[0] for '%s'"
-msgstr "incapaz analisar log para '%s'"
+msgstr "incapaz começar worker[0] para '%s'"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:353
#, c-format
msgid "failed to unlink '%s'"
msgstr "falha ao unlink '%s'"
+#: compat/fsmonitor/fsm-listen-darwin.c:355
+msgid "Unable to create FSEventStream."
+msgstr "Incapaz criar FSEventStream."
+
+#: compat/fsmonitor/fsm-listen-darwin.c:403
+msgid "Failed to start the FSEventStream"
+msgstr "Falhou ao iniciar o FSEventStream"
+
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<opções>] [--] <caminho>..."
+msgstr "git add [<opções>] [--] <espetro-caminho>..."
-#: builtin/add.c:61
-#, fuzzy, c-format
+#: builtin/add.c:63
+#, c-format
msgid "cannot chmod %cx '%s'"
-msgstr "incapaz chdir para '%s'"
+msgstr "incapaz chmod %cx '%s'"
-#: builtin/add.c:99
+#: builtin/add.c:105
#, c-format
msgid "unexpected diff status %c"
msgstr "diff status inesperado %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:110 builtin/commit.c:299
msgid "updating files failed"
-msgstr "falha ao atualizar os ficheiros"
+msgstr "falhou ao atualizar ficheiros"
-#: builtin/add.c:114
+#: builtin/add.c:120
#, c-format
msgid "remove '%s'\n"
msgstr "remove '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:204
msgid "Unstaged changes after refreshing the index:"
-msgstr "Alterações despreparadas após refrescar index:"
+msgstr "Alterações desencenadas após refrescar cenário:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:312 builtin/rev-parse.c:993
msgid "Could not read the index"
-msgstr "Incapaz ler o index"
+msgstr "Incapaz ler o cenário"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Incapaz de abrir '%s' para escrita."
-
-#: builtin/add.c:322
+#: builtin/add.c:325
msgid "Could not write patch"
msgstr "Incapaz de escrever patch"
-#: builtin/add.c:325
+#: builtin/add.c:328
msgid "editing patch failed"
msgstr "edição de patch falhou"
-#: builtin/add.c:328
+#: builtin/add.c:331
#, c-format
msgid "Could not stat '%s'"
msgstr "Impossível fazer stat de '%s'"
-#: builtin/add.c:330
+#: builtin/add.c:333
msgid "Empty patch. Aborted."
msgstr "Patch vazio. Abortado."
-#: builtin/add.c:335
+#: builtin/add.c:339
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossível submeter '%s'"
-#: builtin/add.c:343
+#: builtin/add.c:347
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .gitignore:\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "simular ação"
-#: builtin/add.c:366
+#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "ser verboso"
+
+#: builtin/add.c:370
msgid "interactive picking"
msgstr "seleção interativa"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
msgid "select hunks interactively"
msgstr "selecionar blocos interativamente"
-#: builtin/add.c:368
+#: builtin/add.c:372
msgid "edit current diff and apply"
msgstr "editar o diff atual e aplicá-lo"
-#: builtin/add.c:369
+#: builtin/add.c:373
msgid "allow adding otherwise ignored files"
msgstr "permitir adicionar ficheiros ignorados"
-#: builtin/add.c:370
+#: builtin/add.c:374
msgid "update tracked files"
msgstr "atualizar ficheiros controlados"
-#: builtin/add.c:371
+#: builtin/add.c:375
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/add.c:372
+#: builtin/add.c:376
msgid "record only the fact that the path will be added later"
msgstr "registar apenas o facto de que o caminho será adicionado mais tarde"
-#: builtin/add.c:373
+#: builtin/add.c:377
msgid "add changes from all tracked and untracked files"
msgstr ""
-"adicionar alterações de todos ficheiros seguidos e ficheiros por seguir"
+"adiciona alterações de todos ficheiros monitorizados e desmonitorizados"
-#: builtin/add.c:376
+#: builtin/add.c:380
msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "ignorar paths removidos na worktree (o mesmo que --no-all)"
+msgstr "ignorar paths removidos na árvore-trabalho (o mesmo que --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:382
msgid "don't add, only refresh the index"
-msgstr "deixa de adicionar, apenas atualiza o index"
+msgstr "deixa por adicionar, apenas atualiza o cenário"
-#: builtin/add.c:379
+#: builtin/add.c:383
msgid "just skip files which cannot be added because of errors"
msgstr "apenas ignora ficheiros que, por causa de erros, ficam por adicionar"
-#: builtin/add.c:380
+#: builtin/add.c:384
msgid "check if - even missing - files are ignored in dry run"
msgstr "verificar quais os ficheiros ignorados na simulação"
-#: builtin/add.c:382 builtin/update-index.c:1006
-msgid "override the executable bit of the listed files"
-msgstr "substituir o bit executável dos ficheiros listados"
-
-#: builtin/add.c:384
-#, fuzzy
-msgid "warn when adding an embedded repository"
-msgstr "criar um repositório nu"
-
-#: builtin/add.c:386
-msgid "backend for `git stash -p`"
+#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
msgstr ""
-#: builtin/add.c:404
+#: builtin/add.c:387 builtin/update-index.c:1023
+msgid "override the executable bit of the listed files"
+msgstr "sobrepor o bit executável dos ficheiros listados"
+
+#: builtin/add.c:389
+msgid "warn when adding an embedded repository"
+msgstr ""
+
+#: builtin/add.c:407
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10477,249 +10785,240 @@
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:432
-#, fuzzy, c-format
+#: builtin/add.c:436
+#, c-format
msgid "adding embedded git repository: %s"
-msgstr "--stdin requer um repositório git"
+msgstr ""
-#: builtin/add.c:451
+#: builtin/add.c:456
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"\"git config advice.addIgnoredFile false\""
msgstr ""
-#: builtin/add.c:460
+#: builtin/add.c:471
msgid "adding files failed"
-msgstr "falha ao adicionar ficheiros"
+msgstr "falhou adicionar ficheiros"
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr ""
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A e -u são mutuamente incompatíveis"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "A opção --ignore-missing só pode ser usada em conjunto com --dry-run"
-
-#: builtin/add.c:526
+#: builtin/add.c:534
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
-msgstr "o parâmetro '%s' de --chmod tem de ser -x ou +x"
+msgstr "parâmetro '%s' de --chmod tem de ser -x ou +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
-#, fuzzy
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--patch é incompatível com --{hard,mixed,soft}"
+#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
+#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "argumentos de espetro-caminho e '%s' incapaz de serem usados juntos"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr ""
-
-#: builtin/add.c:555
+#: builtin/add.c:566
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ".\n"
-#: builtin/add.c:557
+#: builtin/add.c:568
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"\"git config advice.addEmptyPathspec false\""
msgstr ""
-#: builtin/am.c:365
+#: builtin/am.c:393
msgid "could not parse author script"
msgstr "incapaz processar script de autor"
-#: builtin/am.c:455
+#: builtin/am.c:483
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' foi eliminado pelo hook applypatch-msg"
-#: builtin/am.c:497
+#: builtin/am.c:525
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Linha de entrada malformada: '%s'."
-#: builtin/am.c:535
+#: builtin/am.c:563
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Falha ao copiar notas de '%s' para '%s'"
-#: builtin/am.c:561
+#: builtin/am.c:589
msgid "fseek failed"
msgstr "falha de fseek"
-#: builtin/am.c:749
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "incapaz processar patch '%s'"
-#: builtin/am.c:814
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Só pode ser aplicada uma série de patches StGIT duma só vez"
-#: builtin/am.c:862
+#: builtin/am.c:890
msgid "invalid timestamp"
msgstr "carimbo de data/hora inválido"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:895 builtin/am.c:907
msgid "invalid Date line"
msgstr "linha de Data inválida"
-#: builtin/am.c:874
+#: builtin/am.c:902
msgid "invalid timezone offset"
msgstr "mudança de fuso horário inválida"
-#: builtin/am.c:967
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Falha ao detetar o formato do patch."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:1000 builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
-msgstr "falha ao criar o diretório '%s'"
+msgstr "falhou criar pasta '%s'"
-#: builtin/am.c:977
+#: builtin/am.c:1005
msgid "Failed to split patches."
-msgstr "Falha ao dividir patches."
+msgstr "Falhou ao dividir remendos."
-#: builtin/am.c:1126
+#: builtin/am.c:1154
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Após resolver este problema, execute \"%s --continue\"."
+msgstr "Após resolver este problema, executa \"%s --continue\"."
-#: builtin/am.c:1127
+#: builtin/am.c:1155
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "Se preferir ignorar este patch, execute \"%s --skip\"."
+msgstr "Se preferes ignorar este remendo, executa \"%s --skip\" invés."
-#: builtin/am.c:1128
+#: builtin/am.c:1160
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Para gravar o remendo vazio como memória vazia, executa \"%s --allow-empty\"."
+
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-"Para restaurar o ramo original e interromper a aplicação dos patches, "
-"execute \"%s --abort\"."
+"Para restaurar o ramo original e parar de remendar, executa \"%s --abort\"."
-#: builtin/am.c:1223
+#: builtin/am.c:1257
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/am.c:1251
-#, fuzzy
-msgid "Patch is empty."
-msgstr "O patch atual está vazio."
-
-#: builtin/am.c:1316
-#, fuzzy, c-format
+#: builtin/am.c:1345
+#, c-format
msgid "missing author line in commit %s"
-msgstr "Autor em falta: %s"
+msgstr "faltando linha de autor em memória %s"
-#: builtin/am.c:1319
-#, fuzzy, c-format
+#: builtin/am.c:1348
+#, c-format
msgid "invalid ident line: %.*s"
msgstr "linha de indentação inválida: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1567
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Repositório falta blobs necessários para recorrer à tri-junção."
-#: builtin/am.c:1540
+#: builtin/am.c:1569
msgid "Using index info to reconstruct a base tree..."
-msgstr "A usar informação do índice para reconstruir uma árvore de base..."
+msgstr "A usar informação do cenário para reconstruir uma árvore de base..."
-#: builtin/am.c:1559
+#: builtin/am.c:1588
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-"Editaste o patch manualmente?\n"
-"No registo de index, aplica-se a blobs nenhuns."
+"Editaste o remendo manualmente?\n"
+"Excepcionando blobs guardados no seu cenário"
-#: builtin/am.c:1565
+#: builtin/am.c:1594
msgid "Falling back to patching base and 3-way merge..."
-msgstr ""
-"A recorrer a uma de base para aplicação de patches e integração com 3 "
-"pontos..."
+msgstr "Recorrendo a remendar base e tri-junção..."
-#: builtin/am.c:1591
+#: builtin/am.c:1620
msgid "Failed to merge in the changes."
-msgstr "Falha ao integrar as alterações."
+msgstr "Falha ao juntar as alterações."
-#: builtin/am.c:1623
+#: builtin/am.c:1652
msgid "applying to an empty history"
-msgstr "a aplicar a um histórico vazio"
+msgstr "submetendo para um histórico vazio"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1704 builtin/am.c:1708
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "incapaz continuar: %s é inexistente."
-#: builtin/am.c:1697
+#: builtin/am.c:1726
msgid "Commit Body is:"
-msgstr "Corpo do commit:"
+msgstr "Corpo da Memória é:"
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1736
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos: "
+msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er remendo/[a]ceitar todos: "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1782 builtin/commit.c:410
msgid "unable to write index file"
-msgstr "incapaz escrever ficheiro de index"
+msgstr "incapaz escrever ficheiro de cenário"
-#: builtin/am.c:1757
+#: builtin/am.c:1786
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "Index sujo: incapaz aplicar patches (sujo: %s)"
+msgstr "Cenário sujo: incapaz aplicar remendos (sujo: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1828
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Saltando: %.*s"
+
+#: builtin/am.c:1833
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Criando memória vazia: %.*s"
+
+#: builtin/am.c:1837
+msgid "Patch is empty."
+msgstr "Remendo está vazio."
+
+#: builtin/am.c:1848 builtin/am.c:1917
#, c-format
msgid "Applying: %.*s"
msgstr "A aplicar: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1865
msgid "No changes -- Patch already applied."
-msgstr "Nenhuma alteração -- Já foi aplicado o patch."
+msgstr "Nenhuma alteração -- Remendo já foi aplicado."
-#: builtin/am.c:1820
+#: builtin/am.c:1871
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Falha ao aplicar o patch em %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1875
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
-#: builtin/am.c:1868
+#: builtin/am.c:1921
+msgid "No changes - recorded it as an empty commit."
+msgstr "Sem alterações - gravado como uma memória vazia."
+
+#: builtin/am.c:1923
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 ""
"Sem alterações - esqueceste-te de usar 'git add'?\n"
-"Se há mais nada por preparar, provavelmente essas mesmas alterações\n"
-"já foram introduzidas; poderás querer saltar este patch."
+"Se há mais nada por encenar, provavelmente essas mesmas alterações\n"
+"já foram introduzidas; poderás querer saltar este remendo."
-#: builtin/am.c:1875
+#: builtin/am.c:1931
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10727,17 +11026,17 @@
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
+#: builtin/reset.c:463
#, c-format
msgid "Could not parse object '%s'."
msgstr "Incapaz analisar objeto '%s'."
-#: builtin/am.c:2034
+#: builtin/am.c:2091 builtin/am.c:2167
msgid "failed to clean index"
-msgstr ""
+msgstr "falhou ao limpar cenário"
-#: builtin/am.c:2078
+#: builtin/am.c:2135
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10745,165 +11044,159 @@
"Parece que moveste HEAD desde a última falha de 'am'.\n"
"Recusando rebobinar até ORIG_HEAD"
-#: builtin/am.c:2185
+#: builtin/am.c:2292
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Valor inválido de --patch-format: %s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "opções '%s=%s' e '%s=%s' incapaz serem usadas juntas"
-#: builtin/am.c:2227
-#, fuzzy, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr "Valor inválido de --patch-format: %s"
-
-#: builtin/am.c:2231
-#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr ""
-
-#: builtin/am.c:2262
+#: builtin/am.c:2323
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opções>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2324
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opções>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2330
msgid "run interactively"
msgstr "executar interativamente"
-#: builtin/am.c:2271
+#: builtin/am.c:2332
msgid "historical option -- no-op"
msgstr "opção histórica -- sem-ação"
-#: builtin/am.c:2273
+#: builtin/am.c:2334
msgid "allow fall back on 3way merging if needed"
-msgstr "permitir recorrer a integração com 3 pontos se necessário"
+msgstr "permitir recorrer a tri-junção se necessário"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:646 builtin/stash.c:946
msgid "be quiet"
-msgstr "silencioso"
+msgstr "ficar silencioso"
-#: builtin/am.c:2276
-#, fuzzy
+#: builtin/am.c:2337
msgid "add a Signed-off-by trailer to the commit message"
-msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
+msgstr "adicionar atribuição Signed-off-by para a mensagem de memória"
-#: builtin/am.c:2279
+#: builtin/am.c:2340
msgid "recode into utf8 (default)"
msgstr "recodificar em utf8 (predefinição)"
-#: builtin/am.c:2281
+#: builtin/am.c:2342
msgid "pass -k flag to git-mailinfo"
msgstr "passar a opção -k ao git-mailinfo"
-#: builtin/am.c:2283
+#: builtin/am.c:2344
msgid "pass -b flag to git-mailinfo"
msgstr "passar a opção -b ao git-mailinfo"
-#: builtin/am.c:2285
+#: builtin/am.c:2346
msgid "pass -m flag to git-mailinfo"
msgstr "passar a opção -m ao git-mailinfo"
-#: builtin/am.c:2287
+#: builtin/am.c:2348
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "passar flag --keep-cr para git-mailsplit para formato mbox"
+msgstr "passar a opção --keep-cr a git-mailsplit para formato mbox"
-#: builtin/am.c:2290
+#: builtin/am.c:2351
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-"proibido passares --keep-cr para git-mailsplit independentemente de am."
-"keepcr"
+"proibido passares --keep-cr a git-mailsplit independentemente de am.keepcr"
-#: builtin/am.c:2293
+#: builtin/am.c:2354
msgid "strip everything before a scissors line"
msgstr "retirar todo o conteúdo antes da linha de tesoura"
-#: builtin/am.c:2295
-#, fuzzy
+#: builtin/am.c:2356
msgid "pass it through git-mailinfo"
-msgstr "transmitir ao git-apply"
+msgstr "passa-o pelo git-mailinfo"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
+#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
+#: builtin/am.c:2386
msgid "pass it through git-apply"
msgstr "passa-o pelo git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
+#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
+#: parse-options.h:348
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
-#: builtin/verify-tag.c:38
+#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
+#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
+#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
+#: builtin/tag.c:480 builtin/verify-tag.c:38
msgid "format"
msgstr "formato"
-#: builtin/am.c:2322
+#: builtin/am.c:2383
msgid "format the patch(es) are in"
-msgstr "formato de apresentação de patches"
+msgstr "formato em que o(s) remendo(s) estão"
-#: builtin/am.c:2328
+#: builtin/am.c:2389
msgid "override error message when patch failure occurs"
-msgstr "substituir a mensagem de erro quando a aplicação do patch falha"
+msgstr "sobrepor mensagem de erro quando falha na aplicação de remendo ocorrer"
-#: builtin/am.c:2330
+#: builtin/am.c:2391
msgid "continue applying patches after resolving a conflict"
-msgstr "continuar a aplicar os patches depois de resolver os conflitos"
+msgstr "continuar aplicando remendos depois de resolver um conflito"
-#: builtin/am.c:2333
+#: builtin/am.c:2394
msgid "synonyms for --continue"
msgstr "sinónimo de --continue"
-#: builtin/am.c:2336
+#: builtin/am.c:2397
msgid "skip the current patch"
msgstr "ignorar remendo atual"
-#: builtin/am.c:2339
-#, fuzzy
+#: builtin/am.c:2400
msgid "restore the original branch and abort the patching operation"
-msgstr "restaurar o ramo original e abortar a operação de patch."
+msgstr "restaurar o ramo original e abortar a operação de remendar"
-#: builtin/am.c:2342
+#: builtin/am.c:2403
msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
-#: builtin/am.c:2346
-#, fuzzy
+#: builtin/am.c:2407
msgid "show the patch being applied"
msgstr "mostrar linhas sendo submetidas"
-#: builtin/am.c:2351
-msgid "lie about committer date"
-msgstr "mentir sobre a data de commit"
+#: builtin/am.c:2411
+msgid "record the empty patch as an empty commit"
+msgstr ""
-#: builtin/am.c:2353
+#: builtin/am.c:2415
+msgid "lie about committer date"
+msgstr "mentir sobre a data de memorizador"
+
+#: builtin/am.c:2417
msgid "use current timestamp for author date"
msgstr "usar a data e hora atual como data de autor"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
+#: builtin/revert.c:117 builtin/tag.c:461
msgid "key-id"
msgstr "id-chave"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2420 builtin/rebase.c:1128
msgid "GPG-sign commits"
-msgstr "assinar os commits com GPG"
+msgstr "assinar memórias com GPG"
-#: builtin/am.c:2359
+#: builtin/am.c:2423
+msgid "how to handle empty patches"
+msgstr "como lidar com remendos vazios"
+
+#: builtin/am.c:2426
msgid "(internal use for git-rebase)"
-msgstr "(uso interno de git-rebase)"
+msgstr "(uso interno para git-rebase)"
-#: builtin/am.c:2377
+#: builtin/am.c:2444
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."
@@ -10911,84 +11204,65 @@
"A opção -b/--binary há muito que é ignorada e será removida.\n"
"Por favor deixa de usá-la."
-#: builtin/am.c:2384
+#: builtin/am.c:2451
msgid "failed to read the index"
msgstr "falhou ler cenário"
-#: builtin/am.c:2399
+#: builtin/am.c:2466
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-"o diretório de rebesa anterior %s ainda existe, mas foi fornecida uma mbox."
+"o pasta de rebesa anterior %s ainda existe, mas foi fornecida uma mbox."
-#: builtin/am.c:2423
+#: builtin/am.c:2490
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-"Diretório abandonado %s encontrado.\n"
-"Use \"git am --abort\" para o remover."
+"Pasta perdida %s encontrada.\n"
+"Usa \"git am --abort\" para a remover."
-#: builtin/am.c:2429
+#: builtin/am.c:2496
msgid "Resolve operation not in progress, we are not resuming."
msgstr "A operação de resolução está parada, continuará parada."
-#: builtin/am.c:2439
+#: builtin/am.c:2506
msgid "interactive mode requires patches on the command line"
msgstr ""
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<opções>] [<patch>...]"
+msgstr "git apply [<opções>] [<remendo>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "incapaz criar ficheiro de arquivo '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "incapaz redirecionar a saída"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Remoto sem URL"
-#: builtin/archive.c:61
-#, fuzzy
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
-msgstr "git archive: esperava-se ACK/NAK, obteve-se EOF"
+msgstr "git archive: esperado ACK/NAK, recebi pacote flush"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: erro de protocolo"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
-msgstr "git archive: esvaziamento de cache (flush) esperado"
-
-#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr ""
+msgstr "git archive: esperado um flush"
#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-
-#: builtin/bisect--helper.c:25
-#, fuzzy
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<memória>]"
#: builtin/bisect--helper.c:26
msgid ""
@@ -10996,495 +11270,518 @@
"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
"[<paths>...]"
msgstr ""
-
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr ""
+"git bisect--helper --bisect-start [--term-{new,bad}=<termo> --term-{old,good}"
+"=<termo>] [--no-checkout] [--first-parent] [<mau> [<bom>...]] [--] "
+"[<caminhos>...]"
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr ""
+msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
#: builtin/bisect--helper.c:30
msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr ""
+msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
#: builtin/bisect--helper.c:31
msgid "git bisect--helper --bisect-replay <filename>"
-msgstr ""
+msgstr "git bisect--helper --bisect-replay <ficheiro>"
#: builtin/bisect--helper.c:32
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr ""
+msgstr "git bisect--helper --bisect-skip [(<rev>|<intervalo>)...]"
-#: builtin/bisect--helper.c:107
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <cmd>..."
+
+#: builtin/bisect--helper.c:109
+#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "incapaz abrir ficheiro '%s' em modo '%s'"
-#: builtin/bisect--helper.c:114
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:116
+#, c-format
msgid "could not write to file '%s'"
msgstr "incapaz escrever para ficheiro '%s'"
-#: builtin/bisect--helper.c:155
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "incapaz abrir ficheiro '%s' para leitura"
+
+#: builtin/bisect--helper.c:170
+#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' é um termo inválido."
-#: builtin/bisect--helper.c:159
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:174
+#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "incapaz usar comando embutido '%s' como um termo"
-#: builtin/bisect--helper.c:169
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:184
+#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "incapaz alterar o significado do termo '%s'"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "por favor, usa dois termos diferentes"
-#: builtin/bisect--helper.c:195
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:210
+#, c-format
msgid "We are not bisecting.\n"
msgstr "Estamos bissetando nada.\n"
-#: builtin/bisect--helper.c:203
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:218
+#, c-format
msgid "'%s' is not a valid commit"
-msgstr "'%s' é um commit inválido"
+msgstr "'%s' é uma memória inválida"
-#: builtin/bisect--helper.c:212
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:227
+#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
-"pude check out HEAD original '%s' nenhuma. Tenta 'git bisect reset <commit>'."
+"incapaz observar HEAD original '%s'. Tenta 'git bisect reset <memória>'."
-#: builtin/bisect--helper.c:256
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:271
+#, c-format
msgid "Bad bisect_write argument: %s"
-msgstr "Argumento de bisect_write incorreto: $state"
+msgstr "Argumento bisect_write incorreto: %s"
-#: builtin/bisect--helper.c:261
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:276
+#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "incapaz obter oid da rev '%s'"
-#: builtin/bisect--helper.c:273
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:288
+#, c-format
msgid "couldn't open the file '%s'"
msgstr "incapaz abrir o ficheiro '%s'"
-#: builtin/bisect--helper.c:299
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:314
+#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
-msgstr ""
-"Comando inválido: está-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD."
+msgstr "Comando inválido: estás bissetando %s/%s"
-#: builtin/bisect--helper.c:326
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:341
+#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-"Deve indicar pelo menos uma revisão $bad_syn e uma revisão $good_syn.\n"
-"(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)"
+"Precisas de dar-me pelo menos uma revisão %s e %s.\n"
+"Para isso, podes usar \"git bisect %s\" e \"git bisect %s\"."
-#: builtin/bisect--helper.c:330
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:345
+#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
"You then need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-"Deve começar por executar \"git bisect start\".\n"
-"Indique pelo menos uma revisão $good_syn e uma revisão $bad_syn.\n"
-"(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)"
+"Precisas de começar com \"git bisect start\".\n"
+"Depois precisas de dar-me pelo menos uma revisão %s e %s.\n"
+"Para isso, podes usar \"git bisect %s\" e \"git bisect %s\"."
-#: builtin/bisect--helper.c:350
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:365
+#, c-format
msgid "bisecting only with a %s commit"
-msgstr "Aviso: a bissetar só com um commit $TERM_BAD."
+msgstr "bissetando apenas com uma memória %s"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
-msgstr "Tem a certeza [Y/n]? "
+msgstr "Tens a certeza [Y/n]? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "termo nenhum definido"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr ""
+"Teus termos actuais são %s para o estado\n"
+"antigo e %s para o estado novo.\n"
-#: builtin/bisect--helper.c:432
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:447
+#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
"argumento inválido %s para 'git bisect terms'.\n"
-"Opções suportadas: --term-good|--term-old e --term-bad|--term-new."
+"Opções sustentadas: --term-good|--term-old e --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
-#, fuzzy
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
-msgstr "falha ao configurar percurso de revisões\n"
+msgstr "falhou a configuração de percurso de revisões\n"
-#: builtin/bisect--helper.c:521
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:536
+#, c-format
msgid "could not open '%s' for appending"
msgstr "incapaz abrir '%s' para acrescentar"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
-#, fuzzy
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' é um termo inválido"
-#: builtin/bisect--helper.c:663
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:678
+#, c-format
msgid "unrecognized option: '%s'"
msgstr "opção desconhecida: '%s'"
-#: builtin/bisect--helper.c:667
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:682
+#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' parece ser uma revisão inválida"
-#: builtin/bisect--helper.c:698
-#, fuzzy
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "HEAD incorreta - é necessário uma HEAD"
-#: builtin/bisect--helper.c:713
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:728
+#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr ""
-"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
+msgstr "falhou observar '%s'. Tenta 'git bisect start <ramo-válido>'."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "incapaz bissetar numa árvore \"cg-seek'ada\""
-#: builtin/bisect--helper.c:737
-#, fuzzy
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
-msgstr "HEAD incorreta - referência simbólica desconhecida"
+msgstr "HEAD incorreta - referência simbólica estranha"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
-msgstr ""
+msgstr "ref inválida: '%s'"
-#: builtin/bisect--helper.c:815
-#, fuzzy
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
-msgstr "Deve começar por executar \"git bisect start\"\n"
+msgstr "Deves começar com \"git bisect start\"\n"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Quer que o Git o faça por si [Y/n]? "
+msgstr "Quer que eu faça isso por ti [Y/n]? "
-#: builtin/bisect--helper.c:844
-#, fuzzy
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
-msgstr "Invoque 'bisect_state' com pelo menos um argumento."
+msgstr "Por favor, chama `--bisect-state` com pelo menos um argumento"
-#: builtin/bisect--helper.c:857
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:872
+#, c-format
msgid "'git bisect %s' can take only one argument."
-msgstr "'git bisect $TERM_BAD' só leva um argumento."
+msgstr "'git bisect %s' só leva um argumento."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
+#, c-format
msgid "Bad rev input: %s"
-msgstr "Revisão incorreta na entrada: $arg"
+msgstr "Entrada de rev inválida: %s"
-#: builtin/bisect--helper.c:889
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:904
+#, c-format
msgid "Bad rev input (not a commit): %s"
-msgstr "Revisão incorreta na entrada: $arg"
+msgstr "Entrada de rev inválida (é memória nenhuma): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Estamos bissetando nada."
-#: builtin/bisect--helper.c:971
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:986
+#, c-format
msgid "'%s'?? what are you talking about?"
-msgstr "?? de que é que estás a falar?"
+msgstr "'%s'?? estás a falar de quê?"
-#: builtin/bisect--helper.c:983
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:998
+#, c-format
msgid "cannot read file '%s' for replaying"
-msgstr "incapaz ler $file para reproduzir"
+msgstr "incapaz ler ficheiro '%s' para reprodução"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#, c-format
+msgid "running %s\n"
+msgstr "executando %s\n"
+
+#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+msgid "bisect run failed: no command provided."
+msgstr "execução bisseção falhou: providenciado comando nenhum."
+
+#: builtin/bisect--helper.c:1166
+#, c-format
+msgid "unable to verify '%s' on good revision"
+msgstr "incapaz de verificar '%s' em revisão boa"
+
+#: builtin/bisect--helper.c:1172
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr ""
+
+#: builtin/bisect--helper.c:1180
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "execução bisseção falhou: código de saída %d de '%s' é < 0 ou >= 128"
+
+#: builtin/bisect--helper.c:1195
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "incapaz abrir ficheiro '%s' para escrita"
+
+#: builtin/bisect--helper.c:1213
+msgid "bisect run cannot continue any more"
+msgstr "execução bisseção incapaz de continuar"
+
+#: builtin/bisect--helper.c:1215
+#, c-format
+msgid "bisect run success"
+msgstr "sucesso na execução bisseção"
+
+#: builtin/bisect--helper.c:1218
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "bisseção encontrou primeira memória má"
+
+#: builtin/bisect--helper.c:1221
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"execução bisseção falhou: 'git bisect--helper --bisect-state %s' retornou "
+"com código de erro %d"
+
+#: builtin/bisect--helper.c:1253
msgid "reset the bisection state"
-msgstr ""
+msgstr "restabelecer o estado de bisseção"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1255
msgid "check whether bad or good terms exist"
-msgstr ""
+msgstr "verificar se existem termos bons ou maus"
-#: builtin/bisect--helper.c:1060
-#, fuzzy
+#: builtin/bisect--helper.c:1257
msgid "print out the bisect terms"
-msgstr "imprimir termos de bifurcação"
+msgstr "mostrar termos de bisseção"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1259
msgid "start the bisect session"
-msgstr ""
+msgstr "começar a sessão de bisseção"
-#: builtin/bisect--helper.c:1064
-#, fuzzy
+#: builtin/bisect--helper.c:1261
msgid "find the next bisection commit"
-msgstr "encontra próximo commit de bisecção"
+msgstr "encontrar próxima memória de bissecção"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1263
msgid "mark the state of ref (or refs)"
-msgstr ""
+msgstr "marcar estado de ref (ou refs)"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1265
msgid "list the bisection steps so far"
-msgstr ""
+msgstr "listar todos os passos de bisseção até então"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1267
msgid "replay the bisection process from the given file"
-msgstr ""
+msgstr "refazer o processo de bisseção a partir de o ficheiro dado"
-#: builtin/bisect--helper.c:1072
-#, fuzzy
+#: builtin/bisect--helper.c:1269
msgid "skip some commits for checkout"
-msgstr "'%s' tem commit checked out nenhum"
+msgstr "saltar algumas memórias para uma observação"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1271
+msgid "visualize the bisection"
+msgstr "visualiza a bissecção"
+
+#: builtin/bisect--helper.c:1273
+msgid "use <cmd>... to automatically bisect"
+msgstr "usa <cmd>... para bissetar automaticamente."
+
+#: builtin/bisect--helper.c:1275
msgid "no log for BISECT_WRITE"
-msgstr ""
+msgstr "nenhum registo para BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1290
msgid "--bisect-reset requires either no argument or a commit"
-msgstr ""
+msgstr "--bisect-reset exige quer argumento nenhum ou uma memória"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:1100
-#, fuzzy
+#: builtin/bisect--helper.c:1295
msgid "--bisect-terms requires 0 or 1 argument"
-msgstr ":strip= requer um inteiro positivo como argumento"
+msgstr "--bisect-terms exige 0 ou 1 argumento"
-#: builtin/bisect--helper.c:1109
-#, fuzzy
+#: builtin/bisect--helper.c:1304
msgid "--bisect-next requires 0 arguments"
-msgstr "--bisect-next requer 0 argumentos"
+msgstr "--bisect-next exige 0 argumentos"
-#: builtin/bisect--helper.c:1120
-#, fuzzy
+#: builtin/bisect--helper.c:1315
msgid "--bisect-log requires 0 arguments"
-msgstr "--bisect-next requer 0 argumentos"
+msgstr "--bisect-log exige 0 argumentos"
-#: builtin/bisect--helper.c:1125
-#, fuzzy
+#: builtin/bisect--helper.c:1320
msgid "no logfile given"
-msgstr "Nenhum ficheiro de log fornecido"
+msgstr "nenhum ficheiro-registo fornecido"
#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git blame [<opções>] [<rev-opções>] [<rev>] [--] <ficheiro>"
+msgstr "git blame [<opções>] [<rev-opts>] [<rev>] [--] <ficheiro>"
#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
-msgstr "<rev-opções> estão documentadas em git-rev-list(1)"
+msgstr "<rev-opts> estão documentadas em git-rev-list(1)"
-#: builtin/blame.c:410
-#, fuzzy, c-format
+#: builtin/blame.c:406
+#, c-format
msgid "expecting a color: %s"
-msgstr "a redirecionar para %s "
+msgstr "esperando cor: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr ""
-#: builtin/blame.c:728
-#, fuzzy, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "ignorar cor inválida '%.*s' em log.graphColors"
-
-#: builtin/blame.c:746
-msgid "invalid value for blame.coloring"
-msgstr ""
-
-#: builtin/blame.c:845
+#: builtin/blame.c:842
#, c-format
msgid "cannot find revision %s to ignore"
-msgstr ""
+msgstr "incapaz encontrar revisão %s para ignorar"
-#: builtin/blame.c:867
-#, fuzzy
+#: builtin/blame.c:864
msgid "show blame entries as we find them, incrementally"
msgstr ""
-"Mostrar entradas de culpa à medida que forem encontradas, incrementalmente"
+"mostrar entradas de culpa à medida que forem encontradas, incrementalmente"
-#: builtin/blame.c:868
-#, fuzzy
+#: builtin/blame.c:865
msgid "do not show object names of boundary commits (Default: off)"
-msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)"
+msgstr ""
+"mostrar nenhuns nomes de objeto de memórias fronteira (Predefinição: "
+"desativado)"
-#: builtin/blame.c:869
-#, fuzzy
+#: builtin/blame.c:866
msgid "do not treat root commits as boundaries (Default: off)"
-msgstr "Tratar commits raiz como limite nenhum (Predefinição: desativado)"
+msgstr ""
+"tratar nenhumas memórias raiz como fronteira (Predefinição: desativado)"
-#: builtin/blame.c:870
-#, fuzzy
+#: builtin/blame.c:867
msgid "show work cost statistics"
-msgstr "Mostrar estatísticas de custo de atividade"
+msgstr "mostrar estatísticas de custo de trabalho"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
+#: builtin/remote.c:683 builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "forçar informação de progresso"
-#: builtin/blame.c:872
-#, fuzzy
+#: builtin/blame.c:869
msgid "show output score for blame entries"
-msgstr "Mostrar a pontuação das entradas de culpa"
+msgstr "mostrar a pontuação das entradas de culpa"
+
+#: builtin/blame.c:870
+msgid "show original filename (Default: auto)"
+msgstr "mostrar nome do ficheiro original (Predefinição: auto)"
+
+#: builtin/blame.c:871
+msgid "show original linenumber (Default: off)"
+msgstr "mostrar números de linha originais (Predefinição: desativado)"
+
+#: builtin/blame.c:872
+msgid "show in a format designed for machine consumption"
+msgstr "mostrar em formato próprio para consumo por máquina"
#: builtin/blame.c:873
-#, fuzzy
-msgid "show original filename (Default: auto)"
-msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)"
+msgid "show porcelain format with per-line commit information"
+msgstr "mostrar em formato de porcelana com informações de memória por linha"
#: builtin/blame.c:874
-#, fuzzy
-msgid "show original linenumber (Default: off)"
-msgstr "Mostrar números de linha originais (Predefinição: desativado)"
+msgid "use the same output mode as git-annotate (Default: off)"
+msgstr "usar o mesmo modo de saída que git-annotate (Predefinição: desativado)"
#: builtin/blame.c:875
-#, fuzzy
-msgid "show in a format designed for machine consumption"
-msgstr "Mostrar em formato próprio para ser consumo por uma máquina"
+msgid "show raw timestamp (Default: off)"
+msgstr "mostrar carimbo cronológico em bruto (Predefinição: desativado)"
#: builtin/blame.c:876
-#, fuzzy
-msgid "show porcelain format with per-line commit information"
-msgstr "Mostrar em formato de porcelana com informações de commit por linha"
+msgid "show long commit SHA1 (Default: off)"
+msgstr "mostrar SHA1 longo de memória (Predefinição: desativado)"
#: builtin/blame.c:877
-#, fuzzy
-msgid "use the same output mode as git-annotate (Default: off)"
-msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)"
-
-#: builtin/blame.c:878
-#, fuzzy
-msgid "show raw timestamp (Default: off)"
-msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)"
-
-#: builtin/blame.c:879
-#, fuzzy
-msgid "show long commit SHA1 (Default: off)"
-msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)"
-
-#: builtin/blame.c:880
-#, fuzzy
msgid "suppress author name and timestamp (Default: off)"
msgstr ""
-"Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)"
+"suprimir nome de autor e carimbo cronológico (Predefinição: desativado)"
-#: builtin/blame.c:881
-#, fuzzy
+#: builtin/blame.c:878
msgid "show author email instead of name (Default: off)"
-msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)"
+msgstr "mostrar email de autor em vez do nome (Predefinição: desativado)"
-#: builtin/blame.c:882
-#, fuzzy
+#: builtin/blame.c:879
msgid "ignore whitespace differences"
msgstr "Ignorar as diferenças de espaço em branco"
-#: builtin/blame.c:883 builtin/log.c:1823
-#, fuzzy
+#: builtin/blame.c:880 builtin/log.c:1857
msgid "rev"
-msgstr "reverter"
+msgstr "rev"
-#: builtin/blame.c:883
-#, fuzzy
+#: builtin/blame.c:880
msgid "ignore <rev> when blaming"
-msgstr "ignorar o índice ao verificar"
+msgstr "ignorar <rev> ao culpar"
-#: builtin/blame.c:884
+#: builtin/blame.c:881
msgid "ignore revisions from <file>"
-msgstr ""
+msgstr "ignorar revisões de <ficheiro>"
-#: builtin/blame.c:885
+#: builtin/blame.c:882
msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/blame.c:886
+#: builtin/blame.c:883
msgid "color lines by age"
-msgstr ""
+msgstr "cor de linhas por idade"
-#: builtin/blame.c:887
-#, fuzzy
+#: builtin/blame.c:884
msgid "spend extra cycles to find better match"
-msgstr "Despender ciclos extra para encontrar uma melhor correspondência"
+msgstr "gastar ciclos extra para encontrar uma melhor correspondência"
-#: builtin/blame.c:888
-#, fuzzy
+#: builtin/blame.c:885
msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list"
+msgstr "usar revisões de <ficheiro> em vez de invocar git-rev-list"
-#: builtin/blame.c:889
-#, fuzzy
+#: builtin/blame.c:886
msgid "use <file>'s contents as the final image"
-msgstr "Usar o conteúdo do <ficheiro> como imagem final"
+msgstr "usar o conteúdo de <ficheiro> como imagem final"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:887 builtin/blame.c:888
msgid "score"
msgstr "pontuação"
-#: builtin/blame.c:890
-#, fuzzy
+#: builtin/blame.c:887
msgid "find line copies within and across files"
-msgstr "Localizar linhas copiadas dentro e entre ficheiros"
+msgstr "encontrar linhas copiadas dentro e entre ficheiros"
-#: builtin/blame.c:891
-#, fuzzy
+#: builtin/blame.c:888
msgid "find line movements within and across files"
-msgstr "Localizar linhas movidas dentro e entre ficheiros"
+msgstr "encontrar linhas movidas dentro e entre ficheiros"
-#: builtin/blame.c:892
-#, fuzzy
+#: builtin/blame.c:889
msgid "range"
msgstr "intervalo"
-#: builtin/blame.c:893
-#, fuzzy
+#: builtin/blame.c:890
msgid "process only line range <start>,<end> or function :<funcname>"
-msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
-
-#: builtin/blame.c:945
-msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
-"estás proibido de usar --progress com --incremental ou formatos porcelain"
+"processar apenas intervalo de linhas <início>,<fim> ou função :<nome-função>"
+
+#: builtin/blame.c:949
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "proibido usar --progress com --incremental ou formatos porcelana"
#. TRANSLATORS: This string is used to tell us the
#. maximum display width for a relative timestamp in
@@ -11494,52 +11791,58 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:1000
msgid "4 years, 11 months ago"
msgstr "há 4 anos e 11 meses atrás"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1116
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
-msgstr[0] "o ficheiro %s só tem %lu linha"
-msgstr[1] "o ficheiro %s só tem %lu linhas"
+msgstr[0] "ficheiro %s só tem %lu linha"
+msgstr[1] "ficheiro %s só tem %lu linhas"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1161
msgid "Blaming lines"
msgstr "Linhas de culpa"
#: builtin/branch.c:29
-#, fuzzy
msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr "git branch [<opções>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<opções>] [-r | -a] [--merged] [--no-merged]"
#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<opções>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr ""
+"git branch [<opções>] [-f] [--recurse-submodules] <nome-ramo> [<ponto-de-"
+"partida>]"
#: builtin/branch.c:31
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr "git branch [<opções>] [-r] (-d | -D) <nome-do-ramo>..."
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<opções>] [-l] [<padrão>...]"
#: builtin/branch.c:32
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<opções>] [-r] (-d | -D) <nome-ramo>..."
+
+#: builtin/branch.c:33
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<opções>] (-m | -M) [<ramo-antigo>] <novo-ramo>"
-#: builtin/branch.c:33
-#, fuzzy
-msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
-msgstr "git branch [<opções>] (-m | -M) [<ramo-antigo>] <novo-ramo>"
-
#: builtin/branch.c:34
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<opções>] (-c | -C) [<ramo-antigo>] <novo-ramo>"
+
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<opções>] [-r | -a] [--points-at]"
-#: builtin/branch.c:35
+#: builtin/branch.c:36
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opções>] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:165
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -11548,7 +11851,7 @@
"eliminando ramo '%s' que foi juntado a\n"
" '%s', mas ainda está por juntar a HEAD."
-#: builtin/branch.c:158
+#: builtin/branch.c:169
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -11557,324 +11860,321 @@
"mantendo ramo '%s' que ainda está por juntar a\n"
" '%s', apesar de já estar junto a HEAD."
-#: builtin/branch.c:172
+#: builtin/branch.c:183
#, c-format
msgid "Couldn't look up commit object for '%s'"
-msgstr "Incapaz pesquisar objeto commit para '%s'"
+msgstr "Incapaz encontrar objeto memória para '%s'"
-#: builtin/branch.c:176
+#: builtin/branch.c:187
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-"O ramo '%s' está por juntar na totalidade.\n"
+"O ramo '%s' está por ser totalmente juntado.\n"
"Se tens a certeza que queres eliminá-lo, executa 'git branch -D %s'."
-#: builtin/branch.c:189
+#: builtin/branch.c:200
msgid "Update of config-file failed"
msgstr "Falha ao atualizar o ficheiro de configuração"
-#: builtin/branch.c:223
+#: builtin/branch.c:235
msgid "cannot use -a with -d"
msgstr "incapaz usar -a com -d"
-#: builtin/branch.c:230
+#: builtin/branch.c:242
msgid "Couldn't look up commit object for HEAD"
-msgstr "Incapaz de pesquisar objeto commit para HEAD"
-
-#: builtin/branch.c:244
-#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "Impossível apagar ramo '%s' checked out em '%s'"
+msgstr "Incapaz de encontrar objeto memória para HEAD"
#: builtin/branch.c:259
#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Incapaz eliminar ramo '%s' observado em '%s'"
+
+#: builtin/branch.c:274
+#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "ramo de monitorização remoto '%s' por encontrar."
-#: builtin/branch.c:260
+#: builtin/branch.c:275
#, c-format
msgid "branch '%s' not found."
msgstr "ramo '%s' por encontrar."
-#: builtin/branch.c:291
+#: builtin/branch.c:306
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Ramo de monitorização remoto %s eliminado (era %s).\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:307
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Ramo %s eliminado (era %s).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
-#, fuzzy
+#: builtin/branch.c:457 builtin/tag.c:64
msgid "unable to parse format string"
msgstr "incapaz processar o formato string"
-#: builtin/branch.c:471
-#, fuzzy
+#: builtin/branch.c:488
msgid "could not resolve HEAD"
msgstr "incapaz resolver HEAD"
-#: builtin/branch.c:477
-#, fuzzy, c-format
+#: builtin/branch.c:494
+#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) aponta para fora de refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:509
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "O ramo %s está a ser rebaseado em %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:513
#, c-format
msgid "Branch %s is being bisected at %s"
-msgstr "O ramo %s está a ser bissetado em %s"
+msgstr "Ramo %s está sendo bissetado em %s"
-#: builtin/branch.c:513
-#, fuzzy
+#: builtin/branch.c:530
msgid "cannot copy the current branch while not on any."
msgstr "apenas podes copiar o ramo corrente enquanto estás num."
-#: builtin/branch.c:515
+#: builtin/branch.c:532
msgid "cannot rename the current branch while not on any."
msgstr "apenas podes renomear o ramo corrente enquanto estás num."
-#: builtin/branch.c:526
+#: builtin/branch.c:543
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nome de ramo inválido: '%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:572
msgid "Branch rename failed"
-msgstr "Falha ao mudar o nome do ramo"
+msgstr "Renomear ramo falhou"
-#: builtin/branch.c:557
-#, fuzzy
+#: builtin/branch.c:574
msgid "Branch copy failed"
-msgstr "Falha ao mudar o nome do ramo"
+msgstr "Copiar ramo falhou"
-#: builtin/branch.c:561
-#, fuzzy, c-format
+#: builtin/branch.c:578
+#, c-format
msgid "Created a copy of a misnamed branch '%s'"
-msgstr "O ramo incorretamente denominado '%s' mudou de nome"
+msgstr "Criei uma cópia de ramo incorretamente denominado '%s'"
-#: builtin/branch.c:564
+#: builtin/branch.c:581
#, c-format
msgid "Renamed a misnamed branch '%s' away"
-msgstr "O ramo incorretamente denominado '%s' mudou de nome"
+msgstr "Renomeei o ramo incorretamente denominado '%s'"
-#: builtin/branch.c:570
+#: builtin/branch.c:587
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Ramo renomeado para %s, mas HEAD está desatualizada!"
-#: builtin/branch.c:579
+#: builtin/branch.c:596
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-"O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
+"Ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
-#: builtin/branch.c:581
-#, fuzzy
+#: builtin/branch.c:598
msgid "Branch is copied, but update of config-file failed"
-msgstr ""
-"O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
+msgstr "Ramo foi copiado, mas a atualização do ficheiro de configuração falhou"
-#: builtin/branch.c:597
+#: builtin/branch.c:614
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-"Edite a descrição do ramo:\n"
+"Por favor, edita a descrição do ramo\n"
" %s\n"
-"Linha começadas com '%c' serão ignoradas.\n"
+"Linha começadas com '%c' serão removidas.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Opções genéricas"
-#: builtin/branch.c:633
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
-msgstr "apresentar hash e assunto, duplique para ramos a montante"
+msgstr "mostrar hash e assunto, duplica para ramo upstream"
-#: builtin/branch.c:634
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "suprimir mensagens informativas"
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "configurar modo de seguimento (consulte git-pull(1))"
+#: builtin/branch.c:656 builtin/checkout.c:1571
+#: builtin/submodule--helper.c:3077
+msgid "set branch tracking configuration"
+msgstr "mostrar configuração de monitorização de ramo"
-#: builtin/branch.c:637
-#, fuzzy
+#: builtin/branch.c:659
msgid "do not use"
-msgstr "esquema a usar"
+msgstr "deixar de usar"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:661
msgid "upstream"
-msgstr "a montante"
+msgstr "upstream"
-#: builtin/branch.c:639
+#: builtin/branch.c:661
msgid "change the upstream info"
-msgstr "alterar a informação do ramo a montante"
+msgstr "alterar info de upstream"
-#: builtin/branch.c:640
-#, fuzzy
+#: builtin/branch.c:662
msgid "unset the upstream info"
-msgstr "Remover a informação do ramo a montante"
+msgstr "indefinir info de upstream"
-#: builtin/branch.c:641
+#: builtin/branch.c:663
msgid "use colored output"
msgstr "usar saída colorida"
-#: builtin/branch.c:642
+#: builtin/branch.c:664
msgid "act on remote-tracking branches"
-msgstr "atuar sobre ramos de monitorização remotos"
+msgstr "atuar sobre ramos remotos de monitorização"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:666 builtin/branch.c:668
msgid "print only branches that contain the commit"
-msgstr "imprimir apenas ramos que contenham o commit"
+msgstr "mostrar apenas ramos que contenham a memória"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:667 builtin/branch.c:669
msgid "print only branches that don't contain the commit"
-msgstr "imprimir apenas ramos que contenham outro commit"
+msgstr "mostrar apenas ramos a que falte a memória"
-#: builtin/branch.c:650
+#: builtin/branch.c:672
msgid "Specific git-branch actions:"
-msgstr "Ações específicas do git-branch:"
+msgstr "Ações específicas de git-branch:"
-#: builtin/branch.c:651
+#: builtin/branch.c:673
msgid "list both remote-tracking and local branches"
-msgstr "listar ramos de monitorização remotos e ramos locais"
+msgstr "listar quer ramos de monitorização remotos quer ramos locais"
-#: builtin/branch.c:653
+#: builtin/branch.c:675
msgid "delete fully merged branch"
-msgstr "eliminar um ramo totalmente integrado"
+msgstr "eliminar ramo que está totalmente junto"
-#: builtin/branch.c:654
+#: builtin/branch.c:676
msgid "delete branch (even if not merged)"
msgstr "elimina ramo (mesmo que esteja por juntar)"
-#: builtin/branch.c:655
+#: builtin/branch.c:677
msgid "move/rename a branch and its reflog"
-msgstr "mover ou mudar o nome de um ramo e o seu reflog"
+msgstr "mover/renomear ramo e seu registo-ref"
-#: builtin/branch.c:656
+#: builtin/branch.c:678
msgid "move/rename a branch, even if target exists"
-msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista"
+msgstr "mover/renomear um ramo, mesmo se existe alvo"
-#: builtin/branch.c:657
-#, fuzzy
+#: builtin/branch.c:679
msgid "copy a branch and its reflog"
-msgstr "mover ou mudar o nome de um ramo e o seu reflog"
+msgstr "copiar ramo e seu registo-ref"
-#: builtin/branch.c:658
-#, fuzzy
+#: builtin/branch.c:680
msgid "copy a branch, even if target exists"
-msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista"
+msgstr "copiar um ramo, mesmo se existe alvo"
-#: builtin/branch.c:659
+#: builtin/branch.c:681
msgid "list branch names"
-msgstr "listar os nomes dos ramos"
+msgstr "listar nomes de ramos"
-#: builtin/branch.c:660
-#, fuzzy
+#: builtin/branch.c:682
msgid "show current branch name"
-msgstr "Nenhum ramo atual."
+msgstr "mostrar nome de ramo atual"
-#: builtin/branch.c:661
+#: builtin/branch.c:683 builtin/submodule--helper.c:3075
msgid "create the branch's reflog"
-msgstr "criar reflog do ramo"
+msgstr "criar registo-ref de ramo"
-#: builtin/branch.c:663
+#: builtin/branch.c:685
msgid "edit the description for the branch"
-msgstr "editar a descrição do ramo"
+msgstr "editar a descrição de ramo"
-#: builtin/branch.c:664
+#: builtin/branch.c:686
msgid "force creation, move/rename, deletion"
-msgstr "forçar criação, mover/mudar o nome ou exclusão"
+msgstr "forçar criação, mover/renomear, eliminação"
-#: builtin/branch.c:665
+#: builtin/branch.c:687
msgid "print only branches that are merged"
-msgstr "imprimir apenas os ramos que foram integrados"
+msgstr "mostrar apenas ramos que estão juntos"
-#: builtin/branch.c:666
+#: builtin/branch.c:688
msgid "print only branches that are not merged"
-msgstr "imprimir apenas ramos que estão por juntar"
+msgstr "mostrar apenas ramos que estão por juntar"
-#: builtin/branch.c:667
+#: builtin/branch.c:689
msgid "list branches in columns"
-msgstr "listar os ramos em colunas"
+msgstr "listar ramos em colunas"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:476
msgid "object"
msgstr "objeto"
-#: builtin/branch.c:670
+#: builtin/branch.c:692
msgid "print only branches of the object"
-msgstr "imprimir apenas os ramos do objeto"
+msgstr "mostrar apenas ramos de objeto"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
msgid "sorting and filtering are case insensitive"
msgstr "ordenar e filtrar são insensíveis a maiúsculas"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:694 builtin/ls-files.c:667
+msgid "recurse through submodules"
+msgstr "percorrer recursivamente pelos submódulos"
+
+#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
+#: builtin/tag.c:481 builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "formato a usar na saída"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:718 builtin/clone.c:684
msgid "HEAD not found below refs/heads!"
-msgstr "HEAD por encontrar em refs/heads!"
+msgstr "HEAD ficou por encontrar em refs/heads!"
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column e --verbose são incompatíveis"
+#: builtin/branch.c:739
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:741
+msgid "--recurse-submodules can only be used to create branches"
+msgstr ""
+
+#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
msgid "branch name required"
msgstr "nome do ramo é obrigatório"
-#: builtin/branch.c:766
+#: builtin/branch.c:802
msgid "Cannot give description to detached HEAD"
-msgstr "Impossível dar descrição a HEAD solta"
+msgstr "Incapaz de dar descrição a HEAD desanexada"
-#: builtin/branch.c:771
+#: builtin/branch.c:807
msgid "cannot edit description of more than one branch"
msgstr "incapaz editar descrição de mais do que um ramo"
-#: builtin/branch.c:778
+#: builtin/branch.c:814
#, c-format
msgid "No commit on branch '%s' yet."
-msgstr "Ramo '%s' ainda tem commit nenhum."
+msgstr "Ainda sem memórias em ramo '%s'."
-#: builtin/branch.c:781
+#: builtin/branch.c:817
#, c-format
msgid "No branch named '%s'."
msgstr "Ramo nenhum denominado '%s'."
-#: builtin/branch.c:796
-#, fuzzy
+#: builtin/branch.c:832
msgid "too many branches for a copy operation"
-msgstr "demasiados ramos para uma operação de mudança de nome"
+msgstr "demasiados ramos para uma operação de cópia"
-#: builtin/branch.c:805
-#, fuzzy
+#: builtin/branch.c:841
msgid "too many arguments for a rename operation"
-msgstr "demasiados ramos para uma operação de mudança de nome"
+msgstr "demasiados argumentos para uma operação de renomeação"
-#: builtin/branch.c:810
-#, fuzzy
+#: builtin/branch.c:846
msgid "too many arguments to set new upstream"
-msgstr "demasiados ramos para definir novo ramo a montante"
+msgstr "demasiados argumentos para definir novo upstream"
-#: builtin/branch.c:814
+#: builtin/branch.c:850
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11882,76 +12182,73 @@
"apenas pode definir upstream de HEAD para %s quando aponta para qualquer "
"ramo."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:853 builtin/branch.c:873
#, c-format
msgid "no such branch '%s'"
-msgstr "esse ramo '%s' é inexistente"
+msgstr "ramo '%s' inexistente"
-#: builtin/branch.c:821
+#: builtin/branch.c:857
#, c-format
msgid "branch '%s' does not exist"
msgstr "ramo '%s' é inexistente"
-#: builtin/branch.c:834
-#, fuzzy
+#: builtin/branch.c:867
msgid "too many arguments to unset upstream"
-msgstr "demasiados ramos para remover a definição de ramo a montante"
+msgstr "demasiados argumentos para indefinir upstream"
-#: builtin/branch.c:838
+#: builtin/branch.c:871
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-"apenas posso desdefinir upstream de HEAD quando aponta para qualquer ramo."
+"apenas posso indefinir upstream de HEAD quando aponta para qualquer ramo."
-#: builtin/branch.c:844
+#: builtin/branch.c:877
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Ramo '%s' tem informação de upstream nenhuma"
-#: builtin/branch.c:854
-#, fuzzy
+#: builtin/branch.c:890
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
"As opções -a, e -r, em 'git branch' levam nome de branch nenhum.\n"
-"Quiseste utilizar: -a|-r --list <pattern>? "
+"Quiseste utilizar: -a|-r --list <padrão>? "
-#: builtin/branch.c:858
-#, fuzzy
+#: builtin/branch.c:894
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
-"A opção --set-upstream está obsoleta. Por favor, usa '--track' ou '--set-"
-"upstream-to' invés."
+"opção --set-upstream está obsoleta. Por favor, usa '--track' ou '--set-"
+"upstream-to invés."
-#: builtin/bugreport.c:15
-#, fuzzy
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "versão git:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
-msgstr ""
+msgstr "uname() falhou com erro '%s' (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
-msgstr ""
+msgstr "info de compilador: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
-msgstr ""
+msgstr "info de libc: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
-msgstr ""
+msgstr "executado fora de repositório git - com ganchos nenhuns para mostrar\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr ""
+"git bugreport [-o|--output-directory <ficheiro>] [-s|--suffix <formato>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11970,194 +12267,292 @@
"You can delete any lines you don't wish to share.\n"
msgstr ""
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
-msgstr ""
+msgstr "especifica um destino para o ficheiro de reporte de bug"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
-msgstr ""
+msgstr "especifica um sufixo strftime para o ficheiro"
-#: builtin/bugreport.c:160
-#, fuzzy, c-format
+#: builtin/bugreport.c:132
+#, c-format
msgid "could not create leading directories for '%s'"
msgstr "incapaz criar pastas superiores para '%s'"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
-msgstr ""
+msgstr "Info de sistema"
-#: builtin/bugreport.c:170
-#, fuzzy
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
-msgstr "Hooks Ativados"
+msgstr "Ganchos Ativados"
-#: builtin/bugreport.c:177
-#, fuzzy, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "incapaz criar novo ficheiro em '%s'"
-
-#: builtin/bugreport.c:180
-#, fuzzy, c-format
+#: builtin/bugreport.c:149
+#, c-format
msgid "unable to write to %s"
msgstr "incapaz escrever para %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
-msgstr ""
+msgstr "Criado novo reporte em '%s'.\n"
#: builtin/bundle.c:15 builtin/bundle.c:23
-#, fuzzy
msgid "git bundle create [<options>] <file> <git-rev-list args>"
-msgstr "git remote add [<opções>] <nome> <url>"
+msgstr "git bundle create [<opções>] <ficheiro> <args lista-git-rev>"
#: builtin/bundle.c:16 builtin/bundle.c:28
-#, fuzzy
msgid "git bundle verify [<options>] <file>"
-msgstr "git rm [<opções>] [--] <ficheiro>..."
+msgstr "git bundle verify [<opções>] <ficheiro>"
#: builtin/bundle.c:17 builtin/bundle.c:33
msgid "git bundle list-heads <file> [<refname>...]"
-msgstr ""
+msgstr "git bundle list-heads <ficheiro> [<nome-ref>...]"
#: builtin/bundle.c:18 builtin/bundle.c:38
msgid "git bundle unbundle <file> [<refname>...]"
-msgstr ""
+msgstr "git bundle unbundle <ficheiro> [<nome-ref>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3899
msgid "do not show progress meter"
msgstr "mostrar medidor de progresso nenhum"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
msgid "show progress meter"
msgstr "mostrar medidor de progresso"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3903
msgid "show progress meter during object writing phase"
-msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
+msgstr "mostrar medidor de progresso durante fase de escrita de objetos"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3906
msgid "similar to --all-progress when progress meter is shown"
msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
-msgstr ""
+msgstr "especifica formato de versão de arquivo-pacote"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
-msgstr "É necessário um repositório para criar um bundle."
+msgstr "É necessário um repositório para criar um arquivo-pacote."
-#: builtin/bundle.c:109
-#, fuzzy
+#: builtin/bundle.c:108
msgid "do not show bundle details"
-msgstr "mostrar nenhuns detalhes de conjunto"
+msgstr "mostrar nenhuns detalhes de arquivo-pacote"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:127
#, c-format
msgid "%s is okay\n"
msgstr "%s está ok\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:183
msgid "Need a repository to unbundle."
-msgstr "É preciso um repositório para desempacotar."
+msgstr "É preciso um repositório para desarquivar."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "ser verboso; deve ser colocado antes de um subcomando"
+#: builtin/bundle.c:186
+msgid "Unbundling objects"
+msgstr "Desarquivando objetos"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:220 builtin/remote.c:1758
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subcomando desconhecido: %s"
-#: builtin/cat-file.c:596
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+#: builtin/cat-file.c:568
+msgid "flush is only for --buffer mode"
msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>"
-#: builtin/cat-file.c:597
-#, fuzzy
-msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+#: builtin/cat-file.c:612
+msgid "empty command in input"
+msgstr "comando vazio na entrada"
-#: builtin/cat-file.c:618
-#, fuzzy
-msgid "only one batch option may be specified"
-msgstr "Nenhum nome de ramo especificado"
+#: builtin/cat-file.c:614
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "espaço-em-branco antes de comando: '%s'"
+
+#: builtin/cat-file.c:623
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s exige argumentos"
+
+#: builtin/cat-file.c:628
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s leva argumentos nenhuns"
#: builtin/cat-file.c:636
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<tipo> pode ser um de: blob, tree, commit, tag"
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "comando desconhecido: '%s'"
-#: builtin/cat-file.c:637
-msgid "show object type"
-msgstr "mostrar tipo do objeto"
+#: builtin/cat-file.c:795
+msgid "only one batch option may be specified"
+msgstr "apenas uma opção batch pode ser especificada"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:824
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <type> <objeto>"
+
+#: builtin/cat-file.c:825
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git cat-file (-e | -p) <objeto>"
+
+#: builtin/cat-file.c:826
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr ""
+
+#: builtin/cat-file.c:827
+msgid ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+
+#: builtin/cat-file.c:830
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
+
+#: builtin/cat-file.c:836
+msgid "Check object existence or emit object contents"
+msgstr "Verifica existência de objeto ou emite conteúdo de objeto"
+
+#: builtin/cat-file.c:838
+msgid "check if <object> exists"
+msgstr "verificando se <objeto> existe"
+
+#: builtin/cat-file.c:839
+msgid "pretty-print <object> content"
+msgstr "mostrar bonitinho o conteúdo de <objeto>"
+
+#: builtin/cat-file.c:841
+msgid "Emit [broken] object attributes"
+msgstr ""
+
+#: builtin/cat-file.c:842
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr ""
+"mostrar tipo de objeto (um de 'blob', 'árvore', 'memória', 'etiqueta', ...)"
+
+#: builtin/cat-file.c:843
msgid "show object size"
msgstr "mostrar tamanho do objeto"
-#: builtin/cat-file.c:640
-msgid "exit with zero when there's no error"
-msgstr "sair com retorno zero quando há erro nenhum"
-
-#: builtin/cat-file.c:641
-msgid "pretty-print object's content"
-msgstr "mostrar conteúdo do objeto com impressão bonita"
-
-#: builtin/cat-file.c:643
-msgid "for blob objects, run textconv on object's content"
-msgstr "executar textconv no conteúdo de objetos blob"
-
-#: builtin/cat-file.c:645
-msgid "for blob objects, run filters on object's content"
-msgstr "para objetos blob, correr filtros sobre o conteúdo do objeto"
-
-#: builtin/cat-file.c:646
-msgid "blob"
-msgstr "blob"
-
-#: builtin/cat-file.c:647
-msgid "use a specific path for --textconv/--filters"
-msgstr "usar um caminho específico para --textconv/--filters"
-
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:845
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permitir que -s e -t funcionem com objetos danificados/corrompidos"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:847
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr ""
+
+#: builtin/cat-file.c:849
+msgid "show full <object> or <rev> contents"
+msgstr ""
+
+#: builtin/cat-file.c:853
+msgid "like --batch, but don't emit <contents>"
+msgstr ""
+
+#: builtin/cat-file.c:857
+msgid "read commands from stdin"
+msgstr "ler comandos de entrada padrão"
+
+#: builtin/cat-file.c:861
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr ""
+
+#: builtin/cat-file.c:863
+msgid "Change or optimize batch output"
+msgstr ""
+
+#: builtin/cat-file.c:864
msgid "buffer --batch output"
msgstr "carregar a saída de --batch"
-#: builtin/cat-file.c:652
-msgid "show info and content of objects fed from the standard input"
-msgstr "mostrar informação e conteúdo dos objetos fornecidos na entrada padrão"
+#: builtin/cat-file.c:866
+msgid "follow in-tree symlinks"
+msgstr "seguir ligação simbólica de dentro da árvore"
-#: builtin/cat-file.c:656
-msgid "show info about objects fed from the standard input"
-msgstr "mostrar informação sobre os objetos fornecidos na entrada padrão"
+#: builtin/cat-file.c:868
+msgid "do not order objects before emitting them"
+msgstr "proibido ordenar objetos antes de emiti-los"
-#: builtin/cat-file.c:660
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: builtin/cat-file.c:870
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
msgstr ""
-"seguir ligações simbólica no interior da árvore (usado com --batch ou --"
-"batch-check)"
-#: builtin/cat-file.c:662
-msgid "show all objects with --batch or --batch-check"
-msgstr "mostrar todos os objetos com --batch ou --batch-check"
+#: builtin/cat-file.c:872
+msgid "run textconv on object's content"
+msgstr "executar textconv sobre o conteúdo de objeto"
-#: builtin/cat-file.c:664
-msgid "do not order --batch-all-objects output"
+#: builtin/cat-file.c:874
+msgid "run filters on object's content"
+msgstr "executar filtros sobre o conteúdo de objeto"
+
+#: builtin/cat-file.c:875
+msgid "blob|tree"
+msgstr "blob|árvore"
+
+#: builtin/cat-file.c:876
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
+msgstr "usar um <caminho> para (--textconv | --filters); sem 'batch'"
+
+#: builtin/cat-file.c:894
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr ""
+
+#: builtin/cat-file.c:896
+msgid "path|tree-ish"
+msgstr "caminho|arvoredo"
+
+#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "'%s' exige um modo em lote"
+
+#: builtin/cat-file.c:921
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "'-%c' é incompatível com modo em lote"
+
+#: builtin/cat-file.c:924
+msgid "batch modes take no arguments"
+msgstr "modos lote levam nenhuns argumentos"
+
+#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr ""
+
+#: builtin/cat-file.c:938
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr ""
+
+#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429
+#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596
+#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965
+#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
+#: builtin/tag.c:592
+msgid "too many arguments"
+msgstr ""
+
+#: builtin/cat-file.c:947
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
msgstr ""
#: builtin/check-attr.c:13
@@ -12170,22 +12565,22 @@
#: builtin/check-attr.c:21
msgid "report all attributes set on file"
-msgstr "apresentar todos os atributos definidos no ficheiro"
+msgstr "reportar todos os atributos definidos no ficheiro"
#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
-msgstr "usar .gitattributes apenas a partir de cenário"
+msgstr "usar apenas .gitattributes de cenário"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
msgid "read file names from stdin"
-msgstr "ler os nomes dos ficheiros da entrada padrão"
+msgstr "ler nomes de ficheiros da entrada padrão"
#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr "terminar registos da entrada e da saída com um carácter NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
+#: builtin/worktree.c:565
msgid "suppress progress reporting"
msgstr "suprimir informação de progresso"
@@ -12195,11 +12590,11 @@
#: builtin/check-ignore.c:31
msgid "ignore index when checking"
-msgstr "ignorar o índice ao verificar"
+msgstr "ignorar cenário ao verificar"
#: builtin/check-ignore.c:165
msgid "cannot specify pathnames with --stdin"
-msgstr "incapaz especificar pathnames com --stdin"
+msgstr "incapaz especificar nomes de caminho com --stdin"
#: builtin/check-ignore.c:168
msgid "-z only makes sense with --stdin"
@@ -12207,7 +12602,7 @@
#: builtin/check-ignore.c:170
msgid "no path specified"
-msgstr "path nenhum especificado"
+msgstr "caminho nenhum especificado"
#: builtin/check-ignore.c:174
msgid "--quiet is only valid with a single pathname"
@@ -12239,224 +12634,218 @@
msgstr "contato nenhum especificado"
#: builtin/checkout--worker.c:110
-#, fuzzy
msgid "git checkout--worker [<options>]"
msgstr "git checkout--worker [<opções>]"
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
+#: builtin/worktree.c:808
msgid "string"
-msgstr "cadeia"
+msgstr "string"
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
msgid "when creating files, prepend <string>"
-msgstr "preceder <cadeia> ao criar ficheiros"
+msgstr "ao criar ficheiros, preceder com <string>"
-#: builtin/checkout-index.c:152
+#: builtin/checkout-index.c:184
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<opções>] [--] [<ficheiro>...]"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:201
msgid "stage should be between 1 and 3 or all"
-msgstr "stage deve ser um número entre 1 e 3 ou o parâmetro all"
+msgstr "cenário tem de ser entre 1 e 3 ou all"
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:219
msgid "check out all files in the index"
-msgstr "extrair todos os ficheiros presentes no índice"
+msgstr "observar todos os ficheiros de cenário"
-#: builtin/checkout-index.c:188
-msgid "force overwrite of existing files"
-msgstr "forçar substituição dos ficheiros existentes"
-
-#: builtin/checkout-index.c:190
-msgid "no warning for existing files and files not in index"
+#: builtin/checkout-index.c:221
+msgid "do not skip files with skip-worktree set"
msgstr ""
-"mostrar aviso nenhum para ficheiros existentes e ficheiros fora do index"
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:222
+msgid "force overwrite of existing files"
+msgstr "forçar o sobrescrever de ficheiros existentes"
+
+#: builtin/checkout-index.c:224
+msgid "no warning for existing files and files not in index"
+msgstr "aviso nenhum para ficheiros existentes e ficheiros fora de cenário"
+
+#: builtin/checkout-index.c:226
msgid "don't checkout new files"
-msgstr "extrair ficheiros novos nenhuns"
+msgstr "observar ficheiros novos nenhuns"
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:228
msgid "update stat information in the index file"
-msgstr "atualizar informação de stat de ficheiro de cenário"
+msgstr "atualizar informação de stat no ficheiro de cenário"
-#: builtin/checkout-index.c:198
+#: builtin/checkout-index.c:232
msgid "read list of paths from the standard input"
msgstr "ler lista de caminhos da entrada padrão"
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:234
msgid "write the content to temporary files"
msgstr "escrever o conteúdo em ficheiros temporários"
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:238
msgid "copy out the files from named stage"
-msgstr "copiar os ficheiros do estágio indicado"
+msgstr "copiar os ficheiros do cenário indicado"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:34
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<opções>] <ramo>"
-#: builtin/checkout.c:34
+#: builtin/checkout.c:35
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opções>] [<ramo>] -- <ficheiro>..."
-#: builtin/checkout.c:39
-#, fuzzy
+#: builtin/checkout.c:40
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<opções>] [<ramo>]"
-#: builtin/checkout.c:44
-#, fuzzy
+#: builtin/checkout.c:45
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<opções>] [--source=<ramo>] <ficheiro>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:199 builtin/checkout.c:238
#, c-format
msgid "path '%s' does not have our version"
-msgstr "path '%s' é diferente da nossa versão"
+msgstr "caminho '%s' é diferente da nossa versão"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:201 builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have their version"
-msgstr "path '%s' é diferente da versão deles"
+msgstr "caminho '%s' é diferente da versão deles"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:217
#, c-format
msgid "path '%s' does not have all necessary versions"
-msgstr "path '%s' falta todas as versões necessárias"
+msgstr "caminho '%s' falta todas as versões necessárias"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:271
#, c-format
msgid "path '%s' does not have necessary versions"
-msgstr "path '%s' falta as versões necessárias"
+msgstr "caminho '%s' falta as versões necessárias"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:291
#, c-format
msgid "path '%s': cannot merge"
-msgstr "path '%s': incapaz juntar"
+msgstr "caminho '%s': incapaz juntar"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:307
#, c-format
msgid "Unable to add merge result for '%s'"
-msgstr "Impossível adicionar o resultado da junção para '%s'"
+msgstr "Incapaz adicionar o resultado da junção para '%s'"
-#: builtin/checkout.c:411
+#: builtin/checkout.c:424
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Recriar %d conflito de junção"
+msgstr[1] "Recriar %d conflitos de junção"
-#: builtin/checkout.c:416
-#, fuzzy, c-format
+#: builtin/checkout.c:429
+#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
-msgstr[0] "%d caminho atualizado"
-msgstr[1] "%d caminhos atualizados"
+msgstr[0] "Atualizado %d caminho de %s"
+msgstr[1] "Atualizados %d caminhos de %s"
-#: builtin/checkout.c:423
+#: builtin/checkout.c:436
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:469
#, c-format
msgid "'%s' cannot be used with updating paths"
-msgstr "'%s' incapaz ser usado com paths em atualização"
+msgstr "'%s' incapaz ser usado com caminhos em atualização"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' incapaz ser usado com %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:479
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
-msgstr "Incapaz atualizar paths e mudar para ramo '%s' ao mesmo tempo."
+msgstr "Incapaz atualizar caminhos e, ao mesmo tempo, mudar para ramo '%s'."
-#: builtin/checkout.c:470
+#: builtin/checkout.c:483
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr ""
-#: builtin/checkout.c:474
-#, fuzzy, c-format
+#: builtin/checkout.c:487
+#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "'%s' tem de ser usado quando '%s' está por ser especificado"
-#: builtin/checkout.c:479 builtin/checkout.c:484
-#, fuzzy, c-format
+#: builtin/checkout.c:492 builtin/checkout.c:497
+#, c-format
msgid "'%s' or '%s' cannot be used with %s"
-msgstr "'%s' ou '%s' impossível ser usado com %s"
+msgstr "'%s' ou '%s' incapaz ser usado com %s"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:571 builtin/checkout.c:578
#, c-format
msgid "path '%s' is unmerged"
-msgstr "path '%s' está por juntar"
+msgstr "caminho '%s' está por juntar"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:753
msgid "you need to resolve your current index first"
-msgstr "primeiro deve resolver o índice atual"
+msgstr "primeiro precisas resolver teu cenário atual"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:809
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:881
+#: builtin/checkout.c:902
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Incapaz fazer reflog para '%s': %s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:947
msgid "HEAD is now at"
msgstr "HEAD está agora em"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "incapaz atualizar HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:955
#, c-format
msgid "Reset branch '%s'\n"
-msgstr "Repor ramo '%s'\n"
+msgstr "Restabelecer ramo '%s'\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:958
#, c-format
msgid "Already on '%s'\n"
msgstr "Já em '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:962
#, c-format
msgid "Switched to and reset branch '%s'\n"
-msgstr "Mudou para e repôs o ramo '%s'\n"
+msgstr "Trocou para e restabeleceu o ramo '%s'\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:964 builtin/checkout.c:1398
#, c-format
msgid "Switched to a new branch '%s'\n"
-msgstr "Mudou para o novo ramo '%s'\n"
+msgstr "Trocou para um novo ramo '%s'\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:966
#, c-format
msgid "Switched to branch '%s'\n"
-msgstr "Mudou para o ramo '%s'\n"
+msgstr "Trocou para o ramo '%s'\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:1017
#, c-format
msgid " ... and %d more.\n"
msgstr " ... e mais %d.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12469,17 +12858,17 @@
"\n"
"%s\n"
msgstr[0] ""
-"Aviso: estás deixando %d commit para trás, desconetado a qualquer dos teus "
-"ramos:\n"
+"Aviso: estás deixando %d memória para trás, desconectada de qualquer dos "
+"teus ramos:\n"
"\n"
"%s\n"
msgstr[1] ""
-"Aviso: estás deixando %d commits para trás, desconetado a qualquer dos teus "
-"ramos:\n"
+"Aviso: estás deixando %d memórias para trás, desconectadas de qualquer dos "
+"teus ramos:\n"
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1042
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12494,38 +12883,38 @@
" git branch <new-branch-name> %s\n"
"\n"
msgstr[0] ""
-"Se deseja mantê-lo, criando um novo ramo, agora seria uma boa altura\n"
+"Se desejas mantê-lo, criando um novo ramo, agora é uma boa altura\n"
"para fazê-lo com:\n"
"\n"
" git branch <nome-do-novo-ramo> %s\n"
"\n"
msgstr[1] ""
-"Se deseja mantê-los, criando um novo ramo, agora seria uma boa altura\n"
+"Se desejas mantê-los, criando um novo ramo, agora é uma boa altura\n"
"para fazê-lo com:\n"
"\n"
" git branch <nome-do-novo-ramo> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1077
msgid "internal error in revision walk"
msgstr "erro interno durante o curso de revisões"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1081
msgid "Previous HEAD position was"
msgstr "A posição anterior de HEAD era"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1124 builtin/checkout.c:1393
msgid "You are on a branch yet to be born"
-msgstr "Está num ramo ainda por nascer"
+msgstr "Estás num ramo ainda por nascer"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1206
#, 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:1186
+#: builtin/checkout.c:1213
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"
@@ -12537,297 +12926,274 @@
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/checkout.c:1196
-#, fuzzy, c-format
+#: builtin/checkout.c:1223
+#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
-msgstr "atuar sobre ramos de monitorização remotos"
+msgstr "'%s' correspondeu a múltiplos (%d) ramos remotos de monitorização"
-#: builtin/checkout.c:1262
-#, fuzzy
+#: builtin/checkout.c:1289
msgid "only one reference expected"
-msgstr "esperava-se apenas uma referência, %d fornecidas."
+msgstr "apenas uma referência esperada"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1306
#, c-format
msgid "only one reference expected, %d given."
-msgstr "esperava-se apenas uma referência, %d fornecidas."
+msgstr "esperava apenas uma referência, %d fornecidas."
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
#, c-format
msgid "invalid reference: %s"
msgstr "referência inválida: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1365 builtin/checkout.c:1744
#, c-format
msgid "reference is not a tree: %s"
msgstr "referência é árvore nenhuma: %s"
-#: builtin/checkout.c:1385
-#, fuzzy, c-format
+#: builtin/checkout.c:1413
+#, c-format
msgid "a branch is expected, got tag '%s'"
-msgstr "esperado um ramo, recebi tag '%s'"
+msgstr "esperado um ramo, recebi etiqueta '%s'"
-#: builtin/checkout.c:1387
-#, fuzzy, c-format
+#: builtin/checkout.c:1415
+#, c-format
msgid "a branch is expected, got remote branch '%s'"
-msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s."
+msgstr "esperado um ramo, recebi ramo remoto '%s'"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
-#, fuzzy, c-format
+#: builtin/checkout.c:1417 builtin/checkout.c:1426
+#, c-format
msgid "a branch is expected, got '%s'"
-msgstr "O ramo %s está a ser bissetado em %s"
+msgstr "esperado um ramo, recebi '%s'"
-#: builtin/checkout.c:1391
-#, fuzzy, c-format
+#: builtin/checkout.c:1420
+#, c-format
msgid "a branch is expected, got commit '%s'"
-msgstr "é suposto um branch, recebi um commit '%s'"
+msgstr "esperado um ramo, recebi memória '%s'"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1429
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr ""
+
+#: builtin/checkout.c:1442
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1450
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1458
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1427
-#, fuzzy
+#: builtin/checkout.c:1462
msgid "you are switching branch while bisecting"
-msgstr "Está a bissetar neste momento."
+msgstr "estás trocando de ramo enquanto bissetas"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1469
msgid "paths cannot be used with switching branches"
-msgstr "incapaz mudar ramo com o uso de paths"
+msgstr "incapaz usar caminhos com a troca de ramos"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
#, c-format
msgid "'%s' cannot be used with switching branches"
-msgstr "incapaz de mudar ramo com o uso de '%s'"
+msgstr "incapaz usar '%s' com a troca de ramos"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
+#: builtin/checkout.c:1495 builtin/checkout.c:1500
#, c-format
msgid "'%s' cannot be used with '%s'"
-msgstr "'%s' é incapaz de ser usado com '%s'"
+msgstr "incapaz usar '%s' com '%s'"
-#: builtin/checkout.c:1462
-#, fuzzy, c-format
+#: builtin/checkout.c:1497
+#, c-format
msgid "'%s' cannot take <start-point>"
-msgstr "'%s' incapaz receber <start-point>"
+msgstr "'%s' incapaz de receber <ponto-inicial>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1505
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "Incapaz mudar ramo para '%s', pois está fora de ser um commit"
+msgstr "Apenas posso trocar ramo para uma memória, não para '%s'"
-#: builtin/checkout.c:1477
-#, fuzzy
+#: builtin/checkout.c:1512
msgid "missing branch or commit argument"
-msgstr "Falta um nome dum ramo; tente -b"
+msgstr "faltando argumento de ramo ou memória"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1555
msgid "perform a 3-way merge with the new branch"
-msgstr "realizar uma integração com 3 pontos com o novo ramo"
+msgstr "realizar uma tri-junção com o novo ramo"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1522
-msgid "conflict style (merge or diff3)"
-msgstr "estilo de conflito (merge ou diff3)"
+#: builtin/checkout.c:1557
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "estilo de conflito (merge, diff3 ou zdiff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1569 builtin/worktree.c:560
msgid "detach HEAD at named commit"
-msgstr "destacar HEAD no commit indicado"
+msgstr "desanexar HEAD na memória indicada"
-#: builtin/checkout.c:1535
-msgid "set upstream info for new branch"
-msgstr "definir a informação do ramo a montante do novo ramo"
-
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1574
msgid "force checkout (throw away local modifications)"
-msgstr "forçar extração (descartar modificações locais)"
+msgstr "forçar observação (descartar modificações locais)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new-branch"
msgstr "novo-ramo"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new unparented branch"
-msgstr "novo ramo sem pai"
+msgstr "novo ramo sem parente"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1578 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "atualizar ficheiros ignorados (predefinição)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1581
msgid "do not check if another worktree is holding the given ref"
-msgstr "incapaz verificar se outra worktree contém referência dada"
+msgstr "deixar por verificar se outra árvore-trabalho contém a ref dada"
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1594
msgid "checkout our version for unmerged files"
-msgstr "checkout a nossa versão dos ficheiros por juntar"
+msgstr "observa a nossa versão dos ficheiros por juntar"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1597
msgid "checkout their version for unmerged files"
-msgstr "checkout a versão deles dos ficheiros por juntar"
+msgstr "observa a versão deles dos ficheiros por juntar"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1601
msgid "do not limit pathspecs to sparse entries only"
-msgstr "abrange especificadores de path além de entradas dispersas"
+msgstr "abranger espetro-caminhos além de entradas dispersas"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1659
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr ""
-
-#: builtin/checkout.c:1626
-msgid "-p and --overlay are mutually exclusive"
-msgstr ""
-
-#: builtin/checkout.c:1663
-msgid "--track needs a branch name"
-msgstr "--track requer um nome dum ramo"
-
-#: builtin/checkout.c:1668
-#, fuzzy, c-format
-msgid "missing branch name; try -%c"
-msgstr "Falta um nome dum ramo; tente -b"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "opções '-%c', '-%c' e '%s' incapaz serem usadas juntas"
#: builtin/checkout.c:1700
-#, fuzzy, c-format
+msgid "--track needs a branch name"
+msgstr "--track precisa de um nome de ramo"
+
+#: builtin/checkout.c:1705
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "faltando nome de ramo; tenta -%c"
+
+#: builtin/checkout.c:1737
+#, c-format
msgid "could not resolve %s"
msgstr "incapaz resolver %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1753
msgid "invalid path specification"
msgstr "especificação de caminho inválida"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1760
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1764
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr "git checkout: --detach recusa path '%s' como argumento"
+msgstr "git checkout: --detach recusa caminho '%s' como argumento"
-#: builtin/checkout.c:1736
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr ""
-
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr ""
-
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1789
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout: --ours/--theirs, --force e --merge são incompatíveis\n"
-"durante a extração do índice."
+"durante a observação do cenário."
-#: builtin/checkout.c:1757
-#, fuzzy
+#: builtin/checkout.c:1794
msgid "you must specify path(s) to restore"
-msgstr "Deve especificar um diretório."
+msgstr "tens de especificar caminho(s) a restaurar"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
+#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
+#: builtin/remote.c:173 builtin/submodule--helper.c:3038
+#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
+#: builtin/worktree.c:558
msgid "branch"
msgstr "ramo"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1820
msgid "create and checkout a new branch"
-msgstr "criar e extrair um novo ramo"
+msgstr "criar e observar um novo ramo"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1822
msgid "create/reset and checkout a branch"
-msgstr "criar/repor e extrair um ramo"
+msgstr "criar/restabelecer e observar um ramo"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1823
msgid "create reflog for new branch"
-msgstr "criar reflog do novo ramo"
+msgstr "criar registo-ref para novo ramo"
-#: builtin/checkout.c:1789
-#, fuzzy
+#: builtin/checkout.c:1825
msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
+msgstr "tentando adivinhar 'git checkout <ramo-inexistente>' (predefinido)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1826
msgid "use overlay mode (default)"
-msgstr ""
+msgstr "usar modo overlay (predefinido)"
-#: builtin/checkout.c:1835
-#, fuzzy
+#: builtin/checkout.c:1874
msgid "create and switch to a new branch"
-msgstr "criar e extrair um novo ramo"
+msgstr "criar e trocar para um novo ramo"
-#: builtin/checkout.c:1837
-#, fuzzy
+#: builtin/checkout.c:1876
msgid "create/reset and switch to a branch"
-msgstr "criar/repor e extrair um ramo"
+msgstr "criar/restabelecer e trocar para um ramo"
-#: builtin/checkout.c:1839
-#, fuzzy
+#: builtin/checkout.c:1878
msgid "second guess 'git switch <no-such-branch>'"
-msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
+msgstr "tentando adivinhar 'git switch <ramo-inexistente>'"
-#: builtin/checkout.c:1841
-#, fuzzy
+#: builtin/checkout.c:1880
msgid "throw away local modifications"
-msgstr "forçar extração (descartar modificações locais)"
+msgstr "descartar modificações locais"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1916
msgid "which tree-ish to checkout from"
msgstr ""
-#: builtin/checkout.c:1877
-#, fuzzy
+#: builtin/checkout.c:1918
msgid "restore the index"
msgstr "restaurar o cenário"
-#: builtin/checkout.c:1879
-#, fuzzy
+#: builtin/checkout.c:1920
msgid "restore the working tree (default)"
-msgstr "Mostrar o estado da árvores de trabalho"
+msgstr "restaurar a árvore-trabalho (predefinido)"
-#: builtin/checkout.c:1881
-#, fuzzy
+#: builtin/checkout.c:1922
msgid "ignore unmerged entries"
-msgstr "ignora unmerged entries"
+msgstr "ignora entradas por juntar"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1923
msgid "use overlay mode"
-msgstr ""
+msgstr "usar modo overlay"
#: builtin/clean.c:29
msgid ""
@@ -12838,7 +13204,7 @@
#: builtin/clean.c:33
#, c-format
msgid "Removing %s\n"
-msgstr "A remover %s\n"
+msgstr "Removendo %s\n"
#: builtin/clean.c:34
#, c-format
@@ -12848,19 +13214,27 @@
#: builtin/clean.c:35
#, c-format
msgid "Skipping repository %s\n"
-msgstr "A ignorar o repositório %s\n"
+msgstr "Saltando o repositório %s\n"
#: builtin/clean.c:36
#, c-format
msgid "Would skip repository %s\n"
-msgstr "Ignoraria o repositório %s\n"
+msgstr "Saltaria o repositório %s\n"
#: builtin/clean.c:38
-#, fuzzy, c-format
+#, c-format
msgid "could not lstat %s\n"
msgstr "incapaz lstat %s\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Recusando remover pasta-trabalho atual\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Recusaria remover pasta-trabalho atual\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12873,7 +13247,7 @@
"foo - selecionar item baseado no prefixo único\n"
" - (vazio) seleciona nada\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12894,33 +13268,33 @@
"* - escolher todos os itens\n"
" - (vazio) concluir seleção\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "O quê (%s)?\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
-msgstr "Introduza padrões a ignorar>> "
+msgstr "Introduz padrões a ignorar>> "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
-msgstr "AVISO: incapaz encontrar items correspondentes a: %s"
+msgstr "AVISO: Incapaz encontrar items correspondentes a: %s"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
-msgstr "Selecione itens para eliminar"
+msgstr "Seleciona itens para eliminar"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Remover %s [y/N]? "
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12936,54 +13310,54 @@
"ask each - confirmar cada eliminação (como \"rm -i\")\n"
"quit - parar limpeza\n"
"help - esta ajuda\n"
-"? - ajuda para seleção em linha de comandos"
+"? - ajuda para a seleção em linha de comandos"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Removeria o seguinte item:"
msgstr[1] "Removeria os seguintes itens:"
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
-msgstr "Mais ficheiro por limpar nenhum, saindo."
+msgstr "Mais nenhum ficheiro por limpar, saindo."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
-msgstr "incapaz imprimir nomes de ficheiros removidos"
+msgstr "deixar de mostrar nomes de ficheiros removidos"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "forçar"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "limpeza interativa"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
-msgstr "remover diretórios inteiros"
+msgstr "remover pastas inteiras"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
+#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "padrão"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "adicionar <padrão> às regras ignoradas"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "também remover ficheiros ignorados"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "remover apenas ficheiros ignorados"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12991,7 +13365,7 @@
"clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; "
"recusando limpar"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12999,378 +13373,371 @@
"clean.requireForce predefinido como true e nenhum -i, -n, ou -f fornecido; "
"recusando limpar"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
-msgstr "-x e -X incapazes de ser usados juntos"
+msgstr "-x e -X incapazes de serem usados juntos"
-#: builtin/clone.c:45
+#: builtin/clone.c:47
msgid "git clone [<options>] [--] <repo> [<dir>]"
-msgstr "git clone [<opções>] [--] <repo> [<dir>]"
+msgstr "git clone [<opções>] [--] <repo> [<pasta>]"
-#: builtin/clone.c:96
-#, fuzzy
+#: builtin/clone.c:100
msgid "don't clone shallow repository"
-msgstr "para clonar de um repositório local"
+msgstr "clonar nenhum repositório superficial"
-#: builtin/clone.c:98
+#: builtin/clone.c:102
msgid "don't create a checkout"
-msgstr "cria checkout nenhum"
+msgstr "deixar por criar a observação"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "criar um repositório nu"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "create a mirror repository (implies bare)"
-msgstr "criar um repositório espelhado (implica repositório nu)"
+msgstr "criar um repositório-espelho (implica repositório nu)"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "to clone from a local repository"
msgstr "para clonar de um repositório local"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "don't use local hardlinks, always copy"
msgstr "usa hardlinks nenhuns, copia sempre"
-#: builtin/clone.c:109
+#: builtin/clone.c:113
msgid "setup as shared repository"
msgstr "configurar como repositório partilhado"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "pathspec"
-msgstr "pathspec"
+msgstr "espetro-caminho"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "initialize submodules in the clone"
msgstr "inicializar submódulos no clone"
-#: builtin/clone.c:115
+#: builtin/clone.c:119
msgid "number of submodules cloned in parallel"
msgstr "número de submódulos clonados em paralelo"
-#: builtin/clone.c:116 builtin/init-db.c:539
+#: builtin/clone.c:120 builtin/init-db.c:539
msgid "template-directory"
-msgstr "diretório-modelo"
+msgstr "pasta-modelo"
-#: builtin/clone.c:117 builtin/init-db.c:540
+#: builtin/clone.c:121 builtin/init-db.c:540
msgid "directory from which templates will be used"
-msgstr "diretório que contém os modelos usados"
+msgstr "pasta que contém os modelos a usar"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
msgid "reference repository"
msgstr "repositório de referência"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:127 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2721
msgid "use --reference only while cloning"
-msgstr "usar --reference apenas para clonar"
+msgstr "usar --reference apenas enquanto clonando"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3967 builtin/repack.c:669
+#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nome"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "use <name> instead of 'origin' to track upstream"
-msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante"
+msgstr "usar <nome> em vez de 'origin' monitorizar upstream"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "observar <ramo> em vez de HEAD de remoto"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "path to git-upload-pack on the remote"
msgstr "caminho para git-upload-pack no remoto"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
+#: builtin/pull.c:212
msgid "depth"
msgstr "profundidade"
-#: builtin/clone.c:131
+#: builtin/clone.c:135
msgid "create a shallow clone of that depth"
-msgstr "criar um clone raso com essa profundidade"
+msgstr "criar um clone superficial com essa profundidade"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
+#: builtin/pull.c:215
msgid "time"
msgstr "hora"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "create a shallow clone since a specific time"
-msgstr "criar um clone raso desde uma data específica"
+msgstr "criar um clone superficial desde uma data específica"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
msgid "revision"
msgstr "revisão"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
-msgstr "aprofundar o histórico de um clone raso, excluindo a revisão"
+msgstr "aprofundar o histórico de clone superficial, excluindo a revisão"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:141 builtin/submodule--helper.c:1897
+#: builtin/submodule--helper.c:2735
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar apenas um ramo, HEAD ou --branch"
-#: builtin/clone.c:139
+#: builtin/clone.c:143
msgid "don't clone any tags, and make later fetches not to follow them"
-msgstr ""
+msgstr "clonar nenhuma etiqueta, e fazer buscas seguintes seguir nenhuma"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "any cloned submodules will be shallow"
-msgstr "qualquer submódulo clonado será raso"
+msgstr "qualquer submódulo clonado será superficial"
-#: builtin/clone.c:142 builtin/init-db.c:548
+#: builtin/clone.c:146 builtin/init-db.c:548
msgid "gitdir"
-msgstr "gitdir"
+msgstr "pasta-git"
-#: builtin/clone.c:143 builtin/init-db.c:549
+#: builtin/clone.c:147 builtin/init-db.c:549
msgid "separate git dir from working tree"
-msgstr "separar o repositório git da árvore de trabalho"
+msgstr "separar pasta git de árvore-trabalho"
-#: builtin/clone.c:144
+#: builtin/clone.c:148
msgid "key=value"
msgstr "chave=valor"
-#: builtin/clone.c:145
+#: builtin/clone.c:149
msgid "set config inside the new repository"
msgstr "definir configuração dentro do novo repositório"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "específico do servidor"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
-msgstr "opção para transmitir"
+msgstr "opção a transmitir"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "usar apenas endereços IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "usar apenas endereços IPv6"
-#: builtin/clone.c:154
-#, fuzzy
-msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "qualquer submódulo clonado será raso"
+#: builtin/clone.c:158
+msgid "apply partial clone filters to submodules"
+msgstr ""
-#: builtin/clone.c:156
+#: builtin/clone.c:160
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "qualquer submódulo clonado usará seu ramo remoto de monitorização"
+
+#: builtin/clone.c:162
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
+"iniciar ficheiro de observação-dispersa para incluir apenas ficheiros em raiz"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Incapaz adivinhar nome de pasta.\n"
-"Por favor especifique uma pasta na linha de comandos"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:237
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Incapaz adicionar sobressalente para '%s': %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:310
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe e é pasta nenhuma"
-#: builtin/clone.c:436
-#, fuzzy, c-format
+#: builtin/clone.c:328
+#, c-format
msgid "failed to start iterator over '%s'"
msgstr "falhou começar iterador em '%s'"
-#: builtin/clone.c:467
+#: builtin/clone.c:359
#, c-format
msgid "failed to create link '%s'"
-msgstr "falha ao criar a ligação '%s'"
+msgstr "falhou criar a ligação '%s'"
-#: builtin/clone.c:471
+#: builtin/clone.c:363
#, c-format
msgid "failed to copy file to '%s'"
-msgstr "falha ao copiar o ficheiro para '%s'"
+msgstr "falhou copiar o ficheiro para '%s'"
-#: builtin/clone.c:476
-#, fuzzy, c-format
+#: builtin/clone.c:368
+#, c-format
msgid "failed to iterate over '%s'"
-msgstr "falha ao remover '%s'"
+msgstr "falhou iterar sobre '%s'"
-#: builtin/clone.c:503
+#: builtin/clone.c:395
#, c-format
msgid "done.\n"
msgstr "concluído.\n"
-#: builtin/clone.c:517
-#, fuzzy
+#: builtin/clone.c:409
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 ""
-"Clonado com sucesso, mas a extração falhou.\n"
-"Pode inspecionar o que foi extraído com 'git status'\n"
-"e repetir a extração com 'git checkout -f HEAD'\n"
+"Clonagem com sucesso, mas a observação falhou.\n"
+"Podes inspecionar o que foi observado com 'git status'\n"
+"e repetir com 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:486
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Incapaz encontrar ramo remoto %s para clonar."
-#: builtin/clone.c:713
+#: builtin/clone.c:603
#, c-format
msgid "unable to update %s"
msgstr "incapaz atualizar %s"
-#: builtin/clone.c:761
-#, fuzzy
+#: builtin/clone.c:651
msgid "failed to initialize sparse-checkout"
-msgstr "falha ao finalizar integração de notas"
+msgstr "falhou iniciar observação-dispersa"
-#: builtin/clone.c:784
+#: builtin/clone.c:674
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr ""
-"remote HEAD refere-se a referência inexistente, impossível fazer checkout.\n"
+msgstr "HEAD remota refere-se a referência inexistente, incapaz de observar.\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:709
msgid "unable to checkout working tree"
-msgstr "incapaz de checkout working tree"
+msgstr "incapaz de observar árvore-trabalho"
-#: builtin/clone.c:894
+#: builtin/clone.c:793
msgid "unable to write parameters to config file"
msgstr "incapaz escrever parâmetros para ficheiro config"
-#: builtin/clone.c:957
+#: builtin/clone.c:856
msgid "cannot repack to clean up"
msgstr "incapaz reempacotar para limpar"
-#: builtin/clone.c:959
+#: builtin/clone.c:858
msgid "cannot unlink temporary alternates file"
msgstr "incapaz unlink ficheiro sobressalente temporário"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:901
msgid "Too many arguments."
-msgstr ""
+msgstr "Demasiados argumentos."
-#: builtin/clone.c:1005
+#: builtin/clone.c:905 contrib/scalar/scalar.c:413
msgid "You must specify a repository to clone."
-msgstr "Deve especificar um repositório para clonar."
+msgstr "Tens de especificar um repositório para clonar."
-#: builtin/clone.c:1018
+#: builtin/clone.c:918
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "as opções --bare e --origin %s são incompatíveis."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "opções '%s' e '%s %s' incapaz serem usadas juntas"
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare e --separate-git-dir são incompatíveis."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:935
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositório '%s' é inexistente"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:939 builtin/fetch.c:2176
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidade %s é número positivo nenhum"
-#: builtin/clone.c:1049
+#: builtin/clone.c:949
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
-msgstr "path de destino '%s' já existe e é pasta vazia nenhum."
+msgstr "caminho de destino '%s' já existe e é pasta vazia nenhuma."
-#: builtin/clone.c:1055
-#, fuzzy, c-format
+#: builtin/clone.c:955
+#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
-msgstr "path de repositório '%s' já existe e é diretório vazio nenhum."
+msgstr "caminho de repositório '%s' já existe e é pasta vazia nenhuma."
-#: builtin/clone.c:1069
+#: builtin/clone.c:969
#, c-format
msgid "working tree '%s' already exists."
-msgstr "a árvore de trabalho '%s' já existe."
+msgstr "árvore-trabalho '%s' já existe."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
+#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "incapaz criar as pastas superiores de '%s'"
-#: builtin/clone.c:1089
+#: builtin/clone.c:989
#, c-format
msgid "could not create work tree dir '%s'"
-msgstr "incapaz criar pasta de work tree '%s'"
+msgstr "incapaz criar pasta de árvore-trabalho '%s'"
-#: builtin/clone.c:1109
+#: builtin/clone.c:1009
#, c-format
msgid "Cloning into bare repository '%s'...\n"
-msgstr "Clonando em repositório nú '%s'...\n"
+msgstr "Clonando para repositório nu '%s'...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1011
#, c-format
msgid "Cloning into '%s'...\n"
-msgstr "Clonando em '%s'...\n"
+msgstr "Clonando para '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1040
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"clone --recursive é incompatível com ambos --reference e --reference-if-able"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' é nome de remoto inválido"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1157
msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth é ignorado em clones locais; use file:// ."
+msgstr "--depth é ignorado em clones locais; usa file:// invés."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1159
msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr "--shallow-since é ignorado em clones locais; use file:// ."
+msgstr "--shallow-since é ignorado em clones locais; usa file:// invés."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1161
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr "--shallow-exclude é ignorado em clones locais; use file:// ."
+msgstr "--shallow-exclude é ignorado em clones locais; usa file:// invés."
-#: builtin/clone.c:1235
-#, fuzzy
+#: builtin/clone.c:1163
msgid "--filter is ignored in local clones; use file:// instead."
-msgstr "--depth é ignorado em clones locais; use file:// ."
+msgstr "--filter é ignorado em clones locais; usa file:// invés."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1168
msgid "source repository is shallow, ignoring --local"
-msgstr "o repositório de origem é raso, --local ignorado"
+msgstr "repositório da fonte é superficial, ignorando --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1173
msgid "--local is ignored"
msgstr "--local ignorado"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1185
+msgid "cannot clone from filtered bundle"
+msgstr ""
+
+#: builtin/clone.c:1265 builtin/clone.c:1324
msgid "remote transport reported error"
msgstr "transporte remoto reportou erro"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1277 builtin/clone.c:1289
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Ramo remoto %s por encontrar em upstream %s"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1292
msgid "You appear to have cloned an empty repository."
-msgstr "Parece foi clonado um repositório vazio."
+msgstr "Pareces ter clonado um repositório vazio."
#: builtin/column.c:10
msgid "git column [<options>]"
@@ -13378,136 +13745,134 @@
#: builtin/column.c:27
msgid "lookup config vars"
-msgstr "pesquisar variáveis de configuração"
+msgstr "encontrar vars de config"
#: builtin/column.c:28 builtin/column.c:29
msgid "layout to use"
msgstr "esquema a usar"
#: builtin/column.c:30
-#, fuzzy
msgid "maximum width"
-msgstr "Largura máxima"
+msgstr "largura máxima"
#: builtin/column.c:31
-#, fuzzy
msgid "padding space on left border"
-msgstr "Espaço de preenchimento na borda esquerda"
+msgstr "espaço de preenchimento na borda esquerda"
#: builtin/column.c:32
-#, fuzzy
msgid "padding space on right border"
-msgstr "Espaço de preenchimento na borda direita"
+msgstr "espaço de preenchimento na borda direita"
#: builtin/column.c:33
-#, fuzzy
msgid "padding space between columns"
-msgstr "Espaço de preenchimento entre colunas"
+msgstr "espaço de preenchimento entre colunas"
#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr "--command deve ser o primeiro argumento"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
+"git commit-graph verify [--object-dir <pasta-de-obj>] [--shallow] [--"
+"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
msgstr ""
+"git commit-graph write [--object-dir <pasta-de-obj>] [--append] [--"
+"split[=<estratégia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opções de divisão>"
-#: builtin/commit-graph.c:64
-#, fuzzy, c-format
-msgid "could not find object directory matching %s"
-msgstr "incapaz encontrar pasta objeto correspondendo %s"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
msgid "dir"
-msgstr "dir"
+msgstr "pasta"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr ""
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
-#: builtin/commit-graph.c:106
-#, fuzzy, c-format
+#: builtin/commit-graph.c:100
+#, c-format
msgid "Could not open commit-graph '%s'"
-msgstr "Incapaz abrir commit-graph '%s'"
+msgstr "Incapaz abrir grafo-memória '%s'"
-#: builtin/commit-graph.c:142
-#, fuzzy, c-format
+#: builtin/commit-graph.c:137
+#, c-format
msgid "unrecognized --split argument, %s"
msgstr "argumento --split desconhecido, %s"
-#: builtin/commit-graph.c:155
-#, fuzzy, c-format
+#: builtin/commit-graph.c:150
+#, c-format
msgid "unexpected non-hex object ID: %s"
-msgstr "reutilizar o objeto de nota especificado"
+msgstr "ID não-hex de objeto inesperado: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr ""
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr ""
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr ""
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
-#: builtin/commit-graph.c:232
-#, fuzzy
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
-msgstr "expirar objetos mais antigos que <tempo>"
+msgstr "apenas expirar ficheiros fornecidos mais velhos que data"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr ""
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr ""
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "subcomando desconhecido: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13519,81 +13884,75 @@
msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
-#, fuzzy, c-format
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
+#, c-format
msgid "not a valid object name %s"
msgstr "nome de objeto inválido %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr ""
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr ""
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr ""
-#: builtin/commit-tree.c:111
-#, fuzzy
+#: builtin/commit-tree.c:109
msgid "parent"
-msgstr "número-pai"
+msgstr "parente"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr ""
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
+#: builtin/tag.c:455
msgid "message"
msgstr "mensagem"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
-msgstr "mensagem de commit"
+msgstr "mensagem de memória"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr ""
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
-msgstr "assinar o commit com GPG"
+msgstr "assinar memória com GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr ""
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr ""
-#: builtin/commit.c:41
+#: builtin/commit.c:43
msgid "git commit [<options>] [--] <pathspec>..."
-msgstr "git commit [<opções>] [--] <especificador-de-caminho>..."
+msgstr "git commit [<opções>] [--] <espetro-caminho>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:48
msgid "git status [<options>] [--] <pathspec>..."
-msgstr "git status [<opções>] [--] <especificador-de-caminho>..."
+msgstr "git status [<opções>] [--] <espetro-caminho>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:53
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-"Pediu para emendar o commit mais recente, mas ao fazê-lo torná-lo-ia\n"
-"vazio. Pode repetir o comando com --allow-empty, ou pode remover o\n"
-"commit completamente com \"git reset HEAD^\".\n"
+"Pediste para emendar a memória mais recente, mas ao fazê-lo torná-la-ia\n"
+"vazia. Podes repetir o teu comando com --allow-empty, ou podes remover a\n"
+"memória completamente com \"git reset HEAD^\".\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:58
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13601,24 +13960,21 @@
" git commit --allow-empty\n"
"\n"
msgstr ""
-"O cherry-pick anterior está vazio, possivelmente devido a resolução de "
-"conflito.\n"
-"Se ainda desejas commit, usa:\n"
+"A apanha anterior está vazia, possivelmente devido à resolução de conflito.\n"
+"Se, mesmo assim, desejas memorizá-la, usa:\n"
"\n"
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
-#, fuzzy
+#: builtin/commit.c:65
msgid "Otherwise, please use 'git rebase --skip'\n"
-msgstr "Caso contrário, use 'git reset'\n"
+msgstr "Caso contrário, por favor usa 'git rebase --skip'\n"
-#: builtin/commit.c:66
-#, fuzzy
+#: builtin/commit.c:68
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
-msgstr "Caso contrário, use 'git reset'\n"
+msgstr "Caso contrário, por favor usa 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:71
msgid ""
"and then use:\n"
"\n"
@@ -13631,161 +13987,152 @@
"\n"
msgstr ""
-#: builtin/commit.c:324
+#: builtin/commit.c:326
msgid "failed to unpack HEAD tree object"
-msgstr "falha ao descompactar o objeto árvore HEAD"
+msgstr "falhou desempacotar o objeto árvore HEAD"
-#: builtin/commit.c:360
-#, fuzzy
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspe de ficheiro com -a faz sentido nenhum."
-
-#: builtin/commit.c:374
+#: builtin/commit.c:376
msgid "No paths with --include/--only does not make sense."
-msgstr "--include/--only fazem sentido nenhum sem indicar paths."
+msgstr "--include/--only só fazem sentido, indicando caminhos."
-#: builtin/commit.c:386
+#: builtin/commit.c:388
msgid "unable to create temporary index"
-msgstr "incapaz criar index temporário"
+msgstr "incapaz criar cenário temporário"
-#: builtin/commit.c:395
+#: builtin/commit.c:397
msgid "interactive add failed"
msgstr "falha ao adicionar interativamente"
-#: builtin/commit.c:410
-msgid "unable to update temporary index"
-msgstr "incapaz atualizar index temporário"
-
#: builtin/commit.c:412
-msgid "Failed to update main cache tree"
-msgstr "Falha ao atualizar a árvore de cache principal"
+msgid "unable to update temporary index"
+msgstr "incapaz atualizar cenário temporário"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:414
+msgid "Failed to update main cache tree"
+msgstr "Falhou atualizar a árvore de cenário principal"
+
+#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
msgid "unable to write new_index file"
msgstr "incapaz escrever ficheiro new_index"
-#: builtin/commit.c:489
-msgid "cannot do a partial commit during a merge."
-msgstr "incapaz fazer commit parcial durante uma junção."
-
#: builtin/commit.c:491
-msgid "cannot do a partial commit during a cherry-pick."
-msgstr "incapaz fazer commit parcial durante um cherry-pick."
+msgid "cannot do a partial commit during a merge."
+msgstr "incapaz fazer memória parcial durante uma junção."
#: builtin/commit.c:493
-#, fuzzy
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "incapaz fazer memória parcial durante uma apanha."
+
+#: builtin/commit.c:495
msgid "cannot do a partial commit during a rebase."
-msgstr "incapaz fazer commit parcial durante um rebase."
+msgstr "incapaz fazer memória parcial durante um rebaseamento."
-#: builtin/commit.c:501
+#: builtin/commit.c:503
msgid "cannot read the index"
-msgstr "incapaz ler o index"
+msgstr "incapaz ler cenário"
-#: builtin/commit.c:520
+#: builtin/commit.c:522
msgid "unable to write temporary index file"
-msgstr "incapaz escrever ficheiro de index temporário"
-
-#: builtin/commit.c:618
-#, c-format
-msgid "commit '%s' lacks author header"
-msgstr "commit '%s' falta cabeçalho de autor"
+msgstr "incapaz escrever ficheiro de cenário temporário"
#: builtin/commit.c:620
#, c-format
-msgid "commit '%s' has malformed author line"
-msgstr "o commit '%s' tem a linha de autor malformada"
+msgid "commit '%s' lacks author header"
+msgstr "memória '%s' falta cabeçalho de autor"
-#: builtin/commit.c:639
+#: builtin/commit.c:622
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "memória '%s' tem a linha de autor malformada"
+
+#: builtin/commit.c:641
msgid "malformed --author parameter"
msgstr "parâmetro --author malformado"
-#: builtin/commit.c:692
+#: builtin/commit.c:694
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-"incapaz selecionar um carácter de comentário fica por usar\n"
-"na mensagem de commit atual"
+"apenas sou capaz de selecionar carácter de comentário usado\n"
+"na mensagem de memória atual"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
#, c-format
msgid "could not lookup commit %s"
-msgstr "incapaz consultar commit %s"
+msgstr "incapaz procurar memória %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:762 builtin/shortlog.c:417
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(a ler mensagem de log da entrada padrão)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:764
msgid "could not read log from standard input"
msgstr "incapaz ler log da entrada padrão"
-#: builtin/commit.c:764
+#: builtin/commit.c:768
#, c-format
msgid "could not read log file '%s'"
msgstr "incapaz ler ficheiro de log '%s'"
-#: builtin/commit.c:801
-#, fuzzy, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "incapaz de combinar '--root' com '--fork-point'"
+#: builtin/commit.c:805
+#, c-format
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "opções '%s' e '%s:%s' incapaz serem usadas juntas"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:817 builtin/commit.c:833
msgid "could not read SQUASH_MSG"
msgstr "incapaz ler SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
msgid "could not read MERGE_MSG"
msgstr "incapaz ler MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:884
msgid "could not write commit template"
-msgstr "incapaz escrever o modelo de commit"
+msgstr "incapaz escrever modelo de memória"
-#: builtin/commit.c:893
-#, fuzzy, c-format
+#: builtin/commit.c:897
+#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored.\n"
msgstr ""
-"Introduza a mensagem de commit das suas alterações.\n"
-"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
-"aborta o commit.\n"
+"Por favor, introduz a mensagem de memória das tuas alterações.\n"
+"Linhas começadas com '%c' serão ignoradas.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:899
#, 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 ""
-"Introduza a mensagem de commit das suas alterações.\n"
+"Por favor, introduz a mensagem de memória das tuas alterações.\n"
"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
-"aborta o commit.\n"
-
-#: builtin/commit.c:899
-#, fuzzy, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-msgstr ""
-"Introduzia a mensagem de commit das suas alterações.\n"
-"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n"
-"Uma mensagem vazia aborta o commit.\n"
+"aborta a memorização.\n"
#: builtin/commit.c:903
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Por favor, introduz a mensagem de memória das tuas alterações.\n"
+"Linhas começadas com '%c' serão mantidas; podes removê-las se quiseres.\n"
+
+#: builtin/commit.c:907
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
-"Introduzia a mensagem de commit das suas alterações.\n"
-"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n"
-"Uma mensagem vazia aborta o commit.\n"
+"Por favor, introduz a mensagem de memória das tuas alterações.\n"
+"Linhas começadas com '%c' serão mantidas; podes removê-las se quiseres.\n"
+"Uma mensagem vazia aborta a memorização.\n"
-#: builtin/commit.c:915
-#, fuzzy
+#: builtin/commit.c:919
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13794,13 +14141,12 @@
"and try again.\n"
msgstr ""
"\n"
-"Parece que estás a fazer commit a uma junção.\n"
-"Se isto é incorreto, remove o ficheiro\n"
+"Parece que estás a memorizar uma junção.\n"
+"Se isto é incorreto, por favor executa\n"
"\tgit update-ref -d MERGE_HEAD\n"
"e tenta de novo.\n"
-#: builtin/commit.c:920
-#, fuzzy
+#: builtin/commit.c:924
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13809,186 +14155,154 @@
"and try again.\n"
msgstr ""
"\n"
-"Parece que está a fazer commit a um cherry-pick.\n"
-"Se é incorreto, remove o ficheiro\n"
+"Parece que estás memorizando uma apanha.\n"
+"Se isto é incorreto, por favor executa\n"
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"e tenta de novo.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:951
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:959
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:966
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
-msgstr "%sCommitter: %.*s <%.*s>"
+msgstr "%sMemorizador: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:984
msgid "Cannot read index"
-msgstr "Incapaz ler index"
+msgstr "Incapaz ler cenário"
-#: builtin/commit.c:1025
-#, fuzzy
+#: builtin/commit.c:1029
msgid "unable to pass trailers to --trailers"
-msgstr "incapaz processar cabeçalho de %s"
+msgstr "incapaz passar atribuições para --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1069
msgid "Error building trees"
msgstr "Erro ao construir árvores"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1083 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Indique a mensagem usando apenas as opções -m ou -F.\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1128
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-"--author '%s' é diferente 'Nome <email>' e corresponde a um autor inexistente"
+"--author '%s' é diferente de 'Nome <email>' e corresponde a autor inexistente"
-#: builtin/commit.c:1137
-#, fuzzy, c-format
+#: builtin/commit.c:1142
+#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Modo de ignorar inválido '%s'"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1160 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
-msgstr "Modo inválido de ficheiros por seguir '%s'"
-
-#: builtin/commit.c:1195
-msgid "--long and -z are incompatible"
-msgstr "--long e -z são incompatíveis"
-
-#: builtin/commit.c:1226
-#, fuzzy
-msgid "You are in the middle of a merge -- cannot reword."
-msgstr "Estás no meio de junção -- incapaz emendar."
-
-#: builtin/commit.c:1228
-#, fuzzy
-msgid "You are in the middle of a cherry-pick -- cannot reword."
-msgstr "Estás no meio de cherry-pick -- incapaz emendar."
+msgstr "Modo '%s' inválido de ficheiros desmonitorizados"
#: builtin/commit.c:1231
-#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr ""
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "Estás no meio de uma junção -- incapaz refrasear."
#: builtin/commit.c:1233
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "Estás no meio de uma apanha -- incapaz refrasear."
+
+#: builtin/commit.c:1236
+#, c-format
+msgid "reword option of '%s' and path '%s' cannot be used together"
msgstr ""
+"opção de renomeamento de '%s' e caminho '%s' incapaz serem usadas juntas"
-#: builtin/commit.c:1252
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "Usar ambos --reset-author e --author faz sentido nenhum"
+#: builtin/commit.c:1238
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "opção de renomeamento de '%s' e '%s' incapaz serem usadas juntas"
-#: builtin/commit.c:1261
+#: builtin/commit.c:1263
msgid "You have nothing to amend."
msgstr "Tens nada para emendar."
-#: builtin/commit.c:1264
-msgid "You are in the middle of a merge -- cannot amend."
-msgstr "Estás no meio de junção -- incapaz emendar."
-
#: builtin/commit.c:1266
-msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "Estás no meio de cherry-pick -- incapaz emendar."
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "Estás no meio de uma junção -- incapaz emendar."
#: builtin/commit.c:1268
-#, fuzzy
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "Estás no meio de uma apanha -- incapaz emendar."
+
+#: builtin/commit.c:1270
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Estás no meio de rebase -- incapaz emendar."
-#: builtin/commit.c:1271
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "Opções --squash e --fixup incapaz serem usadas juntas"
-
-#: builtin/commit.c:1281
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado."
-
-#: builtin/commit.c:1283
-#, fuzzy
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "Opção -m incapaz ser combinada com -c/C/-F."
-
-#: builtin/commit.c:1292
+#: builtin/commit.c:1290
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author só pode ser usado com -C, -c ou --amend."
-#: builtin/commit.c:1310
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr ""
-"Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado."
-
-#: builtin/commit.c:1338
-#, fuzzy, c-format
+#: builtin/commit.c:1337
+#, c-format
msgid "unknown option: --fixup=%s:%s"
-msgstr "desconheço opção: %s\n"
+msgstr "opção desconhecida: --fixup=%s:%s"
-#: builtin/commit.c:1352
-#, fuzzy, c-format
+#: builtin/commit.c:1354
+#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "paths '%s ...' com -a faz sentido nenhum"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "mostrar status de forma concisa"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
-msgstr "mostrar informação do ramo"
+msgstr "mostrar informação de ramo"
-#: builtin/commit.c:1487
-#, fuzzy
+#: builtin/commit.c:1489
msgid "show stash information"
-msgstr "mostrar informação do ramo"
+msgstr "mostrar informação de esconderijo"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "versão"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:765
msgid "machine-readable output"
-msgstr "saída inteligível por máquina"
+msgstr "saída inteligível a máquina"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "apresentar status em formato longo (predefinição)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "terminar entradas com NUL"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-"mostrar ficheiros por seguir, modo opcional: all, normal, no. (Predefinição: "
-"all)"
+"mostrar ficheiros desmonitorizados, modos opcionais: all, normal, no. "
+"Predefinição: all)"
-#: builtin/commit.c:1504
-#, fuzzy
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13996,215 +14310,210 @@
"mostrar ficheiros ignorados, modo opcional: traditional, matching, no. "
"(Predefinição: tradicional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:197
msgid "when"
msgstr "quando"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-"ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
+"ignorar alterações em submódulos, opcional quando: all, dirty, untracked. "
"(Predefinição: all)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
-msgstr "listar ficheiros por seguir em colunas"
+msgstr "listar ficheiros desmonitorizados em colunas"
-#: builtin/commit.c:1510
-#, fuzzy
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "detecção renomeação nenhuma"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
-msgstr "suprimir o resumo depois de submeter com sucesso"
-
-#: builtin/commit.c:1618
-msgid "show diff in commit message template"
-msgstr "mostrar diff no modelo da mensagem de commit"
+msgstr "suprimir resumo depois de memorizar com sucesso"
#: builtin/commit.c:1620
-msgid "Commit message options"
-msgstr "Opções de mensagem de commit"
+msgid "show diff in commit message template"
+msgstr "mostrar diff no modelo da mensagem de memória"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1622
+msgid "Commit message options"
+msgstr "Opções de mensagem de memória"
+
+#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
msgid "read message from file"
msgstr "ler mensagem de ficheiro"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
-msgstr "substituir autor do commit"
+msgstr "sobrepor autor de memória"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:551
msgid "date"
msgstr "data"
-#: builtin/commit.c:1623
-msgid "override date for commit"
-msgstr "substituir data do commit"
-
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
-msgid "commit"
-msgstr "commit"
-
#: builtin/commit.c:1625
-msgid "reuse and edit message from specified commit"
-msgstr "reutilizar e editar a mensagem de um commit especificado"
+msgid "override date for commit"
+msgstr "sobrepor data de memória"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:360 ref-filter.h:89
+msgid "commit"
+msgstr "memória"
+
+#: builtin/commit.c:1627
+msgid "reuse and edit message from specified commit"
+msgstr "reutilizar e editar mensagem de memória especificada"
+
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
-msgstr "reutilizar a mensagem de um commit especificado"
+msgstr "reutilizar mensagem de memória especificada"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
-#, fuzzy
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
-msgstr "emendar o commit anterior"
+msgstr "[(amend|reword):]memória"
-#: builtin/commit.c:1631
-#, fuzzy
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
-"usar mensagem com formato autosquash para corrigir o commit especificado"
-
-#: builtin/commit.c:1632
-msgid "use autosquash formatted message to squash specified commit"
-msgstr ""
-"usar mensagem com formato autosquash para esmagar o commit especificado"
-
-#: builtin/commit.c:1633
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
-msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)"
-
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "terminador"
+"usar mensagem com formato autosquash para consertar ou emendar/refrasear "
+"memória especificada"
#: builtin/commit.c:1634
-msgid "add custom trailer(s)"
-msgstr ""
+msgid "use autosquash formatted message to squash specified commit"
+msgstr "usar mensagem com formato autosquash para esmagar memória especificada"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
-#, fuzzy
-msgid "add a Signed-off-by trailer"
-msgstr "adicionar Signed-off-by:"
+#: builtin/commit.c:1635
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "o autor da memória agora sou eu (usado com -C/-c/--amend)"
+
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "atribuição"
#: builtin/commit.c:1636
+msgid "add custom trailer(s)"
+msgstr "adicionar atribuição(ões) customizada(s)"
+
+#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
+#: builtin/pull.c:146 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "adicionar atribuição Signed-off-by"
+
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "usar ficheiro de modelo especificado"
-#: builtin/commit.c:1637
-msgid "force edit of commit"
-msgstr "forçar edição do commit"
-
#: builtin/commit.c:1639
+msgid "force edit of commit"
+msgstr "forçar edição de memória"
+
+#: builtin/commit.c:1641
msgid "include status in commit message template"
-msgstr "incluir status no modelo da mensagem de commit"
-
-#: builtin/commit.c:1644
-msgid "Commit contents options"
-msgstr "Opções de conteúdo do commit"
-
-#: builtin/commit.c:1645
-msgid "commit all changed files"
-msgstr "submeter todos os ficheiros alterados"
+msgstr "incluir status no modelo da mensagem de memória"
#: builtin/commit.c:1646
-msgid "add specified files to index for commit"
-msgstr "adicionar ficheiros especificados ao índice para submeter"
+msgid "Commit contents options"
+msgstr "Opções de conteúdo de memória"
#: builtin/commit.c:1647
+msgid "commit all changed files"
+msgstr "memorizar todos os ficheiros alterados"
+
+#: builtin/commit.c:1648
+msgid "add specified files to index for commit"
+msgstr "adicionar ficheiros especificados ao cenário para a memória"
+
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "adicionar ficheiros interativamente"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "adicionar alterações interativamente"
-#: builtin/commit.c:1649
-msgid "commit only specified files"
-msgstr "submeter somente os ficheiros especificados"
-
-#: builtin/commit.c:1650
-msgid "bypass pre-commit and commit-msg hooks"
-msgstr "ignorar pre-commit e commit-msg hooks"
-
#: builtin/commit.c:1651
+msgid "commit only specified files"
+msgstr "memorizar somente ficheiros especificados"
+
+#: builtin/commit.c:1652
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "contornar ganchos pre-commit e commit-msg"
+
+#: builtin/commit.c:1653
msgid "show what would be committed"
-msgstr "mostrar o que seria submetido"
+msgstr "mostrar o que seria memorizado"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
-msgstr "emendar o commit anterior"
+msgstr "emendar memória anterior"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
-msgstr "ignorar post-rewrite hook"
-
-#: builtin/commit.c:1672
-msgid "ok to record an empty change"
-msgstr "aceitar o registo duma alteração vazia"
+msgstr "contornar gancho post-rewrite"
#: builtin/commit.c:1674
-msgid "ok to record a change with an empty message"
-msgstr "aceitar o registo duma alteração com uma mensagem vazia"
+msgid "ok to record an empty change"
+msgstr "ok a gravar uma alteração vazia"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1676
+msgid "ok to record a change with an empty message"
+msgstr "ok a gravar uma alteração com uma mensagem vazia"
+
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Ficheiro MERGE_HEAD roto (%s)"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "incapaz ler MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
-msgstr "incapaz ler mensagem de commit: %s"
+msgstr "incapaz ler mensagem de memória: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
-msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
+msgstr "Abortando a memorização devido a mensagem de memória vazia.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Abortando commit; mensagem ficou por editar.\n"
+msgstr "Abortando memorização; mensagem ficou por editar.\n"
-#: builtin/commit.c:1801
-#, fuzzy, c-format
+#: builtin/commit.c:1803
+#, c-format
msgid "Aborting commit due to empty commit message body.\n"
-msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
+msgstr "Abortando memorização devido a corpo de mensagem de memória vazia.\n"
-#: builtin/commit.c:1837
-#, fuzzy
+#: builtin/commit.c:1839
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 ""
-"Repositório foi atualizado, mas incapaz escrever ficheiro new_index.\n"
+"repositório foi atualizado, mas incapaz escrever ficheiro new_index.\n"
"Verifica se tens espaço em disco e que a quota está por preencher,\n"
"e executa \"git restore --staged :/\" para recuperar."
@@ -14213,14 +14522,13 @@
msgstr "git config [<opções>]"
#: builtin/config.c:109 builtin/env--helper.c:27
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized --type argument, %s"
-msgstr "argumento --type desconhecido: %s"
+msgstr "argumento --type desconhecido, %s"
#: builtin/config.c:121
-#, fuzzy
msgid "only one type at a time"
-msgstr "imprimir apenas correspondências exatas"
+msgstr "apenas um tipo de cada vez"
#: builtin/config.c:130
msgid "Config file location"
@@ -14252,24 +14560,21 @@
#: builtin/config.c:136
msgid "read config from given blob object"
-msgstr "ler configuração a partir do objeto blob fornecido"
+msgstr "ler configuração a partir de objeto-blob fornecido"
#: builtin/config.c:137
msgid "Action"
msgstr "Ação"
#: builtin/config.c:138
-#, fuzzy
msgid "get value: name [value-pattern]"
msgstr "obter valor: nome [regex-do-valor]"
#: builtin/config.c:139
-#, fuzzy
msgid "get all values: key [value-pattern]"
msgstr "obter todos os valores: chave [regex-do-valor]"
#: builtin/config.c:140
-#, fuzzy
msgid "get values for regexp: name-regex [value-pattern]"
msgstr "obter valores para a regexp: regex-do-nome [regex-do-valor]"
@@ -14278,7 +14583,6 @@
msgstr "obter valor do URL especificado: section[.var] URL"
#: builtin/config.c:142
-#, fuzzy
msgid "replace all matching variables: name value [value-pattern]"
msgstr ""
"substituir todos as variáveis correspondentes: nome valor [regex-do-valor]"
@@ -14288,12 +14592,10 @@
msgstr "adicionar uma nova variável: nome valor"
#: builtin/config.c:144
-#, fuzzy
msgid "remove a variable: name [value-pattern]"
msgstr "remover uma variável: nome [regex-do-valor]"
#: builtin/config.c:145
-#, fuzzy
msgid "remove all matches: name [value-pattern]"
msgstr "remover todas as correspondências: nome [regex-do-valor]"
@@ -14329,6 +14631,10 @@
msgid "Type"
msgstr "Tipo"
+#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+msgid "type"
+msgstr "tipo"
+
#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr ""
@@ -14343,16 +14649,15 @@
#: builtin/config.c:157
msgid "value is --bool or --int"
-msgstr "o valor é --bool ou --int"
+msgstr "valor é --bool ou --int"
#: builtin/config.c:158
-#, fuzzy
msgid "value is --bool or string"
-msgstr "o valor é --bool ou --int"
+msgstr "valor é --bool ou string"
#: builtin/config.c:159
msgid "value is a path (file or directory name)"
-msgstr "o valor é um caminho (nome dum ficheiro ou diretório)"
+msgstr "valor é um caminho (nome dum ficheiro ou pasta)"
#: builtin/config.c:160
msgid "value is an expiry date"
@@ -14385,9 +14690,8 @@
msgstr ""
#: builtin/config.c:167 builtin/env--helper.c:45
-#, fuzzy
msgid "value"
-msgstr "chave=valor"
+msgstr "valor"
#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
@@ -14404,9 +14708,9 @@
msgstr ""
#: builtin/config.c:339
-#, fuzzy, c-format
+#, c-format
msgid "invalid key pattern: %s"
-msgstr "chave inválida: %s"
+msgstr "padrão de chave inválido: %s"
#: builtin/config.c:377
#, c-format
@@ -14414,7 +14718,7 @@
msgstr ""
#: builtin/config.c:441
-#, fuzzy, c-format
+#, c-format
msgid "cannot parse color '%s'"
msgstr "incapaz processar cor '%s'"
@@ -14423,17 +14727,14 @@
msgstr "incapaz processar valor de cor padrão"
#: builtin/config.c:536 builtin/config.c:833
-#, fuzzy
msgid "not in a git directory"
msgstr "está fora de pasta git"
#: builtin/config.c:539
-#, fuzzy
msgid "writing to stdin is not supported"
msgstr "escrever para stdin tem suporte nenhum"
#: builtin/config.c:542
-#, fuzzy
msgid "writing config blobs is not supported"
msgstr "escrever config blobs tem suporte nenhum"
@@ -14465,7 +14766,6 @@
msgstr ""
#: builtin/config.c:662
-#, fuzzy
msgid "--worktree can only be used inside a git repository"
msgstr "--worktree apenas pode ser usado dentro repositório git"
@@ -14507,7 +14807,7 @@
msgstr ""
#: builtin/config.c:822
-#, fuzzy, c-format
+#, c-format
msgid "unable to read config file '%s'"
msgstr "incapaz ler ficheiro config '%s'"
@@ -14516,12 +14816,10 @@
msgstr ""
#: builtin/config.c:835
-#, fuzzy
msgid "editing stdin is not supported"
msgstr "editar stdin tem suporte nenhum"
#: builtin/config.c:837
-#, fuzzy
msgid "editing blobs is not supported"
msgstr "editar blobs tem suporte nenhum"
@@ -14540,14 +14838,10 @@
" Usa uma regexp, --add ou --replace-all para alterar %s."
#: builtin/config.c:943 builtin/config.c:954
-#, fuzzy, c-format
+#, c-format
msgid "no such section: %s"
msgstr "secção inexistente: %s"
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "imprimir dimensões em formato inteligível por humanos"
@@ -14560,32 +14854,32 @@
"\n"
"\tchmod 0700 %s"
msgstr ""
-"As permissões do diretório do socket são demasiado fracas; outros\n"
-"utilizadores poderão conseguir as suas credenciais em cache. Considere "
+"As permissões da pasta de socket são demasiado fracas; outros\n"
+"utilizadores poderão conseguir ler as tuas credenciais em cache. Considera "
"executar:\n"
"\n"
"\tchmod 0700 %s"
#: builtin/credential-cache--daemon.c:276
msgid "print debugging messages to stderr"
-msgstr "imprimir mensagens de depuração no stderr"
+msgstr "mostrar mensagens de depuração no stderr"
#: builtin/credential-cache--daemon.c:316
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr ""
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr ""
#: builtin/credential-store.c:66
-#, fuzzy, c-format
+#, c-format
msgid "unable to get credential storage lock in %d ms"
msgstr "incapaz obter bloqueio de armazenamento de credenciais em %d ms"
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [<opções>] [<commit-etc>...]"
+msgstr "git describe [<opções>] [<mnemónica>...]"
#: builtin/describe.c:27
msgid "git describe [<options>] --dirty"
@@ -14606,17 +14900,17 @@
#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
-msgstr "tag anotada %s está indisponível"
+msgstr "etiqueta anotada %s está indisponível"
#: builtin/describe.c:281
-#, fuzzy, c-format
+#, c-format
msgid "tag '%s' is externally known as '%s'"
-msgstr "a tag '%s' está de facto em '%s'"
+msgstr "etiqueta '%s' é conhecida como '%s'"
#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
-msgstr "tag nenhuma corresponde exatamente a '%s'"
+msgstr "etiqueta nenhuma corresponde exatamente a '%s'"
#: builtin/describe.c:330
#, c-format
@@ -14634,8 +14928,8 @@
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
-"'%s' pode ser descrição de tag anotada nenhuma.\n"
-"No entanto, houve fora das tags anotadas: tenta --tags."
+"'%s' pode ser descrição de etiqueta anotada nenhuma.\n"
+"No entanto, existem etiquetas desanotadas: tenta --tags."
#: builtin/describe.c:428
#, c-format
@@ -14643,13 +14937,13 @@
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-"'%s' pode ser descrição de tag nenhuma.\n"
-"Tenta --always, ou cria algumas tags."
+"'%s' pode ser descrição de etiqueta nenhuma.\n"
+"Tenta --always, ou cria algumas etiquetas."
#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
-msgstr "%lu commits percorridos\n"
+msgstr "%lu memórias percorridas\n"
#: builtin/describe.c:461
#, c-format
@@ -14657,11 +14951,11 @@
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
-"mais de %i tags encontradas; foram listadas as %i mais recentes\n"
+"mais de %i etiquetas encontradas; foram listadas as %i mais recentes\n"
"pesquisa interrompida em %s\n"
#: builtin/describe.c:529
-#, fuzzy, c-format
+#, c-format
msgid "describe %s\n"
msgstr "à procurar da descrição de %s\n"
@@ -14671,25 +14965,25 @@
msgstr "%s é nome de objeto inválido"
#: builtin/describe.c:540
-#, fuzzy, c-format
+#, c-format
msgid "%s is neither a commit nor blob"
-msgstr "'%s' é nem commit nem blob"
+msgstr "'%s' é nem memória nem blob"
#: builtin/describe.c:554
msgid "find the tag that comes after the commit"
-msgstr "localizar a tag que vem após o commit"
+msgstr "encontrar a etiqueta que vem após a memória"
#: builtin/describe.c:555
msgid "debug search strategy on stderr"
-msgstr "depurar a estratégia de procura para stderr"
+msgstr "depurar a estratégia de procura em stderr"
#: builtin/describe.c:556
msgid "use any ref"
-msgstr "usar uma referência qualquer"
+msgstr "usa qualquer ref"
#: builtin/describe.c:557
msgid "use any tag, even unannotated"
-msgstr "usa qualquer tag, mesmo uma por anotar"
+msgstr "usa qualquer etiqueta, mesmo uma desanotada"
#: builtin/describe.c:558
msgid "always use long format"
@@ -14697,27 +14991,27 @@
#: builtin/describe.c:559
msgid "only follow first parent"
-msgstr "seguir só o primeiro pai"
+msgstr "seguir só o primeiro parente"
#: builtin/describe.c:562
msgid "only output exact matches"
-msgstr "imprimir apenas correspondências exatas"
+msgstr "sair apenas correspondências exatas"
#: builtin/describe.c:564
msgid "consider <n> most recent tags (default: 10)"
-msgstr "considerar as <n> tags mais recentes (predefinição: 10)"
+msgstr "considerar as <n> etiquetas mais recentes (predefinição: 10)"
#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
-msgstr "apenas considerar tags que correspondam ao <padrão>"
+msgstr "apenas considerar etiquetas correspondentes a <padrão>"
#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
-msgstr "descarta tags que correspondam ao <padrão>"
+msgstr "descarta etiquetas correspondentes a <padrão>"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:595
msgid "show abbreviated commit object as fallback"
-msgstr "mostrar objetos de commit abreviados em recurso"
+msgstr "mostrar objeto de memória abreviado como recurso"
#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
@@ -14725,35 +15019,21 @@
#: builtin/describe.c:572
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr ""
-"acrescentar <marca> se a árvore de trabalho contiver alterações "
-"(predefinição: \"-dirty\")"
+msgstr "acrescentar <marca> em árvore-trabalho suja (predefinição: \"-dirty\")"
#: builtin/describe.c:575
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-"acrescentar <marca> no caso de árvore de trabalho quebrada (predefinição: \"-"
-"broken\")"
-
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long é incompatível com --abbrev=0"
+"acrescentar <marca> em árvore-trabalho quebrada (predefinição: \"-broken\")"
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Nenhum nome encontrado, incapaz descrever qualquer coisa."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty é incompatível com mnemónicas"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken é incompatível com commits ou semelhantes"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr ""
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "opção '%s' e mnemónicas incapaz serem usadas juntas"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
@@ -14774,144 +15054,134 @@
msgid "%s...%s: no merge base"
msgstr ""
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "É repositório git nenhum"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:537 builtin/grep.c:700
#, c-format
msgid "invalid object '%s' given."
msgstr "objeto inválido '%s' fornecido."
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mais do que dois blobs fornecidos: '%s'"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "objeto sem tratamento '%s' fornecido."
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr ""
#: builtin/difftool.c:31
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
-msgstr "git difftool [<opções>] [<commit> [<commit>]] [--] [<caminho>...]"
+msgstr "git difftool [<opções>] [<memória> [<memória>]] [--] [<caminho>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "falha: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "incapaz ler ligação simbólica %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "incapaz ler ficheiro de ligação simbólica %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "incapaz ler o objeto %s para ligação simbólica %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
-"formatos diff combinado('-c' e '--cc') são insustentados em\n"
-"modo diff pasta('-d' e '--dir-diff')."
+"formatos diff combinados ('-c' e '--cc') são insustentados em\n"
+"modo diff de pasta ('-d' e '--dir-diff')."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "ambos os ficheiros modificados: '%s' e '%s'."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
msgid "working tree file has been left."
-msgstr "ficheiro de árvore de trabalho foi deixado."
+msgstr "ficheiro de árvore-trabalho foi deixado."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "existem ficheiros temporários em '%s'."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "pode querer limpar ou recuperá-los."
-#: builtin/difftool.c:699
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "falhou: %d"
+
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "use 'diff.guitool' em vez de 'diff.tool'"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
-msgstr "efetuar diff diretório completo"
+msgstr "efetuar diff de pasta completa"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "deixar de perguntar antes de lançar ferramenta diff"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
-msgstr "usar symlinks no modi dir-diff"
+msgstr "usar symlinks no modo diff-de-pasta"
-#: builtin/difftool.c:709
-#, fuzzy
+#: builtin/difftool.c:700
msgid "tool"
msgstr "ferramenta"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "usar a ferramenta diff especificada"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-"imprimir uma lista de ferramentas diff que podem ser usadas com '--tool'"
+"imprimir uma lista de ferramentas diff que podem ser usadas com `--tool`"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:706
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
"fazer com que 'git-difftool' termine quando uma ferramenta diff invocada "
"retorna um código de saída diferente de zero"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "especificar um comando personalizado para ver diffs"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr ""
-#: builtin/difftool.c:734
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/difftool.c:741
-#, fuzzy
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff é incompatível com --no-index"
-
-#: builtin/difftool.c:744
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr ""
-
-#: builtin/difftool.c:752
+#: builtin/difftool.c:745
msgid "no <tool> given for --tool=<tool>"
msgstr "<ferramenta> nenhuma dada a --tool=<ferramenta>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:752
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "<cmd> nenhum dado a --extcmd=<cmd>"
@@ -14919,10 +15189,6 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr ""
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
-msgid "type"
-msgstr "tipo"
-
#: builtin/env--helper.c:46
msgid "default for git_env_*(...) to fall back on"
msgstr ""
@@ -14944,545 +15210,543 @@
msgstr ""
#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [opções-de-rev-list]"
+msgid "git fast-export [<rev-list-opts>]"
+msgstr "git fast-export [<opções-lista-rev>]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr ""
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "mostrar progresso depois de <n> objetos"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
-msgstr "selecionar o tratamento de tags assinadas"
+msgstr "selecionar como lidar as etiquetas assinadas"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
-msgstr "selecionar o tratamento de tags que apontem para objetos filtrados"
+msgstr "selecionar como lidar as etiquetas que marcam objetos filtrados"
-#: builtin/fast-export.c:1205
-#, fuzzy
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
-msgstr "selecionar o tratamento de tags que apontem para objetos filtrados"
+msgstr ""
+"selecionar como lidar as mensagens de memória com codificação alternativa"
-#: builtin/fast-export.c:1208
-#, fuzzy
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "Capturar marcas neste ficheiro"
-#: builtin/fast-export.c:1210
-#, fuzzy
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
-msgstr "Importar marcas deste ficheiro"
+msgstr "importar marcas deste ficheiro"
-#: builtin/fast-export.c:1214
-#, fuzzy
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
-msgstr "Importar marcas deste ficheiro"
+msgstr "importar marcas deste ficheiro se existir"
-#: builtin/fast-export.c:1216
-#, fuzzy
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
-msgstr "Falsear um \"tageador\" para quando falte um às tags"
+msgstr "Falsear um etiquetador quando faltar um para etiquetas"
-#: builtin/fast-export.c:1218
-#, fuzzy
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
-msgstr "Mostrar a árvore completa para cada commit"
+msgstr "mostrar árvore completa para cada memória"
-#: builtin/fast-export.c:1220
-#, fuzzy
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "Usar a funcionalidade done para terminar o fluxo"
-#: builtin/fast-export.c:1221
-#, fuzzy
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "Ignorar a exibição de dados de blob"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1860
msgid "refspec"
msgstr "especificador de referência"
-#: builtin/fast-export.c:1223
-#, fuzzy
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "Aplicar o especificador de referência a referências exportadas"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "anonimizar saída"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr ""
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr ""
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr ""
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
-msgstr ""
+msgstr "rotular etiquetas com marcas de id"
-#: builtin/fast-export.c:1256
-#, fuzzy
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map sem --anonymize faz sentido nenhum"
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3097
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr ""
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3099
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr ""
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3234
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr ""
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3239
#, c-format
msgid "Expected 'to' command, got %s"
msgstr ""
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3331
msgid "Expected format name:filename for submodule rewrite option"
msgstr ""
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3386
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr ""
-#: builtin/fetch-pack.c:242
-#, fuzzy, c-format
+#: builtin/fetch-pack.c:246
+#, c-format
msgid "Lockfile created but not reported: %s"
-msgstr "Ficheiro de bloqueio criado mas por reportar: %s"
-
-#: builtin/fetch.c:35
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr ""
-"git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr "Ficheiro de trancar criado mas por reportar: %s"
#: builtin/fetch.c:36
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<opções>] [<repositório> [<espetro-ref>...]]"
+
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opções>] <grupo>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opções>] [(<repositório> | <grupo>)...]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opções>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:124
msgid "fetch.parallel cannot be negative"
-msgstr ""
+msgstr "fetch.parallel incapaz de ser negativo"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:147 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "obter de todos os remotos"
-#: builtin/fetch.c:147 builtin/pull.c:245
-#, fuzzy
+#: builtin/fetch.c:149 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "definir upstream para git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:151 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
-msgstr "acrescentar a .git/FETCH_HEAD em vez de substituir"
+msgstr "acrescentar a .git/FETCH_HEAD em vez de sobrescrever"
-#: builtin/fetch.c:151
-#, fuzzy
+#: builtin/fetch.c:153
msgid "use atomic transaction to update references"
-msgstr "solicitar transação atómica no servidor remoto"
+msgstr "usar transação atómica para atualizar referências"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:155 builtin/pull.c:195
msgid "path to upload pack on remote end"
-msgstr "caminho para o comando upload pack no remoto"
-
-#: builtin/fetch.c:154
-#, fuzzy
-msgid "force overwrite of local reference"
-msgstr "forçar a substituição do ramo local"
+msgstr "caminho para pacote upload no lado remoto"
#: builtin/fetch.c:156
+msgid "force overwrite of local reference"
+msgstr "forçar sobrescrever referências locais"
+
+#: builtin/fetch.c:158
msgid "fetch from multiple remotes"
msgstr "obter de múltiplos remotos"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:160 builtin/pull.c:199
msgid "fetch all tags and associated objects"
-msgstr "obter todas as tags e objetos associados"
-
-#: builtin/fetch.c:160
-msgid "do not fetch all tags (--no-tags)"
-msgstr "buscar tag nenhuma (--no-tags)"
+msgstr "buscar todas as etiquetas e objetos associados"
#: builtin/fetch.c:162
+msgid "do not fetch all tags (--no-tags)"
+msgstr "buscar nada todas as etiquetas (--no-tags)"
+
+#: builtin/fetch.c:164
msgid "number of submodules fetched in parallel"
msgstr "número de submódulos obtidos em paralelo"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:166
msgid "modify the refspec to place all refs within refs/prefetch/"
-msgstr ""
+msgstr "modificar o espetro-ref para colocar todas as refs em refs/prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:168 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "podar ramos de monitorização remotos que deixaram de estar no remoto"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:170
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
+"podar etiquetas locais que que deixaram de estar no remoto e trocar etiquetas"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:172
msgid "control recursive fetching of submodules"
-msgstr "controlar a obtenção recursiva de submódulos"
+msgstr "controlar busca recursiva de submódulos"
-#: builtin/fetch.c:175
-#, fuzzy
+#: builtin/fetch.c:177
msgid "write fetched references to the FETCH_HEAD file"
-msgstr "escrever o arquivo para este ficheiro"
+msgstr "escrever referências buscadas para ficheiro FETCH_HEAD"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:178 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "manter o pacote transferido"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:180
msgid "allow updating of HEAD ref"
-msgstr "permitir a atualização da referência HEAD"
+msgstr "permitir a atualização da ref HEAD"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
-msgstr "aprofundar o histórico de um clone raso"
+msgstr "aprofundar o histórico de clone superficial"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:185 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
-msgstr "aprofundar o histórico de repositório raso com base na data"
+msgstr "aprofundar o histórico de repositório superficial com base na data"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:191 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "converter num repositório completo"
-#: builtin/fetch.c:192
-msgid "prepend this to submodule path output"
-msgstr "preceder isto ao caminho do submódulo"
+#: builtin/fetch.c:194
+msgid "re-fetch without negotiating common commits"
+msgstr "voltar a buscar com negociação nenhuma de memórias comuns"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:197
+msgid "prepend this to submodule path output"
+msgstr "preceder isto à saída de caminho de submódulo"
+
+#: builtin/fetch.c:200
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
+"predefinido para busca recursiva de submódulos (menor prioridade que "
+"ficheiros config)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:204 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
-msgstr "aceitar referência que atualizem .git/shallow"
+msgstr "aceitar refs que atualizem .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:205 builtin/pull.c:230
msgid "refmap"
-msgstr "mapa de referências"
+msgstr "mapa-ref"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:206 builtin/pull.c:231
msgid "specify fetch refmap"
-msgstr "especificar mapa de referências"
+msgstr "especificar buscar mapa-ref"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:213 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
-msgstr ""
+msgstr "reportar que apenas temos objetos alcançáveis a partir deste objeto"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:215
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
+"mostrar antecessores da ponta de negociação; em vez de buscar ficheiro-pacote"
-#: builtin/fetch.c:213 builtin/fetch.c:215
-#, fuzzy
+#: builtin/fetch.c:218 builtin/fetch.c:220
msgid "run 'maintenance --auto' after fetching"
msgstr "executar 'maintenance --auto' após buscar"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:222 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
-msgstr ""
+msgstr "verificar em todos os ramos atualizados por atualizações forçadas"
-#: builtin/fetch.c:219
-#, fuzzy
+#: builtin/fetch.c:224
msgid "write the commit-graph after fetching"
-msgstr "escrever commit-graph após buscar"
+msgstr "escrever grafo-memória após buscar"
-#: builtin/fetch.c:221
-#, fuzzy
+#: builtin/fetch.c:226
msgid "accept refspecs from stdin"
-msgstr "ler referências do stdin"
+msgstr "aceitar espetro-refs de entrada padrão"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Incapaz de encontrar ref remota HEAD"
+#: builtin/fetch.c:618
+msgid "couldn't find remote ref HEAD"
+msgstr "incapaz encontrar HEAD de ref remota"
-#: builtin/fetch.c:757
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr "configuração fetch.output contém valor inválido %s"
-
-#: builtin/fetch.c:856
+#: builtin/fetch.c:893
#, c-format
msgid "object %s not found"
msgstr "objeto %s por encontrar"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:897
msgid "[up to date]"
msgstr "[atualizado]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
msgid "[rejected]"
msgstr "[rejeitado]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:911
msgid "can't fetch in current branch"
-msgstr "incapaz buscar no ramo atual"
+msgstr "incapaz buscar em ramo atual"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:912
+msgid "checked out in another worktree"
+msgstr "em observação em outra árvore-trabalho"
+
+#: builtin/fetch.c:922
msgid "[tag update]"
-msgstr "[tag atualizada]"
+msgstr "[atualização de etiqueta]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
+#: builtin/fetch.c:994
msgid "unable to update local ref"
msgstr "incapaz atualizar ref local"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:927
msgid "would clobber existing tag"
-msgstr ""
+msgstr "encobriria etiqueta existente"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:949
msgid "[new tag]"
-msgstr "[nova tag]"
+msgstr "[nova etiqueta]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:952
msgid "[new branch]"
msgstr "[novo ramo]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:955
msgid "[new ref]"
-msgstr "[nova referência]"
+msgstr "[nova ref]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:994
msgid "forced update"
msgstr "atualização forçada"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:999
msgid "non-fast-forward"
-msgstr "sem avanço-rápido"
+msgstr "sem avanço"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1102
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'."
+"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 ""
+"buscar normalmente indica qual ramo teve uma atualização forçada,\n"
+"mas essa verificação está desativada; to reactivar, usa a flag\n"
+"'--show-forced-updates' ou executa 'git config fetch.showForcedUpdates true'"
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1106
#, c-format
msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
+"demorou %.2f segundos a verificar por atualizações forçadas: podes usar\n"
+"'--no-show-forced-updates' ou executar 'git config fetch.showForcedUpdates "
+"true'\n"
+"para evitar esta verificação\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1136
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s ficou por enviar todos objetos necessários\n"
-#: builtin/fetch.c:1129
-#, fuzzy, c-format
+#: builtin/fetch.c:1156
+#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
-msgstr "%s rejeitada, porque raízes rasas são proibidas de ser atualizadas"
+msgstr ""
+"%s rejeitada, porque raízes superficiais são proibidas de serem atualizadas"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1259 builtin/fetch.c:1418
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1269
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-"algumas refs locais ficaram desatualizadas; tenta executar\n"
-" 'git remote prune %s' para remover algum ramo antigo e conflituoso"
+"algumas refs locais ficaram por atualizar; tenta executar\n"
+" 'git remote prune %s' para remover algum ramo conflituoso e antigo"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1377
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s ficará suspenso)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1378
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s ficou suspenso)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1421
msgid "[deleted]"
msgstr "[eliminado]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1422 builtin/remote.c:1153
msgid "(none)"
msgstr "(nenhum)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1446
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Recusando buscar para o ramo atual %s de repositório diferente de nu"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "recusando buscar para o ramo '%s' observado em '%s'"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1466
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "Opção \"%s\" com valor \"%s\" é inválido para %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "opção \"%s\" com valor \"%s\" é inválido para %s"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1469
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "Opção \"%s\" ignorada em %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "opção \"%s\" ignorada em %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1496
+#, c-format
+msgid "the object %s does not exist"
+msgstr "o objeto %s é inexistente"
+
+#: builtin/fetch.c:1748
msgid "multiple branches detected, incompatible with --set-upstream"
-msgstr ""
+msgstr "múltiplos\tramos detetados, incompatível com --set-upstream"
-#: builtin/fetch.c:1633
-#, fuzzy
+#: builtin/fetch.c:1760
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"apenas pode definir upstream de HEAD para '%s' a partir de '%s' quando "
+"aponta para qualquer ramo."
+
+#: builtin/fetch.c:1773
msgid "not setting upstream for a remote remote-tracking branch"
-msgstr "desdefinindo upstream para remoto de ramo de monitorização remoto"
+msgstr "indefinindo upstream para remoto de ramo de monitorização remoto"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1775
msgid "not setting upstream for a remote tag"
-msgstr ""
+msgstr "indefinindo upstream para etiqueta remota"
-#: builtin/fetch.c:1637
-#, fuzzy
+#: builtin/fetch.c:1777
msgid "unknown branch type"
msgstr "tipo de ramo desconhecido"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1779
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
+"nenhum ramo de origem encontrado;\n"
+"precisas de especificar exatamente um ramo, com a opção --set-upstream"
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1904 builtin/fetch.c:1967
#, c-format
msgid "Fetching %s\n"
-msgstr "A obter de %s\n"
+msgstr "Buscando %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1914 builtin/fetch.c:1969
#, c-format
-msgid "Could not fetch %s"
-msgstr "Incapaz buscar %s"
+msgid "could not fetch %s"
+msgstr "incapaz buscar %s"
-#: builtin/fetch.c:1790
-#, fuzzy, c-format
+#: builtin/fetch.c:1926
+#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
-msgstr "fetch '%s' impossível (exit code: %d)\n"
+msgstr "incapaz buscar '%s' (exit code: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:2030
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
-"Nenhum repositório remoto especificado. Especifique um URL ou\n"
-"o nome remoto a partir do qual as novas revisões devem ser obtidas."
+"nenhum repositório remoto especificado; por favor especifica um URL ou\n"
+"um nome remoto a partir de onde as novas revisões devem ser buscadas."
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Deve especificar um nome para a tag."
+#: builtin/fetch.c:2066
+msgid "you need to specify a tag name"
+msgstr "precisas especificar um nome de etiqueta"
-#: builtin/fetch.c:1994
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
-msgstr "--negotiate-only precisa de um ou mais --negotiate-tip=*"
+#: builtin/fetch.c:2156
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
+msgstr "--negotiate-only precisa de um ou mais --negotiation-tip=*"
-#: builtin/fetch.c:1998
-msgid "Negative depth in --deepen is not supported"
-msgstr "Profundidade negativa em --deepen tem suporte nenhum"
+#: builtin/fetch.c:2160
+msgid "negative depth in --deepen is not supported"
+msgstr "profundidade negativa em --deepen é insustentado"
-#: builtin/fetch.c:2000
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen e --depth são mutuamente exclusivos"
-
-#: builtin/fetch.c:2005
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth e --unshallow incapazes serem usados juntos"
-
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2169
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow num repositório completo faz sentido nenhum"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2186
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all leva como argumento repositório nenhum"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2188
msgid "fetch --all does not make sense with refspecs"
-msgstr "fetch --all com refspecs, faz sentido nenhum"
+msgstr "fetch --all com espetro-refs, faz sentido nenhum"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2197
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Remoto ou grupo remoto inexistente: %s"
+msgid "no such remote or remote group: %s"
+msgstr "remoto ou grupo remoto inexistente: %s"
-#: builtin/fetch.c:2042
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Buscar um grupo e especificar refspecs faz sentido nenhum"
+#: builtin/fetch.c:2205
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "buscar um grupo e especificar espetro-refs faz sentido nenhum"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2221
msgid "must supply remote when using --negotiate-only"
-msgstr ""
+msgstr "tens de indicar remoto quando usas --negotiate-only"
-#: builtin/fetch.c:2063
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr ""
+#: builtin/fetch.c:2226
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "protocolo insustenta --negotiate-only, saindo"
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2246
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
+"--filter apenas pode ser usado com o remoto configurado em extensions."
+"partialclone"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2250
msgid "--atomic can only be used when fetching from one remote"
-msgstr ""
+msgstr "--atomic apenas pode ser usado quando buscando de um remoto"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2254
msgid "--stdin can only be used when fetching from one remote"
-msgstr ""
+msgstr "--stdin apenas pode ser usado quando buscando de um remoto"
#: builtin/fmt-merge-msg.c:7
msgid ""
@@ -15491,23 +15755,27 @@
"git fmt-merge-msg [-m <mensagem>] [--log[=<n>] | --no-log] [--file "
"<ficheiro>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr "povoar o registo com, no máximo, <n> entradas do shortlog"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "alias de --log (obsoleto)"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "texto"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "usar <texto> no início da mensagem"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "usar <nome> em vez de ramo alvo real"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "ficheiro a ler"
@@ -15520,61 +15788,59 @@
msgstr "git for-each-ref [--points-at <objeto>]"
#: builtin/for-each-ref.c:12
-#, fuzzy
msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [--merged [<memória>]] [--no-merged [<memória>]]"
#: builtin/for-each-ref.c:13
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<memória>]] [--no-contains [<memória>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr ""
"envolver os marcadores de posição em aspas de forma adequada para "
"interpretadores de comandos"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "envolver os marcadores de posição em aspas de forma adequada para perl"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr ""
"envolver os marcadores de posição em aspas de forma adequada para python"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "envolver os marcadores de posição em aspas de forma adequada para Tcl"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "mostrar apenas <n> referências correspondidas"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
-#, fuzzy
+#: builtin/for-each-ref.c:42 builtin/tag.c:482
msgid "respect format colors"
-msgstr "formato esperado: %%(color:<cor>)"
+msgstr "respeitar cores de formatação"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "imprimir apenas referências que apontem para o objeto fornecido"
-#: builtin/for-each-ref.c:46
-msgid "print only refs that are merged"
-msgstr "imprimir apenas referenciadas integradas"
-
#: builtin/for-each-ref.c:47
+msgid "print only refs that are merged"
+msgstr "mostrar apenas refs que estão juntas"
+
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "imprimir apenas refs que estão por juntar"
-#: builtin/for-each-ref.c:48
-msgid "print only refs which contain the commit"
-msgstr "imprimir apenas refs que contenham o commit"
-
#: builtin/for-each-ref.c:49
+msgid "print only refs which contain the commit"
+msgstr "imprimir apenas refs que contenham a memória"
+
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
-msgstr "imprimir apenas refs que contenham outros commits"
+msgstr "imprimir apenas refs que contenham outras memórias"
#: builtin/for-each-repo.c:9
msgid "git for-each-repo --config=<config> <command-args>"
@@ -15593,19 +15859,18 @@
msgstr ""
#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
-#, fuzzy
msgid "unknown"
msgstr "desconhecido"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
#: builtin/fsck.c:78 builtin/fsck.c:100
-#, fuzzy, c-format
+#, c-format
msgid "error in %s %s: %s"
msgstr "erro em %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
#: builtin/fsck.c:94
-#, fuzzy, c-format
+#, c-format
msgid "warning in %s %s: %s"
msgstr "aviso em %s %s: %s"
@@ -15615,7 +15880,6 @@
msgstr ""
#: builtin/fsck.c:136
-#, fuzzy
msgid "wrong object type in link"
msgstr "link com tipo de objeto errado"
@@ -15632,37 +15896,36 @@
msgstr ""
#: builtin/fsck.c:291
-#, fuzzy, c-format
+#, c-format
msgid "unreachable %s %s"
-msgstr "já se tem %s (%s)"
+msgstr "inacessível %s %s"
#: builtin/fsck.c:311
-#, fuzzy, c-format
+#, c-format
msgid "dangling %s %s"
-msgstr "balanceando %s %s"
+msgstr "suspendendo %s %s"
#: builtin/fsck.c:321
-#, fuzzy
msgid "could not create lost-found"
msgstr "incapaz criar lost-found"
#: builtin/fsck.c:332
-#, fuzzy, c-format
+#, c-format
msgid "could not finish '%s'"
msgstr "incapaz acabar '%s'"
#: builtin/fsck.c:349
-#, fuzzy, c-format
+#, c-format
msgid "Checking %s"
msgstr "Verificando %s"
#: builtin/fsck.c:387
-#, fuzzy, c-format
+#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Verificando conectividade (%d objetos)"
#: builtin/fsck.c:406
-#, fuzzy, c-format
+#, c-format
msgid "Checking %s %s"
msgstr "Verificando %s %s"
@@ -15671,7 +15934,7 @@
msgstr "links quebrados"
#: builtin/fsck.c:420
-#, fuzzy, c-format
+#, c-format
msgid "root %s"
msgstr "raiz %s"
@@ -15691,152 +15954,272 @@
msgstr ""
#: builtin/fsck.c:496
-#, fuzzy, c-format
+#, c-format
msgid "Checking reflog %s->%s"
msgstr "Verificando reflog %s->%s"
#: builtin/fsck.c:530
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid sha1 pointer %s"
-msgstr "linha rasa inválida: %s"
+msgstr "%s: ponteiro sha1 inválido %s"
#: builtin/fsck.c:537
-#, fuzzy, c-format
+#, c-format
msgid "%s: not a commit"
-msgstr "%s: é commit nenhum"
+msgstr "%s: é memória nenhuma"
#: builtin/fsck.c:591
-#, fuzzy
msgid "notice: No default references"
msgstr "notificação: Referências padrão nenhumas"
-#: builtin/fsck.c:606
-#, fuzzy, c-format
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr ""
+
+#: builtin/fsck.c:624
+#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objeto roto ou em falta: %s"
-#: builtin/fsck.c:619
-#, fuzzy, c-format
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: objeto é de tipo desconhecido '%s': %s"
+
+#: builtin/fsck.c:645
+#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: objeto incapaz de ser processado: %s"
-#: builtin/fsck.c:639
-#, fuzzy, c-format
+#: builtin/fsck.c:665
+#, c-format
msgid "bad sha1 file: %s"
msgstr "mau ficheiro sha1: %s"
-#: builtin/fsck.c:654
-#, fuzzy
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "Verificando pasta objeto"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "Verificando pastas objeto"
-#: builtin/fsck.c:672
-#, fuzzy, c-format
+#: builtin/fsck.c:705
+#, c-format
msgid "Checking %s link"
msgstr "Verfificando ligação %s"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:710 builtin/index-pack.c:862
#, c-format
msgid "invalid %s"
msgstr "%s inválido"
-#: builtin/fsck.c:684
-#, fuzzy, c-format
+#: builtin/fsck.c:717
+#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s aponta para algo estranho (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
-msgstr ""
+msgstr "%s: HEAD desanexada aponta para nada"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
-msgstr ""
+msgstr "aviso: %s aponta para um ramo por nascer (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:739
msgid "Checking cache tree"
-msgstr ""
+msgstr "Verificando árvore-cenário"
-#: builtin/fsck.c:711
-#, fuzzy, c-format
+#: builtin/fsck.c:744
+#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
-msgstr "Falha ao atualizar a árvore de cache principal"
+msgstr "%s: ponteiro sha1 inválido em árvore-cenário"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
-msgstr ""
+msgstr "não-árvore em árvore-cenário"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opções>] [<objeto>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "mostrar objetos inalcançáveis"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "mostrar objetos suspensos"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:792
msgid "report tags"
-msgstr "mostrar tags"
+msgstr "mostrar etiquetas"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "mostrar nós raiz"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
-msgstr "considerar objetos do índice como nós cabeça"
+msgstr "fazer de objetos de cenário, nós de cabeça"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "considerar os reflogs como nós cabeça (predefinição)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
-msgstr "considerar também pacotes e objetos sobressalente"
+msgstr "também considerar pacotes e objetos alternativos"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "verificar só a conetividade"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr "ativar verificação mais rigorosa"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "escrever objetos suspensos em .git/lost-found"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "mostrar progresso"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "mostrar nomes verbosos de objetos inalcançáveis"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Verificando objetos"
-#: builtin/fsck.c:856
-#, fuzzy, c-format
+#: builtin/fsck.c:890
+#, c-format
msgid "%s: object missing"
-msgstr "mostrar tamanho do objeto"
+msgstr "%s: faltando objeto"
-#: builtin/fsck.c:867
-#, fuzzy, c-format
+#: builtin/fsck.c:901
+#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
-msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
+msgstr "parâmetro inválido: esperado sha1, recebi '%s'"
+
+#: builtin/fsmonitor--daemon.c:13
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [<opções>]"
+
+#: builtin/fsmonitor--daemon.c:14
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [<opções>]"
+
+#: builtin/fsmonitor--daemon.c:15
+msgid "git fsmonitor--daemon stop"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:16
+msgid "git fsmonitor--daemon status"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:57
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "valor de '%s' é bool nenhum ou int: %d"
+
+#: builtin/fsmonitor--daemon.c:99
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:104
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:170
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "incapaz criar cookie fsmonitor '%s'"
+
+#: builtin/fsmonitor--daemon.c:753
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1187
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr "incapaz começar piscina de fio IPC em '%s'"
+
+#: builtin/fsmonitor--daemon.c:1199
+msgid "could not start fsmonitor listener thread"
+msgstr "incapaz começar fio de ouvinte de fsmonitor"
+
+#: builtin/fsmonitor--daemon.c:1297
+msgid "could not initialize listener thread"
+msgstr "incapaz iniciar fio de ouvinte"
+
+#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1332
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1387
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "começando fsmonitor-daemon em '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:1413
+msgid "daemon failed to start"
+msgstr "iniciação de daemon falhou"
+
+#: builtin/fsmonitor--daemon.c:1416
+msgid "daemon not online yet"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1419
+msgid "daemon terminated"
+msgstr "daemon terminado"
+
+#: builtin/fsmonitor--daemon.c:1429
+msgid "detach from console"
+msgstr "desanexado de consola"
+
+#: builtin/fsmonitor--daemon.c:1432
+msgid "use <n> ipc worker threads"
+msgstr "usar <n> fios de trabalho ipc"
+
+#: builtin/fsmonitor--daemon.c:1435
+msgid "max seconds to wait for background daemon startup"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c:1449
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "valor 'ipc-threads' inválido (%d)"
+
+#: builtin/fsmonitor--daemon.c:1464
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "Subcomando '%s' por lidar"
+
+#: builtin/fsmonitor--daemon.c:1477
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr ""
#: builtin/gc.c:39
msgid "git gc [<options>]"
@@ -15852,266 +16235,295 @@
msgid "failed to parse '%s' value '%s'"
msgstr ""
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "incapaz estatutar '%s'"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr "incapaz ler '%s'"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
-"A última execução do gc reportou o seguinte.\n"
-"Corrije a origem do problema e remove %s.\n"
-"A limpeza automática apenas será realizada quando o ficheiro for removido.\n"
+"A última execução do gc reportou o seguinte. Por favor, corrige a causa\n"
+"de origem e remove %s\n"
+"Limpeza automática apenas será realizada quando o ficheiro for removido.\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "podar objetos por referênciar"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "ser mais minucioso (aumenta o tempo de execução)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "ativar modo auto-gc"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr "forçar a execução do gc mesmo que haja outro gc a executar"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/gc.c:576
-#, fuzzy, c-format
+#: builtin/gc.c:577
+#, c-format
msgid "failed to parse gc.logexpiry value %s"
-msgstr "falha ao analisar o valor %s de gc.logexpiry"
+msgstr "falhou processar o valor %s de gc.logexpiry"
-#: builtin/gc.c:587
-#, fuzzy, c-format
+#: builtin/gc.c:588
+#, c-format
msgid "failed to parse prune expiry value %s"
-msgstr "falha ao analisar o valor %s de gc.logexpiry"
+msgstr "falhou processar o valor de expiração de poda %s"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Auto-empacotando repositório, em segundo plano, para desempenho otimizado.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Auto-empacotando repositório para desempenho otimizado.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vê \"git help gc\" para manual de manutenção.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"gc já a executar na máquina '%s' pid %<PRIuMAX> (usa --force caso contrário)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Existem demasiados objeto soltos inalcançáveis; execute 'git prune' para os "
"remover."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr ""
-#: builtin/gc.c:750
-#, fuzzy, c-format
+#: builtin/gc.c:752
+#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "argumento --schedule desconhecido: '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr ""
-#: builtin/gc.c:905
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
-msgstr ""
+msgstr "pré-buscar remotos falhou"
#: builtin/gc.c:1022
-#, fuzzy
msgid "failed to start 'git pack-objects' process"
msgstr "começar processo 'git pack-objects' falhou"
#: builtin/gc.c:1039
-#, fuzzy
msgid "failed to finish 'git pack-objects' process"
msgstr "terminar processo 'git pack-objects' falhou"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr ""
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr ""
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr ""
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr ""
-#: builtin/gc.c:1313
-#, fuzzy, c-format
+#: builtin/gc.c:1308
+#, c-format
msgid "task '%s' failed"
msgstr "tarefa '%s' falhou"
-#: builtin/gc.c:1395
-#, fuzzy, c-format
+#: builtin/gc.c:1390
+#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' é uma tarefa inválida"
-#: builtin/gc.c:1400
-#, fuzzy, c-format
+#: builtin/gc.c:1395
+#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "tarefa '%s' apenas pode ser selecionada uma vez"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr ""
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
msgid "frequency"
msgstr ""
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr ""
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr ""
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
msgid "task"
msgstr ""
-#: builtin/gc.c:1422
-#, fuzzy
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "corre uma tarefa específica"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr ""
-#: builtin/gc.c:1482
-#, fuzzy
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "falhou executar 'git config'"
-#: builtin/gc.c:1547
-#, fuzzy, c-format
+#: builtin/gc.c:1629
+#, c-format
msgid "failed to expand path '%s'"
-msgstr "falha ao criar o caminho '%s'%s"
+msgstr "falhou expandir caminho '%s'"
-#: builtin/gc.c:1576
-#, fuzzy
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
-msgstr "Falha ao iniciar emacsclient."
+msgstr "iniciar launchctl falhou"
-#: builtin/gc.c:1613
-#, fuzzy, c-format
+#: builtin/gc.c:1769 builtin/gc.c:2237
+#, c-format
msgid "failed to create directories for '%s'"
-msgstr "falha ao criar o diretório '%s'"
+msgstr "falhou criar pastas para '%s'"
-#: builtin/gc.c:1674
-#, fuzzy, c-format
+#: builtin/gc.c:1796
+#, c-format
msgid "failed to bootstrap service %s"
msgstr "bootstrap serviços %s falhou"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr ""
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr ""
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
-msgstr ""
+msgstr "falhou a executar 'crontab -l': teu sistema pode insustentar 'cron'"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
-msgstr ""
+msgstr "falhou a executar 'crontab': teu sistema pode insustentar 'cron'"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
-msgstr ""
+msgstr "falhou abrir stdin de 'crontab'"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
msgid "'crontab' died"
-msgstr ""
+msgstr "'crontab' terminou inesperadamente"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "falhou início de systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "falhou executar systemctl"
+
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
+#: builtin/worktree.c:1024
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "falhou apagar '%s'"
+
+#: builtin/gc.c:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "argumento --scheduler desconhecido '%s'"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "sem temporizadores systemd ou crontab disponíveis"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s agendador está indisponível"
+
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr ""
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<agendador>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "agendador"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "agendador a ativar execução de manutenção git"
+
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr ""
-#: builtin/gc.c:2010
-#, fuzzy
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
-msgstr "git notes prune [<opções>]"
+msgstr "git maintenance <subcomando> [<opções>]"
-#: builtin/gc.c:2029
-#, fuzzy, c-format
+#: builtin/gc.c:2523
+#, c-format
msgid "invalid subcommand: %s"
-msgstr "commit inválido %s"
+msgstr "subcomando inválido: %s"
-#: builtin/grep.c:30
+#: builtin/grep.c:32
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opções>] [-e] <padrão> [<rev>...] [[--] <caminho>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:241
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: falha ao criar thread: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:295
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "o número de threads especificado em %2$s é inválido (%1$d)"
@@ -16120,276 +16532,259 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3150
#, c-format
msgid "no threads support, ignoring %s"
-msgstr "sem suporte de threads, %s ignorado"
+msgstr "fios insustentado, ignorando %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
#, c-format
msgid "unable to read tree (%s)"
msgstr "incapaz ler árvore (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:674
#, c-format
msgid "unable to grep from object of type %s"
msgstr "incapaz efetuar grep a objetos do tipo %s"
-#: builtin/grep.c:738
+#: builtin/grep.c:754
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:837
+#: builtin/grep.c:852
msgid "search in index instead of in the work tree"
-msgstr "procurar no índice em vez de procurar na árvore de trabalho"
+msgstr "procurar no cenário em vez de procurar na árvore-trabalho"
-#: builtin/grep.c:839
+#: builtin/grep.c:854
msgid "find in contents not managed by git"
-msgstr "procurar em conteúdos fora da gestão do git"
+msgstr "procurar em conteúdos fora da gestão de git"
-#: builtin/grep.c:841
+#: builtin/grep.c:856
msgid "search in both tracked and untracked files"
-msgstr "procurar em ficheiros monitorizados e por monitorizar"
+msgstr "procurar em ambos os ficheiros monitorizados e desmonitorizados"
-#: builtin/grep.c:843
+#: builtin/grep.c:858
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar ficheiros especificados via '.gitignore'"
-#: builtin/grep.c:845
+#: builtin/grep.c:860
msgid "recursively search in each submodule"
msgstr "procurar recursivamente em cada submódulo"
-#: builtin/grep.c:848
+#: builtin/grep.c:863
msgid "show non-matching lines"
msgstr "mostrar linhas por corresponder"
-#: builtin/grep.c:850
+#: builtin/grep.c:865
msgid "case insensitive matching"
msgstr "correspondência insensível a maiúsculas e minúsculas"
-#: builtin/grep.c:852
+#: builtin/grep.c:867
msgid "match patterns only at word boundaries"
msgstr "corresponder padrões apenas a palavras"
-#: builtin/grep.c:854
+#: builtin/grep.c:869
msgid "process binary files as text"
msgstr "processar ficheiros binários como texto"
-#: builtin/grep.c:856
+#: builtin/grep.c:871
msgid "don't match patterns in binary files"
msgstr "ignorar ficheiros binários"
-#: builtin/grep.c:859
+#: builtin/grep.c:874
msgid "process binary files with textconv filters"
msgstr "processar ficheiros binários com filtros textconv"
-#: builtin/grep.c:861
+#: builtin/grep.c:876
msgid "search in subdirectories (default)"
-msgstr ""
+msgstr "procurar em subpastas (predefinição)"
-#: builtin/grep.c:863
+#: builtin/grep.c:878
msgid "descend at most <depth> levels"
msgstr "descer no máximo até <profundidade>"
-#: builtin/grep.c:867
+#: builtin/grep.c:882
msgid "use extended POSIX regular expressions"
-msgstr "usar expressões regulares estendidas do POSIX"
+msgstr "usar expressões comum estendidas de POSIX"
-#: builtin/grep.c:870
+#: builtin/grep.c:885
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expressões regulares básicas do POSIX (predefinição)"
-#: builtin/grep.c:873
+#: builtin/grep.c:888
msgid "interpret patterns as fixed strings"
msgstr "interpretar padrões como cadeias de caracteres fixas"
-#: builtin/grep.c:876
+#: builtin/grep.c:891
msgid "use Perl-compatible regular expressions"
msgstr "usar expressões regulares compatíveis com Perl"
-#: builtin/grep.c:879
+#: builtin/grep.c:894
msgid "show line numbers"
msgstr "mostrar números de linha"
-#: builtin/grep.c:880
-#, fuzzy
+#: builtin/grep.c:895
msgid "show column number of first match"
-msgstr "mostrar apenas nomes de ficheiro sem correspondência"
+msgstr "mostrar número de coluna da primeira correspondência"
-#: builtin/grep.c:881
+#: builtin/grep.c:896
msgid "don't show filenames"
msgstr "esconder nomes de ficheiro"
-#: builtin/grep.c:882
+#: builtin/grep.c:897
msgid "show filenames"
msgstr "mostrar nomes de ficheiro"
-#: builtin/grep.c:884
+#: builtin/grep.c:899
msgid "show filenames relative to top directory"
-msgstr "mostrar nomes de ficheiro relativamente ao diretório superior"
+msgstr "mostrar nomes de ficheiro relativamente à pasta superior"
-#: builtin/grep.c:886
+#: builtin/grep.c:901
msgid "show only filenames instead of matching lines"
msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
-#: builtin/grep.c:888
+#: builtin/grep.c:903
msgid "synonym for --files-with-matches"
msgstr "sinónimo de --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:906
msgid "show only the names of files without match"
msgstr "mostrar apenas nomes de ficheiro sem correspondência"
-#: builtin/grep.c:893
+#: builtin/grep.c:908
msgid "print NUL after filenames"
msgstr "imprimir NUL depois dos nomes de ficheiro"
-#: builtin/grep.c:896
-#, fuzzy
+#: builtin/grep.c:911
msgid "show only matching parts of a line"
msgstr "mostrar apenas partes da linha correspondentes"
-#: builtin/grep.c:898
+#: builtin/grep.c:913
msgid "show the number of matches instead of matching lines"
msgstr "mostrar o número de correspondências em vez das linha correspondidas"
-#: builtin/grep.c:899
+#: builtin/grep.c:914
msgid "highlight matches"
msgstr "realçar correspondências"
-#: builtin/grep.c:901
+#: builtin/grep.c:916
msgid "print empty line between matches from different files"
msgstr ""
"imprimir uma linha em branco entre correspondências de diferentes ficheiros"
-#: builtin/grep.c:903
+#: builtin/grep.c:918
msgid "show filename only once above matches from same file"
msgstr ""
"mostrar só uma vez o nome do ficheiro acima das correspondências dentro do "
"mesmo ficheiro"
-#: builtin/grep.c:906
+#: builtin/grep.c:921
msgid "show <n> context lines before and after matches"
msgstr "mostrar <n> linhas de contexto antes e depois das correspondências"
-#: builtin/grep.c:909
+#: builtin/grep.c:924
msgid "show <n> context lines before matches"
msgstr "mostrar <n> linhas de contexto antes das correspondências"
-#: builtin/grep.c:911
+#: builtin/grep.c:926
msgid "show <n> context lines after matches"
msgstr "mostrar <n> linhas de contexto depois das correspondências"
-#: builtin/grep.c:913
+#: builtin/grep.c:928
msgid "use <n> worker threads"
-msgstr "usar <n> threads de trabalho"
+msgstr "usar <n> fios de trabalho"
-#: builtin/grep.c:914
+#: builtin/grep.c:929
msgid "shortcut for -C NUM"
msgstr "atalho para -C NUM"
-#: builtin/grep.c:917
+#: builtin/grep.c:932
msgid "show a line with the function name before matches"
msgstr "mostrar uma linha com o nome da função antes das correspondências"
-#: builtin/grep.c:919
+#: builtin/grep.c:934
msgid "show the surrounding function"
msgstr "mostrar a função circundante"
-#: builtin/grep.c:922
+#: builtin/grep.c:937
msgid "read patterns from file"
-msgstr "ler padrões do ficheiro"
+msgstr "ler padrões de ficheiro"
-#: builtin/grep.c:924
+#: builtin/grep.c:939
msgid "match <pattern>"
msgstr "procurar <padrão>"
-#: builtin/grep.c:926
+#: builtin/grep.c:941
msgid "combine patterns specified with -e"
msgstr "combinar padrões especificados com -e"
-#: builtin/grep.c:938
+#: builtin/grep.c:953
msgid "indicate hit with exit status without output"
msgstr "indicar correspondência, sem output, com status de saída"
-#: builtin/grep.c:940
+#: builtin/grep.c:955
msgid "show only matches from files that match all patterns"
msgstr ""
"mostrar apenas correspondências de ficheiro que tenham todos os padrões"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "show matching files in the pager"
-msgstr "mostrar ficheiros com correspondências no paginador"
+msgstr "mostrar ficheiros correspondentes no paginador"
-#: builtin/grep.c:947
+#: builtin/grep.c:962
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir invocar grep(1) (ignorado nesta compilação)"
-#: builtin/grep.c:1013
-#, fuzzy
+#: builtin/grep.c:1028
msgid "no pattern given"
msgstr "fornecido pattern nenhum"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1064
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index ou --untracked incapazes serem usados em revs"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1072
#, c-format
msgid "unable to resolve revision: %s"
msgstr "incapaz resolver revisão: %s"
-#: builtin/grep.c:1087
-#, fuzzy
+#: builtin/grep.c:1102
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked insustentada com --recurse-submodules"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1106
msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
-#, fuzzy
+#: builtin/grep.c:1109 builtin/pack-objects.c:4084
msgid "no threads support, ignoring --threads"
-msgstr "sem suporte de threads, %s ignorado"
+msgstr "fios insustentado, ignorando --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número de threads especificado inválido (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1146
msgid "--open-files-in-pager only works on the worktree"
-msgstr "--open-files-in-pager só funciona na árvore de trabalho"
+msgstr "--open-files-in-pager só funciona na árvore-trabalho"
-#: builtin/grep.c:1157
-#, fuzzy
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached ou --untracked proibidos serem usados com --no-index"
-
-#: builtin/grep.c:1160
-#, fuzzy
-msgid "--untracked cannot be used with --cached"
-msgstr "--cached ou --untracked proibidos serem usados com --no-index"
-
-#: builtin/grep.c:1166
-#, fuzzy
+#: builtin/grep.c:1179
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"--[no-]exclude-standard proibidos serem usados para conteúdos monitorizados"
-#: builtin/grep.c:1174
-#, fuzzy
+#: builtin/grep.c:1187
msgid "both --cached and trees are given"
-msgstr "--cached e árvores foram fornecidos simultaneamente."
+msgstr "são dados ambos --cached e árvores"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16397,99 +16792,101 @@
"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--"
"stdin] [--] <ficheiro>..."
-#: builtin/hash-object.c:86
-msgid "git hash-object --stdin-paths"
-msgstr "git hash-object --stdin-paths"
+#: builtin/hash-object.c:97
+msgid "object type"
+msgstr "tipo de objeto"
#: builtin/hash-object.c:98
-msgid "object type"
-msgstr "tipo do objeto"
-
-#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr ""
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
msgstr "ler o objeto da entrada padrão"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:102
msgid "store file as is without filters"
msgstr "guardar o ficheiro tal como está, sem filtros"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:103
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-"obter hash de lixo aleatório para criar objetos corrompidos para depurar o "
-"Git"
+"apenas faz hash de qualquer lixo aleatório para criar objetos corrompidos "
+"para depurar o Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
msgstr "processar o ficheiro como se este fosse do caminho indicado"
-#: builtin/help.c:47
+#: builtin/help.c:57
msgid "print all available commands"
msgstr "imprimir todos os comandos disponíveis"
-#: builtin/help.c:48
+#: builtin/help.c:60
+msgid "show external commands in --all"
+msgstr "mostrar comandos externos em --all"
+
+#: builtin/help.c:61
+msgid "show aliases in --all"
+msgstr "mostrar aliases em --all"
+
+#: builtin/help.c:62
msgid "exclude guides"
msgstr "excluir guias"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "imprimir lista de guias úteis"
-
-#: builtin/help.c:50
-#, fuzzy
-msgid "print all configuration variable names"
-msgstr "imprimir todas nomes variáveis de configuração"
-
-#: builtin/help.c:52
+#: builtin/help.c:63
msgid "show man page"
msgstr "mostrar página man"
-#: builtin/help.c:53
+#: builtin/help.c:64
msgid "show manual in web browser"
msgstr "mostrar manual no navegador web"
-#: builtin/help.c:55
+#: builtin/help.c:66
msgid "show info page"
msgstr "mostrar página info"
-#: builtin/help.c:57
-#, fuzzy
+#: builtin/help.c:68
msgid "print command description"
msgstr "imprimir descrição de comando"
-#: 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:70
+msgid "print list of useful guides"
+msgstr "imprimir lista de guias úteis"
-#: builtin/help.c:163
+#: builtin/help.c:72
+msgid "print all configuration variable names"
+msgstr "imprimir todas nomes variáveis de configuração"
+
+#: builtin/help.c:84
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<comando>]"
+
+#: builtin/help.c:201
#, c-format
msgid "unrecognized help format '%s'"
msgstr "formato de ajuda '%s' desconhecido"
-#: builtin/help.c:190
+#: builtin/help.c:227
msgid "Failed to start emacsclient."
-msgstr "Falha ao iniciar emacsclient."
+msgstr "Iniciar emacsclient falhou."
-#: builtin/help.c:203
+#: builtin/help.c:240
msgid "Failed to parse emacsclient version."
msgstr "Falha ao analisar a versão do emacsclient."
-#: builtin/help.c:211
+#: builtin/help.c:248
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "a versão do emacsclient '%d' é demasiado antiga (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
#, c-format
msgid "failed to exec '%s'"
msgstr "falhou exec a '%s'"
-#: builtin/help.c:307
+#: builtin/help.c:344
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16498,7 +16895,7 @@
"'%s': path para visualizador man insustentado.\n"
"Por favor, considera usar 'man.<ferramenta>.cmd' invés."
-#: builtin/help.c:319
+#: builtin/help.c:356
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16507,335 +16904,331 @@
"'%s': comando para visualizador de man.\n"
"Considera usar 'man.<ferramenta>.path' invés."
-#: builtin/help.c:436
+#: builtin/help.c:471
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': visualizador de manual desconhecido."
-#: builtin/help.c:452
+#: builtin/help.c:487
msgid "no man viewer handled the request"
msgstr "atendeu ao pedido visualizador de man nenhum"
-#: builtin/help.c:459
+#: builtin/help.c:494
msgid "no info viewer handled the request"
msgstr "atendeu ao pedido visualizador de info nenhum"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
-#, fuzzy, c-format
+#: builtin/help.c:555 builtin/help.c:566 git.c:348
+#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'git %s' é um alias de '%s'"
-#: builtin/help.c:531 git.c:380
-#, fuzzy, c-format
+#: builtin/help.c:569 git.c:380
+#, c-format
msgid "bad alias.%s string: %s"
-msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
+msgstr ""
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:611
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "opção '%s' apenas leva argumentos de opção"
+
+#: builtin/help.c:631
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr ""
+
+#: builtin/help.c:643 builtin/help.c:671
#, c-format
msgid "usage: %s%s"
-msgstr "utilização: %s%s"
+msgstr "uso: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:666
msgid "'git help config' for more information"
msgstr ""
-#: builtin/index-pack.c:222
+#: builtin/hook.c:10
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr ""
+
+#: builtin/hook.c:30
+msgid "silently ignore missing requested <hook-name>"
+msgstr ""
+
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "incompatibilidade de tipo de objeto em %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "objeto esperado %s ficou por ser recebido"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objeto %s: tipo esperado %s, obtido %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "incapaz preencher %d byte"
msgstr[1] "incapaz preencher %d bytes"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "EOF prematuro"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "erro de leitura da entrada"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "foram usados mais bytes dos que estavam disponíveis"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:754
msgid "pack too large for current definition of off_t"
msgstr "pacote demasiado grande para a definição atual de off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "o pacote excede o tamanho máximo permitido"
-
-#: builtin/index-pack.c:343
+#: builtin/index-pack.c:329
#, c-format
-msgid "unable to create '%s'"
-msgstr "incapaz criar '%s'"
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "o pacote excede o tamanho máximo permitido (%s)"
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "incapaz abrir ficheiro de pacote '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "assinatura de pacote faz correspondência nenhuma"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versão de pacote %<PRIu32> insustentada"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:380
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
-msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s"
+msgstr "pacote tem objeto inválido em offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:485
#, c-format
msgid "inflate returned %d"
msgstr "a descompactação retornou %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:534
msgid "offset value overflow for delta base object"
msgstr "delta de objeto base com capacidade excedida no valor de offset"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:542
msgid "delta base offset is out of bound"
msgstr "offset de base delta está fora de limite"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:550
#, c-format
msgid "unknown object type %d"
msgstr "tipo de objeto %d desconhecido"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:581
msgid "cannot pread pack file"
msgstr "incapaz invocar pread sobre ficheiro de pacote"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:583
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "fim prematuro de ficheiro de pacote, falta %<PRIuMAX> byte"
msgstr[1] "fim prematuro de ficheiro de pacote, faltam %<PRIuMAX> bytes"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:609
msgid "serious inflate inconsistency"
msgstr "inconsistência de descompactação grave"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
+#: builtin/index-pack.c:823 builtin/index-pack.c:832
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLISÃO DE SHA1 COM %s ENCONTRADA!"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
-#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
+#: builtin/index-pack.c:757 builtin/pack-objects.c:290
+#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
#, c-format
msgid "unable to read %s"
msgstr "incapaz ler %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:821
#, c-format
msgid "cannot read existing object info %s"
msgstr "incapaz ler informação existente de objeto %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:829
#, c-format
msgid "cannot read existing object %s"
msgstr "incapaz ler objeto existente %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:843
#, c-format
msgid "invalid blob object %s"
-msgstr "objeto blob inválido %s"
+msgstr "objeto-blob inválido %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:846 builtin/index-pack.c:865
msgid "fsck error in packed object"
msgstr ""
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:867
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nem todos os objetos filhos de %s são alcançáveis"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:928 builtin/index-pack.c:975
msgid "failed to apply delta"
msgstr "falha ao aplicar delta"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "A receber objetos"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
-msgstr "A indexar objetos"
+msgstr "Encenando objetos"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "pacote roto (SHA1 sem correspondência)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "incapaz fstat ficheiro de pacote"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "pacote com lixo no final"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "extrema confusão em parse_pack_objects()"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "A resolver deltas"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
#, c-format
msgid "unable to create thread: %s"
-msgstr "incapaz criar thread: %s"
+msgstr "incapaz criar fio: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "extrema confusão"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "concluído com %d objeto local"
msgstr[1] "concluído com %d objetos locais"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr "Soma de verificação inesperada no final de %s (corrupção no disco?)"
+msgstr "Checksum de cauda inesperado %s (disco corrompido?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "pacote tem %d delta por resolver"
msgstr[1] "pacote tem %d deltas por resolver"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
-msgstr "incapaz descompactar objeto acrescentado (%d)"
+msgstr "incapaz esvaziar objeto acrescentado (%d)"
#: builtin/index-pack.c:1423
#, c-format
msgid "local object %s is corrupt"
-msgstr ""
+msgstr "objeto local %s está roto"
-#: builtin/index-pack.c:1444
-#, fuzzy, c-format
+#: builtin/index-pack.c:1445
+#, c-format
msgid "packfile name '%s' does not end with '.%s'"
-msgstr "ao nome de ficheiro de pacote '%s' falta terminar em '.pack'"
+msgstr "fim de nome de ficheiro-pacote '%s' é diferente de '.%s'"
-#: builtin/index-pack.c:1468
-#, fuzzy, c-format
+#: builtin/index-pack.c:1469
+#, c-format
msgid "cannot write %s file '%s'"
msgstr "incapaz escrever ficheiro %s '%s'"
-#: builtin/index-pack.c:1476
-#, fuzzy, c-format
+#: builtin/index-pack.c:1477
+#, c-format
msgid "cannot close written %s file '%s'"
msgstr "incapaz fechar ficheiro %s gravado '%s'"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1494
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "incapaz renomear ficheiro '*.%s' temporário para '%s'"
+
+#: builtin/index-pack.c:1519
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "incapaz guardar ficheiro de pacote"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "incapaz guardar ficheiro index"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> incorreto"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1648
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Incapaz abrir ficheiro pack existente '%s'"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Incapaz abrir ficheiro idx existente para '%s'"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1698
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "não-delta: %d objeto"
msgstr[1] "não-delta: %d objetos"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1705
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
-msgstr[0] "comprimento de cadeia = %d: %lu objeto"
-msgstr[1] "comprimento de cadeia = %d: %lu objetos"
+msgstr[0] "comprimento de série = %d: %lu objeto"
+msgstr[1] "comprimento de série = %d: %lu objetos"
#: builtin/index-pack.c:1748
msgid "Cannot come back to cwd"
msgstr "Incapaz voltar a cwd"
#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
#, c-format
msgid "bad %s"
msgstr "%s incorreto"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr ""
-#: builtin/index-pack.c:1850
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin requer ser usado com --stdin"
-
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1856
msgid "--stdin requires a git repository"
-msgstr "--stdin requer um repositório git"
+msgstr "--stdin exige um repositório git"
-#: builtin/index-pack.c:1854
-#, fuzzy
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format incapaz ser usado com --stdin"
-
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1873
msgid "--verify with no packfile name given"
msgstr "--verify sem nome do ficheiro de pacote indicado"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
-#, fuzzy
+#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
-msgstr "erro no objeto: %s"
+msgstr "erro fsck em objetos pacote"
#: builtin/init-db.c:63
#, c-format
@@ -16868,7 +17261,7 @@
msgstr "ignorando modelo %s"
#: builtin/init-db.c:123
-#, fuzzy, c-format
+#, c-format
msgid "templates not found in %s"
msgstr "modelos em %s por encontrar"
@@ -16878,7 +17271,7 @@
msgstr "deixando de copiar modelos de '%s': %s"
#: builtin/init-db.c:263
-#, fuzzy, c-format
+#, c-format
msgid "invalid initial branch name: '%s'"
msgstr "Nome de ramo inicial inválido: '%s'"
@@ -16904,7 +17297,7 @@
#: builtin/init-db.c:432
#, c-format
msgid "re-init: ignored --initial-branch=%s"
-msgstr ""
+msgstr "reiniciar: ignorei --initial-branch=%s"
#: builtin/init-db.c:463
#, c-format
@@ -16931,8 +17324,8 @@
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--"
-"shared[=<permissões>]] [<diretório>]"
+"git init [-q | --quiet] [--bare] [--template=<pasta-modelo>] [--"
+"shared[=<permissões>]] [<pasta>]"
#: builtin/init-db.c:544
msgid "permissions"
@@ -16944,9 +17337,8 @@
"especificar que o repositório git será partilhado por vários utilizadores"
#: builtin/init-db.c:551
-#, fuzzy
msgid "override the name of the initial branch"
-msgstr "substituir o bit executável dos ficheiros listados"
+msgstr "sobrepor o nome do ramo inicial"
#: builtin/init-db.c:552 builtin/verify-pack.c:74
msgid "hash"
@@ -16954,11 +17346,7 @@
#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
msgid "specify the hash algorithm to use"
-msgstr ""
-
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr ""
+msgstr "especifica o algoritmo hash a ser usado"
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
@@ -16976,18 +17364,17 @@
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-"%s (ou --work-tree=<diretório>) só é permitido se especificar %s (ou --git-"
-"dir=<diretório>)"
+"%s (ou --work-tree=<pasta>) só é permitido se especificar %s (ou --git-"
+"dir=<pasta>)"
#: builtin/init-db.c:679
#, c-format
msgid "Cannot access work tree '%s'"
-msgstr "Incapaz aceder work tree '%s'"
+msgstr "Incapaz aceder árvore-trabalho '%s'"
#: builtin/init-db.c:684
-#, fuzzy
msgid "--separate-git-dir incompatible with bare repository"
-msgstr "--separate-git-dir incompatível com repositório nú"
+msgstr "--separate-git-dir incompatível com repositório nu"
#: builtin/interpret-trailers.c:16
msgid ""
@@ -17003,39 +17390,35 @@
#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
-msgstr "cortar terminadores vazios"
+msgstr "cortar atribuições vazias"
#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr ""
#: builtin/interpret-trailers.c:101
-#, fuzzy
msgid "action if trailer already exists"
-msgstr "a árvore de trabalho '%s' já existe."
+msgstr "ação se atribuição já exista"
#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
-msgstr ""
+msgstr "ação se atribuição está faltando"
#: builtin/interpret-trailers.c:105
-#, fuzzy
msgid "output only the trailers"
-msgstr "cortar terminadores vazios"
+msgstr "mostrar apenas atribuições"
#: builtin/interpret-trailers.c:106
-#, fuzzy
msgid "do not apply config rules"
-msgstr "pesquisar variáveis de configuração"
+msgstr "aplicar regras de config nenhumas"
#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr ""
#: builtin/interpret-trailers.c:108
-#, fuzzy
msgid "set parsing options"
-msgstr "Opções de integração"
+msgstr "definir opções de processamento"
#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
@@ -17046,7 +17429,6 @@
msgstr "terminadores a adicionar"
#: builtin/interpret-trailers.c:123
-#, fuzzy
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer com --only-input faz sentido nenhum"
@@ -17054,595 +17436,575 @@
msgid "no input file given for in-place editing"
msgstr "fornecido para edição in-place, ficheiro de entrada nenhum"
-#: builtin/log.c:59
+#: builtin/log.c:60
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opções>] [<intervalo-de-revisões>] [[--] <caminho>...]"
-#: builtin/log.c:60
+#: builtin/log.c:61
msgid "git show [<options>] <object>..."
msgstr "git show [<opções>] <objeto>..."
-#: builtin/log.c:113
+#: builtin/log.c:114
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opção --decorate inválida: %s"
-#: builtin/log.c:180
+#: builtin/log.c:181
msgid "show source"
msgstr "mostrar origem"
-#: builtin/log.c:181
-#, fuzzy
+#: builtin/log.c:182
msgid "use mail map file"
msgstr "usar ficheiro de mapeamento de correio"
-#: builtin/log.c:184
-#, fuzzy
+#: builtin/log.c:185
msgid "only decorate refs that match <pattern>"
-msgstr "usar apenas referência que correspondam ao <padrão>"
+msgstr "apenas decorar refs que correspondam ao <padrão>"
-#: builtin/log.c:186
-#, fuzzy
+#: builtin/log.c:187
msgid "do not decorate refs that match <pattern>"
msgstr "deixar por decorar refs correspondentes a <padrão>"
-#: builtin/log.c:187
+#: builtin/log.c:188
msgid "decorate options"
msgstr "opções de decoração"
-#: builtin/log.c:190
-#, fuzzy
+#: builtin/log.c:191
msgid ""
"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
-msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
+msgstr ""
+"localizar a evolução de intervalo de linhas <início>,<fim> ou função :<nome-"
+"função> em <ficheiro>"
-#: builtin/log.c:213
-#, fuzzy
+#: builtin/log.c:214
msgid "-L<range>:<file> cannot be used with pathspec"
-msgstr "-L<alcance>:<ficheiro>incapaz ser usado com especificador de path"
+msgstr "-L<intervalo>:<ficheiro>incapaz ser usado com especificador de path"
-#: builtin/log.c:306
+#: builtin/log.c:322
#, c-format
msgid "Final output: %d %s\n"
msgstr "Output final: %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:429
+msgid "unable to create temporary object directory"
+msgstr "incapaz criar pasta de objeto temporário"
+
+#: builtin/log.c:599
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ficheiro incorreto"
-#: builtin/log.c:586 builtin/log.c:676
-#, fuzzy, c-format
+#: builtin/log.c:614 builtin/log.c:706
+#, c-format
msgid "could not read object %s"
msgstr "incapaz ler objeto %s"
-#: builtin/log.c:701
-#, fuzzy, c-format
+#: builtin/log.c:731
+#, c-format
msgid "unknown type: %d"
-msgstr "Tipo desconhecido: %d"
+msgstr "tipo desconhecido: %d"
-#: builtin/log.c:846
+#: builtin/log.c:880
#, c-format
msgid "%s: invalid cover from description mode"
msgstr ""
-#: builtin/log.c:853
+#: builtin/log.c:887
msgid "format.headers without value"
msgstr "format.headers sem valor"
-#: builtin/log.c:982
-#, fuzzy, c-format
+#: builtin/log.c:1016
+#, c-format
msgid "cannot open patch file %s"
msgstr "incapaz abrir ficheiro patch %s"
-#: builtin/log.c:999
+#: builtin/log.c:1033
msgid "need exactly one range"
msgstr ""
-#: builtin/log.c:1009
-#, fuzzy
+#: builtin/log.c:1043
msgid "not a range"
msgstr "é intervalo nenhum"
-#: builtin/log.c:1173
-#, fuzzy
+#: builtin/log.c:1207
msgid "cover letter needs email format"
-msgstr "A carta de apresentação precisa de um formato de e-mail"
+msgstr "carta de apresentação precisa de formato de e-mail"
-#: builtin/log.c:1179
+#: builtin/log.c:1213
msgid "failed to create cover-letter file"
msgstr ""
-#: builtin/log.c:1266
+#: builtin/log.c:1300
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to incorreto: %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1327
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]"
-#: builtin/log.c:1351
-#, fuzzy
+#: builtin/log.c:1385
msgid "two output directories?"
-msgstr "Dois diretórios de saída?"
+msgstr "duas pastas de saída?"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
-#, fuzzy, c-format
+#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
+#, c-format
msgid "unknown commit %s"
-msgstr "Commit desconhecido %s"
+msgstr "memória %s desconhecida"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
-#, fuzzy, c-format
+#, c-format
msgid "failed to resolve '%s' as a valid ref"
-msgstr "falha ao resolver '%s' como uma referência válida."
+msgstr "falhou resolver '%s' como uma ref válida"
-#: builtin/log.c:1522
-#, fuzzy
+#: builtin/log.c:1556
msgid "could not find exact merge base"
msgstr "incapaz encontrar a exata base de junção."
-#: builtin/log.c:1532
-#, fuzzy
+#: builtin/log.c:1566
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 ""
-"Falha ao obter ramo a montante, se quer gravar o commit base "
-"automaticamente,\n"
-"use branch --set-upstream-to para seguir um ramo remoto.\n"
-"Ou pode especificar o commit base com --base=<base-commit-id> manualmente."
+"falhou obter upstream, se queres gravar a memória base automaticamente,\n"
+"por favor, usa git branch --set-upstream-to para monitorizar um ramo "
+"remoto.\n"
+"Ou podes especificar a memória base manualmente com --base=<id-memória-base>"
-#: builtin/log.c:1555
-#, fuzzy
+#: builtin/log.c:1589
msgid "failed to find exact merge base"
-msgstr "Falha ao procurar base exata de integração"
+msgstr "Falha ao encontrar base de junção exata"
-#: builtin/log.c:1572
+#: builtin/log.c:1606
msgid "base commit should be the ancestor of revision list"
-msgstr "o commit base deve ser o antecessor da lista de revisões"
+msgstr "memória base tem de ser o antecessor da lista de revisões"
-#: builtin/log.c:1582
+#: builtin/log.c:1616
msgid "base commit shouldn't be in revision list"
-msgstr "commit base devia estar fora da lista de revisões"
+msgstr "memória base tem de estar fora da lista de revisões"
-#: builtin/log.c:1640
+#: builtin/log.c:1674
msgid "cannot get patch id"
msgstr "incapaz obter id de patch"
-#: builtin/log.c:1703
-#, fuzzy
+#: builtin/log.c:1737
msgid "failed to infer range-diff origin of current series"
-msgstr "falha ao guardar ligação à referência de notas atual (%s)"
+msgstr "falhou ao inferir origem intervalo-diff da série atual"
-#: builtin/log.c:1705
+#: builtin/log.c:1739
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr ""
-#: builtin/log.c:1749
+#: builtin/log.c:1783
msgid "use [PATCH n/m] even with a single patch"
msgstr "usar [PATCH n/m] mesmo com um único patch"
-#: builtin/log.c:1752
+#: builtin/log.c:1786
msgid "use [PATCH] even with multiple patches"
msgstr "usar [PATCH] mesmo com múltiplos patches"
-#: builtin/log.c:1756
+#: builtin/log.c:1790
msgid "print patches to standard out"
msgstr "imprimir patches para a saída padrão"
-#: builtin/log.c:1758
+#: builtin/log.c:1792
msgid "generate a cover letter"
msgstr "gerar uma carta de apresentação"
-#: builtin/log.c:1760
+#: builtin/log.c:1794
msgid "use simple number sequence for output file names"
msgstr ""
"usar uma sequência de números simples para denominar os ficheiros gerados"
-#: builtin/log.c:1761
+#: builtin/log.c:1795
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1762
+#: builtin/log.c:1796
msgid "use <sfx> instead of '.patch'"
msgstr "usar <sfx> em vez de '.patch'"
-#: builtin/log.c:1764
+#: builtin/log.c:1798
msgid "start numbering patches at <n> instead of 1"
msgstr "começar a numerar os patches em <n> em vez de 1"
-#: builtin/log.c:1765
+#: builtin/log.c:1799
msgid "reroll-count"
msgstr ""
-#: builtin/log.c:1766
+#: builtin/log.c:1800
msgid "mark the series as Nth re-roll"
msgstr "marcar a série como a n-ésima reiteração"
-#: builtin/log.c:1768
-#, fuzzy
+#: builtin/log.c:1802
msgid "max length of output filename"
-msgstr "tamanho máximo de cada ficheiro de pacote gerado"
+msgstr "comprimento máximo de saída de nome de ficheiro"
-#: builtin/log.c:1770
-#, fuzzy
+#: builtin/log.c:1804
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "Usar [RFC PATCH] em vez de [PATCH]"
-#: builtin/log.c:1773
+#: builtin/log.c:1807
msgid "cover-from-description-mode"
msgstr ""
-#: builtin/log.c:1774
+#: builtin/log.c:1808
msgid "generate parts of a cover letter based on a branch's description"
-msgstr ""
+msgstr "gerar partes de carta de apresentação baseado na descrição do ramo"
-#: builtin/log.c:1776
-#, fuzzy
+#: builtin/log.c:1810
msgid "use [<prefix>] instead of [PATCH]"
msgstr "usar [<prefixo>] em vez de [PATCH]"
-#: builtin/log.c:1779
+#: builtin/log.c:1813
msgid "store resulting files in <dir>"
-msgstr "guardar os ficheiros resultantes em <dir>"
+msgstr "guardar os ficheiros resultantes em <pasta>"
-#: builtin/log.c:1782
+#: builtin/log.c:1816
msgid "don't strip/add [PATCH]"
msgstr "deixar de despir/adicionar [PATCH]"
-#: builtin/log.c:1785
+#: builtin/log.c:1819
msgid "don't output binary diffs"
msgstr "deixar de gerar diffs binários"
-#: builtin/log.c:1787
+#: builtin/log.c:1821
msgid "output all-zero hash in From header"
msgstr "preencher o cabeçalho From com hash de zeros"
-#: builtin/log.c:1789
+#: builtin/log.c:1823
msgid "don't include a patch matching a commit upstream"
-msgstr "incluir nenhum patch correspondente commit upstream"
+msgstr "incluir nenhum remendo correspondente a memória upstream"
-#: builtin/log.c:1791
+#: builtin/log.c:1825
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostrar no formato de patch em vez de no formato por omissão (patch + stat)"
-#: builtin/log.c:1793
+#: builtin/log.c:1827
msgid "Messaging"
msgstr "Mensagem"
-#: builtin/log.c:1794
+#: builtin/log.c:1828
msgid "header"
msgstr "cabeçalho"
-#: builtin/log.c:1795
+#: builtin/log.c:1829
msgid "add email header"
msgstr "adicionar cabeçalho de e-mail"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1830 builtin/log.c:1831
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1796
+#: builtin/log.c:1830
msgid "add To: header"
msgstr "adicionar cabeçalho To:"
-#: builtin/log.c:1797
+#: builtin/log.c:1831
msgid "add Cc: header"
msgstr "adicionar cabeçalho Cc:"
-#: builtin/log.c:1798
+#: builtin/log.c:1832
msgid "ident"
msgstr "identidade"
-#: builtin/log.c:1799
+#: builtin/log.c:1833
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-"definir endereço From para <identidade> (ou, identidade do committer, caso "
-"contrário)"
+"definir endereço From para <identidade> (ou identidade de memorizador caso "
+"ausente)"
-#: builtin/log.c:1801
+#: builtin/log.c:1835
msgid "message-id"
msgstr "id-mensagem"
-#: builtin/log.c:1802
+#: builtin/log.c:1836
msgid "make first mail a reply to <message-id>"
msgstr "usar o primeiro email para responder a <id-mensagem>"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1837 builtin/log.c:1840
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1804
+#: builtin/log.c:1838
msgid "attach the patch"
-msgstr "anexar o patch"
+msgstr "anexar remendo"
-#: builtin/log.c:1807
+#: builtin/log.c:1841
msgid "inline the patch"
-msgstr "incorporar o patch"
+msgstr "incorporar remendo"
-#: builtin/log.c:1811
+#: builtin/log.c:1845
msgid "enable message threading, styles: shallow, deep"
-msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)"
+msgstr ""
+"ativar mensagens por tópicos, estilos: shallow (superficial), deep (profundo)"
-#: builtin/log.c:1813
+#: builtin/log.c:1847
msgid "signature"
msgstr "assinatura"
-#: builtin/log.c:1814
+#: builtin/log.c:1848
msgid "add a signature"
msgstr "adicionar uma assinatura"
-#: builtin/log.c:1815
+#: builtin/log.c:1849
msgid "base-commit"
-msgstr "commit-base"
+msgstr "memória-base"
-#: builtin/log.c:1816
+#: builtin/log.c:1850
msgid "add prerequisite tree info to the patch series"
msgstr "adicionar informação pré-requisito da árvore à série de patches"
-#: builtin/log.c:1819
+#: builtin/log.c:1853
msgid "add a signature from a file"
msgstr "adicionar uma assinatura de um ficheiro"
-#: builtin/log.c:1820
+#: builtin/log.c:1854
msgid "don't print the patch filenames"
msgstr "imprimir nomes de ficheiros de patch nenhuns"
-#: builtin/log.c:1822
-#, fuzzy
+#: builtin/log.c:1856
msgid "show progress while generating patches"
-msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
+msgstr "mostrar progresso enquanto se gera remendos"
-#: builtin/log.c:1824
+#: builtin/log.c:1858
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
+"mostrar alterações contra <rev> em carta de apresentação ou em remendo único"
-#: builtin/log.c:1827
+#: builtin/log.c:1861
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
+"mostrar alterações contra <espetro-ref> em carta de apresentação ou em "
+"remendo único"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1863 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1916
+#: builtin/log.c:1953
#, c-format
msgid "invalid ident line: %s"
msgstr "linha de indentação inválida: %s"
-#: builtin/log.c:1931
-#, fuzzy
-msgid "-n and -k are mutually exclusive"
-msgstr "-n e -k são mutuamente exclusivos."
-
-#: builtin/log.c:1933
-#, fuzzy
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc e -k são mutuamente exclusivos."
-
-#: builtin/log.c:1941
+#: builtin/log.c:1978
msgid "--name-only does not make sense"
msgstr "--name-only faz sentido nenhum"
-#: builtin/log.c:1943
+#: builtin/log.c:1980
msgid "--name-status does not make sense"
msgstr "--name-status faz sentido nenhum"
-#: builtin/log.c:1945
+#: builtin/log.c:1982
msgid "--check does not make sense"
msgstr "--check faz sentido nenhum"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
+#: builtin/log.c:1984
+msgid "--remerge-diff does not make sense"
+msgstr "--remerge-diff faz sentido nenhum"
-#: builtin/log.c:2089
+#: builtin/log.c:2129
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:2093
+#: builtin/log.c:2133
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:2094
+#: builtin/log.c:2134
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr ""
-
-#: builtin/log.c:2104
+#: builtin/log.c:2144
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:2112
+#: builtin/log.c:2152
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:2113
+#: builtin/log.c:2153
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:2124
+#: builtin/log.c:2164
#, c-format
msgid "unable to read signature file '%s'"
msgstr "incapaz ler ficheiro de assinatura '%s'"
-#: builtin/log.c:2160
-#, fuzzy
+#: builtin/log.c:2200
msgid "Generating patches"
msgstr "falha ao editar patch"
-#: builtin/log.c:2204
+#: builtin/log.c:2244
msgid "failed to create output files"
msgstr ""
-#: builtin/log.c:2263
+#: builtin/log.c:2304
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
-msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]"
+msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2358
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-"Incapaz encontrar ramo monitorizado remoto, por favor especifica <upstream> "
+"Incapaz encontrar ramo remoto monitorizado, por favor especifica <upstream> "
"manualmente.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opções>] [<ficheiro>...]"
-#: builtin/ls-files.c:619
-msgid "identify the file status with tags"
-msgstr "identificar o estado do ficheiro com tags"
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "separa caminhos com o caractere NUL"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:620
+msgid "identify the file status with tags"
+msgstr "identificar o estado do ficheiro com as etiquetas"
+
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usar letras minúsculas para ficheiros 'assume unchanged'"
-#: builtin/ls-files.c:623
-#, fuzzy
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "usar letras minúsculas para ficheiros 'fsmonitor clean'"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
-msgstr "mostrar ficheiros em cache na saída (predefinição)"
+msgstr "mostrar ficheiros de cenário na saída (predefinição)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "mostrar ficheiros eliminados na saída"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "mostrar ficheiros modificados na saída"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "mostrar outros ficheiros na saída"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "mostrar ficheiros ignorados na saída"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
-msgstr "mostrar nome de objetos com conteúdo preparado, na saída"
+msgstr "mostrar nome de objetos de conteúdo encenado, na saída"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr ""
"mostrar ficheiros no sistema de ficheiros que precisam de ser removidos"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
-msgstr "mostrar nomes de diretórios 'other' (outro)"
+msgstr "mostrar apenas nomes das pastas 'other' (outro)"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "mostrar finais de linha dos ficheiros"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "mostrar pastas vazias nenhumas"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "mostrar ficheiros por juntar no output"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "mostrar informação de resolver-desfazer"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "ignorar ficheiros que correspondam ao padrão"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "ler padrões de exclusão do <ficheiro>"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "ler padrões de exclusão de <ficheiro>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
-msgstr "ler padrões de exclusão por diretório do <ficheiro>"
+msgstr "ler padrões de exclusão por pasta adicionais em <ficheiro>"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
-msgstr "incluir as exclusões standard do git"
+msgstr "incluir as exclusões standard de git"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
-msgstr "mostrar os caminhos relativamente ao diretório superior do projeto"
-
-#: builtin/ls-files.c:666
-msgid "recurse through submodules"
-msgstr "percorrer recursivamente submódulos"
-
-#: builtin/ls-files.c:668
-msgid "if any <file> is not in the index, treat this as an error"
-msgstr "se estiver no index <ficheiro> nenhum, tratar como erro"
+msgstr "fazer a saída relativa à pasta de topo de projeto"
#: builtin/ls-files.c:669
-msgid "tree-ish"
-msgstr "árvore-etc"
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "se qualquer <ficheiro> estiver fora de cenário, tratar como erro"
#: builtin/ls-files.c:670
-msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr ""
-"fingir que os caminhos removidos desde <árvore-etc> ainda estão presentes"
+msgid "tree-ish"
+msgstr "arvoredo"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:671
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr "fingir que caminhos removidos desde <arvoredo> ainda estão presentes"
+
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "mostrar dados de depuração"
-#: builtin/ls-files.c:674
-#, fuzzy
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
-msgstr "suprimir a cadeias de caracteres de nomes"
+msgstr "suprimir entradas duplicadas"
+
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr ""
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repositório> [<referências>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repositório> [<refs>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "imprimir URL remoto nenhum"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
msgid "exec"
msgstr "exec"
#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
-msgstr "caminho para git-upload-pack no servidor remoto"
+msgstr "caminho para git-upload-pack no host remoto"
#: builtin/ls-remote.c:66
msgid "limit to tags"
-msgstr "restringir-se a tags"
+msgstr "restringir-se a etiquetas"
#: builtin/ls-remote.c:67
msgid "limit to heads"
-msgstr "restringir-se a cabeças"
+msgstr "limitar-se a cabeças"
#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
-msgstr "mostrar nenhumas tags descascadas"
+msgstr "mostrar nenhumas etiquetas descascadas"
#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
@@ -17656,51 +18018,76 @@
msgid "show underlying ref in addition to the object pointed by it"
msgstr "mostrar a referência subjacente em adição ao objeto por ela apontado"
-#: builtin/ls-tree.c:30
+#: builtin/ls-tree.c:36
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<opções>] <árvore-etc> [<caminho>...]"
+msgstr "git ls-tree [<opções>] <arvoredo> [<caminho>...]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:54
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "incapaz obter info de objeto acerca de '%s'"
+
+#: builtin/ls-tree.c:79
+#, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "formato ls-tree inválido: elemento '%s' começa diferente de '('"
+
+#: builtin/ls-tree.c:83
+#, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "formate ls-tree inválido: elemento '%s' termina diferente de ')'"
+
+#: builtin/ls-tree.c:109
+#, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr "formato ls-tree inválido: %%%.*s"
+
+#: builtin/ls-tree.c:336
msgid "only show trees"
msgstr "mostrar apenas árvores"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:338
msgid "recurse into subtrees"
msgstr "percorrer as subárvores recursivamente"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:340
msgid "show trees when recursing"
msgstr "mostrar árvores ao percorrer"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:343
msgid "terminate entries with NUL byte"
msgstr "terminar entradas com o byte NUL"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:344
msgid "include object size"
msgstr "incluir dimensão dos objetos"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
msgid "list only filenames"
msgstr "listar apenas os nomes de ficheiro"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:350
+msgid "list only objects"
+msgstr "listar apenas objetos"
+
+#: builtin/ls-tree.c:353
msgid "use full path names"
msgstr "usar nomes de caminho completos"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:355
msgid "list entire tree; not just current directory (implies --full-name)"
-msgstr ""
-"listar toda árvore; e para além do diretório atual (implica --full-name)"
+msgstr "listar toda árvore; para além da pasta atual (implica --full-name)"
+
+#: builtin/ls-tree.c:391
+msgid "--format can't be combined with other format-altering options"
+msgstr "incapaz combinar --format com outras opções alteradoras de formato"
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
-#, fuzzy
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
-msgstr "git merge [<opções>] <msg> HEAD <commit>"
+msgstr "git mailinfo [<opções>] <msg> <remendo> < mail >info"
#: builtin/mailinfo.c:58
-#, fuzzy
msgid "keep subject"
msgstr "manter assunto"
@@ -17709,9 +18096,8 @@
msgstr ""
#: builtin/mailinfo.c:62
-#, fuzzy
msgid "copy Message-ID to the end of commit message"
-msgstr "Esta é a 2ª mensagem de commit:"
+msgstr "copia Message-ID para o fim da mensagem de memória"
#: builtin/mailinfo.c:64
msgid "re-code metadata to i18n.commitEncoding"
@@ -17734,9 +18120,8 @@
msgstr ""
#: builtin/mailinfo.c:73
-#, fuzzy
msgid "<action>"
-msgstr "ação"
+msgstr "<ação>"
#: builtin/mailinfo.c:74
msgid "action when quoted CR is found"
@@ -17746,51 +18131,54 @@
msgid "use headers in message's body"
msgstr ""
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:227
+msgid "reading patches from stdin/tty..."
+msgstr "lendo remendos de entrada padrão/tty..."
+
+#: builtin/mailsplit.c:242
#, c-format
msgid "empty mbox: '%s'"
msgstr ""
#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <memória> <memória>..."
#: builtin/merge-base.c:33
msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <memória>..."
#: builtin/merge-base.c:34
msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <memória>..."
#: builtin/merge-base.c:35
msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <memória> <memória>"
#: builtin/merge-base.c:36
msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <referência> [<commit>]"
+msgstr "git merge-base --fork-point <ref> [<memória>]"
-#: builtin/merge-base.c:143
+#: builtin/merge-base.c:144
msgid "output all common ancestors"
msgstr "mostrar todos os antecessores"
-#: builtin/merge-base.c:145
+#: builtin/merge-base.c:146
msgid "find ancestors for a single n-way merge"
-msgstr "encontrar antecessores de uma única integração com n pontos"
+msgstr "encontrar antecessores para uma única n-junção (e.g. tri-junção)"
-#: builtin/merge-base.c:147
+#: builtin/merge-base.c:148
msgid "list revs not reachable from others"
msgstr "listar revs apenas alcançáveis pelos nossos"
-#: builtin/merge-base.c:149
+#: builtin/merge-base.c:150
msgid "is the first one ancestor of the other?"
-msgstr "é o primeiro antecessor do outro?"
+msgstr "é o primeiro, antecessor do outro?"
-#: builtin/merge-base.c:151
+#: builtin/merge-base.c:152
msgid "find where <commit> forked from reflog of <ref>"
-msgstr ""
-"descobrir onde foi que o <commit> divergiu usando o reflog da <referência>"
+msgstr "descobrir onde <memória> forqueou a partir de registo-ref da <ref>"
#: builtin/merge-file.c:9
msgid ""
@@ -17806,31 +18194,35 @@
#: builtin/merge-file.c:36
msgid "use a diff3 based merge"
-msgstr "usar integração baseada em diff3"
+msgstr "usar junção com diff3"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "usar uma zelosa junção com diff3"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "usar a nossa versão em caso de conflito"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "usar a versão deles em caso de conflito"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "usar a união das versões em caso de conflito"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
-msgstr "usar este comprimento de marcador para os conflitos"
+msgstr "usar este tamanho de marcador para os conflitos"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "deixar de alertar sobre conflitos"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
-msgstr "definir identificares para ficheiro1/ficheiro-orig/ficheiro2"
+msgstr "definir rótulos para ficheiro1/ficheiro-orig/ficheiro2"
#: builtin/merge-recursive.c:47
#, c-format
@@ -17863,391 +18255,373 @@
msgid "Merging %s with %s\n"
msgstr "Juntando %s com %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<opções>] [<commit>...]"
+msgstr "git merge [<opções>] [<memória>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "a opção 'm' requer um valor"
-#: builtin/merge.c:146
-#, fuzzy, c-format
+#: builtin/merge.c:148
+#, c-format
msgid "option `%s' requires a value"
-msgstr "a opção '%s' requer um valor"
+msgstr "opção `%s' exige um valor"
-#: builtin/merge.c:199
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Incapaz encontrar estratégia de junção '%s'.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Estratégias disponíveis:"
-#: builtin/merge.c:205
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Estratégias personalizadas disponíveis:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "mostrar diffstat nenhuma ao fim da junção"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "mostrar um diffstat ao fim da junção"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(sinónimo de --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da "
-"integração"
+"adicionar (no máximo <n>) entradas de shortlog à mensagem de memória da "
+"junção"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
-msgstr "criar um único commit em vez de realizar uma integração"
+msgstr "criar uma única memória em vez de realizar uma junção"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
-msgstr "realizar um commit se a integração for bem sucedida (predefinição)"
+msgstr "realizar uma memorização se a junção suceder (predefinição)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
-msgstr "editar a mensagem antes de submeter"
+msgstr "editar a mensagem antes de memorizar"
-#: builtin/merge.c:271
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
-msgstr "permitir avanço rápido (predefinição)"
+msgstr "permitir avanço (predefinição)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
-msgstr "abortar se fast-forward é impossível"
+msgstr "abortar se avanço é impossível"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
-msgstr "verificar se o commit tem uma assinatura GPG válida"
+msgstr "verificar que a memória em questão tem uma assinatura GPG válida"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1145 builtin/revert.c:114
msgid "strategy"
msgstr "estratégia"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
-msgstr "estratégia de integração a usar"
+msgstr "estratégia de junção a usar"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "opção=valor"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
-msgstr "opções da estratégia de integração selecionada"
+msgstr "opção para estratégia de junção selecionada"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "mensagem de commit de junção (para junções non-fast-forward)"
+msgstr "mensagem de memória de junção (para junções diferentes de avanço)"
-#: builtin/merge.c:290
-msgid "abort the current in-progress merge"
-msgstr "abortar integração em curso"
-
-#: builtin/merge.c:292
-#, fuzzy
-msgid "--abort but leave index and working tree alone"
-msgstr "repor HEAD, índice e árvore de trabalho"
+#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "usar <nome> em vez do alvo real"
#: builtin/merge.c:294
-msgid "continue the current in-progress merge"
-msgstr "continuar a integração em curso"
+msgid "abort the current in-progress merge"
+msgstr "abortar a junção atualmente em curso"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:296
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort mas deixar o cenário e a árvore-trabalho quietas"
+
+#: builtin/merge.c:298
+msgid "continue the current in-progress merge"
+msgstr "continuar a junção em curso"
+
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "permitir junção de históricos diferentes"
-#: builtin/merge.c:303
-#, fuzzy
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "ignorar pre-commit e commit-msg hooks"
+msgstr "contornar ganchos pre-merge-commit e commit-msg"
-#: builtin/merge.c:320
+#: builtin/merge.c:323
msgid "could not run stash."
-msgstr "incapaz executar stash."
+msgstr "incapaz executar o esconder."
-#: builtin/merge.c:325
+#: builtin/merge.c:328
msgid "stash failed"
-msgstr ""
+msgstr "esconder falhou"
-#: builtin/merge.c:330
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
-msgstr ""
+msgstr "objeto inválido: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
-msgstr "falha ao executar o comando read-tree"
+msgstr "read-tree falhou"
-#: builtin/merge.c:400
-#, fuzzy
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
-msgstr " (nada para esmagar)"
+msgstr "Já está atualizado. (nada para esmagar)"
-#: builtin/merge.c:414
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
-msgstr "Squash commit -- deixar HEAD por atualizar\n"
+msgstr "Esmagar memória -- deixando HEAD por atualizar\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
-msgstr "Mensagem de junção nenhuma -- deixar HEAD por atualizar\n"
+msgstr "Mensagem de junção nenhuma -- deixando HEAD por atualizar\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
-msgstr "'%s' aponta para commit nenhum"
+msgstr "'%s' aponta para memória nenhuma"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
+msgstr "String de branch.%s.mergeoptions incorreta: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "Lidando nada além da junção de duas heads."
-#: builtin/merge.c:742
+#: builtin/merge.c:745
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opção desconhecida de merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "opção de estratégia desconhecida: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "incapaz escrever %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "Incapaz ler de '%s'"
-#: builtin/merge.c:822
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-"Usa 'git commit' para completar a junção. Committando junção nenhuma.\n"
+"Memorizando junção nenhuma; usa 'git commit' para completar a junção.\n"
-#: builtin/merge.c:828
-#, fuzzy
+#: builtin/merge.c:831
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
msgstr ""
-"Introduza uma mensagem de commit, explicando o porquê desta integração\n"
-"ser necessária, especialmente se é merge de updated stream para topic "
-"branch.\n"
+"Por favor, introduz uma mensagem de memória, explicando porque esta junção\n"
+"é necessária, especialmente se junta um upstream atualizado num ramo-"
+"tópico.\n"
"\n"
-#: builtin/merge.c:833
-#, fuzzy
-msgid "An empty message aborts the commit.\n"
-msgstr "Uma mensagem vazia aborta o commit.\n"
-
#: builtin/merge.c:836
-#, fuzzy, c-format
+msgid "An empty message aborts the commit.\n"
+msgstr "Uma mensagem vazia aborta a memorização.\n"
+
+#: builtin/merge.c:839
+#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
-"Linhas começadas com '%c' são ignoradas, e uma messagem vazia aborta\n"
-"o commit.\n"
+"Linhas começadas com '%c' são ignoradas, e uma mensagem vazia aborta\n"
+"a memorização.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:900
msgid "Empty commit message."
-msgstr "Mensagem commit vazia."
+msgstr "Mensagem de memória vazia."
-#: builtin/merge.c:904
+#: builtin/merge.c:915
#, c-format
msgid "Wonderful.\n"
msgstr "Maravilhoso.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:976
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-"Merge automático falhou; resolve os conflitos e depois podes commitar o "
-"resultado.\n"
+"Junção automática falhou; conserta os conflitos e depois podes memorizar\n"
+"o resultado.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1015
msgid "No current branch."
msgstr "Nenhum ramo atual."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1017
msgid "No remote for the current branch."
-msgstr "Ŕamo atual de remoto nenhum."
+msgstr "Remoto nenhum para ramo atual."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1019
msgid "No default upstream defined for the current branch."
-msgstr "Ramo atual sem upstream default definido."
+msgstr "Ramo atual sem predefinição de upstream definida."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1024
#, c-format
msgid "No remote-tracking branch for %s from %s"
-msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s"
+msgstr "Nenhum ramo de monitorização remoto para %s de %s"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1081
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor '%s' incorreto no ambiente '%s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1183
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "podemos juntar em %s nenhum(a): %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1217
msgid "not something we can merge"
msgstr "podemos juntar nada"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1330
msgid "--abort expects no arguments"
-msgstr "--abort supõe argumento nenhum"
+msgstr "--abort espera argumento nenhum"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1334
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Há junção nenhuma para abortar (MERGE_HEAD faltando)."
-#: builtin/merge.c:1339
-#, fuzzy
-msgid "--quit expects no arguments"
-msgstr "--abort supõe argumento nenhum"
-
#: builtin/merge.c:1352
-msgid "--continue expects no arguments"
-msgstr "--continue supõe argumento nenhum"
+msgid "--quit expects no arguments"
+msgstr "--quit espera argumento nenhum"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1365
+msgid "--continue expects no arguments"
+msgstr "--continue espera argumento nenhum"
+
+#: builtin/merge.c:1369
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Há junção nenhuma em curso (MERGE_HEAD faltando)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1385
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
"Junção está por concluir (MERGE_HEAD existe).\n"
-"Por favor, faz commit das tuas alterações antes de juntar."
+"Por favor, memoriza tuas alterações antes de juntar."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1392
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-"Cherry-pick por concluir (existe CHERRY_PICK_HEAD).\n"
-"Por favor, memorize suas alterações antes de juntar."
+"Apanha por concluir (existe CHERRY_PICK_HEAD).\n"
+"Por favor, memoriza tuas alterações antes de juntares."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1395
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "Cherry-pick por concluir (existe CHERRY_PICK_HEAD)."
+msgstr "Apanha por concluir (existe CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1396
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Impossível combinar --squash com --no-ff."
-
-#: builtin/merge.c:1398
-#, fuzzy
-msgid "You cannot combine --squash with --commit."
-msgstr "Impossível combinar --squash com --commit."
-
-#: builtin/merge.c:1414
+#: builtin/merge.c:1427
msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "Especificado commit nenhum e merge.defaultToUpstream indefinido."
+msgstr "Especificada memória nenhuma e merge.defaultToUpstream indefinido."
-#: builtin/merge.c:1431
+#: builtin/merge.c:1444
msgid "Squash commit into empty head not supported yet"
-msgstr "Esmagar commit para uma cabeça vazia por enquanto tem suporte nenhum"
+msgstr "Esmagar memória para uma cabeça vazia por enquanto é insustentado"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1446
msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "Non-fast-forward commit para uma cabeça vazia faz sentido nenhum"
+msgstr ""
+"Memorização diferente de avanço para uma cabeça vazia faz sentido nenhum"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1451
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nada que se pode juntar"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1453
msgid "Can merge only exactly one commit into empty head"
-msgstr "Só se pode integrar exatamente um commit numa cabeça vazia"
+msgstr "Podendo apenas juntar exatamente uma memória para uma cabeça vazia"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1540
msgid "refusing to merge unrelated histories"
msgstr "recusando juntar históricos diferentes"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1559
#, c-format
msgid "Updating %s..%s\n"
msgstr "Atualizando %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1606
#, c-format
msgid "Trying really trivial in-index merge...\n"
-msgstr "A tentar integração mesmo trivial no interior do índice...\n"
+msgstr "Tentando junção mesmo trivial no interior de cenário...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1613
#, c-format
msgid "Nope.\n"
-msgstr "Nada.\n"
+msgstr "Népia.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "Impossível fazer fast-forward, abortando."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1671 builtin/merge.c:1737
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Recuando a árvore para estado pristino...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1675
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Tentando estratégia merge %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1727
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "A junção lidou com estratégia de junção nenhuma.\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1729
#, c-format
msgid "Merge with strategy %s failed.\n"
-msgstr "Falha ao integrar com a estratégia %s.\n"
+msgstr "Falhou junção com estratégia %s.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1739
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Usando estratégia %s para preparar resolução manual.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1753
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr "Merge automática correu bem; parei antes de commitar como pedido\n"
-
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr ""
+msgstr "Junção automática correu bem; parei antes de memorizar, como pedido\n"
#: builtin/mktag.c:27
-#, fuzzy, c-format
+#, c-format
msgid "warning: tag input does not pass fsck: %s"
-msgstr "aviso: `:include:` insustentado: %s\n"
+msgstr "aviso: entrada de etiqueta falha na verificação fsck: %s"
#: builtin/mktag.c:38
#, c-format
@@ -18260,31 +18634,26 @@
msgstr ""
#: builtin/mktag.c:56
-#, fuzzy, c-format
+#, c-format
msgid "could not read tagged object '%s'"
msgstr "incapaz ler objeto %s"
#: builtin/mktag.c:59
-#, fuzzy, c-format
+#, c-format
msgid "object '%s' tagged as '%s', but is a '%s' type"
-msgstr "objeto %s é %s, é %s nenhum(a)"
+msgstr "objeto '%s' etiquetado como '%s', mas é de tipo '%s'"
#: builtin/mktag.c:97
msgid "tag on stdin did not pass our strict fsck check"
msgstr ""
#: builtin/mktag.c:100
-#, fuzzy
msgid "tag on stdin did not refer to a valid object"
-msgstr "'%s' aponta para objeto válido nenhum!"
+msgstr "etiqueta em entrada padrão referiu-se a objeto inválido"
#: builtin/mktag.c:103 builtin/tag.c:243
msgid "unable to write tag file"
-msgstr "incapaz escrever ficheiro de tag"
-
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
+msgstr "incapaz escrever ficheiro de etiqueta"
#: builtin/mktree.c:154
msgid "input is NUL terminated"
@@ -18299,48 +18668,55 @@
msgstr "permitir a criação de mais do que uma árvore"
#: builtin/multi-pack-index.c:10
-#, fuzzy
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<opções>] write [--preferred-pack=<pacote>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<opções>] write [--preferred-pack=<pacote>][--refs-"
+"snapshot=<caminho>]"
-#: builtin/multi-pack-index.c:13
-#, fuzzy
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<opções>] verify"
-#: builtin/multi-pack-index.c:16
-#, fuzzy
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<opções>] expire"
-#: builtin/multi-pack-index.c:19
-#, fuzzy
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<opções>] repack [--batch-size=<tamanho>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr ""
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr ""
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr ""
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "escrita multi-pack em cenário contendo apenas cenários dados"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr ""
+
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr ""
-#: builtin/multi-pack-index.c:179
-#, fuzzy, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "subcomando desconhecido: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<opções>] <origem>... <destino>"
@@ -18348,199 +18724,193 @@
#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
-msgstr "A pasta %s está no index porém submódulo nenhum?"
+msgstr "A pasta %s está em cenário porém submódulo nenhum?"
#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
+"Por favor encena tuas alterações em .gitmodules ou esconde-as para prosseguir"
#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
-msgstr "%.*s está no índice"
+msgstr "%.*s está no cenário"
#: builtin/mv.c:125
msgid "force move/rename even if target exists"
-msgstr "forçar mover/mudar o nome mesmo que o destino exista"
+msgstr "forçar mover/renomear mesmo se destino existir"
#: builtin/mv.c:127
msgid "skip move/rename errors"
-msgstr "ignorar erros ao mover/mudar o nome"
+msgstr "ignorar erros de mover/renomear"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destino '%s' é pasta nenhuma"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
-msgstr "A verificar a mudança de nome de '%s' para '%s'\n"
+msgstr "Verificando renomeação de '%s' para '%s'\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "origem incorreta"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "incapaz mover pasta para si mesma"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "incapaz mover pasta para um ficheiro"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "pasta de origem está vazia"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr ""
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
-msgstr ""
+msgstr "conflituoso"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "o destino já existe"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "a substituir '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Incapaz subscrever"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "múltiplas origens para o mesmo destino"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "pasta de destino é inexistente"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, origem=%s, destino=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "A mudar de nome de %s para %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
#, c-format
msgid "renaming '%s' failed"
msgstr "renomear '%s' falhou"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:524
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opções>] <commit>..."
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:525
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opções>] --all"
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<opções>] --stdin"
+#: builtin/name-rev.c:526
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [<opções>] --annotate-stdin"
-#: builtin/name-rev.c:524
-#, fuzzy
+#: builtin/name-rev.c:583
msgid "print only ref-based names (no object names)"
-msgstr "imprimir apenas os ramos do objeto"
+msgstr "imprimir apenas nomes baseados em ref (nomes de objeto nenhum)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:584
msgid "only use tags to name the commits"
-msgstr "usar apenas tags para designar commits"
+msgstr "usar apenas etiquetas para designar memórias"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:586
msgid "only use refs matching <pattern>"
-msgstr "usar apenas referência que correspondam ao <padrão>"
+msgstr "usar apenas refs que correspondam ao <padrão>"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:588
msgid "ignore refs matching <pattern>"
-msgstr "ignorar referências que correspondam ao <padrão>"
+msgstr "ignorar refs que correspondam ao <padrão>"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:590
msgid "list all commits reachable from all refs"
-msgstr "listar todos os commits alcançáveis a partir de todas as referências"
+msgstr "listar todas as memórias alcançáveis de todas as refs"
-#: builtin/name-rev.c:532
-msgid "read from stdin"
-msgstr "ler da entrada padrão"
+#: builtin/name-rev.c:591
+msgid "deprecated: use annotate-stdin instead"
+msgstr ""
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:592
+msgid "annotate text from stdin"
+msgstr "anotar texto de entrada padrão"
+
+#: builtin/name-rev.c:593
msgid "allow to print `undefined` names (default)"
msgstr "permitir imprimir nomes 'indefinidos' (predefinição)"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:599
msgid "dereference tags in the input (internal use)"
-msgstr "desreferenciar tags na entrada (uso interno)"
+msgstr "desreferenciar etiquetas na entrada (uso interno)"
#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
-msgstr "git notes [--ref <notes-ref>] [list [<objeto>]]"
+msgstr "git notes [--ref <notas-ref>] [list [<objeto>]]"
#: builtin/notes.c:29
msgid ""
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
msgstr ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F "
+"git notes [--ref <notas-ref>] add [-f] [--allow-empty] [-m <msg> | -F "
"<ficheiro> | (-c | -C) <objeto>] [<objeto>]"
#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <notes-ref>] copy [-f] <de-objeto> <para-objeto>"
+msgstr "git notes [--ref <notas-ref>] copy [-f] <de-objeto> <para-objeto>"
#: builtin/notes.c:31
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
msgstr ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F "
+"git notes [--ref <notas-ref>] append [--allow-empty] [-m <msg> | -F "
"<ficheiro> | (-c | -C) <objeto>] [<objeto>]"
#: builtin/notes.c:32
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr "git notes [--ref <notes-ref>] edit [--allow-empty] [<objeto>]"
+msgstr "git notes [--ref <notas-ref>] edit [--allow-empty] [<objeto>]"
#: builtin/notes.c:33
msgid "git notes [--ref <notes-ref>] show [<object>]"
-msgstr "git notes [--ref <notes-ref>] show [<objeto>]"
+msgstr "git notes [--ref <notas-ref>] show [<objeto>]"
#: builtin/notes.c:34
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <estratégia>] <notes-ref>"
-
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
+"git notes [--ref <notas-ref>] merge [-v | -q] [-s <estratégia>] <notas-ref>"
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
-msgstr "git notes [--ref <notes-ref>] remove [<objeto>...]"
+msgstr "git notes [--ref <notas-ref>] remove [<objeto>...]"
#: builtin/notes.c:38
-#, fuzzy
msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
-msgstr "git notes [--ref <notes-ref>] prune [-n | -v]"
+msgstr "git notes [--ref <notas-ref>] prune [-n] [-v]"
#: builtin/notes.c:39
msgid "git notes [--ref <notes-ref>] get-ref"
-msgstr "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <notas-ref>] get-ref"
#: builtin/notes.c:44
msgid "git notes [list [<object>]]"
@@ -18572,7 +18942,7 @@
#: builtin/notes.c:75
msgid "git notes merge [<options>] <notes-ref>"
-msgstr "git notes merge [<opções>] <notes-ref>"
+msgstr "git notes merge [<opções>] <notas-ref>"
#: builtin/notes.c:76
msgid "git notes merge --commit [<options>]"
@@ -18590,118 +18960,107 @@
msgid "git notes prune [<options>]"
msgstr "git notes prune [<opções>]"
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "Escreva/edite as notas do seguinte objeto:"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "incapaz iniciar 'show' para objeto '%s'"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "incapaz ler output de 'show'"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "falha ao concluir o comando 'show' sobre o objeto '%s'"
-#: builtin/notes.c:197
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr "forneça o conteúdo da nota usando a opção -m ou -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "incapaz escrever para objeto de nota"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "o conteúdo da nota foi colocado em %s"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:582
#, c-format
msgid "could not open or read '%s'"
msgstr "incapaz abrir ou ler '%s'"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
-msgstr "falha ao resolver '%s' como uma referência válida."
+msgstr "falhou resolver '%s' como uma ref válida."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
-msgstr "falha ao ler o objeto '%s'."
+msgstr "falhou ler objeto '%s'."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
-msgstr "incapaz ler dados de nota, de objeto não-blob '%s'."
+msgstr "incapaz ler dados de nota, de não-objeto-blob '%s'."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "linha de entrada malformada: '%s'."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
-msgstr "falha ao copiar notas de '%s' para '%s'"
+msgstr "falhou copiar notas de '%s' para '%s'"
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "foi recusado efetuar %s de notas em %s (fora de refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
-msgid "too many arguments"
-msgstr ""
-
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "Encontrada nota nenhuma para objeto %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "conteúdo da nota sob a forma de cadeia de caracteres"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "conteúdo da nota de um ficheiro"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "reutilizar e editar o objeto de nota especificado"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
-msgstr "reutilizar o objeto de nota especificado"
+msgstr "reutilizar objeto de nota especificado"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "permitir guardar uma nota vazia"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "substituir notas existentes"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18710,29 +19069,29 @@
"Incapaz adicionar notas. Encontrei notas existentes para objeto %s. Usa '-f' "
"para subscrever notas existentes"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Gravando por cima, notas existentes para objeto %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "Removendo nota para objeto %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "ler objetos de stdin"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "carregar configuração de reescrita do <comando> (implica --stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr ""
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18741,66 +19100,66 @@
"Incapaz copiar notas. Encontrei Notas existentes para objeto %s. Usa '-f' "
"para subscrever notas existentes"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "faltando notas para objeto fonte %s. Incapaz copiar."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
"As opções -m/-F/-c/-C são obsoletas no subcomando 'edit'.\n"
-"Use 'git notes add -f -m/-F/-c/-C' em seu lugar.\n"
+"Use 'git notes add -f -m/-F/-c/-C' invés.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "falha ao eliminar a referência NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "falha ao eliminar a referência NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
-msgstr "falha ao remover a árvore de trabalho de 'git notes merge'"
+msgstr "falha ao remover árvore-trabalho de 'git notes merge'"
+
+#: builtin/notes.c:720
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "falha ao ler ref NOTES_MERGE_PARTIAL"
#: builtin/notes.c:722
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
-msgstr "falha ao ler referência NOTES_MERGE_PARTIAL"
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "incapaz encontrar memória a partir de NOTES_MERGE_PARTIAL."
#: builtin/notes.c:724
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
-msgstr "incapaz encontrar commit a partir de NOTES_MERGE_PARTIAL."
-
-#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
-msgstr "incapaz processar commit a partir de NOTES_MERGE_PARTIAL."
+msgstr "incapaz processar memória a partir de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "falha ao resolver NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
-msgstr "falha ao finalizar integração de notas"
+msgstr "falhou finalizar junção de notas"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
-msgstr "estratégia de integração de notas %s desconhecida"
+msgstr "estratégia de junção de notas %s desconhecida"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Opções gerais"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
-msgstr "Opções de integração"
+msgstr "Opções de junção"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18808,91 +19167,91 @@
"resolver conflitos nas notas usando a estratégia indicada (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Memorizando notas por juntar"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
-msgstr "concluir junção de notas, memorizando notas por juntar"
+msgstr "finaliza junção de notas, memorizando notas por juntar"
+
+#: builtin/notes.c:792
+msgid "Aborting notes merge resolution"
+msgstr "Abortando resolução de junção das notas"
#: builtin/notes.c:794
-msgid "Aborting notes merge resolution"
-msgstr "A abortar resolução de integração das notas"
-
-#: builtin/notes.c:796
msgid "abort notes merge"
-msgstr "abortar integração das notas"
+msgstr "abortar junção das notas"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "incapaz misturar --commit, --abort ou -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
-msgstr "tem de especificar uma referência de notas para integrar"
+msgstr "tens de especificar uma ref de notas para juntar"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy desconhecida: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
-msgstr "uma integração das notas em %s já está em curso em %s"
-
-#: builtin/notes.c:876
-#, c-format
-msgid "failed to store link to current notes ref (%s)"
-msgstr "falha ao guardar ligação à referência de notas atual (%s)"
+msgstr "uma junção das notas para %s já está em curso em %s"
#: builtin/notes.c:878
#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "falhou ao guardar ligação à ref de notas atual (%s)"
+
+#: builtin/notes.c:880
+#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"'git notes merge --commit', or abort the merge with 'git notes merge --"
"abort'.\n"
msgstr ""
-"A integração automática de notas falhou. Corrija os conflitos em %s e "
-"submeta o resultado com 'git notes merge --commit' ou aborte a integração "
-"com 'git notes merge --abort'.\n"
+"Junção automática de notas falhou. Conserta os conflitos em %s e memoriza o "
+"resultado com 'git notes merge --commit', ou aborta a junção com 'git notes "
+"merge --abort'.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:595
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Falha ao resolver '%s' numa referência válida."
-#: builtin/notes.c:900
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "O objeto %s tem nota nenhuma\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "apenas é erro se remover nota existente"
-#: builtin/notes.c:915
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "ler nome dos objetos da entrada padrão"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "remover nada, apenas mostrar"
-#: builtin/notes.c:955
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "reportar notas podadas"
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "usar notas de <notes-ref>"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1036 builtin/stash.c:1802
#, c-format
msgid "unknown subcommand: %s"
msgstr "subcomando desconhecido: %s"
@@ -18911,410 +19270,393 @@
"git pack-objects [<opções>...] <nome-base> [< <lista-referências> | < <lista-"
"objetos>]"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:570
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
"pack %s"
msgstr ""
-#: builtin/pack-objects.c:580
+#: builtin/pack-objects.c:578
#, c-format
msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/pack-objects.c:591
+#: builtin/pack-objects.c:589
#, c-format
msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/pack-objects.c:722
-#, fuzzy, c-format
+#: builtin/pack-objects.c:720
+#, c-format
msgid "recursive delta detected for object %s"
msgstr "delta recursivo detetado para objeto %s"
-#: builtin/pack-objects.c:941
+#: builtin/pack-objects.c:939
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1036
-#, fuzzy, c-format
+#: builtin/pack-objects.c:1034
+#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
-msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s"
+msgstr "esperado objeto no offset %<PRIuMAX> em pacote %s"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1158
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"a desativar escrita de mapa de bits, os pacotes são divididos devido a pack."
"packSizeLimit"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1171
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1243 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "falhou stat a %s"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1276
+msgid "failed to write bitmap index"
+msgstr "falhou escrever índice de bitmap"
+
+#: builtin/pack-objects.c:1302
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1544
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"desativando escrita bitmap, visto a incapacidade de alguns objetos serem "
"compactados"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1992
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1980
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2001
+#, c-format
msgid "delta base offset out of bound for %s"
msgstr "offset de base delta está fora do limite para %s"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2282
msgid "Counting objects"
msgstr "A contar objetos"
-#: builtin/pack-objects.c:2426
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2447
+#, c-format
msgid "unable to parse object header of %s"
msgstr "incapaz processar cabeçalho de objeto de %s"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
+#: builtin/pack-objects.c:2543
+#, c-format
msgid "object %s cannot be read"
msgstr "objeto %s incapaz ser lido"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2557
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2872
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2990
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3011
+#, c-format
msgid "unable to pack objects reachable from tag %s"
-msgstr "incluir objetos alcançáveis a partir de qualquer referência"
+msgstr "incapaz de empacotar objetos alcançáveis a partir de etiqueta %s"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3097
msgid "Compressing objects"
-msgstr "A comprimir objetos"
+msgstr "Comprimindo objetos"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3103
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3182
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
"hash> <uri>' (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3185
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:3199
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3220
+#, c-format
msgid "could not get type of object %s in pack %s"
-msgstr "incapaz obter tipo de objeto %s"
+msgstr "incapaz obter tipo de objeto %s em pacote %s"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
+#: builtin/pack-objects.c:3373
+#, c-format
msgid "could not find pack '%s'"
-msgstr "incapaz acabar '%s'"
+msgstr "incapaz encontrar pacote '%s'"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3416
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3422
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3482
-msgid "invalid value for --missing"
-msgstr ""
-
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
-#, fuzzy
+#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
msgid "cannot open pack index"
-msgstr "incapaz abrir index pack"
+msgstr "incapaz abrir índice de pacote"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3549
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3658
-#, fuzzy
+#: builtin/pack-objects.c:3635
msgid "unable to force loose object"
msgstr "incapaz forçar objeto solto"
-#: builtin/pack-objects.c:3788
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3763
+#, c-format
msgid "not a rev '%s'"
msgstr "rev '%s' nenhum"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
+#, c-format
msgid "bad revision '%s'"
msgstr "revisão '%s' incorreto"
-#: builtin/pack-objects.c:3819
-#, fuzzy
+#: builtin/pack-objects.c:3794
msgid "unable to add recent objects"
msgstr "incapaz adicionar objetos recentes"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3847
#, c-format
msgid "unsupported index version %s"
-msgstr "versão de index %s insustentada"
+msgstr "versão de cenário %s insustentada"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3851
#, c-format
msgid "bad index version '%s'"
-msgstr "versão de índice '%s' incorreta"
+msgstr "versão de cenário '%s' inválida"
-#: builtin/pack-objects.c:3915
-#, fuzzy
+#: builtin/pack-objects.c:3907
msgid "<version>[,<offset>]"
msgstr "versão[,offset]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3908
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escrever o ficheiro de índice do pacote na versão de formato especificada"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3911
msgid "maximum size of each output pack file"
-msgstr "tamanho máximo de cada ficheiro de pacote gerado"
+msgstr "tamanho máximo de cada saída de ficheiro-pacote"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3913
msgid "ignore borrowed objects from alternate object store"
-msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes"
+msgstr "ignorar objetos emprestados do arquivo de objetos alternativos"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3915
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3917
msgid "limit pack window by objects"
msgstr "limitar a janela de compactação por objetos"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3919
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limitar a janela de compactação por memória em adição ao limite por objetos"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3921
msgid "maximum length of delta chain allowed in the resulting pack"
-msgstr "tamanho máximo de cadeias delta permitidas no pacote resultante"
+msgstr "tamanho máximo de série delta permitido no pacote resultante"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3923
msgid "reuse existing deltas"
msgstr "reutilizar deltas existentes"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3925
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3927
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3929
msgid "use threads when searching for best delta matches"
msgstr "usar threads ao procurar pela melhor correspondência delta"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3931
msgid "do not create an empty pack output"
msgstr "criar output de pack vazio nenhum"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3933
msgid "read revision arguments from standard input"
msgstr "ler argumentos de revisão da entrada padrão"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3935
msgid "limit the objects to those that are not yet packed"
msgstr "restringir-se aos objetos que ainda estão por compactar"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3938
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcançáveis a partir de qualquer referência"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3941
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referenciados por entradas do reflog"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3944
msgid "include objects referred to by the index"
-msgstr "incluir objetos referenciados pelo índice"
+msgstr "incluir objetos referenciados pelo cenário"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3947
msgid "read packs from stdin"
msgstr ""
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3949
msgid "output pack to stdout"
msgstr "gerar pacote para a saída padrão"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3951
msgid "include tag objects that refer to objects to be packed"
-msgstr "incluir objetos tag que refiram objetos a compactar"
+msgstr "incluir objetos-etiqueta que refiram objetos a empacotar"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3953
msgid "keep unreachable objects"
msgstr "manter objetos inalcançáveis"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3955
msgid "pack loose unreachable objects"
msgstr "empacotar objetos soltos inalcançáveis"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3957
msgid "unpack unreachable objects newer than <time>"
msgstr "descompactar objetos inalcançáveis mais recentes que <tempo>"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3960
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3962
msgid "create thin packs"
msgstr "criar pacotes finos"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3964
msgid "create packs suitable for shallow fetches"
-msgstr "criar pacotes adequados para obter em repositórios pouco profundos"
+msgstr "criar pacotes adequados para buscas superficiais"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3966
msgid "ignore packs that have companion .keep file"
msgstr "ignorar pacotes que tenham um ficheiro .keep"
-#: builtin/pack-objects.c:3976
-#, fuzzy
+#: builtin/pack-objects.c:3968
msgid "ignore this pack"
-msgstr "usar pacote fino"
+msgstr "ignorar este pacote"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3970
msgid "pack compression level"
-msgstr "nível de compactação do pacote"
+msgstr "nível de compressão de pacote"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3972
msgid "do not hide commits by grafts"
-msgstr "esconder commits por enxertos nenhuns"
+msgstr "esconder nenhumas memórias por enxertos"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3974
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-"usar um índice de mapa de bits se disponível, para acelerar a contagem de "
-"objetos"
+"usar um índice de bitmap se disponível, para acelerar a contagem de objetos"
+
+#: builtin/pack-objects.c:3976
+msgid "write a bitmap index together with the pack index"
+msgstr "escrever um índice de bitmap juntamente com o índice do pacote"
+
+#: builtin/pack-objects.c:3980
+msgid "write a bitmap index if possible"
+msgstr "escrever um índice de bitmap se possível"
#: builtin/pack-objects.c:3984
-msgid "write a bitmap index together with the pack index"
-msgstr "escrever um índice de mapa de bits juntamente com o índice do pacote"
-
-#: builtin/pack-objects.c:3988
-#, fuzzy
-msgid "write a bitmap index if possible"
-msgstr "escrever índice de mapa de bits"
-
-#: builtin/pack-objects.c:3992
-#, fuzzy
msgid "handling for missing objects"
msgstr "lidando para objetos que faltem"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3987
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3997
-#, fuzzy
+#: builtin/pack-objects.c:3989
msgid "respect islands during delta compression"
-msgstr "dimensão da janela usada em compressão de deltas"
+msgstr "respeitar ilhas durante compressão de delta"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3991
msgid "protocol"
msgstr ""
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3992
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4027
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
-msgstr ""
+msgstr "profundidade de série delta %d é demasiado profunda, forçando %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4032
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4088
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4090
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:4101
-#, fuzzy
+#: builtin/pack-objects.c:4095
msgid "--thin cannot be used to build an indexable pack"
-msgstr "incapaz usar --thin para construir pack indexável"
+msgstr "incapaz usar --thin para construir pacote indexável"
#: builtin/pack-objects.c:4104
-#, fuzzy
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable e -A são incompatíveis"
+msgid "cannot use --filter without --stdout"
+msgstr "apenas podes usar --filter com --stdout"
+
+#: builtin/pack-objects.c:4106
+msgid "cannot use --filter with --stdin-packs"
+msgstr "incapaz usar --filter com --stdin-packs"
#: builtin/pack-objects.c:4110
-#, fuzzy
-msgid "cannot use --filter without --stdout"
-msgstr "usar --filter com --stdout"
-
-#: builtin/pack-objects.c:4112
-#, fuzzy
-msgid "cannot use --filter with --stdin-packs"
-msgstr "usar --filter com --stdout"
-
-#: builtin/pack-objects.c:4116
-#, fuzzy
msgid "cannot use internal rev list with --stdin-packs"
-msgstr "incapaz especificar pathnames com --stdin"
+msgstr ""
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4169
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4210
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19342,91 +19684,78 @@
msgid "prune loose refs (default)"
msgstr "podar refs soltas (predefinição)"
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
#: builtin/prune.c:14
-#, fuzzy
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <tempo>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <tempo>] [--] [<cabeça>...]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "apresentar objetos eliminados"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
-msgstr "expirar objetos mais antigos que <tempo>"
+msgstr "expirar objetos mais velhos que <tempo>"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/prune.c:152
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "incapaz podar num repo de precious-objects"
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Valor inválido de %s: %s"
-
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr "git pull [<opções>] [<repositório> [<espetro-ref>...]]"
-#: builtin/pull.c:123
-#, fuzzy
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
-msgstr "controlar a obtenção recursiva de submódulos"
+msgstr "controlo para buscar recursivo de submódulos"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
-msgstr "Opções relativas a integração"
+msgstr "Opções relativas a fazer junção"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
-msgstr "incorporar alterações por rebase em vez de integrar"
+msgstr "incorporar alterações fazendo rebase em vez de junção"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
-msgstr "permitir avanço rápido"
+msgstr "permitir avanço"
-#: builtin/pull.c:167 parse-options.h:340
-#, fuzzy
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "uso controlado de ganchos pre-merge-commit e commit-msg"
+
+#: builtin/pull.c:171 parse-options.h:371
msgid "automatically stash/stash pop before and after"
-msgstr "empilhar/desempilhar automaticamente antes de depois de rebase"
+msgstr "fazer stash/stash pop automaticamente antes e depois de"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
-msgstr "Opções relacionadas com obtenção de objetos"
+msgstr "Opções relacionadas com buscas"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
-msgstr "forçar a substituição do ramo local"
+msgstr "forçar sobrescrever ramo local"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "número de submódulos com pull em paralelo"
-#: builtin/pull.c:317
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "Valor inválido de pull.ff: %s"
-
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "As refs que obteste tem candidato nenhum para onde rebasear."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "As refs que obteste tem candidato nenhum para junção."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19434,7 +19763,7 @@
"Normalmente isto significa que forneceste um wildcard especificador de ref\n"
"que tem correspondência nenhuma no lado do remoto."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19443,69 +19772,70 @@
msgstr ""
"Pediste para agarrar remoto '%s', mas falta especificar um ramo.\n"
"Visto que o remoto configurado como predefinido para o ramo atual é\n"
-"outro, deves de especificar um ramo na linha de comandos."
+"outro, tens de especificar um ramo na linha de comandos."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:978
msgid "You are not currently on a branch."
msgstr "Atualmente estás em ramo nenhum."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Especifique o ramo sobre o qual pretende realizar rebase."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
-msgstr "Especifique o ramo com o qual pretende integrar."
+msgstr "Por favor especifica para qual ramo queres juntar."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
-msgstr "Consulte git-pull(1) para obter mais detalhes."
+msgstr "Vê git-pull(1) para detalhes."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:984
msgid "<remote>"
msgstr "<remoto>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:374
msgid "<branch>"
msgstr "<ramo>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:976
msgid "There is no tracking information for the current branch."
-msgstr "O ramo atual tem informação de tracking nenhuma."
+msgstr "O ramo atual tem informação de monitorização nenhuma."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-"Se deseja definir o ramo que deve ser seguido por este ramo, pode fazê-lo "
+"Se queres definir informação de monitorização para este ramo, pode fazê-lo "
"com:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
-"Tua configuração indica para juntar com ref '%s'\n"
-"a partir do remoto, mas essa ref está por buscar."
+"Tua configuração indica para, a partir do remoto, juntar\n"
+"com ref '%s', mas apenas outras refs foram buscadas."
-#: builtin/pull.c:596
-#, fuzzy, c-format
+#: builtin/pull.c:600
+#, c-format
msgid "unable to access commit %s"
-msgstr "incapaz acessar commit %s"
+msgstr "incapaz acessar memória %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
-msgstr "ignorado --verify-signatures para rebase"
+msgstr "ignorando --verify-signatures para rebase"
-#: builtin/pull.c:930
+#: builtin/pull.c:969
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
@@ -19516,30 +19846,31 @@
"invocation.\n"
msgstr ""
-#: builtin/pull.c:990
+#: builtin/pull.c:1047
msgid "Updating an unborn branch with changes added to the index."
-msgstr "Atualizando um ramo por nascer com alterações adicionadas ao índex."
+msgstr ""
+"Atualizando um ramo por nascer com as alterações adicionadas ao cenário."
-#: builtin/pull.c:994
+#: builtin/pull.c:1051
msgid "pull with rebase"
msgstr "pull com rebase"
-#: builtin/pull.c:995
+#: builtin/pull.c:1052
msgid "please commit or stash them."
-msgstr "submeta ou esconda-as."
+msgstr "por favor, memoriza ou esconde-as."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1077
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fast-forwarding your working tree from\n"
"commit %s."
msgstr ""
-"o fetch atualizou a cabeça do ramo atual.\n"
-"a avançar a árvore de trabalho a partir do\n"
-"commit %s."
+"a busca atualizou a cabeça de ramo atual.\n"
+"avançando tua árvore-trabalho da memória\n"
+"%s."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1083
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19549,36 +19880,44 @@
"$ git reset --hard\n"
"to recover."
msgstr ""
-"Incapaz de fast-forward a tua working tree.\n"
-"Após confirmares que guardaste algo precioso do resultado de\n"
+"Incapaz de avançar tua árvore-trabalho.\n"
+"Após confirmares que guardaste algo precioso da saída de\n"
"$ git diff %s\n"
-"execute\n"
+"executa\n"
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1098
msgid "Cannot merge multiple branches into empty head."
-msgstr "Incapaz de juntar ramos múltiplos para head vazia."
+msgstr "Incapaz de juntar ramos múltiplos para cabeça vazia."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1103
msgid "Cannot rebase onto multiple branches."
msgstr "Incapaz de rebasear sobre ramos múltiplos."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1105
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Incapaz de avançar para ramos múltiplos."
+
+#: builtin/pull.c:1120
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Precisas de especificar como reconciliar ramos divergentes."
+
+#: builtin/pull.c:1134
msgid "cannot rebase with locally recorded submodule modifications"
-msgstr ""
+msgstr "incapaz rebasear com modificações locais guardadas no submódulo"
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr "git push [<opções>] [<repositório> [<espetro-ref>...]]"
#: builtin/push.c:111
msgid "tag shorthand without <tag>"
-msgstr "forma abreviada de tag sem <tag>"
+msgstr "forma abreviada de etiqueta sem <etiqueta>"
#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
-msgstr "--delete só aceita nomes simples como referências de destino"
+msgstr "--delete só aceita nomes de ref simples como destino"
#: builtin/push.c:164
msgid ""
@@ -19590,7 +19929,7 @@
"config'."
#: builtin/push.c:167
-#, fuzzy, c-format
+#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
"the name of your current branch. To push to the upstream branch\n"
@@ -19603,8 +19942,8 @@
" git push %s HEAD\n"
"%s"
msgstr ""
-"Ramo upstream do ramo atual corresponde com nome ramo atual nenhum.\n"
-"Para atirar para ramo upstream do remoto, usa\n"
+"Ramo upstream de ramo atual corresponde com nenhum nome de ramo atual.\n"
+"Para atirar para o ramo upstream no remoto, usa\n"
"\n"
" git push %s HEAD:%s\n"
"\n"
@@ -19623,7 +19962,7 @@
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
"Atualmente estás em ramo nenhum.\n"
-"Para atirar a história que leva ao estado atual (HEAD solta), usa\n"
+"Para atirar a história que leva ao estado atual (HEAD desanexada), usa\n"
"\n"
" git push %s HEAD:<nome-de-ramo-remoto>\n"
@@ -19643,7 +19982,7 @@
#: builtin/push.c:199
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr "O ramo atual %s tem múltiplos ramos a montante, publicação recusada."
+msgstr "O ramo atual %s tem múltiplos ramos upstream, recusando atirar."
#: builtin/push.c:217
msgid ""
@@ -19659,7 +19998,7 @@
msgstr ""
"Estás atirando para remoto '%s', que é nenhum upstream do teu\n"
"ramo atual '%s', sem dizer-me o que atirar para atualizar\n"
-"um qualquer ramo remoto."
+"qual ramo remoto."
#: builtin/push.c:258
msgid ""
@@ -19668,10 +20007,10 @@
"'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-"As atualizações foram rejeitadas porque a ponta do ramo atual está atrasada\n"
-"em relação ao homólogo remoto. Integre as alterações remotas (e.g.\n"
-"'git pull ...') antes de publicar de novo.\n"
-"Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes."
+"Atualizações foram rejeitadas porque a ponta do ramo atual está atrasada\n"
+"em relação ao homólogo remoto. Integra as alterações remotas (e.g.\n"
+"'git pull ...') antes de atirares novamente.\n"
+"Para detalhes, vê a 'Note about fast-forwards' em 'git push --help'."
#: builtin/push.c:264
msgid ""
@@ -19680,10 +20019,10 @@
"(e.g. 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-"As atualizações foram rejeitadas porque a ponta do ramo atual está atrasada\n"
-"em relação ao homólogo remoto. Extraia o ramo e integre\n"
-"as alterações remotas (e.g. 'git pull ...') antes de publicar de novo.\n"
-"Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes."
+"Atualizações foram rejeitadas porque a ponta de atirar do ramo está\n"
+"atrasada em relação ao homólogo remoto. Observa este ramo e integra as\n"
+"alterações remotas (e.g. 'git pull ...') antes de atirares novamente.\n"
+"Para detalhes, vê a 'Note about fast-forwards' em 'git push --help'."
#: builtin/push.c:270
msgid ""
@@ -19694,14 +20033,16 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"Atualizações foram rejeitadas porque o remoto contém trabalho diferente\n"
-"do teu trabalho local. A causa, normalmente, é um push para a mesma ref.\n"
-"Podes tentar integrar as diferenças remotas (p.e., 'git pull ...') antes\n"
-"de fazeres novo push.\n"
-"Vê a 'Note about fast-forwards' do 'git push --help' para detalhes."
+"do teu trabalho local. A causa, normalmente, é um atirar para a mesma ref.\n"
+"Podes tentar, primeiro, integrar as diferenças remotas (e.g., 'git "
+"pull ...')\n"
+"antes de atirares novamente.\n"
+"Para detalhes, vê a 'Note about fast-forwards' em 'git push --help'."
#: builtin/push.c:277
msgid "Updates were rejected because the tag already exists in the remote."
-msgstr "As atualizações foram rejeitadas porque a tag já existe no remoto."
+msgstr ""
+"As atualizações foram rejeitadas porque a etiqueta já existe no remoto."
#: builtin/push.c:280
msgid ""
@@ -19709,67 +20050,65 @@
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr ""
-"És impedido de atualizar uma ref remota que aponte para um objecto\n"
-"fora de commit, ou atualizar uma ref remota fazendo-a apontar para um\n"
-"objeto fora de commit, sem usar a opção '--force'.\n"
+"Apenas podes atualizar uma ref remota que aponte para um objecto\n"
+"fora de memória, ou atualizar uma ref remota fazendo-a apontar para um\n"
+"objeto fora de memória, usando a opção '--force'.\n"
#: builtin/push.c:285
-#, fuzzy
msgid ""
"Updates were rejected because the tip of the remote-tracking\n"
"branch has been updated since the last checkout. You may want\n"
"to integrate those changes locally (e.g., 'git pull ...')\n"
"before forcing an update.\n"
msgstr ""
-"As atualizações foram rejeitadas porque a ponta do ramo atual está atrasada\n"
-"em relação ao homólogo remoto. Integre as alterações remotas (e.g.\n"
-"'git pull ...') antes de publicar de novo.\n"
-"Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes."
+"Atualizações foram rejeitadas porque a ponta do ramo remoto de\n"
+"monitorização foi atualizada desde a última observação. Poderás querer\n"
+"integrar essas alterações localmente (e.g., 'git pull ...') antes de\n"
+"forçar uma atualização.\n"
#: builtin/push.c:355
#, c-format
msgid "Pushing to %s\n"
-msgstr "Fazendo push para %s\n"
+msgstr "Atirando para %s\n"
#: builtin/push.c:362
#, c-format
msgid "failed to push some refs to '%s'"
-msgstr "falha ao publicar algumas referências em '%s'"
+msgstr "falha ao atirar algumas refs para '%s'"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3377
msgid "repository"
msgstr "repositório"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
-msgstr "publicar todas as referências"
+msgstr "atirar todas as refs"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
-msgstr "replicar todas as referências"
+msgstr "espelha todas as refs"
#: builtin/push.c:548
msgid "delete refs"
-msgstr "eliminar referências"
+msgstr "apagar refs"
#: builtin/push.c:549
msgid "push tags (can't be used with --all or --mirror)"
-msgstr "atirar tags (incapaz ser usado com --all ou --mirror)"
+msgstr "atirar etiquetas (incapaz ser usado com --all ou --mirror)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "forçar atualização"
-#: builtin/push.c:553 builtin/send-pack.c:204
-#, fuzzy
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
-msgstr "nome da referência>:<esperado"
+msgstr "<nome-ref>:<esperado>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
-msgstr "exigir que o antigo valor da referência tenha este valor"
+msgstr "exigir que o antigo valor da ref tenha este valor"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr ""
@@ -19777,12 +20116,12 @@
msgid "control recursive pushing of submodules"
msgstr "controlar a publicação recursiva de submódulos"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "usar pacote fino"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "programa receive pack"
@@ -19796,23 +20135,19 @@
#: builtin/push.c:569
msgid "bypass pre-push hook"
-msgstr "ignorar pre-push hook"
+msgstr "contornar gancho pre-push"
#: builtin/push.c:570
msgid "push missing but relevant tags"
-msgstr "publicar tags perdidas mas relevantes"
+msgstr "atirar etiquetas ausentes mas relevantes"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "assinar publicação com GPG"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
-msgstr "solicitar transação atómica no servidor remoto"
-
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete é incompatível com --all, --mirror e --tags"
+msgstr "solicitar transação atómica do lado remoto"
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
@@ -19836,398 +20171,206 @@
" git push <name>\n"
msgstr ""
"Destino de atirar indefinido.\n"
-"Indica um URL da linha de comandos ou configure um repositório remoto "
+"Indica um URL da linha de comandos ou configura um repositório remoto "
"usando\n"
"\n"
" git remote add <nome> <url>\n"
"\n"
-"e depois atire usando o nome remoto\n"
+"e depois atira usando o nome remoto\n"
"\n"
" git push <nome>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all e --tags são incompatíveis"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
-msgstr "incapaz combinar --all com refspecs"
-
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror e --tags são incompatíveis"
+msgstr "incapaz combinar --all com espetros-ref"
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
-msgstr "incapaz combinar --mirror com refspecs"
-
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all e --mirror são incompatíveis"
+msgstr "incapaz combinar --mirror com espetro-refs"
#: builtin/push.c:648
msgid "push options must not have new line characters"
-msgstr "opções de atiranço podem ter caracteres de nova linha nenhuns"
+msgstr "opções de atirar podem ter caracteres de nova linha nenhuns"
#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
#: builtin/range-diff.c:10
-#, fuzzy
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
-msgstr "git merge [<opções>] [<commit>...]"
+msgstr "git range-diff [<opções>] <ponta-antiga>...<ponta-nova>"
#: builtin/range-diff.c:11
-#, fuzzy
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
-msgstr "git mv [<opções>] <origem>... <destino>"
+msgstr "git range-diff [<opções>] <base> <ponta-antiga> <nova-ponta>"
#: builtin/range-diff.c:30
-#, fuzzy
msgid "use simple diff colors"
-msgstr "usar a ferramenta diff especificada"
+msgstr "usar cores diff simples"
#: builtin/range-diff.c:32
-#, fuzzy
msgid "notes"
-msgstr "notes-ref"
+msgstr "notas"
#: builtin/range-diff.c:32
msgid "passed to 'git log'"
msgstr ""
#: builtin/range-diff.c:35
-#, fuzzy
msgid "only emit output related to the first range"
-msgstr "mostrar apenas commits fora do primeiro ramo"
+msgstr "apenas emitir saída relativa ao primeiro intervalo"
#: builtin/range-diff.c:37
-#, fuzzy
msgid "only emit output related to the second range"
-msgstr "mostrar os caminhos relativamente ao diretório superior do projeto"
+msgstr "apenas emitir saída relativa ao segundo intervalo"
#: builtin/range-diff.c:60 builtin/range-diff.c:64
-#, fuzzy, c-format
+#, c-format
msgid "not a commit range: '%s'"
-msgstr "ramo inexistente: '%s'"
+msgstr "intervalo de memórias nenhum: '%s'"
#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
msgstr ""
#: builtin/range-diff.c:89
-#, fuzzy
msgid "need two commit ranges"
msgstr "preciso dois intervalos de memórias"
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
-"prefix=<prefixo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
-"sparse-checkout] [--index-output=<ficheiro>] (--empty | <árvore-etc1> "
-"[<árvore-etc2> [<árvore-etc3>]])"
+"prefix=<prefixo>) [-u | -i]] [--no-sparse-checkout] [--index-"
+"output=<ficheiro>] (--empty | <arvoredo1> [<arvoredo2> [<arvoredo3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
-msgstr "escrever o índice resultante no <ficheiro>"
+msgstr "escrever cenário resultante para <ficheiro>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
-msgstr "apenas esvaziar o índice"
+msgstr "apenas esvaziar o cenário"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
-msgstr "A integrar"
+msgstr "Juntando"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
-msgstr "realizar uma integração em adição a uma leitura"
+msgstr "realizar uma junção para além de uma leitura"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "tri-junção se dispensar junção ao nível de ficheiros"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "tri-junção na presença de adições e remoções"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "o mesmo que -m, mas descartar entradas por juntar"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
-msgstr "<subdiretório>/"
+msgstr "<subpasta>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
-msgstr "ler a árvore em <subdiretório>/ para o índice"
+msgstr "ler a árvore em <subpasta>/ para o cenário"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
-msgstr "atualizar a árvore de trabalho com os resultados da integração"
+msgstr "atualizar a árvore-trabalho com os resultados de junção"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "permitir que os ficheiros explicitamente ignorados sejam substituídos"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
-msgstr "verifica nenhuma worktree após junção"
+msgstr "verifica árvore-trabalho nenhuma após junção"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
-msgstr "atualizar index nenhum e worktree nenhuma"
+msgstr "atualizar cenário nenhum e árvore-trabalho nenhuma"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
-msgstr "ignorar a aplicação do filtro de extração esparsa"
+msgstr "saltar aplicação de filtro de observação disperso"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "depurar unpack-trees"
-#: builtin/read-tree.c:157
-#, fuzzy
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
-msgstr "suprimir mensagens informativas"
+msgstr "suprimir mensagens de feedback"
-#: builtin/read-tree.c:188
-#, fuzzy
+#: builtin/read-tree.c:190
msgid "You need to resolve your current index first"
-msgstr "primeiro deve resolver o índice atual"
+msgstr "Primeiro precisas resolver teu cenário atual"
-#: builtin/rebase.c:35
+#: builtin/rebase.c:36
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
msgstr ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <nova-base> | --keep-base] "
+"[<upstream> [<ramo>]]"
-#: builtin/rebase.c:37
+#: builtin/rebase.c:38
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <nova-base>] --root [<ramo>]"
-#: builtin/rebase.c:39
-#, fuzzy
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git am [<opções>] (--continue | --skip | --abort)"
-
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, fuzzy, c-format
-msgid "unusable todo list: '%s'"
-msgstr "lista de tarefas inutilizável: '%s'"
-
-#: builtin/rebase.c:311
-#, fuzzy, c-format
+#: builtin/rebase.c:231
+#, c-format
msgid "could not create temporary %s"
msgstr "incapaz criar %s temporário"
-#: builtin/rebase.c:317
-#, fuzzy
+#: builtin/rebase.c:237
msgid "could not mark as interactive"
msgstr "incapaz marcar como interativo"
-#: builtin/rebase.c:370
-#, fuzzy
+#: builtin/rebase.c:290
msgid "could not generate todo list"
msgstr "incapaz gerar lista de tarefas"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:332
msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
-#: builtin/rebase.c:481
-#, fuzzy
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--helper [<opções>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr ""
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "permitir commits com mensagens vazias"
-
-#: builtin/rebase.c:500
-#, fuzzy
-msgid "rebase merge commits"
-msgstr "mergetag incorreta no commit '%s'"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr ""
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr ""
-
-#: builtin/rebase.c:505
-#, fuzzy
-msgid "sign commits"
-msgstr "assinar os commits com GPG"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr ""
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "continuar rebase"
-
-#: builtin/rebase.c:511
-#, fuzzy
-msgid "skip commit"
-msgstr "commit"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr ""
-
-#: builtin/rebase.c:514
-#, fuzzy
-msgid "show the current patch"
-msgstr "mostrar remendo atual"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr ""
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr ""
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr ""
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr ""
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr ""
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr ""
-
-#: builtin/rebase.c:529
-#, fuzzy
-msgid "restrict-revision"
-msgstr "revisão-restrita"
-
-#: builtin/rebase.c:529
-#, fuzzy
-msgid "restrict revision"
-msgstr "revisão restrita"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr ""
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr ""
-
-#: builtin/rebase.c:534
-#, fuzzy
-msgid "the upstream commit"
-msgstr "Remover a informação do ramo a montante"
-
-#: builtin/rebase.c:536
-#, fuzzy
-msgid "head-name"
-msgstr "mudar nome"
-
-#: builtin/rebase.c:536
-#, fuzzy
-msgid "head name"
-msgstr "à frente "
-
-#: builtin/rebase.c:541
-#, fuzzy
-msgid "rebase strategy"
-msgstr "estratégia de integração"
-
-#: builtin/rebase.c:542
-#, fuzzy
-msgid "strategy-opts"
-msgstr "estratégia"
-
-#: builtin/rebase.c:543
-#, fuzzy
-msgid "strategy options"
-msgstr "opções de decoração"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr ""
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr ""
-
-#: builtin/rebase.c:546
-#, fuzzy
-msgid "onto-name"
-msgstr "para-nome"
-
-#: builtin/rebase.c:546
-#, fuzzy
-msgid "onto name"
-msgstr "para nome"
-
-#: builtin/rebase.c:547
-#, fuzzy
-msgid "cmd"
-msgstr "comando"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr ""
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr ""
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr ""
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:391
#, c-format
msgid "%s requires the merge backend"
msgstr ""
-#: builtin/rebase.c:625
-#, fuzzy, c-format
+#: builtin/rebase.c:433
+#, c-format
msgid "could not get 'onto': '%s'"
msgstr "incapaz obter 'onto': '%s'"
-#: builtin/rebase.c:642
-#, fuzzy, c-format
+#: builtin/rebase.c:450
+#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head inválida: '%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:475
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
-#, fuzzy
+#: builtin/rebase.c:600
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20235,12 +20378,14 @@
"To abort and get back to the state before \"git rebase\", run \"git rebase --"
"abort\"."
msgstr ""
-"Depois de resolver este problema, execute \"git rebase --continue\".\n"
-"Se prefere ignorar este patch, execute \"git rebase --skip\".\n"
-"Para extrair o ramo original e interromper o rebase, execute \"git rebase --"
-"abort\"."
+"Resolve todos conflitos manualmente, marca-os como resolvidos com\n"
+"\"git add/rm <ficheiros conflitosos>\", depois executa \"git rebase --"
+"continue\".\n"
+"Alternativamente podes saltar esta memória: executa \"git rebase --skip\".\n"
+"Para abortar e voltar ao estado anterior a \"git rebase\", executa\n"
+"\"git rebase --abort\"."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:685
#, c-format
msgid ""
"\n"
@@ -20251,16 +20396,28 @@
"\n"
"As a result, git cannot rebase them."
msgstr ""
+"\n"
+"git encontrou erro enquanto preparava as correções para refazer\n"
+"estas revisões:\n"
+"\n"
+" %s\n"
+"\n"
+"Como resultado, git é incapaz de rebaseá-las."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:836
+#, c-format
+msgid "could not switch to %s"
+msgstr "incapaz alternar para %s"
+
+#: builtin/rebase.c:952
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr ""
-#: builtin/rebase.c:1240
-#, fuzzy, c-format
+#: builtin/rebase.c:970
+#, c-format
msgid ""
"%s\n"
"Please specify which branch you want to rebase against.\n"
@@ -20270,238 +20427,217 @@
"\n"
msgstr ""
"%s\n"
-"Por favor, diz o branch sobre o qual queres rebasear.\n"
+"Por favor, diz o ramo sobre o qual queres rebasear.\n"
"Vê git-rebase(1) para detalhes.\n"
"\n"
-" git rebase '<branch>'\n"
+" git rebase '<ramo>'\n"
"\n"
-#: builtin/rebase.c:1256
-#, fuzzy, c-format
+#: builtin/rebase.c:986
+#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
"\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
msgstr ""
-"Se desejas por tracking information neste branch, podes fazer com:\n"
+"Se queres definir informação de monitorização deste branch, podes fazer "
+"com:\n"
"\n"
-" git branch --set-upstream-to=%s/<branch> %s\n"
+" git branch --set-upstream-to=%s/<ramo> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:1016
msgid "exec commands cannot contain newlines"
-msgstr ""
+msgstr "incapaz de conter novas-linhas em comandos exec"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:1020
msgid "empty exec command"
-msgstr ""
+msgstr "comando exec vazio"
-#: builtin/rebase.c:1319
-#, fuzzy
+#: builtin/rebase.c:1051
msgid "rebase onto given branch instead of upstream"
-msgstr "demasiados ramos para remover a definição de ramo a montante"
+msgstr "rebasear sobre ramo dado invés de upstream"
-#: builtin/rebase.c:1321
-#, fuzzy
+#: builtin/rebase.c:1053
msgid "use the merge-base of upstream and branch as the current base"
msgstr "usar a base de junção de upstream e ramo como base atual"
-#: builtin/rebase.c:1323
-#, fuzzy
+#: builtin/rebase.c:1055
msgid "allow pre-rebase hook to run"
-msgstr "Rebase recusado pelo hook pre-rebase."
+msgstr "permitir execução de gancho pre-rebase"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1057
msgid "be quiet. implies --no-stat"
-msgstr ""
+msgstr "fica silencioso. implica --no-stat"
-#: builtin/rebase.c:1331
-#, fuzzy
+#: builtin/rebase.c:1060
+msgid "display a diffstat of what changed upstream"
+msgstr "mostrar uma diffstat das alterações em upstream"
+
+#: builtin/rebase.c:1063
msgid "do not show diffstat of what changed upstream"
-msgstr "esconder diffstat de o que alterou upstream"
+msgstr "esconder diffstat das alterações upstream"
-#: builtin/rebase.c:1334
-#, fuzzy
+#: builtin/rebase.c:1066
msgid "add a Signed-off-by trailer to each commit"
-msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
+msgstr "adicionar a atribuição Signed-off-by para cada memória"
-#: builtin/rebase.c:1337
-#, fuzzy
+#: builtin/rebase.c:1069
msgid "make committer date match author date"
-msgstr "agrupar por committer em vez de autor"
+msgstr "fazer data de memorizador corresponder à data de autor"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1071
msgid "ignore author date and use current date"
-msgstr ""
+msgstr "ignorar data de autor e usar data atual"
-#: builtin/rebase.c:1341
-#, fuzzy
+#: builtin/rebase.c:1073
msgid "synonym of --reset-author-date"
msgstr "sinónimo de --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
-#, fuzzy
+#: builtin/rebase.c:1075 builtin/rebase.c:1079
msgid "passed to 'git apply'"
msgstr "passado para 'git apply'"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1077
msgid "ignore changes in whitespace"
-msgstr ""
+msgstr "ignorar alterações de espaços-em-branco"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1081 builtin/rebase.c:1084
msgid "cherry-pick all commits, even if unchanged"
-msgstr ""
+msgstr "apanhar todas as memórias, mesmo se inalteradas"
-#: builtin/rebase.c:1354
-#, fuzzy
+#: builtin/rebase.c:1086
msgid "continue"
-msgstr "continuar rebase"
+msgstr "continuar"
-#: builtin/rebase.c:1357
-#, fuzzy
+#: builtin/rebase.c:1089
msgid "skip current patch and continue"
msgstr "ignorar remendo atual e continuar"
-#: builtin/rebase.c:1359
-#, fuzzy
+#: builtin/rebase.c:1091
msgid "abort and check out the original branch"
-msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"
+msgstr "abortar e observar o ramo original"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1094
msgid "abort but keep HEAD where it is"
-msgstr ""
+msgstr "abortar mas manter HEAD on está"
-#: builtin/rebase.c:1363
-#, fuzzy
+#: builtin/rebase.c:1095
msgid "edit the todo list during an interactive rebase"
msgstr "editar a lista de afazeres durante rebase interativa"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1098
msgid "show the patch file being applied or merged"
-msgstr ""
+msgstr "mostrar remendo aplicado or juntado"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1101
msgid "use apply strategies to rebase"
-msgstr ""
+msgstr "usar estratégias de apply para rebasear"
-#: builtin/rebase.c:1373
-#, fuzzy
+#: builtin/rebase.c:1105
msgid "use merging strategies to rebase"
-msgstr "estratégia de integração a usar"
+msgstr "usar estratégias de junção para rebasear"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1109
msgid "let the user edit the list of commits to rebase"
-msgstr ""
+msgstr "deixar o utilizador editar a lista de memórias a rebasear"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1113
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr ""
+msgstr "(OBSOLETO) tenta recriar junções em vez de ignorá-las"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1118
msgid "how to handle commits that become empty"
-msgstr ""
+msgstr "como lidar com memórias que ficam vazias"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1121
+msgid "keep commits which start empty"
+msgstr "manter memórias que começaram como vazias"
+
+#: builtin/rebase.c:1125
msgid "move commits that begin with squash!/fixup! under -i"
-msgstr ""
+msgstr "mover para -i as memórias que começam com squash!/fixup!"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1132
msgid "add exec lines after each commit of the editable list"
-msgstr ""
+msgstr "adicionar linhas exec após cada memória da lista editável"
-#: builtin/rebase.c:1404
-#, fuzzy
+#: builtin/rebase.c:1136
msgid "allow rebasing commits with empty messages"
-msgstr "permitir commits com mensagens vazias"
+msgstr "permitir rebasear memórias com mensagens vazias"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1140
msgid "try to rebase merges instead of skipping them"
-msgstr ""
+msgstr "tentar rebasear junções em vez de saltá-las"
-#: builtin/rebase.c:1411
-#, fuzzy
+#: builtin/rebase.c:1143
msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "git merge-base --fork-point <referência> [<commit>]"
+msgstr "usa 'merge-base --fork-point' para refinar upstream"
-#: builtin/rebase.c:1413
-#, fuzzy
+#: builtin/rebase.c:1145
msgid "use the given merge strategy"
-msgstr "opção de estratégia de integração"
+msgstr "usar a estratégia de junção dada"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1147 builtin/revert.c:115
msgid "option"
msgstr "opção"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1148
msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1151
msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1154
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:1156
msgid "apply all changes, even those already present upstream"
msgstr ""
-#: builtin/rebase.c:1442
-#, fuzzy
+#: builtin/rebase.c:1177
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Parece que 'git am' está em curso. Incapaz de rebasear."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+#: builtin/rebase.c:1208
+msgid "--preserve-merges was replaced by --rebase-merges"
msgstr ""
-#: builtin/rebase.c:1488
-#, fuzzy
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "incapaz de combinar '--keep-base' com '--onto'"
-
-#: builtin/rebase.c:1490
-#, fuzzy
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "incapaz de combinar '--keep-base' com '--root'"
-
-#: builtin/rebase.c:1494
-#, fuzzy
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "incapaz de combinar '--root' com '--fork-point'"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1230
msgid "No rebase in progress?"
msgstr "Algum rebase em curso?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1234
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "A ação --edit-todo só pode ser usada durante uma rebase interativa."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Incapaz ler HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1269
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-"Deve editar todos os conflitos da integração\n"
+"Tens de editar todos os conflitos da junção\n"
"e marcá-los como resolvidos usando git add"
-#: builtin/rebase.c:1555
-#, fuzzy
+#: builtin/rebase.c:1287
msgid "could not discard worktree changes"
-msgstr "incapaz de descartar alterações de worktree"
+msgstr "incapaz de descartar alterações de árvore-trabalho"
-#: builtin/rebase.c:1574
-#, fuzzy, c-format
+#: builtin/rebase.c:1308
+#, c-format
msgid "could not move back to %s"
msgstr "incapaz de retroceder a %s"
-#: builtin/rebase.c:1620
-#, fuzzy, c-format
+#: builtin/rebase.c:1354
+#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"I wonder if you are in the middle of another rebase. If that is the\n"
@@ -20513,153 +20649,135 @@
"valuable there.\n"
msgstr ""
"Parece que já existe uma pasta %s, e\n"
-"pregunto-me se estás a meio de outro rebase. Se for o caso,\n"
+"pergunto-me se estás a meio de outro rebase. Se for o caso,\n"
"por favor tenta\n"
"\t%s\n"
-"Caso eu esteja errado, faz por favor\n"
+"Caso eu esteja errado, por favor\n"
"\t%s\n"
"e execute-me novamente. Estou parando caso ainda tenhas algo\n"
"de valor aí.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1382
msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/rebase.c:1690
-#, fuzzy, c-format
+#: builtin/rebase.c:1424
+#, c-format
msgid "Unknown mode: %s"
-msgstr "Mode de --patch desconhecido: %s"
+msgstr "Modo desconhecido: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1463
msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr ""
+#: builtin/rebase.c:1492
+msgid "apply options and merge options cannot be used together"
+msgstr "opções de submeter e de juntar incapaz de serem usadas juntas"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1505
#, c-format
msgid "Unknown rebase backend: %s"
msgstr ""
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1534
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr ""
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1565
#, c-format
msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/rebase.c:1856
-#, fuzzy
+#: builtin/rebase.c:1571
msgid "Could not create new root commit"
-msgstr "incapaz criar novo commit raiz"
+msgstr "Incapaz criar nova memória raiz"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1597
#, c-format
msgid "'%s': need exactly one merge base with branch"
-msgstr ""
+msgstr "'%s': preciso exatamente de uma base de junção para ramo"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1600
#, c-format
msgid "'%s': need exactly one merge base"
-msgstr ""
+msgstr "'%s': preciso exatamente de uma base de junção"
-#: builtin/rebase.c:1893
-#, fuzzy, c-format
+#: builtin/rebase.c:1609
+#, c-format
msgid "Does not point to a valid commit '%s'"
-msgstr "Aponta nada para commit válido '%s'"
+msgstr "Aponta para fora de memória válida '%s'"
-#: builtin/rebase.c:1921
-#, fuzzy, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal: nenhum ramo/commit '%s'"
+#: builtin/rebase.c:1636
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "nenhum ramo/memória '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
+#: builtin/submodule--helper.c:2477
#, c-format
msgid "No such ref: %s"
msgstr "Referência inexistente: %s"
-#: builtin/rebase.c:1940
-#, fuzzy
+#: builtin/rebase.c:1658
msgid "Could not resolve HEAD to a revision"
msgstr "Foi impossível resolver HEAD para uma revisão"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1679
msgid "Please commit or stash them."
-msgstr "Submeta ou esconda-as."
+msgstr "Por favor, memoriza ou esconde-as."
-#: builtin/rebase.c:1997
-#, fuzzy, c-format
-msgid "could not switch to %s"
-msgstr "incapaz alternar para %s"
-
-#: builtin/rebase.c:2008
-#, fuzzy
+#: builtin/rebase.c:1714
msgid "HEAD is up to date."
-msgstr "HEAD está agora em"
+msgstr "HEAD está atualizada."
-#: builtin/rebase.c:2010
-#, fuzzy, c-format
+#: builtin/rebase.c:1716
+#, c-format
msgid "Current branch %s is up to date.\n"
-msgstr "Branch atual %s está atualizado.\n"
+msgstr "Ramo atual %s está atualizado.\n"
-#: builtin/rebase.c:2018
-#, fuzzy
+#: builtin/rebase.c:1724
msgid "HEAD is up to date, rebase forced."
-msgstr "O ramo atual $branch_name está atualizado, rebase forçado."
+msgstr "HEAD está atualizada, rebase forçado."
-#: builtin/rebase.c:2020
-#, fuzzy, c-format
+#: builtin/rebase.c:1726
+#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
-msgstr "Branch actual %s está atualizado, rebase forçado.\n"
+msgstr "Ramo actual %s está atualizado, rebase forçado.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1734
msgid "The pre-rebase hook refused to rebase."
-msgstr "Rebase recusado pelo hook pre-rebase."
+msgstr "Gancho pre-rebase recusou rebasear."
-#: builtin/rebase.c:2035
-#, fuzzy, c-format
+#: builtin/rebase.c:1741
+#, c-format
msgid "Changes to %s:\n"
msgstr "Modificações para %s:\n"
-#: builtin/rebase.c:2038
-#, fuzzy, c-format
+#: builtin/rebase.c:1744
+#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Modificações de %s para %s:\n"
-#: builtin/rebase.c:2063
-#, fuzzy, c-format
+#: builtin/rebase.c:1769
+#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
-msgstr "Primeiro, recuando head para refazer o teu trabalho em cima dela...\n"
+msgstr ""
+"Primeiro, rebobinar cabeça para refazer o teu trabalho em cima dela...\n"
-#: builtin/rebase.c:2072
-#, fuzzy
+#: builtin/rebase.c:1781
msgid "Could not detach HEAD"
-msgstr "incapaz soltar HEAD"
+msgstr "Incapaz desanexar HEAD"
-#: builtin/rebase.c:2081
-#, fuzzy, c-format
+#: builtin/rebase.c:1790
+#, c-format
msgid "Fast-forwarded %s to %s.\n"
-msgstr "Avançei-rápido %s para %s.\n"
+msgstr "Avancei %s para %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
-msgstr "git receive-pack <git-dir>"
+msgstr "git receive-pack <pasta-git>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1263
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"
@@ -20675,21 +20793,21 @@
"To squelch this message and still keep the default behaviour, set\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-"Por predefinição, atualizar o ramo atual num repositório não-nu\n"
-"é proibido, porque tornará o index e a worktree inconsistentes\n"
-"com o que atiraste, e requererá 'git reset --hard' para igualar a\n"
-"worktree com HEAD.\n"
+"Por predefinição, atualizar o ramo atual num repositório diferente\n"
+"de nu é proibido, porque tornará o cenário e a árvore-trabalho\n"
+"inconsistentes com o que atiraste, e requererá 'git reset --hard'\n"
+"para igualar a árvore-trabalho com HEAD.\n"
"\n"
-"Podes definir variável configuração 'receive.denyCurrentBranch'\n"
+"Podes definir variável de configuração 'receive.denyCurrentBranch'\n"
"como 'ignore' ou 'warn' no repositório remoto para permitir atirar\n"
"para o ramo atual deste; no entanto, é recomendando nada disto a\n"
-"menos que consigas outra forma de atualizar a worktree dele para\n"
-"refletir o que atiraste.\n"
+"menos que consigas outra forma de atualizar a árvore-trabalho dele\n"
+"para refletir o que atiraste.\n"
"\n"
-"Para suprimir esta mensagem e manter o comportamento predefinido, define\n"
+"Para silenciar esta mensagem e manter o comportamento predefinido, define\n"
"a variável de configuração 'receive.denyCurrentBranch' como 'refuse'."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1283
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"
@@ -20700,84 +20818,115 @@
"\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-"Por predefinição, apagar o ramo atual é proibido, porque o próximo\n"
-"'git clone' resultará em ficheiro nenhum checked out, causando confusão.\n"
+"Por predefinição, eliminar o ramo atual é proibido, porque o próximo\n"
+"'git clone' resultará em nenhum ficheiro observado, causando confusão.\n"
"\n"
"Podes definir a variável de configuração 'receive.denyDeleteCurrent' como\n"
"'warn' ou 'ignore' no repositório remoto para permitir eliminar o\n"
-"ramo atual, com ou sem a mensagem de aviso.\n"
+"ramo atual, com ou sem uma mensagem de aviso.\n"
"\n"
-"Para suprimir esta mensagem, podes definí-la como 'refuse'."
+"Para silenciar esta mensagem, podes defini-la como 'refuse'."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2476
msgid "quiet"
msgstr "silencioso"
-#: builtin/receive-pack.c:2492
-msgid "You must specify a directory."
-msgstr "Deve especificar um diretório."
+#: builtin/receive-pack.c:2491
+msgid "you must specify a directory"
+msgstr "tens de especificar uma pasta"
+
+#: builtin/reflog.c:9
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [<opções-de-registo>] [<ref>]"
+
+#: builtin/reflog.c:12
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
+msgstr ""
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
msgstr ""
-#: builtin/reflog.c:22
-msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
-msgstr ""
-
-#: builtin/reflog.c:25
+#: builtin/reflog.c:21
msgid "git reflog exists <ref>"
msgstr ""
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:197 builtin/reflog.c:211
#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "'%s' é um carimbo de data/hora inválido"
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "carimbo cronológico inválido '%s' fornecido a '--%s'"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:240 builtin/reflog.c:359
+msgid "do not actually prune any entries"
+msgstr ""
+
+#: builtin/reflog.c:243 builtin/reflog.c:362
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr ""
+
+#: builtin/reflog.c:246 builtin/reflog.c:365
+msgid "update the reference to the value of the top reflog entry"
+msgstr ""
+
+#: builtin/reflog.c:248 builtin/reflog.c:367
+msgid "print extra information on screen"
+msgstr ""
+
+#: builtin/reflog.c:249 builtin/reflog.c:253
+msgid "timestamp"
+msgstr "carimbo cronológico"
+
+#: builtin/reflog.c:250
+msgid "prune entries older than the specified time"
+msgstr "podar entradas mais velhas que tempo especifico"
+
+#: builtin/reflog.c:254
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+
+#: builtin/reflog.c:258
+msgid "prune any reflog entries that point to broken commits"
+msgstr ""
+"podar qualquer entrada de registo-ref que aponte para memórias quebradas"
+
+#: builtin/reflog.c:259
+msgid "process the reflogs of all references"
+msgstr "processar os registos-ref de todas as referências"
+
+#: builtin/reflog.c:261
+msgid "limits processing to reflogs from the current worktree only"
+msgstr ""
+"limitando processamento para apenas registros-ref da árvore-trabalho atual"
+
+#: builtin/reflog.c:294
#, c-format
msgid "Marking reachable objects..."
msgstr ""
-#: builtin/reflog.c:647
+#: builtin/reflog.c:338
#, c-format
msgid "%s points nowhere!"
msgstr ""
-#: builtin/reflog.c:699
-#, fuzzy
+#: builtin/reflog.c:374
msgid "no reflog specified to delete"
msgstr "especificado reflog nenhum para apagar"
-#: builtin/reflog.c:708
-#, fuzzy, c-format
-msgid "not a reflog: %s"
-msgstr "reflog inválido: %s"
-
-#: builtin/reflog.c:713
-#, fuzzy, c-format
-msgid "no reflog for '%s'"
-msgstr "reflog nenhum para '%s'"
-
-#: builtin/reflog.c:759
-#, fuzzy, c-format
+#: builtin/reflog.c:396
+#, c-format
msgid "invalid ref format: %s"
msgstr "formato de ref inválido: %s"
-#: builtin/reflog.c:768
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr ""
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
@@ -20785,82 +20934,87 @@
"git remote add [-t <ramo>] [-m <mestre>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <nome> <url>"
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <antigo> <novo>"
+#: builtin/remote.c:20 builtin/remote.c:40
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <antigo> <novo>"
-#: builtin/remote.c:20 builtin/remote.c:44
+#: builtin/remote.c:21 builtin/remote.c:45
msgid "git remote remove <name>"
msgstr "git remote remove <nome>"
-#: builtin/remote.c:21 builtin/remote.c:49
+#: builtin/remote.c:22 builtin/remote.c:50
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <nome> (-a | --auto | -d | --delete | <ramo>)"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <nome>"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <nome>"
-#: builtin/remote.c:24
+#: builtin/remote.c:25
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]"
-#: builtin/remote.c:25
+#: builtin/remote.c:26
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <nome> <ramo>..."
-#: builtin/remote.c:26 builtin/remote.c:75
+#: builtin/remote.c:27 builtin/remote.c:76
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <nome>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <nome> <novo-url> [<url-antigo>]"
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <nome> <novo-url>"
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c:30 builtin/remote.c:83
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <nome> <url>"
-#: builtin/remote.c:34
+#: builtin/remote.c:35
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<opções>] <nome> <url>"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <nome> <ramo>..."
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <nome> <ramo>..."
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<opções>] <nome>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<opções>] <nome>"
-#: builtin/remote.c:70
+#: builtin/remote.c:71
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<opções>] [<grupo> | <remoto>]..."
-#: builtin/remote.c:99
+#: builtin/remote.c:100
#, c-format
msgid "Updating %s"
msgstr "Atualizando %s"
-#: builtin/remote.c:131
+#: builtin/remote.c:102
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Incapaz buscar %s"
+
+#: builtin/remote.c:132
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -20868,72 +21022,78 @@
"--mirror é perigoso e obsoleto; por favor\n"
"\t usa --mirror=fetch ou --mirror=push invés"
-#: builtin/remote.c:148
+#: builtin/remote.c:149
#, c-format
msgid "unknown mirror argument: %s"
msgstr "argumento de mirror desconhecido: %s"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "fetch the remote branches"
-msgstr "obter os ramos remotos"
+msgstr "buscar os ramos remotos"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "import all tags and associated objects when fetching"
-msgstr "importar todas as tags e objetos associados ao obter"
+msgstr "importar todas as etiquetas e objetos associados ao buscar"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "or do not fetch any tag at all (--no-tags)"
-msgstr "ou busca tag nenhuma (--no-tags)"
-
-#: builtin/remote.c:171
-msgid "branch(es) to track"
-msgstr "ramos a seguir"
+msgstr "ou buscar etiqueta nenhuma (--no-tags)"
#: builtin/remote.c:172
+msgid "branch(es) to track"
+msgstr "ramo(s) a monitorizar"
+
+#: builtin/remote.c:173
msgid "master branch"
msgstr "ramo mestre"
-#: builtin/remote.c:174
+#: builtin/remote.c:175
msgid "set up remote as a mirror to push to or fetch from"
-msgstr "configurar o remoto como um espelho para publicar ou obter"
+msgstr "definir remoto como um espelho para 'buscar de' ou 'atirar para'"
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying a master branch makes no sense with --mirror"
msgstr "especificar um ramo master com --mirror faz sentido nenhum"
-#: builtin/remote.c:188
+#: builtin/remote.c:189
msgid "specifying branches to track makes sense only with fetch mirrors"
-msgstr "especificar ramos para seguir só faz sentido com fetch mirrors"
+msgstr ""
+"especificar ramos para monitorizar só faz sentido com espelhos de busca"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:196 builtin/remote.c:716
#, c-format
msgid "remote %s already exists."
msgstr "o remoto %s já existe."
-#: builtin/remote.c:240
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "Incapaz configurar master '%s'"
-#: builtin/remote.c:355
+#: builtin/remote.c:323
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branch.%s.rebase=%s por lidar; assumindo 'true'"
+
+#: builtin/remote.c:367
#, c-format
msgid "Could not get fetch map for refspec %s"
-msgstr "Incapaz de obter mapa de busca para refspec %s"
+msgstr "Incapaz de obter mapa de busca para espetro-ref %s"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:461 builtin/remote.c:469
msgid "(matching)"
msgstr "(correspondente)"
-#: builtin/remote.c:466
+#: builtin/remote.c:473
msgid "(delete)"
-msgstr "(apagar)"
+msgstr "(eliminar)"
-#: builtin/remote.c:655
-#, fuzzy, c-format
+#: builtin/remote.c:664
+#, c-format
msgid "could not set '%s'"
msgstr "incapaz definir '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:669
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20941,37 +21101,42 @@
"now names the non-existent remote '%s'"
msgstr ""
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
-#, fuzzy, c-format
+#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
+#, c-format
msgid "No such remote: '%s'"
-msgstr "Remoto inexistente '%s'"
+msgstr "Remoto inexistente: '%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:726
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Incapaz de mudar o nome a secção de configuração '%s' para '%s'"
-#: builtin/remote.c:730
+#: builtin/remote.c:746
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-"Deixando por atualizar refspec que é diferente de pré-definido\t%s\n"
+"Deixando por atualizar espetro-ref que é diferente de pré-definido\n"
+"\t%s\n"
"\tPor favor, atualiza a configuração manualmente se necessário."
-#: builtin/remote.c:770
+#: builtin/remote.c:783
+msgid "Renaming remote references"
+msgstr "Renomeando referências remotas"
+
+#: builtin/remote.c:794
#, c-format
msgid "deleting '%s' failed"
msgstr "falha ao apagar '%s'"
-#: builtin/remote.c:804
+#: builtin/remote.c:832
#, c-format
msgid "creating '%s' failed"
msgstr "falhou criar '%s'"
-#: builtin/remote.c:882
+#: builtin/remote.c:912
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20980,124 +21145,124 @@
"to delete them, use:"
msgstr[0] ""
"Nota: Um ramo fora da hierarquia refs/remotes/ está por remover;\n"
-"para apagá-lo, usa:"
+"para eliminá-lo, usa:"
msgstr[1] ""
-"Nota: Alguns ramos fora da hierarquia refs/remotes/ estão por serem "
+"Nota: Alguns ramos fora da hierarquia refs/remotes/ estão por ser "
"removidos;\n"
-"para os apagá-los, usa:"
+"para eliminá-los, usa:"
-#: builtin/remote.c:896
+#: builtin/remote.c:926
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Incapaz remover secção de configuração '%s'"
-#: builtin/remote.c:999
+#: builtin/remote.c:1034
#, c-format
msgid " new (next fetch will store in remotes/%s)"
-msgstr " novo (os próxima objetos obtidos serão guardados em remotes/%s)"
+msgstr " novo (próxima busca irá guardar em remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1037
msgid " tracked"
-msgstr " seguido"
+msgstr " monitorizado"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1039
msgid " stale (use 'git remote prune' to remove)"
msgstr " obsoleto (use 'git remote prune' para remover)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1041
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1082
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge inválido; incapaz rebasear sobre > 1 ramo"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1091
#, c-format
msgid "rebases interactively onto remote %s"
-msgstr "rebaseia interativamente sobre %s do remoto"
+msgstr "rebaseia interativamente sobre remoto %s"
-#: builtin/remote.c:1058
-#, fuzzy, c-format
+#: builtin/remote.c:1093
+#, c-format
msgid "rebases interactively (with merges) onto remote %s"
-msgstr "rebaseia interativamente sobre %s do remoto"
+msgstr "rebaseia interativamente (com junções) sobre remoto %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1096
#, c-format
msgid "rebases onto remote %s"
-msgstr "rebaseia sobre %s do remoto"
+msgstr "rebaseia sobre remoto %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1100
#, c-format
msgid " merges with remote %s"
-msgstr " integra com %s do remoto"
+msgstr " junta com remoto %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1103
#, c-format
msgid "merges with remote %s"
-msgstr "integra com %s do remoto"
+msgstr "junta com remoto %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1106
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s e com o %s remote\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1149
msgid "create"
msgstr "criado"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1152
msgid "delete"
msgstr "eliminado"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1156
msgid "up to date"
msgstr "atualizado"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1159
msgid "fast-forwardable"
-msgstr "pode ser avançado rapidamente"
+msgstr "pode ser avançado"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1162
msgid "local out of date"
msgstr "local desatualizado"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1169
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força em %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1172
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s publica em %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1176
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força em %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1179
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s publica em %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1247
msgid "do not query remotes"
msgstr "faz consulta a remotos nenhuns"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1268
#, c-format
msgid "* remote %s"
msgstr "* remoto %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1269
#, c-format
msgid " Fetch URL: %s"
msgstr " Buscar URL: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
msgid "(no URL)"
msgstr "(URL nenhum)"
@@ -21105,336 +21270,343 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1284 builtin/remote.c:1286
#, c-format
msgid " Push URL: %s"
msgstr " Atirar URL: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
#, c-format
msgid " HEAD branch: %s"
msgstr " Ramo HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1288
msgid "(not queried)"
msgstr "(nada consultado)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1290
msgid "(unknown)"
msgstr "(desconhecido)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1294
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
-msgstr " HEAD branch (HEAD remote é ambíguo, pode ser um dos seguintes):\n"
+msgstr " Ramo HEAD (HEAD remota é ambígua, pode ser uma das seguintes):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1306
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Ramo remoto:%s"
msgstr[1] " Ramos remotos:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1309 builtin/remote.c:1335
msgid " (status not queried)"
-msgstr " (estado é nada consultado)"
+msgstr " (estado por consultar)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1318
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Ramo local configurado para 'git pull':"
msgstr[1] " Ramos locais configurados para 'git pull':"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1326
msgid " Local refs will be mirrored by 'git push'"
-msgstr " Referências locais serão refletidas (mirror) por 'git push'"
+msgstr " Refs locais serão espelhadas por 'git push'"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1332
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
-msgstr[0] " Referência local configurada para 'git push'%s:"
-msgstr[1] " Referências locais configuradas para 'git push'%s:"
+msgstr[0] " Ref local configurada para 'git push'%s:"
+msgstr[1] " Refs locais configuradas para 'git push'%s:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1353
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "definir refs/remotes/<nome>/HEAD de acordo com o remoto"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1355
msgid "delete refs/remotes/<name>/HEAD"
msgstr "eliminar refs/remotes/<nome>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1369
msgid "Cannot determine remote HEAD"
msgstr "Incapaz de determinar o HEAD remoto"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1371
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
-msgstr "Múltiplos ramos HEAD remotos. Escolha um explicitamente com:"
+msgstr ""
+"Múltiplos ramos HEAD remotos. Por favor, escolhe um explicitamente com:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1381
#, c-format
msgid "Could not delete %s"
msgstr "Incapaz eliminar %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1389
#, c-format
msgid "Not a valid ref: %s"
-msgstr "Referência inválida: %s"
+msgstr "Ref inválida: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1391
#, c-format
msgid "Could not setup %s"
msgstr "Incapaz configurar %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1409
#, c-format
msgid " %s will become dangling!"
msgstr " %s ficará suspenso!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1410
#, c-format
msgid " %s has become dangling!"
msgstr " %s ficou suspenso!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1419
#, c-format
msgid "Pruning %s"
-msgstr "A eliminar %s"
+msgstr "Podando %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1420
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1436
#, c-format
msgid " * [would prune] %s"
-msgstr " * [eliminaria] %s"
+msgstr " * [iria podar] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1439
#, c-format
msgid " * [pruned] %s"
-msgstr " * [eliminado] %s"
+msgstr " * [podado] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1484
msgid "prune remotes after fetching"
msgstr "podar remotos após buscar"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
#, c-format
msgid "No such remote '%s'"
-msgstr "Remoto inexistente '%s'"
+msgstr "Remoto '%s' inexistente"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1566
msgid "add branch"
msgstr "adicionar ramo"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1573
msgid "no remote specified"
msgstr "especificado remoto nenhum"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1590
msgid "query push URLs rather than fetch URLs"
-msgstr "consultar URLs de publicação em vez de URLs utilizados para obter"
+msgstr "consultar URLs de atiro em vez de URLs de busca"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1592
msgid "return all URLs"
msgstr "retornar todos os URLs"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1622
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "o remoto '%s' tem configurado URL nenhum"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1648
msgid "manipulate push URLs"
-msgstr "manipular URLs de publicação"
+msgstr "manipular URLs de atiro"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1650
msgid "add URL"
msgstr "adicionar URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1652
msgid "delete URLs"
msgstr "eliminar URLs"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1659
msgid "--add --delete doesn't make sense"
msgstr "--add --delete faz sentido nenhum"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1700
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Padrão de URL antigo inválido: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1708
#, c-format
msgid "No such URL found: %s"
msgstr "URL por encontrar: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1710
msgid "Will not delete all non-push URLs"
-msgstr "Apagarei apenas alguns URLs de não-atirar"
+msgstr "Deixarei por eliminar todos os URLs de não-atirar"
-#: builtin/repack.c:26
+#: builtin/remote.c:1727
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ser verboso; deve ser colocado antes de um subcomando"
+
+#: builtin/repack.c:29
msgid "git repack [<options>]"
msgstr "git repack [<opções>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:34
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-"Repacks incrementais são incompatíveis com indexes bitmap. Usa\n"
+"Repacks incrementais são incompatíveis com índices de bitmap. Usa\n"
"--no-write-bitmap-index ou desativa a configuração pack.writebitmaps ."
-#: builtin/repack.c:198
+#: builtin/repack.c:206
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:280 builtin/repack.c:824
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-#: builtin/repack.c:294
+#: builtin/repack.c:304
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:309
-#, fuzzy, c-format
+#: builtin/repack.c:319
+#, c-format
msgid "cannot open index for %s"
-msgstr "incapaz opendir '%s'"
+msgstr "incapaz abrir cenário para %s"
-#: builtin/repack.c:368
+#: builtin/repack.c:378
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr ""
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
#, c-format
msgid "pack %s too large to roll up"
msgstr ""
-#: builtin/repack.c:460
+#: builtin/repack.c:503
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "incapaz abrir ficheiro-temp %s para escrita"
+
+#: builtin/repack.c:521
+msgid "could not close refs snapshot tempfile"
+msgstr "incapaz fechar snapshot ficheiro-temp de refs"
+
+#: builtin/repack.c:634
msgid "pack everything in a single pack"
msgstr "compactar tudo num único pacote"
-#: builtin/repack.c:462
+#: builtin/repack.c:636
msgid "same as -a, and turn unreachable objects loose"
msgstr "o mesmo que -a, e soltar objetos inalcançáveis"
-#: builtin/repack.c:465
+#: builtin/repack.c:639
msgid "remove redundant packs, and run git-prune-packed"
msgstr "remover pacotes redundantes e executar git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:641
msgid "pass --no-reuse-delta to git-pack-objects"
-msgstr "passar --no-reuse-delta ao git-pack-objects"
+msgstr "passar --no-reuse-delta para git-pack-objects"
-#: builtin/repack.c:469
+#: builtin/repack.c:643
msgid "pass --no-reuse-object to git-pack-objects"
-msgstr "passar --no-reuse-object ao git-pack-objects"
+msgstr "passar --no-reuse-object para git-pack-objects"
-#: builtin/repack.c:471
+#: builtin/repack.c:645
msgid "do not run git-update-server-info"
msgstr "executar git-update-server-info nenhum"
-#: builtin/repack.c:474
+#: builtin/repack.c:648
msgid "pass --local to git-pack-objects"
msgstr "passar --local para git-pack-objects"
-#: builtin/repack.c:476
+#: builtin/repack.c:650
msgid "write bitmap index"
-msgstr "escrever índice de mapa de bits"
+msgstr "escrever índice de bitmap"
-#: builtin/repack.c:478
-#, fuzzy
+#: builtin/repack.c:652
msgid "pass --delta-islands to git-pack-objects"
-msgstr "passar --local ao git-pack-objects"
+msgstr "passar --delta-islands para git-pack-objects"
-#: builtin/repack.c:479
+#: builtin/repack.c:653
msgid "approxidate"
msgstr "aproximar"
-#: builtin/repack.c:480
+#: builtin/repack.c:654
msgid "with -A, do not loosen objects older than this"
msgstr "com -A, deixar de soltar objetos mais velhos que isto"
-#: builtin/repack.c:482
+#: builtin/repack.c:656
msgid "with -a, repack unreachable objects"
msgstr "com -a, reempacotar objetos inalcançáveis"
-#: builtin/repack.c:484
+#: builtin/repack.c:658
msgid "size of the window used for delta compression"
-msgstr "dimensão da janela usada em compressão de deltas"
+msgstr "dimensão da janela usada para compressão de delta"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:659 builtin/repack.c:665
msgid "bytes"
msgstr "bytes"
-#: builtin/repack.c:486
+#: builtin/repack.c:660
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"o mesmo que o anterior, mas limitar a memória usada em vez do número de "
"entradas"
-#: builtin/repack.c:488
+#: builtin/repack.c:662
msgid "limits the maximum delta depth"
msgstr "limitar a profundidade máxima de delta"
-#: builtin/repack.c:490
-#, fuzzy
+#: builtin/repack.c:664
msgid "limits the maximum number of threads"
-msgstr "limitar a profundidade máxima de delta"
+msgstr "limitar máximo número de fios"
-#: builtin/repack.c:492
+#: builtin/repack.c:666
msgid "maximum size of each packfile"
msgstr "tamanho máximo de cada ficheiro de pacote"
-#: builtin/repack.c:494
+#: builtin/repack.c:668
msgid "repack objects in packs marked with .keep"
msgstr "reempacotar objetos em pacotes marcados com .keep"
-#: builtin/repack.c:496
-#, fuzzy
+#: builtin/repack.c:670
msgid "do not repack this pack"
-msgstr "criar pacotes finos"
+msgstr "reempacotar nada deste pacote"
-#: builtin/repack.c:498
+#: builtin/repack.c:672
msgid "find a geometric progression with factor <N>"
msgstr ""
-#: builtin/repack.c:508
+#: builtin/repack.c:674
+msgid "write a multi-pack index of the resulting packs"
+msgstr ""
+
+#: builtin/repack.c:684
msgid "cannot delete packs in a precious-objects repo"
msgstr "incapaz apagar pacotes num repo de precious-objects"
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable e -A são incompatíveis"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr ""
-
-#: builtin/repack.c:639
+#: builtin/repack.c:833
msgid "Nothing new to pack."
msgstr ""
-#: builtin/repack.c:669
+#: builtin/repack.c:863
#, c-format
msgid "missing required file: %s"
msgstr ""
-#: builtin/repack.c:671
-#, fuzzy, c-format
+#: builtin/repack.c:865
+#, c-format
msgid "could not unlink: %s"
msgstr "incapaz unlink: %s"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
-msgstr "git replace [-f] <objeto> <substituição>"
+msgstr "git replace [-f] <objeto> <substituto>"
#: builtin/replace.c:23
msgid "git replace [-f] --edit <object>"
@@ -21442,12 +21614,7 @@
#: builtin/replace.c:24
msgid "git replace [-f] --graft <commit> [<parent>...]"
-msgstr "git replace [-f] --graft <commit> [<pai>...]"
-
-#: builtin/replace.c:25
-#, fuzzy
-msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --edit <objeto>"
+msgstr "git replace [-f] --graft <memória> [<parente>...]"
#: builtin/replace.c:26
msgid "git replace -d <object>..."
@@ -21465,22 +21632,22 @@
msgstr ""
#: builtin/replace.c:125
-#, fuzzy, c-format
+#, c-format
msgid "replace ref '%s' not found"
msgstr "ref substituição '%s' por encontrar"
#: builtin/replace.c:141
-#, fuzzy, c-format
+#, c-format
msgid "Deleted replace ref '%s'"
msgstr "Ref substituição '%s' apagada"
#: builtin/replace.c:153
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid ref name"
msgstr "'%s' é nome de ref inválido"
#: builtin/replace.c:158
-#, fuzzy, c-format
+#, c-format
msgid "replace ref '%s' already exists"
msgstr "ref substituição '%s' já existe"
@@ -21493,7 +21660,7 @@
msgstr ""
#: builtin/replace.c:229
-#, fuzzy, c-format
+#, c-format
msgid "unable to open %s for writing"
msgstr "incapaz abrir %s para escrita"
@@ -21502,189 +21669,173 @@
msgstr ""
#: builtin/replace.c:258
-#, fuzzy, c-format
+#, c-format
msgid "unable to open %s for reading"
msgstr "incapaz abrir %s para ler"
-#: builtin/replace.c:272
-#, fuzzy
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "incapaz lançar mktree"
-#: builtin/replace.c:276
-#, fuzzy
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "incapaz ler de mktree"
-#: builtin/replace.c:285
-#, fuzzy
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "mktree reportou falha"
-#: builtin/replace.c:289
-#, fuzzy
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree retornou nome de objeto nenhum"
-#: builtin/replace.c:298
-#, fuzzy, c-format
+#: builtin/replace.c:297
+#, c-format
msgid "unable to fstat %s"
msgstr "incapaz fstat %s"
-#: builtin/replace.c:303
-#, fuzzy
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "incapaz escrever objeto para base de dados"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, fuzzy, c-format
-msgid "not a valid object name: '%s'"
-msgstr "nome de objeto inválido: '%s'"
-
-#: builtin/replace.c:326
-#, fuzzy, c-format
+#: builtin/replace.c:325
+#, c-format
msgid "unable to get object type for %s"
msgstr "incapaz obter tipo de objetos para %s"
-#: builtin/replace.c:342
-#, fuzzy
+#: builtin/replace.c:341
msgid "editing object file failed"
-msgstr "falha ao ler referências bissetadas"
+msgstr "falhou editar ficheiro-objeto"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:384
-#, fuzzy, c-format
+#: builtin/replace.c:383
+#, c-format
msgid "could not parse %s as a commit"
-msgstr "incapaz processar %s como commit"
+msgstr "incapaz processar %s como memória"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
-msgstr "mergetag incorreta no commit '%s'"
+msgstr "mergetag inválida na memória '%s'"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
-msgstr "mergetag malformada no commit '%s'"
+msgstr "mergetag malformada na memória '%s'"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-"o commit original '%s' contém a mergetag '%s' que foi excluída; use --edit "
+"memória original '%s' contém a etiqueta-junção '%s' que foi descartada; usa --edit "
"em vez de --graft"
-#: builtin/replace.c:469
-#, fuzzy, c-format
+#: builtin/replace.c:468
+#, c-format
msgid "the original commit '%s' has a gpg signature"
-msgstr "o commit original '%s' tem uma assinatura gpg."
+msgstr "a memória original '%s' tem uma assinatura gpg."
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
-msgstr "a assinatura será removida do commit suplente!"
+msgstr "a assinatura será removida na memória substituta!"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
-msgstr "incapaz escrever o commit substituto para: '%s'"
+msgstr "incapaz escrever a memória substituta para: '%s'"
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
-msgstr ""
+msgstr "desnecessário enxerto para '%s'"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:527
-#, fuzzy, c-format
+#: builtin/replace.c:526
+#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-"Impossível converter os seguinte(s) graft(s):\n"
+"incapaz converter os seguinte(s) enxerto(s):\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
-msgstr "listar referências substituídas"
+msgstr "listar refs de substituição"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "eliminar refs de substituição"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "editar objeto existente"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
-msgstr "mudar os pais de um commit"
+msgstr "alterar parentes da memória"
+
+#: builtin/replace.c:551
+msgid "convert existing graft file"
+msgstr "converter ficheiro enxerto existente"
#: builtin/replace.c:552
-#, fuzzy
-msgid "convert existing graft file"
-msgstr "forçar substituição dos ficheiros existentes"
-
-#: builtin/replace.c:553
msgid "replace the ref if it exists"
msgstr "substituir a referência se esta existir"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "incapaz pretty-print conteúdo para --edit"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "usar este formato"
-#: builtin/replace.c:569
-#, fuzzy
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
-msgstr "--format apenas pode ser usado quando faz listagem"
+msgstr "--format apenas pode ser usado quando fazes listagem"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
-msgstr ""
+msgstr "-f apenas faz sentido quando escreves um substituto"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
-msgstr ""
+msgstr "--raw apenas faz sentido com --edit"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
-msgstr ""
+msgstr "-d precisa pelo menos um argumento"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr ""
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr ""
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr ""
-#: builtin/replace.c:611
-#, fuzzy
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file leva argumento nenhum"
-#: builtin/replace.c:617
-#, fuzzy
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
-msgstr "combinar padrões especificados com -e"
+msgstr "com -l apenas pode ser dado um padrão"
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
@@ -21693,176 +21844,165 @@
#: builtin/rerere.c:58
msgid "register clean resolutions in index"
-msgstr "registar resoluções limpas no índice"
+msgstr "registar resoluções corretas em cenário"
#: builtin/rerere.c:77
msgid "'git rerere forget' without paths is deprecated"
-msgstr ""
+msgstr "'git rerere forget' sem caminho é obsoleto"
#: builtin/rerere.c:111
-#, fuzzy, c-format
+#, c-format
msgid "unable to generate diff for '%s'"
msgstr "incapaz gerar diff para '%s'"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-
-#: builtin/reset.c:33
-#, fuzzy
-msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr "git reset [-q] [<árvore-etc>] [--] <caminhos>..."
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<memória>]"
#: builtin/reset.c:34
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<arvoredo>] [--] <espetro-caminho>..."
+
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arvoredo>]"
-#: builtin/reset.c:35
-#, fuzzy
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-msgstr "git reset --patch [<árvore-etc>] [--] [<caminhos>...]"
+msgstr "git reset --patch [<arvoredo>] [--] [<espetro-caminho>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "misturado"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "suave"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "forte"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
-msgstr "merge"
+msgstr "junção"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "conservador"
-#: builtin/reset.c:83
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
-msgstr "HEAD inválida."
+msgstr "Tens HEAD inválida."
-#: builtin/reset.c:85
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
-msgstr "Falha ao procurar árvore de HEAD."
+msgstr "Falhou encontrar árvore de HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
-msgstr "Falha ao procurar árvore de %s."
+msgstr "Falhou encontrar árvore de %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD está agora em %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:304
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Incapaz de fazer uma reposição %s durante uma junção."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
+#: builtin/stash.c:693
msgid "be quiet, only report errors"
-msgstr "silencioso, só reportar erros"
+msgstr "ficar silencioso, só reportar erros"
-#: builtin/reset.c:297
-msgid "reset HEAD and index"
-msgstr "repor HEAD e índice"
-
-#: builtin/reset.c:298
-msgid "reset only HEAD"
-msgstr "repor HEAD apenas"
-
-#: builtin/reset.c:300 builtin/reset.c:302
-msgid "reset HEAD, index and working tree"
-msgstr "repor HEAD, índice e árvore de trabalho"
-
-#: builtin/reset.c:304
-msgid "reset HEAD but keep local changes"
-msgstr "repor HEAD mas conservar alterações locais"
-
-#: builtin/reset.c:310
-msgid "record only the fact that removed paths will be added later"
-msgstr "registar apenas o facto de que os caminhos removidos serão adicionados"
-
-#: builtin/reset.c:344
-#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
-msgstr "Falha ao resolver '%s' como referência válida."
-
-#: builtin/reset.c:352
-#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
-msgstr "Falha ao resolver '%s' como árvore válida."
-
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch é incompatível com --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+#: builtin/reset.c:404
+msgid "skip refreshing the index after reset"
msgstr ""
-"--mixed acompanhado com caminhos é obsoleto; use 'git reset -- <caminhos>'."
-#: builtin/reset.c:373
-#, c-format
-msgid "Cannot do %s reset with paths."
-msgstr "Incapaz de fazer uma reposição %s com paths."
+#: builtin/reset.c:406
+msgid "reset HEAD and index"
+msgstr "restabelecer HEAD e cenário"
-#: builtin/reset.c:388
-#, c-format
-msgid "%s reset is not allowed in a bare repository"
-msgstr "%s reset é proíbido num repositório nú"
+#: builtin/reset.c:407
+msgid "reset only HEAD"
+msgstr "restabelecer apenas HEAD"
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "-N só pode ser usado com --mixed"
+#: builtin/reset.c:409 builtin/reset.c:411
+msgid "reset HEAD, index and working tree"
+msgstr "restabelecer HEAD, cenário e árvore-trabalho"
#: builtin/reset.c:413
-msgid "Unstaged changes after reset:"
-msgstr "Alterações despreparadas depois de reposição:"
+msgid "reset HEAD but keep local changes"
+msgstr "restabelecer HEAD mas conservar alterações locais"
-#: builtin/reset.c:416
+#: builtin/reset.c:419
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+"registar apenas o facto de que os caminhos removidos serão adicionados mais "
+"tarde"
+
+#: builtin/reset.c:452
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "Falhou resolver '%s' como referência válida."
+
+#: builtin/reset.c:460
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "Falhou resolver '%s' como árvore válida."
+
+#: builtin/reset.c:479
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr "--mixed com caminhos é obsoleto; usa 'git reset -- <caminhos>' invés."
+
+#: builtin/reset.c:481
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "Incapaz de fazer uma reposição %s com caminhos."
+
+#: builtin/reset.c:496
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr "%s restabelecer é proibido num repositório nu"
+
+#: builtin/reset.c:527
+msgid "Unstaged changes after reset:"
+msgstr "Alterações desencenadas depois do restabelecimento:"
+
+#: builtin/reset.c:530
#, c-format
msgid ""
-"\n"
-"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
-"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
-"to make this the default.\n"
+"It took %.2f seconds to refresh the index after reset. You can use\n"
+"'--no-refresh' to avoid this."
msgstr ""
+"Demorou %.2f segundos para refrescar o cenário após restabelecimento.\n"
+"Para evitar isto, podes usar '--no-refresh'."
-#: builtin/reset.c:434
+#: builtin/reset.c:547
#, c-format
msgid "Could not reset index file to revision '%s'."
-msgstr "Incapaz repor ficheiro index para a revisão '%s'."
+msgstr "Incapaz restabelecer ficheiro de cenário para a revisão '%s'."
-#: builtin/reset.c:439
+#: builtin/reset.c:552
msgid "Could not write new index file."
-msgstr "Incapaz escrever novo ficheiro index."
+msgstr "Incapaz escrever ficheiro de cenário novo."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
-
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr ""
-
-#: builtin/rev-list.c:674
+#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
msgstr "rev-list insustenta mostrar notas"
-#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr ""
+#: builtin/rev-list.c:664
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "contagem marcada e '%s' só podem ser usadas separadamente"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -21881,7 +22021,6 @@
msgstr "mostrar em formato fixo e longo"
#: builtin/rev-parse.c:438
-#, fuzzy
msgid "premature end of input"
msgstr "fim de input prematuro"
@@ -21890,7 +22029,6 @@
msgstr "antes do separador '--' foi dado string de utilização nenhuma"
#: builtin/rev-parse.c:548
-#, fuzzy
msgid "Needed a single revision"
msgstr "Precisava uma única revisão"
@@ -21910,58 +22048,52 @@
"utilização."
#: builtin/rev-parse.c:712
-#, fuzzy
msgid "--resolve-git-dir requires an argument"
-msgstr "--resolve-git-dir requer argumento"
+msgstr "--resolve-git-dir exige argumento"
#: builtin/rev-parse.c:715
-#, fuzzy, c-format
+#, c-format
msgid "not a gitdir '%s'"
-msgstr "gitdir '%s' nenhuma"
+msgstr "nenhuma pasta-git '%s'"
#: builtin/rev-parse.c:739
-#, fuzzy
msgid "--git-path requires an argument"
-msgstr "--git-path requer argumento"
+msgstr "--git-path exige argumento"
#: builtin/rev-parse.c:749
-#, fuzzy
msgid "-n requires an argument"
-msgstr "-n requer argumento"
+msgstr "-n exige argumento"
#: builtin/rev-parse.c:763
-#, fuzzy
msgid "--path-format requires an argument"
-msgstr "--path-format requer argumento"
+msgstr "--path-format exige argumento"
#: builtin/rev-parse.c:769
-#, fuzzy, c-format
+#, c-format
msgid "unknown argument to --path-format: %s"
msgstr "argumento desconhecido para --path-format: %s"
#: builtin/rev-parse.c:776
-#, fuzzy
msgid "--default requires an argument"
-msgstr "--default requer argumento"
+msgstr "--default exige argumento"
#: builtin/rev-parse.c:782
-#, fuzzy
msgid "--prefix requires an argument"
-msgstr "--prefix requer argumento"
+msgstr "--prefix exige argumento"
#: builtin/rev-parse.c:851
-#, fuzzy, c-format
+#, c-format
msgid "unknown mode for --abbrev-ref: %s"
msgstr "modo desconhecido para --abbrev-ref: %s"
#: builtin/rev-parse.c:1023
-#, fuzzy, c-format
+#, c-format
msgid "unknown mode for --show-object-format: %s"
msgstr "modo desconhecido para --show-object-format: %s"
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
-msgstr "git revert [<opções>] <commit-etc>..."
+msgstr "git revert [<opções>] <mnemónica>..."
#: builtin/revert.c:25
msgid "git revert <subcommand>"
@@ -21969,7 +22101,7 @@
#: builtin/revert.c:30
msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr "git cherry-pick [<opções>] <commit-etc>..."
+msgstr "git cherry-pick [<opções>] <mnemónica>..."
#: builtin/revert.c:31
msgid "git cherry-pick <subcommand>"
@@ -21987,15 +22119,15 @@
#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
-msgstr "terminar reversão ou cherry-pick"
+msgstr "terminar sequência de reversão ou apanha"
#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
-msgstr "retomar a reversão ou cherry-pick"
+msgstr "retomar sequência de reversão ou apanha"
#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
-msgstr "cancelar reversão ou cherry-pick"
+msgstr "cancelar sequência de reversão ou apanha"
#: builtin/revert.c:105
msgid "skip current commit and continue"
@@ -22003,7 +22135,7 @@
#: builtin/revert.c:107
msgid "don't automatically commit"
-msgstr "memorizar automaticamente nada"
+msgstr "memorizar nada automaticamente"
#: builtin/revert.c:108
msgid "edit the commit message"
@@ -22011,39 +22143,43 @@
#: builtin/revert.c:111
msgid "parent-number"
-msgstr "número-pai"
+msgstr "número-parente"
#: builtin/revert.c:112
msgid "select mainline parent"
-msgstr "selecionar pai principal"
+msgstr "selecionar parente principal"
#: builtin/revert.c:114
msgid "merge strategy"
-msgstr "estratégia de integração"
+msgstr "estratégia de junção"
#: builtin/revert.c:116
msgid "option for merge strategy"
-msgstr "opção de estratégia de integração"
+msgstr "opção para estratégia de junção"
#: builtin/revert.c:125
msgid "append commit name"
-msgstr "acrescentar nome do commit"
+msgstr "acrescentar nome de memória"
#: builtin/revert.c:127
msgid "preserve initially empty commits"
-msgstr "preservar commits inicialmente vazios"
+msgstr "preservar memórias inicialmente vazias"
+
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "permitir memórias com mensagens vazias"
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
-msgstr "manter commits redundantes e vazios"
+msgstr "manter memórias redundantes e vazias"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "falha ao reverter"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
-msgstr "falha ao efetuar cherry-pick"
+msgstr "falhou a apanha"
#: builtin/rm.c:20
msgid "git rm [<options>] [--] <file>..."
@@ -22057,10 +22193,10 @@
"the following files have staged content different from both the\n"
"file and the HEAD:"
msgstr[0] ""
-"o seguinte ficheiro tem staged content diferente quer no ficheiro\n"
+"o ficheiro seguinte tem conteúdo encenado diferente quer no ficheiro\n"
"quer em HEAD:"
msgstr[1] ""
-"os seguintes ficheiros têm staged content diferente quer no ficheiro\n"
+"os ficheiros seguintes têm conteúdo encenado diferente quer no ficheiro\n"
"quer em HEAD:"
#: builtin/rm.c:213
@@ -22074,8 +22210,8 @@
#: builtin/rm.c:217
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
-msgstr[0] "o seguinte ficheiro contém alterações preparadas no índice:"
-msgstr[1] "os seguintes ficheiros contêm alterações preparadas no índice:"
+msgstr[0] "o ficheiro seguinte tem alterações encenadas no cenário:"
+msgstr[1] "os ficheiros seguintes tem alterações encenadas no cenário:"
#: builtin/rm.c:221 builtin/rm.c:230
msgid ""
@@ -22091,82 +22227,78 @@
msgstr[0] "o seguinte ficheiro contém alterações locais:"
msgstr[1] "os seguintes ficheiros contêm alterações locais:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "listar ficheiros removidos nenhuns"
-#: builtin/rm.c:245
-msgid "only remove from the index"
-msgstr "remover apenas do índice"
-
#: builtin/rm.c:246
-msgid "override the up-to-date check"
-msgstr "ignorar verificação de atualização"
+msgid "only remove from the index"
+msgstr "remover apenas de cenário"
#: builtin/rm.c:247
+msgid "override the up-to-date check"
+msgstr "sobrepor a verificação de atualização"
+
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "permitir remoção recursiva"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "sair com valor zero mesmo se nada corresponder"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
-#: builtin/rm.c:310
-#, fuzzy
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
+"por favor encena tuas alterações em .gitmodules ou esconde-as para prosseguir"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "removendo '%s' recursivamente apenas com -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: incapaz remover %s"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<diretório> "
-"[<ref>...]\n"
-" --all e <ref> explícito são mutuamente exclusivos."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<pasta> (--all | <ref>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "nome de remoto"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "use protocolo RPC sem estado"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
-msgstr "ler referências do stdin"
+msgstr "ler refs de entrada padrão"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
-msgstr "imprimir estado do programa auxiliar remoto"
+msgstr "imprimir status de ajudante remoto"
#: builtin/shortlog.c:16
-#, fuzzy
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr ""
-"git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]"
+msgstr "git shortlog [<opções>] [<intervalo-revisões>] [[--] [<caminho>...]]"
#: builtin/shortlog.c:17
-#, fuzzy
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<opções>]"
@@ -22179,35 +22311,31 @@
msgstr ""
#: builtin/shortlog.c:323
-#, fuzzy, c-format
+#, c-format
msgid "unknown group type: %s"
-msgstr "Tipo desconhecido: %d"
+msgstr "tipo de grupo desconhecido: %s"
#: builtin/shortlog.c:351
-#, fuzzy
msgid "group by committer rather than author"
-msgstr "agrupar por committer em vez de autor"
+msgstr "agrupar por memorizador em vez de autor"
#: builtin/shortlog.c:354
msgid "sort output according to the number of commits per author"
-msgstr "ordenar saída de acordo com o número de commits por autor"
+msgstr "ordenar saída de acordo com o número de memórias por autor"
#: builtin/shortlog.c:356
-#, fuzzy
msgid "suppress commit descriptions, only provides commit count"
-msgstr "suprimir a descrição dos commits, fornecer apenas o número de commits"
+msgstr "suprimir a descrição de memórias, fornecer apenas o número de memórias"
#: builtin/shortlog.c:358
-#, fuzzy
msgid "show the email address of each author"
-msgstr "Mostrar o endereço de e-mail de cada autor"
+msgstr "mostrar endereço de e-mail de cada autor"
#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr ""
#: builtin/shortlog.c:360
-#, fuzzy
msgid "linewrap output"
msgstr "ajustar linhas"
@@ -22219,27 +22347,28 @@
msgid "group by field"
msgstr ""
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:395
msgid "too many arguments given outside repository"
msgstr ""
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<revisão> | <glob>)...]"
+" [--current] [--color[=<quando>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<revisão> | "
+"<glob>)...]"
-#: builtin/show-branch.c:17
+#: builtin/show-branch.c:18
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referência>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
-#: builtin/show-branch.c:395
+#: builtin/show-branch.c:396
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
@@ -22249,7 +22378,7 @@
#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
-msgstr "correspondência de refs com %s nenhuma"
+msgstr "nenhuma correspondência de refs com %s"
#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
@@ -22257,7 +22386,7 @@
#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
-msgstr ""
+msgstr "mostrar ramos remotos de monitorização"
#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
@@ -22265,7 +22394,7 @@
#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
-msgstr "mostrar mais <n> commits depois do antecessor comum"
+msgstr "mostrar mais <n> memórias após a antecessora comum"
#: builtin/show-branch.c:653
msgid "synonym to more=-1"
@@ -22273,7 +22402,7 @@
#: builtin/show-branch.c:654
msgid "suppress naming strings"
-msgstr "suprimir a cadeias de caracteres de nomes"
+msgstr "suprimir nomes de strings"
#: builtin/show-branch.c:656
msgid "include the current branch"
@@ -22281,15 +22410,15 @@
#: builtin/show-branch.c:658
msgid "name commits with their object names"
-msgstr "designar commits pelos seus nomes de objeto"
+msgstr "designar memórias pelos seus nomes de objeto"
#: builtin/show-branch.c:660
msgid "show possible merge bases"
-msgstr "mostrar possíveis bases de integração"
+msgstr "mostrar possíveis bases de junção"
#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
-msgstr "mostrar referências inalcançáveis a partir de outras referências"
+msgstr "mostrar refs inalcançáveis a partir de outras refs"
#: builtin/show-branch.c:664
msgid "show commits in topological order"
@@ -22297,11 +22426,11 @@
#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
-msgstr "mostrar apenas commits fora do primeiro ramo"
+msgstr "mostrar apenas memórias fora do primeiro ramo"
#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
-msgstr "mostrar integrações alcançáveis a partir duma única ponta"
+msgstr "mostrar junções alcançáveis a partir duma única ponta"
#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
@@ -22314,13 +22443,7 @@
#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
-msgstr "mostrar as <n> entradas de ref-log mais recente a partir da base"
-
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog é incompatível com --all, --remotes, --independent or --merge-base"
+msgstr "mostrar as <n> entradas de ref-log mais recente começando na base"
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
@@ -22328,14 +22451,14 @@
#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
-msgstr "a opção --reflog precisa do nome de um ramo"
+msgstr "opção --reflog precisa de nome de ramo"
#: builtin/show-branch.c:741
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
-msgstr[0] "apenas %d entrada podem ser mostradas neste momento."
-msgstr[1] "apenas %d entradas podem ser mostradas neste momento."
+msgstr[0] "apenas %d entrada podem ser mostradas de uma só vez."
+msgstr[1] "apenas %d entradas podem ser mostradas de uma só vez."
#: builtin/show-branch.c:745
#, c-format
@@ -22357,7 +22480,7 @@
#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
-msgstr "incapaz encontrar commit %s (%s)"
+msgstr "incapaz encontrar memória %s (%s)"
#: builtin/show-index.c:21
msgid "hash-algorithm"
@@ -22381,17 +22504,15 @@
#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
-msgstr "mostrar apenas tags (pode ser combinado com heads)"
+msgstr "mostrar apenas etiquetas (pode ser combinado com cabeças)"
#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
-msgstr "mostrar apenas cabeças (pode ser combinado com tags)"
+msgstr "mostrar apenas cabeças (pode ser combinado com etiquetas)"
#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
-msgstr ""
-"verificação de referências mais rigorosa, requer o caminho exato da "
-"referência"
+msgstr "verificação de referências mais rigorosa, exige caminho exato da ref"
#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
@@ -22399,7 +22520,7 @@
#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
-msgstr "desreferenciar tags em IDs de objeto"
+msgstr "desreferenciar etiquetas em IDs de objeto"
#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
@@ -22413,137 +22534,197 @@
msgid "show refs from stdin that aren't in local repository"
msgstr "mostrar refs de stdin que estão fora do repositório local"
-#: builtin/sparse-checkout.c:22
+#: builtin/sparse-checkout.c:23
msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
-msgstr ""
+msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opções>"
-#: builtin/sparse-checkout.c:46
-#, fuzzy
-msgid "git sparse-checkout list"
-msgstr "git archive --list"
+#: builtin/sparse-checkout.c:61
+msgid "this worktree is not sparse"
+msgstr "esta árvore-trabalho é nada dispersa"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:76
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-#: builtin/sparse-checkout.c:227
-#, fuzzy
+#: builtin/sparse-checkout.c:177
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+
+#: builtin/sparse-checkout.c:185
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "falhou remover pasta '%s'"
+
+#: builtin/sparse-checkout.c:327
msgid "failed to create directory for sparse-checkout file"
-msgstr "falha ao criar o diretório %s"
+msgstr "falhou criar a pasta para ficheiro sparse-checkout"
-#: builtin/sparse-checkout.c:268
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr ""
+#: builtin/sparse-checkout.c:366
+msgid "failed to initialize worktree config"
+msgstr "falhou iniciar config da árvore-trabalho"
-#: builtin/sparse-checkout.c:270
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr ""
-
-#: builtin/sparse-checkout.c:290
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr ""
-
-#: builtin/sparse-checkout.c:310
-msgid "initialize the sparse-checkout in cone mode"
-msgstr ""
-
-#: builtin/sparse-checkout.c:312
-msgid "toggle the use of a sparse index"
-msgstr ""
-
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:411
msgid "failed to modify sparse-index config"
msgstr ""
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
+#: builtin/sparse-checkout.c:847
+msgid "initialize the sparse-checkout in cone mode"
+msgstr ""
+
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
+#: builtin/sparse-checkout.c:849
+msgid "toggle the use of a sparse index"
+msgstr ""
+
+#: builtin/sparse-checkout.c:479
#, c-format
msgid "failed to open '%s'"
-msgstr "falha ao abrir '%s'"
+msgstr "falhou abrir '%s'"
-#: builtin/sparse-checkout.c:413
-#, fuzzy, c-format
+#: builtin/sparse-checkout.c:531
+#, c-format
msgid "could not normalize path %s"
msgstr "incapaz normalizar patch %s"
-#: builtin/sparse-checkout.c:425
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:450
-#, fuzzy, c-format
+#: builtin/sparse-checkout.c:560
+#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "incapaz de unquote string de C-style '%s'"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:619
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr ""
+
+#: builtin/sparse-checkout.c:707
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr ""
+
+#: builtin/sparse-checkout.c:712
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:714
+msgid ""
+"specify directories rather than patterns. If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+
+#: builtin/sparse-checkout.c:716
+msgid ""
+"specify directories rather than patterns. If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+
+#: builtin/sparse-checkout.c:732
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr ""
+
+#: builtin/sparse-checkout.c:734
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+
+#: builtin/sparse-checkout.c:739
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <padrão>)"
+
+#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr ""
+
+#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
msgid "read patterns from standard in"
msgstr ""
-#: builtin/sparse-checkout.c:588
-msgid "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:760
+msgid "no sparse-checkout to add to"
+msgstr "nenhum sparse-checkout a que adicionar"
+
+#: builtin/sparse-checkout.c:775
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <padrões>)"
+
+#: builtin/sparse-checkout.c:854
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
msgstr ""
-#: builtin/sparse-checkout.c:607
-#, fuzzy
-msgid "git sparse-checkout disable"
-msgstr "ignorar a aplicação do filtro de extração esparsa"
-
-#: builtin/sparse-checkout.c:638
-#, fuzzy
+#: builtin/sparse-checkout.c:914
msgid "error while refreshing working directory"
-msgstr "erro enquanto refrescava pasta de trabalho"
+msgstr "erro ao refrescar pasta-trabalho"
#: builtin/stash.c:24 builtin/stash.c:40
-#, fuzzy
msgid "git stash list [<options>]"
msgstr "git stash list [<opções>]"
#: builtin/stash.c:25 builtin/stash.c:45
-#, fuzzy
msgid "git stash show [<options>] [<stash>]"
-msgstr "git stash show [<opções>] [<escondido>]"
+msgstr "git stash show [<opções>] [<esconderijo>]"
#: builtin/stash.c:26 builtin/stash.c:50
msgid "git stash drop [-q|--quiet] [<stash>]"
-msgstr ""
+msgstr "git stash drop [-q|--quiet] [<esconderijo>]"
#: builtin/stash.c:27
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
-msgstr ""
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<esconderijo>]"
#: builtin/stash.c:28 builtin/stash.c:65
-#, fuzzy
msgid "git stash branch <branchname> [<stash>]"
-msgstr "git stash branch <nome-de-ramo> [<escondido>]"
+msgstr "git stash branch <nome-de-ramo> [<esconderijo>]"
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <mensagem>]\n"
+" [--pathspec-from-file=<ficheiro> [--pathspec-file-nul]]\n"
+" [--] [<espetro-caminho>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<mensagem>]"
#: builtin/stash.c:55
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
-msgstr ""
+msgstr "git stash pop [--index] [-q|--quiet] [<esconderijo>]"
#: builtin/stash.c:60
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
-msgstr ""
+msgstr "git stash apply [--index] [-q|--quiet] [<esconderijo>]"
#: builtin/stash.c:75
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
-msgstr ""
+msgstr "git stash store [-m|--message <mensagem>] [-q|--quiet] <memória>"
#: builtin/stash.c:80
msgid ""
@@ -22551,33 +22732,42 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--] [<pathspec>...]]"
msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <mensagem>]\n"
+" [--] [<espetro-caminho>...]]"
+
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<mensagem>]"
#: builtin/stash.c:130
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a stash-like commit"
-msgstr "'%s' é commit tipo-arrumos nenhum"
+msgstr "'%s' é memória tipo esconderijo nenhuma"
#: builtin/stash.c:150
-#, fuzzy, c-format
+#, c-format
msgid "Too many revisions specified:%s"
-msgstr "Demasiadas revisões especificadas: $REV"
+msgstr "Demasiadas revisões especificadas:%s"
#: builtin/stash.c:164
-#, fuzzy
msgid "No stash entries found."
-msgstr "Nenhuma pilha encontrada."
+msgstr "Encontrado entrada de esconderijo nenhuma."
#: builtin/stash.c:178
-#, fuzzy, c-format
+#, c-format
msgid "%s is not a valid reference"
msgstr "%s é referência inválida"
#: builtin/stash.c:227
-#, fuzzy
msgid "git stash clear with arguments is unimplemented"
-msgstr "git stash clear com parâmetros está por implementar"
+msgstr "git stash clear com argumentos está por implementar"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22585,192 +22775,180 @@
" to make room.\n"
msgstr ""
-#: builtin/stash.c:492
-#, fuzzy
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
-msgstr "incapaz aplicar arrumação durante uma junção"
+msgstr "incapaz de esconder durante uma junção"
-#: builtin/stash.c:503
-#, fuzzy, c-format
+#: builtin/stash.c:519
+#, c-format
msgid "could not generate diff %s^!."
msgstr "incapaz gerar diff %s^!."
-#: builtin/stash.c:510
-#, fuzzy
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
-msgstr "Conflitos no index. Tenta sem --index."
+msgstr "conflitos no cenário. Tenta sem --index."
-#: builtin/stash.c:516
-#, fuzzy
+#: builtin/stash.c:532
msgid "could not save index tree"
-msgstr "incapaz guardar árvore index"
+msgstr "incapaz guardar árvore de cenário"
-#: builtin/stash.c:525
-#, fuzzy
-msgid "could not restore untracked files from stash"
-msgstr "incapaz restaurar ficheiros por seguir de arrumos"
-
-#: builtin/stash.c:539
-#, fuzzy, c-format
+#: builtin/stash.c:552
+#, c-format
msgid "Merging %s with %s"
msgstr "Juntando %s com %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
-msgstr "Index está por despreparar."
+msgstr "Cenário ficou por sair do esconderijo."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "incapaz restaurar ficheiros desmonitorizados de esconderijo"
+
+#: builtin/stash.c:608 builtin/stash.c:695
msgid "attempt to recreate the index"
-msgstr ""
+msgstr "tentativa de recriar o cenário"
-#: builtin/stash.c:635
-#, fuzzy, c-format
+#: builtin/stash.c:641
+#, c-format
msgid "Dropped %s (%s)"
-msgstr "A descartar ${REV} ($s)"
+msgstr "Descartei %s (%s)"
-#: builtin/stash.c:638
-#, fuzzy, c-format
+#: builtin/stash.c:644
+#, c-format
msgid "%s: Could not drop stash entry"
-msgstr "%s: Incapaz descartar entrada de arrumos"
+msgstr "%s: Incapaz descartar entrada de esconderijo"
-#: builtin/stash.c:651
-#, fuzzy, c-format
+#: builtin/stash.c:657
+#, c-format
msgid "'%s' is not a stash reference"
-msgstr "'%s' é referência de arrumos nenhuma"
+msgstr "'%s' é referência de esconderijo nenhuma"
-#: builtin/stash.c:701
-#, fuzzy
+#: builtin/stash.c:707
msgid "The stash entry is kept in case you need it again."
-msgstr "A pilha é guarda no caso de precisar dela de novo."
+msgstr "A entrada de esconderijo está guardada caso voltes a precisar."
-#: builtin/stash.c:724
+#: builtin/stash.c:730
msgid "No branch name specified"
msgstr "Nenhum nome de ramo especificado"
-#: builtin/stash.c:808
-#, fuzzy
+#: builtin/stash.c:809
msgid "failed to parse tree"
msgstr "falhou processar árvore"
-#: builtin/stash.c:819
-#, fuzzy
+#: builtin/stash.c:820
msgid "failed to unpack trees"
-msgstr "falha ao descompactar o objeto árvore HEAD"
+msgstr "falhou desempacotar árvores"
-#: builtin/stash.c:839
-#, fuzzy
+#: builtin/stash.c:840
msgid "include untracked files in the stash"
-msgstr "incluir ficheiros desmonitorizados de esconderijo"
+msgstr "incluir ficheiros desmonitorizados em esconderijo"
-#: builtin/stash.c:842
-#, fuzzy
+#: builtin/stash.c:843
msgid "only show untracked files in the stash"
-msgstr "mostrar apenas ficheiros desmonitorizados de esconderijo"
+msgstr "apenas mostrar ficheiros desmonitorizados de esconderijo"
-#: builtin/stash.c:929 builtin/stash.c:966
-#, fuzzy, c-format
+#: builtin/stash.c:930 builtin/stash.c:967
+#, c-format
msgid "Cannot update %s with %s"
msgstr "Incapaz atualizar %s com %s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
-#, fuzzy
+#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
msgid "stash message"
-msgstr "mensagem da tag"
+msgstr "mensagem de esconderijo"
-#: builtin/stash.c:957
+#: builtin/stash.c:958
msgid "\"git stash store\" requires one <commit> argument"
-msgstr ""
+msgstr "\"git stash store\" exige um argumento <memória>"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1143
+msgid "No staged changes"
+msgstr "Alterações encenadas nenhumas"
+
+#: builtin/stash.c:1204
msgid "No changes selected"
msgstr "Nenhuma alteração selecionada"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1304
msgid "You do not have the initial commit yet"
-msgstr "Commit inicial ainda é inexistente"
+msgstr "Memória inicial ainda é inexistente"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1331
msgid "Cannot save the current index state"
msgstr "Incapaz guardar estado atual de index"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1340
msgid "Cannot save the untracked files"
-msgstr "Incapaz de guardar ficheiros por seguir"
+msgstr "Incapaz de guardar ficheiros desmonitorizados"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1351 builtin/stash.c:1370
msgid "Cannot save the current worktree state"
-msgstr "Incapaz guardar o estado atual de worktree"
+msgstr "Incapaz guardar estado atual de árvore-trabalho"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1361
+msgid "Cannot save the current staged state"
+msgstr "Incapaz guardar estado atual de cenário"
+
+#: builtin/stash.c:1398
msgid "Cannot record working tree state"
-msgstr "Incapaz gravar o estado de worktree"
+msgstr "Incapaz gravar estado de árvore-trabalho"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1447
msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "Impossível usar --patch e --include-untracked ou --all ao mesmo tempo"
+msgstr "Incapaz usar --patch e --include-untracked ou --all ao mesmo tempo"
-#: builtin/stash.c:1422
-#, fuzzy
+#: builtin/stash.c:1458
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "Incapaz usar --staged e --include-untracked ou --all ao mesmo tempo"
+
+#: builtin/stash.c:1476
msgid "Did you forget to 'git add'?"
-msgstr "Será que falta 'git add'?"
+msgstr "Será que esqueceste-te de 'git add'?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1491
msgid "No local changes to save"
msgstr "Com alterações locais para guardar nenhumas"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1498
msgid "Cannot initialize stash"
-msgstr "Incapaz inicializar arrumos"
+msgstr "Incapaz inicializar esconderijo"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1513
msgid "Cannot save the current status"
msgstr "Incapaz guardar o estado atual"
-#: builtin/stash.c:1464
-#, fuzzy, c-format
+#: builtin/stash.c:1518
+#, c-format
msgid "Saved working directory and index state %s"
-msgstr "Diretório de trabalho e estado do índice $stash_msg guardados"
+msgstr "Pasta-trabalho e estado de cenário %s guardados"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1615
msgid "Cannot remove worktree changes"
-msgstr "Incapaz remover alterações de worktree"
+msgstr "Incapaz remover alterações de árvore-trabalho"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1656 builtin/stash.c:1728
msgid "keep index"
-msgstr ""
+msgstr "manter cenário"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1658 builtin/stash.c:1730
+msgid "stash staged changes only"
+msgstr "esconder apenas alterações encenadas"
+
+#: builtin/stash.c:1660 builtin/stash.c:1732
msgid "stash in patch mode"
-msgstr ""
+msgstr "esconder em modo remendos"
-#: builtin/stash.c:1596 builtin/stash.c:1661
-#, fuzzy
+#: builtin/stash.c:1661 builtin/stash.c:1733
msgid "quiet mode"
msgstr "modo silencioso"
-#: builtin/stash.c:1598 builtin/stash.c:1663
-#, fuzzy
+#: builtin/stash.c:1663 builtin/stash.c:1735
msgid "include untracked files in stash"
-msgstr "incluir ficheiros desmonitorizados de esconderijo"
+msgstr "incluir ficheiros desmonitorizados em esconderijo"
-#: builtin/stash.c:1600 builtin/stash.c:1665
-#, fuzzy
+#: builtin/stash.c:1665 builtin/stash.c:1737
msgid "include ignore files"
-msgstr "mostrar ficheiros ignorados"
-
-#: builtin/stash.c:1700
-msgid ""
-"the stash.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
+msgstr "incluir ficheiros ignorados"
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
@@ -22781,71 +22959,18 @@
msgid "prepend comment character and space to each line"
msgstr "preceder cada linha com um carácter de comentário e um espaço"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Esperava-se um nome completo de uma referência, obteve-se %s"
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr ""
-
-#: builtin/submodule--helper.c:101
+#: builtin/submodule--helper.c:103
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "incapaz despir um componente a partir do url '%s'"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
-msgid "alternative anchor for relative paths"
-msgstr "âncora alternativa para caminhos relativos"
-
-#: builtin/submodule--helper.c:416
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
-
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:213
#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules"
-
-#: builtin/submodule--helper.c:526
-#, fuzzy, c-format
-msgid "Entering '%s'\n"
-msgstr "Entrando em '%s'\n"
-
-#: builtin/submodule--helper.c:529
-#, c-format
-msgid ""
-"run_command returned non-zero status for %s\n"
-"."
-msgstr ""
-
-#: builtin/submodule--helper.c:551
-#, c-format
-msgid ""
-"run_command returned non-zero status while recursing in the nested "
-"submodules of %s\n"
-"."
-msgstr ""
-
-#: builtin/submodule--helper.c:567
-msgid "suppress output of entering each submodule command"
-msgstr ""
-
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
-#, fuzzy
-msgid "recurse into nested submodules"
-msgstr "percorrer recursivamente submódulos aninhados"
-
-#: builtin/submodule--helper.c:574
-msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
-msgstr ""
-
-#: builtin/submodule--helper.c:601
-#, fuzzy, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
@@ -22853,211 +22978,248 @@
"incapaz encontrar configuração '%s'. Assumindo que este repositório é o "
"próprio repositório upstream autoritário."
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
+msgid "alternative anchor for relative paths"
+msgstr "âncora alternativa para caminhos relativos"
+
+#: builtin/submodule--helper.c:418
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
+
+#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
+#: builtin/submodule--helper.c:640
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules"
+
+#: builtin/submodule--helper.c:528
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Entrando em '%s'\n"
+
+#: builtin/submodule--helper.c:531
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:553
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:569
+msgid "suppress output of entering each submodule command"
+msgstr ""
+
+#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1458
+msgid "recurse into nested submodules"
+msgstr "percorrer recursivamente submódulos aninhados"
+
+#: builtin/submodule--helper.c:576
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr ""
+
+#: builtin/submodule--helper.c:654
#, c-format
msgid "Failed to register url for submodule path '%s'"
-msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
+msgstr "Falhou registar url para caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:658
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submódulo '%s' (%s) registado para path '%s'\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:668
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "aviso: modo command update sugerido para submódulo '%s'\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:675
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:697
msgid "suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:702
msgid "git submodule--helper init [<options>] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"para path '%s' encontrei em .gitmodules, mapeamento de submódulo nenhum"
-#: builtin/submodule--helper.c:837
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:823
+#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "incapaz resolver ref HEAD dentro de submódulo '%s'"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
+#, c-format
msgid "failed to recurse into submodule '%s'"
-msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
+msgstr "falhou percorrer recursivamente o submódulo '%s'"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
-#, fuzzy
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
msgid "suppress submodule status output"
-msgstr "preceder isto ao caminho do submódulo"
+msgstr "suprimir saída de status de submódulo"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:875
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-#: builtin/submodule--helper.c:895
-#, fuzzy
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<caminho>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <caminho>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:977
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr ""
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:980
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr ""
-#: builtin/submodule--helper.c:1007
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:993
+#, c-format
msgid "%s"
msgstr "[%s]"
-#: builtin/submodule--helper.c:1057
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1043
+#, c-format
msgid "couldn't hash object from '%s'"
msgstr "incapaz fazer hash a objeto a partir de '%s'"
-#: builtin/submodule--helper.c:1061
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1047
+#, c-format
msgid "unexpected mode %o\n"
msgstr "modo inesperado %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1288
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
-#: builtin/submodule--helper.c:1304
-#, fuzzy
+#: builtin/submodule--helper.c:1290
msgid "compare the commit in the index with that in the submodule HEAD"
-msgstr "compara a memória no arquivador com aquela no submódulo HEAD"
+msgstr "compara a memória do cenário com aquela do submódulo HEAD"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1292
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
-#: builtin/submodule--helper.c:1308
-#, fuzzy
+#: builtin/submodule--helper.c:1294
msgid "limit the summary size"
-msgstr "restringir-se a cabeças"
+msgstr "limitar tamanho de sumário"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1299
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1337
-#, fuzzy
+#: builtin/submodule--helper.c:1323
msgid "could not fetch a revision for HEAD"
msgstr "incapaz buscar uma revisão para HEAD"
-#: builtin/submodule--helper.c:1342
-msgid "--cached and --files are mutually exclusive"
-msgstr ""
-
-#: builtin/submodule--helper.c:1409
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1384
+#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Sincronizando url de submódulo para '%s'\n"
-#: builtin/submodule--helper.c:1415
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1390
+#, c-format
msgid "failed to register url for submodule path '%s'"
-msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
+msgstr "falhou registar url para caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1399
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1409
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1456
msgid "suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1463
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1548
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1513
+#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"Submodule work tree '%s' tem uma pasta .git (usa 'rm -rf' se queres mesmo "
-"removê-la e remover toda a história)"
+"Árvore-trabalho de submódulo '%s' contém uma pasta .git. Esta será "
+"substituída por um ficheiro .git usando o absorbgitdirs."
-#: builtin/submodule--helper.c:1560
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1530
+#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "
-"use '-f' para as descartar"
+"Árvore-trabalho de submódulo '%s' contém alterações locais; usa '-f' para as "
+"descartar"
-#: builtin/submodule--helper.c:1568
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1538
+#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Pasta '%s' limpa\n"
-#: builtin/submodule--helper.c:1570
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1540
+#, c-format
msgid "Could not remove submodule work tree '%s'\n"
-msgstr "Impossível remover submodule work tree '%s'\n"
+msgstr "Incapaz remover árvore-trabalho de submódulo '%s'\n"
-#: builtin/submodule--helper.c:1581
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1551
+#, c-format
msgid "could not create empty submodule directory %s"
-msgstr "incapaz criar pasta vazio de submódulo %s"
+msgstr "incapaz criar pasta vazia de submódulo %s"
-#: builtin/submodule--helper.c:1597
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1567
+#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submódulo '%s' (%s) unregistred para caminho '%s'\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1596
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1597
msgid "unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1602
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1616
msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-"Use '--all' se pretende mesmo anular a inicialização todos os submódulos"
+msgstr "Usa '--all' se queres mesmo anular a inicialização de todos submódulos"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1665
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -23065,314 +23227,468 @@
"'--reference-if-able' instead of '--reference'."
msgstr ""
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submódulo '%s' incapaz adicionar alternativo: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1749
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Valor '%s' de submodule.alternateErrorStrategy é irreconhecível"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1756
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Valor '%s' de submodule.alternateLocation é irreconhecível"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1781
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "recusando criar/usar '%s' em outra pasta de submódulo git"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1826
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "clonar '%s' no caminho de submódulo '%s' falhou"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1831
#, c-format
msgid "directory not empty: '%s'"
msgstr "pasta com conteúdo: '%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1843
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "incapaz obter pasta de submódulo para '%s'"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1876
msgid "where the new submodule will be cloned to"
-msgstr "sítio para aonde o novo submódulo será clonado"
+msgstr "para onde o novo submódulo será clonado"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1879
msgid "name of the new submodule"
msgstr "nome do novo submódulo"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1882
msgid "url where to clone the submodule from"
-msgstr "url donde clonar o submódulos"
+msgstr "url donde clonar o submódulo"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
msgid "depth for shallow clones"
-msgstr "profundidade de clones rasos"
+msgstr "profundidade de clones superficiais"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
+#: builtin/submodule--helper.c:3376
msgid "force cloning progress"
msgstr "forçar progresso da clonagem"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
-#, fuzzy
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
msgid "disallow cloning into non-empty directory"
-msgstr "a aplicar a um histórico vazio"
+msgstr "proibindo clonar para uma pasta com conteúdo"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1903
#, fuzzy
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference "
-"<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>"
+"<repositório>] [--name <nome>] [--depth <profundidade>] [--single-branch] [--"
+"filter <espetro-filtro>] --url <url> --path <caminho>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1943
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1947
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Path de submódulo '%s' por inicializar"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Pretendias usar 'update --init'?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Passando à frente submódulo por juntar %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Passando à frente submódulo '%s'"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Falha ao clonar '%s'. Nova tentativa agendada"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Falha ao clonar '%s' pela segunda vez, abortado"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
-msgid "path into the working tree"
-msgstr "caminho para árvore de trabalho"
+#: builtin/submodule--helper.c:2371
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Incapaz de observar '%s' em caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:2347
-msgid "path into the working tree, across nested submodule boundaries"
+#: builtin/submodule--helper.c:2375
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Incapaz de rebasear '%s' em caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2379
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Incapaz juntar '%s' em caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2383
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Execução de '%s %s' falhou em caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2402
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Caminho de submódulo '%s': '%s' observado\n"
+
+#: builtin/submodule--helper.c:2406
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Caminho de submódulo '%s': rebaseado para '%s'\n"
+
+#: builtin/submodule--helper.c:2410
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Caminho de submódulo '%s': juntado em '%s'\n"
+
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Caminho de submódulo '%s': '%s %s'\n"
+
+#: builtin/submodule--helper.c:2438
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr ""
-"caminho para a árvore de trabalho, atravessando limites de submódulos "
-"aninhados"
+"Incapaz de buscar em caminho de submódulo '%s'; tentando buscar %s "
+"directamente:"
-#: builtin/submodule--helper.c:2351
-msgid "rebase, merge, checkout or none"
-msgstr "rebase, merge, checkout ou none"
+#: builtin/submodule--helper.c:2447
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Buscado no caminho de submódulo '%s', mas continha nenhum %s. Falhou ao "
+"buscar essa memória diretamente."
-#: builtin/submodule--helper.c:2357
-#, fuzzy
-msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr "criar um clone raso, truncado ao número especificado de revisões"
-
-#: builtin/submodule--helper.c:2360
-msgid "parallel jobs"
-msgstr "trabalhos em paralelo"
-
-#: builtin/submodule--helper.c:2362
-msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "se o clone inicial deve seguir a recomendação rasa"
-
-#: builtin/submodule--helper.c:2363
-msgid "don't print cloning progress"
-msgstr "imprimir progresso da clonagem nenhum"
-
-#: builtin/submodule--helper.c:2374
-#, fuzzy
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
-
-#: builtin/submodule--helper.c:2387
-msgid "bad value for update parameter"
-msgstr "valor incorreto no parâmetro update"
-
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2481
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-"Ramo de submódulo (%s) foi configurado para herdar o ramo do superprojeto, "
-"mas o superprojeto está em ramo nenhum"
+"Ramo de submódulo (%s) foi configurado para herdar ramo de superprojeto, mas "
+"o superprojeto está em ramo nenhum"
-#: builtin/submodule--helper.c:2558
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2499
+#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "incapaz obter pega de repositório para submódulo '%s'"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2588
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr "Incapaz encontrar revisão atual em caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2599
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "Incapaz de buscar em caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2604
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr "Incapaz encontrar revisão %s em caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2640
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "Falhou percorrer recursivamente o caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2699
+msgid "force checkout updates"
+msgstr "forçar atualizações de observação"
+
+#: builtin/submodule--helper.c:2701
+msgid "initialize uninitialized submodules before update"
+msgstr "iniciar submódulos por iniciar antes de atualização"
+
+#: builtin/submodule--helper.c:2703
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "usa o SHA-1 de ramo remoto de monitorização de submódulo"
+
+#: builtin/submodule--helper.c:2705
+msgid "traverse submodules recursively"
+msgstr ""
+
+#: builtin/submodule--helper.c:2707
+msgid "don't fetch new objects from the remote site"
+msgstr "buscar nenhuns objetos novos de sítio remoto"
+
+#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+msgid "path into the working tree"
+msgstr "caminho para a árvore-trabalho"
+
+#: builtin/submodule--helper.c:2713
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr ""
+"caminho para a árvore-trabalho, atravessando fronteiras de submódulos "
+"encaixados"
+
+#: builtin/submodule--helper.c:2717
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout ou none"
+
+#: builtin/submodule--helper.c:2723
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr ""
+"criar um clone superficial, truncado ao número especificado de revisões"
+
+#: builtin/submodule--helper.c:2726
+msgid "parallel jobs"
+msgstr "trabalhos em paralelo"
+
+#: builtin/submodule--helper.c:2728
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "se o clone inicial deve seguir a recomendação da superfície"
+
+#: builtin/submodule--helper.c:2729
+msgid "don't print cloning progress"
+msgstr "mostrar nenhum progresso da clonagem"
+
+#: builtin/submodule--helper.c:2741
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+msgstr ""
+"git submodule [--quiet] update [--init [--filter=<espetro-filtro>]] [--"
+"remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--"
+"[no-]recommend-shallow] [--reference <repositório>] [--recursive] [--"
+"[no-]single-branch] [--] [<caminho>...]"
+
+#: builtin/submodule--helper.c:2767
+msgid "bad value for update parameter"
+msgstr "valor incorreto no parâmetro update"
+
+#: builtin/submodule--helper.c:2893
msgid "recurse into submodules"
-msgstr "percorrer recursivamente submódulos"
+msgstr "entrar recursivamente nos submódulos"
-#: builtin/submodule--helper.c:2597
-#, fuzzy
+#: builtin/submodule--helper.c:2899
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<caminho>...]"
+msgstr "git submodule--helper absorb-git-dirs [<opções>] [<caminho>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2955
msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2656
-#, fuzzy
+#: builtin/submodule--helper.c:2958
msgid "unset the config in the .gitmodules file"
-msgstr "falha ao preparar .gitmodules atualizado"
+msgstr "indefinir a config no ficheiro .gitmodules"
-#: builtin/submodule--helper.c:2661
-#, fuzzy
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper config <name> [<value>]"
-msgstr "git submodule--helper name <caminho>"
+msgstr "git submodule--helper config <nome> [<valor>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper config --unset <name>"
msgstr ""
-#: builtin/submodule--helper.c:2663
-msgid "git submodule--helper config --check-writeable"
-msgstr ""
-
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, fuzzy, sh-format
+#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
+#: builtin/submodule--helper.c:3395
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
+"por favor certifica-te que ficheiro .gitmodules está na árvore-trabalho"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:3000
msgid "suppress output for setting url of a submodule"
msgstr ""
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:3004
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr ""
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:3037
msgid "set the default tracking branch to master"
-msgstr ""
+msgstr "definir o ramo de monitorização predefinido como master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:3039
msgid "set the default tracking branch"
-msgstr ""
+msgstr "definir o ramo de monitorização predefinido"
-#: builtin/submodule--helper.c:2741
-#, fuzzy
+#: builtin/submodule--helper.c:3043
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <caminho>"
-#: builtin/submodule--helper.c:2742
-#, fuzzy
+#: builtin/submodule--helper.c:3044
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <ramo> <caminho>"
-#: builtin/submodule--helper.c:2749
-#, fuzzy
+#: builtin/submodule--helper.c:3051
msgid "--branch or --default required"
-msgstr "nome do ramo é obrigatório"
+msgstr "--branch ou --default exigido"
-#: builtin/submodule--helper.c:2752
-msgid "--branch and --default are mutually exclusive"
+#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+msgid "print only error messages"
+msgstr "imprimir apenas mensagens de erro"
+
+#: builtin/submodule--helper.c:3073
+msgid "force creation"
msgstr ""
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3081
+msgid "show whether the branch would be created"
+msgstr "mostrar se ramo seria criado"
+
+#: builtin/submodule--helper.c:3085
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+
+#: builtin/submodule--helper.c:3097
+#, c-format
+msgid "creating branch '%s'"
+msgstr "criando ramo '%s'"
+
+#: builtin/submodule--helper.c:3155
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Adicionando repo existente em '%s' ao cenário\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3158
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' já existe e é repositório git inválido"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3171
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "Uma pasta git para '%s' foi encontrado localmente com remoto(s):"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "Uma pasta git para '%s' foi encontrado localmente com remoto(s):\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3178
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"Se queres reutilizar esta pasta git local, em vez de voltares a clonar de\n"
" %s\n"
-"usa a opção '--force'. Se a pasta git local é o repo incorreto ou\n"
-"se tens pouca certeza sobre o que isto significa, podes mudar o nome com a "
-"opção '--name'.\n"
+"usa a opção '--force'. Se a pasta git local é um repo incorreto\n"
+"ou se tens pouca certeza o que isto significa, muda o nome com a opção '--"
+"name'."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3190
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Reactivando pasta git local para submódulo '%s'\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3227
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "incapaz de observar submódulo '%s'"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "ramo de repositório para observar na clonagem"
+#: builtin/submodule--helper.c:3266
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Falhou ao adicionar submódulo '%s'"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
+#: builtin/submodule--helper.c:3283
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Falha ao registar submódulo '%s'"
+
+#: builtin/submodule--helper.c:3339
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' já existe no cenário"
+
+#: builtin/submodule--helper.c:3342
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' já existe no cenário e é submódulo nenhum"
+
+#: builtin/submodule--helper.c:3372
+msgid "branch of repository to add as submodule"
+msgstr "ramo de repositório a adicionar como submódulo"
+
+#: builtin/submodule--helper.c:3373
msgid "allow adding an otherwise ignored submodule path"
msgstr "permitir adicionar os caminhos de submódulo ignorados"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<opções>...] --url <url> --path <caminho> "
-"--name <nome>"
+#: builtin/submodule--helper.c:3379
+msgid "borrow the objects from reference repositories"
+msgstr "emprestar os objetos de repositórios referenciados"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3381
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+
+#: builtin/submodule--helper.c:3388
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<opções>] [--] <repositório> [<caminho>]"
+
+#: builtin/submodule--helper.c:3416
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"Caminhos relativos só podem ser usados a partir do topo da árvore-trabalho"
+
+#: builtin/submodule--helper.c:3425
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "URL de repo: '%s' tem de ser absoluto ou começar com ./|../"
+
+#: builtin/submodule--helper.c:3460
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' é nome de submódulo inválido"
+
+#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s insustenta --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3526
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr "'%s' é subcomando inválido de submodule--helper"
+msgstr "'%s' é subcomando de submodule--helper inválido"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr "git symbolic-ref [<opções>] <nome> [<referência>]"
+msgstr "git symbolic-ref [<opções>] <nome> [<ref>]"
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
@@ -23380,7 +23696,7 @@
#: builtin/symbolic-ref.c:42
msgid "suppress error message for non-symbolic (detached) refs"
-msgstr "suprimir mensagens de erro sobre refs não-simbólicas (destacadas)"
+msgstr "suprimir mensagens de erro sobre refs não-simbólicas (desanexadas)"
#: builtin/symbolic-ref.c:43
msgid "delete symbolic ref"
@@ -23390,55 +23706,53 @@
msgid "shorten ref output"
msgstr "encurtar output de ref"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "razão"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "razão da atualização"
-#: builtin/tag.c:25
-#, fuzzy
+#: builtin/tag.c:26
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <ficheiro>]\n"
-"\t\t<tagname> [<head>]"
-
-#: builtin/tag.c:27
-msgid "git tag -d <tagname>..."
-msgstr "git tag -d <nome-da-tag>..."
+"git tag [-a | -s | -u <id-chave>] [-f] [-m <msg> | -F <ficheiro>]\n"
+" <nome-tag> [<cabeça>]"
#: builtin/tag.c:28
-#, fuzzy
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <nome-etiqueta>..."
+
+#: builtin/tag.c:29
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"git tag -l [-n[<num>]] [--contains <memória>] [--no-contains <memória>] [--"
"points-at <objeto>]\n"
-"\t\t[--format=<formato>] [--merged [<commit>] [--no-merged <commit>] "
-"[<pattern>...]"
+" [--format=<formato>] [--merged [<memória>] [--no-merged <memória>] "
+"[<padrão>...]"
-#: builtin/tag.c:30
+#: builtin/tag.c:31
msgid "git tag -v [--format=<format>] <tagname>..."
-msgstr "git tag -v [--format=<formato>] <nometag>..."
+msgstr "git tag -v [--format=<formato>] <nome-etiqueta>..."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "tag '%s' not found."
-msgstr "tag '%s' por encontrar."
+msgstr "etiqueta '%s' por encontrar."
-#: builtin/tag.c:135
+#: builtin/tag.c:136
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
-msgstr "Apaguei tag '%s' (era %s)\n"
+msgstr "Apaguei etiqueta '%s' (era %s)\n"
-#: builtin/tag.c:170
+#: builtin/tag.c:171
#, c-format
msgid ""
"\n"
@@ -23447,11 +23761,11 @@
"Lines starting with '%c' will be ignored.\n"
msgstr ""
"\n"
-"Escreve mensagem para tag:\n"
+"Escreve mensagem para etiqueta:\n"
" %s\n"
"Linha começadas com '%c' serão ignoradas.\n"
-#: builtin/tag.c:174
+#: builtin/tag.c:175
#, c-format
msgid ""
"\n"
@@ -23461,13 +23775,13 @@
"want to.\n"
msgstr ""
"\n"
-"Escreve mensagem para tag:\n"
+"Escreve mensagem para etiqueta:\n"
" %s\n"
"Linhas começadas com '%c' serão mantidas; se queres, podes apagá-las.\n"
#: builtin/tag.c:241
msgid "unable to sign the tag"
-msgstr "incapaz assinar a tag"
+msgstr "incapaz assinar a etiqueta"
#: builtin/tag.c:259
#, c-format
@@ -23480,136 +23794,116 @@
#: builtin/tag.c:275
msgid "bad object type."
-msgstr "tipo de objeto incorreto."
+msgstr "tipo de objeto inválido."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
-msgstr "sem mensagem de tag?"
+msgstr "sem mensagem de etiqueta?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
-msgstr "Deixei a mensagem da tag em %s\n"
+msgstr "Deixei a mensagem da etiqueta em %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:445
msgid "list tag names"
-msgstr "listar os nomes das tag"
+msgstr "listar os nomes das etiquetas"
-#: builtin/tag.c:448
+#: builtin/tag.c:447
msgid "print <n> lines of each tag message"
-msgstr "imprimir <n> linhas de cada mensagem de tag"
+msgstr "mostrar <n> linhas de cada mensagem de etiqueta"
+
+#: builtin/tag.c:449
+msgid "delete tags"
+msgstr "eliminar etiquetas"
#: builtin/tag.c:450
-msgid "delete tags"
-msgstr "eliminar tags"
-
-#: builtin/tag.c:451
msgid "verify tags"
-msgstr "verificar tags"
+msgstr "verificar etiquetas"
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "Tag creation options"
-msgstr "Opções de criação de tags"
+msgstr "Opções de criação de etiqueta"
-#: builtin/tag.c:455
+#: builtin/tag.c:454
msgid "annotated tag, needs a message"
-msgstr "tag anotada, é necessário uma mensagem"
+msgstr "etiqueta anotada, precisa uma mensagem"
-#: builtin/tag.c:457
+#: builtin/tag.c:456
msgid "tag message"
-msgstr "mensagem da tag"
+msgstr "mensagem de etiqueta"
+
+#: builtin/tag.c:458
+msgid "force edit of tag message"
+msgstr "forçar edição de mensagem de etiqueta"
#: builtin/tag.c:459
-#, fuzzy
-msgid "force edit of tag message"
-msgstr "forçar edição do commit"
-
-#: builtin/tag.c:460
msgid "annotated and GPG-signed tag"
-msgstr "tag anotada e assinada com GPG"
+msgstr "etiqueta anotada e assinada com GPG"
+
+#: builtin/tag.c:462
+msgid "use another key to sign the tag"
+msgstr "usar outra chave para assinar a etiqueta"
#: builtin/tag.c:463
-msgid "use another key to sign the tag"
-msgstr "usar outra chave para assinar a tag"
-
-#: builtin/tag.c:464
msgid "replace the tag if exists"
-msgstr "substituir a tag se esta existir"
+msgstr "substituir a etiqueta se existe"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:464 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "criar um reflog"
-#: builtin/tag.c:467
+#: builtin/tag.c:466
msgid "Tag listing options"
-msgstr "Opções de listagem de tags"
+msgstr "Opções de listagem de etiquetas"
-#: builtin/tag.c:468
+#: builtin/tag.c:467
msgid "show tag list in columns"
-msgstr "mostrar a lista de tags em colunas"
+msgstr "mostrar a lista de etiquetas em colunas"
+
+#: builtin/tag.c:468 builtin/tag.c:470
+msgid "print only tags that contain the commit"
+msgstr "mostrar apenas etiquetas que contenham a memória"
#: builtin/tag.c:469 builtin/tag.c:471
-msgid "print only tags that contain the commit"
-msgstr "imprimir apenas tags que contenham o commit"
-
-#: builtin/tag.c:470 builtin/tag.c:472
msgid "print only tags that don't contain the commit"
-msgstr "imprimir apenas tags a que falte o commit"
+msgstr "mostrar apenas etiquetas a que falte a memória"
+
+#: builtin/tag.c:472
+msgid "print only tags that are merged"
+msgstr "mostrar apenas as etiquetas juntas"
#: builtin/tag.c:473
-msgid "print only tags that are merged"
-msgstr "imprimir apenas as tags que foram integradas"
-
-#: builtin/tag.c:474
msgid "print only tags that are not merged"
-msgstr "imprimir apenas as tags que estão por juntar"
+msgstr "mostrar apenas as etiquetas que estão por juntar"
-#: builtin/tag.c:478
+#: builtin/tag.c:477
msgid "print only tags of the object"
msgstr "imprimir apenas etiquetas do objeto"
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column e -n são incompatíveis"
+#: builtin/tag.c:559
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "a opção '%s' só é permitida no modo listagem"
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "a opção -n só é permitida no modo lista"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "a opção --contains só é permitida no modo lista"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "opção --no-contains só é permitida no modo lista"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "a opção --points-at só é permitida no modo lista"
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "as opções --merged e --no-merged só são permitidas no modo lista"
-
-#: builtin/tag.c:567
-msgid "only one -F or -m option is allowed."
-msgstr "só é permitido um opção -F ou -m."
-
-#: builtin/tag.c:592
+#: builtin/tag.c:598
#, c-format
msgid "'%s' is not a valid tag name."
-msgstr "'%s' é nome de tag inválido."
+msgstr "'%s' é nome de etiqueta inválido."
-#: builtin/tag.c:597
+#: builtin/tag.c:603
#, c-format
msgid "tag '%s' already exists"
-msgstr "a tag '%s' já existe"
+msgstr "a etiqueta '%s' já existe"
-#: builtin/tag.c:628
+#: builtin/tag.c:634
#, c-format
msgid "Updated tag '%s' (was %s)\n"
-msgstr "Atualizei tag '%s' (era %s)\n"
+msgstr "Atualizei etiqueta '%s' (era %s)\n"
+
+#: builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "o pacote excede o tamanho máximo permitido"
#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
@@ -23618,331 +23912,313 @@
#: builtin/update-index.c:84
#, c-format
msgid "failed to create directory %s"
-msgstr "falha ao criar o diretório %s"
+msgstr "falhou criar pasta %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "falhou criar ficheiro %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "falha ao eliminar o ficheiro %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
-msgstr "falha ao eliminar o diretório %s"
+msgstr "falhou ao eliminar a pasta %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Testando mtime em '%s' "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr ""
"info de stat da pasta mantêm-se inalterada após adicionar novo ficheiro"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "info de stat da pasta mantêm-se inalterada após adicionar nova pasta"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "info de stat muda após atualizar ficheiro"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "info de stat da pasta muda após adicionar ficheiro dentro de subpasta"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "info de stat da pasta mantêm-se inalterada após apagar ficheiro"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "info de stat da pasta mantêm-se inalterada após apagar pasta"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opções>] [--] [<ficheiro>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:993
msgid "continue refresh even when index needs update"
-msgstr "continuar a refrescar mesmo quando o índice precise de ser atualizado"
+msgstr "continuar a refrescar mesmo quando cenário precisa de atualização"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:996
msgid "refresh: ignore submodules"
msgstr "refrescar: ignorar submódulos"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:999
msgid "do not ignore new files"
msgstr "considera novos ficheiros"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:1001
msgid "let files replace directories and vice-versa"
-msgstr "deixar que os ficheiros substituam os diretórios e vice-versa"
+msgstr "deixar que os ficheiros substituam pastas e vice-versa"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1003
msgid "notice files missing from worktree"
-msgstr "avisar sobre ficheiros que faltem na árvore de trabalho"
+msgstr "avisar sobre ficheiros que faltem na árvore-trabalho"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:1005
msgid "refresh even if index contains unmerged entries"
-msgstr "refrescar mesmo se índex contenha entradas por juntar"
+msgstr "refrescar mesmo se cenário tenha entradas por juntar"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1008
msgid "refresh stat information"
msgstr "refrescar informação de stat"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1012
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "como --refresh, mas ignorar a definição assume-unchanged"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1016
msgid "<mode>,<object>,<path>"
msgstr "<modo>,<objeto>,<caminho>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1017
msgid "add the specified entry to the index"
-msgstr "adicionar o elemento especificado ao índice"
+msgstr "adicionar entrada especificada ao cenário"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1027
msgid "mark files as \"not changing\""
msgstr "marcar ficheiros como \"não alterar\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1030
msgid "clear assumed-unchanged bit"
-msgstr "limpar o bit assumed-unchanged"
+msgstr "limpar bit assumed-unchanged"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1033
msgid "mark files as \"index-only\""
-msgstr "marcar ficheiros como \"únicos do índice\""
+msgstr "marcar ficheiros como \"index-only\""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1036
msgid "clear skip-worktree bit"
-msgstr "limpar o bit ignorar-árvore-de-trabalho"
+msgstr "limpar o bit saltar-árvore-trabalho"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1039
msgid "do not touch index-only entries"
msgstr ""
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1041
msgid "add to index only; do not add content to object database"
msgstr ""
-"adicionar apenas a index; não adicionar conteúdo à base de dados de objetos"
+"adicionar apenas a cenário; adicionar conteúdo nenhum à base de dados de "
+"objetos"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1043
msgid "remove named paths even if present in worktree"
-msgstr ""
-"remover os caminhos mencionado mesmo se estiverem presentes na árvore de "
-"trabalho"
+msgstr "remover os caminhos mencionado mesmo se presentes na árvore-trabalho"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1045
msgid "with --stdin: input lines are terminated by null bytes"
-msgstr "com --stdin: as linhas da entrada são terminadas com bytes nulos"
+msgstr "com --stdin: linhas da entrada são terminadas com bytes nulos"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1047
msgid "read list of paths to be updated from standard input"
msgstr "ler lista de caminho a atualizar da entrada padrão"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1051
msgid "add entries from standard input to the index"
-msgstr "adicionar elementos da entrada padrão ao índice"
+msgstr "adicionar elementos da entrada padrão ao cenário"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1055
msgid "repopulate stages #2 and #3 for the listed paths"
-msgstr "repovoar as fases nº2 e nº3 dos caminhos listados"
+msgstr "repovoar os cenários #2 e #3 dos caminhos listados"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1059
msgid "only update entries that differ from HEAD"
msgstr "atualizar apenas elementos que difiram de HEAD"
-#: builtin/update-index.c:1046
-msgid "ignore files missing from worktree"
-msgstr "ignorar ficheiros ausentes da worktree"
-
-#: builtin/update-index.c:1049
-msgid "report actions to standard output"
-msgstr "reportar ações na saída padrão"
-
-#: builtin/update-index.c:1051
-msgid "(for porcelains) forget saved unresolved conflicts"
-msgstr "(para porcelains) esquecer conflitos guardados que estão por resolver"
-
-#: builtin/update-index.c:1055
-msgid "write index in this format"
-msgstr "escrever o índice neste formato"
-
-#: builtin/update-index.c:1057
-msgid "enable or disable split index"
-msgstr "ativar ou desativar a divisão do índice"
-
-#: builtin/update-index.c:1059
-msgid "enable/disable untracked cache"
-msgstr "ativar/desativar cache por monitorizar"
-
-#: builtin/update-index.c:1061
-msgid "test if the filesystem supports untracked cache"
-msgstr "testar se sistema de ficheiros sustenta cache por monitorizar"
-
#: builtin/update-index.c:1063
-msgid "enable untracked cache without testing the filesystem"
-msgstr "ativar cache por monitorizar sem testar o sistema de ficheiros"
+msgid "ignore files missing from worktree"
+msgstr "ignorar ficheiros ausentes da árvore-trabalho"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1066
+msgid "report actions to standard output"
+msgstr "reportar ações para saída padrão"
+
+#: builtin/update-index.c:1068
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(para porcelanas) esquecer conflitos guardados que estão por resolver"
+
+#: builtin/update-index.c:1072
+msgid "write index in this format"
+msgstr "escrever o cenário neste formato"
+
+#: builtin/update-index.c:1074
+msgid "enable or disable split index"
+msgstr "ativar ou desativar a divisão de cenário"
+
+#: builtin/update-index.c:1076
+msgid "enable/disable untracked cache"
+msgstr "ativar/desativar cenário desmonitorizado"
+
+#: builtin/update-index.c:1078
+msgid "test if the filesystem supports untracked cache"
+msgstr "testar se sistema de ficheiros sustenta cenário desmonitorizado"
+
+#: builtin/update-index.c:1080
+msgid "enable untracked cache without testing the filesystem"
+msgstr "ativar cenário desmonitorizado sem testar o sistema de ficheiros"
+
+#: builtin/update-index.c:1082
msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/update-index.c:1067
-#, fuzzy
+#: builtin/update-index.c:1084
msgid "enable or disable file system monitor"
-msgstr "ativar ou desativar a divisão do índice"
+msgstr "ativar ou desativar monitorizador de sistema de ficheiros"
-#: builtin/update-index.c:1069
-#, fuzzy
+#: builtin/update-index.c:1086
msgid "mark files as fsmonitor valid"
msgstr "marcar ficheiros válidos para fsmonitor"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1089
msgid "clear fsmonitor valid bit"
msgstr "limpar bit válido de fsmonitor"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1195
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-"core.splitIndex está definida como false; remova ou altere-a se pretende "
-"mesmo ativar índice separado"
+"core.splitIndex está definida como false; remove ou altera-a se queres mesmo "
+"ativar cenário separado"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1204
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-"core.splitIndex está definida como true; remova ou altere-a se pretende "
-"mesmo desativar índice separado"
+"core.splitIndex está definida como true; remove ou altera-a se queres mesmo "
+"desativar cenário separado"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1216
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
"core.untrackedCache está definida como true; remove ou altera-a, se queres "
-"mesmo desativar a cache por monitorizar"
+"mesmo desativar o cenário desmonitorizado"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1220
msgid "Untracked cache disabled"
-msgstr "Cache por monitorizar está desativada"
+msgstr "Cenário desmonitorizado está desativado"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1228
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
"core.untrackedCache está definida como false; remove ou altera-a, se queres "
-"mesmo ativar a cache por monitorizar"
+"mesmo ativar o cenário desmonitorizado"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1232
#, c-format
msgid "Untracked cache enabled for '%s'"
-msgstr "Cache por monitorizar ativada para '%s'"
+msgstr "Cenário desmonitorizado ativado para '%s'"
-#: builtin/update-index.c:1220
-#, fuzzy
+#: builtin/update-index.c:1241
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-"core.splitIndex está definida como false; remova ou altere-a se pretende "
-"mesmo ativar índice separado"
+"core.fsmonitor está indefinida; define-a se queres mesmo ativar fsmonitor"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1246
msgid "fsmonitor enabled"
-msgstr ""
+msgstr "fsmonitor ativado"
-#: builtin/update-index.c:1227
-#, fuzzy
+#: builtin/update-index.c:1250
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-"core.splitIndex está definida como true; remova ou altere-a se pretende "
-"mesmo desativar índice separado"
+"core.fsmonitor está definida; remove-a se queres mesmo desativar fsmonitor"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1254
msgid "fsmonitor disabled"
-msgstr ""
+msgstr "fsmonitor desativado"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
-msgstr "git update-ref [<opções>] -d <nome-da-referência> [<valor-antigo>]"
+msgstr "git update-ref [<opções>] -d <nome-ref> [<valor-antigo>]"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
-msgstr ""
-"git update-ref [<opções>] <nome-da-referência> <novo-valor> [<valor-"
-"antigo>]"
+msgstr "git update-ref [<opções>] <nome-ref> <novo-valor> [<valor-antigo>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opções>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
-msgstr "eliminar a referência"
+msgstr "apagar a referência"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "atualizar <nome-ref>, não à qual esta aponta"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
-msgstr "os argumentos da entrada padrão terminam em NUL"
+msgstr "a entrada padrão tem argumentos NUL-terminados"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "ler atualizações de entrada padrão"
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
-msgstr "atualizar os ficheiros de informação do zero"
+msgstr "atualizar os ficheiros de info do zero"
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
-msgstr "git upload-pack [<opções>] <dir>"
+msgstr "git upload-pack [<opções>] <pasta>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "terminar depois de uma única troca de pedido/resposta"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "sair imediatamente depois do anúncio inicial da referência"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr ""
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "tentar <pasta>/.git/ apenas se <pasta> for pasta Git"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interromper transferência depois de <n> segundos de inatividade"
#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <memória>..."
#: builtin/verify-commit.c:68
msgid "print commit contents"
-msgstr "imprimir conteúdo do memória"
+msgstr "imprimir conteúdo de memória"
#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
@@ -23950,7 +24226,7 @@
#: builtin/verify-pack.c:59
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
-msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pacote>..."
#: builtin/verify-pack.c:70
msgid "verbose"
@@ -23962,293 +24238,290 @@
#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
-msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <etiqueta>..."
#: builtin/verify-tag.c:36
msgid "print tag contents"
-msgstr "imprimir conteúdo da tag"
+msgstr "imprimir conteúdo da etiqueta"
-#: builtin/worktree.c:18
-#, fuzzy
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<opções>] <caminho> [<mnemónica>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<opções>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<opções>] <caminho>"
-#: builtin/worktree.c:21
-#, fuzzy
-msgid "git worktree move <worktree> <new-path>"
-msgstr "git worktree move <árvore-de-trabalho> <novo-caminho>"
-
#: builtin/worktree.c:22
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <árvore-trabalho> <novo-caminho>"
+
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opções>]"
-#: builtin/worktree.c:23
-#, fuzzy
-msgid "git worktree remove [<options>] <worktree>"
-msgstr "git worktree remove [<opções>] <árvore-de-trabalho>"
-
#: builtin/worktree.c:24
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<opções>] <árvore-trabalho>"
+
+#: builtin/worktree.c:25
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [<caminho>...]"
+
+#: builtin/worktree.c:26
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <caminho>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, fuzzy, c-format
-msgid "failed to delete '%s'"
-msgstr "falhou apagar '%s'"
-
-#: builtin/worktree.c:74
-#, fuzzy, c-format
+#: builtin/worktree.c:76
+#, c-format
msgid "Removing %s/%s: %s"
-msgstr "A remover %s"
-
-#: builtin/worktree.c:147
-msgid "report pruned working trees"
-msgstr "reportar árvores de trabalho podadas"
+msgstr "Removendo %s/%s: %s"
#: builtin/worktree.c:149
-msgid "expire working trees older than <time>"
-msgstr "expirar árvores de trabalho mais antigos que <tempo>"
+msgid "report pruned working trees"
+msgstr "reportar árvores-trabalho podadas"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:151
+msgid "expire working trees older than <time>"
+msgstr "expirar árvores-trabalho mais velhas que <tempo>"
+
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' já existe"
-#: builtin/worktree.c:228
-#, fuzzy, c-format
+#: builtin/worktree.c:230
+#, c-format
msgid "unusable worktree destination '%s'"
-msgstr "destino '%s' de worktree inutilizável"
+msgstr "destino '%s' de árvore-trabalho inutilizável"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:235
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/worktree.c:235
+#: builtin/worktree.c:237
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use '%s -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/worktree.c:286
+#: builtin/worktree.c:248
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr ""
+
+#: builtin/worktree.c:268
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr "falhou copiar config de árvore-trabalho de '%s' para '%s'"
+
+#: builtin/worktree.c:280 builtin/worktree.c:285
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "falhou ao indefinir '%s' em '%s'"
+
+#: builtin/worktree.c:356
#, c-format
msgid "could not create directory of '%s'"
-msgstr "incapaz criar diretório de '%s'"
+msgstr "incapaz criar pasta de '%s'"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:378
msgid "initializing"
msgstr "iniciando"
-#: builtin/worktree.c:420 builtin/worktree.c:426
-#, fuzzy, c-format
+#: builtin/worktree.c:492 builtin/worktree.c:498
+#, c-format
msgid "Preparing worktree (new branch '%s')"
-msgstr "Erro a eliminar ramo '%s'"
+msgstr "Preparando árvore-trabalho (novo ramo '%s')"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:494
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
-msgstr ""
+msgstr "Preparando árvore-trabalho (restabelecendo ramo '%s'; estava em %s)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:503
#, c-format
msgid "Preparing worktree (checking out '%s')"
-msgstr ""
+msgstr "Preparando árvore-trabalho (observando '%s')"
-#: builtin/worktree.c:437
-#, fuzzy, c-format
+#: builtin/worktree.c:509
+#, c-format
msgid "Preparing worktree (detached HEAD %s)"
-msgstr "A preparar %s (identificador %s)"
+msgstr "Preparando árvore-trabalho (HEAD desanexada %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:554
msgid "checkout <branch> even if already checked out in other worktree"
-msgstr ""
-"extrair o <ramo> mesmo se já tenha sido extraído noutra árvore de trabalho"
+msgstr "observar <ramo> mesmo se já em observação em outra árvore-trabalho"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:557
msgid "create a new branch"
msgstr "criar um novo ramo"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:559
msgid "create or reset a branch"
-msgstr "criar ou repor um ramo"
+msgstr "criar ou restabelecer um ramo"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:561
msgid "populate the new working tree"
-msgstr "povoar a nova árvore de trabalho"
+msgstr "povoar nova árvore-trabalho"
-#: builtin/worktree.c:490
-#, fuzzy
+#: builtin/worktree.c:562
msgid "keep the new working tree locked"
-msgstr "povoar a nova árvore de trabalho"
+msgstr "manter nova árvore-trabalho trancada"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:564 builtin/worktree.c:809
msgid "reason for locking"
msgstr "razão para trancar"
-#: builtin/worktree.c:495
-#, fuzzy
+#: builtin/worktree.c:567
msgid "set up tracking mode (see git-branch(1))"
-msgstr "configurar modo de seguimento (consulte git-pull(1))"
+msgstr "configurar modo de monitorização (vê git-branch(1))"
-#: builtin/worktree.c:498
-#, fuzzy
+#: builtin/worktree.c:570
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "tenta corresponder nome de novo ramo com ramo de monitorização remoto"
-#: builtin/worktree.c:506
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:508
-#, fuzzy
-msgid "--reason requires --lock"
-msgstr "--reason requer --lock"
-
-#: builtin/worktree.c:512
+#: builtin/worktree.c:584
msgid "added with --lock"
msgstr "adicionado com --lock"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:646
msgid "--[no-]track can only be used if a new branch is created"
-msgstr ""
+msgstr "--[no-]track apenas pode ser usado se for criado um novo ramo"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:766
msgid "show extended annotations and reasons, if available"
msgstr ""
-#: builtin/worktree.c:693
-#, fuzzy
+#: builtin/worktree.c:768
msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr "expirar árvores de trabalho mais antigos que <tempo>"
-
-#: builtin/worktree.c:702
-msgid "--verbose and --porcelain are mutually exclusive"
msgstr ""
+"adicionar anotação 'prunable' em árvores-trabalho mais velhas que <tempo>"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:770
+msgid "terminate records with a NUL character"
+msgstr "terminar registos com um carácter NUL"
+
+#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
+#: builtin/worktree.c:1052
#, c-format
msgid "'%s' is not a working tree"
-msgstr "'%s' é working tree nenhuma"
+msgstr "'%s' é árvore-trabalho nenhuma"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:823 builtin/worktree.c:856
msgid "The main working tree cannot be locked or unlocked"
-msgstr "Working tree principal incapaz de ser trancada ou destrancada"
+msgstr "Árvore-trabalho principal incapaz de ser trancada ou destrancada"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:828
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' já está trancada, razão: %s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:830
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' já está trancada"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:858
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' está destrancada"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:899
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:827
-#, fuzzy
+#: builtin/worktree.c:907
msgid "force move even if worktree is dirty or locked"
-msgstr "forçar mover/mudar o nome mesmo que o destino exista"
+msgstr "forçar mover mesmo que a árvore-trabalho esteja suja ou trancada"
-#: builtin/worktree.c:850 builtin/worktree.c:974
-#, fuzzy, c-format
+#: builtin/worktree.c:930 builtin/worktree.c:1054
+#, c-format
msgid "'%s' is a main working tree"
-msgstr "'%s' é uma working tree principal"
+msgstr "'%s' é uma árvore-trabalho principal"
-#: builtin/worktree.c:855
-#, fuzzy, c-format
+#: builtin/worktree.c:935
+#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "incapaz descobrir nome de destino a partir de '%s'"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:948
#, 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:870
+#: builtin/worktree.c:950
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:873
+#: builtin/worktree.c:953
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:878
+#: builtin/worktree.c:958
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:924
-#, fuzzy, c-format
+#: builtin/worktree.c:1004
+#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "falhou executar 'git status' em '%s'"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:1008
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:933
-#, fuzzy, c-format
+#: builtin/worktree.c:1013
+#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "falhou executar 'git status' em '%s', código %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:1036
msgid "force removal even if worktree is dirty or locked"
-msgstr ""
+msgstr "forçar remoção mesmo que árvore-trabalho esteja suja ou trancada"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:1059
#, 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:981
+#: builtin/worktree.c:1061
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:984
+#: builtin/worktree.c:1064
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/worktree.c:1008
-#, fuzzy, c-format
+#: builtin/worktree.c:1088
+#, c-format
msgid "repair: %s: %s"
-msgstr "%s: %s"
+msgstr "reparar: %s: %s"
-#: builtin/worktree.c:1011
-#, fuzzy, c-format
+#: builtin/worktree.c:1091
+#, c-format
msgid "error: %s: %s"
-msgstr "%s: %s"
+msgstr "erro: %s: %s"
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -24260,7 +24533,7 @@
#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
-msgstr "escrever objeto árvore do subdiretório <prefixo>"
+msgstr "escrever objeto árvore para <prefixo> de subpasta"
#: builtin/write-tree.c:31
msgid "only useful for debugging"
@@ -24278,7 +24551,6 @@
msgstr ""
#: git.c:36
-#, fuzzy
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -24288,25 +24560,20 @@
"'git help -a' e 'git help -g' listam subcomandos disponíveis e alguns\n"
"guias de conceitos. Consulta 'git help <comando>' ou 'git help <conceito>'\n"
"para ler sobre um subcomando específico ou conceito específico.\n"
-"Vê 'git help git' para visão geral do sistema."
+"Para uma visão geral do sistema, vê 'git help git'."
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr ""
+msgid "no directory given for '%s' option\n"
+msgstr "dada pasta nenhuma para opção '%s'\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr ""
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr ""
-
#: git.c:230
-#, fuzzy, c-format
+#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "--super-prefix recebeu prefixo nenhum\n"
@@ -24320,13 +24587,8 @@
msgid "no config key given for --config-env\n"
msgstr ""
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr ""
-
#: git.c:326
-#, fuzzy, c-format
+#, c-format
msgid "unknown option: %s\n"
msgstr "desconheço opção: %s\n"
@@ -24352,241 +24614,184 @@
msgid "recursive alias: %s"
msgstr ""
-#: git.c:476
+#: git.c:480
msgid "write failure on standard output"
msgstr ""
-#: git.c:478
+#: git.c:482
msgid "unknown write failure on standard output"
msgstr ""
-#: git.c:480
-#, fuzzy
+#: git.c:484
msgid "close failed on standard output"
-msgstr "enviar resultados para a saída padrão"
+msgstr "fechar a saída padrão falhou"
-#: git.c:833
+#: git.c:838
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: git.c:883
-#, fuzzy, c-format
+#: git.c:888
+#, c-format
msgid "cannot handle %s as a builtin"
msgstr "incapaz lidar %s como um builtin"
-#: git.c:896
-#, fuzzy, c-format
+#: git.c:901
+#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
-"utilização: %s\n"
+"uso: %s\n"
"\n"
-#: git.c:916
+#: git.c:921
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:928
-#, fuzzy, c-format
+#: git.c:933
+#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "incapaz de executar comando '%s': %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr ""
+msgstr "argumento de --packfile tem de ser um hash válido (recebi '%s')"
-#: http-fetch.c:128
-#, fuzzy
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "é repositório git nenhum"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr ""
-
-#: http-fetch.c:143
-#, fuzzy
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "-N só pode ser usado com --mixed"
-
#: t/helper/test-fast-rebase.c:141
-#, fuzzy
msgid "unhandled options"
-msgstr "Opções gerais"
+msgstr "opções largadas"
#: t/helper/test-fast-rebase.c:146
-#, fuzzy
msgid "error preparing revisions"
msgstr "erro preparando revisões"
#: t/helper/test-reach.c:154
-#, fuzzy, c-format
+#, c-format
msgid "commit %s is not marked reachable"
-msgstr "commit %s está a ser tratado como inalcançável"
+msgstr "memória %s está marcada como inalcançável"
#: t/helper/test-reach.c:164
msgid "too many commits marked reachable"
msgstr ""
#: t/helper/test-serve-v2.c:7
-#, fuzzy
msgid "test-tool serve-v2 [<options>]"
-msgstr "git rebase--helper [<opções>]"
+msgstr "test-tool serve-v2 [<opções>]"
#: t/helper/test-serve-v2.c:19
-#, fuzzy
msgid "exit immediately after advertising capabilities"
-msgstr "sair imediatamente depois do anúncio inicial da referência"
+msgstr "sair imediatamente depois de anunciar capacidades"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr ""
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr ""
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr ""
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr ""
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr ""
-#: t/helper/test-simple-ipc.c:704
-#, fuzzy
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
-msgstr "incapaz criar thread: %s"
+msgstr "número de pedidos por fio"
-#: t/helper/test-simple-ipc.c:706
-#, fuzzy
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
-msgstr "bytes"
+msgstr "byte"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr ""
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
-msgstr ""
+msgstr "token"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr ""
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
-msgstr "Delegação de controlo tem suporte nenhum com cURL < 7.22.0"
+msgstr "Delegação de controlo é insustentado com cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Afixar chaves públicas tem suporte nenhum com cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Afixar chaves públicas é insustentado com cURL < 7.39.0"
-#: http.c:910
-#, fuzzy
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr "CURLSSLOPT_NO_REVOKE tem suporte nenhum com cURL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE é insustentado com cURL < 7.44.0"
-#: http.c:989
-#, fuzzy
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Restrição protocolar tem suporte nenhum com cURL < 7.44.0"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: http.c:1143
-#, fuzzy, c-format
+#: http.c:1027
+#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Incapaz de definir backend SSL para '%s': já definido"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24597,238 +24802,415 @@
" pedi: %s\n"
" redireção: %s"
-#: remote-curl.c:183
+#: remote-curl.c:184
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr ""
-#: remote-curl.c:307
-#, fuzzy, c-format
+#: remote-curl.c:308
+#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs é inválido; isto é um repositório git?"
-#: remote-curl.c:408
+#: remote-curl.c:409
msgid "invalid server response; expected service, got flush packet"
msgstr ""
-#: remote-curl.c:439
+#: remote-curl.c:440
#, c-format
msgid "invalid server response; got '%s'"
msgstr ""
-#: remote-curl.c:499
-#, fuzzy, c-format
+#: remote-curl.c:500
+#, c-format
msgid "repository '%s' not found"
msgstr "repositório '%s' inexistente"
-#: remote-curl.c:503
-#, fuzzy, c-format
+#: remote-curl.c:504
+#, c-format
msgid "Authentication failed for '%s'"
-msgstr "Falha ao executar: $rest"
+msgstr "Autenticação falhou para '%s'"
-#: remote-curl.c:507
+#: remote-curl.c:508
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+
+#: remote-curl.c:512
#, c-format
msgid "unable to access '%s': %s"
msgstr "incapaz aceder '%s': %s"
-#: remote-curl.c:513
+#: remote-curl.c:518
#, c-format
msgid "redirecting to %s"
-msgstr "a redirecionar para %s "
+msgstr "redirecionando para %s"
-#: remote-curl.c:644
+#: remote-curl.c:649
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
-#: remote-curl.c:656
-#, fuzzy
+#: remote-curl.c:661
msgid "remote server sent unexpected response end packet"
msgstr "servidor remoto enviou pacote fim de resposta inesperado"
-#: remote-curl.c:726
+#: remote-curl.c:730
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
-#: remote-curl.c:756
+#: remote-curl.c:759
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr ""
-#: remote-curl.c:758
+#: remote-curl.c:761
msgid "remote-curl: unexpected response end packet"
msgstr ""
-#: remote-curl.c:834
-#, fuzzy, c-format
+#: remote-curl.c:837
+#, c-format
msgid "RPC failed; %s"
-msgstr "falha: %d"
+msgstr "RPC falhou: %s"
-#: remote-curl.c:874
-#, fuzzy
+#: remote-curl.c:877
msgid "cannot handle pushes this big"
msgstr "incapaz atirar algo tão grande"
-#: remote-curl.c:989
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
-#: remote-curl.c:993
+#: remote-curl.c:994
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
-#: remote-curl.c:1043
+#: remote-curl.c:1044
#, c-format
msgid "%d bytes of length header were received"
msgstr ""
-#: remote-curl.c:1045
+#: remote-curl.c:1046
#, c-format
msgid "%d bytes of body are still expected"
msgstr ""
-#: remote-curl.c:1134
-#, fuzzy
+#: remote-curl.c:1135
msgid "dumb http transport does not support shallow capabilities"
-msgstr "transporte http estúpido insustenta capacidades shallow"
+msgstr "transporte http burro insustenta capacidades de superfície"
-#: remote-curl.c:1149
+#: remote-curl.c:1150
msgid "fetch failed."
-msgstr ""
+msgstr "busca falhou."
-#: remote-curl.c:1195
+#: remote-curl.c:1198
msgid "cannot fetch by sha1 over smart http"
-msgstr ""
+msgstr "incapaz buscar por sha1 através de http esperto"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1242 remote-curl.c:1248
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
-#: remote-curl.c:1257 remote-curl.c:1375
-#, fuzzy, c-format
+#: remote-curl.c:1260 remote-curl.c:1378
+#, c-format
msgid "http transport does not support %s"
msgstr "transporte http insustenta %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1296
msgid "git-http-push failed"
msgstr ""
-#: remote-curl.c:1481
+#: remote-curl.c:1485
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
-#: remote-curl.c:1513
+#: remote-curl.c:1517
msgid "remote-curl: error reading command stream from git"
msgstr ""
-#: remote-curl.c:1520
+#: remote-curl.c:1524
msgid "remote-curl: fetch attempted without a local repo"
-msgstr ""
+msgstr "remote-curl: busca tentada sem repo local"
-#: remote-curl.c:1561
+#: remote-curl.c:1565
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "precisando de pasta-trabalho"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "incapaz encontrar raiz de alistamento"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
+#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "incapaz trocar para '%s'"
+
+#: contrib/scalar/scalar.c:179
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "incapaz configurar %s=%s"
+
+#: contrib/scalar/scalar.c:197
+msgid "could not configure log.excludeDecoration"
+msgstr ""
+
+#: contrib/scalar/scalar.c:218
+msgid "Scalar enlistments require a worktree"
+msgstr ""
+
+#: contrib/scalar/scalar.c:310
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "HEAD remota é ramo nenhum: '%.*s'"
+
+#: contrib/scalar/scalar.c:316
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"falhou obter de remoto nome de ramo pré-definido; usando pré-definição local"
+
+#: contrib/scalar/scalar.c:329
+msgid "failed to get default branch name"
+msgstr "falhou ao obter nome de ramo pré-definido"
+
+#: contrib/scalar/scalar.c:340
+msgid "failed to unregister repository"
+msgstr "falhou ao anular registo de repositório"
+
+#: contrib/scalar/scalar.c:355
+msgid "failed to delete enlistment directory"
+msgstr "falhou ao eliminar pasta de alistamento"
+
+#: contrib/scalar/scalar.c:375
+msgid "branch to checkout after clone"
+msgstr "ramo a observar após clonagem"
+
+#: contrib/scalar/scalar.c:377
+msgid "when cloning, create full working directory"
+msgstr "quando clonando, cria pasta-trabalho completa"
+
+#: contrib/scalar/scalar.c:379
+msgid "only download metadata for the branch that will be checked out"
+msgstr "apenas transferir metadata para o ramo que será observado"
+
+#: contrib/scalar/scalar.c:384
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<opções>] [--] <repo> [<pasta>]"
+
+#: contrib/scalar/scalar.c:409
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "incapaz deduzir nome de árvore-trabalho a partir de '%s'"
+
+#: contrib/scalar/scalar.c:418
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "pasta '%s' já existe"
+
+#: contrib/scalar/scalar.c:445
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "falhou obter ramo pré-definido para '%s'"
+
+#: contrib/scalar/scalar.c:456
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "incapaz configurar remoto em '%s'"
+
+#: contrib/scalar/scalar.c:465
+#, c-format
+msgid "could not configure '%s'"
+msgstr "incapaz configurar '%s'"
+
+#: contrib/scalar/scalar.c:468
+msgid "partial clone failed; attempting full clone"
+msgstr "clonagem parcial falhou; tentando clonagem completa"
+
+#: contrib/scalar/scalar.c:472
+msgid "could not configure for full clone"
+msgstr "incapaz configurar para clone completo"
+
+#: contrib/scalar/scalar.c:504
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` leva argumentos nenhuns"
+
+#: contrib/scalar/scalar.c:517
+msgid "scalar register [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:544
+msgid "reconfigure all registered enlistments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:548
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:566
+msgid "--all or <enlistment>, but not both"
+msgstr ""
+
+#: contrib/scalar/scalar.c:581
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "foi-se repositório git em '%s'"
+
+#: contrib/scalar/scalar.c:621
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+
+#: contrib/scalar/scalar.c:639
+#, c-format
+msgid "no such task: '%s'"
+msgstr "tarefa inexistente: '%s'"
+
+#: contrib/scalar/scalar.c:689
+msgid "scalar unregister [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:736
+msgid "scalar delete <enlistment>"
+msgstr ""
+
+#: contrib/scalar/scalar.c:751
+msgid "refusing to delete current working directory"
+msgstr "recusando apagar pasta-trabalho atual"
+
+#: contrib/scalar/scalar.c:766
+msgid "include Git version"
+msgstr "incluir versão Git"
+
+#: contrib/scalar/scalar.c:768
+msgid "include Git's build options"
+msgstr ""
+
+#: contrib/scalar/scalar.c:772
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:813
+msgid "-C requires a <directory>"
+msgstr "-C exige uma <pasta>"
+
+#: contrib/scalar/scalar.c:815
+#, c-format
+msgid "could not change to '%s'"
+msgstr "incapaz mudar para '%s'"
+
+#: contrib/scalar/scalar.c:821
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c exige um argumento <chave>=<valor>"
+
+#: contrib/scalar/scalar.c:839
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <pasta>] [-c <chave>=<valor>] <comando> [<opções>]\n"
+"\n"
+"Comandos:\n"
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr ""
#: compat/compiler.h:38
-#, fuzzy
msgid "no libc information available\n"
msgstr "informação libc indisponível\n"
-#: list-objects-filter-options.h:94
+#: list-objects-filter-options.h:126
msgid "args"
msgstr ""
-#: list-objects-filter-options.h:95
-#, fuzzy
+#: list-objects-filter-options.h:127
msgid "object filtering"
-msgstr "tipo do objeto"
+msgstr "filtração de objeto"
-#: parse-options.h:184
+#: parse-options.h:188
msgid "expiry-date"
msgstr "data-de-validade"
-#: parse-options.h:198
+#: parse-options.h:202
msgid "no-op (backward compatibility)"
msgstr "sem-ação (retrocompatibilidade)"
-#: parse-options.h:310
+#: parse-options.h:341
msgid "be more verbose"
msgstr "ser mais verboso"
-#: parse-options.h:312
+#: parse-options.h:343
msgid "be more quiet"
msgstr "ser mais silencioso"
-#: parse-options.h:318
-#, fuzzy
+#: parse-options.h:349
msgid "use <n> digits to display object names"
-msgstr "usar <n> dígitos para mostrar SHA-1s"
+msgstr "usar <n> dígitos para mostrar nomes de objetos"
-#: parse-options.h:337
+#: parse-options.h:368
msgid "how to strip spaces and #comments from message"
msgstr "como retirar espaços e #comentários da mensagem"
-#: parse-options.h:338
-#, fuzzy
+#: parse-options.h:369
msgid "read pathspec from file"
-msgstr "ler padrões do ficheiro"
+msgstr "ler espetro-caminho de ficheiro"
-#: parse-options.h:339
-#, fuzzy
+#: parse-options.h:370
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
-msgstr "os caminhos estão separados por caracteres NUL"
+msgstr ""
+"com --pathspec-from-file, os elementos de espetro-caminho estão separados "
+"por caractere NUL"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "key"
msgstr "chave"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "nome do campo pelo qual ordernar"
#: rerere.h:44
msgid "update the index with reused conflict resolution if possible"
msgstr ""
-"atualizar o índice com resoluções de conflitos reutilizadas se possível"
+"se possível, atualizar o cenário com resoluções de conflitos já utilizadas"
#: command-list.h:50
msgid "Add file contents to the index"
-msgstr "Adicionar conteúdos de ficheiros ao índice"
+msgstr "Adicionar conteúdos de ficheiro ao cenário"
#: command-list.h:51
msgid "Apply a series of patches from a mailbox"
msgstr ""
#: command-list.h:52
-#, fuzzy
msgid "Annotate file lines with commit information"
-msgstr "Mostrar em formato de porcelana com informações de commit por linha"
+msgstr "Anotar linha de ficheiro com informação de memória"
#: command-list.h:53
-#, fuzzy
msgid "Apply a patch to files and/or to the index"
-msgstr "adicionar o elemento especificado ao índice"
+msgstr "Submeter um remendo a ficheiros e/ou ao cenário"
#: command-list.h:54
msgid "Import a GNU Arch repository into Git"
msgstr ""
#: command-list.h:55
-#, fuzzy
msgid "Create an archive of files from a named tree"
-msgstr "listar ficheiros arquivados para stderr"
+msgstr "Criar arquivo de ficheiros a partir de árvore nomeada"
#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
-msgstr "Use procura binário para encontrar o commit que introduziu um bug"
+msgstr "Usar procura binário para encontrar a memória que introduziu um bug"
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
@@ -24840,7 +25222,7 @@
#: command-list.h:59
msgid "Collect information for user to file a bug report"
-msgstr ""
+msgstr "Recolher informação para o utilizador reportar um bug"
#: command-list.h:60
msgid "Move objects and refs by archive"
@@ -24856,23 +25238,22 @@
#: command-list.h:63
msgid "Debug gitignore / exclude files"
-msgstr ""
+msgstr "Depurar gitignore / ficheiros excluídos"
#: command-list.h:64
-#, fuzzy
msgid "Show canonical names and email addresses of contacts"
-msgstr "Mostrar o endereço de e-mail de cada autor"
+msgstr "Mostrar nomes canónicos e endereços de e-mail de contatos"
#: command-list.h:65
-msgid "Switch branches or restore working tree files"
-msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho"
-
-#: command-list.h:66
-msgid "Copy files from the index to the working tree"
+msgid "Ensures that a reference name is well formed"
msgstr ""
+#: command-list.h:66
+msgid "Switch branches or restore working tree files"
+msgstr "Trocar ramos ou restaurar ficheiros de árvore-trabalho"
+
#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
+msgid "Copy files from the index to the working tree"
msgstr ""
#: command-list.h:68
@@ -24893,12 +25274,11 @@
#: command-list.h:72
msgid "Clone a repository into a new directory"
-msgstr "Clonar um repositório num novo diretório"
+msgstr "Clonar um repositório numa nova pasta"
#: command-list.h:73
-#, fuzzy
msgid "Display data in columns"
-msgstr "listar os ramos em colunas"
+msgstr "Mostrar informação em colunas"
#: command-list.h:74
msgid "Record changes to the repository"
@@ -24910,7 +25290,7 @@
#: command-list.h:76
msgid "Create a new commit object"
-msgstr ""
+msgstr "Criar um novo objeto de memória"
#: command-list.h:77
msgid "Get and set repository or global options"
@@ -24954,8 +25334,7 @@
#: command-list.h:87
msgid "Show changes between commits, commit and working tree, etc"
-msgstr ""
-"Mostrar alterações entre commits, entre commit e árvore de trabalho, etc"
+msgstr "Mostrar alterações entre memórias, memória e árvore-trabalho, etc"
#: command-list.h:88
msgid "Compares files in the working tree and the index"
@@ -24990,13 +25369,12 @@
msgstr ""
#: command-list.h:96
-#, fuzzy
msgid "Rewrite branches"
-msgstr " Ramo remoto:%s"
+msgstr "Reescrever ramos"
#: command-list.h:97
msgid "Produce a merge commit message"
-msgstr ""
+msgstr "Produzir uma mensagem de memória de junção"
#: command-list.h:98
msgid "Output information on each ref"
@@ -25039,55 +25417,52 @@
msgstr ""
#: command-list.h:108
-msgid "Server side implementation of Git over HTTP"
+msgid "Run git hooks"
msgstr ""
#: command-list.h:109
-msgid "Download from a remote Git repository via HTTP"
+msgid "Server side implementation of Git over HTTP"
msgstr ""
#: command-list.h:110
-msgid "Push objects over HTTP/DAV to another repository"
+msgid "Download from a remote Git repository via HTTP"
msgstr ""
#: command-list.h:111
-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:112
-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:113
-msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr "Criar um repositório Git vazio ou reinicializar um já existente"
+msgid "Build pack index file for an existing packed archive"
+msgstr ""
#: command-list.h:114
-msgid "Instantly browse your working repository in gitweb"
-msgstr ""
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "Criar um repositório Git vazio ou reinicializar um existente"
#: command-list.h:115
-msgid "Add or parse structured information in commit messages"
-msgstr ""
+msgid "Instantly browse your working repository in gitweb"
+msgstr "Navegar instantaneamente pelo teu repositório-trabalho em gitweb"
#: command-list.h:116
-#, fuzzy
-msgid "The Git repository browser"
-msgstr "O browser de repositórios Git"
+msgid "Add or parse structured information in commit messages"
+msgstr "Adiciona ou processa informação estruturada em mensagem de memória"
#: command-list.h:117
msgid "Show commit logs"
-msgstr "Mostrar histórico de commits"
+msgstr "Mostrar registro de memórias"
#: command-list.h:118
-#, fuzzy
msgid "Show information about files in the index and the working tree"
-msgstr "e fez alterações ao índice e/ou à árvore de trabalho"
+msgstr "Mostrar informação acerca de ficheiros no cenário e na árvore-trabalho"
#: command-list.h:119
-#, fuzzy
msgid "List references in a remote repository"
-msgstr "repositório de referência"
+msgstr "Listar referências em um repositório remoto"
#: command-list.h:120
msgid "List the contents of a tree object"
@@ -25110,17 +25485,14 @@
msgstr "Juntar duas ou mais histórias de desenvolvimento numa só"
#: command-list.h:125
-#, fuzzy
msgid "Find as good common ancestors as possible for a merge"
-msgstr "encontrar antecessores de uma única integração com n pontos"
+msgstr "Encontrar tantos quantos antecessores comuns, bons para uma junção"
#: command-list.h:126
-#, fuzzy
msgid "Run a three-way file merge"
msgstr "Faz uma junção por três de ficheiro"
#: command-list.h:127
-#, fuzzy
msgid "Run a merge for files needing merging"
msgstr "Faz um merge de ficheiros precisando de merge"
@@ -25129,36 +25501,36 @@
msgstr ""
#: command-list.h:129
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr ""
-
-#: command-list.h:130
msgid "Show three-way merge without touching index"
msgstr ""
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
+#: command-list.h:130
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
+"Executa ferramentas de resolução de conflito de junção para resolver "
+"conflitos de junção"
+
+#: command-list.h:131
+msgid "Creates a tag object with extra validation"
+msgstr "Cria um objeto-etiqueta com validação extra"
#: command-list.h:132
-#, fuzzy
-msgid "Creates a tag object with extra validation"
-msgstr "outro objeto tag"
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr ""
#: command-list.h:133
-msgid "Build a tree-object from ls-tree formatted text"
+msgid "Write and verify multi-pack-indexes"
msgstr ""
#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
-msgstr "Mover ou mudar o nome de um ficheiro, diretório ou ligação simbólica"
+msgstr "Mover ou renomear um ficheiro, pasta ou ligação simbólica"
#: command-list.h:135
msgid "Find symbolic names for given revs"
msgstr ""
#: command-list.h:136
-#, fuzzy
msgid "Add or inspect object notes"
msgstr "Adicionar ou inspecionar notas de objeto"
@@ -25171,7 +25543,6 @@
msgstr ""
#: command-list.h:139
-#, fuzzy
msgid "Find redundant pack files"
msgstr "Encontrar ficheiros de pacote redundantes"
@@ -25193,20 +25564,19 @@
#: command-list.h:144
msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "Obter e integrar com outro repositório ou outro ramo local"
+msgstr "Buscar de e integrar com outro repositório ou um ramo local"
#: command-list.h:145
msgid "Update remote refs along with associated objects"
msgstr "Atualizar referências remotas juntamente com objetos associados"
#: command-list.h:146
-#, fuzzy
msgid "Applies a quilt patchset onto the current branch"
-msgstr "Submete a mistura de patchset para o ramo atual."
+msgstr "Aplica-se uma mistura de patchset para o ramo atual."
#: command-list.h:147
msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr ""
+msgstr "Comparar os dois intervalos de memórias (e.g. duas versões de ramo)"
#: command-list.h:148
msgid "Reads tree information into the index"
@@ -25214,17 +25584,15 @@
#: command-list.h:149
msgid "Reapply commits on top of another base tip"
-msgstr "Reaplicar commits no topo de outra base"
+msgstr "Reaplicar memórias no topo de outra ponta"
#: command-list.h:150
-#, fuzzy
msgid "Receive what is pushed into the repository"
msgstr "Receber para o repositório, o que foi atirado"
#: command-list.h:151
-#, fuzzy
msgid "Manage reflog information"
-msgstr "mostrar informação de resolver-desfazer"
+msgstr "Gerir informação de registo-ref"
#: command-list.h:152
msgid "Manage set of tracked repositories"
@@ -25235,9 +25603,8 @@
msgstr ""
#: command-list.h:154
-#, fuzzy
msgid "Create, list, delete refs to replace objects"
-msgstr "Criar, listar, eliminar ou verificar um objeto tag assinado com GPG"
+msgstr "Criar, listar, apagar refs para substituir objetos"
#: command-list.h:155
msgid "Generates a summary of pending changes"
@@ -25245,31 +25612,28 @@
#: command-list.h:156
msgid "Reuse recorded resolution of conflicted merges"
-msgstr ""
+msgstr "Reutilizar resolução guardada de junções conflituosas"
#: command-list.h:157
msgid "Reset current HEAD to the specified state"
-msgstr "Repor a HEAD atual no estado especificado"
+msgstr "Restabelecer a HEAD atual para estado especificado"
#: command-list.h:158
-#, fuzzy
msgid "Restore working tree files"
-msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho"
+msgstr "Restaurar ficheiros de árvore-trabalho"
#: command-list.h:159
-#, fuzzy
-msgid "Revert some existing commits"
-msgstr "Reverter algumas memórias existentes"
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Listar objetos de memória em ordem cronológica inversa"
#: command-list.h:160
-msgid "Lists commit objects in reverse chronological order"
-msgstr ""
-
-#: command-list.h:161
-#, fuzzy
msgid "Pick out and massage parameters"
msgstr "demasiados parâmetros"
+#: command-list.h:161
+msgid "Revert some existing commits"
+msgstr "Reverter algumas memórias existentes"
+
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr ""
@@ -25283,56 +25647,53 @@
msgstr ""
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
-msgstr ""
-
-#: command-list.h:166
-msgid "Summarize 'git log' output"
-msgstr ""
-
-#: command-list.h:167
-msgid "Show various types of objects"
-msgstr "Mostrar vários tipos objetos"
-
-#: command-list.h:168
-#, fuzzy
-msgid "Show branches and their commits"
-msgstr "imprimir apenas ramos que contenham o commit"
-
-#: command-list.h:169
-msgid "Show packed archive index"
-msgstr ""
-
-#: command-list.h:170
-#, fuzzy
-msgid "List references in a local repository"
-msgstr "Lista referências num repositório local"
-
-#: command-list.h:171
msgid "Git's i18n setup code for shell scripts"
msgstr ""
-#: command-list.h:172
+#: command-list.h:166
msgid "Common Git shell script setup code"
msgstr ""
-#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
+#: command-list.h:167
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
+#: command-list.h:168
+msgid "Summarize 'git log' output"
+msgstr ""
+
+#: command-list.h:169
+msgid "Show various types of objects"
+msgstr "Mostrar vários tipos objetos"
+
+#: command-list.h:170
+msgid "Show branches and their commits"
+msgstr "Mostrar ramos e suas memórias"
+
+#: command-list.h:171
+msgid "Show packed archive index"
+msgstr ""
+
+#: command-list.h:172
+msgid "List references in a local repository"
+msgstr "Lista referências num repositório local"
+
+#: command-list.h:173
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr ""
+"Reduzir tua árvore-trabalho para um subgrupo de ficheiros monitorizados"
+
#: command-list.h:174
-#, fuzzy
-msgid "Stash the changes in a dirty working directory away"
-msgstr "%s: já existe no diretório de trabalho"
+msgid "Add file contents to the staging area"
+msgstr "Adicionar conteúdos de ficheiro ao cenário"
#: command-list.h:175
-#, fuzzy
-msgid "Add file contents to the staging area"
-msgstr "Adicionar conteúdos de ficheiros ao índice"
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Esconde as alterações duma pasta-trabalho suja"
#: command-list.h:176
msgid "Show the working tree status"
-msgstr "Mostrar o estado da árvores de trabalho"
+msgstr "Mostrar status de árvore-trabalho"
#: command-list.h:177
msgid "Remove unnecessary whitespace"
@@ -25347,18 +25708,16 @@
msgstr ""
#: command-list.h:180
-#, fuzzy
msgid "Switch branches"
-msgstr "Troca branches"
+msgstr "Trocar ramos"
#: command-list.h:181
-#, fuzzy
msgid "Read, modify and delete symbolic refs"
-msgstr "eliminar referências simbólicas"
+msgstr "Ler, modificar e eliminar refs simbólicas"
#: command-list.h:182
msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Criar, listar, eliminar ou verificar um objeto tag assinado com GPG"
+msgstr "Criar, listar, apagar ou verificar um objeto-etiqueta assinado com GPG"
#: command-list.h:183
msgid "Creates a temporary file with a blob's contents"
@@ -25379,6 +25738,7 @@
#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
+"Atualizar ficheiro auxiliar de informação para ajudar servidores burros"
#: command-list.h:188
msgid "Send archive back to git-archive"
@@ -25386,94 +25746,88 @@
#: command-list.h:189
msgid "Send objects packed back to git-fetch-pack"
-msgstr ""
+msgstr "Enviar objetos empacotados de volta a git-fetch-pack"
#: command-list.h:190
msgid "Show a Git logical variable"
msgstr ""
#: command-list.h:191
-#, fuzzy
msgid "Check the GPG signature of commits"
msgstr "Verifica assinatura GPG de memórias"
#: command-list.h:192
-#, fuzzy
msgid "Validate packed Git archive files"
-msgstr "Validar ficheiros pacote de arquivo Git"
+msgstr "Validar ficheiros pacote de repositório"
#: command-list.h:193
msgid "Check the GPG signature of tags"
-msgstr "Verifica assinatura GPG de tags"
+msgstr "Verifica assinatura GPG de etiquetas"
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Interface web de Git (frontend web para repositórios Git)"
+msgid "Show logs with difference each commit introduces"
+msgstr "Mostrar registro com as diferenças que cada memória introduz"
#: command-list.h:195
-msgid "Show logs with difference each commit introduces"
-msgstr "Mostrar logs com diferenças que cada memória introduz"
+msgid "Manage multiple working trees"
+msgstr "Gerir múltiplas árvores-trabalho"
#: command-list.h:196
-#, fuzzy
-msgid "Manage multiple working trees"
-msgstr "Gerir múltiplas working trees"
+msgid "Create a tree object from the current index"
+msgstr "Criar um objeto-árvore a partir de cenário atual"
#: command-list.h:197
-#, fuzzy
-msgid "Create a tree object from the current index"
-msgstr "Criar um objeto tree a partir de index atual"
-
-#: command-list.h:198
msgid "Defining attributes per path"
msgstr "Definir atributos por path"
-#: command-list.h:199
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr ""
-#: command-list.h:200
+#: command-list.h:199
msgid "A Git core tutorial for developers"
-msgstr ""
+msgstr "Um tutorial para programadores sobre o núcleo de Git"
-#: command-list.h:201
+#: command-list.h:200
msgid "Providing usernames and passwords to Git"
msgstr ""
-#: command-list.h:202
+#: command-list.h:201
msgid "Git for CVS users"
msgstr ""
-#: command-list.h:203
-#, fuzzy
+#: command-list.h:202
msgid "Tweaking diff output"
-msgstr "suprimir saída do diff"
+msgstr "Mexendo com saída de diff"
-#: command-list.h:204
+#: command-list.h:203
msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
-#: command-list.h:205
+#: command-list.h:204
msgid "Frequently asked questions about using Git"
msgstr ""
-#: command-list.h:206
-#, fuzzy
+#: command-list.h:205
msgid "A Git Glossary"
msgstr "Um Glossário de Git"
-#: command-list.h:207
+#: command-list.h:206
msgid "Hooks used by Git"
msgstr ""
-#: command-list.h:208
+#: command-list.h:207
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
"Especificar ficheiros por monitorizar intencionalmente, para serem ignorados"
+#: command-list.h:208
+msgid "The Git repository browser"
+msgstr "O browser de repositórios Git"
+
#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
-msgstr ""
+msgstr "Mapear nomes de autor/memorizador e/ou endereços de E-Mail"
#: command-list.h:210
msgid "Defining submodule properties"
@@ -25500,61 +25854,28 @@
msgstr ""
#: command-list.h:216
-#, fuzzy
-msgid "A tutorial introduction to Git: part two"
-msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)"
+msgid "A tutorial introduction to Git"
+msgstr "Um tutorial de introdução a Git"
#: command-list.h:217
-#, fuzzy
-msgid "A tutorial introduction to Git"
-msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)"
+msgid "A tutorial introduction to Git: part two"
+msgstr "Um tutorial de introdução a Git: parte dois"
#: command-list.h:218
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interface web de Git (frontend web para repositórios Git)"
+
+#: command-list.h:219
msgid "An overview of recommended workflows with Git"
msgstr "Uma descrição geral dos fluxos de trabalho recomendados para o Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr ""
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "executando $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"bissetar impossível:\n"
-"exit code $res de '$command' é < 0 ou >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "bisseção incapaz de continuar"
-
-#: git-bisect.sh:111
-#, fuzzy, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"bisseção impossível:\n"
-"'bisect_state $state' retornou código $res de erro"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "bissecção concluída com sucesso"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
"merge"
msgstr ""
-"Erro: As suas alterações locais nos seguintes ficheiros seriam substituídas "
-"ao integrar"
+"Erro: Tuas alterações locais nos seguintes ficheiros seriam sobrescritas ao "
+"juntar"
#: git-merge-octopus.sh:61
msgid "Automated merge did not work."
@@ -25567,525 +25888,65 @@
#: git-merge-octopus.sh:73
#, sh-format
msgid "Unable to find common commit with $pretty_name"
-msgstr "Incapaz de encontrar commit comum com $pretty_name"
+msgstr "Incapaz de encontrar memória comum com $pretty_name"
#: git-merge-octopus.sh:77
-#, fuzzy, sh-format
+#, sh-format
msgid "Already up to date with $pretty_name"
msgstr "Já está atualizado com $pretty_name"
#: git-merge-octopus.sh:89
#, sh-format
msgid "Fast-forwarding to: $pretty_name"
-msgstr "A avançar rapidamente para: $pretty_name"
+msgstr "Avançando para: $pretty_name"
#: git-merge-octopus.sh:97
#, sh-format
msgid "Trying simple merge with $pretty_name"
-msgstr "A tentar integração simples com $pretty_name"
+msgstr "Tentando junção simples com $pretty_name"
#: git-merge-octopus.sh:102
msgid "Simple merge did not work, trying automatic merge."
msgstr "Junção simples falhou, tentando junção automática."
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"Os caminhos relativos só podem ser usados a partir do topo da árvore de "
-"trabalho"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "URL do repositório: '$repo' deve ser absoluto ou começar com ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' já existe no índice"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' já existe no index e é submódulo nenhum"
-
-#: git-submodule.sh:218
-#, fuzzy, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' tem memória nenhuma checked out"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Falha ao adicionar o submódulo '$sm_path'"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Falha ao registar submódulo '$sm_path'"
-
-#: git-submodule.sh:532
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "Incapaz encontrar revisão atual em path de submódulo '$displaypath'"
-
-#: git-submodule.sh:542
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "Incapaz de buscar em path de submódulo '$sm_path'"
-
-#: git-submodule.sh:547
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr ""
-"Incapaz de encontrar revisão atual ${remote_name}/${branch} em path de "
-"submódulo '$sm_path'"
-
-#: git-submodule.sh:565
-#, fuzzy, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Incapaz de buscar em path de submódulo '$displaypath'; tentando buscar $sha1 "
-"directamente:"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Buscado na path de submódulo '$displaypath', mas continha nenhum $sha1. "
-"Falha ao buscar aquela memória diretamente."
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Incapaz de checkout '$sha1' no path de submódulo '$displaypath'"
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Path de submódulo '$displaypath': '$sha1' checked out"
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Incapaz de rebasear '$sha1' em path de submódulo '$displaypath'"
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Path de submódulo '$displaypath': rebaseado em '$sha1'"
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Incapaz juntar '$sha1' em path de submódulo '$displaypath'"
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Caminho de submódulo '$displaypath': integrado em '$sha1'"
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Falha ao executar '$command $sha1' no caminho de submódulo '$displaypath'"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Caminho de submódulo '$displaypath': '$command $sha1'"
-
-#: git-submodule.sh:627
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'"
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Pilha automática (autostash) aplicada."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Incapaz guardar $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 ""
-"Realizando autostash existem sobreposições.\n"
-"As tuas mudanças estão salvas na stash.\n"
-"Podes executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "A rebasear ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-#, fuzzy
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Comandos:\n"
-"p, pick <commit> = usa commit\n"
-"r, reword <commit> = usa commit, editando a mensagem commit\n"
-"e, edit <commit> = usa commit, mas pára para emendar\n"
-"s, squash <commit> = usa commit, fundindo no commit anterior\n"
-"f, fixup <commit> = como \"squash\", mas descarta mensagem deste commit\n"
-"x, exec <commit> = executa comando (do resto da linha) usando a shell\n"
-"d, drop <commit> = larga commit\n"
-"l, label <label> = dá um label a HEAD atual\n"
-"t, reset <label> = reinicia a HEAD em label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". cria merge commit usando a commit message original (a única\n"
-". linha também poderá ser utlilizada). Usa -c <commit> para \n"
-". modificar a commit message.\n"
-"\n"
-"Estas linhas podem ser reordenadas; são executadas de cima para baixo.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Podes emendar o commit agora, com\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Quando modificações estão correctas, executa\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: é memória nenhuma que possa ser escolhida"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nome de commit inválido: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Incapaz escrever sha1 substituto atual de commit"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Avanço para $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Incapaz fast-forward até $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Incapaz mover HEAD até $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Recusa-se a esmagar uma integração: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Erro ao refazer integração $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Incapaz apanhar $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Esta é a mensagem de memória #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Mensagem de memória #${n} será ignorada:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Isto é a combinação de $count commit."
-msgstr[1] "Isto é a combinação de $count commits."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Incapaz escrever $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Isto é a combinação de 2 commits."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Incapaz submeter $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Impossível emendar commit pós um sucesso do picking $sha1... $rest\n"
-" devido a um commit message vazio, ou o pre-commit hook falhou. Se o \n"
-"pre-commit hook falhou, pode ser preciso resolver o issue antes de \n"
-"tentares modificar a mensagem commit."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Parou em $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Incapaz '$squash_style' sem um commit anterior"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "A executar: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Falha ao executar: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "e fez alterações ao índice e/ou à árvore de trabalho"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Podes resolver o problema, e executar\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Executado com sucesso: $rest\n"
-"e tens alterações em índice e/ou em working tree\n"
-"Põe no commit ou stash, e corre\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Comando desconhecido: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Corrija-o usando 'git rebase --edit-todo'."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "$head_name rebaseado e atualizado com sucesso."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Incapaz remover CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Tens modificações staged na working tree.\n"
-"Se tenciona squash as modificações no último\n"
-"commit, execute:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Se tenciona pô-las em novo commit, execute:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"Em ambos os casos, quando feito, continue com:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Erro ao tentar encontrar a identidade do autor para emendar o commit"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n"
-"e execute 'git rebase --continue' de novo."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Incapaz de commit alterações preparadas."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Incapaz executar editor"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Incapaz checkout $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "HEAD nenhuma?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Incapaz criar $state_dir temporário"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Incapaz marcar como interativo"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)"
-msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Note que memórias vazias são comentadas"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Incapaz inicializar memórias reescritas"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
-msgstr "utilização: $dashless $USAGE"
+msgstr "uso: $dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:182
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
-msgstr "Incapaz chdir para $cdup, o topo da árvore de trabalho"
+msgstr "Incapaz chdir para $cdup, o topo da árvore-trabalho"
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:191 git-sh-setup.sh:198
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "fatal: $program_name apenas pode ser usado com uma árvore de trabalho."
+msgstr "fatal: $program_name apenas pode ser usado com uma árvore-trabalho."
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Incapaz rebasear: Tens alterações despreparadas."
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:212
msgid "Cannot rewrite branches: You have unstaged changes."
-msgstr "Incapaz reescrever ramos: Tens alterações despreparadas."
+msgstr "Incapaz reescrever ramos: Tens alterações desencenadas."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Incapaz agarrar com rebase: Tens alterações despreparadas."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:215
#, sh-format
msgid "Cannot $action: You have unstaged changes."
-msgstr "Incapaz $action: Tens alterações despreparadas."
+msgstr "Incapaz $action: Tens alterações desencenadas."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "Incapaz rebasear: Teu index contém alterações por memorizar."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "Incapaz agarrar com rebase: Teu index contém alterações por memorizar."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:226
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
-msgstr "Incapaz $action: Teu index contém alterações por memorizar."
+msgstr "Incapaz $action: Teu cenário contém alterações por memorizar."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:228
msgid "Additionally, your index contains uncommitted changes."
-msgstr "Além disso, teu index contém alterações por memorizar."
+msgstr "Além disso, teu cenário contém alterações por memorizar."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:348
msgid "You need to run this command from the toplevel of the working tree."
-msgstr ""
-"Precisa de executar este comando a partir do topo da árvore de trabalho."
+msgstr "Precisas executar este comando a partir do topo da árvore-trabalho."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:353
msgid "Unable to determine absolute path of git directory"
msgstr "Incapaz determinar caminho absoluto de pasta git"
@@ -26107,24 +25968,24 @@
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-"Se patch aplica-se correctamente, a edição do hunk será marcada\n"
-"imediatamente como preparado."
+"Se remendo aplica-se correctamente, a edição do hunk será imediatamente\n"
+"marcada para encenar."
#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-"Se patch aplica-se corretamente, a edição do hunk será marcada\n"
-"imediatamente como stashed."
+"Se remendo aplica-se corretamente, a edição do hunk será imediatamente\n"
+"marcada para esconder."
#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-"Se patch aplica-se corretamente, a edição do hunk será marcada\n"
-"imediatamente como despreparada."
+"Se remendo aplica-se corretamente, a edição do hunk será imediatamente\n"
+"marcada para desencenar."
#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
#: git-add--interactive.perl:1080
@@ -26132,8 +25993,8 @@
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-"Se patch aplica-se corretamente, a edição do hunk será marcada\n"
-"imediatamente como aplicada."
+"Se remendo aplica-se corretamente, a edição do hunk será imediatamente\n"
+"marcada para aplicação."
#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
#: git-add--interactive.perl:1077
@@ -26141,8 +26002,8 @@
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-"Se patch aplica-se corretamente, o pedaço editado será marcado\n"
-"imediatamente como descartado."
+"Se remendo aplica-se corretamente, o pedaço editado será imediatamente\n"
+"marcada para descartar."
#: git-add--interactive.perl:1114
#, perl-format
@@ -26167,7 +26028,7 @@
msgid "failed to open hunk edit file for reading: %s"
msgstr "falha a abrir ficheiro de edição do pedaço para leitura: %s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -26175,13 +26036,13 @@
"a - stage this hunk and all later hunks in the file\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-"y - preparar este pedaço\n"
-"n - despreparar este pedaço\n"
-"q - sair; despreparar este pedaço e os restantes\n"
-"a - preparar este pedaço e os próximos deste ficheiro\n"
-"d - despreparar este pedaço e os próximos deste ficheiro"
+"y - encenar este pedaço\n"
+"n - deixar por encenar este pedaço\n"
+"q - sair; deixar por encenar este pedaço ou qualquer um dos que permaneçam\n"
+"a - encenar este pedaço e todos os próximos pedaços deste ficheiro\n"
+"d - deixar por encenar este pedaço ou qualquer próximo pedaço deste ficheiro"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -26189,13 +26050,13 @@
"a - stash this hunk and all later hunks in the file\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-"y - arrumar este pedaço\n"
-"n - deixar este pedaço fora dos arrumos\n"
-"q - sair; deixar este pedaço e os restantes fora dos arrumos\n"
-"a - arrumar este pedaço e os próximos deste ficheiro\n"
-"d - deixar este pedaço e os próximos deste ficheiro fora dos arrumos"
+"y - esconder este pedaço\n"
+"n - deixar por esconder este pedaço\n"
+"q - sair; deixar por esconder este pedaço ou qualquer um dos que permaneçam\n"
+"a - esconder este pedaço e todos os próximos pedaços neste ficheiro\n"
+"d - deixar por esconder este pedaço ou qualquer próximo pedaço neste ficheiro"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -26203,13 +26064,14 @@
"a - unstage this hunk and all later hunks in the file\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-"y - despreparar este pedaço\n"
-"n - preparar este pedaço\n"
-"q - sair; preparar este pedaço e os restantes\n"
-"a - despreparar este pedaço e os próximos deste ficheiro\n"
-"d - preparar este pedaço e os próximos deste ficheiro"
+"y - desencenar este pedaço\n"
+"n - deixar por desencenar este pedaço\n"
+"q - sair; deixar por encenar este pedaço ou qualquer um dos que permaneçam\n"
+"a - desencenar este pedaço e todos os próximos pedaços neste ficheiro\n"
+"d - deixar por desencenar este pedaço ou qualquer próximo pedaço neste "
+"ficheiro"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -26217,13 +26079,13 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-"y - submeter este pedaço ao index\n"
-"n - deixar este pedaço de fora do index\n"
-"q - sair; deixar de fora este pedaço e os restantes\n"
-"a - submeter este pedaço e os próximos deste ficheiro\n"
-"d - deixar de fora este pedaço e os próximos deste ficheiro"
+"y - submeter este pedaço no cenário\n"
+"n - deixar por submeter este pedaço no cenário\n"
+"q - sair; deixar por submeter este pedaço ou qualquer um dos que permaneçam\n"
+"a - submeter este pedaço e todos os próximos pedaços neste ficheiro\n"
+"d - deixar por submeter este pedaço ou qualquer próximo pedaço neste ficheiro"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -26231,13 +26093,15 @@
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-"y - descartar este pedaço da árvore de trabalho\n"
-"n - manter este pedaço na árvore de trabalho\n"
-"q - sair; considerar este pedaço e os restantes\n"
-"a - descartar este pedaço e os os próximos deste ficheiro\n"
-"d - manter este pedaço e os próximos deste ficheiro"
+"y - descartar este pedaço da árvore-trabalho\n"
+"n - deixar por descartar este pedaço da árvore-trabalho\n"
+"q - sair; deixar por descartar este pedaço ou qualquer um dos que "
+"permaneçam\n"
+"a - descartar este pedaço e qualquer próximos pedaço neste ficheiro\n"
+"d - deixar por descartar este pedaço ou qualquer próximo pedaço neste "
+"ficheiro"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -26245,13 +26109,15 @@
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-"y - descartar este pedaço de index e árvore de trabalho\n"
-"n - manter este pedaço no index e árvore de trabalho\n"
-"q - sair; manter este pedaço e os restante\n"
-"a - descartar este pedaço e os próximos deste ficheiro\n"
-"d - manter este pedaço e os próximos deste ficheiro"
+"y - descartar este pedaço do cenário e árvore-trabalho\n"
+"n - deixar por descartar este pedaço do cenário e árvore-trabalho\n"
+"q - sair; deixar por descartar este pedaço ou qualquer um dos que "
+"permaneçam\n"
+"a - descartar este pedaço e qualquer próximos pedaço neste ficheiro\n"
+"d - deixar por descartar este pedaço ou qualquer próximo pedaço neste "
+"ficheiro"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -26259,14 +26125,13 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-"y - submeter este pedaço ao index e à árvore de trabalho\n"
-"n - deixar este pedaço fora de índice e à árvore de trabalho\n"
-"q - sair; deixar de fora este pedaço e restantes\n"
-"a - submeter este pedaço e os próximos deste ficheiro\n"
-"d - deixar de fora este pedaço e os próximos deste ficheiro"
+"y - submeter este pedaço ao cenário e à árvore-trabalho\n"
+"n - deixar por submeter este pedaço ao cenário e à árvore-trabalho\n"
+"q - sair; deixar por submeter este pedaço ou qualquer um dos que permaneçam\n"
+"a - submeter este pedaço e qualquer próximos pedaço neste ficheiro\n"
+"d - deixar por submeter este pedaço ou qualquer próximo pedaço neste ficheiro"
-#: git-add--interactive.perl:1299
-#, fuzzy
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -26274,13 +26139,13 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-"y - submeter este pedaço à árvore de trabalho\n"
-"n - deixar este pedaço de fora da árvore de trabalho\n"
-"q - sair; deixar de fora este pedaço e restantes\n"
-"a - submeter este pedaço e os próximos deste ficheiro\n"
-"d - deixar de fora este pedaço e os próximos deste ficheiro"
+"y - submeter este pedaço à árvore-trabalho\n"
+"n - deixar por submeter este pedaço à árvore-trabalho\n"
+"q - sair; deixar por submeter este pedaço ou qualquer um dos que permaneçam\n"
+"a - submeter este pedaço e qualquer próximos pedaço neste ficheiro\n"
+"d - deixar por submeter este pedaço ou qualquer próximo pedaço neste ficheiro"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -26302,95 +26167,90 @@
"e - editar manualmente o pedaço atual\n"
"? - imprimir ajuda\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
-msgstr "Os pedaços selecionados ficam de fora de index!\n"
+msgstr "Os pedaços selecionados ficam de fora de cenário!\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorando por juntar: %s\n"
-#: git-add--interactive.perl:1479
-#, fuzzy, perl-format
-msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Aplicar alteração de modo ao índice e à árvore de trabalho [y,n,q,a,d,/"
-"%s,?]? "
-
-#: git-add--interactive.perl:1480
-#, fuzzy, perl-format
-msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Aplicar eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
-
#: git-add--interactive.perl:1481
-#, fuzzy, perl-format
-msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Aplicar eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Submeter alteração de modo à árvore-trabalho [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1482
-#, fuzzy, perl-format
-msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Aplicar este pedaço ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Submeter eliminação à árvore-trabalho [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1483
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "Submeter adição à árvore-trabalho [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1484
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplicar este pedaço à árvore-trabalho [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Número inválido: '%s'\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Lamento, apenas %d pedaço disponível.\n"
msgstr[1] "Lamento, apenas %d pedaços disponíveis.\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr ""
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Regexp de pesquisa malformada %s: %s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "Nenhum pedaço corresponde ao padrão fornecido\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Nenhum pedaço anterior\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Nenhum pedaço seguinte\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Dividir em %d pedaço.\n"
msgstr[1] "Dividir em %d pedaços.\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -26400,113 +26260,113 @@
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
-"status - mostrar paths com alterações\n"
-"update - adicionar o estado da árvore de trabalho ao conjunto de "
-"alterações preparadas\n"
-"revert - reverter conjunto de alterações preparadas de volta à versão "
+"status - mostrar caminhos com alterações\n"
+"update - adicionar estado de árvore-trabalho ao conjunto de "
+"alterações encenadas\n"
+"revert - reverter conjunto de alterações encenadas de volta à versão "
"HEAD\n"
"patch - escolher pedaços e atualizar seletivamente\n"
-"diff - ver diff entre HEAD e index\n"
-"add untracked - adicionar conteúdos de ficheiros por monitorizar ao conjunto "
-"de alterações preparadas\n"
+"diff - ver diff entre HEAD e cenário\n"
+"add untracked - adicionar conteúdos de ficheiros desmonitorizados ao "
+"conjunto de alterações encenadas\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "falta --"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
-msgstr "Mode de --patch desconhecido: %s"
+msgstr "modo --patch desconhecido: %s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
-msgstr "argumento inválido %s, esperava-se --"
+msgstr "argumento inválido %s, esperando --"
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "zona local difere de GMT por um intervalo diferente de minuto\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "a diferença de tempo local é maior ou igual a 24 horas\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr ""
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
-msgstr "o editor saiu com erros, abortar tudo"
+msgstr "o editor saiu incorretamente, abortar tudo"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
-msgstr "'%s' contém uma versão intermédia do e-mail que esteve a compor.\n"
+msgstr "'%s' contém uma versão intermédia do email que estavas a compor.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' contém o e-mail composto.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases incompatível com outras opções\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
msgstr ""
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Incapaz executar git format-patch fora de um repositório\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Campo de --suppress-cc desconhecido: '%s'\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Definidição --confirm desconhecida: '%s'\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "aviso: alias sendmail com aspas é insustentado: %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "aviso: `:include:` insustentado: %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "aviso: `/file` ou redireção `|pipe` é insustentado: %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "aviso: linha sendmail está por reconhecer: %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -26515,18 +26375,18 @@
" * Saying \"./%s\" if you mean a file; or\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-"O ficheiro '%s' existe mas também pode ser um intervalo de commits\n"
-"para os quais produzir patches. Por favor desambigue...\n"
+"Ficheiro '%s' existe mas também pode ser o intervalo de memórias\n"
+"para as quais produzir remendos. Por favor desambigue...\n"
"\n"
-" * Dizendo \"./%s\" se pretende um ficheiro; ou\n"
-" * Passando a opção --format-patch se pretende um intervalo de commits.\n"
+" * Dizendo \"./%s\" se pretendes um ficheiro; ou\n"
+" * Passando a opção --format-patch se pretendes um intervalo.\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
-msgstr "Falha ao abrir diretório %s: %s"
+msgstr "Falhou ao opendir %s: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
@@ -26536,17 +26396,17 @@
"Nenhum ficheiro patch especificado!\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "Nenhum linha de assunto em %s?"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Falha ao abrir %s para escrita: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -26560,27 +26420,27 @@
"\n"
"Apague o conteúdo do corpo se deseja enviar um sumário nenhum.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Falha ao abrir %s: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Falha ao abrir %s.final: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
-msgstr "O e-mail de sumário está vazio, saltá-lo à frente\n"
+msgstr "O email de sumário está vazio, saltá-lo à frente\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr "Tem a certeza que quer usar <%s> [y/N]? "
+msgstr "Tens a certeza que queres usar <%s> [y/N]? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -26588,11 +26448,11 @@
"Os seguintes ficheiros são 8bit, mas declaram Content-Transfer-Encoding "
"nenhum.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr "Que codificação 8bit se deve declarar [UTF-8]? "
+msgstr "Que codificação 8bit queres que eu declare [UTF-8]? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -26605,22 +26465,22 @@
"tem o assunto modelo '*** SUBJECT HERE ***'. Passe --force se pretende mesmo "
"enviar.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
-msgstr "Para quem devem ser enviados os e-mails (se alguém)?"
+msgstr "Para quem devem ser enviados os emails (se alguém)?"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: alias '%s' expande para si próprio\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID para ser usado como In-Reply-To para o primeiro e-mail (se "
"algum)? "
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "erro: incapaz extrair endereço válido de: %s\n"
@@ -26628,16 +26488,16 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "O que fazer com este endereço? ([q]uit|[d]rop|[e]dit): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Path CA \"%s\" é inexistente"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -26651,158 +26511,156 @@
"\n"
msgstr ""
" A lista de Cc acima foi expandida com endereços\n"
-" adicionais encontrados na mensagem de commit do patch.\n"
+" adicionais encontrados na mensagem de memória do remendo.\n"
" Por omissão send-email pergunta antes de enviar quando\n"
" isto ocorre. Este comportamento é controlado pela definição\n"
-" de configuração sendemail.confirm.\n"
+" de configuração sendemail.confirm .\n"
"\n"
-" Para informação adicional, execute 'git send-email --help'.\n"
+" Para informação adicional, executa 'git send-email --help'.\n"
" Para reter o comportamento atual, mas suprimir esta mensagem,\n"
-" execute 'git config --global sendemail.confirm auto'.\n"
+" executa 'git config --global sendemail.confirm auto'.\n"
"\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
-#, fuzzy
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Enviar este e-mail? ([y]es|[n]o|[q]uit|[a]ll): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
-msgstr "É necessária resposta se deseja enviar este e-mail"
+msgstr "É exigido enviar esta resposta a email"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "O servidor SMTP necessário está definido incorretamente."
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "O servidor insustenta STARTTLS! %s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Falhou STARTTLS! %s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-"Incapaz inicializar SMTP devidamente. Verifica configuração e usa --smtp-"
-"debug."
+"Incapaz inicializar SMTP devidamente. Verifica config e usa --smtp-debug."
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "Falha ao enviar %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Simulado-Enviado %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "Enviado %s\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "Simulado-OK. O registo diz:\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "OK. O registo diz:\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Resultado: "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Resultado: OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "incapaz abrir ficheiro %s"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Adicionar cc: %s da linha '%s'\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Adicionar para: %s da linha '%s'\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Adicionar cc: %s da linha '%s'\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Adicionar cc: %s da linha '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Incapaz executar '%s'"
-#: git-send-email.perl:1972
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Adicionar %s: %s de: '%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) falha ao fechar pipe para '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "incapaz enviar mensagem como 7bit"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "codificação de transferência inválida"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2100
#, fuzzy, perl-format
msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
+"fatal: %s: rejected by %s hook\n"
"%s\n"
"warning: no patches were sent\n"
msgstr ""
-"fatal: %s: %s\n"
-"aviso: enviado patch nenhum\n"
+"fatal: %s:%d é mais longo que 998 caracteres\n"
+"aviso: enviado remendo nenhum\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "incapaz abrir %s: %s\n"
-#: git-send-email.perl:2064
-#, fuzzy, perl-format
+#: git-send-email.perl:2113
+#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"warning: no patches were sent\n"
msgstr ""
-"fatal: %s: %s\n"
-"aviso: enviado patch nenhum\n"
+"fatal: %s:%d é mais longo que 998 caracteres\n"
+"aviso: enviado remendo nenhum\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2131
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
-msgstr "Saltar %s com sufixo de backup '%s'.\n"
+msgstr "Saltando %s com sufixo de backup '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2135
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
-msgstr "Deseja mesmo enviar %s? [y|N]: "
+msgstr "Queres mesmo enviar %s? [y|N]: "
diff --git a/po/sv.po b/po/sv.po
index 7e08824..14176ac 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,14 +1,14 @@
# Swedish translations for Git.
-# Copyright (C) 2010-2021 Peter Krefting <peter@softwolves.pp.se>
+# Copyright (C) 2010-2022 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-2021.
+# Peter Krefting <peter@softwolves.pp.se>, 2010-2022.
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.33.0\n"
+"Project-Id-Version: git 2.36.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-14 21:14+0100\n"
+"POT-Creation-Date: 2022-04-13 14:52+0800\n"
+"PO-Revision-Date: 2022-04-17 18:08+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,235 +16,233 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.30.1\n"
-#: add-interactive.c:376
+#: add-interactive.c:382
#, c-format
msgid "Huh (%s)?"
msgstr "Vadå (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
+#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
+#: builtin/rebase.c:1671
msgid "could not read index"
msgstr "kunde inte läsa indexet"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:590 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binär"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:648 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "ingenting"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:649 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "oändrad"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:686 git-add--interactive.perl:641
msgid "Update"
msgstr "Uppdatera"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:703 add-interactive.c:891
#, c-format
msgid "could not stage '%s'"
msgstr "kunde inte köa \"%s\""
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
msgid "could not write index"
msgstr "kunde inte skriva indexet"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:712 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "uppdaterade %d sökväg\n"
msgstr[1] "uppdaterade %d sökvägar\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:730 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "observera: %s spåras inte längre.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:765 git-add--interactive.perl:653
msgid "Revert"
msgstr "Återställ"
-#: add-interactive.c:775
+#: add-interactive.c:781
msgid "Could not parse HEAD^{tree}"
msgstr "kunde inte tolka HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:819 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "återställde %d sökväg\n"
msgstr[1] "återställde %d sökvägar\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:870 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Inga ospårade filer.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:874 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Lägg till ospårad"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:901 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "lade till %d sökväg\n"
msgstr[1] "lade till %d sökvägar\n"
-#: add-interactive.c:925
+#: add-interactive.c:931
#, c-format
msgid "ignoring unmerged: %s"
msgstr "ignorerar ej sammanslagen: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Endast binära filer ändrade.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Inga ändringar.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:949 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Uppdatera patch"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:988 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Granska diff"
-#: add-interactive.c:1010
+#: add-interactive.c:1016
msgid "show paths with changes"
msgstr "visa sökvägar med ändringar"
-#: add-interactive.c:1012
+#: add-interactive.c:1018
msgid "add working tree state to the staged set of changes"
msgstr "lägg arbetskatalogens tillstånd till köade ändringar"
-#: add-interactive.c:1014
+#: add-interactive.c:1020
msgid "revert staged set of changes back to the HEAD version"
msgstr "återställ köade ändringar tillbaka till HEAD-versionen"
-#: add-interactive.c:1016
+#: add-interactive.c:1022
msgid "pick hunks and update selectively"
msgstr "välj stycken och uppdatera selektivt"
-#: add-interactive.c:1018
+#: add-interactive.c:1024
msgid "view diff between HEAD and index"
msgstr "visa skillnad mellan HEAD och index"
-#: add-interactive.c:1020
+#: add-interactive.c:1026
msgid "add contents of untracked files to the staged set of changes"
msgstr "lägg innehåll i ospårade filer till köade ändringar"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1034 add-interactive.c:1083
msgid "Prompt help:"
msgstr "Kommandoradshjälp:"
-#: add-interactive.c:1030
+#: add-interactive.c:1036
msgid "select a single item"
msgstr "markera en post"
-#: add-interactive.c:1032
+#: add-interactive.c:1038
msgid "select a range of items"
msgstr "markera intervall av poster"
-#: add-interactive.c:1034
+#: add-interactive.c:1040
msgid "select multiple ranges"
msgstr "markera flera intervall"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1042 add-interactive.c:1087
msgid "select item based on unique prefix"
msgstr "markera post baserad på unikt prefix"
-#: add-interactive.c:1038
+#: add-interactive.c:1044
msgid "unselect specified items"
msgstr "avmarkera angivna poster"
-#: add-interactive.c:1040
+#: add-interactive.c:1046
msgid "choose all items"
msgstr "välj alla poster"
-#: add-interactive.c:1042
+#: add-interactive.c:1048
msgid "(empty) finish selecting"
msgstr "(tomt) avsluta markering"
-#: add-interactive.c:1079
+#: add-interactive.c:1085
msgid "select a numbered item"
msgstr "markera en numrerad post"
-#: add-interactive.c:1083
+#: add-interactive.c:1089
msgid "(empty) select nothing"
msgstr "(tomt) markera ingenting"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "Vad nu"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "staged"
msgstr "köad"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "unstaged"
msgstr "ej köad"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
+#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
+#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
+#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
#: git-add--interactive.perl:213
msgid "path"
msgstr "sökväg"
-#: add-interactive.c:1151
+#: add-interactive.c:1157
msgid "could not refresh index"
msgstr "kunde inte uppdatera indexet"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Hej då.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Köa borttagning [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Köa tillägg [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Köa stycket [y,n,q,a,d%s,?]? "
@@ -271,22 +269,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:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Stash:a tillägg [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
@@ -313,22 +311,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:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Ta bort tillägg från kön [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? "
@@ -355,22 +353,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:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Applicera tillägg på indexet [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? "
@@ -397,26 +395,26 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta tillägg från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? "
@@ -443,22 +441,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:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta tillägg från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
@@ -477,22 +475,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:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera tillägg på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
@@ -535,24 +533,24 @@
msgid "could not parse colored hunk header '%.*s'"
msgstr "kunde inte tolka färgat styckehuvud \"%.*s\""
-#: add-patch.c:420
+#: add-patch.c:431
msgid "could not parse diff"
msgstr "kunde inte tolka diff"
-#: add-patch.c:439
+#: add-patch.c:450
msgid "could not parse colored diff"
msgstr "kunde inte tolka färgad diff"
-#: add-patch.c:453
+#: add-patch.c:464
#, c-format
msgid "failed to run '%s'"
msgstr "misslyckades att köra \"%s\""
-#: add-patch.c:612
+#: add-patch.c:618
msgid "mismatched output from interactive.diffFilter"
msgstr "omaka utdata från interactive.diffFilter"
-#: add-patch.c:613
+#: add-patch.c:619
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -560,7 +558,7 @@
"Alla rader i indata måste ha en motsvarande rad i utdata från\n"
"ditt filter."
-#: add-patch.c:791
+#: add-patch.c:797
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -569,7 +567,7 @@
"förväntade sammanhangsrad %d i\n"
"%.*s"
-#: add-patch.c:806
+#: add-patch.c:812
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -582,11 +580,11 @@
"\tavslutas inte med:\n"
"%.*s"
-#: add-patch.c:1082 git-add--interactive.perl:1115
+#: add-patch.c:1088 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
-#: add-patch.c:1086
+#: add-patch.c:1092
#, c-format
msgid ""
"---\n"
@@ -600,7 +598,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:1100 git-add--interactive.perl:1129
+#: add-patch.c:1106 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -610,11 +608,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:1133
+#: add-patch.c:1139
msgid "could not parse hunk header"
msgstr "kunde inte tolka styckehuvud"
-#: add-patch.c:1178
+#: add-patch.c:1184
msgid "'git apply --cached' failed"
msgstr "\"git apply --cached\" misslyckades"
@@ -630,26 +628,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1253 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
"[y/n]? "
-#: add-patch.c:1290
+#: add-patch.c:1296
msgid "The selected hunks do not apply to the index!"
msgstr "Markerade stycken kan inte appliceras på indexet!"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Applicera dem på arbetskatalogen trots det? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1304 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Ingenting applicerades.\n"
-#: add-patch.c:1355
+#: add-patch.c:1361
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -671,73 +669,73 @@
"e - redigera aktuellt stycke manuellt\n"
"? - visa hjälp\n"
-#: add-patch.c:1517 add-patch.c:1527
+#: add-patch.c:1523 add-patch.c:1533
msgid "No previous hunk"
msgstr "Inget föregående stycke"
-#: add-patch.c:1522 add-patch.c:1532
+#: add-patch.c:1528 add-patch.c:1538
msgid "No next hunk"
msgstr "Inget följande stycke"
-#: add-patch.c:1538
+#: add-patch.c:1544
msgid "No other hunks to goto"
msgstr "Inga andra stycken att gå till"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1555 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "gå till vilket stycke (<ret> för att se fler)? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1556 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "gå till vilket stycke? "
-#: add-patch.c:1561
+#: add-patch.c:1567
#, c-format
msgid "Invalid number: '%s'"
msgstr "Ogiltigt siffervärde: \"%s\""
-#: add-patch.c:1566
+#: add-patch.c:1572
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Beklagar, det finns bara %d stycke."
msgstr[1] "Beklagar, det finns bara %d stycken."
-#: add-patch.c:1575
+#: add-patch.c:1581
msgid "No other hunks to search"
msgstr "Inga andra stycken att söka efter"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1587 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "sök efter reguljärt uttryck? "
-#: add-patch.c:1596
+#: add-patch.c:1602
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s"
-#: add-patch.c:1613
+#: add-patch.c:1619
msgid "No hunk matches the given pattern"
msgstr "Inga stycken motsvarar givet mönster"
-#: add-patch.c:1620
+#: add-patch.c:1626
msgid "Sorry, cannot split this hunk"
msgstr "Beklagar, kan inte dela stycket"
-#: add-patch.c:1624
+#: add-patch.c:1630
#, c-format
msgid "Split into %d hunks."
msgstr "Dela i %d stycken."
-#: add-patch.c:1628
+#: add-patch.c:1634
msgid "Sorry, cannot edit this hunk"
msgstr "Beklagar, kan inte redigera stycket"
-#: add-patch.c:1680
+#: add-patch.c:1686
msgid "'git apply' failed"
msgstr "\"git apply\" misslyckades"
-#: advice.c:145
+#: advice.c:81
#, c-format
msgid ""
"\n"
@@ -746,47 +744,47 @@
"\n"
"Slå av meddelandet med \"git config advice.%s false\""
-#: advice.c:161
+#: advice.c:97
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%stips: %.*s%s\n"
-#: advice.c:252
+#: advice.c:181
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:254
+#: advice.c:183
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:256
+#: advice.c:185
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:258
+#: advice.c:187
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:260
+#: advice.c:189
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:262
+#: advice.c:191
#, 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:270
+#: advice.c:199
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."
@@ -794,41 +792,48 @@
"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:278
+#: advice.c:207
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:212 builtin/merge.c:1388
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
-#: advice.c:285
+#: advice.c:214
msgid "Please, commit your changes before merging."
msgstr "Checka in dina ändringar innan du utför sammanslagningen."
-#: advice.c:286
+#: advice.c:215
msgid "Exiting because of unfinished merge."
msgstr "Avslutar på grund av ofullbordad sammanslagning."
-#: advice.c:296
+#: advice.c:220
+msgid "Not possible to fast-forward, aborting."
+msgstr "Kan inte snabbspola, avbryter."
+
+#: advice.c:230
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"Följande sökvägsangivelser motsvarar inte någon kvalificerad sökväg, men "
-"motsvarar\n"
-"indexposter utanför den nuvarande glesa utcheckningen:\n"
+"Följande sökvägar och/eller ökvägsangivelser motsvarar sökvägar\n"
+"utanför din \"sparse-checkout\"-definition, så de kommer inte\n"
+"uppdateras i indexet:\n"
-#: advice.c:303
+#: advice.c:237
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Du måste ta bort eller ändra glesningsreglerna för att uppdatera sådana "
-"poster."
+"Om du har tänkt uppdatera sådana poster, försök något av följande:\n"
+"* Använd flaggan --sparse.\n"
+"* Inaktivera eller ändra reglerna för gles utcheckning."
-#: advice.c:310
+#: advice.c:245
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -889,68 +894,83 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject och --3way kan inte användas samtidigt."
+#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
+#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
+#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
+#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
+#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
+#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
+#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
+#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
+#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
+#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
+#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
+#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
+#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
+#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
+#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
+#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
+#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
+#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
+#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
+#: builtin/worktree.c:779
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "flaggorna \"%s\" och \"%s\" kan inte användas samtidigt"
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way utanför arkiv"
+#: apply.c:141 apply.c:152 apply.c:155
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "\"%s\" utanför arkiv"
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index utanför arkiv"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached utanför arkiv"
-
-#: apply.c:800
+#: apply.c:807
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
-#: apply.c:809
+#: apply.c:816
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec returnerade %d för indata: %s"
-#: apply.c:883
+#: apply.c:890
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "kan inte hitta filnamn i patchen på rad %d"
-#: apply.c:921
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
-#: apply.c:927
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
-#: apply.c:928
+#: apply.c:935
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
-#: apply.c:933
+#: apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
-#: apply.c:962
+#: apply.c:969
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "ogiltigt läge på rad %d: %s"
-#: apply.c:1281
+#: apply.c:1288
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "huvudet är inkonsekvent mellan rad %d och %d"
-#: apply.c:1371
+#: apply.c:1378
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -966,92 +986,92 @@
"sökvägskomponenter\n"
"tas bort (rad %d)"
-#: apply.c:1384
+#: apply.c:1391
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"
-#: apply.c:1480
+#: apply.c:1487
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: oväntad rad: %.*s"
-#: apply.c:1549
+#: apply.c:1556
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "patch-fragment utan huvud på rad %d: %.*s"
-#: apply.c:1752
+#: apply.c:1759
msgid "new file depends on old contents"
msgstr "ny fil beror på gammalt innehåll"
-#: apply.c:1754
+#: apply.c:1761
msgid "deleted file still has contents"
msgstr "borttagen fil har fortfarande innehåll"
-#: apply.c:1788
+#: apply.c:1795
#, c-format
msgid "corrupt patch at line %d"
msgstr "trasig patch på rad %d"
-#: apply.c:1825
+#: apply.c:1832
#, c-format
msgid "new file %s depends on old contents"
msgstr "nya filen %s beror på gammalt innehåll"
-#: apply.c:1827
+#: apply.c:1834
#, c-format
msgid "deleted file %s still has contents"
msgstr "borttagna filen %s har fortfarande innehåll"
-#: apply.c:1830
+#: apply.c:1837
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** varning: filen %s blir tom men har inte tagits bort"
-#: apply.c:1977
+#: apply.c:1985
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "trasig binärpatch på rad %d: %.*s"
-#: apply.c:2014
+#: apply.c:2022
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "binärpatchen på rad %d känns inte igen"
-#: apply.c:2176
+#: apply.c:2184
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch med bara skräp på rad %d"
-#: apply.c:2262
+#: apply.c:2270
#, c-format
msgid "unable to read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: apply.c:2266
+#: apply.c:2274
#, c-format
msgid "unable to open or read %s"
msgstr "kunde inte öppna eller läsa %s"
-#: apply.c:2935
+#: apply.c:2943
#, c-format
msgid "invalid start of line: '%c'"
msgstr "felaktig inledning på rad: \"%c\""
-#: apply.c:3056
+#: apply.c:3064
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
-#: apply.c:3068
+#: apply.c:3076
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
-#: apply.c:3074
+#: apply.c:3082
#, c-format
msgid ""
"while searching for:\n"
@@ -1060,25 +1080,25 @@
"vid sökning efter:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3104
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "saknar binära patchdata för \"%s\""
-#: apply.c:3104
+#: apply.c:3112
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"
"\""
-#: apply.c:3151
+#: apply.c:3159
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"
-#: apply.c:3162
+#: apply.c:3170
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -1086,462 +1106,461 @@
"patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
"innehållet."
-#: apply.c:3170
+#: apply.c:3178
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"
-#: apply.c:3188
+#: apply.c:3196
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"
-#: apply.c:3201
+#: apply.c:3209
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "binärpatchen kan inte tillämpas på \"%s\""
-#: apply.c:3208
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
-#: apply.c:3229
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
-#: apply.c:3352
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
+#: setup.c:310
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
-#: apply.c:3412
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3449 apply.c:3721
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3559 apply.c:3736
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3568 apply.c:3744 apply.c:3960
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
-#: apply.c:3571
+#: apply.c:3605
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "arkivet saknar objekt som behövs för att utföra 3-vägssammanslagning."
-#: apply.c:3574
+#: apply.c:3608
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Utför trevägssammanslagning...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3624 apply.c:3628
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
-#: apply.c:3606
+#: apply.c:3640
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Misslyckades utföra trevägssammanslagning...\n"
-#: apply.c:3620
+#: apply.c:3654
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
-#: apply.c:3625
+#: apply.c:3659
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Tillämpade patchen på \"%s\" rent.\n"
-#: apply.c:3642
+#: apply.c:3676
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Faller tillbaka på direkt tillämpning...\n"
-#: apply.c:3654
+#: apply.c:3688
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
-#: apply.c:3727
+#: apply.c:3761
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
-#: apply.c:3729
+#: apply.c:3763
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
+#: read-cache.c:1399
#, c-format
msgid "invalid path '%s'"
msgstr "ogiltig sökväg \"%s\""
-#: apply.c:3952
+#: apply.c:3958
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: apply.c:3956
+#: apply.c:3962
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: apply.c:3976
+#: apply.c:3982
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
-#: apply.c:3981
+#: apply.c:3987
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
-#: apply.c:4001
+#: apply.c:4007
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
-#: apply.c:4005
+#: apply.c:4011
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: apply.c:4020
+#: apply.c:4026
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: apply.c:4112
+#: apply.c:4118
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"
-#: apply.c:4119
+#: apply.c:4125
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
-#: apply.c:4122
+#: apply.c:4128
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
-#: apply.c:4131
+#: apply.c:4137
#, c-format
msgid "could not add %s to temporary index"
msgstr "kunde inte lägga till %s till temporärt index"
-#: apply.c:4141
+#: apply.c:4147
#, c-format
msgid "could not write temporary index to %s"
msgstr "kunde inte skriva temporärt index till %s"
-#: apply.c:4279
+#: apply.c:4285
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: apply.c:4313
+#: apply.c:4319
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: apply.c:4319
+#: apply.c:4325
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: apply.c:4327
+#: apply.c:4333
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4339 apply.c:4484
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "misslyckades skriva till \"%s\""
-#: apply.c:4380
+#: apply.c:4386
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: apply.c:4450
+#: apply.c:4456
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: apply.c:4548
+#: apply.c:4554
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: apply.c:4556
+#: apply.c:4562
msgid "internal error"
msgstr "internt fel"
-#: apply.c:4559
+#: apply.c:4565
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
-#: apply.c:4570
+#: apply.c:4576
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4584
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
-#: apply.c:4592
+#: apply.c:4598
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: apply.c:4596
+#: apply.c:4602
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: apply.c:4725
+#: apply.c:4731
#, c-format
msgid "Skipped patch '%s'."
msgstr "Ignorerar patch \"%s\"."
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "indata känns inte igen"
+#: apply.c:4740
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Inga giltiga patchar i indata (tillåt med \"--allow-empty\")"
-#: apply.c:4753
+#: apply.c:4761
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: apply.c:4910
+#: apply.c:4918
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kan inte öppna patchen \"%s\": %s"
-#: apply.c:4937
+#: apply.c:4945
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "undertryckte %d fel i blanksteg"
msgstr[1] "undertryckte %d fel i blanksteg"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4951 apply.c:4966
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d rad lägger till fel i blanksteg."
msgstr[1] "%d rader lägger till fel i blanksteg."
-#: apply.c:4951
+#: apply.c:4959
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: apply.c:4995
+#: apply.c:5003
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: apply.c:4998
+#: apply.c:5006
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5008 builtin/am.c:2379
msgid "num"
msgstr "antal"
-#: apply.c:5001
+#: apply.c:5009
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: apply.c:5004
+#: apply.c:5012
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: apply.c:5006
+#: apply.c:5014
msgid "instead of applying the patch, output diffstat for the input"
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
-#: apply.c:5010
+#: apply.c:5018
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: apply.c:5012
+#: apply.c:5020
msgid "instead of applying the patch, output a summary for the input"
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
-#: apply.c:5014
+#: apply.c:5022
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
-#: apply.c:5016
+#: apply.c:5024
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: apply.c:5018
+#: apply.c:5026
msgid "mark new files with `git add --intent-to-add`"
msgstr "markera nya filer med \"git add --intent-to-add\""
-#: apply.c:5020
+#: apply.c:5028
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: apply.c:5022
+#: apply.c:5030
msgid "accept a patch that touches outside the working area"
msgstr "godta en patch som rör filer utanför arbetskatalogen"
-#: apply.c:5025
+#: apply.c:5033
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: apply.c:5027
+#: apply.c:5035
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"försök en trevägssammanslagning, fall tillbaka på normal patch om det "
"misslyckas"
-#: apply.c:5029
+#: apply.c:5037
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5040 builtin/checkout-index.c:230
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: apply.c:5034
+#: apply.c:5042
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
+#: builtin/rebase.c:1079
msgid "action"
msgstr "åtgärd"
-#: apply.c:5036
+#: apply.c:5044
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5047 apply.c:5050
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: apply.c:5045
+#: apply.c:5053
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: apply.c:5047
+#: apply.c:5055
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: apply.c:5049
+#: apply.c:5057
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: apply.c:5051
+#: apply.c:5059
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "var pratsam"
-
-#: apply.c:5054
+#: apply.c:5062
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: apply.c:5057
+#: apply.c:5065
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5067 builtin/am.c:2367
msgid "root"
msgstr "rot"
-#: apply.c:5060
+#: apply.c:5068
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
-#: archive-tar.c:125 archive-zip.c:345
+#: apply.c:5071
+msgid "don't return error for empty patches"
+msgstr "ge inte någon felkod för tomma patchar"
+
+#: archive-tar.c:125 archive-zip.c:346
#, c-format
msgid "cannot stream blob %s"
msgstr "kan inte strömma blob:en %s"
-#: archive-tar.c:265 archive-zip.c:358
+#: archive-tar.c:265 archive-zip.c:359
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "filens läge stöds ej: 0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "kunde inte starta filtret \"%s\""
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "kan inte omdirigera handtag"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "filtret \"%s\" rapporterade fel"
-#: archive-zip.c:318
+#: archive-zip.c:319
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "sökvägen är inte giltig UTF-8: %s"
-#: archive-zip.c:322
+#: archive-zip.c:323
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
-#: archive-zip.c:603
+#: archive-zip.c:604
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"
@@ -1550,10 +1569,6 @@
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>...]"
@@ -1565,142 +1580,138 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:579
#, c-format
-msgid "cannot read %s"
-msgstr "kan inte läsa %s"
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "ingen sådan referens: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "objektnamnet är inte giltigt: %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "inte ett trädobjekt: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "aktuell arbetskatalog är inte spårad"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Hittar inte filen: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "Inte en vanlig fil: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "fmt"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1809
msgid "prefix"
msgstr "prefix"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
+#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
msgid "file"
msgstr "fil"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "ta med ospårade filer i arkivet"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "skriv arkivet till filen"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "läs .gitattributes i arbetskatalogen"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "rapportera arkiverade filer på standard fel"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "välj komprimeringsgrad"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
+#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
msgid "repo"
msgstr "arkiv"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
msgid "command"
msgstr "kommando"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "sökväg till kommandot git-upload-archive på fjärren"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Oväntad flagga --remote"
-#: archive.c:581
-msgid "Option --exec can only be used together with --remote"
-msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
+#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
+#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
+#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
+#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
+#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "flaggan \"%s\" kräver \"%s\""
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Oväntad flagga --output"
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt"
-
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Okänt arkivformat \"%s\""
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
@@ -1723,22 +1734,22 @@
"Negativa mönster ignoreras i git-attribut\n"
"Använd '\\!' för att inleda med ett utropstecken."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Det finns inte mer att göra \"bisect\" på!\n"
-#: bisect.c:766
+#: bisect.c:765
#, c-format
msgid "Not a valid commit name %s"
msgstr "Namnet på incheckningen är inte giltigt: %s"
-#: bisect.c:791
+#: bisect.c:790
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1747,7 +1758,7 @@
"Sammanslagningsbasen %s är trasig.\n"
"Det betyder att felet har rättats mellan %s och [%s].\n"
-#: bisect.c:796
+#: bisect.c:795
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1756,7 +1767,7 @@
"Sammanslagningsbasen %s är ny.\n"
"Egenskapen har ändrats mellan %s och [%s].\n"
-#: bisect.c:801
+#: bisect.c:800
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1765,7 +1776,7 @@
"Sammanslagningsbasen %s är %s.\n"
"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
-#: bisect.c:809
+#: bisect.c:808
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1776,7 +1787,7 @@
"git bisect kan inte fungera korrekt i detta fall.\n"
"Kanske du skrev fel %s- och %s-revisioner?\n"
-#: bisect.c:822
+#: bisect.c:821
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1788,36 +1799,36 @@
"%s.\n"
"Vi fortsätter ändå."
-#: bisect.c:861
+#: bisect.c:860
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisect: en sammanslagningsbas måste testas\n"
-#: bisect.c:911
+#: bisect.c:910
#, c-format
msgid "a %s revision is needed"
msgstr "en %s-revision behövs"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:940
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:986 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
-#: bisect.c:1027
+#: bisect.c:1026
msgid "reading bisect refs failed"
msgstr "misslyckades läsa bisect-referenser"
-#: bisect.c:1057
+#: bisect.c:1056
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s var både %s och %s\n"
-#: bisect.c:1066
+#: bisect.c:1065
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1826,7 +1837,7 @@
"Ingen testbar incheckning hittades.\n"
"Kanske du startade med felaktiga sökvägsargument?\n"
-#: bisect.c:1095
+#: bisect.c:1094
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1836,151 +1847,178 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1100
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
-#: blame.c:2776
+#: blame.c:2773
msgid "--contents and --reverse do not blend well."
msgstr "--contents och --reverse fungerar inte så bra tillsammans."
-#: blame.c:2790
+#: blame.c:2787
msgid "cannot use --contents with final commit object name"
msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
-#: blame.c:2811
+#: blame.c:2808
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:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
+#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
+#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
+#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
+#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
-#: blame.c:2838
+#: blame.c:2835
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:2849
+#: blame.c:2846
#, c-format
msgid "no such path %s in %s"
msgstr "sökvägen %s i %s finns inte"
-#: blame.c:2860
+#: blame.c:2857
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kan inte läsa objektet %s för sökvägen %s"
-#: branch.c:53
-#, c-format
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr ""
-"\n"
-"När du har rättat felorsaken kan du försöka rätta\n"
-"fjärrspårningsinformationen genom att utföra\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."
-
#: branch.c:93
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
msgstr ""
-"Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom "
-"ombasering."
-
-#: branch.c:94
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"."
-
-#: branch.c:98
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
-"Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom "
-"ombasering."
-
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"."
+"kan inte ärva uppströmsspårningsinformation från flera referenser när "
+"ombasering är vald"
#: branch.c:104
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "ställer inte in grenen %s som sin egen uppströmsgren"
+
+#: branch.c:160
+#, c-format
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "grenen \"%s\" inställd på att spåra \"%s\" genom ombasering."
+
+#: branch.c:161
+#, c-format
+msgid "branch '%s' set up to track '%s'."
+msgstr "grenen \"%s\" inställd på att spåra \"%s\"."
+
+#: branch.c:164
+#, c-format
+msgid "branch '%s' set up to track:"
+msgstr "grenen \"%s\" inställd på att spåra:"
+
+#: branch.c:176
+msgid "unable to write upstream branch configuration"
+msgstr "kan inte skriva inställningar för uppströmsgren"
+
+#: branch.c:178
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
msgstr ""
-"Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering."
+"\n"
+"När du har rättat felorsaken kan du försöka rätta\n"
+"fjärrspårningsinformationen genom att utföra:"
-#: branch.c:105
+#: branch.c:219
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"."
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr "bad om att ärva spårning från \"%s\", men ingen fjärr är vald"
-#: branch.c:109
+#: branch.c:225
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr ""
-"Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom "
-"ombasering."
+"bad om att ärva spårning från \"%s\", men ingen sammanslagningsinställning "
+"är vald"
-#: branch.c:110
+#: branch.c:277
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"."
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "spårar inte: tvetydig information för referensen \"%s\""
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Kan inte skriva inställningar för uppströmsgren"
-
-#: branch.c:156
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading " " space around.
+#.
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#: branch.c:289 object-name.c:464
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Spårar inte: tvetydig information för referensen %s"
+msgid " %s\n"
+msgstr " %s\n"
-#: branch.c:189
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#: branch.c:295
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "\"%s\" är inte ett giltigt grennamn."
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
+"Flera fjärrars hämtnings-referensspecifikationer motsvarar fjärr-\n"
+"spårningsreferensen \"%s\":\n"
+"%s\n"
+"Detta är vanligtvis ett fel i konfigurationen.\n"
+"\n"
+"För att möjliggöra konfiguration av spårande grenar, se till att\n"
+"olika fjärrars hämtnings-referensspecifikationer kopplas till\n"
+"olika spårningsnamnrymder."
-#: branch.c:208
+#: branch.c:344
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Det finns redan en gren som heter \"%s\"."
+msgid "'%s' is not a valid branch name"
+msgstr "\"%s\" är inte ett giltigt grennamn"
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Kan inte tvinga uppdatering av aktuell gren."
-
-#: branch.c:233
+#: branch.c:364
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."
+msgid "a branch named '%s' already exists"
+msgstr "det finns redan en gren som heter \"%s\""
-#: branch.c:235
+#: branch.c:370
+#, c-format
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr ""
+"kan inte tvinga uppdatering av grenen \"%s\" som är utcheckad på \"%s\""
+
+#: branch.c:393
+#, c-format
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"kan inte ställa in spårningsinformation; startpunkten \"%s\" är inte en gren"
+
+#: branch.c:395
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
-#: branch.c:237
+#: branch.c:397
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -2000,125 +2038,145 @@
"spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"
"för att ställa in uppströmskonfigurationen när du sänder in."
-#: branch.c:281
+#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Objektnamnet är inte giltigt: \"%s\"."
+msgid "not a valid object name: '%s'"
+msgstr "objektnamnet är inte giltigt: \"%s\""
-#: branch.c:301
+#: branch.c:465
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Objektnamnet är tvetydigt: \"%s\"."
+msgid "ambiguous object name: '%s'"
+msgstr "objektnamnet är tvetydigt: \"%s\""
-#: branch.c:306
+#: branch.c:470
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Avgreningspunkten är inte giltig: \"%s\"."
+msgid "not a valid branch point: '%s'"
+msgstr "avgreningspunkten är inte giltig: \"%s\""
-#: branch.c:366
+#: branch.c:658
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "undermodulen \"%s\": kan inte hitta undermodulen"
+
+#: branch.c:661
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
+msgstr ""
+"Du kan försöka uppdatera undermodulerna med \"git checkout %s && git "
+"submodule update --init\""
+
+#: branch.c:672 branch.c:698
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "undermodulen \"%s\": kan inte skapa grenen \"%s\""
+
+#: branch.c:730
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "\"%s\" är redan utcheckad på \"%s\""
-#: branch.c:389
+#: branch.c:755
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
-#: bundle.c:44
+#: bundle.c:45
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
-msgstr "okänd hashningsalgoritm för paket (bundle): \"%s\""
+msgstr "okänd hashningsalgoritm för bunt: \"%s\""
-#: bundle.c:48
+#: bundle.c:53
#, c-format
msgid "unknown capability '%s'"
msgstr "okänd kapabilitet \"%s\""
-#: bundle.c:74
+#: bundle.c:79
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)"
+msgstr "'%s' ser inte ut som en v2- eller v3-bunt-fil"
-#: bundle.c:113
+#: bundle.c:118
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
+#: builtin/commit.c:865
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
-#: bundle.c:198
+#: bundle.c:203
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:201
+#: bundle.c:206
msgid "need a repository to verify a bundle"
-msgstr "behöver ett arkiv för att verifiera ett paket (bundle)."
-
-#: bundle.c:257
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Paketet (bundlen) innehåller denna referens:"
-msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"
+msgstr "behöver ett arkiv för att bekräfta en bunt."
#: bundle.c:264
-msgid "The bundle records a complete history."
-msgstr "Paketet (bundlen) beskriver en komplett historik."
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Bunten innehåller denna referens:"
+msgstr[1] "Bunten innehåller dessa %<PRIuMAX> referenser:"
-#: bundle.c:266
+#: bundle.c:272
+msgid "The bundle records a complete history."
+msgstr "Bunten beskriver en komplett historik."
+
+#: bundle.c:274
#, c-format
msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Paketet (bundlen) kräver denna referens:"
-msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Bunten kräver denna referens:"
+msgstr[1] "Bunten kräver dessa %<PRIuMAX> referenser:"
-#: bundle.c:333
+#: bundle.c:350
msgid "unable to dup bundle descriptor"
-msgstr "kan inte duplicera pakethandtag"
+msgstr "kan inte duplicera bunthandtag"
-#: bundle.c:340
+#: bundle.c:357
msgid "Could not spawn pack-objects"
msgstr "Kunde inte starta pack-objects"
-#: bundle.c:351
+#: bundle.c:368
msgid "pack-objects died"
msgstr "pack-objects misslyckades"
-#: bundle.c:400
+#: bundle.c:417
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:504
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "version %d för paket (bundle) stöds ej"
-
-#: bundle.c:506
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s"
-
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
-#: bundle.c:553
-msgid "Refusing to create empty bundle."
-msgstr "Vägrar skapa ett tomt paket (bundle)."
+#: bundle.c:548
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "version %d för bunt stöds ej"
-#: bundle.c:563
+#: bundle.c:550
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "kan inte skriva bunt med version %d med algoritmen %s"
+
+#: bundle.c:600
+msgid "Refusing to create empty bundle."
+msgstr "Vägrar skapa en tom bunt."
+
+#: bundle.c:610
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
-#: bundle.c:588
+#: bundle.c:639
msgid "index-pack died"
msgstr "index-pack dog"
@@ -2141,12 +2199,12 @@
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "avslutande stycke har id %<PRIx32> som inte är noll"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:52
msgid "invalid hash version"
msgstr "felaktig hashnings-version"
@@ -2174,207 +2232,208 @@
msgid "commit-graph file is too small to hold %u chunks"
msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken"
-#: commit-graph.c:482
+#: commit-graph.c:485
msgid "commit-graph has no base graphs chunk"
msgstr "incheckningsgrafen har inga bas-graf-stycken"
-#: commit-graph.c:492
+#: commit-graph.c:495
msgid "commit-graph chain does not match"
msgstr "incheckningsgrafens kedja stämmer inte"
-#: commit-graph.c:540
+#: commit-graph.c:543
#, 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:564
+#: commit-graph.c:567
msgid "unable to find all commit-graph files"
msgstr "kan inte hitta alla incheckingsgraffiler"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:752 commit-graph.c:789
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
-#: commit-graph.c:766
+#: commit-graph.c:773
#, c-format
msgid "could not find commit %s"
msgstr "kunde inte hitta incheckningen %s"
-#: commit-graph.c:799
+#: commit-graph.c:806
msgid "commit-graph requires overflow generation data but has none"
msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
+#: builtin/clone.c:705
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1373 builtin/pack-objects.c:3078
#, c-format
msgid "unable to get type of object %s"
msgstr "kunde inte hämta typ för objektet %s"
-#: commit-graph.c:1368
+#: commit-graph.c:1404
msgid "Loading known commits in commit graph"
msgstr "Läser in kända incheckningar i incheckningsgraf"
-#: commit-graph.c:1385
+#: commit-graph.c:1421
msgid "Expanding reachable commits in commit graph"
msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
-#: commit-graph.c:1405
+#: commit-graph.c:1441
msgid "Clearing commit marks in commit graph"
msgstr "Rensar incheckningsmärken i incheckningsgraf"
-#: commit-graph.c:1424
+#: commit-graph.c:1460
msgid "Computing commit graph topological levels"
msgstr "Beräknar topografiska nivåer för incheckningsgraf"
-#: commit-graph.c:1477
+#: commit-graph.c:1513
msgid "Computing commit graph generation numbers"
msgstr "Beräknar generationsvärden för incheckningsgraf"
-#: commit-graph.c:1558
+#: commit-graph.c:1598
msgid "Computing commit changed paths Bloom filters"
msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"
-#: commit-graph.c:1635
+#: commit-graph.c:1675
msgid "Collecting referenced commits"
msgstr "Samlar refererade incheckningar"
-#: commit-graph.c:1660
+#: commit-graph.c:1701
#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"
-msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "Söker incheckningar för incheckingsgraf i %<PRIuMAX> paket"
+msgstr[1] "Söker incheckningar för incheckingsgraf i %<PRIuMAX> paket"
-#: commit-graph.c:1673
+#: commit-graph.c:1714
#, c-format
msgid "error adding pack %s"
msgstr "fel vid tillägg av paketet %s"
-#: commit-graph.c:1677
+#: commit-graph.c:1718
#, c-format
msgid "error opening index for %s"
msgstr "fel vid öppning av indexet för %s"
-#: commit-graph.c:1714
+#: commit-graph.c:1756
msgid "Finding commits for commit graph among packed objects"
msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
-#: commit-graph.c:1732
+#: commit-graph.c:1774
msgid "Finding extra edges in commit graph"
msgstr "Söker ytterligare kanter i incheckingsgraf"
-#: commit-graph.c:1781
+#: commit-graph.c:1823
msgid "failed to write correct number of base graph ids"
msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
#, c-format
msgid "unable to create leading directories of %s"
msgstr "kunde inte skapa inledande kataloger för %s"
-#: commit-graph.c:1825
+#: commit-graph.c:1868
msgid "unable to create temporary graph layer"
msgstr "kan inte skapa temporärt graflager"
-#: commit-graph.c:1830
+#: commit-graph.c:1873
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "kan inte justera delade behörigheter för \"%s\""
-#: commit-graph.c:1887
+#: commit-graph.c:1930
#, 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:1923
+#: commit-graph.c:1967
msgid "unable to open commit-graph chain file"
msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
-#: commit-graph.c:1939
+#: commit-graph.c:1983
msgid "failed to rename base commit-graph file"
msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
-#: commit-graph.c:1959
+#: commit-graph.c:2004
msgid "failed to rename temporary commit-graph file"
msgstr "kunde inte byta namn på temporär incheckningsgraffil"
-#: commit-graph.c:2092
+#: commit-graph.c:2137
msgid "Scanning merged commits"
msgstr "Söker sammanslagna incheckningar"
-#: commit-graph.c:2136
+#: commit-graph.c:2181
msgid "Merging commit-graph"
msgstr "Slår ihop incheckningsgraf"
-#: commit-graph.c:2244
+#: commit-graph.c:2289
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad"
-#: commit-graph.c:2351
+#: commit-graph.c:2396
msgid "too many commits to write graph"
msgstr "för många incheckningar för att skriva graf"
-#: commit-graph.c:2449
+#: commit-graph.c:2494
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis "
"trasig"
-#: commit-graph.c:2459
+#: commit-graph.c:2504
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2514 commit-graph.c:2529
#, 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:2476
+#: commit-graph.c:2521
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
-#: commit-graph.c:2494
+#: commit-graph.c:2539
msgid "Verifying commits in commit graph"
msgstr "Bekräftar incheckningar i incheckningsgrafen"
-#: commit-graph.c:2509
+#: commit-graph.c:2554
#, 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:2516
+#: commit-graph.c:2561
#, 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:2526
+#: commit-graph.c:2571
#, 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:2535
+#: commit-graph.c:2580
#, 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:2549
+#: commit-graph.c:2594
#, 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:2554
+#: commit-graph.c:2599
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2382,7 +2441,7 @@
"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
"noll på annan plats"
-#: commit-graph.c:2558
+#: commit-graph.c:2603
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2390,32 +2449,32 @@
"incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
"%s, men noll på annan plats"
-#: commit-graph.c:2575
+#: commit-graph.c:2620
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
"incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < "
"%<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2626
#, 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:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
+#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
-#: commit.c:54
+#: commit.c:56
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s är inte en incheckning!"
-#: commit.c:194
+#: commit.c:197
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2435,29 +2494,29 @@
"Slå av detta meddelande genom att skriva\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1237
+#: commit.c:1252
#, 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:1241
+#: commit.c:1256
#, 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:1244
+#: commit.c:1259
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: commit.c:1247
+#: commit.c:1262
#, 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:1501
+#: commit.c:1516
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"
@@ -2471,7 +2530,15 @@
msgid "memory exhausted"
msgstr "minnet slut"
-#: config.c:126
+#: compat/terminal.c:167
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr "kan inte fortsätta i bakgrunden, använd \"fg\" för att återuppta"
+
+#: compat/terminal.c:168
+msgid "cannot restore terminal settings"
+msgstr "kan inte återställa terminalinställningar"
+
+#: config.c:143
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2486,341 +2553,368 @@
"\t%s\n"
"Det kan bero på cirkulära inkluderingar."
-#: config.c:142
+#: config.c:159
#, c-format
msgid "could not expand include path '%s'"
msgstr "kunde inte expandera inkluderingssökväg \"%s\""
-#: config.c:153
+#: config.c:170
msgid "relative config includes must come from files"
msgstr "relativa konfigureringsinkluderingar måste komma från filer"
-#: config.c:199
+#: config.c:219
msgid "relative config include conditionals must come from files"
msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
-#: config.c:396
+#: config.c:364
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"fjärr-URL:er kan inte konfigureras direkt eller indirekt i en fil inkluderad "
+"med includeIf.hasconfig:remote.*.url"
+
+#: config.c:508
#, c-format
msgid "invalid config format: %s"
msgstr "felaktigt konfigurationsformat: %s"
-#: config.c:400
+#: config.c:512
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\""
-#: config.c:405
+#: config.c:517
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\""
-#: config.c:442
+#: config.c:553
#, c-format
msgid "key does not contain a section: %s"
msgstr "nyckeln innehåller inte ett stycke: %s"
-#: config.c:448
+#: config.c:558
#, c-format
msgid "key does not contain variable name: %s"
msgstr "nyckeln innehåller inte variabelnamn: %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:580 sequencer.c:2802
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: config.c:478
+#: config.c:585
#, c-format
msgid "invalid key (newline): %s"
msgstr "ogiltig nyckel (nyradstecken): %s"
-#: config.c:511
+#: config.c:605
msgid "empty config key"
msgstr "tom konfigurationsnyckel"
-#: config.c:529 config.c:541
+#: config.c:623 config.c:635
#, c-format
msgid "bogus config parameter: %s"
msgstr "falsk konfigureringsparameter: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:649 config.c:666 config.c:673 config.c:682
#, c-format
msgid "bogus format in %s"
msgstr "felaktigt format i %s"
-#: config.c:622
+#: config.c:716
#, c-format
msgid "bogus count in %s"
msgstr "felaktigt antal i %s"
-#: config.c:626
+#: config.c:720
#, c-format
msgid "too many entries in %s"
msgstr "för många poster i %s"
-#: config.c:636
+#: config.c:730
#, c-format
msgid "missing config key %s"
msgstr "konfigurationsnyckel saknas för %s"
-#: config.c:644
+#: config.c:738
#, c-format
msgid "missing config value %s"
msgstr "konfigurationsvärde saknas för %s"
-#: config.c:995
+#: config.c:1089
#, c-format
msgid "bad config line %d in blob %s"
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-#: config.c:999
+#: config.c:1093
#, c-format
msgid "bad config line %d in file %s"
msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: config.c:1003
+#: config.c:1097
#, c-format
msgid "bad config line %d in standard input"
msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: config.c:1007
+#: config.c:1101
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-#: config.c:1011
+#: config.c:1105
#, c-format
msgid "bad config line %d in command line %s"
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-#: config.c:1015
+#: config.c:1109
#, c-format
msgid "bad config line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:1152
+#: config.c:1246
msgid "out of range"
msgstr "utanför intervallet"
-#: config.c:1152
+#: config.c:1246
msgid "invalid unit"
msgstr "ogiltig enhet"
-#: config.c:1153
+#: config.c:1247
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:1163
+#: config.c:1257
#, 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:1166
+#: config.c:1260
#, 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:1169
+#: config.c:1263
#, 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:1172
+#: config.c:1266
#, 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:1175
+#: config.c:1269
#, 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:1178
+#: config.c:1272
#, 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:1257
+#: config.c:1368
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "ogiltigt värde för variabeln %s"
+
+#: config.c:1389
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "ignorerar okänd core.fsync-komponent \"%s\""
+
+#: config.c:1425
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\""
-#: config.c:1275
+#: config.c:1443
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:1284
+#: config.c:1452
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: config.c:1377
+#: config.c:1545
#, c-format
msgid "abbrev length out of range: %d"
msgstr "förkortningslängd utanför intervallet: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1559 config.c:1570
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:1494
+#: config.c:1660
msgid "core.commentChar should only be one character"
msgstr "core.commentChar kan bara vara ett tecken"
-#: config.c:1527
+#: config.c:1692
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "ignorerar okänt core.fsyncMethod-värde \"%s\""
+
+#: config.c:1698
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles avråds från; använd core.fsync istället"
+
+#: config.c:1714
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1599
+#: config.c:1800
#, c-format
msgid "malformed value for %s"
msgstr "felformat värde för %s"
-#: config.c:1625
+#: config.c:1826
#, c-format
msgid "malformed value for %s: %s"
msgstr "felformat värde för %s: %s"
-#: config.c:1626
+#: config.c:1827
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:1687 builtin/pack-objects.c:4084
+#: config.c:1888 builtin/pack-objects.c:4078
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1809
+#: config.c:2014
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
-#: config.c:1812
+#: config.c:2017
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referensen \"%s\" pekar inte på en blob"
-#: config.c:1829
+#: config.c:2035
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
-#: config.c:1874
+#: config.c:2080
#, c-format
msgid "failed to parse %s"
msgstr "kunde inte tolka %s"
-#: config.c:1930
+#: config.c:2136
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:2294
+#: config.c:2512
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:2468
+#: config.c:2686
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: config.c:2513
+#: config.c:2731
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100"
-#: config.c:2559
+#: config.c:2763
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:2561
+#: config.c:2765
#, 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:2645
+#: config.c:2850
#, c-format
msgid "invalid section name '%s'"
msgstr "felaktigt sektionsnamn \"%s\""
-#: config.c:2677
+#: config.c:2882
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2706
+#: config.c:2911
#, c-format
msgid "failed to write new configuration file %s"
msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
-#: config.c:2958 config.c:3285
+#: config.c:3177 config.c:3518
#, c-format
msgid "could not lock config file %s"
msgstr "kunde inte låsa konfigurationsfilen %s"
-#: config.c:2969
+#: config.c:3188
#, c-format
msgid "opening %s"
msgstr "öppnar %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:3225 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "ogiltigt mönster: %s"
-#: config.c:3031
+#: config.c:3250
#, c-format
msgid "invalid config file %s"
msgstr "ogiltig konfigurationsfil: \"%s\""
-#: config.c:3044 config.c:3298
+#: config.c:3263 config.c:3531
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:3055
+#: config.c:3274
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "kunde inte utföra mmap på \"%s\"%s"
-#: config.c:3065 config.c:3303
+#: config.c:3284 config.c:3536
#, c-format
msgid "chmod on %s failed"
msgstr "chmod misslyckades på %s"
-#: config.c:3150 config.c:3400
+#: config.c:3369 config.c:3633
#, c-format
msgid "could not write config file %s"
msgstr "kunde inte skriva konfigurationsfilen %s"
-#: config.c:3184
+#: config.c:3403
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
-#: config.c:3276
+#: config.c:3509
#, c-format
msgid "invalid section name: %s"
msgstr "felaktigt namn på stycke: %s"
-#: config.c:3443
+#: config.c:3676
#, c-format
msgid "missing value for '%s'"
msgstr "värde saknas för \"%s\""
@@ -2855,72 +2949,72 @@
msgid "expected flush after capabilities"
msgstr "förväntade \"flush\" efter förmågor"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "ignorerar förmågor efter första raden \"%s\""
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "protokollfel: förväntade inte capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\""
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "arkivet på andra sidan kan inte vara grunt"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "ogiltigt paket"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "protokollfel: förväntade inte \"%s\""
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "okänt objektformat \"%s\" angavs av servern"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "ogiltigt svar på ls-refs: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "förväntade \"flush\" efter ref-listan"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "förväntade svarsavslutningspaket efter ref-listan"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "protokollet \"%s\" stöds inte"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "kunde inte sätta SO_KEEPALIVE på uttaget"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Slår upp %s..."
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "kan inte slå upp %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2929,7 +3023,7 @@
"klart.\n"
"Ansluter till %s (port %s)..."
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2939,79 +3033,79 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "klart."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "kunde inte slå upp %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "okänd port %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "konstigt värdnamn \"%s\" blockerat"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "konstig port \"%s\" blockerad"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "kan inte starta mellanserver (proxy) %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "radbrytningar är förbjudna i git://-värdnamn och arkivsökvägar"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh-varianten \"simple\" stöder inte -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh-varianten \"simple\" stöder inte -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh-varianten \"simple\" stöder inte val av port"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "konstigt sökvägsnamn \"%s\" blockerat"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "kunde inte grena (fork)"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Kunde inte köra \"git rev-list\""
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "kunde inte skriva till rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "kunde inte stänga rev-list:s standard in"
@@ -3156,68 +3250,68 @@
msgid "refusing to work with credential missing protocol field"
msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält"
-#: credential.c:394
+#: 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:438
+#: credential.c:440
#, c-format
msgid "url has no scheme: %s"
msgstr "url saknar protokoll: %s"
-#: credential.c:511
+#: credential.c:513
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "kan inte tolka url för inloggingsuppgifter: %s"
-#: date.c:138
+#: date.c:139
msgid "in the future"
msgstr "i framtiden"
-#: date.c:144
+#: date.c:145
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "%<PRIuMAX> sekund sedan"
msgstr[1] "%<PRIuMAX> sekunder sedan"
-#: date.c:151
+#: date.c:152
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "%<PRIuMAX> minut sedan"
msgstr[1] "%<PRIuMAX> minuter sedan"
-#: date.c:158
+#: date.c:159
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "%<PRIuMAX> timme sedan"
msgstr[1] "%<PRIuMAX> timmar sedan"
-#: date.c:165
+#: date.c:166
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "%<PRIuMAX> dag sedan"
msgstr[1] "%<PRIuMAX> dagar sedan"
-#: date.c:171
+#: date.c:172
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> vecka sedan"
msgstr[1] "%<PRIuMAX> veckor sedan"
-#: date.c:178
+#: date.c:179
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> månad sedan"
msgstr[1] "%<PRIuMAX> månader sedan"
-#: date.c:189
+#: date.c:190
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -3225,14 +3319,14 @@
msgstr[1] "%<PRIuMAX> år"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
+#: date.c:193
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s, %<PRIuMAX> månad sedan"
msgstr[1] "%s, %<PRIuMAX> månader sedan"
-#: date.c:197 date.c:202
+#: date.c:198 date.c:203
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
@@ -3263,28 +3357,32 @@
msgid "Marked %d islands, done.\n"
msgstr "Markerade %d öar, klar.\n"
-#: diff-merges.c:70
+#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
+#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
+#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
+#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
+#: builtin/pull.c:47 builtin/pull.c:321
#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "okänt värde för --diff-merges: %s"
+msgid "invalid value for '%s': '%s'"
+msgstr "felaktigt värde för \"%s\": \"%s\""
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base fungerar inte med intervall"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base fungerar bara med incheckningar"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "kan inte hämta HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "ingen sammanslagningsbas hittades"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "flera sammanslagningsbaser hittades"
@@ -3300,17 +3398,17 @@
"Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "
"en arbetskatalog."
-#: diff.c:156
+#: diff.c:159
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
-#: diff.c:161
+#: diff.c:164
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Okänd dirstat-parameter \"%s\"\n"
-#: diff.c:297
+#: diff.c:300
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3318,7 +3416,7 @@
"färginställningen för flyttade block måste vara en av \"no\", \"default\", "
"\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\""
-#: diff.c:325
+#: diff.c:328
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3328,7 +3426,7 @@
"\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"
"\""
-#: diff.c:333
+#: diff.c:336
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3336,12 +3434,12 @@
"color-moved-ws: allow-indentation-change kan inte kombineras med andra "
"blankstegslägen"
-#: diff.c:410
+#: diff.c:413
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
-#: diff.c:470
+#: diff.c:473
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3355,45 +3453,48 @@
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:4634
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check och -s är ömsesidigt uteslutande"
-
-#: diff.c:4637
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
-
-#: diff.c:4640
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4677 parse-options.c:1114
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
msgstr ""
-"-G och --pickaxe-regex är ömsesidigt uteslutande, använd --pickaxe-regex med "
-"-S"
+"flaggorna \"%s\", \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
-#: diff.c:4643
-msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "flaggorna \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
+
+#: diff.c:4685
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
msgstr ""
-"--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-"
-"all med -G och -S"
+"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "
+"\"%s\""
-#: diff.c:4722
+#: diff.c:4689
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "
+"\"%s\" och \"%s\""
+
+#: diff.c:4769
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:4770
+#: diff.c:4823
#, c-format
msgid "invalid --stat value: %s"
msgstr "ogiltigt värde för --stat: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s förväntar ett numeriskt värde"
-#: diff.c:4807
+#: diff.c:4860
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3402,42 +3503,42 @@
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:4892
+#: diff.c:4893
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4917
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "okänt värde efter ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4931
#, c-format
msgid "unable to resolve '%s'"
msgstr "kunde inte slå upp \"%s\""
-#: diff.c:4980 diff.c:4986
+#: diff.c:4981 diff.c:4987
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s förväntar formen <n>/<m>"
-#: diff.c:4998
+#: diff.c:4999
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s förväntar ett tecken, fick \"%s\""
-#: diff.c:5019
+#: diff.c:5020
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "felaktigt argument till --color-moved: %s"
-#: diff.c:5038
+#: diff.c:5039
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "ogiltigt läge %s\" i --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5079
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3445,154 +3546,154 @@
"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
"\"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5115 diff.c:5135
#, c-format
msgid "invalid argument to %s"
msgstr "ogiltigt argument för %s"
-#: diff.c:5238
+#: diff.c:5239
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""
-#: diff.c:5287
+#: diff.c:5288
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: diff.c:5343
+#: diff.c:5344
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "felaktigt argument --word-diff: %s"
-#: diff.c:5379
+#: diff.c:5380
msgid "Diff output format options"
msgstr "Formatflaggor för diff-utdata"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5382 diff.c:5388
msgid "generate patch"
msgstr "skapar patch"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5385 builtin/log.c:180
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5390 diff.c:5504 diff.c:5511
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5391 diff.c:5394
msgid "generate diffs with <n> lines context"
msgstr "skapa diffar med <n> rader sammanhang"
-#: diff.c:5395
+#: diff.c:5396
msgid "generate the diff in raw format"
msgstr "generera diff i råformat"
-#: diff.c:5398
+#: diff.c:5399
msgid "synonym for '-p --raw'"
msgstr "synonym till \"-p --raw\""
-#: diff.c:5402
+#: diff.c:5403
msgid "synonym for '-p --stat'"
msgstr "synonym till \"-p --stat\""
-#: diff.c:5406
+#: diff.c:5407
msgid "machine friendly --stat"
msgstr "maskinläsbar --stat"
-#: diff.c:5409
+#: diff.c:5410
msgid "output only the last line of --stat"
msgstr "skriv bara ut den sista raden för --stat"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5412 diff.c:5420
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5412
+#: diff.c:5413
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:5416
+#: diff.c:5417
msgid "synonym for --dirstat=cumulative"
msgstr "synonym för --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5421
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonym för --dirstat=filer,param1,param2..."
-#: diff.c:5424
+#: diff.c:5425
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
-#: diff.c:5427
+#: diff.c:5428
msgid "condensed summary such as creations, renames and mode changes"
msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"
-#: diff.c:5430
+#: diff.c:5431
msgid "show only names of changed files"
msgstr "visa endast namnen på ändrade filer"
-#: diff.c:5433
+#: diff.c:5434
msgid "show only names and status of changed files"
msgstr "visa endast namn och status för ändrade filer"
-#: diff.c:5435
+#: diff.c:5436
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
-#: diff.c:5436
+#: diff.c:5437
msgid "generate diffstat"
msgstr "skapa diffstat"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5439 diff.c:5442 diff.c:5445
msgid "<width>"
msgstr "<bredd>"
-#: diff.c:5439
+#: diff.c:5440
msgid "generate diffstat with a given width"
msgstr "generera en diffstat med given bredd"
-#: diff.c:5442
+#: diff.c:5443
msgid "generate diffstat with a given name width"
msgstr "generera en diffstat med given namnbredd"
-#: diff.c:5445
+#: diff.c:5446
msgid "generate diffstat with a given graph width"
msgstr "generera en diffstat med given grafbredd"
-#: diff.c:5447
+#: diff.c:5448
msgid "<count>"
msgstr "<antal>"
-#: diff.c:5448
+#: diff.c:5449
msgid "generate diffstat with limited lines"
msgstr "generera diffstat med begränsade rader"
-#: diff.c:5451
+#: diff.c:5452
msgid "generate compact summary in diffstat"
msgstr "skapa kompakt översikt i diffstat"
-#: diff.c:5454
+#: diff.c:5455
msgid "output a binary diff that can be applied"
msgstr "skapa en binärdiff som kan appliceras"
-#: diff.c:5457
+#: diff.c:5458
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:5459
+#: diff.c:5460
msgid "show colored diff"
msgstr "visa färgad diff"
-#: diff.c:5460
+#: diff.c:5461
msgid "<kind>"
msgstr "<typ>"
-#: diff.c:5461
+#: diff.c:5462
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3600,7 +3701,7 @@
"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
"\"new\" (nya) rader i diffen"
-#: diff.c:5464
+#: diff.c:5465
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3608,87 +3709,87 @@
"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
"eller --numstat"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
msgid "<prefix>"
msgstr "<prefix>"
-#: diff.c:5468
+#: diff.c:5469
msgid "show the given source prefix instead of \"a/\""
msgstr "visa givet källprefix istället för \"a/\""
-#: diff.c:5471
+#: diff.c:5472
msgid "show the given destination prefix instead of \"b/\""
msgstr "visa givet målprefix istället för \"b/\""
-#: diff.c:5474
+#: diff.c:5475
msgid "prepend an additional prefix to every line of output"
msgstr "lägg till ytterligare prefix på alla rader i utdata"
-#: diff.c:5477
+#: diff.c:5478
msgid "do not show any source or destination prefix"
msgstr "visa inte käll- eller målprefix"
-#: diff.c:5480
+#: diff.c:5481
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:5484 diff.c:5489 diff.c:5494
+#: diff.c:5485 diff.c:5490 diff.c:5495
msgid "<char>"
msgstr "<tecken>"
-#: diff.c:5485
+#: diff.c:5486
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:5490
+#: diff.c:5491
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:5495
+#: diff.c:5496
msgid "specify the character to indicate a context instead of ' '"
msgstr "ange tecken för att ange sammanhang istället för \" \""
-#: diff.c:5498
+#: diff.c:5499
msgid "Diff rename options"
msgstr "Diff-namnbytesflaggor"
-#: diff.c:5499
+#: diff.c:5500
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5501
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
-#: diff.c:5504
+#: diff.c:5505
msgid "detect renames"
msgstr "detektera namnändringar"
-#: diff.c:5508
+#: diff.c:5509
msgid "omit the preimage for deletes"
msgstr "ta bort för-version för borttagningar"
-#: diff.c:5511
+#: diff.c:5512
msgid "detect copies"
msgstr "detektera kopior"
-#: diff.c:5515
+#: diff.c:5516
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:5517
+#: diff.c:5518
msgid "disable rename detection"
msgstr "inaktivera detektering av namnbyten"
-#: diff.c:5520
+#: diff.c:5521
msgid "use empty blobs as rename source"
msgstr "använd tomma blob:ar som namnändringskälla"
-#: diff.c:5522
+#: diff.c:5523
msgid "continue listing the history of a file beyond renames"
msgstr "fortsätt lista historiken för en fil bortom namnändringar"
-#: diff.c:5525
+#: diff.c:5526
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3696,163 +3797,163 @@
"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
"given gräns"
-#: diff.c:5527
+#: diff.c:5528
msgid "Diff algorithm options"
msgstr "Alternativ för diff-algoritm"
-#: diff.c:5529
+#: diff.c:5530
msgid "produce the smallest possible diff"
msgstr "skapa minsta möjliga diff"
-#: diff.c:5532
+#: diff.c:5533
msgid "ignore whitespace when comparing lines"
msgstr "ignorera blanktecken vid radjämförelse"
-#: diff.c:5535
+#: diff.c:5536
msgid "ignore changes in amount of whitespace"
msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
-#: diff.c:5538
+#: diff.c:5539
msgid "ignore changes in whitespace at EOL"
msgstr "ignorera blanktecken vid radslut"
-#: diff.c:5541
+#: diff.c:5542
msgid "ignore carrier-return at the end of line"
msgstr "ignorera CR-tecken vid radslut"
-#: diff.c:5544
+#: diff.c:5545
msgid "ignore changes whose lines are all blank"
msgstr "ignorera ändringar i rader som är helt blanka"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
msgid "<regex>"
msgstr "<reguttr>"
-#: diff.c:5547
+#: diff.c:5548
msgid "ignore changes whose all lines match <regex>"
msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"
-#: diff.c:5550
+#: diff.c:5551
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:5553
+#: diff.c:5554
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "skapa diffar med algoritmen \"patience diff\""
-#: diff.c:5557
+#: diff.c:5558
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "skapa diffar med algoritmen \"histogram diff\""
-#: diff.c:5559
+#: diff.c:5560
msgid "<algorithm>"
msgstr "<algoritm>"
-#: diff.c:5560
+#: diff.c:5561
msgid "choose a diff algorithm"
msgstr "välj en diff-algoritm"
-#: diff.c:5562
+#: diff.c:5563
msgid "<text>"
msgstr "<text>"
-#: diff.c:5563
+#: diff.c:5564
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "skapa diffar med algoritmen \"anchored diff\""
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5566 diff.c:5575 diff.c:5578
msgid "<mode>"
msgstr "<läge>"
-#: diff.c:5566
+#: diff.c:5567
msgid "show word diff, using <mode> to delimit changed words"
msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
-#: diff.c:5569
+#: diff.c:5570
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:5572
+#: diff.c:5573
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
-#: diff.c:5575
+#: diff.c:5576
msgid "moved lines of code are colored differently"
msgstr "flyttade kodrader färgas på annat sätt"
-#: diff.c:5578
+#: diff.c:5579
msgid "how white spaces are ignored in --color-moved"
msgstr "hur blanktecken ignoreras i --color-moved"
-#: diff.c:5581
+#: diff.c:5582
msgid "Other diff options"
msgstr "Andra diff-flaggor"
-#: diff.c:5583
+#: diff.c:5584
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:5587
+#: diff.c:5588
msgid "treat all files as text"
msgstr "hantera alla filer som text"
-#: diff.c:5589
+#: diff.c:5590
msgid "swap two inputs, reverse the diff"
msgstr "växla två indatafiler, vänd diffen"
-#: diff.c:5591
+#: diff.c:5592
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "avsluta med 1 vid ändringar, annars 0"
-#: diff.c:5593
+#: diff.c:5594
msgid "disable all output of the program"
msgstr "slå av alla utdata från programmet"
-#: diff.c:5595
+#: diff.c:5596
msgid "allow an external diff helper to be executed"
msgstr "tillåt köra en extern diff-hjälpare"
-#: diff.c:5597
+#: diff.c:5598
msgid "run external text conversion filters when comparing binary files"
msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"
-#: diff.c:5599
+#: diff.c:5600
msgid "<when>"
msgstr "<när>"
-#: diff.c:5600
+#: diff.c:5601
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorera ändringar i undermoduler när diffen skapas"
-#: diff.c:5603
+#: diff.c:5604
msgid "<format>"
msgstr "<format>"
-#: diff.c:5604
+#: diff.c:5605
msgid "specify how differences in submodules are shown"
msgstr "ange hur ändringar i undermoduler visas"
-#: diff.c:5608
+#: diff.c:5609
msgid "hide 'git add -N' entries from the index"
msgstr "dölj \"git add -N\"-poster från indexet"
-#: diff.c:5611
+#: diff.c:5612
msgid "treat 'git add -N' entries as real in the index"
msgstr "tolka \"git add -N\"-poster som äkta i indexet"
-#: diff.c:5613
+#: diff.c:5614
msgid "<string>"
msgstr "<sträng>"
-#: diff.c:5614
+#: diff.c:5615
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:5617
+#: diff.c:5618
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3860,66 +3961,66 @@
"se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
"uttryck"
-#: diff.c:5620
+#: diff.c:5621
msgid "show all changes in the changeset with -S or -G"
msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"
-#: diff.c:5623
+#: diff.c:5624
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:5626
+#: diff.c:5627
msgid "control the order in which files appear in the output"
msgstr "styr ordningen i vilken filer visas i utdata"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5628 diff.c:5631
msgid "<path>"
msgstr "<sökväg>"
-#: diff.c:5628
+#: diff.c:5629
msgid "show the change in the specified path first"
msgstr "visa ändringen i angiven sökväg först"
-#: diff.c:5631
+#: diff.c:5632
msgid "skip the output to the specified path"
msgstr "hoppa över utdata fram till angiven sökväg"
-#: diff.c:5633
+#: diff.c:5634
msgid "<object-id>"
msgstr "<objekt-id>"
-#: diff.c:5634
+#: diff.c:5635
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:5636
+#: diff.c:5637
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5638
msgid "select files by diff type"
msgstr "välj filter efter diff-typ"
-#: diff.c:5639
+#: diff.c:5640
msgid "<file>"
msgstr "<fil>"
-#: diff.c:5640
-msgid "Output to a specific file"
-msgstr "Skriv utdata till en specifik fil"
+#: diff.c:5641
+msgid "output to a specific file"
+msgstr "skriv utdata till en specifik fil"
-#: diff.c:6298
+#: diff.c:6321
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"uttömmande namnbytesdetektering hoppades över på grund av för många filer."
-#: diff.c:6301
+#: diff.c:6324
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:6304
+#: diff.c:6327
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3931,7 +4032,7 @@
msgid "failed to read orderfile '%s'"
msgstr "kunde inte läsa orderfilen \"%s\""
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Utför onöjaktig namnbytesdetektering"
@@ -3962,39 +4063,47 @@
"din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "
"gånger"
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr "inaktiverar konmönstermatchning"
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "kan inte använda %s som exkluderingsfil"
-#: dir.c:2351
+#: dir.c:2419
#, c-format
msgid "could not open directory '%s'"
msgstr "kunde inte öppna katalogen \"%s\""
-#: dir.c:2653
+#: dir.c:2721
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:2777
+#: dir.c:2846
msgid "untracked cache is disabled on this system or location"
msgstr "ospårad cache är inaktiverad på systemet eller platsen"
-#: dir.c:3610
+#: dir.c:3119
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Kunde inte gissa katalognamn.\n"
+"Ange en katalog på kommandoraden"
+
+#: dir.c:3807
#, c-format
msgid "index file corrupt in repo %s"
msgstr "indexfilen trasig i arkivet %s"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3854 dir.c:3859
#, c-format
msgid "could not create directories for %s"
msgstr "kunde inte skapa kataloger för %s"
-#: dir.c:3691
+#: dir.c:3888
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
@@ -4004,305 +4113,398 @@
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"
-#: entry.c:176
+#: entry.c:179
msgid "Filtering content"
msgstr "Filtrerar innehåll"
-#: entry.c:497
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "kunde inte ta status på filen \"%s\""
-#: environment.c:152
+#: environment.c:147
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "felaktig git-namnrymdssökväg \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "kunde inte ställa in GIT_DIR till \"%s\""
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "för många flaggor för att köra %s"
-#: fetch-pack.c:182
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: förväntade grund lista"
-#: fetch-pack.c:185
+#: fetch-pack.c:197
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:196
+#: fetch-pack.c:208
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:216
+#: fetch-pack.c:228
#, 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:227
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "kunde inte skriva till fjärren"
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:397 fetch-pack.c:1460
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:403 fetch-pack.c:1466
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:405 fetch-pack.c:1468
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:408 fetch-pack.c:1471
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:410 fetch-pack.c:1473
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:413 fetch-pack.c:1477
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:453
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:470
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:501
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:514 progress.h:25
msgid "done"
msgstr "klart"
-#: fetch-pack.c:512
+#: fetch-pack.c:526
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:562
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
-#: fetch-pack.c:763
+#: fetch-pack.c:784
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:870
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-#: fetch-pack.c:857
+#: fetch-pack.c:878
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
-#: fetch-pack.c:951
+#: fetch-pack.c:974
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-patch: kunde inte grena av %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:980
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-patch: ogiltig utdata från index-pack"
-#: fetch-pack.c:974
+#: fetch-pack.c:997
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
-#: fetch-pack.c:976
+#: fetch-pack.c:999
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1048
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
+#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
+#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
+#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
#, c-format
msgid "Server supports %s"
msgstr "Servern stöder %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1058
msgid "Server does not support shallow clients"
msgstr "Servern stöder inte klienter med grunda arkiv"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1118
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1123
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1127
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1129
msgid "Server does not support this repository's object format"
msgstr "Servern stöder inte det här arkivets objektformat"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1142
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
msgid "source repository is shallow, reject to clone."
msgstr "källarkivet är grunt, tillåter inte kloning."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1157 fetch-pack.c:1705
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: hämtning misslyckades."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1271
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "omaka algoritmer: klient %s; server %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1275
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "servern stöder inte algoritmen \"%s\""
-#: fetch-pack.c:1279
+#: fetch-pack.c:1308
msgid "Server does not support shallow requests"
msgstr "Servern stöder inte grunda förfrågningar"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1315
msgid "Server supports filter"
msgstr "Servern stöder filter"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1358 fetch-pack.c:2087
msgid "unable to write request to remote"
msgstr "kunde inte skriva anrop till fjärren"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1376
#, c-format
msgid "error reading section header '%s'"
msgstr "fel vid läsning av styckehuvudet \"%s\""
-#: fetch-pack.c:1353
+#: fetch-pack.c:1382
#, c-format
msgid "expected '%s', received '%s'"
msgstr "förväntade \"%s\", tog emot \"%s\""
-#: fetch-pack.c:1387
+#: fetch-pack.c:1416
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "oväntad bekräftelserad: \"%s\""
-#: fetch-pack.c:1392
+#: fetch-pack.c:1421
#, c-format
msgid "error processing acks: %d"
msgstr "fel vid hantering av bekräftelser: %d"
-#: fetch-pack.c:1402
-msgid "expected packfile to be sent after 'ready'"
-msgstr "väntade att paketfil skulle sändas efter \"ready\""
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1435
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "väntade att paketfil skulle sändas efter \"%s\""
-#: fetch-pack.c:1404
-msgid "expected no other sections to be sent after no 'ready'"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1441
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
msgstr ""
-"väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""
+"väntade inte att några ytterligare sektioner skulle sändas efter \"%s\""
-#: fetch-pack.c:1445
+#: fetch-pack.c:1482
#, c-format
msgid "error processing shallow info: %d"
msgstr "fel vid hantering av grund (\"shallow\") info: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1531
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "förväntade wanted-ref, fick %s"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1536
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "oväntad wanted-ref: \"%s\""
-#: fetch-pack.c:1504
+#: fetch-pack.c:1541
#, c-format
msgid "error processing wanted refs: %d"
msgstr "fel vid hantering av önskade referenser: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1571
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: förväntade svarsavslutningspaket"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1983
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:2006 builtin/clone.c:587
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2109
msgid "unexpected 'ready' from remote"
msgstr "oväntat \"ready\" från fjärr"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2132
#, c-format
msgid "no such remote ref %s"
msgstr "ingen sådan fjärreferens: %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2135
#, 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:273
+#: fsmonitor-ipc.c:119
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: ogilitg sökväg \"%s\""
+
+#: fsmonitor-ipc.c:125
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: ospecificerat fel på \"%s\""
+
+#: fsmonitor-ipc.c:155
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon kör inte"
+
+#: fsmonitor-ipc.c:164
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "kunde inte sända kommandot \"%s\" till fsmonitor--daemon"
+
+#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
+#: gpg-interface.c:1011
msgid "could not create temporary file"
msgstr "kunde inte skapa temporära fil"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:459
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "misslyckades skriva fristående signatur till \"%s\""
-#: gpg-interface.c:470
+#: gpg-interface.c:450
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile måste ställas in och finnas för att bekräfta ssh-"
+"signaturer"
+
+#: gpg-interface.c:479
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"\"ssh-keygen -Y find-principals/verify\" behövs för att bekräfta ssh-"
+"signaturer (tillgängligt i openssh version 8.2p1+)"
+
+#: gpg-interface.c:550
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "återkallningsfilen för ssh-signering inställd men saknas: %s"
+
+#: gpg-interface.c:638
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "felaktig/inkompatibel signatur \"%s\""
+
+#: gpg-interface.c:815 gpg-interface.c:820
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "misslyckades hämta ssh-fingeravtrycket för nyckeln \"%s\""
+
+#: gpg-interface.c:843
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"måste konfigurera antingen user.signingkey eller gpg.ssh.defaultKeyCommand"
+
+#: gpg-interface.c:865
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand lyckades men gav inga nycklar: %s %s"
+
+#: gpg-interface.c:871
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s"
+
+#: gpg-interface.c:966
msgid "gpg failed to sign the data"
msgstr "gpg misslyckades signera data"
+#: gpg-interface.c:988
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey måste anges för ssh-signering"
+
+#: gpg-interface.c:999
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "misslyckades skriva ssh-signeringsnyckel till \"%s\""
+
+#: gpg-interface.c:1017
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "misslyckades skriva ssh-signeringsnyckelbuffert till \"%s\""
+
+#: gpg-interface.c:1035
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"\"ssh-keygen -Y sign\" behövs för ssh-signering (tillgängligt i openssh "
+"version 8.2p1+)"
+
+#: gpg-interface.c:1047
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\""
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "ignorerade felaktig färg \"%.*s\" i log.graphColors"
-#: grep.c:531
+#: grep.c:446
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4310,109 +4512,109 @@
"angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"
"P under PCRE v2"
-#: grep.c:1895
+#: grep.c:1859
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: grep.c:1923
+#: grep.c:1887
#, c-format
msgid "'%s': short read"
msgstr "\"%s\": kort läsning"
-#: help.c:23
+#: help.c:25
msgid "start a working area (see also: git help tutorial)"
msgstr "starta arbetskatalog (se också: git help tutorial)"
-#: help.c:24
+#: help.c:26
msgid "work on the current change (see also: git help everyday)"
msgstr "jobba med aktuell förändring (se också: git help everyday)"
-#: help.c:25
+#: help.c:27
msgid "examine the history and state (see also: git help revisions)"
msgstr "utforska historiken och tillståndet (se också: git help revisions)"
-#: help.c:26
+#: help.c:28
msgid "grow, mark and tweak your common history"
msgstr "utöka, markera och justera din gemensamma historik"
-#: help.c:27
+#: help.c:29
msgid "collaborate (see also: git help workflows)"
msgstr "samarbeta (se också: git help workflows)"
-#: help.c:31
+#: help.c:33
msgid "Main Porcelain Commands"
msgstr "Huvudsakliga porslinskommandon"
-#: help.c:32
+#: help.c:34
msgid "Ancillary Commands / Manipulators"
msgstr "Tilläggskommandon / manipulerare"
-#: help.c:33
+#: help.c:35
msgid "Ancillary Commands / Interrogators"
msgstr "Tilläggskommandon / frågare"
-#: help.c:34
+#: help.c:36
msgid "Interacting with Others"
msgstr "Interaktion med andra"
-#: help.c:35
+#: help.c:37
msgid "Low-level Commands / Manipulators"
msgstr "Lågnivåkommandon / maniupulerare"
-#: help.c:36
+#: help.c:38
msgid "Low-level Commands / Interrogators"
msgstr "Lågnivåkommandon / frågare"
-#: help.c:37
+#: help.c:39
msgid "Low-level Commands / Syncing Repositories"
msgstr "Lågnivåkommandon / synka arkiv"
-#: help.c:38
+#: help.c:40
msgid "Low-level Commands / Internal Helpers"
msgstr "Lågnivåkommandon / interna hjälpare"
-#: help.c:300
+#: help.c:316
#, c-format
msgid "available git commands in '%s'"
msgstr "git-kommandon tillgängliga i \"%s\""
-#: help.c:307
+#: help.c:323
msgid "git commands available from elsewhere on your $PATH"
msgstr "git-kommandon från andra platser i din $PATH"
-#: help.c:316
+#: help.c:332
msgid "These are common Git commands used in various situations:"
msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
-#: help.c:365 git.c:100
+#: help.c:382 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "okänd kommandolisttyp \"%s\""
-#: help.c:405
+#: help.c:422
msgid "The Git concept guides are:"
msgstr "Vägledningar för Git-koncept:"
-#: help.c:429
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando"
-
-#: help.c:434
+#: help.c:446
msgid "External commands"
msgstr "Externa kommandon"
-#: help.c:449
+#: help.c:468
msgid "Command aliases"
msgstr "Kommadoalias"
-#: help.c:527
+#: help.c:486
+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:563
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4421,32 +4623,37 @@
"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
"köra det. Kanske git-%s är trasigt?"
-#: help.c:543 help.c:631
+#: help.c:585 help.c:682
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
-#: help.c:591
+#: help.c:633
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
-#: help.c:613
+#: help.c:655
#, 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:618
+#: help.c:660
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Fortsätter under förutsättningen att du menade \"%s\"."
-#: help.c:623
+#: help.c:666
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Köra \"%s\" istället (j/N)?"
+
+#: help.c:674
#, 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:635
+#: help.c:686
msgid ""
"\n"
"The most similar command is"
@@ -4460,16 +4667,16 @@
"\n"
"Mest lika kommandon är"
-#: help.c:675
+#: help.c:729
msgid "git version [<options>]"
msgstr "git version [<flaggor>]"
-#: help.c:730
+#: help.c:784
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:788
msgid ""
"\n"
"Did you mean this?"
@@ -4483,15 +4690,29 @@
"\n"
"Menade du ett av dessa?"
-#: ident.c:353
+#: hook.c:28
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"
+"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
+
+#: hook.c:87
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "Kunde inte starta kroken \"%s\"\n"
+
+#: ident.c:354
msgid "Author identity unknown\n"
msgstr "Författar-identitet okänd\n"
-#: ident.c:356
+#: ident.c:357
msgid "Committer identity unknown\n"
msgstr "Incheckar-identitet okänd\n"
-#: ident.c:362
+#: ident.c:363
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -4517,71 +4738,71 @@
"Kör utan --global för att endast ändra i aktuellt arkiv.\n"
"\n"
-#: ident.c:397
+#: ident.c:398
msgid "no email was given and auto-detection is disabled"
msgstr "ingen e-post angavs och autodetektering är inaktiverad"
-#: ident.c:402
+#: ident.c:403
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "kunde inte autodetektera e-postadress (fick \"%s\")"
-#: ident.c:419
+#: ident.c:420
msgid "no name was given and auto-detection is disabled"
msgstr "inget namn angavs och autodetektering är inaktiverad"
-#: ident.c:425
+#: ident.c:426
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "kunde inte autodetektera namn (fick \"%s\")"
-#: ident.c:433
+#: ident.c:434
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "tomt ident-namn (för <%s>) ej tillåtet"
-#: ident.c:439
+#: ident.c:440
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "namnet består enbart av ej tillåtna tecken: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:455 builtin/commit.c:649
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
-#: list-objects-filter-options.c:83
+#: list-objects-filter-options.c:68
msgid "expected 'tree:<depth>'"
msgstr "förväntade \"tree:<djup>\""
-#: list-objects-filter-options.c:98
+#: list-objects-filter-options.c:83
msgid "sparse:path filters support has been dropped"
msgstr "sparse:sökväg-filter stöds inte längre"
-#: list-objects-filter-options.c:105
+#: list-objects-filter-options.c:90
#, c-format
msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "\"%s\" för \"object:type=<typ>\" är inte en giltig objekttyp"
-#: list-objects-filter-options.c:124
+#: list-objects-filter-options.c:109
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "felaktig filterspecifikation: \"%s\""
-#: list-objects-filter-options.c:140
+#: list-objects-filter-options.c:125
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr "måste använda specialsekvens i delfilter-spec: \"%c\""
-#: list-objects-filter-options.c:182
+#: list-objects-filter-options.c:167
msgid "expected something after combine:"
msgstr "förväntade någonting efter combine:"
-#: list-objects-filter-options.c:264
+#: list-objects-filter-options.c:249
msgid "multiple filter-specs cannot be combined"
msgstr "flera filterspecifikationer kan inte kombineras"
-#: list-objects-filter-options.c:376
+#: list-objects-filter-options.c:365
msgid "unable to upgrade repository format to support partial clone"
msgstr "kunde inte uppgradera arkivformat till att stöda delvis klon"
@@ -4595,17 +4816,17 @@
msgid "unable to parse sparse filter data in %s"
msgstr "kunde inte tolka gles filterdata i %s"
-#: list-objects.c:127
+#: list-objects.c:144
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"
-#: list-objects.c:140
+#: list-objects.c:157
#, 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:398
+#: list-objects.c:415
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "kunde inte läsa in rot-trädet för incheckningen %s"
@@ -4635,12 +4856,12 @@
msgid "Unable to create '%s.lock': %s"
msgstr "Kunde inte skapa \"%s.lock\": %s"
-#: ls-refs.c:37
+#: ls-refs.c:175
#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "ogiltigt värde \"%s\" för lsrefs.unborn"
+msgid "unexpected line: '%s'"
+msgstr "oväntad rad: \"%s\""
-#: ls-refs.c:167
+#: ls-refs.c:179
msgid "expected flush after ls-refs arguments"
msgstr "förväntade \"flush\" efter ls-refs-argument"
@@ -4648,39 +4869,39 @@
msgid "quoted CRLF detected"
msgstr "citerad CRLF upptäcktes"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "felaktig funktion \"%s\" för \"%s\""
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1630 merge-recursive.c:1214
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1639 merge-recursive.c:1221
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1648 merge-recursive.c:1228
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Misslyckades slå ihop undermodulen %s (incheckningar följer inte "
"sammanslagningsbasen)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1658 merge-ort.c:1666
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Obs: Snabbspolar undermodulen %s till %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1688
#, c-format
msgid "Failed to merge submodule %s"
msgstr "Misslyckades slå ihop undermodulen %s"
-#: merge-ort.c:1632
+#: merge-ort.c:1695
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4689,7 +4910,7 @@
"Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1699 merge-recursive.c:1284
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4706,7 +4927,7 @@
"\n"
"vilket godtar lösningen.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1712
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4716,21 +4937,21 @@
"finns:\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1937 merge-recursive.c:1375
msgid "Failed to execute internal merge"
msgstr "Misslyckades exekvera intern sammanslagning"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1942 merge-recursive.c:1380
#, c-format
msgid "Unable to add %s to database"
msgstr "Kunde inte lägga till %s till databasen"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1949 merge-recursive.c:1413
#, c-format
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2088 merge-recursive.c:2135
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4739,7 +4960,7 @@
"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "
"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2098 merge-recursive.c:2145
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4748,7 +4969,7 @@
"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "
"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"
-#: merge-ort.c:2087
+#: merge-ort.c:2156
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4759,7 +4980,7 @@
"den har namnbytts till flera andra kataloger, utan att någon destination "
"fick en majoritet av filerna."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2310 merge-recursive.c:2481
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4768,7 +4989,7 @@
"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
"bytt namn."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2450 merge-recursive.c:3264
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4777,7 +4998,7 @@
"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
"flyttar den till %s."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2457 merge-recursive.c:3271
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4786,7 +5007,7 @@
"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
"namn i %s; flyttar den till %s."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2470 merge-recursive.c:3267
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4795,7 +5016,7 @@
"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
"%s, föreslår att den bör flyttas till%s."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2478 merge-recursive.c:3274
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4804,13 +5025,13 @@
"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
"bytte namn i %s; flyttar den till %s."
-#: merge-ort.c:2569
+#: merge-ort.c:2634
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s."
-#: merge-ort.c:2664
+#: merge-ort.c:2729
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4821,23 +5042,23 @@
"innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till "
"nästlade konfliktmarkörer."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2748 merge-ort.c:2772
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3261 merge-recursive.c:3025
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3264 merge-recursive.c:3028
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-ort.c:3613
+#: merge-ort.c:3693
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4846,7 +5067,7 @@
"KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den "
"till %s istället."
-#: merge-ort.c:3689
+#: merge-ort.c:3770
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4855,7 +5076,7 @@
"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge "
"så att de kan protokollföras någonstans."
-#: merge-ort.c:3696
+#: merge-ort.c:3777
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4864,24 +5085,24 @@
"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena "
"så att de kan protokollföras någonstans."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3866 merge-recursive.c:3104
msgid "content"
msgstr "innehåll"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3868 merge-recursive.c:3108
msgid "add/add"
msgstr "tillägg/tillägg"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3870 merge-recursive.c:3153
msgid "submodule"
msgstr "undermodul"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3872 merge-recursive.c:3154
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3916
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4890,7 +5111,7 @@
"KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "
"lämnad i trädet."
-#: merge-ort.c:4120
+#: merge-ort.c:4212
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4902,12 +5123,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4586
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3723
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4917,109 +5138,109 @@
"sammanslagning:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
msgid "Already up to date."
msgstr "Redan à jour."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(felaktig incheckning)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "
"sammanslagningen."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "misslyckades skapa sökvägen \"%s\"%s"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Tar bort %s för att göra plats för underkatalog\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": kanske en K/F-konflikt?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "vägrar förlora ospårad fil vid \"%s\""
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:47
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kan inte läsa objektet %s: \"%s\""
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "misslyckades öppna \"%s\": %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "misslyckades skapa symboliska länken \"%s\": %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "vet inte hur %06o %s \"%s\" ska hanteras"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Snabbspolar undermodulen %s till följande incheckning:"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1239 merge-recursive.c:1252
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Snabbspolar undermodulen %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
"hittades inte)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1280
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1281
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1293
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1437
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5028,7 +5249,7 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1514
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5037,7 +5258,7 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
"%s lämnad i trädet."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1521
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5046,7 +5267,7 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet vid %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5055,40 +5276,40 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
"%s lämnad i trädet vid %s."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "rename"
msgstr "namnbyte"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Vägrar förlora lortig fil vid \"%s\""
-#: merge-recursive.c:1605
+#: merge-recursive.c:1622
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1680
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1711
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s är en katalog i %s lägger till som %s istället"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1716
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1743
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5097,17 +5318,17 @@
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1748
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1840
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2103
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5118,7 +5339,7 @@
"katalogen %s bytte namn till flera andra kataloger, utan att någon "
"destination fick en majoritet av filerna."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2237
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5127,80 +5348,80 @@
"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
"%s->%s i %s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3131
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3184
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s istället"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3388
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3411
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3416
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3423
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
-#: merge-recursive.c:3415
+#: merge-recursive.c:3432
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3441
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3494
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3588
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3601
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "hittade %u gemensam förfader:"
msgstr[1] "hittade %u gemensamma förfäder:"
-#: merge-recursive.c:3634
+#: merge-recursive.c:3651
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3823
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
@@ -5208,190 +5429,226 @@
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
+#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
-#: midx.c:74
+#: midx.c:79
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "multi-pack-indexets OID-utbredning har fel storlek"
-#: midx.c:105
+#: midx.c:112
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-indexfilen %s är för liten"
-#: midx.c:121
+#: midx.c:128
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"
-#: midx.c:126
+#: midx.c:133
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-indexversionen %d stöds inte"
-#: midx.c:131
+#: midx.c:138
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "multi-pack-index-hashversionen %u stämmer inte med versionen %u"
-#: midx.c:148
+#: midx.c:155
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index saknar krävd paketnamn-stycke"
-#: midx.c:150
+#: midx.c:157
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"
-#: midx.c:152
+#: midx.c:159
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"
-#: midx.c:154
+#: midx.c:161
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index saknar krävt objekt-offsetstycke"
-#: midx.c:170
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""
-#: midx.c:214
+#: midx.c:228
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "bad pack-int-id: %u (%u paket totalt)"
-#: midx.c:264
+#: midx.c:278
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:490
+#: midx.c:509
#, c-format
msgid "failed to add packfile '%s'"
msgstr "misslyckades läsa paketfilen \"%s\""
-#: midx.c:496
+#: midx.c:515
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "misslyckades öppna paketindexet \"%s\""
-#: midx.c:564
+#: midx.c:583
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "misslyckades hitta objekt %d i paketfilen"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:911
msgid "cannot store reverse index file"
msgstr "kan inte spara reverse-index-fil"
-#: midx.c:920
+#: midx.c:1009
+#, c-format
+msgid "could not parse line: %s"
+msgstr "kunde inte tolka rad: %s"
+
+#: midx.c:1011
+#, c-format
+msgid "malformed line: %s"
+msgstr "felaktig rad: %s"
+
+#: midx.c:1181
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma"
-#: midx.c:943
+#: midx.c:1206
+msgid "could not load pack"
+msgstr "kunde inte läsa paket{"
+
+#: midx.c:1212
+#, c-format
+msgid "could not open index for %s"
+msgstr "kunde inte öppna indexet för %s"
+
+#: midx.c:1223
msgid "Adding packfiles to multi-pack-index"
msgstr "Lägger till paketfiler till multi-pack-index"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "såg inte paketfilen %s som skulle kastas"
-
-#: midx.c:1034
+#: midx.c:1266
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "okänt föredraget paket: %s"
-#: midx.c:1039
+#: midx.c:1311
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "kan inte välja föredraget paket %s som inte har några objekt"
+
+#: midx.c:1343
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "såg inte paketfilen %s som skulle kastas"
+
+#: midx.c:1389
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "föredraget paket \"%s\" har löpt ut"
-#: midx.c:1055
+#: midx.c:1402
msgid "no pack files to index."
msgstr "inga paketfiler att indexera."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1409
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "kunde inte skriva fler-paketsbitkarta utan några objekt"
+
+#: midx.c:1451
+msgid "could not write multi-pack bitmap"
+msgstr "kunde inte skriva fler-paketsbitkarta"
+
+#: midx.c:1461
+msgid "could not write multi-pack-index"
+msgstr "kunde inte skriva flerpakets-index"
+
+#: midx.c:1520 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "misslyckades ta bort %s"
-#: midx.c:1166
+#: midx.c:1553
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "misslyckades städa multi-pack-index på %s"
-#: midx.c:1225
+#: midx.c:1616
msgid "multi-pack-index file exists, but failed to parse"
msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"
-#: midx.c:1233
+#: midx.c:1624
msgid "incorrect checksum"
msgstr "felaktig kontrollsumma"
-#: midx.c:1236
+#: midx.c:1627
msgid "Looking for referenced packfiles"
msgstr "Ser efter refererade packfiler"
-#: midx.c:1251
+#: midx.c:1642
#, 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:1256
+#: midx.c:1647
msgid "the midx contains no oid"
msgstr "midx saknar oid"
-#: midx.c:1265
+#: midx.c:1656
msgid "Verifying OID order in multi-pack-index"
msgstr "Bekräftar OID-ordning i multi-pack-index"
-#: midx.c:1274
+#: midx.c:1665
#, 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:1294
+#: midx.c:1685
msgid "Sorting objects by packfile"
msgstr "Sorterar objekt efter packfil"
-#: midx.c:1301
+#: midx.c:1692
msgid "Verifying object offsets"
msgstr "Bekräftar offset för objekt"
-#: midx.c:1317
+#: midx.c:1708
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "misslyckades läsa paketpost för oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1714
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "misslyckades läsa paketindex för paketfil %s"
-#: midx.c:1332
+#: midx.c:1723
#, 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:1357
+#: midx.c:1750
msgid "Counting referenced objects"
msgstr "Räknar refererade objekt"
-#: midx.c:1367
+#: midx.c:1760
msgid "Finding and deleting unreferenced packfiles"
msgstr "Ser efter och tar bort orefererade packfiler"
-#: midx.c:1558
+#: midx.c:1952
msgid "could not start pack-objects"
msgstr "kunde inte starta pack-objects"
-#: midx.c:1578
+#: midx.c:1972
msgid "could not finish pack-objects"
msgstr "kunde inte avsluta pack-objects"
@@ -5410,7 +5667,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "misslyckades utföra join på lazy_name-tråd: %s"
-#: notes-merge.c:277
+#: notes-merge.c:276
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -5422,7 +5679,7 @@
"att checka in eller avbryta föregående sammanslagning innan du påbörjar en "
"ny antecknings-sammanslagning."
-#: notes-merge.c:284
+#: notes-merge.c:283
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."
@@ -5450,272 +5707,343 @@
msgid "Bad %s value: '%s'"
msgstr "Felaktigt värde på %s: \"%s\""
-#: object-file.c:526
+#: object-file.c:457
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:515
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "kunde inte normalisera supplerande objektsökväg: %s"
-#: object-file.c:658
+#: object-file.c:589
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: ignorerar supplerande objektlager, för djup nästling"
-#: object-file.c:665
+#: object-file.c:596
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "kan inte normalisera objektkatalogen: %s"
-#: object-file.c:708
+#: object-file.c:639
msgid "unable to fdopen alternates lockfile"
msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"
-#: object-file.c:726
+#: object-file.c:657
msgid "unable to read alternates file"
msgstr "kan inte läsa \"alternates\"-filen"
-#: object-file.c:733
+#: object-file.c:664
msgid "unable to move new alternates file into place"
msgstr "kan inte flytta ny \"alternates\"-fil på plats"
-#: object-file.c:768
+#: object-file.c:742
#, c-format
msgid "path '%s' does not exist"
msgstr "sökvägen \"%s\" finns inte"
-#: object-file.c:789
+#: object-file.c:763
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
-#: object-file.c:795
+#: object-file.c:769
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: object-file.c:801
+#: object-file.c:775
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: object-file.c:809
+#: object-file.c:783
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: object-file.c:869
+#: object-file.c:814
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "kunde inte hitta objektkatalog för %s"
+
+#: object-file.c:864
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
-#: object-file.c:1019
+#: object-file.c:1014
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1049
#, c-format
msgid "mmap failed%s"
msgstr "mmap misslyckades%s"
-#: object-file.c:1218
+#: object-file.c:1230
#, c-format
msgid "object file %s is empty"
msgstr "objektfilen %s är tom"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1349 object-file.c:2588
#, c-format
msgid "corrupt loose object '%s'"
msgstr "trasigt löst objekt \"%s\""
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1351 object-file.c:2592
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "skräp i slutet av löst objekt \"%s\""
-#: object-file.c:1397
+#: object-file.c:1473
+#, c-format
+msgid "unable to parse %s header"
+msgstr "kan inte tolka %s-huvud"
+
+#: object-file.c:1475
msgid "invalid object type"
msgstr "felaktig objekttyp"
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
-
-#: object-file.c:1484
+#: object-file.c:1486
#, c-format
msgid "unable to unpack %s header"
msgstr "kan inte packa upp %s-huvudet"
#: object-file.c:1490
#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "huvudet för %s är för långt, mer än %d byte"
-#: object-file.c:1493
-#, c-format
-msgid "unable to parse %s header"
-msgstr "kan inte tolka %s-huvud"
-
-#: object-file.c:1717
+#: object-file.c:1720
#, c-format
msgid "failed to read object %s"
msgstr "misslyckades läsa objektet %s"
-#: object-file.c:1721
+#: object-file.c:1724
#, c-format
msgid "replacement %s not found for %s"
msgstr "ersättningen %s hittades inte för %s"
-#: object-file.c:1725
+#: object-file.c:1728
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "löst objekt %s (lagrat i %s) är trasigt"
-#: object-file.c:1729
+#: object-file.c:1732
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "packat objekt %s (lagrat i %s) är trasigt"
-#: object-file.c:1834
+#: object-file.c:1855
#, c-format
msgid "unable to write file %s"
msgstr "kunde inte skriva filen %s"
-#: object-file.c:1841
+#: object-file.c:1862
#, c-format
msgid "unable to set permission to '%s'"
msgstr "kan inte sätta behörigheten till \"%s\""
-#: object-file.c:1848
+#: object-file.c:1869
msgid "file write error"
msgstr "fel vid skrivning av fil"
-#: object-file.c:1868
+#: object-file.c:1904
msgid "error when closing loose object file"
msgstr "fel vid stängning av fil för löst objekt"
-#: object-file.c:1933
+#: object-file.c:1971
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
-#: object-file.c:1935
+#: object-file.c:1973
msgid "unable to create temporary file"
msgstr "kan inte skapa temporär fil"
-#: object-file.c:1959
+#: object-file.c:1997
msgid "unable to write loose object file"
msgstr "kunde inte skriva fil för löst objekt"
-#: object-file.c:1965
+#: object-file.c:2003
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
-#: object-file.c:1969
+#: object-file.c:2007
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
-#: object-file.c:1973
+#: object-file.c:2011
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "förvirrad av instabil objektkälldata för %s"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:2022 builtin/pack-objects.c:1251
#, c-format
msgid "failed utime() on %s"
msgstr "\"utime()\" misslyckades på %s"
-#: object-file.c:2060
+#: object-file.c:2100
#, c-format
msgid "cannot read object for %s"
msgstr "kan inte läsa objekt för %s"
-#: object-file.c:2111
+#: object-file.c:2151
msgid "corrupt commit"
msgstr "trasik incheckning"
-#: object-file.c:2119
+#: object-file.c:2159
msgid "corrupt tag"
msgstr "trasig tagg"
-#: object-file.c:2219
+#: object-file.c:2259
#, c-format
msgid "read error while indexing %s"
msgstr "läsfel vid indexering av %s"
-#: object-file.c:2222
+#: object-file.c:2262
#, c-format
msgid "short read while indexing %s"
msgstr "för lite lästes vid indexering av %s"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2335 object-file.c:2345
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: misslyckades lägga in i databasen"
-#: object-file.c:2311
+#: object-file.c:2351
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: filtypen stöds ej"
-#: object-file.c:2335
+#: object-file.c:2375 builtin/fetch.c:1494
#, c-format
msgid "%s is not a valid object"
msgstr "%s är inte ett giltigt objekt"
-#: object-file.c:2337
+#: object-file.c:2377
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s är inte ett giltigt \"%s\"-objekt"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2404
#, c-format
msgid "unable to open %s"
msgstr "kan inte öppna %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2599
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "hash stämmer inte för %s (förväntade %s)"
-#: object-file.c:2583
+#: object-file.c:2622
#, c-format
msgid "unable to mmap %s"
msgstr "kan inte utföra \"mmap\" för %s"
-#: object-file.c:2588
+#: object-file.c:2628
#, c-format
msgid "unable to unpack header of %s"
msgstr "kan inte packa upp huvud för %s"
-#: object-file.c:2594
+#: object-file.c:2633
#, c-format
msgid "unable to parse header of %s"
msgstr "kan inte tolka huvud för %s"
-#: object-file.c:2605
+#: object-file.c:2644
#, c-format
msgid "unable to unpack contents of %s"
msgstr "kan inte tolka innehåll i %s"
-#: object-name.c:480
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c:382
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [felaktig objekt]."
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c:407
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s incheckning %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c:428
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s tagg %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#. "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c:439
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [felaktig tagg, kunde inte tolka]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c:447
+#, c-format
+msgid "%s tree"
+msgstr "%s-träd"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c:453
+#, c-format
+msgid "%s blob"
+msgstr "%s blob"
+
+#: object-name.c:569
#, c-format
msgid "short object ID %s is ambiguous"
msgstr "kort objekt-ID %s är tvetydigt"
-#: object-name.c:491
-msgid "The candidates are:"
-msgstr "Kandidaterna är:"
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c:591
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Kandidaterna är:\n"
+"%s"
-#: object-name.c:790
+#: object-name.c:888
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5737,22 +6065,22 @@
"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
"genom att köra \"git config advice.objectNameWarning false\""
-#: object-name.c:910
+#: object-name.c:1008
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s"
-#: object-name.c:918
+#: object-name.c:1016
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "loggen för \"%.*s\" har bara %d poster"
-#: object-name.c:1696
+#: object-name.c:1794
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\""
-#: object-name.c:1702
+#: object-name.c:1800
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
@@ -5761,12 +6089,12 @@
"sökvägen \"%s\" finns, men inte i \"%s\"\n"
"tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?"
-#: object-name.c:1711
+#: object-name.c:1809
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "sökvägen \"%s\" finns inte i \"%.*s\""
-#: object-name.c:1739
+#: object-name.c:1837
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
@@ -5775,7 +6103,7 @@
"sökvägen \"%s\" finns i indexet men inte i etapp %d\n"
"tips: Menade du \":%d:%s\"?"
-#: object-name.c:1755
+#: object-name.c:1853
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
@@ -5784,21 +6112,26 @@
"sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n"
"tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?"
-#: object-name.c:1763
+#: object-name.c:1861
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "sökvägen \"%s\" finns på disk, men inte i indexet"
-#: object-name.c:1765
+#: object-name.c:1863
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)"
-#: object-name.c:1778
+#: object-name.c:1876
msgid "relative path syntax can't be used outside working tree"
msgstr "relativ sökväg kan inte användas utanför arbetskatalogen"
-#: object-name.c:1916
+#: object-name.c:1901
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<objekt>:<sökväg> krävs, endast <objekt> \"%s\" har angivits"
+
+#: object-name.c:2014
#, c-format
msgid "invalid object name '%.*s'."
msgstr "felaktigt objektnamn \"%.*s\"."
@@ -5823,17 +6156,30 @@
msgid "unable to parse object: %s"
msgstr "kunde inte tolka objektet: %s"
-#: object.c:283 object.c:295
+#: object.c:283 object.c:294
#, c-format
msgid "hash mismatch %s"
msgstr "hashvärde stämmer inte överens %s"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index"
+
+#: pack-bitmap.c:433
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: kunde inte öppna paket"
+
+#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
#, c-format
msgid "unable to get size of %s"
msgstr "kan inte hämta storlek på %s"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1937
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "kunde inte hitta %s i paketet %s på offset %<PRIuMAX>"
+
+#: pack-bitmap.c:1973 builtin/rev-list.c:91
#, c-format
msgid "unable to get disk usage of %s"
msgstr "kan inte hämta diskanvändning för %s"
@@ -5863,130 +6209,135 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "reverse-index-filen %s har hash-ID %<PRIu32> som inte stöds"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "kan inte både skriva och bekräfta reverse-index"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "kunde inte ta status: %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "kunde inte göra %s läsbar"
-#: pack-write.c:522
+#: pack-write.c:521
#, c-format
msgid "could not write '%s' promisor file"
msgstr "kunde inte skriva kontraktsfilen \"%s\""
-#: packfile.c:625
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: packfile.c:655
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "paketfilen %s kunde inte kopplas%s"
-#: packfile.c:1934
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset före slutet av packindex för %s (trasigt index?)"
-#: packfile.c:1938
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "flaggan \"%s\" antar ett numeriskt värde"
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "trasigt utlöpsdatum: \"%s\""
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
-#: parse-options.c:38
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "flaggan \"%s\" kräver \"%s\" eller \"%s\""
+
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s behöver ett värde"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s är inkompatibel med %s"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s: inkompatibelt med något annat"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s tar inget värde"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s är inte tillgängligt"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "menade du \"--%s\" (med två bindestreck)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "alias för --%s"
-#: parse-options.c:879
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "okänd flagga \"%s\""
-#: parse-options.c:881
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "okänd flagga \"%c\""
-#: parse-options.c:883
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "okänd icke-ascii-flagga i strängen: \"%s\""
-#: parse-options.c:907
+#: parse-options.c:920
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
@@ -5994,48 +6345,72 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-TAL"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "Kunde inte göra %s skrivbar för gruppen"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Endast en \"attr:\"-angivelse tillåten."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "attr-angivelse kan inte vara tom"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "ogiltigt attributnamn %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6043,51 +6418,51 @@
"den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "
"globala sökvägsinställningar"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\""
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: \"%s\" är utanför arkivet på \"%s\""
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "\"%s\" (minnesstöd: \"%c\")"
-#: pathspec.c:552
+#: pathspec.c:551
#, 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:619
+#: pathspec.c:618
#, 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:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "linjen er felaktigt citerad: %s"
@@ -6108,7 +6483,7 @@
msgid "flush packet write failed"
msgstr "fel vid skrivning av \"flush\"-paket"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "protokollfel: omöjligt lång rad"
@@ -6116,7 +6491,7 @@
msgid "packet write with format failed"
msgstr "paketskrivning med format misslyckades"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek"
@@ -6125,25 +6500,25 @@
msgid "packet write failed: %s"
msgstr "paketskrivning misslyckades: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "läsfel"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "fjärren lade på oväntat"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "protokollfel: felaktig radlängdstecken: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "protokollfel: felaktig radlängd: %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "fjärrfel: %s"
@@ -6157,7 +6532,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "kunde inte skapa trådad lstat: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
@@ -6187,20 +6562,20 @@
msgid "Removing duplicate objects"
msgstr "Tar bort duplicerade objekt"
-#: range-diff.c:78
+#: range-diff.c:68
msgid "could not start `log`"
msgstr "kunde inte starta \"log\""
-#: range-diff.c:80
+#: range-diff.c:70
msgid "could not read `log` output"
msgstr "kunde inte läsa utdata från \"log\""
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:98 sequencer.c:5575
#, c-format
msgid "could not parse commit '%s'"
msgstr "kunde inte tolka incheckningen \"%s\""
-#: range-diff.c:115
+#: range-diff.c:109
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6209,69 +6584,65 @@
"kunde inte tolka första raden i \"log\"-updata: börjar inte med \"commit \": "
"\"%s\""
-#: range-diff.c:140
+#: range-diff.c:132
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "kunde inte tolka git-huvudet \"%.*s\""
-#: range-diff.c:307
+#: range-diff.c:300
msgid "failed to generate diff"
msgstr "misslyckades skapa diff"
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only och --right-only är ömsesidigt uteslutande"
-
-#: range-diff.c:562 range-diff.c:564
+#: range-diff.c:558 range-diff.c:560
#, c-format
msgid "could not parse log for '%s'"
msgstr "kunde inte tolka loggen för \"%s\""
-#: read-cache.c:710
+#: read-cache.c:737
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)"
-#: read-cache.c:726
+#: read-cache.c:753
msgid "cannot create an empty blob in the object database"
msgstr "kan inte skapa tom blob i objektdatabasen"
-#: read-cache.c:748
+#: read-cache.c:775
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger"
-#: read-cache.c:753
+#: read-cache.c:780 builtin/submodule--helper.c:3359
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "\"%s\" har inte någon utcheckad incheckning"
-#: read-cache.c:805
+#: read-cache.c:832
#, c-format
msgid "unable to index file '%s'"
msgstr "kan inte indexera filen \"%s\""
-#: read-cache.c:824
+#: read-cache.c:851
#, c-format
msgid "unable to add '%s' to index"
msgstr "kan inte lägga till \"%s\" till indexet"
-#: read-cache.c:835
+#: read-cache.c:862
#, c-format
msgid "unable to stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: read-cache.c:1358
+#: read-cache.c:1404
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "\"%s\" finns både som en fil och en katalog"
-#: read-cache.c:1573
+#: read-cache.c:1619
msgid "Refresh index"
msgstr "Uppdatera indexet"
-#: read-cache.c:1705
+#: read-cache.c:1751
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6280,7 +6651,7 @@
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1715
+#: read-cache.c:1761
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6289,143 +6660,147 @@
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1771
+#: read-cache.c:1817
#, c-format
msgid "bad signature 0x%08x"
msgstr "felaktig signatur 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1820
#, c-format
msgid "bad index version %d"
msgstr "felaktig indexversion %d"
-#: read-cache.c:1783
+#: read-cache.c:1829
msgid "bad index file sha1 signature"
msgstr "felaktig sha1-signatur för indexfil"
-#: read-cache.c:1817
+#: read-cache.c:1863
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "index använder filtillägget %.4s, vilket vi inte förstår"
-#: read-cache.c:1819
+#: read-cache.c:1865
#, c-format
msgid "ignoring %.4s extension"
msgstr "ignorerar filtillägget %.4s"
-#: read-cache.c:1856
+#: read-cache.c:1902
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "okänt format 0x%08x på indexpost"
-#: read-cache.c:1872
+#: read-cache.c:1918
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""
-#: read-cache.c:1929
+#: read-cache.c:1975
msgid "unordered stage entries in index"
msgstr "osorterade köposter i index"
-#: read-cache.c:1932
+#: read-cache.c:1978
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "flera köposter för den sammanslagna filen \"%s\""
-#: read-cache.c:1935
+#: read-cache.c:1981
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "osorterade köposter för \"%s\""
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
+#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
+#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
+#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
+#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
+#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: read-cache.c:2185
+#: read-cache.c:2240
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "kunde inte skapa tråd för load_cache_entries: %s"
-#: read-cache.c:2198
+#: read-cache.c:2253
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "kunde inte ansluta till tråden för load_cache_entries: %s"
-#: read-cache.c:2231
+#: read-cache.c:2286
#, c-format
msgid "%s: index file open failed"
msgstr "%s: öppning av indexfilen misslyckades"
-#: read-cache.c:2235
+#: read-cache.c:2290
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: kan inte ta startus på det öppna indexet"
-#: read-cache.c:2239
+#: read-cache.c:2294
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: indexfilen mindre än förväntat"
-#: read-cache.c:2243
+#: read-cache.c:2298
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: kan inte koppla indexfilen%s"
-#: read-cache.c:2286
+#: read-cache.c:2341
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "kunde inte skapa load_index_extensions-tråden: %s"
-#: read-cache.c:2313
+#: read-cache.c:2368
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"
-#: read-cache.c:2351
+#: read-cache.c:2414
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "kunde inte uppdatera delat index \"%s\""
-#: read-cache.c:2398
+#: read-cache.c:2473
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "trasigt index, förväntade %s i %s, fick %s"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3032
+msgid "cannot write split index for a sparse index"
+msgstr "kan inte skriva delat index för ett glest index"
+
+#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: read-cache.c:3075
+#: read-cache.c:3157
msgid "failed to convert to a sparse-index"
msgstr "misslyckades omvandla till glest index"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3228
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
-#: read-cache.c:3159
+#: read-cache.c:3241
#, c-format
msgid "unable to open git dir: %s"
msgstr "kunde inte öppna git-katalog: %s"
-#: read-cache.c:3171
+#: read-cache.c:3253
#, c-format
msgid "unable to unlink: %s"
msgstr "misslyckades ta bort länken: %s"
-#: read-cache.c:3200
+#: read-cache.c:3282
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "kan inte rätta behörighetsbitar på \"%s\""
-#: read-cache.c:3349
+#: read-cache.c:3439
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: kan inte återgå till kö 0"
@@ -6508,7 +6883,7 @@
msgstr[0] "Ombasera %s på %s (%d kommando)"
msgstr[1] "Ombasera %s på %s (%d kommandon)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6517,7 +6892,7 @@
"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
"incheckning.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6525,7 +6900,7 @@
"\n"
"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6539,7 +6914,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6549,14 +6924,14 @@
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
+#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
+#: builtin/rebase.c:191
#, c-format
msgid "could not write '%s'"
msgstr "kunde inte skriva \"%s\""
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "kunde inte skriva \"%s\"."
@@ -6590,14 +6965,12 @@
"\" (fel).\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "kunde inte läsa \"%s\"."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: \"preserve\" har ersatts av \"merges\""
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2057
msgid "gone"
msgstr "försvunnen"
@@ -6616,258 +6989,239 @@
msgid "ahead %d, behind %d"
msgstr "före %d, bakom %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "förväntat format: %%(color:<color>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "okänd färg: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Heltalsvärde förväntades refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Heltalsvärde förväntades refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "okänt %%(%s)-argument: %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) tar inte argument"
-#: ref-filter.c:339
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "okänt %%(objectsize)-argument: %s"
-
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) tar inte argument"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) tar inte argument"
-#: ref-filter.c:372
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "okänt %%(subject)-argument: %s"
-
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
-msgstr "förvändate %%(trailers:nyckel=<värde>)"
+msgstr "förväntade %%(trailers:key=<värde>)"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "okänt %%(trailers)-argument: %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "positivt värde förväntat contents:lines=%s"
-#: ref-filter.c:426
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "okänt %%(contents)-argument: %s"
-
-#: ref-filter.c:441
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "positivt värde förväntat \"%s\" i %%(%s)"
-#: ref-filter.c:445
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "okänt argument \"%s\" i %%(%s)"
-
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "okänd e-postalternativ: %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "förväntat format: %%(align:<bredd>,<position>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "okänd position:%s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "okänd bredd:%s"
-#: ref-filter.c:517
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "okänt %%(align)-argument: %s"
-
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "positiv bredd förväntad med atomen %%(align)"
-#: ref-filter.c:543
+#: ref-filter.c:568
#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "okänt %%(if)-argument: %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) tar inte argument"
-#: ref-filter.c:645
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "felformat fältnamn: %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "okänt fältnamn: %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"
-#: ref-filter.c:801
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format: atomen %%(%s) använd utan en %%(%s)-atom"
-#: ref-filter.c:865
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
-
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: atomen %%(then) använd mer än en gång"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atomen %%(then) använd efter %%(else)"
-#: ref-filter.c:897
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
-
-#: ref-filter.c:899
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
-
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: atomen %%(else) använd mer än en gång"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: atomen %%(end) använd utan motsvarande atom"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "felformad formatsträng %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "kommandot förkastar atom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl"
+
+#: ref-filter.c:1707
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ingen gren, ombaserar %s)"
-#: ref-filter.c:1624
+#: ref-filter.c:1710
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"
-#: ref-filter.c:1627
+#: ref-filter.c:1713
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ingen gren, \"bisect\" startad på %s)"
-#: ref-filter.c:1631
+#: ref-filter.c:1717
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD frånkopplat vid %s)"
-#: ref-filter.c:1634
+#: ref-filter.c:1720
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD frånkopplat från %s)"
-#: ref-filter.c:1637
+#: ref-filter.c:1723
msgid "(no branch)"
msgstr "(ingen gren)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1755 ref-filter.c:1973
#, c-format
msgid "missing object %s for %s"
msgstr "objektet %s saknas för %s"
-#: ref-filter.c:1679
+#: ref-filter.c:1765
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer misslyckades på %s för %s"
-#: ref-filter.c:2064
+#: ref-filter.c:2156
#, c-format
msgid "malformed object at '%s'"
msgstr "felformat objekt vid \"%s\""
-#: ref-filter.c:2153
+#: ref-filter.c:2246
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2251 refs.c:672
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorerar trasig referens %s"
-#: ref-filter.c:2502
+#: ref-filter.c:2630
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:2596
+#: ref-filter.c:2741
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2746
#, c-format
msgid "option `%s' must point to a commit"
msgstr "flaggan \"%s\" måste peka på en incheckning"
-#: refs.c:264
+#: reflog.c:407
+#, c-format
+msgid "not a reflog: %s"
+msgstr "inte en referenslogg: %s"
+
+#: reflog.c:410
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "ingen referenslogg för \"%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:566
+#: refs.c:561
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6892,32 +7246,32 @@
"\n"
"\tgit branch -m <namn>\n"
-#: refs.c:588
+#: refs.c:583
#, c-format
msgid "could not retrieve `%s`"
msgstr "kunde inte hämta \"%s\""
-#: refs.c:598
+#: refs.c:593
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "felaktigt namn på gren: %s = %s"
-#: refs.c:674
+#: refs.c:670
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignorerar dinglande symbolisk referens %s"
-#: refs.c:922
+#: refs.c:919
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "loggen för referensen %s har lucka efter %s"
-#: refs.c:929
+#: refs.c:926
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "loggen för referensen %s slutade oväntat på %s"
-#: refs.c:994
+#: refs.c:991
#, c-format
msgid "log for %s is empty"
msgstr "loggen för %s är tom"
@@ -6927,46 +7281,46 @@
msgid "refusing to update ref with bad name '%s'"
msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
-#: refs.c:1157
+#: refs.c:1164
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref misslyckades för referensen \"%s\": %s"
-#: refs.c:2051
+#: refs.c:2059
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
-#: refs.c:2131
+#: refs.c:2145
msgid "ref updates forbidden inside quarantine environment"
msgstr "referensuppdateringar förbjudna i karantänmiljö"
-#: refs.c:2142
+#: refs.c:2156
msgid "ref updates aborted by hook"
msgstr "referensuppdateringar avbrutna av krok"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2264 refs.c:2294
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "\"%s\" finns; kan inte skapa \"%s\""
-#: refs.c:2248 refs.c:2283
+#: refs.c:2270 refs.c:2305
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1295
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1310 refs/packed-backend.c:1565
+#: refs/packed-backend.c:1575
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1313 refs/packed-backend.c:1578
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
@@ -6976,50 +7330,50 @@
msgid "invalid refspec '%s'"
msgstr "felaktig referensspecifikation: \"%s\""
-#: remote.c:351
+#: remote.c:402
#, 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:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "mer än en receivepack angavs, använder den första"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "mer än en uploadpack angavs, använder den första"
-#: remote.c:590
+#: remote.c:698
#, 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:594
+#: remote.c:702
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s spårar vanligtvis %s, inte %s"
-#: remote.c:598
+#: remote.c:706
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s spårar både %s och %s"
-#: remote.c:666
+#: remote.c:774
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""
-#: remote.c:676
+#: remote.c:784
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""
-#: remote.c:1083
+#: remote.c:1191
#, c-format
msgid "src refspec %s does not match any"
msgstr "käll-referensspecifikationen %s motsvarar ingen"
-#: remote.c:1088
+#: remote.c:1196
#, c-format
msgid "src refspec %s matches more than one"
msgstr "käll-referensspecifikationen %s motsvarar mer än en"
@@ -7028,7 +7382,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1211
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -7051,7 +7405,7 @@
"\n"
"Inget av dem fungerade, så vi gav upp. Ange fullständig referens."
-#: remote.c:1123
+#: remote.c:1231
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -7062,7 +7416,7 @@
"Var det meningen att skapa en ny gren genom att sända\n"
"till \"%s:refs/heads/%s\"?"
-#: remote.c:1128
+#: remote.c:1236
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -7073,7 +7427,7 @@
"Var det meningen att skapa en ny tagg genom att sända\n"
"till \"%s:refs/tags/%s\"?"
-#: remote.c:1133
+#: remote.c:1241
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -7084,7 +7438,7 @@
"Var det meningen att tagga ett nytt träd genom att sända\n"
"till \"%s:refs/tags/%s\"?"
-#: remote.c:1138
+#: remote.c:1246
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -7095,114 +7449,114 @@
"Var det meningen att tagga en ny blob genom att sända\n"
"till \"%s:refs/tags/%s\"?"
-#: remote.c:1174
+#: remote.c:1282
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s kan inte slås upp till en gren"
-#: remote.c:1185
+#: remote.c:1293
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"
-#: remote.c:1197
+#: remote.c:1305
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"
-#: remote.c:1204
+#: remote.c:1312
#, 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:1724 remote.c:1825
+#: remote.c:1833 remote.c:1940
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: remote.c:1733
+#: remote.c:1842
#, c-format
msgid "no such branch: '%s'"
msgstr "okänd gren: \"%s\""
-#: remote.c:1736
+#: remote.c:1845
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "ingen standarduppström angiven för grenen \"%s\""
-#: remote.c:1742
+#: remote.c:1851
#, 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:1757
+#: remote.c:1866
#, 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:1769
+#: remote.c:1881
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "grenen \"%s\" har ingen fjärr för \"push\""
-#: remote.c:1779
+#: remote.c:1891
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-#: remote.c:1792
+#: remote.c:1904
msgid "push has no destination (push.default is 'nothing')"
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: remote.c:1814
+#: remote.c:1926
msgid "cannot resolve 'simple' push to a single destination"
msgstr "\"enkel push\" motsvarar flera olika mål"
-#: remote.c:1943
+#: remote.c:2059
#, c-format
msgid "couldn't find remote ref %s"
msgstr "Kunde inte hitta fjärr-referensen %s"
-#: remote.c:1956
+#: remote.c:2072
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Ignorerar märklig referens \"%s\" lokalt"
-#: remote.c:2119
+#: remote.c:2235
#, 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:2123
+#: remote.c:2239
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
-#: remote.c:2126
+#: remote.c:2242
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Din gren är à jour med \"%s\".\n"
-#: remote.c:2130
+#: remote.c:2246
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
-#: remote.c:2133
+#: remote.c:2249
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (använd \"%s\" för detaljer)\n"
-#: remote.c:2137
+#: remote.c:2253
#, 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:2143
+#: remote.c:2259
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:2146
+#: remote.c:2262
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -7212,11 +7566,11 @@
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:2154
+#: remote.c:2270
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:2157
+#: remote.c:2273
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -7231,11 +7585,11 @@
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:2167
+#: remote.c:2283
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:2359
+#: remote.c:2475
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "kan inte tolka förväntat objektnamn \"%s\""
@@ -7268,130 +7622,121 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "fel vid skrivning av \"%s\" (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr "misslyckades spola \"%s\""
-#: rerere.c:487 rerere.c:1023
+#: rerere.c:487 rerere.c:1024
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "kunde inte tolka konflikt-stycket i \"%s\""
-#: rerere.c:668
+#: rerere.c:669
#, c-format
msgid "failed utime() on '%s'"
msgstr "\"utime()\" misslyckades på \"%s\""
-#: rerere.c:678
+#: rerere.c:679
#, c-format
msgid "writing '%s' failed"
msgstr "misslyckades skriva \"%s\""
-#: rerere.c:698
+#: rerere.c:699
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "Köade \"%s\" med sparad lösning."
-#: rerere.c:737
+#: rerere.c:738
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "Sparade lösning för \"%s\"."
-#: rerere.c:772
+#: rerere.c:773
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "Löste \"%s\" med tidigare lösning."
-#: rerere.c:787
+#: rerere.c:788
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "kan inte ta bort lös länk \"%s\""
-#: rerere.c:791
+#: rerere.c:792
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "Sparade förhandsbild för \"%s\""
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
+#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: rerere.c:1041
+#: rerere.c:1042
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "misslyckades uppdatera tillstånd för sammanslagningsproblem i \"%s\""
-#: rerere.c:1052 rerere.c:1059
+#: rerere.c:1053 rerere.c:1060
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "inget sparat sammanslagningsresultat för \"%s\""
-#: rerere.c:1061
+#: rerere.c:1062
#, c-format
msgid "cannot unlink '%s'"
msgstr "kan inte ta bort länken \"%s\""
-#: rerere.c:1071
+#: rerere.c:1072
#, c-format
msgid "Updated preimage for '%s'"
msgstr "Uppdaterade förhandsbild för \"%s\""
-#: rerere.c:1080
+#: rerere.c:1081
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Glömde lösning för \"%s\"\n"
-#: rerere.c:1191
+#: rerere.c:1192
msgid "unable to open rr-cache directory"
msgstr "kan inte uppdatera katalogen rr-cache"
-#: reset.c:42
+#: reset.c:112
msgid "could not determine HEAD revision"
msgstr "kunde inte bestämma HEAD-revision"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:141 reset.c:147 sequencer.c:3696
#, c-format
msgid "failed to find tree of %s"
msgstr "kunde inte hitta trädet för %s."
-#: revision.c:2344
+#: revision.c:2358
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<paketfil> stöds inte längre"
-#: revision.c:2684
+#: revision.c:2712
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2687
+#: revision.c:2715
#, 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:2893
+#: revision.c:2901
+msgid "object filtering requires --objects"
+msgstr "objektfiltrering kräver --objects"
+
+#: revision.c:2918
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L stöder ännu inte andra diff-format än -p och -s"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "misslyckades öppna /dev/null"
-
-#: run-command.c:1274
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "kan inte skapa asynkron tråd: %s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"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:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"
@@ -7410,23 +7755,23 @@
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack: kunde inte starta (fork) underprocessen för fetch"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "sänd-förhandling misslyckades; fortsätter ändå med sändningen"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7434,47 +7779,48 @@
"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
"signed"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "mottagarsidan stöder inte push med --atomic"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "mottagarsidan stöder inte push-flaggor"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "kunde inte ta bort \"%s\""
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "kunde inte ta bort \"%s\""
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "revert"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "okänd funktion: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7482,53 +7828,81 @@
"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:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
-"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
-"och checka in resultatet med \"git commit\""
+"Efter att ha löst konflikterna, märk dem med\n"
+"\"git add/rm <sökvägsangivelse>\" och kör sedan\n"
+"\"git cherry-pick --continue\".\n"
+"Du kan hoppa över incheckningen istället med \"git cherry-pick --skip\"\n"
+"För att avbryta och återgå till där du var före \"git cherry-pick\",\n"
+"kör \"git cherry-pick --abort\"."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Efter att ha löst konflikterna, märk dem med\n"
+"\"git add/rm <sökvägsangivelse>\" och kör sedan\n"
+"\"git revert --continue\".\n"
+"Du kan hoppa över incheckningen istället med \"git revert --skip\"\n"
+"För att avbryta och återgå till där du var före \"git revert\",\n"
+"kör \"git revert --abort\"."
+
+#: sequencer.c:448 sequencer.c:3288
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
+#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
#, c-format
msgid "could not write to '%s'"
msgstr "kunde inte skriva till \"%s\""
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3565
#, c-format
msgid "failed to finalize '%s'"
msgstr "misslyckades färdigställa \"%s\""
-#: sequencer.c:486
+#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
+#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
+#, c-format
+msgid "could not read '%s'"
+msgstr "kunde inte läsa \"%s\""
+
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "dina lokala ändringar skulle skrivas över av %s."
-#: sequencer.c:490
+#: sequencer.c:503
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:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: snabbspola"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:615
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
@@ -7536,65 +7910,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "kan inte uppdatera cacheträd"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "kunde inte bestämma HEAD:s incheckning"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "ingen nyckel i \"%.*s\""
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "kan inte ta bort citering av värdet \"%s\""
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
+#: builtin/am.c:849 builtin/rebase.c:699
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "okänd variabel \"%s\""
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "\"GIT_AUTHOR_NAME\" saknas"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "\"GIT_AUTHOR_DATE\" saknas"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7623,11 +7997,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr "kroken \"prepare-commit-msg\" misslyckades"
-#: sequencer.c:1218
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7654,7 +8028,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7679,345 +8053,346 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1287
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: sequencer.c:1275
+#: sequencer.c:1289
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: sequencer.c:1321
+#: sequencer.c:1336
msgid "unable to resolve HEAD after creating commit"
msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
-#: sequencer.c:1323
+#: sequencer.c:1338
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: sequencer.c:1327
+#: sequencer.c:1342
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "could not parse HEAD"
msgstr "kunde inte tolka HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1365
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s är inte en incheckning!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1425 sequencer.c:2310
msgid "unable to parse commit author"
msgstr "kunde inte tolka incheckningens författare"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1469 sequencer.c:1589
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1500 sequencer.c:1532
#, c-format
msgid "invalid author identity '%s'"
msgstr "ogiltig författar-identitet \"%s\""
-#: sequencer.c:1491
+#: sequencer.c:1506
msgid "corrupt author: missing date information"
msgstr "trasig författare: saknar datuminformation"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
+#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "kunde inte uppdatera %s"
-#: sequencer.c:1606
+#: sequencer.c:1621
#, c-format
msgid "could not parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: sequencer.c:1611
+#: sequencer.c:1626
#, c-format
msgid "could not parse parent commit %s"
msgstr "kunde inte tolka föräldraincheckningen %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1709 sequencer.c:1990
#, c-format
msgid "unknown command: %d"
msgstr "okänt kommando: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1751
msgid "This is the 1st commit message:"
msgstr "Det här är 1:a incheckningsmeddelandet:"
-#: sequencer.c:1737
+#: sequencer.c:1752
#, c-format
msgid "This is the commit message #%d:"
msgstr "Det här är incheckningsmeddelande %d:"
-#: sequencer.c:1738
+#: sequencer.c:1753
msgid "The 1st commit message will be skipped:"
msgstr "1:a incheckningsmeddelandet kommer hoppas över:"
-#: sequencer.c:1739
+#: sequencer.c:1754
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-#: sequencer.c:1740
+#: sequencer.c:1755
#, c-format
msgid "This is a combination of %d commits."
msgstr "Det här är en kombination av %d incheckningar."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1902 sequencer.c:1959
#, c-format
msgid "cannot write '%s'"
msgstr "kan inte skriva \"%s\""
-#: sequencer.c:1934
+#: sequencer.c:1949
msgid "need a HEAD to fixup"
msgstr "behöver en HEAD-incheckning att rätta"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1951 sequencer.c:3592
msgid "could not read HEAD"
msgstr "kunde inte läsa HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1953
msgid "could not read HEAD's commit message"
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-#: sequencer.c:1962
+#: sequencer.c:1977
#, c-format
msgid "could not read commit message of %s"
msgstr "kunde inte läsa incheckningsmeddelande för %s"
-#: sequencer.c:2072
+#: sequencer.c:2087
msgid "your index file is unmerged."
msgstr "din indexfil har inte slagits ihop."
-#: sequencer.c:2079
+#: sequencer.c:2094
msgid "cannot fixup root commit"
msgstr "kan inte göra \"fixup\" på rotincheckning"
-#: sequencer.c:2098
+#: sequencer.c:2113
#, 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:2106 sequencer.c:2114
+#: sequencer.c:2121 sequencer.c:2129
#, c-format
msgid "commit %s does not have parent %d"
msgstr "incheckning %s har inte förälder %d"
-#: sequencer.c:2120
+#: sequencer.c:2135
#, 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:2139
+#: sequencer.c:2154
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:2205
+#: sequencer.c:2220
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:2265
+#: sequencer.c:2280
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2281
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:2287
+#: sequencer.c:2302
#, 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:2345
+#: sequencer.c:2360
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:2352
+#: sequencer.c:2368
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:2425
+#: sequencer.c:2448
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s tar inte argument: \"%s\""
-#: sequencer.c:2434
+#: sequencer.c:2457
#, c-format
msgid "missing arguments for %s"
msgstr "argument saknas för %s"
-#: sequencer.c:2477
+#: sequencer.c:2500
#, c-format
msgid "could not parse '%s'"
msgstr "kunde inte tolka \"%s\""
-#: sequencer.c:2538
+#: sequencer.c:2561
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2572
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
-#: sequencer.c:2635
+#: sequencer.c:2620 builtin/rebase.c:185
+#, c-format
+msgid "could not read '%s'."
+msgstr "kunde inte läsa \"%s\"."
+
+#: sequencer.c:2658
msgid "cancelling a cherry picking in progress"
msgstr "avbryter pågående \"cherry-pick\""
-#: sequencer.c:2644
+#: sequencer.c:2667
msgid "cancelling a revert in progress"
msgstr "avbryter pågående \"revert\""
-#: sequencer.c:2690
+#: sequencer.c:2707
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:2692
+#: sequencer.c:2709
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "oanvändbart manus: \"%s\""
-#: sequencer.c:2697
+#: sequencer.c:2714
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:2708
+#: sequencer.c:2725
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:2710
+#: sequencer.c:2727
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:2788
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "felaktigt värde för %s: %s"
-
-#: sequencer.c:2897
+#: sequencer.c:2914
msgid "unusable squash-onto"
msgstr "oanvändbar squash-onto"
-#: sequencer.c:2917
+#: sequencer.c:2934
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "trasigt manus: \"%s\""
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3029 sequencer.c:4875
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:3029
+#: sequencer.c:3046
msgid "revert is already in progress"
msgstr "en \"revert\" pågår redan"
-#: sequencer.c:3031
+#: sequencer.c:3048
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3051
msgid "cherry-pick is already in progress"
msgstr "en \"cherry-pick\" pågår redan"
-#: sequencer.c:3036
+#: sequencer.c:3053
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3067
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:3065
+#: sequencer.c:3082
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3142 sequencer.c:4585
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3144 sequencer.c:3155
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3146 sequencer.c:3190
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:3159 builtin/grep.c:758
+#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
+#: builtin/grep.c:774
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:3161
+#: sequencer.c:3178
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:3162
+#: sequencer.c:3179
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:3168
+#: sequencer.c:3185
#, 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:3179
+#: sequencer.c:3196
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:3220
+#: sequencer.c:3237
msgid "no revert in progress"
msgstr "ingen \"revers\" pågår"
-#: sequencer.c:3229
+#: sequencer.c:3246
msgid "no cherry-pick in progress"
msgstr "ingen \"cherry-pick\" pågår"
-#: sequencer.c:3239
+#: sequencer.c:3256
msgid "failed to skip the commit"
msgstr "kunde inte hoppa över incheckningen"
-#: sequencer.c:3246
+#: sequencer.c:3263
msgid "there is nothing to skip"
msgstr "ingenting att hoppa över"
-#: sequencer.c:3249
+#: sequencer.c:3266
#, c-format
msgid ""
"have you committed already?\n"
@@ -8026,16 +8401,16 @@
"har du redan checkat in?\n"
"testa \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3428 sequencer.c:4476
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3445
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "kan inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:3436
+#: sequencer.c:3453
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8054,27 +8429,27 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3463
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Kunde inte tillämpa %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3470
#, c-format
msgid "Could not merge %.*s"
msgstr "Kunde inte slå ihop %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:3483
+#: sequencer.c:3499
#, c-format
msgid "Executing: %s\n"
msgstr "Kör: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3510
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8089,11 +8464,11 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3516
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:3510
+#: sequencer.c:3522
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8110,90 +8485,90 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3582
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "ogiltigt etikettnamn: \"%.*s\""
-#: sequencer.c:3645
+#: sequencer.c:3655
msgid "writing fake root commit"
msgstr "skriver fejkad rotincheckning"
-#: sequencer.c:3650
+#: sequencer.c:3660
msgid "writing squash-onto"
msgstr "skriver squash-onto"
-#: sequencer.c:3734
+#: sequencer.c:3739
#, c-format
msgid "could not resolve '%s'"
msgstr "kunde inte upplösa \"%s\""
-#: sequencer.c:3767
+#: sequencer.c:3771
msgid "cannot merge without a current revision"
msgstr "kan inte slå ihop utan en aktuell incheckning"
-#: sequencer.c:3789
+#: sequencer.c:3793
#, c-format
msgid "unable to parse '%.*s'"
msgstr "kan inte tolka \"%.*s\""
-#: sequencer.c:3798
+#: sequencer.c:3802
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "inget att slå samman: \"%.*s\""
-#: sequencer.c:3810
+#: sequencer.c:3814
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:3826
+#: sequencer.c:3869
#, c-format
msgid "could not get commit message of '%s'"
msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
-#: sequencer.c:4009
+#: sequencer.c:4013
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "kunde inte ens försöka slå ihop \"%.*s\""
-#: sequencer.c:4025
+#: sequencer.c:4029
msgid "merge: Unable to write new index file"
msgstr "sammanslagning: Kunde inte skriva ny indexfil"
-#: sequencer.c:4099
+#: sequencer.c:4110
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: sequencer.c:4102
+#: sequencer.c:4113
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Oväntat svar från stash: \"%s\""
-#: sequencer.c:4108
+#: sequencer.c:4119
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Kunde inte skapa katalog för \"%s\""
-#: sequencer.c:4111
+#: sequencer.c:4122
#, c-format
msgid "Created autostash: %s\n"
msgstr "Skapade autostash: %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4124
msgid "could not reset --hard"
msgstr "kunde inte utföra \"reset --hard\""
-#: sequencer.c:4140
+#: sequencer.c:4148
#, c-format
msgid "Applied autostash.\n"
msgstr "Tillämpade autostash.\n"
-#: sequencer.c:4152
+#: sequencer.c:4160
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:4155
+#: sequencer.c:4163
#, c-format
msgid ""
"%s\n"
@@ -8204,29 +8579,29 @@
"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:4160
+#: sequencer.c:4168
msgid "Applying autostash resulted in conflicts."
msgstr "Tillämpning av autostash gav konflikter."
-#: sequencer.c:4161
+#: sequencer.c:4169
msgid "Autostash exists; creating a new stash entry."
msgstr "Autostash finns; skapar ny stash-post."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4225
msgid "could not detach HEAD"
msgstr "kunde inte koppla från HEAD"
-#: sequencer.c:4248
+#: sequencer.c:4240
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Stoppade på HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4242
#, c-format
msgid "Stopped at %s\n"
msgstr "Stoppade på %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4274
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8247,58 +8622,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4320
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Ombaserar (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4366
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4436
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:4480
+#: sequencer.c:4484
msgid "could not read orig-head"
msgstr "kunde inte läsa orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4489
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:4499
+#: sequencer.c:4503
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:4559
+#: sequencer.c:4563
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Lyckades ombasera och uppdatera %s.\n"
-#: sequencer.c:4611
+#: sequencer.c:4615
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:4620
+#: sequencer.c:4624
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:4622
+#: sequencer.c:4626
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:4624
+#: sequencer.c:4628
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:4627
+#: sequencer.c:4631
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8308,59 +8683,68 @@
"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:4663 sequencer.c:4702
+#: sequencer.c:4667 sequencer.c:4706
#, c-format
msgid "could not write file: '%s'"
msgstr "kunde inte skriva fil: \"%s\""
-#: sequencer.c:4718
+#: sequencer.c:4722
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4732
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:4845
+#: sequencer.c:4852
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: sequencer.c:4849
+#: sequencer.c:4856
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:4884
+#: sequencer.c:4891
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
-#: sequencer.c:5361
+#: sequencer.c:5162 sequencer.c:5391
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "hoppade över tidigare applicerad incheckning %s"
+
+#: sequencer.c:5232 sequencer.c:5407
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "använd --reapply-cherry-picks för att ta med överhoppade incheckningar"
+
+#: sequencer.c:5378
msgid "make_script: unhandled options"
msgstr "make_script: flaggor som inte stöds"
-#: sequencer.c:5364
+#: sequencer.c:5381
msgid "make_script: error preparing revisions"
msgstr "make_script: fel när revisioner skulle förberedas"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5639 sequencer.c:5656
msgid "nothing to do"
msgstr "inget att göra"
-#: sequencer.c:5650
+#: sequencer.c:5675
msgid "could not skip unnecessary pick commands"
msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
-#: sequencer.c:5750
+#: sequencer.c:5775
msgid "the script was already rearranged."
msgstr "skriptet har redan omordnats."
-#: setup.c:133
+#: setup.c:135
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "\"%s\" är utanför arkivet på \"%s\""
-#: setup.c:185
+#: setup.c:187
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -8370,7 +8754,7 @@
"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
"lokalt."
-#: setup.c:198
+#: setup.c:200
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8382,12 +8766,12 @@
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:264
+#: setup.c:266
#, 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:283
+#: setup.c:285
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -8398,100 +8782,100 @@
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:419
+#: setup.c:421
msgid "unable to set up work tree using invalid config"
msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:425 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "funktionen måste köras i en arbetskatalog"
-#: setup.c:658
+#: setup.c:724
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Förväntade git-arkivversion <= %d, hittade %d"
-#: setup.c:666
+#: setup.c:732
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "okänd arkivutökning hittades:"
msgstr[1] "okända arkivutökningar hittades:"
-#: setup.c:680
+#: setup.c:746
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "arkivversionen är 0, men utökning som bara finns i v1 upptäcktes:"
msgstr[1] "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:"
-#: setup.c:701
+#: setup.c:767
#, c-format
msgid "error opening '%s'"
msgstr "fel vid öppning av \"%s\""
-#: setup.c:703
+#: setup.c:769
#, 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:705
+#: setup.c:771
#, c-format
msgid "error reading %s"
msgstr "fel vid läsning av %s"
-#: setup.c:707
+#: setup.c:773
#, c-format
msgid "invalid gitfile format: %s"
msgstr "ogiltigt gitfilformat: %s"
-#: setup.c:709
+#: setup.c:775
#, c-format
msgid "no path in gitfile: %s"
msgstr "ingen sökväg i gitfil: %s"
-#: setup.c:711
+#: setup.c:777
#, c-format
msgid "not a git repository: %s"
msgstr "inte ett git-arkiv: %s"
-#: setup.c:813
+#: setup.c:879
#, c-format
msgid "'$%s' too big"
msgstr "\"$%s\" för stor"
-#: setup.c:827
+#: setup.c:893
#, c-format
msgid "not a git repository: '%s'"
msgstr "inte ett git-arkiv: \"%s\""
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:922 setup.c:924 setup.c:955
#, c-format
msgid "cannot chdir to '%s'"
msgstr "kan inte byta katalog (chdir) till \"%s\""
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
msgid "cannot come back to cwd"
msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: setup.c:988
+#: setup.c:1054
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "misslyckades ta status på \"%*ss%s%s\""
-#: setup.c:1231
+#: setup.c:1338
msgid "Unable to read current working directory"
msgstr "Kan inte läsa aktuell arbetskatalog"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1347 setup.c:1353
#, c-format
msgid "cannot change to '%s'"
msgstr "kan inte byta till \"%s\""
-#: setup.c:1251
+#: setup.c:1358
#, 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:1257
+#: setup.c:1364
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -8501,7 +8885,20 @@
"monteringspunkten %s)\n"
"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
-#: setup.c:1381
+#: setup.c:1374
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"osäkert arkiv (\"%s\" ägs av någon annan)\n"
+"För att lägga till ett undantag för denna katalog, kör:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#: setup.c:1502
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8510,69 +8907,61 @@
"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:1430
-msgid "open /dev/null or dup failed"
-msgstr "misslyckades öppna /dev/null eller \"dup\""
-
-#: setup.c:1445
+#: setup.c:1564
msgid "fork failed"
msgstr "\"fork\" misslyckades"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1569
msgid "setsid failed"
msgstr "\"setsid\" misslyckades"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "försöker använda glest index utan \"cone\"-läge"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "kan inte uppdatera cacheträd, behåller fullt läge"
-
-#: sparse-index.c:263
+#: sparse-index.c:285
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "indexposten är en katalog, men inte gles (%08x)"
+#: split-index.c:9
+msgid "cannot use split index with a sparse index"
+msgstr "kan inte dela indexet med ett glest index"
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u,%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:852
+#: 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:860
+#: strbuf.c:861
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u,%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:862
+#: 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:869
+#: strbuf.c:870
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u,%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:871
+#: 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:877
+#: strbuf.c:878
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8580,84 +8969,84 @@
msgstr[1] "%u bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
+#: strbuf.c:880
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u byte/s"
msgstr[1] "%u bytes/s"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
+#: builtin/rebase.c:653
#, c-format
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
-#: strbuf.c:1177
+#: strbuf.c:1196
#, c-format
msgid "could not edit '%s'"
msgstr "kunde inte redigera \"%s\""
-#: submodule-config.c:237
+#: submodule-config.c:238
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "ignorerar misstänkt undermodulnamn: %s"
-#: submodule-config.c:304
+#: submodule-config.c:305
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"
-#: submodule-config.c:402
+#: submodule-config.c:403
#, 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
+#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
#, c-format
-msgid "invalid value for %s"
-msgstr "ogiltigt värde för %s"
+msgid "invalid value for '%s'"
+msgstr "ogiltigt värde för \"%s\""
-#: submodule-config.c:766
+#: submodule-config.c:828
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Kunde inte uppdatera .gitmodules-posten %s"
-#: submodule.c:114 submodule.c:143
+#: submodule.c:115 submodule.c:144
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
"sammanslagningskonflikter först"
-#: submodule.c:118 submodule.c:147
+#: submodule.c:119 submodule.c:148
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"
-#: submodule.c:154
+#: submodule.c:155
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Kunde inte ta bort .gitmodules-posten för %s"
-#: submodule.c:165
+#: submodule.c:166
msgid "staging updated .gitmodules failed"
msgstr "misslyckades köa uppdaterad .gitmodules"
-#: submodule.c:328
+#: submodule.c:346
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "i ej utcheckad undermodul \"%s\""
-#: submodule.c:359
+#: submodule.c:377
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
-#: submodule.c:436
+#: submodule.c:454
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "felaktigt argument till --ignore-submodules: %s"
-#: submodule.c:805
+#: submodule.c:866
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8666,12 +9055,12 @@
"Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul "
"med samma namn. Hoppar över den."
-#: submodule.c:908
+#: submodule.c:987
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"
-#: submodule.c:993
+#: submodule.c:1069
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8680,36 +9069,46 @@
"kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i "
"undermodulen \"%s\""
-#: submodule.c:1116
+#: submodule.c:1192
#, c-format
msgid "process for submodule '%s' failed"
msgstr "process för undermodulen \"%s\" misslyckades"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens."
-#: submodule.c:1156
+#: submodule.c:1232
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Sänder undermodulen \"%s\"\n"
-#: submodule.c:1159
+#: submodule.c:1235
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Kunde inte sända undermodulen \"%s\"\n"
-#: submodule.c:1451
+#: submodule.c:1567
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Hämtar undermodulen %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1589
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Kunde inte komma åt undermodulen \"%s\"\n"
-#: submodule.c:1640
+#: submodule.c:1618
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Kunde inte komma åt undermodulen \"%s\" vid incheckningen %s\n"
+
+#: submodule.c:1629
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Hämtar undermodulen %s%s vvid incheckningen %s\n"
+
+#: submodule.c:1849
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8718,61 +9117,61 @@
"Fel vid hämtning av undermodul:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1874
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "\"%s\" känns inte igen som ett git-arkiv"
-#: submodule.c:1682
+#: submodule.c:1891
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\""
-#: submodule.c:1723
+#: submodule.c:1932
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\""
-#: submodule.c:1798
+#: submodule.c:2007
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
-#: submodule.c:1811
+#: submodule.c:2020
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
-#: submodule.c:1826
+#: submodule.c:2037
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\""
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:2064 submodule.c:2379
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "kunde inte rekursera in i undermodulen \"%s\""
-#: submodule.c:1874
+#: submodule.c:2086
msgid "could not reset submodule index"
msgstr "kunde inte återställa indexet i undermodul"
-#: submodule.c:1916
+#: submodule.c:2128
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "undermodulen \"%s\" har ett smutsigt index"
-#: submodule.c:1968
+#: submodule.c:2182
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Undermoduler \"%s\" kunde inte uppdateras."
-#: submodule.c:2036
+#: submodule.c:2250
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\""
-#: submodule.c:2057
+#: submodule.c:2271
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8780,17 +9179,17 @@
"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
"stöds ej"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2283 submodule.c:2343
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
-#: submodule.c:2073
+#: submodule.c:2287
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog"
-#: submodule.c:2080
+#: submodule.c:2293
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8801,11 +9200,11 @@
"\"%s\" till\n"
"\"%s\"\n"
-#: submodule.c:2208
+#: submodule.c:2424
msgid "could not start ls-files in .."
msgstr "kunde inte starta ls-files i .."
-#: submodule.c:2248
+#: submodule.c:2464
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree returnerade en oväntad returkod %d"
@@ -8826,8 +9225,8 @@
msgid "unknown value '%s' for key '%s'"
msgstr "okänt värde \"%s\" för nyckeln \"%s\""
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
+#: builtin/remote.c:328
#, c-format
msgid "more than one %s"
msgstr "mer än en %s"
@@ -8842,11 +9241,11 @@
msgid "could not read input file '%s'"
msgstr "kunde inte läsa indatafilen \"%s\""
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
msgid "could not read from stdin"
msgstr "kunde inte läsa från standard in"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:760
#, c-format
msgid "could not stat %s"
msgstr "kunde inte ta status på %s"
@@ -8916,7 +9315,7 @@
msgid "error while running fast-import"
msgstr "fel när fast-import kördes"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1254
#, c-format
msgid "could not read ref %s"
msgstr "kunde inte läsa referensen %s"
@@ -8934,7 +9333,7 @@
msgid "invalid remote service path"
msgstr "felaktig sökväg till fjärrtjänst"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1496
msgid "operation not supported by protocol"
msgstr "funktionen stöds inte av protokollet"
@@ -8943,72 +9342,72 @@
msgid "can't connect to subservice %s"
msgstr "kan inte ansluta till undertjänsten %s"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:415
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only kräver protokoll v2"
-#: transport-helper.c:755
+#: transport-helper.c:758
msgid "'option' without a matching 'ok/error' directive"
msgstr "\"option\" utan mostsvarande \"ok/error\"-direktiv"
-#: transport-helper.c:798
+#: transport-helper.c:801
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\""
-#: transport-helper.c:855
+#: transport-helper.c:862
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "hjälparen returnerade oväntad status %s"
-#: transport-helper.c:938
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support dry-run"
msgstr "hjälparen %s stöder inte dry-run"
-#: transport-helper.c:941
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed"
msgstr "hjälparen %s stöder inte --signed"
-#: transport-helper.c:944
+#: transport-helper.c:951
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "hjälparen %s stöder inte --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:956
#, c-format
msgid "helper %s does not support --atomic"
msgstr "hjälparen %s stöder inte --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:960
#, c-format
msgid "helper %s does not support --%s"
msgstr "hjälparen %s stöder inte --%s"
-#: transport-helper.c:960
+#: transport-helper.c:967
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "hjälparen %s stöder inte \"push-option\""
-#: transport-helper.c:1060
+#: transport-helper.c:1067
msgid "remote-helper doesn't support push; refspec needed"
msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"
-#: transport-helper.c:1065
+#: transport-helper.c:1072
#, c-format
msgid "helper %s does not support 'force'"
msgstr "hjälparen %s stöder inte \"force\""
-#: transport-helper.c:1112
+#: transport-helper.c:1119
msgid "couldn't run fast-export"
msgstr "kunde inte köra fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1124
msgid "error while running fast-export"
msgstr "fel vid körning av fast-export"
-#: transport-helper.c:1142
+#: transport-helper.c:1149
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9017,52 +9416,52 @@
"Inga gemensamma referenser och inga angavs; gör inget.\n"
"Du kanske borde ange en gren.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1231
#, c-format
msgid "unsupported object format '%s'"
msgstr "objektformatet \"%s\" stöds ej"
-#: transport-helper.c:1233
+#: transport-helper.c:1240
#, c-format
msgid "malformed response in ref list: %s"
msgstr "felformat svar i referenslistan: %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1392
#, c-format
msgid "read(%s) failed"
msgstr "läs(%s) misslyckades"
-#: transport-helper.c:1412
+#: transport-helper.c:1419
#, c-format
msgid "write(%s) failed"
msgstr "skriv(%s) misslyckades"
-#: transport-helper.c:1461
+#: transport-helper.c:1468
#, c-format
msgid "%s thread failed"
msgstr "%s-tråden misslyckades"
-#: transport-helper.c:1465
+#: transport-helper.c:1472
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s-tråden misslyckades ansluta: %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1491 transport-helper.c:1495
#, 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:1525
+#: transport-helper.c:1532
#, c-format
msgid "%s process failed to wait"
msgstr "processen %s misslyckades vänta"
-#: transport-helper.c:1529
+#: transport-helper.c:1536
#, c-format
msgid "%s process failed"
msgstr "processen %s misslyckades"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1554 transport-helper.c:1563
msgid "can't start thread for copying data"
msgstr "kan inte skapa tråd för kopiering av data"
@@ -9071,51 +9470,51 @@
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
-#: transport.c:145
+#: transport.c:138
#, c-format
msgid "could not read bundle '%s'"
-msgstr "kunde inte läsa paketet (bundlen) \"%s\""
+msgstr "kunde inte läsa bunten \"%s\""
-#: transport.c:223
+#: transport.c:234
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: ogiltig flagga för depth: \"%s\""
-#: transport.c:275
+#: transport.c:289
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:276
+#: transport.c:290
msgid "server options require protocol version 2 or later"
msgstr "serverflaggor kräver protokollversion 2 eller senare"
-#: transport.c:403
+#: transport.c:418
msgid "server does not support wait-for-done"
msgstr "servern stöder inte wait-for-done"
-#: transport.c:755
+#: transport.c:770
msgid "could not parse transport.color.* config"
msgstr "kunde inte tolka inställningen för transport.color.*"
-#: transport.c:830
+#: transport.c:845
msgid "support for protocol v2 not implemented yet"
msgstr "stöd för protokoll v2 ännu ej implementerat"
-#: transport.c:965
+#: transport.c:978
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "okänt värde för inställningen \"%s\": %s"
-#: transport.c:1031
+#: transport.c:1044
#, c-format
msgid "transport '%s' not allowed"
msgstr "transporten \"%s\" tillåts inte"
-#: transport.c:1084
+#: transport.c:1093
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync stöds inte längre"
-#: transport.c:1187
+#: transport.c:1196
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9124,7 +9523,7 @@
"Följande undermodulsökvägar innehåller ändringar som\n"
"inte kan hittas av fjärrarna:\n"
-#: transport.c:1191
+#: transport.c:1200
#, c-format
msgid ""
"\n"
@@ -9151,11 +9550,11 @@
"för att sända dem till fjärren.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1208
msgid "Aborting."
msgstr "Avbryter."
-#: transport.c:1346
+#: transport.c:1354
msgid "failed to push all needed submodules"
msgstr "kunde inte sända alla nödvändiga undermoduler"
@@ -9175,7 +9574,7 @@
msgid "too-short tree file"
msgstr "trädfil för kort"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9184,7 +9583,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:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9193,7 +9592,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9203,7 +9602,7 @@
"sammanslagning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9213,7 +9612,7 @@
"sammanslagning:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9222,7 +9621,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:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9231,7 +9630,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -9241,7 +9640,16 @@
"dem:\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Vägrar ta bort aktuell arbetskatalog:\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9250,7 +9658,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:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9259,7 +9667,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9269,7 +9677,7 @@
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du slår samman."
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9279,7 +9687,7 @@
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9288,7 +9696,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:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9297,7 +9705,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9308,7 +9716,7 @@
"utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9319,7 +9727,7 @@
"utcheckningen:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9329,7 +9737,7 @@
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9339,7 +9747,7 @@
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9348,7 +9756,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:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9357,12 +9765,12 @@
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -9371,7 +9779,7 @@
"Kan inte uppdatera undermodul:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -9381,7 +9789,7 @@
"Följande sökvägar är inte àjour och lämnades till trots för gles-mönster:\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9391,7 +9799,7 @@
"mönster:\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -9402,12 +9810,12 @@
"gles-mönster:\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "Avbryter\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9416,11 +9824,11 @@
"Du bör köra \"git sparse-checkout reapply\" efter att ha fixat sökvägarna "
"ovan.\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "Uppdaterar filer"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -9430,16 +9838,16 @@
"sökvägar på ett okänsligt filsystem) och endast en från samma\n"
"kollisionsgrupp finns i arbetskatalogen:\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1664
msgid "Updating index flags"
msgstr "Uppdaterar indexflaggor"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2925
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1579
msgid "expected flush after fetch arguments"
msgstr "förväntade \"flush\" efter \"fetch\"-argument"
@@ -9476,113 +9884,137 @@
msgid "Fetching objects"
msgstr "Hämtar objekt"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "misslyckades läsa \"%s\""
-#: worktree.c:303
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"
-#: worktree.c:314
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"
-#: worktree.c:326
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "\"%s\" finns inte"
-#: worktree.c:332
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "\"%s\" är inte en .git-fil, felkod %d"
-#: worktree.c:341
+#: worktree.c:342
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "\"%s\" pekar inte tillbaka till \"%s\""
-#: worktree.c:603
+#: worktree.c:600
msgid "not a directory"
msgstr "inte en katalog"
-#: worktree.c:612
+#: worktree.c:609
msgid ".git is not a file"
msgstr ".git är inte en fil"
-#: worktree.c:614
+#: worktree.c:611
msgid ".git file broken"
msgstr ".git-filen är trasig"
-#: worktree.c:616
+#: worktree.c:613
msgid ".git file incorrect"
msgstr ".git-filen är felaktig"
-#: worktree.c:722
+#: worktree.c:719
msgid "not a valid path"
msgstr "inte en giltig sökväg"
-#: worktree.c:728
+#: worktree.c:725
msgid "unable to locate repository; .git is not a file"
msgstr "hittar inte arkivet; .git är inte en fil"
-#: worktree.c:732
+#: worktree.c:729
msgid "unable to locate repository; .git file does not reference a repository"
msgstr "hittar inte arkivet; .git-filen hänvisar inte till ett arkiv"
-#: worktree.c:736
+#: worktree.c:733
msgid "unable to locate repository; .git file broken"
msgstr "hittar inte arkivet; .git-filen är trasig"
-#: worktree.c:742
+#: worktree.c:739
msgid "gitdir unreadable"
msgstr "gitdir är oläsbar"
-#: worktree.c:746
+#: worktree.c:743
msgid "gitdir incorrect"
msgstr "gitdir är felaktig"
-#: worktree.c:771
+#: worktree.c:768
msgid "not a valid directory"
msgstr "inte i en giltig katalog"
-#: worktree.c:777
+#: worktree.c:774
msgid "gitdir file does not exist"
msgstr "gitdir-filen existerar inte"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:779 worktree.c:788
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "kunde inte läsa gitdir-filen (%s)"
-#: worktree.c:801
+#: worktree.c:798
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "kort läsning (förväntade %<PRIuMAX> byte, läste %<PRIuMAX>)"
-#: worktree.c:809
+#: worktree.c:806
msgid "invalid gitdir file"
msgstr "ogiltig gitdir-fil"
-#: worktree.c:817
+#: worktree.c:814
msgid "gitdir file points to non-existent location"
msgstr "gitdir-filen pekar på en ickeexisterande plats"
-#: wrapper.c:197 wrapper.c:367
+#: worktree.c:830
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "kan inte sätta %s i \"%s\""
+
+#: worktree.c:832
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "kan inte slå av %s i \"%s\""
+
+#: worktree.c:852
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "misslyckades ändra inställningen extensions.worktreeConfig"
+
+#: wrapper.c:161
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "kunde inte lagra miljövariabeln \"%s\""
+
+#: wrapper.c:213
+#, c-format
+msgid "unable to create '%s'"
+msgstr "kunde inte skapa \"%s\""
+
+#: wrapper.c:215 wrapper.c:385
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:416 wrapper.c:683
#, c-format
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
-#: wrapper.c:607
+#: wrapper.c:691
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
@@ -9617,11 +10049,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:1125
+#: wt-status.c:211 wt-status.c:1140
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1149
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
@@ -9724,22 +10156,22 @@
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:958
+#: wt-status.c:973
#, 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:989
+#: wt-status.c:1004
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:991
+#: wt-status.c:1006
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:1073
+#: wt-status.c:1088
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9747,7 +10179,7 @@
"Raden ovan får inte ändras eller tas bort.\n"
"Allt under den kommer tas bort."
-#: wt-status.c:1165
+#: wt-status.c:1180
#, c-format
msgid ""
"\n"
@@ -9758,107 +10190,114 @@
"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:1195
+#: wt-status.c:1210
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:1198
+#: wt-status.c:1213
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:1200
+#: wt-status.c:1215
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"
-#: wt-status.c:1204
+#: wt-status.c:1219
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:1207
+#: wt-status.c:1222
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:1216
+#: wt-status.c:1233
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:1219
+#: wt-status.c:1236
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:1223
+#: wt-status.c:1241
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:1225
+#: wt-status.c:1243
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:1227
+#: wt-status.c:1246
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (använd \"git am --allow-empty\" för att registrera patchen som en tom "
+"incheckning)"
+
+#: wt-status.c:1248
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:1360
+#: wt-status.c:1381
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo saknas."
-#: wt-status.c:1362
+#: wt-status.c:1383
msgid "No commands done."
msgstr "Inga kommandon utförda."
-#: wt-status.c:1365
+#: wt-status.c:1386
#, 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):"
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Sista kommandot utfört (%<PRIuMAX> kommando utfört):"
+msgstr[1] "Sista kommandot utfört (%<PRIuMAX> kommandon utfört):"
-#: wt-status.c:1376
+#: wt-status.c:1397
#, c-format
msgid " (see more in file %s)"
msgstr " (se fler i filen %s)"
-#: wt-status.c:1381
+#: wt-status.c:1402
msgid "No commands remaining."
msgstr "Inga kommandon återstår."
-#: wt-status.c:1384
+#: wt-status.c:1405
#, 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):"
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Nästa kommando att utföra (%<PRIuMAX> kommando återstår):"
+msgstr[1] "Följande kommandon att utföra (%<PRIuMAX> kommandon återstår):"
-#: wt-status.c:1392
+#: wt-status.c:1413
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:1404
+#: wt-status.c:1425
#, 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:1409
+#: wt-status.c:1430
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:1422
+#: wt-status.c:1443
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:1424
+#: wt-status.c:1445
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:1426
+#: wt-status.c:1447
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:1433
+#: wt-status.c:1454
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:1437
+#: wt-status.c:1458
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9866,159 +10305,159 @@
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1442
+#: wt-status.c:1463
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:1445
+#: wt-status.c:1466
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:1449
+#: wt-status.c:1470
#, 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:1454
+#: wt-status.c:1475
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:1457
+#: wt-status.c:1478
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:1459
+#: wt-status.c:1480
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:1470
+#: wt-status.c:1491
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick pågår."
-#: wt-status.c:1473
+#: wt-status.c:1494
#, 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:1480
+#: wt-status.c:1501
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: wt-status.c:1483
+#: wt-status.c:1504
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)"
-#: wt-status.c:1486
+#: wt-status.c:1507
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: wt-status.c:1488
+#: wt-status.c:1509
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:1490
+#: wt-status.c:1511
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:1500
+#: wt-status.c:1521
msgid "Revert currently in progress."
msgstr "Ångring pågår."
-#: wt-status.c:1503
+#: wt-status.c:1524
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:1509
+#: wt-status.c:1530
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:1512
+#: wt-status.c:1533
msgid " (run \"git revert --continue\" to continue)"
msgstr " (kör \"git revert --continue\" för att fortsätta)"
-#: wt-status.c:1515
+#: wt-status.c:1536
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:1517
+#: wt-status.c:1538
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (använd \"git revert --skip\" för att hoppa över patchen)"
-#: wt-status.c:1519
+#: wt-status.c:1540
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:1529
+#: wt-status.c:1550
#, 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:1533
+#: wt-status.c:1554
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1536
+#: wt-status.c:1557
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:1547
+#: wt-status.c:1568
msgid "You are in a sparse checkout."
msgstr "Du är i en gles utcheckning."
-#: wt-status.c:1550
+#: wt-status.c:1571
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats."
-#: wt-status.c:1794
+#: wt-status.c:1815
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1801
+#: wt-status.c:1822
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå "
-#: wt-status.c:1803
+#: wt-status.c:1824
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå "
-#: wt-status.c:1808
+#: wt-status.c:1829
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:1810
+#: wt-status.c:1831
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:1813
+#: wt-status.c:1834
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1830
+#: wt-status.c:1851
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1831
+#: wt-status.c:1852
msgid "No commits yet"
msgstr "Inga incheckningar ännu"
-#: wt-status.c:1845
+#: wt-status.c:1866
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1847
+#: wt-status.c:1868
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1851
+#: wt-status.c:1872
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10030,32 +10469,32 @@
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1857
+#: wt-status.c:1878
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1859
+#: wt-status.c:1880
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1865
+#: wt-status.c:1886
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1870
+#: wt-status.c:1891
#, 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:1874
+#: wt-status.c:1895
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1878
+#: wt-status.c:1899
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -10064,218 +10503,227 @@
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1882
+#: wt-status.c:1903
#, 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:1886
+#: wt-status.c:1907
#, 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:1890 wt-status.c:1896
+#: wt-status.c:1911 wt-status.c:1917
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1893
+#: wt-status.c:1914
#, 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:1898
+#: wt-status.c:1919
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:2003
+#: wt-status.c:2024
msgid "No commits yet on "
msgstr "Inga incheckningar ännu på "
-#: wt-status.c:2007
+#: wt-status.c:2028
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:2038
+#: wt-status.c:2059
msgid "different"
msgstr "olika"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2061 wt-status.c:2069
msgid "behind "
msgstr "efter "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2064 wt-status.c:2067
msgid "ahead "
msgstr "före "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2605
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "kan inte %s: Du har oköade ändringar."
-#: wt-status.c:2575
+#: wt-status.c:2611
msgid "additionally, your index contains uncommitted changes."
msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
-#: wt-status.c:2577
+#: wt-status.c:2613
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "kunde inte sända IPC-kommando"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "kunde inte läsa IPC-svar"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "kunde inte ta status \"accept_thread\" \"%s\""
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "kunde inte starta \"worker[0]\" för \"%s\""
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:353
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
+#: compat/fsmonitor/fsm-listen-darwin.c:355
+msgid "Unable to create FSEventStream."
+msgstr "kunde inte skapa FSEventStream."
+
+#: compat/fsmonitor/fsm-listen-darwin.c:403
+msgid "Failed to start the FSEventStream"
+msgstr "Misslyckades starta FSEventStream:en"
+
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<flaggor>] [--] <sökväg>..."
-#: builtin/add.c:61
+#: builtin/add.c:63
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "kan inte utföra chmod %cx \"%s\""
-#: builtin/add.c:99
+#: builtin/add.c:105
#, c-format
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:110 builtin/commit.c:299
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
-#: builtin/add.c:114
+#: builtin/add.c:120
#, c-format
msgid "remove '%s'\n"
msgstr "ta bort \"%s\"\n"
-#: builtin/add.c:198
+#: builtin/add.c:204
msgid "Unstaged changes after refreshing the index:"
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:312 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Kunde inte öppna \"%s\" för skrivning."
-
-#: builtin/add.c:322
+#: builtin/add.c:325
msgid "Could not write patch"
msgstr "Kunde inte skriva patch"
-#: builtin/add.c:325
+#: builtin/add.c:328
msgid "editing patch failed"
msgstr "redigering av patch misslyckades"
-#: builtin/add.c:328
+#: builtin/add.c:331
#, c-format
msgid "Could not stat '%s'"
msgstr "Kunde inte ta status på \"%s\""
-#: builtin/add.c:330
+#: builtin/add.c:333
msgid "Empty patch. Aborted."
msgstr "Tom patch. Avbryter."
-#: builtin/add.c:335
+#: builtin/add.c:339
#, c-format
msgid "Could not apply '%s'"
msgstr "Kunde inte tillämpa \"%s\""
-#: builtin/add.c:343
+#: builtin/add.c:347
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:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:366
+#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "var pratsam"
+
+#: builtin/add.c:370
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
-#: builtin/add.c:368
+#: builtin/add.c:372
msgid "edit current diff and apply"
msgstr "redigera aktuell diff och applicera"
-#: builtin/add.c:369
+#: builtin/add.c:373
msgid "allow adding otherwise ignored files"
msgstr "tillåt lägga till annars ignorerade filer"
-#: builtin/add.c:370
+#: builtin/add.c:374
msgid "update tracked files"
msgstr "uppdatera spårade filer"
-#: builtin/add.c:371
+#: builtin/add.c:375
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
-#: builtin/add.c:372
+#: builtin/add.c:376
msgid "record only the fact that the path will be added later"
msgstr "registrera endast att sökvägen kommer läggas till senare"
-#: builtin/add.c:373
+#: builtin/add.c:377
msgid "add changes from all tracked and untracked files"
msgstr "lägg till ändringar från alla spårade och ospårade filer"
-#: builtin/add.c:376
+#: builtin/add.c:380
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:382
msgid "don't add, only refresh the index"
msgstr "lägg inte till, uppdatera endast indexet"
-#: builtin/add.c:379
+#: builtin/add.c:383
msgid "just skip files which cannot be added because of errors"
msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"
-#: builtin/add.c:380
+#: builtin/add.c:384
msgid "check if - even missing - files are ignored in dry run"
msgstr "se om - även saknade - filer ignoreras i testkörning"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "tillåt uppdatera poster utanför området angivet i \"sparse-checkout\""
+
+#: builtin/add.c:387 builtin/update-index.c:1023
msgid "override the executable bit of the listed files"
msgstr "överstyr exekveringsbiten för angivna filer"
-#: builtin/add.c:384
+#: builtin/add.c:389
msgid "warn when adding an embedded repository"
msgstr "varna när ett inbyggt arkiv läggs till"
-#: builtin/add.c:386
-msgid "backend for `git stash -p`"
-msgstr "bakända för \"git stash -p\""
-
-#: builtin/add.c:404
+#: builtin/add.c:407
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10306,12 +10754,12 @@
"\n"
"Se \"git help submodule\" för ytterligare information."
-#: builtin/add.c:432
+#: builtin/add.c:436
#, c-format
msgid "adding embedded git repository: %s"
msgstr "lägger till inbäddat git-arkiv: %s"
-#: builtin/add.c:451
+#: builtin/add.c:456
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10321,51 +10769,27 @@
"Slå av detta meddelande med\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:471
msgid "adding files failed"
msgstr "misslyckades lägga till filer"
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run är inkompatibelt med --interactive/--patch"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file är inkompatibelt med --edit"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A och -u är ömsesidigt inkompatibla"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
-
-#: builtin/add.c:526
+#: builtin/add.c:534
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
-msgstr "--chmod parametern \"%s\" måste antingen vara -x eller +x"
+msgstr "\"--chmod\"-parametern \"%s\" måste antingen vara -x eller +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
+#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
+#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "\"%s\" kan inte användas tillsammans med sökvägsangivelser"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul kräver --pathspec-from-file"
-
-#: builtin/add.c:555
+#: builtin/add.c:566
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/add.c:557
+#: builtin/add.c:568
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10375,109 +10799,112 @@
"Slå av detta meddelande genom att köra\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:393
msgid "could not parse author script"
msgstr "kunde inte tolka författarskript"
-#: builtin/am.c:455
+#: builtin/am.c:483
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "\"%s\" togs bort av kroken applypatch-msg"
-#: builtin/am.c:497
+#: builtin/am.c:525
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Felaktig indatarad: \"%s\"."
-#: builtin/am.c:535
+#: builtin/am.c:563
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-#: builtin/am.c:561
+#: builtin/am.c:589
msgid "fseek failed"
msgstr "\"fseek\" misslyckades"
-#: builtin/am.c:749
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "kunde inte tolka patchen \"%s\""
-#: builtin/am.c:814
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
-#: builtin/am.c:862
+#: builtin/am.c:890
msgid "invalid timestamp"
msgstr "ogiltig tidsstämpel"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:895 builtin/am.c:907
msgid "invalid Date line"
msgstr "ogiltig \"Date\"-rad"
-#: builtin/am.c:874
+#: builtin/am.c:902
msgid "invalid timezone offset"
msgstr "ogiltig tidszons-offset"
-#: builtin/am.c:967
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:1000 builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/am.c:977
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:1126
+#: builtin/am.c:1154
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "När du har löst problemet, kör \"%s --continue\"."
-#: builtin/am.c:1127
+#: builtin/am.c:1155
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."
-#: builtin/am.c:1128
+#: builtin/am.c:1160
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"För att registrera den tomma patchen som en tom incheckning, kör \"%s --"
+"allow-empty\"."
+
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."
-#: builtin/am.c:1223
+#: builtin/am.c:1257
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats."
-#: builtin/am.c:1251
-msgid "Patch is empty."
-msgstr "Patchen är tom."
-
-#: builtin/am.c:1316
+#: builtin/am.c:1345
#, c-format
msgid "missing author line in commit %s"
msgstr "saknad \"author\"-rad i incheckningen %s"
-#: builtin/am.c:1319
+#: builtin/am.c:1348
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ogiltig ident-rad: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1567
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: builtin/am.c:1540
+#: builtin/am.c:1569
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1559
+#: builtin/am.c:1588
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10485,25 +10912,25 @@
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1565
+#: builtin/am.c:1594
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1591
+#: builtin/am.c:1620
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1623
+#: builtin/am.c:1652
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1704 builtin/am.c:1708
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1697
+#: builtin/am.c:1726
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
@@ -10511,41 +10938,59 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1736
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1782 builtin/commit.c:410
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1757
+#: builtin/am.c:1786
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1828
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Hoppar över: %.*s"
+
+#: builtin/am.c:1833
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Skapar en tom incheckningar: %.*s"
+
+#: builtin/am.c:1837
+msgid "Patch is empty."
+msgstr "Patchen är tom."
+
+#: builtin/am.c:1848 builtin/am.c:1917
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1865
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1820
+#: builtin/am.c:1871
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1875
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:1868
+#: builtin/am.c:1921
+msgid "No changes - recorded it as an empty commit."
+msgstr "Inga ändringar - sparat som en tom incheckning."
+
+#: builtin/am.c:1923
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10555,7 +11000,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:1875
+#: builtin/am.c:1931
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10567,17 +11012,17 @@
"lösta.\n"
"Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
+#: builtin/reset.c:463
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet \"%s\"."
-#: builtin/am.c:2034
+#: builtin/am.c:2091 builtin/am.c:2167
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2078
+#: builtin/am.c:2135
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10585,159 +11030,158 @@
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2185
+#: builtin/am.c:2292
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Felaktigt värde för --patch-format: %s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "flaggorna \"%s=%s\" och \"%s=%s\" kan inte användas samtidigt"
-#: builtin/am.c:2227
-#, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr "Felaktigt värde för --show-current-patch: %s"
-
-#: builtin/am.c:2231
-#, 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:2262
+#: builtin/am.c:2323
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2324
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2330
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2271
+#: builtin/am.c:2332
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2273
+#: builtin/am.c:2334
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:646 builtin/stash.c:946
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2276
+#: builtin/am.c:2337
msgid "add a Signed-off-by trailer to the commit message"
msgstr "lägg till \"Signed-off-by\"-släprad i incheckningsmeddelandet"
-#: builtin/am.c:2279
+#: builtin/am.c:2340
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2281
+#: builtin/am.c:2342
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2283
+#: builtin/am.c:2344
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2285
+#: builtin/am.c:2346
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2287
+#: builtin/am.c:2348
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:2290
+#: builtin/am.c:2351
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:2293
+#: builtin/am.c:2354
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2295
+#: builtin/am.c:2356
msgid "pass it through git-mailinfo"
msgstr "sänd det genom git-mailinfo"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
+#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
+#: builtin/am.c:2386
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
+#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
+#: parse-options.h:348
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
-#: builtin/verify-tag.c:38
+#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
+#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
+#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
+#: builtin/tag.c:480 builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2322
+#: builtin/am.c:2383
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2328
+#: builtin/am.c:2389
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2330
+#: builtin/am.c:2391
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2333
+#: builtin/am.c:2394
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2336
+#: builtin/am.c:2397
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2339
+#: builtin/am.c:2400
msgid "restore the original branch and abort the patching operation"
msgstr "återställ originalgrenen och avbryt patchningen"
-#: builtin/am.c:2342
+#: builtin/am.c:2403
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:2346
+#: builtin/am.c:2407
msgid "show the patch being applied"
msgstr "visa patchen som tillämpas"
-#: builtin/am.c:2351
+#: builtin/am.c:2411
+msgid "record the empty patch as an empty commit"
+msgstr "lagra den tomma patchen som en tom incheckning"
+
+#: builtin/am.c:2415
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2353
+#: builtin/am.c:2417
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
+#: builtin/revert.c:117 builtin/tag.c:461
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2420 builtin/rebase.c:1128
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2359
+#: builtin/am.c:2423
+msgid "how to handle empty patches"
+msgstr "hantering av tomma patchar"
+
+#: builtin/am.c:2426
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2377
+#: builtin/am.c:2444
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."
@@ -10745,16 +11189,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:2384
+#: builtin/am.c:2451
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2399
+#: builtin/am.c:2466
#, 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:2423
+#: builtin/am.c:2490
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10763,11 +11207,11 @@
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2429
+#: builtin/am.c:2496
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
-#: builtin/am.c:2439
+#: builtin/am.c:2506
msgid "interactive mode requires patches on the command line"
msgstr "interaktivt läge kräver patchar på kommandoraden"
@@ -10775,53 +11219,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<flaggor>] [<patch>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "kunde inte skapa arkivfilen \"%s\""
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "kunde inte omdirigera utdata"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Fjärr utan URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: förväntade ACK/NAK, fick flush-paket"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: protokollfel"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: förväntade en tömning (flush)"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<incheckning>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <term-för-rätt> <term-för-fel> <eterm>"
-
-#: builtin/bisect--helper.c:25
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-
#: builtin/bisect--helper.c:26
msgid ""
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
@@ -10832,10 +11258,6 @@
"=<term>] [--no-checkout] [--first-parent] [<dålig> [<bra>...]] [--] "
"[<sökvägar>...]"
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-next"
-
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
msgstr "git bisect--helper --bisect-state (bad|new) [<incheckning>]"
@@ -10852,46 +11274,55 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<incheckning>|<intervall>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <kommando>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "kan inte kopiera filen \"%s\" i läget \"%s\""
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "kunde inte skriva till filen \"%s\""
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "kan inte öppna filen \"%s\" för läsning"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "\"%s\" är inte en giltig term"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "kan inte använda det inbyggda kommandot \"%s\" som term"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "kan inte ändra betydelsen av termen \"%s\""
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "termerna måste vara olika"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "Vi utför ingen bisect för tillfället.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "\"%s\" är inte en giltig incheckning"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10899,27 +11330,27 @@
"Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset "
"<incheckning>\"."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Felaktigt argument till bisect_write: %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "kan inte läsa oid för referensen \"%s\""
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "kunde inte öppna filen \"%s\""
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Ogiltigt kommando: du utför just nu en \"bisect\" med %s/%s."
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10928,7 +11359,7 @@
"Du måste ange åtminstone en %s och en %s version.\n"
"(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)"
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10939,7 +11370,7 @@
"Du måste sedan ange åtminstone en %s och en %s version.\n"
"(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)"
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "utför bisect med endast en %s incheckning"
@@ -10948,15 +11379,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Är du säker [Y=ja/N=nej]? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "inga termer angivna"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10965,7 +11396,7 @@
"Aktuella termer är %s för det gamla tillståndet\n"
"och %s för det nya tillståndet.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10974,54 +11405,54 @@
"ogiltigt argument %s för \"git bisect terms\".\n"
"Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "misslyckades starta revisionstraversering\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "kunde inte öppna \"%s\" för tillägg"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "\"\" är inte en giltig term"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "okänd flagga: %s"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "\"%s\" verkar inte vara en giltig revision"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "felaktigt HEAD - Jag behöver ett HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"."
# cogito-relaterat
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "felaktigt HEAD - konstig symbolisk referens"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "ogiltig referens: \"%s\""
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Du måste starta med \"git bisect start\"\n"
@@ -11029,104 +11460,161 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]? "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Anropa \"--bisect-state\" med minst ett argument."
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "\"git bisect %s\" kan bara ta ett argument."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Felaktig rev-indata: %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Felaktig rev-indata (ej incheckning): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Vi utför ingen bisect för tillfället."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "\"%s\"?? vad menar du?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "kan inte läsa filen \"%s\" för återuppspelning"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#, c-format
+msgid "running %s\n"
+msgstr "kör %s\n"
+
+#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+msgid "bisect run failed: no command provided."
+msgstr "bisect-körning misslyckades: inget kommando gavs."
+
+#: builtin/bisect--helper.c:1166
+#, c-format
+msgid "unable to verify '%s' on good revision"
+msgstr "kan inte bekräfta \"%s\" på bra revision"
+
+#: builtin/bisect--helper.c:1172
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr "falsk slutkod %d för bra revision"
+
+#: builtin/bisect--helper.c:1180
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"\"bisect\"-körningen misslyckades: felkod %d från \"%s\" är < 0 eller >= 128"
+
+#: builtin/bisect--helper.c:1195
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "kan inte öppna \"%s\" för skrivning"
+
+#: builtin/bisect--helper.c:1213
+msgid "bisect run cannot continue any more"
+msgstr "\"bisect\"-körningen kan inte fortsätta längre"
+
+#: builtin/bisect--helper.c:1215
+#, c-format
+msgid "bisect run success"
+msgstr "\"bisect\"-körningen lyckades"
+
+#: builtin/bisect--helper.c:1218
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "bisect hittade första trasiga incheckning"
+
+#: builtin/bisect--helper.c:1221
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"\"bisect\"-körningen misslyckades: \"git bisect--helper --bisect-state %s\" "
+"avslutades med felkoden %d"
+
+#: builtin/bisect--helper.c:1253
msgid "reset the bisection state"
msgstr "återställ bisect-tillstånd"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1255
msgid "check whether bad or good terms exist"
msgstr "se efter om termer för rätt och fel finns"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1257
msgid "print out the bisect terms"
msgstr "skriv ut termer för bisect"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1259
msgid "start the bisect session"
msgstr "påbörja bisect-körningen"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1261
msgid "find the next bisection commit"
msgstr "hitta nästa incheckning i bisect"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1263
msgid "mark the state of ref (or refs)"
msgstr "markera tillståndet för en eller flera referenser"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1265
msgid "list the bisection steps so far"
msgstr "lista \"bisect\"-stegen som utförts så långt"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1267
msgid "replay the bisection process from the given file"
msgstr "spela upp \"bisect\"-processen från angiven fil"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1269
msgid "skip some commits for checkout"
msgstr "hoppa över ett par incheckningar"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1271
+msgid "visualize the bisection"
+msgstr "visualisera \"bisect\"-körningen"
+
+#: builtin/bisect--helper.c:1273
+msgid "use <cmd>... to automatically bisect"
+msgstr "använd <kommando>... för att utföra \"bisect\" automatiskt"
+
+#: builtin/bisect--helper.c:1275
msgid "no log for BISECT_WRITE"
msgstr "ingen logg för BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1290
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset kräver antingen inget argument eller en incheckning"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check kräver 2 eller 3 argument"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1295
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms kräver noll eller ett argument"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1304
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next kräver 0 argument"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1315
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log kräver 0 argument"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1320
msgid "no logfile given"
msgstr "ingen loggfil angiven"
@@ -11138,150 +11626,143 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "förväntade en färg: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "måste sluta med en färg"
-#: builtin/blame.c:728
-#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "felaktig färg \"%s\" i color.blame.repeatedLines"
-
-#: builtin/blame.c:746
-msgid "invalid value for blame.coloring"
-msgstr "ogiltigt värde för blame.coloring"
-
-#: builtin/blame.c:845
+#: builtin/blame.c:842
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "kan inte hitta revision %s att ignorera"
-#: builtin/blame.c:867
+#: builtin/blame.c:864
msgid "show blame entries as we find them, incrementally"
msgstr "visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:868
+#: builtin/blame.c:865
msgid "do not show object names of boundary commits (Default: off)"
msgstr "visa inte objektnamn för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:869
+#: builtin/blame.c:866
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "vehandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:870
+#: builtin/blame.c:867
msgid "show work cost statistics"
msgstr "visa statistik över arbetskostnad"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
+#: builtin/remote.c:683 builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/blame.c:872
+#: builtin/blame.c:869
msgid "show output score for blame entries"
msgstr "visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:873
+#: builtin/blame.c:870
msgid "show original filename (Default: auto)"
msgstr "visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:874
+#: builtin/blame.c:871
msgid "show original linenumber (Default: off)"
msgstr "visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:875
+#: builtin/blame.c:872
msgid "show in a format designed for machine consumption"
msgstr "visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:876
+#: builtin/blame.c:873
msgid "show porcelain format with per-line commit information"
msgstr "visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:877
+#: builtin/blame.c:874
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "använd samma utdataläge som git-annotate (Standard: av)"
-#: builtin/blame.c:878
+#: builtin/blame.c:875
msgid "show raw timestamp (Default: off)"
msgstr "visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:879
+#: builtin/blame.c:876
msgid "show long commit SHA1 (Default: off)"
msgstr "visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:880
+#: builtin/blame.c:877
msgid "suppress author name and timestamp (Default: off)"
msgstr "undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:881
+#: builtin/blame.c:878
msgid "show author email instead of name (Default: off)"
msgstr "visa författarens e-post istället för namn (Standard: av)"
-#: builtin/blame.c:882
+#: builtin/blame.c:879
msgid "ignore whitespace differences"
msgstr "ignorera ändringar i blanksteg"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:880 builtin/log.c:1857
msgid "rev"
msgstr "incheckning"
-#: builtin/blame.c:883
+#: builtin/blame.c:880
msgid "ignore <rev> when blaming"
msgstr "ignorera <incheckning> vid klandringen"
-#: builtin/blame.c:884
+#: builtin/blame.c:881
msgid "ignore revisions from <file>"
msgstr "ignorera incheckningar från <fil>"
-#: builtin/blame.c:885
+#: builtin/blame.c:882
msgid "color redundant metadata from previous line differently"
msgstr "färglägg redundant metadata från tidigare rader annorlunda"
-#: builtin/blame.c:886
+#: builtin/blame.c:883
msgid "color lines by age"
msgstr "färglägg rader efter ålder"
-#: builtin/blame.c:887
+#: builtin/blame.c:884
msgid "spend extra cycles to find better match"
msgstr "slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:888
+#: builtin/blame.c:885
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "använd revisioner från <fil> istället för att anropa git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:886
msgid "use <file>'s contents as the final image"
msgstr "använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:887 builtin/blame.c:888
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:890
+#: builtin/blame.c:887
msgid "find line copies within and across files"
msgstr "hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:891
+#: builtin/blame.c:888
msgid "find line movements within and across files"
msgstr "hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:892
+#: builtin/blame.c:889
msgid "range"
msgstr "intervall"
-#: builtin/blame.c:893
+#: builtin/blame.c:890
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
"behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>"
-#: builtin/blame.c:945
+#: builtin/blame.c:949
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress kan inte användas med --incremental eller porslinsformat"
@@ -11293,18 +11774,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:1000
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1116
#, 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:1157
+#: builtin/blame.c:1161
msgid "Blaming lines"
msgstr "Klandra rader"
@@ -11313,30 +11794,37 @@
msgstr "git branch [<flaggor>] [-r | -a] [--merged] [--no-merged]"
#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr ""
+"git branch [<flaggor>] [-f] [--recurse-submodules] <grennamn> [<startpunkt>]"
#: builtin/branch.c:31
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<flaggor>] [-l] [<mönster>...]"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..."
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"
-#: builtin/branch.c:33
+#: builtin/branch.c:34
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<flaggor>] (-c | -C) [<gammal_gren>] <ny_gren>"
-#: builtin/branch.c:34
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"
-#: builtin/branch.c:35
+#: builtin/branch.c:36
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<flaggor>] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:165
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -11345,7 +11833,7 @@
"tar bort grenen \"%s\" som har slagits ihop med\n"
" \"%s\", men ännu inte slagits ihop med HEAD."
-#: builtin/branch.c:158
+#: builtin/branch.c:169
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -11354,12 +11842,12 @@
"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
" \"%s\", trots att den har slagits ihop med HEAD."
-#: builtin/branch.c:172
+#: builtin/branch.c:183
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
-#: builtin/branch.c:176
+#: builtin/branch.c:187
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -11368,112 +11856,112 @@
"Grenen \"%s\" har inte slagits samman i sin helhet.\n"
"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
-#: builtin/branch.c:189
+#: builtin/branch.c:200
msgid "Update of config-file failed"
msgstr "Misslyckades uppdatera konfigurationsfil"
-#: builtin/branch.c:223
+#: builtin/branch.c:235
msgid "cannot use -a with -d"
msgstr "kan inte ange -a med -d"
-#: builtin/branch.c:230
+#: builtin/branch.c:242
msgid "Couldn't look up commit object for HEAD"
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
-#: builtin/branch.c:244
+#: builtin/branch.c:259
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""
-#: builtin/branch.c:259
+#: builtin/branch.c:274
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "fjärrspårande grenen \"%s\" hittades inte."
-#: builtin/branch.c:260
+#: builtin/branch.c:275
#, c-format
msgid "branch '%s' not found."
msgstr "grenen \"%s\" hittades inte."
-#: builtin/branch.c:291
+#: builtin/branch.c:306
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:307
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:457 builtin/tag.c:64
msgid "unable to parse format string"
msgstr "kan inte tolka formatsträng"
-#: builtin/branch.c:471
+#: builtin/branch.c:488
msgid "could not resolve HEAD"
msgstr "kunde inte slå upp HEAD"
-#: builtin/branch.c:477
+#: builtin/branch.c:494
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) pekar utenför refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:509
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Grenen %s ombaseras på %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:513
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Grenen %s är i en \"bisect\" på %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:530
msgid "cannot copy the current branch while not on any."
msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:515
+#: builtin/branch.c:532
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:526
+#: builtin/branch.c:543
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:555
+#: builtin/branch.c:572
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:557
+#: builtin/branch.c:574
msgid "Branch copy failed"
msgstr "Misslyckades kopiera gren"
-#: builtin/branch.c:561
+#: builtin/branch.c:578
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:564
+#: builtin/branch.c:581
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:570
+#: builtin/branch.c:587
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:579
+#: builtin/branch.c:596
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:581
+#: builtin/branch.c:598
msgid "Branch is copied, but update of config-file failed"
msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:597
+#: builtin/branch.c:614
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11484,211 +11972,224 @@
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:633
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
-#: builtin/branch.c:634
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "ställ in spårningsläge (se git-pull(1))"
+#: builtin/branch.c:656 builtin/checkout.c:1571
+#: builtin/submodule--helper.c:3077
+msgid "set branch tracking configuration"
+msgstr "ställ in inställningar för spårad gren"
-#: builtin/branch.c:637
+#: builtin/branch.c:659
msgid "do not use"
msgstr "använd ej"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:661
msgid "upstream"
msgstr "uppströms"
-#: builtin/branch.c:639
+#: builtin/branch.c:661
msgid "change the upstream info"
msgstr "ändra uppströmsinformationen"
-#: builtin/branch.c:640
+#: builtin/branch.c:662
msgid "unset the upstream info"
msgstr "ta bort uppströmsinformationen"
-#: builtin/branch.c:641
+#: builtin/branch.c:663
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:642
+#: builtin/branch.c:664
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:666 builtin/branch.c:668
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:667 builtin/branch.c:669
msgid "print only branches that don't contain the commit"
msgstr "visa endast grenar som inte innehåller incheckningen"
-#: builtin/branch.c:650
+#: builtin/branch.c:672
msgid "Specific git-branch actions:"
-msgstr "Specifika git-branch åtgärder:"
+msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:651
+#: builtin/branch.c:673
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:653
+#: builtin/branch.c:675
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:654
+#: builtin/branch.c:676
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:655
+#: builtin/branch.c:677
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:656
+#: builtin/branch.c:678
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:657
+#: builtin/branch.c:679
msgid "copy a branch and its reflog"
msgstr "kopiera en gren och dess reflogg"
-#: builtin/branch.c:658
+#: builtin/branch.c:680
msgid "copy a branch, even if target exists"
msgstr "kopiera en gren, även om målet finns"
-#: builtin/branch.c:659
+#: builtin/branch.c:681
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:660
+#: builtin/branch.c:682
msgid "show current branch name"
msgstr "visa namn på aktuell gren"
-#: builtin/branch.c:661
+#: builtin/branch.c:683 builtin/submodule--helper.c:3075
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:663
+#: builtin/branch.c:685
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:664
+#: builtin/branch.c:686
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:665
+#: builtin/branch.c:687
msgid "print only branches that are merged"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:666
+#: builtin/branch.c:688
msgid "print only branches that are not merged"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:667
+#: builtin/branch.c:689
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:476
msgid "object"
msgstr "objekt"
-#: builtin/branch.c:670
+#: builtin/branch.c:692
msgid "print only branches of the object"
msgstr "visa endast grenar för objektet"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
msgid "sorting and filtering are case insensitive"
msgstr "sortering och filtrering skiljer gemener och VERSALER"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:694 builtin/ls-files.c:667
+msgid "recurse through submodules"
+msgstr "rekursera ner i undermoduler"
+
+#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
+#: builtin/tag.c:481 builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format att använda för utdata"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:718 builtin/clone.c:684
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column och --verbose är inkompatibla"
+#: builtin/branch.c:739
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
+"gren med --recurse-submodules kan endast användas om submodule."
+"propagateBranches har aktiverats"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:741
+msgid "--recurse-submodules can only be used to create branches"
+msgstr "--recurse-submodules jan endast användas för att skapa grenar"
+
+#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:766
+#: builtin/branch.c:802
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:771
+#: builtin/branch.c:807
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:778
+#: builtin/branch.c:814
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu."
-#: builtin/branch.c:781
+#: builtin/branch.c:817
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:796
+#: builtin/branch.c:832
msgid "too many branches for a copy operation"
msgstr "för många grenar för kopiering"
-#: builtin/branch.c:805
+#: builtin/branch.c:841
msgid "too many arguments for a rename operation"
msgstr "för många flaggor för namnbyte"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "too many arguments to set new upstream"
msgstr "för många flaggor för att byta uppström"
-#: builtin/branch.c:814
+#: builtin/branch.c:850
#, 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:817 builtin/branch.c:840
+#: builtin/branch.c:853 builtin/branch.c:873
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:821
+#: builtin/branch.c:857
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:834
+#: builtin/branch.c:867
msgid "too many arguments to unset upstream"
msgstr "för många flaggor för att ta bort uppström"
-#: builtin/branch.c:838
+#: builtin/branch.c:871
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:844
+#: builtin/branch.c:877
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:854
+#: builtin/branch.c:890
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>?"
@@ -11696,7 +12197,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:858
+#: builtin/branch.c:894
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11704,32 +12205,32 @@
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
"eller --set-upstream-to istället."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "git version:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() misslyckades med felet \"%s\" (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "kompilatorinfo:"
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "libc-info:"
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "körs inte från ett git-arkiv - inga krokar att visa\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11765,38 +12266,33 @@
"Se över resten av felrapporten nedan.\n"
"Du kan ta bort rader du inte vill dela.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "ange mål för buggrapporteringsfilen"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "ange ett filändelse i strftime-format"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Systeminfo"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Aktiverade krokar"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "kunde inte skapa filen på \"%s\""
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "kunde inte skriva till %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Skapade ny rapport på \"%s\"\n"
@@ -11817,136 +12313,250 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <fil> [<refnamn>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3899
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3903
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3906
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
-msgstr "ange formatversion för paket (bundle)."
+msgstr "ange formatversion för bunten."
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
-msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
+msgstr "Behöver ett arkiv för att skapa en bunt."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:108
msgid "do not show bundle details"
-msgstr "visa inte paketdetaljer"
+msgstr "visa inte buntdetaljer"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:127
#, c-format
msgid "%s is okay\n"
msgstr "%s är okej\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:183
msgid "Need a repository to unbundle."
-msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
+msgstr "Behöver ett arkiv för att packa upp en bunt."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "var pratsam; måste skrivas före ett underkommando"
+#: builtin/bundle.c:186
+msgid "Unbundling objects"
+msgstr "Packar upp objektbunt"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:220 builtin/remote.c:1758
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Okänt underkommando: %s"
-#: builtin/cat-file.c:596
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
-msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
+#: builtin/cat-file.c:568
+msgid "flush is only for --buffer mode"
+msgstr "flush är endast till för --buffer-läge"
-#: builtin/cat-file.c:597
-msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
-msgstr ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
+#: builtin/cat-file.c:612
+msgid "empty command in input"
+msgstr "tomt kommando i indata"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:614
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "blanksteg före kommando: \"%s\""
+
+#: builtin/cat-file.c:623
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s kräver ett argument"
+
+#: builtin/cat-file.c:628
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s tar inget argument"
+
+#: builtin/cat-file.c:636
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "okänt kommando: \"%s\""
+
+#: builtin/cat-file.c:795
msgid "only one batch option may be specified"
msgstr "endast en buntflagga kan anges"
-#: builtin/cat-file.c:636
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<typ> kan vara en av: blob, tree, commit, tag"
+#: builtin/cat-file.c:824
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <typ> <objekt>"
-#: builtin/cat-file.c:637
-msgid "show object type"
-msgstr "visa objekttyp"
+#: builtin/cat-file.c:825
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git cat-file (-e | -p) <objekt>"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:826
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objekt>"
+
+#: builtin/cat-file.c:827
+msgid ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+
+#: builtin/cat-file.c:830
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
+"git cat-file (--textconv | --filters)\n"
+" [<revision>:<sökväg|träd-igt> | --path=<sökväg|träd-igt> "
+"<revision>]"
+
+#: builtin/cat-file.c:836
+msgid "Check object existence or emit object contents"
+msgstr "Kontrollera om objektet finns eller mata ut objektets innehåll"
+
+#: builtin/cat-file.c:838
+msgid "check if <object> exists"
+msgstr "kontrollera om <objekt> finns"
+
+#: builtin/cat-file.c:839
+msgid "pretty-print <object> content"
+msgstr "visa <objekt>-innehåll snyggt"
+
+#: builtin/cat-file.c:841
+msgid "Emit [broken] object attributes"
+msgstr "Skriv ut [trasiga] objektattribut"
+
+#: builtin/cat-file.c:842
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr "visa objekttyp (en av: \"blob\", \"tree\", \"commit\", \"tag\", ...)"
+
+#: builtin/cat-file.c:843
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:640
-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:641
-msgid "pretty-print object's content"
-msgstr "visa objektets innehåll snyggt"
-
-#: builtin/cat-file.c:643
-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:645
-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:646
-msgid "blob"
-msgstr "blob"
-
-#: builtin/cat-file.c:647
-msgid "use a specific path for --textconv/--filters"
-msgstr "använd specifik sökväg för --textconv/--filters"
-
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:845
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:650
+#: builtin/cat-file.c:847
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr "Buntobjekt ombeds på standard in (eller --batch-all-objects)"
+
+#: builtin/cat-file.c:849
+msgid "show full <object> or <rev> contents"
+msgstr "visa komplett innehåll för <objekt> eller <rev>"
+
+#: builtin/cat-file.c:853
+msgid "like --batch, but don't emit <contents>"
+msgstr "som --batch, men mata inte ut <innehåll>"
+
+#: builtin/cat-file.c:857
+msgid "read commands from stdin"
+msgstr "läs kommandon från standard in"
+
+#: builtin/cat-file.c:861
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr "med --batch[-check]: ignorear standard in, buntar alla kända objekt"
+
+#: builtin/cat-file.c:863
+msgid "Change or optimize batch output"
+msgstr "Ändra eller optimera buntutdata"
+
+#: builtin/cat-file.c:864
msgid "buffer --batch output"
msgstr "buffra utdata från --batch"
-#: builtin/cat-file.c:652
-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:866
+msgid "follow in-tree symlinks"
+msgstr "följ symboliska länkar inom trädet"
-#: builtin/cat-file.c:656
-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:868
+msgid "do not order objects before emitting them"
+msgstr "sortera inte objekt innan de matas ut"
-#: builtin/cat-file.c:660
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: builtin/cat-file.c:870
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
msgstr ""
-"följ symboliska länkar i trädet (använd med --batch eller --batch-check)"
+"Mata ut objekt (blob eller träd) med konvertering eller filter (fristående "
+"eller med bunt)"
-#: builtin/cat-file.c:662
-msgid "show all objects with --batch or --batch-check"
-msgstr "visa alla objekt med --batch eller --batch-check"
+#: builtin/cat-file.c:872
+msgid "run textconv on object's content"
+msgstr "kör textconv på objektets innehåll"
-#: builtin/cat-file.c:664
-msgid "do not order --batch-all-objects output"
-msgstr "ordna inte --batch-all-objects output"
+#: builtin/cat-file.c:874
+msgid "run filters on object's content"
+msgstr "kör filter på objektets innehåll"
+
+#: builtin/cat-file.c:875
+msgid "blob|tree"
+msgstr "blob|träd"
+
+#: builtin/cat-file.c:876
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
+msgstr "använd en <sökväg> för (--textconv | --filters): Inte med 'batch'"
+
+#: builtin/cat-file.c:894
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "'%s=<%s>' behöver '%s' eller '%s'"
+
+#: builtin/cat-file.c:896
+msgid "path|tree-ish"
+msgstr "sökväg|träd-igt"
+
+#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "\"%s\" behöver ett buntläge"
+
+#: builtin/cat-file.c:921
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "\"-%c\" är inkompatibel med buntläge"
+
+#: builtin/cat-file.c:924
+msgid "batch modes take no arguments"
+msgstr "buntlägen inte några argument"
+
+#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "<rev> krävs med \"%s\""
+
+#: builtin/cat-file.c:938
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "<objekt> krävs med \"-%c\""
+
+#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429
+#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596
+#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965
+#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
+#: builtin/tag.c:592
+msgid "too many arguments"
+msgstr "för många argument"
+
+#: builtin/cat-file.c:947
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr "endast två argument krävs i <typ> <objekt>-läge, inte %d"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -11964,7 +12574,7 @@
msgid "use .gitattributes only from the index"
msgstr "använd .gitattributes endast från indexet"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
msgid "read file names from stdin"
msgstr "läs filnamn från standard in"
@@ -11972,8 +12582,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:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
+#: builtin/worktree.c:565
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
@@ -12030,167 +12640,165 @@
msgid "git checkout--worker [<options>]"
msgstr "git checkout--worker [<flaggor>]"
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
+#: builtin/worktree.c:808
msgid "string"
msgstr "sträng"
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
msgid "when creating files, prepend <string>"
msgstr "när filer skapas, lägg till <sträng> först"
-#: builtin/checkout-index.c:152
+#: builtin/checkout-index.c:184
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<flaggor>] [--] [<fil>...]"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:201
msgid "stage should be between 1 and 3 or all"
msgstr "etapp måste vara mellan 1 och 3 eller \"all\""
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:219
msgid "check out all files in the index"
msgstr "checka ut alla filer i indexet"
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:221
+msgid "do not skip files with skip-worktree set"
+msgstr "hoppa inte över filer med skip-worktree satt"
+
+#: builtin/checkout-index.c:222
msgid "force overwrite of existing files"
msgstr "tvinga överskrivning av befintliga filer"
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:224
msgid "no warning for existing files and files not in index"
msgstr "ingen varning för existerande filer och filer ej i indexet"
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:226
msgid "don't checkout new files"
msgstr "checka inte ut nya filer"
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:228
msgid "update stat information in the index file"
msgstr "uppdatera stat-information i indexfilen"
-#: builtin/checkout-index.c:198
+#: builtin/checkout-index.c:232
msgid "read list of paths from the standard input"
msgstr "läs listan över sökvägar från standard in"
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:234
msgid "write the content to temporary files"
msgstr "skriv innehåll till temporära filer"
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:238
msgid "copy out the files from named stage"
msgstr "kopiera ut filer från namngiven etapp"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:34
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<flaggor>] <gren>"
-#: builtin/checkout.c:34
+#: builtin/checkout.c:35
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."
-#: builtin/checkout.c:39
+#: builtin/checkout.c:40
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<flaggor>] [<gren>]"
-#: builtin/checkout.c:44
+#: builtin/checkout.c:45
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:199 builtin/checkout.c:238
#, c-format
msgid "path '%s' does not have our version"
msgstr "sökvägen \"%s\" har inte vår version"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:201 builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have their version"
msgstr "sökvägen \"%s\" har inte deras version"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:217
#, 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:261
+#: builtin/checkout.c:271
#, 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:278
+#: builtin/checkout.c:291
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:307
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
-#: builtin/checkout.c:411
+#: builtin/checkout.c:424
#, 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:416
+#: builtin/checkout.c:429
#, 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:423
+#: builtin/checkout.c:436
#, 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:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:469
#, 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:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "\"%s\" kan inte användas med %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:479
#, 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:470
+#: builtin/checkout.c:483
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "varken \"%s\" eller \"%s\" har angivits"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:487
#, 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:479 builtin/checkout.c:484
+#: builtin/checkout.c:492 builtin/checkout.c:497
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "\"%s\" eller \"%s\" kan inte användas med %s"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:571 builtin/checkout.c:578
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:753
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:809
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12199,50 +12807,50 @@
"kan inte fortsätta med köade ändringar i följande filer:\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:902
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:947
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:955
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:958
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:962
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:964 builtin/checkout.c:1398
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:966
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:1017
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12265,7 +12873,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1042
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12292,19 +12900,19 @@
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1077
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1081
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1124 builtin/checkout.c:1393
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:1179
+#: builtin/checkout.c:1206
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12313,7 +12921,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:1186
+#: builtin/checkout.c:1213
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"
@@ -12333,51 +12941,58 @@
"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:1196
+#: builtin/checkout.c:1223
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
msgid "only one reference expected"
msgstr "endast en referens förväntades"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1306
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1365 builtin/checkout.c:1744
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "förväntade gren, fick taggen \"%s\""
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1415
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "förväntade gren, fick fjärrgrenen \"%s\""
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1417 builtin/checkout.c:1426
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "förväntade gren, fick \"%s\""
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1420
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "förväntade gren, fick incheckningen \"%s\""
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1429
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr ""
+"Om du vill koppla från HEAD vid incheckningen, försök igen med flaggan --"
+"detach."
+
+#: builtin/checkout.c:1442
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12385,7 +13000,7 @@
"kan inte växla gren vid sammanslagning\n"
"Överväg \"git merge --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12393,7 +13008,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:1415
+#: builtin/checkout.c:1450
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12401,7 +13016,7 @@
"kan inte växla gren vid ombasering\n"
"Överväg \"git rebase --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12409,7 +13024,7 @@
"kan inte växla gren i en \"cherry-pick\"\n"
"Överväg \"git cherry-pick --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1458
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12417,139 +13032,123 @@
"kan inte växla gren i en \"revert\"\n"
"Överväg \"git revert --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1462
msgid "you are switching branch while bisecting"
msgstr "då växlar grenar medan du gör en \"bisect\""
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1469
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
+#: builtin/checkout.c:1495 builtin/checkout.c:1500
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1497
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "\"%s\" kan inte ta <startpunkt>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1505
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1512
msgid "missing branch or commit argument"
msgstr "saknar gren- eller incheckingsargument"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1555
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:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1522
-msgid "conflict style (merge or diff3)"
-msgstr "konfliktstil (merge eller diff3)"
+#: builtin/checkout.c:1557
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "konfliktstil (merge, diff3 eller zdiff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1569 builtin/worktree.c:560
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1535
-msgid "set upstream info for new branch"
-msgstr "sätt uppströmsinformation för ny gren"
-
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1574
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1578 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1581
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:1557
+#: builtin/checkout.c:1594
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1597
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1601
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1659
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "flaggorna \"%-c\", \"-%c\" och \"%s\" kan inte användas samtidigt"
-#: builtin/checkout.c:1626
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p och --overlay är ömsesidigt uteslutande"
-
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1700
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1705
#, c-format
msgid "missing branch name; try -%c"
msgstr "grennamn saknas; försök med -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1737
#, c-format
msgid "could not resolve %s"
msgstr "kunde inte upplösa %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1753
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1760
#, 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:1727
+#: builtin/checkout.c:1764
#, 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:1736
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file är inkompatibelt med --detach"
-
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file är inkompatibelt med --patch"
-
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1789
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12557,71 +13156,71 @@
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
"du checkar ut från indexet."
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1794
msgid "you must specify path(s) to restore"
msgstr "du måste ange katalog(er) att återställa"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
+#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
+#: builtin/remote.c:173 builtin/submodule--helper.c:3038
+#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
+#: builtin/worktree.c:558
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1820
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1822
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1823
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1825
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1826
msgid "use overlay mode (default)"
msgstr "använd överläggsläge (standard)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1874
msgid "create and switch to a new branch"
msgstr "skapa och växla till en ny gren"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1876
msgid "create/reset and switch to a branch"
msgstr "skapa/nollställ och växla till en gren"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1878
msgid "second guess 'git switch <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1880
msgid "throw away local modifications"
msgstr "kasta bort lokala ändringar"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1916
msgid "which tree-ish to checkout from"
msgstr "vilken träd-igt att checka ut från"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1918
msgid "restore the index"
msgstr "återställ indexet"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1920
msgid "restore the working tree (default)"
msgstr "återställ arbetskatalogen (förval)"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1922
msgid "ignore unmerged entries"
msgstr "ignorera ej sammanslagna poster"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1923
msgid "use overlay mode"
msgstr "använd överläggsläge"
@@ -12657,7 +13256,15 @@
msgid "could not lstat %s\n"
msgstr "kunde inte ta status (\"lstat\") på %s\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Vägrar ta bort aktuell arbetskatalog\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Skulle vägra ta bort aktuell arbetskatalog\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12670,7 +13277,7 @@
"foo - markera post baserad på unikt prefix\n"
" - (tomt) markera ingenting\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12691,33 +13298,33 @@
"* - välj alla poster\n"
" - (tomt) avsluta markering\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Vadå (%s)?\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ange ignoreringsmönster>>"
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "VARNING: Hittar inte poster som motsvarar: %s"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Välj poster att ta bort"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Ta bort %s [Y=ja / N=nej]? "
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12735,52 +13342,52 @@
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
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:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "skriv inte ut namn på borttagna filer"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "tvinga"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "städa interaktivt"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
+#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "mönster"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "lägg till <mönster> till ignoreringsregler"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "ta även bort ignorerade filer"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "ta endast bort ignorerade filer"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12788,7 +13395,7 @@
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12796,220 +13403,216 @@
"clean.requireForce har standardvärdet true och varken -i, -n eller -f "
"angavs; vägrar städa"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x och -X kan inte användas samtidigt"
-#: builtin/clone.c:45
+#: builtin/clone.c:47
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:96
+#: builtin/clone.c:100
msgid "don't clone shallow repository"
msgstr "klona inte grunt arkiv"
-#: builtin/clone.c:98
+#: builtin/clone.c:102
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "don't use local hardlinks, always copy"
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
-#: builtin/clone.c:109
+#: builtin/clone.c:113
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "pathspec"
msgstr "sökvägsangivelse"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:115
+#: builtin/clone.c:119
msgid "number of submodules cloned in parallel"
msgstr "antal undermoduler som klonas parallellt"
-#: builtin/clone.c:116 builtin/init-db.c:539
+#: builtin/clone.c:120 builtin/init-db.c:539
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:117 builtin/init-db.c:540
+#: builtin/clone.c:121 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:127 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2721
msgid "use --reference only while cloning"
msgstr "använd --reference endast under kloningen"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3967 builtin/repack.c:669
+#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "namn"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "use <name> instead of 'origin' to track upstream"
msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checka ut <gren> istället för fjärrens HEAD"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
+#: builtin/pull.c:212
msgid "depth"
msgstr "djup"
-#: builtin/clone.c:131
+#: builtin/clone.c:135
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
+#: builtin/pull.c:215
msgid "time"
msgstr "tid"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "create a shallow clone since a specific time"
msgstr "skapa en grund klon från en angiven tidpunkt"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "fördjupa historik för grund klon, exkludera revisionen"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:141 builtin/submodule--helper.c:1897
+#: builtin/submodule--helper.c:2735
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
-#: builtin/clone.c:139
+#: builtin/clone.c:143
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "klona inga taggar och gör att senare hämtningar inte följer dem"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "any cloned submodules will be shallow"
msgstr "klonade undermoduler kommer vara grunda"
-#: builtin/clone.c:142 builtin/init-db.c:548
+#: builtin/clone.c:146 builtin/init-db.c:548
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:143 builtin/init-db.c:549
+#: builtin/clone.c:147 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
-#: builtin/clone.c:144
+#: builtin/clone.c:148
msgid "key=value"
msgstr "nyckel=värde"
-#: builtin/clone.c:145
+#: builtin/clone.c:149
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "serverspecifik"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
-msgstr ""
-"inget att checka in\n"
-"flagga att sända"
+msgstr "flagga att sända"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
-#: builtin/clone.c:154
+#: builtin/clone.c:158
+msgid "apply partial clone filters to submodules"
+msgstr "tillämpa delvisa klonfilter på undermoduler"
+
+#: builtin/clone.c:160
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren"
-#: builtin/clone.c:156
+#: builtin/clone.c:162
msgid "initialize sparse-checkout file to include only files at root"
-msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten"
+msgstr "initiera sparse-checkout-filen till att bara ta med filer i roten"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Kunde inte gissa katalognamn.\n"
-"Ange en katalog på kommandoraden"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:237
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:310
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:436
+#: builtin/clone.c:328
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "misslyckades starta iterator över \"%s\""
-#: builtin/clone.c:467
+#: builtin/clone.c:359
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:471
+#: builtin/clone.c:363
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:476
+#: builtin/clone.c:368
#, c-format
msgid "failed to iterate over '%s'"
msgstr "misslyckades iterera över \"%s\""
-#: builtin/clone.c:503
+#: builtin/clone.c:395
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:409
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13019,151 +13622,151 @@
"Du kan inspektera det som checkades ut med \"git status\"\n"
"och försöka med \"git restore --source=HEAD :/\"\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:486
#, 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:713
+#: builtin/clone.c:603
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:651
msgid "failed to initialize sparse-checkout"
msgstr "misslyckades initiera sparse-checkout"
-#: builtin/clone.c:784
+#: builtin/clone.c:674
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:816
+#: builtin/clone.c:709
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:894
+#: builtin/clone.c:793
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:957
+#: builtin/clone.c:856
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:959
+#: builtin/clone.c:858
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:901
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:1005
+#: builtin/clone.c:905 contrib/scalar/scalar.c:413
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:1018
+#: builtin/clone.c:918
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "flaggorna --bare och --origin %s är inkompatibla."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "flaggorna \"%s\" och \"%s %s\" kan inte användas samtidigt"
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:935
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:939 builtin/fetch.c:2176
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:1049
+#: builtin/clone.c:949
#, 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:1055
+#: builtin/clone.c:955
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "arkivsökvägen \"%s\" finns redan och är inte en tom katalog."
-#: builtin/clone.c:1069
+#: builtin/clone.c:969
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
+#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:1089
+#: builtin/clone.c:989
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:1109
+#: builtin/clone.c:1009
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1011
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1040
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:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1157
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1159
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:1233
+#: builtin/clone.c:1161
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:1235
+#: builtin/clone.c:1163
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1168
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1173
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1185
+msgid "cannot clone from filtered bundle"
+msgstr "kan inte klona från filtrerad bunt"
+
+#: builtin/clone.c:1265 builtin/clone.c:1324
msgid "remote transport reported error"
msgstr "fjärrtransport rapporterade fel"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1277 builtin/clone.c:1289
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1292
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
@@ -13199,13 +13802,13 @@
msgid "--command must be the first argument"
msgstr "--command måste vara första argument"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13215,94 +13818,92 @@
"split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <delnings-flaggor>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "kunde inte hitta objektkatalog för %s"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
msgid "dir"
msgstr "kat"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "objektkatalogen där grafen ska lagras"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Kunde inte öppna incheckningsgrafen \"%s\""
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "okänt argument för --split, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "oväntat icke-hexadecimalt objekt-ID: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "ogiltigt objekt: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "starta traversering vid alla referenser"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "sök paketindex listade på standard in efter incheckningar"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "börja gå genom incheckningar listade på standard in"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr "ta med alla incheckningar redan i filen commit-graph"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "aktivera beräkning av ändrade sökvägar"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "tillåt skriva en inkrementell incheckningsgraffil"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
"maximalt antal incheckningar i en delad incheckingsgraf som inte är bad"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "låt tid endast gå ut för filer äldre än givet datum och tid"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "maximalt antal Bloom-filer med ändrad sökväg att beräkna"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "använd som mest en av --reachable, --stdin-commits och --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Hämtar incheckningar från indata"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "okänt underkommando: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13316,70 +13917,65 @@
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:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
#, c-format
msgid "not a valid object name %s"
msgstr "objektnamnet är inte giltigt: %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: misslyckades öppna \"%s\""
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: misslyckades läsa \"%s\""
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: misslyckades stänga \"%s\""
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "förälder"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "id på ett förälderincheckningsobjekt"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
+#: builtin/tag.c:455
msgid "message"
msgstr "meddelande"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "läs incheckningsloggmeddelande från fil"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "måste ange exakt ett träd"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: misslyckades läsa"
-#: builtin/commit.c:41
+#: builtin/commit.c:43
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<flaggor>] [--] <sökväg>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:48
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<flaggor>] [--] <sökväg>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:53
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13389,7 +13985,7 @@
"blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
"så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:58
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13403,15 +13999,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:65
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Använd annars \"git rebase --skip\"\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:68
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Använd annars \"git cherry-pick --skip\"\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:71
msgid ""
"and then use:\n"
"\n"
@@ -13433,73 +14029,69 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:326
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file med -a ger ingen mening"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:376
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:386
+#: builtin/commit.c:388
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:395
+#: builtin/commit.c:397
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:410
+#: builtin/commit.c:412
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:412
+#: builtin/commit.c:414
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:489
+#: builtin/commit.c:491
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:491
+#: builtin/commit.c:493
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:493
+#: builtin/commit.c:495
msgid "cannot do a partial commit during a rebase."
msgstr "kan inte utföra en delvis incheckning under en ombasering."
-#: builtin/commit.c:501
+#: builtin/commit.c:503
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:520
+#: builtin/commit.c:522
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:618
+#: builtin/commit.c:620
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:620
+#: builtin/commit.c:622
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:639
+#: builtin/commit.c:641
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:692
+#: builtin/commit.c:694
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13507,43 +14099,43 @@
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:762 builtin/shortlog.c:417
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:764
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:764
+#: builtin/commit.c:768
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:801
+#: builtin/commit.c:805
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "kan inte kombinera -m med --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "flaggorna \"%s\" och \"%s:%s\" kan inte användas samtidigt"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:817 builtin/commit.c:833
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:884
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:893
+#: builtin/commit.c:897
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13552,7 +14144,7 @@
"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
"med \"%c\" kommer ignoreras.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:899
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13562,7 +14154,7 @@
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:903
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13571,7 +14163,7 @@
"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:907
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13582,7 +14174,7 @@
"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:915
+#: builtin/commit.c:919
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13596,7 +14188,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"och försöker igen.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:924
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13610,175 +14202,147 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"och försöker igen.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:951
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:959
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:966
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:984
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1029
msgid "unable to pass trailers to --trailers"
msgstr "kan inte sända släprader till --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1069
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1083 builtin/tag.c:317
#, 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:1123
+#: builtin/commit.c:1128
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' är inte 'Namn <epost>' och motsvarar ingen befintlig författare"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1142
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ogiltigt ignorerat läge \"%s\""
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1160 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1195
-msgid "--long and -z are incompatible"
-msgstr "--long och -z är inkompatibla"
-
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Du är i mitten av en sammanslagning -- kan inte omformulera."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1233
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "Du är i mitten av en cherry-pick -- kan inte omformulera."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1236
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
msgstr ""
-"kan inte kombinera omformuleringsflaggor för --fixup med sökvägen \"%s\""
+"reword-flaggan till \"%s\" och sökvägen \"%s\" kan inte användas tillsammans"
-#: builtin/commit.c:1233
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"omformuleringsflaggan i --fixup är ömsesidigt uteslutande med --patch/--"
-"interactive/--all/--include/--only"
+#: builtin/commit.c:1238
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "reword-flaggan till \"%s\" och \"%s\" kan inte användas tillsammans"
-#: builtin/commit.c:1252
-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:1261
+#: builtin/commit.c:1263
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1266
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:1266
+#: builtin/commit.c:1268
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:1268
+#: builtin/commit.c:1270
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:1271
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-
-#: builtin/commit.c:1281
-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:1283
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
-
-#: builtin/commit.c:1292
+#: builtin/commit.c:1290
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:1310
-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:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "okänd flagga: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "sökvägarna \"%s ...\" med -a ger ingen mening"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "visa information om stash"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "beräkna fullständiga före-/efter-värden"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "version"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:765
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
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:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13786,11 +14350,11 @@
"visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
"traditional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:197
msgid "when"
msgstr "när"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13798,194 +14362,194 @@
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "detektera inte namnändringar"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "detektera namnändringar, möjligen sätt likhetsindex"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
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:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:551
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:360 ref-filter.h:89
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]incheckning"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa/omformulera angiven "
"incheckning"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
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:1633
+#: builtin/commit.c:1635
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:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "släprad"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "använd skräddarsydd(a) släprad(er)"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "lägg till Signed-off-by-släprad"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
-msgstr "inkludera status i mallen för incheckningsmeddelandet"
+msgstr "ta med status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "förbigå pre-commit- och commit-msg-krokar"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Avbryter på grund av tom incheckningsmeddelandekropp.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14109,6 +14673,10 @@
msgid "Type"
msgstr "Typ"
+#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+msgid "type"
+msgstr "typ"
+
#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "värdet har givits denna typ"
@@ -14320,10 +14888,6 @@
msgid "no such section: %s"
msgstr "ingen sådan sektion: %s"
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "skriv storlekar i människoläsbart format"
@@ -14350,7 +14914,7 @@
msgstr ""
"\"credential-cache--daemon\" ej tillgänglig; stöd för unix-uttag saknas"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "\"credential-cache\" ej tillgänglig; stöd för unix-uttag saknas"
@@ -14492,7 +15056,7 @@
msgid "do not consider tags matching <pattern>"
msgstr "överväg inte taggar som motsvarar <mönster>"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:595
msgid "show abbreviated commit object as fallback"
msgstr "visa förkortade incheckningsobjekt som standard"
@@ -14508,25 +15072,14 @@
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long är inkompatibel med --abbrev=0"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Inga namn hittades, kan inte beskriva något."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin och --merge-base är ömsesidigt uteslutande"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "flaggorna \"%s\" och incheckning-igter kan inte användas samtidigt"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
@@ -14547,26 +15100,26 @@
msgid "%s...%s: no merge base"
msgstr "%s...%s: ingen sammanslagningsbas"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "Inte ett git-arkiv"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:537 builtin/grep.c:700
#, c-format
msgid "invalid object '%s' given."
msgstr "objektet \"%s\" som angavs är felaktigt."
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mer än två blobbar angavs: \"%s\""
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "ej hanterat objekt \"%s\" angavs."
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: flera sammanslagningsbaser, använder %s"
@@ -14576,113 +15129,105 @@
msgstr ""
"git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "misslyckades: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "kunde inte läsa symbolisk länk-fil %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "kunde inte läsa objektet %s för symboliska länken %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
"katalogdiffläge (\"-d\" och \"--dir-diff\")."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "filen i arbetskatalogen lämnades kvar."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "temporära filer finns i \"%s\"."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "du kanske vill städa eller rädda dem."
-#: builtin/difftool.c:699
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "misslyckades: %d"
+
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
-#: builtin/difftool.c:701
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "utför diff för hela katalogen"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "fråga inte vid start av diff-verktyg"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "använd symboliska länkar i katalogdiffläge"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:700
msgid "tool"
msgstr "verktyg"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "använd angivet diff-verktyg"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\""
-#: builtin/difftool.c:715
+#: builtin/difftool.c:706
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
-"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
+"låt \"git-difftool\" avsluta när ett anropat diff-verktyg ger returvärde "
"skilt från noll"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "ange eget kommando för att visa diffar"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "sändes till \"diff\""
-#: builtin/difftool.c:734
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool kräver en arbetskatalog eller --no-index"
-#: builtin/difftool.c:741
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff är inkompatibelt med --no-index"
-
-#: builtin/difftool.c:744
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
-
-#: builtin/difftool.c:752
+#: builtin/difftool.c:745
msgid "no <tool> given for --tool=<tool>"
msgstr "inget <verktyg> angavs för --tool=<verktyg>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:752
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "inget <kommando> angavs för --extcmd=<kommando>"
@@ -14690,10 +15235,6 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljövariabel>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
-msgid "type"
-msgstr "typ"
-
#: builtin/env--helper.c:46
msgid "default for git_env_*(...) to fall back on"
msgstr "standard för git_env_*(...) att falla tillbaka på"
@@ -14719,248 +15260,244 @@
"\", inte \"%s\""
#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [rev-list-flaggor]"
+msgid "git fast-export [<rev-list-opts>]"
+msgstr "git fast-export [<rev-list-flaggor>]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "Fel: Kan inte exportera nästlade taggar såvida inte --mark-tags anges."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "symbolen för --anonymize-map kan inte vara tom"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "visa förlopp efter <n> objekt"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "välj hantering av signerade taggar"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "dumpa märken till filen"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "importera märken från filen"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "importera märken från filen, om den finns"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr "fejka taggare när taggen saknar en"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "skriv ut hela trädet för varje incheckning"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "använd done-funktionen för att avsluta strömmen"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "hoppa över skrivning av blob-data"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1860
msgid "refspec"
msgstr "referensspecifikation"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "applicera referensspecifikation på exporterade referenser"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "anonymisera utdata"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "från:till"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "konvertera <från> till <till> i anonymiserad utdata"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr "referera föräldrar som inte finns i fast-export-ström med objekt-id"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "visa ursprungliga objekt-id för blobbar/incheckningar"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "märk taggar med märke-id"
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map utan --anonymize ger ingen mening"
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "Kan inte ange både --import-marks och --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3097
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "Saknar från-märken för undermodulen \"%s\""
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3099
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "Saknar till-märken för undermodulen \"%s\""
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3234
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "Förväntade \"mark\"-kommando, fick %s"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3239
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "Förväntade \"to\"-kommando, fick %s"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3331
msgid "Expected format name:filename for submodule rewrite option"
msgstr "Förvändae formatet namn:filnamn för undermodul-omskrivningsflaggan"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3386
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features"
-#: builtin/fetch-pack.c:242
+#: builtin/fetch-pack.c:246
#, c-format
msgid "Lockfile created but not reported: %s"
msgstr "Låsfil skapad men inte rapporterad: %s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<flaggor>] <grupp>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:124
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel kan inte vara negativt"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:147 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:149 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "ställ in uppström för git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:151 builtin/pull.c:192
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:151
+#: builtin/fetch.c:153
msgid "use atomic transaction to update references"
msgstr "använd atomiska transaktioner för att uppdatera referenser"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:155 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
msgid "force overwrite of local reference"
msgstr "tvinga överskrivning av lokal referens"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:158
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:160 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:164
msgid "number of submodules fetched in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:166
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
"modifiera referensspecifikationen så att alla referenser hamnar i refs/"
"prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:168 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:170
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:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:172
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:177
msgid "write fetched references to the FETCH_HEAD file"
msgstr "skriv hämtade referenser till FETCH_HEAD-filen"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:178 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:180
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:185 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "fördjupa historik för grund klon baserad på tid"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:191 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:194
+msgid "re-fetch without negotiating common commits"
+msgstr "hämta om utan att förhandla om gemensamma incheckningar"
+
+#: builtin/fetch.c:197
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:200
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -14968,141 +15505,140 @@
"standard för rekursiv hämtning av undermoduler (lägre prioritet än "
"konfigurationsfiler)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:204 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:205 builtin/pull.c:230
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:206 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:213 builtin/pull.c:244
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:210
+#: builtin/fetch.c:215
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:218 builtin/fetch.c:220
msgid "run 'maintenance --auto' after fetching"
msgstr "kör \"maintenance --auto\" efter hämtning"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:222 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:224
msgid "write the commit-graph after fetching"
msgstr "skriv incheckingsgrafen efter hämtning"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:226
msgid "accept refspecs from stdin"
msgstr "ta emot referenser från standard in"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Kunde inte hitta fjärr-referensen HEAD"
+#: builtin/fetch.c:618
+msgid "couldn't find remote ref HEAD"
+msgstr "kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:757
-#, 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:856
+#: builtin/fetch.c:893
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:897
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:911
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:912
+msgid "checked out in another worktree"
+msgstr "utcheckat i en annan arbetskatalog"
+
+#: builtin/fetch.c:922
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
+#: builtin/fetch.c:994
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:927
msgid "would clobber existing tag"
msgstr "skulle skriva över befintlig tagg"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:949
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:952
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:955
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:994
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:999
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1102
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'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"Fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har "
+"fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har "
"slagits\n"
-"av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n"
-"\"git config fetch.showForcedUpdates true\"."
+"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:1069
+#: builtin/fetch.c:1106
#, c-format
msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-"Det tog %.2f sekunder att se efter tvångsuppdateringar. Du kan använda\n"
+"det tog %.2f sekunder att se efter tvångsuppdateringar; Du kan använda\n"
"\"--no-show-forced-updates\" eller köra \"git config fetch."
"showForcedUpdates\n"
-"false\" för att undvika testet.\n"
+"false\" för att undvika testet\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1136
#, 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:1129
+#: builtin/fetch.c:1156
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "avvisade %s då grunda rötter inte tillåts uppdateras"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1259 builtin/fetch.c:1418
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1269
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15111,136 +15647,142 @@
"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:1327
+#: builtin/fetch.c:1377
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1378
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1421
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1422 builtin/remote.c:1153
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1446
#, 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"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "vägrar hämta till grenen \"%s\" som är utcheckad på \"%s\""
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1466
#, 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"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "flaggan \"%s\" med värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1469
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "Flaggan \"%s\" ignoreras för %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1496
+#, c-format
+msgid "the object %s does not exist"
+msgstr "objektet %s finns inte"
+
+#: builtin/fetch.c:1748
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1760
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"kunde inte sätta uppström för HEAD till \"%s\" från \"%s\" när det inte "
+"pekar mot någon gren."
+
+#: builtin/fetch.c:1773
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:1635
+#: builtin/fetch.c:1775
msgid "not setting upstream for a remote tag"
msgstr "ställer inte in uppström för en fjärrtag"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1777
msgid "unknown branch type"
msgstr "okänd grentyp"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1779
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
-"hittade ingen källgren.\n"
-"du måste ange exakt en gren med flaggan --set-upstream."
+"hittade ingen källgren;\n"
+"du måste ange exakt en gren med flaggan --set-upstream"
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1904 builtin/fetch.c:1967
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1914 builtin/fetch.c:1969
#, c-format
-msgid "Could not fetch %s"
-msgstr "Kunde inte hämta %s"
+msgid "could not fetch %s"
+msgstr "kunde inte hämta %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1926
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "kunde inte hämta \"%s\" (felkod: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:2030
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
-"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
-"fjärrarkiv som nya incheckningar ska hämtas från."
+"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:1930
-msgid "You need to specify a tag name."
-msgstr "Du måste ange namnet på en tagg."
+#: builtin/fetch.c:2066
+msgid "you need to specify a tag name"
+msgstr "du måste ange namnet på en tagg"
-#: builtin/fetch.c:1994
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
-msgstr "--negotiate-only behöver en eller flera --negotiate-tip=*"
+#: builtin/fetch.c:2156
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
+msgstr "--negotiate-only behöver en eller flera --negotiation-tip=*"
-#: builtin/fetch.c:1998
-msgid "Negative depth in --deepen is not supported"
-msgstr "Negativa djup stöds inte i --deepen"
+#: builtin/fetch.c:2160
+msgid "negative depth in --deepen is not supported"
+msgstr "negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:2000
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen och --depth är ömsesidigt uteslutande"
-
-#: builtin/fetch.c:2005
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth och --unshallow kan inte användas samtidigt"
-
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2169
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2186
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2188
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2197
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Fjärren eller fjärrgruppen finns inte: %s"
+msgid "no such remote or remote group: %s"
+msgstr "fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:2042
-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:2205
+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:2058
+#: builtin/fetch.c:2221
msgid "must supply remote when using --negotiate-only"
msgstr "måste ange fjärr när --negotiate-only anges"
-#: builtin/fetch.c:2063
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Protokollet stöder inte --negotiate-only, avslutar."
+#: builtin/fetch.c:2226
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "protokollet stöder inte --negotiate-only, avslutar"
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2246
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15248,11 +15790,11 @@
"--filter kan endast användas med fjärren konfigurerad i extensions."
"partialclone"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2250
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic kan bara användas vid hämtning från en fjärr"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2254
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin kan bara användas vid hämtning fårn en fjärr"
@@ -15262,23 +15804,27 @@
msgstr ""
"git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
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:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "alias för --log (avråds)"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "inled meddelande med <text>"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "använd <namn> istället för den verkliga målgrenen"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "fil att läsa från"
@@ -15300,47 +15846,47 @@
msgstr ""
"git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "citera platshållare passande för skal"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "citera platshållare passande för perl"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "citera platshållare passande för python"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "citera platshållare passande för Tcl"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:42 builtin/tag.c:482
msgid "respect format colors"
msgstr "använd formatfärger"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "visa endast referenser som pekar på objektet"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "visa endast referenser som slagits samman"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "visa endast referenser som ej slagits samman"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "visa endast referenser som innehåller incheckningen"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "visa endast referenser som inte innehåller incheckningen"
@@ -15478,135 +16024,257 @@
msgid "notice: No default references"
msgstr "obs: Inga förvalda referenser"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: hashsökväg stämmer inte överens, hittad vid: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objektet trasigt eller saknas: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: objektet har okänd typ \"%s\": %s"
+
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: objektet kunde inte tolkas: %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "ogiltig sha1-fil: %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "Kontrollerar objektkatalog"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "Kontrollerar %s-länk"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:710 builtin/index-pack.c:862
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s pekar på något konstigt (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: frånkopplat HEAD pekar på ingenting"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "obs: %s pekar på en ofödd gren (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "Kontrollerar cacheträd"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: ogiltig sha1-pekare i cacheträd"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "icke-träd i cacheträd"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<flaggor>] [<objekt>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "ta även hänsyn till paket och supplerande objekt"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:764
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "kontrollera endast konnektivitet"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "skriv dinglande objekt i .git/lost-found"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "visa ordrika namn för nåbara objekt"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Kontrollerar objekt"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s: objekt saknas"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "ogiltig parameter: förväntade sha1, fick \"%s\""
+#: builtin/fsmonitor--daemon.c:13
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [<flaggor>]"
+
+#: builtin/fsmonitor--daemon.c:14
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [<flaggor>]"
+
+#: builtin/fsmonitor--daemon.c:15
+msgid "git fsmonitor--daemon stop"
+msgstr "git fsmonitor--daemon stop"
+
+#: builtin/fsmonitor--daemon.c:16
+msgid "git fsmonitor--daemon status"
+msgstr "git fsmonitor--daemon status"
+
+#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "värdet för \"%s\" utanför intervallet: %d"
+
+#: builtin/fsmonitor--daemon.c:57
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "värdet för \"%s\" är inte bool eller int: %d"
+
+#: builtin/fsmonitor--daemon.c:99
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr "fsmonitor-daemon bevakar \"%s\"\n"
+
+#: builtin/fsmonitor--daemon.c:104
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr "fsmonitor-daemon bevakar inte \"%s\"\n"
+
+#: builtin/fsmonitor--daemon.c:170
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "kunde inte skapa fsmonitor-kaka \"%s\""
+
+#: builtin/fsmonitor--daemon.c:753
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr "fsmonitor: cookie_result '%d' != SEEN"
+
+#: builtin/fsmonitor--daemon.c:1187
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr "kunde inte starta IPC-trådpol på \"%s\""
+
+#: builtin/fsmonitor--daemon.c:1199
+msgid "could not start fsmonitor listener thread"
+msgstr "kunde inte starta fsmonitor-lyssnartråd"
+
+#: builtin/fsmonitor--daemon.c:1297
+msgid "could not initialize listener thread"
+msgstr "kunde inte initiera lyssnartråd"
+
+#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr "fsmonitor--daemon körs redan på \"%s\""
+
+#: builtin/fsmonitor--daemon.c:1332
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr "kör fsmonitor-daemon i \"%s\"\n"
+
+#: builtin/fsmonitor--daemon.c:1387
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "startar fsmonitor-daemon i \"%s\"\n"
+
+#: builtin/fsmonitor--daemon.c:1413
+msgid "daemon failed to start"
+msgstr "serverprocessen kunde inte startas"
+
+#: builtin/fsmonitor--daemon.c:1416
+msgid "daemon not online yet"
+msgstr "serverprocessen ännu inte operativ"
+
+#: builtin/fsmonitor--daemon.c:1419
+msgid "daemon terminated"
+msgstr "serverprocessen avslutades"
+
+#: builtin/fsmonitor--daemon.c:1429
+msgid "detach from console"
+msgstr "koppla från konsolen"
+
+#: builtin/fsmonitor--daemon.c:1432
+msgid "use <n> ipc worker threads"
+msgstr "använd <n> ipc-jobbtrådar"
+
+#: builtin/fsmonitor--daemon.c:1435
+msgid "max seconds to wait for background daemon startup"
+msgstr "max sekunder att vänta på att serverprocessen startar"
+
+#: builtin/fsmonitor--daemon.c:1449
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "ogiltigt värde för \"ipc-threads\" (%d)"
+
+#: builtin/fsmonitor--daemon.c:1464
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "Ej hanterat underkommando \"%s\""
+
+#: builtin/fsmonitor--daemon.c:1477
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr "fsmonitor--daemon stöds inte på denna plattform"
+
#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<flaggor>]"
@@ -15621,77 +16289,72 @@
msgid "failed to parse '%s' value '%s'"
msgstr "misslyckades tolka \"%s\" värde \"%s\""
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr "kunde inte läsa \"%s\""
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
"Senaste körningen av git gc rapporterade följande. Fixa grundproblemet\n"
-"och ta bort %s.\n"
+"och ta bort %s\n"
"Automatisk städning kommer inte utföras förrän filen tas bort.\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr "tvinga gc-körning även om en annan gc kanske körs"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "packa om alla paket förutom det största paketet"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "kunde inte tolka värdet %s för gc.logexpiry"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "kunde inte tolka värdet %s för prune expiry"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Se \"git help gc\" för manuell hushållning.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -15699,33 +16362,33 @@
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
"är fallet)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "
"dem."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<uppgift>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "--no-schedule tillåts inte"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "okänt argument för --schedule, %s"
-#: builtin/gc.c:869
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "kunde inte skriva incheckningsgraf"
-#: builtin/gc.c:905
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "kunde inte förhämta fjärrar"
@@ -15737,148 +16400,188 @@
msgid "failed to finish 'git pack-objects' process"
msgstr "kunde inte avsluta \"git pack-objects\"-process"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "kunde inte skriva multi-pack-index"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "\"git multi-pack-index expire\" misslyckades"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "\"git multi-pack-index repack\" misslyckades"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"hoppar över \"incremental-repack\"-uppgift eftersom core.multiPackIndex är "
"inaktiverat"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "låsfilen \"%s\" finns, hoppar över underhåll"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "uppgiften \"%s\" misslyckades"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "\"%s\" är inte en giltig uppgift"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "uppgiften \"%s\" kan inte väljas flera gånger"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "kör uppgifter baserad på arkivets tillstånd"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "frekvens"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "kör uppgifter baserat på frekvens"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "rapportera inte framgång eller annan information över standard fel"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
msgid "task"
msgstr "uppgift"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "utför en specifik uppgift"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "använd som mest en av --auto och --schedule=<frekvens>"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "misslyckades köra \"git config\""
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "misslyckades expandera sökvägen \"%s\""
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "misslyckades starta launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "misslyckades skapa kataloger för \"%s\""
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "misslyckades starta tjänsten %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "misslyckades skapa temporär xml-fil"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "misslyckades starta schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"kunde inte köra \"crontab -l\"; ditt system kanske inte stöder \"cron\""
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "kunde inte köra \"crontab\"; ditt system kanske inte stöder \"cron\""
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "misslyckades öppna standard in för \"crontab\""
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "\"crontab\" dog"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "misslyckades starta systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "misslyckades att köra systemctl"
+
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
+#: builtin/worktree.c:1024
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "misslyckades ta bort \"%s\""
+
+#: builtin/gc.c:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "okänt argument för --scheduler, \"%s\""
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "varken systemd-timer eller crontab är tillgänglig"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s-schemaläggare är inte tillgänglig"
+
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr "en annan process schemalägger bakgrundsunderhåll"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<schemaläggare>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "schemaläggare"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "schemaläggare som utlöser \"git maintenance\"-körning"
+
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "misslyckades lägga till arkiv till global konfiguration"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <underkommando> [<flaggor>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "felaktigt underkommando: %s"
-#: builtin/grep.c:30
+#: builtin/grep.c:32
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:241
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: misslyckades skapa tråd. %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:295
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "felaktigt antal trådar angivet (%d) för %s"
@@ -15887,262 +16590,254 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3150
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:674
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:738
+#: builtin/grep.c:754
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:837
+#: builtin/grep.c:852
msgid "search in index instead of in the work tree"
msgstr "sök i indexet istället för i arbetskatalogen"
-#: builtin/grep.c:839
+#: builtin/grep.c:854
msgid "find in contents not managed by git"
msgstr "sök i innehåll som inte hanteras av git"
-#: builtin/grep.c:841
+#: builtin/grep.c:856
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
-#: builtin/grep.c:843
+#: builtin/grep.c:858
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:845
+#: builtin/grep.c:860
msgid "recursively search in each submodule"
msgstr "sök varje undermodul rekursivt"
-#: builtin/grep.c:848
+#: builtin/grep.c:863
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:850
+#: builtin/grep.c:865
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:852
+#: builtin/grep.c:867
msgid "match patterns only at word boundaries"
msgstr "träffa endast mönster vid ordgränser"
-#: builtin/grep.c:854
+#: builtin/grep.c:869
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:856
+#: builtin/grep.c:871
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:859
+#: builtin/grep.c:874
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:861
+#: builtin/grep.c:876
msgid "search in subdirectories (default)"
msgstr "sök i underkataloger (standard)"
-#: builtin/grep.c:863
+#: builtin/grep.c:878
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:867
+#: builtin/grep.c:882
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:870
+#: builtin/grep.c:885
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:873
+#: builtin/grep.c:888
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:876
+#: builtin/grep.c:891
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:879
+#: builtin/grep.c:894
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:880
+#: builtin/grep.c:895
msgid "show column number of first match"
msgstr "visa kolumnnummer för första träff"
-#: builtin/grep.c:881
+#: builtin/grep.c:896
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:882
+#: builtin/grep.c:897
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:884
+#: builtin/grep.c:899
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:886
+#: builtin/grep.c:901
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:888
+#: builtin/grep.c:903
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:906
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:893
+#: builtin/grep.c:908
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:896
+#: builtin/grep.c:911
msgid "show only matching parts of a line"
msgstr "visa endast träffade delar av rader"
-#: builtin/grep.c:898
+#: builtin/grep.c:913
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:899
+#: builtin/grep.c:914
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:901
+#: builtin/grep.c:916
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:903
+#: builtin/grep.c:918
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:906
+#: builtin/grep.c:921
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:909
+#: builtin/grep.c:924
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:911
+#: builtin/grep.c:926
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:913
+#: builtin/grep.c:928
msgid "use <n> worker threads"
msgstr "använd <n> jobbtrådar"
-#: builtin/grep.c:914
+#: builtin/grep.c:929
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:917
+#: builtin/grep.c:932
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:919
+#: builtin/grep.c:934
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:922
+#: builtin/grep.c:937
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:924
+#: builtin/grep.c:939
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:926
+#: builtin/grep.c:941
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:938
+#: builtin/grep.c:953
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:940
+#: builtin/grep.c:955
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:943
+#: builtin/grep.c:958
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:947
+#: builtin/grep.c:962
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1028
msgid "no pattern given"
msgstr "inget mönster angavs"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1064
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index och --untracked kan inte användas med revisioner"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1072
#, c-format
msgid "unable to resolve revision: %s"
msgstr "kan inte slå upp revision: %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1102
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked stöds inte med --recurse-submodules"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1106
msgid "invalid option combination, ignoring --threads"
msgstr "ogiltig kombination av flaggor, ignorerar --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1109 builtin/pack-objects.c:4084
msgid "no threads support, ignoring --threads"
msgstr "trådstöd saknas, ignorerar --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1146
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:1157
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached och --untracked kan inte användas med --no-index"
-
-#: builtin/grep.c:1160
-msgid "--untracked cannot be used with --cached"
-msgstr "--untracked kan inte användas med --cached"
-
-#: builtin/grep.c:1166
+#: builtin/grep.c:1179
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:1174
+#: builtin/grep.c:1187
msgid "both --cached and trees are given"
msgstr "både --cached och träd angavs"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16150,96 +16845,100 @@
"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "
"<fil>..."
-#: builtin/hash-object.c:86
-msgid "git hash-object --stdin-paths"
-msgstr "git hash-object --stdin-paths"
-
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:97
msgid "object type"
msgstr "objekttyp"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:98
msgid "write the object into the object database"
msgstr "skriv objektet till objektdatabasen"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
msgstr "läs objektet från standard in"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:102
msgid "store file as is without filters"
msgstr "spara filen som den är utan filer"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:103
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
msgstr "hantera filen som om den kom från sökvägen"
-#: builtin/help.c:47
+#: builtin/help.c:57
msgid "print all available commands"
msgstr "visa alla tillgängliga kommandon"
-#: builtin/help.c:48
+#: builtin/help.c:60
+msgid "show external commands in --all"
+msgstr "visa externa kommandon i --all"
+
+#: builtin/help.c:61
+msgid "show aliases in --all"
+msgstr "visa alias i --all"
+
+#: builtin/help.c:62
msgid "exclude guides"
msgstr "uteslut vägledningar"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "lista användbara vägledningar"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "visa namn på alla konfigurationsvariabler"
-
-#: builtin/help.c:52
+#: builtin/help.c:63
msgid "show man page"
msgstr "visa manualsida"
-#: builtin/help.c:53
+#: builtin/help.c:64
msgid "show manual in web browser"
msgstr "visa manual i webbläsare"
-#: builtin/help.c:55
+#: builtin/help.c:66
msgid "show info page"
msgstr "visa info-sida"
-#: builtin/help.c:57
+#: builtin/help.c:68
msgid "print command description"
msgstr "visa kommandobeskrivning"
-#: 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:70
+msgid "print list of useful guides"
+msgstr "lista användbara vägledningar"
-#: builtin/help.c:163
+#: builtin/help.c:72
+msgid "print all configuration variable names"
+msgstr "visa namn på alla konfigurationsvariabler"
+
+#: builtin/help.c:84
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<kommando>]"
+
+#: builtin/help.c:201
#, c-format
msgid "unrecognized help format '%s'"
msgstr "okänt hjälpformat: \"%s\""
-#: builtin/help.c:190
+#: builtin/help.c:227
msgid "Failed to start emacsclient."
msgstr "Misslyckades starta emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:240
msgid "Failed to parse emacsclient version."
msgstr "Kunde inte tolka emacsclient-version."
-#: builtin/help.c:211
+#: builtin/help.c:248
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient version \"%d\" för gammal (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
#, c-format
msgid "failed to exec '%s'"
msgstr "exec misslyckades för \"%s\""
-#: builtin/help.c:307
+#: builtin/help.c:344
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16248,7 +16947,7 @@
"\"%s\": sökväg för man-visare som ej stöds.\n"
"Använd \"man.<verktyg>.cmd\" istället."
-#: builtin/help.c:319
+#: builtin/help.c:356
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16257,234 +16956,245 @@
"\"%s\": kommando för man-visare som stöds.\n"
"Använd \"man.<verktyg>.path\" istället."
-#: builtin/help.c:436
+#: builtin/help.c:471
#, c-format
msgid "'%s': unknown man viewer."
msgstr "\"%s\": okänd man-visare."
-#: builtin/help.c:452
+#: builtin/help.c:487
msgid "no man viewer handled the request"
msgstr "ingen man-visare hanterade förfrågan"
-#: builtin/help.c:459
+#: builtin/help.c:494
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:555 builtin/help.c:566 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "\"%s\" är ett alias för \"%s\""
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:569 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "felaktig alias.%s-sträng: %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:611
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "flaggan \"%s\" tar inte några argument som inte är flaggor"
+
+#: builtin/help.c:631
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr ""
+"flaggorna '--no-[external-commands|aliases]' kan endast användas med \"--all"
+"\""
+
+#: builtin/help.c:643 builtin/help.c:671
#, c-format
msgid "usage: %s%s"
msgstr "användning: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:666
msgid "'git help config' for more information"
msgstr "\"git help config\" för mer information"
-#: builtin/index-pack.c:222
+#: builtin/hook.c:10
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr "git hook run [--ignore-missing] <krok-namn> [-- <krok-argument>]"
+
+#: builtin/hook.c:30
+msgid "silently ignore missing requested <hook-name>"
+msgstr "ignorera tyst om önskat <krok-namn> saknas"
+
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "objekttyp stämmer inte överens vid %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "emottog inte det förväntade objektet %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objektet %s: förväntad typ %s, såg %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kan inte fylla %d byte"
msgstr[1] "kan inte fylla %d byte"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "tidigt filslut"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "indataläsfel"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:754
msgid "pack too large for current definition of off_t"
msgstr "paket för stort för nuvarande definition av off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "paket är större än tillåten maximal storlek"
-
-#: builtin/index-pack.c:343
+#: builtin/index-pack.c:329
#, c-format
-msgid "unable to create '%s'"
-msgstr "kunde inte skapa \"%s\""
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "paket är större än tillåten maximal storlek (%s)"
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "kan inte öppna paketfilen \"%s\""
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paketversion %<PRIu32> stöds ej"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:380
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:485
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:534
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:542
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:550
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:581
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:583
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:609
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
+#: builtin/index-pack.c:823 builtin/index-pack.c:832
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
-#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
+#: builtin/index-pack.c:757 builtin/pack-objects.c:290
+#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:821
#, c-format
msgid "cannot read existing object info %s"
msgstr "kan inte läsa information om befintligt objekt %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:829
#, c-format
msgid "cannot read existing object %s"
msgstr "kan inte läsa befintligt objekt %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:843
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:846 builtin/index-pack.c:865
msgid "fsck error in packed object"
msgstr "fsck-fel i packat objekt"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:867
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Inte alla barnobjekt för %s kan nås"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:928 builtin/index-pack.c:975
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "slutfördes med %d lokalt objekt"
msgstr[1] "slutfördes med %d lokala objekt"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanskontrollsumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketet har %d oanalyserat delta"
msgstr[1] "paketet har %d oanalyserade delta"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
@@ -16494,56 +17204,53 @@
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1445
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".%s\""
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "kan inte ta skriva %s-fil \"%s\""
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "kan inte stänga skriven %s-fil \"%s\""
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1494
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "kunde inte byta namn på temporär \"*.%s\"-fil till \"%s\""
+
+#: builtin/index-pack.c:1519
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "kan inte spara paketfil"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "kan inte spara indexfil"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1648
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1650
#, 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:1699
+#: builtin/index-pack.c:1698
#, 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:1706
+#: builtin/index-pack.c:1705
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -16555,33 +17262,25 @@
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "okänd hashningsalgoritm \"%s\""
-#: builtin/index-pack.c:1850
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin kan inte användas med --stdin"
-
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1856
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
-#: builtin/index-pack.c:1854
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format kan inte användas med --stdin"
-
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1873
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "fsck-fel i packat objekt"
@@ -16702,10 +17401,6 @@
msgid "specify the hash algorithm to use"
msgstr "ange hashningsalgoritm att använda"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
@@ -16794,40 +17489,40 @@
msgid "no input file given for in-place editing"
msgstr "ingen indatafil angiven för redigering på plats"
-#: builtin/log.c:59
+#: builtin/log.c:60
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/log.c:60
+#: builtin/log.c:61
msgid "git show [<options>] <object>..."
msgstr "git show [<flaggor>] <objekt>..."
-#: builtin/log.c:113
+#: builtin/log.c:114
#, c-format
msgid "invalid --decorate option: %s"
msgstr "ogiltig flagga för --decorate: %s"
-#: builtin/log.c:180
+#: builtin/log.c:181
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:181
+#: builtin/log.c:182
msgid "use mail map file"
msgstr "använd e-postmappningsfil"
-#: builtin/log.c:184
+#: builtin/log.c:185
msgid "only decorate refs that match <pattern>"
msgstr "dekorera endast referenser som motsvarar <mönster>"
-#: builtin/log.c:186
+#: builtin/log.c:187
msgid "do not decorate refs that match <pattern>"
msgstr "dekorera inte referenser som motsvarar <mönster>"
-#: builtin/log.c:187
+#: builtin/log.c:188
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:190
+#: builtin/log.c:191
msgid ""
"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
@@ -16835,89 +17530,93 @@
"spåra utvecklingen av radintervallet <start>,<slut> eller funktionen :"
"<funknamn> i <fil>"
-#: builtin/log.c:213
+#: builtin/log.c:214
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation"
-#: builtin/log.c:306
+#: builtin/log.c:322
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:429
+msgid "unable to create temporary object directory"
+msgstr "kunde inte skapa temporär objektkatalog"
+
+#: builtin/log.c:599
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:614 builtin/log.c:706
#, c-format
msgid "could not read object %s"
msgstr "kunde inte läsa objektet %s"
-#: builtin/log.c:701
+#: builtin/log.c:731
#, c-format
msgid "unknown type: %d"
msgstr "okänd typ: %d"
-#: builtin/log.c:846
+#: builtin/log.c:880
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: ogiltigt omslag från beskrivningsläge"
-#: builtin/log.c:853
+#: builtin/log.c:887
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:982
+#: builtin/log.c:1016
#, c-format
msgid "cannot open patch file %s"
msgstr "kan inte öppna patchfilen %s"
-#: builtin/log.c:999
+#: builtin/log.c:1033
msgid "need exactly one range"
msgstr "behöver precis ett intervall"
-#: builtin/log.c:1009
+#: builtin/log.c:1043
msgid "not a range"
msgstr "inte ett intervall"
-#: builtin/log.c:1173
+#: builtin/log.c:1207
msgid "cover letter needs email format"
msgstr "omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1179
+#: builtin/log.c:1213
msgid "failed to create cover-letter file"
msgstr "misslyckades skapa fil för omslagsbrev"
-#: builtin/log.c:1266
+#: builtin/log.c:1300
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1327
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1385
msgid "two output directories?"
msgstr "två utdatakataloger?"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
#, c-format
msgid "unknown commit %s"
msgstr "okänd incheckning %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1547 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:1522
+#: builtin/log.c:1556
msgid "could not find exact merge base"
msgstr "kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1532
+#: builtin/log.c:1566
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"
@@ -16927,416 +17626,408 @@
"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:1555
+#: builtin/log.c:1589
msgid "failed to find exact merge base"
msgstr "kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1572
+#: builtin/log.c:1606
msgid "base commit should be the ancestor of revision list"
msgstr "basincheckningen bör vara förfader till revisionslistan"
-#: builtin/log.c:1582
+#: builtin/log.c:1616
msgid "base commit shouldn't be in revision list"
msgstr "basincheckningen bör inte vara i revisionslistan"
-#: builtin/log.c:1640
+#: builtin/log.c:1674
msgid "cannot get patch id"
msgstr "kan inte hämta patch-id"
-#: builtin/log.c:1703
+#: builtin/log.c:1737
msgid "failed to infer range-diff origin of current series"
msgstr "misslyckades räkna ut intervalldiff-ursprung för aktuell serie"
-#: builtin/log.c:1705
+#: builtin/log.c:1739
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "använd \"%s\" som intervalldiff-ursprung för aktuell serie"
-#: builtin/log.c:1749
+#: builtin/log.c:1783
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:1752
+#: builtin/log.c:1786
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1756
+#: builtin/log.c:1790
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1758
+#: builtin/log.c:1792
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1760
+#: builtin/log.c:1794
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1761
+#: builtin/log.c:1795
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1762
+#: builtin/log.c:1796
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1764
+#: builtin/log.c:1798
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1765
+#: builtin/log.c:1799
msgid "reroll-count"
msgstr "antal iterationer"
-#: builtin/log.c:1766
+#: builtin/log.c:1800
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1768
+#: builtin/log.c:1802
msgid "max length of output filename"
msgstr "maximal längd för utdatafilnamn"
-#: builtin/log.c:1770
+#: builtin/log.c:1804
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "använd [RFC PATCH] istället för [PATCH]"
-#: builtin/log.c:1773
+#: builtin/log.c:1807
msgid "cover-from-description-mode"
msgstr "cover-from-description-läge"
-#: builtin/log.c:1774
+#: builtin/log.c:1808
msgid "generate parts of a cover letter based on a branch's description"
msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen"
-#: builtin/log.c:1776
+#: builtin/log.c:1810
msgid "use [<prefix>] instead of [PATCH]"
msgstr "använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1779
+#: builtin/log.c:1813
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1782
+#: builtin/log.c:1816
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1785
+#: builtin/log.c:1819
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1787
+#: builtin/log.c:1821
msgid "output all-zero hash in From header"
msgstr "använd hashvärde med nollor i From-huvud"
-#: builtin/log.c:1789
+#: builtin/log.c:1823
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1791
+#: builtin/log.c:1825
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1793
+#: builtin/log.c:1827
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1794
+#: builtin/log.c:1828
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1795
+#: builtin/log.c:1829
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1830 builtin/log.c:1831
msgid "email"
msgstr "epost"
-#: builtin/log.c:1796
+#: builtin/log.c:1830
msgid "add To: header"
msgstr "lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1797
+#: builtin/log.c:1831
msgid "add Cc: header"
msgstr "lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1798
+#: builtin/log.c:1832
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1799
+#: builtin/log.c:1833
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:1801
+#: builtin/log.c:1835
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1802
+#: builtin/log.c:1836
msgid "make first mail a reply to <message-id>"
msgstr "gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1837 builtin/log.c:1840
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1804
+#: builtin/log.c:1838
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1807
+#: builtin/log.c:1841
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1811
+#: builtin/log.c:1845
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1813
+#: builtin/log.c:1847
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1814
+#: builtin/log.c:1848
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1815
+#: builtin/log.c:1849
msgid "base-commit"
msgstr "basincheckning"
-#: builtin/log.c:1816
+#: builtin/log.c:1850
msgid "add prerequisite tree info to the patch series"
msgstr "lägg till förhandskrävd trädinfo i patchserien"
-#: builtin/log.c:1819
+#: builtin/log.c:1853
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1820
+#: builtin/log.c:1854
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1822
+#: builtin/log.c:1856
msgid "show progress while generating patches"
msgstr "visa förloppsindikator medan patchar skapas"
-#: builtin/log.c:1824
+#: builtin/log.c:1858
msgid "show changes against <rev> in cover letter or single patch"
msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch"
-#: builtin/log.c:1827
+#: builtin/log.c:1861
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1863 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "procent som skapelse vägs med"
-#: builtin/log.c:1916
+#: builtin/log.c:1953
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n och -k kan inte användas samtidigt"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1978
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1943
+#: builtin/log.c:1980
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1945
+#: builtin/log.c:1982
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, och --output-directory är ömsesidigt uteslutande"
+#: builtin/log.c:1984
+msgid "--remerge-diff does not make sense"
+msgstr "kan inte använda --remerge-diff"
-#: builtin/log.c:2089
+#: builtin/log.c:2129
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff kräver --cover-letter eller ensam patch"
-#: builtin/log.c:2093
+#: builtin/log.c:2133
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:2094
+#: builtin/log.c:2134
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff mot v%d:"
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor kräver --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2144
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff kräver --cover-letter eller ensam patch"
-#: builtin/log.c:2112
+#: builtin/log.c:2152
msgid "Range-diff:"
msgstr "Intervall-diff:"
-#: builtin/log.c:2113
+#: builtin/log.c:2153
#, c-format
msgid "Range-diff against v%d:"
msgstr "Intervall-diff mot v%d:"
-#: builtin/log.c:2124
+#: builtin/log.c:2164
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:2160
+#: builtin/log.c:2200
msgid "Generating patches"
msgstr "Skapar patchar"
-#: builtin/log.c:2204
+#: builtin/log.c:2244
msgid "failed to create output files"
msgstr "misslyckades skapa utdatafiler"
-#: builtin/log.c:2263
+#: builtin/log.c:2304
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2358
#, 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:563
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "sökvägar avdelas med NUL-tecken"
+
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
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:623
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "använd små bokstäver för \"fsmonitor clean\"-filer"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
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:640
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "visa radslut i filer"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "exkludera mönster som läses från <fil>"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "läs exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:666
-msgid "recurse through submodules"
-msgstr "rekursera ner i undermoduler"
-
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
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:669
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
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:672
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "visa felsökningsutdata"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "undertyck dublettposter"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "visa glesa kataloger när et glest index existerar"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<arkiv> [<referenser>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<arkiv> [<referenser>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "visa inte fjärr-URL"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
msgid "exec"
msgstr "exec"
@@ -17368,42 +18059,70 @@
msgid "show underlying ref in addition to the object pointed by it"
msgstr "visa underliggande referens och objektet det pekar på"
-#: builtin/ls-tree.c:30
+#: builtin/ls-tree.c:36
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:54
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "kunde inte hämta objektinfo om \"%s\""
+
+#: builtin/ls-tree.c:79
+#, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "felaktigt ls-tree-format: elementet \"%s\" börjar inte med \"(\""
+
+#: builtin/ls-tree.c:83
+#, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "felaktigt ls-tree-format: elementet \"%s\" slutar inte med \")\""
+
+#: builtin/ls-tree.c:109
+#, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr "felaktigt ls-tree-format: %%%.*s"
+
+#: builtin/ls-tree.c:336
msgid "only show trees"
msgstr "visa endast träd"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:338
msgid "recurse into subtrees"
msgstr "rekursera ner i underträd"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:340
msgid "show trees when recursing"
msgstr "visa träd medan rekursering"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:343
msgid "terminate entries with NUL byte"
msgstr "terminera poster med NUL-byte"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:344
msgid "include object size"
-msgstr "inkludera objektstorlek"
+msgstr "ta med objektstorlek"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
msgid "list only filenames"
msgstr "visa endast filnamn"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:350
+msgid "list only objects"
+msgstr "lista endast objekt"
+
+#: builtin/ls-tree.c:353
msgid "use full path names"
msgstr "använd fullständiga sökvägsnamn"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:355
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
+#: builtin/ls-tree.c:391
+msgid "--format can't be combined with other format-altering options"
+msgstr "--format kan inte kombineras med andra formatändrande flaggor"
+
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
@@ -17453,7 +18172,11 @@
msgid "use headers in message's body"
msgstr "använd huvuden i brevkroppen"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:227
+msgid "reading patches from stdin/tty..."
+msgstr "läser patchar från standard in/tty..."
+
+#: builtin/mailsplit.c:242
#, c-format
msgid "empty mbox: '%s'"
msgstr "tom mbox: \"%s\""
@@ -17478,23 +18201,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <ref> [<incheckning>]"
-#: builtin/merge-base.c:143
+#: builtin/merge-base.c:144
msgid "output all common ancestors"
msgstr "skriv ut alla gemensamma anfäder"
-#: builtin/merge-base.c:145
+#: builtin/merge-base.c:146
msgid "find ancestors for a single n-way merge"
msgstr "hitta anfader för enkel n-vägssammanslagning"
-#: builtin/merge-base.c:147
+#: builtin/merge-base.c:148
msgid "list revs not reachable from others"
msgstr "visa revisioner som inte kan nås från andra"
-#: builtin/merge-base.c:149
+#: builtin/merge-base.c:150
msgid "is the first one ancestor of the other?"
msgstr "är den första anfader till den andra?"
-#: builtin/merge-base.c:151
+#: builtin/merge-base.c:152
msgid "find where <commit> forked from reflog of <ref>"
msgstr "se var <incheckning> grenades av från referensloggen från <ref>"
@@ -17515,26 +18238,30 @@
msgstr "använd diff3-baserad sammanslagning"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "använd nitisk diff3-baserad sammanslagning"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "för konflikter, använd vår version"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "för konflikter, använd deras version"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "för konflikter, använd en förenad version"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "för konflikter, använd denna markörstorlek"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "varna inte om konflikter"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "sätt etiketter för fil1/origfil/fil2"
@@ -17569,184 +18296,188 @@
msgid "Merging %s with %s\n"
msgstr "Slår ihop %s med %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<flaggor>] [<incheckning>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "flaggan \"m\" behöver ett värde"
-#: builtin/merge.c:146
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "flaggan \"%s\" behöver ett värde"
-#: builtin/merge.c:199
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Tillgängliga strategier är:"
-#: builtin/merge.c:205
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "visa inte en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
-#: builtin/merge.c:271
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1145 builtin/revert.c:114
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "använd <namn> istället för det verkliga målet"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "avbryt den pågående sammanslagningen"
-#: builtin/merge.c:292
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort men lämna index och arbetskatalog ensamma"
-#: builtin/merge.c:294
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "fortsätt den pågående sammanslagningen"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "tillåt sammanslagning av orelaterade historier"
-#: builtin/merge.c:303
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "förbigå pre-merge-commit- och commit-msg-krokar"
-#: builtin/merge.c:320
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "kunde köra stash."
-#: builtin/merge.c:325
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "stash misslyckades"
-#: builtin/merge.c:330
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "inte ett giltigt objekt: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "read-tree misslyckades"
-#: builtin/merge.c:400
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "Redan à jour. (inget att platta till)"
-#: builtin/merge.c:414
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "\"%s\" verkar inte peka på en incheckning"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
-#: builtin/merge.c:742
+#: builtin/merge.c:745
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Felaktig flagga för merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "okänd strategiflagga: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "kunde inte skriva %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "Kunde inte läsa från \"%s\""
-#: builtin/merge.c:822
+#: builtin/merge.c:825
#, 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:828
+#: builtin/merge.c:831
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"
@@ -17757,11 +18488,11 @@
"temagren.\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17770,73 +18501,73 @@
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
"avbryter incheckningen.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:900
msgid "Empty commit message."
msgstr "Tomt incheckningsmeddelande."
-#: builtin/merge.c:904
+#: builtin/merge.c:915
#, c-format
msgid "Wonderful.\n"
msgstr "Underbart.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:976
#, 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:1004
+#: builtin/merge.c:1015
msgid "No current branch."
msgstr "Inte på någon gren."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1017
msgid "No remote for the current branch."
msgstr "Ingen fjärr för aktuell gren."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1019
msgid "No default upstream defined for the current branch."
msgstr "Ingen standarduppström angiven för aktuell gren."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1024
#, 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:1070
+#: builtin/merge.c:1081
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
-#: builtin/merge.c:1173
+#: builtin/merge.c:1183
#, 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:1207
+#: builtin/merge.c:1217
msgid "not something we can merge"
msgstr "inte något vi kan slå ihop"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1330
msgid "--abort expects no arguments"
msgstr "--abort tar inga argument"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1334
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1352
msgid "--quit expects no arguments"
msgstr "--quit tar inga argument"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1365
msgid "--continue expects no arguments"
msgstr "--continue tar inga argument"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1369
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1385
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17844,7 +18575,7 @@
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1392
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17852,97 +18583,81 @@
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1395
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:1396
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Du kan inte kombinera --squash med --no-ff."
-
-#: builtin/merge.c:1398
-msgid "You cannot combine --squash with --commit."
-msgstr "Du kan inte kombinera --squash med --commit."
-
-#: builtin/merge.c:1414
+#: builtin/merge.c:1427
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1431
+#: builtin/merge.c:1444
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1446
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:1438
+#: builtin/merge.c:1451
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1453
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:1521
+#: builtin/merge.c:1540
msgid "refusing to merge unrelated histories"
msgstr "vägrar slå samman orelaterad historik"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1559
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1606
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1613
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "Kan inte snabbspola, avbryter."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1671 builtin/merge.c:1737
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1675
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1727
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1729
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1739
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Använder strategin %s för att förbereda lösning för hand.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1753
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr "git mktag"
-
#: builtin/mktag.c:27
#, c-format
msgid "warning: tag input does not pass fsck: %s"
@@ -17980,10 +18695,6 @@
msgid "unable to write tag file"
msgstr "kunde inte skriva tagg-filen"
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
-
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "indata är NUL-terminerad"
@@ -17997,34 +18708,50 @@
msgstr "tillåt skapa mer än ett träd"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<flaggor>] write [--preferred-pack=<paket>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<flaggor>] write [--preferred-pack=<paket>] [--refs-"
+"snapshot=<sökväg>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<flaggor>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<flaggor>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<flaggor>] repack [--batch-size=<storlek>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "föredraget paket"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "paket att återanvända vid beräkning av multipaketsbitkarta"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "skriv flerpaketsbitkarta"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "skriv flerpaketsindex som endast innehåller angivna index"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "refs-ögonblicksbild för att välja bitkarte-incheckningar"
+
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18032,11 +18759,6 @@
"vid ompackning, samla mindre paketfiler i en bunt som är större än denna "
"storlek"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "okänt underkommando: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<flaggor>] <källa>... <mål>"
@@ -18064,117 +18786,121 @@
msgid "skip move/rename errors"
msgstr "hoppa över fel vid flytt/namnändring"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destinationen \"%s\" är ingen katalog"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "felaktig källa"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "kan inte flytta katalog till sig själv"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "kan inte flytta katalog över fil"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "källkatalogen är tom"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "inte versionshanterad"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "i konflikt"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "destinationen finns"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "skriver över \"%s\""
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Kan inte skriva över"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "flera källor för samma mål"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "destinationskatalogen finns inte"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, källa=%s, mål=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:524
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<flaggor>] <incheckning>..."
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:525
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<flaggor>] --all"
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<flaggor>] --stdin"
+#: builtin/name-rev.c:526
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [<flaggor>] --annotate-stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:583
msgid "print only ref-based names (no object names)"
msgstr "skriv endast referensbaserade namn (inga objektnamn)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:584
msgid "only use tags to name the commits"
msgstr "använd endast taggar för att namnge incheckningar"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:586
msgid "only use refs matching <pattern>"
msgstr "använd endast referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:588
msgid "ignore refs matching <pattern>"
msgstr "ignorera referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:590
msgid "list all commits reachable from all refs"
msgstr "lista alla incheckningar som kan nås alla referenser"
-#: builtin/name-rev.c:532
-msgid "read from stdin"
-msgstr "läs från standard in"
+#: builtin/name-rev.c:591
+msgid "deprecated: use annotate-stdin instead"
+msgstr "avråds: använd annotate-stdin istället"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:592
+msgid "annotate text from stdin"
+msgstr "annotera text från standard in"
+
+#: builtin/name-rev.c:593
msgid "allow to print `undefined` names (default)"
msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:599
msgid "dereference tags in the input (internal use)"
msgstr "avreferera taggar i indata (används internt)"
@@ -18218,14 +18944,6 @@
"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] "
"<anteckningsref>"
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
-
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]"
@@ -18286,69 +19004,65 @@
msgid "git notes prune [<options>]"
msgstr "git notes prune [<flaggor>]"
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "Skriv/redigera anteckningar för följande objekt:"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "kunde inte starta \"show\" för objektet \"%s\""
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "kunde inte läsa utdata från \"show\""
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
-#: builtin/notes.c:197
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr "ange innehåll för anteckningen med antingen -m eller -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "kunde inte skriva anteckningsobjekt"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
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:576
+#: builtin/notes.c:240 builtin/tag.c:582
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "kunde inte läsa objektet \"%s\"."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "felaktig indatarad: \"%s\"."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\""
@@ -18356,48 +19070,41 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
-msgid "too many arguments"
-msgstr "för många argument"
-
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "inga anteckningar hittades för objektet %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "anteckningsinnehåll som sträng"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "anteckningsinnehåll i en fil"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "återanvänd och redigera angivet anteckningsobjekt"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "återanvänd angivet anteckningsobjekt"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "tillåt lagra tom anteckning"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "ersätt befintliga anteckningar"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18406,29 +19113,29 @@
"Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "
"objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "Tar bort anteckning för objektet %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "läs objekt från standard in"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "för få argument"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18437,12 +19144,12 @@
"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
"%s. Använd \"-f\" för att skriva över befintliga anteckningar"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18451,52 +19158,52 @@
"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "misslyckades ta bort referensen NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\""
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "misslyckades bestämma NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "misslyckades färdigställa sammanslagning av anteckningar"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "okänd sammanslagningsstrategi för anteckningar: %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Allmänna flaggor"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Flaggor för sammanslagning"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18504,48 +19211,48 @@
"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Checkar in ej sammanslagna anteckningar"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"färdigställ sammanslagning av anteckningar genom att checka in ej "
"sammanslagna anteckningar"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Avbryt lösning av sammanslagning av anteckningar"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "avbryt sammanslagning av anteckningar"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "kan inte blanda --commit, --abort eller -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "måste ange en antecknings-referens att slå ihop"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "okänd -s/--strategy: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18556,41 +19263,41 @@
"%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:589
+#: builtin/notes.c:899 builtin/tag.c:595
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/notes.c:900
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "Objektet %s har ingen anteckning\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
-#: builtin/notes.c:915
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
-#: builtin/notes.c:955
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "rapportera borttagna anteckningar"
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "anteckningar-ref"
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1036 builtin/stash.c:1802
#, c-format
msgid "unknown subcommand: %s"
msgstr "okänt underkommando: %s"
@@ -18607,7 +19314,7 @@
msgstr ""
"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:570
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18616,107 +19323,111 @@
"write_reuse_object: kunde inte hitta %s, förväntat på position %<PRIuMAX> i "
"paketet %s"
-#: builtin/pack-objects.c:580
+#: builtin/pack-objects.c:578
#, c-format
msgid "bad packed object CRC for %s"
msgstr "felaktig CRC för packat objekt %s"
-#: builtin/pack-objects.c:591
+#: builtin/pack-objects.c:589
#, c-format
msgid "corrupt packed object for %s"
msgstr "trasigt packat objekt för %s"
-#: builtin/pack-objects.c:722
+#: builtin/pack-objects.c:720
#, c-format
msgid "recursive delta detected for object %s"
msgstr "rekursivt delta upptäcktes för objektet %s"
-#: builtin/pack-objects.c:941
+#: builtin/pack-objects.c:939
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "ordnade %u objekt, förväntade %<PRIu32>"
-#: builtin/pack-objects.c:1036
+#: builtin/pack-objects.c:1034
#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "förväntade objekt på position %<PRIuMAX> i paketet %s"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1158
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:1168
+#: builtin/pack-objects.c:1171
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1243 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "misslyckades ta status på %s"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1276
+msgid "failed to write bitmap index"
+msgstr "misslyckade skriva bitkarteindex"
+
+#: builtin/pack-objects.c:1302
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1544
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:1971
+#: builtin/pack-objects.c:1992
#, 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:1980
+#: builtin/pack-objects.c:2001
#, 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:2261
+#: builtin/pack-objects.c:2282
msgid "Counting objects"
msgstr "Räknar objekt"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2447
#, c-format
msgid "unable to parse object header of %s"
msgstr "kunde inte tolka objekthuvud för %s"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
+#: builtin/pack-objects.c:2543
#, c-format
msgid "object %s cannot be read"
msgstr "objektet %s kunde inte läsas"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
#, 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:2536
+#: builtin/pack-objects.c:2557
msgid "suboptimal pack - out of memory"
msgstr "icke-optimalt pack - minnet slut"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2872
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Deltakomprimering använder upp till %d trådar"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3011
#, 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:3076
+#: builtin/pack-objects.c:3097
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3103
msgid "inconsistency with delta count"
msgstr "deltaräknaren är inkonsekvent"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3182
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18725,24 +19436,25 @@
"värdet på uploadpack.blobpackfileuri måste vara på formen '<objekt-hash> "
"<paket-hash> <uri>' (fick '%s')"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3185
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
"objektet redan konfigurerat i et annat uploadpack.blobpackfileuri (fick '%s)"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3220
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "kunde inte hämta typ för objektet %s i paketet %s"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
+#: builtin/pack-objects.c:3373
#, c-format
msgid "could not find pack '%s'"
msgstr "kunde inte hitta paketet \"%s\""
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3416
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18751,7 +19463,7 @@
"förväntade kant-objekt-id, fick skräp:\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3422
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -18760,248 +19472,240 @@
"förväntade objekt-id, fick skräp:\n"
" %s"
-#: builtin/pack-objects.c:3482
-msgid "invalid value for --missing"
-msgstr "ogiltigt värde för --missing"
-
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
msgid "cannot open pack index"
msgstr "kan inte öppna paketfilen"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3549
#, 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:3658
+#: builtin/pack-objects.c:3635
msgid "unable to force loose object"
msgstr "kan inte tvinga lösa objekt"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3763
#, c-format
msgid "not a rev '%s'"
msgstr "inte en referens \"%s\""
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "felaktig revision \"%s\""
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3794
msgid "unable to add recent objects"
msgstr "kan inte lägga till nya objekt"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3847
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3851
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3907
msgid "<version>[,<offset>]"
msgstr "<version>[,<offset>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3908
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3911
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3913
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från supplerande objektlager"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3915
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3917
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3919
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:3929
+#: builtin/pack-objects.c:3921
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:3931
+#: builtin/pack-objects.c:3923
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3925
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3927
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3929
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:3939
+#: builtin/pack-objects.c:3931
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3933
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3935
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:3946
+#: builtin/pack-objects.c:3938
msgid "include objects reachable from any reference"
-msgstr "inkludera objekt som kan nås från någon referens"
+msgstr "ta med objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3941
msgid "include objects referred by reflog entries"
-msgstr "inkludera objekt som refereras från referensloggposter"
+msgstr "ta med objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3944
msgid "include objects referred to by the index"
-msgstr "inkludera objekt som refereras från indexet"
+msgstr "ta med objekt som refereras från indexet"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3947
msgid "read packs from stdin"
msgstr "läs paket från standard in"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3949
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3951
msgid "include tag objects that refer to objects to be packed"
-msgstr "inkludera taggobjekt som refererar objekt som ska packas"
+msgstr "ta med taggobjekt som refererar objekt som ska packas"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3953
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3955
msgid "pack loose unreachable objects"
msgstr "packa lösa onåbara objekt"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3957
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3960
msgid "use the sparse reachability algorithm"
msgstr "använd gles-nåbarhetsalgoritmen"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3962
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3964
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3966
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3968
msgid "ignore this pack"
msgstr "ignorera detta paket"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3970
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3972
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3974
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:3984
+#: builtin/pack-objects.c:3976
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3980
msgid "write a bitmap index if possible"
msgstr "skriv bitkartindex om möjligt"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3984
msgid "handling for missing objects"
msgstr "hantering av saknade objekt"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3987
msgid "do not pack objects in promisor packfiles"
msgstr "packa inte objekt i kontraktspackfiler"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3989
msgid "respect islands during delta compression"
msgstr "respektera öar under deltakomprimering"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3991
msgid "protocol"
msgstr "protokoll"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3992
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
"uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4027
#, 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:4038
+#: builtin/pack-objects.c:4032
#, 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:4094
+#: builtin/pack-objects.c:4088
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:4096
+#: builtin/pack-objects.c:4090
msgid "minimum pack size limit is 1 MiB"
msgstr "minsta packstorlek är 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4095
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:4104
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable och --unpack-unreachable kan inte användas samtidigt"
-
-#: builtin/pack-objects.c:4110
msgid "cannot use --filter without --stdout"
msgstr "kan inte använda --filter utan --stdout"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4106
msgid "cannot use --filter with --stdin-packs"
msgstr "kan inte använda --filter med --stdin-packs"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4110
msgid "cannot use internal rev list with --stdin-packs"
msgstr "kan inte använda intern revisionslista med --stdin-packs"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4169
msgid "Enumerating objects"
msgstr "Räknar upp objekt"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4210
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19036,77 +19740,67 @@
msgid "prune loose refs (default)"
msgstr "ta bort lösa referenser (standard)"
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "rapportera borttagna objekt"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "låt tid gå ut för objekt äldre än <tid>"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr "begränsa vandring av objekt utanför kontraktspackfiler."
-#: builtin/prune.c:152
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Felaktigt värde för %s: %s"
-
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "styrning för rekursiv hämtning av undermoduler"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Alternativ gällande sammanslagning"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "styr användning av pre-merge-commit- och commit-msg-krokar"
+
+#: builtin/pull.c:171 parse-options.h:371
msgid "automatically stash/stash pop before and after"
msgstr "utför automatiskt stash/stash pop före och efter"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Alternativ gällande hämtningar"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: 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:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -19114,14 +19808,14 @@
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
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:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19129,7 +19823,7 @@
"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
"motsvarade något i fjärränden."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19140,41 +19834,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:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:978
msgid "You are not currently on a branch."
msgstr "Du är inte på någon gren för närvarande."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Ange vilken gren du vill ombasera mot."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Ange vilken gren du vill slå samman med."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Se git-pull(1) för detaljer."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:984
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:374
msgid "<branch>"
msgstr "<gren>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:976
msgid "There is no tracking information for the current branch."
msgstr "Det finns ingen spårningsinformation för aktuell gren."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
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:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19183,22 +19878,22 @@
"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:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "kunde inte komma åt incheckningen %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorera --verify-signatures för ombasering"
-#: builtin/pull.c:930
+#: builtin/pull.c:969
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
@@ -19208,11 +19903,11 @@
"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"
+"Du har avvikande grenar och måste ange hur de skall förlikas.\n"
+"Du kan göra detta genom att köra ett av följande kommando innan du\n"
+"gör \"pull\" nästa gång: \n"
"\n"
-" git config pull.rebase false # sammanslagning (förvald strategi)\n"
+" git config pull.rebase false # sammanslagning\n"
" git config pull.rebase true # ombasering\n"
" git config pull.ff only # endast snabbspolning\n"
"\n"
@@ -19221,19 +19916,19 @@
"eller --ff-only på kommandoraden för att överstyra det konfigurerade\n"
"förvalet vid körning.\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1047
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:994
+#: builtin/pull.c:1051
msgid "pull with rebase"
msgstr "pull med ombasering"
-#: builtin/pull.c:995
+#: builtin/pull.c:1052
msgid "please commit or stash them."
msgstr "checka in eller använd \"stash\" på dem."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1077
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19244,7 +19939,7 @@
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1083
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19261,15 +19956,23 @@
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1098
msgid "Cannot merge multiple branches into empty head."
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1103
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1105
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Kan inte snabbspola till flera grenar."
+
+#: builtin/pull.c:1120
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Måste ange hur avvikande grenar skall förlikas."
+
+#: builtin/pull.c:1134
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
@@ -19445,15 +20148,15 @@
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3377
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "spegla alla referenser"
@@ -19465,19 +20168,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<refnamn>:<förvänta>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
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:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "kräv att fjärruppdateringar har integrerats lokalt"
@@ -19485,12 +20188,12 @@
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "program för att ta emot paket"
@@ -19510,18 +20213,14 @@
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
@@ -19552,26 +20251,14 @@
"\n"
" git push <namn>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all och --tags är inkompatibla"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror och --tags är inkompatibla"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all och --mirror är inkompatibla"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "push-flaggor kan inte innehålla radbrytning"
@@ -19625,86 +20312,86 @@
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<fil>] (--empty | <träd-"
+"igt1> [<träd-igt2> [<träd-igt3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "skriv resulterande index till <fil>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "töm bara indexet"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Sammanslagning"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "utför en sammanslagning i tillägg till en läsning"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "3-vägssammanslagning när det finns tillägg och borttagningar"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "som -m, men kasta bort ej sammanslagna poster"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<underkatalog>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "läs in trädet i indexet under <underkatalog>/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "tillåt explicit ignorerade filer att skrivas över"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "kontrollera inte arbetskatalogen efter sammanslagning"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "uppdatera inte indexet eller arbetskatalogen"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "hoppa över att applicera filter för gles utcheckning"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "undertryck återkopplingsmeddelanden"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:190
msgid "You need to resolve your current index first"
msgstr "Du måste lösa ditt befintliga index först"
-#: builtin/rebase.c:35
+#: builtin/rebase.c:36
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -19712,203 +20399,50 @@
"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas> | --keep-base] "
"[<uppström> [<gren>]]"
-#: builtin/rebase.c:37
+#: builtin/rebase.c:38
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:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "oanvändbar todo-lista: %s"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:231
#, c-format
msgid "could not create temporary %s"
msgstr "kunde inte skapa temporär %s"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:237
msgid "could not mark as interactive"
msgstr "kunde inte markera som interaktiv"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:290
msgid "could not generate todo list"
msgstr "Kunde inte skapa attgöra-lista"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:332
msgid "a base commit must be provided with --upstream or --onto"
msgstr "en basincheckning måste anges med --upstream eller --onto"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<flaggor>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "behåller incheckningar som är tomma från början"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "tillåt incheckningar med tomt meddelande"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "ombasera sammanslagningar"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "behåll ursprungliga förgreningspunkter för kusiner"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "flytta incheckningar som inleds med squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "signera incheckningar"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "vis diffstat för vad som ändrats uppströms"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "fortsätt ombasering"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "hoppa över incheckning"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "redigera attgöra-listan"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "visa nuvarande patch"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "förkorta inchecknings-id i todo-listan"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "utöka inchecknings-id i todo-listan"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "kontrollera todo-listan"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "ordna om fixup-/squash-rader"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "lägg in exec-kommandon i todo-listan"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "ovanpå"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "begränsa revision"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "tryck ihop ovanpå"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "uppströmsincheckningen"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "namn på huvud"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "sammanslagningsstrategi"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "strategiflaggor"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "gren eller inchecking att checka ut"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "på-namn"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "kmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "kommando att köra"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:391
#, c-format
msgid "%s requires the merge backend"
msgstr "%s kräver \"merge\"-bakändan"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:433
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "kunde inte hämta \"onto\": \"%s\""
-#: builtin/rebase.c:642
+#: builtin/rebase.c:450
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "ogiltigt orig-head: \"%s\""
-#: builtin/rebase.c:667
+#: builtin/rebase.c:475
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\""
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:600
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19922,7 +20456,7 @@
"För att avbryta och återgå till där du var före ombaseringen, kör \"git "
"rebase --abort\"."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:685
#, c-format
msgid ""
"\n"
@@ -19941,7 +20475,12 @@
"\n"
"Därför kan inte git ombasera dessa."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:836
+#, c-format
+msgid "could not switch to %s"
+msgstr "kunde inte växla till %s"
+
+#: builtin/rebase.c:952
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -19949,7 +20488,7 @@
msgstr ""
"okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:970
#, c-format
msgid ""
"%s\n"
@@ -19966,7 +20505,7 @@
" git rebase '<gren>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:986
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -19979,182 +20518,180 @@
" git branch --set-upstream-to=%s/<gren> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:1016
msgid "exec commands cannot contain newlines"
msgstr "exec-kommandon kan inte innehålla nyradstecken"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:1020
msgid "empty exec command"
msgstr "tomt exec-kommando"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1051
msgid "rebase onto given branch instead of upstream"
msgstr "ombasera mot given grenen istället för uppström"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1053
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:1323
+#: builtin/rebase.c:1055
msgid "allow pre-rebase hook to run"
msgstr "tillåt pre-rebase-krok att köra"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1057
msgid "be quiet. implies --no-stat"
msgstr "var tyst. implicerar --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1060
+msgid "display a diffstat of what changed upstream"
+msgstr "vis diffstat för vad som ändrats uppströms"
+
+#: builtin/rebase.c:1063
msgid "do not show diffstat of what changed upstream"
msgstr "visa inte en diffstat för vad som ändrats uppströms"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1066
msgid "add a Signed-off-by trailer to each commit"
msgstr "lägg \"Signed-off-by:\"-släprad till varje incheckning"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1069
msgid "make committer date match author date"
msgstr "sätt incheckningsdatum till författardatum"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1071
msgid "ignore author date and use current date"
msgstr "ignorera författardatum och använd nuvarande"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1073
msgid "synonym of --reset-author-date"
msgstr "synonym för --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1075 builtin/rebase.c:1079
msgid "passed to 'git apply'"
msgstr "sänds till \"git apply\""
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1077
msgid "ignore changes in whitespace"
msgstr "ignorera ändringar i blanksteg"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1081 builtin/rebase.c:1084
msgid "cherry-pick all commits, even if unchanged"
msgstr "utför cherry-pick på alla incheckningar, även om oändrad"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1086
msgid "continue"
msgstr "fortsätt"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1089
msgid "skip current patch and continue"
msgstr "hoppa över nuvarande patch och fortsätt"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1091
msgid "abort and check out the original branch"
msgstr "avbryt och checka ut ursprungsgrenen"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1094
msgid "abort but keep HEAD where it is"
msgstr "avbryt men behåll HEAD där det är"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1095
msgid "edit the todo list during an interactive rebase"
msgstr "redigera attgöra-listan under interaktiv ombasering."
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1098
msgid "show the patch file being applied or merged"
msgstr "visa patchen som tillämpas eller slås samman"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1101
msgid "use apply strategies to rebase"
msgstr "använd appliceringstrategier för ombasering"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1105
msgid "use merging strategies to rebase"
msgstr "använd sammanslagningsstrategier för ombasering"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1109
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:1381
+#: builtin/rebase.c:1113
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:1386
+#: builtin/rebase.c:1118
msgid "how to handle commits that become empty"
msgstr "hur incheckningar som blir tomma ska hanteras"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1121
+msgid "keep commits which start empty"
+msgstr "behåller incheckningar som är tomma från början"
+
+#: builtin/rebase.c:1125
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "flytta incheckningar som börjar med squash!/fixup! under -i"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1132
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:1404
+#: builtin/rebase.c:1136
msgid "allow rebasing commits with empty messages"
msgstr "tillåt ombasering av incheckningar med tomt meddelande"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1140
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:1411
+#: builtin/rebase.c:1143
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:1413
+#: builtin/rebase.c:1145
msgid "use the given merge strategy"
msgstr "använd angiven sammanslagningsstrategi"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1147 builtin/revert.c:115
msgid "option"
msgstr "alternativ"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1148
msgid "pass the argument through to the merge strategy"
msgstr "sänd flaggan till sammanslagningsstrategin"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1151
msgid "rebase all reachable commits up to the root(s)"
msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1154
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt"
+
+#: builtin/rebase.c:1156
msgid "apply all changes, even those already present upstream"
msgstr "applicera alla ändringar, även de som redan finns uppströms"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1177
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:1483
-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:1208
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges har ersatts av --rebase-merges"
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "kan inte kombinera \"--root\" med \"--fork-point\""
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1230
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1234
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:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1269
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20162,16 +20699,16 @@
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1287
msgid "could not discard worktree changes"
msgstr "kunde inte kasta ändringar i arbetskatalogen"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1308
#, c-format
msgid "could not move back to %s"
msgstr "kunde inte flytta tillbaka till %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1354
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20192,143 +20729,128 @@
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1382
msgid "switch `C' expects a numerical value"
msgstr "flaggan \"C\" förväntar ett numeriskt värde"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1424
#, c-format
msgid "Unknown mode: %s"
msgstr "Okänt läge: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1463
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy kräver --merge eller --interactive"
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
+#: builtin/rebase.c:1492
+msgid "apply options and merge options cannot be used together"
+msgstr ""
+"appliceringsflaggor och sammanslagningsflaggor kan inte användas tillsammans"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1505
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Okänd rebase-bakända: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1534
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec kräver --exec eller --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec"
-"\""
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1565
#, c-format
msgid "invalid upstream '%s'"
msgstr "felaktig uppström \"%s\""
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1571
msgid "Could not create new root commit"
msgstr "kunde inte skapa ny rotincheckning"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1597
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "\"%s\": behöver precis en sammanslagningsbas med gren"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1600
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "\"%s\": behöver precis en sammanslagningsbas"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1609
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Pekar inte på en giltig incheckning: \"%s\""
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1636
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\""
+msgid "no such branch/commit '%s'"
+msgstr "ingen sådan gren/incheckning: \"%s\""
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
+#: builtin/submodule--helper.c:2477
#, c-format
msgid "No such ref: %s"
msgstr "Ingen sådan referens: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1658
msgid "Could not resolve HEAD to a revision"
msgstr "Kunde inte bestämma HEAD:s incheckning"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1679
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: builtin/rebase.c:1997
-#, c-format
-msgid "could not switch to %s"
-msgstr "kunde inte växla till %s"
-
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1714
msgid "HEAD is up to date."
msgstr "HEAD är à jour."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1716
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Aktuell gren %s är à jour.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1724
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD är à jour, ombasering framtvingad."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1726
#, 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:2028
+#: builtin/rebase.c:1734
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1741
#, c-format
msgid "Changes to %s:\n"
msgstr "Ändringar till %s:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1744
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Ändringar från %s till %s:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1769
#, 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:2072
+#: builtin/rebase.c:1781
msgid "Could not detach HEAD"
msgstr "Kunde inte koppla från HEAD"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1790
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Snabbspolade %s till %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1263
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"
@@ -20358,7 +20880,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:1295
+#: builtin/receive-pack.c:1283
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"
@@ -20379,79 +20901,111 @@
"\n"
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2476
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:2492
-msgid "You must specify a directory."
-msgstr "Du måste ange en katalog."
+#: builtin/receive-pack.c:2491
+msgid "you must specify a directory"
+msgstr "du måste ange en katalog"
+
+#: builtin/reflog.c:9
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [<log-flaggor>] [<ref>]"
+
+#: builtin/reflog.c:12
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
+msgstr ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<referenser>...]"
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
msgstr ""
-"git reflog expire [--expire=<tid>] [--expire-unreachable=<tid>] [--rewrite] "
-"[--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<referenser>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specificering>}..."
-#: builtin/reflog.c:22
-msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
-msgstr ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<referenser>..."
-
-#: builtin/reflog.c:25
+#: builtin/reflog.c:21
msgid "git reflog exists <ref>"
msgstr "git reflog exists <referens>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:197 builtin/reflog.c:211
#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "\"%s\" är inte en giltig tidsstämpel"
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "ogiltig tidsstämpel \"%s\" given i \"--%s\""
-#: builtin/reflog.c:609
+#: builtin/reflog.c:240 builtin/reflog.c:359
+msgid "do not actually prune any entries"
+msgstr "rensa faktiskt inte några poster"
+
+#: builtin/reflog.c:243 builtin/reflog.c:362
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr "skriv om gammal SHA1 med ny SHA1 i posten som nu föregår den"
+
+#: builtin/reflog.c:246 builtin/reflog.c:365
+msgid "update the reference to the value of the top reflog entry"
+msgstr "uppdatera referensen till värdet i översta referensloggposten"
+
+#: builtin/reflog.c:248 builtin/reflog.c:367
+msgid "print extra information on screen"
+msgstr "visa extra information på skärm"
+
+#: builtin/reflog.c:249 builtin/reflog.c:253
+msgid "timestamp"
+msgstr "tidsstämpel"
+
+#: builtin/reflog.c:250
+msgid "prune entries older than the specified time"
+msgstr "rensa poster äldre än angiven tid"
+
+#: builtin/reflog.c:254
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+"rensa poster äldre än <tid> som inte kan nås från nuvarande ände av grenen"
+
+#: builtin/reflog.c:258
+msgid "prune any reflog entries that point to broken commits"
+msgstr "rensa alla referensloggposter som pekar på trasiga incheckningar"
+
+#: builtin/reflog.c:259
+msgid "process the reflogs of all references"
+msgstr "hantera referensloggar för alla referenser"
+
+#: builtin/reflog.c:261
+msgid "limits processing to reflogs from the current worktree only"
+msgstr "begränsar hantering av referensloggar till endst aktuell arbetskatalog"
+
+#: builtin/reflog.c:294
#, c-format
msgid "Marking reachable objects..."
msgstr "Markerar nåbara objekt..."
-#: builtin/reflog.c:647
+#: builtin/reflog.c:338
#, c-format
msgid "%s points nowhere!"
msgstr "%s pekar ingenstans!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:374
msgid "no reflog specified to delete"
msgstr "ingen referenslogg att ta bort angavs"
-#: builtin/reflog.c:708
-#, c-format
-msgid "not a reflog: %s"
-msgstr "inte en referenslogg: %s"
-
-#: builtin/reflog.c:713
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "ingen referenslogg för \"%s\""
-
-#: builtin/reflog.c:759
+#: builtin/reflog.c:396
#, c-format
msgid "invalid ref format: %s"
msgstr "felaktigt referensformat: %s"
-#: builtin/reflog.c:768
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr "git reflog [ show | expire | delete | exists ]"
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
@@ -20459,82 +21013,87 @@
"git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <namn> <url>"
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <gammal> <ny>"
+#: builtin/remote.c:20 builtin/remote.c:40
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <gammal> <ny>"
-#: builtin/remote.c:20 builtin/remote.c:44
+#: builtin/remote.c:21 builtin/remote.c:45
msgid "git remote remove <name>"
msgstr "git remote remove <namn>"
-#: builtin/remote.c:21 builtin/remote.c:49
+#: builtin/remote.c:22 builtin/remote.c:50
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <namn>"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <namn>"
-#: builtin/remote.c:24
+#: builtin/remote.c:25
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]"
-#: builtin/remote.c:25
+#: builtin/remote.c:26
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <namn> <gren>..."
-#: builtin/remote.c:26 builtin/remote.c:75
+#: builtin/remote.c:27 builtin/remote.c:76
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <namn>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]"
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <namn> <nyurl>"
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c:30 builtin/remote.c:83
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <namn> <url>"
-#: builtin/remote.c:34
+#: builtin/remote.c:35
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<flaggor>] <namn> <url>"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <namn> <gren>..."
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <namn> <gren>..."
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<flaggor>] <namn>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<flaggor>] <namn>"
-#: builtin/remote.c:70
+#: builtin/remote.c:71
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..."
-#: builtin/remote.c:99
+#: builtin/remote.c:100
#, c-format
msgid "Updating %s"
msgstr "Uppdaterar %s"
-#: builtin/remote.c:131
+#: builtin/remote.c:102
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Kunde inte hämta %s"
+
+#: builtin/remote.c:132
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -20542,72 +21101,77 @@
"--mirror är farlig och föråldrad; använd\n"
"\t --mirror=fetch eller --mirror=push istället"
-#: builtin/remote.c:148
+#: builtin/remote.c:149
#, c-format
msgid "unknown mirror argument: %s"
msgstr "okänt argument till mirror: %s"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "fetch the remote branches"
msgstr "hämta fjärrgrenarna"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "import all tags and associated objects when fetching"
msgstr "importera alla taggar och associerade objekt vid hämtning"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "eller hämta inte några taggar alls (--no-tags)"
-#: builtin/remote.c:171
+#: builtin/remote.c:172
msgid "branch(es) to track"
msgstr "gren(ar) att spåra"
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "master branch"
msgstr "huvudgren"
-#: builtin/remote.c:174
+#: builtin/remote.c:175
msgid "set up remote as a mirror to push to or fetch from"
msgstr "ställ in arkiv som spegel att sända eller ta emot från"
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying a master branch makes no sense with --mirror"
msgstr "att ange en master-gren ger ingen mening med --mirror"
-#: builtin/remote.c:188
+#: builtin/remote.c:189
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:196 builtin/remote.c:716
#, c-format
msgid "remote %s already exists."
msgstr "fjärrarkivet %s finns redan."
-#: builtin/remote.c:240
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "Kunde inte skapa master \"%s\""
-#: builtin/remote.c:355
+#: builtin/remote.c:323
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "ohanterad branch.%s.rebase=%s; antar \"true\""
+
+#: builtin/remote.c:367
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Kunde inte hämta mappning för referensspecifikation %s"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:461 builtin/remote.c:469
msgid "(matching)"
msgstr "(träffande)"
-#: builtin/remote.c:466
+#: builtin/remote.c:473
msgid "(delete)"
msgstr "(ta bort)"
-#: builtin/remote.c:655
+#: builtin/remote.c:664
#, c-format
msgid "could not set '%s'"
msgstr "kunde inte ställa in \"%s\""
-#: builtin/remote.c:660
+#: builtin/remote.c:669
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20618,17 +21182,17 @@
"\t%s:%d\n"
"anger nu den icke-existerande fjärren \"%s\""
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
#, c-format
msgid "No such remote: '%s'"
msgstr "Ingen sådan fjärr: \"%s\""
-#: builtin/remote.c:710
+#: builtin/remote.c:726
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
-#: builtin/remote.c:730
+#: builtin/remote.c:746
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20639,17 +21203,21 @@
"\t%s\n"
"\tUppdatera konfigurationen manuellt om nödvändigt."
-#: builtin/remote.c:770
+#: builtin/remote.c:783
+msgid "Renaming remote references"
+msgstr "Byter namn på fjärreferenser"
+
+#: builtin/remote.c:794
#, c-format
msgid "deleting '%s' failed"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/remote.c:804
+#: builtin/remote.c:832
#, c-format
msgid "creating '%s' failed"
msgstr "misslyckades skapa \"%s\""
-#: builtin/remote.c:882
+#: builtin/remote.c:912
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20663,118 +21231,118 @@
"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
"för att ta bort dem, använd:"
-#: builtin/remote.c:896
+#: builtin/remote.c:926
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
-#: builtin/remote.c:999
+#: builtin/remote.c:1034
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " ny (nästa hämtning sparar i remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1037
msgid " tracked"
msgstr " spårad"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1039
msgid " stale (use 'git remote prune' to remove)"
msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1041
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1082
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1091
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "ombaseras interaktivt på fjärren %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1093
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1096
#, c-format
msgid "rebases onto remote %s"
msgstr "ombaseras på fjärren %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1100
#, c-format
msgid " merges with remote %s"
msgstr " sammanslås med fjärren %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1103
#, c-format
msgid "merges with remote %s"
msgstr "sammanslås med fjärren %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1106
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s och med fjärren %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1149
msgid "create"
msgstr "skapa"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1152
msgid "delete"
msgstr "ta bort"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1156
msgid "up to date"
msgstr "àjour"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1159
msgid "fast-forwardable"
msgstr "kan snabbspolas"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1162
msgid "local out of date"
msgstr "lokal föråldrad"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1169
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s tvingar till %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1172
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s sänder till %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1176
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s tvingar till %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1179
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s sänder till %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1247
msgid "do not query remotes"
msgstr "fråga inte fjärrar"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1268
#, c-format
msgid "* remote %s"
msgstr "* fjärr %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1269
#, c-format
msgid " Fetch URL: %s"
msgstr " Hämt-URL: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
msgid "(no URL)"
msgstr "(ingen URL)"
@@ -20782,184 +21350,188 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1284 builtin/remote.c:1286
#, c-format
msgid " Push URL: %s"
msgstr " Sänd-URL: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD-gren: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1288
msgid "(not queried)"
msgstr "(inte förfrågad)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1290
msgid "(unknown)"
msgstr "(okänd)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1294
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1306
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Fjärrgren:%s"
msgstr[1] " Fjärrgrenar:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1309 builtin/remote.c:1335
msgid " (status not queried)"
msgstr " (status inte förfrågad)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1318
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokal gren konfigurerad för \"git pull\":"
msgstr[1] " Lokala grenar konfigurerade för \"git pull\":"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1326
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokala referenser speglas av \"git push\""
-#: builtin/remote.c:1303
+#: builtin/remote.c:1332
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:"
msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1353
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1355
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ta bort refs/remotes/<namn>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1369
msgid "Cannot determine remote HEAD"
msgstr "Kan inte bestämma HEAD på fjärren"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1371
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1381
#, c-format
msgid "Could not delete %s"
msgstr "Kunde inte ta bort %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1389
#, c-format
msgid "Not a valid ref: %s"
msgstr "Inte en giltig referens: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1391
#, c-format
msgid "Could not setup %s"
msgstr "Kunde inte ställa in %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1409
#, c-format
msgid " %s will become dangling!"
msgstr " %s kommer bli dinglande!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1410
#, c-format
msgid " %s has become dangling!"
msgstr " %s har blivit dinglande!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1419
#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1420
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1436
#, c-format
msgid " * [would prune] %s"
msgstr " * [skulle rensa] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1439
#, c-format
msgid " * [pruned] %s"
msgstr " * [rensad] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1484
msgid "prune remotes after fetching"
msgstr "rensa fjärrar efter hämtning"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
#, c-format
msgid "No such remote '%s'"
msgstr "Ingen sådan fjärr \"%s\""
-#: builtin/remote.c:1539
+#: builtin/remote.c:1566
msgid "add branch"
msgstr "lägg till gren"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1573
msgid "no remote specified"
msgstr "ingen fjärr angavs"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1590
msgid "query push URLs rather than fetch URLs"
msgstr "fråga sänd-URL:er istället för hämta-URL:er"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1592
msgid "return all URLs"
msgstr "returnera alla URL:er"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1622
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "ingen URL:er angivna för fjärren \"%s\""
-#: builtin/remote.c:1621
+#: builtin/remote.c:1648
msgid "manipulate push URLs"
msgstr "manipulera URL:ar för sändning"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1650
msgid "add URL"
msgstr "lägg till URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1652
msgid "delete URLs"
msgstr "ta bort URL:ar"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1659
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ger ingen mening"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1700
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Felaktig gammalt URL-mönster: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1708
#, c-format
msgid "No such URL found: %s"
msgstr "Ingen sådan URL hittades: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1710
msgid "Will not delete all non-push URLs"
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
-#: builtin/repack.c:26
+#: builtin/remote.c:1727
+msgid "be verbose; must be placed before a subcommand"
+msgstr "var pratsam; måste skrivas före ett underkommando"
+
+#: builtin/repack.c:29
msgid "git repack [<options>]"
msgstr "git repack [<flaggor>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:34
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20968,140 +21540,145 @@
"Använd --no-write-bitmap-index eller inaktivera inställningen\n"
"pack.writebitmaps"
-#: builtin/repack.c:198
+#: builtin/repack.c:206
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:270 builtin/repack.c:630
+#: builtin/repack.c:280 builtin/repack.c:824
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:294
+#: builtin/repack.c:304
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:309
+#: builtin/repack.c:319
#, c-format
msgid "cannot open index for %s"
msgstr "kunde inte öppna indexet för %s"
-#: builtin/repack.c:368
+#: builtin/repack.c:378
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "paketet %s för stort för att tas med i geometriskt förlopp"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
#, c-format
msgid "pack %s too large to roll up"
msgstr "paketet %s för stort att rulla upp"
-#: builtin/repack.c:460
+#: builtin/repack.c:503
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "kunde inte öppna temporär fil %s för skrivning"
+
+#: builtin/repack.c:521
+msgid "could not close refs snapshot tempfile"
+msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild"
+
+#: builtin/repack.c:634
msgid "pack everything in a single pack"
msgstr "packa allt i ett enda paket"
-#: builtin/repack.c:462
+#: builtin/repack.c:636
msgid "same as -a, and turn unreachable objects loose"
msgstr "samma som -a, och gör onåbara objekt lösa"
-#: builtin/repack.c:465
+#: builtin/repack.c:639
msgid "remove redundant packs, and run git-prune-packed"
msgstr "ta bort överflödiga paket, och kör git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:641
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "sänd --no-reuse-delta till git-pack-objects"
-#: builtin/repack.c:469
+#: builtin/repack.c:643
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "sänd --no-reuse-object till git-pack-objects"
-#: builtin/repack.c:471
+#: builtin/repack.c:645
msgid "do not run git-update-server-info"
msgstr "kör inte git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:648
msgid "pass --local to git-pack-objects"
msgstr "sänd --local till git-pack-objects"
-#: builtin/repack.c:476
+#: builtin/repack.c:650
msgid "write bitmap index"
msgstr "skriv bitkartindex"
-#: builtin/repack.c:478
+#: builtin/repack.c:652
msgid "pass --delta-islands to git-pack-objects"
msgstr "sänd --delta-islands till git-pack-objects"
-#: builtin/repack.c:479
+#: builtin/repack.c:653
msgid "approxidate"
msgstr "cirkadatum"
-#: builtin/repack.c:480
+#: builtin/repack.c:654
msgid "with -A, do not loosen objects older than this"
msgstr "med -A, lös inte upp objekt äldre än detta"
-#: builtin/repack.c:482
+#: builtin/repack.c:656
msgid "with -a, repack unreachable objects"
msgstr "med -a, packa om onåbara objekt"
-#: builtin/repack.c:484
+#: builtin/repack.c:658
msgid "size of the window used for delta compression"
msgstr "storlek på fönster använt för deltakomprimering"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:659 builtin/repack.c:665
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:486
+#: builtin/repack.c:660
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:488
+#: builtin/repack.c:662
msgid "limits the maximum delta depth"
msgstr "begränsa maximalt deltadjup"
-#: builtin/repack.c:490
+#: builtin/repack.c:664
msgid "limits the maximum number of threads"
msgstr "begränsar maximalt antal trådar"
-#: builtin/repack.c:492
+#: builtin/repack.c:666
msgid "maximum size of each packfile"
msgstr "maximal storlek på varje paketfil"
-#: builtin/repack.c:494
+#: builtin/repack.c:668
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
-#: builtin/repack.c:496
+#: builtin/repack.c:670
msgid "do not repack this pack"
msgstr "packa inte om detta paket"
-#: builtin/repack.c:498
+#: builtin/repack.c:672
msgid "find a geometric progression with factor <N>"
msgstr "hitta ett geometrisk förlopp med faktor <N>"
-#: builtin/repack.c:508
+#: builtin/repack.c:674
+msgid "write a multi-pack index of the resulting packs"
+msgstr "skriv ett flerpaketsindex för de skapade paketen"
+
+#: builtin/repack.c:684
msgid "cannot delete packs in a precious-objects repo"
msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable och -A kan inte användas samtidigt"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric är inkompatibel med -A, -a"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:833
msgid "Nothing new to pack."
msgstr "Inget nytt att packa."
-#: builtin/repack.c:669
+#: builtin/repack.c:863
#, c-format
msgid "missing required file: %s"
msgstr "nödvändig fil saknas: %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:865
#, c-format
msgid "could not unlink: %s"
msgstr "kunde inte ta bort: \"%s\""
@@ -21118,10 +21695,6 @@
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <incheckning> [<förälder>...]"
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --convert-graft-file"
-
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <objekt>..."
@@ -21184,67 +21757,61 @@
msgid "unable to open %s for reading"
msgstr "kan inte öppna %s för läsning"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "kan inte starta mktree"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "kan inte läsa från mktree"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "mktree rapporterade misslyckande"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree returnerade inte ett objektnamn"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "kan inte utföra \"fstat\" på %s"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "kan inte skriva objektet till databasen"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "objektnamnet är inte giltigt: \"%s\""
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "kan inte läsa objekttyp för %s"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "misslyckades redigera objektfilen"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "nytt objekt är samma som det gamla: \"%s\""
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "kunde inte tolka %s som incheckning"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21253,31 +21820,31 @@
"den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s"
"\" som har förkastats; använd --edit istället för --graft"
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "ympning för \"%s\" behövs inte"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "ny incheckning är samma som den gamla: \"%s\""
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -21286,71 +21853,71 @@
"kunde inte konvertera följande ympning(ar):\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "visa ersättningsreferenser"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "ta bort ersättningsreferenser"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "redigera befintligt objekt"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "ändra en inchecknings föräldrar"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "konvertera befintlig ympningsfil"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "ersätt referensen om den finns"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "använd inte snygg visning av innehåll för --edit"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "använd detta format"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "--format kan inte användas utanför listning"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "-f kan endast användas vid skrivning av ersättning"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw kan bara användas med --edit"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d behöver minst ett argument"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "fel antal argument"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e tar exakt ett argument"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-g tar minst ett argument"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file tar inga argument"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "endast ett mönster kan anges med -l"
@@ -21371,169 +21938,153 @@
msgid "unable to generate diff for '%s'"
msgstr "misslyckades skapa diff för \"%s\""
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..."
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<träd-igt>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "blandad"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "mjuk"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "hård"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "sammanslagning"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "behåll"
-#: builtin/reset.c:83
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "Du har inte en giltig HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "Kunde inte hitta trädet för HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "Kunde inte hitta trädet för %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD är nu på %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:304
#, 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:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
+#: builtin/stash.c:693
msgid "be quiet, only report errors"
msgstr "var tyst, rapportera endast fel"
-#: builtin/reset.c:297
+#: builtin/reset.c:404
+msgid "skip refreshing the index after reset"
+msgstr "hoppa över uppdatering av indexet efter nollställning"
+
+#: builtin/reset.c:406
msgid "reset HEAD and index"
msgstr "återställ HEAD och index"
-#: builtin/reset.c:298
+#: builtin/reset.c:407
msgid "reset only HEAD"
msgstr "återställ endast HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:409 builtin/reset.c:411
msgid "reset HEAD, index and working tree"
msgstr "återställ HEAD, index och arbetskatalog"
-#: builtin/reset.c:304
+#: builtin/reset.c:413
msgid "reset HEAD but keep local changes"
msgstr "återställ HEAD men behåll lokala ändringar"
-#: builtin/reset.c:310
+#: builtin/reset.c:419
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:344
+#: builtin/reset.c:452
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
-#: builtin/reset.c:352
+#: builtin/reset.c:460
#, 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:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:479
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:373
+#: builtin/reset.c:481
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Kan inte göra %s återställning med sökvägar."
-#: builtin/reset.c:388
+#: builtin/reset.c:496
#, 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:392
-msgid "-N can only be used with --mixed"
-msgstr "-N kan endast användas med --mixed"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:527
msgid "Unstaged changes after reset:"
msgstr "Oköade ändringar efter återställning:"
-#: builtin/reset.c:416
+#: builtin/reset.c:530
#, c-format
msgid ""
-"\n"
-"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
-"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
-"to make this the default.\n"
+"It took %.2f seconds to refresh the index after reset. You can use\n"
+"'--no-refresh' to avoid this."
msgstr ""
-"\n"
-"Det tog %.2f sekunder att räkna upp oköade ändringar efter återställning.\n"
-"Du kan använda \"--quiet\" för att förhindra detta. Ställ "
-"konfigurationsvariabeln\n"
-"reset.quiet till true för att göra detta till förval.\n"
+"Det tog %.2f sekunder att uppdatera indexet efter återställning.\n"
+"Du kan använda \"--no-refresh\" för undvika detta."
-#: builtin/reset.c:434
+#: builtin/reset.c:547
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
-#: builtin/reset.c:439
+#: builtin/reset.c:552
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
-
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr "objektfiltrering kräver --objects"
-
-#: builtin/rev-list.c:674
+#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
msgstr "rev-list stöder inte visning av anteckningar"
-#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "markerad räkning är inkompatibelt med --objects"
+#: builtin/rev-list.c:664
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "markerad räkning och \"%s\" kan inte användas samtidigt."
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -21696,15 +22247,19 @@
msgid "preserve initially empty commits"
msgstr "behåll incheckningar som börjar som tomma"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "tillåt incheckningar med tomt meddelande"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "behåll redundanta, tomma incheckningar"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "\"revert\" misslyckades"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" misslyckades"
@@ -21752,70 +22307,70 @@
msgstr[0] "följande fil har lokala ändringar:"
msgstr[1] "följande filer har lokala ändringar:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "lista inte borttagna filer"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "ta bara bort från indexet"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "överstyr àjour-testet"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "tillåt rekursiv borttagning"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "avsluta med nollstatus även om inget träffades"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "Ingen sökvägsangivelse gavs. Vilka filer ska jag ta bort?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"löa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "tar inte bort \"%s\" rekursivt utan -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: kan inte ta bort %s"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<värd>:]<katalog> "
-"[<ref>...]\n"
-" --all och explicit angiven <ref> är ömsesidigt uteslutande."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<värd>:]<katalog> (--all | <ref>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "fjärrnamn"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "använd tillståndslöst RPC-protokoll"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "läs referenser från standard in"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "visa status från fjärrhjälpare"
@@ -21829,7 +22384,7 @@
#: builtin/shortlog.c:123
msgid "using multiple --group options with stdin is not supported"
-msgstr "mer än en --group flagga stöds inte med standard in"
+msgstr "mer än en \"--group\"-flagga stöds inte med standard in"
#: builtin/shortlog.c:133
msgid "using --group=trailer with stdin is not supported"
@@ -21872,27 +22427,27 @@
msgid "group by field"
msgstr "gruppera efter fält"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:395
msgid "too many arguments given outside repository"
msgstr "för många flaggor givna utanför arkivet"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
+" [--current] [--color[=<när>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
-#: builtin/show-branch.c:17
+#: builtin/show-branch.c:18
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]"
-#: builtin/show-branch.c:395
+#: builtin/show-branch.c:396
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
@@ -21930,7 +22485,7 @@
#: builtin/show-branch.c:656
msgid "include the current branch"
-msgstr "inkludera aktuell gren"
+msgstr "ta med aktuell gren"
#: builtin/show-branch.c:658
msgid "name commits with their object names"
@@ -21968,13 +22523,6 @@
msgid "show <n> most recent ref-log entries starting at base"
msgstr "visa <n> nyaste refloggposter med början på bas"
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog är inkompatibel med --all, --remotes, --independent eller --merge-"
-"base"
-
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "inga grenar angavs, och HEAD är inte giltigt"
@@ -22064,83 +22612,153 @@
msgid "show refs from stdin that aren't in local repository"
msgstr "visa referenser från standard in som inte finns i lokalt arkiv"
-#: builtin/sparse-checkout.c:22
+#: builtin/sparse-checkout.c:23
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:46
-msgid "git sparse-checkout list"
-msgstr "git sparse-checkout list"
+#: builtin/sparse-checkout.c:61
+msgid "this worktree is not sparse"
+msgstr "arbetskatalogen är inte gren"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:76
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:177
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"katalogen \"%s\" innehåller ospårade filer, men är inte i området som ages i "
+"\"sparse-checkout\""
+
+#: builtin/sparse-checkout.c:185
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "misslyckades ta bort katalogen \"%s\""
+
+#: builtin/sparse-checkout.c:327
msgid "failed to create directory for sparse-checkout file"
msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen"
-#: builtin/sparse-checkout.c:268
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig"
+#: builtin/sparse-checkout.c:366
+msgid "failed to initialize worktree config"
+msgstr "misslyckades initiera arbetskataloginställning"
-#: builtin/sparse-checkout.c:270
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "misslyckades ändra inställningen extensions.worktreeConfig"
-
-#: builtin/sparse-checkout.c:290
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-
-#: builtin/sparse-checkout.c:310
-msgid "initialize the sparse-checkout in cone mode"
-msgstr "initiera sparse-checkout i konläge"
-
-#: builtin/sparse-checkout.c:312
-msgid "toggle the use of a sparse index"
-msgstr "slå på/av använding av glest index"
-
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:411
msgid "failed to modify sparse-index config"
msgstr "misslyckades ändra inställning för sparse-index"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
+#: builtin/sparse-checkout.c:847
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "initiera sparse-checkout i konläge"
+
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
+#: builtin/sparse-checkout.c:849
+msgid "toggle the use of a sparse index"
+msgstr "slå på/av använding av glest index"
+
+#: builtin/sparse-checkout.c:479
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:531
#, c-format
msgid "could not normalize path %s"
msgstr "kunde inte normalisera sökvägen \"%s\""
-#: builtin/sparse-checkout.c:425
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)"
-
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:560
#, 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:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
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:573
+#: builtin/sparse-checkout.c:619
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "befintliga filter för gles utcheckning använder inte konläge"
+
+#: builtin/sparse-checkout.c:707
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr "vänligen kör från toppnivåkatalogen i icke-konläge"
+
+#: builtin/sparse-checkout.c:712
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr "ange kataloger istället för mönster (utan inledande snedstreck)"
+
+#: builtin/sparse-checkout.c:714
+msgid ""
+"specify directories rather than patterns. If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+"ange kataloger istället för mönster. Om din katalog börjar med ett \"!\", "
+"sänd med --skip-checks"
+
+#: builtin/sparse-checkout.c:716
+msgid ""
+"specify directories rather than patterns. If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"ange kataloger istället för mönster. Om din katalog faktiskt har tecknen '*?"
+"[]\\' i namnet, sänd med --skip-checks"
+
+#: builtin/sparse-checkout.c:732
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr ""
+"\"%s\" är inte en katalog: för att ändå behandla det som en katalog, kör på "
+"nytt med --skip-checks"
+
+#: builtin/sparse-checkout.c:734
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"sänd med ett inledande snedstreck före sökvägar som \"%s\" om du vill ha en "
+"enstaka file (se NON-CONE PROBLEMS i manualen git-sparse-checkout)."
+
+#: builtin/sparse-checkout.c:739
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <mönster>)"
+
+#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr ""
+"hoppa över några kontroller på de angivna sökvägarna som kan ge falska "
+"positiva"
+
+#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
msgid "read patterns from standard in"
msgstr "läs mönster från standard in"
-#: builtin/sparse-checkout.c:588
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:760
+msgid "no sparse-checkout to add to"
+msgstr "ingen sparse-checkout att utöka"
-#: builtin/sparse-checkout.c:607
-msgid "git sparse-checkout disable"
-msgstr "git sparse-checkout disable"
+#: builtin/sparse-checkout.c:775
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <mönster>)"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:854
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"måste vara i en gles utcheckning för att tillämpa gleshetsmönster på nytt"
+
+#: builtin/sparse-checkout.c:914
msgid "error while refreshing working directory"
msgstr "fel vid uppdatering av arbetskatalog"
@@ -22166,22 +22784,26 @@
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"
" [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n"
" [--] [<sökväg>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<meddelande>]"
#: builtin/stash.c:55
@@ -22206,6 +22828,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"
" [--] [<sökväg>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<meddelande>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22229,7 +22859,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "\"git stash clear\" med argument har inte implementerats"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22240,181 +22870,182 @@
" %s -> %s\n"
" för att lämna plats.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "kunde inte skapa diff %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "konflikter i indexet. Testa utan --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "kunde inte spara indexträd"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "kunde inte återställa ospårade filer från stash-post"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Slår ihop %s med %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits upp ur \"stash\":en"
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "kunde inte återställa ospårade filer från stash-post"
+
+#: builtin/stash.c:608 builtin/stash.c:695
msgid "attempt to recreate the index"
msgstr "försök återskapa indexet"
-#: builtin/stash.c:635
+#: builtin/stash.c:641
#, c-format
msgid "Dropped %s (%s)"
msgstr "Kastade %s (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:644
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Kunde inte kasta \"stash\"-post"
-#: builtin/stash.c:651
+#: builtin/stash.c:657
#, c-format
msgid "'%s' is not a stash reference"
msgstr "\"%s\" är inte en \"stash\"-referens"
-#: builtin/stash.c:701
+#: builtin/stash.c:707
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:724
+#: builtin/stash.c:730
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: builtin/stash.c:808
+#: builtin/stash.c:809
msgid "failed to parse tree"
msgstr "misslyckades tolka träd"
-#: builtin/stash.c:819
+#: builtin/stash.c:820
msgid "failed to unpack trees"
msgstr "misslyckades packa upp träd"
-#: builtin/stash.c:839
+#: builtin/stash.c:840
msgid "include untracked files in the stash"
msgstr "ta med ospårade filer i \"stash\""
-#: builtin/stash.c:842
+#: builtin/stash.c:843
msgid "only show untracked files in the stash"
msgstr "visa bara ospårade filer i \"stash\""
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:930 builtin/stash.c:967
#, c-format
msgid "Cannot update %s with %s"
msgstr "Kan inte uppdatera %s med %s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
msgid "stash message"
msgstr "\"stash\"-meddelande"
-#: builtin/stash.c:957
+#: builtin/stash.c:958
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" kräver ett <incheckning>-argument"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1143
+msgid "No staged changes"
+msgstr "Inga köade ändringar"
+
+#: builtin/stash.c:1204
msgid "No changes selected"
msgstr "Inga ändringar valda"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1304
msgid "You do not have the initial commit yet"
msgstr "Du har inte den första incheckningen ännu"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1331
msgid "Cannot save the current index state"
msgstr "Kan inte spara aktuellt tillstånd för indexet"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1340
msgid "Cannot save the untracked files"
msgstr "Kan inte spara ospårade filer"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1351 builtin/stash.c:1370
msgid "Cannot save the current worktree state"
msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1361
+msgid "Cannot save the current staged state"
+msgstr "Kan inte spara aktuellt tillstånd kö"
+
+#: builtin/stash.c:1398
msgid "Cannot record working tree state"
msgstr "Kan inte registrera tillstånd för arbetskatalog"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1447
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:1422
+#: builtin/stash.c:1458
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"Kan inte använda --staged och --include-untracked eller --all samtidigt"
+
+#: builtin/stash.c:1476
msgid "Did you forget to 'git add'?"
msgstr "Glömde du använda \"git add\"?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1491
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1498
msgid "Cannot initialize stash"
msgstr "Kan inte initiera \"stash\""
-#: builtin/stash.c:1459
+#: builtin/stash.c:1513
msgid "Cannot save the current status"
msgstr "Kan inte spara aktuell status"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1518
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Sparade arbetskatalogen och indexstatus %s"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1615
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1656 builtin/stash.c:1728
msgid "keep index"
msgstr "behåll indexet"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1658 builtin/stash.c:1730
+msgid "stash staged changes only"
+msgstr "stash:a endast köade ändringar"
+
+#: builtin/stash.c:1660 builtin/stash.c:1732
msgid "stash in patch mode"
msgstr "\"stash\" i \"patch\"-läge"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1661 builtin/stash.c:1733
msgid "quiet mode"
msgstr "tyst läge"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1663 builtin/stash.c:1735
msgid "include untracked files in stash"
msgstr "ta med ospårade filer i \"stash\""
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1665 builtin/stash.c:1737
msgid "include ignore files"
msgstr "ta med ignorerade filer"
-#: builtin/stash.c:1700
-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]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
-
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken"
@@ -22423,41 +23054,45 @@
msgid "prepend comment character and space to each line"
msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Förväntade fullt referensnamn, fick %s"
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr "submodule--helper print-default-remote tar inga argument"
-
-#: builtin/submodule--helper.c:101
+#: builtin/submodule--helper.c:103
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "kan inte ta bort en komponent från url:en \"%s\""
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:213
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
+"officiella uppström."
+
+#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:418
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
+#: builtin/submodule--helper.c:640
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:528
#, c-format
msgid "Entering '%s'\n"
msgstr "Går in i \"%s\"\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:531
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22466,7 +23101,7 @@
"run_command returnerade icke-nollstatus för %s\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:553
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22477,76 +23112,67 @@
"undermoduler för %s\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:569
msgid "suppress output of entering each submodule command"
msgstr "dölj utdata från för varje undermodulskommando som startas"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1458
msgid "recurse into nested submodules"
msgstr "rekursera in i nästlade undermoduler"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:576
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
-"officiella uppström."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:654
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:658
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:668
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:675
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:697
msgid "suppress output for initializing a submodule"
msgstr "dölj utdata från initiering av undermodul"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:702
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<flaggor>] [<sökväg>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\""
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "misslyckades rekursera in i undermodulen \"%s\""
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
msgid "suppress submodule status output"
msgstr "hindra statusutskrift för undermodul"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:875
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -22554,107 +23180,103 @@
"visa incheckning från indexet istället för den som lagrats i undermodulens "
"HEAD"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <sökväg>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:977
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodule)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:980
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodule)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:993
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1043
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "kunde inte hasha objekt från \"%s\""
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1047
#, c-format
msgid "unexpected mode %o\n"
msgstr "okänt läge %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1288
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "använd incechkning lagrad i indexet istället för undermodulens HEAD"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1290
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "jämför incheckningen i indexet med den i undermodulens HEAD"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1292
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
"hoppa över undermoduler där värdet för \"ignore_config\" är satt till \"all\""
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1294
msgid "limit the summary size"
msgstr "begränsa översiktsstorleken"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1299
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr ""
"git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1323
msgid "could not fetch a revision for HEAD"
msgstr "kunde inte hämta en version för HEAD"
-#: builtin/submodule--helper.c:1342
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached och --files är ömsesidigt uteslutande"
-
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1384
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synkroniserar undermodul-url för \"%s\"\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1390
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "misslyckades registrera url för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1399
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1409
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1456
msgid "suppress output of synchronizing submodule url"
msgstr "dölj utdata från synkronisering av undermodul-url"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1463
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1513
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf"
-"\" om du verkligen vill ta bort den och all dess historik)"
+"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog. Denna kommer "
+"ersättas med en .git-fil med absorbgitdirs."
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1530
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22663,46 +23285,46 @@
"Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
"dem"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1538
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Rensade katalogen \"%s\"\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1540
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1551
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "kunde inte skapa tom undermodulskatalog %s"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1567
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1596
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1597
msgid "unregister all submodules"
msgstr "avregistrera alla undermoduler"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1602
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1616
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1665
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22714,153 +23336,171 @@
"submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n"
"med \"--reference-if-able\" istället för \"--reference\"."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1749
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1756
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1781
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1826
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1831
#, c-format
msgid "directory not empty: '%s'"
msgstr "katalogen inte tom: \"%s\""
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1843
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1876
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen ska klonas till"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1879
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1882
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
+#: builtin/submodule--helper.c:3376
msgid "force cloning progress"
msgstr "tvinga kloningsförlopp"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
msgid "disallow cloning into non-empty directory"
msgstr "förhindra kloning till icke-tom katalog"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1903
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
-"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --"
-"path <sökväg>"
+"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] [--filter "
+"<filterangivelse>] --url <url> --path <sökväg>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1943
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1947
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Kanske menade du att använda \"update --init\"?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Misslyckades klona \"%s\" för andra gången, avbryter"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
-msgid "path into the working tree"
-msgstr "sökväg inuti arbetskatalogen"
+#: builtin/submodule--helper.c:2371
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Kan inte checka ut \"%s\" i undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:2347
-msgid "path into the working tree, across nested submodule boundaries"
-msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
+#: builtin/submodule--helper.c:2375
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Kan inte ombasera \"%s\" i undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:2351
-msgid "rebase, merge, checkout or none"
-msgstr "rebase, merge, checkout eller none"
+#: builtin/submodule--helper.c:2379
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Kan inte slå ihop \"%s\" i undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:2357
-msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr "skapa en grund klon trunkerad till angivet antal revisioner"
+#: builtin/submodule--helper.c:2383
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Misslyckades köra \"%s %s\" i undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:2360
-msgid "parallel jobs"
-msgstr "parallella jobb"
+#: builtin/submodule--helper.c:2402
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Undermodulsökvägen \"%s\": checkade ut \"%s\"\n"
-#: builtin/submodule--helper.c:2362
-msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "om den första klonen ska följa rekommendation för grund kloning"
+#: builtin/submodule--helper.c:2406
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Undermodulsökvägen \"%s\": ombaserade in i \"%s\"\n"
-#: builtin/submodule--helper.c:2363
-msgid "don't print cloning progress"
-msgstr "skriv inte klonförlopp"
+#: builtin/submodule--helper.c:2410
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Undermodulsökvägen \"%s\": sammanslagen i \"%s\"\n"
-#: builtin/submodule--helper.c:2374
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]"
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Undermodulsökvägen \"%s\": \"%s %s\"\n"
-#: builtin/submodule--helper.c:2387
-msgid "bad value for update parameter"
-msgstr "felaktigt värde för parametern update"
+#: builtin/submodule--helper.c:2438
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr "Kan inte hämta i undermodulsökväg \"%s\"; försökte hämta %s direkt:"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2447
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Hämtade i undermodulssökvägen \"%s\", men den innehöll inte %s. Direkt "
+"hämtning av incheckningen misslyckades."
+
+#: builtin/submodule--helper.c:2481
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22869,102 +23509,203 @@
"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
"huvudprojektet är inte på någon gren"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2499
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\""
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2588
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"%s\""
+
+#: builtin/submodule--helper.c:2599
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "Kan inte hämta i undermodulsökväg \"%s\""
+
+#: builtin/submodule--helper.c:2604
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr "Kan inte hitta %s revision i undermodulsökvägen \"%s\""
+
+#: builtin/submodule--helper.c:2640
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "Misslyckades rekursera in i undermodulsökväg \"%s\""
+
+#: builtin/submodule--helper.c:2699
+msgid "force checkout updates"
+msgstr "tvinga utcheckningsuppdateringar"
+
+#: builtin/submodule--helper.c:2701
+msgid "initialize uninitialized submodules before update"
+msgstr "initiera oinitierade undermoduler före uppdateringen"
+
+#: builtin/submodule--helper.c:2703
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "använd SHA-1 från undermodulers fjärrspårningsgren"
+
+#: builtin/submodule--helper.c:2705
+msgid "traverse submodules recursively"
+msgstr "traversera undermoduler rekursivt"
+
+#: builtin/submodule--helper.c:2707
+msgid "don't fetch new objects from the remote site"
+msgstr "hämta inte nya objekt från fjärrplatsen"
+
+#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+msgid "path into the working tree"
+msgstr "sökväg inuti arbetskatalogen"
+
+#: builtin/submodule--helper.c:2713
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
+
+#: builtin/submodule--helper.c:2717
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout eller none"
+
+#: builtin/submodule--helper.c:2723
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "skapa en grund klon trunkerad till angivet antal revisioner"
+
+#: builtin/submodule--helper.c:2726
+msgid "parallel jobs"
+msgstr "parallella jobb"
+
+#: builtin/submodule--helper.c:2728
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "om den första klonen ska följa rekommendation för grund kloning"
+
+#: builtin/submodule--helper.c:2729
+msgid "don't print cloning progress"
+msgstr "skriv inte klonförlopp"
+
+#: builtin/submodule--helper.c:2741
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+msgstr ""
+"git submodule [--quiet] update [--init [--filter=<filterspecifikationer>]] "
+"[--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--"
+"[no-]recommend-shallow] [--reference <arkiv>] [--recursive] [--[no-]single-"
+"branch] [--] [<sökväg>...]"
+
+#: builtin/submodule--helper.c:2767
+msgid "bad value for update parameter"
+msgstr "felaktigt värde för parametern update"
+
+#: builtin/submodule--helper.c:2893
msgid "recurse into submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2899
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]"
+msgstr "git submodule--helper absorb-git-dirs [<flaggor>] [<sökväg>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2955
msgid "check if it is safe to write to the .gitmodules file"
msgstr "se om det är säkert att skriva till .gitmodules-filen"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2958
msgid "unset the config in the .gitmodules file"
msgstr "ta bort konfigurationen från .gitmodules-filen"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <namn> [<värde>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <namn>"
-#: builtin/submodule--helper.c:2663
-msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper config --check-writeable"
-
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
+#: builtin/submodule--helper.c:3395
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:2698
+#: builtin/submodule--helper.c:3000
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:2702
+#: builtin/submodule--helper.c:3004
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:3037
msgid "set the default tracking branch to master"
msgstr "välj master som förvald spårad gren"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:3039
msgid "set the default tracking branch"
msgstr "välj förvald spårad gren"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:3043
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sökväg>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:3044
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:3051
msgid "--branch or --default required"
msgstr "--branch eller --default krävs"
-#: builtin/submodule--helper.c:2752
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch och --default är ömsesidigt uteslutande"
+#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+msgid "print only error messages"
+msgstr "visa endast felmeddelanden"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3073
+msgid "force creation"
+msgstr "tvinga skapande"
+
+#: builtin/submodule--helper.c:3081
+msgid "show whether the branch would be created"
+msgstr "visa om grenen skulle skapas"
+
+#: builtin/submodule--helper.c:3085
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <namn> <start-oid> <start-namn>"
+
+#: builtin/submodule--helper.c:3097
+#, c-format
+msgid "creating branch '%s'"
+msgstr "skapar grenen \"%s\""
+
+#: builtin/submodule--helper.c:3155
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Lägger till befintligt arkiv i \"%s\" i indexet\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3158
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "\"%s\" finns redan och är inte ett giltigt git-arkiv"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3171
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "En git-katalog för \"%s\" hittades lokalt med fjärr(ar):"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "En git-katalog för \"%s\" hittades lokalt med fjärr(ar):\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3178
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"Om du vill återanvända den lokala git-katalogen istället för att klona på "
"nytt från\n"
@@ -22972,40 +23713,83 @@
"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är "
"korrekt\n"
"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
-"flaggan \"--name\".\n"
+"flaggan \"--name\"."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3190
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Aktiverar lokal git-katalog för undermodulen \"%s\" på nytt.\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3227
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "Kan inte checka ut undermodulen \"%s\""
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "gren från arkivet att checka ut vid kloning"
+#: builtin/submodule--helper.c:3266
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Misslyckades lägga till undermodulen \"%s\""
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
+#: builtin/submodule--helper.c:3283
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Misslyckades registrera undermodulen \"%s\""
+
+#: builtin/submodule--helper.c:3339
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "\"%s\" finns redan i indexet"
+
+#: builtin/submodule--helper.c:3342
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "\"%s\" finns redan i indexet och är inte en undermodul"
+
+#: builtin/submodule--helper.c:3372
+msgid "branch of repository to add as submodule"
+msgstr "gren från arkivet att lägga till som undermodul"
+
+#: builtin/submodule--helper.c:3373
msgid "allow adding an otherwise ignored submodule path"
msgstr "tillåt lägga till en annars ignorerad undermodulsökväg"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<flaggor>...] --url <url> --path <sökväg> "
-"--name <namn>"
+#: builtin/submodule--helper.c:3379
+msgid "borrow the objects from reference repositories"
+msgstr "låna objekt från referensarkiv"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3381
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"sätter undermodulens namn till den angivna strängen istället för att använda "
+"sökvägen"
+
+#: builtin/submodule--helper.c:3388
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<flaggor>] [--] <arkiv> [<sökväg>]"
+
+#: builtin/submodule--helper.c:3416
+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å"
+
+#: builtin/submodule--helper.c:3425
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "arkiv-URL: \"%s\" måste vara absolut eller börja med ./|../"
+
+#: builtin/submodule--helper.c:3460
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "\"%s\" är inte ett giltigt namn på undermodul"
+
+#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s stöder inte --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3526
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -23031,53 +23815,53 @@
msgid "shorten ref output"
msgstr "förkorta ref-utdata"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "skäl"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "skäl till uppdateringen"
-#: builtin/tag.c:25
+#: builtin/tag.c:26
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>]\n"
-"\t\t<taggnamn> [<huvud>]"
+" <taggnamn> [<huvud>]"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid "git tag -d <tagname>..."
msgstr "git tag -d <taggnamn>..."
-#: builtin/tag.c:28
+#: builtin/tag.c:29
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<antal>]] [--contains <incheckning>] [--no-contains "
"<incheckning>] [--points-at <objekt>]\n"
-"\t\t[--format=<format>] [--merged <incheckning>] [--no-merged <incheckning>] "
-"[<mönster>...]"
+" [--format=<format>] [--merged <incheckning>] [--no-merged "
+"<incheckning>] [<mönster>...]"
-#: builtin/tag.c:30
+#: builtin/tag.c:31
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <taggnamn>..."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "tag '%s' not found."
msgstr "taggen \"%s\" hittades inte."
-#: builtin/tag.c:135
+#: builtin/tag.c:136
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tog bort tagg \"%s\" (var %s)\n"
-#: builtin/tag.c:170
+#: builtin/tag.c:171
#, c-format
msgid ""
"\n"
@@ -23090,7 +23874,7 @@
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/tag.c:174
+#: builtin/tag.c:175
#, c-format
msgid ""
"\n"
@@ -23126,134 +23910,115 @@
msgid "bad object type."
msgstr "felaktig objekttyp."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:445
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:448
+#: builtin/tag.c:447
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:450
+#: builtin/tag.c:449
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:451
+#: builtin/tag.c:450
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:455
+#: builtin/tag.c:454
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:457
+#: builtin/tag.c:456
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
msgid "force edit of tag message"
msgstr "tvinga redigering av incheckningsmeddelande"
-#: builtin/tag.c:460
+#: builtin/tag.c:459
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:463
+#: builtin/tag.c:462
msgid "use another key to sign the tag"
msgstr "använd annan nyckel för att signera taggen"
-#: builtin/tag.c:464
+#: builtin/tag.c:463
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:464 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "skapa en reflog"
-#: builtin/tag.c:467
+#: builtin/tag.c:466
msgid "Tag listing options"
msgstr "Alternativ för listning av taggar"
-#: builtin/tag.c:468
+#: builtin/tag.c:467
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:469 builtin/tag.c:471
msgid "print only tags that don't contain the commit"
msgstr "visa endast taggar som inte innehåller incheckningen"
-#: builtin/tag.c:473
+#: builtin/tag.c:472
msgid "print only tags that are merged"
msgstr "visa endast taggar som slagits samman"
-#: builtin/tag.c:474
+#: builtin/tag.c:473
msgid "print only tags that are not merged"
msgstr "visa endast taggar som ej slagits samman"
-#: builtin/tag.c:478
+#: builtin/tag.c:477
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column och -n är inkompatibla"
+#: builtin/tag.c:559
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "flaggan \"%s\" är endast tillåten i listläge"
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "Flaggan -n är endast tillåten i listläge"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "Flaggan --contains är endast tillåten i listläge"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "Flaggan --no-contains är endast tillåten i listläge"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "Flaggan --points-at är endast tillåten i listläge"
-
-#: builtin/tag.c:556
-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:567
-msgid "only one -F or -m option is allowed."
-msgstr "endast en av flaggorna -F eller -m tillåts."
-
-#: builtin/tag.c:592
+#: builtin/tag.c:598
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:597
+#: builtin/tag.c:603
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:628
+#: builtin/tag.c:634
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
+#: builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "paket är större än tillåten maximal storlek"
+
#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr "Packar upp objekt"
@@ -23263,198 +24028,193 @@
msgid "failed to create directory %s"
msgstr "misslyckades skapa katalogen %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "misslyckades skapa filen %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "misslyckades ta bort filen %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "misslyckades ta bort katalogen %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Testar mtime i \"%s\" "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"stat-informationen för en katalog ändras inte när nya kataloger läggs till"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "stat-informationen för en katalog ändras när filer uppdateras"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"stat-informationen för en katalog ändras när filer läggs till i en "
"underkatalog"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "stat-informationen för en katalog ändras inte när en fil tas bort"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<flaggor>] [--] [<fil>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:993
msgid "continue refresh even when index needs update"
msgstr "fortsätt uppdatera även när index inte är àjour"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:996
msgid "refresh: ignore submodules"
msgstr "refresh: ignorera undermoduler"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:999
msgid "do not ignore new files"
msgstr "ignorera inte nya filer"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:1001
msgid "let files replace directories and vice-versa"
msgstr "låt filer ersätta kataloger och omvänt"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1003
msgid "notice files missing from worktree"
msgstr "lägg märke till filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:1005
msgid "refresh even if index contains unmerged entries"
msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1008
msgid "refresh stat information"
msgstr "uppdatera statusinformation"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1012
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "som --refresh, men ignorera assume-unchanged-inställning"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1016
msgid "<mode>,<object>,<path>"
msgstr "<läge>,<objekt>,<sökväg>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1017
msgid "add the specified entry to the index"
msgstr "lägg till angiven post i indexet"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1027
msgid "mark files as \"not changing\""
msgstr "markera filer som \"ändras inte\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1030
msgid "clear assumed-unchanged bit"
msgstr "rensa \"assume-unchanged\"-biten"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1033
msgid "mark files as \"index-only\""
msgstr "markera filer som \"endast index\""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1036
msgid "clear skip-worktree bit"
msgstr "töm \"skip-worktree\"-biten"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1039
msgid "do not touch index-only entries"
msgstr "rör inte \"endast index\"-poster"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1041
msgid "add to index only; do not add content to object database"
msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1043
msgid "remove named paths even if present in worktree"
msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1045
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "med --stdin: indatarader termineras med null-byte"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1047
msgid "read list of paths to be updated from standard input"
msgstr "läs lista över sökvägar att uppdatera från standard in"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1051
msgid "add entries from standard input to the index"
msgstr "lägg poster från standard in till indexet"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1055
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "återfyll etapp 2 och 3 från angivna sökvägar"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1059
msgid "only update entries that differ from HEAD"
msgstr "uppdatera endast poster som skiljer sig från HEAD"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1063
msgid "ignore files missing from worktree"
msgstr "ignorera filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1066
msgid "report actions to standard output"
msgstr "rapportera åtgärder på standard ut"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1068
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(för porslin) glöm sparade olösta konflikter"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1072
msgid "write index in this format"
msgstr "skriv index i detta format"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1074
msgid "enable or disable split index"
msgstr "aktivera eller inaktivera delat index"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1076
msgid "enable/disable untracked cache"
msgstr "aktivera/inaktivera ospårad cache"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1078
msgid "test if the filesystem supports untracked cache"
msgstr "testa om filsystemet stöder ospårad cache"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1080
msgid "enable untracked cache without testing the filesystem"
msgstr "aktivera ospårad cache utan att testa filsystemet"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1082
msgid "write out the index even if is not flagged as changed"
msgstr "skriv ut indexet även om det inte angivits som ändrat"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1084
msgid "enable or disable file system monitor"
msgstr "aktivera eller inaktivera filsystemsövervakning"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1086
msgid "mark files as fsmonitor valid"
msgstr "markera filer som \"fsmonitor valid\""
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1089
msgid "clear fsmonitor valid bit"
msgstr "töm \"fsmonitor valid\"-bit"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1195
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -23462,7 +24222,7 @@
"core.splitIndex är satt till false; ta bort eller ändra det om du verkligen "
"vill aktivera delat index"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1204
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -23470,7 +24230,7 @@
"core.splitIndex är satt till true; ta bort eller ändra det om du verkligen "
"vill inaktivera delat index"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1216
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23478,11 +24238,11 @@
"core.untrackedCache är satt till true; ta bort eller ändra det om du "
"verkligen vill inaktivera den ospårade cachen"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1220
msgid "Untracked cache disabled"
msgstr "Ospårad cache är inaktiverad"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1228
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -23490,26 +24250,26 @@
"core.untrackedCache är satt till false; ta bort eller ändra det om du "
"verkligen vill aktivera den ospårade cachen"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1232
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Ospårad cache är aktiverad för \"%s\""
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1241
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1246
msgid "fsmonitor enabled"
msgstr "fsmonitor aktiverat"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1250
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1254
msgid "fsmonitor disabled"
msgstr "fsmonitor inaktiverat"
@@ -23525,26 +24285,22 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<flaggor>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "ta bort referensen"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "uppdatera <refnamn> inte det den pekar på"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "standard in har NUL-terminerade argument"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "läs uppdateringar från standard in"
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "uppdatera informationsfilerna från grunden"
@@ -23553,19 +24309,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<flaggor>] <katalog>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "presentera info/referenser för git-http-backend"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
@@ -23601,63 +24357,62 @@
msgid "print tag contents"
msgstr "visa innehåll för tag"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<flaggor>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<flaggor>] <sökväg>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <arbetskatalog> <ny-sökväg>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<flaggor>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<flaggor>] <arbetskatalog>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [<sökväg>...]"
+
+#: builtin/worktree.c:26
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <sökväg>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "misslyckades ta bort \"%s\""
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:76
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Tar bort %s/%s: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "rapportera borttagna arbetskataloger"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:230
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "oanvändbar mål för arbetskatalog \"%s\""
-#: builtin/worktree.c:233
+#: builtin/worktree.c:235
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23667,7 +24422,7 @@
"använd \"%s -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller "
"\"remove\" för att rensa"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:237
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23677,141 +24432,151 @@
"använd \"%s -f\" för att överstyra, eller \"prune\" eller \"remove\" för att "
"rensa"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:248
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr ""
+"misslyckades kopiera \"%s\" till \"%s\"; sparse-checkout kanske inte kommer "
+"att fungera korrekt"
+
+#: builtin/worktree.c:268
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr ""
+"misslyckades kopiera arbetskatalogkonfiguration från \"%s\" till \"%s\""
+
+#: builtin/worktree.c:280 builtin/worktree.c:285
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "misslyckades slå av \"%s\" i \"%s\""
+
+#: builtin/worktree.c:356
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:308
+#: builtin/worktree.c:378
msgid "initializing"
msgstr "initierar"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:492 builtin/worktree.c:498
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Förbereder arbetskatalog (ny gren \"%s\")"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:494
#, 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:431
+#: builtin/worktree.c:503
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:509
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:554
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:485
+#: builtin/worktree.c:557
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:559
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:561
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:562
msgid "keep the new working tree locked"
msgstr "låt arbetskatalogen förbli låst"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:564 builtin/worktree.c:809
msgid "reason for locking"
msgstr "orsak till lås"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:567
msgid "set up tracking mode (see git-branch(1))"
msgstr "ställ in spårningsläge (se git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:570
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "försök träffa namn på ny gren mot en fjärrspårande gren"
-#: builtin/worktree.c:506
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-
-#: builtin/worktree.c:508
-msgid "--reason requires --lock"
-msgstr "--reason kräver --lock"
-
-#: builtin/worktree.c:512
+#: builtin/worktree.c:584
msgid "added with --lock"
msgstr "lagt till med --lock"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:646
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:691
+#: builtin/worktree.c:766
msgid "show extended annotations and reasons, if available"
msgstr "visa utökade annoteringar och grunder, om tillgängliga"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:768
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
"lägg till \"prunable\"-annoteringar till arbetskataloger äldre än <tid>"
-#: builtin/worktree.c:702
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose och --porcelain är ömsesidigt uteslutande"
+#: builtin/worktree.c:770
+msgid "terminate records with a NUL character"
+msgstr "avsluta poster med NUL-tecken"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
+#: builtin/worktree.c:1052
#, c-format
msgid "'%s' is not a working tree"
msgstr "\"%s\" är inte en arbetskatalog"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:823 builtin/worktree.c:856
msgid "The main working tree cannot be locked or unlocked"
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:828
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:830
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:858
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:899
msgid "working trees containing submodules cannot be moved or removed"
msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:907
msgid "force move even if worktree is dirty or locked"
msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:930 builtin/worktree.c:1054
#, c-format
msgid "'%s' is a main working tree"
msgstr "\"%s\" är inte en huvudarbetskatalog"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:935
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "kunde inte lista ut målnamn från \"%s\""
-#: builtin/worktree.c:868
+#: builtin/worktree.c:948
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -23820,7 +24585,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:870
+#: builtin/worktree.c:950
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -23828,38 +24593,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:873
+#: builtin/worktree.c:953
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:958
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "misslyckades flytta \"%s\" till \"%s\""
-#: builtin/worktree.c:924
+#: builtin/worktree.c:1004
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "misslyckades köra \"git status\" på \"%s\""
-#: builtin/worktree.c:928
+#: builtin/worktree.c:1008
#, 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:933
+#: builtin/worktree.c:1013
#, 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:956
+#: builtin/worktree.c:1036
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:979
+#: builtin/worktree.c:1059
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -23868,7 +24633,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:981
+#: builtin/worktree.c:1061
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -23876,17 +24641,17 @@
"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:984
+#: builtin/worktree.c:1064
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1088
#, c-format
msgid "repair: %s: %s"
msgstr "reparera: %s: %s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1091
#, c-format
msgid "error: %s: %s"
msgstr "fel: %s: %s"
@@ -23938,21 +24703,16 @@
"<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:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "ingen katalog angavs för --git-dir\n"
+msgid "no directory given for '%s' option\n"
+msgstr "ingen katalog angavs för flaggan \"%s\"\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "ingen namnrymd angavs för --namespace\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "ingen katalog angavs för --work-tree\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
@@ -23968,11 +24728,6 @@
msgid "no config key given for --config-env\n"
msgstr "ingen konfigurationsnyckel angavs för --config-env\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "ingen katalog angavs för -C\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
@@ -24002,29 +24757,29 @@
msgid "recursive alias: %s"
msgstr "rekursivt alias: %s"
-#: git.c:476
+#: git.c:480
msgid "write failure on standard output"
msgstr "skrivfel på standard ut"
-#: git.c:478
+#: git.c:482
msgid "unknown write failure on standard output"
msgstr "okänt skrivfel på standard ut"
-#: git.c:480
+#: git.c:484
msgid "close failed on standard output"
msgstr "stäng misslyckades på standard ut"
-#: git.c:833
+#: git.c:838
#, 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:883
+#: git.c:888
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "kan inte hantera %s som inbyggd"
-#: git.c:896
+#: git.c:901
#, c-format
msgid ""
"usage: %s\n"
@@ -24033,35 +24788,27 @@
"användning: %s\n"
"\n"
-#: git.c:916
+#: git.c:921
#, 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:928
+#: git.c:933
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "misslyckades köra kommandot \"%s\": %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr ""
"argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "inte ett git-arkiv"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile kräver --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args kan endast användas med --packfile"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "flaggor som inte hanterats"
@@ -24087,66 +24834,32 @@
msgid "exit immediately after advertising capabilities"
msgstr "avsluta omedelbart efter kungörelse av kapabiliteter"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "uttag/rör används redan: \"%s\""
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "kunde inte starta server på: \"%s\""
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "kunde inte starta serverprocess i bakgrunden"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "\"waitpid\" misslyckades"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "serverprocessen ännu inte operativ"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "serverprocessen kunde inte startas"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid är förvirrad"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "serverprocessen har ännu inte avslutats"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<namn>] [<flaggor>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<namn>] [<trådar>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
"test-helper simple-ipc start-daemon [<namn>] [<trådar>] [<max-väntetid>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<namn>] [<max-väntetid>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<namn>] [<igenkänningstecken>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [<namn>] [<antal-byte>] [<byte>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24154,83 +24867,79 @@
"test-helper simple-ipc multiple [<namn>] [<trådar>] [<antal-byte>] "
"[<buntstorlek>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "namn eller sövkäg till unixdomän-uttag"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "namn på namngivet rör"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "antal trådar i serverns trådpool"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "sekunder att vänta på att serverprocessen startar eller stoppar"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "antal byte"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "antal frågor per tråd"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "byte"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "ballasttecken"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "igenkänningstecken"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "igenkänningstecken för kommando att sända till servern"
-#: http.c:399
+#: http.c:350
#, 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:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
-#: 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:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.39.0"
-#: http.c:910
+#: http.c:812
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:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, 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:1139
+#: http.c:1023
#, 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:1143
+#: http.c:1027
#, 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:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24241,138 +24950,326 @@
" bad om: %s\n"
" omdirigering: %s"
-#: remote-curl.c:183
+#: remote-curl.c:184
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "felaktig citering på värde för push-option: \"%s\""
-#: remote-curl.c:307
+#: remote-curl.c:308
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?"
-#: remote-curl.c:408
+#: remote-curl.c:409
msgid "invalid server response; expected service, got flush packet"
msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket"
-#: remote-curl.c:439
+#: remote-curl.c:440
#, c-format
msgid "invalid server response; got '%s'"
msgstr "ogiltigt svar från servern; fick \"%s\""
-#: remote-curl.c:499
+#: remote-curl.c:500
#, c-format
msgid "repository '%s' not found"
msgstr "arkivet \"%s\" hittades inte"
-#: remote-curl.c:503
+#: remote-curl.c:504
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Autentisering misslyckades \"%s\""
-#: remote-curl.c:507
+#: remote-curl.c:508
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "kan inte nå \"%s\" med http.pinnedPubkey inställt till: %s"
+
+#: remote-curl.c:512
#, c-format
msgid "unable to access '%s': %s"
msgstr "kan inte komma åt \"%s\": %s"
-#: remote-curl.c:513
+#: remote-curl.c:518
#, c-format
msgid "redirecting to %s"
msgstr "omdirigerar till %s"
-#: remote-curl.c:644
+#: remote-curl.c:649
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "borde inte ha EOF när inte försiktig på EOF"
-#: remote-curl.c:656
+#: remote-curl.c:661
msgid "remote server sent unexpected response end packet"
msgstr "fjärrservern sände oväntat svarsavslutningspaketet"
-#: remote-curl.c:726
+#: remote-curl.c:730
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer"
-#: remote-curl.c:756
+#: remote-curl.c:759
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: felaktig radlängdstecken: %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:761
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: oväntat svarsavslutningspaketet"
-#: remote-curl.c:834
+#: remote-curl.c:837
#, c-format
msgid "RPC failed; %s"
msgstr "RPC misslyckades; %s"
-#: remote-curl.c:874
+#: remote-curl.c:877
msgid "cannot handle pushes this big"
msgstr "kan inte hantera så stora sändningar"
-#: remote-curl.c:989
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "kan inte packa upp anrop; zlib-deflate-fel %d"
-#: remote-curl.c:993
+#: remote-curl.c:994
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "kan inte packa upp anrop; zlib-slutfel %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1044
#, c-format
msgid "%d bytes of length header were received"
msgstr "%d byte av längd-huvudet togs emot"
-#: remote-curl.c:1045
+#: remote-curl.c:1046
#, c-format
msgid "%d bytes of body are still expected"
msgstr "%d byte av kroppen väntas fortfarande"
-#: remote-curl.c:1134
+#: remote-curl.c:1135
msgid "dumb http transport does not support shallow capabilities"
msgstr "dum http-transport stöder inte grunda arkiv"
-#: remote-curl.c:1149
+#: remote-curl.c:1150
msgid "fetch failed."
msgstr "mottagning misslyckades."
-#: remote-curl.c:1195
+#: remote-curl.c:1198
msgid "cannot fetch by sha1 over smart http"
msgstr "kan inte hämta med sha1 över smart http"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1242 remote-curl.c:1248
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "protokollfel: förväntade sha/ref, fick \"%s\""
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1260 remote-curl.c:1378
#, c-format
msgid "http transport does not support %s"
msgstr "http-transporten stöder inte %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1296
msgid "git-http-push failed"
msgstr "git-http-push misslyckades"
-#: remote-curl.c:1481
+#: remote-curl.c:1485
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1517
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: fel vid läsning av kommandoström från git"
-#: remote-curl.c:1520
+#: remote-curl.c:1524
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: försökte ta emot utan lokalt arkiv"
-#: remote-curl.c:1561
+#: remote-curl.c:1565
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: okänt kommando \"%s\" från git"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "behöver en arbetskatalog"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "kunde inte hitta enrolleringsroten"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
+#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "kunde inte växla till \"%s\""
+
+#: contrib/scalar/scalar.c:179
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "kunde inte ställa in %s=%s"
+
+#: contrib/scalar/scalar.c:197
+msgid "could not configure log.excludeDecoration"
+msgstr "kunde inte ställa in log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:218
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar-enrolleringar kräver en arbetskatalog"
+
+#: contrib/scalar/scalar.c:310
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "HEAD hos fjärren är inte en gren: \"%.*s\""
+
+#: contrib/scalar/scalar.c:316
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"misslyckades hämta namn på standardgren för fjärr; använder lokalt förval"
+
+#: contrib/scalar/scalar.c:329
+msgid "failed to get default branch name"
+msgstr "misslyckades hämta namn på standardgren"
+
+#: contrib/scalar/scalar.c:340
+msgid "failed to unregister repository"
+msgstr "misslyckades avregistrera arkivet"
+
+#: contrib/scalar/scalar.c:355
+msgid "failed to delete enlistment directory"
+msgstr "misslyckades ta bort enrolleringskatalogen"
+
+#: contrib/scalar/scalar.c:375
+msgid "branch to checkout after clone"
+msgstr "gren att checka ut efter kloning"
+
+#: contrib/scalar/scalar.c:377
+msgid "when cloning, create full working directory"
+msgstr "skapa komplett arbetskatalog vid kloning"
+
+#: contrib/scalar/scalar.c:379
+msgid "only download metadata for the branch that will be checked out"
+msgstr "hämta endast metadata för grenen som skall checkas ut"
+
+#: contrib/scalar/scalar.c:384
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<flaggor>] [--] <arkiv> [<kat>]"
+
+#: contrib/scalar/scalar.c:409
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "Kan inte härleda arbetsträdsnamn från \"%s\""
+
+#: contrib/scalar/scalar.c:418
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "katalogen \"%s\" finns redan"
+
+#: contrib/scalar/scalar.c:445
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "misslyckades hämta standardgren för \"%s\""
+
+#: contrib/scalar/scalar.c:456
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "kunde inte ställa in fjärr i \"%s\""
+
+#: contrib/scalar/scalar.c:465
+#, c-format
+msgid "could not configure '%s'"
+msgstr "kunde inte ställa in \"%s\""
+
+#: contrib/scalar/scalar.c:468
+msgid "partial clone failed; attempting full clone"
+msgstr "delvis klon misslyckades; försöker med fullständig klon"
+
+#: contrib/scalar/scalar.c:472
+msgid "could not configure for full clone"
+msgstr "kunde inte ställa in för komplett klon"
+
+#: contrib/scalar/scalar.c:504
+msgid "`scalar list` does not take arguments"
+msgstr "\"scalar list\" tar inte argument"
+
+#: contrib/scalar/scalar.c:517
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enrollering>]"
+
+#: contrib/scalar/scalar.c:544
+msgid "reconfigure all registered enlistments"
+msgstr "konfigurera alla registrerade enrolleringar på nytt"
+
+#: contrib/scalar/scalar.c:548
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enrollering>]"
+
+#: contrib/scalar/scalar.c:566
+msgid "--all or <enlistment>, but not both"
+msgstr "--all eller <enrollering>, men inte bägge"
+
+#: contrib/scalar/scalar.c:581
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "git-arkiv försvunnet i \"%s\""
+
+#: contrib/scalar/scalar.c:621
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <uppgift> [<enrollering>]\n"
+"Uppgifter:\n"
+
+#: contrib/scalar/scalar.c:639
+#, c-format
+msgid "no such task: '%s'"
+msgstr "okänd uppgift: \"%s\""
+
+#: contrib/scalar/scalar.c:689
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enrollering>]"
+
+#: contrib/scalar/scalar.c:736
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enrollering>"
+
+#: contrib/scalar/scalar.c:751
+msgid "refusing to delete current working directory"
+msgstr "vägrar ta bort aktuell arbetskatalog"
+
+#: contrib/scalar/scalar.c:766
+msgid "include Git version"
+msgstr "ta med Git-version"
+
+#: contrib/scalar/scalar.c:768
+msgid "include Git's build options"
+msgstr "ta med Gits byggflaggor"
+
+#: contrib/scalar/scalar.c:772
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:813
+msgid "-C requires a <directory>"
+msgstr "-C kräver en <katalog>"
+
+#: contrib/scalar/scalar.c:815
+#, c-format
+msgid "could not change to '%s'"
+msgstr "kunde inte byta till \"%s\""
+
+#: contrib/scalar/scalar.c:821
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c kräver ett argument på formen <nyckel>=<värde>"
+
+#: contrib/scalar/scalar.c:839
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <katalog>] [-c <nyckel>=<värde>] <kommando> [<flaggor>]\n"
+"\n"
+"Kommandon:\n"
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr "ingen kompilatorinformation tillgänglig\n"
@@ -24381,52 +25278,52 @@
msgid "no libc information available\n"
msgstr "ingen libc-information tillgänglig\n"
-#: list-objects-filter-options.h:94
+#: list-objects-filter-options.h:126
msgid "args"
msgstr "argument"
-#: list-objects-filter-options.h:95
+#: list-objects-filter-options.h:127
msgid "object filtering"
msgstr "objektfiltrering"
-#: parse-options.h:184
+#: parse-options.h:188
msgid "expiry-date"
msgstr "giltig-till"
-#: parse-options.h:198
+#: parse-options.h:202
msgid "no-op (backward compatibility)"
msgstr "ingen funktion (bakåtkompatibilitet)"
-#: parse-options.h:310
+#: parse-options.h:341
msgid "be more verbose"
msgstr "var mer pratsam"
-#: parse-options.h:312
+#: parse-options.h:343
msgid "be more quiet"
msgstr "var mer tyst"
-#: parse-options.h:318
+#: parse-options.h:349
msgid "use <n> digits to display object names"
msgstr "använd <n> siffror för att visa objektnamn"
-#: parse-options.h:337
+#: parse-options.h:368
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande"
-#: parse-options.h:338
+#: parse-options.h:369
msgid "read pathspec from file"
msgstr "läs sökvägsangivelse från fil"
-#: parse-options.h:339
+#: parse-options.h:370
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "key"
msgstr "nyckel"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
@@ -24496,17 +25393,17 @@
msgstr "Visa kanoniska namn och e-postadresser för kontakter"
#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Se till att referensen är välformad"
+
+#: command-list.h:66
msgid "Switch branches or restore working tree files"
msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "Kopiera filer från indexet till arbetskatalogen"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Se till att referensen är välformad"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "Hitta incheckningar som ännu inte applicerats uppströms"
@@ -24668,42 +25565,42 @@
msgstr "Visa hjälpinformation om Git"
#: command-list.h:108
+msgid "Run git hooks"
+msgstr "Kör git-krokar"
+
+#: command-list.h:109
msgid "Server side implementation of Git over HTTP"
msgstr "Serversideimplementation av Git över HTTP"
-#: command-list.h:109
+#: command-list.h:110
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:110
+#: command-list.h:111
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Sänd objekt över HTTP/DAV till ett annat arkiv"
-#: command-list.h:111
+#: command-list.h:112
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:112
+#: command-list.h:113
msgid "Build pack index file for an existing packed archive"
msgstr "SKapa pack-indexfiler för ett befintligt packat arkiv"
-#: command-list.h:113
+#: command-list.h:114
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt"
-#: command-list.h:114
+#: command-list.h:115
msgid "Instantly browse your working repository in gitweb"
msgstr "Omedelbart bläddra i din arbetskatalog med gitweb"
-#: command-list.h:115
+#: command-list.h:116
msgid "Add or parse structured information in commit messages"
msgstr ""
"Lägg till eller tolka strukturerad information i incheckningsmeddelanden"
-#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Bläddraren för Git-arkiv"
-
#: command-list.h:117
msgid "Show commit logs"
msgstr "Visa incheckningsloggar"
@@ -24753,25 +25650,25 @@
msgstr "Förvalt hjälpprogram att använda tillsammans med git-merge-index"
#: command-list.h:129
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr "Kör verktyg för lösning av sammanslagningskonflikter"
-
-#: command-list.h:130
msgid "Show three-way merge without touching index"
msgstr "Visa trevägssammanslagning utan att röra indexet"
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Skriv och verifiera multi-pack-index"
+#: command-list.h:130
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr "Kör verktyg för lösning av sammanslagningskonflikter"
-#: command-list.h:132
+#: command-list.h:131
msgid "Creates a tag object with extra validation"
msgstr "skapar ett taggobjekt med extra validering"
-#: command-list.h:133
+#: command-list.h:132
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Bygg ett trädobjekt från ls-tree-formaterad text"
+#: command-list.h:133
+msgid "Write and verify multi-pack-indexes"
+msgstr "Skriv och verifiera multi-pack-index"
+
#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk"
@@ -24873,17 +25770,17 @@
msgstr "Återställ filer i arbetskatalogen"
#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Återställ några befintliga incheckningar"
-
-#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning"
-#: command-list.h:161
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "Plocka ut och massera parametrar"
+#: command-list.h:161
+msgid "Revert some existing commits"
+msgstr "Återställ några befintliga incheckningar"
+
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr "Ta bort filer från arbetskatalogen och från indexet"
@@ -24897,49 +25794,49 @@
msgstr "Sänd objekt över Git-protokollet till annat arkiv"
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
-msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git"
-
-#: command-list.h:166
-msgid "Summarize 'git log' output"
-msgstr "Summera \"git log\"-utdata"
-
-#: command-list.h:167
-msgid "Show various types of objects"
-msgstr "Visa olika sorters objekt"
-
-#: command-list.h:168
-msgid "Show branches and their commits"
-msgstr "Visa grenar och deras incheckningar"
-
-#: command-list.h:169
-msgid "Show packed archive index"
-msgstr "Skapa packat arkivindex"
-
-#: command-list.h:170
-msgid "List references in a local repository"
-msgstr "Visa referenser i ett lokalt arkiv"
-
-#: command-list.h:171
msgid "Git's i18n setup code for shell scripts"
msgstr "Git:s i18n-startkod för skalskript"
-#: command-list.h:172
+#: command-list.h:166
msgid "Common Git shell script setup code"
msgstr "Gemensam skriptstartkod för Git"
+#: command-list.h:167
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git"
+
+#: command-list.h:168
+msgid "Summarize 'git log' output"
+msgstr "Summera \"git log\"-utdata"
+
+#: command-list.h:169
+msgid "Show various types of objects"
+msgstr "Visa olika sorters objekt"
+
+#: command-list.h:170
+msgid "Show branches and their commits"
+msgstr "Visa grenar och deras incheckningar"
+
+#: command-list.h:171
+msgid "Show packed archive index"
+msgstr "Skapa packat arkivindex"
+
+#: command-list.h:172
+msgid "List references in a local repository"
+msgstr "Visa referenser i ett lokalt arkiv"
+
#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
-msgstr "Initiera och modifiera sparse-checkout"
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr "Reducera din arbetskatalog till en undermängd av de spårade filerna"
#: command-list.h:174
-msgid "Stash the changes in a dirty working directory away"
-msgstr "Spara undan ändringar i en lortig arbetskatalog"
-
-#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Lägg filinnehållet till indexet"
+#: command-list.h:175
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Spara undan ändringar i en lortig arbetskatalog"
+
#: command-list.h:176
msgid "Show the working tree status"
msgstr "Visa status för arbetskatalogen"
@@ -25013,65 +25910,65 @@
msgstr "Kontrollera GPG-signaturer i taggar"
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)"
-
-#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "Visa loggar med differenser varje incheckning introducerar"
-#: command-list.h:196
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "Hantera ytterligare arbetskataloger"
-#: command-list.h:197
+#: 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:198
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "Definierar attribut per sökväg"
-#: command-list.h:199
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Gits kommandoradsgränssnitt och -konventioner"
-#: command-list.h:200
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "Grundläggande Git-handledning för utvecklare"
-#: command-list.h:201
+#: command-list.h:200
msgid "Providing usernames and passwords to Git"
msgstr "Tillhandahåll användarnamn och lösenord till Git"
-#: command-list.h:202
+#: command-list.h:201
msgid "Git for CVS users"
msgstr "Git för CVS-användare"
-#: command-list.h:203
+#: command-list.h:202
msgid "Tweaking diff output"
msgstr "Justrea diff-utdata"
-#: command-list.h:204
+#: command-list.h:203
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:205
+#: command-list.h:204
msgid "Frequently asked questions about using Git"
msgstr "Ofta ställda frågor om att använda Git"
-#: command-list.h:206
+#: command-list.h:205
msgid "A Git Glossary"
msgstr "En Git-ordlista"
-#: command-list.h:207
+#: command-list.h:206
msgid "Hooks used by Git"
msgstr "Krokar som används av Git"
-#: command-list.h:208
+#: command-list.h:207
msgid "Specifies intentionally untracked files to ignore"
msgstr "Ange avsiktligen ospårade filer att ignorera"
+#: command-list.h:208
+msgid "The Git repository browser"
+msgstr "Bläddraren för Git-arkiv"
+
#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
msgstr "Kopplar författar-/incheckarnamn och/eller -e-postadresser"
@@ -25101,52 +25998,21 @@
msgstr "Monterar ett arkiv inuti ett annat"
#: command-list.h:216
-msgid "A tutorial introduction to Git: part two"
-msgstr "Introduktion till Git: del två"
-
-#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "Introduktion till Git"
+#: command-list.h:217
+msgid "A tutorial introduction to Git: part two"
+msgstr "Introduktion till Git: del två"
+
#: command-list.h:218
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)"
+
+#: command-list.h:219
msgid "An overview of recommended workflows with Git"
msgstr "Översikt över rekommenderade arbetsflöden med Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "bisect-körning misslyckades: inget kommando gavs."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "kör $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"\"bisect\"-körningen misslyckades:\n"
-"felkod $res från \"$command\" är < 0 eller >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "\"bisect\"-körningen kan inte fortsätta längre"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"\"bisect\"-körningen misslyckades:\n"
-"\"bisect-state $state\" avslutades med felkoden $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "\"bisect\"-körningen lyckades"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25187,506 +26053,45 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "\"$sm_path\" finns redan i indexet"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "\"$sm_path\" har inte någon utcheckad incheckning"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-
-#: git-submodule.sh:532
-#, 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:542
-#, 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:547
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr ""
-"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
-"undermodulsökvägen \"$sm_path\""
-
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 "
-"direkt:"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
-"Direkt hämtning av incheckningen misslyckades."
-
-#: git-submodule.sh:578
-#, 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:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-
-#: git-submodule.sh:589
-#, 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:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-
-#: git-submodule.sh:595
-#, 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:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-
-#: git-submodule.sh:627
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Tillämpade autostash."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Kan inte spara $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"Tillämpning av autostash gav konflikter.\n"
-"Dina ändringar är säkra i stashen.\n"
-"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Ombaserar ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Kommandon:\n"
-"p, pick <incheckning> = använd incheckning\n"
-"r, reword <incheckning> = använd incheckning, men redigera "
-"incheckningsmeddelandet\n"
-"e, edit <incheckning> = använd incheckning, men stanna för tillägg\n"
-"s, squash <incheckning> = använd incheckning, men infoga i föregående "
-"incheckning\n"
-"f, fixup <incheckning> = som \"squash\", men förkasta "
-"incheckningsmeddelandet\n"
-"x, exec <incheckning> = kör kommando (resten av raden) i skalet\n"
-"d, drop <incheckning> = ta bort incheckning\n"
-"l, label <etikett> = ge aktuellt HEAD ett namn\n"
-"t, reset <etikett> = återställ HEAD till en etikett\n"
-"m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n"
-". skapa en sammanslagning med ursprungligt meddelande (eller\n"
-". enrads, om inget incheckningsmeddelande angavs). Använd\n"
-". -v <incheckning> för att skriva om meddelandet.\n"
-"\n"
-"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Du kan utöka incheckningen nu, med\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"När du är nöjd med dina ändringar kör du\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: inte en incheckning som kan väljas"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Felaktigt incheckningsnamn: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Snabbspolade till $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Kan inte snabbspola till $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Kan inte flytta HEAD till $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Fel när sammanslagningen $sha1 skulle göras om"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Kunde inte välja $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Det här är incheckningsmeddelande ${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Det här är en kombination av $count incheckning."
-msgstr[1] "Det här är en kombination av $count incheckningar."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Kan inte skriva $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Det här är en kombination av 2 incheckningar."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Kunde inte tillämpa $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Kunde inte utöka incheckning efter att ha lyckats välja $sha1... $rest\n"
-"Det är antagligen på grund av ett tomt incheckningsmeddelande, eller att\n"
-"pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
-"du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Stoppade på $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Kör: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Körning misslyckades: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Du kan rätta problemet och sedan köra\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Körningen lyckades: $rest\n"
-"men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n"
-"Checka in eller utför \"stash\" på ändringarna och kör sedan\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Okänt kommando: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Rätta det med \"git rebase --edit-todo\"."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Lyckades ombasera och uppdatera $head_name."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Du har köade ändringar i din arbetskatalog.\n"
-"Om det är meningen att ändringarna\n"
-"ska läggas in i föregående incheckning, kör:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Om de ska checkas in i en egen incheckning, kör:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"Oavsett vilket, när du är färdig fortsätter du med:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
-"först och kör sedan \"git rebase --continue\" igen."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Kunde inte checka in köade ändringar."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Kunde inte starta textredigerare"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Kunde inte checka ut $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Inget HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Kunde inte skapa temporär $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Kunde inte markera som interaktiv"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
-msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Observera att tomma incheckningar är utkommenterade"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Kunde inte initiera omskrivna incheckningar"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "använd: $dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:182
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen"
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:191 git-sh-setup.sh:198
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog."
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Kan inte ombasera: Du har oköade ändringar."
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:212
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Kan inte skriva om grenar: Du har oköade ändringar."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:215
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "Kan inte $action: Du har oköade ändringar."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:226
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Kan inte $action: Ditt index innehåller ändringar som inte checkats in."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:228
msgid "Additionally, your index contains uncommitted changes."
msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:348
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Du måste köra kommandot från arbetskatalogens toppnivå."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:353
msgid "Unable to determine absolute path of git directory"
msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
@@ -25768,7 +26173,7 @@
msgid "failed to open hunk edit file for reading: %s"
msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -25782,7 +26187,7 @@
"a - köa stycket och alla följande i filen\n"
"d - köa inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -25796,7 +26201,7 @@
"a - \"stash\":a stycket och alla följande i filen\n"
"d - \"stash\":a inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -25810,7 +26215,7 @@
"a - ta bort stycket och alla följande i filen från kön\n"
"d - ta inte bort stycket eller något av de följande i filen från kön"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -25824,7 +26229,7 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -25838,7 +26243,7 @@
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -25852,7 +26257,7 @@
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -25866,7 +26271,7 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -25880,7 +26285,7 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -25902,90 +26307,90 @@
"e - redigera aktuellt stycke manuellt\n"
"? - visa hjälp\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "Markerade stycken kan inte appliceras på indexet!\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorerar ej sammanslagen: %s\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera tillägg på arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "Inga andra stycken att gå till\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ogiltigt siffervärde: \"%s\"\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Beklagar, det finns bara %d stycke.\n"
msgstr[1] "Beklagar, det finns bara %d stycken.\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "Inga andra stycken att söka efter\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "Inga stycken motsvarar givet mönster\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Inget föregående stycke\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Inget följande stycke\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "Beklagar, kan inte dela stycket\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Dela i %d stycke.\n"
msgstr[1] "Dela i %d stycken.\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "Beklagar, kan inte redigera stycket\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -26002,57 +26407,57 @@
"diff - visa diff mellan HEAD och index\n"
"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "saknad --"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "okänt läge för --patch: %s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "felaktigt argument %s, förväntar --"
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "lokal zon skiljer sig från GMT med delar av minuter\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "ödesdigert: kommandot \"%s\" dog med slutkoden %d"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases är inkompatibelt med andra flaggor\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26064,11 +26469,11 @@
"Sätt sendemail.forbidSendmailVariables till false för att inaktivera denna "
"kontroll.\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Kan inte köra git format-patch från utanför arkivet\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -26076,37 +26481,37 @@
"\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad "
"eller konfigurationsflagga)\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Okänd inställning i --confirm: \"%s\"\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "varning: \":include:\" stöds inte: %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "varning: sendmail-raden känns inte igen: %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -26121,12 +26526,12 @@
" * Säga \"./%s\" om du menar en fil; eller\n"
" * Ange flaggan --format-patch om du menar ett intervall.\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Misslyckades utföra opendir %s: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
@@ -26136,17 +26541,17 @@
"Inga patchfiler angavs!\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "Ingen ärenderad i %s?"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Kunde inte öppna för skrivning %s: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -26160,38 +26565,38 @@
"\n"
"Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Misslyckades öppna %s: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Misslyckades öppna %s.final: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "Sammanfattande brev tomt, hoppar över\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
"Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -26204,21 +26609,21 @@
"har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
"vill sända.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Till vem ska breven sändas (om någon)?"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID att använda som In-Reply-To för det första brevet (om något)? "
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "fel: kunde inte få fram en giltig adress från: %s\n"
@@ -26226,16 +26631,16 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA-sökvägen \"%s\" finns inte"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -26262,130 +26667,130 @@
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "Svar krävs på frågan \"Sända brevet?\""
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "Nödvändig SMTP-server har inte angivits korrekt."
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Servern stöder inte SMARTTLS! %s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS misslyckades! %s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --"
"smtp-debug."
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "Misslyckades sända %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Test-Sände %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "Sände %s\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "Test-OK. Loggen säger:\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "OK. Loggen säger:\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Resultat: OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "kan inte öppna filen %s"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Kunde inte köra \"%s\""
-#: git-send-email.perl:1972
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Lägger till %s: %s från: \"%s\"\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) misslyckades stänga röret till \"%s\""
-#: git-send-email.perl:2006
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "kan inte sända brev som sjubitars"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "ogiltig överföringskondning"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2100
#, perl-format
msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
+"fatal: %s: rejected by %s hook\n"
"%s\n"
"warning: no patches were sent\n"
msgstr ""
-"ödesdigert: %s: refuserad av sendemail-validate-kroken\n"
+"ödesdigert: %s: refuserad av kroken %s\n"
"%s\n"
"varning: inga patchar har sänts\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "kunde inte öppna %s: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2113
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -26394,7 +26799,7 @@
"ödesdigert: %s:%d är längre än 998 tecken\n"
"varning: inga patchar har sänts\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2131
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
@@ -26402,11 +26807,1143 @@
"säkerhetskopior.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2135
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ msgid "git archive --list"
+#~ msgstr "git archive --list"
+
+#, c-format
+#~ msgid "unknown value for --diff-merges: %s"
+#~ msgstr "okänt värde för --diff-merges: %s"
+
+#, c-format
+#~ msgid "invalid value '%s' for lsrefs.unborn"
+#~ msgstr "ogiltigt värde \"%s\" för lsrefs.unborn"
+
+#~ msgid "backend for `git stash -p`"
+#~ msgstr "bakända för \"git stash -p\""
+
+#, c-format
+#~ msgid "Invalid value for --empty: %s"
+#~ msgstr "Felaktigt värde för --empty: %s"
+
+#, c-format
+#~ msgid "Invalid value for --patch-format: %s"
+#~ msgstr "Felaktigt värde för --patch-format: %s"
+
+#, c-format
+#~ msgid "Invalid value for --show-current-patch: %s"
+#~ msgstr "Felaktigt värde för --show-current-patch: %s"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad "
+#~ "| --term-new]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad "
+#~ "| --term-new]"
+
+#~ msgid "git bisect--helper --bisect-next"
+#~ msgstr "git bisect--helper --bisect-next"
+
+#~ msgid "git bisect--helper --bisect-visualize"
+#~ msgstr "git bisect--helper --bisect-visualize"
+
+#, c-format
+#~ msgid "invalid color '%s' in color.blame.repeatedLines"
+#~ msgstr "felaktig färg \"%s\" i color.blame.repeatedLines"
+
+#~ msgid "invalid value for blame.coloring"
+#~ msgstr "ogiltigt värde för blame.coloring"
+
+#~ msgid ""
+#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e "
+#~ "| -p | <type> | --textconv | --filters) [--path=<path>] <object>"
+#~ msgstr ""
+#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e "
+#~ "| -p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
+
+#~ msgid "show object type"
+#~ msgstr "visa objekttyp"
+
+#~ msgid "exit with zero when there's no error"
+#~ msgstr "avsluta med noll när det inte uppstått något fel"
+
+#~ 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"
+
+#~ msgid "show info about objects fed from the standard input"
+#~ msgstr "visa information för objekt som listas på standard in"
+
+#~ 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)"
+
+#~ msgid "show all objects with --batch or --batch-check"
+#~ msgstr "visa alla objekt med --batch eller --batch-check"
+
+#~ msgid "do not order --batch-all-objects output"
+#~ msgstr "ordna inte --batch-all-objects output"
+
+#~ msgid "set up tracking mode (see git-pull(1))"
+#~ msgstr "ställ in spårningsläge (se git-pull(1))"
+
+#~ msgid "Using both --reset-author and --author does not make sense"
+#~ msgstr "Kan inte använda både --reset-author och --author"
+
+#~ msgid "Options --squash and --fixup cannot be used together"
+#~ msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
+
+#~ msgid "Only one of -c/-C/-F/--fixup can be used."
+#~ msgstr "Endast en av -c/-C/-F/--fixup kan användas."
+
+#~ msgid "Option -m cannot be combined with -c/-C/-F."
+#~ msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
+
+#~ msgid ""
+#~ "Only one of --include/--only/--all/--interactive/--patch can be used."
+#~ msgstr ""
+#~ "Endast en av --include/--only/--all/--interactive/--patch kan användas."
+
+#~ msgid "git count-objects [-v] [-H | --human-readable]"
+#~ msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#, c-format
+#~ msgid "configuration fetch.output contains invalid value %s"
+#~ msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
+
+#~ msgid "--cached or --untracked cannot be used with --no-index"
+#~ msgstr "--cached och --untracked kan inte användas med --no-index"
+
+#~ msgid "--untracked cannot be used with --cached"
+#~ msgstr "--untracked kan inte användas med --cached"
+
+#~ msgid "git hash-object --stdin-paths"
+#~ msgstr "git hash-object --stdin-paths"
+
+#~ msgid "git help [-g|--guides]"
+#~ msgstr "git help [-g|--guides]"
+
+#~ msgid "git help [-c|--config]"
+#~ msgstr "git help [-c|--config]"
+
+#~ msgid "git mktag"
+#~ msgstr "git mktag"
+
+#~ msgid "git mktree [-z] [--missing] [--batch]"
+#~ msgstr "git mktree [-z] [--missing] [--batch]"
+
+#~ msgid "read from stdin"
+#~ msgstr "läs från standard in"
+
+#~ msgid "git notes merge --commit [-v | -q]"
+#~ msgstr "git notes merge --commit [-v | -q]"
+
+#~ msgid "git notes merge --abort [-v | -q]"
+#~ msgstr "git notes merge --abort [-v | -q]"
+
+#~ msgid "git notes get-ref"
+#~ msgstr "git notes get-ref"
+
+#~ msgid "invalid value for --missing"
+#~ msgstr "ogiltigt värde för --missing"
+
+#~ msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#~ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#, c-format
+#~ msgid "Invalid value for %s: %s"
+#~ msgstr "Felaktigt värde för %s: %s"
+
+#, c-format
+#~ msgid "Invalid value for pull.ff: %s"
+#~ msgstr "Felaktigt värde för pull.ff: %s"
+
+#~ msgid "git rebase --continue | --abort | --skip | --edit-todo"
+#~ msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+
+#, c-format
+#~ msgid "'%s' is not a valid timestamp"
+#~ msgstr "\"%s\" är inte en giltig tidsstämpel"
+
+#~ msgid "git reflog [ show | expire | delete | exists ]"
+#~ msgstr "git reflog [ show | expire | delete | exists ]"
+
+#~ msgid "git remote [-v | --verbose]"
+#~ msgstr "git remote [-v | --verbose]"
+
+#~ msgid "git replace [-f] --convert-graft-file"
+#~ msgstr "git replace [-f] --convert-graft-file"
+
+#, c-format
+#~ msgid ""
+#~ "\n"
+#~ "It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+#~ "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+#~ "to make this the default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Det tog %.2f sekunder att räkna upp oköade ändringar efter "
+#~ "återställning.\n"
+#~ "Du kan använda \"--quiet\" för att förhindra detta. Ställ "
+#~ "konfigurationsvariabeln\n"
+#~ "reset.quiet till true för att göra detta till förval.\n"
+
+#~ msgid "git sparse-checkout list"
+#~ msgstr "git sparse-checkout list"
+
+#~ msgid "unable to upgrade repository format to enable worktreeConfig"
+#~ msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig"
+
+#~ msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+#~ msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#~ msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+#~ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#~ msgid "git sparse-checkout disable"
+#~ msgstr "git sparse-checkout disable"
+
+#~ 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."
+
+#~ msgid "git stripspace [-s | --strip-comments]"
+#~ msgstr "git stripspace [-s | --strip-comments]"
+
+#~ msgid "git stripspace [-c | --comment-lines]"
+#~ msgstr "git stripspace [-c | --comment-lines]"
+
+#~ msgid "submodule--helper print-default-remote takes no arguments"
+#~ msgstr "submodule--helper print-default-remote tar inga argument"
+
+#~ msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+#~ msgstr ""
+#~ "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]"
+
+#~ msgid "suppress output for update by rebase or merge"
+#~ msgstr "dölj utdata för uppdatering via ombasering eller sammanslagning{"
+
+#~ msgid "overrides update mode in case the repository is a fresh clone"
+#~ msgstr "överstyr uppdateringsläge om arkviet är en färsk klon"
+
+#~ msgid "depth for shallow fetch"
+#~ msgstr "djup för grund hämtning"
+
+#~ msgid "sha1"
+#~ msgstr "sha1"
+
+#~ msgid "SHA1 expected by superproject"
+#~ msgstr "SHA1 förväntades av överprojekt{"
+
+#~ msgid "subsha1"
+#~ msgstr "subsha1"
+
+#~ msgid "SHA1 of submodule's HEAD"
+#~ msgstr "SHA1 för undermodulens \"HEAD\""
+
+#~ msgid "git submodule--helper run-update-procedure [<options>] <path>"
+#~ msgstr "git submodule--helper run-update-procedure [<flaggor>] <sökväg>"
+
+#~ msgid "git submodule--helper config --check-writeable"
+#~ msgstr "git submodule--helper config --check-writeable"
+
+#~ msgid "git update-server-info [--force]"
+#~ msgstr "git update-server-info [--force]"
+
+#~ msgid "Initialize and modify the sparse-checkout"
+#~ msgstr "Initiera och modifiera sparse-checkout"
+
+#, sh-format
+#~ msgid ""
+#~ "Unable to find current ${remote_name}/${branch} revision in submodule "
+#~ "path '$sm_path'"
+#~ msgstr ""
+#~ "Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
+#~ "undermodulsökvägen \"$sm_path\""
+
+#, sh-format
+#~ msgid "Failed to recurse into submodule path '$displaypath'"
+#~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
+
+#~ msgid "--index outside a repository"
+#~ msgstr "--index utanför arkiv"
+
+#~ msgid "--cached outside a repository"
+#~ msgstr "--cached utanför arkiv"
+
+#~ msgid "unrecognized input"
+#~ msgstr "indata känns inte igen"
+
+#, c-format
+#~ msgid "cannot read %s"
+#~ msgstr "kan inte läsa %s"
+
+#~ msgid "Option --exec can only be used together with --remote"
+#~ msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
+
+#, c-format
+#~ msgid ""
+#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+#~ msgstr ""
+#~ "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom "
+#~ "ombasering."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+#~ msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+#~ msgstr ""
+#~ "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom "
+#~ "ombasering."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track local branch '%s'."
+#~ msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#~ msgstr ""
+#~ "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom "
+#~ "ombasering."
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote ref '%s'."
+#~ msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"."
+
+#~ msgid "Cannot force update the current branch."
+#~ msgstr "Kan inte tvinga uppdatering av aktuell gren."
+
+#, c-format
+#~ msgid "Not a valid object name: '%s'."
+#~ msgstr "Objektnamnet är inte giltigt: \"%s\"."
+
+#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#~ msgstr ""
+#~ "--name-only, --name-status, --check och -s är ömsesidigt uteslutande"
+
+#~ msgid "-G, -S and --find-object are mutually exclusive"
+#~ msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
+
+#~ msgid ""
+#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#~ msgstr ""
+#~ "-G och --pickaxe-regex är ömsesidigt uteslutande, använd --pickaxe-regex "
+#~ "med -S"
+
+#~ msgid ""
+#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+#~ "with -G and -S"
+#~ msgstr ""
+#~ "--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --"
+#~ "pickaxe-all med -G och -S"
+
+#~ msgid "--stateless-rpc requires multi_ack_detailed"
+#~ msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
+
+#~ msgid "--left-only and --right-only are mutually exclusive"
+#~ msgstr "--left-only och --right-only är ömsesidigt uteslutande"
+
+#, c-format
+#~ msgid "unrecognized %%(objectsize) argument: %s"
+#~ msgstr "okänt %%(objectsize)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized %%(subject) argument: %s"
+#~ msgstr "okänt %%(subject)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized %%(contents) argument: %s"
+#~ msgstr "okänt %%(contents)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized %%(raw) argument: %s"
+#~ msgstr "okänt %%(raw)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized argument '%s' in %%(%s)"
+#~ msgstr "okänt argument \"%s\" i %%(%s)"
+
+#, c-format
+#~ msgid "unrecognized %%(align) argument: %s"
+#~ msgstr "okänt %%(align)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized %%(if) argument: %s"
+#~ msgstr "okänt %%(if)-argument: %s"
+
+#, c-format
+#~ msgid "format: %%(if) atom used without a %%(then) atom"
+#~ msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
+
+#, c-format
+#~ msgid "format: %%(then) atom used without an %%(if) atom"
+#~ msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
+
+#, c-format
+#~ msgid "format: %%(else) atom used without a %%(then) atom"
+#~ msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
+
+#~ msgid "--unsorted-input is incompatible with --no-walk"
+#~ msgstr "--unsorted-input är inkompatibelt med --no-walk"
+
+#~ msgid "--no-walk is incompatible with --unsorted-input"
+#~ msgstr "--no-walk är inkompatibelt med --unsorted-input"
+
+#~ msgid "--dry-run is incompatible with --interactive/--patch"
+#~ msgstr "--dry-run är inkompatibelt med --interactive/--patch"
+
+#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+#~ msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch"
+
+#~ msgid "--pathspec-from-file is incompatible with --edit"
+#~ msgstr "--pathspec-from-file är inkompatibelt med --edit"
+
+#~ msgid "-A and -u are mutually incompatible"
+#~ msgstr "-A och -u är ömsesidigt inkompatibla"
+
+#~ msgid "Option --ignore-missing can only be used together with --dry-run"
+#~ msgstr ""
+#~ "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
+
+#~ msgid "--pathspec-from-file is incompatible with pathspec arguments"
+#~ msgstr ""
+#~ "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
+
+#~ msgid "--pathspec-file-nul requires --pathspec-from-file"
+#~ msgstr "--pathspec-file-nul kräver --pathspec-from-file"
+
+#, 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"
+
+#~ msgid "--column and --verbose are incompatible"
+#~ msgstr "--column och --verbose är inkompatibla"
+
+#, c-format
+#~ msgid "'%s' cannot be used with %s"
+#~ msgstr "\"%s\" kan inte användas med %s"
+
+#~ msgid "set upstream info for new branch"
+#~ msgstr "sätt uppströmsinformation för ny gren"
+
+#, c-format
+#~ msgid "-%c, -%c and --orphan are mutually exclusive"
+#~ msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
+
+#~ msgid "-p and --overlay are mutually exclusive"
+#~ msgstr "-p och --overlay är ömsesidigt uteslutande"
+
+#~ msgid "--pathspec-from-file is incompatible with --detach"
+#~ msgstr "--pathspec-from-file är inkompatibelt med --detach"
+
+#~ msgid "--pathspec-from-file is incompatible with --patch"
+#~ msgstr "--pathspec-from-file är inkompatibelt med --patch"
+
+#, c-format
+#~ msgid "--bare and --origin %s options are incompatible."
+#~ msgstr "flaggorna --bare och --origin %s är inkompatibla."
+
+#~ msgid "--bare and --separate-git-dir are incompatible."
+#~ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
+
+#~ msgid "--pathspec-from-file with -a does not make sense"
+#~ msgstr "--pathspec-from-file med -a ger ingen mening"
+
+#, c-format
+#~ msgid "cannot combine -m with --fixup:%s"
+#~ msgstr "kan inte kombinera -m med --fixup:%s"
+
+#~ msgid "--long and -z are incompatible"
+#~ msgstr "--long och -z är inkompatibla"
+
+#, c-format
+#~ msgid "cannot combine reword option of --fixup with path '%s'"
+#~ msgstr ""
+#~ "kan inte kombinera omformuleringsflaggor för --fixup med sökvägen \"%s\""
+
+#~ msgid ""
+#~ "reword option of --fixup is mutually exclusive with --patch/--"
+#~ "interactive/--all/--include/--only"
+#~ msgstr ""
+#~ "omformuleringsflaggan i --fixup är ömsesidigt uteslutande med --patch/--"
+#~ "interactive/--all/--include/--only"
+
+#~ msgid "--long is incompatible with --abbrev=0"
+#~ msgstr "--long är inkompatibel med --abbrev=0"
+
+#~ msgid "--dirty is incompatible with commit-ishes"
+#~ msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
+
+#~ msgid "--broken is incompatible with commit-ishes"
+#~ msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
+
+#~ msgid "--stdin and --merge-base are mutually exclusive"
+#~ msgstr "--stdin och --merge-base är ömsesidigt uteslutande"
+
+#~ msgid "--dir-diff is incompatible with --no-index"
+#~ msgstr "--dir-diff är inkompatibelt med --no-index"
+
+#~ msgid "--gui, --tool and --extcmd are mutually exclusive"
+#~ msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
+
+#~ msgid "--anonymize-map without --anonymize does not make sense"
+#~ msgstr "--anonymize-map utan --anonymize ger ingen mening"
+
+#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+#~ msgstr "Kan inte ange både --import-marks och --import-marks-if-exists"
+
+#, 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"
+
+#~ msgid "--deepen and --depth are mutually exclusive"
+#~ msgstr "--deepen och --depth är ömsesidigt uteslutande"
+
+#~ msgid "--depth and --unshallow cannot be used together"
+#~ msgstr "--depth och --unshallow kan inte användas samtidigt"
+
+#~ msgid "--fix-thin cannot be used without --stdin"
+#~ msgstr "--fix-thin kan inte användas med --stdin"
+
+#~ msgid "--object-format cannot be used with --stdin"
+#~ msgstr "--object-format kan inte användas med --stdin"
+
+#~ msgid "--separate-git-dir and --bare are mutually exclusive"
+#~ msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande"
+
+#~ msgid "-n and -k are mutually exclusive"
+#~ msgstr "-n och -k kan inte användas samtidigt"
+
+#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+#~ msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
+
+#~ msgid "--stdout, --output, and --output-directory are mutually exclusive"
+#~ msgstr ""
+#~ "--stdout, --output, och --output-directory är ömsesidigt uteslutande"
+
+#~ msgid "--creation-factor requires --range-diff"
+#~ msgstr "--creation-factor kräver --range-diff"
+
+#~ msgid "You cannot combine --squash with --no-ff."
+#~ msgstr "Du kan inte kombinera --squash med --no-ff."
+
+#~ msgid "You cannot combine --squash with --commit."
+#~ msgstr "Du kan inte kombinera --squash med --commit."
+
+#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+#~ msgstr ""
+#~ "--keep-unreachable och --unpack-unreachable kan inte användas samtidigt"
+
+#~ msgid "--delete is incompatible with --all, --mirror and --tags"
+#~ msgstr "--delete är inkompatibel med --all, --mirror och --tags"
+
+#~ msgid "--all and --tags are incompatible"
+#~ msgstr "--all och --tags är inkompatibla"
+
+#~ msgid "--mirror and --tags are incompatible"
+#~ msgstr "--mirror och --tags är inkompatibla"
+
+#~ msgid "--all and --mirror are incompatible"
+#~ msgstr "--all och --mirror är inkompatibla"
+
+#~ msgid "cannot combine '--keep-base' with '--onto'"
+#~ msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
+
+#~ msgid "cannot combine '--keep-base' with '--root'"
+#~ msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
+
+#~ msgid "cannot combine '--root' with '--fork-point'"
+#~ msgstr "kan inte kombinera \"--root\" med \"--fork-point\""
+
+#~ msgid "cannot combine apply options with merge options"
+#~ msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
+
+#~ msgid "--keep-unreachable and -A are incompatible"
+#~ msgstr "--keep-unreachable och -A kan inte användas samtidigt"
+
+#~ msgid "--geometric is incompatible with -A, -a"
+#~ msgstr "--geometric är inkompatibel med -A, -a"
+
+#~ msgid "--patch is incompatible with --{hard,mixed,soft}"
+#~ msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
+
+#~ msgid "-N can only be used with --mixed"
+#~ msgstr "-N kan endast användas med --mixed"
+
+#~ msgid "cannot combine --exclude-promisor-objects and --missing"
+#~ msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
+
+#~ msgid "marked counting is incompatible with --objects"
+#~ msgstr "markerad räkning är inkompatibelt med --objects"
+
+#~ msgid ""
+#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-"
+#~ "base"
+#~ msgstr ""
+#~ "--reflog är inkompatibel med --all, --remotes, --independent eller --"
+#~ "merge-base"
+
+#~ msgid "git sparse-checkout reapply"
+#~ msgstr "git sparse-checkout reapply"
+
+#~ msgid "--cached and --files are mutually exclusive"
+#~ msgstr "--cached och --files är ömsesidigt uteslutande"
+
+#~ msgid "--branch and --default are mutually exclusive"
+#~ msgstr "--branch och --default är ömsesidigt uteslutande"
+
+#~ msgid "--column and -n are incompatible"
+#~ msgstr "--column och -n är inkompatibla"
+
+#~ msgid "--contains option is only allowed in list mode"
+#~ msgstr "Flaggan --contains är endast tillåten i listläge"
+
+#~ msgid "--no-contains option is only allowed in list mode"
+#~ msgstr "Flaggan --no-contains är endast tillåten i listläge"
+
+#~ msgid "--points-at option is only allowed in list mode"
+#~ msgstr "Flaggan --points-at är endast tillåten i listläge"
+
+#~ 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"
+
+#~ msgid "only one -F or -m option is allowed."
+#~ msgstr "endast en av flaggorna -F eller -m tillåts."
+
+#~ msgid "-b, -B, and --detach are mutually exclusive"
+#~ msgstr "-b, -B och --detach är ömsesidigt uteslutande"
+
+#~ msgid "--reason requires --lock"
+#~ msgstr "--reason kräver --lock"
+
+#~ msgid "--verbose and --porcelain are mutually exclusive"
+#~ msgstr "--verbose och --porcelain är ömsesidigt uteslutande"
+
+#, c-format
+#~ msgid "no directory given for --git-dir\n"
+#~ msgstr "ingen katalog angavs för --git-dir\n"
+
+#, c-format
+#~ msgid "no directory given for --work-tree\n"
+#~ msgstr "ingen katalog angavs för --work-tree\n"
+
+#~ msgid "--packfile requires --index-pack-args"
+#~ msgstr "--packfile kräver --index-pack-args"
+
+#~ msgid "--index-pack-args can only be used with --packfile"
+#~ msgstr "--index-pack-args kan endast användas med --packfile"
+
+#~ msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"
+#~ msgstr "gpg.ssh.defaultKeycommand lyckades men gav inga nycklar: %s %s"
+
+#~ msgid "--format=%.*s cannot be used with--python, --shell, --tcl"
+#~ msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl"
+
+#~ msgid "unable to rename temporary '*.%s' file to '%s"
+#~ msgstr "kunde inte byta namn på temporär \"*.%s\"-fil till \"%s\""
+
+#~ msgid ""
+#~ "The following pathspecs didn't match any eligible path, but they do match "
+#~ "index\n"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "Följande sökvägsangivelser motsvarar inte någon kvalificerad sökväg, men "
+#~ "motsvarar\n"
+#~ "indexposter utanför den nuvarande glesa utcheckningen:\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr ""
+#~ "Du måste ta bort eller ändra glesningsreglerna för att uppdatera sådana "
+#~ "poster."
+
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "kunde inte ställa in GIT_DIR till \"%s\""
+
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
+
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "misslyckades öppna /dev/null"
+
+#~ 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 ""
+#~ "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>\"\n"
+#~ "och checka in resultatet med \"git commit\""
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "misslyckades öppna /dev/null eller \"dup\""
+
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "försöker använda glest index utan \"cone\"-läge"
+
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "kan inte uppdatera cacheträd, behåller fullt läge"
+
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "Kunde inte öppna \"%s\" för skrivning."
+
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "kunde inte skapa arkivfilen \"%s\""
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-next-check <term-för-rätt> <term-för-fel> "
+#~ "<eterm>"
+
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check kräver 2 eller 3 argument"
+
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "kunde inte skapa filen på \"%s\""
+
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree: misslyckades öppna \"%s\""
+
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "kan inte öppna paketfilen \"%s\""
+
+#~ msgid "cannot store pack file"
+#~ msgstr "kan inte spara paketfil"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "exkludera mönster som läses från <fil>"
+
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "Felaktig flagga för merge-recursive: -X%s"
+
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "oanvändbar todo-lista: %s"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<flaggor>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "ombasera sammanslagningar"
+
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "behåll ursprungliga förgreningspunkter för kusiner"
+
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "flytta incheckningar som inleds med squash!/fixup!"
+
+#~ msgid "sign commits"
+#~ msgstr "signera incheckningar"
+
+#~ msgid "continue rebase"
+#~ msgstr "fortsätt ombasering"
+
+#~ msgid "skip commit"
+#~ msgstr "hoppa över incheckning"
+
+#~ msgid "edit the todo list"
+#~ msgstr "redigera attgöra-listan"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "förkorta inchecknings-id i todo-listan"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "utöka inchecknings-id i todo-listan"
+
+#~ msgid "check the todo list"
+#~ msgstr "kontrollera todo-listan"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "ordna om fixup-/squash-rader"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "lägg in exec-kommandon i todo-listan"
+
+#~ msgid "onto"
+#~ msgstr "ovanpå"
+
+#~ msgid "restrict-revision"
+#~ msgstr "restrict-revision"
+
+#~ msgid "restrict revision"
+#~ msgstr "begränsa revision"
+
+#~ msgid "squash-onto"
+#~ msgstr "squash-onto"
+
+#~ msgid "squash onto"
+#~ msgstr "tryck ihop ovanpå"
+
+#~ msgid "the upstream commit"
+#~ msgstr "uppströmsincheckningen"
+
+#~ msgid "head-name"
+#~ msgstr "head-name"
+
+#~ msgid "head name"
+#~ msgstr "namn på huvud"
+
+#~ msgid "rebase strategy"
+#~ msgstr "sammanslagningsstrategi"
+
+#~ msgid "strategy-opts"
+#~ msgstr "strategy-opts"
+
+#~ msgid "strategy options"
+#~ msgstr "strategiflaggor"
+
+#~ msgid "switch-to"
+#~ msgstr "switch-to"
+
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "gren eller inchecking att checka ut"
+
+#~ msgid "onto-name"
+#~ msgstr "onto-name"
+
+#~ msgid "onto name"
+#~ msgstr "på-namn"
+
+#~ msgid "cmd"
+#~ msgstr "kmd"
+
+#~ msgid "the command to run"
+#~ msgstr "kommando att köra"
+
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-"
+#~ "exec\""
+
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr ""
+#~ "git submodule--helper add-clone [<flaggor>...] --url <url> --path "
+#~ "<sökväg> --name <namn>"
+
+#~ msgid "failed to create file %s"
+#~ msgstr "misslyckades skapa filen %s"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
+
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "uttag/rör används redan: \"%s\""
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "kunde inte starta serverprocess i bakgrunden"
+
+#~ msgid "waitpid failed"
+#~ msgstr "\"waitpid\" misslyckades"
+
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid är förvirrad"
+
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "serverprocessen har ännu inte avslutats"
+
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4"
+
+#~ msgid "running $command"
+#~ msgstr "kör $command"
+
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "\"$sm_path\" har inte någon utcheckad incheckning"
+
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
+
+#~ msgid "Applied autostash."
+#~ msgstr "Tillämpade autostash."
+
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "Kan inte spara $stash_sha1"
+
+#~ 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"
+
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "Ombaserar ($new_count/$total)"
+
+#~ msgid ""
+#~ "\n"
+#~ "Commands:\n"
+#~ "p, pick <commit> = use commit\n"
+#~ "r, reword <commit> = use commit, but edit the commit message\n"
+#~ "e, edit <commit> = use commit, but stop for amending\n"
+#~ "s, squash <commit> = use commit, but meld into previous commit\n"
+#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
+#~ "message\n"
+#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
+#~ "d, drop <commit> = remove commit\n"
+#~ "l, label <label> = label current HEAD with a name\n"
+#~ "t, reset <label> = reset HEAD to a label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". create a merge commit using the original merge commit's\n"
+#~ ". message (or the oneline, if no original merge commit was\n"
+#~ ". specified). Use -c <commit> to reword the commit message.\n"
+#~ "\n"
+#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Kommandon:\n"
+#~ "p, pick <incheckning> = använd incheckning\n"
+#~ "r, reword <incheckning> = använd incheckning, men redigera "
+#~ "incheckningsmeddelandet\n"
+#~ "e, edit <incheckning> = använd incheckning, men stanna för tillägg\n"
+#~ "s, squash <incheckning> = använd incheckning, men infoga i föregående "
+#~ "incheckning\n"
+#~ "f, fixup <incheckning> = som \"squash\", men förkasta "
+#~ "incheckningsmeddelandet\n"
+#~ "x, exec <incheckning> = kör kommando (resten av raden) i skalet\n"
+#~ "d, drop <incheckning> = ta bort incheckning\n"
+#~ "l, label <etikett> = ge aktuellt HEAD ett namn\n"
+#~ "t, reset <etikett> = återställ HEAD till en etikett\n"
+#~ "m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n"
+#~ ". skapa en sammanslagning med ursprungligt meddelande (eller\n"
+#~ ". enrads, om inget incheckningsmeddelande angavs). Använd\n"
+#~ ". -v <incheckning> för att skriva om meddelandet.\n"
+#~ "\n"
+#~ "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
+
+#~ msgid ""
+#~ "You can amend the commit now, with\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Once you are satisfied with your changes, run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Du kan utöka incheckningen nu, med\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "När du är nöjd med dina ändringar kör du\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1: inte en incheckning som kan väljas"
+
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "Felaktigt incheckningsnamn: $sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning"
+
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "Snabbspolade till $sha1"
+
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "Kan inte snabbspola till $sha1"
+
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "Kan inte flytta HEAD till $first_parent"
+
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
+
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "Fel när sammanslagningen $sha1 skulle göras om"
+
+#~ msgid "Could not pick $sha1"
+#~ msgstr "Kunde inte välja $sha1"
+
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "Det här är incheckningsmeddelande ${n}:"
+
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
+
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "Det här är en kombination av $count incheckning."
+#~ msgstr[1] "Det här är en kombination av $count incheckningar."
+
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "Kan inte skriva $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "Det här är en kombination av 2 incheckningar."
+
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "Kunde inte tillämpa $sha1... $rest"
+
+#~ msgid ""
+#~ "Could not amend commit after successfully picking $sha1... $rest\n"
+#~ "This is most likely due to an empty commit message, or the pre-commit "
+#~ "hook\n"
+#~ "failed. If the pre-commit hook failed, you may need to resolve the issue "
+#~ "before\n"
+#~ "you are able to reword the commit."
+#~ msgstr ""
+#~ "Kunde inte utöka incheckning efter att ha lyckats välja $sha1... $rest\n"
+#~ "Det är antagligen på grund av ett tomt incheckningsmeddelande, eller att\n"
+#~ "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
+#~ "du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
+
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "Stoppade på $sha1_abbrev... $rest"
+
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning"
+
+#~ msgid "Executing: $rest"
+#~ msgstr "Kör: $rest"
+
+#~ msgid "Execution failed: $rest"
+#~ msgstr "Körning misslyckades: $rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
+
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Du kan rätta problemet och sedan köra\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid ""
+#~ "Execution succeeded: $rest\n"
+#~ "but left changes to the index and/or the working tree\n"
+#~ "Commit or stash your changes, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Körningen lyckades: $rest\n"
+#~ "men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n"
+#~ "Checka in eller utför \"stash\" på ändringarna och kör sedan\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "Okänt kommando: $command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "Rätta det med \"git rebase --edit-todo\"."
+
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "Lyckades ombasera och uppdatera $head_name."
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
+
+#~ msgid ""
+#~ "You have staged changes in your working tree.\n"
+#~ "If these changes are meant to be\n"
+#~ "squashed into the previous commit, run:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "If they are meant to go into a new commit, run:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "In both cases, once you're done, continue with:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+#~ msgstr ""
+#~ "Du har köade ändringar i din arbetskatalog.\n"
+#~ "Om det är meningen att ändringarna\n"
+#~ "ska läggas in i föregående incheckning, kör:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Om de ska checkas in i en egen incheckning, kör:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Oavsett vilket, när du är färdig fortsätter du med:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr ""
+#~ "Fel vid försök att hitta författaridentitet för att utöka incheckning"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
+#~ "först och kör sedan \"git rebase --continue\" igen."
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "Kunde inte checka in köade ändringar."
+
+#~ msgid "Could not execute editor"
+#~ msgstr "Kunde inte starta textredigerare"
+
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "Kunde inte checka ut $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "Inget HEAD?"
+
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "Kunde inte skapa temporär $state_dir"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "Kunde inte markera som interaktiv"
+
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
+#~ msgstr[1] ""
+#~ "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "Observera att tomma incheckningar är utkommenterade"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "Kunde inte initiera omskrivna incheckningar"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr "Kan inte ombasera: Du har oköade ändringar."
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in."
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "Kan inte hämta med ombasering: Ditt index innehåller oincheckade "
+#~ "ändringar."
+
#~ msgid "unable to write stateless separator packet"
#~ msgstr "kan inte skriva tillståndslöst avdelarpaket"
@@ -26522,9 +28059,6 @@
#~ msgid "Error deleting remote-tracking branch '%s'"
#~ msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
-#~ msgid "Error deleting branch '%s'"
-#~ msgstr "Fel vid borttagning av grenen \"%s\""
-
#~ msgid "show parse tree for grep expression"
#~ msgstr "visa analysträd för grep-uttryck"
@@ -26797,9 +28331,6 @@
#~ msgid "Cannot store %s"
#~ msgstr "Kan inte spara %s"
-#~ msgid "set sparse-checkout patterns"
-#~ msgstr "ställ in filter för gles utcheckning"
-
#~ msgid "disable sparse-checkout"
#~ msgstr "inaktivera gles utcheckning"
@@ -26963,9 +28494,6 @@
#~ msgid "error building trees"
#~ msgstr "fel vid byggande av träd"
-#~ msgid "invalid date format '%s' in '%s'"
-#~ msgstr "ogiltigt datumformat \"%s\" i \"%s\""
-
#~ msgid "writing root commit"
#~ msgstr "skriver rotincheckning"
@@ -27073,9 +28601,6 @@
#~ msgid "unrecognized verb: %s"
#~ msgstr "okänt verb: %s"
-#~ msgid "option '%s' requires a value"
-#~ msgstr "flaggan \"%s\" behöver ett värde"
-
#~ msgid "could not transform the todo list"
#~ msgstr "kunde inte transformera att göra-listan"
@@ -27174,9 +28699,6 @@
#~ msgstr ""
#~ "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
-#~ msgid "ignoring unknown color-moved-ws mode '%s'"
-#~ msgstr "ignorerar okänt läge för color-mode-ws \"%s\""
-
#~ msgid "only 'tree:0' is supported"
#~ msgstr "endast \"tree:0\" stöds"
@@ -27334,9 +28856,6 @@
#~ msgid "could not truncate '%s'"
#~ msgstr "kunde inte trunkera \"%s\""
-#~ msgid "could not close %s"
-#~ msgstr "kunde inte stänga %s"
-
#~ msgid "Copied a misnamed branch '%s' away"
#~ msgstr "Kopierade bort en felaktigt namngiven gren \"%s\""
@@ -27362,9 +28881,6 @@
#~ msgid "Failed to recurse into submodule path '$sm_path'"
#~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
-#~ msgid "%%(trailers) does not take arguments"
-#~ msgstr "%%(trailers) tar inte argument"
-
#~ msgid ""
#~ "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
#~ msgstr ""
@@ -27693,9 +29209,6 @@
#~ msgid "Can't cherry-pick into empty head"
#~ msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
-#~ msgid "could not open %s for writing"
-#~ msgstr "kunde inte öppna %s för skrivning"
-
#~ msgid "bug: unhandled unmerged status %x"
#~ msgstr "programfel: ej hanterad \"unmerged\"-status %x"
@@ -27870,9 +29383,6 @@
#~ msgid "branch '%s' does not point at a commit"
#~ msgstr "grenen \"%s\" pekar inte på en incheckning"
-#~ msgid "print only merged branches"
-#~ msgstr "visa endast sammanslagna grenar"
-
#~ msgid "--dissociate given, but there is no --reference"
#~ msgstr "--dissociate angavs, men --reference har inte angivits"
@@ -27976,9 +29486,6 @@
#~ msgid "Invalid gc.pruneexpire: '%s'"
#~ msgstr "Ogiltig gc.pruneexpire: '%s'"
-#~ msgid "(detached from %s)"
-#~ msgstr "(frånkopplad från %s)"
-
#~ msgid "No existing author found with '%s'"
#~ msgstr "Hittade ingen befintlig författare med \"%s\""
diff --git a/po/tr.po b/po/tr.po
index 84b8be3..45d66c6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,8 +1,8 @@
# Turkish translations for Git
# Git Türkçe çevirileri
-# Copyright (C) 2020-2021 Emir SARI <emir_sari@msn.com>
+# Copyright (C) 2020-2022 Emir SARI <emir_sari@icloud.com>
# This file is distributed under the same license as the Git package.
-# Emir SARI <emir_sari@msn.com>, 2020-2021
+# Emir SARI <emir_sari@icloud.com>, 2020-2022
#
# ######################################################### #
# Git Türkçe kavramlar dizini / Git Turkish Glossary #
@@ -90,9 +90,9 @@
msgstr ""
"Project-Id-Version: Git Turkish Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-03 18:00+0300\n"
-"Last-Translator: Emir SARI <emir_sari@msn.com>\n"
+"POT-Creation-Date: 2022-04-13 14:52+0800\n"
+"PO-Revision-Date: 2022-04-06 16:00+0300\n"
+"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
@@ -100,233 +100,232 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: add-interactive.c:376
+#: add-interactive.c:382
#, c-format
msgid "Huh (%s)?"
msgstr "Pardon (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
+#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
+#: builtin/rebase.c:1671
msgid "could not read index"
msgstr "indeks okunamadı"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:590 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "ikili"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:648 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "hiçbir şey"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:649 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "değiştirilmemiş"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:686 git-add--interactive.perl:641
msgid "Update"
msgstr "Güncelle"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:703 add-interactive.c:891
#, c-format
msgid "could not stage '%s'"
msgstr "'%s' hazırlanamadı"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
msgid "could not write index"
msgstr "indeks yazılamadı"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:712 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d yol güncellendi\n"
msgstr[1] "%d yol güncellendi\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:730 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "not: %s artık izlenmiyor.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "'%s' yolu için make_cache_entry başarısız oldu"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:765 git-add--interactive.perl:653
msgid "Revert"
msgstr "Geri al"
-#: add-interactive.c:775
+#: add-interactive.c:781
msgid "Could not parse HEAD^{tree}"
msgstr "HEAD^{tree} ayrıştırılamadı"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:819 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d yol geri alındı\n"
msgstr[1] "%d yol geri alındı\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:870 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "İzlenmeyen dosya yok.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:874 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "İzlenmeyenleri ekle"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:901 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d yol eklendi\n"
msgstr[1] "%d yol eklendi\n"
-#: add-interactive.c:925
+#: add-interactive.c:931
#, c-format
msgid "ignoring unmerged: %s"
msgstr "birleştirilmeyenler yok sayılıyor: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Yalnızca ikili dosyalar değiştirildi.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Değişiklik yok.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:949 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Yama güncellemesi"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:988 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "diff'i gözden geçir"
-#: add-interactive.c:1010
+#: add-interactive.c:1016
msgid "show paths with changes"
msgstr "değiştirilmiş yolları göster"
-#: add-interactive.c:1012
+#: add-interactive.c:1018
msgid "add working tree state to the staged set of changes"
msgstr "hazırlanan değişikliklere çalışma ağacı durumunu ekle"
-#: add-interactive.c:1014
+#: add-interactive.c:1020
msgid "revert staged set of changes back to the HEAD version"
msgstr "hazırlanan değişiklikleri HEAD sürümüne geri al"
-#: add-interactive.c:1016
+#: add-interactive.c:1022
msgid "pick hunks and update selectively"
msgstr "parçaları seç ve seçerek güncelle"
-#: add-interactive.c:1018
+#: add-interactive.c:1024
msgid "view diff between HEAD and index"
msgstr "HEAD ve indeks arasındaki diff'i gör"
-#: add-interactive.c:1020
+#: add-interactive.c:1026
msgid "add contents of untracked files to the staged set of changes"
msgstr "izlenmeyen dosyaların içeriğini hazırlanan değişikliklere ekle"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1034 add-interactive.c:1083
msgid "Prompt help:"
msgstr "İstem yardımı:"
-#: add-interactive.c:1030
+#: add-interactive.c:1036
msgid "select a single item"
msgstr "tek bir öge seç"
-#: add-interactive.c:1032
+#: add-interactive.c:1038
msgid "select a range of items"
msgstr "bir öge erimi seç"
-#: add-interactive.c:1034
+#: add-interactive.c:1040
msgid "select multiple ranges"
msgstr "birden çok erim seç"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1042 add-interactive.c:1087
msgid "select item based on unique prefix"
msgstr "benzersiz öneke dayanarak öge seç"
-#: add-interactive.c:1038
+#: add-interactive.c:1044
msgid "unselect specified items"
msgstr "belirtilen ögelerin seçimini kaldır"
-#: add-interactive.c:1040
+#: add-interactive.c:1046
msgid "choose all items"
msgstr "tüm ögeleri seç"
-#: add-interactive.c:1042
+#: add-interactive.c:1048
msgid "(empty) finish selecting"
msgstr "(boş) seçimi bitir"
-#: add-interactive.c:1079
+#: add-interactive.c:1085
msgid "select a numbered item"
msgstr "numaralandırılmış bir öge seç"
-#: add-interactive.c:1083
+#: add-interactive.c:1089
msgid "(empty) select nothing"
msgstr "(boş) hiçbir şey seçme"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** Komutlar ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "Şimdi ne olacak"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "staged"
msgstr "hazırlanmış"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "unstaged"
msgstr "hazırlanmamış"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
+#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
+#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
+#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
#: git-add--interactive.perl:213
msgid "path"
msgstr "yol"
-#: add-interactive.c:1151
+#: add-interactive.c:1157
msgid "could not refresh index"
msgstr "indeks yenilenemedi"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Güle güle.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi hazırlansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Silme hazırlansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Ekleme hazırlansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Bu parça hazırlansın mı [y,n,q,a,d%s,?]? "
@@ -353,22 +352,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:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi zulalansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Silme zulalansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Ekleme zulalansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Bu parça zulalansın mı [y,n,q,a,d%s,?]? "
@@ -395,22 +394,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:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Silme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Ekleme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Bu parça hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
@@ -437,22 +436,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:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi indekse uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Silme indekse uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Ekleme indekse uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Bu parça indekse uygulansın mı [y,n,q,a,d%s,?]? "
@@ -479,26 +478,26 @@
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Silme çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Ekleme çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
@@ -525,23 +524,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:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Kip değişimi indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Silme indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Ekleme indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
@@ -560,23 +559,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:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Kip değişimi indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Silme indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Ekleme indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
@@ -619,24 +618,24 @@
msgid "could not parse colored hunk header '%.*s'"
msgstr "renklendirilmiş parça üstbilgisi '%.*s' ayrıştırılamadı"
-#: add-patch.c:420
+#: add-patch.c:431
msgid "could not parse diff"
msgstr "diff ayrıştırılamadı"
-#: add-patch.c:439
+#: add-patch.c:450
msgid "could not parse colored diff"
msgstr "renklendirilmiş diff ayrıştırılamadı"
-#: add-patch.c:453
+#: add-patch.c:464
#, c-format
msgid "failed to run '%s'"
msgstr "'%s' çalıştırılamadı"
-#: add-patch.c:612
+#: add-patch.c:618
msgid "mismatched output from interactive.diffFilter"
msgstr "interactive.diffFilter ögesinden eşleşmeyen çıktı"
-#: add-patch.c:613
+#: add-patch.c:619
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -644,7 +643,7 @@
"Süzgeciniz kendisinin girdi ve çıktı satırları arasında\n"
"birebir karşılık sağlamalıdır."
-#: add-patch.c:791
+#: add-patch.c:797
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -653,7 +652,7 @@
"şurada bağlam satırı #%d bekleniyordu:\n"
"%.*s"
-#: add-patch.c:806
+#: add-patch.c:812
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -666,11 +665,11 @@
"\tşununla bitmiyor:\n"
"%.*s"
-#: add-patch.c:1082 git-add--interactive.perl:1115
+#: add-patch.c:1088 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "El ile parça düzenleme kipi -- hızlıca öğrenmek için aşağıya bakın.\n"
-#: add-patch.c:1086
+#: add-patch.c:1092
#, c-format
msgid ""
"---\n"
@@ -684,7 +683,7 @@
"%c kaldırılacak.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1100 git-add--interactive.perl:1129
+#: add-patch.c:1106 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -694,11 +693,11 @@
"sunulacaktır. Parçanın tüm satırları kaldırılırsa düzenleme durdurulur\n"
"ve parça değiştirilmeden bırakılır.\n"
-#: add-patch.c:1133
+#: add-patch.c:1139
msgid "could not parse hunk header"
msgstr "parça üstbilgisi ayrıştırılamadı"
-#: add-patch.c:1178
+#: add-patch.c:1184
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' başarısız oldu"
@@ -714,26 +713,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1253 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Düzenlediğiniz parça uygulanamıyor. Yeniden düzenlensin mi (\"n (hayır)\" "
"ıskartaya çıkarır!) [y/n]? "
-#: add-patch.c:1290
+#: add-patch.c:1296
msgid "The selected hunks do not apply to the index!"
msgstr "Seçili parçalar indekse uygulanamıyor!"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Çalışma ağacına yine de uygulansın mı? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1304 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Hiçbir şey uygulanmadı.\n"
-#: add-patch.c:1355
+#: add-patch.c:1361
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -755,73 +754,73 @@
"e - geçerli parçayı el ile düzenle\n"
"? - yardımı yazdır\n"
-#: add-patch.c:1517 add-patch.c:1527
+#: add-patch.c:1523 add-patch.c:1533
msgid "No previous hunk"
msgstr "Öncesinde parça yok"
-#: add-patch.c:1522 add-patch.c:1532
+#: add-patch.c:1528 add-patch.c:1538
msgid "No next hunk"
msgstr "Sonrasında parça yok"
-#: add-patch.c:1538
+#: add-patch.c:1544
msgid "No other hunks to goto"
msgstr "Gidilecek başka bir parça yok"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1555 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "hangi parçaya gidilsin (daha fazla görmek için <ret>)? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1556 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "hangi parçaya gidilsin? "
-#: add-patch.c:1561
+#: add-patch.c:1567
#, c-format
msgid "Invalid number: '%s'"
msgstr "Geçersiz sayı: '%s'"
-#: add-patch.c:1566
+#: add-patch.c:1572
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Üzgünüm, yalnızca %d parça kullanılabilir."
msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir."
-#: add-patch.c:1575
+#: add-patch.c:1581
msgid "No other hunks to search"
msgstr "Aranacak başka parça yok"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1587 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "düzenli ifade aransın mı? "
-#: add-patch.c:1596
+#: add-patch.c:1602
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Hatalı oluşturulmuş düzenli ifade %s: %s"
-#: add-patch.c:1613
+#: add-patch.c:1619
msgid "No hunk matches the given pattern"
msgstr "Verilen dizgi ile eşleşen bir parça yok"
-#: add-patch.c:1620
+#: add-patch.c:1626
msgid "Sorry, cannot split this hunk"
msgstr "Üzgünüm, bu parça bölünemiyor"
-#: add-patch.c:1624
+#: add-patch.c:1630
#, c-format
msgid "Split into %d hunks."
msgstr "%d parçaya bölündü."
-#: add-patch.c:1628
+#: add-patch.c:1634
msgid "Sorry, cannot edit this hunk"
msgstr "Üzgünüm, bu parça düzenlenemiyor"
-#: add-patch.c:1680
+#: add-patch.c:1686
msgid "'git apply' failed"
msgstr "'git apply' başarısız oldu"
-#: advice.c:145
+#: advice.c:81
#, c-format
msgid ""
"\n"
@@ -830,37 +829,37 @@
"\n"
"Bu iletiyi \"git config advice.%s false\" ile devre dışı bırakın"
-#: advice.c:161
+#: advice.c:97
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sipucu: %.*s%s\n"
-#: advice.c:252
+#: advice.c:181
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Seç-al yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:254
+#: advice.c:183
msgid "Committing is not possible because you have unmerged files."
msgstr "İşleme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:256
+#: advice.c:185
msgid "Merging is not possible because you have unmerged files."
msgstr "Birleştirme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:258
+#: advice.c:187
msgid "Pulling is not possible because you have unmerged files."
msgstr "Çekme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:260
+#: advice.c:189
msgid "Reverting is not possible because you have unmerged files."
msgstr "Geriye al yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:262
+#: advice.c:191
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s yapılamıyor; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:270
+#: advice.c:199
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."
@@ -868,40 +867,49 @@
"Onları çalışma ağacında onarın, ardından hazırlığı bitirmek için uygun\n"
"görüldüğü biçimde 'git add/rm <dosya>' yaptıktan sonra işleyin."
-#: advice.c:278
+#: advice.c:207
msgid "Exiting because of an unresolved conflict."
msgstr "Çözüme kavuşturulmamış bir çakışmadan dolayı çıkılıyor."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:212 builtin/merge.c:1388
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut)."
-#: advice.c:285
+#: advice.c:214
msgid "Please, commit your changes before merging."
msgstr "Birleştirme öncesinde değişikliklerinizi işleyin."
-#: advice.c:286
+#: advice.c:215
msgid "Exiting because of unfinished merge."
msgstr "Tamamlanmamış birleştirmeden dolayı çıkılıyor."
-#: advice.c:296
+#: advice.c:220
+msgid "Not possible to fast-forward, aborting."
+msgstr "İleri sarma olanaklı değil, iptal ediliyor."
+
+#: advice.c:230
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"Aşağıdaki yol belirteçleri uygun bir yolla eşleşmediler; ancak geçerli\n"
-"aralıklı çıkışın dışındaki girdilerle eşleşiyorlar:\n"
+"Aşağıdaki yollar ve/veya yol belirteçleri, aralıklı çıkış\n"
+"tanımınızın dışında kalan yollarla eşleştiğinden dolayı\n"
+"indeksinizde güncellenmeyecek:\n"
-#: advice.c:303
+#: advice.c:237
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Böyle girdileri güncellemeyi düşünüyorsanız aralıklandırma kurallarını devre "
-"dışı bırakın veya değiştirin."
+"Eğer böyle girdileri güncellemek istiyorsanız, aşağıdakilerden\n"
+"birini deneyin:\n"
+"* --sparse seçeneğini kullanın.\n"
+"* Aralıklandırma kurallarını devre dışı bırakın veya değiştirin."
-#: advice.c:310
+#: advice.c:245
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -960,69 +968,84 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "tanımlanamayan boşluk yok sayma seçeneği '%s'"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject ve --3way birlikte kullanılamaz."
+#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
+#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
+#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
+#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
+#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
+#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
+#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
+#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
+#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
+#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
+#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
+#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
+#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
+#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
+#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
+#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
+#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
+#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
+#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
+#: builtin/worktree.c:779
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "'%s' ve '%s' seçenekleri birlikte kullanılamaz"
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "-3way bir depo dışında"
+#: apply.c:141 apply.c:152 apply.c:155
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' bir depo dışında"
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index bir depo dışında"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached bir depo dışında"
-
-#: apply.c:800
+#: apply.c:807
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Zaman damgası düzenli ifadesi %s hazırlanamıyor"
-#: apply.c:809
+#: apply.c:816
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "düzenli ifade girdi için %d döndürdü: %s"
-#: apply.c:883
+#: apply.c:890
#, c-format
msgid "unable to find filename in patch at line %d"
-msgstr "yamanın %d. satırında dosya adı bulunamıyor "
+msgstr "yamanın %d. satırında dosya adı bulunamıyor"
-#: apply.c:921
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: hatalı git-diff - /dev/null bekleniyordu, %s alındı, satır %d"
-#: apply.c:927
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: hatalı git-diff - %d. satırda tutarsız yeni dosya adı"
-#: apply.c:928
+#: apply.c:935
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: hatalı git-diff - %d. satırda tutarsız eski dosya adı"
-#: apply.c:933
+#: apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: hatalı git-diff - %d. satırda /dev/null bekleniyordu"
-#: apply.c:962
+#: apply.c:969
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "%d. satırda geçersiz kip: %s"
-#: apply.c:1281
+#: apply.c:1288
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "tutarsız üstbilgi satırları %d ve %d"
-#: apply.c:1371
+#: apply.c:1378
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -1037,93 +1060,93 @@
"%d öncü yol adı bileşeni kaldırılırken git diff üstbilgisi dosya adı "
"bilgisine iye değil (%d. satır)"
-#: apply.c:1384
+#: apply.c:1391
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff üstbilgisi dosya adı bilgisine iye değil (%d. satır)"
-#: apply.c:1480
+#: apply.c:1487
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: beklenmedik satır: %.*s"
-#: apply.c:1549
+#: apply.c:1556
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "%d. satırda üstbilgisi olmayan yama parçacığı: %.*s"
-#: apply.c:1752
+#: apply.c:1759
msgid "new file depends on old contents"
msgstr "yeni dosyanın eski içeriğe bağımlılığı var"
-#: apply.c:1754
+#: apply.c:1761
msgid "deleted file still has contents"
msgstr "silinen dosya içinde hâlâ bir şeyler var"
-#: apply.c:1788
+#: apply.c:1795
#, c-format
msgid "corrupt patch at line %d"
msgstr "hasarlı yama, %d. satır"
-#: apply.c:1825
+#: apply.c:1832
#, c-format
msgid "new file %s depends on old contents"
msgstr "%s yeni dosyasının eski içeriğe bağımlılığı var"
-#: apply.c:1827
+#: apply.c:1834
#, c-format
msgid "deleted file %s still has contents"
msgstr "%s silinen dosyasının içinde hâlâ bir şeyler var"
-#: apply.c:1830
+#: apply.c:1837
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** uyarı: %s dosyası boş duruma gelir; ancak silinmez"
-#: apply.c:1977
+#: apply.c:1985
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "hasarlı ikili yama, %d. satır: %.*s"
-#: apply.c:2014
+#: apply.c:2022
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "tanımlanamayan ikili yama, %d. satır"
-#: apply.c:2176
+#: apply.c:2184
#, c-format
msgid "patch with only garbage at line %d"
msgstr "yalnızca anlamsız veri içeren yama, %d. satır"
-#: apply.c:2262
+#: apply.c:2270
#, c-format
msgid "unable to read symlink %s"
msgstr "%s sembolik bağı okunamıyor"
-#: apply.c:2266
+#: apply.c:2274
#, c-format
msgid "unable to open or read %s"
msgstr "%s açılamıyor veya okunamıyor"
-#: apply.c:2935
+#: apply.c:2943
#, c-format
msgid "invalid start of line: '%c'"
msgstr "geçersiz satır başlangıcı: '%c'"
-#: apply.c:3056
+#: apply.c:3064
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Parça #%d başarılı oldu, %d (%d satır ofset)."
msgstr[1] "Parça #%d başarılı oldu, %d (%d satır ofset)."
-#: apply.c:3068
+#: apply.c:3076
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
"Bağlam şuna indirildi: (%ld/%ld) (%d konumundaki parçacığı uygulamak için)"
-#: apply.c:3074
+#: apply.c:3082
#, c-format
msgid ""
"while searching for:\n"
@@ -1132,482 +1155,481 @@
"şunu ararken:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3104
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "'%s' için ikili yama verisi eksik"
-#: apply.c:3104
+#: apply.c:3112
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "'%s' parçası geri alınmadan bir ikili yama reverse-apply yapılamıyor"
-#: apply.c:3151
+#: apply.c:3159
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "tam indeks satırı olmadan '%s' üzerine bir ikili yama uygulanamıyor"
-#: apply.c:3162
+#: apply.c:3170
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "Bu yama geçerli içerik ile eşleşmeyen '%s' üzerine uygulanır (%s)."
-#: apply.c:3170
+#: apply.c:3178
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "yama boş bir '%s' üzerine uygulanır; ancak o boş değil"
-#: apply.c:3188
+#: apply.c:3196
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "gereken songörüntü %s ('%s' için) okunamıyor"
-#: apply.c:3201
+#: apply.c:3209
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "ikili yama '%s' üzerine uygulanamıyor"
-#: apply.c:3208
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"'%s' üzerine ikili yama yanlış sonuç doğuruyor (%s bekleniyordu, %s alındı)"
-#: apply.c:3229
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "yama başarısız oldu: %s:%ld"
-#: apply.c:3352
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr "%s çıkışı yapılamıyor"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
+#: setup.c:310
#, c-format
msgid "failed to read %s"
msgstr "%s okunamadı"
-#: apply.c:3412
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "'%s' bir sembolik bağın ötesinden okunuyor"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3449 apply.c:3721
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "%s yolu yeniden adlandırıldı/silindi"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3559 apply.c:3736
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: indekste bulunmuyor"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3568 apply.c:3744 apply.c:3960
#, c-format
msgid "%s: does not match index"
msgstr "%s: indeks ile eşleşmiyor"
-#: apply.c:3571
+#: apply.c:3605
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "Depo, 3 yönlü birleştirme için gereken ikili nesneye iye değil."
-#: apply.c:3574
+#: apply.c:3608
#, c-format
msgid "Performing three-way merge...\n"
msgstr "3 yönlü birleştirme gerçekleştiriliyor...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3624 apply.c:3628
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "'%s' ögesinin geçerli içeriği okunamıyor"
-#: apply.c:3606
+#: apply.c:3640
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "3 yönlü birleştirme gerçekleştirilemedi...\n"
-#: apply.c:3620
+#: apply.c:3654
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "'%s' üzerine yama çakışmalarla birlikte uygulandı.\n"
-#: apply.c:3625
+#: apply.c:3659
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "'%s' üzerine yama sorunsuzca uygulandı.\n"
-#: apply.c:3642
+#: apply.c:3676
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Doğrudan uygulamaya geri çekiliniyor...\n"
-#: apply.c:3654
+#: apply.c:3688
msgid "removal patch leaves file contents"
msgstr "kaldırma yaması dosya içeriğini bırakır"
-#: apply.c:3727
+#: apply.c:3761
#, c-format
msgid "%s: wrong type"
msgstr "%s: yanlış tür"
-#: apply.c:3729
+#: apply.c:3763
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s, %o türüne iye, %o bekleniyordu"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
+#: read-cache.c:1399
#, c-format
msgid "invalid path '%s'"
msgstr "geçersiz yol '%s'"
-#: apply.c:3952
+#: apply.c:3958
#, c-format
msgid "%s: already exists in index"
msgstr "%s: indekste halihazırda var"
-#: apply.c:3956
+#: apply.c:3962
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: çalışma dizininde halihazırda var"
-#: apply.c:3976
+#: apply.c:3982
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "şunun yeni kipi (%o): %s, eski kip (%o) ile eşleşmiyor "
+msgstr "şunun yeni kipi (%o): %s, eski kip (%o) ile eşleşmiyor"
-#: apply.c:3981
+#: apply.c:3987
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "şunun yeni kipi (%o): %s, şunun eski kipi (%o): %s, ile eşleşmiyor"
-#: apply.c:4001
+#: apply.c:4007
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "etkilenen dosya '%s' bir sembolik bağın ötesinde"
-#: apply.c:4005
+#: apply.c:4011
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: yama uygulanamıyor"
-#: apply.c:4020
+#: apply.c:4026
#, c-format
msgid "Checking patch %s..."
msgstr "%s yaması denetleniyor..."
-#: apply.c:4112
+#: apply.c:4118
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "%s altmodülü için sha1 bilgisi eksik veya yararsız"
-#: apply.c:4119
+#: apply.c:4125
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "geçerli HEAD'de olmayan %s için kip değişimi"
-#: apply.c:4122
+#: apply.c:4128
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 bilgisi eksik veya yararsız (%s)."
-#: apply.c:4131
+#: apply.c:4137
#, c-format
msgid "could not add %s to temporary index"
msgstr "%s geçici indekse eklenemedi"
-#: apply.c:4141
+#: apply.c:4147
#, c-format
msgid "could not write temporary index to %s"
msgstr "geçici indeks şuraya yazılamadı: %s"
-#: apply.c:4279
+#: apply.c:4285
#, c-format
msgid "unable to remove %s from index"
msgstr "%s indeksten kaldırılamıyor"
-#: apply.c:4313
+#: apply.c:4319
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "%s altmodülü için hasarlı yama"
-#: apply.c:4319
+#: apply.c:4325
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "yeni oluşturulan '%s' dosyasının bilgileri alınamıyor"
-#: apply.c:4327
+#: apply.c:4333
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "yeni oluşturulan %s dosyası için yardımcı bellek oluşturulamıyor"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4339 apply.c:4484
#, c-format
msgid "unable to add cache entry for %s"
msgstr "%s için önbellek girdisi eklenemiyor"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "şuraya yazılamadı: '%s'"
-#: apply.c:4380
+#: apply.c:4386
#, c-format
msgid "closing file '%s'"
msgstr "'%s' dosyası kapatılıyor"
-#: apply.c:4450
+#: apply.c:4456
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "'%s' dosyası yazılamıyor, %o kipi"
-#: apply.c:4548
+#: apply.c:4554
#, c-format
msgid "Applied patch %s cleanly."
msgstr "%s yaması sorunsuzca uygulandı."
-#: apply.c:4556
+#: apply.c:4562
msgid "internal error"
msgstr "iç hata"
-#: apply.c:4559
+#: apply.c:4565
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "%%s yaması %d geri çevirme ile uygulanıyor..."
msgstr[1] "%%s yaması %d geri çevirme ile uygulanıyor..."
-#: apply.c:4570
+#: apply.c:4576
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ".rej dosya adı %.*s.rej olarak kısaltılıyor"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4584
#, c-format
msgid "cannot open %s"
msgstr "%s açılamıyor"
-#: apply.c:4592
+#: apply.c:4598
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Parça #%d sorunsuzca uygulandı."
-#: apply.c:4596
+#: apply.c:4602
#, c-format
msgid "Rejected hunk #%d."
msgstr "Parça %d geri çevrildi."
-#: apply.c:4725
+#: apply.c:4731
#, c-format
msgid "Skipped patch '%s'."
msgstr "'%s' yaması atlandı."
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "tanımlanamayan girdi"
+#: apply.c:4740
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Girdide geçerli yama yok (\"--allow-empty\" ile izin ver)"
-#: apply.c:4753
+#: apply.c:4761
msgid "unable to read index file"
msgstr "indeks dosyası okunamıyor"
-#: apply.c:4910
+#: apply.c:4918
#, c-format
msgid "can't open patch '%s': %s"
msgstr "'%s' yaması açılamıyor: %s"
-#: apply.c:4937
+#: apply.c:4945
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d boşluk hatası susturuldu"
msgstr[1] "%d boşluk hatası susturuldu"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4951 apply.c:4966
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d satır boşluk hatası ekliyor."
msgstr[1] "%d satır boşluk hatası ekliyor."
-#: apply.c:4951
+#: apply.c:4959
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "Boşluk hataları düzeltildikten sonra %d satır uygulandı."
msgstr[1] "Boşluk hataları düzeltildikten sonra %d satır uygulandı."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Yeni indeks dosyası yazılamıyor"
-#: apply.c:4995
+#: apply.c:5003
msgid "don't apply changes matching the given path"
msgstr "verilen yol ile eşleşen değişiklikleri uygulama"
-#: apply.c:4998
+#: apply.c:5006
msgid "apply changes matching the given path"
msgstr "verilen yol ile eşleşen değişiklikleri uygula"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5008 builtin/am.c:2379
msgid "num"
msgstr "sayı"
-#: apply.c:5001
+#: apply.c:5009
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "geleneksel diff yollarından <sayı> öncü eğik çizgiyi kaldır"
-#: apply.c:5004
+#: apply.c:5012
msgid "ignore additions made by the patch"
msgstr "yamanın yaptığı eklemeleri yok say"
-#: apply.c:5006
+#: apply.c:5014
msgid "instead of applying the patch, output diffstat for the input"
msgstr "yamayı uygulama yerine girdi için diffstat çıktısı ver"
-#: apply.c:5010
+#: apply.c:5018
msgid "show number of added and deleted lines in decimal notation"
msgstr "eklenen ve silinen satırların sayısını onluk birimde göster"
-#: apply.c:5012
+#: apply.c:5020
msgid "instead of applying the patch, output a summary for the input"
msgstr "yamayı uygulama yerine girdi için bir özet çıktısı ver"
-#: apply.c:5014
+#: apply.c:5022
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "yamayı uygulama yerine yamanın uygulanabilir olup olmadığına bak"
-#: apply.c:5016
+#: apply.c:5024
msgid "make sure the patch is applicable to the current index"
msgstr "yamanın geçerli indekse uygulanabilir olduğundan emin ol"
-#: apply.c:5018
+#: apply.c:5026
msgid "mark new files with `git add --intent-to-add`"
msgstr "yeni dosyaları `git add --intent-to-add` ile imle"
-#: apply.c:5020
+#: apply.c:5028
msgid "apply a patch without touching the working tree"
msgstr "çalışma ağacına dokunmadan bir yama uygula"
-#: apply.c:5022
+#: apply.c:5030
msgid "accept a patch that touches outside the working area"
msgstr "çalışma ağacının dışına dokunan bir yamayı kabul et"
-#: apply.c:5025
+#: apply.c:5033
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "ek olarak yamayı da uygula (--stat/--summary/--check ile kullan)"
-#: apply.c:5027
+#: apply.c:5035
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr "3 yönlü birleştirme dene, başarısız olursa normal yamaya geri çekil"
-#: apply.c:5029
+#: apply.c:5037
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:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5040 builtin/checkout-index.c:230
msgid "paths are separated with NUL character"
msgstr "yollar NUL karakteri ile ayrılır"
-#: apply.c:5034
+#: apply.c:5042
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:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
+#: builtin/rebase.c:1079
msgid "action"
msgstr "eylem"
-#: apply.c:5036
+#: apply.c:5044
msgid "detect new or modified lines that have whitespace errors"
msgstr "boşluk hatası içeren yeni veya değiştirilmiş satırları algıla"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5047 apply.c:5050
msgid "ignore changes in whitespace when finding context"
msgstr "bağlam bulurken boşluk değişikliklerini yok say"
-#: apply.c:5045
+#: apply.c:5053
msgid "apply the patch in reverse"
msgstr "yamayı tersten uygula"
-#: apply.c:5047
+#: apply.c:5055
msgid "don't expect at least one line of context"
msgstr "en az bir satır bağlam bekleme"
-#: apply.c:5049
+#: apply.c:5057
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "reddedilmiş parçaları ilgili *.rej dosyalarında bırak"
-#: apply.c:5051
+#: apply.c:5059
msgid "allow overlapping hunks"
msgstr "üst üste binen parçalara izin ver"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "ayrıntı ver"
-
-#: apply.c:5054
+#: apply.c:5062
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "dosya sonunda yanlışlıkla algılanan eksik yenisatırı hoş gör"
-#: apply.c:5057
+#: apply.c:5065
msgid "do not trust the line counts in the hunk headers"
msgstr "parça üstbilgisindeki satır sayımına güvenme"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5067 builtin/am.c:2367
msgid "root"
msgstr "kök"
-#: apply.c:5060
+#: apply.c:5068
msgid "prepend <root> to all filenames"
msgstr "tüm dosya adlarının başına <kök> ekle"
-#: archive-tar.c:125 archive-zip.c:345
+#: apply.c:5071
+msgid "don't return error for empty patches"
+msgstr "boş yamalar için hata döndürme"
+
+#: archive-tar.c:125 archive-zip.c:346
#, c-format
msgid "cannot stream blob %s"
msgstr "%s ikili nesnesi akıtılamıyor"
-#: archive-tar.c:265 archive-zip.c:358
+#: archive-tar.c:265 archive-zip.c:359
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "desteklenmeyen dosya kipi: 0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "'%s' süzgeci başlatılamıyor"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "açıklayıcı yeniden yönlendirilemiyor"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "'%s' süzgeci hata bildirdi"
-#: archive-zip.c:318
+#: archive-zip.c:319
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "yol geçerli UTF-8 değil: %s"
-#: archive-zip.c:322
+#: archive-zip.c:323
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "yol çok uzun (%d karakter, SHA1: %s): %s"
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
#, c-format
msgid "deflate error (%d)"
msgstr "söndürme hatası (%d)"
-#: archive-zip.c:603
+#: archive-zip.c:604
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "zaman damgası bu sistem için çok büyük: %<PRIuMAX>"
@@ -1616,10 +1638,6 @@
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>...]"
@@ -1630,142 +1648,138 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <depo> [--exec <komut>] --list"
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:579
#, c-format
-msgid "cannot read %s"
-msgstr "%s okunamıyor"
+msgid "cannot read '%s'"
+msgstr "'%s' okunamıyor"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
-#, c-format
-msgid "could not read '%s'"
-msgstr "'%s' okunamadı"
-
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "yol belirteci '%s' hiçbir dosya ile eşleşmedi"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "böyle bir başvuru yok: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "geçerli bir nesne adı değil: %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "bir ağaç nesnesi değil: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "geçerli çalışma dizini izlenmiyor"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Dosya bulunamadı: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "Normal bir dosya değil: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "biçim"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "arşiv biçimi"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1809
msgid "prefix"
msgstr "önek"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "öneki arşivdeki tüm yol adlarının başına ekle"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
+#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
msgid "file"
msgstr "dosya"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "izlenmeyen dosyaları arşive ekle"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "arşivi bu dosyaya yaz"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "çalışma dizinindeki .gitattributes'u oku"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "arşivlenmiş dosyaları stderr'de raporla"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "sıkıştırma düzeyini ayarla"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "desteklenen arşiv biçimlerini listele"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
+#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
msgid "repo"
msgstr "depo"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "arşivi uzak konum deposu <depo>'dan al"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
msgid "command"
msgstr "komut"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "uzak konum komutu git-upload-archive'e olan yol"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Beklenmedik seçenek --remote"
-#: archive.c:581
-msgid "Option --exec can only be used together with --remote"
-msgstr "--exec seçeneği yalnızca --remote ile birlikte kullanılabilir"
+#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
+#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
+#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
+#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
+#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
+#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "'%s' seçeneği '%s' gerektiriyor"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Beklenmedik seçenek --output"
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "--add-file ve --remote seçenekleri birlikte kullanılamaz"
-
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Bilinmeyen arşiv biçimi '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "'%s' biçimi için desteklenmeyen argüman: -%d"
@@ -1788,22 +1802,22 @@
"Negatif dizgiler git özniteliklerinde yok sayılır.\n"
"Gerçek öncü ünlem için '\\!' kullanın."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "'%s' dosyasında hatalı tırnağa alınmış içerik: %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Daha fazla ikili arama yapılamıyor!\n"
-#: bisect.c:766
+#: bisect.c:765
#, c-format
msgid "Not a valid commit name %s"
msgstr "Geçerli bir işleme adı değil: %s"
-#: bisect.c:791
+#: bisect.c:790
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1812,7 +1826,7 @@
"Birleştirme temeli %s hatalı.\n"
"Bu demek oluyor ki hata %s ve [%s] arasında düzeltilmiş.\n"
-#: bisect.c:796
+#: bisect.c:795
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1821,7 +1835,7 @@
"Birleştirme temeli %s yeni.\n"
"Özellik %s ve [%s] arasında değişmiş.\n"
-#: bisect.c:801
+#: bisect.c:800
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1830,7 +1844,7 @@
"Birleştirme temeli %s, %s.\n"
"Bu demek oluyor ki ilk '%s' işlemesi %s ve [%s] arasında.\n"
-#: bisect.c:809
+#: bisect.c:808
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1841,7 +1855,7 @@
"git bisect bu durumda düzgünce çalışamaz.\n"
"%s ve %s revizyonlarını birbirine mi karıştırdınız?\n"
-#: bisect.c:822
+#: bisect.c:821
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1852,36 +1866,36 @@
"%s işlemesinin %s ve [%s] arasında olduğundan emin olamıyoruz.\n"
"Yine de sürdüreceğiz."
-#: bisect.c:861
+#: bisect.c:860
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "İkili arama: Birleştirme temelleri sınanmalı\n"
-#: bisect.c:911
+#: bisect.c:910
#, c-format
msgid "a %s revision is needed"
msgstr "bir %s revizyonu gerekiyor"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:940
#, c-format
msgid "could not create file '%s'"
msgstr "'%s' dosyası oluşturulamadı"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:986 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "'%s' dosyası okunamadı"
-#: bisect.c:1027
+#: bisect.c:1026
msgid "reading bisect refs failed"
msgstr "ikili arama başvurularını okuma başarısız oldu"
-#: bisect.c:1057
+#: bisect.c:1056
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s hem %s hem %s idi\n"
-#: bisect.c:1066
+#: bisect.c:1065
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1890,7 +1904,7 @@
"Sınanabilir bir işleme bulunamadı.\n"
"Hatalı yol argümanları ile mi başladınız?\n"
-#: bisect.c:1095
+#: bisect.c:1094
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1900,151 +1914,178 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1100
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "İkili arama: Şundan sonra sınanacak %d revizyon kaldı: %s\n"
msgstr[1] "İkili arama: Şundan sonra sınanacak %d revizyon kaldı: %s\n"
-#: blame.c:2776
+#: blame.c:2773
msgid "--contents and --reverse do not blend well."
msgstr "--contents ve --reverse birlikte pek iyi gitmiyor."
-#: blame.c:2790
+#: blame.c:2787
msgid "cannot use --contents with final commit object name"
msgstr "--contents son işleme nesnesi adı ile kullanılamıyor"
-#: blame.c:2811
+#: blame.c:2808
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse ve --first-parent birlikte en son işlemenin belirtilmesini "
"gerektiriyor"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
+#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
+#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
+#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
+#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "revizyonda gezinme ayarlaması başarısız oldu"
-#: blame.c:2838
+#: blame.c:2835
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:2849
+#: blame.c:2846
#, c-format
msgid "no such path %s in %s"
msgstr "şurada %s yolu bulunamadı: %s"
-#: blame.c:2860
+#: blame.c:2857
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "%s ikili nesnesi %s yolunda okunamıyor"
-#: branch.c:53
-#, c-format
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr ""
-"\n"
-"Hata nedenini ortadan kaldırdıktan sonra uzak konum izleme\n"
-"bilgisini onarmayı şunu çalıştırarak deneyebilirsiniz:\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "%s dalı kendi üst kaynağı olarak ayarlanamaz."
-
#: branch.c:93
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
msgstr ""
-"'%s' dalı '%s' uzak dalını yeniden temellendirme ile %s konumundan izlemek "
-"üzere ayarlandı."
-
-#: branch.c:94
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "'%s' dalı '%s' uzak dalını %s konumundan izlemek üzere ayarlandı."
-
-#: branch.c:98
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
-"'%s' dalı '%s' yerel dalını yeniden temellendirme ile izlemek üzere ayarlandı"
-
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "'%s' dalı '%s' yerel dalını izlemek üzere ayarlandı."
+"yeniden temellendirme istendiğinde birden çok başvurunun üst kaynak izleme "
+"yapılandırması miras alınamıyor"
#: branch.c:104
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "'%s' dalı kendi üst kaynağı olarak ayarlanamaz"
+
+#: branch.c:160
+#, c-format
+msgid "branch '%s' set up to track '%s' by rebasing."
msgstr ""
-"'%s' dalı '%s' uzak başvurusunu yeniden temellendirme ile izlemek üzere "
-"ayarlandı."
+"'%s' dalı '%s' ögesini yeniden temellendirme ile izlemek üzere ayarlandı."
-#: branch.c:105
+#: branch.c:161
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "'%s' dalı '%s' uzak başvurusunu izlemek üzere ayarlandı."
+msgid "branch '%s' set up to track '%s'."
+msgstr "'%s' dalı '%s' ögesini izlemek üzere ayarlandı."
-#: branch.c:109
+#: branch.c:164
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "branch '%s' set up to track:"
+msgstr "'%s' dalı şunu izlemek üzere ayarlandı:"
+
+#: branch.c:176
+msgid "unable to write upstream branch configuration"
+msgstr "üstkaynak dal yapılandırması yazılamıyor"
+
+#: branch.c:178
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
msgstr ""
-"'%s' dalı '%s' yerel başvurusunu yeniden temellendirme ile izlemek üzere "
-"ayarlandı."
+"\n"
+"Hata nedenini ortadan kaldırdıktan sonra uzak konum izleme\n"
+"bilgisini onarmayı şunu çalıştırarak deneyebilirsiniz:"
-#: branch.c:110
+#: branch.c:219
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "'%s' dalı '%s' yerel başvurusunu izlemek üzere ayarlandı."
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr ""
+"'%s' konumundan izleme miras istendi; ancak bir uzak konum ayarlanmamış"
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Üstkaynak dal yapılandırması yazılamıyor"
-
-#: branch.c:156
+#: branch.c:225
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "İzlenmiyor: %s başvurusu için belirsiz bilgi"
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr ""
+"'%s' konumundan izleme miras istendi; ancak bir birleştirme yapılandırması "
+"ayarlanmamış"
-#: branch.c:189
+#: branch.c:277
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' geçerli bir dal adı değil."
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "izlenmiyor: '%s' başvurusu için belirsiz bilgi"
-#: branch.c:208
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading " " space around.
+#.
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#: branch.c:289 object-name.c:464
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "'%s' adında bir dal halihazırda var."
+msgid " %s\n"
+msgstr " %s\n"
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Geçerli dal zorla güncellenemiyor."
-
-#: branch.c:233
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#: branch.c:295
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "İzleme bilgisi ayarlanamıyor; başlangıç noktası '%s' bir dal değil."
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
+"Getirme başvuru belirteçleri, '%s' uzak izleyen başvurusuna\n"
+"eşlemlenen birden çok uzak konum var:\n"
+"%s\n"
+"Bu, genelde bir yapılandırma hatasıdır.\n"
+"\n"
+"İzleyen dalları ayarlamayı desteklemek için, farklı uzak\n"
+"konumların getirme belirteçlerinin değişik izleme ad alanlarına\n"
+"eşlemlendiğinden emin olun."
-#: branch.c:235
+#: branch.c:344
+#, c-format
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' geçerli bir dal adı değil"
+
+#: branch.c:364
+#, c-format
+msgid "a branch named '%s' already exists"
+msgstr "'%s' adında bir dal halihazırda var"
+
+#: branch.c:370
+#, c-format
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "'%s' dalı zorla güncellenemiyor, '%s' konumunda çıkış yapılmış"
+
+#: branch.c:393
+#, c-format
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr "izleme bilgisi ayarlanamıyor; başlangıç noktası '%s' bir dal değil"
+
+#: branch.c:395
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "istenen üstkaynak dalı '%s' mevcut değil"
-#: branch.c:237
+#: branch.c:397
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -2064,125 +2105,145 @@
"tasarlıyorsanız itme sırasında üstkaynak yapılandırmasını\n"
"da ayarlamak için \"git push -u\" kullanmak isteyebilirsiniz."
-#: branch.c:281
+#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Geçerli bir nesne adı değil: '%s'."
+msgid "not a valid object name: '%s'"
+msgstr "geçerli bir nesne adı değil: '%s'"
-#: branch.c:301
+#: branch.c:465
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Belirsiz nesne adı: '%s'."
+msgid "ambiguous object name: '%s'"
+msgstr "belirsiz nesne adı: '%s'"
-#: branch.c:306
+#: branch.c:470
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Geçerli bir dal noktası değil: '%s'."
+msgid "not a valid branch point: '%s'"
+msgstr "geçerli bir dal noktası değil: '%s'"
-#: branch.c:366
+#: branch.c:658
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "'%s' altmodülü: altmodül bulunamıyor"
+
+#: branch.c:661
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
+msgstr ""
+"Altmodülleri güncellemeyi 'git checkout %s && git submodule update --init' "
+"kullanarak deneyebilirsiniz."
+
+#: branch.c:672 branch.c:698
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "'%s' altmodülü: '%s' dalı oluşturulamıyor"
+
+#: branch.c:730
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' çıkışı '%s' konumunda halihazırda yapılmış"
-#: branch.c:389
+#: branch.c:755
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "%s çalışma ağacının HEAD'i güncellenmemiş"
-#: bundle.c:44
+#: bundle.c:45
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
msgstr "bilinmeyen demet sağlama algoritması: %s"
-#: bundle.c:48
+#: bundle.c:53
#, c-format
msgid "unknown capability '%s'"
msgstr "bilinmeyen yetenek '%s'"
-#: bundle.c:74
+#: bundle.c:79
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
msgstr "'%s' bir v2 veya v3 demet dosyası gibi görünmüyor"
-#: bundle.c:113
+#: bundle.c:118
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "tanımlanamayan üstbilgi: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
+#: builtin/commit.c:865
#, c-format
msgid "could not open '%s'"
msgstr "'%s' açılamadı"
-#: bundle.c:198
+#: bundle.c:203
msgid "Repository lacks these prerequisite commits:"
msgstr "Depo aşağıdaki önkoşul işlemelere iye değil:"
-#: bundle.c:201
+#: bundle.c:206
msgid "need a repository to verify a bundle"
msgstr "bir demeti doğrulamak için bir depo gerekiyor"
-#: bundle.c:257
+#: bundle.c:264
#, c-format
msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Demet şu başvuruyu içeriyor:"
-msgstr[1] "Demet şu %d başvuruyu içeriyor:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Demet bu başvuruyu içeriyor:"
+msgstr[1] "Demet bu %<PRIuMAX> başvuruyu içeriyor:"
-#: bundle.c:264
+#: bundle.c:272
msgid "The bundle records a complete history."
msgstr "Demet tam bir geçmiş kaydını yazar."
-#: bundle.c:266
+#: bundle.c:274
#, c-format
msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Demet şu işlemeyi gerektiriyor:"
-msgstr[1] "Demet şu %d işlemeyi gerektiriyor:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Demet bu başvuruyu gerektiriyor:"
+msgstr[1] "Demet bu %<PRIuMAX> başvuruyu gerektiriyor:"
-#: bundle.c:333
+#: bundle.c:350
msgid "unable to dup bundle descriptor"
msgstr "demet açıklayıcısı çoğaltılamıyor"
-#: bundle.c:340
+#: bundle.c:357
msgid "Could not spawn pack-objects"
msgstr "pack-objects ortaya çıkarılamadı"
-#: bundle.c:351
+#: bundle.c:368
msgid "pack-objects died"
msgstr "pack-objects sonlandı"
-#: bundle.c:400
+#: bundle.c:417
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "'%s' başvurusu revizyon listesi seçenekleri tarafından dışlandı"
-#: bundle.c:504
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "desteklenmeyen demet sürümü %d"
-
-#: bundle.c:506
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "demet sürümü %d, %s algoritması ile yazılamıyor"
-
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
#, c-format
msgid "unrecognized argument: %s"
msgstr "tanımlanamayan argüman: %s"
-#: bundle.c:553
+#: bundle.c:548
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "desteklenmeyen demet sürümü %d"
+
+#: bundle.c:550
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "demet sürümü %d, %s algoritması ile yazılamıyor"
+
+#: bundle.c:600
msgid "Refusing to create empty bundle."
msgstr "Boş demet oluşturma reddediliyor."
-#: bundle.c:563
+#: bundle.c:610
#, c-format
msgid "cannot create '%s'"
msgstr "'%s' oluşturulamıyor"
-#: bundle.c:588
+#: bundle.c:639
msgid "index-pack died"
msgstr "index-pack sonlandı"
@@ -2205,12 +2266,12 @@
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "en son iri parçanın numarası sıfır olmayan %<PRIx32>"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "geçersiz renk değeri: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:52
msgid "invalid hash version"
msgstr "geçersiz sağlama sürümü"
@@ -2238,207 +2299,208 @@
msgid "commit-graph file is too small to hold %u chunks"
msgstr "commit-graph dosyası %u iri parça tutmak için pek küçük"
-#: commit-graph.c:482
+#: commit-graph.c:485
msgid "commit-graph has no base graphs chunk"
msgstr "commit-graph temel grafiği iri parçasına iye değil"
-#: commit-graph.c:492
+#: commit-graph.c:495
msgid "commit-graph chain does not match"
msgstr "commit-graph zinciri eşleşmiyor"
-#: commit-graph.c:540
+#: commit-graph.c:543
#, 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:564
+#: commit-graph.c:567
msgid "unable to find all commit-graph files"
msgstr "tüm commit-graph dosyaları bulunamıyor"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:752 commit-graph.c:789
msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "geçersiz işleme konumu. commit-graph büyük olasılıkla hasar görmüş."
+msgstr "geçersiz işleme konumu, commit-graph büyük olasılıkla hasar görmüş"
-#: commit-graph.c:766
+#: commit-graph.c:773
#, c-format
msgid "could not find commit %s"
msgstr "%s işlemesi bulunamadı"
-#: commit-graph.c:799
+#: commit-graph.c:806
msgid "commit-graph requires overflow generation data but has none"
msgstr "commit-graph, taşım oluşturma verisi gerektiriyor; ancak hiç yok"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
+#: builtin/clone.c:705
#, c-format
msgid "unable to parse commit %s"
msgstr "%s işlemesi ayrıştırılamıyor"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1373 builtin/pack-objects.c:3078
#, c-format
msgid "unable to get type of object %s"
msgstr "%s nesnesinin türü alınamıyor"
-#: commit-graph.c:1368
+#: commit-graph.c:1404
msgid "Loading known commits in commit graph"
msgstr "İşleme grafiğindeki bilinen işlemeler yükleniyor"
-#: commit-graph.c:1385
+#: commit-graph.c:1421
msgid "Expanding reachable commits in commit graph"
msgstr "İşleme grafiğindeki ulaşılabilir işlemeler genişletiliyor"
-#: commit-graph.c:1405
+#: commit-graph.c:1441
msgid "Clearing commit marks in commit graph"
msgstr "İşleme grafiğindeki işleme imleri temizleniyor"
-#: commit-graph.c:1424
+#: commit-graph.c:1460
msgid "Computing commit graph topological levels"
msgstr "İşleme grafiği ilingesel düzeyleri hesaplanıyor"
-#: commit-graph.c:1477
+#: commit-graph.c:1513
msgid "Computing commit graph generation numbers"
msgstr "İşleme grafiği kuşak sayıları hesaplanıyor"
-#: commit-graph.c:1558
+#: commit-graph.c:1598
msgid "Computing commit changed paths Bloom filters"
msgstr ""
"Geçerli işlemelerdeki değiştirilmiş yollar için Bloom süzgeci hesaplanıyor"
-#: commit-graph.c:1635
+#: commit-graph.c:1675
msgid "Collecting referenced commits"
msgstr "Başvurulmuş işlemeler toplanıyor"
-#: commit-graph.c:1660
+#: commit-graph.c:1701
#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "%d pakette işleme grafiği için işlemeler bulunuyor"
-msgstr[1] "%d pakette işleme grafiği için işlemeler bulunuyor"
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "%<PRIuMAX> pakette işleme grafiği için işlemeler bulunuyor"
+msgstr[1] "%<PRIuMAX> pakette işleme grafiği için işlemeler bulunuyor"
-#: commit-graph.c:1673
+#: commit-graph.c:1714
#, c-format
msgid "error adding pack %s"
msgstr "%s paketi eklenirken hata"
-#: commit-graph.c:1677
+#: commit-graph.c:1718
#, c-format
msgid "error opening index for %s"
msgstr "%s için indeks açılırken hata"
-#: commit-graph.c:1714
+#: commit-graph.c:1756
msgid "Finding commits for commit graph among packed objects"
msgstr "Paketlenmiş nesneler arasından işleme grafiği için işlemeler bulunuyor"
-#: commit-graph.c:1732
+#: commit-graph.c:1774
msgid "Finding extra edges in commit graph"
msgstr "İşleme grafiğindeki ek sınırlar bulunuyor"
-#: commit-graph.c:1781
+#: commit-graph.c:1823
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:1812 midx.c:911
+#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
#, c-format
msgid "unable to create leading directories of %s"
msgstr "%s öncü dizinleri oluşturulamıyor"
-#: commit-graph.c:1825
+#: commit-graph.c:1868
msgid "unable to create temporary graph layer"
msgstr "geçici grafik katmanı oluşturulamıyor"
-#: commit-graph.c:1830
+#: commit-graph.c:1873
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "'%s' için paylaşılan izinler ayarlanamıyor"
-#: commit-graph.c:1887
+#: commit-graph.c:1930
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "İşleme grafiği %d geçişte yazılıyor"
msgstr[1] "İşleme grafiği %d geçişte yazılıyor"
-#: commit-graph.c:1923
+#: commit-graph.c:1967
msgid "unable to open commit-graph chain file"
msgstr "commit-graph zincir dosyası açılamıyor"
-#: commit-graph.c:1939
+#: commit-graph.c:1983
msgid "failed to rename base commit-graph file"
msgstr "temel commit-graph dosyası yeniden adlandırılamadı"
-#: commit-graph.c:1959
+#: commit-graph.c:2004
msgid "failed to rename temporary commit-graph file"
msgstr "geçici commit-graph dosyası yeniden adlandırılamadı"
-#: commit-graph.c:2092
+#: commit-graph.c:2137
msgid "Scanning merged commits"
msgstr "Birleştirilen işlemeler taranıyor"
-#: commit-graph.c:2136
+#: commit-graph.c:2181
msgid "Merging commit-graph"
msgstr "commit-graph birleştiriliyor"
-#: commit-graph.c:2244
+#: commit-graph.c:2289
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"bir commit-graph yazılmaya çalışılıyor; ancak 'core.commitGraph' devre dışı"
-#: commit-graph.c:2351
+#: commit-graph.c:2396
msgid "too many commits to write graph"
msgstr "grafik yazımı için çok fazla işleme"
-#: commit-graph.c:2449
+#: commit-graph.c:2494
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:2459
+#: commit-graph.c:2504
#, 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:2469 commit-graph.c:2484
+#: commit-graph.c:2514 commit-graph.c:2529
#, 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:2476
+#: commit-graph.c:2521
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "%s işlemesi commit-graph'tan ayrıştırılamadı"
-#: commit-graph.c:2494
+#: commit-graph.c:2539
msgid "Verifying commits in commit graph"
msgstr "İşleme grafiğindeki işlemeler doğrulanıyor"
-#: commit-graph.c:2509
+#: commit-graph.c:2554
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"%s işlemesi commit-graph için olan nesne veritabanından ayrıştırılamadı"
-#: commit-graph.c:2516
+#: commit-graph.c:2561
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"commit-graph'teki %s işlemesi için olan kök ağaç nesne tanımlayıcısı %s != %s"
-#: commit-graph.c:2526
+#: commit-graph.c:2571
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "%s işlemesi için olan commit-graph üst öge listesi çok uzun"
-#: commit-graph.c:2535
+#: commit-graph.c:2580
#, 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:2549
+#: commit-graph.c:2594
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "%s işlemesi için olan commit-graph üst öge listesi erkenden sonlanıyor"
-#: commit-graph.c:2554
+#: commit-graph.c:2599
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2446,7 +2508,7 @@
"%s işlemesi için commit-graph kuşak sayısı sıfır; ancak başka yerlerde "
"sıfırdan farklı"
-#: commit-graph.c:2558
+#: commit-graph.c:2603
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2454,29 +2516,29 @@
"%s işlemesi için commit-graph kuşak sayısı sıfırdan farklı; ancak başka "
"yerlerde sıfır"
-#: commit-graph.c:2575
+#: commit-graph.c:2620
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "%s işlemesi için commit-graph kuşağı %<PRIuMAX> < %<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2626
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"%s işlemesi için commit-graph içindeki işleme tarihi %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
+#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "%s ayrıştırılamadı"
-#: commit.c:54
+#: commit.c:56
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s bir işleme değil!"
-#: commit.c:194
+#: commit.c:197
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2496,28 +2558,28 @@
"\"git config advice.graftFileDeprecated false\"\n"
"kullanarak bu iletiyi kapatabilirsiniz."
-#: commit.c:1237
+#: commit.c:1252
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"%s işlemesinin güvenilmeyen bir GPG imzası var, iddiaya göre %s tarafından."
-#: commit.c:1241
+#: commit.c:1256
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "%s işlemesinin hatalı bir GPG imzası var, iddiaya göre %s tarafından."
-#: commit.c:1244
+#: commit.c:1259
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "%s işlemesinin bir GPG imzası yok."
-#: commit.c:1247
+#: commit.c:1262
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "%s işlemesinin %s tarafından sağlanan düzgün bir GPG imzası var\n"
-#: commit.c:1501
+#: commit.c:1516
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"
@@ -2532,7 +2594,15 @@
msgid "memory exhausted"
msgstr "bellek tükendi"
-#: config.c:126
+#: compat/terminal.c:167
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr "arka planda sürdürülemiyor, sürdürmek için 'fg' kullanın"
+
+#: compat/terminal.c:168
+msgid "cannot restore terminal settings"
+msgstr "uçbirim ayarları geri yüklenemiyor"
+
+#: config.c:143
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2547,341 +2617,368 @@
"\t%s\n"
"Bu dairesel içermelerden dolayı olabilir."
-#: config.c:142
+#: config.c:159
#, c-format
msgid "could not expand include path '%s'"
msgstr "içerme yolu '%s' genişletilemedi"
-#: config.c:153
+#: config.c:170
msgid "relative config includes must come from files"
msgstr "göreceli yapılandırma içermeleri dosyalardan gelmeli"
-#: config.c:199
+#: config.c:219
msgid "relative config include conditionals must come from files"
msgstr "göreceli yapılandırma içerme koşulluları dosyalardan gelmeli"
-#: config.c:396
+#: config.c:364
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"uzak URL'ler dosya içinde doğrudan veya başka türlü includeIf.hasconfig:"
+"remote.*.url kullanarak yapılandırılamaz"
+
+#: config.c:508
#, c-format
msgid "invalid config format: %s"
msgstr "geçersiz yapılandırma biçimi: %s"
-#: config.c:400
+#: config.c:512
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "'%.*s' yapılandırması için ortam değişkeni adı eksik"
-#: config.c:405
+#: config.c:517
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "şu yapılandırma için '%s' ortam değişkeni eksik: '%.*s'"
-#: config.c:442
+#: config.c:553
#, c-format
msgid "key does not contain a section: %s"
msgstr "anahtar, bir bölüm içermiyor: %s"
-#: config.c:448
+#: config.c:558
#, c-format
msgid "key does not contain variable name: %s"
msgstr "anahtar, bir değişken adı içermiyor: %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:580 sequencer.c:2802
#, c-format
msgid "invalid key: %s"
msgstr "geçersiz anahtar: %s"
-#: config.c:478
+#: config.c:585
#, c-format
msgid "invalid key (newline): %s"
msgstr "geçersiz anahtar (yenisatır): %s"
-#: config.c:511
+#: config.c:605
msgid "empty config key"
msgstr "boş yapılandırma anahtarı"
-#: config.c:529 config.c:541
+#: config.c:623 config.c:635
#, c-format
msgid "bogus config parameter: %s"
msgstr "düzmece yapılandırma parametresi: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:649 config.c:666 config.c:673 config.c:682
#, c-format
msgid "bogus format in %s"
msgstr "%s içinde düzmece biçim"
-#: config.c:622
+#: config.c:716
#, c-format
msgid "bogus count in %s"
msgstr "%s içinde düzmece sayım"
-#: config.c:626
+#: config.c:720
#, c-format
msgid "too many entries in %s"
msgstr "%s içinde çok fazla girdi"
-#: config.c:636
+#: config.c:730
#, c-format
msgid "missing config key %s"
msgstr "%s yapılandırma anahtarı eksik"
-#: config.c:644
+#: config.c:738
#, c-format
msgid "missing config value %s"
msgstr "%s yapılandırma değeri eksik"
-#: config.c:995
+#: config.c:1089
#, 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:999
+#: config.c:1093
#, c-format
msgid "bad config line %d in file %s"
msgstr "hatalı yapılandırma satırı %d, %s dosyası içinde"
-#: config.c:1003
+#: config.c:1097
#, c-format
msgid "bad config line %d in standard input"
msgstr "standart girdi içinde hatalı yapılandırma satırı %d"
-#: config.c:1007
+#: config.c:1101
#, 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:1011
+#: config.c:1105
#, 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:1015
+#: config.c:1109
#, c-format
msgid "bad config line %d in %s"
msgstr "hatalı yapılandırma satırı %d (%s içinde)"
-#: config.c:1152
+#: config.c:1246
msgid "out of range"
msgstr "erim dışı"
-#: config.c:1152
+#: config.c:1246
msgid "invalid unit"
msgstr "geçersiz birim"
-#: config.c:1153
+#: config.c:1247
#, 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:1163
+#: config.c:1257
#, 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:1166
+#: config.c:1260
#, 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:1169
+#: config.c:1263
#, 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:1172
+#: config.c:1266
#, 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:1175
+#: config.c:1269
#, 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:1178
+#: config.c:1272
#, 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:1257
+#: config.c:1368
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "%s değişkeni için geçersiz değer"
+
+#: config.c:1389
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "bilinmeyen core.fsync bileşeni '%s' yok sayılıyor"
+
+#: config.c:1425
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "hatalı Boole yapılandırma değeri '%s', '%s' için"
-#: config.c:1275
+#: config.c:1443
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "şuradaki kullanıcı dizini genişletilemedi: '%s'"
-#: config.c:1284
+#: config.c:1452
#, 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:1377
+#: config.c:1545
#, c-format
msgid "abbrev length out of range: %d"
msgstr "kısaltma uzunluğu erim dışında: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1559 config.c:1570
#, c-format
msgid "bad zlib compression level %d"
msgstr "hatalı zlib sıkıştırma düzeyi %d"
-#: config.c:1494
+#: config.c:1660
msgid "core.commentChar should only be one character"
msgstr "core.commentChar yalnızca bir karakter olmalı"
-#: config.c:1527
+#: config.c:1692
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "bilinmeyen core.fsyncMethod değeri '%s' yok sayılıyor"
+
+#: config.c:1698
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles artık kullanılmıyor; yerine core.fsync kullanın"
+
+#: config.c:1714
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "nesne oluşturma için geçersiz kip: %s"
-#: config.c:1599
+#: config.c:1800
#, c-format
msgid "malformed value for %s"
msgstr "%s için hatalı oluşturulmuş değer"
-#: config.c:1625
+#: config.c:1826
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s için hatalı oluşturulmuş değer: %s"
-#: config.c:1626
+#: config.c:1827
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1888 builtin/pack-objects.c:4078
#, c-format
msgid "bad pack compression level %d"
msgstr "hatalı paket sıkıştırma düzeyi %d"
-#: config.c:1809
+#: config.c:2014
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor"
-#: config.c:1812
+#: config.c:2017
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "'%s' başvurusu ikili bir nesneye işaret etmiyor"
-#: config.c:1829
+#: config.c:2035
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor"
-#: config.c:1874
+#: config.c:2080
#, c-format
msgid "failed to parse %s"
msgstr "%s ayrıştırılamadı"
-#: config.c:1930
+#: config.c:2136
msgid "unable to parse command-line config"
msgstr "komut satırı yapılandırması ayrıştırılamıyor"
-#: config.c:2294
+#: config.c:2512
msgid "unknown error occurred while reading the configuration files"
msgstr "yapılandırma dosyaları okunurken beklenmedik bir hata oluştu"
-#: config.c:2468
+#: config.c:2686
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Geçersiz %s: '%s'"
-#: config.c:2513
+#: config.c:2731
#, 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:2559
+#: config.c:2763
#, 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:2561
+#: config.c:2765
#, 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:2645
+#: config.c:2850
#, c-format
msgid "invalid section name '%s'"
msgstr "geçersiz bölüm adı '%s'"
-#: config.c:2677
+#: config.c:2882
#, c-format
msgid "%s has multiple values"
msgstr "%s birden çok değere iye"
-#: config.c:2706
+#: config.c:2911
#, c-format
msgid "failed to write new configuration file %s"
msgstr "yeni yapılandırma dosyası %s yazılamadı"
-#: config.c:2958 config.c:3285
+#: config.c:3177 config.c:3518
#, c-format
msgid "could not lock config file %s"
msgstr "%s yapılandırma dosyası kilitlenemedi"
-#: config.c:2969
+#: config.c:3188
#, c-format
msgid "opening %s"
msgstr "%s açılıyor"
-#: config.c:3006 builtin/config.c:361
+#: config.c:3225 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "geçersiz dizgi: %s"
-#: config.c:3031
+#: config.c:3250
#, c-format
msgid "invalid config file %s"
msgstr "geçersiz yapılandırma dosyası %s"
-#: config.c:3044 config.c:3298
+#: config.c:3263 config.c:3531
#, c-format
msgid "fstat on %s failed"
msgstr "%s üzerinde fstat başarısız oldu"
-#: config.c:3055
+#: config.c:3274
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "'%s'%s mmap yapılamıyor"
-#: config.c:3065 config.c:3303
+#: config.c:3284 config.c:3536
#, c-format
msgid "chmod on %s failed"
msgstr "%s üzerinde chmod başarısız oldu"
-#: config.c:3150 config.c:3400
+#: config.c:3369 config.c:3633
#, c-format
msgid "could not write config file %s"
msgstr "%s yapılandırma dosyası yazılamadı"
-#: config.c:3184
+#: config.c:3403
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "'%s', '%s' olarak ayarlanamadı"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
#, c-format
msgid "could not unset '%s'"
msgstr "'%s' ayarı kapatılamadı"
-#: config.c:3276
+#: config.c:3509
#, c-format
msgid "invalid section name: %s"
msgstr "geçersiz bölüm adı: %s"
-#: config.c:3443
+#: config.c:3676
#, c-format
msgid "missing value for '%s'"
msgstr "'%s' için değer eksik"
@@ -2916,81 +3013,81 @@
msgid "expected flush after capabilities"
msgstr "yeteneklerden sonra floş bekleniyordu"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "'%s' ilk satırından sonra yetenekler yok sayılıyor"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "protokol hatası: beklenmedik yetenekler^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "protokol hatası: sığ sha-1 bekleniyordu, '%s' alındı"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "diğer uçtaki depo sığ olamaz"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "geçersiz paket"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "protokol hatası: beklenmedik '%s'"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "sunucu tarafından bilinmeyen nesne biçimi '%s' belirtildi"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "geçersiz ls-refs yanıtı: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "başvuru listelemesinden sonra floş bekleniyordu"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "başvuru listelemesinden sonra yanıt sonu paketi bekleniyordu"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "'%s' protokolü desteklenmiyor"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "soket üzerinde SO_KEEPALIVE ayarlanamıyor"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
-msgstr "%s adresi aranıyor..."
+msgstr "%s adresi aranıyor ... "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "%s aranamıyor (kapı %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
"bitti.\n"
-"%s adresine bağlanılıyor (kapı %s)..."
+"%s adresine bağlanılıyor (kapı %s) ... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -3000,77 +3097,77 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "bitti."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "%s aranamıyor (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "bilinmeyen kapı %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "garip makine adı '%s' engellendi"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "garip kapı '%s' engellendi"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "vekil %s başlatılamıyor"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "yol belirtilmedi; geçerli url sözdizimi için 'git help pull' yazın"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "git:// makinelerinde ve depo yollarında yenisatır karakteri yasak"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh değişik biçimi 'simple' -4 desteklemiyor"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh değişik biçimi 'simple' -6 desteklemiyor"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh değişik biçimi 'simple' kapı ayarlamayı desteklemiyor"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "garip yol adı '%s' engellendi"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "çatallanamıyor"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "Bağlantı denetleniyor"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "'git rev-list' çalıştırılamadı"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "rev-list yazılamadı"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "rev-list'in stdin'i kapatılamadı"
@@ -3208,74 +3305,74 @@
#: credential.c:112
msgid "refusing to work with credential missing host field"
-msgstr "anamakine bilgisi eksik yetki ile çalışma reddediliyor"
+msgstr "ana makine bilgisi eksik yetki ile çalışma reddediliyor"
#: credential.c:114
msgid "refusing to work with credential missing protocol field"
msgstr "protokol bilgisi eksik yetki ile çalışma reddediliyor"
-#: credential.c:394
+#: 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:438
+#: credential.c:440
#, c-format
msgid "url has no scheme: %s"
msgstr "url'nin şeması yok: %s"
-#: credential.c:511
+#: 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
+#: date.c:139
msgid "in the future"
msgstr "gelecekte"
-#: date.c:144
+#: date.c:145
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "%<PRIuMAX> saniye önce"
msgstr[1] "%<PRIuMAX> saniye önce"
-#: date.c:151
+#: date.c:152
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "%<PRIuMAX> dakika önce"
msgstr[1] "%<PRIuMAX> dakika önce"
-#: date.c:158
+#: date.c:159
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "%<PRIuMAX> saat önce"
msgstr[1] "%<PRIuMAX> saat önce"
-#: date.c:165
+#: date.c:166
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "%<PRIuMAX> gün önce"
msgstr[1] "%<PRIuMAX> gün önce"
-#: date.c:171
+#: date.c:172
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> hafta önce"
msgstr[1] "%<PRIuMAX> hafta önce"
-#: date.c:178
+#: date.c:179
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> ay önce"
msgstr[1] "%<PRIuMAX> ay önce"
-#: date.c:189
+#: date.c:190
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -3283,14 +3380,14 @@
msgstr[1] "%<PRIuMAX> yıl"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
+#: date.c:193
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s, %<PRIuMAX> ay önce"
msgstr[1] "%s, %<PRIuMAX> ay önce"
-#: date.c:197 date.c:202
+#: date.c:198 date.c:203
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
@@ -3323,28 +3420,32 @@
msgid "Marked %d islands, done.\n"
msgstr "%d delta adası imlendi, bitti.\n"
-#: diff-merges.c:70
+#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
+#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
+#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
+#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
+#: builtin/pull.c:47 builtin/pull.c:321
#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "--diff-merges için bilinmeyen değer: %s"
+msgid "invalid value for '%s': '%s'"
+msgstr "'%s' için geçersiz değer: '%s'"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base erimlerle çalışmaz"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base yalnızca işlemelerle çalışır"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "HEAD alınamıyor"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "bir birleştirme temeli bulunamadı"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "birden çok birleştirme temeli bulundu"
@@ -3360,17 +3461,17 @@
"Bir git deposu değil. Bir çalışma ağacının dışındaki iki yolu karşılaştırmak "
"için --no-index kullanın."
-#: diff.c:156
+#: diff.c:159
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " dirstat kesim yüzdesi '%s' ayrıştırılamadı\n"
-#: diff.c:161
+#: diff.c:164
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Bilinmeyen dirstat parametresi '%s'\n"
-#: diff.c:297
+#: diff.c:300
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3378,7 +3479,7 @@
"\"color-moved\" ayarı 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', "
"'plain' seçeneklerinden biri olmalıdır"
-#: diff.c:325
+#: diff.c:328
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3387,7 +3488,7 @@
"bilinmeyen color-moved-ws kipi '%s', olabilecek değerler: 'ignore-space-"
"change', 'ignore-space-at-eol', 'ignore-all-space' 'allow-indentation-change'"
-#: diff.c:333
+#: diff.c:336
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3395,12 +3496,12 @@
"color-moved-ws: allow-indentation-change diğer boşluk kipleri ile birlikte "
"kullanılamaz"
-#: diff.c:410
+#: diff.c:413
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "'diff.submodule' yapılandırma değişkeni için bilinmeyen değer: '%s'"
-#: diff.c:470
+#: diff.c:473
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3414,45 +3515,47 @@
msgid "external diff died, stopping at %s"
msgstr "dış diff sonlandı, %s konumunda durdu"
-#: diff.c:4634
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check ve -s birlikte kullanılmaz"
+#: diff.c:4677 parse-options.c:1114
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "'%s', '%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
-#: diff.c:4637
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S ve --find-object birlikte kullanılmaz"
+#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "'%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
-#: diff.c:4640
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4685
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
msgstr ""
-"-G ve --pickaxe-regex birlikte kullanılamaz, --pickaxe-regex'i -S ile "
+"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ile "
"kullanın"
-#: diff.c:4643
+#: diff.c:4689
+#, c-format
msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr ""
-"--pickaxe-all ve --find-object birlikte kullanılamaz, --pickaxe-all'u -G ve -"
-"S ile kullanın"
+"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ve '%s' "
+"ile kullanın"
-#: diff.c:4722
+#: diff.c:4769
msgid "--follow requires exactly one pathspec"
msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor"
-#: diff.c:4770
+#: diff.c:4823
#, c-format
msgid "invalid --stat value: %s"
msgstr "geçersiz --stat değeri: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s bir sayısal değer bekliyor"
-#: diff.c:4807
+#: diff.c:4860
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3461,42 +3564,42 @@
"--dirstat/-X seçenek parametresi ayrıştırılamadı:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4893
#, 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:4916
+#: diff.c:4917
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "şundan sonra bilinmeyen değer: ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4931
#, c-format
msgid "unable to resolve '%s'"
msgstr "'%s' çözülemiyor"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4981 diff.c:4987
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s <n>/<m> biçimi bekliyor"
-#: diff.c:4998
+#: diff.c:4999
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s bir karakter bekliyor, '%s' aldı"
-#: diff.c:5019
+#: diff.c:5020
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "hatalı --color-moved argümanı: %s"
-#: diff.c:5038
+#: diff.c:5039
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws içinde geçersiz kip '%s'"
-#: diff.c:5078
+#: diff.c:5079
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3504,162 +3607,162 @@
"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", "
"\"patience\" ve \"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5115 diff.c:5135
#, c-format
msgid "invalid argument to %s"
msgstr "%s için geçersiz argüman"
-#: diff.c:5238
+#: diff.c:5239
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "-I'ya geçersiz düzenli ifade verildi: '%s'"
-#: diff.c:5287
+#: diff.c:5288
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'"
-#: diff.c:5343
+#: diff.c:5344
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "hatalı --word-diff argümanı: %s"
-#: diff.c:5379
+#: diff.c:5380
msgid "Diff output format options"
msgstr "Diff çıktısı biçimlendirme seçenekleri"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5382 diff.c:5388
msgid "generate patch"
msgstr "yama oluştur"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5385 builtin/log.c:180
msgid "suppress diff output"
msgstr "diff çıktısını gizle"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5390 diff.c:5504 diff.c:5511
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5391 diff.c:5394
msgid "generate diffs with <n> lines context"
msgstr "diff'leri <n> satır bağlamlı oluştur"
-#: diff.c:5395
+#: diff.c:5396
msgid "generate the diff in raw format"
msgstr "diff'i ham biçimde oluştur"
-#: diff.c:5398
+#: diff.c:5399
msgid "synonym for '-p --raw'"
msgstr "'-p --raw eşanlamlısı"
-#: diff.c:5402
+#: diff.c:5403
msgid "synonym for '-p --stat'"
msgstr "'-p --stat eşanlamlısı"
-#: diff.c:5406
+#: diff.c:5407
msgid "machine friendly --stat"
msgstr "makinede okunabilen --stat"
-#: diff.c:5409
+#: diff.c:5410
msgid "output only the last line of --stat"
msgstr "--stat'ın yalnızca son satırını çıktı ver"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5412 diff.c:5420
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5412
+#: diff.c:5413
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:5416
+#: diff.c:5417
msgid "synonym for --dirstat=cumulative"
msgstr "--dirstat=cumulative eşanlamlısı"
-#: diff.c:5420
+#: diff.c:5421
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "--dirstat=files,param1,param2... eşanlamlısı"
-#: diff.c:5424
+#: diff.c:5425
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:5427
+#: diff.c:5428
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:5430
+#: diff.c:5431
msgid "show only names of changed files"
msgstr "yalnızca değiştirilen dosyaların adlarını göster"
-#: diff.c:5433
+#: diff.c:5434
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:5435
+#: diff.c:5436
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]"
-#: diff.c:5436
+#: diff.c:5437
msgid "generate diffstat"
msgstr "diffstat oluştur"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5439 diff.c:5442 diff.c:5445
msgid "<width>"
msgstr "<genişlik>"
-#: diff.c:5439
+#: diff.c:5440
msgid "generate diffstat with a given width"
msgstr "diffstat'ı verilmiş bir genişlik ile oluştur"
-#: diff.c:5442
+#: diff.c:5443
msgid "generate diffstat with a given name width"
msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur"
-#: diff.c:5445
+#: diff.c:5446
msgid "generate diffstat with a given graph width"
msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur"
-#: diff.c:5447
+#: diff.c:5448
msgid "<count>"
msgstr "<sayım>"
-#: diff.c:5448
+#: diff.c:5449
msgid "generate diffstat with limited lines"
msgstr "diffstat'ı kısıtlı satırlarla oluştur"
-#: diff.c:5451
+#: diff.c:5452
msgid "generate compact summary in diffstat"
msgstr "diffstat içinde ufak özet oluştur"
-#: diff.c:5454
+#: diff.c:5455
msgid "output a binary diff that can be applied"
msgstr "uygulanabilir bir ikili diff çıktısı ver"
-#: diff.c:5457
+#: diff.c:5458
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:5459
+#: diff.c:5460
msgid "show colored diff"
msgstr "renkli diff göster"
-#: diff.c:5460
+#: diff.c:5461
msgid "<kind>"
msgstr "<çeşit>"
-#: diff.c:5461
+#: diff.c:5462
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:5464
+#: diff.c:5465
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3667,88 +3770,88 @@
"--raw veya --numstat içinde yol adlarını tahrip etme ve çıktı alanı "
"sonlandırıcıları olarak NUL'ları kullan"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
msgid "<prefix>"
msgstr "<önek>"
-#: diff.c:5468
+#: diff.c:5469
msgid "show the given source prefix instead of \"a/\""
msgstr "\"a/\" yerine verilmiş kaynak önekini göster"
-#: diff.c:5471
+#: diff.c:5472
msgid "show the given destination prefix instead of \"b/\""
msgstr "\"b/\"yerine verilmiş kaynak önekini göster"
-#: diff.c:5474
+#: diff.c:5475
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:5477
+#: diff.c:5478
msgid "do not show any source or destination prefix"
msgstr "hiçbir kaynak ve hedef önekini gösterme"
-#: diff.c:5480
+#: diff.c:5481
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:5484 diff.c:5489 diff.c:5494
+#: diff.c:5485 diff.c:5490 diff.c:5495
msgid "<char>"
msgstr "<karakter>"
-#: diff.c:5485
+#: diff.c:5486
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:5490
+#: diff.c:5491
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:5495
+#: diff.c:5496
msgid "specify the character to indicate a context instead of ' '"
msgstr "bağlam belirtmek için ' ' yerine kullanılacak karakteri belirle"
-#: diff.c:5498
+#: diff.c:5499
msgid "Diff rename options"
msgstr "Diff yeniden adlandırma seçenekleri"
-#: diff.c:5499
+#: diff.c:5500
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5501
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:5504
+#: diff.c:5505
msgid "detect renames"
msgstr "yeniden adlandırmaları algıla"
-#: diff.c:5508
+#: diff.c:5509
msgid "omit the preimage for deletes"
msgstr "silmeler için öngörüntüyü atla"
-#: diff.c:5511
+#: diff.c:5512
msgid "detect copies"
msgstr "kopyaları algıla"
-#: diff.c:5515
+#: diff.c:5516
msgid "use unmodified files as source to find copies"
msgstr "değiştirilmemiş dosyaları kopyaları bulmak için kaynak olarak kullan"
-#: diff.c:5517
+#: diff.c:5518
msgid "disable rename detection"
msgstr "yeniden adlandırma algılamasını devre dışı bırak"
-#: diff.c:5520
+#: diff.c:5521
msgid "use empty blobs as rename source"
msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan"
-#: diff.c:5522
+#: diff.c:5523
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:5525
+#: diff.c:5526
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3756,234 +3859,234 @@
"eğer yeniden adlandırma/kopyalama hedeflerinin sayısı verilen sınırı aşarsa "
"yeniden adlandırma/kopyalama algılamasını önle"
-#: diff.c:5527
+#: diff.c:5528
msgid "Diff algorithm options"
msgstr "Diff algoritma seçenekleri"
-#: diff.c:5529
+#: diff.c:5530
msgid "produce the smallest possible diff"
msgstr "olabilecek en küçük diff'i üret"
-#: diff.c:5532
+#: diff.c:5533
msgid "ignore whitespace when comparing lines"
msgstr "satırları karşılaştırırken boşlukları yok say"
-#: diff.c:5535
+#: diff.c:5536
msgid "ignore changes in amount of whitespace"
msgstr "boşluk sayısındaki değişiklikleri yok say"
-#: diff.c:5538
+#: diff.c:5539
msgid "ignore changes in whitespace at EOL"
msgstr "satır sonundaki boşluk değişikliklerini yok say"
-#: diff.c:5541
+#: diff.c:5542
msgid "ignore carrier-return at the end of line"
msgstr "satır sonundaki satırbaşı karakterini yok say"
-#: diff.c:5544
+#: diff.c:5545
msgid "ignore changes whose lines are all blank"
msgstr "satırlarının tümü boş olan değişiklikleri yok say"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
msgid "<regex>"
msgstr "<ifade>"
-#: diff.c:5547
+#: diff.c:5548
msgid "ignore changes whose all lines match <regex>"
msgstr "satırlarının tümü <ifade> ile eşleşen değişiklikleri yok say"
-#: diff.c:5550
+#: diff.c:5551
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:5553
+#: diff.c:5554
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5557
+#: diff.c:5558
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5559
+#: diff.c:5560
msgid "<algorithm>"
msgstr "<algoritma>"
-#: diff.c:5560
+#: diff.c:5561
msgid "choose a diff algorithm"
msgstr "bir diff algoritması seç"
-#: diff.c:5562
+#: diff.c:5563
msgid "<text>"
msgstr "<metin>"
-#: diff.c:5563
+#: diff.c:5564
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "diff'i \"anchored diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5566 diff.c:5575 diff.c:5578
msgid "<mode>"
msgstr "<kip>"
-#: diff.c:5566
+#: diff.c:5567
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:5569
+#: diff.c:5570
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:5572
+#: diff.c:5573
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "şuna eşdeğer: --word-diff=color --word-diff-regex=<ifade>"
-#: diff.c:5575
+#: diff.c:5576
msgid "moved lines of code are colored differently"
msgstr "taşınan kod satırları farklı renklendirilir"
-#: diff.c:5578
+#: diff.c:5579
msgid "how white spaces are ignored in --color-moved"
msgstr "boşluklar --color-moved içinde nasıl yok sayılır"
-#: diff.c:5581
+#: diff.c:5582
msgid "Other diff options"
msgstr "Diğer diff seçenekleri"
-#: diff.c:5583
+#: diff.c:5584
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:5587
+#: diff.c:5588
msgid "treat all files as text"
msgstr "tüm dosyaları metin olarak varsay"
-#: diff.c:5589
+#: diff.c:5590
msgid "swap two inputs, reverse the diff"
msgstr "iki girdiyi değiştir, diff'i tersine döndür"
-#: diff.c:5591
+#: diff.c:5592
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "ayrımlar varsa 1 ile, yoksa 0 ile çık"
-#: diff.c:5593
+#: diff.c:5594
msgid "disable all output of the program"
msgstr "tüm program çıktısını devre dışı bırak"
-#: diff.c:5595
+#: diff.c:5596
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:5597
+#: diff.c:5598
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:5599
+#: diff.c:5600
msgid "<when>"
msgstr "<ne-zaman>"
-#: diff.c:5600
+#: diff.c:5601
msgid "ignore changes to submodules in the diff generation"
msgstr "diff oluştururken altmodüllere olan değişiklikleri yok say"
-#: diff.c:5603
+#: diff.c:5604
msgid "<format>"
msgstr "<biçim>"
-#: diff.c:5604
+#: diff.c:5605
msgid "specify how differences in submodules are shown"
msgstr "altmodüllerdeki değişikliklerin nasıl gösterileceğini belirt"
-#: diff.c:5608
+#: diff.c:5609
msgid "hide 'git add -N' entries from the index"
msgstr "indeksten 'git add -N' girdilerini gizle"
-#: diff.c:5611
+#: diff.c:5612
msgid "treat 'git add -N' entries as real in the index"
msgstr "indekste 'git add -N' girdilerine gerçekmiş gibi davran"
-#: diff.c:5613
+#: diff.c:5614
msgid "<string>"
msgstr "<dizi>"
-#: diff.c:5614
+#: diff.c:5615
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:5617
+#: diff.c:5618
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:5620
+#: diff.c:5621
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:5623
+#: diff.c:5624
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:5626
+#: diff.c:5627
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:5627 diff.c:5630
+#: diff.c:5628 diff.c:5631
msgid "<path>"
msgstr "<yol>"
-#: diff.c:5628
+#: diff.c:5629
msgid "show the change in the specified path first"
msgstr "öncelikle belirtilen yoldaki değişikliği göster"
-#: diff.c:5631
+#: diff.c:5632
msgid "skip the output to the specified path"
msgstr "belirtilen yola olan çıktıyı atla"
-#: diff.c:5633
+#: diff.c:5634
msgid "<object-id>"
msgstr "<nesne-no>"
-#: diff.c:5634
+#: diff.c:5635
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:5636
+#: diff.c:5637
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5638
msgid "select files by diff type"
msgstr "dosyaları diff türüne göre seç"
-#: diff.c:5639
+#: diff.c:5640
msgid "<file>"
msgstr "<dosya>"
-#: diff.c:5640
-msgid "Output to a specific file"
-msgstr "belirli bir dosyaya çıktı ver"
+#: diff.c:5641
+msgid "output to a specific file"
+msgstr "belirli bir dosyaya çıktıla"
-#: diff.c:6298
+#: diff.c:6321
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"Geniş kapsamlı yeniden adlandırma algılaması çok fazla dosya olmasından "
"dolayı atlandı."
-#: diff.c:6301
+#: diff.c:6324
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:6304
+#: diff.c:6327
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3996,7 +4099,7 @@
msgid "failed to read orderfile '%s'"
msgstr "orderfile '%s' okunamadı"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor"
@@ -4025,39 +4128,47 @@
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr "sparse-checkout dosyanızın sorunları olabilir: '%s' dizgisi yinelenmiş"
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr "koni dizgi eşleşmesi devre dışı bırakılıyor"
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor"
-#: dir.c:2351
+#: dir.c:2419
#, c-format
msgid "could not open directory '%s'"
msgstr "'%s' dizini açılamadı"
-#: dir.c:2653
+#: dir.c:2721
msgid "failed to get kernel name and information"
msgstr "çekirdek adı ve bilgisi alınamadı"
-#: dir.c:2777
+#: dir.c:2846
msgid "untracked cache is disabled on this system or location"
msgstr "izlenmeyen önbellek bu sistemde veya konumda devre dışı bırakılmış"
-#: dir.c:3610
+#: dir.c:3119
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Bir dizin adı tahmin edilemedi.\n"
+"Lütfen komut satırında bir dizin belirtin."
+
+#: dir.c:3807
#, c-format
msgid "index file corrupt in repo %s"
msgstr "%s deposundaki indeks dosyası hasarlı"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3854 dir.c:3859
#, c-format
msgid "could not create directories for %s"
msgstr "%s için dizinler oluşturulamadı"
-#: dir.c:3691
+#: dir.c:3888
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi"
@@ -4067,304 +4178,400 @@
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "İpucu: Düzenleyicinizin dosyayı kapatması bekleniyor...%c"
-#: entry.c:176
+#: entry.c:179
msgid "Filtering content"
msgstr "İçerik süzülüyor"
-#: entry.c:497
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "'%s' dosyasının bilgileri alınamadı"
-#: environment.c:152
+#: environment.c:147
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "hatalı git ad alanı yolu \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "GIT_DIR şuna ayarlanamadı: '%s'"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "%s çalıştırmak için çok fazla argüman"
-#: fetch-pack.c:182
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: sığ bir liste bekleniyordu"
-#: fetch-pack.c:185
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: sığ listeden sonra floş paketi bekleniyordu"
-#: fetch-pack.c:196
+#: fetch-pack.c:208
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:216
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK bekleniyordu, '%s' alındı"
-#: fetch-pack.c:227
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "uzak konuma yazılamıyor"
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc multi_ack_detailed gerektiriyor"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:397 fetch-pack.c:1460
#, c-format
msgid "invalid shallow line: %s"
msgstr "geçersiz sığ satır: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:403 fetch-pack.c:1466
#, c-format
msgid "invalid unshallow line: %s"
msgstr "geçersiz sığ olmayan satır: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:405 fetch-pack.c:1468
#, c-format
msgid "object not found: %s"
msgstr "nesne bulunamadı: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:408 fetch-pack.c:1471
#, c-format
msgid "error in object: %s"
msgstr "nesne içinde hata: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:410 fetch-pack.c:1473
#, c-format
msgid "no shallow found: %s"
msgstr "sığ bulunamadı: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:413 fetch-pack.c:1477
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "sığ/sığ olmayan bekleniyordu, %s alındı"
-#: fetch-pack.c:439
+#: fetch-pack.c:453
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s alındı"
-#: fetch-pack.c:456
+#: fetch-pack.c:470
#, c-format
msgid "invalid commit %s"
msgstr "geçersiz işleme %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:501
msgid "giving up"
msgstr "vazgeçiliyor"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:514 progress.h:25
msgid "done"
msgstr "bitti"
-#: fetch-pack.c:512
+#: fetch-pack.c:526
#, c-format
msgid "got %s (%d) %s"
msgstr "%s (%d) %s alındı"
-#: fetch-pack.c:548
+#: fetch-pack.c:562
#, c-format
msgid "Marking %s as complete"
msgstr "%s tamam olarak imleniyor"
-#: fetch-pack.c:763
+#: fetch-pack.c:784
#, c-format
msgid "already have %s (%s)"
msgstr "%s halihazırda var (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:870
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: yanbant çoğullama çözücüsü ayrı çatallanamıyor"
-#: fetch-pack.c:857
+#: fetch-pack.c:878
msgid "protocol error: bad pack header"
msgstr "protokol hatası: hatalı paket üstbilgisi"
-#: fetch-pack.c:951
+#: fetch-pack.c:974
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: %s ayrı çatallanamıyor"
-#: fetch-pack.c:957
+#: fetch-pack.c:980
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: geçersiz index-pack çıktısı"
-#: fetch-pack.c:974
+#: fetch-pack.c:997
#, c-format
msgid "%s failed"
msgstr "%s başarısız oldu"
-#: fetch-pack.c:976
+#: fetch-pack.c:999
msgid "error in sideband demultiplexer"
msgstr "yanbant çoğullama çözücüsünde hata"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1048
#, c-format
msgid "Server version is %.*s"
msgstr "Sunucu sürümü %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
+#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
+#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
+#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
#, c-format
msgid "Server supports %s"
msgstr "Sunucu %s destekliyor"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1058
msgid "Server does not support shallow clients"
msgstr "Sunucu sığ istemcileri desteklemiyor"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1118
msgid "Server does not support --shallow-since"
msgstr "Sunucu --shallow-since desteklemiyor"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1123
msgid "Server does not support --shallow-exclude"
msgstr "Sunucu --shallow-exclude desteklemiyor"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1127
msgid "Server does not support --deepen"
msgstr "Sunucu --deepen desteklemiyor"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1129
msgid "Server does not support this repository's object format"
msgstr "Sunucu bu deponun nesne türünü desteklemiyor"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1142
msgid "no common commits"
msgstr "ortak işleme yok"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
msgid "source repository is shallow, reject to clone."
-msgstr "kaynak depo sığ, klonlama için reddet"
+msgstr "kaynak depo sığ, klonlama için reddet."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1157 fetch-pack.c:1705
msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: getirme başarısız"
+msgstr "git fetch-pack: Getirme başarısız."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1271
#, c-format
msgid "mismatched algorithms: client %s; server %s"
-msgstr "eşleşmeyen algoritmalar: istemci %s; sunucu %s"
+msgstr "eşleşmeyen algoritmalar: İstemci %s; sunucu %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1275
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "sunucu '%s' algoritmasını desteklemiyor"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1308
msgid "Server does not support shallow requests"
msgstr "Sunucu sığ istekleri desteklemiyor"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1315
msgid "Server supports filter"
msgstr "Sunucu süzgeç destekliyor"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1358 fetch-pack.c:2087
msgid "unable to write request to remote"
msgstr "uzak konuma istek yazılamıyor"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1376
#, c-format
msgid "error reading section header '%s'"
msgstr "bölüm üstbilgisi '%s' okunurken hata"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1382
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' bekleniyordu, '%s' alındı"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1416
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "beklenmedik alındı satırı: '%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1421
#, c-format
msgid "error processing acks: %d"
msgstr "alındılar işlenirken hata: %d"
-#: fetch-pack.c:1402
-msgid "expected packfile to be sent after 'ready'"
-msgstr "paket dosyasının 'ready'den sonra gönderilmesi gerekiyordu"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1435
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "paket dosyasının '%s' ögesinden sonra gönderilmesi bekleniyordu"
-#: fetch-pack.c:1404
-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"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1441
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "'%s' \"yok\" iken başka hiçbir bölümün gönderilmemesi bekleniyordu"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1482
#, c-format
msgid "error processing shallow info: %d"
msgstr "sığ bilgi işlenirken hata: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1531
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref bekleniyordu, '%s' alındı"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1536
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "beklenmedik wanted-ref: '%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1541
#, c-format
msgid "error processing wanted refs: %d"
msgstr "aranan başvurular işlenirken hata: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1571
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: yanıt sonu paketi bekleniyordu"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1983
msgid "no matching remote head"
msgstr "eşleşen uzak dal ucu yok"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:2006 builtin/clone.c:587
msgid "remote did not send all necessary objects"
msgstr "uzak konum gereken tüm nesneleri göndermedi"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2109
msgid "unexpected 'ready' from remote"
msgstr "uzak konumdan beklenmedik 'ready'"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2132
#, c-format
msgid "no such remote ref %s"
msgstr "böyle bir uzak başvuru yok: %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2135
#, 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:273
+#: fsmonitor-ipc.c:119
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: geçersiz yol '%s'"
+
+#: fsmonitor-ipc.c:125
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: '%s' üzerinde belirtilmemiş hata"
+
+#: fsmonitor-ipc.c:155
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon çalışmıyor"
+
+#: fsmonitor-ipc.c:164
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "fsmonitor--daemon'a '%s' komutu gönderilemedi"
+
+#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
+#: gpg-interface.c:1011
msgid "could not create temporary file"
msgstr "geçici dosya oluşturulamadı"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:459
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "şuna ayrık imza yazılamadı: '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:450
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile'ın ssh imza doğrulaması için yapılandırılması ve "
+"var olması gerekiyor"
+
+#: gpg-interface.c:479
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify, ssh imza doğrulaması için gerekli "
+"(openssh 8.21p1+ sürümünde mevcut)"
+
+#: gpg-interface.c:550
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "ssh imza geri alım dosyası yapılandırıldı; ancak bulunamadı: %s"
+
+#: gpg-interface.c:638
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "hatalı/uyumsuz imza '%s'"
+
+#: gpg-interface.c:815 gpg-interface.c:820
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "'%s' anahtarı için ssh parmak izi alınamadı"
+
+#: gpg-interface.c:843
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"ya user.signingkey ya da gpg.ssh.defaultKeyCommand'in yapılandırılması "
+"gerekiyor"
+
+#: gpg-interface.c:865
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand başarılı oldu; ancak herhangi bir anahtar "
+"döndürmedi: %s %s"
+
+#: gpg-interface.c:871
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand başarısız oldu: %s %s"
+
+#: gpg-interface.c:966
msgid "gpg failed to sign the data"
msgstr "gpg veriyi imzalayamadı"
+#: gpg-interface.c:988
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey'in ssh imzalaması için ayarlanması gerekiyor"
+
+#: gpg-interface.c:999
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "ssh imzalama anahtarı '%s' konumuna yazılamadı"
+
+#: gpg-interface.c:1017
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "ssh imzalama anahtarı arabelleği '%s' konumuna yazılamadı"
+
+#: gpg-interface.c:1035
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y imzası, ssh imzalaması için gerekli (openssh 8.21p1+ sürümünde "
+"mevcut)"
+
+#: gpg-interface.c:1047
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "ssh imzalama verisi arabelleği '%s' konumundan okunamadı"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "log.graphColors içindeki '%.*s' geçersiz renk yok sayıldı"
-#: grep.c:531
+#: grep.c:446
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4372,110 +4579,110 @@
"verilen dizgi NULL baytı içeriyor (-f <dosya> aracılığıyla). Bu yalnızca "
"PCRE v2 altında -P ile desteklenir"
-#: grep.c:1895
+#: grep.c:1859
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': %s okunamıyor"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "'%s' dosyasının bilgileri alınamadı"
-#: grep.c:1923
+#: grep.c:1887
#, c-format
msgid "'%s': short read"
msgstr "'%s': kısa okuma"
-#: help.c:23
+#: help.c:25
msgid "start a working area (see also: git help tutorial)"
msgstr "bir çalışma alanı başlatın (ayrıca bkz: git help tutorial)"
-#: help.c:24
+#: help.c:26
msgid "work on the current change (see also: git help everyday)"
msgstr "güncel değişiklikler üzerinde çalışın (ayrıca bkz: git help everyday)"
-#: help.c:25
+#: help.c:27
msgid "examine the history and state (see also: git help revisions)"
msgstr ""
"geçmişi ve geçerli durumu gözden geçirin (ayrıca bkz: git help revisions)"
-#: help.c:26
+#: help.c:28
msgid "grow, mark and tweak your common history"
msgstr "ortak geçmişinizi büyütün, imleyin ve geliştirin"
-#: help.c:27
+#: help.c:29
msgid "collaborate (see also: git help workflows)"
msgstr "birlikte çalışın (ayrıca bkz: git help workflows)"
-#: help.c:31
+#: help.c:33
msgid "Main Porcelain Commands"
msgstr "Ana Komutlar"
-#: help.c:32
+#: help.c:34
msgid "Ancillary Commands / Manipulators"
msgstr "Yan Komutlar / Yönlendiriciler"
-#: help.c:33
+#: help.c:35
msgid "Ancillary Commands / Interrogators"
msgstr "Yan Komutlar / Sorgucular"
-#: help.c:34
+#: help.c:36
msgid "Interacting with Others"
msgstr "Başkaları ile Etkileşim"
-#: help.c:35
+#: help.c:37
msgid "Low-level Commands / Manipulators"
msgstr "Düşük Düzeyli Komutlar / Yönlendiriciler"
-#: help.c:36
+#: help.c:38
msgid "Low-level Commands / Interrogators"
msgstr "Düşük Düzeyli Komutlar / Sorgucular"
-#: help.c:37
+#: help.c:39
msgid "Low-level Commands / Syncing Repositories"
msgstr "Düşük Düzeyli Komutlar / Depo Eşitleme"
-#: help.c:38
+#: help.c:40
msgid "Low-level Commands / Internal Helpers"
msgstr "Düşük Düzeyli Komutlar / İç Yardımcılar"
-#: help.c:300
+#: help.c:316
#, c-format
msgid "available git commands in '%s'"
msgstr "'%s' içindeki kullanılabilir git komutları"
-#: help.c:307
+#: help.c:323
msgid "git commands available from elsewhere on your $PATH"
msgstr "$PATH içindeki başka yerlerden kullanılabilen git komutları"
-#: help.c:316
+#: help.c:332
msgid "These are common Git commands used in various situations:"
msgstr "En çok kullanılan temel Git komutlarının bir listesi aşağıdadır:"
-#: help.c:365 git.c:100
+#: help.c:382 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "desteklenmeyen komut listeleme türü '%s'"
-#: help.c:405
+#: help.c:422
msgid "The Git concept guides are:"
msgstr "Git konsept kılavuzları şunlardır:"
-#: help.c:429
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Belirli bir altkomut üzerine okumak için 'git help <komut>' kullanın"
-
-#: help.c:434
+#: help.c:446
msgid "External commands"
msgstr "Dış komutlar"
-#: help.c:449
+#: help.c:468
msgid "Command aliases"
msgstr "Komut armaları"
-#: help.c:527
+#: help.c:486
+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:563
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4484,32 +4691,37 @@
"'%s' bir git komutu gibi görünüyor; ancak biz onu\n"
"çalıştıramadık. git-%s bozuk olabilir mi?"
-#: help.c:543 help.c:631
+#: help.c:585 help.c:682
#, 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:591
+#: help.c:633
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Tüh. Sisteminiz hiçbir Git komutu bildirmiyor."
-#: help.c:613
+#: help.c:655
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"UYARI: '%s' adında bir Git komutunu çağırdınız; ancak böyle bir komut yok."
-#: help.c:618
+#: help.c:660
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "'%s' demek istediğiniz varsayılarak sürdürülüyor."
-#: help.c:623
+#: help.c:666
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Bunun yerine '%s' çalıştırılsın mı? (y/N)? "
+
+#: help.c:674
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "%0.1f saniye içinde sürdürülüyor, '%s' demek istediğiniz varsayılacak."
-#: help.c:635
+#: help.c:686
msgid ""
"\n"
"The most similar command is"
@@ -4523,16 +4735,16 @@
"\n"
"Buna en yakın komutlar:"
-#: help.c:675
+#: help.c:729
msgid "git version [<options>]"
msgstr "git version [<seçenekler>]"
-#: help.c:730
+#: help.c:784
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:788
msgid ""
"\n"
"Did you mean this?"
@@ -4546,15 +4758,29 @@
"\n"
"Şunlardan birini mi demek istediniz?"
-#: ident.c:353
+#: hook.c:28
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"'%s' kancası yok sayıldı; çünkü bir çalıştırılabilir olarak ayarlanmamış.\n"
+"Bu uyarıyı 'git config advice.ignoredHook false' ile kapatabilirsiniz."
+
+#: hook.c:87
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "'%s' kancası başlatılamadı\n"
+
+#: ident.c:354
msgid "Author identity unknown\n"
msgstr "Yazar kimliği bilinmiyor\n"
-#: ident.c:356
+#: ident.c:357
msgid "Committer identity unknown\n"
msgstr "İşleyici kimliği bilinmiyor\n"
-#: ident.c:362
+#: ident.c:363
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -4581,71 +4807,71 @@
"değişkenini kullanmayın.\n"
"\n"
-#: ident.c:397
+#: ident.c:398
msgid "no email was given and auto-detection is disabled"
msgstr "bir e-posta verilmedi ve kendiliğinden algılama devre dışı"
-#: ident.c:402
+#: ident.c:403
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "e-posta adresi kendiliğinden algılanamıyor ('%s' alındı)"
-#: ident.c:419
+#: ident.c:420
msgid "no name was given and auto-detection is disabled"
msgstr "bir ad verilmedi ve kendiliğinden algılama devre dışı"
-#: ident.c:425
+#: ident.c:426
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "ad kendiliğinden algılanamıyor ('%s' alındı)"
-#: ident.c:433
+#: ident.c:434
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "boş tanımlayıcı adına (<%s> için) izin verilmiyor"
-#: ident.c:439
+#: ident.c:440
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "ad yalnızca izin verilmeyen karakterlerden oluşuyor: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:455 builtin/commit.c:649
#, c-format
msgid "invalid date format: %s"
msgstr "geçersiz tarih biçimi: %s"
-#: list-objects-filter-options.c:83
+#: list-objects-filter-options.c:68
msgid "expected 'tree:<depth>'"
msgstr "'tree:<derinlik>' bekleniyordu"
-#: list-objects-filter-options.c:98
+#: list-objects-filter-options.c:83
msgid "sparse:path filters support has been dropped"
msgstr "sparse:path süzgeçleri desteği artık yok"
-#: list-objects-filter-options.c:105
+#: list-objects-filter-options.c:90
#, c-format
msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "'object:type=<tür>' için '%s' geçerli bir nesne türü değil"
-#: list-objects-filter-options.c:124
+#: list-objects-filter-options.c:109
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "geçersiz filter-spec '%s'"
-#: list-objects-filter-options.c:140
+#: list-objects-filter-options.c:125
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr "sub-filter-spec içinde kaçış karakteri olmalı: '%c'"
-#: list-objects-filter-options.c:182
+#: list-objects-filter-options.c:167
msgid "expected something after combine:"
msgstr "birlikte kullanımdan sonra bir şeyler bekleniyordu:"
-#: list-objects-filter-options.c:264
+#: list-objects-filter-options.c:249
msgid "multiple filter-specs cannot be combined"
msgstr "çoklu filter-specs birlikte kullanılamaz"
-#: list-objects-filter-options.c:376
+#: list-objects-filter-options.c:365
msgid "unable to upgrade repository format to support partial clone"
msgstr "depo biçimi kısımsal klonları desteklemesi için yükseltilemiyor"
@@ -4659,19 +4885,19 @@
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
+#: list-objects.c:144
#, 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
+#: list-objects.c:157
#, 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"
+"'%s' girdisi (%s ağacında) ikili nesne kipine iye; ancak bir ikili nesne "
+"değil"
-#: list-objects.c:398
+#: list-objects.c:415
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "%s işlemesi için kök ağacı yüklenemiyor"
@@ -4700,12 +4926,12 @@
msgid "Unable to create '%s.lock': %s"
msgstr "'%s.lock' oluşturulamıyor: %s"
-#: ls-refs.c:37
+#: ls-refs.c:175
#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "lsrefs.unborn için '%s' geçersiz değeri"
+msgid "unexpected line: '%s'"
+msgstr "beklenmedik satır: '%s'"
-#: ls-refs.c:167
+#: ls-refs.c:179
msgid "expected flush after ls-refs arguments"
msgstr "ls-refs argümanlarından sonra floş bekleniyordu"
@@ -4713,37 +4939,37 @@
msgid "quoted CRLF detected"
msgstr "alıntılanmış CRLF algılandı"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "hatalı eylem '%s', '%s' için"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1630 merge-recursive.c:1214
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "%s altmodülü birleştirilemedi (çıkış yapılmadı)"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1639 merge-recursive.c:1221
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "%s altmodülü birleştirilemedi (işlemeler mevcut değil)"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1648 merge-recursive.c:1228
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "%s altmodülü birleştirilemedi (işlemeler merge-base'i takip etmiyor)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1658 merge-ort.c:1666
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Not: %s altmodülü %s yönüne ileri sarılıyor"
-#: merge-ort.c:1625
+#: merge-ort.c:1688
#, c-format
msgid "Failed to merge submodule %s"
-msgstr "'%s' altmodülünü birleştirilemedi"
+msgstr "'%s' altmodülü birleştirilemedi"
-#: merge-ort.c:1632
+#: merge-ort.c:1695
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4752,7 +4978,7 @@
"%s altmodülü birleştirilemedi; ancak olası bir birleştirme çözümü mevcut:\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1699 merge-recursive.c:1284
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4768,7 +4994,7 @@
"\n"
"komutu bu öneriyi kabul edecektir.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1712
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4778,21 +5004,21 @@
"mevcut:\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1937 merge-recursive.c:1375
msgid "Failed to execute internal merge"
msgstr "İç birleştirme çalıştırılamadı"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1942 merge-recursive.c:1380
#, c-format
msgid "Unable to add %s to database"
msgstr "%s veritabanına eklenemedi"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1949 merge-recursive.c:1413
#, c-format
msgid "Auto-merging %s"
msgstr "%s kendiliğinden birleştiriliyor"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2088 merge-recursive.c:2135
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4802,7 +5028,7 @@
"örtülü yeniden adlandırmanın aşağıdaki yolları oraya koymasına engel oluyor: "
"%s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2098 merge-recursive.c:2145
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4812,7 +5038,7 @@
"eşlemlenemiyor; örtülü dizin yeniden adlandırmaları aşağıdaki yolları oraya "
"koymayı denedi: %s."
-#: merge-ort.c:2087
+#: merge-ort.c:2156
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4823,7 +5049,7 @@
"adlandırılacağı belirsiz; herhangi bir hedef dosyaların çoğunu almadan "
"birden çok başka dizine yeniden adlandırılmıştı."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2310 merge-recursive.c:2481
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4832,7 +5058,7 @@
"UYARI: %s -> %s yeniden adlandırmasını %s ögesine uygulamadan kaçınılıyor, "
"çünkü %s ögesinin kendisi yeniden adlandırıldı."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2450 merge-recursive.c:3264
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4841,7 +5067,7 @@
"Yol güncellendi: %s, (%s içinde eklenen) %s içinde yeniden adlandırılan bir "
"dizinde; onu %s konumuna taşıdı."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2457 merge-recursive.c:3271
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4850,7 +5076,7 @@
"Yol güncellendi: %s, %s olarak yeniden adlandırıldı (%s içinde), %s içinde "
"yeniden adlandırılan bir dizinde; onu %s konumuna taşıdı."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2470 merge-recursive.c:3267
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4859,7 +5085,7 @@
"ÇAKIŞMA (dosya konumu): %s, (%s içinde eklenen) %s içinde yeniden "
"adlandırılan bir dizinde, belki de %s konumuna taşınmalı."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2478 merge-recursive.c:3274
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4868,14 +5094,14 @@
"ÇAKIŞMA (dosya konumu): %s, %s olarak yeniden adlandırıldı (%s içinde), %s "
"içinde yeniden adlandırılan bir dizinde, belki de %s konumuna taşınmalı."
-#: merge-ort.c:2569
+#: merge-ort.c:2634
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandırıldı (%s içinde) ve "
"ek olarak %s olarak da adlandırıldı (%s içinde)."
-#: merge-ort.c:2664
+#: merge-ort.c:2729
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4884,26 +5110,26 @@
msgstr ""
"ÇAKIŞMA (yeniden adlandırma çarpışması): %s -> %s yeniden adlandırmasının "
"içerik çakışmaları var ve başka bir yolla çarpışıyor; bu iç içe geçmiş "
-"çakışmaimleyicilerine neden olabilir."
+"çakışma imleyicilerine neden olabilir."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2748 merge-ort.c:2772
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"ÇAKIŞMA (yeniden adlandır/sil): %s->%s olarak adlandırıldı (%s içinde); "
"ancak %s içinde silindi."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3261 merge-recursive.c:3025
#, c-format
msgid "cannot read object %s"
msgstr "%s nesnesi okunamıyor"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3264 merge-recursive.c:3028
#, c-format
msgid "object %s is not a blob"
msgstr "%s nesnesi ikili bir nesne değil"
-#: merge-ort.c:3613
+#: merge-ort.c:3693
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4912,7 +5138,7 @@
"ÇAKIŞMA (dosya/dizin): Dizin, şuradan %s yolunda: %s; bunun yerine %s "
"konumuna taşınıyor."
-#: merge-ort.c:3689
+#: merge-ort.c:3770
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4922,7 +5148,7 @@
"ikisi de yeniden adlandırıldı; böylelikle başka bir yerde kayıtları "
"yazılabilir."
-#: merge-ort.c:3696
+#: merge-ort.c:3777
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4932,24 +5158,24 @@
"bir tanesi yeniden adlandırıldı; böylelikle her birinin başka bir yerde "
"kayıtları yazılabilir."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3866 merge-recursive.c:3104
msgid "content"
msgstr "içerik"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3868 merge-recursive.c:3108
msgid "add/add"
msgstr "ekle/ekle"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3870 merge-recursive.c:3153
msgid "submodule"
msgstr "altmodül"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3872 merge-recursive.c:3154
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması"
-#: merge-ort.c:3833
+#: merge-ort.c:3916
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4958,7 +5184,7 @@
"ÇAKIŞMA (değiştir/sil): %s silindi (%s içinde) ve %s içinde değiştirildi. %s "
"sürümü (şunun: %s) ağaçta bırakıldı."
-#: merge-ort.c:4120
+#: merge-ort.c:4212
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4970,12 +5196,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4586
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "şu ağaçlar için birleştirme bilgisi toplama başarısız: %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3723
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4985,107 +5211,107 @@
"yazılacak:\n"
"\t%s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
msgid "Already up to date."
msgstr "Tümü güncel."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(hatalı işleme)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo '%s' yolu için başarısız oldu; birleştirme iptal ediliyor."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo '%s' yolu için yenilenemedi; birleştirme iptal ediliyor."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "'%s'%s yolu oluşturulamadı"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Altdizine yer açmak için %s kaldırılıyor\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": bir D/F çakışması olabilir mi?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "'%s' konumundaki izlenmeyen dosyayı kaybetme reddediliyor"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:47
#, c-format
msgid "cannot read object %s '%s'"
msgstr "%s '%s' nesnesi okunamıyor"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' için ikili nesne bekleniyordu"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "'%s' açılamadı: %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "'%s' için sembolik bağ oluşturulamadı: %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "şununla ne yapılacağı bilinmiyor: %06o %s '%s'"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "%s altmodülü şu işlemeye ileri sarılıyor:"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1239 merge-recursive.c:1252
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "%s altmodülü ileri sarılıyor"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"%s altmodülü birleştirilemedi (işlemeleri takip eden birleştirme bulunamadı)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1280
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "%s altmodülü birleştirilemedi (ileri sarım değil)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1281
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Şu altmodül için olası bir birleştirme çözümü bulundu:\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1293
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "%s altmodülü birleştirilemedi (birden çok birleştirme bulundu)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1437
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Hata: %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine "
"%s konumuna yazılacak."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5094,7 +5320,7 @@
"ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü "
"ağaçta bırakıldı."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1514
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5103,7 +5329,7 @@
"ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s "
"(%s) sürümü ağaçta bırakıldı."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1521
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5112,7 +5338,7 @@
"ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü "
"ağaçta %s konumunda bırakıldı."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5121,45 +5347,45 @@
"ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s "
"(%s) sürümü ağaçta %s konumunda bırakıldı."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "rename"
msgstr "yeniden adlandır"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "renamed"
msgstr "yeniden adlandırıldı"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "%s konumundaki kirli dosyayı kaybetme reddediliyor"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1622
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Engel olduğu halde %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1680
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"ÇAKIŞMA (yeniden adlandır/ekle): %s->%s olarak adlandırıldı (%s içinde). %s "
"eklendi (%s içinde)."
-#: merge-recursive.c:1694
+#: merge-recursive.c:1711
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s bir dizin (%s içinde), bunun yerine %s olarak ekleniyor"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1716
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"%s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine %s "
"olarak ekleniyor"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1743
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5168,18 +5394,18 @@
"ÇAKIŞMA (y. adlandır/y. adlandır): \"%s\"->\"%s\" olarak adlandır (\"%s\" "
"dalında), \"%s\"->\"%s\" olarak adlandır (\"%s\"%s içinde)"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1748
msgid " (left unresolved)"
msgstr " (çözülmeden bırakıldı)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1840
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandır (%s içinde). %s->"
"%s olarak adlandır (%s içinde)"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2103
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5190,7 +5416,7 @@
"yerleştirileceği belirsiz; çünkü %s dizini birden çok başka dizine yeniden "
"adlandırılırken hiçbir hedef dosyaların büyük çoğunluğunu almadı."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2237
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5199,80 +5425,80 @@
"ÇAKIŞMA (y. adlandır/y. adlandır): Dizini %s->%s olarak adlandır (%s "
"içinde). Dizini %s->%s olarak adlandır (%s içinde)."
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modify"
msgstr "değiştir"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modified"
msgstr "değiştirilmiş"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3131
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s atlandı (mevcut ile aynı biçimde birleştirildi)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3184
#, c-format
msgid "Adding as %s instead"
msgstr "Bunun yerine %s olarak ekleniyor"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3388
#, c-format
msgid "Removing %s"
msgstr "%s kaldırılıyor"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3411
msgid "file/directory"
msgstr "dosya/dizin"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3416
msgid "directory/file"
msgstr "dizin/dosya"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3423
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"ÇAKIŞMA (%s): %s adıyla bir dizin var (%s içinde). %s, %s olarak ekleniyor."
-#: merge-recursive.c:3415
+#: merge-recursive.c:3432
#, c-format
msgid "Adding %s"
msgstr "%s ekleniyor"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3441
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "ÇAKIŞMA (ekle/ekle): %s içinde birleştirme çakışması"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3494
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "%s ve %s ağaçlarının birleştirilmesi başarısız"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3588
msgid "Merging:"
msgstr "Birleştiriliyor:"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3601
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u ortak ata bulundu:"
msgstr[1] "%u ortak ata bulundu:"
-#: merge-recursive.c:3634
+#: merge-recursive.c:3651
msgid "merge returned no commit"
msgstr "birleştirme herhangi bir işleme döndürmedi"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3823
#, c-format
msgid "Could not parse object '%s'"
msgstr "'%s' nesnesi ayrıştırılamadı"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "İndeks yazılamıyor."
@@ -5280,189 +5506,225 @@
msgid "failed to read the cache"
msgstr "önbellek okunamadı"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
+#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "yeni indeks dosyası yazılamıyor"
-#: midx.c:74
+#: midx.c:79
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "multi-pack-index OID ikiye bölümünün boyutu hatalı"
-#: midx.c:105
+#: midx.c:112
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-index dosyası %s pek küçük"
-#: midx.c:121
+#: midx.c:128
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "multi-pack-index imzası 0x%08x, 0x%08x imzası ile eşleşmiyor"
-#: midx.c:126
+#: midx.c:133
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index sürümü %d tanımlanamıyor"
-#: midx.c:131
+#: midx.c:138
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "multi-pack-index sağlama sürümü %u, %u sürümü ile eşleşmiyor"
-#: midx.c:148
+#: midx.c:155
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index'ten gerekli pack-name iri parçası eksik"
-#: midx.c:150
+#: midx.c:157
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index'ten gerekli OID fanout iri parçası eksik"
-#: midx.c:152
+#: midx.c:159
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index'ten gerekli OID arama iri parçası eksik"
-#: midx.c:154
+#: midx.c:161
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index'ten gerekli nesne ofsetleri iri parçası eksik"
-#: midx.c:170
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index paket adlarının sırasız: '%s' şundan önce: '%s'"
-#: midx.c:214
+#: midx.c:228
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "hatalı pack-int-id: %u (%u toplam paket)"
-#: midx.c:264
+#: midx.c:278
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:490
+#: midx.c:509
#, c-format
msgid "failed to add packfile '%s'"
msgstr "paket dosyası '%s' eklenemedi"
-#: midx.c:496
+#: midx.c:515
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "pack-index '%s' açılamadı"
-#: midx.c:564
+#: midx.c:583
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "%d nesnesi paket dosyasında bulunamadı"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:911
msgid "cannot store reverse index file"
msgstr "ters indeks dosyası depolanamıyor"
-#: midx.c:920
+#: midx.c:1009
+#, c-format
+msgid "could not parse line: %s"
+msgstr "satır ayrıştırılamadı: %s"
+
+#: midx.c:1011
+#, c-format
+msgid "malformed line: %s"
+msgstr "hatalı oluşturulmuş satır: %s"
+
+#: midx.c:1181
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "mevcut multi-pack-index yok sayılıyor; sağlama toplamı uyumsuzluğu"
-#: midx.c:943
+#: midx.c:1206
+msgid "could not load pack"
+msgstr "paket yüklenemedi"
+
+#: midx.c:1212
+#, c-format
+msgid "could not open index for %s"
+msgstr "%s için indeks açılamadı"
+
+#: midx.c:1223
msgid "Adding packfiles to multi-pack-index"
msgstr "Paket dosyaları multi-pack-index'e ekleniyor"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "bırakılacak pack-file %s görülmedi"
-
-#: midx.c:1034
+#: midx.c:1266
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "bilinmeyen tercih edilen paket: '%s'"
-#: midx.c:1039
+#: midx.c:1311
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "yeğlenen paket %s nesnesiz seçilemiyor"
+
+#: midx.c:1343
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "bırakılacak pack-file %s görülmedi"
+
+#: midx.c:1389
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "tercih edilen '%s' paketinin süresi geçmiş"
-#: midx.c:1055
+#: midx.c:1402
msgid "no pack files to index."
msgstr "indekslenecek paket dosyası yok."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1409
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "bir nesne olmadan multi-pack .bitmap yazımı reddediliyor"
+
+#: midx.c:1451
+msgid "could not write multi-pack bitmap"
+msgstr "çoklu paket biteşlem yazılamadı"
+
+#: midx.c:1461
+msgid "could not write multi-pack-index"
+msgstr "multi-pack-index yazılamadı"
+
+#: midx.c:1520 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "%s kaldırılamadı"
-#: midx.c:1166
+#: midx.c:1553
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "multi-pack-index %s konumunda temizlenemedi"
-#: midx.c:1225
+#: midx.c:1616
msgid "multi-pack-index file exists, but failed to parse"
msgstr "multi-pack-index dosyası mevcut, ancak ayrıştırılamadı"
-#: midx.c:1233
+#: midx.c:1624
msgid "incorrect checksum"
msgstr "yanlış sağlama toplamı"
-#: midx.c:1236
+#: midx.c:1627
msgid "Looking for referenced packfiles"
msgstr "Başvurulmuş paket dosyaları aranıyor"
-#: midx.c:1251
+#: midx.c:1642
#, 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:1256
+#: midx.c:1647
msgid "the midx contains no oid"
msgstr "midx bir oid içermiyor"
-#: midx.c:1265
+#: midx.c:1656
msgid "Verifying OID order in multi-pack-index"
msgstr "multi-pack-index içindeki OID sırası doğrulanıyor"
-#: midx.c:1274
+#: midx.c:1665
#, 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:1294
+#: midx.c:1685
msgid "Sorting objects by packfile"
msgstr "Nesneler paket dosyasına göre sıralanıyor"
-#: midx.c:1301
+#: midx.c:1692
msgid "Verifying object offsets"
msgstr "Nesne ofsetleri doğrulanıyor"
-#: midx.c:1317
+#: midx.c:1708
#, 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:1323
+#: midx.c:1714
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "paket dosyası %s için pack-index yüklenemedi"
-#: midx.c:1332
+#: midx.c:1723
#, 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:1357
+#: midx.c:1750
msgid "Counting referenced objects"
msgstr "Başvurulmuş nesneler sayılıyor"
-#: midx.c:1367
+#: midx.c:1760
msgid "Finding and deleting unreferenced packfiles"
msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor"
-#: midx.c:1558
+#: midx.c:1952
msgid "could not start pack-objects"
msgstr "pack-objects başlatılamadı"
-#: midx.c:1578
+#: midx.c:1972
msgid "could not finish pack-objects"
msgstr "pack-objects bitirilemedi"
@@ -5481,7 +5743,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "lazy_name iş parçacığı ucu birleştirilemiyor: %s"
-#: notes-merge.c:277
+#: notes-merge.c:276
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -5493,7 +5755,7 @@
"commit' veya 'git notes merge --abort' kullanarak bir önceki birleştirmeyi "
"işleyin/durdurun."
-#: notes-merge.c:284
+#: notes-merge.c:283
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Notlar birleştirmenizi sonuçlandırmadınız (%s var)."
@@ -5521,272 +5783,343 @@
msgid "Bad %s value: '%s'"
msgstr "Hatalı %s değeri: '%s'"
-#: object-file.c:526
+#: object-file.c:457
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "nesne dizini %s yok; şurayı denetleyin: .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:515
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s"
-#: object-file.c:658
+#: object-file.c:589
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: alternatif nesne depoları yok sayılıyor, iç içe geçme pek derin"
-#: object-file.c:665
+#: object-file.c:596
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "nesne dizini olağanlaştırılamıyor: %s"
-#: object-file.c:708
+#: object-file.c:639
msgid "unable to fdopen alternates lockfile"
msgstr "alternatifler kilit dosyası fdopen yapılamıyor"
-#: object-file.c:726
+#: object-file.c:657
msgid "unable to read alternates file"
msgstr "alternatifler dosyası okunamıyor"
-#: object-file.c:733
+#: object-file.c:664
msgid "unable to move new alternates file into place"
msgstr "yeni alternatifler dosyası yerine taşınamıyor"
-#: object-file.c:768
+#: object-file.c:742
#, c-format
msgid "path '%s' does not exist"
msgstr "'%s' diye bir yol yok"
-#: object-file.c:789
+#: object-file.c:763
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"Bağlantı yapılmış çıkış olarak '%s' başvuru deposu henüz desteklenmiyor."
-#: object-file.c:795
+#: object-file.c:769
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Başvuru deposu '%s' yerel bir depo değil."
-#: object-file.c:801
+#: object-file.c:775
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "başvuru deposu '%s' sığ"
-#: object-file.c:809
+#: object-file.c:783
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "başvuru deposu '%s' aşılı"
-#: object-file.c:869
+#: object-file.c:814
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "'%s' ile eşleşen nesne dizini bulunamadı"
+
+#: object-file.c:864
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "alternatif başvurular ayrıştırılırken geçersiz satır: %s"
-#: object-file.c:1019
+#: object-file.c:1014
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "%<PRIuMAX>, %<PRIuMAX> sınırı üzerinden mmap yapılmaya çalışılıyor"
-#: object-file.c:1054
+#: object-file.c:1049
#, c-format
msgid "mmap failed%s"
msgstr "mmap başarısız%s"
-#: object-file.c:1218
+#: object-file.c:1230
#, c-format
msgid "object file %s is empty"
msgstr "nesne dosyası %s boş"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1349 object-file.c:2588
#, c-format
msgid "corrupt loose object '%s'"
msgstr "hasar görmüş gevşek nesne '%s'"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1351 object-file.c:2592
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "gevşek nesne '%s' sonunda anlamsız veri"
-#: object-file.c:1397
+#: object-file.c:1473
+#, c-format
+msgid "unable to parse %s header"
+msgstr "%s üstbilgisi ayrıştırılamıyor"
+
+#: object-file.c:1475
msgid "invalid object type"
msgstr "geçersiz nesne türü"
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "%s üstbilgisi --allow-unknown-type ile açılamıyor"
-
-#: object-file.c:1484
+#: object-file.c:1486
#, c-format
msgid "unable to unpack %s header"
msgstr "%s üstbilgisi açılamıyor"
#: object-file.c:1490
#, 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"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "%s üstbilgisi pek uzun, %d bayt'ı aşıyor"
-#: object-file.c:1493
-#, c-format
-msgid "unable to parse %s header"
-msgstr "%s üstbilgisi ayrıştırılamıyor"
-
-#: object-file.c:1717
+#: object-file.c:1720
#, c-format
msgid "failed to read object %s"
msgstr "%s nesnesi okunamadı"
-#: object-file.c:1721
+#: object-file.c:1724
#, c-format
msgid "replacement %s not found for %s"
msgstr "%s yedeği %s için bulunamadı"
-#: object-file.c:1725
+#: object-file.c:1728
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasar görmüş"
-#: object-file.c:1729
+#: object-file.c:1732
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasar görmüş"
-#: object-file.c:1834
+#: object-file.c:1855
#, c-format
msgid "unable to write file %s"
msgstr "%s dosyası yazılamıyor"
-#: object-file.c:1841
+#: object-file.c:1862
#, c-format
msgid "unable to set permission to '%s'"
msgstr "'%s' ögesine izin ayarlanamıyor"
-#: object-file.c:1848
+#: object-file.c:1869
msgid "file write error"
msgstr "dosya yazım hatası"
-#: object-file.c:1868
+#: object-file.c:1904
msgid "error when closing loose object file"
msgstr "gevşek nesne dosyası kapatılırken hata"
-#: object-file.c:1933
+#: object-file.c:1971
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "%s depo veritabanına nesne eklemek için yetersiz izin"
-#: object-file.c:1935
+#: object-file.c:1973
msgid "unable to create temporary file"
msgstr "geçici dosya oluşturulamıyor"
-#: object-file.c:1959
+#: object-file.c:1997
msgid "unable to write loose object file"
msgstr "gevşek nesne dosyası yazılamıyor"
-#: object-file.c:1965
+#: object-file.c:2003
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "yeni nesne %s söndürülemiyor (%d)"
-#: object-file.c:1969
+#: object-file.c:2007
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)"
-#: object-file.c:1973
+#: object-file.c:2011
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:2022 builtin/pack-objects.c:1251
#, c-format
msgid "failed utime() on %s"
msgstr "%s üzerinde utime() başarısız"
-#: object-file.c:2060
+#: object-file.c:2100
#, c-format
msgid "cannot read object for %s"
msgstr "%s için nesne okunamıyor"
-#: object-file.c:2111
+#: object-file.c:2151
msgid "corrupt commit"
msgstr "hasar görmüş işleme"
-#: object-file.c:2119
+#: object-file.c:2159
msgid "corrupt tag"
msgstr "hasar görmüş etiket"
-#: object-file.c:2219
+#: object-file.c:2259
#, c-format
msgid "read error while indexing %s"
msgstr "%s indekslenirken okuma hatası"
-#: object-file.c:2222
+#: object-file.c:2262
#, c-format
msgid "short read while indexing %s"
msgstr "%s indekslenirken kısa read"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2335 object-file.c:2345
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: veritabanına ekleme başarısız"
-#: object-file.c:2311
+#: object-file.c:2351
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: desteklenmeyen dosya türü"
-#: object-file.c:2335
+#: object-file.c:2375 builtin/fetch.c:1494
#, c-format
msgid "%s is not a valid object"
msgstr "%s geçerli bir nesne değil"
-#: object-file.c:2337
+#: object-file.c:2377
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s geçerli bir '%s' nesnesi değil"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2404
#, c-format
msgid "unable to open %s"
msgstr "%s açılamıyor"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2599
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)"
-#: object-file.c:2583
+#: object-file.c:2622
#, c-format
msgid "unable to mmap %s"
msgstr "%s mmap yapılamadı"
-#: object-file.c:2588
+#: object-file.c:2628
#, c-format
msgid "unable to unpack header of %s"
msgstr "%s üstbilgisi açılamıyor"
-#: object-file.c:2594
+#: object-file.c:2633
#, c-format
msgid "unable to parse header of %s"
msgstr "%s üstbilgisi ayrıştırılamıyor"
-#: object-file.c:2605
+#: object-file.c:2644
#, c-format
msgid "unable to unpack contents of %s"
msgstr "%s içeriği açılamıyor"
-#: object-name.c:480
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c:382
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [hatalı nesne]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c:407
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s %s işlemesi - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c:428
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s %s etiketi - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#. "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c:439
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [hatalı etiket, ayrıştırılamadı]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c:447
+#, c-format
+msgid "%s tree"
+msgstr "%s ağacı"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c:453
+#, c-format
+msgid "%s blob"
+msgstr "%s ikili nesnesi"
+
+#: object-name.c:569
#, c-format
msgid "short object ID %s is ambiguous"
-msgstr "kısa nesne ID'si %s belirsiz"
+msgstr "kısa nesne kimliği %s belirsiz"
-#: object-name.c:491
-msgid "The candidates are:"
-msgstr "Adaylar:"
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c:591
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Adaylar:\n"
+"%s"
-#: object-name.c:790
+#: object-name.c:888
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5809,22 +6142,22 @@
"iletiyi\n"
"kapatmak için \"git config advice.objectNameWarning\" yapın."
-#: object-name.c:910
+#: object-name.c:1008
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "'%.*s' günlüğü yalnızca şuna geri gider: %s"
-#: object-name.c:918
+#: object-name.c:1016
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "'%.*s' günlüğünde yalnızca %d girdi var"
-#: object-name.c:1696
+#: object-name.c:1794
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "'%s' yolu disk üzerinde mevcut; ancak '%.*s' içinde değil"
-#: object-name.c:1702
+#: object-name.c:1800
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
@@ -5833,12 +6166,12 @@
"'%s' yolu mevcut; ancak '%s' değil\n"
"İpucu: Şunu mu demek istediniz: '%.*s:%s', nam-ı diğer '%.*s:./%s'?"
-#: object-name.c:1711
+#: object-name.c:1809
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "'%s' yolu '%.*s' içinde mevcut değil"
-#: object-name.c:1739
+#: object-name.c:1837
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
@@ -5847,7 +6180,7 @@
"'%s' yolu indekste; ancak %d numaralı alanda değil\n"
"İpucu: Şunu mu demek istediniz: ':%d:%s'?"
-#: object-name.c:1755
+#: object-name.c:1853
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
@@ -5856,21 +6189,26 @@
"'%s' yolu indekste; ancak '%s' değil\n"
"İpucu: Şunu mu demek istediniz: '%d:%s', nam-ı diğer ':%d:./%s'?"
-#: object-name.c:1763
+#: object-name.c:1861
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "'%s' yolu diskte mevcut; ancak indekste değil"
-#: object-name.c:1765
+#: object-name.c:1863
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "'%s' diye bir yol yok (ne diskte ne de indekste)"
-#: object-name.c:1778
+#: object-name.c:1876
msgid "relative path syntax can't be used outside working tree"
msgstr "göreceli yol sözdizimi çalışma ağacı dışında kullanılamaz"
-#: object-name.c:1916
+#: object-name.c:1901
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<nesne>:<yol> gerekiyor, yalnızca <nesne> '%s' verildi"
+
+#: object-name.c:2014
#, c-format
msgid "invalid object name '%.*s'."
msgstr "geçersiz nesne adı: '%.*s'"
@@ -5895,17 +6233,30 @@
msgid "unable to parse object: %s"
msgstr "nesne ayrıştırılamıyor: %s"
-#: object.c:283 object.c:295
+#: object.c:283 object.c:294
#, c-format
msgid "hash mismatch %s"
msgstr "sağlama uyuşmazlığı %s"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "çoklu paket biteşlemi gereken ters indeksi içermiyor"
+
+#: pack-bitmap.c:433
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: paket açılamadı"
+
+#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
#, c-format
msgid "unable to get size of %s"
msgstr "%s boyutu alınamıyor"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1937
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "%s, %s paketi %<PRIuMAX> ofsetinde bulunamadı"
+
+#: pack-bitmap.c:1973 builtin/rev-list.c:91
#, c-format
msgid "unable to get disk usage of %s"
msgstr "%s ögesinin disk kullanımı alınamıyor"
@@ -5935,129 +6286,134 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "%s reverse-index dosyasının sağlama numarası %<PRIu32> desteklenmiyor"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "ters indeks dosyası hem yazılıp hem doğrulanamıyor"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "dosya bilgileri alınamadı: %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "%s, yazılabilir yapılamadı"
-#: pack-write.c:522
+#: pack-write.c:521
#, c-format
msgid "could not write '%s' promisor file"
msgstr "vaat dosyası '%s' yazılamadı"
-#: packfile.c:625
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)"
-#: packfile.c:655
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "paket dosyası %s eşlemlenemiyor%s"
-#: packfile.c:1934
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "ofset %s için paket indeksinin başlangıcından önce (hasarlı indeks?)"
-#: packfile.c:1938
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "ofset %s için paket indeksinin sonundan ötede (kırpılmış index?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, 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
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "hatalı oluşturulmuş son kullanım tarihi '%s'"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "'%s' seçeneği \"always\", \"auto\" veya \"never\" bekliyor"
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "hatalı oluşturulmuş nesne adı '%s'"
-#: parse-options.c:38
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "'%s' seçeneği \"%s\" veya \"%s\" bekliyor"
+
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s bir değer gerektiriyor"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s, %s ile uyumsuz"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s: başka bir şeyle uyumsuz"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s bir değer almıyor"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s kullanılabilir değil"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s negatif olmayan bir tamsayı bekliyor, isteğe bağlı k/m/g eki ile"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "belirsiz seçenek: %s (--%s%s veya --%s%s olabilir)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "şunu mu demek istediniz: '--%s' (iki tire ile)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "şunun arması: --%s"
-#: parse-options.c:879
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "bilinmeyen seçenek '%s'"
-#: parse-options.c:881
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "bilinmeyen anahtar '%c'"
-#: parse-options.c:883
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "dizi içinde bilinmeyen ascii dışı seçenek: '%s'"
-#: parse-options.c:907
+#: parse-options.c:920
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "kullanım: %s"
@@ -6065,47 +6421,71 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " veya: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-SAYI"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "%s grup ile yazılabilir yapılamadı"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Kaçış karakteri '\\' attr değerindeki son karakter olarak kullanılamaz"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Yalnızca bir 'attr:' belirtimine izin verilir."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
-msgstr "attr belirteci boş olmamalı"
+msgstr "attr belirteci boş bırakılmamalı"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "geçersiz öznitelik adı %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "global 'glob' ve 'noglob' yol belirteci ayarları birbiriyle uyumsuz"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6113,51 +6493,51 @@
"global 'literal' yol belirteci ayarı diğer tüm global yol belirteci "
"ayarlarıyla uyumsuz"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "yol belirteci sihri 'prefix' için geçersiz parametre"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Geçersiz yol belirteci sihri '%.*s' (%s içinde)"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "'%s' içindeki yol belirteci sihrinin sonunda eksik ')'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Yerine getirilmemiş yol belirteci sihri '%c' ('%s' içinde)"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' ve 'glob' birbiriyle uyumsuz"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s', '%s' konumunda depo dışında"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (belleten: '%c')"
-#: pathspec.c:552
+#: pathspec.c:551
#, 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:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "yol belirteci '%s' bir sembolik bağın ötesinde"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "satırda hatalı tırnaklar: %s"
@@ -6178,7 +6558,7 @@
msgid "flush packet write failed"
msgstr "floş paketi yazımı başarısız"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "protokol hatası: olanaksız uzun satır"
@@ -6186,7 +6566,7 @@
msgid "packet write with format failed"
msgstr "biçimlendirilmiş paket yazımı başarısız"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr "paket yazımı başarısız - veri olabilecek en çok paket boyutunu aşıyor"
@@ -6195,25 +6575,25 @@
msgid "packet write failed: %s"
msgstr "paket yazımı başarısız: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "okuma hatası"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "uzak konum beklenmedik bir biçimde hattı kapattı"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "protokol hatası: hatalı satır uzunluğu karakteri: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "protokol hatası: hatalı satır uzunluğu %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "uzak konum hatası: %s"
@@ -6227,21 +6607,21 @@
msgid "unable to create threaded lstat: %s"
msgstr "iş parçacıklarına ayrılmış 'lstat' oluşturulamıyor: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "--pretty biçimi ayrıştırılamıyor"
#: promisor-remote.c:31
msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote: getirme altişlemi çatallanamıyor"
+msgstr "promisor-remote: getirme alt süreci çatallanamıyor"
#: promisor-remote.c:38 promisor-remote.c:40
msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "promisor-remote: getirme altişlemine yazılamıyor"
+msgstr "promisor-remote: getirme alt sürecine yazılamıyor"
#: promisor-remote.c:44
msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr "promisor-remote: altişlemi getirmek için stdin kapatılamıyor"
+msgstr "promisor-remote: alt sürecine getirmek için stdin kapatılamıyor"
#: promisor-remote.c:54
#, c-format
@@ -6256,20 +6636,20 @@
msgid "Removing duplicate objects"
msgstr "Yinelenmiş nesneler kaldırılıyor"
-#: range-diff.c:78
+#: range-diff.c:68
msgid "could not start `log`"
msgstr "'log' başlatılamadı"
-#: range-diff.c:80
+#: range-diff.c:70
msgid "could not read `log` output"
msgstr "'log' çıktısı okunamadı"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:98 sequencer.c:5575
#, c-format
msgid "could not parse commit '%s'"
msgstr "'%s' işlemesi ayrıştırılamadı"
-#: range-diff.c:115
+#: range-diff.c:109
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6277,69 +6657,65 @@
msgstr ""
"'log' çıktısının ilk satırı ayrıştırılamadı: 'commit ' ile başlamıyor: '%s'"
-#: range-diff.c:140
+#: range-diff.c:132
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "git üstbilgisi '%.*s' ayrıştırılamadı"
-#: range-diff.c:307
+#: range-diff.c:300
msgid "failed to generate diff"
msgstr "diff oluşturulamadı"
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only ve --right-only birlikte kullanılmaz"
-
-#: range-diff.c:562 range-diff.c:564
+#: range-diff.c:558 range-diff.c:560
#, c-format
msgid "could not parse log for '%s'"
msgstr "'%s' günlüğü ayrıştırılamadı"
-#: read-cache.c:710
+#: read-cache.c:737
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "dosya arması '%s' eklenmeyecek ('%s' indekste halihazırda var)"
-#: read-cache.c:726
+#: read-cache.c:753
msgid "cannot create an empty blob in the object database"
msgstr "nesne veritabanında boş ikili bir nesne oluşturulamıyor"
-#: read-cache.c:748
+#: read-cache.c:775
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s: yalnızca sıradan dosyalar, sembolik bağlar ve git dizinleri eklenebilir"
-#: read-cache.c:753
+#: read-cache.c:780 builtin/submodule--helper.c:3359
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' çıkışı yapılmış bir işlemeye iye değil"
-#: read-cache.c:805
+#: read-cache.c:832
#, c-format
msgid "unable to index file '%s'"
msgstr "'%s' dosyası indekslenemiyor"
-#: read-cache.c:824
+#: read-cache.c:851
#, c-format
msgid "unable to add '%s' to index"
msgstr "'%s' indekse eklenemiyor"
-#: read-cache.c:835
+#: read-cache.c:862
#, c-format
msgid "unable to stat '%s'"
msgstr "'%s' dosyasının bilgileri alınamıyor"
-#: read-cache.c:1358
+#: read-cache.c:1404
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' hem bir dosya hem de bir dizin olarak görünüyor"
-#: read-cache.c:1573
+#: read-cache.c:1619
msgid "Refresh index"
msgstr "İndeks yenileniyor"
-#: read-cache.c:1705
+#: read-cache.c:1751
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6348,7 +6724,7 @@
"index.version ayarlanmış; ancak değer geçersiz.\n"
"%i sürümü kullanılıyor"
-#: read-cache.c:1715
+#: read-cache.c:1761
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6357,143 +6733,147 @@
"GIT_INDEX_VERSION ayarlanmış; ancak değer geçersiz.\n"
"%i sürümü kullanılıyor"
-#: read-cache.c:1771
+#: read-cache.c:1817
#, c-format
msgid "bad signature 0x%08x"
msgstr "hatalı imza 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1820
#, c-format
msgid "bad index version %d"
msgstr "hatalı indeks sürümü %d"
-#: read-cache.c:1783
+#: read-cache.c:1829
msgid "bad index file sha1 signature"
msgstr "hatalı indeks dosyası sha1 imzası"
-#: read-cache.c:1817
+#: read-cache.c:1863
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "indeks bizim anlamadığımız %.4s imzası kullanıyor"
-#: read-cache.c:1819
+#: read-cache.c:1865
#, c-format
msgid "ignoring %.4s extension"
msgstr "%.4s uzantısı yok sayılıyor"
-#: read-cache.c:1856
+#: read-cache.c:1902
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "bilinmeyen indeks girdisi biçimi 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1918
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "indekste hatalı oluşturulmuş ad alanı, '%s' yolu yakınında"
-#: read-cache.c:1929
+#: read-cache.c:1975
msgid "unordered stage entries in index"
msgstr "indekste sırasız hazırlama alanı girdileri"
-#: read-cache.c:1932
+#: read-cache.c:1978
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "birleştirilmiş dosya '%s' için çoklu hazırlama alanı girdileri"
-#: read-cache.c:1935
+#: read-cache.c:1981
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' için sırasız hazırlama alanı girdileri"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
+#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
+#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
+#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
+#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
+#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
msgid "index file corrupt"
msgstr "indeks dosyası hasar görmüş"
-#: read-cache.c:2185
+#: read-cache.c:2240
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "load_cache_entries iş parçacığı oluşturulamıyor: %s"
-#: read-cache.c:2198
+#: read-cache.c:2253
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "load_cache_entries iş parçacığı ucu birleştirilemiyor: %s"
-#: read-cache.c:2231
+#: read-cache.c:2286
#, c-format
msgid "%s: index file open failed"
msgstr "%s: indeks dosyası açılamadı"
-#: read-cache.c:2235
+#: read-cache.c:2290
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: açık indeksin bilgileri alınamıyor"
-#: read-cache.c:2239
+#: read-cache.c:2294
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: indeks dosyası beklenenden daha küçük"
-#: read-cache.c:2243
+#: read-cache.c:2298
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: indeks dosyası eşlemlenemiyor%s"
-#: read-cache.c:2286
+#: read-cache.c:2341
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "load_index_extensions iş parçacığı oluşturulamıyor: %s"
-#: read-cache.c:2313
+#: read-cache.c:2368
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "load_index_extensions iş parçacığı ucu birleştirilemiyor: %s"
-#: read-cache.c:2351
+#: read-cache.c:2414
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "paylaşılan indeks '%s' tazelenemedi"
-#: read-cache.c:2398
+#: read-cache.c:2473
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "bozuk indeks, %s bekleniyordu (%s içinde), %s alındı"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3032
+msgid "cannot write split index for a sparse index"
+msgstr "bir aralıklı indeks için bölünmüş indeks yazılamıyor"
+
+#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
#, c-format
msgid "could not close '%s'"
msgstr "'%s' kapatılamadı"
-#: read-cache.c:3075
+#: read-cache.c:3157
msgid "failed to convert to a sparse-index"
msgstr "bir sparse-index'e dönüştürülemedi"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3228
#, c-format
msgid "could not stat '%s'"
msgstr "'%s' bilgileri alınamadı"
-#: read-cache.c:3159
+#: read-cache.c:3241
#, c-format
msgid "unable to open git dir: %s"
msgstr "git dizini açılamıyor: %s"
-#: read-cache.c:3171
+#: read-cache.c:3253
#, c-format
msgid "unable to unlink: %s"
msgstr "bağlantı kesilemiyor: %s"
-#: read-cache.c:3200
+#: read-cache.c:3282
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "'%s' üzerindeki izin bitleri onarılamıyor"
-#: read-cache.c:3349
+#: read-cache.c:3439
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor"
@@ -6570,7 +6950,7 @@
msgstr[0] "%s ögesini %s üzerine yeniden temellendir (%d komut)"
msgstr[1] "%s ögesini %s üzerine yeniden temellendir (%d komut)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6579,7 +6959,7 @@
"Hiçbir satırı kaldırmayın. Bir işlemeyi kaldırmak için 'drop'u açıkça "
"kullanın.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6587,7 +6967,7 @@
"\n"
"Buradaki bir satırı kaldırırsanız İŞLEME KAYBOLUR.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6602,7 +6982,7 @@
"\tgit rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6612,14 +6992,14 @@
"Ancak tümünü kaldırırsanız yeniden temellendirme iptal edilecektir.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
+#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
+#: builtin/rebase.c:191
#, c-format
msgid "could not write '%s'"
msgstr "'%s' yazılamadı"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "'%s' yazılamadı."
@@ -6650,14 +7030,12 @@
"Kullanılabilir davranışlar: ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "'%s' okunamadı."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve'in yerini 'merges' aldı"
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2057
msgid "gone"
msgstr "gitti"
@@ -6676,258 +7054,239 @@
msgid "ahead %d, behind %d"
msgstr "%d önünde, %d arkasında"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "beklenen biçim: %%(color:<renk>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "tanımlanamayan renk: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Tamsayı değeri şunu bekliyordu: refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Tamsayı değeri şunu bekliyordu: refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "tanımlanamayan %%(%s) argümanı: %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) argüman almıyor"
-#: ref-filter.c:339
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "tanımlanamayan %%(objectsize) argümanı: %s"
-
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) argüman almıyor"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) argüman almıyor"
-#: ref-filter.c:372
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "tanımlanamayan %%(subject) argümanı: %s"
-
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "%%(trailers:key=<değer>) bekleniyordu"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "bilinmeyen %%(trailers) argümanı: %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "pozitif değer şunu bekliyordu: contents:lines=%s"
-#: ref-filter.c:426
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "tanımlanamayan %%(contents) argümanı: %s"
-
-#: ref-filter.c:441
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "pozitif değer şurada '%s' bekliyordu: %%(%s)"
-#: ref-filter.c:445
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "şurada tanımlanamayan argüman '%s': %%(%s)"
-
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "tanımlanamayan e-posta seçeneği: %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "beklenen biçim: %%(align:<genişlik>,<konum>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "tanımlanamayan konum:%s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "tanımlanamayan genişlik:%s"
-#: ref-filter.c:517
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "tanımlanamayan %%(align) argümanı: %s"
-
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "pozitif genişlik %%(align) ögeciği ile birlikte bekleniyordu"
-#: ref-filter.c:543
+#: ref-filter.c:568
#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "tanımlanamayan %%(if) argümanı: %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) argüman almıyor"
-#: ref-filter.c:645
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "hatalı oluşturulmuş alan adı: %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "bilinmeyen alan adı: %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"bir git deposu değil; ancak '%.*s' alanı nesne verisine erişim gerektiriyor"
-#: ref-filter.c:801
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "biçim: %%(if) ögeciği bir %%(then) ögeciği olmadan kullanıldı"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "biçim: %%(%s) ögeciği bir %%(%s) ögeciği olmadan kullanıldı"
-#: ref-filter.c:865
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "biçim: %%(then) ögeciği bir %%(if) ögeciği olmadan kullanıldı"
-
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "biçim: %%(then) ögeciği birden çok kez kullanıldı"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "biçim: %%(then) ögeciği %%(else) ögeciğinden sonra kullanıldı"
-#: ref-filter.c:897
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "biçim: %%(else) ögeciği bir %%(if) ögeciği olmadan kullanıldı"
-
-#: ref-filter.c:899
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "biçim: %%(else) ögeciği bir %%(then) ögeciği olmadan kullanıldı"
-
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "biçim: %%(else) ögeciği birden çok kez kullanıldı"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "biçim: %%(end) ögeciği eş ögeciği olmadan kullanıldı"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "hatalı oluşturulmuş biçim dizisi %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "bu komut atom %%(%.*s) reddediyor"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s, --python, --shell ve --tcl ile kullanılamaz"
+
+#: ref-filter.c:1707
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(dal yok, %s yeniden temellendiriliyor)"
-#: ref-filter.c:1624
+#: ref-filter.c:1710
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(dal yok, ayrık HEAD %s yeniden temellendiriliyor)"
-#: ref-filter.c:1627
+#: ref-filter.c:1713
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(dal yok, ikili arama %s üzerinde başladı)"
-#: ref-filter.c:1631
+#: ref-filter.c:1717
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD, %s konumunda ayrıldı)"
-#: ref-filter.c:1634
+#: ref-filter.c:1720
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD, %s ögesinden ayrıldı)"
-#: ref-filter.c:1637
+#: ref-filter.c:1723
msgid "(no branch)"
msgstr "(dal yok)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1755 ref-filter.c:1973
#, c-format
msgid "missing object %s for %s"
msgstr "eksik nesne %s (%s için)"
-#: ref-filter.c:1679
+#: ref-filter.c:1765
#, 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:2064
+#: ref-filter.c:2156
#, c-format
msgid "malformed object at '%s'"
msgstr "'%s' konumunda hatalı oluşturulmuş nesne"
-#: ref-filter.c:2153
+#: ref-filter.c:2246
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "bozuk ada iye %s başvurusu yok sayılıyor"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2251 refs.c:672
#, c-format
msgid "ignoring broken ref %s"
msgstr "bozuk başvuru %s yok sayılıyor"
-#: ref-filter.c:2502
+#: ref-filter.c:2630
#, c-format
msgid "format: %%(end) atom missing"
msgstr "biçim: %%(end) ögeciği eksik"
-#: ref-filter.c:2596
+#: ref-filter.c:2741
#, c-format
msgid "malformed object name %s"
msgstr "hatalı oluşturulmuş nesne adı %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2746
#, c-format
msgid "option `%s' must point to a commit"
msgstr "'%s' bir işlemeye işaret etmeli"
-#: refs.c:264
+#: reflog.c:407
+#, c-format
+msgid "not a reflog: %s"
+msgstr "bir başvuru günlüğü değil: %s"
+
+#: reflog.c:410
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "'%s' için başvuru günlüğü yok"
+
+#: 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:566
+#: refs.c:561
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6947,38 +7306,39 @@
"\n"
"\tgit config --global init.defaultBranch <ad>\n"
"\n"
-"'master' yerine kullanılan diğer yaygın dal adları 'main', 'trunk' ve/veya\n"
-"'development'tır. Yeni oluşturulan dal şu komutla yeniden adlandırılabilir:\n"
+"'master' yerine kullanılan diğer yaygın dal adları 'main', 'trunk'\n"
+"ve/veya 'development'tır. Yeni oluşturulan dal şu komutla yeniden\n"
+"adlandırılabilir:\n"
"\n"
"\tgit branch -m <ad>\n"
-#: refs.c:588
+#: refs.c:583
#, c-format
msgid "could not retrieve `%s`"
msgstr "'%s' alınamadı"
-#: refs.c:598
+#: refs.c:593
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "geçersiz dal adı: %s = %s"
-#: refs.c:674
+#: refs.c:670
#, c-format
msgid "ignoring dangling symref %s"
msgstr "sarkan sembolik başvuru %s yok sayılıyor"
-#: refs.c:922
+#: refs.c:919
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "%s başvurusu için olan günlükte %s sonrasında boşluk var"
-#: refs.c:929
+#: refs.c:926
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
"%s başvurusu için olan günlük %s konumunda beklenmedik bir biçimde sonlandı"
-#: refs.c:994
+#: refs.c:991
#, c-format
msgid "log for %s is empty"
msgstr "%s için olan günlük boş"
@@ -6988,46 +7348,46 @@
msgid "refusing to update ref with bad name '%s'"
msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor"
-#: refs.c:1157
+#: refs.c:1164
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "'%s' başvurusu için update_ref başarısız oldu: %s"
-#: refs.c:2051
+#: refs.c:2059
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor"
-#: refs.c:2131
+#: refs.c:2145
msgid "ref updates forbidden inside quarantine environment"
msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
-#: refs.c:2142
+#: refs.c:2156
msgid "ref updates aborted by hook"
msgstr "başvuru güncellemeleri kanca tarafından iptal edildi"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2264 refs.c:2294
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' mevcut; '%s' oluşturulamıyor"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2270 refs.c:2305
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "'%s' ve '%s' aynı anda işlenemiyor"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1295
#, c-format
msgid "could not remove reference %s"
msgstr "%s başvurusu kaldırılamadı"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1310 refs/packed-backend.c:1565
+#: refs/packed-backend.c:1575
#, c-format
msgid "could not delete reference %s: %s"
msgstr "%s başvurusu silinemedi: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1313 refs/packed-backend.c:1578
#, c-format
msgid "could not delete references: %s"
msgstr "başvurular silinemedi: %s"
@@ -7037,50 +7397,50 @@
msgid "invalid refspec '%s'"
msgstr "geçersiz başvuru belirteci '%s'"
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "uzak konum yapılandırma stenografisi '/' ile başlayamaz: %s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "birden fazla receivepack verildi, birincisi kullanılıyor"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "birden fazla uploadpack verildi, birincisi kullanılıyor"
-#: remote.c:590
+#: remote.c:698
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Hem %s hem %s şuraya getirilemiyor: %s"
-#: remote.c:594
+#: remote.c:702
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s genelde %s ögesini izler, %s değil"
-#: remote.c:598
+#: remote.c:706
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s hem %s hem %s ögelerini izler"
-#: remote.c:666
+#: remote.c:774
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "dizginin '%s' anahtarında '*' yoktu"
-#: remote.c:676
+#: remote.c:784
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "dizginin '%s' değerinde '*' yok"
-#: remote.c:1083
+#: remote.c:1191
#, 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:1088
+#: remote.c:1196
#, c-format
msgid "src refspec %s matches more than one"
msgstr "kaynak başvuru belirteci %s birden fazlası ile eşleşiyor"
@@ -7089,7 +7449,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1211
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -7113,7 +7473,7 @@
"Hiçbiri işe yaramadı, biz de bıraktık. Başvuruyu tam olarak "
"nitelendirmelisiniz."
-#: remote.c:1123
+#: remote.c:1231
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -7124,7 +7484,7 @@
"'%s:refs/heads/%s' konumuna iterek yeni bir dal mı\n"
"oluşturmak istediniz?"
-#: remote.c:1128
+#: remote.c:1236
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -7135,7 +7495,7 @@
"'%s:refs/tags/%s' konumuna iterek yeni bir etiket mi\n"
"oluşturmak istediniz?"
-#: remote.c:1133
+#: remote.c:1241
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -7146,7 +7506,7 @@
"'%s:refs/tags/%s' konumuna iterek yeni bir ağaç mı\n"
"etiketlemek istediniz?"
-#: remote.c:1138
+#: remote.c:1246
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -7157,114 +7517,114 @@
"'%s:refs/tags/%s' konumuna iterek yeni ikili bir nesne mi\n"
"etiketlemek istediniz?"
-#: remote.c:1174
+#: remote.c:1282
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s dala çözülemiyor"
-#: remote.c:1185
+#: remote.c:1293
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "'%s' silinemiyor: uzak başvuru yok"
-#: remote.c:1197
+#: remote.c:1305
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "birden çok hedef başvuru belirteci %s eşleşmesi"
-#: remote.c:1204
+#: remote.c:1312
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "hedef başvurusu %s birden çok kaynaktan alıyor"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1833 remote.c:1940
msgid "HEAD does not point to a branch"
msgstr "HEAD bir dala işaret etmiyor"
-#: remote.c:1733
+#: remote.c:1842
#, c-format
msgid "no such branch: '%s'"
msgstr "böyle bir dal yok: '%s'"
-#: remote.c:1736
+#: remote.c:1845
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "'%s' dalı için üstkaynak yapılandırılmamış"
-#: remote.c:1742
+#: remote.c:1851
#, 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:1757
+#: remote.c:1866
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "'%s' itme hedefinin ('%s' uzak konumunda) yerel izleme dalı yok"
-#: remote.c:1769
+#: remote.c:1881
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "'%s' dalının itme için uzak konumu yok"
-#: remote.c:1779
+#: remote.c:1891
#, 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:1792
+#: remote.c:1904
msgid "push has no destination (push.default is 'nothing')"
msgstr "itilecek bir hedef yok (push.default: 'nothing')"
-#: remote.c:1814
+#: remote.c:1926
msgid "cannot resolve 'simple' push to a single destination"
msgstr "tek bir konuma 'simple' itme çözülemiyor"
-#: remote.c:1943
+#: remote.c:2059
#, c-format
msgid "couldn't find remote ref %s"
msgstr "%s uzak başvurusu bulunamadı"
-#: remote.c:1956
+#: remote.c:2072
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Eğlenceli başvuru '%s' yerel olarak yok sayılıyor"
-#: remote.c:2119
+#: remote.c:2235
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Dalınız '%s' temelli; ancak üstkaynak kaybolmuş.\n"
-#: remote.c:2123
+#: remote.c:2239
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (düzeltmek için \"git branch --unset-upstream\" kullan)\n"
-#: remote.c:2126
+#: remote.c:2242
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Dalınız '%s' ile güncel.\n"
-#: remote.c:2130
+#: remote.c:2246
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Sizin dalınız ve '%s' başka işlemelere başvuruyor.\n"
-#: remote.c:2133
+#: remote.c:2249
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (ayrıntılar için \"%s\" kullanın)\n"
-#: remote.c:2137
+#: remote.c:2253
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Dalınız '%s' dalından %d işleme ileride.\n"
msgstr[1] "Dalınız '%s' dalından %d işleme ileride.\n"
-#: remote.c:2143
+#: remote.c:2259
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (yerel işlemelerinizi yayımlamak için \"git push\" kullanın)\n"
-#: remote.c:2146
+#: remote.c:2262
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -7272,11 +7632,11 @@
msgstr[0] "Dalınız '%s' dalından %d işleme geride ve ileri sarılabilir.\n"
msgstr[1] "Dalınız '%s' dalından %d işleme geride ve ileri sarılabilir.\n"
-#: remote.c:2154
+#: remote.c:2270
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:2157
+#: remote.c:2273
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -7291,11 +7651,11 @@
"Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n"
"her birinde %d ve %d işleme var.\n"
-#: remote.c:2167
+#: remote.c:2283
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:2359
+#: remote.c:2475
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "beklenen nesne adı '%s' ayrıştırılamıyor"
@@ -7328,130 +7688,121 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "'%s' yazılırken hatalar vardı (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr "'%s' floş yapılamadı"
-#: rerere.c:487 rerere.c:1023
+#: rerere.c:487 rerere.c:1024
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "'%s' içindeki çakışan parçalar ayrıştırılamadı"
-#: rerere.c:668
+#: rerere.c:669
#, c-format
msgid "failed utime() on '%s'"
msgstr "'%s' üzerinde utime() başarısız"
-#: rerere.c:678
+#: rerere.c:679
#, c-format
msgid "writing '%s' failed"
msgstr "'%s' yazılamadı"
-#: rerere.c:698
+#: rerere.c:699
#, c-format
msgid "Staged '%s' using previous resolution."
-msgstr "'%s' bir önceki çözüm kullanılarak hazırlama alanına alındı"
+msgstr "'%s' bir önceki çözüm kullanılarak hazırlama alanına alındı."
-#: rerere.c:737
+#: rerere.c:738
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "'%s' için çözüm kaydedildi."
-#: rerere.c:772
+#: rerere.c:773
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "'%s' bir önceki çözüm kullanılarak çözüldü."
-#: rerere.c:787
+#: rerere.c:788
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "'%s' başıboşunun bağlantısı kesilemiyor"
-#: rerere.c:791
+#: rerere.c:792
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "'%s' için öngörüntü kaydedildi"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
+#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
#, c-format
msgid "could not create directory '%s'"
msgstr "'%s' dizini oluşturulamadı"
-#: rerere.c:1041
+#: rerere.c:1042
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "'%s' içindeki çakışan durum güncellenemedi"
-#: rerere.c:1052 rerere.c:1059
+#: rerere.c:1053 rerere.c:1060
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "'%s' için hatırlanan çözüm yok"
-#: rerere.c:1061
+#: rerere.c:1062
#, c-format
msgid "cannot unlink '%s'"
msgstr "'%s' bağlantısı kesilemiyor"
-#: rerere.c:1071
+#: rerere.c:1072
#, c-format
msgid "Updated preimage for '%s'"
msgstr "'%s' için öngörüntü güncellendi"
-#: rerere.c:1080
+#: rerere.c:1081
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "'%s' için çözüm unutuldu\n"
-#: rerere.c:1191
+#: rerere.c:1192
msgid "unable to open rr-cache directory"
msgstr "rr-cache dizini açılamıyor"
-#: reset.c:42
+#: reset.c:112
msgid "could not determine HEAD revision"
msgstr "HEAD revizyonu saptanamadı"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:141 reset.c:147 sequencer.c:3696
#, c-format
msgid "failed to find tree of %s"
msgstr "%s ögesinin ağacı bulunamadı"
-#: revision.c:2344
+#: revision.c:2358
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<paketdosyası> artık desteklenmiyor"
-#: revision.c:2684
+#: revision.c:2712
msgid "your current branch appears to be broken"
msgstr "geçerli dalınız bozuk gibi görünüyor"
-#: revision.c:2687
+#: revision.c:2715
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "geçerli dalınız '%s' içinde henüz bir işleme yok"
-#: revision.c:2893
+#: revision.c:2901
+msgid "object filtering requires --objects"
+msgstr "nesne süzme --objects gerektiriyor"
+
+#: revision.c:2918
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L, -p ve -s dışında başka diff biçimlerini henüz desteklemiyor"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "/dev/null açılamadı"
-
-#: run-command.c:1274
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "async iş parçacığı oluşturulamadı: %s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"'%s' kancası yok sayıldı; çünkü bir çalıştırılabilir olarak ayarlanmamış.\n"
-"Bu uyarıyı 'git config advice.ignoredHook false' ile kapatabilirsiniz."
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr "uzak konum açım durumu okunurken beklenmedik floş paketi"
@@ -7470,23 +7821,23 @@
msgid "failed to sign the push certificate"
msgstr "itme sertifikası imzalanamadı"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
-msgstr "send-pack: getirme altişlemi çatallanamıyor"
+msgstr "send-pack: getirme alt süreci çatallanamıyor"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "itme pazarlığı başarısız; yine de itme olmadan sürdürülüyor"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "alıcı uç bu deponun sağlama algoritmasını desteklemiyor"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "alıcı uç --signed itmeyi desteklemiyor"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7494,47 +7845,48 @@
"alıcı uç --signed itmeyi desteklemediğinden dolayı bir itme sertifikası "
"gönderilmiyor"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "alıcı uç --atomic itmeyi desteklemiyor"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "alıcı uç itme seçeneklerini desteklemiyor"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "geçersiz işleme iletisi temizleme kipi '%s'"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "'%s' silinemedi"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "'%s' kaldırılamadı"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "geri al"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "seç-al"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "yeniden temellendirme"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "bilinmeyen eylem: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7542,53 +7894,81 @@
"çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n"
"veya 'git rm <yollar>' ile imleyin"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n"
-"veya 'git rm <yollar>' ile imleyin ve çıkan sonucu\n"
-"'git commit' ile işleyin"
+"Çakışmaları çözdükten sonra onları şu komutla imleyin:\n"
+"\"git add/rm <yolblrtç>\", sonrasında şunu çalıştırın:\n"
+"\"git cherry-pick --continue\".\n"
+"Bunun yerine bu işlemeyi \"git cherry-pick --skip\" ile\n"
+"atlayabilirsiniz. İptal edip \"git cherry-pick\" öncesine\n"
+"geri dönmek için \"git cherry-pick --abort\" çalıştırın."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Çakışmaları çözdükten sonra onları şu komutla imleyin:\n"
+"\"git add/rm <yolblrtç>\", sonrasında şunu çalıştırın:\n"
+"\"git revert --continue\".\n"
+"Bunun yerine bu işlemeyi \"git revert --skip\" ile\n"
+"atlayabilirsiniz. İptal edip \"git revert\" öncesine\n"
+"geri dönmek için \"git revert --abort\" çalıştırın."
+
+#: sequencer.c:448 sequencer.c:3288
#, c-format
msgid "could not lock '%s'"
msgstr "'%s' kilitlenemedi"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
+#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
#, c-format
msgid "could not write to '%s'"
msgstr "şuraya yazılamadı: '%s'"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "satır sonu şuraya yazılamadı: '%s'"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3565
#, c-format
msgid "failed to finalize '%s'"
msgstr "'%s' tamamlanamadı"
-#: sequencer.c:486
+#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
+#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
+#, c-format
+msgid "could not read '%s'"
+msgstr "'%s' okunamadı"
+
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "%s ile yerel değişikliklerinizin üzerine yazılacaktır."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "İlerlemek için değişikliklerinizi işleyin veya zulalayın."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: ileri sar"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:615
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Geçersiz temizlik kipi %s"
@@ -7596,65 +7976,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Yeni indeks dosyası yazılamıyor"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "önbellek ağacı güncellenemiyor"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "HEAD işlemesi çözülemedi"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "'%.*s' içinde bir anahtar yok"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "'%s' ögesinin tırnakları kaldırılamıyor"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
+#: builtin/am.c:849 builtin/rebase.c:699
#, c-format
msgid "could not open '%s' for reading"
msgstr "'%s' okuma için açılamadı"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' halihazırda verilmiş"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' halihazırda verilmiş"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' halihazırda verilmiş"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "bilinmeyen değişken '%s'"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' eksik"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' eksik"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' eksik"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7684,11 +8064,11 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' başarısız oldu"
-#: sequencer.c:1218
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7714,7 +8094,7 @@
"\n"
"\tgit commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7738,343 +8118,344 @@
"\n"
"\tgit commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1287
msgid "couldn't look up newly created commit"
msgstr "yeni yapılan işleme aranamadı"
-#: sequencer.c:1275
+#: sequencer.c:1289
msgid "could not parse newly created commit"
msgstr "yeni yapılan işleme ayrıştırılamadı"
-#: sequencer.c:1321
+#: sequencer.c:1336
msgid "unable to resolve HEAD after creating commit"
msgstr "HEAD, işleme yapıldıktan sonra çözülemiyor"
-#: sequencer.c:1323
+#: sequencer.c:1338
msgid "detached HEAD"
msgstr "ayrık HEAD"
-#: sequencer.c:1327
+#: sequencer.c:1342
msgid " (root-commit)"
msgstr " (kök işleme)"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "could not parse HEAD"
msgstr "HEAD ayrıştırılamadı"
-#: sequencer.c:1350
+#: sequencer.c:1365
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s bir işleme değil"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "HEAD işlemesi ayrıştırılamadı"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1425 sequencer.c:2310
msgid "unable to parse commit author"
msgstr "işleme yazarı ayrıştırılamıyor"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "git write-tree bir ağaca yazamadı"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1469 sequencer.c:1589
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "'%s' konumundan işleme iletisi okunamıyor"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1500 sequencer.c:1532
#, c-format
msgid "invalid author identity '%s'"
msgstr "geçersiz yazar kimliği '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1506
msgid "corrupt author: missing date information"
msgstr "hasar görmüş yazar: tarih bilgisi eksik"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
+#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "işleme nesnesi yazılamadı"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "%s güncellenemedi"
-#: sequencer.c:1606
+#: sequencer.c:1621
#, c-format
msgid "could not parse commit %s"
msgstr "%s işlemesi ayrıştırılamadı"
-#: sequencer.c:1611
+#: sequencer.c:1626
#, c-format
msgid "could not parse parent commit %s"
msgstr "üst işleme %s ayrıştırılamadı"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1709 sequencer.c:1990
#, c-format
msgid "unknown command: %d"
msgstr "bilinmeyen komut: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1751
msgid "This is the 1st commit message:"
msgstr "Birinci işleme iletisi bu:"
-#: sequencer.c:1737
+#: sequencer.c:1752
#, c-format
msgid "This is the commit message #%d:"
msgstr "İşleme iletisi #%d bu:"
-#: sequencer.c:1738
+#: sequencer.c:1753
msgid "The 1st commit message will be skipped:"
msgstr "Birinci işlemenin iletisi atlanacak:"
-#: sequencer.c:1739
+#: sequencer.c:1754
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "İşleme iletisi #%d atlanacak:"
-#: sequencer.c:1740
+#: sequencer.c:1755
#, c-format
msgid "This is a combination of %d commits."
msgstr "Bu %d işlemenin bir birleşimi."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1902 sequencer.c:1959
#, c-format
msgid "cannot write '%s'"
msgstr "'%s' yazılamıyor"
-#: sequencer.c:1934
+#: sequencer.c:1949
msgid "need a HEAD to fixup"
msgstr "düzeltmek için bir HEAD gerekiyor"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1951 sequencer.c:3592
msgid "could not read HEAD"
msgstr "HEAD okunamadı"
-#: sequencer.c:1938
+#: sequencer.c:1953
msgid "could not read HEAD's commit message"
msgstr "HEAD'in işleme iletisi okunamadı"
-#: sequencer.c:1962
+#: sequencer.c:1977
#, c-format
msgid "could not read commit message of %s"
msgstr "%s işleme iletisi okunamadı"
-#: sequencer.c:2072
+#: sequencer.c:2087
msgid "your index file is unmerged."
msgstr "indeks dosyanız birleştirilmemiş"
-#: sequencer.c:2079
+#: sequencer.c:2094
msgid "cannot fixup root commit"
msgstr "kök işleme düzeltilemiyor"
-#: sequencer.c:2098
+#: sequencer.c:2113
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "%s işlemesi bir birleştirme; ancak bir -m seçeneği verilmedi."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2121 sequencer.c:2129
#, c-format
msgid "commit %s does not have parent %d"
msgstr "%s işlemesinin %d diye bir üst ögesi yok"
-#: sequencer.c:2120
+#: sequencer.c:2135
#, c-format
msgid "cannot get commit message for %s"
msgstr "%s işlemesinin iletisi alınamıyor"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2154
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: üst işleme %s ayrıştırılamıyor"
-#: sequencer.c:2205
+#: sequencer.c:2220
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "'%s', '%s' olarak yeniden adlandırılamadı"
-#: sequencer.c:2265
+#: sequencer.c:2280
#, c-format
msgid "could not revert %s... %s"
msgstr "%s geri alınamadı... %s"
-#: sequencer.c:2266
+#: sequencer.c:2281
#, c-format
msgid "could not apply %s... %s"
msgstr "%s uygulanamadı... %s"
-#: sequencer.c:2287
+#: sequencer.c:2302
#, 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:2345
+#: sequencer.c:2360
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: indeks okunamadı"
-#: sequencer.c:2352
+#: sequencer.c:2368
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: indeks yenilenemedi"
-#: sequencer.c:2425
+#: sequencer.c:2448
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s argüman kabul etmiyor: '%s'"
-#: sequencer.c:2434
+#: sequencer.c:2457
#, c-format
msgid "missing arguments for %s"
msgstr "%s için eksik argüman"
-#: sequencer.c:2477
+#: sequencer.c:2500
#, c-format
msgid "could not parse '%s'"
msgstr "'%s' ayrıştırılamadı"
-#: sequencer.c:2538
+#: sequencer.c:2561
#, c-format
msgid "invalid line %d: %.*s"
msgstr "geçersiz satır %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2572
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "öncesinde bir işleme olmadan '%s' yapılamıyor"
-#: sequencer.c:2635
+#: sequencer.c:2620 builtin/rebase.c:185
+#, c-format
+msgid "could not read '%s'."
+msgstr "'%s' okunamadı."
+
+#: sequencer.c:2658
msgid "cancelling a cherry picking in progress"
msgstr "sürmekte olan bir seç-al iptal ediliyor"
-#: sequencer.c:2644
+#: sequencer.c:2667
msgid "cancelling a revert in progress"
msgstr "sürmekte olan bir geri al iptal ediliyor"
-#: sequencer.c:2690
+#: sequencer.c:2707
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "lütfen bunu 'git rebase --edit-todo' kullanarak onarın."
-#: sequencer.c:2692
+#: sequencer.c:2709
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "kullanılabilir olmayan yönerge tablosu: '%s'"
-#: sequencer.c:2697
+#: sequencer.c:2714
msgid "no commits parsed."
msgstr "Hiçbir işleme ayrıştırılmadı."
-#: sequencer.c:2708
+#: sequencer.c:2725
msgid "cannot cherry-pick during a revert."
msgstr "bir geri al sırasında seç-al yapılamıyor"
-#: sequencer.c:2710
+#: sequencer.c:2727
msgid "cannot revert during a cherry-pick."
msgstr "bir seç-al sırasında geri al yapılamıyor"
-#: sequencer.c:2788
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "%s için geçersiz değer: %s"
-
-#: sequencer.c:2897
+#: sequencer.c:2914
msgid "unusable squash-onto"
msgstr "kullanılabilir olmayan squash-onto"
-#: sequencer.c:2917
+#: sequencer.c:2934
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3029 sequencer.c:4875
msgid "empty commit set passed"
msgstr "boş işleme seti aktarıldı"
-#: sequencer.c:3029
+#: sequencer.c:3046
msgid "revert is already in progress"
msgstr "geri al halihazırda sürüyor"
-#: sequencer.c:3031
+#: sequencer.c:3048
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin"
-#: sequencer.c:3034
+#: sequencer.c:3051
msgid "cherry-pick is already in progress"
msgstr "seç-al halihazırda sürüyor"
-#: sequencer.c:3036
+#: sequencer.c:3053
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin"
-#: sequencer.c:3050
+#: sequencer.c:3067
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "ardıştırıcı dizini '%s' oluşturulamadı"
-#: sequencer.c:3065
+#: sequencer.c:3082
msgid "could not lock HEAD"
msgstr "HEAD kilitlenemedi"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3142 sequencer.c:4585
msgid "no cherry-pick or revert in progress"
msgstr "süren bir seç-al veya geri al yok"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3144 sequencer.c:3155
msgid "cannot resolve HEAD"
msgstr "HEAD çözülemiyor"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3146 sequencer.c:3190
msgid "cannot abort from a branch yet to be born"
msgstr "daha doğmamış bir daldan iptal edilemiyor"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
+#: builtin/grep.c:774
#, c-format
msgid "cannot open '%s'"
msgstr "'%s' açılamıyor"
-#: sequencer.c:3161
+#: sequencer.c:3178
#, c-format
msgid "cannot read '%s': %s"
msgstr "'%s' okunamıyor: %s"
-#: sequencer.c:3162
+#: sequencer.c:3179
msgid "unexpected end of file"
msgstr "beklenmedik dosya sonu"
-#: sequencer.c:3168
+#: sequencer.c:3185
#, 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:3179
+#: sequencer.c:3196
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:3220
+#: sequencer.c:3237
msgid "no revert in progress"
msgstr "süren bir geri al yok"
-#: sequencer.c:3229
+#: sequencer.c:3246
msgid "no cherry-pick in progress"
msgstr "süren bir seç-al yok"
-#: sequencer.c:3239
+#: sequencer.c:3256
msgid "failed to skip the commit"
msgstr "işleme atlanamadı"
-#: sequencer.c:3246
+#: sequencer.c:3263
msgid "there is nothing to skip"
msgstr "atlanacak bir şey yok"
-#: sequencer.c:3249
+#: sequencer.c:3266
#, c-format
msgid ""
"have you committed already?\n"
@@ -8083,16 +8464,16 @@
"İşlemeyi yaptınız mı?\n"
"\"git %s --continue\" deneyin.\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3428 sequencer.c:4476
msgid "cannot read HEAD"
msgstr "HEAD okunamıyor"
-#: sequencer.c:3428
+#: sequencer.c:3445
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "'%s', '%s' konumuna kopyalanamıyor"
-#: sequencer.c:3436
+#: sequencer.c:3453
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8111,27 +8492,27 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3463
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "%s uygulanamıyor... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3470
#, c-format
msgid "Could not merge %.*s"
msgstr "%.*s birleştirilemedi"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "'%s', '%s' konumuna kopyalanamadı"
-#: sequencer.c:3483
+#: sequencer.c:3499
#, c-format
msgid "Executing: %s\n"
msgstr "Çalıştırılıyor: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3510
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8146,11 +8527,11 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3516
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:3510
+#: sequencer.c:3522
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8167,90 +8548,90 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3582
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "izin verilmeyen etiket adı: '%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3655
msgid "writing fake root commit"
msgstr "sahte kök işlemesi yazılıyor"
-#: sequencer.c:3650
+#: sequencer.c:3660
msgid "writing squash-onto"
msgstr "squash-onto yazılıyor"
-#: sequencer.c:3734
+#: sequencer.c:3739
#, c-format
msgid "could not resolve '%s'"
msgstr "'%s' çözülemedi"
-#: sequencer.c:3767
+#: sequencer.c:3771
msgid "cannot merge without a current revision"
msgstr "güncel bir revizyon olmadan birleştirilemiyor"
-#: sequencer.c:3789
+#: sequencer.c:3793
#, c-format
msgid "unable to parse '%.*s'"
msgstr "'%.*s' ayrıştırılamıyor"
-#: sequencer.c:3798
+#: sequencer.c:3802
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "birleştirilecek bir şey yok: '%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3814
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:3826
+#: sequencer.c:3869
#, c-format
msgid "could not get commit message of '%s'"
msgstr "'%s' işlemesinin işleme iletisi alınamadı"
-#: sequencer.c:4009
+#: sequencer.c:4013
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'"
-#: sequencer.c:4025
+#: sequencer.c:4029
msgid "merge: Unable to write new index file"
msgstr "merge: Yeni indeks dosyası yazılamıyor"
-#: sequencer.c:4099
+#: sequencer.c:4110
msgid "Cannot autostash"
msgstr "Kendiliğinden zulalanamıyor"
-#: sequencer.c:4102
+#: sequencer.c:4113
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Beklenmedik zula yanıtı: '%s'"
-#: sequencer.c:4108
+#: sequencer.c:4119
#, c-format
msgid "Could not create directory for '%s'"
msgstr "'%s' için dizin oluşturulamadı"
-#: sequencer.c:4111
+#: sequencer.c:4122
#, c-format
msgid "Created autostash: %s\n"
msgstr "Zula kendiliğinden oluşturuldu: %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4124
msgid "could not reset --hard"
msgstr "'reset --hard' yapılamadı"
-#: sequencer.c:4140
+#: sequencer.c:4148
#, c-format
msgid "Applied autostash.\n"
msgstr "Kendiliğinden zulalama uygulandı.\n"
-#: sequencer.c:4152
+#: sequencer.c:4160
#, c-format
msgid "cannot store %s"
msgstr "%s depolanamıyor"
-#: sequencer.c:4155
+#: sequencer.c:4163
#, c-format
msgid ""
"%s\n"
@@ -8261,29 +8642,29 @@
"Değişiklikleriniz zulada güvende.\n"
"İstediğiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n"
-#: sequencer.c:4160
+#: sequencer.c:4168
msgid "Applying autostash resulted in conflicts."
msgstr "Kendiliğinden zulalama çakışmalara neden oldu."
-#: sequencer.c:4161
+#: sequencer.c:4169
msgid "Autostash exists; creating a new stash entry."
msgstr "Kendiliğinden zulalama mevcut; yeni bir zula girdisi oluşturuluyor."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4225
msgid "could not detach HEAD"
msgstr "HEAD ayrılamadı"
-#: sequencer.c:4248
+#: sequencer.c:4240
#, c-format
msgid "Stopped at HEAD\n"
msgstr "HEAD'de duruldu\n"
-#: sequencer.c:4250
+#: sequencer.c:4242
#, c-format
msgid "Stopped at %s\n"
msgstr "%s konumunda duruldu\n"
-#: sequencer.c:4258
+#: sequencer.c:4274
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8304,58 +8685,58 @@
"\tgit rebase --edit-todo\n"
"\tgit rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4320
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Yeniden temellendiriliyor: (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4366
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "%s konumunda durdu... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4436
#, c-format
msgid "unknown command %d"
msgstr "bilinmeyen komut %d"
-#: sequencer.c:4480
+#: sequencer.c:4484
msgid "could not read orig-head"
msgstr "orig-head okunamadı"
-#: sequencer.c:4485
+#: sequencer.c:4489
msgid "could not read 'onto'"
msgstr "'onto' okunamadı"
-#: sequencer.c:4499
+#: sequencer.c:4503
#, c-format
msgid "could not update HEAD to %s"
msgstr "HEAD şu konuma güncellenemedi: %s"
-#: sequencer.c:4559
+#: sequencer.c:4563
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "%s başarıyla yeniden temellendirildi ve güncellendi.\n"
-#: sequencer.c:4611
+#: sequencer.c:4615
msgid "cannot rebase: You have unstaged changes."
msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
-#: sequencer.c:4620
+#: sequencer.c:4624
msgid "cannot amend non-existing commit"
msgstr "var olmayan işleme değiştirilemiyor"
-#: sequencer.c:4622
+#: sequencer.c:4626
#, c-format
msgid "invalid file: '%s'"
msgstr "geçersiz dosya: '%s'"
-#: sequencer.c:4624
+#: sequencer.c:4628
#, c-format
msgid "invalid contents: '%s'"
msgstr "geçersiz içerik: '%s'"
-#: sequencer.c:4627
+#: sequencer.c:4631
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8365,59 +8746,68 @@
"Çalışma ağacınızda işlenmemiş değişiklikleriniz var. Lütfen önce\n"
"onları işleyin ve ardından 'git rebase --continue' yapın."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4667 sequencer.c:4706
#, c-format
msgid "could not write file: '%s'"
msgstr "dosya yazılamadı: '%s'"
-#: sequencer.c:4718
+#: sequencer.c:4722
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "CHERRY_PICK_HEAD kaldırılamadı"
-#: sequencer.c:4725
+#: sequencer.c:4732
msgid "could not commit staged changes."
msgstr "Hazırlanmış değişiklikler işlenemedi."
-#: sequencer.c:4845
+#: sequencer.c:4852
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: Bir %s seçip alınamıyor"
-#: sequencer.c:4849
+#: sequencer.c:4856
#, c-format
msgid "%s: bad revision"
msgstr "%s hatalı revizyon"
-#: sequencer.c:4884
+#: sequencer.c:4891
msgid "can't revert as initial commit"
msgstr "ilk işleme geri alınamaz"
-#: sequencer.c:5361
+#: sequencer.c:5162 sequencer.c:5391
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "daha önce uygulanan %s işlemesi atlandı"
+
+#: sequencer.c:5232 sequencer.c:5407
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "atlanan işlemeleri içermek için --reapply-cherry-picks kullanın"
+
+#: sequencer.c:5378
msgid "make_script: unhandled options"
msgstr "make_script: ele alınmayan seçenekler"
-#: sequencer.c:5364
+#: sequencer.c:5381
msgid "make_script: error preparing revisions"
msgstr "make_script: revizyonlar hazırlanırken hata"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5639 sequencer.c:5656
msgid "nothing to do"
msgstr "yapılacak bir şey yok"
-#: sequencer.c:5650
+#: sequencer.c:5675
msgid "could not skip unnecessary pick commands"
msgstr "gerekli olmayan seçim komutları atlanamadı"
-#: sequencer.c:5750
+#: sequencer.c:5775
msgid "the script was already rearranged."
msgstr "betik halihazırda yeniden düzenlenmişti"
-#: setup.c:133
+#: setup.c:135
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s', '%s' konumunda depo dışında"
-#: setup.c:185
+#: setup.c:187
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -8426,7 +8816,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:198
+#: setup.c:200
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8438,12 +8828,12 @@
"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
"'git <komut> [<revizyon>...] -- [<dosya>...]'"
-#: setup.c:264
+#: setup.c:266
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "'%s' seçeneği seçenek olmayan argümanlardan önce gelmeli"
-#: setup.c:283
+#: setup.c:285
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -8454,100 +8844,100 @@
"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
"'git <komut> [<revizyon>...] -- [<dosya>...]'"
-#: setup.c:419
+#: setup.c:421
msgid "unable to set up work tree using invalid config"
msgstr "geçersiz yapılandırma kullanılarak çalışma ağacı kurulamıyor"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:425 builtin/rev-parse.c:895
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:658
+#: setup.c:724
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Beklenen git repo sürümü <= %d, %d bulundu"
-#: setup.c:666
+#: setup.c:732
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "bilinmeyen depo genişletmesi bulundu:"
msgstr[1] "bilinmeyen depo genişletmeleri bulundu:"
-#: setup.c:680
+#: setup.c:746
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "depo sürümü 0; ancak v1'e özel genişletme bulundu:"
msgstr[1] "depo sürümü 0; ancak v1'e özel genişletmeler bulundu:"
-#: setup.c:701
+#: setup.c:767
#, c-format
msgid "error opening '%s'"
msgstr "'%s' açılırken hata"
-#: setup.c:703
+#: setup.c:769
#, 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:705
+#: setup.c:771
#, c-format
msgid "error reading %s"
msgstr "%s okunurken hata"
-#: setup.c:707
+#: setup.c:773
#, c-format
msgid "invalid gitfile format: %s"
msgstr "geçersiz gitfile biçimi: %s"
-#: setup.c:709
+#: setup.c:775
#, c-format
msgid "no path in gitfile: %s"
msgstr "gitfile içinde yol yok: %s"
-#: setup.c:711
+#: setup.c:777
#, c-format
msgid "not a git repository: %s"
msgstr "bir git deposu değil: %s"
-#: setup.c:813
+#: setup.c:879
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' çok büyük"
-#: setup.c:827
+#: setup.c:893
#, c-format
msgid "not a git repository: '%s'"
msgstr "bir git deposu değil: '%s'"
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:922 setup.c:924 setup.c:955
#, c-format
msgid "cannot chdir to '%s'"
msgstr "'%s' konumuna chdir yapılamıyor"
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
msgid "cannot come back to cwd"
msgstr "cwd'ye geri dönülemiyor"
-#: setup.c:988
+#: setup.c:1054
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "'%*s%s%s' bilgileri alınamadı"
-#: setup.c:1231
+#: setup.c:1338
msgid "Unable to read current working directory"
msgstr "Şu anki çalışma dizini okunamıyor"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1347 setup.c:1353
#, c-format
msgid "cannot change to '%s'"
msgstr "şuraya değiştirilemiyor: '%s'"
-#: setup.c:1251
+#: setup.c:1358
#, 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:1257
+#: setup.c:1364
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -8557,7 +8947,20 @@
"Dosya sistemi sınırında duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"ayarlanmamış)."
-#: setup.c:1381
+#: setup.c:1374
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"güvensiz depo ('%s' sahibi bir başkası)\n"
+"Bu dizin için bir istisna eklemek için şunu çağırın:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#: setup.c:1502
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8566,69 +8969,61 @@
"core.sharedRepository dosya kipi değeri ile sorun (0%.3o).\n"
"Dosyaların sahibinin her zaman okuma ve yazma izni olması gerekir."
-#: setup.c:1430
-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:1445
+#: setup.c:1564
msgid "fork failed"
msgstr "çatallama başarısız"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1569
msgid "setsid failed"
msgstr "setsid başarısız"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "koni kipi olmadan sparse-index kullanılmaya çalışılıyor"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "önbellek ağacı güncellenemiyor, dolu kalınıyor"
-
-#: sparse-index.c:263
+#: sparse-index.c:285
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "indeks girdisi bir dizin; ancak aralıklı değil (%08x)"
+#: split-index.c:9
+msgid "cannot use split index with a sparse index"
+msgstr "bir aralıklı indeksle bölünmüş indeks kullanılamıyor"
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:852
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u GiB/sn"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:860
+#: strbuf.c:861
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:862
+#: strbuf.c:863
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u MiB/sn"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:869
+#: strbuf.c:870
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:871
+#: strbuf.c:872
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u KiB/sn"
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:877
+#: strbuf.c:878
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8636,85 +9031,85 @@
msgstr[1] "%u bayt"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
+#: strbuf.c:880
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u bayt/sn"
msgstr[1] "%u bayt/sn"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
+#: builtin/rebase.c:653
#, c-format
msgid "could not open '%s' for writing"
msgstr "'%s' yazma için açılamadı"
-#: strbuf.c:1177
+#: strbuf.c:1196
#, c-format
msgid "could not edit '%s'"
msgstr "'%s' düzenlenemedi"
-#: submodule-config.c:237
+#: submodule-config.c:238
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "kuşku doğuran altmodül yok sayılıyor: %s"
-#: submodule-config.c:304
+#: submodule-config.c:305
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "submodule.fetchjobs için negatif değerlere izin verilmiyor"
-#: submodule-config.c:402
+#: submodule-config.c:403
#, 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
+#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
#, c-format
-msgid "invalid value for %s"
-msgstr "%s için geçersiz değer"
+msgid "invalid value for '%s'"
+msgstr "'%s' için geçersiz değer"
-#: submodule-config.c:766
+#: submodule-config.c:828
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ".gitmodules girdisi %s güncellenemedi"
-#: submodule.c:114 submodule.c:143
+#: submodule.c:115 submodule.c:144
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Birleştirilmemiş .gitmodules değiştirilemiyor, önce birleştirme "
"çakışmalarını çözün"
-#: submodule.c:118 submodule.c:147
+#: submodule.c:119 submodule.c:148
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr ".gitmodules içinde path=%s olan bölüm bulunamadı"
-#: submodule.c:154
+#: submodule.c:155
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "%s için .gitmodules girdisi kaldırılamadı"
-#: submodule.c:165
+#: submodule.c:166
msgid "staging updated .gitmodules failed"
msgstr "güncellenmiş .gitmodules'u hazırlama başarısız oldu"
-#: submodule.c:328
+#: submodule.c:346
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "içi doldurulmamış '%s' altmodülünde"
-#: submodule.c:359
+#: submodule.c:377
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Yol belirteci '%s' '%.*s' altmodülünde"
-#: submodule.c:436
+#: submodule.c:454
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "hatalı --ignore-submodules argümanı: %s"
-#: submodule.c:805
+#: submodule.c:866
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8723,12 +9118,12 @@
"%s işlemesinde '%s' yolunda bulunan altmodül, aynı adlı bir altmodülle "
"çarpışıyor. Atlanıyor."
-#: submodule.c:908
+#: submodule.c:987
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "altmodül girdisi '%s' (%s) bir %s, işleme değil"
-#: submodule.c:993
+#: submodule.c:1069
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8737,36 +9132,46 @@
"'%s' altmodülünde 'git rev-list <commits> --not --remotes -n 1' "
"çalıştırılamadı"
-#: submodule.c:1116
+#: submodule.c:1192
#, c-format
msgid "process for submodule '%s' failed"
msgstr "'%s' altmodülü için işlem başarısız oldu"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
msgid "Failed to resolve HEAD as a valid ref."
msgstr "HEAD geçerli bir başvuru olarak çözülemedi."
-#: submodule.c:1156
+#: submodule.c:1232
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "'%s' altmodülü itiliyor\n"
-#: submodule.c:1159
+#: submodule.c:1235
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "'%s' altmodülü itilemiyor\n"
-#: submodule.c:1451
+#: submodule.c:1567
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "%s%s altmodülü getiriliyor\n"
-#: submodule.c:1485
+#: submodule.c:1589
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "'%s' altmodülüne erişilemedi\n"
-#: submodule.c:1640
+#: submodule.c:1618
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "'%s' altmodülüne %s işlemesinde erişilemedi\n"
+
+#: submodule.c:1629
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "%s%s altmodülü %s işlemesinde getiriliyor\n"
+
+#: submodule.c:1849
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8775,78 +9180,78 @@
"Altmodül getirilirken hata:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1874
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' bir git deposu olarak tanımlanamadı"
-#: submodule.c:1682
+#: submodule.c:1891
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "'%s' altmodülü içinde 'git status --porcelain=2' çalıştırılamadı"
-#: submodule.c:1723
+#: submodule.c:1932
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'%s' altmodülü içinde 'git status --porcelain=2' başarısız oldu"
-#: submodule.c:1798
+#: submodule.c:2007
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "'%s' altmodülü içinde 'git status' başlatılamadı"
-#: submodule.c:1811
+#: submodule.c:2020
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "'%s' altmodülü içinde 'git status' çalıştırılamadı"
-#: submodule.c:1826
+#: submodule.c:2037
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "'%s' altmodülü içinde core.worktree ayarı kapatılamadı"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:2064 submodule.c:2379
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "'%s' altmodülüne özyinelenemedi"
-#: submodule.c:1874
+#: submodule.c:2086
msgid "could not reset submodule index"
msgstr "altmodül indeksi sıfırlanamadı"
-#: submodule.c:1916
+#: submodule.c:2128
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "'%s' altmodülü indeksi kirli"
-#: submodule.c:1968
+#: submodule.c:2182
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "'%s' altmodülü güncellenemedi."
-#: submodule.c:2036
+#: submodule.c:2250
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "altmodül git dizini '%s', '%.*s' git dizini içinde"
-#: submodule.c:2057
+#: submodule.c:2271
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
"relocate_gitdir birden çok çalışma ağaçlı '%s' altmodülü için desteklenmiyor"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2283 submodule.c:2343
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "'%s' altmodülü adı aranamadı"
-#: submodule.c:2073
+#: submodule.c:2287
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "'%s' ögesini mevcut bir git dizinine taşıma reddediliyor"
-#: submodule.c:2080
+#: submodule.c:2293
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8857,11 +9262,11 @@
"şuradan: '%s'\n"
"şuraya: '%s'\n"
-#: submodule.c:2208
+#: submodule.c:2424
msgid "could not start ls-files in .."
msgstr "ls-files şurada başlatılamadı .."
-#: submodule.c:2248
+#: submodule.c:2464
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı"
@@ -8882,8 +9287,8 @@
msgid "unknown value '%s' for key '%s'"
msgstr "bilinmeyen değer '%s' ('%s' anahtarı için)"
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
+#: builtin/remote.c:328
#, c-format
msgid "more than one %s"
msgstr "birden çok %s"
@@ -8898,11 +9303,11 @@
msgid "could not read input file '%s'"
msgstr "'%s' girdi dosyası okunamadı"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
msgid "could not read from stdin"
msgstr "stdin'den okunamadı"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:760
#, c-format
msgid "could not stat %s"
msgstr "%s dosya bilgileri alınamadı"
@@ -8970,7 +9375,7 @@
msgid "error while running fast-import"
msgstr "fast-import çalıştırılırken hata"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1254
#, c-format
msgid "could not read ref %s"
msgstr "%s başvurusu okunamadı"
@@ -8988,7 +9393,7 @@
msgid "invalid remote service path"
msgstr "geçersiz uzak konum servis yolu"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1496
msgid "operation not supported by protocol"
msgstr "işlem protokol tarafından desteklenmiyor"
@@ -8997,72 +9402,72 @@
msgid "can't connect to subservice %s"
msgstr "%s altservisine bağlanılamıyor"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:415
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only protokolün ikinci sürümünü gerektiriyor"
-#: transport-helper.c:755
+#: transport-helper.c:758
msgid "'option' without a matching 'ok/error' directive"
msgstr "eşleşen bir 'tamam/hata' direktifi olmadan 'option'"
-#: transport-helper.c:798
+#: transport-helper.c:801
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "tamam/hata bekleniyordu, yardımcı şunu söyledi: '%s'"
-#: transport-helper.c:855
+#: transport-helper.c:862
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "yardımcı %s beklenmedik durumu bildirdi"
-#: transport-helper.c:938
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support dry-run"
msgstr "%s yardımcısı 'dry-run' desteklemiyor"
-#: transport-helper.c:941
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed"
msgstr "%s yardımcısı --signed desteklemiyor"
-#: transport-helper.c:944
+#: transport-helper.c:951
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "%s yardımcısı --signed=if-asked desteklemiyor"
-#: transport-helper.c:949
+#: transport-helper.c:956
#, c-format
msgid "helper %s does not support --atomic"
msgstr "%s yardımcısı --atomic desteklemiyor"
-#: transport-helper.c:953
+#: transport-helper.c:960
#, c-format
msgid "helper %s does not support --%s"
msgstr "%s yardımcısı --%s desteklemiyor"
-#: transport-helper.c:960
+#: transport-helper.c:967
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "%s yardımcısı 'push-option' desteklemiyor"
-#: transport-helper.c:1060
+#: transport-helper.c:1067
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper itme desteklemiyor; başvuru belirteci gerekli"
-#: transport-helper.c:1065
+#: transport-helper.c:1072
#, c-format
msgid "helper %s does not support 'force'"
msgstr "%s yardımcısı 'force' desteklemiyor"
-#: transport-helper.c:1112
+#: transport-helper.c:1119
msgid "couldn't run fast-export"
msgstr "fast-export çalıştırılamadı"
-#: transport-helper.c:1117
+#: transport-helper.c:1124
msgid "error while running fast-export"
msgstr "fast-export çalıştırılırken hata"
-#: transport-helper.c:1142
+#: transport-helper.c:1149
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9071,52 +9476,52 @@
"Ortak başvuru yok ve hiç belirtilmemiş; bir şey yapılmayacak.\n"
"Belki de bir dal belirtmelisiniz.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1231
#, c-format
msgid "unsupported object format '%s'"
msgstr "desteklenmeyen nesne biçimi '%s'"
-#: transport-helper.c:1233
+#: transport-helper.c:1240
#, c-format
msgid "malformed response in ref list: %s"
msgstr "başvuru listesinde hatalı oluşturulmuş yanıt: %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1392
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) başarısız oldu"
-#: transport-helper.c:1412
+#: transport-helper.c:1419
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) başarısız oldu"
-#: transport-helper.c:1461
+#: transport-helper.c:1468
#, c-format
msgid "%s thread failed"
msgstr "%s iş parçacığı başarısız oldu"
-#: transport-helper.c:1465
+#: transport-helper.c:1472
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s iş parçacığı eklenemedi: %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1491 transport-helper.c:1495
#, 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:1525
+#: transport-helper.c:1532
#, c-format
msgid "%s process failed to wait"
msgstr "%s işlemi bekleyemedi"
-#: transport-helper.c:1529
+#: transport-helper.c:1536
#, c-format
msgid "%s process failed"
msgstr "%s işlemi başarısız oldu"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1554 transport-helper.c:1563
msgid "can't start thread for copying data"
msgstr "veri kopyalama için iş parçacığı başlatılamıyor"
@@ -9125,51 +9530,51 @@
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "'%s' üst kaynağı '%s' (kaynak: '%s') olarak ayarlanacak\n"
-#: transport.c:145
+#: transport.c:138
#, c-format
msgid "could not read bundle '%s'"
msgstr "'%s' demeti okunamadı"
-#: transport.c:223
+#: transport.c:234
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: Geçersiz derinlik seçeneği '%s'"
-#: transport.c:275
+#: transport.c:289
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:276
+#: transport.c:290
msgid "server options require protocol version 2 or later"
msgstr "sunucu seçenekleri protokol sürüm 2 veya sonrasını gerektirir"
-#: transport.c:403
+#: transport.c:418
msgid "server does not support wait-for-done"
msgstr "Sunucu, wait-for-done desteklemiyor"
-#: transport.c:755
+#: transport.c:770
msgid "could not parse transport.color.* config"
msgstr "transport.color.* yapılandırması ayrıştırılamadı"
-#: transport.c:830
+#: transport.c:845
msgid "support for protocol v2 not implemented yet"
msgstr "protokol v2 desteği henüz yerine getirilmedi"
-#: transport.c:965
+#: transport.c:978
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "'%s' yapılandırması için bilinmeyen değer: %s"
-#: transport.c:1031
+#: transport.c:1044
#, c-format
msgid "transport '%s' not allowed"
msgstr "'%s' taşıyıcısına izin verilmiyor"
-#: transport.c:1084
+#: transport.c:1093
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync artık desteklenmiyor"
-#: transport.c:1187
+#: transport.c:1196
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9178,7 +9583,7 @@
"Aşağıdaki altmodül yolları başka hiçbir uzak konumda bulunamayan\n"
"değişiklikler içeriyor:\n"
-#: transport.c:1191
+#: transport.c:1200
#, c-format
msgid ""
"\n"
@@ -9205,11 +9610,11 @@
"kullanın.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1208
msgid "Aborting."
-msgstr "İptal ediliyor"
+msgstr "İptal ediliyor."
-#: transport.c:1346
+#: transport.c:1354
msgid "failed to push all needed submodules"
msgstr "gereken tüm altmodüller itilemedi"
@@ -9229,7 +9634,7 @@
msgid "too-short tree file"
msgstr "ağaç dosyası çok kısa"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9238,7 +9643,7 @@
"Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
"%%sLütfen dal değiştirmeden önce değişikliklerinizi işleyin veya zulalayın."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9247,7 +9652,7 @@
"Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine 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 merge:\n"
@@ -9257,7 +9662,7 @@
"yazılacak:\n"
"%%sLütfen birleştirmeden önce değişikliklerinizi işleyin veya zulalayın."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9267,7 +9672,7 @@
"yazılacak:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9276,7 +9681,7 @@
"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
"%%sLütfen %s yapmadan önce değişikliklerinizi işleyin veya zulalayın."
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9285,7 +9690,7 @@
"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -9294,7 +9699,16 @@
"Aşağıdaki dizinleri güncellemek içlerindeki izlenmeyen dosyaları kaybeder:\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Geçerli çalışma dizinini kaldırma reddediliyor:\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9303,7 +9717,7 @@
"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9312,7 +9726,7 @@
"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9321,7 +9735,7 @@
"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:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9330,7 +9744,7 @@
"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9339,18 +9753,18 @@
"%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:148
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
-"%%s"
-
#: unpack-trees.c:154
#, c-format
msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
+"%%s"
+
+#: unpack-trees.c:160
+#, c-format
+msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%sPlease move or remove them before you switch branches."
@@ -9359,7 +9773,7 @@
"yazılacak:\n"
"%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9370,7 +9784,7 @@
"yazılacak:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9380,7 +9794,7 @@
"yazılacak:\n"
"%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9390,7 +9804,7 @@
"yazılacak:\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9399,7 +9813,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:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9408,12 +9822,12 @@
"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "'%s' girdisi '%s' ile üst üste biniyor. Bağlanamıyor."
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -9422,7 +9836,7 @@
"Altmodül güncellenemiyor:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -9432,7 +9846,7 @@
"Aşağıdaki yollar güncel değil ve seyrek dizgilere rağmen terk edilmiş:\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9441,7 +9855,7 @@
"Aşağıdaki yollar birleştirilmemiş ve seyrek dizgilere rağmen terk edilmiş:\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -9452,12 +9866,12 @@
"güncellenmedi:\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "İptal ediliyor\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9466,11 +9880,11 @@
"Yukarıdaki yolları onardıktan sonra 'git sparse-checkout reapply' yapmak "
"isteyebilirsiniz.\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "Dosyalar güncelleniyor"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -9480,16 +9894,16 @@
"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:1618
+#: unpack-trees.c:1664
msgid "Updating index flags"
msgstr "İndeks bayrakları güncelleniyor"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2925
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr "çalışma ağacı ve izlenmeyen işlemenin yinelenmiş girdileri var: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1579
msgid "expected flush after fetch arguments"
msgstr "getir argümanlarından sonra floş bekleniyordu"
@@ -9526,113 +9940,137 @@
msgid "Fetching objects"
msgstr "Nesneler getiriliyor"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "'%s' okunamadı"
-#: worktree.c:303
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "ana çalışma ağacındaki '%s' depo dizini değil"
-#: worktree.c:314
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "'%s' dosyası çalışma ağacı konumuna olan tam yolu içermiyor"
-#: worktree.c:326
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' mevcut değil"
-#: worktree.c:332
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' bir .git dosyası değil, hata kodu %d"
-#: worktree.c:341
+#: worktree.c:342
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' şuna geri işaret etmiyor: '%s'"
-#: worktree.c:603
+#: worktree.c:600
msgid "not a directory"
msgstr "bir dizin değil"
-#: worktree.c:612
+#: worktree.c:609
msgid ".git is not a file"
msgstr ".git bir dosya değil"
-#: worktree.c:614
+#: worktree.c:611
msgid ".git file broken"
msgstr ".git dosyası bozuk"
-#: worktree.c:616
+#: worktree.c:613
msgid ".git file incorrect"
msgstr ".git dosyası doğru değil"
-#: worktree.c:722
+#: worktree.c:719
msgid "not a valid path"
msgstr "geçerli bir yol değil"
-#: worktree.c:728
+#: worktree.c:725
msgid "unable to locate repository; .git is not a file"
msgstr "depo konumu bulunamıyor: .git bir dosya değil"
-#: worktree.c:732
+#: worktree.c:729
msgid "unable to locate repository; .git file does not reference a repository"
msgstr "depo konumu bulunamıyor: .git dosyası bir depoya başvurmuyor"
-#: worktree.c:736
+#: worktree.c:733
msgid "unable to locate repository; .git file broken"
msgstr "depo konumu bulunamıyor: .git dosyası bozuk"
-#: worktree.c:742
+#: worktree.c:739
msgid "gitdir unreadable"
msgstr "okunamayan gitdir"
-#: worktree.c:746
+#: worktree.c:743
msgid "gitdir incorrect"
msgstr "doğru olmayan gitdir"
-#: worktree.c:771
+#: worktree.c:768
msgid "not a valid directory"
msgstr "geçerli bir dizin değil"
-#: worktree.c:777
+#: worktree.c:774
msgid "gitdir file does not exist"
msgstr "gitdir dosyası mevcut değil"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:779 worktree.c:788
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "gitdir dosyası (%s) okunamıyor"
-#: worktree.c:801
+#: worktree.c:798
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "az okundu (%<PRIuMAX> bayt bekleniyordu, %<PRIuMAX> okundu)"
-#: worktree.c:809
+#: worktree.c:806
msgid "invalid gitdir file"
msgstr "geçersiz gitdir dosyası"
-#: worktree.c:817
+#: worktree.c:814
msgid "gitdir file points to non-existent location"
msgstr "gitdir dosyası var olmayan bir konuma işaret ediyor"
-#: wrapper.c:197 wrapper.c:367
+#: worktree.c:830
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "%s, '%s' içinde ayarlanamıyor"
+
+#: worktree.c:832
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "%s, '%s' içinde ayarı kaldırılamıyor"
+
+#: worktree.c:852
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı"
+
+#: wrapper.c:161
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "setenv '%s' yapılamadı"
+
+#: wrapper.c:213
+#, c-format
+msgid "unable to create '%s'"
+msgstr "'%s' oluşturulamıyor"
+
+#: wrapper.c:215 wrapper.c:385
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "'%s' okuma ve yazma için açılamadı"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:416 wrapper.c:683
#, c-format
msgid "unable to access '%s'"
msgstr "'%s' erişilemiyor"
-#: wrapper.c:607
+#: wrapper.c:691
msgid "unable to get current working directory"
msgstr "geçerli çalışma dizini alınamıyor"
@@ -9670,11 +10108,11 @@
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:1125
+#: wt-status.c:211 wt-status.c:1140
msgid "Changes to be committed:"
msgstr "İşlenecek değişiklikler:"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1149
msgid "Changes not staged for commit:"
msgstr "İşleme için hazırlanmamış değişiklikler:"
@@ -9756,7 +10194,7 @@
#: wt-status.c:300
msgid "unknown:"
-msgstr "bilinmiyor"
+msgstr "bilinmiyor:"
#: wt-status.c:302
msgid "unmerged:"
@@ -9774,22 +10212,22 @@
msgid "untracked content, "
msgstr "izlenmeyen içerik, "
-#: wt-status.c:958
+#: wt-status.c:973
#, 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:989
+#: wt-status.c:1004
msgid "Submodules changed but not updated:"
msgstr "Değiştirilen; ancak güncellenmeyen altmodüller:"
-#: wt-status.c:991
+#: wt-status.c:1006
msgid "Submodule changes to be committed:"
msgstr "İşlenecek altmodül değişiklikleri:"
-#: wt-status.c:1073
+#: wt-status.c:1088
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9797,7 +10235,7 @@
"Yukarıdaki satırı değiştirmeyin veya kaldırmayın.\n"
"Altındaki her şey yok sayılacaktır."
-#: wt-status.c:1165
+#: wt-status.c:1180
#, c-format
msgid ""
"\n"
@@ -9808,107 +10246,114 @@
"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:1195
+#: wt-status.c:1210
msgid "You have unmerged paths."
msgstr "Birleştirilmemiş yollarınız var."
-#: wt-status.c:1198
+#: wt-status.c:1213
msgid " (fix conflicts and run \"git commit\")"
msgstr " (çakışmaları onar ve \"git commit\" çalıştır)"
-#: wt-status.c:1200
+#: wt-status.c:1215
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (birleştirmeyi iptal etmek için \"git merge --abort\" kullanın)"
-#: wt-status.c:1204
+#: wt-status.c:1219
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:1207
+#: wt-status.c:1222
msgid " (use \"git commit\" to conclude merge)"
msgstr " (birleştirmeyi sonuçlandırmak için \"git commit\" kullanın)"
-#: wt-status.c:1216
+#: wt-status.c:1233
msgid "You are in the middle of an am session."
msgstr "Bir 'am' oturumunun tam ortasındasınız."
-#: wt-status.c:1219
+#: wt-status.c:1236
msgid "The current patch is empty."
msgstr "Mevcut yama boş."
-#: wt-status.c:1223
+#: wt-status.c:1241
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:1225
+#: wt-status.c:1243
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (bu yamayı atlamak için \"git am --skip\" kullanın"
-#: wt-status.c:1227
+#: wt-status.c:1246
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (yamayı boş işleme kaydı olarak yazmak için \"git am --allow-empty\" "
+"kullanın)"
+
+#: wt-status.c:1248
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:1360
+#: wt-status.c:1381
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo eksik"
-#: wt-status.c:1362
+#: wt-status.c:1383
msgid "No commands done."
msgstr "Yerine getirilen bir komut yok."
-#: wt-status.c:1365
+#: wt-status.c:1386
#, 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):"
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Son yerine getirilen komut (%<PRIuMAX> komut yapıldı):"
+msgstr[1] "Son yerine getirilen komutlar (%<PRIuMAX> komut yapıldı):"
-#: wt-status.c:1376
+#: wt-status.c:1397
#, c-format
msgid " (see more in file %s)"
msgstr " (ek bilgi için %s dosyasına bakın)"
-#: wt-status.c:1381
+#: wt-status.c:1402
msgid "No commands remaining."
msgstr "Kalan komut yok."
-#: wt-status.c:1384
+#: wt-status.c:1405
#, 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):"
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Sıradaki yerine getirilecek komut (%<PRIuMAX> kalan komut):"
+msgstr[1] "Sıradaki yerine getirilecek komutlar (%<PRIuMAX> kalan komut):"
-#: wt-status.c:1392
+#: wt-status.c:1413
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:1404
+#: wt-status.c:1425
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Şu anda '%s' dalını '%s' üzerine yeniden temellendiriyorsunuz."
-#: wt-status.c:1409
+#: wt-status.c:1430
msgid "You are currently rebasing."
msgstr "Şu anda yeniden temellendirme yapmaktasınız."
-#: wt-status.c:1422
+#: wt-status.c:1443
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:1424
+#: wt-status.c:1445
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (bu yamayı atlamak için \"git rebase --skip\" kullanın)"
-#: wt-status.c:1426
+#: wt-status.c:1447
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:1433
+#: wt-status.c:1454
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tüm çakışmalar onarıldı: \"git rebase --continue\" çalıştır)"
-#: wt-status.c:1437
+#: wt-status.c:1458
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9916,158 +10361,158 @@
"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
"parçalara bölüyorsunuz."
-#: wt-status.c:1442
+#: wt-status.c:1463
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Şu anda yeniden temellendirme sırasında bir işlemeyi parçalara bölüyorsunuz."
-#: wt-status.c:1445
+#: wt-status.c:1466
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:1449
+#: wt-status.c:1470
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
"düzenliyorsunuz."
-#: wt-status.c:1454
+#: wt-status.c:1475
msgid "You are currently editing a commit during a rebase."
msgstr "Şu anda yeniden temellendirme sırasında bir işlemeyi düzenliyorsunuz."
-#: wt-status.c:1457
+#: wt-status.c:1478
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (geçerli işlemeyi değiştirmek için \"git commit --amend\" kullanın)"
-#: wt-status.c:1459
+#: wt-status.c:1480
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:1470
+#: wt-status.c:1491
msgid "Cherry-pick currently in progress."
msgstr "Seç-al şu anda sürmekte."
-#: wt-status.c:1473
+#: wt-status.c:1494
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Şu anda %s işlemesini seç-al yapıyorsunuz."
-#: wt-status.c:1480
+#: wt-status.c:1501
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (çakışmaları onar ve \"git cherry-pick --continue\" çalıştır)"
-#: wt-status.c:1483
+#: wt-status.c:1504
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (sürdürmek için \"git cherry-pick --continue\" çalıştır)"
-#: wt-status.c:1486
+#: wt-status.c:1507
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:1488
+#: wt-status.c:1509
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:1490
+#: wt-status.c:1511
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:1500
+#: wt-status.c:1521
msgid "Revert currently in progress."
msgstr "Geriye al şu anda sürmekte."
-#: wt-status.c:1503
+#: wt-status.c:1524
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Şu anda %s işlemesini geri alıyorsunuz."
-#: wt-status.c:1509
+#: wt-status.c:1530
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (çakışmaları onar ve \"git revert --continue\" çalıştır)"
-#: wt-status.c:1512
+#: wt-status.c:1533
msgid " (run \"git revert --continue\" to continue)"
msgstr " (sürdürmek için \"git revert --continue\" çalıştır)"
-#: wt-status.c:1515
+#: wt-status.c:1536
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tüm çakışmalar onarıldı: \"git revert --continue\" çalıştır)"
-#: wt-status.c:1517
+#: wt-status.c:1538
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (bu yamayı atlamak için \"git revert --skip\" kullanın)"
-#: wt-status.c:1519
+#: wt-status.c:1540
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:1529
+#: wt-status.c:1550
#, 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:1533
+#: wt-status.c:1554
msgid "You are currently bisecting."
-msgstr "Şu anda ikili arama yapıyorsunuz"
+msgstr "Şu anda ikili arama yapıyorsunuz."
-#: wt-status.c:1536
+#: wt-status.c:1557
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:1547
+#: wt-status.c:1568
msgid "You are in a sparse checkout."
msgstr "Bir aralıklı çıkış içindesiniz."
-#: wt-status.c:1550
+#: wt-status.c:1571
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr "İzlenen dosyaların %%%d mevcut olduğu aralıklı bir çıkıştasınız."
-#: wt-status.c:1794
+#: wt-status.c:1815
msgid "On branch "
msgstr "Üzerinde bulunulan dal: "
-#: wt-status.c:1801
+#: wt-status.c:1822
msgid "interactive rebase in progress; onto "
msgstr "şunun üzerine etkileşimli yeniden temellendirme sürmekte: "
-#: wt-status.c:1803
+#: wt-status.c:1824
msgid "rebase in progress; onto "
msgstr "şunun üzerine yeniden temellendirme sürmekte: "
-#: wt-status.c:1808
+#: wt-status.c:1829
msgid "HEAD detached at "
msgstr "HEAD şurada ayrıldı: "
-#: wt-status.c:1810
+#: wt-status.c:1831
msgid "HEAD detached from "
msgstr "HEAD şundan ayrıldı: "
-#: wt-status.c:1813
+#: wt-status.c:1834
msgid "Not currently on any branch."
msgstr "Şu anda bir dal üzerinde değil."
-#: wt-status.c:1830
+#: wt-status.c:1851
msgid "Initial commit"
msgstr "İlk işleme"
-#: wt-status.c:1831
+#: wt-status.c:1852
msgid "No commits yet"
msgstr "Henüz bir işleme yok"
-#: wt-status.c:1845
+#: wt-status.c:1866
msgid "Untracked files"
msgstr "İzlenmeyen dosyalar"
-#: wt-status.c:1847
+#: wt-status.c:1868
msgid "Ignored files"
msgstr "Yok sayılan dosyalar"
-#: wt-status.c:1851
+#: wt-status.c:1872
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10078,259 +10523,268 @@
"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:1857
+#: wt-status.c:1878
#, c-format
msgid "Untracked files not listed%s"
msgstr "İzlenmeyen dosyalar listelenmiyor%s"
-#: wt-status.c:1859
+#: wt-status.c:1880
msgid " (use -u option to show untracked files)"
msgstr " (izlenmeyen dosyaları göstermek için -u seçeneğini kullanın)"
-#: wt-status.c:1865
+#: wt-status.c:1886
msgid "No changes"
msgstr "Değişiklik yok"
-#: wt-status.c:1870
+#: wt-status.c:1891
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"İşlemeye eklenen değişiklik yok (\"git add\" ve/veya \"git commit -a\" "
"kullanın)\n"
-#: wt-status.c:1874
+#: wt-status.c:1895
#, c-format
msgid "no changes added to commit\n"
msgstr "İşlemeye eklenen değişiklik yok\n"
-#: wt-status.c:1878
+#: wt-status.c:1899
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-"işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var (izlemek için\n"
+"işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var (izlemek için "
"\"git add\" kullanın)\n"
-#: wt-status.c:1882
+#: wt-status.c:1903
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var\n"
-#: wt-status.c:1886
+#: wt-status.c:1907
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"İşlenecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için \"git "
"add\" kullanın)\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1911 wt-status.c:1917
#, c-format
msgid "nothing to commit\n"
msgstr "İşlenecek bir şey yok\n"
-#: wt-status.c:1893
+#: wt-status.c:1914
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"İşlenecek bir şey yok (izlenmeyen dosyaları göstermek için -u kullanın)\n"
-#: wt-status.c:1898
+#: wt-status.c:1919
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "İşlenecek bir şey yok, çalışma ağacı temiz\n"
-#: wt-status.c:2003
+#: wt-status.c:2024
msgid "No commits yet on "
msgstr "Şurada henüz bir işleme yok: "
-#: wt-status.c:2007
+#: wt-status.c:2028
msgid "HEAD (no branch)"
msgstr "HEAD (dal yok)"
-#: wt-status.c:2038
+#: wt-status.c:2059
msgid "different"
msgstr "değişik"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2061 wt-status.c:2069
msgid "behind "
msgstr "şunun arkasında: "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2064 wt-status.c:2067
msgid "ahead "
msgstr "şunun önünde: "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2605
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "%s yapılamıyor: Hazırlanmamış değişiklikleriniz var."
-#: wt-status.c:2575
+#: wt-status.c:2611
msgid "additionally, your index contains uncommitted changes."
msgstr "Ek olarak, indeksiniz işlenmemiş değişiklikler içeriyor."
-#: wt-status.c:2577
+#: wt-status.c:2613
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s yapılamıyor: İndeksiniz işlenmemiş değişiklikler içeriyor."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "IPC komutu gönderilemedi"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "IPC yanıtı okunamadı"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "accept_thread '%s' başlatılamadı"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "'%s' için worker[0] başlatılamadı"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:353
#, c-format
msgid "failed to unlink '%s'"
msgstr "'%s' bağlantısı kesilemedi"
+#: compat/fsmonitor/fsm-listen-darwin.c:355
+msgid "Unable to create FSEventStream."
+msgstr "FSEventStream oluşturulamadı."
+
+#: compat/fsmonitor/fsm-listen-darwin.c:403
+msgid "Failed to start the FSEventStream"
+msgstr "FSEventStream başlatılamadı"
+
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<seçenekler>] [--] <yol-blrtç>..."
-#: builtin/add.c:61
+#: builtin/add.c:63
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "%cx '%s' chmod yapılamıyor"
-#: builtin/add.c:99
+#: builtin/add.c:105
#, c-format
msgid "unexpected diff status %c"
msgstr "beklenmedik diff durumu %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:110 builtin/commit.c:299
msgid "updating files failed"
msgstr "dosyaları güncelleme başarısız"
-#: builtin/add.c:114
+#: builtin/add.c:120
#, c-format
msgid "remove '%s'\n"
msgstr "kaldır: '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:204
msgid "Unstaged changes after refreshing the index:"
msgstr "İndeksi yeniledikten sonra hazırlanmamış değişiklikler:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:312 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "İndeks okunamadı"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "'%s' yazım için açılamadı."
-
-#: builtin/add.c:322
+#: builtin/add.c:325
msgid "Could not write patch"
msgstr "Yama yazılamadı"
-#: builtin/add.c:325
+#: builtin/add.c:328
msgid "editing patch failed"
msgstr "yamayı düzenleme başarısız"
-#: builtin/add.c:328
+#: builtin/add.c:331
#, c-format
msgid "Could not stat '%s'"
msgstr "'%s' dosya bilgileri alınamadı"
-#: builtin/add.c:330
+#: builtin/add.c:333
msgid "Empty patch. Aborted."
msgstr "Boş yama. İptal edildi."
-#: builtin/add.c:335
+#: builtin/add.c:339
#, c-format
msgid "Could not apply '%s'"
msgstr "'%s' uygulanamadı"
-#: builtin/add.c:343
+#: builtin/add.c:347
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Aşağıdaki yollar sizin .gitignore dosyalarınızın biri tarafından yok "
"sayılıyor:\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "sınama turu"
-#: builtin/add.c:366
+#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "ayrıntı ver"
+
+#: builtin/add.c:370
msgid "interactive picking"
msgstr "etkileşimli seçim"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
msgid "select hunks interactively"
msgstr "parçaları etkileşimli olarak seç"
-#: builtin/add.c:368
+#: builtin/add.c:372
msgid "edit current diff and apply"
msgstr "geçerli diff'i düzenle ve uygula"
-#: builtin/add.c:369
+#: builtin/add.c:373
msgid "allow adding otherwise ignored files"
msgstr "başka türlü yok sayılan dosyaların eklenmesine izin ver"
-#: builtin/add.c:370
+#: builtin/add.c:374
msgid "update tracked files"
msgstr "izlenen dosyaları güncelle"
-#: builtin/add.c:371
+#: builtin/add.c:375
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "izlenen dosyaların satır sonlarını yeniden olağanlaştır (-u ima eder)"
-#: builtin/add.c:372
+#: builtin/add.c:376
msgid "record only the fact that the path will be added later"
msgstr "yalnızca yolun sonra ekleneceği gerçeğinin kaydını yaz"
-#: builtin/add.c:373
+#: builtin/add.c:377
msgid "add changes from all tracked and untracked files"
msgstr "tüm izlenen/izlenmeyen dosyalardan değişiklikleri ekle"
-#: builtin/add.c:376
+#: builtin/add.c:380
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "çalışma ağacında kaldırılan yolları yok say (--no-all ile aynı)"
-#: builtin/add.c:378
+#: builtin/add.c:382
msgid "don't add, only refresh the index"
msgstr "ekleme, yalnızca indeksi yenile"
-#: builtin/add.c:379
+#: builtin/add.c:383
msgid "just skip files which cannot be added because of errors"
msgstr "yalnızca hatalardan dolayı eklenemeyen dosyaları atla"
-#: builtin/add.c:380
+#: builtin/add.c:384
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"dosyaların -eksik olsalar bile- sınama turunda yok sayılıp sayılmadığını "
"denetle"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "aralıklı çıkış konisi dışındaki girdileri güncellemeye izin ver"
+
+#: builtin/add.c:387 builtin/update-index.c:1023
msgid "override the executable bit of the listed files"
msgstr "listelenen dosyaların çalıştırılabilir kısımlarını geçersiz kıl"
-#: builtin/add.c:384
+#: builtin/add.c:389
msgid "warn when adding an embedded repository"
msgstr "gömülü bir depo eklenirken uyar"
-#: builtin/add.c:386
-msgid "backend for `git stash -p`"
-msgstr "'git stash -p' için arka uç"
-
-#: builtin/add.c:404
+#: builtin/add.c:407
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10361,12 +10815,12 @@
"\n"
"Ek bilgi için: \"git help submodule\"."
-#: builtin/add.c:432
+#: builtin/add.c:436
#, c-format
msgid "adding embedded git repository: %s"
msgstr "gömülü git deposu ekleniyor: %s"
-#: builtin/add.c:451
+#: builtin/add.c:456
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10376,53 +10830,27 @@
"Bu iletiyi 'git config advice.addIgnoredFile false'\n"
"kullanarak kapatabilirsiniz."
-#: builtin/add.c:460
+#: builtin/add.c:471
msgid "adding files failed"
msgstr "dosya ekleme başarısız"
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run, --interactive/--patch ile uyumsuz"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file, --interactive/--patch ile uyumsuz"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file, --edit ile uyumsuz"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A ve -u karşılıklı olarak uyumlu"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-"--ignore-missing seçeneği yalnızca --dry-run seçeneği ile birlikte "
-"kullanılabilir"
-
-#: builtin/add.c:526
+#: builtin/add.c:534
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod param '%s' ya -x ya da +x olmalıdır"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file yol belirteci argümanları ile uyumsuz"
+#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
+#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "'%s' ve yol belirteci argümanları birlikte kullanılamaz"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul, --pathspec-from-file gerektiriyor"
-
-#: builtin/add.c:555
+#: builtin/add.c:566
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Hiçbir şey belirtilmedi, hiçbir şey eklenmedi.\n"
-#: builtin/add.c:557
+#: builtin/add.c:568
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10432,111 +10860,114 @@
"Bu iletiyi 'git config advice.addEmptyPathspec false'\n"
"yaparak kapatabilirsiniz."
-#: builtin/am.c:365
+#: builtin/am.c:393
msgid "could not parse author script"
msgstr "yazar betiği ayrıştırılamadı"
-#: builtin/am.c:455
+#: builtin/am.c:483
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' applypatch-msg kancası tarafından silindi"
-#: builtin/am.c:497
+#: builtin/am.c:525
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Hatalı oluşturulmuş girdi satırı: '%s'."
-#: builtin/am.c:535
+#: builtin/am.c:563
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Notların '%s' konumundan '%s' konumuna kopyalanması başarısız"
-#: builtin/am.c:561
+#: builtin/am.c:589
msgid "fseek failed"
msgstr "fseek başarısız oldu"
-#: builtin/am.c:749
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "'%s' yaması ayrıştırılamadı"
-#: builtin/am.c:814
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Bir kerede yalnızca bir StGIT yama serisi uygulanabilir"
-#: builtin/am.c:862
+#: builtin/am.c:890
msgid "invalid timestamp"
msgstr "geçersiz zaman damgası"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:895 builtin/am.c:907
msgid "invalid Date line"
msgstr "geçersiz tarih satırı"
-#: builtin/am.c:874
+#: builtin/am.c:902
msgid "invalid timezone offset"
msgstr "geçersiz zaman dilimi ofseti"
-#: builtin/am.c:967
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Yama biçimi algılaması başarısız."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:1000 builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
msgstr "'%s' dizini oluşturulamadı"
-#: builtin/am.c:977
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "Yamalar parçalanıp bölünemedi."
-#: builtin/am.c:1126
+#: builtin/am.c:1154
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Bu sorunu çözdüğünüzde \"%s --continue\" çalıştırın."
-#: builtin/am.c:1127
+#: builtin/am.c:1155
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Eğer bu yamayı atlamayı yeğliyorsanız \"%s --skip\" çalıştırın."
-#: builtin/am.c:1128
+#: builtin/am.c:1160
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Boş yamayı boş işleme kaydı olarak yazmak için \"%s --allow-empty\" "
+"çalıştırın."
+
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"İlk dalı eski durumuna getirip yamalamayı durdurmak için \"%s --abort\" "
"çalıştır."
-#: builtin/am.c:1223
+#: builtin/am.c:1257
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Yama format=flowed ile gönderildi; satır sonlarındaki boşluk kaybolmuş "
"olabilir."
-#: builtin/am.c:1251
-msgid "Patch is empty."
-msgstr "Yama boş."
-
-#: builtin/am.c:1316
+#: builtin/am.c:1345
#, c-format
msgid "missing author line in commit %s"
msgstr "%s işlemesinde yazar satırı eksik"
-#: builtin/am.c:1319
+#: builtin/am.c:1348
#, c-format
msgid "invalid ident line: %.*s"
msgstr "geçersiz tanımlama satırı: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1567
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Depo 3 yönlü birleştirmeye geri çekilebilme için gereken ikili nesnelere iye "
"değil."
-#: builtin/am.c:1540
+#: builtin/am.c:1569
msgid "Using index info to reconstruct a base tree..."
msgstr "Bir temel ağacını yeniden yapmak için indeks bilgisi kullanılıyor..."
-#: builtin/am.c:1559
+#: builtin/am.c:1588
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10544,24 +10975,24 @@
"Yamanızı elle mi düzenlediniz?\n"
"Kendi indeksinde kaydı yazılan ikili nesnelere uygulanamıyor."
-#: builtin/am.c:1565
+#: builtin/am.c:1594
msgid "Falling back to patching base and 3-way merge..."
msgstr "Temeli yamalamaya ve 3 yönlü birleştirmeye geri çekiliniyor..."
-#: builtin/am.c:1591
+#: builtin/am.c:1620
msgid "Failed to merge in the changes."
msgstr "Değişiklikler birleştirilemedi."
-#: builtin/am.c:1623
+#: builtin/am.c:1652
msgid "applying to an empty history"
msgstr "boş bir geçmişe uygulanıyor"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1704 builtin/am.c:1708
#, c-format
msgid "cannot resume: %s does not exist."
-msgstr "sürdürülemiyor: %s yok"
+msgstr "sürdürülemiyor: %s yok."
-#: builtin/am.c:1697
+#: builtin/am.c:1726
msgid "Commit Body is:"
msgstr "İşleme gövdesi:"
@@ -10569,41 +11000,59 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1736
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Uygula? [y]evet/[n]hayır/düz[e]nle/[v]yamayı görüntüle/tümünü k[a]bul et: "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1782 builtin/commit.c:410
msgid "unable to write index file"
msgstr "indeks dosyası yazılamıyor"
-#: builtin/am.c:1757
+#: builtin/am.c:1786
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Kirli indeks: Yamalar uygulanamıyor (kirli: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1828
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Atlanıyor: %.*s"
+
+#: builtin/am.c:1833
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Boş bir işleme oluşturuluyor: %.*s"
+
+#: builtin/am.c:1837
+msgid "Patch is empty."
+msgstr "Yama boş."
+
+#: builtin/am.c:1848 builtin/am.c:1917
#, c-format
msgid "Applying: %.*s"
msgstr "Uygulanıyor: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1865
msgid "No changes -- Patch already applied."
msgstr "Değişiklik yok -- Yama halihazırda uygulandı."
-#: builtin/am.c:1820
+#: builtin/am.c:1871
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Yama şurada başarısız oldu: %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1875
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:1868
+#: builtin/am.c:1921
+msgid "No changes - recorded it as an empty commit."
+msgstr "Değişiklik yok -- boş bir işleme olarak kayıt yazıldı."
+
+#: builtin/am.c:1923
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10613,7 +11062,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:1875
+#: builtin/am.c:1931
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10626,17 +11075,17 @@
"Bir dosyanın \"onlar sildi\" olduğunu kabul etmek için dosya ile 'git rm' "
"yapabilirsiniz."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
+#: builtin/reset.c:463
#, c-format
msgid "Could not parse object '%s'."
msgstr "'%s' nesnesi ayrıştırılamadı."
-#: builtin/am.c:2034
+#: builtin/am.c:2091 builtin/am.c:2167
msgid "failed to clean index"
msgstr "indeks temizlenemedi"
-#: builtin/am.c:2078
+#: builtin/am.c:2135
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10644,160 +11093,159 @@
"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:2185
+#: builtin/am.c:2292
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Geçersiz --patch-format değeri: %s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "'%s=%s' ve '%s=%s' seçenekleri birlikte kullanılamaz"
-#: builtin/am.c:2227
-#, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr "--show-current-patch için geçersiz değer: %s"
-
-#: builtin/am.c:2231
-#, 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:2262
+#: builtin/am.c:2323
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<seçenekler>] [(<mbox> | <posta-dizin>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2324
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<seçenekler>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2330
msgid "run interactively"
msgstr "etkileşimli olarak çalıştır"
-#: builtin/am.c:2271
+#: builtin/am.c:2332
msgid "historical option -- no-op"
msgstr "tarihi seçenek -- no-op"
-#: builtin/am.c:2273
+#: builtin/am.c:2334
msgid "allow fall back on 3way merging if needed"
msgstr "gerekirse 3 yönlü birleştirmeye geri çekilmeye izin ver"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:646 builtin/stash.c:946
msgid "be quiet"
msgstr "sessiz ol"
-#: builtin/am.c:2276
+#: builtin/am.c:2337
msgid "add a Signed-off-by trailer to the commit message"
msgstr "işleme iletisine bir Signed-off-by satırı ekle"
-#: builtin/am.c:2279
+#: builtin/am.c:2340
msgid "recode into utf8 (default)"
msgstr "utf8 olarak yeniden kodla (öntanımlı)"
-#: builtin/am.c:2281
+#: builtin/am.c:2342
msgid "pass -k flag to git-mailinfo"
msgstr "'git-mailinfo'ya -k bayrağını geçir"
-#: builtin/am.c:2283
+#: builtin/am.c:2344
msgid "pass -b flag to git-mailinfo"
msgstr "'git-mailinfo'ya -b bayrağını geçir"
-#: builtin/am.c:2285
+#: builtin/am.c:2346
msgid "pass -m flag to git-mailinfo"
msgstr "'git-mailinfo'ya -m bayrağını geçir"
-#: builtin/am.c:2287
+#: builtin/am.c:2348
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:2290
+#: builtin/am.c:2351
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:2293
+#: builtin/am.c:2354
msgid "strip everything before a scissors line"
msgstr "bir kesim çizgisinden önceki her şeyi çıkar"
-#: builtin/am.c:2295
+#: builtin/am.c:2356
msgid "pass it through git-mailinfo"
msgstr "git-mailinfo içerisinden geçir"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
+#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
+#: builtin/am.c:2386
msgid "pass it through git-apply"
msgstr "git-apply aracılığıyla geçir"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
+#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
+#: parse-options.h:348
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
-#: builtin/verify-tag.c:38
+#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
+#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
+#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
+#: builtin/tag.c:480 builtin/verify-tag.c:38
msgid "format"
msgstr "biçim"
-#: builtin/am.c:2322
+#: builtin/am.c:2383
msgid "format the patch(es) are in"
msgstr "yama biçimi"
-#: builtin/am.c:2328
+#: builtin/am.c:2389
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:2330
+#: builtin/am.c:2391
msgid "continue applying patches after resolving a conflict"
msgstr "bir çakışmayı çözdükten sonra yamaları uygulamayı sürdür"
-#: builtin/am.c:2333
+#: builtin/am.c:2394
msgid "synonyms for --continue"
msgstr "--continue eşanlamlıları"
-#: builtin/am.c:2336
+#: builtin/am.c:2397
msgid "skip the current patch"
msgstr "geçerli yamayı atla"
-#: builtin/am.c:2339
+#: builtin/am.c:2400
msgid "restore the original branch and abort the patching operation"
msgstr "orijinal dalı eski durumuna getir ve yamalama işlemini iptal et"
-#: builtin/am.c:2342
+#: builtin/am.c:2403
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:2346
+#: builtin/am.c:2407
msgid "show the patch being applied"
msgstr "uygulanmakta olan yamayı göster"
-#: builtin/am.c:2351
+#: builtin/am.c:2411
+msgid "record the empty patch as an empty commit"
+msgstr "boş yamayı bir boş işleme olarak kayıt yaz"
+
+#: builtin/am.c:2415
msgid "lie about committer date"
msgstr "işleyici tarihi hakkında yalan söyle"
-#: builtin/am.c:2353
+#: builtin/am.c:2417
msgid "use current timestamp for author date"
msgstr "yazar tarihi için geçerli zaman damgasını kullan"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
+#: builtin/revert.c:117 builtin/tag.c:461
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2420 builtin/rebase.c:1128
msgid "GPG-sign commits"
msgstr "GPG imzalı işlemeler"
-#: builtin/am.c:2359
+#: builtin/am.c:2423
+msgid "how to handle empty patches"
+msgstr "boş yamaların nasıl değerlendirileceği"
+
+#: builtin/am.c:2426
msgid "(internal use for git-rebase)"
msgstr "(git-rebase için iç kullanım)"
-#: builtin/am.c:2377
+#: builtin/am.c:2444
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."
@@ -10805,17 +11253,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:2384
+#: builtin/am.c:2451
msgid "failed to read the index"
msgstr "indeks okunamadı"
-#: builtin/am.c:2399
+#: builtin/am.c:2466
#, 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:2423
+#: builtin/am.c:2490
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10824,11 +11272,11 @@
"Başıboş %s dizini bulundu.\n"
"Kaldırmak için \"git am --abort\" kullanın."
-#: builtin/am.c:2429
+#: builtin/am.c:2496
msgid "Resolve operation not in progress, we are not resuming."
msgstr "İlerlemekte olan bir çözüm işlemi yok, sürdürme yapmıyoruz."
-#: builtin/am.c:2439
+#: builtin/am.c:2506
msgid "interactive mode requires patches on the command line"
msgstr "etkileşimli kip yamanın komut satırında olmasını gerektirir"
@@ -10836,53 +11284,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<seçenekler>] [<yama>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "arşiv dosyası '%s' oluşturulamadı"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "çıktı yeniden yönlendirilemedi"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: URL'si olmayan uzak konum"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: ACK/NAK bekleniyordu, floş paketi alındı"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: Protokol hatası"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: Floş bekleniyordu"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<işleme>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <iyi_terim> <kötü_terim> [<terim>]"
-
-#: builtin/bisect--helper.c:25
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-
#: builtin/bisect--helper.c:26
msgid ""
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
@@ -10893,10 +11323,6 @@
"=<terim>] [--no-checkout] [--first-parent] [<kötü> [<iyi>...]] [--] "
"[<yollar>...]"
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-next"
-
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
@@ -10913,73 +11339,82 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<rev>|<erim>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <komut>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "'%s' dosyası '%s' kipinde açılamıyor"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "'%s' dosyasına yazılamadı"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "'%s' dosyası okuma için açılamıyor"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' geçerli bir terim değil"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "'%s yerleşik komutu bir terim olarak kullanılamıyor"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "'%s' teriminin anlamı değiştirilemiyor"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "lütfen iki değişik terim kullanın"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "İkili arama yapılmıyor.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' geçerli bir işleme değil"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
"Orijinal HEAD '%s' çıkışı yapılamadı. 'git bisect reset <işleme>' deneyin."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Hatalı bisect_write argümanı: %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "'%s' revizyonunun oid'si alınamadı"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "'%s' dosyası açılamadı"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Geçersiz komut: Şu anda bir %s/%s ikili aramasındasınız"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10988,7 +11423,7 @@
"Bana en azından bir %s ve %s revizyonu vermeniz gerekiyor.\n"
"Bunun için \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz."
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10999,7 +11434,7 @@
"Bundan sonra bana en azından bir %s ve %s revizyonu vermeniz gerekiyor.\n"
"Bunun için \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz."
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "yalnızca bir %s işlemesi ile ikili arama yapılıyor"
@@ -11008,15 +11443,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Emin misiniz [Y/n]? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "hiçbir terim tanımlanmadı"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11025,7 +11460,7 @@
"Mevcut terimleriniz eski durum için %s ve\n"
"yeni durum için %s.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11034,52 +11469,52 @@
"'git bisect terms' için geçersiz argüman %s.\n"
"Desteklenen seçenekler: --term-good|--term-old ve --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "revizyonda gezinme ayarlaması başarısız oldu\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "'%s' iliştirme için açılamadı"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' geçerli bir terim değil"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "tanımlanamayan seçenek: '%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' geçerli bir revizyon değil gibi görünüyor"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "hatalı HEAD - Bana bir HEAD gerek"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "'%s' çıkış yapımı başarısız. 'git bisect start <geçerli-dal>' deneyin."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "cg-seek yapılmış bir ağaçta ikili arama yapılmayacak"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "hatalı HEAD - tuhaf sembolik başvuru"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "geçersiz başvuru: '%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "\"git bisect start\" ile başlamalısınız\n"
@@ -11087,104 +11522,161 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Bunu sizin yerinize benim yapmamı ister misiniz [Y/n]? "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Lütfen '--bisect-state'i en az bir argümanla çağırın"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' yalnızca bir argüman alabilir."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Hatalı revizyon girdisi: %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Hatalı revizyon girdisi (bir işleme değil): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "İkili arama yapmıyoruz."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "'%s'?? ney ney?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "'%s' dosyası yeniden oynatım için okunamıyor"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#, c-format
+msgid "running %s\n"
+msgstr "%s çalıştırılıyor\n"
+
+#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+msgid "bisect run failed: no command provided."
+msgstr "ikili arama başarısız: Komut verilmedi."
+
+#: builtin/bisect--helper.c:1166
+#, c-format
+msgid "unable to verify '%s' on good revision"
+msgstr "'%s', iyi revizyonda doğrulanamadı"
+
+#: builtin/bisect--helper.c:1172
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr "iyi revizyon için anlamsız %d çıkış kodu"
+
+#: builtin/bisect--helper.c:1180
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"bisect çalıştırılamadı: çıkış kodu %d, '%s' konumundan, < 0 veya >= 128"
+
+#: builtin/bisect--helper.c:1195
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "'%s' dosyası yazma için açılamadı"
+
+#: builtin/bisect--helper.c:1213
+msgid "bisect run cannot continue any more"
+msgstr "ikili arama artık çalışmayı sürdüremiyor"
+
+#: builtin/bisect--helper.c:1215
+#, c-format
+msgid "bisect run success"
+msgstr "ikili arama başarılı"
+
+#: builtin/bisect--helper.c:1218
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "ikili arama ilk hatalı işlemeyi buldu"
+
+#: builtin/bisect--helper.c:1221
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"ikili arama çalıştırılamadı: 'git bisect--helper --bisect-state %s', %d hata "
+"koduyla çıktı"
+
+#: builtin/bisect--helper.c:1253
msgid "reset the bisection state"
msgstr "ikili arama durumunu sıfırla"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1255
msgid "check whether bad or good terms exist"
msgstr "iyi veya kötü terimlerin olup olmadığını denetle"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1257
msgid "print out the bisect terms"
msgstr "ikili arama terimlerini yazdır"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1259
msgid "start the bisect session"
msgstr "ikili arama oturumunu başlat"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1261
msgid "find the next bisection commit"
msgstr "bir sonraki ikili arama işlemesini bul"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1263
msgid "mark the state of ref (or refs)"
msgstr "başvurunun (veya başvuruların) durumunu imle"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1265
msgid "list the bisection steps so far"
msgstr "şu ana kadarki ikili arama durumunu listele"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1267
msgid "replay the bisection process from the given file"
msgstr "verilen dosyadan ikili arama işlemini yeniden oynat"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1269
msgid "skip some commits for checkout"
msgstr "çıkış için birkaç işlemeyi atla"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1271
+msgid "visualize the bisection"
+msgstr "ikili aramayı görselleştir"
+
+#: builtin/bisect--helper.c:1273
+msgid "use <cmd>... to automatically bisect"
+msgstr "kendiliğinden ikili aramak için <komut>... kullan"
+
+#: builtin/bisect--helper.c:1275
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE için günlük yok"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1290
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset bir argüman veya işleme gerektirmiyor"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check 2 veya 3 argüman gerektiriyor"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1295
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 0 veya 1 argüman gerektiriyor"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1304
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next 0 argüman gerektiriyor"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1315
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log 0 argüman gerektiriyor"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1320
msgid "no logfile given"
msgstr "hiçbir günlük dosyası verilmedi"
@@ -11196,150 +11688,143 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-sçnk>, git-rev-list(1) içinde belgelendirilmiştir"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "bir renk bekleniyor: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "bir renk ile bitmeli"
-#: builtin/blame.c:728
-#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "color.blame.repeatedLines içinde geçersiz renk '%s'"
-
-#: builtin/blame.c:746
-msgid "invalid value for blame.coloring"
-msgstr "blame.coloring için geçersiz değer"
-
-#: builtin/blame.c:845
+#: builtin/blame.c:842
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "yok saymak için %s revizyonu bulunamıyor"
-#: builtin/blame.c:867
+#: builtin/blame.c:864
msgid "show blame entries as we find them, incrementally"
msgstr "genel bakış girdilerini biz buldukça artan biçimde göster"
-#: builtin/blame.c:868
+#: builtin/blame.c:865
msgid "do not show object names of boundary commits (Default: off)"
msgstr "sınır işlemeleri için nesne adlarını gösterme (Öntanımlı: Kapalı)"
-#: builtin/blame.c:869
+#: builtin/blame.c:866
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "kök işlemelerini sınır olarak değerlendirme (Öntanımlı: Kapalı)"
-#: builtin/blame.c:870
+#: builtin/blame.c:867
msgid "show work cost statistics"
msgstr "iş maliyet istatistiklerini göster"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
+#: builtin/remote.c:683 builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "durum belirtmeyi zorla"
-#: builtin/blame.c:872
+#: builtin/blame.c:869
msgid "show output score for blame entries"
msgstr "genel bakış girdileri için çıktı skorunu göster"
-#: builtin/blame.c:873
+#: builtin/blame.c:870
msgid "show original filename (Default: auto)"
msgstr "orijinal dosya adını göster (Öntanımlı: Otomatik)"
-#: builtin/blame.c:874
+#: builtin/blame.c:871
msgid "show original linenumber (Default: off)"
msgstr "orijinal satır numarasını göster (Öntanımlı: Kapalı)"
-#: builtin/blame.c:875
+#: builtin/blame.c:872
msgid "show in a format designed for machine consumption"
msgstr "makine işlemesi için tasarlanmış bir biçimde göster"
-#: builtin/blame.c:876
+#: builtin/blame.c:873
msgid "show porcelain format with per-line commit information"
msgstr "okunabilir biçimde her satır için işleme bilgisi ile göster"
-#: builtin/blame.c:877
+#: builtin/blame.c:874
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "git-annotate ile aynı çıktı kipini kullan (Öntanımlı: Kapalı)"
-#: builtin/blame.c:878
+#: builtin/blame.c:875
msgid "show raw timestamp (Default: off)"
msgstr "ham zaman damgasını göster (Öntanımlı: Kapalı)"
-#: builtin/blame.c:879
+#: builtin/blame.c:876
msgid "show long commit SHA1 (Default: off)"
msgstr "uzun işleme SHA1'ini göster (Öntanımlı: Kapalı)"
-#: builtin/blame.c:880
+#: builtin/blame.c:877
msgid "suppress author name and timestamp (Default: off)"
msgstr "yazar adını ve zaman damgasını gizle (Öntanımlı: Kapalı)"
-#: builtin/blame.c:881
+#: builtin/blame.c:878
msgid "show author email instead of name (Default: off)"
msgstr "yazar adı yerine e-postasını göster (Öntanımlı: Kapalı)"
-#: builtin/blame.c:882
+#: builtin/blame.c:879
msgid "ignore whitespace differences"
msgstr "boşluk ayrımlarını yok say"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:880 builtin/log.c:1857
msgid "rev"
msgstr "revizyon"
-#: builtin/blame.c:883
+#: builtin/blame.c:880
msgid "ignore <rev> when blaming"
msgstr "suçlarken <revizyon>'u yok say"
-#: builtin/blame.c:884
+#: builtin/blame.c:881
msgid "ignore revisions from <file>"
msgstr "<dosya>'dan olan revizyonları yok say"
-#: builtin/blame.c:885
+#: builtin/blame.c:882
msgid "color redundant metadata from previous line differently"
msgstr "bir önceki dosyadan gereksiz üstveriyi başka biçimde renklendir"
-#: builtin/blame.c:886
+#: builtin/blame.c:883
msgid "color lines by age"
msgstr "satırları yaşına göre renklendir"
-#: builtin/blame.c:887
+#: builtin/blame.c:884
msgid "spend extra cycles to find better match"
msgstr "daha iyi eşleşme bulmak için ek döngüler harca"
-#: builtin/blame.c:888
+#: builtin/blame.c:885
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "git-rev-list çağırma yerine <dosya>'dan olan revizyonları kullan"
-#: builtin/blame.c:889
+#: builtin/blame.c:886
msgid "use <file>'s contents as the final image"
msgstr "<dosya>'nın içeriğini son görüntü olarak kullan"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:887 builtin/blame.c:888
msgid "score"
msgstr "skor"
-#: builtin/blame.c:890
+#: builtin/blame.c:887
msgid "find line copies within and across files"
msgstr "satır kopyalarını dosyaların içinde ve aralarında ara"
-#: builtin/blame.c:891
+#: builtin/blame.c:888
msgid "find line movements within and across files"
msgstr "satır hareketlerini dosyaların içinde ve aralarında ara"
-#: builtin/blame.c:892
+#: builtin/blame.c:889
msgid "range"
msgstr "erim"
-#: builtin/blame.c:893
+#: builtin/blame.c:890
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
"Yalnızca <başlangıç>,<bitiş> satır erimini veya :<işlevadı> işlevini işle"
-#: builtin/blame.c:945
+#: builtin/blame.c:949
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress, --incremental veya okunabilir biçimlerle kullanılamaz"
@@ -11351,18 +11836,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:1000
msgid "4 years, 11 months ago"
msgstr "4 yıl 11 ay önce"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1116
#, 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:1157
+#: builtin/blame.c:1161
msgid "Blaming lines"
msgstr "Genel bakış satırları"
@@ -11371,39 +11856,47 @@
msgstr "git branch [<seçenekler>] [-r | -a] [--merged] [--no-merged]"
#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<seçenekler>] [-l] [-f] <dal-adı> [<başlama-noktası>]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr ""
+"git branch [<seçenekler>] [-f] [--recurse-submodules] <dal-adı> [<başlangıç-"
+"noktası>]"
#: builtin/branch.c:31
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<seçenekler>] [-l] [<dizgi>...]"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<seçenekler>] [-r] (-d | -D) <dal-adı>..."
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<seçenekler>] (-m | -M) [<eski-dal>] <yeni-dal>"
-#: builtin/branch.c:33
+#: builtin/branch.c:34
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<seçenekler>] (-c | -C) [<eski-dal>] <yeni-dal>"
-#: builtin/branch.c:34
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<seçenekler>] [-r | -a] [--points-at]"
-#: builtin/branch.c:35
+#: builtin/branch.c:36
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<seçenekler>] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:165
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
"'%s' dalı siliniyor: Bu dal '%s'\n"
-" dalına birleştirilmiş; ancak HEAD'e henüz birleştirilmemiş"
+" dalına birleştirilmiş; ancak HEAD'e henüz birleştirilmemiş."
-#: builtin/branch.c:158
+#: builtin/branch.c:169
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -11412,12 +11905,12 @@
"'%s' dalı silinmiyor: Bu dal HEAD'e birleştirilmiş olmasına rağmen\n"
" '%s' dalına birleştirilmemiş."
-#: builtin/branch.c:172
+#: builtin/branch.c:183
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "'%s' için işleme nesnesi aranamadı"
-#: builtin/branch.c:176
+#: builtin/branch.c:187
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -11426,111 +11919,111 @@
"'%s' dalı tümüyle birleştirilmemiş.\n"
"Eğer silmek istediğinizden eminseniz 'git branch -D %s' çalıştırın."
-#: builtin/branch.c:189
+#: builtin/branch.c:200
msgid "Update of config-file failed"
msgstr "config-file güncellemesi başarısız"
-#: builtin/branch.c:223
+#: builtin/branch.c:235
msgid "cannot use -a with -d"
msgstr "-a, -d ile kullanılamıyor"
-#: builtin/branch.c:230
+#: builtin/branch.c:242
msgid "Couldn't look up commit object for HEAD"
-msgstr "HEAD için işleme nesnesi aranamadı"
-
-#: builtin/branch.c:244
-#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "'%s' dalı silinemiyor, şurada çıkış yapılmış: '%s'"
+msgstr "HEAD için işleme nesnesi aranamadı."
#: builtin/branch.c:259
#, c-format
-msgid "remote-tracking branch '%s' not found."
-msgstr "uzak izleme dalı '%s' bulunamadı"
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "'%s' dalı silinemiyor, şurada çıkış yapılmış: '%s'."
-#: builtin/branch.c:260
+#: builtin/branch.c:274
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "Uzak izleme dalı '%s' bulunamadı."
+
+#: builtin/branch.c:275
#, c-format
msgid "branch '%s' not found."
-msgstr "'%s' dalı bulunamadı"
+msgstr "'%s' dalı bulunamadı."
-#: builtin/branch.c:291
+#: builtin/branch.c:306
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Uzak izleme dalı %s silindi (%s idi).\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:307
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "%s dalı silindi (%s idi).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:457 builtin/tag.c:64
msgid "unable to parse format string"
msgstr "biçim dizisi ayrıştırılamıyor"
-#: builtin/branch.c:471
+#: builtin/branch.c:488
msgid "could not resolve HEAD"
msgstr "HEAD çözülemedi"
-#: builtin/branch.c:477
+#: builtin/branch.c:494
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s), refs/heads/ dışına işaret ediyor"
-#: builtin/branch.c:492
+#: builtin/branch.c:509
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "%s dalı %s konumunda yeniden temellendiriliyor"
-#: builtin/branch.c:496
+#: builtin/branch.c:513
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "%s dalı %s konumunda ikili aranıyor"
-#: builtin/branch.c:513
+#: builtin/branch.c:530
msgid "cannot copy the current branch while not on any."
-msgstr "bir dalın üzerinde değilken geçerli dal kopyalanamaz"
+msgstr "Bir dalın üzerinde değilken geçerli dal kopyalanamaz."
-#: builtin/branch.c:515
+#: builtin/branch.c:532
msgid "cannot rename the current branch while not on any."
-msgstr "bir dalın üzerinde değilken geçerli dal yeniden adlandırılamaz"
+msgstr "Bir dalın üzerinde değilken geçerli dal yeniden adlandırılamaz."
-#: builtin/branch.c:526
+#: builtin/branch.c:543
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Geçersiz dal adı: '%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:572
msgid "Branch rename failed"
msgstr "Dal yeniden adlandırması başarısız"
-#: builtin/branch.c:557
+#: builtin/branch.c:574
msgid "Branch copy failed"
msgstr "Dal kopyalaması başarısız"
-#: builtin/branch.c:561
+#: builtin/branch.c:578
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Yanlış adlandırılan '%s' dalının bir kopyası oluşturuldu"
-#: builtin/branch.c:564
+#: builtin/branch.c:581
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Yanlış adlandırılan '%s' dalı yeniden adlandırıldı"
-#: builtin/branch.c:570
+#: builtin/branch.c:587
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Dal %s olarak yeniden adlandırıldı; ancak HEAD güncellenmedi!"
-#: builtin/branch.c:579
+#: builtin/branch.c:596
msgid "Branch is renamed, but update of config-file failed"
msgstr "Dal yeniden adlandırıldı; ancak config-file güncellemesi başarısız"
-#: builtin/branch.c:581
+#: builtin/branch.c:598
msgid "Branch is copied, but update of config-file failed"
msgstr "Dal kopyalandı; ancak config-file güncellemesi başarısız"
-#: builtin/branch.c:597
+#: builtin/branch.c:614
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11541,180 +12034,193 @@
"\t%s\n"
"'%c' ile başlayan satırlar çıkarılacaktır.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Genel seçenekler"
-#: builtin/branch.c:633
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "sağlamayı ve konuyu göster, üstkaynak dalı için iki kez ver"
-#: builtin/branch.c:634
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "bilgi iletilerini gizle"
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "izleme kipini ayarla (bilgi için: git-pull(1))"
+#: builtin/branch.c:656 builtin/checkout.c:1571
+#: builtin/submodule--helper.c:3077
+msgid "set branch tracking configuration"
+msgstr "dal izleme yapılandırmasını ayarla"
-#: builtin/branch.c:637
+#: builtin/branch.c:659
msgid "do not use"
msgstr "kullanma"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:661
msgid "upstream"
msgstr "üstkaynak"
-#: builtin/branch.c:639
+#: builtin/branch.c:661
msgid "change the upstream info"
msgstr "üstkaynak bilgisini değiştir"
-#: builtin/branch.c:640
+#: builtin/branch.c:662
msgid "unset the upstream info"
msgstr "üstkaynak bilgisini kaldır"
-#: builtin/branch.c:641
+#: builtin/branch.c:663
msgid "use colored output"
msgstr "renklendirilmiş çıktı kullan"
-#: builtin/branch.c:642
+#: builtin/branch.c:664
msgid "act on remote-tracking branches"
msgstr "uzak izleme dallarında iş yap"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:666 builtin/branch.c:668
msgid "print only branches that contain the commit"
msgstr "yalnızca işlemeyi içeren dalları yazdır"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:667 builtin/branch.c:669
msgid "print only branches that don't contain the commit"
msgstr "yalnızca işlemeyi içermeyen dalları yazdır"
-#: builtin/branch.c:650
+#: builtin/branch.c:672
msgid "Specific git-branch actions:"
msgstr "Özel git-branch eylemleri:"
-#: builtin/branch.c:651
+#: builtin/branch.c:673
msgid "list both remote-tracking and local branches"
msgstr "hem uzak izleme hem de yerel dalları listele"
-#: builtin/branch.c:653
+#: builtin/branch.c:675
msgid "delete fully merged branch"
msgstr "tümüyle birleştirilen dalı sil"
-#: builtin/branch.c:654
+#: builtin/branch.c:676
msgid "delete branch (even if not merged)"
msgstr "dalı sil (birleştirilmemiş olsa bile)"
-#: builtin/branch.c:655
+#: builtin/branch.c:677
msgid "move/rename a branch and its reflog"
msgstr "bir dalı ve onun başvuru günlüğünü taşı/yeniden adlandır"
-#: builtin/branch.c:656
+#: builtin/branch.c:678
msgid "move/rename a branch, even if target exists"
msgstr "bir dalı taşı/yeniden adlandır, hedef var olsa bile"
-#: builtin/branch.c:657
+#: builtin/branch.c:679
msgid "copy a branch and its reflog"
msgstr "bir dalı ve onun başvuru günlüğünü kopyala"
-#: builtin/branch.c:658
+#: builtin/branch.c:680
msgid "copy a branch, even if target exists"
msgstr "bir dalı kopyala, hedef var olsa bile"
-#: builtin/branch.c:659
+#: builtin/branch.c:681
msgid "list branch names"
msgstr "dal adlarını listele"
-#: builtin/branch.c:660
+#: builtin/branch.c:682
msgid "show current branch name"
msgstr "geçerli dal adını göster"
-#: builtin/branch.c:661
+#: builtin/branch.c:683 builtin/submodule--helper.c:3075
msgid "create the branch's reflog"
msgstr "dalın başvuru günlüğünü oluştur"
-#: builtin/branch.c:663
+#: builtin/branch.c:685
msgid "edit the description for the branch"
msgstr "dalın açıklamasını düzenle"
-#: builtin/branch.c:664
+#: builtin/branch.c:686
msgid "force creation, move/rename, deletion"
msgstr "zorla oluştur, taşı/yeniden adlandır, sil"
-#: builtin/branch.c:665
+#: builtin/branch.c:687
msgid "print only branches that are merged"
msgstr "yalnızca birleştirilen dalları yazdır"
-#: builtin/branch.c:666
+#: builtin/branch.c:688
msgid "print only branches that are not merged"
msgstr "yalnızca birleştirilmeyen dalları yazdır"
-#: builtin/branch.c:667
+#: builtin/branch.c:689
msgid "list branches in columns"
msgstr "dalları sütunlarla listele"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:476
msgid "object"
msgstr "nesne"
-#: builtin/branch.c:670
+#: builtin/branch.c:692
msgid "print only branches of the object"
msgstr "yalnızca nesnenin dallarını yazdır"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
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:672 builtin/for-each-ref.c:40 builtin/tag.c:482
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:694 builtin/ls-files.c:667
+msgid "recurse through submodules"
+msgstr "altmodüller içinden özyinele"
+
+#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
+#: builtin/tag.c:481 builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "çıktı için kullanılacak biçim"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:718 builtin/clone.c:684
msgid "HEAD not found below refs/heads!"
msgstr "HEAD, refs/heads altında bulunamadı!"
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column ve --verbose birbiriyle uyumsuz"
+#: builtin/branch.c:739
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
+"--recurse-submodules ile dallanma, yalnızca submodule.propagateBranches "
+"etkinleştirilmişse kullanılabilir"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:741
+msgid "--recurse-submodules can only be used to create branches"
+msgstr "--recurse-submodules, yalnızca dal oluşturmada kullanılabilir"
+
+#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
msgid "branch name required"
msgstr "dal adı gerekli"
-#: builtin/branch.c:766
+#: builtin/branch.c:802
msgid "Cannot give description to detached HEAD"
msgstr "Ayrılmış HEAD'e açıklama verilemiyor"
-#: builtin/branch.c:771
+#: builtin/branch.c:807
msgid "cannot edit description of more than one branch"
msgstr "birden çok dalın açıklaması düzenlenemiyor"
-#: builtin/branch.c:778
+#: builtin/branch.c:814
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "'%s' dalında henüz bir işleme yok."
-#: builtin/branch.c:781
+#: builtin/branch.c:817
#, c-format
msgid "No branch named '%s'."
msgstr "'%s' adında bir dal yok."
-#: builtin/branch.c:796
+#: builtin/branch.c:832
msgid "too many branches for a copy operation"
msgstr "bir kopyalama işlemi için çok fazla dal"
-#: builtin/branch.c:805
+#: builtin/branch.c:841
msgid "too many arguments for a rename operation"
msgstr "bir yeniden adlandırma işlemi için çok fazla argüman"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "too many arguments to set new upstream"
msgstr "yeni üstkaynak ayarlamak için çok fazla argüman"
-#: builtin/branch.c:814
+#: builtin/branch.c:850
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11722,31 +12228,31 @@
"HEAD'in üst kaynağı %s olarak ayarlanamadı; çünkü herhangi bir dala işaret "
"etmiyor."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:853 builtin/branch.c:873
#, c-format
msgid "no such branch '%s'"
msgstr "'%s' diye bir dal yok"
-#: builtin/branch.c:821
+#: builtin/branch.c:857
#, c-format
msgid "branch '%s' does not exist"
msgstr "'%s' diye bir dal mevcut değil"
-#: builtin/branch.c:834
+#: builtin/branch.c:867
msgid "too many arguments to unset upstream"
msgstr "üst kaynağı kaldırmak için çok fazla argüman"
-#: builtin/branch.c:838
+#: builtin/branch.c:871
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:844
+#: builtin/branch.c:877
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "'%s' dalının üstkaynak bilgisi yok"
-#: builtin/branch.c:854
+#: builtin/branch.c:890
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>?"
@@ -11754,7 +12260,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:858
+#: builtin/branch.c:894
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11762,32 +12268,32 @@
"--set-upstream seçeneği artık desteklenmiyor. Lütfen --track veya --set-"
"upstream-to kullanın."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "git sürümü:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() '%s' hatasını verip çıktı (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "derleyici bilgisi: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "libc bilgisi: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "bir git deposundan çalıştırılmadı - gösterilecek kanca yok\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <dosya>] [-s|--suffix <biçim>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11822,38 +12328,33 @@
"Aşağıda hata raporunun geri kalanına bir göz atın.\n"
"Paylaşmak istemediğiniz satırları silebilirsiniz.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "hata raporu dosyası için bir konum belirtin"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "dosya adı için bir strftime biçimli ek belirtin"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "'%s' için öncü dizinler oluşturulamadı"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Sistem Bilgisi"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Etkin Kancalar"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "'%s' hata raporu dosyası oluşturulamadı"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "%s dosyasına yazılamıyor"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Hata raporu '%s' dosyasına yazıldı.\n"
@@ -11874,136 +12375,251 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <dosya> [<başvuru-adı>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3899
msgid "do not show progress meter"
msgstr "ilerleme çubuğunu gösterme"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
msgid "show progress meter"
msgstr "ilerleme çubuğunu göster"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3903
msgid "show progress meter during object writing phase"
msgstr "ilerleme çubuğunu nesne yazımı aşaması sırasında göster"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3906
msgid "similar to --all-progress when progress meter is shown"
msgstr "ilerleme çubuğu gösterildiğinde --all-progress'e benzer"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "demet biçim sürümünü belirt"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "Bir demet oluşturmak için bir depo gerekli."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:108
msgid "do not show bundle details"
msgstr "demet ayrıntılarını gösterme"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:127
#, c-format
msgid "%s is okay\n"
msgstr "%s tamam\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:183
msgid "Need a repository to unbundle."
-msgstr "Demeti çözmek için bir depo gerekli"
+msgstr "Demeti çözmek için bir depo gerekiyor."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir"
+#: builtin/bundle.c:186
+msgid "Unbundling objects"
+msgstr "Nesneler demetten çıkarılıyor"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:220 builtin/remote.c:1758
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Bilinmeyen altkomut: %s"
-#: builtin/cat-file.c:596
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
-msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <tür> | --textconv | --filters) [--path=<yol>] <nesne>"
+#: builtin/cat-file.c:568
+msgid "flush is only for --buffer mode"
+msgstr "floş, yalnızca --buffer kipi içindir"
-#: builtin/cat-file.c:597
-msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
-msgstr ""
-"git cat-file (--batch[=<biçim>] | --batch-check[=<biçim>]) [--follow-"
-"symlinks] [--textconv | --filters]"
+#: builtin/cat-file.c:612
+msgid "empty command in input"
+msgstr "girdide boş komut"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:614
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "komuttan önce boşluk: '%s'"
+
+#: builtin/cat-file.c:623
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s, argümanlar gerektiriyor"
+
+#: builtin/cat-file.c:628
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s, bir argüman almıyor"
+
+#: builtin/cat-file.c:636
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "bilinmeyen komut: '%s'"
+
+#: builtin/cat-file.c:795
msgid "only one batch option may be specified"
msgstr "yalnızca bir toplu iş seçeneği belirtilebilir"
-#: builtin/cat-file.c:636
-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:824
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <tür> <nesne>"
-#: builtin/cat-file.c:637
-msgid "show object type"
-msgstr "nesne türünü göster"
+#: builtin/cat-file.c:825
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git cat-file (-e | -p) <nesne>"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:826
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr "git cat-file (-t | -s) [--allow-unknown-type] <nesne>"
+
+#: builtin/cat-file.c:827
+msgid ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+
+#: builtin/cat-file.c:830
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
+"git cat-file (--textconv | --filters)\n"
+" [<başvuru>:<yol|ağacımsı> | --path=<yol|ağacımsı> <revizyon>]"
+
+#: builtin/cat-file.c:836
+msgid "Check object existence or emit object contents"
+msgstr "Nesne varlığını denetle veya nesne içeriğini yay"
+
+#: builtin/cat-file.c:838
+msgid "check if <object> exists"
+msgstr "<nesne> varlığını denetle"
+
+#: builtin/cat-file.c:839
+msgid "pretty-print <object> content"
+msgstr "<nesne> içeriğini okunabilir yap"
+
+#: builtin/cat-file.c:841
+msgid "Emit [broken] object attributes"
+msgstr "[Hatalı] nesne özniteliklerini yay"
+
+#: builtin/cat-file.c:842
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr "nesne türünü göster (türler: 'blob', 'tree', 'commit', 'tag', ...)"
+
+#: builtin/cat-file.c:843
msgid "show object size"
msgstr "nesne boyutunu göster"
-#: builtin/cat-file.c:640
-msgid "exit with zero when there's no error"
-msgstr "hata yoksa sıfır koduyla çık"
-
-#: builtin/cat-file.c:641
-msgid "pretty-print object's content"
-msgstr "nesne içeriğini okunabilir biçimde göster"
-
-#: builtin/cat-file.c:643
-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:645
-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:646
-msgid "blob"
-msgstr "ikili nesne"
-
-#: builtin/cat-file.c:647
-msgid "use a specific path for --textconv/--filters"
-msgstr "--textconv/--filters için belirli bir yol kullan"
-
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:845
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:650
+#: builtin/cat-file.c:847
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr "Toplu iş nesneleri stdin'de istendi (veya --batch-all-objects)"
+
+#: builtin/cat-file.c:849
+msgid "show full <object> or <rev> contents"
+msgstr "tam <nesne> veya <revizyon> içeriğini göster"
+
+#: builtin/cat-file.c:853
+msgid "like --batch, but don't emit <contents>"
+msgstr "--batch gibi; ancak <içerik> yayma"
+
+#: builtin/cat-file.c:857
+msgid "read commands from stdin"
+msgstr "komutları stdin'den oku"
+
+#: builtin/cat-file.c:861
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr ""
+"--batch[-check] ile stdin'i yok sayar, bilinen tüm nesneleri bir araya "
+"getirir"
+
+#: builtin/cat-file.c:863
+msgid "Change or optimize batch output"
+msgstr "Toplu iş çıktısını değiştir veya eniyile"
+
+#: builtin/cat-file.c:864
msgid "buffer --batch output"
msgstr "--batch çıktısını arabelleğe al"
-#: builtin/cat-file.c:652
-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:866
+msgid "follow in-tree symlinks"
+msgstr "ağaç içi sembolik bağları izle"
-#: builtin/cat-file.c:656
-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:868
+msgid "do not order objects before emitting them"
+msgstr "onları yaymadan önce nesneleri sıralama"
-#: builtin/cat-file.c:660
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: builtin/cat-file.c:870
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
msgstr ""
-"ağaç içi sembolik bağları izle (--batch veya --batch-check ile kullanılır)"
+"Nesneyi (ikili veya ağaç), dönüştürme veya süzgeçle yay (tek veya toplu)"
-#: builtin/cat-file.c:662
-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:872
+msgid "run textconv on object's content"
+msgstr "nesnenin içeriği üzerinde textconv çalıştır"
-#: builtin/cat-file.c:664
-msgid "do not order --batch-all-objects output"
-msgstr "--batch-all-objects çıktısını sıralama"
+#: builtin/cat-file.c:874
+msgid "run filters on object's content"
+msgstr "nesnenin içeriği üzerinde süzgeçler çalıştır"
+
+#: builtin/cat-file.c:875
+msgid "blob|tree"
+msgstr "ikili nesne/ağaç"
+
+#: builtin/cat-file.c:876
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
+msgstr ""
+"(--textconv | --filters) için bir <yol> kullan; ancak 'batch' ile değil"
+
+#: builtin/cat-file.c:894
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "'%s=<%s>' için '%s' veya '%s' gerekiyor"
+
+#: builtin/cat-file.c:896
+msgid "path|tree-ish"
+msgstr "yol|ağacımsı"
+
+#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "'%s' bir toplu iş kipi gerektiriyor"
+
+#: builtin/cat-file.c:921
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "'-%c', toplu iş kipi ile uyumsuz"
+
+#: builtin/cat-file.c:924
+msgid "batch modes take no arguments"
+msgstr "toplu iş kipleri argüman almaz"
+
+#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "<revizyon>, '%s' ile gerekiyor"
+
+#: builtin/cat-file.c:938
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "<nesne>, '-%c' ile gerekiyor"
+
+#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429
+#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596
+#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965
+#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
+#: builtin/tag.c:592
+msgid "too many arguments"
+msgstr "çok fazla argüman"
+
+#: builtin/cat-file.c:947
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr "<tür> <nesne> kipinde yalnızca iki argümana izin veriliyor, %d değil"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -12021,7 +12637,7 @@
msgid "use .gitattributes only from the index"
msgstr "yalnızca indeksteki .gitattributes'u kullan"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
msgid "read file names from stdin"
msgstr "dosya adlarını stdin'den oku"
@@ -12029,8 +12645,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:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
+#: builtin/worktree.c:565
msgid "suppress progress reporting"
msgstr "ilerleme bildirimini gizle"
@@ -12087,167 +12703,165 @@
msgid "git checkout--worker [<options>]"
msgstr "git checkout--worker [<seçenekler>]"
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
+#: builtin/worktree.c:808
msgid "string"
msgstr "dizi"
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
msgid "when creating files, prepend <string>"
msgstr "dosyalar oluştururken başına <dizi> ekle"
-#: builtin/checkout-index.c:152
+#: builtin/checkout-index.c:184
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<seçenekler>] [--] [<dosya>...]"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:201
msgid "stage should be between 1 and 3 or all"
msgstr "stage 1 ve 3 arasında veya tümü olmalıdır"
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:219
msgid "check out all files in the index"
msgstr "indeksteki tüm dosyaları çıkış yap"
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:221
+msgid "do not skip files with skip-worktree set"
+msgstr "skip-worktree kümesiyle dosyaları atlama"
+
+#: builtin/checkout-index.c:222
msgid "force overwrite of existing files"
msgstr "mevcut dosyaların üzerine yazılmasını zorla"
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:224
msgid "no warning for existing files and files not in index"
msgstr "mevcut dosyalar ve indekste olmayan dosyalar için uyarma"
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:226
msgid "don't checkout new files"
msgstr "yeni dosyaları çıkış yapma"
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:228
msgid "update stat information in the index file"
msgstr "indeks dosyasındaki dosya bilgilerini güncelle"
-#: builtin/checkout-index.c:198
+#: builtin/checkout-index.c:232
msgid "read list of paths from the standard input"
msgstr "yolların listesini standart girdi'den oku"
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:234
msgid "write the content to temporary files"
msgstr "içeriği geçici dosyalara yaz"
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:238
msgid "copy out the files from named stage"
msgstr "dosyaları adı verilen alandan kopyala"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:34
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<seçenekler>] <dal>"
-#: builtin/checkout.c:34
+#: builtin/checkout.c:35
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<seçenekler>] [<dal>] -- <dosya>..."
-#: builtin/checkout.c:39
+#: builtin/checkout.c:40
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<seçenekler>] [<dal>]"
-#: builtin/checkout.c:44
+#: builtin/checkout.c:45
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<seçenekler>] [--source=<dal>] <dosya>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:199 builtin/checkout.c:238
#, c-format
msgid "path '%s' does not have our version"
msgstr "'%s' yolu bizdeki sürüme iye değil"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:201 builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have their version"
msgstr "'%s' yolu onlardaki sürüme iye değil"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:217
#, 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:261
+#: builtin/checkout.c:271
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "'%s' yolu gereken sürümlere iye değil"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:291
#, c-format
msgid "path '%s': cannot merge"
msgstr "'%s' yolu: Birleştirilemiyor"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:307
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "'%s' için birleştirme sonuçları eklenemiyor"
-#: builtin/checkout.c:411
+#: builtin/checkout.c:424
#, 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:416
+#: builtin/checkout.c:429
#, 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:423
+#: builtin/checkout.c:436
#, 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:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:469
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' güncellenmekte olan yollarla kullanılamaz"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s', %s ile birlikte kullanılamaz"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:479
#, 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:470
+#: builtin/checkout.c:483
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "ne '%s' ne de '%s' belirtilmiş"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:487
#, 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:479 builtin/checkout.c:484
+#: builtin/checkout.c:492 builtin/checkout.c:497
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' veya '%s', %s ile birlikte kullanılamaz"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:571 builtin/checkout.c:578
#, c-format
msgid "path '%s' is unmerged"
msgstr "'%s' yolu birleştirilmemiş"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:753
msgid "you need to resolve your current index first"
msgstr "önce geçerli indeksinizi çözmelisiniz"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:809
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12256,50 +12870,50 @@
"aşağıdaki dosyalardaki hazırlanan değişikliklerle sürdürülemiyor:\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:902
#, 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:923
+#: builtin/checkout.c:947
msgid "HEAD is now at"
msgstr "HEAD konumu:"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "HEAD güncellenemiyor"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:955
#, c-format
msgid "Reset branch '%s'\n"
msgstr "'%s' dalı sıfırlandı.\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:958
#, c-format
msgid "Already on '%s'\n"
msgstr "Halihazırda '%s' üzerinde\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:962
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "'%s' dalına geçildi ve sıfırlandı.\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:964 builtin/checkout.c:1398
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Yeni '%s' dalına geçildi.\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:966
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "'%s' dalına geçildi.\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:1017
#, c-format
msgid " ... and %d more.\n"
-msgstr "... ve %d daha.\n"
+msgstr " ... ve %d daha.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12322,7 +12936,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1042
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12349,19 +12963,19 @@
"\tgit branch <yeni-dal-adı> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1077
msgid "internal error in revision walk"
msgstr "revizyonlarda gezinirken iç hata"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1081
msgid "Previous HEAD position was"
msgstr "Önceki HEAD konumu şuydu:"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1124 builtin/checkout.c:1393
msgid "You are on a branch yet to be born"
msgstr "Henüz doğmamış bir dal üzerindesiniz"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1206
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12370,7 +12984,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:1186
+#: builtin/checkout.c:1213
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"
@@ -12390,51 +13004,57 @@
"isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultRemote=origin\n"
"ayarını yapmayı düşünün."
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1223
#, 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:1262
+#: builtin/checkout.c:1289
msgid "only one reference expected"
msgstr "yalnızca bir başvuru bekleniyordu"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1306
#, c-format
msgid "only one reference expected, %d given."
-msgstr "yalnızca bir başvuru bekleniyordu, %d verildi"
+msgstr "Yalnızca bir başvuru bekleniyordu, %d verildi."
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
#, c-format
msgid "invalid reference: %s"
msgstr "geçersiz başvuru: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1365 builtin/checkout.c:1744
#, c-format
msgid "reference is not a tree: %s"
msgstr "başvuru bir ağaca değil: %s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "bir dal bekleniyordu, '%s' etiketi alındı"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1415
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "bir dal bekleniyordu, '%s' uzak dalı alındı"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1417 builtin/checkout.c:1426
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "bir dal bekleniyordu, '%s' alındı"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1420
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "bir dal bekleniyordu, '%s' işlemesi alındı"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1429
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr ""
+"HEAD'i işlemede ayırmak istiyorsanız --detach seçeneğiyle yeniden deneyin."
+
+#: builtin/checkout.c:1442
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12442,7 +13062,7 @@
"Birleştirme yaparken dal değiştirilemiyor.\n"
"\"git merge --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12450,7 +13070,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:1415
+#: builtin/checkout.c:1450
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12458,7 +13078,7 @@
"Yeniden temellendirme yaparken dal değiştirilemiyor.\n"
"\"git rebase --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12466,7 +13086,7 @@
"Seç-al yaparken dal değiştirilemiyor.\n"
"\"git cherry-pick --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1458
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12474,210 +13094,194 @@
"Geriye al yaparken dal değiştirilemiyor.\n"
"\"git revert --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1462
msgid "you are switching branch while bisecting"
msgstr "ikili arama yaparken dal değiştiriyorsunuz"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1469
msgid "paths cannot be used with switching branches"
msgstr "dal değiştirilirken yollar kullanılamaz"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "dal değiştirilirken '%s' kullanılamaz"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
+#: builtin/checkout.c:1495 builtin/checkout.c:1500
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s', '%s' ile birlikte kullanılamaz"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1497
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s', <başlama-noktası> alamaz"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1505
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Dal, işleme olmayan '%s' ögesine değiştirilemez"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1512
msgid "missing branch or commit argument"
msgstr "dal veya işleme argümanı eksik"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1555
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:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1522
-msgid "conflict style (merge or diff3)"
-msgstr "çakışma stili (birleştirme veya diff3)"
+#: builtin/checkout.c:1557
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "çakışma stili (birleştirme, diff3 veya zdiff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1569 builtin/worktree.c:560
msgid "detach HEAD at named commit"
msgstr "adı verilen işlemede HEAD'i ayır"
-#: builtin/checkout.c:1535
-msgid "set upstream info for new branch"
-msgstr "yeni dal için üstkaynak bilgisi ayarla"
-
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1574
msgid "force checkout (throw away local modifications)"
msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new-branch"
msgstr "yeni dal"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new unparented branch"
msgstr "yeni üst ögesi olmayan dal"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1578 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "yok sayılan dosyaları güncelle (öntanımlı)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1581
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:1557
+#: builtin/checkout.c:1594
msgid "checkout our version for unmerged files"
msgstr "birleştirilmeyen dosyalar için bizdeki sürümü çıkış yap"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1597
msgid "checkout their version for unmerged files"
msgstr "birleştirilmeyen dosyalar için onlardaki sürümünü çıkış yap"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1601
msgid "do not limit pathspecs to sparse entries only"
msgstr "yol belirteçlerini yalnızca aralıklı girdilere kısıtlama"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1659
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c ve --orphan birlikte kullanılmaz"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "'-%c', '-%c' ve '%s' seçenekleri birlikte kullanılamaz"
-#: builtin/checkout.c:1626
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p ve --overlay birlikte kullanılmaz"
-
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1700
msgid "--track needs a branch name"
msgstr "--track için bir dal adı gerekli"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1705
#, c-format
msgid "missing branch name; try -%c"
msgstr "eksik dal adı; -%c deneyin"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1737
#, c-format
msgid "could not resolve %s"
msgstr "%s çözülemedi"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1753
msgid "invalid path specification"
msgstr "geçersiz yol belirtimi"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1760
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' bir işleme değil ve ondan bir '%s' dalı oluşturulamaz"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1764
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach bir '%s' yol argümanı almıyor"
-#: builtin/checkout.c:1736
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file, --detach ile uyumsuz"
-
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file, --patch ile uyumsuz"
-
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1789
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout: --ours/--theirs, --force ve --merge indeks çıkışı yapılırken\n"
-"birlikte kullanılamaz"
+"birlikte kullanılamaz."
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1794
msgid "you must specify path(s) to restore"
msgstr "eski durumuna getirilecek yolları belirtmelisiniz"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
+#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
+#: builtin/remote.c:173 builtin/submodule--helper.c:3038
+#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
+#: builtin/worktree.c:558
msgid "branch"
msgstr "dal"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1820
msgid "create and checkout a new branch"
msgstr "yeni bir dal oluştur ve çıkış yap"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1822
msgid "create/reset and checkout a branch"
msgstr "bir dal oluştur/sıfırla ve çıkış yap"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1823
msgid "create reflog for new branch"
msgstr "yeni dal için başvuru günlüğü oluştur"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1825
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:1790
+#: builtin/checkout.c:1826
msgid "use overlay mode (default)"
msgstr "yerpaylaşım kipini kullan (öntanımlı)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1874
msgid "create and switch to a new branch"
msgstr "yeni bir dal oluştur ve ona geç"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1876
msgid "create/reset and switch to a branch"
msgstr "bir dal oluştur/sıfırla ve ona geç"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1878
msgid "second guess 'git switch <no-such-branch>'"
msgstr "'git switch <böyle-bir-dal-yok>'a temkinli yaklaş"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1880
msgid "throw away local modifications"
msgstr "yerel değişiklikleri çöpe at"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1916
msgid "which tree-ish to checkout from"
msgstr "çıkış yapılacak ağacımsı"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1918
msgid "restore the index"
msgstr "indeksi eski durumuna getir"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1920
msgid "restore the working tree (default)"
msgstr "çalışma ağacını eski durumuna getir"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1922
msgid "ignore unmerged entries"
msgstr "birleştirilmemiş girdileri yok say"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1923
msgid "use overlay mode"
msgstr "yerpaylaşım kipini kullan"
@@ -12712,7 +13316,15 @@
msgid "could not lstat %s\n"
msgstr "%s 'lstat' yapılamadı\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Geçerli çalışma dizinini kaldırma reddediliyor\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Geçerli çalışma dizinini kaldırmayı reddederdim\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12725,7 +13337,7 @@
"foo - benzersiz öneke dayanarak bir öge seç\n"
" - (boş) hiçbir şey seçme\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12737,7 +13349,8 @@
"* - choose all items\n"
" - (empty) finish selecting\n"
msgstr ""
-"İstem yardımı:1 - tek bir öge seç\n"
+"İstem yardımı:\n"
+"1 - tek bir öge seç\n"
"3-5 - bir öge aralığı seç\n"
"2-3,6-9 - birden çok erim seç\n"
"foo - benzersiz öneke dayanarak bir öge seç\n"
@@ -12745,33 +13358,33 @@
"* - tüm ögeleri seç\n"
" - (boş) seçimi bitir\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Pardon (%s)?\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Girdi için yok sayma dizgileri>> "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "UYARI: Şununla eşleşen ögeler bulunamıyor: %s"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Silinecek ögeleri seçin"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "%s kaldırılsın mı [y/N]? "
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12789,52 +13402,52 @@
"help - bu ekranı görüntüle\n"
"? - istem seçimi için yardım"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
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:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Temizlenecek başka dosya yok, çıkılıyor."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "kaldırılan dosyaların adlarını yazdırma"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "zorla"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "etkileşimli temizlik"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "dizinleri tümüyle kaldır"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
+#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "dizgi"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "yok sayma kurallarına <dizgi> ekle"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "yok sayılan dosyalar da kaldırıldı"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "yalnızca yok sayılan dosyaları kaldır"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12842,7 +13455,7 @@
"clean.requireForce 'true' olarak ayarlanmış ve ne -i ne -n ne de -f "
"verilmiş; temizleme reddediliyor"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12850,220 +13463,218 @@
"clean.requireForce öntanımlı olarak 'true' ve ne -i ne -n ne de -f verilmiş; "
"temizleme reddediliyor"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x ve -X birlikte kullanılamaz"
-#: builtin/clone.c:45
+#: builtin/clone.c:47
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<seçenekler>] [--] <depo> [<dizin>]"
-#: builtin/clone.c:96
+#: builtin/clone.c:100
msgid "don't clone shallow repository"
msgstr "sığ depoyu klonlama"
-#: builtin/clone.c:98
+#: builtin/clone.c:102
msgid "don't create a checkout"
msgstr "çıkış yapma!"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "çıplak bir depo oluştur"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "create a mirror repository (implies bare)"
msgstr "bir yansı depo oluştur (çıplak ima eder)"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "to clone from a local repository"
msgstr "bir yerel depodan klonla"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "don't use local hardlinks, always copy"
msgstr "yerel sabit bağları kullanma, her zaman kopyala"
-#: builtin/clone.c:109
+#: builtin/clone.c:113
msgid "setup as shared repository"
msgstr "paylaşılan depo ayarla"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "pathspec"
msgstr "yol belirteci"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "initialize submodules in the clone"
msgstr "klon içerisindeki altmodülleri ilklendir"
-#: builtin/clone.c:115
+#: builtin/clone.c:119
msgid "number of submodules cloned in parallel"
msgstr "paralelde klonlanan altmodüllerin sayısı"
-#: builtin/clone.c:116 builtin/init-db.c:539
+#: builtin/clone.c:120 builtin/init-db.c:539
msgid "template-directory"
msgstr "şablon dizini"
-#: builtin/clone.c:117 builtin/init-db.c:540
+#: builtin/clone.c:121 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "şablonların kullanılacağı dizin"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
msgid "reference repository"
msgstr "başvuru deposu"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:127 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2721
msgid "use --reference only while cloning"
msgstr "--reference'ı yalnızca klonlarken kullan"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3967 builtin/repack.c:669
+#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "ad"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "use <name> instead of 'origin' to track upstream"
msgstr "üstkaynağı izlemek için 'origin' yerine <ad> kullan"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "uzak konumun HEAD'i yerine <dal>'ı çıkış yap"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "path to git-upload-pack on the remote"
msgstr "uzak konumdaki git-upload-pack'e olan yol"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
+#: builtin/pull.c:212
msgid "depth"
msgstr "derinlik"
-#: builtin/clone.c:131
+#: builtin/clone.c:135
msgid "create a shallow clone of that depth"
msgstr "verilen derinlikte sığ bir depo oluştur"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
+#: builtin/pull.c:215
msgid "time"
msgstr "zaman"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "create a shallow clone since a specific time"
msgstr "verilen zamandan sonrasını içeren bir sığ depo oluştur"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
msgid "revision"
msgstr "revizyon"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "revizyonu hariç tutarak sığ klonun geçmişini derinleştir"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:141 builtin/submodule--helper.c:1897
+#: builtin/submodule--helper.c:2735
msgid "clone only one branch, HEAD or --branch"
msgstr "yalnızca bir dal klonla, HEAD veya --branch"
-#: builtin/clone.c:139
+#: builtin/clone.c:143
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "etiket klonlama ve sonraki getirmeler de onları izlemesin"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "any cloned submodules will be shallow"
msgstr "klonlanan altmodüller sığ olacak"
-#: builtin/clone.c:142 builtin/init-db.c:548
+#: builtin/clone.c:146 builtin/init-db.c:548
msgid "gitdir"
msgstr "git dizini"
-#: builtin/clone.c:143 builtin/init-db.c:549
+#: builtin/clone.c:147 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "git dizinini çalışma ağacından ayır"
-#: builtin/clone.c:144
+#: builtin/clone.c:148
msgid "key=value"
msgstr "anahtar=değer"
-#: builtin/clone.c:145
+#: builtin/clone.c:149
msgid "set config inside the new repository"
msgstr "yapılandırmayı yeni deponun içinde ayarla"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "sunucuya özel"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "iletme seçeneği"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "yalnızca IPv4 adresleri kullan"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "yalnızca IPv6 adresleri kullan"
-#: builtin/clone.c:154
+#: builtin/clone.c:158
+msgid "apply partial clone filters to submodules"
+msgstr "altmodüllere kısımsal klon süzgeçlerini uygula"
+
+#: builtin/clone.c:160
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "klonlanan herhangi bir altmodül kendi uzak izleme dallarını kullanacak"
-#: builtin/clone.c:156
+#: builtin/clone.c:162
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
"sparse-checkout dosyasını yalnızca kökteki dosyaları içerecek biçimde "
"ilklendir"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Bir dizin adı tahmin edilemedi.\n"
-"Lütfen komut satırında bir dizin belirtin."
-
-#: builtin/clone.c:345
+#: builtin/clone.c:237
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: '%s' için alternatif eklenemedi: %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:310
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s var ve bir dizin değil"
-#: builtin/clone.c:436
+#: builtin/clone.c:328
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "yineleyici '%s' üzerinden çalıştırılamadı"
-#: builtin/clone.c:467
+#: builtin/clone.c:359
#, c-format
msgid "failed to create link '%s'"
msgstr "'%s' bağı oluşturulamadı"
-#: builtin/clone.c:471
+#: builtin/clone.c:363
#, c-format
msgid "failed to copy file to '%s'"
msgstr "dosya şuraya kopyalanamadı: '%s'"
-#: builtin/clone.c:476
+#: builtin/clone.c:368
#, c-format
msgid "failed to iterate over '%s'"
msgstr "'%s' üzerinde yinelenemedi"
-#: builtin/clone.c:503
+#: builtin/clone.c:395
#, c-format
msgid "done.\n"
msgstr "bitti.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:409
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13073,151 +13684,151 @@
"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:594
+#: builtin/clone.c:486
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Klonlanacak %s uzak dal bulunamadı."
-#: builtin/clone.c:713
+#: builtin/clone.c:603
#, c-format
msgid "unable to update %s"
msgstr "%s güncellenemiyor"
-#: builtin/clone.c:761
+#: builtin/clone.c:651
msgid "failed to initialize sparse-checkout"
msgstr "sparse-checkout ilklendirilemedi"
-#: builtin/clone.c:784
+#: builtin/clone.c:674
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:816
+#: builtin/clone.c:709
msgid "unable to checkout working tree"
msgstr "çalışma ağacı çıkış yapılamıyor"
-#: builtin/clone.c:894
+#: builtin/clone.c:793
msgid "unable to write parameters to config file"
msgstr "parametreler yapılandırma dosyasına yazılamıyor"
-#: builtin/clone.c:957
+#: builtin/clone.c:856
msgid "cannot repack to clean up"
msgstr "temizlik için yeniden paketlenemiyor"
-#: builtin/clone.c:959
+#: builtin/clone.c:858
msgid "cannot unlink temporary alternates file"
msgstr "geçici alternatifler dosyasının bağlantısı kesilemiyor"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:901
msgid "Too many arguments."
msgstr "Çok fazla argüman."
-#: builtin/clone.c:1005
+#: builtin/clone.c:905 contrib/scalar/scalar.c:413
msgid "You must specify a repository to clone."
msgstr "Klonlamak için bir depo belirtmelisiniz."
-#: builtin/clone.c:1018
+#: builtin/clone.c:918
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare ve --origin %s seçenekleri birbiriyle uyumsuz."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "'%s' ve '%s %s' seçenekleri birlikte kullanılamaz"
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare ve --separate-git-dir birbiriyle uyumsuz."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:935
#, c-format
msgid "repository '%s' does not exist"
msgstr "'%s' deposu mevcut değil"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:939 builtin/fetch.c:2176
#, c-format
msgid "depth %s is not a positive number"
msgstr "%s derinliği pozitif bir sayı değil"
-#: builtin/clone.c:1049
+#: builtin/clone.c:949
#, 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:1055
+#: builtin/clone.c:955
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "Depo yolu '%s' halihazırda mevcut ve boş bir dizin değil."
-#: builtin/clone.c:1069
+#: builtin/clone.c:969
#, c-format
msgid "working tree '%s' already exists."
msgstr "Çalışma ağacı '%s' halihazırda mevcut."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
+#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "şunun öncü dizinleri oluşturulamadı: '%s'"
-#: builtin/clone.c:1089
+#: builtin/clone.c:989
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "'%s' çalışma ağacı dizini oluşturulamadı"
-#: builtin/clone.c:1109
+#: builtin/clone.c:1009
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "'%s' çıplak deposuna klonlanıyor...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1011
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonlama konumu: '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1040
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:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' geçerli bir uzak konum adı değil"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1157
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:1231
+#: builtin/clone.c:1159
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:1233
+#: builtin/clone.c:1161
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:1235
+#: builtin/clone.c:1163
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:1240
+#: builtin/clone.c:1168
msgid "source repository is shallow, ignoring --local"
msgstr "kaynak depo sığ, --local yok sayılıyor"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1173
msgid "--local is ignored"
msgstr "--local yok sayıldı"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1185
+msgid "cannot clone from filtered bundle"
+msgstr "süzülmüş demetten klonlanamıyor"
+
+#: builtin/clone.c:1265 builtin/clone.c:1324
msgid "remote transport reported error"
msgstr "uzak konum taşıması hata bildirdi"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1277 builtin/clone.c:1289
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "%s uzak dalı %s üstkaynağında bulunamadı"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1292
msgid "You appear to have cloned an empty repository."
msgstr "Boş bir depoyu klonlamış görünüyorsunuz."
@@ -13253,13 +13864,13 @@
msgid "--command must be the first argument"
msgstr "--command ilk argüman olmalı"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <nsndzn>] [--shallow] [--[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13269,97 +13880,95 @@
"split[=<strateji>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <bölme-seçenekleri>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "'%s' ile eşleşen nesne dizini bulunamadı"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
msgid "dir"
msgstr "dizin"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "Grafiğin depolanacağı nesne dizini"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr "commit-graph parçalara bölünmüşse yalnızca uç dosyayı doğrula"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "commit-graph '%s' açılamadı"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "tanımlanamayan --split argümanı, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "beklenmedik onaltılık olmayan nesne kimliği: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "geçersiz nesne: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "tüm başvurularda gezinmeyi başlat"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "stdin tarafından listelenen paket indekslerini tara"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "stdin tarafından listelenen tüm işlemelerde gezinmeyi başlat"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr "halihazırda commit-graph dosyasında bulunan tüm işlemeleri içer"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "değiştirilen yollar için hesaplamayı etkinleştir"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "artan bir commit-graph dosyasının yazımına izin ver"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
"bir temel olmayan parçalara bölünmüş commit-graph içinde en çok olabilecek "
"işleme sayısı"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
"bölünmüş bir commit-graph'ın iki düzeyi arasında olabilecek en büyük oran"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "yalnızca verilen bir tarihten daha eski dosyaların hükmünü kaldır"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "Hesaplanacak en çok değiştirilen yollar için Bloom süzgeçleri sayısı"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"--reachable, --stdin-commits veya --stdin-packs'ten en çok birini kullan"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Girdiden işlemeler toplanıyor"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "tanımlanamayan altkomut: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13373,70 +13982,65 @@
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:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
#, c-format
msgid "not a valid object name %s"
msgstr "%s geçerli bir nesne adı değil"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: '%s' açılamadı"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: '%s' okunamadı"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: '%s' kapatılamadı"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "üst öge"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "bir üst işleme ögesinin no'su"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
+#: builtin/tag.c:455
msgid "message"
msgstr "ileti"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "işleme iletisi"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "işleme günlük iletisini dosyadan oku"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "işlemeyi GPG ile imzala"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "bir tam ağaç vermeli"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: okunamadı"
-#: builtin/commit.c:41
+#: builtin/commit.c:43
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<seçenekler>] [--] <yol-blrtç>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:48
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<seçenekler>] [--] <yol-blrtç>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:53
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13446,7 +14050,7 @@
"boş yapacaktır. Komutunuzu --allow-empty ile yineleyebilir veya\n"
"işlemeyi \"git reset HEAD^\" ile tümüyle kaldırabilirsiniz.\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:58
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13460,15 +14064,15 @@
"\tgit commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:65
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Aksi durumda, lütfen 'git rebase --skip' kullanın.\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:68
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
+#: builtin/commit.c:71
msgid ""
"and then use:\n"
"\n"
@@ -13490,73 +14094,69 @@
"\tgit cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:326
msgid "failed to unpack HEAD tree object"
msgstr "HEAD ağaç nesnesi açılamadı"
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file, -a ile bir anlam ifade etmiyor"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:376
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only içermeyen yollar bir anlam ifade etmiyor."
-#: builtin/commit.c:386
+#: builtin/commit.c:388
msgid "unable to create temporary index"
msgstr "geçici indeks oluşturulamıyor"
-#: builtin/commit.c:395
+#: builtin/commit.c:397
msgid "interactive add failed"
msgstr "etkileşimli ekleme başarısız"
-#: builtin/commit.c:410
+#: builtin/commit.c:412
msgid "unable to update temporary index"
msgstr "geçici indeks güncellenemiyor"
-#: builtin/commit.c:412
+#: builtin/commit.c:414
msgid "Failed to update main cache tree"
msgstr "Ana önbellek ağacı güncellenemedi"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
msgid "unable to write new_index file"
msgstr "new_index dosyası yazılamıyor"
-#: builtin/commit.c:489
+#: builtin/commit.c:491
msgid "cannot do a partial commit during a merge."
msgstr "Bir birleştirme sırasında kısmi işleme yapılamaz."
-#: builtin/commit.c:491
+#: builtin/commit.c:493
msgid "cannot do a partial commit during a cherry-pick."
msgstr "Bir seç-al sırasında kısmi işleme yapılamaz."
-#: builtin/commit.c:493
+#: builtin/commit.c:495
msgid "cannot do a partial commit during a rebase."
msgstr "Bir yeniden temellendirme sırasında kısmi işleme yapılamaz."
-#: builtin/commit.c:501
+#: builtin/commit.c:503
msgid "cannot read the index"
msgstr "indeks okunamıyor"
-#: builtin/commit.c:520
+#: builtin/commit.c:522
msgid "unable to write temporary index file"
msgstr "geçici indeks dosyası yazılamıyor"
-#: builtin/commit.c:618
+#: builtin/commit.c:620
#, c-format
msgid "commit '%s' lacks author header"
msgstr "'%s' işlemesinde yazar üstbilgisi yok"
-#: builtin/commit.c:620
+#: builtin/commit.c:622
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "'%s' işlemesindeki yazar satırı hatalı oluşturulmuş"
-#: builtin/commit.c:639
+#: builtin/commit.c:641
msgid "malformed --author parameter"
msgstr "hatalı oluşturulmuş --author parametresi"
-#: builtin/commit.c:692
+#: builtin/commit.c:694
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13564,43 +14164,43 @@
"mevcut işleme iletisinde kullanılmayan bir yorum\n"
"karakteri seçilemiyor"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
#, c-format
msgid "could not lookup commit %s"
msgstr "%s işlemesi aranamadı"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:762 builtin/shortlog.c:417
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(günlük iletisi standart girdi'den okunuyor)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:764
msgid "could not read log from standard input"
msgstr "günlük standart girdi'den okunamadı"
-#: builtin/commit.c:764
+#: builtin/commit.c:768
#, c-format
msgid "could not read log file '%s'"
msgstr "günlük dosyası '%s' okunamadı"
-#: builtin/commit.c:801
+#: builtin/commit.c:805
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "--fixup:%s ile -m birlikte kullanılamaz"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "'%s' ve '%s:%s' seçenekleri birlikte kullanılamaz"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:817 builtin/commit.c:833
msgid "could not read SQUASH_MSG"
msgstr "SQUASH_MSG okunamadı"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
msgid "could not read MERGE_MSG"
msgstr "MERGE_MSG okunamadı"
-#: builtin/commit.c:880
+#: builtin/commit.c:884
msgid "could not write commit template"
msgstr "işleme şablonu yazılamadı"
-#: builtin/commit.c:893
+#: builtin/commit.c:897
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13609,7 +14209,7 @@
"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n"
"satırlar yok sayılacaktır.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:899
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13618,7 +14218,7 @@
"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n"
"satırlar yok sayılacaktır. Boş bir ileti işlemeyi iptal eder.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:903
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13627,7 +14227,7 @@
"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n"
"satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:907
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13638,7 +14238,7 @@
"satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n"
"Boş bir ileti işlemeyi iptal eder.\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:919
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13652,7 +14252,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"ve yeniden deneyin.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:924
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13666,181 +14266,152 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"ve yeniden deneyin.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:951
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sYazar: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:959
#, c-format
msgid "%sDate: %s"
msgstr "%sTarih: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:966
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sİşleyici: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:984
msgid "Cannot read index"
msgstr "İndeks okunamıyor"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1029
msgid "unable to pass trailers to --trailers"
msgstr "--trailers'a artbilgiler geçirilemiyor"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1069
msgid "Error building trees"
msgstr "Ağaçlar yapılırken hata"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1083 builtin/tag.c:317
#, 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:1123
+#: builtin/commit.c:1128
#, 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:1137
+#: builtin/commit.c:1142
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Geçersiz yok sayılanları göster kipi '%s'"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1160 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Geçersiz izlenmeyen dosyaları göster kipi '%s'"
-#: builtin/commit.c:1195
-msgid "--long and -z are incompatible"
-msgstr "--long ve -z birbiriyle uyumsuz"
-
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Bir birleştirmenin tam ortasındasınız -- ileti değiştirilemiyor."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1233
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "Bir seç-al'ın tam ortasındasınız -- ileti değiştirilemiyor."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1236
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
msgstr ""
-"--fixup'ın ileti değiştirme seçeneği '%s' yolu ile birlikte kullanılamıyor"
+"'%s' ögesinin yeniden yazım seçeneği ve '%s' yolu birlikte kullanılamaz"
-#: builtin/commit.c:1233
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"--fixup'ın ileti değiştirme seçeneği --patch/--interactive/--all/--include/--"
-"only ile birlikte kullanılamaz"
+#: builtin/commit.c:1238
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "'%s' ögesinin yeniden yazım seçeneği ve '%s' birlikte kullanılamaz"
-#: builtin/commit.c:1252
-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:1261
+#: builtin/commit.c:1263
msgid "You have nothing to amend."
msgstr "Değiştirecek bir şeyiniz yok."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1266
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:1266
+#: builtin/commit.c:1268
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:1268
+#: builtin/commit.c:1270
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:1271
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "--squash ve --fixup seçenekleri birlikte kullanılamaz"
-
-#: builtin/commit.c:1281
-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:1283
-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:1292
+#: builtin/commit.c:1290
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:1310
-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:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "bilinmeyen seçenek: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "'%s ...' yolları -a ile bir anlam ifade etmiyor"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "durumu kısaca göster"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "dal bilgisini göster"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "zula bilgisini göster"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "tam önünde/arkasında değerlerini hesapla"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "sürüm"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:765
msgid "machine-readable output"
msgstr "makine tarafından okunabilir çıktı"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "durumu uzun biçimde göster (öntanımlı)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "girdileri NUL ile sonlandır"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
msgid "mode"
msgstr "kip"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
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:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13848,11 +14419,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:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:197
msgid "when"
msgstr "ne zaman"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13860,198 +14431,198 @@
"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:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "izlenmeyen dosyaları sütunlarla göster"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "yeniden adlandırmaları algılama"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr ""
"yeniden adlandırmaları algıla, isteğe bağlı olarak benzerlik indeksi ayarla"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Yok sayılan ve izlenmeyen dosyalar argümanlarının desteklenmeyen birlikte "
"kullanımı"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "başarılı işlemenin ardından özeti gizle"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "diff'i işleme iletisi şablonunda göster"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "İşleme iletisi seçenekleri"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
msgid "read message from file"
msgstr "iletiyi dosyadan oku"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "yazar"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "işleme yazarını geçersiz kıl"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:551
msgid "date"
msgstr "tarih"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "işleme tarihini geçersiz kıl"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:360 ref-filter.h:89
msgid "commit"
msgstr "işleme"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "belirtilen işlemenin iletisini düzenle ve yeniden kullan"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "belirtilen işlemenin iletisini yeniden kullan"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]işleme"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"belirtilen işlemeyi değiştirmek/iletiyi yeniden yazmak için kendiliğinden "
"tıkıştırma tarafından biçimlendirilen iletiyi kullan"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"belirtilen işlemeyi tıkıştırmak için kendiliğinden tıkıştırma tarafından "
"biçimlendirilen iletiyi kullan"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"işlemenin yazarı şu andan itibaren benim (-C/-c/--amend ile kullanıldı)"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "artbilgi"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "özel artbilgiler ekle"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "bir Signed-off-by artbilgisi ekle"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "belirtilen şablon dosyasını kullan"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "işlemeyi zorla düzenle"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "işleme iletisi şablonunda durumu içer"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "İşleme içeriği seçenekleri"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "değiştirilen tüm dosyaları gönder"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "belirtilen dosyaları işleme için indekse ekle"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "dosyaları etkileşimli olarak ekle"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "değişiklikleri etkileşimli olarak ekle"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "yalnızca belirtilen dosyaları gönder"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "pre-commit ve commit-msg kancalarını atla"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "neyin işleneceğini göster"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "önceki işlemeyi değiştir"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "post-rewrite kancasını atla"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "boş bir değişikliğin kaydı yazılabilir"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "boş iletili bir değişikliğin kaydı yazılabilir"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "MERGE_MODE okunamadı"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "işleme iletisi okunamadı: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
-msgstr "İşleme iletisinin boş olmasından dolayı iptal ediliyor.\n"
+msgstr "İşleme iletisinin boş bırakılmasından ötürü iptal ediliyor.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "İşleme iptal ediliyor; iletiyi düzenlenmedi.\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
-msgstr "İşleme iletisi gövdesinin boş olmasından dolayı iptal ediliyor.\n"
+msgstr "İşleme iletisi gövdesinin boş bırakılmasından ötürü iptal ediliyor.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14174,6 +14745,10 @@
msgid "Type"
msgstr "Tür"
+#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+msgid "type"
+msgstr "tür"
+
#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "değer bu türde verildi"
@@ -14388,10 +14963,6 @@
msgid "no such section: %s"
msgstr "böyle bir bölüm yok: %s"
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "yazdırma boyutları kişi tarafından okunabilir biçimde"
@@ -14417,7 +14988,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr "credential-cache--daemon kullanılamıyor; unix soket desteği yok"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache kullanılamıyor; unix soket desteği yok"
@@ -14559,7 +15130,7 @@
msgid "do not consider tags matching <pattern>"
msgstr "<dizgi> ile eşleşen etiketleri dikkate alma"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:595
msgid "show abbreviated commit object as fallback"
msgstr "kısaltılmış işleme nesnesini geri çekilinecek nesne olarak göster"
@@ -14575,25 +15146,14 @@
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "<im>'i bozuk çalışma ağacına iliştir (öntanımlı: \"-broken\")"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long, --abbrev=0 ile uyumsuz"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Hiçbir ad bulunamadı, hiçbir şey betimlenemiyor."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty, işlememsilerle uyumsuz"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken, işlememsilerle uyumsuz"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin ve --merge-base birlikte kullanılamaz"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "'%s' seçeneği ve işlememsiler birlikte kullanılamaz"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
@@ -14614,26 +15174,26 @@
msgid "%s...%s: no merge base"
msgstr "%s...%s: birleştirme temeli yok"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "Bir git deposu değil"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:537 builtin/grep.c:700
#, c-format
msgid "invalid object '%s' given."
msgstr "geçersiz nesne '%s' verildi"
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "ikiden çok ikili nesne verildi: '%s'"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "ele alınmayan nesne '%s' verildi"
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: çoklu birleştirme temelleri, %s kullanılıyor"
@@ -14642,113 +15202,106 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<seçenekler>] [<işleme> [<işleme>]] [--] [<yol>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "başarısız: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "%s sembolik bağı okunamadı"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "%s sembolik bağ dosyası okunamadı"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "%s nesnesi %s sembolik bağı için okunamadı"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
-"Birleştirilmiş diff biçimleri (-c ve --cc) dizin diff kipinde\n"
-"(-d ve --dir-diff) desteklenmiyor."
+"Birleştirilmiş diff biçimleri ('-c' ve '--cc') dizin diff kipinde\n"
+"('-d' ve '--dir-diff') desteklenmiyor."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "Her iki dosya da değiştirildi: '%s' ve '%s'."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "Çalışma ağacı dosyası bırakıldı."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "'%s' konumunda geçici dosyalar var."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "Bunları temizlemek veya kurtarmak isteyebilirsiniz."
-#: builtin/difftool.c:699
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "başarısız: %d"
+
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "'diff.tool' yerine 'diff.guitool' kullan"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "bir tam dizin diff'i gerçekleştir"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "bir diff aracı çalıştırmadan önce sorma"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "dir-diff kipinde sembolik bağlar kullan"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:700
msgid "tool"
msgstr "araç"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "belirtilen diff aracını kullan"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
-msgstr "'--tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar"
+msgstr ""
+"'--tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:706
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
"çalıştırılan bir diff aracı sıfır olmayan bir çıkış kodu döndürdüğünde 'git-"
"difftool'un çıkış yapmasını sağla"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "diff'leri görüntülemek için özel bir komut belirle"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "'diff'e aktarıldı"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool, çalışma ağacı veya --no-index gerektiriyor"
-#: builtin/difftool.c:741
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff, --no-index ile uyumsuz"
-
-#: builtin/difftool.c:744
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool ve --extcmd birlikte kullanılamaz"
-
-#: builtin/difftool.c:752
+#: builtin/difftool.c:745
msgid "no <tool> given for --tool=<tool>"
msgstr "--tool=<araç> için bir <araç> verilmedi"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:752
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "--extcmd=<komut> için bir <komut> verilmedi"
@@ -14756,10 +15309,6 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <seçenekler> <ortam-dğşkn>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
-msgid "type"
-msgstr "tür"
-
#: builtin/env--helper.c:46
msgid "default for git_env_*(...) to fall back on"
msgstr "git_env_*(...)'ın geri çekileceği öntanımlı"
@@ -14785,252 +15334,248 @@
"bekliyor, '%s' değil"
#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [rev-list-opts]"
+msgid "git fast-export [<rev-list-opts>]"
+msgstr "git fast-export [<revizyon-listesi-seçenekleri>]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Hata: İç içe geçmiş etiketler --mark-tags belirtilmediği sürece dışa "
"aktarılamaz."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "--anonymize-map jetonu boş olamaz"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "<n> nesneden sonra ilerlemeyi göster"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "imzalanan etiketlerin nasıl ele alınacağını seçin"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "nesnelerce süzülen etiketlerin nasıl ele alınacağını seçin"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"başka bir kodlamaya iye işleme iletilerinin nasıl ele alınacağını seçin"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "imleri bu dosyaya boşalt"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "imleri bu dosyadan içe aktar"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "eğer varsa bu dosyadan imleri içe aktar"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr "etiketlerin bir etiketleyicisi yoksa varmış gibi davran"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "her işleme için tüm ağacın çıktısını ver"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "akışı sonlandırmak için 'done' özelliğini kullan"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "ikili nesne verisi çıktısını atla"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1860
msgid "refspec"
msgstr "başvuru belirteci"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "başvuru belirtecini dışa aktarılan başvurulara uygula"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "çıktı kimliğini gizle"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "kimden:kime"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "<kimden> ve <kime>'yi anonimleştirilmiş çıktıda dönüştür"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr "'fast-export' akışında olmayan üst ögelere nesne numarası ile başvur"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "ikili nesnelerin/işlemelerin orijinal nesne numaralarını göster"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "etiketleri im numaralarıyla adlandır"
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map, --anonymize olmadan bir anlam ifade etmiyor"
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "Hem --import-marks ve hem --import-marks-if-exists aktarılamadı"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3097
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "'%s' altmodülü için '(on)-dan' imleri eksik"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3099
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "'%s' altmodülü için '(o)-na' imleri eksik"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3234
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "'mark' komutu bekleniyordu, %s alındı"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3239
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "'to' komutu bekleniyordu, %s alındı"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3331
msgid "Expected format name:filename for submodule rewrite option"
msgstr "Altmodül yeniden yazım seçeneği için name:filename biçimi bekleniyordu"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3386
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "'%s' özelliği --allow-unsafe-features olmadan girdide yasaklı"
-#: builtin/fetch-pack.c:242
+#: builtin/fetch-pack.c:246
#, c-format
msgid "Lockfile created but not reported: %s"
msgstr "Kilit dosyası oluşturuldu; ancak raporlanmadı: %s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<seçenekler>] <grup>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<seçenekler>] [(<depo> | <grup>)...]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<seçenekler>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:124
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel negatif olamaz"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:147 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "tüm uzak konumlardan getir"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:149 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "git pull/fetch için üstkaynak ayarla"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:151 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ".git/FETCH_HEAD'in üzerine yazmak yerine ona iliştir"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:153
msgid "use atomic transaction to update references"
msgstr "başvuruları güncellemek için atomsal işlem kullan"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:155 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "uzak uçtaki yükleme paketine olan yol"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
msgid "force overwrite of local reference"
msgstr "yerel başvurunun üzerine zorla yaz"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:158
msgid "fetch from multiple remotes"
msgstr "birden çok uzak konumdan getir"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:160 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "tüm etiketleri ve ilişkilendirilen nesneleri getir"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
msgid "do not fetch all tags (--no-tags)"
msgstr "tüm etiketleri getirme (--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:164
msgid "number of submodules fetched in parallel"
msgstr "paralelde getirilen altmodüllerin sayısı"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:166
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
"başvuru belirtecini tüm başvuruları refs/prefetch/'e yerleştirecek biçimde "
"değiştir"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:168 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "artık uzak konumda olmayan uzak izleme dallarını buda"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:170
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:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
msgid "on-demand"
msgstr "istek üzerine"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:172
msgid "control recursive fetching of submodules"
msgstr "altmodüllerin özyineli getirilmesini denetle"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:177
msgid "write fetched references to the FETCH_HEAD file"
msgstr "getirilen başvuruları FETCH_HEAD dosyasına yaz"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:178 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "indirilen paketi tut"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:180
msgid "allow updating of HEAD ref"
msgstr "HEAD başvurusunun güncellenmesine izin ver"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "sığ klonun geçmişini derinleştir"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:185 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "zamana bağlı olarak sığ deponun geçmişini derinleştir"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:191 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "tam bir depoya dönüştür"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:194
+msgid "re-fetch without negotiating common commits"
+msgstr "ortak işlemeleri pazarlık etmeden yeniden getir"
+
+#: builtin/fetch.c:197
msgid "prepend this to submodule path output"
msgstr "bunu altmodül yol çıktısının başına ekle"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:200
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -15038,141 +15583,141 @@
"altmodüllerin özyineli getirilmesi için öntanımlı (yapılandırma "
"dosyalarından daha az önceliğe iye)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:204 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr ".git/shallow'u güncelleyen başvuruları kabul et"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:205 builtin/pull.c:230
msgid "refmap"
msgstr "ilgili başvuru"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:206 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "getirme ile ilgili başvuruları belirt"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:213 builtin/pull.c:244
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:210
+#: builtin/fetch.c:215
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
"bir paket dosyasını getirme; bunun yerine pazarlık ipuçlarının atalarını "
"yazdır"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:218 builtin/fetch.c:220
msgid "run 'maintenance --auto' after fetching"
msgstr "getirme sonrasında 'maintenance --auto' çalıştır"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:222 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "tüm güncellenmiş dalları zorlanmış güncellemeler için denetle"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:224
msgid "write the commit-graph after fetching"
msgstr "getirdikten sonra işleme grafiğini yaz"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:226
msgid "accept refspecs from stdin"
msgstr "başvuru belirteçlerini stdin'den oku"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Uzak HEAD başvurusu bulunamadı"
+#: builtin/fetch.c:618
+msgid "couldn't find remote ref HEAD"
+msgstr "uzak HEAD başvurusu bulunamadı"
-#: builtin/fetch.c:757
-#, 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:856
+#: builtin/fetch.c:893
#, c-format
msgid "object %s not found"
msgstr "%s nesnesi bulunamadı"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:897
msgid "[up to date]"
msgstr "[güncel]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
msgid "[rejected]"
msgstr "[reddedildi]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:911
msgid "can't fetch in current branch"
msgstr "geçerli dalda getirme yapılamıyor"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:912
+msgid "checked out in another worktree"
+msgstr "başka bir çalışma ağacında çıkış yapıldı"
+
+#: builtin/fetch.c:922
msgid "[tag update]"
msgstr "[etiket güncellemesi]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
+#: builtin/fetch.c:994
msgid "unable to update local ref"
msgstr "yerel başvuru güncellenemiyor"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:927
msgid "would clobber existing tag"
msgstr "var olan etiketi değiştirecektir"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:949
msgid "[new tag]"
msgstr "[yeni etiket]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:952
msgid "[new branch]"
msgstr "[yeni dal]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:955
msgid "[new ref]"
msgstr "[yeni başvuru]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:994
msgid "forced update"
msgstr "zorlanmış güncelleme"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:999
msgid "non-fast-forward"
msgstr "ileri sarım değil"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1102
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'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"Getirme normalde hangi dallarda zorla güncelleme yapıldığını belirtir,\n"
-"ancak bu denetleme kapatılmış. Yeniden açmak için --show-forced-updates\n"
+"Getirme normalde hangi dallarda zorla güncelleme yapıldığını belirtir;\n"
+"ancak bu denetleme kapatılmış. Yeniden açmak için '--show-forced-updates'\n"
"bayrağını kullanın veya 'git config fetch.showForcedUpdates true' çalıştırın."
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1106
#, c-format
msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-"Zorla güncellemeleri denetleme %.2f saniye sürdü. --no-show-forced-updates\n"
+"Zorla güncellemeleri denetleme %.2f saniye sürdü. '--no-show-forced-"
+"updates'\n"
"kullanarak veya 'git config fetch.showForcedUpdates false' çalıştırarak\n"
"bu denetlemeden kaçınabilirsiniz.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1136
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s tüm gerekli nesneleri göndermedi\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1156
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "%s reddedildi; çünkü sığ köklerin güncellenmesine izin verilmiyor"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1259 builtin/fetch.c:1418
#, c-format
msgid "From %.*s\n"
msgstr "Şu konumdan: %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1269
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15181,138 +15726,143 @@
"bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n"
"kullanarak eski ve çakışan dalları kaldırmayı deneyin"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1377
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sarkacak)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1378
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s sarkmaya başladı)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1421
msgid "[deleted]"
msgstr "[silindi]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1422 builtin/remote.c:1153
msgid "(none)"
msgstr "(hiçbiri)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1446
#, 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"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "'%s' dalına getirme reddediliyor, '%s' konumunda çıkış yapıldı"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1466
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+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:1406
+#: builtin/fetch.c:1469
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
msgstr "\"%s\" seçeneği %s için yok sayılıyor\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1496
+#, c-format
+msgid "the object %s does not exist"
+msgstr "%s diye bir nesne yok"
+
+#: builtin/fetch.c:1748
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1760
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"HEAD'in üst kaynağı '%s' olarak '%s' konumundan ayarlanamadı; çünkü herhangi "
+"bir dala işaret etmiyor."
+
+#: builtin/fetch.c:1773
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:1635
+#: builtin/fetch.c:1775
msgid "not setting upstream for a remote tag"
msgstr "bir uzak konum etiketi için üstkaynak ayarlanmıyor"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1777
msgid "unknown branch type"
msgstr "bilinmeyen dal türü"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1779
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
"Kaynak dal bulunamadı.\n"
"--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1904 builtin/fetch.c:1967
#, c-format
msgid "Fetching %s\n"
msgstr "%s getiriliyor\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1914 builtin/fetch.c:1969
#, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
msgstr "%s getirilemedi"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1926
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "'%s' getirilemedi (çıkış kodu: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:2030
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
"Bir uzak dal belirtilmedi. Lütfen yeni revizyonların\n"
-"alınacağı bir URL veya uzak konum adı belirtin."
+"getirileceği bir URL veya uzak konum adı belirtin."
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Bir etiket adı belirtmeniz gerekiyor."
+#: builtin/fetch.c:2066
+msgid "you need to specify a tag name"
+msgstr "bir etiket adı belirtmeniz gerekiyor"
-#: builtin/fetch.c:1994
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
-msgstr ""
-"--negotiate-only'nin bir veya daha çok --negotiate-tip=* gereksinimi var"
+#: builtin/fetch.c:2156
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
+msgstr "--negotiate-only'e bir veya daha çok --negotiation-tip=* gerekiyor"
-#: builtin/fetch.c:1998
-msgid "Negative depth in --deepen is not supported"
-msgstr "--deepen için negatif derinlik desteklenmiyor"
+#: builtin/fetch.c:2160
+msgid "negative depth in --deepen is not supported"
+msgstr "--deepen içinde negatif derinlik desteklenmiyor"
-#: builtin/fetch.c:2000
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen ve --depth birlikte kullanılamaz"
-
-#: builtin/fetch.c:2005
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth ve --unshallow birlikte kullanılamaz"
-
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2169
msgid "--unshallow on a complete repository does not make sense"
msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2186
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all bir depo argümanı almıyor"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2188
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:2035
+#: builtin/fetch.c:2197
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Böyle bir uzak konum veya uzak konum grubu yok: %s"
+msgid "no such remote or remote group: %s"
+msgstr "böyle bir uzak konum veya uzak konum grubu yok: %s"
-#: builtin/fetch.c:2042
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2205
+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"
+"bir grubu getirme ve başvuru belirteçleri tanımlama bir anlam ifade etmiyor"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2221
msgid "must supply remote when using --negotiate-only"
msgstr "--negotiate-only kullanırken uzak konum sağlanmalıdır"
-#: builtin/fetch.c:2063
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Protokol, --negotiate-only desteklemiyor, çıkılıyor."
+#: builtin/fetch.c:2226
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "protokol, --negotiate-only desteklemediğinden çıkılıyor"
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2246
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15320,11 +15870,11 @@
"--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum "
"ile kullanılabilir."
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2250
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2254
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
"--stdin seçeneği yalnızca bir uzak konumdan getirilirken kullanılabilir"
@@ -15335,23 +15885,27 @@
msgstr ""
"git fmt-merge-msg [-m <ileti>] [--log[=<n>] | --no-log] [--file <dosya>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr "günlüğü kısa günlükten en az <n> girdi ile doldur"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "--log için arma (kullanılmamalı)"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "metin"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "iletinin başlangıcı olarak <metin> kullan"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "gerçek hedef dal yerine <ad> kullan"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "okunacak dosya"
@@ -15371,47 +15925,47 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<işleme>]] [--no-contains [<işleme>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "yer tutucuları kabuğun anlayabileceği biçimde tırnak içine al"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "yer tutucuları perl'in anlayabileceği biçimde tırnak içine al"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "yer tutucuları python'un anlayabileceği biçimde tırnak içine al"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "yer tutucuları Tcl'nin anlayabileceği biçimde tırnak içine al"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "yalnızca <n> eşleşen başvuruyu göster"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:42 builtin/tag.c:482
msgid "respect format colors"
msgstr "biçim renklerine uy"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "yalnızca verilen nesneye işaret eden başvuruları yazdır"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "yalnızca birleştirilen başvuruları yazdır"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "yalnızca birleştirilmemiş başvuruları yazdır"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "yalnızca işlemeyi içeren başvuruları yazdır"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "yalnızca işlemeyi içermeyen başvuruları yazdır"
@@ -15547,133 +16101,255 @@
msgid "notice: No default references"
msgstr "Uyarı: Öntanımlı başvurular yok"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: sağlama yolu uyuşmazlığı, şurada bulundu: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: nesne hasar görmüş veya kayıp: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: nesne bilinmeyen bir türde: '%s': %s"
+
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: nesne ayrıştırılamadı: %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "hatalı sha1 dosyası: %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "Nesne dizini denetleniyor"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "Nesne dizinleri denetleniyor"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "%s bağ denetleniyor"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:710 builtin/index-pack.c:862
#, c-format
msgid "invalid %s"
msgstr "geçersiz %s"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s garip bir şeye işaret ediyor (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: ayrık HEAD bir şeye işaret etmiyor"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "Uyarı: %s henüz doğmamış bir dala işaret ediyor (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "Önbellek ağacı denetleniyor"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: cache-tree içinde geçersiz sha1 işaretçisi"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "cache-tree içinde ağaç olmayan öge"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<seçenekler>] [<nesne>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "ulaşılamayan nesneleri göster"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "sarkan nesneleri göster"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "etiketleri bildir"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "kök düğümleri bildir"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "indeks nesnelerini dal ucu düğümü yap"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "başvuru günlüklerini dal ucu düğümü yap (öntanımlı)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "yalnızca bağlanabilirliği denetle"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr "daha kesin denetlemeyi etkinleştir"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "sarkan nesneleri .git/lost-found'a yaz"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "ilerlemeyi göster"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "ulaşılabilir nesneler için ayrıntılı adları göster"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Nesneler denetleniyor"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s: nesne kayıp"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı"
+#: builtin/fsmonitor--daemon.c:13
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [<seçenekler>]"
+
+#: builtin/fsmonitor--daemon.c:14
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [<seçenekler>]"
+
+#: builtin/fsmonitor--daemon.c:15
+msgid "git fsmonitor--daemon stop"
+msgstr "git fsmonitor--daemon stop"
+
+#: builtin/fsmonitor--daemon.c:16
+msgid "git fsmonitor--daemon status"
+msgstr "git fsmonitor--daemon status"
+
+#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "'%s' değeri erim dışında: %d"
+
+#: builtin/fsmonitor--daemon.c:57
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "'%s' değeri Boole veya tamsayı değil: %d"
+
+#: builtin/fsmonitor--daemon.c:99
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr "fsmonitor-daemon, '%s' ögesini izliyor\n"
+
+#: builtin/fsmonitor--daemon.c:104
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr "fsmonitor-daemon, '%s' ögesini izlemiyor\n"
+
+#: builtin/fsmonitor--daemon.c:170
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "fsmonitor çerezi '%s' oluşturulamadı"
+
+#: builtin/fsmonitor--daemon.c:753
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr "fsmonitor: cookie_result '%d' != SEEN"
+
+#: builtin/fsmonitor--daemon.c:1187
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr "'%s' üzerinde IPC iş parçacığı havuzu başlatılamadı"
+
+#: builtin/fsmonitor--daemon.c:1199
+msgid "could not start fsmonitor listener thread"
+msgstr "fsmonitor dinleyici iş parçacığı başlatılamadı"
+
+#: builtin/fsmonitor--daemon.c:1297
+msgid "could not initialize listener thread"
+msgstr "dinleyici iş parçacığı ilklendirilemedi"
+
+#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr "fsmonitor--daemon, halihazırda '%s' çalıştırıyor"
+
+#: builtin/fsmonitor--daemon.c:1332
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr "fsmonitor-daemon '%s' içinde çalışıyor\n"
+
+#: builtin/fsmonitor--daemon.c:1387
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "'%s' içinde fsmonitor-daemon başlatılıyor\n"
+
+#: builtin/fsmonitor--daemon.c:1413
+msgid "daemon failed to start"
+msgstr "ardalan süreci başlatılamadı"
+
+#: builtin/fsmonitor--daemon.c:1416
+msgid "daemon not online yet"
+msgstr "ardalan süreci henüz çalışmaya başlamadı"
+
+#: builtin/fsmonitor--daemon.c:1419
+msgid "daemon terminated"
+msgstr "ardalan süreci sonlandırıldı"
+
+#: builtin/fsmonitor--daemon.c:1429
+msgid "detach from console"
+msgstr "konsoldan ayrıl"
+
+#: builtin/fsmonitor--daemon.c:1432
+msgid "use <n> ipc worker threads"
+msgstr "<n> ipc işçisi iş parçacığı kullan"
+
+#: builtin/fsmonitor--daemon.c:1435
+msgid "max seconds to wait for background daemon startup"
+msgstr "ardalan sürecinin başlaması için beklenecek en çok saniye"
+
+#: builtin/fsmonitor--daemon.c:1449
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "geçersiz 'ipc-threads' değeri (%d)"
+
+#: builtin/fsmonitor--daemon.c:1464
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "İşlenmemiş altkomut '%s'"
+
+#: builtin/fsmonitor--daemon.c:1477
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr "fsmonitor--daemon bu platformda desteklenmiyor"
+
#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<seçenekler>]"
@@ -15688,77 +16364,72 @@
msgid "failed to parse '%s' value '%s'"
msgstr "'%s' değeri '%s' ayrıştırılamadı"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "'%s' bilgileri alınamıyor"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr "'%s' okunamıyor"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
-"En son yapılan 'gc' işlemi aşağıdakileri bildirdi. Lütfen sorunun ana\n"
-"nedenini düzeltin ve %s ögesini kaldırın.\n"
-"Kendiliğinden temizlik dosya kaldırılana değin gerçekleştirilmeyecektir.\n"
+"En son yapılan gc işlemi aşağıdakileri bildirdi. Lütfen sorunun ana\n"
+"nedenini düzeltin ve %s ögesini kaldırın. Kendiliğinden temizlik\n"
+"dosya kaldırılana değin gerçekleştirilmeyecektir.\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "başvurulmayan nesneleri buda"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "biraz daha titiz ol (artırılmış işleyiş süresi)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "auto-gc kipini etkinleştir"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr "başka bir gc çalışıyor olsa bile zorla gc çalıştır"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "en büyük paket dışındaki diğer tüm paketleri yeniden paketle"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "gc.logexpiry değeri %s ayrıştırılamadı"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "'prune expiry' değeri %s ayrıştırılamadı"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "En iyi başarım için depo arka planda kendiliğinden paketleniyor.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "En iyi başarım için depo kendiliğinden paketleniyor.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "El ile ortalık temizliği için \"git help gc\"ye bakın.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -15766,32 +16437,32 @@
"gc %s makinesinde halihazırda çalışıyor (pid %<PRIuMAX> - çalışmıyorsa --"
"force kullanın)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Çok fazla ulaşılabilir boşta nesne var; kaldırmak için 'git prune' kullanın."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<görev>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "--no-schedule kullanımına izin yok"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "tanımlanamayan --schedule argümanı, %s"
-#: builtin/gc.c:869
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "commit-graph yazılamadı"
-#: builtin/gc.c:905
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "uzak konumlar önden getirilemedi"
@@ -15803,146 +16474,186 @@
msgid "failed to finish 'git pack-objects' process"
msgstr "'git pack-objects' işlemi bitirilemedi"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "multi-pack-index yazılamadı"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "'git multi-pack-index expire' başarısız oldu"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "'git multi-pack-index repack' başarısız oldu"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"incremental-repack görevi atlanıyor; çünkü core.multiPackIndex devre dışı"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "kilit dosyası '%s' mevcut, bakım atlanıyor"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "'%s' görevi başarısız oldu"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' geçerli bir görev değil"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "'%s' görevi birden çok kez seçilemez"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "görevleri deponun durumuna göre çalıştır"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "sıklık"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "görevleri sıklığa göre çalıştır"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "stderr üzerinden ilerlemeyi veya başka bir bilgiyi raporlama"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
msgid "task"
msgstr "görev"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "belirli bir görevi çalıştır"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "tek kezde --auto ve --schedule=<sıklık>'tan birini kullan"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "'git config' çalıştırılamadı"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "'%s' yolu oluşturulamadı"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "launchctl başlatılamadı"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "'%s' için dizinler oluşturulamadı"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "%s servisi özyüklenemedi"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "geçici xml dosyası oluşturulamadı"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "schtasks başlatılamadı"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr "'crontab -l' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "'crontab' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "'crontab' stdin'i açılamadı"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "'crontab' beklenmedik bir biçimde sonlandı"
-#: builtin/gc.c:1976
-msgid "another process is scheduling background maintenance"
-msgstr "başka bir işlem arka plan bakımı zamanının ayarlıyor"
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "systemctl başlatılamadı"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "systemctl çalıştırılamadı"
+
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
+#: builtin/worktree.c:1024
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "'%s' silinemedi"
+
+#: builtin/gc.c:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "tanımlanamayan --scheduler argümanı, '%s'"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "ne systemd zamanlayıcıları ne de crontab mevcut değil"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s planlayıcısı mevcut değil"
+
+#: builtin/gc.c:2449
+msgid "another process is scheduling background maintenance"
+msgstr "başka bir işlem arka plan bakımı zamanını planlıyor"
+
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<görev-planlayıcı>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "görev planlayıcı"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "git bakımını tetikleyecek görev planlayıcı"
+
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "depo, global yapılandırmaya eklenemedi"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <altkomut> [<seçenekler>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "geçersiz altkomut: %s"
-#: builtin/grep.c:30
+#: builtin/grep.c:32
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<seçenekler>] [-e] <dizgi> [<rev>...] [[--] <yol>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:241
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: iş parçacığı oluşturulamadı: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:295
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "geçersiz belirtilen iş parçacığı sayısı (%d), %s için"
@@ -15951,263 +16662,255 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3150
#, c-format
msgid "no threads support, ignoring %s"
msgstr "iş parçacığı desteği yok, %s yok sayılıyor"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
#, c-format
msgid "unable to read tree (%s)"
msgstr "ağaç okunamıyor (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:674
#, 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:738
+#: builtin/grep.c:754
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "'%c' anahtarı sayısal bir değer bekliyor"
-#: builtin/grep.c:837
+#: builtin/grep.c:852
msgid "search in index instead of in the work tree"
msgstr "çalışma ağacı yerine indekste ara"
-#: builtin/grep.c:839
+#: builtin/grep.c:854
msgid "find in contents not managed by git"
msgstr "git tarafından yönetilmeyen içerikte bul"
-#: builtin/grep.c:841
+#: builtin/grep.c:856
msgid "search in both tracked and untracked files"
msgstr "hem izlenen hem izlenmeyen dosyalar içinde ara"
-#: builtin/grep.c:843
+#: builtin/grep.c:858
msgid "ignore files specified via '.gitignore'"
msgstr "'.gitignore'da belirtilen dosyaları yok say"
-#: builtin/grep.c:845
+#: builtin/grep.c:860
msgid "recursively search in each submodule"
msgstr "her altmodülde özyineli olarak ara"
-#: builtin/grep.c:848
+#: builtin/grep.c:863
msgid "show non-matching lines"
msgstr "eşleşmeyen satırları göster"
-#: builtin/grep.c:850
+#: builtin/grep.c:865
msgid "case insensitive matching"
msgstr "BÜYÜK/küçük harf duyarsız eşleşme"
-#: builtin/grep.c:852
+#: builtin/grep.c:867
msgid "match patterns only at word boundaries"
msgstr "yalnızca sözcük sınırlarındaki dizgileri eşleştir"
-#: builtin/grep.c:854
+#: builtin/grep.c:869
msgid "process binary files as text"
msgstr "ikili dosyaları metin olarak işle"
-#: builtin/grep.c:856
+#: builtin/grep.c:871
msgid "don't match patterns in binary files"
msgstr "ikili dosyalardaki dizgileri eşleştirme"
-#: builtin/grep.c:859
+#: builtin/grep.c:874
msgid "process binary files with textconv filters"
msgstr "ikili dosyaları textconv süzgeçleri ile işle"
-#: builtin/grep.c:861
+#: builtin/grep.c:876
msgid "search in subdirectories (default)"
msgstr "altdizinlerde ara (öntanımlı)"
-#: builtin/grep.c:863
+#: builtin/grep.c:878
msgid "descend at most <depth> levels"
msgstr "en çok <derinlik> düzey in"
-#: builtin/grep.c:867
+#: builtin/grep.c:882
msgid "use extended POSIX regular expressions"
msgstr "genişletilmiş POSIX düzenli ifadelerini kullan"
-#: builtin/grep.c:870
+#: builtin/grep.c:885
msgid "use basic POSIX regular expressions (default)"
msgstr "temel POSIX düzenli ifadelerini kullan (öntanımlı)"
-#: builtin/grep.c:873
+#: builtin/grep.c:888
msgid "interpret patterns as fixed strings"
msgstr "dizgileri sabit diziler olarak yorumla"
-#: builtin/grep.c:876
+#: builtin/grep.c:891
msgid "use Perl-compatible regular expressions"
msgstr "Perl uyumlu düzenli ifadeler kullan"
-#: builtin/grep.c:879
+#: builtin/grep.c:894
msgid "show line numbers"
msgstr "satır numaralarını göster"
-#: builtin/grep.c:880
+#: builtin/grep.c:895
msgid "show column number of first match"
msgstr "ilk eşleşmenin sütun numarasını göster"
-#: builtin/grep.c:881
+#: builtin/grep.c:896
msgid "don't show filenames"
msgstr "dosya adlarını gösterme"
-#: builtin/grep.c:882
+#: builtin/grep.c:897
msgid "show filenames"
msgstr "dosya adlarını göster"
-#: builtin/grep.c:884
+#: builtin/grep.c:899
msgid "show filenames relative to top directory"
msgstr "dosya adlarını en üst dizine göreceli olarak göster"
-#: builtin/grep.c:886
+#: builtin/grep.c:901
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:888
+#: builtin/grep.c:903
msgid "synonym for --files-with-matches"
msgstr "--files-with-matches eşanlamlısı"
-#: builtin/grep.c:891
+#: builtin/grep.c:906
msgid "show only the names of files without match"
msgstr "eşleşme olmadan yalnızca dosya adlarını göster"
-#: builtin/grep.c:893
+#: builtin/grep.c:908
msgid "print NUL after filenames"
msgstr "dosya adlarından sonra NUL yazdır"
-#: builtin/grep.c:896
+#: builtin/grep.c:911
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:898
+#: builtin/grep.c:913
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:899
+#: builtin/grep.c:914
msgid "highlight matches"
msgstr "eşleşmeleri vurgula"
-#: builtin/grep.c:901
+#: builtin/grep.c:916
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:903
+#: builtin/grep.c:918
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:906
+#: builtin/grep.c:921
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:909
+#: builtin/grep.c:924
msgid "show <n> context lines before matches"
msgstr "eşleşmelerden önce <n> satır bağlam göster"
-#: builtin/grep.c:911
+#: builtin/grep.c:926
msgid "show <n> context lines after matches"
msgstr "eşleşmelerden sonra <n> satır bağlam göster"
-#: builtin/grep.c:913
+#: builtin/grep.c:928
msgid "use <n> worker threads"
msgstr "<n> iş parçacığı kullan"
-#: builtin/grep.c:914
+#: builtin/grep.c:929
msgid "shortcut for -C NUM"
msgstr "-C NUM için kısayol"
-#: builtin/grep.c:917
+#: builtin/grep.c:932
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:919
+#: builtin/grep.c:934
msgid "show the surrounding function"
msgstr "çevresindeki işlevi göster"
-#: builtin/grep.c:922
+#: builtin/grep.c:937
msgid "read patterns from file"
msgstr "dizgileri dosyadan oku"
-#: builtin/grep.c:924
+#: builtin/grep.c:939
msgid "match <pattern>"
msgstr "<dizgi> ile eşleş"
-#: builtin/grep.c:926
+#: builtin/grep.c:941
msgid "combine patterns specified with -e"
msgstr "-e ile belirtilen dizgileri birleştir"
-#: builtin/grep.c:938
+#: builtin/grep.c:953
msgid "indicate hit with exit status without output"
msgstr "çıkış durumu ile olan eşleşmelerde çıktı verme"
-#: builtin/grep.c:940
+#: builtin/grep.c:955
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:943
+#: builtin/grep.c:958
msgid "pager"
msgstr "sayfalayıcı"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "show matching files in the pager"
msgstr "sayfalayıcıda eşleşen dosyaları göster"
-#: builtin/grep.c:947
+#: builtin/grep.c:962
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:1013
+#: builtin/grep.c:1028
msgid "no pattern given"
msgstr "bir dizgi verilmedi"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1064
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index veya --untracked revizyonlarla birlikte kullanılamaz"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1072
#, c-format
msgid "unable to resolve revision: %s"
msgstr "revizyon çözülemiyor: %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1102
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked, --recurse-submodules ile desteklenmiyor"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1106
msgid "invalid option combination, ignoring --threads"
msgstr "geçersiz seçenek birleştirmesi, --threads yok sayılıyor"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1109 builtin/pack-objects.c:4084
msgid "no threads support, ignoring --threads"
msgstr "iş parçacığı desteği yok, --threads yok sayılıyor"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "geçersiz belirtilen iş parçacığı sayısı (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1146
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:1157
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached veya --untracked, --no-index ile birlikte kullanılamıyor"
-
-#: builtin/grep.c:1160
-msgid "--untracked cannot be used with --cached"
-msgstr "--untracked, --cached ile birlikte kullanılamıyor"
-
-#: builtin/grep.c:1166
+#: builtin/grep.c:1179
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:1174
+#: builtin/grep.c:1187
msgid "both --cached and trees are given"
msgstr "hem --cached hem ağaçlar verilmiş"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16215,97 +16918,101 @@
"git hash-object [-t <tür>] [-w] [--path=<dosya> | --no-filters] [--stdin] "
"[--] <dosya>..."
-#: builtin/hash-object.c:86
-msgid "git hash-object --stdin-paths"
-msgstr "git hash-object --stdin-paths"
-
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:97
msgid "object type"
msgstr "nesne türü"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:98
msgid "write the object into the object database"
msgstr "nesneyi nesne veritabanına yaz"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
msgstr "nesneyi stdin'den oku"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:102
msgid "store file as is without filters"
msgstr "dosyayı süzgeçler olmadan olduğu gibi depola"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:103
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"Git hata ayıklamasında kullanmak için çer çöp toplayarak hasarlı nesneler "
"oluştur"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
msgstr "dosyayı sanki bu yoldanmış gibi işle"
-#: builtin/help.c:47
+#: builtin/help.c:57
msgid "print all available commands"
msgstr "tüm kullanılabilir komutları yazdır"
-#: builtin/help.c:48
+#: builtin/help.c:60
+msgid "show external commands in --all"
+msgstr "--all içinde dış komutları göster"
+
+#: builtin/help.c:61
+msgid "show aliases in --all"
+msgstr "--all içinde armaları göster"
+
+#: builtin/help.c:62
msgid "exclude guides"
msgstr "kılavuzları hariç tut"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "kullanışlı kılavuzların listesini çıkar"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "tüm yapılandırma değişkenleri adlarını yazdır"
-
-#: builtin/help.c:52
+#: builtin/help.c:63
msgid "show man page"
msgstr "man sayfasını göster"
-#: builtin/help.c:53
+#: builtin/help.c:64
msgid "show manual in web browser"
msgstr "kılavuzu web tarayıcısında göster"
-#: builtin/help.c:55
+#: builtin/help.c:66
msgid "show info page"
msgstr "bilgi sayfasını göster"
-#: builtin/help.c:57
+#: builtin/help.c:68
msgid "print command description"
msgstr "komut açıklamasını yazdır"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<komut>]"
+#: builtin/help.c:70
+msgid "print list of useful guides"
+msgstr "kullanışlı kılavuzların listesini çıkar"
-#: builtin/help.c:163
+#: builtin/help.c:72
+msgid "print all configuration variable names"
+msgstr "tüm yapılandırma değişkenleri adlarını yazdır"
+
+#: builtin/help.c:84
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<komutlar>]"
+
+#: builtin/help.c:201
#, c-format
msgid "unrecognized help format '%s'"
msgstr "tanımlanamayan yardım biçimi '%s'"
-#: builtin/help.c:190
+#: builtin/help.c:227
msgid "Failed to start emacsclient."
msgstr "emacsclient başlatılamadı."
-#: builtin/help.c:203
+#: builtin/help.c:240
msgid "Failed to parse emacsclient version."
msgstr "emacsclient sürümü ayrıştırılamadı."
-#: builtin/help.c:211
+#: builtin/help.c:248
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient sürümü '%d' pek eski (<22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
#, c-format
msgid "failed to exec '%s'"
msgstr "'%s' çalıştırılamadı"
-#: builtin/help.c:307
+#: builtin/help.c:344
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16314,7 +17021,7 @@
"'%s': desteklenmeyen man görüntüleyicisi yolu.\n"
"Bunun yerine 'man.<araç>.cmd' kullanmayı düşünün."
-#: builtin/help.c:319
+#: builtin/help.c:356
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16323,234 +17030,244 @@
"'%s': desteklenmeyen man görüntüleyicisi komutu.\n"
"Bunun yerine 'man.<araç>.path' kullanmayı düşünün."
-#: builtin/help.c:436
+#: builtin/help.c:471
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': Bilinmeyen man görüntüleyicisi."
-#: builtin/help.c:452
+#: builtin/help.c:487
msgid "no man viewer handled the request"
msgstr "isteğe hiçbir man görüntüleyicisi ele almadı"
-#: builtin/help.c:459
+#: builtin/help.c:494
msgid "no info viewer handled the request"
msgstr "isteğe hiçbir bilgi görüntüleyicisi ele almadı"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:555 builtin/help.c:566 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s', '%s' olarak armalanmış"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:569 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "hatalı alias.%s dizisi: %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:611
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "'%s', seçenek olmayan bir argüman almıyor"
+
+#: builtin/help.c:631
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr ""
+"'--no-[external-commands|aliases]', yalnızca '--all' ile kullanılabilir"
+
+#: builtin/help.c:643 builtin/help.c:671
#, c-format
msgid "usage: %s%s"
msgstr "kullanım: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:666
msgid "'git help config' for more information"
msgstr "ek bilgi için: 'git help config'"
-#: builtin/index-pack.c:222
+#: builtin/hook.c:10
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr "git hook run [--ignore-missing] <kanca-adı> [-- <kanca-argümanları>]"
+
+#: builtin/hook.c:30
+msgid "silently ignore missing requested <hook-name>"
+msgstr "istenen eksik <kanca-adı> sessizce yok sayılıyor"
+
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "%s konumunda nesne türü uyuşmazlığı"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "beklenen nesne %s alınmadı"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "nesne %s: beklenen tür %s, bulunan %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "%d bayt doldurulamıyor"
msgstr[1] "%d bayt doldurulamıyor"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "erken dosya sonu"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "girdide okuma hatası"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "kullanılabilir olandan daha çok bayt kullanıldı"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:754
msgid "pack too large for current definition of off_t"
msgstr "paket off_t'nin geçerli tanımı için çok büyük"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "paket izin verilen en büyük boyutu aşıyor"
-
-#: builtin/index-pack.c:343
+#: builtin/index-pack.c:329
#, c-format
-msgid "unable to create '%s'"
-msgstr "'%s' oluşturulamıyor"
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "paket izin verilen en büyük boyutu aşıyor (%s)"
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "'%s' paket dosyası açılamıyor"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "paket imzası uyuşmazlığı"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paket sürümü %<PRIu32> desteklenmiyor"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:380
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paketin %<PRIuMAX> ofsetinde hatalı nesne var: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:485
#, c-format
msgid "inflate returned %d"
msgstr "şişirme programı %d döndürdü"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:534
msgid "offset value overflow for delta base object"
msgstr "delta tabanı nesnesi için ofset değeri taşımı"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:542
msgid "delta base offset is out of bound"
msgstr "delta tabanı ofseti sınırlar dışında"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:550
#, c-format
msgid "unknown object type %d"
msgstr "bilinmeyen nesne türü %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:581
msgid "cannot pread pack file"
msgstr "paket dosyası 'pread' yapılamıyor"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:583
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik"
msgstr[1] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:609
msgid "serious inflate inconsistency"
msgstr "ciddi şişirme programı tutarsızlığı"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
+#: builtin/index-pack.c:823 builtin/index-pack.c:832
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "%s İLE SHA1 ÇARPIŞMASI BULUNDU!"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
-#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
+#: builtin/index-pack.c:757 builtin/pack-objects.c:290
+#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
#, c-format
msgid "unable to read %s"
msgstr "%s okunamıyor"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:821
#, c-format
msgid "cannot read existing object info %s"
msgstr "mevcut %s nesne bilgisi okunamıyor"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:829
#, c-format
msgid "cannot read existing object %s"
msgstr "mevcut %s nesnesi okunamıyor"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:843
#, c-format
msgid "invalid blob object %s"
msgstr "geçersiz %s ikili nesnesi"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:846 builtin/index-pack.c:865
msgid "fsck error in packed object"
msgstr "paketlenmiş nesne içinde fsck hatası"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:867
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s ögesinin tüm alt ögeleri ulaşılabilir değil"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:928 builtin/index-pack.c:975
msgid "failed to apply delta"
msgstr "delta uygulanamadı"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Nesneler alınıyor"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Nesneler indeksleniyor"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paket hasar görmüş (SHA1 uyumsuzluğu)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "paket dosyası fstat yapılamıyor"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "paket sonunda döküntüler var"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() içindeki karmaşa akıl almaz düzeyde"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Deltalar çözülüyor"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
#, c-format
msgid "unable to create thread: %s"
msgstr "iş parçacığı oluşturulamadı: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "karmaşa akıl almaz düzeyde"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "%d yerel nesneyle tamamlandı"
msgstr[1] "%d yerel nesneyle tamamlandı"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "%s için beklenmedik kuyruk sağlaması (disk hasarı?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketin %d çözülmemiş deltası var"
msgstr[1] "paketin %d çözülmemiş deltası var"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "iliştirilen nesne söndürülemedi (%d)"
@@ -16560,56 +17277,53 @@
msgid "local object %s is corrupt"
msgstr "yerel nesne %s hasarlı"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1445
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "paket dosyası adı '%s', '.%s' ile bitmiyor"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "%s dosyası '%s' yazılamıyor"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "yazılmış %s dosyası '%s' kapatılamıyor"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1494
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "geçici '*.%s' dosyası '%s' olarak yeniden adlandırılamıyor"
+
+#: builtin/index-pack.c:1519
msgid "error while closing pack file"
msgstr "paket dosyası kapatılırken hata"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "paket dosyası depolanamıyor"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "indeks dosyası depolanamıyor"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "hatalı pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1648
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Mevcut paket dosyası '%s' açılamıyor"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1650
#, 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:1699
+#: builtin/index-pack.c:1698
#, 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:1706
+#: builtin/index-pack.c:1705
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -16621,33 +17335,25 @@
msgstr "Şu anki çalışma dizinine geri gelinemiyor"
#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
#, c-format
msgid "bad %s"
msgstr "hatalı %s"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "bilinmeyen sağlama algoritması '%s'"
-#: builtin/index-pack.c:1850
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin, --stdin olmadan kullanılamaz"
-
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1856
msgid "--stdin requires a git repository"
msgstr "--stdin bir git dizini gerektirir"
-#: builtin/index-pack.c:1854
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format, --stdin olmadan kullanılamaz"
-
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1873
msgid "--verify with no packfile name given"
msgstr "--verify ile bir paket dosyası adı verilmedi"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "paket nesnelerinde fsck hatası"
@@ -16768,10 +17474,6 @@
msgid "specify the hash algorithm to use"
msgstr "kullanılacak sağlama algoritmasını belirle"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir ve --bare birlikte kullanılamaz"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
@@ -16860,40 +17562,40 @@
msgid "no input file given for in-place editing"
msgstr "yerinde düzenleme için girdi dosyası verilmedi"
-#: builtin/log.c:59
+#: builtin/log.c:60
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<seçenekler>] [<revizyon-erimi>] [[--] <yol>...]"
-#: builtin/log.c:60
+#: builtin/log.c:61
msgid "git show [<options>] <object>..."
msgstr "git show [<seçenekler>] <nesne>..."
-#: builtin/log.c:113
+#: builtin/log.c:114
#, c-format
msgid "invalid --decorate option: %s"
msgstr "geçersiz --decorate seçeneği: %s"
-#: builtin/log.c:180
+#: builtin/log.c:181
msgid "show source"
msgstr "kaynağı göster"
-#: builtin/log.c:181
+#: builtin/log.c:182
msgid "use mail map file"
msgstr "posta eşlem dosyasını kullan"
-#: builtin/log.c:184
+#: builtin/log.c:185
msgid "only decorate refs that match <pattern>"
msgstr "yalnızca <dizgi> ile eşleşen başvuruları süsle"
-#: builtin/log.c:186
+#: builtin/log.c:187
msgid "do not decorate refs that match <pattern>"
msgstr "<dizgi> ile eşleşen başvuruları süsleme"
-#: builtin/log.c:187
+#: builtin/log.c:188
msgid "decorate options"
msgstr "süsleme seçenekleri"
-#: builtin/log.c:190
+#: builtin/log.c:191
msgid ""
"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
@@ -16901,89 +17603,93 @@
"<dosya> içindeki <başlangıç>,<bitiş> satır eriminin veya :<işlevadı> "
"işlevinin evrimini izle"
-#: builtin/log.c:213
+#: builtin/log.c:214
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<erim>:<dosya>, yol belirteci ile kullanılamıyor"
-#: builtin/log.c:306
+#: builtin/log.c:322
#, c-format
msgid "Final output: %d %s\n"
msgstr "Son çıktı: %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:429
+msgid "unable to create temporary object directory"
+msgstr "geçici nesne dizini oluşturulamıyor"
+
+#: builtin/log.c:599
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: hatalı dosya"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:614 builtin/log.c:706
#, c-format
msgid "could not read object %s"
msgstr "%s nesnesi okunamadı"
-#: builtin/log.c:701
+#: builtin/log.c:731
#, c-format
msgid "unknown type: %d"
msgstr "bilinmeyen tür: %d"
-#: builtin/log.c:846
+#: builtin/log.c:880
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: açıklama kipinden geçersiz kapak sayfası"
-#: builtin/log.c:853
+#: builtin/log.c:887
msgid "format.headers without value"
msgstr "format.headers değere iye değil"
-#: builtin/log.c:982
+#: builtin/log.c:1016
#, c-format
msgid "cannot open patch file %s"
msgstr "%s yama dosyası okunamıyor"
-#: builtin/log.c:999
+#: builtin/log.c:1033
msgid "need exactly one range"
msgstr "bir tam erim gerekiyor"
-#: builtin/log.c:1009
+#: builtin/log.c:1043
msgid "not a range"
msgstr "bir erim değil"
-#: builtin/log.c:1173
+#: builtin/log.c:1207
msgid "cover letter needs email format"
msgstr "ön yazı için e-posta biçimi gerekli"
-#: builtin/log.c:1179
+#: builtin/log.c:1213
msgid "failed to create cover-letter file"
msgstr "cover-letter dosyası oluşturulamadı"
-#: builtin/log.c:1266
+#: builtin/log.c:1300
#, c-format
msgid "insane in-reply-to: %s"
msgstr "akıl almaz in-reply-to: %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1327
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<seçenekler>] [<-beri> | <revizyon-erimi>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1385
msgid "two output directories?"
msgstr "iki çıktı dizini?"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
#, c-format
msgid "unknown commit %s"
msgstr "bilinmeyen işleme %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1547 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:1522
+#: builtin/log.c:1556
msgid "could not find exact merge base"
msgstr "kesin birleştirme temeli bulunamadı"
-#: builtin/log.c:1532
+#: builtin/log.c:1566
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"
@@ -16994,418 +17700,410 @@
"izleyin. Bunun dışında taban işlemesini kendiniz --base=<taban-işlemesi-no>\n"
"kullanarak el ile belirtebilirsiniz."
-#: builtin/log.c:1555
+#: builtin/log.c:1589
msgid "failed to find exact merge base"
msgstr "kesin birleştirme temeli bulunamadı"
-#: builtin/log.c:1572
+#: builtin/log.c:1606
msgid "base commit should be the ancestor of revision list"
msgstr "taban işlemesi revizyon listesinin atası olmalı"
-#: builtin/log.c:1582
+#: builtin/log.c:1616
msgid "base commit shouldn't be in revision list"
msgstr "taban işlemesi revizyon listesinde olmamalı"
-#: builtin/log.c:1640
+#: builtin/log.c:1674
msgid "cannot get patch id"
msgstr "yama numarası alınamıyor"
-#: builtin/log.c:1703
+#: builtin/log.c:1737
msgid "failed to infer range-diff origin of current series"
msgstr "geçerli dizinin range-diff kökeninden bir anlam çıkartılamadı"
-#: builtin/log.c:1705
+#: builtin/log.c:1739
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "geçerli dizinin range-diff kökeni olarak '%s' kullanılıyor"
-#: builtin/log.c:1749
+#: builtin/log.c:1783
msgid "use [PATCH n/m] even with a single patch"
msgstr "bir yamayla bile olsa [PATCH n/m] kullan"
-#: builtin/log.c:1752
+#: builtin/log.c:1786
msgid "use [PATCH] even with multiple patches"
msgstr "birden çok yama bile olsa [PATCH] kullan"
-#: builtin/log.c:1756
+#: builtin/log.c:1790
msgid "print patches to standard out"
msgstr "yamaları standart çıktıya yazdır"
-#: builtin/log.c:1758
+#: builtin/log.c:1792
msgid "generate a cover letter"
msgstr "bir ön yazı oluştur"
-#: builtin/log.c:1760
+#: builtin/log.c:1794
msgid "use simple number sequence for output file names"
msgstr "çıktı dosya adları için yalın sayı dizisi oluştur"
-#: builtin/log.c:1761
+#: builtin/log.c:1795
msgid "sfx"
msgstr "sonek"
-#: builtin/log.c:1762
+#: builtin/log.c:1796
msgid "use <sfx> instead of '.patch'"
msgstr "'.patch' yerine <sonek> kullan"
-#: builtin/log.c:1764
+#: builtin/log.c:1798
msgid "start numbering patches at <n> instead of 1"
msgstr "yamaları 1 yerine <n>'de numaralandırmaya başla"
-#: builtin/log.c:1765
+#: builtin/log.c:1799
msgid "reroll-count"
msgstr "reroll-count"
-#: builtin/log.c:1766
+#: builtin/log.c:1800
msgid "mark the series as Nth re-roll"
msgstr "diziyi n. deneme olarak imle"
-#: builtin/log.c:1768
+#: builtin/log.c:1802
msgid "max length of output filename"
msgstr "çıktı dosya adının olabilecek en çok uzunluğu"
-#: builtin/log.c:1770
+#: builtin/log.c:1804
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "[PATCH] yerine [RFC PATCH] kullan"
-#: builtin/log.c:1773
+#: builtin/log.c:1807
msgid "cover-from-description-mode"
msgstr "açıklama kipinden kapak sayfası kipi"
-#: builtin/log.c:1774
+#: builtin/log.c:1808
msgid "generate parts of a cover letter based on a branch's description"
msgstr "ön yazının bazı kısımlarını dalın açıklamasından oluştur"
-#: builtin/log.c:1776
+#: builtin/log.c:1810
msgid "use [<prefix>] instead of [PATCH]"
msgstr "[PATCH] yerine [<önek>] kullan"
-#: builtin/log.c:1779
+#: builtin/log.c:1813
msgid "store resulting files in <dir>"
msgstr "ortaya çıkan dosyaları <dizin>'de depola"
-#: builtin/log.c:1782
+#: builtin/log.c:1816
msgid "don't strip/add [PATCH]"
msgstr "[PATCH]'i soyma/ekleme"
-#: builtin/log.c:1785
+#: builtin/log.c:1819
msgid "don't output binary diffs"
msgstr "ikili diff'leri çıktı verme"
-#: builtin/log.c:1787
+#: builtin/log.c:1821
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:1789
+#: builtin/log.c:1823
msgid "don't include a patch matching a commit upstream"
msgstr "üstkaynaktaki bir işleme ile eşleşen bir yamayı içerme"
-#: builtin/log.c:1791
+#: builtin/log.c:1825
msgid "show patch format instead of default (patch + stat)"
msgstr "öntanımlı yerine yama biçimini göster (patch + stat)"
-#: builtin/log.c:1793
+#: builtin/log.c:1827
msgid "Messaging"
msgstr "İletileşme"
-#: builtin/log.c:1794
+#: builtin/log.c:1828
msgid "header"
msgstr "üstbilgi"
-#: builtin/log.c:1795
+#: builtin/log.c:1829
msgid "add email header"
msgstr "e-posta üstbilgisi ekle"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1830 builtin/log.c:1831
msgid "email"
msgstr "e-posta"
-#: builtin/log.c:1796
+#: builtin/log.c:1830
msgid "add To: header"
msgstr "To: üstbilgisi ekle"
-#: builtin/log.c:1797
+#: builtin/log.c:1831
msgid "add Cc: header"
msgstr "Cc: üstbilgisi ekle"
-#: builtin/log.c:1798
+#: builtin/log.c:1832
msgid "ident"
msgstr "tanımlayıcı"
-#: builtin/log.c:1799
+#: builtin/log.c:1833
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"From adresini <tanımlayıcı> olarak ayarla (veya yoksa işleyici tanımlayıcısı)"
-#: builtin/log.c:1801
+#: builtin/log.c:1835
msgid "message-id"
msgstr "ileti no"
-#: builtin/log.c:1802
+#: builtin/log.c:1836
msgid "make first mail a reply to <message-id>"
msgstr "ilk postayı <ileti no>'ya bir yanıt yap"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1837 builtin/log.c:1840
msgid "boundary"
msgstr "sınır"
-#: builtin/log.c:1804
+#: builtin/log.c:1838
msgid "attach the patch"
msgstr "yamayı ekle"
-#: builtin/log.c:1807
+#: builtin/log.c:1841
msgid "inline the patch"
msgstr "yamayı iletiye koy"
-#: builtin/log.c:1811
+#: builtin/log.c:1845
msgid "enable message threading, styles: shallow, deep"
msgstr "iletileri kataloglamayı etkinleştir, stiller: shallow, deep"
-#: builtin/log.c:1813
+#: builtin/log.c:1847
msgid "signature"
msgstr "imza"
-#: builtin/log.c:1814
+#: builtin/log.c:1848
msgid "add a signature"
msgstr "imza ekle"
-#: builtin/log.c:1815
+#: builtin/log.c:1849
msgid "base-commit"
msgstr "taban işleme"
-#: builtin/log.c:1816
+#: builtin/log.c:1850
msgid "add prerequisite tree info to the patch series"
msgstr "yama dizisine önkoşul ağaç bilgisini ekle"
-#: builtin/log.c:1819
+#: builtin/log.c:1853
msgid "add a signature from a file"
msgstr "dosyadan bir imza ekle"
-#: builtin/log.c:1820
+#: builtin/log.c:1854
msgid "don't print the patch filenames"
msgstr "yama dosya adlarını yazdırma"
-#: builtin/log.c:1822
+#: builtin/log.c:1856
msgid "show progress while generating patches"
msgstr "yamalar oluşturulurken ilerlemeyi göster"
-#: builtin/log.c:1824
+#: builtin/log.c:1858
msgid "show changes against <rev> in cover letter or single patch"
msgstr "<rev> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster"
-#: builtin/log.c:1827
+#: builtin/log.c:1861
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"<bşvr-blrtç> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1863 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "oluşumun tartıldığı yüzde"
-#: builtin/log.c:1916
+#: builtin/log.c:1953
#, c-format
msgid "invalid ident line: %s"
msgstr "geçersiz tanımlayıcı satırı: %s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n ve -k birlikte kullanılamaz"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc ve -k birlikte kullanılamaz"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1978
msgid "--name-only does not make sense"
msgstr "--name-only bir anlam ifade etmiyor"
-#: builtin/log.c:1943
+#: builtin/log.c:1980
msgid "--name-status does not make sense"
msgstr "--name-status bir anlam ifade etmiyor"
-#: builtin/log.c:1945
+#: builtin/log.c:1982
msgid "--check does not make sense"
msgstr "--check bir anlam ifade etmiyor"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output ve --output-directory birlikte kullanılamaz"
+#: builtin/log.c:1984
+msgid "--remerge-diff does not make sense"
+msgstr "--remerge-diff bir anlam ifade etmiyor"
-#: builtin/log.c:2089
+#: builtin/log.c:2129
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor"
-#: builtin/log.c:2093
+#: builtin/log.c:2133
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:2094
+#: builtin/log.c:2134
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff v%d karşısında:"
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor, --range-diff gerektiriyor"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2144
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff, --cover-letter veya tek yama gerektiriyor"
-#: builtin/log.c:2112
+#: builtin/log.c:2152
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:2113
+#: builtin/log.c:2153
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff v%d karşısında:"
-#: builtin/log.c:2124
+#: builtin/log.c:2164
#, c-format
msgid "unable to read signature file '%s'"
msgstr "'%s' imza dosyası okunamıyor"
-#: builtin/log.c:2160
+#: builtin/log.c:2200
msgid "Generating patches"
msgstr "Yamalar oluşturuluyor"
-#: builtin/log.c:2204
+#: builtin/log.c:2244
msgid "failed to create output files"
msgstr "çıktı dosyaları oluşturulamadı"
-#: builtin/log.c:2263
+#: builtin/log.c:2304
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<üstkaynak> [<dal-ucu> [<sınır>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2358
#, 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:563
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<seçenekler>] [<dosya>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "yolları NUL karakteri ile ayır"
+
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "dosya durumunu etiketlerle tanımla"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
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:623
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "'fsmonitor clean' dosyalarını küçük harflerle göster"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "önbelleğe alınan dosyaları çıktıda göster (öntanımlı)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "silinen dosyaları çıktıda göster"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "değiştirilen dosyaları çıktıda göster"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "diğer dosyaları çıktıda göster"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "yok sayılan dosyaları çıktıda göster"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
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:638
+#: builtin/ls-files.c:639
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:640
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "'diğer' dizinlerin yalnızca adını göster"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "dosyaların satır sonlarını göster"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "boş dizinleri gösterme"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "birleştirilmemiş dosyaları çıktıda göster"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "'resolve-undo' bilgisini göster"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "dizgi ile eşleşen dosyaları atla"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "hariç tutma dizgileri <dosya>'dan okunuyor"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "hariç bırakma dizgilerini <dosya>'dan oku"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr "ek dizin başı hariç tutma dizgilerini <dosya>'dan oku"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "standart git hariç tutmalarını ekle"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
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:666
-msgid "recurse through submodules"
-msgstr "altmodüller içinden özyinele"
-
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
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:669
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "ağacımsı"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
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:672
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "hata ayıklama verisini göster"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "yinelenen girdileri sustur"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "bir aralıklı indeks bulunurluğunda aralıklı dizinleri göster"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<depo> [<başvurular>...]]"
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<çlştr>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<depo> [<başvurular>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "uzak konum URL'sini yazdırma"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
msgid "exec"
msgstr "çalıştır"
@@ -17437,42 +18135,70 @@
msgid "show underlying ref in addition to the object pointed by it"
msgstr "işaret ettiği nesneye ek olarak altında yatan başvuruyu göster"
-#: builtin/ls-tree.c:30
+#: builtin/ls-tree.c:36
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<seçenekler>] <ağacımsı> [<yol>...]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:54
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "'%s' hakkında nesne bilgisi alınamadı"
+
+#: builtin/ls-tree.c:79
+#, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "hatalı ls-tree biçimi: '%s' ögesi '(' ile başlamıyor"
+
+#: builtin/ls-tree.c:83
+#, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "hatalı ls-tree biçimi: '%s' ögesi ')' ile sonlanmıyor"
+
+#: builtin/ls-tree.c:109
+#, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr "hatalı ls-tree biçimi: %%%.*s"
+
+#: builtin/ls-tree.c:336
msgid "only show trees"
msgstr "yalnızca ağaçları göster"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:338
msgid "recurse into subtrees"
msgstr "altağaçlara özyinele"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:340
msgid "show trees when recursing"
msgstr "özyinelerken ağaçları göster"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:343
msgid "terminate entries with NUL byte"
msgstr "girdileri NUL baytı ile sonlandır"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:344
msgid "include object size"
msgstr "nesne boyutunu içer"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
msgid "list only filenames"
msgstr "yalnızca dosya adlarını listele"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:350
+msgid "list only objects"
+msgstr "yalnızca nesneleri listele"
+
+#: builtin/ls-tree.c:353
msgid "use full path names"
msgstr "tam yol adlarını kullan"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:355
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "yalnızca geçerli dizini değil tüm ağacı listele (--full-name ima eder)"
+#: builtin/ls-tree.c:391
+msgid "--format can't be combined with other format-altering options"
+msgstr "--format, diğer format-altering seçenekleriyle birlikte kullanılamaz"
+
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
@@ -17522,7 +18248,11 @@
msgid "use headers in message's body"
msgstr "ileti gövdesinde üstbilgi kullan"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:227
+msgid "reading patches from stdin/tty..."
+msgstr "yamalar stdin/tty'den okunuyor..."
+
+#: builtin/mailsplit.c:242
#, c-format
msgid "empty mbox: '%s'"
msgstr "boş mbox: '%s'"
@@ -17547,23 +18277,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <başvuru> [<işleme>]"
-#: builtin/merge-base.c:143
+#: builtin/merge-base.c:144
msgid "output all common ancestors"
msgstr "tüm ortak ataları çıktı ver"
-#: builtin/merge-base.c:145
+#: builtin/merge-base.c:146
msgid "find ancestors for a single n-way merge"
msgstr "tek bir n yönlü birleştirme için ataları bul"
-#: builtin/merge-base.c:147
+#: builtin/merge-base.c:148
msgid "list revs not reachable from others"
msgstr "başkaları tarafından ulaşılabilir revizyonları listele"
-#: builtin/merge-base.c:149
+#: builtin/merge-base.c:150
msgid "is the first one ancestor of the other?"
msgstr "ilki diğerlerinin atası mı?"
-#: builtin/merge-base.c:151
+#: builtin/merge-base.c:152
msgid "find where <commit> forked from reflog of <ref>"
msgstr "<işleme>'nin nerede <başvuru>'nun günlüğünden çatallandığını bul"
@@ -17584,26 +18314,30 @@
msgstr "diff3 tabanlı birleştirme kullan"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "gayretli bir diff3 tabanlı birleştirme kullan"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "çakışmalarda bizim sürümü kullan"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "çakışmalarda onların sürümünü kullan"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "çakışmalarda birlik olmuş bir sürüm kullan"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "çakışmalarda bu imleyici boyutunu kullan"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "çakışmalar hakkında uyarma"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "file1/orig-file/file2 için etiketler yapıştır"
@@ -17638,183 +18372,187 @@
msgid "Merging %s with %s\n"
msgstr "%s, %s ile birleştiriliyor\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<seçenekler>] [<işleme>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "'m' anahtarı bir değer gerektiriyor"
-#: builtin/merge.c:146
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "'%s' seçeneği bir değer gerektiriyor"
-#: builtin/merge.c:199
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Birleştirme stratejisi '%s' bulunamadı.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Kullanılabilir stratejiler:"
-#: builtin/merge.c:205
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Kullanılabilir özel stratejiler:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "birleştirmenin sonunda bir diffstat gösterme"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "birleştirmenin sonunda bir diffstat göster"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(--stat eşanlamlısı)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"kısa günlükten birleştirme işlemesi iletisine girdiler (en çok <n>) ekle"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "birleştirme yerine tek bir işleme oluştur"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "birleştirme başarılı olursa bir işleme gerçekleştir (öntanımlı)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "göndermeden önce iletiyi düzenle"
-#: builtin/merge.c:271
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "ileri sarıma izin ver (öntanımlı)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "ileri sarım olanaklı değilse iptal et"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "adı verilen işlemenin geçerli bir GPG imzası olduğunu doğrula"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1145 builtin/revert.c:114
msgid "strategy"
msgstr "strateji"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "kullanılacak birleştirme stratejisi"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "seçenek=değer"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "seçili birleştirme stratejisi için seçenekler"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"birleştirme işlemesi iletisi (ileri sarım olmayan bir birleştirme için)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "gerçek hedef yerine <ad> kullan"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "ilerlemekte olan geçerli birleştirmeyi iptal et"
-#: builtin/merge.c:292
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort; ancak indeksi ve çalışma ağacını değiştirmeden bırakın"
-#: builtin/merge.c:294
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "ilerlemekte olan geçerli birleştirmeyi sürdürün"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver"
-#: builtin/merge.c:303
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "pre-merge-commit ve commit-msg kancalarını atla"
-#: builtin/merge.c:320
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "zula yapılamadı"
-#: builtin/merge.c:325
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "zulalama başarısız oldu"
-#: builtin/merge.c:330
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "geçerli bir nesne değil: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "read-tree başarısız oldu"
-#: builtin/merge.c:400
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "Tümü güncel (tıkıştırılacak bir şey yok)."
-#: builtin/merge.c:414
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tıkıştırma işlemesi -- HEAD güncellenmiyor\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Birleştirme iletisi yok -- HEAD güncellenmiyor\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' bir işlemeye işaret etmiyor"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Hatalı branch.%s.mergeoptions dizisi: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "İki uç işlemenin birleştirilmesi dışında bir şey yapılmıyor."
-#: builtin/merge.c:742
+#: builtin/merge.c:745
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive için geçersiz seçenek: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "bilinmeyen strateji seçeneği: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "%s yazılamıyor"
-#: builtin/merge.c:813
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "Şu konumdan okunamadı: '%s'"
-#: builtin/merge.c:822
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "Birleştirme işlenmiyor, tamamlamak için 'git commit' kullanın.\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:831
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"
@@ -17824,11 +18562,11 @@
"girin, özellikle güncellenmiş bir üstkaynağı kişisel dala birleştiriyorsa.\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Boş bir ileti işlemeyi iptal eder.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17837,72 +18575,72 @@
"'%c' ile başlayan satırlar yok sayılacaktır. Boş bir ileti işlemeyi\n"
"iptal eder.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:900
msgid "Empty commit message."
msgstr "Boş işleme iletisi."
-#: builtin/merge.c:904
+#: builtin/merge.c:915
#, c-format
msgid "Wonderful.\n"
msgstr "Harika.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:976
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "Otomatik birleştirme başarısız; çakışmaları çözün ve sonucu işleyin.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1015
msgid "No current branch."
msgstr "Geçerli dal yok."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1017
msgid "No remote for the current branch."
msgstr "Geçerli dal için uzak konum yok."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1019
msgid "No default upstream defined for the current branch."
msgstr "Geçerli dal için öntanımlı üstkaynak tanımlanmamış."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1024
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "%s için %s konumundan uzak izleme dalı yok"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1081
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Hatalı değer '%s', '%s' ortamında"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1183
#, 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:1207
+#: builtin/merge.c:1217
msgid "not something we can merge"
msgstr "birleştirebileceğimiz bir şey değil"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1330
msgid "--abort expects no arguments"
msgstr "--abort bir argüman beklemez"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1334
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "İptal edilecek bir birleştirme yok (MERGE_HEAD eksik)."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1352
msgid "--quit expects no arguments"
msgstr "--quit bir argüman beklemez"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1365
msgid "--continue expects no arguments"
msgstr "--continue bir argüman beklemez"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1369
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "İlerlemekte olan bir birleştirme yok (MERGE_HEAD eksik)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1385
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17910,7 +18648,7 @@
"Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut).\n"
"Lütfen birleştirmeden önce değişikliklerinizi işleyin."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1392
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17918,98 +18656,82 @@
"Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut).\n"
"Lütfen birleştirmeden önce değişikliklerinizi işleyin."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1395
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:1396
-msgid "You cannot combine --squash with --no-ff."
-msgstr "--squash ile --no-ff birlikte kullanılamaz."
-
-#: builtin/merge.c:1398
-msgid "You cannot combine --squash with --commit."
-msgstr "--squash ile --commit birlikte kullanılamaz."
-
-#: builtin/merge.c:1414
+#: builtin/merge.c:1427
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Belirtilen bir işleme yok ve merge.defaultToUpstream ayarlanmamış."
-#: builtin/merge.c:1431
+#: builtin/merge.c:1444
msgid "Squash commit into empty head not supported yet"
msgstr "İşlemeyi boş dal ucuna tıkıştırma henüz desteklenmiyor"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1446
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"İleri sarım olmayan işlemeyi boş dal ucuna yapmak bir anlam ifade etmiyor"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1451
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - birleştirebileceğimiz bir şey değil"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1453
msgid "Can merge only exactly one commit into empty head"
msgstr "Boş dal ucuna tam olarak yalnızca bir işleme birleştirilebilir"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1540
msgid "refusing to merge unrelated histories"
msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1559
#, c-format
msgid "Updating %s..%s\n"
msgstr "Güncelleniyor: %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1606
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1613
#, c-format
msgid "Nope.\n"
msgstr "Yok.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "İleri sarma olanaklı değil, iptal ediliyor."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1671 builtin/merge.c:1737
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Ağaç bozulmamış durumuna geri sarılıyor...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1675
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "%s birleştirme stratejisi deneniyor...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1727
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1729
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "%s stratejisi ile birleştirme başarısız oldu.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1739
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "El ile çözümü hazırlamak için %s stratejisi kullanılıyor.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1753
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"Otomatik birleştirme iyi geçti; istendiği üzere gönderme öncesinde durdu.\n"
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr "git mktag"
-
#: builtin/mktag.c:27
#, c-format
msgid "warning: tag input does not pass fsck: %s"
@@ -18047,10 +18769,6 @@
msgid "unable to write tag file"
msgstr "etiket dosyası yazılamıyor"
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
-
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "girdi NUL ile sonlandırıldı"
@@ -18064,34 +18782,50 @@
msgstr "birden çok ağacın oluşturulmasına izin ver"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<seçenekler>] write [--preferred-pack=<paket>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<seçenekler>] write [--preferred-pack=<paket>][--refs-"
+"snapshot=<yol>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<seçenekler>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<seçenekler>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<seçenekler>] repack [--batch-size=<boyut>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "nesne dizini paket dosyası seti ve pack-index eşleri içeriyor"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "preferred-pack"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "bir çoklu paket biteşlemi hesaplanırken yeniden kullanılacak paket"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "çoklu paket biteşlemi yaz"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "yalnızca verilen indeksleri içeren çoklu paket indekslerini yaz"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "biteşlem işlemeleri seçmek için başvuruların anlık görüntüsünü al"
+
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18099,11 +18833,6 @@
"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:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "tanımlanamayan altkomut: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<seçenekler>] <kaynak>... <hedef>"
@@ -18132,117 +18861,121 @@
msgid "skip move/rename errors"
msgstr "taşı/yeniden adlandır hatalarını atla"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "'%s' hedefi bir dizin değil"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "'%s'->'%s' yeniden adlandırması denetleniyor\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "hatalı kaynak"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "dizin kendi içine taşınamıyor"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "dizin dosya üzerinden taşınamıyor"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "kaynak dizin boş"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "sürüm denetimi altında değil"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "çakışmalı"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "hedef mevcut"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "üzerine yazılıyor: '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Üzerine yazılamıyor"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "aynı hedef için birden çok kaynak"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "hedef dizin mevcut değil"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, kaynak=%s, hedef:%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "%s, %s olarak yeniden adlandırılıyor\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
#, c-format
msgid "renaming '%s' failed"
msgstr "'%s' yeniden adlandırılamadı"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:524
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<seçenekler>] <işleme>..."
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:525
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<seçenekler>] --all"
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<seçenekler>] --stdin"
+#: builtin/name-rev.c:526
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [<seçenekler>] --annotate-stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:583
msgid "print only ref-based names (no object names)"
msgstr "yalnızca başvuru tabanlı adları yazdır (nesne adı yok)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:584
msgid "only use tags to name the commits"
msgstr "işlemeleri adlandırmak için yalnızca etiketleri kullan"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:586
msgid "only use refs matching <pattern>"
msgstr "yalnızca <dizgi> ile eşleşen başvuruları kullan"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:588
msgid "ignore refs matching <pattern>"
msgstr "<dizgi> ile eşleşen başvuruları yok say"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:590
msgid "list all commits reachable from all refs"
msgstr "tüm başvurulardan ulaşılabilir olan tüm işlemeleri listele"
-#: builtin/name-rev.c:532
-msgid "read from stdin"
-msgstr "stdin'den oku"
+#: builtin/name-rev.c:591
+msgid "deprecated: use annotate-stdin instead"
+msgstr "kullanılmıyor: Yerine annotate-stdin kullanın"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:592
+msgid "annotate text from stdin"
+msgstr "metne stdin'den açıklama ekle"
+
+#: builtin/name-rev.c:593
msgid "allow to print `undefined` names (default)"
msgstr "'tanımlanmayan' adların yazdırılmasına izin ver (öntanımlı)"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:599
msgid "dereference tags in the input (internal use)"
msgstr "girdide etiketlerin başvurularını kaldır (iç kullanım)"
@@ -18284,14 +19017,6 @@
msgstr ""
"git notes [--ref <not-bşvr>] merge [-v | -q] [-s <strateji>] <not-bşvr>"
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
-
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <not-bşvr>] remove [<nesne>...]"
@@ -18352,69 +19077,65 @@
msgid "git notes prune [<options>]"
msgstr "git notes prune [<seçenekler>]"
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "Aşağıdaki nesneler için not yaz/düzenle:"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "'%s' nesnesi için 'show' başlatılamıyor"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "'show' çıktısı okunamadı"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "'%s' nesnesi için 'show' bitirilemedi"
-#: builtin/notes.c:197
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr "not içeriğini lütfen -m veya -F seçeneğini kullanarak sağlayın"
-#: builtin/notes.c:206
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "not nesnesi yazılamıyor"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "not içeriği %s içinde bırakıldı"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:582
#, c-format
msgid "could not open or read '%s'"
msgstr "'%s' açılamadı veya okunamadı"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "'%s' geçerli bir başvuru olarak çözülemedi"
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "'%s' nesnesi okunamadı."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "İkili nesne olmayan '%s' nesnesinden not verisi okunamıyor."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "hatalı oluşturulmuş girdi satırı: '%s'"
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "notlar '%s' konumundan '%s' konumuna kopyalanamadı"
@@ -18422,48 +19143,41 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "notları %s yapma (%s içinde) reddediliyor (refs/notes/ dışında)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
-msgid "too many arguments"
-msgstr "çok fazla argüman"
-
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "%s nesnesi için not bulunamadı."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "not içeriği dizi olarak"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "not içeriği bir dosyada"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "belirtilen not nesnesini düzenle ve yeniden kullan"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "belirtilen not nesnesini yeniden kullan"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "boş not depolamasına izin ver"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "var olan notları başkalarıyla değiştir"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18472,29 +19186,29 @@
"Not eklenemiyor. %s nesnesi için halihazırda var olan notlar bulundu. Bu "
"notların üzerine yazmak için '-f' kullanın."
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "%s nesnesi için var olan notların üzerine yazılıyor\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "%s nesnesi için olan not kaldırılıyor\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "nesneleri stdin'den oku"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "<komut> için yapılandırma yeniden yazımını yükle (--stdin ima eder)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "pek az argüman"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18503,12 +19217,12 @@
"Notlar kopyalanamıyor. %s nesnesi için halihazırda var olan notlar bulundu. "
"Bu notların üzerine yazmak için '-f' kullanın."
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "%s kaynak nesnesi için not eksik. Kopyalanamıyor."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18517,52 +19231,52 @@
"'edit' altkomutunun -m/-F/-c/-C seçenekleri artık eski ve kullanılmamalı.\n"
"Lütfen bunun yerine 'git notes add -f -m/-F/-c/-C' kullanın.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "NOTES_MERGE_PARTIAL başvurusu silinemedi"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "NOTES_MERGE_REF başvurusu silinemedi"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "'git remove merge' çalışma ağacı kaldırılamadı"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "NOTES_MERGE_PARTIAL başvurusu okunamadı"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden bulunamadı."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden ayrıştırılamadı"
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "NOTES_MERGE_REF çözülemedi"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "not birleştirilmesi tamamlanamadı"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "bilinmeyen not birleştirme stratejisi %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Genel seçenekler"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Birleştirme seçenekleri"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18570,46 +19284,46 @@
"not çakışmalarını verilen stratejiyi kullanarak çöz (el ile/bizimkionlarınki/"
"birlik olmuş/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Birleştirilmemiş notlar işleniyor"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "birleştirilmemiş notları işleyerek not birleştirmesini tamamla"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Notlar birleştirmesi çözümü iptal ediliyor"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "not birleştirmesini iptal et"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort veya -s/--strategy karıştırılamıyor"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "birleştirmek için bir not başvurusu belirtilmeli"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "bilinmeyen -s/--strategy: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "%s konumuna bir not birleştirmesi halihazırda %s konumunda sürüyor"
-#: builtin/notes.c:876
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "geçerli not başvurusuna bağlantı depolanamadı (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18620,41 +19334,41 @@
"çözün ve sonucu 'git notes merge --commit' ile işleyin. Birleştirmeyi iptal "
"etmek isterseniz 'git notes merge --abort' kullanarak bunu yapabilirsiniz.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:595
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "'%s' geçerli bir başvuru olarak çözülemiyor"
-#: builtin/notes.c:900
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "%s nesnesinin notu yok\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "var olmayan notu kaldırma denemesi bir hata değil"
-#: builtin/notes.c:915
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "nesne adlarını standart girdi'den oku"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "kaldırma, yalnızca göster"
-#: builtin/notes.c:955
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "budanmış notları kaldır"
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "not başvurusu"
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "notları <not-bşvr>'ndan kullan"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1036 builtin/stash.c:1802
#, c-format
msgid "unknown subcommand: %s"
msgstr "bilinmeyen altkomut: %s"
@@ -18672,7 +19386,7 @@
msgstr ""
"git pack-objects [<sçnklr>...] <base-name> [< <bşvr-liste> | < <nesne-liste>]"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:570
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18681,108 +19395,112 @@
"write_reuse_object: %s bulunamıyor, %<PRIuMAX> ofsetinde bekleniyordu (%s "
"paketinde)"
-#: builtin/pack-objects.c:580
+#: builtin/pack-objects.c:578
#, c-format
msgid "bad packed object CRC for %s"
msgstr "%s için hatalı paketlenmiş nesne CRC'si"
-#: builtin/pack-objects.c:591
+#: builtin/pack-objects.c:589
#, c-format
msgid "corrupt packed object for %s"
msgstr "%s için hasar görmüş paketlenmiş nesne"
-#: builtin/pack-objects.c:722
+#: builtin/pack-objects.c:720
#, c-format
msgid "recursive delta detected for object %s"
msgstr "%s nesnesi için özyineli delta algılandı"
-#: builtin/pack-objects.c:941
+#: builtin/pack-objects.c:939
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u nesne sipariş verildi, %<PRIu32> bekleniyordu"
-#: builtin/pack-objects.c:1036
+#: builtin/pack-objects.c:1034
#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "şu paketin %<PRIuMAX> ofsetinde nesne bekleniyordu: %s"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1158
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:1168
+#: builtin/pack-objects.c:1171
msgid "Writing objects"
msgstr "Nesneler yazılıyor"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1243 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "%s bilgileri alınamıyor"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1276
+msgid "failed to write bitmap index"
+msgstr "biteşlem indeksi yazılamadı"
+
+#: builtin/pack-objects.c:1302
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> nesne yazıldı (%<PRIu32> bekleniyordu)"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1544
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:1971
+#: builtin/pack-objects.c:1992
#, 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:1980
+#: builtin/pack-objects.c:2001
#, 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:2261
+#: builtin/pack-objects.c:2282
msgid "Counting objects"
msgstr "Nesneler sayılıyor"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2447
#, c-format
msgid "unable to parse object header of %s"
msgstr "%s nesne üstbilgisi ayrıştırılamıyor"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
+#: builtin/pack-objects.c:2543
#, c-format
msgid "object %s cannot be read"
msgstr "%s nesnesi okunamıyor"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
#, 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:2536
+#: builtin/pack-objects.c:2557
msgid "suboptimal pack - out of memory"
msgstr "standart altı paket - bellek yetersiz"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2872
#, 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:2990
+#: builtin/pack-objects.c:3011
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "%s etiketinden ulaşılabilir nesneler paketlenemiyor"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3097
msgid "Compressing objects"
msgstr "Nesneler sıkıştırılıyor"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3103
msgid "inconsistency with delta count"
msgstr "delta sayımında tutarsızlık"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3182
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18791,7 +19509,7 @@
"uploadpack.blobpackfileuri değeri '<nesne-sağlaması> <paket-sağlaması> <uri> "
"biçiminde olmalıdır ('%s' alındı)"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3185
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -18799,17 +19517,18 @@
"nesne halihazırda başka bir uploadpack.blobpackfileuri içinde yapılandırıldı "
"('%s' alındı)"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3220
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "%s nesnesinin türü alınamıyor (%s paketinde)"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
+#: builtin/pack-objects.c:3373
#, c-format
msgid "could not find pack '%s'"
msgstr "'%s' paketi bulunamadı"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3416
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18818,7 +19537,7 @@
"sınır nesnesi numarası bekleniyordu, anlamsız veri alındı:\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3422
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -18827,249 +19546,241 @@
"nesne numarası bekleniyordu, anlamsız veri alındı:\n"
"%s"
-#: builtin/pack-objects.c:3482
-msgid "invalid value for --missing"
-msgstr "--missing için geçersiz değer"
-
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
msgid "cannot open pack index"
msgstr "paket indeksi açılamıyor"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3549
#, c-format
msgid "loose object at %s could not be examined"
msgstr "%s konumundaki gevşek nesne incelenemedi"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3635
msgid "unable to force loose object"
msgstr "gevşek nesne zorlanamıyor"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3763
#, c-format
msgid "not a rev '%s'"
msgstr "bir revizyon değil: '%s'"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "hatalı revizyon: '%s'"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3794
msgid "unable to add recent objects"
msgstr "en son nesneler eklenemiyor"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3847
#, c-format
msgid "unsupported index version %s"
msgstr "desteklenmeyen indeks sürümü %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3851
#, c-format
msgid "bad index version '%s'"
msgstr "hatalı indeks sürümü '%s'"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3907
msgid "<version>[,<offset>]"
msgstr "<sürüm>[,<ofset>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3908
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:3919
+#: builtin/pack-objects.c:3911
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:3921
+#: builtin/pack-objects.c:3913
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:3923
+#: builtin/pack-objects.c:3915
msgid "ignore packed objects"
msgstr "paketlenmiş nesneleri yok say"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3917
msgid "limit pack window by objects"
msgstr "paket penceresini nesnelerle sınırla"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3919
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:3929
+#: builtin/pack-objects.c:3921
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:3931
+#: builtin/pack-objects.c:3923
msgid "reuse existing deltas"
msgstr "var olan deltaları yeniden kullan"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3925
msgid "reuse existing objects"
msgstr "var olan nesneleri yeniden kullan"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3927
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA nesneleri kullan"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3929
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:3939
+#: builtin/pack-objects.c:3931
msgid "do not create an empty pack output"
msgstr "boş bir paket çıktısı oluşturma"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3933
msgid "read revision arguments from standard input"
msgstr "revizyon argümanlarını standart girdi'den oku"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3935
msgid "limit the objects to those that are not yet packed"
msgstr "nesneleri henüz paketlenmeyenlere kısıtla"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3938
msgid "include objects reachable from any reference"
msgstr "herhangi bir başvurudan ulaşılabilir olan nesneleri içer"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3941
msgid "include objects referred by reflog entries"
msgstr "başvuru günlüğü tarafından başvurulan nesneleri içer"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3944
msgid "include objects referred to by the index"
msgstr "indeks tarafından başvurulan nesneleri içer"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3947
msgid "read packs from stdin"
msgstr "paketleri stdin'den oku"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3949
msgid "output pack to stdout"
msgstr "paketi stdout'a çıktı ver"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3951
msgid "include tag objects that refer to objects to be packed"
msgstr "paketlenecek nesnelere başvuran etiket nesnelerini içer"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3953
msgid "keep unreachable objects"
msgstr "ulaşılamayan nesneleri tut"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3955
msgid "pack loose unreachable objects"
msgstr "ulaşılamayan gevşek nesneleri paketle"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3957
msgid "unpack unreachable objects newer than <time>"
msgstr "<zaman>'dan daha yeni ulaşılamayan nesneleri aç"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3960
msgid "use the sparse reachability algorithm"
msgstr "aralıklı ulaşılabilirlik algoritmasını kullan"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3962
msgid "create thin packs"
msgstr "ince paketler oluştur"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3964
msgid "create packs suitable for shallow fetches"
msgstr "sığ getirmelere uygun paketler oluştur"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3966
msgid "ignore packs that have companion .keep file"
msgstr "eşlik eden .keep dosyasına iye paketleri yok say"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3968
msgid "ignore this pack"
msgstr "bu paketi yok say"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3970
msgid "pack compression level"
msgstr "paket sıkıştırma düzeyi"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3972
msgid "do not hide commits by grafts"
msgstr "aşılarla gelen işlemeleri gizleme"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3974
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:3984
+#: builtin/pack-objects.c:3976
msgid "write a bitmap index together with the pack index"
msgstr "paket indeksiyle birlikte bir biteşlem indeksi de yaz"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3980
msgid "write a bitmap index if possible"
msgstr "eğer olanaklıysa bir biteşlem indeksi yaz"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3984
msgid "handling for missing objects"
msgstr "eksik nesneler için işlem"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3987
msgid "do not pack objects in promisor packfiles"
msgstr "nesneleri vaatçi paket dosyalarıyla paketleme"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3989
msgid "respect islands during delta compression"
msgstr "delta sıkıştırması sırasında adalara uy"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3991
msgid "protocol"
msgstr "protokol"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3992
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
"bu protokol ile herhangi bir yapılandırılmış uploadpack.blobpackfileuri "
"ögesini hariç tut"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4027
#, 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:4038
+#: builtin/pack-objects.c:4032
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit çok yüksek, %d zorlanıyor"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4088
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:4096
+#: builtin/pack-objects.c:4090
msgid "minimum pack size limit is 1 MiB"
msgstr "olabilecek en küçük paket boyutu limiti 1 MiB'dır"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4095
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin bir indekslenebilir paket yapımında kullanılamaz"
#: builtin/pack-objects.c:4104
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable ve --unpack-unreachable birbiriyle uyumsuz"
-
-#: builtin/pack-objects.c:4110
msgid "cannot use --filter without --stdout"
msgstr "--filter, --stdout olmadan kullanılamaz"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4106
msgid "cannot use --filter with --stdin-packs"
msgstr "--filter, --stdin-packs ile birlikte kullanılamıyor"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4110
msgid "cannot use internal rev list with --stdin-packs"
msgstr "iç revizyon listeleri, --stdin-packs ile birlikte kullanılamıyor"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4169
msgid "Enumerating objects"
msgstr "Nesneler ortaya dökülüyor"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4210
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19105,90 +19816,80 @@
msgid "prune loose refs (default)"
msgstr "gevşek başvuruları buda (öntanımlı)"
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
"git prune [-n] [-v] [--progress] [--expire <zaman>] [--] [<dal-ucu>...]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "budanmış nesneleri bildir"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "<zaman>'dan daha eski nesnelerin hükmünü kaldır"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr "promisor paket dosyalarının dışındaki nesnelere taramayı kısıtla"
-#: builtin/prune.c:152
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "bir precious-objects deposu içinde budama yapılamıyor"
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "%s için geçersiz değer: %s"
-
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "altmodüllerin özyineli getirilmesi için denetleme"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Birleştirme ile ilgili seçenekler"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "değişiklikleri birleştirme yerine yeniden temellendirme ile kat"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "ileri sarıma izin ver"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "pre-merge-commit ve commit-msg kancalarının kullanımını denetle"
+
+#: builtin/pull.c:171 parse-options.h:371
msgid "automatically stash/stash pop before and after"
msgstr "öncesinde ve sonrasında kendiliğinden zulala/zulaları patlat"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Getirme ile ilgili seçenekler"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "zorla yerel dalın üzerine yaz"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "paralelde çekilen altmodüllerin sayısı"
-#: builtin/pull.c:317
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "pull.ff için geçersiz değer: %s"
-
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
"Az önce getirdiğiniz başvurular arasında yeniden temellendirme için aday yok."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
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:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19196,7 +19897,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:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19207,43 +19908,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:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:978
msgid "You are not currently on a branch."
msgstr "Şu anda bir dal üzerinde değilsiniz."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
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:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Lütfen hangi dal ile birleştirmek istediğinizi belirtin."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Ayrıntılar için: git-pull(1)"
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:984
msgid "<remote>"
msgstr "<uzak-konum>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:374
msgid "<branch>"
msgstr "<dal>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:976
msgid "There is no tracking information for the current branch."
msgstr "Geçerli dal için izleme bilgisi yok."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
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:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19252,22 +19954,22 @@
"Yapılandırmanız uzak konumdan '%s' başvurusu ile birleştirmeyi belirtiyor,\n"
"ancak böyle bir başvuru getirilmedi."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "%s işlemesine erişilemedi"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "yeniden temellendirme için --verify-signatures yok sayılıyor"
-#: builtin/pull.c:930
+#: builtin/pull.c:969
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
@@ -19277,31 +19979,32 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Iraksak dalların nasıl uzlaştırılacağını belirtmeden çekme\n"
-"yapılması önerilmez. Bu iletiyi bir sonraki çekimden önce\n"
-"aşağıdaki komutlardan birini çalıştırarak susturabilirsiniz:\n"
+"Iraksak dallarınız mevcut ve onların nasıl uzlaştırılacağını\n"
+"belirtmeniz gerekiyor. Bunu bir sonraki çekimden önce\n"
+"aşağıdaki komutlardan birini çalıştırarak yapabilirsiniz:\n"
"\n"
-"\tgit config pull.rebase false # birleştir (öntanımlı strateji)\n"
+"\tgit config pull.rebase false # birleştir\n"
"\tgit config pull.rebase true # yeniden temellendir\n"
-"\tgit config pull.ff only # yalnızca ileri sarım\n"
+"\tgit config pull.ff only # yalnızca ileri sar\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"
+"Tüm depolar için global bir tercih ayarlamak için \"git config\"i\n"
+"\"git config --global\" ile değiştirebilirsiniz. Öntanımlı\n"
+"yapılandırmayı yürütme sırasında --rebase, --no-rebase veya\n"
+"--ff-only ile bir kerelik geçersiz kılabilirsiniz.\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1047
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:994
+#: builtin/pull.c:1051
msgid "pull with rebase"
msgstr "yeniden temellendirme ile çekim"
-#: builtin/pull.c:995
+#: builtin/pull.c:1052
msgid "please commit or stash them."
msgstr "Lütfen onları işleyin veya zulalayın."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1077
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19312,7 +20015,7 @@
"Çalışma ağacınız %s işlemesinden\n"
"ileri sarılıyor."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1083
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19329,15 +20032,23 @@
"$ git reset --hard\n"
"komutunu çalıştırın."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1098
msgid "Cannot merge multiple branches into empty head."
msgstr "Boş dal ucuna birden çok dal birleştirilemez."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1103
msgid "Cannot rebase onto multiple branches."
msgstr "Birden çok dala yeniden temellendirme yapılamaz."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1105
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Birden çok dala ileri sarım yapılamaz."
+
+#: builtin/pull.c:1120
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Iraksak dalların nasıl uzlaştırılacağının belirtilmesi gerekiyor."
+
+#: builtin/pull.c:1134
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"yerelde kaydı yazılmış altmodül değişiklikleriyle yeniden temellendirme "
@@ -19449,7 +20160,8 @@
"Güncellemeler reddedildi; çünkü geçerli dalınızın ucu kendisinin\n"
"uzak konum karşıtından geride. Yeniden itmeden önce uzak konumdaki\n"
"değişiklikleri entegre edin (örn. 'git pull ...').\n"
-"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın."
+"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a\n"
+"bakın."
#: builtin/push.c:264
msgid ""
@@ -19460,8 +20172,9 @@
msgstr ""
"Güncellemeler reddedildi; çünkü itilmiş bir dal ucu kendisinin\n"
"uzak konum karşıtından geride. Yeniden itmeden önce bu dalı çıkış\n"
-"yapın ve uzak konumdaki değişiklikleri entegre edin (örn. 'git pull ...').\n"
-"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın."
+"yapın ve uzak konumdaki değişiklikleri entegre edin (örn. 'git pull\n"
+"...'). Ayrıntılar için 'git push --help' içinde 'Notes about\n"
+"fast-forwards'a bakın."
#: builtin/push.c:270
msgid ""
@@ -19475,7 +20188,8 @@
"değişiklikler var. Bu genelde başka bir deponun aynı başvuruya itmesinden\n"
"dolayı olur. Yeniden itmeden önce uzak konumdaki değişiklikleri entegre\n"
"etmek isteyebilirsiniz (örn. 'git pull ...').\n"
-"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın."
+"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a\n"
+"bakın."
#: builtin/push.c:277
msgid "Updates were rejected because the tag already exists in the remote."
@@ -19498,9 +20212,10 @@
"to integrate those changes locally (e.g., 'git pull ...')\n"
"before forcing an update.\n"
msgstr ""
-"Güncellemeler reddedildi; çünkü uzak izleme dalının ucu son çıkıştan bu\n"
-"yana güncellenmiş. Bir güncellemeyi zorlamadan önce bu değişiklikleri yerel\n"
-"olarak entegre etmek isteyebilirsiniz (örn. 'git pull ...'\n"
+"Güncellemeler reddedildi; çünkü uzak izleme dalının ucu son\n"
+"çıkıştan bu yana güncellenmiş. Bir güncellemeyi zorlamadan\n"
+"önce bu değişiklikleri yerel olarak entegre etmek isteye-\n"
+"bilirsiniz (örn. 'git pull ...'\n"
#: builtin/push.c:355
#, c-format
@@ -19512,15 +20227,15 @@
msgid "failed to push some refs to '%s'"
msgstr "bazı başvurular '%s' konumuna itilemedi"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3377
msgid "repository"
msgstr "depo"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "tüm başvuruları it"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "tüm başvuruları yansıla"
@@ -19532,19 +20247,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "etiketleri it (--all veya --mirror ile kullanılamaz)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "zorla güncelle"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<başvuruadı>:<bekle>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
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:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "uzak güncellemelerin yerele entegre edilmesini gerektir"
@@ -19552,12 +20267,12 @@
msgid "control recursive pushing of submodules"
msgstr "altmodüllerin özyineli itilmesini denetle"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "ince paket kullan"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "paket programını al"
@@ -19577,18 +20292,14 @@
msgid "push missing but relevant tags"
msgstr "eksik; ancak ilgili etiketleri it"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "itmeyi GPG ile imzala"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "uzak tarafta atomsal işlem iste"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete; --all, --mirror ve --tags ile uyumsuz"
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete bir başvuru olmadan anlam ifade etmiyor"
@@ -19620,26 +20331,14 @@
"\n"
"\tgit push <ad>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all ve --tags birbiriyle uyumsuz"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all başvuru belirteçleriyle birleştirilemez"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror ve --tags birbiriyle uyumsuz"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror başvuru belirteçleriyle birleştirilemez"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all ve --mirror birbiriyle uyumsuz"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "itme seçeneklerinde yeni satır karakterleri olmamalı"
@@ -19693,86 +20392,86 @@
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<önek>) [-"
-"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<dosya>] (--empty | <ağacımsı1> [<ağacımsı2> [<ağacımsı3>]])"
+"u | -i]] [--no-sparse-checkout] [--index-output=<dosya>] (--empty | "
+"<ağacımsı1> [<ağacımsı2> [<ağacımsı3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "ortaya çıkan indeksi <dosya>'ya yaz"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "yalnızca indeksi boşalt"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Birleştiriliyor"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "bir okumaya ek olarak bir birleştirme gerçekleştir"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "dosya düzeyinde birleştirme gerekmiyorsa 3 yönlü birleştir"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "eklemeler ve kaldırmalar varlığında 3 yönlü birleştir"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "-m ile aynı; ancak birleştirilmeyen girdileri atar"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<altdizin>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "ağacı indekse <altdizin>/ altında oku"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "birleştirme sonucuyla çalışma ağacını güncelleştir"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "açıkça yok sayılan dosyaların üzerine yazılmasına izin ver"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "birleştirmeden sonra çalışma ağacını denetleme"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "indeksi veya çalışma ağacını güncelleme"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "aralıklı çıkış süzgeci uygulamayı atla"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "unpack-trees hatalarını ayıkla"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "geribildirim iletilerini gizle"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:190
msgid "You need to resolve your current index first"
msgstr "Öncelikle geçerli indeksinizi çözmelisiniz"
-#: builtin/rebase.c:35
+#: builtin/rebase.c:36
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -19780,205 +20479,51 @@
"git rebase [-i] [options] [--exec <komut>] [--onto <yeni-temel> | --keep-"
"base] [<üstkaynak> [<dal>]]"
-#: builtin/rebase.c:37
+#: builtin/rebase.c:38
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [options] [--exec <komut>] [--onto <yeni-temel>] --root "
"[<dal>]"
-#: builtin/rebase.c:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "kullanılamaz yapılacaklar listesi: '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:231
#, c-format
msgid "could not create temporary %s"
msgstr "geçici %s oluşturulamadı"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:237
msgid "could not mark as interactive"
msgstr "etkileşimli olarak imlenemedi"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:290
msgid "could not generate todo list"
msgstr "yapılacaklar listesi oluşturulamadı"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:332
msgid "a base commit must be provided with --upstream or --onto"
msgstr "bir taban işlemesi --upstream veya --onto ile sağlanmalıdır"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<seçenekler>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "boş başlayan işlemeleri tut"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "boş iletili işlemelere izin ver"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "birleştirme işlemelerini yeniden temellendir"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "kuzenlerin orijinal dal noktalarını tut"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "squash!/fixup! ile başlayan işlemeleri taşı"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "işlemeleri imzala"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-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:509
-msgid "continue rebase"
-msgstr "yeniden temellendirmeyi sürdür"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "işlemeyi atla"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "yapılacaklar listesini düzenle"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "geçerli yamayı göster"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "yapılacaklar listesindeki işleme numaralarını kısalt"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "yapılacaklar listesindeki işleme numaralarını genişlet"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "yapılacaklar listesini denetle"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "fixup/squash satırlarını yeniden düzenle"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "yapılacaklar listesine 'exec' komutları ekle"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "üzerine"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "revizyonu sınırla"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "tıkıştır"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "üstkaynak işlemesi"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "dal ucu adı"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "yeniden temellendirme stratejisi"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "strateji seçenekleri"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "çıkış yapılacak dal veya işleme"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "'onto' adı:"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "komut"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "çalıştırılacak komut"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "başarısız olan her 'exec'i kendiliğinden yeniden zamanla"
-
-#: builtin/rebase.c:566
-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:582
+#: builtin/rebase.c:391
#, c-format
msgid "%s requires the merge backend"
msgstr "%s birleştirme arka ucunu gerektiriyor"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:433
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "'onto' alınamadı: '%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:450
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "geçersiz orig-head: '%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:475
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "geçersiz allow_rerere_autoupdate yok sayılıyor: '%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:600
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19987,12 +20532,12 @@
"abort\"."
msgstr ""
"Tüm çakışmaları el ile çözün, onları \"git add/rm <çakışan-dosyalar>\"\n"
-"ile tamam olarak imleyin, ardından \"git rebase --continue\" çalıştırın.\n"
-"Bunun yerine bu işlemeyi atlayabilirsiniz: \"git rebase --skip\" yapın.\n"
-"İptal edip \"git rebase\" öncesine geri dönmek için \"git rebase --abort\"\n"
-"çalıştırın."
+"ile tamam olarak imleyin, ardından \"git rebase --continue\"\n"
+"çalıştırın. Bunun yerine bu işlemeyi atlayabilirsiniz: \"git rebase\n"
+"--skip\" yapın. İptal edip \"git rebase\" öncesine geri dönmek için\n"
+"\"git rebase --abort\" çalıştırın."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:685
#, c-format
msgid ""
"\n"
@@ -20011,15 +20556,20 @@
"\n"
"Bunun sonucu olarak git onları yeniden temellendiremiyor."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:836
+#, c-format
+msgid "could not switch to %s"
+msgstr "şuraya geçilemedi: %s"
+
+#: builtin/rebase.c:952
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr ""
-"tanımlanamayan boş tür '%s'; geçerli türler: \"drop\", \"keep\" ve \"ask\""
+"Tanımlanamayan boş tür '%s'; geçerli türler: \"drop\", \"keep\" ve \"ask\"."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:970
#, c-format
msgid ""
"%s\n"
@@ -20036,7 +20586,7 @@
"\tgit rebase '<dal>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:986
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20049,189 +20599,187 @@
"\tgit branch --set-upstream-to=%s/<dal> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:1016
msgid "exec commands cannot contain newlines"
msgstr "'exec' komutları yenisatırlar içeremez"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:1020
msgid "empty exec command"
msgstr "boş 'exec' komutu"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1051
msgid "rebase onto given branch instead of upstream"
msgstr "üstkaynak yerine verilen dalın üzerine yeniden temellendir"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1053
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:1323
+#: builtin/rebase.c:1055
msgid "allow pre-rebase hook to run"
msgstr "pre-rebase kancasının çalışmasına izin ver"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1057
msgid "be quiet. implies --no-stat"
msgstr "sessiz ol (--no-stat ima eder)"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1060
+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:1063
msgid "do not show diffstat of what changed upstream"
msgstr "üstkaynakta nelerin değiştiğini gösteren diffstat gösterme"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1066
msgid "add a Signed-off-by trailer to each commit"
msgstr "her işlemeye bir Signed-off-by artbilgisi ekle"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1069
msgid "make committer date match author date"
msgstr "işleyici tarihi ile yazar tarihini aynı yap"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1071
msgid "ignore author date and use current date"
msgstr "yazar tarihini yok say ve geçerli tarihi kullan"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1073
msgid "synonym of --reset-author-date"
msgstr "--reset-author-date eşanlamlısı"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1075 builtin/rebase.c:1079
msgid "passed to 'git apply'"
msgstr "'git apply'a aktarıldı"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1077
msgid "ignore changes in whitespace"
msgstr "boşluk değişikliklerini yok say"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1081 builtin/rebase.c:1084
msgid "cherry-pick all commits, even if unchanged"
msgstr "değiştirilmemiş olsa bile tüm işlemeleri seç-al yap"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1086
msgid "continue"
msgstr "sürdür"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1089
msgid "skip current patch and continue"
msgstr "geçerli yamayı atla ve sürdür"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1091
msgid "abort and check out the original branch"
msgstr "iptal et ve orijinal dalı çıkış yap"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1094
msgid "abort but keep HEAD where it is"
msgstr "iptal et; ancak HEAD'i olduğu yerde bırak"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1095
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:1366
+#: builtin/rebase.c:1098
msgid "show the patch file being applied or merged"
msgstr "yama dosyası uygulanırken veya birleştirilirken göster"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1101
msgid "use apply strategies to rebase"
msgstr "yeniden temellendirmek için \"apply\" stratejilerini kullan"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1105
msgid "use merging strategies to rebase"
msgstr "yeniden temellendirmek için birleştirme stratejilerini kullan"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1109
msgid "let the user edit the list of commits to rebase"
msgstr ""
"yeniden temellendirilecek işlemelerin listesini kullanıcının düzenlemesine "
"izin ver"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1113
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
"(KULLANILMAMALI) birleştirmeleri yok saymak yerine onları yeniden "
"oluşturmaya çalış"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1118
msgid "how to handle commits that become empty"
msgstr "boşalan işlemelerin nasıl ele alınacağı"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1121
+msgid "keep commits which start empty"
+msgstr "boş başlayan işlemeleri tut"
+
+#: builtin/rebase.c:1125
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "-i altındaki squash!/fixup! ile başlayan işlemeleri taşı"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1132
msgid "add exec lines after each commit of the editable list"
msgstr "düzenlenebilir listenin her işlemesinden sonra exec satırları ekle"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1136
msgid "allow rebasing commits with empty messages"
msgstr "boş iletili işlemelerin yeniden temellendirilmesine izin ver"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1140
msgid "try to rebase merges instead of skipping them"
msgstr "birleştirmeleri atlamak yerine onları yeniden temellendirmeyi dene"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1143
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:1413
+#: builtin/rebase.c:1145
msgid "use the given merge strategy"
msgstr "verilen birleştirme stratejisini kullan"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1147 builtin/revert.c:115
msgid "option"
msgstr "seçenek"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1148
msgid "pass the argument through to the merge strategy"
msgstr "argümanı birleştirme stratejisine aktar"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1151
msgid "rebase all reachable commits up to the root(s)"
msgstr "ulaşılabilir tüm işlemeleri kök(ler)e kadar yeniden temellendir"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1154
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "başarısız olan her 'exec'i kendiliğinden yeniden zamanla"
+
+#: builtin/rebase.c:1156
msgid "apply all changes, even those already present upstream"
msgstr "tüm değişiklikleri uygula, halihazırda üstkaynakta olanları bile"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1177
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:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"'git rebase --preserve-merges' artık eski. Yerine --rebase-merges kullanın."
+#: builtin/rebase.c:1208
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges, --rebase-merges olarak değiştirildi"
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "--keep-base ile --onto birlikte kullanılamaz"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "--keep-base ile --root birlikte kullanılamaz"
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "--root ile --fork-point birlikte kullanılamaz"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1230
msgid "No rebase in progress?"
msgstr "Sürmekte olan bir yeniden temellendirme yok"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1234
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:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "HEAD okunamıyor"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1269
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20239,16 +20787,16 @@
"Önce tüm birleştirme çakışmalarını düzenlemeli ve onları\n"
"git add kullanarak tamamlandı olarak imlemelisiniz."
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1287
msgid "could not discard worktree changes"
msgstr "çalışma ağacı değişiklikleri atılamadı"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1308
#, c-format
msgid "could not move back to %s"
msgstr "%s konumuna geri taşınamadı"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1354
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20269,143 +20817,128 @@
"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:1648
+#: builtin/rebase.c:1382
msgid "switch `C' expects a numerical value"
msgstr "'C' anahtarı sayısal bir değer bekliyor"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1424
#, c-format
msgid "Unknown mode: %s"
msgstr "Bilinmeyen kip: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1463
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy, --merge veya --interactive gerektiriyor"
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "\"apply\" seçenekleri \"merge\" seçenekleriyle birlikte kullanılamıyor"
+#: builtin/rebase.c:1492
+msgid "apply options and merge options cannot be used together"
+msgstr "uygulama seçenekleri ve birleştirme seçenekleri birlikte kullanılamaz"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1505
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Bilinmeyen yeniden temellendirme arka ucu: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1534
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec, --exec veya --interactive gerektiriyor"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "--preserve-merges ile --rebase-merges birlikte kullanılamıyor"
-
-#: builtin/rebase.c:1826
-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:1850
+#: builtin/rebase.c:1565
#, c-format
msgid "invalid upstream '%s'"
msgstr "geçersiz üstkaynak '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1571
msgid "Could not create new root commit"
msgstr "Yeni kök işleme oluşturulamadı"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1597
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': tam olarak dallı bir birleştirme temeli gerekli"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1600
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': tam olarak bir birleştirme temeli gerekiyor"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1609
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "'%s' geçerli bir işlemeye işaret etmiyor"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1636
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "onulmaz: böyle bir dal/işleme yok: '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "böyle bir dal/işleme yok: '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
+#: builtin/submodule--helper.c:2477
#, c-format
msgid "No such ref: %s"
msgstr "Böyle bir başvuru yok: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1658
msgid "Could not resolve HEAD to a revision"
msgstr "HEAD bir revizyona çözülemedi"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1679
msgid "Please commit or stash them."
msgstr "Lütfen onları işleyin veya zulalayın."
-#: builtin/rebase.c:1997
-#, c-format
-msgid "could not switch to %s"
-msgstr "şuraya geçilemedi: %s"
-
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1714
msgid "HEAD is up to date."
msgstr "HEAD güncel."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1716
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Geçerli dal %s güncel.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1724
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD güncel, yeniden temellendirme zorla yapıldı."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1726
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Geçerli dal %s güncel, yeniden temellendirme zorla yapıldı.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1734
msgid "The pre-rebase hook refused to rebase."
msgstr "'pre-rebase' kancası yeniden temellendirmeyi reddetti."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1741
#, c-format
msgid "Changes to %s:\n"
msgstr "%s için olan değişiklikler:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1744
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "%s -> %s değişiklikleri:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1769
#, 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:2072
+#: builtin/rebase.c:1781
msgid "Could not detach HEAD"
msgstr "HEAD ayrılamadı"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1790
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "%s, %s konumuna ileri sarıldı.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dizini>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1263
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"
@@ -20421,20 +20954,19 @@
"To squelch this message and still keep the default behaviour, set\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-"Öntanımlı olarak, çıplak olmayan bir depodaki geçerli dalı güncelleme\n"
-"reddedilir; çünkü bu indeksi ve çalışma ağacını ittiğinizle tutarsız\n"
-"duruma getirir ve çalışma ağacını HEAD ile eşleştirmek için\n"
-"'git reset --hard' gerektirir.\n"
-"Geçerli dalına itmeye izin vermek için uzak depodaki 'receive."
-"denyCurrentBranch'\n"
-"yapılandırma değişkenini 'ignore' veya 'warn' olarak ayarlayabilirsiniz,\n"
-"ancak bu onun çalışma ağacını ittiğinizle eşleştirecek bir yol bulmadığınız\n"
-"sürece önerilmez.\n"
-"Bu iletiyi susturup öntanımlı davranışı tutmak için 'receive."
-"denyCurrentBranch'\n"
-"yapılandırma değişkenini 'refuse' olarak ayarlayın."
+"Öntanımlı olarak, çıplak olmayan bir depodaki geçerli dalı\n"
+"güncelleme reddedilir; çünkü bu indeksi ve çalışma ağacını\n"
+"ittiğinizle tutarsız duruma getirir ve çalışma ağacını HEAD\n"
+"ile eşleştirmek için 'git reset --hard' gerektirir.\n"
+"Geçerli dalına itmeye izin vermek için uzak depodaki\n"
+"'receive.denyCurrentBranch' yapılandırma değişkenini 'ignore'\n"
+"veya 'warn' olarak ayarlayabilirsiniz; ancak bu onun çalışma\n"
+"ağacını ittiğinizle eşleştirecek bir yol bulmadığınız sürece\n"
+"önerilmez. Bu iletiyi susturup öntanımlı davranışı tutmak için\n"
+"'receive.denyCurrentBranch' yapılandırma değişkenini 'refuse'\n"
+"olarak ayarlayın."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1283
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"
@@ -20445,88 +20977,124 @@
"\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-"Öntanımlı olarak, geçerli dalı silme reddedilir; çünkü bir sonraki 'git "
-"clone'\n"
-"hiçbir dosyanın çıkış yapılamamasına neden olup karmaşa doğurur.\n"
+"Öntanımlı olarak, geçerli dalı silme reddedilir; çünkü bir\n"
+"sonraki 'git clone' hiçbir dosyanın çıkış yapılamamasına\n"
+"neden olup karmaşa doğurur.\n"
"\n"
-"Geçerli dalın bir uyarı iletisiyle veya ileti olmadan silinebilmesine izin\n"
-"vermek için uzak depodaki 'receive.denyDeleteCurrent' yapılandırma\n"
-"değişkenini 'warn' veya 'ignore' olarak ayarlayabilirsiniz.\n"
+"Geçerli dalın bir uyarı iletisiyle veya ileti olmadan\n"
+"silinebilmesine izin vermek için uzak depodaki\n"
+"'receive.denyDeleteCurrent' yapılandırma değişkenini 'warn'\n"
+"veya 'ignore' olarak ayarlayabilirsiniz.\n"
+"\n"
"Bu iletiyi susturmak için onu 'refuse' olarak ayarlayın."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2476
msgid "quiet"
msgstr "sessiz"
-#: builtin/receive-pack.c:2492
-msgid "You must specify a directory."
-msgstr "Bir dizin belirtmelisiniz."
+#: builtin/receive-pack.c:2491
+msgid "you must specify a directory"
+msgstr "bir dizin belirtmelisiniz"
+
+#: builtin/reflog.c:9
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [<günlük-seçenekleri>] [<başvuru>]"
+
+#: builtin/reflog.c:12
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
+msgstr ""
+"git reflog expire [--expire=<zaman>] [--expire-unreachable=<zaman>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<zaman>...]"
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
msgstr ""
-"git reflog expire [--expire=<zaman>] [--expire-unreachable=<zaman>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<başvurular>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <başvuru>@{<belirteç>}..."
-#: builtin/reflog.c:22
-msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
-msgstr ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<başvurular>..."
-
-#: builtin/reflog.c:25
+#: builtin/reflog.c:21
msgid "git reflog exists <ref>"
msgstr "git reflog exists <başvuru>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:197 builtin/reflog.c:211
#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "'%s' geçerli bir zaman damgası değil"
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "geçersiz zaman damgası '%s', '--%s' argümanına verildi"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:240 builtin/reflog.c:359
+msgid "do not actually prune any entries"
+msgstr "özünde, hiçbir girdiyi budama"
+
+#: builtin/reflog.c:243 builtin/reflog.c:362
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr ""
+"eski SHA-1'i, onun öncesinde gelen girdinin yeni SHA-1'i ile üzerine yaz"
+
+#: builtin/reflog.c:246 builtin/reflog.c:365
+msgid "update the reference to the value of the top reflog entry"
+msgstr "başvuruyu, en üst başvuru günlüğü girdisinin değerine güncelle"
+
+#: builtin/reflog.c:248 builtin/reflog.c:367
+msgid "print extra information on screen"
+msgstr "ekranda ek bilgi yazdır"
+
+#: builtin/reflog.c:249 builtin/reflog.c:253
+msgid "timestamp"
+msgstr "zaman damgası"
+
+#: builtin/reflog.c:250
+msgid "prune entries older than the specified time"
+msgstr "belirtilen zamandan daha eski girdileri buda"
+
+#: builtin/reflog.c:254
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+"dalın geçerli ucundan erişilemeyen ve <zaman>'dan daha eski girdileri buda"
+
+#: builtin/reflog.c:258
+msgid "prune any reflog entries that point to broken commits"
+msgstr "hatalı işlemelere işaret eden tüm başvuru günlüğü girdilerini buda"
+
+#: builtin/reflog.c:259
+msgid "process the reflogs of all references"
+msgstr "tüm başvuruların başvuru günlüklerini işle"
+
+#: builtin/reflog.c:261
+msgid "limits processing to reflogs from the current worktree only"
+msgstr ""
+"başvuru günlüklerine işlemeyi yalnızca geçerli çalışma ağacına sınırlar"
+
+#: builtin/reflog.c:294
#, c-format
msgid "Marking reachable objects..."
msgstr "Ulaşılabilir nesneler imleniyor..."
-#: builtin/reflog.c:647
+#: builtin/reflog.c:338
#, c-format
msgid "%s points nowhere!"
msgstr "%s hiçbir yere işaret etmiyor!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:374
msgid "no reflog specified to delete"
msgstr "silmek için bir başvuru günlüğü belirtilmedi"
-#: builtin/reflog.c:708
-#, c-format
-msgid "not a reflog: %s"
-msgstr "bir başvuru günlüğü değil: %s"
-
-#: builtin/reflog.c:713
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "'%s' için başvuru günlüğü yok"
-
-#: builtin/reflog.c:759
+#: builtin/reflog.c:396
#, c-format
msgid "invalid ref format: %s"
msgstr "geçersiz başvuru biçimi: %s"
-#: builtin/reflog.c:768
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr "git reflog [ show | expire | delete | exists ]"
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
@@ -20534,82 +21102,87 @@
"git remote add [-t <dal>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<getir|it>] <ad> <url>"
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <eski> <yeni>"
+#: builtin/remote.c:20 builtin/remote.c:40
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <eski> <yeni>"
-#: builtin/remote.c:20 builtin/remote.c:44
+#: builtin/remote.c:21 builtin/remote.c:45
msgid "git remote remove <name>"
msgstr "git remote remove <ad>"
-#: builtin/remote.c:21 builtin/remote.c:49
+#: builtin/remote.c:22 builtin/remote.c:50
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <ad> (-a | --auto | -d | --delete | <dal>)"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <ad>"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <ad>"
-#: builtin/remote.c:24
+#: builtin/remote.c:25
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <uzak-k>)...]"
-#: builtin/remote.c:25
+#: builtin/remote.c:26
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <ad> <dal>..."
-#: builtin/remote.c:26 builtin/remote.c:75
+#: builtin/remote.c:27 builtin/remote.c:76
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <ad>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <ad> <yeni-url> [<eski-url>]"
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <ad> <yeni-url>"
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c:30 builtin/remote.c:83
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <ad> <url>"
-#: builtin/remote.c:34
+#: builtin/remote.c:35
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<seçenekler>] <ad> <url>"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <ad> <dal>..."
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <ad> <dal>..."
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<seçenekler>] <ad>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<seçenekler>] <ad>"
-#: builtin/remote.c:70
+#: builtin/remote.c:71
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<seçenekler>] [<grup> | <uzak-konum>]..."
-#: builtin/remote.c:99
+#: builtin/remote.c:100
#, c-format
msgid "Updating %s"
msgstr "%s güncelleniyor"
-#: builtin/remote.c:131
+#: builtin/remote.c:102
+#, c-format
+msgid "Could not fetch %s"
+msgstr "%s getirilemedi"
+
+#: builtin/remote.c:132
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -20617,75 +21190,80 @@
"--mirror tehlikeli ve artık kullanılmamalı; lütfen\n"
"\t yerine --mirror=fetch veya --mirror=push kullanın."
-#: builtin/remote.c:148
+#: builtin/remote.c:149
#, c-format
msgid "unknown mirror argument: %s"
msgstr "bilinmeyen yansı argümanı: %s"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "fetch the remote branches"
msgstr "uzak konum dallarını getir"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "import all tags and associated objects when fetching"
msgstr "getirirken tüm etiketleri ve ilişkili nesneleri içe aktar"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "veya hiçbir etiketi getirme (--no-tags)"
-#: builtin/remote.c:171
+#: builtin/remote.c:172
msgid "branch(es) to track"
msgstr "izlenecek dal(lar)"
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "master branch"
msgstr "ana dal"
-#: builtin/remote.c:174
+#: builtin/remote.c:175
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
"uzak konum deposunu ona itilecek veya ondan getirilecek bir yansı olarak "
"ayarla"
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying a master branch makes no sense with --mirror"
msgstr "--mirror ile bir ana dal belirtmek anlam ifade etmiyor"
-#: builtin/remote.c:188
+#: builtin/remote.c:189
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"izlemek için dallar belirtmek yalnızca getirme yansılarıyla anlamifade ediyor"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:196 builtin/remote.c:716
#, c-format
msgid "remote %s already exists."
msgstr "%s uzak konumu halihazırda var."
-#: builtin/remote.c:240
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "'%s' ana dalı ayarlanamadı"
-#: builtin/remote.c:355
+#: builtin/remote.c:323
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "ilgilenilmemiş branch.%s.rebase=%s, 'true' olduğu var sayılıyor"
+
+#: builtin/remote.c:367
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "%s başvuru belirteci için getirme haritası alınamadı"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:461 builtin/remote.c:469
msgid "(matching)"
msgstr "(eşleşiyor)"
-#: builtin/remote.c:466
+#: builtin/remote.c:473
msgid "(delete)"
msgstr "(sil)"
-#: builtin/remote.c:655
+#: builtin/remote.c:664
#, c-format
msgid "could not set '%s'"
msgstr "'%s' ayarlanamadı"
-#: builtin/remote.c:660
+#: builtin/remote.c:669
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20696,17 +21274,17 @@
"\t%s:%d\n"
"artık var olmayan '%s' uzak konumunu adlandırıyor."
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
#, c-format
msgid "No such remote: '%s'"
msgstr "Böyle bir uzak konum yok: '%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:726
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "'%s' yapılandırma bölümü '%s' olarak yeniden adlandırılamadı"
-#: builtin/remote.c:730
+#: builtin/remote.c:746
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20717,17 +21295,21 @@
"\t%s\n"
"\tLütfen gerekirse yapılandırmayı el ile güncelleyin."
-#: builtin/remote.c:770
+#: builtin/remote.c:783
+msgid "Renaming remote references"
+msgstr "Uzak konum başvuruları yeniden adlandırılıyor"
+
+#: builtin/remote.c:794
#, c-format
msgid "deleting '%s' failed"
msgstr "'%s' silinmesi başarısız"
-#: builtin/remote.c:804
+#: builtin/remote.c:832
#, c-format
msgid "creating '%s' failed"
msgstr "'%s' oluşturulması başarısız"
-#: builtin/remote.c:882
+#: builtin/remote.c:912
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20741,120 +21323,120 @@
"Not: refs/remotes hiyerarşisi dışındaki bazı dallar kaldırılmadı;\n"
"onları silmek için şunu kullanın:"
-#: builtin/remote.c:896
+#: builtin/remote.c:926
#, c-format
msgid "Could not remove config section '%s'"
msgstr "'%s' yapılandırsa bölümü kaldırılamadı"
-#: builtin/remote.c:999
+#: builtin/remote.c:1034
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " yeni (bir sonraki getirme uzak konumlarda depolayacak/%s"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1037
msgid " tracked"
msgstr " izlendi"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1039
msgid " stale (use 'git remote prune' to remove)"
msgstr " eskimiş (kaldırmak için 'git remote prune' kullanın)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1041
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1082
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "geçersiz branch.%s.merge; birden çok dala yeniden temellendirilemiyor"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1091
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "%s uzak konumuna etkileşimli olarak yeniden temellendirir"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1093
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
"%s uzak konumuna etkileşimli olarak (birleştirmelerle birlikte) yeniden "
"temellendirir"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1096
#, c-format
msgid "rebases onto remote %s"
msgstr "%s uzak konumuna yeniden temellendirir"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1100
#, c-format
msgid " merges with remote %s"
msgstr " %s uzak konumu ile birleştirir"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1103
#, c-format
msgid "merges with remote %s"
msgstr "%s uzak konumu ile birleştirir"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1106
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s ve %s uzak konumu ile birlikte\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1149
msgid "create"
msgstr "oluştur"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1152
msgid "delete"
msgstr "sil"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1156
msgid "up to date"
msgstr "güncel"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1159
msgid "fast-forwardable"
msgstr "ileri sarılabilir"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1162
msgid "local out of date"
msgstr "yerelin tarihi geçmiş"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1169
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s şuna zorluyor: %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1172
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s şuna itiyor: %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1176
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s şuna zorluyor: %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1179
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s şuna itiyor: %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1247
msgid "do not query remotes"
msgstr "uzak konumları sorgulama"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1268
#, c-format
msgid "* remote %s"
msgstr "* uzak konum %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1269
#, c-format
msgid " Fetch URL: %s"
msgstr " URL'yi getir: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
msgid "(no URL)"
msgstr "(URL yok)"
@@ -20862,327 +21444,336 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1284 builtin/remote.c:1286
#, c-format
msgid " Push URL: %s"
msgstr " URL'yi it: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD dalı: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1288
msgid "(not queried)"
msgstr "(sorgulanmadı"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1290
msgid "(unknown)"
msgstr "(bilinmiyor)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1294
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" HEAD dalı (uzak konum HEAD'i belirsiz, aşağıdakilerden biri olabilir):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1306
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Uzak dal:%s"
msgstr[1] " Uzak dallar:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1309 builtin/remote.c:1335
msgid " (status not queried)"
msgstr " (durum sorgulanmadı)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1318
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 'git pull' için yapılandırılan yerel dal:"
msgstr[1] " 'git pull' için yapılandırılan yerel dallar:"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1326
msgid " Local refs will be mirrored by 'git push'"
msgstr " Yerel başvurular 'git pull' tarafından yansılanacak"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1332
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 'git push'%s için yapılandırılan yerel başvuru:"
msgstr[1] " 'git push'%s için yapılandırılan yerel başvurular:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1353
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "refs/remotes/<ad>/HEAD'i uzak konuma göre ayarla"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1355
msgid "delete refs/remotes/<name>/HEAD"
msgstr "refs/remotes/<ad>/HEAD'i sil"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1369
msgid "Cannot determine remote HEAD"
msgstr "Uzak konum HEAD'i belirlenemiyor"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1371
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Birden çok uzak konum HEAD dalı. Lütfen birini açıkça seçin:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1381
#, c-format
msgid "Could not delete %s"
msgstr "%s silinemedi"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1389
#, c-format
msgid "Not a valid ref: %s"
msgstr "Geçerli bir başvuru değil: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1391
#, c-format
msgid "Could not setup %s"
msgstr "%s ayarlanamadı"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1409
#, c-format
msgid " %s will become dangling!"
msgstr " %s sarkacak!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1410
#, c-format
msgid " %s has become dangling!"
msgstr " %s sarkmaya başladı!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1419
#, c-format
msgid "Pruning %s"
msgstr "%s budanıyor"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1420
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1436
#, c-format
msgid " * [would prune] %s"
msgstr " * %s [budanacak]"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1439
#, c-format
msgid " * [pruned] %s"
msgstr " * %s [budandı]"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1484
msgid "prune remotes after fetching"
msgstr "getirme sonrasında uzak konumları buda"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
#, c-format
msgid "No such remote '%s'"
msgstr "Böyle bir uzak konum yok '%s'"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1566
msgid "add branch"
msgstr "dal ekle"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1573
msgid "no remote specified"
msgstr "uzak konum belirtilmedi"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1590
msgid "query push URLs rather than fetch URLs"
msgstr "itme URL'lerinden çok getirme URL'lerini sorgula"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1592
msgid "return all URLs"
msgstr "tüm URL'leri döndür"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1622
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "'%s' uzak konumu için URL yapılandırılmamış"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1648
msgid "manipulate push URLs"
msgstr "itme URL'lerini değiştir"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1650
msgid "add URL"
msgstr "URL ekle"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1652
msgid "delete URLs"
msgstr "URL'leri sil"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1659
msgid "--add --delete doesn't make sense"
msgstr "--add --delete bir anlam ifade etmiyor"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1700
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Geçersiz eski URL dizgisi: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1708
#, c-format
msgid "No such URL found: %s"
msgstr "Böyle bir URL bulunamadı: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1710
msgid "Will not delete all non-push URLs"
msgstr "Tüm itme olmayan URL'ler silinmeyecek"
-#: builtin/repack.c:26
+#: builtin/remote.c:1727
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir"
+
+#: builtin/repack.c:29
msgid "git repack [<options>]"
msgstr "git repack [<seçenekler>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:34
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
"Artan yeniden paketlemeler biteşlem indeksleri ile uyumsuzdur.\n"
-"--no-write-bitmap-index kullanın veya pack.writebitmaps yapılandırmasını\n"
-"devre dışı bırakın."
+"--no-write-bitmap-index kullanın veya pack.writebitmaps\n"
+"yapılandırmasını devre dışı bırakın."
-#: builtin/repack.c:198
+#: builtin/repack.c:206
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:270 builtin/repack.c:630
+#: builtin/repack.c:280 builtin/repack.c:824
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:294
+#: builtin/repack.c:304
msgid "could not finish pack-objects to repack promisor objects"
msgstr "vaatçi nesneleri yeniden paketleme için pack-objects bitirilemedi"
-#: builtin/repack.c:309
+#: builtin/repack.c:319
#, c-format
msgid "cannot open index for %s"
msgstr "%s için indeks açılamıyor"
-#: builtin/repack.c:368
+#: builtin/repack.c:378
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "%s paketi, geometrik ilerlemede kullanmayı düşünmek için pek büyük"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
#, c-format
msgid "pack %s too large to roll up"
msgstr "%s paketi, sarmak için pek büyük"
-#: builtin/repack.c:460
+#: builtin/repack.c:503
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "geçici dosya '%s', yazma için açılamadı"
+
+#: builtin/repack.c:521
+msgid "could not close refs snapshot tempfile"
+msgstr "başvurular anlık görüntü geçici dosyası kapatılamadı"
+
+#: builtin/repack.c:634
msgid "pack everything in a single pack"
msgstr "her şeyi tek bir pakete sığdır"
-#: builtin/repack.c:462
+#: builtin/repack.c:636
msgid "same as -a, and turn unreachable objects loose"
msgstr "-a ile aynı ve ulaşılamayan nesneleri serbest bırakır"
-#: builtin/repack.c:465
+#: builtin/repack.c:639
msgid "remove redundant packs, and run git-prune-packed"
msgstr "gereksiz paketleri kaldır ve 'git-prune-packed' çalıştır"
-#: builtin/repack.c:467
+#: builtin/repack.c:641
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "'git-pack-objects'e --no-reuse-delta geçir"
-#: builtin/repack.c:469
+#: builtin/repack.c:643
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "'git-pack-objects'e --no-reuse-object geçir"
-#: builtin/repack.c:471
+#: builtin/repack.c:645
msgid "do not run git-update-server-info"
msgstr "'git-update-server-info' çalıştırma"
-#: builtin/repack.c:474
+#: builtin/repack.c:648
msgid "pass --local to git-pack-objects"
msgstr "--local'ı 'git-pack-objects'e geçir"
-#: builtin/repack.c:476
+#: builtin/repack.c:650
msgid "write bitmap index"
msgstr "biteşlem indeksi yaz"
-#: builtin/repack.c:478
+#: builtin/repack.c:652
msgid "pass --delta-islands to git-pack-objects"
msgstr "--delta-islands'ı 'git-pack-objects'e geçir"
-#: builtin/repack.c:479
+#: builtin/repack.c:653
msgid "approxidate"
msgstr "yaklaşık tarih"
-#: builtin/repack.c:480
+#: builtin/repack.c:654
msgid "with -A, do not loosen objects older than this"
msgstr "-A ile, bundan daha eski nesneleri bırakma"
-#: builtin/repack.c:482
+#: builtin/repack.c:656
msgid "with -a, repack unreachable objects"
msgstr "-a ile, ulaşılamayan nesneleri yeniden paketle"
-#: builtin/repack.c:484
+#: builtin/repack.c:658
msgid "size of the window used for delta compression"
msgstr "delta sıkıştırması için kullanılan pencerenin boyutu"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:659 builtin/repack.c:665
msgid "bytes"
msgstr "baytlar"
-#: builtin/repack.c:486
+#: builtin/repack.c:660
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:488
+#: builtin/repack.c:662
msgid "limits the maximum delta depth"
msgstr "olabilecek en büyük delta derinliğini kısıtlar"
-#: builtin/repack.c:490
+#: builtin/repack.c:664
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:492
+#: builtin/repack.c:666
msgid "maximum size of each packfile"
msgstr "her paket dosyasının olabilecek en büyük boyutu"
-#: builtin/repack.c:494
+#: builtin/repack.c:668
msgid "repack objects in packs marked with .keep"
msgstr "nesneleri .keep ile imlenmiş paketlerde yeniden paketle"
-#: builtin/repack.c:496
+#: builtin/repack.c:670
msgid "do not repack this pack"
msgstr "bu paketi yeniden paketleme"
-#: builtin/repack.c:498
+#: builtin/repack.c:672
msgid "find a geometric progression with factor <N>"
msgstr "<N> faktörlü bir geometrik ilerleme bul"
-#: builtin/repack.c:508
+#: builtin/repack.c:674
+msgid "write a multi-pack index of the resulting packs"
+msgstr "ortaya çıkan paketlerin bir çoklu paket indeksini yaz"
+
+#: builtin/repack.c:684
msgid "cannot delete packs in a precious-objects repo"
msgstr "bir precious-objects deposundaki paketler silinemiyor"
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable ve -A birbiriyle uyumsuz"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric, -A ve -a ile uyumsuz"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:833
msgid "Nothing new to pack."
msgstr "Paketlenecek yeni bir şey yok."
-#: builtin/repack.c:669
+#: builtin/repack.c:863
#, c-format
msgid "missing required file: %s"
msgstr "gereken dosya eksik: %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:865
#, c-format
msgid "could not unlink: %s"
msgstr "bağlantı kaldırılamadı: %s"
@@ -21199,10 +21790,6 @@
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <işleme> [<üst-öge>...]"
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --convert-graft-file"
-
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <nesne>..."
@@ -21265,67 +21852,61 @@
msgid "unable to open %s for reading"
msgstr "%s okuma için açılamıyor"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "mktree ortaya çıkarılamıyor"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "mktree'den okunamıyor"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "mktree hata bildirdi"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree bir nesne adı döndürmedi"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "%s 'fstat' yapılamıyor"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "nesne veritabanına yazılamıyor"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "geçerli bir nesne adı değil: '%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "%s için nesne türü alınamadı"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "nesne dosyasını düzenleme başarısız"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "yeni nesne eskisiyle aynı: '%s'"
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "%s, bir işleme olarak ayrıştırılamadı"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "'%s' işlemesinde hatalı birleştirme etiketi"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "'%s' işlemesinde hatalı oluşturulmuş birleştirme etiketi"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21334,31 +21915,31 @@
"'%s' orijinal işlemesi atılmış olan '%s' birleştirme etiketini içeriyor; --"
"graft yerine --edit kullanın"
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "'%s' orijinal işlemesinin bir gpg imzası var"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "imza, yerine geçecek işlemede kaldırılacak"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "şunun yerine geçecek işleme yazılamadı: '%s'"
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "'%s' için aşı gereksiz"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "yeni işleme eskisiyle aynı: '%s'"
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -21367,71 +21948,71 @@
"aşağıdaki aşı(lar) dönüştürülemedi:\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "değiştirme başvurularını listele"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "değiştirme başvurularını sil"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "geçerli nesneyi düzenle"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "bir işlemenin üst ögelerini değiştir"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "mevcut aşı dosyasını dönüştür"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "başvuru mevcutsa onu değiştir"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "--edit içeriğini hoş biçimde gösterme"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "bu biçimi kullan"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "--format, listelemiyorken kullanılamaz"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "-f yalnızca yerine geçecek bir nesne yazılırken anlam ifade eder"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw yalnızca --edit ile anlam ifade eder"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d için en azından bir argüman gerekli"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "hatalı argüman sayısı"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e için tam olarak bir argüman gerekli"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-g için en azından bir argüman gerekli"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file argüman almaz"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "-l ile yalnızca bir dizgi verilebilir"
@@ -21452,170 +22033,156 @@
msgid "unable to generate diff for '%s'"
msgstr "'%s' için diff oluşturulamıyor"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<işleme>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<ağacımsı>] [--] <yol-blrtç>..."
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<ağacımsı>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<ağacımsı>] [--] [<yol-blrtç>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "karışık"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "yumuşak"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "sert"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "birleştir"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "tut"
-#: builtin/reset.c:83
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "Geçerli bir HEAD'iniz yok."
-#: builtin/reset.c:85
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "HEAD ağacı bulunamadı."
-#: builtin/reset.c:91
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "%s ağacı bulunamadı."
-#: builtin/reset.c:116
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD şimdi şurada: %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:304
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Bir birleştirmenin ortasında %s sıfırlaması yapılamıyor."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
+#: builtin/stash.c:693
msgid "be quiet, only report errors"
msgstr "sessiz ol, yalnızca hataları bildir"
-#: builtin/reset.c:297
+#: builtin/reset.c:404
+msgid "skip refreshing the index after reset"
+msgstr "sıfırlama sonrası indeksi yenilemeyi atla"
+
+#: builtin/reset.c:406
msgid "reset HEAD and index"
msgstr "HEAD'i ve indeksi sıfırla"
-#: builtin/reset.c:298
+#: builtin/reset.c:407
msgid "reset only HEAD"
msgstr "yalnızca HEAD'i sıfırla"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:409 builtin/reset.c:411
msgid "reset HEAD, index and working tree"
msgstr "HEAD'i, indeksi ve çalışma ağacını sıfırla"
-#: builtin/reset.c:304
+#: builtin/reset.c:413
msgid "reset HEAD but keep local changes"
msgstr "HEAD'i sıfırla; ancak yerel değişiklikleri tut"
-#: builtin/reset.c:310
+#: builtin/reset.c:419
msgid "record only the fact that removed paths will be added later"
msgstr ""
"yalnızca kaldırılan yolların daha sonra ekleneceği gerçeğinin kaydını yaz"
-#: builtin/reset.c:344
+#: builtin/reset.c:452
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "'%s' geçerli bir revizyon olarak çözülemedi."
-#: builtin/reset.c:352
+#: builtin/reset.c:460
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "'%s' geçerli bir ağaç olarak çözülemedi."
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch, --{hard,mixed,soft} ile uyumsuz"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:479
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"belirtilmiş yol ile --mixed artık eski; yerine 'git reset -- <yollar>' "
"kullanın."
-#: builtin/reset.c:373
+#: builtin/reset.c:481
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Belirtilmiş yol varken %s sıfırlaması yapılamıyor."
-#: builtin/reset.c:388
+#: builtin/reset.c:496
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s sıfırlamasına çıplak bir depoda izin verilmiyor"
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "-N yalnızca --mixed ile birlikte kullanılabilir"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:527
msgid "Unstaged changes after reset:"
msgstr "Sıfırlama sonrasında hazırlanmamış değişiklikler:"
-#: builtin/reset.c:416
+#: builtin/reset.c:530
#, c-format
msgid ""
-"\n"
-"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
-"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
-"to make this the default.\n"
+"It took %.2f seconds to refresh the index after reset. You can use\n"
+"'--no-refresh' to avoid this."
msgstr ""
-"\n"
-"Sıfırlama sonrasında hazırlanmamış değişiklikleri ortaya dökme %.2f saniye\n"
-"sürdü. Bundan kaçınmak için --quiet kullanabilir, öntanımlı yapmak içinse\n"
-"reset.quiet yapılandırma değişkenini 'true' olarak değiştirebilirsiniz.\n"
+"Sıfırlamadan sonra indeksi yenilemek %.2f saniye sürdü. Bundan kaçınmak "
+"için\n"
+"'--no-refresh' kullanabilirsiniz."
-#: builtin/reset.c:434
+#: builtin/reset.c:547
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "İndeks dosyası '%s' revizyonuna sıfırlanamadı."
-#: builtin/reset.c:439
+#: builtin/reset.c:552
msgid "Could not write new index file."
msgstr "Yeni indeks dosyası yazılamadı."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "--exclude-promisor-objects ve --missing birlikte kullanılamıyor"
-
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr "nesne süzme --objects gerektiriyor"
-
-#: builtin/rev-list.c:674
+#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
msgstr "rev-list not görüntülemesini desteklemiyor"
-#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "imlenmiş sayım, --objects ile uyumsuz"
+#: builtin/rev-list.c:664
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "imli sayım ve '%s' birlikte kullanılamaz"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -21777,15 +22344,19 @@
msgid "preserve initially empty commits"
msgstr "başlangıçta boş olan işlemeleri koru"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "boş iletili işlemelere izin ver"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "gereksiz, boş işlemeleri tut"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "geri al başarısız"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "seç-al başarısız"
@@ -21835,71 +22406,71 @@
msgstr[0] "Aşağıdaki dosyanın yerel değişiklikleri var:"
msgstr[1] "Aşağıdaki dosyaların yerel değişiklikleri var:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "kaldırılan dosyaları listeleme"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "yalnızca indeksten kaldır"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "güncellik denetlemesini geçersiz kıl"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "özyineli kaldırmaya izin ver"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "hiçbir şey eşleşmemiş olsa bile sıfır koduyla çık"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "Yol belirteci verilmedi. Hangi dosyaları kaldırmalıyım?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"ilerlemek için lütfen değişikliklerinizi .gitmodules'a hazırlayın veya "
"zulalayın"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "'%s', -r olmadan özyineli olarak kaldırılmıyor"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: %s kaldırılamadı"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<makine>:]<dizin> "
-"[<başvuru>...]\n"
-" --all ve açık <başvuru> tanımlaması birlikte kullanılamaz."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<makine>:]<dizin> (--all | <başvurular>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "uzak konum adı"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "durumsuz RPC protokolünü kullan"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "başvuruları stdin'den oku"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "uzak konum yardımcısından durum yazdır"
@@ -21956,27 +22527,27 @@
msgid "group by field"
msgstr "alan ile grupla"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:395
msgid "too many arguments given outside repository"
msgstr "depo dışında çok fazla argüman verildi"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<ne-zaman>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<nezaman>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<bşvr> | <glob>)...]"
-#: builtin/show-branch.c:17
+#: builtin/show-branch.c:18
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<temel>]] [--list] [<başvuru>]"
-#: builtin/show-branch.c:395
+#: builtin/show-branch.c:396
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
@@ -22052,12 +22623,6 @@
msgid "show <n> most recent ref-log entries starting at base"
msgstr "tabanda başlayarak en yeni <n> başvuru günlüğü girdilerini göster"
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog; --all, --remotes, --independent veya --merge-base ile uyumsuz"
-
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "dal verilmedi ve HEAD geçersiz"
@@ -22070,8 +22635,8 @@
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
-msgstr[0] "aynı anda yalnızca %d girdi gösterilebilir"
-msgstr[1] "aynı anda yalnızca %d girdi gösterilebilir"
+msgstr[0] "Aynı anda yalnızca %d girdi gösterilebilir."
+msgstr[1] "Aynı anda yalnızca %d girdi gösterilebilir."
#: builtin/show-branch.c:745
#, c-format
@@ -22147,83 +22712,152 @@
msgid "show refs from stdin that aren't in local repository"
msgstr "stdin'den yerel bir depoda olmayan başvuruları göster"
-#: builtin/sparse-checkout.c:22
+#: builtin/sparse-checkout.c:23
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:46
-msgid "git sparse-checkout list"
-msgstr "git sparse-checkout list"
+#: builtin/sparse-checkout.c:61
+msgid "this worktree is not sparse"
+msgstr "bu çalışma ağacı aralıklı değil"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:76
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"bu çalışma ağacı aralıklı değil (sparse-checkout dosyası var olmayabilir)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:177
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"'%s' dizini izlenmeyen dosyalar içeriyor; ancak aralıklı çıkış konisinde "
+"değil"
+
+#: builtin/sparse-checkout.c:185
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "'%s' dizini kaldırılamadı"
+
+#: builtin/sparse-checkout.c:327
msgid "failed to create directory for sparse-checkout file"
msgstr "aralıklı çıkış dosyası için dizin oluşturulamadı"
-#: builtin/sparse-checkout.c:268
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr "depo biçimi worktreeConfig etkinleştirmesi için yükseltilemiyor"
+#: builtin/sparse-checkout.c:366
+msgid "failed to initialize worktree config"
+msgstr "çalışma ağacı yapılandırması ilklendirilemedi"
-#: builtin/sparse-checkout.c:270
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı"
-
-#: builtin/sparse-checkout.c:290
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-
-#: builtin/sparse-checkout.c:310
-msgid "initialize the sparse-checkout in cone mode"
-msgstr "aralıklı çıkışı koni kipinde ilklendir"
-
-#: builtin/sparse-checkout.c:312
-msgid "toggle the use of a sparse index"
-msgstr "bir aralıklı indeksin kullanımını aç/kapa"
-
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:411
msgid "failed to modify sparse-index config"
msgstr "sparse-index yapılandırması değiştirilemedi"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
+#: builtin/sparse-checkout.c:847
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "aralıklı çıkışı koni kipinde ilklendir"
+
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
+#: builtin/sparse-checkout.c:849
+msgid "toggle the use of a sparse index"
+msgstr "bir aralıklı indeksin kullanımını aç/kapat"
+
+#: builtin/sparse-checkout.c:479
#, c-format
msgid "failed to open '%s'"
msgstr "'%s' açılamadı"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:531
#, c-format
msgid "could not normalize path %s"
msgstr "'%s' yolu olağanlaştırılamadı"
-#: builtin/sparse-checkout.c:425
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <dizgiler>)"
-
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:560
#, 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:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
msgid "unable to load existing sparse-checkout patterns"
msgstr "mevcut aralıklı çıkış dizgileri yüklenemiyor"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:619
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "mevcut aralıklı çıkış dizgileri koni kipini kullanmıyor"
+
+#: builtin/sparse-checkout.c:707
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr "koni dışı kipte en üst düzey dizinden çalıştırın"
+
+#: builtin/sparse-checkout.c:712
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr "dizgiler yerine dizinleri belirt (önünde eğik çizgi yok)"
+
+#: builtin/sparse-checkout.c:714
+msgid ""
+"specify directories rather than patterns. If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+"dizgiler yerine dizinleri belirt; dizininiz bir '!' ile başlıyorsa --skip-"
+"checks'i geç"
+
+#: builtin/sparse-checkout.c:716
+msgid ""
+"specify directories rather than patterns. If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"dizgiler yerine dizinleri belirt; dizininizin içinde '*?[[\\' varsa --skip-"
+"checks'i geç"
+
+#: builtin/sparse-checkout.c:732
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr ""
+"%s, bir dizin değil; yine de bir dizinmiş gibi davranmak için --skip-checks "
+"ile yeniden çalıştır"
+
+#: builtin/sparse-checkout.c:734
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"Tek bir dosya istiyorsanız yollardan önce bir eğik çizgi geçirin ('%s' gibi) "
+"git-sparse-checkout kılavuzunda NON-CONE PROBLEMS'a bakın)."
+
+#: builtin/sparse-checkout.c:739
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <dizgiler>)"
+
+#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr "yanlış pozitif verebilen yollarda düzgünlük denetimlerini atla"
+
+#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
msgid "read patterns from standard in"
msgstr "dizgileri stdin'den oku"
-#: builtin/sparse-checkout.c:588
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:760
+msgid "no sparse-checkout to add to"
+msgstr "kendisine eklenecek bir aralıklı çıkış yok"
-#: builtin/sparse-checkout.c:607
-msgid "git sparse-checkout disable"
-msgstr "git sparse-checkout disable"
+#: builtin/sparse-checkout.c:775
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <dizgiler>)"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:854
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"aralıklılık dizgilerinin yeniden uygulanması için bir aralıklı çıkış içinde "
+"olmalı"
+
+#: builtin/sparse-checkout.c:914
msgid "error while refreshing working directory"
msgstr "çalışma dizini yenilenirken hata"
@@ -22249,22 +22883,26 @@
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n"
" [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n"
" [--] [<yol-blrtç>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<ileti>]"
#: builtin/stash.c:55
@@ -22289,6 +22927,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n"
" [--] [<yol-blrtç>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<ileti>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22312,7 +22958,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "parametreli git stash clear henüz kullanılabilir değil"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22324,181 +22970,181 @@
" %s -> %s\n"
" yeniden adlandırılıyor.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "bir birleştirmenin ortasında zula uygulanamıyor"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "diff oluşturulamadı: %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "İndekste çakışmalar var. --index olmadan deneyin."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "indeks ağacı kaydedilemedi"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "izlenmeyen dosyalar zuladan geri getirilemedi"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "%s, %s ile birleştiriliyor"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "İndeks zuladan çıkartılmamıştı."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "izlenmeyen dosyalar zuladan geri getirilemedi"
+
+#: builtin/stash.c:608 builtin/stash.c:695
msgid "attempt to recreate the index"
msgstr "indeks yeniden oluşturulmaya çalışılıyor"
-#: builtin/stash.c:635
+#: builtin/stash.c:641
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s bırakıldı (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:644
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Zula girdisi bırakılamadı"
-#: builtin/stash.c:651
+#: builtin/stash.c:657
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' bir zula başvurusu değil"
-#: builtin/stash.c:701
+#: builtin/stash.c:707
msgid "The stash entry is kept in case you need it again."
msgstr "Zula girdisi yeniden gereksiniminiz olursa diye saklanıyor."
-#: builtin/stash.c:724
+#: builtin/stash.c:730
msgid "No branch name specified"
msgstr "Dal adı belirtilmedi"
-#: builtin/stash.c:808
+#: builtin/stash.c:809
msgid "failed to parse tree"
msgstr "ağaç ayrıştırılamadı"
-#: builtin/stash.c:819
+#: builtin/stash.c:820
msgid "failed to unpack trees"
msgstr "ağaçların paketi açılamadı"
-#: builtin/stash.c:839
+#: builtin/stash.c:840
msgid "include untracked files in the stash"
msgstr "zulada izlenmeyen dosyaları içer"
-#: builtin/stash.c:842
+#: builtin/stash.c:843
msgid "only show untracked files in the stash"
msgstr "zulada yalnızca izlenmeyen dosyaları göster"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:930 builtin/stash.c:967
#, c-format
msgid "Cannot update %s with %s"
msgstr "%s, %s ile güncellenemiyor"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
msgid "stash message"
msgstr "zula iletisi"
-#: builtin/stash.c:957
+#: builtin/stash.c:958
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" bir <işleme> argümanı gerektirir"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1143
+msgid "No staged changes"
+msgstr "Hazırlanan değişiklik yok"
+
+#: builtin/stash.c:1204
msgid "No changes selected"
msgstr "Değişiklik seçilmedi"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1304
msgid "You do not have the initial commit yet"
msgstr "Henüz ilk işleme yapılmamış"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1331
msgid "Cannot save the current index state"
msgstr "Geçerli indeks durumu kaydedilemiyor"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1340
msgid "Cannot save the untracked files"
msgstr "İzlenmeyen dosyalar kaydedilemiyor"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1351 builtin/stash.c:1370
msgid "Cannot save the current worktree state"
msgstr "Geçerli çalışma ağacı durumu kaydedilemiyor"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1361
+msgid "Cannot save the current staged state"
+msgstr "Geçerli hazırlananlar durumu kaydedilemiyor"
+
+#: builtin/stash.c:1398
msgid "Cannot record working tree state"
msgstr "Çalışma ağacı durumu kaydı yazılamıyor"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1447
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:1422
+#: builtin/stash.c:1458
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "--staged, --include-untracked veya --all hepsi bir anda kullanılamıyor"
+
+#: builtin/stash.c:1476
msgid "Did you forget to 'git add'?"
msgstr "'git add' yapmayı mı unuttunuz?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1491
msgid "No local changes to save"
msgstr "Kaydedilecek yerel değişiklik yok"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1498
msgid "Cannot initialize stash"
msgstr "Zula ilklendirilemiyor"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1513
msgid "Cannot save the current status"
msgstr "Geçerli durum kaydedilemiyor"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1518
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Çalışma dizini ve indeks durumu %s kaydedildi"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1615
msgid "Cannot remove worktree changes"
msgstr "Çalışma ağacı değişiklikleri kaldırılamıyor"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1656 builtin/stash.c:1728
msgid "keep index"
msgstr "indeksi tut"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1658 builtin/stash.c:1730
+msgid "stash staged changes only"
+msgstr "yalnızca hazırlanan değişiklikleri zulala"
+
+#: builtin/stash.c:1660 builtin/stash.c:1732
msgid "stash in patch mode"
msgstr "yama kipinde zula"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1661 builtin/stash.c:1733
msgid "quiet mode"
msgstr "sessiz kip"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1663 builtin/stash.c:1735
msgid "include untracked files in stash"
msgstr "zulada izlenmeyen dosyaları içer"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1665 builtin/stash.c:1737
msgid "include ignore files"
msgstr "yok sayma dosyalarını içer"
-#: builtin/stash.c:1700
-msgid ""
-"the stash.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"stash.useBuiltin desteği kaldırıldı!\n"
-"Ayrıntılar için 'git help config' içindeki girdisine bakın."
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
-
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "yorum karakteri ile başlayan tüm satırları atla ve kaldır"
@@ -22507,73 +23153,17 @@
msgid "prepend comment character and space to each line"
msgstr "her satırın başına yorum karakteri ve boşluk koy"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Tam bir başvuru adı bekleniyordu, %s alındı"
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr "submodule--helper print-default-remote argümanı almaz"
-
-#: builtin/submodule--helper.c:101
+#: builtin/submodule--helper.c:103
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "'%s' url'sinden bir bileşen çıkarılamıyor"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
-msgid "alternative anchor for relative paths"
-msgstr "göreceli yollar için alternatif tutturucu"
-
-#: builtin/submodule--helper.c:416
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]"
-
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
-#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr ".gitmodules içinde '%s' altmodül yolu için url bulunamadı"
-
-#: builtin/submodule--helper.c:526
-#, c-format
-msgid "Entering '%s'\n"
-msgstr "Giriliyor: '%s'\n"
-
-#: builtin/submodule--helper.c:529
-#, c-format
-msgid ""
-"run_command returned non-zero status for %s\n"
-"."
-msgstr ""
-"run_command, %s için sıfır olmayan durum döndürdü\n"
-"."
-
-#: builtin/submodule--helper.c:551
-#, c-format
-msgid ""
-"run_command returned non-zero status while recursing in the nested "
-"submodules of %s\n"
-"."
-msgstr ""
-"run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken "
-"sıfır olmayan durum döndürdü"
-
-#: builtin/submodule--helper.c:567
-msgid "suppress output of entering each submodule command"
-msgstr "her bir altmodül komutu girişinin çıktısını gizle"
-
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
-msgid "recurse into nested submodules"
-msgstr "iç içe geçmiş altmodüle özyinele"
-
-#: builtin/submodule--helper.c:574
-msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <komut>"
-
-#: builtin/submodule--helper.c:601
+#: builtin/submodule--helper.c:213
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -22582,54 +23172,105 @@
"'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu "
"varsayılıyor."
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
+msgid "alternative anchor for relative paths"
+msgstr "göreceli yollar için alternatif tutturucu"
+
+#: builtin/submodule--helper.c:418
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]"
+
+#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
+#: builtin/submodule--helper.c:640
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr ".gitmodules içinde '%s' altmodül yolu için url bulunamadı"
+
+#: builtin/submodule--helper.c:528
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Giriliyor: '%s'\n"
+
+#: builtin/submodule--helper.c:531
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command, %s için sıfır olmayan durum döndürdü\n"
+"."
+
+#: builtin/submodule--helper.c:553
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken "
+"sıfır olmayan durum döndürdü."
+
+#: builtin/submodule--helper.c:569
+msgid "suppress output of entering each submodule command"
+msgstr "her bir altmodül komutu girişinin çıktısını gizle"
+
+#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1458
+msgid "recurse into nested submodules"
+msgstr "iç içe geçmiş altmodüle özyinele"
+
+#: builtin/submodule--helper.c:576
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <komut>"
+
+#: builtin/submodule--helper.c:654
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Altmodül yolu url'si '%s' kaydı yapılamadı"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:658
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapıldı\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:668
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "uyarı: '%s' altmodülü için komut güncellemesi önerilmiyor\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:675
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "'%s' altmodülü yolu için güncelleme kipi kaydı yapılamadı"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:697
msgid "suppress output for initializing a submodule"
msgstr "bir altmodül ilklendirmesi çıktısını gizle"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:702
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<seçenekler>] [<yol>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "'%s' yolu için .gitmodules içinde altmodül eşlemi bulunmadı"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "'%s' altmodülü içinde HEAD başvurusu çözülemedi"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "'%s' altmodülüne özyinelenemedi"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
msgid "suppress submodule status output"
msgstr "altmodül durum çıktısını gizle"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:875
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -22637,105 +23278,101 @@
"altmodül HEAD'i içinde depolanan işleme yerine indekste depolanan işlemeyi "
"kullan"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<yol>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <yol>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:977
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(ikili nesne)->%s(altmodül)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:980
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(altmodül)->%s(ikili nesne)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:993
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1043
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "'%s' üzerinden nesne sağlaması yapılamadı"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1047
#, c-format
msgid "unexpected mode %o\n"
msgstr "beklenmedik kip %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1288
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "altmodül HEAD'i içindeki işleme ile indekstekini karşılaştırmak için"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1290
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "indeksteki işlemeyi altmodül HEAD'inde olan ile karşılaştır"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1292
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "'ignore_config' değeri 'all' olan altmodülleri atla"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1294
msgid "limit the summary size"
msgstr "özet boyutunu sınırla"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1299
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<seçenekler>] [<işleme>] [--] [<yol>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1323
msgid "could not fetch a revision for HEAD"
msgstr "HEAD için bir revizyon getirilemedi"
-#: builtin/submodule--helper.c:1342
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached ve --files birlikte kullanılamaz"
-
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1384
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "'%s' için altmodül url'si eşitleniyor\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1390
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "'%s' altmodülü yolu için url kaydı yapılamadı"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1399
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "'%s' altmodülü için öntanımlı uzak konum alınamadı"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1409
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "'%s' altmodülü için uzak konum güncellenemedi"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1456
msgid "suppress output of synchronizing submodule url"
msgstr "altmodül url'si eşitleme çıktısını gizle"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1463
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1513
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"Altmodül çalışma ağacı '%s' bir .git dizini içeriyor (tüm geçmişi dahil "
-"olacak biçimde kaldırmak istiyorsanız 'rm -rf' kullanın)"
+"Altmodül çalışma ağacı '%s' bir .git dizini içeriyor. Bu, absorbgitdirs "
+"kullanılarak bir .git dosyası ile değiştirilecek."
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1530
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22744,47 +23381,47 @@
"Altmodül çalışma ağacı '%s' yerel değişiklikler içeriyor; onları atmak için "
"'-f' kullanın"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1538
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "'%s' dizini temizlendi\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1540
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "'%s' altmodül çalışma ağacı kaldırılamadı\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1551
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "boş altmodül dizini %s oluşturulamadı"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1567
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapılmamış\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1596
msgid "remove submodule working trees even if they contain local changes"
msgstr "altmodül çalışma ağaçlarını yerel değişiklikler içerseler bile kaldır"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1597
msgid "unregister all submodules"
msgstr "tüm altmodüllerin kaydını kaldır"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1602
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<yol>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1616
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Tüm altmodüllerin ilklendirmesini gerçekten geri almak istiyorsanız '--all' "
"kullanın"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1665
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22796,152 +23433,173 @@
"submodule.alternateErrorStrategy ayarını 'info'ya ayarlayın veya\n"
"--reference yerine --reference-if-able kullanarak klonlayın."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "'%s' altmodülü alternatif ekleyemiyor: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1749
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "'%s' submodule.alternateErrorStrategy değeri tanımlanamadı"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1756
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "'%s' submodule.alternateLocation değeri tanımlanamadı"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1781
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"başka bir altmodülün git dizininde '%s' oluşturma/kullanma reddediliyor"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1826
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "'%s' ögesinin '%s' altmodül yoluna klonlanması başarısız"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1831
#, c-format
msgid "directory not empty: '%s'"
msgstr "dizin boş değil: '%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1843
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "'%s' için altmodül dizini alınamadı"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1876
msgid "where the new submodule will be cloned to"
msgstr "yeni altmodülün nereye klonlanacağı"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1879
msgid "name of the new submodule"
msgstr "yeni altmodülün adı"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1882
msgid "url where to clone the submodule from"
msgstr "altmodülün klonlanacağı url konumu"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
msgid "depth for shallow clones"
msgstr "sığ klonların derinliği"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
+#: builtin/submodule--helper.c:3376
msgid "force cloning progress"
msgstr "zorla klonla"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
msgid "disallow cloning into non-empty directory"
msgstr "boş olmayan dizine klonlamaya izin verme"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1903
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
msgstr ""
-"git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference <depo>] "
-"[--name <ad>] [--depth <derinlik>] [--single-branch] --url <url> --path <yol>"
+"git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference "
+"<depo>] [--name <ad>] [--depth <derinlik>] [--single-branch] [--filter "
+"<süzgeç-belirteci>] --url <url> --path <yol>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1943
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1947
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için yapılandırılmış"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Altmodül yolu '%s' ilklendirilmedi"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "'update --init' mi kullanmak istersiniz?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Birleştirilmemiş altmodül %s atlanıyor"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "'%s' altmodülü atlanıyor"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı."
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "'%s' ikinci bir kez klonlanamadı, iptal ediliyor"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
-msgid "path into the working tree"
-msgstr "çalışma ağacına giden yol"
+#: builtin/submodule--helper.c:2371
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Şu altmodül yolunda '%s' çıkışı yapılamadı: '%s'"
-#: builtin/submodule--helper.c:2347
-msgid "path into the working tree, across nested submodule boundaries"
-msgstr "iç içe geçmiş altmodül sınırları üzerinden çalışma ağacına giden yol"
+#: builtin/submodule--helper.c:2375
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Şu altmodül yolunda '%s' yeniden temellendirilemedi: '%s'"
-#: builtin/submodule--helper.c:2351
-msgid "rebase, merge, checkout or none"
-msgstr "rebase, merge, checkout veya none"
+#: builtin/submodule--helper.c:2379
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Şu altmodül yolunda '%s' birleştirilemedi: '%s'"
-#: builtin/submodule--helper.c:2357
-msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr "belirli bir revizyon sayısına kısaltılmış sığ klon oluştur"
+#: builtin/submodule--helper.c:2383
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Şu altmodül yolunda '%s %s' çalıştırılamadı: '%s'"
-#: builtin/submodule--helper.c:2360
-msgid "parallel jobs"
-msgstr "paralel işler"
+#: builtin/submodule--helper.c:2402
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Altmodül yolu '%s': '%s' çıkışı yapıldı\n"
-#: builtin/submodule--helper.c:2362
-msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "ilk klonun sığlık üzerine olan tavsiyeyi izleyip izlemeyeceği"
+#: builtin/submodule--helper.c:2406
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Altmodül yolu '%s': '%s' üzerine yeniden temellendirildi\n"
-#: builtin/submodule--helper.c:2363
-msgid "don't print cloning progress"
-msgstr "klonlama işlemini yazdırma"
+#: builtin/submodule--helper.c:2410
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Altmodül yolu '%s': '%s' içinde birleştirildi\n"
-#: builtin/submodule--helper.c:2374
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update-clone [--prefix=<yol>] [<yol>...]"
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Altmodül yolu '%s': '%s %s'\n"
-#: builtin/submodule--helper.c:2387
-msgid "bad value for update parameter"
-msgstr "güncelleme parametresi için hatalı değer"
+#: builtin/submodule--helper.c:2438
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"'%s' altmodül yolunda getirme yapılamadı; %s doğrudan getirilmeye "
+"çalışılıyor:"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2447
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"'%s' altmodül yolunda getirme yapıldı; ancak %s içermiyor. Bu işlemenin "
+"doğrudan getirilmesi başarısız oldu."
+
+#: builtin/submodule--helper.c:2481
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22950,142 +23608,286 @@
"Altmodül (%s) dalı süperproje dalından devralmak üzere yapılandırıldı; ancak "
"süperproje herhangi bir dalda değil"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2499
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "'%s' altmodülü için depo tutacağı alınamadı"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2588
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr "'%s' altmodül yolunda geçerli revizyon bulunamadı"
+
+#: builtin/submodule--helper.c:2599
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "'%s' altmodül yolunda getirme yapılamadı"
+
+#: builtin/submodule--helper.c:2604
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr "%s revizyonu, '%s' altmodül yolunda bulunamadı"
+
+#: builtin/submodule--helper.c:2640
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "'%s' altmodül yoluna özyineleme yapılamadı"
+
+#: builtin/submodule--helper.c:2699
+msgid "force checkout updates"
+msgstr "güncellemeleri zorla çıkış yap"
+
+#: builtin/submodule--helper.c:2701
+msgid "initialize uninitialized submodules before update"
+msgstr "güncellemeden önce ilklendirilmemiş altmodülleri ilklendir"
+
+#: builtin/submodule--helper.c:2703
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "altmodül uzak izleme dalının SHA-1'ini kullan"
+
+#: builtin/submodule--helper.c:2705
+msgid "traverse submodules recursively"
+msgstr "altmodülleri özyineli basamaklandır"
+
+#: builtin/submodule--helper.c:2707
+msgid "don't fetch new objects from the remote site"
+msgstr "yeni nesneleri uzak konumdan getirme"
+
+#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+msgid "path into the working tree"
+msgstr "çalışma ağacına giden yol"
+
+#: builtin/submodule--helper.c:2713
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "iç içe geçmiş altmodül sınırları üzerinden çalışma ağacına giden yol"
+
+#: builtin/submodule--helper.c:2717
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout veya none"
+
+#: builtin/submodule--helper.c:2723
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "belirli bir revizyon sayısına kısaltılmış sığ klon oluştur"
+
+#: builtin/submodule--helper.c:2726
+msgid "parallel jobs"
+msgstr "paralel işler"
+
+#: builtin/submodule--helper.c:2728
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "ilk klonun sığlık üzerine olan tavsiyeyi izleyip izlemeyeceği"
+
+#: builtin/submodule--helper.c:2729
+msgid "don't print cloning progress"
+msgstr "klonlama işlemini yazdırma"
+
+#: builtin/submodule--helper.c:2741
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+msgstr ""
+"git submodule [--quiet] update [--init [--filter=<süzgeç-blrtç>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <depo>] [--recursive] [--[no-]single-branch] [--] "
+"[<yol>...]"
+
+#: builtin/submodule--helper.c:2767
+msgid "bad value for update parameter"
+msgstr "güncelleme parametresi için hatalı değer"
+
+#: builtin/submodule--helper.c:2893
msgid "recurse into submodules"
msgstr "altmodüllere özyinele"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2899
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<seçenekler>] [<yol>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2955
msgid "check if it is safe to write to the .gitmodules file"
msgstr ".gitmodules dosyasına yazım güvenli mi değil mi denetle"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2958
msgid "unset the config in the .gitmodules file"
msgstr ".gitmodules dosyasındaki yapılandırmayı kaldır"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <ad> [<değer>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <ad>"
-#: builtin/submodule--helper.c:2663
-msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper config --check-writeable"
-
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
+#: builtin/submodule--helper.c:3395
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:2698
+#: builtin/submodule--helper.c:3000
msgid "suppress output for setting url of a submodule"
msgstr "bir altmodül url ayarlanması çıktısını gizle"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:3004
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <yol> <yeniurl>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:3037
msgid "set the default tracking branch to master"
msgstr "öntanımlı izleme dalını master olarak ayarla"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:3039
msgid "set the default tracking branch"
msgstr "öntanımlı izleme dalını ayarla"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:3043
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <yol>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:3044
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <dal> <yol>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:3051
msgid "--branch or --default required"
msgstr "--branch veya --default gerekli"
-#: builtin/submodule--helper.c:2752
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch ve --default birlikte kullanılamaz"
+#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+msgid "print only error messages"
+msgstr "yalnızca hata iletilerini yazdır"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3073
+msgid "force creation"
+msgstr "oluşturmayı zorla"
+
+#: builtin/submodule--helper.c:3081
+msgid "show whether the branch would be created"
+msgstr "dalın oluşturulup oluşturulmayacağını göster"
+
+#: builtin/submodule--helper.c:3085
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <ad> <başlangıç-oid> <başlangıç-adı>"
+
+#: builtin/submodule--helper.c:3097
+#, c-format
+msgid "creating branch '%s'"
+msgstr "'%s' dalı oluşturuluyor"
+
+#: builtin/submodule--helper.c:3155
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "'%s' konumundaki mevcut repo indekse ekleniyor\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3158
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' halihazırda mevcut ve geçerli bir git deposu değil"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3171
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "'%s' için bir git deposu yerelde şu uzak konumlarla bulundu:"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "'%s' için bir git deposu yerelde şu uzak konumlarla bulundu:\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3178
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"Eğer bu yerel git dizinini\n"
" %s\n"
-"konumundan yeniden klonlama yerine kullanmak isterseniz '--force'\n"
-"seçeneğini kullanın. Eğer bu yerel git dizini doğru depo değilse veya bunun\n"
-"ne anlama geldiğinden emin değilseniz '--name' seçeneği ile başka bir ad\n"
-"seçin.\n"
+"konumundan yeniden klonlama yerine yeniden kullanmak isterseniz\n"
+"'--force' seçeneğini kullanın. Eğer bu yerel git dizini doğru\n"
+"depo değilse veya bunun ne anlama geldiğinden emin değilseniz\n"
+"'--name' seçeneği ile başka bir ad seçin."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3190
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "'%s' altmodülü için yerel git dizini yeniden etkinleştiriliyor\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3227
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "'%s' altmodülü çıkış yapılamıyor"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "klonlamada çıkış yapılacak depo dalı"
+#: builtin/submodule--helper.c:3266
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "'%s' altmodülü eklenemedi"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
+#: builtin/submodule--helper.c:3283
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "'%s' altmodülü kaydı yapılamadı"
+
+#: builtin/submodule--helper.c:3339
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' indekste halihazırda var"
+
+#: builtin/submodule--helper.c:3342
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' indekste halihazırda var ve bir altmodül değil"
+
+#: builtin/submodule--helper.c:3372
+msgid "branch of repository to add as submodule"
+msgstr "altmodül olarak eklenecek depo dalı"
+
+#: builtin/submodule--helper.c:3373
msgid "allow adding an otherwise ignored submodule path"
msgstr "başka bir durumda yok sayılan altmodül yolunun eklenmesine izin ver"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<seçenekler>...] --url <url> --path <yol> --"
-"name <ad>"
+#: builtin/submodule--helper.c:3379
+msgid "borrow the objects from reference repositories"
+msgstr "nesneleri başvuru depolarından ödünç al"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3381
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"altmodülün adını kendi yoluna öntanımlamak yerine verilen dizi olarak ayarlar"
+
+#: builtin/submodule--helper.c:3388
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<seçenekler>] [--] <depo> [<yol>]"
+
+#: builtin/submodule--helper.c:3416
+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"
+
+#: builtin/submodule--helper.c:3425
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "depo URL'si: '%s' mutlak olmalı veya ./|../ ile başlamalıdır"
+
+#: builtin/submodule--helper.c:3460
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' geçerli bir altmodül adı değil"
+
+#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s, --super-prefix desteklemiyor"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3526
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' geçerli bir submodule--helper altkomutu değil"
@@ -23110,53 +23912,52 @@
msgid "shorten ref output"
msgstr "başvuru çıktısını kısalt"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "neden"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "güncelleme nedeni"
-#: builtin/tag.c:25
+#: builtin/tag.c:26
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <anahtar-no>] [-f] [-m <ileti> | -F <dosya>]\n"
-"\t\t<etiket-adı> [<dal-ucu>]"
+"git tag [-a | -s | -u <anahtar-kimliği>] [-f] [-m <ileti> | -F <dosya>]\n"
+" <etiket-adı> [<head>]"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid "git tag -d <tagname>..."
msgstr "git tag -d <etiket-adı>..."
-#: builtin/tag.c:28
+#: builtin/tag.c:29
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
-"git tag -l [-n[<sayı>]] [--contains <işleme>] [--no-contains <işleme>] [--"
-"points-at <nesne>]\n"
-"\t\t[--format=<biçim>] [--merged <işleme>] [--no-merged <işleme>] "
-"[<dizgi>...]"
+"git tag -l [-n[<sayı>]] [--contains <işleme>] [--no-contains <işleme>]\n"
+" [-- points-at <nesne>] [--format=<biçim>] [--merged <işleme>]\n"
+" [--no-merged <işleme>] [<dizgi>...]"
-#: builtin/tag.c:30
+#: builtin/tag.c:31
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<biçim>] <etiket-adı>..."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "tag '%s' not found."
msgstr "'%s' etiketi bulunamadı."
-#: builtin/tag.c:135
+#: builtin/tag.c:136
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "'%s' etiketi silindi (%s idi)\n"
-#: builtin/tag.c:170
+#: builtin/tag.c:171
#, c-format
msgid ""
"\n"
@@ -23169,7 +23970,7 @@
" %s\n"
"'%c' ile başlayan satırlar yok sayılacaktır.\n"
-#: builtin/tag.c:174
+#: builtin/tag.c:175
#, c-format
msgid ""
"\n"
@@ -23203,137 +24004,117 @@
#: builtin/tag.c:275
msgid "bad object type."
-msgstr "hatalı nesne türü"
+msgstr "hatalı nesne türü."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "etiket iletisi yok mu?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, 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:446
+#: builtin/tag.c:445
msgid "list tag names"
msgstr "etiket adlarını listele"
-#: builtin/tag.c:448
+#: builtin/tag.c:447
msgid "print <n> lines of each tag message"
msgstr "her etiket iletisinin <n> satırını listele"
-#: builtin/tag.c:450
+#: builtin/tag.c:449
msgid "delete tags"
msgstr "etiketleri sil"
-#: builtin/tag.c:451
+#: builtin/tag.c:450
msgid "verify tags"
msgstr "etiketleri doğrula"
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "Tag creation options"
msgstr "Etiket oluşturma seçenekleri"
-#: builtin/tag.c:455
+#: builtin/tag.c:454
msgid "annotated tag, needs a message"
msgstr "açıklama eklenmiş etiket için bir ileti gerek"
-#: builtin/tag.c:457
+#: builtin/tag.c:456
msgid "tag message"
msgstr "etiket iletisi"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
msgid "force edit of tag message"
msgstr "etiket iletisini zorla düzenle"
-#: builtin/tag.c:460
+#: builtin/tag.c:459
msgid "annotated and GPG-signed tag"
msgstr "açıklama eklenmiş ve GPG imzalı etiket"
-#: builtin/tag.c:463
+#: builtin/tag.c:462
msgid "use another key to sign the tag"
msgstr "etiketi imzalamak için başka bir anahtar kullanın"
-#: builtin/tag.c:464
+#: builtin/tag.c:463
msgid "replace the tag if exists"
msgstr "eğer varsa etiketi başkasıyla değiştir"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:464 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "bir başvuru günlüğü oluştur"
-#: builtin/tag.c:467
+#: builtin/tag.c:466
msgid "Tag listing options"
msgstr "Etiket listeleme seçenekleri"
-#: builtin/tag.c:468
+#: builtin/tag.c:467
msgid "show tag list in columns"
msgstr "etiket listesini sütunlarla göster"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that contain the commit"
msgstr "yalnızca işlemeyi içeren etiketleri yazdır"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:469 builtin/tag.c:471
msgid "print only tags that don't contain the commit"
msgstr "yalnızca işleme içermeyen etiketleri yazdır"
-#: builtin/tag.c:473
+#: builtin/tag.c:472
msgid "print only tags that are merged"
msgstr "yalnızca birleştirilen etiketleri yazdır"
-#: builtin/tag.c:474
+#: builtin/tag.c:473
msgid "print only tags that are not merged"
msgstr "yalnızca birleştirilmeyen etiketleri yazdır"
-#: builtin/tag.c:478
+#: builtin/tag.c:477
msgid "print only tags of the object"
msgstr "yalnızca nesnenin etiketlerini yazdır"
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column ve -n birbiriyle uyumsuz"
+#: builtin/tag.c:559
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "'%s' seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "-n seçeneğine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains seçeneğine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:552
-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:554
-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:556
-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:567
-msgid "only one -F or -m option is allowed."
-msgstr "yalnızca bir -F veya -m seçeneğine izin verilir"
-
-#: builtin/tag.c:592
+#: builtin/tag.c:598
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' geçerli bir etiket adı değil."
-#: builtin/tag.c:597
+#: builtin/tag.c:603
#, c-format
msgid "tag '%s' already exists"
msgstr "'%s' etiketi halihazırda var"
-#: builtin/tag.c:628
+#: builtin/tag.c:634
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "'%s' etiketi güncellendi (%s idi)\n"
+#: builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "paket izin verilen en büyük boyutu aşıyor"
+
#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr "Nesneler açılıyor"
@@ -23343,195 +24124,190 @@
msgid "failed to create directory %s"
msgstr "%s dizini oluşturulamadı"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "%s dosyası oluşturulamadı"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "%s dosyası silinemedi"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "%s dizini silinemedi"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "'%s' içindeki mtime sınanıyor "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "dizin bilgileri yeni bir dosya ekledikten sonra değişmez"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "dizin bilgileri yeni bir dizin ekledikten sonra değişmez"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "dizin bilgileri bir dosya güncellemesinden sonra değişir"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "dizin bilgileri altdizin içine yeni bir dosya ekledikten sonra değişir"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "dizin bilgileri bir dosya sildikten sonra değişmez"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "dizin bilgileri bir dizin sildikten sonra değişmez"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " Tamam"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<seçenekler>] [--] [<dosya>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:993
msgid "continue refresh even when index needs update"
msgstr "indeksin güncellenmesi gerekse bile yenilemeyi sürdür"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:996
msgid "refresh: ignore submodules"
msgstr "refresh: altmodülleri yok say"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:999
msgid "do not ignore new files"
msgstr "yeni dosyaları yok sayma"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:1001
msgid "let files replace directories and vice-versa"
msgstr "dosyaların dizinlerin yerine geçmesine ve tersine izin ver"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1003
msgid "notice files missing from worktree"
msgstr "çalışma ağacından eksik olan dosyaları fark et"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:1005
msgid "refresh even if index contains unmerged entries"
msgstr "indekste birleştirilmemiş girdiler olsa bile yenile"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1008
msgid "refresh stat information"
msgstr "dosya durum bilgisini yenile"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1012
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "--refresh gibi; ancak assume-unchanged ayarını yok sayar"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1016
msgid "<mode>,<object>,<path>"
msgstr "<kip>,<nesne>,<yol>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1017
msgid "add the specified entry to the index"
msgstr "belirtilen girdiyi indekse ekle"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1027
msgid "mark files as \"not changing\""
msgstr "dosyaları \"not changing\" olarak imle"
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1030
msgid "clear assumed-unchanged bit"
msgstr "assumed-unchanged kısmını temizle"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1033
msgid "mark files as \"index-only\""
msgstr "dosyaları \"index-only\" olarak imle"
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1036
msgid "clear skip-worktree bit"
msgstr "skip-worktree kısmını atla"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1039
msgid "do not touch index-only entries"
msgstr "'index-only' girdilerine dokunma"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1041
msgid "add to index only; do not add content to object database"
msgstr "yalnızca indekse ekle; içeriğe nesne veritabanına ekleme"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1043
msgid "remove named paths even if present in worktree"
msgstr "çalışma ağacında mevcut olsa bile ad verilen yolları kaldır"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1045
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "--stdin ile: girdi satırları boş baytlarla sonlandırılır"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1047
msgid "read list of paths to be updated from standard input"
msgstr "güncellenecek yol listelerini standart girdi'den oku"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1051
msgid "add entries from standard input to the index"
msgstr "indekse standart girdi'den girdiler ekle"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1055
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "#2 ve #3 numaralı adımları listelenmiş yollar için yeniden doldur"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1059
msgid "only update entries that differ from HEAD"
msgstr "yalnızca HEAD'den farklı olan girdileri güncelle"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1063
msgid "ignore files missing from worktree"
msgstr "çalışma ağacından eksik olan dosyaları yok say"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1066
msgid "report actions to standard output"
msgstr "eylemleri standart çıktı'ya bildir"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1068
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(okunabilir veri için) kaydedilmiş çözülmeyen çakışmaları unut"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1072
msgid "write index in this format"
msgstr "indeksi bu biçimle yaz"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1074
msgid "enable or disable split index"
msgstr "bölünmüş indeksi etkinleştir veya devre dışı bırak"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1076
msgid "enable/disable untracked cache"
msgstr "izlenmeyen önbelleği etkinleştir/devre dışı bırak"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1078
msgid "test if the filesystem supports untracked cache"
msgstr "dosya sisteminin izlenmeyen önbellek destekleyip desteklemediğini sına"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1080
msgid "enable untracked cache without testing the filesystem"
msgstr "dosya sistemini sınamadan izlenmeyen önbelleği etkinleştir"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1082
msgid "write out the index even if is not flagged as changed"
msgstr "değiştirilmiş olarak imlenmese bile indeksi yaz"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1084
msgid "enable or disable file system monitor"
msgstr "dosya sistemi monitörünü etkinleştir veya devre dışı bırak"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1086
msgid "mark files as fsmonitor valid"
msgstr "dosyaları dosya sistemi monitöründe geçerli olarak imle"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1089
msgid "clear fsmonitor valid bit"
msgstr "dosya sistemi monitöründe geçerli kısmını temizle"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1195
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -23539,7 +24315,7 @@
"core.splitIndex 'false' olarak ayarlanmış; bölünmüş indeksi etkinleştirmeyi "
"gerçekten istiyorsanız bunu kaldırın veya değiştirin"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1204
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -23547,7 +24323,7 @@
"core.splitIndex 'true' olarak ayarlanmış; bölünmüş indeksi devre dışı "
"bırakmayı gerçekten istiyorsanız bunu kaldırın veya değiştirin"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1216
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23555,11 +24331,11 @@
"core.untrackedCache 'true' olarak ayarlanmış; izlenmeyen önbelleği gerçekten "
"devre dışı bırakmayı istiyorsanız bunu kaldırın veya değiştirin"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1220
msgid "Untracked cache disabled"
msgstr "İzlenmeyen önbellek devre dışı bırakıldı"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1228
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -23567,29 +24343,29 @@
"core.untrackedCache 'false' olarak ayarlanmış; izlenmeyen önbelleği "
"gerçekten etkinleştirmek istiyorsanız bunu kaldırın veya değiştirin"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1232
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "İzlenmeyen önbellek '%s' için etkinleştirildi"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1241
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor ayarlanmamış; dosya sistemin monitörünü gerçekten "
"etkinleştirmek istiyorsanız onu ayarlayın"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1246
msgid "fsmonitor enabled"
msgstr "dosya sistemi monitörü etkin"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1250
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor ayarlanmış; dosya sistemi monitörünü gerçekten devre dışı "
"bırakmak istiyorsanız onu kaldırın"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1254
msgid "fsmonitor disabled"
msgstr "dosya sistemi monitörü devre dışı"
@@ -23606,26 +24382,22 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<seçenekler>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "başvuruyu sil"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
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:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "stdin'de NUL ile sonlandırılan argümanlar var"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "güncellemeleri stdin'den oku"
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "bilgi dosyalarını en baştan güncelle"
@@ -23634,19 +24406,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<seçenekler>] <dizin>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "tek bir istek/yanıt değiş tokuşundan sonra çık"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "ilk başvuru tanıtımından sonra hemen çık"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "git-http-backend için info/refs'i sun"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "eğer <dizin> bir Git dizini değilse <dizin>/.git/ deneme"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "aktarımı <n> saniye hareketsizlikten sonra kes"
@@ -23682,63 +24454,62 @@
msgid "print tag contents"
msgstr "etiket içeriğini yazdır"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<seçenekler>] <yol> [<işlememsi>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<seçenekler>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<seçenekler>] <yol>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <ç-ağacı> <yeni-yol>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<seçenekler>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<seçenekler>] <ç-ağacı>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [<yol>...]"
+
+#: builtin/worktree.c:26
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <yol>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "'%s' silinemedi"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:76
#, c-format
msgid "Removing %s/%s: %s"
msgstr "%s/%s kaldırılıyor: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "budanan çalışma ağaçlarını bildir"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "<zaman>'dan eski çalışma ağaçlarının hükmünü kaldır"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' halihazırda var"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:230
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "kullanılamayan çalışma ağacı konumu '%s'"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:235
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23748,7 +24519,7 @@
"geçersiz kılmak için '%s -f -f', temizlemek için 'unlock', 'prune' veya "
"'remove' kullanın"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:237
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23757,139 +24528,146 @@
"'%s' eksik; ancak halihazırda kaydı yapılmış bir çalışma ağacı;\n"
"geçersiz kılmak için '%s -f', temizlemek için 'prune' veya 'remove' kullanın"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:248
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr "'%s' -> '%s' kopyalanamadı; aralıklı çıkış düzgün çalışmayabilir"
+
+#: builtin/worktree.c:268
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr "çalışma ağacı yapılandırması '%s' -> '%s' konumuna kopyalanamadı"
+
+#: builtin/worktree.c:280 builtin/worktree.c:285
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "'%s' ayarı, '%s' içinde kaldırılamadı"
+
+#: builtin/worktree.c:356
#, c-format
msgid "could not create directory of '%s'"
msgstr "'%s' dizini oluşturulamadı"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:378
msgid "initializing"
msgstr "ilklendiriliyor"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:492 builtin/worktree.c:498
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Çalışma ağacı hazırlanıyor (yeni dal '%s')"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:494
#, 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:431
+#: builtin/worktree.c:503
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Çalışma ağacı hazırlanıyor ('%s' çıkış yapılıyor)"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:509
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:554
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:485
+#: builtin/worktree.c:557
msgid "create a new branch"
msgstr "yeni bir dal oluştur"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:559
msgid "create or reset a branch"
msgstr "yeni bir dal oluştur veya sıfırla"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:561
msgid "populate the new working tree"
msgstr "yeni çalışma ağacını doldur"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:562
msgid "keep the new working tree locked"
msgstr "yeni çalışma ağacını kilitli tut"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:564 builtin/worktree.c:809
msgid "reason for locking"
msgstr "kilitleme nedeni"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:567
msgid "set up tracking mode (see git-branch(1))"
msgstr "izleme kipini ayarla (bkz: git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:570
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:506
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B ve --detach birlikte kullanılamaz"
-
-#: builtin/worktree.c:508
-msgid "--reason requires --lock"
-msgstr "--reason, --lock gerektiriyor"
-
-#: builtin/worktree.c:512
+#: builtin/worktree.c:584
msgid "added with --lock"
msgstr "--lock ile eklendi"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:646
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:691
+#: builtin/worktree.c:766
msgid "show extended annotations and reasons, if available"
msgstr "varsa genişletilmiş açıklamaları ve nedenleri göster"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:768
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr "<zaman>'dan eski çalışma ağaçlarına 'budanabilir' açıklama ekle"
-#: builtin/worktree.c:702
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose ve --porcelain birlikte kullanılamaz"
+#: builtin/worktree.c:770
+msgid "terminate records with a NUL character"
+msgstr "kayıtları bir NUL karakteriyle sonlandır"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
+#: builtin/worktree.c:1052
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' bir çalışma ağacı değil"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:823 builtin/worktree.c:856
msgid "The main working tree cannot be locked or unlocked"
msgstr "Ana çalışma ağacı kilitlenemez veya kilidi açılamaz"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:828
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' halihazırda kilitli, nedeni: %s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:830
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' halihazırda kilitli"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:858
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' kilitli değil"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:899
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:827
+#: builtin/worktree.c:907
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:850 builtin/worktree.c:974
+#: builtin/worktree.c:930 builtin/worktree.c:1054
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' bir ana çalışma ağacı"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:935
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "hedef adı şuradan anlaşılamadı: '%s'"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:948
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -23898,7 +24676,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:870
+#: builtin/worktree.c:950
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -23906,38 +24684,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:873
+#: builtin/worktree.c:953
#, 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:878
+#: builtin/worktree.c:958
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "'%s' -> '%s' taşıması başarısız"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:1004
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "'%s' üzerinde 'git status' çalıştırılamadı"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:1008
#, 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:933
+#: builtin/worktree.c:1013
#, 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:956
+#: builtin/worktree.c:1036
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:979
+#: builtin/worktree.c:1059
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -23946,7 +24724,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:981
+#: builtin/worktree.c:1061
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -23954,17 +24732,17 @@
"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:984
+#: builtin/worktree.c:1064
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "doğrulama başarısız, çalışma ağacı kaldırılamıyor: %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1088
#, c-format
msgid "repair: %s: %s"
msgstr "şunu onar %s: %s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1091
#, c-format
msgid "error: %s: %s"
msgstr "hata: %s: %s"
@@ -24015,21 +24793,16 @@
"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:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "--git-dir için dizin verilmedi\n"
+msgid "no directory given for '%s' option\n"
+msgstr "'%s' seçeneği için bir dizin verilmedi\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "--namespace için ad alanı verilmedi\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "--work-tree için dizin verilmedi\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
@@ -24045,11 +24818,6 @@
msgid "no config key given for --config-env\n"
msgstr "--config-env için bir yapılandırma anahtarı verilmedi\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "-C için dizin verilmedi\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
@@ -24079,29 +24847,29 @@
msgid "recursive alias: %s"
msgstr "özyineli arma: %s"
-#: git.c:476
+#: git.c:480
msgid "write failure on standard output"
msgstr "standart çıktı'da yazma hatası"
-#: git.c:478
+#: git.c:482
msgid "unknown write failure on standard output"
msgstr "standart çıktı'da bilinmeyen yazma hatası"
-#: git.c:480
+#: git.c:484
msgid "close failed on standard output"
msgstr "standart çıktı'da kapatma başarısız"
-#: git.c:833
+#: git.c:838
#, 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:883
+#: git.c:888
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "%s bir yerleşik olarak ele alınamıyor"
-#: git.c:896
+#: git.c:901
#, c-format
msgid ""
"usage: %s\n"
@@ -24110,34 +24878,26 @@
"kullanım: %s\n"
"\n"
-#: git.c:916
+#: git.c:921
#, 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:928
+#: git.c:933
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "'%s' komutu çalıştırılamadı: %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr "--packfile için argüman geçerli bir sağlama olmalıdır ('%s' alındı)"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "bir git deposu değil"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile, --index-pack-args gerektiriyor"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args yalnızca --packfile ile kullanılabilir"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "beklenmeyen seçenekler"
@@ -24163,66 +24923,32 @@
msgid "exit immediately after advertising capabilities"
msgstr "becerileri gösterdikten hemen sonra çık"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "soket/boru halihazırda kullanımda: '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "sunucu şurada başlatılamadı: '%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "arka plan servisi oluşturulup çalıştırılamadı"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid başarısız"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "arka plan servisi henüz çevrimiçi değil"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "arka plan servisi başlatılamadı"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid'in kafası karışmış"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "arka plan servisi henüz kapanmadı"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<ad>] [<seçenekler>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<ad>] [<iş-parçacıkları>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
"test-helper simple-ipc start-daemon [<ad>] [<iş-parçacıkları>] [<maks-bekl>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<ad>] [<maks-bekle>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<ad>] [<jeton>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [<ad>] [<bayt-sayısı>] [<bayt>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24230,84 +24956,80 @@
"test-helper simple-ipc multiple [<ad>] [<iş-parçacığı>] [<bayt-sayısı>] "
"[<parti-boyutu>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "unix ad alanının adı veya yol adı"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "named-pipe adı"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "sunucu iş parçacığı havuzundaki iş parçacığı sayısı"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
-msgstr "arka plan servisinin başlaaması veya durması için beklenecek saniye"
+msgstr "ardalan sürecinin başlaması veya durması için beklenecek saniye"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "bayt sayısı"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "iş parçacığı başına düşen istek sayısı"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "bayt"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "dengeleyici karakter"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "jeton"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "sunucuya gönderilecek komut jetonu"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer için negatif değer; %d olarak varsayılıyor"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegasyon denetimi cURL < 7.22.0 tarafından desteklenmiyor"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Ortak anahtar iğnelemesi cURL < 7.44.0 tarafından desteklenmiyor"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Ortak anahtar iğnelemesi cURL < 7.39.0 tarafından desteklenmiyor"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE cURL < 7.44.0 tarafından desteklenmiyor"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Protokol sınırlamaları cURL < 7.19.4 tarafından desteklenmiyor"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Desteklenmeyen SSL arka ucu '%s'. Desteklenen SSL arka uçları:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"SSL arka ucu '%s' olarak ayarlanamadı: cURL, SSL arka uçları olmadan yapılmış"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "SSL arka ucu '%s' olarak ayarlanamadı: Halihazırda ayarlanmış"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24318,139 +25040,327 @@
" şu istendi: %s\n"
" yönlenen: %s"
-#: remote-curl.c:183
+#: remote-curl.c:184
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "push-option değerinde geçersiz tırnak içine alım: '%s'"
-#: remote-curl.c:307
+#: remote-curl.c:308
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs geçerli değil: bu bir git deposu mu?"
-#: remote-curl.c:408
+#: remote-curl.c:409
msgid "invalid server response; expected service, got flush packet"
msgstr "geçersiz sunucu yanıtı; servis bekleniyordu, floş paketi alındı"
-#: remote-curl.c:439
+#: remote-curl.c:440
#, c-format
msgid "invalid server response; got '%s'"
msgstr "geçersiz sunucu yanıtı; '%s' alındı"
-#: remote-curl.c:499
+#: remote-curl.c:500
#, c-format
msgid "repository '%s' not found"
msgstr "'%s' deposu bulunamadı"
-#: remote-curl.c:503
+#: remote-curl.c:504
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' için kimlik doğrulaması başarısız"
-#: remote-curl.c:507
+#: remote-curl.c:508
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "'%s', http.pinnedPubkey yapılandırması ile erişilemiyor: %s"
+
+#: remote-curl.c:512
#, c-format
msgid "unable to access '%s': %s"
msgstr "'%s' erişilemiyor: %s"
-#: remote-curl.c:513
+#: remote-curl.c:518
#, c-format
msgid "redirecting to %s"
msgstr "şuraya yeniden yönlendiriliyor: %s"
-#: remote-curl.c:644
+#: remote-curl.c:649
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "dosya sonuna dikkat edilmiyorsa dosya sonu olmamalıdır"
-#: remote-curl.c:656
+#: remote-curl.c:661
msgid "remote server sent unexpected response end packet"
msgstr "uzak sunucu beklenmedik yanıt sonu paketi gönderdi"
-#: remote-curl.c:726
+#: remote-curl.c:730
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"rpc sonrası verisi geri sarılamıyor - http.postBuffer'ı artırmayı deneyin"
-#: remote-curl.c:756
+#: remote-curl.c:759
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: hatalı satır uzunluğu karakteri: %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:761
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: beklenmedik yanıt sonu paketi"
-#: remote-curl.c:834
+#: remote-curl.c:837
#, c-format
msgid "RPC failed; %s"
msgstr "RPC başarısız oldu; %s"
-#: remote-curl.c:874
+#: remote-curl.c:877
msgid "cannot handle pushes this big"
msgstr "bu kadar büyük itmeler ele alınamıyor"
-#: remote-curl.c:989
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "istek söndürülemiyor; 'zlib deflate' hatası %d"
-#: remote-curl.c:993
+#: remote-curl.c:994
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "istek söndürülemiyor; 'zlib end' hatası %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1044
#, c-format
msgid "%d bytes of length header were received"
msgstr "üstbilginin %d baytı alındı"
-#: remote-curl.c:1045
+#: remote-curl.c:1046
#, c-format
msgid "%d bytes of body are still expected"
msgstr "gövdenin %d baytı hâlâ bekleniyor"
-#: remote-curl.c:1134
+#: remote-curl.c:1135
msgid "dumb http transport does not support shallow capabilities"
msgstr "programlanamayan http taşıyıcısı sığ işlevleri desteklemiyor"
-#: remote-curl.c:1149
+#: remote-curl.c:1150
msgid "fetch failed."
msgstr "getirme başarısız."
-#: remote-curl.c:1195
+#: remote-curl.c:1198
msgid "cannot fetch by sha1 over smart http"
msgstr "akıllı http üzerinden sha1 ile getirme yapılamıyor"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1242 remote-curl.c:1248
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "protokol hatası: sha/ref bekleniyordu, '%s' alındı"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1260 remote-curl.c:1378
#, c-format
msgid "http transport does not support %s"
msgstr "http taşıyıcısı %s desteklemiyor"
-#: remote-curl.c:1293
+#: remote-curl.c:1296
msgid "git-http-push failed"
msgstr "git-http-push başarısız"
-#: remote-curl.c:1481
+#: remote-curl.c:1485
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: kullanım: git remote-curl <uzak-konum> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1517
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: git'ten komut akışı okunurken hata"
-#: remote-curl.c:1520
+#: remote-curl.c:1524
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: yerel bir depo olmadan getirme yapılmaya çalışıldı"
-#: remote-curl.c:1561
+#: remote-curl.c:1565
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: git'ten bilinmeyen komut '%s'"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "bir çalışma dizini gerekiyor"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "gönüllü yazılma kaydı bulunamıyor"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
+#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "şuraya geçilemedi: '%s'"
+
+#: contrib/scalar/scalar.c:179
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "%s=%s yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:197
+msgid "could not configure log.excludeDecoration"
+msgstr "log.excludeDecoration yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:218
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar gönüllü kayıtları bir çalışma ağacı gerektiriyor"
+
+#: contrib/scalar/scalar.c:310
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "uzak konum HEAD'i bir dal değil: '%.*s'"
+
+#: contrib/scalar/scalar.c:316
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"uzak konumdan öntanımlı dal adı alınamadı; yerel öntanımlı kullanılıyor"
+
+#: contrib/scalar/scalar.c:329
+msgid "failed to get default branch name"
+msgstr "öntanımlı dal adı alınamadı"
+
+#: contrib/scalar/scalar.c:340
+msgid "failed to unregister repository"
+msgstr "depo kaydı silinemedi"
+
+#: contrib/scalar/scalar.c:355
+msgid "failed to delete enlistment directory"
+msgstr "gönüllü kayıt dizini silinemedi"
+
+#: contrib/scalar/scalar.c:375
+msgid "branch to checkout after clone"
+msgstr "klonlama sonrası çıkış yapılacak dal"
+
+#: contrib/scalar/scalar.c:377
+msgid "when cloning, create full working directory"
+msgstr "klonlama sırasında tam çalışma dizini oluştur"
+
+#: contrib/scalar/scalar.c:379
+msgid "only download metadata for the branch that will be checked out"
+msgstr "yalnızca çıkış yapılacak dalın üstverisini indir"
+
+#: contrib/scalar/scalar.c:384
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<seçenekler>] [--] <depo> [<dizin>]"
+
+#: contrib/scalar/scalar.c:409
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "'%s' ögesinden çalışma ağacı adı ortaya çıkarılamıyor"
+
+#: contrib/scalar/scalar.c:418
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "'%s' dizini halihazırda var"
+
+#: contrib/scalar/scalar.c:445
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "'%s' için öntanımlı dal alınamadı"
+
+#: contrib/scalar/scalar.c:456
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "'%s' içindeki uzak konum yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:465
+#, c-format
+msgid "could not configure '%s'"
+msgstr "'%s' yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:468
+msgid "partial clone failed; attempting full clone"
+msgstr "kısımsal klonlama başarısız; tam klonlama deneniyor"
+
+#: contrib/scalar/scalar.c:472
+msgid "could not configure for full clone"
+msgstr "tam klonlama için yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:504
+msgid "`scalar list` does not take arguments"
+msgstr "'scalar list' argüman almıyor"
+
+#: contrib/scalar/scalar.c:517
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<gönüllükayıt>]"
+
+#: contrib/scalar/scalar.c:544
+msgid "reconfigure all registered enlistments"
+msgstr "tüm kaydı yapılmış gönüllü kayıtları yeniden yapılandır"
+
+#: contrib/scalar/scalar.c:548
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <gönüllükayıt>]"
+
+#: contrib/scalar/scalar.c:566
+msgid "--all or <enlistment>, but not both"
+msgstr "--all veya <gönüllükayıt>; ancak ikisi değil"
+
+#: contrib/scalar/scalar.c:581
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "git deposu '%s' içinde gitti"
+
+#: contrib/scalar/scalar.c:621
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <görev> [<gönüllükayıt>]\n"
+"Görevler:\n"
+
+#: contrib/scalar/scalar.c:639
+#, c-format
+msgid "no such task: '%s'"
+msgstr "böyle bir görev yok: '%s'"
+
+#: contrib/scalar/scalar.c:689
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+#: contrib/scalar/scalar.c:736
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <gönüllükayıt>"
+
+#: contrib/scalar/scalar.c:751
+msgid "refusing to delete current working directory"
+msgstr "geçerli çalışma dizinini silme reddediliyor"
+
+#: contrib/scalar/scalar.c:766
+msgid "include Git version"
+msgstr "Git sürümünü içer"
+
+#: contrib/scalar/scalar.c:768
+msgid "include Git's build options"
+msgstr "Git'in yapı seçeneklerini içer"
+
+#: contrib/scalar/scalar.c:772
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:813
+msgid "-C requires a <directory>"
+msgstr "-C, bir <dizin> gerektiriyor"
+
+#: contrib/scalar/scalar.c:815
+#, c-format
+msgid "could not change to '%s'"
+msgstr "'%s' olarak değiştirilemedi"
+
+#: contrib/scalar/scalar.c:821
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c, bir <anahtar>=<değer> argümanı gerektiriyor"
+
+#: contrib/scalar/scalar.c:839
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <dizin>] [-c <anahtar>=<değer>] <komut> [<seçenekler>]\n"
+"\n"
+"Komutlar:\n"
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr "derleyici bilgisi mevcut değil\n"
@@ -24459,53 +25369,53 @@
msgid "no libc information available\n"
msgstr "libc bilgisi mevcut değil\n"
-#: list-objects-filter-options.h:94
+#: list-objects-filter-options.h:126
msgid "args"
msgstr "argümanlar"
-#: list-objects-filter-options.h:95
+#: list-objects-filter-options.h:127
msgid "object filtering"
msgstr "nesne süzümü"
-#: parse-options.h:184
+#: parse-options.h:188
msgid "expiry-date"
msgstr "son kullanım tarihi"
-#: parse-options.h:198
+#: parse-options.h:202
msgid "no-op (backward compatibility)"
msgstr "işlem yok (geriye dönük uyumluluk için)"
-#: parse-options.h:310
+#: parse-options.h:341
msgid "be more verbose"
msgstr "daha ayrıntılı anlat"
-#: parse-options.h:312
+#: parse-options.h:343
msgid "be more quiet"
msgstr "daha sessiz ol"
-#: parse-options.h:318
+#: parse-options.h:349
msgid "use <n> digits to display object names"
msgstr "nesne adlarını görüntülemek için <n> basamak kullan"
-#: parse-options.h:337
+#: parse-options.h:368
msgid "how to strip spaces and #comments from message"
msgstr "iletiden boşlukları ve #yorumları çıkart"
-#: parse-options.h:338
+#: parse-options.h:369
msgid "read pathspec from file"
msgstr "yol belirtecini dosyadan oku"
-#: parse-options.h:339
+#: parse-options.h:370
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"--pathspec-from-file ile, yol belirteci ögeleri NUL karakteri ile ayrılır"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "key"
msgstr "anahtar"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "üzerine sıralanacak alan adı"
@@ -24575,17 +25485,17 @@
msgstr "Kişilerin adlarını ve e-posta adreslerini göster"
#: command-list.h:65
+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:66
msgid "Switch branches or restore working tree files"
msgstr "Dal değiştir veya çalışma ağacını eski haline geri getir"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "Dosyaları indeksten çalışma ağacına kopyala"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Bir başvuru adının düzgünce oluşturulduğundan emin ol"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "Henüz üstkaynağa uygulanmayan işlemeleri bul"
@@ -24648,7 +25558,7 @@
#: 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"
+msgstr "'Tiskindiğiniz' başka bir KDY'den verinizi kurtarın"
#: command-list.h:84
msgid "A CVS server emulator for Git"
@@ -24748,41 +25658,41 @@
msgstr "Git yardım bilgisini görüntüle"
#: command-list.h:108
+msgid "Run git hooks"
+msgstr "Git kancalarını çalıştır"
+
+#: command-list.h:109
msgid "Server side implementation of Git over HTTP"
msgstr "Git'in HTTP üzerinden sunucu tarafı uygulaması"
-#: command-list.h:109
+#: command-list.h:110
msgid "Download from a remote Git repository via HTTP"
msgstr "HTTP üzerinden uzak bir Git deposundan indir"
-#: command-list.h:110
+#: command-list.h:111
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Nesneleri HTTP/DAV üzerinden başka bir depoya it"
-#: command-list.h:111
+#: command-list.h:112
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:112
+#: command-list.h:113
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:113
+#: command-list.h:114
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Boş bir Git deposu oluştur veya olanı yeniden ilklendir"
-#: command-list.h:114
+#: command-list.h:115
msgid "Instantly browse your working repository in gitweb"
msgstr "gitweb'deki çalışma deposuna anında göz at"
-#: command-list.h:115
+#: command-list.h:116
msgid "Add or parse structured information in commit messages"
msgstr "İşleme iletilerine düzenli bilgi ekle veya ayrıştır"
-#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Git depo tarayıcısı"
-
#: command-list.h:117
msgid "Show commit logs"
msgstr "İşleme günlüklerini göster"
@@ -24832,25 +25742,25 @@
msgstr "Bu yardımcı program git-merge-index kullanımı içindir"
#: command-list.h:129
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr "Çakışmaları çözmek için çözüm araçlarını çalıştır"
-
-#: command-list.h:130
msgid "Show three-way merge without touching index"
msgstr "İndekse dokunmadan üçlü birleştirmeyi göster"
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "multi-pack-index doğrula ve yaz"
+#: command-list.h:130
+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:132
+#: command-list.h:131
msgid "Creates a tag object with extra validation"
msgstr "Ek doğrulamalı bir etiket nesnesi oluştur"
-#: command-list.h:133
+#: command-list.h:132
msgid "Build a tree-object from ls-tree formatted text"
msgstr "ls-tree biçimli metinden bir ağaç nesnesi yap"
+#: command-list.h:133
+msgid "Write and verify multi-pack-indexes"
+msgstr "multi-pack-index doğrula ve yaz"
+
#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Dosya, dizin veya sembolik bağları taşı/yeniden adlandır"
@@ -24952,17 +25862,17 @@
msgstr "Çalışma ağacı dosyalarını eski durumuna getir"
#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Bazı var olan işlemeleri geri al"
-
-#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
msgstr "İşleme nesnelerini ters kronolojik sırada listele"
-#: command-list.h:161
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "Parametreleri al ve üzerinde çalış"
+#: command-list.h:161
+msgid "Revert some existing commits"
+msgstr "Bazı var olan işlemeleri geri al"
+
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr "Dosyaları çalışma ağacından ve indeksten kaldır"
@@ -24976,49 +25886,49 @@
msgstr "Nesneleri Git protokolü üzerinden başka bir depoya it"
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
-msgstr "Yalnızca Git SSH erişimi için kısıtlandırılmış oturum açma kabuğu"
-
-#: command-list.h:166
-msgid "Summarize 'git log' output"
-msgstr "'git log' çıktısını özetle"
-
-#: command-list.h:167
-msgid "Show various types of objects"
-msgstr "Çeşitli türlerden nesneleri göster"
-
-#: command-list.h:168
-msgid "Show branches and their commits"
-msgstr "Dalları ve onların işlemelerini göster"
-
-#: command-list.h:169
-msgid "Show packed archive index"
-msgstr "Paketlenmiş arşiv indeksini göster"
-
-#: command-list.h:170
-msgid "List references in a local repository"
-msgstr "Yerel bir depodaki başvuruları listele"
-
-#: command-list.h:171
msgid "Git's i18n setup code for shell scripts"
msgstr "Kabuk betikleri için Git'in i18n kurulum kodu"
-#: command-list.h:172
+#: command-list.h:166
msgid "Common Git shell script setup code"
msgstr "Ortak Git kabuk betiği kurulum kodu"
+#: command-list.h:167
+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:168
+msgid "Summarize 'git log' output"
+msgstr "'git log' çıktısını özetle"
+
+#: command-list.h:169
+msgid "Show various types of objects"
+msgstr "Çeşitli türlerden nesneleri göster"
+
+#: command-list.h:170
+msgid "Show branches and their commits"
+msgstr "Dalları ve onların işlemelerini göster"
+
+#: command-list.h:171
+msgid "Show packed archive index"
+msgstr "Paketlenmiş arşiv indeksini göster"
+
+#: command-list.h:172
+msgid "List references in a local repository"
+msgstr "Yerel bir depodaki başvuruları listele"
+
#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
-msgstr "Aralıklı çıkışı ilklendir ve güncelle"
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr "Çalışma ağacını izlenen dosyaların bir alt kümesine küçült"
#: command-list.h:174
-msgid "Stash the changes in a dirty working directory away"
-msgstr "Kirli bir çalışma dizinindeki değişiklikleri zulala"
-
-#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Dosya içeriğini hazırlama alanına ekle"
+#: command-list.h:175
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Kirli bir çalışma dizinindeki değişiklikleri zulala"
+
#: command-list.h:176
msgid "Show the working tree status"
msgstr "Çalışma ağacı durumunu göster"
@@ -25093,65 +26003,65 @@
msgstr "Etiketlerin GPG imzasını doğrula"
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git web arabirimi (Git depoları için web ön ucu)"
-
-#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "Günlükleri her işlemenin sunduğu değişikliklerle göster"
-#: command-list.h:196
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "Birden çok çalışma ağacını yönet"
-#: command-list.h:197
+#: 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:198
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "Öznitelikleri yola göre tanımla"
-#: command-list.h:199
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Git komut satırı arabirimi ve kuralları"
-#: command-list.h:200
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "Geliştiriciler için Git çekirdeği eğitmeni"
-#: command-list.h:201
+#: command-list.h:200
msgid "Providing usernames and passwords to Git"
msgstr "Git'e kullanıcı adları ve parolalar belirt"
-#: command-list.h:202
+#: command-list.h:201
msgid "Git for CVS users"
msgstr "CVS kullanıcıları için Git"
-#: command-list.h:203
+#: command-list.h:202
msgid "Tweaking diff output"
msgstr "diff çıktısı için ince ayarlar"
-#: command-list.h:204
+#: command-list.h:203
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Günlük Git kullanımı için yararlı komutlar"
-#: command-list.h:205
+#: command-list.h:204
msgid "Frequently asked questions about using Git"
msgstr "Git kullanımı hakkında sıkça sorulan sorular"
-#: command-list.h:206
+#: command-list.h:205
msgid "A Git Glossary"
msgstr "Git Kavram Dizini"
-#: command-list.h:207
+#: command-list.h:206
msgid "Hooks used by Git"
msgstr "Git tarafından kullanılan kancalar"
-#: command-list.h:208
+#: command-list.h:207
msgid "Specifies intentionally untracked files to ignore"
msgstr "Özellikle yok sayılması istenen dosyaları belirt"
+#: command-list.h:208
+msgid "The Git repository browser"
+msgstr "Git depo tarayıcısı"
+
#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
msgstr "Yazar/İşleyici adlarını ve/veya e-posta adreslerini eşlemle"
@@ -25181,52 +26091,21 @@
msgstr "Bir depoyu bir başkasının içine bağlama"
#: command-list.h:216
-msgid "A tutorial introduction to Git: part two"
-msgstr "Git'e Giriş: Bölüm 2"
-
-#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "Git'e Giriş"
+#: command-list.h:217
+msgid "A tutorial introduction to Git: part two"
+msgstr "Git'e Giriş: Bölüm 2"
+
#: command-list.h:218
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git web arabirimi (Git depoları için web ön ucu)"
+
+#: command-list.h:219
msgid "An overview of recommended workflows with Git"
msgstr "Önerilen Git çalışma akışlarına genel bakış"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "ikili arama başarısız: Komut verilmedi."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "$command çalıştırılıyor"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"bisect çalıştırılamadı:\n"
-"çıkış kodu $res, '$command' konumundan, < 0 veya >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "bisect daha fazla çalıştırılamıyor"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"ikili arama başarısız oldu:\n"
-"'bisect-state $state' $res hata koduyla çıktı"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "ikili arama başarılı"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25265,510 +26144,46 @@
#: git-merge-octopus.sh:102
msgid "Simple merge did not work, trying automatic merge."
-msgstr "Yalın birleştirme işe yaramadı, otomatik birleştirme deneniyor"
-
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"Göreceli yol yalnızca çalışma ağacının en üst düzeyinden kullanılabilir"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "depo URL'si: '$repo' kesin olmalı veya ./|../ ile başlamalıdır"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' indekste halihazırda var"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' indekste halihazırda var ve bir altmodül değil"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' çıkış yapılan bir işlemeye iye değil"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "'$sm_path' altmodülü eklenemedi"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "'$sm_path' altmodülü kaydı yapılamadı"
-
-#: git-submodule.sh:532
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "'$displaypath' altmodül yolunda geçerli revizyon bulunamadı"
-
-#: git-submodule.sh:542
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "'$sm_path' altmodül yolunda getirme yapılamadı"
-
-#: git-submodule.sh:547
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr ""
-"'$sm_path' altmodül yolunda geçerli ${remote_name}/${branch} revizyonu "
-"bulunamadı"
-
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"'$displaypath' altmodül yolunda getirme yapılamadı; $sha1 doğrudan "
-"getirilmeye çalışılıyor"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"'$displaypath' altmodül yolunda getirme tamamlandı; ancak $sha1 içermiyor. "
-"Bu işlemenin doğrudan getirilmesi başarısız oldu."
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "'$displaypath' altmodül yolunda '$sha1' çıkışı yapılamadı"
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Altmodül yolu '$displaypath': '$sha1' çıkışı yaptı"
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "'$sha1', '$displaypath' altmodül yolunda yeniden temellendirilemedi"
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Altmodül yolu '$displaypath': '$sha1' içine yeniden temellendirildi"
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "'$sha1', '$displaypath' altmodül yolunda birleştirilemedi"
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Altmodül yolu '$displaypath': '$sha1' içinde birleştirildi"
-
-#: git-submodule.sh:595
-#, 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:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Altmodül yolu '$displaypath': '$command $sha1'"
-
-#: git-submodule.sh:627
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "'$displaypath' altmodül yoluna özyinelenemedi"
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Kendiliğinden zulalama uygulandı."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "$stash_sha1 depolanamıyor"
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"Kendiliğinden zulalama uygulaması çakışmalara neden oldu.\n"
-"Değişiklikleriniz zula içerisinde güvende.\n"
-"İstediğiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Yeniden temellendiriliyor ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Komutlar:\n"
-"p, pick <işleme> = işlemeyi kullan\n"
-"r, reword <işleme> = işlemeyi kullan; ancak işleme iletisini düzenle\n"
-"e, edit <işleme> = işlemeyi kullan; ancak değiştirme için dur\n"
-"s, squash <işleme> = işlemeyi kullan; ancak önceki işleme içine karıştır\n"
-"f, fixup <işleme> = \"squash\" gibi; ancak bu işlemenin günlük iletisini at\n"
-"x, exec <işleme> = komutu (satırın geri kalanı) kabuk kullanarak çalıştır\n"
-"d, drop <işleme> = işlemeyi kaldır\n"
-"l, label <etiket> = geçerli HEAD'i bir ad ile etiketle\n"
-"t, reset <etiket> = HEAD'i bir etikete sıfırla\n"
-"m, merge [-C <işleme> | -c <işleme>] <etiket> [# <tek-satır>]\n"
-". orijinal birleştirme işlemesi iletisini kullanarak bir\n"
-". birleştirme işlemesi oluştur (veya teksatır, eğer bir orijinal\n"
-". birleştirme işlemesi belirtilmemişse). İşleme iletisini yeniden\n"
-". yazmak için -c <işleme> kullanın.\n"
-"\n"
-"Bu satırlar yeniden sıralanabilirler, yukarıdan aşağıya çalıştırılırlar.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"İşlemeyi şimdi şu komutla değiştirebilirsiniz:\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Değişikliklerinizden memnunsanız şu komutla sürdürün:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: seçilebilecek bir işleme değil"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Geçersiz işleme adı: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Geçerli işlemenin yerine geçecek sha1 yazılamıyor"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Şuraya ileri sar: $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Şuraya ileri sarılamıyor: $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "HEAD şuraya taşınamıyor: $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Bir birleştirmeyi tıkıştırma reddediliyor: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "$sha1 birleştirmesi yeniden yapılırken hata"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "$sha1 seçilemedi"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "İşleme iletisi #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "İşleme iletisi #${n} atlanacak:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Bu $count işlemenin bir birleşimidir."
-msgstr[1] "Bu $count işlemenin bir birleşimidir."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "$fixup_msg yazılamıyor"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Bu 2 işlemenin bir birleşimidir."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "$sha1... $rest uygulanamadı"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"$sha1... $rest başarıyla seçildikten sonra işleme değiştirilemedi.\n"
-"Bu büyük olasılıkla boş bir işleme iletisinden veya pre-commit kancasının\n"
-"başarısız olmasından kaynaklıdır. Eğer pre-commit kancası başarısız olduysa\n"
-"işlemeyi düzenleyebilmeye başlamanız için bu sorunu çözmeniz gerekebilir."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Şurada duruldu: $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Öncesinde bir işleme olmadan '$squash_style' yapılamıyor"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Çalıştırılıyor: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Çalıştırma başarısız: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "ve indekse ve/veya çalışma ağacına değişiklikler yaptı"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Sorunu çözüp sürdürmek için şunu çalıştırın\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Çalıştırma başarılı: $rest\n"
-"ancak indekse ve/veya çalışma ağacına değişiklikler bıraktı.\n"
-"Değişikliklerinizi işleyin veya zulalayın, ardından şunu çalıştırın:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Bilinmeyen komut: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Lütfen bunu 'git rebase --edit-todo' kullanarak onarın."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "$head_name başarıyla yeniden temellendirildi ve güncellendi."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "CHERRY_PICK_HEAD kaldırılamadı"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Çalışma ağacınızda hazırlanmış değişiklikleriniz var.\n"
-"Eğer bu değişiklikleri bir önceki işlemeye eklenmesi\n"
-"gerekiyorsa şu komutu çalıştırın:\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Eğer yeni bir işleme içinse şunu çalıştırın:\n"
-"\n"
-"\tgit commit $gpg_sign_opt_quoted\n"
-"\n"
-"Her iki durumda da işinizi bitirdikten sonra şununla sürdürün:\n"
-"\n"
-"\tgit rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "İşlemeyi değiştirmek için yazar kimliğini bulmaya çalışırken hata"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Çalışma ağacınızda işlenmemiş değişiklikleriniz var. Lütfen önce onları\n"
-"işleyin ve ardından yeniden 'git rebase --continue' çalıştırın."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Hazırlanan değişiklikler işlenemedi."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Düzenleyici çalıştırılamadı"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "$switch_to çıkışı yapılamadı"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "HEAD yok mu?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Geçici $state_dir oluşturulamadı"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Etkileşimli olarak imlenemedi"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-"$shortrevisions ögesini $shortonto üzerine yeniden temelle ($todocount komut)"
-msgstr[1] ""
-"$shortrevisions ögesini $shortonto üzerine yeniden temelle ($todocount komut)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Boş işlemelerin yorum olarak varsayıldığını kenara yazın."
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Yeniden yazılan işlemeler ilklendirilemedi"
+msgstr "Yalın birleştirme işe yaramadı, otomatik birleştirme deneniyor."
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "kullanım: $dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:182
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "$cdup konumuna chdir yapılamıyor, çalışma ağacının en üst düzeyi"
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:191 git-sh-setup.sh:198
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "onulmaz: $program_name bir çalışma ağacı olmadan kullanılamaz"
+msgstr "onulmaz: $program_name bir çalışma ağacı olmadan kullanılamaz."
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:212
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Dallar yeniden yazılamıyor: Hazırlanmamış değişiklikleriniz var."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"Yeniden temellendirme ile çekilemiyor: Hazırlanmamış değişiklikleriniz var."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:215
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "$action yapılamıyor: Hazırlanmamış değişiklikleriniz var."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Yeniden temellendirme yapılamıyor: İndeksinizde işlenmemiş değişiklikleriniz "
-"var."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Yeniden temellendirme ile çekilemiyor: İndeksinizde işlenmemiş "
-"değişiklikleriniz var."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:226
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "$action yapılamıyor: İndeksinizde işlenmemiş değişiklikleriniz var."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:228
msgid "Additionally, your index contains uncommitted changes."
msgstr "Ek olarak, indeksinizde işlenmemiş değişiklikleriniz var."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:348
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Bu komutu çalışma ağacının en üst düzeyinden çalıştırmanız gerekiyor."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:353
msgid "Unable to determine absolute path of git directory"
msgstr "Git dizininin kesin yolu algılanamıyor"
@@ -25850,7 +26265,7 @@
msgid "failed to open hunk edit file for reading: %s"
msgstr "parça düzenleme dosyası okuma için açılamadı: %s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -25864,7 +26279,7 @@
"a - bu parçayı ve sonraki tüm parçaları hazırla\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -25878,7 +26293,7 @@
"a - bu parçayı ve sonraki tüm parçaları zulala\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini zulalama"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -25892,7 +26307,7 @@
"a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -25906,7 +26321,7 @@
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -25920,7 +26335,7 @@
"a - bu parçayı ve sonraki tüm parçaları at\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini atma"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -25934,7 +26349,7 @@
"a - bu parçayı ve sonraki tüm parçaları at\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini atma"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -25948,7 +26363,7 @@
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -25962,7 +26377,7 @@
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -25984,90 +26399,90 @@
"e - geçerli parçayı el ile düzenle\n"
"? - yardımı yazdır\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "Seçili parçalar indekse uygulanamıyor!\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "birleştirilmeyenler yok sayılıyor: %s\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Silme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "Ekleme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "Gidilecek başka parça yok\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Geçersiz sayı: '%s'\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Üzgünüm, yalnızca %d parça kullanılabilir.\n"
msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir.\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "Aranacak başka parça yok\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Hatalı oluşturulmuş arama düzenli ifadesi %s: %s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "Verilen dizgi ile hiçbir parça eşleşmiyor\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Öncesinde parça yok\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Sonrasında parça yok\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "Üzgünüm, bu parça bölünemiyor\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "%d parçaya bölündü.\n"
msgstr[1] "%d parçaya bölündü.\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "Üzgünüm, bu parça düzenlenemiyor\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -26085,56 +26500,56 @@
"add untracked - izlenmeyen dosyaların içeriğini hazırlanan değişiklik setine "
"ekle\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "-- eksik"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "bilinmeyen --patch kipi: %s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "geçersiz argüman %s, -- bekleniyor"
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "yerel dilim GMT'den bir dakikadan az bir aralıkla ayrımlı\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "yerel saat ofseti 24 saate eşit veya daha büyük\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "onulmaz: '%s' komutu %d çıkış koduyla sonlandı"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr "düzenleyici düzgünce çıkmadı, her şey iptal ediliyor"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' yazmakta olduğunuz e-postanın orta düzey bir sürümünü içeriyor.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' yazılan e-postayı içeriyor.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases diğer seçeneklerle uyumsuz\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26142,14 +26557,14 @@
msgstr ""
"onulmaz: 'sendmail' için yapılandırma seçenekleri bulundu\n"
"git-send-email, sendemail.* seçenekleri ile yapılandırılmıştır.\n"
-"'e'ye dikkat edin. sendemail.forbidSendmailVariables seçeneğini 'false'\n"
-"yaparak bu denetimi devre dışı bırakabilirsiniz.\n"
+"'e'ye dikkat edin. sendemail.forbidSendmailVariables seçeneğini\n"
+"'false' yaparak bu denetimi devre dışı bırakabilirsiniz.\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "'git format-patch' bir deponun dışından çalıştırılamıyor\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -26157,37 +26572,37 @@
"'batch-size' ve 'relogin' birlikte belirtilmeli (komut satırı veya "
"yapılandırma seçeneklerinden)\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Bilinmeyen --suppress-cc alanı: '%s'\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Bilinmeyen --confirm ayarı: '%s'\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "uyarı: tırnak içine alınmış sendmail arması desteklenmiyor: %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "uyarı: ':include:' desteklenmiyor: %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "uyarı: '/file' veya '|pipe' yeniden yönlendirmesi desteklenmiyor: %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "uyarı: sendmail satırı tanımlanamadı: %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -26202,12 +26617,12 @@
"\t* Bir dosya demek istiyorsanız \"./%s\" diyerek veya\n"
"\t* Bir erim demek istiyorsanız --format-patch seçeneğini vererek\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "%s opendir yapılamadı: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
@@ -26217,17 +26632,17 @@
"Hiçbir yama dosyası belirtilmedi!\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "%s içinde konu satırı yok mu?"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "%s yazma için açılamadı: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -26241,38 +26656,38 @@
"\n"
"Bir özet göndermek istemiyorsanız gövde kısmını temizleyin.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "%s açılamadı: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "%s.final açılamadı: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "Özet e-postası boş, atlanıyor\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "<%s> kullanmak istediğinizden emin misiniz [y/N]? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
"Aşağıdaki dosyalar 8 bit; ancak Content-Transfer-Encoding desteklemiyorlar.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Hangi 8 bit kodlamayı beyan etmeliyim [UTF-8]? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -26285,22 +26700,22 @@
"içinde '*** SUBJECT HERE ***' konu şablonu var. Yine de göndermek "
"istiyorsanız --force kullanın.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "E-postalar kime gönderilmeli (eğer gerekliyse)?"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "onulmaz: '%s' arması kendisine genişliyor\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"İlk e-posta için Message-ID, In-Reply-To olarak kullanılsın mı (eğer "
-"gerekliyse)?"
+"gerekliyse)? "
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "hata: şuradan geçerli bir adres çıkartılamadı: %s\n"
@@ -26308,16 +26723,16 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Bu adresle ne yapılsın? ([q] çık|[d] bırak|düz[e]nle): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA yolu \"%s\" mevcut değil"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -26343,131 +26758,131 @@
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Bu e-posta gönderilsin mi? ([y] evet|[n] hayır|düz[e]nle|[q] çık|[a] tümü): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "Bu e-postayı yanıt gerektirme seçeneğiyle gönder"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "Gerekli SMTP sunucusu düzgünce tanımlanmamış."
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Sunucu STARTTLS desteklemiyor! %s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS başarısız oldu! %s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"SMTP düzgünce başlatılamıyor. Yapılandırmayı denetleyin ve --smtp-debug "
"yapın."
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "%s gönderilemedi\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "%s gönderilir gibi yapıldı\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "%s gönderildi\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "Sınama tamam. Günlük çıktısı:\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "Tamam. Günlük çıktısı:\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Sonuç: "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Sonuç: Tamam\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "%s dosyası açılamıyor"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Cc: %s, '%s' satırından ekleniyor\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) To: %s, '%s' satırından ekleniyor\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Cc: %s, '%s' satırından ekleniyor\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Cc: %s, '%s' satırından ekleniyor\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) '%s' çalıştırılamadı"
-#: git-send-email.perl:1972
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) şuraya olan veri yolu kapatılamadı: '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "ileti 7 bit olarak gönderilemiyor"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "geçersiz aktarım kodlaması"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2100
#, perl-format
msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
+"fatal: %s: rejected by %s hook\n"
"%s\n"
"warning: no patches were sent\n"
msgstr ""
-"onulmaz: %s: sendemail-validate kancası tarafından reddedildi\n"
+"onulmaz: %s: %s kancası tarafından reddedildi\n"
"%s\n"
"uyarı: hiçbir yama gönderilmedi\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "%s açılamıyor: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2113
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -26476,28 +26891,13 @@
"onulmaz: %s:%d, 998 karakterden uzun\n"
"uyarı: hiçbir yama gönderilmedi\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2131
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "%s, yedek sonek '%s' ile atlanıyor.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2135
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "%s ögesini gerçekten göndermek istiyor musunuz? [y|N]: "
-
-#~ msgid "unable to write stateless separator packet"
-#~ msgstr "durumsuz ayırıcı paketi yazılamıyor"
-
-#~ msgid "git merge --abort"
-#~ msgstr "git merge --abort"
-
-#~ msgid "git merge --continue"
-#~ msgstr "git merge --continue"
-
-#~ msgid "git stash clear"
-#~ msgstr "git stash clear"
-
-#~ msgid "remote server sent stateless separator"
-#~ msgstr "uzak sunucu durumsuz ayırıcı gönderdi"
diff --git a/po/vi.po b/po/vi.po
index 40b9996..69c3b93 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,15 +2,15 @@
# Bản dịch tiếng Việt dành cho GIT-CORE.
# This file is distributed under the same license as the git-core package.
# Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2022.
# Đoàn Trần Công Danh <congdanhqx@gmail.com>, 2020.
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.33.0-rc2\n"
+"Project-Id-Version: git v2.36.0 round 2\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-14 14:53+0700\n"
+"POT-Creation-Date: 2022-04-13 14:52+0800\n"
+"PO-Revision-Date: 2022-04-14 15:34+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -19,238 +19,237 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
-#: add-interactive.c:376
+#: add-interactive.c:382
#, c-format
msgid "Huh (%s)?"
msgstr "Hả (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
+#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
+#: builtin/rebase.c:1671
msgid "could not read index"
msgstr "không thể đọc bảng mục lục"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:590 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "nhị phân"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:648 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "không có gì"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:649 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "không thay đổi"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:686 git-add--interactive.perl:641
msgid "Update"
msgstr "Cập nhật"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:703 add-interactive.c:891
#, c-format
msgid "could not stage '%s'"
msgstr "không thể đưa “%s” lên bệ phóng"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
msgid "could not write index"
msgstr "không thể ghi bảng mục lục"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:712 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "đã cập nhật %d đường dẫn\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:730 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "chú ý: %s giờ đã bỏ theo dõi.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:765 git-add--interactive.perl:653
msgid "Revert"
msgstr "Hoàn nguyên"
-#: add-interactive.c:775
+#: add-interactive.c:781
msgid "Could not parse HEAD^{tree}"
msgstr "Không thể phân tích cú pháp HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:819 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "đã hoàn nguyên %d đường dẫn\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:870 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Không có tập tin nào chưa được theo dõi.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:874 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Thêm các cái chưa được theo dõi"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:901 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "đã thêm %d đường dẫn\n"
-#: add-interactive.c:925
+#: add-interactive.c:931
#, c-format
msgid "ignoring unmerged: %s"
msgstr "bỏ qua những thứ chưa hòa trộn: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "Không có thay đổi nào.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:949 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Cập nhật miếng vá"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:988 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Xem xét lại diff"
-#: add-interactive.c:1010
+#: add-interactive.c:1016
msgid "show paths with changes"
msgstr "hiển thị đường dẫn với các thay đổi"
-#: add-interactive.c:1012
+#: add-interactive.c:1018
msgid "add working tree state to the staged set of changes"
msgstr ""
"thêm trạng thái cây làm việc vào tập hợp các thay đổi đã được đưa lên bệ "
"phóng"
-#: add-interactive.c:1014
+#: add-interactive.c:1020
msgid "revert staged set of changes back to the HEAD version"
msgstr ""
"hoàn nguyên lại tập hợp các thay đổi đã được đưa lên bệ phóng trở lại phiên "
"bản HEAD"
-#: add-interactive.c:1016
+#: add-interactive.c:1022
msgid "pick hunks and update selectively"
msgstr "chọn các “khúc” và cập nhật có tuyển chọn"
-#: add-interactive.c:1018
+#: add-interactive.c:1024
msgid "view diff between HEAD and index"
msgstr "xem khác biệt giữa HEAD và mục lục"
-#: add-interactive.c:1020
+#: add-interactive.c:1026
msgid "add contents of untracked files to the staged set of changes"
msgstr ""
"thêm nội dung của các tập tin chưa được theo dõi vào tập hợp các thay đổi đã "
"được đưa lên bệ phóng"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1034 add-interactive.c:1083
msgid "Prompt help:"
msgstr "Trợ giúp về nhắc:"
-#: add-interactive.c:1030
+#: add-interactive.c:1036
msgid "select a single item"
msgstr "chọn một mục đơn"
-#: add-interactive.c:1032
+#: add-interactive.c:1038
msgid "select a range of items"
msgstr "chọn một vùng các mục"
-#: add-interactive.c:1034
+#: add-interactive.c:1040
msgid "select multiple ranges"
msgstr "chọn nhiều vùng"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1042 add-interactive.c:1087
msgid "select item based on unique prefix"
msgstr "chọn mục dựa trên tiền tố duy nhất"
-#: add-interactive.c:1038
+#: add-interactive.c:1044
msgid "unselect specified items"
msgstr "bỏ chọn các mục đã cho"
-#: add-interactive.c:1040
+#: add-interactive.c:1046
msgid "choose all items"
msgstr "chọn tất cả các mục"
-#: add-interactive.c:1042
+#: add-interactive.c:1048
msgid "(empty) finish selecting"
msgstr "(để trống) hoàn tất chọn lựa"
-#: add-interactive.c:1079
+#: add-interactive.c:1085
msgid "select a numbered item"
msgstr "tùy chọn mục bằng số"
-#: add-interactive.c:1083
+#: add-interactive.c:1089
msgid "(empty) select nothing"
msgstr "(để trống) không chọn gì"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** Lệnh ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "Giờ thì sao"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "staged"
msgstr "đã đưa lên bệ phóng"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "unstaged"
msgstr "chưa đưa lên bệ phóng"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
+#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
+#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
+#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
#: git-add--interactive.perl:213
msgid "path"
msgstr "đường-dẫn"
-#: add-interactive.c:1151
+#: add-interactive.c:1157
msgid "could not refresh index"
msgstr "không thể đọc lại bảng mục lục"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Tạm biệt.\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Thay đổi chế độ bệ phóng [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Xóa khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Thêm vào bệ phóng [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Đưa lên bệ phóng khúc này [y,n,q,a,d%s,?]? "
@@ -278,22 +277,22 @@
"d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong tập "
"tin\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Thay đổi chế độ tạm cất đi [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Xóa tạm cất [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Thêm vào tạm cất [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Tạm cất khúc này [y,n,q,a,d%s,?]? "
@@ -320,22 +319,22 @@
"a - tạm cất khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại trong tập tin\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Thay đổi chế độ bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Xóa bỏ việc bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Thêm vào việc bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Bỏ ra khỏi bệ phóng khúc này [y,n,q,a,d%s,?]? "
@@ -364,22 +363,22 @@
"d - đừng đưa ra khỏi bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong "
"tập tin\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Áp dụng thay đổi chế độ cho mục lục [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Áp dụng việc xóa vào mục lục [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Áp dụng các thêm vào mục lục [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Áo dụng khúc này vào mục lục [y,n,q,a,d%s,?]? "
@@ -406,26 +405,26 @@
"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ các thay đổi chế độ từ cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ việc xóa khỏi cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Thêm các loại bỏ khỏi cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ khúc này khỏi cây làm việc [y,n,q,a,d%s,?]? "
@@ -452,22 +451,22 @@
"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ thay đổi chế độ từ mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ việc xóa khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Thêm các loại bỏ từ mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ khúc này khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? "
@@ -486,22 +485,22 @@
"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng thay đổi chế độ cho mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng việc xóa vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng thêm vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng khúc này vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
@@ -544,24 +543,24 @@
msgid "could not parse colored hunk header '%.*s'"
msgstr "không thể phân tích cú pháp phần đầu khúc đã tô màu “%.*s”"
-#: add-patch.c:420
+#: add-patch.c:431
msgid "could not parse diff"
msgstr "không thể phân tích cú pháp khác biệt"
-#: add-patch.c:439
+#: add-patch.c:450
msgid "could not parse colored diff"
msgstr "không thể phân tích khác biệt được tô màu"
-#: add-patch.c:453
+#: add-patch.c:464
#, c-format
msgid "failed to run '%s'"
msgstr "gặp lỗi khi chạy “%s”"
-#: add-patch.c:612
+#: add-patch.c:618
msgid "mismatched output from interactive.diffFilter"
msgstr "đầu ra không khớp từ interactive.diffFilter"
-#: add-patch.c:613
+#: add-patch.c:619
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -569,7 +568,7 @@
"Bộ lọc của bạn phải duy trì một quan hệ một-đến-một\n"
"giữa các dòng đầu vào và đầu ra của nó."
-#: add-patch.c:791
+#: add-patch.c:797
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -578,7 +577,7 @@
"cần dòng ngữ cảnh #%d trong\n"
"%.*s"
-#: add-patch.c:806
+#: add-patch.c:812
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -591,11 +590,11 @@
"\tkhông được kết thúc bằng:\n"
"%.*s"
-#: add-patch.c:1082 git-add--interactive.perl:1115
+#: add-patch.c:1088 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Chế độ sửa khúc bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n"
-#: add-patch.c:1086
+#: add-patch.c:1092
#, c-format
msgid ""
"---\n"
@@ -604,12 +603,12 @@
"Lines starting with %c will be removed.\n"
msgstr ""
"---\n"
-"Để gỡ bỏ dòng “%c”, sửa chúng thành những dòng ' ' (ngữ cảnh).\n"
+"Để gỡ bỏ dòng “%c”, sửa chúng thành những dòng “ ” (ngữ cảnh).\n"
"Để gõ bỏ dòng “%c”, xóa chúng đi.\n"
"Những dòng bắt đầu bằng %c sẽ bị loại bỏ.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1100 git-add--interactive.perl:1129
+#: add-patch.c:1106 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -619,11 +618,11 @@
"để sửa lần nữa. Nếu mọi dòng của khúc bị xóa bỏ, thế thì những\n"
"sửa dổi sẽ bị loại bỏ, và khúc vẫn giữ nguyên.\n"
-#: add-patch.c:1133
+#: add-patch.c:1139
msgid "could not parse hunk header"
msgstr "không thể phân tích cú pháp phần đầu khúc"
-#: add-patch.c:1178
+#: add-patch.c:1184
msgid "'git apply --cached' failed"
msgstr "“git apply --cached” gặp lỗi"
@@ -639,26 +638,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1253 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại "
"bỏ!) [y/n]? "
-#: add-patch.c:1290
+#: add-patch.c:1296
msgid "The selected hunks do not apply to the index!"
msgstr "Các khúc đã chọn không được áp dụng vào bảng mục lục!"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "Vẫn áp dụng chúng cho cây làm việc? "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1304 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Đã không áp dụng gì cả.\n"
-#: add-patch.c:1355
+#: add-patch.c:1361
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -680,72 +679,72 @@
"e - sửa bằng tay khúc hiện hành\n"
"? - hiển thị trợ giúp\n"
-#: add-patch.c:1517 add-patch.c:1527
+#: add-patch.c:1523 add-patch.c:1533
msgid "No previous hunk"
msgstr "Không có khúc kế trước"
-#: add-patch.c:1522 add-patch.c:1532
+#: add-patch.c:1528 add-patch.c:1538
msgid "No next hunk"
msgstr "Không có khúc kế tiếp"
-#: add-patch.c:1538
+#: add-patch.c:1544
msgid "No other hunks to goto"
msgstr "Không còn khúc nào để mà nhảy đến"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1555 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "nhảy đến khúc nào (<ret> để xem thêm)? "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1556 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "nhảy đến khúc nào? "
-#: add-patch.c:1561
+#: add-patch.c:1567
#, c-format
msgid "Invalid number: '%s'"
msgstr "Số không hợp lệ: “%s”"
-#: add-patch.c:1566
+#: add-patch.c:1572
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc."
-#: add-patch.c:1575
+#: add-patch.c:1581
msgid "No other hunks to search"
msgstr "Không còn khúc nào để mà tìm kiếm"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1587 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "tìm kiếm cho biểu thức chính quy? "
-#: add-patch.c:1596
+#: add-patch.c:1602
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s"
-#: add-patch.c:1613
+#: add-patch.c:1619
msgid "No hunk matches the given pattern"
msgstr "Không thấy khúc nào khớp mẫu đã cho"
-#: add-patch.c:1620
+#: add-patch.c:1626
msgid "Sorry, cannot split this hunk"
msgstr "Rất tiếc, không thể chia nhỏ khúc này"
-#: add-patch.c:1624
+#: add-patch.c:1630
#, c-format
msgid "Split into %d hunks."
msgstr "Chi nhỏ thành %d khúc."
-#: add-patch.c:1628
+#: add-patch.c:1634
msgid "Sorry, cannot edit this hunk"
msgstr "Rất tiếc, không thể sửa khúc này"
-#: add-patch.c:1680
+#: add-patch.c:1686
msgid "'git apply' failed"
msgstr "“git apply” gặp lỗi"
-#: advice.c:145
+#: advice.c:81
#, c-format
msgid ""
"\n"
@@ -754,45 +753,47 @@
"\n"
"Tắt lời nhắn này bằng \"git config advice.%s false\""
-#: advice.c:161
+#: advice.c:97
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sgợi ý: %.*s%s\n"
-#: advice.c:252
+#: advice.c:181
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Cherry-picking là không thể thực hiện bởi vì bạn có những tập tin chưa được "
"hòa trộn."
-#: advice.c:254
+#: advice.c:183
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-"Commit là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+"Không thể thực hiện chuyển giao được bởi vì bạn có những tập tin chưa được "
+"hòa trộn."
-#: advice.c:256
+#: advice.c:185
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-"Merge là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+"Không thể thực hiện hòa trộn bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:258
+#: advice.c:187
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-"Pull là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+"Không thể thực hiện kéo về bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:260
+#: advice.c:189
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-"Revert là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+"Không thể thực hiện hoàn nguyên bởi vì bạn có những tập tin chưa được hòa "
+"trộn."
-#: advice.c:262
+#: advice.c:191
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
"Việc này không thể thực hiện với %s bởi vì bạn có những tập tin chưa được "
"hòa trộn."
-#: advice.c:270
+#: advice.c:199
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."
@@ -800,41 +801,49 @@
"Sửa chúng trong cây làm việc, và sau đó dùng lệnh “git add/rm <tập-tin>”\n"
"dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao."
-#: advice.c:278
+#: advice.c:207
msgid "Exiting because of an unresolved conflict."
msgstr "Thoát ra bởi vì xung đột không thể giải quyết."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:212 builtin/merge.c:1388
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)."
-#: advice.c:285
+#: advice.c:214
msgid "Please, commit your changes before merging."
msgstr "Vui lòng chuyển giao các thay đổi trước khi hòa trộn."
-#: advice.c:286
+#: advice.c:215
msgid "Exiting because of unfinished merge."
msgstr "Thoát ra bởi vì việc hòa trộn không hoàn tất."
-#: advice.c:296
+#: advice.c:220
+msgid "Not possible to fast-forward, aborting."
+msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỏ qua."
+
+#: advice.c:230
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"Các đặc tả đường dẫn sau đây không khớp với bất kỳ đường dẫn thích hợp nào,\n"
-"nhưng chúng khớp với các mục mục lục bên ngoài \"sparse checkout\" hiện "
-"tại:\n"
+"Các đường dẫn và/hoặc đặc tả đường dẫn sau đây khớp với các đường dẫn tồn "
+"tại\n"
+"bên ngoài định nghĩa “sparse-checkout” của bạn, vì vậy sẽ không\n"
+"cập nhật trong chỉ mục:\n"
-#: advice.c:303
+#: advice.c:237
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Vô hiệu hóa hoặc sửa đổi các quy tắc sparsity nếu bạn có ý định cập nhật các "
-"mục như vậy."
+"Nếu bạn có ý định cập nhật các mục như vậy, hãy thử một trong các mục sau:\n"
+"* Sử dụng tùy chọn --sparse.\n"
+"* Vô hiệu hóa hoặc sửa đổi các quy tắc thưa thớt."
-#: advice.c:310
+#: advice.c:245
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -894,71 +903,86 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng “%s”"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject và --3way không thể dùng cùng nhau."
+#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
+#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
+#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
+#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
+#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
+#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
+#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
+#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
+#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
+#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
+#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
+#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
+#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
+#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
+#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
+#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
+#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
+#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
+#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
+#: builtin/worktree.c:779
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "tùy chọn '%s' và '%s' không thể dùng cùng nhau"
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way ở ngoài một kho chứa"
+#: apply.c:141 apply.c:152 apply.c:155
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' ở ngoài một kho chứa"
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index ở ngoài một kho chứa"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached ở ngoài một kho chứa"
-
-#: apply.c:800
+#: apply.c:807
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
"Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) "
"%s"
-#: apply.c:809
+#: apply.c:816
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "thi hành biểu thức chính quy trả về %d cho đầu vào: %s"
-#: apply.c:883
+#: apply.c:890
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d"
-#: apply.c:921
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d"
-#: apply.c:927
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d"
-#: apply.c:928
+#: apply.c:935
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d"
-#: apply.c:933
+#: apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff sai - cần “/dev/null” trên dòng %d"
-#: apply.c:962
+#: apply.c:969
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "chế độ không hợp lệ trên dòng %d: %s"
-#: apply.c:1281
+#: apply.c:1288
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "phần đầu mâu thuẫn dòng %d và %d"
-#: apply.c:1371
+#: apply.c:1378
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -970,91 +994,91 @@
"phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong "
"thành phần dẫn đầu tên của đường dẫn (dòng %d)"
-#: apply.c:1384
+#: apply.c:1391
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "phần đầu diff cho git thiếu thông tin tên tập tin (dòng %d)"
-#: apply.c:1480
+#: apply.c:1487
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "chi tiết: dòng không cần: %.*s"
-#: apply.c:1549
+#: apply.c:1556
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s"
-#: apply.c:1752
+#: apply.c:1759
msgid "new file depends on old contents"
msgstr "tập tin mới phụ thuộc vào nội dung cũ"
-#: apply.c:1754
+#: apply.c:1761
msgid "deleted file still has contents"
msgstr "tập tin đã xóa vẫn còn nội dung"
-#: apply.c:1788
+#: apply.c:1795
#, c-format
msgid "corrupt patch at line %d"
msgstr "miếng vá hỏng tại dòng %d"
-#: apply.c:1825
+#: apply.c:1832
#, c-format
msgid "new file %s depends on old contents"
msgstr "tập tin mới %s phụ thuộc vào nội dung cũ"
-#: apply.c:1827
+#: apply.c:1834
#, c-format
msgid "deleted file %s still has contents"
msgstr "tập tin đã xóa %s vẫn còn nội dung"
-#: apply.c:1830
+#: apply.c:1837
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa"
-#: apply.c:1977
+#: apply.c:1985
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s"
-#: apply.c:2014
+#: apply.c:2022
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d"
-#: apply.c:2176
+#: apply.c:2184
#, c-format
msgid "patch with only garbage at line %d"
msgstr "vá chỉ với “rác” tại dòng %d"
-#: apply.c:2262
+#: apply.c:2270
#, c-format
msgid "unable to read symlink %s"
msgstr "không thể đọc liên kết mềm %s"
-#: apply.c:2266
+#: apply.c:2274
#, c-format
msgid "unable to open or read %s"
msgstr "không thể mở hay đọc %s"
-#: apply.c:2935
+#: apply.c:2943
#, c-format
msgid "invalid start of line: '%c'"
msgstr "sai khởi đầu dòng: “%c”"
-#: apply.c:3056
+#: apply.c:3064
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)."
-#: apply.c:3068
+#: apply.c:3076
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Ngữ cảnh bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
-#: apply.c:3074
+#: apply.c:3082
#, c-format
msgid ""
"while searching for:\n"
@@ -1063,491 +1087,491 @@
"trong khi đang tìm kiếm cho:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3104
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s”"
-#: apply.c:3104
+#: apply.c:3112
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"không thể reverse-apply một miếng vá nhị phân mà không đảo ngược khúc thành "
"“%s”"
-#: apply.c:3151
+#: apply.c:3159
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"không thể áp dụng miếng vá nhị phân thành “%s” mà không có dòng chỉ mục đầy "
"đủ"
-#: apply.c:3162
+#: apply.c:3170
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"miếng vá áp dụng cho “%s” (%s), cái mà không khớp với các nội dung hiện tại."
-#: apply.c:3170
+#: apply.c:3178
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "miếng vá áp dụng cho một “%s” trống rỗng nhưng nó lại không trống"
-#: apply.c:3188
+#: apply.c:3196
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "không thể đọc postimage %s cần thiết cho “%s”"
-#: apply.c:3201
+#: apply.c:3209
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s”"
-#: apply.c:3208
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"vá nhị phân cho “%s” tạo ra kết quả không chính xác (mong chờ %s, lại nhận "
"%s)"
-#: apply.c:3229
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "gặp lỗi khi vá: %s:%ld"
-#: apply.c:3352
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr "không thể lấy ra %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
+#: setup.c:310
#, c-format
msgid "failed to read %s"
msgstr "gặp lỗi khi đọc %s"
-#: apply.c:3412
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "đọc từ “%s” vượt ra ngoài liên kết mềm"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3449 apply.c:3721
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "đường dẫn %s đã bị xóa hoặc đổi tên"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3559 apply.c:3736
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: không tồn tại trong bảng mục lục"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3568 apply.c:3744 apply.c:3960
#, c-format
msgid "%s: does not match index"
msgstr "%s: không khớp trong mục lục"
-#: apply.c:3571
+#: apply.c:3605
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "kho thiếu đối tượng blob cần thiết để thực hiện hòa trộn “3-way”."
-#: apply.c:3574
+#: apply.c:3608
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Đang thực hiện hòa trộn “3-đường”…\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3624 apply.c:3628
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "không thể đọc nội dung hiện hành của “%s”"
-#: apply.c:3606
+#: apply.c:3640
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Gặp lỗi khi thực hiện hòa trộn kiểu “three-way”…\n"
-#: apply.c:3620
+#: apply.c:3654
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Đã áp dụng miếng vá %s với các xung đột.\n"
-#: apply.c:3625
+#: apply.c:3659
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ.\n"
-#: apply.c:3642
+#: apply.c:3676
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Đang trở lại ứng dụng chi phối…\n"
-#: apply.c:3654
+#: apply.c:3688
msgid "removal patch leaves file contents"
msgstr "loại bỏ miếng vá để lại nội dung tập tin"
-#: apply.c:3727
+#: apply.c:3761
#, c-format
msgid "%s: wrong type"
msgstr "%s: sai kiểu"
-#: apply.c:3729
+#: apply.c:3763
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s có kiểu %o, cần %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
+#: read-cache.c:1399
#, c-format
msgid "invalid path '%s'"
msgstr "đường dẫn không hợp lệ “%s”"
-#: apply.c:3952
+#: apply.c:3958
#, c-format
msgid "%s: already exists in index"
msgstr "%s: đã có từ trước trong bảng mục lục"
-#: apply.c:3956
+#: apply.c:3962
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: đã sẵn có trong thư mục đang làm việc"
-#: apply.c:3976
+#: apply.c:3982
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)"
-#: apply.c:3981
+#: apply.c:3987
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s"
-#: apply.c:4001
+#: apply.c:4007
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "tập tin chịu tác động “%s” vượt ra ngoài liên kết mềm"
-#: apply.c:4005
+#: apply.c:4011
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: miếng vá không được áp dụng"
-#: apply.c:4020
+#: apply.c:4026
#, c-format
msgid "Checking patch %s..."
msgstr "Đang kiểm tra miếng vá %s…"
-#: apply.c:4112
+#: apply.c:4118
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "thông tin sha1 thiếu hoặc không dùng được cho mô-đun %s"
-#: apply.c:4119
+#: apply.c:4125
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "thay đổi chế độ cho %s, cái mà không phải là HEAD hiện tại"
-#: apply.c:4122
+#: apply.c:4128
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "thông tin sha1 còn thiếu hay không dùng được(%s)."
-#: apply.c:4131
+#: apply.c:4137
#, c-format
msgid "could not add %s to temporary index"
msgstr "không thể thêm %s vào chỉ mục tạm thời"
-#: apply.c:4141
+#: apply.c:4147
#, c-format
msgid "could not write temporary index to %s"
msgstr "không thể ghi mục lục tạm vào %s"
-#: apply.c:4279
+#: apply.c:4285
#, c-format
msgid "unable to remove %s from index"
msgstr "không thể gỡ bỏ %s từ mục lục"
-#: apply.c:4313
+#: apply.c:4319
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "miếng vá sai hỏng cho mô-đun-con %s"
-#: apply.c:4319
+#: apply.c:4325
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "không thể lấy thống kê về tập tin %s mới hơn đã được tạo"
-#: apply.c:4327
+#: apply.c:4333
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "không thể tạo “kho lưu đằng sau” cho tập tin được tạo mới hơn %s"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4339 apply.c:4484
#, c-format
msgid "unable to add cache entry for %s"
msgstr "không thể thêm mục nhớ đệm cho %s"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "gặp lỗi khi ghi vào “%s”"
-#: apply.c:4380
+#: apply.c:4386
#, c-format
msgid "closing file '%s'"
msgstr "đang đóng tập tin “%s”"
-#: apply.c:4450
+#: apply.c:4456
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "không thể ghi vào tập tin “%s” chế độ %o"
-#: apply.c:4548
+#: apply.c:4554
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ."
-#: apply.c:4556
+#: apply.c:4562
msgid "internal error"
msgstr "lỗi nội bộ"
-#: apply.c:4559
+#: apply.c:4565
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…"
-#: apply.c:4570
+#: apply.c:4576
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4584
#, c-format
msgid "cannot open %s"
msgstr "không mở được “%s”"
-#: apply.c:4592
+#: apply.c:4598
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Khối nhớ #%d được áp dụng gọn gàng."
-#: apply.c:4596
+#: apply.c:4602
#, c-format
msgid "Rejected hunk #%d."
msgstr "Đoạn dữ liệu #%d bị từ chối."
-#: apply.c:4725
+#: apply.c:4731
#, c-format
msgid "Skipped patch '%s'."
msgstr "Bỏ qua đường dẫn “%s”."
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "không thừa nhận đầu vào"
+#: apply.c:4740
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr ""
+"Không có miếng vá hợp lệ nào trong đầu vào (cho phép với \"--allow-empty\")"
-#: apply.c:4753
+#: apply.c:4761
msgid "unable to read index file"
msgstr "không thể đọc tập tin lưu bảng mục lục"
-#: apply.c:4910
+#: apply.c:4918
#, c-format
msgid "can't open patch '%s': %s"
msgstr "không thể mở miếng vá “%s”: %s"
-#: apply.c:4937
+#: apply.c:4945
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "đã chấm dứt %d lỗi khoảng trắng"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4951 apply.c:4966
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d dòng thêm khoảng trắng lỗi."
-#: apply.c:4951
+#: apply.c:4959
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d dòng được áp dụng sau khi sửa các lỗi khoảng trắng."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Không thể ghi tập tin lưu bảng mục lục mới"
-#: apply.c:4995
+#: apply.c:5003
msgid "don't apply changes matching the given path"
msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho"
-#: apply.c:4998
+#: apply.c:5006
msgid "apply changes matching the given path"
msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5008 builtin/am.c:2379
msgid "num"
msgstr "số"
-#: apply.c:5001
+#: apply.c:5009
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển"
-#: apply.c:5004
+#: apply.c:5012
msgid "ignore additions made by the patch"
msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá"
-#: apply.c:5006
+#: apply.c:5014
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra"
-#: apply.c:5010
+#: apply.c:5018
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân"
-#: apply.c:5012
+#: apply.c:5020
msgid "instead of applying the patch, output a summary for the input"
msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào"
-#: apply.c:5014
+#: apply.c:5022
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không"
-#: apply.c:5016
+#: apply.c:5024
msgid "make sure the patch is applicable to the current index"
msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành"
-#: apply.c:5018
+#: apply.c:5026
msgid "mark new files with `git add --intent-to-add`"
msgstr "đánh dấu các tập tin mới với “git add --intent-to-add”"
-#: apply.c:5020
+#: apply.c:5028
msgid "apply a patch without touching the working tree"
msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc"
-#: apply.c:5022
+#: apply.c:5030
msgid "accept a patch that touches outside the working area"
msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc"
-#: apply.c:5025
+#: apply.c:5033
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)"
-#: apply.c:5027
+#: apply.c:5035
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"thử hòa trộn kiểu three-way, quay lại dán bình thường nếu không thể thực "
"hiện được"
-#: apply.c:5029
+#: apply.c:5037
msgid "build a temporary index based on embedded index information"
msgstr ""
"xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5040 builtin/checkout-index.c:230
msgid "paths are separated with NUL character"
msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL"
-#: apply.c:5034
+#: apply.c:5042
msgid "ensure at least <n> lines of context match"
msgstr "đảm bảo rằng có ít nhất <n> dòng ngữ cảnh khớp"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
+#: builtin/rebase.c:1079
msgid "action"
msgstr "hành động"
-#: apply.c:5036
+#: apply.c:5044
msgid "detect new or modified lines that have whitespace errors"
msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5047 apply.c:5050
msgid "ignore changes in whitespace when finding context"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi tìm ngữ cảnh"
-#: apply.c:5045
+#: apply.c:5053
msgid "apply the patch in reverse"
msgstr "áp dụng miếng vá theo chiều ngược"
-#: apply.c:5047
+#: apply.c:5055
msgid "don't expect at least one line of context"
msgstr "đừng hy vọng có ít nhất một dòng ngữ cảnh"
-#: apply.c:5049
+#: apply.c:5057
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng"
-#: apply.c:5051
+#: apply.c:5059
msgid "allow overlapping hunks"
msgstr "cho phép chồng khối nhớ"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "chi tiết"
-
-#: apply.c:5054
+#: apply.c:5062
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin"
-#: apply.c:5057
+#: apply.c:5065
msgid "do not trust the line counts in the hunk headers"
msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5067 builtin/am.c:2367
msgid "root"
msgstr "gốc"
-#: apply.c:5060
+#: apply.c:5068
msgid "prepend <root> to all filenames"
msgstr "treo thêm <root> vào tất cả các tên tập tin"
-#: archive-tar.c:125 archive-zip.c:345
+#: apply.c:5071
+msgid "don't return error for empty patches"
+msgstr "đừng trả về lỗi khi các miếng vá trống rỗng"
+
+#: archive-tar.c:125 archive-zip.c:346
#, c-format
msgid "cannot stream blob %s"
msgstr "không thể stream blob “%s”"
-#: archive-tar.c:265 archive-zip.c:358
+#: archive-tar.c:265 archive-zip.c:359
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "chế độ tập tin lục không được hỗ trợ: 0%o (SHA1: %s)"
+msgstr "chế độ tập tin không được hỗ trợ: 0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "không thể bắt đầu bộ lọc “%s”"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "không thể chuyển hướng mô tả"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "bộ lọc “%s” đã báo cáo lỗi"
-#: archive-zip.c:318
+#: archive-zip.c:319
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "đường dẫn không hợp lệ UTF-8: %s"
-#: archive-zip.c:322
+#: archive-zip.c:323
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "đường dẫn quá dài (%d ký tự, SHA1: %s): %s"
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
#, c-format
msgid "deflate error (%d)"
msgstr "lỗi giải nén (%d)"
-#: archive-zip.c:603
+#: archive-zip.c:604
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "dấu vết thời gian là quá lớn cho hệ thống này: %<PRIuMAX>"
@@ -1556,10 +1580,6 @@
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<các tùy chọn>] <tree-ish> [</đường/dẫn>…]"
-#: 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>...]"
@@ -1571,142 +1591,138 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:579
#, c-format
-msgid "cannot read %s"
-msgstr "không thể đọc %s"
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "không thể đọc “%s”"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "không có tham chiếu nào như thế: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "không phải là tên đối tượng hợp lệ: “%s”"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "không phải là đối tượng cây: “%s”"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "thư mục làm việc hiện hành chưa được theo dõi"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Không tìm thấy tập tin: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "Không phải một tập tin thường: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "định_dạng"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "định dạng lưu trữ"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1809
msgid "prefix"
msgstr "tiền_tố"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
+#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
msgid "file"
msgstr "tập_tin"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "thêm các tập tin không được theo dõi vào kho lưu"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "ghi kho lưu vào tập tin này"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "đọc .gitattributes trong thư mục làm việc"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi tiêu chuẩn)"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "đặt mức nén"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "liệt kê các kiểu nén được hỗ trợ"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
+#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
msgid "repo"
msgstr "kho"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
msgid "command"
msgstr "lệnh"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "đường dẫn đến lệnh git-upload-archive trên máy chủ"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Gặp tùy chọn không cần --remote"
-#: archive.c:581
-msgid "Option --exec can only be used together with --remote"
-msgstr "Tùy chọn --exec chỉ có thể được dùng cùng với --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
+#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
+#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
+#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
+#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
+#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "tùy chọn “%s” yêu cầu “%s”"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Gặp tùy chọn không cần --output"
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Các tùy chọn --add-file và --remote không thể sử dụng cùng với nhau"
-
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Không hiểu định dạng “%s”"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d"
@@ -1729,22 +1745,22 @@
"Các mẫu dạng phủ định bị cấm dùng cho các thuộc tính của git\n"
"Dùng “\\!” cho các chuỗi văn bản có dấu chấm than dẫn đầu."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Nội dung được trích dẫn sai trong tập tin “%s”: %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Chúng tôi không bisect thêm nữa!\n"
-#: bisect.c:766
+#: bisect.c:765
#, c-format
msgid "Not a valid commit name %s"
msgstr "Không phải tên đối tượng commit %s hợp lệ"
-#: bisect.c:791
+#: bisect.c:790
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1753,7 +1769,7 @@
"Hòa trộn trên %s là sai.\n"
"Điều đó có nghĩa là lỗi đã được sửa chữa giữa %s và [%s].\n"
-#: bisect.c:796
+#: bisect.c:795
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1762,7 +1778,7 @@
"Hòa trộn trên %s là mới.\n"
"Gần như chắc chắn là có thay đổi giữa %s và [%s].\n"
-#: bisect.c:801
+#: bisect.c:800
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1771,7 +1787,7 @@
"Hòa trộn trên %s là %s.\n"
"Điều đó có nghĩa là lần chuyển giao “%s” đầu tiên là giữa %s và [%s].\n"
-#: bisect.c:809
+#: bisect.c:808
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1782,7 +1798,7 @@
"git bisect không thể làm việc đúng đắn trong trường hợp này.\n"
"Liệu có phải bạn nhầm lẫn các điểm %s và %s không?\n"
-#: bisect.c:822
+#: bisect.c:821
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1794,36 +1810,36 @@
"%s.\n"
"Chúng tôi vẫn cứ tiếp tục."
-#: bisect.c:861
+#: bisect.c:860
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisecting: nền hòa trộn cần phải được kiểm tra\n"
-#: bisect.c:911
+#: bisect.c:910
#, c-format
msgid "a %s revision is needed"
msgstr "cần một điểm xét duyệt %s"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:940
#, c-format
msgid "could not create file '%s'"
msgstr "không thể tạo tập tin “%s”"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:986 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "không thể đọc tập tin “%s”"
-#: bisect.c:1027
+#: bisect.c:1026
msgid "reading bisect refs failed"
msgstr "việc đọc tham chiếu bisect gặp lỗi"
-#: bisect.c:1057
+#: bisect.c:1056
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s là cả %s và %s\n"
-#: bisect.c:1066
+#: bisect.c:1065
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1832,7 +1848,7 @@
"Không tìm thấy lần chuyển giao kiểm tra được nào.\n"
"Có lẽ bạn bắt đầu với các tham số đường dẫn sai?\n"
-#: bisect.c:1095
+#: bisect.c:1094
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1841,147 +1857,177 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1100
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bisecting: còn %d điểm xét duyệt để kiểm sau %s này\n"
-#: blame.c:2776
+#: blame.c:2773
msgid "--contents and --reverse do not blend well."
msgstr "tùy chọn --contents và --reverse không được trộn vào nhau."
-#: blame.c:2790
+#: blame.c:2787
msgid "cannot use --contents with final commit object name"
msgstr "không thể dùng --contents với tên đối tượng chuyển giao cuối cùng"
-#: blame.c:2811
+#: blame.c:2808
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"cùng sử dụng --reverse và --first-parent cần chỉ định lần chuyển giao cuối"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
+#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
+#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
+#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
+#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi"
-#: blame.c:2838
+#: blame.c:2835
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"cùng sử dụng --reverse --first-parent yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-"
"tiên"
-#: blame.c:2849
+#: blame.c:2846
#, c-format
msgid "no such path %s in %s"
msgstr "không có đường dẫn %s trong “%s”"
-#: blame.c:2860
+#: blame.c:2857
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "không thể đọc blob %s cho đường dẫn “%s”"
-#: branch.c:53
-#, c-format
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr ""
-"\n"
-"Sau khi sửa nguyên nhân lỗi bạn có lẻ cần thử sửa\n"
-"thông tin theo dõi máy chủ bằng cách gọi lệnh\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Chưa cài đặt nhánh %s như là thượng nguồn của nó."
-
#: branch.c:93
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
msgstr ""
-"Nhánh “%s” cài đặt để theo dõi nhánh máy chủ “%s” từ “%s” bằng cách rebase."
-
-#: branch.c:94
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "Nhánh “%s” cài đặt để theo dõi nhánh máy chủ “%s” từ “%s”."
-
-#: branch.c:98
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "Nhánh “%s” cài đặt để theo dõi nhánh nội bộ “%s” bằng cách rebase."
-
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "Nhánh “%s” cài đặt để theo dõi nhánh nội bộ “%s”."
+"không thể kế thừa cấu hình theo dõi thượng nguồn của nhiều tham chiếu khi mà "
+"lệnh cải tổ được yêu cầu"
#: branch.c:104
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "không cài đặt nhánh '%s' như là thượng nguồn của nó"
+
+#: branch.c:160
+#, c-format
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "nhánh “%s” cài đặt để theo dõi “%s” bằng cách rebase."
+
+#: branch.c:161
+#, c-format
+msgid "branch '%s' set up to track '%s'."
+msgstr "nhánh “%s” cài đặt để theo dõi “%s”."
+
+#: branch.c:164
+#, c-format
+msgid "branch '%s' set up to track:"
+msgstr "nhánh “%s” cài đặt để theo dõi:"
+
+#: branch.c:176
+msgid "unable to write upstream branch configuration"
+msgstr "không thể ghi cấu hình nhánh thượng nguồn"
+
+#: branch.c:178
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
msgstr ""
-"Nhánh “%s” cài đặt để theo dõi tham chiếu máy chủ “%s” bằng cách rebase."
+"\n"
+"Sau khi sửa nguyên nhân gây lỗi bạn có lẻ cần thử sửa\n"
+"thông tin theo dõi máy chủ bằng cách gọi lệnh:"
-#: branch.c:105
+#: branch.c:219
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "Nhánh “%s” cài đặt để theo dõi tham chiếu máy chủ “%s”."
-
-#: branch.c:109
-#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no remote is set"
msgstr ""
-"Nhánh “%s” cài đặt để theo dõi tham chiếu nội bộ “%s” bằng cách rebase."
+"đã hỏi để kế thừa theo dõi từ '%s', nhưng không có máy chủ nào được đặt"
-#: branch.c:110
+#: branch.c:225
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "Nhánh “%s” cài đặt để theo dõi tham chiếu nội bộ “%s”."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Không thể ghi cấu hình nhánh thượng nguồn"
-
-#: branch.c:156
-#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Không theo dõi: thông tin chưa rõ ràng cho tham chiếu %s"
-
-#: branch.c:189
-#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "“%s” không phải là một tên nhánh hợp lệ."
-
-#: branch.c:208
-#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Đã có nhánh mang tên “%s”."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Không thể ép buộc cập nhật nhánh hiện hành."
-
-#: branch.c:233
-#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr ""
-"Không thể cài đặt thông tin theo dõi; điểm bắt đầu “%s” không phải là một "
-"nhánh."
+"đã hỏi để kế thừa theo dõi từ '%s', nhưng không có cấu hình hòa trộn nào "
+"được đặt"
-#: branch.c:235
+#: branch.c:277
+#, c-format
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "không theo dõi: thông tin chưa rõ ràng cho tham chiếu '%s'"
+
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading " " space around.
+#.
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#: branch.c:289 object-name.c:464
+#, c-format
+msgid " %s\n"
+msgstr " %s\n"
+
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#: branch.c:295
+#, c-format
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
+"Có nhiều máy chủ những cái lấy ánh xạ refspecs tham chiếu theo\n"
+"dõi máy chủ '%s':\n"
+"%s\n"
+"Đây thường là lỗi cấu hình.\n"
+"\n"
+"Để hỗ trợ thiết lập các nhánh theo dõi, hãy đảm bảo rằng\n"
+"các máy chủ khác nhau lấy các refspecs ánh xạ đến\n"
+"không gian tên theo dõi khác."
+
+#: branch.c:344
+#, c-format
+msgid "'%s' is not a valid branch name"
+msgstr "“%s” không phải là một tên nhánh hợp lệ"
+
+#: branch.c:364
+#, c-format
+msgid "a branch named '%s' already exists"
+msgstr "đã có nhánh mang tên “%s”"
+
+#: branch.c:370
+#, c-format
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "không thể ép buộc cập nhật nhánh “%s” đã được lấy ra tại “%s”"
+
+#: branch.c:393
+#, c-format
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"không thể cài đặt thông tin theo dõi; điểm bắt đầu “%s” không phải là một "
+"nhánh"
+
+#: branch.c:395
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "nhánh thượng nguồn đã yêu cầu “%s” không tồn tại"
-#: branch.c:237
+#: branch.c:397
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -2001,123 +2047,143 @@
"sẽ theo dõi bản đối chiếu máy chủ của nó, bạn cần dùng lệnh\n"
"\"git push -u\" để đặt cấu hình thượng nguồn bạn muốn push."
-#: branch.c:281
+#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Không phải tên đối tượng hợp lệ: “%s”."
+msgid "not a valid object name: '%s'"
+msgstr "không phải là tên đối tượng hợp lệ: “%s”"
-#: branch.c:301
+#: branch.c:465
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Tên đối tượng chưa rõ ràng: “%s”."
+msgid "ambiguous object name: '%s'"
+msgstr "tên đối tượng chưa rõ ràng: “%s”."
-#: branch.c:306
+#: branch.c:470
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Nhánh không hợp lệ: “%s”."
+msgid "not a valid branch point: '%s'"
+msgstr "không phải là một điểm nhánh hợp lệ: “%s”"
-#: branch.c:366
+#: branch.c:658
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "mô-đun-con “%s”: không thể tìm thấy mô-đun-con"
+
+#: branch.c:661
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
+msgstr ""
+"Bạn có thể thử cập nhật các mô-đun-con bằng cách sử dụng 'git checkout %s && "
+"git submodule update --init'"
+
+#: branch.c:672 branch.c:698
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "mô-đun-con “%s”: không thể tạo nhánh “%s”"
+
+#: branch.c:730
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "“%s” đã được lấy ra tại “%s” rồi"
-#: branch.c:389
+#: branch.c:755
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD của cây làm việc %s chưa được cập nhật"
-#: bundle.c:44
+#: bundle.c:45
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
msgstr "không hiểu thuật toán băm dữ liệu bundle: %s"
-#: bundle.c:48
+#: bundle.c:53
#, c-format
msgid "unknown capability '%s'"
msgstr "không hiểu dung lượng “%s”"
-#: bundle.c:74
+#: bundle.c:79
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
msgstr "“%s” không giống như tập tin v2 hay v3 bundle (định dạng dump của git)"
-#: bundle.c:113
+#: bundle.c:118
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "phần đầu không được thừa nhận: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
+#: builtin/commit.c:865
#, c-format
msgid "could not open '%s'"
msgstr "không thể mở “%s”"
-#: bundle.c:198
+#: bundle.c:203
msgid "Repository lacks these prerequisite commits:"
msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:"
-#: bundle.c:201
+#: bundle.c:206
msgid "need a repository to verify a bundle"
msgstr "cần một kho chứa để thẩm tra một bundle"
-#: bundle.c:257
+#: bundle.c:264
#, c-format
msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Bó dữ liệu chứa %d tham chiếu:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Bó dữ liệu chứa %<PRIuMAX> tham chiếu:"
-#: bundle.c:264
+#: bundle.c:272
msgid "The bundle records a complete history."
msgstr "Lệnh bundle ghi lại toàn bộ lịch sử."
-#: bundle.c:266
+#: bundle.c:274
#, c-format
msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Lệnh bundle yêu cầu %d tham chiếu này:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Lệnh bundle yêu cầu %<PRIuMAX> tham chiếu này:"
-#: bundle.c:333
+#: bundle.c:350
msgid "unable to dup bundle descriptor"
msgstr "không thể nhân đôi bộ mô tả bundle"
-#: bundle.c:340
+#: bundle.c:357
msgid "Could not spawn pack-objects"
msgstr "Không thể sản sinh đối tượng gói"
-#: bundle.c:351
+#: bundle.c:368
msgid "pack-objects died"
msgstr "đối tượng gói đã chết"
-#: bundle.c:400
+#: bundle.c:417
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list"
-#: bundle.c:504
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "phiên bản bundle %d không được hỗ trợ"
-
-#: bundle.c:506
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "không thể ghi phiên bản bundle %d với thuật toán %s"
-
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
-#: bundle.c:553
+#: bundle.c:548
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "phiên bản bundle %d không được hỗ trợ"
+
+#: bundle.c:550
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "không thể ghi phiên bản bundle %d với thuật toán %s"
+
+#: bundle.c:600
msgid "Refusing to create empty bundle."
msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
-#: bundle.c:563
+#: bundle.c:610
#, c-format
msgid "cannot create '%s'"
msgstr "không thể tạo “%s”"
-#: bundle.c:588
+#: bundle.c:639
msgid "index-pack died"
msgstr "mục lục gói đã chết"
@@ -2140,12 +2206,12 @@
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "mảnh cuối cùng có id không bằng không %<PRIx32>"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "giá trị màu không hợp lệ: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:52
msgid "invalid hash version"
msgstr "phiên bản băm không hợp lệ"
@@ -2173,221 +2239,222 @@
msgid "commit-graph file is too small to hold %u chunks"
msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nhỏ để giữ %u mảnh dữ liệu"
-#: commit-graph.c:482
+#: commit-graph.c:485
msgid "commit-graph has no base graphs chunk"
msgstr "đồ-thị-các-lần-chuyển-giao có không có mảnh các đồ họa cơ sở"
-#: commit-graph.c:492
+#: commit-graph.c:495
msgid "commit-graph chain does not match"
msgstr "móc xích đồ-thị-các-lần-chuyển-giao không khớp"
-#: commit-graph.c:540
+#: commit-graph.c:543
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr ""
"móc xích đồ-thị-các-lần-chuyển-giao không hợp lệ: dòng “%s” không phải là "
"một mã băm"
-#: commit-graph.c:564
+#: commit-graph.c:567
msgid "unable to find all commit-graph files"
msgstr "không thể tìm thấy tất cả các tập tin đồ-thị-các-lần-chuyển-giao"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:752 commit-graph.c:789
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
"vị trí lần chuyển giao không hợp lệ. đồ-thị-các-lần-chuyển-giao có vẻ như đã "
"bị hỏng"
-#: commit-graph.c:766
+#: commit-graph.c:773
#, c-format
msgid "could not find commit %s"
msgstr "không thể tìm thấy lần chuyển giao %s"
-#: commit-graph.c:799
+#: commit-graph.c:806
msgid "commit-graph requires overflow generation data but has none"
msgstr "commit-graph yêu cầu dữ liệu tạo tràn nhưng không có"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
+#: builtin/clone.c:705
#, c-format
msgid "unable to parse commit %s"
msgstr "không thể phân tích lần chuyển giao “%s”"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1373 builtin/pack-objects.c:3078
#, c-format
msgid "unable to get type of object %s"
msgstr "không thể lấy kiểu của đối tượng “%s”"
-#: commit-graph.c:1368
+#: commit-graph.c:1404
msgid "Loading known commits in commit graph"
msgstr "Đang tải các lần chuyển giao chưa biết trong đồ thị lần chuyển giao"
-#: commit-graph.c:1385
+#: commit-graph.c:1421
msgid "Expanding reachable commits in commit graph"
msgstr ""
"Mở rộng các lần chuyển giao có thể tiếp cận được trong trong đồ thị lần "
"chuyển giao"
-#: commit-graph.c:1405
+#: commit-graph.c:1441
msgid "Clearing commit marks in commit graph"
msgstr "Đang dọn dẹp các đánh dấu lần chuyển giao trong đồ thị lần chuyển giao"
-#: commit-graph.c:1424
+#: commit-graph.c:1460
msgid "Computing commit graph topological levels"
msgstr "Đang tính mức hình học tô-pô tạo đồ thị các lần chuyển giao"
-#: commit-graph.c:1477
+#: commit-graph.c:1513
msgid "Computing commit graph generation numbers"
msgstr "Đang tính toán số tạo đồ thị các lần chuyển giao"
-#: commit-graph.c:1558
+#: commit-graph.c:1598
msgid "Computing commit changed paths Bloom filters"
msgstr "Đang tính toán chuyển giao các bộ lọc Bloom đường dẫn bị thay đổi"
-#: commit-graph.c:1635
+#: commit-graph.c:1675
msgid "Collecting referenced commits"
msgstr "Đang sưu tập các lần chuyển giao được tham chiếu"
-#: commit-graph.c:1660
+#: commit-graph.c:1701
#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
msgstr[0] ""
-"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong %d gói"
+"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong %<PRIuMAX> gói"
-#: commit-graph.c:1673
+#: commit-graph.c:1714
#, c-format
msgid "error adding pack %s"
msgstr "gặp lỗi thêm gói %s"
-#: commit-graph.c:1677
+#: commit-graph.c:1718
#, c-format
msgid "error opening index for %s"
msgstr "gặp lỗi khi mở mục lục cho “%s”"
-#: commit-graph.c:1714
+#: commit-graph.c:1756
msgid "Finding commits for commit graph among packed objects"
msgstr ""
"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong số các đối "
"tượng đã đóng gói"
-#: commit-graph.c:1732
+#: commit-graph.c:1774
msgid "Finding extra edges in commit graph"
msgstr "Đang tìm các cạnh mở tộng trong đồ thị lần chuyển giao"
-#: commit-graph.c:1781
+#: commit-graph.c:1823
msgid "failed to write correct number of base graph ids"
msgstr "gặp lỗi khi ghi số đúng của mã đồ họa cơ sở"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
#, c-format
msgid "unable to create leading directories of %s"
msgstr "không thể tạo các thư mục dẫn đầu của “%s”"
-#: commit-graph.c:1825
+#: commit-graph.c:1868
msgid "unable to create temporary graph layer"
msgstr "không thể tạo lớp sơ đồ tạm thời"
-#: commit-graph.c:1830
+#: commit-graph.c:1873
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "không thể chỉnh sửa quyền chia sẻ thành “%s”"
-#: commit-graph.c:1887
+#: commit-graph.c:1930
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Đang ghi ra đồ thị các lần chuyển giao trong lần %d"
-#: commit-graph.c:1923
+#: commit-graph.c:1967
msgid "unable to open commit-graph chain file"
msgstr "không thể mở tập tin mắt xích đồ thị chuyển giao"
-#: commit-graph.c:1939
+#: commit-graph.c:1983
msgid "failed to rename base commit-graph file"
msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao"
-#: commit-graph.c:1959
+#: commit-graph.c:2004
msgid "failed to rename temporary commit-graph file"
msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao tạm thời"
-#: commit-graph.c:2092
+#: commit-graph.c:2137
msgid "Scanning merged commits"
msgstr "Đang quét các lần chuyển giao đã hòa trộn"
-#: commit-graph.c:2136
+#: commit-graph.c:2181
msgid "Merging commit-graph"
msgstr "Đang hòa trộn đồ-thị-các-lần-chuyển-giao"
-#: commit-graph.c:2244
+#: commit-graph.c:2289
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"cố gắng để ghi một đồ thị các lần chuyển giao, nhưng “core.commitGraph” bị "
"vô hiệu hóa"
-#: commit-graph.c:2351
+#: commit-graph.c:2396
msgid "too many commits to write graph"
msgstr "có quá nhiều lần chuyển giao để ghi đồ thị"
-#: commit-graph.c:2449
+#: commit-graph.c:2494
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"tập tin đồ-thị-các-lần-chuyển-giao có tổng kiểm không đúng và có vẻ như là "
"đã hỏng"
-#: commit-graph.c:2459
+#: commit-graph.c:2504
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "đồ-thị-các-lần-chuyển-giao có thứ tự OID không đúng: %s sau %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2514 commit-graph.c:2529
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"đồ-thị-các-lần-chuyển-giao có giá trị fanout không đúng: fanout[%d] = %u != "
"%u"
-#: commit-graph.c:2476
+#: commit-graph.c:2521
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "gặp lỗi khi phân tích lần chuyển giao từ %s đồ-thị-các-lần-chuyển-giao"
-#: commit-graph.c:2494
+#: commit-graph.c:2539
msgid "Verifying commits in commit graph"
msgstr "Đang thẩm tra các lần chuyển giao trong đồ thị lần chuyển giao"
-#: commit-graph.c:2509
+#: commit-graph.c:2554
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"gặp lỗi khi phân tích lần chuyển giao %s từ cơ sở dữ liệu đối tượng cho đồ "
"thị lần chuyển giao"
-#: commit-graph.c:2516
+#: commit-graph.c:2561
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"OID cây gốc cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là %s != "
"%s"
-#: commit-graph.c:2526
+#: commit-graph.c:2571
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
"danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là quá dài"
-#: commit-graph.c:2535
+#: commit-graph.c:2580
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "cha mẹ đồ-thị-các-lần-chuyển-giao cho %s là %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2594
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
"danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s bị chấm "
"dứt quá sớm"
-#: commit-graph.c:2554
+#: commit-graph.c:2599
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2395,7 +2462,7 @@
"đồ-thị-các-lần-chuyển-giao có con số không lần tạo cho lần chuyển giao %s, "
"nhưng không phải số không ở chỗ khác"
-#: commit-graph.c:2558
+#: commit-graph.c:2603
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2403,32 +2470,32 @@
"đồ-thị-các-lần-chuyển-giao có con số không phải không lần tạo cho lần chuyển "
"giao %s, nhưng số không ở chỗ khác"
-#: commit-graph.c:2575
+#: commit-graph.c:2620
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
"tạo đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là %<PRIuMAX> < "
"%<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2626
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"ngày chuyển giao cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là "
"%<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
+#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "không thể phân tích cú pháp %s"
-#: commit.c:54
+#: commit.c:56
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s không phải là một lần chuyển giao!"
-#: commit.c:194
+#: commit.c:197
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2448,28 +2515,28 @@
"Tắt lời nhắn này bằng cách chạy\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1237
+#: commit.c:1252
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s."
-#: commit.c:1241
+#: commit.c:1256
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s."
-#: commit.c:1244
+#: commit.c:1259
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Lần chuyển giao %s không có chữ ký GPG."
-#: commit.c:1247
+#: commit.c:1262
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n"
-#: commit.c:1501
+#: commit.c:1516
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"
@@ -2483,7 +2550,17 @@
msgid "memory exhausted"
msgstr "hết bộ nhớ"
-#: config.c:126
+#: compat/terminal.c:167
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+"không thể khôi phục lại trong nền hệ thống, vui lòng sử dụng 'fg' để khôi "
+"phục lại"
+
+#: compat/terminal.c:168
+msgid "cannot restore terminal settings"
+msgstr "không thể phục hồi lại các cài đặt thiết bị cuối"
+
+#: config.c:143
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2498,335 +2575,362 @@
"\t%s\n"
"Nguyên nhân có thể là gồm quẩn vòng."
-#: config.c:142
+#: config.c:159
#, c-format
msgid "could not expand include path '%s'"
msgstr "không thể khai triển đường dẫn “%s”"
-#: config.c:153
+#: config.c:170
msgid "relative config includes must come from files"
msgstr "các bao gồm cấu hình liên quan phải đến từ các tập tin"
-#: config.c:199
+#: config.c:219
msgid "relative config include conditionals must come from files"
msgstr "các điều kiện bao gồm cấu hình liên quan phải đến từ các tập tin"
-#: config.c:396
+#: config.c:364
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"các URL máy chủ không thể được cấu hình trong tệp trực tiếp hoặc gián tiếp "
+"được bao gồm bởi includeIf.hasconfig:remote.*.url"
+
+#: config.c:508
#, c-format
msgid "invalid config format: %s"
msgstr "định dạng cấu hình không hợp lệ: %s"
-#: config.c:400
+#: config.c:512
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
-msgstr "thiếu tên biến môi trường cho cấu hình '%.*s'"
+msgstr "thiếu tên biến môi trường cho cấu hình “%.*s”"
-#: config.c:405
+#: config.c:517
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "thiếu biến môi trường '%s' cho cấu hình '%.*s'"
+msgstr "thiếu biến môi trường “%s” cho cấu hình “%.*s”"
-#: config.c:442
+#: config.c:553
#, c-format
msgid "key does not contain a section: %s"
msgstr "khóa không chứa một phần: %s"
-#: config.c:448
+#: config.c:558
#, c-format
msgid "key does not contain variable name: %s"
msgstr "khóa không chứa bất kỳ một tên biến nào: %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:580 sequencer.c:2802
#, c-format
msgid "invalid key: %s"
msgstr "khóa không đúng: %s"
-#: config.c:478
+#: config.c:585
#, c-format
msgid "invalid key (newline): %s"
msgstr "khóa không hợp lệ (dòng mới): %s"
-#: config.c:511
+#: config.c:605
msgid "empty config key"
msgstr "khóa cấu hình trống rỗng"
-#: config.c:529 config.c:541
+#: config.c:623 config.c:635
#, c-format
msgid "bogus config parameter: %s"
msgstr "tham số cấu hình không có thực: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:649 config.c:666 config.c:673 config.c:682
#, c-format
msgid "bogus format in %s"
msgstr "định dạng không có thực trong %s"
-#: config.c:622
+#: config.c:716
#, c-format
msgid "bogus count in %s"
msgstr "số lượng không có thực trong %s"
-#: config.c:626
+#: config.c:720
#, c-format
msgid "too many entries in %s"
msgstr "quá nhiều mục tin trong %s"
-#: config.c:636
+#: config.c:730
#, c-format
msgid "missing config key %s"
msgstr "thiếu khóa cấu hình “%s”"
-#: config.c:644
+#: config.c:738
#, c-format
msgid "missing config value %s"
msgstr "thiếu giá trị cấu hình “%s”"
-#: config.c:995
+#: config.c:1089
#, c-format
msgid "bad config line %d in blob %s"
msgstr "tập tin cấu hình sai tại dòng %d trong blob %s"
-#: config.c:999
+#: config.c:1093
#, c-format
msgid "bad config line %d in file %s"
msgstr "cấu hình sai tại dòng %d trong tập tin %s"
-#: config.c:1003
+#: config.c:1097
#, c-format
msgid "bad config line %d in standard input"
msgstr "cấu hình sai tại dòng %d trong đầu vào tiêu chuẩn"
-#: config.c:1007
+#: config.c:1101
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "cấu hình sai tại dòng %d trong blob-mô-đun-con %s"
-#: config.c:1011
+#: config.c:1105
#, c-format
msgid "bad config line %d in command line %s"
msgstr "cấu hình sai tại dòng %d trong dòng lệnh %s"
-#: config.c:1015
+#: config.c:1109
#, c-format
msgid "bad config line %d in %s"
msgstr "cấu hình sai tại dòng %d trong %s"
-#: config.c:1152
+#: config.c:1246
msgid "out of range"
msgstr "nằm ngoài phạm vi"
-#: config.c:1152
+#: config.c:1246
msgid "invalid unit"
msgstr "đơn vị không hợp lệ"
-#: config.c:1153
+#: config.c:1247
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s”: %s"
-#: config.c:1163
+#: config.c:1257
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong blob %s: %s"
-#: config.c:1166
+#: config.c:1260
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong tập tin %s: %s"
-#: config.c:1169
+#: config.c:1263
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"sai giá trị bằng số của cấu hình “%s” cho “%s” trong đầu vào tiêu chuẩn: %s"
-#: config.c:1172
+#: config.c:1266
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"sai giá trị bằng số của cấu hình “%s” cho “%s” trong submodule-blob %s: %s"
-#: config.c:1175
+#: config.c:1269
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong dòng lệnh %s: %s"
-#: config.c:1178
+#: config.c:1272
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong %s: %s"
-#: config.c:1257
+#: config.c:1368
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "giá trị không hợp lệ cho biến %s"
+
+#: config.c:1389
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "bỏ qua thành phần core.fsync chưa biết '%s'"
+
+#: config.c:1425
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "sai giá trị kiểu lô-gíc của cấu hình “%s” cho “%s”"
-#: config.c:1275
+#: config.c:1443
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "gặp lỗi mở rộng thư mục người dùng trong: “%s”"
-#: config.c:1284
+#: config.c:1452
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "“%s” dành cho “%s” không phải là dấu vết thời gian hợp lệ"
-#: config.c:1377
+#: config.c:1545
#, c-format
msgid "abbrev length out of range: %d"
msgstr "chiều dài abbrev nằm ngoài phạm vi: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1559 config.c:1570
#, c-format
msgid "bad zlib compression level %d"
msgstr "mức nén zlib %d là sai"
-#: config.c:1494
+#: config.c:1660
msgid "core.commentChar should only be one character"
msgstr "core.commentChar chỉ được có một ký tự"
-#: config.c:1527
+#: config.c:1692
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "bỏ qua giá trị core.fsyncMethod chưa biết '%s'"
+
+#: config.c:1698
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles đã lạc hậu; hãy dùng core.fsync để thay thế"
+
+#: config.c:1714
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s"
-#: config.c:1599
+#: config.c:1800
#, c-format
msgid "malformed value for %s"
msgstr "giá trị cho %s sai dạng"
-#: config.c:1625
+#: config.c:1826
#, c-format
msgid "malformed value for %s: %s"
msgstr "giá trị cho %s sai dạng: %s"
-#: config.c:1626
+#: config.c:1827
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "phải là một trong số nothing, matching, simple, upstream hay current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1888 builtin/pack-objects.c:4078
#, c-format
msgid "bad pack compression level %d"
msgstr "mức nén gói %d không hợp lệ"
-#: config.c:1809
+#: config.c:2014
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "không thể tải đối tượng blob cấu hình “%s”"
-#: config.c:1812
+#: config.c:2017
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "tham chiếu “%s” không chỉ đến một blob nào cả"
-#: config.c:1829
+#: config.c:2035
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "không thể phân giải điểm xét duyệt “%s”"
-#: config.c:1874
+#: config.c:2080
#, c-format
msgid "failed to parse %s"
msgstr "gặp lỗi khi phân tích cú pháp %s"
-#: config.c:1930
+#: config.c:2136
msgid "unable to parse command-line config"
msgstr "không thể phân tích cấu hình dòng lệnh"
-#: config.c:2294
+#: config.c:2512
msgid "unknown error occurred while reading the configuration files"
msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình"
-#: config.c:2468
+#: config.c:2686
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s không hợp lệ: “%s”"
-#: config.c:2513
+#: config.c:2731
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "giá trị splitIndex.maxPercentChange “%d” phải nằm giữa 0 và 100"
-#: config.c:2559
+#: config.c:2763
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "không thể phân tích “%s” từ cấu hình dòng lệnh"
-#: config.c:2561
+#: config.c:2765
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d"
-#: config.c:2645
+#: config.c:2850
#, c-format
msgid "invalid section name '%s'"
msgstr "tên của phần không hợp lệ “%s”"
-#: config.c:2677
+#: config.c:2882
#, c-format
msgid "%s has multiple values"
msgstr "%s có đa giá trị"
-#: config.c:2706
+#: config.c:2911
#, c-format
msgid "failed to write new configuration file %s"
msgstr "gặp lỗi khi ghi tập tin cấu hình “%s”"
-#: config.c:2958 config.c:3285
+#: config.c:3177 config.c:3518
#, c-format
msgid "could not lock config file %s"
msgstr "không thể khóa tập tin cấu hình %s"
-#: config.c:2969
+#: config.c:3188
#, c-format
msgid "opening %s"
msgstr "đang mở “%s”"
-#: config.c:3006 builtin/config.c:361
+#: config.c:3225 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "mẫu không hợp lệ: %s"
-#: config.c:3031
+#: config.c:3250
#, c-format
msgid "invalid config file %s"
msgstr "tập tin cấu hình “%s” không hợp lệ"
-#: config.c:3044 config.c:3298
+#: config.c:3263 config.c:3531
#, c-format
msgid "fstat on %s failed"
msgstr "fstat trên %s gặp lỗi"
-#: config.c:3055
+#: config.c:3274
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "không thể mmap “%s”%s"
-#: config.c:3065 config.c:3303
+#: config.c:3284 config.c:3536
#, c-format
msgid "chmod on %s failed"
msgstr "chmod trên %s gặp lỗi"
-#: config.c:3150 config.c:3400
+#: config.c:3369 config.c:3633
#, c-format
msgid "could not write config file %s"
msgstr "không thể ghi tập tin cấu hình “%s”"
-#: config.c:3184
+#: config.c:3403
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "không thể đặt “%s” thành “%s”"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
#, c-format
msgid "could not unset '%s'"
msgstr "không thể thôi đặt “%s”"
-#: config.c:3276
+#: config.c:3509
#, c-format
msgid "invalid section name: %s"
msgstr "tên của phần không hợp lệ: %s"
-#: config.c:3443
+#: config.c:3676
#, c-format
msgid "missing value for '%s'"
msgstr "thiếu giá trị cho cho “%s”"
@@ -2861,72 +2965,72 @@
msgid "expected flush after capabilities"
msgstr "cần đẩy dữ liệu lên đĩa sau các capabilities"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "bỏ qua capabilities sau dòng đầu tiên “%s”"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "lỗi giao thức: không cần capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "lỗi giao thức: cần sha-1 shallow, nhưng lại nhận được “%s”"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "kho đã ở điểm cuối khoác nên không thể được shallow"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "gói không hợp lệ"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "lỗi giao thức: không cần “%s”"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "không hiểu định dạng đối tượng “%s” được chỉ định bởi máy phục vụ"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "trả về của ls-refs không hợp lệ: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "cần đẩy dữ liệu lên đĩa sau khi liệt kê tham chiếu"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "cần nhận được trả lời là kết thúc gói sau khi liệt kê tham chiếu"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "giao thức “%s” chưa được hỗ trợ"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "không thể đặt SO_KEEPALIVE trên ổ cắm"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Đang tìm kiếm %s … "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "không tìm được %s (cổng %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2935,7 +3039,7 @@
"xong.\n"
"Đang kết nối đến %s (cổng %s) … "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2945,77 +3049,77 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "hoàn tất."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "không thể tìm thấy %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "không hiểu cổng %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "đã khóa tên máy lạ “%s”"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "đã khóa cổng lạ “%s”"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "không thể khởi chạy ủy nhiệm “%s”"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "chưa chỉ định đường dẫn; xem'git help pull” để biết cú pháp url hợp lệ"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "newline bị cấm trong các git:// máy chủ và đường dẫn repo"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh biến thể “simple” không hỗ trợ -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh biến thể “simple” không hỗ trợ -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh biến thể “simple” không hỗ trợ đặt cổng"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "đã khóa tên đường dẫn lạ “%s”"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "không thể rẽ nhánh tiến trình con"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "Đang kiểm tra kết nối"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Không thể chạy “git rev-list”"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "gặp lỗi khi ghi vào rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list"
@@ -3159,75 +3263,75 @@
msgid "refusing to work with credential missing protocol field"
msgstr "từ chối làm việc với giấy chứng thực thiếu trường giao thức"
-#: credential.c:394
+#: credential.c:396
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "url có chứa một dấu xuống dòng trong thành phần %s của nó: %s"
-#: credential.c:438
+#: credential.c:440
#, c-format
msgid "url has no scheme: %s"
msgstr "url không có lược đồ: %s"
-#: credential.c:511
+#: credential.c:513
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "không thể phân tích cú pháp giấy chứng thực url: %s"
-#: date.c:138
+#: date.c:139
msgid "in the future"
msgstr "ở thời tương lai"
-#: date.c:144
+#: date.c:145
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "%<PRIuMAX> giây trước"
-#: date.c:151
+#: date.c:152
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "%<PRIuMAX> phút trước"
-#: date.c:158
+#: date.c:159
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "%<PRIuMAX> giờ trước"
-#: date.c:165
+#: date.c:166
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "%<PRIuMAX> ngày trước"
-#: date.c:171
+#: date.c:172
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> tuần trước"
-#: date.c:178
+#: date.c:179
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> tháng trước"
-#: date.c:189
+#: date.c:190
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[0] "%<PRIuMAX> năm"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
+#: date.c:193
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s, %<PRIuMAX> tháng trước"
-#: date.c:197 date.c:202
+#: date.c:198 date.c:203
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
@@ -3258,28 +3362,32 @@
msgid "Marked %d islands, done.\n"
msgstr "Đã đánh dấu %d island, xong.\n"
-#: diff-merges.c:70
+#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
+#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
+#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
+#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
+#: builtin/pull.c:47 builtin/pull.c:321
#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "không hiểu giá trị cho --diff-merges: %s"
+msgid "invalid value for '%s': '%s'"
+msgstr "giá trị không hợp lệ cho '%s': '%s'"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base không hoạt động với phạm vi"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base chỉ hoạt động với các lần chuyển giao"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "không thể lấy HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "không tìm thấy cơ sở để hòa trộn"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "có nhiều cơ sở để hòa trộn"
@@ -3295,17 +3403,17 @@
"Không phải là một thư mục git. Dùng --no-index để so sánh hai đường dẫn bên "
"ngoài một cây làm việc"
-#: diff.c:156
+#: diff.c:159
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Gặp lỗi khi phân tích dirstat cắt bỏ phần trăm “%s”\n"
-#: diff.c:161
+#: diff.c:164
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Không hiểu đối số dirstat “%s”\n"
-#: diff.c:297
+#: diff.c:300
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3313,7 +3421,7 @@
"cài đặt màu đã di chuyển phải là một trong “no”, “default”, “blocks”, "
"“zebra”, “dimmed-zebra”, “plain”"
-#: diff.c:325
+#: diff.c:328
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3323,7 +3431,7 @@
"change”, “ignore-space-at-eol”, “ignore-all-space”, “allow-indentation-"
"change”"
-#: diff.c:333
+#: diff.c:336
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3331,12 +3439,12 @@
"color-moved-ws: allow-indentation-change không thể tổ hợp cùng với các chế "
"độ khoảng trắng khác"
-#: diff.c:410
+#: diff.c:413
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Không hiểu giá trị cho biến cấu hình “diff.submodule”: “%s”"
-#: diff.c:470
+#: diff.c:473
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3350,44 +3458,44 @@
msgid "external diff died, stopping at %s"
msgstr "phần mềm diff ở bên ngoài đã chết, dừng tại %s"
-#: diff.c:4634
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau"
+#: diff.c:4677 parse-options.c:1114
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "tùy chọn '%s', '%s', '%s' và '%s' không thể dùng cùng nhau"
-#: diff.c:4637
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "Các tùy chọn -G, -S, và --find-object loại từ lẫn nhau"
+#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "tùy chọn '%s', '%s' và '%s' không thể dùng cùng nhau"
-#: diff.c:4640
+#: diff.c:4685
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "tùy chọn '%s' và '%s' không thể dùng cùng nhau, dùng '%s' với '%s'"
+
+#: diff.c:4689
+#, c-format
msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr ""
-"-G và --pickaxe-regex là loại trừ lẫn nhau, dùng --pickaxe-regex với -S"
+"tùy chọn '%s' và '%s' không thể dùng cùng nhau, dùng '%s' với '%s' và '%s'"
-#: diff.c:4643
-msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr ""
-"tùy chọn --pickaxe-all và --find-object loại từ lẫn nhau, hãy dùng --pickaxe-"
-"all với -G và -S"
-
-#: diff.c:4722
+#: diff.c:4769
msgid "--follow requires exactly one pathspec"
msgstr "--follow cần chính xác một đặc tả đường dẫn"
-#: diff.c:4770
+#: diff.c:4823
#, c-format
msgid "invalid --stat value: %s"
msgstr "giá trị --stat không hợp lệ: “%s”"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "tùy chọn “%s” cần một giá trị bằng số"
-#: diff.c:4807
+#: diff.c:4860
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3396,42 +3504,42 @@
"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4893
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "không hiểu lớp thay đổi “%c” trong --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4917
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "không hiểu giá trị sau ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4931
#, c-format
msgid "unable to resolve '%s'"
msgstr "không thể phân giải “%s”"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4981 diff.c:4987
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s cần dạng <n>/<m>"
-#: diff.c:4998
+#: diff.c:4999
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s cần một ký tự, nhưng lại nhận được “%s”"
-#: diff.c:5019
+#: diff.c:5020
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "đối số --color-moved sai: %s"
-#: diff.c:5038
+#: diff.c:5039
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "chế độ “%s” không hợp lệ trong --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5079
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3439,155 +3547,155 @@
"tùy chọn diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và "
"\"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5115 diff.c:5135
#, c-format
msgid "invalid argument to %s"
msgstr "tham số cho %s không hợp lệ"
-#: diff.c:5238
+#: diff.c:5239
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "đưa cho -I biểu thức chính quy không hợp lệ: “%s”"
-#: diff.c:5287
+#: diff.c:5288
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”"
-#: diff.c:5343
+#: diff.c:5344
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "đối số --word-diff sai: %s"
-#: diff.c:5379
+#: diff.c:5380
msgid "Diff output format options"
msgstr "Các tùy chọn định dạng khi xuất các khác biệt"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5382 diff.c:5388
msgid "generate patch"
msgstr "tạo miếng vá"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5385 builtin/log.c:180
msgid "suppress diff output"
msgstr "chặn mọi kết xuất từ diff"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5390 diff.c:5504 diff.c:5511
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5391 diff.c:5394
msgid "generate diffs with <n> lines context"
msgstr "tạo khác biệt với <n> dòng ngữ cảnh"
-#: diff.c:5395
+#: diff.c:5396
msgid "generate the diff in raw format"
msgstr "tạo khác biệt ở định dạng thô"
-#: diff.c:5398
+#: diff.c:5399
msgid "synonym for '-p --raw'"
msgstr "đồng nghĩa với “-p --raw”"
-#: diff.c:5402
+#: diff.c:5403
msgid "synonym for '-p --stat'"
msgstr "đồng nghĩa với “-p --stat”"
-#: diff.c:5406
+#: diff.c:5407
msgid "machine friendly --stat"
msgstr "--stat thuận tiện cho máy đọc"
-#: diff.c:5409
+#: diff.c:5410
msgid "output only the last line of --stat"
msgstr "chỉ xuất những dòng cuối của --stat"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5412 diff.c:5420
msgid "<param1,param2>..."
msgstr "<tham_số_1,tham_số_2>…"
-#: diff.c:5412
+#: diff.c:5413
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "đầu ra phân phối của số lượng thay đổi tương đối cho mỗi thư mục con"
-#: diff.c:5416
+#: diff.c:5417
msgid "synonym for --dirstat=cumulative"
msgstr "đồng nghĩa với --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5421
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "đồng nghĩa với --dirstat=files,param1,param2…"
-#: diff.c:5424
+#: diff.c:5425
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"cảnh báo nếu các thay đổi đưa ra các bộ tạo xung đột hay lỗi khoảng trắng"
-#: diff.c:5427
+#: diff.c:5428
msgid "condensed summary such as creations, renames and mode changes"
msgstr "tổng hợp dạng xúc tích như là tạo, đổi tên và các thay đổi chế độ"
-#: diff.c:5430
+#: diff.c:5431
msgid "show only names of changed files"
msgstr "chỉ hiển thị tên của các tập tin đổi"
-#: diff.c:5433
+#: diff.c:5434
msgid "show only names and status of changed files"
msgstr "chỉ hiển thị tên tập tin và tình trạng của các tập tin bị thay đổi"
-#: diff.c:5435
+#: diff.c:5436
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<rộng>[,<name-width>[,<số-lượng>]]"
-#: diff.c:5436
+#: diff.c:5437
msgid "generate diffstat"
msgstr "tạo diffstat"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5439 diff.c:5442 diff.c:5445
msgid "<width>"
msgstr "<rộng>"
-#: diff.c:5439
+#: diff.c:5440
msgid "generate diffstat with a given width"
msgstr "tạo diffstat với độ rộng đã cho"
-#: diff.c:5442
+#: diff.c:5443
msgid "generate diffstat with a given name width"
msgstr "tạo diffstat với tên độ rộng đã cho"
-#: diff.c:5445
+#: diff.c:5446
msgid "generate diffstat with a given graph width"
msgstr "tạo diffstat với độ rộng đồ thị đã cho"
-#: diff.c:5447
+#: diff.c:5448
msgid "<count>"
msgstr "<số_lượng>"
-#: diff.c:5448
+#: diff.c:5449
msgid "generate diffstat with limited lines"
msgstr "tạo diffstat với các dòng bị giới hạn"
-#: diff.c:5451
+#: diff.c:5452
msgid "generate compact summary in diffstat"
msgstr "tạo tổng hợp xúc tích trong diffstat"
-#: diff.c:5454
+#: diff.c:5455
msgid "output a binary diff that can be applied"
msgstr "xuất ra một khác biệt dạng nhị phân cái mà có thể được áp dụng"
-#: diff.c:5457
+#: diff.c:5458
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"hiển thị đầy đủ các tên đối tượng pre- và post-image trên các dòng \"mục lục"
"\""
-#: diff.c:5459
+#: diff.c:5460
msgid "show colored diff"
msgstr "hiển thị thay đổi được tô màu"
-#: diff.c:5460
+#: diff.c:5461
msgid "<kind>"
msgstr "<kiểu>"
-#: diff.c:5461
+#: diff.c:5462
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3595,7 +3703,7 @@
"tô sáng các lỗi về khoảng trắng trong các dòng “context”, “old” và “new” "
"trong khác biệt"
-#: diff.c:5464
+#: diff.c:5465
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3603,89 +3711,89 @@
"không munge tên đường dẫn và sử dụng NUL làm bộ phân tách trường đầu ra "
"trong --raw hay --numstat"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
msgid "<prefix>"
msgstr "<tiền_tố>"
-#: diff.c:5468
+#: diff.c:5469
msgid "show the given source prefix instead of \"a/\""
msgstr "hiển thị tiền tố nguồn đã cho thay cho \"a/\""
-#: diff.c:5471
+#: diff.c:5472
msgid "show the given destination prefix instead of \"b/\""
msgstr "hiển thị tiền tố đích đã cho thay cho \"b/\""
-#: diff.c:5474
+#: diff.c:5475
msgid "prepend an additional prefix to every line of output"
msgstr "treo vào trước một tiền tố bổ sung cho mỗi dòng kết xuất"
-#: diff.c:5477
+#: diff.c:5478
msgid "do not show any source or destination prefix"
msgstr "đừng hiển thị bất kỳ tiền tố nguồn hay đích"
-#: diff.c:5480
+#: diff.c:5481
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"hiển thị ngữ cảnh giữa các khúc khác biệt khi đạt đến số lượng dòng đã chỉ "
"định"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5485 diff.c:5490 diff.c:5495
msgid "<char>"
msgstr "<ký_tự>"
-#: diff.c:5485
+#: diff.c:5486
msgid "specify the character to indicate a new line instead of '+'"
msgstr "chỉ định một ký tự để biểu thị một dòng được thêm mới thay cho “+”"
-#: diff.c:5490
+#: diff.c:5491
msgid "specify the character to indicate an old line instead of '-'"
msgstr "chỉ định một ký tự để biểu thị một dòng đã cũ thay cho “-”"
-#: diff.c:5495
+#: diff.c:5496
msgid "specify the character to indicate a context instead of ' '"
msgstr "chỉ định một ký tự để biểu thị một ngữ cảnh thay cho “”"
-#: diff.c:5498
+#: diff.c:5499
msgid "Diff rename options"
msgstr "Tùy chọn khác biệt đổi tên"
-#: diff.c:5499
+#: diff.c:5500
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5501
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "ngắt các thay đổi ghi lại hoàn thiện thành cặp của xóa và tạo"
-#: diff.c:5504
+#: diff.c:5505
msgid "detect renames"
msgstr "dò tìm các tên thay đổi"
-#: diff.c:5508
+#: diff.c:5509
msgid "omit the preimage for deletes"
msgstr "bỏ qua preimage (tiền ảnh??) cho các việc xóa"
-#: diff.c:5511
+#: diff.c:5512
msgid "detect copies"
msgstr "dò bản sao"
-#: diff.c:5515
+#: diff.c:5516
msgid "use unmodified files as source to find copies"
msgstr "dùng các tập tin không bị chỉnh sửa như là nguồn để tìm các bản sao"
-#: diff.c:5517
+#: diff.c:5518
msgid "disable rename detection"
msgstr "tắt dò tìm đổi tên"
-#: diff.c:5520
+#: diff.c:5521
msgid "use empty blobs as rename source"
msgstr "dùng các blob trống rống như là nguồn đổi tên"
-#: diff.c:5522
+#: diff.c:5523
msgid "continue listing the history of a file beyond renames"
msgstr "tiếp tục liệt kê lịch sử của một tập tin ngoài đổi tên"
-#: diff.c:5525
+#: diff.c:5526
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3693,160 +3801,160 @@
"ngăn cản dò tìm đổi tên/bản sao nếu số lượng của đích đổi tên/bản sao vượt "
"quá giới hạn đưa ra"
-#: diff.c:5527
+#: diff.c:5528
msgid "Diff algorithm options"
msgstr "Tùy chọn thuật toán khác biệt"
-#: diff.c:5529
+#: diff.c:5530
msgid "produce the smallest possible diff"
msgstr "sản sinh khác biệt ít nhất có thể"
-#: diff.c:5532
+#: diff.c:5533
msgid "ignore whitespace when comparing lines"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi so sánh các dòng"
-#: diff.c:5535
+#: diff.c:5536
msgid "ignore changes in amount of whitespace"
msgstr "lờ đi sự thay đổi do số lượng khoảng trắng gây ra"
-#: diff.c:5538
+#: diff.c:5539
msgid "ignore changes in whitespace at EOL"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi ở cuối dòng EOL"
-#: diff.c:5541
+#: diff.c:5542
msgid "ignore carrier-return at the end of line"
msgstr "bỏ qua ký tự về đầu dòng tại cuối dòng"
-#: diff.c:5544
+#: diff.c:5545
msgid "ignore changes whose lines are all blank"
msgstr "bỏ qua các thay đổi cho toàn bộ các dòng là trống"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5547
+#: diff.c:5548
msgid "ignore changes whose all lines match <regex>"
msgstr "bỏ qua các thay đổi có tất cả các dòng khớp <regex>"
-#: diff.c:5550
+#: diff.c:5551
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heuristic để dịch hạn biên của khối khác biệt cho dễ đọc"
-#: diff.c:5553
+#: diff.c:5554
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "tạo khác biệt sử dung thuật toán \"patience diff\""
-#: diff.c:5557
+#: diff.c:5558
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "tạo khác biệt sử dung thuật toán \"histogram diff\""
-#: diff.c:5559
+#: diff.c:5560
msgid "<algorithm>"
msgstr "<thuật toán>"
-#: diff.c:5560
+#: diff.c:5561
msgid "choose a diff algorithm"
msgstr "chọn một thuật toán khác biệt"
-#: diff.c:5562
+#: diff.c:5563
msgid "<text>"
msgstr "<văn bản>"
-#: diff.c:5563
+#: diff.c:5564
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "tạo khác biệt sử dung thuật toán \"anchored diff\""
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5566 diff.c:5575 diff.c:5578
msgid "<mode>"
msgstr "<chế độ>"
-#: diff.c:5566
+#: diff.c:5567
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"hiển thị khác biệt từ, sử dụng <chế độ> để bỏ giới hạn các từ bị thay đổi"
-#: diff.c:5569
+#: diff.c:5570
msgid "use <regex> to decide what a word is"
msgstr "dùng <regex> để quyết định từ là cái gì"
-#: diff.c:5572
+#: diff.c:5573
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "tương đương với --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5575
+#: diff.c:5576
msgid "moved lines of code are colored differently"
msgstr "các dòng di chuyển của mã mà được tô màu khác nhau"
-#: diff.c:5578
+#: diff.c:5579
msgid "how white spaces are ignored in --color-moved"
msgstr "cách bỏ qua khoảng trắng trong --color-moved"
-#: diff.c:5581
+#: diff.c:5582
msgid "Other diff options"
msgstr "Các tùy chọn khác biệt khác"
-#: diff.c:5583
+#: diff.c:5584
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"khi chạy từ thư mục con, thực thi các thay đổi bên ngoài và hiển thị các "
"đường dẫn liên quan"
-#: diff.c:5587
+#: diff.c:5588
msgid "treat all files as text"
msgstr "coi mọi tập tin là dạng văn bản thường"
-#: diff.c:5589
+#: diff.c:5590
msgid "swap two inputs, reverse the diff"
msgstr "tráo đổi hai đầu vào, đảo ngược khác biệt"
-#: diff.c:5591
+#: diff.c:5592
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "thoát với mã 1 nếu không có khác biệt gì, 0 nếu ngược lại"
-#: diff.c:5593
+#: diff.c:5594
msgid "disable all output of the program"
msgstr "tắt mọi kết xuất của chương trình"
-#: diff.c:5595
+#: diff.c:5596
msgid "allow an external diff helper to be executed"
msgstr "cho phép mộ bộ hỗ trợ xuất khác biệt ở bên ngoài được phép thực thi"
-#: diff.c:5597
+#: diff.c:5598
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"chạy các bộ lọc văn bản thông thường bên ngoài khi so sánh các tập tin nhị "
"phân"
-#: diff.c:5599
+#: diff.c:5600
msgid "<when>"
msgstr "<khi>"
-#: diff.c:5600
+#: diff.c:5601
msgid "ignore changes to submodules in the diff generation"
msgstr "bỏ qua các thay đổi trong mô-đun-con trong khi tạo khác biệt"
-#: diff.c:5603
+#: diff.c:5604
msgid "<format>"
msgstr "<định dạng>"
-#: diff.c:5604
+#: diff.c:5605
msgid "specify how differences in submodules are shown"
msgstr "chi định khác biệt bao nhiêu trong các mô đun con được hiển thị"
-#: diff.c:5608
+#: diff.c:5609
msgid "hide 'git add -N' entries from the index"
msgstr "ẩn các mục “git add -N” từ bảng mục lục"
-#: diff.c:5611
+#: diff.c:5612
msgid "treat 'git add -N' entries as real in the index"
msgstr "coi các mục “git add -N” như là có thật trong bảng mục lục"
-#: diff.c:5613
+#: diff.c:5614
msgid "<string>"
msgstr "<chuỗi>"
-#: diff.c:5614
+#: diff.c:5615
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3854,7 +3962,7 @@
"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của "
"chuỗi được chỉ ra"
-#: diff.c:5617
+#: diff.c:5618
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3862,35 +3970,35 @@
"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của biểu "
"thức chính quy được chỉ ra"
-#: diff.c:5620
+#: diff.c:5621
msgid "show all changes in the changeset with -S or -G"
msgstr "hiển thị tất cả các thay đổi trong một bộ các thay đổi với -S hay -G"
-#: diff.c:5623
+#: diff.c:5624
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "coi <chuỗi> trong -S như là biểu thức chính qui POSIX có mở rộng"
-#: diff.c:5626
+#: diff.c:5627
msgid "control the order in which files appear in the output"
msgstr "điều khiển thứ tự xuát hiện các tập tin trong kết xuất"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5628 diff.c:5631
msgid "<path>"
msgstr "<đường-dẫn>"
-#: diff.c:5628
+#: diff.c:5629
msgid "show the change in the specified path first"
msgstr "hiển thị các thay đổi trong đường dẫn đã cho đầu tiên"
-#: diff.c:5631
+#: diff.c:5632
msgid "skip the output to the specified path"
msgstr "bỏ qua đầu ra đến đường dẫn đã cho"
-#: diff.c:5633
+#: diff.c:5634
msgid "<object-id>"
msgstr "<mã-số-đối-tượng>"
-#: diff.c:5634
+#: diff.c:5635
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3898,32 +4006,32 @@
"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của đối "
"tượng được chỉ ra"
-#: diff.c:5636
+#: diff.c:5637
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
-#: diff.c:5637
+#: diff.c:5638
msgid "select files by diff type"
msgstr "chọn các tập tin theo kiểu khác biệt"
-#: diff.c:5639
+#: diff.c:5640
msgid "<file>"
msgstr "<tập_tin>"
-#: diff.c:5640
-msgid "Output to a specific file"
-msgstr "Xuất ra một tập tin cụ thể"
+#: diff.c:5641
+msgid "output to a specific file"
+msgstr "xuất ra một tập tin cụ thể"
-#: diff.c:6298
+#: diff.c:6321
msgid "exhaustive rename detection was skipped due to too many files."
msgstr "nhận thấy đổi tên toàn diện đã bị bỏ qua bởi có quá nhiều tập tin."
-#: diff.c:6301
+#: diff.c:6324
msgid "only found copies from modified paths due to too many files."
msgstr ""
"chỉ tìm thấy các bản sao từ đường dẫn đã sửa đổi bởi vì có quá nhiều tập tin."
-#: diff.c:6304
+#: diff.c:6327
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3936,7 +4044,7 @@
msgid "failed to read orderfile '%s'"
msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Đang thực hiện dò tìm đổi tên không chính xác"
@@ -3965,39 +4073,47 @@
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr "tập tin sparse-checkout của bạn có lẽ gặp lỗi: mẫu “%s” đã bị lặp lại"
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr "vô hiệu khớp mẫu nón"
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "không thể dùng %s như là một tập tin loại trừ"
-#: dir.c:2351
+#: dir.c:2419
#, c-format
msgid "could not open directory '%s'"
msgstr "không thể mở thư mục “%s”"
-#: dir.c:2653
+#: dir.c:2721
msgid "failed to get kernel name and information"
msgstr "gặp lỗi khi lấy tên và thông tin của nhân"
-#: dir.c:2777
+#: dir.c:2846
msgid "untracked cache is disabled on this system or location"
msgstr "bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này"
-#: dir.c:3610
+#: dir.c:3119
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Không đoán được thư mục tên là gì.\n"
+"Vui lòng chỉ định tên một thư mục trên dòng lệnh"
+
+#: dir.c:3807
#, c-format
msgid "index file corrupt in repo %s"
msgstr "tập tin ghi bảng mục lục bị hỏng trong kho %s"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3854 dir.c:3859
#, c-format
msgid "could not create directories for %s"
msgstr "không thể tạo thư mục cho %s"
-#: dir.c:3691
+#: dir.c:3888
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "không thể di dời thư mục git từ “%s” sang “%s”"
@@ -4007,305 +4123,399 @@
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "gợi ý: Chờ trình biên soạn của bạn đóng tập tin…%c"
-#: entry.c:176
+#: entry.c:179
msgid "Filtering content"
msgstr "Nội dung lọc"
-#: entry.c:497
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "không thể lấy thống kê tập tin “%s”"
-#: environment.c:152
+#: environment.c:147
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "đường dẫn không gian tên git \"%s\" sai"
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "không thể đặt GIT_DIR thành “%s”"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "quá nhiều tham số để chạy %s"
-#: fetch-pack.c:182
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: cần danh sách shallow"
-#: fetch-pack.c:185
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: cần một gói đẩy sau danh sách shallow"
-#: fetch-pack.c:196
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được một gói flush"
-#: fetch-pack.c:216
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được “%s”"
-#: fetch-pack.c:227
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "không thể ghi lên máy phục vụ"
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc cần multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:397 fetch-pack.c:1460
#, c-format
msgid "invalid shallow line: %s"
msgstr "dòng shallow không hợp lệ: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:403 fetch-pack.c:1466
#, c-format
msgid "invalid unshallow line: %s"
msgstr "dòng unshallow không hợp lệ: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:405 fetch-pack.c:1468
#, c-format
msgid "object not found: %s"
msgstr "không tìm thấy đối tượng: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:408 fetch-pack.c:1471
#, c-format
msgid "error in object: %s"
msgstr "lỗi trong đối tượng: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:410 fetch-pack.c:1473
#, c-format
msgid "no shallow found: %s"
msgstr "không tìm shallow nào: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:413 fetch-pack.c:1477
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:453
#, c-format
msgid "got %s %d %s"
msgstr "nhận %s %d - %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:470
#, c-format
msgid "invalid commit %s"
msgstr "lần chuyển giao %s không hợp lệ"
-#: fetch-pack.c:487
+#: fetch-pack.c:501
msgid "giving up"
msgstr "chịu thua"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:514 progress.h:25
msgid "done"
msgstr "xong"
-#: fetch-pack.c:512
+#: fetch-pack.c:526
#, c-format
msgid "got %s (%d) %s"
msgstr "nhận %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:562
#, c-format
msgid "Marking %s as complete"
msgstr "Đánh dấu %s là đã hoàn thành"
-#: fetch-pack.c:763
+#: fetch-pack.c:784
#, c-format
msgid "already have %s (%s)"
msgstr "đã sẵn có %s (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:870
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
-#: fetch-pack.c:857
+#: fetch-pack.c:878
msgid "protocol error: bad pack header"
msgstr "lỗi giao thức: phần đầu gói bị sai"
-#: fetch-pack.c:951
+#: fetch-pack.c:974
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: không thể rẽ nhánh %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:980
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: kết xuất index-pack không hợp lệ"
-#: fetch-pack.c:974
+#: fetch-pack.c:997
#, c-format
msgid "%s failed"
msgstr "%s gặp lỗi"
-#: fetch-pack.c:976
+#: fetch-pack.c:999
msgid "error in sideband demultiplexer"
msgstr "có lỗi trong sideband demultiplexer"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1048
#, c-format
msgid "Server version is %.*s"
msgstr "Phiên bản máy chủ là %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
+#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
+#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
+#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
#, c-format
msgid "Server supports %s"
msgstr "Máy chủ hỗ trợ %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1058
msgid "Server does not support shallow clients"
msgstr "Máy chủ không hỗ trợ máy khách shallow"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1118
msgid "Server does not support --shallow-since"
msgstr "Máy chủ không hỗ trợ --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1123
msgid "Server does not support --shallow-exclude"
msgstr "Máy chủ không hỗ trợ --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1127
msgid "Server does not support --deepen"
msgstr "Máy chủ không hỗ trợ --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1129
msgid "Server does not support this repository's object format"
msgstr "Máy chủ không hỗ trợ định dạng đối tượng của kho này"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1142
msgid "no common commits"
msgstr "không có lần chuyển giao chung nào"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
msgid "source repository is shallow, reject to clone."
msgstr "kho nguồn là nông, nên bỏ từ chối nhân bản."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1157 fetch-pack.c:1705
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch gặp lỗi."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1271
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "các thuật toán không khớp nhau: máy khách %s; máy chủ %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1275
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "máy chủ không hỗ trợ thuật toán “%s”"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1308
msgid "Server does not support shallow requests"
msgstr "Máy chủ không hỗ trợ yêu cầu shallow"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1315
msgid "Server supports filter"
msgstr "Máy chủ hỗ trợ bộ lọc"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1358 fetch-pack.c:2087
msgid "unable to write request to remote"
msgstr "không thể ghi các yêu cầu lên máy phục vụ"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1376
#, c-format
msgid "error reading section header '%s'"
msgstr "gặp lỗi khi đọc phần đầu của đoạn %s"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1382
#, c-format
msgid "expected '%s', received '%s'"
msgstr "cần “%s”, nhưng lại nhận “%s”"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1416
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "gặp dòng không được thừa nhận: “%s”"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1421
#, c-format
msgid "error processing acks: %d"
msgstr "gặp lỗi khi xử lý tín hiệu trả lời: %d"
-#: fetch-pack.c:1402
-msgid "expected packfile to be sent after 'ready'"
-msgstr "cần tập tin gói để gửi sau “ready”"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1435
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "cần tập tin gói để gửi sau “%s”"
-#: fetch-pack.c:1404
-msgid "expected no other sections to be sent after no 'ready'"
-msgstr "không cần thêm phần nào để gửi sau “ready”"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1441
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "không cần thêm phần nào để gửi sau không “%s”"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1482
#, c-format
msgid "error processing shallow info: %d"
msgstr "lỗi xử lý thông tin shallow: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1531
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "cần wanted-ref, nhưng lại nhận được “%s”"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1536
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref không được mong đợi: “%s”"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1541
#, c-format
msgid "error processing wanted refs: %d"
msgstr "lỗi khi xử lý wanted refs: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1571
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: cần nhận được trả lời là kết thúc gói"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1983
msgid "no matching remote head"
msgstr "không khớp phần đầu máy chủ"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:2006 builtin/clone.c:587
msgid "remote did not send all necessary objects"
msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2109
msgid "unexpected 'ready' from remote"
-msgstr "gặp 'ready' đột xuất từ máy chủ"
+msgstr "gặp “ready” đột xuất từ máy chủ"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2132
#, c-format
msgid "no such remote ref %s"
msgstr "không có máy chủ tham chiếu nào như %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2135
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
"Máy phục vụ không cho phép yêu cầu cho đối tượng không được báo trước %s"
-#: gpg-interface.c:273
+#: fsmonitor-ipc.c:119
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: đường dẫn không hợp lệ '%s'"
+
+#: fsmonitor-ipc.c:125
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: lỗi chưa rõ trên '%s'"
+
+#: fsmonitor-ipc.c:155
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon hiện tại chưa chạy"
+
+#: fsmonitor-ipc.c:164
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "không thể gửi lệnh '%s' đến fsmonitor--daemon"
+
+#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
+#: gpg-interface.c:1011
msgid "could not create temporary file"
msgstr "không thể tạo tập tin tạm thời"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:459
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”"
-#: gpg-interface.c:470
+#: gpg-interface.c:450
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile cần được cấu hình và tồn tại để xác minh chữ ký "
+"ssh"
+
+#: gpg-interface.c:479
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify là cần thiết để xác minh chữ ký ssh (có "
+"sẵn trong phiên bản openssh 8.2p1+)"
+
+#: gpg-interface.c:550
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "tập tin thu hồi chữ ký ssh đã được cấu hình nhưng không tìm thấy: %s"
+
+#: gpg-interface.c:638
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "chữ sai / không tương thích “%s”"
+
+#: gpg-interface.c:815 gpg-interface.c:820
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "gặp lỗi khi lấy dấu vân tay ssh cho khóa “%s”"
+
+#: gpg-interface.c:843
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"hoặc là user.signingkey hoặc gpg.ssh.defaultKeyCommand cần được cấu hình"
+
+#: gpg-interface.c:865
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand thành công nhưng lại không trả về khóa nào: %s %s"
+
+#: gpg-interface.c:871
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand gặp lỗi: %s %s"
+
+#: gpg-interface.c:966
msgid "gpg failed to sign the data"
msgstr "gpg gặp lỗi khi ký dữ liệu"
+#: gpg-interface.c:988
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey cần được đặt cho ký ssh"
+
+#: gpg-interface.c:999
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "gặp lỗi khi ghi chìa khóa ký ssh vào “%s”"
+
+#: gpg-interface.c:1017
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "gặp lỗi khi ghi bộ đệm chìa khóa ký ssh vào “%s”"
+
+#: gpg-interface.c:1035
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y sign là cần thiết cho ký ssh (sẵn có trong openssh phiên bản "
+"8.2p1+)"
+
+#: gpg-interface.c:1047
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "gặp lỗi khi đọc bộ đệm dữ liệu chữ ký ssh từ “%s”"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "bỏ qua màu không hợp lệ “%.*s” trong log.graphColors"
-#: grep.c:531
+#: grep.c:446
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4313,109 +4523,109 @@
"mẫu đã cho có chứa NULL byte (qua -f <file>). Điều này chỉ được hỗ trợ với -"
"P dưới PCRE v2"
-#: grep.c:1895
+#: grep.c:1859
#, c-format
msgid "'%s': unable to read %s"
msgstr "“%s”: không thể đọc %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "gặp lỗi khi lấy thống kê về “%s”"
-#: grep.c:1923
+#: grep.c:1887
#, c-format
msgid "'%s': short read"
msgstr "“%s”: đọc ngắn"
-#: help.c:23
+#: help.c:25
msgid "start a working area (see also: git help tutorial)"
msgstr "bắt đầu một vùng làm việc (xem thêm: git help tutorial)"
-#: help.c:24
+#: help.c:26
msgid "work on the current change (see also: git help everyday)"
msgstr "làm việc trên thay đổi hiện tại (xem thêm: git help everyday)"
-#: help.c:25
+#: help.c:27
msgid "examine the history and state (see also: git help revisions)"
msgstr "xem xét lịch sử tình trạng (xem thêm: git help revisions)"
-#: help.c:26
+#: help.c:28
msgid "grow, mark and tweak your common history"
msgstr "thêm, ghi dấu và chỉnh lịch sử chung của bạn"
-#: help.c:27
+#: help.c:29
msgid "collaborate (see also: git help workflows)"
msgstr "làm việc nhóm (xem thêm: git help workflows)"
-#: help.c:31
+#: help.c:33
msgid "Main Porcelain Commands"
msgstr "Các lệnh Porcelain chính"
-#: help.c:32
+#: help.c:34
msgid "Ancillary Commands / Manipulators"
msgstr "Lệnh/thao tác thứ cấp"
-#: help.c:33
+#: help.c:35
msgid "Ancillary Commands / Interrogators"
msgstr "Lệnh/bộ hỏi thứ cấp"
-#: help.c:34
+#: help.c:36
msgid "Interacting with Others"
msgstr "Tương tác với những cái khác"
-#: help.c:35
+#: help.c:37
msgid "Low-level Commands / Manipulators"
msgstr "Lệnh/thao tác ở mức thấp"
-#: help.c:36
+#: help.c:38
msgid "Low-level Commands / Interrogators"
msgstr "Lệnh/bộ hỏi ở mức thấp"
-#: help.c:37
+#: help.c:39
msgid "Low-level Commands / Syncing Repositories"
msgstr "Lệnh/Đồng bộ kho ở mức thấp"
-#: help.c:38
+#: help.c:40
msgid "Low-level Commands / Internal Helpers"
msgstr "Lệnh/Hỗ trợ nội tại ở mức thấp"
-#: help.c:300
+#: help.c:316
#, c-format
msgid "available git commands in '%s'"
msgstr "các lệnh git sẵn có trong thư mục “%s”:"
-#: help.c:307
+#: help.c:323
msgid "git commands available from elsewhere on your $PATH"
msgstr "các lệnh git sẵn có từ một nơi khác trong $PATH của bạn"
-#: help.c:316
+#: help.c:332
msgid "These are common Git commands used in various situations:"
msgstr "Có các lệnh Git chung được sử dụng trong các tình huống khác nhau:"
-#: help.c:365 git.c:100
+#: help.c:382 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "không hỗ trợ liệt kê lệnh kiểu “%s”"
-#: help.c:405
+#: help.c:422
msgid "The Git concept guides are:"
msgstr "Các chỉ dẫn khái niệm về Git là:"
-#: help.c:429
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Xem “git help <lệnh>” để đọc các đặc tả của lệnh con"
-
-#: help.c:434
+#: help.c:446
msgid "External commands"
msgstr "Các lệnh bên ngoài"
-#: help.c:449
+#: help.c:468
msgid "Command aliases"
msgstr "Các bí danh lệnh"
-#: help.c:527
+#: help.c:486
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Xem “git help <lệnh>” để đọc các đặc tả của lệnh con"
+
+#: help.c:563
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4424,31 +4634,36 @@
"“%s” trông như là một lệnh git, nhưng chúng tôi không\n"
"thể thực thi nó. Có lẽ là lệnh git-%s đã bị hỏng?"
-#: help.c:543 help.c:631
+#: help.c:585 help.c:682
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: “%s” không phải là một lệnh của git. Xem “git --help”."
-#: help.c:591
+#: help.c:633
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ối chà. Hệ thống của bạn báo rằng chẳng có lệnh Git nào cả."
-#: help.c:613
+#: help.c:655
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "CẢNH BÁO: Bạn đã gọi lệnh Git có tên “%s”, mà nó lại không có sẵn."
-#: help.c:618
+#: help.c:660
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Tiếp tục và coi rằng ý bạn là “%s”."
-#: help.c:623
+#: help.c:666
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Chạy “%s” để thay thế? (y/N)? "
+
+#: help.c:674
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Tiếp tục trong %0.1f giây,và coi rằng ý bạn là “%s”."
-#: help.c:635
+#: help.c:686
msgid ""
"\n"
"The most similar command is"
@@ -4459,16 +4674,16 @@
"\n"
"Những lệnh giống nhất là"
-#: help.c:675
+#: help.c:729
msgid "git version [<options>]"
msgstr "git version [<các tùy chọn>]"
-#: help.c:730
+#: help.c:784
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:788
msgid ""
"\n"
"Did you mean this?"
@@ -4479,15 +4694,29 @@
"\n"
"Có phải ý bạn là một trong số những cái này không?"
-#: ident.c:353
+#: hook.c:28
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Móc “%s” bị bỏ qua bởi vì nó không thể đặt là thực thi được.\n"
+"Bạn có thể tắt cảnh báo này bằng “git config advice.ignoredHook false“."
+
+#: hook.c:87
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "Không thể khởi chạy móc “%s”\n"
+
+#: ident.c:354
msgid "Author identity unknown\n"
msgstr "Chưa biết định danh tác giả\n"
-#: ident.c:356
+#: ident.c:357
msgid "Committer identity unknown\n"
msgstr "Chưa biết định danh người chuyển giao\n"
-#: ident.c:362
+#: ident.c:363
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -4513,71 +4742,71 @@
"Bỏ tùy chọn --global nếu chỉ định danh riêng cho kho này.\n"
"\n"
-#: ident.c:397
+#: ident.c:398
msgid "no email was given and auto-detection is disabled"
msgstr "không đưa ra địa chỉ thư điện tử và auto-detection bị tắt"
-#: ident.c:402
+#: ident.c:403
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "không thể tự dò tìm địa chỉ thư điện tử (nhận “%s”)"
-#: ident.c:419
+#: ident.c:420
msgid "no name was given and auto-detection is disabled"
msgstr "chưa chỉ ra tên và tự-động-dò-tìm bị tắt"
-#: ident.c:425
+#: ident.c:426
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "không thể dò-tìm-tự động tên (đã nhận “%s”)"
-#: ident.c:433
+#: ident.c:434
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "không cho phép tên định danh là rỗng (cho <%s>)"
-#: ident.c:439
+#: ident.c:440
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "tên chỉ được phép bao gồm các ký tự sau: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:455 builtin/commit.c:649
#, c-format
msgid "invalid date format: %s"
msgstr "ngày tháng không hợp lệ: %s"
-#: list-objects-filter-options.c:83
+#: list-objects-filter-options.c:68
msgid "expected 'tree:<depth>'"
msgstr "cần “tree:<depth>”"
-#: list-objects-filter-options.c:98
+#: list-objects-filter-options.c:83
msgid "sparse:path filters support has been dropped"
msgstr "việc hỗ trợ bộ lọc sparse:đường/dẫn đã bị bỏ"
-#: list-objects-filter-options.c:105
+#: list-objects-filter-options.c:90
#, c-format
msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "“%s” dành cho “object:type=<type>” không phải là kiểu đối tượng hợp lệ"
-#: list-objects-filter-options.c:124
+#: list-objects-filter-options.c:109
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "đặc tả bộ lọc không hợp lệ “%s”"
-#: list-objects-filter-options.c:140
+#: list-objects-filter-options.c:125
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr "phải thoát char trong sub-filter-spec: “%c”"
-#: list-objects-filter-options.c:182
+#: list-objects-filter-options.c:167
msgid "expected something after combine:"
msgstr "mong đợi một cái gì đó sau khi kết hợp:"
-#: list-objects-filter-options.c:264
+#: list-objects-filter-options.c:249
msgid "multiple filter-specs cannot be combined"
msgstr "không thể tổ hợp nhiều đặc tả kiểu lọc"
-#: list-objects-filter-options.c:376
+#: list-objects-filter-options.c:365
msgid "unable to upgrade repository format to support partial clone"
msgstr "không thể nâng cấp định định dạng kho chứa để hỗ trợ nhân bản cục bộ"
@@ -4591,17 +4820,17 @@
msgid "unable to parse sparse filter data in %s"
msgstr "không thể phân tích dữ liệu bộ lọc rải rác trong %s"
-#: list-objects.c:127
+#: list-objects.c:144
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr "mục “%s” trong cây %s có nút cây, nhưng không phải là một cây"
-#: list-objects.c:140
+#: list-objects.c:157
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "mục “%s” trong cây %s có nút blob, nhưng không phải là một blob"
-#: list-objects.c:398
+#: list-objects.c:415
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "không thể tải cây gốc cho lần chuyển giao “%s”"
@@ -4630,12 +4859,12 @@
msgid "Unable to create '%s.lock': %s"
msgstr "Không thể tạo “%s.lock”: %s"
-#: ls-refs.c:37
+#: ls-refs.c:175
#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "giá trị '%s' không hợp lệ cho lsrefs.unborn"
+msgid "unexpected line: '%s'"
+msgstr "dòng không cần: “%s”"
-#: ls-refs.c:167
+#: ls-refs.c:179
msgid "expected flush after ls-refs arguments"
msgstr "cần đẩy dữ liệu lên đĩa sau tham số ls-refs (liệt kê tham chiếu)"
@@ -4643,39 +4872,39 @@
msgid "quoted CRLF detected"
msgstr "phát hiện CRLF được trích dẫn"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "thao tác sai “%s” cho “%s”"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1630 merge-recursive.c:1214
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không lấy ra được)"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1639 merge-recursive.c:1221
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không hiện diện)"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1648 merge-recursive.c:1228
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không theo sau nền-hòa-"
"trộn)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1658 merge-ort.c:1666
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Chú ý: Chuyển-tiếp-nhanh mô-đun-con “%s” sang “%s”"
-#: merge-ort.c:1625
+#: merge-ort.c:1688
#, c-format
msgid "Failed to merge submodule %s"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s”"
-#: merge-ort.c:1632
+#: merge-ort.c:1695
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4684,7 +4913,7 @@
"Gặp lỗi khi hòa trộn mô-đun-con “%s”, nhưng có cách giải quyết:\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1699 merge-recursive.c:1284
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4701,7 +4930,7 @@
"\n"
"cái mà sẽ chấp nhận gợi ý này.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1712
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4710,21 +4939,21 @@
"Gặp lỗi khi hòa trộn mô-đun-con “%s”, nhưng có nhiều cách giải quyết:\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1937 merge-recursive.c:1375
msgid "Failed to execute internal merge"
msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1942 merge-recursive.c:1380
#, c-format
msgid "Unable to add %s to database"
msgstr "Không thể thêm %s vào cơ sở dữ liệu"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1949 merge-recursive.c:1413
#, c-format
msgid "Auto-merging %s"
msgstr "Tự-động-hòa-trộn %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2088 merge-recursive.c:2135
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4733,7 +4962,7 @@
"XUNG ĐỘT: (ngầm đổi tên thư mục): Tập tin/thư mục đã sẵn có tại %s theo cách "
"của các đổi tên thư mục ngầm đặt (các) đường dẫn sau ở đây: %s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2098 merge-recursive.c:2145
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4742,7 +4971,7 @@
"XUNG ĐỘT: (ngầm đổi tên thư mục): Không thể ánh xạ một đường dẫn thành %s; "
"các đổi tên thư mục ngầm cố đặt các đường dẫn ở đây: %s"
-#: merge-ort.c:2087
+#: merge-ort.c:2156
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4753,7 +4982,7 @@
"thành; nó đã bị đổi tên thành nhiều thư mục khác, với không đích đến nhận "
"một phần nhiều của các tập tin."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2310 merge-recursive.c:2481
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4762,7 +4991,7 @@
"CẢNH BÁO: tránh áp dụng %s -> %s đổi thên thành %s, bởi vì bản thân %s cũng "
"bị đổi tên."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2450 merge-recursive.c:3264
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4771,7 +5000,7 @@
"Đường dẫn đã được cập nhật: %s được thêm vào trong %s bên trong một thư mục "
"đã được đổi tên trong %s; di chuyển nó đến %s."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2457 merge-recursive.c:3271
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4780,7 +5009,7 @@
"Đường dẫn đã được cập nhật: %s được đổi tên thành %s trong %s, bên trong một "
"thư mục đã được đổi tên trong %s; di chuyển nó đến %s."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2470 merge-recursive.c:3267
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4789,7 +5018,7 @@
"XUNG ĐỘT (vị trí tệp): %s được thêm vào trong %s trong một thư mục đã được "
"đổi tên thành %s, đoán là nó nên được di chuyển đến %s."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2478 merge-recursive.c:3274
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4798,13 +5027,13 @@
"XUNG ĐỘT (vị trí tệp): %s được đổi tên thành %s trong %s, bên trong một thư "
"mục đã được đổi tên thành %s, đoán là nó nên được di chuyển đến %s."
-#: merge-ort.c:2569
+#: merge-ort.c:2634
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s và thành %s trong %s."
-#: merge-ort.c:2664
+#: merge-ort.c:2729
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4815,23 +5044,23 @@
"VÀ va chạm với một đường dẫn khác; điều này có thể dẫn đến tạo ra các xung "
"đột lồng nhau."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2748 merge-ort.c:2772
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"XUNG ĐỘT (đổi-tên/xóa): Đổi tên %s->%s trong %s, nhưng lại bị xóa trong %s."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3261 merge-recursive.c:3025
#, c-format
msgid "cannot read object %s"
msgstr "không thể đọc đối tượng %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3264 merge-recursive.c:3028
#, c-format
msgid "object %s is not a blob"
msgstr "đối tượng %s không phải là một blob"
-#: merge-ort.c:3613
+#: merge-ort.c:3693
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4840,7 +5069,7 @@
"XUNG ĐỘT (tập tin/thư mục): thư mục theo cách của %s từ %s; thay vào đó, di "
"chuyển nó đến %s."
-#: merge-ort.c:3689
+#: merge-ort.c:3770
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4849,7 +5078,7 @@
"XUNG ĐỘT (các kiểu riêng biệt): %s có các kiểu khác nhau ở mỗi bên; đã đổi "
"tên cả hai trong số chúng để mỗi cái có thể được ghi lại ở đâu đó."
-#: merge-ort.c:3696
+#: merge-ort.c:3777
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4858,24 +5087,24 @@
"XUNG ĐỘT (các kiểu riêng biệt): %s có các loại khác nhau ở mỗi bên; đã đổi "
"tên một trong số chúng để mỗi cái có thể được ghi lại ở đâu đó."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3866 merge-recursive.c:3104
msgid "content"
msgstr "nội dung"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3868 merge-recursive.c:3108
msgid "add/add"
msgstr "thêm/thêm"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3870 merge-recursive.c:3153
msgid "submodule"
msgstr "mô-đun-con"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3872 merge-recursive.c:3154
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3916
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4884,7 +5113,7 @@
"XUNG ĐỘT (sửa/xóa): %s bị xóa trong %s và sửa trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree)."
-#: merge-ort.c:4120
+#: merge-ort.c:4212
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4896,12 +5125,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4586
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "thu thập thông tin hòa trộn gặp lỗi cho cây %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3723
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4911,109 +5140,109 @@
"hòa trộn:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
msgid "Already up to date."
msgstr "Đã cập nhật rồi."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(commit sai)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo gặp lỗi đối với đường dẫn “%s”; việc hòa trộn bị bãi bỏ."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo gặp lỗi khi làm mới đối với đường dẫn “%s”; việc hòa trộn bị "
"bãi bỏ."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "gặp lỗi khi tạo đường dẫn “%s”%s"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": có lẽ là một xung đột D/F?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "từ chối đóng tập tin không được theo dõi tại “%s”"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:47
#, c-format
msgid "cannot read object %s '%s'"
msgstr "không thể đọc đối tượng %s “%s”"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "mong đợi đối tượng blob cho %s “%s”"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "gặp lỗi khi mở “%s”: %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "gặp lỗi khi tạo liên kết mềm (symlink) “%s”: %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "không hiểu phải làm gì với %06o %s “%s”"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s” đến lần chuyển giao sau đây:"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1239 merge-recursive.c:1252
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s”"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Gặp lỗi khi hòa trộn mô-đun-con “%s” (không tìm thấy các lần chuyển giao "
"theo sau hòa trộn)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1280
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không chuyển tiếp nhanh được)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1281
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Tìm thấy một giải pháp hòa trộn có thể cho mô-đun-con:\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1293
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (thấy nhiều hòa trộn đa trùng)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1437
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Lỗi: từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó ghi vào "
"%s."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5022,7 +5251,7 @@
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree)."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1514
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5031,7 +5260,7 @@
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
"của %s còn lại trong cây (tree)."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1521
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5040,7 +5269,7 @@
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree) tại %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5049,45 +5278,45 @@
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
"của %s còn lại trong cây (tree) tại %s."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "rename"
msgstr "đổi tên"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "renamed"
msgstr "đã đổi tên"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Từ chối đóng tập tin không được theo dõi tại “%s”"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1622
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Từ chối đóng tập tin không được theo dõi tại “%s”, ngay cả khi nó ở trên "
"đường."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1680
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm trong %s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1711
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1716
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó đang thêm "
"thành %s"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1743
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5096,17 +5325,17 @@
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi "
"tên \"%s\"->\"%s\" trong \"%s\"%s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1748
msgid " (left unresolved)"
msgstr " (cần giải quyết)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1840
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2103
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5117,7 +5346,7 @@
"vì thư mục %s đã bị đổi tên thành nhiều thư mục khác, với không đích đến "
"nhận một phần nhiều của các tập tin."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2237
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5126,80 +5355,80 @@
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên thư mục %s->%s trong %s. Đổi tên thư mục "
"%s->%s trong %s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modify"
msgstr "sửa đổi"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modified"
msgstr "đã sửa"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3131
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3184
#, c-format
msgid "Adding as %s instead"
msgstr "Thay vào đó thêm vào %s"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3388
#, c-format
msgid "Removing %s"
msgstr "Đang xóa %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3411
msgid "file/directory"
msgstr "tập-tin/thư-mục"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3416
msgid "directory/file"
msgstr "thư-mục/tập-tin"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3423
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"XUNG ĐỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là "
"%s"
-#: merge-recursive.c:3415
+#: merge-recursive.c:3432
#, c-format
msgid "Adding %s"
msgstr "Thêm \"%s\""
-#: merge-recursive.c:3424
+#: merge-recursive.c:3441
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "XUNG ĐỘT (thêm/thêm): Xung đột hòa trộn trong %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3494
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "hòa trộn các cây %s và %s gặp lỗi"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3588
msgid "Merging:"
msgstr "Đang trộn:"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3601
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "tìm thấy %u tổ tiên chung:"
-#: merge-recursive.c:3634
+#: merge-recursive.c:3651
msgid "merge returned no commit"
msgstr "hòa trộn không trả về lần chuyển giao nào"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3823
#, c-format
msgid "Could not parse object '%s'"
msgstr "Không thể phân tích đối tượng “%s”"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Không thể ghi bảng mục lục."
@@ -5207,190 +5436,226 @@
msgid "failed to read the cache"
msgstr "gặp lỗi khi đọc bộ nhớ đệm"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
+#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "không thể ghi tập tin lưu bảng mục lục mới"
-#: midx.c:74
+#: midx.c:79
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "fanout OID nhiều gói chỉ mục có kích thước sai"
-#: midx.c:105
+#: midx.c:112
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "tập tin đồ thị multi-pack-index %s quá nhỏ"
-#: midx.c:121
+#: midx.c:128
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "chữ ký multi-pack-index 0x%08x không khớp chữ ký 0x%08x"
-#: midx.c:126
+#: midx.c:133
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "không nhận ra phiên bản %d của multi-pack-index"
-#: midx.c:131
+#: midx.c:138
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "phiên bản băm multi-pack-index %u không khớp phiên bản %u"
-#: midx.c:148
+#: midx.c:155
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index thiếu mảnh pack-name cần thiết"
-#: midx.c:150
+#: midx.c:157
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index thiếu mảnh OID fanout cần thiết"
-#: midx.c:152
+#: midx.c:159
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index thiếu mảnh OID lookup cần thiết"
-#: midx.c:154
+#: midx.c:161
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index thiếu mảnh các khoảng bù đối tượng cần thiết"
-#: midx.c:170
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "các tên gói multi-pack-index không đúng thứ tự: “%s” trước “%s”"
-#: midx.c:214
+#: midx.c:228
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "pack-int-id sai: %u (%u các gói tổng)"
-#: midx.c:264
+#: midx.c:278
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index lưu trữ một khoảng bù 64-bít, nhưng off_t là quá nhỏ"
-#: midx.c:490
+#: midx.c:509
#, c-format
msgid "failed to add packfile '%s'"
msgstr "gặp lỗi khi thêm tập tin gói “%s”"
-#: midx.c:496
+#: midx.c:515
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "gặp lỗi khi mở pack-index “%s”"
-#: midx.c:564
+#: midx.c:583
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "gặp lỗi khi phân bổ đối tượng “%d” trong tập tin gói"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:911
msgid "cannot store reverse index file"
msgstr "không thể lưu trữ tập tin ghi mục lục đảo ngược"
-#: midx.c:920
+#: midx.c:1009
+#, c-format
+msgid "could not parse line: %s"
+msgstr "không thể phân tích cú pháp dòng: %s"
+
+#: midx.c:1011
+#, c-format
+msgid "malformed line: %s"
+msgstr "dòng dị hình: %s"
+
+#: midx.c:1181
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "bỏ qua multi-pack-index sẵn có; tổng kiểm không khớp"
-#: midx.c:943
+#: midx.c:1206
+msgid "could not load pack"
+msgstr "không thể tải gói"
+
+#: midx.c:1212
+#, c-format
+msgid "could not open index for %s"
+msgstr "không thể mở mục lục cho %s"
+
+#: midx.c:1223
msgid "Adding packfiles to multi-pack-index"
msgstr "Đang thêm tập tin gói từ multi-pack-index"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "đã không thấy tập tin gói %s để mà xóa"
-
-#: midx.c:1034
+#: midx.c:1266
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "không hiểu \"preferred pack\": %s"
-#: midx.c:1039
+#: midx.c:1311
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "không thể chọn gói ưa dùng %s với không đối tượng nào"
+
+#: midx.c:1343
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "đã không thấy tập tin gói %s để mà xóa"
+
+#: midx.c:1389
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "\"preferred pack\" “%s” đã hết hạn"
-#: midx.c:1055
+#: midx.c:1402
msgid "no pack files to index."
msgstr "không có tập tin gói để đánh mục lục."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1409
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "từ chối ghi “multi-pack bitmap” mà không có bất kỳ đối tượng nào"
+
+#: midx.c:1451
+msgid "could not write multi-pack bitmap"
+msgstr "không thể ghi “multi-pack bitmap”"
+
+#: midx.c:1461
+msgid "could not write multi-pack-index"
+msgstr "không thể ghi “multi-pack-index”"
+
+#: midx.c:1520 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "gặp lỗi khi gỡ bỏ %s"
-#: midx.c:1166
+#: midx.c:1553
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "gặp lỗi khi xóa multi-pack-index tại %s"
-#: midx.c:1225
+#: midx.c:1616
msgid "multi-pack-index file exists, but failed to parse"
msgstr "đã có tập tin multi-pack-index, nhưng gặp lỗi khi phân tích cú pháp"
-#: midx.c:1233
+#: midx.c:1624
msgid "incorrect checksum"
msgstr "tổng kiểm không đúng"
-#: midx.c:1236
+#: midx.c:1627
msgid "Looking for referenced packfiles"
msgstr "Đang khóa cho các gói bị tham chiếu"
-#: midx.c:1251
+#: midx.c:1642
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "fanout cũ sai thứ tự: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1647
msgid "the midx contains no oid"
msgstr "midx chẳng chứa oid nào"
-#: midx.c:1265
+#: midx.c:1656
msgid "Verifying OID order in multi-pack-index"
msgstr "Thẩm tra thứ tự OID trong multi-pack-index"
-#: midx.c:1274
+#: midx.c:1665
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "lookup cũ sai thứ tự: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1685
msgid "Sorting objects by packfile"
msgstr "Đang sắp xếp các đối tượng theo tập tin gói"
-#: midx.c:1301
+#: midx.c:1692
msgid "Verifying object offsets"
msgstr "Đang thẩm tra các khoảng bù đối tượng"
-#: midx.c:1317
+#: midx.c:1708
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "gặp lỗi khi tải mục gói cho oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1714
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "gặp lỗi khi tải pack-index cho tập tin gói %s"
-#: midx.c:1332
+#: midx.c:1723
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
"khoảng bù đối tượng không đúng cho oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1750
msgid "Counting referenced objects"
msgstr "Đang đếm các đối tượng được tham chiếu"
-#: midx.c:1367
+#: midx.c:1760
msgid "Finding and deleting unreferenced packfiles"
msgstr "Đang tìm và xóa các gói không được tham chiếu"
-#: midx.c:1558
+#: midx.c:1952
msgid "could not start pack-objects"
msgstr "không thể lấy thông tin thống kê về các đối tượng gói"
-#: midx.c:1578
+#: midx.c:1972
msgid "could not finish pack-objects"
msgstr "không thể hoàn thiện các đối tượng gói"
@@ -5409,7 +5674,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "không thể gia nhập tuyến lazy_name: %s"
-#: notes-merge.c:277
+#: notes-merge.c:276
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -5421,7 +5686,7 @@
"chuyển giao hay bãi bỏ lần hòa trộn trước đây và bắt đầu một hòa trộn ghi "
"chú mới."
-#: notes-merge.c:284
+#: notes-merge.c:283
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Bạn chưa kết thúc việc hòa trộn ghi chú (%s vẫn tồn tại)."
@@ -5451,273 +5716,344 @@
msgid "Bad %s value: '%s'"
msgstr "Giá trị %s sai: “%s”"
-#: object-file.c:526
+#: object-file.c:457
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"thư mục đối tượng %s không tồn tại; kiểm tra .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:515
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "không thể thường hóa đường dẫn đối tượng thay thế: “%s”"
-#: object-file.c:658
+#: object-file.c:589
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: đang bỏ qua kho đối tượng thay thế, lồng nhau quá sâu"
-#: object-file.c:665
+#: object-file.c:596
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "không thể chuẩn hóa thư mục đối tượng: “%s”"
-#: object-file.c:708
+#: object-file.c:639
msgid "unable to fdopen alternates lockfile"
msgstr "không thể fdopen tập tin khóa thay thế"
-#: object-file.c:726
+#: object-file.c:657
msgid "unable to read alternates file"
msgstr "không thể đọc tập tin thay thế"
-#: object-file.c:733
+#: object-file.c:664
msgid "unable to move new alternates file into place"
msgstr "không thể di chuyển tập tin thay thế vào chỗ"
-#: object-file.c:768
+#: object-file.c:742
#, c-format
msgid "path '%s' does not exist"
msgstr "đường dẫn “%s” không tồn tại"
-#: object-file.c:789
+#: object-file.c:763
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "kho tham chiếu “%s” như là lấy ra liên kết vẫn chưa được hỗ trợ."
-#: object-file.c:795
+#: object-file.c:769
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "kho tham chiếu “%s” không phải là một kho nội bộ."
-#: object-file.c:801
+#: object-file.c:775
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "kho tham chiếu “%s” là nông"
-#: object-file.c:809
+#: object-file.c:783
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "kho tham chiếu “%s” bị cấy ghép"
-#: object-file.c:869
+#: object-file.c:814
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "không thể tìm thấy thư mục đối tượng khớp với “%s”"
+
+#: object-file.c:864
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "dòng không hợp lệ trong khi phân tích các tham chiếu thay thế: %s"
-#: object-file.c:1019
+#: object-file.c:1014
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1049
#, c-format
msgid "mmap failed%s"
msgstr "mmap gặp lỗi%s"
-#: object-file.c:1218
+#: object-file.c:1230
#, c-format
msgid "object file %s is empty"
msgstr "tập tin đối tượng %s trống rỗng"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1349 object-file.c:2588
#, c-format
msgid "corrupt loose object '%s'"
msgstr "đối tượng mất hỏng “%s”"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1351 object-file.c:2592
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "gặp rác tại cuối của đối tượng bị mất “%s”"
-#: object-file.c:1397
+#: object-file.c:1473
+#, c-format
+msgid "unable to parse %s header"
+msgstr "không thể phân tích phần đầu của “%s”"
+
+#: object-file.c:1475
msgid "invalid object type"
msgstr "kiểu đối tượng không hợp lệ"
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "không thể giải nén phần đầu gói %s với --allow-unknown-type"
-
-#: object-file.c:1484
+#: object-file.c:1486
#, c-format
msgid "unable to unpack %s header"
msgstr "không thể giải gói phần đầu %s"
#: object-file.c:1490
#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "không thể phân tích phần đầu gói %s với --allow-unknown-type"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "phần đầu cho %s quá dài, vượt quá %d byte"
-#: object-file.c:1493
-#, c-format
-msgid "unable to parse %s header"
-msgstr "không thể phân tích phần đầu của “%s”"
-
-#: object-file.c:1717
+#: object-file.c:1720
#, c-format
msgid "failed to read object %s"
msgstr "gặp lỗi khi đọc đối tượng “%s”"
-#: object-file.c:1721
+#: object-file.c:1724
#, c-format
msgid "replacement %s not found for %s"
msgstr "c%s thay thế không được tìm thấy cho %s"
-#: object-file.c:1725
+#: object-file.c:1728
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "đối tượng mất %s (được lưu trong %s) bị hỏng"
-#: object-file.c:1729
+#: object-file.c:1732
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "đối tượng đã đóng gói %s (được lưu trong %s) bị hỏng"
-#: object-file.c:1834
+#: object-file.c:1855
#, c-format
msgid "unable to write file %s"
msgstr "không thể ghi tập tin %s"
-#: object-file.c:1841
+#: object-file.c:1862
#, c-format
msgid "unable to set permission to '%s'"
msgstr "không thể đặt quyền thành “%s”"
-#: object-file.c:1848
+#: object-file.c:1869
msgid "file write error"
msgstr "lỗi ghi tập tin"
-#: object-file.c:1868
+#: object-file.c:1904
msgid "error when closing loose object file"
msgstr "gặp lỗi trong khi đóng tập tin đối tượng"
-#: object-file.c:1933
+#: object-file.c:1971
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"không đủ thẩm quyền để thêm một đối tượng vào cơ sở dữ liệu kho chứa %s"
-#: object-file.c:1935
+#: object-file.c:1973
msgid "unable to create temporary file"
msgstr "không thể tạo tập tin tạm thời"
-#: object-file.c:1959
+#: object-file.c:1997
msgid "unable to write loose object file"
msgstr "không thể ghi tập tin đối tượng đã mất"
-#: object-file.c:1965
+#: object-file.c:2003
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "không thể xả nén đối tượng mới %s (%d)"
-#: object-file.c:1969
+#: object-file.c:2007
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd trên đối tượng %s gặp lỗi (%d)"
-#: object-file.c:1973
+#: object-file.c:2011
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "chưa rõ ràng baowir dữ liệu nguồn đối tượng không ổn định cho %s"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:2022 builtin/pack-objects.c:1251
#, c-format
msgid "failed utime() on %s"
msgstr "gặp lỗi utime() trên “%s”"
-#: object-file.c:2060
+#: object-file.c:2100
#, c-format
msgid "cannot read object for %s"
msgstr "không thể đọc đối tượng cho %s"
-#: object-file.c:2111
+#: object-file.c:2151
msgid "corrupt commit"
msgstr "lần chuyển giao sai hỏng"
-#: object-file.c:2119
+#: object-file.c:2159
msgid "corrupt tag"
msgstr "thẻ sai hỏng"
-#: object-file.c:2219
+#: object-file.c:2259
#, c-format
msgid "read error while indexing %s"
msgstr "gặp lỗi đọc khi đánh mục lục %s"
-#: object-file.c:2222
+#: object-file.c:2262
#, c-format
msgid "short read while indexing %s"
msgstr "không đọc ngắn khi đánh mục lục %s"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2335 object-file.c:2345
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: gặp lỗi khi thêm vào cơ sở dữ liệu"
-#: object-file.c:2311
+#: object-file.c:2351
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: kiểu tập tin không được hỗ trợ"
-#: object-file.c:2335
+#: object-file.c:2375 builtin/fetch.c:1494
#, c-format
msgid "%s is not a valid object"
msgstr "%s không phải là một đối tượng hợp lệ"
-#: object-file.c:2337
+#: object-file.c:2377
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s không phải là một đối tượng “%s” hợp lệ"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2404
#, c-format
msgid "unable to open %s"
msgstr "không thể mở %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2599
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "mã băm không khớp cho %s (cần %s)"
-#: object-file.c:2583
+#: object-file.c:2622
#, c-format
msgid "unable to mmap %s"
msgstr "không thể mmap %s"
-#: object-file.c:2588
+#: object-file.c:2628
#, c-format
msgid "unable to unpack header of %s"
msgstr "không thể giải gói phần đầu của “%s”"
-#: object-file.c:2594
+#: object-file.c:2633
#, c-format
msgid "unable to parse header of %s"
msgstr "không thể phân tích phần đầu của “%s”"
-#: object-file.c:2605
+#: object-file.c:2644
#, c-format
msgid "unable to unpack contents of %s"
msgstr "không thể giải gói nội dung của “%s”"
-#: object-name.c:480
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c:382
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [đối tượng sai.]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c:407
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s lần chuyển giao %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c:428
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s thẻ %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#. "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c:439
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [thẻ sai, không thể phân tích cú pháp nó]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c:447
+#, c-format
+msgid "%s tree"
+msgstr "%s tree"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c:453
+#, c-format
+msgid "%s blob"
+msgstr "%s blob"
+
+#: object-name.c:569
#, c-format
msgid "short object ID %s is ambiguous"
msgstr "mã đối tượng dạng rút gọn %s chưa rõ ràng"
-#: object-name.c:491
-msgid "The candidates are:"
-msgstr "Các ứng cử là:"
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c:591
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Các ứng cử là:\n"
+"%s"
-#: object-name.c:790
+#: object-name.c:888
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5741,22 +6077,22 @@
"này\n"
"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
-#: object-name.c:910
+#: object-name.c:1008
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "nhật ký cho “%.*s” chỉ trở lại đến %s"
-#: object-name.c:918
+#: object-name.c:1016
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "nhật ký cho “%.*s” chỉ có %d mục"
-#: object-name.c:1696
+#: object-name.c:1794
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "đường dẫn “%s” có ở trên đĩa, nhưng không trong “%.*s”"
-#: object-name.c:1702
+#: object-name.c:1800
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
@@ -5765,12 +6101,12 @@
"đường dẫn “%s” tồn tại, nhưng không phải “%s”\n"
"gợi ý: Có phải ý bạn là “%.*s:%s” aka “%.*s:./%s”?"
-#: object-name.c:1711
+#: object-name.c:1809
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "đường dẫn “%s” không tồn tại trong “%.*s”"
-#: object-name.c:1739
+#: object-name.c:1837
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
@@ -5779,7 +6115,7 @@
"đường dẫn “%s” nằm trong chỉ mục, nhưng không phải ở giai đoạn %d\n"
"gợi ý: Có phải ý bạn là “:%d:%s”?"
-#: object-name.c:1755
+#: object-name.c:1853
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
@@ -5788,21 +6124,26 @@
"đường dẫn “%s” nằm trong chỉ mục, nhưng không phải “%s”\n"
"gợi ý: Có phải ý bạn là “:% d:%s “ aka “:%d:./%s”?"
-#: object-name.c:1763
+#: object-name.c:1861
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "đường dẫn “%s” tồn tại trên đĩa, nhưng không có trong chỉ mục"
-#: object-name.c:1765
+#: object-name.c:1863
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "đường dẫn “%s” không tồn tại (không trên đĩa cũng không trong mục lục)"
-#: object-name.c:1778
+#: object-name.c:1876
msgid "relative path syntax can't be used outside working tree"
msgstr "cú pháp đường dẫn tương đối không thể thể dùng ngoài cây làm việc"
-#: object-name.c:1916
+#: object-name.c:1901
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<object>:<path> cần cả hai, nhưng chỉ <object> '%s' được đưa ra"
+
+#: object-name.c:2014
#, c-format
msgid "invalid object name '%.*s'."
msgstr "“%.*s” không phải là tên đối tượng hợp lệ."
@@ -5827,17 +6168,30 @@
msgid "unable to parse object: %s"
msgstr "không thể phân tích đối tượng: “%s”"
-#: object.c:283 object.c:295
+#: object.c:283 object.c:294
#, c-format
msgid "hash mismatch %s"
msgstr "mã băm không khớp %s"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "ánh xạ multi-pack thiếu mục lục để dành cần thiết"
+
+#: pack-bitmap.c:433
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: không thể mở gói"
+
+#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
#, c-format
msgid "unable to get size of %s"
msgstr "không thể lấy kích cỡ của %s"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1937
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "không thể tìm thấy %s trong gói “%s” tại vị trí %<PRIuMAX>"
+
+#: pack-bitmap.c:1973 builtin/rev-list.c:91
#, c-format
msgid "unable to get disk usage of %s"
msgstr "không thể dung lượng đĩa đã dùng của %s"
@@ -5867,130 +6221,135 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "tệp chỉ mục ngược %s có id mã băm không được hỗ trợ %<PRIu32>"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "không thể cùng lúc đọc và xác minh được bảng mục lục đảo ngược"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "không thể lấy thông tin thống kê: %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "gặp lỗi làm cho %s đọc được"
-#: pack-write.c:522
+#: pack-write.c:521
#, c-format
msgid "could not write '%s' promisor file"
msgstr "không thể ghi tập tin promisor “%s”"
-#: packfile.c:625
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx hỏng à?)"
-#: packfile.c:655
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "tập tin gói %s không thể được ánh xạ %s"
-#: packfile.c:1934
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "vị trí tương đối nằm trước chỉ mục gói cho %s (mục lục bị hỏng à?)"
-#: packfile.c:1938
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"vị trí tương đối vượt quá cuối của chỉ mục gói cho %s (mục lục bị cắt cụt à?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "tùy chọn “%s” cần một giá trị bằng số"
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "ngày tháng hết hạn dị hình “%s”"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "tùy chọn “%s” cần \"always\", \"auto\", hoặc \"never\""
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "tên đối tượng dị hình “%s”"
-#: parse-options.c:38
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "tùy chọn “%s” cần \"%s\" hoặc \"%s\""
+
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "“%s” yêu cầu một giá trị"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s là xung khắc với %s"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s : xung khắc với các cái khác"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s k nhận giá trị"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s không sẵn có"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s cần một giá trị dạng số không âm với một hậu tố tùy chọn k/m/g"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "tùy chọn chưa rõ rang: %s (nên là --%s%s hay --%s%s)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "có phải ý bạn là “--%s“ (với hai dấu gạch ngang)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "bí danh của --%s"
-#: parse-options.c:879
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "không hiểu tùy chọn “%s”"
-#: parse-options.c:881
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "không hiểu tùy chọn “%c”"
-#: parse-options.c:883
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "không hiểu tùy chọn non-ascii trong chuỗi: “%s”"
-#: parse-options.c:907
+#: parse-options.c:920
msgid "..."
msgstr "…"
-#: parse-options.c:926
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "cách dùng: %s"
@@ -5998,49 +6357,73 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " hoặc: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-SỐ"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "Không thể làm %s được ghi bởi nhóm"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"Ký tự thoát chuỗi “\\” không được phép là ký tự cuối trong giá trị thuộc tính"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Chỉ có một đặc tả “attr:” là được phép."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "đặc tả attr phải không được để trống"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "tên thuộc tính không hợp lệ %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"các cài đặt đặc tả đường dẫn “glob” và “noglob” toàn cục là xung khắc nhau"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6048,51 +6431,51 @@
"cài đặt đặc tả đường dẫn “literal” toàn cục là xung khắc với các cài đặt đặc "
"tả đường dẫn toàn cục khác"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "tham số không hợp lệ cho “tiền tố” màu nhiệm đặc tả đường đẫn"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Số màu nhiệm đặc tả đường dẫn không hợp lệ “%.*s” trong “%s”"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Thiếu “)” tại cuối của số màu nhiệm đặc tả đường dẫn trong “%s”"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Chưa viết mã cho số màu nhiệm đặc tả đường dẫn “%c” trong “%s”"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: “literal” và “glob” xung khắc nhau"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: “%s” ngoài một kho chứa tại “%s”"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "“%s” (mnemonic: “%c”)"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: số mầu nhiệm đặc tả đường dẫn chưa được hỗ trợ bởi lệnh này: %s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "đặc tả đường dẫn “%s” vượt ra ngoài liên kết mềm"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "dòng được trích dẫn sai: %s"
@@ -6113,7 +6496,7 @@
msgid "flush packet write failed"
msgstr "gặp lỗi khi ghi vào tập tin gói lúc đẩy dữ liệu lên bộ nhớ"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "lỗi giao thức: không thể làm được dòng dài"
@@ -6121,7 +6504,7 @@
msgid "packet write with format failed"
msgstr "gặp lỗi khi ghi gói có định dạng"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr "gặp lỗi khi ghi gói - dữ liệu vượt quá cỡ vói tối đa"
@@ -6130,25 +6513,25 @@
msgid "packet write failed: %s"
msgstr "gặp lỗi khi ghi gói: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "lỗi đọc"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "máy chủ bị treo bất ngờ"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "lỗi giao thức: ký tự chiều dài dòng bị sai: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "lỗi giao thức: chiều dài dòng bị sai %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "lỗi máy chủ: %s"
@@ -6162,7 +6545,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "không thể tạo tuyến trình lstat: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "không thể phân tích định dạng --pretty"
@@ -6192,20 +6575,20 @@
msgid "Removing duplicate objects"
msgstr "Đang gỡ các đối tượng trùng lặp"
-#: range-diff.c:78
+#: range-diff.c:68
msgid "could not start `log`"
msgstr "không thể lấy thông tin thống kê về “log“"
-#: range-diff.c:80
+#: range-diff.c:70
msgid "could not read `log` output"
msgstr "không thể đọc kết xuất “log”"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:98 sequencer.c:5575
#, c-format
msgid "could not parse commit '%s'"
msgstr "không thể phân tích lần chuyển giao “%s”"
-#: range-diff.c:115
+#: range-diff.c:109
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6214,70 +6597,66 @@
"không thể phân tích cú pháp dòng đầu tiên của đầu ra “log”: không bắt đầu "
"bằng “commit ”: “%s”"
-#: range-diff.c:140
+#: range-diff.c:132
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "không thể phân tích cú pháp phần đầu git “%.*s”"
-#: range-diff.c:307
+#: range-diff.c:300
msgid "failed to generate diff"
msgstr "gặp lỗi khi tạo khác biệt"
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only và --right-only loại từ lẫn nhau"
-
-#: range-diff.c:562 range-diff.c:564
+#: range-diff.c:558 range-diff.c:560
#, c-format
msgid "could not parse log for '%s'"
msgstr "không thể phân tích nhật ký cho “%s”"
-#: read-cache.c:710
+#: read-cache.c:737
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
"sẽ không thêm các bí danh “%s” (“%s” đã có từ trước trong bảng mục lục)"
-#: read-cache.c:726
+#: read-cache.c:753
msgid "cannot create an empty blob in the object database"
msgstr "không thể tạo một blob rỗng trong cơ sở dữ liệu đối tượng"
-#: read-cache.c:748
+#: read-cache.c:775
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s: chỉ có thể thêm tập tin thông thường, liên kết mềm hoặc git-directories"
-#: read-cache.c:753
+#: read-cache.c:780 builtin/submodule--helper.c:3359
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "“%s” không có một lần chuyển giao nào được lấy ra"
-#: read-cache.c:805
+#: read-cache.c:832
#, c-format
msgid "unable to index file '%s'"
msgstr "không thể đánh mục lục tập tin “%s”"
-#: read-cache.c:824
+#: read-cache.c:851
#, c-format
msgid "unable to add '%s' to index"
msgstr "không thể thêm %s vào bảng mục lục"
-#: read-cache.c:835
+#: read-cache.c:862
#, c-format
msgid "unable to stat '%s'"
msgstr "không thể lấy thống kê “%s”"
-#: read-cache.c:1358
+#: read-cache.c:1404
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "%s có vẻ không phải là tập tin và cũng chẳng phải là một thư mục"
-#: read-cache.c:1573
+#: read-cache.c:1619
msgid "Refresh index"
msgstr "Làm tươi mới bảng mục lục"
-#: read-cache.c:1705
+#: read-cache.c:1751
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6286,7 +6665,7 @@
"index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
"Dùng phiên bản %i"
-#: read-cache.c:1715
+#: read-cache.c:1761
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6295,143 +6674,147 @@
"GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
"Dùng phiên bản %i"
-#: read-cache.c:1771
+#: read-cache.c:1817
#, c-format
msgid "bad signature 0x%08x"
msgstr "chữ ký sai 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1820
#, c-format
msgid "bad index version %d"
msgstr "phiên bản mục lục sai %d"
-#: read-cache.c:1783
+#: read-cache.c:1829
msgid "bad index file sha1 signature"
msgstr "chữ ký dạng sha1 cho tập tin mục lục không đúng"
-#: read-cache.c:1817
+#: read-cache.c:1863
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "mục lục dùng phần mở rộng %.4s, cái mà chúng tôi không hiểu được"
-#: read-cache.c:1819
+#: read-cache.c:1865
#, c-format
msgid "ignoring %.4s extension"
msgstr "đang lờ đi phần mở rộng %.4s"
-#: read-cache.c:1856
+#: read-cache.c:1902
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "không hiểu định dạng mục lục 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1918
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "trường tên sai sạng trong mục lục, gần đường dẫn “%s”"
-#: read-cache.c:1929
+#: read-cache.c:1975
msgid "unordered stage entries in index"
msgstr "các mục tin stage không đúng thứ tự trong mục lục"
-#: read-cache.c:1932
+#: read-cache.c:1978
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "nhiều mục stage cho tập tin hòa trộn “%s”"
-#: read-cache.c:1935
+#: read-cache.c:1981
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "các mục tin stage không đúng thứ tự cho “%s”"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
+#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
+#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
+#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
+#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
+#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
msgid "index file corrupt"
msgstr "tập tin ghi bảng mục lục bị hỏng"
-#: read-cache.c:2185
+#: read-cache.c:2240
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "không thể tạo tuyến load_cache_entries: %s"
-#: read-cache.c:2198
+#: read-cache.c:2253
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "không thể gia nhập tuyến load_cache_entries: %s"
-#: read-cache.c:2231
+#: read-cache.c:2286
#, c-format
msgid "%s: index file open failed"
msgstr "%s: mở tập tin mục lục gặp lỗi"
-#: read-cache.c:2235
+#: read-cache.c:2290
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: không thể lấy thống kê bảng mục lục đã mở"
-#: read-cache.c:2239
+#: read-cache.c:2294
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: tập tin mục lục nhỏ hơn mong đợi"
-#: read-cache.c:2243
+#: read-cache.c:2298
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: không thể ánh xạ tập tin mục lục%s"
-#: read-cache.c:2286
+#: read-cache.c:2341
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "không thể tạo tuyến load_index_extensions: %s"
-#: read-cache.c:2313
+#: read-cache.c:2368
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "không thể gia nhập tuyến load_index_extensions: %s"
-#: read-cache.c:2351
+#: read-cache.c:2414
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "không thể làm tươi mới mục lục đã chia sẻ “%s”"
-#: read-cache.c:2398
+#: read-cache.c:2473
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "mục lục bị hỏng, cần %s trong %s, nhưng lại nhận được %s"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3032
+msgid "cannot write split index for a sparse index"
+msgstr "không thể ghi mục lục chia tách cho \"sparse index\""
+
+#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
#, c-format
msgid "could not close '%s'"
msgstr "không thể đóng “%s”"
-#: read-cache.c:3075
+#: read-cache.c:3157
msgid "failed to convert to a sparse-index"
msgstr "gặp lỗi khi chuyển đổi sang \"sparse-index\""
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3228
#, c-format
msgid "could not stat '%s'"
msgstr "không thể lấy thông tin thống kê về “%s”"
-#: read-cache.c:3159
+#: read-cache.c:3241
#, c-format
msgid "unable to open git dir: %s"
msgstr "không thể mở thư mục git: %s"
-#: read-cache.c:3171
+#: read-cache.c:3253
#, c-format
msgid "unable to unlink: %s"
msgstr "không thể bỏ liên kết (unlink): “%s”"
-#: read-cache.c:3200
+#: read-cache.c:3282
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "không thể sửa các bít phân quyền trên “%s”"
-#: read-cache.c:3349
+#: read-cache.c:3439
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: không thể xóa bỏ stage #0"
@@ -6513,7 +6896,7 @@
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] "Cải tổ %s vào %s (%d lệnh )"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6522,7 +6905,7 @@
"Đừng xóa bất kỳ dòng nào. Dùng “drop” một cách rõ ràng để xóa bỏ một lần "
"chuyển giao.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6530,7 +6913,7 @@
"\n"
"Nếu bạn xóa bỏ một dòng ở đây thì LẦN CHUYỂN GIAO ĐÓ SẼ MẤT.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6544,7 +6927,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6554,14 +6937,14 @@
"Tuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
+#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
+#: builtin/rebase.c:191
#, c-format
msgid "could not write '%s'"
msgstr "không thể ghi “%s”"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "không thể ghi “%s”."
@@ -6593,14 +6976,12 @@
"Cánh ứng xử có thể là: ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "không thể đọc “%s”."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: “preserve” bị cấm bởi “merges”"
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2057
msgid "gone"
msgstr "đã ra đi"
@@ -6619,132 +7000,108 @@
msgid "ahead %d, behind %d"
msgstr "trước %d, sau %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "cần định dạng: %%(color:<color>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
-msgstr "không nhận ra màu: %%(màu:%s)"
+msgstr "không nhận ra màu: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "đối số không được thừa nhận %%(%s): %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) không nhận các đối số"
-#: ref-filter.c:339
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "tham số không được thừa nhận %%(objectname): %s"
-
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) không nhận các đối số"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) không nhận các đối số"
-#: ref-filter.c:372
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "tham số không được thừa nhận %%(subject): %s"
-
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "cần %%(trailers:key=<giá trị>)"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "không hiểu tham số %%(trailers): %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "cần nội dung mang giá trị dương:lines=%s"
-#: ref-filter.c:426
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "đối số không được thừa nhận %%(contents): %s"
-
-#: ref-filter.c:441
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "cần giá trị dương “%s” trong %%(%s)"
-#: ref-filter.c:445
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "đối số “%s” không được thừa nhận trong %%(%s)"
-
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "không nhận ra tùy chọn thư điện tử: “%s”"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "cần định dạng: %%(align:<width>,<position>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "vị trí không được thừa nhận:%s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "chiều rộng không được thừa nhận:%s"
-#: ref-filter.c:517
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "đối số không được thừa nhận %%(align): %s"
-
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "cần giá trị độ rộng dương với nguyên tử %%(align)"
-#: ref-filter.c:543
+#: ref-filter.c:568
#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "đối số không được thừa nhận %%(if): %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) không nhận các đối số"
-#: ref-filter.c:645
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "tên trường dị hình: %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "không hiểu tên trường: %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
@@ -6752,126 +7109,131 @@
"không phải là một kho git, nhưng trường “%.*s” yêu cầu truy cập vào dữ liệu "
"đối tượng"
-#: ref-filter.c:801
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "định dạng: nguyên tử %%(%s) được dùng mà không có nguyên tử %%(%s)"
-#: ref-filter.c:865
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "định dạng: nguyên tử %%(then) được dùng mà không có nguyên tử %%(if)"
-
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "định dạng: nguyên tử %%(then) được dùng nhiều hơn một lần"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)"
-#: ref-filter.c:897
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(if)"
-
-#: ref-filter.c:899
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(then)"
-
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "định dạng: nguyên tử %%(else) được dùng nhiều hơn một lần"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "định dạng: nguyên tử %%(end) được dùng mà không có nguyên tử tương ứng"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "chuỗi định dạng dị hình %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "lệnh này từ chối atom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s không thể được dùng với --python, --shell, --tcl"
+
+#: ref-filter.c:1707
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(không nhánh, đang cải tổ %s)"
-#: ref-filter.c:1624
+#: ref-filter.c:1710
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(không nhánh, đang cải tổ HEAD %s đã tách rời)"
-#: ref-filter.c:1627
+#: ref-filter.c:1713
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)"
-#: ref-filter.c:1631
+#: ref-filter.c:1717
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD được tách rời tại %s)"
-#: ref-filter.c:1634
+#: ref-filter.c:1720
#, c-format
msgid "(HEAD detached from %s)"
-msgstr "(HEAD được tách rời từ %s)"
+msgstr "(HEAD được tách rời khỏi %s)"
-#: ref-filter.c:1637
+#: ref-filter.c:1723
msgid "(no branch)"
msgstr "(không nhánh)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1755 ref-filter.c:1973
#, c-format
msgid "missing object %s for %s"
msgstr "thiếu đối tượng %s cho %s"
-#: ref-filter.c:1679
+#: ref-filter.c:1765
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer gặp lỗi trên %s cho %s"
-#: ref-filter.c:2064
+#: ref-filter.c:2156
#, c-format
msgid "malformed object at '%s'"
msgstr "đối tượng dị hình tại “%s”"
-#: ref-filter.c:2153
+#: ref-filter.c:2246
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "đang lờ đi tham chiếu với tên hỏng %s"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2251 refs.c:672
#, c-format
msgid "ignoring broken ref %s"
msgstr "đang lờ đi tham chiếu hỏng %s"
-#: ref-filter.c:2502
+#: ref-filter.c:2630
#, c-format
msgid "format: %%(end) atom missing"
msgstr "định dạng: thiếu nguyên tử %%(end)"
-#: ref-filter.c:2596
+#: ref-filter.c:2741
#, c-format
msgid "malformed object name %s"
msgstr "tên đối tượng dị hình %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2746
#, c-format
msgid "option `%s' must point to a commit"
msgstr "tùy chọn “%s” phải chỉ đến một lần chuyển giao"
-#: refs.c:264
+#: reflog.c:407
+#, c-format
+msgid "not a reflog: %s"
+msgstr "không phải một reflog: %s"
+
+#: reflog.c:410
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "không reflog cho “%s”"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "“%s” không chỉ đến một lần chuyển giao hợp lệ nào cả!"
-#: refs.c:566
+#: refs.c:561
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6885,43 +7247,43 @@
"\n"
"\tgit branch -m <name>\n"
msgstr ""
-"Sử dụng '%s' làm tên cho nhánh ban đầu. Tên nhánh mặc định này\n"
+"Sử dụng “%s” làm tên cho nhánh ban đầu. Tên nhánh mặc định này\n"
"có thể thay đổi. Để cấu hình tên nhánh khởi đầu sử dụng trong tất cả\n"
"kho lưu trữ mới của bạn, cái mà sẽ ngăn chặn cảnh báo này, gọi lệnh:\n"
"\n"
"\tgit config --global init.defaultBranch <tên>\n"
"\n"
-"Tên thường được chọn thay cho 'master' là 'main', 'trunk' và\n"
-"'development'. Nhánh vừa tạo có thể được đổi tên thông qua lệnh:\n"
+"Tên thường được chọn thay cho “master” là “main”, “trunk” và\n"
+"“development”. Nhánh vừa tạo có thể được đổi tên thông qua lệnh:\n"
"\n"
"\tgit branch -m <tên>\n"
-#: refs.c:588
+#: refs.c:583
#, c-format
msgid "could not retrieve `%s`"
msgstr "không thể lấy về “%s”"
-#: refs.c:598
+#: refs.c:593
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "tên nhánh không hợp lệ: %s = %s"
-#: refs.c:674
+#: refs.c:670
#, c-format
msgid "ignoring dangling symref %s"
msgstr "đang lờ đi tham chiếu mềm thừa %s"
-#: refs.c:922
+#: refs.c:919
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "nhật ký cho tham chiếu %s có khoảng trống sau %s"
-#: refs.c:929
+#: refs.c:926
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "nhật ký cho tham chiếu %s kết thúc bất ngờ trên %s"
-#: refs.c:994
+#: refs.c:991
#, c-format
msgid "log for %s is empty"
msgstr "nhật ký cho %s trống rỗng"
@@ -6931,46 +7293,46 @@
msgid "refusing to update ref with bad name '%s'"
msgstr "từ chối cập nhật tham chiếu với tên sai “%s”"
-#: refs.c:1157
+#: refs.c:1164
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref bị lỗi cho ref “%s”: %s"
-#: refs.c:2051
+#: refs.c:2059
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "không cho phép đa cập nhật cho tham chiếu “%s”"
-#: refs.c:2131
+#: refs.c:2145
msgid "ref updates forbidden inside quarantine environment"
msgstr "cập nhật tham chiếu bị cấm trong môi trường kiểm tra"
-#: refs.c:2142
+#: refs.c:2156
msgid "ref updates aborted by hook"
msgstr "các cập nhật tham chiếu bị bãi bỏ bởi móc"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2264 refs.c:2294
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "“%s” sẵn có; không thể tạo “%s”"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2270 refs.c:2305
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "không thể xử lý “%s” và “%s” cùng một lúc"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1295
#, c-format
msgid "could not remove reference %s"
msgstr "không thể gỡ bỏ tham chiếu: %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1310 refs/packed-backend.c:1565
+#: refs/packed-backend.c:1575
#, c-format
msgid "could not delete reference %s: %s"
msgstr "không thể xóa bỏ tham chiếu %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1313 refs/packed-backend.c:1578
#, c-format
msgid "could not delete references: %s"
msgstr "không thể xóa bỏ tham chiếu: %s"
@@ -6980,50 +7342,50 @@
msgid "invalid refspec '%s'"
msgstr "refspec không hợp lệ “%s”"
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "cấu hình viết tắt máy chủ không thể bắt đầu bằng “/”: %s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "đã đưa ra nhiều hơn một gói nhận về, đang sử dụng cái đầu tiên"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "đã đưa ra nhiều hơn một gói tải lên, đang sử dụng cái đầu tiên"
-#: remote.c:590
+#: remote.c:698
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Không thể lấy về cả %s và %s cho %s"
-#: remote.c:594
+#: remote.c:702
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s thường theo dõi %s, không phải %s"
-#: remote.c:598
+#: remote.c:706
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s theo dõi cả %s và %s"
-#: remote.c:666
+#: remote.c:774
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "khóa “%s” của mẫu k có “*”"
-#: remote.c:676
+#: remote.c:784
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "giá trị “%s” của mẫu k có “*”"
-#: remote.c:1083
+#: remote.c:1191
#, c-format
msgid "src refspec %s does not match any"
msgstr "refspec %s nguồn không khớp bất kỳ cái gì"
-#: remote.c:1088
+#: remote.c:1196
#, c-format
msgid "src refspec %s matches more than one"
msgstr "refspec %s nguồn khớp nhiều hơn một"
@@ -7032,7 +7394,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1211
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -7057,7 +7419,7 @@
"Nếu cả hai là không thể, thì chúng tôi cũng chịu thua. Bạn phải dùng tham "
"chiếu dạng đầy đủ."
-#: remote.c:1123
+#: remote.c:1231
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -7068,7 +7430,7 @@
"Có phải ý bạn là một tạo một nhánh mới bằng cách đẩy lên\n"
"“%s:refs/heads/%s”?"
-#: remote.c:1128
+#: remote.c:1236
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -7079,7 +7441,7 @@
"Có phải ý bạn là một tạo một thẻ mới bằng cách đẩy lên\n"
"“%s:refs/tags/%s”?"
-#: remote.c:1133
+#: remote.c:1241
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -7090,7 +7452,7 @@
"Có phải ý bạn là một tạo một cây mới bằng cách đẩy lên\n"
"“%s:refs/tags/%s”?"
-#: remote.c:1138
+#: remote.c:1246
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -7101,115 +7463,115 @@
"Có phải ý bạn là một tạo một blob mới bằng cách đẩy lên\n"
"“%s:refs/tags/%s”?"
-#: remote.c:1174
+#: remote.c:1282
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "“%s” không thể được phân giải thành nhánh"
-#: remote.c:1185
+#: remote.c:1293
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "không thể xóa “%s”: tham chiếu trên máy chủ không tồn tại"
-#: remote.c:1197
+#: remote.c:1305
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "dst refspec %s khớp nhiều hơn một"
-#: remote.c:1204
+#: remote.c:1312
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "dst ref %s nhận từ hơn một nguồn"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1833 remote.c:1940
msgid "HEAD does not point to a branch"
msgstr "HEAD không chỉ đến một nhánh nào cả"
-#: remote.c:1733
+#: remote.c:1842
#, c-format
msgid "no such branch: '%s'"
msgstr "không có nhánh nào như thế: “%s”"
-#: remote.c:1736
+#: remote.c:1845
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "không có thượng nguồn được cấu hình cho nhánh “%s”"
-#: remote.c:1742
+#: remote.c:1851
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
"nhánh thượng nguồn “%s” không được lưu lại như là một nhánh theo dõi máy chủ"
-#: remote.c:1757
+#: remote.c:1866
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "đẩy lên đích “%s” trên máy chủ “%s” không có nhánh theo dõi nội bộ"
-#: remote.c:1769
+#: remote.c:1881
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "nhánh “%s” không có máy chủ để đẩy lên"
-#: remote.c:1779
+#: remote.c:1891
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "đẩy refspecs cho “%s” không bao gồm “%s”"
-#: remote.c:1792
+#: remote.c:1904
msgid "push has no destination (push.default is 'nothing')"
msgstr "đẩy lên mà không có đích (push.default là “nothing”)"
-#: remote.c:1814
+#: remote.c:1926
msgid "cannot resolve 'simple' push to a single destination"
msgstr "không thể phân giải đẩy “đơn giản” đến một đích đơn"
-#: remote.c:1943
+#: remote.c:2059
#, c-format
msgid "couldn't find remote ref %s"
msgstr "không thể tìm thấy tham chiếu máy chủ %s"
-#: remote.c:1956
+#: remote.c:2072
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Đang bỏ qua tham chiếu thú vị nội bộ “%s”"
-#: remote.c:2119
+#: remote.c:2235
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
"Nhánh của bạn dựa trên cơ sở là “%s”, nhưng trên thượng nguồn không còn.\n"
-#: remote.c:2123
+#: remote.c:2239
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n"
-#: remote.c:2126
+#: remote.c:2242
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Nhánh của bạn đã cập nhật với “%s”.\n"
-#: remote.c:2130
+#: remote.c:2246
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Nhánh của bạn và “%s” tham chiếu đến các lần chuyển giao khác nhau.\n"
-#: remote.c:2133
+#: remote.c:2249
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (dùng \"%s\" để biết thêm chi tiết)\n"
-#: remote.c:2137
+#: remote.c:2253
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Nhánh của bạn đứng trước “%s” %d lần chuyển giao.\n"
-#: remote.c:2143
+#: remote.c:2259
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n"
-#: remote.c:2146
+#: remote.c:2262
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -7218,11 +7580,11 @@
"Nhánh của bạn đứng đằng sau “%s” %d lần chuyển giao, và có thể được chuyển-"
"tiếp-nhanh.\n"
-#: remote.c:2154
+#: remote.c:2270
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n"
-#: remote.c:2157
+#: remote.c:2273
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -7235,13 +7597,13 @@
"và có %d và %d lần chuyển giao khác nhau cho từng cái,\n"
"tương ứng với mỗi lần.\n"
-#: remote.c:2167
+#: remote.c:2283
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của "
"bạn)\n"
-#: remote.c:2359
+#: remote.c:2475
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "không thể phân tích tên đối tượng mong muốn “%s”"
@@ -7274,129 +7636,120 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "gặp lỗi đọc khi đang ghi “%s” (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
msgstr "gặp lỗi khi đẩy dữ liệu “%s” lên đĩa"
-#: rerere.c:487 rerere.c:1023
+#: rerere.c:487 rerere.c:1024
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "không thể phân tích các mảnh xung đột trong “%s”"
-#: rerere.c:668
+#: rerere.c:669
#, c-format
msgid "failed utime() on '%s'"
msgstr "gặp lỗi utime() trên “%s”"
-#: rerere.c:678
+#: rerere.c:679
#, c-format
msgid "writing '%s' failed"
msgstr "gặp lỗi khi đang ghi “%s”"
-#: rerere.c:698
+#: rerere.c:699
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "Đã tạm cất “%s” sử dụng cách phân giải kế trước."
-#: rerere.c:737
+#: rerere.c:738
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "Cách giải quyết đã ghi lại cho “%s”."
-#: rerere.c:772
+#: rerere.c:773
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "Đã phân giải giải “%s” sử dụng cách giải quyết kế trước."
-#: rerere.c:787
+#: rerere.c:788
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "không thể unlink stray “%s”"
-#: rerere.c:791
+#: rerere.c:792
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "Preimage đã được ghi lại cho “%s”"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
+#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
#, c-format
msgid "could not create directory '%s'"
msgstr "không thể tạo thư mục “%s”"
-#: rerere.c:1041
+#: rerere.c:1042
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "gặp lỗi khi chạy cập nhật trạng thái bị xung đột trong “%s”"
-#: rerere.c:1052 rerere.c:1059
+#: rerere.c:1053 rerere.c:1060
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "đừng nhó các giải quyết cho “%s”"
-#: rerere.c:1061
+#: rerere.c:1062
#, c-format
msgid "cannot unlink '%s'"
msgstr "không thể unlink “%s”"
-#: rerere.c:1071
+#: rerere.c:1072
#, c-format
msgid "Updated preimage for '%s'"
msgstr "Đã cập nhật preimage cho “%s”"
-#: rerere.c:1080
+#: rerere.c:1081
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Quên phân giải cho “%s”\n"
-#: rerere.c:1191
+#: rerere.c:1192
msgid "unable to open rr-cache directory"
msgstr "không thể mở thư mục rr-cache"
-#: reset.c:42
+#: reset.c:112
msgid "could not determine HEAD revision"
msgstr "không thể dò tìm điểm xét duyệt HEAD"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:141 reset.c:147 sequencer.c:3696
#, c-format
msgid "failed to find tree of %s"
msgstr "gặp lỗi khi tìm cây của %s"
-#: revision.c:2344
+#: revision.c:2358
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<packfile> không còn được hỗ trợ nữa"
-#: revision.c:2684
+#: revision.c:2712
msgid "your current branch appears to be broken"
msgstr "nhánh hiện tại của bạn có vẻ như bị hỏng"
-#: revision.c:2687
+#: revision.c:2715
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "nhánh hiện tại của bạn “%s” không có một lần chuyển giao nào cả"
-#: revision.c:2893
+#: revision.c:2901
+msgid "object filtering requires --objects"
+msgstr "lọc đối tượng yêu cầu --objects"
+
+#: revision.c:2918
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L vẫn chưa hỗ trợ định dạng khác biệt nào ngoài -p và -s"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "gặp lỗi khi mở “/dev/null”"
-
-#: run-command.c:1274
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
-msgstr "không thể tạo tuyến async: %s"
-
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Móc “%s” bị bỏ qua bởi vì nó không thể đặt là thực thi được.\n"
-"Bạn có thể tắt cảnh báo này bằng “git config advice.ignoredHook false“."
+msgstr "không thể tạo tuyến trình async: %s"
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
@@ -7417,23 +7770,23 @@
msgid "failed to sign the push certificate"
msgstr "gặp lỗi khi ký chứng thực đẩy"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack: không thể rẽ nhánh tuyến trình con fetch"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "đẩy đàm phán thất bại; vẫn tiếp tục xử lý bằng lệnh đẩy"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "kết thúc nhận không hỗ trợ đẩy --signed"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7441,47 +7794,48 @@
"đừng gửi giấy chứng nhận đẩy trước khi kết thúc nhận không hỗ trợ đẩy --"
"signed"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "kết thúc nhận không hỗ trợ đẩy --atomic"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "chế độ dọn dẹp ghi chú các lần chuyển giao không hợp lệ “%s”"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "không thể xóa bỏ “%s”"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "không thể gỡ bỏ “%s”"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "hoàn nguyên"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "không nhận ra thao tác: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7489,53 +7843,81 @@
"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n"
"với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n"
-"với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”\n"
-"và chuyển giao kết quả bằng lệnh “git commit”"
+"Sau khi giải quyết vấn đề xung đột, hãy đánh dấu bằng\n"
+"\"git add/rm <pathspec>\", sai đó chạy\n"
+"\"git cherry-pick --continue\".\n"
+"Bạn có thể bỏ qua lần chuyển giao này với \"git cherry-pick --skip\".\n"
+"Để bãi bỏ và quay trở lại trạng thái trước khi \"git cherry-pick\",\n"
+"chạy \"git cherry-pick --abort\"."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Sau khi giải quyết vấn đề này, hãy đánh dấu chúng bằng\n"
+"\"git add/rm <đặc_tả_đường_dẫn_xung_đột>\", sau đó chạy\n"
+"\"git revert --continue\".\n"
+"Bạn có thể bỏ qua lần chuyển giao này với \"git rebase --skip\".\n"
+"Để bãi bỏ và quay trở lại trạng thái trước \"git revert\",\n"
+"chạy \"git revert --abort\"."
+
+#: sequencer.c:448 sequencer.c:3288
#, c-format
msgid "could not lock '%s'"
msgstr "không thể khóa “%s”"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
+#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
#, c-format
msgid "could not write to '%s'"
msgstr "không thể ghi vào “%s”"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "không thể ghi eol vào “%s”"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3565
#, c-format
msgid "failed to finalize '%s'"
msgstr "gặp lỗi khi hoàn thành “%s”"
-#: sequencer.c:486
+#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
+#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
+#, c-format
+msgid "could not read '%s'"
+msgstr "không thể đọc “%s”"
+
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: chuyển-tiếp-nhanh"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:615
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Chế độ dọn dẹp không hợp lệ %s"
@@ -7543,65 +7925,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "không thể cập nhật cây bộ nhớ đệm"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "không thể phân giải lần chuyển giao HEAD"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "không có khóa hiện diện trong “%.*s”"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "không thể giải trích dẫn giá trị của “%s”"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
+#: builtin/am.c:849 builtin/rebase.c:699
#, c-format
msgid "could not open '%s' for reading"
msgstr "không thể mở “%s” để đọc"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "“GIT_AUTHOR_NAME” đã sẵn đưa ra rồi"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "“GIT_AUTHOR_EMAIL” đã sẵn đưa ra rồi"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "“GIT_AUTHOR_DATE” đã sẵn đưa ra rồi"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "không hiểu biến “%s”"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "thiếu “GIT_AUTHOR_NAME”"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "thiếu “GIT_AUTHOR_EMAIL”"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "thiếu “GIT_AUTHOR_DATE”"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7630,11 +8012,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr "móc “prepare-commit-msg” bị lỗi"
-#: sequencer.c:1218
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7665,7 +8047,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7693,346 +8075,347 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1287
msgid "couldn't look up newly created commit"
msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo"
-#: sequencer.c:1275
+#: sequencer.c:1289
msgid "could not parse newly created commit"
msgstr ""
"không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo"
-#: sequencer.c:1321
+#: sequencer.c:1336
msgid "unable to resolve HEAD after creating commit"
msgstr "không thể phân giải HEAD sau khi tạo lần chuyển giao"
-#: sequencer.c:1323
+#: sequencer.c:1338
msgid "detached HEAD"
msgstr "đã rời khỏi HEAD"
-#: sequencer.c:1327
+#: sequencer.c:1342
msgid " (root-commit)"
msgstr " (root-commit)"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "could not parse HEAD"
msgstr "không thể phân tích HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1365
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s không phải là một lần chuyển giao!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1425 sequencer.c:2310
msgid "unable to parse commit author"
msgstr "không thể phân tích tác giả của lần chuyển giao"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "lệnh git write-tree gặp lỗi khi ghi một cây"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1469 sequencer.c:1589
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "không thể đọc phần chú thích (message) từ “%s”"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1500 sequencer.c:1532
#, c-format
msgid "invalid author identity '%s'"
msgstr "định danh tác giả không hợp lệ “%s”"
-#: sequencer.c:1491
+#: sequencer.c:1506
msgid "corrupt author: missing date information"
-msgstr "tác giả sai hỏng: thiếu thông tin này tháng"
+msgstr "tác giả sai hỏng: thiếu thông tin ngày tháng"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
+#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "không thể cập nhật %s"
-#: sequencer.c:1606
+#: sequencer.c:1621
#, c-format
msgid "could not parse commit %s"
msgstr "không thể phân tích lần chuyển giao %s"
-#: sequencer.c:1611
+#: sequencer.c:1626
#, c-format
msgid "could not parse parent commit %s"
msgstr "không thể phân tích lần chuyển giao cha mẹ “%s”"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1709 sequencer.c:1990
#, c-format
msgid "unknown command: %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1751
msgid "This is the 1st commit message:"
msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:"
-#: sequencer.c:1737
+#: sequencer.c:1752
#, c-format
msgid "This is the commit message #%d:"
msgstr "Đây là chú thích cho lần chuyển giao thứ #%d:"
-#: sequencer.c:1738
+#: sequencer.c:1753
msgid "The 1st commit message will be skipped:"
msgstr "Chú thích cho lần chuyển giao thứ nhất sẽ bị bỏ qua:"
-#: sequencer.c:1739
+#: sequencer.c:1754
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Chú thích cho lần chuyển giao thứ #%d sẽ bị bỏ qua:"
-#: sequencer.c:1740
+#: sequencer.c:1755
#, c-format
msgid "This is a combination of %d commits."
msgstr "Đây là tổ hợp của %d lần chuyển giao."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1902 sequencer.c:1959
#, c-format
msgid "cannot write '%s'"
msgstr "không thể ghi “%s”"
-#: sequencer.c:1934
+#: sequencer.c:1949
msgid "need a HEAD to fixup"
msgstr "cần một HEAD để sửa"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1951 sequencer.c:3592
msgid "could not read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1953
msgid "could not read HEAD's commit message"
msgstr "không thể đọc phần chú thích (message) của HEAD"
-#: sequencer.c:1962
+#: sequencer.c:1977
#, c-format
msgid "could not read commit message of %s"
msgstr "không thể đọc phần chú thích (message) của %s"
-#: sequencer.c:2072
+#: sequencer.c:2087
msgid "your index file is unmerged."
msgstr "tập tin lưu mục lục của bạn không được hòa trộn."
-#: sequencer.c:2079
+#: sequencer.c:2094
msgid "cannot fixup root commit"
msgstr "không thể sửa chữa lần chuyển giao gốc"
-#: sequencer.c:2098
+#: sequencer.c:2113
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2121 sequencer.c:2129
#, c-format
msgid "commit %s does not have parent %d"
msgstr "lần chuyển giao %s không có cha mẹ %d"
-#: sequencer.c:2120
+#: sequencer.c:2135
#, c-format
msgid "cannot get commit message for %s"
msgstr "không thể lấy ghi chú lần chuyển giao cho %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2154
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s"
-#: sequencer.c:2205
+#: sequencer.c:2220
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "không thể đổi tên “%s” thành “%s”"
-#: sequencer.c:2265
+#: sequencer.c:2280
#, c-format
msgid "could not revert %s... %s"
msgstr "không thể hoàn nguyên %s… %s"
-#: sequencer.c:2266
+#: sequencer.c:2281
#, c-format
msgid "could not apply %s... %s"
msgstr "không thể áp dụng miếng vá %s… %s"
-#: sequencer.c:2287
+#: sequencer.c:2302
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "xóa %s %s -- vá nội dung thượng nguồn đã có\n"
-#: sequencer.c:2345
+#: sequencer.c:2360
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: gặp lỗi đọc bảng mục lục"
-#: sequencer.c:2352
+#: sequencer.c:2368
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục"
-#: sequencer.c:2425
+#: sequencer.c:2448
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s không nhận các đối số: “%s”"
-#: sequencer.c:2434
+#: sequencer.c:2457
#, c-format
msgid "missing arguments for %s"
msgstr "thiếu đối số cho %s"
-#: sequencer.c:2477
+#: sequencer.c:2500
#, c-format
msgid "could not parse '%s'"
msgstr "không thể phân tích cú pháp “%s”"
-#: sequencer.c:2538
+#: sequencer.c:2561
#, c-format
msgid "invalid line %d: %.*s"
msgstr "dòng không hợp lệ %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2572
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "không thể “%s” thể mà không có lần chuyển giao kế trước"
-#: sequencer.c:2635
+#: sequencer.c:2620 builtin/rebase.c:185
+#, c-format
+msgid "could not read '%s'."
+msgstr "không thể đọc “%s”."
+
+#: sequencer.c:2658
msgid "cancelling a cherry picking in progress"
msgstr "đang hủy bỏ thao tác cherry pick đang thực hiện"
-#: sequencer.c:2644
+#: sequencer.c:2667
msgid "cancelling a revert in progress"
msgstr "đang hủy bỏ các thao tác hoàn nguyên đang thực hiện"
-#: sequencer.c:2690
+#: sequencer.c:2707
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”."
-#: sequencer.c:2692
+#: sequencer.c:2709
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "bảng chỉ thị không thể dùng được: %s"
-#: sequencer.c:2697
+#: sequencer.c:2714
msgid "no commits parsed."
msgstr "không có lần chuyển giao nào được phân tích."
-#: sequencer.c:2708
+#: sequencer.c:2725
msgid "cannot cherry-pick during a revert."
msgstr "không thể cherry-pick trong khi hoàn nguyên."
-#: sequencer.c:2710
+#: sequencer.c:2727
msgid "cannot revert during a cherry-pick."
msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick."
-#: sequencer.c:2788
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "giá trị cho %s không hợp lệ: %s"
-
-#: sequencer.c:2897
+#: sequencer.c:2914
msgid "unusable squash-onto"
msgstr "squash-onto không dùng được"
-#: sequencer.c:2917
+#: sequencer.c:2934
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "bảng tùy chọn dị hình: “%s”"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3029 sequencer.c:4875
msgid "empty commit set passed"
msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
-#: sequencer.c:3029
+#: sequencer.c:3046
msgid "revert is already in progress"
msgstr "có thao tác hoàn nguyên đang được thực hiện"
-#: sequencer.c:3031
+#: sequencer.c:3048
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "hãy thử \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3051
msgid "cherry-pick is already in progress"
msgstr "có thao tác “cherry-pick” đang được thực hiện"
-#: sequencer.c:3036
+#: sequencer.c:3053
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "hãy thử \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3067
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "không thể tạo thư mục xếp dãy “%s”"
-#: sequencer.c:3065
+#: sequencer.c:3082
msgid "could not lock HEAD"
msgstr "không thể khóa HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3142 sequencer.c:4585
msgid "no cherry-pick or revert in progress"
msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3144 sequencer.c:3155
msgid "cannot resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3146 sequencer.c:3190
msgid "cannot abort from a branch yet to be born"
msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
+#: builtin/grep.c:774
#, c-format
msgid "cannot open '%s'"
msgstr "không mở được “%s”"
-#: sequencer.c:3161
+#: sequencer.c:3178
#, c-format
msgid "cannot read '%s': %s"
msgstr "không thể đọc “%s”: %s"
-#: sequencer.c:3162
+#: sequencer.c:3179
msgid "unexpected end of file"
msgstr "gặp kết thúc tập tin đột xuất"
-#: sequencer.c:3168
+#: sequencer.c:3185
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng"
-#: sequencer.c:3179
+#: sequencer.c:3196
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Bạn có lẽ đã có HEAD đã bị di chuyển đi, Không thể tua, kiểm tra HEAD của "
"bạn!"
-#: sequencer.c:3220
+#: sequencer.c:3237
msgid "no revert in progress"
msgstr "không có tiến trình hoàn nguyên nào"
-#: sequencer.c:3229
+#: sequencer.c:3246
msgid "no cherry-pick in progress"
msgstr "không có cherry-pick đang được thực hiện"
-#: sequencer.c:3239
+#: sequencer.c:3256
msgid "failed to skip the commit"
msgstr "gặp lỗi khi bỏ qua đối tượng chuyển giao"
-#: sequencer.c:3246
+#: sequencer.c:3263
msgid "there is nothing to skip"
msgstr "ở đây không có gì để mà bỏ qua cả"
-#: sequencer.c:3249
+#: sequencer.c:3266
#, c-format
msgid ""
"have you committed already?\n"
@@ -8041,16 +8424,16 @@
"bạn đã sẵn sàng chuyển giao chưa?\n"
"thử \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3428 sequencer.c:4476
msgid "cannot read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3445
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "không thể chép “%s” sang “%s”"
-#: sequencer.c:3436
+#: sequencer.c:3453
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8069,27 +8452,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3463
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Không thể áp dụng %s… %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3470
#, c-format
msgid "Could not merge %.*s"
msgstr "Không hòa trộn %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "không thể chép “%s” sang “%s”"
-#: sequencer.c:3483
+#: sequencer.c:3499
#, c-format
msgid "Executing: %s\n"
msgstr "Đang thực thi: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3510
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8104,11 +8487,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3516
msgid "and made changes to the index and/or the working tree\n"
msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc\n"
-#: sequencer.c:3510
+#: sequencer.c:3522
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8125,90 +8508,90 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3582
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "tên nhãn dị hình: “%.*s”"
-#: sequencer.c:3645
+#: sequencer.c:3655
msgid "writing fake root commit"
msgstr "ghi lần chuyển giao gốc giả"
-#: sequencer.c:3650
+#: sequencer.c:3660
msgid "writing squash-onto"
msgstr "đang ghi squash-onto"
-#: sequencer.c:3734
+#: sequencer.c:3739
#, c-format
msgid "could not resolve '%s'"
msgstr "không thể phân giải “%s”"
-#: sequencer.c:3767
+#: sequencer.c:3771
msgid "cannot merge without a current revision"
msgstr "không thể hòa trộn mà không có một điểm xét duyệt hiện tại"
-#: sequencer.c:3789
+#: sequencer.c:3793
#, c-format
msgid "unable to parse '%.*s'"
msgstr "không thể phân tích “%.*s”"
-#: sequencer.c:3798
+#: sequencer.c:3802
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "chẳng có gì để hòa trộn: “%.*s”"
-#: sequencer.c:3810
+#: sequencer.c:3814
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "hòa trộn octopus không thể được thực thi trên đỉnh của một [new root]"
-#: sequencer.c:3826
+#: sequencer.c:3869
#, c-format
msgid "could not get commit message of '%s'"
msgstr "không thể lấy chú thích của lần chuyển giao của “%s”"
-#: sequencer.c:4009
+#: sequencer.c:4013
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "không thể ngay cả khi thử hòa trộn “%.*s”"
-#: sequencer.c:4025
+#: sequencer.c:4029
msgid "merge: Unable to write new index file"
msgstr "merge: Không thể ghi tập tin lưu bảng mục lục mới"
-#: sequencer.c:4099
+#: sequencer.c:4110
msgid "Cannot autostash"
msgstr "Không thể autostash"
-#: sequencer.c:4102
+#: sequencer.c:4113
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Gặp đáp ứng stash không cần: “%s”"
-#: sequencer.c:4108
+#: sequencer.c:4119
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Không thể tạo thư mục cho “%s”"
-#: sequencer.c:4111
+#: sequencer.c:4122
#, c-format
msgid "Created autostash: %s\n"
msgstr "Đã tạo autostash: %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4124
msgid "could not reset --hard"
msgstr "không thể reset --hard"
-#: sequencer.c:4140
+#: sequencer.c:4148
#, c-format
msgid "Applied autostash.\n"
msgstr "Đã áp dụng autostash.\n"
-#: sequencer.c:4152
+#: sequencer.c:4160
#, c-format
msgid "cannot store %s"
msgstr "không thử lưu “%s”"
-#: sequencer.c:4155
+#: sequencer.c:4163
#, c-format
msgid ""
"%s\n"
@@ -8220,29 +8603,29 @@
"Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
"nào.\n"
-#: sequencer.c:4160
+#: sequencer.c:4168
msgid "Applying autostash resulted in conflicts."
msgstr "Áp dụng autostash có hiệu quả trong các xung đột."
-#: sequencer.c:4161
+#: sequencer.c:4169
msgid "Autostash exists; creating a new stash entry."
msgstr "Autostash đã sẵn có; nên tạo một mục stash mới."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4225
msgid "could not detach HEAD"
msgstr "không thể tách rời HEAD"
-#: sequencer.c:4248
+#: sequencer.c:4240
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Dừng lại ở HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4242
#, c-format
msgid "Stopped at %s\n"
msgstr "Dừng lại ở %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4274
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8263,58 +8646,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4320
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Đang cải tổ (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4366
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Dừng lại ở %s… %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4436
#, c-format
msgid "unknown command %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:4480
+#: sequencer.c:4484
msgid "could not read orig-head"
msgstr "không thể đọc orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4489
msgid "could not read 'onto'"
msgstr "không thể đọc “onto”."
-#: sequencer.c:4499
+#: sequencer.c:4503
#, c-format
msgid "could not update HEAD to %s"
msgstr "không thể cập nhật HEAD thành %s"
-#: sequencer.c:4559
+#: sequencer.c:4563
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Cài tổ và cập nhật %s một cách thành công.\n"
-#: sequencer.c:4611
+#: sequencer.c:4615
msgid "cannot rebase: You have unstaged changes."
msgstr "không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: sequencer.c:4620
+#: sequencer.c:4624
msgid "cannot amend non-existing commit"
msgstr "không thể tu bỏ một lần chuyển giao không tồn tại"
-#: sequencer.c:4622
+#: sequencer.c:4626
#, c-format
msgid "invalid file: '%s'"
msgstr "tập tin không hợp lệ: “%s”"
-#: sequencer.c:4624
+#: sequencer.c:4628
#, c-format
msgid "invalid contents: '%s'"
msgstr "nội dung không hợp lệ: “%s”"
-#: sequencer.c:4627
+#: sequencer.c:4631
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8324,59 +8707,69 @@
"Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc. Vui lòng\n"
"chuyển giao chúng trước và sau đó chạy lệnh “git rebase --continue” lần nữa."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4667 sequencer.c:4706
#, c-format
msgid "could not write file: '%s'"
msgstr "không thể ghi tập tin: “%s”"
-#: sequencer.c:4718
+#: sequencer.c:4722
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "không thể xóa bỏ CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4732
msgid "could not commit staged changes."
msgstr "không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-#: sequencer.c:4845
+#: sequencer.c:4852
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: không thể cherry-pick một %s"
-#: sequencer.c:4849
+#: sequencer.c:4856
#, c-format
msgid "%s: bad revision"
msgstr "%s: điểm xét duyệt sai"
-#: sequencer.c:4884
+#: sequencer.c:4891
msgid "can't revert as initial commit"
msgstr "không thể hoàn nguyên một lần chuyển giao khởi tạo"
-#: sequencer.c:5361
+#: sequencer.c:5162 sequencer.c:5391
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "bỏ qua lần chuyển giao được áp dụng kế trước %s"
+
+#: sequencer.c:5232 sequencer.c:5407
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+"dùng --reapply-cherry-picks để bao gồm các lần chuyển giao đã bị bỏ qua"
+
+#: sequencer.c:5378
msgid "make_script: unhandled options"
msgstr "make_script: các tùy chọn được không xử lý"
-#: sequencer.c:5364
+#: sequencer.c:5381
msgid "make_script: error preparing revisions"
msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5639 sequencer.c:5656
msgid "nothing to do"
msgstr "không có gì để làm"
-#: sequencer.c:5650
+#: sequencer.c:5675
msgid "could not skip unnecessary pick commands"
msgstr "không thể bỏ qua các lệnh cậy (pick) không cần thiết"
-#: sequencer.c:5750
+#: sequencer.c:5775
msgid "the script was already rearranged."
msgstr "văn lệnh đã sẵn được sắp đặt rồi."
-#: setup.c:133
+#: setup.c:135
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "“%s” ngoài một kho chứa tại “%s”"
-#: setup.c:185
+#: setup.c:187
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -8386,7 +8779,7 @@
"Dùng “git <lệnh> -- <đường/dẫn>…” để chỉ định đường dẫn mà nó không tồn tại "
"một cách nội bộ."
-#: setup.c:198
+#: setup.c:200
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8398,12 +8791,12 @@
"Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n"
"“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”"
-#: setup.c:264
+#: setup.c:266
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "tùy chọn “%s” phải trước các đối số đầu tiên không có tùy chọn"
-#: setup.c:283
+#: setup.c:285
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -8414,98 +8807,98 @@
"Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n"
"“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”"
-#: setup.c:419
+#: setup.c:421
msgid "unable to set up work tree using invalid config"
msgstr "không thể cài đặt thư mục làm việc sử dụng cấu hình không hợp lệ"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:425 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "thao tác này phải được thực hiện trong thư mục làm việc"
-#: setup.c:658
+#: setup.c:724
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Cần phiên bản kho git <= %d, nhưng lại nhận được %d"
-#: setup.c:666
+#: setup.c:732
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "tìm thấy phần mở rộng kho chưa biết:"
-#: setup.c:680
+#: setup.c:746
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "phiên bản kho là 0, nhưng lại tìm thấy phần mở rộng chỉ v1:"
-#: setup.c:701
+#: setup.c:767
#, c-format
msgid "error opening '%s'"
msgstr "gặp lỗi khi mở “%s”"
-#: setup.c:703
+#: setup.c:769
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "tập tin .git là quá lớn: “%s”"
-#: setup.c:705
+#: setup.c:771
#, c-format
msgid "error reading %s"
msgstr "gặp lỗi khi đọc %s"
-#: setup.c:707
+#: setup.c:773
#, c-format
msgid "invalid gitfile format: %s"
msgstr "định dạng tập tin git không hợp lệ: %s"
-#: setup.c:709
+#: setup.c:775
#, c-format
msgid "no path in gitfile: %s"
msgstr "không có đường dẫn trong tập tin git: %s"
-#: setup.c:711
+#: setup.c:777
#, c-format
msgid "not a git repository: %s"
msgstr "không phải là kho git: %s"
-#: setup.c:813
+#: setup.c:879
#, c-format
msgid "'$%s' too big"
msgstr "“$%s” quá lớn"
-#: setup.c:827
+#: setup.c:893
#, c-format
msgid "not a git repository: '%s'"
msgstr "không phải là kho git: “%s”"
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:922 setup.c:924 setup.c:955
#, c-format
msgid "cannot chdir to '%s'"
msgstr "không thể chdir (chuyển đổi thư mục) sang “%s”"
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
msgid "cannot come back to cwd"
msgstr "không thể quay lại cwd"
-#: setup.c:988
+#: setup.c:1054
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "gặp lỗi khi lấy thống kê về “%*s%s%s”"
-#: setup.c:1231
+#: setup.c:1338
msgid "Unable to read current working directory"
msgstr "Không thể đọc thư mục làm việc hiện hành"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1347 setup.c:1353
#, c-format
msgid "cannot change to '%s'"
msgstr "không thể chuyển sang “%s”"
-#: setup.c:1251
+#: setup.c:1358
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "không phải là kho git (hoặc bất kỳ thư mục cha mẹ nào): %s"
-#: setup.c:1257
+#: setup.c:1364
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -8515,7 +8908,20 @@
"Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa "
"đặt)."
-#: setup.c:1381
+#: setup.c:1374
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"kho lưu trữ không an toàn ('%s' thuộc sở hữu của người khác)\n"
+"Để thêm ngoại lệ cho thư mục này, hãy gọi:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#: setup.c:1502
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8524,154 +8930,146 @@
"gặp vấn đề với giá trị chế độ tập tin core.sharedRepository (0%.3o).\n"
"người sở hữu tập tin phải luôn có quyền đọc và ghi."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "gặp lỗi khi mở “/dev/null” hay dup"
-
-#: setup.c:1445
+#: setup.c:1564
msgid "fork failed"
msgstr "gặp lỗi khi rẽ nhánh tiến trình"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1569
msgid "setsid failed"
msgstr "setsid gặp lỗi"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "cố gắng sử dụng chỉ mục thưa thớt mà không có chế độ hình nón"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "không thể cập nhật cây bộ nhớ đệm, chỗ chứa bị đầy"
-
-#: sparse-index.c:263
+#: sparse-index.c:285
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "mục tin mục lục là một thư mục, nhưng không \"sparse\" (%08x)"
+#: split-index.c:9
+msgid "cannot use split index with a sparse index"
+msgstr "không thể sử dụng bảng mục lục chia tách với một \"sparse index\""
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:852
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u GiB/giây"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:860
+#: strbuf.c:861
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:862
+#: strbuf.c:863
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u MiB/giây"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:869
+#: strbuf.c:870
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:871
+#: strbuf.c:872
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u KiB/giây"
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:877
+#: strbuf.c:878
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[0] "%u byte"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
+#: strbuf.c:880
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u byte/giây"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
+#: builtin/rebase.c:653
#, c-format
msgid "could not open '%s' for writing"
msgstr "không thể mở “%s” để ghi"
-#: strbuf.c:1177
+#: strbuf.c:1196
#, c-format
msgid "could not edit '%s'"
msgstr "không thể sửa “%s”"
-#: submodule-config.c:237
+#: submodule-config.c:238
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "đang lờ đi tên mô-đun-con mập mờ: %s"
-#: submodule-config.c:304
+#: submodule-config.c:305
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "không cho phép giá trị âm ở submodule.fetchjobs"
-#: submodule-config.c:402
+#: submodule-config.c:403
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
"đang bỏ qua “%s” cái mà có thể được phiên dịch như là một tùy chọn dòng "
"lệnh: %s"
-#: submodule-config.c:499
+#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
#, c-format
-msgid "invalid value for %s"
-msgstr "giá trị cho %s không hợp lệ"
+msgid "invalid value for '%s'"
+msgstr "giá trị cho '%s' không hợp lệ"
-#: submodule-config.c:766
+#: submodule-config.c:828
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Không thể cập nhật mục .gitmodules %s"
-#: submodule.c:114 submodule.c:143
+#: submodule.c:115 submodule.c:144
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Không thể thay đổi .gitmodules chưa hòa trộn, hãy giải quyết xung đột trộn "
"trước"
-#: submodule.c:118 submodule.c:147
+#: submodule.c:119 submodule.c:148
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Không thể tìm thấy phần trong .gitmodules nơi mà đường_dẫn=%s"
-#: submodule.c:154
+#: submodule.c:155
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Không thể gỡ bỏ mục .gitmodules dành cho %s"
-#: submodule.c:165
+#: submodule.c:166
msgid "staging updated .gitmodules failed"
msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
-#: submodule.c:328
+#: submodule.c:346
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "trong mô-đun-con không có gì “%s”"
-#: submodule.c:359
+#: submodule.c:377
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”"
-#: submodule.c:436
+#: submodule.c:454
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "đối số --ignore-submodules sai: %s"
-#: submodule.c:805
+#: submodule.c:866
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8680,13 +9078,13 @@
"Mô-đun-con trong lần chuyển giao %s tại đường dẫn: “%s” va chạm với mô-đun-"
"con cùng tên. Nên bỏ qua nó."
-#: submodule.c:908
+#: submodule.c:987
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
"mục tin mô-đun-con “%s” (%s) là một %s, không phải là một lần chuyển giao"
-#: submodule.c:993
+#: submodule.c:1069
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8695,36 +9093,46 @@
"Không thể chạy lệnh “git rev-list <các lần chuyển giao> --not --remotes -n "
"1” trong mô-đun-con “%s”"
-#: submodule.c:1116
+#: submodule.c:1192
#, c-format
msgid "process for submodule '%s' failed"
msgstr "xử lý cho mô-đun-con “%s” gặp lỗi"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ."
-#: submodule.c:1156
+#: submodule.c:1232
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Đẩy lên mô-đun-con “%s”\n"
-#: submodule.c:1159
+#: submodule.c:1235
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Không thể đẩy lên mô-đun-con “%s”\n"
-#: submodule.c:1451
+#: submodule.c:1567
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Đang lấy về mô-đun-con %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1589
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Không thể truy cập mô-đun-con “%s”\n"
-#: submodule.c:1640
+#: submodule.c:1618
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Không thể truy cập mô-đun-con “%s” ở lần chuyển giao %s\n"
+
+#: submodule.c:1629
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Đang lấy về mô-đun-con %s%s tại lần chuyển giao %s\n"
+
+#: submodule.c:1849
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8733,61 +9141,61 @@
"Có lỗi khi lấy về mô-đun-con:\n"
" “%s”"
-#: submodule.c:1665
+#: submodule.c:1874
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "không nhận ra “%s” là một kho git"
-#: submodule.c:1682
+#: submodule.c:1891
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Không thể chạy “git status --porcelain=2” trong mô-đun-con “%s”"
-#: submodule.c:1723
+#: submodule.c:1932
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "“git status --porcelain=2” gặp lỗi trong mô-đun-con “%s”"
-#: submodule.c:1798
+#: submodule.c:2007
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "không thể lấy thống kê “git status” trong mô-đun-con “%s”"
-#: submodule.c:1811
+#: submodule.c:2020
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "không thể chạy “git status” trong mô-đun-con “%s”"
-#: submodule.c:1826
+#: submodule.c:2037
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Không thể đặt core.worktree trong mô-đun-con “%s”"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:2064 submodule.c:2379
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "không thể đệ quy vào trong mô-đun-con “%s”"
-#: submodule.c:1874
+#: submodule.c:2086
msgid "could not reset submodule index"
msgstr "không thể đặt lại mục lục của mô-đun-con"
-#: submodule.c:1916
+#: submodule.c:2128
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "mô-đun-con “%s” có mục lục còn bẩn"
-#: submodule.c:1968
+#: submodule.c:2182
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Mô-đun-con “%s” không thể được cập nhật."
-#: submodule.c:2036
+#: submodule.c:2250
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "thư mục git mô đun con “%s” là bên trong git DIR “%.*s”"
-#: submodule.c:2057
+#: submodule.c:2271
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8795,17 +9203,17 @@
"relocate_gitdir cho mô-đun-con “%s” với nhiều hơn một cây làm việc là chưa "
"được hỗ trợ"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2283 submodule.c:2343
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "không thể tìm kiếm tên cho mô-đun-con “%s”"
-#: submodule.c:2073
+#: submodule.c:2287
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "từ chối di chuyển “%s” vào trong một thư mục git sẵn có"
-#: submodule.c:2080
+#: submodule.c:2293
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8816,11 +9224,11 @@
"“%s” sang\n"
"“%s”\n"
-#: submodule.c:2208
+#: submodule.c:2424
msgid "could not start ls-files in .."
msgstr "không thể lấy thông tin thống kê về ls-files trong .."
-#: submodule.c:2248
+#: submodule.c:2464
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree trả về mã không như mong đợi %d"
@@ -8841,8 +9249,8 @@
msgid "unknown value '%s' for key '%s'"
msgstr "không hiểu giá trị “%s” cho khóa “%s”"
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
+#: builtin/remote.c:328
#, c-format
msgid "more than one %s"
msgstr "nhiều hơn một %s"
@@ -8857,11 +9265,11 @@
msgid "could not read input file '%s'"
msgstr "không đọc được tập tin đầu vào “%s”"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
msgid "could not read from stdin"
msgstr "không thể đọc từ đầu vào tiêu chuẩn"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:760
#, c-format
msgid "could not stat %s"
msgstr "không thể lấy thông tin thống kê về %s"
@@ -8929,7 +9337,7 @@
msgid "error while running fast-import"
msgstr "gặp lỗi trong khi chạy fast-import"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1254
#, c-format
msgid "could not read ref %s"
msgstr "không thể đọc tham chiếu %s"
@@ -8947,7 +9355,7 @@
msgid "invalid remote service path"
msgstr "đường dẫn dịch vụ máy chủ không hợp lệ"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1496
msgid "operation not supported by protocol"
msgstr "thao tác không được gia thức hỗ trợ"
@@ -8956,72 +9364,72 @@
msgid "can't connect to subservice %s"
msgstr "không thể kết nối đến dịch vụ phụ %s"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:415
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only cần giao thức v2"
-#: transport-helper.c:755
+#: transport-helper.c:758
msgid "'option' without a matching 'ok/error' directive"
msgstr "“option” không có chỉ thị “ok/error” tương ứng"
-#: transport-helper.c:798
+#: transport-helper.c:801
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "cần ok/error, nhưng bộ hỗ trợ lại nói “%s”"
-#: transport-helper.c:855
+#: transport-helper.c:862
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "bộ hỗ trợ báo cáo rằng không cần tình trạng của %s"
-#: transport-helper.c:938
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support dry-run"
msgstr "helper %s không hỗ trợ dry-run"
-#: transport-helper.c:941
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed"
msgstr "helper %s không hỗ trợ --signed"
-#: transport-helper.c:944
+#: transport-helper.c:951
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "helper %s không hỗ trợ --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:956
#, c-format
msgid "helper %s does not support --atomic"
msgstr "helper %s không hỗ trợ --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:960
#, c-format
msgid "helper %s does not support --%s"
msgstr "helper %s không hỗ trợ --%s"
-#: transport-helper.c:960
+#: transport-helper.c:967
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "helper %s không hỗ trợ “push-option”"
-#: transport-helper.c:1060
+#: transport-helper.c:1067
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper không hỗ trợ push; cần đặc tả tham chiếu"
-#: transport-helper.c:1065
+#: transport-helper.c:1072
#, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s không hỗ trợ “force”"
-#: transport-helper.c:1112
+#: transport-helper.c:1119
msgid "couldn't run fast-export"
msgstr "không thể chạy fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1124
msgid "error while running fast-export"
msgstr "gặp lỗi trong khi chạy fast-export"
-#: transport-helper.c:1142
+#: transport-helper.c:1149
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9031,52 +9439,52 @@
"cả.\n"
"Tuy nhiên bạn nên chỉ định một nhánh.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1231
#, c-format
msgid "unsupported object format '%s'"
msgstr "không hỗ trợ định dạng đối tượng “%s”"
-#: transport-helper.c:1233
+#: transport-helper.c:1240
#, c-format
msgid "malformed response in ref list: %s"
msgstr "đáp ứng sai dạng trong danh sách tham chiếu: %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1392
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) gặp lỗi"
-#: transport-helper.c:1412
+#: transport-helper.c:1419
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) gặp lỗi"
-#: transport-helper.c:1461
+#: transport-helper.c:1468
#, c-format
msgid "%s thread failed"
msgstr "tuyến trình %s gặp lỗi"
-#: transport-helper.c:1465
+#: transport-helper.c:1472
#, c-format
msgid "%s thread failed to join: %s"
msgstr "tuyến trình %s gặp lỗi khi gia nhập: %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1491 transport-helper.c:1495
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "không thể khởi chạy tuyến trình để sao chép dữ liệu: %s"
-#: transport-helper.c:1525
+#: transport-helper.c:1532
#, c-format
msgid "%s process failed to wait"
msgstr "xử lý %s gặp lỗi khi đợi"
-#: transport-helper.c:1529
+#: transport-helper.c:1536
#, c-format
msgid "%s process failed"
msgstr "xử lý %s gặp lỗi"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1554 transport-helper.c:1563
msgid "can't start thread for copying data"
msgstr "không thể khởi chạy tuyến trình cho việc chép dữ liệu"
@@ -9085,51 +9493,51 @@
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "Không thể đặt thượng nguồn của “%s” thành “%s” của “%s”\n"
-#: transport.c:145
+#: transport.c:138
#, c-format
msgid "could not read bundle '%s'"
msgstr "không thể đọc bó “%s”"
-#: transport.c:223
+#: transport.c:234
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "vận chuyển: tùy chọn độ sâu “%s” không hợp lệ"
-#: transport.c:275
+#: transport.c:289
msgid "see protocol.version in 'git help config' for more details"
msgstr "xem protocol.version trong “git help config” để có thêm thông tin"
-#: transport.c:276
+#: transport.c:290
msgid "server options require protocol version 2 or later"
msgstr "các tùy chọn máy chủ yêu cầu giao thức phiên bản 2 hoặc mới hơn"
-#: transport.c:403
+#: transport.c:418
msgid "server does not support wait-for-done"
msgstr "máy chủ không hỗ trợ wait-for-done"
-#: transport.c:755
+#: transport.c:770
msgid "could not parse transport.color.* config"
msgstr "không thể phân tích cú pháp cấu hình transport.color.*"
-#: transport.c:830
+#: transport.c:845
msgid "support for protocol v2 not implemented yet"
msgstr "việc hỗ trợ giao thức v2 chưa được thực hiện"
-#: transport.c:965
+#: transport.c:978
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "không hiểu giá trị cho cho cấu hình “%s”: %s"
-#: transport.c:1031
+#: transport.c:1044
#, c-format
msgid "transport '%s' not allowed"
msgstr "không cho phép phương thức vận chuyển “%s”"
-#: transport.c:1084
+#: transport.c:1093
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync không còn được hỗ trợ nữa"
-#: transport.c:1187
+#: transport.c:1196
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9138,7 +9546,7 @@
"Các đường dẫn mô-đun-con sau đây có chứa các thay đổi cái mà\n"
"có thể được tìm thấy trên mọi máy phục vụ:\n"
-#: transport.c:1191
+#: transport.c:1200
#, c-format
msgid ""
"\n"
@@ -9165,11 +9573,11 @@
"để đẩy chúng lên máy phục vụ.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1208
msgid "Aborting."
msgstr "Bãi bỏ."
-#: transport.c:1346
+#: transport.c:1354
msgid "failed to push all needed submodules"
msgstr "gặp lỗi khi đẩy dữ liệu của tất cả các mô-đun-con cần thiết"
@@ -9189,7 +9597,7 @@
msgid "too-short tree file"
msgstr "tập tin cây quá ngắn"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9200,7 +9608,7 @@
"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn "
"chuyển nhánh."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9210,7 +9618,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9221,7 +9629,7 @@
"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn hòa "
"trộn."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9231,7 +9639,7 @@
"hòa trộn:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9241,7 +9649,7 @@
"%s:\n"
"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn %s."
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9251,7 +9659,7 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -9261,7 +9669,16 @@
"trong nó:\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Từ chối gỡ bỏ thư mục làm việc hiện tại:\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9271,7 +9688,7 @@
"checkout:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh."
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9281,7 +9698,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9291,7 +9708,7 @@
"trộn:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9301,7 +9718,7 @@
"trộn:\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9310,18 +9727,18 @@
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
-#: unpack-trees.c:148
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
-"%%s"
-
#: unpack-trees.c:154
#, c-format
msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
+"%%s"
+
+#: unpack-trees.c:160
+#, c-format
+msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%sPlease move or remove them before you switch branches."
@@ -9330,7 +9747,7 @@
"checkout:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh."
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9341,7 +9758,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9351,7 +9768,7 @@
"hòa trộn:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9361,7 +9778,7 @@
"hòa trộn:\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9371,7 +9788,7 @@
"%s:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9381,12 +9798,12 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Mục “%s” đè lên “%s”. Không thể buộc."
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -9395,7 +9812,7 @@
"Không thể cập nhật mô-đun-con:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -9406,7 +9823,7 @@
"mẫu sparse:\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9416,7 +9833,7 @@
"sparse:\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -9427,12 +9844,12 @@
"cấp các mẫu sparse:\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "Bãi bỏ\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9441,11 +9858,11 @@
"Sau khi sửa các đường dẫn phía trên, bạn có thể chạy “git sparse-checkout "
"reapply“.\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "Đang cập nhật các tập tin"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -9455,17 +9872,17 @@
"HOA/thường trên một hệ thống tập tin không phân biệt HOA/thường)\n"
"và chỉ một từ cùng một nhóm xung đột là trong cây làm việc hiện tại:\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1664
msgid "Updating index flags"
msgstr "Đang cập nhật các cờ mục lục"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2925
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
"cây làm việc và lần chuyển giao không được theo dõi có các mục trùng lặp: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1579
msgid "expected flush after fetch arguments"
msgstr "cần đẩy dữ liệu lên đĩa sau các tham số của lệnh fetch"
@@ -9502,114 +9919,138 @@
msgid "Fetching objects"
msgstr "Đang lấy về các đối tượng"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "gặp lỗi khi đọc “%s”"
-#: worktree.c:303
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "“%s” tại cây làm việc chình không phải là thư mục kho"
-#: worktree.c:314
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"tập tin “%s” không chứa đường dẫn tuyệt đối đến vị trí cây làm việc hiện"
-#: worktree.c:326
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "\"%s\" không tồn tại"
-#: worktree.c:332
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "“%s” không phải là tập tin .git, mã lỗi %d"
-#: worktree.c:341
+#: worktree.c:342
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "“%s” không chỉ ngược đến “%s”"
-#: worktree.c:603
+#: worktree.c:600
msgid "not a directory"
msgstr "không phải thư mục"
-#: worktree.c:612
+#: worktree.c:609
msgid ".git is not a file"
msgstr ".git không phải là một tập tin"
-#: worktree.c:614
+#: worktree.c:611
msgid ".git file broken"
msgstr "tệp .git bị hỏng"
-#: worktree.c:616
+#: worktree.c:613
msgid ".git file incorrect"
msgstr "tập tin .git không chính xác"
-#: worktree.c:722
+#: worktree.c:719
msgid "not a valid path"
msgstr "không phải là một đường dẫn hợp lệ"
-#: worktree.c:728
+#: worktree.c:725
msgid "unable to locate repository; .git is not a file"
msgstr "không thể phân bổ kho chứa; .git không phải là một tập tin"
-#: worktree.c:732
+#: worktree.c:729
msgid "unable to locate repository; .git file does not reference a repository"
msgstr "không thể phân bổ kho chứa; tập tin .git tham chiếu đến một kho"
-#: worktree.c:736
+#: worktree.c:733
msgid "unable to locate repository; .git file broken"
msgstr "không thể phân bổ kho chứa; tập tin .git bị hỏng"
-#: worktree.c:742
+#: worktree.c:739
msgid "gitdir unreadable"
msgstr "gitdir không thể đọc được"
-#: worktree.c:746
+#: worktree.c:743
msgid "gitdir incorrect"
msgstr "gitdir không chính xác"
-#: worktree.c:771
+#: worktree.c:768
msgid "not a valid directory"
msgstr "không phải thư mục hợp lệ"
-#: worktree.c:777
+#: worktree.c:774
msgid "gitdir file does not exist"
msgstr "tập tin gitdir không tồn tại"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:779 worktree.c:788
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "không thể đọc tập tin gitdir (%s)"
-#: worktree.c:801
+#: worktree.c:798
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "đọc ngắn (cần %<PRIuMAX> byte, đọc %<PRIuMAX>)"
-#: worktree.c:809
+#: worktree.c:806
msgid "invalid gitdir file"
msgstr "tập tin gitdir (thư mục git) không hợp lệ"
-#: worktree.c:817
+#: worktree.c:814
msgid "gitdir file points to non-existent location"
msgstr "tập tin gitdir chỉ đến vị trí không tồn tại"
-#: wrapper.c:197 wrapper.c:367
+#: worktree.c:830
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "không thể đặt %s trong “%s”"
+
+#: worktree.c:832
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "không thể bỏ đặt %s trong '%s'"
+
+#: worktree.c:852
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "gặp lỗi khi đặt cài đặt extensions.worktreeConfig"
+
+#: wrapper.c:161
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "không thể setenv “%s”"
+
+#: wrapper.c:213
+#, c-format
+msgid "unable to create '%s'"
+msgstr "không thể tạo “%s”"
+
+#: wrapper.c:215 wrapper.c:385
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "không thể mở “%s” để đọc và ghi"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:416 wrapper.c:683
#, c-format
msgid "unable to access '%s'"
msgstr "không thể truy cập “%s”"
-#: wrapper.c:607
+#: wrapper.c:691
msgid "unable to get current working directory"
msgstr "không thể lấy thư mục làm việc hiện hành"
@@ -9646,11 +10087,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1140
msgid "Changes to be committed:"
msgstr "Những thay đổi sẽ được chuyển giao:"
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1149
msgid "Changes not staged for commit:"
msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
@@ -9754,21 +10195,21 @@
msgid "untracked content, "
msgstr "nội dung chưa được theo dõi, "
-#: wt-status.c:958
+#: wt-status.c:973
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Bạn hiện nay ở trong phần cất đi đang có %d mục"
-#: wt-status.c:989
+#: wt-status.c:1004
msgid "Submodules changed but not updated:"
msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
-#: wt-status.c:991
+#: wt-status.c:1006
msgid "Submodule changes to be committed:"
msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
-#: wt-status.c:1073
+#: wt-status.c:1088
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9776,7 +10217,7 @@
"Không sửa hay xóa bỏ đường ở trên.\n"
"Mọi thứ phía dưới sẽ được xóa bỏ."
-#: wt-status.c:1165
+#: wt-status.c:1180
#, c-format
msgid ""
"\n"
@@ -9787,109 +10228,116 @@
"Nó cần %.2f giây để tính toán giá trị của trước/sau của nhánh.\n"
"Bạn có thể dùng “--no-ahead-behind” tránh phải điều này.\n"
-#: wt-status.c:1195
+#: wt-status.c:1210
msgid "You have unmerged paths."
msgstr "Bạn có những đường dẫn chưa được hòa trộn."
-#: wt-status.c:1198
+#: wt-status.c:1213
msgid " (fix conflicts and run \"git commit\")"
msgstr " (sửa các xung đột rồi chạy \"git commit\")"
-#: wt-status.c:1200
+#: wt-status.c:1215
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (dùng \"git merge --abort\" để bãi bỏ việc hòa trộn)"
-#: wt-status.c:1204
+#: wt-status.c:1219
msgid "All conflicts fixed but you are still merging."
msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn."
-#: wt-status.c:1207
+#: wt-status.c:1222
msgid " (use \"git commit\" to conclude merge)"
msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)"
-#: wt-status.c:1216
+#: wt-status.c:1233
msgid "You are in the middle of an am session."
msgstr "Bạn đang ở giữa của một phiên “am”."
-#: wt-status.c:1219
+#: wt-status.c:1236
msgid "The current patch is empty."
msgstr "Miếng vá hiện tại bị trống rỗng."
-#: wt-status.c:1223
+#: wt-status.c:1241
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")"
-#: wt-status.c:1225
+#: wt-status.c:1243
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)"
-#: wt-status.c:1227
+#: wt-status.c:1246
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+" (dùng \"git am --allow-empty\" ghi miếng vá này như một lần chuyển giao "
+"rỗng)"
+
+#: wt-status.c:1248
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
-#: wt-status.c:1360
+#: wt-status.c:1381
msgid "git-rebase-todo is missing."
msgstr "thiếu git-rebase-todo."
-#: wt-status.c:1362
+#: wt-status.c:1383
msgid "No commands done."
msgstr "Không thực hiện lệnh nào."
-#: wt-status.c:1365
+#: wt-status.c:1386
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):"
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Lệnh thực hiện cuối (%<PRIuMAX> lệnh được thực thi):"
-#: wt-status.c:1376
+#: wt-status.c:1397
#, c-format
msgid " (see more in file %s)"
msgstr " (xem thêm trong %s)"
-#: wt-status.c:1381
+#: wt-status.c:1402
msgid "No commands remaining."
msgstr "Không có lệnh nào còn lại."
-#: wt-status.c:1384
+#: wt-status.c:1405
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Lệnh cần làm kế tiếp (%d lệnh còn lại):"
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Lệnh cần làm kế tiếp (%<PRIuMAX> lệnh còn lại):"
-#: wt-status.c:1392
+#: wt-status.c:1413
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)"
-#: wt-status.c:1404
+#: wt-status.c:1425
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”."
-#: wt-status.c:1409
+#: wt-status.c:1430
msgid "You are currently rebasing."
msgstr "Bạn hiện nay đang thực hiện việc “rebase” (cải tổ)."
-#: wt-status.c:1422
+#: wt-status.c:1443
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")"
-#: wt-status.c:1424
+#: wt-status.c:1445
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)"
-#: wt-status.c:1426
+#: wt-status.c:1447
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)"
-#: wt-status.c:1433
+#: wt-status.c:1454
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"git rebase --"
"continue\")"
-#: wt-status.c:1437
+#: wt-status.c:1458
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9897,169 +10345,169 @@
"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi "
"đang “rebase” nhánh “%s” trên “%s”."
-#: wt-status.c:1442
+#: wt-status.c:1463
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc "
"rebase."
-#: wt-status.c:1445
+#: wt-status.c:1466
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Một khi thư mục làm việc của bạn đã gọn gàng, chạy lệnh “cải tổ” \"git "
"rebase --continue\")"
-#: wt-status.c:1449
+#: wt-status.c:1470
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang "
"rebase nhánh “%s” trên “%s”."
-#: wt-status.c:1454
+#: wt-status.c:1475
msgid "You are currently editing a commit during a rebase."
msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase."
-#: wt-status.c:1457
+#: wt-status.c:1478
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)"
-#: wt-status.c:1459
+#: wt-status.c:1480
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (chạy lệnh “cải tổ” \"git rebase --continue\" một khi bạn cảm thấy hài "
"lòng về những thay đổi của mình)"
-#: wt-status.c:1470
+#: wt-status.c:1491
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick hiện tại đang được thực hiện."
-#: wt-status.c:1473
+#: wt-status.c:1494
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s."
-#: wt-status.c:1480
+#: wt-status.c:1501
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
" (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")"
-#: wt-status.c:1483
+#: wt-status.c:1504
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (chạy lệnh \"git cherry-pick --continue\" để tiếp tục)"
-#: wt-status.c:1486
+#: wt-status.c:1507
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --"
"continue\")"
-#: wt-status.c:1488
+#: wt-status.c:1509
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (dùng \"git cherry-pick --skip\" để bỏ qua miếng vá này)"
-#: wt-status.c:1490
+#: wt-status.c:1511
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)"
-#: wt-status.c:1500
+#: wt-status.c:1521
msgid "Revert currently in progress."
msgstr "Hoàn nguyên hiện tại đang thực hiện."
-#: wt-status.c:1503
+#: wt-status.c:1524
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s”."
-#: wt-status.c:1509
+#: wt-status.c:1530
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")"
-#: wt-status.c:1512
+#: wt-status.c:1533
msgid " (run \"git revert --continue\" to continue)"
msgstr " (chạy lệnh \"git revert --continue\" để tiếp tục)"
-#: wt-status.c:1515
+#: wt-status.c:1536
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")"
-#: wt-status.c:1517
+#: wt-status.c:1538
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (dùng lệnh \"git revert --skip\" để bỏ qua lần vá này)"
-#: wt-status.c:1519
+#: wt-status.c:1540
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác hoàn nguyên)"
-#: wt-status.c:1529
+#: wt-status.c:1550
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
"Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ "
"nhánh “%s”."
-#: wt-status.c:1533
+#: wt-status.c:1554
msgid "You are currently bisecting."
msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)."
-#: wt-status.c:1536
+#: wt-status.c:1557
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
-#: wt-status.c:1547
+#: wt-status.c:1568
msgid "You are in a sparse checkout."
msgstr "Bạn đang trong lần lấy ra sparse."
-#: wt-status.c:1550
+#: wt-status.c:1571
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
"Bạn đang ở trong lần lấy ra sparser %d%% của các tập tin được theo dõi hiện "
"tại."
-#: wt-status.c:1794
+#: wt-status.c:1815
msgid "On branch "
msgstr "Trên nhánh "
-#: wt-status.c:1801
+#: wt-status.c:1822
msgid "interactive rebase in progress; onto "
msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
-#: wt-status.c:1803
+#: wt-status.c:1824
msgid "rebase in progress; onto "
msgstr "rebase đang được thực hiện: lên trên "
-#: wt-status.c:1808
+#: wt-status.c:1829
msgid "HEAD detached at "
msgstr "HEAD được tách rời tại "
-#: wt-status.c:1810
+#: wt-status.c:1831
msgid "HEAD detached from "
msgstr "HEAD được tách rời từ "
-#: wt-status.c:1813
+#: wt-status.c:1834
msgid "Not currently on any branch."
msgstr "Hiện tại chẳng ở nhánh nào cả."
-#: wt-status.c:1830
+#: wt-status.c:1851
msgid "Initial commit"
msgstr "Lần chuyển giao khởi tạo"
-#: wt-status.c:1831
+#: wt-status.c:1852
msgid "No commits yet"
msgstr "Vẫn chưa chuyển giao"
-#: wt-status.c:1845
+#: wt-status.c:1866
msgid "Untracked files"
msgstr "Những tập tin chưa được theo dõi"
-#: wt-status.c:1847
+#: wt-status.c:1868
msgid "Ignored files"
msgstr "Những tập tin bị lờ đi"
-#: wt-status.c:1851
+#: wt-status.c:1872
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10071,32 +10519,32 @@
"có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n"
"tự thêm các tập tin mới (xem “git help status”.."
-#: wt-status.c:1857
+#: wt-status.c:1878
#, c-format
msgid "Untracked files not listed%s"
msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s"
-#: wt-status.c:1859
+#: wt-status.c:1880
msgid " (use -u option to show untracked files)"
msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)"
-#: wt-status.c:1865
+#: wt-status.c:1886
msgid "No changes"
msgstr "Không có thay đổi nào"
-#: wt-status.c:1870
+#: wt-status.c:1891
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc "
"\"git commit -a\")\n"
-#: wt-status.c:1874
+#: wt-status.c:1895
#, c-format
msgid "no changes added to commit\n"
msgstr "không có thay đổi nào được thêm vào để chuyển giao\n"
-#: wt-status.c:1878
+#: wt-status.c:1899
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -10105,232 +10553,241 @@
"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
"theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n"
-#: wt-status.c:1882
+#: wt-status.c:1903
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
"theo dõi hiện diện\n"
-#: wt-status.c:1886
+#: wt-status.c:1907
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để "
"đưa vào theo dõi)\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1911 wt-status.c:1917
#, c-format
msgid "nothing to commit\n"
msgstr "không có gì để chuyển giao\n"
-#: wt-status.c:1893
+#: wt-status.c:1914
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n"
-#: wt-status.c:1898
+#: wt-status.c:1919
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
-#: wt-status.c:2003
+#: wt-status.c:2024
msgid "No commits yet on "
msgstr "Vẫn không thực hiện lệnh chuyển giao nào "
-#: wt-status.c:2007
+#: wt-status.c:2028
msgid "HEAD (no branch)"
msgstr "HEAD (không nhánh)"
-#: wt-status.c:2038
+#: wt-status.c:2059
msgid "different"
msgstr "khác"
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2061 wt-status.c:2069
msgid "behind "
msgstr "đằng sau "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2064 wt-status.c:2067
msgid "ahead "
msgstr "phía trước "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2605
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: wt-status.c:2575
+#: wt-status.c:2611
msgid "additionally, your index contains uncommitted changes."
msgstr ""
"thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: wt-status.c:2577
+#: wt-status.c:2613
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
"không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "không thể gửi lệnh IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "không thể đọc đáp ứng IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "không thể khởi chạy accept_thread “%s”"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "không thể khởi chạy bộ làm việc worker[0] cho “%s”"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:353
#, c-format
msgid "failed to unlink '%s'"
msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”"
+#: compat/fsmonitor/fsm-listen-darwin.c:355
+msgid "Unable to create FSEventStream."
+msgstr "Không thể tạo FSEventStream."
+
+#: compat/fsmonitor/fsm-listen-darwin.c:403
+msgid "Failed to start the FSEventStream"
+msgstr "Gặp lỗi khi khởi chạy FSEventStream"
+
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<các tùy chọn>] [--] <pathspec>…"
-#: builtin/add.c:61
+#: builtin/add.c:63
#, c-format
msgid "cannot chmod %cx '%s'"
-msgstr "không thể chmod %cx '%s'"
+msgstr "không thể chmod %cx “%s”"
-#: builtin/add.c:99
+#: builtin/add.c:105
#, c-format
msgid "unexpected diff status %c"
msgstr "trạng thái lệnh diff không như mong đợi %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:110 builtin/commit.c:299
msgid "updating files failed"
msgstr "cập nhật tập tin gặp lỗi"
-#: builtin/add.c:114
+#: builtin/add.c:120
#, c-format
msgid "remove '%s'\n"
msgstr "gỡ bỏ “%s”\n"
-#: builtin/add.c:198
+#: builtin/add.c:204
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Đưa ra khỏi bệ phóng các thay đổi sau khi làm tươi mới lại bảng mục lục:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:312 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Không thể đọc bảng mục lục"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Không thể mở “%s” để ghi."
-
-#: builtin/add.c:322
+#: builtin/add.c:325
msgid "Could not write patch"
msgstr "Không thể ghi ra miếng vá"
-#: builtin/add.c:325
+#: builtin/add.c:328
msgid "editing patch failed"
msgstr "gặp lỗi khi sửa miếng vá"
-#: builtin/add.c:328
+#: builtin/add.c:331
#, c-format
msgid "Could not stat '%s'"
msgstr "Không thể lấy thông tin thống kê về “%s”"
-#: builtin/add.c:330
+#: builtin/add.c:333
msgid "Empty patch. Aborted."
msgstr "Miếng vá trống rỗng. Nên bỏ qua."
-#: builtin/add.c:335
+#: builtin/add.c:339
#, c-format
msgid "Could not apply '%s'"
msgstr "Không thể áp dụng miếng vá “%s”"
-#: builtin/add.c:343
+#: builtin/add.c:347
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore "
"của bạn:\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "chạy thử"
-#: builtin/add.c:366
+#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "chi tiết"
+
+#: builtin/add.c:370
msgid "interactive picking"
msgstr "sửa bằng cách tương tác"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
msgid "select hunks interactively"
msgstr "chọn “hunks” theo kiểu tương tác"
-#: builtin/add.c:368
+#: builtin/add.c:372
msgid "edit current diff and apply"
msgstr "sửa diff hiện nay và áp dụng nó"
-#: builtin/add.c:369
+#: builtin/add.c:373
msgid "allow adding otherwise ignored files"
msgstr "cho phép thêm các tập tin bị bỏ qua khác"
-#: builtin/add.c:370
+#: builtin/add.c:374
msgid "update tracked files"
msgstr "cập nhật các tập tin được theo dõi"
-#: builtin/add.c:371
+#: builtin/add.c:375
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "thường hóa lại EOL của các tập tin được theo dõi (ý là -u)"
-#: builtin/add.c:372
+#: builtin/add.c:376
msgid "record only the fact that the path will be added later"
msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau"
-#: builtin/add.c:373
+#: builtin/add.c:377
msgid "add changes from all tracked and untracked files"
msgstr ""
"thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu "
"vết"
-#: builtin/add.c:376
+#: builtin/add.c:380
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"lờ đi các đường dẫn bị gỡ bỏ trong cây thư mục làm việc (giống với --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:382
msgid "don't add, only refresh the index"
msgstr "không thêm, chỉ làm tươi mới bảng mục lục"
-#: builtin/add.c:379
+#: builtin/add.c:383
msgid "just skip files which cannot be added because of errors"
msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi"
-#: builtin/add.c:380
+#: builtin/add.c:384
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "cho phép cập nhật các mục ở ngoài “sparse-checkout cone”"
+
+#: builtin/add.c:387 builtin/update-index.c:1023
msgid "override the executable bit of the listed files"
msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê"
-#: builtin/add.c:384
+#: builtin/add.c:389
msgid "warn when adding an embedded repository"
msgstr "cảnh báo khi thêm một kho nhúng"
-#: builtin/add.c:386
-msgid "backend for `git stash -p`"
-msgstr "ứng dụng chạy phía sau cho “git stash -p”"
-
-#: builtin/add.c:404
+#: builtin/add.c:407
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10361,12 +10818,12 @@
"\n"
"Xem \"git help submodule\" để biết thêm chi tiết."
-#: builtin/add.c:432
+#: builtin/add.c:436
#, c-format
msgid "adding embedded git repository: %s"
msgstr "thêm cần một kho git nhúng: %s"
-#: builtin/add.c:451
+#: builtin/add.c:456
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10376,51 +10833,27 @@
"Tắt thông báo này bằng cách chạy lệnh\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:471
msgid "adding files failed"
msgstr "thêm tập tin gặp lỗi"
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run xung khắc với --interactive/--patch"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file xung khắc với --interactive/--patch"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file xung khắc với --edit"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A và -u xung khắc nhau"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run"
-
-#: builtin/add.c:526
+#: builtin/add.c:534
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod tham số “%s” phải hoặc là -x hay +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file xung khắc với các tham số đặc tả đường dẫn"
+#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
+#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "'%s' và các tham số đặc tả đường dẫn không thể dùng cùng nhau"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul cần --pathspec-from-file"
-
-#: builtin/add.c:555
+#: builtin/add.c:566
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n"
-#: builtin/add.c:557
+#: builtin/add.c:568
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10430,109 +10863,112 @@
"Tắt thông báo này bằng cách chạy lệnh\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:393
msgid "could not parse author script"
msgstr "không thể phân tích cú pháp văn lệnh tác giả"
-#: builtin/am.c:455
+#: builtin/am.c:483
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "“%s” bị xóa bởi móc applypatch-msg"
-#: builtin/am.c:497
+#: builtin/am.c:525
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Dòng đầu vào dị hình: “%s”."
-#: builtin/am.c:535
+#: builtin/am.c:563
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s” tới “%s”"
-#: builtin/am.c:561
+#: builtin/am.c:589
msgid "fseek failed"
msgstr "fseek gặp lỗi"
-#: builtin/am.c:749
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "không thể phân tích cú pháp “%s”"
-#: builtin/am.c:814
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc"
-#: builtin/am.c:862
+#: builtin/am.c:890
msgid "invalid timestamp"
msgstr "dấu thời gian không hợp lệ"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:895 builtin/am.c:907
msgid "invalid Date line"
msgstr "dòng Ngày tháng không hợp lệ"
-#: builtin/am.c:874
+#: builtin/am.c:902
msgid "invalid timezone offset"
msgstr "độ lệch múi giờ không hợp lệ"
-#: builtin/am.c:967
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Dò tìm định dạng miếng vá gặp lỗi."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:1000 builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/am.c:977
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "Gặp lỗi khi chia nhỏ các miếng vá."
-#: builtin/am.c:1126
+#: builtin/am.c:1154
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Khi bạn đã giải quyết xong trục trặc này, hãy chạy \"%s --continue\"."
-#: builtin/am.c:1127
+#: builtin/am.c:1155
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Nếu bạn muốn bỏ qua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế."
-#: builtin/am.c:1128
+#: builtin/am.c:1160
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Để ghi một miếng vá trống rỗng như một lần chuyển giao rông, \"%s --allow-"
+"empty\"."
+
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "Để phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"."
-#: builtin/am.c:1223
+#: builtin/am.c:1257
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Miếng vá được gửi với format=flowed; khoảng trống ở cuối của các dòng có thể "
"bị mất."
-#: builtin/am.c:1251
-msgid "Patch is empty."
-msgstr "Miếng vá trống rỗng."
-
-#: builtin/am.c:1316
+#: builtin/am.c:1345
#, c-format
msgid "missing author line in commit %s"
msgstr "thiếu dòng tác giả trong lần chuyển gia %s"
-#: builtin/am.c:1319
+#: builtin/am.c:1348
#, c-format
msgid "invalid ident line: %.*s"
msgstr "dòng định danh không hợp lệ: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1567
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Kho thiếu đối tượng blob cần thiết để thực hiện “3-way merge”."
-#: builtin/am.c:1540
+#: builtin/am.c:1569
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…"
-#: builtin/am.c:1559
+#: builtin/am.c:1588
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10540,24 +10976,24 @@
"Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n"
"Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó."
-#: builtin/am.c:1565
+#: builtin/am.c:1594
msgid "Falling back to patching base and 3-way merge..."
msgstr "Đang dùng phương án dự phòng: vá bản cơ sở và “hòa trộn 3-đường”…"
-#: builtin/am.c:1591
+#: builtin/am.c:1620
msgid "Failed to merge in the changes."
msgstr "Gặp lỗi khi trộn vào các thay đổi."
-#: builtin/am.c:1623
+#: builtin/am.c:1652
msgid "applying to an empty history"
msgstr "áp dụng vào một lịch sử trống rỗng"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1704 builtin/am.c:1708
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "không thể phục hồi: %s không tồn tại."
-#: builtin/am.c:1697
+#: builtin/am.c:1726
msgid "Commit Body is:"
msgstr "Thân của lần chuyển giao là:"
@@ -10565,41 +11001,59 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1736
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Áp dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/chấp nhận tất "
"cả [a]: "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1782 builtin/commit.c:410
msgid "unable to write index file"
msgstr "không thể ghi tập tin lưu mục lục"
-#: builtin/am.c:1757
+#: builtin/am.c:1786
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1828
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Đang bỏ qua: %.*s"
+
+#: builtin/am.c:1833
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Đang tạo một lần chuyển giao trống rỗng: %.*s"
+
+#: builtin/am.c:1837
+msgid "Patch is empty."
+msgstr "Miếng vá trống rỗng."
+
+#: builtin/am.c:1848 builtin/am.c:1917
#, c-format
msgid "Applying: %.*s"
msgstr "Áp dụng: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1865
msgid "No changes -- Patch already applied."
msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi."
-#: builtin/am.c:1820
+#: builtin/am.c:1871
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Gặp lỗi khi vá tại %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1875
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "Dùng “git am --show-current-patch=diff” để xem miếng vá bị lỗi"
-#: builtin/am.c:1868
+#: builtin/am.c:1921
+msgid "No changes - recorded it as an empty commit."
+msgstr "Không có thay đổi nào - được ghi thành một lần chuyển giao rỗng."
+
+#: builtin/am.c:1923
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10610,7 +11064,7 @@
"đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng "
"vá này."
-#: builtin/am.c:1875
+#: builtin/am.c:1931
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10623,17 +11077,17 @@
"Bạn có lẽ muốn chạy “git rm“ trên một tập tin để chấp nhận \"được xóa bởi họ"
"\" cho nó."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
+#: builtin/reset.c:463
#, c-format
msgid "Could not parse object '%s'."
msgstr "Không thể phân tích đối tượng “%s”."
-#: builtin/am.c:2034
+#: builtin/am.c:2091 builtin/am.c:2167
msgid "failed to clean index"
msgstr "gặp lỗi khi dọn bảng mục lục"
-#: builtin/am.c:2078
+#: builtin/am.c:2135
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10641,160 +11095,159 @@
"Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n"
"Không thể chuyển tới ORIG_HEAD"
-#: builtin/am.c:2185
+#: builtin/am.c:2292
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Giá trị không hợp lệ cho --patch-format: %s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "tùy chọn '%s=%s' và '%s=%s' không thể dùng cùng nhau"
-#: builtin/am.c:2227
-#, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr "Giá trị không hợp lệ cho --show-current-patch: %s"
-
-#: builtin/am.c:2231
-#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s xung khắc với --show-current-patch=%s"
-
-#: builtin/am.c:2262
+#: builtin/am.c:2323
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<các tùy chọn>] [(<mbox>|<Maildir>)…]"
-#: builtin/am.c:2263
+#: builtin/am.c:2324
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<các tùy chọn>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2330
msgid "run interactively"
msgstr "chạy kiểu tương tác"
-#: builtin/am.c:2271
+#: builtin/am.c:2332
msgid "historical option -- no-op"
msgstr "tùy chọn lịch sử -- không-toán-tử"
-#: builtin/am.c:2273
+#: builtin/am.c:2334
msgid "allow fall back on 3way merging if needed"
msgstr "cho phép quay trở lại để hòa trộn kiểu “3way” nếu cần"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:646 builtin/stash.c:946
msgid "be quiet"
msgstr "im lặng"
-#: builtin/am.c:2276
+#: builtin/am.c:2337
msgid "add a Signed-off-by trailer to the commit message"
msgstr "thêm dòng Signed-off-by vào cuối ghi chú của lần chuyển giao"
-#: builtin/am.c:2279
+#: builtin/am.c:2340
msgid "recode into utf8 (default)"
msgstr "chuyển mã thành utf8 (mặc định)"
-#: builtin/am.c:2281
+#: builtin/am.c:2342
msgid "pass -k flag to git-mailinfo"
msgstr "chuyển cờ -k cho git-mailinfo"
-#: builtin/am.c:2283
+#: builtin/am.c:2344
msgid "pass -b flag to git-mailinfo"
msgstr "chuyển cờ -b cho git-mailinfo"
-#: builtin/am.c:2285
+#: builtin/am.c:2346
msgid "pass -m flag to git-mailinfo"
msgstr "chuyển cờ -m cho git-mailinfo"
-#: builtin/am.c:2287
+#: builtin/am.c:2348
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "chuyển cờ --keep-cr cho git-mailsplit với định dạng mbox"
-#: builtin/am.c:2290
+#: builtin/am.c:2351
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"đừng chuyển cờ --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr"
-#: builtin/am.c:2293
+#: builtin/am.c:2354
msgid "strip everything before a scissors line"
msgstr "cắt mọi thứ trước dòng scissors"
-#: builtin/am.c:2295
+#: builtin/am.c:2356
msgid "pass it through git-mailinfo"
msgstr "chuyển nó qua git-mailinfo"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
+#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
+#: builtin/am.c:2386
msgid "pass it through git-apply"
msgstr "chuyển nó qua git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
+#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
+#: parse-options.h:348
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
-#: builtin/verify-tag.c:38
+#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
+#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
+#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
+#: builtin/tag.c:480 builtin/verify-tag.c:38
msgid "format"
msgstr "định dạng"
-#: builtin/am.c:2322
+#: builtin/am.c:2383
msgid "format the patch(es) are in"
msgstr "định dạng (các) miếng vá theo"
-#: builtin/am.c:2328
+#: builtin/am.c:2389
msgid "override error message when patch failure occurs"
msgstr "đè lên các lời nhắn lỗi khi xảy ra lỗi vá nghiêm trọng"
-#: builtin/am.c:2330
+#: builtin/am.c:2391
msgid "continue applying patches after resolving a conflict"
msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột"
-#: builtin/am.c:2333
+#: builtin/am.c:2394
msgid "synonyms for --continue"
msgstr "đồng nghĩa với --continue"
-#: builtin/am.c:2336
+#: builtin/am.c:2397
msgid "skip the current patch"
msgstr "bỏ qua miếng vá hiện hành"
-#: builtin/am.c:2339
+#: builtin/am.c:2400
msgid "restore the original branch and abort the patching operation"
msgstr "phục hồi lại nhánh gốc và loại bỏ thao tác vá"
-#: builtin/am.c:2342
+#: builtin/am.c:2403
msgid "abort the patching operation but keep HEAD where it is"
msgstr "bỏ qua thao tác vá nhưng vẫn giữ HEAD nơi nó chỉ đến"
-#: builtin/am.c:2346
+#: builtin/am.c:2407
msgid "show the patch being applied"
msgstr "hiển thị miếng vá đã được áp dụng rồi"
-#: builtin/am.c:2351
+#: builtin/am.c:2411
+msgid "record the empty patch as an empty commit"
+msgstr "ghi lại miếng vá trống rỗng như là một lần chuyển giao trống"
+
+#: builtin/am.c:2415
msgid "lie about committer date"
msgstr "nói dối về ngày chuyển giao"
-#: builtin/am.c:2353
+#: builtin/am.c:2417
msgid "use current timestamp for author date"
msgstr "dùng dấu thời gian hiện tại cho ngày tác giả"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
+#: builtin/revert.c:117 builtin/tag.c:461
msgid "key-id"
msgstr "mã-số-khóa"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2420 builtin/rebase.c:1128
msgid "GPG-sign commits"
msgstr "Các lần chuyển giao ký-GPG"
-#: builtin/am.c:2359
+#: builtin/am.c:2423
+msgid "how to handle empty patches"
+msgstr "xử lý các miếng vá trống rỗng như thế nào"
+
+#: builtin/am.c:2426
msgid "(internal use for git-rebase)"
msgstr "(dùng nội bộ cho git-rebase)"
-#: builtin/am.c:2377
+#: builtin/am.c:2444
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."
@@ -10802,16 +11255,16 @@
"Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n"
"nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa."
-#: builtin/am.c:2384
+#: builtin/am.c:2451
msgid "failed to read the index"
msgstr "gặp lỗi đọc bảng mục lục"
-#: builtin/am.c:2399
+#: builtin/am.c:2466
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra."
-#: builtin/am.c:2423
+#: builtin/am.c:2490
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10820,11 +11273,11 @@
"Tìm thấy thư mục lạc %s.\n"
"Dùng \"git am --abort\" để loại bỏ nó đi."
-#: builtin/am.c:2429
+#: builtin/am.c:2496
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại."
-#: builtin/am.c:2439
+#: builtin/am.c:2506
msgid "interactive mode requires patches on the command line"
msgstr "chế độ tương tác yêu cầu có các miếng vá trên dòng lệnh"
@@ -10832,52 +11285,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<các tùy chọn>] [<miếng-vá>…]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "không thể tạo tập tin kho (lưu trữ, nén) “%s”"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "không thể chuyển hướng kết xuất"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Máy chủ không có địa chỉ URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: cần ACK/NAK, nhưng lại nhận được gói flush"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: lỗi giao thức"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: cần một flush (đẩy dữ liệu lên đĩa)"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<lần_chuyển_giao>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <lúc_sai> <lúc_đúng> [<term>]"
-
-#: builtin/bisect--helper.c:25
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-
#: builtin/bisect--helper.c:26
msgid ""
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
@@ -10888,10 +11324,6 @@
"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>…]] [--] [</các/"
"đường/dẫn>…]"
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-next"
-
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
msgstr "git bisect--helper --bisect-state (bad|new) [<lần_chuyển_giao>]"
@@ -10906,48 +11338,57 @@
#: builtin/bisect--helper.c:32
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr "git bisect--helper --bisect-skip [(<rev>|<vùng>)...]"
+msgstr "git bisect--helper --bisect-skip [(<rev>|<vùng>)…]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <lệnh>…"
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "không thể mở tập tin “%s” ở chế độ “%s”"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "không thể ghi vào tập tin “%s”"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "không thể mở tập tin “%s” để đọc"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "“%s” không phải một thời hạn hợp lệ"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "không thể dùng lệnh tích hợp “%s” như là một thời kỳ"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "không thể thay đổi nghĩa của thời kỳ “%s”"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "vui lòng dùng hai thời kỳ khác nhau"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "Chúng tôi đang không bisect.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "“%s” không phải một lần chuyển giao hợp lệ"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10955,27 +11396,27 @@
"không thể lấy ra HEAD nguyên thủy của “%s”. Hãy thử “git bisect reset <lần-"
"chuyển-giao>”."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Đối số bisect_write sai: %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "không thể lấy oid của điểm xét duyệt “%s”"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "không thể mở tập tin “%s”"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Lệnh không hợp lệ: bạn hiện đang ở một bisect %s/%s"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10984,7 +11425,7 @@
"Bạn phải chỉ cho tôi ít nhất một điểm %s và một %s.\n"
"Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho cái đó."
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10995,7 +11436,7 @@
"Bạn sau đó cần phải chỉ cho tôi ít nhất một điểm xét duyệt %s và một %s.\n"
"Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho chúng."
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "chỉ thực hiện việc bisect với một lần chuyển giao %s"
@@ -11004,15 +11445,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Bạn có chắc chắn chưa [Y/n]? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "chưa định nghĩa thời kỳ nào"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11021,7 +11462,7 @@
"Bạn hiện tại đang ở thời kỳ %s cho tình trạng cũ\n"
"và %s cho tình trạng mới.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11030,52 +11471,52 @@
"tham số không hợp lệ %s cho “git bisect terms”.\n"
"Các tùy chọn hỗ trợ là: --term-good|--term-old và --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "gặp lỗi cài đặt việc di chuyển qua các điểm xét duyệt\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "không thể mở “%s” để nối thêm"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "” không phải một thời hạn hợp lệ"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "tùy chọn không được thừa nhận: “%s”"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "“%s” không có vẻ như là một điểm xét duyệt hợp lệ"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "sai HEAD - Tôi cần một HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "lấy ra “%s” ra gặp lỗi. Hãy thử \"git bisect reset <nhánh_hợp_lệ>\"."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "sẽ không di chuyển nửa bước trên cây được cg-seek"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "sai HEAD - tham chiếu mềm kỳ lạ"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "refspec không hợp lệ: “%s”"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Bạn cần khởi đầu bằng \"git bisect start\"\n"
@@ -11083,105 +11524,161 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Bạn có muốn tôi thực hiện điều này cho bạn không [Y/n]? "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Hãy gọi “--bisect-state” với ít nhất một đối số"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "“git bisect %s” có thể lấy chỉ một đối số."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Đầu vào rev sai: %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Đầu vào rev sai (không phải là lần chuyển giao): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Chúng tôi không bisect."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
-msgstr "'%s'?? bạn đang nói gì thế?"
+msgstr "“%s”?? bạn đang nói gì thế?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
-msgstr "không thể đọc tập tin '%s' để thao diễn lại"
+msgstr "không thể đọc tập tin “%s” để thao diễn lại"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#, c-format
+msgid "running %s\n"
+msgstr "đang chạy %s\n"
+
+#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+msgid "bisect run failed: no command provided."
+msgstr "bisect chạy gặp lỗi: không đưa ra lệnh."
+
+#: builtin/bisect--helper.c:1166
+#, c-format
+msgid "unable to verify '%s' on good revision"
+msgstr "không thể xác nhận “%s” trên điểm xét duyệt tốt"
+
+#: builtin/bisect--helper.c:1172
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr "mã thoát giả %d cho điểm xét duyệt tốt"
+
+#: builtin/bisect--helper.c:1180
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "chạy bisect gặp lỗi: mã trả về %d từ lệnh “%s” là < 0 hoặc >= 128"
+
+#: builtin/bisect--helper.c:1195
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "không thể mở “%s” để ghi"
+
+#: builtin/bisect--helper.c:1213
+msgid "bisect run cannot continue any more"
+msgstr "bisect không thể tiếp tục thêm được nữa"
+
+#: builtin/bisect--helper.c:1215
+#, c-format
+msgid "bisect run success"
+msgstr "bisect chạy thành công"
+
+#: builtin/bisect--helper.c:1218
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "bisect tìm thấy lần chuyển giao sai đầu tiên"
+
+#: builtin/bisect--helper.c:1221
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"chạy bisect gặp lỗi: “git bisect--helper --bisect-state %s” đã thoát ra với "
+"mã lỗi %d"
+
+#: builtin/bisect--helper.c:1253
msgid "reset the bisection state"
msgstr "đặt lại trạng di chuyển nửa bước"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1255
msgid "check whether bad or good terms exist"
msgstr "kiểm tra xem các thời điểm xấu/tốt có tồn tại không"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1257
msgid "print out the bisect terms"
msgstr "in ra các thời điểm di chuyển nửa bước"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1259
msgid "start the bisect session"
msgstr "bắt đầu phiên di chuyển nửa bước"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1261
msgid "find the next bisection commit"
msgstr "tìm lần chuyển giao không di chuyển phân đôi"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1263
msgid "mark the state of ref (or refs)"
msgstr "đánh dấu trạng thái ref (hoặc refs)"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1265
msgid "list the bisection steps so far"
msgstr "liệt kê các bước bisection đi quá xa"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1267
msgid "replay the bisection process from the given file"
msgstr "phát lại quá trình bisection từ tệp đã cho"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1269
msgid "skip some commits for checkout"
msgstr "bỏ qua một số lần chuyển giao để lấy ra"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1271
+msgid "visualize the bisection"
+msgstr "trực quan việc di chuyển nửa bước"
+
+#: builtin/bisect--helper.c:1273
+msgid "use <cmd>... to automatically bisect"
+msgstr "dùng <cmd>… để bisect một cách tự động"
+
+#: builtin/bisect--helper.c:1275
msgid "no log for BISECT_WRITE"
msgstr "không có nhật ký cho BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1290
msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
"--bisect-reset requires không nhận đối số cũng không nhận lần chuyển giao"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check cần 2 hoặc 3 tham số"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1295
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms cần 0 hoặc 1 tham số"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1304
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next cần 0 tham số"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1315
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log cần 0 tham số"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1320
msgid "no logfile given"
msgstr "chưa chỉ ra tập tin ghi nhật ký"
@@ -11193,152 +11690,145 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "cần một màu: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "phải kết thúc bằng một màu"
-#: builtin/blame.c:728
-#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "màu không hợp lệ “%s” trong color.blame.repeatedLines"
-
-#: builtin/blame.c:746
-msgid "invalid value for blame.coloring"
-msgstr "màu không hợp lệ cho blame.coloring"
-
-#: builtin/blame.c:845
+#: builtin/blame.c:842
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "không thể tìm thấy điểm xét duyệt %s để mà bỏ qua"
-#: builtin/blame.c:867
+#: builtin/blame.c:864
msgid "show blame entries as we find them, incrementally"
msgstr "hiển thị các mục “blame” như là chúng ta thấy chúng, tăng dần"
-#: builtin/blame.c:868
+#: builtin/blame.c:865
msgid "do not show object names of boundary commits (Default: off)"
msgstr ""
"đừng hiển thị tên đối tượng của những lần chuyển giao biên giới (Mặc định: "
"off)"
-#: builtin/blame.c:869
+#: builtin/blame.c:866
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)"
-#: builtin/blame.c:870
+#: builtin/blame.c:867
msgid "show work cost statistics"
msgstr "hiển thị thống kê công sức làm việc"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
+#: builtin/remote.c:683 builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "ép buộc báo cáo tiến triển công việc"
-#: builtin/blame.c:872
+#: builtin/blame.c:869
msgid "show output score for blame entries"
msgstr "hiển thị kết xuất điểm số cho các mục tin “blame”"
-#: builtin/blame.c:873
+#: builtin/blame.c:870
msgid "show original filename (Default: auto)"
msgstr "hiển thị tên tập tin gốc (Mặc định: auto)"
-#: builtin/blame.c:874
+#: builtin/blame.c:871
msgid "show original linenumber (Default: off)"
msgstr "hiển thị số dòng gốc (Mặc định: off)"
-#: builtin/blame.c:875
+#: builtin/blame.c:872
msgid "show in a format designed for machine consumption"
msgstr "hiển thị ở định dạng đã thiết kế cho dùng bằng máy"
-#: builtin/blame.c:876
+#: builtin/blame.c:873
msgid "show porcelain format with per-line commit information"
msgstr "hiển thị định dạng “porcelain” với thông tin chuyển giao mỗi dòng"
-#: builtin/blame.c:877
+#: builtin/blame.c:874
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "dùng cùng chế độ xuất ra với git-annotate (Mặc định: off)"
-#: builtin/blame.c:878
+#: builtin/blame.c:875
msgid "show raw timestamp (Default: off)"
msgstr "hiển thị dấu vết thời gian dạng thô (Mặc định: off)"
-#: builtin/blame.c:879
+#: builtin/blame.c:876
msgid "show long commit SHA1 (Default: off)"
msgstr "hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)"
-#: builtin/blame.c:880
+#: builtin/blame.c:877
msgid "suppress author name and timestamp (Default: off)"
msgstr "không hiển thị tên tác giả và dấu vết thời gian (Mặc định: off)"
-#: builtin/blame.c:881
+#: builtin/blame.c:878
msgid "show author email instead of name (Default: off)"
msgstr "hiển thị thư điện tử của tác giả thay cho tên (Mặc định: off)"
-#: builtin/blame.c:882
+#: builtin/blame.c:879
msgid "ignore whitespace differences"
msgstr "bỏ qua các khác biệt do khoảng trắng gây ra"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:880 builtin/log.c:1857
msgid "rev"
msgstr "rev"
-#: builtin/blame.c:883
+#: builtin/blame.c:880
msgid "ignore <rev> when blaming"
msgstr "bỏ qua <rev> khi blame"
-#: builtin/blame.c:884
+#: builtin/blame.c:881
msgid "ignore revisions from <file>"
msgstr "bỏ qua các điểm xét duyệt từ <tập tin>"
-#: builtin/blame.c:885
+#: builtin/blame.c:882
msgid "color redundant metadata from previous line differently"
msgstr "siêu dữ liệu dư thừa màu từ dòng trước khác hẳn"
-#: builtin/blame.c:886
+#: builtin/blame.c:883
msgid "color lines by age"
msgstr "các dòng màu theo tuổi"
-#: builtin/blame.c:887
+#: builtin/blame.c:884
msgid "spend extra cycles to find better match"
msgstr "tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa"
-#: builtin/blame.c:888
+#: builtin/blame.c:885
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr ""
"sử dụng các điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”"
-#: builtin/blame.c:889
+#: builtin/blame.c:886
msgid "use <file>'s contents as the final image"
msgstr "sử dụng nội dung của <tập tin> như là ảnh cuối cùng"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:887 builtin/blame.c:888
msgid "score"
msgstr "điểm số"
-#: builtin/blame.c:890
+#: builtin/blame.c:887
msgid "find line copies within and across files"
msgstr "tìm các bản sao chép dòng trong và ngang qua tập tin"
-#: builtin/blame.c:891
+#: builtin/blame.c:888
msgid "find line movements within and across files"
msgstr "tìm các di chuyển dòng trong và ngang qua tập tin"
-#: builtin/blame.c:892
+#: builtin/blame.c:889
msgid "range"
msgstr "vùng"
-#: builtin/blame.c:893
+#: builtin/blame.c:890
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "xử lý chỉ dòng vùng <đầu>,<cuối> hoặc tính năng :<funcname>"
-#: builtin/blame.c:945
+#: builtin/blame.c:949
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress không được dùng cùng với --incremental hay các định dạng porcelain"
@@ -11351,17 +11841,17 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:1000
msgid "4 years, 11 months ago"
msgstr "4 năm, 11 tháng trước"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1116
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "tập tin %s chỉ có %lu dòng"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1161
msgid "Blaming lines"
msgstr "Các dòng blame"
@@ -11370,30 +11860,38 @@
msgstr "git branch [<các tùy chọn>] [-r | -a] [--merged] [ --no-merged]"
#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<các tùy chọn>] [-l] [-f] <tên-nhánh> [<điểm-đầu>]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr ""
+"git branch [<các tùy chọn>] [-f] [--recurse-submodules] <tên-nhánh> [<điểm-"
+"đầu>]"
#: builtin/branch.c:31
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<các tùy chọn>] [-l] [<mẫu>...]"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<các tùy chọn>] [-r] (-d | -D) <tên-nhánh> …"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<các tùy chọn>] (-m | -M) [<nhánh-cũ>] <nhánh-mới>"
-#: builtin/branch.c:33
+#: builtin/branch.c:34
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<các tùy chọn>] (-c | -C) [<nhánh-cũ>] <nhánh-mới>"
-#: builtin/branch.c:34
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<các tùy chọn>] [-r | -a] [--points-at]"
-#: builtin/branch.c:35
+#: builtin/branch.c:36
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<các tùy chọn>] [-r | -a] [--format]"
-#: builtin/branch.c:154
+#: builtin/branch.c:165
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -11402,7 +11900,7 @@
"đang xóa nhánh “%s” mà nó lại đã được hòa trộn vào\n"
" “%s”, nhưng vẫn chưa được hòa trộn vào HEAD."
-#: builtin/branch.c:158
+#: builtin/branch.c:169
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -11411,12 +11909,12 @@
"không xóa nhánh “%s” cái mà chưa được hòa trộn vào\n"
" “%s”, cho dù là nó đã được hòa trộn vào HEAD."
-#: builtin/branch.c:172
+#: builtin/branch.c:183
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho “%s”"
-#: builtin/branch.c:176
+#: builtin/branch.c:187
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -11425,111 +11923,111 @@
"Nhánh “%s” không được trộn một cách đầy đủ.\n"
"Nếu bạn thực sự muốn xóa nó, thì chạy lệnh “git branch -D %s”."
-#: builtin/branch.c:189
+#: builtin/branch.c:200
msgid "Update of config-file failed"
msgstr "Cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:223
+#: builtin/branch.c:235
msgid "cannot use -a with -d"
msgstr "không thể dùng tùy chọn -a với -d"
-#: builtin/branch.c:230
+#: builtin/branch.c:242
msgid "Couldn't look up commit object for HEAD"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD"
-#: builtin/branch.c:244
+#: builtin/branch.c:259
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Không thể xóa nhánh “%s” đã được lấy ra tại “%s”"
-#: builtin/branch.c:259
+#: builtin/branch.c:274
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "không tìm thấy nhánh theo dõi máy chủ “%s”."
-#: builtin/branch.c:260
+#: builtin/branch.c:275
#, c-format
msgid "branch '%s' not found."
msgstr "không tìm thấy nhánh “%s”."
-#: builtin/branch.c:291
+#: builtin/branch.c:306
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Đã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:307
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:457 builtin/tag.c:64
msgid "unable to parse format string"
msgstr "không thể phân tích chuỗi định dạng"
-#: builtin/branch.c:471
+#: builtin/branch.c:488
msgid "could not resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: builtin/branch.c:477
+#: builtin/branch.c:494
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) chỉ bên ngoài của refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:509
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Nhánh %s đang được cải tổ lại tại %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:513
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Nhánh %s đang được di chuyển phân đôi (bisect) tại %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:530
msgid "cannot copy the current branch while not on any."
msgstr "không thể sao chép nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:515
+#: builtin/branch.c:532
msgid "cannot rename the current branch while not on any."
msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:526
+#: builtin/branch.c:543
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Tên nhánh không hợp lệ: “%s”"
-#: builtin/branch.c:555
+#: builtin/branch.c:572
msgid "Branch rename failed"
msgstr "Gặp lỗi khi đổi tên nhánh"
-#: builtin/branch.c:557
+#: builtin/branch.c:574
msgid "Branch copy failed"
msgstr "Gặp lỗi khi sao chép nhánh"
-#: builtin/branch.c:561
+#: builtin/branch.c:578
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Đã tạo một bản sao của nhánh khuyết danh “%s”"
-#: builtin/branch.c:564
+#: builtin/branch.c:581
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Đã đổi tên nhánh khuyết danh “%s” đi"
-#: builtin/branch.c:570
+#: builtin/branch.c:587
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!"
-#: builtin/branch.c:579
+#: builtin/branch.c:596
msgid "Branch is renamed, but update of config-file failed"
msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:581
+#: builtin/branch.c:598
msgid "Branch is copied, but update of config-file failed"
msgstr "Nhánh đã được sao chép, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:597
+#: builtin/branch.c:614
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11540,180 +12038,193 @@
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được cắt bỏ.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Tùy chọn chung"
-#: builtin/branch.c:633
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "hiển thị mã băm và chủ đề, đưa ra hai lần cho nhánh thượng nguồn"
-#: builtin/branch.c:634
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "không xuất các thông tin"
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
+#: builtin/branch.c:656 builtin/checkout.c:1571
+#: builtin/submodule--helper.c:3077
+msgid "set branch tracking configuration"
+msgstr "đặt cấu hình thao dõi nhánh"
-#: builtin/branch.c:637
+#: builtin/branch.c:659
msgid "do not use"
msgstr "không dùng"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:661
msgid "upstream"
msgstr "thượng nguồn"
-#: builtin/branch.c:639
+#: builtin/branch.c:661
msgid "change the upstream info"
msgstr "thay đổi thông tin thượng nguồn"
-#: builtin/branch.c:640
+#: builtin/branch.c:662
msgid "unset the upstream info"
msgstr "bỏ đặt thông tin thượng nguồn"
-#: builtin/branch.c:641
+#: builtin/branch.c:663
msgid "use colored output"
msgstr "tô màu kết xuất"
-#: builtin/branch.c:642
+#: builtin/branch.c:664
msgid "act on remote-tracking branches"
msgstr "thao tác trên nhánh “remote-tracking”"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:666 builtin/branch.c:668
msgid "print only branches that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:667 builtin/branch.c:669
msgid "print only branches that don't contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó không chứa lần chuyển giao"
-#: builtin/branch.c:650
+#: builtin/branch.c:672
msgid "Specific git-branch actions:"
msgstr "Hành động git-branch:"
-#: builtin/branch.c:651
+#: builtin/branch.c:673
msgid "list both remote-tracking and local branches"
msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ"
-#: builtin/branch.c:653
+#: builtin/branch.c:675
msgid "delete fully merged branch"
msgstr "xóa một toàn bộ nhánh đã hòa trộn"
-#: builtin/branch.c:654
+#: builtin/branch.c:676
msgid "delete branch (even if not merged)"
msgstr "xóa nhánh (cho dù là chưa được hòa trộn)"
-#: builtin/branch.c:655
+#: builtin/branch.c:677
msgid "move/rename a branch and its reflog"
msgstr "di chuyển hay đổi tên một nhánh và reflog của nó"
-#: builtin/branch.c:656
+#: builtin/branch.c:678
msgid "move/rename a branch, even if target exists"
msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn"
-#: builtin/branch.c:657
+#: builtin/branch.c:679
msgid "copy a branch and its reflog"
msgstr "sao chép một nhánh và reflog của nó"
-#: builtin/branch.c:658
+#: builtin/branch.c:680
msgid "copy a branch, even if target exists"
msgstr "sao chép một nhánh ngay cả khi đích đã có sẵn"
-#: builtin/branch.c:659
+#: builtin/branch.c:681
msgid "list branch names"
msgstr "liệt kê các tên nhánh"
-#: builtin/branch.c:660
+#: builtin/branch.c:682
msgid "show current branch name"
msgstr "hiển thị nhánh hiện hành"
-#: builtin/branch.c:661
+#: builtin/branch.c:683 builtin/submodule--helper.c:3075
msgid "create the branch's reflog"
msgstr "tạo reflog của nhánh"
-#: builtin/branch.c:663
+#: builtin/branch.c:685
msgid "edit the description for the branch"
msgstr "sửa mô tả cho nhánh"
-#: builtin/branch.c:664
+#: builtin/branch.c:686
msgid "force creation, move/rename, deletion"
msgstr "buộc tạo, di chuyển/đổi tên, xóa"
-#: builtin/branch.c:665
+#: builtin/branch.c:687
msgid "print only branches that are merged"
msgstr "chỉ hiển thị những nhánh mà nó được hòa trộn"
-#: builtin/branch.c:666
+#: builtin/branch.c:688
msgid "print only branches that are not merged"
msgstr "chỉ hiển thị những nhánh mà nó không được hòa trộn"
-#: builtin/branch.c:667
+#: builtin/branch.c:689
msgid "list branches in columns"
msgstr "liệt kê các nhánh trong các cột"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:476
msgid "object"
msgstr "đối tượng"
-#: builtin/branch.c:670
+#: builtin/branch.c:692
msgid "print only branches of the object"
msgstr "chỉ hiển thị các nhánh của đối tượng"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
msgid "sorting and filtering are case insensitive"
msgstr "sắp xếp và lọc là phân biệt HOA thường"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:694 builtin/ls-files.c:667
+msgid "recurse through submodules"
+msgstr "đệ quy xuyên qua mô-đun con"
+
+#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
+#: builtin/tag.c:481 builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "định dạng sẽ dùng cho đầu ra"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:718 builtin/clone.c:684
msgid "HEAD not found below refs/heads!"
msgstr "Không tìm thấy HEAD ở dưới refs/heads!"
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "tùy chọn --column và --verbose xung khắc nhau"
+#: builtin/branch.c:739
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
+"nhánh với --recurse-submodules chỉ có thể được sử dụng nếu submodule."
+"propagateBranches được kích hoạt"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:741
+msgid "--recurse-submodules can only be used to create branches"
+msgstr "--recurse-submodules chỉ có thể được sử dụng để tạo ra các nhánh"
+
+#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
msgid "branch name required"
msgstr "cần chỉ ra tên nhánh"
-#: builtin/branch.c:766
+#: builtin/branch.c:802
msgid "Cannot give description to detached HEAD"
msgstr "Không thể đưa ra mô tả HEAD đã tách rời"
-#: builtin/branch.c:771
+#: builtin/branch.c:807
msgid "cannot edit description of more than one branch"
msgstr "không thể sửa mô tả cho nhiều hơn một nhánh"
-#: builtin/branch.c:778
+#: builtin/branch.c:814
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Vẫn chưa chuyển giao trên nhánh “%s”."
-#: builtin/branch.c:781
+#: builtin/branch.c:817
#, c-format
msgid "No branch named '%s'."
msgstr "Không có nhánh nào có tên “%s”."
-#: builtin/branch.c:796
+#: builtin/branch.c:832
msgid "too many branches for a copy operation"
msgstr "quá nhiều nhánh dành cho thao tác sao chép"
-#: builtin/branch.c:805
+#: builtin/branch.c:841
msgid "too many arguments for a rename operation"
msgstr "quá nhiều tham số cho thao tác đổi tên"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "too many arguments to set new upstream"
msgstr "quá nhiều tham số để đặt thượng nguồn mới"
-#: builtin/branch.c:814
+#: builtin/branch.c:850
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11721,30 +12232,30 @@
"không thể đặt thượng nguồn của HEAD thành %s khi mà nó chẳng chỉ đến nhánh "
"nào cả."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:853 builtin/branch.c:873
#, c-format
msgid "no such branch '%s'"
msgstr "không có nhánh nào như thế “%s”"
-#: builtin/branch.c:821
+#: builtin/branch.c:857
#, c-format
msgid "branch '%s' does not exist"
msgstr "chưa có nhánh “%s”"
-#: builtin/branch.c:834
+#: builtin/branch.c:867
msgid "too many arguments to unset upstream"
msgstr "quá nhiều tham số để bỏ đặt thượng nguồn"
-#: builtin/branch.c:838
+#: builtin/branch.c:871
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "không thể bỏ đặt thượng nguồn của HEAD không chỉ đến một nhánh nào cả."
-#: builtin/branch.c:844
+#: builtin/branch.c:877
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Nhánh “%s” không có thông tin thượng nguồn"
-#: builtin/branch.c:854
+#: builtin/branch.c:890
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>?"
@@ -11753,7 +12264,7 @@
"nhánh.\n"
"Có phải ý bạn là dùng: -a|-r --list <mẫu>?"
-#: builtin/branch.c:858
+#: builtin/branch.c:894
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11761,33 +12272,33 @@
"tùy chọn --set-upstream đã không còn được hỗ trợ nữa. Vui lòng dùng “--"
"track” hoặc “--set-upstream-to” để thay thế."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "phiên bản git:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() gặp lỗi “%s” (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "thông tin trình biên dịch: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "thông tin libc: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "không chạy từ một kho git - nên chẳng có móc nào để mà hiển thị cả\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr ""
"git bugreport [-o|--output-directory <tập_tin>] [-s|--suffix <định_dạng>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11821,39 +12332,34 @@
"Vui lòng xen xét phần còn lại của báo cáo lỗi bên dưới.\n"
"Bạn có thể xóa bất kỳ dòng nào bạn không muốn chia sẻ.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "chỉ định thư mục định để tạo tập tin báo cáo lỗi"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr ""
"chỉ định chuỗi định dạng thời gian strftime dùng làm hậu tố cho tên tập tin"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "không thể tạo các thư mục dẫn đầu cho “%s”"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Thông tin hệ thống"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Các Móc đã được bật"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "không thể tạo tập tin mới tại “%s”"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "không thể ghi vào %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Đã tạo báo cáo mới tại “%s”\n"
@@ -11874,136 +12380,256 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <tập tin> [<tên tham chiếu>…]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3899
msgid "do not show progress meter"
msgstr "không hiển thị bộ đo tiến trình"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
msgid "show progress meter"
msgstr "hiển thị bộ đo tiến trình"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3903
msgid "show progress meter during object writing phase"
msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3906
msgid "similar to --all-progress when progress meter is shown"
msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "chỉ điịnh định dạng cho bundle"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "Cần một kho chứa để có thể tạo một bundle."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:108
msgid "do not show bundle details"
msgstr "không hiển thị chi tiết bundle (bó)"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:127
#, c-format
msgid "%s is okay\n"
msgstr "“%s” tốt\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:183
msgid "Need a repository to unbundle."
msgstr "Cần một kho chứa để có thể giải nén một bundle."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "chi tiết; phải được đặt trước một lệnh-con"
+#: builtin/bundle.c:186
+msgid "Unbundling objects"
+msgstr "Tháo rời các đối tượng"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:220 builtin/remote.c:1758
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Không hiểu câu lệnh con: %s"
-#: builtin/cat-file.c:596
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
-msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <kiểu> | --textconv) | --filters) [--path=<đường/dẫn>] <đối_tượng>"
+#: builtin/cat-file.c:568
+msgid "flush is only for --buffer mode"
+msgstr "flush chỉ dành cho chế độ --buffer"
-#: builtin/cat-file.c:597
-msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
-msgstr ""
-"git cat-file (--batch[=<định dạng>] | --batch-check[=<định dạng>]) [--follow-"
-"symlinks] [--textconv | --filters]"
+#: builtin/cat-file.c:612
+msgid "empty command in input"
+msgstr "lệnh thực thi trống rỗng trong đầu vào"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:614
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "có khoảng trắng trước lệnh: '%s'"
+
+#: builtin/cat-file.c:623
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s cần các tham số"
+
+#: builtin/cat-file.c:628
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s không nhận tham số"
+
+#: builtin/cat-file.c:636
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "không hiểu câu lệnh: '%s'"
+
+#: builtin/cat-file.c:795
msgid "only one batch option may be specified"
msgstr "chỉ một tùy chọn batch được chỉ ra"
-#: builtin/cat-file.c:636
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag"
+#: builtin/cat-file.c:824
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <kiểu> <đối tượng>"
-#: builtin/cat-file.c:637
-msgid "show object type"
-msgstr "hiển thị kiểu đối tượng"
+#: builtin/cat-file.c:825
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git cat-file (-e | -p) <đối tượng>"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:826
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr "git cat-file (-t | -s) [--allow-unknown-type] <đối_tượng>"
+
+#: builtin/cat-file.c:827
+msgid ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+
+#: builtin/cat-file.c:830
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+
+#: builtin/cat-file.c:836
+msgid "Check object existence or emit object contents"
+msgstr "Kiểm tra đối tượng có sẵn hay không hoặc phát nội dung của đối tượng"
+
+#: builtin/cat-file.c:838
+msgid "check if <object> exists"
+msgstr "không tra xem <đối tượng> có sẵn hay không"
+
+#: builtin/cat-file.c:839
+msgid "pretty-print <object> content"
+msgstr "in nội dung <đối tượng> dạng dễ đọc"
+
+#: builtin/cat-file.c:841
+msgid "Emit [broken] object attributes"
+msgstr "Phát các thuộc tính đối tượng [hỏng]"
+
+#: builtin/cat-file.c:842
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr ""
+"hiển thị kiểu của đối tượng (là một trong số 'blob', 'tree', 'commit', "
+"'tag', ...)"
+
+#: builtin/cat-file.c:843
msgid "show object size"
msgstr "hiển thị kích thước đối tượng"
-#: builtin/cat-file.c:640
-msgid "exit with zero when there's no error"
-msgstr "thoát với 0 khi không có lỗi"
-
-#: builtin/cat-file.c:641
-msgid "pretty-print object's content"
-msgstr "in nội dung đối tượng dạng dễ đọc"
-
-#: builtin/cat-file.c:643
-msgid "for blob objects, run textconv on object's content"
-msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng"
-
-#: builtin/cat-file.c:645
-msgid "for blob objects, run filters on object's content"
-msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng"
-
-#: builtin/cat-file.c:646
-msgid "blob"
-msgstr "blob"
-
-#: builtin/cat-file.c:647
-msgid "use a specific path for --textconv/--filters"
-msgstr "dùng một đường dẫn rõ ràng cho --textconv/--filters"
-
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:845
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "cho phép -s và -t để làm việc với các đối tượng sai/hỏng"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:847
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr ""
+"Đã yêu cầu các đối tượng batch trên đầu vào tiêu chuẩn stdin (hoặc --batch-"
+"all-objects)"
+
+#: builtin/cat-file.c:849
+msgid "show full <object> or <rev> contents"
+msgstr "hiển thị đầy đủ nội dung <object> hay <rev>"
+
+#: builtin/cat-file.c:853
+msgid "like --batch, but don't emit <contents>"
+msgstr "giống --batch, nhưng không phát ra <contents>"
+
+#: builtin/cat-file.c:857
+msgid "read commands from stdin"
+msgstr "đọc các lệnh từ đầu vào tiêu chuẩn"
+
+#: builtin/cat-file.c:861
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr ""
+"với --batch[-check]: bỏ qua đầu vào tiêu chuẩn stdin, batch mọi đối tượng đã "
+"biết"
+
+#: builtin/cat-file.c:863
+msgid "Change or optimize batch output"
+msgstr "Thay đổi hay tối ưu hóa đầu ra batch"
+
+#: builtin/cat-file.c:864
msgid "buffer --batch output"
msgstr "đệm kết xuất --batch"
-#: builtin/cat-file.c:652
-msgid "show info and content of objects fed from the standard input"
+#: builtin/cat-file.c:866
+msgid "follow in-tree symlinks"
+msgstr "theo liên kết mềm trong-cây"
+
+#: builtin/cat-file.c:868
+msgid "do not order objects before emitting them"
+msgstr "đừng sắp xếp các đối tượng trước khi phát chúng"
+
+#: builtin/cat-file.c:870
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
msgstr ""
-"hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn"
+"Phát đối tượng (blob hoặc cây) với bộ chuyển đổi hoặc bộ lọc (stand-alone, "
+"hoặc với batch)"
-#: builtin/cat-file.c:656
-msgid "show info about objects fed from the standard input"
-msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn"
+#: builtin/cat-file.c:872
+msgid "run textconv on object's content"
+msgstr "chạy lệnh textconv trên nội dung của đối tượng"
-#: builtin/cat-file.c:660
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr "theo liên kết mềm trong-cây (được dùng với --batch hay --batch-check)"
+#: builtin/cat-file.c:874
+msgid "run filters on object's content"
+msgstr "chạy các bộ lọc nội dung của đối tượng"
-#: builtin/cat-file.c:662
-msgid "show all objects with --batch or --batch-check"
-msgstr "hiển thị mọi đối tượng với --batch hay --batch-check"
+#: builtin/cat-file.c:875
+msgid "blob|tree"
+msgstr "blob|tree"
-#: builtin/cat-file.c:664
-msgid "do not order --batch-all-objects output"
-msgstr "đừng sắp xếp đầu ra --batch-all-objects"
+#: builtin/cat-file.c:876
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
+msgstr ""
+"dùng một </đường/dẫn/> rõ ràng cho (--textconv/--filters); Không với 'batch'"
+
+#: builtin/cat-file.c:894
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "'%s=<%s>' cần '%s' hoặc '%s'"
+
+#: builtin/cat-file.c:896
+msgid "path|tree-ish"
+msgstr "path|tree-ish"
+
+#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "“%s” cần một chế độ batch"
+
+#: builtin/cat-file.c:921
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "'-%c' là xung khắc với chế độ batch"
+
+#: builtin/cat-file.c:924
+msgid "batch modes take no arguments"
+msgstr "chế độ batch không nhận các đối số"
+
+#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "cần <rev> với '%s'"
+
+#: builtin/cat-file.c:938
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "cần <object> với '-%c'"
+
+#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429
+#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596
+#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965
+#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
+#: builtin/tag.c:592
+msgid "too many arguments"
+msgstr "có quá nhiều đối số"
+
+#: builtin/cat-file.c:947
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr "chỉ hai đối số được phép trong chế độ <type> <object>, không phải %d"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -12021,7 +12647,7 @@
msgid "use .gitattributes only from the index"
msgstr "chỉ dùng .gitattributes từ bảng mục lục"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
msgid "read file names from stdin"
msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn"
@@ -12029,8 +12655,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
+#: builtin/worktree.c:565
msgid "suppress progress reporting"
msgstr "chặn các báo cáo tiến trình hoạt động"
@@ -12087,166 +12713,164 @@
msgid "git checkout--worker [<options>]"
msgstr "git checkout--worker [<các tùy chọn>]"
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
+#: builtin/worktree.c:808
msgid "string"
msgstr "chuỗi"
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
msgid "when creating files, prepend <string>"
msgstr "khi tạo các tập tin, nối thêm <chuỗi>"
-#: builtin/checkout-index.c:152
+#: builtin/checkout-index.c:184
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<các tùy chọn>] [--] [<tập-tin>…]"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:201
msgid "stage should be between 1 and 3 or all"
msgstr "stage nên giữa 1 và 3 hay all"
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:219
msgid "check out all files in the index"
msgstr "lấy ra toàn bộ các tập tin trong bảng mục lục"
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:221
+msgid "do not skip files with skip-worktree set"
+msgstr "đừng bỏ qua các tập tin với skip-worktree được đặt"
+
+#: builtin/checkout-index.c:222
msgid "force overwrite of existing files"
msgstr "ép buộc ghi đè lên tập tin đã sẵn có từ trước"
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:224
msgid "no warning for existing files and files not in index"
msgstr ""
"không cảnh báo cho những tập tin tồn tại và không có trong bảng mục lục"
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:226
msgid "don't checkout new files"
msgstr "không checkout các tập tin mới"
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:228
msgid "update stat information in the index file"
msgstr "cập nhật thông tin thống kê trong tập tin lưu bảng mục lục mới"
-#: builtin/checkout-index.c:198
+#: builtin/checkout-index.c:232
msgid "read list of paths from the standard input"
msgstr "đọc danh sách đường dẫn từ đầu vào tiêu chuẩn"
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:234
msgid "write the content to temporary files"
msgstr "ghi nội dung vào tập tin tạm"
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:238
msgid "copy out the files from named stage"
msgstr "sao chép ra các tập tin từ bệ phóng có tên"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:34
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<các tùy chọn>] <nhánh>"
-#: builtin/checkout.c:34
+#: builtin/checkout.c:35
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<các tùy chọn>] [<nhánh>] -- <tập-tin>…"
-#: builtin/checkout.c:39
+#: builtin/checkout.c:40
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<các tùy chọn>] [<nhánh>]"
-#: builtin/checkout.c:44
+#: builtin/checkout.c:45
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<các tùy chọn>] [--source=<nhánh>] <tập tin>…"
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:199 builtin/checkout.c:238
#, c-format
msgid "path '%s' does not have our version"
msgstr "đường dẫn “%s” không có các phiên bản của chúng ta"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:201 builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have their version"
msgstr "đường dẫn “%s” không có các phiên bản của chúng"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:217
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "đường dẫn “%s” không có tất cả các phiên bản cần thiết"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:271
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "đường dẫn “%s” không có các phiên bản cần thiết"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:291
#, c-format
msgid "path '%s': cannot merge"
msgstr "đường dẫn “%s”: không thể hòa trộn"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:307
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Không thể thêm kết quả hòa trộn cho “%s”"
-#: builtin/checkout.c:411
+#: builtin/checkout.c:424
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "Đã tạo lại %d xung đột hòa trộn"
-#: builtin/checkout.c:416
+#: builtin/checkout.c:429
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "Đã cập nhật đường dẫn %d từ %s"
-#: builtin/checkout.c:423
+#: builtin/checkout.c:436
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "Đã cập nhật đường dẫn %d từ mục lục"
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:469
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "không được dùng “%s” với các đường dẫn cập nhật"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "không được dùng “%s” với %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:479
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Không thể cập nhật các đường dẫn và chuyển đến nhánh “%s” cùng một lúc."
-#: builtin/checkout.c:470
+#: builtin/checkout.c:483
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "không chỉ định “%s” cũng không “%s”"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:487
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "phải có “%s” khi không chỉ định “%s”"
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:492 builtin/checkout.c:497
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "“%s” hay “%s” không thể được sử dụng với %s"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:571 builtin/checkout.c:578
#, c-format
msgid "path '%s' is unmerged"
msgstr "đường dẫn “%s” không được hòa trộn"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:753
msgid "you need to resolve your current index first"
msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:809
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12256,50 +12880,50 @@
"sau:\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:902
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Không thể thực hiện reflog cho “%s”: %s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:947
msgid "HEAD is now at"
msgstr "HEAD hiện giờ tại"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "không thể cập nhật HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:955
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:958
#, c-format
msgid "Already on '%s'\n"
msgstr "Đã sẵn sàng trên “%s”\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:962
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Đã chuyển tới và đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:964 builtin/checkout.c:1398
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Đã chuyển đến nhánh mới “%s”\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:966
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Đã chuyển đến nhánh “%s”\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:1017
#, c-format
msgid " ... and %d more.\n"
msgstr " … và nhiều hơn %d.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12318,7 +12942,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1042
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12339,19 +12963,19 @@
" git branch <tên_nhánh_mới> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1077
msgid "internal error in revision walk"
msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1081
msgid "Previous HEAD position was"
msgstr "Vị trí trước kia của HEAD là"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1124 builtin/checkout.c:1393
msgid "You are on a branch yet to be born"
msgstr "Bạn tại nhánh mà nó chưa hề được sinh ra"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1206
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12360,7 +12984,7 @@
"“%s” không thể là cả tập tin nội bộ và một nhánh theo dõi.\n"
"Vui long dùng -- (và tùy chọn thêm --no-guess) để tránh lẫn lộn"
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1213
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"
@@ -12380,51 +13004,58 @@
"chưa rõ ràng, ví dụ máy chủ “origin”, cân nhắc cài đặt\n"
"checkout.defaultRemote=origin trong cấu hình của bạn."
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1223
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "“%s” khớp với nhiều (%d) nhánh máy chủ được theo dõi"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
msgid "only one reference expected"
msgstr "chỉ cần một tham chiếu"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1306
#, c-format
msgid "only one reference expected, %d given."
msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d."
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
#, c-format
msgid "invalid reference: %s"
msgstr "tham chiếu không hợp lệ: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1365 builtin/checkout.c:1744
#, c-format
msgid "reference is not a tree: %s"
msgstr "tham chiếu không phải là một cây:%s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "cần một nhánh, nhưng lại nhận được thẻ “%s”"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1415
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "cần một nhánh, nhưng lại nhận được nhánh máy phục vụ “%s”"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1417 builtin/checkout.c:1426
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "cần một nhánh, nhưng lại nhận được “%s”"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1420
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "cần một nhánh, nhưng lại nhận được “%s”"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1429
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr ""
+"Nếu bạn muốn tách rời HEAD ở lần chuyển giao, hay thử lại với tùy chọn --"
+"detach."
+
+#: builtin/checkout.c:1442
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12432,7 +13063,7 @@
"không thể chuyển nhánh trong khi đang hòa trộn\n"
"Cân nhắc dung \"git merge --quit\" hoặc \"git worktree add\"."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12440,7 +13071,7 @@
"không thể chuyển nhanh ở giữa một phiên am\n"
"Cân nhắc dùng \"git am --quit\" hoặc \"git worktree add\"."
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1450
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12448,7 +13079,7 @@
"không thể chuyển nhánh trong khi cải tổ\n"
"Cân nhắc dùng \"git rebase --quit\" hay \"git worktree add\"."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12456,7 +13087,7 @@
"không thể chuyển nhánh trong khi cherry-picking\n"
"Cân nhắc dùng \"git cherry-pick --quit\" hay \"git worktree add\"."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1458
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12464,143 +13095,127 @@
"không thể chuyển nhánh trong khi hoàn nguyên\n"
"Cân nhắc dùng \"git revert --quit\" hoặc \"git worktree add\"."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1462
msgid "you are switching branch while bisecting"
msgstr ""
"bạn hiện tại đang thực hiện việc chuyển nhánh trong khi đang di chuyển nửa "
"bước"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1469
msgid "paths cannot be used with switching branches"
msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "“%s” không thể được sử dụng với các nhánh chuyển"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
+#: builtin/checkout.c:1495 builtin/checkout.c:1500
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s” không thể được dùng với “%s”"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1497
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "“%s” không thể nhận <điểm-đầu>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1505
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Không thể chuyển nhánh đến một thứ không phải là lần chuyển giao “%s”"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1512
msgid "missing branch or commit argument"
msgstr "thiếu tham số là nhánh hoặc lần chuyển giao"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1555
msgid "perform a 3-way merge with the new branch"
msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
msgid "style"
msgstr "kiểu"
-#: builtin/checkout.c:1522
-msgid "conflict style (merge or diff3)"
-msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
+#: builtin/checkout.c:1557
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "xung đột kiểu (hòa trộn, diff3 hoặc zdiff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1569 builtin/worktree.c:560
msgid "detach HEAD at named commit"
msgstr "rời bỏ HEAD tại lần chuyển giao theo tên"
-#: builtin/checkout.c:1535
-msgid "set upstream info for new branch"
-msgstr "đặt thông tin thượng nguồn cho nhánh mới"
-
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1574
msgid "force checkout (throw away local modifications)"
msgstr "ép buộc lấy ra (bỏ đi những thay đổi nội bộ)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new-branch"
msgstr "nhánh-mới"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new unparented branch"
msgstr "nhánh không cha mới"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1578 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "cập nhật các tập tin bị bỏ qua (mặc định)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1581
msgid "do not check if another worktree is holding the given ref"
msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho"
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1594
msgid "checkout our version for unmerged files"
msgstr ""
"lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1597
msgid "checkout their version for unmerged files"
msgstr ""
"lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1601
msgid "do not limit pathspecs to sparse entries only"
msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục rải rác"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1659
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c và --orphan loại từ lẫn nhau"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "tùy chọn '-%c', '-%c' và '%s' không thể dùng cùng nhau"
-#: builtin/checkout.c:1626
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p và --overlay loại từ lẫn nhau"
-
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1700
msgid "--track needs a branch name"
msgstr "--track cần tên một nhánh"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1705
#, c-format
msgid "missing branch name; try -%c"
msgstr "thiếu tên nhánh; hãy thử -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1737
#, c-format
msgid "could not resolve %s"
msgstr "không thể phân giải “%s”"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1753
msgid "invalid path specification"
msgstr "đường dẫn đã cho không hợp lệ"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1760
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"“%s” không phải là một lần chuyển giao và một nhánh'%s” không thể được tạo "
"từ đó"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1764
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach không nhận một đối số đường dẫn “%s”"
-#: builtin/checkout.c:1736
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file xung khắc với --detach"
-
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file xung khắc với --patch"
-
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1789
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12608,71 +13223,71 @@
"git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n"
"checkout bảng mục lục (index)."
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1794
msgid "you must specify path(s) to restore"
msgstr "bạn phải chỉ định các thư mục muốn hồi phục"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
+#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
+#: builtin/remote.c:173 builtin/submodule--helper.c:3038
+#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
+#: builtin/worktree.c:558
msgid "branch"
msgstr "nhánh"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1820
msgid "create and checkout a new branch"
msgstr "tạo và checkout một nhánh mới"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1822
msgid "create/reset and checkout a branch"
msgstr "tạo/đặt_lại và checkout một nhánh"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1823
msgid "create reflog for new branch"
msgstr "tạo reflog cho nhánh mới"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1825
msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "đoán thứ hai “git checkout <không-nhánh-nào-như-vậy>” (mặc định)"
+msgstr "gợi ý thứ hai “git checkout <không-nhánh-nào-như-vậy>” (mặc định)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1826
msgid "use overlay mode (default)"
msgstr "dùng chế độ che phủ (mặc định)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1874
msgid "create and switch to a new branch"
msgstr "tạo và chuyển đến một nhánh mới"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1876
msgid "create/reset and switch to a branch"
msgstr "tạo/đặt_lại và chuyển đến một nhánh"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1878
msgid "second guess 'git switch <no-such-branch>'"
-msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
+msgstr "gợi ý thứ hai \"git switch <không-nhánh-nào-như-vậy>\""
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1880
msgid "throw away local modifications"
msgstr "vứt bỏ các sửa đổi địa phương"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1916
msgid "which tree-ish to checkout from"
msgstr "lấy ra từ tree-ish nào"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1918
msgid "restore the index"
msgstr "phục hồi bảng mục lục"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1920
msgid "restore the working tree (default)"
msgstr "phục hồi cây làm việc (mặc định)"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1922
msgid "ignore unmerged entries"
msgstr "bỏ qua những thứ chưa hòa trộn: %s"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1923
msgid "use overlay mode"
msgstr "dùng chế độ che phủ"
@@ -12708,7 +13323,15 @@
msgid "could not lstat %s\n"
msgstr "không thể lấy thông tin thống kê đầy đủ của %s\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Từ chối gỡ bỏ thư mục làm việc hiện tại\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Nên từ chối gỡ bỏ thư mục làm việc hiện tại\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12721,7 +13344,7 @@
"foo - chọn mục trên cơ sở tiền tố duy nhất\n"
" - (để trống) không chọn gì cả\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12742,33 +13365,33 @@
"* - chọn tất\n"
" - (để trống) kết thúc việc chọn\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hả (%s)?\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "Mẫu để lọc các tập tin đầu vào cần lờ đi>> "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "CẢNH BÁO: Không tìm thấy các mục được khớp bởi: %s"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "Chọn mục muốn xóa"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Xóa bỏ “%s” [y/N]? "
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12786,51 +13409,51 @@
"help - hiển thị chính trợ giúp này\n"
"? - trợ giúp dành cho chọn bằng cách nhắc"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Có muốn gỡ bỏ (các) mục sau đây không:"
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Không còn tập-tin nào để dọn dẹp, đang thoát ra."
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "không hiển thị tên của các tập tin đã gỡ bỏ"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "ép buộc"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "dọn bằng kiểu tương tác"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "gỡ bỏ toàn bộ thư mục"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
+#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "mẫu"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "thêm <mẫu> vào trong qui tắc bỏ qua"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12838,7 +13461,7 @@
"clean.requireForce được đặt thành true và không đưa ra tùy chọn -i, -n mà "
"cũng không -f; từ chối lệnh dọn dẹp (clean)"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12846,220 +13469,218 @@
"clean.requireForce mặc định được đặt là true và không đưa ra tùy chọn -i, -n "
"mà cũng không -f; từ chối lệnh dọn dẹp (clean)"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x và -X không thể dùng cùng nhau"
-#: builtin/clone.c:45
+#: builtin/clone.c:47
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<các tùy chọn>] [--] <kho> [<t.mục>]"
-#: builtin/clone.c:96
+#: builtin/clone.c:100
msgid "don't clone shallow repository"
msgstr "đừng nhân bản từ kho nông"
-#: builtin/clone.c:98
+#: builtin/clone.c:102
msgid "don't create a checkout"
msgstr "không tạo một checkout"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "tạo kho thuần"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "create a mirror repository (implies bare)"
msgstr "tạo kho bản sao (ý là kho thuần)"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "to clone from a local repository"
msgstr "để nhân bản từ kho nội bộ"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "don't use local hardlinks, always copy"
msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép"
-#: builtin/clone.c:109
+#: builtin/clone.c:113
msgid "setup as shared repository"
msgstr "cài đặt đây là kho chia sẻ"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "pathspec"
msgstr "đặc-tả-đường-dẫn"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "initialize submodules in the clone"
msgstr "khởi tạo mô-đun-con trong bản sao"
-#: builtin/clone.c:115
+#: builtin/clone.c:119
msgid "number of submodules cloned in parallel"
msgstr "số lượng mô-đun-con được nhân bản đồng thời"
-#: builtin/clone.c:116 builtin/init-db.c:539
+#: builtin/clone.c:120 builtin/init-db.c:539
msgid "template-directory"
msgstr "thư-mục-mẫu"
-#: builtin/clone.c:117 builtin/init-db.c:540
+#: builtin/clone.c:121 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "thư mục mà tại đó các mẫu sẽ được dùng"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
msgid "reference repository"
msgstr "kho tham chiếu"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:127 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2721
msgid "use --reference only while cloning"
msgstr "chỉ dùng --reference khi nhân bản"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3967 builtin/repack.c:669
+#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "tên"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "use <name> instead of 'origin' to track upstream"
msgstr "dùng <tên> thay cho “origin” để theo dõi thượng nguồn"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "path to git-upload-pack on the remote"
msgstr "đường dẫn đến git-upload-pack trên máy chủ"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
+#: builtin/pull.c:212
msgid "depth"
msgstr "độ-sâu"
-#: builtin/clone.c:131
+#: builtin/clone.c:135
msgid "create a shallow clone of that depth"
msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
+#: builtin/pull.c:215
msgid "time"
msgstr "thời-gian"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "create a shallow clone since a specific time"
msgstr "tạo bản sao không đầy đủ từ thời điểm đã cho"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
msgid "revision"
msgstr "điểm xét duyệt"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "làm sâu hơn lịch sử của bản sao shallow, bằng điểm xét duyệt loại trừ"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:141 builtin/submodule--helper.c:1897
+#: builtin/submodule--helper.c:2735
msgid "clone only one branch, HEAD or --branch"
msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
-#: builtin/clone.c:139
+#: builtin/clone.c:143
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"đứng có nhân bản bất kỳ nhánh nào, và làm cho những lần lấy về sau không "
"theo chúng nữa"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "any cloned submodules will be shallow"
msgstr "mọi mô-đun-con nhân bản sẽ là shallow (nông)"
-#: builtin/clone.c:142 builtin/init-db.c:548
+#: builtin/clone.c:146 builtin/init-db.c:548
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:143 builtin/init-db.c:549
+#: builtin/clone.c:147 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc"
-#: builtin/clone.c:144
+#: builtin/clone.c:148
msgid "key=value"
msgstr "khóa=giá_trị"
-#: builtin/clone.c:145
+#: builtin/clone.c:149
msgid "set config inside the new repository"
msgstr "đặt cấu hình bên trong một kho chứa mới"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "đặc-tả-máy-phục-vụ"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "tùy chọn để chuyển giao"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "chỉ dùng địa chỉ IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "chỉ dùng địa chỉ IPv6"
-#: builtin/clone.c:154
+#: builtin/clone.c:158
+msgid "apply partial clone filters to submodules"
+msgstr "áp dụng các bộ lọc nhân bản một phần cho mô-đun-con"
+
+#: builtin/clone.c:160
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "mọi mô-đun-con nhân bản sẽ dung nhánh theo dõi máy chủ của chúng"
-#: builtin/clone.c:156
+#: builtin/clone.c:162
msgid "initialize sparse-checkout file to include only files at root"
msgstr "khởi tạo tập tin sparse-checkout để bao gồm chỉ các tập tin ở gốc"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Không đoán được thư mục tên là gì.\n"
-"Vui lòng chỉ định tên một thư mục trên dòng lệnh"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:237
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "thông tin: không thể thêm thay thế cho “%s”: %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:310
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s có tồn tại nhưng lại không phải là một thư mục"
-#: builtin/clone.c:436
+#: builtin/clone.c:328
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "gặp lỗi khi bắt đầu lặp qua “%s”"
-#: builtin/clone.c:467
+#: builtin/clone.c:359
#, c-format
msgid "failed to create link '%s'"
msgstr "gặp lỗi khi tạo được liên kết mềm %s"
-#: builtin/clone.c:471
+#: builtin/clone.c:363
#, c-format
msgid "failed to copy file to '%s'"
msgstr "gặp lỗi khi sao chép tập tin và “%s”"
-#: builtin/clone.c:476
+#: builtin/clone.c:368
#, c-format
msgid "failed to iterate over '%s'"
msgstr "gặp lỗi khi lặp qua “%s”"
-#: builtin/clone.c:503
+#: builtin/clone.c:395
#, c-format
msgid "done.\n"
msgstr "hoàn tất.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:409
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13069,105 +13690,101 @@
"Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n"
"và thử lấy ra với lệnh “git restore --source=HEAD :/”\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:486
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)."
-#: builtin/clone.c:713
+#: builtin/clone.c:603
#, c-format
msgid "unable to update %s"
msgstr "không thể cập nhật %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:651
msgid "failed to initialize sparse-checkout"
msgstr "gặp lỗi khi khởi tạo sparse-checkout"
-#: builtin/clone.c:784
+#: builtin/clone.c:674
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể lấy ra.\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:709
msgid "unable to checkout working tree"
msgstr "không thể lấy ra (checkout) cây làm việc"
-#: builtin/clone.c:894
+#: builtin/clone.c:793
msgid "unable to write parameters to config file"
msgstr "không thể ghi các tham số vào tập tin cấu hình"
-#: builtin/clone.c:957
+#: builtin/clone.c:856
msgid "cannot repack to clean up"
msgstr "không thể đóng gói để dọn dẹp"
-#: builtin/clone.c:959
+#: builtin/clone.c:858
msgid "cannot unlink temporary alternates file"
msgstr "không thể bỏ liên kết tập tin thay thế tạm thời"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:901
msgid "Too many arguments."
msgstr "Có quá nhiều đối số."
-#: builtin/clone.c:1005
+#: builtin/clone.c:905 contrib/scalar/scalar.c:413
msgid "You must specify a repository to clone."
msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)."
-#: builtin/clone.c:1018
+#: builtin/clone.c:918
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "tùy chọn --bare và --origin %s xung khắc nhau."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "tùy chọn '%s', và '%s %s' không thể dùng cùng nhau"
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:935
#, c-format
msgid "repository '%s' does not exist"
msgstr "kho chứa “%s” chưa tồn tại"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:939 builtin/fetch.c:2176
#, c-format
msgid "depth %s is not a positive number"
msgstr "độ sâu %s không phải là một số nguyên dương"
-#: builtin/clone.c:1049
+#: builtin/clone.c:949
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "đường dẫn đích “%s” đã có từ trước và không phải là một thư mục rỗng."
-#: builtin/clone.c:1055
+#: builtin/clone.c:955
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr ""
"đường dẫn kho chứa “%s” đã có từ trước và không phải là một thư mục rỗng."
-#: builtin/clone.c:1069
+#: builtin/clone.c:969
#, c-format
msgid "working tree '%s' already exists."
msgstr "cây làm việc “%s” đã sẵn tồn tại rồi."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
+#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "không thể tạo các thư mục dẫn đầu của “%s”"
-#: builtin/clone.c:1089
+#: builtin/clone.c:989
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "không thể tạo cây thư mục làm việc dir “%s”"
-#: builtin/clone.c:1109
+#: builtin/clone.c:1009
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Đang nhân bản thành kho chứa bare “%s”…\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1011
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Đang nhân bản thành “%s”…\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1040
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -13175,50 +13792,54 @@
"nhân bản --recursive không tương thích với cả hai --reference và --reference-"
"if-able"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "“%s” không phải tên máy chủ hợp lệ"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1157
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1159
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
"thế."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1161
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
"thế."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1163
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"--filter bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1168
msgid "source repository is shallow, ignoring --local"
msgstr "kho nguồn là nông, nên bỏ qua --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1173
msgid "--local is ignored"
msgstr "--local bị lờ đi"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1185
+msgid "cannot clone from filtered bundle"
+msgstr "không thể nhân bản từ bundle được lọc ra"
+
+#: builtin/clone.c:1265 builtin/clone.c:1324
msgid "remote transport reported error"
msgstr "vận chuyển máy mạng đã báo cáo lỗi"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1277 builtin/clone.c:1289
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1292
msgid "You appear to have cloned an empty repository."
msgstr "Bạn hình như là đã nhân bản một kho trống rỗng."
@@ -13254,14 +13875,14 @@
msgid "--command must be the first argument"
msgstr "--command phải là đối số đầu tiên"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir </thư/mục/đối/tượng>] [--shallow] [--"
"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13272,102 +13893,100 @@
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <các tùy chọn chia "
"tách>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "không thể tìm thấy thư mục đối tượng khớp với “%s”"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
msgid "dir"
msgstr "tmục"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "thư mục đối tượng để lưu đồ thị"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
"nếu đồ-thị-các-lần-chuyển-giao bị chia cắt, thì chỉ thẩm tra tập tin đỉnh"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Không thể mở đồ thị chuyển giao “%s”"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "đối số --split không được thừa nhận, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "nhận được ID đối tượng không phải dạng hex không cần: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "đối tượng không hợp lệ: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "bắt đầu di chuyển tại mọi tham chiếu"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
"quét dó các mục lục gói được liệt kê bởi đầu vào tiêu chuẩn cho các lần "
"chuyển giao"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr ""
"bắt đầu di chuyển tại các lần chuyển giao được liệt kê bởi đầu vào tiêu chuẩn"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr ""
"bao gồm mọi lần chuyển giao đã sẵn có trongười tập tin đồ-thị-các-lần-chuyển-"
"giao"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "cho phép tính toán các đường dẫn đã bị thay đổi"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "cho phép ghi một tập tin đồ họa các lần chuyển giao lớn lên"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
"số lượng tối đa của các lần chuyển giao trong một đồ-thị-các-lần-chuyển-giao "
"chia cắt không-cơ-sở"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "tỷ lệ tối đa giữa hai mức của một đồ-thị-các-lần-chuyển-giao chia cắt"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "chỉ làm hết hạn các tập tin khi nó cũ hơn khoảng <thời gian> đưa ra"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "số tối đa các bộ lọc các đường dẫn thay đổi Bloom để tính toán"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"không thể sử dụng hơn một --reachable, --stdin-commits, hay --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Sưu tập các lần chuyển giao từ đầu vào"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "không hiểu câu lệnh con: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13381,70 +14000,65 @@
msgid "duplicate parent %s ignored"
msgstr "cha mẹ bị trùng lặp %s đã bị bỏ qua"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
#, c-format
msgid "not a valid object name %s"
msgstr "không phải là tên đối tượng hợp lệ “%s”"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: gặp lỗi khi mở “%s”"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: gặp lỗi khi đọc “%s”"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: gặp lỗi khi đóng “%s”"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "cha-mẹ"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "mã số của đối tượng chuyển giao cha mẹ"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
+#: builtin/tag.c:455
msgid "message"
msgstr "chú thích"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "chú thích của lần chuyển giao"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "đọc chú thích nhật ký lần chuyển giao từ tập tin"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Ký lần chuyển giao dùng GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "phải đưa ra chính xác một cây"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: gặp lỗi khi đọc"
-#: builtin/commit.c:41
+#: builtin/commit.c:43
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<các tùy chọn>] [--] <pathspec>…"
-#: builtin/commit.c:46
+#: builtin/commit.c:48
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<các tùy chọn>] [--] <pathspec>…"
-#: builtin/commit.c:51
+#: builtin/commit.c:53
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13457,7 +14071,7 @@
"hoặc là bạn gỡ bỏ các lần chuyển giao một cách hoàn toàn bằng lệnh:\n"
"\"git reset HEAD^\".\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:58
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13472,15 +14086,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:65
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Nếu không được thì dùng lệnh \"git rebase --skip\"\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:68
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Nếu không được thì dùng lệnh \"git cherry-pick --skip\"\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:71
msgid ""
"and then use:\n"
"\n"
@@ -13502,76 +14116,72 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:326
msgid "failed to unpack HEAD tree object"
msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây"
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file với -a là không có ý nghĩa gì"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:376
msgid "No paths with --include/--only does not make sense."
msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý."
-#: builtin/commit.c:386
+#: builtin/commit.c:388
msgid "unable to create temporary index"
msgstr "không thể tạo bảng mục lục tạm thời"
-#: builtin/commit.c:395
+#: builtin/commit.c:397
msgid "interactive add failed"
msgstr "gặp lỗi khi thêm bằng cách tương"
-#: builtin/commit.c:410
+#: builtin/commit.c:412
msgid "unable to update temporary index"
msgstr "không thể cập nhật bảng mục lục tạm thời"
-#: builtin/commit.c:412
+#: builtin/commit.c:414
msgid "Failed to update main cache tree"
msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
msgid "unable to write new_index file"
msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)"
-#: builtin/commit.c:489
+#: builtin/commit.c:491
msgid "cannot do a partial commit during a merge."
msgstr ""
"không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn."
-#: builtin/commit.c:491
+#: builtin/commit.c:493
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
"không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick."
-#: builtin/commit.c:493
+#: builtin/commit.c:495
msgid "cannot do a partial commit during a rebase."
msgstr ""
"không thể thực hiện việc chuyển giao cục bộ trong khi đang thực hiện cải tổ."
-#: builtin/commit.c:501
+#: builtin/commit.c:503
msgid "cannot read the index"
msgstr "không đọc được bảng mục lục"
-#: builtin/commit.c:520
+#: builtin/commit.c:522
msgid "unable to write temporary index file"
msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời"
-#: builtin/commit.c:618
+#: builtin/commit.c:620
#, c-format
msgid "commit '%s' lacks author header"
msgstr "lần chuyển giao “%s” thiếu phần tác giả ở đầu"
-#: builtin/commit.c:620
+#: builtin/commit.c:622
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "lần chuyển giao “%s” có phần tác giả ở đầu dị dạng"
-#: builtin/commit.c:639
+#: builtin/commit.c:641
msgid "malformed --author parameter"
msgstr "đối số cho --author bị dị hình"
-#: builtin/commit.c:692
+#: builtin/commit.c:694
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13579,43 +14189,43 @@
"không thể chọn một ký tự ghi chú cái mà không được dùng\n"
"trong phần ghi chú hiện tại"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
#, c-format
msgid "could not lookup commit %s"
msgstr "không thể tìm kiếm commit (lần chuyển giao) %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:762 builtin/shortlog.c:417
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:764
msgid "could not read log from standard input"
msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn"
-#: builtin/commit.c:764
+#: builtin/commit.c:768
#, c-format
msgid "could not read log file '%s'"
msgstr "không đọc được tệp nhật ký “%s”"
-#: builtin/commit.c:801
+#: builtin/commit.c:805
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "không thể kết hợp “-m” với “--fixup”:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "tùy chọn '%s', và '%s:%s' không thể dùng cùng nhau"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:817 builtin/commit.c:833
msgid "could not read SQUASH_MSG"
msgstr "không thể đọc SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
msgid "could not read MERGE_MSG"
msgstr "không thể đọc MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:884
msgid "could not write commit template"
msgstr "không thể ghi mẫu chuyển giao"
-#: builtin/commit.c:893
+#: builtin/commit.c:897
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13624,7 +14234,7 @@
"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những\n"
"dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:899
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13635,7 +14245,7 @@
"bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần "
"chuyển giao.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:903
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13645,7 +14255,7 @@
"được\n"
"bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:907
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13657,7 +14267,7 @@
"bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
"Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:919
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13671,7 +14281,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"và thử lại.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:924
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13685,186 +14295,158 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"và thử lại.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:951
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sTác giả: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:959
#, c-format
msgid "%sDate: %s"
msgstr "%sNgày tháng: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:966
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sNgười chuyển giao: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:984
msgid "Cannot read index"
msgstr "Không đọc được bảng mục lục"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1029
msgid "unable to pass trailers to --trailers"
msgstr "không thể chuyển phần đuôi cho “--trailers”"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1069
msgid "Error building trees"
msgstr "Gặp lỗi khi xây dựng cây"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1083 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -F.\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1128
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author “%s” không phải là “Họ và tên <thư điện tửl>” và không khớp bất kỳ "
"tác giả nào sẵn có"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1142
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Chế độ bỏ qua không hợp lệ “%s”"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1160 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s”"
-#: builtin/commit.c:1195
-msgid "--long and -z are incompatible"
-msgstr "hai tùy chọn --long và -z không tương thích với nhau"
-
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "You are in the middle of a merge -- cannot reword."
msgstr ""
"Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “reword”."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1233
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr ""
"Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc "
"“reword”."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1236
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "không thể tổ hợp tùy chọn \"reword\" của --fixup với đường dẫn '%s'"
-
-#: builtin/commit.c:1233
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+msgid "reword option of '%s' and path '%s' cannot be used together"
msgstr ""
-"tùy chọn \"reword\" của --fixup là loại trừ qua lại với --patch/--"
-"interactive/--all/--include/--only"
+"không thể tổ hợp tùy chọn \"reword\" của '%s' với đường dẫn '%s' cùng nhau"
-#: builtin/commit.c:1252
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý"
+#: builtin/commit.c:1238
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "không thể tổ hợp tùy chọn \"reword\" của '%s' với '%s' cùng nhau"
-#: builtin/commit.c:1261
+#: builtin/commit.c:1263
msgid "You have nothing to amend."
msgstr "Không có gì để mà “tu bổ” cả."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1266
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
"Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ”."
-#: builtin/commit.c:1266
+#: builtin/commit.c:1268
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
"Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu "
"bổ”."
-#: builtin/commit.c:1268
+#: builtin/commit.c:1270
msgid "You are in the middle of a rebase -- cannot amend."
msgstr ""
"Bạn đang ở giữa của quá trình cải tổ -- nên không thể thực hiện việc “tu bổ”."
-#: builtin/commit.c:1271
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau"
-
-#: builtin/commit.c:1281
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "Chỉ được dùng một trong số tùy chọn trong số -c/-C/-F/--fixup."
-
-#: builtin/commit.c:1283
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F."
-
-#: builtin/commit.c:1292
+#: builtin/commit.c:1290
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend."
-#: builtin/commit.c:1310
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr ""
-"Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được "
-"sử dụng."
-
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "không hiểu tùy chọn: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "các đường dẫn “%s …” với tùy chọn -a không hợp lý"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "hiển thị trạng thái ở dạng súc tích"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "hiển thị thông tin nhánh"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "hiển thị thông tin về tạm cất"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "tính đầy đủ giá trị trước/sau"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "phiên bản"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:765
msgid "machine-readable output"
msgstr "kết xuất dạng máy-có-thể-đọc"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "hiển thị trạng thái ở định dạng dài (mặc định)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "chấm dứt các mục bằng NUL"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
msgid "mode"
msgstr "chế độ"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, "
"normal, no. (Mặc định: all)"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13872,11 +14454,11 @@
"hiển thị các tập tin bị bỏ qua, các chế độ tùy chọn: traditional, matching, "
"no. (Mặc định: traditional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:197
msgid "when"
msgstr "khi"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13884,199 +14466,199 @@
"bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. "
"(Mặc định: all)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "không dò tìm các tên thay đổi"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "dò các tên thay đổi, tùy ý đặt mục lục tương tự"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Không hỗ trỡ tổ hợp các tham số các tập tin bị bỏ qua và không được theo dõi"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "không hiển thị tổng kết sau khi chuyển giao thành công"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Các tùy chọn ghi chú commit"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
msgid "read message from file"
msgstr "đọc chú thích từ tập tin"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "tác giả"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "ghi đè tác giả cho commit"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:551
msgid "date"
msgstr "ngày tháng"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "ghi đè ngày tháng cho lần chuyển giao"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:360 ref-filter.h:89
msgid "commit"
msgstr "lần_chuyển_giao"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]commit"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"dùng ghi chú có định dạng autosquash để sửa chữa hoặc tu bổ/reword lần "
"chuyển giao đã chỉ ra"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"dùng lời nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ "
"ra"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -C/-c/--amend)"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "bộ dò vết"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "thêm đuôi tự chọn"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "thêm dòng Signed-off-by vào cuối"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "sử dụng tập tin mẫu đã cho"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "ép buộc sửa lần commit"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Các tùy nội dung ghi chú commit"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "chuyển giao tất cả các tập tin có thay đổi"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "thêm các tập-tin bằng tương tác"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "thêm các thay đổi bằng tương tác"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "vòng qua móc (hook) pre-commit và commit-msg"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "hiển thị xem cái gì có thể được chuyển giao"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "“tu bổ” (amend) lần commit trước"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "vòng qua móc (hook) post-rewrite"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "ok để ghi lại một thay đổi trống rỗng"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Tập tin MERGE_HEAD sai hỏng (%s)"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "không thể đọc MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "không thể đọc phần chú thích (message) của lần chuyển giao: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Bãi bỏ việc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
"Đang bỏ qua việc chuyển giao; bạn đã không biên soạn phần chú thích "
"(message).\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr ""
"Bãi bỏ việc chuyển giao bởi vì phần thân chú thích của nó trống rỗng.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14200,6 +14782,10 @@
msgid "Type"
msgstr "Kiểu"
+#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+msgid "type"
+msgstr "kiểu"
+
#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "giá trị được đưa kiểu này"
@@ -14414,10 +15000,6 @@
msgid "no such section: %s"
msgstr "không có đoạn: %s"
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc"
@@ -14443,7 +15025,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr "credential-cache--daemon không sẵn có; không hỗ trợ unix socket"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache không sẵn có; không hỗ trợ unix socket"
@@ -14584,7 +15166,7 @@
msgid "do not consider tags matching <pattern>"
msgstr "không coi rằng các thẻ khớp với <mẫu>"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:595
msgid "show abbreviated commit object as fallback"
msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
@@ -14600,25 +15182,14 @@
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "thêm <dấu> trên cây thư mục làm việc bị hỏng (mặc định \"-broken\")"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long là xung khắc với tùy chọn --abbrev=0"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Không tìm thấy các tên, không thể mô tả gì cả."
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty là xung khắc với các tùy chọn commit-ish"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken là xung khắc với commit-ishes"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin và --merge-base loại từ lẫn nhau"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "tùy chọn '%s' và commit-ishes không thể dùng cùng nhau"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
@@ -14639,26 +15210,26 @@
msgid "%s...%s: no merge base"
msgstr "%s…%s: không có cơ sở hòa trộn"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "Không phải là kho git"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:537 builtin/grep.c:700
#, c-format
msgid "invalid object '%s' given."
msgstr "đối tượng đã cho “%s” không hợp lệ."
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "đã cho đối tượng không thể nắm giữ “%s”."
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s…%s: có nhiều cơ sở để hòa trộn, nên dùng %s"
@@ -14669,113 +15240,103 @@
"git difftool [<các tùy chọn>] [<lần_chuyển_giao> [<lần_chuyển_giao>]] [--] </"
"đường/dẫn>…]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "gặp lỗi: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "không thể đọc liên kết mềm %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "không đọc được tập tin liên kết mềm %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "không thể đọc đối tượng %s cho liên kết mềm %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"các định dạng diff tổ hợp(“-c” và “--cc”) chưa được hỗ trợ trong\n"
"chế độ diff thư mục(“-d” và “--dir-diff”)."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "cả hai tập tin đã bị sửa: “%s” và “%s”."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "cây làm việc ở bên trái."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "các tập tin tạm đã sẵn có trong “%s”."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "bạn có lẽ muốn dọn dẹp hay phục hồi ở đây."
-#: builtin/difftool.c:699
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "gặp lỗi: %d"
+
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "thực hiện một diff toàn thư mục"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "đừng nhắc khi khởi chạy công cụ diff"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "dùng liên kết mềm trong diff-thư-mục"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:700
msgid "tool"
msgstr "công cụ"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "dùng công cụ diff đã cho"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "in ra danh sách các công cụ dif cái mà có thẻ dùng với “--tool“"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:706
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
-msgstr ""
-"làm cho “git-difftool” thoát khi gọi công cụ diff trả về mã không phải số "
-"không"
+msgstr "làm cho “git-difftool” thoát khi gọi công cụ diff trả về mã khác không"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "chỉ định một lệnh tùy ý để xem diff"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "chuyển cho “diff”"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool cần cây làm việc hoặc --no-index"
-#: builtin/difftool.c:741
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff xung khắc với --no-index"
-
-#: builtin/difftool.c:744
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool và --extcmd loại từ lẫn nhau"
-
-#: builtin/difftool.c:752
+#: builtin/difftool.c:745
msgid "no <tool> given for --tool=<tool>"
msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:752
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
@@ -14783,10 +15344,6 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <các tùy chọn> <env-var>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
-msgid "type"
-msgstr "kiểu"
-
#: builtin/env--helper.c:46
msgid "default for git_env_*(...) to fall back on"
msgstr "mặc định cho git_env_*(…) để quay về"
@@ -14811,252 +15368,248 @@
"type=ulong“, không phải “%s“"
#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [rev-list-opts]"
+msgid "git fast-export [<rev-list-opts>]"
+msgstr "git fast-export [<rev-list-opts>]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "Lỗi: không thể xuất thẻ lồng nhau trừ khi --mark-tags được chỉ định."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "--anonymize-map thẻ không thể là rỗng"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "hiển thị tiến triển sau <n> đối tượng"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "chọn điều khiển của thẻ đã ký"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"chọn bộ xử lý cho các ghi chú của lần chuyển giao theo một bộ mã thay thế"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "đổ các đánh dấu này vào tập-tin"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "nhập vào đánh dấu từ tập tin này"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "nhập vào đánh dấu từ tập tin sẵn có"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr "làm giả một cái thẻ khi thẻ bị thiếu một cái"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "xuất ra toàn bộ cây cho mỗi lần chuyển giao"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "sử dụng tính năng done để chấm dứt luồng dữ liệu"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "bỏ qua kết xuất của dữ liệu blob"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1860
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "áp dụng refspec cho refs đã xuất"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "kết xuất anonymize"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "từ:đến"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "chuyển đổi <from> sang <to> đầu ra ẩn danh"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"các cha mẹ tham chiếu cái mà không trong luồng dữ liệu fast-export bởi mã id "
"đối tượng"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "hiển thị các mã id nguyên gốc của blobs/commits"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "gắn thẻ với các mã ID đánh dấu"
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map mà không có --anonymize là không hợp lý"
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "Không thể chuyển qua cả hai --import-marks và --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3097
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "Thiếu các đánh dấu cho mô-đun-con “%s”"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3099
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "Thiếu đánh dấu cho mô-đun-con “%s”"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3234
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "Cần lệnh “mark”, nhưng lại nhận được %s"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3239
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "Cần lệnh “to”, nhưng lại nhận được %s"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3331
msgid "Expected format name:filename for submodule rewrite option"
msgstr "Cần định dạng tên:tên_tập_tin cho tùy chọn ghi lại mô-đun-con"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3386
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr ""
"tính năng “%s” bị cấm chỉ trong đầu vào mà không có --allow-unsafe-features"
-#: builtin/fetch-pack.c:242
+#: builtin/fetch-pack.c:246
#, c-format
msgid "Lockfile created but not reported: %s"
msgstr "Tập tin khóa đã được tạo nhưng chưa được báo cáo: %s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<các tùy chọn>] [<nhóm>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<các tùy chọn>] [(<kho> | <nhóm>)…]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<các tùy chọn>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:124
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel không thể âm"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:147 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "lấy về từ tất cả các máy chủ"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:149 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "đặt thượng nguồn cho git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:151 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:153
msgid "use atomic transaction to update references"
msgstr "sử dụng giao dịch hạt nhân bên phía máy chủ"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:155 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "đường dẫn đến gói tải lên trên máy chủ cuối"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
msgid "force overwrite of local reference"
msgstr "ép buộc ghi đè lên tham chiếu nội bộ"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:158
msgid "fetch from multiple remotes"
msgstr "lấy từ nhiều máy chủ cùng lúc"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:160 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
msgid "do not fetch all tags (--no-tags)"
msgstr "không lấy tất cả các thẻ (--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:164
msgid "number of submodules fetched in parallel"
msgstr "số lượng mô-đun-con được lấy đồng thời"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:166
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
"sửa đặc tả đường dẫn cho các tham chiếu mọi chỗ có trong refs/prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:168 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"cắt cụt (prune) các nhánh “remote-tracking” không còn tồn tại trên máy chủ "
"nữa"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:170
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "cắt xém các thẻ nội bộ không còn ở máy chủ và xóa các thẻ đã thay đổi"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
msgid "on-demand"
msgstr "khi-cần"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:172
msgid "control recursive fetching of submodules"
msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:177
msgid "write fetched references to the FETCH_HEAD file"
msgstr "ghi các tham chiếu lấy về vào tập tin FETCH_HEAD"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:178 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "giữ lại gói đã tải về"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:180
msgid "allow updating of HEAD ref"
msgstr "cho phép cập nhật th.chiếu HEAD"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "làm sâu hơn lịch sử của bản sao"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:185 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "làm sâu hơn lịch sử của kho bản sao shallow dựa trên thời gian"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:191 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "chuyển đổi hoàn toàn sang kho git"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:194
+msgid "re-fetch without negotiating common commits"
+msgstr "re-fetch mà không dàn xếp các lần chuyển giao chung"
+
+#: builtin/fetch.c:197
msgid "prepend this to submodule path output"
msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:200
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -15064,142 +15617,141 @@
"mặc định cho việc lấy đệ quy các mô-đun-con (có mức ưu tiên thấp hơn các tập "
"tin cấu hình config)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:204 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:205 builtin/pull.c:230
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:206 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "chỉ ra refmap cần lấy về"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:213 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr ""
"báo cáo rằng chúng ta chỉ có các đối tượng tiếp cận được từ đối tượng này"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:215
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
"không lấy về một packfile; thay vào đó, hãy in tổ tiên của đỉnh đàm phán"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:218 builtin/fetch.c:220
msgid "run 'maintenance --auto' after fetching"
msgstr "chạy “maintenance --auto” sau khi lấy về"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:222 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "kiểm cho các-cập-nhật-bắt-buộc trên mọi nhánh đã cập nhật"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:224
msgid "write the commit-graph after fetching"
msgstr "ghi ra đồ thị các lần chuyển giao sau khi lấy về"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:226
msgid "accept refspecs from stdin"
msgstr "chấp nhận tham chiếu từ đầu vào tiêu chuẩn"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD"
+#: builtin/fetch.c:618
+msgid "couldn't find remote ref HEAD"
+msgstr "không thể tìm thấy HEAD tham chiếu máy chủ"
-#: builtin/fetch.c:757
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s"
-
-#: builtin/fetch.c:856
+#: builtin/fetch.c:893
#, c-format
msgid "object %s not found"
msgstr "không tìm thấy đối tượng %s"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:897
msgid "[up to date]"
msgstr "[đã cập nhật]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
msgid "[rejected]"
msgstr "[Bị từ chối]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:911
msgid "can't fetch in current branch"
msgstr "không thể fetch (lấy) về nhánh hiện hành"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:912
+msgid "checked out in another worktree"
+msgstr "lấy ra trong cây làm việc khác"
+
+#: builtin/fetch.c:922
msgid "[tag update]"
msgstr "[cập nhật thẻ]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
+#: builtin/fetch.c:994
msgid "unable to update local ref"
msgstr "không thể cập nhật tham chiếu nội bộ"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:927
msgid "would clobber existing tag"
msgstr "nên xóa chồng các thẻ có sẵn"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:949
msgid "[new tag]"
msgstr "[thẻ mới]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:952
msgid "[new branch]"
msgstr "[nhánh mới]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:955
msgid "[new ref]"
msgstr "[ref (tham chiếu) mới]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:994
msgid "forced update"
msgstr "cưỡng bức cập nhật"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:999
msgid "non-fast-forward"
msgstr "không-phải-chuyển-tiếp-nhanh"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1102
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'."
+"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 ""
-"Việc lấy về thường chỉ ra các nhánh buộc phải cập nhật,\n"
-"nhưng lựa chọn bị tắt. Để kích hoạt lại, sử dụng cờ\n"
+"việc lấy về thường chỉ ra các nhánh buộc phải cập nhật,\n"
+"nhưng lựa chọn bị tắt; để kích hoạt lại, sử dụng cờ\n"
"“--show-forced-updates” hoặc chạy “git config fetch.showForcedUpdates true”."
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1106
#, c-format
msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-"Việc này cần %.2f giây để kiểm tra các cập nhật ép buộc. Bạn có thể dùng\n"
+"việc này cần %.2f giây để kiểm tra các cập nhật ép buộc; bạn có thể dùng\n"
"“--no-show-forced-updates” hoặc chạy “git config fetch.showForcedUpdates "
"false”\n"
-"để tránh kiểm tra này.\n"
+"để tránh kiểm tra này\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1136
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1156
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1259 builtin/fetch.c:1418
#, c-format
msgid "From %.*s\n"
msgstr "Từ %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1269
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15208,138 +15760,142 @@
"một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n"
" “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1377
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sẽ trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1378
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s đã trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1421
msgid "[deleted]"
msgstr "[đã xóa]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1422 builtin/remote.c:1153
msgid "(none)"
msgstr "(không)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1446
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr ""
-"Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho "
-"trần (bare)"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "từ chối lấy về vào nhánh “%s” đã được lấy ra tại “%s”"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1466
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1469
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "tùy chọn \"%s\" bị bỏ qua với %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1496
+#, c-format
+msgid "the object %s does not exist"
+msgstr "đối tượng “%s” không tồn tại"
+
+#: builtin/fetch.c:1748
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "phát hiện nhiều nhánh, không tương thích với --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1760
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"không thể đặt thượng nguồn của HEAD thành '%s' từ '%s' khi mà nó chẳng chỉ "
+"đến nhánh nào cả."
+
+#: builtin/fetch.c:1773
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "không cài đặt thượng nguồn cho một nhánh được theo dõi trên máy chủ"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1775
msgid "not setting upstream for a remote tag"
msgstr "không cài đặt thượng nguồn cho một thẻ nhánh trên máy chủ"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1777
msgid "unknown branch type"
msgstr "không hiểu kiểu nhánh"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1779
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
"không tìm thấy nhánh nguồn.\n"
-"bạn cần phải chỉ định chính xác một nhánh với tùy chọn --set-upstream."
+"bạn cần phải chỉ định chính xác một nhánh với tùy chọn --set-upstream"
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1904 builtin/fetch.c:1967
#, c-format
msgid "Fetching %s\n"
msgstr "Đang lấy “%s” về\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1914 builtin/fetch.c:1969
#, c-format
-msgid "Could not fetch %s"
-msgstr "Không thể lấy“%s” về"
+msgid "could not fetch %s"
+msgstr "không thể lấy “%s” về"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1926
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "không thể lấy “%s” (mã thoát: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:2030
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
msgstr ""
-"Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n"
-"tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)."
+"chưa chỉ ra kho chứa máy chủ; xin hãy chỉ định hoặc là URL hoặc\n"
+"tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)"
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Bạn phải định rõ tên thẻ."
+#: builtin/fetch.c:2066
+msgid "you need to specify a tag name"
+msgstr "bạn cần chỉ định một tên thẻ"
-#: builtin/fetch.c:1994
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
-msgstr "--negotiate-only cần một tham số hay nhiều --negotiate-tip=* hơn"
+#: builtin/fetch.c:2156
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
+msgstr "--negotiate-only cần một hay nhiều --negotiation-tip=* hơn"
-#: builtin/fetch.c:1998
-msgid "Negative depth in --deepen is not supported"
-msgstr "Mức sâu là số âm trong --deepen là không được hỗ trợ"
+#: builtin/fetch.c:2160
+msgid "negative depth in --deepen is not supported"
+msgstr "mức sâu là số âm trong --deepen là không được hỗ trợ"
-#: builtin/fetch.c:2000
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "Các tùy chọn --deepen và --depth loại từ lẫn nhau"
-
-#: builtin/fetch.c:2005
-msgid "--depth and --unshallow cannot be used together"
-msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau"
-
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2169
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2186
msgid "fetch --all does not take a repository argument"
msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2188
msgid "fetch --all does not make sense with refspecs"
msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2197
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Không có nhóm máy chủ hay máy chủ như thế: %s"
+msgid "no such remote or remote group: %s"
+msgstr "không có nhóm máy chủ hay máy chủ như thế: %s"
-#: builtin/fetch.c:2042
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý"
+#: builtin/fetch.c:2205
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "việc lấy về một nhóm và chỉ định refspecs là không hợp lý"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2221
msgid "must supply remote when using --negotiate-only"
msgstr "phải cung cấp máy chủ khi sử dụng --negotiate-only"
-#: builtin/fetch.c:2063
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Giao thức không hỗ trợ --negotiate-only, nên thoát."
+#: builtin/fetch.c:2226
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "giao thức không hỗ trợ --negotiate-only, nên thoát"
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2246
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15347,11 +15903,11 @@
"--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions."
"partialclone"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2250
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic chỉ có thể dùng khi lấy về từ một máy chủ"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2254
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin chỉ có thể dùng khi lấy về từ một máy chủ"
@@ -15362,23 +15918,27 @@
"git fmt-merge-msg [-m <chú_thích>] [--log[=<n>] | --no-log] [--file <tập-"
"tin>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr "gắn nhật ký với ít nhất <n> mục từ lệnh “shortlog”"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "bí danh cho --log (không được dùng)"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "văn bản"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "dùng <văn bản thường> để bắt đầu ghi chú"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "dùng <tên> thay cho nhánh đích thật"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "tập tin để đọc dữ liệu từ đó"
@@ -15402,47 +15962,47 @@
"git for-each-ref [--contains [<lần-chuyển-giao>]] [--no-contains [<lần-"
"chuyển-giao>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "trích dẫn để phù hợp cho hệ vỏ (shell)"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "trích dẫn để phù hợp cho perl"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "trích dẫn để phù hợp cho python"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "trích dẫn để phù hợp cho Tcl"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "hiển thị chỉ <n> tham chiếu khớp"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:42 builtin/tag.c:482
msgid "respect format colors"
msgstr "các màu định dạng lưu tâm"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "chỉ hiển thị các tham chiếu mà nó chỉ đến đối tượng đã cho"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "chỉ hiển thị những tham chiếu mà nó được hòa trộn"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "chỉ hiển thị những tham chiếu mà nó không được hòa trộn"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "chỉ hiển thị những tham chiếu mà nó chứa lần chuyển giao"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuyển giao"
@@ -15578,133 +16138,255 @@
msgid "notice: No default references"
msgstr "cảnh báo: Không có các tham chiếu mặc định"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: đường dẫn mã băm không khớp, tìm thấy tại: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: thiếu đối tượng hoặc hỏng: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: đối tượng có kiểu chưa biết “%s”: %s"
+
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: không thể phân tích cú đối tượng: %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "tập tin sha1 sai: %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "Đang kiểm tra thư mục đối tượng"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "Đang kiểm tra các thư mục đối tượng"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "Đang lấy liên kết %s"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:710 builtin/index-pack.c:862
#, c-format
msgid "invalid %s"
msgstr "%s không hợp lệ"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s chỉ đến thứ gì đó xa lạ (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: HEAD đã tách rời không chỉ vào đâu cả"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "chú ý: %s chỉ đến một nhánh chưa sinh (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "Đang kiểm tra cây nhớ tạm"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: con trỏ sha1 không hợp lệ trong cache-tree"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "non-tree trong cache-tree"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<các tùy chọn>] [<đối-tượng>…]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "hiển thị các đối tượng không thể đọc được"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "hiển thị các đối tượng không được quản lý"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "báo cáo các thẻ"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "báo cáo node gốc"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "tạo “index objects head nodes”"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "tạo “reflogs head nodes” (mặc định)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "cũng cân nhắc đến các đối tượng gói và thay thế"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "chỉ kiểm tra kết nối"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr "cho phép kiểm tra hạn chế hơn"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "ghi các đối tượng không được quản lý trong .git/lost-found"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "hiển thị quá trình"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "hiển thị tên chi tiết cho các đối tượng đọc được"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Đang kiểm tra các đối tượng"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s: thiếu đối tượng"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "tham số không hợp lệ: cần sha1, nhưng lại nhận được “%s”"
+#: builtin/fsmonitor--daemon.c:13
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [<các tùy chọn>]"
+
+#: builtin/fsmonitor--daemon.c:14
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [<các tùy chọn>]"
+
+#: builtin/fsmonitor--daemon.c:15
+msgid "git fsmonitor--daemon stop"
+msgstr "git fsmonitor--daemon stop"
+
+#: builtin/fsmonitor--daemon.c:16
+msgid "git fsmonitor--daemon status"
+msgstr "git fsmonitor--daemon status"
+
+#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "siá trị '%s' ngoài phạm vi cho phép: %d"
+
+#: builtin/fsmonitor--daemon.c:57
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "giá trị của '%s' không là bool hoặc int: %d"
+
+#: builtin/fsmonitor--daemon.c:99
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr "fsmonitor-daemon đang theo dõi '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:104
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr "fsmonitor-daemon hiện không theo dõi '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:170
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "không thể tạo fsmonitor cookie “%s”"
+
+#: builtin/fsmonitor--daemon.c:753
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr "fsmonitor: cookie_result '%d' != SEEN"
+
+#: builtin/fsmonitor--daemon.c:1187
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr "không thể khởi chạy bể tiến trình IPC trêm “%s”"
+
+#: builtin/fsmonitor--daemon.c:1199
+msgid "could not start fsmonitor listener thread"
+msgstr "không thể lấy thông tin thống kê về tuyến trình lắng nghe fsmonitor"
+
+#: builtin/fsmonitor--daemon.c:1297
+msgid "could not initialize listener thread"
+msgstr "không thể khởi tạo tuyến trình lắng nghe"
+
+#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr "fsmonitor--daemon hiện đang chạy rồi '%s'"
+
+#: builtin/fsmonitor--daemon.c:1332
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr "chạy fsmonitor-daemon trong '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:1387
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "đang khởi chạy fsmonitor-daemon trong “%s”\n"
+
+#: builtin/fsmonitor--daemon.c:1413
+msgid "daemon failed to start"
+msgstr "gặp lỗi khi khởi chạy dịch vụ chạy ngầm"
+
+#: builtin/fsmonitor--daemon.c:1416
+msgid "daemon not online yet"
+msgstr "ứng dụng chạy ngầm hiện chưa trực tuyến"
+
+#: builtin/fsmonitor--daemon.c:1419
+msgid "daemon terminated"
+msgstr "dịch vụ chạy ngầm đã bị dừng"
+
+#: builtin/fsmonitor--daemon.c:1429
+msgid "detach from console"
+msgstr "tách rời khỏi bảng điều khiển"
+
+#: builtin/fsmonitor--daemon.c:1432
+msgid "use <n> ipc worker threads"
+msgstr "dùng <n> tuyến trình làm việc ipc"
+
+#: builtin/fsmonitor--daemon.c:1435
+msgid "max seconds to wait for background daemon startup"
+msgstr "số giây chờ tối đa khi khởi động dịch vụ chạy nền"
+
+#: builtin/fsmonitor--daemon.c:1449
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "giá trị 'ipc-threads' không hợp lệ (%d)"
+
+#: builtin/fsmonitor--daemon.c:1464
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "Lệnh con không được xử lý '%s'"
+
+#: builtin/fsmonitor--daemon.c:1477
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr "fsmonitor--daemon không hỗ trợ trên nền tảng này"
+
#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<các tùy chọn>]"
@@ -15719,21 +16401,16 @@
msgid "failed to parse '%s' value '%s'"
msgstr "gặp lỗi khi phân tích “%s” giá trị “%s”"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "không thể lấy thông tin thống kê về “%s”"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr "không thể đọc “%s”"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
@@ -15744,54 +16421,54 @@
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "xóa bỏ các đối tượng không được tham chiếu"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "cẩn thận hơn nữa (tăng thời gian chạy)"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "bật chế độ auto-gc"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "đóng gói lại tất cả các gói khác ngoại trừ gói lớn nhất"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "gặp lỗi khi phân tích giá trị gc.logexpiry %s"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "gặp lỗi khi phân tích giá trị prune %s"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Tự động đóng gói kho chứa trên nền hệ thống để tối ưu hóa hiệu suất làm "
"việc.\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Xem \"git help gc\" để có hướng dẫn cụ thể về cách dọn dẹp kho git.\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -15799,33 +16476,33 @@
"gc đang được thực hiện trên máy “%s” pid %<PRIuMAX> (dùng --force nếu không "
"phải thế)"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Có quá nhiều đối tượng tự do không được dùng đến; hãy chạy lệnh “git prune” "
"để xóa bỏ chúng đi."
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<nhiệm vụ>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "--no-schedule không được phép"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "đối số --schedule không được thừa nhận %s"
-#: builtin/gc.c:869
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "gặp lỗi khi ghi đồ thị các lần chuyển giao"
-#: builtin/gc.c:905
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "gặp lỗi khi tải trước các máy chủ"
@@ -15837,146 +16514,186 @@
msgid "failed to finish 'git pack-objects' process"
msgstr "gặp lỗi khi hoàn tất tiến trình “git pack-objects”"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "gặp lỗi khi ghi multi-pack-index"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "gặp lỗi khi chạy “git multi-pack-index expire”"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "gặp lỗi khi chạy “git multi-pack-index repack”"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr "bỏ qua tác vụ incremental-repack vì core.multiPackIndex bị vô hiệu hóa"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "đã có khóa của tập tin “%s”, bỏ qua bảo trì"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "gặp lỗi khi thực hiện nhiệm vụ “%s”"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "“%s” không phải một nhiệm vụ hợp lệ"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "nhiệm vụ “%s” không được chọn nhiều lần"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "chạy nhiệm vụ dựa trên trạng thái của kho chứa"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "tần số"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "chạy nhiệm vụ dựa trên tần suất"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "đừng báo cáo diễn tiến hay các thông tin khác ra đầu lỗi tiêu chuẩn"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
msgid "task"
msgstr "tác vụ"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "chạy một nhiệm vụ cụ thể"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "dùng nhiều nhất là một trong --auto và --schedule=<frequency>"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "gặp lỗi khi chạy “git config”"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "gặp lỗi khi khai triển đường dẫn “%s”"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "gặp lỗi khi khởi chạy launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "gặp lỗi khi tạo thư mục cho \"%s\""
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "gặp lỗi khi mồi dịch vụ %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "gặp lỗi khi tạo tập tin xml tạm thời"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "gặp lỗi khi lấy thông tin thống kê về schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"gặp lỗi khi chạy “crontab -l”; hệ thống của bạn có thể không hỗ trợ “cron”"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "gặp lỗi khi chạy “crontab”; hiển thị của bạn có lẽ không hỗ trợ “cron”"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "gặp lỗi khi mở đầu vào tiêu chuẩn của “crontab”"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "“crontab” đã chết"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "gặp lỗi khi khởi chạy systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "gặp lỗi khi chạy systemctl"
+
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
+#: builtin/worktree.c:1024
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "gặp lỗi khi xóa “%s”"
+
+#: builtin/gc.c:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "đối số --scheduler không được thừa nhận “%s”"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "hoặc là bộ lập lịch systemd hoặc là crontab không sẵn có"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "bộ lên lịch %s không sẵn có"
+
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr "một tiến trình khác được lập kế hoạch chạy nền để bảo trì"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<bộ lên lịch>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "bộ lên lịch"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "bộ lên lịch để kích hoạt chạy chương trình bảo trì git"
+
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "gặp lỗi khi thêm cấu hình toàn cục"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance run <lệnh_con> [<các tùy chọn>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "lện con không hợp lệ: %s"
-#: builtin/grep.c:30
+#: builtin/grep.c:32
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<các tùy chọn>] [-e] <mẫu> [<rev>…] [[--] </đường/dẫn>…]"
-#: builtin/grep.c:223
+#: builtin/grep.c:241
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: gặp lỗi tạo tuyến (thread): %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:295
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
@@ -15985,263 +16702,255 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3150
#, c-format
msgid "no threads support, ignoring %s"
msgstr "không hỗ trợ đa tuyến, bỏ qua %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
#, c-format
msgid "unable to read tree (%s)"
msgstr "không thể đọc cây (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:674
#, c-format
msgid "unable to grep from object of type %s"
msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s"
-#: builtin/grep.c:738
+#: builtin/grep.c:754
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "chuyển đến “%c” cần một giá trị bằng số"
-#: builtin/grep.c:837
+#: builtin/grep.c:852
msgid "search in index instead of in the work tree"
msgstr "tìm trong bảng mục lục thay vì trong cây làm việc"
-#: builtin/grep.c:839
+#: builtin/grep.c:854
msgid "find in contents not managed by git"
msgstr "tìm trong nội dung không được quản lý bởi git"
-#: builtin/grep.c:841
+#: builtin/grep.c:856
msgid "search in both tracked and untracked files"
msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết"
-#: builtin/grep.c:843
+#: builtin/grep.c:858
msgid "ignore files specified via '.gitignore'"
msgstr "các tập tin bị bỏ qua được chỉ định thông qua “.gitignore”"
-#: builtin/grep.c:845
+#: builtin/grep.c:860
msgid "recursively search in each submodule"
msgstr "tìm kiếm đệ quy trong từng mô-đun-con"
-#: builtin/grep.c:848
+#: builtin/grep.c:863
msgid "show non-matching lines"
msgstr "hiển thị những dòng không khớp với mẫu"
-#: builtin/grep.c:850
+#: builtin/grep.c:865
msgid "case insensitive matching"
msgstr "phân biệt HOA/thường"
-#: builtin/grep.c:852
+#: builtin/grep.c:867
msgid "match patterns only at word boundaries"
msgstr "chỉ khớp mẫu tại đường ranh giới từ"
-#: builtin/grep.c:854
+#: builtin/grep.c:869
msgid "process binary files as text"
msgstr "xử lý tập tin nhị phân như là dạng văn bản thường"
-#: builtin/grep.c:856
+#: builtin/grep.c:871
msgid "don't match patterns in binary files"
msgstr "không khớp mẫu trong các tập tin nhị phân"
-#: builtin/grep.c:859
+#: builtin/grep.c:874
msgid "process binary files with textconv filters"
msgstr "xử lý tập tin nhị phân với các bộ lọc “textconv”"
-#: builtin/grep.c:861
+#: builtin/grep.c:876
msgid "search in subdirectories (default)"
msgstr "tìm kiếm trong thư mục con (mặc định)"
-#: builtin/grep.c:863
+#: builtin/grep.c:878
msgid "descend at most <depth> levels"
msgstr "hạ xuống ít nhất là mức <sâu>"
-#: builtin/grep.c:867
+#: builtin/grep.c:882
msgid "use extended POSIX regular expressions"
msgstr "dùng biểu thức chính qui POSIX có mở rộng"
-#: builtin/grep.c:870
+#: builtin/grep.c:885
msgid "use basic POSIX regular expressions (default)"
msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)"
-#: builtin/grep.c:873
+#: builtin/grep.c:888
msgid "interpret patterns as fixed strings"
msgstr "diễn dịch các mẫu như là chuỗi cố định"
-#: builtin/grep.c:876
+#: builtin/grep.c:891
msgid "use Perl-compatible regular expressions"
msgstr "sử dụng biểu thức chính quy tương thích Perl"
-#: builtin/grep.c:879
+#: builtin/grep.c:894
msgid "show line numbers"
msgstr "hiển thị số của dòng"
-#: builtin/grep.c:880
+#: builtin/grep.c:895
msgid "show column number of first match"
msgstr "hiển thị số cột của khớp với mẫu đầu tiên"
-#: builtin/grep.c:881
+#: builtin/grep.c:896
msgid "don't show filenames"
msgstr "không hiển thị tên tập tin"
-#: builtin/grep.c:882
+#: builtin/grep.c:897
msgid "show filenames"
msgstr "hiển thị các tên tập tin"
-#: builtin/grep.c:884
+#: builtin/grep.c:899
msgid "show filenames relative to top directory"
msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)"
-#: builtin/grep.c:886
+#: builtin/grep.c:901
msgid "show only filenames instead of matching lines"
msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu"
-#: builtin/grep.c:888
+#: builtin/grep.c:903
msgid "synonym for --files-with-matches"
msgstr "đồng nghĩa với --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:906
msgid "show only the names of files without match"
msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu"
-#: builtin/grep.c:893
+#: builtin/grep.c:908
msgid "print NUL after filenames"
msgstr "thêm NUL vào sau tên tập tin"
-#: builtin/grep.c:896
+#: builtin/grep.c:911
msgid "show only matching parts of a line"
msgstr "chỉ hiển thị những phần khớp với mẫu của một dòng"
-#: builtin/grep.c:898
+#: builtin/grep.c:913
msgid "show the number of matches instead of matching lines"
msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu"
-#: builtin/grep.c:899
+#: builtin/grep.c:914
msgid "highlight matches"
msgstr "tô sáng phần khớp mẫu"
-#: builtin/grep.c:901
+#: builtin/grep.c:916
msgid "print empty line between matches from different files"
msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt"
-#: builtin/grep.c:903
+#: builtin/grep.c:918
msgid "show filename only once above matches from same file"
msgstr ""
"hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin"
-#: builtin/grep.c:906
+#: builtin/grep.c:921
msgid "show <n> context lines before and after matches"
msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp"
-#: builtin/grep.c:909
+#: builtin/grep.c:924
msgid "show <n> context lines before matches"
msgstr "hiển thị <n> dòng nội dung trước khớp"
-#: builtin/grep.c:911
+#: builtin/grep.c:926
msgid "show <n> context lines after matches"
msgstr "hiển thị <n> dòng nội dung sau khớp"
-#: builtin/grep.c:913
+#: builtin/grep.c:928
msgid "use <n> worker threads"
msgstr "dùng <n> tuyến trình làm việc"
-#: builtin/grep.c:914
+#: builtin/grep.c:929
msgid "shortcut for -C NUM"
msgstr "dạng viết tắt của -C SỐ"
-#: builtin/grep.c:917
+#: builtin/grep.c:932
msgid "show a line with the function name before matches"
msgstr "hiển thị dòng vói tên hàm trước các lần khớp"
-#: builtin/grep.c:919
+#: builtin/grep.c:934
msgid "show the surrounding function"
msgstr "hiển thị hàm bao quanh"
-#: builtin/grep.c:922
+#: builtin/grep.c:937
msgid "read patterns from file"
msgstr "đọc mẫu từ tập-tin"
-#: builtin/grep.c:924
+#: builtin/grep.c:939
msgid "match <pattern>"
msgstr "match <mẫu>"
-#: builtin/grep.c:926
+#: builtin/grep.c:941
msgid "combine patterns specified with -e"
msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e"
-#: builtin/grep.c:938
+#: builtin/grep.c:953
msgid "indicate hit with exit status without output"
msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất"
-#: builtin/grep.c:940
+#: builtin/grep.c:955
msgid "show only matches from files that match all patterns"
msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "pager"
msgstr "dàn trang"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "show matching files in the pager"
msgstr "hiển thị các tập tin khớp trong trang giấy"
-#: builtin/grep.c:947
+#: builtin/grep.c:962
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1028
msgid "no pattern given"
msgstr "chưa chỉ ra mẫu"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1064
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index hay --untracked không được sử dụng cùng với revs"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1072
#, c-format
msgid "unable to resolve revision: %s"
msgstr "không thể phân giải điểm xét duyệt: %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1102
msgid "--untracked not supported with --recurse-submodules"
msgstr "tùy chọn --untracked không được hỗ trợ với --recurse-submodules"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1106
msgid "invalid option combination, ignoring --threads"
msgstr "tổ hợp tùy chọn không hợp lệ, bỏ qua --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1109 builtin/pack-objects.c:4084
msgid "no threads support, ignoring --threads"
msgstr "không hỗ trợ đa tuyến, bỏ qua --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "số tuyến chỉ ra không hợp lệ (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1146
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc"
-#: builtin/grep.c:1157
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached hay --untracked không được sử dụng với --no-index"
-
-#: builtin/grep.c:1160
-msgid "--untracked cannot be used with --cached"
-msgstr "--untracked không thể được sử dụng với tùy chọn --cached"
-
-#: builtin/grep.c:1166
+#: builtin/grep.c:1179
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1187
msgid "both --cached and trees are given"
msgstr "cả hai --cached và các cây phải được chỉ ra"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16249,95 +16958,99 @@
"git hash-object [-t <kiểu>] [-w] [--path=<tập-tin> | --no-filters] [--stdin] "
"[--] <tập-tin>…"
-#: builtin/hash-object.c:86
-msgid "git hash-object --stdin-paths"
-msgstr "git hash-object --stdin-paths"
-
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:97
msgid "object type"
msgstr "kiểu đối tượng"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:98
msgid "write the object into the object database"
msgstr "ghi đối tượng vào dữ liệu đối tượng"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
msgstr "đọc đối tượng từ đầu vào tiêu chuẩn stdin"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:102
msgid "store file as is without filters"
msgstr "lưu các tập tin mà nó không có các bộ lọc"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:103
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "chỉ cần băm rác ngẫu nhiên để tạo một đối tượng hỏng để mà gỡ lỗi Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
msgstr "xử lý tập tin như là nó đang ở thư mục này"
-#: builtin/help.c:47
+#: builtin/help.c:57
msgid "print all available commands"
msgstr "hiển thị danh sách các câu lệnh người dùng có thể sử dụng"
-#: builtin/help.c:48
+#: builtin/help.c:60
+msgid "show external commands in --all"
+msgstr "hiển thị các lệnh bên ngoài trong --all"
+
+#: builtin/help.c:61
+msgid "show aliases in --all"
+msgstr "hiển thị các bí danh trong --all"
+
+#: builtin/help.c:62
msgid "exclude guides"
msgstr "hướng dẫn loại trừ"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "hiển thị danh sách các hướng dẫn hữu dụng"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "in ra tất cả các tên biến cấu hình"
-
-#: builtin/help.c:52
+#: builtin/help.c:63
msgid "show man page"
msgstr "hiển thị trang man"
-#: builtin/help.c:53
+#: builtin/help.c:64
msgid "show manual in web browser"
msgstr "hiển thị hướng dẫn sử dụng trong trình duyệt web"
-#: builtin/help.c:55
+#: builtin/help.c:66
msgid "show info page"
-msgstr "hiện trang info"
+msgstr "hiển thị trang info"
-#: builtin/help.c:57
+#: builtin/help.c:68
msgid "print command description"
msgstr "hiển thị mô tả lệnh"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<lệnh>]"
+#: builtin/help.c:70
+msgid "print list of useful guides"
+msgstr "hiển thị danh sách các hướng dẫn hữu dụng"
-#: builtin/help.c:163
+#: builtin/help.c:72
+msgid "print all configuration variable names"
+msgstr "in ra tất cả các tên biến cấu hình"
+
+#: builtin/help.c:84
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<lệnh>]"
+
+#: builtin/help.c:201
#, c-format
msgid "unrecognized help format '%s'"
msgstr "không nhận ra định dạng trợ giúp “%s”"
-#: builtin/help.c:190
+#: builtin/help.c:227
msgid "Failed to start emacsclient."
msgstr "Gặp lỗi khi khởi chạy emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:240
msgid "Failed to parse emacsclient version."
msgstr "Gặp lỗi khi phân tích phiên bản emacsclient."
-#: builtin/help.c:211
+#: builtin/help.c:248
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "phiên bản của emacsclient “%d” quá cũ (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
#, c-format
msgid "failed to exec '%s'"
msgstr "gặp lỗi khi thực thi “%s”"
-#: builtin/help.c:307
+#: builtin/help.c:344
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16346,7 +17059,7 @@
"“%s”: đường dẫn không hỗ trợ bộ trình chiếu man.\n"
"Hãy cân nhắc đến việc sử dụng “man.<tool>.cmd” để thay thế."
-#: builtin/help.c:319
+#: builtin/help.c:356
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16355,230 +17068,241 @@
"“%s”: cmd (lệnh) hỗ trợ bộ trình chiếu man.\n"
"Hãy cân nhắc đến việc sử dụng “man.<tool>.path” để thay thế."
-#: builtin/help.c:436
+#: builtin/help.c:471
#, c-format
msgid "'%s': unknown man viewer."
msgstr "“%s”: không rõ chương trình xem man."
-#: builtin/help.c:452
+#: builtin/help.c:487
msgid "no man viewer handled the request"
msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu cầu"
-#: builtin/help.c:459
+#: builtin/help.c:494
msgid "no info viewer handled the request"
msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:555 builtin/help.c:566 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "“%s” được đặt bí danh thành “%s”"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:569 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "chuỗi alias.%s sai: %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:611
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "tùy chọn '%s' không nhận bất kỳ tham số không phải tùy chọn nào khác"
+
+#: builtin/help.c:631
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr ""
+"tùy chọn '--no-[external-commands|aliases]' chỉ có thể sử dụng cùng với '--"
+"all'"
+
+#: builtin/help.c:643 builtin/help.c:671
#, c-format
msgid "usage: %s%s"
msgstr "cách dùng: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:666
msgid "'git help config' for more information"
msgstr "Chạy lệnh “git help config” để có thêm thông tin"
-#: builtin/index-pack.c:222
+#: builtin/hook.c:10
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr "git hook run [--ignore-missing] <tên-móc> [-- <các tham số cho móc>]"
+
+#: builtin/hook.c:30
+msgid "silently ignore missing requested <hook-name>"
+msgstr "bỏ qua âm thầm các <hook-name> đã yêu cầu còn thiếu"
+
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "kiểu đối tượng không khớp tại %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "không thể lấy về đối tượng cần %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "đối tượng %s: cần kiểu %s nhưng lại nhận được %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "không thể điền thêm vào %d byte"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "gặp kết thúc tập tin EOF quá sớm"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "lỗi đọc ở đầu vào"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:754
msgid "pack too large for current definition of off_t"
msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "gói đã vượt quá cỡ tối đa được phép"
-
-#: builtin/index-pack.c:343
+#: builtin/index-pack.c:329
#, c-format
-msgid "unable to create '%s'"
-msgstr "không thể tạo “%s”"
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "gói đã vượt quá cỡ tối đa được phép (%s)"
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "không thể mở packfile “%s”"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "chữ ký cho gói không khớp"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:380
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "gói có đối tượng sai tại khoảng bù %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:485
#, c-format
msgid "inflate returned %d"
msgstr "xả nén trả về %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:534
msgid "offset value overflow for delta base object"
msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:542
msgid "delta base offset is out of bound"
msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:550
#, c-format
msgid "unknown object type %d"
msgstr "không hiểu kiểu đối tượng %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:581
msgid "cannot pread pack file"
msgstr "không thể chạy hàm pread cho tập tin gói"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:583
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:609
msgid "serious inflate inconsistency"
msgstr "sự mâu thuẫn xả nén nghiêm trọng"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
+#: builtin/index-pack.c:823 builtin/index-pack.c:832
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
-#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
+#: builtin/index-pack.c:757 builtin/pack-objects.c:290
+#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
#, c-format
msgid "unable to read %s"
msgstr "không thể đọc %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:821
#, c-format
msgid "cannot read existing object info %s"
msgstr "không thể đọc thông tin đối tượng sẵn có %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:829
#, c-format
msgid "cannot read existing object %s"
msgstr "không thể đọc đối tượng đã tồn tại %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:843
#, c-format
msgid "invalid blob object %s"
msgstr "đối tượng blob không hợp lệ %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:846 builtin/index-pack.c:865
msgid "fsck error in packed object"
msgstr "lỗi fsck trong đối tượng đóng gói"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:867
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:928 builtin/index-pack.c:975
msgid "failed to apply delta"
msgstr "gặp lỗi khi áp dụng delta"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Đang nhận về các đối tượng"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Các đối tượng bảng mục lục"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "gói bị sai hỏng (SHA1 không khớp)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "không thể lấy thông tin thống kê packfile"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "pack có phần thừa ở cuối"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Đang phân giải các delta"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
#, c-format
msgid "unable to create thread: %s"
msgstr "không thể tạo tuyến: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "lộn xộn hơn cả điên rồ"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "đầy đủ với %d đối tượng nội bộ"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa hỏng?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "gói có %d delta chưa được giải quyết"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "không thể xả nén đối tượng nối thêm (%d)"
@@ -16588,55 +17312,52 @@
msgid "local object %s is corrupt"
msgstr "đối tượng nội bộ %s bị hỏng"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1445
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "tên tập tin tập tin gói “%s” không được kết thúc “.%s”"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "không thể ghi %s tập tin “%s”"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "không thể đóng tập tin được ghi %s “%s”"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1494
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "không thể đổi tên tập tin tạm thời “*.%s” thành “%s”"
+
+#: builtin/index-pack.c:1519
msgid "error while closing pack file"
msgstr "gặp lỗi trong khi đóng tập tin gói"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "không thể lưu tập tin gói"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "không thể lưu trữ tập tin ghi mục lục"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "sai pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1648
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Không thể mở tập tin gói đã sẵn có “%s”"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Không thể mở tập tin idx của gói cho “%s”"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1698
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "không delta: %d đối tượng"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1705
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -16647,33 +17368,25 @@
msgstr "Không thể quay lại cwd"
#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
#, c-format
msgid "bad %s"
msgstr "%s sai"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "không hiểu thuật toán băm dữ liệu “%s”"
-#: builtin/index-pack.c:1850
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin không thể được dùng mà không có --stdin"
-
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1856
msgid "--stdin requires a git repository"
msgstr "--stdin cần một kho git"
-#: builtin/index-pack.c:1854
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format không thể được dùng với --stdin"
-
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1873
msgid "--verify with no packfile name given"
msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "lỗi fsck trong các đối tượng gói"
@@ -16794,10 +17507,6 @@
msgid "specify the hash algorithm to use"
msgstr "chỉ định thuật toán băm dữ liệu muốn dùng"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "Các tùy chọn --separate-git-dir và --bare loại từ lẫn nhau"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
@@ -16886,40 +17595,40 @@
msgid "no input file given for in-place editing"
msgstr "không đưa ra tập tin đầu vào để sửa tại-chỗ"
-#: builtin/log.c:59
+#: builtin/log.c:60
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<các tùy chọn>] [<vùng-xem-xét>] [[--] </đường/dẫn>…]"
-#: builtin/log.c:60
+#: builtin/log.c:61
msgid "git show [<options>] <object>..."
msgstr "git show [<các tùy chọn>] <đối-tượng>…"
-#: builtin/log.c:113
+#: builtin/log.c:114
#, c-format
msgid "invalid --decorate option: %s"
msgstr "tùy chọn --decorate không hợp lệ: %s"
-#: builtin/log.c:180
+#: builtin/log.c:181
msgid "show source"
msgstr "hiển thị mã nguồn"
-#: builtin/log.c:181
+#: builtin/log.c:182
msgid "use mail map file"
msgstr "sử dụng tập tin ánh xạ thư"
-#: builtin/log.c:184
+#: builtin/log.c:185
msgid "only decorate refs that match <pattern>"
msgstr "chỉ tô sáng các tham chiếu khớp với <mẫu>"
-#: builtin/log.c:186
+#: builtin/log.c:187
msgid "do not decorate refs that match <pattern>"
msgstr "không tô sáng các tham chiếu khớp với <mẫu>"
-#: builtin/log.c:187
+#: builtin/log.c:188
msgid "decorate options"
msgstr "các tùy chọn trang trí"
-#: builtin/log.c:190
+#: builtin/log.c:191
msgid ""
"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
@@ -16927,89 +17636,93 @@
"theo dõi sự tiến hóa của phạm vi <start><end> dòng, hoặc chức năng:"
"<funcname> trong <file>"
-#: builtin/log.c:213
+#: builtin/log.c:214
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<vùng>:<tập_tin> không thể được sử dụng với đặc tả đường dẫn"
-#: builtin/log.c:306
+#: builtin/log.c:322
#, c-format
msgid "Final output: %d %s\n"
msgstr "Kết xuất cuối cùng: %d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:429
+msgid "unable to create temporary object directory"
+msgstr "không thể tạo thư mục đối tượng tạm thời"
+
+#: builtin/log.c:599
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: sai tập tin"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:614 builtin/log.c:706
#, c-format
msgid "could not read object %s"
msgstr "không thể đọc đối tượng %s"
-#: builtin/log.c:701
+#: builtin/log.c:731
#, c-format
msgid "unknown type: %d"
msgstr "không nhận ra kiểu: %d"
-#: builtin/log.c:846
+#: builtin/log.c:880
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: bao bọc không hợp lệ từ chế độ mô tả"
-#: builtin/log.c:853
+#: builtin/log.c:887
msgid "format.headers without value"
msgstr "format.headers không có giá trị cụ thể"
-#: builtin/log.c:982
+#: builtin/log.c:1016
#, c-format
msgid "cannot open patch file %s"
msgstr "không thể mở tập tin miếng vá: %s"
-#: builtin/log.c:999
+#: builtin/log.c:1033
msgid "need exactly one range"
msgstr "cần chính xác một vùng"
-#: builtin/log.c:1009
+#: builtin/log.c:1043
msgid "not a range"
msgstr "không phải là một vùng"
-#: builtin/log.c:1173
+#: builtin/log.c:1207
msgid "cover letter needs email format"
msgstr "“cover letter” cần cho định dạng thư"
-#: builtin/log.c:1179
+#: builtin/log.c:1213
msgid "failed to create cover-letter file"
msgstr "gặp lỗi khi tạo các tập tin cover-letter"
-#: builtin/log.c:1266
+#: builtin/log.c:1300
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to điên rồ: %s"
-#: builtin/log.c:1293
+#: builtin/log.c:1327
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<các tùy chọn>] [<kể-từ> | <vùng-xem-xét>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1385
msgid "two output directories?"
msgstr "hai thư mục kết xuất?"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
#, c-format
msgid "unknown commit %s"
msgstr "không hiểu lần chuyển giao %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ"
-#: builtin/log.c:1522
+#: builtin/log.c:1556
msgid "could not find exact merge base"
msgstr "không tìm thấy nền hòa trộn chính xác"
-#: builtin/log.c:1532
+#: builtin/log.c:1566
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"
@@ -17020,294 +17733,281 @@
"nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao nền bằng\n"
"\"--base=<base-commit-id>\" một cách thủ công"
-#: builtin/log.c:1555
+#: builtin/log.c:1589
msgid "failed to find exact merge base"
msgstr "gặp lỗi khi tìm nền hòa trộn chính xác"
-#: builtin/log.c:1572
+#: builtin/log.c:1606
msgid "base commit should be the ancestor of revision list"
msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt"
-#: builtin/log.c:1582
+#: builtin/log.c:1616
msgid "base commit shouldn't be in revision list"
msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt"
-#: builtin/log.c:1640
+#: builtin/log.c:1674
msgid "cannot get patch id"
msgstr "không thể lấy mã miếng vá"
-#: builtin/log.c:1703
+#: builtin/log.c:1737
msgid "failed to infer range-diff origin of current series"
msgstr ""
"gặp lỗi khi suy luận range-diff (vùng khác biệt) gốc của sê-ri hiện tại"
-#: builtin/log.c:1705
+#: builtin/log.c:1739
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "dùng “%s” như là gốc range-diff của sê-ri hiện tại"
-#: builtin/log.c:1749
+#: builtin/log.c:1783
msgid "use [PATCH n/m] even with a single patch"
msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn"
-#: builtin/log.c:1752
+#: builtin/log.c:1786
msgid "use [PATCH] even with multiple patches"
msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp"
-#: builtin/log.c:1756
+#: builtin/log.c:1790
msgid "print patches to standard out"
msgstr "hiển thị miếng vá ra đầu ra chuẩn"
-#: builtin/log.c:1758
+#: builtin/log.c:1792
msgid "generate a cover letter"
msgstr "tạo bì thư"
-#: builtin/log.c:1760
+#: builtin/log.c:1794
msgid "use simple number sequence for output file names"
msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra"
-#: builtin/log.c:1761
+#: builtin/log.c:1795
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1762
+#: builtin/log.c:1796
msgid "use <sfx> instead of '.patch'"
msgstr "sử dụng <sfx> thay cho “.patch”"
-#: builtin/log.c:1764
+#: builtin/log.c:1798
msgid "start numbering patches at <n> instead of 1"
msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1"
-#: builtin/log.c:1765
+#: builtin/log.c:1799
msgid "reroll-count"
msgstr "đếm reroll"
-#: builtin/log.c:1766
+#: builtin/log.c:1800
msgid "mark the series as Nth re-roll"
msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll"
-#: builtin/log.c:1768
+#: builtin/log.c:1802
msgid "max length of output filename"
msgstr "chiều dài tên tập tin đầu ra tối đa"
-#: builtin/log.c:1770
+#: builtin/log.c:1804
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "dùng [VÁ RFC] thay cho [VÁ]"
-#: builtin/log.c:1773
+#: builtin/log.c:1807
msgid "cover-from-description-mode"
msgstr "cover-from-description-mode"
-#: builtin/log.c:1774
+#: builtin/log.c:1808
msgid "generate parts of a cover letter based on a branch's description"
msgstr "tạo ra các phần của một lá thư bao gồm dựa trên mô tả của nhánh"
-#: builtin/log.c:1776
+#: builtin/log.c:1810
msgid "use [<prefix>] instead of [PATCH]"
msgstr "dùng [<tiền-tố>] thay cho [VÁ]"
-#: builtin/log.c:1779
+#: builtin/log.c:1813
msgid "store resulting files in <dir>"
msgstr "lưu các tập tin kết quả trong <t.mục>"
-#: builtin/log.c:1782
+#: builtin/log.c:1816
msgid "don't strip/add [PATCH]"
msgstr "không strip/add [VÁ]"
-#: builtin/log.c:1785
+#: builtin/log.c:1819
msgid "don't output binary diffs"
msgstr "không kết xuất diff (những khác biệt) nhị phân"
-#: builtin/log.c:1787
+#: builtin/log.c:1821
msgid "output all-zero hash in From header"
msgstr "xuất mọi mã băm all-zero trong phần đầu From"
-#: builtin/log.c:1789
+#: builtin/log.c:1823
msgid "don't include a patch matching a commit upstream"
msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn"
-#: builtin/log.c:1791
+#: builtin/log.c:1825
msgid "show patch format instead of default (patch + stat)"
msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)"
-#: builtin/log.c:1793
+#: builtin/log.c:1827
msgid "Messaging"
msgstr "Lời nhắn"
-#: builtin/log.c:1794
+#: builtin/log.c:1828
msgid "header"
msgstr "đầu đề thư"
-#: builtin/log.c:1795
+#: builtin/log.c:1829
msgid "add email header"
msgstr "thêm đầu đề thư"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1830 builtin/log.c:1831
msgid "email"
msgstr "thư điện tử"
-#: builtin/log.c:1796
+#: builtin/log.c:1830
msgid "add To: header"
msgstr "thêm To: đầu đề thư"
-#: builtin/log.c:1797
+#: builtin/log.c:1831
msgid "add Cc: header"
msgstr "thêm Cc: đầu đề thư"
-#: builtin/log.c:1798
+#: builtin/log.c:1832
msgid "ident"
msgstr "thụt lề"
-#: builtin/log.c:1799
+#: builtin/log.c:1833
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)"
-#: builtin/log.c:1801
+#: builtin/log.c:1835
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1802
+#: builtin/log.c:1836
msgid "make first mail a reply to <message-id>"
msgstr "dùng thư đầu tiên để trả lời <message-id>"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1837 builtin/log.c:1840
msgid "boundary"
msgstr "ranh giới"
-#: builtin/log.c:1804
+#: builtin/log.c:1838
msgid "attach the patch"
msgstr "đính kèm miếng vá"
-#: builtin/log.c:1807
+#: builtin/log.c:1841
msgid "inline the patch"
msgstr "dùng miếng vá làm nội dung"
-#: builtin/log.c:1811
+#: builtin/log.c:1845
msgid "enable message threading, styles: shallow, deep"
msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”"
-#: builtin/log.c:1813
+#: builtin/log.c:1847
msgid "signature"
msgstr "chữ ký"
-#: builtin/log.c:1814
+#: builtin/log.c:1848
msgid "add a signature"
msgstr "thêm chữ ký"
-#: builtin/log.c:1815
+#: builtin/log.c:1849
msgid "base-commit"
msgstr "lần_chuyển_giao_nền"
-#: builtin/log.c:1816
+#: builtin/log.c:1850
msgid "add prerequisite tree info to the patch series"
msgstr "add trước hết đòi hỏi thông tin cây tới sê-ri miếng vá"
-#: builtin/log.c:1819
+#: builtin/log.c:1853
msgid "add a signature from a file"
msgstr "thêm chữ ký từ một tập tin"
-#: builtin/log.c:1820
+#: builtin/log.c:1854
msgid "don't print the patch filenames"
msgstr "không hiển thị các tên tập tin của miếng vá"
-#: builtin/log.c:1822
+#: builtin/log.c:1856
msgid "show progress while generating patches"
msgstr "hiển thị bộ đo tiến triển trong khi tạo các miếng vá"
-#: builtin/log.c:1824
+#: builtin/log.c:1858
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"hiển thị các thay đổi dựa trên <rev> trong các chữ bao bọc hoặc miếng vá đơn"
-#: builtin/log.c:1827
+#: builtin/log.c:1861
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"hiển thị các thay đổi dựa trên <refspec> trong các chữ bao bọc hoặc miếng vá "
"đơn"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1863 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "tỷ lệ phần trăm theo cái tạo là weighted"
-#: builtin/log.c:1916
+#: builtin/log.c:1953
#, c-format
msgid "invalid ident line: %s"
msgstr "dòng định danh không hợp lệ: %s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n và -k loại trừ lẫn nhau"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc và -k xung khắc nhau"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1978
msgid "--name-only does not make sense"
msgstr "--name-only không hợp lý"
-#: builtin/log.c:1943
+#: builtin/log.c:1980
msgid "--name-status does not make sense"
msgstr "--name-status không hợp lý"
-#: builtin/log.c:1945
+#: builtin/log.c:1982
msgid "--check does not make sense"
msgstr "--check không hợp lý"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-"Các tùy chọn --stdout, --output, và --output-directory loại từ lẫn nhau"
+#: builtin/log.c:1984
+msgid "--remerge-diff does not make sense"
+msgstr "--remerge-diff không hợp lý"
-#: builtin/log.c:2089
+#: builtin/log.c:2129
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff cần --cover-letter hoặc vá đơn"
-#: builtin/log.c:2093
+#: builtin/log.c:2133
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:2094
+#: builtin/log.c:2134
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff dựa trên v%d:"
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor yêu cầu --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2144
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff yêu cầu --cover-letter hoặc miếng vá đơn"
-#: builtin/log.c:2112
+#: builtin/log.c:2152
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:2113
+#: builtin/log.c:2153
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff dựa trên v%d:"
-#: builtin/log.c:2124
+#: builtin/log.c:2164
#, c-format
msgid "unable to read signature file '%s'"
msgstr "không thể đọc tập tin chữ ký “%s”"
-#: builtin/log.c:2160
+#: builtin/log.c:2200
msgid "Generating patches"
msgstr "Đang tạo các miếng vá"
-#: builtin/log.c:2204
+#: builtin/log.c:2244
msgid "failed to create output files"
msgstr "gặp lỗi khi tạo các tập tin kết xuất"
-#: builtin/log.c:2263
+#: builtin/log.c:2304
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2358
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17315,132 +18015,136 @@
"Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một "
"cách thủ công.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<các tùy chọn>] [<tập-tin>…]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "các đường dẫn được ngăn cách bởi ký tự NULL"
+
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "nhận dạng các trạng thái tập tin với thẻ"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"dùng chữ cái viết thường cho các tập tin “assume unchanged” (giả định không "
"thay đổi)"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "dùng chữ cái viết thường cho các tập tin “fsmonitor clean”"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "hiển thị các tập tin đã xóa trong kết xuất"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "hiển thị các tập tin khác trong kết xuất"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "hiển thị tên đối tượng của nội dung được đặt lên bệ phóng ra kết xuất"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "chỉ hiển thị tên của các thư mục “khác”"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "hiển thị kết thúc dòng của các tập tin"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "không hiển thị thư mục rỗng"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "hiển thị thông tin resolve-undo"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "bỏ qua những tập tin khớp với một mẫu"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "mẫu loại trừ được đọc từ <tập tin>"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "đọc mẫu cần loại trừ từ <tập-tin>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr "đọc thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "thêm loại trừ tiêu chuẩn kiểu git"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án"
-#: builtin/ls-files.c:666
-msgid "recurse through submodules"
-msgstr "đệ quy xuyên qua mô-đun con"
-
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "tree-ish"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "hiển thị dữ liệu gỡ lỗi"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "chặn các mục tin trùng lặp"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "hiển thị thư mục \"sparse\" trong sự có mặt của mục lục \"sparse\""
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<kho> [<các tham chiếu>…]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<kho> [<các tham chiếu>…]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "không hiển thị URL máy chủ"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
msgid "exec"
msgstr "thực thi"
@@ -17472,42 +18176,71 @@
msgid "show underlying ref in addition to the object pointed by it"
msgstr "hiển thị tham chiếu nằm dưới để thêm vào đối tượng được chỉ bởi nó"
-#: builtin/ls-tree.c:30
+#: builtin/ls-tree.c:36
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<các tùy chọn>] <tree-ish> [</đường/dẫn>…]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:54
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "không thể lấy thông tin đối tượng về “%s”"
+
+#: builtin/ls-tree.c:79
+#, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "định dạng ls-tree sai: phần tử “%s” không bắt đầu bằng “(”"
+
+#: builtin/ls-tree.c:83
+#, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "định dạng ls-tree sai: phần tử “%s” không bắt kết thúc bằng “)”"
+
+#: builtin/ls-tree.c:109
+#, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr "định dạng ls-tree sai: %%%.*s"
+
+#: builtin/ls-tree.c:336
msgid "only show trees"
msgstr "chỉ hiển thị các tree"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:338
msgid "recurse into subtrees"
msgstr "đệ quy vào các thư mục con"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:340
msgid "show trees when recursing"
msgstr "hiển thị cây khi đệ quy"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:343
msgid "terminate entries with NUL byte"
msgstr "chấm dứt mục tin với byte NUL"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:344
msgid "include object size"
msgstr "gồm cả kích thước đối tượng"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
msgid "list only filenames"
msgstr "chỉ liệt kê tên tập tin"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:350
+msgid "list only objects"
+msgstr "chỉ liệt kê các đối tượng"
+
+#: builtin/ls-tree.c:353
msgid "use full path names"
msgstr "dùng tên đường dẫn đầy đủ"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:355
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ ý --full-name)"
+#: builtin/ls-tree.c:391
+msgid "--format can't be combined with other format-altering options"
+msgstr ""
+"--format không thể được tổ hợp cùng với các tùy chọn format-alterin khác"
+
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
@@ -17557,7 +18290,11 @@
msgid "use headers in message's body"
msgstr "sử dụng phần đầu trong nội dung thư"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:227
+msgid "reading patches from stdin/tty..."
+msgstr "đọc các miếng vá từ đầu vào tiêu chuẩn stdin/tty..."
+
+#: builtin/mailsplit.c:242
#, c-format
msgid "empty mbox: '%s'"
msgstr "mbox trống rỗng: “%s”"
@@ -17582,23 +18319,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <tham-chiếu> [<lần_chuyển_giao>]"
-#: builtin/merge-base.c:143
+#: builtin/merge-base.c:144
msgid "output all common ancestors"
msgstr "xuất ra tất cả các ông bà, tổ tiên chung"
-#: builtin/merge-base.c:145
+#: builtin/merge-base.c:146
msgid "find ancestors for a single n-way merge"
msgstr "tìm tổ tiên của hòa trộn n-way đơn"
-#: builtin/merge-base.c:147
+#: builtin/merge-base.c:148
msgid "list revs not reachable from others"
msgstr "liệt kê các “rev” mà nó không thể đọc được từ cái khác"
-#: builtin/merge-base.c:149
+#: builtin/merge-base.c:150
msgid "is the first one ancestor of the other?"
msgstr "là cha mẹ đầu tiên của cái khác?"
-#: builtin/merge-base.c:151
+#: builtin/merge-base.c:152
msgid "find where <commit> forked from reflog of <ref>"
msgstr "tìm xem <commit> được rẽ nhánh ở đâu từ reflog của <th.chiếu>"
@@ -17619,26 +18356,30 @@
msgstr "dùng kiểu hòa dựa trên diff3"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "dùng kiểu hòa trộn dựa trên 'zealous diff3'"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "để tránh xung đột, sử dụng phiên bản của chúng ta"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "để tránh xung đột, sử dụng phiên bản của họ"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "để tránh xung đột, sử dụng phiên bản kết hợp"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "để tránh xung đột, hãy sử dụng kích thước bộ tạo này"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "không cảnh báo về các xung đột xảy ra"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "đặt nhãn cho tập-tin-1/tập-tin-gốc/tập-tin-2"
@@ -17672,185 +18413,189 @@
msgid "Merging %s with %s\n"
msgstr "Đang hòa trộn %s với %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<các tùy chọn>] [<commit>…]"
-#: builtin/merge.c:123
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "switch “m” yêu cầu một giá trị"
-#: builtin/merge.c:146
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "tùy chọn “%s” yêu cầu một giá trị"
-#: builtin/merge.c:199
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Không tìm thấy chiến lược hòa trộn “%s”.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "Các chiến lược sẵn sàng là:"
-#: builtin/merge.c:205
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "Các chiến lược tùy chỉnh sẵn sàng là:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(đồng nghĩa với --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "sửa chú thích trước khi chuyển giao"
-#: builtin/merge.c:271
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "bỏ qua nếu chuyển-tiếp-nhanh không thể được"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1145 builtin/revert.c:114
msgid "strategy"
msgstr "chiến lược"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "chiến lược hòa trộn sẽ dùng"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "tùy_chọn=giá_trị"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "tùy chọn cho chiến lược hòa trộn đã chọn"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn không-chuyển-tiếp-"
"nhanh)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "dùng <tên> thay cho đích thật"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện"
-#: builtin/merge.c:292
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort nhưng để lại bảng mục lục và cây làm việc"
-#: builtin/merge.c:294
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "tiếp tục quá trình hòa trộn hiện tại đang thực hiện"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "cho phép hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:303
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "vòng qua móc (hook) pre-merge-commit và commit-msg"
-#: builtin/merge.c:320
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "không thể chạy stash."
-#: builtin/merge.c:325
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "lệnh tạm cất gặp lỗi"
-#: builtin/merge.c:330
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "không phải là một đối tượng hợp lệ: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "read-tree gặp lỗi"
-#: builtin/merge.c:400
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "Đã cập nhật rồi. (không có gì để squash)"
-#: builtin/merge.c:414
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Squash commit -- không cập nhật HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Không có lời chú thích hòa trộn -- nên không cập nhật HEAD\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "“%s” không chỉ đến một lần chuyển giao nào cả"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Chuỗi branch.%s.mergeoptions sai: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "Không cầm nắm gì ngoài hai head hòa trộn."
-#: builtin/merge.c:742
+#: builtin/merge.c:745
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "không hiểu chiến lược: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "không thể ghi %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "Không thể đọc từ “%s”"
-#: builtin/merge.c:822
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Vẫn chưa hòa trộn các lần chuyển giao; sử dụng lệnh “git commit” để hoàn tất "
"việc hòa trộn.\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:831
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"
@@ -17862,11 +18607,11 @@
"topic.\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "Nếu phần chú thích rỗng sẽ hủy bỏ lần chuyển giao.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17875,75 +18620,75 @@
"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua, và nếu phần chú\n"
"thích rỗng sẽ hủy bỏ lần chuyển giao.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:900
msgid "Empty commit message."
msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
-#: builtin/merge.c:904
+#: builtin/merge.c:915
#, c-format
msgid "Wonderful.\n"
msgstr "Tuyệt vời.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:976
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết "
"quả.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1015
msgid "No current branch."
msgstr "Không phải nhánh hiện hành."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1017
msgid "No remote for the current branch."
msgstr "Không có máy chủ cho nhánh hiện hành."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1019
msgid "No default upstream defined for the current branch."
msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1024
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Không nhánh mạng theo dõi cho %s từ %s"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1081
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Giá trị sai “%s” trong biến môi trường “%s”"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1183
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "không phải là một thứ gì đó mà chúng tôi có thể hòa trộn trong %s: %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1217
msgid "not something we can merge"
msgstr "không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1330
msgid "--abort expects no arguments"
msgstr "--abort không nhận các đối số"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1334
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1352
msgid "--quit expects no arguments"
msgstr "--quit không nhận các đối số"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1365
msgid "--continue expects no arguments"
msgstr "--continue không nhận đối số"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1369
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ở đây không có lần hòa trộn nào đang được xử lý cả (thiếu MERGE_HEAD)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1385
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17951,7 +18696,7 @@
"Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n"
"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1392
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17959,100 +18704,84 @@
"Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n"
"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1395
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)."
-#: builtin/merge.c:1396
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Bạn không thể kết hợp --squash với --no-ff."
-
-#: builtin/merge.c:1398
-msgid "You cannot combine --squash with --commit."
-msgstr "Bạn không thể kết hợp --squash với --commit."
-
-#: builtin/merge.c:1414
+#: builtin/merge.c:1427
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt."
-#: builtin/merge.c:1431
+#: builtin/merge.c:1444
msgid "Squash commit into empty head not supported yet"
msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1446
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1451
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1453
msgid "Can merge only exactly one commit into empty head"
msgstr ""
"Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1540
msgid "refusing to merge unrelated histories"
msgstr "từ chối hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1559
#, c-format
msgid "Updating %s..%s\n"
msgstr "Đang cập nhật %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1606
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Đang thử hòa trộn kiểu “trivial in-index”…\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1613
#, c-format
msgid "Nope.\n"
msgstr "Không.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỏ qua."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1671 builtin/merge.c:1737
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Đang tua lại cây thành thời xa xưa…\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1675
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Đang thử chiến lược hòa trộn %s…\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1727
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1729
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1739
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Sử dụng chiến lược %s để chuẩn bị giải quyết bằng tay.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1753
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"Hòa trộn tự động đã trở nên tốt; bị dừng trước khi việc chuyển giao được yêu "
"cầu\n"
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr "git mktag"
-
#: builtin/mktag.c:27
#, c-format
msgid "warning: tag input does not pass fsck: %s"
@@ -18092,10 +18821,6 @@
msgid "unable to write tag file"
msgstr "không thể ghi vào tập tin lưu thẻ"
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
-
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "đầu vào được chấm dứt bởi NUL"
@@ -18109,34 +18834,50 @@
msgstr "cho phép tạo nhiều hơn một cây"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<các tùy chọn>] write [--preferred-pack=<cỡ>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<các tùy chọn>] write [--preferred-pack=<gói>][--refs-"
+"snapshot=</đường/dẫn>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<các tùy chọn>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<các tùy chọn>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<các-tùy-chọn>] repack [--batch-size=<cỡ>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "thư mục đối tượng có chứa một bộ các tập tin gói và cặp pack-index"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "preferred-pack"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "gói được sử dụng khi tính toán một \"multi-pack bitmap\""
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "ghi multi-pack bitmap"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "ghi mục lục multi-pack chỉ chứa các mục lục đã cho"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "ảnh chụp nhanh refs để chọn các lần chuyển giao ánh xạ"
+
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18144,11 +18885,6 @@
"trong suốt quá trình đóng gói lại, gom các tập tin gói có kích cỡ nhỏ hơn "
"vào một bó cái mà lớn hơn kích thước này"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "không hiểu câu lệnh con: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<các tùy chọn>] <nguồn>… <đích>"
@@ -18176,118 +18912,122 @@
msgid "skip move/rename errors"
msgstr "bỏ qua các lỗi liên quan đến di chuyển, đổi tên"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "có đích “%s” nhưng đây không phải là một thư mục"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "nguồn sai"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "không thể di chuyển một thư mục vào trong chính nó được"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "không di chuyển được thư mục thông qua tập tin"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "thư mục nguồn là trống rỗng"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "không nằm dưới sự quản lý mã nguồn"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "bị xung đột"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "đích đã tồn tại sẵn rồi"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "đang ghi đè lên “%s”"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Không thể ghi đè"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "nhiều nguồn cho cùng một đích"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "thư mục đích không tồn tại"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, nguồn=%s, đích=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Đổi tên %s thành %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
#, c-format
msgid "renaming '%s' failed"
msgstr "gặp lỗi khi đổi tên “%s”"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:524
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<các tùy chọn>] <commit>…"
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:525
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<các tùy chọn>] --all"
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<các tùy chọn>] --stdin"
+#: builtin/name-rev.c:526
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [<các tùy chọn>] --annotate-stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:583
msgid "print only ref-based names (no object names)"
msgstr "chỉ hiển thị các tham chiếu cơ sở (không phải các tên đối tượng)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:584
msgid "only use tags to name the commits"
msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:586
msgid "only use refs matching <pattern>"
msgstr "chỉ sử dụng các tham chiếu khớp với <mẫu>"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:588
msgid "ignore refs matching <pattern>"
msgstr "bỏ qua các tham chiếu khớp với <mẫu>"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:590
msgid "list all commits reachable from all refs"
msgstr ""
"liệt kê tất cả các lần chuyển giao có thể đọc được từ tất cả các tham chiếu"
-#: builtin/name-rev.c:532
-msgid "read from stdin"
-msgstr "đọc từ đầu vào tiêu chuẩn"
+#: builtin/name-rev.c:591
+msgid "deprecated: use annotate-stdin instead"
+msgstr "đã lạc hậu: hãy dùng annotate-stdin để thay thế"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:592
+msgid "annotate text from stdin"
+msgstr "chú giải chữ từ đầu vào tiêu chuẩn stdin"
+
+#: builtin/name-rev.c:593
msgid "allow to print `undefined` names (default)"
msgstr "cho phép in các tên “chưa định nghĩa” (mặc định)"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:599
msgid "dereference tags in the input (internal use)"
msgstr "bãi bỏ tham chiếu các thẻ trong đầu vào (dùng nội bộ)"
@@ -18329,14 +19069,6 @@
msgstr ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <chiến-lược> ] <notes-ref>"
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
-
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <notes-ref>] remove [<đối-tượng>…]"
@@ -18397,70 +19129,66 @@
msgid "git notes prune [<options>]"
msgstr "git notes prune [<các tùy chọn>]"
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "Ghi hay sửa ghi chú cho đối tượng sau đây:"
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "không thể khởi chạy “show” cho đối tượng “%s”"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "không thể đọc kết xuất “show”"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "gặp lỗi khi hoàn thành “show” cho đối tượng “%s”"
-#: builtin/notes.c:197
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr ""
"xin hãy áp dụng nội dung của ghi chú sử dụng hoặc là tùy chọn -m hoặc là -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "không thể ghi đối tượng ghi chú (note)"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "nội dung ghi chú còn lại %s"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:582
#, c-format
msgid "could not open or read '%s'"
msgstr "không thể mở hay đọc “%s”"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "gặp lỗi khi đọc đối tượng “%s”."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "không thể đọc dữ liệu ghi chú từ đối tượng không-blob “%s”."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "dòng đầu vào dị hình: “%s”."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "gặp lỗi khi sao chép ghi chú (note) từ “%s” sang “%s”"
@@ -18468,48 +19196,41 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "từ chối %s ghi chú trong %s (nằm ngoài refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
-msgid "too many arguments"
-msgstr "có quá nhiều đối số"
-
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "không tìm thấy ghi chú cho đối tượng %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "nội dung ghi chú (note) nằm trong một chuỗi"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "nội dung ghi chú (note) nằm trong một tập tin"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "cho lưu trữ ghi chú trống rỗng"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "thay thế ghi chú trước"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18518,29 +19239,29 @@
"Không thể thêm các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối tượng "
"%s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Đang ghi đè lên ghi chú cũ cho đối tượng %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "Đang gỡ bỏ ghi chú (note) cho đối tượng %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "quá ít đối số"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18549,12 +19270,12 @@
"Không thể sao chép các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối "
"tượng %s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "thiếu ghi chú trên đối tượng nguồn %s. Không thể sao chép."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18563,52 +19284,52 @@
"Các tùy chọn -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit”.\n"
"Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C”.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "gặp lỗi khi gỡ bỏ cây làm việc “git notes merge”"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "gặp lỗi khi đọc tham chiếu NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "không thể tìm thấy lần chuyển giao từ NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "không thể phân tích cú pháp lần chuyển giao từ NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "gặp lỗi khi phân giải NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "gặp lỗi khi hoàn thành hòa trộn ghi chú"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "không hiểu chiến lược hòa trộn ghi chú %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Tùy chọn chung"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Tùy chọn về hòa trộn"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18616,48 +19337,48 @@
"phân giải các xung đột “notes” sử dụng chiến lược đã đưa ra (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Chuyển giao các note chưa được hòa trộn"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển "
"giao"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "bỏ qua hòa trộn các ghi chú (note)"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "không thể trộn lẫn --commit, --abort hay -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "bạn phải chỉ định tham chiếu ghi chú để hòa trộn"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "không hiểu -s/--strategy: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "một ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "gặp lỗi khi lưu liên kết đến tham chiếu ghi chú hiện tại (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18668,41 +19389,41 @@
"chuyển giao kết quả bằng “git notes merge --commit”, hoặc bãi bỏ việc hòa "
"trộn bằng “git notes merge --abort”.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:595
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ."
-#: builtin/notes.c:900
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "Đối tượng %s không có ghi chú (note)\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải là một lỗi"
-#: builtin/notes.c:915
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "không gỡ bỏ, chỉ hiển thị"
-#: builtin/notes.c:955
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "báo cáo các đối tượng đã prune"
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "dùng “notes” từ <notes-ref>"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1036 builtin/stash.c:1802
#, c-format
msgid "unknown subcommand: %s"
msgstr "không hiểu câu lệnh con: %s"
@@ -18721,7 +19442,7 @@
"git pack-objects [các tùy chọn…] <base-name> [< <danh-sách-ref> | < <danh-"
"sách-đối-tượng>]"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:570
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18730,108 +19451,112 @@
"write_reuse_object: không thể phân bổ %s, cần tại vị trí bù %<PRIuMAX> trong "
"gói %s"
-#: builtin/pack-objects.c:580
+#: builtin/pack-objects.c:578
#, c-format
msgid "bad packed object CRC for %s"
msgstr "CRC của đối tượng gói sai với %s"
-#: builtin/pack-objects.c:591
+#: builtin/pack-objects.c:589
#, c-format
msgid "corrupt packed object for %s"
msgstr "đối tượng đã đóng gói sai hỏng cho %s"
-#: builtin/pack-objects.c:722
+#: builtin/pack-objects.c:720
#, c-format
msgid "recursive delta detected for object %s"
msgstr "dò thấy delta đệ quy cho đối tượng %s"
-#: builtin/pack-objects.c:941
+#: builtin/pack-objects.c:939
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "đã sắp xếp %u đối tượng, cần %<PRIu32>"
-#: builtin/pack-objects.c:1036
+#: builtin/pack-objects.c:1034
#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "cần đối tượng tại khoảng bù %<PRIuMAX> trong gói: %s"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1158
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "tắt ghi bitmap, các gói bị chia nhỏ bởi vì pack.packSizeLimit"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1171
msgid "Writing objects"
msgstr "Đang ghi lại các đối tượng"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1243 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "gặp lỗi khi lấy thông tin thống kê về %s"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1276
+msgid "failed to write bitmap index"
+msgstr "gặp lỗi khi ghi mục lục ánh xạ"
+
+#: builtin/pack-objects.c:1302
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "đã ghi %<PRIu32> đối tượng trong khi cần %<PRIu32>"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1544
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1992
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "khoảng bù cơ sở cho delta bị tràn trong gói cho %s"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:2001
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm cho %s"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2282
msgid "Counting objects"
msgstr "Đang đếm các đối tượng"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2447
#, c-format
msgid "unable to parse object header of %s"
msgstr "không thể phân tích phần đầu đối tượng của “%s”"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
+#: builtin/pack-objects.c:2543
#, c-format
msgid "object %s cannot be read"
msgstr "không thể đọc đối tượng %s"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"đối tượng %s không nhất quán về chiều dài đối tượng (%<PRIuMAX> so với "
"%<PRIuMAX>)"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2557
msgid "suboptimal pack - out of memory"
msgstr "suboptimal pack - hết bộ nhớ"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2872
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Nén delta dùng tới %d tuyến trình"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3011
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "không thể đóng gói các đối tượng tiếp cận được từ thẻ “%s”"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3097
msgid "Compressing objects"
msgstr "Đang nén các đối tượng"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3103
msgid "inconsistency with delta count"
msgstr "mâu thuẫn với số lượng delta"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3182
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18840,7 +19565,7 @@
"giá trị của uploadpack.blobpackfileuri phải có dạng “<object-hash> <pack-"
"hash> <uri>” (nhận “%s”)"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3185
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -18848,17 +19573,18 @@
"đối tượng đã được cấu hình trong một uploadpack.blobpackfileuri khác (đã "
"nhận “%s”)"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3220
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "không thể lấy kiểu của đối tượng “%s” trong gói “%s”"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
+#: builtin/pack-objects.c:3373
#, c-format
msgid "could not find pack '%s'"
msgstr "không thể tìm thấy gói “%s”"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3416
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18867,7 +19593,7 @@
"cần ID đối tượng cạnh, nhận được rác:\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3422
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -18876,248 +19602,240 @@
"cần ID đối tượng, nhận được rác:\n"
" %s"
-#: builtin/pack-objects.c:3482
-msgid "invalid value for --missing"
-msgstr "giá trị cho --missing không hợp lệ"
-
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
msgid "cannot open pack index"
msgstr "không thể mở mục lục của gói"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3549
#, c-format
msgid "loose object at %s could not be examined"
msgstr "đối tượng mất tại %s không thể đã kiểm tra"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3635
msgid "unable to force loose object"
msgstr "không thể buộc mất đối tượng"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3763
#, c-format
msgid "not a rev '%s'"
msgstr "không phải một rev “%s”"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "điểm xem xét sai “%s”"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3794
msgid "unable to add recent objects"
msgstr "không thể thêm các đối tượng mới dùng"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3847
#, c-format
msgid "unsupported index version %s"
msgstr "phiên bản mục lục không được hỗ trợ %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3851
#, c-format
msgid "bad index version '%s'"
msgstr "phiên bản mục lục sai “%s”"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3907
msgid "<version>[,<offset>]"
msgstr "<phiên bản>[,offset]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3908
msgid "write the pack index file in the specified idx format version"
msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3911
msgid "maximum size of each output pack file"
msgstr "kcíh thước tối đa cho tập tin gói được tạo"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3913
msgid "ignore borrowed objects from alternate object store"
msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3915
msgid "ignore packed objects"
msgstr "bỏ qua các đối tượng đóng gói"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3917
msgid "limit pack window by objects"
msgstr "giới hạn cửa sổ đóng gói theo đối tượng"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3919
msgid "limit pack window by memory in addition to object limit"
msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3921
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3923
msgid "reuse existing deltas"
msgstr "dùng lại các delta sẵn có"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3925
msgid "reuse existing objects"
msgstr "dùng lại các đối tượng sẵn có"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3927
msgid "use OFS_DELTA objects"
msgstr "dùng các đối tượng OFS_DELTA"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3929
msgid "use threads when searching for best delta matches"
msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3931
msgid "do not create an empty pack output"
msgstr "không thể tạo kết xuất gói trống rỗng"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3933
msgid "read revision arguments from standard input"
msgstr "đọc tham số “revision” từ thiết bị nhập chuẩn"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3935
msgid "limit the objects to those that are not yet packed"
msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3938
msgid "include objects reachable from any reference"
msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3941
msgid "include objects referred by reflog entries"
msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3944
msgid "include objects referred to by the index"
msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3947
msgid "read packs from stdin"
msgstr "đọc các gói từ đầu vào tiêu chuẩn"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3949
msgid "output pack to stdout"
msgstr "xuất gói ra đầu ra tiêu chuẩn"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3951
msgid "include tag objects that refer to objects to be packed"
msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3953
msgid "keep unreachable objects"
msgstr "giữ lại các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3955
msgid "pack loose unreachable objects"
msgstr "pack mất các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3957
msgid "unpack unreachable objects newer than <time>"
msgstr ""
"xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3960
msgid "use the sparse reachability algorithm"
msgstr "sử dụng thuật toán “sparse reachability”"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3962
msgid "create thin packs"
msgstr "tạo gói nhẹ"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3964
msgid "create packs suitable for shallow fetches"
msgstr "tạo gói để phù hợp cho lấy về nông (shallow)"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3966
msgid "ignore packs that have companion .keep file"
msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3968
msgid "ignore this pack"
msgstr "bỏ qua gói này"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3970
msgid "pack compression level"
msgstr "mức nén gói"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3972
msgid "do not hide commits by grafts"
msgstr "không ẩn các lần chuyển giao bởi “grafts”"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3974
msgid "use a bitmap index if available to speed up counting objects"
msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3976
msgid "write a bitmap index together with the pack index"
msgstr "ghi một mục lục ánh xạ cùng với mục lục gói"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3980
msgid "write a bitmap index if possible"
msgstr "ghi mục lục ánh xạ nếu được"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3984
msgid "handling for missing objects"
msgstr "xử lý cho thiếu đối tượng"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3987
msgid "do not pack objects in promisor packfiles"
msgstr "không thể đóng gói các đối tượng trong các tập tin gói hứa hẹn"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3989
msgid "respect islands during delta compression"
msgstr "tôn trọng island trong suốt quá trình nén “delta”"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3991
msgid "protocol"
msgstr "giao thức"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3992
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "loại trừ bất kỳ cấu hình uploadpack.blobpackfileuri với giao thức này"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4027
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "mức sau xích delta %d là quá sâu, buộc dùng %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4032
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit là quá cao, ép dùng %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4088
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size không thể được sử dụng để xây dựng một gói để vận chuyển"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4090
msgid "minimum pack size limit is 1 MiB"
msgstr "giới hạn kích thước tối thiểu của gói là 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4095
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin không thể được dùng để xây dựng gói đánh mục lục được"
#: builtin/pack-objects.c:4104
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable và --unpack-unreachable xung khắc nhau"
-
-#: builtin/pack-objects.c:4110
msgid "cannot use --filter without --stdout"
msgstr "không thể dùng tùy chọn --filter mà không có --stdout"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4106
msgid "cannot use --filter with --stdin-packs"
msgstr "không thể dùng tùy chọn --filter với --stdin-packs"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4110
msgid "cannot use internal rev list with --stdin-packs"
msgstr "không thể dùng danh sách rev bên trong với --stdin-packs"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4169
msgid "Enumerating objects"
msgstr "Đánh số các đối tượng"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4210
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19134,9 +19852,9 @@
"and let us know you still use it by sending an e-mail\n"
"to <git@vger.kernel.org>. Thanks.\n"
msgstr ""
-"'git pack-redundant' được đề cử để loại bỏ.\n"
+"“git pack-redundant” được đề cử để loại bỏ.\n"
"Nếu bạn vẫn sử dụng lệnh này, vui lòng bổ sung\n"
-"thêm một tùy chọn, '--i-still-use-this', trên dòng lệnh\n"
+"thêm một tùy chọn, “--i-still-use-this”, trên dòng lệnh\n"
"và cho chúng tôi biết bạn vẫn sử dụng nó bằng cách gửi e-mail\n"
"đến <git@vger.kernel.org>. Cảm ơn.\n"
@@ -19152,77 +19870,67 @@
msgid "prune loose refs (default)"
msgstr "prune (cắt cụt) những tham chiếu bị mất (mặc định)"
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <thời-gian>] [--] [<head>…]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "báo cáo các đối tượng đã prune"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "các đối tượng hết hạn cũ hơn khoảng <thời gian>"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr "giới hạn giao đến các đối tượng nằm ngoài các tập tin gói hứa hẹn"
-#: builtin/prune.c:152
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "không thể tỉa bớt trong một kho đối_tượng_vĩ_đại"
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Giá trị không hợp lệ %s: %s"
-
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "điều khiển việc lấy về đệ quy của các mô-đun-con"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Các tùy chọn liên quan đến hòa trộn"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "cho phép chuyển-tiếp-nhanh"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "điều khiển cách dùng các móc (hook) pre-merge-commit và commit-msg"
+
+#: builtin/pull.c:171 parse-options.h:371
msgid "automatically stash/stash pop before and after"
msgstr "tự động stash/stash pop trước và sau"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Các tùy chọn liên quan đến lệnh lấy về"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "ép buộc ghi đè lên nhánh nội bộ"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "số lượng mô-đun-con được đẩy lên đồng thời"
-#: builtin/pull.c:317
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "Giá trị không hợp lệ cho pull.ff: %s"
-
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -19230,14 +19938,14 @@
"Ở đây không có ứng cử nào để cải tổ lại trong số các tham chiếu mà bạn vừa "
"lấy về."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Ở đây không có ứng cử nào để hòa trộn trong số các tham chiếu mà bạn vừa lấy "
"về."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19246,7 +19954,7 @@
"tự\n"
"đại diện mà nó lại không khớp trên điểm cuối máy phục vụ."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19258,42 +19966,43 @@
"theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n"
"một nhánh trên dòng lệnh."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:978
msgid "You are not currently on a branch."
msgstr "Hiện tại bạn chẳng ở nhánh nào cả."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Xem git-pull(1) để biết thêm chi tiết."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:984
msgid "<remote>"
msgstr "<máy chủ>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:374
msgid "<branch>"
msgstr "<nhánh>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:976
msgid "There is no tracking information for the current branch."
msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19302,22 +20011,22 @@
"Các đặc tả cấu hình của bạn để hòa trộn với tham chiếu “%s”\n"
"từ máy dịch vụ, nhưng không có nhánh nào như thế được lấy về."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "không thể truy cập lần chuyển giao “%s”"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "bỏ qua --verify-signatures khi rebase"
-#: builtin/pull.c:930
+#: builtin/pull.c:969
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
@@ -19327,38 +20036,36 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Kéo mà không chỉ định làm thế nào để hòa giải các nhánh phân kỳ là khác nhau "
-"là\n"
-"không khuyến khích. Bạn có thể dịu thông báo này bằng cách chạy một trong "
-"những lệnh sau đây\n"
-"các lệnh thỉnh thoảng trước khi thực hiện lệnh pull tiếp theo của bạn:\n"
+"Bạn có các nhánh phân kỳ và cần chỉ định cách hòa hợp chúng.\n"
+"Bạn có thể làm như vậy bằng cách chạy một trong những lệnh sau đây\n"
+"thỉnh thoảng trước khi thực hiện lệnh pull tiếp theo của bạn:\n"
"\n"
-" git config pull.rebase false # merge (chiến lược mặc định)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
-" git config pull.ff only # fast-forward only\n"
+" git config pull.ff only # chỉ fast-forward\n"
"\n"
"Bạn có thể thay thế \"git config\" với \"git config --global\" để thiết lập "
"mặc định\n"
"ưu tiên cho tất cả các kho. Bạn cũng có thể chuyển qua --rebase, --no-"
"rebase,\n"
-"hoặc --ff-only trên dòng lệnh để ghi đè mặc định được cấu hình cho mỗi\n"
+"hoặc --ff-only trên dòng lệnh để ghi đè các mặc định đã cấu hình cho mỗi\n"
"lần gọi.\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1047
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Đang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào "
"bảng mục lục."
-#: builtin/pull.c:994
+#: builtin/pull.c:1051
msgid "pull with rebase"
msgstr "pull với rebase"
-#: builtin/pull.c:995
+#: builtin/pull.c:1052
msgid "please commit or stash them."
msgstr "xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1077
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19369,7 +20076,7 @@
"đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n"
"lần chuyển giaot %s."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1083
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19387,15 +20094,23 @@
"$ git reset --hard\n"
"để khôi phục lại."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1098
msgid "Cannot merge multiple branches into empty head."
msgstr "Không thể hòa trộn nhiều nhánh vào trong một head trống rỗng."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1103
msgid "Cannot rebase onto multiple branches."
msgstr "Không thể thực hiện lệnh rebase (cải tổ) trên nhiều nhánh."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1105
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Không thể thực hiện chuyển tiếp nhanh trên nhiều nhánh."
+
+#: builtin/pull.c:1120
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Caanfchir định làm thế nào để giải quyết các nhánh phân kỳ."
+
+#: builtin/pull.c:1134
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"không thể cải tổ với các thay đổi mô-đun-con được ghi lại một cách cục bộ"
@@ -19579,15 +20294,15 @@
msgid "failed to push some refs to '%s'"
msgstr "gặp lỗi khi đẩy tới một số tham chiếu đến “%s”"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3377
msgid "repository"
msgstr "kho"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "đẩy tất cả các tham chiếu"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "mirror tất cả các tham chiếu"
@@ -19599,19 +20314,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "đẩy các thẻ (không dùng cùng với --all hay --mirror)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "ép buộc cập nhật"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<tên-tham-chiếu>:<cần>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "yêu cầu máy chủ cập nhật để thích hợp với máy cục bộ"
@@ -19619,12 +20334,12 @@
msgid "control recursive pushing of submodules"
msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "tạo gói nhẹ"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "chương trình nhận gói"
@@ -19644,18 +20359,14 @@
msgid "push missing but relevant tags"
msgstr "push phần bị thiếu nhưng các thẻ lại thích hợp"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "ký lần đẩy dùng GPG"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "yêu cầu giao dịch hạt nhân bên phía máy chủ"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete là xung khắc với các tùy chọn --all, --mirror và --tags"
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu nào"
@@ -19686,26 +20397,14 @@
"\n"
" git push <tên>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all và --tags xung khắc nhau"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all không thể được tổ hợp cùng với đặc tả đường dẫn"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror và --tags xung khắc nhau"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror không thể được tổ hợp cùng với đặc tả đường dẫn"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all và --mirror xung khắc nhau"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "các tùy chọn push phải không có ký tự dòng mới"
@@ -19759,88 +20458,87 @@
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<tiền-"
-"tố>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] "
-"[--index-output=<tập-tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-"
-"ish3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<tiền_tố>) [-u | -i]] [--no-sparse-checkout] [--index-"
+"output=<tập_tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "ghi mục lục kết quả vào <tập-tin>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "chỉ với bảng mục lục trống rỗng"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Hòa trộn"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "thực hiện một hòa trộn thêm vào việc đọc"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr ""
"hòa trộn kiểu “3-way” nếu không có tập tin mức hòa trộn nào được yêu cầu"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "hòa trộn 3-way trong sự hiện diện của “adds” và “removes”"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "giống với -m, nhưng bỏ qua các mục chưa được hòa trộn"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<thư-mục-con>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "đọc cây vào trong bảng mục lục dưới <thư_mục_con>/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "cập nhật cây làm việc với kết quả hòa trộn"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "cho phép các tập tin rõ ràng bị lờ đi được ghi đè"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "không kiểm tra cây làm việc sau hòa trộn"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "không cập nhật bảng mục lục hay cây làm việc"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "bỏ qua áp dụng bộ lọc lấy ra (checkout) thưa thớt"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "gỡ lỗi “unpack-trees”"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "không xuất các thông tin phản hồi"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:190
msgid "You need to resolve your current index first"
msgstr "Bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã"
-#: builtin/rebase.c:35
+#: builtin/rebase.c:36
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -19848,204 +20546,51 @@
"git rebase [-i] [các tùy chọn] [--exec <lệnh>] [--onto <newbase> | --keep-"
"base] [<upstream>] [<nhánh>]]"
-#: builtin/rebase.c:37
+#: builtin/rebase.c:38
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [các tùy chọn] [--exec <lệnh>] [--onto <newbase>] --root "
"[<nhánh>]"
-#: builtin/rebase.c:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "danh sách cần làm không dùng được: “%s”"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:231
#, c-format
msgid "could not create temporary %s"
msgstr "không thể tạo %s tạm thời"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:237
msgid "could not mark as interactive"
msgstr "không thể đánh dấu là tương tác"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:290
msgid "could not generate todo list"
msgstr "không thể tạo danh sách cần làm"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:332
msgid "a base commit must be provided with --upstream or --onto"
msgstr "lần chuyển giao cơ sỏ phải được chỉ định với --upstream hoặc --onto"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<các tùy chọn>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "bỏ qua các lần chuyển giao mà nó bắt đầu trống rỗng"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "chấp nhận chuyển giao mà không ghi chú gì"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "cải tổ các lần chuyển giao hòa trộn"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "giữ các điểm nhánh nguyên bản của các anh em họ"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "di chuyển các lần chuyển giao bắt đầu bằng squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "ký các lần chuyển giao"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "hiển thị một diffstat của những thay đổi thượng nguồn"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "tiếp tục cải tổ"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "bỏ qua lần chuyển giao"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "sửa danh sách cần làm"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "hiển thị miếng vá hiện hành"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "rút ngắn mã chuyển giao trong danh sách cần làm"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "khai triển mã chuyển giao trong danh sách cần làm"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "kiểm tra danh sách cần làm"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "sắp xếp lại các dòng fixup/squash"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "chèn các lệnh thực thi trong danh sách cần làm"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "lên trên"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "điểm-xét-duyệt-hạn-chế"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "điểm xét duyệt hạn chế"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-lên-trên"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash lên trên"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "lần chuyển giao thượng nguồn"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "tên-đầu"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "tên đầu"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "chiến lược cải tổ"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "tùy-chọn-chiến-lược"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "các tùy chọn chiến lược"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "chuyển-đến"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "nhánh hay lần chuyển giao lần lấy ra"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "tên lên trên"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "lệnh"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "lệnh muốn chạy"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "lập lịch lại một cách tự động bất kỳ “exec“ bị lỗi"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins không có tác dụng khi không có --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:391
#, c-format
msgid "%s requires the merge backend"
msgstr "%s cần một ứng dụng hòa trộn chạy phía sau"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:433
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "không thể đặt lấy “onto”: “%s”"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:450
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head không hợp lệ: “%s”"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:475
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "đang bỏ qua allow_rerere_autoupdate không hợp lệ: “%s”"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:600
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20060,7 +20605,7 @@
"Để bãi bỏ và quay trở lại trạng thái trước \"git rebase\", chạy \"git rebase "
"--abort\"."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:685
#, c-format
msgid ""
"\n"
@@ -20079,7 +20624,12 @@
"\n"
"Kết quả là git không thể cải tổ lại chúng."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:836
+#, c-format
+msgid "could not switch to %s"
+msgstr "không thể chuyển đến %s"
+
+#: builtin/rebase.c:952
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20088,7 +20638,7 @@
"kiểu rỗng không được nhận dạng “%s”; giá trị hợp lệ là \"drop\", \"keep\", "
"và \"ask\"."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:970
#, c-format
msgid ""
"%s\n"
@@ -20105,7 +20655,7 @@
" git rebase “<nhánh>”\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:986
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20119,188 +20669,185 @@
" git branch --set-upstream-to=%s/<nhánh> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:1016
msgid "exec commands cannot contain newlines"
msgstr "các lệnh thực thi không thể chứa các ký tự dòng mới"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:1020
msgid "empty exec command"
msgstr "lệnh thực thi trống rỗng"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1051
msgid "rebase onto given branch instead of upstream"
msgstr "cải tổ vào nhánh đã cho thay cho thượng nguồn"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1053
msgid "use the merge-base of upstream and branch as the current base"
msgstr ""
"sử dụng các cơ sở hòa trộn của thượng nguồn và nhánh như là cơ sở hiện tại"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1055
msgid "allow pre-rebase hook to run"
msgstr "cho phép móc (hook) pre-rebase được chạy"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1057
msgid "be quiet. implies --no-stat"
msgstr "hãy im lặng. ý là --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1060
+msgid "display a diffstat of what changed upstream"
+msgstr "hiển thị một diffstat của những thay đổi thượng nguồn"
+
+#: builtin/rebase.c:1063
msgid "do not show diffstat of what changed upstream"
msgstr "đừng hiển thị diffstat của những thay đổi thượng nguồn"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1066
msgid "add a Signed-off-by trailer to each commit"
msgstr "thêm dòng Signed-off-by vào cuối cho từng lần chuyển giao"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1069
msgid "make committer date match author date"
msgstr "làm ngày tháng chuyển giao khớp với ngày của tác giả"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1071
msgid "ignore author date and use current date"
msgstr "bỏ qua ngày tác giả và sử dụng ngày tháng hiện tại"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1073
msgid "synonym of --reset-author-date"
msgstr "đồng nghĩa với --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1075 builtin/rebase.c:1079
msgid "passed to 'git apply'"
msgstr "chuyển cho “git apply”"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1077
msgid "ignore changes in whitespace"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1081 builtin/rebase.c:1084
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
"cherry-pick tất cả các lần chuyển giao, ngay cả khi không có thay đổi gì"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1086
msgid "continue"
msgstr "tiếp tục"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1089
msgid "skip current patch and continue"
msgstr "bỏ qua miếng vá hiện hành và tiếp tục"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1091
msgid "abort and check out the original branch"
msgstr "bãi bỏ và lấy ra nhánh nguyên thủy"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1094
msgid "abort but keep HEAD where it is"
msgstr "bãi bỏ nhưng vẫn vẫn giữ HEAD chỉ đến nó"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1095
msgid "edit the todo list during an interactive rebase"
msgstr "sửa danh sách cần làm trong quá trình “rebase” (cải tổ) tương tác"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1098
msgid "show the patch file being applied or merged"
msgstr "hiển thị miếng vá đã được áp dụng hay hòa trộn"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1101
msgid "use apply strategies to rebase"
msgstr "dùng chiến lược áp dụng để cải tổ"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1105
msgid "use merging strategies to rebase"
msgstr "dùng chiến lược hòa trộn để cải tổ"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1109
msgid "let the user edit the list of commits to rebase"
msgstr "để người dùng sửa danh sách các lần chuyển giao muốn cải tổ"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1113
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(ĐÃ LẠC HẬU) hay thử tạo lại các hòa trộn thay vì bỏ qua chúng"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1118
msgid "how to handle commits that become empty"
msgstr "xử lý các lần chuyển giao mà nó trở thành trống rỗng như thế nào"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1121
+msgid "keep commits which start empty"
+msgstr "bỏ qua các lần chuyển giao mà nó bắt đầu trống rỗng"
+
+#: builtin/rebase.c:1125
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "di chuyển các lần chuyển giao mà bắt đầu bằng squash!/fixup! dưới -i"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1132
msgid "add exec lines after each commit of the editable list"
msgstr "thêm các dòng thực thi sau từng lần chuyển giao của danh sách sửa được"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1136
msgid "allow rebasing commits with empty messages"
msgstr "chấp nhận cải tổ các chuyển giao mà không ghi chú gì"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1140
msgid "try to rebase merges instead of skipping them"
msgstr "cố thử cải tổ các hòa trộn thay vì bỏ qua chúng"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1143
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "dùng “merge-base --fork-point” để định nghĩa lại thượng nguồn"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1145
msgid "use the given merge strategy"
msgstr "dùng chiến lược hòa trộn đã cho"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1147 builtin/revert.c:115
msgid "option"
msgstr "tùy chọn"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1148
msgid "pass the argument through to the merge strategy"
msgstr "chuyển thao số đến chiến lược hòa trộn"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1151
msgid "rebase all reachable commits up to the root(s)"
msgstr "cải tổ tất các các lần chuyển giao cho đến root"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1154
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "lập lịch lại một cách tự động bất kỳ “exec“ bị lỗi"
+
+#: builtin/rebase.c:1156
msgid "apply all changes, even those already present upstream"
msgstr ""
"áp dụng mọi thay đổi, ngay cả khi những thứ đó đã sẵn có ở thượng nguồn"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1177
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
"Hình như đang trong quá trình thực hiện lệnh “git am”. Không thể rebase."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges đã lạc hậu. Hãy dùng --rebase-merges để thay "
-"thế."
+#: builtin/rebase.c:1208
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges đã bị thay thế bằng --rebase-merges"
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "không thể kết hợp “--keep-base” với “--onto”"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "không thể kết hợp “--keep-base” với “--root”"
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "không thể kết hợp “--root” với “--fork-point”"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1230
msgid "No rebase in progress?"
msgstr "Không có tiến trình rebase nào phải không?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1234
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch "
"sử) tương tác."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Không thể đọc HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1269
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20308,16 +20855,16 @@
"Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n"
"đó đánh dấu chúng là cần xử lý sử dụng lệnh git add"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1287
msgid "could not discard worktree changes"
msgstr "không thể loại bỏ các thay đổi cây-làm-việc"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1308
#, c-format
msgid "could not move back to %s"
msgstr "không thể quay trở lại %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1354
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20338,141 +20885,128 @@
"và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n"
"có một số thứ quý giá ở đây.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1382
msgid "switch `C' expects a numerical value"
msgstr "tùy chọn “%c” cần một giá trị bằng số"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1424
#, c-format
msgid "Unknown mode: %s"
msgstr "Không hiểu chế độ: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1463
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy cần --merge hay --interactive"
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "không thể tổ hợp các tùy chọn áp dụng với các tùy chọn hòa trộn"
+#: builtin/rebase.c:1492
+msgid "apply options and merge options cannot be used together"
+msgstr ""
+"không thể tổ hợp các tùy chọn áp dụng với các tùy chọn hòa trộn với nhau"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1505
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Không hiểu ứng dụng chạy phía sau lệnh cải tổ: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1534
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec cần --exec hay --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "không thể kết hợp “--preserve-merges” với “--rebase-merges”"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr "không thể kết hợp “--preserve-merges” với “--reschedule-failed-exec”"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1565
#, c-format
msgid "invalid upstream '%s'"
msgstr "thượng nguồn không hợp lệ “%s”"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1571
msgid "Could not create new root commit"
msgstr "Không thể tạo lần chuyển giao gốc mới"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1597
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "“%s”: cần chính xác một cơ sở hòa trộn với nhánh"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1600
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "“%s”: cần chính xác một cơ sở hòa trộn"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1609
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Không chỉ đến một lần chuyển giao không hợp lệ “%s”"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1636
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "nghiêm trọng: không có nhánh/lần chuyển giao “%s” như thế"
+msgid "no such branch/commit '%s'"
+msgstr "không có nhánh/lần chuyển giao “%s” như thế"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
+#: builtin/submodule--helper.c:2477
#, c-format
msgid "No such ref: %s"
msgstr "Không có tham chiếu nào như thế: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1658
msgid "Could not resolve HEAD to a revision"
msgstr "Không thể phân giải lần chuyển giao HEAD đến một điểm xét duyệt"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1679
msgid "Please commit or stash them."
msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: builtin/rebase.c:1997
-#, c-format
-msgid "could not switch to %s"
-msgstr "không thể chuyển đến %s"
-
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1714
msgid "HEAD is up to date."
msgstr "HEAD đã cập nhật."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1716
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Nhánh hiện tại %s đã được cập nhật rồi.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1724
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD hiện đã được cập nhật rồi, bị ép buộc rebase."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1726
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Nhánh hiện tại %s đã được cập nhật rồi, lệnh rebase ép buộc.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1734
msgid "The pre-rebase hook refused to rebase."
msgstr "Móc (hook) pre-rebase từ chối rebase."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1741
#, c-format
msgid "Changes to %s:\n"
msgstr "Thay đổi thành %s:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1744
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Thay đổi từ %s thành %s:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1769
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1781
msgid "Could not detach HEAD"
msgstr "Không thể tách rời HEAD"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1790
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Chuyển-tiếp-nhanh %s đến %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <thư-mục-git>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1263
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"
@@ -20502,7 +21036,7 @@
"Để chấm dứt lời nhắn này và vẫn giữ cách ứng xử mặc định, hãy đặt\n"
"biến cấu hình “receive.denyCurrentBranch” thành “refuse”."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1283
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"
@@ -20523,79 +21057,112 @@
"\n"
"Để chấm dứt lời nhắn này, bạn hãy đặt nó thành “refuse”."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2476
msgid "quiet"
msgstr "im lặng"
-#: builtin/receive-pack.c:2492
-msgid "You must specify a directory."
-msgstr "Bạn phải chỉ định thư mục."
+#: builtin/receive-pack.c:2491
+msgid "you must specify a directory"
+msgstr "bạn phải chỉ định thư mục"
+
+#: builtin/reflog.c:9
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [<các tùy chọn>] [<tham chiếu>]"
+
+#: builtin/reflog.c:12
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
+msgstr ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
msgstr ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<các tham chiếu>…"
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
-#: builtin/reflog.c:22
-msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
-msgstr ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<các tham chiếu>…"
-
-#: builtin/reflog.c:25
+#: builtin/reflog.c:21
msgid "git reflog exists <ref>"
msgstr "git reflog exists <tham_chiếu>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:197 builtin/reflog.c:211
#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "“%s” không phải là dấu thời gian hợp lệ"
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "dấu vết thời gian không hợp lệ '%s' đưa cho '--%s'"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:240 builtin/reflog.c:359
+msgid "do not actually prune any entries"
+msgstr "thực tế không cắt ngắn bất kỳ mục tin nào"
+
+#: builtin/reflog.c:243 builtin/reflog.c:362
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr "ghi lại SHA1 cũ bằng một SHA1 mới của mục tin mà giờ đứng trước nó"
+
+#: builtin/reflog.c:246 builtin/reflog.c:365
+msgid "update the reference to the value of the top reflog entry"
+msgstr "cập nhật tham chiếu đến giá trị của mục tin reflog trên cùng"
+
+#: builtin/reflog.c:248 builtin/reflog.c:367
+msgid "print extra information on screen"
+msgstr "xuất thông tin thêm trên màn hình"
+
+#: builtin/reflog.c:249 builtin/reflog.c:253
+msgid "timestamp"
+msgstr "dấu vết thời gian"
+
+#: builtin/reflog.c:250
+msgid "prune entries older than the specified time"
+msgstr "cắt cụt các mục tin cũ hơn khoảng thời gian đã cho"
+
+#: builtin/reflog.c:254
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+"cắt cụt các mục tin cũ hơn <thời gian> cái mà không thể tiếp cận được từ "
+"đỉnh hiện tại của nhánh"
+
+#: builtin/reflog.c:258
+msgid "prune any reflog entries that point to broken commits"
+msgstr "cắt ngắn bất kỳ mục tin reflog cái mà chỉ đến lần chuyển giao hỏng"
+
+#: builtin/reflog.c:259
+msgid "process the reflogs of all references"
+msgstr "xử lý các reflogs cho mọi tham chiếu"
+
+#: builtin/reflog.c:261
+msgid "limits processing to reflogs from the current worktree only"
+msgstr "giới hạn xử lý với reflogs chỉ từ thư mục làm việc hiện tại"
+
+#: builtin/reflog.c:294
#, c-format
msgid "Marking reachable objects..."
msgstr "Đánh dấu các đối tượng tiếp cận được…"
-#: builtin/reflog.c:647
+#: builtin/reflog.c:338
#, c-format
msgid "%s points nowhere!"
msgstr "%s chẳng chỉ đến đâu cả!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:374
msgid "no reflog specified to delete"
msgstr "chưa chỉ ra reflog để xóa"
-#: builtin/reflog.c:708
-#, c-format
-msgid "not a reflog: %s"
-msgstr "không phải một reflog: %s"
-
-#: builtin/reflog.c:713
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "không reflog cho “%s”"
-
-#: builtin/reflog.c:759
+#: builtin/reflog.c:396
#, c-format
msgid "invalid ref format: %s"
msgstr "định dạng tham chiếu không hợp lệ: %s"
-#: builtin/reflog.c:768
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr "git reflog [ show | expire | delete | exists ]"
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
@@ -20603,82 +21170,87 @@
"git remote add [-t <nhánh>] [-m <master>] [-f] [--tags|--no-tags] [--"
"mirror=<fetch|push>] <tên> <url>"
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <tên-cũ> <tên-mới>"
+#: builtin/remote.c:20 builtin/remote.c:40
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <tên-cũ> <tên-mới>"
-#: builtin/remote.c:20 builtin/remote.c:44
+#: builtin/remote.c:21 builtin/remote.c:45
msgid "git remote remove <name>"
msgstr "git remote remove <tên>"
-#: builtin/remote.c:21 builtin/remote.c:49
+#: builtin/remote.c:22 builtin/remote.c:50
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <tên>"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <tên>"
-#: builtin/remote.c:24
+#: builtin/remote.c:25
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<nhóm> | <máy-chủ>)…]"
-#: builtin/remote.c:25
+#: builtin/remote.c:26
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <tên> <nhánh>…"
-#: builtin/remote.c:26 builtin/remote.c:75
+#: builtin/remote.c:27 builtin/remote.c:76
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote set-url [--push] [--all] <tên>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <tên> <url-mới> [<url-cũ>]"
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <tên> <url-mới>"
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c:30 builtin/remote.c:83
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <tên> <url>"
-#: builtin/remote.c:34
+#: builtin/remote.c:35
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<các tùy chọn>] <tên> <url>"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <tên> <nhánh>…"
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <tên> <nhánh>…"
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<các tùy chọn>] <tên>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<các tùy chọn>] <tên>"
-#: builtin/remote.c:70
+#: builtin/remote.c:71
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<các tùy chọn>] [<nhóm> | <máy-chủ>]…"
-#: builtin/remote.c:99
+#: builtin/remote.c:100
#, c-format
msgid "Updating %s"
msgstr "Đang cập nhật %s"
-#: builtin/remote.c:131
+#: builtin/remote.c:102
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Không thể lấy“%s” về"
+
+#: builtin/remote.c:132
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -20686,72 +21258,77 @@
"--mirror nguy hiểm và không dùng nữa; xin hãy\n"
"\t sử dụng tùy chọn --mirror=fetch hoặc --mirror=push để thay thế"
-#: builtin/remote.c:148
+#: builtin/remote.c:149
#, c-format
msgid "unknown mirror argument: %s"
msgstr "không hiểu tham số máy bản sao (mirror): %s"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "fetch the remote branches"
msgstr "lấy về các nhánh từ máy chủ"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "import all tags and associated objects when fetching"
msgstr "nhập vào tất cả các đối tượng thẻ và thành phần liên quan khi lấy về"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "hoặc không lấy về bất kỳ thẻ nào (--no-tags)"
-#: builtin/remote.c:171
+#: builtin/remote.c:172
msgid "branch(es) to track"
msgstr "các nhánh để theo dõi"
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "master branch"
msgstr "nhánh master"
-#: builtin/remote.c:174
+#: builtin/remote.c:175
msgid "set up remote as a mirror to push to or fetch from"
msgstr "đặt máy chủ (remote) như là một máy bản sao để push hay fetch từ đó"
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying a master branch makes no sense with --mirror"
msgstr "đang chỉ định một nhánh master không hợp lý với tùy chọn --mirror"
-#: builtin/remote.c:188
+#: builtin/remote.c:189
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "chỉ định những nhánh để theo dõi chỉ hợp lý với các “fetch mirror”"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:196 builtin/remote.c:716
#, c-format
msgid "remote %s already exists."
msgstr "máy chủ %s đã tồn tại rồi."
-#: builtin/remote.c:240
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "Không thể cài đặt nhánh master “%s”"
-#: builtin/remote.c:355
+#: builtin/remote.c:323
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "nhánh chưa được quản lý.%s.rebase=%s; giả định là “true”"
+
+#: builtin/remote.c:367
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Không thể lấy ánh xạ (map) fetch cho đặc tả tham chiếu %s"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:461 builtin/remote.c:469
msgid "(matching)"
msgstr "(khớp)"
-#: builtin/remote.c:466
+#: builtin/remote.c:473
msgid "(delete)"
msgstr "(xóa)"
-#: builtin/remote.c:655
+#: builtin/remote.c:664
#, c-format
msgid "could not set '%s'"
msgstr "không thể đặt “%s”"
-#: builtin/remote.c:660
+#: builtin/remote.c:669
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20762,17 +21339,17 @@
"\t%s:%d\n"
"bây giờ tên trên máy chủ không tồn tại “%s”"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
#, c-format
msgid "No such remote: '%s'"
msgstr "Không có máy chủ nào như vậy: “%s”"
-#: builtin/remote.c:710
+#: builtin/remote.c:726
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Không thể đổi tên phần của cấu hình từ “%s” thành “%s”"
-#: builtin/remote.c:730
+#: builtin/remote.c:746
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20783,17 +21360,21 @@
"\t%s\n"
"\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết."
-#: builtin/remote.c:770
+#: builtin/remote.c:783
+msgid "Renaming remote references"
+msgstr "Đổi tên các tham chiếu máy chủ"
+
+#: builtin/remote.c:794
#, c-format
msgid "deleting '%s' failed"
msgstr "gặp lỗi khi xóa “%s”"
-#: builtin/remote.c:804
+#: builtin/remote.c:832
#, c-format
msgid "creating '%s' failed"
msgstr "gặp lỗi khi tạo “%s”"
-#: builtin/remote.c:882
+#: builtin/remote.c:912
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20805,119 +21386,119 @@
"đi;\n"
"để xóa đi, sử dụng:"
-#: builtin/remote.c:896
+#: builtin/remote.c:926
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Không thể gỡ bỏ phần cấu hình “%s”"
-#: builtin/remote.c:999
+#: builtin/remote.c:1034
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " mới (lần lấy về tiếp theo sẽ lưu trong remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1037
msgid " tracked"
msgstr " được theo dõi"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1039
msgid " stale (use 'git remote prune' to remove)"
msgstr " cũ rích (dùng “git remote prune” để gỡ bỏ)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1041
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1082
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge không hợp lệ; không thể cải tổ về phía > 1 nhánh"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1091
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "thực hiện rebase một cách tương tác trên máy chủ %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1093
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
"thực hiện cải tổ (với các hòa trộn) một cách tương tác lên trên máy chủ %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1096
#, c-format
msgid "rebases onto remote %s"
msgstr "thực hiện rebase trên máy chủ %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1100
#, c-format
msgid " merges with remote %s"
msgstr " hòa trộn với máy chủ %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1103
#, c-format
msgid "merges with remote %s"
msgstr "hòa trộn với máy chủ %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1106
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s và với máy chủ %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1149
msgid "create"
msgstr "tạo"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1152
msgid "delete"
msgstr "xóa"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1156
msgid "up to date"
msgstr "đã cập nhật"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1159
msgid "fast-forwardable"
msgstr "có-thể-chuyển-tiếp-nhanh"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1162
msgid "local out of date"
msgstr "dữ liệu nội bộ đã cũ"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1169
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s ép buộc thành %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1172
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s đẩy lên thành %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1176
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s ép buộc thành %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1179
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s đẩy lên thành %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1247
msgid "do not query remotes"
msgstr "không truy vấn các máy chủ"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1268
#, c-format
msgid "* remote %s"
msgstr "* máy chủ %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1269
#, c-format
msgid " Fetch URL: %s"
msgstr " URL để lấy về: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
msgid "(no URL)"
msgstr "(không có URL)"
@@ -20925,181 +21506,185 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1284 builtin/remote.c:1286
#, c-format
msgid " Push URL: %s"
msgstr " URL để đẩy lên: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
#, c-format
msgid " HEAD branch: %s"
msgstr " Nhánh HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1288
msgid "(not queried)"
msgstr "(không yêu cầu)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1290
msgid "(unknown)"
msgstr "(không hiểu)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1294
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1306
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Những nhánh trên máy chủ:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1309 builtin/remote.c:1335
msgid " (status not queried)"
msgstr " (trạng thái không được yêu cầu)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1318
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Những nhánh nội bộ đã được cấu hình cho lệnh “git pull”:"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1326
msgid " Local refs will be mirrored by 'git push'"
msgstr " refs nội bộ sẽ được phản chiếu bởi lệnh “git push”"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1332
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Những tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1353
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1355
msgid "delete refs/remotes/<name>/HEAD"
msgstr "xóa refs/remotes/<tên>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1369
msgid "Cannot determine remote HEAD"
msgstr "Không thể xác định được HEAD máy chủ"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1371
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Nhiều nhánh HEAD máy chủ. Hãy chọn rõ ràng một:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1381
#, c-format
msgid "Could not delete %s"
msgstr "Không thể xóa bỏ %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1389
#, c-format
msgid "Not a valid ref: %s"
msgstr "Không phải là tham chiếu hợp lệ: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1391
#, c-format
msgid "Could not setup %s"
msgstr "Không thể cài đặt %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1409
#, c-format
msgid " %s will become dangling!"
msgstr " %s sẽ trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1410
#, c-format
msgid " %s has become dangling!"
msgstr " %s đã trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1419
#, c-format
msgid "Pruning %s"
msgstr "Đang xén bớt %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1420
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1436
#, c-format
msgid " * [would prune] %s"
msgstr " * [nên xén bớt] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1439
#, c-format
msgid " * [pruned] %s"
msgstr " * [đã bị xén] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1484
msgid "prune remotes after fetching"
msgstr "cắt máy chủ sau khi lấy về"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
#, c-format
msgid "No such remote '%s'"
msgstr "Không có máy chủ nào có tên “%s”"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1566
msgid "add branch"
msgstr "thêm nhánh"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1573
msgid "no remote specified"
msgstr "chưa chỉ ra máy chủ nào"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1590
msgid "query push URLs rather than fetch URLs"
msgstr "truy vấn đẩy URL thay vì lấy"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1592
msgid "return all URLs"
msgstr "trả về mọi URL"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1622
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "không có URL nào được cấu hình cho nhánh “%s”"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1648
msgid "manipulate push URLs"
msgstr "đẩy các “URL” bằng tay"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1650
msgid "add URL"
msgstr "thêm URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1652
msgid "delete URLs"
msgstr "xóa URLs"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1659
msgid "--add --delete doesn't make sense"
msgstr "--add --delete không hợp lý"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1700
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1708
#, c-format
msgid "No such URL found: %s"
msgstr "Không tìm thấy URL như vậy: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1710
msgid "Will not delete all non-push URLs"
msgstr "Sẽ không xóa những địa chỉ URL không-push"
-#: builtin/repack.c:26
+#: builtin/remote.c:1727
+msgid "be verbose; must be placed before a subcommand"
+msgstr "chi tiết; phải được đặt trước một lệnh-con"
+
+#: builtin/repack.c:29
msgid "git repack [<options>]"
msgstr "git repack [<các tùy chọn>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:34
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21107,143 +21692,148 @@
"Gia tăng repack là không tương thích với chỉ mục bitmap. Dùng\n"
"--no-write-bitmap-index hay tắt cấu hình pack.writebitmaps."
-#: builtin/repack.c:198
+#: builtin/repack.c:206
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"không thể lấy thông tin thống kê pack-objects để mà đóng gói lại các đối "
"tượng hứa hẹn"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:280 builtin/repack.c:824
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Đang chỉ cần các dòng ID đối tượng dạng thập lục phân đầy dủ từ pack-"
"objects."
-#: builtin/repack.c:294
+#: builtin/repack.c:304
msgid "could not finish pack-objects to repack promisor objects"
msgstr "không thể hoàn tất pack-objects để đóng gói các đối tượng hứa hẹn"
-#: builtin/repack.c:309
+#: builtin/repack.c:319
#, c-format
msgid "cannot open index for %s"
msgstr "không thể mở mục lục cho “%s”"
-#: builtin/repack.c:368
+#: builtin/repack.c:378
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "gói %s là quá lớn để được xem là trong tiến trình hình học"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
#, c-format
msgid "pack %s too large to roll up"
msgstr "gói %s là quá lớn để được cuộn lại"
-#: builtin/repack.c:460
+#: builtin/repack.c:503
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "không thể mở tập tin tạm %s để ghi"
+
+#: builtin/repack.c:521
+msgid "could not close refs snapshot tempfile"
+msgstr "không thể đóng tập tin tạm thời chụp nhanh các tham chiếu"
+
+#: builtin/repack.c:634
msgid "pack everything in a single pack"
msgstr "đóng gói mọi thứ trong một gói đơn"
-#: builtin/repack.c:462
+#: builtin/repack.c:636
msgid "same as -a, and turn unreachable objects loose"
msgstr "giống với -a, và chỉnh sửa các đối tượng không đọc được thiếu sót"
-#: builtin/repack.c:465
+#: builtin/repack.c:639
msgid "remove redundant packs, and run git-prune-packed"
msgstr "xóa bỏ các gói dư thừa, và chạy git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:641
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "chuyển --no-reuse-delta cho git-pack-objects"
-#: builtin/repack.c:469
+#: builtin/repack.c:643
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "chuyển --no-reuse-object cho git-pack-objects"
-#: builtin/repack.c:471
+#: builtin/repack.c:645
msgid "do not run git-update-server-info"
msgstr "không chạy git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:648
msgid "pass --local to git-pack-objects"
msgstr "chuyển --local cho git-pack-objects"
-#: builtin/repack.c:476
+#: builtin/repack.c:650
msgid "write bitmap index"
msgstr "ghi mục lục ánh xạ"
-#: builtin/repack.c:478
+#: builtin/repack.c:652
msgid "pass --delta-islands to git-pack-objects"
msgstr "chuyển --delta-islands cho git-pack-objects"
-#: builtin/repack.c:479
+#: builtin/repack.c:653
msgid "approxidate"
msgstr "ngày ước tính"
-#: builtin/repack.c:480
+#: builtin/repack.c:654
msgid "with -A, do not loosen objects older than this"
msgstr "với -A, các đối tượng cũ hơn khoảng thời gian này thì không bị mất"
-#: builtin/repack.c:482
+#: builtin/repack.c:656
msgid "with -a, repack unreachable objects"
msgstr "với -a, đóng gói lại các đối tượng không thể đọc được"
-#: builtin/repack.c:484
+#: builtin/repack.c:658
msgid "size of the window used for delta compression"
msgstr "kích thước cửa sổ được dùng cho nén “delta”"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:659 builtin/repack.c:665
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:486
+#: builtin/repack.c:660
msgid "same as the above, but limit memory size instead of entries count"
msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng"
-#: builtin/repack.c:488
+#: builtin/repack.c:662
msgid "limits the maximum delta depth"
msgstr "giới hạn độ sâu tối đa của “delta”"
-#: builtin/repack.c:490
+#: builtin/repack.c:664
msgid "limits the maximum number of threads"
msgstr "giới hạn số lượng tối đa tuyến trình"
-#: builtin/repack.c:492
+#: builtin/repack.c:666
msgid "maximum size of each packfile"
msgstr "kích thước tối đa cho từng tập tin gói"
-#: builtin/repack.c:494
+#: builtin/repack.c:668
msgid "repack objects in packs marked with .keep"
msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep"
-#: builtin/repack.c:496
+#: builtin/repack.c:670
msgid "do not repack this pack"
msgstr "đừng đóng gói lại gói này"
-#: builtin/repack.c:498
+#: builtin/repack.c:672
msgid "find a geometric progression with factor <N>"
msgstr "tìm một tiến trình hình học với hệ số <N>"
-#: builtin/repack.c:508
+#: builtin/repack.c:674
+msgid "write a multi-pack index of the resulting packs"
+msgstr "ghi mục lục “multi-pack” của các gói kết quả"
+
+#: builtin/repack.c:684
msgid "cannot delete packs in a precious-objects repo"
msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại"
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable và -A xung khắc nhau"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric là xung khắc với tùy chọn -A, -a"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:833
msgid "Nothing new to pack."
msgstr "Không có gì mới để mà đóng gói."
-#: builtin/repack.c:669
+#: builtin/repack.c:863
#, c-format
msgid "missing required file: %s"
msgstr "thiếu tập tin cần thiết: %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:865
#, c-format
msgid "could not unlink: %s"
msgstr "không thể bỏ liên kết: %s"
@@ -21260,10 +21850,6 @@
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <lần_chuyển_giao> [<cha_mẹ>…]"
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --convert-graft-file"
-
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <đối tượng>…"
@@ -21326,67 +21912,61 @@
msgid "unable to open %s for reading"
msgstr "không thể mở “%s” để đọc"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "không thể sinh tiến trình con mktree"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "không thể đọc từ mktree"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "mktree đã báo cáo gặp lỗi nghiêm trọng"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree đã không trả về một tên đối tượng"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "không thể fstat %s"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "không thể ghi đối tượng vào cơ sở dữ liệu"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "không phải là tên đối tượng hợp lệ: “%s”"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "không thể lấy kiểu đối tượng cho %s"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "việc sửa tập tin đối tượng gặp lỗi"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "đối tượng mới là giống với cái cũ: “%s”"
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "không thể phân tích %s như là một lần chuyển giao"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "thẻ hòa trộn sai trong lần chuyển giao “%s”"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "thẻ hòa trộn không đúng dạng ở lần chuyển giao “%s”"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21395,31 +21975,31 @@
"lần chuyển giao gốc “%s” có chứa thẻ hòa trộn “%s” cái mà bị loại bỏ; dùng "
"tùy chọn --edit thay cho --graft"
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "lần chuyển giao gốc “%s” có chữ ký GPG"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "chữ ký sẽ được bỏ đi trong lần chuyển giao thay thế!"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "không thể ghi lần chuyển giao thay thế cho: “%s”"
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "graft cho “%s” không cần thiết"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "lần chuyển giao mới là giống với cái cũ: “%s”"
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -21428,71 +22008,71 @@
"không thể chuyển đổi các graft sau đây:\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "liệt kê các refs thay thế"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "xóa tham chiếu thay thế"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "sửa đối tượng sẵn có"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "thay đổi cha mẹ của lần chuyển giao"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "chuyển đổi các tập tin graft sẵn có"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "thay thế tham chiếu nếu nó đã sẵn có"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "đừng in đẹp các nội dung cho --edit"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "dùng định dạng này"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "--format không thể được dùng khi không liệt kê gì"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "-f chỉ hợp lý khi ghi một cái thay thế"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw chỉ hợp lý với --edit"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d cần ít nhất một tham số"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "số lượng đối số không đúng"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e cần chính các là một đối số"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-q cần ít nhất một tham số"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file không nhận đối số"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "chỉ một mẫu được chỉ ra với tùy chọn -l"
@@ -21514,171 +22094,155 @@
msgid "unable to generate diff for '%s'"
msgstr "không thể tạo khác biệt cho “%s”"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<tree-ish>] [--] <đặc/tả/đường/dẫn>…"
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<tree-ish>] [--] [<đặc/tả/đường/dẫn>…]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "pha trộn"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "mềm"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "cứng"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "hòa trộn"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "giữ lại"
-#: builtin/reset.c:83
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "Bạn không có HEAD nào hợp lệ."
-#: builtin/reset.c:85
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "Gặp lỗi khi tìm cây của HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "Gặp lỗi khi tìm cây của %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD hiện giờ tại %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:304
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Không thể thực hiện một %s reset ở giữa của quá trình hòa trộn."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
+#: builtin/stash.c:693
msgid "be quiet, only report errors"
msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi"
-#: builtin/reset.c:297
+#: builtin/reset.c:404
+msgid "skip refreshing the index after reset"
+msgstr "bỏ qua làm tươi mục lục sau khi đặt lại"
+
+#: builtin/reset.c:406
msgid "reset HEAD and index"
msgstr "đặt lại (reset) HEAD và bảng mục lục"
-#: builtin/reset.c:298
+#: builtin/reset.c:407
msgid "reset only HEAD"
msgstr "chỉ đặt lại (reset) HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:409 builtin/reset.c:411
msgid "reset HEAD, index and working tree"
msgstr "đặt lại HEAD, bảng mục lục và cây làm việc"
-#: builtin/reset.c:304
+#: builtin/reset.c:413
msgid "reset HEAD but keep local changes"
msgstr "đặt lại HEAD nhưng giữ lại các thay đổi nội bộ"
-#: builtin/reset.c:310
+#: builtin/reset.c:419
msgid "record only the fact that removed paths will be added later"
msgstr "chỉ ghi lại những đường dẫn thực sự sẽ được thêm vào sau này"
-#: builtin/reset.c:344
+#: builtin/reset.c:452
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Gặp lỗi khi phân giải “%s” như là điểm xét duyệt hợp lệ."
-#: builtin/reset.c:352
+#: builtin/reset.c:460
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Gặp lỗi khi phân giải “%s” như là một cây (tree) hợp lệ."
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch xung khắc với --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:479
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed với các đường dẫn không còn dùng nữa; hãy thay thế bằng lệnh “git "
"reset -- </các/đường/dẫn>”."
-#: builtin/reset.c:373
+#: builtin/reset.c:481
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Không thể thực hiện lệnh %s reset với các đường dẫn."
-#: builtin/reset.c:388
+#: builtin/reset.c:496
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s reset không được phép trên kho thuần"
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "-N chỉ được dùng khi có --mixed"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:527
msgid "Unstaged changes after reset:"
msgstr "Những thay đổi được đưa ra khỏi bệ phóng sau khi reset:"
-#: builtin/reset.c:416
+#: builtin/reset.c:530
#, c-format
msgid ""
-"\n"
-"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
-"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
-"to make this the default.\n"
+"It took %.2f seconds to refresh the index after reset. You can use\n"
+"'--no-refresh' to avoid this."
msgstr ""
-"\n"
-"Cần %.2f giây để kiểm đếm các thay đổi chưa đưa lên bệ phóng sau khi đặt "
-"lại.\n"
-"Bạn có thể sử dụng '--quiet' để tránh việc này. Đặt reset.quiet thành true "
-"trong\n"
-"cài đặt config nếu bạn muốn thực hiện nó như là mặc định.\n"
+"Việc này cần %.2f giây để làm tươi mới mục lục sau khi đặt lại. Bạn có thể "
+"sử dụng\n"
+"“--no-refresh” tránh điều này."
-#: builtin/reset.c:434
+#: builtin/reset.c:547
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét duyệt “%s”."
-#: builtin/reset.c:439
+#: builtin/reset.c:552
msgid "Could not write new index file."
msgstr "Không thể ghi tập tin lưu bảng mục lục mới."
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "không thể tổ hợp --exclude-promisor-objects và --missing"
-
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr "lọc đối tượng yêu cầu --objects"
-
-#: builtin/rev-list.c:674
+#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
msgstr "rev-list không hỗ trợ hiển thị các ghi chú"
-#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "được đánh dấu đếm là xung khắc với --objects"
+#: builtin/rev-list.c:664
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "đánh dấu để đếm và '%s' không thể dùng cùng nhau"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -21702,7 +22266,7 @@
#: builtin/rev-parse.c:442
msgid "no usage string given before the `--' separator"
-msgstr "không có chuỗi cách dùng nào được đưa ra trước dấu phân cách '--'"
+msgstr "không có chuỗi cách dùng nào được đưa ra trước dấu phân cách “--”"
#: builtin/rev-parse.c:548
msgid "Needed a single revision"
@@ -21840,15 +22404,19 @@
msgid "preserve initially empty commits"
msgstr "cấm khởi tạo lần chuyển giao trống rỗng"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "chấp nhận chuyển giao mà không ghi chú gì"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "hoàn nguyên gặp lỗi"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "cherry-pick gặp lỗi"
@@ -21893,70 +22461,70 @@
msgid_plural "the following files have local modifications:"
msgstr[0] "những tập tin sau đây có những thay đổi nội bộ:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "không liệt kê các tập tin đã gỡ bỏ"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "chỉ gỡ bỏ từ mục lục"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "ghi đè lên kiểm tra cập nhật"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "cho phép gỡ bỏ đệ qui"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "Không đưa ra đặc tả đường dẫn. Tôi nên loại bỏ các tập tin nào?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"hãy đưa các thay đổi của bạn vào .gitmodules hay tạm cất chúng đi để xử lý"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "không thể gỡ bỏ “%s” một cách đệ qui mà không có tùy chọn -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: không thể gỡ bỏ %s"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<máy>:]<thư/mục> [<các-tham-"
-"chiếu>…]\n"
-" --all và đặc tả <ref> rõ ràng là loại trừ lẫn nhau."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<thư mục> (--all | <tham chiếu>…)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "tên máy dịch vụ"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "dùng giao thức RPC không ổn định"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "đọc tham chiếu từ đầu vào tiêu chuẩn"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "in các trạng thái từ phần hướng dẫn trên máy dịch vụ"
@@ -22014,27 +22582,27 @@
msgid "group by field"
msgstr "nhóm theo trường"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:395
msgid "too many arguments given outside repository"
msgstr "quá nhiều tham số đưa ra ngoài kho chứa"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<khi>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]"
-#: builtin/show-branch.c:17
+#: builtin/show-branch.c:18
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<nền>]] [--list] [<ref>]"
-#: builtin/show-branch.c:395
+#: builtin/show-branch.c:396
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
@@ -22109,13 +22677,6 @@
msgid "show <n> most recent ref-log entries starting at base"
msgstr "hiển thị <n> các mục “ref-log” gần nhất kể từ nền (base)"
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog là không tương thích với các tùy chọn --all, --remotes, --"
-"independent hay --merge-base"
-
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "chưa đưa ra nhánh, và HEAD không hợp lệ"
@@ -22207,84 +22768,153 @@
"hiển thị các tham chiếu từ đầu vào tiêu chuẩn (stdin) cái mà không ở kho nội "
"bộ"
-#: builtin/sparse-checkout.c:22
+#: builtin/sparse-checkout.c:23
msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <các-tùy-chọn>"
-#: builtin/sparse-checkout.c:46
-msgid "git sparse-checkout list"
-msgstr "git sparse-checkout list"
+#: builtin/sparse-checkout.c:61
+msgid "this worktree is not sparse"
+msgstr "cây làm việc này không phải là sparse"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:76
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"không thể phân tích cú pháp cây làm việc này (tập tin sparse-checkout có lẽ "
"không tồn tại)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:177
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"thư mục “%s” có chứa các tập tin chưa được theo dõi, nhưng lại không trong "
+"“sparse-checkout cone”"
+
+#: builtin/sparse-checkout.c:185
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "gặp lỗi khi gỡ bỏ thư mục \"%s\""
+
+#: builtin/sparse-checkout.c:327
msgid "failed to create directory for sparse-checkout file"
msgstr "gặp lỗi khi tạo thư mục cho tập tin sparse-checkout"
-#: builtin/sparse-checkout.c:268
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr "không thể nâng cấp định dạng kho lưu trữ để kích hoạt worktreeConfig"
+#: builtin/sparse-checkout.c:366
+msgid "failed to initialize worktree config"
+msgstr "gặp lỗi khi khởi tạo cấu hình cây làm việc"
-#: builtin/sparse-checkout.c:270
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "gặp lỗi khi đặt cài đặt extensions.worktreeConfig"
-
-#: builtin/sparse-checkout.c:290
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-
-#: builtin/sparse-checkout.c:310
-msgid "initialize the sparse-checkout in cone mode"
-msgstr "khởi tạo sparse-checkout trong chế độ nón"
-
-#: builtin/sparse-checkout.c:312
-msgid "toggle the use of a sparse index"
-msgstr "bật tắt việc sử dụng một \"sparse index\""
-
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:411
msgid "failed to modify sparse-index config"
msgstr "gặp lỗi khi sửa cấu hình \"sparse-index\""
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
+#: builtin/sparse-checkout.c:847
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "khởi tạo sparse-checkout trong chế độ nón"
+
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
+#: builtin/sparse-checkout.c:849
+msgid "toggle the use of a sparse index"
+msgstr "bật tắt việc sử dụng một \"sparse index\""
+
+#: builtin/sparse-checkout.c:479
#, c-format
msgid "failed to open '%s'"
msgstr "gặp lỗi khi mở “%s”"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:531
#, c-format
msgid "could not normalize path %s"
msgstr "không thể thường hóa đường dẫn “%s”"
-#: builtin/sparse-checkout.c:425
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <các mẫu>)"
-
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:560
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "không thể bỏ trích dẫn chuỗi kiểu C “%s”"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
msgid "unable to load existing sparse-checkout patterns"
msgstr "không thể tải các mẫu sparse-checkout"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:619
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "đặt các mẫu sparse-checkout sẵn có không sử dụng chế độ cone"
+
+#: builtin/sparse-checkout.c:707
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr "vui lòng chạy từ thư mục mức cao nhất trong chế độ non-cone"
+
+#: builtin/sparse-checkout.c:712
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr "chỉ định các thư mục thay mẫu (không có dấu gạch chéo đứng đầu)"
+
+#: builtin/sparse-checkout.c:714
+msgid ""
+"specify directories rather than patterns. If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+"chỉ định các thư mục thay mẫu. Nếu thư mục của bạn bắt đầu với một '!', "
+"chuyển qua --skip-checks"
+
+#: builtin/sparse-checkout.c:716
+msgid ""
+"specify directories rather than patterns. If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"chỉ định các thư mục thay mẫu. Nếu thư mục của bạn đã sẵn có chứa một trong "
+"số bất kỳ '*?[]\\', chuyển qua --skip-checks"
+
+#: builtin/sparse-checkout.c:732
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr ""
+"'%s' không phải là một thư mục; để vẫn coi nó là một thư mục hãy chạy với --"
+"skip-checks"
+
+#: builtin/sparse-checkout.c:734
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"chuyển một dấu xổ chéo dẫn đầu đường dẫn như là '%s' nếu bạn muốn một tập "
+"tin đơn (xem NON-CONE PROBLEMS trong hướng dẫn sử dụng git-sparse-checkout)."
+
+#: builtin/sparse-checkout.c:739
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <các mẫu>)"
+
+#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr ""
+"bỏ qua một số kiểm tra đúng mục trên đường dẫn đã cho cái mà có thể đưa ra "
+"xác thực sai"
+
+#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
msgid "read patterns from standard in"
msgstr "đọc các mẫu từ đầu vào tiêu chuẩn"
-#: builtin/sparse-checkout.c:588
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:760
+msgid "no sparse-checkout to add to"
+msgstr "không có sparse-checkout để thêm vào"
-#: builtin/sparse-checkout.c:607
-msgid "git sparse-checkout disable"
-msgstr "git sparse-checkout disable"
+#: builtin/sparse-checkout.c:775
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <các mẫu>)"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:854
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr "phải trong một sparse-checkout để áp dụng lại các mẫu sparse"
+
+#: builtin/sparse-checkout.c:914
msgid "error while refreshing working directory"
msgstr "gặp lỗi khi đọc lại thư mục làm việc"
@@ -22310,22 +22940,26 @@
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-" [-u|--include-untracked] [-a|--all] [-m|--message <lời nhắn>]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <ghi chú>]\n"
" [--pathspec-from-file=<tập_tin> [--pathspec-file-nul]]\n"
" [--] [<đặc/tả/đường/dẫn>…]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<ghi chú>]"
#: builtin/stash.c:55
@@ -22350,6 +22984,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <lời nhắn>]\n"
" [--] [<đặc/tả/đường/dẫn>…]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<ghi chú>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22373,7 +23015,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear với các tham số là chưa được thực hiện"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22384,181 +23026,181 @@
" %s -> %s\n"
" để nhường chỗ.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "không thể áp dụng một stash ở giữa của quá trình hòa trộn"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "không thể tạo diff %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "không thể ghi lại cây chỉ mục"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Đang hòa trộn %s với %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "Bảng mục lục đã không được bỏ stash."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)"
+
+#: builtin/stash.c:608 builtin/stash.c:695
msgid "attempt to recreate the index"
msgstr "gặp lỗi đọc bảng mục lục"
-#: builtin/stash.c:635
+#: builtin/stash.c:641
#, c-format
msgid "Dropped %s (%s)"
msgstr "Đã xóa %s (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:644
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Không thể xóa bỏ mục stash"
-#: builtin/stash.c:651
+#: builtin/stash.c:657
#, c-format
msgid "'%s' is not a stash reference"
msgstr "”%s” không phải tham chiếu đến stash"
-#: builtin/stash.c:701
+#: builtin/stash.c:707
msgid "The stash entry is kept in case you need it again."
msgstr "Các mục tạm cất (stash) được giữ trong trường hợp bạn lại cần nó."
-#: builtin/stash.c:724
+#: builtin/stash.c:730
msgid "No branch name specified"
msgstr "Chưa chỉ ra tên của nhánh"
-#: builtin/stash.c:808
+#: builtin/stash.c:809
msgid "failed to parse tree"
msgstr "gặp lỗi khi phân tích cây"
-#: builtin/stash.c:819
+#: builtin/stash.c:820
msgid "failed to unpack trees"
msgstr "gặp lỗi khi tháo dỡ cây"
-#: builtin/stash.c:839
+#: builtin/stash.c:840
msgid "include untracked files in the stash"
msgstr "bao gồm các tập tin không được theo dõi trong stash"
-#: builtin/stash.c:842
+#: builtin/stash.c:843
msgid "only show untracked files in the stash"
msgstr "chỉ hiển thị các tập tin không được theo dõi trong stash"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:930 builtin/stash.c:967
#, c-format
msgid "Cannot update %s with %s"
msgstr "Không thể cập nhật %s với %s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
msgid "stash message"
msgstr "phần chú thích cho stash"
-#: builtin/stash.c:957
+#: builtin/stash.c:958
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" cần một đối số <lần chuyển giao>"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1143
+msgid "No staged changes"
+msgstr "Không có thay đổi đã được đưa lên bệ phóng"
+
+#: builtin/stash.c:1204
msgid "No changes selected"
msgstr "Chưa có thay đổi nào được chọn"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1304
msgid "You do not have the initial commit yet"
msgstr "Bạn chưa còn có lần chuyển giao khởi tạo"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1331
msgid "Cannot save the current index state"
msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1340
msgid "Cannot save the untracked files"
msgstr "Không thể ghi lại các tập tin chưa theo dõi"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1351 builtin/stash.c:1370
msgid "Cannot save the current worktree state"
msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1361
+msgid "Cannot save the current staged state"
+msgstr "Không thể ghi lại trạng thái bệ phóng hiện hành"
+
+#: builtin/stash.c:1398
msgid "Cannot record working tree state"
msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1447
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1458
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "Không thể dùng --staged và --include-untracked hay --all cùng một lúc"
+
+#: builtin/stash.c:1476
msgid "Did you forget to 'git add'?"
msgstr "Có lẽ bạn đã quên “git add ” phải không?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1491
msgid "No local changes to save"
msgstr "Không có thay đổi nội bộ nào được ghi lại"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1498
msgid "Cannot initialize stash"
msgstr "Không thể khởi tạo stash"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1513
msgid "Cannot save the current status"
msgstr "Không thể ghi lại trạng thái hiện hành"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1518
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục %s"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1615
msgid "Cannot remove worktree changes"
msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1656 builtin/stash.c:1728
msgid "keep index"
msgstr "giữ nguyên bảng mục lục"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1658 builtin/stash.c:1730
+msgid "stash staged changes only"
+msgstr "chỉ tạm cất đi các thay đổi đã đưa lên bệ phóng"
+
+#: builtin/stash.c:1660 builtin/stash.c:1732
msgid "stash in patch mode"
msgstr "cất đi ở chế độ miếng vá"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1661 builtin/stash.c:1733
msgid "quiet mode"
msgstr "chế độ im lặng"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1663 builtin/stash.c:1735
msgid "include untracked files in stash"
msgstr "bao gồm các tập tin không được theo dõi trong stash"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1665 builtin/stash.c:1737
msgid "include ignore files"
msgstr "bao gồm các tập tin bị bỏ qua"
-#: builtin/stash.c:1700
-msgid ""
-"the stash.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"việc hỗ trợ stash.useBuiltin đã bị xóa!\n"
-"Xem mục tin của nó trong “git help config” để biết chi tiết."
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
-
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "giữ và xóa bỏ mọi dòng bắt đầu bằng ký tự ghi chú"
@@ -22567,41 +23209,45 @@
msgid "prepend comment character and space to each line"
msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s"
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr "submodule--helper print-default-remote takes không nhận tham số"
-
-#: builtin/submodule--helper.c:101
+#: builtin/submodule--helper.c:103
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:213
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"không thể tìm thấy cấu hình “%s”. Coi rằng đây là kho thượng nguồn có quyền "
+"sở hữu chính nó."
+
+#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
msgid "alternative anchor for relative paths"
msgstr "điểm neo thay thế cho các đường dẫn tương đối"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:418
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
+#: builtin/submodule--helper.c:640
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Không tìm thấy url cho đường dẫn mô-đun-con “%s” trong .gitmodules"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:528
#, c-format
msgid "Entering '%s'\n"
msgstr "Đang vào “%s”\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:531
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22610,7 +23256,7 @@
"run_command trả về trạng thái khác không cho %s\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:553
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22621,78 +23267,69 @@
"con lồng nhau của %s\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:569
msgid "suppress output of entering each submodule command"
msgstr "chặn kết xuất của từng lệnh mô-đun-con"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1458
msgid "recurse into nested submodules"
msgstr "đệ quy vào trong mô-đun-con lồng nhau"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:576
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <lệnh>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"không thể tìm thấy cấu hình “%s”. Coi rằng đây là kho thượng nguồn có quyền "
-"sở hữu chính nó."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:654
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:658
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:668
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s”\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:675
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:697
msgid "suppress output for initializing a submodule"
msgstr "chặn kết xuất của khởi tạo một mô-đun-con"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:702
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<các tùy chọn>] [</đường/dẫn>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn "
"“%s”"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "không thể phân giải tham chiếu HEAD bên trong mô-đun-con “%s”"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "gặp lỗi khi đệ quy vào trong mô-đun-con “%s”"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
msgid "suppress submodule status output"
msgstr "chặn kết xuất về tình trạng mô-đun-con"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:875
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -22700,111 +23337,107 @@
"dùng lần chuyển giao lưu trong mục lục thay cho cái được lưu trong HEAD mô-"
"đun-con"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
"git submodule status [--quiet] [--cached] [--recursive] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name </đường/dẫn>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:977
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr ""
"* %s %s(blob)->%s(\n"
")"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:980
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(mô-đun-con)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:993
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1043
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "không thể băm đối tượng từ “%s”"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1047
#, c-format
msgid "unexpected mode %o\n"
msgstr "gặp chế độ không như mong chờ %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1288
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "hùng lần chuyển giao đã lưu trong mục lục thay cho HEAD mô-đun-con"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1290
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "để so sánh lần trong mục lục với cái trong HEAD mô-đun-con"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1292
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
"bỏ qua các mô-đun-con với giá trị của “ignore_config” được đặt thành “all”"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1294
msgid "limit the summary size"
msgstr "giới hạn kích cỡ tổng hợp"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1299
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr ""
"git submodule--helper summary [<các tùy chọn>] [<lần_chuyển_giao>] [--] [</"
"đường/dẫn>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1323
msgid "could not fetch a revision for HEAD"
msgstr "không thể lấy về một điểm xem xét cho HEAD"
-#: builtin/submodule--helper.c:1342
-msgid "--cached and --files are mutually exclusive"
-msgstr "Các tùy chọn --cached và --files loại từ lẫn nhau"
-
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1384
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Url mô-đun-con đồng bộ hóa cho “%s”\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1390
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1399
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "gặp lỗi khi lấy máy chủ mặc định cho mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1409
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "gặp lỗi khi cập nhật cho mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1456
msgid "suppress output of synchronizing submodule url"
msgstr "chặn kết xuất của url mô-đun-con đồng bộ"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1463
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [</đường/dẫn>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1513
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"Cây làm việc mô-đun-con “%s” có chứa thư mục .git (dùng “rm -rf” nếu bạn "
-"thực sự muốn gỡ bỏ nó cùng với toàn bộ lịch sử của chúng)"
+"Cây làm việc mô-đun-con “%s” có chứa thư mục .git. Việc này sẽ được thay thế "
+"với một tập tin .git bằng các sử dụng absorbgitdirs."
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1530
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22813,45 +23446,45 @@
"Cây làm việc mô-đun-con “%s” chứa các thay đổi nội bộ; hãy dùng “-f” để loại "
"bỏ chúng đi"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1538
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Đã xóa thư mục “%s”\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1540
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “%s”\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1551
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "không thể tạo thư mục mô-đun-con rỗng “%s”"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1567
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1596
msgid "remove submodule working trees even if they contain local changes"
msgstr "gỡ bỏ cây làm việc của mô-đun-con ngay cả khi nó có thay đổi nội bộ"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1597
msgid "unregister all submodules"
msgstr "bỏ đăng ký tất cả các trong mô-đun-con"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1602
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [</đường/dẫn>…]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1616
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Dùng “--all” nếu bạn thực sự muốn hủy khởi tạo mọi mô-đun-con"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1665
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22866,155 +23499,173 @@
"bằng\n"
"“--reference-if-able” thay vì dùng “--reference”."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "mô-đun-con “%s” không thể thêm thay thế: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1749
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Giá trị “%s” cho submodule.alternateErrorStrategy không được thừa nhận"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1756
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Giá trị “%s” cho submodule.alternateLocation không được thừa nhận"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1781
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "từ chối tạo/dùng “%s” trong một thư mục git của mô đun con"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1826
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "việc sao “%s” vào đường dẫn mô-đun-con “%s” gặp lỗi"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1831
#, c-format
msgid "directory not empty: '%s'"
msgstr "thư mục không trống: “%s”"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1843
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "không thể lấy thư mục mô-đun-con cho “%s”"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1876
msgid "where the new submodule will be cloned to"
msgstr "nhân bản mô-đun-con mới vào chỗ nào"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1879
msgid "name of the new submodule"
msgstr "tên của mô-đun-con mới"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1882
msgid "url where to clone the submodule from"
msgstr "url nơi mà nhân bản mô-đun-con từ đó"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
msgid "depth for shallow clones"
msgstr "chiều sâu lịch sử khi tạo bản sao"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
+#: builtin/submodule--helper.c:3376
msgid "force cloning progress"
msgstr "ép buộc tiến trình nhân bản"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
msgid "disallow cloning into non-empty directory"
msgstr "làm đầy đủ dữ liệu cho bản sao vào trong một thư mục trống rỗng"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1903
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=</đường/dẫn>] [--quiet] [--reference "
-"<kho>] [--name <tên>] [--depth <sâu>] [--single-branch] --url <url> --path </"
-"đường/dẫn>"
+"<kho>] [--name <tên>] [--depth <sâu>] [--single-branch] [--filter <filter-"
+"spec>] --url <url> --path </đường/dẫn>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1943
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Chế độ cập nhật “%s” không hợp lệ cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1947
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Chế độ cập nhật “%s” không hợp lệ được cấu hình cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Đường dẫn mô-đun-con “%s” chưa được khởi tạo"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Bỏ qua các mô-đun-con chưa được hòa trộn %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Bỏ qua mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Gặp lỗi khi nhân bản “%s”. Thử lại lịch trình"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Gặp lỗi khi nhân bản “%s” lần thứ hai nên bãi bỏ"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
-msgid "path into the working tree"
-msgstr "đường dẫn đến cây làm việc"
+#: builtin/submodule--helper.c:2371
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Không thể lấy ra “%s” trong đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2347
-msgid "path into the working tree, across nested submodule boundaries"
-msgstr "đường dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau"
+#: builtin/submodule--helper.c:2375
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Không thể cải tổ “%s” trong đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2351
-msgid "rebase, merge, checkout or none"
-msgstr "rebase, merge, checkout hoặc không làm gì cả"
+#: builtin/submodule--helper.c:2379
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Không thể hòa trộn (merge) “%s” trong đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2357
-msgid "create a shallow clone truncated to the specified number of revisions"
+#: builtin/submodule--helper.c:2383
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
msgstr ""
-"tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho"
+"Thực hiện không thành công lệnh “%s %s” trong đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2360
-msgid "parallel jobs"
-msgstr "công việc đồng thời"
+#: builtin/submodule--helper.c:2402
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Đường dẫn mô-đun-con “%s”: đã checkout “%s”\n"
-#: builtin/submodule--helper.c:2362
-msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không"
+#: builtin/submodule--helper.c:2406
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Đường dẫn mô-đun-con “%s”: được rebase vào trong “%s”\n"
-#: builtin/submodule--helper.c:2363
-msgid "don't print cloning progress"
-msgstr "đừng in tiến trình nhân bản"
+#: builtin/submodule--helper.c:2410
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Đường dẫn mô-đun-con “%s”: được hòa trộn vào “%s”\n"
-#: builtin/submodule--helper.c:2374
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Đường dẫn mô-đun-con “%s”: “%s %s”\n"
+
+#: builtin/submodule--helper.c:2438
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr ""
-"git submodule--helper update-clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
+"Không thể lấy về trong đường dẫn mô-đun-con “%s”; thử lấy về trực tiếp %s:"
-#: builtin/submodule--helper.c:2387
-msgid "bad value for update parameter"
-msgstr "giá trị cho tham số cập nhật bị sai"
+#: builtin/submodule--helper.c:2447
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Đã lấy về từ đường dẫn mô-đun con “%s”, nhưng nó không chứa %s. Lấy về trực "
+"tiếp lần chuyển giao gặp lỗi đó."
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2481
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23023,143 +23674,293 @@
"Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu "
"dự án lại không trên bất kỳ nhánh nào"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2499
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "không thể lấy thẻ quản kho cho mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2588
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr ""
+"Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con “%s”"
+
+#: builtin/submodule--helper.c:2599
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "Không thể lấy về trong đường dẫn mô-đun-con “%s”"
+
+#: builtin/submodule--helper.c:2604
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr "Không tìm thấy điểm xét duyệt %s trong đường dẫn mô-đun-con “%s”"
+
+#: builtin/submodule--helper.c:2640
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “%s”"
+
+#: builtin/submodule--helper.c:2699
+msgid "force checkout updates"
+msgstr "ép buộc lấy ra các cập nhật"
+
+#: builtin/submodule--helper.c:2701
+msgid "initialize uninitialized submodules before update"
+msgstr "khởi tạo mô-đun-con chưa khởi tạo trước khi cập nhật"
+
+#: builtin/submodule--helper.c:2703
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "sử dụng SHA-1 của nhánh theo dõi máy chủ của mô-đun-con"
+
+#: builtin/submodule--helper.c:2705
+msgid "traverse submodules recursively"
+msgstr "đi theo mô-đun con một cách đệ quy"
+
+#: builtin/submodule--helper.c:2707
+msgid "don't fetch new objects from the remote site"
+msgstr "đừng lấy các đối tượng mới từ địa chỉ trên mạng"
+
+#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+msgid "path into the working tree"
+msgstr "đường dẫn đến cây làm việc"
+
+#: builtin/submodule--helper.c:2713
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "đường dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau"
+
+#: builtin/submodule--helper.c:2717
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout hoặc không làm gì cả"
+
+#: builtin/submodule--helper.c:2723
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr ""
+"tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho"
+
+#: builtin/submodule--helper.c:2726
+msgid "parallel jobs"
+msgstr "công việc đồng thời"
+
+#: builtin/submodule--helper.c:2728
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không"
+
+#: builtin/submodule--helper.c:2729
+msgid "don't print cloning progress"
+msgstr "đừng in tiến trình nhân bản"
+
+#: builtin/submodule--helper.c:2741
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+msgstr ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <kho>] [--recursive] [--[no-]single-branch] [--] [</"
+"đường/dẫn/>...]"
+
+#: builtin/submodule--helper.c:2767
+msgid "bad value for update parameter"
+msgstr "giá trị cho tham số cập nhật bị sai"
+
+#: builtin/submodule--helper.c:2893
msgid "recurse into submodules"
msgstr "đệ quy vào trong mô-đun-con"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2899
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<các tùy chọn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2955
msgid "check if it is safe to write to the .gitmodules file"
msgstr "chọn nếu nó là an toàn để ghi vào tập tin .gitmodules"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2958
msgid "unset the config in the .gitmodules file"
msgstr "bỏ đặt cấu hình trong tập tin .gitmodules"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <tên> [<giá trị>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <tên>"
-#: builtin/submodule--helper.c:2663
-msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper config --check-writeable"
-
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
+#: builtin/submodule--helper.c:3395
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "hãy đảm bảo rằng tập tin .gitmodules có trong cây làm việc"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:3000
msgid "suppress output for setting url of a submodule"
msgstr "chặn kết xuất cho cài đặt url của một mô-đun-con"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:3004
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] </đường/dẫn> <url_mới>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:3037
msgid "set the default tracking branch to master"
msgstr "đặt nhánh theo dõi mặc định thành master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:3039
msgid "set the default tracking branch"
msgstr "đặt nhánh theo dõi mặc định"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:3043
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet](-d|--default)</đường/dẫn>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:3044
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <nhánh> </đường/"
"dẫn>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:3051
msgid "--branch or --default required"
msgstr "cần --branch hoặc --default"
-#: builtin/submodule--helper.c:2752
-msgid "--branch and --default are mutually exclusive"
-msgstr "Các tùy chọn --branch và --default loại từ lẫn nhau"
+#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+msgid "print only error messages"
+msgstr "chỉ hiển thị các thông điệp báo lỗi"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3073
+msgid "force creation"
+msgstr "buộc tạo"
+
+#: builtin/submodule--helper.c:3081
+msgid "show whether the branch would be created"
+msgstr "hiển thị xem nhánh nào nên được tạo ra"
+
+#: builtin/submodule--helper.c:3085
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <tên> <start-oid> <start-name>"
+
+#: builtin/submodule--helper.c:3097
+#, c-format
+msgid "creating branch '%s'"
+msgstr "đang tạo nhánh “%s”"
+
+#: builtin/submodule--helper.c:3155
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Đang thêm repo có sẵn tại “%s” vào bảng mục lục\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3158
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "“%s” đã tồn tại từ trước và không phải là một kho git hợp lệ"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3171
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "Thư mục git cho “%s” được tìm thấy một cách cục bộ với các máy chủ:"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "Thư mục git cho “%s” được tìm thấy một cách cục bộ với các máy chủ:\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3178
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
-"Nếu bạn muốn sử dụng lại thư mục nội bộ này thay vì nhân bản lại lần nữa từ\n"
+"Nếu bạn muốn sử dụng lại thư mục git nội bộ này thay vì nhân bản lại lần nữa "
+"từ\n"
" %s\n"
-"dùng tùy chọn “--force”. Nếu thư mục git nội bộ không phải là một kho đúng\n"
-"hoặc là bạn không chắc chắn điều đó nghĩa là gì thì chọn tên khác với tùy "
-"chọn “--name”.\n"
+"dùng tùy chọn “--force”. Nếu thư mục git nội bộ không phải là một kho đúng "
+"hoặc\n"
+"là bạn không chắc chắn điều đó nghĩa là gì thì chọn tên khác với tùy chọn “--"
+"name”."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3190
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “%s”.\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3227
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "không thể lấy ra mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "nhánh của kho để lấy ra khi nhân bản"
+#: builtin/submodule--helper.c:3266
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Gặp lỗi khi thêm mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
+#: builtin/submodule--helper.c:3283
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Gặp lỗi khi đăng ký mô-đun-con “%s”"
+
+#: builtin/submodule--helper.c:3339
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "”%s” thực sự đã tồn tại ở bảng mục lục rồi"
+
+#: builtin/submodule--helper.c:3342
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr ""
+"”%s” thực sự đã tồn tại ở bảng mục lục rồi và không phải là một mô-đun-con"
+
+#: builtin/submodule--helper.c:3372
+msgid "branch of repository to add as submodule"
+msgstr "nhánh của kho để thêm như là mô-đun-con"
+
+#: builtin/submodule--helper.c:3373
msgid "allow adding an otherwise ignored submodule path"
msgstr "cho phép thêm một đường dẫn mô-đun-con bị bỏ qua khác"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<các tùy chọn>...] --url <url> --path </"
-"đường/dẫn> --name <tên>"
+#: builtin/submodule--helper.c:3379
+msgid "borrow the objects from reference repositories"
+msgstr "vay mượn các đối tượng từ kho thay thế"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3381
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"đặt tên của mô-đun-con bằng chuỗi đã cho thay vì mặc định là đường dẫn của nó"
+
+#: builtin/submodule--helper.c:3388
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<các tùy chọn>] [--] <kho> [</đường/dẫn>]"
+
+#: builtin/submodule--helper.c:3416
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"Đường dẫn tương đối chỉ có thể dùng từ thư mục ở mức cao nhất của cây làm "
+"việc"
+
+#: builtin/submodule--helper.c:3425
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "repo URL: “%s” phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
+
+#: builtin/submodule--helper.c:3460
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "“%s” không phải là một tên mô-đun-con hợp lệ"
+
+#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s không hỗ trợ --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3526
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "“%s” không phải là lệnh con submodule--helper hợp lệ"
@@ -23184,53 +23985,53 @@
msgid "shorten ref output"
msgstr "làm ngắn kết xuất ref (tham chiếu)"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "lý do"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "lý do cập nhật"
-#: builtin/tag.c:25
+#: builtin/tag.c:26
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <tập-tin>]\n"
-"\t\t<tên-thẻ> [<head>]"
+" <tên-thẻ> [<head>]"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid "git tag -d <tagname>..."
msgstr "git tag -d <tên-thẻ>…"
-#: builtin/tag.c:28
+#: builtin/tag.c:29
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<số>]] [--contains <lần_chuyển_giao>] [--no-contains "
"<lần_chuyển_giao>] [--points-at <đối-tượng>]\n"
-"\t\t[--format=<định_dạng>] [--merged <lần_chuyển_giao>] [--no-merged "
+" [--format=<định_dạng>] [--merged <lần_chuyển_giao>] [--no-merged "
"[<lần_chuyển_giao>]] [<mẫu>…]"
-#: builtin/tag.c:30
+#: builtin/tag.c:31
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<định_dạng>] <tên-thẻ>…"
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "tag '%s' not found."
msgstr "không tìm thấy tìm thấy thẻ “%s”."
-#: builtin/tag.c:135
+#: builtin/tag.c:136
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Thẻ đã bị xóa “%s” (từng là %s)\n"
-#: builtin/tag.c:170
+#: builtin/tag.c:171
#, c-format
msgid ""
"\n"
@@ -23243,7 +24044,7 @@
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n"
-#: builtin/tag.c:174
+#: builtin/tag.c:175
#, c-format
msgid ""
"\n"
@@ -23279,135 +24080,115 @@
msgid "bad object type."
msgstr "kiểu đối tượng sai."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "không có chú thích gì cho cho thẻ à?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Nội dung ghi chú còn lại %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:445
msgid "list tag names"
msgstr "chỉ liệt kê tên các thẻ"
-#: builtin/tag.c:448
+#: builtin/tag.c:447
msgid "print <n> lines of each tag message"
msgstr "hiển thị <n> dòng cho mỗi ghi chú"
-#: builtin/tag.c:450
+#: builtin/tag.c:449
msgid "delete tags"
msgstr "xóa thẻ"
-#: builtin/tag.c:451
+#: builtin/tag.c:450
msgid "verify tags"
msgstr "thẩm tra thẻ"
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "Tag creation options"
msgstr "Tùy chọn tạo thẻ"
-#: builtin/tag.c:455
+#: builtin/tag.c:454
msgid "annotated tag, needs a message"
msgstr "để chú giải cho thẻ, cần một lời ghi chú"
-#: builtin/tag.c:457
+#: builtin/tag.c:456
msgid "tag message"
msgstr "phần chú thích cho thẻ"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
msgid "force edit of tag message"
msgstr "ép buộc sửa thẻ lần commit"
-#: builtin/tag.c:460
+#: builtin/tag.c:459
msgid "annotated and GPG-signed tag"
msgstr "thẻ chú giải và ký kiểu GPG"
-#: builtin/tag.c:463
+#: builtin/tag.c:462
msgid "use another key to sign the tag"
msgstr "dùng kháo khác để ký thẻ"
-#: builtin/tag.c:464
+#: builtin/tag.c:463
msgid "replace the tag if exists"
msgstr "thay thế nếu thẻ đó đã có trước"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:464 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "tạo một reflog"
-#: builtin/tag.c:467
+#: builtin/tag.c:466
msgid "Tag listing options"
msgstr "Các tùy chọn liệt kê thẻ"
-#: builtin/tag.c:468
+#: builtin/tag.c:467
msgid "show tag list in columns"
msgstr "hiển thị danh sách thẻ trong các cột"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:469 builtin/tag.c:471
msgid "print only tags that don't contain the commit"
msgstr "chỉ hiển thị những thẻ mà nó không chứa lần chuyển giao"
-#: builtin/tag.c:473
+#: builtin/tag.c:472
msgid "print only tags that are merged"
msgstr "chỉ hiển thị những thẻ mà nó được hòa trộn"
-#: builtin/tag.c:474
+#: builtin/tag.c:473
msgid "print only tags that are not merged"
msgstr "chỉ hiển thị những thẻ mà nó không được hòa trộn"
-#: builtin/tag.c:478
+#: builtin/tag.c:477
msgid "print only tags of the object"
msgstr "chỉ hiển thị các thẻ của đối tượng"
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column và -n xung khắc nhau"
+#: builtin/tag.c:559
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "tùy chọn '%s' chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "tùy chọn -n chỉ cho phép dùng trong chế độ liệt kê"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "tùy chọn --contains chỉ cho phép dùng trong chế độ liệt kê"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "tùy chọn --no-contains chỉ cho phép dùng trong chế độ liệt kê"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "tùy chọn --points-at chỉ cho phép dùng trong chế độ liệt kê"
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr ""
-"tùy chọn --merged và --no-merged chỉ cho phép dùng trong chế độ liệt kê"
-
-#: builtin/tag.c:567
-msgid "only one -F or -m option is allowed."
-msgstr "chỉ có một tùy chọn -F hoặc -m là được phép."
-
-#: builtin/tag.c:592
+#: builtin/tag.c:598
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "“%s” không phải thẻ hợp lệ."
-#: builtin/tag.c:597
+#: builtin/tag.c:603
#, c-format
msgid "tag '%s' already exists"
msgstr "thẻ “%s” đã tồn tại rồi"
-#: builtin/tag.c:628
+#: builtin/tag.c:634
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n"
+#: builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "gói đã vượt quá cỡ tối đa được phép"
+
#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr "Đang giải nén các đối tượng"
@@ -23417,201 +24198,196 @@
msgid "failed to create directory %s"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "gặp lỗi khi tạo tập tin %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "gặp lỗi khi xóa tập tin %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "gặp lỗi khi xóa thư mục %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Đang kiểm thử mtime trong “%s” "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm tập tin mới"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm thư mục mới"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "thông tin thống kê thư mục thay đổi sau khi cập nhật tập tin"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"thông tin thống kê thư mục thay đổi sau khi thêm tập tin mới vào trong thư "
"mục con"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa tập tin"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa thư mục"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " Đồng ý"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<các tùy chọn>] [--] [<tập-tin>…]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:993
msgid "continue refresh even when index needs update"
msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:996
msgid "refresh: ignore submodules"
msgstr "refresh: lờ đi mô-đun-con"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:999
msgid "do not ignore new files"
msgstr "không bỏ qua các tập tin mới tạo"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:1001
msgid "let files replace directories and vice-versa"
msgstr "để các tập tin thay thế các thư mục và “vice-versa”"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1003
msgid "notice files missing from worktree"
msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:1005
msgid "refresh even if index contains unmerged entries"
msgstr ""
"làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1008
msgid "refresh stat information"
msgstr "lấy lại thông tin thống kê"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1012
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "giống --refresh, nhưng bỏ qua các cài đặt “assume-unchanged”"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1016
msgid "<mode>,<object>,<path>"
msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1017
msgid "add the specified entry to the index"
msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1027
msgid "mark files as \"not changing\""
msgstr "đánh dấu các tập tin là \"không thay đổi\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1030
msgid "clear assumed-unchanged bit"
msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1033
msgid "mark files as \"index-only\""
msgstr "đánh dấu các tập tin là “chỉ-đọc”"
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1036
msgid "clear skip-worktree bit"
msgstr "xóa bít skip-worktree"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1039
msgid "do not touch index-only entries"
msgstr "đừng động vào các mục index-only"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1041
msgid "add to index only; do not add content to object database"
msgstr ""
"chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1043
msgid "remove named paths even if present in worktree"
msgstr ""
"gỡ bỏ các đường dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục "
"làm việc"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1045
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "với tùy chọn --stdin: các dòng đầu vào được chấm dứt bởi ký tự null"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1047
msgid "read list of paths to be updated from standard input"
msgstr "đọc danh sách đường dẫn cần cập nhật từ đầu vào tiêu chuẩn"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1051
msgid "add entries from standard input to the index"
msgstr "không thể đọc các mục từ đầu vào tiêu chuẩn vào bảng mục lục"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1055
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "phục hồi các trạng thái #2 và #3 cho các đường dẫn được liệt kê"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1059
msgid "only update entries that differ from HEAD"
msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1063
msgid "ignore files missing from worktree"
msgstr "bỏ qua các tập-tin thiếu trong thư-mục làm việc"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1066
msgid "report actions to standard output"
msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1068
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(cho “porcelains”) quên các xung đột chưa được giải quyết đã ghi"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1072
msgid "write index in this format"
msgstr "ghi mục lục ở định dạng này"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1074
msgid "enable or disable split index"
msgstr "bật/tắt chia cắt bảng mục lục"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1076
msgid "enable/disable untracked cache"
msgstr "bật/tắt bộ đệm không theo vết"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1078
msgid "test if the filesystem supports untracked cache"
msgstr "kiểm tra xem hệ thống tập tin có hỗ trợ đệm không theo dõi hay không"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1080
msgid "enable untracked cache without testing the filesystem"
msgstr "bật bộ đệm không theo vết mà không kiểm tra hệ thống tập tin"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1082
msgid "write out the index even if is not flagged as changed"
msgstr "ghi ra mục lục ngay cả khi không được đánh cờ là có thay đổi"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1084
msgid "enable or disable file system monitor"
msgstr "bật/tắt theo dõi hệ thống tập tin"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1086
msgid "mark files as fsmonitor valid"
msgstr "đánh dấu các tập tin là hợp lệ fsmonitor"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1089
msgid "clear fsmonitor valid bit"
msgstr "xóa bít hợp lệ fsmonitor"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1195
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -23619,7 +24395,7 @@
"core.splitIndex được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự "
"muốn bật chia tách mục lục"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1204
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -23627,7 +24403,7 @@
"core.splitIndex được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực sự "
"muốn tắt chia tách mục lục"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1216
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23635,11 +24411,11 @@
"core.untrackedCache được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực "
"sự muốn tắt bộ đệm chưa theo dõi"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1220
msgid "Untracked cache disabled"
msgstr "Nhớ đệm không theo vết bị tắt"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1228
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -23647,29 +24423,29 @@
"core.untrackedCache được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự "
"muốn bật bộ đệm chưa theo dõi"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1232
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Nhớ đệm không theo vết được bật cho “%s”"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1241
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor chưa được đặt; đặt nó nếu bạn thực sự muốn bật theo dõi hệ "
"thống tập tin"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1246
msgid "fsmonitor enabled"
msgstr "fsmonitor được bật"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1250
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor đã được đặt; bỏ đặt nó nếu bạn thực sự muốn bật theo dõi hệ "
"thống tập tin"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1254
msgid "fsmonitor disabled"
msgstr "fsmonitor bị tắt"
@@ -23685,26 +24461,22 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<các tùy chọn>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "xóa tham chiếu"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "cập nhật <tên-tham-chiếu> không phải cái nó chỉ tới"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "đầu vào tiêu chuẩn có các đối số được chấm dứt bởi NUL"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "đọc cập nhật từ đầu vào tiêu chuẩn"
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "cập nhật các tập tin thông tin từ điểm xuất phát"
@@ -23713,19 +24485,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<các tùy chọn>] </đường/dẫn>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "thoát sau khi một trao đổi yêu cầu hay trả lời đơn"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "thoát ngay sau khi khởi tạo quảng cáo tham chiếu"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "phục vụ info/refs (thông tin/tham chiếu) cho git-http-backend"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "đừng thử <thư_mục>/.git/ nếu <thư_mục> không phải là thư mục Git"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "ngắt truyền thông sau <n> giây không hoạt động"
@@ -23761,63 +24533,62 @@
msgid "print tag contents"
msgstr "hiển thị nội dung của thẻ"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<các tùy chọn>] </đường/dẫn> [<commit-ish>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<các tùy chọn>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<các tùy chọn>] </đường/dẫn>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <worktree> </đường/dẫn/mới>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<các tùy chọn>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<các tùy chọn>] <worktree>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [</đường/dẫn/>...]"
+
+#: builtin/worktree.c:26
msgid "git worktree unlock <path>"
msgstr "git worktree unlock </đường/dẫn>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "gặp lỗi khi xóa “%s”"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:76
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Đang xóa %s/%s: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "báo cáo các cây làm việc đã prune"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "các cây làm việc hết hạn cũ hơn khoảng <thời gian>"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "“%s” đã có từ trước rồi"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:230
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "đích cây làm việc không sử dụng được “%s”"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:235
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23826,7 +24597,7 @@
"“%s” bị mất nhưng cây làm việc bị khóa;\n"
"dùng “%s -f -f” để ghi đè, hoặc “unlock” và “prune” hay “remove” để xóa"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:237
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23835,141 +24606,148 @@
"“%s” bị mất nhưng cây làm việc đã được đăng ký;\n"
"dùng “%s -f” để ghi đè, hoặc “prune” hay “remove” để xóa"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:248
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr "gặp lỗi khi sao chép '%s' sang '%s'; không thể làm việc đúng được"
+
+#: builtin/worktree.c:268
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr "gặp lỗi khi sao chép cấu hình cây làm việc từ “%s” sang “%s”"
+
+#: builtin/worktree.c:280 builtin/worktree.c:285
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "gặp lỗi bỏ đặt “%s” trong “%s”"
+
+#: builtin/worktree.c:356
#, c-format
msgid "could not create directory of '%s'"
msgstr "không thể tạo thư mục của “%s”"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:378
msgid "initializing"
msgstr "khởi tạo"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:492 builtin/worktree.c:498
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Đang chuẩn bị cây làm việc (nhánh mới “%s”)"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:494
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Đang chuẩn bị cây làm việc (đang cài đặt nhánh “%s”, trước đây tại %s)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:503
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Đang chuẩn bị cây làm việc (đang lấy ra “%s”)"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:509
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Đang chuẩn bị cây làm việc (HEAD đã tách rời “%s”)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:554
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:557
msgid "create a new branch"
msgstr "tạo nhánh mới"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:559
msgid "create or reset a branch"
msgstr "tạo hay đặt lại một nhánh"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:561
msgid "populate the new working tree"
msgstr "di chuyển cây làm việc mới"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:562
msgid "keep the new working tree locked"
msgstr "giữ cây làm việc mới bị khóa"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:564 builtin/worktree.c:809
msgid "reason for locking"
msgstr "lý do khóa"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:567
msgid "set up tracking mode (see git-branch(1))"
msgstr "cài đặt chế độ theo dõi (xem git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:570
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "có khớp tên tên nhánh mới với một nhánh theo dõi máy chủ"
-#: builtin/worktree.c:506
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "Các tùy chọn -b, -B, và --detach loại từ lẫn nhau"
-
-#: builtin/worktree.c:508
-msgid "--reason requires --lock"
-msgstr "--reason cần --lock"
-
-#: builtin/worktree.c:512
+#: builtin/worktree.c:584
msgid "added with --lock"
msgstr "được thêm với --lock"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:646
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track chỉ có thể được dùng nếu một nhánh mới được tạo"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:766
msgid "show extended annotations and reasons, if available"
msgstr "hiển thị chú thích và lý do mở rộng, nếu có"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:768
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
-"thêm chú thích kiểu 'prunable' cho các cây làm việc hết hạn cũ hơn khoảng "
+"thêm chú thích kiểu “prunable” cho các cây làm việc hết hạn cũ hơn khoảng "
"<thời gian>"
-#: builtin/worktree.c:702
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose và --porcelain loại từ lẫn nhau"
+#: builtin/worktree.c:770
+msgid "terminate records with a NUL character"
+msgstr "chấm dứt các bản ghi bằng ký tự NULL"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
+#: builtin/worktree.c:1052
#, c-format
msgid "'%s' is not a working tree"
msgstr "%s không phải là cây làm việc"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:823 builtin/worktree.c:856
msgid "The main working tree cannot be locked or unlocked"
msgstr "Cây thư mục làm việc chính không thể khóa hay bỏ khóa được"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:828
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "“%s” đã được khóa rồi, lý do: %s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:830
#, c-format
msgid "'%s' is already locked"
msgstr "“%s” đã được khóa rồi"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:858
#, c-format
msgid "'%s' is not locked"
msgstr "“%s” chưa bị khóa"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:899
msgid "working trees containing submodules cannot be moved or removed"
msgstr "cây làm việc có chứa mô-đun-con không thể di chuyển hay xóa bỏ"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:907
msgid "force move even if worktree is dirty or locked"
msgstr "ép buộc ngay cả khi cây làm việc đang bẩn hay bị khóa"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:930 builtin/worktree.c:1054
#, c-format
msgid "'%s' is a main working tree"
msgstr "“%s” là cây làm việc chính"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:935
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "không thể phác họa ra tên đích đến “%s”"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:948
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -23978,7 +24756,7 @@
"không thể di chuyển một cây-làm-việc bị khóa, khóa vì: %s\n"
"dùng “move -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:950
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -23986,38 +24764,38 @@
"không thể di chuyển một cây-làm-việc bị khóa;\n"
"dùng “move -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:953
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "thẩm tra gặp lỗi, không thể di chuyển một cây-làm-việc: %s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:958
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "gặp lỗi khi chuyển “%s” sang “%s”"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:1004
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "gặp lỗi khi chạy “git status” vào “%s”"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:1008
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"“%s” có chứa các tập tin đã bị sửa chữa hoặc chưa được theo dõi, hãy dùng --"
"force để xóa nó"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:1013
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "gặp lỗi khi chạy “git status” trong “%s”, mã %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:1036
msgid "force removal even if worktree is dirty or locked"
msgstr "ép buộc di chuyển thậm chí cả khi cây làm việc đang bẩn hay bị khóa"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:1059
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -24026,7 +24804,7 @@
"không thể xóa bỏ một cây-làm-việc bị khóa, khóa vì: %s\n"
"dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:1061
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -24034,17 +24812,17 @@
"không thể xóa bỏ một cây-làm-việc bị khóa;\n"
"dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:1064
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "thẩm tra gặp lỗi, không thể gỡ bỏ một cây-làm-việc: %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1088
#, c-format
msgid "repair: %s: %s"
msgstr "sửa chữa: %s: %s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1091
#, c-format
msgid "error: %s: %s"
msgstr "lỗi: %s: %s"
@@ -24097,21 +24875,16 @@
"để xem các đặc tả cho lệnh hay khái niệm cụ thể.\n"
"Xem “git help git” để biết tổng quan của hệ thống."
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "chưa chỉ ra thư mục cho --git-dir\n"
+msgid "no directory given for '%s' option\n"
+msgstr "không đưa ra thư mục cho tùy chọn '%s'\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "chưa đưa ra không gian làm việc cho --namespace\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "chưa đưa ra cây làm việc cho --work-tree\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
@@ -24127,11 +24900,6 @@
msgid "no config key given for --config-env\n"
msgstr "không đưa ra khóa cấu hình cho --config-env\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "chưa đưa ra thư mục cho -C\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
@@ -24161,30 +24929,30 @@
msgid "recursive alias: %s"
msgstr "đệ quy các bí danh: %s"
-#: git.c:476
+#: git.c:480
msgid "write failure on standard output"
msgstr "lỗi ghi nghiêm trong trên đầu ra tiêu chuẩn"
-#: git.c:478
+#: git.c:482
msgid "unknown write failure on standard output"
msgstr "lỗi nghiêm trọng chưa biết khi ghi ra đầu ra tiêu chuẩn"
-#: git.c:480
+#: git.c:484
msgid "close failed on standard output"
msgstr "gặp lỗi khi đóng đầu ra tiêu chuẩn"
-#: git.c:833
+#: git.c:838
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
"dò tìm thấy các bí danh quẩn tròn: biểu thức của “%s” không có điểm kết:%s"
-#: git.c:883
+#: git.c:888
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "không thể xử lý %s như là một phần bổ sung"
-#: git.c:896
+#: git.c:901
#, c-format
msgid ""
"usage: %s\n"
@@ -24193,33 +24961,25 @@
"cách dùng: %s\n"
"\n"
-#: git.c:916
+#: git.c:921
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "gặp lỗi khi khai triển bí danh “%s”; “%s” không phải là lệnh git\n"
-#: git.c:928
+#: git.c:933
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "gặp lỗi khi chạy lệnh “%s”: %s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr "tham số cho --packfile phải là một giá trị băm hợp lệ (nhận được “%s”)"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "không phải là kho git"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile cần --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args chỉ được dùng khi có --packfile"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "các tùy chọn được không xử lý"
@@ -24245,66 +25005,32 @@
msgid "exit immediately after advertising capabilities"
msgstr "thoát ngay sau khi khởi tạo quảng cáo capabilities"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "socket/pipe đã đang được sử dụng rồi: '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "không thể khởi động máy phục vụ lên: “%s”"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "không thể sinh ra daemon trong nền"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid gặp lỗi"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "\"daemon\" vẫn chưa trực tuyến"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "daemon gặp lỗi khi khởi động"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid là chưa rõ ràng"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "\"daemon\" vẫn chưa được tắt đi"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<tên>] [<các tùy chọn>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<tên>] [<các tiến trình>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
"test-helper simple-ipc start-daemon [<tên>] [<các tiến trình>] [<chờ tối đa>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<tên>] [<chờ tối đa>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<tên>] [<thẻ>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [<tên>] [<số lượng byte>] [<byte>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24312,87 +25038,83 @@
"test-helper simple-ipc multiple [<tên>] [<các tiến trình>] [<số lượng "
"byte>] [<cỡ bó>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "tên hoặc tên đường dẫn của ổ cắm miền unix"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "tên named-pipe"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "số lượng tiến trình trong kho tiến trình máy phục vụ"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "số giây mà dịch vụ chạy nền chờ khi khởi động hoặc dừng"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "số lượng byte"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "số lượng yêu cầu mỗi tiến trình"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "byte"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "ký tự ballast"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "thẻ bài"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "thẻ bài lệnh để gửi lên cho máy phục vụ"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "giá trị âm cho http.postbuffer; đặt thành mặc định là %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Điều khiển giao quyền không được hỗ trợ với cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE không được hỗ trợ với cURL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Các hạn chế giao thức không được hỗ trợ với cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
"Không hỗ trợ ứng dụng SSL chạy phía sau “%s”. Hỗ trợ ứng dụng SSL chạy phía "
"sau:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"Không thể đặt ứng dụng chạy SSL phía sau “%s”: cURL được biên dịch không có "
"sự hỗ trợ ứng dụng chạy phía sau SSL"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Không thể đặt ứng dụng chạy sau SSL cho “%s”: đã đặt rồi"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24403,140 +25125,327 @@
" hỏi cho: %s\n"
" chuyển hướng: %s"
-#: remote-curl.c:183
+#: remote-curl.c:184
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "sai trích dẫn trong giá trị push-option :“%s”"
-#: remote-curl.c:307
+#: remote-curl.c:308
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs không hợp lệ: đây có phải là một kho git?"
-#: remote-curl.c:408
+#: remote-curl.c:409
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"đáp ứng từ máy phục vụ không hợp lệ; cần dịch vụ, nhưng lại nhận được gói "
"flush"
-#: remote-curl.c:439
+#: remote-curl.c:440
#, c-format
msgid "invalid server response; got '%s'"
msgstr "trả về của máy phục vụ không hợp lệ; nhận được %s"
-#: remote-curl.c:499
+#: remote-curl.c:500
#, c-format
msgid "repository '%s' not found"
msgstr "không tìm thấy kho “%s”"
-#: remote-curl.c:503
+#: remote-curl.c:504
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Xác thực gặp lỗi cho “%s”"
-#: remote-curl.c:507
+#: remote-curl.c:508
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "không thể truy cập “%s” với cấu hình http.pinnedPubkey: %s"
+
+#: remote-curl.c:512
#, c-format
msgid "unable to access '%s': %s"
msgstr "không thể truy cập “%s”: %s"
-#: remote-curl.c:513
+#: remote-curl.c:518
#, c-format
msgid "redirecting to %s"
msgstr "chuyển hướng đến %s"
-#: remote-curl.c:644
+#: remote-curl.c:649
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "không nên có EOF khi không gentle trên EOF"
-#: remote-curl.c:656
+#: remote-curl.c:661
msgid "remote server sent unexpected response end packet"
msgstr "máy phục vụ gửi gói kết thúc không cần"
-#: remote-curl.c:726
+#: remote-curl.c:730
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "không thể tua lại dữ liệu post rpc - thử tăng http.postBuffer"
-#: remote-curl.c:756
+#: remote-curl.c:759
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: ký tự chiều dài dòng bị sai: %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:761
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: gặp đáp ứng là gói kết thúc bất ngờ"
-#: remote-curl.c:834
+#: remote-curl.c:837
#, c-format
msgid "RPC failed; %s"
msgstr "RPC gặp lỗi; %s"
-#: remote-curl.c:874
+#: remote-curl.c:877
msgid "cannot handle pushes this big"
msgstr "không thể xử lý đẩy cái lớn này"
-#: remote-curl.c:989
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "không thể giải nén yêu cầu; có lỗi khi giải nén của zlib %d"
-#: remote-curl.c:993
+#: remote-curl.c:994
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "không thể giải nén yêu cầu; có lỗi ở cuối %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1044
#, c-format
msgid "%d bytes of length header were received"
msgstr "đã nhận về phần đầu có chiều dài %d byte"
-#: remote-curl.c:1045
+#: remote-curl.c:1046
#, c-format
msgid "%d bytes of body are still expected"
msgstr "phần thân vẫn còn cần %d byte"
-#: remote-curl.c:1134
+#: remote-curl.c:1135
msgid "dumb http transport does not support shallow capabilities"
msgstr "đổ vận chuyển http không hỗ trợ khả năng nông"
-#: remote-curl.c:1149
+#: remote-curl.c:1150
msgid "fetch failed."
msgstr "lấy về gặp lỗi."
-#: remote-curl.c:1195
+#: remote-curl.c:1198
msgid "cannot fetch by sha1 over smart http"
msgstr "không thể lấy về bằng sha1 thông qua smart http"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1242 remote-curl.c:1248
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "lỗi giao thức: cần sha/ref, nhưng lại nhận được “%s”"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1260 remote-curl.c:1378
#, c-format
msgid "http transport does not support %s"
msgstr "vận chuyển http không hỗ trợ %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1296
msgid "git-http-push failed"
msgstr "git-http-push gặp lỗi"
-#: remote-curl.c:1481
+#: remote-curl.c:1485
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: usage: git remote-curl <máy chủ> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1517
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: gặp lỗi khi đọc luồng dữ liệu lệnh từ git"
-#: remote-curl.c:1520
+#: remote-curl.c:1524
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: đã cố gắng fetch mà không có kho nội bộ"
-#: remote-curl.c:1561
+#: remote-curl.c:1565
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: không hiểu lệnh “%s” từ git"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "cần một thư mục làm việc"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "không tìm thấy gốc enlistment"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
+#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "không thể chuyển đến '%s'"
+
+#: contrib/scalar/scalar.c:179
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "không thể đóng cấu hình %s=%s"
+
+#: contrib/scalar/scalar.c:197
+msgid "could not configure log.excludeDecoration"
+msgstr "không thể cấu hình log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:218
+msgid "Scalar enlistments require a worktree"
+msgstr "'Scalar enlistments' cần một cây làm việc"
+
+#: contrib/scalar/scalar.c:310
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "HEAD của máy chủ không phải một nhánh: '%.*s'"
+
+#: contrib/scalar/scalar.c:316
+msgid "failed to get default branch name from remote; using local default"
+msgstr "gặp lỗi khi lấy tên nhánh mặc định từ máy chủ; sử dụng mặc định nội bộ"
+
+#: contrib/scalar/scalar.c:329
+msgid "failed to get default branch name"
+msgstr "gặp lỗi khi lấy tên nhánh mặc định"
+
+#: contrib/scalar/scalar.c:340
+msgid "failed to unregister repository"
+msgstr "gặp lỗi khi hủy đăng ký kho chứa"
+
+#: contrib/scalar/scalar.c:355
+msgid "failed to delete enlistment directory"
+msgstr "gặp lỗi khi xóa thư mục dành được"
+
+#: contrib/scalar/scalar.c:375
+msgid "branch to checkout after clone"
+msgstr "nhánh để lấy ra sau khi nhân bản"
+
+#: contrib/scalar/scalar.c:377
+msgid "when cloning, create full working directory"
+msgstr "khi nhân bản, tạo đầy đủ thư mục làm việc"
+
+#: contrib/scalar/scalar.c:379
+msgid "only download metadata for the branch that will be checked out"
+msgstr "chỉ siêu dữ liệu tải về cho nhánh mà sẽ được lấy ra"
+
+#: contrib/scalar/scalar.c:384
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<các tùy chọn>] [--] <kho> [<t.mục>]"
+
+#: contrib/scalar/scalar.c:409
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "không thể suy diễn tên cây làm việc từ '%s'"
+
+#: contrib/scalar/scalar.c:418
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "thư mục '%s' đã sẵn có"
+
+#: contrib/scalar/scalar.c:445
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "gặp lỗi khi lấy nhánh mặc định cho '%s'"
+
+#: contrib/scalar/scalar.c:456
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "không thể cấu hình máy chủ trong '%s'"
+
+#: contrib/scalar/scalar.c:465
+#, c-format
+msgid "could not configure '%s'"
+msgstr "không thể cấu hình '%s'"
+
+#: contrib/scalar/scalar.c:468
+msgid "partial clone failed; attempting full clone"
+msgstr "nhân bản từng phần gặp lỗi; đang cố thử nhân bản đầy đủ"
+
+#: contrib/scalar/scalar.c:472
+msgid "could not configure for full clone"
+msgstr "không thể cấu hình cho nhân bản đầy đủ"
+
+#: contrib/scalar/scalar.c:504
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` không nhận các tham số"
+
+#: contrib/scalar/scalar.c:517
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enlistment>]"
+
+#: contrib/scalar/scalar.c:544
+msgid "reconfigure all registered enlistments"
+msgstr "cấu hình mọi enlistments đã đăng ký"
+
+#: contrib/scalar/scalar.c:548
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enlistment>]"
+
+#: contrib/scalar/scalar.c:566
+msgid "--all or <enlistment>, but not both"
+msgstr "--all hoặc <enlistment>, không thể là cả hai"
+
+#: contrib/scalar/scalar.c:581
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "kho git ra đi trong '%s'"
+
+#: contrib/scalar/scalar.c:621
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <task> [<enlistment>]\n"
+"Nhiệm vụ:\n"
+
+#: contrib/scalar/scalar.c:639
+#, c-format
+msgid "no such task: '%s'"
+msgstr "không có nhiệm vụ nào như thế: “%s”"
+
+#: contrib/scalar/scalar.c:689
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+#: contrib/scalar/scalar.c:736
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enlistment>"
+
+#: contrib/scalar/scalar.c:751
+msgid "refusing to delete current working directory"
+msgstr "từ chối gỡ bỏ thư mục làm việc hiện tại"
+
+#: contrib/scalar/scalar.c:766
+msgid "include Git version"
+msgstr "bao gồm phiên bản Git"
+
+#: contrib/scalar/scalar.c:768
+msgid "include Git's build options"
+msgstr "bao gồm các tùy chọn biên dịch của Git"
+
+#: contrib/scalar/scalar.c:772
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:813
+msgid "-C requires a <directory>"
+msgstr "-C cần một <thư_mục>"
+
+#: contrib/scalar/scalar.c:815
+#, c-format
+msgid "could not change to '%s'"
+msgstr "không thể chuyển sang “%s”"
+
+#: contrib/scalar/scalar.c:821
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c cần một tham số <key>=<value>"
+
+#: contrib/scalar/scalar.c:839
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C </thư/mục/>] [-c <khóa>=<giá trị>] <lệnh> [<các tùy chọn>]\n"
+"\n"
+"Các lệnh:\n"
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr "hiện không có thông tin về trình biên dịch\n"
@@ -24545,54 +25454,54 @@
msgid "no libc information available\n"
msgstr "không có thông tin về libc\n"
-#: list-objects-filter-options.h:94
+#: list-objects-filter-options.h:126
msgid "args"
msgstr "các_tham_số"
-#: list-objects-filter-options.h:95
+#: list-objects-filter-options.h:127
msgid "object filtering"
msgstr "lọc đối tượng"
-#: parse-options.h:184
+#: parse-options.h:188
msgid "expiry-date"
msgstr "ngày hết hạn"
-#: parse-options.h:198
+#: parse-options.h:202
msgid "no-op (backward compatibility)"
msgstr "no-op (tương thích ngược)"
-#: parse-options.h:310
+#: parse-options.h:341
msgid "be more verbose"
msgstr "chi tiết hơn nữa"
-#: parse-options.h:312
+#: parse-options.h:343
msgid "be more quiet"
msgstr "im lặng hơn nữa"
-#: parse-options.h:318
+#: parse-options.h:349
msgid "use <n> digits to display object names"
msgstr "sử dụng <n> chữ số để hiển thị tên đối tượng"
-#: parse-options.h:337
+#: parse-options.h:368
msgid "how to strip spaces and #comments from message"
msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn"
-#: parse-options.h:338
+#: parse-options.h:369
msgid "read pathspec from file"
msgstr "đọc đặc tả đường dẫn từ tập tin"
-#: parse-options.h:339
+#: parse-options.h:370
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"với --pathspec-from-file, các phần tử đặc tả đường dẫn bị ngăn cách bởi ký "
"tự NULL"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "key"
msgstr "khóa"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "tên trường cần sắp xếp"
@@ -24664,17 +25573,17 @@
msgstr "Hiển thị tên và địa chỉ thư điện tử của các liên hệ dạng chuẩn hóa"
#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Đảm bảo rằng một tên tham chiếu ở dạng thức tốt"
+
+#: command-list.h:66
msgid "Switch branches or restore working tree files"
msgstr "Chuyển các nhánh hoặc phục hồi lại các tập tin cây làm việc"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "Sao chép các tập tin từ mục lục ra cây làm việc"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Đảm bảo rằng một tên tham chiếu ở dạng thức tốt"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "Tìm những lần chuyển giao còn chưa được áp dụng lên thượng nguồn"
@@ -24845,42 +25754,42 @@
msgstr "Hiển thị thông tin trợ giúp về Git"
#: command-list.h:108
+msgid "Run git hooks"
+msgstr "Chạy các móc git"
+
+#: command-list.h:109
msgid "Server side implementation of Git over HTTP"
msgstr "Thi hành phía máy chủ của Git qua HTTP"
-#: command-list.h:109
+#: command-list.h:110
msgid "Download from a remote Git repository via HTTP"
msgstr "Tải về từ một kho chứa Git trên mạng thông qua HTTP"
-#: command-list.h:110
+#: command-list.h:111
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Đẩy các đối tượng lên thông qua HTTP/DAV đến kho chứa khác"
-#: command-list.h:111
+#: command-list.h:112
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
"Gửi một bộ sưu tập các miếng vá từ đầu vào tiêu chuẩn đến một thư mục IMAP"
-#: command-list.h:112
+#: command-list.h:113
msgid "Build pack index file for an existing packed archive"
msgstr "Xây dựng tập tin mục lục gói cho một kho nén đã đóng gói sẵn có"
-#: command-list.h:113
+#: command-list.h:114
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Tạo một kho git mới hay khởi tạo lại một kho đã tồn tại từ trước"
-#: command-list.h:114
+#: command-list.h:115
msgid "Instantly browse your working repository in gitweb"
msgstr "Duyệt ngay kho làm việc của bạn trong gitweb"
-#: command-list.h:115
+#: command-list.h:116
msgid "Add or parse structured information in commit messages"
msgstr "Thêm hay phân tích thông tin cấu trúc trong ghi chú lần chuyển giao"
-#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Bộ duyện kho Git"
-
#: command-list.h:117
msgid "Show commit logs"
msgstr "Hiển thị nhật ký các lần chuyển giao"
@@ -24930,27 +25839,27 @@
msgstr "Một chương trình hỗ trợ tiêu chuẩn dùng với git-merge-index"
#: command-list.h:129
+msgid "Show three-way merge without touching index"
+msgstr "Hiển thị hòa trộn ba-đường mà không đụng chạm đến mục lục"
+
+#: command-list.h:130
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
"Chạy công cụ phân giải xung đột hòa trộn để mà giải quyết các xung đột hòa "
"trộn"
-#: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "Hiển thị hòa trộn ba-đường mà không đụng chạm đến mục lục"
-
#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Ghi và thẩm tra các multi-pack-indexes"
-
-#: command-list.h:132
msgid "Creates a tag object with extra validation"
msgstr "Tạo một đối tượng thẻ với kiểm tra mở rộng"
-#: command-list.h:133
+#: command-list.h:132
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Xây dựng một tree-object từ văn bản định dạng ls-tree"
+#: command-list.h:133
+msgid "Write and verify multi-pack-indexes"
+msgstr "Ghi và thẩm tra các multi-pack-indexes"
+
#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Di chuyển hay đổi tên một tập tin, thư mục hoặc liên kết mềm"
@@ -25053,17 +25962,17 @@
msgstr "Hoàn nguyên các tập tin cây làm việc"
#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Hoàn lại một số lần chuyển giao sẵn có"
-
-#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
msgstr "Liệt kê các đối tượng chuyển giao theo thứ tự tôpô đảo ngược"
-#: command-list.h:161
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "Cậy ra và xử lý các tham số"
+#: command-list.h:161
+msgid "Revert some existing commits"
+msgstr "Hoàn lại một số lần chuyển giao sẵn có"
+
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr "Gỡ bỏ các tập tin từ cây làm việc và từ bảng mục lục"
@@ -25077,49 +25986,51 @@
msgstr "Đẩy các đối tượng lên thông qua giao thức Git đến kho chứa khác"
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
-msgstr "Hệ vỏ đăng nhập có hạn chế cho truy cập SSH chỉ-Git"
-
-#: command-list.h:166
-msgid "Summarize 'git log' output"
-msgstr "Kết xuất “git log” dạng tóm tắt"
-
-#: command-list.h:167
-msgid "Show various types of objects"
-msgstr "Hiển thị các kiểu khác nhau của các đối tượng"
-
-#: command-list.h:168
-msgid "Show branches and their commits"
-msgstr "Hiển thị những nhánh và các lần chuyển giao của chúng"
-
-#: command-list.h:169
-msgid "Show packed archive index"
-msgstr "Hiển thị các muc lục kho nén đã đóng gói"
-
-#: command-list.h:170
-msgid "List references in a local repository"
-msgstr "Liệt kê các tham chiếu trong một kho nội bộ"
-
-#: command-list.h:171
msgid "Git's i18n setup code for shell scripts"
msgstr "Nã cài đặt quốc tế hóa của Git cho văn lệnh hệ vỏ"
-#: command-list.h:172
+#: command-list.h:166
msgid "Common Git shell script setup code"
msgstr "Mã cài đặt văn lệnh hệ vỏ Git chung"
+#: command-list.h:167
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Hệ vỏ đăng nhập có hạn chế cho truy cập SSH chỉ-Git"
+
+#: command-list.h:168
+msgid "Summarize 'git log' output"
+msgstr "Kết xuất “git log” dạng tóm tắt"
+
+#: command-list.h:169
+msgid "Show various types of objects"
+msgstr "Hiển thị các kiểu khác nhau của các đối tượng"
+
+#: command-list.h:170
+msgid "Show branches and their commits"
+msgstr "Hiển thị những nhánh và các lần chuyển giao của chúng"
+
+#: command-list.h:171
+msgid "Show packed archive index"
+msgstr "Hiển thị các muc lục kho nén đã đóng gói"
+
+#: command-list.h:172
+msgid "List references in a local repository"
+msgstr "Liệt kê các tham chiếu trong một kho nội bộ"
+
#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
-msgstr "Khởi tạo và sửa đổi sparse-checkout"
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr ""
+"Giảm lược cây làm việc của bạn thành tập hợp con của các tập tin được theo "
+"dõi"
#: command-list.h:174
-msgid "Stash the changes in a dirty working directory away"
-msgstr "Tạm cất đi các thay đổi trong một thư mục làm việc bẩn"
-
-#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Thêm nội dung tập tin vào vùng bệ phóng"
+#: command-list.h:175
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Tạm cất đi các thay đổi trong một thư mục làm việc bẩn"
+
#: command-list.h:176
msgid "Show the working tree status"
msgstr "Hiển thị trạng thái cây làm việc"
@@ -25193,65 +26104,65 @@
msgstr "Kiểm tra chữ ký GPG của các thẻ"
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Giao diện Git trên nền web (ứng dụng web chạy trên kho Git)"
-
-#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "Hiển thị các nhật ký với từng lần chuyển giao khác nhau đưa ra"
-#: command-list.h:196
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "Quản lý nhiều cây làm việc"
-#: command-list.h:197
+#: command-list.h:196
msgid "Create a tree object from the current index"
msgstr "Tạo một đối tượng cây từ đầu vào tiêu chuẩn stdin hiện tại"
-#: command-list.h:198
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "Định nghĩa các thuộc tính cho mỗi đường dẫn"
-#: command-list.h:199
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Giao diện dòng lệnh Git và quy ước"
-#: command-list.h:200
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "Hướng dẫn Git cơ bản cho nhà phát triển"
-#: command-list.h:201
+#: command-list.h:200
msgid "Providing usernames and passwords to Git"
msgstr "Cung cấp tài khoản và mật khẩu cho Git"
-#: command-list.h:202
+#: command-list.h:201
msgid "Git for CVS users"
msgstr "Git dành cho những người dùng CVS"
-#: command-list.h:203
+#: command-list.h:202
msgid "Tweaking diff output"
msgstr "Chỉnh kết xuất diff"
-#: command-list.h:204
+#: command-list.h:203
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Một tập hợp lệnh hữu dụng tối thiểu để dùng Git hàng ngày"
-#: command-list.h:205
+#: command-list.h:204
msgid "Frequently asked questions about using Git"
msgstr "Các câu hỏi thường gặp về cách sử dụng Git"
-#: command-list.h:206
+#: command-list.h:205
msgid "A Git Glossary"
msgstr "Thuật ngữ chuyên môn Git"
-#: command-list.h:207
+#: command-list.h:206
msgid "Hooks used by Git"
msgstr "Các móc được sử dụng bởi Git"
-#: command-list.h:208
+#: command-list.h:207
msgid "Specifies intentionally untracked files to ignore"
msgstr "Chỉ định các tập tin không cần theo dõi"
+#: command-list.h:208
+msgid "The Git repository browser"
+msgstr "Bộ duyện kho Git"
+
#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
msgstr "Ánh xạ tên tác giả/người chuyển giao và/hoặc địa chỉ E-Mail"
@@ -25281,52 +26192,21 @@
msgstr "Gắn một kho chứa vào trong một cái khác"
#: command-list.h:216
-msgid "A tutorial introduction to Git: part two"
-msgstr "Hướng dẫn cách dùng Git: phần hai"
-
-#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "Hướng dẫn cách dùng Git"
+#: command-list.h:217
+msgid "A tutorial introduction to Git: part two"
+msgstr "Hướng dẫn cách dùng Git: phần hai"
+
#: command-list.h:218
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Giao diện Git trên nền web (ứng dụng web chạy trên kho Git)"
+
+#: command-list.h:219
msgid "An overview of recommended workflows with Git"
msgstr "Tổng quan về luồng công việc khuyến nghị nên dùng với Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "bisect chạy gặp lỗi: không đưa ra lệnh."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "đang chạy lệnh $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"chạy bisect gặp lỗi:\n"
-"mã trả về $res từ lệnh “$command” là < 0 hoặc >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "bisect không thể tiếp tục thêm được nữa"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"chạy bisect gặp lỗi:\n"
-"”bisect-state $state” đã thoát ra với mã lỗi $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "bisect chạy thành công"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25367,525 +26247,51 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Hòa trộn đơn giản không làm việc, thử hòa trộn tự động."
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"Đường dẫn tương đối chỉ có thể dùng từ thư mục ở mức cao nhất của cây làm "
-"việc"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-"repo URL: “$repo” phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr ""
-"”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi và không phải là một mô-đun-"
-"con"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "“$sm_path” không có lần chuyển giao nào được lấy ra"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Gặp lỗi khi thêm mô-đun-con “$sm_path”"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path”"
-
-#: git-submodule.sh:532
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr ""
-"Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con "
-"“$displaypath”"
-
-#: git-submodule.sh:542
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$sm_path”"
-
-#: git-submodule.sh:547
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr ""
-"Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong "
-"đường dẫn mô-đun-con “$sm_path”"
-
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”; thử lấy về trực "
-"tiếp $sha1:"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Đã lấy về từ đường dẫn mô-đun con “$displaypath”, nhưng nó không chứa $sha1. "
-"Lấy về theo định hướng của lần chuyển giao đó gặp lỗi."
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Không thể lấy ra “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”"
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Không thể cải tổ “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Đường dẫn mô-đun-con “$displaypath”: được rebase vào trong “$sha1”"
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Đường dẫn mô-đun-con “$displaypath”: được hòa trộn vào “$sha1”"
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Thực hiện không thành công lệnh “$command $sha1” trong đường dẫn mô-đun-con "
-"“$displaypath”"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”"
-
-#: git-submodule.sh:627
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”"
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Đã áp dụng autostash."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Không thể lưu $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"Áp dụng autostash có hiệu quả trong các xung đột.\n"
-"Các thay đổi của bạn an toàn trong stash (tạm cất đi).\n"
-"Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
-"nào.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Đang rebase ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Các lệnh:\n"
-"p, pick <commit> = dùng lần chuyển giao\n"
-"r, reword <commit> = dùng lần chuyển giao, nhưng sửa lại phần chú thích\n"
-"e, edit <commit> = dùng lần chuyển giao, nhưng dừng lại để tu bổ (amend)\n"
-"s, squash <commit> = dùng lần chuyển giao, nhưng meld vào lần chuyển giao kế "
-"trước\n"
-"f, fixup <commit> = giống như \"squash\", nhưng loại bỏ chú thích của lần "
-"chuyển giao này\n"
-"x, exec <commit> = chạy lệnh (phần còn lại của dòng) dùng hệ vỏ\n"
-"d, drop <commit> = xóa lần chuyển giao\n"
-"l, label <label> = đánh nhãn HEAD hiện tại bằng một tên\n"
-"t, reset <label> = đặt lại HEAD thành một nhãn\n"
-"m, merge [-C <commit> | -c <commit>] <nhãn> [# <một_dòng>]\n"
-". tạo một lần chuyển giao hòa trộn sử dụng chú thích của lần chuyển\n"
-". giao hòa trộn gốc (hoặc một_dòng, nếu không chỉ định lần chuyển giao "
-"hòa\n"
-". trộn gốc). Dùng -c <commit> để reword chú thích của lần chuyển "
-"giao.\n"
-"\n"
-"Những dòng này có thể đảo ngược thứ tự; chúng chạy từ trên đỉnh xuống dưới "
-"đáy.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Bạn có thể tu bổ lần chuyển giao ngay bây giờ bằng:\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Một khi đã hài lòng với những thay đổi của mình, thì chạy:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: không phải là lần chuyển giao mà có thể lấy ra được"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Tên lần chuyển giao không hợp lệ: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Không thể ghi lại sha1 thay thế của lần chuyển giao"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Chuyển-tiếp-nhanh đến $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Không thể chuyển-tiếp-nhanh đến $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Không thể di chuyển HEAD đến $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Từ chối squash lần hòa trộn: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Gặp lỗi khi hoàn lại bước hòa trộn $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Không thể lấy ra $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Đây là chú thích cho lần chuyển giao thứ #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Chú thích cho lần chuyển giao thứ #${n} sẽ bị bỏ qua:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Đây là tổ hợp của $count lần chuyển giao."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Không thể $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Đây là tổ hợp của 2 lần chuyển giao."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Không thể áp dụng $sha1… $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Không thể tu bổ lần chuyển giao sau khi lấy ra $sha1… $rest thành công\n"
-"Việc này có thể là do một ghi chú cho lần chuyển giao là trống rỗng, hoặc "
-"móc pre-commit\n"
-"gặp lỗi. Nếu là móc pre-commit bị lỗi, Bạn có lẽ cần giải quyết trục trặc "
-"này\n"
-"trước khi bạn có thể làm việc lại với lần chuyển giao."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Bị dừng tại $sha1_abbrev… $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Không “$squash_style” thể mà không có lần chuyển giao kế trước"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Đang thực thi: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Thực thi gặp lỗi: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Bạn có thể sửa các trục trặc, và sau đó chạy lệnh “cải tổ”:\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Thực thi thành công: $rest\n"
-"nhưng còn các thay đổi trong mục lục và/hoặc cây làm việc\n"
-"Chuyển giao hay tạm cất các thay đổi này đi, rồi chạy\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Lệnh chưa biết: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Cài tổ và cập nhật $head_name một cách thành công."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Không thể xóa bỏ CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Bạn có các thay đổi so với trong bệ phóng trong\n"
-"thư mục làm việc của bạn. Nếu các thay đổi này là muốn\n"
-"squash vào lần chuyển giao kế trước, chạy:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Nếu chúng có ý là đi đến lần chuyển giao mới, thì chạy:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"Trong cả hai trường hợp, một khi bạn làm xong, tiếp tục bằng:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Lỗi khi cố tìm định danh của tác giả để tu bổ lần chuyển giao"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc.\n"
-"Vui lòng chuyển giao chúng và sau đó chạy lệnh “git rebase --continue” lần "
-"nữa."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Không thể thực thi trình biên soạn"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Không thể lấy ra $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Không HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Không thể tạo thư mục tạm thời $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Không thể đánh dấu là tương tác"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Không thể khởi tạo các lần chuyển giao ghi lại"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "cách dùng: $dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:182
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"Không thể chuyển thư mục (chdir) sang $cdup, thư mục ở mức cao nhất của cây "
"làm việc"
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:191 git-sh-setup.sh:198
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
"lỗi nghiêm trọng: $program_name không thể được dùng ngoaoif thư mục làm việc."
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:212
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Không thể ghi lại các nhánh: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:215
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "Không thể $action: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Không thể cải tổ: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:226
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Không thể $action: Mục lục của bạn có chứa các thay đổi chưa được chuyển "
"giao."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:228
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
"Thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:348
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Bạn cần chạy lệnh này từ thư mục ở mức cao nhất của cây làm việc."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:353
msgid "Unable to determine absolute path of git directory"
msgstr "Không thể dò tìm đường dẫn tuyệt đối của thư mục git"
@@ -25966,7 +26372,7 @@
msgid "failed to open hunk edit file for reading: %s"
msgstr "gặp lỗi khi mở tập tin khúc để đọc: %s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -25981,7 +26387,7 @@
"d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong tập "
"tin"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -25995,7 +26401,7 @@
"a - tạm cất khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại trong tập tin"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -26011,7 +26417,7 @@
"d - đừng đưa ra khỏi bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong "
"tập tin"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -26025,7 +26431,7 @@
"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -26039,7 +26445,7 @@
"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -26053,7 +26459,7 @@
"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -26067,7 +26473,7 @@
"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -26081,7 +26487,7 @@
"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -26103,88 +26509,88 @@
"e - sửa bằng tay khúc hiện hành\n"
"? - in trợ giúp\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "Các khúc đã chọn không được áp dụng vào bảng mục lục!\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "bỏ qua những thứ chưa hòa trộn: %s\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng thay đổi chế độ cho cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng việc xóa cho cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng việc thêm cho cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng khúc này vào cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "Không còn khúc nào để mà nhảy đến\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Số không hợp lệ: “%s”\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc.\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "Không còn khúc nào để mà tìm kiếm\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "Không thấy khúc nào khớp mẫu đã cho\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Không có khúc kế trước\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Không có khúc kế tiếp\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "Rất tiếc, không thể chia nhỏ khúc này\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Chi nhỏ thành %d khúc.\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "Rất tiếc, không thể sửa khúc này\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -26204,56 +26610,56 @@
"add untracked - thêm nội dung các các tập tin chưa theo dõi và tập hợp các "
"thay đổi đã đặt lên bệ phóng\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "thiếu --"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "không hiểu chế độ --patch: %s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "đối số không hợp lệ %s, cần --"
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "múi giờ nội bộ khác biệt với GMT bởi khoảng thời gian không-phút\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "khoảng bù thời gian nội bộ lớn hơn hoặc bằng 24 giờ\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
-msgstr "lỗi nghiêm trọng: lệnh '%s' chết với mã thoát %d"
+msgstr "lỗi nghiêm trọng: lệnh “%s” chết với mã thoát %d"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr "trình soạn thảo thoát không sạch sẽ, bãi bỏ mọi thứ"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "“%s” có chưa một phiên bản trung gian của thư bạn đã soạn.\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "“%s.final” chứa thư điện tử đã soạn thảo.\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases xung khắc với các tùy chọn khác\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26263,11 +26669,11 @@
"git-send-email được cấu hình với các tùy chọn sendemail.* - chú ý “e”.\n"
"Đặt sendemail.forbidSendmailVariables thành false để tắt kiểm tra này.\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Không thể chạy git format-patch ở ngoài một kho chứa\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -26275,37 +26681,37 @@
"“batch-size” và “relogin” phải được chỉ định cùng với nhau (thông qua dòng "
"lệnh hoặc tùy chọn cấu hình)\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Không hiểu trường --suppress-cc: “%s”\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Không hiểu cài đặt --confirm: “%s”\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "cảnh báo: bí danh sendmail với dấu trích dẫn không được hỗ trợ: %s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "cảnh báo: “:include:“ không được hỗ trợ: %s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "cảnh báo: chuyển hướng “/file“ hay “|pipe“ không được hỗ trợ: %s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "cảnh báo: dòng sendmail không nhận ra được: %s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -26320,12 +26726,12 @@
" * Nói \"./%s\" nếu ý bạn là một tập tin; hoặc\n"
" * Đưa ra tùy chọn --format-patch nếu ý bạn là chuẩn bị.\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Gặp lỗi khi mở thư mục “%s”: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
@@ -26335,17 +26741,17 @@
"Chưa chỉ định các tập tin miếng vá!\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "Không có dòng chủ đề trong %s?"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Gặp lỗi khi mở “%s” để ghi: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -26359,27 +26765,27 @@
"\n"
"Xóa nội dung phần thân nếu bạn không muốn gửi tóm tắt.\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Gặp lỗi khi mở “%s”: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Gặp lỗi khi mở %s.final: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "Thư tổng thể là trống rỗng, nên bỏ qua nó\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Bạn có chắc muốn dùng <%s> [y/N]? "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -26387,11 +26793,11 @@
"Các trường sau đây là 8bit, nhưng không khai báo một Content-Transfer-"
"Encoding.\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Bảng mã 8bit nào tôi nên khai báo [UTF-8]? "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -26404,20 +26810,20 @@
"có chủ đề ở dạng mẫu “*** SUBJECT HERE ***”. Dùng --force nếu bạn thực sự "
"muốn gửi.\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Tới người mà thư được gửi (nếu có)?"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "nghiêm trọng: bí danh “%s” được khai triển thành chính nó\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr "Message-ID được dùng như là In-Reply-To cho thư đầu tiên (nếu có)? "
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %s\n"
@@ -26425,16 +26831,16 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Làm gì với địa chỉ này? (thoát[q]|xóa[d]|sửa[e]): "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Đường dẫn CA “%s” không tồn tại"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -26461,130 +26867,130 @@
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Gửi thư này chứ? ([y]có|[n]không|[e]sửa|[q]thoát|[a]tất): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "Gửi thư này trả lời yêu cầu"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "Máy phục vụ SMTP chưa được định nghĩa một cách thích hợp."
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Máy chủ không hỗ trợ STARTTLS! %s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS gặp lỗi! %s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Không thể khởi tạo SMTP một cách đúng đắn. Kiểm tra cấu hình và dùng --smtp-"
"debug."
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "Gặp lỗi khi gửi %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Thử gửi %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "Gửi %s\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "Dry-OK. Nhật ký nói rằng:\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "OK. Nhật ký nói rằng:\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "Kết quả: "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "Kết quả: Tốt\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "không thể mở tập tin “%s”"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Thêm cc: %s từ dòng “%s”\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Đang thêm to: %s từ dòng “%s”\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Thêm cc: %s từ dòng “%s”\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Thêm cc: %s từ dòng “%s”\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Không thể thực thi “%s”"
-#: git-send-email.perl:1972
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Đang thêm %s: %s từ: “%s”\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) gặp lỗi khi đóng đường ống đến “%s”"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "không thể lấy gửi thư dạng 7 bít"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "bảng mã truyền không hợp lệ"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2100
#, perl-format
msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
+"fatal: %s: rejected by %s hook\n"
"%s\n"
"warning: no patches were sent\n"
msgstr ""
-"nghiêm trọng: %s: bị từ chối bởi móc sendemail-validate\n"
+"nghiêm trọng: %s: bị từ chối bởi móc %s\n"
"%s\n"
"cảnh báo: không có miếng vá nào được gửi đi\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "không thể mở %s: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2113
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -26593,1887 +26999,280 @@
"nghiêm trọng: %s: %d là dài hơn 998 ký tự\n"
"cảnh báo: không có miếng vá nào được gửi đi\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2131
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Bỏ qua %s với hậu tố sao lưu dự phòng “%s”.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2135
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
-#~ msgid "unable to write stateless separator packet"
-#~ msgstr "không thể ghi gói phân tách không trạng thái"
+#, perl-format
+#~ msgid "fatal: %s: rejected by %s hook\n"
+#~ msgstr "lỗi nghiêm trọng: %s: bị từ chối bởi móc %s\n"
-#~ msgid "git merge --abort"
-#~ msgstr "git merge --abort"
-
-#~ msgid "git merge --continue"
-#~ msgstr "git merge --continue"
-
-#~ msgid "git stash clear"
-#~ msgstr "git stash clear"
-
-#~ msgid "remote server sent stateless separator"
-#~ msgstr "máy phục vụ từ xa gửi các bộ ngăn cách không tình trạng"
-
-#~ msgid "--cached and --3way cannot be used together."
-#~ msgstr "--cached và --3way không thể dùng cùng nhau."
-
-#~ msgid "both"
-#~ msgstr "cả hai"
-
-#~ msgid "one"
-#~ msgstr "một"
+#~ msgid "git archive --list"
+#~ msgstr "git archive --list"
#, c-format
-#~ msgid "Already up to date!"
-#~ msgstr "Đã cập nhật rồi!"
+#~ msgid "unknown value for --diff-merges: %s"
+#~ msgstr "không hiểu giá trị cho --diff-merges: %s"
-#~ msgid "Already up to date. Yeeah!"
-#~ msgstr "Đã cập nhật rồi. Yeeah!"
+#, c-format
+#~ msgid "invalid value '%s' for lsrefs.unborn"
+#~ msgstr "giá trị “%s” không hợp lệ cho lsrefs.unborn"
-#~ msgid "--batch-size option is only for 'repack' subcommand"
-#~ msgstr "tùy chọn --batch-size chỉ cho lệnh con “repack”"
+#~ msgid "backend for `git stash -p`"
+#~ msgstr "ứng dụng chạy phía sau cho “git stash -p”"
-#~ msgid "Percentage by which creation is weighted"
-#~ msgstr "Tỷ lệ phần trăm cái tạo là weighted"
+#, c-format
+#~ msgid "Invalid value for --empty: %s"
+#~ msgstr "Giá trị cho --empty không hợp lệ: %s"
+
+#, c-format
+#~ msgid "Invalid value for --patch-format: %s"
+#~ msgstr "Giá trị không hợp lệ cho --patch-format: %s"
+
+#, c-format
+#~ msgid "Invalid value for --show-current-patch: %s"
+#~ msgstr "Giá trị không hợp lệ cho --show-current-patch: %s"
#~ msgid ""
-#~ "the rebase.useBuiltin support has been removed!\n"
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad "
+#~ "| --term-new]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad "
+#~ "| --term-new]"
+
+#~ msgid "git bisect--helper --bisect-next"
+#~ msgstr "git bisect--helper --bisect-next"
+
+#~ msgid "git bisect--helper --bisect-visualize"
+#~ msgstr "git bisect--helper --bisect-visualize"
+
+#, c-format
+#~ msgid "invalid color '%s' in color.blame.repeatedLines"
+#~ msgstr "màu không hợp lệ “%s” trong color.blame.repeatedLines"
+
+#~ msgid "invalid value for blame.coloring"
+#~ msgstr "màu không hợp lệ cho blame.coloring"
+
+#~ msgid ""
+#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e "
+#~ "| -p | <type> | --textconv | --filters) [--path=<path>] <object>"
+#~ msgstr ""
+#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e "
+#~ "| -p | <kiểu> | --textconv) | --filters) [--path=<đường/dẫn>] <đối_tượng>"
+
+#~ msgid "show object type"
+#~ msgstr "hiển thị kiểu đối tượng"
+
+#~ msgid "exit with zero when there's no error"
+#~ msgstr "thoát với 0 khi không có lỗi"
+
+#~ msgid "show info and content of objects fed from the standard input"
+#~ msgstr ""
+#~ "hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn"
+
+#~ msgid "show info about objects fed from the standard input"
+#~ msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn"
+
+#~ msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#~ msgstr ""
+#~ "theo liên kết mềm trong-cây (được dùng với --batch hay --batch-check)"
+
+#~ msgid "show all objects with --batch or --batch-check"
+#~ msgstr "hiển thị mọi đối tượng với --batch hay --batch-check"
+
+#~ msgid "do not order --batch-all-objects output"
+#~ msgstr "đừng sắp xếp đầu ra --batch-all-objects"
+
+#~ msgid "set up tracking mode (see git-pull(1))"
+#~ msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
+
+#~ msgid "Using both --reset-author and --author does not make sense"
+#~ msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý"
+
+#~ msgid "Options --squash and --fixup cannot be used together"
+#~ msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau"
+
+#~ msgid "Only one of -c/-C/-F/--fixup can be used."
+#~ msgstr "Chỉ được dùng một trong số tùy chọn trong số -c/-C/-F/--fixup."
+
+#~ msgid "Option -m cannot be combined with -c/-C/-F."
+#~ msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F."
+
+#~ msgid ""
+#~ "Only one of --include/--only/--all/--interactive/--patch can be used."
+#~ msgstr ""
+#~ "Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch "
+#~ "được sử dụng."
+
+#~ msgid "git count-objects [-v] [-H | --human-readable]"
+#~ msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#, c-format
+#~ msgid "configuration fetch.output contains invalid value %s"
+#~ msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s"
+
+#~ msgid "--cached or --untracked cannot be used with --no-index"
+#~ msgstr "--cached hay --untracked không được sử dụng với --no-index"
+
+#~ msgid "--untracked cannot be used with --cached"
+#~ msgstr "--untracked không thể được sử dụng với tùy chọn --cached"
+
+#~ msgid "git hash-object --stdin-paths"
+#~ msgstr "git hash-object --stdin-paths"
+
+#~ msgid "git help [-g|--guides]"
+#~ msgstr "git help [-g|--guides]"
+
+#~ msgid "git help [-c|--config]"
+#~ msgstr "git help [-c|--config]"
+
+#~ msgid "git mktag"
+#~ msgstr "git mktag"
+
+#~ msgid "git mktree [-z] [--missing] [--batch]"
+#~ msgstr "git mktree [-z] [--missing] [--batch]"
+
+#~ msgid "read from stdin"
+#~ msgstr "đọc từ đầu vào tiêu chuẩn"
+
+#~ msgid "git notes merge --commit [-v | -q]"
+#~ msgstr "git notes merge --commit [-v | -q]"
+
+#~ msgid "git notes merge --abort [-v | -q]"
+#~ msgstr "git notes merge --abort [-v | -q]"
+
+#~ msgid "git notes get-ref"
+#~ msgstr "git notes get-ref"
+
+#~ msgid "invalid value for --missing"
+#~ msgstr "giá trị cho --missing không hợp lệ"
+
+#~ msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#~ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#, c-format
+#~ msgid "Invalid value for %s: %s"
+#~ msgstr "Giá trị không hợp lệ %s: %s"
+
+#, c-format
+#~ msgid "Invalid value for pull.ff: %s"
+#~ msgstr "Giá trị không hợp lệ cho pull.ff: %s"
+
+#~ msgid "git rebase --continue | --abort | --skip | --edit-todo"
+#~ msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+
+#, c-format
+#~ msgid "'%s' is not a valid timestamp"
+#~ msgstr "“%s” không phải là dấu thời gian hợp lệ"
+
+#~ msgid "git reflog [ show | expire | delete | exists ]"
+#~ msgstr "git reflog [ show | expire | delete | exists ]"
+
+#~ msgid "git remote [-v | --verbose]"
+#~ msgstr "git remote [-v | --verbose]"
+
+#~ msgid "git replace [-f] --convert-graft-file"
+#~ msgstr "git replace [-f] --convert-graft-file"
+
+#, c-format
+#~ msgid ""
+#~ "\n"
+#~ "It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+#~ "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+#~ "to make this the default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Cần %.2f giây để kiểm đếm các thay đổi chưa đưa lên bệ phóng sau khi đặt "
+#~ "lại.\n"
+#~ "Bạn có thể sử dụng “--quiet” để tránh việc này. Đặt reset.quiet thành "
+#~ "true trong\n"
+#~ "cài đặt config nếu bạn muốn thực hiện nó như là mặc định.\n"
+
+#~ msgid "git sparse-checkout list"
+#~ msgstr "git sparse-checkout list"
+
+#~ msgid "unable to upgrade repository format to enable worktreeConfig"
+#~ msgstr ""
+#~ "không thể nâng cấp định dạng kho lưu trữ để kích hoạt worktreeConfig"
+
+#~ msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+#~ msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#~ msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+#~ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#~ msgid "git sparse-checkout disable"
+#~ msgstr "git sparse-checkout disable"
+
+#~ msgid ""
+#~ "the stash.useBuiltin support has been removed!\n"
#~ "See its entry in 'git help config' for details."
#~ msgstr ""
-#~ "việc hỗ trợ rebase.useBuiltin đã bị xóa!\n"
-#~ "Xem mục tin của nó trong “ git help config” để biết chi tiết."
+#~ "việc hỗ trợ stash.useBuiltin đã bị xóa!\n"
+#~ "Xem mục tin của nó trong “git help config” để biết chi tiết."
-#, perl-format
-#~ msgid "%s: patch contains a line longer than 998 characters"
-#~ msgstr "%s: miếng vá có chứa dòng dài hơn 998 ký tự"
+#~ msgid "git stripspace [-s | --strip-comments]"
+#~ msgstr "git stripspace [-s | --strip-comments]"
-#~ msgid "repository contains replace objects; skipping commit-graph"
+#~ msgid "git stripspace [-c | --comment-lines]"
+#~ msgstr "git stripspace [-c | --comment-lines]"
+
+#~ msgid "submodule--helper print-default-remote takes no arguments"
+#~ msgstr "submodule--helper print-default-remote takes không nhận tham số"
+
+#~ msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
#~ msgstr ""
-#~ "kho lưu trữ chứa các đối tượng thay thế; bỏ qua sơ đồ lần chuyển giao"
+#~ "git submodule--helper update-clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
+#~ msgid "suppress output for update by rebase or merge"
+#~ msgstr "chặn kết xuất cho cập nhật bởi cải tổ hoặc hòa trộn"
+
+#~ msgid "overrides update mode in case the repository is a fresh clone"
+#~ msgstr "ghi đè chế độ cập nhật trong trường hợp kho lưu trữ là bản sao mới"
+
+#~ msgid "depth for shallow fetch"
+#~ msgstr "chiều sâu lịch sử muốn lấy về"
+
+#~ msgid "sha1"
+#~ msgstr "sha1"
+
+#~ msgid "SHA1 expected by superproject"
+#~ msgstr "SHA1 là cần thiết cho superproject"
+
+#~ msgid "subsha1"
+#~ msgstr "subsha1"
+
+#~ msgid "SHA1 of submodule's HEAD"
+#~ msgstr "SHA1 của HEAD của mô-đun-con"
+
+#~ msgid "git submodule--helper run-update-procedure [<options>] <path>"
#~ msgstr ""
-#~ "kho lưu trữ chứa các mối ghép (đã lạc hậu); bỏ qua sơ đồ các lần chuyển "
-#~ "giao"
+#~ "git submodule--helper run-update-procedure [<các tùy chọn>] </đường/dẫn>"
-#~ msgid "repository is shallow; skipping commit-graph"
-#~ msgstr "kho nguồn là nông, nên bỏ qua commit-graph"
+#~ msgid "git submodule--helper config --check-writeable"
+#~ msgstr "git submodule--helper config --check-writeable"
-#, c-format
-#~ msgid "commit-graph improper chunk offset %08x%08x"
-#~ msgstr "bù mảnh đồ-thị-các-lần-chuyển-giao không đúng chỗ %08x%08x"
+#~ msgid "git update-server-info [--force]"
+#~ msgstr "git update-server-info [--force]"
-#, c-format
-#~ msgid "commit-graph chunk id %08x appears multiple times"
-#~ msgstr "mã mảnh đồ-thị-các-lần-chuyển-giao %08x xuất hiện nhiều lần"
-
-#~ msgid "invalid chunk offset (too large)"
-#~ msgstr "khoảng bù đoạn không hợp lệ (quá lớn)"
-
-#~ msgid "Writing chunks to multi-pack-index"
-#~ msgstr "Đang ghi các khúc vào multi-pack-index"
-
-#~ msgid "rev-list died"
-#~ msgstr "rev-list đã chết"
-
-#~ msgid ""
-#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
-#~ "<good_term> <bad_term>"
-#~ msgstr ""
-#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> <lúc_sai> "
-#~ "<lúc_đúng>"
-
-#~ msgid ""
-#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-#~ "<bad_term>"
-#~ msgstr ""
-#~ "git bisect--helper --bisect-check-and-set-terms <command> <lúc_sai> "
-#~ "<lúc_đúng>"
-
-#~ msgid "git bisect--helper --bisect-auto-next"
-#~ msgstr "git bisect--helper --bisect-auto-next"
-
-#~ msgid "write out the bisection state in BISECT_LOG"
-#~ msgstr "ghi ra tình trạng di chuyển nửa bước trong BISECT_LOG"
-
-#~ msgid "check and set terms in a bisection state"
-#~ msgstr "kiểm tra và đặt thời điểm trong di chuyển nửa bước"
-
-#~ msgid ""
-#~ "verify the next bisection state then checkout the next bisection commit"
-#~ msgstr ""
-#~ "xác nhận trạng thái phân đôi kế sau đó lấy ra lần chuyển giao phân đôi kế"
-
-#~ msgid "--bisect-write requires either 4 or 5 arguments"
-#~ msgstr "--bisect-write cần 4 hoặc 5 tham số"
-
-#~ msgid "--check-and-set-terms requires 3 arguments"
-#~ msgstr "--check-and-set-terms cần 3 tham số"
-
-#~ msgid "--bisect-auto-next requires 0 arguments"
-#~ msgstr "--bisect-auto-next cần 0 tham số"
-
-#~ msgid "Force progress reporting"
-#~ msgstr "Ép buộc báo cáo diễn biến công việc"
-
-#, c-format
-#~ msgid "Error deleting remote-tracking branch '%s'"
-#~ msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s”"
-
-#, c-format
-#~ msgid "Error deleting branch '%s'"
-#~ msgstr "Gặp lỗi khi xóa bỏ nhánh “%s”"
-
-#~ msgid "show parse tree for grep expression"
-#~ msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (tìm kiếm)"
-
-#~ msgid "too many parameters"
-#~ msgstr "quá nhiều đối số"
-
-#~ msgid "too few parameters"
-#~ msgstr "quá ít đối số"
-
-#~ msgid "Recurse into nested submodules"
-#~ msgstr "Đệ quy vào trong các mô-đun-con lồng nhau"
-
-#~ msgid "too many params"
-#~ msgstr "quá nhiều đối số"
+#~ msgid "Initialize and modify the sparse-checkout"
+#~ msgstr "Khởi tạo và sửa đổi sparse-checkout"
#, sh-format
-#~ msgid "Bad rev input: $arg"
-#~ msgstr "Đầu vào rev sai: $arg"
-
-#~ msgid "Counting distinct commits in commit graph"
-#~ msgstr "Đang đếm các lần chuyển giao khác nhau trong đồ thị lần chuyển giao"
-
-#, c-format
-#~ msgid "the commit graph format cannot write %d commits"
-#~ msgstr ""
-#~ "định dạng đồ họa các lần chuyển giao không thể ghi %d lần chuyển giao"
-
-#~ msgid "store only"
-#~ msgstr "chỉ lưu (không nén)"
-
-#~ msgid "compress faster"
-#~ msgstr "nén nhanh hơn"
-
-#~ msgid "compress better"
-#~ msgstr "nén nhỏ hơn"
-
-#~ msgid "unexpected duplicate commit id %s"
-#~ msgstr "gặp mã số tích lần chuyển giao bị trùng lặp “%s”"
-
-#~ msgid "error preparing packfile from multi-pack-index"
-#~ msgstr "lỗi chuẩn bị tập tin gói từ multi-pack-index"
-
-#~ msgid "%s: not a valid OID"
-#~ msgstr "%s không phải là một OID hợp lệ"
-
-#~ msgid "invalid committer '%s'"
-#~ msgstr "chuyển giao không hợp lệ “%s”"
-
-#~ msgid "invalid committer: %s"
-#~ msgstr "chuyển giao không hợp lệ: %s"
-
-#~ msgid "git bisect--helper --next-all"
-#~ msgstr "git bisect--helper --next-all"
-
-#~ msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-#~ msgstr "git bisect--helper --write-terms <bad_term> <good_term>"
-
-#~ msgid "git bisect--helper --bisect-autostart"
-#~ msgstr "git bisect--helper --bisect-autostart"
-
-#~ msgid "perform 'git bisect next'"
-#~ msgstr "thực hiện “git bisect next”"
-
-#~ msgid "write the terms to .git/BISECT_TERMS"
-#~ msgstr "ghi thời kỳ vào .git/BISECT_TERMS"
-
-#~ msgid "cleanup the bisection state"
-#~ msgstr "dọn dẹp tình trạng di chuyển nửa bước"
-
-#~ msgid "check for expected revs"
-#~ msgstr "kiểm tra cho điểm xem xét cần dùng"
-
-#~ msgid "start the bisection if it has not yet been started"
-#~ msgstr "chạy di chuyển phân đôi nếu nó vẫn chưa được khởi chạy"
-
-#~ msgid "--write-terms requires two arguments"
-#~ msgstr "--write-terms cần hai tham số"
-
-#~ msgid "--bisect-clean-state requires no arguments"
-#~ msgstr "--bisect-clean-state không nhận đối số"
-
-#~ msgid "--bisect-autostart does not accept arguments"
-#~ msgstr "--bisect-autostart không nhận đối số"
-
-#~ msgid "n,m"
-#~ msgstr "n,m"
-
-#~ msgid "Process line range n,m in file, counting from 1"
-#~ msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1"
-
-#~ msgid "name of output directory is too long"
-#~ msgstr "tên của thư mục kết xuất quá dài"
-
-#~ msgid "standard output, or directory, which one?"
-#~ msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?"
-
#~ msgid ""
-#~ "WARNING: Some packs in use have been renamed by\n"
-#~ "WARNING: prefixing old- to their name, in order to\n"
-#~ "WARNING: replace them with the new version of the\n"
-#~ "WARNING: file. But the operation failed, and the\n"
-#~ "WARNING: attempt to rename them back to their\n"
-#~ "WARNING: original names also failed.\n"
-#~ "WARNING: Please rename them in %s manually:\n"
+#~ "Unable to find current ${remote_name}/${branch} revision in submodule "
+#~ "path '$sm_path'"
#~ msgstr ""
-#~ "CẢNH BÁO: Một số gói đang dùng vừa được đổi tên bằng cách\n"
-#~ "CẢNH BÁO: đánh tiền tố old- vào tên của chúng, mục đích là\n"
-#~ "CẢNH BÁO: thay chúng bằng phiên bản mới của tập\n"
-#~ "CẢNH BÁO: tin. Nhưng thao tác lại gặp lỗi, và nỗ\n"
-#~ "CẢNH BÁO: lực để đổi ngược lại tên chúng cho đúng với tên\n"
-#~ "CẢNH BÁO: nguyên gốc của nó cũng gặp lỗi.\n"
-#~ "CẢNH BÁO: Vui lòng đổi tên chúng trong %s bằng tay:\n"
+#~ "Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} "
+#~ "trong đường dẫn mô-đun-con “$sm_path”"
-#~ msgid "failed to remove '%s'"
-#~ msgstr "gặp lỗi khi gỡ bỏ “%s”"
-
-#~ msgid "Routines to help parsing remote repository access parameters"
-#~ msgstr ""
-#~ "Các thủ tục để giúp phân tích các tham số truy cập kho chứa trên mạng"
-
-#~ msgid "Bad rev input: $bisected_head"
-#~ msgstr "Đầu vào rev sai: $bisected_head"
-
-#~ msgid "Bad rev input: $rev"
-#~ msgstr "Đầu vào rev sai: $rev"
-
-#~ msgid "See git-${cmd}(1) for details."
-#~ msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
-
-#~ msgid "unknown hash algorithm length"
-#~ msgstr "không hiểu chiều dài thuật toán băm dữ liệu"
-
-#~ msgid ""
-#~ "commit-graph chunk lookup table entry missing; file may be incomplete"
-#~ msgstr ""
-#~ "bảng tìm kiếm mảnh đồ-thị-các-lần-chuyển-giao còn thiếu; tập tin có thể "
-#~ "sẽ không hoàn thiện"
-
-#~ msgid "Writing changed paths Bloom filters index"
-#~ msgstr "Ghi dữ liệu các mục lục Bloom đường dẫn đã bị thay đổi"
-
-#~ msgid "hash version %u does not match"
-#~ msgstr "phiên bản băm “%u” không khớp"
-
-#~ msgid "Remote with no URL"
-#~ msgstr "Máy chủ không có địa chỉ URL"
-
-#~ msgid "%%(subject) does not take arguments"
-#~ msgstr "%%(subject) không nhận các đối số"
-
-#~ msgid "positive value expected objectname:short=%s"
-#~ msgstr "cần nội dung mang giá trị dương:shot=%s"
-
-#~ msgid "unrecognized %%(objectname) argument: %s"
-#~ msgstr "đối số không được thừa nhận %%(objectname): %s"
-
-#~ msgid "option `%s' is incompatible with --merged"
-#~ msgstr "tùy chọn “%s” là xung khắc với tùy chọn --merged"
-
-#~ msgid "option `%s' is incompatible with --no-merged"
-#~ msgstr "tùy chọn “%s” là xung khắc với tùy chọn --no-merged"
-
-#~ msgid "could not open '%s' for writing: %s"
-#~ msgstr "không thể mở “%s” để ghi: %s"
-
-#~ msgid "could not read ref '%s'"
-#~ msgstr "không thể đọc tham chiếu “%s”"
-
-#~ msgid "ref '%s' already exists"
-#~ msgstr "tham chiếu “%s” đã có từ trước rồi"
-
-#~ msgid "unexpected object ID when writing '%s'"
-#~ msgstr "không cần ID đối tượng khi ghi “%s”"
-
-#~ msgid "unexpected object ID when deleting '%s'"
-#~ msgstr "gặp ID đối tượng không cần khi xóa “%s”"
-
-#~ msgid "The hash algorithm %s is not supported in this build."
-#~ msgstr "Thuật toán băm %s không được hỗ trợ trong bản biên dịch này."
-
-#~ msgid "could not open the file BISECT_TERMS"
-#~ msgstr "không thể mở tập tin BISECT_TERMS"
-
-#~ msgid "update BISECT_HEAD instead of checking out the current commit"
-#~ msgstr ""
-#~ "cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao hiện "
-#~ "hành"
-
-#~ msgid "print only names (no SHA-1)"
-#~ msgstr "chỉ hiển thị tên (không SHA-1)"
-
-#~ msgid "passed to 'git am'"
-#~ msgstr "chuyển cho “git am”"
-
-#~ msgid "The --cached option cannot be used with the --files option"
-#~ msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files"
-
-#~ msgid " Warn: $display_name doesn't contain commit $sha1_src"
-#~ msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src"
-
-#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-#~ msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst"
-
-#~ msgid ""
-#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-#~ msgstr ""
-#~ " Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và "
-#~ "$sha1_dst"
-
-#~ msgid "Finding commits for commit graph from %d ref"
-#~ msgid_plural "Finding commits for commit graph from %d refs"
-#~ msgstr[0] ""
-#~ "Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao từ %d tham chiếu"
-
-#~ msgid "invalid commit object id: %s"
-#~ msgstr "mã số đối tượng lần chuyển giao không hợp lệ: %s"
-
-#~ msgid "Removing worktrees/%s: not a valid directory"
-#~ msgstr "Gỡ bỏ cây làm việc/%s: không phải là thư mục hợp lệ"
-
-#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-#~ msgstr "Gỡ bỏ cây làm việc/%s: không thể đọc tập tin gitdir (%s)"
-
-#~ msgid "Removing worktrees/%s: invalid gitdir file"
-#~ msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir không hợp lệ"
-
-#~ msgid "unable to re-add worktree '%s'"
-#~ msgstr "không thể thêm-lại cây “%s”"
-
-#~ msgid "target '%s' already exists"
-#~ msgstr "đích “%s” đã tồn tại rồi"
-
-#~ msgid ""
-#~ "Cannot update sparse checkout: the following entries are not up to date:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Không thể cập nhật checkout rải rác: các mục tin sau đây chưa cập nhật:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "The following working tree files would be overwritten by sparse checkout "
-#~ "update:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi cập "
-#~ "nhật checkout rải rác:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "The following working tree files would be removed by sparse checkout "
-#~ "update:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị xóa bỏ bởi cập "
-#~ "nhật checkout rải rác:\n"
-#~ "%s"
-
-#~ msgid "annotated tag %s has no embedded name"
-#~ msgstr "thẻ được chú giải %s không có tên nhúng"
-
-#~ msgid "automatically stash/stash pop before and after rebase"
-#~ msgstr "tự động stash/stash pop tước và sau tu bổ (rebase)"
-
-#~ msgid "--[no-]autostash option is only valid with --rebase."
-#~ msgstr "tùy chọn --[no-]autostash chỉ hợp lệ khi dùng với --rebase."
-
-#~ msgid "(DEPRECATED) keep empty commits"
-#~ msgstr "(CŨ) giữ lại các lần chuyển giao rỗng"
-
-#~ msgid "Could not read '%s'"
-#~ msgstr "Không thể đọc “%s”"
-
-#~ msgid "Cannot store %s"
-#~ msgstr "Không thể lưu “%s”"
-
-#~ msgid "set sparse-checkout patterns"
-#~ msgstr "đặt các mẫu sparse-checkout"
-
-#~ msgid "disable sparse-checkout"
-#~ msgstr "tắt sparse-checkout"
-
-#~ msgid "could not exec %s"
-#~ msgstr "không thể thực thi %s"
-
-#~ msgid "Cannot remove temporary index (can't happen)"
-#~ msgstr "Không thể gỡ bỏ bảng mục lục tạm thời (không thể xảy ra)"
-
-#~ msgid "Cannot update $ref_stash with $w_commit"
-#~ msgstr "Không thể cập nhật $ref_stash với $w_commit"
-
-#~ msgid "error: unknown option for 'stash push': $option"
-#~ msgstr "lỗi: không hiểu tùy chọn cho “stash push”: $option"
-
-#~ msgid "Saved working directory and index state $stash_msg"
-#~ msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục $stash_msg"
-
-#~ msgid "unknown option: $opt"
-#~ msgstr "không hiểu tùy chọn: $opt"
-
-#~ msgid "Too many revisions specified: $REV"
-#~ msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV"
-
-#~ msgid "$reference is not a valid reference"
-#~ msgstr "$reference không phải là tham chiếu hợp lệ"
-
-#~ msgid "'$args' is not a stash-like commit"
-#~ msgstr "“$args” không phải là lần chuyển giao kiểu-stash (cất đi)"
-
-#~ msgid "'$args' is not a stash reference"
-#~ msgstr "”$args” không phải tham chiếu đến stash"
-
-#~ msgid "unable to refresh index"
-#~ msgstr "không thể làm tươi mới bảng mục lục"
-
-#~ msgid "Cannot apply a stash in the middle of a merge"
-#~ msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn"
-
-#~ msgid "Conflicts in index. Try without --index."
-#~ msgstr ""
-#~ "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index."
-
-#~ msgid "Could not save index tree"
-#~ msgstr "Không thể ghi lại cây chỉ mục"
-
-#~ msgid "Could not restore untracked files from stash entry"
-#~ msgstr "Không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)"
-
-#~ msgid "Cannot unstage modified files"
-#~ msgstr "Không thể bỏ ra khỏi bệ phóng các tập tin đã được sửa chữa"
-
-#~ msgid "Dropped ${REV} ($s)"
-#~ msgstr "Đã xóa ${REV} ($s)"
-
-#~ msgid "${REV}: Could not drop stash entry"
-#~ msgstr "${REV}: Không thể xóa bỏ mục stash"
-
-#~ msgid "(To restore them type \"git stash apply\")"
-#~ msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")"
-
-#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
-#~ msgstr "Thay đổi chế độ bệ phóng [y,n,a,q,d%s,?]? "
-
-#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
-#~ msgstr "Xóa khỏi bệ phóng [y,n,a,q,d%s,?]? "
-
-#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
-#~ msgstr "Đưa lên bệ phóng khúc này [y,n,a,q,d%s,?]? "
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for staging.\n"
-#~ msgstr ""
-#~ "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
-#~ "được đánh dấu để chuyển lên bệ phóng.\n"
-
-#~ msgid ""
-#~ "y - stage this hunk\n"
-#~ "n - do not stage this hunk\n"
-#~ "q - quit; do not stage this hunk or any of the remaining ones\n"
-#~ "a - stage this and all the remaining hunks\n"
-#~ "d - do not stage this hunk nor any of the remaining hunks\n"
-#~ msgstr ""
-#~ "y - đưa lên bệ phóng khúc này\n"
-#~ "n - đừng đưa lên bệ phóng khúc này\n"
-#~ "q - thoát; đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn "
-#~ "lại\n"
-#~ "a - đưa lên bệ phóng khúc này và tất cả các khúc còn lại sau này\n"
-#~ "d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại\n"
-
-#~ msgid "could not copy '%s' to '%s'."
-#~ msgstr "không thể chép “%s” sang “%s”."
-
-#~ msgid "malformed ident line"
-#~ msgstr "dòng định danh không hợp lệ"
-
-#~ msgid "could not parse '%.*s'"
-#~ msgstr "không thể phân tích cú pháp “%.*s”"
-
-#~ msgid "could not checkout %s"
-#~ msgstr "không thể lấy ra %s"
-
-#~ msgid "filename in tree entry contains backslash: '%s'"
-#~ msgstr "tên tập tin trong mục tin cây có chứa ký tự gạch ngược: “%s”"
-
-#~ msgid "Use -f if you really want to add them.\n"
-#~ msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n"
-
-#~ msgid "Maybe you wanted to say 'git add .'?\n"
-#~ msgstr "Có lẽ ý bạn là “git add .” phải không?\n"
-
-#~ msgid "packfile is invalid: %s"
-#~ msgstr "tập tin gói không hợp lệ: %s"
-
-#~ msgid "unable to open packfile for reuse: %s"
-#~ msgstr "không thể mở tập tin gói để dùng lại: %s"
-
-#~ msgid "unable to seek in reused packfile"
-#~ msgstr "không thể di chuyển vị trí đọc trong tập tin gói dùng lại"
-
-#~ msgid "unable to read from reused packfile"
-#~ msgstr "không thể đọc từ tập tin gói dùng lại"
-
-#~ msgid "no HEAD?"
-#~ msgstr "không HEAD?"
-
-#~ msgid "preserve empty commits during rebase"
-#~ msgstr "ngăn cấm các lần chuyển giao trống rỗng trong suốt quá trình cải tổ"
-
-#~ msgid "cannot combine --use-bitmap-index with object filtering"
-#~ msgstr "không thể tổ hợp --use-bitmap-index với lọc đối tượng"
-
-#~ msgid ""
-#~ "The following path is ignored by one of your .gitignore files:\n"
-#~ "$sm_path\n"
-#~ "Use -f if you really want to add it."
-#~ msgstr ""
-#~ "Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin ."
-#~ "gitignore của bạn:\n"
-#~ "$sm_path\n"
-#~ "Sử dụng -f nếu bạn thực sự muốn thêm nó vào."
-
-#~ msgid "Use an experimental heuristic to improve diffs"
-#~ msgstr "Dùng một phỏng đoán thử nghiệm để tăng cường các diff"
-
-#~ msgid "git commit-graph [--object-dir <objdir>]"
-#~ msgstr "git commit-graph [--object-dir <objdir>]"
-
-#~ msgid "git commit-graph read [--object-dir <objdir>]"
-#~ msgstr "git commit-graph read [--object-dir <objdir>]"
-
-#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-#~ msgstr ""
-#~ "không hiểu giá trị core.untrackedCache “%s”; dùng giá trị mặc định “keep”"
-
-#~ msgid "cannot change partial clone promisor remote"
-#~ msgstr "không thể thay đổi nhân bản từng phần máy chủ promisor"
-
-#~ msgid "error building trees"
-#~ msgstr "gặp lỗi khi xây dựng cây"
-
-#~ msgid "invalid date format '%s' in '%s'"
-#~ msgstr "định dạng ngày tháng không hợp lệ “%s” trong “%s”"
-
-#~ msgid "writing root commit"
-#~ msgstr "ghi chuyển giao gốc"
-
-#~ msgid "staged changes in the following files may be lost: %s"
-#~ msgstr ""
-#~ "các thay đổi đã đưa lên bệ phóng trong các tập tin sau đây có thể bị mất: "
-#~ "%s"
-
-#~ msgid ""
-#~ "--filter can only be used with the remote configured in extensions."
-#~ "partialClone"
-#~ msgstr ""
-#~ "--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions."
-#~ "partialClone"
-
-#~ msgid "verify commit-msg hook"
-#~ msgstr "thẩm tra móc (hook) commit-msg"
-
-#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-#~ msgstr "không thể kết hợp “--rebase-merges” với “--strategy-option”"
-
-#~ msgid "invalid sparse value '%s'"
-#~ msgstr "giá trị sparse không hợp lệ “%s”"
-
-#~ msgid ""
-#~ "Fetch normally indicates which branches had a forced update, but that "
-#~ "check has been disabled."
-#~ msgstr ""
-#~ "Lấy về bình thường cho biết các các nhánh nào buộc phải cập nhật, nhưng "
-#~ "việc kiểm tra đã bị vô hiệu hóa."
-
-#~ msgid ""
-#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
-#~ msgstr ""
-#~ "hoặc chạy “git config fetch.showForcedUpdates false” để tránh kiểm tra "
-#~ "này.\n"
-
-#~ msgid ""
-#~ "log.mailmap is not set; its implicit value will change in an\n"
-#~ "upcoming release. To squelch this message and preserve current\n"
-#~ "behaviour, set the log.mailmap configuration value to false.\n"
-#~ "\n"
-#~ "To squelch this message and adopt the new behaviour now, set the\n"
-#~ "log.mailmap configuration value to true.\n"
-#~ "\n"
-#~ "See 'git help config' and search for 'log.mailmap' for further "
-#~ "information."
-#~ msgstr ""
-#~ "log.mailmap không được đặt; giá trị ngầm của nó sẽ thay đổi trong một\n"
-#~ "phát hành sắp tới. Để chấm dứt thông báo này và duy trì hành xử\n"
-#~ "hiện tại, đặt giá trị cấu hình log.mailmap thành false.\n"
-#~ "\n"
-#~ "Để làm chấm dứt thông báo này và áp cách hành xử mới, hãy đặt\n"
-#~ "giá trị cấu hình log.mailmap true.\n"
-#~ "\n"
-#~ "Xem “git help config “ và tìm kiếm “ log.mailmap “ để biết thêm thông tin."
-
-#~ msgid "Server supports multi_ack_detailed"
-#~ msgstr "Máy chủ hỗ trợ multi_ack_detailed"
-
-#~ msgid "Server supports no-done"
-#~ msgstr "Máy chủ hỗ trợ no-done"
-
-#~ msgid "Server supports multi_ack"
-#~ msgstr "Máy chủ hỗ trợ multi_ack"
-
-#~ msgid "Server supports side-band-64k"
-#~ msgstr "Máy chủ hỗ trợ side-band-64k"
-
-#~ msgid "Server supports side-band"
-#~ msgstr "Máy chủ hỗ trợ side-band"
-
-#~ msgid "Server supports allow-tip-sha1-in-want"
-#~ msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want"
-
-#~ msgid "Server supports allow-reachable-sha1-in-want"
-#~ msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want"
-
-#~ msgid "Server supports ofs-delta"
-#~ msgstr "Máy chủ hỗ trợ ofs-delta"
-
-#~ msgid "Checking out files"
-#~ msgstr "Đang lấy ra các tập tin"
-
-#~ msgid "cannot be interactive without stdin connected to a terminal."
-#~ msgstr ""
-#~ "không thể được tương tác mà không có stdin kết nối với một thiết bị cuối."
-
-#~ msgid "failed to stat %s\n"
-#~ msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n"
-
-#~ msgid ""
-#~ "If you wish to skip this commit, use:\n"
-#~ "\n"
-#~ " git reset\n"
-#~ "\n"
-#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-#~ "the remaining commits.\n"
-#~ msgstr ""
-#~ "Nếu bạn muốn bỏ qua lần chuyển giao này thì dùng:\n"
-#~ "\n"
-#~ " git reset\n"
-#~ "\n"
-#~ "Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n"
-#~ "những lần chuyển giao còn lại.\n"
-
-#~ msgid "unrecognized verb: %s"
-#~ msgstr "verb không được thừa nhận: %s"
-
-#~ msgid "option '%s' requires a value"
-#~ msgstr "tùy chọn “%s” yêu cầu một giá trị"
-
-#~ msgid "could not transform the todo list"
-#~ msgstr "không thể chuyển dạng danh sách cần làm"
-
-#~ msgid "default"
-#~ msgstr "mặc định"
-
-#~ msgid "Could not create directory '%s'"
-#~ msgstr "Không thể tạo thư mục “%s”"
-
-#~ msgid "allow rerere to update index with resolved conflict"
-#~ msgstr ""
-#~ "cho phép rerere cập nhật bảng mục lục với các xung đột đã được giải quyết"
-
-#~ msgid "could not open %s"
-#~ msgstr "không thể mở %s"
-
-#~ msgid "Could not move back to $head_name"
-#~ msgstr "Không thể quay trở lại $head_name"
-
-#~ msgid ""
-#~ "It seems that there is already a $state_dir_base directory, and\n"
-#~ "I wonder if you are in the middle of another rebase. If that is the\n"
-#~ "case, please try\n"
-#~ "\t$cmd_live_rebase\n"
-#~ "If that is not the case, please\n"
-#~ "\t$cmd_clear_stale_rebase\n"
-#~ "and run me again. I am stopping in case you still have something\n"
-#~ "valuable there."
-#~ msgstr ""
-#~ "Hình như là ở đây sẵn có một thư mục $state_dir_base, và\n"
-#~ "Tôi tự hỏi có phải bạn đang ở giữa một lệnh rebase khác. Nếu đúng là\n"
-#~ "như vậy, xin hãy thử\n"
-#~ "\t$cmd_live_rebase\n"
-#~ "Nếu không phải thế, hãy thử\n"
-#~ "\t$cmd_clear_stale_rebase\n"
-#~ "và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n"
-#~ "có một số thứ quý giá ở đây."
-
-#~ msgid ""
-#~ "fatal: cannot combine am options with either interactive or merge options"
-#~ msgstr ""
-#~ "lỗi nghiêm trọng: không thể tổ hợp các tùy chọn am với các tùy chọn tương "
-#~ "tác hay hòa trộn"
-
-#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
-#~ msgstr ""
-#~ "lỗi nghiêm trọng: không thể kết hợp “--signoff” với “--preserve-merges”"
-
-#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
-#~ msgstr ""
-#~ "lỗi nghiêm trọng: không thể kết hợp “--preserve-merges” với “--rebase-"
-#~ "merges”"
-
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
-#~ msgstr ""
-#~ "lỗi nghiêm trọng: không thể kết hợp “--rebase-merges” với “--strategy-"
-#~ "option”"
-
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
-#~ msgstr ""
-#~ "lỗi nghiêm trọng: không thể kết hợp “--rebase-merges” với “--strategy”"
-
-#~ msgid "invalid upstream '$upstream_name'"
-#~ msgstr "thượng nguồn không hợp lệ “$upstream_name”"
-
-#~ msgid "$onto_name: there are more than one merge bases"
-#~ msgstr "$onto_name: ở đây có nhiều hơn một nền móng hòa trộn"
-
-#~ msgid "$onto_name: there is no merge base"
-#~ msgstr "$onto_name: ở đây không có nền móng hòa trộn nào"
-
-#~ msgid "Does not point to a valid commit: $onto_name"
-#~ msgstr "Không chỉ đến một lần chuyển giao không hợp lệ: $onto_name"
-
-#~ msgid "fatal: no such branch/commit '$branch_name'"
-#~ msgstr "nghiêm trọng: không có nhánh như thế: “$branch_name”"
-
-#~ msgid "Created autostash: $stash_abbrev"
-#~ msgstr "Đã tạo autostash: $stash_abbrev"
-
-#~ msgid "Current branch $branch_name is up to date."
-#~ msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi."
-
-#~ msgid "Current branch $branch_name is up to date, rebase forced."
-#~ msgstr ""
-#~ "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc."
-
-#~ msgid "Changes to $onto:"
-#~ msgstr "Thay đổi thành $onto:"
-
-#~ msgid "Changes from $mb to $onto:"
-#~ msgstr "Thay đổi từ $mb thành $onto:"
-
-#~ msgid "Fast-forwarded $branch_name to $onto_name."
-#~ msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name."
-
-#~ msgid "First, rewinding head to replay your work on top of it..."
-#~ msgstr ""
-#~ "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…"
-
-#~ msgid "ignoring unknown color-moved-ws mode '%s'"
-#~ msgstr "bỏ qua chế độ color-moved-ws chưa biết “%s”"
-
-#~ msgid "only 'tree:0' is supported"
-#~ msgstr "chỉ “tree:0” là được hỗ trợ"
-
-#~ msgid "Renaming %s to %s and %s to %s instead"
-#~ msgstr "Đang đổi tên %s thành %s thay vì %s thành %s"
-
-#~ msgid "Adding merged %s"
-#~ msgstr "Thêm hòa trộn %s"
-
-#~ msgid "Internal error"
-#~ msgstr "Lỗi nội bộ"
-
-#~ msgid "mainline was specified but commit %s is not a merge."
-#~ msgstr ""
-#~ "luồng chính đã được chỉ ra nhưng lần chuyển giao %s không phải là một lần "
-#~ "hòa trộn."
-
-#~ msgid "unable to write sha1 filename %s"
-#~ msgstr "không thể ghi vào tên tập tin sha1 %s"
-
-#~ msgid "cannot read sha1_file for %s"
-#~ msgstr "không thể đọc sha1_file cho %s"
-
-#~ msgid ""
-#~ "error: cannot combine interactive options (--interactive, --exec, --"
-#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am "
-#~ "options (%s)"
-#~ msgstr ""
-#~ "lỗi: không thể tổ hợp các tùy chọn tương tác (--interactive, --exec, --"
-#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) với các "
-#~ "tùy chọn am (%s)"
-
-#~ msgid ""
-#~ "error: cannot combine merge options (--merge, --strategy, --strategy-"
-#~ "option) with am options (%s)"
-#~ msgstr ""
-#~ "lỗi: không thể kết hợp các tùy chọn hòa trộn (--merge, --strategy, --"
-#~ "strategy-option) với một tùy chọn am (%s)"
-
-#~ msgid "unrecognised option: '$arg'"
-#~ msgstr "không công nhận tùy chọn: “$arg”"
-
-#~ msgid "'$invalid' is not a valid commit"
-#~ msgstr "”$invalid” không phải là lần chuyển giao hợp lệ"
-
-#~ msgid "could not parse '%s' (looking for '%s')"
-#~ msgstr "không thể phân tích “%s” (đang tìm kiếm cho “%s”)"
-
-#~ msgid "deprecated synonym for --create-reflog"
-#~ msgstr "đồng nghĩa đã lạc hậu cho --create-reflog"
-
-#~ msgid "Can't stat %s"
-#~ msgstr "không thể lấy thông tin thống kê về “%s”"
-
-#~ msgid "abort rebase"
-#~ msgstr "bãi bỏ việc cải tổ"
-
-#~ msgid "make rebase script"
-#~ msgstr "tạo văn lệnh rebase"
-
-#~ msgid "cannot move a locked working tree"
-#~ msgstr "không thể di chuyển một cây-làm-việc bị khóa"
-
-#~ msgid "cannot remove a locked working tree"
-#~ msgstr "không thể gỡ bỏ một cây-làm-việc bị khóa"
-
-#~ msgid ""
-#~ "\n"
-#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
-#~ "\n"
-#~ "\t"
-#~ msgstr ""
-#~ "\n"
-#~ "\tTuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n"
-#~ "\n"
-#~ "\t"
-
-#~ msgid "could not parse '%s' (looking for '%s'"
-#~ msgstr "không thể phân tích “%s” (tìm kiếm cho “%s”"
-
-#~ msgid "push|fetch"
-#~ msgstr "push|fetch"
-
-#~ msgid "Dirty index: cannot merge (dirty: %s)"
-#~ msgstr "Bảng mục lục bẩn: không thể hòa trộn (bẩn: %s)"
-
-#~ msgid "(+/-)x"
-#~ msgstr "(+/-)x"
-
-#~ msgid "<command>"
-#~ msgstr "<lệnh>"
-
-#~ msgid "w[,i1[,i2]]"
-#~ msgstr "w[,i1[,i2]]"
-
-#~ msgid "Entering '$displaypath'"
-#~ msgstr "Đang vào “$displaypath”"
-
-#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
-#~ msgstr "Dừng lại tại “$displaypath”; script trả về trạng thái khác không."
-
-#~ msgid "Everyday Git With 20 Commands Or So"
-#~ msgstr "Mỗi ngày học 20 lệnh Git hay hơn"
-
-#~ msgid "Could not open '%s' for writing"
-#~ msgstr "Không thể mở “%s” để ghi"
-
-#~ msgid ""
-#~ "unexpected 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "không cần dòng thứ nhất của ghi chú squash:\n"
-#~ "\n"
-#~ "\t%.*s"
-
-#~ msgid ""
-#~ "invalid 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "dòng thứ nhất của ghi chú squash không hợp lệ:\n"
-#~ "\n"
-#~ "\t%.*s"
-
-#~ msgid "BUG: returned path string doesn't match cwd?"
-#~ msgstr "LỖI: trả về chuỗi đường dẫn không khớp cwd?"
-
-#~ msgid "Error in object"
-#~ msgstr "Lỗi trong đối tượng"
-
-#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
-#~ msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được EOF"
-
-#~ msgid "invalid filter-spec expression '%s'"
-#~ msgstr "biểu thức đặc tả bộ lọc “%s” không hợp lệ"
-
-#~ msgid "The copy of the patch that failed is found in: %s"
-#~ msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s"
-
-#~ msgid "pathspec and --all are incompatible"
-#~ msgstr "đặc tả đường dẫn và --all xung khắc nhau"
-
-#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-#~ msgstr ""
-#~ "Mô-đun-con “$name” ($url) được bỏ đăng ký cho đường dẫn “$displaypath”"
-
-#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-#~ msgstr "Các trường To/Cc/Bcc không được phiên dịch, chúng bị bỏ qua\n"
-
-#~ msgid ""
-#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
-#~ "please use . instead if you meant to match all paths"
-#~ msgstr ""
-#~ "chuỗi rỗng làm đặc tả đường dẫn không hợp lệ ở lần phát hành kế tiếp. Vui "
-#~ "lòng dùng . để thay thế nếu ý bạn là khớp mọi đường dẫn"
-
-#~ msgid "could not truncate '%s'"
-#~ msgstr "không thể cắt cụt “%s”"
-
-#~ msgid "could not close %s"
-#~ msgstr "không thể đóng %s"
-
-#~ msgid "Copied a misnamed branch '%s' away"
-#~ msgstr "Đã chép nhánh khuyết danh “%s” đi"
-
-#~ msgid "it does not make sense to create 'HEAD' manually"
-#~ msgstr "không hợp lý khi tạo “HEAD” thủ công"
-
-#~ msgid "Don't know how to clone %s"
-#~ msgstr "Không biết làm cách nào để nhân bản (clone) %s"
-
-#~ msgid "Don't know how to fetch from %s"
-#~ msgstr "Không biết làm cách nào để lấy về từ %s"
-
-#~ msgid "'$term' is not a valid term"
-#~ msgstr "“$term” không phải là thời kỳ hợp lệ"
-
-#~ msgid ""
-#~ "error: unknown option for 'stash save': $option\n"
-#~ " To provide a message, use git stash save -- '$option'"
-#~ msgstr ""
-#~ "lỗi: không hiểu tùy chọn cho “stash save”: $option\n"
-#~ " Để có thể dùng lời chú thích có chứa -- ở đầu,\n"
-#~ " dùng git stash save -- \"$option\""
-
-#~ msgid "Failed to recurse into submodule path '$sm_path'"
-#~ msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$sm_path”"
-
-#~ msgid "%%(trailers) does not take arguments"
-#~ msgstr "%%(trailers) không nhận các đối số"
-
-#~ msgid "submodule update strategy not supported for submodule '%s'"
-#~ msgstr ""
-#~ "chiến lược cập nhật mô-đun-con không được hỗ trợ cho mô-đun-con “%s”"
-
-#~ msgid "change upstream info"
-#~ msgstr "thay đổi thông tin thượng nguồn"
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wanted to make '%s' track '%s', do this:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nếu bạn muốn “%s” theo dõi “%s”, thực hiện lệnh sau:\n"
-#~ "\n"
-
-#~ msgid "basename"
-#~ msgstr "tên cơ sở"
-
-#~ msgid ""
-#~ "When you have resolved this problem, run \"git rebase --continue\".\n"
-#~ "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-#~ "To check out the original branch and stop rebasing, run \"git rebase --"
-#~ "abort\"."
-#~ msgstr ""
-#~ "Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"git rebase --continue"
-#~ "\".\n"
-#~ "Nếu bạn có ý định bỏ qua miếng vá, thay vào đó bạn chạy \"git rebase --"
-#~ "skip\".\n"
-#~ "Để phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy "
-#~ "\"git rebase --abort\"."
-
-#~ msgid ""
-#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Cảnh báo: SHA-1 bị thiếu hoặc không phải là một lần chuyển giao trong "
-#~ "dòng sau đây:\n"
-#~ " - $line"
-
-#~ msgid ""
-#~ "Warning: the command isn't recognized in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Cảnh báo: lệnh không nhận ra trong dòng sau đây:\n"
-#~ " - $line"
-
-#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
-#~ msgstr "Hoặc là bạn có thể bãi bỏ lần cải tổ với lệnh “git rebase --abort”."
-
-#~ msgid "%s, %"
-#~ msgid_plural "%s, %"
-#~ msgstr[0] "%s, %"
-
-#~ msgid "in %0.1f seconds automatically..."
-#~ msgstr "trong %0.1f giây một cách tự động…"
-
-#~ msgid "dup2(%d,%d) failed"
-#~ msgstr "dup2(%d,%d) gặp lỗi"
-
-#~ msgid "Initial commit on "
-#~ msgstr "Lần chuyển giao khởi tạo trên "
-
-#~ msgid "Patch is empty. Was it split wrong?"
-#~ msgstr "Miếng vá trống rỗng. Quá trình chia nhỏ miếng vá có lỗi?"
-
-#~ msgid ""
-#~ "You still have unmerged paths in your index.\n"
-#~ "Did you forget to use 'git add'?"
-#~ msgstr ""
-#~ "Bạn vẫn có những đường dẫn chưa được hòa trộn trong bảng mục lục của "
-#~ "mình.\n"
-#~ "Bạn đã quên sử dụng lệnh “git add” à?"
-
-#~ msgid ""
-#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
-#~ "Did you intend to checkout '%s' which can not be resolved as commit?"
-#~ msgstr ""
-#~ "Không thể cập nhật và chuyển thành nhánh “%s” cùng lúc\n"
-#~ "Bạn đã có ý định checkout “%s” cái mà không thể được phân giải như là lần "
-#~ "chuyển giao?"
-
-#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-#~ msgstr ""
-#~ "Những đường dẫn rõ ràng được chỉ ra không có tùy chọn -i cũng không -o; "
-#~ "coi là --only những đường dẫn"
-
-#~ msgid "default mode for recursion"
-#~ msgstr "chế độ mặc định cho đệ qui"
-
-#~ msgid "submodule--helper subcommand must be called with a subcommand"
-#~ msgstr "lệnh con submodule--helper phải được gọi với một lệnh con"
-
-#~ msgid "tag: tagging "
-#~ msgstr "thẻ: đang đánh thẻ"
-
-#~ msgid "commit object"
-#~ msgstr "đối tượng lần chuyển giao"
-
-#~ msgid "blob object"
-#~ msgstr "đối tượng blob"
-
-#~ msgid ""
-#~ "There is nothing to exclude from by :(exclude) patterns.\n"
-#~ "Perhaps you forgot to add either ':/' or '.' ?"
-#~ msgstr ""
-#~ "Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n"
-#~ "Có lẽ bạn đã quên thêm hoặc là “:/” hoặc là “.”?"
-
-#~ msgid "unrecognized format: %%(%s)"
-#~ msgstr "không nhận ra định dạng: %%(%s)"
-
-#~ msgid ":strip= requires a positive integer argument"
-#~ msgstr ":strip= cần một đối số nguyên dương"
-
-#~ msgid "ref '%s' does not have %ld components to :strip"
-#~ msgstr "tham chiếu “%s” không có %ld thành phần để mà :strip"
-
-#~ msgid "[%s: gone]"
-#~ msgstr "[%s: đã ra đi]"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "[%s: behind %d]"
-#~ msgstr "[%s: đứng sau %d]"
-
-#~ msgid "[%s: ahead %d]"
-#~ msgstr "[%s: phía trước %d]"
-
-#~ msgid "[%s: ahead %d, behind %d]"
-#~ msgstr "[%s: trước %d, sau %d]"
-
-#~ msgid " **** invalid ref ****"
-#~ msgstr " **** tham chiếu không hợp lệ ****"
-
-#~ msgid "insanely long object directory %.*s"
-#~ msgstr "thư mục đối tượng dài một cách điên rồ %.*s"
-
-#~ msgid "tag name too long: %.*s..."
-#~ msgstr "tên thẻ quá dài: %.*s…"
-
-#~ msgid "tag header too big."
-#~ msgstr "phần đầu thẻ quá lớn."
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for discarding"
-#~ msgstr ""
-#~ "Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
-#~ "được đánh dấu để loại bỏ"
-
-#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
-#~ msgstr ""
-#~ "Dùng một phỏng đoán dựa trên dòng trắng thử nghiệm để tăng cường các diff"
-
-#~ msgid "Clever... amending the last one with dirty index."
-#~ msgstr "Giỏi… “tu bổ” cái cuối với bảng mục lục bẩn."
-
-#~ msgid ""
-#~ "the following submodule (or one of its nested submodules)\n"
-#~ "uses a .git directory:"
-#~ msgid_plural ""
-#~ "the following submodules (or one of their nested submodules)\n"
-#~ "use a .git directory:"
-#~ msgstr[0] ""
-#~ "các mô-đun-con sau đây (hay một trong số mô-đun-con bên trong của nó)\n"
-#~ "dùng một thư mục .git:"
-
-#~ msgid ""
-#~ "\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "\n"
-#~ "(dùng /\"rm -rf/\" nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử "
-#~ "của chúng)"
-
-#~ msgid "Error wrapping up %s."
-#~ msgstr "Lỗi bao bọc %s."
-
-#~ msgid "Your local changes would be overwritten by cherry-pick."
-#~ msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh cherry-pick."
-
-#~ msgid "Cannot revert during another revert."
-#~ msgstr "Không thể hoàn nguyên trong khi có hoàn nguyên khác."
-
-#~ msgid "Cannot cherry-pick during another cherry-pick."
-#~ msgstr ""
-#~ "Không thể thực hiện việc cherry-pick trong khi khi đang cherry-pick khác."
-
-#~ msgid "Could not open %s"
-#~ msgstr "Không thể mở %s"
-
-#~ msgid "Could not format %s."
-#~ msgstr "Không thể định dạng “%s”."
-
-#~ msgid "You need to set your committer info first"
-#~ msgstr "Bạn cần đặt thông tin về người chuyển giao mã nguồn trước đã"
-
-#~ msgid "bad numeric config value '%s' for '%s': invalid unit"
-#~ msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s”: đơn vị sai"
-
-#~ msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
-#~ msgstr ""
-#~ "sai giá trị bằng số của cấu hình “%s” cho “%s” trong blob %s: đơn vị sai"
-
-#~ msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
-#~ msgstr ""
-#~ "sai giá trị bằng số của cấu hình “%s” cho “%s” trong tập tin %s: đơn vị "
-#~ "sai"
-
-#~ msgid ""
-#~ "bad numeric config value '%s' for '%s' in standard input: invalid unit"
-#~ msgstr ""
-#~ "sai giá trị bằng số của cấu hình “%s” cho “%s” trong đầu vào tiêu chuẩn: "
-#~ "đơn vị không hợp lệ"
-
-#~ msgid ""
-#~ "bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"
-#~ msgstr ""
-#~ "sai giá trị bằng số của cấu hình “%s” cho “%s” trong submodule-blob %s: "
-#~ "đơn vị không hợp lệ"
-
-#~ msgid ""
-#~ "bad numeric config value '%s' for '%s' in command line %s: invalid unit"
-#~ msgstr ""
-#~ "sai giá trị bằng số của cấu hình “%s” cho “%s” trong dòng lệnh %s: đơn vị "
-#~ "không hợp lệ"
-
-#~ msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"
-#~ msgstr ""
-#~ "sai giá trị bằng số của cấu hình “%s” cho “%s” trong %s: đơn vị không hợp "
-#~ "lệ"
-
-#~ msgid "This is the 3rd commit message:"
-#~ msgstr "Đây là chú thích cho lần chuyển giao thứ 3:"
-
-#~ msgid "This is the 4th commit message:"
-#~ msgstr "Đây là chú thích cho lần chuyển giao thứ 4:"
-
-#~ msgid "This is the 5th commit message:"
-#~ msgstr "Đây là chú thích cho lần chuyển giao thứ 5:"
-
-#~ msgid "This is the 6th commit message:"
-#~ msgstr "Đây là chú thích cho lần chuyển giao thứ 6:"
-
-#~ msgid "This is the 7th commit message:"
-#~ msgstr "Đây là chú thích cho lần chuyển giao thứ 7:"
-
-#~ msgid "This is the 8th commit message:"
-#~ msgstr "Đây là chú thích cho lần chuyển giao thứ 8:"
-
-#~ msgid "This is the 9th commit message:"
-#~ msgstr "Đây là chú thích cho lần chuyển giao thứ 9:"
-
-#~ msgid "This is the 10th commit message:"
-#~ msgstr "Đây là chú thích cho lần chuyển giao thứ 10:"
-
-#~ msgid "This is the ${n}th commit message:"
-#~ msgstr "Đây là chú thích cho lần chuyển giao thứ ${n}:"
-
-#~ msgid "This is the ${n}st commit message:"
-#~ msgstr "Đây là chú thích cho lần chuyển giao thứ ${n}:"
-
-#~ msgid "This is the ${n}nd commit message:"
-#~ msgstr "Đây là chú thích cho lần chuyển giao thứ ${n}:"
-
-#~ msgid "This is the ${n}rd commit message:"
-#~ msgstr "Đây là chú thích cho lần chuyển giao thứ ${n}:"
-
-#~ msgid "The 2nd commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 2 sẽ bị bỏ qua:"
-
-#~ msgid "The 3rd commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 3 sẽ bị bỏ qua:"
-
-#~ msgid "The 4th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 4 sẽ bị bỏ qua:"
-
-#~ msgid "The 5th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 5 sẽ bị bỏ qua:"
-
-#~ msgid "The 6th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 6 sẽ bị bỏ qua:"
-
-#~ msgid "The 7th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 7 sẽ bị bỏ qua:"
-
-#~ msgid "The 8th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 8 sẽ bị bỏ qua:"
-
-#~ msgid "The 9th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 9 sẽ bị bỏ qua:"
-
-#~ msgid "The 10th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 10 sẽ bị bỏ qua:"
-
-#~ msgid "The ${n}th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ ${n} sẽ bị bỏ qua:"
-
-#~ msgid "The ${n}st commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ ${n} sẽ bị bỏ qua:"
-
-#~ msgid "The ${n}nd commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ ${n} sẽ bị bỏ qua:"
-
-#~ msgid "The ${n}rd commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ ${n} sẽ bị bỏ qua:"
-
-#~ msgid "could not run gpg."
-#~ msgstr "không thể chạy gpg."
-
-#~ msgid "gpg did not accept the data"
-#~ msgstr "gpg đã không chấp nhận dữ liệu"
-
-#~ msgid "unsupported object type in the tree"
-#~ msgstr "kiểu đối tượng không được hỗ trợ trong cây (tree)"
-
-#~ msgid "Fatal merge failure, shouldn't happen."
-#~ msgstr "Việc hòa trộn hỏng nghiêm trọng, không nên để xảy ra."
-
-#~ msgid "Unprocessed path??? %s"
-#~ msgstr "Đường dẫn chưa được xử lý??? %s"
-
-#~ msgid "Cannot %s during a %s"
-#~ msgstr "Không thể %s trong khi %s"
-
-#~ msgid "Can't cherry-pick into empty head"
-#~ msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng"
-
-#~ msgid "could not open %s for writing"
-#~ msgstr "không thể mở %s để ghi"
-
-#~ msgid "bug: unhandled unmerged status %x"
-#~ msgstr "lỗi: không thể tiếp nhận trạng thái chưa hòa trộn %x"
-
-#~ msgid "bug: unhandled diff status %c"
-#~ msgstr "lỗi: không thể tiếp nhận trạng thái lệnh diff %c"
-
-#~ msgid "could not write branch description template"
-#~ msgstr "không thể ghi mẫu mô tả nhánh"
-
-#~ msgid "corrupt index file"
-#~ msgstr "tập tin ghi bảng mục lục bị hỏng"
-
-#~ msgid "detach the HEAD at named commit"
-#~ msgstr "rời bỏ HEAD tại lần chuyển giao danh nghĩa"
-
-#~ msgid "Checking connectivity... "
-#~ msgstr "Đang kiểm tra kết nối… "
-
-#~ msgid " (unable to update local ref)"
-#~ msgstr " (không thể cập nhật tham chiếu nội bộ)"
-
-#~ msgid "Initialized empty"
-#~ msgstr "Khởi tạo trống rỗng"
-
-#~ msgid " shared"
-#~ msgstr " đã chia sẻ"
-
-#~ msgid "Verify that the named commit has a valid GPG signature"
-#~ msgstr ""
-#~ "Thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
-
-#~ msgid "Writing SQUASH_MSG"
-#~ msgstr "Đang ghi SQUASH_MSG"
-
-#~ msgid "Finishing SQUASH_MSG"
-#~ msgstr "Hoàn thành SQUASH_MSG"
-
-#~ msgid " and with remote"
-#~ msgstr " và với máy chủ"
-
-#~ msgid "removing '%s' failed"
-#~ msgstr "gặp lỗi khi xóa bỏ “%s”"
-
-#~ msgid ""
-#~ "If you want to reuse this local git directory instead of cloning again "
-#~ "from"
-#~ msgstr "Nếu bạn muốn dùng lại thư mục git nội bộ này thay vì nhân bản từ nó"
-
-#~ msgid ""
-#~ "use the '--force' option. If the local git directory is not the correct "
-#~ "repo"
-#~ msgstr ""
-#~ "dùng tùy chọn “--force”. Nếu thư mục git nội bộ không phải là repo (kho) "
-#~ "đúng"
-
-#~ msgid ""
-#~ "or you are unsure what this means choose another name with the '--name' "
-#~ "option."
-#~ msgstr ""
-#~ "hay bạn không chắc chắn điều đó có nghĩa gì chọn tên khác với tùy chọn “--"
-#~ "name”."
-
-#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
-#~ msgstr "Cây làm việc mô-đun-con “$displaypath” có chứa thư mục .git"
-
-#~ msgid ""
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "(dùng “rm -rf” nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của "
-#~ "chúng)"
-
-#~ msgid "'%s': %s"
-#~ msgstr "“%s”: %s"
-
-#~ msgid " git branch -d %s\n"
-#~ msgstr " git branch -d %s\n"
-
-#~ msgid " git branch --set-upstream-to %s\n"
-#~ msgstr " git branch --set-upstream-to %s\n"
-
-#~ msgid "cannot open %s: %s\n"
-#~ msgstr "không thể mở %s: %s\n"
-
-#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-#~ msgstr ""
-#~ "Vui lòng đưa các thay đổi của bạn vào “.gitmodules” hay tạm cất chúng đi "
-#~ "để xử lý"
-
-#~ msgid "failed to remove: %s"
-#~ msgstr "gặp lỗi khi gỡ bỏ: %s"
-
-#~ msgid ""
-#~ "Submodule path '$displaypath' not initialized\n"
-#~ "Maybe you want to use 'update --init'?"
-#~ msgstr ""
-#~ "Đường dẫn mô-đun-con “$displaypath” chưa được khởi tạo.\n"
-#~ "Có lẽ bạn muốn sử dụng lệnh “update --init”?"
-
-#~ msgid "Forward-port local commits to the updated upstream head"
-#~ msgstr ""
-#~ "Chuyển tiếp những lần chuyển giao nội bộ tới head thượng nguồn đã cập nhật"
-
-#~ msgid "improper format entered align:%s"
-#~ msgstr "định dạng không đúng chỗ căn chỉnh:%s"
-
-#~ msgid ""
-#~ "push.default is unset; its implicit value has changed in\n"
-#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-#~ "and maintain the traditional behavior, use:\n"
-#~ "\n"
-#~ " git config --global push.default matching\n"
-#~ "\n"
-#~ "To squelch this message and adopt the new behavior now, use:\n"
-#~ "\n"
-#~ " git config --global push.default simple\n"
-#~ "\n"
-#~ "When push.default is set to 'matching', git will push local branches\n"
-#~ "to the remote branches that already exist with the same name.\n"
-#~ "\n"
-#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
-#~ "behavior, which only pushes the current branch to the corresponding\n"
-#~ "remote branch that 'git pull' uses to update the current branch.\n"
-#~ "\n"
-#~ "See 'git help config' and search for 'push.default' for further "
-#~ "information.\n"
-#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
-#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
-#~ msgstr ""
-#~ "biến push.default chưa được đặt; giá trị ngầm định của nó\n"
-#~ "đã được thay đổi trong Git 2.0 từ “matching” thành “simple”.\n"
-#~ "Để không hiển thị nhắc nhở này và duy trì cách xử lý cũ, hãy chạy lệnh:\n"
-#~ "\n"
-#~ " git config --global push.default matching\n"
-#~ "\n"
-#~ "Để không hiển thị nhắc nhở này và áp dụng cách ứng xử mới, hãy chạy "
-#~ "lệnh:\n"
-#~ "\n"
-#~ " git config --global push.default simple\n"
-#~ "\n"
-#~ "Khi push.default được đặt thành “matching”, git sẽ đẩy các nhánh nội bộ\n"
-#~ "lên các nhánh trên máy chủ, cái mà đã sẵn có và cùng tên.\n"
-#~ "\n"
-#~ "Trong 2.0, Git sẽ mặc định duy trì các ứng xử “simple”,\n"
-#~ "cái này chỉ đẩy những nhánh hiện hành lên các nhánh tương ứng\n"
-#~ "trên máy chủ cái mà lệnh “git pull” dùng để cập nhật nhánh hiện tại.\n"
-#~ "\n"
-#~ "Xem “git help config” và tìm đến “push.default” để có thêm thông tin.\n"
-#~ "(chế độ “simple” được bắt đầu sử dụng từ Git 1.7.11. Sử dụng chế độ tương "
-#~ "tự\n"
-#~ "“current” thay vì “simple” nếu bạn thỉnh thoảng phải sử dụng bản Git cũ)"
-
-#~ msgid "Could not append '%s'"
-#~ msgstr "Không thể nối thêm “%s”"
-
-#~ msgid "unable to look up current user in the passwd file: %s"
-#~ msgstr "không tìm thấy người dùng hiện tại trong tập tin passwd: %s"
-
-#~ msgid "no such user"
-#~ msgstr "không có người dùng như vậy"
-
-#~ msgid "Testing "
-#~ msgstr "Đang thử"
-
-#~ msgid "branch '%s' does not point at a commit"
-#~ msgstr "nhánh “%s” không chỉ đến một lần chuyển giao nào cả"
-
-#~ msgid "print only merged branches"
-#~ msgstr "chỉ hiển thị các nhánh đã hòa trộn"
-
-#~ msgid "--dissociate given, but there is no --reference"
-#~ msgstr "đã đưa ra --dissociate, nhưng ở đây lại không có --reference"
-
-#~ msgid "show usage"
-#~ msgstr "hiển thị cách dùng"
-
-#~ msgid "insanely long template name %s"
-#~ msgstr "tên mẫu dài một cách điên rồ %s"
-
-#~ msgid "insanely long symlink %s"
-#~ msgstr "liên kết mềm dài một cách điên rồ %s"
-
-#~ msgid "insanely long template path %s"
-#~ msgstr "đường dẫn mẫu “%s” dài một cách điên rồ"
-
-#~ msgid "unsupported sort specification '%s' in variable '%s'"
-#~ msgstr "không hỗ trợ đặc tả sắp xếp “%s” trong biến “%s”"
-
-#~ msgid "switch 'points-at' requires an object"
-#~ msgstr "chuyển đến “points-at” yêu cần một đối tượng"
-
-#~ msgid "--sort and -n are incompatible"
-#~ msgstr "--sort và -n xung khắc nhau"
-
-#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-#~ msgstr ""
-#~ "Gitdir “$a” là bộ phận của đường dẫn mô-đun-con “$b” hoặc \"vice versa\""
-
-#~ msgid "false|true|preserve"
-#~ msgstr "false|true|preserve"
-
-#~ msgid "BUG: reopen a lockfile that is still open"
-#~ msgstr "LỖI: mở lại tập tin khóa mà nó lại đang được mở"
-
-#~ msgid "BUG: reopen a lockfile that has been committed"
-#~ msgstr "LỖI: mở lại tập tin khóa mà nó đã được chuyển giao"
-
-#~ msgid "option %s does not accept negative form"
-#~ msgstr "tùy chọn %s không chấp nhận dạng thức âm"
-
-#~ msgid "-b and -B are mutually exclusive"
-#~ msgstr "-b và -B loại từ lẫn nhau."
-
-#~ msgid "Patch format $patch_format is not supported."
-#~ msgstr "Định dạng miếng vá $patch_format không được hỗ trợ."
-
-#~ msgid "Please make up your mind. --skip or --abort?"
-#~ msgstr "Xin hãy rõ ràng. --skip hay --abort?"
-
-#~ msgid ""
-#~ "Patch is empty. Was it split wrong?\n"
-#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
-#~ msgstr ""
-#~ "Miếng vá trống rỗng. Nó đã bị chia cắt sai phải không?\n"
-#~ "Nếu bạn thích bỏ qua miếng vá này, hãy chạy lệnh sau để thay thế "
-#~ "\"$cmdline --skip\".\n"
-#~ "Để phục hồi lại nhánh nguyên thủy và dừng vá lại hãy chạy lệnh \"$cmdline "
-#~ "--abort\"."
-
-#~ msgid "Patch does not have a valid e-mail address."
-#~ msgstr "Miếng vá không có địa chỉ thư điện tử hợp lệ."
-
-#~ msgid "Applying: $FIRSTLINE"
-#~ msgstr "Đang áp dụng (miếng vá): $FIRSTLINE"
-
-#~ msgid "Patch failed at $msgnum $FIRSTLINE"
-#~ msgstr "Gặp lỗi khi vá tại $msgnum $FIRSTLINE"
-
-#~ msgid ""
-#~ "Pull is not possible because you have unmerged files.\n"
-#~ "Please, 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 ""
-#~ "Pull là không thể được bởi vì bạn có những tập tin chưa được hòa trộn.\n"
-#~ "Xin hãy sửa chữa chúng trước, và sau đó sử dụng lệnh “git add/rm <tập-"
-#~ "tin>”\n"
-#~ "để phê chuẩn việc đánh dấu đây cần được giải quyết và tạo một lần chuyển "
-#~ "giao."
-
-#~ msgid "no branch specified"
-#~ msgstr "chưa chỉ ra tên của nhánh"
-
-#~ msgid "prune .git/worktrees"
-#~ msgstr "xén .git/worktrees"
-
-#~ msgid "The most commonly used git commands are:"
-#~ msgstr "Những lệnh git hay được dùng nhất là:"
-
-#~ msgid "No such branch: '%s'"
-#~ msgstr "Không có nhánh nào như thế: “%s”"
-
-#~ msgid "Could not create git link %s"
-#~ msgstr "Không thể tạo liên kết git “%s”"
-
-#~ msgid "Invalid gc.pruneexpire: '%s'"
-#~ msgstr "gc.pruneexpire không hợp lệ: “%s”"
-
-#~ msgid "(detached from %s)"
-#~ msgstr "(được tách rời từ %s)"
-
-#~ msgid "No existing author found with '%s'"
-#~ msgstr "Không tìm thấy tác giả có sẵn với “%s”"
-
-#~ msgid "search also in ignored files"
-#~ msgstr "tìm cả trong các tập tin đã bị lờ đi"
-
-#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
-#~ msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)"
-
-#~ msgid "no files added"
-#~ msgstr "chưa có tập tin nào được thêm vào"
-
-#~ msgid "slot"
-#~ msgstr "khe"
-
-#~ msgid "check"
-#~ msgstr "kiểm tra"
-
-#~ msgid "Failed to lock ref for update"
-#~ msgstr "Gặp lỗi khi khóa tham chiếu để cập nhật"
-
-#~ msgid "Failed to write ref"
-#~ msgstr "Gặp lỗi khi ghi tham chiếu"
-
-#~ msgid "commit has empty message"
-#~ msgstr "lần chuyển giao có ghi chú trống rỗng"
-
-#~ msgid "cannot lock HEAD ref"
-#~ msgstr "không thể khóa HEAD ref (tham chiếu)"
-
-#~ msgid "cannot update HEAD ref"
-#~ msgstr "không thể cập nhật ref (tham chiếu) HEAD"
-
-#~ msgid "Failed to chdir: %s"
-#~ msgstr "Gặp lỗi với lệnh chdir: %s"
-
-#~ msgid "%s: cannot lock the ref"
-#~ msgstr "%s: không thể khóa ref (tham chiếu)"
-
-#~ msgid "Failed to lock HEAD during fast_forward_to"
-#~ msgstr "Gặp lỗi khi khóa HEAD trong quá trình fast_forward_to"
-
-#~ msgid "key id"
-#~ msgstr "id của khóa"
-
-#~ msgid "Tracking not set up: name too long: %s"
-#~ msgstr "Việc theo dõi chưa được cài đặt: tên quá dài: %s"
-
-#~ msgid "bug"
-#~ msgstr "lỗi"
-
-#~ msgid ", behind "
-#~ msgstr ", đằng sau "
-
-#~ msgid "could not find .gitmodules in index"
-#~ msgstr "không tìm thấy .gitmodules trong bảng mục lục"
-
-#~ msgid "reading updated .gitmodules failed"
-#~ msgstr "gặp lỗi khi đọc cập nhật .gitmodules"
-
-#~ msgid "unable to stat updated .gitmodules"
-#~ msgstr "không thể lấy thống kê .gitmodules đã cập nhật"
-
-#~ msgid "unable to remove .gitmodules from index"
-#~ msgstr "không thể gỡ bỏ .gitmodules từ mục lục"
-
-#~ msgid "adding updated .gitmodules failed"
-#~ msgstr "gặp lỗi khi thêm .gitmodules đã cập nhật"
-
-#~ msgid ""
-#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
-#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
-#~ "anymore.\n"
-#~ "To add content for the whole tree, run:\n"
-#~ "\n"
-#~ " git add %s :/\n"
-#~ " (or git add %s :/)\n"
-#~ "\n"
-#~ "To restrict the command to the current directory, run:\n"
-#~ "\n"
-#~ " git add %s .\n"
-#~ " (or git add %s .)\n"
-#~ "\n"
-#~ "With the current Git version, the command is restricted to the current "
-#~ "directory.\n"
-#~ msgstr ""
-#~ "Cách ứng xử của lệnh “git add %s (hay %s)” khi không có tham số đường dẫn "
-#~ "từ\n"
-#~ "thư-mục con của cây sẽ thay đổi kể từ Git 2.0 và không thể sử dụng như "
-#~ "thế nữa.\n"
-#~ "Để thêm nội dung cho toàn bộ cây, chạy:\n"
-#~ "\n"
-#~ " git add %s :/\n"
-#~ " (hoặc git add %s :/)\n"
-#~ "\n"
-#~ "Để hạn chế lệnh cho thư-mục hiện tại, chạy:\n"
-#~ "\n"
-#~ " git add %s .\n"
-#~ " (hoặc git add %s .)\n"
-#~ "\n"
-#~ "Với phiên bản hiện tại của Git, lệnh bị hạn chế cho thư-mục hiện tại.\n"
-
-#~ msgid ""
-#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
-#~ "whose behaviour will change in Git 2.0 with respect to paths you "
-#~ "removed.\n"
-#~ "Paths like '%s' that are\n"
-#~ "removed from your working tree are ignored with this version of Git.\n"
-#~ "\n"
-#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
-#~ " ignores paths you removed from your working tree.\n"
-#~ "\n"
-#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
-#~ "\n"
-#~ "Run 'git status' to check the paths you removed from your working tree.\n"
-#~ msgstr ""
-#~ "Bạn chạy “git add” mà không có “-A (--all)” cũng không “--ignore-"
-#~ "removal”,\n"
-#~ "cách ứng xử của nó sẽ thay đổi kể từ Git 2.0: nó quan tâm đến các đường "
-#~ "dẫn mà\n"
-#~ "bạn đã gỡ bỏ. Các đường dẫn như là “%s” cái mà\n"
-#~ "bị gỡ bỏ từ cây làm việc của bạn thì bị bỏ qua với phiên bản này của "
-#~ "Git.\n"
-#~ "\n"
-#~ "* “git add --ignore-removal <pathspec>”, cái hiện tại là mặc định,\n"
-#~ " bỏ qua các đường dẫn bạn đã gỡ bỏ từ cây làm việc của bạn.\n"
-#~ "\n"
-#~ "* “git add --all <pathspec>” sẽ đồng thời giúp bạn ghi lại việc dời đi.\n"
-#~ "\n"
-#~ "Chạy “git status” để kiểm tra các đường dẫn bạn đã gỡ bỏ từ cây làm việc "
-#~ "của bạn.\n"
-
-#~ msgid ""
-#~ "Auto packing the repository for optimum performance. You may also\n"
-#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
-#~ msgstr ""
-#~ "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n"
-#~ "chạy lệnh \"git gc\" một cách thủ công. Hãy xem \"git help gc\" để biết "
-#~ "thêm chi tiết.\n"
-
-#~ msgid ""
-#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
-#~ "counterpart. If you did not intend to push that branch, you may want to\n"
-#~ "specify branches to push or set the 'push.default' configuration "
-#~ "variable\n"
-#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
-#~ msgstr ""
-#~ "Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau "
-#~ "bộ\n"
-#~ "phận tương ứng của máy chủ. Nếu bạn không có ý định push nhánh đó, bạn có "
-#~ "lẽ muốn\n"
-#~ "chỉ định các nhánh để push hoặt là đặt nội dung cho biến cấu hình “push."
-#~ "default”\n"
-#~ "thành “simple”, “current” hoặc “upstream” để chỉ push nhánh hiện hành mà "
-#~ "thôi."
-
-#~ msgid "copied: %s -> %s"
-#~ msgstr "đã sao chép: %s -> %s"
-
-#~ msgid "deleted: %s"
-#~ msgstr "đã xóa: %s"
-
-#~ msgid "modified: %s"
-#~ msgstr "đã sửa đổi: %s"
-
-#~ msgid "renamed: %s -> %s"
-#~ msgstr "đã đổi tên: %s -> %s"
-
-#~ msgid "unmerged: %s"
-#~ msgstr "chưa hòa trộn: %s"
-
-#~ msgid "input paths are terminated by a null character"
-#~ msgstr "các đường dẫn được ngăn cách bởi ký tự null"
-
-#~ msgid ""
-#~ "Aborting. Consider using either the --force or --include-untracked option."
-#~ msgstr ""
-#~ "Bãi bỏ. Cân nhắc dùng một trong hai tùy chọn --force và --include-"
-#~ "untracked."
-
-#~ msgid " (fix conflicts and then run \"git am --resolved\")"
-#~ msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --resolved\")"
-
-#~ msgid " (all conflicts fixed: run \"git commit\")"
-#~ msgstr " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git commit\")"
-
-#~ msgid "more than %d trees given: '%s'"
-#~ msgstr "đã chỉ ra nhiều hơn %d cây (tree): “%s”"
-
-#~ msgid ""
-#~ "'%s' has changes staged in the index\n"
-#~ "(use --cached to keep the file, or -f to force removal)"
-#~ msgstr ""
-#~ "“%s” có các thay đổi được lưu trạng thái trong bảng mục lục\n"
-#~ "(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)"
-
-#~ msgid "show commits where no parent comes before its children"
-#~ msgstr "hiển thị các lần chuyển giao nơi mà cha mẹ đến trước con của nó"
-
-#~ msgid "show the HEAD reference"
-#~ msgstr "hiển thị tham chiếu của HEAD"
-
-#~ msgid "Unable to fetch in submodule path '$prefix$sm_path'"
-#~ msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$prefix$sm_path”"
-
-#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
-#~ msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$prefix$sm_path”"
-
-#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
-#~ msgstr "Cần %.2f giây để đếm các tập tin chưa được theo dõi. “status -uno”"
-
-#~ msgid "may speed it up, but you have to be careful not to forget to add"
-#~ msgstr ""
-#~ "có thể làm nó nhanh lên, nhưng bạn phải cẩn trọng đừng quên thêm nó vào"
-
-#~ msgid "new files yourself (see 'git help status')."
-#~ msgstr "tập tin mới của chính bạn (xem “git help status”.."
-
-#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
-#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>… ]"
-
-#~ msgid "use any ref in .git/refs"
-#~ msgstr "sử dụng bất kỳ ref nào trong .git/refs"
-
-#~ msgid "use any tag in .git/refs/tags"
-#~ msgstr "sử dụng bất kỳ thẻ nào trong .git/refs/tags"
-
-#~ msgid "failed to close pipe to 'show' for object '%s'"
-#~ msgstr "gặp lỗi khi đóng đường ống cho lệnh “show” cho đối tượng “%s”"
-
-#~ msgid "You do not have a valid HEAD"
-#~ msgstr "Bạn không có HEAD nào hợp lệ"
-
-#~ msgid "oops"
-#~ msgstr "ôi?"
-
-#~ msgid "Not removing %s\n"
-#~ msgstr "Không xóa %s\n"
-
-#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
-#~ msgstr "git remote set-head <tên> (-a | -d | <nhánh>])"
-
-#~ msgid " %d file changed"
-#~ msgid_plural " %d files changed"
-#~ msgstr[0] " %d tập tin thay đổi"
-
-#~ msgid ", %d insertion(+)"
-#~ msgid_plural ", %d insertions(+)"
-#~ msgstr[0] ", %d thêm(+)"
-
-#~ msgid ", %d deletion(-)"
-#~ msgid_plural ", %d deletions(-)"
-#~ msgstr[0] ", %d xóa(-)"
-
-#~ msgid " (use \"git add\" to track)"
-#~ msgstr " (dùng \"git add\" để theo dõi dấu vết)"
-
-#~ msgid "--detach cannot be used with -b/-B/--orphan"
-#~ msgstr "--detach không thể được sử dụng với tùy chọn -b/-B/--orphan"
-
-#~ msgid "--orphan and -b|-B are mutually exclusive"
-#~ msgstr "Tùy chọn --orphan và -b|-B loại từ lẫn nhau"
-
-#~ msgid "git checkout: -f and -m are incompatible"
-#~ msgstr "git checkout: hai tùy chọn -f và -m xung khắc nhau"
-
-#~ msgid ""
-#~ "git checkout: updating paths is incompatible with switching branches."
-#~ msgstr ""
-#~ "git checkout: việc cập nhật các đường dẫn là xung khắc với việc chuyển "
-#~ "đổi các nhánh."
-
-#~ msgid "diff setup failed"
-#~ msgstr "cài đặt diff gặp lỗi"
-
-#~ msgid "merge-recursive: disk full?"
-#~ msgstr "merge-recursive: đĩa bị đầy?"
-
-#~ msgid "diff_setup_done failed"
-#~ msgstr "diff_setup_done gặp lỗi"
-
-#~ msgid "%s: has been deleted/renamed"
-#~ msgstr "%s: đã được xóa/thay-tên"
-
-#~ msgid "'%s': not a documentation directory."
-#~ msgstr "”%s”: không phải là một thư mục tài liệu."
-
-#~ msgid "--"
-#~ msgstr "--"
-
-#~ msgid "Could not extract email from committer identity."
-#~ msgstr ""
-#~ "Không thể rút trích địa chỉ thư điện tử từ định danh người chuyển giao"
+#, sh-format
+#~ msgid "Failed to recurse into submodule path '$displaypath'"
+#~ msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index abbf74c..f0551f2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -44,6 +44,7 @@
# commit message | 提交说明
# commit object | 提交对象
# commit-ish (also committish) | 提交号
+# cone | 锥形（稀疏检出模型）；锥（稀疏检出）
# conflict | 冲突
# core Git | 核心 Git 工具
# cover letter | 附函
@@ -53,6 +54,7 @@
# directory | 目录
# dirty | 脏（的工作区）
# dumb HTTP protocol | 哑 HTTP 协议
+# enlistment | 登记（在 scalar 中使用）
# evil merge | 坏合并（合并引入了父提交没有的修改）
# fast-forward | 快进
# fetch | 获取
@@ -136,248 +138,249 @@
# upstream | 上游
# upstream branch | 上游分支
# working tree | 工作区
+# Fangyi Zhou <me@fangyi.io>, 2021-2022.
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-14 17:27+0800\n"
-"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
-"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
+"POT-Creation-Date: 2022-04-13 14:52+0800\n"
+"PO-Revision-Date: 2022-04-14 15:39+0100\n"
+"Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
+"Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 40.0\n"
-#: add-interactive.c:376
+#: add-interactive.c:382
#, c-format
msgid "Huh (%s)?"
msgstr "嗯（%s）？"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
+#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
+#: builtin/rebase.c:1671
msgid "could not read index"
msgstr "不能读取索引"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:590 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "二进制"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:648 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "无"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:649 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "没有修改"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:686 git-add--interactive.perl:641
msgid "Update"
msgstr "更新"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:703 add-interactive.c:891
#, c-format
msgid "could not stage '%s'"
msgstr "不能暂存 '%s'"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
msgid "could not write index"
msgstr "不能写入索引"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:712 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "更新了 %d 个路径\n"
msgstr[1] "更新了 %d 个路径\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:730 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "说明：%s 现已成为未跟踪的。\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:765 git-add--interactive.perl:653
msgid "Revert"
msgstr "还原"
-#: add-interactive.c:775
+#: add-interactive.c:781
msgid "Could not parse HEAD^{tree}"
msgstr "不能解析 HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:819 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "还原了 %d 个路径\n"
msgstr[1] "还原了 %d 个路径\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:870 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "没有未跟踪的文件。\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:874 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "添加未跟踪的"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:901 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "增加了 %d 个路径\n"
msgstr[1] "增加了 %d 个路径\n"
-#: add-interactive.c:925
+#: add-interactive.c:931
#, c-format
msgid "ignoring unmerged: %s"
msgstr "忽略未合入的：%s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "没有修改。\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:949 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "补丁更新"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:988 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "检视 diff"
-#: add-interactive.c:1010
+#: add-interactive.c:1016
msgid "show paths with changes"
msgstr "显示含变更的路径"
-#: add-interactive.c:1012
+#: add-interactive.c:1018
msgid "add working tree state to the staged set of changes"
msgstr "将工作区状态添加到暂存区修改集中"
-#: add-interactive.c:1014
+#: add-interactive.c:1020
msgid "revert staged set of changes back to the HEAD version"
msgstr "将暂存的修改集恢复为 HEAD 版本"
-#: add-interactive.c:1016
+#: add-interactive.c:1022
msgid "pick hunks and update selectively"
msgstr "挑选数据块并有选择地更新"
-#: add-interactive.c:1018
+#: add-interactive.c:1024
msgid "view diff between HEAD and index"
msgstr "显示 HEAD 和索引的差异"
-#: add-interactive.c:1020
+#: add-interactive.c:1026
msgid "add contents of untracked files to the staged set of changes"
msgstr "将未跟踪文件的内容添加到暂存区修改集中"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1034 add-interactive.c:1083
msgid "Prompt help:"
msgstr "帮助："
-#: add-interactive.c:1030
+#: add-interactive.c:1036
msgid "select a single item"
msgstr "选择一个条目"
-#: add-interactive.c:1032
+#: add-interactive.c:1038
msgid "select a range of items"
msgstr "选择一系列条目"
-#: add-interactive.c:1034
+#: add-interactive.c:1040
msgid "select multiple ranges"
msgstr "选择多个范围"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1042 add-interactive.c:1087
msgid "select item based on unique prefix"
msgstr "基于唯一前缀选择条目"
-#: add-interactive.c:1038
+#: add-interactive.c:1044
msgid "unselect specified items"
msgstr "反选指定的条目"
-#: add-interactive.c:1040
+#: add-interactive.c:1046
msgid "choose all items"
msgstr "选择所有条目"
-#: add-interactive.c:1042
+#: add-interactive.c:1048
msgid "(empty) finish selecting"
msgstr "（空）结束选择"
-#: add-interactive.c:1079
+#: add-interactive.c:1085
msgid "select a numbered item"
msgstr "选择一个编号条目"
-#: add-interactive.c:1083
+#: add-interactive.c:1089
msgid "(empty) select nothing"
msgstr "（空）不选择任何内容"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "请选择"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "staged"
msgstr "缓存"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "unstaged"
msgstr "未缓存"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
+#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
+#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
+#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
#: git-add--interactive.perl:213
msgid "path"
msgstr "路径"
-#: add-interactive.c:1151
+#: add-interactive.c:1157
msgid "could not refresh index"
msgstr "不能刷新索引"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "暂存该块 [y,n,q,a,d%s,?]? "
@@ -402,22 +405,22 @@
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
@@ -442,22 +445,22 @@
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
@@ -482,22 +485,22 @@
"a - 取消暂存该块和本文件中后面的全部块\n"
"d - 不要取消暂存该块和本文件中后面的全部块\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
@@ -522,26 +525,26 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
@@ -566,22 +569,22 @@
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
@@ -600,22 +603,22 @@
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
@@ -658,30 +661,30 @@
msgid "could not parse colored hunk header '%.*s'"
msgstr "无法解析彩色数据块头信息 '%.*s'"
-#: add-patch.c:420
+#: add-patch.c:431
msgid "could not parse diff"
msgstr "不能解析差异信息"
-#: add-patch.c:439
+#: add-patch.c:450
msgid "could not parse colored diff"
msgstr "不能解析彩色差异信息"
-#: add-patch.c:453
+#: add-patch.c:464
#, c-format
msgid "failed to run '%s'"
-msgstr "运行 '%s' 失败"
+msgstr "无法运行 '%s'"
-#: add-patch.c:612
+#: add-patch.c:618
msgid "mismatched output from interactive.diffFilter"
msgstr "interactive.diffFilter 的输出不匹配"
-#: add-patch.c:613
+#: add-patch.c:619
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
-#: add-patch.c:791
+#: add-patch.c:797
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -690,7 +693,7 @@
"预期上下文行 #%d 于\n"
"%.*s"
-#: add-patch.c:806
+#: add-patch.c:812
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -703,11 +706,11 @@
"\t不是结尾于：\n"
"%.*s"
-#: add-patch.c:1082 git-add--interactive.perl:1115
+#: add-patch.c:1088 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
-#: add-patch.c:1086
+#: add-patch.c:1092
#, c-format
msgid ""
"---\n"
@@ -721,7 +724,7 @@
"以 %c 开始的行将被删除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1100 git-add--interactive.perl:1129
+#: add-patch.c:1106 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -730,11 +733,11 @@
"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
"此次编辑被终止，该块不会被修改。\n"
-#: add-patch.c:1133
+#: add-patch.c:1139
msgid "could not parse hunk header"
msgstr "无法解析数据块头信息"
-#: add-patch.c:1178
+#: add-patch.c:1184
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' 失败"
@@ -750,24 +753,24 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1253 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
-#: add-patch.c:1290
+#: add-patch.c:1296
msgid "The selected hunks do not apply to the index!"
msgstr "选中的块不能应用到索引！"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "无论如何都要应用到工作区么？"
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1304 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "未应用。\n"
-#: add-patch.c:1355
+#: add-patch.c:1361
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -789,73 +792,73 @@
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: add-patch.c:1517 add-patch.c:1527
+#: add-patch.c:1523 add-patch.c:1533
msgid "No previous hunk"
msgstr "没有前一个块"
-#: add-patch.c:1522 add-patch.c:1532
+#: add-patch.c:1528 add-patch.c:1538
msgid "No next hunk"
msgstr "没有下一个块"
-#: add-patch.c:1538
+#: add-patch.c:1544
msgid "No other hunks to goto"
msgstr "没有其它可供跳转的块"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1555 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳转到哪个块（<回车> 查看更多）？ "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1556 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "跳转到哪个块？"
-#: add-patch.c:1561
+#: add-patch.c:1567
#, c-format
msgid "Invalid number: '%s'"
msgstr "无效数字：'%s'"
-#: add-patch.c:1566
+#: add-patch.c:1572
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "对不起，只有 %d 个可用块。"
msgstr[1] "对不起，只有 %d 个可用块。"
-#: add-patch.c:1575
+#: add-patch.c:1581
msgid "No other hunks to search"
msgstr "没有其它可供查找的块"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1587 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "使用正则表达式搜索？"
-#: add-patch.c:1596
+#: add-patch.c:1602
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "错误的正则表达式 %s：%s"
-#: add-patch.c:1613
+#: add-patch.c:1619
msgid "No hunk matches the given pattern"
msgstr "没有和给定模式相匹配的块"
-#: add-patch.c:1620
+#: add-patch.c:1626
msgid "Sorry, cannot split this hunk"
msgstr "对不起，不能拆分这个块"
-#: add-patch.c:1624
+#: add-patch.c:1630
#, c-format
msgid "Split into %d hunks."
msgstr "拆分为 %d 块。"
-#: add-patch.c:1628
+#: add-patch.c:1634
msgid "Sorry, cannot edit this hunk"
msgstr "对不起，不能编辑这个块"
-#: add-patch.c:1680
+#: add-patch.c:1686
msgid "'git apply' failed"
msgstr "'git apply' 失败"
-#: advice.c:145
+#: advice.c:81
#, c-format
msgid ""
"\n"
@@ -864,37 +867,37 @@
"\n"
"使用 \"git config advice.%s false\" 来关闭此消息"
-#: advice.c:161
+#: advice.c:97
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示：%.*s%s\n"
-#: advice.c:252
+#: advice.c:181
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选，因为您有未合并的文件。"
-#: advice.c:254
+#: advice.c:183
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交，因为您有未合并的文件。"
-#: advice.c:256
+#: advice.c:185
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并，因为您有未合并的文件。"
-#: advice.c:258
+#: advice.c:187
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取，因为您有未合并的文件。"
-#: advice.c:260
+#: advice.c:189
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退，因为您有未合并的文件。"
-#: advice.c:262
+#: advice.c:191
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s，因为您有未合并的文件。"
-#: advice.c:270
+#: advice.c:199
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."
@@ -902,37 +905,47 @@
"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
-#: advice.c:278
+#: advice.c:207
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:212 builtin/merge.c:1388
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
-#: advice.c:285
+#: advice.c:214
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
-#: advice.c:286
+#: advice.c:215
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"
-#: advice.c:296
+#: advice.c:220
+msgid "Not possible to fast-forward, aborting."
+msgstr "无法快进，终止。"
+
+#: advice.c:230
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹配：\n"
+"下面的路径和/或者路径规格匹配了您定义的稀疏检出以外的路径，\n"
+"所以不会在索引中更新：\n"
-#: advice.c:303
+#: advice.c:237
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
-msgstr "如果您打算更新此类条目，请禁用或修改稀疏规则。"
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
+msgstr ""
+"如果您意图更新这些条目，请尝试下列其中之一：\n"
+"* 使用 --sparse 选项。\n"
+"* 禁用或者修改稀疏规则。"
-#: advice.c:310
+#: advice.c:245
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -989,68 +1002,83 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject 和 --3way 不能同时使用。"
+#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
+#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
+#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
+#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
+#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
+#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
+#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
+#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
+#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
+#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
+#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
+#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
+#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
+#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
+#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
+#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
+#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
+#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
+#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
+#: builtin/worktree.c:779
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "选项 '%s' 和 '%s' 不能同时使用"
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way 在一个仓库之外"
+#: apply.c:141 apply.c:152 apply.c:155
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' 在仓库之外"
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index 在一个仓库之外"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached 在一个仓库之外"
-
-#: apply.c:800
+#: apply.c:807
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"
-#: apply.c:809
+#: apply.c:816
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d，输入为：%s"
-#: apply.c:883
+#: apply.c:890
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"
-#: apply.c:921
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
-#: apply.c:927
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
-#: apply.c:928
+#: apply.c:935
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
-#: apply.c:933
+#: apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
-#: apply.c:962
+#: apply.c:969
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "第 %d 行包含无效文件模式：%s"
-#: apply.c:1281
+#: apply.c:1288
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "不一致的文件头，%d 行和 %d 行"
-#: apply.c:1371
+#: apply.c:1378
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -1061,92 +1089,92 @@
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
-#: apply.c:1384
+#: apply.c:1391
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
-#: apply.c:1480
+#: apply.c:1487
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount：意外的行：%.*s"
-#: apply.c:1549
+#: apply.c:1556
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息：%.*s"
-#: apply.c:1752
+#: apply.c:1759
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
-#: apply.c:1754
+#: apply.c:1761
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
-#: apply.c:1788
+#: apply.c:1795
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"
-#: apply.c:1825
+#: apply.c:1832
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
-#: apply.c:1827
+#: apply.c:1834
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
-#: apply.c:1830
+#: apply.c:1837
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：文件 %s 成为空文件但并未删除"
-#: apply.c:1977
+#: apply.c:1985
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏：%.*s"
-#: apply.c:2014
+#: apply.c:2022
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
-#: apply.c:2176
+#: apply.c:2184
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
-#: apply.c:2262
+#: apply.c:2270
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
-#: apply.c:2266
+#: apply.c:2274
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
-#: apply.c:2935
+#: apply.c:2943
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符：'%c'"
-#: apply.c:3056
+#: apply.c:3064
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
-#: apply.c:3068
+#: apply.c:3076
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
-#: apply.c:3074
+#: apply.c:3082
#, c-format
msgid ""
"while searching for:\n"
@@ -1155,481 +1183,480 @@
"当查询：\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3104
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
-#: apply.c:3104
+#: apply.c:3112
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
-#: apply.c:3151
+#: apply.c:3159
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
-#: apply.c:3162
+#: apply.c:3170
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
-#: apply.c:3170
+#: apply.c:3178
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "补丁应用到空文件 '%s'，但其并非空文件"
-#: apply.c:3188
+#: apply.c:3196
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
-#: apply.c:3201
+#: apply.c:3209
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
-#: apply.c:3208
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
-#: apply.c:3229
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败：%s:%ld"
-#: apply.c:3352
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
+#: setup.c:310
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
-#: apply.c:3412
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3449 apply.c:3721
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3559 apply.c:3736
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3568 apply.c:3744 apply.c:3960
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
-#: apply.c:3571
+#: apply.c:3605
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "仓库缺乏执行三方合并所必需的数据对象。"
-#: apply.c:3574
+#: apply.c:3608
#, c-format
msgid "Performing three-way merge...\n"
msgstr "执行三方合并...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3624 apply.c:3628
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"
-#: apply.c:3606
+#: apply.c:3640
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "无法执行三方合并...\n"
-#: apply.c:3620
+#: apply.c:3654
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"
-#: apply.c:3625
+#: apply.c:3659
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"
-#: apply.c:3642
+#: apply.c:3676
#, c-format
msgid "Falling back to direct application...\n"
msgstr "回落到直接应用...\n"
-#: apply.c:3654
+#: apply.c:3688
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
-#: apply.c:3727
+#: apply.c:3761
#, c-format
msgid "%s: wrong type"
msgstr "%s：错误类型"
-#: apply.c:3729
+#: apply.c:3763
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o，应为 %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
+#: read-cache.c:1399
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: apply.c:3952
+#: apply.c:3958
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
-#: apply.c:3956
+#: apply.c:3962
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
-#: apply.c:3976
+#: apply.c:3982
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: apply.c:3981
+#: apply.c:3987
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
-#: apply.c:4001
+#: apply.c:4007
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: apply.c:4005
+#: apply.c:4011
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
-#: apply.c:4020
+#: apply.c:4026
#, c-format
msgid "Checking patch %s..."
msgstr "正在检查补丁 %s..."
-#: apply.c:4112
+#: apply.c:4118
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: apply.c:4119
+#: apply.c:4125
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式变更，但它不在当前 HEAD 中"
-#: apply.c:4122
+#: apply.c:4128
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"
-#: apply.c:4131
+#: apply.c:4137
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
-#: apply.c:4141
+#: apply.c:4147
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
-#: apply.c:4279
+#: apply.c:4285
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: apply.c:4313
+#: apply.c:4319
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: apply.c:4319
+#: apply.c:4325
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
-#: apply.c:4327
+#: apply.c:4333
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4339 apply.c:4484
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
-msgstr "写入 '%s' 失败"
+msgstr "无法写入 '%s'"
-#: apply.c:4380
+#: apply.c:4386
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: apply.c:4450
+#: apply.c:4456
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: apply.c:4548
+#: apply.c:4554
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: apply.c:4556
+#: apply.c:4562
msgid "internal error"
msgstr "内部错误"
-#: apply.c:4559
+#: apply.c:4565
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
-#: apply.c:4570
+#: apply.c:4576
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4584
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
-#: apply.c:4592
+#: apply.c:4598
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: apply.c:4596
+#: apply.c:4602
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: apply.c:4725
+#: apply.c:4731
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "未能识别的输入"
+#: apply.c:4740
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）"
-#: apply.c:4753
+#: apply.c:4761
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4910
+#: apply.c:4918
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"
-#: apply.c:4937
+#: apply.c:4945
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4951 apply.c:4966
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
-#: apply.c:4951
+#: apply.c:4959
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修复空白错误后，应用了 %d 行。"
msgstr[1] "修复空白错误后，应用了 %d 行。"
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4995
+#: apply.c:5003
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:4998
+#: apply.c:5006
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5008 builtin/am.c:2379
msgid "num"
msgstr "数字"
-#: apply.c:5001
+#: apply.c:5009
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:5004
+#: apply.c:5012
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:5006
+#: apply.c:5014
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: apply.c:5010
+#: apply.c:5018
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:5012
+#: apply.c:5020
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
-#: apply.c:5014
+#: apply.c:5022
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
-#: apply.c:5016
+#: apply.c:5024
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:5018
+#: apply.c:5026
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
-#: apply.c:5020
+#: apply.c:5028
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:5022
+#: apply.c:5030
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:5025
+#: apply.c:5033
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: apply.c:5027
+#: apply.c:5035
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr "尝试三路合并，如果失败则回落至正常补丁模式"
-#: apply.c:5029
+#: apply.c:5037
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5040 builtin/checkout-index.c:230
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:5034
+#: apply.c:5042
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
+#: builtin/rebase.c:1079
msgid "action"
msgstr "动作"
-#: apply.c:5036
+#: apply.c:5044
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5047 apply.c:5050
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:5045
+#: apply.c:5053
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:5047
+#: apply.c:5055
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:5049
+#: apply.c:5057
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:5051
+#: apply.c:5059
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "冗长输出"
-
-#: apply.c:5054
+#: apply.c:5062
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:5057
+#: apply.c:5065
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5067 builtin/am.c:2367
msgid "root"
msgstr "根目录"
-#: apply.c:5060
+#: apply.c:5068
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
-#: archive-tar.c:125 archive-zip.c:345
+#: apply.c:5071
+msgid "don't return error for empty patches"
+msgstr "对空的补丁不返回错误"
+
+#: archive-tar.c:125 archive-zip.c:346
#, c-format
msgid "cannot stream blob %s"
msgstr "不能打开数据对象 %s"
-#: archive-tar.c:265 archive-zip.c:358
+#: archive-tar.c:265 archive-zip.c:359
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "不支持的文件模式：0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "无法启动 '%s' 过滤器"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "无法重定向描述符"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "'%s' 过滤器报告了错误"
-#: archive-zip.c:318
+#: archive-zip.c:319
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "路径不是有效的 UTF-8：%s"
-#: archive-zip.c:322
+#: archive-zip.c:323
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "路径太长（%d 字符，SHA1：%s）：%s"
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
#, c-format
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
-#: archive-zip.c:603
+#: archive-zip.c:604
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "对于本系统时间戳太大：%<PRIuMAX>"
@@ -1638,10 +1665,6 @@
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>...]"
@@ -1652,142 +1675,138 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:579
#, c-format
-msgid "cannot read %s"
-msgstr "不能读取 %s"
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "无此引用：%.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "不是一个有效的对象名：%s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "不是一个树对象：%s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "当前工作目录未被跟踪"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "文件未找到：%s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "不是一个常规文件：%s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "格式"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "归档格式"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1809
msgid "prefix"
msgstr "前缀"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
+#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
msgid "file"
msgstr "文件"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "将未跟踪文件添加到归档"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "设置压缩级别"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
+#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
msgid "repo"
msgstr "仓库"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库（<仓库>）提取归档文件"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
msgid "command"
msgstr "命令"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
-#: archive.c:581
-msgid "Option --exec can only be used together with --remote"
-msgstr "选项 --exec 只能和 --remote 同时使用"
+#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
+#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
+#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
+#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
+#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
+#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "选项 '%s' 需要 '%s'"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "未知参数 --output"
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "选项 --add-file 和 --remote 不能同时使用"
-
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s'：-%d"
@@ -1810,22 +1829,22 @@
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时，使用 '\\!'。"
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式：%s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找！\n"
-#: bisect.c:766
+#: bisect.c:765
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
-#: bisect.c:791
+#: bisect.c:790
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1834,7 +1853,7 @@
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
-#: bisect.c:796
+#: bisect.c:795
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1843,7 +1862,7 @@
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
-#: bisect.c:801
+#: bisect.c:800
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1852,7 +1871,7 @@
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
-#: bisect.c:809
+#: bisect.c:808
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1863,7 +1882,7 @@
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本？\n"
-#: bisect.c:822
+#: bisect.c:821
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1874,36 +1893,36 @@
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
-#: bisect.c:861
+#: bisect.c:860
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中：合并基线必须是经过测试的\n"
-#: bisect.c:911
+#: bisect.c:910
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:940
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:986 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
-#: bisect.c:1027
+#: bisect.c:1026
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
-#: bisect.c:1057
+#: bisect.c:1056
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
-#: bisect.c:1066
+#: bisect.c:1065
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1912,7 +1931,7 @@
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数？\n"
-#: bisect.c:1095
+#: bisect.c:1094
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1922,139 +1941,166 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1100
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
-#: blame.c:2776
+#: blame.c:2773
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: blame.c:2790
+#: blame.c:2787
msgid "cannot use --contents with final commit object name"
msgstr "不能将 --contents 和最终的提交对象名共用"
-#: blame.c:2811
+#: blame.c:2808
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
+#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
+#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
+#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
+#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
-#: blame.c:2838
+#: blame.c:2835
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
-#: blame.c:2849
+#: blame.c:2846
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中无此路径 %1$s"
-#: blame.c:2860
+#: blame.c:2857
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
-#: branch.c:53
-#, c-format
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr ""
-"\n"
-"在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n"
-"\"git branch --set-upstream-to=%s%s%s\" 。"
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "未设置分支 %s 作为它自己的上游。"
-
#: branch.c:93
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
-
-#: branch.c:94
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
-
-#: branch.c:98
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
-
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
+msgstr "在请求变基时无法继承上游多个引用的跟踪设置"
#: branch.c:104
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
+msgid "not setting branch '%s' as its own upstream"
+msgstr "没有将分支 '%s' 设置为它自己的上游"
-#: branch.c:105
+#: branch.c:160
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "分支 '%s' 设置为使用变基来跟踪 '%s'。"
-#: branch.c:109
+#: branch.c:161
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
+msgid "branch '%s' set up to track '%s'."
+msgstr "分支 '%s' 设置为跟踪 '%s'。"
-#: branch.c:110
+#: branch.c:164
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
+msgid "branch '%s' set up to track:"
+msgstr "分支 '%s' 设置为跟踪："
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
+#: branch.c:176
+msgid "unable to write upstream branch configuration"
msgstr "无法写入上游分支配置"
-#: branch.c:156
+#: branch.c:178
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
+msgstr ""
+"\n"
+"在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支："
+
+#: branch.c:219
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "未跟踪：引用 %s 有歧义"
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr "要求从 '%s' 继承跟踪信息，但是没有设置远程"
-#: branch.c:189
+#: branch.c:225
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' 不是一个有效的分支名称。"
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置"
-#: branch.c:208
+#: branch.c:277
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "一个分支名 '%s' 已经存在。"
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "不在跟踪中：引用 '%s' 有歧义的信息"
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "无法强制更新当前分支。"
-
-#: branch.c:233
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading " " space around.
+#.
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#: branch.c:289 object-name.c:464
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
+msgid " %s\n"
+msgstr " %s\n"
-#: branch.c:235
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#: branch.c:295
+#, c-format
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
+"有多个远程的获取引用规格映射到了追踪引用 '%s'：\n"
+"%s\n"
+"这一般是个配置错误。\n"
+"\n"
+"如果要支持设置追踪分支，请保证不同远程的获取引用规格映射至不同的追踪命名空"
+"间。"
+
+#: branch.c:344
+#, c-format
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' 不是一个有效的分支名称"
+
+#: branch.c:364
+#, c-format
+msgid "a branch named '%s' already exists"
+msgstr "一个名为 '%s' 的分支已经存在"
+
+#: branch.c:370
+#, c-format
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'"
+
+#: branch.c:393
+#, c-format
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支"
+
+#: branch.c:395
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"
-#: branch.c:237
+#: branch.c:397
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -2066,131 +2112,150 @@
"\"git push -u\" to set the upstream config as you push."
msgstr ""
"\n"
-"如果您正计划基于远程一个现存的上游分支开始你的工作，\n"
+"如果您正计划基于远程一个现存的上游分支开始您的工作，\n"
"您可能需要执行 \"git fetch\" 来获取分支。\n"
"\n"
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
-#: branch.c:281
+#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "不是一个有效的对象名：'%s'。"
+msgid "not a valid object name: '%s'"
+msgstr "不是一个有效的对象名：'%s'"
-#: branch.c:301
+#: branch.c:465
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "歧义的对象名：'%s'。"
+msgid "ambiguous object name: '%s'"
+msgstr "歧义的对象名：'%s'"
-#: branch.c:306
+#: branch.c:470
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "无效的分支点：'%s'。"
+msgid "not a valid branch point: '%s'"
+msgstr "无效的分支点：'%s'"
-#: branch.c:366
+#: branch.c:658
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "子模组 '%s'：无法找到子模组"
+
+#: branch.c:661
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
+msgstr ""
+"你可以用 'git checkout %s && git submodule update --init' 来尝试更新子模组"
+
+#: branch.c:672 branch.c:698
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "子模组 '%s'：不能创建分支 '%s'"
+
+#: branch.c:730
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
-#: branch.c:389
+#: branch.c:755
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作区 %s 的 HEAD 指向没有被更新"
-#: bundle.c:44
+#: bundle.c:45
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
msgstr "未能识别的归档包哈希算法：%s"
-#: bundle.c:48
+#: bundle.c:53
#, c-format
msgid "unknown capability '%s'"
msgstr "未知能力 '%s'"
-#: bundle.c:74
+#: bundle.c:79
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
-#: bundle.c:113
+#: bundle.c:118
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
+#: builtin/commit.c:865
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
-#: bundle.c:198
+#: bundle.c:203
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交："
-#: bundle.c:201
+#: bundle.c:206
msgid "need a repository to verify a bundle"
msgstr "需要一个仓库来校验一个归档包"
-#: bundle.c:257
+#: bundle.c:264
#, c-format
msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
msgstr[0] "这个归档包中含有这个引用："
-msgstr[1] "这个归档包中含有 %d 个引用："
+msgstr[1] "这个归档包中含有 %<PRIuMAX> 个引用："
-#: bundle.c:264
+#: bundle.c:272
msgid "The bundle records a complete history."
msgstr "这个归档包记录一个完整历史。"
-#: bundle.c:266
+#: bundle.c:274
#, c-format
msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
msgstr[0] "这个归档包需要这个引用："
-msgstr[1] "这个归档包需要 %d 个引用："
+msgstr[1] "这个归档包需要 %<PRIuMAX> 个引用："
-#: bundle.c:333
+#: bundle.c:350
msgid "unable to dup bundle descriptor"
msgstr "无法复制归档包描述符"
-#: bundle.c:340
+#: bundle.c:357
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
-#: bundle.c:351
+#: bundle.c:368
msgid "pack-objects died"
msgstr "pack-objects 终止"
-#: bundle.c:400
+#: bundle.c:417
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:504
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "不支持的归档包版本 %d"
-
-#: bundle.c:506
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "不能写入，归档包版本 %d 不支持算法 %s"
-
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
-#: bundle.c:553
+#: bundle.c:548
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "不支持的归档包版本 %d"
+
+#: bundle.c:550
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "不能写入，归档包版本 %d 不支持算法 %s"
+
+#: bundle.c:600
msgid "Refusing to create empty bundle."
msgstr "不能创建空的归档包。"
-#: bundle.c:563
+#: bundle.c:610
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"
-#: bundle.c:588
+#: bundle.c:639
msgid "index-pack died"
msgstr "index-pack 终止"
@@ -2213,12 +2278,12 @@
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "最终块有非零 ID %<PRIx32>"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:52
msgid "invalid hash version"
msgstr "无效的哈希版本"
@@ -2246,234 +2311,235 @@
msgid "commit-graph file is too small to hold %u chunks"
msgstr "提交图形文件太小，容不下 %u 个块"
-#: commit-graph.c:482
+#: commit-graph.c:485
msgid "commit-graph has no base graphs chunk"
msgstr "提交图形没有基础图形块"
-#: commit-graph.c:492
+#: commit-graph.c:495
msgid "commit-graph chain does not match"
msgstr "提交图形链不匹配"
-#: commit-graph.c:540
+#: commit-graph.c:543
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"
-#: commit-graph.c:564
+#: commit-graph.c:567
msgid "unable to find all commit-graph files"
msgstr "无法找到所有提交图形文件"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:752 commit-graph.c:789
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "无效的提交位置。提交图形可能已损坏"
-#: commit-graph.c:766
+#: commit-graph.c:773
#, c-format
msgid "could not find commit %s"
msgstr "无法找到提交 %s"
-#: commit-graph.c:799
+#: commit-graph.c:806
msgid "commit-graph requires overflow generation data but has none"
msgstr "提交图需要溢出世代数据，但是没有"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
+#: builtin/clone.c:705
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1373 builtin/pack-objects.c:3078
#, c-format
msgid "unable to get type of object %s"
msgstr "无法获得对象 %s 类型"
-#: commit-graph.c:1368
+#: commit-graph.c:1404
msgid "Loading known commits in commit graph"
msgstr "正在加载提交图中的已知提交"
-#: commit-graph.c:1385
+#: commit-graph.c:1421
msgid "Expanding reachable commits in commit graph"
msgstr "正在扩展提交图中的可达提交"
-#: commit-graph.c:1405
+#: commit-graph.c:1441
msgid "Clearing commit marks in commit graph"
msgstr "正在清除提交图中的提交标记"
-#: commit-graph.c:1424
+#: commit-graph.c:1460
msgid "Computing commit graph topological levels"
msgstr "正在计算提交图拓扑级别"
-#: commit-graph.c:1477
+#: commit-graph.c:1513
msgid "Computing commit graph generation numbers"
msgstr "正在计算提交图世代数字"
-#: commit-graph.c:1558
+#: commit-graph.c:1598
msgid "Computing commit changed paths Bloom filters"
msgstr "计算提交变更路径的布隆过滤器"
-#: commit-graph.c:1635
+#: commit-graph.c:1675
msgid "Collecting referenced commits"
msgstr "正在收集引用的提交"
-#: commit-graph.c:1660
+#: commit-graph.c:1701
#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "正在 %d 个包中查找提交图的提交"
-msgstr[1] "正在 %d 个包中查找提交图的提交"
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "正在 %<PRIuMAX> 个包中查找提交图的提交"
+msgstr[1] "正在 %<PRIuMAX> 个包中查找提交图的提交"
-#: commit-graph.c:1673
+#: commit-graph.c:1714
#, c-format
msgid "error adding pack %s"
msgstr "添加包 %s 出错"
-#: commit-graph.c:1677
+#: commit-graph.c:1718
#, c-format
msgid "error opening index for %s"
msgstr "为 %s 打开索引出错"
-#: commit-graph.c:1714
+#: commit-graph.c:1756
msgid "Finding commits for commit graph among packed objects"
msgstr "正在打包对象中查找提交图的提交"
-#: commit-graph.c:1732
+#: commit-graph.c:1774
msgid "Finding extra edges in commit graph"
msgstr "正在查找提交图中额外的边"
-#: commit-graph.c:1781
+#: commit-graph.c:1823
msgid "failed to write correct number of base graph ids"
msgstr "无法写入正确数量的基础图形 ID"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能为 %s 创建先导目录"
-#: commit-graph.c:1825
+#: commit-graph.c:1868
msgid "unable to create temporary graph layer"
msgstr "无法创建临时图层"
-#: commit-graph.c:1830
+#: commit-graph.c:1873
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "无法为 '%s' 调整共享权限"
-#: commit-graph.c:1887
+#: commit-graph.c:1930
#, 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:1923
+#: commit-graph.c:1967
msgid "unable to open commit-graph chain file"
msgstr "无法打开提交图形链文件"
-#: commit-graph.c:1939
+#: commit-graph.c:1983
msgid "failed to rename base commit-graph file"
msgstr "无法重命名基础提交图形文件"
-#: commit-graph.c:1959
+#: commit-graph.c:2004
msgid "failed to rename temporary commit-graph file"
msgstr "无法重命名临时提交图形文件"
-#: commit-graph.c:2092
+#: commit-graph.c:2137
msgid "Scanning merged commits"
msgstr "正在扫描合并提交"
-#: commit-graph.c:2136
+#: commit-graph.c:2181
msgid "Merging commit-graph"
msgstr "正在合并提交图形"
-#: commit-graph.c:2244
+#: commit-graph.c:2289
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
-#: commit-graph.c:2351
+#: commit-graph.c:2396
msgid "too many commits to write graph"
msgstr "提交太多不能画图"
-#: commit-graph.c:2449
+#: commit-graph.c:2494
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交图文件的校验码错误，可能已经损坏"
-#: commit-graph.c:2459
+#: commit-graph.c:2504
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2514 commit-graph.c:2529
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2521
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "无法从提交图形中解析提交 %s"
-#: commit-graph.c:2494
+#: commit-graph.c:2539
msgid "Verifying commits in commit graph"
msgstr "正在校验提交图中的提交"
-#: commit-graph.c:2509
+#: commit-graph.c:2554
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr "无法从提交图形的对象库中解析提交 %s"
-#: commit-graph.c:2516
+#: commit-graph.c:2561
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
-#: commit-graph.c:2526
+#: commit-graph.c:2571
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "提交 %s 的提交图形父提交列表太长了"
-#: commit-graph.c:2535
+#: commit-graph.c:2580
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s 的提交图形父提交是 %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2594
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "提交 %s 的提交图形父提交列表过早终止"
-#: commit-graph.c:2554
+#: commit-graph.c:2599
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
-#: commit-graph.c:2558
+#: commit-graph.c:2603
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
-#: commit-graph.c:2575
+#: commit-graph.c:2620
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2626
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
+#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
-#: commit.c:54
+#: commit.c:56
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交！"
-#: commit.c:194
+#: commit.c:197
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2493,27 +2559,27 @@
"设置 \"git config advice.graftFileDeprecated false\"\n"
"可关闭本消息"
-#: commit.c:1237
+#: commit.c:1252
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: commit.c:1241
+#: commit.c:1256
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: commit.c:1244
+#: commit.c:1259
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有 GPG 签名。"
-#: commit.c:1247
+#: commit.c:1262
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: commit.c:1501
+#: commit.c:1516
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"
@@ -2527,7 +2593,15 @@
msgid "memory exhausted"
msgstr "内存耗尽"
-#: config.c:126
+#: compat/terminal.c:167
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr "无法从后台中恢复，请使用 'fg' 来恢复"
+
+#: compat/terminal.c:168
+msgid "cannot restore terminal settings"
+msgstr "无法恢复终端设置"
+
+#: config.c:143
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2542,333 +2616,360 @@
"\t%2$s\n"
"这可能是因为循环包含。"
-#: config.c:142
+#: config.c:159
#, c-format
msgid "could not expand include path '%s'"
msgstr "无法扩展包含路径 '%s'"
-#: config.c:153
+#: config.c:170
msgid "relative config includes must come from files"
msgstr "相对路径的配置文件引用必须来自于文件"
-#: config.c:199
+#: config.c:219
msgid "relative config include conditionals must come from files"
msgstr "相对路径的配置文件条件引用必须来自于文件"
-#: config.c:396
+#: config.c:364
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"远程 URL 不能在文件中配置，不管直接地还是通过 includeIf.hasconfig:remote.*."
+"url 间接地包含。"
+
+#: config.c:508
#, c-format
msgid "invalid config format: %s"
msgstr "无效的配置格式：%s"
-#: config.c:400
+#: config.c:512
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "配置 '%.*s' 缺少环境变量名称"
-#: config.c:405
+#: config.c:517
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "缺少环境变量 '%s' 于配置 '%.*s' "
-#: config.c:442
+#: config.c:553
#, c-format
msgid "key does not contain a section: %s"
msgstr "键名没有包含一个小节名称：%s"
-#: config.c:448
+#: config.c:558
#, c-format
msgid "key does not contain variable name: %s"
msgstr "键名没有包含变量名：%s"
-#: config.c:472 sequencer.c:2785
+#: config.c:580 sequencer.c:2802
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
-#: config.c:478
+#: config.c:585
#, c-format
msgid "invalid key (newline): %s"
msgstr "无效键名（有换行符）：%s"
-#: config.c:511
+#: config.c:605
msgid "empty config key"
msgstr "空的配置键名"
-#: config.c:529 config.c:541
+#: config.c:623 config.c:635
#, c-format
msgid "bogus config parameter: %s"
msgstr "伪配置参数：%s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:649 config.c:666 config.c:673 config.c:682
#, c-format
msgid "bogus format in %s"
msgstr "%s 中格式错误"
-#: config.c:622
+#: config.c:716
#, c-format
msgid "bogus count in %s"
msgstr "%s 中错误计数"
-#: config.c:626
+#: config.c:720
#, c-format
msgid "too many entries in %s"
msgstr "%s 中太多的条目"
-#: config.c:636
+#: config.c:730
#, c-format
msgid "missing config key %s"
msgstr "缺失配置键名 %s"
-#: config.c:644
+#: config.c:738
#, c-format
msgid "missing config value %s"
msgstr "缺失配置取值 %s"
-#: config.c:995
+#: config.c:1089
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:999
+#: config.c:1093
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
-#: config.c:1003
+#: config.c:1097
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
-#: config.c:1007
+#: config.c:1101
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:1011
+#: config.c:1105
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
-#: config.c:1015
+#: config.c:1109
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
-#: config.c:1152
+#: config.c:1246
msgid "out of range"
msgstr "超出范围"
-#: config.c:1152
+#: config.c:1246
msgid "invalid unit"
msgstr "无效的单位"
-#: config.c:1153
+#: config.c:1247
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
-#: config.c:1163
+#: config.c:1257
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:1166
+#: config.c:1260
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:1169
+#: config.c:1263
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
-#: config.c:1172
+#: config.c:1266
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:1175
+#: config.c:1269
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:1178
+#: config.c:1272
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:1257
+#: config.c:1368
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "变量 %s 的值无效"
+
+#: config.c:1389
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "忽略未知的 core.fsync 组件 '%s'"
+
+#: config.c:1425
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
-#: config.c:1275
+#: config.c:1443
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展用户目录：'%s'"
-#: config.c:1284
+#: config.c:1452
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
-#: config.c:1377
+#: config.c:1545
#, c-format
msgid "abbrev length out of range: %d"
msgstr "缩写长度超出范围：%d"
-#: config.c:1391 config.c:1402
+#: config.c:1559 config.c:1570
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:1494
+#: config.c:1660
msgid "core.commentChar should only be one character"
msgstr "core.commentChar 应该是一个字符"
-#: config.c:1527
+#: config.c:1692
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "忽略未知的 core.fsyncMethod 值 '%s'"
+
+#: config.c:1698
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles 已经被弃用；取而代之使用 core.fsync"
+
+#: config.c:1714
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
-#: config.c:1599
+#: config.c:1800
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式错误"
-#: config.c:1625
+#: config.c:1826
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式错误：%s"
-#: config.c:1626
+#: config.c:1827
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1888 builtin/pack-objects.c:4078
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:1809
+#: config.c:2014
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "无法从数据对象 '%s' 加载配置"
-#: config.c:1812
+#: config.c:2017
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 没有指向一个数据对象"
-#: config.c:1829
+#: config.c:2035
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析配置对象 '%s'"
-#: config.c:1874
+#: config.c:2080
#, c-format
msgid "failed to parse %s"
-msgstr "解析 %s 失败"
+msgstr "无法解析 %s"
-#: config.c:1930
+#: config.c:2136
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:2294
+#: config.c:2512
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:2468
+#: config.c:2686
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"
-#: config.c:2513
+#: config.c:2731
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-#: config.c:2559
+#: config.c:2763
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:2561
+#: config.c:2765
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:2645
+#: config.c:2850
#, c-format
msgid "invalid section name '%s'"
msgstr "无效的小节名称 '%s'"
-#: config.c:2677
+#: config.c:2882
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2706
+#: config.c:2911
#, c-format
msgid "failed to write new configuration file %s"
-msgstr "写入新的配置文件 %s 失败"
+msgstr "无法写入新的配置文件 %s"
-#: config.c:2958 config.c:3285
+#: config.c:3177 config.c:3518
#, c-format
msgid "could not lock config file %s"
msgstr "不能锁定配置文件 %s"
-#: config.c:2969
+#: config.c:3188
#, c-format
msgid "opening %s"
msgstr "打开 %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:3225 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "无效模式：%s"
-#: config.c:3031
+#: config.c:3250
#, c-format
msgid "invalid config file %s"
msgstr "无效的配置文件 %s"
-#: config.c:3044 config.c:3298
+#: config.c:3263 config.c:3531
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:3055
+#: config.c:3274
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "不能 mmap '%s'%s"
-#: config.c:3065 config.c:3303
+#: config.c:3284 config.c:3536
#, c-format
msgid "chmod on %s failed"
msgstr "对 %s 调用 chmod 失败"
-#: config.c:3150 config.c:3400
+#: config.c:3369 config.c:3633
#, c-format
msgid "could not write config file %s"
msgstr "不能写入配置文件 %s"
-#: config.c:3184
+#: config.c:3403
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
-#: config.c:3276
+#: config.c:3509
#, c-format
msgid "invalid section name: %s"
msgstr "无效的小节名称：%s"
-#: config.c:3443
+#: config.c:3676
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺失"
@@ -2902,72 +3003,72 @@
msgid "expected flush after capabilities"
msgstr "在能力之后应为一个 flush 包"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "忽略第一行 '%s' 之后的能力字段"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "协议错误：意外的 capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "另一端的仓库不能是浅克隆仓库"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "无效数据包"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "协议错误：意外的 '%s'"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "服务器给出未知的对象格式 '%s'"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "无效的 ls-refs 响应：%s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "在引用列表之后应该有一个 flush 包"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "在引用列表之后应该有响应结束包"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "不支持 '%s' 协议"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "无法为 socket 设置 SO_KEEPALIVE"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "查找 %s ..."
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "无法查找 %s（端口 %s）（%s）"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2976,7 +3077,7 @@
"完成。\n"
"连接到 %s（端口 %s）... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2986,79 +3087,79 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "完成。"
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "无法查找 %s（%s）"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "未知端口 %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "已阻止奇怪的主机名 '%s'"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "已阻止奇怪的端口号 '%s'"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "不能启动代理 %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "在 git:// 主机和仓库路径中禁止使用换行符"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh 变体 'simple' 不支持 -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh 变体 'simple' 不支持 -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh 变体 'simple' 不支持设置端口"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "已阻止奇怪的路径名 '%s'"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "无法 fork"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "正在检查连通性"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "写入 rev-list 失败"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
-msgstr "关闭 rev-list 的标准输入失败"
+msgstr "无法关闭 rev-list 的标准输入"
#: convert.c:183
#, c-format
@@ -3197,68 +3298,68 @@
msgid "refusing to work with credential missing protocol field"
msgstr "拒绝使用缺少协议字段的凭据"
-#: credential.c:394
+#: credential.c:396
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "URL 的 %s 组件中包含换行符：%s"
-#: credential.c:438
+#: credential.c:440
#, c-format
msgid "url has no scheme: %s"
msgstr "URL 没有 scheme：%s"
-#: credential.c:511
+#: credential.c:513
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "不能解析凭据 URL：%s"
-#: date.c:138
+#: date.c:139
msgid "in the future"
msgstr "在将来"
-#: date.c:144
+#: date.c:145
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "%<PRIuMAX> 秒钟前"
msgstr[1] "%<PRIuMAX> 秒钟前"
-#: date.c:151
+#: date.c:152
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "%<PRIuMAX> 分钟前"
msgstr[1] "%<PRIuMAX> 分钟前"
-#: date.c:158
+#: date.c:159
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "%<PRIuMAX> 小时前"
msgstr[1] "%<PRIuMAX> 小时前"
-#: date.c:165
+#: date.c:166
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "%<PRIuMAX> 天前"
msgstr[1] "%<PRIuMAX> 天前"
-#: date.c:171
+#: date.c:172
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> 周前"
msgstr[1] "%<PRIuMAX> 周前"
-#: date.c:178
+#: date.c:179
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> 个月前"
msgstr[1] "%<PRIuMAX> 个月前"
-#: date.c:189
+#: date.c:190
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -3266,14 +3367,14 @@
msgstr[1] "%<PRIuMAX> 年"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
+#: date.c:193
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s %<PRIuMAX> 个月前"
msgstr[1] "%s %<PRIuMAX> 个月前"
-#: date.c:197 date.c:202
+#: date.c:198 date.c:203
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
@@ -3304,28 +3405,32 @@
msgid "Marked %d islands, done.\n"
msgstr "已标记 %d 个数据岛，结束。\n"
-#: diff-merges.c:70
+#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
+#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
+#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
+#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
+#: builtin/pull.c:47 builtin/pull.c:321
#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "未知的 --diff-merges 取值：%s"
+msgid "invalid value for '%s': '%s'"
+msgstr "'%s' 的值无效：'%s'"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base 不适用于范围"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base 仅适用于提交"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "不能解析 HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "未找到合并基线"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "找到了多条合并基线"
@@ -3340,18 +3445,18 @@
msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
# 译者：注意保持前导空格
-#: diff.c:156
+#: diff.c:159
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
# 译者：注意保持前导空格
-#: diff.c:161
+#: diff.c:164
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 参数 '%s'\n"
-#: diff.c:297
+#: diff.c:300
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3359,7 +3464,7 @@
"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "
"'plain'"
-#: diff.c:325
+#: diff.c:328
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3368,18 +3473,18 @@
"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
-#: diff.c:333
+#: diff.c:336
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"
-#: diff.c:410
+#: diff.c:413
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
-#: diff.c:470
+#: diff.c:473
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3393,41 +3498,43 @@
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:4634
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
+#: diff.c:4677 parse-options.c:1114
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "选项 '%s'、'%s'、'%s' 和 '%s' 不能同时使用"
-#: diff.c:4637
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G、-S 和 --find-object 是互斥的"
+#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"
-#: diff.c:4640
+#: diff.c:4685
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 一起使用 '%3$s'"
+
+#: diff.c:4689
+#, c-format
msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'"
-#: diff.c:4643
-msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr "---pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S"
-
-#: diff.c:4722
+#: diff.c:4769
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:4770
+#: diff.c:4823
#, c-format
msgid "invalid --stat value: %s"
msgstr "无效的 --stat 值：%s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s 期望一个数字值"
-#: diff.c:4807
+#: diff.c:4860
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3436,200 +3543,200 @@
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:4892
+#: diff.c:4893
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
-#: diff.c:4916
+#: diff.c:4917
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之后未知的值"
-#: diff.c:4930
+#: diff.c:4931
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4981 diff.c:4987
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
-#: diff.c:4998
+#: diff.c:4999
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一个字符，得到 '%s'"
-#: diff.c:5019
+#: diff.c:5020
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "坏的 --color-moved 参数：%s"
-#: diff.c:5038
+#: diff.c:5039
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws 中的无效模式 '%s' "
-#: diff.c:5078
+#: diff.c:5079
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5115 diff.c:5135
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的参数无效"
-#: diff.c:5238
+#: diff.c:5239
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "选项 -I 的正则表达式无效：'%s'"
-#: diff.c:5287
+#: diff.c:5288
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: diff.c:5343
+#: diff.c:5344
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "坏的 --word-diff 参数：%s"
-#: diff.c:5379
+#: diff.c:5380
msgid "Diff output format options"
msgstr "差异输出格式化选项"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5382 diff.c:5388
msgid "generate patch"
msgstr "生成补丁"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5385 builtin/log.c:180
msgid "suppress diff output"
msgstr "不显示差异输出"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5390 diff.c:5504 diff.c:5511
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5391 diff.c:5394
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差异"
-#: diff.c:5395
+#: diff.c:5396
msgid "generate the diff in raw format"
msgstr "生成原始格式的差异"
-#: diff.c:5398
+#: diff.c:5399
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同义"
-#: diff.c:5402
+#: diff.c:5403
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同义"
-#: diff.c:5406
+#: diff.c:5407
msgid "machine friendly --stat"
msgstr "机器友好的 --stat"
-#: diff.c:5409
+#: diff.c:5410
msgid "output only the last line of --stat"
msgstr "只输出 --stat 的最后一行"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5412 diff.c:5420
msgid "<param1,param2>..."
msgstr "<参数1,参数2>..."
-#: diff.c:5412
+#: diff.c:5413
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "输出每个子目录相对变更的分布"
-#: diff.c:5416
+#: diff.c:5417
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同义"
-#: diff.c:5420
+#: diff.c:5421
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同义词"
-#: diff.c:5424
+#: diff.c:5425
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
-#: diff.c:5427
+#: diff.c:5428
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精简摘要，例如创建、重命名和模式变更"
-#: diff.c:5430
+#: diff.c:5431
msgid "show only names of changed files"
msgstr "只显示变更文件的文件名"
-#: diff.c:5433
+#: diff.c:5434
msgid "show only names and status of changed files"
msgstr "只显示变更文件的文件名和状态"
-#: diff.c:5435
+#: diff.c:5436
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
-#: diff.c:5436
+#: diff.c:5437
msgid "generate diffstat"
msgstr "生成差异统计（diffstat）"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5439 diff.c:5442 diff.c:5445
msgid "<width>"
msgstr "<宽度>"
-#: diff.c:5439
+#: diff.c:5440
msgid "generate diffstat with a given width"
msgstr "使用给定的长度生成差异统计"
-#: diff.c:5442
+#: diff.c:5443
msgid "generate diffstat with a given name width"
msgstr "使用给定的文件名长度生成差异统计"
-#: diff.c:5445
+#: diff.c:5446
msgid "generate diffstat with a given graph width"
msgstr "使用给定的图形长度生成差异统计"
-#: diff.c:5447
+#: diff.c:5448
msgid "<count>"
msgstr "<次数>"
-#: diff.c:5448
+#: diff.c:5449
msgid "generate diffstat with limited lines"
msgstr "生成有限行数的差异统计"
-#: diff.c:5451
+#: diff.c:5452
msgid "generate compact summary in diffstat"
msgstr "生成差异统计的简洁摘要"
-#: diff.c:5454
+#: diff.c:5455
msgid "output a binary diff that can be applied"
msgstr "输出一个可以应用的二进制差异"
-#: diff.c:5457
+#: diff.c:5458
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行显示完整的前后对象名称"
-#: diff.c:5459
+#: diff.c:5460
msgid "show colored diff"
msgstr "显示带颜色的差异"
-#: diff.c:5460
+#: diff.c:5461
msgid "<kind>"
msgstr "<类型>"
-#: diff.c:5461
+#: diff.c:5462
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
-#: diff.c:5464
+#: diff.c:5465
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3637,311 +3744,311 @@
"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
"符"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
msgid "<prefix>"
msgstr "<前缀>"
-#: diff.c:5468
+#: diff.c:5469
msgid "show the given source prefix instead of \"a/\""
msgstr "显示给定的源前缀取代 \"a/\""
-#: diff.c:5471
+#: diff.c:5472
msgid "show the given destination prefix instead of \"b/\""
msgstr "显示给定的目标前缀取代 \"b/\""
-#: diff.c:5474
+#: diff.c:5475
msgid "prepend an additional prefix to every line of output"
msgstr "输出的每一行附加前缀"
-#: diff.c:5477
+#: diff.c:5478
msgid "do not show any source or destination prefix"
msgstr "不显示任何源和目标前缀"
-#: diff.c:5480
+#: diff.c:5481
msgid "show context between diff hunks up to the specified number of lines"
msgstr "显示指定行数的差异块间的上下文"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5485 diff.c:5490 diff.c:5495
msgid "<char>"
msgstr "<字符>"
-#: diff.c:5485
+#: diff.c:5486
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一个字符取代 '+' 来表示新的一行"
-#: diff.c:5490
+#: diff.c:5491
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一个字符取代 '-' 来表示旧的一行"
-#: diff.c:5495
+#: diff.c:5496
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一个字符取代 ' ' 来表示一行上下文"
-#: diff.c:5498
+#: diff.c:5499
msgid "Diff rename options"
msgstr "差异重命名选项"
-#: diff.c:5499
+#: diff.c:5500
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5501
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "将完全重写的变更打破为成对的删除和创建"
-#: diff.c:5504
+#: diff.c:5505
msgid "detect renames"
msgstr "检测重命名"
-#: diff.c:5508
+#: diff.c:5509
msgid "omit the preimage for deletes"
msgstr "省略删除操作的差异输出"
-#: diff.c:5511
+#: diff.c:5512
msgid "detect copies"
msgstr "检测拷贝"
-#: diff.c:5515
+#: diff.c:5516
msgid "use unmodified files as source to find copies"
msgstr "使用未修改的文件做为发现拷贝的源"
-#: diff.c:5517
+#: diff.c:5518
msgid "disable rename detection"
msgstr "禁用重命名探测"
-#: diff.c:5520
+#: diff.c:5521
msgid "use empty blobs as rename source"
msgstr "使用空的数据对象做为重命名的源"
-#: diff.c:5522
+#: diff.c:5523
msgid "continue listing the history of a file beyond renames"
msgstr "继续列出文件重命名以外的历史记录"
-#: diff.c:5525
+#: diff.c:5526
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
-#: diff.c:5527
+#: diff.c:5528
msgid "Diff algorithm options"
msgstr "差异算法选项"
-#: diff.c:5529
+#: diff.c:5530
msgid "produce the smallest possible diff"
msgstr "生成尽可能小的差异"
-#: diff.c:5532
+#: diff.c:5533
msgid "ignore whitespace when comparing lines"
msgstr "行比较时忽略空白字符"
-#: diff.c:5535
+#: diff.c:5536
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字符的变更"
-#: diff.c:5538
+#: diff.c:5539
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字符变更"
-#: diff.c:5541
+#: diff.c:5542
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的回车符（CR）"
-#: diff.c:5544
+#: diff.c:5545
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的变更"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
msgid "<regex>"
msgstr "<正则>"
-#: diff.c:5547
+#: diff.c:5548
msgid "ignore changes whose all lines match <regex>"
msgstr "忽略所有行都和正则表达式匹配的变更"
-#: diff.c:5550
+#: diff.c:5551
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "启发式转换差异边界以便阅读"
-#: diff.c:5553
+#: diff.c:5554
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "使用 \"patience diff\" 算法生成差异"
-#: diff.c:5557
+#: diff.c:5558
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "使用 \"histogram diff\" 算法生成差异"
-#: diff.c:5559
+#: diff.c:5560
msgid "<algorithm>"
msgstr "<算法>"
-#: diff.c:5560
+#: diff.c:5561
msgid "choose a diff algorithm"
msgstr "选择一个差异算法"
-#: diff.c:5562
+#: diff.c:5563
msgid "<text>"
msgstr "<文本>"
-#: diff.c:5563
+#: diff.c:5564
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "使用 \"anchored diff\" 算法生成差异"
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5566 diff.c:5575 diff.c:5578
msgid "<mode>"
msgstr "<模式>"
-#: diff.c:5566
+#: diff.c:5567
msgid "show word diff, using <mode> to delimit changed words"
msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
-#: diff.c:5569
+#: diff.c:5570
msgid "use <regex> to decide what a word is"
msgstr "使用 <正则表达式> 确定何为一个词"
-#: diff.c:5572
+#: diff.c:5573
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
-#: diff.c:5575
+#: diff.c:5576
msgid "moved lines of code are colored differently"
msgstr "移动的代码行用不同方式着色"
-#: diff.c:5578
+#: diff.c:5579
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字符"
-#: diff.c:5581
+#: diff.c:5582
msgid "Other diff options"
msgstr "其它差异选项"
-#: diff.c:5583
+#: diff.c:5584
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
-#: diff.c:5587
+#: diff.c:5588
msgid "treat all files as text"
msgstr "把所有文件当做文本处理"
-#: diff.c:5589
+#: diff.c:5590
msgid "swap two inputs, reverse the diff"
msgstr "交换两个输入，反转差异"
-#: diff.c:5591
+#: diff.c:5592
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差异时退出码为 1，否则为 0"
-#: diff.c:5593
+#: diff.c:5594
msgid "disable all output of the program"
msgstr "禁用本程序的所有输出"
-#: diff.c:5595
+#: diff.c:5596
msgid "allow an external diff helper to be executed"
msgstr "允许执行一个外置的差异助手"
-#: diff.c:5597
+#: diff.c:5598
msgid "run external text conversion filters when comparing binary files"
msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
-#: diff.c:5599
+#: diff.c:5600
msgid "<when>"
msgstr "<何时>"
-#: diff.c:5600
+#: diff.c:5601
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差异时，忽略子模组的更改"
-#: diff.c:5603
+#: diff.c:5604
msgid "<format>"
msgstr "<格式>"
-#: diff.c:5604
+#: diff.c:5605
msgid "specify how differences in submodules are shown"
msgstr "指定子模组的差异如何显示"
-#: diff.c:5608
+#: diff.c:5609
msgid "hide 'git add -N' entries from the index"
msgstr "隐藏索引中 'git add -N' 条目"
-#: diff.c:5611
+#: diff.c:5612
msgid "treat 'git add -N' entries as real in the index"
msgstr "将索引中 'git add -N' 条目当做真实的"
-#: diff.c:5613
+#: diff.c:5614
msgid "<string>"
msgstr "<字符串>"
-#: diff.c:5614
+#: diff.c:5615
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "查找改变了指定字符串出现次数的差异"
-#: diff.c:5617
+#: diff.c:5618
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "查找改变指定正则匹配出现次数的差异"
-#: diff.c:5620
+#: diff.c:5621
msgid "show all changes in the changeset with -S or -G"
msgstr "显示使用 -S 或 -G 的变更集的所有变更"
-#: diff.c:5623
+#: diff.c:5624
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
-#: diff.c:5626
+#: diff.c:5627
msgid "control the order in which files appear in the output"
msgstr "控制输出中的文件显示顺序"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5628 diff.c:5631
msgid "<path>"
msgstr "<路径>"
-#: diff.c:5628
+#: diff.c:5629
msgid "show the change in the specified path first"
msgstr "先显示指定路径的变更"
-#: diff.c:5631
+#: diff.c:5632
msgid "skip the output to the specified path"
msgstr "跳过指定路径的输出"
-#: diff.c:5633
+#: diff.c:5634
msgid "<object-id>"
msgstr "<对象 ID>"
-#: diff.c:5634
+#: diff.c:5635
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "查找改变指定对象出现次数的差异"
-#: diff.c:5636
+#: diff.c:5637
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5638
msgid "select files by diff type"
msgstr "通过差异类型选择文件"
-#: diff.c:5639
+#: diff.c:5640
msgid "<file>"
msgstr "<文件>"
-#: diff.c:5640
-msgid "Output to a specific file"
-msgstr "输出到一个指定的文件"
+#: diff.c:5641
+msgid "output to a specific file"
+msgstr "输出到指定的文件"
-#: diff.c:6298
+#: diff.c:6321
msgid "exhaustive rename detection was skipped due to too many files."
msgstr "由于文件太多，跳过详尽的重命名检查。"
-#: diff.c:6301
+#: diff.c:6324
msgid "only found copies from modified paths due to too many files."
msgstr "由于文件太多，只在修改的路径中找到了拷贝。"
-#: diff.c:6304
+#: diff.c:6327
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3950,9 +4057,9 @@
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
-msgstr "读取排序文件 '%s' 失败"
+msgstr "无法读取排序文件 '%s'"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "正在进行非精确的重命名探测"
@@ -3981,39 +4088,47 @@
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
-msgstr "禁止 cone 模式匹配"
+msgstr "停用锥形模式匹配"
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "不能将 %s 用作排除文件"
-#: dir.c:2351
+#: dir.c:2419
#, c-format
msgid "could not open directory '%s'"
msgstr "不能打开目录 '%s'"
-#: dir.c:2653
+#: dir.c:2721
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
-#: dir.c:2777
+#: dir.c:2846
msgid "untracked cache is disabled on this system or location"
msgstr "缓存未跟踪文件在本系统或位置中被禁用"
-#: dir.c:3610
+#: dir.c:3119
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"无法猜到目录名。\n"
+"请在命令行指定一个目录"
+
+#: dir.c:3807
#, c-format
msgid "index file corrupt in repo %s"
msgstr "仓库 %s 中的索引文件损坏"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3854 dir.c:3859
#, c-format
msgid "could not create directories for %s"
msgstr "不能为 %s 创建目录"
-#: dir.c:3691
+#: dir.c:3888
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
@@ -4023,304 +4138,392 @@
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "提示：等待您的编辑器关闭文件...%c"
-#: entry.c:176
+#: entry.c:179
msgid "Filtering content"
msgstr "过滤内容"
-#: entry.c:497
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "不能对文件 '%s' 调用 stat"
-#: environment.c:152
+#: environment.c:147
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "错误的 git 名字空间路径 \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "不能设置 GIT_DIR 为 '%s'"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "执行 %s 的参数太多"
-#: fetch-pack.c:182
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：应为 shallow 列表"
-#: fetch-pack.c:185
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
-#: fetch-pack.c:196
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
-#: fetch-pack.c:216
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: fetch-pack.c:227
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "无法写到远程"
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc 需要 multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:397 fetch-pack.c:1460
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:403 fetch-pack.c:1466
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:405 fetch-pack.c:1468
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:408 fetch-pack.c:1471
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:410 fetch-pack.c:1473
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:413 fetch-pack.c:1477
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:453
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:470
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:501
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:514 progress.h:25
msgid "done"
msgstr "完成"
-#: fetch-pack.c:512
+#: fetch-pack.c:526
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:562
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
-#: fetch-pack.c:763
+#: fetch-pack.c:784
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"
-#: fetch-pack.c:849
+#: fetch-pack.c:870
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: fetch-pack.c:857
+#: fetch-pack.c:878
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"
-#: fetch-pack.c:951
+#: fetch-pack.c:974
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:980
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack：无效的 index-pack 输出"
-#: fetch-pack.c:974
+#: fetch-pack.c:997
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: fetch-pack.c:976
+#: fetch-pack.c:999
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1048
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
+#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
+#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
+#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
#, c-format
msgid "Server supports %s"
msgstr "服务器支持 %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1058
msgid "Server does not support shallow clients"
msgstr "服务器不支持浅客户端"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1118
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1123
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1127
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1129
msgid "Server does not support this repository's object format"
msgstr "服务器不支持这个仓库的对象格式"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1142
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
msgid "source repository is shallow, reject to clone."
msgstr "源仓库是浅克隆，拒绝克隆。"
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1157 fetch-pack.c:1705
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
-#: fetch-pack.c:1242
+#: fetch-pack.c:1271
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "不匹配的算法：客户端 %s，服务端 %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1275
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "服务器不支持算法 '%s'"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1308
msgid "Server does not support shallow requests"
msgstr "服务器不支持浅克隆请求"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1315
msgid "Server supports filter"
msgstr "服务器支持 filter"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1358 fetch-pack.c:2087
msgid "unable to write request to remote"
msgstr "无法将请求写到远程"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1376
#, c-format
msgid "error reading section header '%s'"
msgstr "读取节标题 '%s' 出错"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1382
#, c-format
msgid "expected '%s', received '%s'"
msgstr "预期 '%s'，得到 '%s'"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1416
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的确认行：'%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1421
#, c-format
msgid "error processing acks: %d"
msgstr "处理 ack 出错：%d"
-#: fetch-pack.c:1402
-msgid "expected packfile to be sent after 'ready'"
-msgstr "预期在 'ready' 之后发送 packfile"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1435
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "预期在 '%s' 之后发送 packfile"
-#: fetch-pack.c:1404
-msgid "expected no other sections to be sent after no 'ready'"
-msgstr "在没有 'ready' 不应该发送其它小节"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1441
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "在没有 '%s' 后不应该发送其它小节"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1482
#, c-format
msgid "error processing shallow info: %d"
msgstr "处理浅克隆信息出错：%d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1531
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "预期 wanted-ref，得到 '%s'"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1536
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref：'%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1541
#, c-format
msgid "error processing wanted refs: %d"
msgstr "处理要获取的引用出错：%d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1571
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack：预期响应结束包"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1983
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:2006 builtin/clone.c:587
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必需的对象"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2109
msgid "unexpected 'ready' from remote"
msgstr "来自远程的意外的 'ready'"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2132
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2135
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
-#: gpg-interface.c:273
+#: fsmonitor-ipc.c:119
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: 无效路径 '%s'"
+
+#: fsmonitor-ipc.c:125
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: 未知错误于 '%s'"
+
+#: fsmonitor-ipc.c:155
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon 没有运行"
+
+#: fsmonitor-ipc.c:164
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "无法发送 '%s' 命令至 fsmonitor--daemon"
+
+#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
+#: gpg-interface.c:1011
msgid "could not create temporary file"
msgstr "不能创建临时文件"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:459
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离式签名写入 '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:450
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在"
+
+#: gpg-interface.c:479
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n"
+"（openssh 8.2p1+ 版本可用）"
+
+#: gpg-interface.c:550
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "设置了 ssh 签名吊销文件但无法找到：%s"
+
+#: gpg-interface.c:638
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "坏的/不兼容的签名 '%s‘"
+
+#: gpg-interface.c:815 gpg-interface.c:820
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "无法得到密钥 '%s' 的 ssh 指纹"
+
+#: gpg-interface.c:843
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
+
+#: gpg-interface.c:865
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 成功，但没有返回密钥：%s %s"
+
+#: gpg-interface.c:871
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s"
+
+#: gpg-interface.c:966
msgid "gpg failed to sign the data"
-msgstr "gpg 数据签名失败"
+msgstr "gpg 无法为数据签名"
+
+#: gpg-interface.c:988
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "ssh 签名需要设置 user.signingkey"
+
+#: gpg-interface.c:999
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "无法将 ssh 签名密钥写入 '%s'"
+
+#: gpg-interface.c:1017
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'"
+
+#: gpg-interface.c:1035
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr "ssh 签名需要 ssh-keygen -Y sign （openssh 8.2p1+ 版本可用）"
+
+#: gpg-interface.c:1047
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "无法从 '%s' 读入 ssh 签名数据"
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: grep.c:531
+#: grep.c:446
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4328,109 +4531,109 @@
"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
"功能"
-#: grep.c:1895
+#: grep.c:1859
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
-msgstr "对 '%s' 调用 stat 失败"
+msgstr "无法对 '%s' 调用 stat"
-#: grep.c:1923
+#: grep.c:1887
#, c-format
msgid "'%s': short read"
msgstr "'%s'：读取不完整"
-#: help.c:23
+#: help.c:25
msgid "start a working area (see also: git help tutorial)"
msgstr "开始一个工作区（参见：git help tutorial）"
-#: help.c:24
+#: help.c:26
msgid "work on the current change (see also: git help everyday)"
msgstr "在当前变更上工作（参见：git help everyday）"
-#: help.c:25
+#: help.c:27
msgid "examine the history and state (see also: git help revisions)"
msgstr "检查历史和状态（参见：git help revisions）"
-#: help.c:26
+#: help.c:28
msgid "grow, mark and tweak your common history"
msgstr "扩展、标记和调校您的历史记录"
-#: help.c:27
+#: help.c:29
msgid "collaborate (see also: git help workflows)"
msgstr "协同（参见：git help workflows）"
-#: help.c:31
+#: help.c:33
msgid "Main Porcelain Commands"
msgstr "主要的上层命令"
-#: help.c:32
+#: help.c:34
msgid "Ancillary Commands / Manipulators"
msgstr "辅助命令/操作者"
-#: help.c:33
+#: help.c:35
msgid "Ancillary Commands / Interrogators"
msgstr "辅助命令/询问者"
-#: help.c:34
+#: help.c:36
msgid "Interacting with Others"
msgstr "与其它系统交互"
-#: help.c:35
+#: help.c:37
msgid "Low-level Commands / Manipulators"
msgstr "低级命令/操作者"
-#: help.c:36
+#: help.c:38
msgid "Low-level Commands / Interrogators"
msgstr "低级命令/询问者"
-#: help.c:37
+#: help.c:39
msgid "Low-level Commands / Syncing Repositories"
msgstr "低级命令/同步仓库"
-#: help.c:38
+#: help.c:40
msgid "Low-level Commands / Internal Helpers"
msgstr "低级命令/内部助手"
-#: help.c:300
+#: help.c:316
#, c-format
msgid "available git commands in '%s'"
msgstr "在 '%s' 下可用的 git 命令"
-#: help.c:307
+#: help.c:323
msgid "git commands available from elsewhere on your $PATH"
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
-#: help.c:316
+#: help.c:332
msgid "These are common Git commands used in various situations:"
msgstr "这些是各种场合常见的 Git 命令："
-#: help.c:365 git.c:100
+#: help.c:382 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "不支持的命令列表类型 '%s'"
-#: help.c:405
+#: help.c:422
msgid "The Git concept guides are:"
msgstr "Git 概念向导有："
-#: help.c:429
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "执行 'git help <command>' 来查看特定子命令"
-
-#: help.c:434
+#: help.c:446
msgid "External commands"
msgstr "外部命令"
-#: help.c:449
+#: help.c:468
msgid "Command aliases"
msgstr "命令别名"
-#: help.c:527
+#: help.c:486
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "执行 'git help <command>' 来了解特定子命令"
+
+#: help.c:563
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4439,31 +4642,36 @@
"'%s' 像是一个 git 命令，但却无法运行。\n"
"可能是 git-%s 受损？"
-#: help.c:543 help.c:631
+#: help.c:585 help.c:682
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
-#: help.c:591
+#: help.c:633
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀，您的系统中未发现 Git 命令。"
-#: help.c:613
+#: help.c:655
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
-#: help.c:618
+#: help.c:660
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
-msgstr "假定你想要的是 '%s' 并继续。"
+msgstr "假定您想要的是 '%s' 并继续。"
-#: help.c:623
+#: help.c:666
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "取而代之运行 '%s' [y/N]？"
+
+#: help.c:674
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
+msgstr "假定您想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
-#: help.c:635
+#: help.c:686
msgid ""
"\n"
"The most similar command is"
@@ -4477,16 +4685,16 @@
"\n"
"最相似的命令是"
-#: help.c:675
+#: help.c:729
msgid "git version [<options>]"
msgstr "git version [<选项>]"
-#: help.c:730
+#: help.c:784
#, c-format
msgid "%s: %s - %s"
msgstr "%s：%s - %s"
-#: help.c:734
+#: help.c:788
msgid ""
"\n"
"Did you mean this?"
@@ -4500,15 +4708,29 @@
"\n"
"您指的是这其中的某一个么？"
-#: ident.c:353
+#: hook.c:28
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
+"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
+
+#: hook.c:87
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "不能启动钩子 '%s'\n"
+
+#: ident.c:354
msgid "Author identity unknown\n"
msgstr "作者身份未知\n"
-#: ident.c:356
+#: ident.c:357
msgid "Committer identity unknown\n"
msgstr "提交者身份未知\n"
-#: ident.c:362
+#: ident.c:363
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -4523,7 +4745,7 @@
"\n"
msgstr ""
"\n"
-"*** 请告诉我你是谁。\n"
+"*** 请告诉我您是谁。\n"
"\n"
"运行\n"
"\n"
@@ -4533,71 +4755,71 @@
"来设置您账号的缺省身份标识。\n"
"如果仅在本仓库设置身份标识，则省略 --global 参数。\n"
-#: ident.c:397
+#: ident.c:398
msgid "no email was given and auto-detection is disabled"
msgstr "未提供邮件地址且自动探测被禁用"
-#: ident.c:402
+#: ident.c:403
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "无法自动探测邮件地址（得到 '%s'）"
-#: ident.c:419
+#: ident.c:420
msgid "no name was given and auto-detection is disabled"
msgstr "未提供姓名且自动探测被禁用"
-#: ident.c:425
+#: ident.c:426
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "无法自动探测姓名（得到 '%s'）"
-#: ident.c:433
+#: ident.c:434
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "不允许空的姓名（对于 <%s>）"
-#: ident.c:439
+#: ident.c:440
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中仅包含禁用字符：%s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:455 builtin/commit.c:649
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式：%s"
-#: list-objects-filter-options.c:83
+#: list-objects-filter-options.c:68
msgid "expected 'tree:<depth>'"
msgstr "期望 'tree:<深度>'"
-#: list-objects-filter-options.c:98
+#: list-objects-filter-options.c:83
msgid "sparse:path filters support has been dropped"
msgstr "sparse:path 过滤器支持已被删除"
-#: list-objects-filter-options.c:105
+#: list-objects-filter-options.c:90
#, c-format
msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "'object:type=<type>' 的值 '%s' 不是有效的对象类型"
-#: list-objects-filter-options.c:124
+#: list-objects-filter-options.c:109
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "无效的过滤器表达式 '%s'"
-#: list-objects-filter-options.c:140
+#: list-objects-filter-options.c:125
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'"
-#: list-objects-filter-options.c:182
+#: list-objects-filter-options.c:167
msgid "expected something after combine:"
msgstr "期望在组合后有一些东西："
-#: list-objects-filter-options.c:264
+#: list-objects-filter-options.c:249
msgid "multiple filter-specs cannot be combined"
msgstr "不能混用多种过滤规格"
-#: list-objects-filter-options.c:376
+#: list-objects-filter-options.c:365
msgid "unable to upgrade repository format to support partial clone"
msgstr "无法升级仓库格式以支持部分克隆"
@@ -4611,17 +4833,17 @@
msgid "unable to parse sparse filter data in %s"
msgstr "无法解析 %s 中的稀疏过滤器数据"
-#: list-objects.c:127
+#: list-objects.c:144
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对象"
-#: list-objects.c:140
+#: list-objects.c:157
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象"
-#: list-objects.c:398
+#: list-objects.c:415
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "无法为提交 %s 加载根树"
@@ -4649,12 +4871,12 @@
msgid "Unable to create '%s.lock': %s"
msgstr "不能创建 '%s.lock'：%s"
-#: ls-refs.c:37
+#: ls-refs.c:175
#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "lsrefs.unborn 的取值 '%s' 无效"
+msgid "unexpected line: '%s'"
+msgstr "意外的行：'%s'"
-#: ls-refs.c:167
+#: ls-refs.c:179
msgid "expected flush after ls-refs arguments"
msgstr "在 ls-refs 参数后应该有一个 flush 包"
@@ -4662,37 +4884,37 @@
msgid "quoted CRLF detected"
msgstr "检测到被引用的 CRLF"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "'%2$s' 的错误动作 '%1$s'"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1630 merge-recursive.c:1214
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "无法合并子模组 %s （没有检出）"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1639 merge-recursive.c:1221
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "无法合并子模组 %s（提交不存在）"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1648 merge-recursive.c:1228
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "无法合并子模组 %s （提交未跟随合并基线）"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1658 merge-ort.c:1666
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "注意：快进子模组 %s 到 %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1688
#, c-format
msgid "Failed to merge submodule %s"
msgstr "无法合并子模组 %s"
-#: merge-ort.c:1632
+#: merge-ort.c:1695
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4701,7 +4923,7 @@
"无法合并子模组 %s，但是存在一个可能的合并方案：\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1699 merge-recursive.c:1284
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4717,7 +4939,7 @@
"\n"
"以接受此建议。\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1712
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4726,21 +4948,21 @@
"无法合并子模组 %s，但是存在多个可能的合并：\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1937 merge-recursive.c:1375
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1942 merge-recursive.c:1380
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1949 merge-recursive.c:1413
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2088 merge-recursive.c:2135
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4749,7 +4971,7 @@
"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
"在：%s。"
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2098 merge-recursive.c:2145
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4758,7 +4980,7 @@
"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
"径放置于此：%s"
-#: merge-ort.c:2087
+#: merge-ort.c:2156
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4768,14 +4990,14 @@
"冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目"
"录中，没有一个目标目录中包含多数文件。"
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2310 merge-recursive.c:2481
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2450 merge-recursive.c:3264
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4783,7 +5005,7 @@
msgstr ""
"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2457 merge-recursive.c:3271
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4792,7 +5014,7 @@
"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
"动到 %5$s。"
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2470 merge-recursive.c:3267
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4801,7 +5023,7 @@
"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
"到 %s。"
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2478 merge-recursive.c:3274
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4810,13 +5032,13 @@
"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
"建议将其移动到 %5$s。"
-#: merge-ort.c:2569
+#: merge-ort.c:2634
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。"
-#: merge-ort.c:2664
+#: merge-ort.c:2729
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4826,29 +5048,29 @@
"冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这"
"可能导致嵌套的冲突标签。"
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2748 merge-ort.c:2772
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。"
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3261 merge-recursive.c:3025
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3264 merge-recursive.c:3028
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
-#: merge-ort.c:3613
+#: merge-ort.c:3693
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。"
-#: merge-ort.c:3689
+#: merge-ort.c:3770
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4857,7 +5079,7 @@
"冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位"
"置。"
-#: merge-ort.c:3696
+#: merge-ort.c:3777
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4866,24 +5088,24 @@
"冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同"
"位置。"
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3866 merge-recursive.c:3104
msgid "content"
msgstr "内容"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3868 merge-recursive.c:3108
msgid "add/add"
msgstr "添加/添加"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3870 merge-recursive.c:3153
msgid "submodule"
msgstr "子模组"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3872 merge-recursive.c:3154
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突（%s）：合并冲突于 %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3916
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4892,7 +5114,7 @@
"冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
"在树中被保留。"
-#: merge-ort.c:4120
+#: merge-ort.c:4212
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4902,12 +5124,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4586
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "无法收集树 %s、%s、%s 的合并信息"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3723
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4916,103 +5138,103 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
msgid "Already up to date."
msgstr "已经是最新的。"
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "（坏提交）\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
-msgstr "创建路径 '%s'%s 失败"
+msgstr "无法创建路径 '%s'%s"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr "：可能是一个目录/文件冲突？"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:47
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据对象"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
-msgstr "打开 '%s' 失败：%s"
+msgstr "无法打开 '%s'：%s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
-msgstr "创建符号链接 '%s' 失败：%s"
+msgstr "无法创建符号链接 '%s'：%s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "子模组 %s 快进到如下提交："
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1239 merge-recursive.c:1252
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "快进子模组 %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1280
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "无法合并子模组 %s（非快进）"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1281
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "找到子模组的一个可能的合并方案：\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1293
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "无法合并子模组 %s （发现多个合并）"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1437
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
-#: merge-recursive.c:1492
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5021,7 +5243,7 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本被保留。"
-#: merge-recursive.c:1497
+#: merge-recursive.c:1514
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5030,7 +5252,7 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"
-#: merge-recursive.c:1504
+#: merge-recursive.c:1521
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5039,7 +5261,7 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本保留在 %8$s 中。"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5048,60 +5270,60 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "rename"
msgstr "重命名"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒绝丢失脏文件 '%s'"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1622
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
-#: merge-recursive.c:1663
+#: merge-recursive.c:1680
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1711
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1716
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1743
#, c-format
msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+"\"%s\"->\"%s\" in \"%s\"%s"
msgstr ""
"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1748
msgid " (left unresolved)"
msgstr "（留下未解决）"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1840
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
-"%5$s"
+"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s-"
+">%5$s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2103
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5111,7 +5333,7 @@
"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
"其它目录，没有目录包含大部分文件。"
-#: merge-recursive.c:2220
+#: merge-recursive.c:2237
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5120,269 +5342,305 @@
"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
"%4$s->%5$s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3131
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s（已经做过相同合并）"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3184
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3388
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3411
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3416
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3423
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
-#: merge-recursive.c:3415
+#: merge-recursive.c:3432
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3441
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "冲突（add/add）：合并冲突于 %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3494
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3588
msgid "Merging:"
msgstr "合并："
-#: merge-recursive.c:3584
+#: merge-recursive.c:3601
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："
-#: merge-recursive.c:3634
+#: merge-recursive.c:3651
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3823
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "不能写入索引。"
#: merge.c:41
msgid "failed to read the cache"
-msgstr "读取缓存失败"
+msgstr "无法读取缓存"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
+#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
-#: midx.c:74
+#: midx.c:79
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "多包索引的对象ID扇出表大小错误"
-#: midx.c:105
+#: midx.c:112
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引文件 %s 太小"
-#: midx.c:121
+#: midx.c:128
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
-#: midx.c:126
+#: midx.c:133
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被识别"
-#: midx.c:131
+#: midx.c:138
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
-#: midx.c:148
+#: midx.c:155
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名块"
-#: midx.c:150
+#: midx.c:157
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "多包索引缺少必需的对象 ID 扇出块"
-#: midx.c:152
+#: midx.c:159
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "多包索引缺少必需的对象 ID 查询块"
-#: midx.c:154
+#: midx.c:161
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的对象偏移块"
-#: midx.c:170
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
-#: midx.c:214
+#: midx.c:228
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "错的 pack-int-id：%u（共有 %u 个包）"
-#: midx.c:264
+#: midx.c:278
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
-#: midx.c:490
+#: midx.c:509
#, c-format
msgid "failed to add packfile '%s'"
-msgstr "添加包文件 '%s' 失败"
+msgstr "无法添加包文件 '%s'"
-#: midx.c:496
+#: midx.c:515
#, c-format
msgid "failed to open pack-index '%s'"
-msgstr "打开包索引 '%s' 失败"
+msgstr "无法打开包索引 '%s'"
-#: midx.c:564
+#: midx.c:583
#, c-format
msgid "failed to locate object %d in packfile"
-msgstr "在包文件中定位对象 %d 失败"
+msgstr "无法在包文件中定位对象 %d"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:911
msgid "cannot store reverse index file"
msgstr "无法存储反向索引文件"
-#: midx.c:920
+#: midx.c:1009
+#, c-format
+msgid "could not parse line: %s"
+msgstr "不能解析行：%s"
+
+#: midx.c:1011
+#, c-format
+msgid "malformed line: %s"
+msgstr "格式错误的行：%s"
+
+#: midx.c:1181
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "忽略已存在的多包索引，校验码不匹配"
-#: midx.c:943
+#: midx.c:1206
+msgid "could not load pack"
+msgstr "不能载入包"
+
+#: midx.c:1212
+#, c-format
+msgid "could not open index for %s"
+msgstr "不能打开 %s 的索引"
+
+#: midx.c:1223
msgid "Adding packfiles to multi-pack-index"
msgstr "添加包文件到多包索引"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "没有看到要丢弃的包文件 %s"
-
-#: midx.c:1034
+#: midx.c:1266
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "未知的首选包：'%s'"
-#: midx.c:1039
+#: midx.c:1311
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "不能选择没有对象的首选包 %s"
+
+#: midx.c:1343
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "没有看到要丢弃的包文件 %s"
+
+#: midx.c:1389
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "首选包 '%s' 已过期"
-#: midx.c:1055
+#: midx.c:1402
msgid "no pack files to index."
msgstr "没有要索引的包文件。"
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1409
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "拒绝写入没有任何对象的多包位图 .bitmap"
+
+#: midx.c:1451
+msgid "could not write multi-pack bitmap"
+msgstr "无法写入多包位图"
+
+#: midx.c:1461
+msgid "could not write multi-pack-index"
+msgstr "无法写入多包索引"
+
+#: midx.c:1520 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
-msgstr "删除 %s 失败"
+msgstr "无法删除 %s"
-#: midx.c:1166
+#: midx.c:1553
#, c-format
msgid "failed to clear multi-pack-index at %s"
-msgstr "清理位于 %s 的多包索引失败"
+msgstr "无法清理位于 %s 的多包索引"
-#: midx.c:1225
+#: midx.c:1616
msgid "multi-pack-index file exists, but failed to parse"
msgstr "多包索引文件存在，但无法解析"
-#: midx.c:1233
+#: midx.c:1624
msgid "incorrect checksum"
msgstr "不正确的校验码"
-#: midx.c:1236
+#: midx.c:1627
msgid "Looking for referenced packfiles"
msgstr "正在查找引用的包文件"
-#: midx.c:1251
+#: midx.c:1642
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1647
msgid "the midx contains no oid"
msgstr "midx 不包含 oid"
-#: midx.c:1265
+#: midx.c:1656
msgid "Verifying OID order in multi-pack-index"
msgstr "校验多包索引中的 OID 顺序"
-#: midx.c:1274
+#: midx.c:1665
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1685
msgid "Sorting objects by packfile"
msgstr "通过包文件为对象排序"
-#: midx.c:1301
+#: midx.c:1692
msgid "Verifying object offsets"
msgstr "校验对象偏移"
-#: midx.c:1317
+#: midx.c:1708
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
-msgstr "为 oid[%d] = %s 加载包条目失败"
+msgstr "无法为 oid[%d] = %s 加载包条目"
-#: midx.c:1323
+#: midx.c:1714
#, c-format
msgid "failed to load pack-index for packfile %s"
-msgstr "为包文件 %s 加载包索引失败"
+msgstr "无法为包文件 %s 加载包索引"
-#: midx.c:1332
+#: midx.c:1723
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1750
msgid "Counting referenced objects"
msgstr "正在对引用对象计数"
-#: midx.c:1367
+#: midx.c:1760
msgid "Finding and deleting unreferenced packfiles"
msgstr "正在查找和删除未引用的包文件"
-#: midx.c:1558
+#: midx.c:1952
msgid "could not start pack-objects"
msgstr "不能开始 pack-objects"
-#: midx.c:1578
+#: midx.c:1972
msgid "could not finish pack-objects"
msgstr "不能结束 pack-objects"
@@ -5401,7 +5659,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "不能加入 lazy_name 线程：%s"
-#: notes-merge.c:277
+#: notes-merge.c:276
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -5412,7 +5670,7 @@
"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "
"notes merge --abort' 来提交/终止前一次合并。"
-#: notes-merge.c:284
+#: notes-merge.c:283
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "您尚未结束注释合并（存在 %s）。"
@@ -5440,271 +5698,342 @@
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值：'%s'"
-#: object-file.c:526
+#: object-file.c:457
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:515
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "无法规范化备用对象路径：%s"
-#: object-file.c:658
+#: object-file.c:589
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s：忽略备用对象库，嵌套太深"
-#: object-file.c:665
+#: object-file.c:596
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "无法规范化对象目录: %s"
-#: object-file.c:708
+#: object-file.c:639
msgid "unable to fdopen alternates lockfile"
msgstr "无法 fdopen 替换锁文件"
-#: object-file.c:726
+#: object-file.c:657
msgid "unable to read alternates file"
msgstr "无法读取替代文件"
-#: object-file.c:733
+#: object-file.c:664
msgid "unable to move new alternates file into place"
msgstr "无法将新的替代文件移动到位"
-#: object-file.c:768
+#: object-file.c:742
#, c-format
msgid "path '%s' does not exist"
msgstr "路径 '%s' 不存在"
-#: object-file.c:789
+#: object-file.c:763
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-#: object-file.c:795
+#: object-file.c:769
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: object-file.c:801
+#: object-file.c:775
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "参考仓库 '%s' 是一个浅克隆"
-#: object-file.c:809
+#: object-file.c:783
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被移植"
-#: object-file.c:869
+#: object-file.c:814
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "无法找到和 %s 匹配的对象目录"
+
+#: object-file.c:864
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "解析备用引用时无效的行：%s"
-#: object-file.c:1019
+#: object-file.c:1014
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1049
#, c-format
msgid "mmap failed%s"
msgstr "mmap 失败%s"
-#: object-file.c:1218
+#: object-file.c:1230
#, c-format
msgid "object file %s is empty"
msgstr "对象文件 %s 为空"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1349 object-file.c:2588
#, c-format
msgid "corrupt loose object '%s'"
msgstr "损坏的松散对象 '%s'"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1351 object-file.c:2592
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "松散对象 '%s' 后面有垃圾数据"
-#: object-file.c:1397
+#: object-file.c:1473
+#, c-format
+msgid "unable to parse %s header"
+msgstr "无法解析 %s 头部"
+
+#: object-file.c:1475
msgid "invalid object type"
msgstr "无效的对象类型"
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
-
-#: object-file.c:1484
+#: object-file.c:1486
#, c-format
msgid "unable to unpack %s header"
msgstr "无法解开 %s 头部"
#: object-file.c:1490
#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "%s 的头部太长，超出了 %d 字节"
-#: object-file.c:1493
-#, c-format
-msgid "unable to parse %s header"
-msgstr "无法解析 %s 头部"
-
-#: object-file.c:1717
+#: object-file.c:1720
#, c-format
msgid "failed to read object %s"
-msgstr "读取对象 %s 失败"
+msgstr "无法读取对象 %s"
-#: object-file.c:1721
+#: object-file.c:1724
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: object-file.c:1725
+#: object-file.c:1728
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "松散对象 %s（保存在 %s）已损坏"
-#: object-file.c:1729
+#: object-file.c:1732
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包对象 %s（保存在 %s）已损坏"
-#: object-file.c:1834
+#: object-file.c:1855
#, c-format
msgid "unable to write file %s"
msgstr "无法写文件 %s"
-#: object-file.c:1841
+#: object-file.c:1862
#, c-format
msgid "unable to set permission to '%s'"
msgstr "无法为 '%s' 设置权限"
-#: object-file.c:1848
+#: object-file.c:1869
msgid "file write error"
msgstr "文件写错误"
-#: object-file.c:1868
+#: object-file.c:1904
msgid "error when closing loose object file"
msgstr "关闭松散对象文件时出错"
-#: object-file.c:1933
+#: object-file.c:1971
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
-#: object-file.c:1935
+#: object-file.c:1973
msgid "unable to create temporary file"
msgstr "无法创建临时文件"
-#: object-file.c:1959
+#: object-file.c:1997
msgid "unable to write loose object file"
msgstr "不能写松散对象文件"
-#: object-file.c:1965
+#: object-file.c:2003
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能压缩新对象 %s（%d）"
-#: object-file.c:1969
+#: object-file.c:2007
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
-#: object-file.c:1973
+#: object-file.c:2011
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "被 %s 的不稳定对象源数据搞糊涂了"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:2022 builtin/pack-objects.c:1251
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上调用 utime() 失败"
-#: object-file.c:2060
+#: object-file.c:2100
#, c-format
msgid "cannot read object for %s"
msgstr "不能读取对象 %s"
-#: object-file.c:2111
+#: object-file.c:2151
msgid "corrupt commit"
msgstr "损坏的提交"
-#: object-file.c:2119
+#: object-file.c:2159
msgid "corrupt tag"
msgstr "损坏的标签"
-#: object-file.c:2219
+#: object-file.c:2259
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 时读取错误"
-#: object-file.c:2222
+#: object-file.c:2262
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 时读入不完整"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2335 object-file.c:2345
#, c-format
msgid "%s: failed to insert into database"
-msgstr "%s：插入数据库失败"
+msgstr "%s：无法插入数据库"
-#: object-file.c:2311
+#: object-file.c:2351
#, c-format
msgid "%s: unsupported file type"
msgstr "%s：不支持的文件类型"
-#: object-file.c:2335
+#: object-file.c:2375 builtin/fetch.c:1494
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一个有效的对象"
-#: object-file.c:2337
+#: object-file.c:2377
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2404
#, c-format
msgid "unable to open %s"
msgstr "不能打开 %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2599
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s 的哈希值不匹配（预期 %s）"
-#: object-file.c:2583
+#: object-file.c:2622
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
-#: object-file.c:2588
+#: object-file.c:2628
#, c-format
msgid "unable to unpack header of %s"
msgstr "无法解压缩 %s 的头部"
-#: object-file.c:2594
+#: object-file.c:2633
#, c-format
msgid "unable to parse header of %s"
msgstr "无法解析 %s 的头部"
-#: object-file.c:2605
+#: object-file.c:2644
#, c-format
msgid "unable to unpack contents of %s"
msgstr "无法解压缩 %s 的内容"
-#: object-name.c:480
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c:382
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [坏的对象]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c:407
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s 提交 %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c:428
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s 标签 %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#. "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c:439
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [坏的标签，无法解析]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c:447
+#, c-format
+msgid "%s tree"
+msgstr "%s 树"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c:453
+#, c-format
+msgid "%s blob"
+msgstr "%s 数据对象"
+
+#: object-name.c:569
#, c-format
msgid "short object ID %s is ambiguous"
msgstr "短对象ID %s 存在歧义"
-#: object-name.c:491
-msgid "The candidates are:"
-msgstr "候选者有："
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c:591
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"候选者有：\n"
+"%s"
-#: object-name.c:790
+#: object-name.c:888
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5725,22 +6054,22 @@
"引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
"false\" 命令关闭本消息通知。"
-#: object-name.c:910
+#: object-name.c:1008
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "'%.*s' 的日志仅能回到 %s"
-#: object-name.c:918
+#: object-name.c:1016
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "'%.*s' 的日志仅有 %d 个条目"
-#: object-name.c:1696
+#: object-name.c:1794
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中"
-#: object-name.c:1702
+#: object-name.c:1800
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
@@ -5749,12 +6078,12 @@
"路径 '%s' 存在，而 '%s' 不存在\n"
"提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？"
-#: object-name.c:1711
+#: object-name.c:1809
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "路径 '%s' 不在 '%.*s' 中"
-#: object-name.c:1739
+#: object-name.c:1837
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
@@ -5763,7 +6092,7 @@
"路径 '%s' 在索引中，但不在暂存区 %d 中\n"
"提示：您的意思是 ':%d:%s'？"
-#: object-name.c:1755
+#: object-name.c:1853
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
@@ -5772,21 +6101,26 @@
"路径 '%s' 在索引中，但 '%s' 不在\n"
"提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？"
-#: object-name.c:1763
+#: object-name.c:1861
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "路径 '%s' 在磁盘上，但不在索引里"
-#: object-name.c:1765
+#: object-name.c:1863
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）"
-#: object-name.c:1778
+#: object-name.c:1876
msgid "relative path syntax can't be used outside working tree"
msgstr "不能在工作区之外使用相对路径语法"
-#: object-name.c:1916
+#: object-name.c:1901
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "需要 <对象>:<路径>，只给出了 <对象> '%s'"
+
+#: object-name.c:2014
#, c-format
msgid "invalid object name '%.*s'."
msgstr "无效的对象名 '%.*s'。"
@@ -5811,17 +6145,30 @@
msgid "unable to parse object: %s"
msgstr "不能解析对象：%s"
-#: object.c:283 object.c:295
+#: object.c:283 object.c:294
#, c-format
msgid "hash mismatch %s"
msgstr "哈希值与 %s 不匹配"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "多包位图缺少必需的反向索引"
+
+#: pack-bitmap.c:433
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index：无法打开包"
+
+#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
#, c-format
msgid "unable to get size of %s"
msgstr "无法得到 %s 的大小"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1937
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s"
+
+#: pack-bitmap.c:1973 builtin/rev-list.c:91
#, c-format
msgid "unable to get disk usage of %s"
msgstr "无法得到 %s 的磁盘使用量"
@@ -5851,129 +6198,134 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "无法同时写入和校验反向索引"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "不能调用 stat：%s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "无法设置 %s 为可读"
-#: pack-write.c:522
+#: pack-write.c:521
#, c-format
msgid "could not write '%s' promisor file"
msgstr "无法写入 '%s' 承诺者文件"
-#: packfile.c:625
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-#: packfile.c:655
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "包文件 %s 不能被映射%s"
-#: packfile.c:1934
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-#: packfile.c:1938
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "选项 `%s' 期望一个数字值"
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "格式错误的到期时间：'%s'"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "格式错误的对象名 '%s'"
-#: parse-options.c:38
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "选项 `%s' 期望 \"%s\" 或 \"%s\""
+
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s 需要一个值"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s 与 %s 不兼容"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s：和其它的不兼容"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s 不取值"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s 不可用"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
-msgstr "你的意思是 `--%s`（有两个短线）？"
+msgstr "您的意思是 `--%s`（有两个短线）？"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "--%s 的别名"
-#: parse-options.c:879
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "未知选项 `%s'"
-#: parse-options.c:881
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "未知开关 `%c'"
-#: parse-options.c:883
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "字符串中未知的非 ascii 字符选项：`%s'"
-#: parse-options.c:907
+#: parse-options.c:920
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "用法：%s"
@@ -5981,98 +6333,122 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " 或：%s"
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:935
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-数字"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能设置 %s 为组可写"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "只允许一个 'attr:' 规格。"
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "属性规格不能为空"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "无效的属性名 %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "路径规格包含无效的神奇前缀"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s：'literal' 和 'glob' 不兼容"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s：'%s' 在位于 '%s' 的仓库之外"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'（助记符：'%c'）"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规格 '%s' 位于符号链接中"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "行被错误地引用：%s"
@@ -6093,7 +6469,7 @@
msgid "flush packet write failed"
msgstr "flush 包写错误"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "协议错误：不可能的长行"
@@ -6101,7 +6477,7 @@
msgid "packet write with format failed"
msgstr "格式化包写入错误"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr "写数据包失败：数据超过了包的最大长度"
@@ -6110,25 +6486,25 @@
msgid "packet write failed: %s"
msgstr "数据包写入失败：%s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "读取错误"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "远端意外挂断了"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "协议错误：错误的行长度字符串：%.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "协议错误：错误的行长度 %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "远程错误：%s"
@@ -6142,7 +6518,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "无法创建线程 lstat：%s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
@@ -6171,88 +6547,84 @@
msgid "Removing duplicate objects"
msgstr "正在删除重复对象"
-#: range-diff.c:78
+#: range-diff.c:68
msgid "could not start `log`"
msgstr "不能启动 `log`"
-#: range-diff.c:80
+#: range-diff.c:70
msgid "could not read `log` output"
msgstr "不能读取 `log` 的输出"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:98 sequencer.c:5575
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
-#: range-diff.c:115
+#: range-diff.c:109
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
"'%s'"
msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'"
-#: range-diff.c:140
+#: range-diff.c:132
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "无法解析 git 头 '%.*s'"
-#: range-diff.c:307
+#: range-diff.c:300
msgid "failed to generate diff"
-msgstr "生成 diff 失败"
+msgstr "无法生成 diff"
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only 和 --right-only 互斥"
-
-#: range-diff.c:562 range-diff.c:564
+#: range-diff.c:558 range-diff.c:560
#, c-format
msgid "could not parse log for '%s'"
msgstr "不能解析 '%s' 的日志"
-#: read-cache.c:710
+#: read-cache.c:737
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"
-#: read-cache.c:726
+#: read-cache.c:753
msgid "cannot create an empty blob in the object database"
msgstr "不能在对象数据库中创建空的数据对象"
-#: read-cache.c:748
+#: read-cache.c:775
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr "%s：只能添加常规文件、符号链接或 git 目录"
-#: read-cache.c:753
+#: read-cache.c:780 builtin/submodule--helper.c:3359
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' 没有检出一个提交"
-#: read-cache.c:805
+#: read-cache.c:832
#, c-format
msgid "unable to index file '%s'"
msgstr "无法索引文件 '%s'"
-#: read-cache.c:824
+#: read-cache.c:851
#, c-format
msgid "unable to add '%s' to index"
msgstr "无法在索引中添加 '%s'"
-#: read-cache.c:835
+#: read-cache.c:862
#, c-format
msgid "unable to stat '%s'"
msgstr "无法对 %s 执行 stat"
-#: read-cache.c:1358
+#: read-cache.c:1404
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' 看起来既是文件又是目录"
-#: read-cache.c:1573
+#: read-cache.c:1619
msgid "Refresh index"
msgstr "刷新索引"
-#: read-cache.c:1705
+#: read-cache.c:1751
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6261,7 +6633,7 @@
"设置了 index.version，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1715
+#: read-cache.c:1761
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6270,144 +6642,148 @@
"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1771
+#: read-cache.c:1817
#, c-format
msgid "bad signature 0x%08x"
msgstr "坏的签名 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1820
#, c-format
msgid "bad index version %d"
msgstr "坏的索引版本 %d"
-#: read-cache.c:1783
+#: read-cache.c:1829
msgid "bad index file sha1 signature"
msgstr "坏的索引文件 sha1 签名"
-#: read-cache.c:1817
+#: read-cache.c:1863
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "索引使用不被支持的 %.4s 扩展"
#
-#: read-cache.c:1819
+#: read-cache.c:1865
#, c-format
msgid "ignoring %.4s extension"
msgstr "忽略 %.4s 扩展"
-#: read-cache.c:1856
+#: read-cache.c:1902
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "未知的索引条目格式 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1918
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "索引中靠近路径 '%s' 有错误的名称字段"
-#: read-cache.c:1929
+#: read-cache.c:1975
msgid "unordered stage entries in index"
msgstr "索引中有未排序的暂存条目"
-#: read-cache.c:1932
+#: read-cache.c:1978
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "合并文件 '%s' 有多个暂存条目"
-#: read-cache.c:1935
+#: read-cache.c:1981
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' 的未排序暂存条目"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
+#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
+#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
+#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
+#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
+#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: read-cache.c:2185
+#: read-cache.c:2240
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "无法创建 load_cache_entries 线程：%s"
-#: read-cache.c:2198
+#: read-cache.c:2253
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "无法加入 load_cache_entries 线程：%s"
-#: read-cache.c:2231
+#: read-cache.c:2286
#, c-format
msgid "%s: index file open failed"
msgstr "%s：打开索引文件失败"
-#: read-cache.c:2235
+#: read-cache.c:2290
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s：不能对打开的索引执行 stat 操作"
-#: read-cache.c:2239
+#: read-cache.c:2294
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s：索引文件比预期的小"
-#: read-cache.c:2243
+#: read-cache.c:2298
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s：无法映射索引文件%s"
-#: read-cache.c:2286
+#: read-cache.c:2341
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "无法创建 load_index_extensions 线程：%s"
-#: read-cache.c:2313
+#: read-cache.c:2368
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "无法加入 load_index_extensions 线程：%s"
-#: read-cache.c:2351
+#: read-cache.c:2414
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "无法刷新共享索引 '%s'"
-#: read-cache.c:2398
+#: read-cache.c:2473
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3032
+msgid "cannot write split index for a sparse index"
+msgstr "无法为稀疏索引写入拆分索引"
+
+#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: read-cache.c:3075
+#: read-cache.c:3157
msgid "failed to convert to a sparse-index"
msgstr "无法转换为稀疏索引"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3228
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: read-cache.c:3159
+#: read-cache.c:3241
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录：%s"
-#: read-cache.c:3171
+#: read-cache.c:3253
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除：%s"
-#: read-cache.c:3200
+#: read-cache.c:3282
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "不能修复 '%s' 的权限位"
-#: read-cache.c:3349
+#: read-cache.c:3439
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s：不能落到暂存区 #0"
@@ -6480,7 +6856,7 @@
msgstr[0] "变基 %s 到 %s（%d 个提交）"
msgstr[1] "变基 %s 到 %s（%d 个提交）"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6488,7 +6864,7 @@
"\n"
"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6496,7 +6872,7 @@
"\n"
"如果您在这里删除一行，对应的提交将会丢失。\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6510,7 +6886,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6520,14 +6896,14 @@
"然而，如果您删除全部内容，变基操作将会终止。\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
+#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
+#: builtin/rebase.c:191
#, c-format
msgid "could not write '%s'"
msgstr "不能写入 '%s'"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "不能写入 '%s'。"
@@ -6557,14 +6933,12 @@
"可选值有：ignore、warn、error。\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "不能读取 '%s'。"
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s：'preserve' 被 'merges' 取代"
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2057
msgid "gone"
msgstr "丢失"
@@ -6583,257 +6957,238 @@
msgid "ahead %d, behind %d"
msgstr "领先 %d，落后 %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式：%%(color:<颜色>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "未能识别的颜色：%%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整数值 refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整数值 refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "未能识别的 %%(%s) 参数：%s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) 不带参数"
-#: ref-filter.c:339
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "未能识别的 %%(objectsize) 参数：%s"
-
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) 不带参数"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
-#: ref-filter.c:372
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "未能识别的 %%(subject) 参数：%s"
-
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "预期 %%(trailers:key=<值>)"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "未知的 %%(trailers) 参数：%s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一个正数 contents:lines=%s"
-#: ref-filter.c:426
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "未能识别的 %%(contents) 参数：%s"
-
-#: ref-filter.c:441
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
-#: ref-filter.c:445
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'"
-
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "未识别的邮件选项：%s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式：%%(align:<宽度>,<位置>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "未能识别的位置：%s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "未能识别的宽度：%s"
-#: ref-filter.c:517
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "未能识别的 %%(align) 参数：%s"
-
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
-#: ref-filter.c:543
+#: ref-filter.c:568
#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "未能识别的 %%(if) 参数：%s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) 不带参数"
-#: ref-filter.c:645
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "格式错误的字段名：%.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的字段名：%.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据"
-#: ref-filter.c:801
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "格式：在没有 %%(%2$s) 元素的情况下使用了 %%(%1$s) 元素"
-#: ref-filter.c:865
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
-
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式：%%(then) 元素用了多次"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
-#: ref-filter.c:897
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
-
-#: ref-filter.c:899
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
-
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式：%%(else) 元素用了多次"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "错误的格式化字符串 %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "这个命令拒绝元素 %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用"
+
+#: ref-filter.c:1707
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "（非分支，正变基 %s）"
-#: ref-filter.c:1624
+#: ref-filter.c:1710
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "（非分支，正变基分离头指针 %s）"
-#: ref-filter.c:1627
+#: ref-filter.c:1713
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "（非分支，二分查找开始于 %s）"
-#: ref-filter.c:1631
+#: ref-filter.c:1717
#, c-format
msgid "(HEAD detached at %s)"
msgstr "（头指针在 %s 分离）"
-#: ref-filter.c:1634
+#: ref-filter.c:1720
#, c-format
msgid "(HEAD detached from %s)"
msgstr "（头指针自 %s 分离）"
-#: ref-filter.c:1637
+#: ref-filter.c:1723
msgid "(no branch)"
msgstr "（非分支）"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1755 ref-filter.c:1973
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
-#: ref-filter.c:1679
+#: ref-filter.c:1765
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-#: ref-filter.c:2064
+#: ref-filter.c:2156
#, c-format
msgid "malformed object at '%s'"
msgstr "格式错误的对象 '%s'"
-#: ref-filter.c:2153
+#: ref-filter.c:2246
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2251 refs.c:672
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
-#: ref-filter.c:2502
+#: ref-filter.c:2630
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2596
+#: ref-filter.c:2741
#, c-format
msgid "malformed object name %s"
msgstr "格式错误的对象名 %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2746
#, c-format
msgid "option `%s' must point to a commit"
msgstr "选项 `%s' 必须指向一个提交"
-#: refs.c:264
+#: reflog.c:407
+#, c-format
+msgid "not a reflog: %s"
+msgstr "不是一个引用日志：%s"
+
+#: reflog.c:410
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "没有 '%s' 的引用日志"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s 没有指向一个有效的对象！"
-#: refs.c:566
+#: refs.c:561
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6857,32 +7212,32 @@
"\n"
"\tgit branch -m <name>\n"
-#: refs.c:588
+#: refs.c:583
#, c-format
msgid "could not retrieve `%s`"
msgstr "无法获取 `%s`"
-#: refs.c:598
+#: refs.c:593
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "无效的分支名：%s = %s"
-#: refs.c:674
+#: refs.c:670
#, c-format
msgid "ignoring dangling symref %s"
msgstr "忽略悬空符号引用 %s"
-#: refs.c:922
+#: refs.c:919
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "引用 %s 的日志在 %s 之后有缺口"
-#: refs.c:929
+#: refs.c:926
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "引用 %s 的日志意外终止于 %s "
-#: refs.c:994
+#: refs.c:991
#, c-format
msgid "log for %s is empty"
msgstr "%s 的日志为空"
@@ -6892,46 +7247,46 @@
msgid "refusing to update ref with bad name '%s'"
msgstr "拒绝更新有错误名称 '%s' 的引用"
-#: refs.c:1157
+#: refs.c:1164
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "对引用 '%s' 执行 update_ref 失败：%s"
-#: refs.c:2051
+#: refs.c:2059
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "不允许对引用 '%s' 多次更新"
-#: refs.c:2131
+#: refs.c:2145
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔离环境中禁止更新引用"
-#: refs.c:2142
+#: refs.c:2156
msgid "ref updates aborted by hook"
msgstr "引用更新被钩子中止"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2264 refs.c:2294
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' 已存在，无法创建 '%s'"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2270 refs.c:2305
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "无法同时处理 '%s' 和 '%s'"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1295
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1310 refs/packed-backend.c:1565
+#: refs/packed-backend.c:1575
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s：%s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1313 refs/packed-backend.c:1578
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用：%s"
@@ -6941,50 +7296,50 @@
msgid "invalid refspec '%s'"
msgstr "无效的引用规格：'%s'"
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "配置的远程短名称不能以 '/' 开始：%s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "提供了一个以上的 receivepack，使用第一个"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "提供了一个以上的 uploadpack，使用第一个"
-#: remote.c:590
+#: remote.c:698
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同时获取 %s 和 %s 至 %s"
-#: remote.c:594
+#: remote.c:702
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %s，而非 %s"
-#: remote.c:598
+#: remote.c:706
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同时跟踪 %s 和 %s"
-#: remote.c:666
+#: remote.c:774
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "模式的键 '%s' 没有 '*'"
-#: remote.c:676
+#: remote.c:784
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "模式的值 '%s' 没有 '*'"
-#: remote.c:1083
+#: remote.c:1191
#, c-format
msgid "src refspec %s does not match any"
msgstr "源引用规格 %s 没有匹配"
-#: remote.c:1088
+#: remote.c:1196
#, c-format
msgid "src refspec %s matches more than one"
msgstr "源引用规格 %s 匹配超过一个"
@@ -6993,7 +7348,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1211
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -7015,7 +7370,7 @@
"\n"
"都不行，所以我们已放弃。您必须给出完整的引用。"
-#: remote.c:1123
+#: remote.c:1231
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -7025,7 +7380,7 @@
"引用规格的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
"'%s:refs/heads/%s' 推送么？"
-#: remote.c:1128
+#: remote.c:1236
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -7035,7 +7390,7 @@
"引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
"'%s:refs/tags/%s' 推送么？"
-#: remote.c:1133
+#: remote.c:1241
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -7045,7 +7400,7 @@
"引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
"'%s:refs/tags/%s' 推送么？"
-#: remote.c:1138
+#: remote.c:1246
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -7055,114 +7410,114 @@
"引用规格的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
"'%s:refs/tags/%s' 推送么？"
-#: remote.c:1174
+#: remote.c:1282
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s 无法被解析为分支"
-#: remote.c:1185
+#: remote.c:1293
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "无法删除 '%s'：远程引用不存在"
-#: remote.c:1197
+#: remote.c:1305
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "目标引用规格 %s 匹配超过一个"
-#: remote.c:1204
+#: remote.c:1312
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "目标引用 %s 接收超过一个源"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1833 remote.c:1940
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
-#: remote.c:1733
+#: remote.c:1842
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支：'%s'"
-#: remote.c:1736
+#: remote.c:1845
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1742
+#: remote.c:1851
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1757
+#: remote.c:1866
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1769
+#: remote.c:1881
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: remote.c:1779
+#: remote.c:1891
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: remote.c:1792
+#: remote.c:1904
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送无目标（push.default 是 'nothing'）"
-#: remote.c:1814
+#: remote.c:1926
msgid "cannot resolve 'simple' push to a single destination"
msgstr "无法解析 'simple' 推送至一个单独的目标"
-#: remote.c:1943
+#: remote.c:2059
#, c-format
msgid "couldn't find remote ref %s"
msgstr "无法找到远程引用 %s"
-#: remote.c:1956
+#: remote.c:2072
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* 在本地忽略可笑的引用 '%s'"
-#: remote.c:2119
+#: remote.c:2235
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-#: remote.c:2123
+#: remote.c:2239
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
-#: remote.c:2126
+#: remote.c:2242
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: remote.c:2130
+#: remote.c:2246
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
-#: remote.c:2133
+#: remote.c:2249
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " （使用 \"%s\" 查看详情）\n"
-#: remote.c:2137
+#: remote.c:2253
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
-#: remote.c:2143
+#: remote.c:2259
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
-#: remote.c:2146
+#: remote.c:2262
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -7171,11 +7526,11 @@
msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
# 译者：注意保持前导空格
-#: remote.c:2154
+#: remote.c:2270
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
-#: remote.c:2157
+#: remote.c:2273
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -7191,11 +7546,11 @@
"并且分别有 %d 和 %d 处不同的提交。\n"
# 译者：注意保持前导空格
-#: remote.c:2167
+#: remote.c:2283
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
-#: remote.c:2359
+#: remote.c:2475
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "无法解析期望的对象名 '%s'"
@@ -7228,130 +7583,121 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "写入 '%s' (%s) 时出错"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
-msgstr "刷新 '%s' 失败"
+msgstr "无法刷新 '%s'"
-#: rerere.c:487 rerere.c:1023
+#: rerere.c:487 rerere.c:1024
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "不能解析 '%s' 中的冲突块"
-#: rerere.c:668
+#: rerere.c:669
#, c-format
msgid "failed utime() on '%s'"
msgstr "在 '%s' 上调用 utime() 失败"
-#: rerere.c:678
+#: rerere.c:679
#, c-format
msgid "writing '%s' failed"
msgstr "写入 '%s' 失败"
-#: rerere.c:698
+#: rerere.c:699
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "使用之前的解决方案暂存 '%s'。"
-#: rerere.c:737
+#: rerere.c:738
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "已记录 '%s' 的解决方案。"
-#: rerere.c:772
+#: rerere.c:773
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "使用之前的解决方案解决 '%s'。"
-#: rerere.c:787
+#: rerere.c:788
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "不能删除 stray '%s'"
-#: rerere.c:791
+#: rerere.c:792
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "为 '%s' 记录 preimage"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
+#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: rerere.c:1041
+#: rerere.c:1042
#, c-format
msgid "failed to update conflicted state in '%s'"
-msgstr "更新 '%s' 中的冲突状态失败"
+msgstr "无法更新 '%s' 中的冲突状态"
-#: rerere.c:1052 rerere.c:1059
+#: rerere.c:1053 rerere.c:1060
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "没有为 '%s' 记忆的解决方案"
-#: rerere.c:1061
+#: rerere.c:1062
#, c-format
msgid "cannot unlink '%s'"
msgstr "不能删除 '%s'"
-#: rerere.c:1071
+#: rerere.c:1072
#, c-format
msgid "Updated preimage for '%s'"
msgstr "已为 '%s' 更新 preimage"
-#: rerere.c:1080
+#: rerere.c:1081
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "忘记 '%s' 的解决方案\n"
-#: rerere.c:1191
+#: rerere.c:1192
msgid "unable to open rr-cache directory"
msgstr "不能打开 rr-cache 目录"
-#: reset.c:42
+#: reset.c:112
msgid "could not determine HEAD revision"
msgstr "不能确定 HEAD 版本"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:141 reset.c:147 sequencer.c:3696
#, c-format
msgid "failed to find tree of %s"
-msgstr "无法找到 %s 指向的树。"
+msgstr "无法找到 %s 指向的树"
-#: revision.c:2344
+#: revision.c:2358
msgid "--unpacked=<packfile> no longer supported"
msgstr "不再支持 --unpacked=<packfile>"
-#: revision.c:2684
+#: revision.c:2712
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
-#: revision.c:2687
+#: revision.c:2715
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
-#: revision.c:2893
+#: revision.c:2901
+msgid "object filtering requires --objects"
+msgstr "对象过滤需要 --objects"
+
+#: revision.c:2918
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "不能打开 /dev/null"
-
-#: run-command.c:1274
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "不能创建 async 线程：%s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
-"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr "读取远程解包状态时收到意外的 flush 包"
@@ -7368,71 +7714,72 @@
#: send-pack.c:378
msgid "failed to sign the push certificate"
-msgstr "为推送证书签名失败"
+msgstr "无法为推送证书签名"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack：无法派生 fetch 子进程"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "推送协商失败，但还是继续推送"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "接收端不支持这个仓库的哈希算法"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "接收端不支持签名推送（--signed）"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未发送推送证书，因为接收端不支持签名推送（--signed）"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支持原子推送（--atomic）"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "无效的提交信息清理模式 '%s'"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "还原"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "拣选"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "变基"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "未知动作：%d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7440,52 +7787,77 @@
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"命令标记修正后的文件"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
-"对修正后的文件做标记，然后用 'git commit' 提交"
+"解决所有冲突之后，用 \"git add/rm <路径规格>\" 标记它们，\n"
+"然后执行 \"git cherry-pick --continue\"。您也可以执行\n"
+"\"git cherry-pick --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
+"执行 \"git cherry-pick\" 之前的状态，执行 \"git cherry-pick --abort\"。"
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"解决所有冲突之后，用 \"git add/rm <路径规格>\" 标记它们，\n"
+"然后执行 \"git revert --continue\"。您也可以执行\n"
+"\"git revert --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
+"执行 \"git revert\" 之前的状态，执行 \"git revert --abort\"。"
+
+#: sequencer.c:448 sequencer.c:3288
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
+#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3565
#, c-format
msgid "failed to finalize '%s'"
msgstr "无法完成 '%s'"
-#: sequencer.c:486
+#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
+#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
+#, c-format
+msgid "could not read '%s'"
+msgstr "不能读取 '%s'"
+
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本地修改将被%s覆盖。"
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或贮藏后再继续。"
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s：快进"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:615
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
@@ -7493,65 +7865,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：无法写入新索引文件"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "不能更新缓存树"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中没有 key"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "无法为 '%s' 的值去引号"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
+#: builtin/am.c:849 builtin/rebase.c:699
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已经给出 'GIT_AUTHOR_NAME'"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已经给出 'GIT_AUTHOR_DATE'"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "未知变量 '%s'"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7580,11 +7952,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 钩子失败"
-#: sequencer.c:1218
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7608,7 +7980,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7631,344 +8003,345 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1287
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: sequencer.c:1275
+#: sequencer.c:1289
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: sequencer.c:1321
+#: sequencer.c:1336
msgid "unable to resolve HEAD after creating commit"
msgstr "创建提交后，不能解析 HEAD"
-#: sequencer.c:1323
+#: sequencer.c:1338
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
-#: sequencer.c:1327
+#: sequencer.c:1342
msgid " (root-commit)"
msgstr "（根提交）"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1365
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一个提交！"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1425 sequencer.c:2310
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入树对象"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1469 sequencer.c:1589
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能从 '%s' 读取提交说明"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1500 sequencer.c:1532
#, c-format
msgid "invalid author identity '%s'"
msgstr "无效的作者身份 '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1506
msgid "corrupt author: missing date information"
msgstr "损坏的作者：缺失日期信息"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
+#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
-msgstr "写提交对象失败"
+msgstr "无法写提交对象"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:1606
+#: sequencer.c:1621
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1611
+#: sequencer.c:1626
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1709 sequencer.c:1990
#, c-format
msgid "unknown command: %d"
msgstr "未知命令：%d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1751
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明："
-#: sequencer.c:1737
+#: sequencer.c:1752
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d："
-#: sequencer.c:1738
+#: sequencer.c:1753
msgid "The 1st commit message will be skipped:"
msgstr "第一个提交说明将被跳过："
-#: sequencer.c:1739
+#: sequencer.c:1754
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过："
-#: sequencer.c:1740
+#: sequencer.c:1755
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1902 sequencer.c:1959
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:1934
+#: sequencer.c:1949
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1951 sequencer.c:3592
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1953
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:1962
+#: sequencer.c:1977
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:2072
+#: sequencer.c:2087
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:2079
+#: sequencer.c:2094
msgid "cannot fixup root commit"
msgstr "不能修复根提交"
-#: sequencer.c:2098
+#: sequencer.c:2113
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2121 sequencer.c:2129
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:2120
+#: sequencer.c:2135
#, 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:2139
+#: sequencer.c:2154
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:2205
+#: sequencer.c:2220
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:2265
+#: sequencer.c:2280
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2281
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:2287
+#: sequencer.c:2302
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
-#: sequencer.c:2345
+#: sequencer.c:2360
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
-#: sequencer.c:2352
+#: sequencer.c:2368
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:2425
+#: sequencer.c:2448
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受参数：'%s'"
-#: sequencer.c:2434
+#: sequencer.c:2457
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的参数"
-#: sequencer.c:2477
+#: sequencer.c:2500
#, c-format
msgid "could not parse '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:2538
+#: sequencer.c:2561
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
-#: sequencer.c:2549
+#: sequencer.c:2572
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:2635
+#: sequencer.c:2620 builtin/rebase.c:185
+#, c-format
+msgid "could not read '%s'."
+msgstr "不能读取 '%s'。"
+
+#: sequencer.c:2658
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一个进行中的拣选"
-#: sequencer.c:2644
+#: sequencer.c:2667
msgid "cancelling a revert in progress"
msgstr "正在取消一个进行中的还原"
-#: sequencer.c:2690
+#: sequencer.c:2707
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:2692
+#: sequencer.c:2709
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
-#: sequencer.c:2697
+#: sequencer.c:2714
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:2708
+#: sequencer.c:2725
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:2710
+#: sequencer.c:2727
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:2788
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "%s 的值无效：%s"
-
-#: sequencer.c:2897
+#: sequencer.c:2914
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2917
+#: sequencer.c:2934
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式错误的选项清单：'%s'"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3029 sequencer.c:4875
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:3029
+#: sequencer.c:3046
msgid "revert is already in progress"
msgstr "一个还原操作已在进行"
-#: sequencer.c:3031
+#: sequencer.c:3048
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3051
msgid "cherry-pick is already in progress"
msgstr "拣选操作已在进行"
-#: sequencer.c:3036
+#: sequencer.c:3053
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3067
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:3065
+#: sequencer.c:3082
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3142 sequencer.c:4585
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3144 sequencer.c:3155
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3146 sequencer.c:3190
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
+#: builtin/grep.c:774
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:3161
+#: sequencer.c:3178
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
-#: sequencer.c:3162
+#: sequencer.c:3179
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:3168
+#: sequencer.c:3185
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:3179
+#: sequencer.c:3196
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: sequencer.c:3220
+#: sequencer.c:3237
msgid "no revert in progress"
msgstr "没有正在进行的还原"
-#: sequencer.c:3229
+#: sequencer.c:3246
msgid "no cherry-pick in progress"
msgstr "没有正在进行的拣选"
-#: sequencer.c:3239
+#: sequencer.c:3256
msgid "failed to skip the commit"
msgstr "无法跳过这个提交"
-#: sequencer.c:3246
+#: sequencer.c:3263
msgid "there is nothing to skip"
msgstr "没有要跳过的"
-#: sequencer.c:3249
+#: sequencer.c:3266
#, c-format
msgid ""
"have you committed already?\n"
@@ -7977,16 +8350,16 @@
"您已经提交了么？\n"
"试试 \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3428 sequencer.c:4476
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3445
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "无法拷贝 '%s' 至 '%s'"
-#: sequencer.c:3436
+#: sequencer.c:3453
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8005,27 +8378,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3463
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能应用 %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3470
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合并 %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: sequencer.c:3483
+#: sequencer.c:3499
#, c-format
msgid "Executing: %s\n"
msgstr "正在执行：%s\n"
-#: sequencer.c:3498
+#: sequencer.c:3510
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8040,11 +8413,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3516
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:3510
+#: sequencer.c:3522
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8061,90 +8434,90 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3582
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的标签名称：'%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3655
msgid "writing fake root commit"
msgstr "写伪根提交"
-#: sequencer.c:3650
+#: sequencer.c:3660
msgid "writing squash-onto"
msgstr "写入 squash-onto"
-#: sequencer.c:3734
+#: sequencer.c:3739
#, c-format
msgid "could not resolve '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:3767
+#: sequencer.c:3771
msgid "cannot merge without a current revision"
msgstr "没有当前版本不能合并"
-#: sequencer.c:3789
+#: sequencer.c:3793
#, c-format
msgid "unable to parse '%.*s'"
msgstr "无法解析 '%.*s'"
-#: sequencer.c:3798
+#: sequencer.c:3802
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "无可用合并：'%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3814
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章鱼合并不能在一个新的根提交上执行"
-#: sequencer.c:3826
+#: sequencer.c:3869
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能获取 '%s' 的提交说明"
-#: sequencer.c:4009
+#: sequencer.c:4013
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能尝试合并 '%.*s'"
-#: sequencer.c:4025
+#: sequencer.c:4029
msgid "merge: Unable to write new index file"
msgstr "合并：无法写入新索引文件"
-#: sequencer.c:4099
+#: sequencer.c:4110
msgid "Cannot autostash"
msgstr "无法自动贮藏"
-#: sequencer.c:4102
+#: sequencer.c:4113
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "意外的贮藏响应：'%s'"
-#: sequencer.c:4108
+#: sequencer.c:4119
#, c-format
msgid "Could not create directory for '%s'"
msgstr "不能为 '%s' 创建目录"
-#: sequencer.c:4111
+#: sequencer.c:4122
#, c-format
msgid "Created autostash: %s\n"
msgstr "创建了自动贮藏：%s\n"
-#: sequencer.c:4115
+#: sequencer.c:4124
msgid "could not reset --hard"
msgstr "无法硬性重置（reset --hard）"
-#: sequencer.c:4140
+#: sequencer.c:4148
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用自动贮藏。\n"
-#: sequencer.c:4152
+#: sequencer.c:4160
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:4155
+#: sequencer.c:4163
#, c-format
msgid ""
"%s\n"
@@ -8155,29 +8528,29 @@
"您的修改在贮藏区中很安全。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:4160
+#: sequencer.c:4168
msgid "Applying autostash resulted in conflicts."
msgstr "应用自动贮藏导致冲突。"
-#: sequencer.c:4161
+#: sequencer.c:4169
msgid "Autostash exists; creating a new stash entry."
msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4225
msgid "could not detach HEAD"
msgstr "不能分离头指针"
-#: sequencer.c:4248
+#: sequencer.c:4240
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4242
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4274
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8197,58 +8570,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4320
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "正在变基（%d/%d）%s"
-#: sequencer.c:4350
+#: sequencer.c:4366
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4436
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:4480
+#: sequencer.c:4484
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4489
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:4499
+#: sequencer.c:4503
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:4559
+#: sequencer.c:4563
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "成功变基并更新 %s。\n"
-#: sequencer.c:4611
+#: sequencer.c:4615
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: sequencer.c:4620
+#: sequencer.c:4624
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:4622
+#: sequencer.c:4626
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
-#: sequencer.c:4624
+#: sequencer.c:4628
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
-#: sequencer.c:4627
+#: sequencer.c:4631
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8257,59 +8630,68 @@
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4667 sequencer.c:4706
#, c-format
msgid "could not write file: '%s'"
msgstr "不能写入文件：'%s'"
-#: sequencer.c:4718
+#: sequencer.c:4722
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4732
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:4845
+#: sequencer.c:4852
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:4849
+#: sequencer.c:4856
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:4884
+#: sequencer.c:4891
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
-#: sequencer.c:5361
+#: sequencer.c:5162 sequencer.c:5391
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "跳过了先前已应用的提交 %s"
+
+#: sequencer.c:5232 sequencer.c:5407
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "使用 --reapply-cherry-picks 来包括跳过的提交"
+
+#: sequencer.c:5378
msgid "make_script: unhandled options"
msgstr "make_script：有未能处理的选项"
-#: sequencer.c:5364
+#: sequencer.c:5381
msgid "make_script: error preparing revisions"
msgstr "make_script：准备版本时错误"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5639 sequencer.c:5656
msgid "nothing to do"
msgstr "无事可做"
-#: sequencer.c:5650
+#: sequencer.c:5675
msgid "could not skip unnecessary pick commands"
msgstr "无法跳过不必要的拣选"
-#: sequencer.c:5750
+#: sequencer.c:5775
msgid "the script was already rearranged."
msgstr "脚本已经重新编排。"
-#: setup.c:133
+#: setup.c:135
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' 在位于 '%s' 的仓库之外"
-#: setup.c:185
+#: setup.c:187
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -8318,7 +8700,7 @@
"%s：工作区中无此路径。\n"
"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
-#: setup.c:198
+#: setup.c:200
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8329,12 +8711,12 @@
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:264
+#: setup.c:266
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "选项 '%s' 必须在其他非选项参数之前"
-#: setup.c:283
+#: setup.c:285
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -8345,100 +8727,100 @@
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:419
+#: setup.c:421
msgid "unable to set up work tree using invalid config"
msgstr "无法使用无效配置来创建工作区"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:425 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "该操作必须在一个工作区中运行"
-#: setup.c:658
+#: setup.c:724
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 仓库版本 <= %d，却得到 %d"
-#: setup.c:666
+#: setup.c:732
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "发现未知的仓库扩展："
msgstr[1] "发现未知的仓库扩展："
-#: setup.c:680
+#: setup.c:746
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "仓库的版本是 0，但是发现仅用于 v1 的扩展："
msgstr[1] "仓库的版本是 0，但是发现仅用于 v1 的扩展："
-#: setup.c:701
+#: setup.c:767
#, c-format
msgid "error opening '%s'"
msgstr "打开 '%s' 出错"
-#: setup.c:703
+#: setup.c:769
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "文件太大，无法作为 .git 文件：'%s'"
-#: setup.c:705
+#: setup.c:771
#, c-format
msgid "error reading %s"
msgstr "读取 %s 出错"
-#: setup.c:707
+#: setup.c:773
#, c-format
msgid "invalid gitfile format: %s"
msgstr "无效的 gitfile 格式：%s"
-#: setup.c:709
+#: setup.c:775
#, c-format
msgid "no path in gitfile: %s"
msgstr "在 gitfile 中没有路径：%s"
-#: setup.c:711
+#: setup.c:777
#, c-format
msgid "not a git repository: %s"
msgstr "不是 git 仓库：%s"
-#: setup.c:813
+#: setup.c:879
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' 太大"
-#: setup.c:827
+#: setup.c:893
#, c-format
msgid "not a git repository: '%s'"
msgstr "不是 git 仓库：'%s'"
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:922 setup.c:924 setup.c:955
#, c-format
msgid "cannot chdir to '%s'"
msgstr "不能切换目录到 '%s'"
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
msgid "cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: setup.c:988
+#: setup.c:1054
#, c-format
msgid "failed to stat '%*s%s%s'"
-msgstr "获取 '%*s%s%s' 状态（stat）失败"
+msgstr "无法获取 '%*s%s%s' 状态（stat）"
-#: setup.c:1231
+#: setup.c:1338
msgid "Unable to read current working directory"
msgstr "不能读取当前工作目录"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1347 setup.c:1353
#, c-format
msgid "cannot change to '%s'"
msgstr "不能切换到 '%s'"
-#: setup.c:1251
+#: setup.c:1358
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "不是 git 仓库（或者任何父目录）：%s"
-#: setup.c:1257
+#: setup.c:1364
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -8447,7 +8829,21 @@
"不是 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
-#: setup.c:1381
+#: setup.c:1374
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"仓库不安全（'%s' 的所有者是其他人）\n"
+"要为本仓库创建特例，请使用：\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+
+#: setup.c:1502
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8456,69 +8852,61 @@
"参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
"文件属主必须始终拥有读写权限。"
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "不能打开或者复制 /dev/null"
-
-#: setup.c:1445
+#: setup.c:1564
msgid "fork failed"
msgstr "fork 失败"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1569
msgid "setsid failed"
msgstr "setsid 失败"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "尝试在没有 cone 模式下使用稀疏索引"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "不能更新缓存树，保持完整"
-
-#: sparse-index.c:263
+#: sparse-index.c:285
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "索引条目是一个目录，但不是稀疏的 (%08x)"
+#: split-index.c:9
+msgid "cannot use split index with a sparse index"
+msgstr "拆分索引无法与稀疏索引一起使用"
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:852
+#: 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:860
+#: strbuf.c:861
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:862
+#: 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:869
+#: strbuf.c:870
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:871
+#: 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:877
+#: strbuf.c:878
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8526,130 +8914,140 @@
msgstr[1] "%u 字节"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
+#: strbuf.c:880
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u 字节/秒"
msgstr[1] "%u 字节/秒"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
+#: builtin/rebase.c:653
#, c-format
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: strbuf.c:1177
+#: strbuf.c:1196
#, c-format
msgid "could not edit '%s'"
msgstr "不能编辑 '%s'"
-#: submodule-config.c:237
+#: submodule-config.c:238
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "忽略可疑的子模组名称：%s"
-#: submodule-config.c:304
+#: submodule-config.c:305
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "submodule.fetchjobs 不允许为负值"
-#: submodule-config.c:402
+#: submodule-config.c:403
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr "忽略可能被解析为命令行选项的 '%s'：%s"
-#: submodule-config.c:499
+#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
#, c-format
-msgid "invalid value for %s"
-msgstr "%s 的值无效"
+msgid "invalid value for '%s'"
+msgstr "'%s' 的值无效"
-#: submodule-config.c:766
+#: submodule-config.c:828
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 条目 %s"
-#: submodule.c:114 submodule.c:143
+#: submodule.c:115 submodule.c:144
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
-#: submodule.c:118 submodule.c:147
+#: submodule.c:119 submodule.c:148
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
-#: submodule.c:154
+#: submodule.c:155
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "无法移除 %s 的 .gitmodules 条目"
-#: submodule.c:165
+#: submodule.c:166
msgid "staging updated .gitmodules failed"
msgstr "将更新后 .gitmodules 添加暂存区失败"
-#: submodule.c:328
+#: submodule.c:346
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "位于未检出的子模组 '%s'"
-#: submodule.c:359
+#: submodule.c:377
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-#: submodule.c:436
+#: submodule.c:454
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "坏的 --ignore-submodules 参数：%s"
-#: submodule.c:805
+#: submodule.c:866
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
-#: submodule.c:908
+#: submodule.c:987
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
-#: submodule.c:993
+#: submodule.c:1069
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'"
-#: submodule.c:1116
+#: submodule.c:1192
#, c-format
msgid "process for submodule '%s' failed"
msgstr "处理子模组 '%s' 失败"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
-#: submodule.c:1156
+#: submodule.c:1232
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "正在推送子模组 '%s'\n"
-#: submodule.c:1159
+#: submodule.c:1235
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "无法推送子模组 '%s'\n"
-#: submodule.c:1451
+#: submodule.c:1567
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "正在获取子模组 %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1589
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "无法访问子模组 '%s'\n"
-#: submodule.c:1640
+#: submodule.c:1618
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "无法访问子模组 '%s' 提交 %s\n"
+
+#: submodule.c:1629
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "正在获取子模组 %s%s 提交 %s\n"
+
+#: submodule.c:1849
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8658,77 +9056,77 @@
"获取子模组时的错误：\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1874
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "无法将 '%s' 识别为 git 仓库"
-#: submodule.c:1682
+#: submodule.c:1891
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
-#: submodule.c:1723
+#: submodule.c:1932
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
-#: submodule.c:1798
+#: submodule.c:2007
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中启动 'git status'"
-#: submodule.c:1811
+#: submodule.c:2020
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中执行 'git status'"
-#: submodule.c:1826
+#: submodule.c:2037
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:2064 submodule.c:2379
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "无法递归进子模组路径 '%s'"
-#: submodule.c:1874
+#: submodule.c:2086
msgid "could not reset submodule index"
msgstr "无法重置子模组索引"
-#: submodule.c:1916
+#: submodule.c:2128
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "子模组 '%s' 中有脏索引"
-#: submodule.c:1968
+#: submodule.c:2182
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "子模组 '%s' 无法被更新。"
-#: submodule.c:2036
+#: submodule.c:2250
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
-#: submodule.c:2057
+#: submodule.c:2271
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2283 submodule.c:2343
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
-#: submodule.c:2073
+#: submodule.c:2287
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "禁止移动 '%s' 到现存 git 目录中"
-#: submodule.c:2080
+#: submodule.c:2293
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8739,11 +9137,11 @@
"'%s' 迁移至\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2424
msgid "could not start ls-files in .."
msgstr "无法在 .. 中启动 ls-files"
-#: submodule.c:2248
+#: submodule.c:2464
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
@@ -8764,8 +9162,8 @@
msgid "unknown value '%s' for key '%s'"
msgstr "键 '%2$s' 的未知取值 '%1$s'"
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
+#: builtin/remote.c:328
#, c-format
msgid "more than one %s"
msgstr "多于一个 %s"
@@ -8780,11 +9178,11 @@
msgid "could not read input file '%s'"
msgstr "不能读取输入文件 '%s'"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
msgid "could not read from stdin"
msgstr "不能自标准输入读取"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:760
#, c-format
msgid "could not stat %s"
msgstr "不能对 %s 调用 stat"
@@ -8850,7 +9248,7 @@
msgid "error while running fast-import"
msgstr "执行 fast-import 出错"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1254
#, c-format
msgid "could not read ref %s"
msgstr "无法读取引用 %s"
@@ -8868,7 +9266,7 @@
msgid "invalid remote service path"
msgstr "无效的远程服务路径"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1496
msgid "operation not supported by protocol"
msgstr "协议不支持该操作"
@@ -8877,72 +9275,72 @@
msgid "can't connect to subservice %s"
msgstr "不能连接到子服务 %s"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:415
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only 需要协议 v2"
-#: transport-helper.c:755
+#: transport-helper.c:758
msgid "'option' without a matching 'ok/error' directive"
msgstr "'option' 缺乏一个匹配的 'ok/error' 指令"
-#: transport-helper.c:798
+#: transport-helper.c:801
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "预期 ok/error，助手说 '%s'"
-#: transport-helper.c:855
+#: transport-helper.c:862
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "助手报告 %s 的意外状态"
-#: transport-helper.c:938
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support dry-run"
msgstr "助手 %s 不支持 dry-run"
-#: transport-helper.c:941
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed"
msgstr "助手 %s 不支持 --signed"
-#: transport-helper.c:944
+#: transport-helper.c:951
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "助手 %s 不支持 --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:956
#, c-format
msgid "helper %s does not support --atomic"
msgstr "助手 %s 不支持 --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:960
#, c-format
msgid "helper %s does not support --%s"
msgstr "助手 %s 不支持 --%s"
-#: transport-helper.c:960
+#: transport-helper.c:967
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "助手 %s 不支持 'push-option'"
-#: transport-helper.c:1060
+#: transport-helper.c:1067
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-heper 不支持推送，需要引用规格"
-#: transport-helper.c:1065
+#: transport-helper.c:1072
#, c-format
msgid "helper %s does not support 'force'"
msgstr "助手 %s 不支持 'force'"
-#: transport-helper.c:1112
+#: transport-helper.c:1119
msgid "couldn't run fast-export"
msgstr "无法执行 fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1124
msgid "error while running fast-export"
msgstr "执行 fast-export 时出错"
-#: transport-helper.c:1142
+#: transport-helper.c:1149
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8951,52 +9349,52 @@
"没有共同的引用并且也没有指定，什么也不会做。\n"
"也许您应该指定一个分支。\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1231
#, c-format
msgid "unsupported object format '%s'"
msgstr "不支持的对象格式 '%s'"
-#: transport-helper.c:1233
+#: transport-helper.c:1240
#, c-format
msgid "malformed response in ref list: %s"
msgstr "引用列表中格式错误的响应：%s"
-#: transport-helper.c:1385
+#: transport-helper.c:1392
#, c-format
msgid "read(%s) failed"
msgstr "读取（%s）失败"
-#: transport-helper.c:1412
+#: transport-helper.c:1419
#, c-format
msgid "write(%s) failed"
msgstr "写（%s）失败"
-#: transport-helper.c:1461
+#: transport-helper.c:1468
#, c-format
msgid "%s thread failed"
msgstr "%s 线程失败"
-#: transport-helper.c:1465
+#: transport-helper.c:1472
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s 线程等待失败：%s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1491 transport-helper.c:1495
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "不能启动线程来拷贝数据：%s"
-#: transport-helper.c:1525
+#: transport-helper.c:1532
#, c-format
msgid "%s process failed to wait"
msgstr "%s 进程等待失败"
-#: transport-helper.c:1529
+#: transport-helper.c:1536
#, c-format
msgid "%s process failed"
msgstr "%s 进程失败"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1554 transport-helper.c:1563
msgid "can't start thread for copying data"
msgstr "不能启动线程来拷贝数据"
@@ -9005,58 +9403,58 @@
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
-#: transport.c:145
+#: transport.c:138
#, c-format
msgid "could not read bundle '%s'"
msgstr "无法读取归档包 '%s'"
-#: transport.c:223
+#: transport.c:234
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "传输：无效的深度选项 '%s'"
-#: transport.c:275
+#: transport.c:289
msgid "see protocol.version in 'git help config' for more details"
msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
-#: transport.c:276
+#: transport.c:290
msgid "server options require protocol version 2 or later"
msgstr "服务端选项需要版本 2 协议或更高"
-#: transport.c:403
+#: transport.c:418
msgid "server does not support wait-for-done"
msgstr "服务器不支持 wait-for-done"
-#: transport.c:755
+#: transport.c:770
msgid "could not parse transport.color.* config"
msgstr "不能解析 transport.color.* 配置"
-#: transport.c:830
+#: transport.c:845
msgid "support for protocol v2 not implemented yet"
msgstr "协议 v2 的支持尚未实现"
-#: transport.c:965
+#: transport.c:978
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "配置 '%s' 的取值未知：%s"
-#: transport.c:1031
+#: transport.c:1044
#, c-format
msgid "transport '%s' not allowed"
msgstr "传输 '%s' 不允许"
-#: transport.c:1084
+#: transport.c:1093
msgid "git-over-rsync is no longer supported"
msgstr "不再支持 git-over-rsync"
-#: transport.c:1187
+#: transport.c:1196
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
-#: transport.c:1191
+#: transport.c:1200
#, c-format
msgid ""
"\n"
@@ -9083,11 +9481,11 @@
"以推送至远程。\n"
"\n"
-#: transport.c:1199
+#: transport.c:1208
msgid "Aborting."
msgstr "正在终止。"
-#: transport.c:1346
+#: transport.c:1354
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模组"
@@ -9107,7 +9505,7 @@
msgid "too-short tree file"
msgstr "太短的树文件"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9116,7 +9514,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 checkout:\n"
@@ -9125,7 +9523,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 merge:\n"
@@ -9134,7 +9532,7 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s请在合并前提交或贮藏您的修改。"
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9143,7 +9541,7 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9152,7 +9550,7 @@
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s请在 %s 之前提交或贮藏您的修改。"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9161,7 +9559,7 @@
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -9170,7 +9568,16 @@
"更新如下目录将会丢失其中未跟踪的文件：\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"拒绝删除当前工作目录：\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9179,7 +9586,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s请在切换分支之前移动或删除。"
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9188,7 +9595,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9197,7 +9604,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9206,7 +9613,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9215,7 +9622,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9224,7 +9631,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9234,7 +9641,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s请在切换分支前移动或删除。"
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9244,7 +9651,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9253,7 +9660,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9262,7 +9669,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9271,7 +9678,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9280,12 +9687,12 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -9294,7 +9701,7 @@
"无法更新子模组：\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -9304,7 +9711,7 @@
"尽管存在稀疏检出模板，以下路径不是最新，因而保留：\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9313,7 +9720,7 @@
"尽管存在稀疏检出模板，以下路径处于未合并状态，因而保留：\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -9323,23 +9730,23 @@
"尽管存在稀疏检出模板，以下路径已经存在，因而未更新：\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "正在终止\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
-msgstr "在修复上述路径之后，你可能要执行 `git sparse-checkout reapply`。\n"
+msgstr "在修复上述路径之后，您可能要执行 `git sparse-checkout reapply`。\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "正在更新文件"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -9348,16 +9755,16 @@
"以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n"
"并且碰撞组中只有一个文件存在工作区中：\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1664
msgid "Updating index flags"
msgstr "正在更新索引标志"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2925
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr "工作树和未跟踪提交具有重复条目：%s"
-#: upload-pack.c:1548
+#: upload-pack.c:1579
msgid "expected flush after fetch arguments"
msgstr "在 fetch 参数之后应该有一个 flush 包"
@@ -9394,113 +9801,137 @@
msgid "Fetching objects"
msgstr "正在获取对象"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
-msgstr "读取 '%s' 失败"
+msgstr "无法读取 '%s'"
-#: worktree.c:303
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "在主工作区的 '%s' 不是仓库目录"
-#: worktree.c:314
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "文件 '%s' 不包含工作区的绝对路径"
-#: worktree.c:326
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
-#: worktree.c:332
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' 不是一个 .git 文件，错误码 %d"
-#: worktree.c:341
+#: worktree.c:342
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' 没有指回到 '%s'"
-#: worktree.c:603
+#: worktree.c:600
msgid "not a directory"
msgstr "不是一个目录"
-#: worktree.c:612
+#: worktree.c:609
msgid ".git is not a file"
msgstr ".git 不是一个文件"
-#: worktree.c:614
+#: worktree.c:611
msgid ".git file broken"
msgstr ".git 文件损坏"
-#: worktree.c:616
+#: worktree.c:613
msgid ".git file incorrect"
msgstr ".git 文件不正确"
-#: worktree.c:722
+#: worktree.c:719
msgid "not a valid path"
msgstr "不是一个有效的路径"
-#: worktree.c:728
+#: worktree.c:725
msgid "unable to locate repository; .git is not a file"
msgstr "无法定位仓库，.git 不是一个文件"
-#: worktree.c:732
+#: worktree.c:729
msgid "unable to locate repository; .git file does not reference a repository"
msgstr "无法定位仓库，.git 文件没有指向一个仓库"
-#: worktree.c:736
+#: worktree.c:733
msgid "unable to locate repository; .git file broken"
msgstr "无法定位仓库，.git 文件损坏"
-#: worktree.c:742
+#: worktree.c:739
msgid "gitdir unreadable"
msgstr "gitdir 不可读"
-#: worktree.c:746
+#: worktree.c:743
msgid "gitdir incorrect"
msgstr "gitdir 不正确"
-#: worktree.c:771
+#: worktree.c:768
msgid "not a valid directory"
msgstr "不是一个有效的目录"
-#: worktree.c:777
+#: worktree.c:774
msgid "gitdir file does not exist"
msgstr "gitdir 文件不存在"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:779 worktree.c:788
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "无法读取 gitdir 文件（%s）"
-#: worktree.c:801
+#: worktree.c:798
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
-#: worktree.c:809
+#: worktree.c:806
msgid "invalid gitdir file"
msgstr "无效的 gitdir 文件"
-#: worktree.c:817
+#: worktree.c:814
msgid "gitdir file points to non-existent location"
msgstr "gitdir 文件指向一个不存在的位置"
-#: wrapper.c:197 wrapper.c:367
+#: worktree.c:830
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "无法在 '%2$s' 中设置 %1$s"
+
+#: worktree.c:832
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "无法在 '%2$s' 中取消设置 %1$s"
+
+#: worktree.c:852
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "无法设置 extensions.worktreeConfig"
+
+#: wrapper.c:161
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "无法设置环境变量 '%s'"
+
+#: wrapper.c:213
+#, c-format
+msgid "unable to create '%s'"
+msgstr "无法创建 '%s'"
+
+#: wrapper.c:215 wrapper.c:385
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "无法打开 '%s' 进行读写"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:416 wrapper.c:683
#, c-format
msgid "unable to access '%s'"
msgstr "不能访问 '%s'"
-#: wrapper.c:607
+#: wrapper.c:691
msgid "unable to get current working directory"
msgstr "不能获取当前工作目录"
@@ -9539,11 +9970,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1140
msgid "Changes to be committed:"
msgstr "要提交的变更："
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1149
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更："
@@ -9649,22 +10080,22 @@
msgid "untracked content, "
msgstr "未跟踪的内容, "
-#: wt-status.c:958
+#: wt-status.c:973
#, 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:989
+#: wt-status.c:1004
msgid "Submodules changed but not updated:"
msgstr "子模组已修改但尚未更新："
-#: wt-status.c:991
+#: wt-status.c:1006
msgid "Submodule changes to be committed:"
msgstr "要提交的子模组变更："
-#: wt-status.c:1073
+#: wt-status.c:1088
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9672,7 +10103,7 @@
"不要改动或删除上面的一行。\n"
"其下所有内容都将被忽略。"
-#: wt-status.c:1165
+#: wt-status.c:1180
#, c-format
msgid ""
"\n"
@@ -9683,284 +10114,290 @@
"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
"为避免，您可以使用 '--no-ahead-behind'。\n"
-#: wt-status.c:1195
+#: wt-status.c:1210
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者：注意保持前导空格
-#: wt-status.c:1198
+#: wt-status.c:1213
msgid " (fix conflicts and run \"git commit\")"
msgstr " （解决冲突并运行 \"git commit\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1200
+#: wt-status.c:1215
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " （使用 \"git merge --abort\" 终止合并）"
-#: wt-status.c:1204
+#: wt-status.c:1219
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者：注意保持前导空格
-#: wt-status.c:1207
+#: wt-status.c:1222
msgid " (use \"git commit\" to conclude merge)"
msgstr " （使用 \"git commit\" 结束合并）"
-#: wt-status.c:1216
+#: wt-status.c:1233
msgid "You are in the middle of an am session."
msgstr "您正处于 am 操作过程中。"
-#: wt-status.c:1219
+#: wt-status.c:1236
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者：注意保持前导空格
-#: wt-status.c:1223
+#: wt-status.c:1241
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " （解决冲突，然后运行 \"git am --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1225
+#: wt-status.c:1243
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1227
+#: wt-status.c:1246
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr " （使用 \"git am --allow-empty\" 将这个补丁记录为空提交）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1248
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " （使用 \"git am --abort\" 恢复原有分支）"
-#: wt-status.c:1360
+#: wt-status.c:1381
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 丢失。"
-#: wt-status.c:1362
+#: wt-status.c:1383
msgid "No commands done."
msgstr "没有命令被执行。"
-#: wt-status.c:1365
+#: wt-status.c:1386
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "最后一条命令已完成（%d 条命令被执行）："
-msgstr[1] "最后的命令已完成（%d 条命令被执行）："
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "最后完成的命令（%<PRIuMAX> 条命令被执行）："
+msgstr[1] "最后完成的命令（%<PRIuMAX> 条命令被执行）："
-#: wt-status.c:1376
+#: wt-status.c:1397
#, c-format
msgid " (see more in file %s)"
msgstr " （更多参见文件 %s）"
-#: wt-status.c:1381
+#: wt-status.c:1402
msgid "No commands remaining."
msgstr "未剩下任何命令。"
-#: wt-status.c:1384
+#: wt-status.c:1405
#, 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 条命令）："
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "接下来要执行的命令（剩余 %<PRIuMAX> 条命令）："
+msgstr[1] "接下来要执行的命令（剩余 %<PRIuMAX> 条命令）："
# 译者：注意保持前导空格
-#: wt-status.c:1392
+#: wt-status.c:1413
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
-#: wt-status.c:1404
+#: wt-status.c:1425
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
-#: wt-status.c:1409
+#: wt-status.c:1430
msgid "You are currently rebasing."
msgstr "您在执行变基操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1422
+#: wt-status.c:1443
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1424
+#: wt-status.c:1445
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1426
+#: wt-status.c:1447
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
# 译者：注意保持前导空格
-#: wt-status.c:1433
+#: wt-status.c:1454
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
-#: wt-status.c:1437
+#: wt-status.c:1458
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
-#: wt-status.c:1442
+#: wt-status.c:1463
msgid "You are currently splitting a commit during a rebase."
msgstr "您在执行变基操作时拆分提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1445
+#: wt-status.c:1466
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
-#: wt-status.c:1449
+#: wt-status.c:1470
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
-#: wt-status.c:1454
+#: wt-status.c:1475
msgid "You are currently editing a commit during a rebase."
msgstr "您在执行变基操作时编辑提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1457
+#: wt-status.c:1478
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " （使用 \"git commit --amend\" 修补当前提交）"
# 译者：注意保持前导空格
-#: wt-status.c:1459
+#: wt-status.c:1480
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
-#: wt-status.c:1470
+#: wt-status.c:1491
msgid "Cherry-pick currently in progress."
msgstr "拣选操作正在进行中。"
-#: wt-status.c:1473
+#: wt-status.c:1494
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在执行拣选提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1480
+#: wt-status.c:1501
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1483
+#: wt-status.c:1504
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " （执行 \"git cherry-pick --continue\" 以继续）"
# 译者：注意保持前导空格
-#: wt-status.c:1486
+#: wt-status.c:1507
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1488
+#: wt-status.c:1509
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " （使用 \"git cherry-pick --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1490
+#: wt-status.c:1511
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
-#: wt-status.c:1500
+#: wt-status.c:1521
msgid "Revert currently in progress."
msgstr "还原操作正在行中。"
-#: wt-status.c:1503
+#: wt-status.c:1524
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在执行反转提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1509
+#: wt-status.c:1530
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " （解决冲突并执行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1512
+#: wt-status.c:1533
msgid " (run \"git revert --continue\" to continue)"
msgstr " （执行 \"git revert --continue\" 以继续）"
# 译者：注意保持前导空格
-#: wt-status.c:1515
+#: wt-status.c:1536
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " （所有冲突已解决：执行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1517
+#: wt-status.c:1538
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " （使用 \"git revert --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1519
+#: wt-status.c:1540
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
-#: wt-status.c:1529
+#: wt-status.c:1550
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
-#: wt-status.c:1533
+#: wt-status.c:1554
msgid "You are currently bisecting."
msgstr "您在执行二分查找操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1536
+#: wt-status.c:1557
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-#: wt-status.c:1547
+#: wt-status.c:1568
msgid "You are in a sparse checkout."
msgstr "您处于一个稀疏检出中。"
-#: wt-status.c:1550
+#: wt-status.c:1571
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr "您处于稀疏检出状态，包含 %d%% 的跟踪文件"
-#: wt-status.c:1794
+#: wt-status.c:1815
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:1801
+#: wt-status.c:1822
msgid "interactive rebase in progress; onto "
msgstr "交互式变基操作正在进行中；至 "
-#: wt-status.c:1803
+#: wt-status.c:1824
msgid "rebase in progress; onto "
msgstr "变基操作正在进行中；至 "
-#: wt-status.c:1808
+#: wt-status.c:1829
msgid "HEAD detached at "
msgstr "头指针分离于 "
-#: wt-status.c:1810
+#: wt-status.c:1831
msgid "HEAD detached from "
msgstr "头指针分离自 "
-#: wt-status.c:1813
+#: wt-status.c:1834
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
-#: wt-status.c:1830
+#: wt-status.c:1851
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1831
+#: wt-status.c:1852
msgid "No commits yet"
msgstr "尚无提交"
-#: wt-status.c:1845
+#: wt-status.c:1866
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1847
+#: wt-status.c:1868
msgid "Ignored files"
msgstr "忽略的文件"
-#: wt-status.c:1851
+#: wt-status.c:1872
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9970,250 +10407,259 @@
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
-#: wt-status.c:1857
+#: wt-status.c:1878
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1859
+#: wt-status.c:1880
msgid " (use -u option to show untracked files)"
msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: wt-status.c:1865
+#: wt-status.c:1886
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1870
+#: wt-status.c:1891
#, 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:1874
+#: wt-status.c:1895
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1878
+#: wt-status.c:1899
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1882
+#: wt-status.c:1903
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空，但是存在尚未跟踪的文件\n"
-#: wt-status.c:1886
+#: wt-status.c:1907
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1911 wt-status.c:1917
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
-#: wt-status.c:1893
+#: wt-status.c:1914
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
-#: wt-status.c:1898
+#: wt-status.c:1919
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "无文件要提交，干净的工作区\n"
-#: wt-status.c:2003
+#: wt-status.c:2024
msgid "No commits yet on "
msgstr "尚无提交在 "
-#: wt-status.c:2007
+#: wt-status.c:2028
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
-#: wt-status.c:2038
+#: wt-status.c:2059
msgid "different"
msgstr "不同"
# 译者：注意保持句尾空格
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2061 wt-status.c:2069
msgid "behind "
msgstr "落后 "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2064 wt-status.c:2067
msgid "ahead "
msgstr "领先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2605
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s：您有未暂存的变更。"
-#: wt-status.c:2575
+#: wt-status.c:2611
msgid "additionally, your index contains uncommitted changes."
msgstr "另外，您的索引中包含未提交的变更。"
-#: wt-status.c:2577
+#: wt-status.c:2613
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的变更。"
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "无法发送 IPC 命令"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "无法读取 IPC 响应"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "无法启动 accept_thread '%s'"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "无法启动 '%s' 的 worker[0]"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:353
#, c-format
msgid "failed to unlink '%s'"
-msgstr "删除 '%s' 失败"
+msgstr "无法删除 '%s'"
+
+#: compat/fsmonitor/fsm-listen-darwin.c:355
+msgid "Unable to create FSEventStream."
+msgstr "无法创建 FSEventStream。"
+
+#: compat/fsmonitor/fsm-listen-darwin.c:403
+msgid "Failed to start the FSEventStream"
+msgstr "无法启动 FSEventStream"
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<选项>] [--] <路径规格>..."
-#: builtin/add.c:61
+#: builtin/add.c:63
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "不能 chmod %cx '%s'"
-#: builtin/add.c:99
+#: builtin/add.c:105
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:110 builtin/commit.c:299
msgid "updating files failed"
msgstr "更新文件失败"
-#: builtin/add.c:114
+#: builtin/add.c:120
#, c-format
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:204
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:312 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "不能读取索引"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "无法为写入打开 '%s'。"
-
-#: builtin/add.c:322
+#: builtin/add.c:325
msgid "Could not write patch"
msgstr "不能生成补丁"
-#: builtin/add.c:325
+#: builtin/add.c:328
msgid "editing patch failed"
msgstr "编辑补丁失败"
-#: builtin/add.c:328
+#: builtin/add.c:331
#, c-format
msgid "Could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/add.c:330
+#: builtin/add.c:333
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"
-#: builtin/add.c:335
+#: builtin/add.c:339
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
-#: builtin/add.c:343
+#: builtin/add.c:347
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:366
+#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "冗长输出"
+
+#: builtin/add.c:370
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
-#: builtin/add.c:368
+#: builtin/add.c:372
msgid "edit current diff and apply"
msgstr "编辑当前差异并应用"
-#: builtin/add.c:369
+#: builtin/add.c:373
msgid "allow adding otherwise ignored files"
msgstr "允许添加忽略的文件"
-#: builtin/add.c:370
+#: builtin/add.c:374
msgid "update tracked files"
msgstr "更新已跟踪的文件"
-#: builtin/add.c:371
+#: builtin/add.c:375
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
-#: builtin/add.c:372
+#: builtin/add.c:376
msgid "record only the fact that the path will be added later"
msgstr "只记录，该路径稍后再添加"
-#: builtin/add.c:373
+#: builtin/add.c:377
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
-#: builtin/add.c:376
+#: builtin/add.c:380
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
-#: builtin/add.c:378
+#: builtin/add.c:382
msgid "don't add, only refresh the index"
msgstr "不添加，只刷新索引"
-#: builtin/add.c:379
+#: builtin/add.c:383
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错不能添加的文件"
-#: builtin/add.c:380
+#: builtin/add.c:384
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "允许更新稀疏检出锥以外的条目"
+
+#: builtin/add.c:387 builtin/update-index.c:1023
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
-#: builtin/add.c:384
+#: builtin/add.c:389
msgid "warn when adding an embedded repository"
msgstr "创建一个嵌入式仓库时给予警告"
-#: builtin/add.c:386
-msgid "backend for `git stash -p`"
-msgstr "`git stash -p` 的后端"
-
-#: builtin/add.c:404
+#: builtin/add.c:407
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10241,12 +10687,12 @@
"\n"
"参见 \"git help submodule\" 获取更多信息。"
-#: builtin/add.c:432
+#: builtin/add.c:436
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在添加嵌入式 git 仓库：%s"
-#: builtin/add.c:451
+#: builtin/add.c:456
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10256,51 +10702,27 @@
"运行下面的命令来关闭本消息\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:471
msgid "adding files failed"
msgstr "添加文件失败"
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run 与 --interactive/--patch 不兼容"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file 与 --edit 不兼容"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 和 -u 选项互斥"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-
-#: builtin/add.c:526
+#: builtin/add.c:534
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file 与路径表达式参数不兼容"
+#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
+#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "'%s' 和路径规格参数不能同时使用"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
-
-#: builtin/add.c:555
+#: builtin/add.c:566
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件，也没有文件被添加。\n"
-#: builtin/add.c:557
+#: builtin/add.c:568
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10310,105 +10732,106 @@
"运行下面的命令来关闭本消息\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:393
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:455
+#: builtin/am.c:483
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:497
+#: builtin/am.c:525
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
-#: builtin/am.c:535
+#: builtin/am.c:563
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:561
+#: builtin/am.c:589
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:749
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:814
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:862
+#: builtin/am.c:890
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:895 builtin/am.c:907
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:874
+#: builtin/am.c:902
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:967
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:1000 builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
-msgstr "创建目录 '%s' 失败"
+msgstr "无法创建目录 '%s'"
-#: builtin/am.c:977
+#: builtin/am.c:1005
msgid "Failed to split patches."
-msgstr "拆分补丁失败。"
+msgstr "无法拆分补丁。"
-#: builtin/am.c:1126
+#: builtin/am.c:1154
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题，执行 \"%s --continue\"。"
-#: builtin/am.c:1127
+#: builtin/am.c:1155
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
-#: builtin/am.c:1128
+#: builtin/am.c:1160
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。"
+
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
-#: builtin/am.c:1223
+#: builtin/am.c:1257
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。"
-#: builtin/am.c:1251
-msgid "Patch is empty."
-msgstr "补丁为空。"
-
-#: builtin/am.c:1316
+#: builtin/am.c:1345
#, c-format
msgid "missing author line in commit %s"
msgstr "在提交 %s 中缺失作者行"
-#: builtin/am.c:1319
+#: builtin/am.c:1348
#, c-format
msgid "invalid ident line: %.*s"
msgstr "无效的身份标识：%.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1567
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1540
+#: builtin/am.c:1569
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
-#: builtin/am.c:1559
+#: builtin/am.c:1588
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10416,24 +10839,24 @@
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1565
+#: builtin/am.c:1594
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1591
+#: builtin/am.c:1620
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1623
+#: builtin/am.c:1652
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1704 builtin/am.c:1708
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
-#: builtin/am.c:1697
+#: builtin/am.c:1726
msgid "Commit Body is:"
msgstr "提交内容为："
@@ -10441,39 +10864,57 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1736
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1782 builtin/commit.c:410
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1757
+#: builtin/am.c:1786
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1828
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "跳过：%.*s"
+
+#: builtin/am.c:1833
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "创建空提交：%.*s"
+
+#: builtin/am.c:1837
+msgid "Patch is empty."
+msgstr "补丁为空。"
+
+#: builtin/am.c:1848 builtin/am.c:1917
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1865
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1820
+#: builtin/am.c:1871
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1875
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
-#: builtin/am.c:1868
+#: builtin/am.c:1921
+msgid "No changes - recorded it as an empty commit."
+msgstr "没有变更 —— 记录为空提交。"
+
+#: builtin/am.c:1923
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10483,7 +10924,7 @@
"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:1875
+#: builtin/am.c:1931
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10492,177 +10933,176 @@
msgstr ""
"在您的索引中仍存在未合并的路径。\n"
"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
-"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
+"您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
+#: builtin/reset.c:463
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:2034
+#: builtin/am.c:2091 builtin/am.c:2167
msgid "failed to clean index"
-msgstr "清空索引失败"
+msgstr "无法清空索引"
-#: builtin/am.c:2078
+#: builtin/am.c:2135
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
-#: builtin/am.c:2185
+#: builtin/am.c:2292
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "无效的 --patch-format 值：%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "选项 '%s=%s' 和 '%s=%s' 不能同时使用"
-#: builtin/am.c:2227
-#, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr "无效的 --show-current-patch 值：%s"
-
-#: builtin/am.c:2231
-#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容"
-
-#: builtin/am.c:2262
+#: builtin/am.c:2323
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2324
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2330
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2271
+#: builtin/am.c:2332
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2273
+#: builtin/am.c:2334
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:646 builtin/stash.c:946
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2276
+#: builtin/am.c:2337
msgid "add a Signed-off-by trailer to the commit message"
msgstr "在提交说明中添加 Signed-off-by 尾注"
-#: builtin/am.c:2279
+#: builtin/am.c:2340
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
-#: builtin/am.c:2281
+#: builtin/am.c:2342
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2283
+#: builtin/am.c:2344
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2285
+#: builtin/am.c:2346
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2287
+#: builtin/am.c:2348
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2290
+#: builtin/am.c:2351
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/am.c:2293
+#: builtin/am.c:2354
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2295
+#: builtin/am.c:2356
msgid "pass it through git-mailinfo"
msgstr "传递给 git-mailinfo"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
+#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
+#: builtin/am.c:2386
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
+#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
+#: parse-options.h:348
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
-#: builtin/verify-tag.c:38
+#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
+#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
+#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
+#: builtin/tag.c:480 builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2322
+#: builtin/am.c:2383
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2328
+#: builtin/am.c:2389
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2330
+#: builtin/am.c:2391
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2333
+#: builtin/am.c:2394
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2336
+#: builtin/am.c:2397
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2339
+#: builtin/am.c:2400
msgid "restore the original branch and abort the patching operation"
msgstr "恢复原始分支并终止打补丁操作"
-#: builtin/am.c:2342
+#: builtin/am.c:2403
msgid "abort the patching operation but keep HEAD where it is"
msgstr "终止补丁操作但保持 HEAD 不变"
-#: builtin/am.c:2346
+#: builtin/am.c:2407
msgid "show the patch being applied"
msgstr "显示正在应用的补丁"
-#: builtin/am.c:2351
+#: builtin/am.c:2411
+msgid "record the empty patch as an empty commit"
+msgstr "把空补丁记录为空提交"
+
+#: builtin/am.c:2415
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2353
+#: builtin/am.c:2417
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
+#: builtin/revert.c:117 builtin/tag.c:461
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2420 builtin/rebase.c:1128
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2359
+#: builtin/am.c:2423
+msgid "how to handle empty patches"
+msgstr "如何处理空补丁"
+
+#: builtin/am.c:2426
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
-#: builtin/am.c:2377
+#: builtin/am.c:2444
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."
@@ -10670,16 +11110,16 @@
"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2384
+#: builtin/am.c:2451
msgid "failed to read the index"
-msgstr "读取索引失败"
+msgstr "无法读取索引"
-#: builtin/am.c:2399
+#: builtin/am.c:2466
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/am.c:2423
+#: builtin/am.c:2490
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10688,11 +11128,11 @@
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2429
+#: builtin/am.c:2496
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
-#: builtin/am.c:2439
+#: builtin/am.c:2506
msgid "interactive mode requires patches on the command line"
msgstr "交互式模式需要命令行上提供补丁"
@@ -10700,52 +11140,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<选项>] [<补丁>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "不能创建归档文件 '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "不能重定向输出"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive：未提供远程 URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive：期望是 ACK/NAK，却得到 flush 包"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive：NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive：协议错误"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive：应有一个 flush 包"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<提交>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
-
-#: builtin/bisect--helper.c:25
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-
#: builtin/bisect--helper.c:26
msgid ""
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
@@ -10755,10 +11178,6 @@
"git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}"
"=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]"
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-next"
-
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]"
@@ -10775,72 +11194,81 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <命令>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "不能写入文件 '%s'"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "不能打开文件 '%s' 来读取"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' 不是一个有效的术语"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "不能使用内置命令 '%s' 作为术语"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "不能修改术语 '%s' 的含义"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "请使用两个不同的术语"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "我们没有在二分查找。\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' 不是一个有效的提交"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "坏的 bisect_write 参数：%s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "无法获取版本 '%s' 的对象 ID"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "无法打开文件 '%s'"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10849,7 +11277,7 @@
"您需要给我至少一个 %s 和一个 %s 版本。\n"
"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10860,7 +11288,7 @@
"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "在只有一个 %s 提交的情况下二分查找"
@@ -10869,22 +11297,22 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "您确认么[Y/n]？ "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "未定义术语"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10893,52 +11321,52 @@
"命令 'git bisect terms' 的参数 %s 无效。\n"
"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "版本遍历设置失败\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "无法打开 '%s' 进行追加"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' 不是一个有效的术语"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "未识别的选项：'%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' 看起来不是一个有效的版本"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "坏的 HEAD - 我需要一个 HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "不会在做了 cg-seek 的树上做二分查找"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "坏的 HEAD - 奇怪的符号引用"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "无效的引用：'%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "您需要执行 \"git bisect start\" 来开始\n"
@@ -10946,104 +11374,158 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "您想让我为您这样做么[Y/n]？ "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "请使用至少一个参数调用 `--bisect-state`"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' 只能带一个参数。"
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "坏的版本输入：%s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "坏的版本输入（不是提交）：%s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "我们没有在二分查找。"
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "'%s'?? 您在说什么?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "不能读取文件 '%s' 来重放"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#, c-format
+msgid "running %s\n"
+msgstr "正在执行 %s\n"
+
+#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+msgid "bisect run failed: no command provided."
+msgstr "二分查找运行失败：没有提供命令。"
+
+#: builtin/bisect--helper.c:1166
+#, c-format
+msgid "unable to verify '%s' on good revision"
+msgstr "无法在好版本中验证 '%s'"
+
+#: builtin/bisect--helper.c:1172
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr "好版本返回错误的退出码 %d"
+
+#: builtin/bisect--helper.c:1180
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "二分查找运行失败：命令 '%2$s' 的退出码 %1$d < 0 或 >= 128"
+
+#: builtin/bisect--helper.c:1195
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "无法打开文件 '%s' 进行写入"
+
+#: builtin/bisect--helper.c:1213
+msgid "bisect run cannot continue any more"
+msgstr "二分查找不能继续运行"
+
+#: builtin/bisect--helper.c:1215
+#, c-format
+msgid "bisect run success"
+msgstr "二分查找运行成功"
+
+#: builtin/bisect--helper.c:1218
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "二分查找找到了第一个坏的提交"
+
+#: builtin/bisect--helper.c:1221
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr "二分查找运行失败：'git bisect--helper --bisect-state %s' 退出码为 %d"
+
+#: builtin/bisect--helper.c:1253
msgid "reset the bisection state"
msgstr "清除二分查找状态"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1255
msgid "check whether bad or good terms exist"
msgstr "检查坏的或好的术语是否存在"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1257
msgid "print out the bisect terms"
msgstr "打印二分查找术语"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1259
msgid "start the bisect session"
msgstr "启动二分查找过程"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1261
msgid "find the next bisection commit"
msgstr "查询下一个二分查找提交"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1263
msgid "mark the state of ref (or refs)"
msgstr "标记引用的状态"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1265
msgid "list the bisection steps so far"
msgstr "列出到目前为止的二分查找步骤"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1267
msgid "replay the bisection process from the given file"
msgstr "从给定文件重放二分查找进程"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1269
msgid "skip some commits for checkout"
msgstr "跳过要检出的一些提交"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1271
+msgid "visualize the bisection"
+msgstr "可视化二分查找过程"
+
+#: builtin/bisect--helper.c:1273
+msgid "use <cmd>... to automatically bisect"
+msgstr "使用 <命令>... 来自动二分查找"
+
+#: builtin/bisect--helper.c:1275
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE 无日志"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1290
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset 无需参数或者需要一个提交"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check 需要 2 或 3 个参数"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1295
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 需要 0 或 1 个参数"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1304
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next 需要 0 个参数"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1315
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log 需要 0 个参数"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1320
msgid "no logfile given"
msgstr "未提供日志文件"
@@ -11055,149 +11537,142 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "期望一个颜色：%s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "必须以一个颜色结尾"
-#: builtin/blame.c:728
-#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
-
-#: builtin/blame.c:746
-msgid "invalid value for blame.coloring"
-msgstr "设置 blame.coloring 中的无效取值"
-
-#: builtin/blame.c:845
+#: builtin/blame.c:842
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "不能找到要忽略的版本 %s"
-#: builtin/blame.c:867
+#: builtin/blame.c:864
msgid "show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:868
+#: builtin/blame.c:865
msgid "do not show object names of boundary commits (Default: off)"
msgstr "不显示边界提交的对象名（默认：关闭）"
-#: builtin/blame.c:869
+#: builtin/blame.c:866
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界（默认：关闭）"
-#: builtin/blame.c:870
+#: builtin/blame.c:867
msgid "show work cost statistics"
msgstr "显示工作消耗统计"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
+#: builtin/remote.c:683 builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "强制显示进度报告"
-#: builtin/blame.c:872
+#: builtin/blame.c:869
msgid "show output score for blame entries"
msgstr "显示 blame 条目的输出得分"
-#: builtin/blame.c:873
+#: builtin/blame.c:870
msgid "show original filename (Default: auto)"
msgstr "显示原始文件名（默认：自动）"
-#: builtin/blame.c:874
+#: builtin/blame.c:871
msgid "show original linenumber (Default: off)"
msgstr "显示原始的行号（默认：关闭）"
-#: builtin/blame.c:875
+#: builtin/blame.c:872
msgid "show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:876
+#: builtin/blame.c:873
msgid "show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:877
+#: builtin/blame.c:874
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
-#: builtin/blame.c:878
+#: builtin/blame.c:875
msgid "show raw timestamp (Default: off)"
msgstr "显示原始时间戳（默认：关闭）"
-#: builtin/blame.c:879
+#: builtin/blame.c:876
msgid "show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 提交号（默认：关闭）"
-#: builtin/blame.c:880
+#: builtin/blame.c:877
msgid "suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳（默认：关闭）"
-#: builtin/blame.c:881
+#: builtin/blame.c:878
msgid "show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字（默认：关闭）"
-#: builtin/blame.c:882
+#: builtin/blame.c:879
msgid "ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:880 builtin/log.c:1857
msgid "rev"
msgstr "版本"
-#: builtin/blame.c:883
+#: builtin/blame.c:880
msgid "ignore <rev> when blaming"
msgstr "在执行 blame 操作时忽略 <版本>"
-#: builtin/blame.c:884
+#: builtin/blame.c:881
msgid "ignore revisions from <file>"
msgstr "忽略来自 <文件> 中的版本"
-#: builtin/blame.c:885
+#: builtin/blame.c:882
msgid "color redundant metadata from previous line differently"
msgstr "使用颜色间隔输出与前一行不同的重复元信息"
-#: builtin/blame.c:886
+#: builtin/blame.c:883
msgid "color lines by age"
msgstr "依据时间着色"
-#: builtin/blame.c:887
+#: builtin/blame.c:884
msgid "spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:888
+#: builtin/blame.c:885
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:886
msgid "use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的镜像"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:887 builtin/blame.c:888
msgid "score"
msgstr "得分"
-#: builtin/blame.c:890
+#: builtin/blame.c:887
msgid "find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:891
+#: builtin/blame.c:888
msgid "find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:892
+#: builtin/blame.c:889
msgid "range"
msgstr "范围"
-#: builtin/blame.c:893
+#: builtin/blame.c:890
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数名>"
-#: builtin/blame.c:945
+#: builtin/blame.c:949
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能和 --incremental 或机器内部格式一起使用"
@@ -11209,18 +11684,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:1000
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1116
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "文件 %s 只有 %lu 行"
msgstr[1] "文件 %s 只有 %lu 行"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1161
msgid "Blaming lines"
msgstr "追踪代码行"
@@ -11229,31 +11704,37 @@
msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]"
#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr "git branch [<选项>] [-f] [--recurse-submodules] <分支名> [<起始点>]"
#: builtin/branch.c:31
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<选项>] [-l] [<模式>...]"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
-#: builtin/branch.c:33
+#: builtin/branch.c:34
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
-#: builtin/branch.c:34
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<选项>] [-r | -a] [--points-at]"
-#: builtin/branch.c:35
+#: builtin/branch.c:36
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<选项>] [-r | -a] [--format]"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:154
+#: builtin/branch.c:165
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -11263,7 +11744,7 @@
" '%s'，但未合并到 HEAD。"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:158
+#: builtin/branch.c:169
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -11272,12 +11753,12 @@
"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
" 然而却尚未被合并到分支 '%s' 。"
-#: builtin/branch.c:172
+#: builtin/branch.c:183
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
-#: builtin/branch.c:176
+#: builtin/branch.c:187
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -11286,111 +11767,111 @@
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它，执行 'git branch -D %s'。"
-#: builtin/branch.c:189
+#: builtin/branch.c:200
msgid "Update of config-file failed"
msgstr "更新配置文件失败"
-#: builtin/branch.c:223
+#: builtin/branch.c:235
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
-#: builtin/branch.c:230
+#: builtin/branch.c:242
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
-#: builtin/branch.c:244
+#: builtin/branch.c:259
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
-#: builtin/branch.c:259
+#: builtin/branch.c:274
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/branch.c:260
+#: builtin/branch.c:275
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
-#: builtin/branch.c:291
+#: builtin/branch.c:306
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:307
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:457 builtin/tag.c:64
msgid "unable to parse format string"
msgstr "不能解析格式化字符串"
-#: builtin/branch.c:471
+#: builtin/branch.c:488
msgid "could not resolve HEAD"
msgstr "不能解析 HEAD 提交"
-#: builtin/branch.c:477
+#: builtin/branch.c:494
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) 指向 refs/heads/ 之外"
-#: builtin/branch.c:492
+#: builtin/branch.c:509
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被变基到 %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:513
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分查找于 %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:530
msgid "cannot copy the current branch while not on any."
msgstr "无法拷贝当前分支因为不处于任何分支上。"
-#: builtin/branch.c:515
+#: builtin/branch.c:532
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:526
+#: builtin/branch.c:543
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:572
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:557
+#: builtin/branch.c:574
msgid "Branch copy failed"
msgstr "分支拷贝失败"
-#: builtin/branch.c:561
+#: builtin/branch.c:578
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "已为错误命名的分支 '%s' 创建了一个副本"
-#: builtin/branch.c:564
+#: builtin/branch.c:581
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "已将错误命名的分支 '%s' 重命名"
-#: builtin/branch.c:570
+#: builtin/branch.c:587
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/branch.c:579
+#: builtin/branch.c:596
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名，但更新配置文件失败"
-#: builtin/branch.c:581
+#: builtin/branch.c:598
msgid "Branch is copied, but update of config-file failed"
msgstr "分支已拷贝，但更新配置文件失败"
-#: builtin/branch.c:597
+#: builtin/branch.c:614
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11401,209 +11882,221 @@
" %s\n"
"以 '%c' 开头的行将被过滤。\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:633
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/branch.c:634
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "设置跟踪模式（参见 git-pull(1)）"
+#: builtin/branch.c:656 builtin/checkout.c:1571
+#: builtin/submodule--helper.c:3077
+msgid "set branch tracking configuration"
+msgstr "设置分支跟踪配置"
-#: builtin/branch.c:637
+#: builtin/branch.c:659
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:661
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:639
+#: builtin/branch.c:661
msgid "change the upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:640
+#: builtin/branch.c:662
msgid "unset the upstream info"
msgstr "取消上游信息的设置"
-#: builtin/branch.c:641
+#: builtin/branch.c:663
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:642
+#: builtin/branch.c:664
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:666 builtin/branch.c:668
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:667 builtin/branch.c:669
msgid "print only branches that don't contain the commit"
msgstr "只打印不包含该提交的分支"
-#: builtin/branch.c:650
+#: builtin/branch.c:672
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作："
-#: builtin/branch.c:651
+#: builtin/branch.c:673
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:653
+#: builtin/branch.c:675
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:654
+#: builtin/branch.c:676
msgid "delete branch (even if not merged)"
msgstr "删除分支（即使没有合并）"
-#: builtin/branch.c:655
+#: builtin/branch.c:677
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/branch.c:656
+#: builtin/branch.c:678
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/branch.c:657
+#: builtin/branch.c:679
msgid "copy a branch and its reflog"
msgstr "拷贝一个分支和它的引用日志"
-#: builtin/branch.c:658
+#: builtin/branch.c:680
msgid "copy a branch, even if target exists"
msgstr "拷贝一个分支，即使目标已存在"
-#: builtin/branch.c:659
+#: builtin/branch.c:681
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:660
+#: builtin/branch.c:682
msgid "show current branch name"
msgstr "显示当前分支名"
-#: builtin/branch.c:661
+#: builtin/branch.c:683 builtin/submodule--helper.c:3075
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:663
+#: builtin/branch.c:685
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:664
+#: builtin/branch.c:686
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
-#: builtin/branch.c:665
+#: builtin/branch.c:687
msgid "print only branches that are merged"
msgstr "只打印已经合并的分支"
-#: builtin/branch.c:666
+#: builtin/branch.c:688
msgid "print only branches that are not merged"
msgstr "只打印尚未合并的分支"
-#: builtin/branch.c:667
+#: builtin/branch.c:689
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:476
msgid "object"
msgstr "对象"
-#: builtin/branch.c:670
+#: builtin/branch.c:692
msgid "print only branches of the object"
msgstr "只打印指向该对象的分支"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
msgid "sorting and filtering are case insensitive"
msgstr "排序和过滤属于大小写不敏感"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:694 builtin/ls-files.c:667
+msgid "recurse through submodules"
+msgstr "在子模组中递归"
+
+#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
+#: builtin/tag.c:481 builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "输出格式"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:718 builtin/clone.c:684
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column 和 --verbose 不兼容"
+#: builtin/branch.c:739
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
+"带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:741
+msgid "--recurse-submodules can only be used to create branches"
+msgstr "--recurse-submodules 只能用于创建分支"
+
+#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:766
+#: builtin/branch.c:802
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:771
+#: builtin/branch.c:807
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:778
+#: builtin/branch.c:814
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:781
+#: builtin/branch.c:817
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:796
+#: builtin/branch.c:832
msgid "too many branches for a copy operation"
msgstr "为拷贝操作提供了太多的分支名"
-#: builtin/branch.c:805
+#: builtin/branch.c:841
msgid "too many arguments for a rename operation"
msgstr "为重命名操作提供了太多的参数"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "too many arguments to set new upstream"
msgstr "为设置新上游提供了太多的参数"
-#: builtin/branch.c:814
+#: builtin/branch.c:850
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:853 builtin/branch.c:873
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:821
+#: builtin/branch.c:857
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:834
+#: builtin/branch.c:867
msgid "too many arguments to unset upstream"
msgstr "为取消上游设置操作提供了太多的参数"
-#: builtin/branch.c:838
+#: builtin/branch.c:871
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:844
+#: builtin/branch.c:877
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:854
+#: builtin/branch.c:890
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>?"
@@ -11611,39 +12104,39 @@
"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
"您是否想要使用：-a|-r --list <模式>？"
-#: builtin/branch.c:858
+#: builtin/branch.c:894
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "git 版本：\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() 失败，错误为 '%s'（%d）\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "编译器信息："
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "libc 信息："
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11677,38 +12170,33 @@
"请检查下面错误报告中余下的内容。\n"
"您可以删除任何您不想共享的内容。\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "指定错误报告文件的目标位置"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "指定文件的 strftime 格式后缀"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "系统信息"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "启用的钩子"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "不能在 '%s' 创建新文件"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "无法写入 %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "在 '%s' 创建了新报告。\n"
@@ -11729,135 +12217,247 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <文件> [<引用名>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3899
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3903
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3906
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "指定归档包的格式版本"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "需要一个仓库来创建归档包。"
-#: builtin/bundle.c:109
+#: builtin/bundle.c:108
msgid "do not show bundle details"
msgstr "不显示归档包的细节"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:127
#, c-format
msgid "%s is okay\n"
msgstr "%s 可以\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:183
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解开归档包。"
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "冗长输出；必须置于子命令之前"
+#: builtin/bundle.c:186
+msgid "Unbundling objects"
+msgstr "解包对象中"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:220 builtin/remote.c:1758
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令：%s"
-#: builtin/cat-file.c:596
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
-msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
+#: builtin/cat-file.c:568
+msgid "flush is only for --buffer mode"
+msgstr "flush 只在 --buffer 模式中使用"
-#: builtin/cat-file.c:597
-msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
-msgstr ""
-"git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] "
-"[--textconv | --filters]"
+#: builtin/cat-file.c:612
+msgid "empty command in input"
+msgstr "输入为空的命令"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:614
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "命令前存在空白：'%s'"
+
+#: builtin/cat-file.c:623
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s 需要参数"
+
+#: builtin/cat-file.c:628
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s 不需要参数"
+
+#: builtin/cat-file.c:636
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "未知命令：'%s'"
+
+#: builtin/cat-file.c:795
msgid "only one batch option may be specified"
msgstr "只能指定一个批处理选项"
-#: builtin/cat-file.c:636
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
+#: builtin/cat-file.c:824
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <类型> <对象>"
-#: builtin/cat-file.c:637
-msgid "show object type"
-msgstr "显示对象类型"
+#: builtin/cat-file.c:825
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git cat-file (-e | -p) <对象>"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:826
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr "git cat-file (-t | -s) [--allow-unknown-type] <对象>"
+
+#: builtin/cat-file.c:827
+msgid ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+
+#: builtin/cat-file.c:830
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
+"git cat-file (--textconv | --filters)\n"
+" [<版本>:<路径|树对象> | --path=<路径|树对象> <版本>]"
+
+#: builtin/cat-file.c:836
+msgid "Check object existence or emit object contents"
+msgstr "检查对象存在或输出对象内容"
+
+#: builtin/cat-file.c:838
+msgid "check if <object> exists"
+msgstr "检查 <对象> 是否存在"
+
+#: builtin/cat-file.c:839
+msgid "pretty-print <object> content"
+msgstr "美观地打印 <对象> 的内容"
+
+#: builtin/cat-file.c:841
+msgid "Emit [broken] object attributes"
+msgstr "输出 [坏的] 对象属性"
+
+#: builtin/cat-file.c:842
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr "显示对象的类型（'blob'、'tree'、'commit'、'tag'……其中之一）"
+
+#: builtin/cat-file.c:843
msgid "show object size"
msgstr "显示对象大小"
-#: builtin/cat-file.c:640
-msgid "exit with zero when there's no error"
-msgstr "当没有错误时退出并返回零"
-
-#: builtin/cat-file.c:641
-msgid "pretty-print object's content"
-msgstr "美观地打印对象的内容"
-
-#: builtin/cat-file.c:643
-msgid "for blob objects, run textconv on object's content"
-msgstr "对于数据对象，对其内容做文本转换"
-
-#: builtin/cat-file.c:645
-msgid "for blob objects, run filters on object's content"
-msgstr "对于数据对象，对其内容做过滤"
-
-#: builtin/cat-file.c:646
-msgid "blob"
-msgstr "数据对象"
-
-#: builtin/cat-file.c:647
-msgid "use a specific path for --textconv/--filters"
-msgstr "对于 --textconv/--filters 使用一个特定的路径"
-
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:845
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允许 -s 和 -t 对损坏的对象生效"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:847
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr "批量处理标准输入中请求的对象（或者 --batch-all-objects）"
+
+#: builtin/cat-file.c:849
+msgid "show full <object> or <rev> contents"
+msgstr "显示完整的 <对象> 或 <版本> 内容"
+
+#: builtin/cat-file.c:853
+msgid "like --batch, but don't emit <contents>"
+msgstr "类似于 --batch，但不输出 <内容>"
+
+#: builtin/cat-file.c:857
+msgid "read commands from stdin"
+msgstr "从标准输入读取命令"
+
+#: builtin/cat-file.c:861
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr "带有 --batch[-check]：忽略标准输入，批量处理所有已知的对象"
+
+#: builtin/cat-file.c:863
+msgid "Change or optimize batch output"
+msgstr "更改或优化批处理输出"
+
+#: builtin/cat-file.c:864
msgid "buffer --batch output"
msgstr "缓冲 --batch 的输出"
-#: builtin/cat-file.c:652
-msgid "show info and content of objects fed from the standard input"
-msgstr "显示从标准输入提供的对象的信息和内容"
+#: builtin/cat-file.c:866
+msgid "follow in-tree symlinks"
+msgstr "跟随树内符号链接"
-#: builtin/cat-file.c:656
-msgid "show info about objects fed from the standard input"
-msgstr "显示从标准输入提供的对象的信息"
+#: builtin/cat-file.c:868
+msgid "do not order objects before emitting them"
+msgstr "在输出对象前不要排序"
-#: builtin/cat-file.c:660
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
+#: builtin/cat-file.c:870
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
+msgstr "转换或过滤后输出对象（数据对象或树）（单独或批处理）"
-#: builtin/cat-file.c:662
-msgid "show all objects with --batch or --batch-check"
-msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
+#: builtin/cat-file.c:872
+msgid "run textconv on object's content"
+msgstr "对对象内容做文本转换"
-#: builtin/cat-file.c:664
-msgid "do not order --batch-all-objects output"
-msgstr "不要对 --batch-all-objects 的输出排序"
+#: builtin/cat-file.c:874
+msgid "run filters on object's content"
+msgstr "对对象内容做过滤"
+
+#: builtin/cat-file.c:875
+msgid "blob|tree"
+msgstr "数据对象|树"
+
+#: builtin/cat-file.c:876
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
+msgstr "(--textconv | --filters) 使用 <路径>；而不是 'batch'"
+
+#: builtin/cat-file.c:894
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "'%s=<%s>' 需要 '%s' 或 '%s'"
+
+#: builtin/cat-file.c:896
+msgid "path|tree-ish"
+msgstr "路径|树对象"
+
+#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "'%s' 需要批处理模式"
+
+#: builtin/cat-file.c:921
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "'-%c' 与批处理模式不兼容"
+
+#: builtin/cat-file.c:924
+msgid "batch modes take no arguments"
+msgstr "批处理模式不带其他参数"
+
+#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "'%s' 需要 <版本>"
+
+#: builtin/cat-file.c:938
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "'-%c' 需要 <对象>"
+
+#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429
+#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596
+#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965
+#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
+#: builtin/tag.c:592
+msgid "too many arguments"
+msgstr "太多参数"
+
+#: builtin/cat-file.c:947
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr "<类型> <对象> 模式只允许两个参数，而不是 %d 个"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -11875,7 +12475,7 @@
msgid "use .gitattributes only from the index"
msgstr "只使用索引中的 .gitattributes"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
msgid "read file names from stdin"
msgstr "从标准输入读出文件名"
@@ -11883,8 +12483,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
+#: builtin/worktree.c:565
msgid "suppress progress reporting"
msgstr "不显示进度报告"
@@ -11941,167 +12541,165 @@
msgid "git checkout--worker [<options>]"
msgstr "git checkout--worker [<选项>]"
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
+#: builtin/worktree.c:808
msgid "string"
msgstr "字符串"
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
msgid "when creating files, prepend <string>"
msgstr "在创建文件时，在前面加上 <字符串>"
-#: builtin/checkout-index.c:152
+#: builtin/checkout-index.c:184
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<选项>] [--] [<文件>...]"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:201
msgid "stage should be between 1 and 3 or all"
msgstr "索引值应该取值 1 到 3 或者 all"
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:219
msgid "check out all files in the index"
msgstr "检出索引区的所有文件"
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:221
+msgid "do not skip files with skip-worktree set"
+msgstr "在 skip-worktree 设置时不要跳过文件"
+
+#: builtin/checkout-index.c:222
msgid "force overwrite of existing files"
msgstr "强制覆盖现有的文件"
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:224
msgid "no warning for existing files and files not in index"
msgstr "存在或不在索引中的文件都没有警告"
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:226
msgid "don't checkout new files"
msgstr "不检出新文件"
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:228
msgid "update stat information in the index file"
msgstr "更新索引中文件的状态信息"
-#: builtin/checkout-index.c:198
+#: builtin/checkout-index.c:232
msgid "read list of paths from the standard input"
msgstr "从标准输入读取路径列表"
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:234
msgid "write the content to temporary files"
msgstr "将内容写入临时文件"
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:238
msgid "copy out the files from named stage"
msgstr "从指定暂存区中拷出文件"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:34
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<选项>] <分支>"
-#: builtin/checkout.c:34
+#: builtin/checkout.c:35
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
-#: builtin/checkout.c:39
+#: builtin/checkout.c:40
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<选项>] [<分支>]"
-#: builtin/checkout.c:44
+#: builtin/checkout.c:45
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:199 builtin/checkout.c:238
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:201 builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:217
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必需的版本"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:271
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必需的版本"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:291
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：无法合并"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:307
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:411
+#: builtin/checkout.c:424
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "重新创建了 %d 个合并冲突"
msgstr[1] "重新创建了 %d 个合并冲突"
-#: builtin/checkout.c:416
+#: builtin/checkout.c:429
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "从 %2$s 更新了 %1$d 个路径"
msgstr[1] "从 %2$s 更新了 %1$d 个路径"
-#: builtin/checkout.c:423
+#: builtin/checkout.c:436
#, 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:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:469
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' 不能和 %s 同时使用"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:479
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:470
+#: builtin/checkout.c:483
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "'%s' 或 '%s' 都没有指定"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:487
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "未指定 '%2$s' 时，必须使用 '%1$s'"
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:492 builtin/checkout.c:497
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:571 builtin/checkout.c:578
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:753
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:809
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12110,51 +12708,51 @@
"不能继续，下列文件有暂存的修改：\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:902
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:947
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:955
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:958
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:962
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:964 builtin/checkout.c:1398
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:966
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:993
+#: builtin/checkout.c:1017
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12175,7 +12773,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1042
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12202,19 +12800,19 @@
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1077
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1081
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1124 builtin/checkout.c:1393
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1206
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12223,7 +12821,7 @@
"'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
"请使用 --（和可选的 --no-guess）来消除歧义"
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1213
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"
@@ -12242,51 +12840,56 @@
"如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n"
"名称，可以在配置中设置 checkout.defaultRemote=origin。"
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1223
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' 匹配多个（%d 个）远程跟踪分支"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
msgid "only one reference expected"
msgstr "只期望一个引用"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1306
#, c-format
msgid "only one reference expected, %d given."
msgstr "应只有一个引用，却给出了 %d 个"
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1365 builtin/checkout.c:1744
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "期望一个分支，得到标签 '%s'"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1415
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "期望一个分支，得到远程分支 '%s'"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1417 builtin/checkout.c:1426
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "期望一个分支，得到 '%s'"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1420
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "期望一个分支，得到提交 '%s'"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1429
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr "如果你在本提交分离头指针，使用 --detach 选项重试。"
+
+#: builtin/checkout.c:1442
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12294,7 +12897,7 @@
"不能在合并时切换分支\n"
"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12302,7 +12905,7 @@
"不能在一个 am 会话期间切换分支\n"
"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1450
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12310,7 +12913,7 @@
"不能在变基时切换分支\n"
"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12318,7 +12921,7 @@
"不能在拣选时切换分支\n"
"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1458
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12326,208 +12929,192 @@
"不能在还原时切换分支\n"
"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1462
msgid "you are switching branch while bisecting"
msgstr "您在执行二分查找时切换分支"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1469
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
+#: builtin/checkout.c:1495 builtin/checkout.c:1500
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1497
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' 不带 <起始点>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1505
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1512
msgid "missing branch or commit argument"
msgstr "缺少分支或提交参数"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1555
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1522
-msgid "conflict style (merge or diff3)"
-msgstr "冲突输出风格（merge 或 diff3）"
+#: builtin/checkout.c:1557
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "冲突输出风格（merge、diff3 或 zdiff3）"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1569 builtin/worktree.c:560
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/checkout.c:1535
-msgid "set upstream info for new branch"
-msgstr "为新的分支设置上游信息"
-
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1574
msgid "force checkout (throw away local modifications)"
msgstr "强制检出（丢弃本地修改）"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1578 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "更新忽略的文件（默认）"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1581
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1594
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1597
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1601
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1659
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c、-%c 和 --orphan 是互斥的"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "选项 '-%c'、'-%c' 和 ‘%s' 不能同时使用"
-#: builtin/checkout.c:1626
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p 和 --overlay 互斥"
-
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1700
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1705
#, c-format
msgid "missing branch name; try -%c"
msgstr "缺少分支名，尝试 -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1737
#, c-format
msgid "could not resolve %s"
msgstr "无法解析 %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1753
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1760
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1764
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1736
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file 与 --detach 不兼容"
-
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file 与 --patch 不兼容"
-
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1789
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1794
msgid "you must specify path(s) to restore"
msgstr "您必须指定一个要恢复的路径"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
+#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
+#: builtin/remote.c:173 builtin/submodule--helper.c:3038
+#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
+#: builtin/worktree.c:558
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1820
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1822
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1823
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1825
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "二次猜测 'git checkout <无此分支>'（默认）"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1826
msgid "use overlay mode (default)"
msgstr "使用叠加模式（默认）"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1874
msgid "create and switch to a new branch"
msgstr "创建并切换一个新分支"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1876
msgid "create/reset and switch to a branch"
msgstr "创建/重置并切换一个分支"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1878
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜测 'git switch <无此分支>'"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1880
msgid "throw away local modifications"
msgstr "丢弃本地修改"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1916
msgid "which tree-ish to checkout from"
msgstr "要检出哪一个树"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1918
msgid "restore the index"
msgstr "恢复索引"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1920
msgid "restore the working tree (default)"
msgstr "恢复工作区（默认）"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1922
msgid "ignore unmerged entries"
msgstr "忽略未合并条目"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1923
msgid "use overlay mode"
msgstr "使用叠加模式"
@@ -12562,7 +13149,15 @@
msgid "could not lstat %s\n"
msgstr "不能对 %s 调用 lstat\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "拒绝删除当前工作目录\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "将拒绝删除当前工作目录\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12575,7 +13170,7 @@
"foo - 通过唯一前缀选择一个选项\n"
" - （空）什么也不选择\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12596,33 +13191,33 @@
"* - 选择所有选项\n"
" - （空）结束选择\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯（%s）？\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告：无法找到和 %s 匹配的条目"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]？"
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12640,277 +13235,275 @@
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目："
msgstr[1] "将删除如下条目："
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件，退出。"
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "强制"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "交互式清除"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
+#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "添加 <模式> 到忽略规则"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "只删除忽略的文件"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
-#: builtin/clone.c:45
+#: builtin/clone.c:47
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:96
+#: builtin/clone.c:100
msgid "don't clone shallow repository"
msgstr "不克隆浅仓库"
-#: builtin/clone.c:98
+#: builtin/clone.c:102
msgid "don't create a checkout"
msgstr "不创建一个检出"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "创建一个纯仓库"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像仓库（也是纯仓库）"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接，始终复制"
-#: builtin/clone.c:109
+#: builtin/clone.c:113
msgid "setup as shared repository"
msgstr "设置为共享仓库"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "pathspec"
msgstr "路径规格"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:115
+#: builtin/clone.c:119
msgid "number of submodules cloned in parallel"
msgstr "并发克隆的子模组的数量"
-#: builtin/clone.c:116 builtin/init-db.c:539
+#: builtin/clone.c:120 builtin/init-db.c:539
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:117 builtin/init-db.c:540
+#: builtin/clone.c:121 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:127 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2721
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3967 builtin/repack.c:669
+#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "名称"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而不是远程 HEAD"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
+#: builtin/pull.c:212
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:131
+#: builtin/clone.c:135
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
+#: builtin/pull.c:215
msgid "time"
msgstr "时间"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
msgid "revision"
msgstr "版本"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史，除了特定版本"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:141 builtin/submodule--helper.c:1897
+#: builtin/submodule--helper.c:2735
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
-#: builtin/clone.c:139
+#: builtin/clone.c:143
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "any cloned submodules will be shallow"
msgstr "子模组将以浅下载模式克隆"
-#: builtin/clone.c:142 builtin/init-db.c:548
+#: builtin/clone.c:146 builtin/init-db.c:548
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:143 builtin/init-db.c:549
+#: builtin/clone.c:147 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:144
+#: builtin/clone.c:148
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:145
+#: builtin/clone.c:149
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "server-specific"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "传输选项"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
-#: builtin/clone.c:154
+#: builtin/clone.c:158
+msgid "apply partial clone filters to submodules"
+msgstr "对子模组使用部分克隆过滤器"
+
+#: builtin/clone.c:160
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
-#: builtin/clone.c:156
+#: builtin/clone.c:162
msgid "initialize sparse-checkout file to include only files at root"
msgstr "初始化稀疏检出文件，只包含根目录文件"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"无法猜到目录名。\n"
-"请在命令行指定一个目录"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:237
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:310
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:436
+#: builtin/clone.c:328
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "无法在 '%s' 上启动迭代器"
-#: builtin/clone.c:467
+#: builtin/clone.c:359
#, c-format
msgid "failed to create link '%s'"
-msgstr "创建链接 '%s' 失败"
+msgstr "无法创建链接 '%s'"
-#: builtin/clone.c:471
+#: builtin/clone.c:363
#, c-format
msgid "failed to copy file to '%s'"
-msgstr "拷贝文件至 '%s' 失败"
+msgstr "无法拷贝文件至 '%s'"
-#: builtin/clone.c:476
+#: builtin/clone.c:368
#, c-format
msgid "failed to iterate over '%s'"
msgstr "无法在 '%s' 上迭代"
-#: builtin/clone.c:503
+#: builtin/clone.c:395
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:409
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12920,148 +13513,148 @@
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
"'git restore --source=HEAD :/' 重试\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:486
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:713
+#: builtin/clone.c:603
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:651
msgid "failed to initialize sparse-checkout"
msgstr "无法初始化稀疏检出"
-#: builtin/clone.c:784
+#: builtin/clone.c:674
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:709
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:894
+#: builtin/clone.c:793
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:957
+#: builtin/clone.c:856
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:959
+#: builtin/clone.c:858
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:901
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:1005
+#: builtin/clone.c:905 contrib/scalar/scalar.c:413
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:1018
+#: builtin/clone.c:918
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare 和 --origin %s 选项不兼容。"
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "选项 '%s' 和 '%s %s' 不能同时使用"
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:935
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:939 builtin/fetch.c:2176
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:1049
+#: builtin/clone.c:949
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:1055
+#: builtin/clone.c:955
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "仓库路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:1069
+#: builtin/clone.c:969
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
+#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:1089
+#: builtin/clone.c:989
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:1109
+#: builtin/clone.c:1009
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1011
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1040
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' 不是一个有效的远程名称"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1157
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1231
+#: builtin/clone.c:1159
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1233
+#: builtin/clone.c:1161
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1235
+#: builtin/clone.c:1163
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1240
+#: builtin/clone.c:1168
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1173
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1185
+msgid "cannot clone from filtered bundle"
+msgstr "无法从经过过滤的归档包克隆"
+
+#: builtin/clone.c:1265 builtin/clone.c:1324
msgid "remote transport reported error"
msgstr "远程传输报告错误"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1277 builtin/clone.c:1289
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1292
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
@@ -13097,14 +13690,14 @@
msgid "--command must be the first argument"
msgstr "--command 必须是第一个参数"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13114,93 +13707,91 @@
">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
"[no-]max-new-filters <n>] [--[no-]progress] <切分选项>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "无法找到和 %s 匹配的对象目录"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
msgid "dir"
msgstr "目录"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "保存图形的对象目录"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr "如果提交图形被拆分，只验证头一个文件"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "无法打开提交图形 '%s'"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "未能识别的 --split 参数，%s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "意外的非十六进制对象 ID：%s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "无效对象：%s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "开始遍历所有引用"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "从标准输入中的包索引文件列表中扫描提交"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "从标准输入中的提交开始扫描"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr "包含 commit-graph 文件中已有所有提交"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "启用变更路径的计算"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "允许写一个增量提交图形文件"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "在非基本拆分提交图形中的最大提交数"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "一个拆分提交图形的两个级别之间的最大比率"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "只让早于给定时间的文件过期"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "要计算的变更路径布隆过滤器的最大数"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "正从标准输入收集提交"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "未识别的子命令：%s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13214,70 +13805,65 @@
msgid "duplicate parent %s ignored"
msgstr "忽略重复的父提交 %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
#, c-format
msgid "not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree：无法打开 '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree：无法读取 '%s'"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree：无法关闭 '%s'"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "父提交"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "父提交对象 ID"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
+#: builtin/tag.c:455
msgid "message"
msgstr "说明"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "提交说明"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交签名"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "必须精确地提供一个树"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
-msgstr "git commit-tree：读取失败"
+msgstr "git commit-tree：无法读取"
-#: builtin/commit.c:41
+#: builtin/commit.c:43
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<选项>] [--] <路径规格>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:48
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<选项>] [--] <路径规格>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:53
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13286,7 +13872,7 @@
"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:58
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13300,15 +13886,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:65
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "否则，请使用 'git rebase --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:68
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "否则，请使用 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:71
msgid ""
"and then use:\n"
"\n"
@@ -13329,122 +13915,118 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:326
msgid "failed to unpack HEAD tree object"
-msgstr "解包 HEAD 树对象失败"
+msgstr "无法解包 HEAD 树对象"
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file 和 -a 在一起没有意义"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:376
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
-#: builtin/commit.c:386
+#: builtin/commit.c:388
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
-#: builtin/commit.c:395
+#: builtin/commit.c:397
msgid "interactive add failed"
msgstr "交互式添加失败"
-#: builtin/commit.c:410
+#: builtin/commit.c:412
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:412
+#: builtin/commit.c:414
msgid "Failed to update main cache tree"
msgstr "不能更新树的主缓存"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:489
+#: builtin/commit.c:491
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
-#: builtin/commit.c:491
+#: builtin/commit.c:493
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
-#: builtin/commit.c:493
+#: builtin/commit.c:495
msgid "cannot do a partial commit during a rebase."
msgstr "在变基过程中不能做部分提交。"
-#: builtin/commit.c:501
+#: builtin/commit.c:503
msgid "cannot read the index"
msgstr "无法读取索引"
-#: builtin/commit.c:520
+#: builtin/commit.c:522
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:618
+#: builtin/commit.c:620
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者信息"
-#: builtin/commit.c:620
+#: builtin/commit.c:622
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有格式错误的作者信息"
-#: builtin/commit.c:639
+#: builtin/commit.c:641
msgid "malformed --author parameter"
msgstr "格式错误的 --author 参数"
-#: builtin/commit.c:692
+#: builtin/commit.c:694
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "无法选择一个未被当前提交说明使用的注释字符"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:762 builtin/shortlog.c:417
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:764
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
-#: builtin/commit.c:764
+#: builtin/commit.c:768
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
-#: builtin/commit.c:801
+#: builtin/commit.c:805
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "不能将 -m 和 --fixup 组合使用：%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "选项 '%s' 和 '%s:%s' 不能同时使用"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:817 builtin/commit.c:833
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:884
msgid "could not write commit template"
msgstr "不能写提交模版"
-#: builtin/commit.c:893
+#: builtin/commit.c:897
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored.\n"
msgstr "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略。\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:899
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13453,7 +14035,7 @@
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
"说明将会终止提交。\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:903
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13462,7 +14044,7 @@
"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n"
"也可以删除它们。\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:907
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13472,7 +14054,7 @@
"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n"
"也可以删除它们。一个空的提交说明将会终止提交。\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:919
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13485,7 +14067,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"然后重试。\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:924
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13499,374 +14081,348 @@
"然后重试。\n"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:947
+#: builtin/commit.c:951
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者： %.*s <%.*s>"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:955
+#: builtin/commit.c:959
#, c-format
msgid "%sDate: %s"
msgstr "%s日期： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:962
+#: builtin/commit.c:966
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者：%.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:984
msgid "Cannot read index"
msgstr "无法读取索引"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1029
msgid "unable to pass trailers to --trailers"
msgstr "无法将尾注传递给 --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1069
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1083 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1128
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1142
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "无效的忽略模式 '%s'"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1160 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
-msgstr "无效的未追踪文件参数 '%s'"
+msgstr "无效的未跟踪文件参数 '%s'"
-#: builtin/commit.c:1195
-msgid "--long and -z are incompatible"
-msgstr "--long 和 -z 选项不兼容"
-
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "You are in the middle of a merge -- cannot reword."
msgstr "您正处于一个合并过程中 -- 无法改写说明。"
-#: builtin/commit.c:1228
+#: builtin/commit.c:1233
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "您正处于一个拣选过程中 -- 无法改写说明。"
-#: builtin/commit.c:1231
+#: builtin/commit.c:1236
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "不能将 --fixup 的改写说明选项和路径 '%s' 组合使用"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "改写说明选项 '%s' 和路径 '%s' 不能同时使用"
-#: builtin/commit.c:1233
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥"
+#: builtin/commit.c:1238
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "改写说明选项 '%s' 和 '%s' 不能同时使用"
-#: builtin/commit.c:1252
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "同时使用 --reset-author 和 --author 没有意义"
-
-#: builtin/commit.c:1261
+#: builtin/commit.c:1263
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
-#: builtin/commit.c:1264
+#: builtin/commit.c:1266
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
-#: builtin/commit.c:1266
+#: builtin/commit.c:1268
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/commit.c:1268
+#: builtin/commit.c:1270
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "您正处于一个变基过程中 -- 无法修补提交。"
-#: builtin/commit.c:1271
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "选项 --squash 和 --fixup 不能同时使用"
-
-#: builtin/commit.c:1281
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
-
-#: builtin/commit.c:1283
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
-
-#: builtin/commit.c:1292
+#: builtin/commit.c:1290
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
-#: builtin/commit.c:1310
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
-
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "未知选项：--fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "显示分支信息"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "显示贮藏区信息"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "计算完整的领先/落后值"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:765
msgid "machine-readable output"
msgstr "机器可读的输出"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "以长格式显示状态（默认）"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
"显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:197
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "不检测重命名"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "检测重命名，可以设置索引相似度"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支持已忽略和未跟踪文件参数的组合"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
msgid "read message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:551
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:360 ref-filter.h:89
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]提交"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "尾注"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "添加自定义尾注"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "添加 Signed-off-by 尾注"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "使用指定的模板文件"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "强制编辑提交"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "提交内容选项"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "提交所有改动的文件"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "交互式添加文件"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "交互式添加变更"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "只提交指定的文件"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "绕过 pre-commit 和 commit-msg 钩子"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "显示将要提交的内容"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "允许一个空提交"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件（%s）"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明：%s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交；您未更改来自模版的提交说明。\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "因提交说明的正文为空而终止提交。\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -13988,6 +14544,10 @@
msgid "Type"
msgstr "类型"
+#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+msgid "type"
+msgstr "类型"
+
#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "取值为该类型"
@@ -14066,7 +14626,7 @@
#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
-msgstr "格式化默认配置值失败：%s"
+msgstr "无法格式化默认配置值：%s"
#: builtin/config.c:441
#, c-format
@@ -14195,10 +14755,6 @@
msgid "no such section: %s"
msgstr "无此小节：%s"
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "以用户可读的格式显示大小"
@@ -14224,7 +14780,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr "credential-cache--daemon 不可用，不支持 unix 套接字"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache 不可用，不支持 unix 套接字"
@@ -14365,7 +14921,7 @@
msgid "do not consider tags matching <pattern>"
msgstr "不考虑匹配 <模式> 的标签"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:595
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
@@ -14381,25 +14937,14 @@
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long 与 --abbrev=0 不兼容"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "没有发现名称，无法描述任何东西。"
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty 与提交号不兼容"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken 与提交号不兼容"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin 和 --merge-base 是互斥的"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "选项 '%s' 和提交号不能同时使用"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
@@ -14420,26 +14965,26 @@
msgid "%s...%s: no merge base"
msgstr "%s...%s：无合并基线"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "不是 git 仓库"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:537 builtin/grep.c:700
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个数据对象：'%s'"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "无法处理的对象 '%s'。"
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s：多条合并基线，使用 %s"
@@ -14448,111 +14993,103 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "失败：%d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "无法读取符号链接 %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "无法读取符号链接文件 %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
"cc'）。"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "两个文件都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "工作区文件被留了下来。"
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "临时文件存在于 '%s'。"
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者恢复它们。"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "失败：%d"
+
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "执行一个全目录差异比较"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "启动差异比较工具之前不提示"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:700
msgid "tool"
msgstr "工具"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "使用指定的差异比较工具"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:706
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
-msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"
+msgstr "当执行的 diff 工具返回非零退出码时，使 'git-difftool' 退出"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "指定一个用于查看差异的自定义命令"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "传递给 `diff`"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool 要求工作区或者 --no-index"
-#: builtin/difftool.c:741
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff 和 --no-index 不兼容"
-
-#: builtin/difftool.c:744
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui、--tool 和 --extcmd 互斥"
-
-#: builtin/difftool.c:752
+#: builtin/difftool.c:745
msgid "no <tool> given for --tool=<tool>"
msgstr "没有为 --tool=<工具> 参数提供 <工具>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:752
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
@@ -14560,10 +15097,6 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
-msgid "type"
-msgstr "类型"
-
#: builtin/env--helper.c:46
msgid "default for git_env_*(...) to fall back on"
msgstr "git_env_*(...) 的默认值"
@@ -14580,388 +15113,383 @@
#: builtin/env--helper.c:82
#, c-format
msgid ""
-"option `--default' expects an unsigned long value with `--type=ulong`, not `"
-"%s`"
+"option `--default' expects an unsigned long value with `--type=ulong`, not "
+"`%s`"
msgstr "选项 `--default' 和 `--type=ulong` 期望一个无符号长整型，不是 `%s`"
#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [rev-list-opts]"
+msgid "git fast-export [<rev-list-opts>]"
+msgstr "git fast-export [<rev-list 选项>]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。"
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "--anonymize-map 取值不能为空"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "选择如何处理签名标签"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "选择当标签指向被过滤对象时该标签的处理方式"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr "选择使用备用编码处理提交说明"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "把标记存储到这个文件"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "从这个文件导入标记"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "如果文件存在，从该文件导入标记"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr "当标签缺少标记人字段时，假装提供一个"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "每次提交都输出整个树"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "跳过数据对象的输出"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1860
msgid "refspec"
msgstr "引用规格"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "对导出的引用应用引用规格"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "匿名输出"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "from:to"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "在匿名输出中将 <from> 转换为 <to>"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
msgstr "引用父对象 ID 不在 fast-export 流中"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "显示数据对象/提交的原始对象 ID"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "对带有标记 ID 的标签做标记"
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map 而没有 --anonymize 没有意义"
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3097
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "子模组 '%s' 缺少 from 标记"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3099
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "子模组 '%s' 缺少 to 标记"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3234
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "预期 'mark' 命令，得到 %s"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3239
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "预期 'to' 命令，得到 %s"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3331
msgid "Expected format name:filename for submodule rewrite option"
msgstr "子模组重写选项的预期格式为 name:filename"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3386
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
-#: builtin/fetch-pack.c:242
+#: builtin/fetch-pack.c:246
#, c-format
msgid "Lockfile created but not reported: %s"
msgstr "Lockfile 已创建但未报告：%s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<选项>] <组>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:124
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel 不能为负数"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:147 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:149 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "为 git pull/fetch 设置上游"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:151 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:153
msgid "use atomic transaction to update references"
msgstr "使用原子事务更新引用"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:155 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
msgid "force overwrite of local reference"
msgstr "强制覆盖本地引用"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:158
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:160 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "抓取所有的标签和关联对象"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何标签(--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:164
msgid "number of submodules fetched in parallel"
msgstr "子模组获取的并发数"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:166
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr "修改引用规格以将所有引用放入 refs/prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:168 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:170
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "清除远程不存在的本地标签，并且替换变更标签"
# 译者：可选值，不能翻译
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:172
msgid "control recursive fetching of submodules"
msgstr "控制子模组的递归抓取"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:177
msgid "write fetched references to the FETCH_HEAD file"
msgstr "将获取到的引用写入 FETCH_HEAD 文件"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:178 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "保持下载包"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:180
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:185 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "基于时间来深化浅克隆的历史"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:191 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:194
+msgid "re-fetch without negotiating common commits"
+msgstr "不协商共有提交重新获取"
+
+#: builtin/fetch.c:197
msgid "prepend this to submodule path output"
msgstr "在子模组路径输出的前面加上此目录"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:200
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:204 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:205 builtin/pull.c:230
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:206 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "指定获取操作的引用映射"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:213 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "报告我们只拥有从该对象开始可达的对象"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:215
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr "不获取包文件；而是打印协商的祖先提交"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:218 builtin/fetch.c:220
msgid "run 'maintenance --auto' after fetching"
msgstr "获取后执行 'maintenance --auto'"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:222 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "在所有更新分支上检查强制更新"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:224
msgid "write the commit-graph after fetching"
msgstr "抓取后写提交图"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:226
msgid "accept refspecs from stdin"
msgstr "从标准输入获取引用规格"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#: builtin/fetch.c:618
+msgid "couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:757
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr "配置变量 fetch.output 包含无效值 %s"
-
-#: builtin/fetch.c:856
+#: builtin/fetch.c:893
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:897
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
msgid "[rejected]"
msgstr "[已拒绝]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:911
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:912
+msgid "checked out in another worktree"
+msgstr "已在另一个工作树中检出"
+
+#: builtin/fetch.c:922
msgid "[tag update]"
msgstr "[标签更新]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
+#: builtin/fetch.c:994
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:927
msgid "would clobber existing tag"
msgstr "会破坏现有的标签"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:949
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:952
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:955
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:994
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:999
msgid "non-fast-forward"
msgstr "非快进"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1102
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'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"获取操作通常显示哪些分支发生了强制更新，但该检查已被禁用。\n"
+"获取操作通常显示哪些分支发生了强制更新，但该检查已被禁用；\n"
"要重新启用，请使用 '--show-forced-updates' 选项或运行\n"
-"'git config fetch.showForcedUpdates true'。"
+"'git config fetch.showForcedUpdates true'"
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1106
#, c-format
msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
-"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
+"花了 %.2f 秒来检查强制更新；您可以使用 '--no-show-forced-updates'\n"
+"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1136
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必需的对象\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1156
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆的根不允许被更新"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1259 builtin/fetch.c:1418
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1269
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14971,145 +15499,149 @@
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1377
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为悬空状态）"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1378
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为悬空状态）"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1421
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1422 builtin/remote.c:1153
msgid "(none)"
msgstr "（无）"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1446
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "拒绝获取到非纯仓库的当前分支 %s"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "拒绝获取于 '%2$s' 检出的分支 '%1$s'"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1466
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1469
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1496
+#, c-format
+msgid "the object %s does not exist"
+msgstr "对象 '%s' 不存在"
+
+#: builtin/fetch.c:1748
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "检测到多分支，和 --set-upstream 不兼容"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1760
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr "无法在不指向任何分支时将 HEAD 的上游从 '%s' 设置为 '%s'。"
+
+#: builtin/fetch.c:1773
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "没有为一个远程跟踪分支设置上游"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1775
msgid "not setting upstream for a remote tag"
msgstr "没有为一个远程标签设置上游"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1777
msgid "unknown branch type"
msgstr "未知的分支类型"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1779
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
-"未发现源分支。\n"
-"您需要使用 --set-upstream 选项指定一个分支。"
+"未发现源分支；\n"
+"您需要使用 --set-upstream 选项指定一个分支"
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1904 builtin/fetch.c:1967
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1914 builtin/fetch.c:1969
#, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1926
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "无法获取 '%s'（退出码：%d）\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:2030
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
-msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
+msgstr "未指定远程仓库；请指定一个用于获取新版本的 URL 或远程仓库名"
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "您需要指定一个标签名称。"
+#: builtin/fetch.c:2066
+msgid "you need to specify a tag name"
+msgstr "您需要指定一个标签名称"
-#: builtin/fetch.c:1994
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
-msgstr "--negotiate-only 需要一个或多个 --negotiate-tip=*"
+#: builtin/fetch.c:2156
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
+msgstr "--negotiate-only 需要一个或多个 --negotiation-tip=*"
-#: builtin/fetch.c:1998
-msgid "Negative depth in --deepen is not supported"
+#: builtin/fetch.c:2160
+msgid "negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
-#: builtin/fetch.c:2000
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen 和 --depth 是互斥的"
-
-#: builtin/fetch.c:2005
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth 和 --unshallow 不能同时使用"
-
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2169
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2186
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2188
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2197
#, c-format
-msgid "No such remote or remote group: %s"
+msgid "no such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
-#: builtin/fetch.c:2042
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2205
+msgid "fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2221
msgid "must supply remote when using --negotiate-only"
msgstr "在使用 --negotiate-only 时必须提供远程仓库"
-#: builtin/fetch.c:2063
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "协议不支持 --negotiate-only，退出。"
+#: builtin/fetch.c:2226
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "协议不支持 --negotiate-only，退出"
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2246
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2250
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic 仅在从一个远程仓库获取的时候可用"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2254
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin 仅在从一个远程仓库获取的时候可用"
@@ -15118,23 +15650,27 @@
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "参数 --log 的别名（已弃用）"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "文本"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "使用 <文本> 作为提交说明的开始"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "使用 <名称> 而不是真正的目标分支"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "从文件中读取"
@@ -15154,47 +15690,47 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "引用占位符适用于 shells"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "引用占位符适用于 perl"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "引用占位符适用于 python"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "引用占位符适用于 Tcl"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:42 builtin/tag.c:482
msgid "respect format colors"
msgstr "遵照格式中的颜色输出"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "只打印指向给定对象的引用"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "只打印已经合并的引用"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "只打印没有合并的引用"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "只打印包含该提交的引用"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "只打印不包含该提交的引用"
@@ -15330,133 +15866,255 @@
msgid "notice: No default references"
msgstr "注意：无默认引用"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s：哈希路径不匹配，发现于 %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s：对象损坏或丢失：%s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s：对象有未知的类型 '%s': %s"
+
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s：不能解析对象：%s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "坏的 sha1 文件：%s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "正在检查对象目录"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "正在检查对象目录"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "正在检查 %s 链接"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:710 builtin/index-pack.c:862
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s 指向奇怪的东西（%s）"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s：分离头指针的指向不存在"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "注意：%s 指向一个尚未诞生的分支（%s）"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "正在检查缓存树"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s：cache-tree 中无效的 sha1 指针"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "cache-tree 中非树对象"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "显示不可达的对象"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "显示悬空的对象"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "报告标签"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "报告根节点"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点（默认）"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "仅检查连通性"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr "启用更严格的检查"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "将悬空对象写入 .git/lost-found 中"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "显示进度"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "显示可达对象的详细名称"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "正在检查对象"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s：对象缺失"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "无效的参数：期望 sha1，得到 '%s'"
+#: builtin/fsmonitor--daemon.c:13
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [<选项>]"
+
+#: builtin/fsmonitor--daemon.c:14
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [<选项>]"
+
+#: builtin/fsmonitor--daemon.c:15
+msgid "git fsmonitor--daemon stop"
+msgstr "git fsmonitor--daemon stop"
+
+#: builtin/fsmonitor--daemon.c:16
+msgid "git fsmonitor--daemon status"
+msgstr "git fsmonitor--daemon status"
+
+#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "'%s' 的值超出范围：%d"
+
+#: builtin/fsmonitor--daemon.c:57
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "'%s' 的值不是 bool 或 int：%d"
+
+#: builtin/fsmonitor--daemon.c:99
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr "fsmonitor-daemon 正在监视 '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:104
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr "fsmonitor-daemon 不在监视 '%s'\n"
+
+#: builtin/fsmonitor--daemon.c:170
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "无法创建 fsmonitor cookie '%s'"
+
+#: builtin/fsmonitor--daemon.c:753
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr "fsmonitor: cookie_result '%d' != SEEN"
+
+#: builtin/fsmonitor--daemon.c:1187
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr "无法在 '%s' 启动 IPC 线程池"
+
+#: builtin/fsmonitor--daemon.c:1199
+msgid "could not start fsmonitor listener thread"
+msgstr "无法启动 fsmonitor 监听线程"
+
+#: builtin/fsmonitor--daemon.c:1297
+msgid "could not initialize listener thread"
+msgstr "无法初始化监听线程"
+
+#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr "fsmonitor--daemon 已经在运行 '%s'"
+
+#: builtin/fsmonitor--daemon.c:1332
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr "在 '%s' 中运行 fsmonitor-daemon\n"
+
+#: builtin/fsmonitor--daemon.c:1387
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "在 '%s' 中启动 fsmonitor-daemon\n"
+
+#: builtin/fsmonitor--daemon.c:1413
+msgid "daemon failed to start"
+msgstr "守护进程无法启动"
+
+#: builtin/fsmonitor--daemon.c:1416
+msgid "daemon not online yet"
+msgstr "守护进程尚未在线"
+
+#: builtin/fsmonitor--daemon.c:1419
+msgid "daemon terminated"
+msgstr "守护进程被终结"
+
+#: builtin/fsmonitor--daemon.c:1429
+msgid "detach from console"
+msgstr "从控制台分离"
+
+#: builtin/fsmonitor--daemon.c:1432
+msgid "use <n> ipc worker threads"
+msgstr "使用 <n> 个 IPC 工作线程"
+
+#: builtin/fsmonitor--daemon.c:1435
+msgid "max seconds to wait for background daemon startup"
+msgstr "等待守护进程启动的最大秒数"
+
+#: builtin/fsmonitor--daemon.c:1449
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "无效的 'ipc-threads' 值（%d）"
+
+#: builtin/fsmonitor--daemon.c:1464
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "未处理的子命令 '%s'"
+
+#: builtin/fsmonitor--daemon.c:1477
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr "fsmonitor--daemon 不支持本平台"
+
#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<选项>]"
@@ -15471,107 +16129,102 @@
msgid "failed to parse '%s' value '%s'"
msgstr "无法解析 '%s' 值 '%s'"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr "不能读取 '%s'"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
-"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
+"最后一次 gc 操作报告如下信息。请检查原因并删除 %s\n"
"在该文件被删除之前，自动清理将不会执行。\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "更彻底（增加运行时间）"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "除了最大的包之外，对所有其它包文件重新打包"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
-msgstr "解析 gc.logexpiry 的值 %s 失败"
+msgstr "无法解析 gc.logexpiry 的值 %s"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
-msgstr "解析清除期限值 %s 失败"
+msgstr "无法解析清除期限值 %s"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "--no-schedule 不被允许"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "无法识别的 --schedule 参数 '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "无法写入提交图"
-#: builtin/gc.c:905
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "无法预先获取远程仓库"
@@ -15583,145 +16236,185 @@
msgid "failed to finish 'git pack-objects' process"
msgstr "无法完成 'git pack-objects' 进程"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "无法写入多包索引"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "'git multi-pack-index expire' 失败"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "'git multi-pack-index repack' 失败"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "锁文件 '%s' 已存在，跳过维护"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "任务 '%s' 失败"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' 不是一个有效的任务"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "任务 '%s' 不能被多次选择"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "基于仓库状态来运行任务"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "频率"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "基于频率运行任务"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "不通过标准错误报告进度或其它信息"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
msgid "task"
msgstr "任务"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "运行一个特定的任务"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "无法运行 'git config'"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "无法扩展路径 '%s'"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "无法启动 launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "无法为 '%s' 创建目录"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "无法引导服务 %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "无法创建临时 XML 文件"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "无法启动计划任务"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "无法打开 'crontab' 的标准输入"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "'crontab' 终止"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "无法启动 systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "无法运行 systemctl"
+
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
+#: builtin/worktree.c:1024
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "无法删除 '%s'"
+
+#: builtin/gc.c:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "无法识别的 --scheduler 参数 '%s'"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "systemd 和 crontab 的定时器都不可用"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s 调度器不可用"
+
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr "另外一个进程正运行于后台维护"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<调度器>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "调度器"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "触发 git maintenance 执行的调度器"
+
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "无法将仓库添加到全局配置"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <子命令> [<选项>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "无效子命令：%s"
-#: builtin/grep.c:30
+#: builtin/grep.c:32
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:241
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep：无法创建线程：%s"
-#: builtin/grep.c:277
+#: builtin/grep.c:295
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
@@ -15730,262 +16423,254 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3150
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持，忽略 %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"
-#: builtin/grep.c:658
+#: builtin/grep.c:674
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:738
+#: builtin/grep.c:754
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:837
+#: builtin/grep.c:852
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:839
+#: builtin/grep.c:854
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
-#: builtin/grep.c:841
+#: builtin/grep.c:856
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:843
+#: builtin/grep.c:858
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:845
+#: builtin/grep.c:860
msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
-#: builtin/grep.c:848
+#: builtin/grep.c:863
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:850
+#: builtin/grep.c:865
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:852
+#: builtin/grep.c:867
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:854
+#: builtin/grep.c:869
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:856
+#: builtin/grep.c:871
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:859
+#: builtin/grep.c:874
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:861
+#: builtin/grep.c:876
msgid "search in subdirectories (default)"
msgstr "在子目录中寻找（默认）"
-#: builtin/grep.c:863
+#: builtin/grep.c:878
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:867
+#: builtin/grep.c:882
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:870
+#: builtin/grep.c:885
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/grep.c:873
+#: builtin/grep.c:888
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:876
+#: builtin/grep.c:891
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:879
+#: builtin/grep.c:894
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:880
+#: builtin/grep.c:895
msgid "show column number of first match"
msgstr "显示第一个匹配的列号"
-#: builtin/grep.c:881
+#: builtin/grep.c:896
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:882
+#: builtin/grep.c:897
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:884
+#: builtin/grep.c:899
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:886
+#: builtin/grep.c:901
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:888
+#: builtin/grep.c:903
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:891
+#: builtin/grep.c:906
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:893
+#: builtin/grep.c:908
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:896
+#: builtin/grep.c:911
msgid "show only matching parts of a line"
msgstr "只显示行中的匹配的部分"
-#: builtin/grep.c:898
+#: builtin/grep.c:913
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/grep.c:899
+#: builtin/grep.c:914
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:901
+#: builtin/grep.c:916
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:903
+#: builtin/grep.c:918
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:906
+#: builtin/grep.c:921
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:909
+#: builtin/grep.c:924
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:911
+#: builtin/grep.c:926
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:913
+#: builtin/grep.c:928
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:914
+#: builtin/grep.c:929
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:917
+#: builtin/grep.c:932
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:919
+#: builtin/grep.c:934
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:922
+#: builtin/grep.c:937
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:924
+#: builtin/grep.c:939
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:926
+#: builtin/grep.c:941
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:938
+#: builtin/grep.c:953
msgid "indicate hit with exit status without output"
msgstr "不输出，而用退出码标识命中状态"
-#: builtin/grep.c:940
+#: builtin/grep.c:955
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:947
+#: builtin/grep.c:962
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1028
msgid "no pattern given"
msgstr "未提供匹配模式"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1064
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同时使用"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1072
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本：%s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1102
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked 不支持和 --recurse-submodules 共用"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1106
msgid "invalid option combination, ignoring --threads"
msgstr "无效的选项组合，忽略 --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1109 builtin/pack-objects.c:4084
msgid "no threads support, ignoring --threads"
msgstr "没有线程支持，忽略 --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效（%d）"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1146
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:1157
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
-
-#: builtin/grep.c:1160
-msgid "--untracked cannot be used with --cached"
-msgstr "--untracked 不能与 --cached 同时使用"
-
-#: builtin/grep.c:1166
+#: builtin/grep.c:1179
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1187
msgid "both --cached and trees are given"
msgstr "同时给出了 --cached 和树对象"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -15993,95 +16678,99 @@
"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
"[--] <文件>..."
-#: builtin/hash-object.c:86
-msgid "git hash-object --stdin-paths"
-msgstr "git hash-object --stdin-paths"
-
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:97
msgid "object type"
msgstr "对象类型"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:98
msgid "write the object into the object database"
msgstr "将对象写入对象数据库"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
msgstr "从标准输入读取对象"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:102
msgid "store file as is without filters"
msgstr "原样存储文件不使用过滤器"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:103
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
msgstr "处理文件并假设其来自于此路径"
-#: builtin/help.c:47
+#: builtin/help.c:57
msgid "print all available commands"
msgstr "打印所有可用的命令"
-#: builtin/help.c:48
+#: builtin/help.c:60
+msgid "show external commands in --all"
+msgstr "在 --all 中显示外部命令"
+
+#: builtin/help.c:61
+msgid "show aliases in --all"
+msgstr "在 --all 中显示别名"
+
+#: builtin/help.c:62
msgid "exclude guides"
msgstr "排除向导"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "显示有用的指南列表"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "打印所有配置变量名称"
-
-#: builtin/help.c:52
+#: builtin/help.c:63
msgid "show man page"
msgstr "显示 man 手册"
-#: builtin/help.c:53
+#: builtin/help.c:64
msgid "show manual in web browser"
msgstr "在 web 浏览器中显示手册"
-#: builtin/help.c:55
+#: builtin/help.c:66
msgid "show info page"
msgstr "显示 info 手册"
-#: builtin/help.c:57
+#: builtin/help.c:68
msgid "print command description"
msgstr "打印命令描述"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
+#: builtin/help.c:70
+msgid "print list of useful guides"
+msgstr "显示有用的指南列表"
-#: builtin/help.c:163
+#: builtin/help.c:72
+msgid "print all configuration variable names"
+msgstr "打印所有配置变量名称"
+
+#: builtin/help.c:84
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>]"
+
+#: builtin/help.c:201
#, c-format
msgid "unrecognized help format '%s'"
msgstr "未能识别的帮助格式 '%s'"
-#: builtin/help.c:190
+#: builtin/help.c:227
msgid "Failed to start emacsclient."
msgstr "无法启动 emacsclient。"
-#: builtin/help.c:203
+#: builtin/help.c:240
msgid "Failed to parse emacsclient version."
msgstr "无法解析 emacsclient 版本。"
-#: builtin/help.c:211
+#: builtin/help.c:248
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老（< 22）。"
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
#, c-format
msgid "failed to exec '%s'"
-msgstr "执行 '%s' 失败"
+msgstr "无法执行 '%s'"
-#: builtin/help.c:307
+#: builtin/help.c:344
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16090,7 +16779,7 @@
"'%s'：不支持的 man 手册查看器的路径。\n"
"请使用 'man.<工具>.cmd'。"
-#: builtin/help.c:319
+#: builtin/help.c:356
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16099,234 +16788,243 @@
"'%s': 支持的 man 手册查看器命令。\n"
"请使用 'man.<工具>.path'。"
-#: builtin/help.c:436
+#: builtin/help.c:471
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s'：未知的 man 查看器。"
-#: builtin/help.c:452
+#: builtin/help.c:487
msgid "no man viewer handled the request"
msgstr "没有 man 查看器处理此请求"
-#: builtin/help.c:459
+#: builtin/help.c:494
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处理此请求"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:555 builtin/help.c:566 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' 是 '%s' 的别名"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:569 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "坏的 alias.%s 字符串：%s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:611
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "'%s' 选项不带任何非选项参数"
+
+#: builtin/help.c:631
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr "'--no-[external-commands|aliases]' 选项只能和 '--all' 一起使用"
+
+#: builtin/help.c:643 builtin/help.c:671
#, c-format
msgid "usage: %s%s"
msgstr "用法：%s%s"
-#: builtin/help.c:575
+#: builtin/help.c:666
msgid "'git help config' for more information"
msgstr "'git help config' 获取更多信息"
-#: builtin/index-pack.c:222
+#: builtin/hook.c:10
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr "git hook run [--ignore-missing] <钩子名称> [-- <钩子参数>]"
+
+#: builtin/hook.c:30
+msgid "silently ignore missing requested <hook-name>"
+msgstr "静默地忽略缺失的 <钩子名称>"
+
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "%s 的对象类型不匹配"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "未能获取预期的对象 %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "对象 %s：应为类型 %s，却是 %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "无法填充 %d 字节"
msgstr[1] "无法填充 %d 字节"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "过早的文件结束符（EOF）"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "输入上的读错误"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "用掉了超过可用的字节"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:754
msgid "pack too large for current definition of off_t"
msgstr "包太大超过了当前 off_t 的定义"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "包超过了最大允许值"
-
-#: builtin/index-pack.c:343
+#: builtin/index-pack.c:329
#, c-format
-msgid "unable to create '%s'"
-msgstr "不能创建 '%s'"
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "包超过了最大允许大小（%s）"
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "无法打开包文件 '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "包签名不匹配"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支持包版本 %<PRIu32>"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:380
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:485
#, c-format
msgid "inflate returned %d"
msgstr "解压缩返回 %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:534
msgid "offset value overflow for delta base object"
msgstr "偏移值覆盖了 delta 基准对象"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:542
msgid "delta base offset is out of bound"
msgstr "delta 基准偏移越界"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:550
#, c-format
msgid "unknown object type %d"
msgstr "未知对象类型 %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:581
msgid "cannot pread pack file"
msgstr "无法读取包文件"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:583
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "包文件过早结束，缺少 %<PRIuMAX> 字节"
msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:609
msgid "serious inflate inconsistency"
msgstr "解压缩严重的不一致"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
+#: builtin/index-pack.c:823 builtin/index-pack.c:832
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "发现 %s 出现 SHA1 冲突！"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
-#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
+#: builtin/index-pack.c:757 builtin/pack-objects.c:290
+#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
#, c-format
msgid "unable to read %s"
msgstr "不能读 %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:821
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能读取现存对象信息 %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:829
#, c-format
msgid "cannot read existing object %s"
msgstr "不能读取现存对象 %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:843
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数据对象 %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:846 builtin/index-pack.c:865
msgid "fsck error in packed object"
msgstr "对打包对象 fsck 检查出错"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:867
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:928 builtin/index-pack.c:975
msgid "failed to apply delta"
-msgstr "应用 delta 失败"
+msgstr "无法应用 delta"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突（SHA1 不匹配）"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "不能对包文件调用 fstat"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程：%s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "完成 %d 个本地对象"
msgstr[1] "完成 %d 个本地对象"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 个未解决的 delta"
msgstr[1] "包有 %d 个未解决的 delta"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象（%d）"
@@ -16336,56 +17034,53 @@
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1445
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "包文件名 '%s' 没有以 '.%s' 结尾"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "无法写入 %s 文件 '%s'"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "无法关闭已写入的 %s 文件 '%s'"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1494
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "不能重命名临时文件 '*.%s' 为 '%s'"
+
+#: builtin/index-pack.c:1519
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "无法存储包文件"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "无法存储索引文件"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1648
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1698
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta：%d 个对象"
msgstr[1] "非 delta：%d 个对象"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1705
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -16397,33 +17092,25 @@
msgstr "无法返回当前工作目录"
#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "未知的哈希算法 '%s'"
-#: builtin/index-pack.c:1850
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin 不能和 --stdin 同时使用"
-
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1856
msgid "--stdin requires a git repository"
msgstr "--stdin 需要 git 仓库"
-#: builtin/index-pack.c:1854
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format 不能和 --stdin 同时使用"
-
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1873
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "在打包对象中 fsck 检查出错"
@@ -16544,10 +17231,6 @@
msgid "specify the hash algorithm to use"
msgstr "指定要使用的哈希算法"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir 和 --bare 是互斥的"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
@@ -16634,547 +17317,543 @@
msgid "no input file given for in-place editing"
msgstr "没有给出要原位编辑的文件"
-#: builtin/log.c:59
+#: builtin/log.c:60
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
-#: builtin/log.c:60
+#: builtin/log.c:61
msgid "git show [<options>] <object>..."
msgstr "git show [<选项>] <对象>..."
-#: builtin/log.c:113
+#: builtin/log.c:114
#, c-format
msgid "invalid --decorate option: %s"
msgstr "无效的 --decorate 选项：%s"
-#: builtin/log.c:180
+#: builtin/log.c:181
msgid "show source"
msgstr "显示源"
-#: builtin/log.c:181
+#: builtin/log.c:182
msgid "use mail map file"
msgstr "使用邮件映射文件"
-#: builtin/log.c:184
+#: builtin/log.c:185
msgid "only decorate refs that match <pattern>"
msgstr "只修饰与 <模式> 匹配的引用"
-#: builtin/log.c:186
+#: builtin/log.c:187
msgid "do not decorate refs that match <pattern>"
msgstr "不修饰和 <模式> 匹配的引用"
-#: builtin/log.c:187
+#: builtin/log.c:188
msgid "decorate options"
msgstr "修饰选项"
-#: builtin/log.c:190
+#: builtin/log.c:191
msgid ""
"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变"
-#: builtin/log.c:213
+#: builtin/log.c:214
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<范围>:<文件> 不能和路径表达式共用"
-#: builtin/log.c:306
+#: builtin/log.c:322
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出：%d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:429
+msgid "unable to create temporary object directory"
+msgstr "无法创建临时对象目录"
+
+#: builtin/log.c:599
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:614 builtin/log.c:706
#, c-format
msgid "could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:701
+#: builtin/log.c:731
#, c-format
msgid "unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:846
+#: builtin/log.c:880
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s：从描述生成附函的模式无效"
-#: builtin/log.c:853
+#: builtin/log.c:887
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:982
+#: builtin/log.c:1016
#, c-format
msgid "cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:999
+#: builtin/log.c:1033
msgid "need exactly one range"
msgstr "只需要一个范围"
-#: builtin/log.c:1009
+#: builtin/log.c:1043
msgid "not a range"
msgstr "不是一个范围"
-#: builtin/log.c:1173
+#: builtin/log.c:1207
msgid "cover letter needs email format"
msgstr "附函需要邮件地址格式"
-#: builtin/log.c:1179
+#: builtin/log.c:1213
msgid "failed to create cover-letter file"
msgstr "无法创建附函文件"
-#: builtin/log.c:1266
+#: builtin/log.c:1300
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1293
+#: builtin/log.c:1327
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1385
msgid "two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
#, c-format
msgid "unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1547 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:1522
+#: builtin/log.c:1556
msgid "could not find exact merge base"
msgstr "不能找到准确的合并基线"
-#: builtin/log.c:1532
+#: builtin/log.c:1566
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-"无法得到上游地址，如果你想自动记录基线提交，请使用命令\n"
-"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
+"无法得到上游地址，如果您想自动记录基线提交，请使用命令\n"
+"git branch --set-upstream-to 来跟踪一个远程分支。或者您可以通过\n"
"参数 --base=<基线提交> 手动指定一个基线提交"
-#: builtin/log.c:1555
+#: builtin/log.c:1589
msgid "failed to find exact merge base"
msgstr "无法找到准确的合并基线"
-#: builtin/log.c:1572
+#: builtin/log.c:1606
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
-#: builtin/log.c:1582
+#: builtin/log.c:1616
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
-#: builtin/log.c:1640
+#: builtin/log.c:1674
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
-#: builtin/log.c:1703
+#: builtin/log.c:1737
msgid "failed to infer range-diff origin of current series"
msgstr "无法推断当前系列的 range-diff 起始"
-#: builtin/log.c:1705
+#: builtin/log.c:1739
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "使用 '%s' 作为当前系列的 range-diff 源"
-#: builtin/log.c:1749
+#: builtin/log.c:1783
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1752
+#: builtin/log.c:1786
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1756
+#: builtin/log.c:1790
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1758
+#: builtin/log.c:1792
msgid "generate a cover letter"
msgstr "生成一封附函"
-#: builtin/log.c:1760
+#: builtin/log.c:1794
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1761
+#: builtin/log.c:1795
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1762
+#: builtin/log.c:1796
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1764
+#: builtin/log.c:1798
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1765
+#: builtin/log.c:1799
msgid "reroll-count"
msgstr "重制-计数"
-#: builtin/log.c:1766
+#: builtin/log.c:1800
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1768
+#: builtin/log.c:1802
msgid "max length of output filename"
msgstr "输出文件名的最大长度"
-#: builtin/log.c:1770
+#: builtin/log.c:1804
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1773
+#: builtin/log.c:1807
msgid "cover-from-description-mode"
msgstr "从分支描述获取附函的模式"
-#: builtin/log.c:1774
+#: builtin/log.c:1808
msgid "generate parts of a cover letter based on a branch's description"
msgstr "基于一个分支描述生成部分附函"
-#: builtin/log.c:1776
+#: builtin/log.c:1810
msgid "use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1779
+#: builtin/log.c:1813
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1782
+#: builtin/log.c:1816
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1785
+#: builtin/log.c:1819
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1787
+#: builtin/log.c:1821
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
-#: builtin/log.c:1789
+#: builtin/log.c:1823
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1791
+#: builtin/log.c:1825
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1793
+#: builtin/log.c:1827
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1794
+#: builtin/log.c:1828
msgid "header"
msgstr "header"
-#: builtin/log.c:1795
+#: builtin/log.c:1829
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1830 builtin/log.c:1831
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1796
+#: builtin/log.c:1830
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1797
+#: builtin/log.c:1831
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1798
+#: builtin/log.c:1832
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1799
+#: builtin/log.c:1833
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
-#: builtin/log.c:1801
+#: builtin/log.c:1835
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1802
+#: builtin/log.c:1836
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1837 builtin/log.c:1840
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1804
+#: builtin/log.c:1838
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1807
+#: builtin/log.c:1841
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1811
+#: builtin/log.c:1845
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1813
+#: builtin/log.c:1847
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1814
+#: builtin/log.c:1848
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1815
+#: builtin/log.c:1849
msgid "base-commit"
msgstr "基线提交"
-#: builtin/log.c:1816
+#: builtin/log.c:1850
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
-#: builtin/log.c:1819
+#: builtin/log.c:1853
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1820
+#: builtin/log.c:1854
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1822
+#: builtin/log.c:1856
msgid "show progress while generating patches"
msgstr "在生成补丁时显示进度"
-#: builtin/log.c:1824
+#: builtin/log.c:1858
msgid "show changes against <rev> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <版本> 的差异"
-#: builtin/log.c:1827
+#: builtin/log.c:1861
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <引用规格> 的差异"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1863 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "创建权重的百分比"
-#: builtin/log.c:1916
+#: builtin/log.c:1953
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n 和 -k 互斥"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc 和 -k 互斥"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1978
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1943
+#: builtin/log.c:1980
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1945
+#: builtin/log.c:1982
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout、--output 和 --output-directory 是互斥的"
+#: builtin/log.c:1984
+msgid "--remerge-diff does not make sense"
+msgstr "--remerge-diff 无意义"
-#: builtin/log.c:2089
+#: builtin/log.c:2129
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:2093
+#: builtin/log.c:2133
msgid "Interdiff:"
msgstr "版本间差异："
-#: builtin/log.c:2094
+#: builtin/log.c:2134
#, c-format
msgid "Interdiff against v%d:"
msgstr "对 v%d 的版本差异："
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor 需要 --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2144
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:2112
+#: builtin/log.c:2152
msgid "Range-diff:"
msgstr "范围差异："
-#: builtin/log.c:2113
+#: builtin/log.c:2153
#, c-format
msgid "Range-diff against v%d:"
msgstr "对 v%d 的范围差异："
-#: builtin/log.c:2124
+#: builtin/log.c:2164
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:2160
+#: builtin/log.c:2200
msgid "Generating patches"
msgstr "生成补丁"
-#: builtin/log.c:2204
+#: builtin/log.c:2244
msgid "failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:2263
+#: builtin/log.c:2304
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2358
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "用 NUL 字符分隔路径"
+
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "使用小写字母表示 'fsmonitor clean' 文件"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "显示文件换行符格式"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "跳过和模式匹配的文件"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "从 <文件> 中读取排除模式"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "从 <文件> 读取排除模式"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:666
-msgid "recurse through submodules"
-msgstr "在子模组中递归"
-
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "树对象"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "显示调试数据"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "抑制重复条目"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "在稀疏索引存在时显示稀疏目录"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<仓库> [<引用>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<仓库> [<引用>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "不打印远程 URL"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
msgid "exec"
msgstr "exec"
@@ -17206,42 +17885,70 @@
msgid "show underlying ref in addition to the object pointed by it"
msgstr "除了显示指向的对象外，显示指向的引用名"
-#: builtin/ls-tree.c:30
+#: builtin/ls-tree.c:36
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:54
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "无法获得关于 '%s' 的对象信息"
+
+#: builtin/ls-tree.c:79
+#, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "坏的 ls-tree 格式：元素 '%s' 没有以 '(' 开头"
+
+#: builtin/ls-tree.c:83
+#, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "坏的 ls-tree 格式：元素 '%s' 没有以 ')' 结尾"
+
+#: builtin/ls-tree.c:109
+#, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr "坏的 ls-tree 格式: %%%.*s"
+
+#: builtin/ls-tree.c:336
msgid "only show trees"
msgstr "只显示树"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:338
msgid "recurse into subtrees"
msgstr "递归到子树"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:340
msgid "show trees when recursing"
msgstr "当递归时显示树"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:343
msgid "terminate entries with NUL byte"
msgstr "条目以 NUL 字符终止"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:344
msgid "include object size"
msgstr "包括对象大小"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
msgid "list only filenames"
msgstr "只列出文件名"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:350
+msgid "list only objects"
+msgstr "只列出对象"
+
+#: builtin/ls-tree.c:353
msgid "use full path names"
msgstr "使用文件的全路径"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:355
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"
+#: builtin/ls-tree.c:391
+msgid "--format can't be combined with other format-altering options"
+msgstr "--format 不能和改变格式的选项同时使用"
+
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
@@ -17291,7 +17998,11 @@
msgid "use headers in message's body"
msgstr "在消息正文中使用标头"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:227
+msgid "reading patches from stdin/tty..."
+msgstr "从标准输入或tty读取补丁……"
+
+#: builtin/mailsplit.c:242
#, c-format
msgid "empty mbox: '%s'"
msgstr "空的 mbox：'%s'"
@@ -17316,23 +18027,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <引用> [<提交>]"
-#: builtin/merge-base.c:143
+#: builtin/merge-base.c:144
msgid "output all common ancestors"
msgstr "输出所有共同的祖先"
-#: builtin/merge-base.c:145
+#: builtin/merge-base.c:146
msgid "find ancestors for a single n-way merge"
msgstr "查找一个多路合并的祖先提交"
-#: builtin/merge-base.c:147
+#: builtin/merge-base.c:148
msgid "list revs not reachable from others"
msgstr "显示不能被其他访问到的版本"
-#: builtin/merge-base.c:149
+#: builtin/merge-base.c:150
msgid "is the first one ancestor of the other?"
msgstr "第一个是其他的祖先提交么？"
-#: builtin/merge-base.c:151
+#: builtin/merge-base.c:152
msgid "find where <commit> forked from reflog of <ref>"
msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点"
@@ -17353,26 +18064,30 @@
msgstr "使用基于 diff3 的合并"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "使用基于狂热 diff3（zealous diff3）的合并"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "如果冲突，使用我们的版本"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "如果冲突，使用他们的版本"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "如果冲突，使用联合版本"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "如果冲突，使用指定长度的标记"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "不要警告冲突"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "为 文件1/初始文件/文件2 设置标签"
@@ -17407,182 +18122,186 @@
msgid "Merging %s with %s\n"
msgstr "合并 %s 和 %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<选项>] [<提交>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
-#: builtin/merge.c:146
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "选项 `%s' 需要一个值"
-#: builtin/merge.c:199
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有："
-#: builtin/merge.c:205
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "（和 --stat 同义）"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功，执行一次提交（默认）"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
-#: builtin/merge.c:271
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "允许快进（默认）"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1145 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合并的提交说明（针对非快进式合并）"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "使用 <名称> 而不是真正的目标"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
#
-#: builtin/merge.c:292
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort，但是保留索引和工作区"
-#: builtin/merge.c:294
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
-#: builtin/merge.c:303
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
-#: builtin/merge.c:320
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "不能运行贮藏。"
-#: builtin/merge.c:325
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "贮藏失败"
-#: builtin/merge.c:330
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象：%s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "读取树失败"
-#: builtin/merge.c:400
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "已经是最新的。（无可挤压）"
-#: builtin/merge.c:414
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "挤压提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-#: builtin/merge.c:729
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "未处理两个头合并之外的任何操作。"
-#: builtin/merge.c:742
+#: builtin/merge.c:745
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive 的未知选项：-X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "未知的策略选项：-X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"
-#: builtin/merge.c:822
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:831
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"
@@ -17592,83 +18311,83 @@
"合并到主题分支。\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "空的提交说明会终止提交。\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:900
msgid "Empty commit message."
msgstr "空提交信息。"
-#: builtin/merge.c:904
+#: builtin/merge.c:915
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:976
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1015
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:1006
+#: builtin/merge.c:1017
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
-#: builtin/merge.c:1008
+#: builtin/merge.c:1019
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:1013
+#: builtin/merge.c:1024
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1081
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1183
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并：%s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1217
msgid "not something we can merge"
msgstr "不能合并"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1330
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1334
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1352
msgid "--quit expects no arguments"
msgstr "--quit 不带参数"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1365
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1369
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1372
+#: builtin/merge.c:1385
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17676,7 +18395,7 @@
"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1379
+#: builtin/merge.c:1392
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17684,96 +18403,80 @@
"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1382
+#: builtin/merge.c:1395
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1396
-msgid "You cannot combine --squash with --no-ff."
-msgstr "您不能将 --squash 和 --no-ff 组合使用。"
-
-#: builtin/merge.c:1398
-msgid "You cannot combine --squash with --commit."
-msgstr "您不能将 --squash 和 --commit 组合使用。"
-
-#: builtin/merge.c:1414
+#: builtin/merge.c:1427
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1431
+#: builtin/merge.c:1444
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1446
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1451
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1453
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1540
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1559
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1606
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1613
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "无法快进，终止。"
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1671 builtin/merge.c:1737
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1675
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1727
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1729
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1739
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "使用 %s 策略以准备手工解决。\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1753
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr "git mktag"
-
#: builtin/mktag.c:27
#, c-format
msgid "warning: tag input does not pass fsck: %s"
@@ -17811,10 +18514,6 @@
msgid "unable to write tag file"
msgstr "无法写标签文件"
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
-
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "输入以 NUL 字符终止"
@@ -17828,44 +18527,55 @@
msgstr "允许创建一个以上的树"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<选项>] write [--preferred-pack=<包>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<选项>] write [--preferred-pack=<包>][--refs-snapshot=<"
+"路径>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<选项>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<选项>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<选项>] repack [--batch-size=<尺寸>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "包含成对包文件和包索引的对象目录"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "首选包"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "在计算多包位图时打包以供重用"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "写入多包位图"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "写入只包括给定索引的多包索引"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "用于选择位图提交的引用快照"
+
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "未识别的子命令：%s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<选项>] <源>... <目标>"
@@ -17892,117 +18602,121 @@
msgid "skip move/rename errors"
msgstr "跳过移动/重命名错误"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "目标 '%s' 不是一个目录"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "检查 '%s' 到 '%s' 的重命名\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "坏的源"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "不能将目录移动到自身"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "不能将目录移动到文件"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "源目录为空"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "不在版本控制之下"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "冲突"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "目标已存在"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "覆盖 '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "不能覆盖"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "同一目标具有多个源"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "目标目录不存在"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s，源=%s，目标=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:524
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <提交>..."
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:525
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<选项>] --stdin"
+#: builtin/name-rev.c:526
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [<选项>] --annotate-stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:583
msgid "print only ref-based names (no object names)"
msgstr "只打印基于引用的名称（非对象名）"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:584
msgid "only use tags to name the commits"
msgstr "只使用标签来命名提交"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:586
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:588
msgid "ignore refs matching <pattern>"
msgstr "忽略和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:590
msgid "list all commits reachable from all refs"
msgstr "列出可以从所有引用访问的提交"
-#: builtin/name-rev.c:532
-msgid "read from stdin"
-msgstr "从标准输入读取"
+#: builtin/name-rev.c:591
+msgid "deprecated: use annotate-stdin instead"
+msgstr "已弃用：取而代之使用 annotate-stdin"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:592
+msgid "annotate text from stdin"
+msgstr "标注标准输入的文字"
+
+#: builtin/name-rev.c:593
msgid "allow to print `undefined` names (default)"
msgstr "允许打印 `未定义` 的名称（默认）"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:599
msgid "dereference tags in the input (internal use)"
msgstr "反向解析输入中的标签（内部使用）"
@@ -18043,14 +18757,6 @@
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
-
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
@@ -18111,159 +18817,148 @@
msgid "git notes prune [<options>]"
msgstr "git notes prune [<选项>]"
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "为下面的对象写/编辑说明："
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "不能为对象 '%s' 开始 'show'"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "不能读取 'show' 的输出"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "无法为对象 '%s' 完成 'show'"
-#: builtin/notes.c:197
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr "请通过 -m 或 -F 选项为注解提供内容"
-#: builtin/notes.c:206
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "不能写注解对象"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:582
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
-msgstr "读取对象 '%s' 失败。"
+msgstr "无法读取对象 '%s'。"
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "不能从非数据对象 '%s' 中读取注解数据。"
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "格式错误的输入行：'%s'。"
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
-msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
+msgstr "无法把注解从 '%s' 拷贝到 '%s'"
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
-msgid "too many arguments"
-msgstr "太多参数"
-
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "未发现对象 %s 的注解。"
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "注解内容作为一个字符串"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "注解内容到一个文件中"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "重用和编辑指定的注解对象"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "重用指定的注解对象"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "允许保存空白注释"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "替换已存在的注解"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "从标准输入读取对象"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "参数太少"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "源对象 %s 缺少注解。不能拷贝。"
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18272,97 +18967,97 @@
"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
"请换用 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
-msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
+msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "无法删除引用 NOTES_MERGE_REF"
#: builtin/notes.c:700
-msgid "failed to delete ref NOTES_MERGE_REF"
-msgstr "删除引用 NOTES_MERGE_REF 失败"
-
-#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
-msgstr "删除 'git notes merge' 工作区失败"
+msgstr "无法删除 'git notes merge' 工作区"
+
+#: builtin/notes.c:720
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
#: builtin/notes.c:722
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
-msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
-
-#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
-msgstr "解析 NOTES_MERGE_REF 失败"
+msgstr "无法解析 NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "无法完成注解合并"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "未知的注解合并策略 %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "通用选项"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "合并选项"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "提交未合并的注解"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "通过提交未合并的注解来完成注解合并"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "中止注解合并的方案"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "中止注解合并"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "不能混用 --commit、--abort 或 -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "必须指定一个注解引用来合并"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "未知的 -s/--strategy：%s"
-#: builtin/notes.c:873
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
-#: builtin/notes.c:876
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "无法存储链接到当前的注解引用（%s）"
-#: builtin/notes.c:878
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18372,41 +19067,41 @@
"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:595
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/notes.c:900
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "尝试删除不存在的注解不是一个错误"
-#: builtin/notes.c:915
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "从标准输入读取对象名称"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "不删除，只显示"
-#: builtin/notes.c:955
+#: builtin/notes.c:957
msgid "report pruned notes"
msgstr "报告清除的注解"
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "注解引用"
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1036 builtin/stash.c:1802
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令：%s"
@@ -18421,7 +19116,7 @@
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:570
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18429,106 +19124,110 @@
msgstr ""
"write_reuse_object：无法定位 %1$s，预期在包 %3$s 中的偏移量 %2$<PRIuMAX> 上"
-#: builtin/pack-objects.c:580
+#: builtin/pack-objects.c:578
#, c-format
msgid "bad packed object CRC for %s"
msgstr "%s 错的包对象 CRC"
-#: builtin/pack-objects.c:591
+#: builtin/pack-objects.c:589
#, c-format
msgid "corrupt packed object for %s"
msgstr "%s 损坏的包对象"
-#: builtin/pack-objects.c:722
+#: builtin/pack-objects.c:720
#, c-format
msgid "recursive delta detected for object %s"
msgstr "发现对象 %s 递归 delta"
-#: builtin/pack-objects.c:941
+#: builtin/pack-objects.c:939
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "排序了 %u 个对象，预期 %<PRIu32> 个"
-#: builtin/pack-objects.c:1036
+#: builtin/pack-objects.c:1034
#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "预期对象在包文件 %2$s 的偏移量 %1$<PRIuMAX> 上"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1158
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1171
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1243 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
-msgstr "对 %s 调用 stat 失败"
+msgstr "无法对 %s 调用 stat"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1276
+msgid "failed to write bitmap index"
+msgstr "无法写入位图索引"
+
+#: builtin/pack-objects.c:1302
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1544
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1992
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 压缩中 delta 基准偏移越界"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:2001
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基准偏移越界"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2282
msgid "Counting objects"
msgstr "对象计数中"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2447
#, c-format
msgid "unable to parse object header of %s"
msgstr "无法解析对象 %s 头信息"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
+#: builtin/pack-objects.c:2543
#, c-format
msgid "object %s cannot be read"
msgstr "对象 %s 无法读取"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2557
msgid "suboptimal pack - out of memory"
msgstr "次优（suboptimal）打包 - 内存不足"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2872
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 个线程进行压缩"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3011
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "无法为标签 %s 压缩对象"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3097
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3103
msgid "inconsistency with delta count"
msgstr "不一致的差异计数"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3182
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18537,23 +19236,24 @@
"uploadpack.blobpackfileuri 的取值必须是 '<object-hash> <pack-hash> <uri>' 格"
"式（得到 '%s'）"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3185
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置（得到 '%s'）"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3220
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "无法获得包 %2$s 中对象 %1$s 的类型"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
+#: builtin/pack-objects.c:3373
#, c-format
msgid "could not find pack '%s'"
msgstr "不能找到包 '%s'"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3416
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18562,7 +19262,7 @@
"预期边界对象（edge object）ID，却得到垃圾数据：\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3422
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -18571,246 +19271,238 @@
"预期对象 ID，却得到垃圾数据：\n"
" %s"
-#: builtin/pack-objects.c:3482
-msgid "invalid value for --missing"
-msgstr "选项 --missing 的值无效"
-
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
msgid "cannot open pack index"
msgstr "无法打开包文件索引"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3549
#, c-format
msgid "loose object at %s could not be examined"
msgstr "无法检查 %s 处的松散对象"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3635
msgid "unable to force loose object"
msgstr "无法强制松散对象"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3763
#, c-format
msgid "not a rev '%s'"
msgstr "不是一个版本 '%s'"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "坏的版本 '%s'"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3794
msgid "unable to add recent objects"
msgstr "无法添加最近的对象"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3847
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3851
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3907
msgid "<version>[,<offset>]"
msgstr "<版本>[,<偏移>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3908
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3911
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3913
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3915
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3917
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3919
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3921
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3923
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3925
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3927
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3929
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3931
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3933
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3935
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3938
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3941
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3944
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3947
msgid "read packs from stdin"
msgstr "从标准输入读取包"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3949
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3951
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3953
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3955
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3957
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3960
msgid "use the sparse reachability algorithm"
msgstr "使用稀疏可达性算法"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3962
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3964
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3966
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3968
msgid "ignore this pack"
msgstr "忽略该 pack"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3970
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3972
msgid "do not hide commits by grafts"
msgstr "显示被移植隐藏的提交"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3974
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3976
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3980
msgid "write a bitmap index if possible"
msgstr "如果可能，写 bitmap 索引"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3984
msgid "handling for missing objects"
msgstr "处理丢失的对象"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3987
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor 包文件中的对象"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3989
msgid "respect islands during delta compression"
msgstr "在增量压缩时参考数据岛"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3991
msgid "protocol"
msgstr "协议"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3992
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4027
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量链深度 %d 太深了，强制为 %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4032
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4088
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4090
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包文件大小是 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4095
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用于创建一个可索引包"
#: builtin/pack-objects.c:4104
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
-
-#: builtin/pack-objects.c:4110
msgid "cannot use --filter without --stdout"
msgstr "不能在没有 --stdout 的情况下使用 --filter"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4106
msgid "cannot use --filter with --stdin-packs"
msgstr "不能同时使用 --filter 和 --stdin-packs"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4110
msgid "cannot use internal rev list with --stdin-packs"
msgstr "不能同时使用内部版本列表和 --stdin-packs"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4169
msgid "Enumerating objects"
msgstr "枚举对象中"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4210
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18844,94 +19536,84 @@
msgid "prune loose refs (default)"
msgstr "清除松散的引用（默认）"
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
msgstr "报告清除的对象"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "使早于给定时间的对象过期"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr "限制遍历 promisor 包以外的对象"
-#: builtin/prune.c:152
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
msgstr "不能在珍品仓库中执行清理操作"
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "%s 的值无效：%s"
-
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "控制子模组的递归获取"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "和合并相关的选项"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允许快进式"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用"
+
+#: builtin/pull.c:171 parse-options.h:371
msgid "automatically stash/stash pop before and after"
msgstr "在操作前后执行自动贮藏和弹出贮藏"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "和获取相关的参数"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "并发拉取的子模组的数量"
-#: builtin/pull.c:317
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "pull.ff 的取值无效：%s"
-
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -18941,41 +19623,42 @@
"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:978
msgid "You are not currently on a branch."
msgstr "您当前不在一个分支上。"
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您要变基到哪一个分支。"
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "请指定您要合并哪一个分支。"
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "详见 git-pull(1)。"
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:984
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:374
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:976
msgid "There is no tracking information for the current branch."
msgstr "当前分支没有跟踪信息。"
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -18984,22 +19667,22 @@
"您的配置中指定要合并远程的引用 '%s'，\n"
"但是没有获取到这个引用。"
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "无法访问提交 %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/pull.c:930
+#: builtin/pull.c:969
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
@@ -19009,10 +19692,10 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"不建议在没有为偏离分支指定合并策略时执行 pull 操作。 您可以在执行下一次\n"
+"您有偏离的分支，需要指定如何调和它们。您可以在执行下一次\n"
"pull 操作之前执行下面一条命令来抑制本消息：\n"
"\n"
-" git config pull.rebase false # 合并（缺省策略）\n"
+" git config pull.rebase false # 合并\n"
" git config pull.rebase true # 变基\n"
" git config pull.ff only # 仅快进\n"
"\n"
@@ -19020,19 +19703,19 @@
"缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n"
"或者 --ff-only 参数覆盖缺省设置。\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1047
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支，变更添加至索引。"
-#: builtin/pull.c:994
+#: builtin/pull.c:1051
msgid "pull with rebase"
msgstr "变基式拉取"
-#: builtin/pull.c:995
+#: builtin/pull.c:1052
msgid "please commit or stash them."
msgstr "请提交或贮藏它们。"
-#: builtin/pull.c:1020
+#: builtin/pull.c:1077
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19042,7 +19725,7 @@
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
-#: builtin/pull.c:1026
+#: builtin/pull.c:1083
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19059,15 +19742,23 @@
"$ git reset --hard\n"
"恢复之前的状态。"
-#: builtin/pull.c:1041
+#: builtin/pull.c:1098
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
-#: builtin/pull.c:1045
+#: builtin/pull.c:1103
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
-#: builtin/pull.c:1065
+#: builtin/pull.c:1105
+msgid "Cannot fast-forward to multiple branches."
+msgstr "无法快进到多个分支。"
+
+#: builtin/pull.c:1120
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "需要指定如何调和偏离的分支。"
+
+#: builtin/pull.c:1134
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本地子模组中有修改，无法变基"
@@ -19228,17 +19919,17 @@
#: builtin/push.c:362
#, c-format
msgid "failed to push some refs to '%s'"
-msgstr "推送一些引用到 '%s' 失败"
+msgstr "无法推送一些引用到 '%s'"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3377
msgid "repository"
msgstr "仓库"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "镜像所有引用"
@@ -19250,19 +19941,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送标签（不能使用 --all or --mirror）"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "强制更新"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<引用名>:<期望值>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "要求引用旧的取值为设定值"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "要求远程更新在本地被整合"
@@ -19270,12 +19961,12 @@
msgid "control recursive pushing of submodules"
msgstr "控制子模组的递归推送"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "使用精简打包"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "接收包程序"
@@ -19295,18 +19986,14 @@
msgid "push missing but relevant tags"
msgstr "推送缺失但有关的标签"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "用 GPG 为推送签名"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "需要远端支持原子事务"
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
-
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"
@@ -19337,26 +20024,14 @@
"\n"
" git push <名称>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all 和 --tags 不兼容"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用规格同时使用"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror 和 --tags 不兼容"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用规格同时使用"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all 和 --mirror 不兼容"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "推送选项不能有换行符"
@@ -19409,86 +20084,86 @@
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
-"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
+"u | -i]] [--no-sparse-checkout] [--index-output=<文件>] (--empty | <树对象一"
+"> [<树对象二> [<树对象三>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "将索引结果写入 <文件>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "只是清空索引"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "合并"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "读取之余再执行一个合并"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "如果没有文件级合并需要，执行三方合并"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "存在添加和删除时，也执行三方合并"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "类似于 -m，但丢弃未合并的条目"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<子目录>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "读取树对象到索引的 <子目录>/ 下"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "用合并的结果更新工作区"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "允许忽略文件中设定的文件可以被覆盖"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "合并后不检查工作区"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "不更新索引区和工作区"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "跳过应用稀疏检出过滤器"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "抑制反馈信息"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:190
msgid "You need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/rebase.c:35
+#: builtin/rebase.c:36
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -19496,203 +20171,50 @@
"git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<"
"上游> [<分支>]]"
-#: builtin/rebase.c:37
+#: builtin/rebase.c:38
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
-#: builtin/rebase.c:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "不可用的待办列表：'%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:231
#, c-format
msgid "could not create temporary %s"
msgstr "无法创建临时的 %s"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:237
msgid "could not mark as interactive"
msgstr "无法标记为交互式"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:290
msgid "could not generate todo list"
msgstr "无法生成待办列表"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:332
msgid "a base commit must be provided with --upstream or --onto"
msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<选项>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "保留初始为空的提交"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "允许提交说明为空"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "对合并提交变基"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "保持兄弟提交的原始分支点"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "移动以 squash!/fixup! 开头的提交"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "签名提交"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "显示上游变化的差异统计"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "继续变基"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "跳过提交"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "变基待办列表"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "显示当前补丁"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "缩短待办列表中的提交号"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "扩展待办列表中的提交号"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "检查待办列表"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "重新排列 fixup/squash 行"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "在待办列表中插入 exec 执行命令"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "onto"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "限制版本"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash onto"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "上游提交"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "head 名称"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "变基策略"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "策略选项"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "切换到"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "要检出的分支或提交"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "onto name"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "要执行的命令"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "自动重新安排任何失败的 `exec`"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:391
#, c-format
msgid "%s requires the merge backend"
msgstr "%s 需要合并后端"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:433
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "无法获取 'onto'：'%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:450
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "无效的原始 head：'%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:475
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略无效的 allow_rerere_autoupdate：'%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:600
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19705,7 +20227,7 @@
"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
-#: builtin/rebase.c:896
+#: builtin/rebase.c:685
#, c-format
msgid ""
"\n"
@@ -19723,14 +20245,19 @@
"\n"
"因此 git 无法对其变基。"
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:836
+#, c-format
+msgid "could not switch to %s"
+msgstr "无法切换到 %s"
+
+#: builtin/rebase.c:952
#, c-format
msgid ""
-"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
-"\"."
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
+"\"ask\"."
msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:970
#, c-format
msgid ""
"%s\n"
@@ -19747,7 +20274,7 @@
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:986
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -19760,180 +20287,179 @@
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:1016
msgid "exec commands cannot contain newlines"
msgstr "exec 命令不能包含换行符"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:1020
msgid "empty exec command"
msgstr "空的 exec 命令"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1051
msgid "rebase onto given branch instead of upstream"
msgstr "变基到给定的分支而非上游"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1053
msgid "use the merge-base of upstream and branch as the current base"
msgstr "使用上游和分支的合并基线做为当前基线"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1055
msgid "allow pre-rebase hook to run"
msgstr "允许执行 pre-rebase 钩子"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1057
msgid "be quiet. implies --no-stat"
msgstr "安静。暗示 --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1060
+msgid "display a diffstat of what changed upstream"
+msgstr "显示上游变化的差异统计"
+
+#: builtin/rebase.c:1063
msgid "do not show diffstat of what changed upstream"
msgstr "不显示上游变化的差异统计"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1066
msgid "add a Signed-off-by trailer to each commit"
msgstr "为每一个提交添加 Signed-off-by 尾注"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1069
msgid "make committer date match author date"
msgstr "使提交者日期和作者日期一致"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1071
msgid "ignore author date and use current date"
msgstr "忽略作者日期，使用当前日期"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1073
msgid "synonym of --reset-author-date"
msgstr "--reset-author-date 的同义词"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1075 builtin/rebase.c:1079
msgid "passed to 'git apply'"
msgstr "传递给 'git apply'"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1077
msgid "ignore changes in whitespace"
msgstr "忽略空白字符的变更"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1081 builtin/rebase.c:1084
msgid "cherry-pick all commits, even if unchanged"
msgstr "拣选所有提交，即使未修改"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1086
msgid "continue"
msgstr "继续"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1089
msgid "skip current patch and continue"
msgstr "跳过当前补丁并继续"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1091
msgid "abort and check out the original branch"
msgstr "终止并检出原有分支"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1094
msgid "abort but keep HEAD where it is"
msgstr "终止但保持 HEAD 不变"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1095
msgid "edit the todo list during an interactive rebase"
msgstr "在交互式变基中编辑待办列表"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1098
msgid "show the patch file being applied or merged"
msgstr "显示正在应用或合并的补丁文件"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1101
msgid "use apply strategies to rebase"
msgstr "使用应用策略进行变基"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1105
msgid "use merging strategies to rebase"
msgstr "使用合并策略进行变基"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1109
msgid "let the user edit the list of commits to rebase"
msgstr "让用户编辑要变基的提交列表"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1113
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "（已弃用）尝试重建合并提交而非忽略它们"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1118
msgid "how to handle commits that become empty"
msgstr "如何处理成为空提交的提交"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1121
+msgid "keep commits which start empty"
+msgstr "保留初始为空的提交"
+
+#: builtin/rebase.c:1125
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1132
msgid "add exec lines after each commit of the editable list"
msgstr "可编辑列表的每一个提交下面增加一行 exec"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1136
msgid "allow rebasing commits with empty messages"
msgstr "允许针对空提交说明的提交变基"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1140
msgid "try to rebase merges instead of skipping them"
msgstr "尝试对合并提交变基而不是忽略它们"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1143
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 来优化上游"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1145
msgid "use the given merge strategy"
msgstr "使用给定的合并策略"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1147 builtin/revert.c:115
msgid "option"
msgstr "选项"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1148
msgid "pass the argument through to the merge strategy"
msgstr "将参数传递给合并策略"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1151
msgid "rebase all reachable commits up to the root(s)"
msgstr "将所有可达的提交变基到根提交"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1154
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "自动重新安排任何失败的 `exec`"
+
+#: builtin/rebase.c:1156
msgid "apply all changes, even those already present upstream"
msgstr "应用所有更改，甚至那些已在上游存在的"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1177
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起来 'git am' 正在执行中。无法变基。"
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
+#: builtin/rebase.c:1208
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges 被 --rebase-merges 代替。"
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "不能将 '--root' 和 '--fork-point' 组合使用"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1230
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1234
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1269
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -19941,16 +20467,16 @@
"您必须编辑所有的合并冲突，然后通过 git add\n"
"命令将它们标记为已解决"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1287
msgid "could not discard worktree changes"
msgstr "无法丢弃工作区变更"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1308
#, c-format
msgid "could not move back to %s"
msgstr "无法移回 %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1354
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -19969,141 +20495,126 @@
"\t%s\n"
"然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1382
msgid "switch `C' expects a numerical value"
msgstr "开关 `C' 期望一个数字值"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1424
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式：%s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1463
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "不能组合使用应用选项和合并选项"
+#: builtin/rebase.c:1492
+msgid "apply options and merge options cannot be used together"
+msgstr "应用选项和合并选项不能同时使用"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1505
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "未知的变基后端：%s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1534
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1565
#, c-format
msgid "invalid upstream '%s'"
msgstr "无效的上游 '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1571
msgid "Could not create new root commit"
msgstr "不能创建新的根提交"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1597
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s'：只需要与分支的一个合并基线"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1600
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s'：只需要一个合并基线"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1609
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "没有指向一个有效的提交 '%s'"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1636
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "致命错误：无此分支/提交 '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "无此分支/提交 '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
+#: builtin/submodule--helper.c:2477
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用：%s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1658
msgid "Could not resolve HEAD to a revision"
msgstr "无法将 HEAD 解析为一个版本"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1679
msgid "Please commit or stash them."
msgstr "请提交或贮藏修改。"
-#: builtin/rebase.c:1997
-#, c-format
-msgid "could not switch to %s"
-msgstr "无法切换到 %s"
-
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1714
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1716
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "当前分支 %s 是最新的。\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1724
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的，强制变基。"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1726
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "当前分支 %s 是最新的，强制变基。\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1734
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 钩子拒绝了变基操作。"
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1741
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的变更：\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1744
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "从 %s 到 %s 的变更：\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1769
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先，回退头指针以便在其上重放您的工作...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1781
msgid "Could not detach HEAD"
msgstr "无法分离头指针"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1790
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快进 %s 到 %s。\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <仓库目录>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1263
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"
@@ -20129,7 +20640,7 @@
"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1283
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"
@@ -20148,79 +20659,110 @@
"\n"
"若要屏蔽此信息，您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2476
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:2492
-msgid "You must specify a directory."
-msgstr "您必须指定一个目录。"
+#: builtin/receive-pack.c:2491
+msgid "you must specify a directory"
+msgstr "您必须指定一个目录"
+
+#: builtin/reflog.c:9
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [<log 选项>] [<引用>]"
+
+#: builtin/reflog.c:12
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
+msgstr ""
+"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | <"
+"引用>...]"
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
msgstr ""
-"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
-"用>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <引用>@{<指定符>}..."
-#: builtin/reflog.c:22
-msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
-msgstr ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
-"用>..."
-
-#: builtin/reflog.c:25
+#: builtin/reflog.c:21
msgid "git reflog exists <ref>"
msgstr "git reflog exists <引用>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:197 builtin/reflog.c:211
#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "'%s' 不是一个有效的时间戳"
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "给 '--%2$s' 的时间戳 '%1$s' 无效"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:240 builtin/reflog.c:359
+msgid "do not actually prune any entries"
+msgstr "不要实际清除任何条目"
+
+#: builtin/reflog.c:243 builtin/reflog.c:362
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr "用现在前继条目的 SHA1 来重写旧的 SHA1"
+
+#: builtin/reflog.c:246 builtin/reflog.c:365
+msgid "update the reference to the value of the top reflog entry"
+msgstr "更新引用至引用日志顶部的条目"
+
+#: builtin/reflog.c:248 builtin/reflog.c:367
+msgid "print extra information on screen"
+msgstr "在屏幕上打印额外信息"
+
+#: builtin/reflog.c:249 builtin/reflog.c:253
+msgid "timestamp"
+msgstr "时间戳"
+
+#: builtin/reflog.c:250
+msgid "prune entries older than the specified time"
+msgstr "清除早于指定时间之前的条目"
+
+#: builtin/reflog.c:254
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr "清除早于 <时间> 且自当前分支顶部不可达的条目"
+
+#: builtin/reflog.c:258
+msgid "prune any reflog entries that point to broken commits"
+msgstr "清除指向损坏提交的引用条目"
+
+#: builtin/reflog.c:259
+msgid "process the reflogs of all references"
+msgstr "处理所有引用的引用日志"
+
+#: builtin/reflog.c:261
+msgid "limits processing to reflogs from the current worktree only"
+msgstr "仅处理当前工作树的引用日志"
+
+#: builtin/reflog.c:294
#, c-format
msgid "Marking reachable objects..."
msgstr "正在标记可达对象..."
-#: builtin/reflog.c:647
+#: builtin/reflog.c:338
#, c-format
msgid "%s points nowhere!"
msgstr "%s 指向不存在！"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:374
msgid "no reflog specified to delete"
msgstr "未指定要删除的引用日志"
-#: builtin/reflog.c:708
-#, c-format
-msgid "not a reflog: %s"
-msgstr "不是一个引用日志：%s"
-
-#: builtin/reflog.c:713
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "没有 '%s' 的引用日志"
-
-#: builtin/reflog.c:759
+#: builtin/reflog.c:396
#, c-format
msgid "invalid ref format: %s"
msgstr "无效的引用格式：%s"
-#: builtin/reflog.c:768
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr "git reflog [ show | expire | delete | exists ]"
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
@@ -20228,81 +20770,86 @@
"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <名称> <地址>"
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <旧名称> <新名称>"
+#: builtin/remote.c:20 builtin/remote.c:40
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <旧> <新>"
-#: builtin/remote.c:20 builtin/remote.c:44
+#: builtin/remote.c:21 builtin/remote.c:45
msgid "git remote remove <name>"
msgstr "git remote remove <名称>"
-#: builtin/remote.c:21 builtin/remote.c:49
+#: builtin/remote.c:22 builtin/remote.c:50
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <名称>"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <名称>"
-#: builtin/remote.c:24
+#: builtin/remote.c:25
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
-#: builtin/remote.c:25
+#: builtin/remote.c:26
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <名称> <分支>..."
-#: builtin/remote.c:26 builtin/remote.c:75
+#: builtin/remote.c:27 builtin/remote.c:76
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <名称>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <名称> <新的地址>"
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c:30 builtin/remote.c:83
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <名称> <地址>"
-#: builtin/remote.c:34
+#: builtin/remote.c:35
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<选项>] <名称> <地址>"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <名称> <分支>..."
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <名称> <分支>..."
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<选项>] <名称>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<选项>] <名称>"
-#: builtin/remote.c:70
+#: builtin/remote.c:71
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<选项>] [<组> | <远程>]..."
-#: builtin/remote.c:99
+#: builtin/remote.c:100
#, c-format
msgid "Updating %s"
msgstr "更新 %s 中"
-#: builtin/remote.c:131
+#: builtin/remote.c:102
+#, c-format
+msgid "Could not fetch %s"
+msgstr "不能获取 %s"
+
+#: builtin/remote.c:132
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -20310,72 +20857,77 @@
"--mirror 选项危险且过时，请使用 --mirror=fetch\n"
"\t 或 --mirror=push"
-#: builtin/remote.c:148
+#: builtin/remote.c:149
#, c-format
msgid "unknown mirror argument: %s"
msgstr "未知的镜像参数：%s"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "fetch the remote branches"
msgstr "抓取远程的分支"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "import all tags and associated objects when fetching"
msgstr "抓取时导入所有的标签和关联对象"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "或不抓取任何标签（--no-tags）"
-#: builtin/remote.c:171
+#: builtin/remote.c:172
msgid "branch(es) to track"
msgstr "跟踪的分支"
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "master branch"
msgstr "主线分支"
-#: builtin/remote.c:174
+#: builtin/remote.c:175
msgid "set up remote as a mirror to push to or fetch from"
msgstr "把远程设置为用以推送或抓取的镜像"
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying a master branch makes no sense with --mirror"
msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
-#: builtin/remote.c:188
+#: builtin/remote.c:189
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:196 builtin/remote.c:716
#, c-format
msgid "remote %s already exists."
msgstr "远程 %s 已经存在。"
-#: builtin/remote.c:240
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "无法设置 master '%s'"
-#: builtin/remote.c:355
+#: builtin/remote.c:323
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "未处理的 branch.%s.rebase=%s; 假定为 'true'"
+
+#: builtin/remote.c:367
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "无法得到引用规格 %s 的获取列表"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:461 builtin/remote.c:469
msgid "(matching)"
msgstr "（匹配）"
-#: builtin/remote.c:466
+#: builtin/remote.c:473
msgid "(delete)"
msgstr "（删除）"
-#: builtin/remote.c:655
+#: builtin/remote.c:664
#, c-format
msgid "could not set '%s'"
msgstr "不能设置 '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:669
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20386,17 +20938,17 @@
"\t%s:%d\n"
"现在在为不存在的远程名 '%s' 命名"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
#, c-format
msgid "No such remote: '%s'"
msgstr "没有此远程仓库：'%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:726
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重命名配置小节 '%s' 到 '%s'"
-#: builtin/remote.c:730
+#: builtin/remote.c:746
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20407,17 +20959,21 @@
"\t%s\n"
"\t如果必要请手动更新配置。"
-#: builtin/remote.c:770
+#: builtin/remote.c:783
+msgid "Renaming remote references"
+msgstr "正在重命名远程引用"
+
+#: builtin/remote.c:794
#, c-format
msgid "deleting '%s' failed"
msgstr "删除 '%s' 失败"
-#: builtin/remote.c:804
+#: builtin/remote.c:832
#, c-format
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:882
+#: builtin/remote.c:912
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20427,118 +20983,118 @@
msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
-#: builtin/remote.c:896
+#: builtin/remote.c:926
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除配置小节 '%s'"
-#: builtin/remote.c:999
+#: builtin/remote.c:1034
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的（下一次获取将存储于 remotes/%s）"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1037
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1039
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时（使用 'git remote prune' 来移除）"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1041
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1082
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1091
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "交互式变基到远程 %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1093
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "交互式变基（含合并提交）到远程 %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1096
#, c-format
msgid "rebases onto remote %s"
msgstr "变基到远程 %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1100
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s 合并"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1103
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s 合并"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1106
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和远程 %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1149
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1152
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1156
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1159
msgid "fast-forwardable"
msgstr "可快进"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1162
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1169
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推送至 %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1172
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1176
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推送至 %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1179
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1247
msgid "do not query remotes"
msgstr "不查询远程"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1268
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1269
#, c-format
msgid " Fetch URL: %s"
msgstr " 获取地址：%s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
msgid "(no URL)"
msgstr "(无 URL)"
@@ -20546,31 +21102,31 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1284 builtin/remote.c:1286
#, c-format
msgid " Push URL: %s"
msgstr " 推送地址：%s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支：%s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1288
msgid "(not queried)"
msgstr "（未查询）"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1290
msgid "(unknown)"
msgstr "（未知）"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1294
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1306
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -20578,155 +21134,159 @@
msgstr[1] " 远程分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1309 builtin/remote.c:1335
msgid " (status not queried)"
msgstr "（状态未查询）"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1318
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 为 'git pull' 配置的本地分支："
msgstr[1] " 为 'git pull' 配置的本地分支："
-#: builtin/remote.c:1297
+#: builtin/remote.c:1326
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1332
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 为 'git push' 配置的本地引用%s："
msgstr[1] " 为 'git push' 配置的本地引用%s："
-#: builtin/remote.c:1324
+#: builtin/remote.c:1353
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1355
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1369
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1371
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
-#: builtin/remote.c:1353
+#: builtin/remote.c:1381
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1389
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用：%s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1391
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者：注意保持前导空格
-#: builtin/remote.c:1381
+#: builtin/remote.c:1409
#, c-format
msgid " %s will become dangling!"
msgstr " %s 将成为悬空状态！"
# 译者：注意保持前导空格
-#: builtin/remote.c:1382
+#: builtin/remote.c:1410
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为悬空状态！"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1419
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1420
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1436
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1439
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1484
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1566
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1573
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1590
msgid "query push URLs rather than fetch URLs"
msgstr "查询推送 URL 地址，而非获取 URL 地址"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1592
msgid "return all URLs"
msgstr "返回所有 URL 地址"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1622
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1648
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1650
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1652
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1659
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1700
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版：%s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1708
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL：%s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1710
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
-#: builtin/repack.c:26
+#: builtin/remote.c:1727
+msgid "be verbose; must be placed before a subcommand"
+msgstr "冗长输出；必须置于子命令之前"
+
+#: builtin/repack.c:29
msgid "git repack [<options>]"
msgstr "git repack [<选项>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:34
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20734,139 +21294,144 @@
"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
"或禁用 pack.writebitmaps 配置。"
-#: builtin/repack.c:198
+#: builtin/repack.c:206
msgid "could not start pack-objects to repack promisor objects"
msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:280 builtin/repack.c:824
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
-#: builtin/repack.c:294
+#: builtin/repack.c:304
msgid "could not finish pack-objects to repack promisor objects"
msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:309
+#: builtin/repack.c:319
#, c-format
msgid "cannot open index for %s"
msgstr "不能打开 %s 的索引"
-#: builtin/repack.c:368
+#: builtin/repack.c:378
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "包 %s 太大，不在几何级数中考虑"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
#, c-format
msgid "pack %s too large to roll up"
msgstr "包 %s 太大导致数字溢出"
-#: builtin/repack.c:460
+#: builtin/repack.c:503
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "无法打开临时文件 %s 进行写入"
+
+#: builtin/repack.c:521
+msgid "could not close refs snapshot tempfile"
+msgstr "不能关闭引用快照临时文件"
+
+#: builtin/repack.c:634
msgid "pack everything in a single pack"
msgstr "所有内容打包到一个包文件中"
-#: builtin/repack.c:462
+#: builtin/repack.c:636
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同，并将不可达的对象设为松散对象"
-#: builtin/repack.c:465
+#: builtin/repack.c:639
msgid "remove redundant packs, and run git-prune-packed"
msgstr "删除多余的包，运行 git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:641
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
-#: builtin/repack.c:469
+#: builtin/repack.c:643
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
-#: builtin/repack.c:471
+#: builtin/repack.c:645
msgid "do not run git-update-server-info"
msgstr "不运行 git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:648
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --local"
-#: builtin/repack.c:476
+#: builtin/repack.c:650
msgid "write bitmap index"
msgstr "写 bitmap 索引"
-#: builtin/repack.c:478
+#: builtin/repack.c:652
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --delta-islands"
-#: builtin/repack.c:479
+#: builtin/repack.c:653
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:480
+#: builtin/repack.c:654
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A，不要将早于给定时间的对象过期"
-#: builtin/repack.c:482
+#: builtin/repack.c:656
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ，重新对不可达对象打包"
-#: builtin/repack.c:484
+#: builtin/repack.c:658
msgid "size of the window used for delta compression"
msgstr "用于增量压缩的窗口值"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:659 builtin/repack.c:665
msgid "bytes"
msgstr "字节"
-#: builtin/repack.c:486
+#: builtin/repack.c:660
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似，但限制内存大小而非条目数"
-#: builtin/repack.c:488
+#: builtin/repack.c:662
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:490
+#: builtin/repack.c:664
msgid "limits the maximum number of threads"
msgstr "限制最大线程数"
-#: builtin/repack.c:492
+#: builtin/repack.c:666
msgid "maximum size of each packfile"
msgstr "每个包文件的最大尺寸"
-#: builtin/repack.c:494
+#: builtin/repack.c:668
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象重新打包"
-#: builtin/repack.c:496
+#: builtin/repack.c:670
msgid "do not repack this pack"
msgstr "不要对该包文件重新打包"
-#: builtin/repack.c:498
+#: builtin/repack.c:672
msgid "find a geometric progression with factor <N>"
msgstr "使用因子 <n> 查找几何级数"
-#: builtin/repack.c:508
+#: builtin/repack.c:674
+msgid "write a multi-pack index of the resulting packs"
+msgstr "写入结果包的多包索引"
+
+#: builtin/repack.c:684
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能删除珍品仓库中的打包文件"
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable 和 -A 不兼容"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric 和 -A、-a 不兼容"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:833
msgid "Nothing new to pack."
msgstr "没有新的要打包。"
-#: builtin/repack.c:669
+#: builtin/repack.c:863
#, c-format
msgid "missing required file: %s"
msgstr "缺少需要的文件：%s"
-#: builtin/repack.c:671
+#: builtin/repack.c:865
#, c-format
msgid "could not unlink: %s"
msgstr "不能删除：%s"
@@ -20883,10 +21448,6 @@
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <提交> [<父提交>...]"
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --convert-graft-file"
-
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <对象>..."
@@ -20949,98 +21510,92 @@
msgid "unable to open %s for reading"
msgstr "无法为读取打开 %s"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "无法启动 mktree"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "无法从 mktree 读取"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "mktree 报告失败"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree 没有返回一个对象名"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "无法对 %s 执行 fstat"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "无法向数据库写入对象"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "不是一个有效的对象名：'%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "无法得到 %s 的对象类型"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "编辑对象文件失败"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "新对象和旧对象相同：'%s'"
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "无法将 %s 解析为一个提交"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "提交 '%s' 中含有损坏的合并标签"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "提交 '%s' 中含有格式错误的合并标签"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "原始提交 '%s' 中有一个 gpg 签名"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "在替换的提交中签名将被移除！"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "不能为 '%s' 写替换提交"
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "对 '%s' 移植没有必要"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "新提交和旧的一样：'%s'"
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -21049,71 +21604,71 @@
"不能转换下列移植：\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "列出替换的引用"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "删除替换的引用"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "编辑现存的对象"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "修改一个提交的父提交"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "转换现存的移植文件"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "如果存在则替换引用"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "不要为 --edit 操作美观显示内容"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "使用此格式"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "不列出时不能使用 --format"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "只有写一个替换时 -f 才有意义"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw 只有和 --edit 共用才有意义"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d 需要至少一个参数"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "错误的参数个数"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e 需要且仅需要一个参数"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-g 需要至少一个参数"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file 不带参数"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "只能为 -l 提供一个模式"
@@ -21134,167 +21689,151 @@
msgid "unable to generate diff for '%s'"
msgstr "无法为 '%s' 生成差异"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "混杂"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "软性"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "硬性"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "合并"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:83
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "您没有一个有效的 HEAD。"
-#: builtin/reset.c:85
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "无法找到 HEAD 指向的树。"
-#: builtin/reset.c:91
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"
-#: builtin/reset.c:116
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 现在位于 %s"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:195
+#: builtin/reset.c:304
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
+#: builtin/stash.c:693
msgid "be quiet, only report errors"
msgstr "安静模式，只报告错误"
-#: builtin/reset.c:297
+#: builtin/reset.c:404
+msgid "skip refreshing the index after reset"
+msgstr "重置后跳过刷新索引"
+
+#: builtin/reset.c:406
msgid "reset HEAD and index"
msgstr "重置 HEAD 和索引"
-#: builtin/reset.c:298
+#: builtin/reset.c:407
msgid "reset only HEAD"
msgstr "只重置 HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:409 builtin/reset.c:411
msgid "reset HEAD, index and working tree"
msgstr "重置 HEAD、索引和工作区"
-#: builtin/reset.c:304
+#: builtin/reset.c:413
msgid "reset HEAD but keep local changes"
msgstr "重置 HEAD 但保存本地变更"
-#: builtin/reset.c:310
+#: builtin/reset.c:419
msgid "record only the fact that removed paths will be added later"
msgstr "将删除的路径标记为稍后添加"
-#: builtin/reset.c:344
+#: builtin/reset.c:452
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "无法将 '%s' 解析为一个有效的版本。"
-#: builtin/reset.c:352
+#: builtin/reset.c:460
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "无法将 '%s' 解析为一个有效的树对象。"
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:479
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:373
+#: builtin/reset.c:481
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:388
+#: builtin/reset.c:496
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对纯仓库进行%s重置"
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "-N 只能和 --mixed 同时使用"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:527
msgid "Unstaged changes after reset:"
msgstr "重置后取消暂存的变更："
-#: builtin/reset.c:416
+#: builtin/reset.c:530
#, c-format
msgid ""
-"\n"
-"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
-"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
-"to make this the default.\n"
-msgstr ""
-"\n"
-"重置后，枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
-"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
+"It took %.2f seconds to refresh the index after reset. You can use\n"
+"'--no-refresh' to avoid this."
+msgstr "在重置后花了 %.2f 秒来刷新索引。使用 '--no-refresh' 以避免之。"
-#: builtin/reset.c:434
+#: builtin/reset.c:547
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重置索引文件至版本 '%s'。"
-#: builtin/reset.c:439
+#: builtin/reset.c:552
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
-
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr "对象过滤需要 --objects"
-
-#: builtin/rev-list.c:674
+#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "标记计数和 --objects 不兼容"
+#: builtin/rev-list.c:664
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "标记计数和 '%s' 不能同时使用"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -21456,15 +21995,19 @@
msgid "preserve initially empty commits"
msgstr "保留初始化的空提交"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "允许提交说明为空"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "拣选失败"
@@ -21510,68 +22053,69 @@
msgstr[0] "如下文件有本地修改："
msgstr[1] "如下文件有本地修改："
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "不列出删除的文件"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "只从索引区删除"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "忽略文件更新状态检查"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "允许递归删除"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "即使没有匹配，也以零状态退出"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "没有提供路径规格。我应该删除哪些文件？"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 选项不会递归删除 '%s'"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm：不能删除 %s"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
-" --all 和明确的 <引用> 互斥。"
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<主机>:]<目录> (--all | <引用>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "远程名称"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "使用无状态的 RPC 协议"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "从标准输入读取引用"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "打印来自远程 helper 的状态"
@@ -21628,27 +22172,27 @@
msgid "group by field"
msgstr "按字段分组"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:395
msgid "too many arguments given outside repository"
msgstr "仓库外执行提供了太多的参数"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
+" [--current] [--color[=<何时>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
-#: builtin/show-branch.c:17
+#: builtin/show-branch.c:18
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
-#: builtin/show-branch.c:395
+#: builtin/show-branch.c:396
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
@@ -21724,11 +22268,6 @@
msgid "show <n> most recent ref-log entries starting at base"
msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
-
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "未提供分支，且 HEAD 无效"
@@ -21818,82 +22357,142 @@
msgid "show refs from stdin that aren't in local repository"
msgstr "显示从标准输入中读入的不在本地仓库中的引用"
-#: builtin/sparse-checkout.c:22
+#: builtin/sparse-checkout.c:23
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:46
-msgid "git sparse-checkout list"
-msgstr "git sparse-checkout list"
+#: builtin/sparse-checkout.c:61
+msgid "this worktree is not sparse"
+msgstr "这个工作区不是稀疏的"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:76
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr "本工作区不是稀疏模式（稀疏检出文件可能不存在）"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:177
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr "目录 '%s' 包括了未跟踪文件，但不在稀疏检出锥中"
+
+#: builtin/sparse-checkout.c:185
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "无法删除目录 '%s'"
+
+#: builtin/sparse-checkout.c:327
msgid "failed to create directory for sparse-checkout file"
msgstr "无法为稀疏检出文件创建目录"
-#: builtin/sparse-checkout.c:268
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr "无法升级仓库格式以启用 worktreeConfig"
+#: builtin/sparse-checkout.c:366
+msgid "failed to initialize worktree config"
+msgstr "无法初始化工作树配置"
-#: builtin/sparse-checkout.c:270
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "无法设置 extensions.worktreeConfig"
-
-#: builtin/sparse-checkout.c:290
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-
-#: builtin/sparse-checkout.c:310
-msgid "initialize the sparse-checkout in cone mode"
-msgstr "初始化稀疏检出为 cone 模式"
-
-#: builtin/sparse-checkout.c:312
-msgid "toggle the use of a sparse index"
-msgstr "切换稀疏索引的使用"
-
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:411
msgid "failed to modify sparse-index config"
msgstr "无法修改 sparse-index 配置"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
+#: builtin/sparse-checkout.c:847
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "初始化稀疏检出为锥形模式"
+
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
+#: builtin/sparse-checkout.c:849
+msgid "toggle the use of a sparse index"
+msgstr "切换稀疏索引的使用"
+
+#: builtin/sparse-checkout.c:479
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:531
#, c-format
msgid "could not normalize path %s"
msgstr "无法规范化路径 %s"
-#: builtin/sparse-checkout.c:425
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <模式>)"
-
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:560
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
msgid "unable to load existing sparse-checkout patterns"
msgstr "无法加载现存的稀疏检出模式"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:619
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "已有的稀疏检出模式不使用锥形模式"
+
+#: builtin/sparse-checkout.c:707
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr "请在非锥形模式的顶级目录中运行"
+
+#: builtin/sparse-checkout.c:712
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr "指定目录而不是模式（无前导斜线）"
+
+#: builtin/sparse-checkout.c:714
+msgid ""
+"specify directories rather than patterns. If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr "指定目录而不是模式。若你的目录以 '!' 开头，传入 --skip-checks"
+
+#: builtin/sparse-checkout.c:716
+msgid ""
+"specify directories rather than patterns. If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"指定目录而不是模式。若你的目录真的包含 '*?[]\\' 中的字符，传入 --skip-checks"
+
+#: builtin/sparse-checkout.c:732
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr "'%s' 不是目录；若无论如何都要将它当作目录，使用 --skip-checks 重新运行"
+
+#: builtin/sparse-checkout.c:734
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"如果您想要单独一个文件，在类似于 '%s' 的路径前传入前置斜线 （参见 git-sparse-"
+"checkout 手册中的 NON-CONE PROBLEMS）。"
+
+#: builtin/sparse-checkout.c:739
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <模式>)"
+
+#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr "跳过可能对一些目录产生假阳性错误的合理性检查"
+
+#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
msgid "read patterns from standard in"
msgstr "从标准输入读取模式"
-#: builtin/sparse-checkout.c:588
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:760
+msgid "no sparse-checkout to add to"
+msgstr "没有可以添加到的稀疏检出"
-#: builtin/sparse-checkout.c:607
-msgid "git sparse-checkout disable"
-msgstr "git sparse-checkout disable"
+#: builtin/sparse-checkout.c:775
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <模式>)"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:854
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr "必须在稀疏检出中重应用稀疏模式"
+
+#: builtin/sparse-checkout.c:914
msgid "error while refreshing working directory"
msgstr "刷新工作目录时出错"
@@ -21919,22 +22518,26 @@
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [[-S|--staged] -k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
-" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+" [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
" [--] [<路径规格>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<消息>]"
#: builtin/stash.c:55
@@ -21959,6 +22562,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
" [--] [<路径规格>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<消息>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -21982,7 +22593,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear 不支持参数"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -21993,181 +22604,181 @@
" %s -> %s\n"
" 以腾出空间。\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程中应用贮藏"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "无法生成差异 %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不用 --index。"
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "不能保存索引树"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "无法从贮藏条目中恢复未跟踪文件"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "正在合并 %s 和 %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "索引未从贮藏中恢复。"
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "无法从贮藏条目中恢复未跟踪文件"
+
+#: builtin/stash.c:608 builtin/stash.c:695
msgid "attempt to recreate the index"
msgstr "尝试重建索引"
-#: builtin/stash.c:635
+#: builtin/stash.c:641
#, c-format
msgid "Dropped %s (%s)"
msgstr "丢弃了 %s（%s）"
-#: builtin/stash.c:638
+#: builtin/stash.c:644
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s：无法丢弃贮藏条目"
-#: builtin/stash.c:651
+#: builtin/stash.c:657
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一个贮藏引用"
-#: builtin/stash.c:701
+#: builtin/stash.c:707
msgid "The stash entry is kept in case you need it again."
msgstr "贮藏条目被保留以备您再次需要。"
-#: builtin/stash.c:724
+#: builtin/stash.c:730
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:808
+#: builtin/stash.c:809
msgid "failed to parse tree"
msgstr "无法解析树"
-#: builtin/stash.c:819
+#: builtin/stash.c:820
msgid "failed to unpack trees"
msgstr "无法解包目录树"
-#: builtin/stash.c:839
+#: builtin/stash.c:840
msgid "include untracked files in the stash"
msgstr "在贮藏中包含未跟踪文件"
-#: builtin/stash.c:842
+#: builtin/stash.c:843
msgid "only show untracked files in the stash"
msgstr "仅显示贮藏中的未跟踪文件"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:930 builtin/stash.c:967
#, c-format
msgid "Cannot update %s with %s"
msgstr "无法用 %2$s 更新 %1$s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
msgid "stash message"
msgstr "贮藏说明"
-#: builtin/stash.c:957
+#: builtin/stash.c:958
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一个 <提交> 参数"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1143
+msgid "No staged changes"
+msgstr "没有暂存的修改"
+
+#: builtin/stash.c:1204
msgid "No changes selected"
msgstr "没有选择变更"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1304
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1331
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1340
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1351 builtin/stash.c:1370
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1361
+msgid "Cannot save the current staged state"
+msgstr "无法保存当前暂存状态"
+
+#: builtin/stash.c:1398
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1447
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1458
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "不能同时使用参数 --staged 和 --include-untracked 或 --all"
+
+#: builtin/stash.c:1476
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了执行 'git add'？"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1491
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1498
msgid "Cannot initialize stash"
msgstr "无法初始化贮藏"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1513
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1518
#, c-format
msgid "Saved working directory and index state %s"
msgstr "保存工作目录和索引状态 %s"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1615
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1656 builtin/stash.c:1728
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1658 builtin/stash.c:1730
+msgid "stash staged changes only"
+msgstr "只贮藏暂存的变更"
+
+#: builtin/stash.c:1660 builtin/stash.c:1732
msgid "stash in patch mode"
msgstr "以补丁模式贮藏"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1661 builtin/stash.c:1733
msgid "quiet mode"
msgstr "静默模式"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1663 builtin/stash.c:1735
msgid "include untracked files in stash"
msgstr "贮藏中包含未跟踪文件"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1665 builtin/stash.c:1737
msgid "include ignore files"
msgstr "包含忽略的文件"
-#: builtin/stash.c:1700
-msgid ""
-"the stash.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"对 stash.useBuiltin 的支持已被删除！\n"
-"详见 'git help config' 中的条目。"
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
-
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "跳过和移除所有的注释行"
@@ -22176,41 +22787,43 @@
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称，却得到 %s"
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr "submodule--helper print-default-remote 不带参数"
-
-#: builtin/submodule--helper.c:101
+#: builtin/submodule--helper.c:103
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:213
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
+
+#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记（anchor）"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:418
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
+#: builtin/submodule--helper.c:640
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
+msgstr "在 .gitmodules 中未找到子模组路径 '%s' 的 url"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:528
#, c-format
msgid "Entering '%s'\n"
msgstr "进入 '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:531
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22219,7 +22832,7 @@
"对 %s 执行 run_command 返回非零值。\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:553
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22229,223 +22842,212 @@
"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:569
msgid "suppress output of entering each submodule command"
msgstr "抑制进入每一个子模组命令的输出"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1458
msgid "recurse into nested submodules"
msgstr "递归进入嵌套子模组中"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:576
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:654
#, c-format
msgid "Failed to register url for submodule path '%s'"
-msgstr "无法为子模组 '%s' 注册 url"
+msgstr "无法为子模组路径 '%s' 注册 url"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:658
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:668
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:675
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
-msgstr "无法为子模组 '%s' 注册更新模式"
+msgstr "无法为子模组路径 '%s' 注册更新模式"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:697
msgid "suppress output for initializing a submodule"
msgstr "抑制子模组初始化的输出"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:702
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<选项>] [<路径>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "无法解析子模组 '%s' 的 HEAD 引用"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
#, c-format
msgid "failed to recurse into submodule '%s'"
-msgstr "递归子模组 '%s' 失败"
+msgstr "无法递归进入子模组 '%s'"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
msgid "suppress submodule status output"
msgstr "抑制子模组状态输出"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:875
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:977
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s（数据对象）->%s（子模组）"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:980
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s（子模组）->%s（数据对象）"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:993
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1043
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "不能从 '%s' 创建哈希对象"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1047
#, c-format
msgid "unexpected mode %o\n"
msgstr "意外的模式 %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1288
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1290
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "比较存储在索引和子模组 HEAD 中的提交"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1292
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "跳过设置了 'ignore_config' 为 'all' 的子模组"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1294
msgid "limit the summary size"
msgstr "限制总结的大小"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1299
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1323
msgid "could not fetch a revision for HEAD"
msgstr "不能为 HEAD 获取一个版本"
-#: builtin/submodule--helper.c:1342
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached 和 --files 是互斥的"
-
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1384
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "为 '%s' 同步子模组 url\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1390
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "无法为子模组路径 '%s' 注册 url"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1399
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "无法得到子模组 '%s' 的默认远程关联"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1409
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "无法为子模组 '%s' 更新远程关联"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1456
msgid "suppress output of synchronizing submodule url"
msgstr "抑制子模组 URL 同步的输出"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1463
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1513
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm "
-"-rf' 命令）"
+"子模组工作区 '%s' 包含一个 .git 目录。这将会用 absorbgitdirs 子命令替换成一"
+"个 .git 文件。"
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1530
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1538
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "已清除目录 '%s'\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1540
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "无法移除子模组工作区 '%s'\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1551
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "不能创建空的子模组目录 %s"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1567
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1596
msgid "remove submodule working trees even if they contain local changes"
msgstr "删除子模组工作区，即使包含本地修改"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1597
msgid "unregister all submodules"
msgstr "将所有子模组取消注册"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1602
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1616
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1665
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22457,289 +23059,450 @@
"Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n"
"'--reference' 来克隆。"
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模组 '%s' 不能添加仓库备选：%s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1749
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1756
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocation 的取值 '%s'"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1781
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1826
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1831
#, c-format
msgid "directory not empty: '%s'"
msgstr "目录非空：'%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1843
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1876
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1879
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1882
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
+#: builtin/submodule--helper.c:3376
msgid "force cloning progress"
msgstr "强制显示克隆进度"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
msgid "disallow cloning into non-empty directory"
msgstr "不允许克隆到一个非空目录"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1903
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
-"[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
+"[--name <名字>] [--depth <深度>] [--single-branch] [--filter <过滤器规格>] --"
+"url <url> --path <路径>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1943
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
+msgstr "子模组路径 '%2$s' 的更新模式 '%1$s' 无效"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1947
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
-msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
+msgstr "为子模组路径 '%2$s' 配置的更新模式 '%1$s' 无效"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
-msgstr "子模组 '%s' 尚未初始化"
+msgstr "子模组路径 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'？"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败，退出"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
-msgid "path into the working tree"
-msgstr "到工作区的路径"
+#: builtin/submodule--helper.c:2371
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "无法在子模组路径 '%2$s' 中检出 '%1$s'"
-#: builtin/submodule--helper.c:2347
-msgid "path into the working tree, across nested submodule boundaries"
-msgstr "工作区中的路径，递归嵌套子模组"
+#: builtin/submodule--helper.c:2375
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "无法在子模组路径 '%2$s' 中变基 '%1$s'"
-#: builtin/submodule--helper.c:2351
-msgid "rebase, merge, checkout or none"
-msgstr "rebase、merge、checkout 或 none"
+#: builtin/submodule--helper.c:2379
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "无法在子模组路径 '%2$s' 中合并 '%1$s'"
-#: builtin/submodule--helper.c:2357
-msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr "创建一个指定深度的浅克隆"
+#: builtin/submodule--helper.c:2383
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "在子模组路径 '%3$s' 中执行 '%1$s %2$s' 失败"
-#: builtin/submodule--helper.c:2360
-msgid "parallel jobs"
-msgstr "并发任务"
+#: builtin/submodule--helper.c:2402
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "子模组路径 '%s'：检出 '%s'\n"
-#: builtin/submodule--helper.c:2362
-msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
+#: builtin/submodule--helper.c:2406
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "子模组路径 '%s'：变基至 '%s'\n"
-#: builtin/submodule--helper.c:2363
-msgid "don't print cloning progress"
-msgstr "不要输出克隆进度"
+#: builtin/submodule--helper.c:2410
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "子模组路径 '%s'：合并入 '%s'\n"
-#: builtin/submodule--helper.c:2374
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "子模组路径 '%s'：'%s %s'\n"
-#: builtin/submodule--helper.c:2387
-msgid "bad value for update parameter"
-msgstr "update 参数取值错误"
+#: builtin/submodule--helper.c:2438
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr "无法在子模组路径 '%s' 中获取；尝试直接获取 %s："
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2447
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr "获取了子模组路径 '%s'，但是它没有包含 %s。直接获取该提交失败。"
+
+#: builtin/submodule--helper.c:2481
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2499
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "无法获得子模组 '%s' 的仓库句柄"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2588
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr "无法在子模组路径 '%s' 中找到当前版本"
+
+#: builtin/submodule--helper.c:2599
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "无法在子模组路径 '%s' 中获取"
+
+#: builtin/submodule--helper.c:2604
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr "无法在子模组路径 '%2$s' 中找到当前版本 %1$s"
+
+#: builtin/submodule--helper.c:2640
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "无法递归进入子模组路径 '%s'"
+
+#: builtin/submodule--helper.c:2699
+msgid "force checkout updates"
+msgstr "强制检出更新"
+
+#: builtin/submodule--helper.c:2701
+msgid "initialize uninitialized submodules before update"
+msgstr "在更新前初始化尚未初始化的子模组"
+
+#: builtin/submodule--helper.c:2703
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "使用子模组远程追踪分支的 SHA-1"
+
+#: builtin/submodule--helper.c:2705
+msgid "traverse submodules recursively"
+msgstr "递归遍历子模组"
+
+#: builtin/submodule--helper.c:2707
+msgid "don't fetch new objects from the remote site"
+msgstr "不要从远程地址获取新对象"
+
+#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+msgid "path into the working tree"
+msgstr "到工作区的路径"
+
+#: builtin/submodule--helper.c:2713
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "工作区中的路径，递归嵌套子模组"
+
+#: builtin/submodule--helper.c:2717
+msgid "rebase, merge, checkout or none"
+msgstr "rebase、merge、checkout 或 none"
+
+#: builtin/submodule--helper.c:2723
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "创建一个指定深度的浅克隆"
+
+#: builtin/submodule--helper.c:2726
+msgid "parallel jobs"
+msgstr "并发任务"
+
+#: builtin/submodule--helper.c:2728
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
+
+#: builtin/submodule--helper.c:2729
+msgid "don't print cloning progress"
+msgstr "不要输出克隆进度"
+
+#: builtin/submodule--helper.c:2741
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+msgstr ""
+"git submodule [--quiet] update [--init [--filter=<过滤器规格>]] [--remote] [-"
+"N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <仓库>] [--recursive] [--[no-]single-branch] [--] [<路"
+"径>...]"
+
+#: builtin/submodule--helper.c:2767
+msgid "bad value for update parameter"
+msgstr "update 参数取值错误"
+
+#: builtin/submodule--helper.c:2893
msgid "recurse into submodules"
msgstr "在子模组中递归"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2899
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2955
msgid "check if it is safe to write to the .gitmodules file"
msgstr "检查写入 .gitmodules 文件是否安全"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2958
msgid "unset the config in the .gitmodules file"
msgstr "取消 .gitmodules 文件中的设置"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <名称> [<值>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <名称>"
-#: builtin/submodule--helper.c:2663
-msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper config --check-writeable"
-
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
+#: builtin/submodule--helper.c:3395
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "请确认 .gitmodules 文件在工作区里"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:3000
msgid "suppress output for setting url of a submodule"
msgstr "抑制设置子模组 URL 的输出"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:3004
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:3037
msgid "set the default tracking branch to master"
msgstr "设置默认跟踪分支为 master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:3039
msgid "set the default tracking branch"
msgstr "设置默认跟踪分支"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:3043
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:3044
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:3051
msgid "--branch or --default required"
msgstr "需要 --branch 或 --default"
-#: builtin/submodule--helper.c:2752
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch 和 --default 是互斥的"
+#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+msgid "print only error messages"
+msgstr "只打印错误消息"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3073
+msgid "force creation"
+msgstr "强制创建"
+
+#: builtin/submodule--helper.c:3081
+msgid "show whether the branch would be created"
+msgstr "显示是否将要创建分支"
+
+#: builtin/submodule--helper.c:3085
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <名称> <起始对象 ID> <起始名称>"
+
+#: builtin/submodule--helper.c:3097
+#, c-format
+msgid "creating branch '%s'"
+msgstr "正在创建分支 '%s'"
+
+#: builtin/submodule--helper.c:3155
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "向索引中添加位于 '%s' 的已存在的仓库\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3158
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' 已存在并且不是一个有效的 git 仓库"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3171
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "发现一个本地 git 目录 '%s' 及其远程仓库："
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "发现一个本地 git 目录 '%s' 及其远程仓库：\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3178
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"如果您想要重用这个本地 git 目录而非重新克隆自\n"
" %s\n"
"使用 '--force' 选项。如果本地 git 目录不是正确的仓库，或者如果您不确定这里\n"
-"的含义，使用 '--name' 选项指定另外的名称。\n"
+"的含义，使用 '--name' 选项指定另外的名称。"
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3190
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "为子模组 '%s' 重新激活本地 git 目录\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3227
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "无法检出子模组 '%s'"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "克隆仓库时要检出的分支"
+#: builtin/submodule--helper.c:3266
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "无法添加子模组 '%s'"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
+#: builtin/submodule--helper.c:3283
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "无法注册子模组 '%s'"
+
+#: builtin/submodule--helper.c:3339
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' 已经存在于索引中"
+
+#: builtin/submodule--helper.c:3342
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' 已经存在于索引中且不是一个子模组"
+
+#: builtin/submodule--helper.c:3372
+msgid "branch of repository to add as submodule"
+msgstr "要添加为子模组的仓库的分支"
+
+#: builtin/submodule--helper.c:3373
msgid "allow adding an otherwise ignored submodule path"
msgstr "允许添加一个被忽略的子模组路径"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr "git submodule--helper add-clone [<选项>...] --url <URL> --path <路径> --name <名称>"
+#: builtin/submodule--helper.c:3379
+msgid "borrow the objects from reference repositories"
+msgstr "从引用仓库中借用对象"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3381
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr "将子模组的名称设置为给定的字符串，而非默认为其路径"
+
+#: builtin/submodule--helper.c:3388
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]"
+
+#: builtin/submodule--helper.c:3416
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "只能在工作区的顶级目录中使用相对路径"
+
+#: builtin/submodule--helper.c:3425
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "仓库 URL：'%s' 必须是绝对路径或以 ./|../ 起始"
+
+#: builtin/submodule--helper.c:3460
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' 不是一个有效的子模组名称"
+
+#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3526
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
@@ -22764,52 +23527,52 @@
msgid "shorten ref output"
msgstr "缩短引用输出"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "原因"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "更新的原因"
-#: builtin/tag.c:25
+#: builtin/tag.c:26
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
-"\t\t<标签名> [<头>]"
+" <标签名> [<头>]"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid "git tag -d <tagname>..."
msgstr "git tag -d <标签名>..."
-#: builtin/tag.c:28
+#: builtin/tag.c:29
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
"at <对象>]\n"
-"\t\t[--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
+" [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
-#: builtin/tag.c:30
+#: builtin/tag.c:31
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<格式>] <标签名>..."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "tag '%s' not found."
msgstr "未发现标签 '%s'。"
-#: builtin/tag.c:135
+#: builtin/tag.c:136
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'（曾为 %s）\n"
-#: builtin/tag.c:170
+#: builtin/tag.c:171
#, c-format
msgid ""
"\n"
@@ -22822,7 +23585,7 @@
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:174
+#: builtin/tag.c:175
#, c-format
msgid ""
"\n"
@@ -22857,134 +23620,115 @@
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "无标签说明？"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:445
msgid "list tag names"
msgstr "列出标签名称"
-#: builtin/tag.c:448
+#: builtin/tag.c:447
msgid "print <n> lines of each tag message"
msgstr "每个标签信息打印 <n> 行"
-#: builtin/tag.c:450
+#: builtin/tag.c:449
msgid "delete tags"
msgstr "删除标签"
-#: builtin/tag.c:451
+#: builtin/tag.c:450
msgid "verify tags"
msgstr "验证标签"
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "Tag creation options"
msgstr "标签创建选项"
-#: builtin/tag.c:455
+#: builtin/tag.c:454
msgid "annotated tag, needs a message"
msgstr "附注标签，需要一个说明"
-#: builtin/tag.c:457
+#: builtin/tag.c:456
msgid "tag message"
msgstr "标签说明"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
msgid "force edit of tag message"
msgstr "强制编辑标签说明"
-#: builtin/tag.c:460
+#: builtin/tag.c:459
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG 签名的标签"
-#: builtin/tag.c:463
+#: builtin/tag.c:462
msgid "use another key to sign the tag"
msgstr "使用另外的私钥签名该标签"
-#: builtin/tag.c:464
+#: builtin/tag.c:463
msgid "replace the tag if exists"
msgstr "如果存在，替换现有的标签"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:464 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "创建引用日志"
-#: builtin/tag.c:467
+#: builtin/tag.c:466
msgid "Tag listing options"
msgstr "标签列表选项"
-#: builtin/tag.c:468
+#: builtin/tag.c:467
msgid "show tag list in columns"
msgstr "以列的方式显示标签列表"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that contain the commit"
msgstr "只打印包含该提交的标签"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:469 builtin/tag.c:471
msgid "print only tags that don't contain the commit"
msgstr "只打印不包含该提交的标签"
-#: builtin/tag.c:473
+#: builtin/tag.c:472
msgid "print only tags that are merged"
msgstr "只打印已经合并的标签"
-#: builtin/tag.c:474
+#: builtin/tag.c:473
msgid "print only tags that are not merged"
msgstr "只打印尚未合并的标签"
-#: builtin/tag.c:478
+#: builtin/tag.c:477
msgid "print only tags of the object"
msgstr "只打印指向该对象的标签"
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column 和 -n 不兼容"
+#: builtin/tag.c:559
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "'%s' 选项只允许用在列表显示模式"
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "-n 选项只允许用在列表显示模式"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains 选项只允许用在列表显示模式"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "--no-contains 选项只允许用在列表显示模式"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "--points-at 选项只允许用在列表显示模式"
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
-
-#: builtin/tag.c:567
-msgid "only one -F or -m option is allowed."
-msgstr "只允许一个 -F 或 -m 选项。"
-
-#: builtin/tag.c:592
+#: builtin/tag.c:598
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/tag.c:597
+#: builtin/tag.c:603
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:628
+#: builtin/tag.c:634
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'（曾为 %s）\n"
+#: builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "包超过了最大允许大小"
+
#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr "展开对象中"
@@ -22992,211 +23736,206 @@
#: builtin/update-index.c:84
#, c-format
msgid "failed to create directory %s"
-msgstr "创建目录 %s 失败"
+msgstr "无法创建目录 %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "创建文件 %s 失败"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
-msgstr "删除文件 %s 失败"
+msgstr "无法删除文件 %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
-msgstr "删除目录 %s 失败"
+msgstr "无法删除目录 %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "在 '%s' 中测试 mtime "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "添加一个新文件后，目录的状态信息未改变"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "添加一个新目录后，目录的状态信息未改变"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "更新一个文件后，目录的状态信息被修改"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "在子目录中添加文件后，目录的状态信息被修改"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "删除一个文件后，目录的状态信息未改变"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "删除一个目录后，目录的状态信息未改变"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<选项>] [--] [<文件>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:993
msgid "continue refresh even when index needs update"
msgstr "当索引需要更新时继续刷新"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:996
msgid "refresh: ignore submodules"
msgstr "刷新：忽略子模组"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:999
msgid "do not ignore new files"
msgstr "不忽略新的文件"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:1001
msgid "let files replace directories and vice-versa"
msgstr "让文件替换目录（反之亦然）"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1003
msgid "notice files missing from worktree"
msgstr "通知文件从工作区丢失"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:1005
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引区包含未合并的条目也执行刷新"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1008
msgid "refresh stat information"
msgstr "刷新统计信息"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1012
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1016
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<对象>,<路径>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1017
msgid "add the specified entry to the index"
msgstr "添加指定的条目到索引区"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1027
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有变更\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1030
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1033
msgid "mark files as \"index-only\""
msgstr "把文件标记为 \"仅索引\""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1036
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1039
msgid "do not touch index-only entries"
msgstr "不要触碰仅索引条目"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1041
msgid "add to index only; do not add content to object database"
msgstr "只添加到索引区；不添加对象到对象库"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1043
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作区里，也删除路径"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1045
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "携带 --stdin：输入的行以 null 字符终止"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1047
msgid "read list of paths to be updated from standard input"
msgstr "从标准输入中读取需要更新的路径列表"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1051
msgid "add entries from standard input to the index"
msgstr "从标准输入添加条目到索引区"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1055
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "为指定文件重新生成第2和第3暂存区"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1059
msgid "only update entries that differ from HEAD"
msgstr "只更新与 HEAD 不同的条目"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1063
msgid "ignore files missing from worktree"
msgstr "忽略工作区丢失的文件"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1066
msgid "report actions to standard output"
msgstr "在标准输出显示操作"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1068
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘记保存的未解决的冲突"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1072
msgid "write index in this format"
msgstr "以这种格式写入索引区"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1074
msgid "enable or disable split index"
msgstr "启用或禁用索引拆分"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1076
msgid "enable/disable untracked cache"
msgstr "启用/禁用对未跟踪文件的缓存"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1078
msgid "test if the filesystem supports untracked cache"
msgstr "测试文件系统是否支持未跟踪文件缓存"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1080
msgid "enable untracked cache without testing the filesystem"
msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1082
msgid "write out the index even if is not flagged as changed"
msgstr "即使没有被标记为已更改，也要写出索引"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1084
msgid "enable or disable file system monitor"
msgstr "启用或禁用文件系统监控"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1086
msgid "mark files as fsmonitor valid"
msgstr "标记文件为 fsmonitor 有效"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1089
msgid "clear fsmonitor valid bit"
msgstr "清除 fsmonitor 有效位"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1195
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
"core.splitIndex 被设置为 false。如果您确实要启用索引拆分，请删除或修改它。"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1204
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分，请删除或修改它。"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1216
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23204,11 +23943,11 @@
"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
"改它。"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1220
msgid "Untracked cache disabled"
msgstr "缓存未跟踪文件被禁用"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1228
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -23216,25 +23955,25 @@
"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
"修改它。"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1232
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "缓存未跟踪文件在 '%s' 启用"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1241
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "core.fsmonitor 未设置；如果想要启用 fsmonitor 请设置该选项"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1246
msgid "fsmonitor enabled"
msgstr "fsmonitor 被启用"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1250
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr "core.fsmonitor 已设置；如果想要禁用 fsmonitor 请移除该选项"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1254
msgid "fsmonitor disabled"
msgstr "fsmonitor 被禁用"
@@ -23250,26 +23989,22 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<选项>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "删除引用"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "标准输入有以 NUL 字符终止的参数"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "从标准输入读取更新"
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "从头开始更新文件信息"
@@ -23278,19 +24013,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<选项>] <目录>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "在一次单独的请求/响应之后退出"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "在初始的引用广告后立即退出"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "为 git-http-backend 提供 info/refs"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "如果 <目录> 不是一个 Git 目录，不要尝试 <目录>/.git/"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "不活动 <n> 秒钟后终止传输"
@@ -23326,63 +24061,62 @@
msgid "print tag contents"
msgstr "打印标签内容"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<选项>] <路径> [<提交>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<选项>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<选项>] <路径>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <工作区> <新路径>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<选项>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<选项>] <工作区>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [<路径>...]"
+
+#: builtin/worktree.c:26
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "删除 '%s' 失败"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:76
#, c-format
msgid "Removing %s/%s: %s"
msgstr "删除 %s/%s: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "报告清除的工作区"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "将早于 <时间> 的工作区过期"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:230
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "无法使用的工作区目标 '%s'"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:235
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23391,7 +24125,7 @@
"'%s' 是一个丢失但锁定的工作区，\n"
"使用 '%s -f -f' 覆盖，或用 'unlock' 和 'prune' 或 'remove' 清除"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:237
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23400,139 +24134,146 @@
"'%s' 是一个丢失但已经注册的工作区，\n"
"使用 '%s -f' 覆盖，或用 'prune' 或 'remove' 清除"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:248
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr "无法将 '%s' 复制至 '%s'；稀疏检出可能无法正确工作"
+
+#: builtin/worktree.c:268
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr "无法把工作树配置从 '%s' 拷贝到 '%s'"
+
+#: builtin/worktree.c:280 builtin/worktree.c:285
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "无法在 '%2$s' 中取消配置 '%1$s'"
+
+#: builtin/worktree.c:356
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:378
msgid "initializing"
msgstr "初始化"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:492 builtin/worktree.c:498
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "准备工作区（新分支 '%s'）"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:494
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "准备工作区（重置分支 '%s'，之前为 %s）"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:503
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "准备工作区（检出 '%s'）"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:509
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "准备工作区（分离头指针 %s）"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:554
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出 <分支>，即使已经被检出到其它工作区"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:557
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:559
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:561
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:562
msgid "keep the new working tree locked"
msgstr "锁定新工作区"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:564 builtin/worktree.c:809
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:567
msgid "set up tracking mode (see git-branch(1))"
msgstr "设置跟踪模式（参见 git-branch(1)）"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:570
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "尝试为新分支名匹配一个远程跟踪分支"
-#: builtin/worktree.c:506
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b、-B 和 --detach 是互斥的"
-
-#: builtin/worktree.c:508
-msgid "--reason requires --lock"
-msgstr "--reason 需要 --lock"
-
-#: builtin/worktree.c:512
+#: builtin/worktree.c:584
msgid "added with --lock"
msgstr "由 --lock 添加"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:646
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在创建新分支时使用选项 --[no-]track "
-#: builtin/worktree.c:691
+#: builtin/worktree.c:766
msgid "show extended annotations and reasons, if available"
msgstr "显示扩展的注释和原因（如果有）"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:768
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr "向早于 <时间> 的工作区添添加“可修剪”注释"
-#: builtin/worktree.c:702
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose 和 --porcelain 互斥"
+#: builtin/worktree.c:770
+msgid "terminate records with a NUL character"
+msgstr "使用 NUL 字符终结记录"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
+#: builtin/worktree.c:1052
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:823 builtin/worktree.c:856
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:828
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:830
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:858
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:899
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移动或删除包含子模组的工作区"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:907
msgid "force move even if worktree is dirty or locked"
msgstr "强制移动，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:930 builtin/worktree.c:1054
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一个主工作区"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:935
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "无法从 '%s' 算出目标名称"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:948
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -23541,7 +24282,7 @@
"无法移动一个锁定的工作区，锁定原因：%s\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:950
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -23549,36 +24290,36 @@
"无法移动一个锁定的工作区，\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:953
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "验证失败，无法移动工作区：%s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:958
#, c-format
msgid "failed to move '%s' to '%s'"
-msgstr "移动 '%s' 到 '%s' 失败"
+msgstr "无法移动 '%s' 到 '%s'"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:1004
#, c-format
msgid "failed to run 'git status' on '%s'"
-msgstr "在 '%s' 中执行 'git status' 失败"
+msgstr "无法在 '%s' 中执行 'git status'"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:1008
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:1013
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
-msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d"
+msgstr "无法在 '%s' 中执行 'git status'，退出码 %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:1036
msgid "force removal even if worktree is dirty or locked"
msgstr "强制删除，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:1059
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -23587,7 +24328,7 @@
"无法删除一个锁定的工作区，锁定原因：%s\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:1061
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -23595,17 +24336,17 @@
"无法删除一个锁定的工作区，\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:1064
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "验证失败，无法删除工作区：%s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1088
#, c-format
msgid "repair: %s: %s"
msgstr "修理：%s：%s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1091
#, c-format
msgid "error: %s: %s"
msgstr "错误：%s：%s"
@@ -23656,21 +24397,16 @@
"帮助。\n"
"有关系统的概述，查看 'git help git'。"
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "没有为 --git-dir 提供目录\n"
+msgid "no directory given for '%s' option\n"
+msgstr "没有为 '%s' 选项提供目录\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "没有为 --namespace 提供命名空间\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "没有为 --work-tree 提供目录\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
@@ -23686,11 +24422,6 @@
msgid "no config key given for --config-env\n"
msgstr "没有为 --config-env 提供配置名称\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "没有为 -C 提供目录\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
@@ -23720,29 +24451,29 @@
msgid "recursive alias: %s"
msgstr "递归的别名：%s"
-#: git.c:476
+#: git.c:480
msgid "write failure on standard output"
msgstr "在标准输出写入失败"
-#: git.c:478
+#: git.c:482
msgid "unknown write failure on standard output"
msgstr "到标准输出的未知写入错误"
-#: git.c:480
+#: git.c:484
msgid "close failed on standard output"
msgstr "标准输出关闭失败"
-#: git.c:833
+#: git.c:838
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "检测到别名循环：'%s'的扩展未终止：%s"
-#: git.c:883
+#: git.c:888
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作为内置命令处理 %s"
-#: git.c:896
+#: git.c:901
#, c-format
msgid ""
"usage: %s\n"
@@ -23751,33 +24482,25 @@
"用法：%s\n"
"\n"
-#: git.c:916
+#: git.c:921
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n"
-#: git.c:928
+#: git.c:933
#, c-format
msgid "failed to run command '%s': %s\n"
-msgstr "运行命令 '%s' 失败：%s\n"
+msgstr "无法运行命令 '%s'：%s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr "--packfile 的参数必须是有效的哈希值（得到 '%s'）"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "不是 git 仓库"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile 需要 --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args 只能和 --packfile 一起使用"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "未处理的选项"
@@ -23803,65 +24526,31 @@
msgid "exit immediately after advertising capabilities"
msgstr "通告能力之后立即退出"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "套接字/管道已在使用：'%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "不能启动服务于：'%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "无法在后台生成守护进程"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid 失败"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "守护进程尚未上线"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "守护进程无法启动"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid 迷惑了"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "守护进程尚未关闭"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<名字>] [<选项>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<名字>] [<线程>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr "test-helper simple-ipc start-daemon [<名字>] [<线程>] [<最大等待>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<名字>] [<最大等待>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<名字>] [<令牌>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [<名字>] [<字节数>] [<字节>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -23869,83 +24558,79 @@
"test-helper simple-ipc multiple [<名字>] [<线程>] [<字节计数>] [<批处理大"
"小>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "unix 域套接字的名称或路径名"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "命名管道的名字"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "服务器线程池中的线程数"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "等待守护进程启动或停止的秒数"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "字节数目"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "每个线程的请求数"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "字节"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "ballast character"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "令牌"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "发送到服务器的命令令牌"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer 为负值，默认为 %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "不支持委托控制，因为 cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "不支持公钥文件锁定，因为 cURL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "不支持协议限制，因为 cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端："
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构建"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "无法将 SSL 后端设置为 '%s'：已经设置"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -23956,138 +24641,325 @@
" 请求：%s\n"
" 重定向：%s"
-#: remote-curl.c:183
+#: remote-curl.c:184
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "在 push-option 取值中无效的引号：'%s'"
-#: remote-curl.c:307
+#: remote-curl.c:308
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs 无效：这是 git 仓库么？"
-#: remote-curl.c:408
+#: remote-curl.c:409
msgid "invalid server response; expected service, got flush packet"
msgstr "无效的服务端响应。预期服务，得到 flush 包"
-#: remote-curl.c:439
+#: remote-curl.c:440
#, c-format
msgid "invalid server response; got '%s'"
msgstr "无效的服务端响应，得到 '%s'"
-#: remote-curl.c:499
+#: remote-curl.c:500
#, c-format
msgid "repository '%s' not found"
msgstr "仓库 '%s' 未找到"
-#: remote-curl.c:503
+#: remote-curl.c:504
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' 鉴权失败"
-#: remote-curl.c:507
+#: remote-curl.c:508
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "无法以 http.pinnedPubkey 设置访问 '%s'：%s"
+
+#: remote-curl.c:512
#, c-format
msgid "unable to access '%s': %s"
msgstr "无法访问 '%s'：%s"
-#: remote-curl.c:513
+#: remote-curl.c:518
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
-#: remote-curl.c:644
+#: remote-curl.c:649
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符"
-#: remote-curl.c:656
+#: remote-curl.c:661
msgid "remote server sent unexpected response end packet"
msgstr "远程服务器发送意外的响应结束数据包"
-#: remote-curl.c:726
+#: remote-curl.c:730
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
-#: remote-curl.c:756
+#: remote-curl.c:759
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl：错误的行宽字符：%.4s"
-#: remote-curl.c:758
+#: remote-curl.c:761
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl：意外响应结束包"
-#: remote-curl.c:834
+#: remote-curl.c:837
#, c-format
msgid "RPC failed; %s"
msgstr "RPC 失败。%s"
-#: remote-curl.c:874
+#: remote-curl.c:877
msgid "cannot handle pushes this big"
msgstr "不能处理这么大的推送"
-#: remote-curl.c:989
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "不能压缩请求，zlib 压缩错误 %d"
-#: remote-curl.c:993
+#: remote-curl.c:994
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "不能压缩请求，zlib 结束错误 %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1044
#, c-format
msgid "%d bytes of length header were received"
msgstr "收到了 %d 字节长度的头信息"
-#: remote-curl.c:1045
+#: remote-curl.c:1046
#, c-format
msgid "%d bytes of body are still expected"
msgstr "预期仍然需要 %d 个字节的正文"
-#: remote-curl.c:1134
+#: remote-curl.c:1135
msgid "dumb http transport does not support shallow capabilities"
msgstr "哑 http 传输不支持浅克隆能力"
-#: remote-curl.c:1149
+#: remote-curl.c:1150
msgid "fetch failed."
msgstr "获取失败。"
-#: remote-curl.c:1195
+#: remote-curl.c:1198
msgid "cannot fetch by sha1 over smart http"
msgstr "无法通过智能 HTTP 获取 sha1"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1242 remote-curl.c:1248
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "协议错误：期望 sha/ref，却得到 '%s'"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1260 remote-curl.c:1378
#, c-format
msgid "http transport does not support %s"
msgstr "http 传输协议不支持 %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1296
msgid "git-http-push failed"
msgstr "git-http-push 失败"
-#: remote-curl.c:1481
+#: remote-curl.c:1485
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1517
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl：错误读取来自 git 的命令流"
-#: remote-curl.c:1520
+#: remote-curl.c:1524
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl：尝试没有本地仓库下获取"
-#: remote-curl.c:1561
+#: remote-curl.c:1565
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl：未知的来自 git 的命令 '%s'"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "需要一个工作目录"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "无法找到登记根"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
+#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "无法切换到 '%s'"
+
+#: contrib/scalar/scalar.c:179
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "无法配置 %s=%s"
+
+#: contrib/scalar/scalar.c:197
+msgid "could not configure log.excludeDecoration"
+msgstr "无法配置 log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:218
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar 登记需要一个工作树"
+
+#: contrib/scalar/scalar.c:310
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "远程 HEAD 不是一个分支：'%.*s'"
+
+#: contrib/scalar/scalar.c:316
+msgid "failed to get default branch name from remote; using local default"
+msgstr "无法从远程获取默认分支名称；使用本地默认值"
+
+#: contrib/scalar/scalar.c:329
+msgid "failed to get default branch name"
+msgstr "无法获取默认分支名称"
+
+#: contrib/scalar/scalar.c:340
+msgid "failed to unregister repository"
+msgstr "无法取消注册仓库"
+
+#: contrib/scalar/scalar.c:355
+msgid "failed to delete enlistment directory"
+msgstr "无法删除登记目录"
+
+#: contrib/scalar/scalar.c:375
+msgid "branch to checkout after clone"
+msgstr "克隆后要检出的分支"
+
+#: contrib/scalar/scalar.c:377
+msgid "when cloning, create full working directory"
+msgstr "在克隆时，创建完整的工作目录"
+
+#: contrib/scalar/scalar.c:379
+msgid "only download metadata for the branch that will be checked out"
+msgstr "只下载要检出的分支的元信息"
+
+#: contrib/scalar/scalar.c:384
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]"
+
+#: contrib/scalar/scalar.c:409
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "无法从 '%s' 猜测工作区名称"
+
+#: contrib/scalar/scalar.c:418
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "目录 '%s' 已存在"
+
+#: contrib/scalar/scalar.c:445
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "无法获取 '%s' 的默认分支"
+
+#: contrib/scalar/scalar.c:456
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "无法在 '%s' 中配置远程"
+
+#: contrib/scalar/scalar.c:465
+#, c-format
+msgid "could not configure '%s'"
+msgstr "无法配置 '%s'"
+
+#: contrib/scalar/scalar.c:468
+msgid "partial clone failed; attempting full clone"
+msgstr "部分克隆失败；尝试完整克隆"
+
+#: contrib/scalar/scalar.c:472
+msgid "could not configure for full clone"
+msgstr "无法配置完整克隆"
+
+#: contrib/scalar/scalar.c:504
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` 不带参数"
+
+#: contrib/scalar/scalar.c:517
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<登记>]"
+
+#: contrib/scalar/scalar.c:544
+msgid "reconfigure all registered enlistments"
+msgstr "重新配置所有注册的登记"
+
+#: contrib/scalar/scalar.c:548
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <登记>]"
+
+#: contrib/scalar/scalar.c:566
+msgid "--all or <enlistment>, but not both"
+msgstr "--all 或者 <登记>，而不是两个一起"
+
+#: contrib/scalar/scalar.c:581
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "在 '%s' 的 git 仓库已消失"
+
+#: contrib/scalar/scalar.c:621
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <任务> [<登记>]\n"
+"任务：\n"
+
+#: contrib/scalar/scalar.c:639
+#, c-format
+msgid "no such task: '%s'"
+msgstr "没有此任务：'%s'"
+
+#: contrib/scalar/scalar.c:689
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<登记>]"
+
+#: contrib/scalar/scalar.c:736
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <登记>"
+
+#: contrib/scalar/scalar.c:751
+msgid "refusing to delete current working directory"
+msgstr "拒绝删除当前工作目录"
+
+#: contrib/scalar/scalar.c:766
+msgid "include Git version"
+msgstr "包括 Git 的版本"
+
+#: contrib/scalar/scalar.c:768
+msgid "include Git's build options"
+msgstr "包括 Git 的构建选项"
+
+#: contrib/scalar/scalar.c:772
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:813
+msgid "-C requires a <directory>"
+msgstr "-C 需要 <目录>"
+
+#: contrib/scalar/scalar.c:815
+#, c-format
+msgid "could not change to '%s'"
+msgstr "无法变更到 '%s'"
+
+#: contrib/scalar/scalar.c:821
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c 需要 <键>=<值> 参数"
+
+#: contrib/scalar/scalar.c:839
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <目录>] [-c <键>=<值>] <命令> [<选项>]\n"
+"\n"
+"命令：\n"
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr "编译器信息不可用\n"
@@ -24096,52 +24968,52 @@
msgid "no libc information available\n"
msgstr "libc 信息不可用\n"
-#: list-objects-filter-options.h:94
+#: list-objects-filter-options.h:126
msgid "args"
msgstr "参数"
-#: list-objects-filter-options.h:95
+#: list-objects-filter-options.h:127
msgid "object filtering"
msgstr "对象过滤"
-#: parse-options.h:184
+#: parse-options.h:188
msgid "expiry-date"
msgstr "到期时间"
-#: parse-options.h:198
+#: parse-options.h:202
msgid "no-op (backward compatibility)"
msgstr "空操作（向后兼容）"
-#: parse-options.h:310
+#: parse-options.h:341
msgid "be more verbose"
msgstr "更加详细"
-#: parse-options.h:312
+#: parse-options.h:343
msgid "be more quiet"
msgstr "更加安静"
-#: parse-options.h:318
+#: parse-options.h:349
msgid "use <n> digits to display object names"
msgstr "用 <n> 位数字显示对象名"
-#: parse-options.h:337
+#: parse-options.h:368
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除提交说明里的空格和#注释"
-#: parse-options.h:338
+#: parse-options.h:369
msgid "read pathspec from file"
msgstr "从文件读取路径表达式"
-#: parse-options.h:339
+#: parse-options.h:370
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "key"
msgstr "key"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "排序的字段名"
@@ -24210,17 +25082,17 @@
msgstr "显示联系人的规范名称和电子邮件"
#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "确保引用名称格式正确"
+
+#: command-list.h:66
msgid "Switch branches or restore working tree files"
msgstr "切换分支或恢复工作区文件"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "从索引拷贝文件到工作区"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "确保引用名称格式正确"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "查找尚未应用到上游的提交"
@@ -24283,7 +25155,7 @@
#: command-list.h:83
msgid "Salvage your data out of another SCM people love to hate"
-msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
+msgstr "从另外一个人们爱恨的配置管理系统中拯救您的数据"
#: command-list.h:84
msgid "A CVS server emulator for Git"
@@ -24382,41 +25254,41 @@
msgstr "显示 Git 的帮助信息"
#: command-list.h:108
+msgid "Run git hooks"
+msgstr "运行 git 钩子"
+
+#: command-list.h:109
msgid "Server side implementation of Git over HTTP"
msgstr "Git HTTP 协议的服务端实现"
-#: command-list.h:109
+#: command-list.h:110
msgid "Download from a remote Git repository via HTTP"
msgstr "通过 HTTP 从远程 Git 仓库下载"
-#: command-list.h:110
+#: command-list.h:111
msgid "Push objects over HTTP/DAV to another repository"
msgstr "通过 HTTP/DAV 推送对象另一个仓库"
-#: command-list.h:111
+#: command-list.h:112
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "从标准输入将一组补丁发送到IMAP文件夹"
-#: command-list.h:112
+#: command-list.h:113
msgid "Build pack index file for an existing packed archive"
msgstr "从一个现存的包存档文件创建包索引"
-#: command-list.h:113
+#: command-list.h:114
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
-#: command-list.h:114
+#: command-list.h:115
msgid "Instantly browse your working repository in gitweb"
msgstr "在 gitweb 中即时浏览您的工作仓库"
-#: command-list.h:115
+#: command-list.h:116
msgid "Add or parse structured information in commit messages"
msgstr "添加或解析提交说明中的结构化信息"
-#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Git 仓库浏览器"
-
#: command-list.h:117
msgid "Show commit logs"
msgstr "显示提交日志"
@@ -24466,25 +25338,25 @@
msgstr "与 git-merge-index 一起使用的标准向导程序"
#: command-list.h:129
+msgid "Show three-way merge without touching index"
+msgstr "在不动索引的情况下显示三路合并"
+
+#: command-list.h:130
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "运行合并冲突解决工具以解决合并冲突"
-#: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "显示三路合并而不动索引"
-
#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "写入和校验多包索引"
-
-#: command-list.h:132
msgid "Creates a tag object with extra validation"
msgstr "创建一个有额外验证的标签对象"
-#: command-list.h:133
+#: command-list.h:132
msgid "Build a tree-object from ls-tree formatted text"
msgstr "基于 ls-tree 的格式化文本创建一个树对象"
+#: command-list.h:133
+msgid "Write and verify multi-pack-indexes"
+msgstr "写入和校验多包索引"
+
#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "移动或重命名一个文件、目录或符号链接"
@@ -24587,17 +25459,17 @@
msgstr "恢复工作区文件"
#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "回退一些现存提交"
-
-#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
msgstr "按时间顺序列出提交对象"
-#: command-list.h:161
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "选出并处理参数"
+#: command-list.h:161
+msgid "Revert some existing commits"
+msgstr "回退一些现存提交"
+
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr "从工作区和索引中删除文件"
@@ -24611,48 +25483,49 @@
msgstr "使用 Git 协议推送对象到另一个仓库"
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
-msgstr "只允许 Git SSH 访问的受限登录shell"
-
-#: command-list.h:166
-msgid "Summarize 'git log' output"
-msgstr "'git log' 输出摘要"
-
-#: command-list.h:167
-msgid "Show various types of objects"
-msgstr "显示各种类型的对象"
-
-#: command-list.h:168
-msgid "Show branches and their commits"
-msgstr "显示分支和提交"
-
-#: command-list.h:169
-msgid "Show packed archive index"
-msgstr "显示打包归档索引"
-
-#: command-list.h:170
-msgid "List references in a local repository"
-msgstr "显示本地仓库中的引用"
-
-#: command-list.h:171
msgid "Git's i18n setup code for shell scripts"
msgstr "为 shell 脚本准备的 Git 国际化设置代码"
-#: command-list.h:172
+#: command-list.h:166
msgid "Common Git shell script setup code"
msgstr "常用的 Git shell 脚本设置代码"
+#: command-list.h:167
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "只允许 Git SSH 访问的受限登录shell"
+
+#: command-list.h:168
+msgid "Summarize 'git log' output"
+msgstr "'git log' 输出摘要"
+
+#: command-list.h:169
+msgid "Show various types of objects"
+msgstr "显示各种类型的对象"
+
+#: command-list.h:170
+msgid "Show branches and their commits"
+msgstr "显示分支和提交"
+
+#: command-list.h:171
+msgid "Show packed archive index"
+msgstr "显示打包归档索引"
+
+#: command-list.h:172
+msgid "List references in a local repository"
+msgstr "显示本地仓库中的引用"
+
+# 译者：中文字符串拼接，可删除前导空格
#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
-msgstr "初始化及修改稀疏检出"
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr "将您的工作树缩减至已追踪文件的子集"
#: command-list.h:174
-msgid "Stash the changes in a dirty working directory away"
-msgstr "贮藏脏工作区中的修改"
+msgid "Add file contents to the staging area"
+msgstr "将文件内容添加到暂存区"
#: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "将文件内容添加到索引"
+msgid "Stash the changes in a dirty working directory away"
+msgstr "贮藏脏工作区中的修改"
#: command-list.h:176
msgid "Show the working tree status"
@@ -24727,65 +25600,65 @@
msgstr "检查标签的 GPG 签名"
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git web 界面（Git 仓库的 web 前端）"
-
-#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "显示每一个提交引入的差异日志"
-#: command-list.h:196
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "管理多个工作区"
-#: command-list.h:197
+#: command-list.h:196
msgid "Create a tree object from the current index"
msgstr "从当前索引创建一个树对象"
-#: command-list.h:198
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "定义路径的属性"
-#: command-list.h:199
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Git 命令行界面和约定"
-#: command-list.h:200
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "面向开发人员的 Git 核心教程"
-#: command-list.h:201
+#: command-list.h:200
msgid "Providing usernames and passwords to Git"
msgstr "为 Git 提供用户名和口令"
-#: command-list.h:202
+#: command-list.h:201
msgid "Git for CVS users"
msgstr "适合 CVS 用户的 Git 帮助"
-#: command-list.h:203
+#: command-list.h:202
msgid "Tweaking diff output"
msgstr "调整差异输出"
-#: command-list.h:204
+#: command-list.h:203
msgid "A useful minimum set of commands for Everyday Git"
msgstr "每一天 Git 的一组有用的最小命令集合"
-#: command-list.h:205
+#: command-list.h:204
msgid "Frequently asked questions about using Git"
msgstr "关于使用 Git 的常见问题"
-#: command-list.h:206
+#: command-list.h:205
msgid "A Git Glossary"
msgstr "Git 词汇表"
-#: command-list.h:207
+#: command-list.h:206
msgid "Hooks used by Git"
msgstr "Git 使用的钩子"
-#: command-list.h:208
+#: command-list.h:207
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未跟踪文件"
+#: command-list.h:208
+msgid "The Git repository browser"
+msgstr "Git 仓库浏览器"
+
#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
msgstr "映射作者/提交者的名称和/或邮件地址"
@@ -24815,52 +25688,21 @@
msgstr "将一个仓库安装到另外一个仓库中"
#: command-list.h:216
-msgid "A tutorial introduction to Git: part two"
-msgstr "一个 Git 教程：第二部分"
+msgid "A tutorial introduction to Git"
+msgstr "Git 入门教程"
#: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "一个 Git 教程"
+msgid "A tutorial introduction to Git: part two"
+msgstr "Git 入门教程：第二部分"
#: command-list.h:218
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git web 界面（Git 仓库的 web 前端）"
+
+#: command-list.h:219
msgid "An overview of recommended workflows with Git"
msgstr "Git 推荐的工作流概览"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "二分查找运行失败：没有提供命令。"
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "运行 $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"二分查找运行失败：\n"
-"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "二分查找不能继续运行"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"二分查找运行失败：\n"
-"'bisect-state $state' 退出码为 $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "二分查找运行成功"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -24899,489 +25741,44 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "简单合并未生效，尝试自动合并。"
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "只能在工作区的顶级目录中使用相对路径"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' 已经存在于索引中"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' 没有检出的提交"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "无法添加子模组 '$sm_path'"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "无法注册子模组 '$sm_path'"
-
-#: git-submodule.sh:532
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-
-#: git-submodule.sh:542
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "无法在子模组路径 '$sm_path' 中获取"
-
-#: git-submodule.sh:547
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
-
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr "无法在子模组路径 '$displaypath' 中获取，尝试直接获取 $sha1："
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "子模组 '$displaypath'：'$command $sha1'"
-
-#: git-submodule.sh:627
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "无法递归进子模组路径 '$displaypath'"
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "已应用 autostash。"
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "不能存储 $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"应用 autostash 导致了冲突。\n"
-"您的修改安全地保存在贮藏区中。\n"
-"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "变基中（$new_count/$total）"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"命令:\n"
-"p, pick <提交> = 使用提交\n"
-"r, reword <提交> = 使用提交，但修改提交说明\n"
-"e, edit <提交> = 使用提交，但停下来修补\n"
-"s, squash <提交> = 使用提交，但挤压到前一个提交\n"
-"f, fixup <提交> = 类似于 \"squash\"，但丢弃提交说明日志\n"
-"x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n"
-"d, drop <提交> = 删除提交\n"
-"l, label <标签> = 为当前 HEAD 打上标签\n"
-"t, reset <标签> = 重置 HEAD 到该标签\n"
-"m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
-". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"
-". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"
-". -c <提交> 可以编辑提交说明。\n"
-"\n"
-"可以对这些行重新排序，将从上至下执行。\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"您现在可以修补这个提交，使用\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"当您对变更感到满意，执行\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1：不是一个可以被拣选的提交"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "无效的提交名：$sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "不能写入当前提交的替代 sha1"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "快进到 $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "不能快进到 $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "不能移动 HEAD 到 $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "拒绝挤压一个合并：$sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "无法重做合并 $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "不能拣选 $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "这是提交说明 #${n}："
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "提交说明 #${n} 将被跳过："
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "这是一个 $count 个提交的组合。"
-msgstr[1] "这是一个 $count 个提交的组合。"
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "不能写入 $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "这是一个 2 个提交的组合。"
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "不能应用 $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"不能在成功拣选 $sha1... $rest 之后修补提交\n"
-"这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
-"钩子执行失败，你可能需要在重写提交说明前解决这个问题。"
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "停止在 $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "没有父提交的情况下不能 '$squash_style'"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "执行：$rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "执行失败：$rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "并且修改索引和/或工作区"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"您可以解决这个问题，然后运行\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"执行成功：$rest\n"
-"但是在索引和/或工作区中存在变更。提交或贮藏修改，然后运行\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "未知命令：$command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "要修改请使用命令 'git rebase --edit-todo'。"
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "成功变基并更新 $head_name。"
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "不能删除 CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"您已暂存了工作区的修改。如果这些修改要挤压到前一个提交，执行：\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"如果这些变更要形成一个新提交，执行：\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"无论哪种情况，当您完成提交，继续执行：\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "在修补提交中查找作者信息时遇到错误"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "不能提交暂存的修改。"
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "无法运行编辑器"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "不能检出 $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "没有 HEAD？"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "不能创建临时 $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "不能标记为交互式"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
-msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "注意空提交已被注释掉"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "不能对重写提交进行初始化"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "用法：$dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:182
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "不能切换目录到 $cdup，工作区的顶级目录"
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:191 git-sh-setup.sh:198
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "致命错误：$program_name 不能在没有工作区的情况下使用"
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "不能变基：您有未暂存的变更。"
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:212
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "不能重写分支：您有未暂存的变更。"
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "无法通过变基方式拉取：您有未暂存的变更。"
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:215
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "不能 $action：您有未暂存的变更。"
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "不能变基：您的索引中包含未提交的变更。"
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。"
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:226
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "不能 $action：您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:228
msgid "Additionally, your index contains uncommitted changes."
msgstr "而且您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:348
msgid "You need to run this command from the toplevel of the working tree."
msgstr "您需要在工作区的顶级目录中运行这个命令。"
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:353
msgid "Unable to determine absolute path of git directory"
msgstr "不能确定 git 目录的绝对路径"
@@ -25433,7 +25830,7 @@
#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
-msgstr "为写入打开块编辑文件失败：%s"
+msgstr "无法为写入打开块编辑文件：%s"
#: git-add--interactive.perl:1121
#, perl-format
@@ -25453,7 +25850,7 @@
msgid "failed to open hunk edit file for reading: %s"
msgstr "无法读取块编辑文件：%s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -25467,7 +25864,7 @@
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -25481,7 +25878,7 @@
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -25495,7 +25892,7 @@
"a - 不暂存该块和本文件中后面的全部块\n"
"d - 不要不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -25509,7 +25906,7 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -25523,7 +25920,7 @@
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -25537,7 +25934,7 @@
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -25551,7 +25948,7 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -25565,7 +25962,7 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -25587,90 +25984,90 @@
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "选中的块不能应用到索引！\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未合入的：%s\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "没有其它可供跳转的块\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "无效数字：'%s'\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "对不起，只有 %d 个可用块。\n"
msgstr[1] "对不起，只有 %d 个可用块。\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "没有其它可供查找的块\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "错误的正则表达式 %s：%s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "没有和给定模式相匹配的块\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "没有前一个块\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "没有下一个块\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "对不起，不能拆分这个块\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "拆分为 %d 块。\n"
msgstr[1] "拆分为 %d 块。\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "对不起，不能编辑这个块\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -25687,56 +26084,56 @@
"diff - 显示 HEAD 和索引间差异\n"
"add untracked - 添加未跟踪文件的内容至暂存列表\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "缺失 --"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "未知的 --patch 模式：%s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "无效的参数 %s，期望是 --"
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "本地时间和 GMT 有不到一分钟间隔\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "本地时间偏移量大于等于 24 小时\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "致命错误：命令 '%s' 已终止，退出代码为 %d"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr "编辑器非正常退出，终止所有操作"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' 包含编辑的邮件。\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases 和其它选项不兼容\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -25746,47 +26143,47 @@
"git-send-email 通过 sendemail.* 选项进行设置，注意字母 'e'。\n"
"设置 sendemail.forbidSendmailVariables 为 false 来禁用这项检查。\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "不能在仓库之外运行 git format-patch\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr "`batch-size` 和 `relogin` 必须同时定义（通过命令行或者配置选项）\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "未知的 --suppress-cc 字段：'%s'\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "未知的 --confirm 设置：'%s'\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "警告：不支持带引号的 sendmail 别名：%s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "警告：不支持 `:include:`：%s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "警告：不能识别的 sendmail 行：%s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -25801,12 +26198,12 @@
" * 如果含义为一个文件，使用 \"./%s\"，或者\n"
" * 如果含义为一个范围，使用 --format-patch 选项。\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "无法打开目录 %s: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
@@ -25816,17 +26213,17 @@
"未指定补丁文件！\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "在 %s 中没有标题行？"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "为写入打开 %s 失败: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -25839,37 +26236,37 @@
"\n"
"如果您不想发送摘要，清除内容。\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "无法打开 %s: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "无法打开 %s.final: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "摘要邮件为空，跳过\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "您确认要使用 <%s> [y/N]？"
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？"
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -25881,20 +26278,20 @@
"\t%s\n"
"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "邮件将要发送给谁？"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "致命错误：别名 '%s' 扩展为它自己\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？"
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
@@ -25902,16 +26299,16 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)："
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA 路径 \"%s\" 不存在"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -25936,128 +26333,128 @@
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "发送这封邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "发送要求的邮件回复"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "要求的 SMTP 服务器未被正确定义。"
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "服务器不支持 STARTTLS！%s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS 失败！%s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "无法发送 %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "演习发送 %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "正发送 %s\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "演习成功。日志说：\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "OK。日志说：\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
msgstr "结果："
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "结果：OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "无法打开文件 %s"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) 添加 cc: %s 自行 '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能执行 '%s'"
-#: git-send-email.perl:1972
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) 添加 %s: %s 自：'%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) 无法关闭管道至 '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "不能以 7bit 形式发送信息"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "无效的传送编码"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2100
#, perl-format
msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
+"fatal: %s: rejected by %s hook\n"
"%s\n"
"warning: no patches were sent\n"
msgstr ""
-"致命错误：%s：被 sendemail-validate 挂钩拒绝\n"
+"致命错误：%s：被 %s 钩子拒绝\n"
"%s\n"
"警告：补丁未能发送\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "不能打开 %s：%s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2113
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -26066,13 +26463,13 @@
"致命错误：%s:%d 超过 998 字符\n"
"警告：补丁未能发送\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2131
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "略过 %s 含备份后缀 '%s'。\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2135
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要发送 %s？[y|N]："
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5d5718a..caf6057 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -17,12 +17,13 @@
# - Yichao Yu <yyc1992 AT gmail.com>
# - Zhuang Ya <zhuangya AT me.com>
#
+# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022.
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-14 13:55+0800\n"
+"POT-Creation-Date: 2022-04-13 14:52+0800\n"
+"PO-Revision-Date: 2022-04-14 08:04+0800\n"
"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
"po/git-cli/zh_Hant/>\n"
@@ -31,234 +32,233 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
"zhconvert.org\n"
-#: add-interactive.c:376
+#: add-interactive.c:382
#, c-format
msgid "Huh (%s)?"
msgstr "嗯（%s）？"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
+#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
+#: builtin/rebase.c:1671
msgid "could not read index"
msgstr "無法讀取索引"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:590 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "二進位"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:648 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "無"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:649 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "未變更"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:686 git-add--interactive.perl:641
msgid "Update"
msgstr "更新"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:703 add-interactive.c:891
#, c-format
msgid "could not stage '%s'"
msgstr "無法暫存「%s」"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
msgid "could not write index"
msgstr "無法寫入索引"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:712 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "已更新 %d 個路徑\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:730 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "注意：%s 現已不再追蹤。\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
+#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "「%s」路徑執行 make_cache_entry 失敗"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:765 git-add--interactive.perl:653
msgid "Revert"
msgstr "還原"
-#: add-interactive.c:775
+#: add-interactive.c:781
msgid "Could not parse HEAD^{tree}"
msgstr "不能解析 HEAD^{樹}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:819 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "還原了 %d 個路徑\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:870 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "沒有未追蹤的檔案。\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:874 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "新增未追蹤的"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:901 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "增加了 %d 個路徑\n"
-#: add-interactive.c:925
+#: add-interactive.c:931
#, c-format
msgid "ignoring unmerged: %s"
msgstr "忽略未合併：%s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "只有二進位檔案被修改。\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "沒有修改。\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:949 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "修補檔更新"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:988 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "檢視 diff"
-#: add-interactive.c:1010
+#: add-interactive.c:1016
msgid "show paths with changes"
msgstr "顯示有變更的路徑"
-#: add-interactive.c:1012
+#: add-interactive.c:1018
msgid "add working tree state to the staged set of changes"
msgstr "加入工作區狀態至暫存列表"
-#: add-interactive.c:1014
+#: add-interactive.c:1020
msgid "revert staged set of changes back to the HEAD version"
msgstr "還原修改的暫存集至 HEAD 版本"
-#: add-interactive.c:1016
+#: add-interactive.c:1022
msgid "pick hunks and update selectively"
msgstr "挑選區塊並選擇性更新"
-#: add-interactive.c:1018
+#: add-interactive.c:1024
msgid "view diff between HEAD and index"
msgstr "檢視 HEAD 及索引之間的差異"
-#: add-interactive.c:1020
+#: add-interactive.c:1026
msgid "add contents of untracked files to the staged set of changes"
msgstr "加入未追蹤檔案的內容至暫存列表"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1034 add-interactive.c:1083
msgid "Prompt help:"
msgstr "提示說明："
-#: add-interactive.c:1030
+#: add-interactive.c:1036
msgid "select a single item"
msgstr "選擇單一項目"
-#: add-interactive.c:1032
+#: add-interactive.c:1038
msgid "select a range of items"
msgstr "選擇項目範圍"
-#: add-interactive.c:1034
+#: add-interactive.c:1040
msgid "select multiple ranges"
msgstr "選擇多個範圍"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1042 add-interactive.c:1087
msgid "select item based on unique prefix"
msgstr "基於唯一前綴選擇項目"
-#: add-interactive.c:1038
+#: add-interactive.c:1044
msgid "unselect specified items"
msgstr "取消選擇指定項目"
-#: add-interactive.c:1040
+#: add-interactive.c:1046
msgid "choose all items"
msgstr "選擇所有項目"
-#: add-interactive.c:1042
+#: add-interactive.c:1048
msgid "(empty) finish selecting"
msgstr "（空）完成選取"
-#: add-interactive.c:1079
+#: add-interactive.c:1085
msgid "select a numbered item"
msgstr "選擇編號過的項目"
-#: add-interactive.c:1083
+#: add-interactive.c:1089
msgid "(empty) select nothing"
msgstr "（空）全不選取"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** 指令 ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "請選擇"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "staged"
msgstr "快取"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "unstaged"
msgstr "未快取"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
+#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
+#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
+#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
#: git-add--interactive.perl:213
msgid "path"
msgstr "路徑"
-#: add-interactive.c:1151
+#: add-interactive.c:1157
msgid "could not refresh index"
msgstr "無法重新整理索引"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "再見。\n"
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "暫存模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "暫存刪除變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "暫存新增變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "
@@ -283,22 +283,22 @@
"a - 暫存此區塊和本檔案中後面的全部區塊\n"
"d - 不暫存此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "儲藏刪除變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "儲藏新增變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? "
@@ -323,22 +323,22 @@
"a - 儲藏此區塊和本檔案中後面的全部區塊\n"
"d - 不儲藏此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "取消暫存刪除變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "取消暫存新增變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "
@@ -363,22 +363,22 @@
"a - 不暫存此區塊和本檔案中後面的全部區塊\n"
"d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "將刪除變更套用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "套用新增變更至索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "
@@ -403,26 +403,26 @@
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "從工作區中捨棄刪除變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "放棄工作目錄的新增變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
@@ -447,22 +447,22 @@
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "放棄索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
@@ -481,22 +481,22 @@
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "將刪除變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "套用索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? "
@@ -539,24 +539,24 @@
msgid "could not parse colored hunk header '%.*s'"
msgstr "無法解析上色過的區塊標頭 '%.*s'"
-#: add-patch.c:420
+#: add-patch.c:431
msgid "could not parse diff"
msgstr "無法解析差異 (diff)"
-#: add-patch.c:439
+#: add-patch.c:450
msgid "could not parse colored diff"
msgstr "無法解析上色過的差異 (diff)"
-#: add-patch.c:453
+#: add-patch.c:464
#, c-format
msgid "failed to run '%s'"
msgstr "無法執行 '%s'"
-#: add-patch.c:612
+#: add-patch.c:618
msgid "mismatched output from interactive.diffFilter"
msgstr "interactive.diffFilter 的輸出不符"
-#: add-patch.c:613
+#: add-patch.c:619
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -564,7 +564,7 @@
"您的過濾器必須在其輸入及輸出行\n"
"維持一對一的對應關係。"
-#: add-patch.c:791
+#: add-patch.c:797
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -573,7 +573,7 @@
"應有上下文行 #%d 於\n"
"%.*s"
-#: add-patch.c:806
+#: add-patch.c:812
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -586,11 +586,11 @@
"\t不以下述結尾：\n"
"%.*s"
-#: add-patch.c:1082 git-add--interactive.perl:1115
+#: add-patch.c:1088 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"
-#: add-patch.c:1086
+#: add-patch.c:1092
#, c-format
msgid ""
"---\n"
@@ -604,7 +604,7 @@
"以 %c 開始的行將被刪除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1100 git-add--interactive.perl:1129
+#: add-patch.c:1106 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -614,11 +614,11 @@
"若刪掉此區塊的全部內容，則會中止\n"
"本次編輯，區塊則不會被修改。\n"
-#: add-patch.c:1133
+#: add-patch.c:1139
msgid "could not parse hunk header"
msgstr "無法解析區塊標頭"
-#: add-patch.c:1178
+#: add-patch.c:1184
msgid "'git apply --cached' failed"
msgstr "「git apply --cached」失敗"
@@ -634,24 +634,24 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1253 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? "
-#: add-patch.c:1290
+#: add-patch.c:1296
msgid "The selected hunks do not apply to the index!"
msgstr "選取的區塊不會套用進索引！"
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
-msgstr "無論如何都要套用到工作區嗎？"
+msgstr "無論如何都要套用到工作區嗎？ "
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1304 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "未套用。\n"
-#: add-patch.c:1355
+#: add-patch.c:1361
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -668,77 +668,77 @@
"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n"
"K - 維持此區塊未決狀態，檢視上一個區塊\n"
"g - 選擇要跳轉至的區塊\n"
-"/ - 尋找符合提供之正規表示式的區塊\n"
+"/ - 尋找符合提供之常規表示式的區塊\n"
"s - 分割目前區塊為更小的區塊\n"
"e - 手動編輯目前區塊\n"
"? - 顯示說明\n"
-#: add-patch.c:1517 add-patch.c:1527
+#: add-patch.c:1523 add-patch.c:1533
msgid "No previous hunk"
msgstr "沒有上一個區塊"
-#: add-patch.c:1522 add-patch.c:1532
+#: add-patch.c:1528 add-patch.c:1538
msgid "No next hunk"
msgstr "沒有下一個區塊"
-#: add-patch.c:1538
+#: add-patch.c:1544
msgid "No other hunks to goto"
msgstr "沒有其它可供跳轉的區塊"
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1555 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ "
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1556 git-add--interactive.perl:1610
msgid "go to which hunk? "
-msgstr "跳轉到哪個區塊？"
+msgstr "跳轉到哪個區塊？ "
-#: add-patch.c:1561
+#: add-patch.c:1567
#, c-format
msgid "Invalid number: '%s'"
msgstr "無效數字：'%s'"
-#: add-patch.c:1566
+#: add-patch.c:1572
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "對不起，只有 %d 個可用區塊。"
-#: add-patch.c:1575
+#: add-patch.c:1581
msgid "No other hunks to search"
msgstr "沒有其它可供尋找的區塊"
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1587 git-add--interactive.perl:1663
msgid "search for regex? "
-msgstr "使用正規表示式搜尋？"
+msgstr "使用常規表示式搜尋？ "
-#: add-patch.c:1596
+#: add-patch.c:1602
#, c-format
msgid "Malformed search regexp %s: %s"
-msgstr "錯誤的正規表示式 %s：%s"
+msgstr "錯誤的常規表示式 %s：%s"
-#: add-patch.c:1613
+#: add-patch.c:1619
msgid "No hunk matches the given pattern"
msgstr "沒有和提供模式相符合的區塊"
-#: add-patch.c:1620
+#: add-patch.c:1626
msgid "Sorry, cannot split this hunk"
msgstr "對不起，不能分割這個區塊"
-#: add-patch.c:1624
+#: add-patch.c:1630
#, c-format
msgid "Split into %d hunks."
msgstr "分割為 %d 個區塊。"
-#: add-patch.c:1628
+#: add-patch.c:1634
msgid "Sorry, cannot edit this hunk"
msgstr "對不起，不能編輯這個區塊"
-#: add-patch.c:1680
+#: add-patch.c:1686
msgid "'git apply' failed"
msgstr "'git apply' 失敗"
-#: advice.c:145
+#: advice.c:81
#, c-format
msgid ""
"\n"
@@ -747,37 +747,37 @@
"\n"
"請使用「git config advice.%s false」來停用此訊息"
-#: advice.c:161
+#: advice.c:97
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示：%.*s%s\n"
-#: advice.c:252
+#: advice.c:181
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "無法揀選，因為您有未合併的檔案。"
-#: advice.c:254
+#: advice.c:183
msgid "Committing is not possible because you have unmerged files."
msgstr "無法提交，因為您有未合併的檔案。"
-#: advice.c:256
+#: advice.c:185
msgid "Merging is not possible because you have unmerged files."
msgstr "無法合併，因為您有未合併的檔案。"
-#: advice.c:258
+#: advice.c:187
msgid "Pulling is not possible because you have unmerged files."
msgstr "無法拉取，因為您有未合併的檔案。"
-#: advice.c:260
+#: advice.c:189
msgid "Reverting is not possible because you have unmerged files."
msgstr "無法還原提交，因為您有未合併的檔案。"
-#: advice.c:262
+#: advice.c:191
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "無法 %s，因為您有未合併的檔案。"
-#: advice.c:270
+#: advice.c:199
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."
@@ -785,38 +785,48 @@
"請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"
"解決方案並提交。"
-#: advice.c:278
+#: advice.c:207
msgid "Exiting because of an unresolved conflict."
msgstr "因為存在未解決的衝突而離開。"
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:212 builtin/merge.c:1388
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"
-#: advice.c:285
+#: advice.c:214
msgid "Please, commit your changes before merging."
msgstr "請在合併前先提交您的修改。"
-#: advice.c:286
+#: advice.c:215
msgid "Exiting because of unfinished merge."
msgstr "因為存在未完成的合併而離開。"
-#: advice.c:296
+#: advice.c:220
+msgid "Not possible to fast-forward, aborting."
+msgstr "無法快轉，終止。"
+
+#: advice.c:230
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"下列路徑規格不符合任何適合路徑，\n"
-"但符合目前稀疏簽出外的索引項目：\n"
+"下列路徑和（或）路徑規格\n"
+"符合稀疏簽出定義外且存在的路徑，\n"
+"所以不會在索引中更新：\n"
-#: advice.c:303
+#: advice.c:237
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
-msgstr "若有意更新這些項目，請停用或修改稀疏規則。"
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
+msgstr ""
+"如果您執意要更新這些項目，請試試以下任一方式：\n"
+"* 使用 --sparse 選項。\n"
+"* 停用或修改稀疏規則。"
-#: advice.c:310
+#: advice.c:245
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -840,20 +850,20 @@
msgstr ""
"注意：正在切換到 '%s'。\n"
"\n"
-"您正處於分離開頭指標狀態。您可以檢視、做實驗性的修改及提交，並且您可以在切"
-"換\n"
-"回一個分支時，捨棄在此狀態下所做的提交而不對分支造成影響。\n"
+"您正處於分離開頭指標狀態。您可以檢視、進行實驗性修改並提交，\n"
+"而且您可以在切換回一個分支時，\n"
+"捨棄在此狀態下所做的提交而不對分支造成影響。\n"
"\n"
-"如果您想要透過建立分支來保留在此狀態下所做的提交，您可以透過在 switch 指令\n"
-"中新增參數 -c 來實現（現在或稍後）。例如：\n"
+"如果您想要透過建立分支來保留在此狀態下所做的提交，\n"
+"您可以現在或稍後在 switch 指令使用 -c 選項。例如：\n"
"\n"
-" git switch -c <新分支名>\n"
+" git switch -c <新分支名稱>\n"
"\n"
-"或者復原此動作：\n"
+"或者是復原此動作：\n"
"\n"
" git switch -\n"
"\n"
-"透過將設定變數 advice.detachedHead 設定為 false 來關閉此建議\n"
+"將組態變數 advice.detachedHead 設定為 false，即可關閉本建議\n"
"\n"
#: alias.c:50
@@ -874,68 +884,83 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "無法識別的空白字元忽略選項 '%s'"
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject 和 --3way 不能同時使用。"
+#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
+#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
+#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
+#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
+#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
+#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
+#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
+#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
+#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
+#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
+#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
+#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
+#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
+#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
+#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
+#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
+#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
+#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
+#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
+#: builtin/worktree.c:779
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "不能同時使用 '%s' 和 '%s' 選項"
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way 在版本庫之外"
+#: apply.c:141 apply.c:152 apply.c:155
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' 在版本庫之外"
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index 在版本庫之外"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached 在版本庫之外"
-
-#: apply.c:800
+#: apply.c:807
#, c-format
msgid "Cannot prepare timestamp regexp %s"
-msgstr "無法準備時間戳正規表示式 %s"
+msgstr "無法準備時間戳常規表示式 %s"
-#: apply.c:809
+#: apply.c:816
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d，輸入為：%s"
-#: apply.c:883
+#: apply.c:890
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在修補檔的第 %d 行找到檔案名"
-#: apply.c:921
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s"
-#: apply.c:927
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案名不一致"
-#: apply.c:928
+#: apply.c:935
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案名不一致"
-#: apply.c:933
+#: apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null"
-#: apply.c:962
+#: apply.c:969
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "第 %d 行包含無效檔案模式：%s"
-#: apply.c:1281
+#: apply.c:1288
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "不一致的檔案頭，%d 行和 %d 行"
-#: apply.c:1371
+#: apply.c:1378
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -945,91 +970,91 @@
"components (line %d)"
msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）"
-#: apply.c:1384
+#: apply.c:1391
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的標頭訊息中缺乏檔案名訊息（第 %d 行）"
-#: apply.c:1480
+#: apply.c:1487
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount：意外的行：%.*s"
-#: apply.c:1549
+#: apply.c:1556
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的修補檔區塊沒有標頭訊息：%.*s"
-#: apply.c:1752
+#: apply.c:1759
msgid "new file depends on old contents"
msgstr "新檔案依賴舊內容"
-#: apply.c:1754
+#: apply.c:1761
msgid "deleted file still has contents"
msgstr "刪除的檔案仍有內容"
-#: apply.c:1788
+#: apply.c:1795
#, c-format
msgid "corrupt patch at line %d"
msgstr "修補檔在第 %d 行發現損壞"
-#: apply.c:1825
+#: apply.c:1832
#, c-format
msgid "new file %s depends on old contents"
msgstr "新檔案 %s 依賴舊內容"
-#: apply.c:1827
+#: apply.c:1834
#, c-format
msgid "deleted file %s still has contents"
msgstr "刪除的檔案 %s 仍有內容"
-#: apply.c:1830
+#: apply.c:1837
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：檔案 %s 成為空檔案但並未刪除"
-#: apply.c:1977
+#: apply.c:1985
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二進位修補檔在第 %d 行損壞：%.*s"
-#: apply.c:2014
+#: apply.c:2022
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "無法識別的二進位修補檔位於第 %d 行"
-#: apply.c:2176
+#: apply.c:2184
#, c-format
msgid "patch with only garbage at line %d"
msgstr "修補檔案的第 %d 行只有垃圾資料"
-#: apply.c:2262
+#: apply.c:2270
#, c-format
msgid "unable to read symlink %s"
msgstr "無法讀取符號連結 %s"
-#: apply.c:2266
+#: apply.c:2274
#, c-format
msgid "unable to open or read %s"
msgstr "不能開啟或讀取 %s"
-#: apply.c:2935
+#: apply.c:2943
#, c-format
msgid "invalid start of line: '%c'"
msgstr "無效的行首字元：'%c'"
-#: apply.c:3056
+#: apply.c:3064
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）。"
-#: apply.c:3068
+#: apply.c:3076
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊"
-#: apply.c:3074
+#: apply.c:3082
#, c-format
msgid ""
"while searching for:\n"
@@ -1038,477 +1063,476 @@
"當查詢：\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3104
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺少 '%s' 的二進位修補檔資料"
-#: apply.c:3104
+#: apply.c:3112
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔"
-#: apply.c:3151
+#: apply.c:3159
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔"
-#: apply.c:3162
+#: apply.c:3170
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。"
-#: apply.c:3170
+#: apply.c:3178
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案"
-#: apply.c:3188
+#: apply.c:3196
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s"
-#: apply.c:3201
+#: apply.c:3209
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二進位修補檔未套用到 '%s'"
-#: apply.c:3208
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）"
-#: apply.c:3229
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打修補檔失敗：%s:%ld"
-#: apply.c:3352
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr "不能簽出 %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
+#: setup.c:310
#, c-format
msgid "failed to read %s"
msgstr "無法讀取 %s"
-#: apply.c:3412
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "讀取位於符號連結中的 '%s'"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3449 apply.c:3721
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路徑 %s 已經被重新命名/刪除"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3559 apply.c:3736
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在於索引中"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3568 apply.c:3744 apply.c:3960
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不符合"
-#: apply.c:3571
+#: apply.c:3605
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "版本庫缺少用來進行三方合併所需要的資料物件。"
-#: apply.c:3574
+#: apply.c:3608
#, c-format
msgid "Performing three-way merge...\n"
msgstr "正在進行三方合併⋯⋯\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3624 apply.c:3628
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "無法讀取 '%s' 的目前內容"
-#: apply.c:3606
+#: apply.c:3640
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "無法進行三方合併⋯⋯\n"
-#: apply.c:3620
+#: apply.c:3654
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "套用修補檔到 '%s' 存在衝突。\n"
-#: apply.c:3625
+#: apply.c:3659
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功套用修補檔到 '%s'。\n"
-#: apply.c:3642
+#: apply.c:3676
#, c-format
msgid "Falling back to direct application...\n"
msgstr "回復至直接套用模式⋯⋯\n"
-#: apply.c:3654
+#: apply.c:3688
msgid "removal patch leaves file contents"
msgstr "移除修補檔仍留下了檔案內容"
-#: apply.c:3727
+#: apply.c:3761
#, c-format
msgid "%s: wrong type"
msgstr "%s：錯誤類型"
-#: apply.c:3729
+#: apply.c:3763
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的類型是 %o，應為 %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
+#: read-cache.c:1399
#, c-format
msgid "invalid path '%s'"
msgstr "無效路徑 '%s'"
-#: apply.c:3952
+#: apply.c:3958
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已經存在於索引中"
-#: apply.c:3956
+#: apply.c:3962
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已經存在於工作區中"
-#: apply.c:3976
+#: apply.c:3982
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合"
-#: apply.c:3981
+#: apply.c:3987
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合"
-#: apply.c:4001
+#: apply.c:4007
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影響的檔案 '%s' 位於符號連結中"
-#: apply.c:4005
+#: apply.c:4011
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：修補檔未套用"
-#: apply.c:4020
+#: apply.c:4026
#, c-format
msgid "Checking patch %s..."
msgstr "正在檢查修補檔 %s..."
-#: apply.c:4112
+#: apply.c:4118
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模組 %s 的 sha1 訊息缺少或無效"
-#: apply.c:4119
+#: apply.c:4125
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式變更，但它不在目前 HEAD 中"
-#: apply.c:4122
+#: apply.c:4128
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 訊息缺少或無效（%s）。"
-#: apply.c:4131
+#: apply.c:4137
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在暫時索引中新增 %s"
-#: apply.c:4141
+#: apply.c:4147
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把暫時索引寫入到 %s"
-#: apply.c:4279
+#: apply.c:4285
#, c-format
msgid "unable to remove %s from index"
msgstr "不能從索引中移除 %s"
-#: apply.c:4313
+#: apply.c:4319
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模組 %s 損壞的修補檔"
-#: apply.c:4319
+#: apply.c:4325
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能對建立檔案 '%s' 呼叫 stat"
-#: apply.c:4327
+#: apply.c:4333
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能為建立檔案 %s 建立後端儲存"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4339 apply.c:4484
#, c-format
msgid "unable to add cache entry for %s"
msgstr "無法為 %s 新增快取條目"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "寫入 '%s' 失敗"
-#: apply.c:4380
+#: apply.c:4386
#, c-format
msgid "closing file '%s'"
msgstr "關閉檔案 '%s'"
-#: apply.c:4450
+#: apply.c:4456
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能寫入檔案 '%s' 權限 %o"
-#: apply.c:4548
+#: apply.c:4554
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功套用修補檔 %s。"
-#: apply.c:4556
+#: apply.c:4562
msgid "internal error"
msgstr "內部錯誤"
-#: apply.c:4559
+#: apply.c:4565
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."
-#: apply.c:4570
+#: apply.c:4576
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 檔案名為 %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4584
#, c-format
msgid "cannot open %s"
msgstr "不能開啟 %s"
-#: apply.c:4592
+#: apply.c:4598
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "成功套用第 #%d 個區塊。"
-#: apply.c:4596
+#: apply.c:4602
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒絕第 #%d 個區塊。"
-#: apply.c:4725
+#: apply.c:4731
#, c-format
msgid "Skipped patch '%s'."
msgstr "略過修補檔 '%s'。"
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "無法識別的輸入"
+#: apply.c:4740
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "輸入中沒有有效的修補檔內容（傳入「--allow-empty」允許）"
-#: apply.c:4753
+#: apply.c:4761
msgid "unable to read index file"
msgstr "無法讀取索引檔案"
-#: apply.c:4910
+#: apply.c:4918
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能開啟修補檔 '%s'：%s"
-#: apply.c:4937
+#: apply.c:4945
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 個空白字元誤用"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4951 apply.c:4966
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字元誤用。"
-#: apply.c:4951
+#: apply.c:4959
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修復空白錯誤後，套用了 %d 行。"
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "無法寫入新索引檔案"
-#: apply.c:4995
+#: apply.c:5003
msgid "don't apply changes matching the given path"
msgstr "不要套用符合提供路徑的變更"
-#: apply.c:4998
+#: apply.c:5006
msgid "apply changes matching the given path"
msgstr "套用符合提供路徑的變更"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5008 builtin/am.c:2379
msgid "num"
msgstr "數字"
-#: apply.c:5001
+#: apply.c:5009
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線"
-#: apply.c:5004
+#: apply.c:5012
msgid "ignore additions made by the patch"
msgstr "忽略修補檔中的新增的檔案"
-#: apply.c:5006
+#: apply.c:5014
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）"
-#: apply.c:5010
+#: apply.c:5018
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十進位數顯示新增和刪除的行數"
-#: apply.c:5012
+#: apply.c:5020
msgid "instead of applying the patch, output a summary for the input"
msgstr "不套用修補檔，而是顯示輸入的概要"
-#: apply.c:5014
+#: apply.c:5022
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不套用修補檔，而是檢視修補檔是否可套用"
-#: apply.c:5016
+#: apply.c:5024
msgid "make sure the patch is applicable to the current index"
msgstr "確認修補檔可以套用到目前索引"
-#: apply.c:5018
+#: apply.c:5026
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"
-#: apply.c:5020
+#: apply.c:5028
msgid "apply a patch without touching the working tree"
msgstr "套用修補檔而不修改工作區"
-#: apply.c:5022
+#: apply.c:5030
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作區之外檔案的修補檔"
-#: apply.c:5025
+#: apply.c:5033
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）"
-#: apply.c:5027
+#: apply.c:5035
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式"
-#: apply.c:5029
+#: apply.c:5037
msgid "build a temporary index based on embedded index information"
msgstr "建立一個暫時索引基於嵌入的索引訊息"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5040 builtin/checkout-index.c:230
msgid "paths are separated with NUL character"
msgstr "路徑以 NUL 字元分隔"
-#: apply.c:5034
+#: apply.c:5042
msgid "ensure at least <n> lines of context match"
msgstr "確保至少符合 <n> 行上下文"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
+#: builtin/rebase.c:1079
msgid "action"
msgstr "動作"
-#: apply.c:5036
+#: apply.c:5044
msgid "detect new or modified lines that have whitespace errors"
msgstr "檢查新增和修改的行中間的空白字元濫用"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5047 apply.c:5050
msgid "ignore changes in whitespace when finding context"
msgstr "尋找上下文時忽略空白字元的變更"
-#: apply.c:5045
+#: apply.c:5053
msgid "apply the patch in reverse"
msgstr "反向套用修補檔"
-#: apply.c:5047
+#: apply.c:5055
msgid "don't expect at least one line of context"
msgstr "無需至少一行上下文"
-#: apply.c:5049
+#: apply.c:5057
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中"
-#: apply.c:5051
+#: apply.c:5059
msgid "allow overlapping hunks"
msgstr "允許重疊的修補檔區塊"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "詳細輸出"
-
-#: apply.c:5054
+#: apply.c:5062
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允許不正確的檔案末尾換行符號"
-#: apply.c:5057
+#: apply.c:5065
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任修補檔區塊的標頭訊息中的行號"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5067 builtin/am.c:2367
msgid "root"
msgstr "根目錄"
-#: apply.c:5060
+#: apply.c:5068
msgid "prepend <root> to all filenames"
msgstr "為所有檔案名前新增 <根目錄>"
-#: archive-tar.c:125 archive-zip.c:345
+#: apply.c:5071
+msgid "don't return error for empty patches"
+msgstr "遇到空白修補檔時不回傳錯誤"
+
+#: archive-tar.c:125 archive-zip.c:346
#, c-format
msgid "cannot stream blob %s"
msgstr "不能開啟資料物件 %s"
-#: archive-tar.c:265 archive-zip.c:358
+#: archive-tar.c:265 archive-zip.c:359
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "不支援的檔案模式：0%o (SHA1: %s)"
-#: archive-tar.c:450
+#: archive-tar.c:447
#, c-format
msgid "unable to start '%s' filter"
msgstr "無法啟動 '%s' 過濾器"
-#: archive-tar.c:453
+#: archive-tar.c:450
msgid "unable to redirect descriptor"
msgstr "無法重定向描述符"
-#: archive-tar.c:460
+#: archive-tar.c:457
#, c-format
msgid "'%s' filter reported error"
msgstr "'%s' 過濾器報告了錯誤"
-#: archive-zip.c:318
+#: archive-zip.c:319
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "路徑不是有效的 UTF-8：%s"
-#: archive-zip.c:322
+#: archive-zip.c:323
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
#, c-format
msgid "deflate error (%d)"
msgstr "壓縮錯誤 (%d)"
-#: archive-zip.c:603
+#: archive-zip.c:604
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "對於本系統時間戳太大：%<PRIuMAX>"
@@ -1517,10 +1541,6 @@
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>...]"
@@ -1531,142 +1551,138 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <版本庫> [--exec <命令>] --list"
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:579
#, c-format
-msgid "cannot read %s"
-msgstr "不能讀取 %s"
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
msgstr "不能讀取 '%s'"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路徑規格 '%s' 未符合任何檔案"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "無此引用：%.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "不是一個有效的物件名：%s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "不是一個樹狀物件：%s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "目前工作目錄未被追蹤"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "找不到檔案：%s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "不是一般檔案：%s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "格式"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "歸檔格式"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1809
msgid "prefix"
msgstr "前綴"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "為歸檔中每個路徑名加上前綴"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
+#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
msgid "file"
msgstr "檔案"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "將未追蹤檔案加入歸檔"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "歸檔寫入此檔案"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "讀取工作區中的 .gitattributes"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "在標準錯誤上報告歸檔檔案"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "設定壓縮級別"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "列出支援的歸檔格式"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
+#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
msgid "repo"
msgstr "版本庫"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
msgid "command"
msgstr "指令"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "遠端 git-upload-archive 指令的路徑"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "未知參數 --remote"
-#: archive.c:581
-msgid "Option --exec can only be used together with --remote"
-msgstr "選項 --exec 只能和 --remote 同時使用"
+#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
+#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
+#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
+#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
+#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
+#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "「%s」選項需要「%s」"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "未知參數 --output"
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "--add-file 和 --remote 選項不能同時使用"
-
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知歸檔格式 '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "參數不支援此格式 '%s'：-%d"
@@ -1689,22 +1705,22 @@
"反向模式在 git attributes 中被忽略\n"
"當字串確定要以驚嘆號開始時，使用 '\\!'。"
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "檔案 '%s' 包含錯誤的引用格式：%s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我們無法進行更多的二分搜尋！\n"
-#: bisect.c:766
+#: bisect.c:765
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一個有效的提交名 %s"
-#: bisect.c:791
+#: bisect.c:790
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1713,7 +1729,7 @@
"合併基礎 %s 是壞的。\n"
"這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"
-#: bisect.c:796
+#: bisect.c:795
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1722,7 +1738,7 @@
"合併基礎 %s 是新的。\n"
"介於 %s 和 [%s] 之間的屬性已經被修改。\n"
-#: bisect.c:801
+#: bisect.c:800
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1731,7 +1747,7 @@
"合併基礎 %s 是 %s。\n"
"這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n"
-#: bisect.c:809
+#: bisect.c:808
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1742,7 +1758,7 @@
"這種情況下 git 二分搜尋無法正常工作。\n"
"您可能弄錯了 %s 和 %s 版本？\n"
-#: bisect.c:822
+#: bisect.c:821
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1753,36 +1769,36 @@
"所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n"
"我們仍舊繼續。"
-#: bisect.c:861
+#: bisect.c:860
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分搜尋中：合併基礎必須是經過測試的\n"
-#: bisect.c:911
+#: bisect.c:910
#, c-format
msgid "a %s revision is needed"
msgstr "需要一個 %s 版本"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:940
#, c-format
msgid "could not create file '%s'"
msgstr "不能建立檔案 '%s'"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:986 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "不能讀取檔案 '%s'"
-#: bisect.c:1027
+#: bisect.c:1026
msgid "reading bisect refs failed"
msgstr "讀取二分搜尋引用失敗"
-#: bisect.c:1057
+#: bisect.c:1056
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同時為 %s 和 %s\n"
-#: bisect.c:1066
+#: bisect.c:1065
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1791,7 +1807,7 @@
"沒找到能夠測試的提交。\n"
"可能是執行傳入的路徑引數是錯誤的？\n"
-#: bisect.c:1095
+#: bisect.c:1094
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1800,138 +1816,166 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1100
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "二分搜尋中：在此之後，還剩 %d 個版本待測試 %s\n"
-#: blame.c:2776
+#: blame.c:2773
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: blame.c:2790
+#: blame.c:2787
msgid "cannot use --contents with final commit object name"
msgstr "不能將 --contents 和最終的提交物件名共用"
-#: blame.c:2811
+#: blame.c:2808
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
+#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
+#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
+#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
+#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "版本遍歷設定失敗"
-#: blame.c:2838
+#: blame.c:2835
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍"
-#: blame.c:2849
+#: blame.c:2846
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中無此路徑 %1$s"
-#: blame.c:2860
+#: blame.c:2857
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能為路徑 %2$s 讀取資料物件 %1$s"
-#: branch.c:53
-#, c-format
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr ""
-"\n"
-"在修復錯誤後，您可以嘗試修改遠端追蹤分支，透過執行指令\n"
-"\"git branch --set-upstream-to=%s%s%s\" 。"
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "未設定分支 %s 作為它自己的上游。"
-
#: branch.c:93
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr "分支 '%1$s' 設定為使用重定基底來追蹤來自 '%3$s' 的遠端分支 '%2$s'。"
-
-#: branch.c:94
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "分支 '%1$s' 設定為追蹤來自 '%3$s' 的遠端分支 '%2$s'。"
-
-#: branch.c:98
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "分支 '%s' 設定為使用重定基底來追蹤本機分支 '%s'。"
-
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "分支 '%s' 設定為追蹤本機分支 '%s'。"
+msgid ""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
+msgstr "請求重定基底時，無法繼承多個參照的上游追蹤設定"
#: branch.c:104
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr "分支 '%s' 設定為使用重定基底來追蹤遠端引用 '%s'。"
+msgid "not setting branch '%s' as its own upstream"
+msgstr "未將「%s」分支設定為其自己的上游"
-#: branch.c:105
+#: branch.c:160
#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "分支 '%s' 設定為追蹤遠端引用 '%s'。"
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "已將「%s」分支設定為透過重定基底追蹤「%s」。"
-#: branch.c:109
+#: branch.c:161
#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr "分支 '%s' 設定為使用重定基底來追蹤本機引用 '%s'。"
+msgid "branch '%s' set up to track '%s'."
+msgstr "已將「%s」分支設定為追蹤「%s」。"
-#: branch.c:110
+#: branch.c:164
#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "分支 '%s' 設定為追蹤本機引用 '%s'。"
+msgid "branch '%s' set up to track:"
+msgstr "「%s」分支已設定追蹤："
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
+#: branch.c:176
+msgid "unable to write upstream branch configuration"
msgstr "無法寫入上游分支設定"
-#: branch.c:156
+#: branch.c:178
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
+msgstr ""
+"\n"
+"修正錯誤後，您可以執行下述命令\n"
+"命令修正遠端追蹤資訊："
+
+#: branch.c:219
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "未追蹤：引用 %s 有歧義"
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr "請求繼承「%s」的追蹤設定，但未設定遠端"
-#: branch.c:189
+#: branch.c:225
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' 不是一個有效的分支名稱。"
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr "請求繼承「%s」的追蹤設定，但未設定合併設定"
-#: branch.c:208
+#: branch.c:277
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "一個分支名 '%s' 已經存在。"
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "未追蹤：「%s」引用有歧義"
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "無法強制更新目前分支。"
-
-#: branch.c:233
+# 譯者：為保證在輸出中對齊，注意調整句中空格！
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading " " space around.
+#.
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#: branch.c:289 object-name.c:464
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "無法設定追蹤訊息；起始點 '%s' 不是一個分支。"
+msgid " %s\n"
+msgstr " %s\n"
-#: branch.c:235
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#: branch.c:295
+#, c-format
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
+"有多個遠端的抓取引用規格映射到遠端追蹤引用「%s」的規格：\n"
+"%s\n"
+"這通常是設定錯誤。\n"
+"\n"
+"若要支援設定追蹤分支，請確定不同遠端的抓取引用規格\n"
+"映射到不同的追蹤命名空間。"
+
+#: branch.c:344
+#, c-format
+msgid "'%s' is not a valid branch name"
+msgstr "「%s」不是一個有效的分支名稱"
+
+#: branch.c:364
+#, c-format
+msgid "a branch named '%s' already exists"
+msgstr "已有同名「%s」分支"
+
+#: branch.c:370
+#, c-format
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "無法強制更新在「%2$s」簽出的「%1$s」分支"
+
+#: branch.c:393
+#, c-format
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr "無法設定追蹤資訊：起始點「%s」不是分支"
+
+#: branch.c:395
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "請求的上游分支 '%s' 不存在"
-#: branch.c:237
+#: branch.c:397
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1943,129 +1987,150 @@
"\"git push -u\" to set the upstream config as you push."
msgstr ""
"\n"
-"如果您正計劃基於遠端一個現存的上游分支開始你的工作，\n"
-"您可能需要執行 \"git fetch\" 來取得分支。\n"
+"如果您打算以遠端現存的上游分支為基礎進行修改，\n"
+"您或許需要執行「git fetch」取得分支。\n"
"\n"
-"如果您正計劃推送一個能與對應遠端分支建立追蹤的新的本機分支，\n"
-"您可能需要使用 \"git push -u\" 推送分支並設定和上游的關聯。"
+"如果您打算將新建立的本機分支推送至對應的遠端分支，\n"
+"且建立兩個分支間的追蹤關係，\n"
+"您可能需要使用「git push -u」推送分支並設定和上游的關聯。"
-#: branch.c:281
+#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "不是一個有效的物件名：'%s'。"
+msgid "not a valid object name: '%s'"
+msgstr "不是一個有效的物件名：'%s'"
-#: branch.c:301
+#: branch.c:465
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "歧義的物件名：'%s'。"
+msgid "ambiguous object name: '%s'"
+msgstr "物件名稱有歧義：「%s」"
-#: branch.c:306
+#: branch.c:470
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "無效的分支點：'%s'。"
+msgid "not a valid branch point: '%s'"
+msgstr "無效的分支點：「%s」"
-#: branch.c:366
+#: branch.c:658
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "「%s」子模組：找不到子模組"
+
+#: branch.c:661
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
+msgstr ""
+"您可以嘗試使用「git checkout %s && git submodule update --init」命令更新子模"
+"組"
+
+#: branch.c:672 branch.c:698
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "「%s」子模組：無法建立「%s」分支"
+
+#: branch.c:730
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已經簽出到 '%s'"
-#: branch.c:389
+#: branch.c:755
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作區 %s 的 HEAD 指向沒有被更新"
-#: bundle.c:44
+#: bundle.c:45
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
-msgstr "無法識別的包雜湊演算法：%s"
+msgstr "無法識別的套件雜湊演算法：%s"
-#: bundle.c:48
+#: bundle.c:53
#, c-format
msgid "unknown capability '%s'"
msgstr "未知功能 '%s'"
-#: bundle.c:74
+#: bundle.c:79
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' 不像是一個 v2 或 v3 版本的包檔案"
+msgstr "'%s' 不像是一個 v2 或 v3 版本的套件檔案"
-#: bundle.c:113
+#: bundle.c:118
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "無法識別的包頭：%s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
+#: builtin/commit.c:865
#, c-format
msgid "could not open '%s'"
msgstr "不能開啟 '%s'"
-#: bundle.c:198
+#: bundle.c:203
msgid "Repository lacks these prerequisite commits:"
msgstr "版本庫中缺少這些必備的提交："
-#: bundle.c:201
+#: bundle.c:206
msgid "need a repository to verify a bundle"
-msgstr "需要版本庫驗證一個包"
-
-#: bundle.c:257
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "這個包中含有這 %d 個引用："
+msgstr "需要版本庫驗證套件"
#: bundle.c:264
-msgid "The bundle records a complete history."
-msgstr "這個包記錄一個完整歷史。"
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "這個套件含有這 %<PRIuMAX> 個引用："
-#: bundle.c:266
+#: bundle.c:272
+msgid "The bundle records a complete history."
+msgstr "這個套件記錄完整歷史紀錄。"
+
+#: bundle.c:274
#, c-format
msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "這個包需要這 %d 個引用："
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "這個套件需要這 %<PRIuMAX> 個引用："
-#: bundle.c:333
+#: bundle.c:350
msgid "unable to dup bundle descriptor"
-msgstr "無法複製 bundle 描述符"
+msgstr "無法複製套件描述符"
-#: bundle.c:340
+#: bundle.c:357
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 進程"
-#: bundle.c:351
+#: bundle.c:368
msgid "pack-objects died"
msgstr "pack-objects 終止"
-#: bundle.c:400
+#: bundle.c:417
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 選項排除"
-#: bundle.c:504
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "不支援的包版本 %d"
-
-#: bundle.c:506
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "無法寫入 %2$s 演算法的包版本 %1$d"
-
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
#, c-format
msgid "unrecognized argument: %s"
msgstr "無法識別的參數：%s"
-#: bundle.c:553
-msgid "Refusing to create empty bundle."
-msgstr "不能建立空包。"
+#: bundle.c:548
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "不支援的套件版本 %d"
-#: bundle.c:563
+#: bundle.c:550
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "無法寫入 %2$s 演算法的套件版本 %1$d"
+
+#: bundle.c:600
+msgid "Refusing to create empty bundle."
+msgstr "不能建立空套件。"
+
+#: bundle.c:610
#, c-format
msgid "cannot create '%s'"
msgstr "不能建立 '%s'"
-#: bundle.c:588
+#: bundle.c:639
msgid "index-pack died"
msgstr "index-pack 終止"
@@ -2088,12 +2153,12 @@
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "最終區塊有非零 ID %<PRIx32>"
-#: color.c:329
+#: color.c:354
#, c-format
msgid "invalid color value: %.*s"
msgstr "無效的顏色值：%.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:52
msgid "invalid hash version"
msgstr "無效的雜湊版本"
@@ -2121,232 +2186,233 @@
msgid "commit-graph file is too small to hold %u chunks"
msgstr "commit-graph 檔案不夠放置 %u 個區塊"
-#: commit-graph.c:482
+#: commit-graph.c:485
msgid "commit-graph has no base graphs chunk"
msgstr "提交圖形沒有基礎圖形區塊"
-#: commit-graph.c:492
+#: commit-graph.c:495
msgid "commit-graph chain does not match"
msgstr "提交圖形鏈不符合"
-#: commit-graph.c:540
+#: commit-graph.c:543
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"
-#: commit-graph.c:564
+#: commit-graph.c:567
msgid "unable to find all commit-graph files"
msgstr "無法找到所有提交圖形檔案"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:752 commit-graph.c:789
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "無效的提交位置。提交圖形可能已損壞"
-#: commit-graph.c:766
+#: commit-graph.c:773
#, c-format
msgid "could not find commit %s"
msgstr "無法找到提交 %s"
-#: commit-graph.c:799
+#: commit-graph.c:806
msgid "commit-graph requires overflow generation data but has none"
msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
+#: builtin/clone.c:705
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1373 builtin/pack-objects.c:3078
#, c-format
msgid "unable to get type of object %s"
msgstr "無法獲得物件 %s 類型"
-#: commit-graph.c:1368
+#: commit-graph.c:1404
msgid "Loading known commits in commit graph"
msgstr "正在載入提交圖中的已知提交"
-#: commit-graph.c:1385
+#: commit-graph.c:1421
msgid "Expanding reachable commits in commit graph"
-msgstr "正在擴展提交圖中的可以取得提交"
+msgstr "正在展開提交圖中的可以取得的提交"
-#: commit-graph.c:1405
+#: commit-graph.c:1441
msgid "Clearing commit marks in commit graph"
msgstr "正在清除提交圖中的提交標記"
-#: commit-graph.c:1424
+#: commit-graph.c:1460
msgid "Computing commit graph topological levels"
msgstr "正在計算提交圖拓樸級別"
-#: commit-graph.c:1477
+#: commit-graph.c:1513
msgid "Computing commit graph generation numbers"
msgstr "正在計算提交圖世代數字"
-#: commit-graph.c:1558
+#: commit-graph.c:1598
msgid "Computing commit changed paths Bloom filters"
msgstr "正在計算提交變更路徑的布隆過濾器"
-#: commit-graph.c:1635
+#: commit-graph.c:1675
msgid "Collecting referenced commits"
msgstr "正在收集引用提交"
-#: commit-graph.c:1660
+#: commit-graph.c:1701
#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "正在 %d 個包中尋找提交圖的提交"
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "正在從 %<PRIuMAX> 個包中尋找提交圖的提交"
-#: commit-graph.c:1673
+#: commit-graph.c:1714
#, c-format
msgid "error adding pack %s"
msgstr "新增包 %s 發生錯誤"
-#: commit-graph.c:1677
+#: commit-graph.c:1718
#, c-format
msgid "error opening index for %s"
msgstr "為 %s 開啟索引發生錯誤"
-#: commit-graph.c:1714
+#: commit-graph.c:1756
msgid "Finding commits for commit graph among packed objects"
msgstr "正在打包物件中尋找提交圖的提交"
-#: commit-graph.c:1732
+#: commit-graph.c:1774
msgid "Finding extra edges in commit graph"
msgstr "正在尋找提交圖中額外的邊"
-#: commit-graph.c:1781
+#: commit-graph.c:1823
msgid "failed to write correct number of base graph ids"
msgstr "無法寫入正確數量的基礎圖形 ID"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能為 %s 建立先導目錄"
-#: commit-graph.c:1825
+#: commit-graph.c:1868
msgid "unable to create temporary graph layer"
msgstr "無法建立暫時的圖形層"
-#: commit-graph.c:1830
+#: commit-graph.c:1873
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "無法調整「%s」的共用權限"
-#: commit-graph.c:1887
+#: commit-graph.c:1930
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "正在用 %d 步寫出提交圖"
-#: commit-graph.c:1923
+#: commit-graph.c:1967
msgid "unable to open commit-graph chain file"
msgstr "無法開啟提交圖形鏈檔案"
-#: commit-graph.c:1939
+#: commit-graph.c:1983
msgid "failed to rename base commit-graph file"
msgstr "無法重新命名基礎提交圖形檔案"
-#: commit-graph.c:1959
+#: commit-graph.c:2004
msgid "failed to rename temporary commit-graph file"
msgstr "無法重新命名暫時提交圖形檔案"
-#: commit-graph.c:2092
+#: commit-graph.c:2137
msgid "Scanning merged commits"
msgstr "正在掃描合併提交"
-#: commit-graph.c:2136
+#: commit-graph.c:2181
msgid "Merging commit-graph"
msgstr "正在合併提交圖形"
-#: commit-graph.c:2244
+#: commit-graph.c:2289
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用"
-#: commit-graph.c:2351
+#: commit-graph.c:2396
msgid "too many commits to write graph"
msgstr "提交太多不能畫圖"
-#: commit-graph.c:2449
+#: commit-graph.c:2494
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"
-#: commit-graph.c:2459
+#: commit-graph.c:2504
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2514 commit-graph.c:2529
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2521
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "無法從提交圖形中解析提交 %s"
-#: commit-graph.c:2494
+#: commit-graph.c:2539
msgid "Verifying commits in commit graph"
msgstr "正在驗證提交圖中的提交"
-#: commit-graph.c:2509
+#: commit-graph.c:2554
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr "無法從提交圖形的物件庫中解析提交 %s"
-#: commit-graph.c:2516
+#: commit-graph.c:2561
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
-#: commit-graph.c:2526
+#: commit-graph.c:2571
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "提交 %s 的提交圖形父提交列表太長了"
-#: commit-graph.c:2535
+#: commit-graph.c:2580
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s 的提交圖形父提交是 %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2594
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "提交 %s 的提交圖形父提交列表過早終止"
-#: commit-graph.c:2554
+#: commit-graph.c:2599
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"
-#: commit-graph.c:2558
+#: commit-graph.c:2603
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"
-#: commit-graph.c:2575
+#: commit-graph.c:2620
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"
-#: commit-graph.c:2581
+#: commit-graph.c:2626
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
+#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
-#: commit.c:54
+#: commit.c:56
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一個提交！"
-#: commit.c:194
+#: commit.c:197
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2366,27 +2432,27 @@
"設定 \"git config advice.graftFileDeprecated false\"\n"
"可關閉本消息"
-#: commit.c:1237
+#: commit.c:1252
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
-#: commit.c:1241
+#: commit.c:1256
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
-#: commit.c:1244
+#: commit.c:1259
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 沒有 GPG 簽名。"
-#: commit.c:1247
+#: commit.c:1262
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
-#: commit.c:1501
+#: commit.c:1516
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"
@@ -2400,7 +2466,15 @@
msgid "memory exhausted"
msgstr "記憶體耗盡"
-#: config.c:126
+#: compat/terminal.c:167
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr "無法在背景繼續；請使用 “fg” 繼續"
+
+#: compat/terminal.c:168
+msgid "cannot restore terminal settings"
+msgstr "無法復原終端機設定"
+
+#: config.c:143
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2415,333 +2489,360 @@
"\t%2$s\n"
"這可能是因為循環包含。"
-#: config.c:142
+#: config.c:159
#, c-format
msgid "could not expand include path '%s'"
-msgstr "無法擴展包含路徑 '%s'"
+msgstr "無法展開包含路徑 '%s'"
-#: config.c:153
+#: config.c:170
msgid "relative config includes must come from files"
msgstr "相對路徑的設定檔案引用必須來自於檔案"
-#: config.c:199
+#: config.c:219
msgid "relative config include conditionals must come from files"
msgstr "相對路徑的設定檔案條件引用必須來自於檔案"
-#: config.c:396
+#: config.c:364
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"無法在檔案設定遠端 URL，無論是直接或間接透過 includeIf.hasconfig:remote.*."
+"url 引入"
+
+#: config.c:508
#, c-format
msgid "invalid config format: %s"
msgstr "無效的設定檔格式：%s"
-#: config.c:400
+#: config.c:512
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "缺少「%.*s」組態設定的環境變數名稱"
-#: config.c:405
+#: config.c:517
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "缺少環境變數「%s」（於「%.*s」組態設定）"
-#: config.c:442
+#: config.c:553
#, c-format
msgid "key does not contain a section: %s"
msgstr "鍵名沒有包含一個小節名稱：%s"
-#: config.c:448
+#: config.c:558
#, c-format
msgid "key does not contain variable name: %s"
msgstr "鍵名沒有包含變數名：%s"
-#: config.c:472 sequencer.c:2785
+#: config.c:580 sequencer.c:2802
#, c-format
msgid "invalid key: %s"
msgstr "無效鍵名：%s"
-#: config.c:478
+#: config.c:585
#, c-format
msgid "invalid key (newline): %s"
msgstr "無效鍵名（有換行符號）：%s"
-#: config.c:511
+#: config.c:605
msgid "empty config key"
msgstr "空白設定鍵"
-#: config.c:529 config.c:541
+#: config.c:623 config.c:635
#, c-format
msgid "bogus config parameter: %s"
msgstr "偽設定參數：%s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:649 config.c:666 config.c:673 config.c:682
#, c-format
msgid "bogus format in %s"
msgstr "%s 中格式錯誤"
-#: config.c:622
+#: config.c:716
#, c-format
msgid "bogus count in %s"
msgstr "%s 中有偽計數"
-#: config.c:626
+#: config.c:720
#, c-format
msgid "too many entries in %s"
msgstr "%s 中的項目過多"
-#: config.c:636
+#: config.c:730
#, c-format
msgid "missing config key %s"
msgstr "缺少 %s 設定鍵"
-#: config.c:644
+#: config.c:738
#, c-format
msgid "missing config value %s"
msgstr "缺少 %s 設定值"
-#: config.c:995
+#: config.c:1089
#, c-format
msgid "bad config line %d in blob %s"
msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"
-#: config.c:999
+#: config.c:1093
#, c-format
msgid "bad config line %d in file %s"
msgstr "檔案 %2$s 中錯誤的設定行 %1$d"
-#: config.c:1003
+#: config.c:1097
#, c-format
msgid "bad config line %d in standard input"
msgstr "標準輸入中錯誤的設定行 %d"
-#: config.c:1007
+#: config.c:1101
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d"
-#: config.c:1011
+#: config.c:1105
#, c-format
msgid "bad config line %d in command line %s"
msgstr "指令列 %2$s 中錯誤的設定行 %1$d"
-#: config.c:1015
+#: config.c:1109
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中錯誤的設定行 %1$d"
-#: config.c:1152
+#: config.c:1246
msgid "out of range"
msgstr "超出範圍"
-#: config.c:1152
+#: config.c:1246
msgid "invalid unit"
msgstr "無效的單位"
-#: config.c:1153
+#: config.c:1247
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s"
-#: config.c:1163
+#: config.c:1257
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
-#: config.c:1166
+#: config.c:1260
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
-#: config.c:1169
+#: config.c:1263
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s'：%3$s"
-#: config.c:1172
+#: config.c:1266
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
-#: config.c:1175
+#: config.c:1269
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
-#: config.c:1178
+#: config.c:1272
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
-#: config.c:1257
+#: config.c:1368
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "%s 變數的值無效"
+
+#: config.c:1389
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "忽略未知的 core.fsync 組件「%s」"
+
+#: config.c:1425
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "「%2$s」的「%1$s」布林設定值無效"
-#: config.c:1275
+#: config.c:1443
#, c-format
msgid "failed to expand user dir in: '%s'"
-msgstr "無法擴展使用者目錄：'%s'"
+msgstr "無法展開使用者目錄於：’%s’"
-#: config.c:1284
+#: config.c:1452
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳"
-#: config.c:1377
+#: config.c:1545
#, c-format
msgid "abbrev length out of range: %d"
msgstr "縮寫長度超出範圍：%d"
-#: config.c:1391 config.c:1402
+#: config.c:1559 config.c:1570
#, c-format
msgid "bad zlib compression level %d"
msgstr "錯誤的 zlib 壓縮級別 %d"
-#: config.c:1494
+#: config.c:1660
msgid "core.commentChar should only be one character"
msgstr "core.commentChar 應該是一個字元"
-#: config.c:1527
+#: config.c:1692
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "忽略未知的 core.fsyncMethod 值「%s」"
+
+#: config.c:1698
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles 已被取代。請改用 core.fsync"
+
+#: config.c:1714
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "無效的物件建立模式：%s"
-#: config.c:1599
+#: config.c:1800
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式錯誤"
-#: config.c:1625
+#: config.c:1826
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式錯誤：%s"
-#: config.c:1626
+#: config.c:1827
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1888 builtin/pack-objects.c:4078
#, c-format
msgid "bad pack compression level %d"
msgstr "錯誤的打包壓縮級別 %d"
-#: config.c:1809
+#: config.c:2014
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "無法從資料物件 '%s' 載入設定"
-#: config.c:1812
+#: config.c:2017
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 沒有指向一個資料物件"
-#: config.c:1829
+#: config.c:2035
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析設定物件 '%s'"
-#: config.c:1874
+#: config.c:2080
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失敗"
-#: config.c:1930
+#: config.c:2136
msgid "unable to parse command-line config"
msgstr "無法解析指令列中的設定"
-#: config.c:2294
+#: config.c:2512
msgid "unknown error occurred while reading the configuration files"
msgstr "在讀取設定檔案時遇到未知錯誤"
-#: config.c:2468
+#: config.c:2686
#, c-format
msgid "Invalid %s: '%s'"
msgstr "無效 %s：'%s'"
-#: config.c:2513
+#: config.c:2731
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"
-#: config.c:2559
+#: config.c:2763
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "無法解析指令列設定中的 '%s'"
-#: config.c:2561
+#: config.c:2765
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"
-#: config.c:2645
+#: config.c:2850
#, c-format
msgid "invalid section name '%s'"
msgstr "無效的小節名稱 '%s'"
-#: config.c:2677
+#: config.c:2882
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多個取值"
-#: config.c:2706
+#: config.c:2911
#, c-format
msgid "failed to write new configuration file %s"
msgstr "寫入新的設定檔案 %s 失敗"
-#: config.c:2958 config.c:3285
+#: config.c:3177 config.c:3518
#, c-format
msgid "could not lock config file %s"
msgstr "不能鎖定設定檔案 %s"
-#: config.c:2969
+#: config.c:3188
#, c-format
msgid "opening %s"
msgstr "開啟 %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:3225 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "無效模式：%s"
-#: config.c:3031
+#: config.c:3250
#, c-format
msgid "invalid config file %s"
msgstr "無效的設定檔案 %s"
-#: config.c:3044 config.c:3298
+#: config.c:3263 config.c:3531
#, c-format
msgid "fstat on %s failed"
msgstr "對 %s 呼叫 fstat 失敗"
-#: config.c:3055
+#: config.c:3274
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "無法 mmap '%s'%s"
-#: config.c:3065 config.c:3303
+#: config.c:3284 config.c:3536
#, c-format
msgid "chmod on %s failed"
msgstr "對 %s 呼叫 chmod 失敗"
-#: config.c:3150 config.c:3400
+#: config.c:3369 config.c:3633
#, c-format
msgid "could not write config file %s"
msgstr "不能寫入設定檔案 %s"
-#: config.c:3184
+#: config.c:3403
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能設定 '%s' 為 '%s'"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消設定 '%s'"
-#: config.c:3276
+#: config.c:3509
#, c-format
msgid "invalid section name: %s"
msgstr "無效的小節名稱：%s"
-#: config.c:3443
+#: config.c:3676
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺少"
@@ -2775,72 +2876,72 @@
msgid "expected flush after capabilities"
msgstr "在能力之後應為一個 flush 包"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "忽略第一行 '%s' 之後的能力欄位"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "協定錯誤：意外的 capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "另一端的版本庫不能是淺複製版本庫"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "無效封包"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "協定錯誤：意外的 '%s'"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "伺服器指定的「%s」物件格式無效"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "無效的 ls-refs 回應：%s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "在引用列表之後應該有一個 flush 包"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "在引用列表後預期要有回應結束封包"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "不支援 '%s' 協定"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "無法為 socket 設定 SO_KEEPALIVE"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "尋找 %s ... "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "無法尋找 %s（埠 %s）（%s）"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2849,7 +2950,7 @@
"完成。\n"
"連線到 %s（埠 %s）... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2859,77 +2960,77 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "完成。"
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "無法尋找 %s（%s）"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "未知埠 %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "已阻止奇怪的主機名稱 '%s'"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "已阻止奇怪的埠號 '%s'"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "不能啟動代理 %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "git:// 主機名稱和版本庫路徑中不能有換行"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh 變體 'simple' 不支援 -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh 變體 'simple' 不支援 -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh 變體 'simple' 不支援設定埠"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "已阻止奇怪的路徑名 '%s'"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "無法 fork"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
msgid "Checking connectivity"
msgstr "正在檢查連通性"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "不能執行 'git rev-list'"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "寫入 rev-list 失敗"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "關閉 rev-list 的標準輸入失敗"
@@ -3069,75 +3170,75 @@
msgid "refusing to work with credential missing protocol field"
msgstr "拒絕使用缺少通訊協定欄位的憑證"
-#: credential.c:394
+#: credential.c:396
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "URL 的 %s 部分有換行：%s"
-#: credential.c:438
+#: credential.c:440
#, c-format
msgid "url has no scheme: %s"
msgstr "URL 沒有 Scheme：%s"
-#: credential.c:511
+#: credential.c:513
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "無法解析憑證 URL：%s"
-#: date.c:138
+#: date.c:139
msgid "in the future"
msgstr "在將來"
-#: date.c:144
+#: date.c:145
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "%<PRIuMAX> 秒鐘前"
-#: date.c:151
+#: date.c:152
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "%<PRIuMAX> 分鐘前"
-#: date.c:158
+#: date.c:159
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "%<PRIuMAX> 小時前"
-#: date.c:165
+#: date.c:166
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "%<PRIuMAX> 天前"
-#: date.c:171
+#: date.c:172
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> 周前"
-#: date.c:178
+#: date.c:179
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> 個月前"
-#: date.c:189
+#: date.c:190
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[0] "%<PRIuMAX> 年"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
+#: date.c:193
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s %<PRIuMAX> 個月前"
-#: date.c:197 date.c:202
+#: date.c:198 date.c:203
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
@@ -3155,40 +3256,44 @@
#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
-msgstr "未能載入 '%s' 的資料島正規表示式：%s"
+msgstr "未能載入 '%s' 的資料島常規表示式：%s"
#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
-msgstr "來自 config 的資料島正規表示式有太多的捕獲組（最多 %d 個）"
+msgstr "來自 config 的資料島常規表示式有太多的擷取群組（最多 %d 個）"
#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "已標記 %d 個資料島，結束。\n"
-#: diff-merges.c:70
+#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
+#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
+#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
+#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
+#: builtin/pull.c:47 builtin/pull.c:321
#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "--diff-merges 的值無效：%s"
+msgid "invalid value for '%s': '%s'"
+msgstr "「%s」的值無效：「%s」"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base 跟範圍無法搭配運作"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base 只能跟提交搭配才能運作"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "不能取得 HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "找不到合併基底"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "找到多個合併基底"
@@ -3203,18 +3308,18 @@
msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"
# 譯者：請維持前導空格
-#: diff.c:156
+#: diff.c:159
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 無法解析 dirstat 截止（cut-off）百分比 '%s'\n"
# 譯者：請維持前導空格
-#: diff.c:161
+#: diff.c:164
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 參數 '%s'\n"
-#: diff.c:297
+#: diff.c:300
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3222,7 +3327,7 @@
"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-"
"zebra'、'plain'"
-#: diff.c:325
+#: diff.c:328
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3231,18 +3336,18 @@
"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
-#: diff.c:333
+#: diff.c:336
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用"
-#: diff.c:410
+#: diff.c:413
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"
-#: diff.c:470
+#: diff.c:473
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3256,42 +3361,43 @@
msgid "external diff died, stopping at %s"
msgstr "外部 diff 離開，停止在 %s"
-#: diff.c:4634
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
+#: diff.c:4677 parse-options.c:1114
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "「%s」、「%s」、「%s」和「%s」選項不得同時使用"
-#: diff.c:4637
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G、-S 和 --find-object 是互斥的"
+#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "「%s」、「%s」和「%s」選項不得同時使用"
-#: diff.c:4640
+#: diff.c:4685
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」"
+
+#: diff.c:4689
+#, c-format
msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex 搭配 -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%s」"
-#: diff.c:4643
-msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr ""
-"--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all 搭配 -G 和 -S"
-
-#: diff.c:4722
+#: diff.c:4769
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明確要求只跟一個路徑規格"
-#: diff.c:4770
+#: diff.c:4823
#, c-format
msgid "invalid --stat value: %s"
msgstr "無效的 --stat 值：%s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s 期望一個數字值"
-#: diff.c:4807
+#: diff.c:4860
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3300,200 +3406,200 @@
"無法解析 --dirstat/-X 選項的參數：\n"
"%s"
-#: diff.c:4892
+#: diff.c:4893
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
-#: diff.c:4916
+#: diff.c:4917
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之後未知的值"
-#: diff.c:4930
+#: diff.c:4931
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4981 diff.c:4987
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
-#: diff.c:4998
+#: diff.c:4999
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一個字元，得到 '%s'"
-#: diff.c:5019
+#: diff.c:5020
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "壞的 --color-moved 參數：%s"
-#: diff.c:5038
+#: diff.c:5039
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws 中的無效模式 '%s'"
-#: diff.c:5078
+#: diff.c:5079
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5115 diff.c:5135
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的參數無效"
-#: diff.c:5238
+#: diff.c:5239
#, c-format
msgid "invalid regex given to -I: '%s'"
-msgstr "傳入 -I 的正規表示式無效：「%s」"
+msgstr "傳入 -I 的常規表示式無效：「%s」"
-#: diff.c:5287
+#: diff.c:5288
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "無法解析 --submodule 選項的參數：'%s'"
-#: diff.c:5343
+#: diff.c:5344
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "壞的 --word-diff 參數：%s"
-#: diff.c:5379
+#: diff.c:5380
msgid "Diff output format options"
msgstr "差異輸出格式化選項"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5382 diff.c:5388
msgid "generate patch"
msgstr "生成修補檔"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5385 builtin/log.c:180
msgid "suppress diff output"
msgstr "不顯示差異輸出"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5390 diff.c:5504 diff.c:5511
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5391 diff.c:5394
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差異"
-#: diff.c:5395
+#: diff.c:5396
msgid "generate the diff in raw format"
msgstr "生成原始格式的差異"
-#: diff.c:5398
+#: diff.c:5399
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同義"
-#: diff.c:5402
+#: diff.c:5403
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同義"
-#: diff.c:5406
+#: diff.c:5407
msgid "machine friendly --stat"
msgstr "機器友好的 --stat"
-#: diff.c:5409
+#: diff.c:5410
msgid "output only the last line of --stat"
msgstr "只輸出 --stat 的最後一行"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5412 diff.c:5420
msgid "<param1,param2>..."
msgstr "<參數1,參數2>..."
-#: diff.c:5412
+#: diff.c:5413
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "輸出每個子目錄相對變更的分布"
-#: diff.c:5416
+#: diff.c:5417
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同義"
-#: diff.c:5420
+#: diff.c:5421
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同義詞"
-#: diff.c:5424
+#: diff.c:5425
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"
-#: diff.c:5427
+#: diff.c:5428
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精簡摘要，例如建立、重新命名和模式變更"
-#: diff.c:5430
+#: diff.c:5431
msgid "show only names of changed files"
msgstr "只顯示變更檔案的檔案名"
-#: diff.c:5433
+#: diff.c:5434
msgid "show only names and status of changed files"
msgstr "只顯示變更檔案的檔案名和狀態"
-#: diff.c:5435
+#: diff.c:5436
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"
-#: diff.c:5436
+#: diff.c:5437
msgid "generate diffstat"
msgstr "生成差異統計（diffstat）"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5439 diff.c:5442 diff.c:5445
msgid "<width>"
msgstr "<寬度>"
-#: diff.c:5439
+#: diff.c:5440
msgid "generate diffstat with a given width"
msgstr "使用提供的長度生成差異統計"
-#: diff.c:5442
+#: diff.c:5443
msgid "generate diffstat with a given name width"
msgstr "使用提供的檔案名長度生成差異統計"
-#: diff.c:5445
+#: diff.c:5446
msgid "generate diffstat with a given graph width"
msgstr "使用提供的圖形長度生成差異統計"
-#: diff.c:5447
+#: diff.c:5448
msgid "<count>"
msgstr "<次數>"
-#: diff.c:5448
+#: diff.c:5449
msgid "generate diffstat with limited lines"
msgstr "生成有限行數的差異統計"
-#: diff.c:5451
+#: diff.c:5452
msgid "generate compact summary in diffstat"
msgstr "生成差異統計的簡潔摘要"
-#: diff.c:5454
+#: diff.c:5455
msgid "output a binary diff that can be applied"
msgstr "輸出一個可以套用的二進位差異"
-#: diff.c:5457
+#: diff.c:5458
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行顯示完整的前後物件名稱"
-#: diff.c:5459
+#: diff.c:5460
msgid "show colored diff"
msgstr "顯示帶顏色的差異"
-#: diff.c:5460
+#: diff.c:5461
msgid "<kind>"
msgstr "<類型>"
-#: diff.c:5461
+#: diff.c:5462
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"
-#: diff.c:5464
+#: diff.c:5465
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3501,311 +3607,311 @@
"在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"
"符"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
msgid "<prefix>"
msgstr "<前綴>"
-#: diff.c:5468
+#: diff.c:5469
msgid "show the given source prefix instead of \"a/\""
-msgstr "顯示提供的源前綴取代 \"a/\""
+msgstr "顯示提供的來源前綴，而非 \"a/\""
-#: diff.c:5471
+#: diff.c:5472
msgid "show the given destination prefix instead of \"b/\""
-msgstr "顯示提供的目標前綴取代 \"b/\""
+msgstr "顯示提供的目的地前綴取代 \"b/\""
-#: diff.c:5474
+#: diff.c:5475
msgid "prepend an additional prefix to every line of output"
msgstr "輸出的每一行附加前綴"
-#: diff.c:5477
+#: diff.c:5478
msgid "do not show any source or destination prefix"
-msgstr "不顯示任何源和目標前綴"
+msgstr "不顯示任何來源和目的地前綴"
-#: diff.c:5480
+#: diff.c:5481
msgid "show context between diff hunks up to the specified number of lines"
msgstr "顯示指定行數的差異區塊間的上下文"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5485 diff.c:5490 diff.c:5495
msgid "<char>"
msgstr "<字元>"
-#: diff.c:5485
+#: diff.c:5486
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一個字元取代 '+' 來表示新的一行"
-#: diff.c:5490
+#: diff.c:5491
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一個字元取代 '-' 來表示舊的一行"
-#: diff.c:5495
+#: diff.c:5496
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一個字元取代 ' ' 來表示一行上下文"
-#: diff.c:5498
+#: diff.c:5499
msgid "Diff rename options"
msgstr "差異重新命名選項"
-#: diff.c:5499
+#: diff.c:5500
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5501
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "將完全重寫的變更打破為成對的刪除和建立"
-#: diff.c:5504
+#: diff.c:5505
msgid "detect renames"
msgstr "檢測重新命名"
-#: diff.c:5508
+#: diff.c:5509
msgid "omit the preimage for deletes"
msgstr "省略刪除變更的差異輸出"
-#: diff.c:5511
+#: diff.c:5512
msgid "detect copies"
msgstr "檢測複製"
-#: diff.c:5515
+#: diff.c:5516
msgid "use unmodified files as source to find copies"
-msgstr "使用未修改的檔案做為發現複製的源"
+msgstr "使用未修改的檔案做為發現拷貝的來源"
-#: diff.c:5517
+#: diff.c:5518
msgid "disable rename detection"
msgstr "停用重新命名偵測"
-#: diff.c:5520
+#: diff.c:5521
msgid "use empty blobs as rename source"
-msgstr "使用空的資料物件做為重新命名的源"
+msgstr "使用空的資料物件做為重新命名的來源"
-#: diff.c:5522
+#: diff.c:5523
msgid "continue listing the history of a file beyond renames"
msgstr "繼續列出檔案重新命名以外的歷史記錄"
-#: diff.c:5525
+#: diff.c:5526
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"
-#: diff.c:5527
+#: diff.c:5528
msgid "Diff algorithm options"
msgstr "差異演算法選項"
-#: diff.c:5529
+#: diff.c:5530
msgid "produce the smallest possible diff"
msgstr "生成儘可能小的差異"
-#: diff.c:5532
+#: diff.c:5533
msgid "ignore whitespace when comparing lines"
msgstr "行比較時忽略空白字元"
-#: diff.c:5535
+#: diff.c:5536
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字元的變更"
-#: diff.c:5538
+#: diff.c:5539
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字元變更"
-#: diff.c:5541
+#: diff.c:5542
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的Enter符（CR）"
-#: diff.c:5544
+#: diff.c:5545
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的變更"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
msgid "<regex>"
msgstr "<正則>"
-#: diff.c:5547
+#: diff.c:5548
msgid "ignore changes whose all lines match <regex>"
msgstr "忽略整行符合 <regex> 的變更"
-#: diff.c:5550
+#: diff.c:5551
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "啟發式轉換差異邊界以便閱讀"
-#: diff.c:5553
+#: diff.c:5554
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "使用 \"patience diff\" 演算法生成差異"
-#: diff.c:5557
+#: diff.c:5558
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "使用 \"histogram diff\" 演算法生成差異"
-#: diff.c:5559
+#: diff.c:5560
msgid "<algorithm>"
msgstr "<演算法>"
-#: diff.c:5560
+#: diff.c:5561
msgid "choose a diff algorithm"
msgstr "選擇一個差異演算法"
-#: diff.c:5562
+#: diff.c:5563
msgid "<text>"
msgstr "<文字>"
-#: diff.c:5563
+#: diff.c:5564
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "使用 \"anchored diff\" 演算法生成差異"
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5566 diff.c:5575 diff.c:5578
msgid "<mode>"
msgstr "<模式>"
-#: diff.c:5566
+#: diff.c:5567
msgid "show word diff, using <mode> to delimit changed words"
msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"
-#: diff.c:5569
+#: diff.c:5570
msgid "use <regex> to decide what a word is"
-msgstr "使用 <正規表示式> 確定何為一個詞"
+msgstr "使用 <常規表示式> 確定何為一個詞"
-#: diff.c:5572
+#: diff.c:5573
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
-#: diff.c:5575
+#: diff.c:5576
msgid "moved lines of code are colored differently"
msgstr "移動的程式碼行用不同方式著色"
-#: diff.c:5578
+#: diff.c:5579
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字元"
-#: diff.c:5581
+#: diff.c:5582
msgid "Other diff options"
msgstr "其它差異選項"
-#: diff.c:5583
+#: diff.c:5584
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"
-#: diff.c:5587
+#: diff.c:5588
msgid "treat all files as text"
msgstr "把所有檔案當做文字處理"
-#: diff.c:5589
+#: diff.c:5590
msgid "swap two inputs, reverse the diff"
msgstr "交換兩個輸入，反轉差異"
-#: diff.c:5591
+#: diff.c:5592
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差異時離開碼為 1，否則為 0"
-#: diff.c:5593
+#: diff.c:5594
msgid "disable all output of the program"
msgstr "停用本程式的所有輸出"
-#: diff.c:5595
+#: diff.c:5596
msgid "allow an external diff helper to be executed"
msgstr "允許執行一個外部的差異協助工具"
-#: diff.c:5597
+#: diff.c:5598
msgid "run external text conversion filters when comparing binary files"
msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"
-#: diff.c:5599
+#: diff.c:5600
msgid "<when>"
msgstr "<何時>"
-#: diff.c:5600
+#: diff.c:5601
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差異時，忽略子模組的更改"
-#: diff.c:5603
+#: diff.c:5604
msgid "<format>"
msgstr "<格式>"
-#: diff.c:5604
+#: diff.c:5605
msgid "specify how differences in submodules are shown"
msgstr "指定子模組的差異如何顯示"
-#: diff.c:5608
+#: diff.c:5609
msgid "hide 'git add -N' entries from the index"
msgstr "隱藏索引中 'git add -N' 條目"
-#: diff.c:5611
+#: diff.c:5612
msgid "treat 'git add -N' entries as real in the index"
msgstr "將索引中 'git add -N' 條目當做真實的"
-#: diff.c:5613
+#: diff.c:5614
msgid "<string>"
msgstr "<字串>"
-#: diff.c:5614
+#: diff.c:5615
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "尋找改變了指定字串出現次數的差異"
-#: diff.c:5617
+#: diff.c:5618
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "尋找改變指定正則符合出現次數的差異"
-#: diff.c:5620
+#: diff.c:5621
msgid "show all changes in the changeset with -S or -G"
msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
-#: diff.c:5623
+#: diff.c:5624
msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式"
+msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式"
-#: diff.c:5626
+#: diff.c:5627
msgid "control the order in which files appear in the output"
msgstr "控制輸出中的檔案顯示順序"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5628 diff.c:5631
msgid "<path>"
msgstr "<路徑>"
-#: diff.c:5628
+#: diff.c:5629
msgid "show the change in the specified path first"
msgstr "先顯示指定路徑的變更"
-#: diff.c:5631
+#: diff.c:5632
msgid "skip the output to the specified path"
msgstr "略過輸出至指定路徑"
-#: diff.c:5633
+#: diff.c:5634
msgid "<object-id>"
msgstr "<物件 ID>"
-#: diff.c:5634
+#: diff.c:5635
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "尋找改變指定物件出現次數的差異"
-#: diff.c:5636
+#: diff.c:5637
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5638
msgid "select files by diff type"
msgstr "透過差異類型選擇檔案"
-#: diff.c:5639
+#: diff.c:5640
msgid "<file>"
msgstr "<檔案>"
-#: diff.c:5640
-msgid "Output to a specific file"
-msgstr "輸出到一個指定的檔案"
+#: diff.c:5641
+msgid "output to a specific file"
+msgstr "輸出至指定檔案"
-#: diff.c:6298
+#: diff.c:6321
msgid "exhaustive rename detection was skipped due to too many files."
msgstr "因為檔案太多，已略過詳細重新命名偵測。"
-#: diff.c:6301
+#: diff.c:6324
msgid "only found copies from modified paths due to too many files."
msgstr "因為檔案太多，只在修改的路徑中尋找複製。"
-#: diff.c:6304
+#: diff.c:6327
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3816,7 +3922,7 @@
msgid "failed to read orderfile '%s'"
msgstr "讀取排序檔案 '%s' 失敗"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "正在進行非精確的重新命名偵測"
@@ -3845,39 +3951,47 @@
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複"
-#: dir.c:830
+#: dir.c:828
msgid "disabling cone pattern matching"
msgstr "停用 cone 樣式符合模式"
-#: dir.c:1214
+#: dir.c:1212
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "不能將 %s 用作排除檔案"
-#: dir.c:2351
+#: dir.c:2419
#, c-format
msgid "could not open directory '%s'"
msgstr "不能開啟目錄 '%s'"
-#: dir.c:2653
+#: dir.c:2721
msgid "failed to get kernel name and information"
msgstr "無法獲得核心名稱和訊息"
-#: dir.c:2777
+#: dir.c:2846
msgid "untracked cache is disabled on this system or location"
msgstr "快取未追蹤檔案在本系統或位置中被停用"
-#: dir.c:3610
+#: dir.c:3119
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"無法猜到目錄名。\n"
+"請在指令列指定一個目錄"
+
+#: dir.c:3807
#, c-format
msgid "index file corrupt in repo %s"
msgstr "版本庫 %s 中的索引檔案損壞"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3854 dir.c:3859
#, c-format
msgid "could not create directories for %s"
msgstr "不能為 %s 建立目錄"
-#: dir.c:3691
+#: dir.c:3888
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"
@@ -3887,304 +4001,392 @@
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "提示：等待您的編輯器關閉檔案...%c"
-#: entry.c:176
+#: entry.c:179
msgid "Filtering content"
msgstr "過濾內容"
-#: entry.c:497
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "不能對檔案 '%s' 呼叫 stat"
-#: environment.c:152
+#: environment.c:147
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "錯誤的 git 名字空間路徑 \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "不能設定 GIT_DIR 為 '%s'"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "執行 %s 的參數太多"
-#: fetch-pack.c:182
+#: fetch-pack.c:194
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：應為 shallow 列表"
-#: fetch-pack.c:185
+#: fetch-pack.c:197
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"
-#: fetch-pack.c:196
+#: fetch-pack.c:208
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包"
-#: fetch-pack.c:216
+#: fetch-pack.c:228
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"
-#: fetch-pack.c:227
+#: fetch-pack.c:239
msgid "unable to write to remote"
msgstr "無法寫到遠端"
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc 需要 multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:397 fetch-pack.c:1460
#, c-format
msgid "invalid shallow line: %s"
msgstr "無效的 shallow 訊息：%s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:403 fetch-pack.c:1466
#, c-format
msgid "invalid unshallow line: %s"
msgstr "無效的 unshallow 訊息：%s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:405 fetch-pack.c:1468
#, c-format
msgid "object not found: %s"
msgstr "物件未找到：%s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:408 fetch-pack.c:1471
#, c-format
msgid "error in object: %s"
msgstr "物件中發生錯誤：%s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:410 fetch-pack.c:1473
#, c-format
msgid "no shallow found: %s"
msgstr "未發現 shallow：%s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:413 fetch-pack.c:1477
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "應為 shallow/unshallow，卻得到 %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:453
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:470
#, c-format
msgid "invalid commit %s"
msgstr "無效提交 %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:501
msgid "giving up"
msgstr "放棄"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:514 progress.h:25
msgid "done"
msgstr "完成"
-#: fetch-pack.c:512
+#: fetch-pack.c:526
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:562
#, c-format
msgid "Marking %s as complete"
msgstr "標記 %s 為完成"
-#: fetch-pack.c:763
+#: fetch-pack.c:784
#, c-format
msgid "already have %s (%s)"
msgstr "已經有 %s（%s）"
-#: fetch-pack.c:849
+#: fetch-pack.c:870
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：無法衍生 sideband 多路輸出"
-#: fetch-pack.c:857
+#: fetch-pack.c:878
msgid "protocol error: bad pack header"
msgstr "協定錯誤：壞的包頭"
-#: fetch-pack.c:951
+#: fetch-pack.c:974
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：無法 fork %s 處理程序"
-#: fetch-pack.c:957
+#: fetch-pack.c:980
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack：無效的 index-pack 輸出"
-#: fetch-pack.c:974
+#: fetch-pack.c:997
#, c-format
msgid "%s failed"
msgstr "%s 失敗"
-#: fetch-pack.c:976
+#: fetch-pack.c:999
msgid "error in sideband demultiplexer"
msgstr "sideband 多路輸出發生錯誤"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1048
#, c-format
msgid "Server version is %.*s"
msgstr "伺服器版本 %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
+#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
+#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
+#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
#, c-format
msgid "Server supports %s"
msgstr "伺服器支援 %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1058
msgid "Server does not support shallow clients"
msgstr "伺服器不支援 shallow 用戶端"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1118
msgid "Server does not support --shallow-since"
msgstr "伺服器不支援 --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1123
msgid "Server does not support --shallow-exclude"
msgstr "伺服器不支援 --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1127
msgid "Server does not support --deepen"
msgstr "伺服器不支援 --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1129
msgid "Server does not support this repository's object format"
msgstr "伺服器不支援此版本庫的物件格式"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1142
msgid "no common commits"
msgstr "沒有共同的提交"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
msgid "source repository is shallow, reject to clone."
msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。"
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1157 fetch-pack.c:1705
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：取得失敗。"
-#: fetch-pack.c:1242
+#: fetch-pack.c:1271
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "算法不一致：用戶端 %s；伺服器 %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1275
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "伺服器不支援「%s」算法"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1308
msgid "Server does not support shallow requests"
msgstr "伺服器不支援 shallow 請求"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1315
msgid "Server supports filter"
msgstr "伺服器支援 filter"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1358 fetch-pack.c:2087
msgid "unable to write request to remote"
msgstr "無法將請求寫到遠端"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1376
#, c-format
msgid "error reading section header '%s'"
msgstr "讀取節標題 '%s' 發生錯誤"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1382
#, c-format
msgid "expected '%s', received '%s'"
msgstr "預期 '%s'，得到 '%s'"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1416
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的確認行：'%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1421
#, c-format
msgid "error processing acks: %d"
msgstr "處理 ack 發生錯誤：%d"
-#: fetch-pack.c:1402
-msgid "expected packfile to be sent after 'ready'"
-msgstr "預期在 'ready' 之後傳送 packfile"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1435
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "預期在 「%s」後傳送 packfile"
-#: fetch-pack.c:1404
-msgid "expected no other sections to be sent after no 'ready'"
-msgstr "在沒有 'ready' 不應該傳送其它小節"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1441
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "預期在沒有「%s」後不傳送其他區段"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1482
#, c-format
msgid "error processing shallow info: %d"
msgstr "處理淺複製訊息發生錯誤：%d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1531
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "預期 wanted-ref，得到 '%s'"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1536
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref：'%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1541
#, c-format
msgid "error processing wanted refs: %d"
msgstr "處理要取得的引用發生錯誤：%d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1571
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: 預期要有回應結束封包"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1983
msgid "no matching remote head"
msgstr "沒有符合的遠端分支"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:2006 builtin/clone.c:587
msgid "remote did not send all necessary objects"
msgstr "遠端沒有傳送所有必需的物件"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2109
msgid "unexpected 'ready' from remote"
msgstr "從遠端收到非預期的 ‘ready’"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2132
#, c-format
msgid "no such remote ref %s"
msgstr "沒有這樣的遠端引用 %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2135
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "伺服器不允許請求未公開的物件 %s"
-#: gpg-interface.c:273
+#: fsmonitor-ipc.c:119
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query：路徑「%s」無效"
+
+#: fsmonitor-ipc.c:125
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query：「%s」上有未指定的錯誤"
+
+#: fsmonitor-ipc.c:155
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon 未在運作"
+
+#: fsmonitor-ipc.c:164
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "無法將「%s」命令傳送到 fsmonitor--daemon"
+
+#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
+#: gpg-interface.c:1011
msgid "could not create temporary file"
msgstr "不能建立暫存檔"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:459
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "無法將分離式簽名寫入 '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:450
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr "SSH 簽名驗證需要設定 gpg.ssh.allowedSignersFile，簽名檔案也要存在"
+
+#: gpg-interface.c:479
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"SSH 簽名驗證需要 ssh-keygen -Y find-principals/verify（可以在 openssh 8.2p1+ "
+"版本使用）"
+
+#: gpg-interface.c:550
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "有設定 SSH 簽名廢止檔案，但找不到檔案本體：%s"
+
+#: gpg-interface.c:638
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "簽名「%s」損壞或者不相容"
+
+#: gpg-interface.c:815 gpg-interface.c:820
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "無法取得「%s」金鑰的 SSH 指紋"
+
+#: gpg-interface.c:843
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一"
+
+#: gpg-interface.c:865
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 執行成功，但沒回傳按鍵：%s %s"
+
+#: gpg-interface.c:871
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s"
+
+#: gpg-interface.c:966
msgid "gpg failed to sign the data"
msgstr "gpg 無法為資料簽名"
+#: gpg-interface.c:988
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "需要設定 user.signingkey 才能進行 SSH 簽名"
+
+#: gpg-interface.c:999
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "無法將 SSH 簽名金鑰寫入「%s」"
+
+#: gpg-interface.c:1017
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "無法將 SSH 簽名金鑰緩衝區寫入「%s」"
+
+#: gpg-interface.c:1035
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr "SSH 簽名需要 ssh-keygen -Y sign（可以在 openssh 8.2p1+ 版本使用）"
+
+#: gpg-interface.c:1047
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩"
-#: grep.c:531
+#: grep.c:446
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4192,109 +4394,109 @@
"提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此"
"功能"
-#: grep.c:1895
+#: grep.c:1859
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：無法讀取 %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "對 '%s' 呼叫 stat 失敗"
-#: grep.c:1923
+#: grep.c:1887
#, c-format
msgid "'%s': short read"
msgstr "'%s'：讀取不完整"
-#: help.c:23
+#: help.c:25
msgid "start a working area (see also: git help tutorial)"
msgstr "開始一個工作區（參見：git help tutorial）"
-#: help.c:24
+#: help.c:26
msgid "work on the current change (see also: git help everyday)"
msgstr "在目前變更上工作（參見：git help everyday）"
-#: help.c:25
+#: help.c:27
msgid "examine the history and state (see also: git help revisions)"
msgstr "檢查歷史和狀態（參見：git help revisions）"
-#: help.c:26
+#: help.c:28
msgid "grow, mark and tweak your common history"
msgstr "擴展、標記和調校您的歷史記錄"
-#: help.c:27
+#: help.c:29
msgid "collaborate (see also: git help workflows)"
msgstr "協同（參見：git help workflows）"
-#: help.c:31
+#: help.c:33
msgid "Main Porcelain Commands"
msgstr "主要的上層指令"
-#: help.c:32
+#: help.c:34
msgid "Ancillary Commands / Manipulators"
msgstr "輔助指令/動作者"
-#: help.c:33
+#: help.c:35
msgid "Ancillary Commands / Interrogators"
msgstr "輔助指令/詢問者"
-#: help.c:34
+#: help.c:36
msgid "Interacting with Others"
msgstr "與其它系統互動"
-#: help.c:35
+#: help.c:37
msgid "Low-level Commands / Manipulators"
msgstr "低級指令/動作者"
-#: help.c:36
+#: help.c:38
msgid "Low-level Commands / Interrogators"
msgstr "低級指令/詢問者"
-#: help.c:37
+#: help.c:39
msgid "Low-level Commands / Syncing Repositories"
msgstr "低級指令 / 同步版本庫"
-#: help.c:38
+#: help.c:40
msgid "Low-level Commands / Internal Helpers"
msgstr "低級指令/內部協助工具"
-#: help.c:300
+#: help.c:316
#, c-format
msgid "available git commands in '%s'"
msgstr "在 '%s' 下可用的 git 指令"
-#: help.c:307
+#: help.c:323
msgid "git commands available from elsewhere on your $PATH"
msgstr "在 $PATH 路徑中的其他地方可用的 git 指令"
-#: help.c:316
+#: help.c:332
msgid "These are common Git commands used in various situations:"
msgstr "這些是各種場合常見的 Git 指令："
-#: help.c:365 git.c:100
+#: help.c:382 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "不支援的指令列表類型 '%s'"
-#: help.c:405
+#: help.c:422
msgid "The Git concept guides are:"
msgstr "Git 概念嚮導有："
-#: help.c:429
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "執行 'git help <command>' 來檢視特定子指令"
-
-#: help.c:434
+#: help.c:446
msgid "External commands"
msgstr "外部指令"
-#: help.c:449
+#: help.c:468
msgid "Command aliases"
msgstr "指令別名"
-#: help.c:527
+#: help.c:486
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "執行 'git help <command>' 來檢視特定子指令"
+
+#: help.c:563
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4303,31 +4505,36 @@
"'%s' 像是一個 git 指令，但卻無法執行。\n"
"可能是 git-%s 受損？"
-#: help.c:543 help.c:631
+#: help.c:585 help.c:682
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。"
-#: help.c:591
+#: help.c:633
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀，您的系統中未發現 Git 指令。"
-#: help.c:613
+#: help.c:655
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。"
-#: help.c:618
+#: help.c:660
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "假定你想要的是 '%s' 並繼續。"
-#: help.c:623
+#: help.c:666
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "改執行「%s」[y/N]？ "
+
+#: help.c:674
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。"
-#: help.c:635
+#: help.c:686
msgid ""
"\n"
"The most similar command is"
@@ -4338,16 +4545,16 @@
"\n"
"最類似的指令有"
-#: help.c:675
+#: help.c:729
msgid "git version [<options>]"
msgstr "git version [<選項>]"
-#: help.c:730
+#: help.c:784
#, c-format
msgid "%s: %s - %s"
msgstr "%s：%s - %s"
-#: help.c:734
+#: help.c:788
msgid ""
"\n"
"Did you mean this?"
@@ -4358,15 +4565,29 @@
"\n"
"您指的是這個嗎？"
-#: ident.c:353
+#: hook.c:28
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n"
+"設定 `git config advice.ignoredHook false` 來關閉這條警告。"
+
+#: hook.c:87
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "無法啟動「%s」掛鉤\n"
+
+#: ident.c:354
msgid "Author identity unknown\n"
msgstr "作者身分未知\n"
-#: ident.c:356
+#: ident.c:357
msgid "Committer identity unknown\n"
msgstr "提交者身分未知\n"
-#: ident.c:362
+#: ident.c:363
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -4389,73 +4610,74 @@
" git config --global user.name \"Your Name\"\n"
"\n"
"來設定您帳號的預設身份標記。\n"
-"如果僅在本版本庫設定身份標記，則省略 --global 參數。\n"
+"若只要在這個版本庫設定身份標記，請省略 --global 參數。\n"
+"\n"
-#: ident.c:397
+#: ident.c:398
msgid "no email was given and auto-detection is disabled"
msgstr "未提供信件位址且自動偵測被停用"
-#: ident.c:402
+#: ident.c:403
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "無法自動偵測信件位址（得到 '%s'）"
-#: ident.c:419
+#: ident.c:420
msgid "no name was given and auto-detection is disabled"
msgstr "未提供姓名且自動偵測被停用"
-#: ident.c:425
+#: ident.c:426
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "無法自動偵測姓名（得到 '%s'）"
-#: ident.c:433
+#: ident.c:434
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "不允許空的姓名（對於 <%s>）"
-#: ident.c:439
+#: ident.c:440
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中僅包含停用字元：%s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:455 builtin/commit.c:649
#, c-format
msgid "invalid date format: %s"
msgstr "無效的日期格式：%s"
-#: list-objects-filter-options.c:83
+#: list-objects-filter-options.c:68
msgid "expected 'tree:<depth>'"
msgstr "期望 'tree:<深度>'"
-#: list-objects-filter-options.c:98
+#: list-objects-filter-options.c:83
msgid "sparse:path filters support has been dropped"
msgstr "sparse:path 過濾器支援已被刪除"
-#: list-objects-filter-options.c:105
+#: list-objects-filter-options.c:90
#, c-format
msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式"
-#: list-objects-filter-options.c:124
+#: list-objects-filter-options.c:109
#, c-format
msgid "invalid filter-spec '%s'"
-msgstr "無效的過濾器表達式 '%s'"
+msgstr "無效的過濾器規格 '%s'"
-#: list-objects-filter-options.c:140
+#: list-objects-filter-options.c:125
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'"
-#: list-objects-filter-options.c:182
+#: list-objects-filter-options.c:167
msgid "expected something after combine:"
msgstr "期望在組合後有一些東西："
-#: list-objects-filter-options.c:264
+#: list-objects-filter-options.c:249
msgid "multiple filter-specs cannot be combined"
msgstr "不能混用多種過濾規格"
-#: list-objects-filter-options.c:376
+#: list-objects-filter-options.c:365
msgid "unable to upgrade repository format to support partial clone"
msgstr "無法升級版本庫格式，以致不支援部分複製"
@@ -4469,17 +4691,17 @@
msgid "unable to parse sparse filter data in %s"
msgstr "無法解析 %s 中的稀疏過濾器資料"
-#: list-objects.c:127
+#: list-objects.c:144
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀物件"
-#: list-objects.c:140
+#: list-objects.c:157
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件"
-#: list-objects.c:398
+#: list-objects.c:415
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "無法為提交 %s 載入根樹"
@@ -4497,22 +4719,23 @@
msgstr ""
"無法建立 '%s.lock'：%s。\n"
"\n"
-"似乎另外一個 git 進程在這個版本庫中執行，例如：'git commit' 指令打\n"
-"開了一個編輯器。請確認所有進程都已經關閉然後重試。如果仍然報錯，\n"
-"可能之前有一個 git 進程在這個版本庫中異常離開：\n"
-"手動刪除這個檔案再繼續。"
+"這個版本庫似乎有另一個 git 處理程序在執行，\n"
+"例如「git commit」命令開啟的編輯器。\n"
+"請確認所有處理程序都已經終止後再重試一次。如果錯誤沒有消失，\n"
+"有可能是之前在這個版本庫執行的 git 處理程序當掉了。\n"
+"如果是這樣，請自行刪除這個檔案再繼續。"
#: lockfile.c:160
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "不能建立 '%s.lock'：%s"
-#: ls-refs.c:37
+#: ls-refs.c:175
#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "lsrefs.unborn 的值「%s」無效"
+msgid "unexpected line: '%s'"
+msgstr "遇到非預期橫列：「%s」"
-#: ls-refs.c:167
+#: ls-refs.c:179
msgid "expected flush after ls-refs arguments"
msgstr "在 ls-refs 引數之後應該有一個 flush 包"
@@ -4520,37 +4743,37 @@
msgid "quoted CRLF detected"
msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "「%s」動作對「%s」無效"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1630 merge-recursive.c:1214
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "無法合併子模組 %s （沒有簽出）"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1639 merge-recursive.c:1221
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "無法合併子模組 %s（提交不存在）"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1648 merge-recursive.c:1228
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "無法合併子模組 %s （提交未跟隨合併基礎）"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1658 merge-ort.c:1666
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "注意：正在將 %s 子模組快轉到 %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1688
#, c-format
msgid "Failed to merge submodule %s"
msgstr "無法合併 %s 子模組"
-#: merge-ort.c:1632
+#: merge-ort.c:1695
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4559,7 +4782,7 @@
"無法合併 %s 子模組，但有找到一個可行的合併方案：\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1699 merge-recursive.c:1284
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4569,13 +4792,13 @@
"\n"
"which will accept this suggestion.\n"
msgstr ""
-"如果這個正確，將其新增到索引，例如使用指令：\n"
+"正確的話，就能直接加進索引，例如執行下述命令：\n"
"\n"
" git update-index --cacheinfo 160000 %s \"%s\"\n"
"\n"
-"以接受此建議。\n"
+"接受本建議。\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1712
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4584,21 +4807,21 @@
"無法合併 %s 子模組，但有找到幾個可行的合併方案：\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1937 merge-recursive.c:1375
msgid "Failed to execute internal merge"
msgstr "無法執行內部合併"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1942 merge-recursive.c:1380
#, c-format
msgid "Unable to add %s to database"
msgstr "不能新增 %s 至物件庫"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1949 merge-recursive.c:1413
#, c-format
msgid "Auto-merging %s"
msgstr "自動合併 %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2088 merge-recursive.c:2135
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4607,7 +4830,7 @@
"衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"
"放在：%s。"
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2098 merge-recursive.c:2145
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4616,7 +4839,7 @@
"衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"
"些路徑放置於此：%s"
-#: merge-ort.c:2087
+#: merge-ort.c:2156
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4626,14 +4849,14 @@
"衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目"
"錄，但沒有目的地取得過半檔案。"
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2310 merge-recursive.c:2481
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2450 merge-recursive.c:3264
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4641,7 +4864,7 @@
msgstr ""
"路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2457 merge-recursive.c:3271
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4650,7 +4873,7 @@
"路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"
"其移動到 %5$s。"
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2470 merge-recursive.c:3267
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4659,7 +4882,7 @@
"衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"
"動到 %s。"
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2478 merge-recursive.c:3274
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4668,14 +4891,14 @@
"衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "
"中，建議將其移動到 %5$s。"
-#: merge-ort.c:2569
+#: merge-ort.c:2634
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"衝突（重新命名/重新命名）：%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 "
"%4$s。"
-#: merge-ort.c:2664
+#: merge-ort.c:2729
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4685,30 +4908,30 @@
"衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可"
"能會因此出現巢狀衝突標記。"
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2748 merge-ort.c:2772
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。"
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3261 merge-recursive.c:3025
#, c-format
msgid "cannot read object %s"
msgstr "不能讀取物件 %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3264 merge-recursive.c:3028
#, c-format
msgid "object %s is not a blob"
msgstr "物件 %s 不是一個資料物件"
-#: merge-ort.c:3613
+#: merge-ort.c:3693
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr "衝突（檔案/目錄）：目錄佔住 %2$s 中 %1$s 的位置。改移動到 %3$s。"
-#: merge-ort.c:3689
+#: merge-ort.c:3770
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4717,7 +4940,7 @@
"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分"
"別記錄這兩方檔案。"
-#: merge-ort.c:3696
+#: merge-ort.c:3777
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4726,24 +4949,24 @@
"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以"
"分別記錄這兩方檔案。"
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3866 merge-recursive.c:3104
msgid "content"
msgstr "內容"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3868 merge-recursive.c:3108
msgid "add/add"
msgstr "新增/新增"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3870 merge-recursive.c:3153
msgid "submodule"
msgstr "子模組"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3872 merge-recursive.c:3154
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "衝突（%s）：合併衝突於 %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3916
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4752,7 +4975,7 @@
"衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"
"上。"
-#: merge-ort.c:4120
+#: merge-ort.c:4212
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4762,12 +4985,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4586
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "%s, %s, %s 樹的合併資訊收集失敗"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3723
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4776,103 +4999,103 @@
"您對下列檔案的本機修改將被合併動作覆蓋：\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
msgid "Already up to date."
msgstr "已經是最新的。"
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "（壞提交）\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。"
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。"
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "建立路徑 '%s'%s 失敗"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "刪除 %s 以便為子目錄留出空間\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr "：可能是一個目錄/檔案衝突？"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:47
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能讀取物件 %s '%s'"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 應為資料物件"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "開啟 '%s' 失敗：%s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "建立符號連結 '%s' 失敗：%s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何處理 %06o %s '%s'"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "子模組 %s 快轉到如下提交："
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1239 merge-recursive.c:1252
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "快轉子模組 %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1280
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "無法合併子模組 %s（非快轉）"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1281
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "找到子模組的一個可能的合併方案：\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1293
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "無法合併子模組 %s （發現多個合併）"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1437
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。"
-#: merge-recursive.c:1492
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4881,7 +5104,7 @@
"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本被保留。"
-#: merge-recursive.c:1497
+#: merge-recursive.c:1514
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4890,7 +5113,7 @@
"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"
-#: merge-recursive.c:1504
+#: merge-recursive.c:1521
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4899,7 +5122,7 @@
"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本保留在 %8$s 中。"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4908,41 +5131,41 @@
"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "rename"
msgstr "重新命名"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1561
msgid "renamed"
msgstr "重新命名"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒絕遺失髒檔案 '%s'"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1622
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。"
-#: merge-recursive.c:1663
+#: merge-recursive.c:1680
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1711
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1716
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1743
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -4951,18 +5174,18 @@
"衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在"
"分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1748
msgid " (left unresolved)"
msgstr " （留下未解決）"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1840
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 "
"%4$s->%5$s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2103
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4972,7 +5195,7 @@
"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"
"多個其它目錄，沒有目錄包含大部分檔案。"
-#: merge-recursive.c:2220
+#: merge-recursive.c:2237
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4981,78 +5204,78 @@
"衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"
"命名目錄 %4$s->%5$s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3092
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3131
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略過 %s（已經做過相同合併）"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3184
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 為名新增"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3388
#, c-format
msgid "Removing %s"
msgstr "刪除 %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3411
msgid "file/directory"
msgstr "檔案/目錄"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3416
msgid "directory/file"
msgstr "目錄/檔案"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3423
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s"
-#: merge-recursive.c:3415
+#: merge-recursive.c:3432
#, c-format
msgid "Adding %s"
msgstr "新增 %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3441
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "衝突（add/add）：合併衝突於 %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3494
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "無法合併樹 %s 和 %s"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3588
msgid "Merging:"
msgstr "合併："
-#: merge-recursive.c:3584
+#: merge-recursive.c:3601
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "發現 %u 個共同祖先："
-#: merge-recursive.c:3634
+#: merge-recursive.c:3651
msgid "merge returned no commit"
msgstr "合併未返回提交"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3823
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析物件 '%s'"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "不能寫入索引。"
@@ -5060,189 +5283,225 @@
msgid "failed to read the cache"
msgstr "讀取快取失敗"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
+#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "無法寫新的索引檔案"
-#: midx.c:74
+#: midx.c:79
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "多包索引的物件 ID fanout 大小錯誤"
-#: midx.c:105
+#: midx.c:112
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引檔案 %s 太小"
-#: midx.c:121
+#: midx.c:128
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"
-#: midx.c:126
+#: midx.c:133
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被識別"
-#: midx.c:131
+#: midx.c:138
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"
-#: midx.c:148
+#: midx.c:155
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名區塊"
-#: midx.c:150
+#: midx.c:157
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "多包索引缺少必需的物件 ID fanout 區塊"
-#: midx.c:152
+#: midx.c:159
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "多包索引缺少必需的物件 ID 查詢區塊"
-#: midx.c:154
+#: midx.c:161
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的物件位移區塊"
-#: midx.c:170
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名無序：'%s' 在 '%s' 之前"
-#: midx.c:214
+#: midx.c:228
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "錯的 pack-int-id：%u（共有 %u 個包）"
-#: midx.c:264
+#: midx.c:278
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引儲存一個64位位移，但是 off_t 太小"
-#: midx.c:490
+#: midx.c:509
#, c-format
msgid "failed to add packfile '%s'"
msgstr "新增 packfile '%s' 失敗"
-#: midx.c:496
+#: midx.c:515
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "開啟包索引 '%s' 失敗"
-#: midx.c:564
+#: midx.c:583
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "在 packfile 中定位物件 %d 失敗"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:911
msgid "cannot store reverse index file"
msgstr "無法儲存倒排索引檔案"
-#: midx.c:920
+#: midx.c:1009
+#, c-format
+msgid "could not parse line: %s"
+msgstr "無法解析橫列：%s"
+
+#: midx.c:1011
+#, c-format
+msgid "malformed line: %s"
+msgstr "橫列格式錯誤：%s"
+
+#: midx.c:1181
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "忽略現有的多包索引：總和檢查碼不符"
-#: midx.c:943
+#: midx.c:1206
+msgid "could not load pack"
+msgstr "無法載入包"
+
+#: midx.c:1212
+#, c-format
+msgid "could not open index for %s"
+msgstr "無法開啟 %s 的索引"
+
+#: midx.c:1223
msgid "Adding packfiles to multi-pack-index"
msgstr "正在新增 packfile 至多包索引"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "沒有看到要捨棄的包檔案 %s"
-
-#: midx.c:1034
+#: midx.c:1266
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "未知偏好包：「%s」"
-#: midx.c:1039
+#: midx.c:1311
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "無法選取偏好，沒有物件的 %s 包"
+
+#: midx.c:1343
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "沒有看到要捨棄的包檔案 %s"
+
+#: midx.c:1389
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "偏好包「%s」已經過期"
-#: midx.c:1055
+#: midx.c:1402
msgid "no pack files to index."
msgstr "沒有要索引的 pack 檔案。"
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1409
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "拒絕寫入無任何物件的多包 .bitmap"
+
+#: midx.c:1451
+msgid "could not write multi-pack bitmap"
+msgstr "無法寫入多包位圖"
+
+#: midx.c:1461
+msgid "could not write multi-pack-index"
+msgstr "無法寫入多包索引"
+
+#: midx.c:1520 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "刪除 %s 失敗"
-#: midx.c:1166
+#: midx.c:1553
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "清理位於 %s 的多包索引失敗"
-#: midx.c:1225
+#: midx.c:1616
msgid "multi-pack-index file exists, but failed to parse"
msgstr "有 multi-pack-index 檔案，但無法解析"
-#: midx.c:1233
+#: midx.c:1624
msgid "incorrect checksum"
msgstr "總和檢查碼不正確"
-#: midx.c:1236
+#: midx.c:1627
msgid "Looking for referenced packfiles"
msgstr "正在尋找引用的 packfile"
-#: midx.c:1251
+#: midx.c:1642
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1647
msgid "the midx contains no oid"
msgstr "midx 沒有 oid"
-#: midx.c:1265
+#: midx.c:1656
msgid "Verifying OID order in multi-pack-index"
msgstr "正在驗證多包索引中的物件 ID 順序"
-#: midx.c:1274
+#: midx.c:1665
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1685
msgid "Sorting objects by packfile"
msgstr "透過 packfile 為物件排序"
-#: midx.c:1301
+#: midx.c:1692
msgid "Verifying object offsets"
msgstr "正在驗證物件位移"
-#: midx.c:1317
+#: midx.c:1708
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "為 oid[%d] = %s 載入包條目失敗"
-#: midx.c:1323
+#: midx.c:1714
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "為 packfile %s 載入包索引失敗"
-#: midx.c:1332
+#: midx.c:1723
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1750
msgid "Counting referenced objects"
msgstr "正在計算引用物件"
-#: midx.c:1367
+#: midx.c:1760
msgid "Finding and deleting unreferenced packfiles"
-msgstr "正在尋找並刪除沒有參考的 packfile"
+msgstr "正在尋找並刪除沒有引用的 packfile"
-#: midx.c:1558
+#: midx.c:1952
msgid "could not start pack-objects"
msgstr "不能開始 pack-objects"
-#: midx.c:1578
+#: midx.c:1972
msgid "could not finish pack-objects"
msgstr "不能結束 pack-objects"
@@ -5261,7 +5520,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "不能加入 lazy_name 執行緒：%s"
-#: notes-merge.c:277
+#: notes-merge.c:276
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -5272,7 +5531,7 @@
"在開始一個新的備註合併之前，請使用 'git notes merge --commit' 或者 'git "
"notes merge --abort' 來提交/終止前一次合併。"
-#: notes-merge.c:284
+#: notes-merge.c:283
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "您尚未結束備註合併（存在 %s）。"
@@ -5300,271 +5559,342 @@
msgid "Bad %s value: '%s'"
msgstr "壞的 %s 值：'%s'"
-#: object-file.c:526
+#: object-file.c:457
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:515
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "無法規範化備用物件路徑：%s"
-#: object-file.c:658
+#: object-file.c:589
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s：忽略備用物件庫，嵌套太深"
-#: object-file.c:665
+#: object-file.c:596
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "無法規範化物件目錄: %s"
-#: object-file.c:708
+#: object-file.c:639
msgid "unable to fdopen alternates lockfile"
msgstr "無法 fdopen 取代鎖檔案"
-#: object-file.c:726
+#: object-file.c:657
msgid "unable to read alternates file"
msgstr "無法讀取替代檔案"
-#: object-file.c:733
+#: object-file.c:664
msgid "unable to move new alternates file into place"
msgstr "無法將新的替代檔案移動到位"
-#: object-file.c:768
+#: object-file.c:742
#, c-format
msgid "path '%s' does not exist"
msgstr "路徑 '%s' 不存在"
-#: object-file.c:789
+#: object-file.c:763
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚不支援將參考版本庫 '%s' 作為一個連結簽出。"
+msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。"
-#: object-file.c:795
+#: object-file.c:769
#, c-format
msgid "reference repository '%s' is not a local repository."
-msgstr "參考版本庫 '%s' 不是一個本機版本庫。"
+msgstr "引用版本庫 '%s' 不是一個本機版本庫。"
-#: object-file.c:801
+#: object-file.c:775
#, c-format
msgid "reference repository '%s' is shallow"
-msgstr "參考版本庫 '%s' 是一個淺複製"
+msgstr "引用版本庫 '%s' 是一個淺複製"
-#: object-file.c:809
+#: object-file.c:783
#, c-format
msgid "reference repository '%s' is grafted"
-msgstr "參考版本庫 '%s' 已被移植"
+msgstr "引用版本庫 '%s' 已被移植"
-#: object-file.c:869
+#: object-file.c:814
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "找不到符合 %s 的物件目錄"
+
+#: object-file.c:864
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "解析備用引用時無效的行：%s"
-#: object-file.c:1019
+#: object-file.c:1014
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1049
#, c-format
msgid "mmap failed%s"
msgstr "mmap 失敗%s"
-#: object-file.c:1218
+#: object-file.c:1230
#, c-format
msgid "object file %s is empty"
msgstr "物件檔案 %s 為空"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1349 object-file.c:2588
#, c-format
msgid "corrupt loose object '%s'"
msgstr "損壞的鬆散物件 '%s'"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1351 object-file.c:2592
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "鬆散物件 '%s' 後面有垃圾資料"
-#: object-file.c:1397
+#: object-file.c:1473
+#, c-format
+msgid "unable to parse %s header"
+msgstr "無法解析 %s 頭部"
+
+#: object-file.c:1475
msgid "invalid object type"
msgstr "無效的物件類型"
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"
-
-#: object-file.c:1484
+#: object-file.c:1486
#, c-format
msgid "unable to unpack %s header"
msgstr "無法解開 %s 頭部"
#: object-file.c:1490
#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "%s 的標頭過長，超出 %d 位元組"
-#: object-file.c:1493
-#, c-format
-msgid "unable to parse %s header"
-msgstr "無法解析 %s 頭部"
-
-#: object-file.c:1717
+#: object-file.c:1720
#, c-format
msgid "failed to read object %s"
msgstr "讀取物件 %s 失敗"
-#: object-file.c:1721
+#: object-file.c:1724
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: object-file.c:1725
+#: object-file.c:1728
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "鬆散物件 %s（儲存在 %s）已損壞"
-#: object-file.c:1729
+#: object-file.c:1732
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包物件 %s（儲存在 %s）已損壞"
-#: object-file.c:1834
+#: object-file.c:1855
#, c-format
msgid "unable to write file %s"
msgstr "無法寫檔案 %s"
-#: object-file.c:1841
+#: object-file.c:1862
#, c-format
msgid "unable to set permission to '%s'"
msgstr "無法為 '%s' 設定權限"
-#: object-file.c:1848
+#: object-file.c:1869
msgid "file write error"
msgstr "檔案寫錯誤"
-#: object-file.c:1868
+#: object-file.c:1904
msgid "error when closing loose object file"
msgstr "關閉鬆散物件檔案時發生錯誤"
-#: object-file.c:1933
+#: object-file.c:1971
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件"
-#: object-file.c:1935
+#: object-file.c:1973
msgid "unable to create temporary file"
msgstr "無法建立暫存檔"
-#: object-file.c:1959
+#: object-file.c:1997
msgid "unable to write loose object file"
msgstr "不能寫鬆散物件檔案"
-#: object-file.c:1965
+#: object-file.c:2003
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能壓縮新物件 %s（%d）"
-#: object-file.c:1969
+#: object-file.c:2007
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"
-#: object-file.c:1973
+#: object-file.c:2011
#, c-format
msgid "confused by unstable object source data for %s"
-msgstr "被 %s 的不穩定物件源資料搞糊塗了"
+msgstr "被 %s 的不穩定物件來源資料混淆"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:2022 builtin/pack-objects.c:1251
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上呼叫 utime() 失敗"
-#: object-file.c:2060
+#: object-file.c:2100
#, c-format
msgid "cannot read object for %s"
msgstr "不能讀取物件 %s"
-#: object-file.c:2111
+#: object-file.c:2151
msgid "corrupt commit"
msgstr "損壞的提交"
-#: object-file.c:2119
+#: object-file.c:2159
msgid "corrupt tag"
msgstr "損壞的標籤"
-#: object-file.c:2219
+#: object-file.c:2259
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 時讀取錯誤"
-#: object-file.c:2222
+#: object-file.c:2262
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 時讀入不完整"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2335 object-file.c:2345
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s：插入資料庫失敗"
-#: object-file.c:2311
+#: object-file.c:2351
#, c-format
msgid "%s: unsupported file type"
msgstr "%s：不支援的檔案類型"
-#: object-file.c:2335
+#: object-file.c:2375 builtin/fetch.c:1494
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一個有效的物件"
-#: object-file.c:2337
+#: object-file.c:2377
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一個有效的 '%s' 物件"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2404
#, c-format
msgid "unable to open %s"
msgstr "不能開啟 %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2599
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s 的雜湊值不符合（預期 %s）"
-#: object-file.c:2583
+#: object-file.c:2622
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
-#: object-file.c:2588
+#: object-file.c:2628
#, c-format
msgid "unable to unpack header of %s"
msgstr "無法解壓縮 %s 的頭部"
-#: object-file.c:2594
+#: object-file.c:2633
#, c-format
msgid "unable to parse header of %s"
msgstr "無法解析 %s 的頭部"
-#: object-file.c:2605
+#: object-file.c:2644
#, c-format
msgid "unable to unpack contents of %s"
msgstr "無法解壓縮 %s 的內容"
-#: object-name.c:480
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c:382
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [無效物件]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c:407
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s 提交 %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c:428
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s 標籤 %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#. "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c:439
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [無效標籤，無法解析]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c:447
+#, c-format
+msgid "%s tree"
+msgstr "%s 樹"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c:453
+#, c-format
+msgid "%s blob"
+msgstr "%s blob"
+
+#: object-name.c:569
#, c-format
msgid "short object ID %s is ambiguous"
msgstr "短物件 ID %s 存在歧義"
-#: object-name.c:491
-msgid "The candidates are:"
-msgstr "候選者有："
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c:591
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"候選物件有：\n"
+"%s"
-#: object-name.c:790
+#: object-name.c:888
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5586,22 +5916,22 @@
"請檢查這些引用，並視需要刪除。執行\n"
"「git config advice.objectNameWarning false」命令以關閉本訊息通知"
-#: object-name.c:910
+#: object-name.c:1008
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "'%.*s' 的日誌只能回到 %s"
-#: object-name.c:918
+#: object-name.c:1016
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "'%.*s' 的日誌只有 %d 個項目"
-#: object-name.c:1696
+#: object-name.c:1794
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'"
-#: object-name.c:1702
+#: object-name.c:1800
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
@@ -5610,12 +5940,12 @@
"'%s' 路徑存在，但不是 '%s'\n"
"提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？"
-#: object-name.c:1711
+#: object-name.c:1809
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "'%s' 路徑不存在於 '%.*s'"
-#: object-name.c:1739
+#: object-name.c:1837
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
@@ -5624,7 +5954,7 @@
"'%s' 路徑在索引，但不在 %d 暫存區\n"
"提示：你在說 ':%d:%s' 嗎？"
-#: object-name.c:1755
+#: object-name.c:1853
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
@@ -5633,21 +5963,26 @@
"'%s' 路徑在索引，但不是 '%s'\n"
"提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？"
-#: object-name.c:1763
+#: object-name.c:1861
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "磁碟上存在 '%s' 路徑，但不在索引中"
-#: object-name.c:1765
+#: object-name.c:1863
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)"
-#: object-name.c:1778
+#: object-name.c:1876
msgid "relative path syntax can't be used outside working tree"
msgstr "相對路徑與法不能用在工作區外"
-#: object-name.c:1916
+#: object-name.c:1901
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "需要指定 <object>:<path>，卻只指定 <object>「%s」"
+
+#: object-name.c:2014
#, c-format
msgid "invalid object name '%.*s'."
msgstr "'%.*s' 物件名稱無效。"
@@ -5672,17 +6007,30 @@
msgid "unable to parse object: %s"
msgstr "不能解析物件：%s"
-#: object.c:283 object.c:295
+#: object.c:283 object.c:294
#, c-format
msgid "hash mismatch %s"
msgstr "雜湊值與 %s 不符合"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "多包位圖缺少需要的反向索引"
+
+#: pack-bitmap.c:433
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index：無法開啟包"
+
+#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
#, c-format
msgid "unable to get size of %s"
msgstr "不能得到 %s 的大小"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1937
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "找不到 %2$s 包，偏移位置 %3$<PRIuMAX> 的 %1$s"
+
+#: pack-bitmap.c:1973 builtin/rev-list.c:91
#, c-format
msgid "unable to get disk usage of %s"
msgstr "無法取得 %s 的磁碟用量"
@@ -5712,129 +6060,134 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "無法同時寫入和驗證倒排索引"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "無法 stat：%s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "無法讓 %s 能夠寫入"
-#: pack-write.c:522
+#: pack-write.c:521
#, c-format
msgid "could not write '%s' promisor file"
msgstr "無法寫入「%s」promisor 檔案"
-#: packfile.c:625
+#: packfile.c:627
msgid "offset before end of packfile (broken .idx?)"
msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"
-#: packfile.c:655
+#: packfile.c:657
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "包檔案 %s 無法映射%s"
-#: packfile.c:1934
+#: packfile.c:1924
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"
-#: packfile.c:1938
+#: packfile.c:1928
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "選項 `%s' 期望一個數字值"
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
#, c-format
msgid "malformed expiration date '%s'"
msgstr "格式錯誤的到期時間：'%s'"
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
#, c-format
msgid "malformed object name '%s'"
msgstr "格式錯誤的物件名 '%s'"
-#: parse-options.c:38
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "選項「%s」期望「%s」或「%s」"
+
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s 需要一個值"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s 與 %s 不相容"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s：和其它的不相容"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s 不取值"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s 不可用"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "你的意思是 `--%s`（有兩個短線）嗎？"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
#, c-format
msgid "alias of --%s"
msgstr "--%s 的別名"
-#: parse-options.c:879
+#: parse-options.c:892
#, c-format
msgid "unknown option `%s'"
msgstr "未知選項 `%s'"
-#: parse-options.c:881
+#: parse-options.c:894
#, c-format
msgid "unknown switch `%c'"
msgstr "未知開關 `%c'"
-#: parse-options.c:883
+#: parse-options.c:896
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "字串中未知的非 ascii 字元選項：`%s'"
-#: parse-options.c:907
+#: parse-options.c:920
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:934
#, c-format
msgid "usage: %s"
msgstr "用法：%s"
@@ -5842,98 +6195,122 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:949
#, c-format
msgid " or: %s"
msgstr " 或：%s"
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
# 譯者：為保證在輸出中對齊，注意調整句中空格！
-#: parse-options.c:935
+#: parse-options.c:993
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1040
msgid "-NUM"
msgstr "-數字"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能設定 %s 為組可寫"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "只允許一個 'attr:' 規格。"
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "屬性規格不能為空"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "無效的屬性名 %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "路徑規格包含無效的神奇前綴"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s：'literal' 和 'glob' 不相容"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s：'%s' 在位於 '%s' 的版本庫之外"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'（助記符：'%c'）"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s：路徑規格神奇前綴不被此指令支援：%s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路徑規格 '%s' 位於符號連結中"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "某行不應該被括號括住：%s"
@@ -5954,7 +6331,7 @@
msgid "flush packet write failed"
msgstr "flush 包寫錯誤"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "協定錯誤：不可能的長行"
@@ -5962,7 +6339,7 @@
msgid "packet write with format failed"
msgstr "格式化包寫入錯誤"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr "寫封包失敗：資料超過了包的最大長度"
@@ -5971,25 +6348,25 @@
msgid "packet write failed: %s"
msgstr "封包寫入失敗：%s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "讀取錯誤"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "遠端意外掛斷了"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "協定錯誤：錯誤的行長度字串：%.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
#, c-format
msgid "protocol error: bad line length %d"
msgstr "協定錯誤：錯誤的行長度 %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "遠端錯誤：%s"
@@ -6003,7 +6380,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "無法建立執行緒 lstat：%s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
@@ -6032,88 +6409,84 @@
msgid "Removing duplicate objects"
msgstr "正在刪除重複物件"
-#: range-diff.c:78
+#: range-diff.c:68
msgid "could not start `log`"
msgstr "不能啟動 `log`"
-#: range-diff.c:80
+#: range-diff.c:70
msgid "could not read `log` output"
msgstr "不能讀取 `log` 的輸出"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:98 sequencer.c:5575
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
-#: range-diff.c:115
+#: range-diff.c:109
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
"'%s'"
msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s」"
-#: range-diff.c:140
+#: range-diff.c:132
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "無法解析 git 頭 '%.*s'"
-#: range-diff.c:307
+#: range-diff.c:300
msgid "failed to generate diff"
msgstr "生成 diff 失敗"
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only 和 --right-only 互斥"
-
-#: range-diff.c:562 range-diff.c:564
+#: range-diff.c:558 range-diff.c:560
#, c-format
msgid "could not parse log for '%s'"
msgstr "不能解析 '%s' 的日誌"
-#: read-cache.c:710
+#: read-cache.c:737
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）"
-#: read-cache.c:726
+#: read-cache.c:753
msgid "cannot create an empty blob in the object database"
msgstr "不能在物件資料庫中建立空的資料物件"
-#: read-cache.c:748
+#: read-cache.c:775
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr "%s：只能新增一般檔案、符號連結或 git 目錄"
-#: read-cache.c:753
+#: read-cache.c:780 builtin/submodule--helper.c:3359
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' 沒有簽出一個提交"
-#: read-cache.c:805
+#: read-cache.c:832
#, c-format
msgid "unable to index file '%s'"
msgstr "無法索引檔案 '%s'"
-#: read-cache.c:824
+#: read-cache.c:851
#, c-format
msgid "unable to add '%s' to index"
msgstr "無法在索引中新增 '%s'"
-#: read-cache.c:835
+#: read-cache.c:862
#, c-format
msgid "unable to stat '%s'"
msgstr "無法對 %s 執行 stat"
-#: read-cache.c:1358
+#: read-cache.c:1404
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' 看起來既是檔案又是目錄"
-#: read-cache.c:1573
+#: read-cache.c:1619
msgid "Refresh index"
msgstr "重新整理索引"
-#: read-cache.c:1705
+#: read-cache.c:1751
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6122,7 +6495,7 @@
"設定了 index.version，但是取值無效。\n"
"使用版本 %i"
-#: read-cache.c:1715
+#: read-cache.c:1761
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6131,144 +6504,148 @@
"設定了 GIT_INDEX_VERSION，但是取值無效。\n"
"使用版本 %i"
-#: read-cache.c:1771
+#: read-cache.c:1817
#, c-format
msgid "bad signature 0x%08x"
msgstr "壞的簽名 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1820
#, c-format
msgid "bad index version %d"
msgstr "壞的索引版本 %d"
-#: read-cache.c:1783
+#: read-cache.c:1829
msgid "bad index file sha1 signature"
msgstr "壞的索引檔案 sha1 簽名"
-#: read-cache.c:1817
+#: read-cache.c:1863
#, c-format
msgid "index uses %.4s extension, which we do not understand"
-msgstr "索引使用不被支援的 %.4s 擴展"
+msgstr "索引使用不被支援的 %.4s 副檔名"
#
-#: read-cache.c:1819
+#: read-cache.c:1865
#, c-format
msgid "ignoring %.4s extension"
-msgstr "忽略 %.4s 擴展"
+msgstr "忽略 %.4s 副檔名"
-#: read-cache.c:1856
+#: read-cache.c:1902
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "未知的索引條目格式 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1918
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"
-#: read-cache.c:1929
+#: read-cache.c:1975
msgid "unordered stage entries in index"
msgstr "索引中有未排序的暫存條目"
-#: read-cache.c:1932
+#: read-cache.c:1978
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "合併檔案 '%s' 有多個暫存條目"
-#: read-cache.c:1935
+#: read-cache.c:1981
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' 的未排序暫存條目"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
+#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
+#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
+#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
+#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
+#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
msgid "index file corrupt"
msgstr "索引檔案損壞"
-#: read-cache.c:2185
+#: read-cache.c:2240
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "無法建立 load_cache_entries 執行緒：%s"
-#: read-cache.c:2198
+#: read-cache.c:2253
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "無法加入 load_cache_entries 執行緒：%s"
-#: read-cache.c:2231
+#: read-cache.c:2286
#, c-format
msgid "%s: index file open failed"
msgstr "%s：開啟索引檔案失敗"
-#: read-cache.c:2235
+#: read-cache.c:2290
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s：不能對開啟的索引執行 stat 動作"
-#: read-cache.c:2239
+#: read-cache.c:2294
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s：索引檔案比預期的小"
-#: read-cache.c:2243
+#: read-cache.c:2298
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s：無法 map 索引檔案%s"
-#: read-cache.c:2286
+#: read-cache.c:2341
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "無法建立 load_index_extensions 執行緒：%s"
-#: read-cache.c:2313
+#: read-cache.c:2368
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "無法加入 load_index_extensions 執行緒：%s"
-#: read-cache.c:2351
+#: read-cache.c:2414
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "無法重新整理共享索引 '%s'"
-#: read-cache.c:2398
+#: read-cache.c:2473
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3032
+msgid "cannot write split index for a sparse index"
+msgstr "無法寫入稀疏索引的索引分割"
+
+#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
#, c-format
msgid "could not close '%s'"
msgstr "不能關閉 '%s'"
-#: read-cache.c:3075
+#: read-cache.c:3157
msgid "failed to convert to a sparse-index"
msgstr "無法轉換成稀疏索引"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3228
#, c-format
msgid "could not stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
-#: read-cache.c:3159
+#: read-cache.c:3241
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能開啟 git 目錄：%s"
-#: read-cache.c:3171
+#: read-cache.c:3253
#, c-format
msgid "unable to unlink: %s"
msgstr "無法刪除：%s"
-#: read-cache.c:3200
+#: read-cache.c:3282
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "不能修復 '%s' 的權限位"
-#: read-cache.c:3349
+#: read-cache.c:3439
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s：不能落到暫存區 #0"
@@ -6339,7 +6716,7 @@
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] "重定基底 %s 到 %s（%d 個提交）"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6347,7 +6724,7 @@
"\n"
"不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6355,7 +6732,7 @@
"\n"
"如果您在這裡刪除一行，對應的提交將會遺失。\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6369,7 +6746,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6379,14 +6756,14 @@
"然而，如果您刪除全部內容，重定基底動作將會終止。\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
+#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
+#: builtin/rebase.c:191
#, c-format
msgid "could not write '%s'"
msgstr "不能寫入 '%s'"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "不能寫入 '%s'。"
@@ -6416,14 +6793,12 @@
"可選值有：ignore、warn、error。\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "不能讀取 '%s'。"
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s：「preserve」已經改成「merges」"
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2057
msgid "gone"
msgstr "遺失"
@@ -6442,257 +6817,238 @@
msgid "ahead %d, behind %d"
msgstr "領先 %d，落後 %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式：%%(color:<顏色>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "無法識別的顏色：%%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整數值 refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整數值 refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "無法識別的 %%(%s) 參數：%s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) 不帶參數"
-#: ref-filter.c:339
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "無法識別的 %%(objectsize) 參數：%s"
-
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) 不帶參數"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不帶參數"
-#: ref-filter.c:372
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "無法識別的 %%(subject) 引數：%s"
-
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "預期是 %%(trailers:key=<value>)"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "未知的 %%(trailers) 參數：%s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一個正數 contents:lines=%s"
-#: ref-filter.c:426
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "無法識別的 %%(contents) 參數：%s"
-
-#: ref-filter.c:441
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值"
-#: ref-filter.c:445
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數"
-
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "無法識別的 email 選項：%s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式：%%(align:<寬度>,<位置>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "無法識別的位置：%s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "無法識別的寬度：%s"
-#: ref-filter.c:517
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "無法識別的 %%(align) 參數：%s"
-
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一個正數的寬度"
-#: ref-filter.c:543
+#: ref-filter.c:568
#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "無法識別的 %%(if) 參數：%s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) 未取引數"
-#: ref-filter.c:645
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "格式錯誤的欄位名：%.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的欄位名：%.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料"
-#: ref-filter.c:801
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format：使用 %%(%s) 元素卻缺少 %%(%s) 元素"
-#: ref-filter.c:865
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素"
-
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式：%%(then) 元素用了多次"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式：%%(then) 元素用在了 %%(else) 之後"
-#: ref-filter.c:897
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素"
-
-#: ref-filter.c:899
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素"
-
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式：%%(else) 元素用了多次"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "錯誤的格式化字串 %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "本命令拒絕 atom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s 不能和 --python、--shell、--tcl 一起使用"
+
+#: ref-filter.c:1707
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "（無分支，重定 %s 的基底）"
-#: ref-filter.c:1624
+#: ref-filter.c:1710
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "（無分支，重定 %s 分離開頭指標的基底）"
-#: ref-filter.c:1627
+#: ref-filter.c:1713
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "（無分支，二分搜尋從 %s 開始）"
-#: ref-filter.c:1631
+#: ref-filter.c:1717
#, c-format
msgid "(HEAD detached at %s)"
msgstr "（開頭指標分離於 %s）"
-#: ref-filter.c:1634
+#: ref-filter.c:1720
#, c-format
msgid "(HEAD detached from %s)"
msgstr "（開頭指標分離自 %s）"
-#: ref-filter.c:1637
+#: ref-filter.c:1723
msgid "(no branch)"
msgstr "（無分支）"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1755 ref-filter.c:1973
#, c-format
msgid "missing object %s for %s"
msgstr "缺少 %2$s 的物件 %1$s"
-#: ref-filter.c:1679
+#: ref-filter.c:1765
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"
-#: ref-filter.c:2064
+#: ref-filter.c:2156
#, c-format
msgid "malformed object at '%s'"
msgstr "格式錯誤的物件 '%s'"
-#: ref-filter.c:2153
+#: ref-filter.c:2246
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略帶有錯誤名稱 %s 的引用"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2251 refs.c:672
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略損壞的引用 %s"
-#: ref-filter.c:2502
+#: ref-filter.c:2630
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2596
+#: ref-filter.c:2741
#, c-format
msgid "malformed object name %s"
msgstr "格式錯誤的物件名 %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2746
#, c-format
msgid "option `%s' must point to a commit"
msgstr "選項 `%s' 必須指向一個提交"
-#: refs.c:264
+#: reflog.c:407
+#, c-format
+msgid "not a reflog: %s"
+msgstr "不是引用日誌：%s"
+
+#: reflog.c:410
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "沒有 '%s' 的引用日誌"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s 沒有指向一個有效的物件！"
-#: refs.c:566
+#: refs.c:561
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6717,32 +7073,32 @@
"\n"
"\tgit branch -m <name>\n"
-#: refs.c:588
+#: refs.c:583
#, c-format
msgid "could not retrieve `%s`"
msgstr "無法擷取「%s」"
-#: refs.c:598
+#: refs.c:593
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "分支名稱無效：%s = %s"
-#: refs.c:674
+#: refs.c:670
#, c-format
msgid "ignoring dangling symref %s"
msgstr "忽略懸空符號引用 %s"
-#: refs.c:922
+#: refs.c:919
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "引用 %s 的日誌在 %s 之後有缺口"
-#: refs.c:929
+#: refs.c:926
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "引用 %s 的日誌意外終止於 %s"
-#: refs.c:994
+#: refs.c:991
#, c-format
msgid "log for %s is empty"
msgstr "%s 的日誌為空"
@@ -6752,46 +7108,46 @@
msgid "refusing to update ref with bad name '%s'"
msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
-#: refs.c:1157
+#: refs.c:1164
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "對引用 '%s' 執行 update_ref 失敗：%s"
-#: refs.c:2051
+#: refs.c:2059
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "不允許對引用 '%s' 多次更新"
-#: refs.c:2131
+#: refs.c:2145
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔離環境中禁止更新引用"
-#: refs.c:2142
+#: refs.c:2156
msgid "ref updates aborted by hook"
msgstr "引用更新被掛鉤拒絕"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2264 refs.c:2294
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' 已存在，無法建立 '%s'"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2270 refs.c:2305
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "無法同時處理 '%s' 和 '%s'"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1295
#, c-format
msgid "could not remove reference %s"
msgstr "無法刪除引用 %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1310 refs/packed-backend.c:1565
+#: refs/packed-backend.c:1575
#, c-format
msgid "could not delete reference %s: %s"
msgstr "無法刪除引用 %s：%s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1313 refs/packed-backend.c:1578
#, c-format
msgid "could not delete references: %s"
msgstr "無法刪除引用：%s"
@@ -6799,61 +7155,61 @@
#: refspec.c:170
#, c-format
msgid "invalid refspec '%s'"
-msgstr "無效的引用表達式：'%s'"
+msgstr "無效的引用規格：「%s」"
-#: remote.c:351
+#: remote.c:402
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "設定的遠端短名稱不能以 '/' 開始：%s"
-#: remote.c:399
+#: remote.c:450
msgid "more than one receivepack given, using the first"
msgstr "提供了一個以上的 receivepack，使用第一個"
-#: remote.c:407
+#: remote.c:458
msgid "more than one uploadpack given, using the first"
msgstr "提供了一個以上的 uploadpack，使用第一個"
-#: remote.c:590
+#: remote.c:698
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同時取得 %s 和 %s 至 %s"
-#: remote.c:594
+#: remote.c:702
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常追蹤 %s，而非 %s"
-#: remote.c:598
+#: remote.c:706
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同時追蹤 %s 和 %s"
-#: remote.c:666
+#: remote.c:774
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "模式的鍵 '%s' 沒有 '*'"
-#: remote.c:676
+#: remote.c:784
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "模式的值 '%s' 沒有 '*'"
-#: remote.c:1083
+#: remote.c:1191
#, c-format
msgid "src refspec %s does not match any"
-msgstr "源引用表達式 %s 沒有符合"
+msgstr "來源引用規格 %s 沒有符合項目"
-#: remote.c:1088
+#: remote.c:1196
#, c-format
msgid "src refspec %s matches more than one"
-msgstr "源引用表達式 %s 符合超過一個"
+msgstr "來源引用規格 %s 符合超過一個"
#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1103
+#: remote.c:1211
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6866,162 +7222,166 @@
"\n"
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-"您提供的目標不是一個完整的引用名稱（即以 \"refs/\" 開頭）。我們\n"
-"試著猜測您的想法：\n"
+"您提供的目的地不是完整的引用名稱（即以「refs/」開頭）。\n"
+"我們覺得您可能想要：\n"
"\n"
-"- 在遠端查詢和 '%s' 符合的引用。\n"
-"- 檢查要推送的 <src>（'%s'）是不是在 \"refs/{heads,tags}/\" 中的\n"
-" 引用。如果是，我們會在對應的遠端新增 refs/{heads,tags}/ 前綴。\n"
+"- 在遠端查詢符合「%s」的引用。\n"
+"- 檢查要推送的 <src>（'%s'）是不是在「refs/{heads,tags}/」中的引用。\n"
+" 如果是，我們會在對應的遠端新增 refs/{heads,tags}/ 前綴。\n"
"\n"
-"都不行，所以我們已放棄。您必須給出完整的引用。"
+"由於這些猜測都不正確，我們放棄了。您必須給出完整引用。"
-#: remote.c:1123
+#: remote.c:1231
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"Did you mean to create a new branch by pushing to\n"
"'%s:refs/heads/%s'?"
msgstr ""
-"引用表達式的 <src> 是一個提交物件。您是想建立一個新的分支而向\n"
-"'%s:refs/heads/%s' 推送嗎？"
+"引用規格的 <src> 是個提交物件。\n"
+"您是想透過推送至「%s:refs/heads/%s」\n"
+"來建立新分支嗎？"
-#: remote.c:1128
+#: remote.c:1236
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"Did you mean to create a new tag by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
-"引用表達式的 <src> 是一個標籤物件。您是想建立一個新的標籤而向\n"
-"'%s:refs/tags/%s' 推送嗎？"
+"引用規格的 <src> 是個標籤物件。\n"
+"您是想透過推送至「%s:refs/tags/%s」\n"
+"來建立新標籤嗎？"
-#: remote.c:1133
+#: remote.c:1241
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"Did you mean to tag a new tree by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
-"引用表達式的 <src> 是一個樹狀物件。您是想為這個樹狀物件建立標籤而向\n"
-"'%s:refs/tags/%s' 推送嗎？"
+"引用規格的 <src> 是個樹狀物件。\n"
+"您是想透過推送至「%s:refs/tags/%s」\n"
+"為新樹狀物件貼上標籤嗎？"
-#: remote.c:1138
+#: remote.c:1246
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"Did you mean to tag a new blob by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
-"引用表達式的 <src> 是一個資料物件。您是想為這個資料物件建立標籤而向\n"
-"'%s:refs/tags/%s' 推送嗎？"
+"引用規格的 <src> 是個資料 (blob) 物件。\n"
+"您是想透過推送至「%s:refs/tags/%s」\n"
+"為新資料物件貼上標籤嗎？"
-#: remote.c:1174
+#: remote.c:1282
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s 無法被解析為分支"
-#: remote.c:1185
+#: remote.c:1293
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "無法刪除 '%s'：遠端引用不存在"
-#: remote.c:1197
+#: remote.c:1305
#, c-format
msgid "dst refspec %s matches more than one"
-msgstr "目標引用表達式 %s 符合超過一個"
+msgstr "目的地引用規格 %s 符合超過一個"
-#: remote.c:1204
+#: remote.c:1312
#, c-format
msgid "dst ref %s receives from more than one src"
-msgstr "目標引用 %s 接收超過一個源"
+msgstr "目的地引用 %s 接收超過一個來源"
-#: remote.c:1724 remote.c:1825
+#: remote.c:1833 remote.c:1940
msgid "HEAD does not point to a branch"
msgstr "HEAD 沒有指向一個分支"
-#: remote.c:1733
+#: remote.c:1842
#, c-format
msgid "no such branch: '%s'"
msgstr "沒有此分支：'%s'"
-#: remote.c:1736
+#: remote.c:1845
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未給分支 '%s' 設定上游"
-#: remote.c:1742
+#: remote.c:1851
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支"
-#: remote.c:1757
+#: remote.c:1866
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "推送目標 '%s' 至遠端 '%s' 沒有本機追蹤分支"
+msgstr "推送目的地 '%s' 至遠端 '%s' 沒有本機追蹤分支"
-#: remote.c:1769
+#: remote.c:1881
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 沒有設定要推送的遠端伺服器"
-#: remote.c:1779
+#: remote.c:1891
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用規格未包含 '%s'"
-#: remote.c:1792
+#: remote.c:1904
msgid "push has no destination (push.default is 'nothing')"
-msgstr "推送無目標（push.default 是 'nothing'）"
+msgstr "推送沒有目的地（push.default 是 'nothing'）"
-#: remote.c:1814
+#: remote.c:1926
msgid "cannot resolve 'simple' push to a single destination"
-msgstr "無法解析 'simple' 推送至一個單獨的目標"
+msgstr "無法解析 'simple' 推送至單獨目的地"
-#: remote.c:1943
+#: remote.c:2059
#, c-format
msgid "couldn't find remote ref %s"
msgstr "無法找到遠端引用 %s"
-#: remote.c:1956
+#: remote.c:2072
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* 在本機忽略可笑的引用 '%s'"
-#: remote.c:2119
+#: remote.c:2235
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n"
-#: remote.c:2123
+#: remote.c:2239
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n"
-#: remote.c:2126
+#: remote.c:2242
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支與上游分支 '%s' 一致。\n"
-#: remote.c:2130
+#: remote.c:2246
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
-#: remote.c:2133
+#: remote.c:2249
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " （使用 \"%s\" 檢視詳情）\n"
-#: remote.c:2137
+#: remote.c:2253
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n"
-#: remote.c:2143
+#: remote.c:2259
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " （使用 \"git push\" 來發布您的本機提交）\n"
-#: remote.c:2146
+#: remote.c:2262
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -7029,11 +7389,11 @@
msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n"
# 譯者：請維持前導空格
-#: remote.c:2154
+#: remote.c:2270
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " （使用 \"git pull\" 來更新您的本機分支）\n"
-#: remote.c:2157
+#: remote.c:2273
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -7046,11 +7406,11 @@
"並且分別有 %d 和 %d 處不同的提交。\n"
# 譯者：請維持前導空格
-#: remote.c:2167
+#: remote.c:2283
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 來合併遠端分支）\n"
-#: remote.c:2359
+#: remote.c:2475
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "無法解析期望的物件名 '%s'"
@@ -7083,130 +7443,121 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "寫入 '%s' (%s) 時發生錯誤"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
-msgstr "重新整理 '%s' 失敗"
+msgstr "排清 '%s' 失敗"
-#: rerere.c:487 rerere.c:1023
+#: rerere.c:487 rerere.c:1024
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "不能解析 '%s' 中的衝突區塊"
-#: rerere.c:668
+#: rerere.c:669
#, c-format
msgid "failed utime() on '%s'"
msgstr "在 '%s' 上呼叫 utime() 失敗"
-#: rerere.c:678
+#: rerere.c:679
#, c-format
msgid "writing '%s' failed"
msgstr "寫入 '%s' 失敗"
-#: rerere.c:698
+#: rerere.c:699
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "使用之前的解決方案暫存 '%s'。"
-#: rerere.c:737
+#: rerere.c:738
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "已記錄 '%s' 的解決方案。"
-#: rerere.c:772
+#: rerere.c:773
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "使用之前的解決方案解決 '%s'。"
-#: rerere.c:787
+#: rerere.c:788
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "不能刪除 stray '%s'"
-#: rerere.c:791
+#: rerere.c:792
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "為 '%s' 記錄 preimage"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
+#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
#, c-format
msgid "could not create directory '%s'"
msgstr "不能建立目錄 '%s'"
-#: rerere.c:1041
+#: rerere.c:1042
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "更新 '%s' 中的衝突狀態失敗"
-#: rerere.c:1052 rerere.c:1059
+#: rerere.c:1053 rerere.c:1060
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "沒有為 '%s' 記憶的解決方案"
-#: rerere.c:1061
+#: rerere.c:1062
#, c-format
msgid "cannot unlink '%s'"
msgstr "不能刪除 '%s'"
-#: rerere.c:1071
+#: rerere.c:1072
#, c-format
msgid "Updated preimage for '%s'"
msgstr "已為 '%s' 更新 preimage"
-#: rerere.c:1080
+#: rerere.c:1081
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "忘記 '%s' 的解決方案\n"
-#: rerere.c:1191
+#: rerere.c:1192
msgid "unable to open rr-cache directory"
msgstr "不能開啟 rr-cache 目錄"
-#: reset.c:42
+#: reset.c:112
msgid "could not determine HEAD revision"
msgstr "不能確定 HEAD 版本"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:141 reset.c:147 sequencer.c:3696
#, c-format
msgid "failed to find tree of %s"
msgstr "無法找到 %s 指向的樹"
-#: revision.c:2344
+#: revision.c:2358
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<packfile> 已不受支援"
-#: revision.c:2684
+#: revision.c:2712
msgid "your current branch appears to be broken"
msgstr "您的目前分支好像被損壞"
-#: revision.c:2687
+#: revision.c:2715
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的目前分支 '%s' 尚無任何提交"
-#: revision.c:2893
+#: revision.c:2901
+msgid "object filtering requires --objects"
+msgstr "物件過濾需要 --objects"
+
+#: revision.c:2918
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "不能開啟 /dev/null"
-
-#: run-command.c:1274
+#: run-command.c:1262
#, c-format
msgid "cannot create async thread: %s"
msgstr "不能建立 async 執行緒：%s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n"
-"設定 `git config advice.ignoredHook false` 來關閉這條警告。"
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr "讀取遠端解包狀態時收到意外的 flush 包"
@@ -7225,69 +7576,70 @@
msgid "failed to sign the push certificate"
msgstr "為推送證書籤名失敗"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack：無法 fork 一個 fetch 子處理程序"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "push 協商失敗。繼續使用 push 處理"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "接收端不支援此版本庫的雜湊算法"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "接收端不支援 --signed 推送"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未傳送推送證書，因為接收端不支援 --signed 推送"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支援 --atomic 推送"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "接收端不支援推送選項"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "無效的提交說明清理模式 '%s'"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "無法刪除 '%s'"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
+#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
msgstr "無法刪除 '%s'"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "復原"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "摘取"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "未知動作：%d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7295,52 +7647,81 @@
"衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
"指令標記修正後的檔案"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
-"對修正後的檔案做標記，然後用 'git commit' 提交"
+"解決衝突後，請使用\n"
+"\"git add/rm <pathspec>\" 標記路徑，再執行\n"
+"\"git cherry-pick --continue\"。\n"
+"亦可以使用 \"git cherry-pick --skip\" 略過提交。\n"
+"若要取消並返回 \"git cherry-pick\" 前的狀態，\n"
+"請執行 \"git cherry-pick --abort\"。"
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"解決衝突後，請使用\n"
+"\"git add/rm <pathspec>\" 標記路徑，再執行\n"
+"\"git revert --continue\"。\n"
+"亦可以使用 \"git revert --skip\" 略過提交。\n"
+"若要取消並返回 \"git revert\" 前的狀態，\n"
+"請執行 \"git revert --abort\"。"
+
+#: sequencer.c:448 sequencer.c:3288
#, c-format
msgid "could not lock '%s'"
msgstr "不能鎖定 '%s'"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
+#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
#, c-format
msgid "could not write to '%s'"
msgstr "不能寫入 '%s'"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能將換行符號寫入 '%s'"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3565
#, c-format
msgid "failed to finalize '%s'"
msgstr "無法完成 '%s'"
-#: sequencer.c:486
+#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
+#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
+#, c-format
+msgid "could not read '%s'"
+msgstr "不能讀取 '%s'"
+
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本機修改將被%s覆蓋。"
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或儲藏後再繼續。"
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s：快轉"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:615
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "無效的清理模式 %s"
@@ -7348,65 +7729,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：無法寫入新索引檔案"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "不能更新快取樹"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中沒有 key"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "無法為 '%s' 的值去引號"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
+#: builtin/am.c:849 builtin/rebase.c:699
#, c-format
msgid "could not open '%s' for reading"
msgstr "無法開啟 '%s' 進行讀取"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已經給出 'GIT_AUTHOR_NAME'"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已經給出 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已經給出 'GIT_AUTHOR_DATE'"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "未知變數 '%s'"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7435,11 +7816,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1225
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 掛鉤失敗"
-#: sequencer.c:1218
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7453,17 +7834,17 @@
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"您的姓名和信件位址基於登入名稱和主機名稱自動設定。請檢查它們正確\n"
-"與否。您可以對其進行設定以免再出現本提示訊息。執行如下指令在編輯器\n"
-"中編輯您的設定檔案：\n"
+"您的姓名和信件位址皆根據您的使用者名稱和主機名稱自動設定。\n"
+"請檢查是否正確。您可以自行設定，這樣便不會再出現這個提示訊息。\n"
+"執行如下指令，在編輯器中遵循指引編輯您的設定檔案：\n"
"\n"
" git config --global --edit\n"
"\n"
-"設定完畢後，您可以用下面的指令來修正本次提交所使用的使用者身份：\n"
+"設定完畢後，您可以使用下述指令，修正這個提交的提交者身份：\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1244
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7476,354 +7857,355 @@
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"您的姓名和信件位址基於登入名稱和主機名稱自動設定。請檢查它們正確\n"
-"與否。您可以對其進行設定以免再出現本提示訊息：\n"
+"您的姓名和信件位址皆根據您的使用者名稱和主機名稱自動設定。\n"
+"請檢查是否正確。您可以自行設定，這樣便不會再出現這個提示訊息：\n"
"\n"
" git config --global user.name \"Your Name\"\n"
" git config --global user.email you@example.com\n"
"\n"
-"設定完畢後，您可以用下面的指令來修正本次提交所使用的使用者身份：\n"
+"設定完畢後，您可以使用下述指令，修正這個提交使用的提交者身份：\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1287
msgid "couldn't look up newly created commit"
msgstr "無法找到新建立的提交"
-#: sequencer.c:1275
+#: sequencer.c:1289
msgid "could not parse newly created commit"
msgstr "不能解析新建立的提交"
-#: sequencer.c:1321
+#: sequencer.c:1336
msgid "unable to resolve HEAD after creating commit"
msgstr "建立提交後，不能解析 HEAD"
-#: sequencer.c:1323
+#: sequencer.c:1338
msgid "detached HEAD"
msgstr "分離 HEAD"
# 譯者：中文字串拼接，可刪除前導空格
-#: sequencer.c:1327
+#: sequencer.c:1342
msgid " (root-commit)"
msgstr " (根提交)"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1365
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一個提交！"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1425 sequencer.c:2310
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 無法寫入樹狀物件"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1469 sequencer.c:1589
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能從 '%s' 讀取提交說明"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1500 sequencer.c:1532
#, c-format
msgid "invalid author identity '%s'"
msgstr "無效的作者身分 '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1506
msgid "corrupt author: missing date information"
msgstr "作者資訊損壞：缺少日期資訊"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
+#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "寫提交物件失敗"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:1606
+#: sequencer.c:1621
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1611
+#: sequencer.c:1626
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1709 sequencer.c:1990
#, c-format
msgid "unknown command: %d"
msgstr "未知指令：%d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1751
msgid "This is the 1st commit message:"
msgstr "這是第一個提交說明："
-#: sequencer.c:1737
+#: sequencer.c:1752
#, c-format
msgid "This is the commit message #%d:"
msgstr "這是提交說明 #%d："
-#: sequencer.c:1738
+#: sequencer.c:1753
msgid "The 1st commit message will be skipped:"
msgstr "略過第 1 個提交說明："
-#: sequencer.c:1739
+#: sequencer.c:1754
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "略過第 %d 個提交說明："
-#: sequencer.c:1740
+#: sequencer.c:1755
#, c-format
msgid "This is a combination of %d commits."
msgstr "這是整合 %d 個提交的集合提交。"
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1902 sequencer.c:1959
#, c-format
msgid "cannot write '%s'"
msgstr "不能寫 '%s'"
-#: sequencer.c:1934
+#: sequencer.c:1949
msgid "need a HEAD to fixup"
msgstr "需要一個 HEAD 來修復"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1951 sequencer.c:3592
msgid "could not read HEAD"
msgstr "不能讀取 HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1953
msgid "could not read HEAD's commit message"
msgstr "不能讀取 HEAD 的提交說明"
-#: sequencer.c:1962
+#: sequencer.c:1977
#, c-format
msgid "could not read commit message of %s"
msgstr "不能讀取 %s 的提交說明"
-#: sequencer.c:2072
+#: sequencer.c:2087
msgid "your index file is unmerged."
msgstr "您的索引檔案未完成合併。"
-#: sequencer.c:2079
+#: sequencer.c:2094
msgid "cannot fixup root commit"
msgstr "不能修復根提交"
-#: sequencer.c:2098
+#: sequencer.c:2113
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一個合併提交但未提供 -m 選項。"
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2121 sequencer.c:2129
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 沒有第 %d 個父提交"
-#: sequencer.c:2120
+#: sequencer.c:2135
#, 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:2139
+#: sequencer.c:2154
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:2205
+#: sequencer.c:2220
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能將 '%s' 重新命名為 '%s'"
-#: sequencer.c:2265
+#: sequencer.c:2280
#, c-format
msgid "could not revert %s... %s"
msgstr "不能還原 %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2281
#, c-format
msgid "could not apply %s... %s"
msgstr "不能套用 %s... %s"
-#: sequencer.c:2287
+#: sequencer.c:2302
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n"
-#: sequencer.c:2345
+#: sequencer.c:2360
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：無法讀取索引"
-#: sequencer.c:2352
+#: sequencer.c:2368
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：無法重新整理索引"
-#: sequencer.c:2425
+#: sequencer.c:2448
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受參數：'%s'"
-#: sequencer.c:2434
+#: sequencer.c:2457
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的參數"
-#: sequencer.c:2477
+#: sequencer.c:2500
#, c-format
msgid "could not parse '%s'"
msgstr "無法解析 '%s'"
-#: sequencer.c:2538
+#: sequencer.c:2561
#, c-format
msgid "invalid line %d: %.*s"
msgstr "無效行 %d：%.*s"
-#: sequencer.c:2549
+#: sequencer.c:2572
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "沒有父提交的情況下不能 '%s'"
-#: sequencer.c:2635
+#: sequencer.c:2620 builtin/rebase.c:185
+#, c-format
+msgid "could not read '%s'."
+msgstr "不能讀取 '%s'。"
+
+#: sequencer.c:2658
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一個進行中的揀選"
-#: sequencer.c:2644
+#: sequencer.c:2667
msgid "cancelling a revert in progress"
msgstr "正在取消一個進行中的還原"
-#: sequencer.c:2690
+#: sequencer.c:2707
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "請用 'git rebase --edit-todo' 來修改。"
-#: sequencer.c:2692
+#: sequencer.c:2709
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清單：'%s'"
-#: sequencer.c:2697
+#: sequencer.c:2714
msgid "no commits parsed."
msgstr "沒有解析提交。"
-#: sequencer.c:2708
+#: sequencer.c:2725
msgid "cannot cherry-pick during a revert."
msgstr "不能在還原提交中執行揀選。"
-#: sequencer.c:2710
+#: sequencer.c:2727
msgid "cannot revert during a cherry-pick."
msgstr "不能在揀選中執行還原提交。"
-#: sequencer.c:2788
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "%s 的值無效：%s"
-
-#: sequencer.c:2897
+#: sequencer.c:2914
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2917
+#: sequencer.c:2934
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式錯誤的選項清單：'%s'"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3029 sequencer.c:4875
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:3029
+#: sequencer.c:3046
msgid "revert is already in progress"
msgstr "一個還原動作已在進行"
-#: sequencer.c:3031
+#: sequencer.c:3048
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3051
msgid "cherry-pick is already in progress"
msgstr "揀選動作已在進行"
-#: sequencer.c:3036
+#: sequencer.c:3053
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3067
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能建立序列目錄 '%s'"
-#: sequencer.c:3065
+#: sequencer.c:3082
msgid "could not lock HEAD"
msgstr "不能鎖定 HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3142 sequencer.c:4585
msgid "no cherry-pick or revert in progress"
msgstr "揀選或還原動作並未進行"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3144 sequencer.c:3155
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3146 sequencer.c:3190
msgid "cannot abort from a branch yet to be born"
msgstr "不能從尚未建立的分支終止"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
+#: builtin/grep.c:774
#, c-format
msgid "cannot open '%s'"
msgstr "不能開啟 '%s'"
-#: sequencer.c:3161
+#: sequencer.c:3178
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能讀取 '%s'：%s"
-#: sequencer.c:3162
+#: sequencer.c:3179
msgid "unexpected end of file"
msgstr "意外的檔案結束"
-#: sequencer.c:3168
+#: sequencer.c:3185
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞"
-#: sequencer.c:3179
+#: sequencer.c:3196
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！"
-#: sequencer.c:3220
+#: sequencer.c:3237
msgid "no revert in progress"
msgstr "沒有正在進行的還原"
-#: sequencer.c:3229
+#: sequencer.c:3246
msgid "no cherry-pick in progress"
msgstr "沒有正在進行的揀選"
-#: sequencer.c:3239
+#: sequencer.c:3256
msgid "failed to skip the commit"
msgstr "無法略過這個提交"
-#: sequencer.c:3246
+#: sequencer.c:3263
msgid "there is nothing to skip"
msgstr "沒有要略過的"
-#: sequencer.c:3249
+#: sequencer.c:3266
#, c-format
msgid ""
"have you committed already?\n"
@@ -7832,16 +8214,16 @@
"您已經提交了嗎？\n"
"試試 \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3428 sequencer.c:4476
msgid "cannot read HEAD"
msgstr "不能讀取 HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3445
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "無法複製 '%s' 至 '%s'"
-#: sequencer.c:3436
+#: sequencer.c:3453
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7860,28 +8242,28 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3463
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能套用 %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3470
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合併 %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能複製 '%s' 至 '%s'"
-#: sequencer.c:3483
+#: sequencer.c:3499
#, c-format
msgid "Executing: %s\n"
msgstr "執行：%s\n"
# 譯者：請維持前導空格
-#: sequencer.c:3498
+#: sequencer.c:3510
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7896,11 +8278,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3516
msgid "and made changes to the index and/or the working tree\n"
msgstr "並且修改索引和/或工作區\n"
-#: sequencer.c:3510
+#: sequencer.c:3522
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7917,90 +8299,90 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3582
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的標籤名稱：'%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3655
msgid "writing fake root commit"
msgstr "寫偽根提交"
-#: sequencer.c:3650
+#: sequencer.c:3660
msgid "writing squash-onto"
msgstr "寫入 squash-onto"
-#: sequencer.c:3734
+#: sequencer.c:3739
#, c-format
msgid "could not resolve '%s'"
msgstr "無法解析 '%s'"
-#: sequencer.c:3767
+#: sequencer.c:3771
msgid "cannot merge without a current revision"
msgstr "沒有目前版本不能合併"
-#: sequencer.c:3789
+#: sequencer.c:3793
#, c-format
msgid "unable to parse '%.*s'"
msgstr "無法解析 '%.*s'"
-#: sequencer.c:3798
+#: sequencer.c:3802
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "無可用合併：'%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3814
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章魚合並不能在一個新的根提交上執行"
-#: sequencer.c:3826
+#: sequencer.c:3869
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能取得 '%s' 的提交說明"
-#: sequencer.c:4009
+#: sequencer.c:4013
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能嘗試合併 '%.*s'"
-#: sequencer.c:4025
+#: sequencer.c:4029
msgid "merge: Unable to write new index file"
msgstr "合併：無法寫入新索引檔案"
-#: sequencer.c:4099
+#: sequencer.c:4110
msgid "Cannot autostash"
msgstr "無法 autostash"
-#: sequencer.c:4102
+#: sequencer.c:4113
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "意外的 stash 回應：'%s'"
-#: sequencer.c:4108
+#: sequencer.c:4119
#, c-format
msgid "Could not create directory for '%s'"
msgstr "不能為 '%s' 建立目錄"
-#: sequencer.c:4111
+#: sequencer.c:4122
#, c-format
msgid "Created autostash: %s\n"
msgstr "建立了 autostash：%s\n"
-#: sequencer.c:4115
+#: sequencer.c:4124
msgid "could not reset --hard"
msgstr "無法 reset --hard"
-#: sequencer.c:4140
+#: sequencer.c:4148
#, c-format
msgid "Applied autostash.\n"
msgstr "已套用 autostash。\n"
-#: sequencer.c:4152
+#: sequencer.c:4160
#, c-format
msgid "cannot store %s"
msgstr "不能儲存 %s"
-#: sequencer.c:4155
+#: sequencer.c:4163
#, c-format
msgid ""
"%s\n"
@@ -8011,29 +8393,29 @@
"您的修改安全地儲存在儲藏區中。\n"
"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:4160
+#: sequencer.c:4168
msgid "Applying autostash resulted in conflicts."
msgstr "因套用自動儲藏而導致衝突。"
-#: sequencer.c:4161
+#: sequencer.c:4169
msgid "Autostash exists; creating a new stash entry."
msgstr "已有自動儲藏；建立新儲藏項目。"
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4225
msgid "could not detach HEAD"
msgstr "不能分離開頭指標"
-#: sequencer.c:4248
+#: sequencer.c:4240
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4242
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4274
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8053,58 +8435,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4320
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "正在重定基底 (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4366
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4436
#, c-format
msgid "unknown command %d"
msgstr "未知指令 %d"
-#: sequencer.c:4480
+#: sequencer.c:4484
msgid "could not read orig-head"
msgstr "不能讀取 orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4489
msgid "could not read 'onto'"
msgstr "不能讀取 'onto'"
-#: sequencer.c:4499
+#: sequencer.c:4503
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 為 %s"
-#: sequencer.c:4559
+#: sequencer.c:4563
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "成功重定基底並更新 %s。\n"
-#: sequencer.c:4611
+#: sequencer.c:4615
msgid "cannot rebase: You have unstaged changes."
msgstr "不能重定基底：您有未暫存的變更。"
-#: sequencer.c:4620
+#: sequencer.c:4624
msgid "cannot amend non-existing commit"
msgstr "不能修補不存在的提交"
-#: sequencer.c:4622
+#: sequencer.c:4626
#, c-format
msgid "invalid file: '%s'"
msgstr "無效檔案：'%s'"
-#: sequencer.c:4624
+#: sequencer.c:4628
#, c-format
msgid "invalid contents: '%s'"
msgstr "無效內容：'%s'"
-#: sequencer.c:4627
+#: sequencer.c:4631
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8113,59 +8495,68 @@
"\n"
"您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4667 sequencer.c:4706
#, c-format
msgid "could not write file: '%s'"
msgstr "不能寫入檔案：'%s'"
-#: sequencer.c:4718
+#: sequencer.c:4722
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能刪除 CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4732
msgid "could not commit staged changes."
msgstr "不能提交暫存的修改。"
-#: sequencer.c:4845
+#: sequencer.c:4852
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能揀選一個%s"
-#: sequencer.c:4849
+#: sequencer.c:4856
#, c-format
msgid "%s: bad revision"
msgstr "%s：錯誤的版本"
-#: sequencer.c:4884
+#: sequencer.c:4891
msgid "can't revert as initial commit"
msgstr "不能作為初始提交還原提交"
-#: sequencer.c:5361
+#: sequencer.c:5162 sequencer.c:5391
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "已略過先前套用的 %s 提交"
+
+#: sequencer.c:5232 sequencer.c:5407
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "使用 --reapply-cherry-picks 以包含略過提交"
+
+#: sequencer.c:5378
msgid "make_script: unhandled options"
msgstr "make_script：有未能處理的選項"
-#: sequencer.c:5364
+#: sequencer.c:5381
msgid "make_script: error preparing revisions"
msgstr "make_script：準備版本時錯誤"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5639 sequencer.c:5656
msgid "nothing to do"
msgstr "無事可做"
-#: sequencer.c:5650
+#: sequencer.c:5675
msgid "could not skip unnecessary pick commands"
msgstr "無法略過不必要的揀選"
-#: sequencer.c:5750
+#: sequencer.c:5775
msgid "the script was already rearranged."
msgstr "腳本已經重新編排。"
-#: setup.c:133
+#: setup.c:135
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' 在位於 '%s' 的版本庫之外"
-#: setup.c:185
+#: setup.c:187
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -8174,7 +8565,7 @@
"%s：工作區中無此路徑。\n"
"使用指令 'git <命令> -- <路徑>...' 來指定本機不存在的路徑。"
-#: setup.c:198
+#: setup.c:200
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8185,12 +8576,12 @@
"使用 '--' 來分隔版本和路徑，例如：\n"
"'git <命令> [<版本>...] -- [<檔案>...]'"
-#: setup.c:264
+#: setup.c:266
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "選項 '%s' 必須在其他非選項參數之前"
-#: setup.c:283
+#: setup.c:285
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -8201,98 +8592,98 @@
"使用 '--' 來分隔版本和路徑，例如：\n"
"'git <命令> [<版本>...] -- [<檔案>...]'"
-#: setup.c:419
+#: setup.c:421
msgid "unable to set up work tree using invalid config"
msgstr "無法使用無效設定來建立工作區"
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:425 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "該動作必須在一個工作區中執行"
-#: setup.c:658
+#: setup.c:724
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 版本庫版本 <= %d，卻得到 %d"
-#: setup.c:666
+#: setup.c:732
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "找到未知的儲存庫擴充元件："
-#: setup.c:680
+#: setup.c:746
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "repo 版本是 0 (v0)，但找到只支援 v1 的擴充元件："
-#: setup.c:701
+#: setup.c:767
#, c-format
msgid "error opening '%s'"
msgstr "開啟 '%s' 發生錯誤"
-#: setup.c:703
+#: setup.c:769
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "檔案太大，無法作為 .git 檔案：'%s'"
-#: setup.c:705
+#: setup.c:771
#, c-format
msgid "error reading %s"
msgstr "讀取 %s 發生錯誤"
-#: setup.c:707
+#: setup.c:773
#, c-format
msgid "invalid gitfile format: %s"
msgstr "無效的 gitfile 格式：%s"
-#: setup.c:709
+#: setup.c:775
#, c-format
msgid "no path in gitfile: %s"
msgstr "在 gitfile 中沒有路徑：%s"
-#: setup.c:711
+#: setup.c:777
#, c-format
msgid "not a git repository: %s"
msgstr "不是一個 git 版本庫：%s"
-#: setup.c:813
+#: setup.c:879
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' 太大"
-#: setup.c:827
+#: setup.c:893
#, c-format
msgid "not a git repository: '%s'"
msgstr "不是一個 git 版本庫：'%s'"
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:922 setup.c:924 setup.c:955
#, c-format
msgid "cannot chdir to '%s'"
msgstr "不能切換目錄到 '%s'"
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
msgid "cannot come back to cwd"
msgstr "無法返回目前工作目錄"
-#: setup.c:988
+#: setup.c:1054
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "取得 '%*s%s%s' 狀態（stat）失敗"
-#: setup.c:1231
+#: setup.c:1338
msgid "Unable to read current working directory"
msgstr "不能讀取目前工作目錄"
-#: setup.c:1240 setup.c:1246
+#: setup.c:1347 setup.c:1353
#, c-format
msgid "cannot change to '%s'"
msgstr "不能切換到 '%s'"
-#: setup.c:1251
+#: setup.c:1358
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "不是一個 git 版本庫（或者任何父目錄）：%s"
-#: setup.c:1257
+#: setup.c:1364
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -8301,7 +8692,20 @@
"不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"
"停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
-#: setup.c:1381
+#: setup.c:1374
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"不安全版本庫（「%s」由其他人所有）\n"
+"若要放行本目錄，請呼叫：\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#: setup.c:1502
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8310,198 +8714,200 @@
"參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n"
"檔案所有者必須始終擁有讀寫權限。"
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "不能開啟或者複製 /dev/null"
-
-#: setup.c:1445
+#: setup.c:1564
msgid "fork failed"
msgstr "fork 失敗"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1569
msgid "setsid failed"
msgstr "setsid 失敗"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "嘗試不在 cone 模式使用稀疏索引"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "無法更新快取樹，保持完整"
-
-#: sparse-index.c:263
+#: sparse-index.c:285
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）"
+#: split-index.c:9
+msgid "cannot use split index with a sparse index"
+msgstr "無法在稀疏索引使用索引分割"
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:852
+#: 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:860
+#: strbuf.c:861
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:862
+#: 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:869
+#: strbuf.c:870
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:871
+#: 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:877
+#: strbuf.c:878
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[0] "%u 位元組"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
+#: strbuf.c:880
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u 位元組/秒"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
+#: builtin/rebase.c:653
#, c-format
msgid "could not open '%s' for writing"
msgstr "無法開啟 '%s' 進行寫入"
-#: strbuf.c:1177
+#: strbuf.c:1196
#, c-format
msgid "could not edit '%s'"
msgstr "無法編輯 '%s'"
-#: submodule-config.c:237
+#: submodule-config.c:238
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "忽略可疑的子模組名稱：%s"
-#: submodule-config.c:304
+#: submodule-config.c:305
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "submodule.fetchjobs 不允許為負值"
-#: submodule-config.c:402
+#: submodule-config.c:403
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr "忽略可能被解析為指令列選項的 '%s'：%s"
-#: submodule-config.c:499
+#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
#, c-format
-msgid "invalid value for %s"
-msgstr "%s 的值無效"
+msgid "invalid value for '%s'"
+msgstr "「%s」的值無效"
-#: submodule-config.c:766
+#: submodule-config.c:828
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 條目 %s"
-#: submodule.c:114 submodule.c:143
+#: submodule.c:115 submodule.c:144
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "無法修改未合併的 .gitmodules，先解決合併衝突"
-#: submodule.c:118 submodule.c:147
+#: submodule.c:119 submodule.c:148
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "無法在 .gitmodules 中找到 path=%s 的小節"
-#: submodule.c:154
+#: submodule.c:155
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "無法移除 %s 的 .gitmodules 條目"
-#: submodule.c:165
+#: submodule.c:166
msgid "staging updated .gitmodules failed"
msgstr "將更新後 .gitmodules 新增暫存區失敗"
-#: submodule.c:328
+#: submodule.c:346
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "位於未簽出的子模組 '%s'"
-#: submodule.c:359
+#: submodule.c:377
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路徑規格 '%s' 在子模組 '%.*s' 中"
-#: submodule.c:436
+#: submodule.c:454
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "無效 --ignore-submodules 參數：%s"
-#: submodule.c:805
+#: submodule.c:866
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。略過。"
-#: submodule.c:908
+#: submodule.c:987
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交"
-#: submodule.c:993
+#: submodule.c:1069
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1' 命令"
-#: submodule.c:1116
+#: submodule.c:1192
#, c-format
msgid "process for submodule '%s' failed"
msgstr "處理 '%s' 子模組失敗"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
msgid "Failed to resolve HEAD as a valid ref."
msgstr "無法將 HEAD 解析為有效引用。"
-#: submodule.c:1156
+#: submodule.c:1232
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "正在推送 '%s' 子模組\n"
-#: submodule.c:1159
+#: submodule.c:1235
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "無法推送 '%s' 子模組\n"
-#: submodule.c:1451
+#: submodule.c:1567
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "正在抓取 %s%s 子模組\n"
-#: submodule.c:1485
+#: submodule.c:1589
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "無法存取子模組 '%s'\n"
-#: submodule.c:1640
+#: submodule.c:1618
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "無法存取 %2$s 提交的子模組「%1$s」\n"
+
+#: submodule.c:1629
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "正在抓取 %3$s 提交的 %1$s%2$s 子模組\n"
+
+#: submodule.c:1849
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8510,77 +8916,77 @@
"抓取子模組時發生錯誤：\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1874
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "無法將 '%s' 識別為一個 git 版本庫"
-#: submodule.c:1682
+#: submodule.c:1891
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "無法在 %s 子模組執行 'git status --porcelain=2'"
-#: submodule.c:1723
+#: submodule.c:1932
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "%s 子模組執行 'git status --porcelain=2' 失敗"
-#: submodule.c:1798
+#: submodule.c:2007
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "無法在子模組 '%s' 中啟動 'git status'"
-#: submodule.c:1811
+#: submodule.c:2020
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "無法在子模組 '%s' 中執行 'git status'"
-#: submodule.c:1826
+#: submodule.c:2037
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:2064 submodule.c:2379
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "無法遞迴子模組路徑 '%s'"
-#: submodule.c:1874
+#: submodule.c:2086
msgid "could not reset submodule index"
msgstr "無法重設子模組的索引"
-#: submodule.c:1916
+#: submodule.c:2128
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "子模組 '%s' 中有髒索引"
-#: submodule.c:1968
+#: submodule.c:2182
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "子模組 '%s' 無法被更新。"
-#: submodule.c:2036
+#: submodule.c:2250
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中"
-#: submodule.c:2057
+#: submodule.c:2271
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2283 submodule.c:2343
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查詢子模組 '%s' 的名稱"
-#: submodule.c:2073
+#: submodule.c:2287
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "拒絕移動「%s」至現存 git 目錄"
-#: submodule.c:2080
+#: submodule.c:2293
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8591,11 +8997,11 @@
"'%s' 遷移至\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2424
msgid "could not start ls-files in .."
msgstr "無法在 .. 中啟動 ls-files"
-#: submodule.c:2248
+#: submodule.c:2464
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
@@ -8616,8 +9022,8 @@
msgid "unknown value '%s' for key '%s'"
msgstr "鍵 '%2$s' 的未知取值 '%1$s'"
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
+#: builtin/remote.c:328
#, c-format
msgid "more than one %s"
msgstr "多於一個 %s"
@@ -8632,11 +9038,11 @@
msgid "could not read input file '%s'"
msgstr "不能讀取輸入檔案 '%s'"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
msgid "could not read from stdin"
msgstr "不能自標準輸入讀取"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:760
#, c-format
msgid "could not stat %s"
msgstr "不能對 %s 呼叫 stat"
@@ -8682,7 +9088,7 @@
#: transport-helper.c:220
msgid "this remote helper should implement refspec capability"
-msgstr "遠端協助工具需要實現 refspec 能力"
+msgstr "遠端協助工具需要實現 refspec 引用規格能力"
#: transport-helper.c:287 transport-helper.c:429
#, c-format
@@ -8702,7 +9108,7 @@
msgid "error while running fast-import"
msgstr "執行 fast-import 發生錯誤"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1254
#, c-format
msgid "could not read ref %s"
msgstr "無法讀取引用 %s"
@@ -8720,7 +9126,7 @@
msgid "invalid remote service path"
msgstr "無效的遠端服務路徑"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1496
msgid "operation not supported by protocol"
msgstr "協定不支援該動作"
@@ -8729,72 +9135,72 @@
msgid "can't connect to subservice %s"
msgstr "不能連線到子服務 %s"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:415
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only 需要 v2 版協定"
-#: transport-helper.c:755
+#: transport-helper.c:758
msgid "'option' without a matching 'ok/error' directive"
msgstr "'option' 缺少對應的 'ok/error' 指令"
-#: transport-helper.c:798
+#: transport-helper.c:801
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "預期 ok/error，協助工具說 '%s'"
-#: transport-helper.c:855
+#: transport-helper.c:862
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "協助工具報告 %s 的意外狀態"
-#: transport-helper.c:938
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support dry-run"
msgstr "協助工具 %s 不支援 dry-run"
-#: transport-helper.c:941
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed"
msgstr "協助工具 %s 不支援 --signed"
-#: transport-helper.c:944
+#: transport-helper.c:951
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "協助工具 %s 不支援 --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:956
#, c-format
msgid "helper %s does not support --atomic"
msgstr "協助工具 %s 不支援 --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:960
#, c-format
msgid "helper %s does not support --%s"
msgstr "協助工具 %s 不支援 --%s"
-#: transport-helper.c:960
+#: transport-helper.c:967
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "協助工具 %s 不支援 'push-option'"
-#: transport-helper.c:1060
+#: transport-helper.c:1067
msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-heper 不支援 push，需要引用表達式"
+msgstr "remote-heper 不支援 push，需要引用規格"
-#: transport-helper.c:1065
+#: transport-helper.c:1072
#, c-format
msgid "helper %s does not support 'force'"
msgstr "協助工具 %s 不支援 'force'"
-#: transport-helper.c:1112
+#: transport-helper.c:1119
msgid "couldn't run fast-export"
msgstr "無法執行 fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1124
msgid "error while running fast-export"
msgstr "執行 fast-export 時發生錯誤"
-#: transport-helper.c:1142
+#: transport-helper.c:1149
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8803,52 +9209,52 @@
"沒有共同的引用並且也沒有指定，什麼也不會做。\n"
"您或許得指定一個分支。\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1231
#, c-format
msgid "unsupported object format '%s'"
msgstr "不支援的物件格式「%s」"
-#: transport-helper.c:1233
+#: transport-helper.c:1240
#, c-format
msgid "malformed response in ref list: %s"
msgstr "引用列表中格式錯誤的回應：%s"
-#: transport-helper.c:1385
+#: transport-helper.c:1392
#, c-format
msgid "read(%s) failed"
msgstr "讀取（%s）失敗"
-#: transport-helper.c:1412
+#: transport-helper.c:1419
#, c-format
msgid "write(%s) failed"
msgstr "寫（%s）失敗"
-#: transport-helper.c:1461
+#: transport-helper.c:1468
#, c-format
msgid "%s thread failed"
msgstr "%s 執行緒失敗"
-#: transport-helper.c:1465
+#: transport-helper.c:1472
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s 執行緒等待失敗：%s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1491 transport-helper.c:1495
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "不能啟動執行緒來複製資料：%s"
-#: transport-helper.c:1525
+#: transport-helper.c:1532
#, c-format
msgid "%s process failed to wait"
msgstr "%s 進程等待失敗"
-#: transport-helper.c:1529
+#: transport-helper.c:1536
#, c-format
msgid "%s process failed"
msgstr "%s 進程失敗"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1554 transport-helper.c:1563
msgid "can't start thread for copying data"
msgstr "不能啟動執行緒來複製資料"
@@ -8857,58 +9263,58 @@
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n"
-#: transport.c:145
+#: transport.c:138
#, c-format
msgid "could not read bundle '%s'"
-msgstr "無法讀取 bundle '%s'"
+msgstr "無法讀取「%s」套件"
-#: transport.c:223
+#: transport.c:234
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "傳輸：無效的深度選項 '%s'"
-#: transport.c:275
+#: transport.c:289
msgid "see protocol.version in 'git help config' for more details"
msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息"
-#: transport.c:276
+#: transport.c:290
msgid "server options require protocol version 2 or later"
msgstr "服務端選項需要版本 2 協定或更高"
-#: transport.c:403
+#: transport.c:418
msgid "server does not support wait-for-done"
msgstr "伺服器不支援「等待完成」(wait-for-done) 功能"
-#: transport.c:755
+#: transport.c:770
msgid "could not parse transport.color.* config"
msgstr "不能解析 transport.color.* 設定"
-#: transport.c:830
+#: transport.c:845
msgid "support for protocol v2 not implemented yet"
msgstr "協定 v2 的支援尚未實現"
-#: transport.c:965
+#: transport.c:978
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "設定 '%s' 的取值未知：%s"
-#: transport.c:1031
+#: transport.c:1044
#, c-format
msgid "transport '%s' not allowed"
msgstr "傳輸 '%s' 不允許"
-#: transport.c:1084
+#: transport.c:1093
msgid "git-over-rsync is no longer supported"
msgstr "不再支援 git-over-rsync"
-#: transport.c:1187
+#: transport.c:1196
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
-msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到：\n"
+msgstr "下列子模組路徑所包含的修改在任何遠端來源中都找不到：\n"
-#: transport.c:1191
+#: transport.c:1200
#, c-format
msgid ""
"\n"
@@ -8935,11 +9341,11 @@
"以推送至遠端。\n"
"\n"
-#: transport.c:1199
+#: transport.c:1208
msgid "Aborting."
msgstr "正在終止。"
-#: transport.c:1346
+#: transport.c:1354
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模組"
@@ -8959,7 +9365,7 @@
msgid "too-short tree file"
msgstr "太短的樹檔案"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8968,7 +9374,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 checkout:\n"
@@ -8977,7 +9383,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 merge:\n"
@@ -8986,7 +9392,7 @@
"您對下列檔案的本機修改將被合併動作覆蓋：\n"
"%%s請在合併前提交或儲藏您的修改。"
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8995,7 +9401,7 @@
"您對下列檔案的本機修改將被合併動作覆蓋：\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:128
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9004,7 +9410,7 @@
"您對下列檔案的本機修改將被 %s 覆蓋：\n"
"%%s請在 %s 之前提交或儲藏您的修改。"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9013,7 +9419,7 @@
"您對下列檔案的本機修改將被 %s 覆蓋：\n"
"%%s"
-#: unpack-trees.c:132
+#: unpack-trees.c:135
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -9022,7 +9428,16 @@
"更新如下目錄將會遺失其中未追蹤的檔案：\n"
"%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"拒絕移除目前工作目錄：\n"
+"%s"
+
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9031,7 +9446,7 @@
"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"
"%%s請在切換分支之前移動或刪除。"
-#: unpack-trees.c:138
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9040,7 +9455,7 @@
"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9049,7 +9464,7 @@
"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n"
"%%s請在合併前移動或刪除。"
-#: unpack-trees.c:143
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9058,7 +9473,7 @@
"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n"
"%%s"
-#: unpack-trees.c:146
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9067,7 +9482,7 @@
"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n"
"%%s請在 %s 前移動或刪除。"
-#: unpack-trees.c:148
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9076,7 +9491,7 @@
"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9086,7 +9501,7 @@
"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
"%%s請在切換分支前移動或刪除。"
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9096,7 +9511,7 @@
"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9105,7 +9520,7 @@
"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n"
"%%s請在合併前移動或刪除。"
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9114,7 +9529,7 @@
"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n"
"%%s"
-#: unpack-trees.c:164
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9123,7 +9538,7 @@
"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n"
"%%s請在 %s 前移動或刪除。"
-#: unpack-trees.c:166
+#: unpack-trees.c:172
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9132,12 +9547,12 @@
"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n"
"%%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "條目 '%s' 和 '%s' 重疊。無法合併。"
-#: unpack-trees.c:177
+#: unpack-trees.c:183
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -9146,7 +9561,7 @@
"無法更新子模組：\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:186
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -9156,7 +9571,7 @@
"即使有稀疏簽出樣板，以下路徑不是最新且保留下來：\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:188
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9165,7 +9580,7 @@
"即使有稀疏簽出樣板，以下路徑未合併且保留下來：\n"
"%s"
-#: unpack-trees.c:184
+#: unpack-trees.c:190
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -9175,23 +9590,23 @@
"即使有稀疏簽出樣板，以下路徑已經存在而因此未更新：\n"
"%s"
-#: unpack-trees.c:264
+#: unpack-trees.c:270
#, c-format
msgid "Aborting\n"
msgstr "正在終止\n"
-#: unpack-trees.c:291
+#: unpack-trees.c:297
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
msgstr "修正以上路徑後，您可能想要執行「git sparse-checkout reapply」。\n"
-#: unpack-trees.c:352
+#: unpack-trees.c:358
msgid "Updating files"
msgstr "正在更新檔案"
-#: unpack-trees.c:384
+#: unpack-trees.c:390
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -9200,16 +9615,16 @@
"以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n"
"並且碰撞組中只有一個檔案存在工作區中：\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1664
msgid "Updating index flags"
msgstr "正在更新索引旗標"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2925
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr "工作區和未追蹤提交有重複項目：%s"
-#: upload-pack.c:1548
+#: upload-pack.c:1579
msgid "expected flush after fetch arguments"
msgstr "在 fetch 引數應為一個 flush 包"
@@ -9246,113 +9661,137 @@
msgid "Fetching objects"
msgstr "正在抓取物件"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "讀取 '%s' 失敗"
-#: worktree.c:303
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "在主工作區的 '%s' 不是版本庫目錄"
-#: worktree.c:314
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "檔案 '%s' 不包含工作區的絕對路徑"
-#: worktree.c:326
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
-#: worktree.c:332
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d"
-#: worktree.c:341
+#: worktree.c:342
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' 沒有指回到 '%s'"
-#: worktree.c:603
+#: worktree.c:600
msgid "not a directory"
msgstr "不是目錄"
-#: worktree.c:612
+#: worktree.c:609
msgid ".git is not a file"
msgstr ".git 不是檔案"
-#: worktree.c:614
+#: worktree.c:611
msgid ".git file broken"
msgstr ".git 檔案損毀"
-#: worktree.c:616
+#: worktree.c:613
msgid ".git file incorrect"
msgstr ".git 檔案不正確"
-#: worktree.c:722
+#: worktree.c:719
msgid "not a valid path"
msgstr "非有效路徑"
-#: worktree.c:728
+#: worktree.c:725
msgid "unable to locate repository; .git is not a file"
msgstr "無法定位版本庫；.git 不是檔案"
-#: worktree.c:732
+#: worktree.c:729
msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "無法定位版本庫；.git 檔案未參考版本庫"
+msgstr "無法定位版本庫：.git 檔案未指向版本庫"
-#: worktree.c:736
+#: worktree.c:733
msgid "unable to locate repository; .git file broken"
msgstr "無法定位版本庫；.git 檔案損壞"
-#: worktree.c:742
+#: worktree.c:739
msgid "gitdir unreadable"
msgstr "無法讀取 gitdir"
-#: worktree.c:746
+#: worktree.c:743
msgid "gitdir incorrect"
msgstr "不正確的 gitdir"
-#: worktree.c:771
+#: worktree.c:768
msgid "not a valid directory"
msgstr "非有效目錄"
-#: worktree.c:777
+#: worktree.c:774
msgid "gitdir file does not exist"
msgstr "找不到 gitdir 檔案"
-#: worktree.c:782 worktree.c:791
+#: worktree.c:779 worktree.c:788
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "無法讀取 gitdir 檔案 (%s)"
-#: worktree.c:801
+#: worktree.c:798
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "讀取過短（預期有 %<PRIuMAX> 位元組，只讀到 %<PRIuMAX>）"
-#: worktree.c:809
+#: worktree.c:806
msgid "invalid gitdir file"
msgstr "gitdir 檔案無效"
-#: worktree.c:817
+#: worktree.c:814
msgid "gitdir file points to non-existent location"
msgstr "gitdir 檔案指向的位置不存在"
-#: wrapper.c:197 wrapper.c:367
+#: worktree.c:830
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "無法在「%2$s」設定 %1$s"
+
+#: worktree.c:832
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "無法取消在「%2$s」設定的 %1$s"
+
+#: worktree.c:852
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "無法設定 extensions.worktreeConfig 設定"
+
+#: wrapper.c:161
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "無法 setenv '%s'"
+
+#: wrapper.c:213
+#, c-format
+msgid "unable to create '%s'"
+msgstr "不能建立 '%s'"
+
+#: wrapper.c:215 wrapper.c:385
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "無法開啟 '%s' 進行讀寫"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:416 wrapper.c:683
#, c-format
msgid "unable to access '%s'"
msgstr "不能存取 '%s'"
-#: wrapper.c:607
+#: wrapper.c:691
msgid "unable to get current working directory"
msgstr "不能取得目前工作目錄"
@@ -9391,11 +9830,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " （使用 \"git rm <檔案>...\" 標記解決方案）"
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1140
msgid "Changes to be committed:"
msgstr "要提交的變更："
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1149
msgid "Changes not staged for commit:"
msgstr "尚未暫存以備提交的變更："
@@ -9501,21 +9940,21 @@
msgid "untracked content, "
msgstr "未追蹤的內容, "
-#: wt-status.c:958
+#: wt-status.c:973
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "您的儲藏區目前有 %d 條紀錄"
-#: wt-status.c:989
+#: wt-status.c:1004
msgid "Submodules changed but not updated:"
msgstr "子模組已修改但尚未更新："
-#: wt-status.c:991
+#: wt-status.c:1006
msgid "Submodule changes to be committed:"
msgstr "要提交的子模組變更："
-#: wt-status.c:1073
+#: wt-status.c:1088
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9523,7 +9962,7 @@
"不要改動或刪除上面的一行。\n"
"其下所有內容都將被忽略。"
-#: wt-status.c:1165
+#: wt-status.c:1180
#, c-format
msgid ""
"\n"
@@ -9534,282 +9973,288 @@
"花了 %.2f 秒才計算出分支的領先/落後範圍。\n"
"為避免，您可以使用 '--no-ahead-behind'。\n"
-#: wt-status.c:1195
+#: wt-status.c:1210
msgid "You have unmerged paths."
msgstr "您有尚未合併的路徑。"
# 譯者：請維持前導空格
-#: wt-status.c:1198
+#: wt-status.c:1213
msgid " (fix conflicts and run \"git commit\")"
msgstr " （解決衝突並執行 \"git commit\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1200
+#: wt-status.c:1215
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " （使用 \"git merge --abort\" 終止合併）"
-#: wt-status.c:1204
+#: wt-status.c:1219
msgid "All conflicts fixed but you are still merging."
msgstr "所有衝突已解決但您仍處於合併中。"
# 譯者：請維持前導空格
-#: wt-status.c:1207
+#: wt-status.c:1222
msgid " (use \"git commit\" to conclude merge)"
msgstr " （使用 \"git commit\" 結束合併）"
-#: wt-status.c:1216
+#: wt-status.c:1233
msgid "You are in the middle of an am session."
msgstr "您正處於 am 動作過程中。"
-#: wt-status.c:1219
+#: wt-status.c:1236
msgid "The current patch is empty."
msgstr "目前的修補檔為空。"
# 譯者：請維持前導空格
-#: wt-status.c:1223
+#: wt-status.c:1241
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " （解決衝突，然後執行 \"git am --continue\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1225
+#: wt-status.c:1243
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 略過此修補檔）"
# 譯者：請維持前導空格
-#: wt-status.c:1227
+#: wt-status.c:1246
+msgid ""
+" (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr " （使用 \"git am --allow-empty\" 將目前修補檔錄製為空白提交）"
+
+# 譯者：請維持前導空格
+#: wt-status.c:1248
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " （使用 \"git am --abort\" 復原原有分支）"
-#: wt-status.c:1360
+#: wt-status.c:1381
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 遺失。"
-#: wt-status.c:1362
+#: wt-status.c:1383
msgid "No commands done."
msgstr "沒有指令被執行。"
-#: wt-status.c:1365
+#: wt-status.c:1386
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "最後一條指令已完成（%d 條指令被執行）："
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "上次完成的命令（完成 %<PRIuMAX> 條指令）："
-#: wt-status.c:1376
+#: wt-status.c:1397
#, c-format
msgid " (see more in file %s)"
msgstr " （更多參見檔案 %s）"
-#: wt-status.c:1381
+#: wt-status.c:1402
msgid "No commands remaining."
msgstr "未剩下任何指令。"
-#: wt-status.c:1384
+#: wt-status.c:1405
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "接下來要執行的指令（剩餘 %d 條指令）："
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "接下來要執行的命令（剩餘 %<PRIuMAX> 條命令）："
# 譯者：請維持前導空格
-#: wt-status.c:1392
+#: wt-status.c:1413
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " （使用 \"git rebase --edit-todo\" 來檢視和編輯）"
-#: wt-status.c:1404
+#: wt-status.c:1425
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。"
-#: wt-status.c:1409
+#: wt-status.c:1430
msgid "You are currently rebasing."
msgstr "您在執行重定基底動作。"
# 譯者：請維持前導空格
-#: wt-status.c:1422
+#: wt-status.c:1443
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " （解決衝突，然後執行 \"git rebase --continue\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1424
+#: wt-status.c:1445
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " （使用 \"git rebase --skip\" 略過此修補檔）"
# 譯者：請維持前導空格
-#: wt-status.c:1426
+#: wt-status.c:1447
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " （使用 \"git rebase --abort\" 以簽出原有分支）"
# 譯者：請維持前導空格
-#: wt-status.c:1433
+#: wt-status.c:1454
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " （所有衝突已解決：執行 \"git rebase --continue\"）"
-#: wt-status.c:1437
+#: wt-status.c:1458
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。"
-#: wt-status.c:1442
+#: wt-status.c:1463
msgid "You are currently splitting a commit during a rebase."
msgstr "您在執行重定基底動作時分割提交。"
# 譯者：請維持前導空格
-#: wt-status.c:1445
+#: wt-status.c:1466
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " （一旦您工作目錄提交乾淨後，執行 \"git rebase --continue\"）"
-#: wt-status.c:1449
+#: wt-status.c:1470
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。"
-#: wt-status.c:1454
+#: wt-status.c:1475
msgid "You are currently editing a commit during a rebase."
msgstr "您在執行重定基底動作時編輯提交。"
# 譯者：請維持前導空格
-#: wt-status.c:1457
+#: wt-status.c:1478
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " （使用 \"git commit --amend\" 修補目前提交）"
# 譯者：請維持前導空格
-#: wt-status.c:1459
+#: wt-status.c:1480
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " （當您對您的修改滿意後執行 \"git rebase --continue\"）"
-#: wt-status.c:1470
+#: wt-status.c:1491
msgid "Cherry-pick currently in progress."
msgstr "揀選動作正在進行中。"
-#: wt-status.c:1473
+#: wt-status.c:1494
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在執行揀選提交 %s 的動作。"
# 譯者：請維持前導空格
-#: wt-status.c:1480
+#: wt-status.c:1501
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " （解決衝突並執行 \"git cherry-pick --continue\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1483
+#: wt-status.c:1504
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " （執行 \"git cherry-pick --continue\" 以繼續）"
# 譯者：請維持前導空格
-#: wt-status.c:1486
+#: wt-status.c:1507
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " （所有衝突已解決：執行 \"git cherry-pick --continue\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1488
+#: wt-status.c:1509
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " （使用 \"git cherry-pick --skip\" 略過此修補檔）"
# 譯者：請維持前導空格
-#: wt-status.c:1490
+#: wt-status.c:1511
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " （使用 \"git cherry-pick --abort\" 以取消揀選動作）"
-#: wt-status.c:1500
+#: wt-status.c:1521
msgid "Revert currently in progress."
msgstr "還原動作正在進行中。"
-#: wt-status.c:1503
+#: wt-status.c:1524
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在執行反轉提交 %s 的動作。"
# 譯者：請維持前導空格
-#: wt-status.c:1509
+#: wt-status.c:1530
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " （解決衝突並執行 \"git revert --continue\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1512
+#: wt-status.c:1533
msgid " (run \"git revert --continue\" to continue)"
msgstr " （執行 \"git revert --continue\" 以繼續）"
# 譯者：請維持前導空格
-#: wt-status.c:1515
+#: wt-status.c:1536
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " （所有衝突已解決：執行 \"git revert --continue\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1517
+#: wt-status.c:1538
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " （使用 \"git revert --skip\" 略過此修補檔）"
# 譯者：請維持前導空格
-#: wt-status.c:1519
+#: wt-status.c:1540
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " （使用 \"git revert --abort\" 以取消反轉提交動作）"
-#: wt-status.c:1529
+#: wt-status.c:1550
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在執行從分支 '%s' 開始的二分搜尋動作。"
-#: wt-status.c:1533
+#: wt-status.c:1554
msgid "You are currently bisecting."
msgstr "您在執行二分搜尋動作。"
# 譯者：請維持前導空格
-#: wt-status.c:1536
+#: wt-status.c:1557
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " （使用 \"git bisect reset\" 簽出原有分支）"
-#: wt-status.c:1547
+#: wt-status.c:1568
msgid "You are in a sparse checkout."
msgstr "您正在稀疏簽出的工作區中。"
-#: wt-status.c:1550
+#: wt-status.c:1571
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr "您處於稀疏簽出狀態，包含 %d%% 的追蹤檔案。"
-#: wt-status.c:1794
+#: wt-status.c:1815
msgid "On branch "
msgstr "位於分支 "
-#: wt-status.c:1801
+#: wt-status.c:1822
msgid "interactive rebase in progress; onto "
msgstr "互動式重定基底動作正在進行中；至 "
-#: wt-status.c:1803
+#: wt-status.c:1824
msgid "rebase in progress; onto "
msgstr "重定基底動作正在進行中；至 "
-#: wt-status.c:1808
+#: wt-status.c:1829
msgid "HEAD detached at "
msgstr "開頭指標分離於 "
-#: wt-status.c:1810
+#: wt-status.c:1831
msgid "HEAD detached from "
msgstr "開頭指標分離自 "
-#: wt-status.c:1813
+#: wt-status.c:1834
msgid "Not currently on any branch."
msgstr "目前不在任何分支上。"
-#: wt-status.c:1830
+#: wt-status.c:1851
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1831
+#: wt-status.c:1852
msgid "No commits yet"
msgstr "尚無提交"
-#: wt-status.c:1845
+#: wt-status.c:1866
msgid "Untracked files"
msgstr "未追蹤的檔案"
-#: wt-status.c:1847
+#: wt-status.c:1868
msgid "Ignored files"
msgstr "忽略的檔案"
-#: wt-status.c:1851
+#: wt-status.c:1872
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9819,253 +10264,262 @@
"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n"
"但您需要小心不要忘了新增新檔案（參見 'git help status'）。"
-#: wt-status.c:1857
+#: wt-status.c:1878
#, c-format
msgid "Untracked files not listed%s"
msgstr "未追蹤的檔案沒有列出%s"
# 譯者：中文字串拼接，可刪除前導空格
-#: wt-status.c:1859
+#: wt-status.c:1880
msgid " (use -u option to show untracked files)"
msgstr " （使用 -u 參數顯示未追蹤的檔案）"
-#: wt-status.c:1865
+#: wt-status.c:1886
msgid "No changes"
msgstr "沒有修改"
-#: wt-status.c:1870
+#: wt-status.c:1891
#, 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:1874
+#: wt-status.c:1895
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1878
+#: wt-status.c:1899
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n"
-#: wt-status.c:1882
+#: wt-status.c:1903
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交為空，但是存在尚未追蹤的檔案\n"
# 譯者：中文字串拼接，可刪除前導空格
-#: wt-status.c:1886
+#: wt-status.c:1907
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n"
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1911 wt-status.c:1917
#, c-format
msgid "nothing to commit\n"
msgstr "無檔案要提交\n"
# 譯者：中文字串拼接，可刪除前導空格
-#: wt-status.c:1893
+#: wt-status.c:1914
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n"
# 譯者：中文字串拼接，可刪除前導空格
-#: wt-status.c:1898
+#: wt-status.c:1919
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "沒有要提交的檔案，工作區為乾淨狀態\n"
-#: wt-status.c:2003
+#: wt-status.c:2024
msgid "No commits yet on "
msgstr "尚無提交在 "
-#: wt-status.c:2007
+#: wt-status.c:2028
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
-#: wt-status.c:2038
+#: wt-status.c:2059
msgid "different"
msgstr "不同"
# 譯者：請維持句尾空格
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2061 wt-status.c:2069
msgid "behind "
msgstr "落後 "
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2064 wt-status.c:2067
msgid "ahead "
msgstr "領先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2605
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s：您有未暫存的變更。"
-#: wt-status.c:2575
+#: wt-status.c:2611
msgid "additionally, your index contains uncommitted changes."
msgstr "另外，您的索引中包含未提交的變更。"
-#: wt-status.c:2577
+#: wt-status.c:2613
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的變更。"
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:205
msgid "could not send IPC command"
msgstr "無法傳送 IPC 命令"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:212
msgid "could not read IPC response"
msgstr "無法讀取 IPC 回應"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:892
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "無法啟動 accept_thread “%s”"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:904
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "無法啟動「%s」的 worker[0]"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:353
#, c-format
msgid "failed to unlink '%s'"
msgstr "刪除 '%s' 失敗"
+#: compat/fsmonitor/fsm-listen-darwin.c:355
+msgid "Unable to create FSEventStream."
+msgstr "無法建立 FSEventStream。"
+
+#: compat/fsmonitor/fsm-listen-darwin.c:403
+msgid "Failed to start the FSEventStream"
+msgstr "無法啟動 FSEventStream"
+
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<選項>] [--] <路徑規格>..."
-#: builtin/add.c:61
+#: builtin/add.c:63
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "無法 chmod %cx ‘%s’"
-#: builtin/add.c:99
+#: builtin/add.c:105
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差異狀態 %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:110 builtin/commit.c:299
msgid "updating files failed"
msgstr "更新檔案失敗"
-#: builtin/add.c:114
+#: builtin/add.c:120
#, c-format
msgid "remove '%s'\n"
msgstr "刪除 '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:204
msgid "Unstaged changes after refreshing the index:"
msgstr "重新整理索引之後尚未被暫存的變更："
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:312 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "不能讀取索引"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "無法為寫入開啟 '%s'。"
-
-#: builtin/add.c:322
+#: builtin/add.c:325
msgid "Could not write patch"
msgstr "不能生成修補檔"
-#: builtin/add.c:325
+#: builtin/add.c:328
msgid "editing patch failed"
msgstr "編輯修補檔失敗"
-#: builtin/add.c:328
+#: builtin/add.c:331
#, c-format
msgid "Could not stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
-#: builtin/add.c:330
+#: builtin/add.c:333
msgid "Empty patch. Aborted."
msgstr "空修補檔。異常終止。"
-#: builtin/add.c:335
+#: builtin/add.c:339
#, c-format
msgid "Could not apply '%s'"
msgstr "不能套用 '%s'"
-#: builtin/add.c:343
+#: builtin/add.c:347
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "測試執行"
-#: builtin/add.c:366
+#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "詳細輸出"
+
+#: builtin/add.c:370
msgid "interactive picking"
msgstr "互動式揀選"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
msgid "select hunks interactively"
msgstr "互動式挑選資料區塊"
-#: builtin/add.c:368
+#: builtin/add.c:372
msgid "edit current diff and apply"
msgstr "編輯目前差異並套用"
-#: builtin/add.c:369
+#: builtin/add.c:373
msgid "allow adding otherwise ignored files"
msgstr "允許新增忽略的檔案"
-#: builtin/add.c:370
+#: builtin/add.c:374
msgid "update tracked files"
msgstr "更新已追蹤的檔案"
-#: builtin/add.c:371
+#: builtin/add.c:375
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號"
-#: builtin/add.c:372
+#: builtin/add.c:376
msgid "record only the fact that the path will be added later"
msgstr "只記錄，該路徑稍後再新增"
-#: builtin/add.c:373
+#: builtin/add.c:377
msgid "add changes from all tracked and untracked files"
msgstr "新增所有改變的已追蹤檔案和未追蹤檔案"
-#: builtin/add.c:376
+#: builtin/add.c:380
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作區中移除的路徑（和 --no-all 相同）"
-#: builtin/add.c:378
+#: builtin/add.c:382
msgid "don't add, only refresh the index"
msgstr "不新增，只重新整理索引"
-#: builtin/add.c:379
+#: builtin/add.c:383
msgid "just skip files which cannot be added because of errors"
msgstr "略過因發生錯誤不能新增的檔案"
-#: builtin/add.c:380
+#: builtin/add.c:384
msgid "check if - even missing - files are ignored in dry run"
msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "允許更新稀疏簽出 cone 外的項目"
+
+#: builtin/add.c:387 builtin/update-index.c:1023
msgid "override the executable bit of the listed files"
msgstr "覆蓋列表裡檔案的可執行位"
-#: builtin/add.c:384
+#: builtin/add.c:389
msgid "warn when adding an embedded repository"
msgstr "建立一個嵌入式版本庫時給予警告"
-#: builtin/add.c:386
-msgid "backend for `git stash -p`"
-msgstr "`git stash -p` 的後端"
-
-#: builtin/add.c:404
+#: builtin/add.c:407
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10094,12 +10548,12 @@
"\n"
"參見 \"git help submodule\" 取得更多訊息。"
-#: builtin/add.c:432
+#: builtin/add.c:436
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在新增嵌入式 git 版本庫：%s"
-#: builtin/add.c:451
+#: builtin/add.c:456
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10109,51 +10563,27 @@
"如要關閉此訊息，請執行\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:471
msgid "adding files failed"
msgstr "新增檔案失敗"
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run 和 --interactive/--patch 不相容"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file 與 --interactive/--patch 不相容"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file 與 --edit 不相容"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 和 -u 選項互斥"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用"
-
-#: builtin/add.c:526
+#: builtin/add.c:534
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容"
+#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
+#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "「%s」和路徑規格引數不得同時使用"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
-
-#: builtin/add.c:555
+#: builtin/add.c:566
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "沒有指定檔案，也沒有檔案被新增。\n"
-#: builtin/add.c:557
+#: builtin/add.c:568
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10163,105 +10593,106 @@
"如要關閉此訊息，請執行\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:393
msgid "could not parse author script"
msgstr "不能解析作者腳本"
-#: builtin/am.c:455
+#: builtin/am.c:483
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 掛鉤刪除"
-#: builtin/am.c:497
+#: builtin/am.c:525
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的輸入行：'%s'。"
-#: builtin/am.c:535
+#: builtin/am.c:563
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "從 '%s' 複製註解到 '%s' 時失敗"
-#: builtin/am.c:561
+#: builtin/am.c:589
msgid "fseek failed"
msgstr "fseek 失敗"
-#: builtin/am.c:749
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "無法解析修補檔 '%s'"
-#: builtin/am.c:814
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一個 StGIT 修補檔佇列被套用"
-#: builtin/am.c:862
+#: builtin/am.c:890
msgid "invalid timestamp"
msgstr "無效的時間戳"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:895 builtin/am.c:907
msgid "invalid Date line"
msgstr "無效的日期行"
-#: builtin/am.c:874
+#: builtin/am.c:902
msgid "invalid timezone offset"
msgstr "無效的時區位移值"
-#: builtin/am.c:967
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "修補檔格式偵測失敗。"
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:1000 builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
msgstr "建立目錄 '%s' 失敗"
-#: builtin/am.c:977
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "分割修補檔失敗。"
-#: builtin/am.c:1126
+#: builtin/am.c:1154
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "當您解決這一問題，執行 \"%s --continue\"。"
-#: builtin/am.c:1127
+#: builtin/am.c:1155
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。"
-#: builtin/am.c:1128
+#: builtin/am.c:1160
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr "若要將空白修補檔錄製為空白提交，請執行「%s --allow-empty」。"
+
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。"
-#: builtin/am.c:1223
+#: builtin/am.c:1257
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。"
-#: builtin/am.c:1251
-msgid "Patch is empty."
-msgstr "修補檔為空。"
-
-#: builtin/am.c:1316
+#: builtin/am.c:1345
#, c-format
msgid "missing author line in commit %s"
msgstr "在提交 %s 中缺少作者行"
-#: builtin/am.c:1319
+#: builtin/am.c:1348
#, c-format
msgid "invalid ident line: %.*s"
msgstr "無效的身份標記：%.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1567
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "版本庫缺乏必要的資料物件以進行三方合併。"
-#: builtin/am.c:1540
+#: builtin/am.c:1569
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..."
-#: builtin/am.c:1559
+#: builtin/am.c:1588
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10269,24 +10700,24 @@
"您是否曾手動編輯過您的修補檔？\n"
"無法套用修補檔到索引中的資料物件上。"
-#: builtin/am.c:1565
+#: builtin/am.c:1594
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基礎版本上修補及進行三方合併..."
-#: builtin/am.c:1591
+#: builtin/am.c:1620
msgid "Failed to merge in the changes."
msgstr "無法合併變更。"
-#: builtin/am.c:1623
+#: builtin/am.c:1652
msgid "applying to an empty history"
msgstr "正套用到一個空歷史上"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1704 builtin/am.c:1708
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "無法繼續：%s 不存在。"
-#: builtin/am.c:1697
+#: builtin/am.c:1726
msgid "Commit Body is:"
msgstr "提交內容為："
@@ -10295,39 +10726,57 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1736
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]： "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1782 builtin/commit.c:410
msgid "unable to write index file"
msgstr "無法寫入索引檔案"
-#: builtin/am.c:1757
+#: builtin/am.c:1786
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "髒索引：不能套用修補檔（髒檔案：%s）"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1828
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "略過：%.*s"
+
+#: builtin/am.c:1833
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "建立空白提交：%.*s"
+
+#: builtin/am.c:1837
+msgid "Patch is empty."
+msgstr "修補檔為空。"
+
+#: builtin/am.c:1848 builtin/am.c:1917
#, c-format
msgid "Applying: %.*s"
msgstr "套用：%.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1865
msgid "No changes -- Patch already applied."
msgstr "沒有變更——修補檔已經套用過。"
-#: builtin/am.c:1820
+#: builtin/am.c:1871
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打修補檔失敗於 %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1875
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔"
-#: builtin/am.c:1868
+#: builtin/am.c:1921
+msgid "No changes - recorded it as an empty commit."
+msgstr "沒有變更 － 將其錄製為空白提交。"
+
+#: builtin/am.c:1923
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10337,7 +10786,7 @@
"如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n"
"您也許想要略過這個修補檔。"
-#: builtin/am.c:1875
+#: builtin/am.c:1931
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10348,175 +10797,174 @@
"您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n"
"你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。"
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
+#: builtin/reset.c:463
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析物件 '%s'。"
-#: builtin/am.c:2034
+#: builtin/am.c:2091 builtin/am.c:2167
msgid "failed to clean index"
msgstr "清空索引失敗"
-#: builtin/am.c:2078
+#: builtin/am.c:2135
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD"
-#: builtin/am.c:2185
+#: builtin/am.c:2292
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "無效的 --patch-format 值：%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "「%s=%s」和「%s=%s」選項不得同時使用"
-#: builtin/am.c:2227
-#, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr "無效的 --show-current-patch 值：%s"
-
-#: builtin/am.c:2231
-#, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容"
-
-#: builtin/am.c:2262
+#: builtin/am.c:2323
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2324
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<選項>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2330
msgid "run interactively"
msgstr "以互動式方式執行"
-#: builtin/am.c:2271
+#: builtin/am.c:2332
msgid "historical option -- no-op"
msgstr "老的參數 —— 無作用"
-#: builtin/am.c:2273
+#: builtin/am.c:2334
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允許使用三方合併"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:646 builtin/stash.c:946
msgid "be quiet"
msgstr "靜默模式"
-#: builtin/am.c:2276
+#: builtin/am.c:2337
msgid "add a Signed-off-by trailer to the commit message"
msgstr "在提交說明結尾加入 Signed-off-by"
-#: builtin/am.c:2279
+#: builtin/am.c:2340
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字元集（預設）"
-#: builtin/am.c:2281
+#: builtin/am.c:2342
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -k 參數"
-#: builtin/am.c:2283
+#: builtin/am.c:2344
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -b 參數"
-#: builtin/am.c:2285
+#: builtin/am.c:2346
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -m 參數"
-#: builtin/am.c:2287
+#: builtin/am.c:2348
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數"
-#: builtin/am.c:2290
+#: builtin/am.c:2351
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定"
-#: builtin/am.c:2293
+#: builtin/am.c:2354
msgid "strip everything before a scissors line"
msgstr "捨棄裁切線前的所有內容"
-#: builtin/am.c:2295
+#: builtin/am.c:2356
msgid "pass it through git-mailinfo"
msgstr "透過 git-mailinfo 傳遞"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
+#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
+#: builtin/am.c:2386
msgid "pass it through git-apply"
msgstr "傳遞給 git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
+#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
+#: parse-options.h:348
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
-#: builtin/verify-tag.c:38
+#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
+#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
+#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
+#: builtin/tag.c:480 builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2322
+#: builtin/am.c:2383
msgid "format the patch(es) are in"
msgstr "修補檔的格式"
-#: builtin/am.c:2328
+#: builtin/am.c:2389
msgid "override error message when patch failure occurs"
msgstr "打修補檔失敗時顯示的錯誤訊息"
-#: builtin/am.c:2330
+#: builtin/am.c:2391
msgid "continue applying patches after resolving a conflict"
msgstr "衝突解決後繼續套用修補檔"
-#: builtin/am.c:2333
+#: builtin/am.c:2394
msgid "synonyms for --continue"
msgstr "和 --continue 同義"
-#: builtin/am.c:2336
+#: builtin/am.c:2397
msgid "skip the current patch"
msgstr "略過目前修補檔"
-#: builtin/am.c:2339
+#: builtin/am.c:2400
msgid "restore the original branch and abort the patching operation"
msgstr "還原原始分支並中止修補動作"
-#: builtin/am.c:2342
+#: builtin/am.c:2403
msgid "abort the patching operation but keep HEAD where it is"
msgstr "終止修補動作但保持 HEAD 不變"
-#: builtin/am.c:2346
+#: builtin/am.c:2407
msgid "show the patch being applied"
msgstr "顯示正在套用的修補檔"
-#: builtin/am.c:2351
+#: builtin/am.c:2411
+msgid "record the empty patch as an empty commit"
+msgstr "將空白修補檔錄製為空白提交"
+
+#: builtin/am.c:2415
msgid "lie about committer date"
msgstr "將作者日期作為提交日期"
-#: builtin/am.c:2353
+#: builtin/am.c:2417
msgid "use current timestamp for author date"
msgstr "用目前時間作為作者日期"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
+#: builtin/revert.c:117 builtin/tag.c:461
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2420 builtin/rebase.c:1128
msgid "GPG-sign commits"
msgstr "使用 GPG 簽名提交"
-#: builtin/am.c:2359
+#: builtin/am.c:2423
+msgid "how to handle empty patches"
+msgstr "空白修補檔的處理方式"
+
+#: builtin/am.c:2426
msgid "(internal use for git-rebase)"
msgstr "（內部使用，用於 git-rebase）"
-#: builtin/am.c:2377
+#: builtin/am.c:2444
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."
@@ -10524,16 +10972,16 @@
"參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n"
"請不要再使用它了。"
-#: builtin/am.c:2384
+#: builtin/am.c:2451
msgid "failed to read the index"
msgstr "讀取索引失敗"
-#: builtin/am.c:2399
+#: builtin/am.c:2466
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。"
-#: builtin/am.c:2423
+#: builtin/am.c:2490
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10542,11 +10990,11 @@
"發現了錯誤的 %s 目錄。\n"
"使用 \"git am --abort\" 刪除它。"
-#: builtin/am.c:2429
+#: builtin/am.c:2496
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解決動作未進行，我們不會繼續。"
-#: builtin/am.c:2439
+#: builtin/am.c:2506
msgid "interactive mode requires patches on the command line"
msgstr "互動式模式需要指令列上提供修補檔"
@@ -10554,52 +11002,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<選項>] [<修補檔>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "不能建立歸檔檔案 '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "不能重定向輸出"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive：未提供遠端 URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive：期望是 ACK/NAK，卻得到 flush 包"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive：NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive：協定錯誤"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive：應有一個 flush 包"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<提交>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <好-術語> <壞-術語> [<術語>]"
-
-#: builtin/bisect--helper.c:25
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-
#: builtin/bisect--helper.c:26
msgid ""
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
@@ -10609,10 +11040,6 @@
"git bisect--helper --bisect-start [--term-{new,bad}=<術語> --term-{old,good}"
"=<術語>] [--no-checkout] [--first-parent] [<壞> [<好>...]] [--] [<路徑>...]"
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-next"
-
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
msgstr "git bisect--helper --bisect-state (bad|new) [<修訂版>]"
@@ -10629,72 +11056,81 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<修訂版>|<範圍>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <cmd>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "無法以 '%2$s' 模式開啟 '%1$s' 檔案"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "無法寫入 '%s' 檔案"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "無法開啟「%s」檔案進行讀取"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' 不是一個有效的術語"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "不能使用內建指令 '%s' 作為術語"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "不能修改術語 '%s' 的含義"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "請使用兩個不同的術語"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "我們沒有在二分搜尋。\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' 不是一個有效的提交"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr "不能簽出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。"
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "壞的 bisect_write 參數：%s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "無法取得版本 '%s' 的物件 ID"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "無法開啟檔案 '%s'"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "無效的指令：您目前正處於一個 %s/%s 二分搜尋中"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10703,7 +11139,7 @@
"您需要給我至少一個 %s 和一個 %s 版本。\n"
"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10714,7 +11150,7 @@
"然後需要提供我至少一個 %s 和一個 %s 版本。\n"
"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。"
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "在只有一個 %s 提交的情況下二分搜尋"
@@ -10724,22 +11160,22 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "您確認嗎[Y/n]？ "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "未定義術語"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr "您目前針對舊狀態的術語是 %s，對新狀態的術語是 %s。\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10748,52 +11184,52 @@
"指令 'git bisect terms' 的參數 %s 無效。\n"
"支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。"
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "版本遍歷設定失敗\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "無法開啟 '%s' 進行附加"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' 不是一個有效的術語"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "未識別的選項：'%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' 看起來不是一個有效的版本"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "壞的 HEAD - 我需要一個 HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "不會在做了 cg-seek 的樹上做二分搜尋"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "壞的 HEAD - 奇怪的符號引用"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "無效的引用：'%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "您需要執行 \"git bisect start\" 來開始\n"
@@ -10802,104 +11238,159 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "您想讓我為您這樣做嗎[Y/n]？ "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' 只能有一個參數。"
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "<修訂版> 輸入格式錯誤：%s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "修訂版輸入有誤（不是提交）：%s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "我們沒有在二分搜尋。"
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "「%s」？？您在說什麼？"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "無法讀取「%s」檔案來重放"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#, c-format
+msgid "running %s\n"
+msgstr "正在執行 %s\n"
+
+#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+msgid "bisect run failed: no command provided."
+msgstr "二分搜尋執行失敗：沒有提供指令。"
+
+#: builtin/bisect--helper.c:1166
+#, c-format
+msgid "unable to verify '%s' on good revision"
+msgstr "無法在正確修訂版上驗證「%s」"
+
+#: builtin/bisect--helper.c:1172
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr "正確修訂版回傳偽造的錯誤代碼 %d"
+
+#: builtin/bisect--helper.c:1180
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "二分搜尋執行失敗：「%2$s」返回的離開碼 %1$d 小於 0 或 >= 128"
+
+#: builtin/bisect--helper.c:1195
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "無法開啟「%s」檔案進行寫入"
+
+#: builtin/bisect--helper.c:1213
+msgid "bisect run cannot continue any more"
+msgstr "二分搜尋不能繼續執行"
+
+#: builtin/bisect--helper.c:1215
+#, c-format
+msgid "bisect run success"
+msgstr "二分搜尋執行成功"
+
+#: builtin/bisect--helper.c:1218
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "二分搜尋發現到第一個有問題的提交"
+
+#: builtin/bisect--helper.c:1221
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"二分搜尋執行失敗：'git bisect--helper --bisect-state %s' 以錯誤代碼 %d 離開"
+
+#: builtin/bisect--helper.c:1253
msgid "reset the bisection state"
msgstr "清除二分搜尋狀態"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1255
msgid "check whether bad or good terms exist"
msgstr "檢查壞的或好的術語是否存在"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1257
msgid "print out the bisect terms"
msgstr "列印二分搜尋術語"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1259
msgid "start the bisect session"
msgstr "啟動二分搜尋過程"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1261
msgid "find the next bisection commit"
msgstr "尋找下一個二分搜尋提交"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1263
msgid "mark the state of ref (or refs)"
msgstr "標記 ref (或 refs) 的狀態"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1265
msgid "list the bisection steps so far"
msgstr "列出迄今的二分搜尋步驟"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1267
msgid "replay the bisection process from the given file"
msgstr "從指定檔案重放二分搜尋過程"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1269
msgid "skip some commits for checkout"
msgstr "略過要簽出的部分提交"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1271
+msgid "visualize the bisection"
+msgstr "視覺化二分搜尋過程"
+
+#: builtin/bisect--helper.c:1273
+msgid "use <cmd>... to automatically bisect"
+msgstr "使用 <cmd>... 自動進行二分搜尋"
+
+#: builtin/bisect--helper.c:1275
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE 無日誌"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1290
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset 無需參數或者需要一個提交"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check 需要 2 或 3 個參數"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1295
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 需要 0 或 1 個參數"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1304
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next 需要 0 個引數"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1315
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log 需要 0 個引數"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1320
msgid "no logfile given"
msgstr "未提供日誌檔案"
@@ -10911,149 +11402,142 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "期望一個顏色：%s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "必須以一個顏色結尾"
-#: builtin/blame.c:728
-#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "設定 color.blame.repeatedLines 中的無效顏色 '%s'"
-
-#: builtin/blame.c:746
-msgid "invalid value for blame.coloring"
-msgstr "設定 blame.coloring 中的無效取值"
-
-#: builtin/blame.c:845
+#: builtin/blame.c:842
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "不能找到要忽略的版本 %s"
-#: builtin/blame.c:867
+#: builtin/blame.c:864
msgid "show blame entries as we find them, incrementally"
msgstr "增量式顯示發現的 blame 條目"
-#: builtin/blame.c:868
+#: builtin/blame.c:865
msgid "do not show object names of boundary commits (Default: off)"
msgstr "不要顯示邊界提交的物件名稱（預設值: off）"
-#: builtin/blame.c:869
+#: builtin/blame.c:866
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "不將根提交看作邊界（預設值：off）"
-#: builtin/blame.c:870
+#: builtin/blame.c:867
msgid "show work cost statistics"
msgstr "顯示工作量統計"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
+#: builtin/remote.c:683 builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "強制顯示進度報告"
-#: builtin/blame.c:872
+#: builtin/blame.c:869
msgid "show output score for blame entries"
msgstr "顯示判斷 blame 條目位移的得分診斷訊息"
-#: builtin/blame.c:873
+#: builtin/blame.c:870
msgid "show original filename (Default: auto)"
msgstr "顯示原始檔案名稱（預設值：auto）"
-#: builtin/blame.c:874
+#: builtin/blame.c:871
msgid "show original linenumber (Default: off)"
msgstr "顯示原始檔案名稱（預設值：off）"
-#: builtin/blame.c:875
+#: builtin/blame.c:872
msgid "show in a format designed for machine consumption"
msgstr "顯示成適合機器讀取的格式"
-#: builtin/blame.c:876
+#: builtin/blame.c:873
msgid "show porcelain format with per-line commit information"
msgstr "顯示每一列適合機器的提交說明"
-#: builtin/blame.c:877
+#: builtin/blame.c:874
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的輸出模式（預設值：off）"
-#: builtin/blame.c:878
+#: builtin/blame.c:875
msgid "show raw timestamp (Default: off)"
msgstr "顯示原始時間戳（預設值：off）"
-#: builtin/blame.c:879
+#: builtin/blame.c:876
msgid "show long commit SHA1 (Default: off)"
msgstr "顯示較長的 SHA1 提交編號（預設值：off）"
-#: builtin/blame.c:880
+#: builtin/blame.c:877
msgid "suppress author name and timestamp (Default: off)"
msgstr "隱藏作者名字及時間戳（預設值：off）"
-#: builtin/blame.c:881
+#: builtin/blame.c:878
msgid "show author email instead of name (Default: off)"
msgstr "顯示作者信箱而非名稱（預設值：off）"
-#: builtin/blame.c:882
+#: builtin/blame.c:879
msgid "ignore whitespace differences"
msgstr "忽略空白差異"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:880 builtin/log.c:1857
msgid "rev"
msgstr "版本"
-#: builtin/blame.c:883
+#: builtin/blame.c:880
msgid "ignore <rev> when blaming"
msgstr "在執行 blame 動作時忽略 <修訂版>"
-#: builtin/blame.c:884
+#: builtin/blame.c:881
msgid "ignore revisions from <file>"
msgstr "忽略 <檔案> 中的修訂版"
-#: builtin/blame.c:885
+#: builtin/blame.c:882
msgid "color redundant metadata from previous line differently"
-msgstr "使用顏色間隔輸出與前一行不同的重複元訊息"
+msgstr "使用顏色間隔輸出與前一行不同的重複中介資料"
-#: builtin/blame.c:886
+#: builtin/blame.c:883
msgid "color lines by age"
msgstr "依據時間著色"
-#: builtin/blame.c:887
+#: builtin/blame.c:884
msgid "spend extra cycles to find better match"
msgstr "循環更多次以找到更佳符合"
-#: builtin/blame.c:888
+#: builtin/blame.c:885
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:886
msgid "use <file>'s contents as the final image"
msgstr "將 <檔案> 的內容當成是最終 image"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:887 builtin/blame.c:888
msgid "score"
msgstr "得分"
-#: builtin/blame.c:890
+#: builtin/blame.c:887
msgid "find line copies within and across files"
msgstr "找到檔案內及跨檔案的複製列"
-#: builtin/blame.c:891
+#: builtin/blame.c:888
msgid "find line movements within and across files"
msgstr "找到檔案內及跨檔案的移動列"
-#: builtin/blame.c:892
+#: builtin/blame.c:889
msgid "range"
msgstr "range"
-#: builtin/blame.c:893
+#: builtin/blame.c:890
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函數"
-#: builtin/blame.c:945
+#: builtin/blame.c:949
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用"
@@ -11065,17 +11549,17 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:1000
msgid "4 years, 11 months ago"
msgstr "4 年 11 個月前"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1116
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "檔案 %s 只有 %lu 行"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1161
msgid "Blaming lines"
msgstr "追蹤程式碼行"
@@ -11084,31 +11568,37 @@
msgstr "git branch [<選項>] [-r | -a] [--merged] [--no-merged]"
#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<選項>] [-l] [-f] <分支名> [<起始點>]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr "git branch [<選項>] [-f] [--recurse-submodules] <分支名> [<起始點>]"
#: builtin/branch.c:31
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<選項>] [-l] [<模式>...]"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<選項>] [-r] (-d | -D) <分支名>..."
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<選項>] (-m | -M) [<舊分支>] <新分支>"
-#: builtin/branch.c:33
+#: builtin/branch.c:34
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<選項>] (-c | -C) [<老分支>] <新分支>"
-#: builtin/branch.c:34
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<選項>] [-r | -a] [--points-at]"
-#: builtin/branch.c:35
+#: builtin/branch.c:36
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<選項>] [-r | -a] [--format]"
# 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長
-#: builtin/branch.c:154
+#: builtin/branch.c:165
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -11118,7 +11608,7 @@
" '%s'，但未合併到 HEAD。"
# 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長
-#: builtin/branch.c:158
+#: builtin/branch.c:169
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -11127,12 +11617,12 @@
"並未刪除分支 '%s'， 雖然它已經合併到 HEAD，\n"
" 然而卻尚未被合併到分支 '%s' 。"
-#: builtin/branch.c:172
+#: builtin/branch.c:183
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "無法查詢 '%s' 指向的提交物件"
-#: builtin/branch.c:176
+#: builtin/branch.c:187
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -11141,111 +11631,111 @@
"分支 '%s' 沒有完全合併。\n"
"如果您確認要刪除它，執行 'git branch -D %s'。"
-#: builtin/branch.c:189
+#: builtin/branch.c:200
msgid "Update of config-file failed"
msgstr "更新設定檔案失敗"
-#: builtin/branch.c:223
+#: builtin/branch.c:235
msgid "cannot use -a with -d"
msgstr "不能將 -a 和 -d 同時使用"
-#: builtin/branch.c:230
+#: builtin/branch.c:242
msgid "Couldn't look up commit object for HEAD"
msgstr "無法查詢 HEAD 指向的提交物件"
-#: builtin/branch.c:244
+#: builtin/branch.c:259
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "無法刪除在「%2$s」簽出的「%1$s」分支"
-#: builtin/branch.c:259
+#: builtin/branch.c:274
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到遠端追蹤分支 '%s'。"
-#: builtin/branch.c:260
+#: builtin/branch.c:275
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未發現。"
-#: builtin/branch.c:291
+#: builtin/branch.c:306
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已刪除遠端追蹤分支 %s（曾為 %s）。\n"
-#: builtin/branch.c:292
+#: builtin/branch.c:307
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已刪除分支 %s（曾為 %s）。\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:457 builtin/tag.c:64
msgid "unable to parse format string"
msgstr "不能解析格式化字串"
-#: builtin/branch.c:471
+#: builtin/branch.c:488
msgid "could not resolve HEAD"
msgstr "不能解析 HEAD 提交"
-#: builtin/branch.c:477
+#: builtin/branch.c:494
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) 指向 refs/heads/ 之外"
-#: builtin/branch.c:492
+#: builtin/branch.c:509
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被重定基底到 %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:513
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分搜尋於 %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:530
msgid "cannot copy the current branch while not on any."
msgstr "無法複製目前分支因為不處於任何分支上。"
-#: builtin/branch.c:515
+#: builtin/branch.c:532
msgid "cannot rename the current branch while not on any."
msgstr "無法重新命名目前分支因為不處於任何分支上。"
-#: builtin/branch.c:526
+#: builtin/branch.c:543
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "無效的分支名：'%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:572
msgid "Branch rename failed"
msgstr "分支重新命名失敗"
-#: builtin/branch.c:557
+#: builtin/branch.c:574
msgid "Branch copy failed"
msgstr "分支複製失敗"
-#: builtin/branch.c:561
+#: builtin/branch.c:578
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "已為錯誤命名的分支 '%s' 建立了一個副本"
-#: builtin/branch.c:564
+#: builtin/branch.c:581
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "已將錯誤命名的分支 '%s' 重新命名"
-#: builtin/branch.c:570
+#: builtin/branch.c:587
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重新命名為 %s，但 HEAD 沒有更新！"
-#: builtin/branch.c:579
+#: builtin/branch.c:596
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重新命名，但更新設定檔案失敗"
-#: builtin/branch.c:581
+#: builtin/branch.c:598
msgid "Branch is copied, but update of config-file failed"
msgstr "分支已複製，但更新設定檔案失敗"
-#: builtin/branch.c:597
+#: builtin/branch.c:614
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11256,209 +11746,221 @@
" %s\n"
"以 '%c' 開頭的行將被過濾。\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "通用選項"
-#: builtin/branch.c:633
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支"
-#: builtin/branch.c:634
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "不顯示訊息"
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "設定追蹤模式（參見 git-pull(1)）"
+#: builtin/branch.c:656 builtin/checkout.c:1571
+#: builtin/submodule--helper.c:3077
+msgid "set branch tracking configuration"
+msgstr "設定分支追蹤設定"
-#: builtin/branch.c:637
+#: builtin/branch.c:659
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:661
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:639
+#: builtin/branch.c:661
msgid "change the upstream info"
msgstr "改變上游訊息"
-#: builtin/branch.c:640
+#: builtin/branch.c:662
msgid "unset the upstream info"
msgstr "取消上游資訊設定"
-#: builtin/branch.c:641
+#: builtin/branch.c:663
msgid "use colored output"
msgstr "使用彩色輸出"
-#: builtin/branch.c:642
+#: builtin/branch.c:664
msgid "act on remote-tracking branches"
msgstr "作用於遠端追蹤分支"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:666 builtin/branch.c:668
msgid "print only branches that contain the commit"
msgstr "只列印包含該提交的分支"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:667 builtin/branch.c:669
msgid "print only branches that don't contain the commit"
msgstr "只列印不包含該提交的分支"
-#: builtin/branch.c:650
+#: builtin/branch.c:672
msgid "Specific git-branch actions:"
msgstr "具體的 git-branch 動作："
-#: builtin/branch.c:651
+#: builtin/branch.c:673
msgid "list both remote-tracking and local branches"
msgstr "列出遠端追蹤及本機分支"
-#: builtin/branch.c:653
+#: builtin/branch.c:675
msgid "delete fully merged branch"
msgstr "刪除完全合併的分支"
-#: builtin/branch.c:654
+#: builtin/branch.c:676
msgid "delete branch (even if not merged)"
msgstr "刪除分支（即使沒有合併）"
-#: builtin/branch.c:655
+#: builtin/branch.c:677
msgid "move/rename a branch and its reflog"
msgstr "移動/重新命名一個分支，以及它的引用日誌"
-#: builtin/branch.c:656
+#: builtin/branch.c:678
msgid "move/rename a branch, even if target exists"
msgstr "移動/重新命名一個分支，即使目標已存在"
-#: builtin/branch.c:657
+#: builtin/branch.c:679
msgid "copy a branch and its reflog"
-msgstr "複製一個分支和它的引用日誌"
+msgstr "複製分支及其引用日誌"
-#: builtin/branch.c:658
+#: builtin/branch.c:680
msgid "copy a branch, even if target exists"
msgstr "複製一個分支，即使目標已存在"
-#: builtin/branch.c:659
+#: builtin/branch.c:681
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:660
+#: builtin/branch.c:682
msgid "show current branch name"
msgstr "顯示目前分支名"
-#: builtin/branch.c:661
+#: builtin/branch.c:683 builtin/submodule--helper.c:3075
msgid "create the branch's reflog"
msgstr "建立分支的引用日誌"
-#: builtin/branch.c:663
+#: builtin/branch.c:685
msgid "edit the description for the branch"
msgstr "標記分支的描述"
-#: builtin/branch.c:664
+#: builtin/branch.c:686
msgid "force creation, move/rename, deletion"
msgstr "強制建立、移動/重新命名、刪除"
-#: builtin/branch.c:665
+#: builtin/branch.c:687
msgid "print only branches that are merged"
msgstr "只列印已經合併的分支"
-#: builtin/branch.c:666
+#: builtin/branch.c:688
msgid "print only branches that are not merged"
msgstr "只列印尚未合併的分支"
-#: builtin/branch.c:667
+#: builtin/branch.c:689
msgid "list branches in columns"
msgstr "以列的方式顯示分支"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:476
msgid "object"
msgstr "物件"
-#: builtin/branch.c:670
+#: builtin/branch.c:692
msgid "print only branches of the object"
msgstr "只列印指向該物件的分支"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
msgid "sorting and filtering are case insensitive"
msgstr "排序和過濾屬於大小寫不敏感"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:694 builtin/ls-files.c:667
+msgid "recurse through submodules"
+msgstr "在子模組中遞迴"
+
+#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
+#: builtin/tag.c:481 builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "輸出格式"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:718 builtin/clone.c:684
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 沒有位於 /refs/heads 之下！"
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column 和 --verbose 不相容"
+#: builtin/branch.c:739
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
+"有 --recurse-submodules 的分支只能在啟用 submodule.propagateBranches 時使用"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:741
+msgid "--recurse-submodules can only be used to create branches"
+msgstr "--recurse-submodules 只能用來建立分支"
+
+#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
msgid "branch name required"
msgstr "必須提供分支名"
-#: builtin/branch.c:766
+#: builtin/branch.c:802
msgid "Cannot give description to detached HEAD"
msgstr "不能向分離開頭指標提供描述"
-#: builtin/branch.c:771
+#: builtin/branch.c:807
msgid "cannot edit description of more than one branch"
msgstr "不能為一個以上的分支編輯描述"
-#: builtin/branch.c:778
+#: builtin/branch.c:814
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚無提交。"
-#: builtin/branch.c:781
+#: builtin/branch.c:817
#, c-format
msgid "No branch named '%s'."
msgstr "沒有分支 '%s'。"
-#: builtin/branch.c:796
+#: builtin/branch.c:832
msgid "too many branches for a copy operation"
msgstr "為複製動作提供了太多的分支名"
-#: builtin/branch.c:805
+#: builtin/branch.c:841
msgid "too many arguments for a rename operation"
msgstr "為重新命名動作提供了太多的參數"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "too many arguments to set new upstream"
msgstr "為設定新上游提供了太多的參數"
-#: builtin/branch.c:814
+#: builtin/branch.c:850
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "無法設定 HEAD 的上游為 %s，因為 HEAD 沒有指向任何分支。"
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:853 builtin/branch.c:873
#, c-format
msgid "no such branch '%s'"
msgstr "沒有此分支 '%s'"
-#: builtin/branch.c:821
+#: builtin/branch.c:857
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:834
+#: builtin/branch.c:867
msgid "too many arguments to unset upstream"
msgstr "為取消上游設定動作提供了太多的參數"
-#: builtin/branch.c:838
+#: builtin/branch.c:871
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。"
-#: builtin/branch.c:844
+#: builtin/branch.c:877
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 沒有上游訊息"
-#: builtin/branch.c:854
+#: builtin/branch.c:890
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>?"
@@ -11466,39 +11968,39 @@
"'git branch' 的 -a 和 -r 選項不帶一個分支名。\n"
"您是否想要使用：-a|-r --list <模式>？"
-#: builtin/branch.c:858
+#: builtin/branch.c:894
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
"不再支援選項 '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。"
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "git 版本：\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() 失敗，錯誤：「%s」(%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "編譯器資訊： "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "libc 資訊： "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格式>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11532,38 +12034,33 @@
"請檢閱臭蟲報告下方的剩餘部分。\n"
"您可刪除任何您不想分享的地方。\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "請指定 bugreport 檔案的目的地"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "請指定檔案名稱的 strftime 格式後綴"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "無法建立 '%s' 的前置目錄"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "系統資訊"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "啟用的掛鉤"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "不要在「%s」建立新檔案"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "無法寫入 %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "已在「%s」建立新報告。\n"
@@ -11578,141 +12075,253 @@
#: builtin/bundle.c:17 builtin/bundle.c:33
msgid "git bundle list-heads <file> [<refname>...]"
-msgstr "git bundle list-heads <檔案> [<參考名稱>...]"
+msgstr "git bundle list-heads <檔案> [<引用名稱>...]"
#: builtin/bundle.c:18 builtin/bundle.c:38
msgid "git bundle unbundle <file> [<refname>...]"
-msgstr "git bundle unbundle <檔案> [<參考名稱>...]"
+msgstr "git bundle unbundle <檔案> [<引用名稱>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3899
msgid "do not show progress meter"
msgstr "不顯示進度表"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
msgid "show progress meter"
msgstr "顯示進度表"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3903
msgid "show progress meter during object writing phase"
msgstr "在物件寫入階段顯示進度表"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3906
msgid "similar to --all-progress when progress meter is shown"
msgstr "當進度表顯示時類似於 --all-progress"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
-msgstr "指定包格式版本"
+msgstr "指定套件的格式版本"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
-msgstr "需要一個版本庫來建立包。"
+msgstr "需要版本庫來建立套件。"
-#: builtin/bundle.c:109
+#: builtin/bundle.c:108
msgid "do not show bundle details"
-msgstr "不顯示包 (bundle) 詳細資訊"
+msgstr "不顯示套件詳細資訊"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:127
#, c-format
msgid "%s is okay\n"
msgstr "%s 可以\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:183
msgid "Need a repository to unbundle."
-msgstr "需要一個版本庫來解包。"
+msgstr "需要版本庫才能拆分套件。"
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "詳細輸出；必須置於子指令之前"
+#: builtin/bundle.c:186
+msgid "Unbundling objects"
+msgstr "正在解包物件"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:220 builtin/remote.c:1758
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子指令：%s"
-#: builtin/cat-file.c:596
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
-msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"
+#: builtin/cat-file.c:568
+msgid "flush is only for --buffer mode"
+msgstr "排清功能只能用於 --buffer 模式"
-#: builtin/cat-file.c:597
-msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
-msgstr ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
+#: builtin/cat-file.c:612
+msgid "empty command in input"
+msgstr "輸入中沒有命令"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:614
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "命令前空格：「%s」"
+
+#: builtin/cat-file.c:623
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s 需要引數"
+
+#: builtin/cat-file.c:628
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s 不取引數"
+
+#: builtin/cat-file.c:636
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "未知命令：「%s」"
+
+#: builtin/cat-file.c:795
msgid "only one batch option may be specified"
msgstr "只能指定一個批次處理選項"
-#: builtin/cat-file.c:636
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<類型> 可以是其中之一：blob、tree、commit、tag"
+#: builtin/cat-file.c:824
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <type> <object>"
-#: builtin/cat-file.c:637
-msgid "show object type"
-msgstr "顯示物件類型"
+#: builtin/cat-file.c:825
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git cat-file (-e | -p) <object>"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:826
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+
+#: builtin/cat-file.c:827
+msgid ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
+
+#: builtin/cat-file.c:830
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+
+#: builtin/cat-file.c:836
+msgid "Check object existence or emit object contents"
+msgstr "檢查物件的存在狀態，或輸出物件內容"
+
+#: builtin/cat-file.c:838
+msgid "check if <object> exists"
+msgstr "檢查 <object> 是否存在"
+
+#: builtin/cat-file.c:839
+msgid "pretty-print <object> content"
+msgstr "美化輸出 <object> 的內容"
+
+#: builtin/cat-file.c:841
+msgid "Emit [broken] object attributes"
+msgstr "輸出 [損壞的] 物件屬性"
+
+#: builtin/cat-file.c:842
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr "顯示物件類型（可以是 “blob”、“tree”、“commit”、“tag” 等其中一個）"
+
+#: builtin/cat-file.c:843
msgid "show object size"
msgstr "顯示物件大小"
-#: builtin/cat-file.c:640
-msgid "exit with zero when there's no error"
-msgstr "當沒有錯誤時離開並返回零"
-
-#: builtin/cat-file.c:641
-msgid "pretty-print object's content"
-msgstr "美觀地列印物件的內容"
-
-#: builtin/cat-file.c:643
-msgid "for blob objects, run textconv on object's content"
-msgstr "對於資料物件，對其內容做文字轉換"
-
-#: builtin/cat-file.c:645
-msgid "for blob objects, run filters on object's content"
-msgstr "對於資料物件，對其內容做過濾"
-
-#: builtin/cat-file.c:646
-msgid "blob"
-msgstr "blob"
-
-#: builtin/cat-file.c:647
-msgid "use a specific path for --textconv/--filters"
-msgstr "對於 --textconv/--filters 使用一個特定的路徑"
-
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:845
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允許 -s 和 -t 對損壞的物件生效"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:847
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr "批次處理 stdin 上請求的物件（或 --batch-all-objects）"
+
+#: builtin/cat-file.c:849
+msgid "show full <object> or <rev> contents"
+msgstr "顯示完整的 <object> 或 <rev> 內容"
+
+#: builtin/cat-file.c:853
+msgid "like --batch, but don't emit <contents>"
+msgstr "類似 --batch 但不輸出 <contents>"
+
+#: builtin/cat-file.c:857
+msgid "read commands from stdin"
+msgstr "從標準輸入讀取命令"
+
+#: builtin/cat-file.c:861
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr "傳入 --batch[-check]：忽略標準輸入，批次處理所有已知物件"
+
+#: builtin/cat-file.c:863
+msgid "Change or optimize batch output"
+msgstr "變更或最佳化批次處理的輸出"
+
+#: builtin/cat-file.c:864
msgid "buffer --batch output"
msgstr "緩衝 --batch 的輸出"
-#: builtin/cat-file.c:652
-msgid "show info and content of objects fed from the standard input"
-msgstr "顯示從標準輸入提供的物件的訊息和內容"
+#: builtin/cat-file.c:866
+msgid "follow in-tree symlinks"
+msgstr "追蹤樹中的符號連結"
-#: builtin/cat-file.c:656
-msgid "show info about objects fed from the standard input"
-msgstr "顯示從標準輸入提供的物件的訊息"
+#: builtin/cat-file.c:868
+msgid "do not order objects before emitting them"
+msgstr "不要在輸出物件前排序"
-#: builtin/cat-file.c:660
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr "跟隨樹內符號連結（和 --batch 或 --batch-check 共用）"
+#: builtin/cat-file.c:870
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
+msgstr "轉換或過濾後輸出物件（blob 或樹）（單獨或批次處理）"
-#: builtin/cat-file.c:662
-msgid "show all objects with --batch or --batch-check"
-msgstr "使用 --batch 或 --batch-check 參數顯示所有物件"
+#: builtin/cat-file.c:872
+msgid "run textconv on object's content"
+msgstr "在物件內容執行 textconv"
-#: builtin/cat-file.c:664
-msgid "do not order --batch-all-objects output"
-msgstr "不要對 --batch-all-objects 的輸出排序"
+#: builtin/cat-file.c:874
+msgid "run filters on object's content"
+msgstr "在物件內容執行過濾器"
+
+#: builtin/cat-file.c:875
+msgid "blob|tree"
+msgstr "blob|tree"
+
+#: builtin/cat-file.c:876
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
+msgstr "請在 (--textconv | --filters) 使用 <path>，而非 “batch”"
+
+#: builtin/cat-file.c:894
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "「%s=<%s>」需要「%s」或「%s」"
+
+#: builtin/cat-file.c:896
+msgid "path|tree-ish"
+msgstr "path|tree-ish"
+
+#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "「%s」需要批次處理模式"
+
+#: builtin/cat-file.c:921
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "「-%c」與批次處理模式不相容"
+
+#: builtin/cat-file.c:924
+msgid "batch modes take no arguments"
+msgstr "批次處理模式不取引數"
+
+#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "<rev> 需要搭配「%s」"
+
+#: builtin/cat-file.c:938
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "<object> 需要搭配「-%c」"
+
+#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429
+#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596
+#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965
+#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
+#: builtin/tag.c:592
+msgid "too many arguments"
+msgstr "太多參數"
+
+#: builtin/cat-file.c:947
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr "只允許在 <type> <object> 模式傳入兩個引數，但傳了 %d 個"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -11730,7 +12339,7 @@
msgid "use .gitattributes only from the index"
msgstr "只使用索引中的 .gitattributes"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
msgid "read file names from stdin"
msgstr "從標準輸入讀出檔案名"
@@ -11738,8 +12347,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "輸入和輸出的紀錄使用 NUL 字元終結"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
+#: builtin/worktree.c:565
msgid "suppress progress reporting"
msgstr "不顯示進度報告"
@@ -11796,164 +12405,162 @@
msgid "git checkout--worker [<options>]"
msgstr "git checkout--worker [<選項>]"
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
+#: builtin/worktree.c:808
msgid "string"
msgstr "字串"
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
msgid "when creating files, prepend <string>"
msgstr "在建立檔案時，在前面加上 <字串>"
-#: builtin/checkout-index.c:152
+#: builtin/checkout-index.c:184
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<選項>] [--] [<檔案>...]"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:201
msgid "stage should be between 1 and 3 or all"
msgstr "索引值應該取值 1 到 3 或者 all"
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:219
msgid "check out all files in the index"
msgstr "簽出索引區的所有檔案"
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:221
+msgid "do not skip files with skip-worktree set"
+msgstr "設定 skip-worktree 時不略過檔案"
+
+#: builtin/checkout-index.c:222
msgid "force overwrite of existing files"
msgstr "強制覆蓋現有的檔案"
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:224
msgid "no warning for existing files and files not in index"
msgstr "存在或不在索引中的檔案都沒有警告"
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:226
msgid "don't checkout new files"
msgstr "不簽出新檔案"
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:228
msgid "update stat information in the index file"
msgstr "更新索引中檔案的狀態訊息"
-#: builtin/checkout-index.c:198
+#: builtin/checkout-index.c:232
msgid "read list of paths from the standard input"
msgstr "從標準輸入讀取路徑列表"
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:234
msgid "write the content to temporary files"
msgstr "將內容寫入暫存檔"
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:238
msgid "copy out the files from named stage"
msgstr "從指定暫存區中拷出檔案"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:34
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<選項>] <分支>"
-#: builtin/checkout.c:34
+#: builtin/checkout.c:35
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<選項>] [<分支>] -- <檔案>..."
-#: builtin/checkout.c:39
+#: builtin/checkout.c:40
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<選項>] [<分支>]"
-#: builtin/checkout.c:44
+#: builtin/checkout.c:45
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<選項>] [--source=<分支>] <檔案>..."
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:199 builtin/checkout.c:238
#, c-format
msgid "path '%s' does not have our version"
msgstr "路徑 '%s' 沒有我們的版本"
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:201 builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have their version"
msgstr "路徑 '%s' 沒有他們的版本"
-#: builtin/checkout.c:208
+#: builtin/checkout.c:217
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路徑 '%s' 沒有全部必需的版本"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:271
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路徑 '%s' 沒有必需的版本"
-#: builtin/checkout.c:278
+#: builtin/checkout.c:291
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：無法合併"
-#: builtin/checkout.c:294
+#: builtin/checkout.c:307
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "無法為 '%s' 新增合併結果"
-#: builtin/checkout.c:411
+#: builtin/checkout.c:424
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "重新建立了 %d 個合併衝突"
-#: builtin/checkout.c:416
+#: builtin/checkout.c:429
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "從 %2$s 更新了 %1$d 個路徑"
-#: builtin/checkout.c:423
+#: builtin/checkout.c:436
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "從索引區更新了 %d 個路徑"
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:469
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路徑時使用"
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' 不能和 %s 同時使用"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:479
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同時更新路徑並切換到分支'%s'。"
-#: builtin/checkout.c:470
+#: builtin/checkout.c:483
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "'%s' 或 '%s' 都沒有指定"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:487
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "未指定 '%2$s' 時，必須使用 '%1$s'"
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:492 builtin/checkout.c:497
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:571 builtin/checkout.c:578
#, c-format
msgid "path '%s' is unmerged"
msgstr "路徑 '%s' 未合併"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:753
msgid "you need to resolve your current index first"
msgstr "您需要先解決目前索引的衝突"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:809
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11962,51 +12569,51 @@
"不能繼續，下列檔案有暫存的修改：\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:902
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能對 '%s' 執行 reflog 動作：%s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:947
msgid "HEAD is now at"
msgstr "HEAD 目前位於"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:955
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重設分支 '%s'\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:958
#, c-format
msgid "Already on '%s'\n"
msgstr "已經位於 '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:962
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切換並重設分支 '%s'\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:964 builtin/checkout.c:1398
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切換到一個新分支 '%s'\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:966
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切換到分支 '%s'\n"
# 譯者：請維持前導空格
-#: builtin/checkout.c:993
+#: builtin/checkout.c:1017
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 個。\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12023,7 +12630,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1042
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12044,19 +12651,19 @@
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1077
msgid "internal error in revision walk"
msgstr "在版本遍歷時遇到內部錯誤"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1081
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1124 builtin/checkout.c:1393
msgid "You are on a branch yet to be born"
msgstr "您位於一個尚未初始化的分支"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1206
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12065,7 +12672,7 @@
"'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n"
"請使用 --（和可選的 --no-guess）來消除歧義"
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1213
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"
@@ -12084,51 +12691,56 @@
"如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n"
"版本庫名，可以在設定中設定 checkout.defaultRemote=origin。"
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1223
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' 符合多個 (%d) 遠端追蹤分支"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
msgid "only one reference expected"
msgstr "預期只有一個引用"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1306
#, c-format
msgid "only one reference expected, %d given."
msgstr "應只有一個引用，卻提供了 %d 個。"
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
#, c-format
msgid "invalid reference: %s"
msgstr "無效引用：%s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1365 builtin/checkout.c:1744
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一個樹：%s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "期望一個分支，得到標籤 '%s'"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1415
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "期望一個分支，得到遠端分支 '%s'"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1417 builtin/checkout.c:1426
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "期望一個分支，得到 '%s'"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1420
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "期望一個分支，得到提交 '%s'"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1429
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr "若您想要分離提交的 HEAD，請傳入 --detach 選項重試。"
+
+#: builtin/checkout.c:1442
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12136,7 +12748,7 @@
"不能在合併時切換分支\n"
"考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12144,7 +12756,7 @@
"不能在 am 工作階段期間切換分支\n"
"考慮使用 \"git am --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1450
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12152,7 +12764,7 @@
"不能在重定基底時切換分支\n"
"考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12160,7 +12772,7 @@
"不能在揀選時切換分支\n"
"考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1458
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12168,208 +12780,192 @@
"不能在還原時切換分支\n"
"考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1462
msgid "you are switching branch while bisecting"
msgstr "您在執行二分搜尋時切換分支"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1469
msgid "paths cannot be used with switching branches"
msgstr "路徑不能和切換分支同時使用"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切換分支同時使用"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
+#: builtin/checkout.c:1495 builtin/checkout.c:1500
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同時使用"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1497
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' 不帶 <起始點>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1505
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切換分支到一個非提交 '%s'"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1512
msgid "missing branch or commit argument"
msgstr "缺少分支或提交參數"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1555
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支執行三方合併"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
msgid "style"
msgstr "風格"
-#: builtin/checkout.c:1522
-msgid "conflict style (merge or diff3)"
-msgstr "衝突輸出風格（merge 或 diff3）"
+#: builtin/checkout.c:1557
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "衝突輸出風格（merge、diff3 或 zdiff3）"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1569 builtin/worktree.c:560
msgid "detach HEAD at named commit"
msgstr "HEAD 從指定的提交分離"
-#: builtin/checkout.c:1535
-msgid "set upstream info for new branch"
-msgstr "為新的分支設定上游訊息"
-
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1574
msgid "force checkout (throw away local modifications)"
msgstr "強制簽出（捨棄本機修改）"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1576
msgid "new unparented branch"
msgstr "新的沒有父提交的分支"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1578 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "更新忽略的檔案（預設）"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1581
msgid "do not check if another worktree is holding the given ref"
msgstr "不檢查指定的引用是否被其他工作區所占用"
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1594
msgid "checkout our version for unmerged files"
msgstr "對尚未合併的檔案簽出我們的版本"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1597
msgid "checkout their version for unmerged files"
msgstr "對尚未合併的檔案簽出他們的版本"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1601
msgid "do not limit pathspecs to sparse entries only"
msgstr "對路徑不做稀疏簽出的限制"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1659
#, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c、-%c 和 --orphan 是互斥的"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "「-%c」、「-%c」和「%s」選項不得同時使用"
-#: builtin/checkout.c:1626
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p 和 --overlay 互斥"
-
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1700
msgid "--track needs a branch name"
msgstr "--track 需要一個分支名"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1705
#, c-format
msgid "missing branch name; try -%c"
msgstr "缺少分支名稱，請嘗試 -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1737
#, c-format
msgid "could not resolve %s"
msgstr "無法解析 %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1753
msgid "invalid path specification"
msgstr "無效的路徑規格"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1760
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1764
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路徑參數 '%s'"
-#: builtin/checkout.c:1736
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file 與 --detach 不相容"
-
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file 與 --patch 不相容"
-
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1789
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout：在從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。"
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1794
msgid "you must specify path(s) to restore"
msgstr "您必須指定一個要復原的路徑"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
+#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
+#: builtin/remote.c:173 builtin/submodule--helper.c:3038
+#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
+#: builtin/worktree.c:558
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1820
msgid "create and checkout a new branch"
msgstr "建立並簽出一個新的分支"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1822
msgid "create/reset and checkout a branch"
msgstr "建立/重設並簽出一個分支"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1823
msgid "create reflog for new branch"
msgstr "為新的分支建立引用日誌"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1825
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "二次猜測 'git checkout <無此分支>'（預設）"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1826
msgid "use overlay mode (default)"
msgstr "使用疊加模式（預設）"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1874
msgid "create and switch to a new branch"
msgstr "建立並切換一個新分支"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1876
msgid "create/reset and switch to a branch"
msgstr "建立/重設並切換一個分支"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1878
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜測 'git switch <無此分支>'"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1880
msgid "throw away local modifications"
msgstr "捨棄本機修改"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1916
msgid "which tree-ish to checkout from"
msgstr "要簽出哪一個樹"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1918
msgid "restore the index"
msgstr "復原索引"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1920
msgid "restore the working tree (default)"
msgstr "復原工作區（預設）"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1922
msgid "ignore unmerged entries"
msgstr "忽略未合併條目"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1923
msgid "use overlay mode"
msgstr "使用疊加模式"
@@ -12404,7 +13000,15 @@
msgid "could not lstat %s\n"
msgstr "不能對 %s 呼叫 lstat\n"
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "拒絕移除目前工作目錄\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "會拒絕移除目前的工作目錄\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12417,7 +13021,7 @@
"foo - 透過唯一前綴選擇一個選項\n"
" - （空）什麼也不選擇\n"
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12438,33 +13042,33 @@
"* - 選擇所有選項\n"
" - （空）結束選擇\n"
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯（%s）？\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:685
#, c-format
msgid "Input ignore patterns>> "
msgstr "輸入範本以排除條目>> "
-#: builtin/clean.c:693
+#: builtin/clean.c:719
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告：無法找到和 %s 符合的條目"
-#: builtin/clean.c:714
+#: builtin/clean.c:740
msgid "Select items to delete"
msgstr "選擇要刪除的條目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
#, c-format
msgid "Remove %s [y/N]? "
msgstr "移除 %s [y/N]？ "
-#: builtin/clean.c:786
+#: builtin/clean.c:812
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12482,276 +13086,274 @@
"help - 顯示本協助\n"
"? - 顯示如何在提示符下選擇的協助"
-#: builtin/clean.c:822
+#: builtin/clean.c:848
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "將刪除如下條目："
-#: builtin/clean.c:838
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "沒有要清理的檔案，離開。"
-#: builtin/clean.c:900
+#: builtin/clean.c:926
msgid "do not print names of files removed"
msgstr "不列印刪除檔案的名稱"
-#: builtin/clean.c:902
+#: builtin/clean.c:928
msgid "force"
msgstr "強制"
-#: builtin/clean.c:903
+#: builtin/clean.c:929
msgid "interactive cleaning"
msgstr "互動式清除"
-#: builtin/clean.c:905
+#: builtin/clean.c:931
msgid "remove whole directories"
msgstr "刪除整個目錄"
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
+#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:907
+#: builtin/clean.c:933
msgid "add <pattern> to ignore rules"
msgstr "新增 <模式> 到忽略規則"
-#: builtin/clean.c:908
+#: builtin/clean.c:934
msgid "remove ignored files, too"
msgstr "也刪除忽略的檔案"
-#: builtin/clean.c:910
+#: builtin/clean.c:936
msgid "remove only ignored files"
msgstr "只刪除忽略的檔案"
-#: builtin/clean.c:925
+#: builtin/clean.c:951
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
"clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"
-#: builtin/clean.c:928
+#: builtin/clean.c:954
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
"clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"
-#: builtin/clean.c:940
+#: builtin/clean.c:966
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同時使用"
-#: builtin/clone.c:45
+#: builtin/clone.c:47
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]"
-#: builtin/clone.c:96
+#: builtin/clone.c:100
msgid "don't clone shallow repository"
msgstr "不要複製淺版本庫"
-#: builtin/clone.c:98
+#: builtin/clone.c:102
msgid "don't create a checkout"
msgstr "不建立一個簽出"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "建立一個純版本庫"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "create a mirror repository (implies bare)"
msgstr "建立一個鏡像版本庫（也是純版本庫）"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "to clone from a local repository"
msgstr "從本機版本庫複製"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "don't use local hardlinks, always copy"
msgstr "不使用本機硬連結，始終複製"
-#: builtin/clone.c:109
+#: builtin/clone.c:113
msgid "setup as shared repository"
msgstr "設定為共享版本庫"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "pathspec"
msgstr "路徑規格"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "initialize submodules in the clone"
msgstr "在複製時初始化子模組"
-#: builtin/clone.c:115
+#: builtin/clone.c:119
msgid "number of submodules cloned in parallel"
msgstr "並行複製的子模組數"
-#: builtin/clone.c:116 builtin/init-db.c:539
+#: builtin/clone.c:120 builtin/init-db.c:539
msgid "template-directory"
msgstr "範本目錄"
-#: builtin/clone.c:117 builtin/init-db.c:540
+#: builtin/clone.c:121 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "範本目錄將被使用"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
msgid "reference repository"
-msgstr "參考版本庫"
+msgstr "引用版本庫"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:127 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2721
msgid "use --reference only while cloning"
msgstr "僅在複製時參考 --reference 指向的本機版本庫"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3967 builtin/repack.c:669
+#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "名稱"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "簽出 <分支> 而不是遠端 HEAD"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "path to git-upload-pack on the remote"
msgstr "遠端 git-upload-pack 路徑"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
+#: builtin/pull.c:212
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:131
+#: builtin/clone.c:135
msgid "create a shallow clone of that depth"
msgstr "建立一個指定深度的淺複製"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
+#: builtin/pull.c:215
msgid "time"
msgstr "時間"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "create a shallow clone since a specific time"
msgstr "建立從指定時間到現在的淺複製"
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
msgid "revision"
msgstr "修訂版"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "取得更多淺複製的過去歷史記錄，除了特定版本"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:141 builtin/submodule--helper.c:1897
+#: builtin/submodule--helper.c:2735
msgid "clone only one branch, HEAD or --branch"
msgstr "只複製一個分支、HEAD 或 --branch"
-#: builtin/clone.c:139
+#: builtin/clone.c:143
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "不要複製任何標籤，之後取得也不要追蹤這些標籤"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "any cloned submodules will be shallow"
msgstr "子模組將以淺下載模式複製"
-#: builtin/clone.c:142 builtin/init-db.c:548
+#: builtin/clone.c:146 builtin/init-db.c:548
msgid "gitdir"
msgstr "git目錄"
-#: builtin/clone.c:143 builtin/init-db.c:549
+#: builtin/clone.c:147 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "git目錄和工作區分離"
-#: builtin/clone.c:144
+#: builtin/clone.c:148
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:145
+#: builtin/clone.c:149
msgid "set config inside the new repository"
msgstr "在新版本庫中設定設定訊息"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "server-specific"
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "傳輸選項"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 位址"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 位址"
-#: builtin/clone.c:154
+#: builtin/clone.c:158
+msgid "apply partial clone filters to submodules"
+msgstr "將部分複製過濾器套用至子模組"
+
+#: builtin/clone.c:160
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "任何複製的子模組都將使用它們的遠端追蹤分支"
-#: builtin/clone.c:156
+#: builtin/clone.c:162
msgid "initialize sparse-checkout file to include only files at root"
msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"無法猜到目錄名。\n"
-"請在指令列指定一個目錄"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:237
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能為 '%s' 新增一個備用：%s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:310
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一個目錄"
-#: builtin/clone.c:436
+#: builtin/clone.c:328
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "無法在 '%s' 上啟動疊代器"
-#: builtin/clone.c:467
+#: builtin/clone.c:359
#, c-format
msgid "failed to create link '%s'"
msgstr "建立連結 '%s' 失敗"
-#: builtin/clone.c:471
+#: builtin/clone.c:363
#, c-format
msgid "failed to copy file to '%s'"
msgstr "複製檔案至 '%s' 失敗"
-#: builtin/clone.c:476
+#: builtin/clone.c:368
#, c-format
msgid "failed to iterate over '%s'"
msgstr "無法在 '%s' 上疊代"
-#: builtin/clone.c:503
+#: builtin/clone.c:395
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:409
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12761,148 +13363,148 @@
"您可以透過 'git status' 檢查哪些已被簽出，然後使用指令\n"
"'git restore --source=HEAD :/' 重試\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:486
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "找不到要複製的遠端分支 %s。"
-#: builtin/clone.c:713
+#: builtin/clone.c:603
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:651
msgid "failed to initialize sparse-checkout"
msgstr "無法初始化稀疏簽出"
-#: builtin/clone.c:784
+#: builtin/clone.c:674
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:709
msgid "unable to checkout working tree"
msgstr "不能簽出工作區"
-#: builtin/clone.c:894
+#: builtin/clone.c:793
msgid "unable to write parameters to config file"
msgstr "無法將參數寫入設定檔案"
-#: builtin/clone.c:957
+#: builtin/clone.c:856
msgid "cannot repack to clean up"
msgstr "無法執行 repack 來清理"
-#: builtin/clone.c:959
+#: builtin/clone.c:858
msgid "cannot unlink temporary alternates file"
msgstr "無法刪除暫時的 alternates 檔案"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:901
msgid "Too many arguments."
msgstr "太多參數。"
-#: builtin/clone.c:1005
+#: builtin/clone.c:905 contrib/scalar/scalar.c:413
msgid "You must specify a repository to clone."
msgstr "您必須指定要複製的版本庫。"
-#: builtin/clone.c:1018
+#: builtin/clone.c:918
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare 和 --origin %s 選項不相容。"
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "「%s」和「%s %s」選項不得同時使用"
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare 和 --separate-git-dir 選項不相容。"
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:935
#, c-format
msgid "repository '%s' does not exist"
msgstr "版本庫 '%s' 不存在"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:939 builtin/fetch.c:2176
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一個正數"
-#: builtin/clone.c:1049
+#: builtin/clone.c:949
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
-msgstr "目標路徑 '%s' 已經存在，並且不是一個空目錄。"
+msgstr "目的地路徑 '%s' 已經存在，並且不是一個空目錄。"
-#: builtin/clone.c:1055
+#: builtin/clone.c:955
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。"
-#: builtin/clone.c:1069
+#: builtin/clone.c:969
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作區 '%s' 已經存在。"
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
+#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能為 '%s' 建立先導目錄"
-#: builtin/clone.c:1089
+#: builtin/clone.c:989
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能建立工作區目錄 '%s'"
-#: builtin/clone.c:1109
+#: builtin/clone.c:1009
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "複製到純版本庫 '%s'...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1011
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正複製到 '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1040
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' 不是一個有效的遠端名稱"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1157
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "本機複製會忽略 --depth。請改用 file:// 通訊協定。"
-#: builtin/clone.c:1231
+#: builtin/clone.c:1159
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "本機複製會忽略 --shallow-since。請改用 file:// 協定。"
-#: builtin/clone.c:1233
+#: builtin/clone.c:1161
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// 協定。"
-#: builtin/clone.c:1235
+#: builtin/clone.c:1163
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "本機複製會忽略 --filter。請改用 file:// 協定。"
-#: builtin/clone.c:1240
+#: builtin/clone.c:1168
msgid "source repository is shallow, ignoring --local"
-msgstr "源版本庫是淺複製，忽略 --local"
+msgstr "來源版本庫是淺複製，忽略 --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1173
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1185
+msgid "cannot clone from filtered bundle"
+msgstr "無法從過濾後的套件複製"
+
+#: builtin/clone.c:1265 builtin/clone.c:1324
msgid "remote transport reported error"
msgstr "遠端傳輸回報錯誤"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1277 builtin/clone.c:1289
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "遠端分支 %s 在上游 %s 未發現"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1292
msgid "You appear to have cloned an empty repository."
msgstr "您複製的版本庫似乎是空的。"
@@ -12938,14 +13540,14 @@
msgid "--command must be the first argument"
msgstr "--command 必須是第一個參數"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--"
"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -12955,93 +13557,91 @@
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "找不到符合 %s 的物件目錄"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
msgid "dir"
msgstr "目錄"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "儲存圖形的物件目錄"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr "如果提交圖形被分割，只驗證頭一個檔案"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "無法開啟提交圖形 '%s'"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "無法識別的 --split 參數，%s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "非期望的非十六進位物件 ID：%s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "物件無效：%s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "開始遍歷所有引用"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "從標準輸入中的包索引檔案列表中掃描提交"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "從標準輸入中的提交開始掃描"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr "包含 commit-graph 檔案中已有所有提交"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "啟用已變更路徑的計算"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "允許寫一個增量提交圖形檔案"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "在非基本分割提交圖形中的最大提交數"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "一個分割提交圖形的兩個級別之間的最大比率"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "只將舊於指定日期與時間的檔案設為過期"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "變更路徑的布隆過濾器要計算的最大量"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "正在從輸入收集提交"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "未識別的子指令：%s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13055,70 +13655,65 @@
msgid "duplicate parent %s ignored"
msgstr "忽略重複的父提交 %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
#, c-format
msgid "not a valid object name %s"
msgstr "不是一個有效的物件名 %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree：無法開啟 '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree：無法讀取 '%s'"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree：無法關閉 '%s'"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "父提交"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "父提交物件 ID"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
+#: builtin/tag.c:455
msgid "message"
msgstr "訊息"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "提交說明"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "從檔案中讀取提交說明"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交簽名"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "必須精確地提供一個樹"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree：讀取失敗"
-#: builtin/commit.c:41
+#: builtin/commit.c:43
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<選項>] [--] <路徑規格>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:48
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<選項>] [--] <路徑規格>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:53
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13127,7 +13722,7 @@
"您要修補最近的提交，但這麼做會讓它成為空提交。您可以重複您的指令並帶上\n"
"--allow-empty 選項，或者您可用指令 \"git reset HEAD^\" 整個刪除該提交。\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:58
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13141,15 +13736,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:65
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "否則，請使用 'git rebase --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:68
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "否則，請使用 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:71
msgid ""
"and then use:\n"
"\n"
@@ -13170,115 +13765,111 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:326
msgid "failed to unpack HEAD tree object"
msgstr "解包 HEAD 樹狀物件失敗"
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file 和 -a 同時使用沒有意義"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:376
msgid "No paths with --include/--only does not make sense."
msgstr "參數 --include/--only 不跟路徑沒有意義。"
-#: builtin/commit.c:386
+#: builtin/commit.c:388
msgid "unable to create temporary index"
msgstr "不能建立暫時索引"
-#: builtin/commit.c:395
+#: builtin/commit.c:397
msgid "interactive add failed"
msgstr "互動式新增失敗"
-#: builtin/commit.c:410
+#: builtin/commit.c:412
msgid "unable to update temporary index"
msgstr "無法更新暫時索引"
-#: builtin/commit.c:412
+#: builtin/commit.c:414
msgid "Failed to update main cache tree"
msgstr "不能更新樹的主快取"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
msgid "unable to write new_index file"
msgstr "無法寫 new_index 檔案"
-#: builtin/commit.c:489
+#: builtin/commit.c:491
msgid "cannot do a partial commit during a merge."
msgstr "在合併過程中不能做部分提交。"
-#: builtin/commit.c:491
+#: builtin/commit.c:493
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在揀選過程中不能做部分提交。"
-#: builtin/commit.c:493
+#: builtin/commit.c:495
msgid "cannot do a partial commit during a rebase."
msgstr "在重定基底過程中不能做部分提交。"
-#: builtin/commit.c:501
+#: builtin/commit.c:503
msgid "cannot read the index"
msgstr "無法讀取索引"
-#: builtin/commit.c:520
+#: builtin/commit.c:522
msgid "unable to write temporary index file"
msgstr "無法寫暫時索引檔案"
-#: builtin/commit.c:618
+#: builtin/commit.c:620
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者訊息"
-#: builtin/commit.c:620
+#: builtin/commit.c:622
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有格式錯誤的作者訊息"
-#: builtin/commit.c:639
+#: builtin/commit.c:641
msgid "malformed --author parameter"
msgstr "格式錯誤的 --author 參數"
-#: builtin/commit.c:692
+#: builtin/commit.c:694
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "無法選擇一個未被目前提交說明使用的備註字元"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查詢提交 %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:762 builtin/shortlog.c:417
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正從標準輸入中讀取日誌訊息）\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:764
msgid "could not read log from standard input"
msgstr "不能從標準輸入中讀取日誌訊息"
-#: builtin/commit.c:764
+#: builtin/commit.c:768
#, c-format
msgid "could not read log file '%s'"
msgstr "不能讀取日誌檔案 '%s'"
-#: builtin/commit.c:801
+#: builtin/commit.c:805
#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "-m 和 --fixup:%s 不可結合使用"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "「%s」和「%s:%s」選項不得同時使用"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:817 builtin/commit.c:833
msgid "could not read SQUASH_MSG"
msgstr "不能讀取 SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
msgid "could not read MERGE_MSG"
msgstr "不能讀取 MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:884
msgid "could not write commit template"
msgstr "不能寫提交範本"
-#: builtin/commit.c:893
+#: builtin/commit.c:897
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13287,7 +13878,7 @@
"請輸入描述您變更的提交訊息。\n"
"開頭是「%c」的行皆會忽略。\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:899
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13296,7 +13887,7 @@
"請輸入描述您變更的提交訊息。開頭是「%c」\n"
"的行皆會忽略。提交訊息空白則取消本次提交作業。\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:903
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13305,7 +13896,7 @@
"請輸入描述您變更的提交訊息。會保留開頭是「%c」\n"
"的行，但也可以自己移除掉這些行。\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:907
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13316,7 +13907,7 @@
"「%c」的行，但也可以自己移除掉這些行。\n"
"提交訊息空白則取消本次提交作業。\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:919
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13330,7 +13921,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"後重試。\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:924
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13345,173 +13936,147 @@
"後重試。\n"
# 譯者：為保證在輸出中對齊，注意調整句中空格！
-#: builtin/commit.c:947
+#: builtin/commit.c:951
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者： %.*s <%.*s>"
# 譯者：為保證在輸出中對齊，注意調整句中空格！
-#: builtin/commit.c:955
+#: builtin/commit.c:959
#, c-format
msgid "%sDate: %s"
msgstr "%s日期： %s"
# 譯者：為保證在輸出中對齊，注意調整句中空格！
-#: builtin/commit.c:962
+#: builtin/commit.c:966
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者：%.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:984
msgid "Cannot read index"
msgstr "無法讀取索引"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1029
msgid "unable to pass trailers to --trailers"
msgstr "無法將尾部署名傳遞至 --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1069
msgid "Error building trees"
msgstr "無法建立樹狀物件"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1083 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "請使用 -m 或 -F 選項提供提交說明。\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1128
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1142
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "無效的忽略模式 '%s'"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1160 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "無效的未追蹤檔案參數 '%s'"
-#: builtin/commit.c:1195
-msgid "--long and -z are incompatible"
-msgstr "--long 和 -z 選項不相容"
-
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
msgid "You are in the middle of a merge -- cannot reword."
msgstr "正在合併中——不能重新輸入。"
-#: builtin/commit.c:1228
+#: builtin/commit.c:1233
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "正在揀選中——不能重新輸入。"
-#: builtin/commit.c:1231
+#: builtin/commit.c:1236
#, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "不能將「%s」路徑與 --fixup 的 reword 選項結合"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "「%s」的改寫選項和「%s」路徑不得同時使用"
-#: builtin/commit.c:1233
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"--fixup 的 reword 選項與 --patch/--interactive/--all/--include/--only 互斥"
+#: builtin/commit.c:1238
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "「%s」的改寫選項和「%s」不得同時使用"
-#: builtin/commit.c:1252
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "同時使用 --reset-author 和 --author 沒有意義"
-
-#: builtin/commit.c:1261
+#: builtin/commit.c:1263
msgid "You have nothing to amend."
msgstr "您沒有可修補的提交。"
-#: builtin/commit.c:1264
+#: builtin/commit.c:1266
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正處於一個合併過程中 -- 無法修補提交。"
-#: builtin/commit.c:1266
+#: builtin/commit.c:1268
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正處於一個揀選過程中 -- 無法修補提交。"
-#: builtin/commit.c:1268
+#: builtin/commit.c:1270
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "您正處於重定基底的過程中 -- 無法修訂。"
-#: builtin/commit.c:1271
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "選項 --squash 和 --fixup 不能同時使用"
-
-#: builtin/commit.c:1281
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "只能用一個 -c/-C/-F/--fixup 選項。"
-
-#: builtin/commit.c:1283
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "選項 -m 不能和 -c/-C/-F 同時使用。"
-
-#: builtin/commit.c:1292
+#: builtin/commit.c:1290
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。"
-#: builtin/commit.c:1310
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。"
-
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "未知選項：--fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "以簡潔的格式顯示狀態"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "顯示分支訊息"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "顯示儲藏區訊息"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "計算完整的領先/落後值"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:765
msgid "machine-readable output"
msgstr "機器可讀的輸出"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "以長格式顯示狀態（預設）"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "條目以 NUL 字元結尾"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13519,201 +14084,201 @@
"顯示已忽略的檔案，可選模式：traditional、matching、no。（預設值："
"traditional）"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:197
msgid "when"
msgstr "何時"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設值：all）"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "以列的方式顯示未追蹤的檔案"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "不檢測重新命名"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "檢測重新命名，可以設定索引相似度"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支援已忽略和未追蹤檔案參數的組合"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "提交成功後不顯示概述訊息"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "在提交說明範本裡顯示差異"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "提交說明選項"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
msgid "read message from file"
msgstr "從檔案中讀取提交說明"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "提交時覆蓋作者"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:551
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "提交時覆蓋日期"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:360 ref-filter.h:89
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "重用並編輯指定提交的提交說明"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交說明"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]commit"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr "使用 autosquash 格式化後的說明來 fixup 或是 amend/reword 指定提交"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "尾部署名"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "加入自訂尾部署名"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "在結尾加入 Signed-off-by"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "使用指定的範本檔案"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "強制編輯提交"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "在提交說明範本裡包含狀態訊息"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "提交內容選項"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "提交所有改動的檔案"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "新增指定的檔案到索引區等待提交"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "互動式新增檔案"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "互動式新增變更"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "只提交指定的檔案"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "繞過 pre-commit 和 commit-msg 掛鉤"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "顯示將要提交的內容"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "繞過 post-rewrite 掛鉤"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "允許一個空提交"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "允許空的提交說明"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "損壞的 MERGE_HEAD 檔案（%s）"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "不能讀取 MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "不能讀取提交說明：%s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "終止提交因為提交說明為空。\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "終止提交；您未更改來自範本的提交說明。\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "提交說明內文空白，中止提交作業。\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -13781,7 +14346,7 @@
#: builtin/config.c:140
msgid "get values for regexp: name-regex [value-pattern]"
-msgstr "根據正規表示式取得值：name-regex [value-pattern]"
+msgstr "根據常規表示式取得值：name-regex [value-pattern]"
#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
@@ -13835,6 +14400,10 @@
msgid "Type"
msgstr "類型"
+#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+msgid "type"
+msgstr "類型"
+
#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "取值為該類型"
@@ -13979,7 +14548,7 @@
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
"section in \"git help worktree\" for details"
msgstr ""
-"不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴展。\n"
+"不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴充部分。\n"
"詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節"
#: builtin/config.c:743
@@ -14037,17 +14606,13 @@
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
"無法用一個值覆蓋多個值\n"
-" 使用一個正規表示式、--add 或 --replace-all 來修改 %s。"
+" 使用一個常規表示式、--add 或 --replace-all 來修改 %s。"
#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr "無此小節：%s"
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "以使用者可讀的格式顯示大小"
@@ -14073,7 +14638,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache 無法使用；缺少 unix socket 支援"
@@ -14214,7 +14779,7 @@
msgid "do not consider tags matching <pattern>"
msgstr "不考慮符合 <模式> 的標籤"
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:595
msgid "show abbreviated commit object as fallback"
msgstr "顯示簡寫的提交號作為後備"
@@ -14230,25 +14795,14 @@
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "對於損壞的工作區，追加 <標記>（預設值：”-broken\"）"
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long 與 --abbrev=0 不相容"
-
#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "沒有發現名稱，無法描述任何東西。"
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty 與提交號不相容"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken 與提交號不相容"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin 和 --merge-base 互斥"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "「%s」選項和提交號不得同時使用"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
@@ -14269,26 +14823,26 @@
msgid "%s...%s: no merge base"
msgstr "%s...%s: 無合併基底"
-#: builtin/diff.c:486
+#: builtin/diff.c:491
msgid "Not a git repository"
msgstr "不是一個 git 版本庫"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:537 builtin/grep.c:700
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了無效物件 '%s'。"
-#: builtin/diff.c:543
+#: builtin/diff.c:548
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超過兩個資料物件：'%s'"
-#: builtin/diff.c:548
+#: builtin/diff.c:553
#, c-format
msgid "unhandled object '%s' given."
msgstr "無法處理的物件 '%s'。"
-#: builtin/diff.c:582
+#: builtin/diff.c:587
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s：多個合併基底，使用 %s"
@@ -14297,111 +14851,103 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<選項>] [<提交> [<提交>]] [--] [<路徑>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "失敗：%d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
#, c-format
msgid "could not read symlink %s"
msgstr "無法讀取符號連結 %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
#, c-format
msgid "could not read symlink file %s"
msgstr "無法讀取符號連結檔案 %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "無法讀取符號連結 %2$s 指向的物件 %1$s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
-"不支援在目錄比較模式（'-d' 和 '--dir-diff'）中採用組合差異格式（'-c' 和 '--"
-"cc'）。"
+"不支援在目錄比較模式（'-d' 和 '--dir-diff'）中\n"
+"採用組合差異格式（'-c' 和 '--cc'）。"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "兩個檔案都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "工作區檔案被留了下來。"
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "暫存檔存在於 '%s'。"
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者復原它們。"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "失敗：%d"
+
+#: builtin/difftool.c:690
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:692
msgid "perform a full-directory diff"
msgstr "執行一個全目錄差異比較"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:694
msgid "do not prompt before launching a diff tool"
msgstr "啟動差異比較工具之前不提示"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符號連結"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:700
msgid "tool"
msgstr "工具"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "使用指定的差異比較工具"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "顯示可以用在 `--tool` 參數後的差異工具列表"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:706
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr "當執行 diff 工具返回非零離開碼時，使 'git-difftool' 離開"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "指定一個用於檢視差異的自訂指令"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:710
msgid "passed to `diff`"
msgstr "傳遞給 `diff`"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:726
msgid "difftool requires worktree or --no-index"
msgstr "difftool 要求工作區或者 --no-index"
-#: builtin/difftool.c:741
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff 和 --no-index 不相容"
-
-#: builtin/difftool.c:744
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui、--tool 和 --extcmd 互斥"
-
-#: builtin/difftool.c:752
+#: builtin/difftool.c:745
msgid "no <tool> given for --tool=<tool>"
msgstr "沒有為 --tool=<工具> 參數提供 <工具>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:752
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>"
@@ -14409,10 +14955,6 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
-msgid "type"
-msgstr "類型"
-
#: builtin/env--helper.c:46
msgid "default for git_env_*(...) to fall back on"
msgstr "git_env_*(...) 的預設值"
@@ -14434,383 +14976,378 @@
msgstr "選項「--default」預期收到「--type=ulong」的無號 long 數值，而非「%s」"
#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [rev-list-opts]"
+msgid "git fast-export [<rev-list-opts>]"
+msgstr "git fast-export [<rev-list-opts>]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。"
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
msgid "--anonymize-map token cannot be empty"
msgstr "--anonymize-map 的鍵不能空白"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
msgid "show progress after <n> objects"
msgstr "在 <n> 個物件之後顯示進度"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
msgid "select handling of signed tags"
msgstr "選擇如何處理簽名標籤"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
msgid "select handling of tags that tag filtered objects"
msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
msgid "select handling of commit messages in an alternate encoding"
msgstr "選擇使用備用編碼處理提交說明"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
msgid "dump marks to this file"
msgstr "把標記傾印到這個檔案"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
msgid "import marks from this file"
msgstr "從這個檔案匯入標記"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
msgid "import marks from this file if it exists"
msgstr "如果這個檔案存在，則從檔案匯入標記"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
msgid "fake a tagger when tags lack one"
msgstr "當標籤缺少標記者欄位時假裝有一個"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
msgid "output full tree for each commit"
msgstr "每次提交都輸出整棵樹"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
msgid "use the done feature to terminate the stream"
msgstr "使用 done 功能終止串流"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
msgid "skip output of blob data"
msgstr "略過資料物件資料的輸出"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1860
msgid "refspec"
-msgstr "參照規格"
+msgstr "引用規格"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
msgid "apply refspec to exported refs"
msgstr "對匯出的引用套用引用規格"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
msgid "anonymize output"
msgstr "匿名輸出"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
msgid "from:to"
msgstr "from:to"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
msgid "convert <from> to <to> in anonymized output"
msgstr "在匿名輸出中將 <from> 轉換為 <to>"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
msgid "reference parents which are not in fast-export stream by object id"
-msgstr "依物件 ID 參考不在 fast-export 串流中的引用父物件"
+msgstr "依物件 ID 引用不在 fast-export 串流中的父物件"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
msgid "show original object ids of blobs/commits"
msgstr "顯示資料物件及提交的原始物件 ID"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
msgid "label tags with mark ids"
msgstr "為包含標記 ID 的標籤打上標記"
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "缺少 --anonymize 的 --anonymize-map 沒有意義"
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3097
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "「%s」子模組缺少 from 標記"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3099
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "「%s」子模組缺少 to 標記"
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3234
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "預期 'mark' 指令，得到 %s"
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3239
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "預期 'to' 指令，得到 %s"
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3331
msgid "Expected format name:filename for submodule rewrite option"
msgstr "期望子模組 rewrite 選項的格式是 name:filename"
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3386
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能"
-#: builtin/fetch-pack.c:242
+#: builtin/fetch-pack.c:246
#, c-format
msgid "Lockfile created but not reported: %s"
msgstr "已建立鎖定檔案，但尚未回報：%s"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<選項>] [<版本庫> [<引用規格>...]]"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<選項>] <組>"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<選項>] [(<版本庫> | <組>)...]"
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<選項>]"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:124
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel 不能為負數"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:147 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "從所有的遠端抓取"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:149 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "為 git pull/fetch 設定上游"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:151 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:153
msgid "use atomic transaction to update references"
-msgstr "使用原子事務更新參考"
+msgstr "使用 atomic 事務更新引用"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:155 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "上傳包到遠端的路徑"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
msgid "force overwrite of local reference"
msgstr "強制覆蓋本機引用"
-#: builtin/fetch.c:156
+#: builtin/fetch.c:158
msgid "fetch from multiple remotes"
msgstr "從多個遠端抓取"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:160 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "抓取所有的標籤和關聯物件"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何標籤(--no-tags)"
-#: builtin/fetch.c:162
+#: builtin/fetch.c:164
msgid "number of submodules fetched in parallel"
msgstr "並行取得的子模組數量"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:166
msgid "modify the refspec to place all refs within refs/prefetch/"
-msgstr "修改參考規格 (refspec) 以便將所有參考 (refs) 放置在 refs/prefetch/ 中"
+msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:168 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除遠端已經不存在的分支的追蹤分支"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:170
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "清除遠端不存在的本機標籤，並且取代變更標籤"
# 譯者：可選值，不能翻譯
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:172
msgid "control recursive fetching of submodules"
msgstr "控制子模組的遞迴抓取"
-#: builtin/fetch.c:175
+#: builtin/fetch.c:177
msgid "write fetched references to the FETCH_HEAD file"
-msgstr "將取得的參考寫入 FETCH_HEAD 檔案"
+msgstr "將取得的引用寫入 FETCH_HEAD 檔案"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:178 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "保持下載包"
-#: builtin/fetch.c:178
+#: builtin/fetch.c:180
msgid "allow updating of HEAD ref"
msgstr "允許更新 HEAD 引用"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "取得淺複製的更多過去歷史記錄"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:185 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "基於時間來深化淺複製的歷史"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:191 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "轉換為一個完整的版本庫"
-#: builtin/fetch.c:192
+#: builtin/fetch.c:194
+msgid "re-fetch without negotiating common commits"
+msgstr "重新抓取而不協商共同提交"
+
+#: builtin/fetch.c:197
msgid "prepend this to submodule path output"
msgstr "在子模組路徑輸出的前面加上此目錄"
-#: builtin/fetch.c:195
+#: builtin/fetch.c:200
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:204 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:205 builtin/pull.c:230
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:206 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "指定取得動作的引用映射"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:213 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "報告我們只擁有從該物件開始可以取得的物件"
-#: builtin/fetch.c:210
+#: builtin/fetch.c:215
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
-msgstr "不取得包檔案，而是輸出交涉的祖先提交"
+msgstr "不取得包檔案，而是輸出協商的祖先提交"
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:218 builtin/fetch.c:220
msgid "run 'maintenance --auto' after fetching"
msgstr "取得 (fetch) 後執行 'maintenance --auto'"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:222 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "在所有更新分支上檢查強制更新"
-#: builtin/fetch.c:219
+#: builtin/fetch.c:224
msgid "write the commit-graph after fetching"
msgstr "抓取後寫入分支圖"
-#: builtin/fetch.c:221
+#: builtin/fetch.c:226
msgid "accept refspecs from stdin"
-msgstr "從標準輸入中接受引用表達式"
+msgstr "從標準輸入中接受引用規格"
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "無法發現遠端 HEAD 引用"
+#: builtin/fetch.c:618
+msgid "couldn't find remote ref HEAD"
+msgstr "找不到遠端 HEAD 引用"
-#: builtin/fetch.c:757
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr "設定變數 fetch.output 包含無效值 %s"
-
-#: builtin/fetch.c:856
+#: builtin/fetch.c:893
#, c-format
msgid "object %s not found"
msgstr "物件 %s 未發現"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:897
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
msgid "[rejected]"
msgstr "[已拒絕]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:911
msgid "can't fetch in current branch"
msgstr "目前分支下不能執行取得動作"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:912
+msgid "checked out in another worktree"
+msgstr "已在其他工作區簽出"
+
+#: builtin/fetch.c:922
msgid "[tag update]"
msgstr "[標籤更新]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
+#: builtin/fetch.c:994
msgid "unable to update local ref"
msgstr "不能更新本機引用"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:927
msgid "would clobber existing tag"
msgstr "會破壞現有的標籤"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:949
msgid "[new tag]"
msgstr "[新標籤]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:952
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:955
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:994
msgid "forced update"
msgstr "強制更新"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:999
msgid "non-fast-forward"
msgstr "非快轉"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1102
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'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
msgstr ""
-"取得動作通常顯示哪些分支發生了強制更新，但該檢查已被停用。\n"
-"要重新啟用，請使用 '--show-forced-updates' 選項或執行\n"
-"'git config fetch.showForcedUpdates true'。"
+"取得 (fetch) 動作通常會指示哪些分支發生了強制更新，但該檢查已被停用。\n"
+"要重新啟用，請使用「--show-forced-updates」選項，或執行\n"
+"「git config fetch.showForcedUpdates true」"
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1106
#, c-format
msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
msgstr ""
-"花了 %.2f 秒來檢查強制更新。您可以使用 '--no-show-forced-updates'\n"
-"或執行 'git config fetch.showForcedUpdates false' 以避免此項檢查。\n"
+"花了 %.2f 秒檢查強制更新。您可以使用「--no-show-forced-updates」\n"
+"或執行「git config fetch.showForcedUpdates false」避免此項檢查\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1136
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未傳送所有必需的物件\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1156
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "已拒絕 %s，不允許更新淺複製"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1259 builtin/fetch.c:1418
#, c-format
msgid "From %.*s\n"
msgstr "來自 %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1269
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14820,145 +15357,152 @@
" 'git remote prune %s' 來刪除舊的、有衝突的分支"
# 譯者：請維持前導空格
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1377
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 將成為懸空狀態）"
# 譯者：請維持前導空格
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1378
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成為懸空狀態）"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1421
msgid "[deleted]"
msgstr "[已刪除]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1422 builtin/remote.c:1153
msgid "(none)"
msgstr "（無）"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1446
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "拒絕取得到非純版本庫的目前分支 %s"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "拒絕取得在「%2$s」簽出的「%1$s」分支"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1466
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "選項 \"%s\" 的值 \"%s\" 對於 %s 是無效的"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "選項「%s」的值「%s」對 %s 無效"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1469
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "選項 \"%s\" 為 %s 所忽略\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "選項「%s」被 %s 忽略\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1496
+#, c-format
+msgid "the object %s does not exist"
+msgstr "%s 物件不存在"
+
+#: builtin/fetch.c:1748
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "檢測到多分支，和 --set-upstream 不相容"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1760
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"無法將 HEAD 的上游從「%2$s」設定為「%1$s」，因為 HEAD 沒有指向任何分支。"
+
+#: builtin/fetch.c:1773
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "沒有為一個遠端追蹤分支設定上游"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1775
msgid "not setting upstream for a remote tag"
msgstr "沒有為一個遠端標籤設定上游"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1777
msgid "unknown branch type"
msgstr "未知的分支類型"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1779
msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
msgstr ""
-"未發現源分支。\n"
-"您需要使用 --set-upstream 選項指定一個分支。"
+"找不到來源分支。\n"
+"您得使用 --set-upstream 選項明確指定一個分支"
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1904 builtin/fetch.c:1967
#, c-format
msgid "Fetching %s\n"
msgstr "正在取得 %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1914 builtin/fetch.c:1969
#, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
msgstr "不能取得 %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1926
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "無法取得 '%s'（離開碼：%d）\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:2030
msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
-msgstr "未指定遠端版本庫。請透過一個 URL 或遠端版本庫名指定，用以取得新提交。"
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
+msgstr ""
+"未指定遠端版本庫。請指定用以取得新修訂版本之\n"
+"來源 URL 或者遠端版本庫名稱"
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "您需要指定一個標籤名稱。"
+#: builtin/fetch.c:2066
+msgid "you need to specify a tag name"
+msgstr "您需要指定標籤名稱"
-#: builtin/fetch.c:1994
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
-msgstr "--negotiate-only 需要一或多個 --negotiate-tip=*"
+#: builtin/fetch.c:2156
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
+msgstr "--negotiate-only 需要一或多個 --negotiation-tip=*"
-#: builtin/fetch.c:1998
-msgid "Negative depth in --deepen is not supported"
+#: builtin/fetch.c:2160
+msgid "negative depth in --deepen is not supported"
msgstr "--deepen 不支援負數深度"
-#: builtin/fetch.c:2000
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen 和 --depth 是互斥的"
-
-#: builtin/fetch.c:2005
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth 和 --unshallow 不能同時使用"
-
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2169
msgid "--unshallow on a complete repository does not make sense"
msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2186
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能帶一個版本庫參數"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2188
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 帶引用規格沒有任何意義"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2197
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "沒有這樣的遠端或遠端組：%s"
+msgid "no such remote or remote group: %s"
+msgstr "無此遠端或遠端群組：%s"
-#: builtin/fetch.c:2042
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "取得組並指定引用規格沒有意義"
+#: builtin/fetch.c:2205
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "取得群組並指定引用規格無意義"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2221
msgid "must supply remote when using --negotiate-only"
msgstr "使用 --negotiate-only 時必須提供遠端"
-#: builtin/fetch.c:2063
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "協定不支援 --negotiate-only，結束。"
+#: builtin/fetch.c:2226
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "通訊協定不支援 --negotiate-only。結束"
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2246
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr "只可以將 --filter 用於在 extensions.partialclone 中設定的遠端版本庫"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2250
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic 只能在擷取 (fetch) 一個遠端時使用"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2254
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin 只能在取得一個遠端時使用"
@@ -14967,23 +15511,27 @@
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <說明>] [--log[=<n>] | --no-log] [--file <檔案>]"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交說明中最多複製指定條目（合併而來的提交）的簡短說明"
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
msgid "alias for --log (deprecated)"
msgstr "參數 --log 的別名（已棄用）"
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
msgid "text"
msgstr "文字"
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
msgid "use <text> as start of message"
msgstr "使用 <文字> 作為提交說明的開始"
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "使用 <名稱> 而非實際目的地分支"
+
+#: builtin/fmt-merge-msg.c:29
msgid "file to read from"
msgstr "從檔案中讀取"
@@ -15003,47 +15551,47 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for shells"
msgstr "引用占位符適用於 shells"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for perl"
msgstr "引用占位符適用於 perl"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
msgid "quote placeholders suitably for python"
msgstr "引用占位符適用於 python"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "quote placeholders suitably for Tcl"
msgstr "引用占位符適用於 Tcl"
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
msgid "show only <n> matched refs"
msgstr "只顯示 <n> 個符合的引用"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:42 builtin/tag.c:482
msgid "respect format colors"
msgstr "遵照格式中的顏色輸出"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs which points at the given object"
msgstr "只列印指向提供物件的引用"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs that are merged"
msgstr "只列印已經合併的引用"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs that are not merged"
msgstr "只列印沒有合併的引用"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
msgid "print only refs which contain the commit"
msgstr "只列印包含該提交的引用"
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
msgid "print only refs which don't contain the commit"
msgstr "只列印不包含該提交的引用"
@@ -15179,133 +15727,255 @@
msgid "notice: No default references"
msgstr "注意：無預設引用"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s：雜湊路徑 (hash-path) 不符，找到的位置：%s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s：物件損壞或遺失：%s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s：物件屬於「%s」未知類型：%s"
+
+#: builtin/fsck.c:645
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s：不能解析物件：%s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:665
#, c-format
msgid "bad sha1 file: %s"
msgstr "壞的 sha1 檔案：%s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:686
msgid "Checking object directory"
msgstr "正在檢查物件目錄"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:689
msgid "Checking object directories"
msgstr "正在檢查物件目錄"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:705
#, c-format
msgid "Checking %s link"
msgstr "正在檢查 %s 連結"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:710 builtin/index-pack.c:862
#, c-format
msgid "invalid %s"
msgstr "無效的 %s"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:717
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s 指向奇怪的東西（%s）"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:723
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s：分離開頭指標的指向不存在"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:727
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "注意：%s 指向一個尚未誕生的分支（%s）"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:739
msgid "Checking cache tree"
msgstr "正在檢查快取樹"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:744
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s：cache-tree 中無效的 sha1 指標"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:753
msgid "non-tree in cache-tree"
msgstr "cache-tree 中非樹狀物件"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:784
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<選項>] [<物件>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:790
msgid "show unreachable objects"
msgstr "顯示無法取得的物件"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:791
msgid "show dangling objects"
msgstr "顯示懸空的物件"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:792
msgid "report tags"
msgstr "報告標籤"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:793
msgid "report root nodes"
msgstr "報告根節點"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:794
msgid "make index objects head nodes"
msgstr "將索引亦作為檢查的頭節點"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
-msgstr "將引用日誌作為檢查的頭節點（預設）"
+msgstr "將引用日誌作為檢查的 HEAD 節點（預設）"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgstr "也考慮包和備用物件"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:797
msgid "check only connectivity"
msgstr "僅檢查連通性"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr "啟用更嚴格的檢查"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:800
msgid "write dangling objects in .git/lost-found"
msgstr "將懸空物件寫入 .git/lost-found 中"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
msgid "show progress"
msgstr "顯示進度"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:802
msgid "show verbose names for reachable objects"
msgstr "顯示可以取得物件的詳細名稱"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "正在檢查物件"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:890
#, c-format
msgid "%s: object missing"
msgstr "%s：物件缺少"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:901
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "無效的參數：期望 sha1，得到 '%s'"
+#: builtin/fsmonitor--daemon.c:13
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [<options>]"
+
+#: builtin/fsmonitor--daemon.c:14
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [<options>]"
+
+#: builtin/fsmonitor--daemon.c:15
+msgid "git fsmonitor--daemon stop"
+msgstr "git fsmonitor--daemon stop"
+
+#: builtin/fsmonitor--daemon.c:16
+msgid "git fsmonitor--daemon status"
+msgstr "git fsmonitor--daemon status"
+
+#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "「%s」的數值超出範圍：%d"
+
+#: builtin/fsmonitor--daemon.c:57
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "「%s」的數值不是布林值或整數：%d"
+
+#: builtin/fsmonitor--daemon.c:99
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr "fsmonitor-daemon 正在監控「%s」\n"
+
+#: builtin/fsmonitor--daemon.c:104
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr "fsmonitor-daemon 未在監控「%s」\n"
+
+#: builtin/fsmonitor--daemon.c:170
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "無法建立 fsmonitor cookie「%s」"
+
+#: builtin/fsmonitor--daemon.c:753
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr "fsmonitor：cookie_result '%d' != SEEN"
+
+#: builtin/fsmonitor--daemon.c:1187
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr "無法在「%s」啟動 IPC 執行緒集區"
+
+#: builtin/fsmonitor--daemon.c:1199
+msgid "could not start fsmonitor listener thread"
+msgstr "無法啟動 fsmonitor 監聽執行緒"
+
+#: builtin/fsmonitor--daemon.c:1297
+msgid "could not initialize listener thread"
+msgstr "無法初始化監聽執行緒"
+
+#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr "fsmonitor--daemon 已在執行「%s」"
+
+#: builtin/fsmonitor--daemon.c:1332
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr "正在「%s」執行 fsmonitor-daemon\n"
+
+#: builtin/fsmonitor--daemon.c:1387
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "正在「%s」啟動 fsmonitor-daemon\n"
+
+#: builtin/fsmonitor--daemon.c:1413
+msgid "daemon failed to start"
+msgstr "無法啟動守護程式"
+
+#: builtin/fsmonitor--daemon.c:1416
+msgid "daemon not online yet"
+msgstr "守護程式尚未上線"
+
+#: builtin/fsmonitor--daemon.c:1419
+msgid "daemon terminated"
+msgstr "守護程式已終止"
+
+#: builtin/fsmonitor--daemon.c:1429
+msgid "detach from console"
+msgstr "從主控台分離"
+
+#: builtin/fsmonitor--daemon.c:1432
+msgid "use <n> ipc worker threads"
+msgstr "使用 <n> 個 IPC 工作執行緒"
+
+#: builtin/fsmonitor--daemon.c:1435
+msgid "max seconds to wait for background daemon startup"
+msgstr "要等待背景守護程式啟動的最長秒數"
+
+#: builtin/fsmonitor--daemon.c:1449
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "無效的「ipc-threads」數值（%d）"
+
+#: builtin/fsmonitor--daemon.c:1464
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "未處理的子命令「%s」"
+
+#: builtin/fsmonitor--daemon.c:1477
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr "fsmonitor--daemon 不支援本平台"
+
#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<選項>]"
@@ -15320,106 +15990,101 @@
msgid "failed to parse '%s' value '%s'"
msgstr "無法解析 '%s' 值 '%s'"
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr "不能讀取 '%s'"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
-"最後一次 gc 動作報告如下訊息。請檢查原因並刪除 %s。\n"
-"在該檔案被刪除之前，自動清理將不會執行。\n"
+"最後一次 gc 動作回報如下資訊。請檢查原因並刪除 %s\n"
+"等到這個檔案刪除後，自動清理才會繼續執行。\n"
"\n"
"%s"
-#: builtin/gc.c:551
+#: builtin/gc.c:552
msgid "prune unreferenced objects"
msgstr "清除未引用的物件"
-#: builtin/gc.c:553
+#: builtin/gc.c:554
msgid "be more thorough (increased runtime)"
msgstr "更徹底（增加執行時間）"
-#: builtin/gc.c:554
+#: builtin/gc.c:555
msgid "enable auto-gc mode"
msgstr "啟用自動垃圾回收模式"
-#: builtin/gc.c:557
+#: builtin/gc.c:558
msgid "force running gc even if there may be another gc running"
msgstr "強制執行 gc 即使另外一個 gc 正在執行"
-#: builtin/gc.c:560
+#: builtin/gc.c:561
msgid "repack all other packs except the largest pack"
msgstr "除了最大的包之外，對所有其它包檔案重新打包"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "解析 gc.logexpiry 的值 %s 失敗"
-#: builtin/gc.c:587
+#: builtin/gc.c:588
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "解析清除期限值 %s 失敗"
-#: builtin/gc.c:607
+#: builtin/gc.c:608
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自動在後台執行版本庫打包以求最佳性能。\n"
-#: builtin/gc.c:609
+#: builtin/gc.c:610
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自動打包版本庫以求最佳性能。\n"
-#: builtin/gc.c:610
+#: builtin/gc.c:611
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手動維護參見 \"git help gc\"。\n"
-#: builtin/gc.c:650
+#: builtin/gc.c:652
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr "gc 已在「%s」機器 pid %<PRIuMAX> 執行（如果不是，使用 --force）"
-#: builtin/gc.c:705
+#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr "有太多無法取得的鬆散物件，執行 'git prune' 刪除它們。"
+msgstr "有太多無法取得的鬆散物件，執行「git prune」刪除它們。"
-#: builtin/gc.c:715
+#: builtin/gc.c:717
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<作業>] [--schedule]"
-#: builtin/gc.c:745
+#: builtin/gc.c:747
msgid "--no-schedule is not allowed"
msgstr "不允許 --no-schedule"
-#: builtin/gc.c:750
+#: builtin/gc.c:752
#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "無法識別的 --schedule 引數 '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:870
msgid "failed to write commit-graph"
msgstr "無法寫入提交圖形"
-#: builtin/gc.c:905
+#: builtin/gc.c:906
msgid "failed to prefetch remotes"
msgstr "無法預先取得遠端"
@@ -15431,145 +16096,185 @@
msgid "failed to finish 'git pack-objects' process"
msgstr "無法完成 ‘git pack-objects’ 處理程序"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
msgid "failed to write multi-pack-index"
msgstr "無法寫入多包索引"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
msgid "'git multi-pack-index expire' failed"
msgstr "'git multi-pack-index expire' 失敗"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
msgid "'git multi-pack-index repack' failed"
msgstr "'git multi-pack-index repack' 失敗"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr "略過增量重新打包工作，因為 core.multiPackIndex 已被停用"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "已存在 '%s' 鎖定檔案，略過維護"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
#, c-format
msgid "task '%s' failed"
msgstr "作業 '%s' 失敗"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' 非有效作業"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "不能多次選取 '%s' 作業"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
msgid "run tasks based on the state of the repository"
msgstr "基於版本庫狀態執行作業"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
msgid "frequency"
msgstr "frequency"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
msgid "run tasks based on frequency"
msgstr "依據頻率執行工作"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
msgid "do not report progress or other information over stderr"
msgstr "不要在 stderr 輸出進度或其他資訊"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
msgid "task"
msgstr "作業"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
msgid "run a specific task"
msgstr "執行指定作業"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "--auto 和 --schedule=<頻率> 請任選一"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
msgid "failed to run 'git config'"
msgstr "無法執行 ‘git config’"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
#, c-format
msgid "failed to expand path '%s'"
msgstr "無法展開「%s」路徑"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
msgid "failed to start launchctl"
msgstr "無法啟動 launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
#, c-format
msgid "failed to create directories for '%s'"
msgstr "無法建立「%s」的目錄"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
#, c-format
msgid "failed to bootstrap service %s"
msgstr "無法啟動載入 %s 服務"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
msgid "failed to create temp xml file"
msgstr "無法建立暫存 XML 檔案"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
msgid "failed to start schtasks"
msgstr "無法啟動 schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr "無法執行 “crontab -l”；您的系統可能不支援 “cron”"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
msgid "failed to open stdin of 'crontab'"
msgstr "無法開啟 ‘crontab’ 的標準輸入"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
msgid "'crontab' died"
msgstr "“crontab” 結束運作"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "無法啟動 systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "無法執行 systemctl"
+
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
+#: builtin/worktree.c:1024
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "刪除 '%s' 失敗"
+
+#: builtin/gc.c:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "無法識別的 --scheduler 引數 '%s'"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "不支援 systemd 計時器或 crontab"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "無法使用 %s 排程器"
+
+#: builtin/gc.c:2449
msgid "another process is scheduling background maintenance"
msgstr "其他處理程序正在排定背景維護工作"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<scheduler>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "scheduler"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "要觸發 git maintenance run 的排程器"
+
+#: builtin/gc.c:2495
msgid "failed to add repo to global config"
msgstr "無法將版本庫加至全域設定"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <子命令> [<選項>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
#, c-format
msgid "invalid subcommand: %s"
msgstr "無效子命令：%s"
-#: builtin/grep.c:30
+#: builtin/grep.c:32
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<選項>] [-e] <模式> [<版本>...] [[--] <路徑>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:241
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep：無法建立執行緒：%s"
-#: builtin/grep.c:277
+#: builtin/grep.c:295
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
@@ -15578,263 +16283,255 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3150
#, c-format
msgid "no threads support, ignoring %s"
msgstr "沒有執行緒支援，忽略 %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
#, c-format
msgid "unable to read tree (%s)"
msgstr "無法讀取樹（%s）"
-#: builtin/grep.c:658
+#: builtin/grep.c:674
#, c-format
msgid "unable to grep from object of type %s"
msgstr "無法抓取來自於 %s 類型的物件"
-#: builtin/grep.c:738
+#: builtin/grep.c:754
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "開關 `%c' 期望一個數字值"
-#: builtin/grep.c:837
+#: builtin/grep.c:852
msgid "search in index instead of in the work tree"
msgstr "在索引區搜尋而不是在工作區"
-#: builtin/grep.c:839
+#: builtin/grep.c:854
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的內容中尋找"
# 譯者：中文字串拼接，可刪除前導空格
-#: builtin/grep.c:841
+#: builtin/grep.c:856
msgid "search in both tracked and untracked files"
msgstr "在追蹤和未追蹤的檔案中搜尋"
-#: builtin/grep.c:843
+#: builtin/grep.c:858
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的檔案"
-#: builtin/grep.c:845
+#: builtin/grep.c:860
msgid "recursively search in each submodule"
msgstr "在每一個子模組中遞迴搜尋"
-#: builtin/grep.c:848
+#: builtin/grep.c:863
msgid "show non-matching lines"
msgstr "顯示未符合的行"
-#: builtin/grep.c:850
+#: builtin/grep.c:865
msgid "case insensitive matching"
msgstr "不區分大小寫符合"
-#: builtin/grep.c:852
+#: builtin/grep.c:867
msgid "match patterns only at word boundaries"
msgstr "只在單詞邊界符合模式"
-#: builtin/grep.c:854
+#: builtin/grep.c:869
msgid "process binary files as text"
msgstr "把二進位檔案當做文字處理"
-#: builtin/grep.c:856
+#: builtin/grep.c:871
msgid "don't match patterns in binary files"
msgstr "不在二進位檔案中符合模式"
-#: builtin/grep.c:859
+#: builtin/grep.c:874
msgid "process binary files with textconv filters"
msgstr "用 textconv 過濾器處理二進位檔案"
-#: builtin/grep.c:861
+#: builtin/grep.c:876
msgid "search in subdirectories (default)"
msgstr "在子目錄中尋找（預設）"
-#: builtin/grep.c:863
+#: builtin/grep.c:878
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下尋找"
-#: builtin/grep.c:867
+#: builtin/grep.c:882
msgid "use extended POSIX regular expressions"
-msgstr "使用擴展的 POSIX 正規表示式"
+msgstr "使用延伸的 POSIX 常規表示式"
-#: builtin/grep.c:870
+#: builtin/grep.c:885
msgid "use basic POSIX regular expressions (default)"
-msgstr "使用基本的 POSIX 正規表示式（預設）"
+msgstr "使用基本的 POSIX 常規表示式（預設）"
-#: builtin/grep.c:873
+#: builtin/grep.c:888
msgid "interpret patterns as fixed strings"
msgstr "把模式解析為固定的字串"
-#: builtin/grep.c:876
+#: builtin/grep.c:891
msgid "use Perl-compatible regular expressions"
-msgstr "使用 Perl 相容的正規表示式"
+msgstr "使用 Perl 相容的常規表示式"
-#: builtin/grep.c:879
+#: builtin/grep.c:894
msgid "show line numbers"
msgstr "顯示行號"
-#: builtin/grep.c:880
+#: builtin/grep.c:895
msgid "show column number of first match"
msgstr "顯示第一個符合的列號"
-#: builtin/grep.c:881
+#: builtin/grep.c:896
msgid "don't show filenames"
msgstr "不顯示檔案名"
-#: builtin/grep.c:882
+#: builtin/grep.c:897
msgid "show filenames"
msgstr "顯示檔案名"
-#: builtin/grep.c:884
+#: builtin/grep.c:899
msgid "show filenames relative to top directory"
msgstr "顯示相對於頂級目錄的檔案名"
-#: builtin/grep.c:886
+#: builtin/grep.c:901
msgid "show only filenames instead of matching lines"
msgstr "只顯示檔案名而不顯示符合的行"
-#: builtin/grep.c:888
+#: builtin/grep.c:903
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同義"
-#: builtin/grep.c:891
+#: builtin/grep.c:906
msgid "show only the names of files without match"
msgstr "只顯示未符合的檔案名"
-#: builtin/grep.c:893
+#: builtin/grep.c:908
msgid "print NUL after filenames"
msgstr "在檔案名後輸出 NUL 字元"
-#: builtin/grep.c:896
+#: builtin/grep.c:911
msgid "show only matching parts of a line"
msgstr "只顯示行中的符合的部分"
-#: builtin/grep.c:898
+#: builtin/grep.c:913
msgid "show the number of matches instead of matching lines"
msgstr "顯示總符合行數，而不顯示符合的行"
-#: builtin/grep.c:899
+#: builtin/grep.c:914
msgid "highlight matches"
msgstr "高亮顯示符合項"
-#: builtin/grep.c:901
+#: builtin/grep.c:916
msgid "print empty line between matches from different files"
msgstr "在不同檔案的符合項之間列印空行"
-#: builtin/grep.c:903
+#: builtin/grep.c:918
msgid "show filename only once above matches from same file"
msgstr "只在同一檔案的符合項的上面顯示一次檔案名"
-#: builtin/grep.c:906
+#: builtin/grep.c:921
msgid "show <n> context lines before and after matches"
msgstr "顯示符合項前後的 <n> 行上下文"
-#: builtin/grep.c:909
+#: builtin/grep.c:924
msgid "show <n> context lines before matches"
msgstr "顯示符合項前 <n> 行上下文"
-#: builtin/grep.c:911
+#: builtin/grep.c:926
msgid "show <n> context lines after matches"
msgstr "顯示符合項後 <n> 行上下文"
-#: builtin/grep.c:913
+#: builtin/grep.c:928
msgid "use <n> worker threads"
msgstr "使用 <n> 個工作執行緒"
-#: builtin/grep.c:914
+#: builtin/grep.c:929
msgid "shortcut for -C NUM"
msgstr "快捷鍵 -C 數字"
-#: builtin/grep.c:917
+#: builtin/grep.c:932
msgid "show a line with the function name before matches"
msgstr "在符合的前面顯示一行函數名"
-#: builtin/grep.c:919
+#: builtin/grep.c:934
msgid "show the surrounding function"
msgstr "顯示所在函數的前後內容"
-#: builtin/grep.c:922
+#: builtin/grep.c:937
msgid "read patterns from file"
msgstr "從檔案讀取模式"
-#: builtin/grep.c:924
+#: builtin/grep.c:939
msgid "match <pattern>"
msgstr "符合 <模式>"
-#: builtin/grep.c:926
+#: builtin/grep.c:941
msgid "combine patterns specified with -e"
msgstr "組合用 -e 參數設定的模式"
-#: builtin/grep.c:938
+#: builtin/grep.c:953
msgid "indicate hit with exit status without output"
msgstr "不輸出，而用離開碼標記命中狀態"
-#: builtin/grep.c:940
+#: builtin/grep.c:955
msgid "show only matches from files that match all patterns"
msgstr "只顯示符合所有模式的檔案中的符合"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "pager"
msgstr "分頁"
-#: builtin/grep.c:943
+#: builtin/grep.c:958
msgid "show matching files in the pager"
msgstr "分頁顯示符合的檔案"
-#: builtin/grep.c:947
+#: builtin/grep.c:962
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允許呼叫 grep(1)（本次組建忽略）"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1028
msgid "no pattern given"
msgstr "未提供符合模式"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1064
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同時使用"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1072
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本：%s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1102
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked 不支援與 --recurse-submodules 一起使用"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1106
msgid "invalid option combination, ignoring --threads"
msgstr "無效的選項組合，忽略 --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1109 builtin/pack-objects.c:4084
msgid "no threads support, ignoring --threads"
msgstr "沒有執行緒支援，忽略 --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的執行緒數無效（%d）"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1146
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 僅用於工作區"
-#: builtin/grep.c:1157
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached 或 --untracked 不能與 --no-index 同時使用"
-
-#: builtin/grep.c:1160
-msgid "--untracked cannot be used with --cached"
-msgstr "--untracked 不能與 --cached 一起使用"
-
-#: builtin/grep.c:1166
+#: builtin/grep.c:1179
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用於已追蹤內容"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1187
msgid "both --cached and trees are given"
msgstr "同時給出了 --cached 和樹狀物件"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -15842,95 +16539,99 @@
"git hash-object [-t <類型>] [-w] [--path=<檔案> | --no-filters] [--stdin] "
"[--] <檔案>..."
-#: builtin/hash-object.c:86
-msgid "git hash-object --stdin-paths"
-msgstr "git hash-object --stdin-paths"
-
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:97
msgid "object type"
msgstr "物件類型"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:98
msgid "write the object into the object database"
msgstr "將物件寫入物件資料庫"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
msgstr "從標準輸入讀取物件"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:102
msgid "store file as is without filters"
msgstr "原樣儲存檔案不使用過濾器"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:103
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "允許對任意隨機垃圾資料做散列來建立損壞的物件以便除錯 Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
msgstr "處理檔案並假設其來自於此路徑"
-#: builtin/help.c:47
+#: builtin/help.c:57
msgid "print all available commands"
msgstr "列印所有可用的指令"
-#: builtin/help.c:48
+#: builtin/help.c:60
+msgid "show external commands in --all"
+msgstr "在 --all 顯示外部命令"
+
+#: builtin/help.c:61
+msgid "show aliases in --all"
+msgstr "在 --all 顯示別名"
+
+#: builtin/help.c:62
msgid "exclude guides"
msgstr "排除嚮導"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "顯示有用的指南列表"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "列印所有設定變數名稱"
-
-#: builtin/help.c:52
+#: builtin/help.c:63
msgid "show man page"
msgstr "顯示 man 手冊"
-#: builtin/help.c:53
+#: builtin/help.c:64
msgid "show manual in web browser"
msgstr "在 web 瀏覽器中顯示手冊"
-#: builtin/help.c:55
+#: builtin/help.c:66
msgid "show info page"
msgstr "顯示 info 手冊"
-#: builtin/help.c:57
+#: builtin/help.c:68
msgid "print command description"
msgstr "列印指令描述"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
+#: builtin/help.c:70
+msgid "print list of useful guides"
+msgstr "顯示有用的指南列表"
-#: builtin/help.c:163
+#: builtin/help.c:72
+msgid "print all configuration variable names"
+msgstr "列印所有設定變數名稱"
+
+#: builtin/help.c:84
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+
+#: builtin/help.c:201
#, c-format
msgid "unrecognized help format '%s'"
msgstr "無法識別的協助格式 '%s'"
-#: builtin/help.c:190
+#: builtin/help.c:227
msgid "Failed to start emacsclient."
msgstr "無法啟動 emacsclient。"
-#: builtin/help.c:203
+#: builtin/help.c:240
msgid "Failed to parse emacsclient version."
msgstr "無法解析 emacsclient 版本。"
-#: builtin/help.c:211
+#: builtin/help.c:248
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老（< 22）。"
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
#, c-format
msgid "failed to exec '%s'"
msgstr "執行 '%s' 失敗"
-#: builtin/help.c:307
+#: builtin/help.c:344
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -15939,7 +16640,7 @@
"'%s'：不支援的 man 手冊檢視器的路徑。\n"
"請使用 'man.<工具>.cmd'。"
-#: builtin/help.c:319
+#: builtin/help.c:356
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -15948,230 +16649,239 @@
"'%s': 支援的 man 手冊檢視器指令。\n"
"請使用 'man.<工具>.path'。"
-#: builtin/help.c:436
+#: builtin/help.c:471
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s'：未知的 man 檢視器。"
-#: builtin/help.c:452
+#: builtin/help.c:487
msgid "no man viewer handled the request"
msgstr "沒有 man 檢視器處理此請求"
-#: builtin/help.c:459
+#: builtin/help.c:494
msgid "no info viewer handled the request"
msgstr "沒有 info 檢視器處理此請求"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:555 builtin/help.c:566 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' 是 '%s' 的別名"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:569 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "壞的 alias.%s 字串：%s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:611
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "「%s」選項不取非選項的引數"
+
+#: builtin/help.c:631
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr "「--no-[external-commands|aliases]」選項只能與「--all」一起使用"
+
+#: builtin/help.c:643 builtin/help.c:671
#, c-format
msgid "usage: %s%s"
msgstr "用法：%s%s"
-#: builtin/help.c:575
+#: builtin/help.c:666
msgid "'git help config' for more information"
msgstr "'git help config' 取得更多訊息"
-#: builtin/index-pack.c:222
+#: builtin/hook.c:10
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+
+#: builtin/hook.c:30
+msgid "silently ignore missing requested <hook-name>"
+msgstr "靜默忽略不存在而請求的 <hook-name>"
+
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "%s 的物件類型不符合"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "未能取得預期的物件 %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "物件 %s：應為類型 %s，卻是 %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "無法填充 %d 位元組"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "過早的檔案結束符（EOF）"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "輸入上的讀錯誤"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "用掉了超過可用的位元組"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:754
msgid "pack too large for current definition of off_t"
msgstr "包太大超過了目前 off_t 的定義"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "包超過了最大允許值"
-
-#: builtin/index-pack.c:343
+#: builtin/index-pack.c:329
#, c-format
-msgid "unable to create '%s'"
-msgstr "不能建立 '%s'"
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "包超過了最大允許大小 (%s)"
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "無法開啟 packfile '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "包簽名不符合"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支援包版本 %<PRIu32>"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:380
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有錯誤的物件位於位移量 %<PRIuMAX>：%s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:485
#, c-format
msgid "inflate returned %d"
msgstr "解壓縮返回 %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:534
msgid "offset value overflow for delta base object"
msgstr "位移值覆蓋了 delta 基準物件"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:542
msgid "delta base offset is out of bound"
msgstr "delta 基準位移越界"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:550
#, c-format
msgid "unknown object type %d"
msgstr "未知物件類型 %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:581
msgid "cannot pread pack file"
msgstr "無法讀取包檔案"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:583
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "包檔案過早結束，缺少 %<PRIuMAX> 位元組"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:609
msgid "serious inflate inconsistency"
msgstr "解壓縮嚴重的不一致"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
+#: builtin/index-pack.c:823 builtin/index-pack.c:832
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "發現 %s 出現 SHA1 衝突！"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
-#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
+#: builtin/index-pack.c:757 builtin/pack-objects.c:290
+#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
#, c-format
msgid "unable to read %s"
msgstr "不能讀 %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:821
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能讀取現存物件訊息 %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:829
#, c-format
msgid "cannot read existing object %s"
msgstr "不能讀取現存物件 %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:843
#, c-format
msgid "invalid blob object %s"
msgstr "無效的資料物件 %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:846 builtin/index-pack.c:865
msgid "fsck error in packed object"
msgstr "對打包物件 fsck 檢查發生錯誤"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:867
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子物件並非都可以取得"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:928 builtin/index-pack.c:975
msgid "failed to apply delta"
msgstr "套用 delta 失敗"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "接收物件中"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "索引物件中"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包衝突（SHA1 不符合）"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "不能對 packfile 呼叫 fstat"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "包的結尾有垃圾資料"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的問題"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "處理 delta 中"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
#, c-format
msgid "unable to create thread: %s"
msgstr "不能建立執行緒：%s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "完成 %d 個本機物件"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 個未解決的 delta"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能壓縮附加物件（%d）"
@@ -16181,55 +16891,52 @@
msgid "local object %s is corrupt"
msgstr "本機物件 %s 已損壞"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1445
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "packfile 名稱「%s」的結尾不是「.%s」"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "無法寫入 %s 檔案 '%s'"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "無法關閉已寫入的 %s 檔案 '%s'"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1494
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "無法將「*.%s」暫存檔的檔名更改為「%s」"
+
+#: builtin/index-pack.c:1519
msgid "error while closing pack file"
msgstr "關閉包檔案時發生錯誤"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "無法儲存包檔案"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "無法儲存索引檔案"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "壞的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1648
#, c-format
msgid "Cannot open existing pack file '%s'"
-msgstr "無法開啟現存包檔案 '%s'"
+msgstr "無法開啟現有包檔案 '%s'"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "無法為 %s 開啟包索引檔案"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1698
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta：%d 個物件"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1705
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -16240,33 +16947,25 @@
msgstr "無法返回目前工作目錄"
#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
#, c-format
msgid "bad %s"
msgstr "錯誤選項 %s"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "未知的「%s」雜湊算法"
-#: builtin/index-pack.c:1850
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin 不能和 --stdin 同時使用"
-
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1856
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一個 git 版本庫"
-#: builtin/index-pack.c:1854
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format 不能和 --stdin 同時使用"
-
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1873
msgid "--verify with no packfile name given"
msgstr "--verify 沒有提供 packfile 名稱參數"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "在打包物件中 fsck 檢查發生錯誤"
@@ -16387,10 +17086,6 @@
msgid "specify the hash algorithm to use"
msgstr "指定要使用的雜湊算法"
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir 和 --bare 互斥"
-
#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
@@ -16477,128 +17172,132 @@
msgid "no input file given for in-place editing"
msgstr "沒有給出要原位編輯的檔案"
-#: builtin/log.c:59
+#: builtin/log.c:60
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]"
-#: builtin/log.c:60
+#: builtin/log.c:61
msgid "git show [<options>] <object>..."
msgstr "git show [<選項>] <物件>..."
-#: builtin/log.c:113
+#: builtin/log.c:114
#, c-format
msgid "invalid --decorate option: %s"
msgstr "無效的 --decorate 選項：%s"
-#: builtin/log.c:180
-msgid "show source"
-msgstr "顯示源"
-
#: builtin/log.c:181
+msgid "show source"
+msgstr "顯示來源"
+
+#: builtin/log.c:182
msgid "use mail map file"
msgstr "使用信件映射檔案"
-#: builtin/log.c:184
+#: builtin/log.c:185
msgid "only decorate refs that match <pattern>"
msgstr "只修飾與 <模式> 符合的引用"
-#: builtin/log.c:186
+#: builtin/log.c:187
msgid "do not decorate refs that match <pattern>"
msgstr "不修飾和 <模式> 符合的引用"
-#: builtin/log.c:187
+#: builtin/log.c:188
msgid "decorate options"
msgstr "修飾選項"
-#: builtin/log.c:190
+#: builtin/log.c:191
msgid ""
"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱> 的變化史"
-#: builtin/log.c:213
+#: builtin/log.c:214
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用"
-#: builtin/log.c:306
+#: builtin/log.c:322
#, c-format
msgid "Final output: %d %s\n"
msgstr "最終輸出：%d %s\n"
-#: builtin/log.c:571
+#: builtin/log.c:429
+msgid "unable to create temporary object directory"
+msgstr "無法建立暫存物件目錄"
+
+#: builtin/log.c:599
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 損壞的檔案"
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:614 builtin/log.c:706
#, c-format
msgid "could not read object %s"
msgstr "不能讀取物件 %s"
-#: builtin/log.c:701
+#: builtin/log.c:731
#, c-format
msgid "unknown type: %d"
msgstr "未知類型：%d"
-#: builtin/log.c:846
+#: builtin/log.c:880
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s：從描述產生附函的模式無效"
-#: builtin/log.c:853
+#: builtin/log.c:887
msgid "format.headers without value"
msgstr "format.headers 沒有值"
-#: builtin/log.c:982
+#: builtin/log.c:1016
#, c-format
msgid "cannot open patch file %s"
msgstr "無法開啟修補檔案 %s"
-#: builtin/log.c:999
+#: builtin/log.c:1033
msgid "need exactly one range"
msgstr "只需要一個範圍"
-#: builtin/log.c:1009
+#: builtin/log.c:1043
msgid "not a range"
msgstr "不是一個範圍"
-#: builtin/log.c:1173
+#: builtin/log.c:1207
msgid "cover letter needs email format"
msgstr "附函需要信件位址格式"
-#: builtin/log.c:1179
+#: builtin/log.c:1213
msgid "failed to create cover-letter file"
msgstr "無法建立附函檔案"
-#: builtin/log.c:1266
+#: builtin/log.c:1300
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1293
+#: builtin/log.c:1327
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<選項>] [<從> | <版本範圍>]"
-#: builtin/log.c:1351
+#: builtin/log.c:1385
msgid "two output directories?"
msgstr "兩個輸出目錄？"
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
#, c-format
msgid "unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1547 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:1522
+#: builtin/log.c:1556
msgid "could not find exact merge base"
msgstr "不能找到準確的合併基礎"
-#: builtin/log.c:1532
+#: builtin/log.c:1566
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"
@@ -16608,416 +17307,408 @@
"git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n"
"參數 --base=<基礎提交> 手動指定一個基礎提交"
-#: builtin/log.c:1555
+#: builtin/log.c:1589
msgid "failed to find exact merge base"
msgstr "無法找到準確的合併基礎"
-#: builtin/log.c:1572
+#: builtin/log.c:1606
msgid "base commit should be the ancestor of revision list"
msgstr "基礎提交應該是版本列表的祖先"
-#: builtin/log.c:1582
+#: builtin/log.c:1616
msgid "base commit shouldn't be in revision list"
msgstr "基礎提交不應該出現在版本列表中"
-#: builtin/log.c:1640
+#: builtin/log.c:1674
msgid "cannot get patch id"
msgstr "無法得到修補檔 id"
-#: builtin/log.c:1703
+#: builtin/log.c:1737
msgid "failed to infer range-diff origin of current series"
msgstr "無法推斷目前系列的 range-diff 起點"
-#: builtin/log.c:1705
+#: builtin/log.c:1739
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "將 '%s' 當作目前系列的 range-diff 起點"
-#: builtin/log.c:1749
+#: builtin/log.c:1783
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一個修補檔"
-#: builtin/log.c:1752
+#: builtin/log.c:1786
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多個修補檔"
-#: builtin/log.c:1756
+#: builtin/log.c:1790
msgid "print patches to standard out"
msgstr "列印修補檔到標準輸出"
-#: builtin/log.c:1758
+#: builtin/log.c:1792
msgid "generate a cover letter"
msgstr "生成一封附函"
-#: builtin/log.c:1760
+#: builtin/log.c:1794
msgid "use simple number sequence for output file names"
msgstr "使用簡單的數字序列作為輸出檔案名"
-#: builtin/log.c:1761
+#: builtin/log.c:1795
msgid "sfx"
msgstr "後綴"
-#: builtin/log.c:1762
+#: builtin/log.c:1796
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <後綴> 代替 '.patch'"
-#: builtin/log.c:1764
+#: builtin/log.c:1798
msgid "start numbering patches at <n> instead of 1"
msgstr "修補檔以 <n> 開始編號，而不是1"
-#: builtin/log.c:1765
+#: builtin/log.c:1799
msgid "reroll-count"
msgstr "reroll-count"
-#: builtin/log.c:1766
+#: builtin/log.c:1800
msgid "mark the series as Nth re-roll"
msgstr "標記修補檔系列是第幾次重製"
-#: builtin/log.c:1768
+#: builtin/log.c:1802
msgid "max length of output filename"
msgstr "輸出檔名的最大長度"
-#: builtin/log.c:1770
+#: builtin/log.c:1804
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1773
+#: builtin/log.c:1807
msgid "cover-from-description-mode"
msgstr "從描述產生附函的模式"
-#: builtin/log.c:1774
+#: builtin/log.c:1808
msgid "generate parts of a cover letter based on a branch's description"
msgstr "基於分支描述產生部分附函"
-#: builtin/log.c:1776
+#: builtin/log.c:1810
msgid "use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前綴>] 代替 [PATCH]"
-#: builtin/log.c:1779
+#: builtin/log.c:1813
msgid "store resulting files in <dir>"
msgstr "把結果檔案儲存在 <目錄>"
-#: builtin/log.c:1782
+#: builtin/log.c:1816
msgid "don't strip/add [PATCH]"
msgstr "不刪除/新增 [PATCH]"
-#: builtin/log.c:1785
+#: builtin/log.c:1819
msgid "don't output binary diffs"
msgstr "不輸出二進位差異"
-#: builtin/log.c:1787
+#: builtin/log.c:1821
msgid "output all-zero hash in From header"
msgstr "在 From 標頭訊息中輸出全為零的雜湊值"
-#: builtin/log.c:1789
+#: builtin/log.c:1823
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的修補檔"
-#: builtin/log.c:1791
+#: builtin/log.c:1825
msgid "show patch format instead of default (patch + stat)"
msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）"
-#: builtin/log.c:1793
+#: builtin/log.c:1827
msgid "Messaging"
msgstr "信件傳送"
-#: builtin/log.c:1794
+#: builtin/log.c:1828
msgid "header"
msgstr "header"
-#: builtin/log.c:1795
+#: builtin/log.c:1829
msgid "add email header"
msgstr "新增信件頭"
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1830 builtin/log.c:1831
msgid "email"
msgstr "信件位址"
-#: builtin/log.c:1796
+#: builtin/log.c:1830
msgid "add To: header"
msgstr "新增收件人"
-#: builtin/log.c:1797
+#: builtin/log.c:1831
msgid "add Cc: header"
msgstr "新增抄送"
-#: builtin/log.c:1798
+#: builtin/log.c:1832
msgid "ident"
msgstr "標記"
-#: builtin/log.c:1799
+#: builtin/log.c:1833
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "將 From 位址設定為 <標記>（如若不提供，則用提交者 ID 做為位址）"
-#: builtin/log.c:1801
+#: builtin/log.c:1835
msgid "message-id"
msgstr "信件標記"
-#: builtin/log.c:1802
+#: builtin/log.c:1836
msgid "make first mail a reply to <message-id>"
msgstr "使第一封信件作為對 <信件標記> 的回覆"
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1837 builtin/log.c:1840
msgid "boundary"
msgstr "邊界"
-#: builtin/log.c:1804
+#: builtin/log.c:1838
msgid "attach the patch"
msgstr "附件方式新增修補檔"
-#: builtin/log.c:1807
+#: builtin/log.c:1841
msgid "inline the patch"
msgstr "內聯顯示修補檔"
-#: builtin/log.c:1811
+#: builtin/log.c:1845
msgid "enable message threading, styles: shallow, deep"
msgstr "啟用信件線索，風格：淺，深"
-#: builtin/log.c:1813
+#: builtin/log.c:1847
msgid "signature"
msgstr "簽名"
-#: builtin/log.c:1814
+#: builtin/log.c:1848
msgid "add a signature"
msgstr "新增一個簽名"
-#: builtin/log.c:1815
+#: builtin/log.c:1849
msgid "base-commit"
msgstr "基礎提交"
-#: builtin/log.c:1816
+#: builtin/log.c:1850
msgid "add prerequisite tree info to the patch series"
msgstr "為修補檔列表新增前置樹訊息"
-#: builtin/log.c:1819
+#: builtin/log.c:1853
msgid "add a signature from a file"
msgstr "從檔案新增一個簽名"
-#: builtin/log.c:1820
+#: builtin/log.c:1854
msgid "don't print the patch filenames"
msgstr "不要列印修補檔檔案名"
-#: builtin/log.c:1822
+#: builtin/log.c:1856
msgid "show progress while generating patches"
msgstr "在生成修補檔時顯示進度"
-#: builtin/log.c:1824
+#: builtin/log.c:1858
msgid "show changes against <rev> in cover letter or single patch"
msgstr "在附函或單個修補檔中顯示和 <rev> 的差異"
-#: builtin/log.c:1827
+#: builtin/log.c:1861
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異"
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1863 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "建立權重的百分比"
-#: builtin/log.c:1916
+#: builtin/log.c:1953
#, c-format
msgid "invalid ident line: %s"
msgstr "包含無效的身份標記：%s"
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n 和 -k 互斥"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc 和 -k 互斥"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1978
msgid "--name-only does not make sense"
msgstr "--name-only 無意義"
-#: builtin/log.c:1943
+#: builtin/log.c:1980
msgid "--name-status does not make sense"
msgstr "--name-status 無意義"
-#: builtin/log.c:1945
+#: builtin/log.c:1982
msgid "--check does not make sense"
msgstr "--check 無意義"
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout、--output 和 --output-directory 互斥"
+#: builtin/log.c:1984
+msgid "--remerge-diff does not make sense"
+msgstr "--remerge-diff 無意義"
-#: builtin/log.c:2089
+#: builtin/log.c:2129
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff 需要 --cover-letter 或單一修補檔"
-#: builtin/log.c:2093
+#: builtin/log.c:2133
msgid "Interdiff:"
msgstr "版本間差異："
-#: builtin/log.c:2094
+#: builtin/log.c:2134
#, c-format
msgid "Interdiff against v%d:"
msgstr "對 v%d 的版本差異："
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor 需要 --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2144
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff 需要 --cover-letter 或單一修補檔"
-#: builtin/log.c:2112
+#: builtin/log.c:2152
msgid "Range-diff:"
msgstr "範圍差異："
-#: builtin/log.c:2113
+#: builtin/log.c:2153
#, c-format
msgid "Range-diff against v%d:"
msgstr "對 v%d 的範圍差異："
-#: builtin/log.c:2124
+#: builtin/log.c:2164
#, c-format
msgid "unable to read signature file '%s'"
msgstr "無法讀取簽名檔案 '%s'"
-#: builtin/log.c:2160
+#: builtin/log.c:2200
msgid "Generating patches"
msgstr "生成修補檔"
-#: builtin/log.c:2204
+#: builtin/log.c:2244
msgid "failed to create output files"
msgstr "無法建立輸出檔案"
-#: builtin/log.c:2263
+#: builtin/log.c:2304
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]"
-#: builtin/log.c:2317
+#: builtin/log.c:2358
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<選項>] [<檔案>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "用 NUL 字元分隔路徑"
+
+#: builtin/ls-files.c:620
msgid "identify the file status with tags"
msgstr "用標籤標記檔案的狀態"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小寫字母表示 '假設未改變的' 檔案"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "使用小寫字母表示 'fsmonitor clean' 檔案"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
msgid "show cached files in the output (default)"
msgstr "顯示快取的檔案（預設）"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
msgid "show deleted files in the output"
msgstr "顯示已刪除的檔案"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
msgid "show modified files in the output"
msgstr "顯示已修改的檔案"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
msgid "show other files in the output"
msgstr "顯示其它檔案"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
msgid "show ignored files in the output"
msgstr "顯示忽略的檔案"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
msgid "show staged contents' object name in the output"
msgstr "顯示暫存區內容的物件名稱"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
msgid "show files on the filesystem that need to be removed"
msgstr "顯示檔案系統需要刪除的檔案"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
msgid "show 'other' directories' names only"
msgstr "只顯示「其他」目錄的名稱"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
msgid "show line endings of files"
msgstr "顯示檔案換行符號格式"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
msgid "don't show empty directories"
msgstr "不顯示空目錄"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
msgid "show unmerged files in the output"
msgstr "顯示未合併的檔案"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
msgid "show resolve-undo information"
msgstr "顯示 resolve-undo 訊息"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
msgid "skip files matching pattern"
msgstr "符合排除檔案的模式"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "從 <檔案> 中讀取排除模式"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "從 <檔案> 讀取排除模式 (pattern)"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
msgid "read additional per-directory exclude patterns in <file>"
msgstr "從 <檔案> 讀取額外的每個目錄的排除模式"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
msgid "add the standard git exclusions"
msgstr "新增標準的 git 排除"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
msgid "make the output relative to the project top directory"
msgstr "顯示相對於頂級目錄的檔案名"
-#: builtin/ls-files.c:666
-msgid "recurse through submodules"
-msgstr "在子模組中遞迴"
-
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <檔案> 都不在索引區，視為錯誤"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:670
msgid "tree-ish"
msgstr "樹或提交"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假裝自從 <樹或提交> 之後刪除的路徑仍然存在"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
msgid "show debugging data"
msgstr "顯示除錯資料"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:675
msgid "suppress duplicate entries"
msgstr "不顯示重複項目"
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "在稀疏索引存在時顯示稀疏目錄"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<版本庫> [<引用>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<版本庫> [<引用>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "不列印遠端 URL"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
msgid "exec"
msgstr "exec"
@@ -17049,42 +17740,70 @@
msgid "show underlying ref in addition to the object pointed by it"
msgstr "除了顯示指向的物件外，顯示指向的引用名"
-#: builtin/ls-tree.c:30
+#: builtin/ls-tree.c:36
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<選項>] <樹或提交> [<路徑>...]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:54
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "無法取得「%s」相關的物件資訊"
+
+#: builtin/ls-tree.c:79
+#, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "無效的 ls-tree 格式：「%s」元素的開頭不是「(」"
+
+#: builtin/ls-tree.c:83
+#, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "無效的 ls-tree 格式：「%s」元素的結尾不是「)」"
+
+#: builtin/ls-tree.c:109
+#, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr "無效的 ls-tree 格式：%%%.*s"
+
+#: builtin/ls-tree.c:336
msgid "only show trees"
msgstr "只顯示樹"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:338
msgid "recurse into subtrees"
msgstr "遞迴到子樹"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:340
msgid "show trees when recursing"
msgstr "當遞迴時顯示樹"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:343
msgid "terminate entries with NUL byte"
msgstr "條目以 NUL 字元終止"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:344
msgid "include object size"
msgstr "包括物件大小"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
msgid "list only filenames"
msgstr "只列出檔案名"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:350
+msgid "list only objects"
+msgstr "只列出物件"
+
+#: builtin/ls-tree.c:353
msgid "use full path names"
msgstr "使用檔案的全路徑"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:355
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "列出整個樹；不僅僅目前目錄（隱含 --full-name）"
+#: builtin/ls-tree.c:391
+msgid "--format can't be combined with other format-altering options"
+msgstr "--format 不能與其他修改格式的選項結合使用"
+
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
@@ -17104,11 +17823,11 @@
#: builtin/mailinfo.c:64
msgid "re-code metadata to i18n.commitEncoding"
-msgstr "重新將中繼資料編碼為 i18n.commitEncoding 的設定值"
+msgstr "重新將中介資料編碼為 i18n.commitEncoding 的設定值"
#: builtin/mailinfo.c:67
msgid "disable charset re-coding of metadata"
-msgstr "停用中繼資料的字元重新編碼功能"
+msgstr "停用中介資料的字元重新編碼功能"
#: builtin/mailinfo.c:69
msgid "encoding"
@@ -17116,7 +17835,7 @@
#: builtin/mailinfo.c:70
msgid "re-code metadata to this encoding"
-msgstr "重新將中繼資料編碼為這個編碼方式"
+msgstr "重新將中介資料編碼為這個編碼方式"
#: builtin/mailinfo.c:72
msgid "use scissors"
@@ -17134,7 +17853,11 @@
msgid "use headers in message's body"
msgstr "在訊息內文中使用標頭"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:227
+msgid "reading patches from stdin/tty..."
+msgstr "正在從標準輸入或 tty 讀取修補檔內容⋯⋯"
+
+#: builtin/mailsplit.c:242
#, c-format
msgid "empty mbox: '%s'"
msgstr "空的 mbox：'%s'"
@@ -17159,23 +17882,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <引用> [<提交>]"
-#: builtin/merge-base.c:143
+#: builtin/merge-base.c:144
msgid "output all common ancestors"
msgstr "輸出所有共同的祖先"
-#: builtin/merge-base.c:145
+#: builtin/merge-base.c:146
msgid "find ancestors for a single n-way merge"
msgstr "尋找一個多路合併的祖先提交"
-#: builtin/merge-base.c:147
+#: builtin/merge-base.c:148
msgid "list revs not reachable from others"
msgstr "顯示不能被其他存取到的版本"
-#: builtin/merge-base.c:149
+#: builtin/merge-base.c:150
msgid "is the first one ancestor of the other?"
msgstr "第一個是其他的祖先提交嗎？"
-#: builtin/merge-base.c:151
+#: builtin/merge-base.c:152
msgid "find where <commit> forked from reflog of <ref>"
msgstr "根據 <引用> 的引用日誌尋找 <提交> 的衍生處"
@@ -17196,26 +17919,30 @@
msgstr "使用基於 diff3 的合併"
#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "使用基於 zealous diff3 的合併"
+
+#: builtin/merge-file.c:39
msgid "for conflicts, use our version"
msgstr "如果衝突，使用我們的版本"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use their version"
msgstr "如果衝突，使用他們的版本"
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
msgid "for conflicts, use a union version"
msgstr "如果衝突，使用聯合版本"
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
msgid "for conflicts, use this marker size"
msgstr "如果衝突，使用指定長度的標記"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "do not warn about conflicts"
msgstr "不要警告衝突"
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
msgid "set labels for file1/orig-file/file2"
msgstr "為 檔案1/初始檔案/檔案2 設定標籤"
@@ -17249,183 +17976,187 @@
msgid "Merging %s with %s\n"
msgstr "合併 %s 和 %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<選項>] [<提交>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:125
msgid "switch `m' requires a value"
msgstr "開關 `m' 需要一個值"
-#: builtin/merge.c:146
+#: builtin/merge.c:148
#, c-format
msgid "option `%s' requires a value"
msgstr "選項 `%s' 需要一個值"
-#: builtin/merge.c:199
+#: builtin/merge.c:201
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合併策略 '%s'。\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:202
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有："
-#: builtin/merge.c:205
+#: builtin/merge.c:207
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自訂策略有："
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:258 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "在合併的最後不顯示差異統計"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "在合併的最後顯示差異統計"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "（和 --stat 同義）"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:264 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合併提交說明中新增（最多 <n> 條）精簡提交記錄"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "建立一個單獨的提交而不是做一次合併"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合併成功，執行一次提交（預設）"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
msgid "edit message before committing"
msgstr "在提交前編輯提交說明"
-#: builtin/merge.c:271
+#: builtin/merge.c:273
msgid "allow fast-forward (default)"
msgstr "允許快轉（預設）"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "如果不能快轉就放棄合併"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1145 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "要使用的合併策略"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "所選的合併策略的選項"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合併的提交說明（針對非快轉式合併）"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "使用 <名稱> 而非實際目的地"
+
+#: builtin/merge.c:294
msgid "abort the current in-progress merge"
msgstr "放棄目前正在進行的合併"
#
-#: builtin/merge.c:292
+#: builtin/merge.c:296
msgid "--abort but leave index and working tree alone"
msgstr "--abort，但是保留索引和工作區"
-#: builtin/merge.c:294
+#: builtin/merge.c:298
msgid "continue the current in-progress merge"
msgstr "繼續目前正在進行的合併"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "允許合並不相關的歷史"
-#: builtin/merge.c:303
+#: builtin/merge.c:307
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤"
-#: builtin/merge.c:320
+#: builtin/merge.c:323
msgid "could not run stash."
msgstr "不能執行儲藏。"
-#: builtin/merge.c:325
+#: builtin/merge.c:328
msgid "stash failed"
msgstr "儲藏失敗"
-#: builtin/merge.c:330
+#: builtin/merge.c:333
#, c-format
msgid "not a valid object: %s"
msgstr "不是一個有效物件：%s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
msgid "read-tree failed"
msgstr "讀取樹失敗"
# 譯者：請維持前導空格
-#: builtin/merge.c:400
+#: builtin/merge.c:403
msgid "Already up to date. (nothing to squash)"
msgstr "已經是最新的。（無需壓縮 (squash)）"
-#: builtin/merge.c:414
+#: builtin/merge.c:417
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "壓縮提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:467
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "無合併訊息 -- 未更新 HEAD\n"
-#: builtin/merge.c:515
+#: builtin/merge.c:517
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 沒有指向一個提交"
-#: builtin/merge.c:603
+#: builtin/merge.c:605
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "壞的 branch.%s.mergeoptions 字串：%s"
-#: builtin/merge.c:729
+#: builtin/merge.c:732
msgid "Not handling anything other than two heads merge."
msgstr "未處理兩個頭合併之外的任何動作。"
-#: builtin/merge.c:742
+#: builtin/merge.c:745
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive 的未知選項：-X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "未知的策略選項：-X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "不能寫 %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:816
#, c-format
msgid "Could not read from '%s'"
msgstr "不能從 '%s' 讀取"
-#: builtin/merge.c:822
+#: builtin/merge.c:825
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合並，使用 'git commit' 完成此次合併。\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:831
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"
@@ -17435,83 +18166,83 @@
"合併到主題分支。\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:836
msgid "An empty message aborts the commit.\n"
msgstr "空的提交說明會終止提交。\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:839
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交。\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:900
msgid "Empty commit message."
msgstr "空提交說明。"
-#: builtin/merge.c:904
+#: builtin/merge.c:915
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:976
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1015
msgid "No current branch."
msgstr "沒有目前分支。"
-#: builtin/merge.c:1006
+#: builtin/merge.c:1017
msgid "No remote for the current branch."
msgstr "目前分支沒有對應的遠端版本庫。"
-#: builtin/merge.c:1008
+#: builtin/merge.c:1019
msgid "No default upstream defined for the current branch."
msgstr "目前分支沒有定義預設的上游分支。"
-#: builtin/merge.c:1013
+#: builtin/merge.c:1024
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1081
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1183
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合併：%s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1217
msgid "not something we can merge"
msgstr "不能合併"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1330
msgid "--abort expects no arguments"
msgstr "--abort 不帶參數"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1334
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1352
msgid "--quit expects no arguments"
msgstr "--quit 不帶參數"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1365
msgid "--continue expects no arguments"
msgstr "--continue 不帶參數"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1369
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。"
-#: builtin/merge.c:1372
+#: builtin/merge.c:1385
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17519,7 +18250,7 @@
"您尚未結束您的合併（存在 MERGE_HEAD）。\n"
"請在合併前先提交您的修改。"
-#: builtin/merge.c:1379
+#: builtin/merge.c:1392
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17527,96 +18258,80 @@
"您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n"
"請在合併前先提交您的修改。"
-#: builtin/merge.c:1382
+#: builtin/merge.c:1395
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1396
-msgid "You cannot combine --squash with --no-ff."
-msgstr "您不能將 --squash 和 --no-ff 組合使用。"
-
-#: builtin/merge.c:1398
-msgid "You cannot combine --squash with --commit."
-msgstr "您不能將 --squash 和 --commit 組合使用。"
-
-#: builtin/merge.c:1414
+#: builtin/merge.c:1427
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交並且 merge.defaultToUpstream 未設定。"
-#: builtin/merge.c:1431
+#: builtin/merge.c:1444
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支援到空分支的壓縮提交"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1446
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快轉式提交沒有意義"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1451
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合併"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1453
msgid "Can merge only exactly one commit into empty head"
msgstr "只能將一個提交合並到空分支上"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1540
msgid "refusing to merge unrelated histories"
msgstr "拒絕合併無關的歷史"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1559
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1606
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "嘗試非常小的索引內合併...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1613
#, c-format
msgid "Nope.\n"
msgstr "無。\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "無法快轉，終止。"
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1671 builtin/merge.c:1737
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "將樹回滾至原始狀態...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1675
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "嘗試合併策略 %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1727
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "沒有合併策略處理此合併。\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1729
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合併失敗。\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1739
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "使用 %s 策略，準備自行解決。\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1753
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自動合併進展順利，按要求在提交前停止\n"
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr "git mktag"
-
#: builtin/mktag.c:27
#, c-format
msgid "warning: tag input does not pass fsck: %s"
@@ -17648,16 +18363,12 @@
#: builtin/mktag.c:100
msgid "tag on stdin did not refer to a valid object"
-msgstr "標準輸入上的標籤參考的不是有效物件"
+msgstr "標準輸入上的標籤指向的不是有效物件"
#: builtin/mktag.c:103 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "無法寫標籤檔案"
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
-
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "輸入以 NUL 字元終止"
@@ -17671,47 +18382,58 @@
msgstr "允許建立一個以上的樹"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<選項>] write [--preferred-pack=<包>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<選項>] write [--preferred-pack=<包>] [--refs-"
+"snapshot=<路徑>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<選項>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<選項>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<選項>] repack [--batch-size=<大小>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "包含成對 packfile 和包索引的物件目錄"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "偏好包"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "計算多包位圖時要重複使用的包"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "寫入多包位圖"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "寫入只包含指定索引的多包索引"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "用來選取位圖提交的引用快照"
+
+#: builtin/multi-pack-index.c:206
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "未識別的子指令：%s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<選項>] <源>... <目標>"
+msgstr "git mv [<選項>] <來源>... <目的地>"
#: builtin/mv.c:83
#, c-format
@@ -17735,117 +18457,121 @@
msgid "skip move/rename errors"
msgstr "略過移動/重新命名錯誤"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
-msgstr "目標 '%s' 不是一個目錄"
+msgstr "目的地「%s」不是目錄"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "檢查 '%s' 到 '%s' 的重新命名\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
-msgstr "壞的源"
+msgstr "來源損壞"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "不能將目錄移動到自身"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "不能將目錄移動到檔案"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
-msgstr "源目錄為空"
+msgstr "來源目錄空白"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "不在版本控制之下"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "衝突"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
-msgstr "目標已存在"
+msgstr "目的地已存在"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "覆蓋 '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "不能覆蓋"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
-msgstr "同一目標具有多個源"
+msgstr "同一目標具有多個來源"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
-msgstr "目標目錄不存在"
+msgstr "找不到目的地目錄"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
-msgstr "%s，源=%s，目標=%s"
+msgstr "%s，來源=%s，目的地=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "重新命名 %s 至 %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
#, c-format
msgid "renaming '%s' failed"
msgstr "重新命名 '%s' 失敗"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:524
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<選項>] <提交>..."
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:525
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<選項>] --all"
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<選項>] --stdin"
+#: builtin/name-rev.c:526
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [<options>] --annotate-stdin"
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:583
msgid "print only ref-based names (no object names)"
-msgstr "只輸出基於參考的名稱 (沒有物件名稱)"
+msgstr "只輸出基於引用的名稱 (沒有物件名稱)"
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:584
msgid "only use tags to name the commits"
msgstr "只使用標籤來命名提交"
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:586
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相符合的引用"
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:588
msgid "ignore refs matching <pattern>"
msgstr "忽略和 <模式> 相符合的引用"
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:590
msgid "list all commits reachable from all refs"
msgstr "列出可以從所有引用存取的提交"
-#: builtin/name-rev.c:532
-msgid "read from stdin"
-msgstr "從標準輸入讀取"
+#: builtin/name-rev.c:591
+msgid "deprecated: use annotate-stdin instead"
+msgstr "已取代：請改用 annotate-stdin"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:592
+msgid "annotate text from stdin"
+msgstr "註解從標準輸入收到的文字"
+
+#: builtin/name-rev.c:593
msgid "allow to print `undefined` names (default)"
msgstr "允許列印 `未定義` 的名稱（預設）"
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:599
msgid "dereference tags in the input (internal use)"
msgstr "反向解析輸入中的標籤（內部使用）"
@@ -17863,7 +18589,7 @@
#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <註解引用>] copy [-f] <源物件> <目標物件>"
+msgstr "git notes [--ref <註解引用>] copy [-f] <來源物件> <目標物件>"
#: builtin/notes.c:31
msgid ""
@@ -17886,14 +18612,6 @@
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr "git notes [--ref <註解引用>] merge [-v | -q] [-s <策略> ] <註解引用>"
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
-
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <註解引用>] remove [<物件>...]"
@@ -17916,11 +18634,11 @@
#: builtin/notes.c:54
msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr "git notes copy [<選項>] <源物件> <目標物件>"
+msgstr "git notes copy [<選項>] <來源物件> <目標物件>"
#: builtin/notes.c:55
msgid "git notes copy --stdin [<from-object> <to-object>]..."
-msgstr "git notes copy --stdin [<源物件> <目標物件>]..."
+msgstr "git notes copy --stdin [<來源物件> <目標物件>]..."
#: builtin/notes.c:60
msgid "git notes append [<options>] [<object>]"
@@ -17954,69 +18672,65 @@
msgid "git notes prune [<options>]"
msgstr "git notes prune [<選項>]"
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "為下面的物件寫/編輯說明："
-#: builtin/notes.c:150
+#: builtin/notes.c:149
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "不能為物件 '%s' 開始 'show'"
-#: builtin/notes.c:154
+#: builtin/notes.c:153
msgid "could not read 'show' output"
msgstr "不能讀取 'show' 的輸出"
-#: builtin/notes.c:162
+#: builtin/notes.c:161
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "無法為物件 '%s' 完成 'show'"
-#: builtin/notes.c:197
+#: builtin/notes.c:194
msgid "please supply the note contents using either -m or -F option"
msgstr "請透過 -m 或 -F 選項為註解提供內容"
-#: builtin/notes.c:206
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "不能寫註解物件"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "註解內容被留在 %s 中"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:582
#, c-format
msgid "could not open or read '%s'"
msgstr "不能開啟或讀取 '%s'"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "無法解析 '%s' 為一個有效引用。"
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "讀取物件 '%s' 失敗。"
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "不能從非資料物件 '%s' 中讀取註解資料。"
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "格式錯誤的輸入行：'%s'。"
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "從 '%s' 複製註解到 '%s' 時失敗"
@@ -18024,89 +18738,82 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
-msgid "too many arguments"
-msgstr "太多參數"
-
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "未發現物件 %s 的註解。"
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "註解內容作為一個字串"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "註解內容到一個檔案中"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "重用和編輯指定的註解物件"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "重用指定的註解物件"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "允許儲存空白備註"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "取代已存在的註解"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能新增註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "覆蓋物件 %s 現存註解\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
#, c-format
msgid "Removing note for object %s\n"
msgstr "刪除物件 %s 的註解\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "從標準輸入讀取物件"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "重新載入 <命令> 的設定（隱含 --stdin）"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "太少參數"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能複製註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
-msgstr "源物件 %s 缺少註解。不能複製。"
+msgstr "來源物件 %s 缺少註解。不能複製。"
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18115,97 +18822,97 @@
"子指令 'edit' 的選項 -m/-F/-c/-C 已棄用。\n"
"請換用 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "刪除引用 NOTES_MERGE_PARTIAL 失敗"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "刪除引用 NOTES_MERGE_REF 失敗"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "刪除 'git notes merge' 工作區失敗"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "讀取引用 NOTES_MERGE_PARTIAL 失敗"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "無法從 NOTES_MERGE_PARTIAL 中找到提交。"
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "無法從 NOTES_MERGE_PARTIAL 中解析提交。"
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "解析 NOTES_MERGE_REF 失敗"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "無法完成註解合併"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "未知的註解合併策略 %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "通用選項"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "合併選項"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr "使用指定的策略解決註解衝突 (manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "提交未合併的註解"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "透過提交未合併的註解來完成註解合併"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "中止註解合併的方案"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "中止註解合併"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "不能混用 --commit、--abort 或 -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "必須指定一個註解引用來合併"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "未知的 -s/--strategy：%s"
-#: builtin/notes.c:873
+#: builtin/notes.c:874
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "位於 %2$s 的一個到 %1$s 中的註解合併正在執行中"
-#: builtin/notes.c:876
+#: builtin/notes.c:878
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "無法儲存連結到目前的註解引用（%s）"
-#: builtin/notes.c:878
+#: builtin/notes.c:880
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18215,41 +18922,41 @@
"自動合併說明失敗。修改 %s 中的衝突並且使用指令 'git notes merge --commit' 提"
"交結果，或者使用指令 'git notes merge --abort' 終止合併。\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:595
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "無法解析 '%s' 為一個有效引用。"
-#: builtin/notes.c:900
+#: builtin/notes.c:902
#, c-format
msgid "Object %s has no note\n"
msgstr "物件 %s 沒有註解\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:914
msgid "attempt to remove non-existent note is not an error"
msgstr "嘗試刪除不存在的註解不是一個錯誤"
-#: builtin/notes.c:915
+#: builtin/notes.c:917
msgid "read object names from the standard input"
msgstr "從標準輸入讀取物件名稱"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "不刪除，只顯示"
-#: builtin/notes.c:955
+#: builtin/notes.c:957
msgid "report pruned notes"
-msgstr "報告清除的註解"
+msgstr "回報剪除的註解"
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
msgid "notes-ref"
msgstr "註解引用"
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
msgid "use notes from <notes-ref>"
msgstr "從 <註解引用> 使用註解"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1036 builtin/stash.c:1802
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子指令：%s"
@@ -18264,7 +18971,7 @@
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:570
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18272,106 +18979,110 @@
msgstr ""
"write_reuse_object：無法定位 %1$s，預期在 %3$s 包中的 %2$<PRIuMAX> 偏移量"
-#: builtin/pack-objects.c:580
+#: builtin/pack-objects.c:578
#, c-format
msgid "bad packed object CRC for %s"
msgstr "%s 錯的包物件 CRC"
-#: builtin/pack-objects.c:591
+#: builtin/pack-objects.c:589
#, c-format
msgid "corrupt packed object for %s"
msgstr "%s 損壞的包物件"
-#: builtin/pack-objects.c:722
+#: builtin/pack-objects.c:720
#, c-format
msgid "recursive delta detected for object %s"
msgstr "發現物件 %s 遞迴 delta"
-#: builtin/pack-objects.c:941
+#: builtin/pack-objects.c:939
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "排序了 %u 個物件，預期 %<PRIu32> 個"
-#: builtin/pack-objects.c:1036
+#: builtin/pack-objects.c:1034
#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "預期 %2$s 包中的偏移 %1$<PRIuMAX> 有物件"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1158
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "停用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1171
msgid "Writing objects"
msgstr "寫入物件中"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1243 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "對 %s 呼叫 stat 失敗"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1276
+msgid "failed to write bitmap index"
+msgstr "無法寫入位圖索引"
+
+#: builtin/pack-objects.c:1302
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1544
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "停用 bitmap 寫入，因為一些物件將不會被打包"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1992
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 壓縮中 delta 基準位移越界"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:2001
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基準位移越界"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2282
msgid "Counting objects"
msgstr "物件計數中"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2447
#, c-format
msgid "unable to parse object header of %s"
msgstr "無法解析物件 %s 標頭訊息"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
+#: builtin/pack-objects.c:2543
#, c-format
msgid "object %s cannot be read"
msgstr "物件 %s 無法讀取"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2557
msgid "suboptimal pack - out of memory"
msgstr "次優（suboptimal）打包 - 記憶體不足"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2872
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 個執行緒進行壓縮"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3011
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "無法為標籤 %s 壓縮物件"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3097
msgid "Compressing objects"
msgstr "壓縮物件中"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3103
msgid "inconsistency with delta count"
msgstr "不一致的差異計數"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3182
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18380,23 +19091,24 @@
"uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> "
"<uri>' (收到 '%s')"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3185
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3220
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "無法取得 %2$s 包中 %1$s 物件的類型"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
+#: builtin/pack-objects.c:3373
#, c-format
msgid "could not find pack '%s'"
msgstr "找不到「%s」包"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3416
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18405,7 +19117,7 @@
"預期邊界物件（edge object）ID，卻得到垃圾資料：\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3422
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -18414,246 +19126,238 @@
"預期物件 ID，卻得到垃圾資料：\n"
" %s"
-#: builtin/pack-objects.c:3482
-msgid "invalid value for --missing"
-msgstr "選項 --missing 的值無效"
-
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
msgid "cannot open pack index"
msgstr "無法開啟包檔案索引"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3549
#, c-format
msgid "loose object at %s could not be examined"
msgstr "無法檢查 %s 處的鬆散物件"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3635
msgid "unable to force loose object"
msgstr "無法強制鬆散物件"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3763
#, c-format
msgid "not a rev '%s'"
msgstr "不是一個版本 '%s'"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "壞的版本 '%s'"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3794
msgid "unable to add recent objects"
msgstr "無法新增最近的物件"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3847
#, c-format
msgid "unsupported index version %s"
msgstr "不支援的索引版本 %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3851
#, c-format
msgid "bad index version '%s'"
msgstr "壞的索引版本 '%s'"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3907
msgid "<version>[,<offset>]"
msgstr "<版本>[,<位移>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3908
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本來寫包索引檔案"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3911
msgid "maximum size of each output pack file"
msgstr "每個輸出包的最大尺寸"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3913
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略從備用物件儲存裡借用物件"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3915
msgid "ignore packed objects"
msgstr "忽略包物件"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3917
msgid "limit pack window by objects"
msgstr "限制打包視窗的物件數"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3919
msgid "limit pack window by memory in addition to object limit"
msgstr "除物件數量限制外設定打包視窗的記憶體限制"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3921
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允許的 delta 鏈的最大長度"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3923
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3925
msgid "reuse existing objects"
msgstr "重用已存在的物件"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3927
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 物件"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3929
msgid "use threads when searching for best delta matches"
msgstr "使用執行緒查詢最佳 delta 符合"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3931
msgid "do not create an empty pack output"
msgstr "不建立空的包輸出"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3933
msgid "read revision arguments from standard input"
msgstr "從標準輸入讀取版本號參數"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3935
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的物件"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3938
msgid "include objects reachable from any reference"
msgstr "包括可以從任何引用存取到的物件"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3941
msgid "include objects referred by reflog entries"
msgstr "包括被引用日誌引用到的物件"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3944
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的物件"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3947
msgid "read packs from stdin"
msgstr "從標準輸入中讀取包"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3949
msgid "output pack to stdout"
msgstr "輸出包到標準輸出"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3951
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包物件的標籤物件"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3953
msgid "keep unreachable objects"
msgstr "維持無法取得的物件"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3955
msgid "pack loose unreachable objects"
msgstr "打包鬆散的無法取得物件"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3957
msgid "unpack unreachable objects newer than <time>"
msgstr "將比提供 <時間> 新的無法存取的物件解包"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3960
msgid "use the sparse reachability algorithm"
msgstr "使用稀疏可以取得性演算法"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3962
msgid "create thin packs"
msgstr "建立精簡包"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3964
msgid "create packs suitable for shallow fetches"
msgstr "建立適合淺複製版本庫取得的包"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3966
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 檔案的包"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3968
msgid "ignore this pack"
msgstr "忽略該 pack"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3970
msgid "pack compression level"
msgstr "打包壓縮級別"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3972
msgid "do not hide commits by grafts"
msgstr "顯示被移植隱藏的提交"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3974
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3976
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同時建立 bitmap 索引"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3980
msgid "write a bitmap index if possible"
msgstr "如果可能，寫 bitmap 索引"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3984
msgid "handling for missing objects"
msgstr "處理遺失的物件"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3987
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor packfile 中的物件"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3989
msgid "respect islands during delta compression"
-msgstr "在增量壓縮時參考資料島"
+msgstr "在差異壓縮時尊重資料島"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3991
msgid "protocol"
msgstr "通訊協定"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3992
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "排除任何設定過，使用此通訊協定的 uploadpack.blobpackfileuri"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4027
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量鏈深度 %d 太深了，強制為 %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4032
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4088
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "不能使用 --max-pack-size 來組建傳輸用的包檔案"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4090
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包檔案大小是 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4095
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用於建立一個可索引包"
#: builtin/pack-objects.c:4104
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable 和 --unpack-unreachable 不相容"
-
-#: builtin/pack-objects.c:4110
msgid "cannot use --filter without --stdout"
msgstr "不能在沒有 --stdout 的情況下使用 --filter"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4106
msgid "cannot use --filter with --stdin-packs"
msgstr "無法將 --filter 及 --stdin-packs 結合使用"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4110
msgid "cannot use internal rev list with --stdin-packs"
msgstr "無法將內部版本清單與 --stdin-packs 結合使用"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4169
msgid "Enumerating objects"
msgstr "枚舉物件"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4210
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18686,96 +19390,86 @@
#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
-msgstr "清除鬆散的引用（預設）"
-
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr "剪除鬆散引用（預設）"
#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <時間>] [--] [<head>...]"
-#: builtin/prune.c:133
+#: builtin/prune.c:145
msgid "report pruned objects"
-msgstr "報告清除的物件"
+msgstr "回報剪除的物件"
-#: builtin/prune.c:136
+#: builtin/prune.c:148
msgid "expire objects older than <time>"
msgstr "使早於提供時間的物件過期"
-#: builtin/prune.c:138
+#: builtin/prune.c:150
msgid "limit traversal to objects outside promisor packfiles"
msgstr "限制遍歷 promisor packfile 以外的物件"
-#: builtin/prune.c:152
+#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
-msgstr "不能在珍品版本庫中執行清理動作"
-
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "%s 的值無效：%s"
+msgstr "不能在珍品版本庫中執行剪除動作"
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<選項>] [<版本庫> [<引用規格>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "控制子模組的遞迴取得"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "和合併相關的選項"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用重定基底動作取代合併動作以套用修改"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允許快轉式"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用"
+
+#: builtin/pull.c:171 parse-options.h:371
msgid "automatically stash/stash pop before and after"
msgstr "在動作前後執行自動儲藏和彈出儲藏"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "和取得相關的參數"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "強制覆蓋本機分支"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "並行拉取的子模組數量"
-#: builtin/pull.c:317
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "pull.ff 的取值無效：%s"
-
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您剛剛取得到的引用中沒有重定基底動作的候選。"
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您剛剛取得到的引用中沒有合併動作的候選。"
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
-msgstr "通常這意味著您提供了一萬用字元引用規格但未能和遠端符合。"
+msgstr "這通常表示您有提供萬用字元引用規格，但遠端沒有符合項目。"
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -18785,41 +19479,42 @@
"您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n"
"分支預設的遠端版本庫，您必須在指令列中指定一個分支名。"
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:978
msgid "You are not currently on a branch."
msgstr "您目前不在一個分支上。"
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "請指定您要重定基底到哪一個分支。"
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "請指定您要合併哪一個分支。"
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "詳見 git-pull(1)。"
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:984
msgid "<remote>"
msgstr "<遠端>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:374
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:976
msgid "There is no tracking information for the current branch."
msgstr "目前分支沒有追蹤訊息。"
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要為此分支建立追蹤訊息，您可以執行："
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -18828,22 +19523,22 @@
"您的設定中指定要合併遠端的引用 '%s'，\n"
"但是沒有取得到這個引用。"
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "無法存取提交 %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "為重定基底動作忽略 --verify-signatures"
-#: builtin/pull.c:930
+#: builtin/pull.c:969
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"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase false # merge\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
@@ -18853,32 +19548,32 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"不建議在尚未指定偏離分支的合併策略的情況下拉取。\n"
-"您可以在下一次呼叫 pull 命令前執行下述命令\n"
-"以隱藏此訊息：\n"
+"您有偏離的分支，需要指定調和分支的方式。\n"
+"您可以在下次拉取前執行以下任一命令\n"
+"指定調和方式：\n"
"\n"
-" git config pull.rebase false # 合併（預設策略）\n"
+" git config pull.rebase false # 合併\n"
" git config pull.rebase true # 重定基底\n"
-" git config pull.ff only # 只快進\n"
+" git config pull.ff only # 只進行快轉\n"
"\n"
"您可以將「git config」改成「git config --global」以設定\n"
"所有版本庫的預設偏好設定。也可以每次在命令列呼叫\n"
"pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n"
"設定的預設值。\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1047
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未誕生的分支，變更新增至索引。"
-#: builtin/pull.c:994
+#: builtin/pull.c:1051
msgid "pull with rebase"
msgstr "重定基底式拉取"
-#: builtin/pull.c:995
+#: builtin/pull.c:1052
msgid "please commit or stash them."
msgstr "請提交或儲藏它們。"
-#: builtin/pull.c:1020
+#: builtin/pull.c:1077
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -18888,7 +19583,7 @@
"fetch 更新了目前的分支。快轉您的工作區\n"
"至提交 %s。"
-#: builtin/pull.c:1026
+#: builtin/pull.c:1083
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -18905,15 +19600,23 @@
"$ git reset --hard\n"
"復原之前的狀態。"
-#: builtin/pull.c:1041
+#: builtin/pull.c:1098
msgid "Cannot merge multiple branches into empty head."
msgstr "無法將多個分支合併到空分支。"
-#: builtin/pull.c:1045
+#: builtin/pull.c:1103
msgid "Cannot rebase onto multiple branches."
msgstr "無法重定基底到多個分支。"
-#: builtin/pull.c:1065
+#: builtin/pull.c:1105
+msgid "Cannot fast-forward to multiple branches."
+msgstr "無法快轉至多個分支。"
+
+#: builtin/pull.c:1120
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "需要指定如何調和偏離的分支。"
+
+#: builtin/pull.c:1134
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本機子模組中有修改，無法重定基底"
@@ -19077,15 +19780,15 @@
msgid "failed to push some refs to '%s'"
msgstr "推送一些引用到 '%s' 失敗"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3377
msgid "repository"
msgstr "版本庫"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "鏡像所有引用"
@@ -19097,19 +19800,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送標籤（不能使用 --all or --mirror）"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "強制更新"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<引用名>:<期望值>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "要求引用舊的取值為設定值"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "需要將遠端更新整合進本地"
@@ -19117,12 +19820,12 @@
msgid "control recursive pushing of submodules"
msgstr "控制子模組的遞迴推送"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "使用精簡打包"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "接收包程式"
@@ -19132,7 +19835,7 @@
#: builtin/push.c:567
msgid "prune locally removed refs"
-msgstr "清除本機刪除的引用"
+msgstr "剪除本機刪除的引用"
#: builtin/push.c:569
msgid "bypass pre-push hook"
@@ -19142,17 +19845,13 @@
msgid "push missing but relevant tags"
msgstr "推送缺少但有關的標籤"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "用 GPG 為推送簽名"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
-msgstr "需要遠端支援原子事務"
-
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete 與 --all、--mirror 及 --tags 不相容"
+msgstr "需要遠端支援 atomic 事務"
#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
@@ -19175,8 +19874,8 @@
"\n"
" git push <name>\n"
msgstr ""
-"沒有設定推送目標。\n"
-"或透過指令列指定 URL，或用下面指令設定一個遠端版本庫\n"
+"沒有設定推送目的地。\n"
+"請透過命令列指定 URL，或者用下面指令設定遠端版本庫\n"
"\n"
" git remote add <名稱> <位址>\n"
"\n"
@@ -19184,26 +19883,14 @@
"\n"
" git push <名稱>\n"
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all 和 --tags 不相容"
-
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用規格同時使用"
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror 和 --tags 不相容"
-
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用規格同時使用"
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all 和 --mirror 不相容"
-
#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "推送選項不能有換行符號"
@@ -19256,86 +19943,86 @@
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前綴>) [-"
-"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<檔案>] (--empty | <樹狀物件1> [<樹狀物件2> [<樹狀物件3>]])"
+"u | -i]] [--no-sparse-checkout] [--index-output=<檔案>] (--empty | <樹狀物件"
+"1> [<樹狀物件2> [<樹狀物件3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "將索引結果寫入 <檔案>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "只是清空索引"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "合併"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "讀取之餘再執行一個合併"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "如果沒有檔案級合併需要，執行三方合併"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "存在新增和刪除時，也執行三方合併"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "類似於 -m，但捨棄未合併的條目"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<子目錄>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "讀取樹狀物件到索引的 <子目錄>/ 下"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "用合併的結果更新工作區"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "允許忽略檔案中設定的檔案可以被覆蓋"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "合併後不檢查工作區"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "不更新索引區和工作區"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "略過套用稀疏簽出過濾器"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "除錯 unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "抑制回饋訊息"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:190
msgid "You need to resolve your current index first"
msgstr "您需要先解決目前索引的衝突"
-#: builtin/rebase.c:35
+#: builtin/rebase.c:36
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -19343,203 +20030,50 @@
"git rebase [-i] [options] [--exec <命令>] [--onto <新基礎> | --keep-base] [<"
"上游> [<分支>]]"
-#: builtin/rebase.c:37
+#: builtin/rebase.c:38
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [選項] [--exec <命令>] [--onto <新基礎>] --root [<分支>]"
-#: builtin/rebase.c:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "不可用的待辦列表：'%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:231
#, c-format
msgid "could not create temporary %s"
msgstr "無法建立暫時的 %s"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:237
msgid "could not mark as interactive"
msgstr "無法標記為互動式"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:290
msgid "could not generate todo list"
msgstr "無法生成待辦列表"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:332
msgid "a base commit must be provided with --upstream or --onto"
msgstr "使用 --upstream 或 --onto 必須提供一個基礎提交"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<選項>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "保留開頭是空白的提交"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "允許提交說明為空"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "對合併提交重定基底"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "保持兄弟提交的原始分支點"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "移動以 squash!/fixup! 開頭的提交"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "簽名提交"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "顯示上游變化的差異統計"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "繼續重定基底"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "略過提交"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "重定基底待辦列表"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "顯示目前修補檔"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "縮短待辦列表中的提交號"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "擴展待辦列表中的提交號"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "檢查待辦列表"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "重新排列 fixup/squash 行"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "在待辦列表中插入 exec 執行指令"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "onto"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "限制版本"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash onto"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "上游提交"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "head 名稱"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "重定基底策略"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "策略選項"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "切換到"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "要簽出的分支或提交"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "onto name"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "要執行的指令"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "自動重新安排任何失敗的 `exec`"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "不使用 --rebase-merges，則 --[no-]rebase-cousins 沒有效果"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:391
#, c-format
msgid "%s requires the merge backend"
msgstr "%s 需要合併後端"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:433
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "無法取得 'onto'：'%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:450
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "無效的原始 head：'%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:475
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略無效的 allow_rerere_autoupdate：'%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:600
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19552,7 +20086,7 @@
"\"git rebase --skip\" 指令略過這個提交。如果想要終止執行並回到\n"
"\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。"
-#: builtin/rebase.c:896
+#: builtin/rebase.c:685
#, c-format
msgid ""
"\n"
@@ -19570,14 +20104,19 @@
"\n"
"因此 git 無法對其重定基底。"
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:836
+#, c-format
+msgid "could not switch to %s"
+msgstr "無法切換到 %s"
+
+#: builtin/rebase.c:952
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。"
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:970
#, c-format
msgid ""
"%s\n"
@@ -19594,7 +20133,7 @@
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:986
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -19607,181 +20146,180 @@
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:1016
msgid "exec commands cannot contain newlines"
msgstr "exec 指令不能包含換行符號"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:1020
msgid "empty exec command"
msgstr "空的 exec 指令"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1051
msgid "rebase onto given branch instead of upstream"
msgstr "重定基底到提供的分支而非上游"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1053
msgid "use the merge-base of upstream and branch as the current base"
msgstr "使用上游和分支的合併基礎做為目前基礎"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1055
msgid "allow pre-rebase hook to run"
msgstr "允許執行 pre-rebase 掛鉤"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1057
msgid "be quiet. implies --no-stat"
msgstr "安靜。暗示 --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1060
+msgid "display a diffstat of what changed upstream"
+msgstr "顯示上游變化的差異統計"
+
+#: builtin/rebase.c:1063
msgid "do not show diffstat of what changed upstream"
msgstr "不顯示上游變化的差異統計"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1066
msgid "add a Signed-off-by trailer to each commit"
msgstr "在每個提交結尾加入 Signed-off-by"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1069
msgid "make committer date match author date"
msgstr "使提交日期與製作日期相符合"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1071
msgid "ignore author date and use current date"
msgstr "忽略製作日期而使用日前日期"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1073
msgid "synonym of --reset-author-date"
msgstr "和 --reset-author-date 同義"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1075 builtin/rebase.c:1079
msgid "passed to 'git apply'"
msgstr "傳遞給 'git apply'"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1077
msgid "ignore changes in whitespace"
msgstr "忽略空白字元中的變更"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1081 builtin/rebase.c:1084
msgid "cherry-pick all commits, even if unchanged"
msgstr "揀選所有提交，即使未修改"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1086
msgid "continue"
msgstr "繼續"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1089
msgid "skip current patch and continue"
msgstr "略過目前修補檔並繼續"
# 譯者：請維持前導空格
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1091
msgid "abort and check out the original branch"
msgstr "終止並簽出原有分支"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1094
msgid "abort but keep HEAD where it is"
msgstr "終止但保持 HEAD 不變"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1095
msgid "edit the todo list during an interactive rebase"
msgstr "在互動式重定基底中編輯待辦列表"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1098
msgid "show the patch file being applied or merged"
msgstr "顯示正在套用或合併的修補檔案"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1101
msgid "use apply strategies to rebase"
msgstr "使用套用策略進行重定基底"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1105
msgid "use merging strategies to rebase"
msgstr "使用合併策略進行重定基底"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1109
msgid "let the user edit the list of commits to rebase"
msgstr "讓使用者編輯要重定基底的提交列表"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1113
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "（已棄用）嘗試重建合併提交而非忽略它們"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1118
msgid "how to handle commits that become empty"
msgstr "處理空白提交的方式"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1121
+msgid "keep commits which start empty"
+msgstr "保留開頭是空白的提交"
+
+#: builtin/rebase.c:1125
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 互動模式下，移動以 squash!/fixup! 開頭的提交"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1132
msgid "add exec lines after each commit of the editable list"
msgstr "可編輯列表的每一個提交下面增加一行 exec"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1136
msgid "allow rebasing commits with empty messages"
msgstr "允許針對空提交說明的提交重定基底"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1140
msgid "try to rebase merges instead of skipping them"
msgstr "嘗試對合併提交重定基底而不是忽略它們"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1143
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 來最佳化上游"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1145
msgid "use the given merge strategy"
msgstr "使用提供的合併策略"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1147 builtin/revert.c:115
msgid "option"
msgstr "選項"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1148
msgid "pass the argument through to the merge strategy"
msgstr "將參數傳遞給合併策略"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1151
msgid "rebase all reachable commits up to the root(s)"
msgstr "將所有可以取得的提交重定基底到根提交"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1154
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "自動重新安排任何失敗的 `exec`"
+
+#: builtin/rebase.c:1156
msgid "apply all changes, even those already present upstream"
msgstr "即使已提供上游，仍套用所有變更"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1177
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起來 'git am' 正在執行中。無法重定基底。"
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr "git rebase --preserve-merges 被棄用。用 --rebase-merges 代替。"
+#: builtin/rebase.c:1208
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges 已經被 --rebase-merges 取代"
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "不能將 '--keep-base' 和 '--onto' 組合使用"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "不能將 '--keep-base' 和 '--root' 組合使用"
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "不能將 '--root' 和 '--fork-point' 結合使用"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1230
msgid "No rebase in progress?"
msgstr "沒有正在進行的重定基底？"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1234
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。"
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "不能讀取 HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1269
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -19789,16 +20327,16 @@
"您必須編輯所有的合併衝突，然後透過 git add\n"
"指令將它們標記為已解決"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1287
msgid "could not discard worktree changes"
msgstr "無法捨棄工作區變更"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1308
#, c-format
msgid "could not move back to %s"
msgstr "無法移回 %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1354
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -19817,141 +20355,126 @@
"\t%s\n"
"然後再重新執行。 為避免遺失重要資料，我已經停止目前動作。\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1382
msgid "switch `C' expects a numerical value"
msgstr "開關 `C' 期望一個數字值"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1424
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式：%s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1463
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "不能將 apply 套用選項與 merge 合併選項一起使用"
+#: builtin/rebase.c:1492
+msgid "apply options and merge options cannot be used together"
+msgstr "套用選項與合併選項不得同時使用"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1505
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "未知 rebase 後端：%s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1534
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "不能將 '--preserve-merges' 和 '--rebase-merges' 同時使用"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"錯誤：不能將 '--preserve-merges' 和 '--reschedule-failed-exec' 同時使用"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1565
#, c-format
msgid "invalid upstream '%s'"
msgstr "無效的上游 '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1571
msgid "Could not create new root commit"
msgstr "不能建立新的根提交"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1597
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s'：只需要與分支的一個合併基礎"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1600
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s'：只需要一個合併基礎"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1609
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "沒有指向一個有效的提交 '%s'"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1636
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "致命錯誤：無此分支/提交 '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "沒有此分支/提交 '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
+#: builtin/submodule--helper.c:2477
#, c-format
msgid "No such ref: %s"
msgstr "沒有這樣的引用：%s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1658
msgid "Could not resolve HEAD to a revision"
msgstr "無法將 HEAD 解析為一個版本"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1679
msgid "Please commit or stash them."
msgstr "請提交或儲藏修改。"
-#: builtin/rebase.c:1997
-#, c-format
-msgid "could not switch to %s"
-msgstr "無法切換到 %s"
-
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1714
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1716
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "目前分支 %s 是最新的。\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1724
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的，強制重定基底。"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1726
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "目前分支 %s 是最新的，強制重定基底。\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1734
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 掛鉤拒絕了重定基底動作。"
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1741
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的變更：\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1744
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "從 %s 到 %s 的變更：\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1769
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先，還原開頭指標以便在其上重放您的工作...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1781
msgid "Could not detach HEAD"
msgstr "無法分離開頭指標"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1790
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快轉 %s 到 %s。\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <版本庫目錄>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1263
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"
@@ -19977,7 +20500,7 @@
"若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n"
"設定變數為 'refuse'。"
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1283
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"
@@ -19996,79 +20519,110 @@
"\n"
"若要封鎖此訊息，您可以設定它為 'refuse'。"
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2476
msgid "quiet"
msgstr "靜默模式"
-#: builtin/receive-pack.c:2492
-msgid "You must specify a directory."
-msgstr "您必須指定一個目錄。"
+#: builtin/receive-pack.c:2491
+msgid "you must specify a directory"
+msgstr "您必須指定目錄"
+
+#: builtin/reflog.c:9
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [<log-options>] [<ref>]"
+
+#: builtin/reflog.c:12
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
+msgstr ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
msgstr ""
-"git reflog expire [--expire=<時間>] [--expire-unreachable=<時間>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
-"用>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
-#: builtin/reflog.c:22
-msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
-msgstr ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
-"用>..."
-
-#: builtin/reflog.c:25
+#: builtin/reflog.c:21
msgid "git reflog exists <ref>"
msgstr "git reflog exists <引用>"
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:197 builtin/reflog.c:211
#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "'%s' 不是一個有效的時間戳"
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "傳入「--%s」的時間戳「%s」無效"
-#: builtin/reflog.c:609
+#: builtin/reflog.c:240 builtin/reflog.c:359
+msgid "do not actually prune any entries"
+msgstr "不實際剪除任何項目"
+
+#: builtin/reflog.c:243 builtin/reflog.c:362
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr "將舊的 SHA1 重寫為現在比它早的新 SHA1"
+
+#: builtin/reflog.c:246 builtin/reflog.c:365
+msgid "update the reference to the value of the top reflog entry"
+msgstr "更新引用至首個引用日誌項目的值"
+
+#: builtin/reflog.c:248 builtin/reflog.c:367
+msgid "print extra information on screen"
+msgstr "在螢幕上輸出額外資訊"
+
+#: builtin/reflog.c:249 builtin/reflog.c:253
+msgid "timestamp"
+msgstr "時間戳"
+
+#: builtin/reflog.c:250
+msgid "prune entries older than the specified time"
+msgstr "剪除舊於指定時間的項目"
+
+#: builtin/reflog.c:254
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr "剪除早於 <time> 且不能從分支目前開頭到達的項目"
+
+#: builtin/reflog.c:258
+msgid "prune any reflog entries that point to broken commits"
+msgstr "剪除任何指向損壞提交的引用日誌項目"
+
+#: builtin/reflog.c:259
+msgid "process the reflogs of all references"
+msgstr "處理所有引用的 reflog"
+
+#: builtin/reflog.c:261
+msgid "limits processing to reflogs from the current worktree only"
+msgstr "限制只處理目前工作區的引用日誌"
+
+#: builtin/reflog.c:294
#, c-format
msgid "Marking reachable objects..."
msgstr "正在標記可以取得物件..."
-#: builtin/reflog.c:647
+#: builtin/reflog.c:338
#, c-format
msgid "%s points nowhere!"
msgstr "%s 指向不存在！"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:374
msgid "no reflog specified to delete"
msgstr "未指定要刪除的引用日誌"
-#: builtin/reflog.c:708
-#, c-format
-msgid "not a reflog: %s"
-msgstr "不是一個引用日誌：%s"
-
-#: builtin/reflog.c:713
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "沒有 '%s' 的引用日誌"
-
-#: builtin/reflog.c:759
+#: builtin/reflog.c:396
#, c-format
msgid "invalid ref format: %s"
msgstr "無效的引用格式：%s"
-#: builtin/reflog.c:768
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr "git reflog [ show | expire | delete | exists ]"
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
@@ -20076,81 +20630,86 @@
"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <名稱> <位址>"
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <舊名稱> <新名稱>"
+#: builtin/remote.c:20 builtin/remote.c:40
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <old> <new>"
-#: builtin/remote.c:20 builtin/remote.c:44
+#: builtin/remote.c:21 builtin/remote.c:45
msgid "git remote remove <name>"
msgstr "git remote remove <名稱>"
-#: builtin/remote.c:21 builtin/remote.c:49
+#: builtin/remote.c:22 builtin/remote.c:50
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <名稱> (-a | --auto | -d | --delete | <分支>)"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <名稱>"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <名稱>"
-#: builtin/remote.c:24
+#: builtin/remote.c:25
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr "git remote [-v | --verbose] update [-p | --prune] [(<組> | <遠端>)...]"
-#: builtin/remote.c:25
+#: builtin/remote.c:26
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <名稱> <分支>..."
-#: builtin/remote.c:26 builtin/remote.c:75
+#: builtin/remote.c:27 builtin/remote.c:76
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <名稱>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <名稱> <新的位址> [<舊的位址>]"
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <名稱> <新的位址>"
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c:30 builtin/remote.c:83
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <名稱> <位址>"
-#: builtin/remote.c:34
+#: builtin/remote.c:35
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<選項>] <名稱> <位址>"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <名稱> <分支>..."
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <名稱> <分支>..."
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<選項>] <名稱>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<選項>] <名稱>"
-#: builtin/remote.c:70
+#: builtin/remote.c:71
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<選項>] [<組> | <遠端>]..."
-#: builtin/remote.c:99
+#: builtin/remote.c:100
#, c-format
msgid "Updating %s"
msgstr "更新 %s 中"
-#: builtin/remote.c:131
+#: builtin/remote.c:102
+#, c-format
+msgid "Could not fetch %s"
+msgstr "不能取得 %s"
+
+#: builtin/remote.c:132
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -20158,72 +20717,77 @@
"--mirror 選項危險且過時，請使用 --mirror=fetch\n"
"\t 或 --mirror=push"
-#: builtin/remote.c:148
+#: builtin/remote.c:149
#, c-format
msgid "unknown mirror argument: %s"
msgstr "未知的鏡像參數：%s"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "fetch the remote branches"
msgstr "抓取遠端的分支"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "import all tags and associated objects when fetching"
msgstr "抓取時匯入所有的標籤和關聯物件"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "或不抓取任何標籤（--no-tags）"
-#: builtin/remote.c:171
+#: builtin/remote.c:172
msgid "branch(es) to track"
msgstr "追蹤的分支"
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "master branch"
msgstr "master 分支"
-#: builtin/remote.c:174
+#: builtin/remote.c:175
msgid "set up remote as a mirror to push to or fetch from"
msgstr "把遠端設定為用以推送或抓取的鏡像"
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying a master branch makes no sense with --mirror"
msgstr "指定一個 master 分支並使用 --mirror 選項沒有意義"
-#: builtin/remote.c:188
+#: builtin/remote.c:189
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:196 builtin/remote.c:716
#, c-format
msgid "remote %s already exists."
msgstr "遠端 %s 已經存在。"
-#: builtin/remote.c:240
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "無法設定 master '%s'"
-#: builtin/remote.c:355
+#: builtin/remote.c:323
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branch.%s.rebase=%s 未處理。假設成 'true'"
+
+#: builtin/remote.c:367
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "無法得到引用規格 %s 的取得列表"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:461 builtin/remote.c:469
msgid "(matching)"
msgstr "（符合）"
-#: builtin/remote.c:466
+#: builtin/remote.c:473
msgid "(delete)"
msgstr "（刪除）"
-#: builtin/remote.c:655
+#: builtin/remote.c:664
#, c-format
msgid "could not set '%s'"
msgstr "無法設定 '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:669
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20234,17 +20798,17 @@
"\t%s:%d\n"
"現命名成不存在的遠端分支 '%s'"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
#, c-format
msgid "No such remote: '%s'"
msgstr "沒有此遠端版本庫：'%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:726
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重新命名設定小節 '%s' 到 '%s'"
-#: builtin/remote.c:730
+#: builtin/remote.c:746
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20255,17 +20819,21 @@
"\t%s\n"
"\t如果必要請手動更新設定。"
-#: builtin/remote.c:770
+#: builtin/remote.c:783
+msgid "Renaming remote references"
+msgstr "正在重新命名遠端引用"
+
+#: builtin/remote.c:794
#, c-format
msgid "deleting '%s' failed"
msgstr "刪除 '%s' 失敗"
-#: builtin/remote.c:804
+#: builtin/remote.c:832
#, c-format
msgid "creating '%s' failed"
msgstr "建立 '%s' 失敗"
-#: builtin/remote.c:882
+#: builtin/remote.c:912
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20274,118 +20842,118 @@
"to delete them, use:"
msgstr[0] "注意：ref/remotes 層級之外的一個分支未被移除。要刪除它，使用："
-#: builtin/remote.c:896
+#: builtin/remote.c:926
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除設定小節 '%s'"
-#: builtin/remote.c:999
+#: builtin/remote.c:1034
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的（下一次取得將儲存於 remotes/%s）"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1037
msgid " tracked"
msgstr " 已追蹤"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1039
msgid " stale (use 'git remote prune' to remove)"
-msgstr " 過時（使用 'git remote prune' 來移除）"
+msgstr " 過時（使用 'git remote prune' 移除）"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1041
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1082
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "無效的 branch.%s.merge，不能重定基底到一個以上的分支"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1091
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "互動式重定基底到遠端 %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1093
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "互動式重定基底（含合併提交）到遠端 %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1096
#, c-format
msgid "rebases onto remote %s"
msgstr "重定基底到遠端 %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1100
#, c-format
msgid " merges with remote %s"
msgstr " 與遠端 %s 合併"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1103
#, c-format
msgid "merges with remote %s"
msgstr "與遠端 %s 合併"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1106
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和遠端 %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1149
msgid "create"
msgstr "建立"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1152
msgid "delete"
msgstr "刪除"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1156
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1159
msgid "fast-forwardable"
msgstr "可快轉"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1162
msgid "local out of date"
msgstr "本機已過時"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1169
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 強制推送至 %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1172
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1176
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 強制推送至 %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1179
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1247
msgid "do not query remotes"
msgstr "不查詢遠端"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1268
#, c-format
msgid "* remote %s"
msgstr "* 遠端 %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1269
#, c-format
msgid " Fetch URL: %s"
msgstr " 取得位址：%s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
msgid "(no URL)"
msgstr "(無 URL)"
@@ -20393,185 +20961,189 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1284 builtin/remote.c:1286
#, c-format
msgid " Push URL: %s"
msgstr " 推送位址：%s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支：%s"
# 譯者：中文字串拼接，可刪除前導空格
-#: builtin/remote.c:1259
+#: builtin/remote.c:1288
msgid "(not queried)"
msgstr "（未查詢）"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1290
msgid "(unknown)"
msgstr "（未知）"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1294
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支（遠端 HEAD 模糊，可能是下列中的一個）：\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1306
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " 遠端分支：%s"
# 譯者：中文字串拼接，可刪除前導空格
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1309 builtin/remote.c:1335
msgid " (status not queried)"
-msgstr "（狀態未查詢）"
+msgstr " （狀態未查詢）"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1318
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 為 'git pull' 設定的本機分支："
-#: builtin/remote.c:1297
+#: builtin/remote.c:1326
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本機引用將在 'git push' 時被鏡像"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1332
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 為 'git push' 設定的本機引用%s："
-#: builtin/remote.c:1324
+#: builtin/remote.c:1353
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根據遠端設定 refs/remotes/<名稱>/HEAD"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1355
msgid "delete refs/remotes/<name>/HEAD"
msgstr "刪除 refs/remotes/<名稱>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1369
msgid "Cannot determine remote HEAD"
msgstr "無法確定遠端 HEAD"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1371
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多個遠端 HEAD 分支。請明確地選擇一個用指令："
-#: builtin/remote.c:1353
+#: builtin/remote.c:1381
#, c-format
msgid "Could not delete %s"
msgstr "無法刪除 %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1389
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一個有效引用：%s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1391
#, c-format
msgid "Could not setup %s"
msgstr "不能設定 %s"
# 譯者：請維持前導空格
-#: builtin/remote.c:1381
+#: builtin/remote.c:1409
#, c-format
msgid " %s will become dangling!"
msgstr " %s 將成為懸空狀態！"
# 譯者：請維持前導空格
-#: builtin/remote.c:1382
+#: builtin/remote.c:1410
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成為懸空狀態！"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1419
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1420
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1436
#, c-format
msgid " * [would prune] %s"
-msgstr " * [將刪除] %s"
+msgstr " * [將剪除] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1439
#, c-format
msgid " * [pruned] %s"
-msgstr " * [已刪除] %s"
+msgstr " * [已剪除] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1484
msgid "prune remotes after fetching"
-msgstr "抓取後清除遠端"
+msgstr "抓取後剪除遠端"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
#, c-format
msgid "No such remote '%s'"
msgstr "沒有此遠端 '%s'"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1566
msgid "add branch"
msgstr "新增分支"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1573
msgid "no remote specified"
msgstr "未指定遠端"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1590
msgid "query push URLs rather than fetch URLs"
msgstr "查詢推送 URL 位址，而非取得 URL 位址"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1592
msgid "return all URLs"
msgstr "返回所有 URL 位址"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1622
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "沒有給遠端版本庫 '%s' 設定 URL"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1648
msgid "manipulate push URLs"
msgstr "動作推送 URLS"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1650
msgid "add URL"
msgstr "新增 URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1652
msgid "delete URLs"
msgstr "刪除 URL"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1659
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 無意義"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1700
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "無效的舊 URL 符合範本：%s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1708
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL：%s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1710
msgid "Will not delete all non-push URLs"
msgstr "將不會刪除所有非推送 URL 位址"
-#: builtin/repack.c:26
+#: builtin/remote.c:1727
+msgid "be verbose; must be placed before a subcommand"
+msgstr "詳細輸出；必須置於子指令之前"
+
+#: builtin/repack.c:29
msgid "git repack [<options>]"
msgstr "git repack [<選項>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:34
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20579,139 +21151,144 @@
"增量 repack 和 bitmap 索引不相容。 使用 --no-write-bitmap-index\n"
"或停用 pack.writebitmaps 設定。"
-#: builtin/repack.c:198
+#: builtin/repack.c:206
msgid "could not start pack-objects to repack promisor objects"
msgstr "無法開始 pack-objects 來重新打包 promisor 物件"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:280 builtin/repack.c:824
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。"
-#: builtin/repack.c:294
+#: builtin/repack.c:304
msgid "could not finish pack-objects to repack promisor objects"
msgstr "無法完成 pack-objects 來重新打包 promisor 物件"
-#: builtin/repack.c:309
+#: builtin/repack.c:319
#, c-format
msgid "cannot open index for %s"
msgstr "無法開啟 %s 的索引"
-#: builtin/repack.c:368
+#: builtin/repack.c:378
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "%s 包太大，以致不能在等比數列中考慮"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
#, c-format
msgid "pack %s too large to roll up"
msgstr "%s 包太大，以致不能縮合"
-#: builtin/repack.c:460
+#: builtin/repack.c:503
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "無法開啟 '%s' 暫存檔進行寫入"
+
+#: builtin/repack.c:521
+msgid "could not close refs snapshot tempfile"
+msgstr "無法關閉 refs 的快照暫存檔"
+
+#: builtin/repack.c:634
msgid "pack everything in a single pack"
msgstr "所有內容打包到一個包檔案中"
-#: builtin/repack.c:462
+#: builtin/repack.c:636
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件"
-#: builtin/repack.c:465
+#: builtin/repack.c:639
msgid "remove redundant packs, and run git-prune-packed"
-msgstr "刪除多餘的包，執行 git-prune-packed"
+msgstr "刪除多餘的包，然後執行 git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:641
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta"
-#: builtin/repack.c:469
+#: builtin/repack.c:643
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object"
-#: builtin/repack.c:471
+#: builtin/repack.c:645
msgid "do not run git-update-server-info"
msgstr "不執行 git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:648
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --local"
-#: builtin/repack.c:476
+#: builtin/repack.c:650
msgid "write bitmap index"
msgstr "寫 bitmap 索引"
-#: builtin/repack.c:478
+#: builtin/repack.c:652
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --delta-islands"
-#: builtin/repack.c:479
+#: builtin/repack.c:653
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:480
+#: builtin/repack.c:654
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A，不要將早於提供時間的物件過期"
-#: builtin/repack.c:482
+#: builtin/repack.c:656
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ，重新對無法取得物件打包"
-#: builtin/repack.c:484
+#: builtin/repack.c:658
msgid "size of the window used for delta compression"
msgstr "用於增量壓縮的視窗值"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:659 builtin/repack.c:665
msgid "bytes"
msgstr "位元組"
-#: builtin/repack.c:486
+#: builtin/repack.c:660
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似，但限制記憶體大小而非條目數"
-#: builtin/repack.c:488
+#: builtin/repack.c:662
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:490
+#: builtin/repack.c:664
msgid "limits the maximum number of threads"
msgstr "限制最大執行緒數"
-#: builtin/repack.c:492
+#: builtin/repack.c:666
msgid "maximum size of each packfile"
msgstr "每個 packfile 的最大尺寸"
-#: builtin/repack.c:494
+#: builtin/repack.c:668
msgid "repack objects in packs marked with .keep"
msgstr "對標記為 .keep 的包中的物件重新打包"
-#: builtin/repack.c:496
+#: builtin/repack.c:670
msgid "do not repack this pack"
msgstr "不要對該包檔案重新打包"
-#: builtin/repack.c:498
+#: builtin/repack.c:672
msgid "find a geometric progression with factor <N>"
msgstr "尋找因數是 <N> 的等比數列"
-#: builtin/repack.c:508
+#: builtin/repack.c:674
+msgid "write a multi-pack index of the resulting packs"
+msgstr "寫入結果包的多包索引"
+
+#: builtin/repack.c:684
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能刪除珍品版本庫中的打包檔案"
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable 和 -A 不相容"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric 與 -A, -a 不相容"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:833
msgid "Nothing new to pack."
msgstr "沒有新的要打包。"
-#: builtin/repack.c:669
+#: builtin/repack.c:863
#, c-format
msgid "missing required file: %s"
msgstr "缺少必要檔案：%s"
-#: builtin/repack.c:671
+#: builtin/repack.c:865
#, c-format
msgid "could not unlink: %s"
msgstr "無法取消連結：%s"
@@ -20728,10 +21305,6 @@
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <提交> [<父提交>...]"
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --convert-graft-file"
-
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <物件>..."
@@ -20794,98 +21367,92 @@
msgid "unable to open %s for reading"
msgstr "無法為讀取開啟 %s"
-#: builtin/replace.c:272
+#: builtin/replace.c:271
msgid "unable to spawn mktree"
msgstr "無法啟動 mktree"
-#: builtin/replace.c:276
+#: builtin/replace.c:275
msgid "unable to read from mktree"
msgstr "無法從 mktree 讀取"
-#: builtin/replace.c:285
+#: builtin/replace.c:284
msgid "mktree reported failure"
msgstr "mktree 報告失敗"
-#: builtin/replace.c:289
+#: builtin/replace.c:288
msgid "mktree did not return an object name"
msgstr "mktree 沒有返回一個物件名"
-#: builtin/replace.c:298
+#: builtin/replace.c:297
#, c-format
msgid "unable to fstat %s"
msgstr "無法對 %s 執行 fstat"
-#: builtin/replace.c:303
+#: builtin/replace.c:302
msgid "unable to write object to database"
msgstr "無法向資料庫寫入物件"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "不是一個有效的物件名：'%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
#, c-format
msgid "unable to get object type for %s"
msgstr "無法得到 %s 的物件類型"
-#: builtin/replace.c:342
+#: builtin/replace.c:341
msgid "editing object file failed"
msgstr "編輯物件檔案失敗"
-#: builtin/replace.c:351
+#: builtin/replace.c:350
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "新物件和舊物件相同：'%s'"
-#: builtin/replace.c:384
+#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "無法將 %s 解析為一個提交"
-#: builtin/replace.c:416
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "提交 '%s' 中含有損壞的合併標籤"
-#: builtin/replace.c:418
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "提交 '%s' 中含有格式錯誤的合併標籤"
-#: builtin/replace.c:430
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr "原始提交 '%s' 包含已經捨棄的合併標籤 '%s'，使用 --edit 代替 --graft"
-#: builtin/replace.c:469
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "原始提交 '%s' 中有一個 gpg 簽名"
-#: builtin/replace.c:470
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr "在取代的提交中簽名將被移除！"
-#: builtin/replace.c:480
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "不能為 '%s' 寫取代提交"
-#: builtin/replace.c:488
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "對 '%s' 移植沒有必要"
-#: builtin/replace.c:492
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "新提交和舊的一樣：'%s'"
-#: builtin/replace.c:527
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -20894,71 +21461,71 @@
"不能轉換下列移植：\n"
"%s"
-#: builtin/replace.c:548
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr "列出取代的引用"
-#: builtin/replace.c:549
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr "刪除取代的引用"
-#: builtin/replace.c:550
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr "編輯現存的物件"
-#: builtin/replace.c:551
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr "修改一個提交的父提交"
-#: builtin/replace.c:552
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr "轉換現存的移植檔案"
-#: builtin/replace.c:553
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr "如果存在則取代引用"
-#: builtin/replace.c:555
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr "不要為 --edit 動作美觀顯示內容"
-#: builtin/replace.c:556
+#: builtin/replace.c:555
msgid "use this format"
msgstr "使用此格式"
-#: builtin/replace.c:569
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr "不列出時不能使用 --format"
-#: builtin/replace.c:577
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr "只有寫一個取代時 -f 才有意義"
-#: builtin/replace.c:581
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr "--raw 只有和 --edit 共用才有意義"
-#: builtin/replace.c:587
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr "-d 需要至少一個參數"
-#: builtin/replace.c:593
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr "錯誤的參數個數"
-#: builtin/replace.c:599
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr "-e 需要且僅需要一個參數"
-#: builtin/replace.c:605
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr "-g 需要至少一個參數"
-#: builtin/replace.c:611
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file 不帶參數"
-#: builtin/replace.c:617
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr "只能為 -l 提供一個模式"
@@ -20979,168 +21546,154 @@
msgid "unable to generate diff for '%s'"
msgstr "無法為 '%s' 生成差異"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "git reset [-q] [<樹或提交>] [--] <路徑規格>..."
-#: builtin/reset.c:34
+#: builtin/reset.c:35
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<樹或提交>]"
-#: builtin/reset.c:35
+#: builtin/reset.c:36
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr "git reset --patch [<樹或提交>] [--] [<路徑規格>...]"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "mixed"
msgstr "混雜"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "soft"
msgstr "軟性"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "hard"
msgstr "硬性"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "merge"
msgstr "合併"
-#: builtin/reset.c:41
+#: builtin/reset.c:42
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:83
+#: builtin/reset.c:90
msgid "You do not have a valid HEAD."
msgstr "您沒有一個有效的 HEAD。"
-#: builtin/reset.c:85
+#: builtin/reset.c:92
msgid "Failed to find tree of HEAD."
msgstr "無法找到 HEAD 指向的樹。"
-#: builtin/reset.c:91
+#: builtin/reset.c:98
#, c-format
msgid "Failed to find tree of %s."
msgstr "無法找到 %s 指向的樹。"
-#: builtin/reset.c:116
+#: builtin/reset.c:123
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 現在位於 %s"
# 譯者：漢字之間無空格，故刪除%s前後空格
-#: builtin/reset.c:195
+#: builtin/reset.c:304
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合併過程中不能做%s重設動作。"
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
+#: builtin/stash.c:693
msgid "be quiet, only report errors"
msgstr "安靜模式，只報告錯誤"
-#: builtin/reset.c:297
+#: builtin/reset.c:404
+msgid "skip refreshing the index after reset"
+msgstr "重設後略過重新整理索引的步驟"
+
+#: builtin/reset.c:406
msgid "reset HEAD and index"
msgstr "重設 HEAD 和索引"
-#: builtin/reset.c:298
+#: builtin/reset.c:407
msgid "reset only HEAD"
msgstr "只重設 HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:409 builtin/reset.c:411
msgid "reset HEAD, index and working tree"
msgstr "重設 HEAD、索引和工作區"
-#: builtin/reset.c:304
+#: builtin/reset.c:413
msgid "reset HEAD but keep local changes"
msgstr "重設 HEAD 但儲存本機變更"
-#: builtin/reset.c:310
+#: builtin/reset.c:419
msgid "record only the fact that removed paths will be added later"
msgstr "將刪除的路徑標記為稍後新增"
-#: builtin/reset.c:344
+#: builtin/reset.c:452
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "無法將 '%s' 解析為一個有效的版本。"
-#: builtin/reset.c:352
+#: builtin/reset.c:460
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "無法將 '%s' 解析為一個有效的樹狀物件。"
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch 與 --{hard、mixed、soft} 選項不相容"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:479
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。"
# 譯者：漢字之間無空格，故刪除%s前後空格
-#: builtin/reset.c:373
+#: builtin/reset.c:481
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能帶路徑進行%s重設。"
# 譯者：漢字之間無空格，故刪除%s前後空格
-#: builtin/reset.c:388
+#: builtin/reset.c:496
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能對純版本庫進行%s重設"
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "-N 只能和 --mixed 同時使用"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:527
msgid "Unstaged changes after reset:"
msgstr "重設後取消暫存的變更："
-#: builtin/reset.c:416
+#: builtin/reset.c:530
#, c-format
msgid ""
-"\n"
-"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
-"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
-"to make this the default.\n"
+"It took %.2f seconds to refresh the index after reset. You can use\n"
+"'--no-refresh' to avoid this."
msgstr ""
-"\n"
-"重設後，枚舉未暫存變更花費了 %.2f 秒。 您可以使用 '--quiet' 避免此情況。\n"
-"將設定變數 reset.quiet 設定為 true 可使其成為預設值。\n"
+"重設後花費 %.2f 秒重新整理索引。\n"
+"您可以使用「--no-refresh」避開本步驟。"
-#: builtin/reset.c:434
+#: builtin/reset.c:547
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重設索引檔案至版本 '%s'。"
-#: builtin/reset.c:439
+#: builtin/reset.c:552
msgid "Could not write new index file."
msgstr "不能寫入新的索引檔案。"
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "不能同時使用 --exclude-promisor-objects 和 --missing 選項"
-
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr "物件過濾需要 --objects"
-
-#: builtin/rev-list.c:674
+#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支援顯示註解"
-#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "--objects 不相容標記計數 (marked counting)"
+#: builtin/rev-list.c:664
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "標記計數 (marked counting) 與「%s」不得同時使用"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -21302,15 +21855,19 @@
msgid "preserve initially empty commits"
msgstr "保留初始化的空提交"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "允許提交說明為空"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "保持多餘的、空的提交"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "還原失敗"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "揀選失敗"
@@ -21353,68 +21910,69 @@
msgid_plural "the following files have local modifications:"
msgstr[0] "如下檔案有本機修改："
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "不列出刪除的檔案"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "只從索引區刪除"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "忽略檔案更新狀態檢查"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "允許遞迴刪除"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "即使沒有符合，也以零狀態離開"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "沒有提供路徑規格。我該移除哪個檔案？"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 選項不會遞迴刪除 '%s'"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm：不能刪除 %s"
#: builtin/send-pack.c:20
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<主機>:]<目錄> [<引用>...]\n"
-" --all 和明確的 <引用> 互斥。"
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<主機>:]<目錄> (--all | <引用>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "遠端名稱"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "使用無狀態的 RPC 協定"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "從標準輸入讀取引用"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "列印來自遠端 helper 的狀態"
@@ -21471,27 +22029,28 @@
msgid "group by field"
msgstr "依欄位分組"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:395
msgid "too many arguments given outside repository"
msgstr "版本庫外執行提供了太多的參數"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<何時>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <萬用字元>)...]"
+" [--current] [--color[=<何時>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<版本> | <萬用字元"
+">)...]"
-#: builtin/show-branch.c:17
+#: builtin/show-branch.c:18
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<起始點>]] [--list] [<引用>]"
-#: builtin/show-branch.c:395
+#: builtin/show-branch.c:396
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
@@ -21566,11 +22125,6 @@
msgid "show <n> most recent ref-log entries starting at base"
msgstr "顯示從起始點開始的 <n> 條最近的引用日誌記錄"
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不相容"
-
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "未提供分支，且 HEAD 無效"
@@ -21658,82 +22212,143 @@
msgid "show refs from stdin that aren't in local repository"
msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用"
-#: builtin/sparse-checkout.c:22
+#: builtin/sparse-checkout.c:23
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:46
-msgid "git sparse-checkout list"
-msgstr "git sparse-checkout list"
+#: builtin/sparse-checkout.c:61
+msgid "this worktree is not sparse"
+msgstr "這不是稀疏工作區"
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:76
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:177
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr "「%s」目錄有未追蹤的檔案，但不在稀疏提交的 cone 中"
+
+#: builtin/sparse-checkout.c:185
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "無法移除 '%s' 目錄"
+
+#: builtin/sparse-checkout.c:327
msgid "failed to create directory for sparse-checkout file"
msgstr "無法建立稀疏簽出檔案的目錄"
-#: builtin/sparse-checkout.c:268
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr "無法升級版本庫格式，以致無法啟用 worktreeConfig"
+#: builtin/sparse-checkout.c:366
+msgid "failed to initialize worktree config"
+msgstr "無法初始化工作區組態"
-#: builtin/sparse-checkout.c:270
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "無法設定 extensions.worktreeConfig 設定"
-
-#: builtin/sparse-checkout.c:290
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-
-#: builtin/sparse-checkout.c:310
-msgid "initialize the sparse-checkout in cone mode"
-msgstr "以 cone 模式初始化稀疏簽出"
-
-#: builtin/sparse-checkout.c:312
-msgid "toggle the use of a sparse index"
-msgstr "切換是否使用稀疏索引"
-
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:411
msgid "failed to modify sparse-index config"
msgstr "無法修改稀疏索引設定"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
+#: builtin/sparse-checkout.c:847
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "以 cone 模式初始化稀疏簽出"
+
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
+#: builtin/sparse-checkout.c:849
+msgid "toggle the use of a sparse index"
+msgstr "切換是否使用稀疏索引"
+
+#: builtin/sparse-checkout.c:479
#, c-format
msgid "failed to open '%s'"
msgstr "無法開啟「%s」"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:531
#, c-format
msgid "could not normalize path %s"
msgstr "無法標準化路徑 %s"
-#: builtin/sparse-checkout.c:425
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)"
-
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:560
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "無法去掉 '%s' C 樣式字串的引號"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
msgid "unable to load existing sparse-checkout patterns"
msgstr "無法載入現存的稀疏簽出樣式"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:619
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "現有的稀疏簽出樣式不使用 cone 模式"
+
+#: builtin/sparse-checkout.c:707
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr "請從上層目錄，以非 cone 模式執行"
+
+#: builtin/sparse-checkout.c:712
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr "指定目錄而非模式（沒有前置斜線）"
+
+#: builtin/sparse-checkout.c:714
+msgid ""
+"specify directories rather than patterns. If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr "指定目錄而非模式。若您的目錄是以「!」開頭，請傳入 --skip-checks"
+
+#: builtin/sparse-checkout.c:716
+msgid ""
+"specify directories rather than patterns. If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"指定目錄而非模式。若您的目錄名稱真的包含「*?[]\\」其中一個，請傳入 --skip-"
+"checks"
+
+#: builtin/sparse-checkout.c:732
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr "「%s」不是目錄。若要仍將其視作目錄，請重新傳入 --skip-checks 執行"
+
+#: builtin/sparse-checkout.c:734
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"若您想要單一檔案，請在目錄前打上斜線，如「%s」（見 git-sparse-checkout 手冊"
+"〈NON-CONE PROBLEMS〉一節）。"
+
+#: builtin/sparse-checkout.c:739
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+
+#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr "在可能給出誤判結果的指定目錄，略過某些完整性檢查"
+
+#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
msgid "read patterns from standard in"
msgstr "從標準輸入讀取樣式"
-#: builtin/sparse-checkout.c:588
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:760
+msgid "no sparse-checkout to add to"
+msgstr "沒有要加入之稀疏簽出"
-#: builtin/sparse-checkout.c:607
-msgid "git sparse-checkout disable"
-msgstr "git sparse-checkout disable"
+#: builtin/sparse-checkout.c:775
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:854
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr "必須在稀疏提交才能重新套用稀疏樣式 (sparsity pattern)"
+
+#: builtin/sparse-checkout.c:914
msgid "error while refreshing working directory"
msgstr "重新整理工作目錄時發生錯誤"
@@ -21759,23 +22374,27 @@
#: builtin/stash.c:30
msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <訊息>]\n"
" [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n"
" [--] [<路徑規格>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-" [-u|--include-untracked] [-a|--all] [<消息>]"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<訊息>]"
#: builtin/stash.c:55
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
@@ -21799,6 +22418,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
" [--] [<路徑規格>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<消息>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -21822,7 +22449,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "尚未實作傳入參數的 git stash clear"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -21833,181 +22460,181 @@
" %s -> %s\n"
" 以騰出空間留給追蹤檔案。\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "無法在合併過程套用儲藏"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "無法生成差異 %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "索引中有衝突。請試試看不用 --index。"
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "不能儲存索引樹"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "無法從儲藏條目中復原未追蹤檔案"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "正在合併 %s 和 %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "索引未從儲藏中復原。"
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "無法從儲藏條目中復原未追蹤檔案"
+
+#: builtin/stash.c:608 builtin/stash.c:695
msgid "attempt to recreate the index"
msgstr "嘗試重建索引"
-#: builtin/stash.c:635
+#: builtin/stash.c:641
#, c-format
msgid "Dropped %s (%s)"
msgstr "捨棄了 %s（%s）"
-#: builtin/stash.c:638
+#: builtin/stash.c:644
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s：無法捨棄儲藏條目"
-#: builtin/stash.c:651
+#: builtin/stash.c:657
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一個儲藏引用"
-#: builtin/stash.c:701
+#: builtin/stash.c:707
msgid "The stash entry is kept in case you need it again."
msgstr "儲藏條目被保留以備您再次需要。"
-#: builtin/stash.c:724
+#: builtin/stash.c:730
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:808
+#: builtin/stash.c:809
msgid "failed to parse tree"
msgstr "無法解析樹"
-#: builtin/stash.c:819
+#: builtin/stash.c:820
msgid "failed to unpack trees"
msgstr "無法解包樹"
-#: builtin/stash.c:839
+#: builtin/stash.c:840
msgid "include untracked files in the stash"
msgstr "在儲藏區包含未追蹤檔案"
-#: builtin/stash.c:842
+#: builtin/stash.c:843
msgid "only show untracked files in the stash"
msgstr "只在儲藏區顯示未追蹤檔案"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:930 builtin/stash.c:967
#, c-format
msgid "Cannot update %s with %s"
msgstr "無法用 %2$s 更新 %1$s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
msgid "stash message"
msgstr "儲藏說明"
-#: builtin/stash.c:957
+#: builtin/stash.c:958
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一個 <提交> 參數"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1143
+msgid "No staged changes"
+msgstr "無暫存變更"
+
+#: builtin/stash.c:1204
msgid "No changes selected"
msgstr "沒有選擇變更"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1304
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1331
msgid "Cannot save the current index state"
msgstr "無法儲存目前索引狀態"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1340
msgid "Cannot save the untracked files"
msgstr "無法儲存未追蹤檔案"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1351 builtin/stash.c:1370
msgid "Cannot save the current worktree state"
msgstr "無法儲存目前工作區狀態"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1361
+msgid "Cannot save the current staged state"
+msgstr "無法儲存目前暫存狀態"
+
+#: builtin/stash.c:1398
msgid "Cannot record working tree state"
msgstr "不能記錄工作區狀態"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1447
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1458
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "--staged 和 --include-untracked 或 --all 不得同時使用"
+
+#: builtin/stash.c:1476
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了執行 'git add'？"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1491
msgid "No local changes to save"
msgstr "沒有要儲存的本機修改"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1498
msgid "Cannot initialize stash"
msgstr "無法初始化儲藏"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1513
msgid "Cannot save the current status"
msgstr "無法儲存目前狀態"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1518
#, c-format
msgid "Saved working directory and index state %s"
msgstr "儲存工作目錄和索引狀態 %s"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1615
msgid "Cannot remove worktree changes"
msgstr "無法刪除工作區變更"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1656 builtin/stash.c:1728
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1658 builtin/stash.c:1730
+msgid "stash staged changes only"
+msgstr "只儲藏暫存變更"
+
+#: builtin/stash.c:1660 builtin/stash.c:1732
msgid "stash in patch mode"
msgstr "以修補檔模式儲藏"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1661 builtin/stash.c:1733
msgid "quiet mode"
msgstr "靜默模式"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1663 builtin/stash.c:1735
msgid "include untracked files in stash"
msgstr "儲藏中包含未追蹤檔案"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1665 builtin/stash.c:1737
msgid "include ignore files"
msgstr "包含忽略的檔案"
-#: builtin/stash.c:1700
-msgid ""
-"the stash.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"對 stash.useBuiltin 的支援已被刪除！\n"
-"詳見「git help config」中的條目。"
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
-
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "略過和移除所有的備註行"
@@ -22016,41 +22643,43 @@
msgid "prepend comment character and space to each line"
msgstr "為每一行的行首新增備註符和空格"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一個完整的引用名稱，卻得到 %s"
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr "submodule--helper print-default-remote 不帶參數"
-
-#: builtin/submodule--helper.c:101
+#: builtin/submodule--helper.c:103
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "無法從 url '%s' 剝離一個元件"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:213
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。"
+
+#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
msgid "alternative anchor for relative paths"
msgstr "相對路徑的替代錨記（anchor）"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:418
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
+#: builtin/submodule--helper.c:640
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模組 '%s' 的 url"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:528
#, c-format
msgid "Entering '%s'\n"
msgstr "進入 '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:531
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22059,7 +22688,7 @@
"對 %s 執行 run_command 返回非零值。\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:553
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22069,223 +22698,211 @@
"在遞迴 %s 的子模組執行 run_command 時返回非零值。\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:569
msgid "suppress output of entering each submodule command"
msgstr "隱藏每個子模組進入命令的輸出"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1458
msgid "recurse into nested submodules"
msgstr "遞迴進入嵌套子模組中"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:576
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。"
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:654
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "無法為子模組 '%s' 註冊 url"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:658
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "子模組 '%s'（%s）已對路徑 '%s' 註冊\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:668
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建議子模組 '%s' 使用指令更新模式\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:675
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "無法為子模組 '%s' 註冊更新模式"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:697
msgid "suppress output for initializing a submodule"
msgstr "隱藏初始化子模組的輸出"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:702
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<選項>] [<路徑>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "無法解析子模組 '%s' 的 HEAD 引用"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "遞迴子模組 '%s' 失敗"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
msgid "suppress submodule status output"
msgstr "隱藏子模組的狀態輸出"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:875
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "使用儲存在索引中的提交，而非儲存在子模組 HEAD 中的提交"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路徑>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:977
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodule)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:980
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodule)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:993
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1043
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "無法雜湊來自 '%s' 的物件"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1047
#, c-format
msgid "unexpected mode %o\n"
msgstr "非預期的模式 %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1288
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "使用儲存在索引中的提交而非子模組 HEAD"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1290
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "比較索引中提交與子模組 HEAD 提交的差異"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1292
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "'ignore_config' 值設為 'all' 時略過子模組"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1294
msgid "limit the summary size"
msgstr "限制摘要大小"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1299
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<選項>] [<提交>] [--] [<路徑>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1323
msgid "could not fetch a revision for HEAD"
msgstr "無法取得 HEAD 的版本"
-#: builtin/submodule--helper.c:1342
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached 和 --files 互斥"
-
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1384
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "為 '%s' 同步子模組 url\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1390
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "無法為子模組路徑 '%s' 註冊 url"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1399
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "無法得到子模組 '%s' 的預設遠端關聯"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1409
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "無法為子模組 '%s' 更新遠端關聯"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1456
msgid "suppress output of synchronizing submodule url"
msgstr "隱藏子模組 URL 同步的輸出"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1463
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1513
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
msgstr ""
-"子模組工作區 '%s' 包含一個 .git 目錄（如果您確需刪除它及其全部歷史，使用 'rm "
-"-rf' 指令）"
+"子模組工作區「%s」內有 .git 目錄。使用 absorbgitdirs 會將其替換為 .git 檔案。"
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1530
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr "子模組工作區 '%s' 包含本機修改；使用 '-f' 捨棄它們"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1538
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "已清除目錄 '%s'\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1540
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "無法移除子模組工作區 '%s'\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1551
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "不能建立空的子模組目錄 %s"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1567
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "子模組 '%s'（%s）未對路徑 '%s' 註冊\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1596
msgid "remove submodule working trees even if they contain local changes"
msgstr "即使有本機變更仍移除子模組的工作區"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1597
msgid "unregister all submodules"
msgstr "取消註冊所有子模組"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1602
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1616
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您確定想要對所有子模組執行取消初始化，請使用 '--all'"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1665
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22297,293 +22914,457 @@
"以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n"
"而非 '--reference' 複製。"
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模組 '%s' 不能新增版本庫備選：%s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1749
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1756
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能識別 submodule.alternateLocation 的取值 '%s'"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1781
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1826
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "無法複製 '%s' 到子模組路徑 '%s'"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1831
#, c-format
msgid "directory not empty: '%s'"
msgstr "目錄不是空的：「%s」"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1843
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "無法得到 '%s' 的子模組目錄"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1876
msgid "where the new submodule will be cloned to"
msgstr "新的子模組將要複製的路徑"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1879
msgid "name of the new submodule"
msgstr "新子模組的名稱"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1882
msgid "url where to clone the submodule from"
msgstr "複製子模組的 url 位址"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
msgid "depth for shallow clones"
msgstr "淺複製的深度"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
+#: builtin/submodule--helper.c:3376
msgid "force cloning progress"
msgstr "強制顯示複製進度"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
msgid "disallow cloning into non-empty directory"
msgstr "不允許複製至非空白目錄"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1903
+#| msgid ""
+#| "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+#| "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--"
+#| "filter <filter-spec>]--url <url> --path <path>"
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
msgstr ""
-"git submodule--helper clone [--prefix=<路徑>] [--quiet] [--reference <版本庫"
-">] [--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路"
-"徑>"
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1943
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1947
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模組 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "也許您想要執行 'update --init'？"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略過未合併的子模組 %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略過子模組 '%s'"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2257
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "複製 '%s' 失敗。已排程重試作業"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2268
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次嘗試複製 '%s' 失敗，中止作業"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
-msgid "path into the working tree"
-msgstr "到工作區的路徑"
+#: builtin/submodule--helper.c:2371
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "無法在「%2$s」子模組路徑簽出「%1$s」"
-#: builtin/submodule--helper.c:2347
-msgid "path into the working tree, across nested submodule boundaries"
-msgstr "工作區中的路徑，遞迴嵌套子模組"
+#: builtin/submodule--helper.c:2375
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "無法在「%2$s」子模組路徑重定「%1$s」的基底"
-#: builtin/submodule--helper.c:2351
-msgid "rebase, merge, checkout or none"
-msgstr "rebase、merge、checkout 或 none"
+#: builtin/submodule--helper.c:2379
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "無法在「%2$s」子模組路徑合併「%1$s」"
-#: builtin/submodule--helper.c:2357
-msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr "建立一個縮減至指定版本數的淺複製"
+#: builtin/submodule--helper.c:2383
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "「%s %s」在「%s」子模組路徑執行失敗"
-#: builtin/submodule--helper.c:2360
-msgid "parallel jobs"
-msgstr "並行任務"
+#: builtin/submodule--helper.c:2402
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "子模組路徑「%s」：已簽出「%s」\n"
-#: builtin/submodule--helper.c:2362
-msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "初始複製是否應該遵循建議的淺複製選項"
+#: builtin/submodule--helper.c:2406
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "子模組路徑「%s」：已重定基底至「%s」\n"
-#: builtin/submodule--helper.c:2363
-msgid "don't print cloning progress"
-msgstr "不要輸出複製進度"
+#: builtin/submodule--helper.c:2410
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "子模組路徑「%s」：已在「%s」合併\n"
-#: builtin/submodule--helper.c:2374
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]"
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "子模組路徑「%s」：「%s %s」\n"
-#: builtin/submodule--helper.c:2387
-msgid "bad value for update parameter"
-msgstr "update 參數取值錯誤"
+#: builtin/submodule--helper.c:2438
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr "無法在子模組路徑 「%s」中取得。嘗試直接取得 %s："
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2447
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr "已經取得「%s」子模組路徑，這個路徑卻未包含「%s」。直接取得該提交失敗。"
+
+#: builtin/submodule--helper.c:2481
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "子模組（%s）的分支設定為繼承上級專案的分支，但是上級專案不在任何分支上"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2499
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "無法獲得子模組 '%s' 的版本庫句柄"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2588
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr "無法在子模組路徑「%s」中尋找目前的修訂版本"
+
+#: builtin/submodule--helper.c:2599
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "無法在子模組路徑「%s」中抓取"
+
+#: builtin/submodule--helper.c:2604
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr "無法在子模組路徑「%s」中尋找 %s 修訂版本"
+
+#: builtin/submodule--helper.c:2640
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "無法遞迴子模組路徑「%s」"
+
+#: builtin/submodule--helper.c:2699
+msgid "force checkout updates"
+msgstr "強制簽出更新"
+
+#: builtin/submodule--helper.c:2701
+msgid "initialize uninitialized submodules before update"
+msgstr "在更新前，初始化尚未進行初始化的子模組"
+
+#: builtin/submodule--helper.c:2703
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "使用子模組遠端追蹤分支的 SHA-1"
+
+#: builtin/submodule--helper.c:2705
+msgid "traverse submodules recursively"
+msgstr "遞迴遍歷子模組"
+
+#: builtin/submodule--helper.c:2707
+msgid "don't fetch new objects from the remote site"
+msgstr "不從遠端站台取得新物件"
+
+#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+msgid "path into the working tree"
+msgstr "到工作區的路徑"
+
+#: builtin/submodule--helper.c:2713
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "工作區中的路徑，遞迴嵌套子模組"
+
+#: builtin/submodule--helper.c:2717
+msgid "rebase, merge, checkout or none"
+msgstr "rebase、merge、checkout 或 none"
+
+#: builtin/submodule--helper.c:2723
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "建立一個縮減至指定版本數的淺複製"
+
+#: builtin/submodule--helper.c:2726
+msgid "parallel jobs"
+msgstr "並行任務"
+
+#: builtin/submodule--helper.c:2728
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "初始複製是否應該遵循建議的淺複製選項"
+
+#: builtin/submodule--helper.c:2729
+msgid "don't print cloning progress"
+msgstr "不要輸出複製進度"
+
+#: builtin/submodule--helper.c:2741
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+msgstr ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+
+#: builtin/submodule--helper.c:2767
+msgid "bad value for update parameter"
+msgstr "update 參數取值錯誤"
+
+#: builtin/submodule--helper.c:2893
msgid "recurse into submodules"
msgstr "在子模組中遞迴"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2899
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2955
msgid "check if it is safe to write to the .gitmodules file"
msgstr "檢查寫入 .gitmodules 檔案是否安全"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2958
msgid "unset the config in the .gitmodules file"
msgstr "取消 .gitmodules 檔案中的設定"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <名稱> [<值>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <名稱>"
-#: builtin/submodule--helper.c:2663
-msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper config --check-writeable"
-
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
+#: builtin/submodule--helper.c:3395
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "請確認 .gitmodules 檔案在工作區裡"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:3000
msgid "suppress output for setting url of a submodule"
msgstr "隱藏子模組設定 URL 的輸出"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:3004
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:3037
msgid "set the default tracking branch to master"
msgstr "將預設的追蹤分支設為 master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:3039
msgid "set the default tracking branch"
msgstr "設定預設追蹤分支"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:3043
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:3044
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:3051
msgid "--branch or --default required"
msgstr "需要 --branch 或 --default"
-#: builtin/submodule--helper.c:2752
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch 與 --default 互斥"
+#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+msgid "print only error messages"
+msgstr "只輸出錯誤訊息"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3073
+msgid "force creation"
+msgstr "強制建立"
+
+#: builtin/submodule--helper.c:3081
+msgid "show whether the branch would be created"
+msgstr "顯示分支是否會被建立"
+
+#: builtin/submodule--helper.c:3085
+#| msgid ""
+#| "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+#| "quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+
+#: builtin/submodule--helper.c:3097
+#, c-format
+msgid "creating branch '%s'"
+msgstr "建立分支「%s」"
+
+#: builtin/submodule--helper.c:3155
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "正在將位於 '%s' 的現有版本庫加入至索引\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3158
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "「%s」已存在，且不是有效的 git 版本庫"
-#: builtin/submodule--helper.c:2828
-#, fuzzy, c-format
-#| msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "在本機找到「%s」Git 目錄，與其對應的遠端版本庫："
+#: builtin/submodule--helper.c:3171
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "在本機找到「%s」Git 目錄，與其對應的遠端版本庫：\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3178
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"如果您想要直接使用這個本機 git 目錄，而非重新複製自\n"
" %s\n"
"請使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n"
-"或者說您不確定，請使用 '--name' 選項輸入其他名稱。\n"
+"假如您不太懂意思，請使用 '--name' 選項輸入其他名稱。"
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3190
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3227
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "無法簽出「%s」子模組"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "複製時要簽出的版本庫分支"
+#: builtin/submodule--helper.c:3266
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "無法加入子模組「%s」"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
+#: builtin/submodule--helper.c:3283
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "無法註冊子模組「%s」"
+
+#: builtin/submodule--helper.c:3339
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "「%s」已在索引中"
+
+#: builtin/submodule--helper.c:3342
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "「%s」已在索引中，且不是子模組"
+
+#: builtin/submodule--helper.c:3372
+msgid "branch of repository to add as submodule"
+msgstr "要加入為子模組的版本庫分支"
+
+#: builtin/submodule--helper.c:3373
msgid "allow adding an otherwise ignored submodule path"
msgstr "允許加入忽略的子模組路徑"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<選項>...] --url <URL> --path <路徑> --name "
-"<名稱>"
+#: builtin/submodule--helper.c:3379
+msgid "borrow the objects from reference repositories"
+msgstr "從引用的版本庫借用物件"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3381
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr "將子模組名稱設定為指定字串，而非預設的路徑名稱"
+
+#: builtin/submodule--helper.c:3388
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<選項>] [--] <版本庫> [<路徑>]"
+
+#: builtin/submodule--helper.c:3416
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "只能在工作區的頂級目錄中使用相對路徑"
+
+#: builtin/submodule--helper.c:3425
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "版本庫 URL：「%s」必須是絕對路徑，或開頭是 ./|../"
+
+#: builtin/submodule--helper.c:3460
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "「%s」不是有效的子模組名稱"
+
+#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支援 --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3526
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一個有效的 submodule--helper 子指令"
@@ -22608,52 +23389,52 @@
msgid "shorten ref output"
msgstr "縮短引用輸出"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "原因"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "更新的原因"
-#: builtin/tag.c:25
+#: builtin/tag.c:26
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <檔案>]\n"
-"\t\t<標籤名> [<頭>]"
+" <標籤名> [<head>]"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid "git tag -d <tagname>..."
msgstr "git tag -d <標籤名>..."
-#: builtin/tag.c:28
+#: builtin/tag.c:29
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<數字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
"at <物件>]\n"
-"\t\t[--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
+" [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
-#: builtin/tag.c:30
+#: builtin/tag.c:31
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<格式>] <標籤名>..."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "tag '%s' not found."
msgstr "未發現標籤 '%s'。"
-#: builtin/tag.c:135
+#: builtin/tag.c:136
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已刪除標籤 '%s'（曾為 %s）\n"
-#: builtin/tag.c:170
+#: builtin/tag.c:171
#, c-format
msgid ""
"\n"
@@ -22666,7 +23447,7 @@
" %s\n"
"以 '%c' 開頭的行將被忽略。\n"
-#: builtin/tag.c:174
+#: builtin/tag.c:175
#, c-format
msgid ""
"\n"
@@ -22701,134 +23482,115 @@
msgid "bad object type."
msgstr "壞的物件類型。"
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "無標籤說明？"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "標籤說明被保留在 %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:445
msgid "list tag names"
msgstr "列出標籤名稱"
-#: builtin/tag.c:448
+#: builtin/tag.c:447
msgid "print <n> lines of each tag message"
msgstr "每個標籤訊息列印 <n> 行"
-#: builtin/tag.c:450
+#: builtin/tag.c:449
msgid "delete tags"
msgstr "刪除標籤"
-#: builtin/tag.c:451
+#: builtin/tag.c:450
msgid "verify tags"
msgstr "驗證標籤"
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "Tag creation options"
msgstr "標籤建立選項"
-#: builtin/tag.c:455
+#: builtin/tag.c:454
msgid "annotated tag, needs a message"
msgstr "附註標籤，需要一個說明"
-#: builtin/tag.c:457
+#: builtin/tag.c:456
msgid "tag message"
msgstr "標籤說明"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
msgid "force edit of tag message"
msgstr "強制編輯標籤說明"
-#: builtin/tag.c:460
+#: builtin/tag.c:459
msgid "annotated and GPG-signed tag"
msgstr "附註並附加 GPG 簽名的標籤"
-#: builtin/tag.c:463
+#: builtin/tag.c:462
msgid "use another key to sign the tag"
msgstr "使用另外的私鑰簽名該標籤"
-#: builtin/tag.c:464
+#: builtin/tag.c:463
msgid "replace the tag if exists"
msgstr "如果存在，取代現有的標籤"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:464 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "建立引用日誌"
-#: builtin/tag.c:467
+#: builtin/tag.c:466
msgid "Tag listing options"
msgstr "標籤列表選項"
-#: builtin/tag.c:468
+#: builtin/tag.c:467
msgid "show tag list in columns"
msgstr "以列的方式顯示標籤列表"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that contain the commit"
msgstr "只列印包含該提交的標籤"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:469 builtin/tag.c:471
msgid "print only tags that don't contain the commit"
msgstr "只列印不包含該提交的標籤"
-#: builtin/tag.c:473
+#: builtin/tag.c:472
msgid "print only tags that are merged"
msgstr "只列印已經合併的標籤"
-#: builtin/tag.c:474
+#: builtin/tag.c:473
msgid "print only tags that are not merged"
msgstr "只列印尚未合併的標籤"
-#: builtin/tag.c:478
+#: builtin/tag.c:477
msgid "print only tags of the object"
msgstr "只列印指向該物件的標籤"
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column 和 -n 不相容"
+#: builtin/tag.c:559
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "「%s」選項只能在列表顯示模式使用"
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "-n 選項只允許用在列表顯示模式"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains 選項只允許用在列表顯示模式"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "--no-contains 選項只允許用在列表顯示模式"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "--points-at 選項只允許用在列表顯示模式"
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "--merged 和 --no-merged 選項只允許用在列表顯示模式"
-
-#: builtin/tag.c:567
-msgid "only one -F or -m option is allowed."
-msgstr "只允許一個 -F 或 -m 選項。"
-
-#: builtin/tag.c:592
+#: builtin/tag.c:598
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一個有效的標籤名稱。"
-#: builtin/tag.c:597
+#: builtin/tag.c:603
#, c-format
msgid "tag '%s' already exists"
msgstr "標籤 '%s' 已存在"
-#: builtin/tag.c:628
+#: builtin/tag.c:634
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新標籤 '%s'（曾為 %s）\n"
+#: builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "包超過了最大允許值"
+
#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr "展開物件中"
@@ -22838,207 +23600,202 @@
msgid "failed to create directory %s"
msgstr "建立目錄 %s 失敗"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "建立檔案 %s 失敗"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "刪除檔案 %s 失敗"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "刪除目錄 %s 失敗"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "在 '%s' 中測試 mtime "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "新增一個新檔案後，目錄的狀態訊息未改變"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "新增一個新目錄後，目錄的狀態訊息未改變"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "更新一個檔案後，目錄的狀態訊息被修改"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "在子目錄中新增檔案後，目錄的狀態訊息被修改"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "刪除一個檔案後，目錄的狀態訊息未改變"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "刪除一個目錄後，目錄的狀態訊息未改變"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<選項>] [--] [<檔案>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:993
msgid "continue refresh even when index needs update"
msgstr "當索引需要更新時繼續重新整理"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:996
msgid "refresh: ignore submodules"
msgstr "重新整理：忽略子模組"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:999
msgid "do not ignore new files"
msgstr "不忽略新的檔案"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:1001
msgid "let files replace directories and vice-versa"
msgstr "讓檔案取代目錄（反之亦然）"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1003
msgid "notice files missing from worktree"
msgstr "通知檔案從工作區遺失"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:1005
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引區包含未合併的條目也執行重新整理"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1008
msgid "refresh stat information"
msgstr "重新整理統計訊息"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1012
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "類似於 --refresh，但是忽略 assume-unchanged 設定"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1016
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<物件>,<路徑>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1017
msgid "add the specified entry to the index"
msgstr "新增指定的條目到索引區"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1027
msgid "mark files as \"not changing\""
msgstr "把檔案標記為 \"沒有變更\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1030
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1033
msgid "mark files as \"index-only\""
msgstr "把檔案標記為 \"僅索引\""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1036
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1039
msgid "do not touch index-only entries"
msgstr "不要建立只有索引的項目"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1041
msgid "add to index only; do not add content to object database"
msgstr "只新增到索引區；不新增物件到物件庫"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1043
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作區裡，也刪除路徑"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1045
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "攜帶 --stdin：輸入的行以 null 字元終止"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1047
msgid "read list of paths to be updated from standard input"
msgstr "從標準輸入中讀取需要更新的路徑列表"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1051
msgid "add entries from standard input to the index"
msgstr "從標準輸入新增條目到索引區"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1055
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "為指定檔案重新生成第2和第3暫存區"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1059
msgid "only update entries that differ from HEAD"
msgstr "只更新與 HEAD 不同的條目"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1063
msgid "ignore files missing from worktree"
msgstr "忽略工作區遺失的檔案"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1066
msgid "report actions to standard output"
msgstr "在標準輸出顯示動作"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1068
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘記儲存的未解決的衝突"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1072
msgid "write index in this format"
msgstr "以這種格式寫入索引區"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1074
msgid "enable or disable split index"
msgstr "啟用或停用索引分割"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1076
msgid "enable/disable untracked cache"
msgstr "啟用/停用對未追蹤檔案的快取"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1078
msgid "test if the filesystem supports untracked cache"
msgstr "測試檔案系統是否支援未追蹤檔案快取"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1080
msgid "enable untracked cache without testing the filesystem"
msgstr "無需檢測檔案系統，啟用對未追蹤檔案的快取"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1082
msgid "write out the index even if is not flagged as changed"
msgstr "即使沒有被標記為已更改，也要寫出索引"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1084
msgid "enable or disable file system monitor"
msgstr "啟用或停用檔案系統監控"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1086
msgid "mark files as fsmonitor valid"
msgstr "標記檔案為 fsmonitor 有效"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1089
msgid "clear fsmonitor valid bit"
msgstr "清除 fsmonitor 有效位"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1195
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr "core.splitIndex 被設定為 false。如果您確定要啟用索引分割，請移除或修改"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1204
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr "core.splitIndex 被設定為 true。如果您確定要停用索引分割，請移除或修改"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1216
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23046,11 +23803,11 @@
"core.untrackedCache 被設定為 true。如果您確定要停用未追蹤檔案的快取，請移除或"
"修改"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1220
msgid "Untracked cache disabled"
msgstr "快取未追蹤檔案被停用"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1228
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -23058,25 +23815,25 @@
"core.untrackedCache 被設定為 false。如果您確定要啟用未追蹤檔案快取，請移除或"
"修改"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1232
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "快取未追蹤檔案在 '%s' 啟用"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1241
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "core.fsmonitor 未設定；如果想要啟用 fsmonitor 請設定該選項"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1246
msgid "fsmonitor enabled"
msgstr "fsmonitor 被啟用"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1250
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr "core.fsmonitor 已設定；如果想要停用 fsmonitor 請移除該選項"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1254
msgid "fsmonitor disabled"
msgstr "fsmonitor 被停用"
@@ -23092,26 +23849,22 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<選項>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "刪除引用"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "標準輸入有以 NUL 字元終止的參數"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "從標準輸入讀取更新"
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "從頭開始更新檔案訊息"
@@ -23120,19 +23873,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<選項>] <目錄>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "在一次單獨的請求/回應之後離開"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "在初始的引用廣告後立即離開"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "為 git-http-backend 提供 info/refs"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "如果 <目錄> 不是一個 Git 目錄，不要嘗試 <目錄>/.git/"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "不活動 <n> 秒鐘後終止傳輸"
@@ -23168,213 +23921,219 @@
msgid "print tag contents"
msgstr "列印標籤內容"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<選項>] <路徑> [<提交>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<選項>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<選項>] <路徑>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <工作區> <新路徑>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<選項>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<選項>] <工作區>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [<路徑>...]"
+
+#: builtin/worktree.c:26
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路徑>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "刪除 '%s' 失敗"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:76
#, c-format
msgid "Removing %s/%s: %s"
msgstr "移除 %s/%s: %s"
-#: builtin/worktree.c:147
-msgid "report pruned working trees"
-msgstr "報告清除的工作區"
-
#: builtin/worktree.c:149
+msgid "report pruned working trees"
+msgstr "報告剪除的工作區"
+
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "將早於 <時間> 的工作區過期"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已經存在"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:230
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "無法使用的工作目錄目的地「%s」"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:235
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
-"'%s' 是個遺失但被鎖定的工作區；\n"
-"使用 '%s -f -f' 覆蓋，或 'unlock' 和 'prune' 或 'remove' 清除"
+"「%s」是個遺失但被鎖定的工作區；\n"
+"使用「%s -f -f」覆蓋，或「unlock」和「prune」或「remove」清除"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:237
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use '%s -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-"'%s' 是個遺失但已註冊的工作區；\n"
-"使用 '%s -f' 覆蓋，或 'prune' 或 'remove' 清除"
+"「%s」是個遺失但已註冊的工作區；\n"
+"使用「%s -f」覆蓋，或「prune」或「remove」清除"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:248
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr "無法將「%s」複製到「%s」；稀疏簽出可能無法正常運作"
+
+#: builtin/worktree.c:268
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr "無法將工作區組態從「%s」複製到「%s」"
+
+#: builtin/worktree.c:280 builtin/worktree.c:285
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "無法取消「%2$s」中「%1$s」的設定"
+
+#: builtin/worktree.c:356
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能建立目錄 '%s'"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:378
msgid "initializing"
msgstr "正在初始化"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:492 builtin/worktree.c:498
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "準備工作區（新分支 '%s'）"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:494
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "準備工作區（重設分支 '%s'，之前為 %s）"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:503
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "準備工作區（簽出 '%s'）"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:509
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "準備工作區（分離開頭指標 %s）"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:554
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "簽出 <分支>，即使已經被簽出到其它工作區"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:557
msgid "create a new branch"
msgstr "建立一個新分支"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:559
msgid "create or reset a branch"
msgstr "建立或重設一個分支"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:561
msgid "populate the new working tree"
msgstr "生成新的工作區"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:562
msgid "keep the new working tree locked"
msgstr "鎖定新工作區"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:564 builtin/worktree.c:809
msgid "reason for locking"
msgstr "鎖定原因"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:567
msgid "set up tracking mode (see git-branch(1))"
msgstr "設定追蹤模式（參見 git-branch(1)）"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:570
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "嘗試為新分支名符合一個遠端追蹤分支"
-#: builtin/worktree.c:506
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b、-B 和 --detach 是互斥的"
-
-#: builtin/worktree.c:508
-msgid "--reason requires --lock"
-msgstr "--reason 需要 --lock"
-
-#: builtin/worktree.c:512
+#: builtin/worktree.c:584
msgid "added with --lock"
msgstr "已使用 --lock 加入"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:646
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在建立新分支時使用 --[no-]track 選項"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:766
msgid "show extended annotations and reasons, if available"
msgstr "如果有則顯示延伸的註釋和原因"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:768
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr "對舊於 <時間> 的工作區加上 ‘prunable’ 標示"
-#: builtin/worktree.c:702
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose 和 --porcelain 互斥"
+#: builtin/worktree.c:770
+msgid "terminate records with a NUL character"
+msgstr "以一個 NUL 字元終止記錄"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
+#: builtin/worktree.c:1052
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一個工作區"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:823 builtin/worktree.c:856
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作區無法被加鎖或解鎖"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:828
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被鎖定，原因：%s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:830
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被鎖定"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:858
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被鎖定"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:899
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移動或刪除包含子模組的工作區"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:907
msgid "force move even if worktree is dirty or locked"
msgstr "強制移動，即使工作區是髒的或已鎖定"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:930 builtin/worktree.c:1054
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一個主工作區"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:935
#, c-format
msgid "could not figure out destination name from '%s'"
-msgstr "無法從 '%s' 算出目標名稱"
+msgstr "無法從 '%s' 算出目的地名稱"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:948
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -23383,7 +24142,7 @@
"無法移動一個鎖定的工作區，鎖定原因：%s\n"
"使用 'move -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:950
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -23391,36 +24150,36 @@
"無法移動一個鎖定的工作區，\n"
"使用 'move -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:953
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "驗證失敗，無法移動工作區：%s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:958
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移動 '%s' 到 '%s' 失敗"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:1004
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中執行 'git status' 失敗"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:1008
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:1013
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:1036
msgid "force removal even if worktree is dirty or locked"
msgstr "強制刪除，即使工作區是髒的或已鎖定"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:1059
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -23429,7 +24188,7 @@
"無法刪除一個鎖定的工作區，鎖定原因：%s\n"
"使用 'remove -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:1061
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -23437,17 +24196,17 @@
"無法刪除一個鎖定的工作區，\n"
"使用 'remove -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:1064
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "驗證失敗，無法刪除工作區：%s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1088
#, c-format
msgid "repair: %s: %s"
msgstr "修復：%s：%s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1091
#, c-format
msgid "error: %s: %s"
msgstr "錯誤：%s：%s"
@@ -23498,21 +24257,16 @@
"說明。\n"
"有關系統概述，檢視 'git help git'。"
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "沒有為 --git-dir 提供目錄\n"
+msgid "no directory given for '%s' option\n"
+msgstr "未傳入目錄至「%s」選項\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "沒有為 --namespace 提供命名空間\n"
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "沒有為 --work-tree 提供目錄\n"
-
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
@@ -23528,11 +24282,6 @@
msgid "no config key given for --config-env\n"
msgstr "未傳入設定鍵至 --config-env\n"
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "沒有為 -C 提供目錄\n"
-
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
@@ -23541,7 +24290,7 @@
#: git.c:375
#, c-format
msgid "while expanding alias '%s': '%s'"
-msgstr "在擴展別名 '%s' 時：'%s'"
+msgstr "在展開別名 '%s' 時：'%s'"
#: git.c:384
#, c-format
@@ -23562,29 +24311,29 @@
msgid "recursive alias: %s"
msgstr "遞迴的別名：%s"
-#: git.c:476
+#: git.c:480
msgid "write failure on standard output"
msgstr "在標準輸出寫入失敗"
-#: git.c:478
+#: git.c:482
msgid "unknown write failure on standard output"
msgstr "到標準輸出的未知寫入錯誤"
-#: git.c:480
+#: git.c:484
msgid "close failed on standard output"
msgstr "標準輸出關閉失敗"
-#: git.c:833
+#: git.c:838
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr "檢測到別名循環：'%s'的擴展未終止：%s"
+msgstr "偵測到別名循環：展開後的「%s」無窮無盡：%s"
-#: git.c:883
+#: git.c:888
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作為內建指令處理 %s"
-#: git.c:896
+#: git.c:901
#, c-format
msgid ""
"usage: %s\n"
@@ -23593,33 +24342,25 @@
"用法：%s\n"
"\n"
-#: git.c:916
+#: git.c:921
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n"
-#: git.c:928
+#: git.c:933
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "執行指令 '%s' 失敗：%s\n"
-#: http-fetch.c:118
+#: http-fetch.c:128
#, c-format
msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr "傳入 --packfile 的參數必須是有效的雜湊 (收到 '%s')"
-#: http-fetch.c:128
+#: http-fetch.c:138
msgid "not a git repository"
msgstr "不是一個 git 版本庫"
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile 需要 --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args 只能與 --packfile 一起使用"
-
#: t/helper/test-fast-rebase.c:141
msgid "unhandled options"
msgstr "未處理選項"
@@ -23645,65 +24386,31 @@
msgid "exit immediately after advertising capabilities"
msgstr "對能力廣告之後立即離開"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "通訊端 (socket) 或管道 (pipe) 已在使用：「%s」"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "無法在下述位置啟動伺服器：「%s」"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "無法在背景啟動 (spawn) 守護程式"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid 失敗"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "守護程式尚未上線"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "無法啟動守護程式"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid 被混淆"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "守護程式尚未關閉"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<name>] [<options>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<name>] [<threads>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<name>] [<token>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -23711,83 +24418,79 @@
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "Unix 網域通訊端的名稱或路徑名稱"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "有命名管道的名稱"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "伺服器執行緒集區的執行緒數量"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "要等待守護程式啟動或停止多久（秒）"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "位元組數"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "每個執行緒的請求數"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "位元組"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "穩定 (ballast) 字元"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "代符"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "要傳送至伺服器的命令代符"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer 為負值，預設為 %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "不支援委託控制，因為 cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "不支援 CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "不支援協定限制，因為 cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端："
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr "無法將 SSL 後端設定為 '%s'：組建 cURL 時未加入 SSL 後端"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "無法將 SSL 後端設定為 '%s'：已經設定"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -23798,138 +24501,325 @@
" 請求：%s\n"
" 重定向：%s"
-#: remote-curl.c:183
+#: remote-curl.c:184
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "在 push-option 取值中無效的引號：'%s'"
-#: remote-curl.c:307
+#: remote-curl.c:308
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？"
-#: remote-curl.c:408
+#: remote-curl.c:409
msgid "invalid server response; expected service, got flush packet"
msgstr "無效的服務端回應。預期服務，得到 flush 包"
-#: remote-curl.c:439
+#: remote-curl.c:440
#, c-format
msgid "invalid server response; got '%s'"
msgstr "無效的服務端回應，得到 '%s'"
-#: remote-curl.c:499
+#: remote-curl.c:500
#, c-format
msgid "repository '%s' not found"
msgstr "版本庫 '%s' 未找到"
-#: remote-curl.c:503
+#: remote-curl.c:504
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' 身份驗證失敗"
-#: remote-curl.c:507
+#: remote-curl.c:508
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "無法依 http.pinnedPubkey 之設定存取「%s」：%s"
+
+#: remote-curl.c:512
#, c-format
msgid "unable to access '%s': %s"
msgstr "無法存取 '%s'：%s"
-#: remote-curl.c:513
+#: remote-curl.c:518
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
-#: remote-curl.c:644
+#: remote-curl.c:649
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符"
-#: remote-curl.c:656
+#: remote-curl.c:661
msgid "remote server sent unexpected response end packet"
msgstr "遠端伺服器傳送了非預期的回應結束封包"
-#: remote-curl.c:726
+#: remote-curl.c:730
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer"
-#: remote-curl.c:756
+#: remote-curl.c:759
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: 錯誤的行長度字串：%.4s"
-#: remote-curl.c:758
+#: remote-curl.c:761
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: 非預期的回應結束封包"
-#: remote-curl.c:834
+#: remote-curl.c:837
#, c-format
msgid "RPC failed; %s"
msgstr "RPC 失敗。%s"
-#: remote-curl.c:874
+#: remote-curl.c:877
msgid "cannot handle pushes this big"
msgstr "不能處理這麼大的推送"
-#: remote-curl.c:989
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "不能壓縮請求，zlib 壓縮錯誤 %d"
-#: remote-curl.c:993
+#: remote-curl.c:994
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "不能壓縮請求，zlib 結束錯誤 %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1044
#, c-format
msgid "%d bytes of length header were received"
msgstr "收到了 %d 位元組長度的標頭"
-#: remote-curl.c:1045
+#: remote-curl.c:1046
#, c-format
msgid "%d bytes of body are still expected"
msgstr "預期仍要有 %d 位元組的本文 (body)"
-#: remote-curl.c:1134
+#: remote-curl.c:1135
msgid "dumb http transport does not support shallow capabilities"
msgstr "啞 http 傳輸不支援 shallow 能力"
-#: remote-curl.c:1149
+#: remote-curl.c:1150
msgid "fetch failed."
msgstr "取得失敗。"
-#: remote-curl.c:1195
+#: remote-curl.c:1198
msgid "cannot fetch by sha1 over smart http"
msgstr "無法透過智慧 HTTP 取得 sha1"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1242 remote-curl.c:1248
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1260 remote-curl.c:1378
#, c-format
msgid "http transport does not support %s"
msgstr "http 傳輸協定不支援 %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1296
msgid "git-http-push failed"
msgstr "git-http-push 失敗"
-#: remote-curl.c:1481
+#: remote-curl.c:1485
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1517
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl：錯誤讀取來自 git 的指令流"
-#: remote-curl.c:1520
+#: remote-curl.c:1524
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl：嘗試沒有本機版本庫下取得"
-#: remote-curl.c:1561
+#: remote-curl.c:1565
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl：未知的來自 git 的指令 '%s'"
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "需要工作目錄"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "找不到編列名單的根目錄"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
+#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "無法切換至「%s」"
+
+#: contrib/scalar/scalar.c:179
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "無法設定 %s=%s"
+
+#: contrib/scalar/scalar.c:197
+msgid "could not configure log.excludeDecoration"
+msgstr "無法設定 log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:218
+msgid "Scalar enlistments require a worktree"
+msgstr "純量編列名單需要工作目錄"
+
+#: contrib/scalar/scalar.c:310
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "遠端 HEAD 不是分支：「%.*s」"
+
+#: contrib/scalar/scalar.c:316
+msgid "failed to get default branch name from remote; using local default"
+msgstr "無法從遠端取得預設分支名稱。改用本機預設名稱"
+
+#: contrib/scalar/scalar.c:329
+msgid "failed to get default branch name"
+msgstr "無法取得預設分支名稱"
+
+#: contrib/scalar/scalar.c:340
+msgid "failed to unregister repository"
+msgstr "無法取消註冊版本庫"
+
+#: contrib/scalar/scalar.c:355
+msgid "failed to delete enlistment directory"
+msgstr "無法刪除編列名單目錄"
+
+#: contrib/scalar/scalar.c:375
+msgid "branch to checkout after clone"
+msgstr "複製後要簽出的分支"
+
+#: contrib/scalar/scalar.c:377
+msgid "when cloning, create full working directory"
+msgstr "複製時建立完整的工作目錄"
+
+#: contrib/scalar/scalar.c:379
+msgid "only download metadata for the branch that will be checked out"
+msgstr "只下載會簽出的分支中介資料"
+
+#: contrib/scalar/scalar.c:384
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<options>] [--] <repo> [<dir>]"
+
+#: contrib/scalar/scalar.c:409
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "無法從「%s」推論工作區名稱"
+
+#: contrib/scalar/scalar.c:418
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "「%s」目錄已經存在"
+
+#: contrib/scalar/scalar.c:445
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "無法取得「%s」的預設分支"
+
+#: contrib/scalar/scalar.c:456
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "無法設定「%s」中的遠端"
+
+#: contrib/scalar/scalar.c:465
+#, c-format
+msgid "could not configure '%s'"
+msgstr "無法設定「%s」"
+
+#: contrib/scalar/scalar.c:468
+msgid "partial clone failed; attempting full clone"
+msgstr "部分複製失敗。嘗試完整複製"
+
+#: contrib/scalar/scalar.c:472
+msgid "could not configure for full clone"
+msgstr "無法設定完整複製"
+
+#: contrib/scalar/scalar.c:504
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` 未取引數"
+
+#: contrib/scalar/scalar.c:517
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enlistment>]"
+
+#: contrib/scalar/scalar.c:544
+msgid "reconfigure all registered enlistments"
+msgstr "重新設定所有註冊的編列名單"
+
+#: contrib/scalar/scalar.c:548
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enlistment>]"
+
+#: contrib/scalar/scalar.c:566
+msgid "--all or <enlistment>, but not both"
+msgstr "--all 或 <enlistment> 但不能傳入兩者"
+
+#: contrib/scalar/scalar.c:581
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "git 版本庫在「%s」遺失"
+
+#: contrib/scalar/scalar.c:621
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <task> [<enlistment>]\n"
+"作業：\n"
+
+#: contrib/scalar/scalar.c:639
+#, c-format
+msgid "no such task: '%s'"
+msgstr "無此作業：「%s」"
+
+#: contrib/scalar/scalar.c:689
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+#: contrib/scalar/scalar.c:736
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enlistment>"
+
+#: contrib/scalar/scalar.c:751
+msgid "refusing to delete current working directory"
+msgstr "拒絕刪除目前工作目錄"
+
+#: contrib/scalar/scalar.c:766
+msgid "include Git version"
+msgstr "包含 Git 版本"
+
+#: contrib/scalar/scalar.c:768
+msgid "include Git's build options"
+msgstr "包含 Git 組建選項"
+
+#: contrib/scalar/scalar.c:772
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:813
+msgid "-C requires a <directory>"
+msgstr "-C 需要 <directory>"
+
+#: contrib/scalar/scalar.c:815
+#, c-format
+msgid "could not change to '%s'"
+msgstr "無法更改為「%s」"
+
+#: contrib/scalar/scalar.c:821
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c 需要 <key>=<value> 引數"
+
+#: contrib/scalar/scalar.c:839
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"命令：\n"
+
#: compat/compiler.h:26
msgid "no compiler information available\n"
msgstr "沒有可用的編譯器資訊\n"
@@ -23938,52 +24828,52 @@
msgid "no libc information available\n"
msgstr "沒有可用的 libc 資訊\n"
-#: list-objects-filter-options.h:94
+#: list-objects-filter-options.h:126
msgid "args"
msgstr "參數"
-#: list-objects-filter-options.h:95
+#: list-objects-filter-options.h:127
msgid "object filtering"
msgstr "物件過濾"
-#: parse-options.h:184
+#: parse-options.h:188
msgid "expiry-date"
msgstr "到期時間"
-#: parse-options.h:198
+#: parse-options.h:202
msgid "no-op (backward compatibility)"
msgstr "空動作（向後相容）"
-#: parse-options.h:310
+#: parse-options.h:341
msgid "be more verbose"
msgstr "更加詳細"
-#: parse-options.h:312
+#: parse-options.h:343
msgid "be more quiet"
msgstr "更加安靜"
-#: parse-options.h:318
+#: parse-options.h:349
msgid "use <n> digits to display object names"
msgstr "用 <n> 位數字顯示物件名稱"
-#: parse-options.h:337
+#: parse-options.h:368
msgid "how to strip spaces and #comments from message"
msgstr "設定如何刪除提交說明裡的空格和 #備註"
-#: parse-options.h:338
+#: parse-options.h:369
msgid "read pathspec from file"
msgstr "從檔案讀取 <路徑規格>"
-#: parse-options.h:339
+#: parse-options.h:370
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "key"
msgstr "key"
-#: ref-filter.h:99
+#: ref-filter.h:98
msgid "field name to sort on"
msgstr "排序的欄位名"
@@ -24052,17 +24942,17 @@
msgstr "顯示聯絡人的規範名稱和電子信件"
#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "確保引用名稱格式正確"
+
+#: command-list.h:66
msgid "Switch branches or restore working tree files"
msgstr "切換分支或復原工作區檔案"
-#: command-list.h:66
+#: command-list.h:67
msgid "Copy files from the index to the working tree"
msgstr "從索引複製檔案到工作區"
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "確保引用名稱格式正確"
-
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "尋找尚未套用到上游的提交"
@@ -24224,41 +25114,41 @@
msgstr "顯示 Git 的說明訊息"
#: command-list.h:108
+msgid "Run git hooks"
+msgstr "執行 git 掛鉤"
+
+#: command-list.h:109
msgid "Server side implementation of Git over HTTP"
msgstr "Git HTTP 協定的服務端實現"
-#: command-list.h:109
+#: command-list.h:110
msgid "Download from a remote Git repository via HTTP"
msgstr "通過 HTTP 從遠端 Git 版本庫下載"
-#: command-list.h:110
+#: command-list.h:111
msgid "Push objects over HTTP/DAV to another repository"
msgstr "通過 HTTP/DAV 推送物件另一個版本庫"
-#: command-list.h:111
+#: command-list.h:112
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "從標準輸入將一組修補檔傳送到IMAP資料夾"
-#: command-list.h:112
+#: command-list.h:113
msgid "Build pack index file for an existing packed archive"
msgstr "從一個現存的包存檔檔案建立包索引"
-#: command-list.h:113
+#: command-list.h:114
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "建立一個空的 Git 版本庫或重新初始化一個已存在的版本庫"
-#: command-list.h:114
+#: command-list.h:115
msgid "Instantly browse your working repository in gitweb"
msgstr "在 gitweb 中即時瀏覽您的工作版本庫"
-#: command-list.h:115
+#: command-list.h:116
msgid "Add or parse structured information in commit messages"
msgstr "新增或解析提交說明中的結構化訊息"
-#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Git 版本庫瀏覽器"
-
#: command-list.h:117
msgid "Show commit logs"
msgstr "顯示提交日誌"
@@ -24308,25 +25198,25 @@
msgstr "與 git-merge-index 一起使用的標準嚮導程式"
#: command-list.h:129
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr "執行合併衝突解決工具以解決合併衝突"
-
-#: command-list.h:130
msgid "Show three-way merge without touching index"
msgstr "顯示三路合併而不動索引"
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "寫入和驗證多包索引"
+#: command-list.h:130
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr "執行合併衝突解決工具以解決合併衝突"
-#: command-list.h:132
+#: command-list.h:131
msgid "Creates a tag object with extra validation"
msgstr "建立有額外驗證的標籤物件"
-#: command-list.h:133
+#: command-list.h:132
msgid "Build a tree-object from ls-tree formatted text"
msgstr "基於 ls-tree 的格式化文字建立一個樹狀物件"
+#: command-list.h:133
+msgid "Write and verify multi-pack-indexes"
+msgstr "寫入和驗證多包索引"
+
#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "移動或重新命名一個檔案、目錄或符號連結"
@@ -24362,7 +25252,7 @@
#: command-list.h:142
msgid "Prune all unreachable objects from the object database"
-msgstr "刪除物件庫中所有無法取得物件"
+msgstr "剪除物件庫中所有無法取得的物件"
#: command-list.h:143
msgid "Remove extra objects that are already in pack files"
@@ -24429,17 +25319,17 @@
msgstr "復原工作區檔案"
#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "還原一些現存提交"
-
-#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
msgstr "按時間順序列出提交物件"
-#: command-list.h:161
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "選出並處理參數"
+#: command-list.h:161
+msgid "Revert some existing commits"
+msgstr "還原一些現存提交"
+
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr "從工作區和索引中刪除檔案"
@@ -24453,49 +25343,50 @@
msgstr "使用 Git 協定推送物件到另一個版本庫"
#: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
-msgstr "只允許 Git SSH 存取的受限登入shell"
-
-#: command-list.h:166
-msgid "Summarize 'git log' output"
-msgstr "'git log' 輸出摘要"
-
-#: command-list.h:167
-msgid "Show various types of objects"
-msgstr "顯示各種類型的物件"
-
-#: command-list.h:168
-msgid "Show branches and their commits"
-msgstr "顯示分支和提交"
-
-#: command-list.h:169
-msgid "Show packed archive index"
-msgstr "顯示打包歸檔索引"
-
-#: command-list.h:170
-msgid "List references in a local repository"
-msgstr "顯示本機版本庫中的引用"
-
-#: command-list.h:171
msgid "Git's i18n setup code for shell scripts"
msgstr "為 shell 腳本準備的 Git 國際化設定程式碼"
-#: command-list.h:172
+#: command-list.h:166
msgid "Common Git shell script setup code"
msgstr "常用的 Git shell 腳本設定程式碼"
+#: command-list.h:167
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "只允許 Git SSH 存取的受限登入shell"
+
+#: command-list.h:168
+msgid "Summarize 'git log' output"
+msgstr "'git log' 輸出摘要"
+
+#: command-list.h:169
+msgid "Show various types of objects"
+msgstr "顯示各種類型的物件"
+
+#: command-list.h:170
+msgid "Show branches and their commits"
+msgstr "顯示分支和提交"
+
+#: command-list.h:171
+msgid "Show packed archive index"
+msgstr "顯示打包歸檔索引"
+
+#: command-list.h:172
+msgid "List references in a local repository"
+msgstr "顯示本機版本庫中的引用"
+
+# 譯者：中文字串拼接，可刪除前導空格
#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
-msgstr "初始化並修改稀疏簽出"
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr "將工作區限縮至只包含追蹤檔案的子集"
#: command-list.h:174
-msgid "Stash the changes in a dirty working directory away"
-msgstr "儲藏髒工作區中的修改"
-
-#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "將檔案內容新增到索引"
+#: command-list.h:175
+msgid "Stash the changes in a dirty working directory away"
+msgstr "儲藏髒工作區中的修改"
+
#: command-list.h:176
msgid "Show the working tree status"
msgstr "顯示工作區狀態"
@@ -24569,65 +25460,65 @@
msgstr "檢查標籤的 GPG 簽名"
#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git web 介面（Git 版本庫的 web 前端）"
-
-#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "顯示每一個提交引入的差異日誌"
-#: command-list.h:196
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "管理多個工作區"
-#: command-list.h:197
+#: command-list.h:196
msgid "Create a tree object from the current index"
msgstr "從目前索引建立一個樹狀物件"
-#: command-list.h:198
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "定義路徑的屬性"
-#: command-list.h:199
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Git 指令列介面和約定"
-#: command-list.h:200
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "面向開發人員的 Git 核心教學"
-#: command-list.h:201
+#: command-list.h:200
msgid "Providing usernames and passwords to Git"
msgstr "將使用者名稱及密碼提供給 Git"
-#: command-list.h:202
+#: command-list.h:201
msgid "Git for CVS users"
msgstr "適合 CVS 使用者的 Git 協助"
-#: command-list.h:203
+#: command-list.h:202
msgid "Tweaking diff output"
msgstr "調整差異輸出"
-#: command-list.h:204
+#: command-list.h:203
msgid "A useful minimum set of commands for Everyday Git"
msgstr "每一天 Git 的一組有用的最小指令集合"
-#: command-list.h:205
+#: command-list.h:204
msgid "Frequently asked questions about using Git"
msgstr "Git 使用的常見問題"
-#: command-list.h:206
+#: command-list.h:205
msgid "A Git Glossary"
msgstr "Git 詞彙表"
-#: command-list.h:207
+#: command-list.h:206
msgid "Hooks used by Git"
msgstr "Git 使用的掛鉤"
-#: command-list.h:208
+#: command-list.h:207
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未追蹤檔案"
+#: command-list.h:208
+msgid "The Git repository browser"
+msgstr "Git 版本庫瀏覽器"
+
#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
msgstr "映射作者或提交者的名稱和（或）電子信箱地址"
@@ -24657,52 +25548,21 @@
msgstr "在某個版本庫掛載某個版本庫"
#: command-list.h:216
-msgid "A tutorial introduction to Git: part two"
-msgstr "一個 Git 教學：第二部分"
-
-#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "一個 Git 教學"
+#: command-list.h:217
+msgid "A tutorial introduction to Git: part two"
+msgstr "一個 Git 教學：第二部分"
+
#: command-list.h:218
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git web 介面（Git 版本庫的 web 前端）"
+
+#: command-list.h:219
msgid "An overview of recommended workflows with Git"
msgstr "Git 推薦的工作流概覽"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "二分搜尋執行失敗：沒有提供指令。"
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "執行 $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"二分搜尋執行失敗：\n"
-"指令 '$command' 的離開碼 $res 小於 0 或大於等於 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "二分搜尋不能繼續執行"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"二分搜尋執行失敗：\n"
-"‘bisect-state $state’ 結束，錯誤碼 $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "二分搜尋執行成功"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -24741,488 +25601,44 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "簡單合併未生效，嘗試自動合併。"
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "只能在工作區的頂級目錄中使用相對路徑"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "版本庫 URL：'$repo' 必須是絕對路徑或以 ./|../ 起始"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' 已經存在於索引中"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' 已經存在於索引中且不是一個子模組"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' 沒有簽出的提交"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "無法新增子模組 '$sm_path'"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "無法註冊子模組 '$sm_path'"
-
-#: git-submodule.sh:532
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "無法在子模組路徑 '$displaypath' 中找到目前版本"
-
-#: git-submodule.sh:542
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "無法在子模組路徑 '$sm_path' 中取得"
-
-#: git-submodule.sh:547
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}"
-
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr "無法在子模組路徑 '$displaypath' 中取得，嘗試直接取得 $sha1："
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"取得了子模組路徑 '$displaypath'，但是它沒有包含 $sha1。直接取得該提交失敗。"
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "無法在子模組路徑 '$displaypath' 中簽出 '$sha1'"
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "子模組路徑 '$displaypath'：簽出 '$sha1'"
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "無法在子模組路徑 '$displaypath' 中重定基底 '$sha1'"
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "子模組路徑 '$displaypath'：重定基底至 '$sha1'"
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "無法合併 '$sha1' 到子模組路徑 '$displaypath' 中"
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "子模組路徑 '$displaypath'：已合併入 '$sha1'"
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "在子模組 '$displaypath' 中執行 '$command $sha1' 失敗"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "子模組 '$displaypath'：'$command $sha1'"
-
-#: git-submodule.sh:627
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "無法遞迴進子模組路徑 '$displaypath'"
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "已套用 autostash。"
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "不能儲存 $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"套用 autostash 導致衝突。\n"
-"您的修改安全地儲存在儲藏區中。\n"
-"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "重定基底中（$new_count/$total）"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"指令:\n"
-"p, pick <提交> = 使用提交\n"
-"r, reword <提交> = 使用提交，但修改提交說明\n"
-"e, edit <提交> = 使用提交，但停下來修補\n"
-"s, squash <提交> = 使用提交，但融合到前一個提交\n"
-"f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n"
-"x, exec <命令> = 使用 shell 執行指令（此行剩餘部分）\n"
-"d, drop <提交> = 刪除提交\n"
-"l, label <標籤> = 為目前 HEAD 打上標籤\n"
-"t, reset <標籤> = 重設 HEAD 到該標籤\n"
-"m, merge [-C <提交> | -c <提交>] <標籤> [# <oneline>]\n"
-". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n"
-". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n"
-". -c <提交> 可以編輯提交說明。\n"
-"\n"
-"可以對這些行重新排序，將從上至下執行。\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"您現在可以修補這個提交，使用\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"當您對變更感到滿意，執行\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1：不是一個可以被揀選的提交"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "無效的提交名：$sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "不能寫入目前提交的替代 sha1"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "快轉到 $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "不能快轉到 $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "不能移動 HEAD 到 $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "拒絕壓縮一個合併：$sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "無法重做合併 $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "不能揀選 $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "這是提交說明 #${n}："
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "提交說明 #${n} 將被略過："
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "這是一個 $count 個提交的組合。"
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "不能寫入 $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "這是一個 2 個提交的組合。"
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "不能套用 $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"不能在成功揀選 $sha1... $rest 之後修補提交\n"
-"這通常是因為空的提交說明，或者 pre-commit 掛鉤執行失敗。如果是 pre-commit\n"
-"掛鉤執行失敗，你可能需要在重寫提交說明前解決這個問題。"
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "停止在 $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "沒有父提交的情況下不能 '$squash_style'"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "執行：$rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "執行失敗：$rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "並且修改索引和/或工作區"
-
-# 譯者：請維持前導空格
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"您可以解決這個問題，然後執行\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"執行成功：$rest\n"
-"但是在索引和/或工作區中存在變更。提交或儲藏修改，然後執行\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "未知指令：$command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "要修改請使用指令 'git rebase --edit-todo'。"
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "成功重定基底並更新 $head_name。"
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "不能刪除 CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"您已暫存了工作區的修改。如果這些修改要壓縮到前一個提交，執行：\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"如果這些變更要形成一個新提交，執行：\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"無論哪種情況，當您完成提交，繼續執行：\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "在修補提交中尋找作者訊息時遇到錯誤"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "不能提交暫存的修改。"
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "無法執行編輯器"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "不能簽出 $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "沒有 HEAD？"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "不能建立暫時 $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "不能標記為互動式"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "重定基底 $shortrevisions 到 $shortonto（$todocount 個提交）"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "注意空提交已被備註掉"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "不能對重寫提交進行初始化"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "用法：$dashless $USAGE"
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:182
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "不能切換目錄到 $cdup，工作區的頂級目錄"
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:191 git-sh-setup.sh:198
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "致命錯誤：$program_name 不能在沒有工作區的情況下使用。"
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "不能重定基底：您有未暫存的變更。"
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:212
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "不能重寫分支：您有未暫存的變更。"
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "無法透過重定基底方式拉取：您有未暫存的變更。"
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:215
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "不能 $action：您有未暫存的變更。"
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "不能重定基底：您的索引中包含未提交的變更。"
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "無法透過重定基底方式拉取：您的索引中包含未提交的變更。"
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:226
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "不能 $action：您的索引中包含未提交的變更。"
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:228
msgid "Additionally, your index contains uncommitted changes."
msgstr "而且您的索引中包含未提交的變更。"
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:348
msgid "You need to run this command from the toplevel of the working tree."
msgstr "您需要在工作區的頂級目錄中執行這個指令。"
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:353
msgid "Unable to determine absolute path of git directory"
msgstr "不能確定 git 目錄的絕對路徑"
@@ -25293,7 +25709,7 @@
msgid "failed to open hunk edit file for reading: %s"
msgstr "無法讀取區塊編輯檔案：%s"
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -25307,7 +25723,7 @@
"a - 暫存此區塊和本檔案中後面的全部區塊\n"
"d - 不暫存此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -25321,7 +25737,7 @@
"a - 儲藏此區塊和本檔案中後面的全部區塊\n"
"d - 不儲藏此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -25335,7 +25751,7 @@
"a - 不暫存此區塊和本檔案中後面的全部區塊\n"
"d - 不要不暫存此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -25349,7 +25765,7 @@
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -25363,7 +25779,7 @@
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
"d - 不要捨棄此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -25377,7 +25793,7 @@
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
"d - 不要捨棄此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -25391,7 +25807,7 @@
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -25405,7 +25821,7 @@
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -25418,7 +25834,7 @@
"? - print help\n"
msgstr ""
"g - 選擇跳轉到一個區塊\n"
-"/ - 尋找和提供正規表示式符合的區塊\n"
+"/ - 尋找和提供常規表示式符合的區塊\n"
"j - 維持此區塊未決狀態，檢視下一個未決定區塊\n"
"J - 維持此區塊未決狀態，檢視下一個區塊\n"
"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n"
@@ -25427,88 +25843,88 @@
"e - 手動編輯目前區塊\n"
"? - 顯示說明\n"
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
msgid "The selected hunks do not apply to the index!\n"
msgstr "選取區塊不能套用到索引！\n"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未套用的：%s\n"
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "將刪除變更套用到工作區 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "將新增變更套用到工作區 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "沒有其它可供跳轉的區塊\n"
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "無效數字：'%s'\n"
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "對不起，只有 %d 個可用區塊。\n"
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "沒有其它可供尋找的區塊\n"
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
#, perl-format
msgid "Malformed search regexp %s: %s\n"
-msgstr "錯誤的正規表示式 %s：%s\n"
+msgstr "錯誤的常規表示式 %s：%s\n"
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
msgid "No hunk matches the given pattern\n"
msgstr "沒有和提供模式相符合的區塊\n"
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "沒有上一個區塊\n"
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "沒有下一個區塊\n"
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
msgid "Sorry, cannot split this hunk\n"
msgstr "對不起，不能分割這個區塊\n"
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "分割為 %d 塊。\n"
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "對不起，不能編輯這個區塊\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -25525,56 +25941,56 @@
"diff - 顯示 HEAD 和索引間差異\n"
"add untracked - 新增未追蹤檔案的內容至暫存列表\n"
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
msgid "missing --"
msgstr "缺少 --"
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "未知的 --patch 模式：%s"
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "無效的參數 %s，期望是 --"
-#: git-send-email.perl:129
+#: git-send-email.perl:159
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "本機時間和 GMT 有不到一分鐘間隔\n"
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "本機時間位移量大於等於 24 小時\n"
-#: git-send-email.perl:214
+#: git-send-email.perl:244
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr "致命錯誤：命令「%s」中止，結束碼：%d"
-#: git-send-email.perl:227
+#: git-send-email.perl:257
msgid "the editor exited uncleanly, aborting everything"
msgstr "編輯器非正常離開，終止所有動作"
-#: git-send-email.perl:316
+#: git-send-email.perl:346
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' 包含您正在編寫的一個中間版本的信件。\n"
-#: git-send-email.perl:321
+#: git-send-email.perl:351
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' 包含編輯的信件。\n"
-#: git-send-email.perl:450
+#: git-send-email.perl:484
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases 和其它選項不相容\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:561
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -25584,47 +26000,47 @@
"git-send-email 已經以 sendemail.* 選項設定 - 注意裡面的 'e'。\n"
"請將 sendemail.forbidSendmailVariables 設為 false 停用此檢查。\n"
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "不能在版本庫之外執行 git format-patch\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:569
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr "`batch-size` 和 `relogin` 必須同時定義（透過指令列或者設定選項）\n"
-#: git-send-email.perl:546
+#: git-send-email.perl:582
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "未知的 --suppress-cc 欄位：'%s'\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:613
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "未知的 --confirm 設定：'%s'\n"
-#: git-send-email.perl:617
+#: git-send-email.perl:653
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "警告：不支援帶引號的 sendmail 別名：%s\n"
-#: git-send-email.perl:619
+#: git-send-email.perl:655
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "警告：不支援 `:include:`：%s\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:657
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "警告：不支援 `/file` 或 `|pipe` 重定向：%s\n"
-#: git-send-email.perl:626
+#: git-send-email.perl:662
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "警告：不能識別的 sendmail 行：%s\n"
-#: git-send-email.perl:711
+#: git-send-email.perl:747
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -25639,12 +26055,12 @@
" * 如果含義為一個檔案，使用 \"./%s\"，或者\n"
" * 如果含義為一個範圍，使用 --format-patch 選項。\n"
-#: git-send-email.perl:732
+#: git-send-email.perl:768
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "無法開啟目錄 %s: %s"
-#: git-send-email.perl:767
+#: git-send-email.perl:803
msgid ""
"\n"
"No patch files specified!\n"
@@ -25654,17 +26070,17 @@
"未指定修補檔案！\n"
"\n"
-#: git-send-email.perl:780
+#: git-send-email.perl:816
#, perl-format
msgid "No subject line in %s?"
msgstr "在 %s 中沒有標題行？"
-#: git-send-email.perl:791
+#: git-send-email.perl:827
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "為寫入開啟 %s 失敗: %s"
-#: git-send-email.perl:802
+#: git-send-email.perl:838
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -25677,37 +26093,37 @@
"\n"
"如果您不想傳送摘要，清除內容。\n"
-#: git-send-email.perl:826
+#: git-send-email.perl:862
#, perl-format
msgid "Failed to open %s: %s"
msgstr "無法開啟 %s: %s"
-#: git-send-email.perl:843
+#: git-send-email.perl:879
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "無法開啟 %s.final: %s"
-#: git-send-email.perl:886
+#: git-send-email.perl:922
msgid "Summary email is empty, skipping it\n"
msgstr "摘要信件為空，略過\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "您是否要使用 <%s> [y/N]？ "
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr "如下檔案含 8bit 內容，但沒有聲明一個 Content-Transfer-Encoding。\n"
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "要宣告 8bit 為什麼樣的編碼格式 [UTF-8]？ "
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -25719,20 +26135,20 @@
"\t%s\n"
"包含範本標題 '*** SUBJECT HERE ***'。如果確定想要傳送，使用參數 --force。\n"
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
msgid "To whom should the emails be sent (if anyone)?"
msgstr "信件將要傳送給誰？"
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
-msgstr "致命錯誤：別名 '%s' 擴展為它自己\n"
+msgstr "致命錯誤：別名 '%s' 展開後還是自己\n"
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr "（如果有）Message-ID 是否要被用作第一封信件的 In-Reply-To ？ "
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n"
@@ -25740,16 +26156,16 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1126
+#: git-send-email.perl:1162
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
-msgstr "如何處理這個位址？([q]uit|[d]rop|[e]dit)："
+msgstr "如何處理這個位址？([q]uit|[d]rop|[e]dit)： "
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA 路徑 \"%s\" 不存在"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -25762,140 +26178,140 @@
" run 'git config --global sendemail.confirm auto'.\n"
"\n"
msgstr ""
-" 以上的抄送列表（Cc）已經用修補檔提交說明中發現的位址進行\n"
-" 了擴展。預設 send-email 會給出提示。這個行為可以透過\n"
+" 以上的 CC 清單已經用修補檔提交說明中發現的位址進行展開。\n"
+" 預設 send-email 會給出提示。這個行為可以透過\n"
" sendemail.confirm 設定設定。\n"
"\n"
-" 更多訊息，執行 'git send-email --help'。\n"
-" 要保持目前行為，但不顯示此訊息，執行 'git config --global\n"
+" 更多資訊，請執行 'git send-email --help'。\n"
+" 要保持目前行為，但不顯示此訊息，請執行 'git config --global\n"
" sendemail.confirm auto'。\n"
"\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "傳送這封信件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
msgid "Send this email reply required"
msgstr "傳送要求的信件回復"
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
msgid "The required SMTP server is not properly defined."
msgstr "要求的 SMTP 伺服器未被正確定義。"
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "伺服器不支援 STARTTLS！%s"
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS 失敗！%s"
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr "無法正確地初始化 SMTP。檢查設定並使用 --smtp-debug。"
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
#, perl-format
msgid "Failed to send %s\n"
msgstr "無法傳送 %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "測試執行傳送 %s\n"
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
#, perl-format
msgid "Sent %s\n"
msgstr "正傳送 %s\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "Dry-OK. Log says:\n"
msgstr "測試執行成功。日誌說：\n"
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
msgid "OK. Log says:\n"
msgstr "OK。日誌說：\n"
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
msgid "Result: "
-msgstr "結果："
+msgstr "結果： "
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
msgid "Result: OK\n"
msgstr "結果：OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1744
#, perl-format
msgid "can't open file %s"
msgstr "無法開啟檔案 %s"
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) 新增 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) 新增 to：%s 自行 '%s'\n"
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) 新增 cc: %s 自行 '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:2009
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能執行 '%s'"
-#: git-send-email.perl:1972
+#: git-send-email.perl:2016
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) 新增 %s: %s 自：'%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:2020
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) 無法關閉管道至 '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2050
msgid "cannot send message as 7bit"
msgstr "不能以 7bit 形式傳送訊息"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2058
msgid "invalid transfer encoding"
msgstr "無效的傳送編碼"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2100
#, perl-format
msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
+"fatal: %s: rejected by %s hook\n"
"%s\n"
"warning: no patches were sent\n"
msgstr ""
-"致命錯誤：%s：被 sendemail-validate 掛鈎拒絕\n"
+"致命錯誤：%s：被 %s 掛鈎拒絕\n"
"%s\n"
"警告：修補檔未能傳送\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "不能開啟 %s：%s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2113
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -25904,16 +26320,1096 @@
"致命錯誤：%s:%d 的字元數超過 998\n"
"警告：修補檔未能傳送\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2131
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "略過 %s 含備份後綴 '%s'。\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2135
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
-msgstr "您真的要傳送 %s？[y|N]："
+msgstr "您真的要傳送 %s？[y|N]： "
+
+#, perl-format
+#~ msgid "fatal: %s: rejected by %s hook\n"
+#~ msgstr "致命錯誤：%s：被 %s 掛勾拒絕\n"
+
+#~ msgid "git archive --list"
+#~ msgstr "git archive --list"
+
+#, c-format
+#~ msgid "unknown value for --diff-merges: %s"
+#~ msgstr "--diff-merges 的值無效：%s"
+
+#, c-format
+#~ msgid "invalid value '%s' for lsrefs.unborn"
+#~ msgstr "lsrefs.unborn 的值「%s」無效"
+
+#~ msgid "backend for `git stash -p`"
+#~ msgstr "`git stash -p` 的後端"
+
+#, c-format
+#~ msgid "Invalid value for --empty: %s"
+#~ msgstr "傳入 --empty 的值無效：%s"
+
+#, c-format
+#~ msgid "Invalid value for --patch-format: %s"
+#~ msgstr "無效的 --patch-format 值：%s"
+
+#, c-format
+#~ msgid "Invalid value for --show-current-patch: %s"
+#~ msgstr "無效的 --show-current-patch 值：%s"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad "
+#~ "| --term-new]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad "
+#~ "| --term-new]"
+
+#~ msgid "git bisect--helper --bisect-next"
+#~ msgstr "git bisect--helper --bisect-next"
+
+#~ msgid "git bisect--helper --bisect-visualize"
+#~ msgstr "git bisect--helper --bisect-visualize"
+
+#, c-format
+#~ msgid "invalid color '%s' in color.blame.repeatedLines"
+#~ msgstr "設定 color.blame.repeatedLines 中的無效顏色 '%s'"
+
+#~ msgid "invalid value for blame.coloring"
+#~ msgstr "設定 blame.coloring 中的無效取值"
+
+#~ msgid ""
+#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e "
+#~ "| -p | <type> | --textconv | --filters) [--path=<path>] <object>"
+#~ msgstr ""
+#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e "
+#~ "| -p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"
+
+#~ msgid "show object type"
+#~ msgstr "顯示物件類型"
+
+#~ msgid "exit with zero when there's no error"
+#~ msgstr "當沒有錯誤時離開並返回零"
+
+#~ msgid "show info and content of objects fed from the standard input"
+#~ msgstr "顯示從標準輸入提供的物件的訊息和內容"
+
+#~ msgid "show info about objects fed from the standard input"
+#~ msgstr "顯示從標準輸入提供的物件的訊息"
+
+#~ msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#~ msgstr "跟隨樹內符號連結（和 --batch 或 --batch-check 共用）"
+
+#~ msgid "show all objects with --batch or --batch-check"
+#~ msgstr "使用 --batch 或 --batch-check 參數顯示所有物件"
+
+#~ msgid "do not order --batch-all-objects output"
+#~ msgstr "不要對 --batch-all-objects 的輸出排序"
+
+#~ msgid "set up tracking mode (see git-pull(1))"
+#~ msgstr "設定追蹤模式（參見 git-pull(1)）"
+
+#~ msgid "Using both --reset-author and --author does not make sense"
+#~ msgstr "同時使用 --reset-author 和 --author 沒有意義"
+
+#~ msgid "Options --squash and --fixup cannot be used together"
+#~ msgstr "選項 --squash 和 --fixup 不能同時使用"
+
+#~ msgid "Only one of -c/-C/-F/--fixup can be used."
+#~ msgstr "只能用一個 -c/-C/-F/--fixup 選項。"
+
+#~ msgid "Option -m cannot be combined with -c/-C/-F."
+#~ msgstr "選項 -m 不能和 -c/-C/-F 同時使用。"
+
+#~ msgid ""
+#~ "Only one of --include/--only/--all/--interactive/--patch can be used."
+#~ msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。"
+
+#~ msgid "git count-objects [-v] [-H | --human-readable]"
+#~ msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#, c-format
+#~ msgid "configuration fetch.output contains invalid value %s"
+#~ msgstr "設定變數 fetch.output 包含無效值 %s"
+
+#~ msgid "--cached or --untracked cannot be used with --no-index"
+#~ msgstr "--cached 或 --untracked 不能與 --no-index 同時使用"
+
+#~ msgid "--untracked cannot be used with --cached"
+#~ msgstr "--untracked 不能與 --cached 一起使用"
+
+#~ msgid "git hash-object --stdin-paths"
+#~ msgstr "git hash-object --stdin-paths"
+
+#~ msgid "git help [-g|--guides]"
+#~ msgstr "git help [-g|--guides]"
+
+#~ msgid "git help [-c|--config]"
+#~ msgstr "git help [-c|--config]"
+
+#~ msgid "git mktag"
+#~ msgstr "git mktag"
+
+#~ msgid "git mktree [-z] [--missing] [--batch]"
+#~ msgstr "git mktree [-z] [--missing] [--batch]"
+
+#~ msgid "read from stdin"
+#~ msgstr "從標準輸入讀取"
+
+#~ msgid "git notes merge --commit [-v | -q]"
+#~ msgstr "git notes merge --commit [-v | -q]"
+
+#~ msgid "git notes merge --abort [-v | -q]"
+#~ msgstr "git notes merge --abort [-v | -q]"
+
+#~ msgid "git notes get-ref"
+#~ msgstr "git notes get-ref"
+
+#~ msgid "invalid value for --missing"
+#~ msgstr "選項 --missing 的值無效"
+
+#~ msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#~ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#, c-format
+#~ msgid "Invalid value for %s: %s"
+#~ msgstr "%s 的值無效：%s"
+
+#, c-format
+#~ msgid "Invalid value for pull.ff: %s"
+#~ msgstr "pull.ff 的取值無效：%s"
+
+#~ msgid "git rebase --continue | --abort | --skip | --edit-todo"
+#~ msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+
+#, c-format
+#~ msgid "'%s' is not a valid timestamp"
+#~ msgstr "'%s' 不是一個有效的時間戳"
+
+#~ msgid "git reflog [ show | expire | delete | exists ]"
+#~ msgstr "git reflog [ show | expire | delete | exists ]"
+
+#~ msgid "git remote [-v | --verbose]"
+#~ msgstr "git remote [-v | --verbose]"
+
+#~ msgid "git replace [-f] --convert-graft-file"
+#~ msgstr "git replace [-f] --convert-graft-file"
+
+#, c-format
+#~ msgid ""
+#~ "\n"
+#~ "It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+#~ "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+#~ "to make this the default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "重設後，枚舉未暫存變更花費了 %.2f 秒。 您可以使用 '--quiet' 避免此情況。\n"
+#~ "將設定變數 reset.quiet 設定為 true 可使其成為預設值。\n"
+
+#~ msgid "git sparse-checkout list"
+#~ msgstr "git sparse-checkout list"
+
+#~ msgid "unable to upgrade repository format to enable worktreeConfig"
+#~ msgstr "無法升級版本庫格式，以致無法啟用 worktreeConfig"
+
+#~ msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+#~ msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#~ msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+#~ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#~ msgid "git sparse-checkout disable"
+#~ msgstr "git sparse-checkout disable"
+
+#~ 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」中的條目。"
+
+#~ msgid "git stripspace [-s | --strip-comments]"
+#~ msgstr "git stripspace [-s | --strip-comments]"
+
+#~ msgid "git stripspace [-c | --comment-lines]"
+#~ msgstr "git stripspace [-c | --comment-lines]"
+
+#~ msgid "submodule--helper print-default-remote takes no arguments"
+#~ msgstr "submodule--helper print-default-remote 不帶參數"
+
+#~ msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+#~ msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]"
+
+#~ msgid "suppress output for update by rebase or merge"
+#~ msgstr "隱藏 rebase 或 merge 觸發之更新的輸出"
+
+#~ msgid "overrides update mode in case the repository is a fresh clone"
+#~ msgstr "如果版本庫是剛複製的，就覆蓋更新模式"
+
+#~ msgid "depth for shallow fetch"
+#~ msgstr "淺 fetch 的深度"
+
+#~ msgid "sha1"
+#~ msgstr "sha1"
+
+#~ msgid "SHA1 expected by superproject"
+#~ msgstr "上層專案預期應是 SHA1"
+
+#~ msgid "subsha1"
+#~ msgstr "subsha1"
+
+#~ msgid "SHA1 of submodule's HEAD"
+#~ msgstr "子模組 HEAD 的 SHA1"
+
+#~ msgid "git submodule--helper run-update-procedure [<options>] <path>"
+#~ msgstr "git submodule--helper run-update-procedure [<選項>] [<路徑>]"
+
+#~ msgid "git submodule--helper config --check-writeable"
+#~ msgstr "git submodule--helper config --check-writeable"
+
+#~ msgid "git update-server-info [--force]"
+#~ msgstr "git update-server-info [--force]"
+
+#~ msgid "Initialize and modify the sparse-checkout"
+#~ msgstr "初始化並修改稀疏簽出"
+
+#, sh-format
+#~ msgid ""
+#~ "Unable to find current ${remote_name}/${branch} revision in submodule "
+#~ "path '$sm_path'"
+#~ msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}"
+
+#, sh-format
+#~ msgid "Failed to recurse into submodule path '$displaypath'"
+#~ msgstr "無法遞迴進子模組路徑 '$displaypath'"
+
+#~ msgid "--index outside a repository"
+#~ msgstr "--index 在版本庫之外"
+
+#~ msgid "--cached outside a repository"
+#~ msgstr "--cached 在版本庫之外"
+
+#~ msgid "unrecognized input"
+#~ msgstr "無法識別的輸入"
+
+#, c-format
+#~ msgid "cannot read %s"
+#~ msgstr "不能讀取 %s"
+
+#~ msgid "Option --exec can only be used together with --remote"
+#~ msgstr "選項 --exec 只能和 --remote 同時使用"
+
+#, c-format
+#~ msgid ""
+#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+#~ msgstr "分支 '%1$s' 設定為使用重定基底來追蹤來自 '%3$s' 的遠端分支 '%2$s'。"
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+#~ msgstr "分支 '%1$s' 設定為追蹤來自 '%3$s' 的遠端分支 '%2$s'。"
+
+#, c-format
+#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+#~ msgstr "分支 '%s' 設定為使用重定基底來追蹤本機分支 '%s'。"
+
+#, c-format
+#~ msgid "Branch '%s' set up to track local branch '%s'."
+#~ msgstr "分支 '%s' 設定為追蹤本機分支 '%s'。"
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#~ msgstr "分支 '%s' 設定為使用重定基底來追蹤遠端引用 '%s'。"
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote ref '%s'."
+#~ msgstr "分支 '%s' 設定為追蹤遠端引用 '%s'。"
+
+#~ msgid "Cannot force update the current branch."
+#~ msgstr "無法強制更新目前分支。"
+
+#, c-format
+#~ msgid "Not a valid object name: '%s'."
+#~ msgstr "不是一個有效的物件名：'%s'。"
+
+#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#~ msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
+
+#~ msgid "-G, -S and --find-object are mutually exclusive"
+#~ msgstr "-G、-S 和 --find-object 是互斥的"
+
+#~ msgid ""
+#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#~ msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex 搭配 -S"
+
+#~ msgid ""
+#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+#~ "with -G and -S"
+#~ msgstr ""
+#~ "--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all 搭配 -G 和 -S"
+
+#~ msgid "--stateless-rpc requires multi_ack_detailed"
+#~ msgstr "--stateless-rpc 需要 multi_ack_detailed"
+
+#~ msgid "--left-only and --right-only are mutually exclusive"
+#~ msgstr "--left-only 和 --right-only 互斥"
+
+#, c-format
+#~ msgid "unrecognized %%(objectsize) argument: %s"
+#~ msgstr "無法識別的 %%(objectsize) 參數：%s"
+
+#, c-format
+#~ msgid "unrecognized %%(subject) argument: %s"
+#~ msgstr "無法識別的 %%(subject) 引數：%s"
+
+#, c-format
+#~ msgid "unrecognized %%(contents) argument: %s"
+#~ msgstr "無法識別的 %%(contents) 參數：%s"
+
+#, c-format
+#~ msgid "unrecognized %%(raw) argument: %s"
+#~ msgstr "無法識別的 %%(raw) 引數：%s"
+
+#, c-format
+#~ msgid "unrecognized argument '%s' in %%(%s)"
+#~ msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數"
+
+#, c-format
+#~ msgid "unrecognized %%(align) argument: %s"
+#~ msgstr "無法識別的 %%(align) 參數：%s"
+
+#, c-format
+#~ msgid "unrecognized %%(if) argument: %s"
+#~ msgstr "無法識別的 %%(if) 參數：%s"
+
+#, c-format
+#~ msgid "format: %%(if) atom used without a %%(then) atom"
+#~ msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素"
+
+#, c-format
+#~ msgid "format: %%(then) atom used without an %%(if) atom"
+#~ msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素"
+
+#, c-format
+#~ msgid "format: %%(else) atom used without a %%(then) atom"
+#~ msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素"
+
+#~ msgid "--unsorted-input is incompatible with --no-walk"
+#~ msgstr "--unsorted-input 與 --no-walk 不相容"
+
+#~ msgid "--no-walk is incompatible with --unsorted-input"
+#~ msgstr "--no-walk 與 --unsorted-input 不相容"
+
+#~ msgid "--dry-run is incompatible with --interactive/--patch"
+#~ msgstr "--dry-run 和 --interactive/--patch 不相容"
+
+#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+#~ msgstr "--pathspec-from-file 與 --interactive/--patch 不相容"
+
+#~ msgid "--pathspec-from-file is incompatible with --edit"
+#~ msgstr "--pathspec-from-file 與 --edit 不相容"
+
+#~ msgid "-A and -u are mutually incompatible"
+#~ msgstr "-A 和 -u 選項互斥"
+
+#~ msgid "Option --ignore-missing can only be used together with --dry-run"
+#~ msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用"
+
+#~ msgid "--pathspec-from-file is incompatible with pathspec arguments"
+#~ msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容"
+
+#~ msgid "--pathspec-file-nul requires --pathspec-from-file"
+#~ msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
+
+#, c-format
+#~ msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+#~ msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容"
+
+#~ msgid "--column and --verbose are incompatible"
+#~ msgstr "--column 和 --verbose 不相容"
+
+#, c-format
+#~ msgid "'%s' cannot be used with %s"
+#~ msgstr "'%s' 不能和 %s 同時使用"
+
+#~ msgid "set upstream info for new branch"
+#~ msgstr "為新的分支設定上游訊息"
+
+#, c-format
+#~ msgid "-%c, -%c and --orphan are mutually exclusive"
+#~ msgstr "-%c、-%c 和 --orphan 是互斥的"
+
+#~ msgid "-p and --overlay are mutually exclusive"
+#~ msgstr "-p 和 --overlay 互斥"
+
+#~ msgid "--pathspec-from-file is incompatible with --detach"
+#~ msgstr "--pathspec-from-file 與 --detach 不相容"
+
+#~ msgid "--pathspec-from-file is incompatible with --patch"
+#~ msgstr "--pathspec-from-file 與 --patch 不相容"
+
+#, c-format
+#~ msgid "--bare and --origin %s options are incompatible."
+#~ msgstr "--bare 和 --origin %s 選項不相容。"
+
+#~ msgid "--bare and --separate-git-dir are incompatible."
+#~ msgstr "--bare 和 --separate-git-dir 選項不相容。"
+
+#~ msgid "--pathspec-from-file with -a does not make sense"
+#~ msgstr "--pathspec-from-file 和 -a 同時使用沒有意義"
+
+#, c-format
+#~ msgid "cannot combine -m with --fixup:%s"
+#~ msgstr "-m 和 --fixup:%s 不可結合使用"
+
+#~ msgid "--long and -z are incompatible"
+#~ msgstr "--long 和 -z 選項不相容"
+
+#, c-format
+#~ msgid "cannot combine reword option of --fixup with path '%s'"
+#~ msgstr "不能將「%s」路徑與 --fixup 的 reword 選項結合"
+
+#~ msgid ""
+#~ "reword option of --fixup is mutually exclusive with --patch/--"
+#~ "interactive/--all/--include/--only"
+#~ msgstr ""
+#~ "--fixup 的 reword 選項與 --patch/--interactive/--all/--include/--only 互斥"
+
+#~ msgid "--long is incompatible with --abbrev=0"
+#~ msgstr "--long 與 --abbrev=0 不相容"
+
+#~ msgid "--dirty is incompatible with commit-ishes"
+#~ msgstr "--dirty 與提交號不相容"
+
+#~ msgid "--broken is incompatible with commit-ishes"
+#~ msgstr "--broken 與提交號不相容"
+
+#~ msgid "--stdin and --merge-base are mutually exclusive"
+#~ msgstr "--stdin 和 --merge-base 互斥"
+
+#~ msgid "--dir-diff is incompatible with --no-index"
+#~ msgstr "--dir-diff 和 --no-index 不相容"
+
+#~ msgid "--gui, --tool and --extcmd are mutually exclusive"
+#~ msgstr "--gui、--tool 和 --extcmd 互斥"
+
+#~ msgid "--anonymize-map without --anonymize does not make sense"
+#~ msgstr "缺少 --anonymize 的 --anonymize-map 沒有意義"
+
+#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+#~ msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists"
+
+#, c-format
+#~ msgid "Refusing to fetch into current branch %s of non-bare repository"
+#~ msgstr "拒絕取得到非純版本庫的目前分支 %s"
+
+#~ msgid "--deepen and --depth are mutually exclusive"
+#~ msgstr "--deepen 和 --depth 是互斥的"
+
+#~ msgid "--depth and --unshallow cannot be used together"
+#~ msgstr "--depth 和 --unshallow 不能同時使用"
+
+#~ msgid "--fix-thin cannot be used without --stdin"
+#~ msgstr "--fix-thin 不能和 --stdin 同時使用"
+
+#~ msgid "--object-format cannot be used with --stdin"
+#~ msgstr "--object-format 不能和 --stdin 同時使用"
+
+#~ msgid "--separate-git-dir and --bare are mutually exclusive"
+#~ msgstr "--separate-git-dir 和 --bare 互斥"
+
+#~ msgid "-n and -k are mutually exclusive"
+#~ msgstr "-n 和 -k 互斥"
+
+#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+#~ msgstr "--subject-prefix/--rfc 和 -k 互斥"
+
+#~ msgid "--stdout, --output, and --output-directory are mutually exclusive"
+#~ msgstr "--stdout、--output 和 --output-directory 互斥"
+
+#~ msgid "--creation-factor requires --range-diff"
+#~ msgstr "--creation-factor 需要 --range-diff"
+
+#~ msgid "You cannot combine --squash with --no-ff."
+#~ msgstr "您不能將 --squash 和 --no-ff 組合使用。"
+
+#~ msgid "You cannot combine --squash with --commit."
+#~ msgstr "您不能將 --squash 和 --commit 組合使用。"
+
+#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+#~ msgstr "--keep-unreachable 和 --unpack-unreachable 不相容"
+
+#~ msgid "--delete is incompatible with --all, --mirror and --tags"
+#~ msgstr "--delete 與 --all、--mirror 及 --tags 不相容"
+
+#~ msgid "--all and --tags are incompatible"
+#~ msgstr "--all 和 --tags 不相容"
+
+#~ msgid "--mirror and --tags are incompatible"
+#~ msgstr "--mirror 和 --tags 不相容"
+
+#~ msgid "--all and --mirror are incompatible"
+#~ msgstr "--all 和 --mirror 不相容"
+
+#~ msgid "cannot combine '--keep-base' with '--onto'"
+#~ msgstr "不能將 '--keep-base' 和 '--onto' 組合使用"
+
+#~ msgid "cannot combine '--keep-base' with '--root'"
+#~ msgstr "不能將 '--keep-base' 和 '--root' 組合使用"
+
+#~ msgid "cannot combine '--root' with '--fork-point'"
+#~ msgstr "不能將 '--root' 和 '--fork-point' 結合使用"
+
+#~ msgid "cannot combine apply options with merge options"
+#~ msgstr "不能將 apply 套用選項與 merge 合併選項一起使用"
+
+#~ msgid "--keep-unreachable and -A are incompatible"
+#~ msgstr "--keep-unreachable 和 -A 不相容"
+
+#~ msgid "--geometric is incompatible with -A, -a"
+#~ msgstr "--geometric 與 -A, -a 不相容"
+
+#~ msgid "--patch is incompatible with --{hard,mixed,soft}"
+#~ msgstr "--patch 與 --{hard、mixed、soft} 選項不相容"
+
+#~ msgid "-N can only be used with --mixed"
+#~ msgstr "-N 只能和 --mixed 同時使用"
+
+#~ msgid "cannot combine --exclude-promisor-objects and --missing"
+#~ msgstr "不能同時使用 --exclude-promisor-objects 和 --missing 選項"
+
+#~ msgid "marked counting is incompatible with --objects"
+#~ msgstr "--objects 不相容標記計數 (marked counting)"
+
+#~ msgid ""
+#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-"
+#~ "base"
+#~ msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不相容"
+
+#~ msgid "git sparse-checkout reapply"
+#~ msgstr "git sparse-checkout reapply"
+
+#~ msgid "--cached and --files are mutually exclusive"
+#~ msgstr "--cached 和 --files 互斥"
+
+#~ msgid "--branch and --default are mutually exclusive"
+#~ msgstr "--branch 與 --default 互斥"
+
+#~ msgid "--column and -n are incompatible"
+#~ msgstr "--column 和 -n 不相容"
+
+#~ msgid "--contains option is only allowed in list mode"
+#~ msgstr "--contains 選項只允許用在列表顯示模式"
+
+#~ msgid "--no-contains option is only allowed in list mode"
+#~ msgstr "--no-contains 選項只允許用在列表顯示模式"
+
+#~ msgid "--points-at option is only allowed in list mode"
+#~ msgstr "--points-at 選項只允許用在列表顯示模式"
+
+#~ msgid "--merged and --no-merged options are only allowed in list mode"
+#~ msgstr "--merged 和 --no-merged 選項只允許用在列表顯示模式"
+
+#~ msgid "only one -F or -m option is allowed."
+#~ msgstr "只允許一個 -F 或 -m 選項。"
+
+#~ msgid "-b, -B, and --detach are mutually exclusive"
+#~ msgstr "-b、-B 和 --detach 是互斥的"
+
+#~ msgid "--reason requires --lock"
+#~ msgstr "--reason 需要 --lock"
+
+#~ msgid "--verbose and --porcelain are mutually exclusive"
+#~ msgstr "--verbose 和 --porcelain 互斥"
+
+#, c-format
+#~ msgid "no directory given for --git-dir\n"
+#~ msgstr "沒有為 --git-dir 提供目錄\n"
+
+#, c-format
+#~ msgid "no directory given for --work-tree\n"
+#~ msgstr "沒有為 --work-tree 提供目錄\n"
+
+#~ msgid "--packfile requires --index-pack-args"
+#~ msgstr "--packfile 需要 --index-pack-args"
+
+#~ msgid "--index-pack-args can only be used with --packfile"
+#~ msgstr "--index-pack-args 只能與 --packfile 一起使用"
+
+#~ msgid ""
+#~ "The following pathspecs didn't match any eligible path, but they do match "
+#~ "index\n"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "下列路徑規格不符合任何適合路徑，\n"
+#~ "但符合目前稀疏簽出外的索引項目：\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr "若有意更新這些項目，請停用或修改稀疏規則。"
+
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "不能設定 GIT_DIR 為 '%s'"
+
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"
+
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "不能開啟 /dev/null"
+
+#~ msgid ""
+#~ "after resolving the conflicts, mark the corrected paths\n"
+#~ "with 'git add <paths>' or 'git rm <paths>'\n"
+#~ "and commit the result with 'git commit'"
+#~ msgstr ""
+#~ "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
+#~ "對修正後的檔案做標記，然後用 'git commit' 提交"
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "不能開啟或者複製 /dev/null"
+
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "嘗試不在 cone 模式使用稀疏索引"
+
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "無法更新快取樹，保持完整"
+
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "無法為寫入開啟 '%s'。"
+
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "不能建立歸檔檔案 '%s'"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr "git bisect--helper --bisect-next-check <好-術語> <壞-術語> [<術語>]"
+
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check 需要 2 或 3 個參數"
+
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "不要在「%s」建立新檔案"
+
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree：無法開啟 '%s'"
+
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "無法開啟 packfile '%s'"
+
+#~ msgid "cannot store pack file"
+#~ msgstr "無法儲存包檔案"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "從 <檔案> 中讀取排除模式"
+
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "merge-recursive 的未知選項：-X%s"
+
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "不可用的待辦列表：'%s'"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<選項>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "對合併提交重定基底"
+
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "保持兄弟提交的原始分支點"
+
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "移動以 squash!/fixup! 開頭的提交"
+
+#~ msgid "sign commits"
+#~ msgstr "簽名提交"
+
+#~ msgid "continue rebase"
+#~ msgstr "繼續重定基底"
+
+#~ msgid "skip commit"
+#~ msgstr "略過提交"
+
+#~ msgid "edit the todo list"
+#~ msgstr "重定基底待辦列表"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "縮短待辦列表中的提交號"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "擴展待辦列表中的提交號"
+
+#~ msgid "check the todo list"
+#~ msgstr "檢查待辦列表"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "重新排列 fixup/squash 行"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "在待辦列表中插入 exec 執行指令"
+
+#~ msgid "onto"
+#~ msgstr "onto"
+
+#~ msgid "restrict-revision"
+#~ msgstr "restrict-revision"
+
+#~ msgid "restrict revision"
+#~ msgstr "限制版本"
+
+#~ msgid "squash-onto"
+#~ msgstr "squash-onto"
+
+#~ msgid "squash onto"
+#~ msgstr "squash onto"
+
+#~ msgid "the upstream commit"
+#~ msgstr "上游提交"
+
+#~ msgid "head-name"
+#~ msgstr "head-name"
+
+#~ msgid "head name"
+#~ msgstr "head 名稱"
+
+#~ msgid "rebase strategy"
+#~ msgstr "重定基底策略"
+
+#~ msgid "strategy-opts"
+#~ msgstr "strategy-opts"
+
+#~ msgid "strategy options"
+#~ msgstr "策略選項"
+
+#~ msgid "switch-to"
+#~ msgstr "切換到"
+
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "要簽出的分支或提交"
+
+#~ msgid "onto-name"
+#~ msgstr "onto-name"
+
+#~ msgid "onto name"
+#~ msgstr "onto name"
+
+#~ msgid "cmd"
+#~ msgstr "cmd"
+
+#~ msgid "the command to run"
+#~ msgstr "要執行的指令"
+
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "不使用 --rebase-merges，則 --[no-]rebase-cousins 沒有效果"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "不能將 '--preserve-merges' 和 '--rebase-merges' 同時使用"
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "錯誤：不能將 '--preserve-merges' 和 '--reschedule-failed-exec' 同時使用"
+
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr ""
+#~ "git submodule--helper add-clone [<選項>...] --url <URL> --path <路徑> --"
+#~ "name <名稱>"
+
+#~ msgid "failed to create file %s"
+#~ msgstr "建立檔案 %s 失敗"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "在初始的引用廣告後立即離開"
+
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "通訊端 (socket) 或管道 (pipe) 已在使用：「%s」"
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "無法在背景啟動 (spawn) 守護程式"
+
+#~ msgid "waitpid failed"
+#~ msgstr "waitpid 失敗"
+
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid 被混淆"
+
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "守護程式尚未關閉"
+
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "不支援協定限制，因為 cURL < 7.19.4"
+
+#~ msgid "running $command"
+#~ msgstr "執行 $command"
+
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "'$sm_path' 沒有簽出的提交"
+
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "子模組 '$displaypath'：'$command $sha1'"
+
+#~ msgid "Applied autostash."
+#~ msgstr "已套用 autostash。"
+
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "不能儲存 $stash_sha1"
+
+#~ msgid ""
+#~ "Applying autostash resulted in conflicts.\n"
+#~ "Your changes are safe in the stash.\n"
+#~ "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+#~ msgstr ""
+#~ "套用 autostash 導致衝突。\n"
+#~ "您的修改安全地儲存在儲藏區中。\n"
+#~ "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
+
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "重定基底中（$new_count/$total）"
+
+#~ msgid ""
+#~ "\n"
+#~ "Commands:\n"
+#~ "p, pick <commit> = use commit\n"
+#~ "r, reword <commit> = use commit, but edit the commit message\n"
+#~ "e, edit <commit> = use commit, but stop for amending\n"
+#~ "s, squash <commit> = use commit, but meld into previous commit\n"
+#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
+#~ "message\n"
+#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
+#~ "d, drop <commit> = remove commit\n"
+#~ "l, label <label> = label current HEAD with a name\n"
+#~ "t, reset <label> = reset HEAD to a label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". create a merge commit using the original merge commit's\n"
+#~ ". message (or the oneline, if no original merge commit was\n"
+#~ ". specified). Use -c <commit> to reword the commit message.\n"
+#~ "\n"
+#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "指令:\n"
+#~ "p, pick <提交> = 使用提交\n"
+#~ "r, reword <提交> = 使用提交，但修改提交說明\n"
+#~ "e, edit <提交> = 使用提交，但停下來修補\n"
+#~ "s, squash <提交> = 使用提交，但融合到前一個提交\n"
+#~ "f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n"
+#~ "x, exec <命令> = 使用 shell 執行指令（此行剩餘部分）\n"
+#~ "d, drop <提交> = 刪除提交\n"
+#~ "l, label <標籤> = 為目前 HEAD 打上標籤\n"
+#~ "t, reset <標籤> = 重設 HEAD 到該標籤\n"
+#~ "m, merge [-C <提交> | -c <提交>] <標籤> [# <oneline>]\n"
+#~ ". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n"
+#~ ". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n"
+#~ ". -c <提交> 可以編輯提交說明。\n"
+#~ "\n"
+#~ "可以對這些行重新排序，將從上至下執行。\n"
+
+#~ msgid ""
+#~ "You can amend the commit now, with\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Once you are satisfied with your changes, run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "您現在可以修補這個提交，使用\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "當您對變更感到滿意，執行\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1：不是一個可以被揀選的提交"
+
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "無效的提交名：$sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "不能寫入目前提交的替代 sha1"
+
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "快轉到 $sha1"
+
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "不能快轉到 $sha1"
+
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "不能移動 HEAD 到 $first_parent"
+
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "拒絕壓縮一個合併：$sha1"
+
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "無法重做合併 $sha1"
+
+#~ msgid "Could not pick $sha1"
+#~ msgstr "不能揀選 $sha1"
+
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "這是提交說明 #${n}："
+
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "提交說明 #${n} 將被略過："
+
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "這是一個 $count 個提交的組合。"
+
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "不能寫入 $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "這是一個 2 個提交的組合。"
+
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "不能套用 $sha1... $rest"
+
+#~ msgid ""
+#~ "Could not amend commit after successfully picking $sha1... $rest\n"
+#~ "This is most likely due to an empty commit message, or the pre-commit "
+#~ "hook\n"
+#~ "failed. If the pre-commit hook failed, you may need to resolve the issue "
+#~ "before\n"
+#~ "you are able to reword the commit."
+#~ msgstr ""
+#~ "不能在成功揀選 $sha1... $rest 之後修補提交\n"
+#~ "這通常是因為空的提交說明，或者 pre-commit 掛鉤執行失敗。如果是 pre-"
+#~ "commit\n"
+#~ "掛鉤執行失敗，你可能需要在重寫提交說明前解決這個問題。"
+
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "停止在 $sha1_abbrev... $rest"
+
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "沒有父提交的情況下不能 '$squash_style'"
+
+#~ msgid "Executing: $rest"
+#~ msgstr "執行：$rest"
+
+#~ msgid "Execution failed: $rest"
+#~ msgstr "執行失敗：$rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "並且修改索引和/或工作區"
+
+# 譯者：請維持前導空格
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "您可以解決這個問題，然後執行\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid ""
+#~ "Execution succeeded: $rest\n"
+#~ "but left changes to the index and/or the working tree\n"
+#~ "Commit or stash your changes, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "執行成功：$rest\n"
+#~ "但是在索引和/或工作區中存在變更。提交或儲藏修改，然後執行\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "未知指令：$command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "要修改請使用指令 'git rebase --edit-todo'。"
+
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "成功重定基底並更新 $head_name。"
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "不能刪除 CHERRY_PICK_HEAD"
+
+#~ msgid ""
+#~ "You have staged changes in your working tree.\n"
+#~ "If these changes are meant to be\n"
+#~ "squashed into the previous commit, run:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "If they are meant to go into a new commit, run:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "In both cases, once you're done, continue with:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+#~ msgstr ""
+#~ "您已暫存了工作區的修改。如果這些修改要壓縮到前一個提交，執行：\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "如果這些變更要形成一個新提交，執行：\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "無論哪種情況，當您完成提交，繼續執行：\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr "在修補提交中尋找作者訊息時遇到錯誤"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "不能提交暫存的修改。"
+
+#~ msgid "Could not execute editor"
+#~ msgstr "無法執行編輯器"
+
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "不能簽出 $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "沒有 HEAD？"
+
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "不能建立暫時 $state_dir"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "不能標記為互動式"
+
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] "重定基底 $shortrevisions 到 $shortonto（$todocount 個提交）"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "注意空提交已被備註掉"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "不能對重寫提交進行初始化"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr "不能重定基底：您有未暫存的變更。"
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr "無法透過重定基底方式拉取：您有未暫存的變更。"
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr "不能重定基底：您的索引中包含未提交的變更。"
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr "無法透過重定基底方式拉取：您的索引中包含未提交的變更。"
#~ msgid "unable to write stateless separator packet"
#~ msgstr "無法寫入無狀態的分隔符號封包"
@@ -26026,9 +27522,6 @@
#~ msgid "Error deleting remote-tracking branch '%s'"
#~ msgstr "無法刪除遠端追蹤分支 '%s'"
-#~ msgid "Error deleting branch '%s'"
-#~ msgstr "無法刪除分支 '%s'"
-
#~ msgid "show parse tree for grep expression"
#~ msgstr "顯示 grep 表達式的解析樹"
diff --git a/pretty.c b/pretty.c
index 73b5ead..ee6114e 100644
--- a/pretty.c
+++ b/pretty.c
@@ -431,6 +431,52 @@ const char *show_ident_date(const struct ident_split *ident,
return show_date(date, tz, mode);
}
+static inline void strbuf_add_with_color(struct strbuf *sb, const char *color,
+ const char *buf, size_t buflen)
+{
+ strbuf_addstr(sb, color);
+ strbuf_add(sb, buf, buflen);
+ if (*color)
+ strbuf_addstr(sb, GIT_COLOR_RESET);
+}
+
+static void append_line_with_color(struct strbuf *sb, struct grep_opt *opt,
+ const char *line, size_t linelen,
+ int color, enum grep_context ctx,
+ enum grep_header_field field)
+{
+ const char *buf, *eol, *line_color, *match_color;
+ regmatch_t match;
+ int eflags = 0;
+
+ buf = line;
+ eol = buf + linelen;
+
+ if (!opt || !want_color(color) || opt->invert)
+ goto end;
+
+ line_color = opt->colors[GREP_COLOR_SELECTED];
+ match_color = opt->colors[GREP_COLOR_MATCH_SELECTED];
+
+ while (grep_next_match(opt, buf, eol, ctx, &match, field, eflags)) {
+ if (match.rm_so == match.rm_eo)
+ break;
+
+ strbuf_add_with_color(sb, line_color, buf, match.rm_so);
+ strbuf_add_with_color(sb, match_color, buf + match.rm_so,
+ match.rm_eo - match.rm_so);
+ buf += match.rm_eo;
+ eflags = REG_NOTBOL;
+ }
+
+ if (eflags)
+ strbuf_add_with_color(sb, line_color, buf, eol - buf);
+ else {
+end:
+ strbuf_add(sb, buf, eol - buf);
+ }
+}
+
void pp_user_info(struct pretty_print_context *pp,
const char *what, struct strbuf *sb,
const char *line, const char *encoding)
@@ -496,9 +542,26 @@ void pp_user_info(struct pretty_print_context *pp,
strbuf_addch(sb, '\n');
strbuf_addf(sb, " <%.*s>\n", (int)maillen, mailbuf);
} else {
- strbuf_addf(sb, "%s: %.*s%.*s <%.*s>\n", what,
- (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0, " ",
- (int)namelen, namebuf, (int)maillen, mailbuf);
+ struct strbuf id = STRBUF_INIT;
+ enum grep_header_field field = GREP_HEADER_FIELD_MAX;
+ struct grep_opt *opt = pp->rev ? &pp->rev->grep_filter : NULL;
+
+ if (!strcmp(what, "Author"))
+ field = GREP_HEADER_AUTHOR;
+ else if (!strcmp(what, "Commit"))
+ field = GREP_HEADER_COMMITTER;
+
+ strbuf_addf(sb, "%s: ", what);
+ if (pp->fmt == CMIT_FMT_FULLER)
+ strbuf_addchars(sb, ' ', 4);
+
+ strbuf_addf(&id, "%.*s <%.*s>", (int)namelen, namebuf,
+ (int)maillen, mailbuf);
+
+ append_line_with_color(sb, opt, id.buf, id.len, pp->color,
+ GREP_CONTEXT_HEAD, field);
+ strbuf_addch(sb, '\n');
+ strbuf_release(&id);
}
switch (pp->fmt) {
@@ -671,11 +734,7 @@ const char *repo_logmsg_reencode(struct repository *r,
* If the re-encoding failed, out might be NULL here; in that
* case we just return the commit message verbatim.
*/
- if (!out) {
- warning("unable to reencode commit to '%s'", output_encoding);
- return msg;
- }
- return out;
+ return out ? out : msg;
}
static int mailmap_name(const char **email, size_t *email_len,
@@ -1216,28 +1275,66 @@ int format_set_trailers_options(struct process_trailer_options *opts,
static size_t parse_describe_args(const char *start, struct strvec *args)
{
- const char *options[] = { "match", "exclude" };
+ struct {
+ char *name;
+ enum {
+ DESCRIBE_ARG_BOOL,
+ DESCRIBE_ARG_INTEGER,
+ DESCRIBE_ARG_STRING,
+ } type;
+ } option[] = {
+ { "tags", DESCRIBE_ARG_BOOL},
+ { "abbrev", DESCRIBE_ARG_INTEGER },
+ { "exclude", DESCRIBE_ARG_STRING },
+ { "match", DESCRIBE_ARG_STRING },
+ };
const char *arg = start;
for (;;) {
- const char *matched = NULL;
+ int found = 0;
const char *argval;
size_t arglen = 0;
+ int optval = 0;
int i;
- for (i = 0; i < ARRAY_SIZE(options); i++) {
- if (match_placeholder_arg_value(arg, options[i], &arg,
- &argval, &arglen)) {
- matched = options[i];
+ for (i = 0; !found && i < ARRAY_SIZE(option); i++) {
+ switch (option[i].type) {
+ case DESCRIBE_ARG_BOOL:
+ if (match_placeholder_bool_arg(arg, option[i].name, &arg, &optval)) {
+ if (optval)
+ strvec_pushf(args, "--%s", option[i].name);
+ else
+ strvec_pushf(args, "--no-%s", option[i].name);
+ found = 1;
+ }
+ break;
+ case DESCRIBE_ARG_INTEGER:
+ if (match_placeholder_arg_value(arg, option[i].name, &arg,
+ &argval, &arglen)) {
+ char *endptr;
+ if (!arglen)
+ return 0;
+ strtol(argval, &endptr, 10);
+ if (endptr - argval != arglen)
+ return 0;
+ strvec_pushf(args, "--%s=%.*s", option[i].name, (int)arglen, argval);
+ found = 1;
+ }
+ break;
+ case DESCRIBE_ARG_STRING:
+ if (match_placeholder_arg_value(arg, option[i].name, &arg,
+ &argval, &arglen)) {
+ if (!arglen)
+ return 0;
+ strvec_pushf(args, "--%s=%.*s", option[i].name, (int)arglen, argval);
+ found = 1;
+ }
break;
}
}
- if (!matched)
+ if (!found)
break;
- if (!arglen)
- return 0;
- strvec_pushf(args, "--%s=%.*s", matched, (int)arglen, argval);
}
return arg - start;
}
@@ -1436,8 +1533,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
check_commit_signature(c->commit, &(c->signature_check));
switch (placeholder[1]) {
case 'G':
- if (c->signature_check.gpg_output)
- strbuf_addstr(sb, c->signature_check.gpg_output);
+ if (c->signature_check.output)
+ strbuf_addstr(sb, c->signature_check.output);
break;
case '?':
switch (c->signature_check.result) {
@@ -1939,8 +2036,9 @@ static int pp_utf8_width(const char *start, const char *end)
return width;
}
-static void strbuf_add_tabexpand(struct strbuf *sb, int tabwidth,
- const char *line, int linelen)
+static void strbuf_add_tabexpand(struct strbuf *sb, struct grep_opt *opt,
+ int color, int tabwidth, const char *line,
+ int linelen)
{
const char *tab;
@@ -1957,7 +2055,9 @@ static void strbuf_add_tabexpand(struct strbuf *sb, int tabwidth,
break;
/* Output the data .. */
- strbuf_add(sb, line, tab - line);
+ append_line_with_color(sb, opt, line, tab - line, color,
+ GREP_CONTEXT_BODY,
+ GREP_HEADER_FIELD_MAX);
/* .. and the de-tabified tab */
strbuf_addchars(sb, ' ', tabwidth - (width % tabwidth));
@@ -1972,7 +2072,8 @@ static void strbuf_add_tabexpand(struct strbuf *sb, int tabwidth,
* worrying about width - there's nothing more to
* align.
*/
- strbuf_add(sb, line, linelen);
+ append_line_with_color(sb, opt, line, linelen, color, GREP_CONTEXT_BODY,
+ GREP_HEADER_FIELD_MAX);
}
/*
@@ -1984,11 +2085,16 @@ static void pp_handle_indent(struct pretty_print_context *pp,
struct strbuf *sb, int indent,
const char *line, int linelen)
{
+ struct grep_opt *opt = pp->rev ? &pp->rev->grep_filter : NULL;
+
strbuf_addchars(sb, ' ', indent);
if (pp->expand_tabs_in_log)
- strbuf_add_tabexpand(sb, pp->expand_tabs_in_log, line, linelen);
+ strbuf_add_tabexpand(sb, opt, pp->color, pp->expand_tabs_in_log,
+ line, linelen);
else
- strbuf_add(sb, line, linelen);
+ append_line_with_color(sb, opt, line, linelen, pp->color,
+ GREP_CONTEXT_BODY,
+ GREP_HEADER_FIELD_MAX);
}
static int is_mboxrd_from(const char *line, int len)
@@ -2006,7 +2112,9 @@ void pp_remainder(struct pretty_print_context *pp,
struct strbuf *sb,
int indent)
{
+ struct grep_opt *opt = pp->rev ? &pp->rev->grep_filter : NULL;
int first = 1;
+
for (;;) {
const char *line = *msg_p;
int linelen = get_one_line(line);
@@ -2027,14 +2135,17 @@ void pp_remainder(struct pretty_print_context *pp,
if (indent)
pp_handle_indent(pp, sb, indent, line, linelen);
else if (pp->expand_tabs_in_log)
- strbuf_add_tabexpand(sb, pp->expand_tabs_in_log,
- line, linelen);
+ strbuf_add_tabexpand(sb, opt, pp->color,
+ pp->expand_tabs_in_log, line,
+ linelen);
else {
if (pp->fmt == CMIT_FMT_MBOXRD &&
is_mboxrd_from(line, linelen))
strbuf_addch(sb, '>');
- strbuf_add(sb, line, linelen);
+ append_line_with_color(sb, opt, line, linelen,
+ pp->color, GREP_CONTEXT_BODY,
+ GREP_HEADER_FIELD_MAX);
}
strbuf_addch(sb, '\n');
}
diff --git a/pretty.h b/pretty.h
index 2f16acd..f34e24c 100644
--- a/pretty.h
+++ b/pretty.h
@@ -2,6 +2,7 @@
#define PRETTY_H
#include "cache.h"
+#include "date.h"
#include "string-list.h"
struct commit;
@@ -163,4 +164,13 @@ int format_set_trailers_options(struct process_trailer_options *opts,
const char **arg,
char **invalid_arg);
+/*
+ * Like show_date, but pull the timestamp and tz parameters from
+ * the ident_split. It will also sanity-check the values and produce
+ * a well-known sentinel date if they appear bogus.
+ */
+const char *show_ident_date(const struct ident_split *id,
+ const struct date_mode *mode);
+
+
#endif /* PRETTY_H */
diff --git a/prio-queue.c b/prio-queue.c
index d3f488c..d31b48e 100644
--- a/prio-queue.c
+++ b/prio-queue.c
@@ -19,7 +19,7 @@ void prio_queue_reverse(struct prio_queue *queue)
{
int i, j;
- if (queue->compare != NULL)
+ if (queue->compare)
BUG("prio_queue_reverse() on non-LIFO queue");
for (i = 0; i < (j = (queue->nr - 1) - i); i++)
swap(queue, i, j);
diff --git a/progress.c b/progress.c
index 680c6a8..0cdd875 100644
--- a/progress.c
+++ b/progress.c
@@ -311,32 +311,39 @@ struct progress *start_delayed_sparse_progress(const char *title,
static void finish_if_sparse(struct progress *progress)
{
- if (progress &&
- progress->sparse &&
+ if (progress->sparse &&
progress->last_value != progress->total)
display_progress(progress, progress->total);
}
-void stop_progress(struct progress **p_progress)
+static void force_last_update(struct progress *progress, const char *msg)
{
- if (!p_progress)
- BUG("don't provide NULL to stop_progress");
+ char *buf;
+ struct throughput *tp = progress->throughput;
- finish_if_sparse(*p_progress);
-
- if (*p_progress) {
- trace2_data_intmax("progress", the_repository, "total_objects",
- (*p_progress)->total);
-
- if ((*p_progress)->throughput)
- trace2_data_intmax("progress", the_repository,
- "total_bytes",
- (*p_progress)->throughput->curr_total);
-
- trace2_region_leave("progress", (*p_progress)->title, the_repository);
+ if (tp) {
+ uint64_t now_ns = progress_getnanotime(progress);
+ unsigned int misecs, rate;
+ misecs = ((now_ns - progress->start_ns) * 4398) >> 32;
+ rate = tp->curr_total / (misecs ? misecs : 1);
+ throughput_string(&tp->display, tp->curr_total, rate);
}
+ progress_update = 1;
+ buf = xstrfmt(", %s.\n", msg);
+ display(progress, progress->last_value, buf);
+ free(buf);
+}
- stop_progress_msg(p_progress, _("done"));
+static void log_trace2(struct progress *progress)
+{
+ trace2_data_intmax("progress", the_repository, "total_objects",
+ progress->total);
+
+ if (progress->throughput)
+ trace2_data_intmax("progress", the_repository, "total_bytes",
+ progress->throughput->curr_total);
+
+ trace2_region_leave("progress", progress->title, the_repository);
}
void stop_progress_msg(struct progress **p_progress, const char *msg)
@@ -350,23 +357,12 @@ void stop_progress_msg(struct progress **p_progress, const char *msg)
if (!progress)
return;
*p_progress = NULL;
- if (progress->last_value != -1) {
- /* Force the last update */
- char *buf;
- struct throughput *tp = progress->throughput;
- if (tp) {
- uint64_t now_ns = progress_getnanotime(progress);
- unsigned int misecs, rate;
- misecs = ((now_ns - progress->start_ns) * 4398) >> 32;
- rate = tp->curr_total / (misecs ? misecs : 1);
- throughput_string(&tp->display, tp->curr_total, rate);
- }
- progress_update = 1;
- buf = xstrfmt(", %s.\n", msg);
- display(progress, progress->last_value, buf);
- free(buf);
- }
+ finish_if_sparse(progress);
+ if (progress->last_value != -1)
+ force_last_update(progress, msg);
+ log_trace2(progress);
+
clear_progress_signal();
strbuf_release(&progress->counters_sb);
if (progress->throughput)
diff --git a/progress.h b/progress.h
index f1913ac..3a94563 100644
--- a/progress.h
+++ b/progress.h
@@ -1,5 +1,6 @@
#ifndef PROGRESS_H
#define PROGRESS_H
+#include "gettext.h"
struct progress;
@@ -18,7 +19,9 @@ struct progress *start_sparse_progress(const char *title, uint64_t total);
struct progress *start_delayed_progress(const char *title, uint64_t total);
struct progress *start_delayed_sparse_progress(const char *title,
uint64_t total);
-void stop_progress(struct progress **progress);
-void stop_progress_msg(struct progress **progress, const char *msg);
-
+void stop_progress_msg(struct progress **p_progress, const char *msg);
+static inline void stop_progress(struct progress **p_progress)
+{
+ stop_progress_msg(p_progress, _("done"));
+}
#endif
diff --git a/promisor-remote.c b/promisor-remote.c
index db2ebdc..5b33f88 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -22,7 +22,7 @@ static int fetch_objects(struct repository *repo,
child.git_cmd = 1;
child.in = -1;
if (repo != the_repository)
- prepare_other_repo_env(&child.env_array, repo->gitdir);
+ prepare_other_repo_env(&child.env, repo->gitdir);
strvec_pushl(&child.args, "-c", "fetch.negotiationAlgorithm=noop",
"fetch", remote_name, "--no-tags",
"--no-write-fetch-head", "--recurse-submodules=no",
@@ -84,7 +84,7 @@ static void promisor_remote_move_to_tail(struct promisor_remote_config *config,
struct promisor_remote *r,
struct promisor_remote *previous)
{
- if (r->next == NULL)
+ if (!r->next)
return;
if (previous)
diff --git a/prompt.c b/prompt.c
index 5ded21a..50df172 100644
--- a/prompt.c
+++ b/prompt.c
@@ -8,15 +8,12 @@
static char *do_askpass(const char *cmd, const char *prompt)
{
struct child_process pass = CHILD_PROCESS_INIT;
- const char *args[3];
static struct strbuf buffer = STRBUF_INIT;
int err = 0;
- args[0] = cmd;
- args[1] = prompt;
- args[2] = NULL;
+ strvec_push(&pass.args, cmd);
+ strvec_push(&pass.args, prompt);
- pass.argv = args;
pass.out = -1;
if (start_command(&pass))
diff --git a/range-diff.c b/range-diff.c
index cac89a2..39cc010 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -40,6 +40,7 @@ static int read_patches(const char *range, struct string_list *list,
char *line, *current_filename = NULL;
ssize_t len;
size_t size;
+ int ret = -1;
strvec_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
"--reverse", "--date-order", "--decorate=no",
@@ -68,10 +69,10 @@ static int read_patches(const char *range, struct string_list *list,
if (strbuf_read(&contents, cp.out, 0) < 0) {
error_errno(_("could not read `log` output"));
finish_command(&cp);
- return -1;
+ goto cleanup;
}
if (finish_command(&cp))
- return -1;
+ goto cleanup;
line = contents.buf;
size = contents.len;
@@ -95,12 +96,9 @@ static int read_patches(const char *range, struct string_list *list,
CALLOC_ARRAY(util, 1);
if (get_oid(p, &util->oid)) {
error(_("could not parse commit '%s'"), p);
- free(util);
- free(current_filename);
+ FREE_AND_NULL(util);
string_list_clear(list, 1);
- strbuf_release(&buf);
- strbuf_release(&contents);
- return -1;
+ goto cleanup;
}
util->matching = -1;
in_header = 1;
@@ -111,11 +109,8 @@ static int read_patches(const char *range, struct string_list *list,
error(_("could not parse first line of `log` output: "
"did not start with 'commit ': '%s'"),
line);
- free(current_filename);
string_list_clear(list, 1);
- strbuf_release(&buf);
- strbuf_release(&contents);
- return -1;
+ goto cleanup;
}
if (starts_with(line, "diff --git")) {
@@ -136,12 +131,9 @@ static int read_patches(const char *range, struct string_list *list,
if (len < 0) {
error(_("could not parse git header '%.*s'"),
orig_len, line);
- free(util);
- free(current_filename);
+ FREE_AND_NULL(util);
string_list_clear(list, 1);
- strbuf_release(&buf);
- strbuf_release(&contents);
- return -1;
+ goto cleanup;
}
strbuf_addstr(&buf, " ## ");
if (patch.is_new > 0)
@@ -165,6 +157,7 @@ static int read_patches(const char *range, struct string_list *list,
patch.old_mode, patch.new_mode);
strbuf_addstr(&buf, " ##");
+ release_patch(&patch);
} else if (in_header) {
if (starts_with(line, "Author: ")) {
strbuf_addstr(&buf, " ## Metadata ##\n");
@@ -218,6 +211,9 @@ static int read_patches(const char *range, struct string_list *list,
strbuf_addch(&buf, '\n');
util->diffsize++;
}
+
+ ret = 0;
+cleanup:
strbuf_release(&contents);
if (util)
@@ -225,7 +221,7 @@ static int read_patches(const char *range, struct string_list *list,
strbuf_release(&buf);
free(current_filename);
- return 0;
+ return ret;
}
static int patch_util_cmp(const void *dummy, const struct patch_util *a,
@@ -556,7 +552,7 @@ int show_range_diff(const char *range1, const char *range2,
struct string_list branch2 = STRING_LIST_INIT_DUP;
if (range_diff_opts->left_only && range_diff_opts->right_only)
- res = error(_("--left-only and --right-only are mutually exclusive"));
+ res = error(_("options '%s' and '%s' cannot be used together"), "--left-only", "--right-only");
if (!res && read_patches(range1, &branch1, range_diff_opts->other_arg))
res = error(_("could not parse log for '%s'"), range1);
@@ -600,6 +596,6 @@ int is_range_diff_range(const char *arg)
}
free(copy);
- object_array_clear(&revs.pending);
+ release_revisions(&revs);
return negative > 0 && positive > 0;
}
diff --git a/reachable.c b/reachable.c
index 84e3d0d..aba63eb 100644
--- a/reachable.c
+++ b/reachable.c
@@ -13,6 +13,7 @@
#include "worktree.h"
#include "object-store.h"
#include "pack-bitmap.h"
+#include "pack-mtimes.h"
struct connectivity_progress {
struct progress *progress;
@@ -60,9 +61,13 @@ static void mark_commit(struct commit *c, void *data)
struct recent_data {
struct rev_info *revs;
timestamp_t timestamp;
+ report_recent_object_fn *cb;
+ int ignore_in_core_kept_packs;
};
static void add_recent_object(const struct object_id *oid,
+ struct packed_git *pack,
+ off_t offset,
timestamp_t mtime,
struct recent_data *data)
{
@@ -103,13 +108,29 @@ static void add_recent_object(const struct object_id *oid,
die("unable to lookup %s", oid_to_hex(oid));
add_pending_object(data->revs, obj, "");
+ if (data->cb)
+ data->cb(obj, pack, offset, mtime);
+}
+
+static int want_recent_object(struct recent_data *data,
+ const struct object_id *oid)
+{
+ if (data->ignore_in_core_kept_packs &&
+ has_object_kept_pack(oid, IN_CORE_KEEP_PACKS))
+ return 0;
+ return 1;
}
static int add_recent_loose(const struct object_id *oid,
const char *path, void *data)
{
struct stat st;
- struct object *obj = lookup_object(the_repository, oid);
+ struct object *obj;
+
+ if (!want_recent_object(data, oid))
+ return 0;
+
+ obj = lookup_object(the_repository, oid);
if (obj && obj->flags & SEEN)
return 0;
@@ -126,7 +147,7 @@ static int add_recent_loose(const struct object_id *oid,
return error_errno("unable to stat %s", oid_to_hex(oid));
}
- add_recent_object(oid, st.st_mtime, data);
+ add_recent_object(oid, NULL, 0, st.st_mtime, data);
return 0;
}
@@ -134,29 +155,49 @@ static int add_recent_packed(const struct object_id *oid,
struct packed_git *p, uint32_t pos,
void *data)
{
- struct object *obj = lookup_object(the_repository, oid);
+ struct object *obj;
+ timestamp_t mtime = p->mtime;
+
+ if (!want_recent_object(data, oid))
+ return 0;
+
+ obj = lookup_object(the_repository, oid);
if (obj && obj->flags & SEEN)
return 0;
- add_recent_object(oid, p->mtime, data);
+ if (p->is_cruft) {
+ if (load_pack_mtimes(p) < 0)
+ die(_("could not load cruft pack .mtimes"));
+ mtime = nth_packed_mtime(p, pos);
+ }
+ add_recent_object(oid, p, nth_packed_object_offset(p, pos), mtime, data);
return 0;
}
int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
- timestamp_t timestamp)
+ timestamp_t timestamp,
+ report_recent_object_fn *cb,
+ int ignore_in_core_kept_packs)
{
struct recent_data data;
+ enum for_each_object_flags flags;
int r;
data.revs = revs;
data.timestamp = timestamp;
+ data.cb = cb;
+ data.ignore_in_core_kept_packs = ignore_in_core_kept_packs;
r = for_each_loose_object(add_recent_loose, &data,
FOR_EACH_OBJECT_LOCAL_ONLY);
if (r)
return r;
- return for_each_packed_object(add_recent_packed, &data,
- FOR_EACH_OBJECT_LOCAL_ONLY);
+
+ flags = FOR_EACH_OBJECT_LOCAL_ONLY | FOR_EACH_OBJECT_PACK_ORDER;
+ if (ignore_in_core_kept_packs)
+ flags |= FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS;
+
+ return for_each_packed_object(add_recent_packed, &data, flags);
}
static int mark_object_seen(const struct object_id *oid,
@@ -205,7 +246,7 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
cp.progress = progress;
cp.count = 0;
- bitmap_git = prepare_bitmap_walk(revs, NULL, 0);
+ bitmap_git = prepare_bitmap_walk(revs, 0);
if (bitmap_git) {
traverse_bitmap_commit_list(bitmap_git, revs, mark_object_seen);
free_bitmap_index(bitmap_git);
@@ -217,7 +258,8 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
if (mark_recent) {
revs->ignore_missing_links = 1;
- if (add_unseen_recent_objects_to_traversal(revs, mark_recent))
+ if (add_unseen_recent_objects_to_traversal(revs, mark_recent,
+ NULL, 0))
die("unable to mark recent objects");
if (prepare_revision_walk(revs))
die("revision walk setup failed");
diff --git a/reachable.h b/reachable.h
index 5df932a..020a887 100644
--- a/reachable.h
+++ b/reachable.h
@@ -3,9 +3,16 @@
struct progress;
struct rev_info;
+struct object;
+struct packed_git;
+
+typedef void report_recent_object_fn(const struct object *, struct packed_git *,
+ off_t, time_t);
int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
- timestamp_t timestamp);
+ timestamp_t timestamp,
+ report_recent_object_fn cb,
+ int ignore_in_core_kept_packs);
void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
timestamp_t mark_recent, struct progress *);
diff --git a/read-cache.c b/read-cache.c
index a78b88a..96ce489 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -28,6 +28,7 @@
#include "sparse-index.h"
#include "csum-file.h"
#include "promisor-remote.h"
+#include "hook.h"
/* Mask for the name length in ce_flags in the on-disk index */
@@ -68,6 +69,11 @@
*/
#define CACHE_ENTRY_PATH_LENGTH 80
+enum index_search_mode {
+ NO_EXPAND_SPARSE = 0,
+ EXPAND_SPARSE = 1
+};
+
static inline struct cache_entry *mem_pool__ce_alloc(struct mem_pool *mem_pool, size_t len)
{
struct cache_entry *ce;
@@ -106,7 +112,7 @@ static const char *alternate_index_output;
static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
if (S_ISSPARSEDIR(ce->ce_mode))
- istate->sparse_index = 1;
+ istate->sparse_index = INDEX_COLLAPSED;
istate->cache[nr] = ce;
add_name_hash(istate, ce);
@@ -128,7 +134,7 @@ static void replace_index_entry(struct index_state *istate, int nr, struct cache
void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
{
- struct cache_entry *old_entry = istate->cache[nr], *new_entry;
+ struct cache_entry *old_entry = istate->cache[nr], *new_entry, *refreshed;
int namelen = strlen(new_name);
new_entry = make_empty_cache_entry(istate, namelen);
@@ -141,7 +147,20 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
cache_tree_invalidate_path(istate, old_entry->name);
untracked_cache_remove_from_index(istate, old_entry->name);
remove_index_entry_at(istate, nr);
- add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
+
+ /*
+ * Refresh the new index entry. Using 'refresh_cache_entry' ensures
+ * we only update stat info if the entry is otherwise up-to-date (i.e.,
+ * the contents/mode haven't changed). This ensures that we reflect the
+ * 'ctime' of the rename in the index without (incorrectly) updating
+ * the cached stat info to reflect unstaged changes on disk.
+ */
+ refreshed = refresh_cache_entry(istate, new_entry, CE_MATCH_REFRESH);
+ if (refreshed && refreshed != new_entry) {
+ add_index_entry(istate, refreshed, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
+ discard_cache_entry(new_entry);
+ } else
+ add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
}
void fill_stat_data(struct stat_data *sd, struct stat *st)
@@ -551,7 +570,10 @@ int cache_name_stage_compare(const char *name1, int len1, int stage1, const char
return 0;
}
-static int index_name_stage_pos(struct index_state *istate, const char *name, int namelen, int stage)
+static int index_name_stage_pos(struct index_state *istate,
+ const char *name, int namelen,
+ int stage,
+ enum index_search_mode search_mode)
{
int first, last;
@@ -570,7 +592,7 @@ static int index_name_stage_pos(struct index_state *istate, const char *name, in
first = next+1;
}
- if (istate->sparse_index &&
+ if (search_mode == EXPAND_SPARSE && istate->sparse_index &&
first > 0) {
/* Note: first <= istate->cache_nr */
struct cache_entry *ce = istate->cache[first - 1];
@@ -586,7 +608,7 @@ static int index_name_stage_pos(struct index_state *istate, const char *name, in
ce_namelen(ce) < namelen &&
!strncmp(name, ce->name, ce_namelen(ce))) {
ensure_full_index(istate);
- return index_name_stage_pos(istate, name, namelen, stage);
+ return index_name_stage_pos(istate, name, namelen, stage, search_mode);
}
}
@@ -595,7 +617,12 @@ static int index_name_stage_pos(struct index_state *istate, const char *name, in
int index_name_pos(struct index_state *istate, const char *name, int namelen)
{
- return index_name_stage_pos(istate, name, namelen, 0);
+ return index_name_stage_pos(istate, name, namelen, 0, EXPAND_SPARSE);
+}
+
+int index_entry_exists(struct index_state *istate, const char *name, int namelen)
+{
+ return index_name_stage_pos(istate, name, namelen, 0, NO_EXPAND_SPARSE) >= 0;
}
int remove_index_entry_at(struct index_state *istate, int pos)
@@ -722,7 +749,7 @@ static struct cache_entry *create_alias_ce(struct index_state *istate,
void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
{
struct object_id oid;
- if (write_object_file("", 0, blob_type, &oid))
+ if (write_object_file("", 0, OBJ_BLOB, &oid))
die(_("cannot create an empty blob in the object database"));
oidcpy(&ce->oid, &oid);
}
@@ -738,7 +765,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
int intent_only = flags & ADD_CACHE_INTENT;
int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
(intent_only ? ADD_CACHE_NEW_ONLY : 0));
- int hash_flags = HASH_WRITE_OBJECT;
+ unsigned hash_flags = pretend ? 0 : HASH_WRITE_OBJECT;
struct object_id oid;
if (flags & ADD_CACHE_RENORMALIZE)
@@ -849,6 +876,19 @@ struct cache_entry *make_empty_transient_cache_entry(size_t len,
return xcalloc(1, cache_entry_size(len));
}
+enum verify_path_result {
+ PATH_OK,
+ PATH_INVALID,
+ PATH_DIR_WITH_SEP,
+};
+
+static enum verify_path_result verify_path_internal(const char *, unsigned);
+
+int verify_path(const char *path, unsigned mode)
+{
+ return verify_path_internal(path, mode) == PATH_OK;
+}
+
struct cache_entry *make_cache_entry(struct index_state *istate,
unsigned int mode,
const struct object_id *oid,
@@ -859,7 +899,7 @@ struct cache_entry *make_cache_entry(struct index_state *istate,
struct cache_entry *ce, *ret;
int len;
- if (!verify_path(path, mode)) {
+ if (verify_path_internal(path, mode) == PATH_INVALID) {
error(_("invalid path '%s'"), path);
return NULL;
}
@@ -993,60 +1033,62 @@ static int verify_dotfile(const char *rest, unsigned mode)
return 1;
}
-int verify_path(const char *path, unsigned mode)
+static enum verify_path_result verify_path_internal(const char *path,
+ unsigned mode)
{
char c = 0;
if (has_dos_drive_prefix(path))
- return 0;
+ return PATH_INVALID;
if (!is_valid_path(path))
- return 0;
+ return PATH_INVALID;
goto inside;
for (;;) {
if (!c)
- return 1;
+ return PATH_OK;
if (is_dir_sep(c)) {
inside:
if (protect_hfs) {
if (is_hfs_dotgit(path))
- return 0;
+ return PATH_INVALID;
if (S_ISLNK(mode)) {
if (is_hfs_dotgitmodules(path))
- return 0;
+ return PATH_INVALID;
}
}
if (protect_ntfs) {
#if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
if (c == '\\')
- return 0;
+ return PATH_INVALID;
#endif
if (is_ntfs_dotgit(path))
- return 0;
+ return PATH_INVALID;
if (S_ISLNK(mode)) {
if (is_ntfs_dotgitmodules(path))
- return 0;
+ return PATH_INVALID;
}
}
c = *path++;
if ((c == '.' && !verify_dotfile(path, mode)) ||
is_dir_sep(c))
- return 0;
+ return PATH_INVALID;
/*
* allow terminating directory separators for
* sparse directory entries.
*/
if (c == '\0')
- return S_ISDIR(mode);
+ return S_ISDIR(mode) ? PATH_DIR_WITH_SEP :
+ PATH_INVALID;
} else if (c == '\\' && protect_ntfs) {
if (is_ntfs_dotgit(path))
- return 0;
+ return PATH_INVALID;
if (S_ISLNK(mode)) {
if (is_ntfs_dotgitmodules(path))
- return 0;
+ return PATH_INVALID;
}
}
@@ -1222,7 +1264,7 @@ static int has_dir_name(struct index_state *istate,
*/
}
- pos = index_name_stage_pos(istate, name, len, stage);
+ pos = index_name_stage_pos(istate, name, len, stage, EXPAND_SPARSE);
if (pos >= 0) {
/*
* Found one, but not so fast. This could
@@ -1311,9 +1353,6 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
int new_only = option & ADD_CACHE_NEW_ONLY;
- if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
- cache_tree_invalidate_path(istate, ce->name);
-
/*
* If this entry's path sorts after the last entry in the index,
* we can avoid searching for it.
@@ -1322,7 +1361,14 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
strcmp(ce->name, istate->cache[istate->cache_nr - 1]->name) > 0)
pos = index_pos_to_insert_pos(istate->cache_nr);
else
- pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
+ pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce), EXPAND_SPARSE);
+
+ /*
+ * Cache tree path should be invalidated only after index_name_stage_pos,
+ * in case it expands a sparse index.
+ */
+ if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
+ cache_tree_invalidate_path(istate, ce->name);
/* existing match? Just replace it. */
if (pos >= 0) {
@@ -1349,7 +1395,7 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
if (!ok_to_add)
return -1;
- if (!verify_path(ce->name, ce->ce_mode))
+ if (verify_path_internal(ce->name, ce->ce_mode) == PATH_INVALID)
return error(_("invalid path '%s'"), ce->name);
if (!skip_df_check &&
@@ -1357,7 +1403,7 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
if (!ok_to_replace)
return error(_("'%s' appears as both a file and as a directory"),
ce->name);
- pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
+ pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce), EXPAND_SPARSE);
pos = -pos-1;
}
return pos + 1;
@@ -1810,7 +1856,7 @@ static int read_index_extension(struct index_state *istate,
break;
case CACHE_EXT_SPARSE_DIRECTORIES:
/* no content, only an indicator */
- istate->sparse_index = 1;
+ istate->sparse_index = INDEX_COLLAPSED;
break;
default:
if (*ext < 'A' || 'Z' < *ext)
@@ -2214,6 +2260,20 @@ static unsigned long load_cache_entries_threaded(struct index_state *istate, con
return consumed;
}
+static void set_new_index_sparsity(struct index_state *istate)
+{
+ /*
+ * If the index's repo exists, mark it sparse according to
+ * repo settings.
+ */
+ if (istate->repo) {
+ prepare_repo_settings(istate->repo);
+ if (!istate->repo->settings.command_requires_full_index &&
+ is_sparse_index_allowed(istate, 0))
+ istate->sparse_index = 1;
+ }
+}
+
/* remember to discard_cache() before reading a different cache! */
int do_read_index(struct index_state *istate, const char *path, int must_exist)
{
@@ -2235,8 +2295,10 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
istate->timestamp.nsec = 0;
fd = open(path, O_RDONLY);
if (fd < 0) {
- if (!must_exist && errno == ENOENT)
+ if (!must_exist && errno == ENOENT) {
+ set_new_index_sparsity(istate);
return 0;
+ }
die_errno(_("%s: index file open failed"), path);
}
@@ -2337,9 +2399,17 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
if (!istate->repo)
istate->repo = the_repository;
+
+ /*
+ * If the command explicitly requires a full index, force it
+ * to be full. Otherwise, correct the sparsity based on repository
+ * settings and other properties of the index (if necessary).
+ */
prepare_repo_settings(istate->repo);
if (istate->repo->settings.command_requires_full_index)
ensure_full_index(istate);
+ else
+ ensure_correct_sparsity(istate);
return istate->cache_nr;
@@ -2739,7 +2809,7 @@ static int repo_verify_index(struct repository *repo)
return verify_index_from(repo->index, repo->index_file);
}
-static int has_racy_timestamp(struct index_state *istate)
+int has_racy_timestamp(struct index_state *istate)
{
int entries = istate->cache_nr;
int i;
@@ -2801,7 +2871,7 @@ static int record_ieot(void)
* rely on it.
*/
static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
- int strip_extensions)
+ int strip_extensions, unsigned flags)
{
uint64_t start = getnanotime();
struct hashfile *f;
@@ -2815,6 +2885,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
int drop_cache_tree = istate->drop_cache_tree;
off_t offset;
+ int csum_fsync_flag;
int ieot_entries = 1;
struct index_entry_offset_table *ieot = NULL;
int nr, nr_threads;
@@ -2973,6 +3044,9 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
!is_null_oid(&istate->split_index->base_oid)) {
struct strbuf sb = STRBUF_INIT;
+ if (istate->sparse_index)
+ die(_("cannot write split index for a sparse index"));
+
err = write_link_extension(&sb, istate) < 0 ||
write_index_ext_header(f, eoie_c, CACHE_EXT_LINK,
sb.len) < 0;
@@ -3045,7 +3119,13 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
return -1;
}
- finalize_hashfile(f, istate->oid.hash, CSUM_HASH_IN_STREAM);
+ csum_fsync_flag = 0;
+ if (!alternate_index_output && (flags & COMMIT_LOCK))
+ csum_fsync_flag = CSUM_FSYNC;
+
+ finalize_hashfile(f, istate->oid.hash, FSYNC_COMPONENT_INDEX,
+ CSUM_HASH_IN_STREAM | csum_fsync_flag);
+
if (close_tempfile_gently(tempfile)) {
error(_("could not close '%s'"), get_tempfile_path(tempfile));
return -1;
@@ -3085,7 +3165,7 @@ static int do_write_locked_index(struct index_state *istate, struct lock_file *l
unsigned flags)
{
int ret;
- int was_full = !istate->sparse_index;
+ int was_full = istate->sparse_index == INDEX_EXPANDED;
ret = convert_to_sparse(istate, 0);
@@ -3100,7 +3180,7 @@ static int do_write_locked_index(struct index_state *istate, struct lock_file *l
*/
trace2_region_enter_printf("index", "do_write_index", the_repository,
"%s", get_lock_file_path(lock));
- ret = do_write_index(istate, lock->tempfile, 0);
+ ret = do_write_index(istate, lock->tempfile, 0, flags);
trace2_region_leave_printf("index", "do_write_index", the_repository,
"%s", get_lock_file_path(lock));
@@ -3114,7 +3194,7 @@ static int do_write_locked_index(struct index_state *istate, struct lock_file *l
else
ret = close_lock_file_gently(lock);
- run_hook_le(NULL, "post-index-change",
+ run_hooks_l("post-index-change",
istate->updated_workdir ? "1" : "0",
istate->updated_skipworktree ? "1" : "0", NULL);
istate->updated_workdir = 0;
@@ -3194,7 +3274,7 @@ static int clean_shared_index_files(const char *current_hex)
}
static int write_shared_index(struct index_state *istate,
- struct tempfile **temp)
+ struct tempfile **temp, unsigned flags)
{
struct split_index *si = istate->split_index;
int ret, was_full = !istate->sparse_index;
@@ -3204,7 +3284,7 @@ static int write_shared_index(struct index_state *istate,
trace2_region_enter_printf("index", "shared/do_write_index",
the_repository, "%s", get_tempfile_path(*temp));
- ret = do_write_index(si->base, *temp, 1);
+ ret = do_write_index(si->base, *temp, 1, flags);
trace2_region_leave_printf("index", "shared/do_write_index",
the_repository, "%s", get_tempfile_path(*temp));
@@ -3313,7 +3393,7 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
ret = do_write_locked_index(istate, lock, flags);
goto out;
}
- ret = write_shared_index(istate, &temp);
+ ret = write_shared_index(istate, &temp, flags);
saved_errno = errno;
if (is_tempfile_active(temp))
diff --git a/rebase-interactive.c b/rebase-interactive.c
index b6cbd16..87649d0 100644
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -226,32 +226,3 @@ int todo_list_check_against_backup(struct repository *r, struct todo_list *todo_
todo_list_release(&backup);
return res;
}
-
-int check_todo_list_from_file(struct repository *r)
-{
- struct todo_list old_todo = TODO_LIST_INIT, new_todo = TODO_LIST_INIT;
- int res = 0;
-
- if (strbuf_read_file(&new_todo.buf, rebase_path_todo(), 0) < 0) {
- res = error(_("could not read '%s'."), rebase_path_todo());
- goto out;
- }
-
- if (strbuf_read_file(&old_todo.buf, rebase_path_todo_backup(), 0) < 0) {
- res = error(_("could not read '%s'."), rebase_path_todo_backup());
- goto out;
- }
-
- res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo);
- if (!res)
- res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo);
- if (res)
- fprintf(stderr, _(edit_todo_list_advice));
- if (!res)
- res = todo_list_check(&old_todo, &new_todo);
-out:
- todo_list_release(&old_todo);
- todo_list_release(&new_todo);
-
- return res;
-}
diff --git a/rebase-interactive.h b/rebase-interactive.h
index dc2cf0e..7239c60 100644
--- a/rebase-interactive.h
+++ b/rebase-interactive.h
@@ -16,6 +16,4 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo);
int todo_list_check_against_backup(struct repository *r,
struct todo_list *todo_list);
-int check_todo_list_from_file(struct repository *r);
-
#endif
diff --git a/rebase.c b/rebase.c
index f8137d8..6775cdd 100644
--- a/rebase.c
+++ b/rebase.c
@@ -1,5 +1,6 @@
#include "rebase.h"
#include "config.h"
+#include "gettext.h"
/*
* Parses textual value for pull.rebase, branch.<name>.rebase, etc.
@@ -20,12 +21,12 @@ enum rebase_type rebase_parse_value(const char *value)
return REBASE_FALSE;
else if (v > 0)
return REBASE_TRUE;
- else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
- return REBASE_PRESERVE;
else if (!strcmp(value, "merges") || !strcmp(value, "m"))
return REBASE_MERGES;
else if (!strcmp(value, "interactive") || !strcmp(value, "i"))
return REBASE_INTERACTIVE;
+ else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
+ error(_("%s: 'preserve' superseded by 'merges'"), value);
/*
* Please update _git_config() in git-completion.bash when you
* add new rebase modes.
diff --git a/rebase.h b/rebase.h
index cc723d4..203b437 100644
--- a/rebase.h
+++ b/rebase.h
@@ -5,7 +5,6 @@ enum rebase_type {
REBASE_INVALID = -1,
REBASE_FALSE = 0,
REBASE_TRUE,
- REBASE_PRESERVE,
REBASE_MERGES,
REBASE_INTERACTIVE
};
diff --git a/ref-filter.c b/ref-filter.c
index add429b..d3c90e5 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -341,7 +341,7 @@ static int objectsize_atom_parser(struct ref_format *format, struct used_atom *a
else
oi.info.disk_sizep = &oi.disk_size;
} else
- return strbuf_addf_ret(err, -1, _("unrecognized %%(objectsize) argument: %s"), arg);
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "objectsize", arg);
return 0;
}
@@ -374,7 +374,7 @@ static int subject_atom_parser(struct ref_format *format, struct used_atom *atom
else if (!strcmp(arg, "sanitize"))
atom->u.contents.option = C_SUB_SANITIZE;
else
- return strbuf_addf_ret(err, -1, _("unrecognized %%(subject) argument: %s"), arg);
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "subject", arg);
return 0;
}
@@ -428,7 +428,7 @@ static int contents_atom_parser(struct ref_format *format, struct used_atom *ato
if (strtoul_ui(arg, 10, &atom->u.contents.nlines))
return strbuf_addf_ret(err, -1, _("positive value expected contents:lines=%s"), arg);
} else
- return strbuf_addf_ret(err, -1, _("unrecognized %%(contents) argument: %s"), arg);
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "contents", arg);
return 0;
}
@@ -440,7 +440,7 @@ static int raw_atom_parser(struct ref_format *format, struct used_atom *atom,
else if (!strcmp(arg, "size"))
atom->u.raw_data.option = RAW_LENGTH;
else
- return strbuf_addf_ret(err, -1, _("unrecognized %%(raw) argument: %s"), arg);
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "raw", arg);
return 0;
}
@@ -459,7 +459,7 @@ static int oid_atom_parser(struct ref_format *format, struct used_atom *atom,
if (atom->u.oid.length < MINIMUM_ABBREV)
atom->u.oid.length = MINIMUM_ABBREV;
} else
- return strbuf_addf_ret(err, -1, _("unrecognized argument '%s' in %%(%s)"), arg, atom->name);
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), atom->name, arg);
return 0;
}
@@ -531,7 +531,7 @@ static int align_atom_parser(struct ref_format *format, struct used_atom *atom,
else if ((position = parse_align_position(s)) >= 0)
align->position = position;
else {
- strbuf_addf(err, _("unrecognized %%(align) argument: %s"), s);
+ strbuf_addf(err, _("unrecognized %%(%s) argument: %s"), "align", s);
string_list_clear(¶ms, 0);
return -1;
}
@@ -557,7 +557,7 @@ static int if_atom_parser(struct ref_format *format, struct used_atom *atom,
} else if (skip_prefix(arg, "notequals=", &atom->u.if_then_else.str)) {
atom->u.if_then_else.cmp_status = COMPARE_UNEQUAL;
} else
- return strbuf_addf_ret(err, -1, _("unrecognized %%(if) argument: %s"), arg);
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "if", arg);
return 0;
}
@@ -841,7 +841,7 @@ static void if_then_else_handler(struct ref_formatting_stack **stack)
struct if_then_else *if_then_else = (struct if_then_else *)cur->at_end_data;
if (!if_then_else->then_atom_seen)
- die(_("format: %%(if) atom used without a %%(then) atom"));
+ die(_("format: %%(%s) atom used without a %%(%s) atom"), "if", "then");
if (if_then_else->else_atom_seen) {
/*
@@ -907,7 +907,7 @@ static int then_atom_handler(struct atom_value *atomv, struct ref_formatting_sta
if (cur->at_end == if_then_else_handler)
if_then_else = (struct if_then_else *)cur->at_end_data;
if (!if_then_else)
- return strbuf_addf_ret(err, -1, _("format: %%(then) atom used without an %%(if) atom"));
+ return strbuf_addf_ret(err, -1, _("format: %%(%s) atom used without a %%(%s) atom"), "then", "if");
if (if_then_else->then_atom_seen)
return strbuf_addf_ret(err, -1, _("format: %%(then) atom used more than once"));
if (if_then_else->else_atom_seen)
@@ -943,9 +943,9 @@ static int else_atom_handler(struct atom_value *atomv, struct ref_formatting_sta
if (prev->at_end == if_then_else_handler)
if_then_else = (struct if_then_else *)prev->at_end_data;
if (!if_then_else)
- return strbuf_addf_ret(err, -1, _("format: %%(else) atom used without an %%(if) atom"));
+ return strbuf_addf_ret(err, -1, _("format: %%(%s) atom used without a %%(%s) atom"), "else", "if");
if (!if_then_else->then_atom_seen)
- return strbuf_addf_ret(err, -1, _("format: %%(else) atom used without a %%(then) atom"));
+ return strbuf_addf_ret(err, -1, _("format: %%(%s) atom used without a %%(%s) atom"), "else", "then");
if (if_then_else->else_atom_seen)
return strbuf_addf_ret(err, -1, _("format: %%(else) atom used more than once"));
if_then_else->else_atom_seen = 1;
@@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)
format->quote_style == QUOTE_TCL) &&
used_atom[at].atom_type == ATOM_RAW &&
used_atom[at].u.raw_data.option == RAW_BARE)
- die(_("--format=%.*s cannot be used with"
+ die(_("--format=%.*s cannot be used with "
"--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
cp = ep + 1;
@@ -1251,7 +1251,7 @@ static void grab_date(const char *buf, struct atom_value *v, const char *atomnam
char *zone;
timestamp_t timestamp;
long tz;
- struct date_mode date_mode = { DATE_NORMAL };
+ struct date_mode date_mode = DATE_MODE_INIT;
const char *formatp;
/*
@@ -1261,7 +1261,7 @@ static void grab_date(const char *buf, struct atom_value *v, const char *atomnam
* ":" means no format is specified, and use the default.
*/
formatp = strchr(atomname, ':');
- if (formatp != NULL) {
+ if (formatp) {
formatp++;
parse_date_format(formatp, &date_mode);
}
@@ -1276,6 +1276,7 @@ static void grab_date(const char *buf, struct atom_value *v, const char *atomnam
goto bad;
v->s = xstrdup(show_date(timestamp, tz, &date_mode));
v->value = timestamp;
+ date_mode_release(&date_mode);
return;
bad:
v->s = xstrdup("");
@@ -1508,7 +1509,7 @@ static void fill_missing_values(struct atom_value *val)
int i;
for (i = 0; i < used_atom_cnt; i++) {
struct atom_value *v = &val[i];
- if (v->s == NULL)
+ if (!v->s)
v->s = xstrdup("");
}
}
@@ -1618,7 +1619,7 @@ static const char *rstrip_ref_components(const char *refname, int len)
while (remaining-- > 0) {
char *p = strrchr(start, '/');
- if (p == NULL) {
+ if (!p) {
free((char *)to_free);
return xstrdup("");
} else
@@ -2391,6 +2392,7 @@ static void reach_filter(struct ref_array *array,
clear_commit_marks(merge_commit, ALL_REV_FLAGS);
}
+ release_revisions(&revs);
free(to_clear);
}
@@ -2470,6 +2472,12 @@ static int memcasecmp(const void *vs1, const void *vs2, size_t n)
return 0;
}
+struct ref_sorting {
+ struct ref_sorting *next;
+ int atom; /* index into used_atom array (internal) */
+ enum ref_sorting_order sort_flags;
+};
+
static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)
{
struct atom_value *va, *vb;
@@ -2663,7 +2671,7 @@ static int parse_sorting_atom(const char *atom)
}
/* If no sorting option is given, use refname to sort as default */
-struct ref_sorting *ref_default_sorting(void)
+static struct ref_sorting *ref_default_sorting(void)
{
static const char cstr_name[] = "refname";
@@ -2674,7 +2682,7 @@ struct ref_sorting *ref_default_sorting(void)
return sorting;
}
-void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *arg)
+static void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *arg)
{
struct ref_sorting *s;
@@ -2692,17 +2700,34 @@ void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *arg)
s->atom = parse_sorting_atom(arg);
}
-int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)
+struct ref_sorting *ref_sorting_options(struct string_list *options)
{
- /*
- * NEEDSWORK: We should probably clear the list in this case, but we've
- * already munged the global used_atoms list, which would need to be
- * undone.
- */
- BUG_ON_OPT_NEG(unset);
+ struct string_list_item *item;
+ struct ref_sorting *sorting = NULL, **tail = &sorting;
- parse_ref_sorting(opt->value, arg);
- return 0;
+ if (!options->nr) {
+ sorting = ref_default_sorting();
+ } else {
+ for_each_string_list_item(item, options)
+ parse_ref_sorting(tail, item->string);
+ }
+
+ /*
+ * From here on, the ref_sorting list should be used to talk
+ * about the sort order used for the output. The caller
+ * should not touch the string form anymore.
+ */
+ string_list_clear(options, 0);
+ return sorting;
+}
+
+void ref_sorting_release(struct ref_sorting *sorting)
+{
+ while (sorting) {
+ struct ref_sorting *next = sorting->next;
+ free(sorting);
+ sorting = next;
+ }
}
int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset)
diff --git a/ref-filter.h b/ref-filter.h
index b636f43..aa0eea4 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -23,16 +23,13 @@
#define FILTER_REFS_KIND_MASK (FILTER_REFS_ALL | FILTER_REFS_DETACHED_HEAD)
struct atom_value;
+struct ref_sorting;
-struct ref_sorting {
- struct ref_sorting *next;
- int atom; /* index into used_atom array (internal) */
- enum {
- REF_SORTING_REVERSE = 1<<0,
- REF_SORTING_ICASE = 1<<1,
- REF_SORTING_VERSION = 1<<2,
- REF_SORTING_DETACHED_HEAD_FIRST = 1<<3,
- } sort_flags;
+enum ref_sorting_order {
+ REF_SORTING_REVERSE = 1<<0,
+ REF_SORTING_ICASE = 1<<1,
+ REF_SORTING_VERSION = 1<<2,
+ REF_SORTING_DETACHED_HEAD_FIRST = 1<<3,
};
struct ref_array_item {
@@ -97,9 +94,8 @@ struct ref_format {
#define OPT_NO_MERGED(f, h) _OPT_MERGED_NO_MERGED("no-merged", f, h)
#define OPT_REF_SORT(var) \
- OPT_CALLBACK_F(0, "sort", (var), \
- N_("key"), N_("field name to sort on"), \
- PARSE_OPT_NONEG, parse_opt_ref_sorting)
+ OPT_STRING_LIST(0, "sort", (var), \
+ N_("key"), N_("field name to sort on"))
/*
* API for filtering a set of refs. Based on the type of refs the user
@@ -121,12 +117,10 @@ int format_ref_array_item(struct ref_array_item *info,
struct ref_format *format,
struct strbuf *final_buf,
struct strbuf *error_buf);
-/* Parse a single sort specifier and add it to the list */
-void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *atom);
-/* Callback function for parsing the sort option */
-int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset);
-/* Default sort option based on refname */
-struct ref_sorting *ref_default_sorting(void);
+/* Release a "struct ref_sorting" */
+void ref_sorting_release(struct ref_sorting *);
+/* Convert list of sort options into ref_sorting */
+struct ref_sorting *ref_sorting_options(struct string_list *);
/* Function to parse --merged and --no-merged options */
int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset);
/* Get the current HEAD's description */
diff --git a/reflog-walk.c b/reflog-walk.c
index 8ac4b28..7aa6595 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -8,7 +8,7 @@
struct complete_reflogs {
char *ref;
- const char *short_ref;
+ char *short_ref;
struct reflog_info {
struct object_id ooid, noid;
char *email;
@@ -51,9 +51,16 @@ static void free_complete_reflog(struct complete_reflogs *array)
}
free(array->items);
free(array->ref);
+ free(array->short_ref);
free(array);
}
+static void complete_reflogs_clear(void *util, const char *str)
+{
+ struct complete_reflogs *array = util;
+ free_complete_reflog(array);
+}
+
static struct complete_reflogs *read_complete_reflog(const char *ref)
{
struct complete_reflogs *reflogs =
@@ -116,6 +123,21 @@ void init_reflog_walk(struct reflog_walk_info **info)
(*info)->complete_reflogs.strdup_strings = 1;
}
+void reflog_walk_info_release(struct reflog_walk_info *info)
+{
+ size_t i;
+
+ if (!info)
+ return;
+
+ for (i = 0; i < info->nr; i++)
+ free(info->logs[i]);
+ string_list_clear_func(&info->complete_reflogs,
+ complete_reflogs_clear);
+ free(info->logs);
+ free(info);
+}
+
int add_reflog_for_walk(struct reflog_walk_info *info,
struct commit *commit, const char *name)
{
diff --git a/reflog-walk.h b/reflog-walk.h
index f26408f..8076f10 100644
--- a/reflog-walk.h
+++ b/reflog-walk.h
@@ -5,8 +5,10 @@
struct commit;
struct reflog_walk_info;
+struct date_mode;
void init_reflog_walk(struct reflog_walk_info **info);
+void reflog_walk_info_release(struct reflog_walk_info *info);
int add_reflog_for_walk(struct reflog_walk_info *info,
struct commit *commit, const char *name);
void show_reflog_message(struct reflog_walk_info *info, int,
diff --git a/reflog.c b/reflog.c
new file mode 100644
index 0000000..135a1a6
--- /dev/null
+++ b/reflog.c
@@ -0,0 +1,434 @@
+#include "cache.h"
+#include "object-store.h"
+#include "reflog.h"
+#include "refs.h"
+#include "revision.h"
+#include "worktree.h"
+
+/* Remember to update object flag allocation in object.h */
+#define INCOMPLETE (1u<<10)
+#define STUDYING (1u<<11)
+#define REACHABLE (1u<<12)
+
+static int tree_is_complete(const struct object_id *oid)
+{
+ struct tree_desc desc;
+ struct name_entry entry;
+ int complete;
+ struct tree *tree;
+
+ tree = lookup_tree(the_repository, oid);
+ if (!tree)
+ return 0;
+ if (tree->object.flags & SEEN)
+ return 1;
+ if (tree->object.flags & INCOMPLETE)
+ return 0;
+
+ if (!tree->buffer) {
+ enum object_type type;
+ unsigned long size;
+ void *data = read_object_file(oid, &type, &size);
+ if (!data) {
+ tree->object.flags |= INCOMPLETE;
+ return 0;
+ }
+ tree->buffer = data;
+ tree->size = size;
+ }
+ init_tree_desc(&desc, tree->buffer, tree->size);
+ complete = 1;
+ while (tree_entry(&desc, &entry)) {
+ if (!has_object_file(&entry.oid) ||
+ (S_ISDIR(entry.mode) && !tree_is_complete(&entry.oid))) {
+ tree->object.flags |= INCOMPLETE;
+ complete = 0;
+ }
+ }
+ free_tree_buffer(tree);
+
+ if (complete)
+ tree->object.flags |= SEEN;
+ return complete;
+}
+
+static int commit_is_complete(struct commit *commit)
+{
+ struct object_array study;
+ struct object_array found;
+ int is_incomplete = 0;
+ int i;
+
+ /* early return */
+ if (commit->object.flags & SEEN)
+ return 1;
+ if (commit->object.flags & INCOMPLETE)
+ return 0;
+ /*
+ * Find all commits that are reachable and are not marked as
+ * SEEN. Then make sure the trees and blobs contained are
+ * complete. After that, mark these commits also as SEEN.
+ * If some of the objects that are needed to complete this
+ * commit are missing, mark this commit as INCOMPLETE.
+ */
+ memset(&study, 0, sizeof(study));
+ memset(&found, 0, sizeof(found));
+ add_object_array(&commit->object, NULL, &study);
+ add_object_array(&commit->object, NULL, &found);
+ commit->object.flags |= STUDYING;
+ while (study.nr) {
+ struct commit *c;
+ struct commit_list *parent;
+
+ c = (struct commit *)object_array_pop(&study);
+ if (!c->object.parsed && !parse_object(the_repository, &c->object.oid))
+ c->object.flags |= INCOMPLETE;
+
+ if (c->object.flags & INCOMPLETE) {
+ is_incomplete = 1;
+ break;
+ }
+ else if (c->object.flags & SEEN)
+ continue;
+ for (parent = c->parents; parent; parent = parent->next) {
+ struct commit *p = parent->item;
+ if (p->object.flags & STUDYING)
+ continue;
+ p->object.flags |= STUDYING;
+ add_object_array(&p->object, NULL, &study);
+ add_object_array(&p->object, NULL, &found);
+ }
+ }
+ if (!is_incomplete) {
+ /*
+ * make sure all commits in "found" array have all the
+ * necessary objects.
+ */
+ for (i = 0; i < found.nr; i++) {
+ struct commit *c =
+ (struct commit *)found.objects[i].item;
+ if (!tree_is_complete(get_commit_tree_oid(c))) {
+ is_incomplete = 1;
+ c->object.flags |= INCOMPLETE;
+ }
+ }
+ if (!is_incomplete) {
+ /* mark all found commits as complete, iow SEEN */
+ for (i = 0; i < found.nr; i++)
+ found.objects[i].item->flags |= SEEN;
+ }
+ }
+ /* clear flags from the objects we traversed */
+ for (i = 0; i < found.nr; i++)
+ found.objects[i].item->flags &= ~STUDYING;
+ if (is_incomplete)
+ commit->object.flags |= INCOMPLETE;
+ else {
+ /*
+ * If we come here, we have (1) traversed the ancestry chain
+ * from the "commit" until we reach SEEN commits (which are
+ * known to be complete), and (2) made sure that the commits
+ * encountered during the above traversal refer to trees that
+ * are complete. Which means that we know *all* the commits
+ * we have seen during this process are complete.
+ */
+ for (i = 0; i < found.nr; i++)
+ found.objects[i].item->flags |= SEEN;
+ }
+ /* free object arrays */
+ object_array_clear(&study);
+ object_array_clear(&found);
+ return !is_incomplete;
+}
+
+static int keep_entry(struct commit **it, struct object_id *oid)
+{
+ struct commit *commit;
+
+ if (is_null_oid(oid))
+ return 1;
+ commit = lookup_commit_reference_gently(the_repository, oid, 1);
+ if (!commit)
+ return 0;
+
+ /*
+ * Make sure everything in this commit exists.
+ *
+ * We have walked all the objects reachable from the refs
+ * and cache earlier. The commits reachable by this commit
+ * must meet SEEN commits -- and then we should mark them as
+ * SEEN as well.
+ */
+ if (!commit_is_complete(commit))
+ return 0;
+ *it = commit;
+ return 1;
+}
+
+/*
+ * Starting from commits in the cb->mark_list, mark commits that are
+ * reachable from them. Stop the traversal at commits older than
+ * the expire_limit and queue them back, so that the caller can call
+ * us again to restart the traversal with longer expire_limit.
+ */
+static void mark_reachable(struct expire_reflog_policy_cb *cb)
+{
+ struct commit_list *pending;
+ timestamp_t expire_limit = cb->mark_limit;
+ struct commit_list *leftover = NULL;
+
+ for (pending = cb->mark_list; pending; pending = pending->next)
+ pending->item->object.flags &= ~REACHABLE;
+
+ pending = cb->mark_list;
+ while (pending) {
+ struct commit_list *parent;
+ struct commit *commit = pop_commit(&pending);
+ if (commit->object.flags & REACHABLE)
+ continue;
+ if (parse_commit(commit))
+ continue;
+ commit->object.flags |= REACHABLE;
+ if (commit->date < expire_limit) {
+ commit_list_insert(commit, &leftover);
+ continue;
+ }
+ commit->object.flags |= REACHABLE;
+ parent = commit->parents;
+ while (parent) {
+ commit = parent->item;
+ parent = parent->next;
+ if (commit->object.flags & REACHABLE)
+ continue;
+ commit_list_insert(commit, &pending);
+ }
+ }
+ cb->mark_list = leftover;
+}
+
+static int unreachable(struct expire_reflog_policy_cb *cb, struct commit *commit, struct object_id *oid)
+{
+ /*
+ * We may or may not have the commit yet - if not, look it
+ * up using the supplied sha1.
+ */
+ if (!commit) {
+ if (is_null_oid(oid))
+ return 0;
+
+ commit = lookup_commit_reference_gently(the_repository, oid,
+ 1);
+
+ /* Not a commit -- keep it */
+ if (!commit)
+ return 0;
+ }
+
+ /* Reachable from the current ref? Don't prune. */
+ if (commit->object.flags & REACHABLE)
+ return 0;
+
+ if (cb->mark_list && cb->mark_limit) {
+ cb->mark_limit = 0; /* dig down to the root */
+ mark_reachable(cb);
+ }
+
+ return !(commit->object.flags & REACHABLE);
+}
+
+/*
+ * Return true iff the specified reflog entry should be expired.
+ */
+int should_expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
+ const char *email, timestamp_t timestamp, int tz,
+ const char *message, void *cb_data)
+{
+ struct expire_reflog_policy_cb *cb = cb_data;
+ struct commit *old_commit, *new_commit;
+
+ if (timestamp < cb->cmd.expire_total)
+ return 1;
+
+ old_commit = new_commit = NULL;
+ if (cb->cmd.stalefix &&
+ (!keep_entry(&old_commit, ooid) || !keep_entry(&new_commit, noid)))
+ return 1;
+
+ if (timestamp < cb->cmd.expire_unreachable) {
+ switch (cb->unreachable_expire_kind) {
+ case UE_ALWAYS:
+ return 1;
+ case UE_NORMAL:
+ case UE_HEAD:
+ if (unreachable(cb, old_commit, ooid) || unreachable(cb, new_commit, noid))
+ return 1;
+ break;
+ }
+ }
+
+ if (cb->cmd.recno && --(cb->cmd.recno) == 0)
+ return 1;
+
+ return 0;
+}
+
+int should_expire_reflog_ent_verbose(struct object_id *ooid,
+ struct object_id *noid,
+ const char *email,
+ timestamp_t timestamp, int tz,
+ const char *message, void *cb_data)
+{
+ struct expire_reflog_policy_cb *cb = cb_data;
+ int expire;
+
+ expire = should_expire_reflog_ent(ooid, noid, email, timestamp, tz,
+ message, cb);
+
+ if (!expire)
+ printf("keep %s", message);
+ else if (cb->dry_run)
+ printf("would prune %s", message);
+ else
+ printf("prune %s", message);
+
+ return expire;
+}
+
+static int push_tip_to_list(const char *refname, const struct object_id *oid,
+ int flags, void *cb_data)
+{
+ struct commit_list **list = cb_data;
+ struct commit *tip_commit;
+ if (flags & REF_ISSYMREF)
+ return 0;
+ tip_commit = lookup_commit_reference_gently(the_repository, oid, 1);
+ if (!tip_commit)
+ return 0;
+ commit_list_insert(tip_commit, list);
+ return 0;
+}
+
+static int is_head(const char *refname)
+{
+ switch (ref_type(refname)) {
+ case REF_TYPE_OTHER_PSEUDOREF:
+ case REF_TYPE_MAIN_PSEUDOREF:
+ if (parse_worktree_ref(refname, NULL, NULL, &refname))
+ BUG("not a worktree ref: %s", refname);
+ break;
+ default:
+ break;
+ }
+ return !strcmp(refname, "HEAD");
+}
+
+void reflog_expiry_prepare(const char *refname,
+ const struct object_id *oid,
+ void *cb_data)
+{
+ struct expire_reflog_policy_cb *cb = cb_data;
+ struct commit_list *elem;
+ struct commit *commit = NULL;
+
+ if (!cb->cmd.expire_unreachable || is_head(refname)) {
+ cb->unreachable_expire_kind = UE_HEAD;
+ } else {
+ commit = lookup_commit(the_repository, oid);
+ if (commit && is_null_oid(&commit->object.oid))
+ commit = NULL;
+ cb->unreachable_expire_kind = commit ? UE_NORMAL : UE_ALWAYS;
+ }
+
+ if (cb->cmd.expire_unreachable <= cb->cmd.expire_total)
+ cb->unreachable_expire_kind = UE_ALWAYS;
+
+ switch (cb->unreachable_expire_kind) {
+ case UE_ALWAYS:
+ return;
+ case UE_HEAD:
+ for_each_ref(push_tip_to_list, &cb->tips);
+ for (elem = cb->tips; elem; elem = elem->next)
+ commit_list_insert(elem->item, &cb->mark_list);
+ break;
+ case UE_NORMAL:
+ commit_list_insert(commit, &cb->mark_list);
+ /* For reflog_expiry_cleanup() below */
+ cb->tip_commit = commit;
+ }
+ cb->mark_limit = cb->cmd.expire_total;
+ mark_reachable(cb);
+}
+
+void reflog_expiry_cleanup(void *cb_data)
+{
+ struct expire_reflog_policy_cb *cb = cb_data;
+ struct commit_list *elem;
+
+ switch (cb->unreachable_expire_kind) {
+ case UE_ALWAYS:
+ return;
+ case UE_HEAD:
+ for (elem = cb->tips; elem; elem = elem->next)
+ clear_commit_marks(elem->item, REACHABLE);
+ free_commit_list(cb->tips);
+ break;
+ case UE_NORMAL:
+ clear_commit_marks(cb->tip_commit, REACHABLE);
+ break;
+ }
+}
+
+int count_reflog_ent(struct object_id *ooid, struct object_id *noid,
+ const char *email, timestamp_t timestamp, int tz,
+ const char *message, void *cb_data)
+{
+ struct cmd_reflog_expire_cb *cb = cb_data;
+ if (!cb->expire_total || timestamp < cb->expire_total)
+ cb->recno++;
+ return 0;
+}
+
+int reflog_delete(const char *rev, enum expire_reflog_flags flags, int verbose)
+{
+ struct cmd_reflog_expire_cb cmd = { 0 };
+ int status = 0;
+ reflog_expiry_should_prune_fn *should_prune_fn = should_expire_reflog_ent;
+ const char *spec = strstr(rev, "@{");
+ char *ep, *ref;
+ int recno;
+ struct expire_reflog_policy_cb cb = {
+ .dry_run = !!(flags & EXPIRE_REFLOGS_DRY_RUN),
+ };
+
+ if (verbose)
+ should_prune_fn = should_expire_reflog_ent_verbose;
+
+ if (!spec)
+ return error(_("not a reflog: %s"), rev);
+
+ if (!dwim_log(rev, spec - rev, NULL, &ref)) {
+ status |= error(_("no reflog for '%s'"), rev);
+ goto cleanup;
+ }
+
+ recno = strtoul(spec + 2, &ep, 10);
+ if (*ep == '}') {
+ cmd.recno = -recno;
+ for_each_reflog_ent(ref, count_reflog_ent, &cmd);
+ } else {
+ cmd.expire_total = approxidate(spec + 2);
+ for_each_reflog_ent(ref, count_reflog_ent, &cmd);
+ cmd.expire_total = 0;
+ }
+
+ cb.cmd = cmd;
+ status |= reflog_expire(ref, flags,
+ reflog_expiry_prepare,
+ should_prune_fn,
+ reflog_expiry_cleanup,
+ &cb);
+
+ cleanup:
+ free(ref);
+ return status;
+}
diff --git a/reflog.h b/reflog.h
new file mode 100644
index 0000000..d2906fb
--- /dev/null
+++ b/reflog.h
@@ -0,0 +1,43 @@
+#ifndef REFLOG_H
+#define REFLOG_H
+#include "refs.h"
+
+struct cmd_reflog_expire_cb {
+ int stalefix;
+ int explicit_expiry;
+ timestamp_t expire_total;
+ timestamp_t expire_unreachable;
+ int recno;
+};
+
+struct expire_reflog_policy_cb {
+ enum {
+ UE_NORMAL,
+ UE_ALWAYS,
+ UE_HEAD
+ } unreachable_expire_kind;
+ struct commit_list *mark_list;
+ unsigned long mark_limit;
+ struct cmd_reflog_expire_cb cmd;
+ struct commit *tip_commit;
+ struct commit_list *tips;
+ unsigned int dry_run:1;
+};
+
+int reflog_delete(const char *rev, enum expire_reflog_flags flags,
+ int verbose);
+void reflog_expiry_cleanup(void *cb_data);
+void reflog_expiry_prepare(const char *refname, const struct object_id *oid,
+ void *cb_data);
+int should_expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
+ const char *email, timestamp_t timestamp, int tz,
+ const char *message, void *cb_data);
+int count_reflog_ent(struct object_id *ooid, struct object_id *noid,
+ const char *email, timestamp_t timestamp, int tz,
+ const char *message, void *cb_data);
+int should_expire_reflog_ent_verbose(struct object_id *ooid,
+ struct object_id *noid,
+ const char *email,
+ timestamp_t timestamp, int tz,
+ const char *message, void *cb_data);
+#endif /* REFLOG_H */
diff --git a/refs.c b/refs.c
index 2166f37..90bcb27 100644
--- a/refs.c
+++ b/refs.c
@@ -10,6 +10,7 @@
#include "refs.h"
#include "refs/refs-internal.h"
#include "run-command.h"
+#include "hook.h"
#include "object-store.h"
#include "object.h"
#include "tag.h"
@@ -18,6 +19,7 @@
#include "strvec.h"
#include "repository.h"
#include "sigchain.h"
+#include "date.h"
/*
* List of all available backends
@@ -250,12 +252,13 @@ int refname_is_safe(const char *refname)
* does not exist, emit a warning and return false.
*/
int ref_resolves_to_object(const char *refname,
+ struct repository *repo,
const struct object_id *oid,
unsigned int flags)
{
if (flags & REF_ISBROKEN)
return 0;
- if (!has_object_file(oid)) {
+ if (!repo_has_object_file(repo, oid)) {
error(_("%s does not point to a valid object!"), refname);
return 0;
}
@@ -289,18 +292,14 @@ struct ref_filter {
void *cb_data;
};
-int refs_read_ref_full(struct ref_store *refs, const char *refname,
- int resolve_flags, struct object_id *oid, int *flags)
-{
- if (refs_resolve_ref_unsafe(refs, refname, resolve_flags, oid, flags))
- return 0;
- return -1;
-}
-
int read_ref_full(const char *refname, int resolve_flags, struct object_id *oid, int *flags)
{
- return refs_read_ref_full(get_main_ref_store(the_repository), refname,
- resolve_flags, oid, flags);
+ struct ref_store *refs = get_main_ref_store(the_repository);
+
+ if (refs_resolve_ref_unsafe(refs, refname, resolve_flags,
+ oid, flags))
+ return 0;
+ return -1;
}
int read_ref(const char *refname, struct object_id *oid)
@@ -310,7 +309,8 @@ int read_ref(const char *refname, struct object_id *oid)
int refs_ref_exists(struct ref_store *refs, const char *refname)
{
- return !!refs_resolve_ref_unsafe(refs, refname, RESOLVE_REF_READING, NULL, NULL);
+ return !!refs_resolve_ref_unsafe(refs, refname, RESOLVE_REF_READING,
+ NULL, NULL);
}
int ref_exists(const char *refname)
@@ -653,12 +653,13 @@ int expand_ref(struct repository *repo, const char *str, int len,
struct object_id oid_from_ref;
struct object_id *this_result;
int flag;
+ struct ref_store *refs = get_main_ref_store(repo);
this_result = refs_found ? &oid_from_ref : oid;
strbuf_reset(&fullref);
strbuf_addf(&fullref, *p, len, str);
- r = refs_resolve_ref_unsafe(get_main_ref_store(repo),
- fullref.buf, RESOLVE_REF_READING,
+ r = refs_resolve_ref_unsafe(refs, fullref.buf,
+ RESOLVE_REF_READING,
this_result, &flag);
if (r) {
if (!refs_found++)
@@ -1076,9 +1077,10 @@ int ref_transaction_update(struct ref_transaction *transaction,
{
assert(err);
- if ((new_oid && !is_null_oid(new_oid)) ?
- check_refname_format(refname, REFNAME_ALLOW_ONELEVEL) :
- !refname_is_safe(refname)) {
+ if (!(flags & REF_SKIP_REFNAME_VERIFICATION) &&
+ ((new_oid && !is_null_oid(new_oid)) ?
+ check_refname_format(refname, REFNAME_ALLOW_ONELEVEL) :
+ !refname_is_safe(refname))) {
strbuf_addf(err, _("refusing to update ref with bad name '%s'"),
refname);
return -1;
@@ -1087,6 +1089,13 @@ int ref_transaction_update(struct ref_transaction *transaction,
if (flags & ~REF_TRANSACTION_UPDATE_ALLOWED_FLAGS)
BUG("illegal flags 0x%x passed to ref_transaction_update()", flags);
+ /*
+ * Clear flags outside the allowed set; this should be a noop because
+ * of the BUG() check above, but it works around a -Wnonnull warning
+ * with some versions of "gcc -O3".
+ */
+ flags &= REF_TRANSACTION_UPDATE_ALLOWED_FLAGS;
+
flags |= (new_oid ? REF_HAVE_NEW : 0) | (old_oid ? REF_HAVE_OLD : 0);
ref_transaction_add_update(transaction, refname, flags,
@@ -1100,8 +1109,10 @@ int ref_transaction_create(struct ref_transaction *transaction,
unsigned int flags, const char *msg,
struct strbuf *err)
{
- if (!new_oid || is_null_oid(new_oid))
- BUG("create called without valid new_oid");
+ if (!new_oid || is_null_oid(new_oid)) {
+ strbuf_addf(err, "'%s' has a null OID", refname);
+ return 1;
+ }
return ref_transaction_update(transaction, refname, new_oid,
null_oid(), flags, msg, err);
}
@@ -1371,32 +1382,13 @@ const char *find_descendant_ref(const char *dirname,
return NULL;
}
-int refs_rename_ref_available(struct ref_store *refs,
- const char *old_refname,
- const char *new_refname)
-{
- struct string_list skip = STRING_LIST_INIT_NODUP;
- struct strbuf err = STRBUF_INIT;
- int ok;
-
- string_list_insert(&skip, old_refname);
- ok = !refs_verify_refname_available(refs, new_refname,
- NULL, &skip, &err);
- if (!ok)
- error("%s", err.buf);
-
- string_list_clear(&skip, 0);
- strbuf_release(&err);
- return ok;
-}
-
int refs_head_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
{
struct object_id oid;
int flag;
- if (!refs_read_ref_full(refs, "HEAD", RESOLVE_REF_READING,
- &oid, &flag))
+ if (refs_resolve_ref_unsafe(refs, "HEAD", RESOLVE_REF_READING,
+ &oid, &flag))
return fn("HEAD", &oid, flag, cb_data);
return 0;
@@ -1647,7 +1639,8 @@ int for_each_fullref_in_prefixes(const char *namespace,
static int refs_read_special_head(struct ref_store *ref_store,
const char *refname, struct object_id *oid,
- struct strbuf *referent, unsigned int *type)
+ struct strbuf *referent, unsigned int *type,
+ int *failure_errno)
{
struct strbuf full_path = STRBUF_INIT;
struct strbuf content = STRBUF_INIT;
@@ -1657,7 +1650,8 @@ static int refs_read_special_head(struct ref_store *ref_store,
if (strbuf_read_file(&content, full_path.buf, 0) < 0)
goto done;
- result = parse_loose_ref_contents(content.buf, oid, referent, type);
+ result = parse_loose_ref_contents(content.buf, oid, referent, type,
+ failure_errno);
done:
strbuf_release(&full_path);
@@ -1665,24 +1659,31 @@ static int refs_read_special_head(struct ref_store *ref_store,
return result;
}
-int refs_read_raw_ref(struct ref_store *ref_store,
- const char *refname, struct object_id *oid,
- struct strbuf *referent, unsigned int *type)
+int refs_read_raw_ref(struct ref_store *ref_store, const char *refname,
+ struct object_id *oid, struct strbuf *referent,
+ unsigned int *type, int *failure_errno)
{
+ assert(failure_errno);
if (!strcmp(refname, "FETCH_HEAD") || !strcmp(refname, "MERGE_HEAD")) {
return refs_read_special_head(ref_store, refname, oid, referent,
- type);
+ type, failure_errno);
}
return ref_store->be->read_raw_ref(ref_store, refname, oid, referent,
- type, &errno);
+ type, failure_errno);
}
-/* This function needs to return a meaningful errno on failure */
+int refs_read_symbolic_ref(struct ref_store *ref_store, const char *refname,
+ struct strbuf *referent)
+{
+ return ref_store->be->read_symbolic_ref(ref_store, refname, referent);
+}
+
const char *refs_resolve_ref_unsafe(struct ref_store *refs,
const char *refname,
int resolve_flags,
- struct object_id *oid, int *flags)
+ struct object_id *oid,
+ int *flags)
{
static struct strbuf sb_refname = STRBUF_INIT;
struct object_id unused_oid;
@@ -1698,10 +1699,8 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
- !refname_is_safe(refname)) {
- errno = EINVAL;
+ !refname_is_safe(refname))
return NULL;
- }
/*
* dwim_ref() uses REF_ISBROKEN to distinguish between
@@ -1716,9 +1715,10 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
for (symref_count = 0; symref_count < SYMREF_MAXDEPTH; symref_count++) {
unsigned int read_flags = 0;
+ int failure_errno;
- if (refs_read_raw_ref(refs, refname,
- oid, &sb_refname, &read_flags)) {
+ if (refs_read_raw_ref(refs, refname, oid, &sb_refname,
+ &read_flags, &failure_errno)) {
*flags |= read_flags;
/* In reading mode, refs must eventually resolve */
@@ -1730,9 +1730,9 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
* may show errors besides ENOENT if there are
* similarly-named refs.
*/
- if (errno != ENOENT &&
- errno != EISDIR &&
- errno != ENOTDIR)
+ if (failure_errno != ENOENT &&
+ failure_errno != EISDIR &&
+ failure_errno != ENOTDIR)
return NULL;
oidclr(oid);
@@ -1758,16 +1758,13 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
}
if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
- !refname_is_safe(refname)) {
- errno = EINVAL;
+ !refname_is_safe(refname))
return NULL;
- }
*flags |= REF_ISBROKEN | REF_BAD_NAME;
}
}
- errno = ELOOP;
return NULL;
}
@@ -1869,7 +1866,8 @@ static struct ref_store *lookup_ref_store_map(struct hashmap *map,
* Create, record, and return a ref_store instance for the specified
* gitdir.
*/
-static struct ref_store *ref_store_init(const char *gitdir,
+static struct ref_store *ref_store_init(struct repository *repo,
+ const char *gitdir,
unsigned int flags)
{
const char *be_name = "files";
@@ -1879,7 +1877,7 @@ static struct ref_store *ref_store_init(const char *gitdir,
if (!be)
BUG("reference backend %s is unknown", be_name);
- refs = be->init(gitdir, flags);
+ refs = be->init(repo, gitdir, flags);
return refs;
}
@@ -1891,7 +1889,7 @@ struct ref_store *get_main_ref_store(struct repository *r)
if (!r->gitdir)
BUG("attempting to get main_ref_store outside of repository");
- r->refs_private = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS);
+ r->refs_private = ref_store_init(r, r->gitdir, REF_STORE_ALL_CAPS);
r->refs_private = maybe_debug_wrap_ref_store(r->gitdir, r->refs_private);
return r->refs_private;
}
@@ -1921,6 +1919,7 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
struct ref_store *refs;
char *to_free = NULL;
size_t len;
+ struct repository *subrepo;
if (!submodule)
return NULL;
@@ -1946,8 +1945,19 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
if (submodule_to_gitdir(&submodule_sb, submodule))
goto done;
- /* assume that add_submodule_odb() has been called */
- refs = ref_store_init(submodule_sb.buf,
+ subrepo = xmalloc(sizeof(*subrepo));
+ /*
+ * NEEDSWORK: Make get_submodule_ref_store() work with arbitrary
+ * superprojects other than the_repository. This probably should be
+ * done by making it take a struct repository * parameter instead of a
+ * submodule path.
+ */
+ if (repo_submodule_init(subrepo, the_repository, submodule,
+ null_oid())) {
+ free(subrepo);
+ goto done;
+ }
+ refs = ref_store_init(subrepo, submodule_sb.buf,
REF_STORE_READ | REF_STORE_ODB);
register_ref_store_map(&submodule_ref_stores, "submodule",
refs, submodule);
@@ -1973,10 +1983,12 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt)
return refs;
if (wt->id)
- refs = ref_store_init(git_common_path("worktrees/%s", wt->id),
+ refs = ref_store_init(the_repository,
+ git_common_path("worktrees/%s", wt->id),
REF_STORE_ALL_CAPS);
else
- refs = ref_store_init(get_git_common_dir(),
+ refs = ref_store_init(the_repository,
+ get_git_common_dir(),
REF_STORE_ALL_CAPS);
if (refs)
@@ -1985,10 +1997,12 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt)
return refs;
}
-void base_ref_store_init(struct ref_store *refs,
- const struct ref_storage_be *be)
+void base_ref_store_init(struct ref_store *refs, struct repository *repo,
+ const char *path, const struct ref_storage_be *be)
{
refs->be = be;
+ refs->repo = repo;
+ refs->gitdir = xstrdup(path);
}
/* backend functions */
@@ -2085,8 +2099,11 @@ static int run_transaction_hook(struct ref_transaction *transaction,
update->refname);
if (write_in_full(proc.in, buf.buf, buf.len) < 0) {
- if (errno != EPIPE)
+ if (errno != EPIPE) {
+ /* Don't leak errno outside this API */
+ errno = 0;
ret = -1;
+ }
break;
}
}
@@ -2120,7 +2137,7 @@ int ref_transaction_prepare(struct ref_transaction *transaction,
break;
}
- if (getenv(GIT_QUARANTINE_ENVIRONMENT)) {
+ if (refs->repo->objects->odb->disable_ref_updates) {
strbuf_addstr(err,
_("ref updates forbidden inside quarantine environment"));
return -1;
@@ -2221,6 +2238,13 @@ int refs_verify_refname_available(struct ref_store *refs,
strbuf_grow(&dirname, strlen(refname) + 1);
for (slash = strchr(refname, '/'); slash; slash = strchr(slash + 1, '/')) {
+ /*
+ * Just saying "Is a directory" when we e.g. can't
+ * lock some multi-level ref isn't very informative,
+ * the user won't be told *what* is a directory, so
+ * let's not use strerror() below.
+ */
+ int ignore_errno;
/* Expand dirname to the new prefix, not including the trailing slash: */
strbuf_add(&dirname, refname + dirname.len, slash - refname - dirname.len);
@@ -2232,7 +2256,8 @@ int refs_verify_refname_available(struct ref_store *refs,
if (skip && string_list_has_string(skip, dirname.buf))
continue;
- if (!refs_read_raw_ref(refs, dirname.buf, &oid, &referent, &type)) {
+ if (!refs_read_raw_ref(refs, dirname.buf, &oid, &referent,
+ &type, &ignore_errno)) {
strbuf_addf(err, _("'%s' exists; cannot create '%s'"),
dirname.buf, refname);
goto cleanup;
@@ -2341,16 +2366,15 @@ int reflog_exists(const char *refname)
}
int refs_create_reflog(struct ref_store *refs, const char *refname,
- int force_create, struct strbuf *err)
-{
- return refs->be->create_reflog(refs, refname, force_create, err);
-}
-
-int safe_create_reflog(const char *refname, int force_create,
struct strbuf *err)
{
+ return refs->be->create_reflog(refs, refname, err);
+}
+
+int safe_create_reflog(const char *refname, struct strbuf *err)
+{
return refs_create_reflog(get_main_ref_store(the_repository), refname,
- force_create, err);
+ err);
}
int refs_delete_reflog(struct ref_store *refs, const char *refname)
@@ -2397,6 +2421,22 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
return refs->be->initial_transaction_commit(refs, transaction, err);
}
+void ref_transaction_for_each_queued_update(struct ref_transaction *transaction,
+ ref_transaction_for_each_queued_update_fn cb,
+ void *cb_data)
+{
+ int i;
+
+ for (i = 0; i < transaction->nr; i++) {
+ struct ref_update *update = transaction->updates[i];
+
+ cb(update->refname,
+ (update->flags & REF_HAVE_OLD) ? &update->old_oid : NULL,
+ (update->flags & REF_HAVE_NEW) ? &update->new_oid : NULL,
+ cb_data);
+ }
+}
+
int refs_delete_refs(struct ref_store *refs, const char *logmsg,
struct string_list *refnames, unsigned int flags)
{
diff --git a/refs.h b/refs.h
index d5099d4..47cb9ed 100644
--- a/refs.h
+++ b/refs.h
@@ -68,6 +68,7 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
int resolve_flags,
struct object_id *oid,
int *flags);
+
const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
struct object_id *oid, int *flags);
@@ -77,12 +78,13 @@ char *refs_resolve_refdup(struct ref_store *refs,
char *resolve_refdup(const char *refname, int resolve_flags,
struct object_id *oid, int *flags);
-int refs_read_ref_full(struct ref_store *refs, const char *refname,
- int resolve_flags, struct object_id *oid, int *flags);
int read_ref_full(const char *refname, int resolve_flags,
struct object_id *oid, int *flags);
int read_ref(const char *refname, struct object_id *oid);
+int refs_read_symbolic_ref(struct ref_store *ref_store, const char *refname,
+ struct strbuf *referent);
+
/*
* Return 0 if a reference named refname could be created without
* conflicting with the name of an existing reference. Otherwise,
@@ -413,8 +415,8 @@ int refs_pack_refs(struct ref_store *refs, unsigned int flags);
* Setup reflog before using. Fill in err and return -1 on failure.
*/
int refs_create_reflog(struct ref_store *refs, const char *refname,
- int force_create, struct strbuf *err);
-int safe_create_reflog(const char *refname, int force_create, struct strbuf *err);
+ struct strbuf *err);
+int safe_create_reflog(const char *refname, struct strbuf *err);
/** Reads log for the value of ref during at_time. **/
int read_ref_at(struct ref_store *refs,
@@ -459,7 +461,29 @@ int delete_reflog(const char *refname);
/*
* Callback to process a reflog entry found by the iteration functions (see
- * below)
+ * below).
+ *
+ * The committer parameter is a single string, in the form
+ * "$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" (without double quotes).
+ *
+ * The timestamp parameter gives the time when entry was created as the number
+ * of seconds since the UNIX epoch.
+ *
+ * The tz parameter gives the timezone offset for the user who created
+ * the reflog entry, and its value gives a positive or negative offset
+ * from UTC. Its absolute value is formed by multiplying the hour
+ * part by 100 and adding the minute part. For example, 1 hour ahead
+ * of UTC, CET == "+0100", is represented as positive one hundred (not
+ * postiive sixty).
+ *
+ * The msg parameter is a single complete line; a reflog message given
+ * to refs_delete_ref, refs_update_ref, etc. is returned to the
+ * callback normalized---each run of whitespaces are squashed into a
+ * single whitespace, trailing whitespace, if exists, is trimmed, and
+ * then a single LF is added at the end.
+ *
+ * The cb_data is a caller-supplied pointer given to the iterator
+ * functions.
*/
typedef int each_reflog_ent_fn(
struct object_id *old_oid, struct object_id *new_oid,
@@ -612,11 +636,23 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
#define REF_FORCE_CREATE_REFLOG (1 << 1)
/*
+ * Blindly write an object_id. This is useful for testing data corruption
+ * scenarios.
+ */
+#define REF_SKIP_OID_VERIFICATION (1 << 10)
+
+/*
+ * Skip verifying refname. This is useful for testing data corruption scenarios.
+ */
+#define REF_SKIP_REFNAME_VERIFICATION (1 << 11)
+
+/*
* Bitmask of all of the flags that are allowed to be passed in to
* ref_transaction_update() and friends:
*/
-#define REF_TRANSACTION_UPDATE_ALLOWED_FLAGS \
- (REF_NO_DEREF | REF_FORCE_CREATE_REFLOG)
+#define REF_TRANSACTION_UPDATE_ALLOWED_FLAGS \
+ (REF_NO_DEREF | REF_FORCE_CREATE_REFLOG | REF_SKIP_OID_VERIFICATION | \
+ REF_SKIP_REFNAME_VERIFICATION)
/*
* Add a reference update to transaction. `new_oid` is the value that
@@ -738,6 +774,20 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
struct strbuf *err);
/*
+ * Execute the given callback function for each of the reference updates which
+ * have been queued in the given transaction. `old_oid` and `new_oid` may be
+ * `NULL` pointers depending on whether the update has these object IDs set or
+ * not.
+ */
+typedef void ref_transaction_for_each_queued_update_fn(const char *refname,
+ const struct object_id *old_oid,
+ const struct object_id *new_oid,
+ void *cb_data);
+void ref_transaction_for_each_queued_update(struct ref_transaction *transaction,
+ ref_transaction_for_each_queued_update_fn cb,
+ void *cb_data);
+
+/*
* Free `*transaction` and all associated data.
*/
void ref_transaction_free(struct ref_transaction *transaction);
@@ -782,8 +832,7 @@ enum ref_type ref_type(const char *refname);
enum expire_reflog_flags {
EXPIRE_REFLOGS_DRY_RUN = 1 << 0,
EXPIRE_REFLOGS_UPDATE_REF = 1 << 1,
- EXPIRE_REFLOGS_VERBOSE = 1 << 2,
- EXPIRE_REFLOGS_REWRITE = 1 << 3
+ EXPIRE_REFLOGS_REWRITE = 1 << 2,
};
/*
diff --git a/refs/debug.c b/refs/debug.c
index 8667c64..eed8bc9 100644
--- a/refs/debug.c
+++ b/refs/debug.c
@@ -26,7 +26,8 @@ struct ref_store *maybe_debug_wrap_ref_store(const char *gitdir, struct ref_stor
be_copy->name = store->be->name;
trace_printf_key(&trace_refs, "ref_store for %s\n", gitdir);
res->refs = store;
- base_ref_store_init((struct ref_store *)res, be_copy);
+ base_ref_store_init((struct ref_store *)res, store->repo, gitdir,
+ be_copy);
return (struct ref_store *)res;
}
@@ -47,7 +48,8 @@ static int debug_transaction_prepare(struct ref_store *refs,
transaction->ref_store = drefs->refs;
res = drefs->refs->be->transaction_prepare(drefs->refs, transaction,
err);
- trace_printf_key(&trace_refs, "transaction_prepare: %d\n", res);
+ trace_printf_key(&trace_refs, "transaction_prepare: %d \"%s\"\n", res,
+ err->buf);
return res;
}
@@ -218,8 +220,9 @@ static int debug_ref_iterator_abort(struct ref_iterator *ref_iterator)
}
static struct ref_iterator_vtable debug_ref_iterator_vtable = {
- debug_ref_iterator_advance, debug_ref_iterator_peel,
- debug_ref_iterator_abort
+ .advance = debug_ref_iterator_advance,
+ .peel = debug_ref_iterator_peel,
+ .abort = debug_ref_iterator_abort,
};
static struct ref_iterator *
@@ -259,6 +262,24 @@ static int debug_read_raw_ref(struct ref_store *ref_store, const char *refname,
return res;
}
+static int debug_read_symbolic_ref(struct ref_store *ref_store, const char *refname,
+ struct strbuf *referent)
+{
+ struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+ struct ref_store *refs = drefs->refs;
+ int res;
+
+ res = refs->be->read_symbolic_ref(refs, refname, referent);
+ if (!res)
+ trace_printf_key(&trace_refs, "read_symbolic_ref: %s: (%s)\n",
+ refname, referent->buf);
+ else
+ trace_printf_key(&trace_refs,
+ "read_symbolic_ref: %s: %d\n", refname, res);
+ return res;
+
+}
+
static struct ref_iterator *
debug_reflog_iterator_begin(struct ref_store *ref_store)
{
@@ -284,6 +305,7 @@ static int debug_print_reflog_ent(struct object_id *old_oid,
int ret;
char o[GIT_MAX_HEXSZ + 1] = "null";
char n[GIT_MAX_HEXSZ + 1] = "null";
+ char *msgend = strchrnul(msg, '\n');
if (old_oid)
oid_to_hex_r(o, old_oid);
if (new_oid)
@@ -291,8 +313,10 @@ static int debug_print_reflog_ent(struct object_id *old_oid,
ret = dbg->fn(old_oid, new_oid, committer, timestamp, tz, msg,
dbg->cb_data);
- trace_printf_key(&trace_refs, "reflog_ent %s (ret %d): %s -> %s, %s %ld \"%s\"\n",
- dbg->refname, ret, o, n, committer, (long int)timestamp, msg);
+ trace_printf_key(&trace_refs,
+ "reflog_ent %s (ret %d): %s -> %s, %s %ld \"%.*s\"\n",
+ dbg->refname, ret, o, n, committer,
+ (long int)timestamp, (int)(msgend - msg), msg);
return ret;
}
@@ -339,11 +363,10 @@ static int debug_reflog_exists(struct ref_store *ref_store, const char *refname)
}
static int debug_create_reflog(struct ref_store *ref_store, const char *refname,
- int force_create, struct strbuf *err)
+ struct strbuf *err)
{
struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
- int res = drefs->refs->be->create_reflog(drefs->refs, refname,
- force_create, err);
+ int res = drefs->refs->be->create_reflog(drefs->refs, refname, err);
trace_printf_key(&trace_refs, "create_reflog: %s: %d\n", refname, res);
return res;
}
@@ -414,29 +437,37 @@ static int debug_reflog_expire(struct ref_store *ref_store, const char *refname,
}
struct ref_storage_be refs_be_debug = {
- NULL,
- "debug",
- NULL,
- debug_init_db,
- debug_transaction_prepare,
- debug_transaction_finish,
- debug_transaction_abort,
- debug_initial_transaction_commit,
+ .next = NULL,
+ .name = "debug",
+ .init = NULL,
+ .init_db = debug_init_db,
- debug_pack_refs,
- debug_create_symref,
- debug_delete_refs,
- debug_rename_ref,
- debug_copy_ref,
+ /*
+ * None of these should be NULL. If the "files" backend (in
+ * "struct ref_storage_be refs_be_files" in files-backend.c)
+ * has a function we should also have a wrapper for it here.
+ * Test the output with "GIT_TRACE_REFS=1".
+ */
+ .transaction_prepare = debug_transaction_prepare,
+ .transaction_finish = debug_transaction_finish,
+ .transaction_abort = debug_transaction_abort,
+ .initial_transaction_commit = debug_initial_transaction_commit,
- debug_ref_iterator_begin,
- debug_read_raw_ref,
+ .pack_refs = debug_pack_refs,
+ .create_symref = debug_create_symref,
+ .delete_refs = debug_delete_refs,
+ .rename_ref = debug_rename_ref,
+ .copy_ref = debug_copy_ref,
- debug_reflog_iterator_begin,
- debug_for_each_reflog_ent,
- debug_for_each_reflog_ent_reverse,
- debug_reflog_exists,
- debug_create_reflog,
- debug_delete_reflog,
- debug_reflog_expire,
+ .iterator_begin = debug_ref_iterator_begin,
+ .read_raw_ref = debug_read_raw_ref,
+ .read_symbolic_ref = debug_read_symbolic_ref,
+
+ .reflog_iterator_begin = debug_reflog_iterator_begin,
+ .for_each_reflog_ent = debug_for_each_reflog_ent,
+ .for_each_reflog_ent_reverse = debug_for_each_reflog_ent_reverse,
+ .reflog_exists = debug_reflog_exists,
+ .create_reflog = debug_create_reflog,
+ .delete_reflog = debug_delete_reflog,
+ .reflog_expire = debug_reflog_expire,
};
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 6a6ead0..8db7882 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -16,8 +16,7 @@
* This backend uses the following flags in `ref_update::flags` for
* internal bookkeeping purposes. Their numerical values must not
* conflict with REF_NO_DEREF, REF_FORCE_CREATE_REFLOG, REF_HAVE_NEW,
- * REF_HAVE_OLD, or REF_IS_PRUNING, which are also stored in
- * `ref_update::flags`.
+ * or REF_HAVE_OLD, which are also stored in `ref_update::flags`.
*/
/*
@@ -79,22 +78,20 @@ static void clear_loose_ref_cache(struct files_ref_store *refs)
* Create a new submodule ref cache and add it to the internal
* set of caches.
*/
-static struct ref_store *files_ref_store_create(const char *gitdir,
+static struct ref_store *files_ref_store_create(struct repository *repo,
+ const char *gitdir,
unsigned int flags)
{
struct files_ref_store *refs = xcalloc(1, sizeof(*refs));
struct ref_store *ref_store = (struct ref_store *)refs;
struct strbuf sb = STRBUF_INIT;
- ref_store->gitdir = xstrdup(gitdir);
- base_ref_store_init(ref_store, &refs_be_files);
+ base_ref_store_init(ref_store, repo, gitdir, &refs_be_files);
refs->store_flags = flags;
-
get_common_dir_noenv(&sb, gitdir);
refs->gitcommondir = strbuf_detach(&sb, NULL);
- strbuf_addf(&sb, "%s/packed-refs", refs->gitcommondir);
- refs->packed_ref_store = packed_ref_store_create(sb.buf, flags);
- strbuf_release(&sb);
+ refs->packed_ref_store =
+ packed_ref_store_create(repo, refs->gitcommondir, flags);
chdir_notify_reparent("files-backend $GIT_DIR", &refs->base.gitdir);
chdir_notify_reparent("files-backend $GIT_COMMONDIR",
@@ -341,9 +338,9 @@ static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs)
return refs->loose;
}
-static int files_read_raw_ref(struct ref_store *ref_store, const char *refname,
- struct object_id *oid, struct strbuf *referent,
- unsigned int *type, int *failure_errno)
+static int read_ref_internal(struct ref_store *ref_store, const char *refname,
+ struct object_id *oid, struct strbuf *referent,
+ unsigned int *type, int *failure_errno, int skip_packed_refs)
{
struct files_ref_store *refs =
files_downcast(ref_store, REF_STORE_READ, "read_raw_ref");
@@ -355,6 +352,7 @@ static int files_read_raw_ref(struct ref_store *ref_store, const char *refname,
int fd;
int ret = -1;
int remaining_retries = 3;
+ int myerr = 0;
*type = 0;
strbuf_reset(&sb_path);
@@ -381,11 +379,13 @@ static int files_read_raw_ref(struct ref_store *ref_store, const char *refname,
goto out;
if (lstat(path, &st) < 0) {
- if (errno != ENOENT)
+ int ignore_errno;
+ myerr = errno;
+ if (myerr != ENOENT || skip_packed_refs)
goto out;
- if (refs_read_raw_ref(refs->packed_ref_store, refname,
- oid, referent, type)) {
- errno = ENOENT;
+ if (refs_read_raw_ref(refs->packed_ref_store, refname, oid,
+ referent, type, &ignore_errno)) {
+ myerr = ENOENT;
goto out;
}
ret = 0;
@@ -396,7 +396,8 @@ static int files_read_raw_ref(struct ref_store *ref_store, const char *refname,
if (S_ISLNK(st.st_mode)) {
strbuf_reset(&sb_contents);
if (strbuf_readlink(&sb_contents, path, st.st_size) < 0) {
- if (errno == ENOENT || errno == EINVAL)
+ myerr = errno;
+ if (myerr == ENOENT || myerr == EINVAL)
/* inconsistent with lstat; retry */
goto stat_ref;
else
@@ -418,14 +419,16 @@ static int files_read_raw_ref(struct ref_store *ref_store, const char *refname,
/* Is it a directory? */
if (S_ISDIR(st.st_mode)) {
+ int ignore_errno;
/*
* Even though there is a directory where the loose
* ref is supposed to be, there could still be a
* packed ref:
*/
- if (refs_read_raw_ref(refs->packed_ref_store, refname,
- oid, referent, type)) {
- errno = EISDIR;
+ if (skip_packed_refs ||
+ refs_read_raw_ref(refs->packed_ref_store, refname, oid,
+ referent, type, &ignore_errno)) {
+ myerr = EISDIR;
goto out;
}
ret = 0;
@@ -438,7 +441,8 @@ static int files_read_raw_ref(struct ref_store *ref_store, const char *refname,
*/
fd = open(path, O_RDONLY);
if (fd < 0) {
- if (errno == ENOENT && !S_ISLNK(st.st_mode))
+ myerr = errno;
+ if (myerr == ENOENT && !S_ISLNK(st.st_mode))
/* inconsistent with lstat; retry */
goto stat_ref;
else
@@ -446,26 +450,51 @@ static int files_read_raw_ref(struct ref_store *ref_store, const char *refname,
}
strbuf_reset(&sb_contents);
if (strbuf_read(&sb_contents, fd, 256) < 0) {
- int save_errno = errno;
+ myerr = errno;
close(fd);
- errno = save_errno;
goto out;
}
close(fd);
strbuf_rtrim(&sb_contents);
buf = sb_contents.buf;
- ret = parse_loose_ref_contents(buf, oid, referent, type);
+ ret = parse_loose_ref_contents(buf, oid, referent, type, &myerr);
out:
- *failure_errno = errno;
+ if (ret && !myerr)
+ BUG("returning non-zero %d, should have set myerr!", ret);
+ *failure_errno = myerr;
+
strbuf_release(&sb_path);
strbuf_release(&sb_contents);
+ errno = 0;
return ret;
}
+static int files_read_raw_ref(struct ref_store *ref_store, const char *refname,
+ struct object_id *oid, struct strbuf *referent,
+ unsigned int *type, int *failure_errno)
+{
+ return read_ref_internal(ref_store, refname, oid, referent, type, failure_errno, 0);
+}
+
+static int files_read_symbolic_ref(struct ref_store *ref_store, const char *refname,
+ struct strbuf *referent)
+{
+ struct object_id oid;
+ int failure_errno, ret;
+ unsigned int type;
+
+ ret = read_ref_internal(ref_store, refname, &oid, referent, &type, &failure_errno, 1);
+ if (ret)
+ return ret;
+
+ return !(type & REF_ISSYMREF);
+}
+
int parse_loose_ref_contents(const char *buf, struct object_id *oid,
- struct strbuf *referent, unsigned int *type)
+ struct strbuf *referent, unsigned int *type,
+ int *failure_errno)
{
const char *p;
if (skip_prefix(buf, "ref:", &buf)) {
@@ -484,7 +513,7 @@ int parse_loose_ref_contents(const char *buf, struct object_id *oid,
if (parse_oid_hex(buf, oid, &p) ||
(*p != '\0' && !isspace(*p))) {
*type |= REF_ISBROKEN;
- errno = EINVAL;
+ *failure_errno = EINVAL;
return -1;
}
return 0;
@@ -730,6 +759,7 @@ struct files_ref_iterator {
struct ref_iterator base;
struct ref_iterator *iter0;
+ struct repository *repo;
unsigned int flags;
};
@@ -751,6 +781,7 @@ static int files_ref_iterator_advance(struct ref_iterator *ref_iterator)
if (!(iter->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
!ref_resolves_to_object(iter->iter0->refname,
+ iter->repo,
iter->iter0->oid,
iter->iter0->flags))
continue;
@@ -791,9 +822,9 @@ static int files_ref_iterator_abort(struct ref_iterator *ref_iterator)
}
static struct ref_iterator_vtable files_ref_iterator_vtable = {
- files_ref_iterator_advance,
- files_ref_iterator_peel,
- files_ref_iterator_abort
+ .advance = files_ref_iterator_advance,
+ .peel = files_ref_iterator_peel,
+ .abort = files_ref_iterator_abort,
};
static struct ref_iterator *files_ref_iterator_begin(
@@ -829,7 +860,7 @@ static struct ref_iterator *files_ref_iterator_begin(
*/
loose_iter = cache_ref_iterator_begin(get_loose_ref_cache(refs),
- prefix, 1);
+ prefix, ref_store->repo, 1);
/*
* The packed-refs file might contain broken references, for
@@ -853,6 +884,7 @@ static struct ref_iterator *files_ref_iterator_begin(
base_ref_iterator_init(ref_iterator, &files_ref_iterator_vtable,
overlay_iter->ordered);
iter->iter0 = overlay_iter;
+ iter->repo = ref_store->repo;
iter->flags = flags;
return ref_iterator;
@@ -990,7 +1022,7 @@ static int create_reflock(const char *path, void *cb)
* Locks a ref returning the lock on success and NULL on failure.
*/
static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
- const char *refname, int *type,
+ const char *refname,
struct strbuf *err)
{
struct strbuf ref_file = STRBUF_INIT;
@@ -1002,16 +1034,6 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
CALLOC_ARRAY(lock, 1);
files_ref_path(refs, &ref_file, refname);
- if (!refs_resolve_ref_unsafe(&refs->base, refname,
- RESOLVE_REF_NO_RECURSE,
- &lock->old_oid, type)) {
- if (!refs_verify_refname_available(&refs->base, refname,
- NULL, NULL, err))
- strbuf_addf(err, "unable to resolve reference '%s': %s",
- refname, strerror(errno));
-
- goto error_return;
- }
/*
* If the ref did not exist and we are creating it, make sure
@@ -1031,9 +1053,8 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
goto error_return;
}
- if (refs_read_ref_full(&refs->base, lock->ref_name,
- 0,
- &lock->old_oid, NULL))
+ if (!refs_resolve_ref_unsafe(&refs->base, lock->ref_name, 0,
+ &lock->old_oid, NULL))
oidclr(&lock->old_oid);
goto out;
@@ -1169,7 +1190,7 @@ static int should_pack_ref(const char *refname,
return 0;
/* Do not pack broken refs: */
- if (!ref_resolves_to_object(refname, oid, ref_flags))
+ if (!ref_resolves_to_object(refname, the_repository, oid, ref_flags))
return 0;
return 1;
@@ -1192,7 +1213,8 @@ static int files_pack_refs(struct ref_store *ref_store, unsigned int flags)
packed_refs_lock(refs->packed_ref_store, LOCK_DIE_ON_ERROR, &err);
- iter = cache_ref_iterator_begin(get_loose_ref_cache(refs), NULL, 0);
+ iter = cache_ref_iterator_begin(get_loose_ref_cache(refs), NULL,
+ the_repository, 0);
while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
/*
* If the loose reference can be packed, add an entry
@@ -1346,12 +1368,42 @@ static int rename_tmp_log(struct files_ref_store *refs, const char *newrefname)
}
static int write_ref_to_lockfile(struct ref_lock *lock,
- const struct object_id *oid, struct strbuf *err);
+ const struct object_id *oid,
+ int skip_oid_verification, struct strbuf *err);
static int commit_ref_update(struct files_ref_store *refs,
struct ref_lock *lock,
const struct object_id *oid, const char *logmsg,
struct strbuf *err);
+/*
+ * Emit a better error message than lockfile.c's
+ * unable_to_lock_message() would in case there is a D/F conflict with
+ * another existing reference. If there would be a conflict, emit an error
+ * message and return false; otherwise, return true.
+ *
+ * Note that this function is not safe against all races with other
+ * processes, and that's not its job. We'll emit a more verbose error on D/f
+ * conflicts if we get past it into lock_ref_oid_basic().
+ */
+static int refs_rename_ref_available(struct ref_store *refs,
+ const char *old_refname,
+ const char *new_refname)
+{
+ struct string_list skip = STRING_LIST_INIT_NODUP;
+ struct strbuf err = STRBUF_INIT;
+ int ok;
+
+ string_list_insert(&skip, old_refname);
+ ok = !refs_verify_refname_available(refs, new_refname,
+ NULL, &skip, &err);
+ if (!ok)
+ error("%s", err.buf);
+
+ string_list_clear(&skip, 0);
+ strbuf_release(&err);
+ return ok;
+}
+
static int files_copy_or_rename_ref(struct ref_store *ref_store,
const char *oldrefname, const char *newrefname,
const char *logmsg, int copy)
@@ -1380,7 +1432,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
if (!refs_resolve_ref_unsafe(&refs->base, oldrefname,
RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
- &orig_oid, &flag)) {
+ &orig_oid, &flag)) {
ret = error("refname %s not found", oldrefname);
goto out;
}
@@ -1424,9 +1476,9 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
* the safety anyway; we want to delete the reference whatever
* its current value.
*/
- if (!copy && !refs_read_ref_full(&refs->base, newrefname,
- RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
- NULL, NULL) &&
+ if (!copy && refs_resolve_ref_unsafe(&refs->base, newrefname,
+ RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
+ NULL, NULL) &&
refs_delete_ref(&refs->base, NULL, newrefname,
NULL, REF_NO_DEREF)) {
if (errno == EISDIR) {
@@ -1452,7 +1504,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
logmoved = log;
- lock = lock_ref_oid_basic(refs, newrefname, NULL, &err);
+ lock = lock_ref_oid_basic(refs, newrefname, &err);
if (!lock) {
if (copy)
error("unable to copy '%s' to '%s': %s", oldrefname, newrefname, err.buf);
@@ -1463,7 +1515,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
}
oidcpy(&lock->old_oid, &orig_oid);
- if (write_ref_to_lockfile(lock, &orig_oid, &err) ||
+ if (write_ref_to_lockfile(lock, &orig_oid, 0, &err) ||
commit_ref_update(refs, lock, &orig_oid, logmsg, &err)) {
error("unable to write current sha1 into %s: %s", newrefname, err.buf);
strbuf_release(&err);
@@ -1474,7 +1526,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
goto out;
rollback:
- lock = lock_ref_oid_basic(refs, oldrefname, NULL, &err);
+ lock = lock_ref_oid_basic(refs, oldrefname, &err);
if (!lock) {
error("unable to lock %s for rollback: %s", oldrefname, err.buf);
strbuf_release(&err);
@@ -1483,7 +1535,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
flag = log_all_ref_updates;
log_all_ref_updates = LOG_REFS_NONE;
- if (write_ref_to_lockfile(lock, &orig_oid, &err) ||
+ if (write_ref_to_lockfile(lock, &orig_oid, 0, &err) ||
commit_ref_update(refs, lock, &orig_oid, NULL, &err)) {
error("unable to write current sha1 into %s: %s", oldrefname, err.buf);
strbuf_release(&err);
@@ -1633,15 +1685,14 @@ static int log_ref_setup(struct files_ref_store *refs,
return -1;
}
-static int files_create_reflog(struct ref_store *ref_store,
- const char *refname, int force_create,
+static int files_create_reflog(struct ref_store *ref_store, const char *refname,
struct strbuf *err)
{
struct files_ref_store *refs =
files_downcast(ref_store, REF_STORE_WRITE, "create_reflog");
int fd;
- if (log_ref_setup(refs, refname, force_create, &fd, err))
+ if (log_ref_setup(refs, refname, 1, &fd, err))
return -1;
if (fd >= 0)
@@ -1719,30 +1770,36 @@ static int files_log_ref_write(struct files_ref_store *refs,
* errors, rollback the lockfile, fill in *err and return -1.
*/
static int write_ref_to_lockfile(struct ref_lock *lock,
- const struct object_id *oid, struct strbuf *err)
+ const struct object_id *oid,
+ int skip_oid_verification, struct strbuf *err)
{
static char term = '\n';
struct object *o;
int fd;
- o = parse_object(the_repository, oid);
- if (!o) {
- strbuf_addf(err,
- "trying to write ref '%s' with nonexistent object %s",
- lock->ref_name, oid_to_hex(oid));
- unlock_ref(lock);
- return -1;
- }
- if (o->type != OBJ_COMMIT && is_branch(lock->ref_name)) {
- strbuf_addf(err,
- "trying to write non-commit object %s to branch '%s'",
- oid_to_hex(oid), lock->ref_name);
- unlock_ref(lock);
- return -1;
+ if (!skip_oid_verification) {
+ o = parse_object(the_repository, oid);
+ if (!o) {
+ strbuf_addf(
+ err,
+ "trying to write ref '%s' with nonexistent object %s",
+ lock->ref_name, oid_to_hex(oid));
+ unlock_ref(lock);
+ return -1;
+ }
+ if (o->type != OBJ_COMMIT && is_branch(lock->ref_name)) {
+ strbuf_addf(
+ err,
+ "trying to write non-commit object %s to branch '%s'",
+ oid_to_hex(oid), lock->ref_name);
+ unlock_ref(lock);
+ return -1;
+ }
}
fd = get_lock_file_fd(&lock->lk);
if (write_in_full(fd, oid_to_hex(oid), the_hash_algo->hexsz) < 0 ||
write_in_full(fd, &term, 1) < 0 ||
+ fsync_component(FSYNC_COMPONENT_REFERENCE, get_lock_file_fd(&lock->lk)) < 0 ||
close_ref_gently(lock) < 0) {
strbuf_addf(err,
"couldn't write '%s'", get_lock_file_path(&lock->lk));
@@ -1838,9 +1895,10 @@ static void update_symref_reflog(struct files_ref_store *refs,
{
struct strbuf err = STRBUF_INIT;
struct object_id new_oid;
+
if (logmsg &&
- !refs_read_ref_full(&refs->base, target,
- RESOLVE_REF_READING, &new_oid, NULL) &&
+ refs_resolve_ref_unsafe(&refs->base, target,
+ RESOLVE_REF_READING, &new_oid, NULL) &&
files_log_ref_write(refs, refname, &lock->old_oid,
&new_oid, logmsg, 0, &err)) {
error("%s", err.buf);
@@ -1881,7 +1939,7 @@ static int files_create_symref(struct ref_store *ref_store,
struct ref_lock *lock;
int ret;
- lock = lock_ref_oid_basic(refs, refname, NULL, &err);
+ lock = lock_ref_oid_basic(refs, refname, &err);
if (!lock) {
error("%s", err.buf);
strbuf_release(&err);
@@ -2125,9 +2183,9 @@ static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator)
if (ends_with(diter->basename, ".lock"))
continue;
- if (refs_read_ref_full(iter->ref_store,
- diter->relative_path, 0,
- &iter->oid, &flags)) {
+ if (!refs_resolve_ref_unsafe(iter->ref_store,
+ diter->relative_path, 0,
+ &iter->oid, &flags)) {
error("bad ref for %s", diter->path.buf);
continue;
}
@@ -2145,7 +2203,7 @@ static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator)
}
static int files_reflog_iterator_peel(struct ref_iterator *ref_iterator,
- struct object_id *peeled)
+ struct object_id *peeled)
{
BUG("ref_iterator_peel() called for reflog_iterator");
}
@@ -2164,9 +2222,9 @@ static int files_reflog_iterator_abort(struct ref_iterator *ref_iterator)
}
static struct ref_iterator_vtable files_reflog_iterator_vtable = {
- files_reflog_iterator_advance,
- files_reflog_iterator_peel,
- files_reflog_iterator_abort
+ .advance = files_reflog_iterator_advance,
+ .peel = files_reflog_iterator_peel,
+ .abort = files_reflog_iterator_abort,
};
static struct ref_iterator *reflog_iterator_begin(struct ref_store *ref_store,
@@ -2471,9 +2529,9 @@ static int lock_ref_for_update(struct files_ref_store *refs,
* the transaction, so we have to read it here
* to record and possibly check old_oid:
*/
- if (refs_read_ref_full(&refs->base,
- referent.buf, 0,
- &lock->old_oid, NULL)) {
+ if (!refs_resolve_ref_unsafe(&refs->base,
+ referent.buf, 0,
+ &lock->old_oid, NULL)) {
if (update->flags & REF_HAVE_OLD) {
strbuf_addf(err, "cannot lock ref '%s': "
"error reading reference",
@@ -2529,8 +2587,10 @@ static int lock_ref_for_update(struct files_ref_store *refs,
* The reference already has the desired
* value, so we don't need to write it.
*/
- } else if (write_ref_to_lockfile(lock, &update->new_oid,
- err)) {
+ } else if (write_ref_to_lockfile(
+ lock, &update->new_oid,
+ update->flags & REF_SKIP_OID_VERIFICATION,
+ err)) {
char *write_err = strbuf_detach(err, NULL);
/*
@@ -3033,11 +3093,12 @@ static int files_initial_transaction_commit(struct ref_store *ref_store,
}
struct expire_reflog_cb {
- unsigned int flags;
reflog_expiry_should_prune_fn *should_prune_fn;
void *policy_cb;
FILE *newlog;
struct object_id last_kept_oid;
+ unsigned int rewrite:1,
+ dry_run:1;
};
static int expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
@@ -3045,33 +3106,27 @@ static int expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
const char *message, void *cb_data)
{
struct expire_reflog_cb *cb = cb_data;
- struct expire_reflog_policy_cb *policy_cb = cb->policy_cb;
+ reflog_expiry_should_prune_fn *fn = cb->should_prune_fn;
- if (cb->flags & EXPIRE_REFLOGS_REWRITE)
+ if (cb->rewrite)
ooid = &cb->last_kept_oid;
- if ((*cb->should_prune_fn)(ooid, noid, email, timestamp, tz,
- message, policy_cb)) {
- if (!cb->newlog)
- printf("would prune %s", message);
- else if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
- printf("prune %s", message);
- } else {
- if (cb->newlog) {
- fprintf(cb->newlog, "%s %s %s %"PRItime" %+05d\t%s",
- oid_to_hex(ooid), oid_to_hex(noid),
- email, timestamp, tz, message);
- oidcpy(&cb->last_kept_oid, noid);
- }
- if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
- printf("keep %s", message);
- }
+ if (fn(ooid, noid, email, timestamp, tz, message, cb->policy_cb))
+ return 0;
+
+ if (cb->dry_run)
+ return 0; /* --dry-run */
+
+ fprintf(cb->newlog, "%s %s %s %"PRItime" %+05d\t%s", oid_to_hex(ooid),
+ oid_to_hex(noid), email, timestamp, tz, message);
+ oidcpy(&cb->last_kept_oid, noid);
+
return 0;
}
static int files_reflog_expire(struct ref_store *ref_store,
const char *refname,
- unsigned int flags,
+ unsigned int expire_flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
reflog_expiry_cleanup_fn cleanup_fn,
@@ -3085,12 +3140,12 @@ static int files_reflog_expire(struct ref_store *ref_store,
struct strbuf log_file_sb = STRBUF_INIT;
char *log_file;
int status = 0;
- int type;
struct strbuf err = STRBUF_INIT;
const struct object_id *oid;
memset(&cb, 0, sizeof(cb));
- cb.flags = flags;
+ cb.rewrite = !!(expire_flags & EXPIRE_REFLOGS_REWRITE);
+ cb.dry_run = !!(expire_flags & EXPIRE_REFLOGS_DRY_RUN);
cb.policy_cb = policy_cb_data;
cb.should_prune_fn = should_prune_fn;
@@ -3099,7 +3154,7 @@ static int files_reflog_expire(struct ref_store *ref_store,
* reference itself, plus we might need to update the
* reference if --updateref was specified:
*/
- lock = lock_ref_oid_basic(refs, refname, &type, &err);
+ lock = lock_ref_oid_basic(refs, refname, &err);
if (!lock) {
error("cannot lock ref '%s': %s", refname, err.buf);
strbuf_release(&err);
@@ -3126,7 +3181,7 @@ static int files_reflog_expire(struct ref_store *ref_store,
files_reflog_path(refs, &log_file_sb, refname);
log_file = strbuf_detach(&log_file_sb, NULL);
- if (!(flags & EXPIRE_REFLOGS_DRY_RUN)) {
+ if (!cb.dry_run) {
/*
* Even though holding $GIT_DIR/logs/$reflog.lock has
* no locking implications, we use the lock_file
@@ -3153,7 +3208,7 @@ static int files_reflog_expire(struct ref_store *ref_store,
refs_for_each_reflog_ent(ref_store, refname, expire_reflog_ent, &cb);
(*cleanup_fn)(cb.policy_cb);
- if (!(flags & EXPIRE_REFLOGS_DRY_RUN)) {
+ if (!cb.dry_run) {
/*
* It doesn't make sense to adjust a reference pointed
* to by a symbolic ref based on expiring entries in
@@ -3161,9 +3216,18 @@ static int files_reflog_expire(struct ref_store *ref_store,
* a reference if there are no remaining reflog
* entries.
*/
- int update = (flags & EXPIRE_REFLOGS_UPDATE_REF) &&
- !(type & REF_ISSYMREF) &&
- !is_null_oid(&cb.last_kept_oid);
+ int update = 0;
+
+ if ((expire_flags & EXPIRE_REFLOGS_UPDATE_REF) &&
+ !is_null_oid(&cb.last_kept_oid)) {
+ int type;
+ const char *ref;
+
+ ref = refs_resolve_ref_unsafe(&refs->base, refname,
+ RESOLVE_REF_NO_RECURSE,
+ NULL, &type);
+ update = !!(ref && !(type & REF_ISSYMREF));
+ }
if (close_lock_file_gently(&reflog_lock)) {
status |= error("couldn't write %s: %s", log_file,
@@ -3216,29 +3280,30 @@ static int files_init_db(struct ref_store *ref_store, struct strbuf *err)
}
struct ref_storage_be refs_be_files = {
- NULL,
- "files",
- files_ref_store_create,
- files_init_db,
- files_transaction_prepare,
- files_transaction_finish,
- files_transaction_abort,
- files_initial_transaction_commit,
+ .next = NULL,
+ .name = "files",
+ .init = files_ref_store_create,
+ .init_db = files_init_db,
+ .transaction_prepare = files_transaction_prepare,
+ .transaction_finish = files_transaction_finish,
+ .transaction_abort = files_transaction_abort,
+ .initial_transaction_commit = files_initial_transaction_commit,
- files_pack_refs,
- files_create_symref,
- files_delete_refs,
- files_rename_ref,
- files_copy_ref,
+ .pack_refs = files_pack_refs,
+ .create_symref = files_create_symref,
+ .delete_refs = files_delete_refs,
+ .rename_ref = files_rename_ref,
+ .copy_ref = files_copy_ref,
- files_ref_iterator_begin,
- files_read_raw_ref,
+ .iterator_begin = files_ref_iterator_begin,
+ .read_raw_ref = files_read_raw_ref,
+ .read_symbolic_ref = files_read_symbolic_ref,
- files_reflog_iterator_begin,
- files_for_each_reflog_ent,
- files_for_each_reflog_ent_reverse,
- files_reflog_exists,
- files_create_reflog,
- files_delete_reflog,
- files_reflog_expire
+ .reflog_iterator_begin = files_reflog_iterator_begin,
+ .for_each_reflog_ent = files_for_each_reflog_ent,
+ .for_each_reflog_ent_reverse = files_for_each_reflog_ent_reverse,
+ .reflog_exists = files_reflog_exists,
+ .create_reflog = files_create_reflog,
+ .delete_reflog = files_delete_reflog,
+ .reflog_expire = files_reflog_expire
};
diff --git a/refs/iterator.c b/refs/iterator.c
index a89d132..b2e56ba 100644
--- a/refs/iterator.c
+++ b/refs/iterator.c
@@ -64,9 +64,9 @@ static int empty_ref_iterator_abort(struct ref_iterator *ref_iterator)
}
static struct ref_iterator_vtable empty_ref_iterator_vtable = {
- empty_ref_iterator_advance,
- empty_ref_iterator_peel,
- empty_ref_iterator_abort
+ .advance = empty_ref_iterator_advance,
+ .peel = empty_ref_iterator_peel,
+ .abort = empty_ref_iterator_abort,
};
struct ref_iterator *empty_ref_iterator_begin(void)
@@ -201,9 +201,9 @@ static int merge_ref_iterator_abort(struct ref_iterator *ref_iterator)
}
static struct ref_iterator_vtable merge_ref_iterator_vtable = {
- merge_ref_iterator_advance,
- merge_ref_iterator_peel,
- merge_ref_iterator_abort
+ .advance = merge_ref_iterator_advance,
+ .peel = merge_ref_iterator_peel,
+ .abort = merge_ref_iterator_abort,
};
struct ref_iterator *merge_ref_iterator_begin(
@@ -378,9 +378,9 @@ static int prefix_ref_iterator_abort(struct ref_iterator *ref_iterator)
}
static struct ref_iterator_vtable prefix_ref_iterator_vtable = {
- prefix_ref_iterator_advance,
- prefix_ref_iterator_peel,
- prefix_ref_iterator_abort
+ .advance = prefix_ref_iterator_advance,
+ .peel = prefix_ref_iterator_peel,
+ .abort = prefix_ref_iterator_abort,
};
struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 47247a1..97b6837 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -193,19 +193,20 @@ static int release_snapshot(struct snapshot *snapshot)
}
}
-struct ref_store *packed_ref_store_create(const char *path,
+struct ref_store *packed_ref_store_create(struct repository *repo,
+ const char *gitdir,
unsigned int store_flags)
{
struct packed_ref_store *refs = xcalloc(1, sizeof(*refs));
struct ref_store *ref_store = (struct ref_store *)refs;
+ struct strbuf sb = STRBUF_INIT;
- base_ref_store_init(ref_store, &refs_be_packed);
- ref_store->gitdir = xstrdup(path);
+ base_ref_store_init(ref_store, repo, gitdir, &refs_be_packed);
refs->store_flags = store_flags;
- refs->path = xstrdup(path);
+ strbuf_addf(&sb, "%s/packed-refs", gitdir);
+ refs->path = strbuf_detach(&sb, NULL);
chdir_notify_reparent("packed-refs", &refs->path);
-
return ref_store;
}
@@ -776,6 +777,7 @@ struct packed_ref_iterator {
struct object_id oid, peeled;
struct strbuf refname_buf;
+ struct repository *repo;
unsigned int flags;
};
@@ -864,8 +866,8 @@ static int packed_ref_iterator_advance(struct ref_iterator *ref_iterator)
continue;
if (!(iter->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
- !ref_resolves_to_object(iter->base.refname, &iter->oid,
- iter->flags))
+ !ref_resolves_to_object(iter->base.refname, iter->repo,
+ &iter->oid, iter->flags))
continue;
return ITER_OK;
@@ -883,6 +885,9 @@ static int packed_ref_iterator_peel(struct ref_iterator *ref_iterator,
struct packed_ref_iterator *iter =
(struct packed_ref_iterator *)ref_iterator;
+ if (iter->repo != the_repository)
+ BUG("peeling for non-the_repository is not supported");
+
if ((iter->base.flags & REF_KNOWS_PEELED)) {
oidcpy(peeled, &iter->peeled);
return is_null_oid(&iter->peeled) ? -1 : 0;
@@ -906,9 +911,9 @@ static int packed_ref_iterator_abort(struct ref_iterator *ref_iterator)
}
static struct ref_iterator_vtable packed_ref_iterator_vtable = {
- packed_ref_iterator_advance,
- packed_ref_iterator_peel,
- packed_ref_iterator_abort
+ .advance = packed_ref_iterator_advance,
+ .peel = packed_ref_iterator_peel,
+ .abort = packed_ref_iterator_abort
};
static struct ref_iterator *packed_ref_iterator_begin(
@@ -954,6 +959,7 @@ static struct ref_iterator *packed_ref_iterator_begin(
iter->base.oid = &iter->oid;
+ iter->repo = ref_store->repo;
iter->flags = flags;
if (prefix && *prefix)
@@ -1256,7 +1262,8 @@ static int write_with_updates(struct packed_ref_store *refs,
goto error;
}
- if (close_tempfile_gently(refs->tempfile)) {
+ if (fsync_component(FSYNC_COMPONENT_REFERENCE, get_tempfile_fd(refs->tempfile)) ||
+ close_tempfile_gently(refs->tempfile)) {
strbuf_addf(err, "error closing file %s: %s",
get_tempfile_path(refs->tempfile),
strerror(errno));
@@ -1347,6 +1354,7 @@ int is_packed_transaction_needed(struct ref_store *ref_store,
ret = 0;
for (i = 0; i < transaction->nr; i++) {
struct ref_update *update = transaction->updates[i];
+ int failure_errno;
unsigned int type;
struct object_id oid;
@@ -1357,9 +1365,9 @@ int is_packed_transaction_needed(struct ref_store *ref_store,
*/
continue;
- if (!refs_read_raw_ref(ref_store, update->refname,
- &oid, &referent, &type) ||
- errno != ENOENT) {
+ if (!refs_read_raw_ref(ref_store, update->refname, &oid,
+ &referent, &type, &failure_errno) ||
+ failure_errno != ENOENT) {
/*
* We have to actually delete that reference
* -> this transaction is needed.
@@ -1570,106 +1578,36 @@ static int packed_pack_refs(struct ref_store *ref_store, unsigned int flags)
return 0;
}
-static int packed_create_symref(struct ref_store *ref_store,
- const char *refname, const char *target,
- const char *logmsg)
-{
- BUG("packed reference store does not support symrefs");
-}
-
-static int packed_rename_ref(struct ref_store *ref_store,
- const char *oldrefname, const char *newrefname,
- const char *logmsg)
-{
- BUG("packed reference store does not support renaming references");
-}
-
-static int packed_copy_ref(struct ref_store *ref_store,
- const char *oldrefname, const char *newrefname,
- const char *logmsg)
-{
- BUG("packed reference store does not support copying references");
-}
-
static struct ref_iterator *packed_reflog_iterator_begin(struct ref_store *ref_store)
{
return empty_ref_iterator_begin();
}
-static int packed_for_each_reflog_ent(struct ref_store *ref_store,
- const char *refname,
- each_reflog_ent_fn fn, void *cb_data)
-{
- BUG("packed reference store does not support reflogs");
- return 0;
-}
-
-static int packed_for_each_reflog_ent_reverse(struct ref_store *ref_store,
- const char *refname,
- each_reflog_ent_fn fn,
- void *cb_data)
-{
- BUG("packed reference store does not support reflogs");
- return 0;
-}
-
-static int packed_reflog_exists(struct ref_store *ref_store,
- const char *refname)
-{
- BUG("packed reference store does not support reflogs");
- return 0;
-}
-
-static int packed_create_reflog(struct ref_store *ref_store,
- const char *refname, int force_create,
- struct strbuf *err)
-{
- BUG("packed reference store does not support reflogs");
-}
-
-static int packed_delete_reflog(struct ref_store *ref_store,
- const char *refname)
-{
- BUG("packed reference store does not support reflogs");
- return 0;
-}
-
-static int packed_reflog_expire(struct ref_store *ref_store,
- const char *refname,
- unsigned int flags,
- reflog_expiry_prepare_fn prepare_fn,
- reflog_expiry_should_prune_fn should_prune_fn,
- reflog_expiry_cleanup_fn cleanup_fn,
- void *policy_cb_data)
-{
- BUG("packed reference store does not support reflogs");
- return 0;
-}
-
struct ref_storage_be refs_be_packed = {
- NULL,
- "packed",
- packed_ref_store_create,
- packed_init_db,
- packed_transaction_prepare,
- packed_transaction_finish,
- packed_transaction_abort,
- packed_initial_transaction_commit,
+ .next = NULL,
+ .name = "packed",
+ .init = packed_ref_store_create,
+ .init_db = packed_init_db,
+ .transaction_prepare = packed_transaction_prepare,
+ .transaction_finish = packed_transaction_finish,
+ .transaction_abort = packed_transaction_abort,
+ .initial_transaction_commit = packed_initial_transaction_commit,
- packed_pack_refs,
- packed_create_symref,
- packed_delete_refs,
- packed_rename_ref,
- packed_copy_ref,
+ .pack_refs = packed_pack_refs,
+ .create_symref = NULL,
+ .delete_refs = packed_delete_refs,
+ .rename_ref = NULL,
+ .copy_ref = NULL,
- packed_ref_iterator_begin,
- packed_read_raw_ref,
+ .iterator_begin = packed_ref_iterator_begin,
+ .read_raw_ref = packed_read_raw_ref,
+ .read_symbolic_ref = NULL,
- packed_reflog_iterator_begin,
- packed_for_each_reflog_ent,
- packed_for_each_reflog_ent_reverse,
- packed_reflog_exists,
- packed_create_reflog,
- packed_delete_reflog,
- packed_reflog_expire
+ .reflog_iterator_begin = packed_reflog_iterator_begin,
+ .for_each_reflog_ent = NULL,
+ .for_each_reflog_ent_reverse = NULL,
+ .reflog_exists = NULL,
+ .create_reflog = NULL,
+ .delete_reflog = NULL,
+ .reflog_expire = NULL,
};
diff --git a/refs/packed-backend.h b/refs/packed-backend.h
index a01a0af..9dd8a34 100644
--- a/refs/packed-backend.h
+++ b/refs/packed-backend.h
@@ -1,6 +1,7 @@
#ifndef REFS_PACKED_BACKEND_H
#define REFS_PACKED_BACKEND_H
+struct repository;
struct ref_transaction;
/*
@@ -12,7 +13,8 @@ struct ref_transaction;
* even among packed refs.
*/
-struct ref_store *packed_ref_store_create(const char *path,
+struct ref_store *packed_ref_store_create(struct repository *repo,
+ const char *gitdir,
unsigned int store_flags);
/*
diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index a5ad8a3..32afd8a 100644
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -134,7 +134,7 @@ int search_ref_dir(struct ref_dir *dir, const char *refname, size_t len)
r = bsearch(&key, dir->entries, dir->nr, sizeof(*dir->entries),
ref_entry_cmp_sslice);
- if (r == NULL)
+ if (!r)
return -1;
return r - dir->entries;
@@ -378,6 +378,8 @@ struct cache_ref_iterator {
* on from there.)
*/
struct cache_ref_iterator_level *levels;
+
+ struct repository *repo;
};
static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator)
@@ -434,6 +436,11 @@ static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator)
static int cache_ref_iterator_peel(struct ref_iterator *ref_iterator,
struct object_id *peeled)
{
+ struct cache_ref_iterator *iter =
+ (struct cache_ref_iterator *)ref_iterator;
+
+ if (iter->repo != the_repository)
+ BUG("peeling for non-the_repository is not supported");
return peel_object(ref_iterator->oid, peeled) ? -1 : 0;
}
@@ -449,13 +456,14 @@ static int cache_ref_iterator_abort(struct ref_iterator *ref_iterator)
}
static struct ref_iterator_vtable cache_ref_iterator_vtable = {
- cache_ref_iterator_advance,
- cache_ref_iterator_peel,
- cache_ref_iterator_abort
+ .advance = cache_ref_iterator_advance,
+ .peel = cache_ref_iterator_peel,
+ .abort = cache_ref_iterator_abort
};
struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
const char *prefix,
+ struct repository *repo,
int prime_dir)
{
struct ref_dir *dir;
@@ -490,5 +498,7 @@ struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
level->prefix_state = PREFIX_CONTAINS_DIR;
}
+ iter->repo = repo;
+
return ref_iterator;
}
diff --git a/refs/ref-cache.h b/refs/ref-cache.h
index 5c042ae..850d9d3 100644
--- a/refs/ref-cache.h
+++ b/refs/ref-cache.h
@@ -214,6 +214,7 @@ struct ref_entry *find_ref_entry(struct ref_dir *dir, const char *refname);
*/
struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
const char *prefix,
+ struct repository *repo,
int prime_dir);
#endif /* REFS_REF_CACHE_H */
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 7274640..69f93b0 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -66,6 +66,7 @@ int refname_is_safe(const char *refname);
* referred-to object does not exist, emit a warning and return false.
*/
int ref_resolves_to_object(const char *refname,
+ struct repository *repo,
const struct object_id *oid,
unsigned int flags);
@@ -149,9 +150,9 @@ struct ref_update {
const char refname[FLEX_ARRAY];
};
-int refs_read_raw_ref(struct ref_store *ref_store,
- const char *refname, struct object_id *oid,
- struct strbuf *referent, unsigned int *type);
+int refs_read_raw_ref(struct ref_store *ref_store, const char *refname,
+ struct object_id *oid, struct strbuf *referent,
+ unsigned int *type, int *failure_errno);
/*
* Write an error to `err` and return a nonzero value iff the same
@@ -228,20 +229,6 @@ const char *find_descendant_ref(const char *dirname,
const struct string_list *extras,
const struct string_list *skip);
-/*
- * Check whether an attempt to rename old_refname to new_refname would
- * cause a D/F conflict with any existing reference (other than
- * possibly old_refname). If there would be a conflict, emit an error
- * message and return false; otherwise, return true.
- *
- * Note that this function is not safe against all races with other
- * processes (though rename_ref() catches some races that might get by
- * this check).
- */
-int refs_rename_ref_available(struct ref_store *refs,
- const char *old_refname,
- const char *new_refname);
-
/* We allow "recursive" symbolic refs. Only within reason, though */
#define SYMREF_MAXDEPTH 5
@@ -539,7 +526,8 @@ struct ref_store;
* should call base_ref_store_init() to initialize the shared part of
* the ref_store and to record the ref_store for later lookup.
*/
-typedef struct ref_store *ref_store_init_fn(const char *gitdir,
+typedef struct ref_store *ref_store_init_fn(struct repository *repo,
+ const char *gitdir,
unsigned int flags);
typedef int ref_init_db_fn(struct ref_store *refs, struct strbuf *err);
@@ -604,7 +592,7 @@ typedef int for_each_reflog_ent_reverse_fn(struct ref_store *ref_store,
void *cb_data);
typedef int reflog_exists_fn(struct ref_store *ref_store, const char *refname);
typedef int create_reflog_fn(struct ref_store *ref_store, const char *refname,
- int force_create, struct strbuf *err);
+ struct strbuf *err);
typedef int delete_reflog_fn(struct ref_store *ref_store, const char *refname);
typedef int reflog_expire_fn(struct ref_store *ref_store,
const char *refname,
@@ -660,6 +648,21 @@ typedef int read_raw_ref_fn(struct ref_store *ref_store, const char *refname,
struct object_id *oid, struct strbuf *referent,
unsigned int *type, int *failure_errno);
+/*
+ * Read a symbolic reference from the specified reference store. This function
+ * is optional: if not implemented by a backend, then `read_raw_ref_fn` is used
+ * to read the symbolcic reference instead. It is intended to be implemented
+ * only in case the backend can optimize the reading of symbolic references.
+ *
+ * Return 0 on success, or -1 on failure. `referent` will be set to the target
+ * of the symbolic reference on success. This function explicitly does not
+ * distinguish between error cases and the reference not being a symbolic
+ * reference to allow backends to optimize this operation in case symbolic and
+ * non-symbolic references are treated differently.
+ */
+typedef int read_symbolic_ref_fn(struct ref_store *ref_store, const char *refname,
+ struct strbuf *referent);
+
struct ref_storage_be {
struct ref_storage_be *next;
const char *name;
@@ -679,6 +682,7 @@ struct ref_storage_be {
ref_iterator_begin_fn *iterator_begin;
read_raw_ref_fn *read_raw_ref;
+ read_symbolic_ref_fn *read_symbolic_ref;
reflog_iterator_begin_fn *reflog_iterator_begin;
for_each_reflog_ent_fn *for_each_reflog_ent;
@@ -701,22 +705,29 @@ struct ref_store {
/* The backend describing this ref_store's storage scheme: */
const struct ref_storage_be *be;
- /* The gitdir that this ref_store applies to: */
+ struct repository *repo;
+
+ /*
+ * The gitdir that this ref_store applies to. Note that this is not
+ * necessarily repo->gitdir if the repo has multiple worktrees.
+ */
char *gitdir;
};
/*
- * Parse contents of a loose ref file.
+ * Parse contents of a loose ref file. *failure_errno maybe be set to EINVAL for
+ * invalid contents.
*/
int parse_loose_ref_contents(const char *buf, struct object_id *oid,
- struct strbuf *referent, unsigned int *type);
+ struct strbuf *referent, unsigned int *type,
+ int *failure_errno);
/*
* Fill in the generic part of refs and add it to our collection of
* reference stores.
*/
-void base_ref_store_init(struct ref_store *refs,
- const struct ref_storage_be *be);
+void base_ref_store_init(struct ref_store *refs, struct repository *repo,
+ const char *path, const struct ref_storage_be *be);
/*
* Support GIT_TRACE_REFS by optionally wrapping the given ref_store instance.
diff --git a/refspec.c b/refspec.c
index e3d852c..63e3112 100644
--- a/refspec.c
+++ b/refspec.c
@@ -4,13 +4,13 @@
#include "refspec.h"
static struct refspec_item s_tag_refspec = {
- 0,
- 1,
- 0,
- 0,
- 0,
- "refs/tags/*",
- "refs/tags/*"
+ .force = 0,
+ .pattern = 1,
+ .matching = 0,
+ .exact_sha1 = 0,
+ .negative = 0,
+ .src = "refs/tags/*",
+ .dst = "refs/tags/*",
};
/* See TAG_REFSPEC for the string version */
diff --git a/reftable/LICENSE b/reftable/LICENSE
new file mode 100644
index 0000000..402e0f9
--- /dev/null
+++ b/reftable/LICENSE
@@ -0,0 +1,31 @@
+BSD License
+
+Copyright (c) 2020, Google LLC
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+* Neither the name of Google LLC nor the names of its contributors may
+be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/reftable/basics.c b/reftable/basics.c
new file mode 100644
index 0000000..f761e48
--- /dev/null
+++ b/reftable/basics.c
@@ -0,0 +1,128 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "basics.h"
+
+void put_be24(uint8_t *out, uint32_t i)
+{
+ out[0] = (uint8_t)((i >> 16) & 0xff);
+ out[1] = (uint8_t)((i >> 8) & 0xff);
+ out[2] = (uint8_t)(i & 0xff);
+}
+
+uint32_t get_be24(uint8_t *in)
+{
+ return (uint32_t)(in[0]) << 16 | (uint32_t)(in[1]) << 8 |
+ (uint32_t)(in[2]);
+}
+
+void put_be16(uint8_t *out, uint16_t i)
+{
+ out[0] = (uint8_t)((i >> 8) & 0xff);
+ out[1] = (uint8_t)(i & 0xff);
+}
+
+int binsearch(size_t sz, int (*f)(size_t k, void *args), void *args)
+{
+ size_t lo = 0;
+ size_t hi = sz;
+
+ /* Invariants:
+ *
+ * (hi == sz) || f(hi) == true
+ * (lo == 0 && f(0) == true) || fi(lo) == false
+ */
+ while (hi - lo > 1) {
+ size_t mid = lo + (hi - lo) / 2;
+
+ if (f(mid, args))
+ hi = mid;
+ else
+ lo = mid;
+ }
+
+ if (lo)
+ return hi;
+
+ return f(0, args) ? 0 : 1;
+}
+
+void free_names(char **a)
+{
+ char **p;
+ if (!a) {
+ return;
+ }
+ for (p = a; *p; p++) {
+ reftable_free(*p);
+ }
+ reftable_free(a);
+}
+
+int names_length(char **names)
+{
+ char **p = names;
+ for (; *p; p++) {
+ /* empty */
+ }
+ return p - names;
+}
+
+void parse_names(char *buf, int size, char ***namesp)
+{
+ char **names = NULL;
+ size_t names_cap = 0;
+ size_t names_len = 0;
+
+ char *p = buf;
+ char *end = buf + size;
+ while (p < end) {
+ char *next = strchr(p, '\n');
+ if (next && next < end) {
+ *next = 0;
+ } else {
+ next = end;
+ }
+ if (p < next) {
+ if (names_len == names_cap) {
+ names_cap = 2 * names_cap + 1;
+ names = reftable_realloc(
+ names, names_cap * sizeof(*names));
+ }
+ names[names_len++] = xstrdup(p);
+ }
+ p = next + 1;
+ }
+
+ names = reftable_realloc(names, (names_len + 1) * sizeof(*names));
+ names[names_len] = NULL;
+ *namesp = names;
+}
+
+int names_equal(char **a, char **b)
+{
+ int i = 0;
+ for (; a[i] && b[i]; i++) {
+ if (strcmp(a[i], b[i])) {
+ return 0;
+ }
+ }
+
+ return a[i] == b[i];
+}
+
+int common_prefix_size(struct strbuf *a, struct strbuf *b)
+{
+ int p = 0;
+ for (; p < a->len && p < b->len; p++) {
+ if (a->buf[p] != b->buf[p])
+ break;
+ }
+
+ return p;
+}
diff --git a/reftable/basics.h b/reftable/basics.h
new file mode 100644
index 0000000..096b368
--- /dev/null
+++ b/reftable/basics.h
@@ -0,0 +1,60 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef BASICS_H
+#define BASICS_H
+
+/*
+ * miscellaneous utilities that are not provided by Git.
+ */
+
+#include "system.h"
+
+/* Bigendian en/decoding of integers */
+
+void put_be24(uint8_t *out, uint32_t i);
+uint32_t get_be24(uint8_t *in);
+void put_be16(uint8_t *out, uint16_t i);
+
+/*
+ * find smallest index i in [0, sz) at which f(i) is true, assuming
+ * that f is ascending. Return sz if f(i) is false for all indices.
+ *
+ * Contrary to bsearch(3), this returns something useful if the argument is not
+ * found.
+ */
+int binsearch(size_t sz, int (*f)(size_t k, void *args), void *args);
+
+/*
+ * Frees a NULL terminated array of malloced strings. The array itself is also
+ * freed.
+ */
+void free_names(char **a);
+
+/* parse a newline separated list of names. `size` is the length of the buffer,
+ * without terminating '\0'. Empty names are discarded. */
+void parse_names(char *buf, int size, char ***namesp);
+
+/* compares two NULL-terminated arrays of strings. */
+int names_equal(char **a, char **b);
+
+/* returns the array size of a NULL-terminated array of strings. */
+int names_length(char **names);
+
+/* Allocation routines; they invoke the functions set through
+ * reftable_set_alloc() */
+void *reftable_malloc(size_t sz);
+void *reftable_realloc(void *p, size_t sz);
+void reftable_free(void *p);
+void *reftable_calloc(size_t sz);
+
+/* Find the longest shared prefix size of `a` and `b` */
+struct strbuf;
+int common_prefix_size(struct strbuf *a, struct strbuf *b);
+
+#endif
diff --git a/reftable/basics_test.c b/reftable/basics_test.c
new file mode 100644
index 0000000..1fcd229
--- /dev/null
+++ b/reftable/basics_test.c
@@ -0,0 +1,98 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "system.h"
+
+#include "basics.h"
+#include "test_framework.h"
+#include "reftable-tests.h"
+
+struct binsearch_args {
+ int key;
+ int *arr;
+};
+
+static int binsearch_func(size_t i, void *void_args)
+{
+ struct binsearch_args *args = void_args;
+
+ return args->key < args->arr[i];
+}
+
+static void test_binsearch(void)
+{
+ int arr[] = { 2, 4, 6, 8, 10 };
+ size_t sz = ARRAY_SIZE(arr);
+ struct binsearch_args args = {
+ .arr = arr,
+ };
+
+ int i = 0;
+ for (i = 1; i < 11; i++) {
+ int res;
+ args.key = i;
+ res = binsearch(sz, &binsearch_func, &args);
+
+ if (res < sz) {
+ EXPECT(args.key < arr[res]);
+ if (res > 0) {
+ EXPECT(args.key >= arr[res - 1]);
+ }
+ } else {
+ EXPECT(args.key == 10 || args.key == 11);
+ }
+ }
+}
+
+static void test_names_length(void)
+{
+ char *a[] = { "a", "b", NULL };
+ EXPECT(names_length(a) == 2);
+}
+
+static void test_parse_names_normal(void)
+{
+ char in[] = "a\nb\n";
+ char **out = NULL;
+ parse_names(in, strlen(in), &out);
+ EXPECT(!strcmp(out[0], "a"));
+ EXPECT(!strcmp(out[1], "b"));
+ EXPECT(!out[2]);
+ free_names(out);
+}
+
+static void test_parse_names_drop_empty(void)
+{
+ char in[] = "a\n\n";
+ char **out = NULL;
+ parse_names(in, strlen(in), &out);
+ EXPECT(!strcmp(out[0], "a"));
+ EXPECT(!out[1]);
+ free_names(out);
+}
+
+static void test_common_prefix(void)
+{
+ struct strbuf s1 = STRBUF_INIT;
+ struct strbuf s2 = STRBUF_INIT;
+ strbuf_addstr(&s1, "abcdef");
+ strbuf_addstr(&s2, "abc");
+ EXPECT(common_prefix_size(&s1, &s2) == 3);
+ strbuf_release(&s1);
+ strbuf_release(&s2);
+}
+
+int basics_test_main(int argc, const char *argv[])
+{
+ RUN_TEST(test_common_prefix);
+ RUN_TEST(test_parse_names_normal);
+ RUN_TEST(test_parse_names_drop_empty);
+ RUN_TEST(test_binsearch);
+ RUN_TEST(test_names_length);
+ return 0;
+}
diff --git a/reftable/block.c b/reftable/block.c
new file mode 100644
index 0000000..34d4d07
--- /dev/null
+++ b/reftable/block.c
@@ -0,0 +1,452 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "block.h"
+
+#include "blocksource.h"
+#include "constants.h"
+#include "record.h"
+#include "reftable-error.h"
+#include "system.h"
+#include <zlib.h>
+
+int header_size(int version)
+{
+ switch (version) {
+ case 1:
+ return 24;
+ case 2:
+ return 28;
+ }
+ abort();
+}
+
+int footer_size(int version)
+{
+ switch (version) {
+ case 1:
+ return 68;
+ case 2:
+ return 72;
+ }
+ abort();
+}
+
+static int block_writer_register_restart(struct block_writer *w, int n,
+ int is_restart, struct strbuf *key)
+{
+ int rlen = w->restart_len;
+ if (rlen >= MAX_RESTARTS) {
+ is_restart = 0;
+ }
+
+ if (is_restart) {
+ rlen++;
+ }
+ if (2 + 3 * rlen + n > w->block_size - w->next)
+ return -1;
+ if (is_restart) {
+ if (w->restart_len == w->restart_cap) {
+ w->restart_cap = w->restart_cap * 2 + 1;
+ w->restarts = reftable_realloc(
+ w->restarts, sizeof(uint32_t) * w->restart_cap);
+ }
+
+ w->restarts[w->restart_len++] = w->next;
+ }
+
+ w->next += n;
+
+ strbuf_reset(&w->last_key);
+ strbuf_addbuf(&w->last_key, key);
+ w->entries++;
+ return 0;
+}
+
+void block_writer_init(struct block_writer *bw, uint8_t typ, uint8_t *buf,
+ uint32_t block_size, uint32_t header_off, int hash_size)
+{
+ bw->buf = buf;
+ bw->hash_size = hash_size;
+ bw->block_size = block_size;
+ bw->header_off = header_off;
+ bw->buf[header_off] = typ;
+ bw->next = header_off + 4;
+ bw->restart_interval = 16;
+ bw->entries = 0;
+ bw->restart_len = 0;
+ bw->last_key.len = 0;
+}
+
+uint8_t block_writer_type(struct block_writer *bw)
+{
+ return bw->buf[bw->header_off];
+}
+
+/* Adds the reftable_record to the block. Returns -1 if it does not fit, 0 on
+ success. Returns REFTABLE_API_ERROR if attempting to write a record with
+ empty key. */
+int block_writer_add(struct block_writer *w, struct reftable_record *rec)
+{
+ struct strbuf empty = STRBUF_INIT;
+ struct strbuf last =
+ w->entries % w->restart_interval == 0 ? empty : w->last_key;
+ struct string_view out = {
+ .buf = w->buf + w->next,
+ .len = w->block_size - w->next,
+ };
+
+ struct string_view start = out;
+
+ int is_restart = 0;
+ struct strbuf key = STRBUF_INIT;
+ int n = 0;
+ int err = -1;
+
+ reftable_record_key(rec, &key);
+ if (!key.len) {
+ err = REFTABLE_API_ERROR;
+ goto done;
+ }
+
+ n = reftable_encode_key(&is_restart, out, last, key,
+ reftable_record_val_type(rec));
+ if (n < 0)
+ goto done;
+ string_view_consume(&out, n);
+
+ n = reftable_record_encode(rec, out, w->hash_size);
+ if (n < 0)
+ goto done;
+ string_view_consume(&out, n);
+
+ err = block_writer_register_restart(w, start.len - out.len, is_restart,
+ &key);
+done:
+ strbuf_release(&key);
+ return err;
+}
+
+int block_writer_finish(struct block_writer *w)
+{
+ int i;
+ for (i = 0; i < w->restart_len; i++) {
+ put_be24(w->buf + w->next, w->restarts[i]);
+ w->next += 3;
+ }
+
+ put_be16(w->buf + w->next, w->restart_len);
+ w->next += 2;
+ put_be24(w->buf + 1 + w->header_off, w->next);
+
+ if (block_writer_type(w) == BLOCK_TYPE_LOG) {
+ int block_header_skip = 4 + w->header_off;
+ uLongf src_len = w->next - block_header_skip;
+ uLongf dest_cap = src_len * 1.001 + 12;
+
+ uint8_t *compressed = reftable_malloc(dest_cap);
+ while (1) {
+ uLongf out_dest_len = dest_cap;
+ int zresult = compress2(compressed, &out_dest_len,
+ w->buf + block_header_skip,
+ src_len, 9);
+ if (zresult == Z_BUF_ERROR && dest_cap < LONG_MAX) {
+ dest_cap *= 2;
+ compressed =
+ reftable_realloc(compressed, dest_cap);
+ if (compressed)
+ continue;
+ }
+
+ if (Z_OK != zresult) {
+ reftable_free(compressed);
+ return REFTABLE_ZLIB_ERROR;
+ }
+
+ memcpy(w->buf + block_header_skip, compressed,
+ out_dest_len);
+ w->next = out_dest_len + block_header_skip;
+ reftable_free(compressed);
+ break;
+ }
+ }
+ return w->next;
+}
+
+uint8_t block_reader_type(struct block_reader *r)
+{
+ return r->block.data[r->header_off];
+}
+
+int block_reader_init(struct block_reader *br, struct reftable_block *block,
+ uint32_t header_off, uint32_t table_block_size,
+ int hash_size)
+{
+ uint32_t full_block_size = table_block_size;
+ uint8_t typ = block->data[header_off];
+ uint32_t sz = get_be24(block->data + header_off + 1);
+ int err = 0;
+ uint16_t restart_count = 0;
+ uint32_t restart_start = 0;
+ uint8_t *restart_bytes = NULL;
+ uint8_t *uncompressed = NULL;
+
+ if (!reftable_is_block_type(typ)) {
+ err = REFTABLE_FORMAT_ERROR;
+ goto done;
+ }
+
+ if (typ == BLOCK_TYPE_LOG) {
+ int block_header_skip = 4 + header_off;
+ uLongf dst_len = sz - block_header_skip; /* total size of dest
+ buffer. */
+ uLongf src_len = block->len - block_header_skip;
+ /* Log blocks specify the *uncompressed* size in their header.
+ */
+ uncompressed = reftable_malloc(sz);
+
+ /* Copy over the block header verbatim. It's not compressed. */
+ memcpy(uncompressed, block->data, block_header_skip);
+
+ /* Uncompress */
+ if (Z_OK !=
+ uncompress2(uncompressed + block_header_skip, &dst_len,
+ block->data + block_header_skip, &src_len)) {
+ err = REFTABLE_ZLIB_ERROR;
+ goto done;
+ }
+
+ if (dst_len + block_header_skip != sz) {
+ err = REFTABLE_FORMAT_ERROR;
+ goto done;
+ }
+
+ /* We're done with the input data. */
+ reftable_block_done(block);
+ block->data = uncompressed;
+ uncompressed = NULL;
+ block->len = sz;
+ block->source = malloc_block_source();
+ full_block_size = src_len + block_header_skip;
+ } else if (full_block_size == 0) {
+ full_block_size = sz;
+ } else if (sz < full_block_size && sz < block->len &&
+ block->data[sz] != 0) {
+ /* If the block is smaller than the full block size, it is
+ padded (data followed by '\0') or the next block is
+ unaligned. */
+ full_block_size = sz;
+ }
+
+ restart_count = get_be16(block->data + sz - 2);
+ restart_start = sz - 2 - 3 * restart_count;
+ restart_bytes = block->data + restart_start;
+
+ /* transfer ownership. */
+ br->block = *block;
+ block->data = NULL;
+ block->len = 0;
+
+ br->hash_size = hash_size;
+ br->block_len = restart_start;
+ br->full_block_size = full_block_size;
+ br->header_off = header_off;
+ br->restart_count = restart_count;
+ br->restart_bytes = restart_bytes;
+
+done:
+ reftable_free(uncompressed);
+ return err;
+}
+
+static uint32_t block_reader_restart_offset(struct block_reader *br, int i)
+{
+ return get_be24(br->restart_bytes + 3 * i);
+}
+
+void block_reader_start(struct block_reader *br, struct block_iter *it)
+{
+ it->br = br;
+ strbuf_reset(&it->last_key);
+ it->next_off = br->header_off + 4;
+}
+
+struct restart_find_args {
+ int error;
+ struct strbuf key;
+ struct block_reader *r;
+};
+
+static int restart_key_less(size_t idx, void *args)
+{
+ struct restart_find_args *a = args;
+ uint32_t off = block_reader_restart_offset(a->r, idx);
+ struct string_view in = {
+ .buf = a->r->block.data + off,
+ .len = a->r->block_len - off,
+ };
+
+ /* the restart key is verbatim in the block, so this could avoid the
+ alloc for decoding the key */
+ struct strbuf rkey = STRBUF_INIT;
+ struct strbuf last_key = STRBUF_INIT;
+ uint8_t unused_extra;
+ int n = reftable_decode_key(&rkey, &unused_extra, last_key, in);
+ int result;
+ if (n < 0) {
+ a->error = 1;
+ return -1;
+ }
+
+ result = strbuf_cmp(&a->key, &rkey);
+ strbuf_release(&rkey);
+ return result;
+}
+
+void block_iter_copy_from(struct block_iter *dest, struct block_iter *src)
+{
+ dest->br = src->br;
+ dest->next_off = src->next_off;
+ strbuf_reset(&dest->last_key);
+ strbuf_addbuf(&dest->last_key, &src->last_key);
+}
+
+int block_iter_next(struct block_iter *it, struct reftable_record *rec)
+{
+ struct string_view in = {
+ .buf = it->br->block.data + it->next_off,
+ .len = it->br->block_len - it->next_off,
+ };
+ struct string_view start = in;
+ struct strbuf key = STRBUF_INIT;
+ uint8_t extra = 0;
+ int n = 0;
+
+ if (it->next_off >= it->br->block_len)
+ return 1;
+
+ n = reftable_decode_key(&key, &extra, it->last_key, in);
+ if (n < 0)
+ return -1;
+
+ if (!key.len)
+ return REFTABLE_FORMAT_ERROR;
+
+ string_view_consume(&in, n);
+ n = reftable_record_decode(rec, key, extra, in, it->br->hash_size);
+ if (n < 0)
+ return -1;
+ string_view_consume(&in, n);
+
+ strbuf_reset(&it->last_key);
+ strbuf_addbuf(&it->last_key, &key);
+ it->next_off += start.len - in.len;
+ strbuf_release(&key);
+ return 0;
+}
+
+int block_reader_first_key(struct block_reader *br, struct strbuf *key)
+{
+ struct strbuf empty = STRBUF_INIT;
+ int off = br->header_off + 4;
+ struct string_view in = {
+ .buf = br->block.data + off,
+ .len = br->block_len - off,
+ };
+
+ uint8_t extra = 0;
+ int n = reftable_decode_key(key, &extra, empty, in);
+ if (n < 0)
+ return n;
+ if (!key->len)
+ return REFTABLE_FORMAT_ERROR;
+
+ return 0;
+}
+
+int block_iter_seek(struct block_iter *it, struct strbuf *want)
+{
+ return block_reader_seek(it->br, it, want);
+}
+
+void block_iter_close(struct block_iter *it)
+{
+ strbuf_release(&it->last_key);
+}
+
+int block_reader_seek(struct block_reader *br, struct block_iter *it,
+ struct strbuf *want)
+{
+ struct restart_find_args args = {
+ .key = *want,
+ .r = br,
+ };
+ struct reftable_record rec = reftable_new_record(block_reader_type(br));
+ struct strbuf key = STRBUF_INIT;
+ int err = 0;
+ struct block_iter next = {
+ .last_key = STRBUF_INIT,
+ };
+
+ int i = binsearch(br->restart_count, &restart_key_less, &args);
+ if (args.error) {
+ err = REFTABLE_FORMAT_ERROR;
+ goto done;
+ }
+
+ it->br = br;
+ if (i > 0) {
+ i--;
+ it->next_off = block_reader_restart_offset(br, i);
+ } else {
+ it->next_off = br->header_off + 4;
+ }
+
+ /* We're looking for the last entry less/equal than the wanted key, so
+ we have to go one entry too far and then back up.
+ */
+ while (1) {
+ block_iter_copy_from(&next, it);
+ err = block_iter_next(&next, &rec);
+ if (err < 0)
+ goto done;
+
+ reftable_record_key(&rec, &key);
+ if (err > 0 || strbuf_cmp(&key, want) >= 0) {
+ err = 0;
+ goto done;
+ }
+
+ block_iter_copy_from(it, &next);
+ }
+
+done:
+ strbuf_release(&key);
+ strbuf_release(&next.last_key);
+ reftable_record_release(&rec);
+
+ return err;
+}
+
+void block_writer_release(struct block_writer *bw)
+{
+ FREE_AND_NULL(bw->restarts);
+ strbuf_release(&bw->last_key);
+ /* the block is not owned. */
+}
+
+void reftable_block_done(struct reftable_block *blockp)
+{
+ struct reftable_block_source source = blockp->source;
+ if (blockp && source.ops)
+ source.ops->return_block(source.arg, blockp);
+ blockp->data = NULL;
+ blockp->len = 0;
+ blockp->source.ops = NULL;
+ blockp->source.arg = NULL;
+}
diff --git a/reftable/block.h b/reftable/block.h
new file mode 100644
index 0000000..87c7753
--- /dev/null
+++ b/reftable/block.h
@@ -0,0 +1,127 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef BLOCK_H
+#define BLOCK_H
+
+#include "basics.h"
+#include "record.h"
+#include "reftable-blocksource.h"
+
+/*
+ * Writes reftable blocks. The block_writer is reused across blocks to minimize
+ * allocation overhead.
+ */
+struct block_writer {
+ uint8_t *buf;
+ uint32_t block_size;
+
+ /* Offset of the global header. Nonzero in the first block only. */
+ uint32_t header_off;
+
+ /* How often to restart keys. */
+ int restart_interval;
+ int hash_size;
+
+ /* Offset of next uint8_t to write. */
+ uint32_t next;
+ uint32_t *restarts;
+ uint32_t restart_len;
+ uint32_t restart_cap;
+
+ struct strbuf last_key;
+ int entries;
+};
+
+/*
+ * initializes the blockwriter to write `typ` entries, using `buf` as temporary
+ * storage. `buf` is not owned by the block_writer. */
+void block_writer_init(struct block_writer *bw, uint8_t typ, uint8_t *buf,
+ uint32_t block_size, uint32_t header_off, int hash_size);
+
+/* returns the block type (eg. 'r' for ref records. */
+uint8_t block_writer_type(struct block_writer *bw);
+
+/* appends the record, or -1 if it doesn't fit. */
+int block_writer_add(struct block_writer *w, struct reftable_record *rec);
+
+/* appends the key restarts, and compress the block if necessary. */
+int block_writer_finish(struct block_writer *w);
+
+/* clears out internally allocated block_writer members. */
+void block_writer_release(struct block_writer *bw);
+
+/* Read a block. */
+struct block_reader {
+ /* offset of the block header; nonzero for the first block in a
+ * reftable. */
+ uint32_t header_off;
+
+ /* the memory block */
+ struct reftable_block block;
+ int hash_size;
+
+ /* size of the data, excluding restart data. */
+ uint32_t block_len;
+ uint8_t *restart_bytes;
+ uint16_t restart_count;
+
+ /* size of the data in the file. For log blocks, this is the compressed
+ * size. */
+ uint32_t full_block_size;
+};
+
+/* Iterate over entries in a block */
+struct block_iter {
+ /* offset within the block of the next entry to read. */
+ uint32_t next_off;
+ struct block_reader *br;
+
+ /* key for last entry we read. */
+ struct strbuf last_key;
+};
+
+/* initializes a block reader. */
+int block_reader_init(struct block_reader *br, struct reftable_block *bl,
+ uint32_t header_off, uint32_t table_block_size,
+ int hash_size);
+
+/* Position `it` at start of the block */
+void block_reader_start(struct block_reader *br, struct block_iter *it);
+
+/* Position `it` to the `want` key in the block */
+int block_reader_seek(struct block_reader *br, struct block_iter *it,
+ struct strbuf *want);
+
+/* Returns the block type (eg. 'r' for refs) */
+uint8_t block_reader_type(struct block_reader *r);
+
+/* Decodes the first key in the block */
+int block_reader_first_key(struct block_reader *br, struct strbuf *key);
+
+void block_iter_copy_from(struct block_iter *dest, struct block_iter *src);
+
+/* return < 0 for error, 0 for OK, > 0 for EOF. */
+int block_iter_next(struct block_iter *it, struct reftable_record *rec);
+
+/* Seek to `want` with in the block pointed to by `it` */
+int block_iter_seek(struct block_iter *it, struct strbuf *want);
+
+/* deallocate memory for `it`. The block reader and its block is left intact. */
+void block_iter_close(struct block_iter *it);
+
+/* size of file header, depending on format version */
+int header_size(int version);
+
+/* size of file footer, depending on format version */
+int footer_size(int version);
+
+/* returns a block to its source. */
+void reftable_block_done(struct reftable_block *ret);
+
+#endif
diff --git a/reftable/block_test.c b/reftable/block_test.c
new file mode 100644
index 0000000..cb88af4
--- /dev/null
+++ b/reftable/block_test.c
@@ -0,0 +1,125 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "block.h"
+
+#include "system.h"
+#include "blocksource.h"
+#include "basics.h"
+#include "constants.h"
+#include "record.h"
+#include "test_framework.h"
+#include "reftable-tests.h"
+
+static void test_block_read_write(void)
+{
+ const int header_off = 21; /* random */
+ char *names[30];
+ const int N = ARRAY_SIZE(names);
+ const int block_size = 1024;
+ struct reftable_block block = { NULL };
+ struct block_writer bw = {
+ .last_key = STRBUF_INIT,
+ };
+ struct reftable_record rec = {
+ .type = BLOCK_TYPE_REF,
+ };
+ int i = 0;
+ int n;
+ struct block_reader br = { 0 };
+ struct block_iter it = { .last_key = STRBUF_INIT };
+ int j = 0;
+ struct strbuf want = STRBUF_INIT;
+
+ block.data = reftable_calloc(block_size);
+ block.len = block_size;
+ block.source = malloc_block_source();
+ block_writer_init(&bw, BLOCK_TYPE_REF, block.data, block_size,
+ header_off, hash_size(GIT_SHA1_FORMAT_ID));
+
+ rec.u.ref.refname = "";
+ rec.u.ref.value_type = REFTABLE_REF_DELETION;
+ n = block_writer_add(&bw, &rec);
+ EXPECT(n == REFTABLE_API_ERROR);
+
+ for (i = 0; i < N; i++) {
+ char name[100];
+ uint8_t hash[GIT_SHA1_RAWSZ];
+ snprintf(name, sizeof(name), "branch%02d", i);
+ memset(hash, i, sizeof(hash));
+
+ rec.u.ref.refname = name;
+ rec.u.ref.value_type = REFTABLE_REF_VAL1;
+ rec.u.ref.value.val1 = hash;
+
+ names[i] = xstrdup(name);
+ n = block_writer_add(&bw, &rec);
+ rec.u.ref.refname = NULL;
+ rec.u.ref.value_type = REFTABLE_REF_DELETION;
+ EXPECT(n == 0);
+ }
+
+ n = block_writer_finish(&bw);
+ EXPECT(n > 0);
+
+ block_writer_release(&bw);
+
+ block_reader_init(&br, &block, header_off, block_size, GIT_SHA1_RAWSZ);
+
+ block_reader_start(&br, &it);
+
+ while (1) {
+ int r = block_iter_next(&it, &rec);
+ EXPECT(r >= 0);
+ if (r > 0) {
+ break;
+ }
+ EXPECT_STREQ(names[j], rec.u.ref.refname);
+ j++;
+ }
+
+ reftable_record_release(&rec);
+ block_iter_close(&it);
+
+ for (i = 0; i < N; i++) {
+ struct block_iter it = { .last_key = STRBUF_INIT };
+ strbuf_reset(&want);
+ strbuf_addstr(&want, names[i]);
+
+ n = block_reader_seek(&br, &it, &want);
+ EXPECT(n == 0);
+
+ n = block_iter_next(&it, &rec);
+ EXPECT(n == 0);
+
+ EXPECT_STREQ(names[i], rec.u.ref.refname);
+
+ want.len--;
+ n = block_reader_seek(&br, &it, &want);
+ EXPECT(n == 0);
+
+ n = block_iter_next(&it, &rec);
+ EXPECT(n == 0);
+ EXPECT_STREQ(names[10 * (i / 10)], rec.u.ref.refname);
+
+ block_iter_close(&it);
+ }
+
+ reftable_record_release(&rec);
+ reftable_block_done(&br.block);
+ strbuf_release(&want);
+ for (i = 0; i < N; i++) {
+ reftable_free(names[i]);
+ }
+}
+
+int block_test_main(int argc, const char *argv[])
+{
+ RUN_TEST(test_block_read_write);
+ return 0;
+}
diff --git a/reftable/blocksource.c b/reftable/blocksource.c
new file mode 100644
index 0000000..8331b34
--- /dev/null
+++ b/reftable/blocksource.c
@@ -0,0 +1,153 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "system.h"
+
+#include "basics.h"
+#include "blocksource.h"
+#include "reftable-blocksource.h"
+#include "reftable-error.h"
+
+static void strbuf_return_block(void *b, struct reftable_block *dest)
+{
+ if (dest->len)
+ memset(dest->data, 0xff, dest->len);
+ reftable_free(dest->data);
+}
+
+static void strbuf_close(void *b)
+{
+}
+
+static int strbuf_read_block(void *v, struct reftable_block *dest, uint64_t off,
+ uint32_t size)
+{
+ struct strbuf *b = v;
+ assert(off + size <= b->len);
+ dest->data = reftable_calloc(size);
+ memcpy(dest->data, b->buf + off, size);
+ dest->len = size;
+ return size;
+}
+
+static uint64_t strbuf_size(void *b)
+{
+ return ((struct strbuf *)b)->len;
+}
+
+static struct reftable_block_source_vtable strbuf_vtable = {
+ .size = &strbuf_size,
+ .read_block = &strbuf_read_block,
+ .return_block = &strbuf_return_block,
+ .close = &strbuf_close,
+};
+
+void block_source_from_strbuf(struct reftable_block_source *bs,
+ struct strbuf *buf)
+{
+ assert(!bs->ops);
+ bs->ops = &strbuf_vtable;
+ bs->arg = buf;
+}
+
+static void malloc_return_block(void *b, struct reftable_block *dest)
+{
+ if (dest->len)
+ memset(dest->data, 0xff, dest->len);
+ reftable_free(dest->data);
+}
+
+static struct reftable_block_source_vtable malloc_vtable = {
+ .return_block = &malloc_return_block,
+};
+
+static struct reftable_block_source malloc_block_source_instance = {
+ .ops = &malloc_vtable,
+};
+
+struct reftable_block_source malloc_block_source(void)
+{
+ return malloc_block_source_instance;
+}
+
+struct file_block_source {
+ int fd;
+ uint64_t size;
+};
+
+static uint64_t file_size(void *b)
+{
+ return ((struct file_block_source *)b)->size;
+}
+
+static void file_return_block(void *b, struct reftable_block *dest)
+{
+ if (dest->len)
+ memset(dest->data, 0xff, dest->len);
+ reftable_free(dest->data);
+}
+
+static void file_close(void *b)
+{
+ int fd = ((struct file_block_source *)b)->fd;
+ if (fd > 0) {
+ close(fd);
+ ((struct file_block_source *)b)->fd = 0;
+ }
+
+ reftable_free(b);
+}
+
+static int file_read_block(void *v, struct reftable_block *dest, uint64_t off,
+ uint32_t size)
+{
+ struct file_block_source *b = v;
+ assert(off + size <= b->size);
+ dest->data = reftable_malloc(size);
+ if (pread(b->fd, dest->data, size, off) != size)
+ return -1;
+ dest->len = size;
+ return size;
+}
+
+static struct reftable_block_source_vtable file_vtable = {
+ .size = &file_size,
+ .read_block = &file_read_block,
+ .return_block = &file_return_block,
+ .close = &file_close,
+};
+
+int reftable_block_source_from_file(struct reftable_block_source *bs,
+ const char *name)
+{
+ struct stat st = { 0 };
+ int err = 0;
+ int fd = open(name, O_RDONLY);
+ struct file_block_source *p = NULL;
+ if (fd < 0) {
+ if (errno == ENOENT) {
+ return REFTABLE_NOT_EXIST_ERROR;
+ }
+ return -1;
+ }
+
+ err = fstat(fd, &st);
+ if (err < 0) {
+ close(fd);
+ return REFTABLE_IO_ERROR;
+ }
+
+ p = reftable_calloc(sizeof(struct file_block_source));
+ p->size = st.st_size;
+ p->fd = fd;
+
+ assert(!bs->ops);
+ bs->ops = &file_vtable;
+ bs->arg = p;
+ return 0;
+}
diff --git a/reftable/blocksource.h b/reftable/blocksource.h
new file mode 100644
index 0000000..072e272
--- /dev/null
+++ b/reftable/blocksource.h
@@ -0,0 +1,22 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef BLOCKSOURCE_H
+#define BLOCKSOURCE_H
+
+#include "system.h"
+
+struct reftable_block_source;
+
+/* Create an in-memory block source for reading reftables */
+void block_source_from_strbuf(struct reftable_block_source *bs,
+ struct strbuf *buf);
+
+struct reftable_block_source malloc_block_source(void);
+
+#endif
diff --git a/reftable/constants.h b/reftable/constants.h
new file mode 100644
index 0000000..5eee72c
--- /dev/null
+++ b/reftable/constants.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
+
+#define BLOCK_TYPE_LOG 'g'
+#define BLOCK_TYPE_INDEX 'i'
+#define BLOCK_TYPE_REF 'r'
+#define BLOCK_TYPE_OBJ 'o'
+#define BLOCK_TYPE_ANY 0
+
+#define MAX_RESTARTS ((1 << 16) - 1)
+#define DEFAULT_BLOCK_SIZE 4096
+
+#endif
diff --git a/reftable/dump.c b/reftable/dump.c
new file mode 100644
index 0000000..155953d
--- /dev/null
+++ b/reftable/dump.c
@@ -0,0 +1,107 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "git-compat-util.h"
+#include "hash.h"
+
+#include "reftable-blocksource.h"
+#include "reftable-error.h"
+#include "reftable-merged.h"
+#include "reftable-record.h"
+#include "reftable-tests.h"
+#include "reftable-writer.h"
+#include "reftable-iterator.h"
+#include "reftable-reader.h"
+#include "reftable-stack.h"
+#include "reftable-generic.h"
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+static int compact_stack(const char *stackdir)
+{
+ struct reftable_stack *stack = NULL;
+ struct reftable_write_options cfg = { 0 };
+
+ int err = reftable_new_stack(&stack, stackdir, cfg);
+ if (err < 0)
+ goto done;
+
+ err = reftable_stack_compact_all(stack, NULL);
+ if (err < 0)
+ goto done;
+done:
+ if (stack) {
+ reftable_stack_destroy(stack);
+ }
+ return err;
+}
+
+static void print_help(void)
+{
+ printf("usage: dump [-cst] arg\n\n"
+ "options: \n"
+ " -c compact\n"
+ " -t dump table\n"
+ " -s dump stack\n"
+ " -6 sha256 hash format\n"
+ " -h this help\n"
+ "\n");
+}
+
+int reftable_dump_main(int argc, char *const *argv)
+{
+ int err = 0;
+ int opt_dump_table = 0;
+ int opt_dump_stack = 0;
+ int opt_compact = 0;
+ uint32_t opt_hash_id = GIT_SHA1_FORMAT_ID;
+ const char *arg = NULL, *argv0 = argv[0];
+
+ for (; argc > 1; argv++, argc--)
+ if (*argv[1] != '-')
+ break;
+ else if (!strcmp("-t", argv[1]))
+ opt_dump_table = 1;
+ else if (!strcmp("-6", argv[1]))
+ opt_hash_id = GIT_SHA256_FORMAT_ID;
+ else if (!strcmp("-s", argv[1]))
+ opt_dump_stack = 1;
+ else if (!strcmp("-c", argv[1]))
+ opt_compact = 1;
+ else if (!strcmp("-?", argv[1]) || !strcmp("-h", argv[1])) {
+ print_help();
+ return 2;
+ }
+
+ if (argc != 2) {
+ fprintf(stderr, "need argument\n");
+ print_help();
+ return 2;
+ }
+
+ arg = argv[1];
+
+ if (opt_dump_table) {
+ err = reftable_reader_print_file(arg);
+ } else if (opt_dump_stack) {
+ err = reftable_stack_print_directory(arg, opt_hash_id);
+ } else if (opt_compact) {
+ err = compact_stack(arg);
+ }
+
+ if (err < 0) {
+ fprintf(stderr, "%s: %s: %s\n", argv0, arg,
+ reftable_error_str(err));
+ return 1;
+ }
+ return 0;
+}
diff --git a/reftable/error.c b/reftable/error.c
new file mode 100644
index 0000000..93941f2
--- /dev/null
+++ b/reftable/error.c
@@ -0,0 +1,43 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "reftable-error.h"
+
+#include <stdio.h>
+
+const char *reftable_error_str(int err)
+{
+ static char buf[250];
+ switch (err) {
+ case REFTABLE_IO_ERROR:
+ return "I/O error";
+ case REFTABLE_FORMAT_ERROR:
+ return "corrupt reftable file";
+ case REFTABLE_NOT_EXIST_ERROR:
+ return "file does not exist";
+ case REFTABLE_LOCK_ERROR:
+ return "data is outdated";
+ case REFTABLE_API_ERROR:
+ return "misuse of the reftable API";
+ case REFTABLE_ZLIB_ERROR:
+ return "zlib failure";
+ case REFTABLE_NAME_CONFLICT:
+ return "file/directory conflict";
+ case REFTABLE_EMPTY_TABLE_ERROR:
+ return "wrote empty table";
+ case REFTABLE_REFNAME_ERROR:
+ return "invalid refname";
+ case REFTABLE_ENTRY_TOO_BIG_ERROR:
+ return "entry too large";
+ case -1:
+ return "general error";
+ default:
+ snprintf(buf, sizeof(buf), "unknown error code %d", err);
+ return buf;
+ }
+}
diff --git a/reftable/generic.c b/reftable/generic.c
new file mode 100644
index 0000000..57f8032
--- /dev/null
+++ b/reftable/generic.c
@@ -0,0 +1,180 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "basics.h"
+#include "constants.h"
+#include "record.h"
+#include "generic.h"
+#include "reftable-iterator.h"
+#include "reftable-generic.h"
+
+int reftable_table_seek_ref(struct reftable_table *tab,
+ struct reftable_iterator *it, const char *name)
+{
+ struct reftable_record rec = { .type = BLOCK_TYPE_REF,
+ .u.ref = {
+ .refname = (char *)name,
+ } };
+ return tab->ops->seek_record(tab->table_arg, it, &rec);
+}
+
+int reftable_table_seek_log(struct reftable_table *tab,
+ struct reftable_iterator *it, const char *name)
+{
+ struct reftable_record rec = { .type = BLOCK_TYPE_LOG,
+ .u.log = {
+ .refname = (char *)name,
+ .update_index = ~((uint64_t)0),
+ } };
+ return tab->ops->seek_record(tab->table_arg, it, &rec);
+}
+
+int reftable_table_read_ref(struct reftable_table *tab, const char *name,
+ struct reftable_ref_record *ref)
+{
+ struct reftable_iterator it = { NULL };
+ int err = reftable_table_seek_ref(tab, &it, name);
+ if (err)
+ goto done;
+
+ err = reftable_iterator_next_ref(&it, ref);
+ if (err)
+ goto done;
+
+ if (strcmp(ref->refname, name) ||
+ reftable_ref_record_is_deletion(ref)) {
+ reftable_ref_record_release(ref);
+ err = 1;
+ goto done;
+ }
+
+done:
+ reftable_iterator_destroy(&it);
+ return err;
+}
+
+int reftable_table_print(struct reftable_table *tab) {
+ struct reftable_iterator it = { NULL };
+ struct reftable_ref_record ref = { NULL };
+ struct reftable_log_record log = { NULL };
+ uint32_t hash_id = reftable_table_hash_id(tab);
+ int err = reftable_table_seek_ref(tab, &it, "");
+ if (err < 0) {
+ return err;
+ }
+
+ while (1) {
+ err = reftable_iterator_next_ref(&it, &ref);
+ if (err > 0) {
+ break;
+ }
+ if (err < 0) {
+ return err;
+ }
+ reftable_ref_record_print(&ref, hash_id);
+ }
+ reftable_iterator_destroy(&it);
+ reftable_ref_record_release(&ref);
+
+ err = reftable_table_seek_log(tab, &it, "");
+ if (err < 0) {
+ return err;
+ }
+ while (1) {
+ err = reftable_iterator_next_log(&it, &log);
+ if (err > 0) {
+ break;
+ }
+ if (err < 0) {
+ return err;
+ }
+ reftable_log_record_print(&log, hash_id);
+ }
+ reftable_iterator_destroy(&it);
+ reftable_log_record_release(&log);
+ return 0;
+}
+
+uint64_t reftable_table_max_update_index(struct reftable_table *tab)
+{
+ return tab->ops->max_update_index(tab->table_arg);
+}
+
+uint64_t reftable_table_min_update_index(struct reftable_table *tab)
+{
+ return tab->ops->min_update_index(tab->table_arg);
+}
+
+uint32_t reftable_table_hash_id(struct reftable_table *tab)
+{
+ return tab->ops->hash_id(tab->table_arg);
+}
+
+void reftable_iterator_destroy(struct reftable_iterator *it)
+{
+ if (!it->ops) {
+ return;
+ }
+ it->ops->close(it->iter_arg);
+ it->ops = NULL;
+ FREE_AND_NULL(it->iter_arg);
+}
+
+int reftable_iterator_next_ref(struct reftable_iterator *it,
+ struct reftable_ref_record *ref)
+{
+ struct reftable_record rec = {
+ .type = BLOCK_TYPE_REF,
+ .u = {
+ .ref = *ref
+ },
+ };
+ int err = iterator_next(it, &rec);
+ *ref = rec.u.ref;
+ return err;
+}
+
+int reftable_iterator_next_log(struct reftable_iterator *it,
+ struct reftable_log_record *log)
+{
+ struct reftable_record rec = {
+ .type = BLOCK_TYPE_LOG,
+ .u = {
+ .log = *log,
+ },
+ };
+ int err = iterator_next(it, &rec);
+ *log = rec.u.log;
+ return err;
+}
+
+int iterator_next(struct reftable_iterator *it, struct reftable_record *rec)
+{
+ return it->ops->next(it->iter_arg, rec);
+}
+
+static int empty_iterator_next(void *arg, struct reftable_record *rec)
+{
+ return 1;
+}
+
+static void empty_iterator_close(void *arg)
+{
+}
+
+static struct reftable_iterator_vtable empty_vtable = {
+ .next = &empty_iterator_next,
+ .close = &empty_iterator_close,
+};
+
+void iterator_set_empty(struct reftable_iterator *it)
+{
+ assert(!it->ops);
+ it->iter_arg = NULL;
+ it->ops = &empty_vtable;
+}
diff --git a/reftable/generic.h b/reftable/generic.h
new file mode 100644
index 0000000..98886a0
--- /dev/null
+++ b/reftable/generic.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef GENERIC_H
+#define GENERIC_H
+
+#include "record.h"
+#include "reftable-generic.h"
+
+/* generic interface to reftables */
+struct reftable_table_vtable {
+ int (*seek_record)(void *tab, struct reftable_iterator *it,
+ struct reftable_record *);
+ uint32_t (*hash_id)(void *tab);
+ uint64_t (*min_update_index)(void *tab);
+ uint64_t (*max_update_index)(void *tab);
+};
+
+struct reftable_iterator_vtable {
+ int (*next)(void *iter_arg, struct reftable_record *rec);
+ void (*close)(void *iter_arg);
+};
+
+void iterator_set_empty(struct reftable_iterator *it);
+int iterator_next(struct reftable_iterator *it, struct reftable_record *rec);
+
+#endif
diff --git a/reftable/iter.c b/reftable/iter.c
new file mode 100644
index 0000000..a8d174c
--- /dev/null
+++ b/reftable/iter.c
@@ -0,0 +1,194 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "iter.h"
+
+#include "system.h"
+
+#include "block.h"
+#include "generic.h"
+#include "constants.h"
+#include "reader.h"
+#include "reftable-error.h"
+
+int iterator_is_null(struct reftable_iterator *it)
+{
+ return !it->ops;
+}
+
+static void filtering_ref_iterator_close(void *iter_arg)
+{
+ struct filtering_ref_iterator *fri = iter_arg;
+ strbuf_release(&fri->oid);
+ reftable_iterator_destroy(&fri->it);
+}
+
+static int filtering_ref_iterator_next(void *iter_arg,
+ struct reftable_record *rec)
+{
+ struct filtering_ref_iterator *fri = iter_arg;
+ struct reftable_ref_record *ref = &rec->u.ref;
+ int err = 0;
+ while (1) {
+ err = reftable_iterator_next_ref(&fri->it, ref);
+ if (err != 0) {
+ break;
+ }
+
+ if (fri->double_check) {
+ struct reftable_iterator it = { NULL };
+
+ err = reftable_table_seek_ref(&fri->tab, &it,
+ ref->refname);
+ if (err == 0) {
+ err = reftable_iterator_next_ref(&it, ref);
+ }
+
+ reftable_iterator_destroy(&it);
+
+ if (err < 0) {
+ break;
+ }
+
+ if (err > 0) {
+ continue;
+ }
+ }
+
+ if (ref->value_type == REFTABLE_REF_VAL2 &&
+ (!memcmp(fri->oid.buf, ref->value.val2.target_value,
+ fri->oid.len) ||
+ !memcmp(fri->oid.buf, ref->value.val2.value,
+ fri->oid.len)))
+ return 0;
+
+ if (ref->value_type == REFTABLE_REF_VAL1 &&
+ !memcmp(fri->oid.buf, ref->value.val1, fri->oid.len)) {
+ return 0;
+ }
+ }
+
+ reftable_ref_record_release(ref);
+ return err;
+}
+
+static struct reftable_iterator_vtable filtering_ref_iterator_vtable = {
+ .next = &filtering_ref_iterator_next,
+ .close = &filtering_ref_iterator_close,
+};
+
+void iterator_from_filtering_ref_iterator(struct reftable_iterator *it,
+ struct filtering_ref_iterator *fri)
+{
+ assert(!it->ops);
+ it->iter_arg = fri;
+ it->ops = &filtering_ref_iterator_vtable;
+}
+
+static void indexed_table_ref_iter_close(void *p)
+{
+ struct indexed_table_ref_iter *it = p;
+ block_iter_close(&it->cur);
+ reftable_block_done(&it->block_reader.block);
+ reftable_free(it->offsets);
+ strbuf_release(&it->oid);
+}
+
+static int indexed_table_ref_iter_next_block(struct indexed_table_ref_iter *it)
+{
+ uint64_t off;
+ int err = 0;
+ if (it->offset_idx == it->offset_len) {
+ it->is_finished = 1;
+ return 1;
+ }
+
+ reftable_block_done(&it->block_reader.block);
+
+ off = it->offsets[it->offset_idx++];
+ err = reader_init_block_reader(it->r, &it->block_reader, off,
+ BLOCK_TYPE_REF);
+ if (err < 0) {
+ return err;
+ }
+ if (err > 0) {
+ /* indexed block does not exist. */
+ return REFTABLE_FORMAT_ERROR;
+ }
+ block_reader_start(&it->block_reader, &it->cur);
+ return 0;
+}
+
+static int indexed_table_ref_iter_next(void *p, struct reftable_record *rec)
+{
+ struct indexed_table_ref_iter *it = p;
+ struct reftable_ref_record *ref = &rec->u.ref;
+
+ while (1) {
+ int err = block_iter_next(&it->cur, rec);
+ if (err < 0) {
+ return err;
+ }
+
+ if (err > 0) {
+ err = indexed_table_ref_iter_next_block(it);
+ if (err < 0) {
+ return err;
+ }
+
+ if (it->is_finished) {
+ return 1;
+ }
+ continue;
+ }
+ /* BUG */
+ if (!memcmp(it->oid.buf, ref->value.val2.target_value,
+ it->oid.len) ||
+ !memcmp(it->oid.buf, ref->value.val2.value, it->oid.len)) {
+ return 0;
+ }
+ }
+}
+
+int new_indexed_table_ref_iter(struct indexed_table_ref_iter **dest,
+ struct reftable_reader *r, uint8_t *oid,
+ int oid_len, uint64_t *offsets, int offset_len)
+{
+ struct indexed_table_ref_iter empty = INDEXED_TABLE_REF_ITER_INIT;
+ struct indexed_table_ref_iter *itr =
+ reftable_calloc(sizeof(struct indexed_table_ref_iter));
+ int err = 0;
+
+ *itr = empty;
+ itr->r = r;
+ strbuf_add(&itr->oid, oid, oid_len);
+
+ itr->offsets = offsets;
+ itr->offset_len = offset_len;
+
+ err = indexed_table_ref_iter_next_block(itr);
+ if (err < 0) {
+ reftable_free(itr);
+ } else {
+ *dest = itr;
+ }
+ return err;
+}
+
+static struct reftable_iterator_vtable indexed_table_ref_iter_vtable = {
+ .next = &indexed_table_ref_iter_next,
+ .close = &indexed_table_ref_iter_close,
+};
+
+void iterator_from_indexed_table_ref_iter(struct reftable_iterator *it,
+ struct indexed_table_ref_iter *itr)
+{
+ assert(!it->ops);
+ it->iter_arg = itr;
+ it->ops = &indexed_table_ref_iter_vtable;
+}
diff --git a/reftable/iter.h b/reftable/iter.h
new file mode 100644
index 0000000..09eb0cb
--- /dev/null
+++ b/reftable/iter.h
@@ -0,0 +1,69 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef ITER_H
+#define ITER_H
+
+#include "system.h"
+#include "block.h"
+#include "record.h"
+
+#include "reftable-iterator.h"
+#include "reftable-generic.h"
+
+/* Returns true for a zeroed out iterator, such as the one returned from
+ * iterator_destroy. */
+int iterator_is_null(struct reftable_iterator *it);
+
+/* iterator that produces only ref records that point to `oid` */
+struct filtering_ref_iterator {
+ int double_check;
+ struct reftable_table tab;
+ struct strbuf oid;
+ struct reftable_iterator it;
+};
+#define FILTERING_REF_ITERATOR_INIT \
+ { \
+ .oid = STRBUF_INIT \
+ }
+
+void iterator_from_filtering_ref_iterator(struct reftable_iterator *,
+ struct filtering_ref_iterator *);
+
+/* iterator that produces only ref records that point to `oid`,
+ * but using the object index.
+ */
+struct indexed_table_ref_iter {
+ struct reftable_reader *r;
+ struct strbuf oid;
+
+ /* mutable */
+ uint64_t *offsets;
+
+ /* Points to the next offset to read. */
+ int offset_idx;
+ int offset_len;
+ struct block_reader block_reader;
+ struct block_iter cur;
+ int is_finished;
+};
+
+#define INDEXED_TABLE_REF_ITER_INIT \
+ { \
+ .cur = { .last_key = STRBUF_INIT }, .oid = STRBUF_INIT, \
+ }
+
+void iterator_from_indexed_table_ref_iter(struct reftable_iterator *it,
+ struct indexed_table_ref_iter *itr);
+
+/* Takes ownership of `offsets` */
+int new_indexed_table_ref_iter(struct indexed_table_ref_iter **dest,
+ struct reftable_reader *r, uint8_t *oid,
+ int oid_len, uint64_t *offsets, int offset_len);
+
+#endif
diff --git a/reftable/merged.c b/reftable/merged.c
new file mode 100644
index 0000000..2a6efa1
--- /dev/null
+++ b/reftable/merged.c
@@ -0,0 +1,361 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "merged.h"
+
+#include "constants.h"
+#include "iter.h"
+#include "pq.h"
+#include "reader.h"
+#include "record.h"
+#include "generic.h"
+#include "reftable-merged.h"
+#include "reftable-error.h"
+#include "system.h"
+
+static int merged_iter_init(struct merged_iter *mi)
+{
+ int i = 0;
+ for (i = 0; i < mi->stack_len; i++) {
+ struct reftable_record rec = reftable_new_record(mi->typ);
+ int err = iterator_next(&mi->stack[i], &rec);
+ if (err < 0) {
+ return err;
+ }
+
+ if (err > 0) {
+ reftable_iterator_destroy(&mi->stack[i]);
+ reftable_record_release(&rec);
+ } else {
+ struct pq_entry e = {
+ .rec = rec,
+ .index = i,
+ };
+ merged_iter_pqueue_add(&mi->pq, e);
+ }
+ }
+
+ return 0;
+}
+
+static void merged_iter_close(void *p)
+{
+ struct merged_iter *mi = p;
+ int i = 0;
+ merged_iter_pqueue_release(&mi->pq);
+ for (i = 0; i < mi->stack_len; i++) {
+ reftable_iterator_destroy(&mi->stack[i]);
+ }
+ reftable_free(mi->stack);
+}
+
+static int merged_iter_advance_nonnull_subiter(struct merged_iter *mi,
+ size_t idx)
+{
+ struct pq_entry e = {
+ .rec = reftable_new_record(mi->typ),
+ .index = idx,
+ };
+ int err = iterator_next(&mi->stack[idx], &e.rec);
+ if (err < 0)
+ return err;
+
+ if (err > 0) {
+ reftable_iterator_destroy(&mi->stack[idx]);
+ reftable_record_release(&e.rec);
+ return 0;
+ }
+
+ merged_iter_pqueue_add(&mi->pq, e);
+ return 0;
+}
+
+static int merged_iter_advance_subiter(struct merged_iter *mi, size_t idx)
+{
+ if (iterator_is_null(&mi->stack[idx]))
+ return 0;
+ return merged_iter_advance_nonnull_subiter(mi, idx);
+}
+
+static int merged_iter_next_entry(struct merged_iter *mi,
+ struct reftable_record *rec)
+{
+ struct strbuf entry_key = STRBUF_INIT;
+ struct pq_entry entry = { 0 };
+ int err = 0;
+
+ if (merged_iter_pqueue_is_empty(mi->pq))
+ return 1;
+
+ entry = merged_iter_pqueue_remove(&mi->pq);
+ err = merged_iter_advance_subiter(mi, entry.index);
+ if (err < 0)
+ return err;
+
+ /*
+ One can also use reftable as datacenter-local storage, where the ref
+ database is maintained in globally consistent database (eg.
+ CockroachDB or Spanner). In this scenario, replication delays together
+ with compaction may cause newer tables to contain older entries. In
+ such a deployment, the loop below must be changed to collect all
+ entries for the same key, and return new the newest one.
+ */
+ reftable_record_key(&entry.rec, &entry_key);
+ while (!merged_iter_pqueue_is_empty(mi->pq)) {
+ struct pq_entry top = merged_iter_pqueue_top(mi->pq);
+ struct strbuf k = STRBUF_INIT;
+ int err = 0, cmp = 0;
+
+ reftable_record_key(&top.rec, &k);
+
+ cmp = strbuf_cmp(&k, &entry_key);
+ strbuf_release(&k);
+
+ if (cmp > 0) {
+ break;
+ }
+
+ merged_iter_pqueue_remove(&mi->pq);
+ err = merged_iter_advance_subiter(mi, top.index);
+ if (err < 0) {
+ return err;
+ }
+ reftable_record_release(&top.rec);
+ }
+
+ reftable_record_copy_from(rec, &entry.rec, hash_size(mi->hash_id));
+ reftable_record_release(&entry.rec);
+ strbuf_release(&entry_key);
+ return 0;
+}
+
+static int merged_iter_next(struct merged_iter *mi, struct reftable_record *rec)
+{
+ while (1) {
+ int err = merged_iter_next_entry(mi, rec);
+ if (err == 0 && mi->suppress_deletions &&
+ reftable_record_is_deletion(rec)) {
+ continue;
+ }
+
+ return err;
+ }
+}
+
+static int merged_iter_next_void(void *p, struct reftable_record *rec)
+{
+ struct merged_iter *mi = p;
+ if (merged_iter_pqueue_is_empty(mi->pq))
+ return 1;
+
+ return merged_iter_next(mi, rec);
+}
+
+static struct reftable_iterator_vtable merged_iter_vtable = {
+ .next = &merged_iter_next_void,
+ .close = &merged_iter_close,
+};
+
+static void iterator_from_merged_iter(struct reftable_iterator *it,
+ struct merged_iter *mi)
+{
+ assert(!it->ops);
+ it->iter_arg = mi;
+ it->ops = &merged_iter_vtable;
+}
+
+int reftable_new_merged_table(struct reftable_merged_table **dest,
+ struct reftable_table *stack, int n,
+ uint32_t hash_id)
+{
+ struct reftable_merged_table *m = NULL;
+ uint64_t last_max = 0;
+ uint64_t first_min = 0;
+ int i = 0;
+ for (i = 0; i < n; i++) {
+ uint64_t min = reftable_table_min_update_index(&stack[i]);
+ uint64_t max = reftable_table_max_update_index(&stack[i]);
+
+ if (reftable_table_hash_id(&stack[i]) != hash_id) {
+ return REFTABLE_FORMAT_ERROR;
+ }
+ if (i == 0 || min < first_min) {
+ first_min = min;
+ }
+ if (i == 0 || max > last_max) {
+ last_max = max;
+ }
+ }
+
+ m = reftable_calloc(sizeof(struct reftable_merged_table));
+ m->stack = stack;
+ m->stack_len = n;
+ m->min = first_min;
+ m->max = last_max;
+ m->hash_id = hash_id;
+ *dest = m;
+ return 0;
+}
+
+/* clears the list of subtable, without affecting the readers themselves. */
+void merged_table_release(struct reftable_merged_table *mt)
+{
+ FREE_AND_NULL(mt->stack);
+ mt->stack_len = 0;
+}
+
+void reftable_merged_table_free(struct reftable_merged_table *mt)
+{
+ if (!mt) {
+ return;
+ }
+ merged_table_release(mt);
+ reftable_free(mt);
+}
+
+uint64_t
+reftable_merged_table_max_update_index(struct reftable_merged_table *mt)
+{
+ return mt->max;
+}
+
+uint64_t
+reftable_merged_table_min_update_index(struct reftable_merged_table *mt)
+{
+ return mt->min;
+}
+
+static int reftable_table_seek_record(struct reftable_table *tab,
+ struct reftable_iterator *it,
+ struct reftable_record *rec)
+{
+ return tab->ops->seek_record(tab->table_arg, it, rec);
+}
+
+static int merged_table_seek_record(struct reftable_merged_table *mt,
+ struct reftable_iterator *it,
+ struct reftable_record *rec)
+{
+ struct reftable_iterator *iters = reftable_calloc(
+ sizeof(struct reftable_iterator) * mt->stack_len);
+ struct merged_iter merged = {
+ .stack = iters,
+ .typ = reftable_record_type(rec),
+ .hash_id = mt->hash_id,
+ .suppress_deletions = mt->suppress_deletions,
+ };
+ int n = 0;
+ int err = 0;
+ int i = 0;
+ for (i = 0; i < mt->stack_len && err == 0; i++) {
+ int e = reftable_table_seek_record(&mt->stack[i], &iters[n],
+ rec);
+ if (e < 0) {
+ err = e;
+ }
+ if (e == 0) {
+ n++;
+ }
+ }
+ if (err < 0) {
+ int i = 0;
+ for (i = 0; i < n; i++) {
+ reftable_iterator_destroy(&iters[i]);
+ }
+ reftable_free(iters);
+ return err;
+ }
+
+ merged.stack_len = n;
+ err = merged_iter_init(&merged);
+ if (err < 0) {
+ merged_iter_close(&merged);
+ return err;
+ } else {
+ struct merged_iter *p =
+ reftable_malloc(sizeof(struct merged_iter));
+ *p = merged;
+ iterator_from_merged_iter(it, p);
+ }
+ return 0;
+}
+
+int reftable_merged_table_seek_ref(struct reftable_merged_table *mt,
+ struct reftable_iterator *it,
+ const char *name)
+{
+ struct reftable_record rec = {
+ .type = BLOCK_TYPE_REF,
+ .u.ref = {
+ .refname = (char *)name,
+ },
+ };
+ return merged_table_seek_record(mt, it, &rec);
+}
+
+int reftable_merged_table_seek_log_at(struct reftable_merged_table *mt,
+ struct reftable_iterator *it,
+ const char *name, uint64_t update_index)
+{
+ struct reftable_record rec = { .type = BLOCK_TYPE_LOG,
+ .u.log = {
+ .refname = (char *)name,
+ .update_index = update_index,
+ } };
+ return merged_table_seek_record(mt, it, &rec);
+}
+
+int reftable_merged_table_seek_log(struct reftable_merged_table *mt,
+ struct reftable_iterator *it,
+ const char *name)
+{
+ uint64_t max = ~((uint64_t)0);
+ return reftable_merged_table_seek_log_at(mt, it, name, max);
+}
+
+uint32_t reftable_merged_table_hash_id(struct reftable_merged_table *mt)
+{
+ return mt->hash_id;
+}
+
+static int reftable_merged_table_seek_void(void *tab,
+ struct reftable_iterator *it,
+ struct reftable_record *rec)
+{
+ return merged_table_seek_record(tab, it, rec);
+}
+
+static uint32_t reftable_merged_table_hash_id_void(void *tab)
+{
+ return reftable_merged_table_hash_id(tab);
+}
+
+static uint64_t reftable_merged_table_min_update_index_void(void *tab)
+{
+ return reftable_merged_table_min_update_index(tab);
+}
+
+static uint64_t reftable_merged_table_max_update_index_void(void *tab)
+{
+ return reftable_merged_table_max_update_index(tab);
+}
+
+static struct reftable_table_vtable merged_table_vtable = {
+ .seek_record = reftable_merged_table_seek_void,
+ .hash_id = reftable_merged_table_hash_id_void,
+ .min_update_index = reftable_merged_table_min_update_index_void,
+ .max_update_index = reftable_merged_table_max_update_index_void,
+};
+
+void reftable_table_from_merged_table(struct reftable_table *tab,
+ struct reftable_merged_table *merged)
+{
+ assert(!tab->ops);
+ tab->ops = &merged_table_vtable;
+ tab->table_arg = merged;
+}
diff --git a/reftable/merged.h b/reftable/merged.h
new file mode 100644
index 0000000..7d9f95d
--- /dev/null
+++ b/reftable/merged.h
@@ -0,0 +1,38 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef MERGED_H
+#define MERGED_H
+
+#include "pq.h"
+
+struct reftable_merged_table {
+ struct reftable_table *stack;
+ size_t stack_len;
+ uint32_t hash_id;
+
+ /* If unset, produce deletions. This is useful for compaction. For the
+ * full stack, deletions should be produced. */
+ int suppress_deletions;
+
+ uint64_t min;
+ uint64_t max;
+};
+
+struct merged_iter {
+ struct reftable_iterator *stack;
+ uint32_t hash_id;
+ size_t stack_len;
+ uint8_t typ;
+ int suppress_deletions;
+ struct merged_iter_pqueue pq;
+};
+
+void merged_table_release(struct reftable_merged_table *mt);
+
+#endif
diff --git a/reftable/merged_test.c b/reftable/merged_test.c
new file mode 100644
index 0000000..d08c16a
--- /dev/null
+++ b/reftable/merged_test.c
@@ -0,0 +1,468 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "merged.h"
+
+#include "system.h"
+
+#include "basics.h"
+#include "blocksource.h"
+#include "constants.h"
+#include "reader.h"
+#include "record.h"
+#include "test_framework.h"
+#include "reftable-merged.h"
+#include "reftable-tests.h"
+#include "reftable-generic.h"
+#include "reftable-writer.h"
+
+static void write_test_table(struct strbuf *buf,
+ struct reftable_ref_record refs[], int n)
+{
+ uint64_t min = 0xffffffff;
+ uint64_t max = 0;
+ int i = 0;
+ int err;
+
+ struct reftable_write_options opts = {
+ .block_size = 256,
+ };
+ struct reftable_writer *w = NULL;
+ for (i = 0; i < n; i++) {
+ uint64_t ui = refs[i].update_index;
+ if (ui > max) {
+ max = ui;
+ }
+ if (ui < min) {
+ min = ui;
+ }
+ }
+
+ w = reftable_new_writer(&strbuf_add_void, buf, &opts);
+ reftable_writer_set_limits(w, min, max);
+
+ for (i = 0; i < n; i++) {
+ uint64_t before = refs[i].update_index;
+ int n = reftable_writer_add_ref(w, &refs[i]);
+ EXPECT(n == 0);
+ EXPECT(before == refs[i].update_index);
+ }
+
+ err = reftable_writer_close(w);
+ EXPECT_ERR(err);
+
+ reftable_writer_free(w);
+}
+
+static void write_test_log_table(struct strbuf *buf,
+ struct reftable_log_record logs[], int n,
+ uint64_t update_index)
+{
+ int i = 0;
+ int err;
+
+ struct reftable_write_options opts = {
+ .block_size = 256,
+ .exact_log_message = 1,
+ };
+ struct reftable_writer *w = NULL;
+ w = reftable_new_writer(&strbuf_add_void, buf, &opts);
+ reftable_writer_set_limits(w, update_index, update_index);
+
+ for (i = 0; i < n; i++) {
+ int err = reftable_writer_add_log(w, &logs[i]);
+ EXPECT_ERR(err);
+ }
+
+ err = reftable_writer_close(w);
+ EXPECT_ERR(err);
+
+ reftable_writer_free(w);
+}
+
+static struct reftable_merged_table *
+merged_table_from_records(struct reftable_ref_record **refs,
+ struct reftable_block_source **source,
+ struct reftable_reader ***readers, int *sizes,
+ struct strbuf *buf, int n)
+{
+ int i = 0;
+ struct reftable_merged_table *mt = NULL;
+ int err;
+ struct reftable_table *tabs =
+ reftable_calloc(n * sizeof(struct reftable_table));
+ *readers = reftable_calloc(n * sizeof(struct reftable_reader *));
+ *source = reftable_calloc(n * sizeof(**source));
+ for (i = 0; i < n; i++) {
+ write_test_table(&buf[i], refs[i], sizes[i]);
+ block_source_from_strbuf(&(*source)[i], &buf[i]);
+
+ err = reftable_new_reader(&(*readers)[i], &(*source)[i],
+ "name");
+ EXPECT_ERR(err);
+ reftable_table_from_reader(&tabs[i], (*readers)[i]);
+ }
+
+ err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
+ EXPECT_ERR(err);
+ return mt;
+}
+
+static void readers_destroy(struct reftable_reader **readers, size_t n)
+{
+ int i = 0;
+ for (; i < n; i++)
+ reftable_reader_free(readers[i]);
+ reftable_free(readers);
+}
+
+static void test_merged_between(void)
+{
+ uint8_t hash1[GIT_SHA1_RAWSZ] = { 1, 2, 3, 0 };
+
+ struct reftable_ref_record r1[] = { {
+ .refname = "b",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_VAL1,
+ .value.val1 = hash1,
+ } };
+ struct reftable_ref_record r2[] = { {
+ .refname = "a",
+ .update_index = 2,
+ .value_type = REFTABLE_REF_DELETION,
+ } };
+
+ struct reftable_ref_record *refs[] = { r1, r2 };
+ int sizes[] = { 1, 1 };
+ struct strbuf bufs[2] = { STRBUF_INIT, STRBUF_INIT };
+ struct reftable_block_source *bs = NULL;
+ struct reftable_reader **readers = NULL;
+ struct reftable_merged_table *mt =
+ merged_table_from_records(refs, &bs, &readers, sizes, bufs, 2);
+ int i;
+ struct reftable_ref_record ref = { NULL };
+ struct reftable_iterator it = { NULL };
+ int err = reftable_merged_table_seek_ref(mt, &it, "a");
+ EXPECT_ERR(err);
+
+ err = reftable_iterator_next_ref(&it, &ref);
+ EXPECT_ERR(err);
+ EXPECT(ref.update_index == 2);
+ reftable_ref_record_release(&ref);
+ reftable_iterator_destroy(&it);
+ readers_destroy(readers, 2);
+ reftable_merged_table_free(mt);
+ for (i = 0; i < ARRAY_SIZE(bufs); i++) {
+ strbuf_release(&bufs[i]);
+ }
+ reftable_free(bs);
+}
+
+static void test_merged(void)
+{
+ uint8_t hash1[GIT_SHA1_RAWSZ] = { 1 };
+ uint8_t hash2[GIT_SHA1_RAWSZ] = { 2 };
+ struct reftable_ref_record r1[] = {
+ {
+ .refname = "a",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_VAL1,
+ .value.val1 = hash1,
+ },
+ {
+ .refname = "b",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_VAL1,
+ .value.val1 = hash1,
+ },
+ {
+ .refname = "c",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_VAL1,
+ .value.val1 = hash1,
+ }
+ };
+ struct reftable_ref_record r2[] = { {
+ .refname = "a",
+ .update_index = 2,
+ .value_type = REFTABLE_REF_DELETION,
+ } };
+ struct reftable_ref_record r3[] = {
+ {
+ .refname = "c",
+ .update_index = 3,
+ .value_type = REFTABLE_REF_VAL1,
+ .value.val1 = hash2,
+ },
+ {
+ .refname = "d",
+ .update_index = 3,
+ .value_type = REFTABLE_REF_VAL1,
+ .value.val1 = hash1,
+ },
+ };
+
+ struct reftable_ref_record *want[] = {
+ &r2[0],
+ &r1[1],
+ &r3[0],
+ &r3[1],
+ };
+
+ struct reftable_ref_record *refs[] = { r1, r2, r3 };
+ int sizes[3] = { 3, 1, 2 };
+ struct strbuf bufs[3] = { STRBUF_INIT, STRBUF_INIT, STRBUF_INIT };
+ struct reftable_block_source *bs = NULL;
+ struct reftable_reader **readers = NULL;
+ struct reftable_merged_table *mt =
+ merged_table_from_records(refs, &bs, &readers, sizes, bufs, 3);
+
+ struct reftable_iterator it = { NULL };
+ int err = reftable_merged_table_seek_ref(mt, &it, "a");
+ struct reftable_ref_record *out = NULL;
+ size_t len = 0;
+ size_t cap = 0;
+ int i = 0;
+
+ EXPECT_ERR(err);
+ EXPECT(reftable_merged_table_hash_id(mt) == GIT_SHA1_FORMAT_ID);
+ EXPECT(reftable_merged_table_min_update_index(mt) == 1);
+
+ while (len < 100) { /* cap loops/recursion. */
+ struct reftable_ref_record ref = { NULL };
+ int err = reftable_iterator_next_ref(&it, &ref);
+ if (err > 0) {
+ break;
+ }
+ if (len == cap) {
+ cap = 2 * cap + 1;
+ out = reftable_realloc(
+ out, sizeof(struct reftable_ref_record) * cap);
+ }
+ out[len++] = ref;
+ }
+ reftable_iterator_destroy(&it);
+
+ EXPECT(ARRAY_SIZE(want) == len);
+ for (i = 0; i < len; i++) {
+ EXPECT(reftable_ref_record_equal(want[i], &out[i],
+ GIT_SHA1_RAWSZ));
+ }
+ for (i = 0; i < len; i++) {
+ reftable_ref_record_release(&out[i]);
+ }
+ reftable_free(out);
+
+ for (i = 0; i < 3; i++) {
+ strbuf_release(&bufs[i]);
+ }
+ readers_destroy(readers, 3);
+ reftable_merged_table_free(mt);
+ reftable_free(bs);
+}
+
+static struct reftable_merged_table *
+merged_table_from_log_records(struct reftable_log_record **logs,
+ struct reftable_block_source **source,
+ struct reftable_reader ***readers, int *sizes,
+ struct strbuf *buf, int n)
+{
+ int i = 0;
+ struct reftable_merged_table *mt = NULL;
+ int err;
+ struct reftable_table *tabs =
+ reftable_calloc(n * sizeof(struct reftable_table));
+ *readers = reftable_calloc(n * sizeof(struct reftable_reader *));
+ *source = reftable_calloc(n * sizeof(**source));
+ for (i = 0; i < n; i++) {
+ write_test_log_table(&buf[i], logs[i], sizes[i], i + 1);
+ block_source_from_strbuf(&(*source)[i], &buf[i]);
+
+ err = reftable_new_reader(&(*readers)[i], &(*source)[i],
+ "name");
+ EXPECT_ERR(err);
+ reftable_table_from_reader(&tabs[i], (*readers)[i]);
+ }
+
+ err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
+ EXPECT_ERR(err);
+ return mt;
+}
+
+static void test_merged_logs(void)
+{
+ uint8_t hash1[GIT_SHA1_RAWSZ] = { 1 };
+ uint8_t hash2[GIT_SHA1_RAWSZ] = { 2 };
+ uint8_t hash3[GIT_SHA1_RAWSZ] = { 3 };
+ struct reftable_log_record r1[] = {
+ {
+ .refname = "a",
+ .update_index = 2,
+ .value_type = REFTABLE_LOG_UPDATE,
+ .value.update = {
+ .old_hash = hash2,
+ /* deletion */
+ .name = "jane doe",
+ .email = "jane@invalid",
+ .message = "message2",
+ }
+ },
+ {
+ .refname = "a",
+ .update_index = 1,
+ .value_type = REFTABLE_LOG_UPDATE,
+ .value.update = {
+ .old_hash = hash1,
+ .new_hash = hash2,
+ .name = "jane doe",
+ .email = "jane@invalid",
+ .message = "message1",
+ }
+ },
+ };
+ struct reftable_log_record r2[] = {
+ {
+ .refname = "a",
+ .update_index = 3,
+ .value_type = REFTABLE_LOG_UPDATE,
+ .value.update = {
+ .new_hash = hash3,
+ .name = "jane doe",
+ .email = "jane@invalid",
+ .message = "message3",
+ }
+ },
+ };
+ struct reftable_log_record r3[] = {
+ {
+ .refname = "a",
+ .update_index = 2,
+ .value_type = REFTABLE_LOG_DELETION,
+ },
+ };
+ struct reftable_log_record *want[] = {
+ &r2[0],
+ &r3[0],
+ &r1[1],
+ };
+
+ struct reftable_log_record *logs[] = { r1, r2, r3 };
+ int sizes[3] = { 2, 1, 1 };
+ struct strbuf bufs[3] = { STRBUF_INIT, STRBUF_INIT, STRBUF_INIT };
+ struct reftable_block_source *bs = NULL;
+ struct reftable_reader **readers = NULL;
+ struct reftable_merged_table *mt = merged_table_from_log_records(
+ logs, &bs, &readers, sizes, bufs, 3);
+
+ struct reftable_iterator it = { NULL };
+ int err = reftable_merged_table_seek_log(mt, &it, "a");
+ struct reftable_log_record *out = NULL;
+ size_t len = 0;
+ size_t cap = 0;
+ int i = 0;
+
+ EXPECT_ERR(err);
+ EXPECT(reftable_merged_table_hash_id(mt) == GIT_SHA1_FORMAT_ID);
+ EXPECT(reftable_merged_table_min_update_index(mt) == 1);
+
+ while (len < 100) { /* cap loops/recursion. */
+ struct reftable_log_record log = { NULL };
+ int err = reftable_iterator_next_log(&it, &log);
+ if (err > 0) {
+ break;
+ }
+ if (len == cap) {
+ cap = 2 * cap + 1;
+ out = reftable_realloc(
+ out, sizeof(struct reftable_log_record) * cap);
+ }
+ out[len++] = log;
+ }
+ reftable_iterator_destroy(&it);
+
+ EXPECT(ARRAY_SIZE(want) == len);
+ for (i = 0; i < len; i++) {
+ EXPECT(reftable_log_record_equal(want[i], &out[i],
+ GIT_SHA1_RAWSZ));
+ }
+
+ err = reftable_merged_table_seek_log_at(mt, &it, "a", 2);
+ EXPECT_ERR(err);
+ reftable_log_record_release(&out[0]);
+ err = reftable_iterator_next_log(&it, &out[0]);
+ EXPECT_ERR(err);
+ EXPECT(reftable_log_record_equal(&out[0], &r3[0], GIT_SHA1_RAWSZ));
+ reftable_iterator_destroy(&it);
+
+ for (i = 0; i < len; i++) {
+ reftable_log_record_release(&out[i]);
+ }
+ reftable_free(out);
+
+ for (i = 0; i < 3; i++) {
+ strbuf_release(&bufs[i]);
+ }
+ readers_destroy(readers, 3);
+ reftable_merged_table_free(mt);
+ reftable_free(bs);
+}
+
+static void test_default_write_opts(void)
+{
+ struct reftable_write_options opts = { 0 };
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &buf, &opts);
+
+ struct reftable_ref_record rec = {
+ .refname = "master",
+ .update_index = 1,
+ };
+ int err;
+ struct reftable_block_source source = { NULL };
+ struct reftable_table *tab = reftable_calloc(sizeof(*tab) * 1);
+ uint32_t hash_id;
+ struct reftable_reader *rd = NULL;
+ struct reftable_merged_table *merged = NULL;
+
+ reftable_writer_set_limits(w, 1, 1);
+
+ err = reftable_writer_add_ref(w, &rec);
+ EXPECT_ERR(err);
+
+ err = reftable_writer_close(w);
+ EXPECT_ERR(err);
+ reftable_writer_free(w);
+
+ block_source_from_strbuf(&source, &buf);
+
+ err = reftable_new_reader(&rd, &source, "filename");
+ EXPECT_ERR(err);
+
+ hash_id = reftable_reader_hash_id(rd);
+ EXPECT(hash_id == GIT_SHA1_FORMAT_ID);
+
+ reftable_table_from_reader(&tab[0], rd);
+ err = reftable_new_merged_table(&merged, tab, 1, GIT_SHA1_FORMAT_ID);
+ EXPECT_ERR(err);
+
+ reftable_reader_free(rd);
+ reftable_merged_table_free(merged);
+ strbuf_release(&buf);
+}
+
+/* XXX test refs_for(oid) */
+
+int merged_test_main(int argc, const char *argv[])
+{
+ RUN_TEST(test_merged_logs);
+ RUN_TEST(test_merged_between);
+ RUN_TEST(test_merged);
+ RUN_TEST(test_default_write_opts);
+ return 0;
+}
diff --git a/reftable/pq.c b/reftable/pq.c
new file mode 100644
index 0000000..96ca6dd
--- /dev/null
+++ b/reftable/pq.c
@@ -0,0 +1,106 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "pq.h"
+
+#include "reftable-record.h"
+#include "system.h"
+#include "basics.h"
+
+int pq_less(struct pq_entry *a, struct pq_entry *b)
+{
+ struct strbuf ak = STRBUF_INIT;
+ struct strbuf bk = STRBUF_INIT;
+ int cmp = 0;
+ reftable_record_key(&a->rec, &ak);
+ reftable_record_key(&b->rec, &bk);
+
+ cmp = strbuf_cmp(&ak, &bk);
+
+ strbuf_release(&ak);
+ strbuf_release(&bk);
+
+ if (cmp == 0)
+ return a->index > b->index;
+
+ return cmp < 0;
+}
+
+struct pq_entry merged_iter_pqueue_top(struct merged_iter_pqueue pq)
+{
+ return pq.heap[0];
+}
+
+int merged_iter_pqueue_is_empty(struct merged_iter_pqueue pq)
+{
+ return pq.len == 0;
+}
+
+struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq)
+{
+ int i = 0;
+ struct pq_entry e = pq->heap[0];
+ pq->heap[0] = pq->heap[pq->len - 1];
+ pq->len--;
+
+ i = 0;
+ while (i < pq->len) {
+ int min = i;
+ int j = 2 * i + 1;
+ int k = 2 * i + 2;
+ if (j < pq->len && pq_less(&pq->heap[j], &pq->heap[i])) {
+ min = j;
+ }
+ if (k < pq->len && pq_less(&pq->heap[k], &pq->heap[min])) {
+ min = k;
+ }
+
+ if (min == i) {
+ break;
+ }
+
+ SWAP(pq->heap[i], pq->heap[min]);
+ i = min;
+ }
+
+ return e;
+}
+
+void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, struct pq_entry e)
+{
+ int i = 0;
+
+ if (pq->len == pq->cap) {
+ pq->cap = 2 * pq->cap + 1;
+ pq->heap = reftable_realloc(pq->heap,
+ pq->cap * sizeof(struct pq_entry));
+ }
+
+ pq->heap[pq->len++] = e;
+ i = pq->len - 1;
+ while (i > 0) {
+ int j = (i - 1) / 2;
+ if (pq_less(&pq->heap[j], &pq->heap[i])) {
+ break;
+ }
+
+ SWAP(pq->heap[j], pq->heap[i]);
+
+ i = j;
+ }
+}
+
+void merged_iter_pqueue_release(struct merged_iter_pqueue *pq)
+{
+ int i = 0;
+ for (i = 0; i < pq->len; i++) {
+ reftable_record_release(&pq->heap[i].rec);
+ }
+ FREE_AND_NULL(pq->heap);
+ pq->len = pq->cap = 0;
+}
diff --git a/reftable/pq.h b/reftable/pq.h
new file mode 100644
index 0000000..56fc1b6
--- /dev/null
+++ b/reftable/pq.h
@@ -0,0 +1,33 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef PQ_H
+#define PQ_H
+
+#include "record.h"
+
+struct pq_entry {
+ int index;
+ struct reftable_record rec;
+};
+
+struct merged_iter_pqueue {
+ struct pq_entry *heap;
+ size_t len;
+ size_t cap;
+};
+
+struct pq_entry merged_iter_pqueue_top(struct merged_iter_pqueue pq);
+int merged_iter_pqueue_is_empty(struct merged_iter_pqueue pq);
+void merged_iter_pqueue_check(struct merged_iter_pqueue pq);
+struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq);
+void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, struct pq_entry e);
+void merged_iter_pqueue_release(struct merged_iter_pqueue *pq);
+int pq_less(struct pq_entry *a, struct pq_entry *b);
+
+#endif
diff --git a/reftable/pq_test.c b/reftable/pq_test.c
new file mode 100644
index 0000000..7de5e88
--- /dev/null
+++ b/reftable/pq_test.c
@@ -0,0 +1,79 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "system.h"
+
+#include "basics.h"
+#include "constants.h"
+#include "pq.h"
+#include "record.h"
+#include "reftable-tests.h"
+#include "test_framework.h"
+
+void merged_iter_pqueue_check(struct merged_iter_pqueue pq)
+{
+ int i;
+ for (i = 1; i < pq.len; i++) {
+ int parent = (i - 1) / 2;
+
+ EXPECT(pq_less(&pq.heap[parent], &pq.heap[i]));
+ }
+}
+
+static void test_pq(void)
+{
+ char *names[54] = { NULL };
+ int N = ARRAY_SIZE(names) - 1;
+
+ struct merged_iter_pqueue pq = { NULL };
+ char *last = NULL;
+
+ int i = 0;
+ for (i = 0; i < N; i++) {
+ char name[100];
+ snprintf(name, sizeof(name), "%02d", i);
+ names[i] = xstrdup(name);
+ }
+
+ i = 1;
+ do {
+ struct pq_entry e = { .rec = { .type = BLOCK_TYPE_REF,
+ .u.ref = {
+ .refname = names[i],
+ } } };
+ merged_iter_pqueue_add(&pq, e);
+ merged_iter_pqueue_check(pq);
+ i = (i * 7) % N;
+ } while (i != 1);
+
+ while (!merged_iter_pqueue_is_empty(pq)) {
+ struct pq_entry e = merged_iter_pqueue_remove(&pq);
+ struct reftable_record *rec = &e.rec;
+ merged_iter_pqueue_check(pq);
+
+ EXPECT(reftable_record_type(rec) == BLOCK_TYPE_REF);
+ if (last) {
+ EXPECT(strcmp(last, rec->u.ref.refname) < 0);
+ }
+ // this is names[i], so don't dealloc.
+ last = rec->u.ref.refname;
+ rec->u.ref.refname = NULL;
+ reftable_record_release(rec);
+ }
+ for (i = 0; i < N; i++) {
+ reftable_free(names[i]);
+ }
+
+ merged_iter_pqueue_release(&pq);
+}
+
+int pq_test_main(int argc, const char *argv[])
+{
+ RUN_TEST(test_pq);
+ return 0;
+}
diff --git a/reftable/publicbasics.c b/reftable/publicbasics.c
new file mode 100644
index 0000000..0ad7d5c
--- /dev/null
+++ b/reftable/publicbasics.c
@@ -0,0 +1,65 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "reftable-malloc.h"
+
+#include "basics.h"
+#include "system.h"
+
+static void *(*reftable_malloc_ptr)(size_t sz);
+static void *(*reftable_realloc_ptr)(void *, size_t);
+static void (*reftable_free_ptr)(void *);
+
+void *reftable_malloc(size_t sz)
+{
+ if (reftable_malloc_ptr)
+ return (*reftable_malloc_ptr)(sz);
+ return malloc(sz);
+}
+
+void *reftable_realloc(void *p, size_t sz)
+{
+ if (reftable_realloc_ptr)
+ return (*reftable_realloc_ptr)(p, sz);
+ return realloc(p, sz);
+}
+
+void reftable_free(void *p)
+{
+ if (reftable_free_ptr)
+ reftable_free_ptr(p);
+ else
+ free(p);
+}
+
+void *reftable_calloc(size_t sz)
+{
+ void *p = reftable_malloc(sz);
+ memset(p, 0, sz);
+ return p;
+}
+
+void reftable_set_alloc(void *(*malloc)(size_t),
+ void *(*realloc)(void *, size_t), void (*free)(void *))
+{
+ reftable_malloc_ptr = malloc;
+ reftable_realloc_ptr = realloc;
+ reftable_free_ptr = free;
+}
+
+int hash_size(uint32_t id)
+{
+ switch (id) {
+ case 0:
+ case GIT_SHA1_FORMAT_ID:
+ return GIT_SHA1_RAWSZ;
+ case GIT_SHA256_FORMAT_ID:
+ return GIT_SHA256_RAWSZ;
+ }
+ abort();
+}
diff --git a/reftable/reader.c b/reftable/reader.c
new file mode 100644
index 0000000..54b4025
--- /dev/null
+++ b/reftable/reader.c
@@ -0,0 +1,816 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "reader.h"
+
+#include "system.h"
+#include "block.h"
+#include "constants.h"
+#include "generic.h"
+#include "iter.h"
+#include "record.h"
+#include "reftable-error.h"
+#include "reftable-generic.h"
+#include "tree.h"
+
+uint64_t block_source_size(struct reftable_block_source *source)
+{
+ return source->ops->size(source->arg);
+}
+
+int block_source_read_block(struct reftable_block_source *source,
+ struct reftable_block *dest, uint64_t off,
+ uint32_t size)
+{
+ int result = source->ops->read_block(source->arg, dest, off, size);
+ dest->source = *source;
+ return result;
+}
+
+void block_source_close(struct reftable_block_source *source)
+{
+ if (!source->ops) {
+ return;
+ }
+
+ source->ops->close(source->arg);
+ source->ops = NULL;
+}
+
+static struct reftable_reader_offsets *
+reader_offsets_for(struct reftable_reader *r, uint8_t typ)
+{
+ switch (typ) {
+ case BLOCK_TYPE_REF:
+ return &r->ref_offsets;
+ case BLOCK_TYPE_LOG:
+ return &r->log_offsets;
+ case BLOCK_TYPE_OBJ:
+ return &r->obj_offsets;
+ }
+ abort();
+}
+
+static int reader_get_block(struct reftable_reader *r,
+ struct reftable_block *dest, uint64_t off,
+ uint32_t sz)
+{
+ if (off >= r->size)
+ return 0;
+
+ if (off + sz > r->size) {
+ sz = r->size - off;
+ }
+
+ return block_source_read_block(&r->source, dest, off, sz);
+}
+
+uint32_t reftable_reader_hash_id(struct reftable_reader *r)
+{
+ return r->hash_id;
+}
+
+const char *reader_name(struct reftable_reader *r)
+{
+ return r->name;
+}
+
+static int parse_footer(struct reftable_reader *r, uint8_t *footer,
+ uint8_t *header)
+{
+ uint8_t *f = footer;
+ uint8_t first_block_typ;
+ int err = 0;
+ uint32_t computed_crc;
+ uint32_t file_crc;
+
+ if (memcmp(f, "REFT", 4)) {
+ err = REFTABLE_FORMAT_ERROR;
+ goto done;
+ }
+ f += 4;
+
+ if (memcmp(footer, header, header_size(r->version))) {
+ err = REFTABLE_FORMAT_ERROR;
+ goto done;
+ }
+
+ f++;
+ r->block_size = get_be24(f);
+
+ f += 3;
+ r->min_update_index = get_be64(f);
+ f += 8;
+ r->max_update_index = get_be64(f);
+ f += 8;
+
+ if (r->version == 1) {
+ r->hash_id = GIT_SHA1_FORMAT_ID;
+ } else {
+ r->hash_id = get_be32(f);
+ switch (r->hash_id) {
+ case GIT_SHA1_FORMAT_ID:
+ break;
+ case GIT_SHA256_FORMAT_ID:
+ break;
+ default:
+ err = REFTABLE_FORMAT_ERROR;
+ goto done;
+ }
+ f += 4;
+ }
+
+ r->ref_offsets.index_offset = get_be64(f);
+ f += 8;
+
+ r->obj_offsets.offset = get_be64(f);
+ f += 8;
+
+ r->object_id_len = r->obj_offsets.offset & ((1 << 5) - 1);
+ r->obj_offsets.offset >>= 5;
+
+ r->obj_offsets.index_offset = get_be64(f);
+ f += 8;
+ r->log_offsets.offset = get_be64(f);
+ f += 8;
+ r->log_offsets.index_offset = get_be64(f);
+ f += 8;
+
+ computed_crc = crc32(0, footer, f - footer);
+ file_crc = get_be32(f);
+ f += 4;
+ if (computed_crc != file_crc) {
+ err = REFTABLE_FORMAT_ERROR;
+ goto done;
+ }
+
+ first_block_typ = header[header_size(r->version)];
+ r->ref_offsets.is_present = (first_block_typ == BLOCK_TYPE_REF);
+ r->ref_offsets.offset = 0;
+ r->log_offsets.is_present = (first_block_typ == BLOCK_TYPE_LOG ||
+ r->log_offsets.offset > 0);
+ r->obj_offsets.is_present = r->obj_offsets.offset > 0;
+ if (r->obj_offsets.is_present && !r->object_id_len) {
+ err = REFTABLE_FORMAT_ERROR;
+ goto done;
+ }
+
+ err = 0;
+done:
+ return err;
+}
+
+int init_reader(struct reftable_reader *r, struct reftable_block_source *source,
+ const char *name)
+{
+ struct reftable_block footer = { NULL };
+ struct reftable_block header = { NULL };
+ int err = 0;
+ uint64_t file_size = block_source_size(source);
+
+ /* Need +1 to read type of first block. */
+ uint32_t read_size = header_size(2) + 1; /* read v2 because it's larger. */
+ memset(r, 0, sizeof(struct reftable_reader));
+
+ if (read_size > file_size) {
+ err = REFTABLE_FORMAT_ERROR;
+ goto done;
+ }
+
+ err = block_source_read_block(source, &header, 0, read_size);
+ if (err != read_size) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+
+ if (memcmp(header.data, "REFT", 4)) {
+ err = REFTABLE_FORMAT_ERROR;
+ goto done;
+ }
+ r->version = header.data[4];
+ if (r->version != 1 && r->version != 2) {
+ err = REFTABLE_FORMAT_ERROR;
+ goto done;
+ }
+
+ r->size = file_size - footer_size(r->version);
+ r->source = *source;
+ r->name = xstrdup(name);
+ r->hash_id = 0;
+
+ err = block_source_read_block(source, &footer, r->size,
+ footer_size(r->version));
+ if (err != footer_size(r->version)) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+
+ err = parse_footer(r, footer.data, header.data);
+done:
+ reftable_block_done(&footer);
+ reftable_block_done(&header);
+ return err;
+}
+
+struct table_iter {
+ struct reftable_reader *r;
+ uint8_t typ;
+ uint64_t block_off;
+ struct block_iter bi;
+ int is_finished;
+};
+#define TABLE_ITER_INIT \
+ { \
+ .bi = {.last_key = STRBUF_INIT } \
+ }
+
+static void table_iter_copy_from(struct table_iter *dest,
+ struct table_iter *src)
+{
+ dest->r = src->r;
+ dest->typ = src->typ;
+ dest->block_off = src->block_off;
+ dest->is_finished = src->is_finished;
+ block_iter_copy_from(&dest->bi, &src->bi);
+}
+
+static int table_iter_next_in_block(struct table_iter *ti,
+ struct reftable_record *rec)
+{
+ int res = block_iter_next(&ti->bi, rec);
+ if (res == 0 && reftable_record_type(rec) == BLOCK_TYPE_REF) {
+ rec->u.ref.update_index += ti->r->min_update_index;
+ }
+
+ return res;
+}
+
+static void table_iter_block_done(struct table_iter *ti)
+{
+ if (!ti->bi.br) {
+ return;
+ }
+ reftable_block_done(&ti->bi.br->block);
+ FREE_AND_NULL(ti->bi.br);
+
+ ti->bi.last_key.len = 0;
+ ti->bi.next_off = 0;
+}
+
+static int32_t extract_block_size(uint8_t *data, uint8_t *typ, uint64_t off,
+ int version)
+{
+ int32_t result = 0;
+
+ if (off == 0) {
+ data += header_size(version);
+ }
+
+ *typ = data[0];
+ if (reftable_is_block_type(*typ)) {
+ result = get_be24(data + 1);
+ }
+ return result;
+}
+
+int reader_init_block_reader(struct reftable_reader *r, struct block_reader *br,
+ uint64_t next_off, uint8_t want_typ)
+{
+ int32_t guess_block_size = r->block_size ? r->block_size :
+ DEFAULT_BLOCK_SIZE;
+ struct reftable_block block = { NULL };
+ uint8_t block_typ = 0;
+ int err = 0;
+ uint32_t header_off = next_off ? 0 : header_size(r->version);
+ int32_t block_size = 0;
+
+ if (next_off >= r->size)
+ return 1;
+
+ err = reader_get_block(r, &block, next_off, guess_block_size);
+ if (err < 0)
+ goto done;
+
+ block_size = extract_block_size(block.data, &block_typ, next_off,
+ r->version);
+ if (block_size < 0) {
+ err = block_size;
+ goto done;
+ }
+ if (want_typ != BLOCK_TYPE_ANY && block_typ != want_typ) {
+ err = 1;
+ goto done;
+ }
+
+ if (block_size > guess_block_size) {
+ reftable_block_done(&block);
+ err = reader_get_block(r, &block, next_off, block_size);
+ if (err < 0) {
+ goto done;
+ }
+ }
+
+ err = block_reader_init(br, &block, header_off, r->block_size,
+ hash_size(r->hash_id));
+done:
+ reftable_block_done(&block);
+
+ return err;
+}
+
+static int table_iter_next_block(struct table_iter *dest,
+ struct table_iter *src)
+{
+ uint64_t next_block_off = src->block_off + src->bi.br->full_block_size;
+ struct block_reader br = { 0 };
+ int err = 0;
+
+ dest->r = src->r;
+ dest->typ = src->typ;
+ dest->block_off = next_block_off;
+
+ err = reader_init_block_reader(src->r, &br, next_block_off, src->typ);
+ if (err > 0) {
+ dest->is_finished = 1;
+ return 1;
+ }
+ if (err != 0)
+ return err;
+ else {
+ struct block_reader *brp =
+ reftable_malloc(sizeof(struct block_reader));
+ *brp = br;
+
+ dest->is_finished = 0;
+ block_reader_start(brp, &dest->bi);
+ }
+ return 0;
+}
+
+static int table_iter_next(struct table_iter *ti, struct reftable_record *rec)
+{
+ if (reftable_record_type(rec) != ti->typ)
+ return REFTABLE_API_ERROR;
+
+ while (1) {
+ struct table_iter next = TABLE_ITER_INIT;
+ int err = 0;
+ if (ti->is_finished) {
+ return 1;
+ }
+
+ err = table_iter_next_in_block(ti, rec);
+ if (err <= 0) {
+ return err;
+ }
+
+ err = table_iter_next_block(&next, ti);
+ if (err != 0) {
+ ti->is_finished = 1;
+ }
+ table_iter_block_done(ti);
+ if (err != 0) {
+ return err;
+ }
+ table_iter_copy_from(ti, &next);
+ block_iter_close(&next.bi);
+ }
+}
+
+static int table_iter_next_void(void *ti, struct reftable_record *rec)
+{
+ return table_iter_next(ti, rec);
+}
+
+static void table_iter_close(void *p)
+{
+ struct table_iter *ti = p;
+ table_iter_block_done(ti);
+ block_iter_close(&ti->bi);
+}
+
+static struct reftable_iterator_vtable table_iter_vtable = {
+ .next = &table_iter_next_void,
+ .close = &table_iter_close,
+};
+
+static void iterator_from_table_iter(struct reftable_iterator *it,
+ struct table_iter *ti)
+{
+ assert(!it->ops);
+ it->iter_arg = ti;
+ it->ops = &table_iter_vtable;
+}
+
+static int reader_table_iter_at(struct reftable_reader *r,
+ struct table_iter *ti, uint64_t off,
+ uint8_t typ)
+{
+ struct block_reader br = { 0 };
+ struct block_reader *brp = NULL;
+
+ int err = reader_init_block_reader(r, &br, off, typ);
+ if (err != 0)
+ return err;
+
+ brp = reftable_malloc(sizeof(struct block_reader));
+ *brp = br;
+ ti->r = r;
+ ti->typ = block_reader_type(brp);
+ ti->block_off = off;
+ block_reader_start(brp, &ti->bi);
+ return 0;
+}
+
+static int reader_start(struct reftable_reader *r, struct table_iter *ti,
+ uint8_t typ, int index)
+{
+ struct reftable_reader_offsets *offs = reader_offsets_for(r, typ);
+ uint64_t off = offs->offset;
+ if (index) {
+ off = offs->index_offset;
+ if (off == 0) {
+ return 1;
+ }
+ typ = BLOCK_TYPE_INDEX;
+ }
+
+ return reader_table_iter_at(r, ti, off, typ);
+}
+
+static int reader_seek_linear(struct reftable_reader *r, struct table_iter *ti,
+ struct reftable_record *want)
+{
+ struct reftable_record rec =
+ reftable_new_record(reftable_record_type(want));
+ struct strbuf want_key = STRBUF_INIT;
+ struct strbuf got_key = STRBUF_INIT;
+ struct table_iter next = TABLE_ITER_INIT;
+ int err = -1;
+
+ reftable_record_key(want, &want_key);
+
+ while (1) {
+ err = table_iter_next_block(&next, ti);
+ if (err < 0)
+ goto done;
+
+ if (err > 0) {
+ break;
+ }
+
+ err = block_reader_first_key(next.bi.br, &got_key);
+ if (err < 0)
+ goto done;
+
+ if (strbuf_cmp(&got_key, &want_key) > 0) {
+ table_iter_block_done(&next);
+ break;
+ }
+
+ table_iter_block_done(ti);
+ table_iter_copy_from(ti, &next);
+ }
+
+ err = block_iter_seek(&ti->bi, &want_key);
+ if (err < 0)
+ goto done;
+ err = 0;
+
+done:
+ block_iter_close(&next.bi);
+ reftable_record_release(&rec);
+ strbuf_release(&want_key);
+ strbuf_release(&got_key);
+ return err;
+}
+
+static int reader_seek_indexed(struct reftable_reader *r,
+ struct reftable_iterator *it,
+ struct reftable_record *rec)
+{
+ struct reftable_record want_index = {
+ .type = BLOCK_TYPE_INDEX, .u.idx = { .last_key = STRBUF_INIT }
+ };
+ struct reftable_record index_result = {
+ .type = BLOCK_TYPE_INDEX,
+ .u.idx = { .last_key = STRBUF_INIT },
+ };
+ struct table_iter index_iter = TABLE_ITER_INIT;
+ struct table_iter next = TABLE_ITER_INIT;
+ int err = 0;
+
+ reftable_record_key(rec, &want_index.u.idx.last_key);
+ err = reader_start(r, &index_iter, reftable_record_type(rec), 1);
+ if (err < 0)
+ goto done;
+
+ err = reader_seek_linear(r, &index_iter, &want_index);
+ while (1) {
+ err = table_iter_next(&index_iter, &index_result);
+ table_iter_block_done(&index_iter);
+ if (err != 0)
+ goto done;
+
+ err = reader_table_iter_at(r, &next, index_result.u.idx.offset,
+ 0);
+ if (err != 0)
+ goto done;
+
+ err = block_iter_seek(&next.bi, &want_index.u.idx.last_key);
+ if (err < 0)
+ goto done;
+
+ if (next.typ == reftable_record_type(rec)) {
+ err = 0;
+ break;
+ }
+
+ if (next.typ != BLOCK_TYPE_INDEX) {
+ err = REFTABLE_FORMAT_ERROR;
+ break;
+ }
+
+ table_iter_copy_from(&index_iter, &next);
+ }
+
+ if (err == 0) {
+ struct table_iter empty = TABLE_ITER_INIT;
+ struct table_iter *malloced =
+ reftable_calloc(sizeof(struct table_iter));
+ *malloced = empty;
+ table_iter_copy_from(malloced, &next);
+ iterator_from_table_iter(it, malloced);
+ }
+done:
+ block_iter_close(&next.bi);
+ table_iter_close(&index_iter);
+ reftable_record_release(&want_index);
+ reftable_record_release(&index_result);
+ return err;
+}
+
+static int reader_seek_internal(struct reftable_reader *r,
+ struct reftable_iterator *it,
+ struct reftable_record *rec)
+{
+ struct reftable_reader_offsets *offs =
+ reader_offsets_for(r, reftable_record_type(rec));
+ uint64_t idx = offs->index_offset;
+ struct table_iter ti = TABLE_ITER_INIT;
+ int err = 0;
+ if (idx > 0)
+ return reader_seek_indexed(r, it, rec);
+
+ err = reader_start(r, &ti, reftable_record_type(rec), 0);
+ if (err < 0)
+ return err;
+ err = reader_seek_linear(r, &ti, rec);
+ if (err < 0)
+ return err;
+ else {
+ struct table_iter *p =
+ reftable_malloc(sizeof(struct table_iter));
+ *p = ti;
+ iterator_from_table_iter(it, p);
+ }
+
+ return 0;
+}
+
+static int reader_seek(struct reftable_reader *r, struct reftable_iterator *it,
+ struct reftable_record *rec)
+{
+ uint8_t typ = reftable_record_type(rec);
+
+ struct reftable_reader_offsets *offs = reader_offsets_for(r, typ);
+ if (!offs->is_present) {
+ iterator_set_empty(it);
+ return 0;
+ }
+
+ return reader_seek_internal(r, it, rec);
+}
+
+int reftable_reader_seek_ref(struct reftable_reader *r,
+ struct reftable_iterator *it, const char *name)
+{
+ struct reftable_record rec = {
+ .type = BLOCK_TYPE_REF,
+ .u.ref = {
+ .refname = (char *)name,
+ },
+ };
+ return reader_seek(r, it, &rec);
+}
+
+int reftable_reader_seek_log_at(struct reftable_reader *r,
+ struct reftable_iterator *it, const char *name,
+ uint64_t update_index)
+{
+ struct reftable_record rec = { .type = BLOCK_TYPE_LOG,
+ .u.log = {
+ .refname = (char *)name,
+ .update_index = update_index,
+ } };
+ return reader_seek(r, it, &rec);
+}
+
+int reftable_reader_seek_log(struct reftable_reader *r,
+ struct reftable_iterator *it, const char *name)
+{
+ uint64_t max = ~((uint64_t)0);
+ return reftable_reader_seek_log_at(r, it, name, max);
+}
+
+void reader_close(struct reftable_reader *r)
+{
+ block_source_close(&r->source);
+ FREE_AND_NULL(r->name);
+}
+
+int reftable_new_reader(struct reftable_reader **p,
+ struct reftable_block_source *src, char const *name)
+{
+ struct reftable_reader *rd =
+ reftable_calloc(sizeof(struct reftable_reader));
+ int err = init_reader(rd, src, name);
+ if (err == 0) {
+ *p = rd;
+ } else {
+ block_source_close(src);
+ reftable_free(rd);
+ }
+ return err;
+}
+
+void reftable_reader_free(struct reftable_reader *r)
+{
+ if (!r)
+ return;
+ reader_close(r);
+ reftable_free(r);
+}
+
+static int reftable_reader_refs_for_indexed(struct reftable_reader *r,
+ struct reftable_iterator *it,
+ uint8_t *oid)
+{
+ struct reftable_record want = {
+ .type = BLOCK_TYPE_OBJ,
+ .u.obj = {
+ .hash_prefix = oid,
+ .hash_prefix_len = r->object_id_len,
+ },
+ };
+ struct reftable_iterator oit = { NULL };
+ struct reftable_record got = {
+ .type = BLOCK_TYPE_OBJ,
+ .u.obj = { 0 },
+ };
+ int err = 0;
+ struct indexed_table_ref_iter *itr = NULL;
+
+ /* Look through the reverse index. */
+ err = reader_seek(r, &oit, &want);
+ if (err != 0)
+ goto done;
+
+ /* read out the reftable_obj_record */
+ err = iterator_next(&oit, &got);
+ if (err < 0)
+ goto done;
+
+ if (err > 0 || memcmp(want.u.obj.hash_prefix, got.u.obj.hash_prefix,
+ r->object_id_len)) {
+ /* didn't find it; return empty iterator */
+ iterator_set_empty(it);
+ err = 0;
+ goto done;
+ }
+
+ err = new_indexed_table_ref_iter(&itr, r, oid, hash_size(r->hash_id),
+ got.u.obj.offsets,
+ got.u.obj.offset_len);
+ if (err < 0)
+ goto done;
+ got.u.obj.offsets = NULL;
+ iterator_from_indexed_table_ref_iter(it, itr);
+
+done:
+ reftable_iterator_destroy(&oit);
+ reftable_record_release(&got);
+ return err;
+}
+
+static int reftable_reader_refs_for_unindexed(struct reftable_reader *r,
+ struct reftable_iterator *it,
+ uint8_t *oid)
+{
+ struct table_iter ti_empty = TABLE_ITER_INIT;
+ struct table_iter *ti = reftable_calloc(sizeof(struct table_iter));
+ struct filtering_ref_iterator *filter = NULL;
+ struct filtering_ref_iterator empty = FILTERING_REF_ITERATOR_INIT;
+ int oid_len = hash_size(r->hash_id);
+ int err;
+
+ *ti = ti_empty;
+ err = reader_start(r, ti, BLOCK_TYPE_REF, 0);
+ if (err < 0) {
+ reftable_free(ti);
+ return err;
+ }
+
+ filter = reftable_malloc(sizeof(struct filtering_ref_iterator));
+ *filter = empty;
+
+ strbuf_add(&filter->oid, oid, oid_len);
+ reftable_table_from_reader(&filter->tab, r);
+ filter->double_check = 0;
+ iterator_from_table_iter(&filter->it, ti);
+
+ iterator_from_filtering_ref_iterator(it, filter);
+ return 0;
+}
+
+int reftable_reader_refs_for(struct reftable_reader *r,
+ struct reftable_iterator *it, uint8_t *oid)
+{
+ if (r->obj_offsets.is_present)
+ return reftable_reader_refs_for_indexed(r, it, oid);
+ return reftable_reader_refs_for_unindexed(r, it, oid);
+}
+
+uint64_t reftable_reader_max_update_index(struct reftable_reader *r)
+{
+ return r->max_update_index;
+}
+
+uint64_t reftable_reader_min_update_index(struct reftable_reader *r)
+{
+ return r->min_update_index;
+}
+
+/* generic table interface. */
+
+static int reftable_reader_seek_void(void *tab, struct reftable_iterator *it,
+ struct reftable_record *rec)
+{
+ return reader_seek(tab, it, rec);
+}
+
+static uint32_t reftable_reader_hash_id_void(void *tab)
+{
+ return reftable_reader_hash_id(tab);
+}
+
+static uint64_t reftable_reader_min_update_index_void(void *tab)
+{
+ return reftable_reader_min_update_index(tab);
+}
+
+static uint64_t reftable_reader_max_update_index_void(void *tab)
+{
+ return reftable_reader_max_update_index(tab);
+}
+
+static struct reftable_table_vtable reader_vtable = {
+ .seek_record = reftable_reader_seek_void,
+ .hash_id = reftable_reader_hash_id_void,
+ .min_update_index = reftable_reader_min_update_index_void,
+ .max_update_index = reftable_reader_max_update_index_void,
+};
+
+void reftable_table_from_reader(struct reftable_table *tab,
+ struct reftable_reader *reader)
+{
+ assert(!tab->ops);
+ tab->ops = &reader_vtable;
+ tab->table_arg = reader;
+}
+
+
+int reftable_reader_print_file(const char *tablename)
+{
+ struct reftable_block_source src = { NULL };
+ int err = reftable_block_source_from_file(&src, tablename);
+ struct reftable_reader *r = NULL;
+ struct reftable_table tab = { NULL };
+ if (err < 0)
+ goto done;
+
+ err = reftable_new_reader(&r, &src, tablename);
+ if (err < 0)
+ goto done;
+
+ reftable_table_from_reader(&tab, r);
+ err = reftable_table_print(&tab);
+done:
+ reftable_reader_free(r);
+ return err;
+}
diff --git a/reftable/reader.h b/reftable/reader.h
new file mode 100644
index 0000000..e869165
--- /dev/null
+++ b/reftable/reader.h
@@ -0,0 +1,64 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef READER_H
+#define READER_H
+
+#include "block.h"
+#include "record.h"
+#include "reftable-iterator.h"
+#include "reftable-reader.h"
+
+uint64_t block_source_size(struct reftable_block_source *source);
+
+int block_source_read_block(struct reftable_block_source *source,
+ struct reftable_block *dest, uint64_t off,
+ uint32_t size);
+void block_source_close(struct reftable_block_source *source);
+
+/* metadata for a block type */
+struct reftable_reader_offsets {
+ int is_present;
+ uint64_t offset;
+ uint64_t index_offset;
+};
+
+/* The state for reading a reftable file. */
+struct reftable_reader {
+ /* for convience, associate a name with the instance. */
+ char *name;
+ struct reftable_block_source source;
+
+ /* Size of the file, excluding the footer. */
+ uint64_t size;
+
+ /* 'sha1' for SHA1, 's256' for SHA-256 */
+ uint32_t hash_id;
+
+ uint32_t block_size;
+ uint64_t min_update_index;
+ uint64_t max_update_index;
+ /* Length of the OID keys in the 'o' section */
+ int object_id_len;
+ int version;
+
+ struct reftable_reader_offsets ref_offsets;
+ struct reftable_reader_offsets obj_offsets;
+ struct reftable_reader_offsets log_offsets;
+};
+
+int init_reader(struct reftable_reader *r, struct reftable_block_source *source,
+ const char *name);
+void reader_close(struct reftable_reader *r);
+const char *reader_name(struct reftable_reader *r);
+
+/* initialize a block reader to read from `r` */
+int reader_init_block_reader(struct reftable_reader *r, struct block_reader *br,
+ uint64_t next_off, uint8_t want_typ);
+
+#endif
diff --git a/reftable/readwrite_test.c b/reftable/readwrite_test.c
new file mode 100644
index 0000000..469ab79
--- /dev/null
+++ b/reftable/readwrite_test.c
@@ -0,0 +1,851 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "system.h"
+
+#include "basics.h"
+#include "block.h"
+#include "blocksource.h"
+#include "constants.h"
+#include "reader.h"
+#include "record.h"
+#include "test_framework.h"
+#include "reftable-tests.h"
+#include "reftable-writer.h"
+
+static const int update_index = 5;
+
+static void test_buffer(void)
+{
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_block_source source = { NULL };
+ struct reftable_block out = { NULL };
+ int n;
+ uint8_t in[] = "hello";
+ strbuf_add(&buf, in, sizeof(in));
+ block_source_from_strbuf(&source, &buf);
+ EXPECT(block_source_size(&source) == 6);
+ n = block_source_read_block(&source, &out, 0, sizeof(in));
+ EXPECT(n == sizeof(in));
+ EXPECT(!memcmp(in, out.data, n));
+ reftable_block_done(&out);
+
+ n = block_source_read_block(&source, &out, 1, 2);
+ EXPECT(n == 2);
+ EXPECT(!memcmp(out.data, "el", 2));
+
+ reftable_block_done(&out);
+ block_source_close(&source);
+ strbuf_release(&buf);
+}
+
+static void write_table(char ***names, struct strbuf *buf, int N,
+ int block_size, uint32_t hash_id)
+{
+ struct reftable_write_options opts = {
+ .block_size = block_size,
+ .hash_id = hash_id,
+ };
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, buf, &opts);
+ struct reftable_ref_record ref = { NULL };
+ int i = 0, n;
+ struct reftable_log_record log = { NULL };
+ const struct reftable_stats *stats = NULL;
+ *names = reftable_calloc(sizeof(char *) * (N + 1));
+ reftable_writer_set_limits(w, update_index, update_index);
+ for (i = 0; i < N; i++) {
+ uint8_t hash[GIT_SHA256_RAWSZ] = { 0 };
+ char name[100];
+ int n;
+
+ set_test_hash(hash, i);
+
+ snprintf(name, sizeof(name), "refs/heads/branch%02d", i);
+
+ ref.refname = name;
+ ref.update_index = update_index;
+ ref.value_type = REFTABLE_REF_VAL1;
+ ref.value.val1 = hash;
+ (*names)[i] = xstrdup(name);
+
+ n = reftable_writer_add_ref(w, &ref);
+ EXPECT(n == 0);
+ }
+
+ for (i = 0; i < N; i++) {
+ uint8_t hash[GIT_SHA256_RAWSZ] = { 0 };
+ char name[100];
+ int n;
+
+ set_test_hash(hash, i);
+
+ snprintf(name, sizeof(name), "refs/heads/branch%02d", i);
+
+ log.refname = name;
+ log.update_index = update_index;
+ log.value_type = REFTABLE_LOG_UPDATE;
+ log.value.update.new_hash = hash;
+ log.value.update.message = "message";
+
+ n = reftable_writer_add_log(w, &log);
+ EXPECT(n == 0);
+ }
+
+ n = reftable_writer_close(w);
+ EXPECT(n == 0);
+
+ stats = reftable_writer_stats(w);
+ for (i = 0; i < stats->ref_stats.blocks; i++) {
+ int off = i * opts.block_size;
+ if (off == 0) {
+ off = header_size(
+ (hash_id == GIT_SHA256_FORMAT_ID) ? 2 : 1);
+ }
+ EXPECT(buf->buf[off] == 'r');
+ }
+
+ EXPECT(stats->log_stats.blocks > 0);
+ reftable_writer_free(w);
+}
+
+static void test_log_buffer_size(void)
+{
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_write_options opts = {
+ .block_size = 4096,
+ };
+ int err;
+ int i;
+ struct reftable_log_record
+ log = { .refname = "refs/heads/master",
+ .update_index = 0xa,
+ .value_type = REFTABLE_LOG_UPDATE,
+ .value = { .update = {
+ .name = "Han-Wen Nienhuys",
+ .email = "hanwen@google.com",
+ .tz_offset = 100,
+ .time = 0x5e430672,
+ .message = "commit: 9\n",
+ } } };
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &buf, &opts);
+
+ /* This tests buffer extension for log compression. Must use a random
+ hash, to ensure that the compressed part is larger than the original.
+ */
+ uint8_t hash1[GIT_SHA1_RAWSZ], hash2[GIT_SHA1_RAWSZ];
+ for (i = 0; i < GIT_SHA1_RAWSZ; i++) {
+ hash1[i] = (uint8_t)(rand() % 256);
+ hash2[i] = (uint8_t)(rand() % 256);
+ }
+ log.value.update.old_hash = hash1;
+ log.value.update.new_hash = hash2;
+ reftable_writer_set_limits(w, update_index, update_index);
+ err = reftable_writer_add_log(w, &log);
+ EXPECT_ERR(err);
+ err = reftable_writer_close(w);
+ EXPECT_ERR(err);
+ reftable_writer_free(w);
+ strbuf_release(&buf);
+}
+
+static void test_log_overflow(void)
+{
+ struct strbuf buf = STRBUF_INIT;
+ char msg[256] = { 0 };
+ struct reftable_write_options opts = {
+ .block_size = ARRAY_SIZE(msg),
+ };
+ int err;
+ struct reftable_log_record
+ log = { .refname = "refs/heads/master",
+ .update_index = 0xa,
+ .value_type = REFTABLE_LOG_UPDATE,
+ .value = { .update = {
+ .name = "Han-Wen Nienhuys",
+ .email = "hanwen@google.com",
+ .tz_offset = 100,
+ .time = 0x5e430672,
+ .message = msg,
+ } } };
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &buf, &opts);
+
+ uint8_t hash1[GIT_SHA1_RAWSZ] = {1}, hash2[GIT_SHA1_RAWSZ] = { 2 };
+
+ memset(msg, 'x', sizeof(msg) - 1);
+ log.value.update.old_hash = hash1;
+ log.value.update.new_hash = hash2;
+ reftable_writer_set_limits(w, update_index, update_index);
+ err = reftable_writer_add_log(w, &log);
+ EXPECT(err == REFTABLE_ENTRY_TOO_BIG_ERROR);
+ reftable_writer_free(w);
+ strbuf_release(&buf);
+}
+
+static void test_log_write_read(void)
+{
+ int N = 2;
+ char **names = reftable_calloc(sizeof(char *) * (N + 1));
+ int err;
+ struct reftable_write_options opts = {
+ .block_size = 256,
+ };
+ struct reftable_ref_record ref = { NULL };
+ int i = 0;
+ struct reftable_log_record log = { NULL };
+ int n;
+ struct reftable_iterator it = { NULL };
+ struct reftable_reader rd = { NULL };
+ struct reftable_block_source source = { NULL };
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &buf, &opts);
+ const struct reftable_stats *stats = NULL;
+ reftable_writer_set_limits(w, 0, N);
+ for (i = 0; i < N; i++) {
+ char name[256];
+ struct reftable_ref_record ref = { NULL };
+ snprintf(name, sizeof(name), "b%02d%0*d", i, 130, 7);
+ names[i] = xstrdup(name);
+ ref.refname = name;
+ ref.update_index = i;
+
+ err = reftable_writer_add_ref(w, &ref);
+ EXPECT_ERR(err);
+ }
+ for (i = 0; i < N; i++) {
+ uint8_t hash1[GIT_SHA1_RAWSZ], hash2[GIT_SHA1_RAWSZ];
+ struct reftable_log_record log = { NULL };
+ set_test_hash(hash1, i);
+ set_test_hash(hash2, i + 1);
+
+ log.refname = names[i];
+ log.update_index = i;
+ log.value_type = REFTABLE_LOG_UPDATE;
+ log.value.update.old_hash = hash1;
+ log.value.update.new_hash = hash2;
+
+ err = reftable_writer_add_log(w, &log);
+ EXPECT_ERR(err);
+ }
+
+ n = reftable_writer_close(w);
+ EXPECT(n == 0);
+
+ stats = reftable_writer_stats(w);
+ EXPECT(stats->log_stats.blocks > 0);
+ reftable_writer_free(w);
+ w = NULL;
+
+ block_source_from_strbuf(&source, &buf);
+
+ err = init_reader(&rd, &source, "file.log");
+ EXPECT_ERR(err);
+
+ err = reftable_reader_seek_ref(&rd, &it, names[N - 1]);
+ EXPECT_ERR(err);
+
+ err = reftable_iterator_next_ref(&it, &ref);
+ EXPECT_ERR(err);
+
+ /* end of iteration. */
+ err = reftable_iterator_next_ref(&it, &ref);
+ EXPECT(0 < err);
+
+ reftable_iterator_destroy(&it);
+ reftable_ref_record_release(&ref);
+
+ err = reftable_reader_seek_log(&rd, &it, "");
+ EXPECT_ERR(err);
+
+ i = 0;
+ while (1) {
+ int err = reftable_iterator_next_log(&it, &log);
+ if (err > 0) {
+ break;
+ }
+
+ EXPECT_ERR(err);
+ EXPECT_STREQ(names[i], log.refname);
+ EXPECT(i == log.update_index);
+ i++;
+ reftable_log_record_release(&log);
+ }
+
+ EXPECT(i == N);
+ reftable_iterator_destroy(&it);
+
+ /* cleanup. */
+ strbuf_release(&buf);
+ free_names(names);
+ reader_close(&rd);
+}
+
+static void test_log_zlib_corruption(void)
+{
+ struct reftable_write_options opts = {
+ .block_size = 256,
+ };
+ struct reftable_iterator it = { 0 };
+ struct reftable_reader rd = { 0 };
+ struct reftable_block_source source = { 0 };
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &buf, &opts);
+ const struct reftable_stats *stats = NULL;
+ uint8_t hash1[GIT_SHA1_RAWSZ] = { 1 };
+ uint8_t hash2[GIT_SHA1_RAWSZ] = { 2 };
+ char message[100] = { 0 };
+ int err, i, n;
+
+ struct reftable_log_record log = {
+ .refname = "refname",
+ .value_type = REFTABLE_LOG_UPDATE,
+ .value = {
+ .update = {
+ .new_hash = hash1,
+ .old_hash = hash2,
+ .name = "My Name",
+ .email = "myname@invalid",
+ .message = message,
+ },
+ },
+ };
+
+ for (i = 0; i < sizeof(message) - 1; i++)
+ message[i] = (uint8_t)(rand() % 64 + ' ');
+
+ reftable_writer_set_limits(w, 1, 1);
+
+ err = reftable_writer_add_log(w, &log);
+ EXPECT_ERR(err);
+
+ n = reftable_writer_close(w);
+ EXPECT(n == 0);
+
+ stats = reftable_writer_stats(w);
+ EXPECT(stats->log_stats.blocks > 0);
+ reftable_writer_free(w);
+ w = NULL;
+
+ /* corrupt the data. */
+ buf.buf[50] ^= 0x99;
+
+ block_source_from_strbuf(&source, &buf);
+
+ err = init_reader(&rd, &source, "file.log");
+ EXPECT_ERR(err);
+
+ err = reftable_reader_seek_log(&rd, &it, "refname");
+ EXPECT(err == REFTABLE_ZLIB_ERROR);
+
+ reftable_iterator_destroy(&it);
+
+ /* cleanup. */
+ strbuf_release(&buf);
+ reader_close(&rd);
+}
+
+static void test_table_read_write_sequential(void)
+{
+ char **names;
+ struct strbuf buf = STRBUF_INIT;
+ int N = 50;
+ struct reftable_iterator it = { NULL };
+ struct reftable_block_source source = { NULL };
+ struct reftable_reader rd = { NULL };
+ int err = 0;
+ int j = 0;
+
+ write_table(&names, &buf, N, 256, GIT_SHA1_FORMAT_ID);
+
+ block_source_from_strbuf(&source, &buf);
+
+ err = init_reader(&rd, &source, "file.ref");
+ EXPECT_ERR(err);
+
+ err = reftable_reader_seek_ref(&rd, &it, "");
+ EXPECT_ERR(err);
+
+ while (1) {
+ struct reftable_ref_record ref = { NULL };
+ int r = reftable_iterator_next_ref(&it, &ref);
+ EXPECT(r >= 0);
+ if (r > 0) {
+ break;
+ }
+ EXPECT(0 == strcmp(names[j], ref.refname));
+ EXPECT(update_index == ref.update_index);
+
+ j++;
+ reftable_ref_record_release(&ref);
+ }
+ EXPECT(j == N);
+ reftable_iterator_destroy(&it);
+ strbuf_release(&buf);
+ free_names(names);
+
+ reader_close(&rd);
+}
+
+static void test_table_write_small_table(void)
+{
+ char **names;
+ struct strbuf buf = STRBUF_INIT;
+ int N = 1;
+ write_table(&names, &buf, N, 4096, GIT_SHA1_FORMAT_ID);
+ EXPECT(buf.len < 200);
+ strbuf_release(&buf);
+ free_names(names);
+}
+
+static void test_table_read_api(void)
+{
+ char **names;
+ struct strbuf buf = STRBUF_INIT;
+ int N = 50;
+ struct reftable_reader rd = { NULL };
+ struct reftable_block_source source = { NULL };
+ int err;
+ int i;
+ struct reftable_log_record log = { NULL };
+ struct reftable_iterator it = { NULL };
+
+ write_table(&names, &buf, N, 256, GIT_SHA1_FORMAT_ID);
+
+ block_source_from_strbuf(&source, &buf);
+
+ err = init_reader(&rd, &source, "file.ref");
+ EXPECT_ERR(err);
+
+ err = reftable_reader_seek_ref(&rd, &it, names[0]);
+ EXPECT_ERR(err);
+
+ err = reftable_iterator_next_log(&it, &log);
+ EXPECT(err == REFTABLE_API_ERROR);
+
+ strbuf_release(&buf);
+ for (i = 0; i < N; i++) {
+ reftable_free(names[i]);
+ }
+ reftable_iterator_destroy(&it);
+ reftable_free(names);
+ reader_close(&rd);
+ strbuf_release(&buf);
+}
+
+static void test_table_read_write_seek(int index, int hash_id)
+{
+ char **names;
+ struct strbuf buf = STRBUF_INIT;
+ int N = 50;
+ struct reftable_reader rd = { NULL };
+ struct reftable_block_source source = { NULL };
+ int err;
+ int i = 0;
+
+ struct reftable_iterator it = { NULL };
+ struct strbuf pastLast = STRBUF_INIT;
+ struct reftable_ref_record ref = { NULL };
+
+ write_table(&names, &buf, N, 256, hash_id);
+
+ block_source_from_strbuf(&source, &buf);
+
+ err = init_reader(&rd, &source, "file.ref");
+ EXPECT_ERR(err);
+ EXPECT(hash_id == reftable_reader_hash_id(&rd));
+
+ if (!index) {
+ rd.ref_offsets.index_offset = 0;
+ } else {
+ EXPECT(rd.ref_offsets.index_offset > 0);
+ }
+
+ for (i = 1; i < N; i++) {
+ int err = reftable_reader_seek_ref(&rd, &it, names[i]);
+ EXPECT_ERR(err);
+ err = reftable_iterator_next_ref(&it, &ref);
+ EXPECT_ERR(err);
+ EXPECT(0 == strcmp(names[i], ref.refname));
+ EXPECT(REFTABLE_REF_VAL1 == ref.value_type);
+ EXPECT(i == ref.value.val1[0]);
+
+ reftable_ref_record_release(&ref);
+ reftable_iterator_destroy(&it);
+ }
+
+ strbuf_addstr(&pastLast, names[N - 1]);
+ strbuf_addstr(&pastLast, "/");
+
+ err = reftable_reader_seek_ref(&rd, &it, pastLast.buf);
+ if (err == 0) {
+ struct reftable_ref_record ref = { NULL };
+ int err = reftable_iterator_next_ref(&it, &ref);
+ EXPECT(err > 0);
+ } else {
+ EXPECT(err > 0);
+ }
+
+ strbuf_release(&pastLast);
+ reftable_iterator_destroy(&it);
+
+ strbuf_release(&buf);
+ for (i = 0; i < N; i++) {
+ reftable_free(names[i]);
+ }
+ reftable_free(names);
+ reader_close(&rd);
+}
+
+static void test_table_read_write_seek_linear(void)
+{
+ test_table_read_write_seek(0, GIT_SHA1_FORMAT_ID);
+}
+
+static void test_table_read_write_seek_linear_sha256(void)
+{
+ test_table_read_write_seek(0, GIT_SHA256_FORMAT_ID);
+}
+
+static void test_table_read_write_seek_index(void)
+{
+ test_table_read_write_seek(1, GIT_SHA1_FORMAT_ID);
+}
+
+static void test_table_refs_for(int indexed)
+{
+ int N = 50;
+ char **want_names = reftable_calloc(sizeof(char *) * (N + 1));
+ int want_names_len = 0;
+ uint8_t want_hash[GIT_SHA1_RAWSZ];
+
+ struct reftable_write_options opts = {
+ .block_size = 256,
+ };
+ struct reftable_ref_record ref = { NULL };
+ int i = 0;
+ int n;
+ int err;
+ struct reftable_reader rd;
+ struct reftable_block_source source = { NULL };
+
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &buf, &opts);
+
+ struct reftable_iterator it = { NULL };
+ int j;
+
+ set_test_hash(want_hash, 4);
+
+ for (i = 0; i < N; i++) {
+ uint8_t hash[GIT_SHA1_RAWSZ];
+ char fill[51] = { 0 };
+ char name[100];
+ uint8_t hash1[GIT_SHA1_RAWSZ];
+ uint8_t hash2[GIT_SHA1_RAWSZ];
+ struct reftable_ref_record ref = { NULL };
+
+ memset(hash, i, sizeof(hash));
+ memset(fill, 'x', 50);
+ /* Put the variable part in the start */
+ snprintf(name, sizeof(name), "br%02d%s", i, fill);
+ name[40] = 0;
+ ref.refname = name;
+
+ set_test_hash(hash1, i / 4);
+ set_test_hash(hash2, 3 + i / 4);
+ ref.value_type = REFTABLE_REF_VAL2;
+ ref.value.val2.value = hash1;
+ ref.value.val2.target_value = hash2;
+
+ /* 80 bytes / entry, so 3 entries per block. Yields 17
+ */
+ /* blocks. */
+ n = reftable_writer_add_ref(w, &ref);
+ EXPECT(n == 0);
+
+ if (!memcmp(hash1, want_hash, GIT_SHA1_RAWSZ) ||
+ !memcmp(hash2, want_hash, GIT_SHA1_RAWSZ)) {
+ want_names[want_names_len++] = xstrdup(name);
+ }
+ }
+
+ n = reftable_writer_close(w);
+ EXPECT(n == 0);
+
+ reftable_writer_free(w);
+ w = NULL;
+
+ block_source_from_strbuf(&source, &buf);
+
+ err = init_reader(&rd, &source, "file.ref");
+ EXPECT_ERR(err);
+ if (!indexed) {
+ rd.obj_offsets.is_present = 0;
+ }
+
+ err = reftable_reader_seek_ref(&rd, &it, "");
+ EXPECT_ERR(err);
+ reftable_iterator_destroy(&it);
+
+ err = reftable_reader_refs_for(&rd, &it, want_hash);
+ EXPECT_ERR(err);
+
+ j = 0;
+ while (1) {
+ int err = reftable_iterator_next_ref(&it, &ref);
+ EXPECT(err >= 0);
+ if (err > 0) {
+ break;
+ }
+
+ EXPECT(j < want_names_len);
+ EXPECT(0 == strcmp(ref.refname, want_names[j]));
+ j++;
+ reftable_ref_record_release(&ref);
+ }
+ EXPECT(j == want_names_len);
+
+ strbuf_release(&buf);
+ free_names(want_names);
+ reftable_iterator_destroy(&it);
+ reader_close(&rd);
+}
+
+static void test_table_refs_for_no_index(void)
+{
+ test_table_refs_for(0);
+}
+
+static void test_table_refs_for_obj_index(void)
+{
+ test_table_refs_for(1);
+}
+
+static void test_write_empty_table(void)
+{
+ struct reftable_write_options opts = { 0 };
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &buf, &opts);
+ struct reftable_block_source source = { NULL };
+ struct reftable_reader *rd = NULL;
+ struct reftable_ref_record rec = { NULL };
+ struct reftable_iterator it = { NULL };
+ int err;
+
+ reftable_writer_set_limits(w, 1, 1);
+
+ err = reftable_writer_close(w);
+ EXPECT(err == REFTABLE_EMPTY_TABLE_ERROR);
+ reftable_writer_free(w);
+
+ EXPECT(buf.len == header_size(1) + footer_size(1));
+
+ block_source_from_strbuf(&source, &buf);
+
+ err = reftable_new_reader(&rd, &source, "filename");
+ EXPECT_ERR(err);
+
+ err = reftable_reader_seek_ref(rd, &it, "");
+ EXPECT_ERR(err);
+
+ err = reftable_iterator_next_ref(&it, &rec);
+ EXPECT(err > 0);
+
+ reftable_iterator_destroy(&it);
+ reftable_reader_free(rd);
+ strbuf_release(&buf);
+}
+
+static void test_write_object_id_min_length(void)
+{
+ struct reftable_write_options opts = {
+ .block_size = 75,
+ };
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &buf, &opts);
+ uint8_t hash[GIT_SHA1_RAWSZ] = {42};
+ struct reftable_ref_record ref = {
+ .update_index = 1,
+ .value_type = REFTABLE_REF_VAL1,
+ .value.val1 = hash,
+ };
+ int err;
+ int i;
+
+ reftable_writer_set_limits(w, 1, 1);
+
+ /* Write the same hash in many refs. If there is only 1 hash, the
+ * disambiguating prefix is length 0 */
+ for (i = 0; i < 256; i++) {
+ char name[256];
+ snprintf(name, sizeof(name), "ref%05d", i);
+ ref.refname = name;
+ err = reftable_writer_add_ref(w, &ref);
+ EXPECT_ERR(err);
+ }
+
+ err = reftable_writer_close(w);
+ EXPECT_ERR(err);
+ EXPECT(reftable_writer_stats(w)->object_id_len == 2);
+ reftable_writer_free(w);
+ strbuf_release(&buf);
+}
+
+static void test_write_object_id_length(void)
+{
+ struct reftable_write_options opts = {
+ .block_size = 75,
+ };
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &buf, &opts);
+ uint8_t hash[GIT_SHA1_RAWSZ] = {42};
+ struct reftable_ref_record ref = {
+ .update_index = 1,
+ .value_type = REFTABLE_REF_VAL1,
+ .value.val1 = hash,
+ };
+ int err;
+ int i;
+
+ reftable_writer_set_limits(w, 1, 1);
+
+ /* Write the same hash in many refs. If there is only 1 hash, the
+ * disambiguating prefix is length 0 */
+ for (i = 0; i < 256; i++) {
+ char name[256];
+ snprintf(name, sizeof(name), "ref%05d", i);
+ ref.refname = name;
+ ref.value.val1[15] = i;
+ err = reftable_writer_add_ref(w, &ref);
+ EXPECT_ERR(err);
+ }
+
+ err = reftable_writer_close(w);
+ EXPECT_ERR(err);
+ EXPECT(reftable_writer_stats(w)->object_id_len == 16);
+ reftable_writer_free(w);
+ strbuf_release(&buf);
+}
+
+static void test_write_empty_key(void)
+{
+ struct reftable_write_options opts = { 0 };
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &buf, &opts);
+ struct reftable_ref_record ref = {
+ .refname = "",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_DELETION,
+ };
+ int err;
+
+ reftable_writer_set_limits(w, 1, 1);
+ err = reftable_writer_add_ref(w, &ref);
+ EXPECT(err == REFTABLE_API_ERROR);
+
+ err = reftable_writer_close(w);
+ EXPECT(err == REFTABLE_EMPTY_TABLE_ERROR);
+ reftable_writer_free(w);
+ strbuf_release(&buf);
+}
+
+static void test_write_key_order(void)
+{
+ struct reftable_write_options opts = { 0 };
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &buf, &opts);
+ struct reftable_ref_record refs[2] = {
+ {
+ .refname = "b",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_SYMREF,
+ .value = {
+ .symref = "target",
+ },
+ }, {
+ .refname = "a",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_SYMREF,
+ .value = {
+ .symref = "target",
+ },
+ }
+ };
+ int err;
+
+ reftable_writer_set_limits(w, 1, 1);
+ err = reftable_writer_add_ref(w, &refs[0]);
+ EXPECT_ERR(err);
+ err = reftable_writer_add_ref(w, &refs[1]);
+ EXPECT(err == REFTABLE_API_ERROR);
+ reftable_writer_close(w);
+ reftable_writer_free(w);
+ strbuf_release(&buf);
+}
+
+static void test_corrupt_table_empty(void)
+{
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_block_source source = { NULL };
+ struct reftable_reader rd = { NULL };
+ int err;
+
+ block_source_from_strbuf(&source, &buf);
+ err = init_reader(&rd, &source, "file.log");
+ EXPECT(err == REFTABLE_FORMAT_ERROR);
+}
+
+static void test_corrupt_table(void)
+{
+ uint8_t zeros[1024] = { 0 };
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_block_source source = { NULL };
+ struct reftable_reader rd = { NULL };
+ int err;
+ strbuf_add(&buf, zeros, sizeof(zeros));
+
+ block_source_from_strbuf(&source, &buf);
+ err = init_reader(&rd, &source, "file.log");
+ EXPECT(err == REFTABLE_FORMAT_ERROR);
+ strbuf_release(&buf);
+}
+
+int readwrite_test_main(int argc, const char *argv[])
+{
+ RUN_TEST(test_log_zlib_corruption);
+ RUN_TEST(test_corrupt_table);
+ RUN_TEST(test_corrupt_table_empty);
+ RUN_TEST(test_log_write_read);
+ RUN_TEST(test_write_key_order);
+ RUN_TEST(test_table_read_write_seek_linear_sha256);
+ RUN_TEST(test_log_buffer_size);
+ RUN_TEST(test_table_write_small_table);
+ RUN_TEST(test_buffer);
+ RUN_TEST(test_table_read_api);
+ RUN_TEST(test_table_read_write_sequential);
+ RUN_TEST(test_table_read_write_seek_linear);
+ RUN_TEST(test_table_read_write_seek_index);
+ RUN_TEST(test_table_refs_for_no_index);
+ RUN_TEST(test_table_refs_for_obj_index);
+ RUN_TEST(test_write_empty_key);
+ RUN_TEST(test_write_empty_table);
+ RUN_TEST(test_log_overflow);
+ RUN_TEST(test_write_object_id_length);
+ RUN_TEST(test_write_object_id_min_length);
+ return 0;
+}
diff --git a/reftable/record.c b/reftable/record.c
new file mode 100644
index 0000000..fbaa1fb
--- /dev/null
+++ b/reftable/record.c
@@ -0,0 +1,1314 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+/* record.c - methods for different types of records. */
+
+#include "record.h"
+
+#include "system.h"
+#include "constants.h"
+#include "reftable-error.h"
+#include "basics.h"
+
+static struct reftable_record_vtable *
+reftable_record_vtable(struct reftable_record *rec);
+static void *reftable_record_data(struct reftable_record *rec);
+
+int get_var_int(uint64_t *dest, struct string_view *in)
+{
+ int ptr = 0;
+ uint64_t val;
+
+ if (in->len == 0)
+ return -1;
+ val = in->buf[ptr] & 0x7f;
+
+ while (in->buf[ptr] & 0x80) {
+ ptr++;
+ if (ptr > in->len) {
+ return -1;
+ }
+ val = (val + 1) << 7 | (uint64_t)(in->buf[ptr] & 0x7f);
+ }
+
+ *dest = val;
+ return ptr + 1;
+}
+
+int put_var_int(struct string_view *dest, uint64_t val)
+{
+ uint8_t buf[10] = { 0 };
+ int i = 9;
+ int n = 0;
+ buf[i] = (uint8_t)(val & 0x7f);
+ i--;
+ while (1) {
+ val >>= 7;
+ if (!val) {
+ break;
+ }
+ val--;
+ buf[i] = 0x80 | (uint8_t)(val & 0x7f);
+ i--;
+ }
+
+ n = sizeof(buf) - i - 1;
+ if (dest->len < n)
+ return -1;
+ memcpy(dest->buf, &buf[i + 1], n);
+ return n;
+}
+
+int reftable_is_block_type(uint8_t typ)
+{
+ switch (typ) {
+ case BLOCK_TYPE_REF:
+ case BLOCK_TYPE_LOG:
+ case BLOCK_TYPE_OBJ:
+ case BLOCK_TYPE_INDEX:
+ return 1;
+ }
+ return 0;
+}
+
+uint8_t *reftable_ref_record_val1(const struct reftable_ref_record *rec)
+{
+ switch (rec->value_type) {
+ case REFTABLE_REF_VAL1:
+ return rec->value.val1;
+ case REFTABLE_REF_VAL2:
+ return rec->value.val2.value;
+ default:
+ return NULL;
+ }
+}
+
+uint8_t *reftable_ref_record_val2(const struct reftable_ref_record *rec)
+{
+ switch (rec->value_type) {
+ case REFTABLE_REF_VAL2:
+ return rec->value.val2.target_value;
+ default:
+ return NULL;
+ }
+}
+
+static int decode_string(struct strbuf *dest, struct string_view in)
+{
+ int start_len = in.len;
+ uint64_t tsize = 0;
+ int n = get_var_int(&tsize, &in);
+ if (n <= 0)
+ return -1;
+ string_view_consume(&in, n);
+ if (in.len < tsize)
+ return -1;
+
+ strbuf_reset(dest);
+ strbuf_add(dest, in.buf, tsize);
+ string_view_consume(&in, tsize);
+
+ return start_len - in.len;
+}
+
+static int encode_string(char *str, struct string_view s)
+{
+ struct string_view start = s;
+ int l = strlen(str);
+ int n = put_var_int(&s, l);
+ if (n < 0)
+ return -1;
+ string_view_consume(&s, n);
+ if (s.len < l)
+ return -1;
+ memcpy(s.buf, str, l);
+ string_view_consume(&s, l);
+
+ return start.len - s.len;
+}
+
+int reftable_encode_key(int *restart, struct string_view dest,
+ struct strbuf prev_key, struct strbuf key,
+ uint8_t extra)
+{
+ struct string_view start = dest;
+ int prefix_len = common_prefix_size(&prev_key, &key);
+ uint64_t suffix_len = key.len - prefix_len;
+ int n = put_var_int(&dest, (uint64_t)prefix_len);
+ if (n < 0)
+ return -1;
+ string_view_consume(&dest, n);
+
+ *restart = (prefix_len == 0);
+
+ n = put_var_int(&dest, suffix_len << 3 | (uint64_t)extra);
+ if (n < 0)
+ return -1;
+ string_view_consume(&dest, n);
+
+ if (dest.len < suffix_len)
+ return -1;
+ memcpy(dest.buf, key.buf + prefix_len, suffix_len);
+ string_view_consume(&dest, suffix_len);
+
+ return start.len - dest.len;
+}
+
+int reftable_decode_key(struct strbuf *key, uint8_t *extra,
+ struct strbuf last_key, struct string_view in)
+{
+ int start_len = in.len;
+ uint64_t prefix_len = 0;
+ uint64_t suffix_len = 0;
+ int n = get_var_int(&prefix_len, &in);
+ if (n < 0)
+ return -1;
+ string_view_consume(&in, n);
+
+ if (prefix_len > last_key.len)
+ return -1;
+
+ n = get_var_int(&suffix_len, &in);
+ if (n <= 0)
+ return -1;
+ string_view_consume(&in, n);
+
+ *extra = (uint8_t)(suffix_len & 0x7);
+ suffix_len >>= 3;
+
+ if (in.len < suffix_len)
+ return -1;
+
+ strbuf_reset(key);
+ strbuf_add(key, last_key.buf, prefix_len);
+ strbuf_add(key, in.buf, suffix_len);
+ string_view_consume(&in, suffix_len);
+
+ return start_len - in.len;
+}
+
+static void reftable_ref_record_key(const void *r, struct strbuf *dest)
+{
+ const struct reftable_ref_record *rec =
+ (const struct reftable_ref_record *)r;
+ strbuf_reset(dest);
+ strbuf_addstr(dest, rec->refname);
+}
+
+static void reftable_ref_record_copy_from(void *rec, const void *src_rec,
+ int hash_size)
+{
+ struct reftable_ref_record *ref = rec;
+ const struct reftable_ref_record *src = src_rec;
+ assert(hash_size > 0);
+
+ /* This is simple and correct, but we could probably reuse the hash
+ * fields. */
+ reftable_ref_record_release(ref);
+ if (src->refname) {
+ ref->refname = xstrdup(src->refname);
+ }
+ ref->update_index = src->update_index;
+ ref->value_type = src->value_type;
+ switch (src->value_type) {
+ case REFTABLE_REF_DELETION:
+ break;
+ case REFTABLE_REF_VAL1:
+ ref->value.val1 = reftable_malloc(hash_size);
+ memcpy(ref->value.val1, src->value.val1, hash_size);
+ break;
+ case REFTABLE_REF_VAL2:
+ ref->value.val2.value = reftable_malloc(hash_size);
+ memcpy(ref->value.val2.value, src->value.val2.value, hash_size);
+ ref->value.val2.target_value = reftable_malloc(hash_size);
+ memcpy(ref->value.val2.target_value,
+ src->value.val2.target_value, hash_size);
+ break;
+ case REFTABLE_REF_SYMREF:
+ ref->value.symref = xstrdup(src->value.symref);
+ break;
+ }
+}
+
+static char hexdigit(int c)
+{
+ if (c <= 9)
+ return '0' + c;
+ return 'a' + (c - 10);
+}
+
+static void hex_format(char *dest, uint8_t *src, int hash_size)
+{
+ assert(hash_size > 0);
+ if (src) {
+ int i = 0;
+ for (i = 0; i < hash_size; i++) {
+ dest[2 * i] = hexdigit(src[i] >> 4);
+ dest[2 * i + 1] = hexdigit(src[i] & 0xf);
+ }
+ dest[2 * hash_size] = 0;
+ }
+}
+
+static void reftable_ref_record_print_sz(const struct reftable_ref_record *ref,
+ int hash_size)
+{
+ char hex[GIT_MAX_HEXSZ + 1] = { 0 }; /* BUG */
+ printf("ref{%s(%" PRIu64 ") ", ref->refname, ref->update_index);
+ switch (ref->value_type) {
+ case REFTABLE_REF_SYMREF:
+ printf("=> %s", ref->value.symref);
+ break;
+ case REFTABLE_REF_VAL2:
+ hex_format(hex, ref->value.val2.value, hash_size);
+ printf("val 2 %s", hex);
+ hex_format(hex, ref->value.val2.target_value,
+ hash_size);
+ printf("(T %s)", hex);
+ break;
+ case REFTABLE_REF_VAL1:
+ hex_format(hex, ref->value.val1, hash_size);
+ printf("val 1 %s", hex);
+ break;
+ case REFTABLE_REF_DELETION:
+ printf("delete");
+ break;
+ }
+ printf("}\n");
+}
+
+void reftable_ref_record_print(const struct reftable_ref_record *ref,
+ uint32_t hash_id) {
+ reftable_ref_record_print_sz(ref, hash_size(hash_id));
+}
+
+static void reftable_ref_record_release_void(void *rec)
+{
+ reftable_ref_record_release(rec);
+}
+
+void reftable_ref_record_release(struct reftable_ref_record *ref)
+{
+ switch (ref->value_type) {
+ case REFTABLE_REF_SYMREF:
+ reftable_free(ref->value.symref);
+ break;
+ case REFTABLE_REF_VAL2:
+ reftable_free(ref->value.val2.target_value);
+ reftable_free(ref->value.val2.value);
+ break;
+ case REFTABLE_REF_VAL1:
+ reftable_free(ref->value.val1);
+ break;
+ case REFTABLE_REF_DELETION:
+ break;
+ default:
+ abort();
+ }
+
+ reftable_free(ref->refname);
+ memset(ref, 0, sizeof(struct reftable_ref_record));
+}
+
+static uint8_t reftable_ref_record_val_type(const void *rec)
+{
+ const struct reftable_ref_record *r =
+ (const struct reftable_ref_record *)rec;
+ return r->value_type;
+}
+
+static int reftable_ref_record_encode(const void *rec, struct string_view s,
+ int hash_size)
+{
+ const struct reftable_ref_record *r =
+ (const struct reftable_ref_record *)rec;
+ struct string_view start = s;
+ int n = put_var_int(&s, r->update_index);
+ assert(hash_size > 0);
+ if (n < 0)
+ return -1;
+ string_view_consume(&s, n);
+
+ switch (r->value_type) {
+ case REFTABLE_REF_SYMREF:
+ n = encode_string(r->value.symref, s);
+ if (n < 0) {
+ return -1;
+ }
+ string_view_consume(&s, n);
+ break;
+ case REFTABLE_REF_VAL2:
+ if (s.len < 2 * hash_size) {
+ return -1;
+ }
+ memcpy(s.buf, r->value.val2.value, hash_size);
+ string_view_consume(&s, hash_size);
+ memcpy(s.buf, r->value.val2.target_value, hash_size);
+ string_view_consume(&s, hash_size);
+ break;
+ case REFTABLE_REF_VAL1:
+ if (s.len < hash_size) {
+ return -1;
+ }
+ memcpy(s.buf, r->value.val1, hash_size);
+ string_view_consume(&s, hash_size);
+ break;
+ case REFTABLE_REF_DELETION:
+ break;
+ default:
+ abort();
+ }
+
+ return start.len - s.len;
+}
+
+static int reftable_ref_record_decode(void *rec, struct strbuf key,
+ uint8_t val_type, struct string_view in,
+ int hash_size)
+{
+ struct reftable_ref_record *r = rec;
+ struct string_view start = in;
+ uint64_t update_index = 0;
+ int n = get_var_int(&update_index, &in);
+ if (n < 0)
+ return n;
+ string_view_consume(&in, n);
+
+ reftable_ref_record_release(r);
+
+ assert(hash_size > 0);
+
+ r->refname = reftable_realloc(r->refname, key.len + 1);
+ memcpy(r->refname, key.buf, key.len);
+ r->update_index = update_index;
+ r->refname[key.len] = 0;
+ r->value_type = val_type;
+ switch (val_type) {
+ case REFTABLE_REF_VAL1:
+ if (in.len < hash_size) {
+ return -1;
+ }
+
+ r->value.val1 = reftable_malloc(hash_size);
+ memcpy(r->value.val1, in.buf, hash_size);
+ string_view_consume(&in, hash_size);
+ break;
+
+ case REFTABLE_REF_VAL2:
+ if (in.len < 2 * hash_size) {
+ return -1;
+ }
+
+ r->value.val2.value = reftable_malloc(hash_size);
+ memcpy(r->value.val2.value, in.buf, hash_size);
+ string_view_consume(&in, hash_size);
+
+ r->value.val2.target_value = reftable_malloc(hash_size);
+ memcpy(r->value.val2.target_value, in.buf, hash_size);
+ string_view_consume(&in, hash_size);
+ break;
+
+ case REFTABLE_REF_SYMREF: {
+ struct strbuf dest = STRBUF_INIT;
+ int n = decode_string(&dest, in);
+ if (n < 0) {
+ return -1;
+ }
+ string_view_consume(&in, n);
+ r->value.symref = dest.buf;
+ } break;
+
+ case REFTABLE_REF_DELETION:
+ break;
+ default:
+ abort();
+ break;
+ }
+
+ return start.len - in.len;
+}
+
+static int reftable_ref_record_is_deletion_void(const void *p)
+{
+ return reftable_ref_record_is_deletion(
+ (const struct reftable_ref_record *)p);
+}
+
+
+static int reftable_ref_record_equal_void(const void *a,
+ const void *b, int hash_size)
+{
+ struct reftable_ref_record *ra = (struct reftable_ref_record *) a;
+ struct reftable_ref_record *rb = (struct reftable_ref_record *) b;
+ return reftable_ref_record_equal(ra, rb, hash_size);
+}
+
+static void reftable_ref_record_print_void(const void *rec,
+ int hash_size)
+{
+ reftable_ref_record_print_sz((struct reftable_ref_record *) rec, hash_size);
+}
+
+static struct reftable_record_vtable reftable_ref_record_vtable = {
+ .key = &reftable_ref_record_key,
+ .type = BLOCK_TYPE_REF,
+ .copy_from = &reftable_ref_record_copy_from,
+ .val_type = &reftable_ref_record_val_type,
+ .encode = &reftable_ref_record_encode,
+ .decode = &reftable_ref_record_decode,
+ .release = &reftable_ref_record_release_void,
+ .is_deletion = &reftable_ref_record_is_deletion_void,
+ .equal = &reftable_ref_record_equal_void,
+ .print = &reftable_ref_record_print_void,
+};
+
+static void reftable_obj_record_key(const void *r, struct strbuf *dest)
+{
+ const struct reftable_obj_record *rec =
+ (const struct reftable_obj_record *)r;
+ strbuf_reset(dest);
+ strbuf_add(dest, rec->hash_prefix, rec->hash_prefix_len);
+}
+
+static void reftable_obj_record_release(void *rec)
+{
+ struct reftable_obj_record *obj = rec;
+ FREE_AND_NULL(obj->hash_prefix);
+ FREE_AND_NULL(obj->offsets);
+ memset(obj, 0, sizeof(struct reftable_obj_record));
+}
+
+static void reftable_obj_record_print(const void *rec, int hash_size)
+{
+ const struct reftable_obj_record *obj = rec;
+ char hex[GIT_MAX_HEXSZ + 1] = { 0 };
+ struct strbuf offset_str = STRBUF_INIT;
+ int i;
+
+ for (i = 0; i < obj->offset_len; i++)
+ strbuf_addf(&offset_str, "%" PRIu64 " ", obj->offsets[i]);
+ hex_format(hex, obj->hash_prefix, obj->hash_prefix_len);
+ printf("prefix %s (len %d), offsets [%s]\n",
+ hex, obj->hash_prefix_len, offset_str.buf);
+ strbuf_release(&offset_str);
+}
+
+static void reftable_obj_record_copy_from(void *rec, const void *src_rec,
+ int hash_size)
+{
+ struct reftable_obj_record *obj = rec;
+ const struct reftable_obj_record *src =
+ (const struct reftable_obj_record *)src_rec;
+
+ reftable_obj_record_release(obj);
+ obj->hash_prefix = reftable_malloc(src->hash_prefix_len);
+ obj->hash_prefix_len = src->hash_prefix_len;
+ if (src->hash_prefix_len)
+ memcpy(obj->hash_prefix, src->hash_prefix, obj->hash_prefix_len);
+
+ obj->offsets = reftable_malloc(src->offset_len * sizeof(uint64_t));
+ obj->offset_len = src->offset_len;
+ COPY_ARRAY(obj->offsets, src->offsets, src->offset_len);
+}
+
+static uint8_t reftable_obj_record_val_type(const void *rec)
+{
+ const struct reftable_obj_record *r = rec;
+ if (r->offset_len > 0 && r->offset_len < 8)
+ return r->offset_len;
+ return 0;
+}
+
+static int reftable_obj_record_encode(const void *rec, struct string_view s,
+ int hash_size)
+{
+ const struct reftable_obj_record *r = rec;
+ struct string_view start = s;
+ int i = 0;
+ int n = 0;
+ uint64_t last = 0;
+ if (r->offset_len == 0 || r->offset_len >= 8) {
+ n = put_var_int(&s, r->offset_len);
+ if (n < 0) {
+ return -1;
+ }
+ string_view_consume(&s, n);
+ }
+ if (r->offset_len == 0)
+ return start.len - s.len;
+ n = put_var_int(&s, r->offsets[0]);
+ if (n < 0)
+ return -1;
+ string_view_consume(&s, n);
+
+ last = r->offsets[0];
+ for (i = 1; i < r->offset_len; i++) {
+ int n = put_var_int(&s, r->offsets[i] - last);
+ if (n < 0) {
+ return -1;
+ }
+ string_view_consume(&s, n);
+ last = r->offsets[i];
+ }
+ return start.len - s.len;
+}
+
+static int reftable_obj_record_decode(void *rec, struct strbuf key,
+ uint8_t val_type, struct string_view in,
+ int hash_size)
+{
+ struct string_view start = in;
+ struct reftable_obj_record *r = rec;
+ uint64_t count = val_type;
+ int n = 0;
+ uint64_t last;
+ int j;
+ r->hash_prefix = reftable_malloc(key.len);
+ memcpy(r->hash_prefix, key.buf, key.len);
+ r->hash_prefix_len = key.len;
+
+ if (val_type == 0) {
+ n = get_var_int(&count, &in);
+ if (n < 0) {
+ return n;
+ }
+
+ string_view_consume(&in, n);
+ }
+
+ r->offsets = NULL;
+ r->offset_len = 0;
+ if (count == 0)
+ return start.len - in.len;
+
+ r->offsets = reftable_malloc(count * sizeof(uint64_t));
+ r->offset_len = count;
+
+ n = get_var_int(&r->offsets[0], &in);
+ if (n < 0)
+ return n;
+ string_view_consume(&in, n);
+
+ last = r->offsets[0];
+ j = 1;
+ while (j < count) {
+ uint64_t delta = 0;
+ int n = get_var_int(&delta, &in);
+ if (n < 0) {
+ return n;
+ }
+ string_view_consume(&in, n);
+
+ last = r->offsets[j] = (delta + last);
+ j++;
+ }
+ return start.len - in.len;
+}
+
+static int not_a_deletion(const void *p)
+{
+ return 0;
+}
+
+static int reftable_obj_record_equal_void(const void *a, const void *b, int hash_size)
+{
+ struct reftable_obj_record *ra = (struct reftable_obj_record *) a;
+ struct reftable_obj_record *rb = (struct reftable_obj_record *) b;
+
+ if (ra->hash_prefix_len != rb->hash_prefix_len
+ || ra->offset_len != rb->offset_len)
+ return 0;
+
+ if (ra->hash_prefix_len &&
+ memcmp(ra->hash_prefix, rb->hash_prefix, ra->hash_prefix_len))
+ return 0;
+ if (ra->offset_len &&
+ memcmp(ra->offsets, rb->offsets, ra->offset_len * sizeof(uint64_t)))
+ return 0;
+
+ return 1;
+}
+
+static struct reftable_record_vtable reftable_obj_record_vtable = {
+ .key = &reftable_obj_record_key,
+ .type = BLOCK_TYPE_OBJ,
+ .copy_from = &reftable_obj_record_copy_from,
+ .val_type = &reftable_obj_record_val_type,
+ .encode = &reftable_obj_record_encode,
+ .decode = &reftable_obj_record_decode,
+ .release = &reftable_obj_record_release,
+ .is_deletion = ¬_a_deletion,
+ .equal = &reftable_obj_record_equal_void,
+ .print = &reftable_obj_record_print,
+};
+
+static void reftable_log_record_print_sz(struct reftable_log_record *log,
+ int hash_size)
+{
+ char hex[GIT_MAX_HEXSZ + 1] = { 0 };
+
+ switch (log->value_type) {
+ case REFTABLE_LOG_DELETION:
+ printf("log{%s(%" PRIu64 ") delete\n", log->refname,
+ log->update_index);
+ break;
+ case REFTABLE_LOG_UPDATE:
+ printf("log{%s(%" PRIu64 ") %s <%s> %" PRIu64 " %04d\n",
+ log->refname, log->update_index,
+ log->value.update.name ? log->value.update.name : "",
+ log->value.update.email ? log->value.update.email : "",
+ log->value.update.time,
+ log->value.update.tz_offset);
+ hex_format(hex, log->value.update.old_hash, hash_size);
+ printf("%s => ", hex);
+ hex_format(hex, log->value.update.new_hash, hash_size);
+ printf("%s\n\n%s\n}\n", hex,
+ log->value.update.message ? log->value.update.message : "");
+ break;
+ }
+}
+
+void reftable_log_record_print(struct reftable_log_record *log,
+ uint32_t hash_id)
+{
+ reftable_log_record_print_sz(log, hash_size(hash_id));
+}
+
+static void reftable_log_record_key(const void *r, struct strbuf *dest)
+{
+ const struct reftable_log_record *rec =
+ (const struct reftable_log_record *)r;
+ int len = strlen(rec->refname);
+ uint8_t i64[8];
+ uint64_t ts = 0;
+ strbuf_reset(dest);
+ strbuf_add(dest, (uint8_t *)rec->refname, len + 1);
+
+ ts = (~ts) - rec->update_index;
+ put_be64(&i64[0], ts);
+ strbuf_add(dest, i64, sizeof(i64));
+}
+
+static void reftable_log_record_copy_from(void *rec, const void *src_rec,
+ int hash_size)
+{
+ struct reftable_log_record *dst = rec;
+ const struct reftable_log_record *src =
+ (const struct reftable_log_record *)src_rec;
+
+ reftable_log_record_release(dst);
+ *dst = *src;
+ if (dst->refname) {
+ dst->refname = xstrdup(dst->refname);
+ }
+ switch (dst->value_type) {
+ case REFTABLE_LOG_DELETION:
+ break;
+ case REFTABLE_LOG_UPDATE:
+ if (dst->value.update.email) {
+ dst->value.update.email =
+ xstrdup(dst->value.update.email);
+ }
+ if (dst->value.update.name) {
+ dst->value.update.name =
+ xstrdup(dst->value.update.name);
+ }
+ if (dst->value.update.message) {
+ dst->value.update.message =
+ xstrdup(dst->value.update.message);
+ }
+
+ if (dst->value.update.new_hash) {
+ dst->value.update.new_hash = reftable_malloc(hash_size);
+ memcpy(dst->value.update.new_hash,
+ src->value.update.new_hash, hash_size);
+ }
+ if (dst->value.update.old_hash) {
+ dst->value.update.old_hash = reftable_malloc(hash_size);
+ memcpy(dst->value.update.old_hash,
+ src->value.update.old_hash, hash_size);
+ }
+ break;
+ }
+}
+
+static void reftable_log_record_release_void(void *rec)
+{
+ struct reftable_log_record *r = rec;
+ reftable_log_record_release(r);
+}
+
+void reftable_log_record_release(struct reftable_log_record *r)
+{
+ reftable_free(r->refname);
+ switch (r->value_type) {
+ case REFTABLE_LOG_DELETION:
+ break;
+ case REFTABLE_LOG_UPDATE:
+ reftable_free(r->value.update.new_hash);
+ reftable_free(r->value.update.old_hash);
+ reftable_free(r->value.update.name);
+ reftable_free(r->value.update.email);
+ reftable_free(r->value.update.message);
+ break;
+ }
+ memset(r, 0, sizeof(struct reftable_log_record));
+}
+
+static uint8_t reftable_log_record_val_type(const void *rec)
+{
+ const struct reftable_log_record *log =
+ (const struct reftable_log_record *)rec;
+
+ return reftable_log_record_is_deletion(log) ? 0 : 1;
+}
+
+static uint8_t zero[GIT_SHA256_RAWSZ] = { 0 };
+
+static int reftable_log_record_encode(const void *rec, struct string_view s,
+ int hash_size)
+{
+ const struct reftable_log_record *r = rec;
+ struct string_view start = s;
+ int n = 0;
+ uint8_t *oldh = NULL;
+ uint8_t *newh = NULL;
+ if (reftable_log_record_is_deletion(r))
+ return 0;
+
+ oldh = r->value.update.old_hash;
+ newh = r->value.update.new_hash;
+ if (!oldh) {
+ oldh = zero;
+ }
+ if (!newh) {
+ newh = zero;
+ }
+
+ if (s.len < 2 * hash_size)
+ return -1;
+
+ memcpy(s.buf, oldh, hash_size);
+ memcpy(s.buf + hash_size, newh, hash_size);
+ string_view_consume(&s, 2 * hash_size);
+
+ n = encode_string(r->value.update.name ? r->value.update.name : "", s);
+ if (n < 0)
+ return -1;
+ string_view_consume(&s, n);
+
+ n = encode_string(r->value.update.email ? r->value.update.email : "",
+ s);
+ if (n < 0)
+ return -1;
+ string_view_consume(&s, n);
+
+ n = put_var_int(&s, r->value.update.time);
+ if (n < 0)
+ return -1;
+ string_view_consume(&s, n);
+
+ if (s.len < 2)
+ return -1;
+
+ put_be16(s.buf, r->value.update.tz_offset);
+ string_view_consume(&s, 2);
+
+ n = encode_string(
+ r->value.update.message ? r->value.update.message : "", s);
+ if (n < 0)
+ return -1;
+ string_view_consume(&s, n);
+
+ return start.len - s.len;
+}
+
+static int reftable_log_record_decode(void *rec, struct strbuf key,
+ uint8_t val_type, struct string_view in,
+ int hash_size)
+{
+ struct string_view start = in;
+ struct reftable_log_record *r = rec;
+ uint64_t max = 0;
+ uint64_t ts = 0;
+ struct strbuf dest = STRBUF_INIT;
+ int n;
+
+ if (key.len <= 9 || key.buf[key.len - 9] != 0)
+ return REFTABLE_FORMAT_ERROR;
+
+ r->refname = reftable_realloc(r->refname, key.len - 8);
+ memcpy(r->refname, key.buf, key.len - 8);
+ ts = get_be64(key.buf + key.len - 8);
+
+ r->update_index = (~max) - ts;
+
+ if (val_type != r->value_type) {
+ switch (r->value_type) {
+ case REFTABLE_LOG_UPDATE:
+ FREE_AND_NULL(r->value.update.old_hash);
+ FREE_AND_NULL(r->value.update.new_hash);
+ FREE_AND_NULL(r->value.update.message);
+ FREE_AND_NULL(r->value.update.email);
+ FREE_AND_NULL(r->value.update.name);
+ break;
+ case REFTABLE_LOG_DELETION:
+ break;
+ }
+ }
+
+ r->value_type = val_type;
+ if (val_type == REFTABLE_LOG_DELETION)
+ return 0;
+
+ if (in.len < 2 * hash_size)
+ return REFTABLE_FORMAT_ERROR;
+
+ r->value.update.old_hash =
+ reftable_realloc(r->value.update.old_hash, hash_size);
+ r->value.update.new_hash =
+ reftable_realloc(r->value.update.new_hash, hash_size);
+
+ memcpy(r->value.update.old_hash, in.buf, hash_size);
+ memcpy(r->value.update.new_hash, in.buf + hash_size, hash_size);
+
+ string_view_consume(&in, 2 * hash_size);
+
+ n = decode_string(&dest, in);
+ if (n < 0)
+ goto done;
+ string_view_consume(&in, n);
+
+ r->value.update.name =
+ reftable_realloc(r->value.update.name, dest.len + 1);
+ memcpy(r->value.update.name, dest.buf, dest.len);
+ r->value.update.name[dest.len] = 0;
+
+ strbuf_reset(&dest);
+ n = decode_string(&dest, in);
+ if (n < 0)
+ goto done;
+ string_view_consume(&in, n);
+
+ r->value.update.email =
+ reftable_realloc(r->value.update.email, dest.len + 1);
+ memcpy(r->value.update.email, dest.buf, dest.len);
+ r->value.update.email[dest.len] = 0;
+
+ ts = 0;
+ n = get_var_int(&ts, &in);
+ if (n < 0)
+ goto done;
+ string_view_consume(&in, n);
+ r->value.update.time = ts;
+ if (in.len < 2)
+ goto done;
+
+ r->value.update.tz_offset = get_be16(in.buf);
+ string_view_consume(&in, 2);
+
+ strbuf_reset(&dest);
+ n = decode_string(&dest, in);
+ if (n < 0)
+ goto done;
+ string_view_consume(&in, n);
+
+ r->value.update.message =
+ reftable_realloc(r->value.update.message, dest.len + 1);
+ memcpy(r->value.update.message, dest.buf, dest.len);
+ r->value.update.message[dest.len] = 0;
+
+ strbuf_release(&dest);
+ return start.len - in.len;
+
+done:
+ strbuf_release(&dest);
+ return REFTABLE_FORMAT_ERROR;
+}
+
+static int null_streq(char *a, char *b)
+{
+ char *empty = "";
+ if (!a)
+ a = empty;
+
+ if (!b)
+ b = empty;
+
+ return 0 == strcmp(a, b);
+}
+
+static int zero_hash_eq(uint8_t *a, uint8_t *b, int sz)
+{
+ if (!a)
+ a = zero;
+
+ if (!b)
+ b = zero;
+
+ return !memcmp(a, b, sz);
+}
+
+static int reftable_log_record_equal_void(const void *a,
+ const void *b, int hash_size)
+{
+ return reftable_log_record_equal((struct reftable_log_record *) a,
+ (struct reftable_log_record *) b,
+ hash_size);
+}
+
+int reftable_log_record_equal(const struct reftable_log_record *a,
+ const struct reftable_log_record *b, int hash_size)
+{
+ if (!(null_streq(a->refname, b->refname) &&
+ a->update_index == b->update_index &&
+ a->value_type == b->value_type))
+ return 0;
+
+ switch (a->value_type) {
+ case REFTABLE_LOG_DELETION:
+ return 1;
+ case REFTABLE_LOG_UPDATE:
+ return null_streq(a->value.update.name, b->value.update.name) &&
+ a->value.update.time == b->value.update.time &&
+ a->value.update.tz_offset == b->value.update.tz_offset &&
+ null_streq(a->value.update.email,
+ b->value.update.email) &&
+ null_streq(a->value.update.message,
+ b->value.update.message) &&
+ zero_hash_eq(a->value.update.old_hash,
+ b->value.update.old_hash, hash_size) &&
+ zero_hash_eq(a->value.update.new_hash,
+ b->value.update.new_hash, hash_size);
+ }
+
+ abort();
+}
+
+static int reftable_log_record_is_deletion_void(const void *p)
+{
+ return reftable_log_record_is_deletion(
+ (const struct reftable_log_record *)p);
+}
+
+static void reftable_log_record_print_void(const void *rec, int hash_size)
+{
+ reftable_log_record_print_sz((struct reftable_log_record*)rec, hash_size);
+}
+
+static struct reftable_record_vtable reftable_log_record_vtable = {
+ .key = &reftable_log_record_key,
+ .type = BLOCK_TYPE_LOG,
+ .copy_from = &reftable_log_record_copy_from,
+ .val_type = &reftable_log_record_val_type,
+ .encode = &reftable_log_record_encode,
+ .decode = &reftable_log_record_decode,
+ .release = &reftable_log_record_release_void,
+ .is_deletion = &reftable_log_record_is_deletion_void,
+ .equal = &reftable_log_record_equal_void,
+ .print = &reftable_log_record_print_void,
+};
+
+static void reftable_index_record_key(const void *r, struct strbuf *dest)
+{
+ const struct reftable_index_record *rec = r;
+ strbuf_reset(dest);
+ strbuf_addbuf(dest, &rec->last_key);
+}
+
+static void reftable_index_record_copy_from(void *rec, const void *src_rec,
+ int hash_size)
+{
+ struct reftable_index_record *dst = rec;
+ const struct reftable_index_record *src = src_rec;
+
+ strbuf_reset(&dst->last_key);
+ strbuf_addbuf(&dst->last_key, &src->last_key);
+ dst->offset = src->offset;
+}
+
+static void reftable_index_record_release(void *rec)
+{
+ struct reftable_index_record *idx = rec;
+ strbuf_release(&idx->last_key);
+}
+
+static uint8_t reftable_index_record_val_type(const void *rec)
+{
+ return 0;
+}
+
+static int reftable_index_record_encode(const void *rec, struct string_view out,
+ int hash_size)
+{
+ const struct reftable_index_record *r =
+ (const struct reftable_index_record *)rec;
+ struct string_view start = out;
+
+ int n = put_var_int(&out, r->offset);
+ if (n < 0)
+ return n;
+
+ string_view_consume(&out, n);
+
+ return start.len - out.len;
+}
+
+static int reftable_index_record_decode(void *rec, struct strbuf key,
+ uint8_t val_type, struct string_view in,
+ int hash_size)
+{
+ struct string_view start = in;
+ struct reftable_index_record *r = rec;
+ int n = 0;
+
+ strbuf_reset(&r->last_key);
+ strbuf_addbuf(&r->last_key, &key);
+
+ n = get_var_int(&r->offset, &in);
+ if (n < 0)
+ return n;
+
+ string_view_consume(&in, n);
+ return start.len - in.len;
+}
+
+static int reftable_index_record_equal(const void *a, const void *b, int hash_size)
+{
+ struct reftable_index_record *ia = (struct reftable_index_record *) a;
+ struct reftable_index_record *ib = (struct reftable_index_record *) b;
+
+ return ia->offset == ib->offset && !strbuf_cmp(&ia->last_key, &ib->last_key);
+}
+
+static void reftable_index_record_print(const void *rec, int hash_size)
+{
+ const struct reftable_index_record *idx = rec;
+ /* TODO: escape null chars? */
+ printf("\"%s\" %" PRIu64 "\n", idx->last_key.buf, idx->offset);
+}
+
+static struct reftable_record_vtable reftable_index_record_vtable = {
+ .key = &reftable_index_record_key,
+ .type = BLOCK_TYPE_INDEX,
+ .copy_from = &reftable_index_record_copy_from,
+ .val_type = &reftable_index_record_val_type,
+ .encode = &reftable_index_record_encode,
+ .decode = &reftable_index_record_decode,
+ .release = &reftable_index_record_release,
+ .is_deletion = ¬_a_deletion,
+ .equal = &reftable_index_record_equal,
+ .print = &reftable_index_record_print,
+};
+
+void reftable_record_key(struct reftable_record *rec, struct strbuf *dest)
+{
+ reftable_record_vtable(rec)->key(reftable_record_data(rec), dest);
+}
+
+uint8_t reftable_record_type(struct reftable_record *rec)
+{
+ return rec->type;
+}
+
+int reftable_record_encode(struct reftable_record *rec, struct string_view dest,
+ int hash_size)
+{
+ return reftable_record_vtable(rec)->encode(reftable_record_data(rec),
+ dest, hash_size);
+}
+
+void reftable_record_copy_from(struct reftable_record *rec,
+ struct reftable_record *src, int hash_size)
+{
+ assert(src->type == rec->type);
+
+ reftable_record_vtable(rec)->copy_from(reftable_record_data(rec),
+ reftable_record_data(src),
+ hash_size);
+}
+
+uint8_t reftable_record_val_type(struct reftable_record *rec)
+{
+ return reftable_record_vtable(rec)->val_type(reftable_record_data(rec));
+}
+
+int reftable_record_decode(struct reftable_record *rec, struct strbuf key,
+ uint8_t extra, struct string_view src, int hash_size)
+{
+ return reftable_record_vtable(rec)->decode(reftable_record_data(rec),
+ key, extra, src, hash_size);
+}
+
+void reftable_record_release(struct reftable_record *rec)
+{
+ reftable_record_vtable(rec)->release(reftable_record_data(rec));
+}
+
+int reftable_record_is_deletion(struct reftable_record *rec)
+{
+ return reftable_record_vtable(rec)->is_deletion(
+ reftable_record_data(rec));
+}
+
+int reftable_record_equal(struct reftable_record *a, struct reftable_record *b, int hash_size)
+{
+ if (a->type != b->type)
+ return 0;
+ return reftable_record_vtable(a)->equal(
+ reftable_record_data(a), reftable_record_data(b), hash_size);
+}
+
+static int hash_equal(uint8_t *a, uint8_t *b, int hash_size)
+{
+ if (a && b)
+ return !memcmp(a, b, hash_size);
+
+ return a == b;
+}
+
+int reftable_ref_record_equal(const struct reftable_ref_record *a,
+ const struct reftable_ref_record *b, int hash_size)
+{
+ assert(hash_size > 0);
+ if (!null_streq(a->refname, b->refname))
+ return 0;
+
+ if (a->update_index != b->update_index ||
+ a->value_type != b->value_type)
+ return 0;
+
+ switch (a->value_type) {
+ case REFTABLE_REF_SYMREF:
+ return !strcmp(a->value.symref, b->value.symref);
+ case REFTABLE_REF_VAL2:
+ return hash_equal(a->value.val2.value, b->value.val2.value,
+ hash_size) &&
+ hash_equal(a->value.val2.target_value,
+ b->value.val2.target_value, hash_size);
+ case REFTABLE_REF_VAL1:
+ return hash_equal(a->value.val1, b->value.val1, hash_size);
+ case REFTABLE_REF_DELETION:
+ return 1;
+ default:
+ abort();
+ }
+}
+
+int reftable_ref_record_compare_name(const void *a, const void *b)
+{
+ return strcmp(((struct reftable_ref_record *)a)->refname,
+ ((struct reftable_ref_record *)b)->refname);
+}
+
+int reftable_ref_record_is_deletion(const struct reftable_ref_record *ref)
+{
+ return ref->value_type == REFTABLE_REF_DELETION;
+}
+
+int reftable_log_record_compare_key(const void *a, const void *b)
+{
+ const struct reftable_log_record *la = a;
+ const struct reftable_log_record *lb = b;
+
+ int cmp = strcmp(la->refname, lb->refname);
+ if (cmp)
+ return cmp;
+ if (la->update_index > lb->update_index)
+ return -1;
+ return (la->update_index < lb->update_index) ? 1 : 0;
+}
+
+int reftable_log_record_is_deletion(const struct reftable_log_record *log)
+{
+ return (log->value_type == REFTABLE_LOG_DELETION);
+}
+
+void string_view_consume(struct string_view *s, int n)
+{
+ s->buf += n;
+ s->len -= n;
+}
+
+static void *reftable_record_data(struct reftable_record *rec)
+{
+ switch (rec->type) {
+ case BLOCK_TYPE_REF:
+ return &rec->u.ref;
+ case BLOCK_TYPE_LOG:
+ return &rec->u.log;
+ case BLOCK_TYPE_INDEX:
+ return &rec->u.idx;
+ case BLOCK_TYPE_OBJ:
+ return &rec->u.obj;
+ }
+ abort();
+}
+
+static struct reftable_record_vtable *
+reftable_record_vtable(struct reftable_record *rec)
+{
+ switch (rec->type) {
+ case BLOCK_TYPE_REF:
+ return &reftable_ref_record_vtable;
+ case BLOCK_TYPE_LOG:
+ return &reftable_log_record_vtable;
+ case BLOCK_TYPE_INDEX:
+ return &reftable_index_record_vtable;
+ case BLOCK_TYPE_OBJ:
+ return &reftable_obj_record_vtable;
+ }
+ abort();
+}
+
+struct reftable_record reftable_new_record(uint8_t typ)
+{
+ struct reftable_record clean = {
+ .type = typ,
+ };
+
+ /* the following is involved, but the naive solution (just return
+ * `clean` as is, except for BLOCK_TYPE_INDEX), returns a garbage
+ * clean.u.obj.offsets pointer on Windows VS CI. Go figure.
+ */
+ switch (typ) {
+ case BLOCK_TYPE_OBJ:
+ {
+ struct reftable_obj_record obj = { 0 };
+ clean.u.obj = obj;
+ break;
+ }
+ case BLOCK_TYPE_INDEX:
+ {
+ struct reftable_index_record idx = {
+ .last_key = STRBUF_INIT,
+ };
+ clean.u.idx = idx;
+ break;
+ }
+ case BLOCK_TYPE_REF:
+ {
+ struct reftable_ref_record ref = { 0 };
+ clean.u.ref = ref;
+ break;
+ }
+ case BLOCK_TYPE_LOG:
+ {
+ struct reftable_log_record log = { 0 };
+ clean.u.log = log;
+ break;
+ }
+ }
+ return clean;
+}
+
+void reftable_record_print(struct reftable_record *rec, int hash_size)
+{
+ printf("'%c': ", rec->type);
+ reftable_record_vtable(rec)->print(reftable_record_data(rec), hash_size);
+}
diff --git a/reftable/record.h b/reftable/record.h
new file mode 100644
index 0000000..fd80cd4
--- /dev/null
+++ b/reftable/record.h
@@ -0,0 +1,140 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef RECORD_H
+#define RECORD_H
+
+#include "system.h"
+
+#include <stdint.h>
+
+#include "reftable-record.h"
+
+/*
+ * A substring of existing string data. This structure takes no responsibility
+ * for the lifetime of the data it points to.
+ */
+struct string_view {
+ uint8_t *buf;
+ size_t len;
+};
+
+/* Advance `s.buf` by `n`, and decrease length. */
+void string_view_consume(struct string_view *s, int n);
+
+/* utilities for de/encoding varints */
+
+int get_var_int(uint64_t *dest, struct string_view *in);
+int put_var_int(struct string_view *dest, uint64_t val);
+
+/* Methods for records. */
+struct reftable_record_vtable {
+ /* encode the key of to a uint8_t strbuf. */
+ void (*key)(const void *rec, struct strbuf *dest);
+
+ /* The record type of ('r' for ref). */
+ uint8_t type;
+
+ void (*copy_from)(void *dest, const void *src, int hash_size);
+
+ /* a value of [0..7], indicating record subvariants (eg. ref vs. symref
+ * vs ref deletion) */
+ uint8_t (*val_type)(const void *rec);
+
+ /* encodes rec into dest, returning how much space was used. */
+ int (*encode)(const void *rec, struct string_view dest, int hash_size);
+
+ /* decode data from `src` into the record. */
+ int (*decode)(void *rec, struct strbuf key, uint8_t extra,
+ struct string_view src, int hash_size);
+
+ /* deallocate and null the record. */
+ void (*release)(void *rec);
+
+ /* is this a tombstone? */
+ int (*is_deletion)(const void *rec);
+
+ /* Are two records equal? This assumes they have the same type. Returns 0 for non-equal. */
+ int (*equal)(const void *a, const void *b, int hash_size);
+
+ /* Print on stdout, for debugging. */
+ void (*print)(const void *rec, int hash_size);
+};
+
+/* returns true for recognized block types. Block start with the block type. */
+int reftable_is_block_type(uint8_t typ);
+
+/* return an initialized record for the given type */
+struct reftable_record reftable_new_record(uint8_t typ);
+
+/* Encode `key` into `dest`. Sets `is_restart` to indicate a restart. Returns
+ * number of bytes written. */
+int reftable_encode_key(int *is_restart, struct string_view dest,
+ struct strbuf prev_key, struct strbuf key,
+ uint8_t extra);
+
+/* Decode into `key` and `extra` from `in` */
+int reftable_decode_key(struct strbuf *key, uint8_t *extra,
+ struct strbuf last_key, struct string_view in);
+
+/* reftable_index_record are used internally to speed up lookups. */
+struct reftable_index_record {
+ uint64_t offset; /* Offset of block */
+ struct strbuf last_key; /* Last key of the block. */
+};
+
+/* reftable_obj_record stores an object ID => ref mapping. */
+struct reftable_obj_record {
+ uint8_t *hash_prefix; /* leading bytes of the object ID */
+ int hash_prefix_len; /* number of leading bytes. Constant
+ * across a single table. */
+ uint64_t *offsets; /* a vector of file offsets. */
+ int offset_len;
+};
+
+/* record is a generic wrapper for different types of records. It is normally
+ * created on the stack, or embedded within another struct. If the type is
+ * known, a fresh instance can be initialized explicitly. Otherwise, use
+ * reftable_new_record() to initialize generically (as the index_record is not
+ * valid as 0-initialized structure)
+ */
+struct reftable_record {
+ uint8_t type;
+ union {
+ struct reftable_ref_record ref;
+ struct reftable_log_record log;
+ struct reftable_obj_record obj;
+ struct reftable_index_record idx;
+ } u;
+};
+
+/* see struct record_vtable */
+int reftable_record_equal(struct reftable_record *a, struct reftable_record *b, int hash_size);
+void reftable_record_print(struct reftable_record *rec, int hash_size);
+void reftable_record_key(struct reftable_record *rec, struct strbuf *dest);
+uint8_t reftable_record_type(struct reftable_record *rec);
+void reftable_record_copy_from(struct reftable_record *rec,
+ struct reftable_record *src, int hash_size);
+uint8_t reftable_record_val_type(struct reftable_record *rec);
+int reftable_record_encode(struct reftable_record *rec, struct string_view dest,
+ int hash_size);
+int reftable_record_decode(struct reftable_record *rec, struct strbuf key,
+ uint8_t extra, struct string_view src,
+ int hash_size);
+int reftable_record_is_deletion(struct reftable_record *rec);
+
+/* frees and zeroes out the embedded record */
+void reftable_record_release(struct reftable_record *rec);
+
+/* for qsort. */
+int reftable_ref_record_compare_name(const void *a, const void *b);
+
+/* for qsort. */
+int reftable_log_record_compare_key(const void *a, const void *b);
+
+#endif
diff --git a/reftable/record_test.c b/reftable/record_test.c
new file mode 100644
index 0000000..70ae78f
--- /dev/null
+++ b/reftable/record_test.c
@@ -0,0 +1,419 @@
+/*
+ Copyright 2020 Google LLC
+
+ Use of this source code is governed by a BSD-style
+ license that can be found in the LICENSE file or at
+ https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "record.h"
+
+#include "system.h"
+#include "basics.h"
+#include "constants.h"
+#include "test_framework.h"
+#include "reftable-tests.h"
+
+static void test_copy(struct reftable_record *rec)
+{
+ struct reftable_record copy = { 0 };
+ uint8_t typ;
+
+ typ = reftable_record_type(rec);
+ copy = reftable_new_record(typ);
+ reftable_record_copy_from(©, rec, GIT_SHA1_RAWSZ);
+ /* do it twice to catch memory leaks */
+ reftable_record_copy_from(©, rec, GIT_SHA1_RAWSZ);
+ EXPECT(reftable_record_equal(rec, ©, GIT_SHA1_RAWSZ));
+
+ puts("testing print coverage:\n");
+ reftable_record_print(©, GIT_SHA1_RAWSZ);
+
+ reftable_record_release(©);
+}
+
+static void test_varint_roundtrip(void)
+{
+ uint64_t inputs[] = { 0,
+ 1,
+ 27,
+ 127,
+ 128,
+ 257,
+ 4096,
+ ((uint64_t)1 << 63),
+ ((uint64_t)1 << 63) + ((uint64_t)1 << 63) - 1 };
+ int i = 0;
+ for (i = 0; i < ARRAY_SIZE(inputs); i++) {
+ uint8_t dest[10];
+
+ struct string_view out = {
+ .buf = dest,
+ .len = sizeof(dest),
+ };
+ uint64_t in = inputs[i];
+ int n = put_var_int(&out, in);
+ uint64_t got = 0;
+
+ EXPECT(n > 0);
+ out.len = n;
+ n = get_var_int(&got, &out);
+ EXPECT(n > 0);
+
+ EXPECT(got == in);
+ }
+}
+
+static void test_common_prefix(void)
+{
+ struct {
+ const char *a, *b;
+ int want;
+ } cases[] = {
+ { "abc", "ab", 2 },
+ { "", "abc", 0 },
+ { "abc", "abd", 2 },
+ { "abc", "pqr", 0 },
+ };
+
+ int i = 0;
+ for (i = 0; i < ARRAY_SIZE(cases); i++) {
+ struct strbuf a = STRBUF_INIT;
+ struct strbuf b = STRBUF_INIT;
+ strbuf_addstr(&a, cases[i].a);
+ strbuf_addstr(&b, cases[i].b);
+ EXPECT(common_prefix_size(&a, &b) == cases[i].want);
+
+ strbuf_release(&a);
+ strbuf_release(&b);
+ }
+}
+
+static void set_hash(uint8_t *h, int j)
+{
+ int i = 0;
+ for (i = 0; i < hash_size(GIT_SHA1_FORMAT_ID); i++) {
+ h[i] = (j >> i) & 0xff;
+ }
+}
+
+static void test_reftable_ref_record_roundtrip(void)
+{
+ int i = 0;
+
+ for (i = REFTABLE_REF_DELETION; i < REFTABLE_NR_REF_VALUETYPES; i++) {
+ struct reftable_record in = {
+ .type = BLOCK_TYPE_REF,
+ };
+ struct reftable_record out = { .type = BLOCK_TYPE_REF };
+ struct strbuf key = STRBUF_INIT;
+ uint8_t buffer[1024] = { 0 };
+ struct string_view dest = {
+ .buf = buffer,
+ .len = sizeof(buffer),
+ };
+ int n, m;
+
+ in.u.ref.value_type = i;
+ switch (i) {
+ case REFTABLE_REF_DELETION:
+ break;
+ case REFTABLE_REF_VAL1:
+ in.u.ref.value.val1 = reftable_malloc(GIT_SHA1_RAWSZ);
+ set_hash(in.u.ref.value.val1, 1);
+ break;
+ case REFTABLE_REF_VAL2:
+ in.u.ref.value.val2.value =
+ reftable_malloc(GIT_SHA1_RAWSZ);
+ set_hash(in.u.ref.value.val2.value, 1);
+ in.u.ref.value.val2.target_value =
+ reftable_malloc(GIT_SHA1_RAWSZ);
+ set_hash(in.u.ref.value.val2.target_value, 2);
+ break;
+ case REFTABLE_REF_SYMREF:
+ in.u.ref.value.symref = xstrdup("target");
+ break;
+ }
+ in.u.ref.refname = xstrdup("refs/heads/master");
+
+ test_copy(&in);
+
+ EXPECT(reftable_record_val_type(&in) == i);
+
+ reftable_record_key(&in, &key);
+ n = reftable_record_encode(&in, dest, GIT_SHA1_RAWSZ);
+ EXPECT(n > 0);
+
+ /* decode into a non-zero reftable_record to test for leaks. */
+ m = reftable_record_decode(&out, key, i, dest, GIT_SHA1_RAWSZ);
+ EXPECT(n == m);
+
+ EXPECT(reftable_ref_record_equal(&in.u.ref, &out.u.ref,
+ GIT_SHA1_RAWSZ));
+ reftable_record_release(&in);
+
+ strbuf_release(&key);
+ reftable_record_release(&out);
+ }
+}
+
+static void test_reftable_log_record_equal(void)
+{
+ struct reftable_log_record in[2] = {
+ {
+ .refname = xstrdup("refs/heads/master"),
+ .update_index = 42,
+ },
+ {
+ .refname = xstrdup("refs/heads/master"),
+ .update_index = 22,
+ }
+ };
+
+ EXPECT(!reftable_log_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ));
+ in[1].update_index = in[0].update_index;
+ EXPECT(reftable_log_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ));
+ reftable_log_record_release(&in[0]);
+ reftable_log_record_release(&in[1]);
+}
+
+static void test_reftable_log_record_roundtrip(void)
+{
+ int i;
+
+ struct reftable_log_record in[] = {
+ {
+ .refname = xstrdup("refs/heads/master"),
+ .update_index = 42,
+ .value_type = REFTABLE_LOG_UPDATE,
+ .value = {
+ .update = {
+ .old_hash = reftable_malloc(GIT_SHA1_RAWSZ),
+ .new_hash = reftable_malloc(GIT_SHA1_RAWSZ),
+ .name = xstrdup("han-wen"),
+ .email = xstrdup("hanwen@google.com"),
+ .message = xstrdup("test"),
+ .time = 1577123507,
+ .tz_offset = 100,
+ },
+ }
+ },
+ {
+ .refname = xstrdup("refs/heads/master"),
+ .update_index = 22,
+ .value_type = REFTABLE_LOG_DELETION,
+ },
+ {
+ .refname = xstrdup("branch"),
+ .update_index = 33,
+ .value_type = REFTABLE_LOG_UPDATE,
+ .value = {
+ .update = {
+ .old_hash = reftable_malloc(GIT_SHA1_RAWSZ),
+ .new_hash = reftable_malloc(GIT_SHA1_RAWSZ),
+ /* rest of fields left empty. */
+ },
+ },
+ }
+ };
+ set_test_hash(in[0].value.update.new_hash, 1);
+ set_test_hash(in[0].value.update.old_hash, 2);
+ set_test_hash(in[2].value.update.new_hash, 3);
+ set_test_hash(in[2].value.update.old_hash, 4);
+ for (i = 0; i < ARRAY_SIZE(in); i++) {
+ struct reftable_record rec = { .type = BLOCK_TYPE_LOG };
+ struct strbuf key = STRBUF_INIT;
+ uint8_t buffer[1024] = { 0 };
+ struct string_view dest = {
+ .buf = buffer,
+ .len = sizeof(buffer),
+ };
+ /* populate out, to check for leaks. */
+ struct reftable_record out = {
+ .type = BLOCK_TYPE_LOG,
+ .u.log = {
+ .refname = xstrdup("old name"),
+ .value_type = REFTABLE_LOG_UPDATE,
+ .value = {
+ .update = {
+ .new_hash = reftable_calloc(GIT_SHA1_RAWSZ),
+ .old_hash = reftable_calloc(GIT_SHA1_RAWSZ),
+ .name = xstrdup("old name"),
+ .email = xstrdup("old@email"),
+ .message = xstrdup("old message"),
+ },
+ },
+ },
+ };
+ int n, m, valtype;
+
+ rec.u.log = in[i];
+
+ test_copy(&rec);
+
+ reftable_record_key(&rec, &key);
+
+ n = reftable_record_encode(&rec, dest, GIT_SHA1_RAWSZ);
+ EXPECT(n >= 0);
+ valtype = reftable_record_val_type(&rec);
+ m = reftable_record_decode(&out, key, valtype, dest,
+ GIT_SHA1_RAWSZ);
+ EXPECT(n == m);
+
+ EXPECT(reftable_log_record_equal(&in[i], &out.u.log,
+ GIT_SHA1_RAWSZ));
+ reftable_log_record_release(&in[i]);
+ strbuf_release(&key);
+ reftable_record_release(&out);
+ }
+}
+
+static void test_u24_roundtrip(void)
+{
+ uint32_t in = 0x112233;
+ uint8_t dest[3];
+ uint32_t out;
+ put_be24(dest, in);
+ out = get_be24(dest);
+ EXPECT(in == out);
+}
+
+static void test_key_roundtrip(void)
+{
+ uint8_t buffer[1024] = { 0 };
+ struct string_view dest = {
+ .buf = buffer,
+ .len = sizeof(buffer),
+ };
+ struct strbuf last_key = STRBUF_INIT;
+ struct strbuf key = STRBUF_INIT;
+ struct strbuf roundtrip = STRBUF_INIT;
+ int restart;
+ uint8_t extra;
+ int n, m;
+ uint8_t rt_extra;
+
+ strbuf_addstr(&last_key, "refs/heads/master");
+ strbuf_addstr(&key, "refs/tags/bla");
+ extra = 6;
+ n = reftable_encode_key(&restart, dest, last_key, key, extra);
+ EXPECT(!restart);
+ EXPECT(n > 0);
+
+ m = reftable_decode_key(&roundtrip, &rt_extra, last_key, dest);
+ EXPECT(n == m);
+ EXPECT(0 == strbuf_cmp(&key, &roundtrip));
+ EXPECT(rt_extra == extra);
+
+ strbuf_release(&last_key);
+ strbuf_release(&key);
+ strbuf_release(&roundtrip);
+}
+
+static void test_reftable_obj_record_roundtrip(void)
+{
+ uint8_t testHash1[GIT_SHA1_RAWSZ] = { 1, 2, 3, 4, 0 };
+ uint64_t till9[] = { 1, 2, 3, 4, 500, 600, 700, 800, 9000 };
+ struct reftable_obj_record recs[3] = { {
+ .hash_prefix = testHash1,
+ .hash_prefix_len = 5,
+ .offsets = till9,
+ .offset_len = 3,
+ },
+ {
+ .hash_prefix = testHash1,
+ .hash_prefix_len = 5,
+ .offsets = till9,
+ .offset_len = 9,
+ },
+ {
+ .hash_prefix = testHash1,
+ .hash_prefix_len = 5,
+ } };
+ int i = 0;
+ for (i = 0; i < ARRAY_SIZE(recs); i++) {
+ uint8_t buffer[1024] = { 0 };
+ struct string_view dest = {
+ .buf = buffer,
+ .len = sizeof(buffer),
+ };
+ struct reftable_record in = {
+ .type = BLOCK_TYPE_OBJ,
+ .u = {
+ .obj = recs[i],
+ },
+ };
+ struct strbuf key = STRBUF_INIT;
+ struct reftable_record out = { .type = BLOCK_TYPE_OBJ };
+ int n, m;
+ uint8_t extra;
+
+ test_copy(&in);
+ reftable_record_key(&in, &key);
+ n = reftable_record_encode(&in, dest, GIT_SHA1_RAWSZ);
+ EXPECT(n > 0);
+ extra = reftable_record_val_type(&in);
+ m = reftable_record_decode(&out, key, extra, dest,
+ GIT_SHA1_RAWSZ);
+ EXPECT(n == m);
+
+ EXPECT(reftable_record_equal(&in, &out, GIT_SHA1_RAWSZ));
+ strbuf_release(&key);
+ reftable_record_release(&out);
+ }
+}
+
+static void test_reftable_index_record_roundtrip(void)
+{
+ struct reftable_record in = {
+ .type = BLOCK_TYPE_INDEX,
+ .u.idx = {
+ .offset = 42,
+ .last_key = STRBUF_INIT,
+ },
+ };
+ uint8_t buffer[1024] = { 0 };
+ struct string_view dest = {
+ .buf = buffer,
+ .len = sizeof(buffer),
+ };
+ struct strbuf key = STRBUF_INIT;
+ struct reftable_record out = {
+ .type = BLOCK_TYPE_INDEX,
+ .u.idx = { .last_key = STRBUF_INIT },
+ };
+ int n, m;
+ uint8_t extra;
+
+ strbuf_addstr(&in.u.idx.last_key, "refs/heads/master");
+ reftable_record_key(&in, &key);
+ test_copy(&in);
+
+ EXPECT(0 == strbuf_cmp(&key, &in.u.idx.last_key));
+ n = reftable_record_encode(&in, dest, GIT_SHA1_RAWSZ);
+ EXPECT(n > 0);
+
+ extra = reftable_record_val_type(&in);
+ m = reftable_record_decode(&out, key, extra, dest, GIT_SHA1_RAWSZ);
+ EXPECT(m == n);
+
+ EXPECT(reftable_record_equal(&in, &out, GIT_SHA1_RAWSZ));
+
+ reftable_record_release(&out);
+ strbuf_release(&key);
+ strbuf_release(&in.u.idx.last_key);
+}
+
+int record_test_main(int argc, const char *argv[])
+{
+ RUN_TEST(test_reftable_log_record_equal);
+ RUN_TEST(test_reftable_log_record_roundtrip);
+ RUN_TEST(test_reftable_ref_record_roundtrip);
+ RUN_TEST(test_varint_roundtrip);
+ RUN_TEST(test_key_roundtrip);
+ RUN_TEST(test_common_prefix);
+ RUN_TEST(test_reftable_obj_record_roundtrip);
+ RUN_TEST(test_reftable_index_record_roundtrip);
+ RUN_TEST(test_u24_roundtrip);
+ return 0;
+}
diff --git a/reftable/refname.c b/reftable/refname.c
new file mode 100644
index 0000000..9573496
--- /dev/null
+++ b/reftable/refname.c
@@ -0,0 +1,209 @@
+/*
+ Copyright 2020 Google LLC
+
+ Use of this source code is governed by a BSD-style
+ license that can be found in the LICENSE file or at
+ https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "system.h"
+#include "reftable-error.h"
+#include "basics.h"
+#include "refname.h"
+#include "reftable-iterator.h"
+
+struct find_arg {
+ char **names;
+ const char *want;
+};
+
+static int find_name(size_t k, void *arg)
+{
+ struct find_arg *f_arg = arg;
+ return strcmp(f_arg->names[k], f_arg->want) >= 0;
+}
+
+static int modification_has_ref(struct modification *mod, const char *name)
+{
+ struct reftable_ref_record ref = { NULL };
+ int err = 0;
+
+ if (mod->add_len > 0) {
+ struct find_arg arg = {
+ .names = mod->add,
+ .want = name,
+ };
+ int idx = binsearch(mod->add_len, find_name, &arg);
+ if (idx < mod->add_len && !strcmp(mod->add[idx], name)) {
+ return 0;
+ }
+ }
+
+ if (mod->del_len > 0) {
+ struct find_arg arg = {
+ .names = mod->del,
+ .want = name,
+ };
+ int idx = binsearch(mod->del_len, find_name, &arg);
+ if (idx < mod->del_len && !strcmp(mod->del[idx], name)) {
+ return 1;
+ }
+ }
+
+ err = reftable_table_read_ref(&mod->tab, name, &ref);
+ reftable_ref_record_release(&ref);
+ return err;
+}
+
+static void modification_release(struct modification *mod)
+{
+ /* don't delete the strings themselves; they're owned by ref records.
+ */
+ FREE_AND_NULL(mod->add);
+ FREE_AND_NULL(mod->del);
+ mod->add_len = 0;
+ mod->del_len = 0;
+}
+
+static int modification_has_ref_with_prefix(struct modification *mod,
+ const char *prefix)
+{
+ struct reftable_iterator it = { NULL };
+ struct reftable_ref_record ref = { NULL };
+ int err = 0;
+
+ if (mod->add_len > 0) {
+ struct find_arg arg = {
+ .names = mod->add,
+ .want = prefix,
+ };
+ int idx = binsearch(mod->add_len, find_name, &arg);
+ if (idx < mod->add_len &&
+ !strncmp(prefix, mod->add[idx], strlen(prefix)))
+ goto done;
+ }
+ err = reftable_table_seek_ref(&mod->tab, &it, prefix);
+ if (err)
+ goto done;
+
+ while (1) {
+ err = reftable_iterator_next_ref(&it, &ref);
+ if (err)
+ goto done;
+
+ if (mod->del_len > 0) {
+ struct find_arg arg = {
+ .names = mod->del,
+ .want = ref.refname,
+ };
+ int idx = binsearch(mod->del_len, find_name, &arg);
+ if (idx < mod->del_len &&
+ !strcmp(ref.refname, mod->del[idx])) {
+ continue;
+ }
+ }
+
+ if (strncmp(ref.refname, prefix, strlen(prefix))) {
+ err = 1;
+ goto done;
+ }
+ err = 0;
+ goto done;
+ }
+
+done:
+ reftable_ref_record_release(&ref);
+ reftable_iterator_destroy(&it);
+ return err;
+}
+
+static int validate_refname(const char *name)
+{
+ while (1) {
+ char *next = strchr(name, '/');
+ if (!*name) {
+ return REFTABLE_REFNAME_ERROR;
+ }
+ if (!next) {
+ return 0;
+ }
+ if (next - name == 0 || (next - name == 1 && *name == '.') ||
+ (next - name == 2 && name[0] == '.' && name[1] == '.'))
+ return REFTABLE_REFNAME_ERROR;
+ name = next + 1;
+ }
+ return 0;
+}
+
+int validate_ref_record_addition(struct reftable_table tab,
+ struct reftable_ref_record *recs, size_t sz)
+{
+ struct modification mod = {
+ .tab = tab,
+ .add = reftable_calloc(sizeof(char *) * sz),
+ .del = reftable_calloc(sizeof(char *) * sz),
+ };
+ int i = 0;
+ int err = 0;
+ for (; i < sz; i++) {
+ if (reftable_ref_record_is_deletion(&recs[i])) {
+ mod.del[mod.del_len++] = recs[i].refname;
+ } else {
+ mod.add[mod.add_len++] = recs[i].refname;
+ }
+ }
+
+ err = modification_validate(&mod);
+ modification_release(&mod);
+ return err;
+}
+
+static void strbuf_trim_component(struct strbuf *sl)
+{
+ while (sl->len > 0) {
+ int is_slash = (sl->buf[sl->len - 1] == '/');
+ strbuf_setlen(sl, sl->len - 1);
+ if (is_slash)
+ break;
+ }
+}
+
+int modification_validate(struct modification *mod)
+{
+ struct strbuf slashed = STRBUF_INIT;
+ int err = 0;
+ int i = 0;
+ for (; i < mod->add_len; i++) {
+ err = validate_refname(mod->add[i]);
+ if (err)
+ goto done;
+ strbuf_reset(&slashed);
+ strbuf_addstr(&slashed, mod->add[i]);
+ strbuf_addstr(&slashed, "/");
+
+ err = modification_has_ref_with_prefix(mod, slashed.buf);
+ if (err == 0) {
+ err = REFTABLE_NAME_CONFLICT;
+ goto done;
+ }
+ if (err < 0)
+ goto done;
+
+ strbuf_reset(&slashed);
+ strbuf_addstr(&slashed, mod->add[i]);
+ while (slashed.len) {
+ strbuf_trim_component(&slashed);
+ err = modification_has_ref(mod, slashed.buf);
+ if (err == 0) {
+ err = REFTABLE_NAME_CONFLICT;
+ goto done;
+ }
+ if (err < 0)
+ goto done;
+ }
+ }
+ err = 0;
+done:
+ strbuf_release(&slashed);
+ return err;
+}
diff --git a/reftable/refname.h b/reftable/refname.h
new file mode 100644
index 0000000..a24b40f
--- /dev/null
+++ b/reftable/refname.h
@@ -0,0 +1,29 @@
+/*
+ Copyright 2020 Google LLC
+
+ Use of this source code is governed by a BSD-style
+ license that can be found in the LICENSE file or at
+ https://developers.google.com/open-source/licenses/bsd
+*/
+#ifndef REFNAME_H
+#define REFNAME_H
+
+#include "reftable-record.h"
+#include "reftable-generic.h"
+
+struct modification {
+ struct reftable_table tab;
+
+ char **add;
+ size_t add_len;
+
+ char **del;
+ size_t del_len;
+};
+
+int validate_ref_record_addition(struct reftable_table tab,
+ struct reftable_ref_record *recs, size_t sz);
+
+int modification_validate(struct modification *mod);
+
+#endif
diff --git a/reftable/refname_test.c b/reftable/refname_test.c
new file mode 100644
index 0000000..8645cd9
--- /dev/null
+++ b/reftable/refname_test.c
@@ -0,0 +1,102 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "basics.h"
+#include "block.h"
+#include "blocksource.h"
+#include "constants.h"
+#include "reader.h"
+#include "record.h"
+#include "refname.h"
+#include "reftable-error.h"
+#include "reftable-writer.h"
+#include "system.h"
+
+#include "test_framework.h"
+#include "reftable-tests.h"
+
+struct testcase {
+ char *add;
+ char *del;
+ int error_code;
+};
+
+static void test_conflict(void)
+{
+ struct reftable_write_options opts = { 0 };
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &buf, &opts);
+ struct reftable_ref_record rec = {
+ .refname = "a/b",
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "destination", /* make sure it's not a symref.
+ */
+ .update_index = 1,
+ };
+ int err;
+ int i;
+ struct reftable_block_source source = { NULL };
+ struct reftable_reader *rd = NULL;
+ struct reftable_table tab = { NULL };
+ struct testcase cases[] = {
+ { "a/b/c", NULL, REFTABLE_NAME_CONFLICT },
+ { "b", NULL, 0 },
+ { "a", NULL, REFTABLE_NAME_CONFLICT },
+ { "a", "a/b", 0 },
+
+ { "p/", NULL, REFTABLE_REFNAME_ERROR },
+ { "p//q", NULL, REFTABLE_REFNAME_ERROR },
+ { "p/./q", NULL, REFTABLE_REFNAME_ERROR },
+ { "p/../q", NULL, REFTABLE_REFNAME_ERROR },
+
+ { "a/b/c", "a/b", 0 },
+ { NULL, "a//b", 0 },
+ };
+ reftable_writer_set_limits(w, 1, 1);
+
+ err = reftable_writer_add_ref(w, &rec);
+ EXPECT_ERR(err);
+
+ err = reftable_writer_close(w);
+ EXPECT_ERR(err);
+ reftable_writer_free(w);
+
+ block_source_from_strbuf(&source, &buf);
+ err = reftable_new_reader(&rd, &source, "filename");
+ EXPECT_ERR(err);
+
+ reftable_table_from_reader(&tab, rd);
+
+ for (i = 0; i < ARRAY_SIZE(cases); i++) {
+ struct modification mod = {
+ .tab = tab,
+ };
+
+ if (cases[i].add) {
+ mod.add = &cases[i].add;
+ mod.add_len = 1;
+ }
+ if (cases[i].del) {
+ mod.del = &cases[i].del;
+ mod.del_len = 1;
+ }
+
+ err = modification_validate(&mod);
+ EXPECT(err == cases[i].error_code);
+ }
+
+ reftable_reader_free(rd);
+ strbuf_release(&buf);
+}
+
+int refname_test_main(int argc, const char *argv[])
+{
+ RUN_TEST(test_conflict);
+ return 0;
+}
diff --git a/reftable/reftable-blocksource.h b/reftable/reftable-blocksource.h
new file mode 100644
index 0000000..5aa3990
--- /dev/null
+++ b/reftable/reftable-blocksource.h
@@ -0,0 +1,49 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_BLOCKSOURCE_H
+#define REFTABLE_BLOCKSOURCE_H
+
+#include <stdint.h>
+
+/* block_source is a generic wrapper for a seekable readable file.
+ */
+struct reftable_block_source {
+ struct reftable_block_source_vtable *ops;
+ void *arg;
+};
+
+/* a contiguous segment of bytes. It keeps track of its generating block_source
+ * so it can return itself into the pool. */
+struct reftable_block {
+ uint8_t *data;
+ int len;
+ struct reftable_block_source source;
+};
+
+/* block_source_vtable are the operations that make up block_source */
+struct reftable_block_source_vtable {
+ /* returns the size of a block source */
+ uint64_t (*size)(void *source);
+
+ /* reads a segment from the block source. It is an error to read
+ beyond the end of the block */
+ int (*read_block)(void *source, struct reftable_block *dest,
+ uint64_t off, uint32_t size);
+ /* mark the block as read; may return the data back to malloc */
+ void (*return_block)(void *source, struct reftable_block *blockp);
+
+ /* release all resources associated with the block source */
+ void (*close)(void *source);
+};
+
+/* opens a file on the file system as a block_source */
+int reftable_block_source_from_file(struct reftable_block_source *block_src,
+ const char *name);
+
+#endif
diff --git a/reftable/reftable-error.h b/reftable/reftable-error.h
new file mode 100644
index 0000000..4c457aa
--- /dev/null
+++ b/reftable/reftable-error.h
@@ -0,0 +1,66 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_ERROR_H
+#define REFTABLE_ERROR_H
+
+/*
+ * Errors in reftable calls are signaled with negative integer return values. 0
+ * means success.
+ */
+enum reftable_error {
+ /* Unexpected file system behavior */
+ REFTABLE_IO_ERROR = -2,
+
+ /* Format inconsistency on reading data */
+ REFTABLE_FORMAT_ERROR = -3,
+
+ /* File does not exist. Returned from block_source_from_file(), because
+ * it needs special handling in stack.
+ */
+ REFTABLE_NOT_EXIST_ERROR = -4,
+
+ /* Trying to write out-of-date data. */
+ REFTABLE_LOCK_ERROR = -5,
+
+ /* Misuse of the API:
+ * - on writing a record with NULL refname.
+ * - on writing a reftable_ref_record outside the table limits
+ * - on writing a ref or log record before the stack's
+ * next_update_inde*x
+ * - on writing a log record with multiline message with
+ * exact_log_message unset
+ * - on reading a reftable_ref_record from log iterator, or vice versa.
+ *
+ * When a call misuses the API, the internal state of the library is
+ * kept unchanged.
+ */
+ REFTABLE_API_ERROR = -6,
+
+ /* Decompression error */
+ REFTABLE_ZLIB_ERROR = -7,
+
+ /* Wrote a table without blocks. */
+ REFTABLE_EMPTY_TABLE_ERROR = -8,
+
+ /* Dir/file conflict. */
+ REFTABLE_NAME_CONFLICT = -9,
+
+ /* Invalid ref name. */
+ REFTABLE_REFNAME_ERROR = -10,
+
+ /* Entry does not fit. This can happen when writing outsize reflog
+ messages. */
+ REFTABLE_ENTRY_TOO_BIG_ERROR = -11,
+};
+
+/* convert the numeric error code to a string. The string should not be
+ * deallocated. */
+const char *reftable_error_str(int err);
+
+#endif
diff --git a/reftable/reftable-generic.h b/reftable/reftable-generic.h
new file mode 100644
index 0000000..d239751
--- /dev/null
+++ b/reftable/reftable-generic.h
@@ -0,0 +1,47 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_GENERIC_H
+#define REFTABLE_GENERIC_H
+
+#include "reftable-iterator.h"
+
+struct reftable_table_vtable;
+
+/*
+ * Provides a unified API for reading tables, either merged tables, or single
+ * readers. */
+struct reftable_table {
+ struct reftable_table_vtable *ops;
+ void *table_arg;
+};
+
+int reftable_table_seek_log(struct reftable_table *tab,
+ struct reftable_iterator *it, const char *name);
+
+int reftable_table_seek_ref(struct reftable_table *tab,
+ struct reftable_iterator *it, const char *name);
+
+/* returns the hash ID from a generic reftable_table */
+uint32_t reftable_table_hash_id(struct reftable_table *tab);
+
+/* returns the max update_index covered by this table. */
+uint64_t reftable_table_max_update_index(struct reftable_table *tab);
+
+/* returns the min update_index covered by this table. */
+uint64_t reftable_table_min_update_index(struct reftable_table *tab);
+
+/* convenience function to read a single ref. Returns < 0 for error, 0
+ for success, and 1 if ref not found. */
+int reftable_table_read_ref(struct reftable_table *tab, const char *name,
+ struct reftable_ref_record *ref);
+
+/* dump table contents onto stdout for debugging */
+int reftable_table_print(struct reftable_table *tab);
+
+#endif
diff --git a/reftable/reftable-iterator.h b/reftable/reftable-iterator.h
new file mode 100644
index 0000000..d3eee7a
--- /dev/null
+++ b/reftable/reftable-iterator.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_ITERATOR_H
+#define REFTABLE_ITERATOR_H
+
+#include "reftable-record.h"
+
+struct reftable_iterator_vtable;
+
+/* iterator is the generic interface for walking over data stored in a
+ * reftable.
+ */
+struct reftable_iterator {
+ struct reftable_iterator_vtable *ops;
+ void *iter_arg;
+};
+
+/* reads the next reftable_ref_record. Returns < 0 for error, 0 for OK and > 0:
+ * end of iteration.
+ */
+int reftable_iterator_next_ref(struct reftable_iterator *it,
+ struct reftable_ref_record *ref);
+
+/* reads the next reftable_log_record. Returns < 0 for error, 0 for OK and > 0:
+ * end of iteration.
+ */
+int reftable_iterator_next_log(struct reftable_iterator *it,
+ struct reftable_log_record *log);
+
+/* releases resources associated with an iterator. */
+void reftable_iterator_destroy(struct reftable_iterator *it);
+
+#endif
diff --git a/reftable/reftable-malloc.h b/reftable/reftable-malloc.h
new file mode 100644
index 0000000..5f2185f
--- /dev/null
+++ b/reftable/reftable-malloc.h
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_H
+#define REFTABLE_H
+
+#include <stddef.h>
+
+/* Overrides the functions to use for memory management. */
+void reftable_set_alloc(void *(*malloc)(size_t),
+ void *(*realloc)(void *, size_t), void (*free)(void *));
+
+#endif
diff --git a/reftable/reftable-merged.h b/reftable/reftable-merged.h
new file mode 100644
index 0000000..1a6d169
--- /dev/null
+++ b/reftable/reftable-merged.h
@@ -0,0 +1,72 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_MERGED_H
+#define REFTABLE_MERGED_H
+
+#include "reftable-iterator.h"
+
+/*
+ * Merged tables
+ *
+ * A ref database kept in a sequence of table files. The merged_table presents a
+ * unified view to reading (seeking, iterating) a sequence of immutable tables.
+ *
+ * The merged tables are on purpose kept disconnected from their actual storage
+ * (eg. files on disk), because it is useful to merge tables aren't files. For
+ * example, the per-workspace and global ref namespace can be implemented as a
+ * merged table of two stacks of file-backed reftables.
+ */
+
+/* A merged table is implements seeking/iterating over a stack of tables. */
+struct reftable_merged_table;
+
+/* A generic reftable; see below. */
+struct reftable_table;
+
+/* reftable_new_merged_table creates a new merged table. It takes ownership of
+ the stack array.
+*/
+int reftable_new_merged_table(struct reftable_merged_table **dest,
+ struct reftable_table *stack, int n,
+ uint32_t hash_id);
+
+/* returns an iterator positioned just before 'name' */
+int reftable_merged_table_seek_ref(struct reftable_merged_table *mt,
+ struct reftable_iterator *it,
+ const char *name);
+
+/* returns an iterator for log entry, at given update_index */
+int reftable_merged_table_seek_log_at(struct reftable_merged_table *mt,
+ struct reftable_iterator *it,
+ const char *name, uint64_t update_index);
+
+/* like reftable_merged_table_seek_log_at but look for the newest entry. */
+int reftable_merged_table_seek_log(struct reftable_merged_table *mt,
+ struct reftable_iterator *it,
+ const char *name);
+
+/* returns the max update_index covered by this merged table. */
+uint64_t
+reftable_merged_table_max_update_index(struct reftable_merged_table *mt);
+
+/* returns the min update_index covered by this merged table. */
+uint64_t
+reftable_merged_table_min_update_index(struct reftable_merged_table *mt);
+
+/* releases memory for the merged_table */
+void reftable_merged_table_free(struct reftable_merged_table *m);
+
+/* return the hash ID of the merged table. */
+uint32_t reftable_merged_table_hash_id(struct reftable_merged_table *m);
+
+/* create a generic table from reftable_merged_table */
+void reftable_table_from_merged_table(struct reftable_table *tab,
+ struct reftable_merged_table *table);
+
+#endif
diff --git a/reftable/reftable-reader.h b/reftable/reftable-reader.h
new file mode 100644
index 0000000..4a4bc2f
--- /dev/null
+++ b/reftable/reftable-reader.h
@@ -0,0 +1,101 @@
+/*
+ Copyright 2020 Google LLC
+
+ Use of this source code is governed by a BSD-style
+ license that can be found in the LICENSE file or at
+ https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_READER_H
+#define REFTABLE_READER_H
+
+#include "reftable-iterator.h"
+#include "reftable-blocksource.h"
+
+/*
+ * Reading single tables
+ *
+ * The follow routines are for reading single files. For an
+ * application-level interface, skip ahead to struct
+ * reftable_merged_table and struct reftable_stack.
+ */
+
+/* The reader struct is a handle to an open reftable file. */
+struct reftable_reader;
+
+/* Generic table. */
+struct reftable_table;
+
+/* reftable_new_reader opens a reftable for reading. If successful,
+ * returns 0 code and sets pp. The name is used for creating a
+ * stack. Typically, it is the basename of the file. The block source
+ * `src` is owned by the reader, and is closed on calling
+ * reftable_reader_destroy(). On error, the block source `src` is
+ * closed as well.
+ */
+int reftable_new_reader(struct reftable_reader **pp,
+ struct reftable_block_source *src, const char *name);
+
+/* reftable_reader_seek_ref returns an iterator where 'name' would be inserted
+ in the table. To seek to the start of the table, use name = "".
+
+ example:
+
+ struct reftable_reader *r = NULL;
+ int err = reftable_new_reader(&r, &src, "filename");
+ if (err < 0) { ... }
+ struct reftable_iterator it = {0};
+ err = reftable_reader_seek_ref(r, &it, "refs/heads/master");
+ if (err < 0) { ... }
+ struct reftable_ref_record ref = {0};
+ while (1) {
+ err = reftable_iterator_next_ref(&it, &ref);
+ if (err > 0) {
+ break;
+ }
+ if (err < 0) {
+ ..error handling..
+ }
+ ..found..
+ }
+ reftable_iterator_destroy(&it);
+ reftable_ref_record_release(&ref);
+*/
+int reftable_reader_seek_ref(struct reftable_reader *r,
+ struct reftable_iterator *it, const char *name);
+
+/* returns the hash ID used in this table. */
+uint32_t reftable_reader_hash_id(struct reftable_reader *r);
+
+/* seek to logs for the given name, older than update_index. To seek to the
+ start of the table, use name = "".
+*/
+int reftable_reader_seek_log_at(struct reftable_reader *r,
+ struct reftable_iterator *it, const char *name,
+ uint64_t update_index);
+
+/* seek to newest log entry for given name. */
+int reftable_reader_seek_log(struct reftable_reader *r,
+ struct reftable_iterator *it, const char *name);
+
+/* closes and deallocates a reader. */
+void reftable_reader_free(struct reftable_reader *);
+
+/* return an iterator for the refs pointing to `oid`. */
+int reftable_reader_refs_for(struct reftable_reader *r,
+ struct reftable_iterator *it, uint8_t *oid);
+
+/* return the max_update_index for a table */
+uint64_t reftable_reader_max_update_index(struct reftable_reader *r);
+
+/* return the min_update_index for a table */
+uint64_t reftable_reader_min_update_index(struct reftable_reader *r);
+
+/* creates a generic table from a file reader. */
+void reftable_table_from_reader(struct reftable_table *tab,
+ struct reftable_reader *reader);
+
+/* print table onto stdout for debugging. */
+int reftable_reader_print_file(const char *tablename);
+
+#endif
diff --git a/reftable/reftable-record.h b/reftable/reftable-record.h
new file mode 100644
index 0000000..67104f8
--- /dev/null
+++ b/reftable/reftable-record.h
@@ -0,0 +1,114 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_RECORD_H
+#define REFTABLE_RECORD_H
+
+#include <stdint.h>
+
+/*
+ * Basic data types
+ *
+ * Reftables store the state of each ref in struct reftable_ref_record, and they
+ * store a sequence of reflog updates in struct reftable_log_record.
+ */
+
+/* reftable_ref_record holds a ref database entry target_value */
+struct reftable_ref_record {
+ char *refname; /* Name of the ref, malloced. */
+ uint64_t update_index; /* Logical timestamp at which this value is
+ * written */
+
+ enum {
+ /* tombstone to hide deletions from earlier tables */
+ REFTABLE_REF_DELETION = 0x0,
+
+ /* a simple ref */
+ REFTABLE_REF_VAL1 = 0x1,
+ /* a tag, plus its peeled hash */
+ REFTABLE_REF_VAL2 = 0x2,
+
+ /* a symbolic reference */
+ REFTABLE_REF_SYMREF = 0x3,
+#define REFTABLE_NR_REF_VALUETYPES 4
+ } value_type;
+ union {
+ uint8_t *val1; /* malloced hash. */
+ struct {
+ uint8_t *value; /* first value, malloced hash */
+ uint8_t *target_value; /* second value, malloced hash */
+ } val2;
+ char *symref; /* referent, malloced 0-terminated string */
+ } value;
+};
+
+/* Returns the first hash, or NULL if `rec` is not of type
+ * REFTABLE_REF_VAL1 or REFTABLE_REF_VAL2. */
+uint8_t *reftable_ref_record_val1(const struct reftable_ref_record *rec);
+
+/* Returns the second hash, or NULL if `rec` is not of type
+ * REFTABLE_REF_VAL2. */
+uint8_t *reftable_ref_record_val2(const struct reftable_ref_record *rec);
+
+/* returns whether 'ref' represents a deletion */
+int reftable_ref_record_is_deletion(const struct reftable_ref_record *ref);
+
+/* prints a reftable_ref_record onto stdout. Useful for debugging. */
+void reftable_ref_record_print(const struct reftable_ref_record *ref,
+ uint32_t hash_id);
+
+/* frees and nulls all pointer values inside `ref`. */
+void reftable_ref_record_release(struct reftable_ref_record *ref);
+
+/* returns whether two reftable_ref_records are the same. Useful for testing. */
+int reftable_ref_record_equal(const struct reftable_ref_record *a,
+ const struct reftable_ref_record *b, int hash_size);
+
+/* reftable_log_record holds a reflog entry */
+struct reftable_log_record {
+ char *refname;
+ uint64_t update_index; /* logical timestamp of a transactional update.
+ */
+
+ enum {
+ /* tombstone to hide deletions from earlier tables */
+ REFTABLE_LOG_DELETION = 0x0,
+
+ /* a simple update */
+ REFTABLE_LOG_UPDATE = 0x1,
+#define REFTABLE_NR_LOG_VALUETYPES 2
+ } value_type;
+
+ union {
+ struct {
+ uint8_t *new_hash;
+ uint8_t *old_hash;
+ char *name;
+ char *email;
+ uint64_t time;
+ int16_t tz_offset;
+ char *message;
+ } update;
+ } value;
+};
+
+/* returns whether 'ref' represents the deletion of a log record. */
+int reftable_log_record_is_deletion(const struct reftable_log_record *log);
+
+/* frees and nulls all pointer values. */
+void reftable_log_record_release(struct reftable_log_record *log);
+
+/* returns whether two records are equal. Useful for testing. */
+int reftable_log_record_equal(const struct reftable_log_record *a,
+ const struct reftable_log_record *b, int hash_size);
+
+/* dumps a reftable_log_record on stdout, for debugging/testing. */
+void reftable_log_record_print(struct reftable_log_record *log,
+ uint32_t hash_id);
+
+#endif
diff --git a/reftable/reftable-stack.h b/reftable/reftable-stack.h
new file mode 100644
index 0000000..1b602dd
--- /dev/null
+++ b/reftable/reftable-stack.h
@@ -0,0 +1,128 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_STACK_H
+#define REFTABLE_STACK_H
+
+#include "reftable-writer.h"
+
+/*
+ * The stack presents an interface to a mutable sequence of reftables.
+
+ * A stack can be mutated by pushing a table to the top of the stack.
+
+ * The reftable_stack automatically compacts files on disk to ensure good
+ * amortized performance.
+ *
+ * For windows and other platforms that cannot have open files as rename
+ * destinations, concurrent access from multiple processes needs the rand()
+ * random seed to be randomized.
+ */
+struct reftable_stack;
+
+/* open a new reftable stack. The tables along with the table list will be
+ * stored in 'dir'. Typically, this should be .git/reftables.
+ */
+int reftable_new_stack(struct reftable_stack **dest, const char *dir,
+ struct reftable_write_options config);
+
+/* returns the update_index at which a next table should be written. */
+uint64_t reftable_stack_next_update_index(struct reftable_stack *st);
+
+/* holds a transaction to add tables at the top of a stack. */
+struct reftable_addition;
+
+/*
+ * returns a new transaction to add reftables to the given stack. As a side
+ * effect, the ref database is locked.
+ */
+int reftable_stack_new_addition(struct reftable_addition **dest,
+ struct reftable_stack *st);
+
+/* Adds a reftable to transaction. */
+int reftable_addition_add(struct reftable_addition *add,
+ int (*write_table)(struct reftable_writer *wr,
+ void *arg),
+ void *arg);
+
+/* Commits the transaction, releasing the lock. After calling this,
+ * reftable_addition_destroy should still be called.
+ */
+int reftable_addition_commit(struct reftable_addition *add);
+
+/* Release all non-committed data from the transaction, and deallocate the
+ * transaction. Releases the lock if held. */
+void reftable_addition_destroy(struct reftable_addition *add);
+
+/* add a new table to the stack. The write_table function must call
+ * reftable_writer_set_limits, add refs and return an error value. */
+int reftable_stack_add(struct reftable_stack *st,
+ int (*write_table)(struct reftable_writer *wr,
+ void *write_arg),
+ void *write_arg);
+
+/* returns the merged_table for seeking. This table is valid until the
+ * next write or reload, and should not be closed or deleted.
+ */
+struct reftable_merged_table *
+reftable_stack_merged_table(struct reftable_stack *st);
+
+/* frees all resources associated with the stack. */
+void reftable_stack_destroy(struct reftable_stack *st);
+
+/* Reloads the stack if necessary. This is very cheap to run if the stack was up
+ * to date */
+int reftable_stack_reload(struct reftable_stack *st);
+
+/* Policy for expiring reflog entries. */
+struct reftable_log_expiry_config {
+ /* Drop entries older than this timestamp */
+ uint64_t time;
+
+ /* Drop older entries */
+ uint64_t min_update_index;
+};
+
+/* compacts all reftables into a giant table. Expire reflog entries if config is
+ * non-NULL */
+int reftable_stack_compact_all(struct reftable_stack *st,
+ struct reftable_log_expiry_config *config);
+
+/* heuristically compact unbalanced table stack. */
+int reftable_stack_auto_compact(struct reftable_stack *st);
+
+/* delete stale .ref tables. */
+int reftable_stack_clean(struct reftable_stack *st);
+
+/* convenience function to read a single ref. Returns < 0 for error, 0 for
+ * success, and 1 if ref not found. */
+int reftable_stack_read_ref(struct reftable_stack *st, const char *refname,
+ struct reftable_ref_record *ref);
+
+/* convenience function to read a single log. Returns < 0 for error, 0 for
+ * success, and 1 if ref not found. */
+int reftable_stack_read_log(struct reftable_stack *st, const char *refname,
+ struct reftable_log_record *log);
+
+/* statistics on past compactions. */
+struct reftable_compaction_stats {
+ uint64_t bytes; /* total number of bytes written */
+ uint64_t entries_written; /* total number of entries written, including
+ failures. */
+ int attempts; /* how often we tried to compact */
+ int failures; /* failures happen on concurrent updates */
+};
+
+/* return statistics for compaction up till now. */
+struct reftable_compaction_stats *
+reftable_stack_compaction_stats(struct reftable_stack *st);
+
+/* print the entire stack represented by the directory */
+int reftable_stack_print_directory(const char *stackdir, uint32_t hash_id);
+
+#endif
diff --git a/reftable/reftable-tests.h b/reftable/reftable-tests.h
new file mode 100644
index 0000000..0019cbc
--- /dev/null
+++ b/reftable/reftable-tests.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_TESTS_H
+#define REFTABLE_TESTS_H
+
+int basics_test_main(int argc, const char **argv);
+int block_test_main(int argc, const char **argv);
+int merged_test_main(int argc, const char **argv);
+int pq_test_main(int argc, const char **argv);
+int record_test_main(int argc, const char **argv);
+int refname_test_main(int argc, const char **argv);
+int readwrite_test_main(int argc, const char **argv);
+int stack_test_main(int argc, const char **argv);
+int tree_test_main(int argc, const char **argv);
+int reftable_dump_main(int argc, char *const *argv);
+
+#endif
diff --git a/reftable/reftable-writer.h b/reftable/reftable-writer.h
new file mode 100644
index 0000000..db8de19
--- /dev/null
+++ b/reftable/reftable-writer.h
@@ -0,0 +1,151 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_WRITER_H
+#define REFTABLE_WRITER_H
+
+#include "reftable-record.h"
+
+#include <stdint.h>
+#include <unistd.h> /* ssize_t */
+
+/* Writing single reftables */
+
+/* reftable_write_options sets options for writing a single reftable. */
+struct reftable_write_options {
+ /* boolean: do not pad out blocks to block size. */
+ unsigned unpadded : 1;
+
+ /* the blocksize. Should be less than 2^24. */
+ uint32_t block_size;
+
+ /* boolean: do not generate a SHA1 => ref index. */
+ unsigned skip_index_objects : 1;
+
+ /* how often to write complete keys in each block. */
+ int restart_interval;
+
+ /* 4-byte identifier ("sha1", "s256") of the hash.
+ * Defaults to SHA1 if unset
+ */
+ uint32_t hash_id;
+
+ /* Default mode for creating files. If unset, use 0666 (+umask) */
+ unsigned int default_permissions;
+
+ /* boolean: do not check ref names for validity or dir/file conflicts.
+ */
+ unsigned skip_name_check : 1;
+
+ /* boolean: copy log messages exactly. If unset, check that the message
+ * is a single line, and add '\n' if missing.
+ */
+ unsigned exact_log_message : 1;
+};
+
+/* reftable_block_stats holds statistics for a single block type */
+struct reftable_block_stats {
+ /* total number of entries written */
+ int entries;
+ /* total number of key restarts */
+ int restarts;
+ /* total number of blocks */
+ int blocks;
+ /* total number of index blocks */
+ int index_blocks;
+ /* depth of the index */
+ int max_index_level;
+
+ /* offset of the first block for this type */
+ uint64_t offset;
+ /* offset of the top level index block for this type, or 0 if not
+ * present */
+ uint64_t index_offset;
+};
+
+/* stats holds overall statistics for a single reftable */
+struct reftable_stats {
+ /* total number of blocks written. */
+ int blocks;
+ /* stats for ref data */
+ struct reftable_block_stats ref_stats;
+ /* stats for the SHA1 to ref map. */
+ struct reftable_block_stats obj_stats;
+ /* stats for index blocks */
+ struct reftable_block_stats idx_stats;
+ /* stats for log blocks */
+ struct reftable_block_stats log_stats;
+
+ /* disambiguation length of shortened object IDs. */
+ int object_id_len;
+};
+
+/* reftable_new_writer creates a new writer */
+struct reftable_writer *
+reftable_new_writer(ssize_t (*writer_func)(void *, const void *, size_t),
+ void *writer_arg, struct reftable_write_options *opts);
+
+/* Set the range of update indices for the records we will add. When writing a
+ table into a stack, the min should be at least
+ reftable_stack_next_update_index(), or REFTABLE_API_ERROR is returned.
+
+ For transactional updates to a stack, typically min==max, and the
+ update_index can be obtained by inspeciting the stack. When converting an
+ existing ref database into a single reftable, this would be a range of
+ update-index timestamps.
+ */
+void reftable_writer_set_limits(struct reftable_writer *w, uint64_t min,
+ uint64_t max);
+
+/*
+ Add a reftable_ref_record. The record should have names that come after
+ already added records.
+
+ The update_index must be within the limits set by
+ reftable_writer_set_limits(), or REFTABLE_API_ERROR is returned. It is an
+ REFTABLE_API_ERROR error to write a ref record after a log record.
+*/
+int reftable_writer_add_ref(struct reftable_writer *w,
+ struct reftable_ref_record *ref);
+
+/*
+ Convenience function to add multiple reftable_ref_records; the function sorts
+ the records before adding them, reordering the records array passed in.
+*/
+int reftable_writer_add_refs(struct reftable_writer *w,
+ struct reftable_ref_record *refs, int n);
+
+/*
+ adds reftable_log_records. Log records are keyed by (refname, decreasing
+ update_index). The key for the record added must come after the already added
+ log records.
+*/
+int reftable_writer_add_log(struct reftable_writer *w,
+ struct reftable_log_record *log);
+
+/*
+ Convenience function to add multiple reftable_log_records; the function sorts
+ the records before adding them, reordering records array passed in.
+*/
+int reftable_writer_add_logs(struct reftable_writer *w,
+ struct reftable_log_record *logs, int n);
+
+/* reftable_writer_close finalizes the reftable. The writer is retained so
+ * statistics can be inspected. */
+int reftable_writer_close(struct reftable_writer *w);
+
+/* writer_stats returns the statistics on the reftable being written.
+
+ This struct becomes invalid when the writer is freed.
+ */
+const struct reftable_stats *reftable_writer_stats(struct reftable_writer *w);
+
+/* reftable_writer_free deallocates memory for the writer */
+void reftable_writer_free(struct reftable_writer *w);
+
+#endif
diff --git a/reftable/stack.c b/reftable/stack.c
new file mode 100644
index 0000000..ddbdf1b
--- /dev/null
+++ b/reftable/stack.c
@@ -0,0 +1,1414 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "stack.h"
+
+#include "system.h"
+#include "merged.h"
+#include "reader.h"
+#include "refname.h"
+#include "reftable-error.h"
+#include "reftable-record.h"
+#include "reftable-merged.h"
+#include "writer.h"
+
+static int stack_try_add(struct reftable_stack *st,
+ int (*write_table)(struct reftable_writer *wr,
+ void *arg),
+ void *arg);
+static int stack_write_compact(struct reftable_stack *st,
+ struct reftable_writer *wr, int first, int last,
+ struct reftable_log_expiry_config *config);
+static int stack_check_addition(struct reftable_stack *st,
+ const char *new_tab_name);
+static void reftable_addition_close(struct reftable_addition *add);
+static int reftable_stack_reload_maybe_reuse(struct reftable_stack *st,
+ int reuse_open);
+
+static void stack_filename(struct strbuf *dest, struct reftable_stack *st,
+ const char *name)
+{
+ strbuf_reset(dest);
+ strbuf_addstr(dest, st->reftable_dir);
+ strbuf_addstr(dest, "/");
+ strbuf_addstr(dest, name);
+}
+
+static ssize_t reftable_fd_write(void *arg, const void *data, size_t sz)
+{
+ int *fdp = (int *)arg;
+ return write(*fdp, data, sz);
+}
+
+int reftable_new_stack(struct reftable_stack **dest, const char *dir,
+ struct reftable_write_options config)
+{
+ struct reftable_stack *p =
+ reftable_calloc(sizeof(struct reftable_stack));
+ struct strbuf list_file_name = STRBUF_INIT;
+ int err = 0;
+
+ if (config.hash_id == 0) {
+ config.hash_id = GIT_SHA1_FORMAT_ID;
+ }
+
+ *dest = NULL;
+
+ strbuf_reset(&list_file_name);
+ strbuf_addstr(&list_file_name, dir);
+ strbuf_addstr(&list_file_name, "/tables.list");
+
+ p->list_file = strbuf_detach(&list_file_name, NULL);
+ p->reftable_dir = xstrdup(dir);
+ p->config = config;
+
+ err = reftable_stack_reload_maybe_reuse(p, 1);
+ if (err < 0) {
+ reftable_stack_destroy(p);
+ } else {
+ *dest = p;
+ }
+ return err;
+}
+
+static int fd_read_lines(int fd, char ***namesp)
+{
+ off_t size = lseek(fd, 0, SEEK_END);
+ char *buf = NULL;
+ int err = 0;
+ if (size < 0) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+ err = lseek(fd, 0, SEEK_SET);
+ if (err < 0) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+
+ buf = reftable_malloc(size + 1);
+ if (read(fd, buf, size) != size) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+ buf[size] = 0;
+
+ parse_names(buf, size, namesp);
+
+done:
+ reftable_free(buf);
+ return err;
+}
+
+int read_lines(const char *filename, char ***namesp)
+{
+ int fd = open(filename, O_RDONLY);
+ int err = 0;
+ if (fd < 0) {
+ if (errno == ENOENT) {
+ *namesp = reftable_calloc(sizeof(char *));
+ return 0;
+ }
+
+ return REFTABLE_IO_ERROR;
+ }
+ err = fd_read_lines(fd, namesp);
+ close(fd);
+ return err;
+}
+
+struct reftable_merged_table *
+reftable_stack_merged_table(struct reftable_stack *st)
+{
+ return st->merged;
+}
+
+static int has_name(char **names, const char *name)
+{
+ while (*names) {
+ if (!strcmp(*names, name))
+ return 1;
+ names++;
+ }
+ return 0;
+}
+
+/* Close and free the stack */
+void reftable_stack_destroy(struct reftable_stack *st)
+{
+ char **names = NULL;
+ int err = 0;
+ if (st->merged) {
+ reftable_merged_table_free(st->merged);
+ st->merged = NULL;
+ }
+
+ err = read_lines(st->list_file, &names);
+ if (err < 0) {
+ FREE_AND_NULL(names);
+ }
+
+ if (st->readers) {
+ int i = 0;
+ struct strbuf filename = STRBUF_INIT;
+ for (i = 0; i < st->readers_len; i++) {
+ const char *name = reader_name(st->readers[i]);
+ strbuf_reset(&filename);
+ if (names && !has_name(names, name)) {
+ stack_filename(&filename, st, name);
+ }
+ reftable_reader_free(st->readers[i]);
+
+ if (filename.len) {
+ /* On Windows, can only unlink after closing. */
+ unlink(filename.buf);
+ }
+ }
+ strbuf_release(&filename);
+ st->readers_len = 0;
+ FREE_AND_NULL(st->readers);
+ }
+ FREE_AND_NULL(st->list_file);
+ FREE_AND_NULL(st->reftable_dir);
+ reftable_free(st);
+ free_names(names);
+}
+
+static struct reftable_reader **stack_copy_readers(struct reftable_stack *st,
+ int cur_len)
+{
+ struct reftable_reader **cur =
+ reftable_calloc(sizeof(struct reftable_reader *) * cur_len);
+ int i = 0;
+ for (i = 0; i < cur_len; i++) {
+ cur[i] = st->readers[i];
+ }
+ return cur;
+}
+
+static int reftable_stack_reload_once(struct reftable_stack *st, char **names,
+ int reuse_open)
+{
+ int cur_len = !st->merged ? 0 : st->merged->stack_len;
+ struct reftable_reader **cur = stack_copy_readers(st, cur_len);
+ int err = 0;
+ int names_len = names_length(names);
+ struct reftable_reader **new_readers =
+ reftable_calloc(sizeof(struct reftable_reader *) * names_len);
+ struct reftable_table *new_tables =
+ reftable_calloc(sizeof(struct reftable_table) * names_len);
+ int new_readers_len = 0;
+ struct reftable_merged_table *new_merged = NULL;
+ int i;
+
+ while (*names) {
+ struct reftable_reader *rd = NULL;
+ char *name = *names++;
+
+ /* this is linear; we assume compaction keeps the number of
+ tables under control so this is not quadratic. */
+ int j = 0;
+ for (j = 0; reuse_open && j < cur_len; j++) {
+ if (cur[j] && 0 == strcmp(cur[j]->name, name)) {
+ rd = cur[j];
+ cur[j] = NULL;
+ break;
+ }
+ }
+
+ if (!rd) {
+ struct reftable_block_source src = { NULL };
+ struct strbuf table_path = STRBUF_INIT;
+ stack_filename(&table_path, st, name);
+
+ err = reftable_block_source_from_file(&src,
+ table_path.buf);
+ strbuf_release(&table_path);
+
+ if (err < 0)
+ goto done;
+
+ err = reftable_new_reader(&rd, &src, name);
+ if (err < 0)
+ goto done;
+ }
+
+ new_readers[new_readers_len] = rd;
+ reftable_table_from_reader(&new_tables[new_readers_len], rd);
+ new_readers_len++;
+ }
+
+ /* success! */
+ err = reftable_new_merged_table(&new_merged, new_tables,
+ new_readers_len, st->config.hash_id);
+ if (err < 0)
+ goto done;
+
+ new_tables = NULL;
+ st->readers_len = new_readers_len;
+ if (st->merged) {
+ merged_table_release(st->merged);
+ reftable_merged_table_free(st->merged);
+ }
+ if (st->readers) {
+ reftable_free(st->readers);
+ }
+ st->readers = new_readers;
+ new_readers = NULL;
+ new_readers_len = 0;
+
+ new_merged->suppress_deletions = 1;
+ st->merged = new_merged;
+ for (i = 0; i < cur_len; i++) {
+ if (cur[i]) {
+ const char *name = reader_name(cur[i]);
+ struct strbuf filename = STRBUF_INIT;
+ stack_filename(&filename, st, name);
+
+ reader_close(cur[i]);
+ reftable_reader_free(cur[i]);
+
+ /* On Windows, can only unlink after closing. */
+ unlink(filename.buf);
+
+ strbuf_release(&filename);
+ }
+ }
+
+done:
+ for (i = 0; i < new_readers_len; i++) {
+ reader_close(new_readers[i]);
+ reftable_reader_free(new_readers[i]);
+ }
+ reftable_free(new_readers);
+ reftable_free(new_tables);
+ reftable_free(cur);
+ return err;
+}
+
+/* return negative if a before b. */
+static int tv_cmp(struct timeval *a, struct timeval *b)
+{
+ time_t diff = a->tv_sec - b->tv_sec;
+ int udiff = a->tv_usec - b->tv_usec;
+
+ if (diff != 0)
+ return diff;
+
+ return udiff;
+}
+
+static int reftable_stack_reload_maybe_reuse(struct reftable_stack *st,
+ int reuse_open)
+{
+ struct timeval deadline = { 0 };
+ int err = gettimeofday(&deadline, NULL);
+ int64_t delay = 0;
+ int tries = 0;
+ if (err < 0)
+ return err;
+
+ deadline.tv_sec += 3;
+ while (1) {
+ char **names = NULL;
+ char **names_after = NULL;
+ struct timeval now = { 0 };
+ int err = gettimeofday(&now, NULL);
+ int err2 = 0;
+ if (err < 0) {
+ return err;
+ }
+
+ /* Only look at deadlines after the first few times. This
+ simplifies debugging in GDB */
+ tries++;
+ if (tries > 3 && tv_cmp(&now, &deadline) >= 0) {
+ break;
+ }
+
+ err = read_lines(st->list_file, &names);
+ if (err < 0) {
+ free_names(names);
+ return err;
+ }
+ err = reftable_stack_reload_once(st, names, reuse_open);
+ if (err == 0) {
+ free_names(names);
+ break;
+ }
+ if (err != REFTABLE_NOT_EXIST_ERROR) {
+ free_names(names);
+ return err;
+ }
+
+ /* err == REFTABLE_NOT_EXIST_ERROR can be caused by a concurrent
+ writer. Check if there was one by checking if the name list
+ changed.
+ */
+ err2 = read_lines(st->list_file, &names_after);
+ if (err2 < 0) {
+ free_names(names);
+ return err2;
+ }
+
+ if (names_equal(names_after, names)) {
+ free_names(names);
+ free_names(names_after);
+ return err;
+ }
+ free_names(names);
+ free_names(names_after);
+
+ delay = delay + (delay * rand()) / RAND_MAX + 1;
+ sleep_millisec(delay);
+ }
+
+ return 0;
+}
+
+/* -1 = error
+ 0 = up to date
+ 1 = changed. */
+static int stack_uptodate(struct reftable_stack *st)
+{
+ char **names = NULL;
+ int err = read_lines(st->list_file, &names);
+ int i = 0;
+ if (err < 0)
+ return err;
+
+ for (i = 0; i < st->readers_len; i++) {
+ if (!names[i]) {
+ err = 1;
+ goto done;
+ }
+
+ if (strcmp(st->readers[i]->name, names[i])) {
+ err = 1;
+ goto done;
+ }
+ }
+
+ if (names[st->merged->stack_len]) {
+ err = 1;
+ goto done;
+ }
+
+done:
+ free_names(names);
+ return err;
+}
+
+int reftable_stack_reload(struct reftable_stack *st)
+{
+ int err = stack_uptodate(st);
+ if (err > 0)
+ return reftable_stack_reload_maybe_reuse(st, 1);
+ return err;
+}
+
+int reftable_stack_add(struct reftable_stack *st,
+ int (*write)(struct reftable_writer *wr, void *arg),
+ void *arg)
+{
+ int err = stack_try_add(st, write, arg);
+ if (err < 0) {
+ if (err == REFTABLE_LOCK_ERROR) {
+ /* Ignore error return, we want to propagate
+ REFTABLE_LOCK_ERROR.
+ */
+ reftable_stack_reload(st);
+ }
+ return err;
+ }
+
+ if (!st->disable_auto_compact)
+ return reftable_stack_auto_compact(st);
+
+ return 0;
+}
+
+static void format_name(struct strbuf *dest, uint64_t min, uint64_t max)
+{
+ char buf[100];
+ uint32_t rnd = (uint32_t)rand();
+ snprintf(buf, sizeof(buf), "0x%012" PRIx64 "-0x%012" PRIx64 "-%08x",
+ min, max, rnd);
+ strbuf_reset(dest);
+ strbuf_addstr(dest, buf);
+}
+
+struct reftable_addition {
+ int lock_file_fd;
+ struct strbuf lock_file_name;
+ struct reftable_stack *stack;
+
+ char **new_tables;
+ int new_tables_len;
+ uint64_t next_update_index;
+};
+
+#define REFTABLE_ADDITION_INIT \
+ { \
+ .lock_file_name = STRBUF_INIT \
+ }
+
+static int reftable_stack_init_addition(struct reftable_addition *add,
+ struct reftable_stack *st)
+{
+ int err = 0;
+ add->stack = st;
+
+ strbuf_reset(&add->lock_file_name);
+ strbuf_addstr(&add->lock_file_name, st->list_file);
+ strbuf_addstr(&add->lock_file_name, ".lock");
+
+ add->lock_file_fd = open(add->lock_file_name.buf,
+ O_EXCL | O_CREAT | O_WRONLY, 0666);
+ if (add->lock_file_fd < 0) {
+ if (errno == EEXIST) {
+ err = REFTABLE_LOCK_ERROR;
+ } else {
+ err = REFTABLE_IO_ERROR;
+ }
+ goto done;
+ }
+ if (st->config.default_permissions) {
+ if (chmod(add->lock_file_name.buf, st->config.default_permissions) < 0) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+ }
+
+ err = stack_uptodate(st);
+ if (err < 0)
+ goto done;
+
+ if (err > 1) {
+ err = REFTABLE_LOCK_ERROR;
+ goto done;
+ }
+
+ add->next_update_index = reftable_stack_next_update_index(st);
+done:
+ if (err) {
+ reftable_addition_close(add);
+ }
+ return err;
+}
+
+static void reftable_addition_close(struct reftable_addition *add)
+{
+ int i = 0;
+ struct strbuf nm = STRBUF_INIT;
+ for (i = 0; i < add->new_tables_len; i++) {
+ stack_filename(&nm, add->stack, add->new_tables[i]);
+ unlink(nm.buf);
+ reftable_free(add->new_tables[i]);
+ add->new_tables[i] = NULL;
+ }
+ reftable_free(add->new_tables);
+ add->new_tables = NULL;
+ add->new_tables_len = 0;
+
+ if (add->lock_file_fd > 0) {
+ close(add->lock_file_fd);
+ add->lock_file_fd = 0;
+ }
+ if (add->lock_file_name.len > 0) {
+ unlink(add->lock_file_name.buf);
+ strbuf_release(&add->lock_file_name);
+ }
+
+ strbuf_release(&nm);
+}
+
+void reftable_addition_destroy(struct reftable_addition *add)
+{
+ if (!add) {
+ return;
+ }
+ reftable_addition_close(add);
+ reftable_free(add);
+}
+
+int reftable_addition_commit(struct reftable_addition *add)
+{
+ struct strbuf table_list = STRBUF_INIT;
+ int i = 0;
+ int err = 0;
+ if (add->new_tables_len == 0)
+ goto done;
+
+ for (i = 0; i < add->stack->merged->stack_len; i++) {
+ strbuf_addstr(&table_list, add->stack->readers[i]->name);
+ strbuf_addstr(&table_list, "\n");
+ }
+ for (i = 0; i < add->new_tables_len; i++) {
+ strbuf_addstr(&table_list, add->new_tables[i]);
+ strbuf_addstr(&table_list, "\n");
+ }
+
+ err = write(add->lock_file_fd, table_list.buf, table_list.len);
+ strbuf_release(&table_list);
+ if (err < 0) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+
+ err = close(add->lock_file_fd);
+ add->lock_file_fd = 0;
+ if (err < 0) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+
+ err = rename(add->lock_file_name.buf, add->stack->list_file);
+ if (err < 0) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+
+ /* success, no more state to clean up. */
+ strbuf_release(&add->lock_file_name);
+ for (i = 0; i < add->new_tables_len; i++) {
+ reftable_free(add->new_tables[i]);
+ }
+ reftable_free(add->new_tables);
+ add->new_tables = NULL;
+ add->new_tables_len = 0;
+
+ err = reftable_stack_reload(add->stack);
+done:
+ reftable_addition_close(add);
+ return err;
+}
+
+int reftable_stack_new_addition(struct reftable_addition **dest,
+ struct reftable_stack *st)
+{
+ int err = 0;
+ struct reftable_addition empty = REFTABLE_ADDITION_INIT;
+ *dest = reftable_calloc(sizeof(**dest));
+ **dest = empty;
+ err = reftable_stack_init_addition(*dest, st);
+ if (err) {
+ reftable_free(*dest);
+ *dest = NULL;
+ }
+ return err;
+}
+
+static int stack_try_add(struct reftable_stack *st,
+ int (*write_table)(struct reftable_writer *wr,
+ void *arg),
+ void *arg)
+{
+ struct reftable_addition add = REFTABLE_ADDITION_INIT;
+ int err = reftable_stack_init_addition(&add, st);
+ if (err < 0)
+ goto done;
+ if (err > 0) {
+ err = REFTABLE_LOCK_ERROR;
+ goto done;
+ }
+
+ err = reftable_addition_add(&add, write_table, arg);
+ if (err < 0)
+ goto done;
+
+ err = reftable_addition_commit(&add);
+done:
+ reftable_addition_close(&add);
+ return err;
+}
+
+int reftable_addition_add(struct reftable_addition *add,
+ int (*write_table)(struct reftable_writer *wr,
+ void *arg),
+ void *arg)
+{
+ struct strbuf temp_tab_file_name = STRBUF_INIT;
+ struct strbuf tab_file_name = STRBUF_INIT;
+ struct strbuf next_name = STRBUF_INIT;
+ struct reftable_writer *wr = NULL;
+ int err = 0;
+ int tab_fd = 0;
+
+ strbuf_reset(&next_name);
+ format_name(&next_name, add->next_update_index, add->next_update_index);
+
+ stack_filename(&temp_tab_file_name, add->stack, next_name.buf);
+ strbuf_addstr(&temp_tab_file_name, ".temp.XXXXXX");
+
+ tab_fd = mkstemp(temp_tab_file_name.buf);
+ if (tab_fd < 0) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+ if (add->stack->config.default_permissions) {
+ if (chmod(temp_tab_file_name.buf, add->stack->config.default_permissions)) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+ }
+ wr = reftable_new_writer(reftable_fd_write, &tab_fd,
+ &add->stack->config);
+ err = write_table(wr, arg);
+ if (err < 0)
+ goto done;
+
+ err = reftable_writer_close(wr);
+ if (err == REFTABLE_EMPTY_TABLE_ERROR) {
+ err = 0;
+ goto done;
+ }
+ if (err < 0)
+ goto done;
+
+ err = close(tab_fd);
+ tab_fd = 0;
+ if (err < 0) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+
+ err = stack_check_addition(add->stack, temp_tab_file_name.buf);
+ if (err < 0)
+ goto done;
+
+ if (wr->min_update_index < add->next_update_index) {
+ err = REFTABLE_API_ERROR;
+ goto done;
+ }
+
+ format_name(&next_name, wr->min_update_index, wr->max_update_index);
+ strbuf_addstr(&next_name, ".ref");
+
+ stack_filename(&tab_file_name, add->stack, next_name.buf);
+
+ /*
+ On windows, this relies on rand() picking a unique destination name.
+ Maybe we should do retry loop as well?
+ */
+ err = rename(temp_tab_file_name.buf, tab_file_name.buf);
+ if (err < 0) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+
+ add->new_tables = reftable_realloc(add->new_tables,
+ sizeof(*add->new_tables) *
+ (add->new_tables_len + 1));
+ add->new_tables[add->new_tables_len] = strbuf_detach(&next_name, NULL);
+ add->new_tables_len++;
+done:
+ if (tab_fd > 0) {
+ close(tab_fd);
+ tab_fd = 0;
+ }
+ if (temp_tab_file_name.len > 0) {
+ unlink(temp_tab_file_name.buf);
+ }
+
+ strbuf_release(&temp_tab_file_name);
+ strbuf_release(&tab_file_name);
+ strbuf_release(&next_name);
+ reftable_writer_free(wr);
+ return err;
+}
+
+uint64_t reftable_stack_next_update_index(struct reftable_stack *st)
+{
+ int sz = st->merged->stack_len;
+ if (sz > 0)
+ return reftable_reader_max_update_index(st->readers[sz - 1]) +
+ 1;
+ return 1;
+}
+
+static int stack_compact_locked(struct reftable_stack *st, int first, int last,
+ struct strbuf *temp_tab,
+ struct reftable_log_expiry_config *config)
+{
+ struct strbuf next_name = STRBUF_INIT;
+ int tab_fd = -1;
+ struct reftable_writer *wr = NULL;
+ int err = 0;
+
+ format_name(&next_name,
+ reftable_reader_min_update_index(st->readers[first]),
+ reftable_reader_max_update_index(st->readers[last]));
+
+ stack_filename(temp_tab, st, next_name.buf);
+ strbuf_addstr(temp_tab, ".temp.XXXXXX");
+
+ tab_fd = mkstemp(temp_tab->buf);
+ wr = reftable_new_writer(reftable_fd_write, &tab_fd, &st->config);
+
+ err = stack_write_compact(st, wr, first, last, config);
+ if (err < 0)
+ goto done;
+ err = reftable_writer_close(wr);
+ if (err < 0)
+ goto done;
+
+ err = close(tab_fd);
+ tab_fd = 0;
+
+done:
+ reftable_writer_free(wr);
+ if (tab_fd > 0) {
+ close(tab_fd);
+ tab_fd = 0;
+ }
+ if (err != 0 && temp_tab->len > 0) {
+ unlink(temp_tab->buf);
+ strbuf_release(temp_tab);
+ }
+ strbuf_release(&next_name);
+ return err;
+}
+
+static int stack_write_compact(struct reftable_stack *st,
+ struct reftable_writer *wr, int first, int last,
+ struct reftable_log_expiry_config *config)
+{
+ int subtabs_len = last - first + 1;
+ struct reftable_table *subtabs = reftable_calloc(
+ sizeof(struct reftable_table) * (last - first + 1));
+ struct reftable_merged_table *mt = NULL;
+ int err = 0;
+ struct reftable_iterator it = { NULL };
+ struct reftable_ref_record ref = { NULL };
+ struct reftable_log_record log = { NULL };
+
+ uint64_t entries = 0;
+
+ int i = 0, j = 0;
+ for (i = first, j = 0; i <= last; i++) {
+ struct reftable_reader *t = st->readers[i];
+ reftable_table_from_reader(&subtabs[j++], t);
+ st->stats.bytes += t->size;
+ }
+ reftable_writer_set_limits(wr, st->readers[first]->min_update_index,
+ st->readers[last]->max_update_index);
+
+ err = reftable_new_merged_table(&mt, subtabs, subtabs_len,
+ st->config.hash_id);
+ if (err < 0) {
+ reftable_free(subtabs);
+ goto done;
+ }
+
+ err = reftable_merged_table_seek_ref(mt, &it, "");
+ if (err < 0)
+ goto done;
+
+ while (1) {
+ err = reftable_iterator_next_ref(&it, &ref);
+ if (err > 0) {
+ err = 0;
+ break;
+ }
+ if (err < 0) {
+ break;
+ }
+
+ if (first == 0 && reftable_ref_record_is_deletion(&ref)) {
+ continue;
+ }
+
+ err = reftable_writer_add_ref(wr, &ref);
+ if (err < 0) {
+ break;
+ }
+ entries++;
+ }
+ reftable_iterator_destroy(&it);
+
+ err = reftable_merged_table_seek_log(mt, &it, "");
+ if (err < 0)
+ goto done;
+
+ while (1) {
+ err = reftable_iterator_next_log(&it, &log);
+ if (err > 0) {
+ err = 0;
+ break;
+ }
+ if (err < 0) {
+ break;
+ }
+ if (first == 0 && reftable_log_record_is_deletion(&log)) {
+ continue;
+ }
+
+ if (config && config->min_update_index > 0 &&
+ log.update_index < config->min_update_index) {
+ continue;
+ }
+
+ if (config && config->time > 0 &&
+ log.value.update.time < config->time) {
+ continue;
+ }
+
+ err = reftable_writer_add_log(wr, &log);
+ if (err < 0) {
+ break;
+ }
+ entries++;
+ }
+
+done:
+ reftable_iterator_destroy(&it);
+ if (mt) {
+ merged_table_release(mt);
+ reftable_merged_table_free(mt);
+ }
+ reftable_ref_record_release(&ref);
+ reftable_log_record_release(&log);
+ st->stats.entries_written += entries;
+ return err;
+}
+
+/* < 0: error. 0 == OK, > 0 attempt failed; could retry. */
+static int stack_compact_range(struct reftable_stack *st, int first, int last,
+ struct reftable_log_expiry_config *expiry)
+{
+ struct strbuf temp_tab_file_name = STRBUF_INIT;
+ struct strbuf new_table_name = STRBUF_INIT;
+ struct strbuf lock_file_name = STRBUF_INIT;
+ struct strbuf ref_list_contents = STRBUF_INIT;
+ struct strbuf new_table_path = STRBUF_INIT;
+ int err = 0;
+ int have_lock = 0;
+ int lock_file_fd = -1;
+ int compact_count = last - first + 1;
+ char **listp = NULL;
+ char **delete_on_success =
+ reftable_calloc(sizeof(char *) * (compact_count + 1));
+ char **subtable_locks =
+ reftable_calloc(sizeof(char *) * (compact_count + 1));
+ int i = 0;
+ int j = 0;
+ int is_empty_table = 0;
+
+ if (first > last || (!expiry && first == last)) {
+ err = 0;
+ goto done;
+ }
+
+ st->stats.attempts++;
+
+ strbuf_reset(&lock_file_name);
+ strbuf_addstr(&lock_file_name, st->list_file);
+ strbuf_addstr(&lock_file_name, ".lock");
+
+ lock_file_fd =
+ open(lock_file_name.buf, O_EXCL | O_CREAT | O_WRONLY, 0666);
+ if (lock_file_fd < 0) {
+ if (errno == EEXIST) {
+ err = 1;
+ } else {
+ err = REFTABLE_IO_ERROR;
+ }
+ goto done;
+ }
+ /* Don't want to write to the lock for now. */
+ close(lock_file_fd);
+ lock_file_fd = -1;
+
+ have_lock = 1;
+ err = stack_uptodate(st);
+ if (err != 0)
+ goto done;
+
+ for (i = first, j = 0; i <= last; i++) {
+ struct strbuf subtab_file_name = STRBUF_INIT;
+ struct strbuf subtab_lock = STRBUF_INIT;
+ int sublock_file_fd = -1;
+
+ stack_filename(&subtab_file_name, st,
+ reader_name(st->readers[i]));
+
+ strbuf_reset(&subtab_lock);
+ strbuf_addbuf(&subtab_lock, &subtab_file_name);
+ strbuf_addstr(&subtab_lock, ".lock");
+
+ sublock_file_fd = open(subtab_lock.buf,
+ O_EXCL | O_CREAT | O_WRONLY, 0666);
+ if (sublock_file_fd >= 0) {
+ close(sublock_file_fd);
+ } else if (sublock_file_fd < 0) {
+ if (errno == EEXIST) {
+ err = 1;
+ } else {
+ err = REFTABLE_IO_ERROR;
+ }
+ }
+
+ subtable_locks[j] = subtab_lock.buf;
+ delete_on_success[j] = subtab_file_name.buf;
+ j++;
+
+ if (err != 0)
+ goto done;
+ }
+
+ err = unlink(lock_file_name.buf);
+ if (err < 0)
+ goto done;
+ have_lock = 0;
+
+ err = stack_compact_locked(st, first, last, &temp_tab_file_name,
+ expiry);
+ /* Compaction + tombstones can create an empty table out of non-empty
+ * tables. */
+ is_empty_table = (err == REFTABLE_EMPTY_TABLE_ERROR);
+ if (is_empty_table) {
+ err = 0;
+ }
+ if (err < 0)
+ goto done;
+
+ lock_file_fd =
+ open(lock_file_name.buf, O_EXCL | O_CREAT | O_WRONLY, 0666);
+ if (lock_file_fd < 0) {
+ if (errno == EEXIST) {
+ err = 1;
+ } else {
+ err = REFTABLE_IO_ERROR;
+ }
+ goto done;
+ }
+ have_lock = 1;
+ if (st->config.default_permissions) {
+ if (chmod(lock_file_name.buf, st->config.default_permissions) < 0) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+ }
+
+ format_name(&new_table_name, st->readers[first]->min_update_index,
+ st->readers[last]->max_update_index);
+ strbuf_addstr(&new_table_name, ".ref");
+
+ stack_filename(&new_table_path, st, new_table_name.buf);
+
+ if (!is_empty_table) {
+ /* retry? */
+ err = rename(temp_tab_file_name.buf, new_table_path.buf);
+ if (err < 0) {
+ err = REFTABLE_IO_ERROR;
+ goto done;
+ }
+ }
+
+ for (i = 0; i < first; i++) {
+ strbuf_addstr(&ref_list_contents, st->readers[i]->name);
+ strbuf_addstr(&ref_list_contents, "\n");
+ }
+ if (!is_empty_table) {
+ strbuf_addbuf(&ref_list_contents, &new_table_name);
+ strbuf_addstr(&ref_list_contents, "\n");
+ }
+ for (i = last + 1; i < st->merged->stack_len; i++) {
+ strbuf_addstr(&ref_list_contents, st->readers[i]->name);
+ strbuf_addstr(&ref_list_contents, "\n");
+ }
+
+ err = write(lock_file_fd, ref_list_contents.buf, ref_list_contents.len);
+ if (err < 0) {
+ err = REFTABLE_IO_ERROR;
+ unlink(new_table_path.buf);
+ goto done;
+ }
+ err = close(lock_file_fd);
+ lock_file_fd = -1;
+ if (err < 0) {
+ err = REFTABLE_IO_ERROR;
+ unlink(new_table_path.buf);
+ goto done;
+ }
+
+ err = rename(lock_file_name.buf, st->list_file);
+ if (err < 0) {
+ err = REFTABLE_IO_ERROR;
+ unlink(new_table_path.buf);
+ goto done;
+ }
+ have_lock = 0;
+
+ /* Reload the stack before deleting. On windows, we can only delete the
+ files after we closed them.
+ */
+ err = reftable_stack_reload_maybe_reuse(st, first < last);
+
+ listp = delete_on_success;
+ while (*listp) {
+ if (strcmp(*listp, new_table_path.buf)) {
+ unlink(*listp);
+ }
+ listp++;
+ }
+
+done:
+ free_names(delete_on_success);
+
+ listp = subtable_locks;
+ while (*listp) {
+ unlink(*listp);
+ listp++;
+ }
+ free_names(subtable_locks);
+ if (lock_file_fd >= 0) {
+ close(lock_file_fd);
+ lock_file_fd = -1;
+ }
+ if (have_lock) {
+ unlink(lock_file_name.buf);
+ }
+ strbuf_release(&new_table_name);
+ strbuf_release(&new_table_path);
+ strbuf_release(&ref_list_contents);
+ strbuf_release(&temp_tab_file_name);
+ strbuf_release(&lock_file_name);
+ return err;
+}
+
+int reftable_stack_compact_all(struct reftable_stack *st,
+ struct reftable_log_expiry_config *config)
+{
+ return stack_compact_range(st, 0, st->merged->stack_len - 1, config);
+}
+
+static int stack_compact_range_stats(struct reftable_stack *st, int first,
+ int last,
+ struct reftable_log_expiry_config *config)
+{
+ int err = stack_compact_range(st, first, last, config);
+ if (err > 0) {
+ st->stats.failures++;
+ }
+ return err;
+}
+
+static int segment_size(struct segment *s)
+{
+ return s->end - s->start;
+}
+
+int fastlog2(uint64_t sz)
+{
+ int l = 0;
+ if (sz == 0)
+ return 0;
+ for (; sz; sz /= 2) {
+ l++;
+ }
+ return l - 1;
+}
+
+struct segment *sizes_to_segments(int *seglen, uint64_t *sizes, int n)
+{
+ struct segment *segs = reftable_calloc(sizeof(struct segment) * n);
+ int next = 0;
+ struct segment cur = { 0 };
+ int i = 0;
+
+ if (n == 0) {
+ *seglen = 0;
+ return segs;
+ }
+ for (i = 0; i < n; i++) {
+ int log = fastlog2(sizes[i]);
+ if (cur.log != log && cur.bytes > 0) {
+ struct segment fresh = {
+ .start = i,
+ };
+
+ segs[next++] = cur;
+ cur = fresh;
+ }
+
+ cur.log = log;
+ cur.end = i + 1;
+ cur.bytes += sizes[i];
+ }
+ segs[next++] = cur;
+ *seglen = next;
+ return segs;
+}
+
+struct segment suggest_compaction_segment(uint64_t *sizes, int n)
+{
+ int seglen = 0;
+ struct segment *segs = sizes_to_segments(&seglen, sizes, n);
+ struct segment min_seg = {
+ .log = 64,
+ };
+ int i = 0;
+ for (i = 0; i < seglen; i++) {
+ if (segment_size(&segs[i]) == 1) {
+ continue;
+ }
+
+ if (segs[i].log < min_seg.log) {
+ min_seg = segs[i];
+ }
+ }
+
+ while (min_seg.start > 0) {
+ int prev = min_seg.start - 1;
+ if (fastlog2(min_seg.bytes) < fastlog2(sizes[prev])) {
+ break;
+ }
+
+ min_seg.start = prev;
+ min_seg.bytes += sizes[prev];
+ }
+
+ reftable_free(segs);
+ return min_seg;
+}
+
+static uint64_t *stack_table_sizes_for_compaction(struct reftable_stack *st)
+{
+ uint64_t *sizes =
+ reftable_calloc(sizeof(uint64_t) * st->merged->stack_len);
+ int version = (st->config.hash_id == GIT_SHA1_FORMAT_ID) ? 1 : 2;
+ int overhead = header_size(version) - 1;
+ int i = 0;
+ for (i = 0; i < st->merged->stack_len; i++) {
+ sizes[i] = st->readers[i]->size - overhead;
+ }
+ return sizes;
+}
+
+int reftable_stack_auto_compact(struct reftable_stack *st)
+{
+ uint64_t *sizes = stack_table_sizes_for_compaction(st);
+ struct segment seg =
+ suggest_compaction_segment(sizes, st->merged->stack_len);
+ reftable_free(sizes);
+ if (segment_size(&seg) > 0)
+ return stack_compact_range_stats(st, seg.start, seg.end - 1,
+ NULL);
+
+ return 0;
+}
+
+struct reftable_compaction_stats *
+reftable_stack_compaction_stats(struct reftable_stack *st)
+{
+ return &st->stats;
+}
+
+int reftable_stack_read_ref(struct reftable_stack *st, const char *refname,
+ struct reftable_ref_record *ref)
+{
+ struct reftable_table tab = { NULL };
+ reftable_table_from_merged_table(&tab, reftable_stack_merged_table(st));
+ return reftable_table_read_ref(&tab, refname, ref);
+}
+
+int reftable_stack_read_log(struct reftable_stack *st, const char *refname,
+ struct reftable_log_record *log)
+{
+ struct reftable_iterator it = { NULL };
+ struct reftable_merged_table *mt = reftable_stack_merged_table(st);
+ int err = reftable_merged_table_seek_log(mt, &it, refname);
+ if (err)
+ goto done;
+
+ err = reftable_iterator_next_log(&it, log);
+ if (err)
+ goto done;
+
+ if (strcmp(log->refname, refname) ||
+ reftable_log_record_is_deletion(log)) {
+ err = 1;
+ goto done;
+ }
+
+done:
+ if (err) {
+ reftable_log_record_release(log);
+ }
+ reftable_iterator_destroy(&it);
+ return err;
+}
+
+static int stack_check_addition(struct reftable_stack *st,
+ const char *new_tab_name)
+{
+ int err = 0;
+ struct reftable_block_source src = { NULL };
+ struct reftable_reader *rd = NULL;
+ struct reftable_table tab = { NULL };
+ struct reftable_ref_record *refs = NULL;
+ struct reftable_iterator it = { NULL };
+ int cap = 0;
+ int len = 0;
+ int i = 0;
+
+ if (st->config.skip_name_check)
+ return 0;
+
+ err = reftable_block_source_from_file(&src, new_tab_name);
+ if (err < 0)
+ goto done;
+
+ err = reftable_new_reader(&rd, &src, new_tab_name);
+ if (err < 0)
+ goto done;
+
+ err = reftable_reader_seek_ref(rd, &it, "");
+ if (err > 0) {
+ err = 0;
+ goto done;
+ }
+ if (err < 0)
+ goto done;
+
+ while (1) {
+ struct reftable_ref_record ref = { NULL };
+ err = reftable_iterator_next_ref(&it, &ref);
+ if (err > 0) {
+ break;
+ }
+ if (err < 0)
+ goto done;
+
+ if (len >= cap) {
+ cap = 2 * cap + 1;
+ refs = reftable_realloc(refs, cap * sizeof(refs[0]));
+ }
+
+ refs[len++] = ref;
+ }
+
+ reftable_table_from_merged_table(&tab, reftable_stack_merged_table(st));
+
+ err = validate_ref_record_addition(tab, refs, len);
+
+done:
+ for (i = 0; i < len; i++) {
+ reftable_ref_record_release(&refs[i]);
+ }
+
+ free(refs);
+ reftable_iterator_destroy(&it);
+ reftable_reader_free(rd);
+ return err;
+}
+
+static int is_table_name(const char *s)
+{
+ const char *dot = strrchr(s, '.');
+ return dot && !strcmp(dot, ".ref");
+}
+
+static void remove_maybe_stale_table(struct reftable_stack *st, uint64_t max,
+ const char *name)
+{
+ int err = 0;
+ uint64_t update_idx = 0;
+ struct reftable_block_source src = { NULL };
+ struct reftable_reader *rd = NULL;
+ struct strbuf table_path = STRBUF_INIT;
+ stack_filename(&table_path, st, name);
+
+ err = reftable_block_source_from_file(&src, table_path.buf);
+ if (err < 0)
+ goto done;
+
+ err = reftable_new_reader(&rd, &src, name);
+ if (err < 0)
+ goto done;
+
+ update_idx = reftable_reader_max_update_index(rd);
+ reftable_reader_free(rd);
+
+ if (update_idx <= max) {
+ unlink(table_path.buf);
+ }
+done:
+ strbuf_release(&table_path);
+}
+
+static int reftable_stack_clean_locked(struct reftable_stack *st)
+{
+ uint64_t max = reftable_merged_table_max_update_index(
+ reftable_stack_merged_table(st));
+ DIR *dir = opendir(st->reftable_dir);
+ struct dirent *d = NULL;
+ if (!dir) {
+ return REFTABLE_IO_ERROR;
+ }
+
+ while ((d = readdir(dir))) {
+ int i = 0;
+ int found = 0;
+ if (!is_table_name(d->d_name))
+ continue;
+
+ for (i = 0; !found && i < st->readers_len; i++) {
+ found = !strcmp(reader_name(st->readers[i]), d->d_name);
+ }
+ if (found)
+ continue;
+
+ remove_maybe_stale_table(st, max, d->d_name);
+ }
+
+ closedir(dir);
+ return 0;
+}
+
+int reftable_stack_clean(struct reftable_stack *st)
+{
+ struct reftable_addition *add = NULL;
+ int err = reftable_stack_new_addition(&add, st);
+ if (err < 0) {
+ goto done;
+ }
+
+ err = reftable_stack_reload(st);
+ if (err < 0) {
+ goto done;
+ }
+
+ err = reftable_stack_clean_locked(st);
+
+done:
+ reftable_addition_destroy(add);
+ return err;
+}
+
+int reftable_stack_print_directory(const char *stackdir, uint32_t hash_id)
+{
+ struct reftable_stack *stack = NULL;
+ struct reftable_write_options cfg = { .hash_id = hash_id };
+ struct reftable_merged_table *merged = NULL;
+ struct reftable_table table = { NULL };
+
+ int err = reftable_new_stack(&stack, stackdir, cfg);
+ if (err < 0)
+ goto done;
+
+ merged = reftable_stack_merged_table(stack);
+ reftable_table_from_merged_table(&table, merged);
+ err = reftable_table_print(&table);
+done:
+ if (stack)
+ reftable_stack_destroy(stack);
+ return err;
+}
diff --git a/reftable/stack.h b/reftable/stack.h
new file mode 100644
index 0000000..f570058
--- /dev/null
+++ b/reftable/stack.h
@@ -0,0 +1,41 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef STACK_H
+#define STACK_H
+
+#include "system.h"
+#include "reftable-writer.h"
+#include "reftable-stack.h"
+
+struct reftable_stack {
+ char *list_file;
+ char *reftable_dir;
+ int disable_auto_compact;
+
+ struct reftable_write_options config;
+
+ struct reftable_reader **readers;
+ size_t readers_len;
+ struct reftable_merged_table *merged;
+ struct reftable_compaction_stats stats;
+};
+
+int read_lines(const char *filename, char ***lines);
+
+struct segment {
+ int start, end;
+ int log;
+ uint64_t bytes;
+};
+
+int fastlog2(uint64_t sz);
+struct segment *sizes_to_segments(int *seglen, uint64_t *sizes, int n);
+struct segment suggest_compaction_segment(uint64_t *sizes, int n);
+
+#endif
diff --git a/reftable/stack_test.c b/reftable/stack_test.c
new file mode 100644
index 0000000..d0b7175
--- /dev/null
+++ b/reftable/stack_test.c
@@ -0,0 +1,979 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "stack.h"
+
+#include "system.h"
+
+#include "reftable-reader.h"
+#include "merged.h"
+#include "basics.h"
+#include "constants.h"
+#include "record.h"
+#include "test_framework.h"
+#include "reftable-tests.h"
+#include "reader.h"
+
+#include <sys/types.h>
+#include <dirent.h>
+
+static void clear_dir(const char *dirname)
+{
+ struct strbuf path = STRBUF_INIT;
+ strbuf_addstr(&path, dirname);
+ remove_dir_recursively(&path, 0);
+ strbuf_release(&path);
+}
+
+static int count_dir_entries(const char *dirname)
+{
+ DIR *dir = opendir(dirname);
+ int len = 0;
+ struct dirent *d;
+ if (!dir)
+ return 0;
+
+ while ((d = readdir(dir))) {
+ if (!strcmp(d->d_name, "..") || !strcmp(d->d_name, "."))
+ continue;
+ len++;
+ }
+ closedir(dir);
+ return len;
+}
+
+/*
+ * Work linenumber into the tempdir, so we can see which tests forget to
+ * cleanup.
+ */
+static char *get_tmp_template(int linenumber)
+{
+ const char *tmp = getenv("TMPDIR");
+ static char template[1024];
+ snprintf(template, sizeof(template) - 1, "%s/stack_test-%d.XXXXXX",
+ tmp ? tmp : "/tmp", linenumber);
+ return template;
+}
+
+static char *get_tmp_dir(int linenumber)
+{
+ char *dir = get_tmp_template(linenumber);
+ EXPECT(mkdtemp(dir));
+ return dir;
+}
+
+static void test_read_file(void)
+{
+ char *fn = get_tmp_template(__LINE__);
+ int fd = mkstemp(fn);
+ char out[1024] = "line1\n\nline2\nline3";
+ int n, err;
+ char **names = NULL;
+ char *want[] = { "line1", "line2", "line3" };
+ int i = 0;
+
+ EXPECT(fd > 0);
+ n = write(fd, out, strlen(out));
+ EXPECT(n == strlen(out));
+ err = close(fd);
+ EXPECT(err >= 0);
+
+ err = read_lines(fn, &names);
+ EXPECT_ERR(err);
+
+ for (i = 0; names[i]; i++) {
+ EXPECT(0 == strcmp(want[i], names[i]));
+ }
+ free_names(names);
+ (void) remove(fn);
+}
+
+static void test_parse_names(void)
+{
+ char buf[] = "line\n";
+ char **names = NULL;
+ parse_names(buf, strlen(buf), &names);
+
+ EXPECT(NULL != names[0]);
+ EXPECT(0 == strcmp(names[0], "line"));
+ EXPECT(NULL == names[1]);
+ free_names(names);
+}
+
+static void test_names_equal(void)
+{
+ char *a[] = { "a", "b", "c", NULL };
+ char *b[] = { "a", "b", "d", NULL };
+ char *c[] = { "a", "b", NULL };
+
+ EXPECT(names_equal(a, a));
+ EXPECT(!names_equal(a, b));
+ EXPECT(!names_equal(a, c));
+}
+
+static int write_test_ref(struct reftable_writer *wr, void *arg)
+{
+ struct reftable_ref_record *ref = arg;
+ reftable_writer_set_limits(wr, ref->update_index, ref->update_index);
+ return reftable_writer_add_ref(wr, ref);
+}
+
+struct write_log_arg {
+ struct reftable_log_record *log;
+ uint64_t update_index;
+};
+
+static int write_test_log(struct reftable_writer *wr, void *arg)
+{
+ struct write_log_arg *wla = arg;
+
+ reftable_writer_set_limits(wr, wla->update_index, wla->update_index);
+ return reftable_writer_add_log(wr, wla->log);
+}
+
+static void test_reftable_stack_add_one(void)
+{
+ char *dir = get_tmp_dir(__LINE__);
+ struct strbuf scratch = STRBUF_INIT;
+ int mask = umask(002);
+ struct reftable_write_options cfg = {
+ .default_permissions = 0660,
+ };
+ struct reftable_stack *st = NULL;
+ int err;
+ struct reftable_ref_record ref = {
+ .refname = "HEAD",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "master",
+ };
+ struct reftable_ref_record dest = { NULL };
+ struct stat stat_result = { 0 };
+ err = reftable_new_stack(&st, dir, cfg);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_add(st, &write_test_ref, &ref);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_read_ref(st, ref.refname, &dest);
+ EXPECT_ERR(err);
+ EXPECT(0 == strcmp("master", dest.value.symref));
+ EXPECT(st->readers_len > 0);
+
+ printf("testing print functionality:\n");
+ err = reftable_stack_print_directory(dir, GIT_SHA1_FORMAT_ID);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_print_directory(dir, GIT_SHA256_FORMAT_ID);
+ EXPECT(err == REFTABLE_FORMAT_ERROR);
+
+#ifndef GIT_WINDOWS_NATIVE
+ strbuf_addstr(&scratch, dir);
+ strbuf_addstr(&scratch, "/tables.list");
+ err = stat(scratch.buf, &stat_result);
+ EXPECT(!err);
+ EXPECT((stat_result.st_mode & 0777) == cfg.default_permissions);
+
+ strbuf_reset(&scratch);
+ strbuf_addstr(&scratch, dir);
+ strbuf_addstr(&scratch, "/");
+ /* do not try at home; not an external API for reftable. */
+ strbuf_addstr(&scratch, st->readers[0]->name);
+ err = stat(scratch.buf, &stat_result);
+ EXPECT(!err);
+ EXPECT((stat_result.st_mode & 0777) == cfg.default_permissions);
+#else
+ (void) stat_result;
+#endif
+
+ reftable_ref_record_release(&dest);
+ reftable_stack_destroy(st);
+ strbuf_release(&scratch);
+ clear_dir(dir);
+ umask(mask);
+}
+
+static void test_reftable_stack_uptodate(void)
+{
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st1 = NULL;
+ struct reftable_stack *st2 = NULL;
+ char *dir = get_tmp_dir(__LINE__);
+
+ int err;
+ struct reftable_ref_record ref1 = {
+ .refname = "HEAD",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "master",
+ };
+ struct reftable_ref_record ref2 = {
+ .refname = "branch2",
+ .update_index = 2,
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "master",
+ };
+
+
+ /* simulate multi-process access to the same stack
+ by creating two stacks for the same directory.
+ */
+ err = reftable_new_stack(&st1, dir, cfg);
+ EXPECT_ERR(err);
+
+ err = reftable_new_stack(&st2, dir, cfg);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_add(st1, &write_test_ref, &ref1);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_add(st2, &write_test_ref, &ref2);
+ EXPECT(err == REFTABLE_LOCK_ERROR);
+
+ err = reftable_stack_reload(st2);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_add(st2, &write_test_ref, &ref2);
+ EXPECT_ERR(err);
+ reftable_stack_destroy(st1);
+ reftable_stack_destroy(st2);
+ clear_dir(dir);
+}
+
+static void test_reftable_stack_transaction_api(void)
+{
+ char *dir = get_tmp_dir(__LINE__);
+
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st = NULL;
+ int err;
+ struct reftable_addition *add = NULL;
+
+ struct reftable_ref_record ref = {
+ .refname = "HEAD",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "master",
+ };
+ struct reftable_ref_record dest = { NULL };
+
+
+ err = reftable_new_stack(&st, dir, cfg);
+ EXPECT_ERR(err);
+
+ reftable_addition_destroy(add);
+
+ err = reftable_stack_new_addition(&add, st);
+ EXPECT_ERR(err);
+
+ err = reftable_addition_add(add, &write_test_ref, &ref);
+ EXPECT_ERR(err);
+
+ err = reftable_addition_commit(add);
+ EXPECT_ERR(err);
+
+ reftable_addition_destroy(add);
+
+ err = reftable_stack_read_ref(st, ref.refname, &dest);
+ EXPECT_ERR(err);
+ EXPECT(REFTABLE_REF_SYMREF == dest.value_type);
+ EXPECT(0 == strcmp("master", dest.value.symref));
+
+ reftable_ref_record_release(&dest);
+ reftable_stack_destroy(st);
+ clear_dir(dir);
+}
+
+static void test_reftable_stack_validate_refname(void)
+{
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st = NULL;
+ int err;
+ char *dir = get_tmp_dir(__LINE__);
+
+ int i;
+ struct reftable_ref_record ref = {
+ .refname = "a/b",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "master",
+ };
+ char *additions[] = { "a", "a/b/c" };
+
+ err = reftable_new_stack(&st, dir, cfg);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_add(st, &write_test_ref, &ref);
+ EXPECT_ERR(err);
+
+ for (i = 0; i < ARRAY_SIZE(additions); i++) {
+ struct reftable_ref_record ref = {
+ .refname = additions[i],
+ .update_index = 1,
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "master",
+ };
+
+ err = reftable_stack_add(st, &write_test_ref, &ref);
+ EXPECT(err == REFTABLE_NAME_CONFLICT);
+ }
+
+ reftable_stack_destroy(st);
+ clear_dir(dir);
+}
+
+static int write_error(struct reftable_writer *wr, void *arg)
+{
+ return *((int *)arg);
+}
+
+static void test_reftable_stack_update_index_check(void)
+{
+ char *dir = get_tmp_dir(__LINE__);
+
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st = NULL;
+ int err;
+ struct reftable_ref_record ref1 = {
+ .refname = "name1",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "master",
+ };
+ struct reftable_ref_record ref2 = {
+ .refname = "name2",
+ .update_index = 1,
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "master",
+ };
+
+ err = reftable_new_stack(&st, dir, cfg);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_add(st, &write_test_ref, &ref1);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_add(st, &write_test_ref, &ref2);
+ EXPECT(err == REFTABLE_API_ERROR);
+ reftable_stack_destroy(st);
+ clear_dir(dir);
+}
+
+static void test_reftable_stack_lock_failure(void)
+{
+ char *dir = get_tmp_dir(__LINE__);
+
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st = NULL;
+ int err, i;
+
+ err = reftable_new_stack(&st, dir, cfg);
+ EXPECT_ERR(err);
+ for (i = -1; i != REFTABLE_EMPTY_TABLE_ERROR; i--) {
+ err = reftable_stack_add(st, &write_error, &i);
+ EXPECT(err == i);
+ }
+
+ reftable_stack_destroy(st);
+ clear_dir(dir);
+}
+
+static void test_reftable_stack_add(void)
+{
+ int i = 0;
+ int err = 0;
+ struct reftable_write_options cfg = {
+ .exact_log_message = 1,
+ };
+ struct reftable_stack *st = NULL;
+ char *dir = get_tmp_dir(__LINE__);
+
+ struct reftable_ref_record refs[2] = { { NULL } };
+ struct reftable_log_record logs[2] = { { NULL } };
+ int N = ARRAY_SIZE(refs);
+
+
+ err = reftable_new_stack(&st, dir, cfg);
+ EXPECT_ERR(err);
+ st->disable_auto_compact = 1;
+
+ for (i = 0; i < N; i++) {
+ char buf[256];
+ snprintf(buf, sizeof(buf), "branch%02d", i);
+ refs[i].refname = xstrdup(buf);
+ refs[i].update_index = i + 1;
+ refs[i].value_type = REFTABLE_REF_VAL1;
+ refs[i].value.val1 = reftable_malloc(GIT_SHA1_RAWSZ);
+ set_test_hash(refs[i].value.val1, i);
+
+ logs[i].refname = xstrdup(buf);
+ logs[i].update_index = N + i + 1;
+ logs[i].value_type = REFTABLE_LOG_UPDATE;
+
+ logs[i].value.update.new_hash = reftable_malloc(GIT_SHA1_RAWSZ);
+ logs[i].value.update.email = xstrdup("identity@invalid");
+ set_test_hash(logs[i].value.update.new_hash, i);
+ }
+
+ for (i = 0; i < N; i++) {
+ int err = reftable_stack_add(st, &write_test_ref, &refs[i]);
+ EXPECT_ERR(err);
+ }
+
+ for (i = 0; i < N; i++) {
+ struct write_log_arg arg = {
+ .log = &logs[i],
+ .update_index = reftable_stack_next_update_index(st),
+ };
+ int err = reftable_stack_add(st, &write_test_log, &arg);
+ EXPECT_ERR(err);
+ }
+
+ err = reftable_stack_compact_all(st, NULL);
+ EXPECT_ERR(err);
+
+ for (i = 0; i < N; i++) {
+ struct reftable_ref_record dest = { NULL };
+
+ int err = reftable_stack_read_ref(st, refs[i].refname, &dest);
+ EXPECT_ERR(err);
+ EXPECT(reftable_ref_record_equal(&dest, refs + i,
+ GIT_SHA1_RAWSZ));
+ reftable_ref_record_release(&dest);
+ }
+
+ for (i = 0; i < N; i++) {
+ struct reftable_log_record dest = { NULL };
+ int err = reftable_stack_read_log(st, refs[i].refname, &dest);
+ EXPECT_ERR(err);
+ EXPECT(reftable_log_record_equal(&dest, logs + i,
+ GIT_SHA1_RAWSZ));
+ reftable_log_record_release(&dest);
+ }
+
+ /* cleanup */
+ reftable_stack_destroy(st);
+ for (i = 0; i < N; i++) {
+ reftable_ref_record_release(&refs[i]);
+ reftable_log_record_release(&logs[i]);
+ }
+ clear_dir(dir);
+}
+
+static void test_reftable_stack_log_normalize(void)
+{
+ int err = 0;
+ struct reftable_write_options cfg = {
+ 0,
+ };
+ struct reftable_stack *st = NULL;
+ char *dir = get_tmp_dir(__LINE__);
+
+ uint8_t h1[GIT_SHA1_RAWSZ] = { 0x01 }, h2[GIT_SHA1_RAWSZ] = { 0x02 };
+
+ struct reftable_log_record input = { .refname = "branch",
+ .update_index = 1,
+ .value_type = REFTABLE_LOG_UPDATE,
+ .value = { .update = {
+ .new_hash = h1,
+ .old_hash = h2,
+ } } };
+ struct reftable_log_record dest = {
+ .update_index = 0,
+ };
+ struct write_log_arg arg = {
+ .log = &input,
+ .update_index = 1,
+ };
+
+ err = reftable_new_stack(&st, dir, cfg);
+ EXPECT_ERR(err);
+
+ input.value.update.message = "one\ntwo";
+ err = reftable_stack_add(st, &write_test_log, &arg);
+ EXPECT(err == REFTABLE_API_ERROR);
+
+ input.value.update.message = "one";
+ err = reftable_stack_add(st, &write_test_log, &arg);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_read_log(st, input.refname, &dest);
+ EXPECT_ERR(err);
+ EXPECT(0 == strcmp(dest.value.update.message, "one\n"));
+
+ input.value.update.message = "two\n";
+ arg.update_index = 2;
+ err = reftable_stack_add(st, &write_test_log, &arg);
+ EXPECT_ERR(err);
+ err = reftable_stack_read_log(st, input.refname, &dest);
+ EXPECT_ERR(err);
+ EXPECT(0 == strcmp(dest.value.update.message, "two\n"));
+
+ /* cleanup */
+ reftable_stack_destroy(st);
+ reftable_log_record_release(&dest);
+ clear_dir(dir);
+}
+
+static void test_reftable_stack_tombstone(void)
+{
+ int i = 0;
+ char *dir = get_tmp_dir(__LINE__);
+
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st = NULL;
+ int err;
+ struct reftable_ref_record refs[2] = { { NULL } };
+ struct reftable_log_record logs[2] = { { NULL } };
+ int N = ARRAY_SIZE(refs);
+ struct reftable_ref_record dest = { NULL };
+ struct reftable_log_record log_dest = { NULL };
+
+
+ err = reftable_new_stack(&st, dir, cfg);
+ EXPECT_ERR(err);
+
+ /* even entries add the refs, odd entries delete them. */
+ for (i = 0; i < N; i++) {
+ const char *buf = "branch";
+ refs[i].refname = xstrdup(buf);
+ refs[i].update_index = i + 1;
+ if (i % 2 == 0) {
+ refs[i].value_type = REFTABLE_REF_VAL1;
+ refs[i].value.val1 = reftable_malloc(GIT_SHA1_RAWSZ);
+ set_test_hash(refs[i].value.val1, i);
+ }
+
+ logs[i].refname = xstrdup(buf);
+ /* update_index is part of the key. */
+ logs[i].update_index = 42;
+ if (i % 2 == 0) {
+ logs[i].value_type = REFTABLE_LOG_UPDATE;
+ logs[i].value.update.new_hash =
+ reftable_malloc(GIT_SHA1_RAWSZ);
+ set_test_hash(logs[i].value.update.new_hash, i);
+ logs[i].value.update.email =
+ xstrdup("identity@invalid");
+ }
+ }
+ for (i = 0; i < N; i++) {
+ int err = reftable_stack_add(st, &write_test_ref, &refs[i]);
+ EXPECT_ERR(err);
+ }
+
+ for (i = 0; i < N; i++) {
+ struct write_log_arg arg = {
+ .log = &logs[i],
+ .update_index = reftable_stack_next_update_index(st),
+ };
+ int err = reftable_stack_add(st, &write_test_log, &arg);
+ EXPECT_ERR(err);
+ }
+
+ err = reftable_stack_read_ref(st, "branch", &dest);
+ EXPECT(err == 1);
+ reftable_ref_record_release(&dest);
+
+ err = reftable_stack_read_log(st, "branch", &log_dest);
+ EXPECT(err == 1);
+ reftable_log_record_release(&log_dest);
+
+ err = reftable_stack_compact_all(st, NULL);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_read_ref(st, "branch", &dest);
+ EXPECT(err == 1);
+
+ err = reftable_stack_read_log(st, "branch", &log_dest);
+ EXPECT(err == 1);
+ reftable_ref_record_release(&dest);
+ reftable_log_record_release(&log_dest);
+
+ /* cleanup */
+ reftable_stack_destroy(st);
+ for (i = 0; i < N; i++) {
+ reftable_ref_record_release(&refs[i]);
+ reftable_log_record_release(&logs[i]);
+ }
+ clear_dir(dir);
+}
+
+static void test_reftable_stack_hash_id(void)
+{
+ char *dir = get_tmp_dir(__LINE__);
+
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st = NULL;
+ int err;
+
+ struct reftable_ref_record ref = {
+ .refname = "master",
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "target",
+ .update_index = 1,
+ };
+ struct reftable_write_options cfg32 = { .hash_id = GIT_SHA256_FORMAT_ID };
+ struct reftable_stack *st32 = NULL;
+ struct reftable_write_options cfg_default = { 0 };
+ struct reftable_stack *st_default = NULL;
+ struct reftable_ref_record dest = { NULL };
+
+ err = reftable_new_stack(&st, dir, cfg);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_add(st, &write_test_ref, &ref);
+ EXPECT_ERR(err);
+
+ /* can't read it with the wrong hash ID. */
+ err = reftable_new_stack(&st32, dir, cfg32);
+ EXPECT(err == REFTABLE_FORMAT_ERROR);
+
+ /* check that we can read it back with default config too. */
+ err = reftable_new_stack(&st_default, dir, cfg_default);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_read_ref(st_default, "master", &dest);
+ EXPECT_ERR(err);
+
+ EXPECT(reftable_ref_record_equal(&ref, &dest, GIT_SHA1_RAWSZ));
+ reftable_ref_record_release(&dest);
+ reftable_stack_destroy(st);
+ reftable_stack_destroy(st_default);
+ clear_dir(dir);
+}
+
+static void test_log2(void)
+{
+ EXPECT(1 == fastlog2(3));
+ EXPECT(2 == fastlog2(4));
+ EXPECT(2 == fastlog2(5));
+}
+
+static void test_sizes_to_segments(void)
+{
+ uint64_t sizes[] = { 2, 3, 4, 5, 7, 9 };
+ /* .................0 1 2 3 4 5 */
+
+ int seglen = 0;
+ struct segment *segs =
+ sizes_to_segments(&seglen, sizes, ARRAY_SIZE(sizes));
+ EXPECT(segs[2].log == 3);
+ EXPECT(segs[2].start == 5);
+ EXPECT(segs[2].end == 6);
+
+ EXPECT(segs[1].log == 2);
+ EXPECT(segs[1].start == 2);
+ EXPECT(segs[1].end == 5);
+ reftable_free(segs);
+}
+
+static void test_sizes_to_segments_empty(void)
+{
+ int seglen = 0;
+ struct segment *segs = sizes_to_segments(&seglen, NULL, 0);
+ EXPECT(seglen == 0);
+ reftable_free(segs);
+}
+
+static void test_sizes_to_segments_all_equal(void)
+{
+ uint64_t sizes[] = { 5, 5 };
+
+ int seglen = 0;
+ struct segment *segs =
+ sizes_to_segments(&seglen, sizes, ARRAY_SIZE(sizes));
+ EXPECT(seglen == 1);
+ EXPECT(segs[0].start == 0);
+ EXPECT(segs[0].end == 2);
+ reftable_free(segs);
+}
+
+static void test_suggest_compaction_segment(void)
+{
+ uint64_t sizes[] = { 128, 64, 17, 16, 9, 9, 9, 16, 16 };
+ /* .................0 1 2 3 4 5 6 */
+ struct segment min =
+ suggest_compaction_segment(sizes, ARRAY_SIZE(sizes));
+ EXPECT(min.start == 2);
+ EXPECT(min.end == 7);
+}
+
+static void test_suggest_compaction_segment_nothing(void)
+{
+ uint64_t sizes[] = { 64, 32, 16, 8, 4, 2 };
+ struct segment result =
+ suggest_compaction_segment(sizes, ARRAY_SIZE(sizes));
+ EXPECT(result.start == result.end);
+}
+
+static void test_reflog_expire(void)
+{
+ char *dir = get_tmp_dir(__LINE__);
+
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st = NULL;
+ struct reftable_log_record logs[20] = { { NULL } };
+ int N = ARRAY_SIZE(logs) - 1;
+ int i = 0;
+ int err;
+ struct reftable_log_expiry_config expiry = {
+ .time = 10,
+ };
+ struct reftable_log_record log = { NULL };
+
+
+ err = reftable_new_stack(&st, dir, cfg);
+ EXPECT_ERR(err);
+
+ for (i = 1; i <= N; i++) {
+ char buf[256];
+ snprintf(buf, sizeof(buf), "branch%02d", i);
+
+ logs[i].refname = xstrdup(buf);
+ logs[i].update_index = i;
+ logs[i].value_type = REFTABLE_LOG_UPDATE;
+ logs[i].value.update.time = i;
+ logs[i].value.update.new_hash = reftable_malloc(GIT_SHA1_RAWSZ);
+ logs[i].value.update.email = xstrdup("identity@invalid");
+ set_test_hash(logs[i].value.update.new_hash, i);
+ }
+
+ for (i = 1; i <= N; i++) {
+ struct write_log_arg arg = {
+ .log = &logs[i],
+ .update_index = reftable_stack_next_update_index(st),
+ };
+ int err = reftable_stack_add(st, &write_test_log, &arg);
+ EXPECT_ERR(err);
+ }
+
+ err = reftable_stack_compact_all(st, NULL);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_compact_all(st, &expiry);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_read_log(st, logs[9].refname, &log);
+ EXPECT(err == 1);
+
+ err = reftable_stack_read_log(st, logs[11].refname, &log);
+ EXPECT_ERR(err);
+
+ expiry.min_update_index = 15;
+ err = reftable_stack_compact_all(st, &expiry);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_read_log(st, logs[14].refname, &log);
+ EXPECT(err == 1);
+
+ err = reftable_stack_read_log(st, logs[16].refname, &log);
+ EXPECT_ERR(err);
+
+ /* cleanup */
+ reftable_stack_destroy(st);
+ for (i = 0; i <= N; i++) {
+ reftable_log_record_release(&logs[i]);
+ }
+ clear_dir(dir);
+ reftable_log_record_release(&log);
+}
+
+static int write_nothing(struct reftable_writer *wr, void *arg)
+{
+ reftable_writer_set_limits(wr, 1, 1);
+ return 0;
+}
+
+static void test_empty_add(void)
+{
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st = NULL;
+ int err;
+ char *dir = get_tmp_dir(__LINE__);
+
+ struct reftable_stack *st2 = NULL;
+
+
+ err = reftable_new_stack(&st, dir, cfg);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_add(st, &write_nothing, NULL);
+ EXPECT_ERR(err);
+
+ err = reftable_new_stack(&st2, dir, cfg);
+ EXPECT_ERR(err);
+ clear_dir(dir);
+ reftable_stack_destroy(st);
+ reftable_stack_destroy(st2);
+}
+
+static void test_reftable_stack_auto_compaction(void)
+{
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st = NULL;
+ char *dir = get_tmp_dir(__LINE__);
+
+ int err, i;
+ int N = 100;
+
+ err = reftable_new_stack(&st, dir, cfg);
+ EXPECT_ERR(err);
+
+ st->disable_auto_compact = 1; /* call manually below for coverage. */
+ for (i = 0; i < N; i++) {
+ char name[100];
+ struct reftable_ref_record ref = {
+ .refname = name,
+ .update_index = reftable_stack_next_update_index(st),
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "master",
+ };
+ snprintf(name, sizeof(name), "branch%04d", i);
+
+ err = reftable_stack_add(st, &write_test_ref, &ref);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_auto_compact(st);
+ EXPECT_ERR(err);
+ EXPECT(i < 3 || st->merged->stack_len < 2 * fastlog2(i));
+ }
+
+ EXPECT(reftable_stack_compaction_stats(st)->entries_written <
+ (uint64_t)(N * fastlog2(N)));
+
+ reftable_stack_destroy(st);
+ clear_dir(dir);
+}
+
+static void test_reftable_stack_compaction_concurrent(void)
+{
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st1 = NULL, *st2 = NULL;
+ char *dir = get_tmp_dir(__LINE__);
+
+ int err, i;
+ int N = 3;
+
+ err = reftable_new_stack(&st1, dir, cfg);
+ EXPECT_ERR(err);
+
+ for (i = 0; i < N; i++) {
+ char name[100];
+ struct reftable_ref_record ref = {
+ .refname = name,
+ .update_index = reftable_stack_next_update_index(st1),
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "master",
+ };
+ snprintf(name, sizeof(name), "branch%04d", i);
+
+ err = reftable_stack_add(st1, &write_test_ref, &ref);
+ EXPECT_ERR(err);
+ }
+
+ err = reftable_new_stack(&st2, dir, cfg);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_compact_all(st1, NULL);
+ EXPECT_ERR(err);
+
+ reftable_stack_destroy(st1);
+ reftable_stack_destroy(st2);
+
+ EXPECT(count_dir_entries(dir) == 2);
+ clear_dir(dir);
+}
+
+static void unclean_stack_close(struct reftable_stack *st)
+{
+ /* break abstraction boundary to simulate unclean shutdown. */
+ int i = 0;
+ for (; i < st->readers_len; i++) {
+ reftable_reader_free(st->readers[i]);
+ }
+ st->readers_len = 0;
+ FREE_AND_NULL(st->readers);
+}
+
+static void test_reftable_stack_compaction_concurrent_clean(void)
+{
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st1 = NULL, *st2 = NULL, *st3 = NULL;
+ char *dir = get_tmp_dir(__LINE__);
+
+ int err, i;
+ int N = 3;
+
+ err = reftable_new_stack(&st1, dir, cfg);
+ EXPECT_ERR(err);
+
+ for (i = 0; i < N; i++) {
+ char name[100];
+ struct reftable_ref_record ref = {
+ .refname = name,
+ .update_index = reftable_stack_next_update_index(st1),
+ .value_type = REFTABLE_REF_SYMREF,
+ .value.symref = "master",
+ };
+ snprintf(name, sizeof(name), "branch%04d", i);
+
+ err = reftable_stack_add(st1, &write_test_ref, &ref);
+ EXPECT_ERR(err);
+ }
+
+ err = reftable_new_stack(&st2, dir, cfg);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_compact_all(st1, NULL);
+ EXPECT_ERR(err);
+
+ unclean_stack_close(st1);
+ unclean_stack_close(st2);
+
+ err = reftable_new_stack(&st3, dir, cfg);
+ EXPECT_ERR(err);
+
+ err = reftable_stack_clean(st3);
+ EXPECT_ERR(err);
+ EXPECT(count_dir_entries(dir) == 2);
+
+ reftable_stack_destroy(st1);
+ reftable_stack_destroy(st2);
+ reftable_stack_destroy(st3);
+
+ clear_dir(dir);
+}
+
+int stack_test_main(int argc, const char *argv[])
+{
+ RUN_TEST(test_empty_add);
+ RUN_TEST(test_log2);
+ RUN_TEST(test_names_equal);
+ RUN_TEST(test_parse_names);
+ RUN_TEST(test_read_file);
+ RUN_TEST(test_reflog_expire);
+ RUN_TEST(test_reftable_stack_add);
+ RUN_TEST(test_reftable_stack_add_one);
+ RUN_TEST(test_reftable_stack_auto_compaction);
+ RUN_TEST(test_reftable_stack_compaction_concurrent);
+ RUN_TEST(test_reftable_stack_compaction_concurrent_clean);
+ RUN_TEST(test_reftable_stack_hash_id);
+ RUN_TEST(test_reftable_stack_lock_failure);
+ RUN_TEST(test_reftable_stack_log_normalize);
+ RUN_TEST(test_reftable_stack_tombstone);
+ RUN_TEST(test_reftable_stack_transaction_api);
+ RUN_TEST(test_reftable_stack_update_index_check);
+ RUN_TEST(test_reftable_stack_uptodate);
+ RUN_TEST(test_reftable_stack_validate_refname);
+ RUN_TEST(test_sizes_to_segments);
+ RUN_TEST(test_sizes_to_segments_all_equal);
+ RUN_TEST(test_sizes_to_segments_empty);
+ RUN_TEST(test_suggest_compaction_segment);
+ RUN_TEST(test_suggest_compaction_segment_nothing);
+ return 0;
+}
diff --git a/reftable/system.h b/reftable/system.h
new file mode 100644
index 0000000..18f9207
--- /dev/null
+++ b/reftable/system.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef SYSTEM_H
+#define SYSTEM_H
+
+/* This header glues the reftable library to the rest of Git */
+
+#include "git-compat-util.h"
+#include "strbuf.h"
+#include "hash.h" /* hash ID, sizes.*/
+#include "dir.h" /* remove_dir_recursively, for tests.*/
+
+int hash_size(uint32_t id);
+
+#endif
diff --git a/reftable/test_framework.c b/reftable/test_framework.c
new file mode 100644
index 0000000..84ac972
--- /dev/null
+++ b/reftable/test_framework.c
@@ -0,0 +1,23 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "system.h"
+#include "test_framework.h"
+
+#include "basics.h"
+
+void set_test_hash(uint8_t *p, int i)
+{
+ memset(p, (uint8_t)i, hash_size(GIT_SHA1_FORMAT_ID));
+}
+
+ssize_t strbuf_add_void(void *b, const void *data, size_t sz)
+{
+ strbuf_add(b, data, sz);
+ return sz;
+}
diff --git a/reftable/test_framework.h b/reftable/test_framework.h
new file mode 100644
index 0000000..774cb27
--- /dev/null
+++ b/reftable/test_framework.h
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef TEST_FRAMEWORK_H
+#define TEST_FRAMEWORK_H
+
+#include "system.h"
+#include "reftable-error.h"
+
+#define EXPECT_ERR(c) \
+ if (c != 0) { \
+ fflush(stderr); \
+ fflush(stdout); \
+ fprintf(stderr, "%s: %d: error == %d (%s), want 0\n", \
+ __FILE__, __LINE__, c, reftable_error_str(c)); \
+ abort(); \
+ }
+
+#define EXPECT_STREQ(a, b) \
+ if (strcmp(a, b)) { \
+ fflush(stderr); \
+ fflush(stdout); \
+ fprintf(stderr, "%s:%d: %s (%s) != %s (%s)\n", __FILE__, \
+ __LINE__, #a, a, #b, b); \
+ abort(); \
+ }
+
+#define EXPECT(c) \
+ if (!(c)) { \
+ fflush(stderr); \
+ fflush(stdout); \
+ fprintf(stderr, "%s: %d: failed assertion %s\n", __FILE__, \
+ __LINE__, #c); \
+ abort(); \
+ }
+
+#define RUN_TEST(f) \
+ fprintf(stderr, "running %s\n", #f); \
+ fflush(stderr); \
+ f();
+
+void set_test_hash(uint8_t *p, int i);
+
+/* Like strbuf_add, but suitable for passing to reftable_new_writer
+ */
+ssize_t strbuf_add_void(void *b, const void *data, size_t sz);
+
+#endif
diff --git a/reftable/tree.c b/reftable/tree.c
new file mode 100644
index 0000000..b8899e0
--- /dev/null
+++ b/reftable/tree.c
@@ -0,0 +1,63 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "tree.h"
+
+#include "basics.h"
+#include "system.h"
+
+struct tree_node *tree_search(void *key, struct tree_node **rootp,
+ int (*compare)(const void *, const void *),
+ int insert)
+{
+ int res;
+ if (!*rootp) {
+ if (!insert) {
+ return NULL;
+ } else {
+ struct tree_node *n =
+ reftable_calloc(sizeof(struct tree_node));
+ n->key = key;
+ *rootp = n;
+ return *rootp;
+ }
+ }
+
+ res = compare(key, (*rootp)->key);
+ if (res < 0)
+ return tree_search(key, &(*rootp)->left, compare, insert);
+ else if (res > 0)
+ return tree_search(key, &(*rootp)->right, compare, insert);
+ return *rootp;
+}
+
+void infix_walk(struct tree_node *t, void (*action)(void *arg, void *key),
+ void *arg)
+{
+ if (t->left) {
+ infix_walk(t->left, action, arg);
+ }
+ action(arg, t->key);
+ if (t->right) {
+ infix_walk(t->right, action, arg);
+ }
+}
+
+void tree_free(struct tree_node *t)
+{
+ if (!t) {
+ return;
+ }
+ if (t->left) {
+ tree_free(t->left);
+ }
+ if (t->right) {
+ tree_free(t->right);
+ }
+ reftable_free(t);
+}
diff --git a/reftable/tree.h b/reftable/tree.h
new file mode 100644
index 0000000..fbdd002
--- /dev/null
+++ b/reftable/tree.h
@@ -0,0 +1,34 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef TREE_H
+#define TREE_H
+
+/* tree_node is a generic binary search tree. */
+struct tree_node {
+ void *key;
+ struct tree_node *left, *right;
+};
+
+/* looks for `key` in `rootp` using `compare` as comparison function. If insert
+ * is set, insert the key if it's not found. Else, return NULL.
+ */
+struct tree_node *tree_search(void *key, struct tree_node **rootp,
+ int (*compare)(const void *, const void *),
+ int insert);
+
+/* performs an infix walk of the tree. */
+void infix_walk(struct tree_node *t, void (*action)(void *arg, void *key),
+ void *arg);
+
+/*
+ * deallocates the tree nodes recursively. Keys should be deallocated separately
+ * by walking over the tree. */
+void tree_free(struct tree_node *t);
+
+#endif
diff --git a/reftable/tree_test.c b/reftable/tree_test.c
new file mode 100644
index 0000000..cbff125
--- /dev/null
+++ b/reftable/tree_test.c
@@ -0,0 +1,61 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "tree.h"
+
+#include "basics.h"
+#include "record.h"
+#include "test_framework.h"
+#include "reftable-tests.h"
+
+static int test_compare(const void *a, const void *b)
+{
+ return (char *)a - (char *)b;
+}
+
+struct curry {
+ void *last;
+};
+
+static void check_increasing(void *arg, void *key)
+{
+ struct curry *c = arg;
+ if (c->last) {
+ EXPECT(test_compare(c->last, key) < 0);
+ }
+ c->last = key;
+}
+
+static void test_tree(void)
+{
+ struct tree_node *root = NULL;
+
+ void *values[11] = { NULL };
+ struct tree_node *nodes[11] = { NULL };
+ int i = 1;
+ struct curry c = { NULL };
+ do {
+ nodes[i] = tree_search(values + i, &root, &test_compare, 1);
+ i = (i * 7) % 11;
+ } while (i != 1);
+
+ for (i = 1; i < ARRAY_SIZE(nodes); i++) {
+ EXPECT(values + i == nodes[i]->key);
+ EXPECT(nodes[i] ==
+ tree_search(values + i, &root, &test_compare, 0));
+ }
+
+ infix_walk(root, check_increasing, &c);
+ tree_free(root);
+}
+
+int tree_test_main(int argc, const char *argv[])
+{
+ RUN_TEST(test_tree);
+ return 0;
+}
diff --git a/reftable/writer.c b/reftable/writer.c
new file mode 100644
index 0000000..2e322a5
--- /dev/null
+++ b/reftable/writer.c
@@ -0,0 +1,707 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "writer.h"
+
+#include "system.h"
+
+#include "block.h"
+#include "constants.h"
+#include "record.h"
+#include "tree.h"
+#include "reftable-error.h"
+
+/* finishes a block, and writes it to storage */
+static int writer_flush_block(struct reftable_writer *w);
+
+/* deallocates memory related to the index */
+static void writer_clear_index(struct reftable_writer *w);
+
+/* finishes writing a 'r' (refs) or 'g' (reflogs) section */
+static int writer_finish_public_section(struct reftable_writer *w);
+
+static struct reftable_block_stats *
+writer_reftable_block_stats(struct reftable_writer *w, uint8_t typ)
+{
+ switch (typ) {
+ case 'r':
+ return &w->stats.ref_stats;
+ case 'o':
+ return &w->stats.obj_stats;
+ case 'i':
+ return &w->stats.idx_stats;
+ case 'g':
+ return &w->stats.log_stats;
+ }
+ abort();
+ return NULL;
+}
+
+/* write data, queuing the padding for the next write. Returns negative for
+ * error. */
+static int padded_write(struct reftable_writer *w, uint8_t *data, size_t len,
+ int padding)
+{
+ int n = 0;
+ if (w->pending_padding > 0) {
+ uint8_t *zeroed = reftable_calloc(w->pending_padding);
+ int n = w->write(w->write_arg, zeroed, w->pending_padding);
+ if (n < 0)
+ return n;
+
+ w->pending_padding = 0;
+ reftable_free(zeroed);
+ }
+
+ w->pending_padding = padding;
+ n = w->write(w->write_arg, data, len);
+ if (n < 0)
+ return n;
+ n += padding;
+ return 0;
+}
+
+static void options_set_defaults(struct reftable_write_options *opts)
+{
+ if (opts->restart_interval == 0) {
+ opts->restart_interval = 16;
+ }
+
+ if (opts->hash_id == 0) {
+ opts->hash_id = GIT_SHA1_FORMAT_ID;
+ }
+ if (opts->block_size == 0) {
+ opts->block_size = DEFAULT_BLOCK_SIZE;
+ }
+}
+
+static int writer_version(struct reftable_writer *w)
+{
+ return (w->opts.hash_id == 0 || w->opts.hash_id == GIT_SHA1_FORMAT_ID) ?
+ 1 :
+ 2;
+}
+
+static int writer_write_header(struct reftable_writer *w, uint8_t *dest)
+{
+ memcpy(dest, "REFT", 4);
+
+ dest[4] = writer_version(w);
+
+ put_be24(dest + 5, w->opts.block_size);
+ put_be64(dest + 8, w->min_update_index);
+ put_be64(dest + 16, w->max_update_index);
+ if (writer_version(w) == 2) {
+ put_be32(dest + 24, w->opts.hash_id);
+ }
+ return header_size(writer_version(w));
+}
+
+static void writer_reinit_block_writer(struct reftable_writer *w, uint8_t typ)
+{
+ int block_start = 0;
+ if (w->next == 0) {
+ block_start = header_size(writer_version(w));
+ }
+
+ strbuf_release(&w->last_key);
+ block_writer_init(&w->block_writer_data, typ, w->block,
+ w->opts.block_size, block_start,
+ hash_size(w->opts.hash_id));
+ w->block_writer = &w->block_writer_data;
+ w->block_writer->restart_interval = w->opts.restart_interval;
+}
+
+static struct strbuf reftable_empty_strbuf = STRBUF_INIT;
+
+struct reftable_writer *
+reftable_new_writer(ssize_t (*writer_func)(void *, const void *, size_t),
+ void *writer_arg, struct reftable_write_options *opts)
+{
+ struct reftable_writer *wp =
+ reftable_calloc(sizeof(struct reftable_writer));
+ strbuf_init(&wp->block_writer_data.last_key, 0);
+ options_set_defaults(opts);
+ if (opts->block_size >= (1 << 24)) {
+ /* TODO - error return? */
+ abort();
+ }
+ wp->last_key = reftable_empty_strbuf;
+ wp->block = reftable_calloc(opts->block_size);
+ wp->write = writer_func;
+ wp->write_arg = writer_arg;
+ wp->opts = *opts;
+ writer_reinit_block_writer(wp, BLOCK_TYPE_REF);
+
+ return wp;
+}
+
+void reftable_writer_set_limits(struct reftable_writer *w, uint64_t min,
+ uint64_t max)
+{
+ w->min_update_index = min;
+ w->max_update_index = max;
+}
+
+void reftable_writer_free(struct reftable_writer *w)
+{
+ if (!w)
+ return;
+ reftable_free(w->block);
+ reftable_free(w);
+}
+
+struct obj_index_tree_node {
+ struct strbuf hash;
+ uint64_t *offsets;
+ size_t offset_len;
+ size_t offset_cap;
+};
+
+#define OBJ_INDEX_TREE_NODE_INIT \
+ { \
+ .hash = STRBUF_INIT \
+ }
+
+static int obj_index_tree_node_compare(const void *a, const void *b)
+{
+ return strbuf_cmp(&((const struct obj_index_tree_node *)a)->hash,
+ &((const struct obj_index_tree_node *)b)->hash);
+}
+
+static void writer_index_hash(struct reftable_writer *w, struct strbuf *hash)
+{
+ uint64_t off = w->next;
+
+ struct obj_index_tree_node want = { .hash = *hash };
+
+ struct tree_node *node = tree_search(&want, &w->obj_index_tree,
+ &obj_index_tree_node_compare, 0);
+ struct obj_index_tree_node *key = NULL;
+ if (!node) {
+ struct obj_index_tree_node empty = OBJ_INDEX_TREE_NODE_INIT;
+ key = reftable_malloc(sizeof(struct obj_index_tree_node));
+ *key = empty;
+
+ strbuf_reset(&key->hash);
+ strbuf_addbuf(&key->hash, hash);
+ tree_search((void *)key, &w->obj_index_tree,
+ &obj_index_tree_node_compare, 1);
+ } else {
+ key = node->key;
+ }
+
+ if (key->offset_len > 0 && key->offsets[key->offset_len - 1] == off) {
+ return;
+ }
+
+ if (key->offset_len == key->offset_cap) {
+ key->offset_cap = 2 * key->offset_cap + 1;
+ key->offsets = reftable_realloc(
+ key->offsets, sizeof(uint64_t) * key->offset_cap);
+ }
+
+ key->offsets[key->offset_len++] = off;
+}
+
+static int writer_add_record(struct reftable_writer *w,
+ struct reftable_record *rec)
+{
+ struct strbuf key = STRBUF_INIT;
+ int err = -1;
+ reftable_record_key(rec, &key);
+ if (strbuf_cmp(&w->last_key, &key) >= 0) {
+ err = REFTABLE_API_ERROR;
+ goto done;
+ }
+
+ strbuf_reset(&w->last_key);
+ strbuf_addbuf(&w->last_key, &key);
+ if (!w->block_writer) {
+ writer_reinit_block_writer(w, reftable_record_type(rec));
+ }
+
+ assert(block_writer_type(w->block_writer) == reftable_record_type(rec));
+
+ if (block_writer_add(w->block_writer, rec) == 0) {
+ err = 0;
+ goto done;
+ }
+
+ err = writer_flush_block(w);
+ if (err < 0) {
+ goto done;
+ }
+
+ writer_reinit_block_writer(w, reftable_record_type(rec));
+ err = block_writer_add(w->block_writer, rec);
+ if (err == -1) {
+ /* we are writing into memory, so an error can only mean it
+ * doesn't fit. */
+ err = REFTABLE_ENTRY_TOO_BIG_ERROR;
+ goto done;
+ }
+
+done:
+ strbuf_release(&key);
+ return err;
+}
+
+int reftable_writer_add_ref(struct reftable_writer *w,
+ struct reftable_ref_record *ref)
+{
+ struct reftable_record rec = {
+ .type = BLOCK_TYPE_REF,
+ .u = {
+ .ref = *ref
+ },
+ };
+ int err = 0;
+
+ if (!ref->refname)
+ return REFTABLE_API_ERROR;
+ if (ref->update_index < w->min_update_index ||
+ ref->update_index > w->max_update_index)
+ return REFTABLE_API_ERROR;
+
+ rec.u.ref.update_index -= w->min_update_index;
+
+ err = writer_add_record(w, &rec);
+ if (err < 0)
+ return err;
+
+ if (!w->opts.skip_index_objects && reftable_ref_record_val1(ref)) {
+ struct strbuf h = STRBUF_INIT;
+ strbuf_add(&h, (char *)reftable_ref_record_val1(ref),
+ hash_size(w->opts.hash_id));
+ writer_index_hash(w, &h);
+ strbuf_release(&h);
+ }
+
+ if (!w->opts.skip_index_objects && reftable_ref_record_val2(ref)) {
+ struct strbuf h = STRBUF_INIT;
+ strbuf_add(&h, reftable_ref_record_val2(ref),
+ hash_size(w->opts.hash_id));
+ writer_index_hash(w, &h);
+ strbuf_release(&h);
+ }
+ return 0;
+}
+
+int reftable_writer_add_refs(struct reftable_writer *w,
+ struct reftable_ref_record *refs, int n)
+{
+ int err = 0;
+ int i = 0;
+ QSORT(refs, n, reftable_ref_record_compare_name);
+ for (i = 0; err == 0 && i < n; i++) {
+ err = reftable_writer_add_ref(w, &refs[i]);
+ }
+ return err;
+}
+
+static int reftable_writer_add_log_verbatim(struct reftable_writer *w,
+ struct reftable_log_record *log)
+{
+ struct reftable_record rec = {
+ .type = BLOCK_TYPE_LOG,
+ .u = {
+ .log = *log,
+ },
+ };
+ if (w->block_writer &&
+ block_writer_type(w->block_writer) == BLOCK_TYPE_REF) {
+ int err = writer_finish_public_section(w);
+ if (err < 0)
+ return err;
+ }
+
+ w->next -= w->pending_padding;
+ w->pending_padding = 0;
+ return writer_add_record(w, &rec);
+}
+
+int reftable_writer_add_log(struct reftable_writer *w,
+ struct reftable_log_record *log)
+{
+ char *input_log_message = NULL;
+ struct strbuf cleaned_message = STRBUF_INIT;
+ int err = 0;
+
+ if (log->value_type == REFTABLE_LOG_DELETION)
+ return reftable_writer_add_log_verbatim(w, log);
+
+ if (!log->refname)
+ return REFTABLE_API_ERROR;
+
+ input_log_message = log->value.update.message;
+ if (!w->opts.exact_log_message && log->value.update.message) {
+ strbuf_addstr(&cleaned_message, log->value.update.message);
+ while (cleaned_message.len &&
+ cleaned_message.buf[cleaned_message.len - 1] == '\n')
+ strbuf_setlen(&cleaned_message,
+ cleaned_message.len - 1);
+ if (strchr(cleaned_message.buf, '\n')) {
+ /* multiple lines not allowed. */
+ err = REFTABLE_API_ERROR;
+ goto done;
+ }
+ strbuf_addstr(&cleaned_message, "\n");
+ log->value.update.message = cleaned_message.buf;
+ }
+
+ err = reftable_writer_add_log_verbatim(w, log);
+ log->value.update.message = input_log_message;
+done:
+ strbuf_release(&cleaned_message);
+ return err;
+}
+
+int reftable_writer_add_logs(struct reftable_writer *w,
+ struct reftable_log_record *logs, int n)
+{
+ int err = 0;
+ int i = 0;
+ QSORT(logs, n, reftable_log_record_compare_key);
+
+ for (i = 0; err == 0 && i < n; i++) {
+ err = reftable_writer_add_log(w, &logs[i]);
+ }
+ return err;
+}
+
+static int writer_finish_section(struct reftable_writer *w)
+{
+ uint8_t typ = block_writer_type(w->block_writer);
+ uint64_t index_start = 0;
+ int max_level = 0;
+ int threshold = w->opts.unpadded ? 1 : 3;
+ int before_blocks = w->stats.idx_stats.blocks;
+ int err = writer_flush_block(w);
+ int i = 0;
+ struct reftable_block_stats *bstats = NULL;
+ if (err < 0)
+ return err;
+
+ while (w->index_len > threshold) {
+ struct reftable_index_record *idx = NULL;
+ int idx_len = 0;
+
+ max_level++;
+ index_start = w->next;
+ writer_reinit_block_writer(w, BLOCK_TYPE_INDEX);
+
+ idx = w->index;
+ idx_len = w->index_len;
+
+ w->index = NULL;
+ w->index_len = 0;
+ w->index_cap = 0;
+ for (i = 0; i < idx_len; i++) {
+ struct reftable_record rec = {
+ .type = BLOCK_TYPE_INDEX,
+ .u = {
+ .idx = idx[i],
+ },
+ };
+ if (block_writer_add(w->block_writer, &rec) == 0) {
+ continue;
+ }
+
+ err = writer_flush_block(w);
+ if (err < 0)
+ return err;
+
+ writer_reinit_block_writer(w, BLOCK_TYPE_INDEX);
+
+ err = block_writer_add(w->block_writer, &rec);
+ if (err != 0) {
+ /* write into fresh block should always succeed
+ */
+ abort();
+ }
+ }
+ for (i = 0; i < idx_len; i++) {
+ strbuf_release(&idx[i].last_key);
+ }
+ reftable_free(idx);
+ }
+
+ writer_clear_index(w);
+
+ err = writer_flush_block(w);
+ if (err < 0)
+ return err;
+
+ bstats = writer_reftable_block_stats(w, typ);
+ bstats->index_blocks = w->stats.idx_stats.blocks - before_blocks;
+ bstats->index_offset = index_start;
+ bstats->max_index_level = max_level;
+
+ /* Reinit lastKey, as the next section can start with any key. */
+ w->last_key.len = 0;
+
+ return 0;
+}
+
+struct common_prefix_arg {
+ struct strbuf *last;
+ int max;
+};
+
+static void update_common(void *void_arg, void *key)
+{
+ struct common_prefix_arg *arg = void_arg;
+ struct obj_index_tree_node *entry = key;
+ if (arg->last) {
+ int n = common_prefix_size(&entry->hash, arg->last);
+ if (n > arg->max) {
+ arg->max = n;
+ }
+ }
+ arg->last = &entry->hash;
+}
+
+struct write_record_arg {
+ struct reftable_writer *w;
+ int err;
+};
+
+static void write_object_record(void *void_arg, void *key)
+{
+ struct write_record_arg *arg = void_arg;
+ struct obj_index_tree_node *entry = key;
+ struct reftable_record
+ rec = { .type = BLOCK_TYPE_OBJ,
+ .u.obj = {
+ .hash_prefix = (uint8_t *)entry->hash.buf,
+ .hash_prefix_len = arg->w->stats.object_id_len,
+ .offsets = entry->offsets,
+ .offset_len = entry->offset_len,
+ } };
+ if (arg->err < 0)
+ goto done;
+
+ arg->err = block_writer_add(arg->w->block_writer, &rec);
+ if (arg->err == 0)
+ goto done;
+
+ arg->err = writer_flush_block(arg->w);
+ if (arg->err < 0)
+ goto done;
+
+ writer_reinit_block_writer(arg->w, BLOCK_TYPE_OBJ);
+ arg->err = block_writer_add(arg->w->block_writer, &rec);
+ if (arg->err == 0)
+ goto done;
+
+ rec.u.obj.offset_len = 0;
+ arg->err = block_writer_add(arg->w->block_writer, &rec);
+
+ /* Should be able to write into a fresh block. */
+ assert(arg->err == 0);
+
+done:;
+}
+
+static void object_record_free(void *void_arg, void *key)
+{
+ struct obj_index_tree_node *entry = key;
+
+ FREE_AND_NULL(entry->offsets);
+ strbuf_release(&entry->hash);
+ reftable_free(entry);
+}
+
+static int writer_dump_object_index(struct reftable_writer *w)
+{
+ struct write_record_arg closure = { .w = w };
+ struct common_prefix_arg common = {
+ .max = 1, /* obj_id_len should be >= 2. */
+ };
+ if (w->obj_index_tree) {
+ infix_walk(w->obj_index_tree, &update_common, &common);
+ }
+ w->stats.object_id_len = common.max + 1;
+
+ writer_reinit_block_writer(w, BLOCK_TYPE_OBJ);
+
+ if (w->obj_index_tree) {
+ infix_walk(w->obj_index_tree, &write_object_record, &closure);
+ }
+
+ if (closure.err < 0)
+ return closure.err;
+ return writer_finish_section(w);
+}
+
+static int writer_finish_public_section(struct reftable_writer *w)
+{
+ uint8_t typ = 0;
+ int err = 0;
+
+ if (!w->block_writer)
+ return 0;
+
+ typ = block_writer_type(w->block_writer);
+ err = writer_finish_section(w);
+ if (err < 0)
+ return err;
+ if (typ == BLOCK_TYPE_REF && !w->opts.skip_index_objects &&
+ w->stats.ref_stats.index_blocks > 0) {
+ err = writer_dump_object_index(w);
+ if (err < 0)
+ return err;
+ }
+
+ if (w->obj_index_tree) {
+ infix_walk(w->obj_index_tree, &object_record_free, NULL);
+ tree_free(w->obj_index_tree);
+ w->obj_index_tree = NULL;
+ }
+
+ w->block_writer = NULL;
+ return 0;
+}
+
+int reftable_writer_close(struct reftable_writer *w)
+{
+ uint8_t footer[72];
+ uint8_t *p = footer;
+ int err = writer_finish_public_section(w);
+ int empty_table = w->next == 0;
+ if (err != 0)
+ goto done;
+ w->pending_padding = 0;
+ if (empty_table) {
+ /* Empty tables need a header anyway. */
+ uint8_t header[28];
+ int n = writer_write_header(w, header);
+ err = padded_write(w, header, n, 0);
+ if (err < 0)
+ goto done;
+ }
+
+ p += writer_write_header(w, footer);
+ put_be64(p, w->stats.ref_stats.index_offset);
+ p += 8;
+ put_be64(p, (w->stats.obj_stats.offset) << 5 | w->stats.object_id_len);
+ p += 8;
+ put_be64(p, w->stats.obj_stats.index_offset);
+ p += 8;
+
+ put_be64(p, w->stats.log_stats.offset);
+ p += 8;
+ put_be64(p, w->stats.log_stats.index_offset);
+ p += 8;
+
+ put_be32(p, crc32(0, footer, p - footer));
+ p += 4;
+
+ err = padded_write(w, footer, footer_size(writer_version(w)), 0);
+ if (err < 0)
+ goto done;
+
+ if (empty_table) {
+ err = REFTABLE_EMPTY_TABLE_ERROR;
+ goto done;
+ }
+
+done:
+ /* free up memory. */
+ block_writer_release(&w->block_writer_data);
+ writer_clear_index(w);
+ strbuf_release(&w->last_key);
+ return err;
+}
+
+static void writer_clear_index(struct reftable_writer *w)
+{
+ int i = 0;
+ for (i = 0; i < w->index_len; i++) {
+ strbuf_release(&w->index[i].last_key);
+ }
+
+ FREE_AND_NULL(w->index);
+ w->index_len = 0;
+ w->index_cap = 0;
+}
+
+static const int debug = 0;
+
+static int writer_flush_nonempty_block(struct reftable_writer *w)
+{
+ uint8_t typ = block_writer_type(w->block_writer);
+ struct reftable_block_stats *bstats =
+ writer_reftable_block_stats(w, typ);
+ uint64_t block_typ_off = (bstats->blocks == 0) ? w->next : 0;
+ int raw_bytes = block_writer_finish(w->block_writer);
+ int padding = 0;
+ int err = 0;
+ struct reftable_index_record ir = { .last_key = STRBUF_INIT };
+ if (raw_bytes < 0)
+ return raw_bytes;
+
+ if (!w->opts.unpadded && typ != BLOCK_TYPE_LOG) {
+ padding = w->opts.block_size - raw_bytes;
+ }
+
+ if (block_typ_off > 0) {
+ bstats->offset = block_typ_off;
+ }
+
+ bstats->entries += w->block_writer->entries;
+ bstats->restarts += w->block_writer->restart_len;
+ bstats->blocks++;
+ w->stats.blocks++;
+
+ if (debug) {
+ fprintf(stderr, "block %c off %" PRIu64 " sz %d (%d)\n", typ,
+ w->next, raw_bytes,
+ get_be24(w->block + w->block_writer->header_off + 1));
+ }
+
+ if (w->next == 0) {
+ writer_write_header(w, w->block);
+ }
+
+ err = padded_write(w, w->block, raw_bytes, padding);
+ if (err < 0)
+ return err;
+
+ if (w->index_cap == w->index_len) {
+ w->index_cap = 2 * w->index_cap + 1;
+ w->index = reftable_realloc(
+ w->index,
+ sizeof(struct reftable_index_record) * w->index_cap);
+ }
+
+ ir.offset = w->next;
+ strbuf_reset(&ir.last_key);
+ strbuf_addbuf(&ir.last_key, &w->block_writer->last_key);
+ w->index[w->index_len] = ir;
+
+ w->index_len++;
+ w->next += padding + raw_bytes;
+ w->block_writer = NULL;
+ return 0;
+}
+
+static int writer_flush_block(struct reftable_writer *w)
+{
+ if (!w->block_writer)
+ return 0;
+ if (w->block_writer->entries == 0)
+ return 0;
+ return writer_flush_nonempty_block(w);
+}
+
+const struct reftable_stats *reftable_writer_stats(struct reftable_writer *w)
+{
+ return &w->stats;
+}
diff --git a/reftable/writer.h b/reftable/writer.h
new file mode 100644
index 0000000..09b8867
--- /dev/null
+++ b/reftable/writer.h
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef WRITER_H
+#define WRITER_H
+
+#include "basics.h"
+#include "block.h"
+#include "tree.h"
+#include "reftable-writer.h"
+
+struct reftable_writer {
+ ssize_t (*write)(void *, const void *, size_t);
+ void *write_arg;
+ int pending_padding;
+ struct strbuf last_key;
+
+ /* offset of next block to write. */
+ uint64_t next;
+ uint64_t min_update_index, max_update_index;
+ struct reftable_write_options opts;
+
+ /* memory buffer for writing */
+ uint8_t *block;
+
+ /* writer for the current section. NULL or points to
+ * block_writer_data */
+ struct block_writer *block_writer;
+
+ struct block_writer block_writer_data;
+
+ /* pending index records for the current section */
+ struct reftable_index_record *index;
+ size_t index_len;
+ size_t index_cap;
+
+ /*
+ * tree for use with tsearch; used to populate the 'o' inverse OID
+ * map */
+ struct tree_node *obj_index_tree;
+
+ struct reftable_stats stats;
+};
+
+#endif
diff --git a/remote-curl.c b/remote-curl.c
index 5975103..67f178b 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -43,6 +43,7 @@ struct options {
/* see documentation of corresponding flag in fetch-pack.h */
from_promisor : 1,
+ refetch : 1,
atomic : 1,
object_format : 1,
force_if_includes : 1;
@@ -198,6 +199,9 @@ static int set_option(const char *name, const char *value)
} else if (!strcmp(name, "from-promisor")) {
options.from_promisor = 1;
return 0;
+ } else if (!strcmp(name, "refetch")) {
+ options.refetch = 1;
+ return 0;
} else if (!strcmp(name, "filter")) {
options.filter = xstrdup(value);
return 0;
@@ -1061,7 +1065,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads,
client.in = -1;
client.out = -1;
client.git_cmd = 1;
- client.argv = client_argv;
+ strvec_pushv(&client.args, client_argv);
if (start_command(&client))
exit(1);
write_or_die(client.in, preamble->buf, preamble->len);
@@ -1088,7 +1092,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads,
rpc->protocol_header = NULL;
while (!err) {
- int n = packet_read(rpc->out, NULL, NULL, rpc->buf, rpc->alloc, 0);
+ int n = packet_read(rpc->out, rpc->buf, rpc->alloc, 0);
if (!n)
break;
rpc->pos = 0;
@@ -1182,6 +1186,8 @@ static int fetch_git(struct discovery *heads,
strvec_push(&args, "--deepen-relative");
if (options.from_promisor)
strvec_push(&args, "--from-promisor");
+ if (options.refetch)
+ strvec_push(&args, "--refetch");
if (options.filter)
strvec_pushf(&args, "--filter=%s", options.filter);
strvec_push(&args, url.buf);
@@ -1472,11 +1478,12 @@ int cmd_main(int argc, const char **argv)
{
struct strbuf buf = STRBUF_INIT;
int nongit;
+ int ret = 1;
setup_git_directory_gently(&nongit);
if (argc < 2) {
error(_("remote-curl: usage: git remote-curl <remote> [<url>]"));
- return 1;
+ goto cleanup;
}
options.verbosity = 1;
@@ -1508,7 +1515,7 @@ int cmd_main(int argc, const char **argv)
if (strbuf_getline_lf(&buf, stdin) == EOF) {
if (ferror(stdin))
error(_("remote-curl: error reading command stream from git"));
- return 1;
+ goto cleanup;
}
if (buf.len == 0)
break;
@@ -1556,12 +1563,15 @@ int cmd_main(int argc, const char **argv)
break;
} else {
error(_("remote-curl: unknown command '%s' from git"), buf.buf);
- return 1;
+ goto cleanup;
}
strbuf_reset(&buf);
} while (1);
http_cleanup();
+ ret = 0;
+cleanup:
+ strbuf_release(&buf);
- return 0;
+ return ret;
}
diff --git a/remote.c b/remote.c
index 98c190a..404e1e0 100644
--- a/remote.c
+++ b/remote.c
@@ -14,6 +14,7 @@
#include "strvec.h"
#include "commit-reach.h"
#include "advice.h"
+#include "connect.h"
enum map_direction { FROM_SRC, FROM_DST };
@@ -545,6 +546,8 @@ static const char *remotes_remote_for_branch(struct remote_state *remote_state,
}
if (explicit)
*explicit = 0;
+ if (remote_state->remotes_nr == 1)
+ return remote_state->remotes[0]->name;
return "origin";
}
@@ -1947,13 +1950,9 @@ const char *branch_get_push(struct branch *branch, struct strbuf *err)
return branch->push_tracking_ref;
}
-static int ignore_symref_update(const char *refname)
+static int ignore_symref_update(const char *refname, struct strbuf *scratch)
{
- int flag;
-
- if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
- return 0; /* non-existing refs are OK */
- return (flag & REF_ISSYMREF);
+ return !refs_read_symbolic_ref(get_main_ref_store(the_repository), refname, scratch);
}
/*
@@ -1966,6 +1965,7 @@ static int ignore_symref_update(const char *refname)
static struct ref *get_expanded_map(const struct ref *remote_refs,
const struct refspec_item *refspec)
{
+ struct strbuf scratch = STRBUF_INIT;
const struct ref *ref;
struct ref *ret = NULL;
struct ref **tail = &ret;
@@ -1973,11 +1973,13 @@ static struct ref *get_expanded_map(const struct ref *remote_refs,
for (ref = remote_refs; ref; ref = ref->next) {
char *expn_name = NULL;
+ strbuf_reset(&scratch);
+
if (strchr(ref->name, '^'))
continue; /* a dereference item */
if (match_name_with_pattern(refspec->src, ref->name,
refspec->dst, &expn_name) &&
- !ignore_symref_update(expn_name)) {
+ !ignore_symref_update(expn_name, &scratch)) {
struct ref *cpy = copy_ref(ref);
cpy->peer_ref = alloc_ref(expn_name);
@@ -1989,6 +1991,7 @@ static struct ref *get_expanded_map(const struct ref *remote_refs,
free(expn_name);
}
+ strbuf_release(&scratch);
return ret;
}
@@ -2174,6 +2177,7 @@ static int stat_branch_pair(const char *branch_name, const char *base,
clear_commit_marks(theirs, ALL_REV_FLAGS);
strvec_clear(&argv);
+ release_revisions(&revs);
return 1;
}
@@ -2729,3 +2733,101 @@ void remote_state_clear(struct remote_state *remote_state)
hashmap_clear_and_free(&remote_state->remotes_hash, struct remote, ent);
hashmap_clear_and_free(&remote_state->branches_hash, struct remote, ent);
}
+
+/*
+ * Returns 1 if it was the last chop before ':'.
+ */
+static int chop_last_dir(char **remoteurl, int is_relative)
+{
+ char *rfind = find_last_dir_sep(*remoteurl);
+ if (rfind) {
+ *rfind = '\0';
+ return 0;
+ }
+
+ rfind = strrchr(*remoteurl, ':');
+ if (rfind) {
+ *rfind = '\0';
+ return 1;
+ }
+
+ if (is_relative || !strcmp(".", *remoteurl))
+ die(_("cannot strip one component off url '%s'"),
+ *remoteurl);
+
+ free(*remoteurl);
+ *remoteurl = xstrdup(".");
+ return 0;
+}
+
+char *relative_url(const char *remote_url, const char *url,
+ const char *up_path)
+{
+ int is_relative = 0;
+ int colonsep = 0;
+ char *out;
+ char *remoteurl;
+ struct strbuf sb = STRBUF_INIT;
+ size_t len;
+
+ if (!url_is_local_not_ssh(url) || is_absolute_path(url))
+ return xstrdup(url);
+
+ len = strlen(remote_url);
+ if (!len)
+ BUG("invalid empty remote_url");
+
+ remoteurl = xstrdup(remote_url);
+ if (is_dir_sep(remoteurl[len-1]))
+ remoteurl[len-1] = '\0';
+
+ if (!url_is_local_not_ssh(remoteurl) || is_absolute_path(remoteurl))
+ is_relative = 0;
+ else {
+ is_relative = 1;
+ /*
+ * Prepend a './' to ensure all relative
+ * remoteurls start with './' or '../'
+ */
+ if (!starts_with_dot_slash_native(remoteurl) &&
+ !starts_with_dot_dot_slash_native(remoteurl)) {
+ strbuf_reset(&sb);
+ strbuf_addf(&sb, "./%s", remoteurl);
+ free(remoteurl);
+ remoteurl = strbuf_detach(&sb, NULL);
+ }
+ }
+ /*
+ * When the url starts with '../', remove that and the
+ * last directory in remoteurl.
+ */
+ while (url) {
+ if (starts_with_dot_dot_slash_native(url)) {
+ url += 3;
+ colonsep |= chop_last_dir(&remoteurl, is_relative);
+ } else if (starts_with_dot_slash_native(url))
+ url += 2;
+ else
+ break;
+ }
+ strbuf_reset(&sb);
+ strbuf_addf(&sb, "%s%s%s", remoteurl, colonsep ? ":" : "/", url);
+ if (ends_with(url, "/"))
+ strbuf_setlen(&sb, sb.len - 1);
+ free(remoteurl);
+
+ if (starts_with_dot_slash_native(sb.buf))
+ out = xstrdup(sb.buf + 2);
+ else
+ out = xstrdup(sb.buf);
+
+ if (!up_path || !is_relative) {
+ strbuf_release(&sb);
+ return out;
+ }
+
+ strbuf_reset(&sb);
+ strbuf_addf(&sb, "%s%s", up_path, out);
+ free(out);
+ return strbuf_detach(&sb, NULL);
+}
diff --git a/remote.h b/remote.h
index 4a1209a..dd44024 100644
--- a/remote.h
+++ b/remote.h
@@ -409,4 +409,36 @@ int parseopt_push_cas_option(const struct option *, const char *arg, int unset);
int is_empty_cas(const struct push_cas_option *);
void apply_push_cas(struct push_cas_option *, struct remote *, struct ref *);
+/*
+ * The `url` argument is the URL that navigates to the submodule origin
+ * repo. When relative, this URL is relative to the superproject origin
+ * URL repo. The `up_path` argument, if specified, is the relative
+ * path that navigates from the submodule working tree to the superproject
+ * working tree. Returns the origin URL of the submodule.
+ *
+ * Return either an absolute URL or filesystem path (if the superproject
+ * origin URL is an absolute URL or filesystem path, respectively) or a
+ * relative file system path (if the superproject origin URL is a relative
+ * file system path).
+ *
+ * When the output is a relative file system path, the path is either
+ * relative to the submodule working tree, if up_path is specified, or to
+ * the superproject working tree otherwise.
+ *
+ * NEEDSWORK: This works incorrectly on the domain and protocol part.
+ * remote_url url outcome expectation
+ * http://a.com/b ../c http://a.com/c as is
+ * http://a.com/b/ ../c http://a.com/c same as previous line, but
+ * ignore trailing slash in url
+ * http://a.com/b ../../c http://c error out
+ * http://a.com/b ../../../c http:/c error out
+ * http://a.com/b ../../../../c http:c error out
+ * http://a.com/b ../../../../../c .:c error out
+ * http://a.com/b http://d.org/e http://d.org/e as is
+ * NEEDSWORK: Given how chop_last_dir() works, this function is broken
+ * when a local part has a colon in its path component, too.
+ */
+char *relative_url(const char *remote_url, const char *url,
+ const char *up_path);
+
#endif
diff --git a/repo-settings.c b/repo-settings.c
index b93e91a..2dfcb2b 100644
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -2,6 +2,7 @@
#include "config.h"
#include "repository.h"
#include "midx.h"
+#include "compat/fsmonitor/fsm-listen.h"
static void repo_cfg_bool(struct repository *r, const char *key, int *dest,
int def)
@@ -17,13 +18,16 @@ void prepare_repo_settings(struct repository *r)
char *strval;
int manyfiles;
+ if (!r->gitdir)
+ BUG("Cannot add settings for uninitialized repository");
+
if (r->settings.initialized++)
return;
/* Defaults */
r->settings.index_version = -1;
r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
- r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT;
+ r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_CONSECUTIVE;
/* Booleans config or default, cascades to other settings */
repo_cfg_bool(r, "feature.manyfiles", &manyfiles, 0);
@@ -78,10 +82,17 @@ void prepare_repo_settings(struct repository *r)
}
if (!repo_config_get_string(r, "fetch.negotiationalgorithm", &strval)) {
+ int fetch_default = r->settings.fetch_negotiation_algorithm;
if (!strcasecmp(strval, "skipping"))
r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
else if (!strcasecmp(strval, "noop"))
r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_NOOP;
+ else if (!strcasecmp(strval, "consecutive"))
+ r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_CONSECUTIVE;
+ else if (!strcasecmp(strval, "default"))
+ r->settings.fetch_negotiation_algorithm = fetch_default;
+ else
+ die("unknown fetch negotiation algorithm '%s'", strval);
}
/*
diff --git a/repository.c b/repository.c
index c7ea706..5d166b6 100644
--- a/repository.c
+++ b/repository.c
@@ -82,6 +82,8 @@ void repo_set_gitdir(struct repository *repo,
expand_base_dir(&repo->objects->odb->path, o->object_dir,
repo->commondir, "objects");
+ repo->objects->odb->disable_ref_updates = o->disable_ref_updates;
+
free(repo->objects->alternate_db);
repo->objects->alternate_db = xstrdup_or_null(o->alternate_db);
expand_base_dir(&repo->graft_file, o->graft_file,
@@ -238,6 +240,20 @@ int repo_submodule_init(struct repository *subrepo,
return ret;
}
+static void repo_clear_path_cache(struct repo_path_cache *cache)
+{
+ FREE_AND_NULL(cache->squash_msg);
+ FREE_AND_NULL(cache->squash_msg);
+ FREE_AND_NULL(cache->merge_msg);
+ FREE_AND_NULL(cache->merge_rr);
+ FREE_AND_NULL(cache->merge_mode);
+ FREE_AND_NULL(cache->merge_head);
+ FREE_AND_NULL(cache->merge_autostash);
+ FREE_AND_NULL(cache->auto_merge);
+ FREE_AND_NULL(cache->fetch_head);
+ FREE_AND_NULL(cache->shallow);
+}
+
void repo_clear(struct repository *repo)
{
FREE_AND_NULL(repo->gitdir);
@@ -278,6 +294,8 @@ void repo_clear(struct repository *repo)
remote_state_clear(repo->remote_state);
FREE_AND_NULL(repo->remote_state);
}
+
+ repo_clear_path_cache(&repo->cached_paths);
}
int repo_read_index(struct repository *repo)
@@ -299,6 +317,13 @@ int repo_read_index(struct repository *repo)
if (repo->settings.command_requires_full_index)
ensure_full_index(repo->index);
+ /*
+ * If sparse checkouts are in use, check whether paths with the
+ * SKIP_WORKTREE attribute are missing from the worktree; if not,
+ * clear that attribute for that path.
+ */
+ clear_skip_worktree_from_present_files(repo->index);
+
return res;
}
diff --git a/repository.h b/repository.h
index 98f9583..6cc661e 100644
--- a/repository.h
+++ b/repository.h
@@ -4,6 +4,7 @@
#include "path.h"
struct config_set;
+struct fsmonitor_settings;
struct git_hash_algo;
struct index_state;
struct lock_file;
@@ -20,7 +21,7 @@ enum untracked_cache_setting {
};
enum fetch_negotiation_setting {
- FETCH_NEGOTIATION_DEFAULT,
+ FETCH_NEGOTIATION_CONSECUTIVE,
FETCH_NEGOTIATION_SKIPPING,
FETCH_NEGOTIATION_NOOP,
};
@@ -35,6 +36,8 @@ struct repo_settings {
int command_requires_full_index;
int sparse_index;
+ struct fsmonitor_settings *fsmonitor; /* lazily loaded */
+
int index_version;
enum untracked_cache_setting core_untracked_cache;
@@ -44,6 +47,18 @@ struct repo_settings {
int core_multi_pack_index;
};
+struct repo_path_cache {
+ char *squash_msg;
+ char *merge_msg;
+ char *merge_rr;
+ char *merge_mode;
+ char *merge_head;
+ char *merge_autostash;
+ char *auto_merge;
+ char *fetch_head;
+ char *shallow;
+};
+
struct repository {
/* Environment */
/*
@@ -82,7 +97,7 @@ struct repository {
/*
* Contains path to often used file names.
*/
- struct path_cache cached_paths;
+ struct repo_path_cache cached_paths;
/*
* Path to the repository's graft file.
@@ -162,6 +177,7 @@ struct set_gitdir_args {
const char *graft_file;
const char *index_file;
const char *alternate_db;
+ int disable_ref_updates;
};
void repo_set_gitdir(struct repository *repo, const char *root,
diff --git a/rerere.c b/rerere.c
index d83d58d..876ab43 100644
--- a/rerere.c
+++ b/rerere.c
@@ -591,7 +591,7 @@ int rerere_remaining(struct repository *r, struct string_list *merge_rr)
else if (conflict_type == RESOLVED) {
struct string_list_item *it;
it = string_list_lookup(merge_rr, (const char *)e->name);
- if (it != NULL) {
+ if (it) {
free_rerere_id(it);
it->util = RERERE_RESOLVED;
}
@@ -609,19 +609,20 @@ static int try_merge(struct index_state *istate,
const struct rerere_id *id, const char *path,
mmfile_t *cur, mmbuffer_t *result)
{
- int ret;
+ enum ll_merge_result ret;
mmfile_t base = {NULL, 0}, other = {NULL, 0};
if (read_mmfile(&base, rerere_path(id, "preimage")) ||
- read_mmfile(&other, rerere_path(id, "postimage")))
- ret = 1;
- else
+ read_mmfile(&other, rerere_path(id, "postimage"))) {
+ ret = LL_MERGE_CONFLICT;
+ } else {
/*
* A three-way merge. Note that this honors user-customizable
* low-level merge driver settings.
*/
ret = ll_merge(result, path, &base, NULL, cur, "", &other, "",
istate, NULL);
+ }
free(base.ptr);
free(other.ptr);
diff --git a/reset.c b/reset.c
index 79310ae..e3383a9 100644
--- a/reset.c
+++ b/reset.c
@@ -7,38 +7,108 @@
#include "tree-walk.h"
#include "tree.h"
#include "unpack-trees.h"
+#include "hook.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)
+static int update_refs(const struct reset_head_opts *opts,
+ const struct object_id *oid,
+ const struct object_id *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;
+ unsigned detach_head = opts->flags & RESET_HEAD_DETACH;
+ unsigned run_hook = opts->flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
+ unsigned update_orig_head = opts->flags & RESET_ORIG_HEAD;
+ const struct object_id *orig_head = opts->orig_head;
+ const char *switch_to_branch = opts->branch;
+ const char *reflog_branch = opts->branch_msg;
+ const char *reflog_head = opts->head_msg;
+ const char *reflog_orig_head = opts->orig_head_msg;
+ const char *default_reflog_action = opts->default_reflog_action;
+ struct object_id *old_orig = NULL, oid_old_orig;
+ struct strbuf msg = STRBUF_INIT;
+ const char *reflog_action;
+ size_t prefix_len;
+ int ret;
+
+ if ((update_orig_head && !reflog_orig_head) || !reflog_head) {
+ if (!default_reflog_action)
+ BUG("default_reflog_action must be given when reflog messages are omitted");
+ 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 (head) {
+ if (!reflog_orig_head) {
+ strbuf_addstr(&msg, "updating ORIG_HEAD");
+ reflog_orig_head = msg.buf;
+ }
+ update_ref(reflog_orig_head, "ORIG_HEAD",
+ orig_head ? orig_head : head,
+ 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, head,
+ detach_head ? REF_NO_DEREF : 0,
+ UPDATE_REFS_MSG_ON_ERR);
+ else {
+ ret = update_ref(reflog_branch ? reflog_branch : 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 (!ret && run_hook)
+ run_hooks_l("post-checkout",
+ oid_to_hex(head ? head : null_oid()),
+ oid_to_hex(oid), "1", NULL);
+ strbuf_release(&msg);
+ return ret;
+}
+
+int reset_head(struct repository *r, const struct reset_head_opts *opts)
+{
+ const struct object_id *oid = opts->oid;
+ const char *switch_to_branch = opts->branch;
+ unsigned reset_hard = opts->flags & RESET_HEAD_HARD;
+ unsigned refs_only = opts->flags & RESET_HEAD_REFS_ONLY;
+ unsigned update_orig_head = opts->flags & RESET_ORIG_HEAD;
+ struct object_id *head = NULL, head_oid;
struct tree_desc desc[2] = { { NULL }, { NULL } };
struct lock_file lock = LOCK_INIT;
struct unpack_trees_options unpack_tree_opts = { 0 };
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;
+ const char *action;
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 (opts->orig_head_msg && !update_orig_head)
+ BUG("ORIG_HEAD reflog message given without updating ORIG_HEAD");
+
+ if (opts->branch_msg && !opts->branch)
+ BUG("branch reflog message given without a 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)) {
+ if (!get_oid("HEAD", &head_oid)) {
+ head = &head_oid;
+ } else if (!oid || !reset_hard) {
ret = error(_("could not determine HEAD revision"));
goto leave_reset_head;
}
@@ -47,8 +117,9 @@ int reset_head(struct repository *r, struct object_id *oid, const char *action,
oid = &head_oid;
if (refs_only)
- goto reset_head_refs;
+ return update_refs(opts, oid, head);
+ action = reset_hard ? "reset" : "checkout";
setup_unpack_trees_porcelain(&unpack_tree_opts, action);
unpack_tree_opts.head_idx = 1;
unpack_tree_opts.src_index = r->index;
@@ -56,9 +127,10 @@ int reset_head(struct repository *r, struct object_id *oid, const char *action,
unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
unpack_tree_opts.update = 1;
unpack_tree_opts.merge = 1;
+ unpack_tree_opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
init_checkout_metadata(&unpack_tree_opts.meta, switch_to_branch, oid, NULL);
- if (!detach_head)
- unpack_tree_opts.reset = 1;
+ if (reset_hard)
+ unpack_tree_opts.reset = UNPACK_RESET_PROTECT_UNTRACKED;
if (repo_read_index_unmerged(r) < 0) {
ret = error(_("could not read index"));
@@ -89,49 +161,10 @@ int reset_head(struct repository *r, struct object_id *oid, const char *action,
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);
+ if (oid != &head_oid || update_orig_head || switch_to_branch)
+ ret = update_refs(opts, oid, head);
leave_reset_head:
- strbuf_release(&msg);
rollback_lock_file(&lock);
clear_unpack_trees_porcelain(&unpack_tree_opts);
while (nr)
diff --git a/reset.h b/reset.h
index 12f83c7..a28f818 100644
--- a/reset.h
+++ b/reset.h
@@ -6,15 +6,55 @@
#define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
+/* Request a detached checkout */
#define RESET_HEAD_DETACH (1<<0)
+/* Request a reset rather than a checkout */
#define RESET_HEAD_HARD (1<<1)
+/* Run the post-checkout hook */
#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2)
+/* Only update refs, do not touch the worktree */
#define RESET_HEAD_REFS_ONLY (1<<3)
+/* Update ORIG_HEAD as well as HEAD */
#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);
+struct reset_head_opts {
+ /*
+ * The commit to checkout/reset to. Defaults to HEAD.
+ */
+ const struct object_id *oid;
+ /*
+ * Optional value to set ORIG_HEAD. Defaults to HEAD.
+ */
+ const struct object_id *orig_head;
+ /*
+ * Optional branch to switch to.
+ */
+ const char *branch;
+ /*
+ * Flags defined above.
+ */
+ unsigned flags;
+ /*
+ * Optional reflog message for branch, defaults to head_msg.
+ */
+ const char *branch_msg;
+ /*
+ * Optional reflog message for HEAD, if this omitted but oid or branch
+ * are given then default_reflog_action must be given.
+ */
+ const char *head_msg;
+ /*
+ * Optional reflog message for ORIG_HEAD, if this omitted and flags
+ * contains RESET_ORIG_HEAD then default_reflog_action must be given.
+ */
+ const char *orig_head_msg;
+ /*
+ * Action to use in default reflog messages, only required if a ref is
+ * being updated and the reflog messages above are omitted.
+ */
+ const char *default_reflog_action;
+};
+
+int reset_head(struct repository *r, const struct reset_head_opts *opts);
#endif
diff --git a/revision.c b/revision.c
index ab7c135..2113527 100644
--- a/revision.c
+++ b/revision.c
@@ -32,6 +32,7 @@
#include "utf8.h"
#include "bloom.h"
#include "json-writer.h"
+#include "list-objects-filter-options.h"
volatile show_early_output_fn_t show_early_output;
@@ -44,10 +45,15 @@ static inline int want_ancestry(const struct rev_info *revs);
void show_object_with_name(FILE *out, struct object *obj, const char *name)
{
- const char *p;
-
fprintf(out, "%s ", oid_to_hex(&obj->oid));
- for (p = name; *p && *p != '\n'; p++)
+ /*
+ * This "for (const char *p = ..." is made as a first step towards
+ * making use of such declarations elsewhere in our codebase. If
+ * it causes compilation problems on your platform, please report
+ * it to the Git mailing list at git@vger.kernel.org. In the meantime,
+ * adding -std=gnu99 to CFLAGS may help if you are with older GCC.
+ */
+ for (const char *p = name; *p && *p != '\n'; p++)
fputc(*p, out);
fputc('\n', out);
}
@@ -268,7 +274,7 @@ static void commit_stack_clear(struct commit_stack *stack)
stack->nr = stack->alloc = 0;
}
-static void mark_one_parent_uninteresting(struct commit *commit,
+static void mark_one_parent_uninteresting(struct rev_info *revs, struct commit *commit,
struct commit_stack *pending)
{
struct commit_list *l;
@@ -285,20 +291,26 @@ static void mark_one_parent_uninteresting(struct commit *commit,
* wasn't uninteresting), in which case we need
* to mark its parents recursively too..
*/
- for (l = commit->parents; l; l = l->next)
+ for (l = commit->parents; l; l = l->next) {
commit_stack_push(pending, l->item);
+ if (revs && revs->exclude_first_parent_only)
+ break;
+ }
}
-void mark_parents_uninteresting(struct commit *commit)
+void mark_parents_uninteresting(struct rev_info *revs, struct commit *commit)
{
struct commit_stack pending = COMMIT_STACK_INIT;
struct commit_list *l;
- for (l = commit->parents; l; l = l->next)
- mark_one_parent_uninteresting(l->item, &pending);
+ for (l = commit->parents; l; l = l->next) {
+ mark_one_parent_uninteresting(revs, l->item, &pending);
+ if (revs && revs->exclude_first_parent_only)
+ break;
+ }
while (pending.nr > 0)
- mark_one_parent_uninteresting(commit_stack_pop(&pending),
+ mark_one_parent_uninteresting(revs, commit_stack_pop(&pending),
&pending);
commit_stack_clear(&pending);
@@ -436,7 +448,7 @@ static struct commit *handle_commit(struct rev_info *revs,
if (repo_parse_commit(revs->repo, commit) < 0)
die("unable to parse commit %s", name);
if (flags & UNINTERESTING) {
- mark_parents_uninteresting(commit);
+ mark_parents_uninteresting(revs, commit);
if (!revs->topo_order || !generation_numbers_enabled(the_repository))
revs->limited = 1;
@@ -594,6 +606,10 @@ static struct commit *one_relevant_parent(const struct rev_info *revs,
*
* 2. We saw anything except REV_TREE_NEW.
*/
+#define REV_TREE_SAME 0
+#define REV_TREE_NEW 1 /* Only new files */
+#define REV_TREE_OLD 2 /* Only files removed */
+#define REV_TREE_DIFFERENT 3 /* Mixed changes */
static int tree_difference = REV_TREE_SAME;
static void file_add_remove(struct diff_options *options,
@@ -1119,7 +1135,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
if (repo_parse_commit_gently(revs->repo, p, 1) < 0)
continue;
if (p->parents)
- mark_parents_uninteresting(p);
+ mark_parents_uninteresting(revs, p);
if (p->object.flags & SEEN)
continue;
p->object.flags |= (SEEN | NOT_USER_GIVEN);
@@ -1127,6 +1143,8 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
commit_list_insert_by_date(p, list);
if (queue)
prio_queue_put(queue, p);
+ if (revs->exclude_first_parent_only)
+ break;
}
return 0;
}
@@ -1417,7 +1435,7 @@ static int limit_list(struct rev_info *revs)
if (process_parents(revs, commit, &original_list, NULL) < 0)
return -1;
if (obj->flags & UNINTERESTING) {
- mark_parents_uninteresting(commit);
+ mark_parents_uninteresting(revs, commit);
slop = still_interesting(original_list, date, slop, &interesting_cache);
if (slop)
continue;
@@ -1426,6 +1444,9 @@ static int limit_list(struct rev_info *revs)
if (revs->min_age != -1 && (commit->date > revs->min_age) &&
!revs->line_level_traverse)
continue;
+ if (revs->max_age_as_filter != -1 &&
+ (commit->date < revs->max_age_as_filter) && !revs->line_level_traverse)
+ continue;
date = commit->date;
p = &commit_list_insert(commit, p)->next;
@@ -1442,10 +1463,9 @@ static int limit_list(struct rev_info *revs)
if (revs->left_only || revs->right_only)
limit_left_right(newlist, revs);
- if (bottom) {
+ if (bottom)
limit_to_ancestry(bottom, newlist);
- free_commit_list(bottom);
- }
+ free_commit_list(bottom);
/*
* Check if any commits have become TREESAME by some of their parents
@@ -1824,6 +1844,7 @@ void repo_init_revisions(struct repository *r,
revs->dense = 1;
revs->prefix = prefix;
revs->max_age = -1;
+ revs->max_age_as_filter = -1;
revs->min_age = -1;
revs->skip_count = -1;
revs->max_count = -1;
@@ -1833,7 +1854,7 @@ void repo_init_revisions(struct repository *r,
revs->commit_format = CMIT_FMT_DEFAULT;
revs->expand_tabs_in_log_default = 8;
- grep_init(&revs->grep_filter, revs->repo, prefix);
+ grep_init(&revs->grep_filter, revs->repo);
revs->grep_filter.status_only = 1;
repo_diff_setup(revs->repo, &revs->diffopt);
@@ -2204,6 +2225,9 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
} else if ((argcount = parse_long_opt("since", argv, &optarg))) {
revs->max_age = approxidate(optarg);
return argcount;
+ } else if ((argcount = parse_long_opt("since-as-filter", argv, &optarg))) {
+ revs->max_age_as_filter = approxidate(optarg);
+ return argcount;
} else if ((argcount = parse_long_opt("after", argv, &optarg))) {
revs->max_age = approxidate(optarg);
return argcount;
@@ -2218,6 +2242,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
return argcount;
} else if (!strcmp(arg, "--first-parent")) {
revs->first_parent_only = 1;
+ } else if (!strcmp(arg, "--exclude-first-parent-only")) {
+ revs->exclude_first_parent_only = 1;
} else if (!strcmp(arg, "--ancestry-path")) {
revs->ancestry_path = 1;
revs->simplify_history = 0;
@@ -2254,10 +2280,6 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
} else if (!strcmp(arg, "--author-date-order")) {
revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
revs->topo_order = 1;
- } else if (!strcmp(arg, "--unsorted-input")) {
- if (revs->no_walk)
- die(_("--unsorted-input is incompatible with --no-walk"));
- revs->unsorted_input = 1;
} else if (!strcmp(arg, "--early-output")) {
revs->early_output = 100;
revs->topo_order = 1;
@@ -2299,11 +2321,11 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->left_only = 1;
} else if (!strcmp(arg, "--right-only")) {
if (revs->left_only)
- die("--right-only is incompatible with --left-only");
+ die(_("options '%s' and '%s' cannot be used together"), "--right-only", "--left-only");
revs->right_only = 1;
} else if (!strcmp(arg, "--cherry")) {
if (revs->left_only)
- die("--cherry is incompatible with --left-only");
+ die(_("options '%s' and '%s' cannot be used together"), "--cherry", "--left-only");
revs->cherry_mark = 1;
revs->right_only = 1;
revs->max_parents = 1;
@@ -2312,12 +2334,12 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->count = 1;
} else if (!strcmp(arg, "--cherry-mark")) {
if (revs->cherry_pick)
- die("--cherry-mark is incompatible with --cherry-pick");
+ die(_("options '%s' and '%s' cannot be used together"), "--cherry-mark", "--cherry-pick");
revs->cherry_mark = 1;
revs->limited = 1; /* needs limit_list() */
} else if (!strcmp(arg, "--cherry-pick")) {
if (revs->cherry_mark)
- die("--cherry-pick is incompatible with --cherry-mark");
+ die(_("options '%s' and '%s' cannot be used together"), "--cherry-pick", "--cherry-mark");
revs->cherry_pick = 1;
revs->limited = 1;
} else if (!strcmp(arg, "--objects")) {
@@ -2423,9 +2445,11 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->pretty_given = 1;
revs->abbrev_commit = 1;
} else if (!strcmp(arg, "--graph")) {
- revs->topo_order = 1;
- revs->rewrite_parents = 1;
+ graph_clear(revs->graph);
revs->graph = graph_init(revs);
+ } else if (!strcmp(arg, "--no-graph")) {
+ graph_clear(revs->graph);
+ revs->graph = NULL;
} else if (!strcmp(arg, "--encode-email-headers")) {
revs->encode_email_headers = 1;
} else if (!strcmp(arg, "--no-encode-email-headers")) {
@@ -2497,7 +2521,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
} else if (!strcmp(arg, "--all-match")) {
revs->grep_filter.all_match = 1;
} else if (!strcmp(arg, "--invert-grep")) {
- revs->invert_grep = 1;
+ revs->grep_filter.no_body_match = 1;
} else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
if (strcmp(optarg, "none"))
git_log_output_encoding = xstrdup(optarg);
@@ -2522,8 +2546,6 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
unkv[(*unkc)++] = arg;
return opts;
}
- if (revs->graph && revs->track_linear)
- die("--show-linear-break and --graph are incompatible");
return 1;
}
@@ -2542,6 +2564,17 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
ctx->argc -= n;
}
+void revision_opts_finish(struct rev_info *revs)
+{
+ if (revs->graph && revs->track_linear)
+ die(_("options '%s' and '%s' cannot be used together"), "--show-linear-break", "--graph");
+
+ if (revs->graph) {
+ revs->topo_order = 1;
+ revs->rewrite_parents = 1;
+ }
+}
+
static int for_each_bisect_ref(struct ref_store *refs, each_ref_fn fn,
void *cb_data, const char *term)
{
@@ -2651,13 +2684,8 @@ static int handle_revision_pseudo_opt(struct rev_info *revs,
} else if (!strcmp(arg, "--not")) {
*flags ^= UNINTERESTING | BOTTOM;
} else if (!strcmp(arg, "--no-walk")) {
- if (!revs->no_walk && revs->unsorted_input)
- die(_("--no-walk is incompatible with --unsorted-input"));
revs->no_walk = 1;
} else if (skip_prefix(arg, "--no-walk=", &optarg)) {
- if (!revs->no_walk && revs->unsorted_input)
- die(_("--no-walk is incompatible with --unsorted-input"));
-
/*
* Detached form ("--no-walk X" as opposed to "--no-walk=X")
* not allowed, since the argument is optional.
@@ -2673,6 +2701,10 @@ static int handle_revision_pseudo_opt(struct rev_info *revs,
revs->no_walk = 0;
} else if (!strcmp(arg, "--single-worktree")) {
revs->single_worktree = 1;
+ } else if (skip_prefix(arg, ("--filter="), &arg)) {
+ parse_list_objects_filter(&revs->filter, arg);
+ } else if (!strcmp(arg, ("--no-filter"))) {
+ list_objects_filter_set_no_filter(&revs->filter);
} else {
return 0;
}
@@ -2789,6 +2821,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
break;
}
}
+ revision_opts_finish(revs);
if (prune_data.nr) {
/*
@@ -2810,7 +2843,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
}
strvec_clear(&prune_data);
- if (revs->def == NULL)
+ if (!revs->def)
revs->def = opt ? opt->def : NULL;
if (opt && opt->tweak)
opt->tweak(revs, opt);
@@ -2864,31 +2897,31 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
diff_setup_done(&revs->diffopt);
- grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
- &revs->grep_filter);
if (!is_encoding_utf8(get_log_output_encoding()))
revs->grep_filter.ignore_locale = 1;
compile_grep_patterns(&revs->grep_filter);
if (revs->reverse && revs->reflog_info)
- die("cannot combine --reverse with --walk-reflogs");
+ die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--walk-reflogs");
if (revs->reflog_info && revs->limited)
die("cannot combine --walk-reflogs with history-limiting options");
if (revs->rewrite_parents && revs->children.name)
- die("cannot combine --parents and --children");
+ die(_("options '%s' and '%s' cannot be used together"), "--parents", "--children");
+ if (revs->filter.choice && !revs->blob_objects)
+ die(_("object filtering requires --objects"));
/*
* Limitations on the graph functionality
*/
if (revs->reverse && revs->graph)
- die("cannot combine --reverse with --graph");
+ die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--graph");
if (revs->reflog_info && revs->graph)
- die("cannot combine --walk-reflogs with --graph");
+ die(_("options '%s' and '%s' cannot be used together"), "--walk-reflogs", "--graph");
if (revs->no_walk && revs->graph)
- die("cannot combine --no-walk with --graph");
+ die(_("options '%s' and '%s' cannot be used together"), "--no-walk", "--graph");
if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
- die("cannot use --grep-reflog without --walk-reflogs");
+ die(_("the option '%s' requires '%s'"), "--grep-reflog", "--walk-reflogs");
if (revs->line_level_traverse &&
(revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT)))
@@ -2900,6 +2933,42 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
return left;
}
+static void release_revisions_cmdline(struct rev_cmdline_info *cmdline)
+{
+ unsigned int i;
+
+ for (i = 0; i < cmdline->nr; i++)
+ free((char *)cmdline->rev[i].name);
+ free(cmdline->rev);
+}
+
+static void release_revisions_mailmap(struct string_list *mailmap)
+{
+ if (!mailmap)
+ return;
+ clear_mailmap(mailmap);
+ free(mailmap);
+}
+
+static void release_revisions_topo_walk_info(struct topo_walk_info *info);
+
+void release_revisions(struct rev_info *revs)
+{
+ free_commit_list(revs->commits);
+ object_array_clear(&revs->pending);
+ object_array_clear(&revs->boundary_commits);
+ release_revisions_cmdline(&revs->cmdline);
+ list_objects_filter_release(&revs->filter);
+ clear_pathspec(&revs->prune_data);
+ date_mode_release(&revs->date_mode);
+ release_revisions_mailmap(revs->mailmap);
+ free_grep_patterns(&revs->grep_filter);
+ /* TODO (need to handle "no_free"): diff_free(&revs->diffopt) */
+ diff_free(&revs->pruning);
+ reflog_walk_info_release(revs->reflog_info);
+ release_revisions_topo_walk_info(revs->topo_walk_info);
+}
+
static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
{
struct commit_list *l = xcalloc(1, sizeof(*l));
@@ -3349,7 +3418,7 @@ static void explore_walk_step(struct rev_info *revs)
return;
if (c->object.flags & UNINTERESTING)
- mark_parents_uninteresting(c);
+ mark_parents_uninteresting(revs, c);
for (p = c->parents; p; p = p->next)
test_flag_and_insert(&info->explore_queue, p->item, TOPO_WALK_EXPLORED);
@@ -3410,17 +3479,22 @@ static void compute_indegrees_to_depth(struct rev_info *revs,
indegree_walk_step(revs);
}
-static void reset_topo_walk(struct rev_info *revs)
+static void release_revisions_topo_walk_info(struct topo_walk_info *info)
{
- struct topo_walk_info *info = revs->topo_walk_info;
-
+ if (!info)
+ return;
clear_prio_queue(&info->explore_queue);
clear_prio_queue(&info->indegree_queue);
clear_prio_queue(&info->topo_queue);
clear_indegree_slab(&info->indegree);
clear_author_date_slab(&info->author_date);
+ free(info);
+}
- FREE_AND_NULL(revs->topo_walk_info);
+static void reset_topo_walk(struct rev_info *revs)
+{
+ release_revisions_topo_walk_info(revs->topo_walk_info);
+ revs->topo_walk_info = NULL;
}
static void init_topo_walk(struct rev_info *revs)
@@ -3629,7 +3703,7 @@ static enum rewrite_result rewrite_one_1(struct rev_info *revs,
return rewrite_one_ok;
if (!p->parents)
return rewrite_one_noparents;
- if ((p = one_relevant_parent(revs, p->parents)) == NULL)
+ if (!(p = one_relevant_parent(revs, p->parents)))
return rewrite_one_ok;
*pp = p;
}
@@ -3787,7 +3861,7 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
(char *)message, strlen(message));
strbuf_release(&buf);
unuse_commit_buffer(commit, message);
- return opt->invert_grep ? !retval : retval;
+ return retval;
}
static inline int want_ancestry(const struct rev_info *revs)
@@ -3839,6 +3913,9 @@ enum commit_action get_commit_action(struct rev_info *revs, struct commit *commi
if (revs->min_age != -1 &&
comparison_date(revs, commit) > revs->min_age)
return commit_ignore;
+ if (revs->max_age_as_filter != -1 &&
+ comparison_date(revs, commit) < revs->max_age_as_filter)
+ return commit_ignore;
if (revs->min_parents || (revs->max_parents >= 0)) {
int n = commit_list_count(commit->parents);
if ((n < revs->min_parents) ||
@@ -4057,10 +4134,8 @@ static void create_boundary_commit_list(struct rev_info *revs)
* boundary commits anyway. (This is what the code has always
* done.)
*/
- if (revs->commits) {
- free_commit_list(revs->commits);
- revs->commits = NULL;
- }
+ free_commit_list(revs->commits);
+ revs->commits = NULL;
/*
* Put all of the actual boundary commits from revs->boundary_commits
@@ -4197,10 +4272,8 @@ struct commit *get_revision(struct rev_info *revs)
graph_update(revs->graph, c);
if (!c) {
free_saved_parents(revs);
- if (revs->previous_parents) {
- free_commit_list(revs->previous_parents);
- revs->previous_parents = NULL;
- }
+ free_commit_list(revs->previous_parents);
+ revs->previous_parents = NULL;
}
return c;
}
diff --git a/revision.h b/revision.h
index 5578bb4..e576845 100644
--- a/revision.h
+++ b/revision.h
@@ -8,6 +8,7 @@
#include "pretty.h"
#include "diff.h"
#include "commit-slab-decl.h"
+#include "list-objects-filter-options.h"
/**
* The revision walking API offers functions to build a list of revisions
@@ -94,6 +95,12 @@ struct rev_info {
/* The end-points specified by the end user */
struct rev_cmdline_info cmdline;
+ /*
+ * Object filter options. No filtering is specified
+ * if and only if filter.choice is zero.
+ */
+ struct list_objects_filter_options filter;
+
/* excluding from --branches, --refs, etc. expansion */
struct string_list *ref_excludes;
@@ -158,6 +165,7 @@ struct rev_info {
bisect:1,
ancestry_path:1,
first_parent_only:1,
+ exclude_first_parent_only:1,
line_level_traverse:1,
tree_blobs_in_commit_order:1,
@@ -195,7 +203,8 @@ struct rev_info {
combine_merges:1,
combined_all_paths:1,
dense_combined_merges:1,
- first_parent_merges:1;
+ first_parent_merges:1,
+ remerge_diff:1;
/* Format info */
int show_notes;
@@ -246,8 +255,6 @@ struct rev_info {
/* Filter by commit log message */
struct grep_opt grep_filter;
- /* Negate the match of grep_filter */
- int invert_grep;
/* Display history graph */
struct git_graph *graph;
@@ -256,6 +263,7 @@ struct rev_info {
int skip_count;
int max_count;
timestamp_t max_age;
+ timestamp_t max_age_as_filter;
timestamp_t min_age;
int min_parents;
int max_parents;
@@ -317,33 +325,29 @@ struct rev_info {
/* misc. flags related to '--no-kept-objects' */
unsigned keep_pack_cache_flags;
+
+ /* Location where temporary objects for remerge-diff are written. */
+ struct tmp_objdir *remerge_objdir;
};
-int ref_excluded(struct string_list *, const char *path);
-void clear_ref_exclusion(struct string_list **);
-void add_ref_exclusion(struct string_list **, const char *exclude);
-
-
-#define REV_TREE_SAME 0
-#define REV_TREE_NEW 1 /* Only new files */
-#define REV_TREE_OLD 2 /* Only files removed */
-#define REV_TREE_DIFFERENT 3 /* Mixed changes */
-
-/* revision.c */
-typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
-extern volatile show_early_output_fn_t show_early_output;
-
-struct setup_revision_opt {
- const char *def;
- void (*tweak)(struct rev_info *, struct setup_revision_opt *);
- unsigned int assume_dashdash:1,
- allow_exclude_promisor_objects:1;
- unsigned revarg_opt;
-};
-
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
-#define init_revisions(revs, prefix) repo_init_revisions(the_repository, revs, prefix)
-#endif
+/**
+ * Initialize the "struct rev_info" structure with a macro.
+ *
+ * This will not fully initialize a "struct rev_info", the
+ * repo_init_revisions() function needs to be called before
+ * setup_revisions() and any revision walking takes place.
+ *
+ * Use REV_INFO_INIT to make the "struct rev_info" safe for passing to
+ * release_revisions() when it's inconvenient (e.g. due to a "goto
+ * cleanup" pattern) to arrange for repo_init_revisions() to be called
+ * before release_revisions() is called.
+ *
+ * Initializing with this REV_INFO_INIT is redundant to invoking
+ * repo_init_revisions(). If repo_init_revisions() is guaranteed to be
+ * called before release_revisions() the "struct rev_info" can be left
+ * uninitialized.
+ */
+#define REV_INFO_INIT { 0 }
/**
* Initialize a rev_info structure with default values. The third parameter may
@@ -356,6 +360,9 @@ struct setup_revision_opt {
void repo_init_revisions(struct repository *r,
struct rev_info *revs,
const char *prefix);
+#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
+#define init_revisions(revs, prefix) repo_init_revisions(the_repository, revs, prefix)
+#endif
/**
* Parse revision information, filling in the `rev_info` structure, and
@@ -364,9 +371,22 @@ void repo_init_revisions(struct repository *r,
* head of the argument list. The last parameter is used in case no
* parameter given by the first two arguments.
*/
+struct setup_revision_opt {
+ const char *def;
+ void (*tweak)(struct rev_info *, struct setup_revision_opt *);
+ unsigned int assume_dashdash:1,
+ allow_exclude_promisor_objects:1;
+ unsigned revarg_opt;
+};
int setup_revisions(int argc, const char **argv, struct rev_info *revs,
struct setup_revision_opt *);
+/**
+ * Free data allocated in a "struct rev_info" after it's been
+ * initialized with repo_init_revisions() or REV_INFO_INIT.
+ */
+void release_revisions(struct rev_info *revs);
+
void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
const struct option *options,
const char * const usagestr[]);
@@ -374,6 +394,7 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
#define REVARG_COMMITTISH 02
int handle_revision_arg(const char *arg, struct rev_info *revs,
int flags, unsigned revarg_opt);
+void revision_opts_finish(struct rev_info *revs);
/**
* Reset the flags used by the revision walking api. You can use this to do
@@ -400,13 +421,21 @@ const char *get_revision_mark(const struct rev_info *revs,
void put_revision_mark(const struct rev_info *revs,
const struct commit *commit);
-void mark_parents_uninteresting(struct commit *commit);
+void mark_parents_uninteresting(struct rev_info *revs, struct commit *commit);
void mark_tree_uninteresting(struct repository *r, struct tree *tree);
void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees);
void show_object_with_name(FILE *, struct object *, const char *);
/**
+ * Helpers to check if a "struct string_list" item matches with
+ * wildmatch().
+ */
+int ref_excluded(struct string_list *, const char *path);
+void clear_ref_exclusion(struct string_list **);
+void add_ref_exclusion(struct string_list **, const char *exclude);
+
+/**
* This function can be used if you want to add commit objects as revision
* information. You can use the `UNINTERESTING` object flag to indicate if
* you want to include or exclude the given commit (and commits reachable
@@ -461,4 +490,10 @@ int rewrite_parents(struct rev_info *revs,
*/
struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit);
+/**
+ * Global for the (undocumented) "--early-output" flag for "git log".
+ */
+typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
+extern volatile show_early_output_fn_t show_early_output;
+
#endif
diff --git a/run-command.c b/run-command.c
index 04a07e6..789eaa5 100644
--- a/run-command.c
+++ b/run-command.c
@@ -9,6 +9,7 @@
#include "quote.h"
#include "config.h"
#include "packfile.h"
+#include "hook.h"
void child_process_init(struct child_process *child)
{
@@ -19,7 +20,7 @@ void child_process_init(struct child_process *child)
void child_process_clear(struct child_process *child)
{
strvec_clear(&child->args);
- strvec_clear(&child->env_array);
+ strvec_clear(&child->env);
}
struct child_to_clean {
@@ -339,15 +340,6 @@ static void child_close_pair(int fd[2])
child_close(fd[1]);
}
-/*
- * parent will make it look like the child spewed a fatal error and died
- * this is needed to prevent changes to t0061.
- */
-static void fake_fatal(const char *err, va_list params)
-{
- vreportf("fatal: ", err, params);
-}
-
static void child_error_fn(const char *err, va_list params)
{
const char msg[] = "error() should not be called in child\n";
@@ -371,15 +363,16 @@ static void NORETURN child_die_fn(const char *err, va_list params)
static void child_err_spew(struct child_process *cmd, struct child_err *cerr)
{
static void (*old_errfn)(const char *err, va_list params);
+ report_fn die_message_routine = get_die_message_routine();
old_errfn = get_error_routine();
- set_error_routine(fake_fatal);
+ set_error_routine(die_message_routine);
errno = cerr->syserr;
switch (cerr->err) {
case CHILD_ERR_CHDIR:
error_errno("exec '%s': cd to '%s' failed",
- cmd->argv[0], cmd->dir);
+ cmd->args.v[0], cmd->dir);
break;
case CHILD_ERR_DUP2:
error_errno("dup2() in child failed");
@@ -391,12 +384,12 @@ static void child_err_spew(struct child_process *cmd, struct child_err *cerr)
error_errno("sigprocmask failed restoring signals");
break;
case CHILD_ERR_ENOENT:
- error_errno("cannot run %s", cmd->argv[0]);
+ error_errno("cannot run %s", cmd->args.v[0]);
break;
case CHILD_ERR_SILENT:
break;
case CHILD_ERR_ERRNO:
- error_errno("cannot exec '%s'", cmd->argv[0]);
+ error_errno("cannot exec '%s'", cmd->args.v[0]);
break;
}
set_error_routine(old_errfn);
@@ -404,7 +397,7 @@ static void child_err_spew(struct child_process *cmd, struct child_err *cerr)
static int prepare_cmd(struct strvec *out, const struct child_process *cmd)
{
- if (!cmd->argv[0])
+ if (!cmd->args.v[0])
BUG("command is empty");
/*
@@ -414,11 +407,11 @@ static int prepare_cmd(struct strvec *out, const struct child_process *cmd)
strvec_push(out, SHELL_PATH);
if (cmd->git_cmd) {
- prepare_git_cmd(out, cmd->argv);
+ prepare_git_cmd(out, cmd->args.v);
} else if (cmd->use_shell) {
- prepare_shell_cmd(out, cmd->argv);
+ prepare_shell_cmd(out, cmd->args.v);
} else {
- strvec_pushv(out, cmd->argv);
+ strvec_pushv(out, cmd->args.v);
}
/*
@@ -551,20 +544,17 @@ static int wait_or_whine(pid_t pid, const char *argv0, int in_signal)
while ((waiting = waitpid(pid, &status, 0)) < 0 && errno == EINTR)
; /* nothing */
- if (in_signal) {
- if (WIFEXITED(status))
- code = WEXITSTATUS(status);
- return code;
- }
if (waiting < 0) {
failed_errno = errno;
- error_errno("waitpid for %s failed", argv0);
+ if (!in_signal)
+ error_errno("waitpid for %s failed", argv0);
} else if (waiting != pid) {
- error("waitpid is confused (%s)", argv0);
+ if (!in_signal)
+ error("waitpid is confused (%s)", argv0);
} else if (WIFSIGNALED(status)) {
code = WTERMSIG(status);
- if (code != SIGINT && code != SIGQUIT && code != SIGPIPE)
+ if (!in_signal && code != SIGINT && code != SIGQUIT && code != SIGPIPE)
error("%s died of signal %d", argv0, code);
/*
* This return value is chosen so that code & 0xff
@@ -575,10 +565,12 @@ static int wait_or_whine(pid_t pid, const char *argv0, int in_signal)
} else if (WIFEXITED(status)) {
code = WEXITSTATUS(status);
} else {
- error("waitpid is confused (%s)", argv0);
+ if (!in_signal)
+ error("waitpid is confused (%s)", argv0);
}
- clear_child_for_cleanup(pid);
+ if (!in_signal)
+ clear_child_for_cleanup(pid);
errno = failed_errno;
return code;
@@ -654,15 +646,10 @@ static void trace_run_command(const struct child_process *cp)
sq_quote_buf_pretty(&buf, cp->dir);
strbuf_addch(&buf, ';');
}
- /*
- * The caller is responsible for initializing cp->env from
- * cp->env_array if needed. We only check one place.
- */
- if (cp->env)
- trace_add_env(&buf, cp->env);
+ trace_add_env(&buf, cp->env.v);
if (cp->git_cmd)
strbuf_addstr(&buf, " git");
- sq_quote_argv_pretty(&buf, cp->argv);
+ sq_quote_argv_pretty(&buf, cp->args.v);
trace_printf("%s", buf.buf);
strbuf_release(&buf);
@@ -675,11 +662,6 @@ int start_command(struct child_process *cmd)
int failed_errno;
char *str;
- if (!cmd->argv)
- cmd->argv = cmd->args.v;
- if (!cmd->env)
- cmd->env = cmd->env_array.v;
-
/*
* In case of errors we must keep the promise to close FDs
* that have been passed in via ->in and ->out.
@@ -728,7 +710,7 @@ int start_command(struct child_process *cmd)
str = "standard error";
fail_pipe:
error("cannot create %s pipe for %s: %s",
- str, cmd->argv[0], strerror(failed_errno));
+ str, cmd->args.v[0], strerror(failed_errno));
child_process_clear(cmd);
errno = failed_errno;
return -1;
@@ -757,7 +739,7 @@ int start_command(struct child_process *cmd)
failed_errno = errno;
cmd->pid = -1;
if (!cmd->silent_exec_failure)
- error_errno("cannot run %s", cmd->argv[0]);
+ error_errno("cannot run %s", cmd->args.v[0]);
goto end_of_spawn;
}
@@ -769,7 +751,7 @@ int start_command(struct child_process *cmd)
set_cloexec(null_fd);
}
- childenv = prep_childenv(cmd->env);
+ childenv = prep_childenv(cmd->env.v);
atfork_prepare(&as);
/*
@@ -867,7 +849,7 @@ int start_command(struct child_process *cmd)
}
atfork_parent(&as);
if (cmd->pid < 0)
- error_errno("cannot fork() for %s", cmd->argv[0]);
+ error_errno("cannot fork() for %s", cmd->args.v[0]);
else if (cmd->clean_on_exit)
mark_child_for_cleanup(cmd->pid, cmd);
@@ -884,7 +866,7 @@ int start_command(struct child_process *cmd)
* At this point we know that fork() succeeded, but exec()
* failed. Errors have been reported to our stderr.
*/
- wait_or_whine(cmd->pid, cmd->argv[0], 0);
+ wait_or_whine(cmd->pid, cmd->args.v[0], 0);
child_err_spew(cmd, &cerr);
failed_errno = errno;
cmd->pid = -1;
@@ -901,7 +883,7 @@ int start_command(struct child_process *cmd)
#else
{
int fhin = 0, fhout = 1, fherr = 2;
- const char **sargv = cmd->argv;
+ const char **sargv = cmd->args.v;
struct strvec nargv = STRVEC_INIT;
if (cmd->no_stdin)
@@ -928,20 +910,21 @@ int start_command(struct child_process *cmd)
fhout = dup(cmd->out);
if (cmd->git_cmd)
- cmd->argv = prepare_git_cmd(&nargv, cmd->argv);
+ cmd->args.v = prepare_git_cmd(&nargv, sargv);
else if (cmd->use_shell)
- cmd->argv = prepare_shell_cmd(&nargv, cmd->argv);
+ cmd->args.v = prepare_shell_cmd(&nargv, sargv);
- cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, (char**) cmd->env,
- cmd->dir, fhin, fhout, fherr);
+ cmd->pid = mingw_spawnvpe(cmd->args.v[0], cmd->args.v,
+ (char**) cmd->env.v,
+ cmd->dir, fhin, fhout, fherr);
failed_errno = errno;
if (cmd->pid < 0 && (!cmd->silent_exec_failure || errno != ENOENT))
- error_errno("cannot spawn %s", cmd->argv[0]);
+ error_errno("cannot spawn %s", cmd->args.v[0]);
if (cmd->clean_on_exit && cmd->pid >= 0)
mark_child_for_cleanup(cmd->pid, cmd);
strvec_clear(&nargv);
- cmd->argv = sargv;
+ cmd->args.v = sargv;
if (fhin != 0)
close(fhin);
if (fhout != 1)
@@ -991,7 +974,7 @@ int start_command(struct child_process *cmd)
int finish_command(struct child_process *cmd)
{
- int ret = wait_or_whine(cmd->pid, cmd->argv[0], 0);
+ int ret = wait_or_whine(cmd->pid, cmd->args.v[0], 0);
trace2_child_exit(cmd, ret);
child_process_clear(cmd);
invalidate_lstat_cache();
@@ -1000,7 +983,7 @@ int finish_command(struct child_process *cmd)
int finish_command_in_signal(struct child_process *cmd)
{
- int ret = wait_or_whine(cmd->pid, cmd->argv[0], 1);
+ int ret = wait_or_whine(cmd->pid, cmd->args.v[0], 1);
trace2_child_exit(cmd, ret);
return ret;
}
@@ -1038,7 +1021,7 @@ int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
const char *const *env, const char *tr2_class)
{
struct child_process cmd = CHILD_PROCESS_INIT;
- cmd.argv = argv;
+ strvec_pushv(&cmd.args, argv);
cmd.no_stdin = opt & RUN_COMMAND_NO_STDIN ? 1 : 0;
cmd.git_cmd = opt & RUN_GIT_CMD ? 1 : 0;
cmd.stdout_to_stderr = opt & RUN_COMMAND_STDOUT_TO_STDERR ? 1 : 0;
@@ -1048,7 +1031,8 @@ int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
cmd.wait_after_clean = opt & RUN_WAIT_AFTER_CLEAN ? 1 : 0;
cmd.close_object_store = opt & RUN_CLOSE_OBJECT_STORE ? 1 : 0;
cmd.dir = dir;
- cmd.env = env;
+ if (env)
+ strvec_pushv(&cmd.env, (const char **)env);
cmd.trace2_child_class = tr2_class;
return run_command(&cmd);
}
@@ -1081,7 +1065,9 @@ static void *run_thread(void *data)
static NORETURN void die_async(const char *err, va_list params)
{
- vreportf("fatal: ", err, params);
+ report_fn die_message_fn = get_die_message_routine();
+
+ die_message_fn(err, params);
if (in_async()) {
struct async *async = pthread_getspecific(async_key);
@@ -1098,7 +1084,7 @@ static NORETURN void die_async(const char *err, va_list params)
static int async_die_is_recursing(void)
{
void *ret = pthread_getspecific(async_die_counter);
- pthread_setspecific(async_die_counter, (void *)1);
+ pthread_setspecific(async_die_counter, &async_die_counter); /* set to any non-NULL valid pointer */
return ret != NULL;
}
@@ -1322,72 +1308,6 @@ int async_with_fork(void)
#endif
}
-const char *find_hook(const char *name)
-{
- static struct strbuf path = STRBUF_INIT;
-
- strbuf_reset(&path);
- strbuf_git_path(&path, "hooks/%s", name);
- if (access(path.buf, X_OK) < 0) {
- int err = errno;
-
-#ifdef STRIP_EXTENSION
- strbuf_addstr(&path, STRIP_EXTENSION);
- if (access(path.buf, X_OK) >= 0)
- return path.buf;
- if (errno == EACCES)
- err = errno;
-#endif
-
- if (err == EACCES && advice_enabled(ADVICE_IGNORED_HOOK)) {
- static struct string_list advise_given = STRING_LIST_INIT_DUP;
-
- if (!string_list_lookup(&advise_given, name)) {
- string_list_insert(&advise_given, name);
- advise(_("The '%s' hook was ignored because "
- "it's not set as executable.\n"
- "You can disable this warning with "
- "`git config advice.ignoredHook false`."),
- path.buf);
- }
- }
- return NULL;
- }
- return path.buf;
-}
-
-int run_hook_ve(const char *const *env, const char *name, va_list args)
-{
- struct child_process hook = CHILD_PROCESS_INIT;
- const char *p;
-
- p = find_hook(name);
- if (!p)
- return 0;
-
- strvec_push(&hook.args, p);
- while ((p = va_arg(args, const char *)))
- strvec_push(&hook.args, p);
- hook.env = env;
- hook.no_stdin = 1;
- hook.stdout_to_stderr = 1;
- hook.trace2_hook_name = name;
-
- return run_command(&hook);
-}
-
-int run_hook_le(const char *const *env, const char *name, ...)
-{
- va_list args;
- int ret;
-
- va_start(args, name);
- ret = run_hook_ve(env, name, args);
- va_end(args);
-
- return ret;
-}
-
struct io_pump {
/* initialized by caller */
int fd;
@@ -1896,14 +1816,143 @@ int run_auto_maintenance(int quiet)
return run_command(&maint);
}
-void prepare_other_repo_env(struct strvec *env_array, const char *new_git_dir)
+void prepare_other_repo_env(struct strvec *env, const char *new_git_dir)
{
const char * const *var;
for (var = local_repo_env; *var; var++) {
if (strcmp(*var, CONFIG_DATA_ENVIRONMENT) &&
strcmp(*var, CONFIG_COUNT_ENVIRONMENT))
- strvec_push(env_array, *var);
+ strvec_push(env, *var);
}
- strvec_pushf(env_array, "%s=%s", GIT_DIR_ENVIRONMENT, new_git_dir);
+ strvec_pushf(env, "%s=%s", GIT_DIR_ENVIRONMENT, new_git_dir);
+}
+
+enum start_bg_result start_bg_command(struct child_process *cmd,
+ start_bg_wait_cb *wait_cb,
+ void *cb_data,
+ unsigned int timeout_sec)
+{
+ enum start_bg_result sbgr = SBGR_ERROR;
+ int ret;
+ int wait_status;
+ pid_t pid_seen;
+ time_t time_limit;
+
+ /*
+ * We do not allow clean-on-exit because the child process
+ * should persist in the background and possibly/probably
+ * after this process exits. So we don't want to kill the
+ * child during our atexit routine.
+ */
+ if (cmd->clean_on_exit)
+ BUG("start_bg_command() does not allow non-zero clean_on_exit");
+
+ if (!cmd->trace2_child_class)
+ cmd->trace2_child_class = "background";
+
+ ret = start_command(cmd);
+ if (ret) {
+ /*
+ * We assume that if `start_command()` fails, we
+ * either get a complete `trace2_child_start() /
+ * trace2_child_exit()` pair or it fails before the
+ * `trace2_child_start()` is emitted, so we do not
+ * need to worry about it here.
+ *
+ * We also assume that `start_command()` does not add
+ * us to the cleanup list. And that it calls
+ * calls `child_process_clear()`.
+ */
+ sbgr = SBGR_ERROR;
+ goto done;
+ }
+
+ time(&time_limit);
+ time_limit += timeout_sec;
+
+wait:
+ pid_seen = waitpid(cmd->pid, &wait_status, WNOHANG);
+
+ if (!pid_seen) {
+ /*
+ * The child is currently running. Ask the callback
+ * if the child is ready to do work or whether we
+ * should keep waiting for it to boot up.
+ */
+ ret = (*wait_cb)(cmd, cb_data);
+ if (!ret) {
+ /*
+ * The child is running and "ready".
+ */
+ trace2_child_ready(cmd, "ready");
+ sbgr = SBGR_READY;
+ goto done;
+ } else if (ret > 0) {
+ /*
+ * The callback said to give it more time to boot up
+ * (subject to our timeout limit).
+ */
+ time_t now;
+
+ time(&now);
+ if (now < time_limit)
+ goto wait;
+
+ /*
+ * Our timeout has expired. We don't try to
+ * kill the child, but rather let it continue
+ * (hopefully) trying to startup.
+ */
+ trace2_child_ready(cmd, "timeout");
+ sbgr = SBGR_TIMEOUT;
+ goto done;
+ } else {
+ /*
+ * The cb gave up on this child. It is still running,
+ * but our cb got an error trying to probe it.
+ */
+ trace2_child_ready(cmd, "error");
+ sbgr = SBGR_CB_ERROR;
+ goto done;
+ }
+ }
+
+ else if (pid_seen == cmd->pid) {
+ int child_code = -1;
+
+ /*
+ * The child started, but exited or was terminated
+ * before becoming "ready".
+ *
+ * We try to match the behavior of `wait_or_whine()`
+ * WRT the handling of WIFSIGNALED() and WIFEXITED()
+ * and convert the child's status to a return code for
+ * tracing purposes and emit the `trace2_child_exit()`
+ * event.
+ *
+ * We do not want the wait_or_whine() error message
+ * because we will be called by client-side library
+ * routines.
+ */
+ if (WIFEXITED(wait_status))
+ child_code = WEXITSTATUS(wait_status);
+ else if (WIFSIGNALED(wait_status))
+ child_code = WTERMSIG(wait_status) + 128;
+ trace2_child_exit(cmd, child_code);
+
+ sbgr = SBGR_DIED;
+ goto done;
+ }
+
+ else if (pid_seen < 0 && errno == EINTR)
+ goto wait;
+
+ trace2_child_exit(cmd, -1);
+ sbgr = SBGR_ERROR;
+
+done:
+ child_process_clear(cmd);
+ invalidate_lstat_cache();
+ return sbgr;
}
diff --git a/run-command.h b/run-command.h
index b9aff74..8a700da 100644
--- a/run-command.h
+++ b/run-command.h
@@ -44,23 +44,36 @@
struct child_process {
/**
- * The .argv member is set up as an array of string pointers (NULL
- * terminated), of which .argv[0] is the program name to run (usually
- * without a path). If the command to run is a git command, set argv[0] to
- * the command name without the 'git-' prefix and set .git_cmd = 1.
+ * The .args is a `struct strvec', use that API to manipulate
+ * it, e.g. strvec_pushv() to add an existing "const char **"
+ * vector.
*
- * Note that the ownership of the memory pointed to by .argv stays with the
- * caller, but it should survive until `finish_command` completes. If the
- * .argv member is NULL, `start_command` will point it at the .args
- * `strvec` (so you may use one or the other, but you must use exactly
- * one). The memory in .args will be cleaned up automatically during
+ * If the command to run is a git command, set the first
+ * element in the strvec to the command name without the
+ * 'git-' prefix and set .git_cmd = 1.
+ *
+ * The memory in .args will be cleaned up automatically during
* `finish_command` (or during `start_command` when it is unsuccessful).
- *
*/
- const char **argv;
-
struct strvec args;
- struct strvec env_array;
+
+ /**
+ * Like .args the .env is a `struct strvec'.
+ *
+ * To modify the environment of the sub-process, specify an array of
+ * environment settings. Each string in the array manipulates the
+ * environment.
+ *
+ * - If the string is of the form "VAR=value", i.e. it contains '='
+ * the variable is added to the child process's environment.
+ *
+ * - If the string does not contain '=', it names an environment
+ * variable that will be removed from the child process's environment.
+ *
+ * The memory in .env will be cleaned up automatically during
+ * `finish_command` (or during `start_command` when it is unsuccessful).
+ */
+ struct strvec env;
pid_t pid;
int trace2_child_id;
@@ -96,23 +109,6 @@ struct child_process {
*/
const char *dir;
- /**
- * To modify the environment of the sub-process, specify an array of
- * string pointers (NULL terminated) in .env:
- *
- * - If the string is of the form "VAR=value", i.e. it contains '='
- * the variable is added to the child process's environment.
- *
- * - If the string does not contain '=', it names an environment
- * variable that will be removed from the child process's environment.
- *
- * If the .env member is NULL, `start_command` will point it at the
- * .env_array `strvec` (so you may use one or the other, but not both).
- * The memory in .env_array will be cleaned up automatically during
- * `finish_command` (or during `start_command` when it is unsuccessful).
- */
- const char *const *env;
-
unsigned no_stdin:1;
unsigned no_stdout:1;
unsigned no_stderr:1;
@@ -146,12 +142,11 @@ struct child_process {
unsigned clean_on_exit:1;
unsigned wait_after_clean:1;
void (*clean_on_exit_handler)(struct child_process *process);
- void *clean_on_exit_handler_cbdata;
};
#define CHILD_PROCESS_INIT { \
.args = STRVEC_INIT, \
- .env_array = STRVEC_INIT, \
+ .env = STRVEC_INIT, \
}
/**
@@ -225,30 +220,6 @@ int finish_command_in_signal(struct child_process *);
int run_command(struct child_process *);
/*
- * Returns the path to the hook file, or NULL if the hook is missing
- * or disabled. Note that this points to static storage that will be
- * overwritten by further calls to find_hook and run_hook_*.
- */
-const char *find_hook(const char *name);
-
-/**
- * Run a hook.
- * The first argument is a pathname to an index file, or NULL
- * if the hook uses the default index file or no index is needed.
- * The second argument is the name of the hook.
- * The further arguments correspond to the hook arguments.
- * The last argument has to be NULL to terminate the arguments list.
- * If the hook does not exist or is not executable, the return
- * value will be zero.
- * If it is executable, the hook will be executed and the exit
- * status of the hook is returned.
- * On execution, .stdout_to_stderr and .no_stdin will be set.
- */
-LAST_ARG_MUST_BE_NULL
-int run_hook_le(const char *const *env, const char *name, ...);
-int run_hook_ve(const char *const *env, const char *name, va_list args);
-
-/*
* Trigger an auto-gc
*/
int run_auto_maintenance(int quiet);
@@ -508,13 +479,70 @@ int run_processes_parallel_tr2(int n, get_next_task_fn, start_failure_fn,
const char *tr2_category, const char *tr2_label);
/**
- * Convenience function which prepares env_array for a command to be run in a
- * new repo. This adds all GIT_* environment variables to env_array with the
+ * Convenience function which prepares env for a command to be run in a
+ * new repo. This adds all GIT_* environment variables to env with the
* exception of GIT_CONFIG_PARAMETERS and GIT_CONFIG_COUNT (which cause the
* corresponding environment variables to be unset in the subprocess) and adds
* an environment variable pointing to new_git_dir. See local_repo_env in
* cache.h for more information.
*/
-void prepare_other_repo_env(struct strvec *env_array, const char *new_git_dir);
+void prepare_other_repo_env(struct strvec *env, const char *new_git_dir);
+
+/**
+ * Possible return values for start_bg_command().
+ */
+enum start_bg_result {
+ /* child process is "ready" */
+ SBGR_READY = 0,
+
+ /* child process could not be started */
+ SBGR_ERROR,
+
+ /* callback error when testing for "ready" */
+ SBGR_CB_ERROR,
+
+ /* timeout expired waiting for child to become "ready" */
+ SBGR_TIMEOUT,
+
+ /* child process exited or was signalled before becomming "ready" */
+ SBGR_DIED,
+};
+
+/**
+ * Callback used by start_bg_command() to ask whether the
+ * child process is ready or needs more time to become "ready".
+ *
+ * The callback will receive the cmd and cb_data arguments given to
+ * start_bg_command().
+ *
+ * Returns 1 is child needs more time (subject to the requested timeout).
+ * Returns 0 if child is "ready".
+ * Returns -1 on any error and cause start_bg_command() to also error out.
+ */
+typedef int(start_bg_wait_cb)(const struct child_process *cmd, void *cb_data);
+
+/**
+ * Start a command in the background. Wait long enough for the child
+ * to become "ready" (as defined by the provided callback). Capture
+ * immediate errors (like failure to start) and any immediate exit
+ * status (such as a shutdown/signal before the child became "ready")
+ * and return this like start_command().
+ *
+ * We run a custom wait loop using the provided callback to wait for
+ * the child to start and become "ready". This is limited by the given
+ * timeout value.
+ *
+ * If the child does successfully start and become "ready", we orphan
+ * it into the background.
+ *
+ * The caller must not call finish_command().
+ *
+ * The opaque cb_data argument will be forwarded to the callback for
+ * any instance data that it might require. This may be NULL.
+ */
+enum start_bg_result start_bg_command(struct child_process *cmd,
+ start_bg_wait_cb *wait_cb,
+ void *cb_data,
+ unsigned int timeout_sec);
#endif
diff --git a/send-pack.c b/send-pack.c
index b3a495b..bc0fcdb 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -341,13 +341,13 @@ static int generate_push_cert(struct strbuf *req_buf,
{
const struct ref *ref;
struct string_list_item *item;
- char *signing_key = xstrdup(get_signing_key());
+ char *signing_key_id = xstrdup(get_signing_key_id());
const char *cp, *np;
struct strbuf cert = STRBUF_INIT;
int update_seen = 0;
strbuf_addstr(&cert, "certificate version 0.1\n");
- strbuf_addf(&cert, "pusher %s ", signing_key);
+ strbuf_addf(&cert, "pusher %s ", signing_key_id);
datestamp(&cert);
strbuf_addch(&cert, '\n');
if (args->url && *args->url) {
@@ -374,7 +374,7 @@ static int generate_push_cert(struct strbuf *req_buf,
if (!update_seen)
goto free_return;
- if (sign_buffer(&cert, &cert, signing_key))
+ if (sign_buffer(&cert, &cert, get_signing_key()))
die(_("failed to sign the push certificate"));
packet_buf_write(req_buf, "push-cert%c%s", 0, cap_string);
@@ -386,7 +386,7 @@ static int generate_push_cert(struct strbuf *req_buf,
packet_buf_write(req_buf, "push-cert-end\n");
free_return:
- free(signing_key);
+ free(signing_key_id);
strbuf_release(&cert);
return update_seen;
}
diff --git a/sequencer.c b/sequencer.c
index 64b1f2e..950733a 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -8,6 +8,7 @@
#include "sequencer.h"
#include "tag.h"
#include "run-command.h"
+#include "hook.h"
#include "exec-cmd.h"
#include "utf8.h"
#include "cache-tree.h"
@@ -918,7 +919,7 @@ static char *get_author(const char *message)
return NULL;
}
-static const char *author_date_from_env_array(const struct strvec *env)
+static const char *author_date_from_env(const struct strvec *env)
{
int i;
const char *date;
@@ -996,8 +997,10 @@ static int run_git_commit(const char *defmsg,
cmd.git_cmd = 1;
- if (is_rebase_i(opts) && !(!defmsg && (flags & AMEND_MSG)) &&
- read_env_script(&cmd.env_array)) {
+ if (is_rebase_i(opts) &&
+ ((opts->committer_date_is_author_date && !opts->ignore_date) ||
+ !(!defmsg && (flags & AMEND_MSG))) &&
+ read_env_script(&cmd.env)) {
const char *gpg_opt = gpg_sign_opt_quoted(opts);
return error(_(staged_changes_advice),
@@ -1005,12 +1008,12 @@ static int run_git_commit(const char *defmsg,
}
if (opts->committer_date_is_author_date)
- strvec_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s",
+ strvec_pushf(&cmd.env, "GIT_COMMITTER_DATE=%s",
opts->ignore_date ?
"" :
- author_date_from_env_array(&cmd.env_array));
+ author_date_from_env(&cmd.env));
if (opts->ignore_date)
- strvec_push(&cmd.env_array, "GIT_AUTHOR_DATE=");
+ strvec_push(&cmd.env, "GIT_AUTHOR_DATE=");
strvec_push(&cmd.args, "commit");
@@ -1161,18 +1164,14 @@ static int run_rewrite_hook(const struct object_id *oldoid,
const struct object_id *newoid)
{
struct child_process proc = CHILD_PROCESS_INIT;
- const char *argv[3];
int code;
struct strbuf sb = STRBUF_INIT;
+ const char *hook_path = find_hook("post-rewrite");
- argv[0] = find_hook("post-rewrite");
- if (!argv[0])
+ if (!hook_path)
return 0;
- argv[1] = "amend";
- argv[2] = NULL;
-
- proc.argv = argv;
+ strvec_pushl(&proc.args, hook_path, "amend", NULL);
proc.in = -1;
proc.stdout_to_stderr = 1;
proc.trace2_hook_name = "post-rewrite";
@@ -1221,7 +1220,7 @@ static int run_prepare_commit_msg_hook(struct repository *r,
} else {
arg1 = "message";
}
- if (run_commit_hook(0, r->index_file, "prepare-commit-msg", name,
+ if (run_commit_hook(0, r->index_file, NULL, "prepare-commit-msg", name,
arg1, arg2, NULL))
ret = error(_("'prepare-commit-msg' hook failed"));
@@ -1281,6 +1280,7 @@ void print_commit_summary(struct repository *r,
struct pretty_print_context pctx = {0};
struct strbuf author_ident = STRBUF_INIT;
struct strbuf committer_ident = STRBUF_INIT;
+ struct ref_store *refs;
commit = lookup_commit(r, oid);
if (!commit)
@@ -1327,12 +1327,12 @@ void print_commit_summary(struct repository *r,
get_commit_format(format.buf, &rev);
rev.always_show_header = 0;
rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
- rev.diffopt.break_opt = 0;
diff_setup_done(&rev.diffopt);
- head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
+ refs = get_main_ref_store(the_repository);
+ head = refs_resolve_ref_unsafe(refs, "HEAD", 0, NULL, NULL);
if (!head)
- die_errno(_("unable to resolve HEAD after creating commit"));
+ die(_("unable to resolve HEAD after creating commit"));
if (!strcmp(head, "HEAD"))
head = _("detached HEAD");
else
@@ -1346,6 +1346,7 @@ void print_commit_summary(struct repository *r,
log_tree_commit(&rev, commit);
}
+ release_revisions(&rev);
strbuf_release(&format);
}
@@ -1459,7 +1460,7 @@ static int try_to_commit(struct repository *r,
}
}
- if (find_hook("prepare-commit-msg")) {
+ if (hook_exists("prepare-commit-msg")) {
res = run_prepare_commit_msg_hook(r, msg, hook_commit);
if (res)
goto out;
@@ -1551,7 +1552,7 @@ static int try_to_commit(struct repository *r,
goto out;
}
- run_commit_hook(0, r->index_file, "post-commit", NULL);
+ run_commit_hook(0, r->index_file, NULL, "post-commit", NULL);
if (flags & AMEND_MSG)
commit_post_rewrite(r, current_head, oid);
@@ -2801,7 +2802,7 @@ static int populate_opts_cb(const char *key, const char *value, void *data)
return error(_("invalid key: %s"), key);
if (!error_flag)
- return error(_("invalid value for %s: %s"), key, value);
+ return error(_("invalid value for '%s': '%s'"), key, value);
return 0;
}
@@ -3414,6 +3415,7 @@ static int make_patch(struct repository *r,
unuse_commit_buffer(commit, commit_buffer);
}
strbuf_release(&buf);
+ release_revisions(&log_tree_opt);
return res;
}
@@ -3492,17 +3494,12 @@ static int error_failed_squash(struct repository *r,
static int do_exec(struct repository *r, const char *command_line)
{
- struct strvec child_env = STRVEC_INIT;
const char *child_argv[] = { NULL, NULL };
int dirty, status;
fprintf(stderr, _("Executing: %s\n"), command_line);
child_argv[0] = command_line;
- strvec_pushf(&child_env, "GIT_DIR=%s", absolute_path(get_git_dir()));
- strvec_pushf(&child_env, "GIT_WORK_TREE=%s",
- absolute_path(get_git_work_tree()));
- status = run_command_v_opt_cd_env(child_argv, RUN_USING_SHELL, NULL,
- child_env.v);
+ status = run_command_v_opt(child_argv, RUN_USING_SHELL);
/* force re-reading of the cache */
if (discard_index(r->index) < 0 || repo_read_index(r) < 0)
@@ -3532,8 +3529,6 @@ static int do_exec(struct repository *r, const char *command_line)
status = 1;
}
- strvec_clear(&child_env);
-
return status;
}
@@ -3644,9 +3639,9 @@ static int do_reset(struct repository *r,
struct strbuf ref_name = STRBUF_INIT;
struct object_id oid;
struct lock_file lock = LOCK_INIT;
- struct tree_desc desc;
+ struct tree_desc desc = { 0 };
struct tree *tree;
- struct unpack_trees_options unpack_tree_opts;
+ struct unpack_trees_options unpack_tree_opts = { 0 };
int ret = 0;
if (repo_hold_locked_index(r, &lock, LOCK_REPORT_ON_ERROR) < 0)
@@ -3678,14 +3673,11 @@ static int do_reset(struct repository *r,
strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name);
if (get_oid(ref_name.buf, &oid) &&
get_oid(ref_name.buf + strlen("refs/rewritten/"), &oid)) {
- error(_("could not read '%s'"), ref_name.buf);
- rollback_lock_file(&lock);
- strbuf_release(&ref_name);
- return -1;
+ ret = error(_("could not read '%s'"), ref_name.buf);
+ goto cleanup;
}
}
- memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts));
setup_unpack_trees_porcelain(&unpack_tree_opts, "reset");
unpack_tree_opts.head_idx = 1;
unpack_tree_opts.src_index = r->index;
@@ -3693,27 +3685,22 @@ static int do_reset(struct repository *r,
unpack_tree_opts.fn = oneway_merge;
unpack_tree_opts.merge = 1;
unpack_tree_opts.update = 1;
+ unpack_tree_opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
init_checkout_metadata(&unpack_tree_opts.meta, name, &oid, NULL);
if (repo_read_index_unmerged(r)) {
- rollback_lock_file(&lock);
- strbuf_release(&ref_name);
- return error_resolve_conflict(_(action_name(opts)));
+ ret = error_resolve_conflict(_(action_name(opts)));
+ goto cleanup;
}
if (!fill_tree_descriptor(r, &desc, &oid)) {
- error(_("failed to find tree of %s"), oid_to_hex(&oid));
- rollback_lock_file(&lock);
- free((void *)desc.buffer);
- strbuf_release(&ref_name);
- return -1;
+ ret = error(_("failed to find tree of %s"), oid_to_hex(&oid));
+ goto cleanup;
}
if (unpack_trees(1, &desc, &unpack_tree_opts)) {
- rollback_lock_file(&lock);
- free((void *)desc.buffer);
- strbuf_release(&ref_name);
- return -1;
+ ret = -1;
+ goto cleanup;
}
tree = parse_tree_indirect(&oid);
@@ -3721,14 +3708,17 @@ static int do_reset(struct repository *r,
if (write_locked_index(r->index, &lock, COMMIT_LOCK) < 0)
ret = error(_("could not write index"));
- free((void *)desc.buffer);
if (!ret)
ret = update_ref(reflog_message(opts, "reset", "'%.*s'",
len, name), "HEAD", &oid,
NULL, 0, UPDATE_REFS_MSG_ON_ERR);
-
+cleanup:
+ free((void *)desc.buffer);
+ if (ret < 0)
+ rollback_lock_file(&lock);
strbuf_release(&ref_name);
+ clear_unpack_trees_porcelain(&unpack_tree_opts);
return ret;
}
@@ -3760,7 +3750,7 @@ static int do_merge(struct repository *r,
int run_commit_flags = 0;
struct strbuf ref_name = STRBUF_INIT;
struct commit *head_commit, *merge_commit, *i;
- struct commit_list *bases, *j, *reversed = NULL;
+ struct commit_list *bases, *j;
struct commit_list *to_merge = NULL, **tail = &to_merge;
const char *strategy = !opts->xopts_nr &&
(!opts->strategy ||
@@ -3923,7 +3913,7 @@ static int do_merge(struct repository *r,
/* Octopus merge */
struct child_process cmd = CHILD_PROCESS_INIT;
- if (read_env_script(&cmd.env_array)) {
+ if (read_env_script(&cmd.env)) {
const char *gpg_opt = gpg_sign_opt_quoted(opts);
ret = error(_(staged_changes_advice), gpg_opt, gpg_opt);
@@ -3931,12 +3921,12 @@ static int do_merge(struct repository *r,
}
if (opts->committer_date_is_author_date)
- strvec_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s",
+ strvec_pushf(&cmd.env, "GIT_COMMITTER_DATE=%s",
opts->ignore_date ?
"" :
- author_date_from_env_array(&cmd.env_array));
+ author_date_from_env(&cmd.env));
if (opts->ignore_date)
- strvec_push(&cmd.env_array, "GIT_AUTHOR_DATE=");
+ strvec_push(&cmd.env, "GIT_AUTHOR_DATE=");
cmd.git_cmd = 1;
strvec_push(&cmd.args, "merge");
@@ -3995,9 +3985,7 @@ static int do_merge(struct repository *r,
git_path_merge_head(r), 0);
write_message("no-ff", 5, git_path_merge_mode(r), 0);
- for (j = bases; j; j = j->next)
- commit_list_insert(j->item, &reversed);
- free_commit_list(bases);
+ bases = reverse_commit_list(bases);
repo_read_index(r);
init_merge_options(&o, r);
@@ -4013,10 +4001,10 @@ static int do_merge(struct repository *r,
* update the index and working copy immediately.
*/
ret = merge_ort_recursive(&o,
- head_commit, merge_commit, reversed,
+ head_commit, merge_commit, bases,
&i);
} else {
- ret = merge_recursive(&o, head_commit, merge_commit, reversed,
+ ret = merge_recursive(&o, head_commit, merge_commit, bases,
&i);
}
if (ret <= 0)
@@ -4096,8 +4084,7 @@ static enum todo_command peek_command(struct todo_list *todo_list, int offset)
return -1;
}
-void create_autostash(struct repository *r, const char *path,
- const char *default_reflog_action)
+void create_autostash(struct repository *r, const char *path)
{
struct strbuf buf = STRBUF_INIT;
struct lock_file lock_file = LOCK_INIT;
@@ -4112,6 +4099,7 @@ void create_autostash(struct repository *r, const char *path,
if (has_unstaged_changes(r, 1) ||
has_uncommitted_changes(r, 1)) {
struct child_process stash = CHILD_PROCESS_INIT;
+ struct reset_head_opts ropts = { .flags = RESET_HEAD_HARD };
struct object_id oid;
strvec_pushl(&stash.args,
@@ -4133,11 +4121,8 @@ void create_autostash(struct repository *r, const char *path,
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)
+ if (reset_head(r, &ropts) < 0)
die(_("could not reset --hard"));
-
if (discard_index(r->index) < 0 ||
repo_read_index(r) < 0)
die(_("could not read index"));
@@ -4222,42 +4207,26 @@ int apply_autostash_oid(const char *stash_oid)
return apply_save_autostash_oid(stash_oid, 1);
}
-static int run_git_checkout(struct repository *r, struct replay_opts *opts,
- const char *commit, const char *action)
-{
- struct child_process cmd = CHILD_PROCESS_INIT;
- int ret;
-
- cmd.git_cmd = 1;
-
- strvec_push(&cmd.args, "checkout");
- strvec_push(&cmd.args, commit);
- strvec_pushf(&cmd.env_array, GIT_REFLOG_ACTION "=%s", action);
-
- if (opts->verbose)
- ret = run_command(&cmd);
- else
- ret = run_command_silent_on_success(&cmd);
-
- if (!ret)
- discard_index(r->index);
-
- return ret;
-}
-
static int checkout_onto(struct repository *r, struct replay_opts *opts,
const char *onto_name, const struct object_id *onto,
const struct object_id *orig_head)
{
- const char *action = reflog_message(opts, "start", "checkout %s", onto_name);
-
- if (run_git_checkout(r, opts, oid_to_hex(onto), action)) {
+ struct reset_head_opts ropts = {
+ .oid = onto,
+ .orig_head = orig_head,
+ .flags = RESET_HEAD_DETACH | RESET_ORIG_HEAD |
+ RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
+ .head_msg = reflog_message(opts, "start", "checkout %s",
+ onto_name),
+ .default_reflog_action = "rebase"
+ };
+ if (reset_head(r, &ropts)) {
apply_autostash(rebase_path_autostash());
sequencer_remove_state(opts);
return error(_("could not detach HEAD"));
}
- return update_ref(NULL, "ORIG_HEAD", orig_head, NULL, 0, UPDATE_REFS_MSG_ON_ERR);
+ return 0;
}
static int stopped_at_head(struct repository *r)
@@ -4557,6 +4526,7 @@ static int pick_commits(struct repository *r,
&log_tree_opt.diffopt);
log_tree_diff_flush(&log_tree_opt);
}
+ release_revisions(&log_tree_opt);
}
flush_rewritten_pending();
if (!stat(rebase_path_rewritten_list(), &st) &&
@@ -5383,6 +5353,7 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
int rebase_merges = flags & TODO_LIST_REBASE_MERGES;
int reapply_cherry_picks = flags & TODO_LIST_REAPPLY_CHERRY_PICKS;
int skipped_commit = 0;
+ int ret = 0;
repo_init_revisions(r, &revs, NULL);
revs.verbose_header = 1;
@@ -5406,14 +5377,20 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
pp.fmt = revs.commit_format;
pp.output_encoding = get_log_output_encoding();
- if (setup_revisions(argc, argv, &revs, NULL) > 1)
- return error(_("make_script: unhandled options"));
+ if (setup_revisions(argc, argv, &revs, NULL) > 1) {
+ ret = error(_("make_script: unhandled options"));
+ goto cleanup;
+ }
- if (prepare_revision_walk(&revs) < 0)
- return error(_("make_script: error preparing revisions"));
+ if (prepare_revision_walk(&revs) < 0) {
+ ret = error(_("make_script: error preparing revisions"));
+ goto cleanup;
+ }
- if (rebase_merges)
- return make_script_with_merges(&pp, &revs, out, flags);
+ if (rebase_merges) {
+ ret = make_script_with_merges(&pp, &revs, out, flags);
+ goto cleanup;
+ }
while ((commit = get_revision(&revs))) {
int is_empty = is_original_commit_empty(commit);
@@ -5437,15 +5414,17 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
if (skipped_commit)
advise_if_enabled(ADVICE_SKIPPED_CHERRY_PICKS,
_("use --reapply-cherry-picks to include skipped commits"));
- return 0;
+cleanup:
+ release_revisions(&revs);
+ return ret;
}
/*
* Add commands after pick and (series of) squash/fixup commands
* in the todo list.
*/
-void todo_list_add_exec_commands(struct todo_list *todo_list,
- struct string_list *commands)
+static void todo_list_add_exec_commands(struct todo_list *todo_list,
+ struct string_list *commands)
{
struct strbuf *buf = &todo_list->buf;
size_t base_offset = buf->len;
@@ -5498,7 +5477,7 @@ void todo_list_add_exec_commands(struct todo_list *todo_list,
}
/* insert or append final <commands> */
- if (insert || nr == todo_list->nr) {
+ if (insert) {
ALLOC_GROW(items, nr + commands->nr, alloc);
COPY_ARRAY(items + nr, base_items, commands->nr);
nr += commands->nr;
diff --git a/sequencer.h b/sequencer.h
index d8a1853..da64473 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -162,8 +162,6 @@ int sequencer_remove_state(struct replay_opts *opts);
int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
const char **argv, unsigned flags);
-void todo_list_add_exec_commands(struct todo_list *todo_list,
- struct string_list *commands);
int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
const char *shortrevisions, const char *onto_name,
struct commit *onto, const struct object_id *orig_head,
@@ -199,8 +197,7 @@ void commit_post_rewrite(struct repository *r,
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);
+void create_autostash(struct repository *r, const char *path);
int save_autostash(const char *path);
int apply_autostash(const char *path);
int apply_autostash_oid(const char *stash_oid);
diff --git a/serve.c b/serve.c
index b3fe9b5..733347f 100644
--- a/serve.c
+++ b/serve.c
@@ -3,7 +3,6 @@
#include "config.h"
#include "pkt-line.h"
#include "version.h"
-#include "strvec.h"
#include "ls-refs.h"
#include "protocol-caps.h"
#include "serve.h"
diff --git a/setup.c b/setup.c
index 347d718..faf5095 100644
--- a/setup.c
+++ b/setup.c
@@ -5,6 +5,7 @@
#include "string-list.h"
#include "chdir-notify.h"
#include "promisor-remote.h"
+#include "quote.h"
static int inside_git_dir = -1;
static int inside_work_tree = -1;
@@ -12,6 +13,7 @@ static int work_tree_config_is_bogus;
static struct startup_info the_startup_info;
struct startup_info *startup_info = &the_startup_info;
+const char *tmp_original_cwd;
/*
* The input parameter must contain an absolute path, and it must already be
@@ -432,6 +434,78 @@ void setup_work_tree(void)
initialized = 1;
}
+static void setup_original_cwd(void)
+{
+ struct strbuf tmp = STRBUF_INIT;
+ const char *worktree = NULL;
+ int offset = -1;
+
+ if (!tmp_original_cwd)
+ return;
+
+ /*
+ * startup_info->original_cwd points to the current working
+ * directory we inherited from our parent process, which is a
+ * directory we want to avoid removing.
+ *
+ * For convience, we would like to have the path relative to the
+ * worktree instead of an absolute path.
+ *
+ * Yes, startup_info->original_cwd is usually the same as 'prefix',
+ * but differs in two ways:
+ * - prefix has a trailing '/'
+ * - if the user passes '-C' to git, that modifies the prefix but
+ * not startup_info->original_cwd.
+ */
+
+ /* Normalize the directory */
+ if (!strbuf_realpath(&tmp, tmp_original_cwd, 0)) {
+ trace2_data_string("setup", the_repository,
+ "realpath-path", tmp_original_cwd);
+ trace2_data_string("setup", the_repository,
+ "realpath-failure", strerror(errno));
+ free((char*)tmp_original_cwd);
+ tmp_original_cwd = NULL;
+ return;
+ }
+
+ free((char*)tmp_original_cwd);
+ tmp_original_cwd = NULL;
+ startup_info->original_cwd = strbuf_detach(&tmp, NULL);
+
+ /*
+ * Get our worktree; we only protect the current working directory
+ * if it's in the worktree.
+ */
+ worktree = get_git_work_tree();
+ if (!worktree)
+ goto no_prevention_needed;
+
+ offset = dir_inside_of(startup_info->original_cwd, worktree);
+ if (offset >= 0) {
+ /*
+ * If startup_info->original_cwd == worktree, that is already
+ * protected and we don't need original_cwd as a secondary
+ * protection measure.
+ */
+ if (!*(startup_info->original_cwd + offset))
+ goto no_prevention_needed;
+
+ /*
+ * original_cwd was inside worktree; precompose it just as
+ * we do prefix so that built up paths will match
+ */
+ startup_info->original_cwd = \
+ precompose_string_if_needed(startup_info->original_cwd
+ + offset);
+ return;
+ }
+
+no_prevention_needed:
+ free((char*)startup_info->original_cwd);
+ startup_info->original_cwd = NULL;
+}
+
static int read_worktree_config(const char *var, const char *value, void *vdata)
{
struct repository_format *data = vdata;
@@ -495,7 +569,8 @@ static enum extension_result handle_extension(const char *var,
return config_error_nonbool(var);
format = hash_algo_by_name(value);
if (format == GIT_HASH_UNKNOWN)
- return error("invalid value for 'extensions.objectformat'");
+ return error(_("invalid value for '%s': '%s'"),
+ "extensions.objectformat", value);
data->hash_algo = format;
return EXTENSION_OK;
}
@@ -1025,6 +1100,48 @@ static int canonicalize_ceiling_entry(struct string_list_item *item,
}
}
+struct safe_directory_data {
+ const char *path;
+ int is_safe;
+};
+
+static int safe_directory_cb(const char *key, const char *value, void *d)
+{
+ struct safe_directory_data *data = d;
+
+ if (strcmp(key, "safe.directory"))
+ return 0;
+
+ if (!value || !*value) {
+ data->is_safe = 0;
+ } else if (!strcmp(value, "*")) {
+ data->is_safe = 1;
+ } else {
+ const char *interpolated = NULL;
+
+ if (!git_config_pathname(&interpolated, key, value) &&
+ !fspathcmp(data->path, interpolated ? interpolated : value))
+ data->is_safe = 1;
+
+ free((char *)interpolated);
+ }
+
+ return 0;
+}
+
+static int ensure_valid_ownership(const char *path)
+{
+ struct safe_directory_data data = { .path = path };
+
+ if (!git_env_bool("GIT_TEST_ASSUME_DIFFERENT_OWNER", 0) &&
+ is_path_owned_by_current_user(path))
+ return 1;
+
+ read_very_early_config(safe_directory_cb, &data);
+
+ return data.is_safe;
+}
+
enum discovery_result {
GIT_DIR_NONE = 0,
GIT_DIR_EXPLICIT,
@@ -1033,7 +1150,8 @@ enum discovery_result {
/* these are errors */
GIT_DIR_HIT_CEILING = -1,
GIT_DIR_HIT_MOUNT_POINT = -2,
- GIT_DIR_INVALID_GITFILE = -3
+ GIT_DIR_INVALID_GITFILE = -3,
+ GIT_DIR_INVALID_OWNERSHIP = -4
};
/*
@@ -1123,11 +1241,15 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
}
strbuf_setlen(dir, offset);
if (gitdirenv) {
+ if (!ensure_valid_ownership(dir->buf))
+ return GIT_DIR_INVALID_OWNERSHIP;
strbuf_addstr(gitdir, gitdirenv);
return GIT_DIR_DISCOVERED;
}
if (is_git_directory(dir->buf)) {
+ if (!ensure_valid_ownership(dir->buf))
+ return GIT_DIR_INVALID_OWNERSHIP;
strbuf_addstr(gitdir, ".");
return GIT_DIR_BARE;
}
@@ -1259,6 +1381,19 @@ const char *setup_git_directory_gently(int *nongit_ok)
dir.buf);
*nongit_ok = 1;
break;
+ case GIT_DIR_INVALID_OWNERSHIP:
+ if (!nongit_ok) {
+ struct strbuf quoted = STRBUF_INIT;
+
+ sq_quote_buf_pretty("ed, dir.buf);
+ die(_("unsafe repository ('%s' is owned by someone else)\n"
+ "To add an exception for this directory, call:\n"
+ "\n"
+ "\tgit config --global --add safe.directory %s"),
+ dir.buf, quoted.buf);
+ }
+ *nongit_ok = 1;
+ break;
case GIT_DIR_NONE:
/*
* As a safeguard against setup_git_directory_gently_1 returning
@@ -1330,6 +1465,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
setenv(GIT_PREFIX_ENVIRONMENT, "", 1);
}
+ setup_original_cwd();
strbuf_release(&dir);
strbuf_release(&gitdir);
@@ -1343,7 +1479,7 @@ int git_config_perm(const char *var, const char *value)
int i;
char *endptr;
- if (value == NULL)
+ if (!value)
return PERM_GROUP;
if (!strcmp(value, "umask"))
diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c
index 6cd307a..133496b 100644
--- a/sh-i18n--envsubst.c
+++ b/sh-i18n--envsubst.c
@@ -397,7 +397,7 @@ subst_from_stdin (void)
/* Substitute the variable's value from the environment. */
const char *env_value = getenv (buffer);
- if (env_value != NULL)
+ if (env_value)
fputs (env_value, stdout);
}
else
diff --git a/shallow.c b/shallow.c
index 9ed18eb..4270471 100644
--- a/shallow.c
+++ b/shallow.c
@@ -90,6 +90,7 @@ static void reset_repository_shallow(struct repository *r)
{
r->parsed_objects->is_shallow = -1;
stat_validity_clear(r->parsed_objects->shallow_stat);
+ reset_commit_grafts(r);
}
int commit_shallow_file(struct repository *r, struct shallow_lock *lk)
@@ -261,6 +262,7 @@ struct commit_list *get_shallow_commits_by_rev_list(int ac, const char **av,
if ((o->flags & both_flags) == both_flags)
o->flags &= ~not_shallow_flag;
}
+ release_revisions(&revs);
return result;
}
@@ -559,7 +561,7 @@ static void paint_down(struct paint_info *info, const struct object_id *oid,
else
c->object.flags |= SEEN;
- if (*refs == NULL)
+ if (!*refs)
*refs = bitmap;
else {
memcpy(tmp, *refs, bitmap_size);
@@ -603,7 +605,7 @@ static int mark_uninteresting(const char *refname, const struct object_id *oid,
if (!commit)
return 0;
commit->object.flags |= UNINTERESTING;
- mark_parents_uninteresting(commit);
+ mark_parents_uninteresting(NULL, commit);
return 0;
}
diff --git a/shared.mak b/shared.mak
new file mode 100644
index 0000000..4330192
--- /dev/null
+++ b/shared.mak
@@ -0,0 +1,105 @@
+### Remove GNU make implicit rules
+
+## This speeds things up since we don't need to look for and stat() a
+## "foo.c,v" every time a rule referring to "foo.c" is in play. See
+## "make -p -f/dev/null | grep ^%::'".
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
+
+## Likewise delete default $(SUFFIXES). See:
+##
+## info make --index-search=.SUFFIXES
+.SUFFIXES:
+
+### Flags affecting all rules
+
+# A GNU make extension since gmake 3.72 (released in late 1994) to
+# remove the target of rules if commands in those rules fail. The
+# default is to only do that if make itself receives a signal. Affects
+# all targets, see:
+#
+# info make --index-search=.DELETE_ON_ERROR
+.DELETE_ON_ERROR:
+
+### Global variables
+
+## comma, empty, space: handy variables as these tokens are either
+## special or can be hard to spot among other Makefile syntax.
+comma := ,
+empty :=
+space := $(empty) $(empty)
+
+### Quieting
+## common
+QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
+QUIET_SUBDIR1 =
+
+ifneq ($(findstring w,$(MAKEFLAGS)),w)
+PRINT_DIR = --no-print-directory
+else # "make -w"
+NO_SUBDIR = :
+endif
+
+ifneq ($(findstring s,$(MAKEFLAGS)),s)
+ifndef V
+## common
+ QUIET_SUBDIR0 = +@subdir=
+ QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
+ $(MAKE) $(PRINT_DIR) -C $$subdir
+
+ QUIET = @
+ QUIET_GEN = @echo ' ' GEN $@;
+
+ QUIET_MKDIR_P_PARENT = @echo ' ' MKDIR -p $(@D);
+
+## Used in "Makefile"
+ QUIET_CC = @echo ' ' CC $@;
+ QUIET_AR = @echo ' ' AR $@;
+ QUIET_LINK = @echo ' ' LINK $@;
+ QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
+ QUIET_LNCP = @echo ' ' LN/CP $@;
+ QUIET_XGETTEXT = @echo ' ' XGETTEXT $@;
+ QUIET_MSGINIT = @echo ' ' MSGINIT $@;
+ QUIET_MSGFMT = @echo ' ' MSGFMT $@;
+ QUIET_MSGMERGE = @echo ' ' MSGMERGE $@;
+ QUIET_GCOV = @echo ' ' GCOV $@;
+ QUIET_SP = @echo ' ' SP $<;
+ QUIET_HDR = @echo ' ' HDR $(<:hcc=h);
+ QUIET_RC = @echo ' ' RC $@;
+ QUIET_SPATCH = @echo ' ' SPATCH $<;
+
+## Used in "Documentation/Makefile"
+ QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@;
+ QUIET_XMLTO = @echo ' ' XMLTO $@;
+ QUIET_DB2TEXI = @echo ' ' DB2TEXI $@;
+ QUIET_MAKEINFO = @echo ' ' MAKEINFO $@;
+ QUIET_DBLATEX = @echo ' ' DBLATEX $@;
+ QUIET_XSLTPROC = @echo ' ' XSLTPROC $@;
+ QUIET_GEN = @echo ' ' GEN $@;
+ QUIET_STDERR = 2> /dev/null
+
+ QUIET_LINT_GITLINK = @echo ' ' LINT GITLINK $<;
+ QUIET_LINT_MANSEC = @echo ' ' LINT MAN SEC $<;
+ QUIET_LINT_MANEND = @echo ' ' LINT MAN END $<;
+
+ export V
+endif
+endif
+
+### Templates
+
+## mkdir_p_parent: lazily "mkdir -p" the path needed for a $@
+## file. Uses $(wildcard) to avoid the "mkdir -p" if it's not
+## needed.
+##
+## Is racy, but in a good way; we might redundantly (and safely)
+## "mkdir -p" when running in parallel, but won't need to exhaustively create
+## individual rules for "a" -> "prefix" -> "dir" -> "file" if given a
+## "a/prefix/dir/file". This can instead be inserted at the start of
+## the "a/prefix/dir/file" rule.
+define mkdir_p_parent_template
+$(if $(wildcard $(@D)),,$(QUIET_MKDIR_P_PARENT)$(shell mkdir -p $(@D)))
+endef
diff --git a/simple-ipc.h b/simple-ipc.h
index 08b2908..a849d9f 100644
--- a/simple-ipc.h
+++ b/simple-ipc.h
@@ -5,13 +5,6 @@
* See Documentation/technical/api-simple-ipc.txt
*/
-#ifdef SUPPORTS_SIMPLE_IPC
-#include "pkt-line.h"
-
-/*
- * Simple IPC Client Side API.
- */
-
enum ipc_active_state {
/*
* The pipe/socket exists and the daemon is waiting for connections.
@@ -43,6 +36,13 @@ enum ipc_active_state {
IPC_STATE__OTHER_ERROR,
};
+#ifdef SUPPORTS_SIMPLE_IPC
+#include "pkt-line.h"
+
+/*
+ * Simple IPC Client Side API.
+ */
+
struct ipc_client_connect_options {
/*
* Spin under timeout if the server is running but can't
@@ -103,7 +103,8 @@ void ipc_client_close_connection(struct ipc_client_connection *connection);
*/
int ipc_client_send_command_to_connection(
struct ipc_client_connection *connection,
- const char *message, struct strbuf *answer);
+ const char *message, size_t message_len,
+ struct strbuf *answer);
/*
* Used by the client to synchronously connect and send and receive a
@@ -115,7 +116,8 @@ int ipc_client_send_command_to_connection(
*/
int ipc_client_send_command(const char *path,
const struct ipc_client_connect_options *options,
- const char *message, struct strbuf *answer);
+ const char *message, size_t message_len,
+ struct strbuf *answer);
/*
* Simple IPC Server Side API.
@@ -140,6 +142,7 @@ typedef int (ipc_server_reply_cb)(struct ipc_server_reply_data *,
*/
typedef int (ipc_server_application_cb)(void *application_data,
const char *request,
+ size_t request_len,
ipc_server_reply_cb *reply_cb,
struct ipc_server_reply_data *reply_data);
diff --git a/sparse-index.c b/sparse-index.c
index 7b7ff79..e4a54ce 100644
--- a/sparse-index.c
+++ b/sparse-index.c
@@ -9,6 +9,11 @@
#include "dir.h"
#include "fsmonitor.h"
+struct modify_index_context {
+ struct index_state *write;
+ struct pattern_list *pl;
+};
+
static struct cache_entry *construct_sparse_dir_entry(
struct index_state *istate,
const char *sparse_dir,
@@ -99,13 +104,9 @@ static int convert_to_sparse_rec(struct index_state *istate,
int set_sparse_index_config(struct repository *repo, int enable)
{
- int res;
- char *config_path = repo_git_path(repo, "config.worktree");
- res = git_config_set_in_file_gently(config_path,
- "index.sparse",
- enable ? "true" : NULL);
- free(config_path);
-
+ int res = repo_config_set_worktree_gently(repo,
+ "index.sparse",
+ enable ? "true" : "false");
prepare_repo_settings(repo);
repo->settings.sparse_index = enable;
return res;
@@ -122,21 +123,21 @@ static int index_has_unmerged_entries(struct index_state *istate)
return 0;
}
-int convert_to_sparse(struct index_state *istate, int flags)
+int is_sparse_index_allowed(struct index_state *istate, int flags)
{
- int test_env;
- if (istate->sparse_index || !istate->cache_nr ||
- !core_apply_sparse_checkout || !core_sparse_checkout_cone)
+ if (!core_apply_sparse_checkout || !core_sparse_checkout_cone)
return 0;
if (!istate->repo)
istate->repo = the_repository;
if (!(flags & SPARSE_INDEX_MEMORY_ONLY)) {
+ int test_env;
+
/*
* The sparse index is not (yet) integrated with a split index.
*/
- if (istate->split_index)
+ if (istate->split_index || git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
return 0;
/*
* The GIT_TEST_SPARSE_INDEX environment variable triggers the
@@ -168,6 +169,19 @@ int convert_to_sparse(struct index_state *istate, int flags)
if (!istate->sparse_checkout_patterns->use_cone_patterns)
return 0;
+ return 1;
+}
+
+int convert_to_sparse(struct index_state *istate, int flags)
+{
+ /*
+ * If the index is already sparse, empty, or otherwise
+ * cannot be converted to sparse, do not convert.
+ */
+ if (istate->sparse_index == INDEX_COLLAPSED || !istate->cache_nr ||
+ !is_sparse_index_allowed(istate, flags))
+ return 0;
+
/*
* NEEDSWORK: If we have unmerged entries, then stay full.
* Unmerged entries prevent the cache-tree extension from working.
@@ -175,17 +189,20 @@ int convert_to_sparse(struct index_state *istate, int flags)
if (index_has_unmerged_entries(istate))
return 0;
- /* Clear and recompute the cache-tree */
- cache_tree_free(&istate->cache_tree);
- /*
- * Silently return if there is a problem with the cache tree update,
- * which might just be due to a conflict state in some entry.
- *
- * This might create new tree objects, so be sure to use
- * WRITE_TREE_MISSING_OK.
- */
- if (cache_tree_update(istate, WRITE_TREE_MISSING_OK))
- return 0;
+ if (!cache_tree_fully_valid(istate->cache_tree)) {
+ /* Clear and recompute the cache-tree */
+ cache_tree_free(&istate->cache_tree);
+
+ /*
+ * Silently return if there is a problem with the cache tree update,
+ * which might just be due to a conflict state in some entry.
+ *
+ * This might create new tree objects, so be sure to use
+ * WRITE_TREE_MISSING_OK.
+ */
+ if (cache_tree_update(istate, WRITE_TREE_MISSING_OK))
+ return 0;
+ }
remove_fsmonitor(istate);
@@ -202,7 +219,7 @@ int convert_to_sparse(struct index_state *istate, int flags)
FREE_AND_NULL(istate->fsmonitor_dirty);
FREE_AND_NULL(istate->fsmonitor_last_update);
- istate->sparse_index = 1;
+ istate->sparse_index = INDEX_COLLAPSED;
trace2_region_leave("index", "convert_to_sparse", istate->repo);
return 0;
}
@@ -219,56 +236,148 @@ static int add_path_to_index(const struct object_id *oid,
struct strbuf *base, const char *path,
unsigned int mode, void *context)
{
- struct index_state *istate = (struct index_state *)context;
+ struct modify_index_context *ctx = (struct modify_index_context *)context;
struct cache_entry *ce;
size_t len = base->len;
- if (S_ISDIR(mode))
- return READ_TREE_RECURSIVE;
+ if (S_ISDIR(mode)) {
+ int dtype;
+ size_t baselen = base->len;
+ if (!ctx->pl)
+ return READ_TREE_RECURSIVE;
- strbuf_addstr(base, path);
+ /*
+ * Have we expanded to a point outside of the sparse-checkout?
+ *
+ * Artificially pad the path name with a slash "/" to
+ * indicate it as a directory, and add an arbitrary file
+ * name ("-") so we can consider base->buf as a file name
+ * to match against the cone-mode patterns.
+ *
+ * If we compared just "path", then we would expand more
+ * than we should. Since every file at root is always
+ * included, we would expand every directory at root at
+ * least one level deep instead of using sparse directory
+ * entries.
+ */
+ strbuf_addstr(base, path);
+ strbuf_add(base, "/-", 2);
- ce = make_cache_entry(istate, mode, oid, base->buf, 0, 0);
+ if (path_matches_pattern_list(base->buf, base->len,
+ NULL, &dtype,
+ ctx->pl, ctx->write)) {
+ strbuf_setlen(base, baselen);
+ return READ_TREE_RECURSIVE;
+ }
+
+ /*
+ * The path "{base}{path}/" is a sparse directory. Create the correct
+ * name for inserting the entry into the index.
+ */
+ strbuf_setlen(base, base->len - 1);
+ } else {
+ strbuf_addstr(base, path);
+ }
+
+ ce = make_cache_entry(ctx->write, mode, oid, base->buf, 0, 0);
ce->ce_flags |= CE_SKIP_WORKTREE | CE_EXTENDED;
- set_index_entry(istate, istate->cache_nr++, ce);
+ set_index_entry(ctx->write, ctx->write->cache_nr++, ce);
strbuf_setlen(base, len);
return 0;
}
-void ensure_full_index(struct index_state *istate)
+void expand_index(struct index_state *istate, struct pattern_list *pl)
{
int i;
struct index_state *full;
struct strbuf base = STRBUF_INIT;
+ const char *tr_region;
+ struct modify_index_context ctx;
- if (!istate || !istate->sparse_index)
+ /*
+ * If the index is already full, then keep it full. We will convert
+ * it to a sparse index on write, if possible.
+ */
+ if (!istate || istate->sparse_index == INDEX_EXPANDED)
return;
+ /*
+ * If our index is sparse, but our new pattern set does not use
+ * cone mode patterns, then we need to expand the index before we
+ * continue. A NULL pattern set indicates a full expansion to a
+ * full index.
+ */
+ if (pl && !pl->use_cone_patterns) {
+ pl = NULL;
+ } else {
+ /*
+ * We might contract file entries into sparse-directory
+ * entries, and for that we will need the cache tree to
+ * be recomputed.
+ */
+ cache_tree_free(&istate->cache_tree);
+
+ /*
+ * If there is a problem creating the cache tree, then we
+ * need to expand to a full index since we cannot satisfy
+ * the current request as a sparse index.
+ */
+ if (cache_tree_update(istate, 0))
+ pl = NULL;
+ }
+
if (!istate->repo)
istate->repo = the_repository;
- trace2_region_enter("index", "ensure_full_index", istate->repo);
+ /*
+ * A NULL pattern set indicates we are expanding a full index, so
+ * we use a special region name that indicates the full expansion.
+ * This is used by test cases, but also helps to differentiate the
+ * two cases.
+ */
+ tr_region = pl ? "expand_index" : "ensure_full_index";
+ trace2_region_enter("index", tr_region, istate->repo);
/* initialize basics of new index */
full = xcalloc(1, sizeof(struct index_state));
memcpy(full, istate, sizeof(struct index_state));
+ /*
+ * This slightly-misnamed 'full' index might still be sparse if we
+ * are only modifying the list of sparse directories. This hinges
+ * on whether we have a non-NULL pattern list.
+ */
+ full->sparse_index = pl ? INDEX_PARTIALLY_SPARSE : INDEX_EXPANDED;
+
/* then change the necessary things */
- full->sparse_index = 0;
full->cache_alloc = (3 * istate->cache_alloc) / 2;
full->cache_nr = 0;
ALLOC_ARRAY(full->cache, full->cache_alloc);
+ ctx.write = full;
+ ctx.pl = pl;
+
for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce = istate->cache[i];
struct tree *tree;
struct pathspec ps;
+ int dtype;
if (!S_ISSPARSEDIR(ce->ce_mode)) {
set_index_entry(full, full->cache_nr++, ce);
continue;
}
+
+ /* We now have a sparse directory entry. Should we expand? */
+ if (pl &&
+ path_matches_pattern_list(ce->name, ce->ce_namelen,
+ NULL, &dtype,
+ pl, istate) == NOT_MATCHED) {
+ set_index_entry(full, full->cache_nr++, ce);
+ continue;
+ }
+
if (!(ce->ce_flags & CE_SKIP_WORKTREE))
warning(_("index entry is a directory, but not sparse (%08x)"),
ce->ce_flags);
@@ -285,7 +394,7 @@ void ensure_full_index(struct index_state *istate)
strbuf_add(&base, ce->name, strlen(ce->name));
read_tree_at(istate->repo, tree, &base, &ps,
- add_path_to_index, full);
+ add_path_to_index, &ctx);
/* free directory entries. full entries are re-used */
discard_cache_entry(ce);
@@ -294,7 +403,7 @@ void ensure_full_index(struct index_state *istate)
/* Copy back into original index. */
memcpy(&istate->name_hash, &full->name_hash, sizeof(full->name_hash));
memcpy(&istate->dir_hash, &full->dir_hash, sizeof(full->dir_hash));
- istate->sparse_index = 0;
+ istate->sparse_index = pl ? INDEX_PARTIALLY_SPARSE : INDEX_EXPANDED;
free(istate->cache);
istate->cache = full->cache;
istate->cache_nr = full->cache_nr;
@@ -310,7 +419,98 @@ void ensure_full_index(struct index_state *istate)
cache_tree_free(&istate->cache_tree);
cache_tree_update(istate, 0);
- trace2_region_leave("index", "ensure_full_index", istate->repo);
+ trace2_region_leave("index", tr_region, istate->repo);
+}
+
+void ensure_full_index(struct index_state *istate)
+{
+ expand_index(istate, NULL);
+}
+
+void ensure_correct_sparsity(struct index_state *istate)
+{
+ /*
+ * If the index can be sparse, make it sparse. Otherwise,
+ * ensure the index is full.
+ */
+ if (is_sparse_index_allowed(istate, 0))
+ convert_to_sparse(istate, 0);
+ else
+ ensure_full_index(istate);
+}
+
+static int path_found(const char *path, const char **dirname, size_t *dir_len,
+ int *dir_found)
+{
+ struct stat st;
+ char *newdir;
+ char *tmp;
+
+ /*
+ * If dirname corresponds to a directory that doesn't exist, and this
+ * path starts with dirname, then path can't exist.
+ */
+ if (!*dir_found && !memcmp(path, *dirname, *dir_len))
+ return 0;
+
+ /*
+ * If path itself exists, return 1.
+ */
+ if (!lstat(path, &st))
+ return 1;
+
+ /*
+ * Otherwise, path does not exist so we'll return 0...but we'll first
+ * determine some info about its parent directory so we can avoid
+ * lstat calls for future cache entries.
+ */
+ newdir = strrchr(path, '/');
+ if (!newdir)
+ return 0; /* Didn't find a parent dir; just return 0 now. */
+
+ /*
+ * If path starts with directory (which we already lstat'ed and found),
+ * then no need to lstat parent directory again.
+ */
+ if (*dir_found && *dirname && memcmp(path, *dirname, *dir_len))
+ return 0;
+
+ /* Free previous dirname, and cache path's dirname */
+ *dirname = path;
+ *dir_len = newdir - path + 1;
+
+ tmp = xstrndup(path, *dir_len);
+ *dir_found = !lstat(tmp, &st);
+ free(tmp);
+
+ return 0;
+}
+
+void clear_skip_worktree_from_present_files(struct index_state *istate)
+{
+ const char *last_dirname = NULL;
+ size_t dir_len = 0;
+ int dir_found = 1;
+
+ int i;
+
+ if (!core_apply_sparse_checkout ||
+ sparse_expect_files_outside_of_patterns)
+ return;
+
+restart:
+ for (i = 0; i < istate->cache_nr; i++) {
+ struct cache_entry *ce = istate->cache[i];
+
+ if (ce_skip_worktree(ce) &&
+ path_found(ce->name, &last_dirname, &dir_len, &dir_found)) {
+ if (S_ISSPARSEDIR(ce->ce_mode)) {
+ ensure_full_index(istate);
+ goto restart;
+ }
+ ce->ce_flags &= ~CE_SKIP_WORKTREE;
+ }
+ }
}
/*
diff --git a/sparse-index.h b/sparse-index.h
index 9f3d7bc..59a92d8 100644
--- a/sparse-index.h
+++ b/sparse-index.h
@@ -3,7 +3,10 @@
struct index_state;
#define SPARSE_INDEX_MEMORY_ONLY (1 << 0)
+int is_sparse_index_allowed(struct index_state *istate, int flags);
int convert_to_sparse(struct index_state *istate, int flags);
+void ensure_correct_sparsity(struct index_state *istate);
+void clear_skip_worktree_from_present_files(struct index_state *istate);
/*
* Some places in the codebase expect to search for a specific path.
@@ -21,4 +24,17 @@ void expand_to_path(struct index_state *istate,
struct repository;
int set_sparse_index_config(struct repository *repo, int enable);
+struct pattern_list;
+
+/**
+ * Scan the given index and compare its entries to the given pattern list.
+ * If the index is sparse and the pattern list uses cone mode patterns,
+ * then modify the index to contain the all of the file entries within that
+ * new pattern list. This expands sparse directories only as far as needed.
+ *
+ * If the pattern list is NULL or does not use cone mode patterns, then the
+ * index is expanded to a full index.
+ */
+void expand_index(struct index_state *istate, struct pattern_list *pl);
+
#endif
diff --git a/split-index.c b/split-index.c
index 8e52e89..9d0ccc3 100644
--- a/split-index.c
+++ b/split-index.c
@@ -5,6 +5,9 @@
struct split_index *init_split_index(struct index_state *istate)
{
if (!istate->split_index) {
+ if (istate->sparse_index)
+ die(_("cannot use split index with a sparse index"));
+
CALLOC_ARRAY(istate->split_index, 1);
istate->split_index->refcount = 1;
}
diff --git a/stable-qsort.c b/stable-qsort.c
index 6cbaf39..7ff1246 100644
--- a/stable-qsort.c
+++ b/stable-qsort.c
@@ -48,15 +48,9 @@ void git_stable_qsort(void *b, size_t n, size_t s,
int (*cmp)(const void *, const void *))
{
const size_t size = st_mult(n, s);
- char buf[1024];
+ char *tmp;
- if (size < sizeof(buf)) {
- /* The temporary array fits on the small on-stack buffer. */
- msort_with_tmp(b, n, s, cmp, buf);
- } else {
- /* It's somewhat large, so malloc it. */
- char *tmp = xmalloc(size);
- msort_with_tmp(b, n, s, cmp, tmp);
- free(tmp);
- }
+ tmp = xmalloc(size);
+ msort_with_tmp(b, n, s, cmp, tmp);
+ free(tmp);
}
diff --git a/strbuf.c b/strbuf.c
index c8a5789..dd9eb85 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -2,6 +2,7 @@
#include "refs.h"
#include "string-list.h"
#include "utf8.h"
+#include "date.h"
int starts_with(const char *str, const char *prefix)
{
@@ -874,9 +875,9 @@ static void strbuf_humanise(struct strbuf *buf, off_t bytes,
strbuf_addf(buf,
humanise_rate == 0 ?
/* TRANSLATORS: IEC 80000-13:2008 byte */
- Q_("%u byte", "%u bytes", (unsigned)bytes) :
+ Q_("%u byte", "%u bytes", bytes) :
/* TRANSLATORS: IEC 80000-13:2008 byte/second */
- Q_("%u byte/s", "%u bytes/s", (unsigned)bytes),
+ Q_("%u byte/s", "%u bytes/s", bytes),
(unsigned)bytes);
}
}
@@ -1006,7 +1007,12 @@ void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm,
/*
* There is no portable way to pass timezone information to
- * strftime, so we handle %z and %Z here.
+ * strftime, so we handle %z and %Z here. Likewise '%s', because
+ * going back to an epoch time requires knowing the zone.
+ *
+ * Note that tz_offset is in the "[-+]HHMM" decimal form; this is what
+ * we want for %z, but the computation for %s has to convert to number
+ * of seconds.
*/
for (;;) {
const char *percent = strchrnul(fmt, '%');
@@ -1019,6 +1025,13 @@ void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm,
strbuf_addstr(&munged_fmt, "%%");
fmt++;
break;
+ case 's':
+ strbuf_addf(&munged_fmt, "%"PRItime,
+ (timestamp_t)tm_to_time_t(tm) -
+ 3600 * (tz_offset / 100) -
+ 60 * (tz_offset % 100));
+ fmt++;
+ break;
case 'z':
strbuf_addf(&munged_fmt, "%+05d", tz_offset);
fmt++;
@@ -1059,15 +1072,21 @@ void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm,
strbuf_setlen(sb, sb->len + len);
}
-void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
- int abbrev_len)
+void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo,
+ const struct object_id *oid, int abbrev_len)
{
int r;
strbuf_grow(sb, GIT_MAX_HEXSZ + 1);
- r = find_unique_abbrev_r(sb->buf + sb->len, oid, abbrev_len);
+ r = repo_find_unique_abbrev_r(repo, sb->buf + sb->len, oid, abbrev_len);
strbuf_setlen(sb, sb->len + r);
}
+void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
+ int abbrev_len)
+{
+ strbuf_repo_add_unique_abbrev(sb, the_repository, oid, abbrev_len);
+}
+
/*
* Returns the length of a line, without trailing spaces.
*
diff --git a/strbuf.h b/strbuf.h
index 3b36bbc..76965a1 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -160,7 +160,7 @@ void strbuf_grow(struct strbuf *sb, size_t amount);
static inline void strbuf_setlen(struct strbuf *sb, size_t len)
{
if (len > (sb->alloc ? sb->alloc - 1 : 0))
- die("BUG: strbuf_setlen() beyond buffer");
+ BUG("strbuf_setlen() beyond buffer");
sb->len = len;
if (sb->buf != strbuf_slopbuf)
sb->buf[len] = '\0';
@@ -634,8 +634,10 @@ void strbuf_list_free(struct strbuf **list);
* Add the abbreviation, as generated by find_unique_abbrev, of `sha1` to
* the strbuf `sb`.
*/
-void strbuf_add_unique_abbrev(struct strbuf *sb,
- const struct object_id *oid,
+struct repository;
+void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo,
+ const struct object_id *oid, int abbrev_len);
+void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
int abbrev_len);
/**
diff --git a/streaming.c b/streaming.c
index 5f480ad..fe54665 100644
--- a/streaming.c
+++ b/streaming.c
@@ -223,19 +223,24 @@ static int open_istream_loose(struct git_istream *st, struct repository *r,
const struct object_id *oid,
enum object_type *type)
{
+ struct object_info oi = OBJECT_INFO_INIT;
+ oi.sizep = &st->size;
+ oi.typep = type;
+
st->u.loose.mapped = map_loose_object(r, oid, &st->u.loose.mapsize);
if (!st->u.loose.mapped)
return -1;
- if ((unpack_loose_header(&st->z,
- st->u.loose.mapped,
- st->u.loose.mapsize,
- st->u.loose.hdr,
- sizeof(st->u.loose.hdr)) < 0) ||
- (parse_loose_header(st->u.loose.hdr, &st->size) < 0)) {
- git_inflate_end(&st->z);
- munmap(st->u.loose.mapped, st->u.loose.mapsize);
- return -1;
+ switch (unpack_loose_header(&st->z, st->u.loose.mapped,
+ st->u.loose.mapsize, st->u.loose.hdr,
+ sizeof(st->u.loose.hdr), NULL)) {
+ case ULHR_OK:
+ break;
+ case ULHR_BAD:
+ case ULHR_TOO_LONG:
+ goto error;
}
+ if (parse_loose_header(st->u.loose.hdr, &oi) < 0 || *type < 0)
+ goto error;
st->u.loose.hdr_used = strlen(st->u.loose.hdr) + 1;
st->u.loose.hdr_avail = st->z.total_out;
@@ -244,6 +249,10 @@ static int open_istream_loose(struct git_istream *st, struct repository *r,
st->read = read_istream_loose;
return 0;
+error:
+ git_inflate_end(&st->z);
+ munmap(st->u.loose.mapped, st->u.loose.mapsize);
+ return -1;
}
diff --git a/string-list.h b/string-list.h
index 267d6e5..d5a744e 100644
--- a/string-list.h
+++ b/string-list.h
@@ -86,7 +86,8 @@ typedef int (*compare_strings_fn)(const char *, const char *);
*/
struct string_list {
struct string_list_item *items;
- unsigned int nr, alloc;
+ size_t nr;
+ size_t alloc;
unsigned int strdup_strings:1;
compare_strings_fn cmp; /* NULL uses strcmp() */
};
diff --git a/sub-process.c b/sub-process.c
index dfa790d..cae56ae 100644
--- a/sub-process.c
+++ b/sub-process.c
@@ -187,7 +187,7 @@ static int handshake_capabilities(struct child_process *process,
*supported_capabilities |= capabilities[i].flag;
} else {
die("subprocess '%s' requested unsupported capability '%s'",
- process->argv[0], p);
+ process->args.v[0], p);
}
}
diff --git a/submodule-config.c b/submodule-config.c
index f953440..ce3beaf 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -7,6 +7,7 @@
#include "strbuf.h"
#include "object-store.h"
#include "parse-options.h"
+#include "tree-walk.h"
/*
* submodule cache lookup structure
@@ -203,17 +204,17 @@ int check_submodule_name(const char *name)
return -1;
/*
- * Look for '..' as a path component. Check both '/' and '\\' as
+ * Look for '..' as a path component. Check is_xplatform_dir_sep() as
* separators rather than is_dir_sep(), because we want the name rules
* to be consistent across platforms.
*/
goto in_component; /* always start inside component */
while (*name) {
char c = *name++;
- if (c == '/' || c == '\\') {
+ if (is_xplatform_dir_sep(c)) {
in_component:
if (name[0] == '.' && name[1] == '.' &&
- (!name[2] || name[2] == '/' || name[2] == '\\'))
+ (!name[2] || is_xplatform_dir_sep(name[2])))
return -1;
}
}
@@ -496,7 +497,7 @@ static int parse_config(const char *var, const char *value, void *data)
else if (parse_submodule_update_strategy(value,
&submodule->update_strategy) < 0 ||
submodule->update_strategy.type == SM_UPDATE_COMMAND)
- die(_("invalid value for %s"), var);
+ die(_("invalid value for '%s'"), var);
} else if (!strcmp(item.buf, "shallow")) {
if (!me->overwrite && submodule->recommend_shallow != -1)
warn_multiple_config(me->treeish_name, submodule->name,
@@ -726,6 +727,66 @@ const struct submodule *submodule_from_path(struct repository *r,
return config_from(r->submodule_cache, treeish_name, path, lookup_path);
}
+/**
+ * Used internally by submodules_of_tree(). Recurses into 'treeish_name'
+ * and appends submodule entries to 'out'. The submodule_cache expects
+ * a root-level treeish_name and paths, so keep track of these values
+ * with 'root_tree' and 'prefix'.
+ */
+static void traverse_tree_submodules(struct repository *r,
+ const struct object_id *root_tree,
+ char *prefix,
+ const struct object_id *treeish_name,
+ struct submodule_entry_list *out)
+{
+ struct tree_desc tree;
+ struct submodule_tree_entry *st_entry;
+ struct name_entry *name_entry;
+ char *tree_path = NULL;
+
+ name_entry = xmalloc(sizeof(*name_entry));
+
+ fill_tree_descriptor(r, &tree, treeish_name);
+ while (tree_entry(&tree, name_entry)) {
+ if (prefix)
+ tree_path =
+ mkpathdup("%s/%s", prefix, name_entry->path);
+ else
+ tree_path = xstrdup(name_entry->path);
+
+ if (S_ISGITLINK(name_entry->mode) &&
+ is_tree_submodule_active(r, root_tree, tree_path)) {
+ st_entry = xmalloc(sizeof(*st_entry));
+ st_entry->name_entry = xmalloc(sizeof(*st_entry->name_entry));
+ *st_entry->name_entry = *name_entry;
+ st_entry->submodule =
+ submodule_from_path(r, root_tree, tree_path);
+ st_entry->repo = xmalloc(sizeof(*st_entry->repo));
+ if (repo_submodule_init(st_entry->repo, r, tree_path,
+ root_tree))
+ FREE_AND_NULL(st_entry->repo);
+
+ ALLOC_GROW(out->entries, out->entry_nr + 1,
+ out->entry_alloc);
+ out->entries[out->entry_nr++] = *st_entry;
+ } else if (S_ISDIR(name_entry->mode))
+ traverse_tree_submodules(r, root_tree, tree_path,
+ &name_entry->oid, out);
+ free(tree_path);
+ }
+}
+
+void submodules_of_tree(struct repository *r,
+ const struct object_id *treeish_name,
+ struct submodule_entry_list *out)
+{
+ CALLOC_ARRAY(out->entries, 0);
+ out->entry_nr = 0;
+ out->entry_alloc = 0;
+
+ traverse_tree_submodules(r, treeish_name, NULL, treeish_name, out);
+}
+
void submodule_free(struct repository *r)
{
if (r->submodule_cache)
diff --git a/submodule-config.h b/submodule-config.h
index 65875b9..28a8ca6 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -6,6 +6,7 @@
#include "hashmap.h"
#include "submodule.h"
#include "strbuf.h"
+#include "tree-walk.h"
/**
* The submodule config cache API allows to read submodule
@@ -37,7 +38,7 @@ struct submodule {
const char *path;
const char *name;
const char *url;
- int fetch_recurse;
+ enum submodule_recurse_mode fetch_recurse;
const char *ignore;
const char *branch;
struct submodule_update_strategy update_strategy;
@@ -101,4 +102,37 @@ int check_submodule_name(const char *name);
void fetch_config_from_gitmodules(int *max_children, int *recurse_submodules);
void update_clone_config_from_gitmodules(int *max_jobs);
+/*
+ * Submodule entry that contains relevant information about a
+ * submodule in a tree.
+ */
+struct submodule_tree_entry {
+ /* The submodule's tree entry. */
+ struct name_entry *name_entry;
+ /*
+ * A struct repository corresponding to the submodule. May be
+ * NULL if the submodule has not been updated.
+ */
+ struct repository *repo;
+ /*
+ * A struct submodule containing the submodule config in the
+ * tree's .gitmodules.
+ */
+ const struct submodule *submodule;
+};
+
+struct submodule_entry_list {
+ struct submodule_tree_entry *entries;
+ int entry_nr;
+ int entry_alloc;
+};
+
+/**
+ * Given a treeish, return all submodules in the tree and its subtrees,
+ * but excluding nested submodules. Callers that require nested
+ * submodules are expected to recurse into the submodules themselves.
+ */
+void submodules_of_tree(struct repository *r,
+ const struct object_id *treeish_name,
+ struct submodule_entry_list *ret);
#endif /* SUBMODULE_CONFIG_H */
diff --git a/submodule.c b/submodule.c
index 9648751..4e299f5 100644
--- a/submodule.c
+++ b/submodule.c
@@ -22,6 +22,7 @@
#include "parse-options.h"
#include "object-store.h"
#include "commit-reach.h"
+#include "shallow.h"
static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
static int initialized_fetch_ref_tips;
@@ -167,26 +168,6 @@ void stage_updated_gitmodules(struct index_state *istate)
static struct string_list added_submodule_odb_paths = STRING_LIST_INIT_NODUP;
-/* TODO: remove this function, use repo_submodule_init instead. */
-int add_submodule_odb(const char *path)
-{
- struct strbuf objects_directory = STRBUF_INIT;
- int ret = 0;
-
- ret = strbuf_git_path_submodule(&objects_directory, path, "objects/");
- if (ret)
- goto done;
- if (!is_directory(objects_directory.buf)) {
- ret = -1;
- goto done;
- }
- string_list_insert(&added_submodule_odb_paths,
- strbuf_detach(&objects_directory, NULL));
-done:
- strbuf_release(&objects_directory);
- return ret;
-}
-
void add_submodule_odb_by_path(const char *path)
{
string_list_insert(&added_submodule_odb_paths, xstrdup(path));
@@ -201,6 +182,8 @@ int register_all_submodule_odb_as_alternates(void)
add_to_alternates_memory(added_submodule_odb_paths.items[i].string);
if (ret) {
string_list_clear(&added_submodule_odb_paths, 0);
+ trace2_data_intmax("submodule", the_repository,
+ "register_all_submodule_odb_as_alternates/registered", ret);
if (git_env_bool("GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB", 0))
BUG("register_all_submodule_odb_as_alternates() called");
}
@@ -265,7 +248,9 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
* ie, the config looks like: "[submodule] active\n".
* Since that is an invalid pathspec, we should inform the user.
*/
-int is_submodule_active(struct repository *repo, const char *path)
+int is_tree_submodule_active(struct repository *repo,
+ const struct object_id *treeish_name,
+ const char *path)
{
int ret = 0;
char *key = NULL;
@@ -273,7 +258,7 @@ int is_submodule_active(struct repository *repo, const char *path)
const struct string_list *sl;
const struct submodule *module;
- module = submodule_from_path(repo, null_oid(), path);
+ module = submodule_from_path(repo, treeish_name, path);
/* early return if there isn't a path->module mapping */
if (!module)
@@ -315,6 +300,11 @@ int is_submodule_active(struct repository *repo, const char *path)
return ret;
}
+int is_submodule_active(struct repository *repo, const char *path)
+{
+ return is_tree_submodule_active(repo, null_oid(), path);
+}
+
int is_submodule_populated_gently(const char *path, int *return_error_code)
{
int ret = 0;
@@ -629,7 +619,7 @@ void show_submodule_diff_summary(struct diff_options *o, const char *path,
struct object_id *one, struct object_id *two,
unsigned dirty_submodule)
{
- struct rev_info rev;
+ struct rev_info rev = REV_INFO_INIT;
struct commit *left = NULL, *right = NULL;
struct commit_list *merge_bases = NULL;
struct repository *sub;
@@ -655,8 +645,8 @@ void show_submodule_diff_summary(struct diff_options *o, const char *path,
print_submodule_diff_summary(sub, &rev, o);
out:
- if (merge_bases)
- free_commit_list(merge_bases);
+ free_commit_list(merge_bases);
+ release_revisions(&rev);
clear_commit_marks(left, ~0);
clear_commit_marks(right, ~0);
if (sub) {
@@ -721,15 +711,15 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED))
strvec_push(&cp.args, oid_to_hex(new_oid));
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
if (!is_directory(path)) {
/* fall back to absorbed git dir, if any */
if (!sub)
goto done;
cp.dir = sub->gitdir;
- strvec_push(&cp.env_array, GIT_DIR_ENVIRONMENT "=.");
- strvec_push(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT "=.");
+ strvec_push(&cp.env, GIT_DIR_ENVIRONMENT "=.");
+ strvec_push(&cp.env, GIT_WORK_TREE_ENVIRONMENT "=.");
}
if (start_command(&cp)) {
@@ -745,8 +735,7 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
done:
strbuf_release(&sb);
- if (merge_bases)
- free_commit_list(merge_bases);
+ free_commit_list(merge_bases);
if (left)
clear_commit_marks(left, ~0);
if (right)
@@ -773,19 +762,6 @@ const struct submodule *submodule_from_ce(const struct cache_entry *ce)
return submodule_from_path(the_repository, null_oid(), ce->name);
}
-static struct oid_array *submodule_commits(struct string_list *submodules,
- const char *name)
-{
- struct string_list_item *item;
-
- item = string_list_insert(submodules, name);
- if (item->util)
- return (struct oid_array *) item->util;
-
- /* NEEDSWORK: should we have oid_array_init()? */
- item->util = xcalloc(1, sizeof(struct oid_array));
- return (struct oid_array *) item->util;
-}
struct collect_changed_submodules_cb_data {
struct repository *repo;
@@ -810,6 +786,52 @@ static const char *default_name_or_path(const char *path_or_name)
return path_or_name;
}
+/*
+ * Holds relevant information for a changed submodule. Used as the .util
+ * member of the changed submodule name string_list_item.
+ *
+ * (super_oid, path) allows the submodule config to be read from _some_
+ * .gitmodules file. We store this information the first time we find a
+ * superproject commit that points to the submodule, but this is
+ * arbitrary - we can choose any (super_oid, path) that matches the
+ * submodule's name.
+ *
+ * NEEDSWORK: Storing an arbitrary commit is undesirable because we can't
+ * guarantee that we're reading the commit that the user would expect. A better
+ * scheme would be to just fetch a submodule by its name. This requires two
+ * steps:
+ * - Create a function that behaves like repo_submodule_init(), but accepts a
+ * submodule name instead of treeish_name and path. This should be easy
+ * because repo_submodule_init() internally uses the submodule's name.
+ *
+ * - Replace most instances of 'struct submodule' (which is the .gitmodules
+ * config) with just the submodule name. This is OK because we expect
+ * submodule settings to be stored in .git/config (via "git submodule init"),
+ * not .gitmodules. This also lets us delete get_non_gitmodules_submodule(),
+ * which constructs a bogus 'struct submodule' for the sake of giving a
+ * placeholder name to a gitlink.
+ */
+struct changed_submodule_data {
+ /*
+ * The first superproject commit in the rev walk that points to
+ * the submodule.
+ */
+ const struct object_id *super_oid;
+ /*
+ * Path to the submodule in the superproject commit referenced
+ * by 'super_oid'.
+ */
+ char *path;
+ /* The submodule commits that have changed in the rev walk. */
+ struct oid_array new_commits;
+};
+
+static void changed_submodule_data_clear(struct changed_submodule_data *cs_data)
+{
+ oid_array_clear(&cs_data->new_commits);
+ free(cs_data->path);
+}
+
static void collect_changed_submodules_cb(struct diff_queue_struct *q,
struct diff_options *options,
void *data)
@@ -821,9 +843,10 @@ static void collect_changed_submodules_cb(struct diff_queue_struct *q,
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
- struct oid_array *commits;
const struct submodule *submodule;
const char *name;
+ struct string_list_item *item;
+ struct changed_submodule_data *cs_data;
if (!S_ISGITLINK(p->two->mode))
continue;
@@ -850,8 +873,16 @@ static void collect_changed_submodules_cb(struct diff_queue_struct *q,
if (!name)
continue;
- commits = submodule_commits(changed, name);
- oid_array_append(commits, &p->two->oid);
+ item = string_list_insert(changed, name);
+ if (item->util)
+ cs_data = item->util;
+ else {
+ item->util = xcalloc(1, sizeof(struct changed_submodule_data));
+ cs_data = item->util;
+ cs_data->super_oid = commit_oid;
+ cs_data->path = xstrdup(p->two->path);
+ }
+ oid_array_append(&cs_data->new_commits, &p->two->oid);
}
}
@@ -893,16 +924,19 @@ static void collect_changed_submodules(struct repository *r,
diff_rev.diffopt.format_callback_data = &data;
diff_rev.dense_combined_merges = 1;
diff_tree_combined_merge(commit, &diff_rev);
+ release_revisions(&diff_rev);
}
reset_revision_walk();
+ release_revisions(&rev);
}
-static void free_submodules_oids(struct string_list *submodules)
+static void free_submodules_data(struct string_list *submodules)
{
struct string_list_item *item;
for_each_string_list_item(item, submodules)
- oid_array_clear((struct oid_array *) item->util);
+ changed_submodule_data_clear(item->util);
+
string_list_clear(submodules, 1);
}
@@ -923,47 +957,53 @@ struct has_commit_data {
struct repository *repo;
int result;
const char *path;
+ const struct object_id *super_oid;
};
static int check_has_commit(const struct object_id *oid, void *data)
{
struct has_commit_data *cb = data;
+ struct repository subrepo;
+ enum object_type type;
- enum object_type type = oid_object_info(cb->repo, oid, NULL);
+ if (repo_submodule_init(&subrepo, cb->repo, cb->path, cb->super_oid)) {
+ cb->result = 0;
+ /* subrepo failed to init, so don't clean it up. */
+ return 0;
+ }
+
+ type = oid_object_info(&subrepo, oid, NULL);
switch (type) {
case OBJ_COMMIT:
- return 0;
+ goto cleanup;
case OBJ_BAD:
/*
* Object is missing or invalid. If invalid, an error message
* has already been printed.
*/
cb->result = 0;
- return 0;
+ goto cleanup;
default:
die(_("submodule entry '%s' (%s) is a %s, not a commit"),
cb->path, oid_to_hex(oid), type_name(type));
}
+cleanup:
+ repo_clear(&subrepo);
+ return 0;
}
static int submodule_has_commits(struct repository *r,
const char *path,
+ const struct object_id *super_oid,
struct oid_array *commits)
{
- struct has_commit_data has_commit = { r, 1, path };
-
- /*
- * Perform a cheap, but incorrect check for the existence of 'commits'.
- * This is done by adding the submodule's object store to the in-core
- * object store, and then querying for each commit's existence. If we
- * do not have the commit object anywhere, there is no chance we have
- * it in the object store of the correct submodule and have it
- * reachable from a ref, so we can fail early without spawning rev-list
- * which is expensive.
- */
- if (add_submodule_odb(path))
- return 0;
+ struct has_commit_data has_commit = {
+ .repo = r,
+ .result = 1,
+ .path = path,
+ .super_oid = super_oid
+ };
oid_array_for_each_unique(commits, check_has_commit, &has_commit);
@@ -980,7 +1020,7 @@ static int submodule_has_commits(struct repository *r,
oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
strvec_pushl(&cp.args, "--not", "--all", NULL);
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.dir = path;
@@ -998,7 +1038,7 @@ static int submodule_needs_pushing(struct repository *r,
const char *path,
struct oid_array *commits)
{
- if (!submodule_has_commits(r, path, commits))
+ if (!submodule_has_commits(r, path, null_oid(), commits))
/*
* NOTE: We do consider it safe to return "no" here. The
* correct answer would be "We do not know" instead of
@@ -1021,7 +1061,7 @@ static int submodule_needs_pushing(struct repository *r,
oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
strvec_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL);
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.out = -1;
@@ -1058,7 +1098,7 @@ int find_unpushed_submodules(struct repository *r,
collect_changed_submodules(r, &submodules, &argv);
for_each_string_list_item(name, &submodules) {
- struct oid_array *commits = name->util;
+ struct changed_submodule_data *cs_data = name->util;
const struct submodule *submodule;
const char *path = NULL;
@@ -1071,11 +1111,11 @@ int find_unpushed_submodules(struct repository *r,
if (!path)
continue;
- if (submodule_needs_pushing(r, path, commits))
+ if (submodule_needs_pushing(r, path, &cs_data->new_commits))
string_list_insert(needs_pushing, path);
}
- free_submodules_oids(&submodules);
+ free_submodules_data(&submodules);
strvec_clear(&argv);
return needs_pushing->nr;
@@ -1107,7 +1147,7 @@ static int push_submodule(const char *path,
strvec_push(&cp.args, rs->raw[i]);
}
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.dir = path;
@@ -1138,7 +1178,7 @@ static void submodule_push_check(const char *path, const char *head,
for (i = 0; i < rs->raw_nr; i++)
strvec_push(&cp.args, rs->raw[i]);
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.no_stdout = 1;
@@ -1221,14 +1261,36 @@ void check_for_new_submodule_commits(struct object_id *oid)
oid_array_append(&ref_tips_after_fetch, oid);
}
+/*
+ * Returns 1 if there is at least one submodule gitdir in
+ * $GIT_DIR/modules and 0 otherwise. This follows
+ * submodule_name_to_gitdir(), which looks for submodules in
+ * $GIT_DIR/modules, not $GIT_COMMON_DIR.
+ *
+ * A submodule can be moved to $GIT_DIR/modules manually by running "git
+ * submodule absorbgitdirs", or it may be initialized there by "git
+ * submodule update".
+ */
+static int repo_has_absorbed_submodules(struct repository *r)
+{
+ int ret;
+ struct strbuf buf = STRBUF_INIT;
+
+ strbuf_repo_git_path(&buf, r, "modules/");
+ ret = file_exists(buf.buf) && !is_empty_dir(buf.buf);
+ strbuf_release(&buf);
+ return ret;
+}
+
static void calculate_changed_submodule_paths(struct repository *r,
struct string_list *changed_submodule_names)
{
struct strvec argv = STRVEC_INIT;
struct string_list_item *name;
- /* No need to check if there are no submodules configured */
- if (!submodule_from_path(r, NULL, NULL))
+ /* No need to check if no submodules would be fetched */
+ if (!submodule_from_path(r, NULL, NULL) &&
+ !repo_has_absorbed_submodules(r))
return;
strvec_push(&argv, "--"); /* argv[0] program name */
@@ -1245,7 +1307,7 @@ static void calculate_changed_submodule_paths(struct repository *r,
collect_changed_submodules(r, changed_submodule_names, &argv);
for_each_string_list_item(name, changed_submodule_names) {
- struct oid_array *commits = name->util;
+ struct changed_submodule_data *cs_data = name->util;
const struct submodule *submodule;
const char *path = NULL;
@@ -1258,8 +1320,8 @@ static void calculate_changed_submodule_paths(struct repository *r,
if (!path)
continue;
- if (submodule_has_commits(r, path, commits)) {
- oid_array_clear(commits);
+ if (submodule_has_commits(r, path, null_oid(), &cs_data->new_commits)) {
+ changed_submodule_data_clear(cs_data);
*name->string = '\0';
}
}
@@ -1296,12 +1358,21 @@ int submodule_touches_in_range(struct repository *r,
strvec_clear(&args);
- free_submodules_oids(&subs);
+ free_submodules_data(&subs);
return ret;
}
struct submodule_parallel_fetch {
- int count;
+ /*
+ * The index of the last index entry processed by
+ * get_fetch_task_from_index().
+ */
+ int index_count;
+ /*
+ * The index of the last string_list entry processed by
+ * get_fetch_task_from_changed().
+ */
+ int changed_count;
struct strvec args;
struct repository *r;
const char *prefix;
@@ -1310,7 +1381,16 @@ struct submodule_parallel_fetch {
int quiet;
int result;
+ /*
+ * Names of submodules that have new commits. Generated by
+ * walking the newly fetched superproject commits.
+ */
struct string_list changed_submodule_names;
+ /*
+ * Names of submodules that have already been processed. Lets us
+ * avoid fetching the same submodule more than once.
+ */
+ struct string_list seen_submodule_names;
/* Pending fetches by OIDs */
struct fetch_task **oid_fetch_tasks;
@@ -1321,6 +1401,7 @@ struct submodule_parallel_fetch {
#define SPF_INIT { \
.args = STRVEC_INIT, \
.changed_submodule_names = STRING_LIST_INIT_DUP, \
+ .seen_submodule_names = STRING_LIST_INIT_DUP, \
.submodules_with_errors = STRBUF_INIT, \
}
@@ -1357,6 +1438,8 @@ struct fetch_task {
struct repository *repo;
const struct submodule *sub;
unsigned free_sub : 1; /* Do we need to free the submodule? */
+ const char *default_argv; /* The default fetch mode. */
+ struct strvec git_args; /* Args for the child git process. */
struct oid_array *commits; /* Ensure these commits are fetched */
};
@@ -1382,31 +1465,6 @@ static const struct submodule *get_non_gitmodules_submodule(const char *path)
return (const struct submodule *) ret;
}
-static struct fetch_task *fetch_task_create(struct repository *r,
- const char *path)
-{
- struct fetch_task *task = xmalloc(sizeof(*task));
- memset(task, 0, sizeof(*task));
-
- task->sub = submodule_from_path(r, null_oid(), path);
- if (!task->sub) {
- /*
- * No entry in .gitmodules? Technically not a submodule,
- * but historically we supported repositories that happen to be
- * in-place where a gitlink is. Keep supporting them.
- */
- task->sub = get_non_gitmodules_submodule(path);
- if (!task->sub) {
- free(task);
- return NULL;
- }
-
- task->free_sub = 1;
- }
-
- return task;
-}
-
static void fetch_task_release(struct fetch_task *p)
{
if (p->free_sub)
@@ -1417,14 +1475,17 @@ static void fetch_task_release(struct fetch_task *p)
if (p->repo)
repo_clear(p->repo);
FREE_AND_NULL(p->repo);
+
+ strvec_clear(&p->git_args);
}
static struct repository *get_submodule_repo_for(struct repository *r,
- const char *path)
+ const char *path,
+ const struct object_id *treeish_name)
{
struct repository *ret = xmalloc(sizeof(*ret));
- if (repo_submodule_init(ret, r, path, null_oid())) {
+ if (repo_submodule_init(ret, r, path, treeish_name)) {
free(ret);
return NULL;
}
@@ -1432,67 +1493,83 @@ static struct repository *get_submodule_repo_for(struct repository *r,
return ret;
}
-static int get_next_submodule(struct child_process *cp,
- struct strbuf *err, void *data, void **task_cb)
+static struct fetch_task *fetch_task_create(struct submodule_parallel_fetch *spf,
+ const char *path,
+ const struct object_id *treeish_name)
{
- struct submodule_parallel_fetch *spf = data;
+ struct fetch_task *task = xmalloc(sizeof(*task));
+ memset(task, 0, sizeof(*task));
- for (; spf->count < spf->r->index->cache_nr; spf->count++) {
- const struct cache_entry *ce = spf->r->index->cache[spf->count];
- const char *default_argv;
+ task->sub = submodule_from_path(spf->r, treeish_name, path);
+
+ if (!task->sub) {
+ /*
+ * No entry in .gitmodules? Technically not a submodule,
+ * but historically we supported repositories that happen to be
+ * in-place where a gitlink is. Keep supporting them.
+ */
+ task->sub = get_non_gitmodules_submodule(path);
+ if (!task->sub)
+ goto cleanup;
+
+ task->free_sub = 1;
+ }
+
+ if (string_list_lookup(&spf->seen_submodule_names, task->sub->name))
+ goto cleanup;
+
+ switch (get_fetch_recurse_config(task->sub, spf))
+ {
+ default:
+ case RECURSE_SUBMODULES_DEFAULT:
+ case RECURSE_SUBMODULES_ON_DEMAND:
+ if (!task->sub ||
+ !string_list_lookup(
+ &spf->changed_submodule_names,
+ task->sub->name))
+ goto cleanup;
+ task->default_argv = "on-demand";
+ break;
+ case RECURSE_SUBMODULES_ON:
+ task->default_argv = "yes";
+ break;
+ case RECURSE_SUBMODULES_OFF:
+ goto cleanup;
+ }
+
+ task->repo = get_submodule_repo_for(spf->r, path, treeish_name);
+
+ return task;
+
+ cleanup:
+ fetch_task_release(task);
+ free(task);
+ return NULL;
+}
+
+static struct fetch_task *
+get_fetch_task_from_index(struct submodule_parallel_fetch *spf,
+ struct strbuf *err)
+{
+ for (; spf->index_count < spf->r->index->cache_nr; spf->index_count++) {
+ const struct cache_entry *ce =
+ spf->r->index->cache[spf->index_count];
struct fetch_task *task;
if (!S_ISGITLINK(ce->ce_mode))
continue;
- task = fetch_task_create(spf->r, ce->name);
+ task = fetch_task_create(spf, ce->name, null_oid());
if (!task)
continue;
- switch (get_fetch_recurse_config(task->sub, spf))
- {
- default:
- case RECURSE_SUBMODULES_DEFAULT:
- case RECURSE_SUBMODULES_ON_DEMAND:
- if (!task->sub ||
- !string_list_lookup(
- &spf->changed_submodule_names,
- task->sub->name))
- continue;
- default_argv = "on-demand";
- break;
- case RECURSE_SUBMODULES_ON:
- default_argv = "yes";
- break;
- case RECURSE_SUBMODULES_OFF:
- continue;
- }
-
- task->repo = get_submodule_repo_for(spf->r, task->sub->path);
if (task->repo) {
- struct strbuf submodule_prefix = STRBUF_INIT;
- child_process_init(cp);
- cp->dir = task->repo->gitdir;
- prepare_submodule_repo_env_in_gitdir(&cp->env_array);
- cp->git_cmd = 1;
if (!spf->quiet)
strbuf_addf(err, _("Fetching submodule %s%s\n"),
spf->prefix, ce->name);
- strvec_init(&cp->args);
- strvec_pushv(&cp->args, spf->args.v);
- strvec_push(&cp->args, default_argv);
- strvec_push(&cp->args, "--submodule-prefix");
- strbuf_addf(&submodule_prefix, "%s%s/",
- spf->prefix,
- task->sub->path);
- strvec_push(&cp->args, submodule_prefix.buf);
-
- spf->count++;
- *task_cb = task;
-
- strbuf_release(&submodule_prefix);
- return 1;
+ spf->index_count++;
+ return task;
} else {
struct strbuf empty_submodule_path = STRBUF_INIT;
@@ -1516,6 +1593,111 @@ static int get_next_submodule(struct child_process *cp,
strbuf_release(&empty_submodule_path);
}
}
+ return NULL;
+}
+
+static struct fetch_task *
+get_fetch_task_from_changed(struct submodule_parallel_fetch *spf,
+ struct strbuf *err)
+{
+ for (; spf->changed_count < spf->changed_submodule_names.nr;
+ spf->changed_count++) {
+ struct string_list_item item =
+ spf->changed_submodule_names.items[spf->changed_count];
+ struct changed_submodule_data *cs_data = item.util;
+ struct fetch_task *task;
+
+ if (!is_tree_submodule_active(spf->r, cs_data->super_oid,cs_data->path))
+ continue;
+
+ task = fetch_task_create(spf, cs_data->path,
+ cs_data->super_oid);
+ if (!task)
+ continue;
+
+ if (!task->repo) {
+ strbuf_addf(err, _("Could not access submodule '%s' at commit %s\n"),
+ cs_data->path,
+ find_unique_abbrev(cs_data->super_oid, DEFAULT_ABBREV));
+
+ fetch_task_release(task);
+ free(task);
+ continue;
+ }
+
+ if (!spf->quiet)
+ strbuf_addf(err,
+ _("Fetching submodule %s%s at commit %s\n"),
+ spf->prefix, task->sub->path,
+ find_unique_abbrev(cs_data->super_oid,
+ DEFAULT_ABBREV));
+
+ spf->changed_count++;
+ /*
+ * NEEDSWORK: Submodules set/unset a value for
+ * core.worktree when they are populated/unpopulated by
+ * "git checkout" (and similar commands, see
+ * submodule_move_head() and
+ * connect_work_tree_and_git_dir()), but if the
+ * submodule is unpopulated in another way (e.g. "git
+ * rm", "rm -r"), core.worktree will still be set even
+ * though the directory doesn't exist, and the child
+ * process will crash while trying to chdir into the
+ * nonexistent directory.
+ *
+ * In this case, we know that the submodule has no
+ * working tree, so we can work around this by
+ * setting "--work-tree=." (--bare does not work because
+ * worktree settings take precedence over bare-ness).
+ * However, this is not necessarily true in other cases,
+ * so a generalized solution is still necessary.
+ *
+ * Possible solutions:
+ * - teach "git [add|rm]" to unset core.worktree and
+ * discourage users from removing submodules without
+ * using a Git command.
+ * - teach submodule child processes to ignore stale
+ * core.worktree values.
+ */
+ strvec_push(&task->git_args, "--work-tree=.");
+ return task;
+ }
+ return NULL;
+}
+
+static int get_next_submodule(struct child_process *cp, struct strbuf *err,
+ void *data, void **task_cb)
+{
+ struct submodule_parallel_fetch *spf = data;
+ struct fetch_task *task =
+ get_fetch_task_from_index(spf, err);
+ if (!task)
+ task = get_fetch_task_from_changed(spf, err);
+
+ if (task) {
+ struct strbuf submodule_prefix = STRBUF_INIT;
+
+ child_process_init(cp);
+ cp->dir = task->repo->gitdir;
+ prepare_submodule_repo_env_in_gitdir(&cp->env);
+ cp->git_cmd = 1;
+ strvec_init(&cp->args);
+ if (task->git_args.nr)
+ strvec_pushv(&cp->args, task->git_args.v);
+ strvec_pushv(&cp->args, spf->args.v);
+ strvec_push(&cp->args, task->default_argv);
+ strvec_push(&cp->args, "--submodule-prefix");
+
+ strbuf_addf(&submodule_prefix, "%s%s/",
+ spf->prefix,
+ task->sub->path);
+ strvec_push(&cp->args, submodule_prefix.buf);
+ *task_cb = task;
+
+ strbuf_release(&submodule_prefix);
+ string_list_insert(&spf->seen_submodule_names, task->sub->name);
+ return 1;
+ }
if (spf->oid_fetch_tasks_nr) {
struct fetch_task *task =
@@ -1527,7 +1709,7 @@ static int get_next_submodule(struct child_process *cp,
spf->prefix, task->sub->path);
child_process_init(cp);
- prepare_submodule_repo_env_in_gitdir(&cp->env_array);
+ prepare_submodule_repo_env_in_gitdir(&cp->env);
cp->git_cmd = 1;
cp->dir = task->repo->gitdir;
@@ -1578,7 +1760,7 @@ static int fetch_finish(int retvalue, struct strbuf *err,
struct fetch_task *task = task_cb;
struct string_list_item *it;
- struct oid_array *commits;
+ struct changed_submodule_data *cs_data;
if (!task || !task->sub)
BUG("callback cookie bogus");
@@ -1606,14 +1788,14 @@ static int fetch_finish(int retvalue, struct strbuf *err,
/* Could be an unchanged submodule, not contained in the list */
goto out;
- commits = it->util;
- oid_array_filter(commits,
+ cs_data = it->util;
+ oid_array_filter(&cs_data->new_commits,
commit_missing_in_sub,
task->repo);
/* Are there commits we want, but do not exist? */
- if (commits->nr) {
- task->commits = commits;
+ if (cs_data->new_commits.nr) {
+ task->commits = &cs_data->new_commits;
ALLOC_GROW(spf->oid_fetch_tasks,
spf->oid_fetch_tasks_nr + 1,
spf->oid_fetch_tasks_alloc);
@@ -1628,11 +1810,11 @@ static int fetch_finish(int retvalue, struct strbuf *err,
return 0;
}
-int fetch_populated_submodules(struct repository *r,
- const struct strvec *options,
- const char *prefix, int command_line_option,
- int default_option,
- int quiet, int max_parallel_jobs)
+int fetch_submodules(struct repository *r,
+ const struct strvec *options,
+ const char *prefix, int command_line_option,
+ int default_option,
+ int quiet, int max_parallel_jobs)
{
int i;
struct submodule_parallel_fetch spf = SPF_INIT;
@@ -1671,7 +1853,7 @@ int fetch_populated_submodules(struct repository *r,
strvec_clear(&spf.args);
out:
- free_submodules_oids(&spf.changed_submodule_names);
+ free_submodules_data(&spf.changed_submodule_names);
return spf.result;
}
@@ -1701,7 +1883,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
if (ignore_untracked)
strvec_push(&cp.args, "-uno");
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.out = -1;
@@ -1773,7 +1955,7 @@ int submodule_uses_gitfile(const char *path)
"submodule", "foreach", "--quiet", "--recursive",
"test -f .git", NULL);
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.no_stderr = 1;
@@ -1816,7 +1998,7 @@ int bad_to_remove_submodule(const char *path, unsigned flags)
if (!(flags & SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED))
strvec_push(&cp.args, "--ignored");
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.out = -1;
@@ -1871,7 +2053,7 @@ static int submodule_has_dirty_index(const struct submodule *sub)
{
struct child_process cp = CHILD_PROCESS_INIT;
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.git_cmd = 1;
strvec_pushl(&cp.args, "diff-index", "--quiet",
@@ -1888,7 +2070,7 @@ static int submodule_has_dirty_index(const struct submodule *sub)
static void submodule_reset_index(const char *path)
{
struct child_process cp = CHILD_PROCESS_INIT;
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.git_cmd = 1;
cp.no_stdin = 1;
@@ -1896,6 +2078,7 @@ static void submodule_reset_index(const char *path)
strvec_pushf(&cp.args, "--super-prefix=%s%s/",
get_super_prefix_or_empty(), path);
+ /* TODO: determine if this might overwright untracked files */
strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
strvec_push(&cp.args, empty_tree_oid_hex());
@@ -1971,7 +2154,7 @@ int submodule_move_head(const char *path,
}
}
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
cp.git_cmd = 1;
cp.no_stdin = 1;
@@ -2009,7 +2192,7 @@ int submodule_move_head(const char *path,
cp.no_stdin = 1;
cp.dir = path;
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
strvec_pushl(&cp.args, "update-ref", "HEAD",
"--no-deref", new_head, NULL);
@@ -2192,7 +2375,7 @@ void absorb_git_dir_into_superproject(const char *path,
strvec_pushl(&cp.args, "--super-prefix", sb.buf,
"submodule--helper",
"absorb-git-dirs", NULL);
- prepare_submodule_repo_env(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
if (run_command(&cp))
die(_("could not recurse into submodule '%s'"), path);
@@ -2225,8 +2408,8 @@ int get_superproject_working_tree(struct strbuf *buf)
subpath = relative_path(cwd, one_up.buf, &sb);
strbuf_release(&one_up);
- prepare_submodule_repo_env(&cp.env_array);
- strvec_pop(&cp.env_array);
+ prepare_submodule_repo_env(&cp.env);
+ strvec_pop(&cp.env);
strvec_pushl(&cp.args, "--literal-pathspecs", "-C", "..",
"ls-files", "-z", "--stage", "--full-name", "--",
diff --git a/submodule.h b/submodule.h
index 6bd2c99..bfaa9da 100644
--- a/submodule.h
+++ b/submodule.h
@@ -13,7 +13,7 @@ struct repository;
struct string_list;
struct strbuf;
-enum {
+enum submodule_recurse_mode {
RECURSE_SUBMODULES_ONLY = -5,
RECURSE_SUBMODULES_CHECK = -4,
RECURSE_SUBMODULES_ERROR = -3,
@@ -54,6 +54,9 @@ int git_default_submodule_config(const char *var, const char *value, void *cb);
struct option;
int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
const char *arg, int unset);
+int is_tree_submodule_active(struct repository *repo,
+ const struct object_id *treeish_name,
+ const char *path);
int is_submodule_active(struct repository *repo, const char *path);
/*
* Determine if a submodule has been populated at a given 'path' by checking if
@@ -85,12 +88,12 @@ int should_update_submodules(void);
*/
const struct submodule *submodule_from_ce(const struct cache_entry *ce);
void check_for_new_submodule_commits(struct object_id *oid);
-int fetch_populated_submodules(struct repository *r,
- const struct strvec *options,
- const char *prefix,
- int command_line_option,
- int default_option,
- int quiet, int max_parallel_jobs);
+int fetch_submodules(struct repository *r,
+ const struct strvec *options,
+ const char *prefix,
+ int command_line_option,
+ int default_option,
+ int quiet, int max_parallel_jobs);
unsigned is_submodule_modified(const char *path, int ignore_untracked);
int submodule_uses_gitfile(const char *path);
@@ -100,12 +103,11 @@ int submodule_uses_gitfile(const char *path);
int bad_to_remove_submodule(const char *path, unsigned flags);
/*
- * Call add_submodule_odb() to add the submodule at the given path to a list.
- * When register_all_submodule_odb_as_alternates() is called, the object stores
- * of all submodules in that list will be added as alternates in
- * the_repository.
+ * Call add_submodule_odb_by_path() to add the submodule at the given
+ * path to a list. When register_all_submodule_odb_as_alternates() is
+ * called, the object stores of all submodules in that list will be
+ * added as alternates in the_repository.
*/
-int add_submodule_odb(const char *path);
void add_submodule_odb_by_path(const char *path);
int register_all_submodule_odb_as_alternates(void);
@@ -156,11 +158,11 @@ int submodule_move_head(const char *path,
void submodule_unset_core_worktree(const struct submodule *sub);
/*
- * Prepare the "env_array" parameter of a "struct child_process" for executing
+ * Prepare the "env" parameter of a "struct child_process" for executing
* a submodule by clearing any repo-specific environment variables, but
* retaining any config in the environment.
*/
-void prepare_submodule_repo_env(struct strvec *out);
+void prepare_submodule_repo_env(struct strvec *env);
#define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0)
void absorb_git_dir_into_superproject(const char *path,
diff --git a/symlinks.c b/symlinks.c
index 5232d02..c667baa 100644
--- a/symlinks.c
+++ b/symlinks.c
@@ -279,7 +279,9 @@ static void do_remove_scheduled_dirs(int new_len)
{
while (removal.len > new_len) {
removal.buf[removal.len] = '\0';
- if (rmdir(removal.buf))
+ if ((startup_info->original_cwd &&
+ !strcmp(removal.buf, startup_info->original_cwd)) ||
+ rmdir(removal.buf))
break;
do {
removal.len--;
@@ -293,6 +295,10 @@ void schedule_dir_for_removal(const char *name, int len)
{
int match_len, last_slash, i, previous_slash;
+ if (startup_info->original_cwd &&
+ !strcmp(name, startup_info->original_cwd))
+ return; /* Do not remove the current working directory */
+
match_len = last_slash = i =
longest_path_match(name, len, removal.buf, removal.len,
&previous_slash);
diff --git a/t/.gitattributes b/t/.gitattributes
index dafa17c..9930e28 100644
--- a/t/.gitattributes
+++ b/t/.gitattributes
@@ -1,6 +1,5 @@
t[0-9][0-9][0-9][0-9]/* -whitespace
/chainlint/*.expect eol=lf
-/lib-diff/* eol=lf
/t0110/url-* binary
/t3206/* eol=lf
/t3900/*.txt eol=lf
diff --git a/t/Makefile b/t/Makefile
index 882d26e..056ce55 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -1,3 +1,6 @@
+# Import tree-wide shared Makefile behavior and libraries
+include ../shared.mak
+
# Run tests
#
# Copyright (c) 2005 Junio C Hamano
@@ -71,12 +74,10 @@
check-chainlint:
@mkdir -p '$(CHAINLINTTMP_SQ)' && \
- err=0 && \
- for i in $(CHAINLINTTESTS); do \
- $(CHAINLINT) <chainlint/$$i.test | \
- sed -e '/^# LINT: /d' >'$(CHAINLINTTMP_SQ)'/$$i.actual && \
- diff -u chainlint/$$i.expect '$(CHAINLINTTMP_SQ)'/$$i.actual || err=1; \
- done && exit $$err
+ sed -e '/^# LINT: /d' $(patsubst %,chainlint/%.test,$(CHAINLINTTESTS)) >'$(CHAINLINTTMP_SQ)'/tests && \
+ sed -e '/^[ ]*$$/d' $(patsubst %,chainlint/%.expect,$(CHAINLINTTESTS)) >'$(CHAINLINTTMP_SQ)'/expect && \
+ $(CHAINLINT) '$(CHAINLINTTMP_SQ)'/tests | grep -v '^[ ]*$$' >'$(CHAINLINTTMP_SQ)'/actual && \
+ diff -u '$(CHAINLINTTMP_SQ)'/expect '$(CHAINLINTTMP_SQ)'/actual
test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax \
test-lint-filenames
diff --git a/t/README b/t/README
index b92155a..309a311 100644
--- a/t/README
+++ b/t/README
@@ -405,8 +405,8 @@
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.
+code paths for utilizing a (hook based) file system monitor to speed up
+detecting new or changed files.
GIT_TEST_INDEX_VERSION=<n> exercises the index read/write code path
for the index version specified. Can be set to any valid version
@@ -419,7 +419,7 @@
GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
by overriding the minimum number of cache entries required per thread.
-GIT_TEST_ADD_I_USE_BUILTIN=<boolean>, when true, enables the
+GIT_TEST_ADD_I_USE_BUILTIN=<boolean>, when false, disables the
built-in version of git add -i. See 'add.interactive.useBuiltin' in
git-config(1).
@@ -463,11 +463,14 @@
registering submodule ODBs as alternates a fatal action. Support for
this environment variable can be removed once the migration to
explicitly providing repositories when accessing submodule objects is
-complete (in which case we might want to replace this with a trace2
-call so that users can make it visible if accessing submodule objects
-without an explicit repository still happens) or needs to be abandoned
-for whatever reason (in which case the migrated codepaths still retain
-their performance benefits).
+complete or needs to be abandoned for whatever reason (in which case the
+migrated codepaths still retain their performance benefits).
+
+GIT_TEST_REQUIRE_PREREQ=<list> allows specifying a space separated list of
+prereqs that are required to succeed. If a prereq in this list is triggered by
+a test and then fails then the whole test run will abort. This can help to make
+sure the expected tests are executed and not silently skipped when their
+dependency breaks or is simply not present in a new environment.
Naming Tests
------------
diff --git a/t/aggregate-results.sh b/t/aggregate-results.sh
index 7913e20..7f2b83b 100755
--- a/t/aggregate-results.sh
+++ b/t/aggregate-results.sh
@@ -6,6 +6,7 @@
failed=0
broken=0
total=0
+missing_prereq=
while read file
do
@@ -30,10 +31,26 @@
broken=$(($broken + $value)) ;;
total)
total=$(($total + $value)) ;;
+ missing_prereq)
+ missing_prereq="$missing_prereq,$value" ;;
esac
done <"$file"
done
+if test -n "$missing_prereq"
+then
+ unique_missing_prereq=$(
+ echo $missing_prereq |
+ tr -s "," "\n" |
+ grep -v '^$' |
+ sort -u |
+ paste -s -d ' ')
+ if test -n "$unique_missing_prereq"
+ then
+ printf "\nmissing prereq: $unique_missing_prereq\n\n"
+ fi
+fi
+
if test -n "$failed_tests"
then
printf "\nfailed test(s):$failed_tests\n\n"
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index d3b299e..cc01d89 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -56,6 +56,10 @@
' "$@" <actual
}
+get_progress_result () {
+ tr '\015' '\012' | tail -n 1
+}
+
test_expect_success 'setup A lines' '
echo "1A quick brown fox jumps over the" >file &&
echo "lazy dog" >>file &&
@@ -161,7 +165,7 @@
GIT_AUTHOR_NAME=$i$j GIT_AUTHOR_EMAIL=$i$j@test.git \
git commit -a -m "$i$j" &&
commit=$(git rev-parse --verify HEAD) &&
- graft="$graft$commit "
+ graft="$graft$commit " || return 1
done
done &&
printf "%s " $graft >.git/info/grafts &&
@@ -604,3 +608,39 @@
test_expect_success 'blame -L ,^/RE/' '
test_must_fail $PROG -L1,^/99/ file
'
+
+test_expect_success 'blame progress on a full file' '
+ cat >expect <<-\EOF &&
+ Blaming lines: 100% (10/10), done.
+ EOF
+
+ GIT_PROGRESS_DELAY=0 \
+ git blame --progress hello.c 2>stderr &&
+
+ get_progress_result <stderr >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'blame progress on a single range' '
+ cat >expect <<-\EOF &&
+ Blaming lines: 100% (4/4), done.
+ EOF
+
+ GIT_PROGRESS_DELAY=0 \
+ git blame --progress -L 3,6 hello.c 2>stderr &&
+
+ get_progress_result <stderr >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'blame progress on multiple ranges' '
+ cat >expect <<-\EOF &&
+ Blaming lines: 100% (7/7), done.
+ EOF
+
+ GIT_PROGRESS_DELAY=0 \
+ git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&
+
+ get_progress_result <stderr >actual &&
+ test_cmp expect actual
+'
diff --git a/t/chainlint.sed b/t/chainlint.sed
index 8a25c5b..dc4ce37 100644
--- a/t/chainlint.sed
+++ b/t/chainlint.sed
@@ -24,9 +24,9 @@
# in order to avoid misinterpreting the ")" in constructs such as "x=$(...)"
# and "case $x in *)" as ending the subshell.
#
-# Lines missing a final "&&" are flagged with "?!AMP?!", and lines which chain
-# commands with ";" internally rather than "&&" are flagged "?!SEMI?!". A line
-# may be flagged for both violations.
+# Lines missing a final "&&" are flagged with "?!AMP?!", as are lines which
+# chain commands with ";" internally rather than "&&". A line may be flagged
+# for both violations.
#
# Detection of a missing &&-link in a multi-line subshell is complicated by the
# fact that the last statement before the closing ")" must not end with "&&".
@@ -47,8 +47,8 @@
# "?!AMP?!" violation is removed from the "bar" line (retrieved from the "hold"
# area) since the final statement of a subshell must not end with "&&". The
# final line of a subshell may still break the &&-chain by using ";" internally
-# to chain commands together rather than "&&", so "?!SEMI?!" is never removed
-# from a line (even though "?!AMP?!" might be).
+# to chain commands together rather than "&&", but an internal "?!AMP?!" is
+# never removed from a line even though a line-ending "?!AMP?!" might be.
#
# Care is taken to recognize the last _statement_ of a multi-line subshell, not
# necessarily the last textual _line_ within the subshell, since &&-chaining
@@ -62,26 +62,20 @@
# receives similar treatment.
#
# Swallowing here-docs with arbitrary tags requires a bit of finesse. When a
-# line such as "cat <<EOF >out" is seen, the here-doc tag is moved to the front
-# of the line enclosed in angle brackets as a sentinel, giving "<EOF>cat >out".
+# line such as "cat <<EOF" is seen, the here-doc tag is copied to the front of
+# the line enclosed in angle brackets as a sentinel, giving "<EOF>cat <<EOF".
# As each subsequent line is read, it is appended to the target line and a
# (whitespace-loose) back-reference match /^<(.*)>\n\1$/ is attempted to see if
# the content inside "<...>" matches the entirety of the newly-read line. For
# instance, if the next line read is "some data", when concatenated with the
-# target line, it becomes "<EOF>cat >out\nsome data", and a match is attempted
+# target line, it becomes "<EOF>cat <<EOF\nsome data", and a match is attempted
# to see if "EOF" matches "some data". Since it doesn't, the next line is
# attempted. When a line consisting of only "EOF" (and possible whitespace) is
-# encountered, it is appended to the target line giving "<EOF>cat >out\nEOF",
+# encountered, it is appended to the target line giving "<EOF>cat <<EOF\nEOF",
# in which case the "EOF" inside "<...>" does match the text following the
# newline, thus the closing here-doc tag has been found. The closing tag line
# and the "<...>" prefix on the target line are then discarded, leaving just
-# the target line "cat >out".
-#
-# To facilitate regression testing (and manual debugging), a ">" annotation is
-# applied to the line containing ")" which closes a subshell, ">>" to a line
-# closing a nested subshell, and ">>>" to a line closing both at once. This
-# makes it easy to detect whether the heuristics correctly identify
-# end-of-subshell.
+# the target line "cat <<EOF".
#------------------------------------------------------------------------------
# incomplete line -- slurp up next line
@@ -94,9 +88,9 @@
# here-doc -- swallow it to avoid false hits within its body (but keep the
# command to which it was attached)
-/<<[ ]*[-\\'"]*[A-Za-z0-9_]/ {
- s/^\(.*\)<<[ ]*[-\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\2>\1<</
- s/[ ]*<<//
+/<<-*[ ]*[\\'"]*[A-Za-z0-9_]/ {
+ /"[^"]*<<[^"]*"/bnotdoc
+ s/^\(.*<<-*[ ]*\)[\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\2>\1\2/
:hered
N
/^<\([^>]*\)>.*\n[ ]*\1[ ]*$/!{
@@ -106,6 +100,7 @@
s/^<[^>]*>//
s/\n.*$//
}
+:notdoc
# one-liner "(...) &&"
/^[ ]*!*[ ]*(..*)[ ]*&&[ ]*$/boneline
@@ -126,7 +121,7 @@
# "&&" (but not ";" in a string)
:oneline
/;/{
- /"[^"]*;[^"]*"/!s/^/?!SEMI?!/
+ /"[^"]*;[^"]*"/!s/;/; ?!AMP?!/
}
b
@@ -136,11 +131,15 @@
h
bnextln
}
-# "(..." line -- split off and stash "(", then process "..." as its own line
+# "(..." line -- "(" opening subshell cuddled with command; temporarily replace
+# "(" with sentinel "^" and process the line as if "(" had been seen solo on
+# the preceding line; this temporary replacement prevents several rules from
+# accidentally thinking "(" introduces a nested subshell; "^" is changed back
+# to "(" at output time
x
-s/.*/(/
+s/.*//
x
-s/(//
+s/(/^/
bslurp
:nextln
@@ -157,8 +156,10 @@
/"[^'"]*'[^'"]*"/!bsqstr
}
:folded
-# here-doc -- swallow it
-/<<[ ]*[-\\'"]*[A-Za-z0-9_]/bheredoc
+# here-doc -- swallow it (but not "<<" in a string)
+/<<-*[ ]*[\\'"]*[A-Za-z0-9_]/{
+ /"[^"]*<<[^"]*"/!bheredoc
+}
# comment or empty line -- discard since final non-comment, non-empty line
# before closing ")", "done", "elsif", "else", or "fi" will need to be
# re-visited to drop "suspect" marking since final line of those constructs
@@ -171,12 +172,12 @@
/"[^"]*#[^"]*"/!s/[ ]#.*$//
}
# one-liner "case ... esac"
-/^[ ]*case[ ]*..*esac/bchkchn
+/^[ ^]*case[ ]*..*esac/bchkchn
# multi-line "case ... esac"
-/^[ ]*case[ ]..*[ ]in/bcase
+/^[ ^]*case[ ]..*[ ]in/bcase
# multi-line "for ... done" or "while ... done"
-/^[ ]*for[ ]..*[ ]in/bcont
-/^[ ]*while[ ]/bcont
+/^[ ^]*for[ ]..*[ ]in/bcont
+/^[ ^]*while[ ]/bcont
/^[ ]*do[ ]/bcont
/^[ ]*do[ ]*$/bcont
/;[ ]*do/bcont
@@ -187,7 +188,7 @@
/||[ ]*exit[ ]/bcont
/||[ ]*exit[ ]*$/bcont
# multi-line "if...elsif...else...fi"
-/^[ ]*if[ ]/bcont
+/^[ ^]*if[ ]/bcont
/^[ ]*then[ ]/bcont
/^[ ]*then[ ]*$/bcont
/;[ ]*then/bcont
@@ -200,15 +201,15 @@
/^[ ]*fi[ ]*[<>|]/bdone
/^[ ]*fi[ ]*)/bdone
# nested one-liner "(...) &&"
-/^[ ]*(.*)[ ]*&&[ ]*$/bchkchn
+/^[ ^]*(.*)[ ]*&&[ ]*$/bchkchn
# nested one-liner "(...)"
-/^[ ]*(.*)[ ]*$/bchkchn
+/^[ ^]*(.*)[ ]*$/bchkchn
# nested one-liner "(...) >x" (or "2>x" or "<x" or "|x")
-/^[ ]*(.*)[ ]*[0-9]*[<>|]/bchkchn
+/^[ ^]*(.*)[ ]*[0-9]*[<>|]/bchkchn
# nested multi-line "(...\n...)"
-/^[ ]*(/bnest
+/^[ ^]*(/bnest
# multi-line "{...\n...}"
-/^[ ]*{/bblock
+/^[ ^]*{/bblock
# closing ")" on own line -- exit subshell
/^[ ]*)/bclssolo
# "$((...))" -- arithmetic expansion; not closing ")"
@@ -230,16 +231,18 @@
# string and not ";;" in one-liner "case...esac")
/;/{
/;;/!{
- /"[^"]*;[^"]*"/!s/^/?!SEMI?!/
+ /"[^"]*;[^"]*"/!s/;/; ?!AMP?!/
}
}
# line ends with pipe "...|" -- valid; not missing "&&"
/|[ ]*$/bcont
# missing end-of-line "&&" -- mark suspect
-/&&[ ]*$/!s/^/?!AMP?!/
+/&&[ ]*$/!s/$/ ?!AMP?!/
:cont
# retrieve and print previous line
x
+s/^\([ ]*\)^/\1(/
+s/?!HERE?!/<</g
n
bslurp
@@ -280,8 +283,7 @@
# found here-doc -- swallow it to avoid false hits within its body (but keep
# the command to which it was attached)
:heredoc
-s/^\(.*\)<<[ ]*[-\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\2>\1<</
-s/[ ]*<<//
+s/^\(.*\)<<\(-*[ ]*\)[\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\3>\1?!HERE?!\2\3/
:hdocsub
N
/^<\([^>]*\)>.*\n[ ]*\1[ ]*$/!{
@@ -295,7 +297,15 @@
# found "case ... in" -- pass through untouched
:case
x
+s/^\([ ]*\)^/\1(/
+s/?!HERE?!/<</g
n
+:cascom
+/^[ ]*#/{
+ N
+ s/.*\n//
+ bcascom
+}
/^[ ]*esac/bslurp
bcase
@@ -303,7 +313,7 @@
# that line legitimately lacks "&&"
:else
x
-s/?!AMP?!//
+s/\( ?!AMP?!\)* ?!AMP?!$//
x
bcont
@@ -311,7 +321,7 @@
# "suspect" from final contained line since that line legitimately lacks "&&"
:done
x
-s/?!AMP?!//
+s/\( ?!AMP?!\)* ?!AMP?!$//
x
# is 'done' or 'fi' cuddled with ")" to close subshell?
/done.*)/bclose
@@ -322,11 +332,18 @@
:nest
x
:nstslrp
+s/^\([ ]*\)^/\1(/
+s/?!HERE?!/<</g
n
+:nstcom
+# comment -- not closing ")" if in comment
+/^[ ]*#/{
+ N
+ s/.*\n//
+ bnstcom
+}
# closing ")" on own line -- stop nested slurp
/^[ ]*)/bnstcl
-# comment -- not closing ")" if in comment
-/^[ ]*#/bnstcnt
# "$((...))" -- arithmetic expansion; not closing ")"
/\$(([^)][^)]*))[^)]*$/bnstcnt
# "$(...)" -- command substitution; not closing ")"
@@ -337,7 +354,6 @@
x
bnstslrp
:nstcl
-s/^/>>/
# is it "))" which closes nested and parent subshells?
/)[ ]*)/bslurp
bchkchn
@@ -345,7 +361,15 @@
# found multi-line "{...\n...}" block -- pass through untouched
:block
x
+s/^\([ ]*\)^/\1(/
+s/?!HERE?!/<</g
n
+:blkcom
+/^[ ]*#/{
+ N
+ s/.*\n//
+ bblkcom
+}
# closing "}" -- stop block slurp
/}/bchkchn
bblock
@@ -354,16 +378,22 @@
# since that line legitimately lacks "&&" and exit subshell loop
:clssolo
x
-s/?!AMP?!//
+s/\( ?!AMP?!\)* ?!AMP?!$//
+s/^\([ ]*\)^/\1(/
+s/?!HERE?!/<</g
p
x
-s/^/>/
+s/^\([ ]*\)^/\1(/
+s/?!HERE?!/<</g
b
# found closing "...)" -- exit subshell loop
:close
x
+s/^\([ ]*\)^/\1(/
+s/?!HERE?!/<</g
p
x
-s/^/>/
+s/^\([ ]*\)^/\1(/
+s/?!HERE?!/<</g
b
diff --git a/t/chainlint/arithmetic-expansion.expect b/t/chainlint/arithmetic-expansion.expect
index 09457d3..46ee104 100644
--- a/t/chainlint/arithmetic-expansion.expect
+++ b/t/chainlint/arithmetic-expansion.expect
@@ -2,8 +2,8 @@
foo &&
bar=$((42 + 1)) &&
baz
->) &&
+) &&
(
-?!AMP?! bar=$((42 + 1))
+ bar=$((42 + 1)) ?!AMP?!
baz
->)
+)
diff --git a/t/chainlint/bash-array.expect b/t/chainlint/bash-array.expect
index c4a830d..4c34eae 100644
--- a/t/chainlint/bash-array.expect
+++ b/t/chainlint/bash-array.expect
@@ -2,9 +2,9 @@
foo &&
bar=(gumbo stumbo wumbo) &&
baz
->) &&
+) &&
(
foo &&
bar=${#bar[@]} &&
baz
->)
+)
diff --git a/t/chainlint/blank-line.expect b/t/chainlint/blank-line.expect
index 3be939e..f76fde1 100644
--- a/t/chainlint/blank-line.expect
+++ b/t/chainlint/blank-line.expect
@@ -1,4 +1,4 @@
(
nothing &&
something
->)
+)
diff --git a/t/chainlint/blank-line.test b/t/chainlint/blank-line.test
index f6dd143..0fdf15b 100644
--- a/t/chainlint/blank-line.test
+++ b/t/chainlint/blank-line.test
@@ -3,7 +3,7 @@
nothing &&
something
-# LINT: swallow blank lines since final _statement_ before subshell end is
+# LINT: ignore blank lines since final _statement_ before subshell end is
# LINT: significant to "&&"-check, not final _line_ (which might be blank)
diff --git a/t/chainlint/block-comment.expect b/t/chainlint/block-comment.expect
new file mode 100644
index 0000000..d10b2ee
--- /dev/null
+++ b/t/chainlint/block-comment.expect
@@ -0,0 +1,6 @@
+(
+ {
+ echo a &&
+ echo b
+ }
+)
diff --git a/t/chainlint/block-comment.test b/t/chainlint/block-comment.test
new file mode 100644
index 0000000..df2beea
--- /dev/null
+++ b/t/chainlint/block-comment.test
@@ -0,0 +1,8 @@
+(
+ {
+ # show a
+ echo a &&
+ # show b
+ echo b
+ }
+)
diff --git a/t/chainlint/block.expect b/t/chainlint/block.expect
index fed7e89..da60257 100644
--- a/t/chainlint/block.expect
+++ b/t/chainlint/block.expect
@@ -7,6 +7,6 @@
bar &&
{
echo c
-?!AMP?! }
+ } ?!AMP?!
baz
->)
+)
diff --git a/t/chainlint/block.test b/t/chainlint/block.test
index d859151..0a82fd5 100644
--- a/t/chainlint/block.test
+++ b/t/chainlint/block.test
@@ -1,6 +1,5 @@
(
-# LINT: missing "&&" in block not currently detected (for consistency with
-# LINT: --chain-lint at top level and to provide escape hatch if needed)
+# LINT: missing "&&" after first "echo"
foo &&
{
echo a
diff --git a/t/chainlint/broken-chain.expect b/t/chainlint/broken-chain.expect
index 55b0f42..cfb58fb 100644
--- a/t/chainlint/broken-chain.expect
+++ b/t/chainlint/broken-chain.expect
@@ -1,6 +1,6 @@
(
foo &&
-?!AMP?! bar
+ bar ?!AMP?!
baz &&
wop
->)
+)
diff --git a/t/chainlint/broken-chain.test b/t/chainlint/broken-chain.test
index 3cc67b6..2a44aa7 100644
--- a/t/chainlint/broken-chain.test
+++ b/t/chainlint/broken-chain.test
@@ -1,6 +1,6 @@
(
foo &&
-# LINT: missing "&&" from 'bar'
+# LINT: missing "&&" from "bar"
bar
baz &&
# LINT: final statement before closing ")" legitimately lacks "&&"
diff --git a/t/chainlint/case-comment.expect b/t/chainlint/case-comment.expect
new file mode 100644
index 0000000..1e4b054
--- /dev/null
+++ b/t/chainlint/case-comment.expect
@@ -0,0 +1,8 @@
+(
+ case "$x" in
+ x) foo ;;
+ *)
+ bar
+ ;;
+ esac
+)
diff --git a/t/chainlint/case-comment.test b/t/chainlint/case-comment.test
new file mode 100644
index 0000000..641c157
--- /dev/null
+++ b/t/chainlint/case-comment.test
@@ -0,0 +1,11 @@
+(
+ case "$x" in
+ # found foo
+ x) foo ;;
+ # found other
+ *)
+ # treat it as bar
+ bar
+ ;;
+ esac
+)
diff --git a/t/chainlint/case.expect b/t/chainlint/case.expect
index 41f121f..31f280d 100644
--- a/t/chainlint/case.expect
+++ b/t/chainlint/case.expect
@@ -4,16 +4,16 @@
*) bar ;;
esac &&
foobar
->) &&
+) &&
(
case "$x" in
x) foo ;;
*) bar ;;
-?!AMP?! esac
+ esac ?!AMP?!
foobar
->) &&
+) &&
(
case "$x" in 1) true;; esac &&
-?!AMP?! case "$y" in 2) false;; esac
+ case "$y" in 2) false;; esac ?!AMP?!
foobar
->)
+)
diff --git a/t/chainlint/case.test b/t/chainlint/case.test
index 5ef6ff7..4cb086b 100644
--- a/t/chainlint/case.test
+++ b/t/chainlint/case.test
@@ -1,5 +1,5 @@
(
-# LINT: "...)" arms in 'case' not misinterpreted as subshell-closing ")"
+# LINT: "...)" arms in "case" not misinterpreted as subshell-closing ")"
case "$x" in
x) foo ;;
*) bar ;;
@@ -7,7 +7,7 @@
foobar
) &&
(
-# LINT: missing "&&" on 'esac'
+# LINT: missing "&&" on "esac"
case "$x" in
x) foo ;;
*) bar ;;
@@ -15,7 +15,7 @@
foobar
) &&
(
-# LINT: "...)" arm in one-liner 'case' not misinterpreted as closing ")"
+# LINT: "...)" arm in one-liner "case" not misinterpreted as closing ")"
case "$x" in 1) true;; esac &&
# LINT: same but missing "&&"
case "$y" in 2) false;; esac
diff --git a/t/chainlint/close-nested-and-parent-together.expect b/t/chainlint/close-nested-and-parent-together.expect
index 2a910f9..72d482f 100644
--- a/t/chainlint/close-nested-and-parent-together.expect
+++ b/t/chainlint/close-nested-and-parent-together.expect
@@ -1,4 +1,3 @@
-(
-cd foo &&
+(cd foo &&
(bar &&
->>> baz))
+ baz))
diff --git a/t/chainlint/close-subshell.expect b/t/chainlint/close-subshell.expect
index 1846887..0f87db9 100644
--- a/t/chainlint/close-subshell.expect
+++ b/t/chainlint/close-subshell.expect
@@ -1,25 +1,25 @@
(
foo
->) &&
+) &&
(
bar
->) >out &&
+) >out &&
(
baz
->) 2>err &&
+) 2>err &&
(
boo
->) <input &&
+) <input &&
(
bip
->) | wuzzle &&
+) | wuzzle &&
(
bop
->) | fazz fozz &&
+) | fazz fozz &&
(
bup
->) |
+) |
fuzzle &&
(
yop
->)
+)
diff --git a/t/chainlint/command-substitution.expect b/t/chainlint/command-substitution.expect
index ad4118e..c72e4df 100644
--- a/t/chainlint/command-substitution.expect
+++ b/t/chainlint/command-substitution.expect
@@ -2,8 +2,8 @@
foo &&
bar=$(gobble) &&
baz
->) &&
+) &&
(
-?!AMP?! bar=$(gobble blocks)
+ bar=$(gobble blocks) ?!AMP?!
baz
->)
+)
diff --git a/t/chainlint/comment.expect b/t/chainlint/comment.expect
index 3be939e..f76fde1 100644
--- a/t/chainlint/comment.expect
+++ b/t/chainlint/comment.expect
@@ -1,4 +1,4 @@
(
nothing &&
something
->)
+)
diff --git a/t/chainlint/complex-if-in-cuddled-loop.expect b/t/chainlint/complex-if-in-cuddled-loop.expect
index 9674b88..2fca183 100644
--- a/t/chainlint/complex-if-in-cuddled-loop.expect
+++ b/t/chainlint/complex-if-in-cuddled-loop.expect
@@ -1,10 +1,9 @@
-(
-for i in a b c; do
+(for i in a b c; do
if test "$(echo $(waffle bat))" = "eleventeen" &&
test "$x" = "$y"; then
:
else
echo >file
fi
-> done) &&
+ done) &&
test ! -f file
diff --git a/t/chainlint/complex-if-in-cuddled-loop.test b/t/chainlint/complex-if-in-cuddled-loop.test
index 571bbd8..5efeda5 100644
--- a/t/chainlint/complex-if-in-cuddled-loop.test
+++ b/t/chainlint/complex-if-in-cuddled-loop.test
@@ -1,4 +1,4 @@
-# LINT: 'for' loop cuddled with "(" and ")" and nested 'if' with complex
+# LINT: "for" loop cuddled with "(" and ")" and nested "if" with complex
# LINT: multi-line condition; indented with spaces, not tabs
(for i in a b c; do
if test "$(echo $(waffle bat))" = "eleventeen" &&
diff --git a/t/chainlint/cuddled-if-then-else.expect b/t/chainlint/cuddled-if-then-else.expect
index ab2a026..1d8ed58 100644
--- a/t/chainlint/cuddled-if-then-else.expect
+++ b/t/chainlint/cuddled-if-then-else.expect
@@ -1,7 +1,6 @@
-(
-if test -z ""; then
+(if test -z ""; then
echo empty
else
echo bizzy
-> fi) &&
+ fi) &&
echo foobar
diff --git a/t/chainlint/cuddled-if-then-else.test b/t/chainlint/cuddled-if-then-else.test
index eed774a..7c53f4e 100644
--- a/t/chainlint/cuddled-if-then-else.test
+++ b/t/chainlint/cuddled-if-then-else.test
@@ -1,4 +1,4 @@
-# LINT: 'if' cuddled with "(" and ")"; indented with spaces, not tabs
+# LINT: "if" cuddled with "(" and ")"; indented with spaces, not tabs
(if test -z ""; then
echo empty
else
diff --git a/t/chainlint/cuddled-loop.expect b/t/chainlint/cuddled-loop.expect
index 8c0260d..9cf2607 100644
--- a/t/chainlint/cuddled-loop.expect
+++ b/t/chainlint/cuddled-loop.expect
@@ -1,5 +1,4 @@
-(
- while read x
+( while read x
do foobar bop || exit 1
-> done <file ) &&
+ done <file ) &&
outside subshell
diff --git a/t/chainlint/cuddled-loop.test b/t/chainlint/cuddled-loop.test
index a841d78..3c2a62f 100644
--- a/t/chainlint/cuddled-loop.test
+++ b/t/chainlint/cuddled-loop.test
@@ -1,4 +1,4 @@
-# LINT: 'while' loop cuddled with "(" and ")", with embedded (allowed)
+# LINT: "while" loop cuddled with "(" and ")", with embedded (allowed)
# LINT: "|| exit {n}" to exit loop early, and using redirection "<" to feed
# LINT: loop; indented with spaces, not tabs
( while read x
diff --git a/t/chainlint/cuddled.expect b/t/chainlint/cuddled.expect
index b506d46..c3e0be4 100644
--- a/t/chainlint/cuddled.expect
+++ b/t/chainlint/cuddled.expect
@@ -1,21 +1,17 @@
-(
-cd foo &&
+(cd foo &&
bar
->) &&
+) &&
-(
-?!AMP?!cd foo
+(cd foo ?!AMP?!
bar
->) &&
+) &&
(
cd foo &&
-> bar) &&
+ bar) &&
-(
-cd foo &&
-> bar) &&
+(cd foo &&
+ bar) &&
-(
-?!AMP?!cd foo
-> bar)
+(cd foo ?!AMP?!
+ bar)
diff --git a/t/chainlint/cuddled.test b/t/chainlint/cuddled.test
index 0499fa4..257b5b5 100644
--- a/t/chainlint/cuddled.test
+++ b/t/chainlint/cuddled.test
@@ -1,5 +1,4 @@
-# LINT: first subshell statement cuddled with opening "("; for implementation
-# LINT: simplicity, "(..." is split into two lines, "(" and "..."
+# LINT: first subshell statement cuddled with opening "("
(cd foo &&
bar
) &&
diff --git a/t/chainlint/exit-loop.expect b/t/chainlint/exit-loop.expect
index 84d8bde..f76aa60 100644
--- a/t/chainlint/exit-loop.expect
+++ b/t/chainlint/exit-loop.expect
@@ -5,7 +5,7 @@
bar &&
baz
done
->) &&
+) &&
(
while true
do
@@ -13,7 +13,7 @@
bar &&
baz
done
->) &&
+) &&
(
i=0 &&
while test $i -lt 10
@@ -21,4 +21,4 @@
echo $i || exit
i=$(($i + 1))
done
->)
+)
diff --git a/t/chainlint/exit-subshell.expect b/t/chainlint/exit-subshell.expect
index bf78454..da80339 100644
--- a/t/chainlint/exit-subshell.expect
+++ b/t/chainlint/exit-subshell.expect
@@ -2,4 +2,4 @@
foo || exit 1
bar &&
baz
->)
+)
diff --git a/t/chainlint/for-loop.expect b/t/chainlint/for-loop.expect
index c33cf56..6671b8c 100644
--- a/t/chainlint/for-loop.expect
+++ b/t/chainlint/for-loop.expect
@@ -1,11 +1,11 @@
(
for i in a b c
do
-?!AMP?! echo $i
- cat
-?!AMP?! done
+ echo $i ?!AMP?!
+ cat <<-EOF
+ done ?!AMP?!
for i in a b c; do
echo $i &&
cat $i
done
->)
+)
diff --git a/t/chainlint/for-loop.test b/t/chainlint/for-loop.test
index 7db7626..6cb3428 100644
--- a/t/chainlint/for-loop.test
+++ b/t/chainlint/for-loop.test
@@ -1,17 +1,17 @@
(
-# LINT: 'for', 'do', 'done' do not need "&&"
+# LINT: "for", "do", "done" do not need "&&"
for i in a b c
do
-# LINT: missing "&&" on 'echo'
+# LINT: missing "&&" on "echo"
echo $i
# LINT: last statement of while does not need "&&"
cat <<-\EOF
bar
EOF
-# LINT: missing "&&" on 'done'
+# LINT: missing "&&" on "done"
done
-# LINT: 'do' on same line as 'for'
+# LINT: "do" on same line as "for"
for i in a b c; do
echo $i &&
cat $i
diff --git a/t/chainlint/here-doc-close-subshell.expect b/t/chainlint/here-doc-close-subshell.expect
index f011e33..2af9ced 100644
--- a/t/chainlint/here-doc-close-subshell.expect
+++ b/t/chainlint/here-doc-close-subshell.expect
@@ -1,2 +1,2 @@
(
-> cat)
+ cat <<-INPUT)
diff --git a/t/chainlint/here-doc-multi-line-command-subst.expect b/t/chainlint/here-doc-multi-line-command-subst.expect
index e5fb752..f8b3aa7 100644
--- a/t/chainlint/here-doc-multi-line-command-subst.expect
+++ b/t/chainlint/here-doc-multi-line-command-subst.expect
@@ -1,5 +1,5 @@
(
- x=$(bobble &&
-?!AMP?!>> wiffle)
+ x=$(bobble <<-END &&
+ wiffle) ?!AMP?!
echo $x
->)
+)
diff --git a/t/chainlint/here-doc-multi-line-string.expect b/t/chainlint/here-doc-multi-line-string.expect
index 32038a0..2578191 100644
--- a/t/chainlint/here-doc-multi-line-string.expect
+++ b/t/chainlint/here-doc-multi-line-string.expect
@@ -1,4 +1,4 @@
(
-?!AMP?! cat && echo "multi-line string"
+ cat <<-TXT && echo "multi-line string" ?!AMP?!
bap
->)
+)
diff --git a/t/chainlint/here-doc.expect b/t/chainlint/here-doc.expect
index 534b065..110059b 100644
--- a/t/chainlint/here-doc.expect
+++ b/t/chainlint/here-doc.expect
@@ -1,9 +1,7 @@
-boodle wobba gorgo snoot wafta snurb &&
+boodle wobba gorgo snoot wafta snurb <<EOF &&
-cat >foo &&
+cat <<-Arbitrary_Tag_42 >foo &&
-cat >bar &&
+cat <<zump >boo &&
-cat >boo &&
-
-horticulture
+horticulture <<EOF
diff --git a/t/chainlint/here-doc.test b/t/chainlint/here-doc.test
index ad4ce8a..3f5f92c 100644
--- a/t/chainlint/here-doc.test
+++ b/t/chainlint/here-doc.test
@@ -14,13 +14,6 @@
woz
Arbitrary_Tag_42
-# LINT: swallow 'quoted' here-doc
-cat <<'FUMP' >bar &&
-snoz
-boz
-woz
-FUMP
-
# LINT: swallow "quoted" here-doc
cat <<"zump" >boo &&
snoz
diff --git a/t/chainlint/if-in-loop.expect b/t/chainlint/if-in-loop.expect
index 03d3ceb..03b82a3 100644
--- a/t/chainlint/if-in-loop.expect
+++ b/t/chainlint/if-in-loop.expect
@@ -3,10 +3,10 @@
do
if false
then
-?!AMP?! echo "err"
+ echo "err" ?!AMP?!
exit 1
-?!AMP?! fi
+ fi ?!AMP?!
foo
-?!AMP?! done
+ done ?!AMP?!
bar
->)
+)
diff --git a/t/chainlint/if-in-loop.test b/t/chainlint/if-in-loop.test
index daf22da..f0cf19c 100644
--- a/t/chainlint/if-in-loop.test
+++ b/t/chainlint/if-in-loop.test
@@ -3,13 +3,13 @@
do
if false
then
-# LINT: missing "&&" on 'echo'
+# LINT: missing "&&" on "echo"
echo "err"
exit 1
-# LINT: missing "&&" on 'fi'
+# LINT: missing "&&" on "fi"
fi
foo
-# LINT: missing "&&" on 'done'
+# LINT: missing "&&" on "done"
done
bar
)
diff --git a/t/chainlint/if-then-else.expect b/t/chainlint/if-then-else.expect
index 5953c7b..44d86c3 100644
--- a/t/chainlint/if-then-else.expect
+++ b/t/chainlint/if-then-else.expect
@@ -1,19 +1,20 @@
(
if test -n ""
then
-?!AMP?! echo very
+ echo very ?!AMP?!
echo empty
elif test -z ""
+ then
echo foo
else
echo foo &&
- cat
-?!AMP?! fi
+ cat <<-EOF
+ fi ?!AMP?!
echo poodle
->) &&
+) &&
(
if test -n ""; then
echo very &&
-?!AMP?! echo empty
- if
->)
+ echo empty
+ fi
+)
diff --git a/t/chainlint/if-then-else.test b/t/chainlint/if-then-else.test
index 9bd8e9a..2055336 100644
--- a/t/chainlint/if-then-else.test
+++ b/t/chainlint/if-then-else.test
@@ -1,28 +1,29 @@
(
-# LINT: 'if', 'then', 'elif', 'else', 'fi' do not need "&&"
+# LINT: "if", "then", "elif", "else", "fi" do not need "&&"
if test -n ""
then
-# LINT: missing "&&" on 'echo'
+# LINT: missing "&&" on "echo"
echo very
-# LINT: last statement before 'elif' does not need "&&"
+# LINT: last statement before "elif" does not need "&&"
echo empty
elif test -z ""
-# LINT: last statement before 'else' does not need "&&"
+ then
+# LINT: last statement before "else" does not need "&&"
echo foo
else
echo foo &&
-# LINT: last statement before 'fi' does not need "&&"
+# LINT: last statement before "fi" does not need "&&"
cat <<-\EOF
bar
EOF
-# LINT: missing "&&" on 'fi'
+# LINT: missing "&&" on "fi"
fi
echo poodle
) &&
(
-# LINT: 'then' on same line as 'if'
+# LINT: "then" on same line as "if"
if test -n ""; then
echo very &&
echo empty
- if
+ fi
)
diff --git a/t/chainlint/incomplete-line.expect b/t/chainlint/incomplete-line.expect
index 2f3ebab..ffac8f9 100644
--- a/t/chainlint/incomplete-line.expect
+++ b/t/chainlint/incomplete-line.expect
@@ -1,4 +1,4 @@
line 1 line 2 line 3 line 4 &&
(
line 5 line 6 line 7 line 8
->)
+)
diff --git a/t/chainlint/inline-comment.expect b/t/chainlint/inline-comment.expect
index fc9f250..dd0dace 100644
--- a/t/chainlint/inline-comment.expect
+++ b/t/chainlint/inline-comment.expect
@@ -1,9 +1,8 @@
(
foobar &&
-?!AMP?! barfoo
+ barfoo ?!AMP?!
flibble "not a # comment"
->) &&
+) &&
-(
-cd foo &&
-> flibble "not a # comment")
+(cd foo &&
+ flibble "not a # comment")
diff --git a/t/chainlint/loop-in-if.expect b/t/chainlint/loop-in-if.expect
index 088e622..e1be423 100644
--- a/t/chainlint/loop-in-if.expect
+++ b/t/chainlint/loop-in-if.expect
@@ -3,10 +3,10 @@
then
while true
do
-?!AMP?! echo "pop"
+ echo "pop" ?!AMP?!
echo "glup"
-?!AMP?! done
+ done ?!AMP?!
foo
-?!AMP?! fi
+ fi ?!AMP?!
bar
->)
+)
diff --git a/t/chainlint/loop-in-if.test b/t/chainlint/loop-in-if.test
index 93e8ba8..dfcc3f9 100644
--- a/t/chainlint/loop-in-if.test
+++ b/t/chainlint/loop-in-if.test
@@ -3,13 +3,13 @@
then
while true
do
-# LINT: missing "&&" on 'echo'
+# LINT: missing "&&" on "echo"
echo "pop"
echo "glup"
-# LINT: missing "&&" on 'done'
+# LINT: missing "&&" on "done"
done
foo
-# LINT: missing "&&" on 'fi'
+# LINT: missing "&&" on "fi"
fi
bar
)
diff --git a/t/chainlint/multi-line-nested-command-substitution.expect b/t/chainlint/multi-line-nested-command-substitution.expect
index 59b6c8b..3000583 100644
--- a/t/chainlint/multi-line-nested-command-substitution.expect
+++ b/t/chainlint/multi-line-nested-command-substitution.expect
@@ -3,16 +3,16 @@
x=$(
echo bar |
cat
->> ) &&
+ ) &&
echo ok
->) |
+) |
sort &&
(
bar &&
x=$(echo bar |
cat
->> ) &&
+ ) &&
y=$(echo baz |
->> fip) &&
+ fip) &&
echo fail
->)
+)
diff --git a/t/chainlint/multi-line-string.expect b/t/chainlint/multi-line-string.expect
index 170cb59..ab0dadf 100644
--- a/t/chainlint/multi-line-string.expect
+++ b/t/chainlint/multi-line-string.expect
@@ -1,15 +1,9 @@
(
x="line 1 line 2 line 3" &&
-?!AMP?! y='line 1 line2'
+ y="line 1 line2" ?!AMP?!
foobar
->) &&
-(
- echo "there's nothing to see here" &&
- exit
->) &&
+) &&
(
echo "xyz" "abc def ghi" &&
- echo 'xyz' 'abc def ghi' &&
- echo 'xyz' "abc def ghi" &&
barfoo
->)
+)
diff --git a/t/chainlint/multi-line-string.test b/t/chainlint/multi-line-string.test
index 287ab89..4a0af21 100644
--- a/t/chainlint/multi-line-string.test
+++ b/t/chainlint/multi-line-string.test
@@ -3,25 +3,13 @@
line 2
line 3" &&
# LINT: missing "&&" on assignment
- y='line 1
- line2'
+ y="line 1
+ line2"
foobar
) &&
(
-# LINT: apostrophe (in a contraction) within string not misinterpreted as
-# LINT: starting multi-line single-quoted string
- echo "there's nothing to see here" &&
- exit
-) &&
-(
echo "xyz" "abc
def
ghi" &&
- echo 'xyz' 'abc
- def
- ghi' &&
- echo 'xyz' "abc
- def
- ghi" &&
barfoo
)
diff --git a/t/chainlint/negated-one-liner.expect b/t/chainlint/negated-one-liner.expect
index cf18429..ad4c2d9 100644
--- a/t/chainlint/negated-one-liner.expect
+++ b/t/chainlint/negated-one-liner.expect
@@ -1,5 +1,5 @@
! (foo && bar) &&
! (foo && bar) >baz &&
-?!SEMI?!! (foo; bar) &&
-?!SEMI?!! (foo; bar) >baz
+! (foo; ?!AMP?! bar) &&
+! (foo; ?!AMP?! bar) >baz
diff --git a/t/chainlint/nested-cuddled-subshell.expect b/t/chainlint/nested-cuddled-subshell.expect
index c2a59ff..2a86885 100644
--- a/t/chainlint/nested-cuddled-subshell.expect
+++ b/t/chainlint/nested-cuddled-subshell.expect
@@ -1,19 +1,19 @@
(
(cd foo &&
bar
->> ) &&
+ ) &&
(cd foo &&
bar
-?!AMP?!>> )
+ ) ?!AMP?!
(
cd foo &&
->> bar) &&
+ bar) &&
(
cd foo &&
-?!AMP?!>> bar)
+ bar) ?!AMP?!
(cd foo &&
->> bar) &&
+ bar) &&
(cd foo &&
-?!AMP?!>> bar)
+ bar) ?!AMP?!
foobar
->)
+)
diff --git a/t/chainlint/nested-here-doc.expect b/t/chainlint/nested-here-doc.expect
index 0c9ef1c..e3bef63 100644
--- a/t/chainlint/nested-here-doc.expect
+++ b/t/chainlint/nested-here-doc.expect
@@ -1,7 +1,7 @@
-cat >foop &&
+cat <<ARBITRARY >foop &&
(
- cat &&
-?!AMP?! cat
+ cat <<-INPUT_END &&
+ cat <<-EOT ?!AMP?!
foobar
->)
+)
diff --git a/t/chainlint/nested-subshell-comment.expect b/t/chainlint/nested-subshell-comment.expect
index 15b68d4..be4b27a 100644
--- a/t/chainlint/nested-subshell-comment.expect
+++ b/t/chainlint/nested-subshell-comment.expect
@@ -2,10 +2,8 @@
foo &&
(
bar &&
- # bottles wobble while fiddles gobble
- # minor numbers of cows (or do they?)
baz &&
snaff
-?!AMP?!>> )
+ ) ?!AMP?!
fuzzy
->)
+)
diff --git a/t/chainlint/nested-subshell-comment.test b/t/chainlint/nested-subshell-comment.test
index 0ff136a..0215cdb 100644
--- a/t/chainlint/nested-subshell-comment.test
+++ b/t/chainlint/nested-subshell-comment.test
@@ -7,7 +7,7 @@
# minor numbers of cows (or do they?)
baz &&
snaff
-# LINT: missing "&&" on ')'
+# LINT: missing "&&" on ")"
)
fuzzy
)
diff --git a/t/chainlint/nested-subshell.expect b/t/chainlint/nested-subshell.expect
index c8165ad..41a48ad 100644
--- a/t/chainlint/nested-subshell.expect
+++ b/t/chainlint/nested-subshell.expect
@@ -3,10 +3,10 @@
(
echo a &&
echo b
->> ) >file &&
+ ) >file &&
cd foo &&
(
echo a
echo b
->> ) >file
->)
+ ) >file
+)
diff --git a/t/chainlint/nested-subshell.test b/t/chainlint/nested-subshell.test
index 998b05a..440ee99 100644
--- a/t/chainlint/nested-subshell.test
+++ b/t/chainlint/nested-subshell.test
@@ -7,7 +7,6 @@
cd foo &&
(
-# LINT: nested multi-line subshell not presently checked for missing "&&"
echo a
echo b
) >file
diff --git a/t/chainlint/not-heredoc.expect b/t/chainlint/not-heredoc.expect
new file mode 100644
index 0000000..2e9bb13
--- /dev/null
+++ b/t/chainlint/not-heredoc.expect
@@ -0,0 +1,14 @@
+echo "<<<<<<< ours" &&
+echo ourside &&
+echo "=======" &&
+echo theirside &&
+echo ">>>>>>> theirs" &&
+
+(
+ echo "<<<<<<< ours" &&
+ echo ourside &&
+ echo "=======" &&
+ echo theirside &&
+ echo ">>>>>>> theirs" ?!AMP?!
+ poodle
+) >merged
diff --git a/t/chainlint/not-heredoc.test b/t/chainlint/not-heredoc.test
new file mode 100644
index 0000000..9aa5734
--- /dev/null
+++ b/t/chainlint/not-heredoc.test
@@ -0,0 +1,16 @@
+# LINT: "<< ours" inside string is not here-doc
+echo "<<<<<<< ours" &&
+echo ourside &&
+echo "=======" &&
+echo theirside &&
+echo ">>>>>>> theirs" &&
+
+(
+# LINT: "<< ours" inside string is not here-doc
+ echo "<<<<<<< ours" &&
+ echo ourside &&
+ echo "=======" &&
+ echo theirside &&
+ echo ">>>>>>> theirs"
+ poodle
+) >merged
diff --git a/t/chainlint/one-liner.expect b/t/chainlint/one-liner.expect
index 237f227..57a7a44 100644
--- a/t/chainlint/one-liner.expect
+++ b/t/chainlint/one-liner.expect
@@ -2,8 +2,8 @@
(foo && bar) |
(foo && bar) >baz &&
-?!SEMI?!(foo; bar) &&
-?!SEMI?!(foo; bar) |
-?!SEMI?!(foo; bar) >baz
+(foo; ?!AMP?! bar) &&
+(foo; ?!AMP?! bar) |
+(foo; ?!AMP?! bar) >baz &&
(foo "bar; baz")
diff --git a/t/chainlint/one-liner.test b/t/chainlint/one-liner.test
index ec9acb9..be9858f 100644
--- a/t/chainlint/one-liner.test
+++ b/t/chainlint/one-liner.test
@@ -3,10 +3,10 @@
(foo && bar) |
(foo && bar) >baz &&
-# LINT: top-level one-liner subshell missing internal "&&"
+# LINT: top-level one-liner subshell missing internal "&&" and broken &&-chain
(foo; bar) &&
(foo; bar) |
-(foo; bar) >baz
+(foo; bar) >baz &&
# LINT: ";" in string not misinterpreted as broken &&-chain
(foo "bar; baz")
diff --git a/t/chainlint/p4-filespec.expect b/t/chainlint/p4-filespec.expect
index 98b3d88..1290fd1 100644
--- a/t/chainlint/p4-filespec.expect
+++ b/t/chainlint/p4-filespec.expect
@@ -1,4 +1,4 @@
(
p4 print -1 //depot/fiddle#42 >file &&
foobar
->)
+)
diff --git a/t/chainlint/pipe.expect b/t/chainlint/pipe.expect
index 211b901..2cfc028 100644
--- a/t/chainlint/pipe.expect
+++ b/t/chainlint/pipe.expect
@@ -3,6 +3,6 @@
bar |
baz &&
fish |
-?!AMP?! cow
+ cow ?!AMP?!
sunder
->)
+)
diff --git a/t/chainlint/pipe.test b/t/chainlint/pipe.test
index e6af4de..dd82534 100644
--- a/t/chainlint/pipe.test
+++ b/t/chainlint/pipe.test
@@ -4,7 +4,7 @@
bar |
baz &&
-# LINT: final line of pipe sequence ('cow') lacking "&&"
+# LINT: final line of pipe sequence ("cow") lacking "&&"
fish |
cow
diff --git a/t/chainlint/semicolon.expect b/t/chainlint/semicolon.expect
index 1d79384..ed0b370 100644
--- a/t/chainlint/semicolon.expect
+++ b/t/chainlint/semicolon.expect
@@ -1,20 +1,19 @@
(
-?!AMP?!?!SEMI?! cat foo ; echo bar
-?!SEMI?! cat foo ; echo bar
->) &&
+ cat foo ; ?!AMP?! echo bar ?!AMP?!
+ cat foo ; ?!AMP?! echo bar
+) &&
(
-?!SEMI?! cat foo ; echo bar &&
-?!SEMI?! cat foo ; echo bar
->) &&
+ cat foo ; ?!AMP?! echo bar &&
+ cat foo ; ?!AMP?! echo bar
+) &&
(
echo "foo; bar" &&
-?!SEMI?! cat foo; echo bar
->) &&
+ cat foo; ?!AMP?! echo bar
+) &&
(
-?!SEMI?! foo;
->) &&
-(
-cd foo &&
+ foo;
+) &&
+(cd foo &&
for i in a b c; do
-?!SEMI?! echo;
-> done)
+ echo;
+ done)
diff --git a/t/chainlint/semicolon.test b/t/chainlint/semicolon.test
index d82c8eb..67e1192 100644
--- a/t/chainlint/semicolon.test
+++ b/t/chainlint/semicolon.test
@@ -15,11 +15,11 @@
cat foo; echo bar
) &&
(
-# LINT: unnecessary terminating semicolon
+# LINT: semicolon unnecessary but legitimate
foo;
) &&
(cd foo &&
for i in a b c; do
-# LINT: unnecessary terminating semicolon
+# LINT: semicolon unnecessary but legitimate
echo;
done)
diff --git a/t/chainlint/subshell-here-doc.expect b/t/chainlint/subshell-here-doc.expect
index 74723e7..029d129 100644
--- a/t/chainlint/subshell-here-doc.expect
+++ b/t/chainlint/subshell-here-doc.expect
@@ -1,11 +1,10 @@
(
- echo wobba gorgo snoot wafta snurb &&
-?!AMP?! cat >bip
- echo >bop
->) &&
+ echo wobba gorgo snoot wafta snurb <<-EOF &&
+ cat <<EOF >bip ?!AMP?!
+ echo <<-EOF >bop
+) &&
(
- cat >bup &&
- cat >bup2 &&
- cat >bup3 &&
+ cat <<-ARBITRARY >bup &&
+ cat <<-ARBITRARY3 >bup3 &&
meep
->)
+)
diff --git a/t/chainlint/subshell-here-doc.test b/t/chainlint/subshell-here-doc.test
index f6b3ba4..d40eb65 100644
--- a/t/chainlint/subshell-here-doc.test
+++ b/t/chainlint/subshell-here-doc.test
@@ -8,10 +8,10 @@
nevermore...
EOF
-# LINT: missing "&&" on 'cat'
+# LINT: missing "&&" on "cat"
cat <<EOF >bip
fish fly high
- EOF
+EOF
# LINT: swallow here-doc (EOF is last line of subshell)
echo <<-\EOF >bop
@@ -27,10 +27,6 @@
glink
FIZZ
ARBITRARY
- cat <<-'ARBITRARY2' >bup2 &&
- glink
- FIZZ
- ARBITRARY2
cat <<-"ARBITRARY3" >bup3 &&
glink
FIZZ
diff --git a/t/chainlint/subshell-one-liner.expect b/t/chainlint/subshell-one-liner.expect
index 5116282..b701536 100644
--- a/t/chainlint/subshell-one-liner.expect
+++ b/t/chainlint/subshell-one-liner.expect
@@ -2,13 +2,13 @@
(foo && bar) &&
(foo && bar) |
(foo && bar) >baz &&
-?!SEMI?! (foo; bar) &&
-?!SEMI?! (foo; bar) |
-?!SEMI?! (foo; bar) >baz &&
+ (foo; ?!AMP?! bar) &&
+ (foo; ?!AMP?! bar) |
+ (foo; ?!AMP?! bar) >baz &&
(foo || exit 1) &&
(foo || exit 1) |
(foo || exit 1) >baz &&
-?!AMP?! (foo && bar)
-?!AMP?!?!SEMI?! (foo && bar; baz)
+ (foo && bar) ?!AMP?!
+ (foo && bar; ?!AMP?! baz) ?!AMP?!
foobar
->)
+)
diff --git a/t/chainlint/t7900-subtree.expect b/t/chainlint/t7900-subtree.expect
index c991342..1cccc7b 100644
--- a/t/chainlint/t7900-subtree.expect
+++ b/t/chainlint/t7900-subtree.expect
@@ -1,10 +1,10 @@
(
chks="sub1sub2sub3sub4" &&
- chks_sub=$(cat | sed 's,^,sub dir/,'
->>) &&
+ chks_sub=$(cat <<TXT | sed "s,^,sub dir/,"
+) &&
chkms="main-sub1main-sub2main-sub3main-sub4" &&
- chkms_sub=$(cat | sed 's,^,sub dir/,'
->>) &&
+ chkms_sub=$(cat <<TXT | sed "s,^,sub dir/,"
+) &&
subfiles=$(git ls-files) &&
check_equal "$subfiles" "$chkms$chks"
->)
+)
diff --git a/t/chainlint/t7900-subtree.test b/t/chainlint/t7900-subtree.test
index 277d835..02f3129 100644
--- a/t/chainlint/t7900-subtree.test
+++ b/t/chainlint/t7900-subtree.test
@@ -3,7 +3,7 @@
sub2
sub3
sub4" &&
- chks_sub=$(cat <<TXT | sed 's,^,sub dir/,'
+ chks_sub=$(cat <<TXT | sed "s,^,sub dir/,"
$chks
TXT
) &&
@@ -11,7 +11,7 @@
main-sub2
main-sub3
main-sub4" &&
- chkms_sub=$(cat <<TXT | sed 's,^,sub dir/,'
+ chkms_sub=$(cat <<TXT | sed "s,^,sub dir/,"
$chkms
TXT
) &&
diff --git a/t/chainlint/while-loop.expect b/t/chainlint/while-loop.expect
index 13cff2c..0d3a9b3 100644
--- a/t/chainlint/while-loop.expect
+++ b/t/chainlint/while-loop.expect
@@ -1,11 +1,11 @@
(
while true
do
-?!AMP?! echo foo
- cat
-?!AMP?! done
+ echo foo ?!AMP?!
+ cat <<-EOF
+ done ?!AMP?!
while true; do
echo foo &&
cat bar
done
->)
+)
diff --git a/t/chainlint/while-loop.test b/t/chainlint/while-loop.test
index f1df085..d09fb01 100644
--- a/t/chainlint/while-loop.test
+++ b/t/chainlint/while-loop.test
@@ -1,17 +1,17 @@
(
-# LINT: 'while, 'do', 'done' do not need "&&"
+# LINT: "while", "do", "done" do not need "&&"
while true
do
-# LINT: missing "&&" on 'echo'
+# LINT: missing "&&" on "echo"
echo foo
# LINT: last statement of while does not need "&&"
cat <<-\EOF
bar
EOF
-# LINT: missing "&&" on 'done'
+# LINT: missing "&&" on "done"
done
-# LINT: 'do' on same line as 'while'
+# LINT: "do" on same line as "while"
while true; do
echo foo &&
cat bar
diff --git a/t/helper/test-chmtime.c b/t/helper/test-chmtime.c
index 524b55c..dc28890 100644
--- a/t/helper/test-chmtime.c
+++ b/t/helper/test-chmtime.c
@@ -134,6 +134,21 @@ int cmd__chmtime(int argc, const char **argv)
}
if (utb.modtime != sb.st_mtime && utime(argv[i], &utb) < 0) {
+#ifdef GIT_WINDOWS_NATIVE
+ if (S_ISDIR(sb.st_mode)) {
+ /*
+ * NEEDSWORK: The Windows version of `utime()`
+ * (aka `mingw_utime()`) does not correctly
+ * handle directory arguments, since it uses
+ * `_wopen()`. Ignore it for now since this
+ * is just a test.
+ */
+ fprintf(stderr,
+ ("Failed to modify time on directory %s. "
+ "Skipping\n"), argv[i]);
+ continue;
+ }
+#endif
fprintf(stderr, "Failed to modify time on %s: %s\n",
argv[i], strerror(errno));
return 1;
diff --git a/t/helper/test-csprng.c b/t/helper/test-csprng.c
new file mode 100644
index 0000000..65d1497
--- /dev/null
+++ b/t/helper/test-csprng.c
@@ -0,0 +1,29 @@
+#include "test-tool.h"
+#include "git-compat-util.h"
+
+
+int cmd__csprng(int argc, const char **argv)
+{
+ unsigned long count;
+ unsigned char buf[1024];
+
+ if (argc > 2) {
+ fprintf(stderr, "usage: %s [<size>]\n", argv[0]);
+ return 2;
+ }
+
+ count = (argc == 2) ? strtoul(argv[1], NULL, 0) : -1L;
+
+ while (count) {
+ unsigned long chunk = count < sizeof(buf) ? count : sizeof(buf);
+ if (csprng_bytes(buf, chunk) < 0) {
+ perror("failed to read");
+ return 5;
+ }
+ if (fwrite(buf, chunk, 1, stdout) != chunk)
+ return 1;
+ count -= chunk;
+ }
+
+ return 0;
+}
diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index 099eff4..45951b1 100644
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@ -1,5 +1,6 @@
#include "test-tool.h"
#include "cache.h"
+#include "date.h"
static const char *usage_msg = "\n"
" test-tool date relative [time_t]...\n"
@@ -34,7 +35,7 @@ static void show_human_dates(const char **argv)
static void show_dates(const char **argv, const char *format)
{
- struct date_mode mode;
+ struct date_mode mode = DATE_MODE_INIT;
parse_date_format(format, &mode);
for (; *argv; argv++) {
@@ -53,6 +54,8 @@ static void show_dates(const char **argv, const char *format)
printf("%s -> %s\n", *argv, show_date(t, tz, &mode));
}
+
+ date_mode_release(&mode);
}
static void parse_dates(const char **argv)
diff --git a/t/helper/test-drop-caches.c b/t/helper/test-drop-caches.c
index 7b42784..e37396d 100644
--- a/t/helper/test-drop-caches.c
+++ b/t/helper/test-drop-caches.c
@@ -3,6 +3,7 @@
#if defined(GIT_WINDOWS_NATIVE)
#include "lazyload.h"
+#include <winnt.h>
static int cmd_sync(void)
{
@@ -86,7 +87,8 @@ static int cmd_dropcaches(void)
{
HANDLE hProcess = GetCurrentProcess();
HANDLE hToken;
- DECLARE_PROC_ADDR(ntdll.dll, DWORD, NtSetSystemInformation, INT, PVOID, ULONG);
+ DECLARE_PROC_ADDR(ntdll.dll, DWORD, NTAPI, NtSetSystemInformation, INT, PVOID,
+ ULONG);
SYSTEM_MEMORY_LIST_COMMAND command;
int status;
diff --git a/t/helper/test-fast-rebase.c b/t/helper/test-fast-rebase.c
index fc2d460..4e5553e 100644
--- a/t/helper/test-fast-rebase.c
+++ b/t/helper/test-fast-rebase.c
@@ -99,6 +99,7 @@ int cmd__fast_rebase(int argc, const char **argv)
struct merge_result result;
struct strbuf reflog_msg = STRBUF_INIT;
struct strbuf branch_name = STRBUF_INIT;
+ int ret = 0;
/*
* test-tool stuff doesn't set up the git directory by default; need to
@@ -137,13 +138,17 @@ int cmd__fast_rebase(int argc, const char **argv)
revs.topo_order = 1;
strvec_pushl(&rev_walk_args, "", argv[4], "--not", argv[3], NULL);
- if (setup_revisions(rev_walk_args.nr, rev_walk_args.v, &revs, NULL) > 1)
- return error(_("unhandled options"));
+ if (setup_revisions(rev_walk_args.nr, rev_walk_args.v, &revs, NULL) > 1) {
+ ret = error(_("unhandled options"));
+ goto cleanup;
+ }
strvec_clear(&rev_walk_args);
- if (prepare_revision_walk(&revs) < 0)
- return error(_("error preparing revisions"));
+ if (prepare_revision_walk(&revs) < 0) {
+ ret = error(_("error preparing revisions"));
+ goto cleanup;
+ }
init_merge_options(&merge_opt, the_repository);
memset(&result, 0, sizeof(result));
@@ -201,8 +206,6 @@ int cmd__fast_rebase(int argc, const char **argv)
}
if (create_symref("HEAD", branch_name.buf, reflog_msg.buf) < 0)
die(_("unable to update HEAD"));
- strbuf_release(&reflog_msg);
- strbuf_release(&branch_name);
prime_cache_tree(the_repository, the_repository->index,
result.tree);
@@ -221,5 +224,11 @@ int cmd__fast_rebase(int argc, const char **argv)
if (write_locked_index(&the_index, &lock,
COMMIT_LOCK | SKIP_IF_UNCHANGED))
die(_("unable to write %s"), get_index_file());
- return (result.clean == 0);
+
+ ret = (result.clean == 0);
+cleanup:
+ strbuf_release(&reflog_msg);
+ strbuf_release(&branch_name);
+ release_revisions(&revs);
+ return ret;
}
diff --git a/t/helper/test-fsmonitor-client.c b/t/helper/test-fsmonitor-client.c
new file mode 100644
index 0000000..3062c8a
--- /dev/null
+++ b/t/helper/test-fsmonitor-client.c
@@ -0,0 +1,116 @@
+/*
+ * test-fsmonitor-client.c: client code to send commands/requests to
+ * a `git fsmonitor--daemon` daemon.
+ */
+
+#include "test-tool.h"
+#include "cache.h"
+#include "parse-options.h"
+#include "fsmonitor-ipc.h"
+
+#ifndef HAVE_FSMONITOR_DAEMON_BACKEND
+int cmd__fsmonitor_client(int argc, const char **argv)
+{
+ die("fsmonitor--daemon not available on this platform");
+}
+#else
+
+/*
+ * Read the `.git/index` to get the last token written to the
+ * FSMonitor Index Extension.
+ */
+static const char *get_token_from_index(void)
+{
+ struct index_state *istate = the_repository->index;
+
+ if (do_read_index(istate, the_repository->index_file, 0) < 0)
+ die("unable to read index file");
+ if (!istate->fsmonitor_last_update)
+ die("index file does not have fsmonitor extension");
+
+ return istate->fsmonitor_last_update;
+}
+
+/*
+ * Send an IPC query to a `git-fsmonitor--daemon` daemon and
+ * ask for the changes since the given token or from the last
+ * token in the index extension.
+ *
+ * This will implicitly start a daemon process if necessary. The
+ * daemon process will persist after we exit.
+ */
+static int do_send_query(const char *token)
+{
+ struct strbuf answer = STRBUF_INIT;
+ int ret;
+
+ if (!token || !*token)
+ token = get_token_from_index();
+
+ ret = fsmonitor_ipc__send_query(token, &answer);
+ if (ret < 0)
+ die("could not query fsmonitor--daemon");
+
+ write_in_full(1, answer.buf, answer.len);
+ strbuf_release(&answer);
+
+ return 0;
+}
+
+/*
+ * Send a "flush" command to the `git-fsmonitor--daemon` (if running)
+ * and tell it to flush its cache.
+ *
+ * This feature is primarily used by the test suite to simulate a loss of
+ * sync with the filesystem where we miss kernel events.
+ */
+static int do_send_flush(void)
+{
+ struct strbuf answer = STRBUF_INIT;
+ int ret;
+
+ ret = fsmonitor_ipc__send_command("flush", &answer);
+ if (ret)
+ return ret;
+
+ write_in_full(1, answer.buf, answer.len);
+ strbuf_release(&answer);
+
+ return 0;
+}
+
+int cmd__fsmonitor_client(int argc, const char **argv)
+{
+ const char *subcmd;
+ const char *token = NULL;
+
+ const char * const fsmonitor_client_usage[] = {
+ "test-tool fsmonitor-client query [<token>]",
+ "test-tool fsmonitor-client flush",
+ NULL,
+ };
+
+ struct option options[] = {
+ OPT_STRING(0, "token", &token, "token",
+ "command token to send to the server"),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, NULL, options, fsmonitor_client_usage, 0);
+
+ if (argc != 1)
+ usage_with_options(fsmonitor_client_usage, options);
+
+ subcmd = argv[0];
+
+ setup_git_directory();
+
+ if (!strcmp(subcmd, "query"))
+ return !!do_send_query(token);
+
+ if (!strcmp(subcmd, "flush"))
+ return !!do_send_flush();
+
+ die("Unhandled subcommand: '%s'", subcmd);
+}
+#endif
diff --git a/t/helper/test-genzeros.c b/t/helper/test-genzeros.c
index 9532f5b..8ca988d 100644
--- a/t/helper/test-genzeros.c
+++ b/t/helper/test-genzeros.c
@@ -3,18 +3,31 @@
int cmd__genzeros(int argc, const char **argv)
{
- long count;
+ /* static, so that it is NUL-initialized */
+ static const char zeros[256 * 1024];
+ intmax_t count;
+ ssize_t n;
if (argc > 2) {
fprintf(stderr, "usage: %s [<count>]\n", argv[0]);
return 1;
}
- count = argc > 1 ? strtol(argv[1], NULL, 0) : -1L;
+ count = argc > 1 ? strtoimax(argv[1], NULL, 0) : -1;
- while (count < 0 || count--) {
- if (putchar(0) == EOF)
+ /* Writing out individual NUL bytes is slow... */
+ while (count < 0)
+ if (write(1, zeros, ARRAY_SIZE(zeros)) < 0)
return -1;
+
+ while (count > 0) {
+ n = write(1, zeros, count < ARRAY_SIZE(zeros) ?
+ count : ARRAY_SIZE(zeros));
+
+ if (n < 0)
+ return -1;
+
+ count -= n;
}
return 0;
diff --git a/t/helper/test-mergesort.c b/t/helper/test-mergesort.c
index c5cffaa..ebf68f7 100644
--- a/t/helper/test-mergesort.c
+++ b/t/helper/test-mergesort.c
@@ -2,6 +2,12 @@
#include "cache.h"
#include "mergesort.h"
+static uint32_t minstd_rand(uint32_t *state)
+{
+ *state = (uint64_t)*state * 48271 % 2147483647;
+ return *state;
+}
+
struct line {
char *text;
struct line *next;
@@ -23,14 +29,12 @@ static int compare_strings(const void *a, const void *b)
return strcmp(x->text, y->text);
}
-int cmd__mergesort(int argc, const char **argv)
+static int sort_stdin(void)
{
struct line *line, *p = NULL, *lines = NULL;
struct strbuf sb = STRBUF_INIT;
- for (;;) {
- if (strbuf_getwholeline(&sb, stdin, '\n'))
- break;
+ while (!strbuf_getline(&sb, stdin)) {
line = xmalloc(sizeof(struct line));
line->text = strbuf_detach(&sb, NULL);
if (p) {
@@ -46,8 +50,362 @@ int cmd__mergesort(int argc, const char **argv)
lines = llist_mergesort(lines, get_next, set_next, compare_strings);
while (lines) {
- printf("%s", lines->text);
+ puts(lines->text);
lines = lines->next;
}
return 0;
}
+
+static void dist_sawtooth(int *arr, int n, int m)
+{
+ int i;
+ for (i = 0; i < n; i++)
+ arr[i] = i % m;
+}
+
+static void dist_rand(int *arr, int n, int m)
+{
+ int i;
+ uint32_t seed = 1;
+ for (i = 0; i < n; i++)
+ arr[i] = minstd_rand(&seed) % m;
+}
+
+static void dist_stagger(int *arr, int n, int m)
+{
+ int i;
+ for (i = 0; i < n; i++)
+ arr[i] = (i * m + i) % n;
+}
+
+static void dist_plateau(int *arr, int n, int m)
+{
+ int i;
+ for (i = 0; i < n; i++)
+ arr[i] = (i < m) ? i : m;
+}
+
+static void dist_shuffle(int *arr, int n, int m)
+{
+ int i, j, k;
+ uint32_t seed = 1;
+ for (i = j = 0, k = 1; i < n; i++)
+ arr[i] = minstd_rand(&seed) % m ? (j += 2) : (k += 2);
+}
+
+#define DIST(name) { #name, dist_##name }
+
+static struct dist {
+ const char *name;
+ void (*fn)(int *arr, int n, int m);
+} dist[] = {
+ DIST(sawtooth),
+ DIST(rand),
+ DIST(stagger),
+ DIST(plateau),
+ DIST(shuffle),
+};
+
+static const struct dist *get_dist_by_name(const char *name)
+{
+ int i;
+ for (i = 0; i < ARRAY_SIZE(dist); i++) {
+ if (!strcmp(dist[i].name, name))
+ return &dist[i];
+ }
+ return NULL;
+}
+
+static void mode_copy(int *arr, int n)
+{
+ /* nothing */
+}
+
+static void mode_reverse(int *arr, int n)
+{
+ int i, j;
+ for (i = 0, j = n - 1; i < j; i++, j--)
+ SWAP(arr[i], arr[j]);
+}
+
+static void mode_reverse_1st_half(int *arr, int n)
+{
+ mode_reverse(arr, n / 2);
+}
+
+static void mode_reverse_2nd_half(int *arr, int n)
+{
+ int half = n / 2;
+ mode_reverse(arr + half, n - half);
+}
+
+static int compare_ints(const void *av, const void *bv)
+{
+ const int *ap = av, *bp = bv;
+ int a = *ap, b = *bp;
+ return (a > b) - (a < b);
+}
+
+static void mode_sort(int *arr, int n)
+{
+ QSORT(arr, n, compare_ints);
+}
+
+static void mode_dither(int *arr, int n)
+{
+ int i;
+ for (i = 0; i < n; i++)
+ arr[i] += i % 5;
+}
+
+static void unriffle(int *arr, int n, int *tmp)
+{
+ int i, j;
+ COPY_ARRAY(tmp, arr, n);
+ for (i = j = 0; i < n; i += 2)
+ arr[j++] = tmp[i];
+ for (i = 1; i < n; i += 2)
+ arr[j++] = tmp[i];
+}
+
+static void unriffle_recursively(int *arr, int n, int *tmp)
+{
+ if (n > 1) {
+ int half = n / 2;
+ unriffle(arr, n, tmp);
+ unriffle_recursively(arr, half, tmp);
+ unriffle_recursively(arr + half, n - half, tmp);
+ }
+}
+
+static void mode_unriffle(int *arr, int n)
+{
+ int *tmp;
+ ALLOC_ARRAY(tmp, n);
+ unriffle_recursively(arr, n, tmp);
+ free(tmp);
+}
+
+static unsigned int prev_pow2(unsigned int n)
+{
+ unsigned int pow2 = 1;
+ while (pow2 * 2 < n)
+ pow2 *= 2;
+ return pow2;
+}
+
+static void unriffle_recursively_skewed(int *arr, int n, int *tmp)
+{
+ if (n > 1) {
+ int pow2 = prev_pow2(n);
+ int rest = n - pow2;
+ unriffle(arr + pow2 - rest, rest * 2, tmp);
+ unriffle_recursively_skewed(arr, pow2, tmp);
+ unriffle_recursively_skewed(arr + pow2, rest, tmp);
+ }
+}
+
+static void mode_unriffle_skewed(int *arr, int n)
+{
+ int *tmp;
+ ALLOC_ARRAY(tmp, n);
+ unriffle_recursively_skewed(arr, n, tmp);
+ free(tmp);
+}
+
+#define MODE(name) { #name, mode_##name }
+
+static struct mode {
+ const char *name;
+ void (*fn)(int *arr, int n);
+} mode[] = {
+ MODE(copy),
+ MODE(reverse),
+ MODE(reverse_1st_half),
+ MODE(reverse_2nd_half),
+ MODE(sort),
+ MODE(dither),
+ MODE(unriffle),
+ MODE(unriffle_skewed),
+};
+
+static const struct mode *get_mode_by_name(const char *name)
+{
+ int i;
+ for (i = 0; i < ARRAY_SIZE(mode); i++) {
+ if (!strcmp(mode[i].name, name))
+ return &mode[i];
+ }
+ return NULL;
+}
+
+static int generate(int argc, const char **argv)
+{
+ const struct dist *dist = NULL;
+ const struct mode *mode = NULL;
+ int i, n, m, *arr;
+
+ if (argc != 4)
+ return 1;
+
+ dist = get_dist_by_name(argv[0]);
+ mode = get_mode_by_name(argv[1]);
+ n = strtol(argv[2], NULL, 10);
+ m = strtol(argv[3], NULL, 10);
+ if (!dist || !mode)
+ return 1;
+
+ ALLOC_ARRAY(arr, n);
+ dist->fn(arr, n, m);
+ mode->fn(arr, n);
+ for (i = 0; i < n; i++)
+ printf("%08x\n", arr[i]);
+ free(arr);
+ return 0;
+}
+
+static struct stats {
+ int get_next, set_next, compare;
+} stats;
+
+struct number {
+ int value, rank;
+ struct number *next;
+};
+
+static void *get_next_number(const void *a)
+{
+ stats.get_next++;
+ return ((const struct number *)a)->next;
+}
+
+static void set_next_number(void *a, void *b)
+{
+ stats.set_next++;
+ ((struct number *)a)->next = b;
+}
+
+static int compare_numbers(const void *av, const void *bv)
+{
+ const struct number *an = av, *bn = bv;
+ int a = an->value, b = bn->value;
+ stats.compare++;
+ return (a > b) - (a < b);
+}
+
+static void clear_numbers(struct number *list)
+{
+ while (list) {
+ struct number *next = list->next;
+ free(list);
+ list = next;
+ }
+}
+
+static int test(const struct dist *dist, const struct mode *mode, int n, int m)
+{
+ int *arr;
+ size_t i;
+ struct number *curr, *list, **tail;
+ int is_sorted = 1;
+ int is_stable = 1;
+ const char *verdict;
+ int result = -1;
+
+ ALLOC_ARRAY(arr, n);
+ dist->fn(arr, n, m);
+ mode->fn(arr, n);
+ for (i = 0, tail = &list; i < n; i++) {
+ curr = xmalloc(sizeof(*curr));
+ curr->value = arr[i];
+ curr->rank = i;
+ *tail = curr;
+ tail = &curr->next;
+ }
+ *tail = NULL;
+
+ stats.get_next = stats.set_next = stats.compare = 0;
+ list = llist_mergesort(list, get_next_number, set_next_number,
+ compare_numbers);
+
+ QSORT(arr, n, compare_ints);
+ for (i = 0, curr = list; i < n && curr; i++, curr = curr->next) {
+ if (arr[i] != curr->value)
+ is_sorted = 0;
+ if (curr->next && curr->value == curr->next->value &&
+ curr->rank >= curr->next->rank)
+ is_stable = 0;
+ }
+ if (i < n) {
+ verdict = "too short";
+ } else if (curr) {
+ verdict = "too long";
+ } else if (!is_sorted) {
+ verdict = "not sorted";
+ } else if (!is_stable) {
+ verdict = "unstable";
+ } else {
+ verdict = "OK";
+ result = 0;
+ }
+
+ printf("%-9s %-16s %8d %8d %8d %8d %8d %s\n",
+ dist->name, mode->name, n, m, stats.get_next, stats.set_next,
+ stats.compare, verdict);
+
+ clear_numbers(list);
+ free(arr);
+
+ return result;
+}
+
+/*
+ * A version of the qsort certification program from "Engineering a Sort
+ * Function" by Bentley and McIlroy, Software—Practice and Experience,
+ * Volume 23, Issue 11, 1249–1265 (November 1993).
+ */
+static int run_tests(int argc, const char **argv)
+{
+ const char *argv_default[] = { "100", "1023", "1024", "1025" };
+ if (!argc)
+ return run_tests(ARRAY_SIZE(argv_default), argv_default);
+ printf("%-9s %-16s %8s %8s %8s %8s %8s %s\n",
+ "distribut", "mode", "n", "m", "get_next", "set_next",
+ "compare", "verdict");
+ while (argc--) {
+ int i, j, m, n = strtol(*argv++, NULL, 10);
+ for (i = 0; i < ARRAY_SIZE(dist); i++) {
+ for (j = 0; j < ARRAY_SIZE(mode); j++) {
+ for (m = 1; m < 2 * n; m *= 2) {
+ if (test(&dist[i], &mode[j], n, m))
+ return 1;
+ }
+ }
+ }
+ }
+ return 0;
+}
+
+int cmd__mergesort(int argc, const char **argv)
+{
+ int i;
+ const char *sep;
+
+ if (argc == 6 && !strcmp(argv[1], "generate"))
+ return generate(argc - 2, argv + 2);
+ if (argc == 2 && !strcmp(argv[1], "sort"))
+ return sort_stdin();
+ if (argc > 1 && !strcmp(argv[1], "test"))
+ return run_tests(argc - 2, argv + 2);
+ fprintf(stderr, "usage: test-tool mergesort generate <distribution> <mode> <n> <m>\n");
+ fprintf(stderr, " or: test-tool mergesort sort\n");
+ fprintf(stderr, " or: test-tool mergesort test [<n>...]\n");
+ fprintf(stderr, "\n");
+ for (i = 0, sep = "distributions: "; i < ARRAY_SIZE(dist); i++, sep = ", ")
+ fprintf(stderr, "%s%s", sep, dist[i].name);
+ fprintf(stderr, "\n");
+ for (i = 0, sep = "modes: "; i < ARRAY_SIZE(mode); i++, sep = ", ")
+ fprintf(stderr, "%s%s", sep, mode[i].name);
+ fprintf(stderr, "\n");
+ return 129;
+}
diff --git a/t/helper/test-oid-array.c b/t/helper/test-oid-array.c
index b16cd0b..d1324d0 100644
--- a/t/helper/test-oid-array.c
+++ b/t/helper/test-oid-array.c
@@ -35,5 +35,9 @@ int cmd__oid_array(int argc, const char **argv)
else
die("unknown command: %s", line.buf);
}
+
+ strbuf_release(&line);
+ oid_array_clear(&array);
+
return 0;
}
diff --git a/t/helper/test-oidtree.c b/t/helper/test-oidtree.c
index 180ee28..d48a409 100644
--- a/t/helper/test-oidtree.c
+++ b/t/helper/test-oidtree.c
@@ -45,5 +45,8 @@ int cmd__oidtree(int argc, const char **argv)
die("unknown command: %s", line.buf);
}
}
+
+ strbuf_release(&line);
+
return 0;
}
diff --git a/t/helper/test-pack-mtimes.c b/t/helper/test-pack-mtimes.c
new file mode 100644
index 0000000..f7b79da
--- /dev/null
+++ b/t/helper/test-pack-mtimes.c
@@ -0,0 +1,56 @@
+#include "git-compat-util.h"
+#include "test-tool.h"
+#include "strbuf.h"
+#include "object-store.h"
+#include "packfile.h"
+#include "pack-mtimes.h"
+
+static void dump_mtimes(struct packed_git *p)
+{
+ uint32_t i;
+ if (load_pack_mtimes(p) < 0)
+ die("could not load pack .mtimes");
+
+ for (i = 0; i < p->num_objects; i++) {
+ struct object_id oid;
+ if (nth_packed_object_id(&oid, p, i) < 0)
+ die("could not load object id at position %"PRIu32, i);
+
+ printf("%s %"PRIu32"\n",
+ oid_to_hex(&oid), nth_packed_mtime(p, i));
+ }
+}
+
+static const char *pack_mtimes_usage = "\n"
+" test-tool pack-mtimes <pack-name.mtimes>";
+
+int cmd__pack_mtimes(int argc, const char **argv)
+{
+ struct strbuf buf = STRBUF_INIT;
+ struct packed_git *p;
+
+ setup_git_directory();
+
+ if (argc != 2)
+ usage(pack_mtimes_usage);
+
+ for (p = get_all_packs(the_repository); p; p = p->next) {
+ strbuf_addstr(&buf, basename(p->pack_name));
+ strbuf_strip_suffix(&buf, ".pack");
+ strbuf_addstr(&buf, ".mtimes");
+
+ if (!strcmp(buf.buf, argv[1]))
+ break;
+
+ strbuf_reset(&buf);
+ }
+
+ strbuf_release(&buf);
+
+ if (!p)
+ die("could not find pack '%s'", argv[1]);
+
+ dump_mtimes(p);
+
+ return 0;
+}
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index a282b6f..48d3cf6 100644
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -14,7 +14,6 @@ static int dry_run = 0, quiet = 0;
static char *string = NULL;
static char *file = NULL;
static int ambiguous;
-static struct string_list list = STRING_LIST_INIT_NODUP;
static struct {
int called;
@@ -107,6 +106,8 @@ int cmd__parse_options(int argc, const char **argv)
NULL
};
struct string_list expect = STRING_LIST_INIT_NODUP;
+ struct string_list list = STRING_LIST_INIT_NODUP;
+
struct option options[] = {
OPT_BOOL(0, "yes", &boolean, "get a boolean"),
OPT_BOOL('D', "no-doubt", &boolean, "begins with 'no-'"),
@@ -185,5 +186,9 @@ int cmd__parse_options(int argc, const char **argv)
for (i = 0; i < argc; i++)
show(&expect, &ret, "arg %02d: %s", i, argv[i]);
+ expect.strdup_strings = 1;
+ string_list_clear(&expect, 0);
+ string_list_clear(&list, 0);
+
return ret;
}
diff --git a/t/helper/test-prio-queue.c b/t/helper/test-prio-queue.c
index f402844..133b5e6 100644
--- a/t/helper/test-prio-queue.c
+++ b/t/helper/test-prio-queue.c
@@ -46,5 +46,7 @@ int cmd__prio_queue(int argc, const char **argv)
}
}
+ clear_prio_queue(&pq);
+
return 0;
}
diff --git a/t/helper/test-progress.c b/t/helper/test-progress.c
index 5d05cbe..6cc9735 100644
--- a/t/helper/test-progress.c
+++ b/t/helper/test-progress.c
@@ -3,6 +3,9 @@
*
* Reads instructions from standard input, one instruction per line:
*
+ * "start <total>[ <title>]" - Call start_progress(title, total),
+ * Uses the default title of "Working hard"
+ * if the " <title>" is omitted.
* "progress <items>" - Call display_progress() with the given item count
* as parameter.
* "throughput <bytes> <millis> - Call display_throughput() with the given
@@ -10,6 +13,7 @@
* specify the time elapsed since the
* start_progress() call.
* "update" - Set the 'progress_update' flag.
+ * "stop" - Call stop_progress().
*
* See 't0500-progress-display.sh' for examples.
*/
@@ -19,34 +23,50 @@
#include "parse-options.h"
#include "progress.h"
#include "strbuf.h"
+#include "string-list.h"
int cmd__progress(int argc, const char **argv)
{
- int total = 0;
- const char *title;
+ const char *const default_title = "Working hard";
+ struct string_list titles = STRING_LIST_INIT_DUP;
struct strbuf line = STRBUF_INIT;
- struct progress *progress;
+ struct progress *progress = NULL;
const char *usage[] = {
- "test-tool progress [--total=<n>] <progress-title>",
+ "test-tool progress <stdin",
NULL
};
struct option options[] = {
- OPT_INTEGER(0, "total", &total, "total number of items"),
OPT_END(),
};
argc = parse_options(argc, argv, NULL, options, usage, 0);
- if (argc != 1)
- die("need a title for the progress output");
- title = argv[0];
+ if (argc)
+ usage_with_options(usage, options);
progress_testing = 1;
- progress = start_progress(title, total);
while (strbuf_getline(&line, stdin) != EOF) {
char *end;
- if (skip_prefix(line.buf, "progress ", (const char **) &end)) {
+ if (skip_prefix(line.buf, "start ", (const char **) &end)) {
+ uint64_t total = strtoull(end, &end, 10);
+ const char *title;
+
+ /*
+ * We can't use "end + 1" as an argument to
+ * start_progress(), it doesn't xstrdup() its
+ * "title" argument. We need to hold onto a
+ * valid "char *" for it until the end.
+ */
+ if (!*end)
+ title = default_title;
+ else if (*end == ' ')
+ title = string_list_insert(&titles, end + 1)->string;
+ else
+ die("invalid input: '%s'\n", line.buf);
+
+ progress = start_progress(title, total);
+ } else if (skip_prefix(line.buf, "progress ", (const char **) &end)) {
uint64_t item_count = strtoull(end, &end, 10);
if (*end != '\0')
die("invalid input: '%s'\n", line.buf);
@@ -63,12 +83,16 @@ int cmd__progress(int argc, const char **argv)
die("invalid input: '%s'\n", line.buf);
progress_test_ns = test_ms * 1000 * 1000;
display_throughput(progress, byte_count);
- } else if (!strcmp(line.buf, "update"))
+ } else if (!strcmp(line.buf, "update")) {
progress_test_force_update();
- else
+ } else if (!strcmp(line.buf, "stop")) {
+ stop_progress(&progress);
+ } else {
die("invalid input: '%s'\n", line.buf);
+ }
}
- stop_progress(&progress);
+ strbuf_release(&line);
+ string_list_clear(&titles, 0);
return 0;
}
diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c
index b52c174..b736ef1 100644
--- a/t/helper/test-read-cache.c
+++ b/t/helper/test-read-cache.c
@@ -1,82 +1,39 @@
#include "test-tool.h"
#include "cache.h"
#include "config.h"
-#include "blob.h"
-#include "commit.h"
-#include "tree.h"
-#include "sparse-index.h"
-
-static void print_cache_entry(struct cache_entry *ce)
-{
- const char *type;
- printf("%06o ", ce->ce_mode & 0177777);
-
- if (S_ISSPARSEDIR(ce->ce_mode))
- type = tree_type;
- else if (S_ISGITLINK(ce->ce_mode))
- type = commit_type;
- else
- type = blob_type;
-
- printf("%s %s\t%s\n",
- type,
- oid_to_hex(&ce->oid),
- ce->name);
-}
-
-static void print_cache(struct index_state *istate)
-{
- int i;
- for (i = 0; i < istate->cache_nr; i++)
- print_cache_entry(istate->cache[i]);
-}
int cmd__read_cache(int argc, const char **argv)
{
- struct repository *r = the_repository;
int i, cnt = 1;
const char *name = NULL;
- int table = 0, expand = 0;
initialize_the_repository();
- prepare_repo_settings(r);
- r->settings.command_requires_full_index = 0;
- for (++argv, --argc; *argv && starts_with(*argv, "--"); ++argv, --argc) {
- if (skip_prefix(*argv, "--print-and-refresh=", &name))
- continue;
- if (!strcmp(*argv, "--table"))
- table = 1;
- else if (!strcmp(*argv, "--expand"))
- expand = 1;
+ if (argc > 1 && skip_prefix(argv[1], "--print-and-refresh=", &name)) {
+ argc--;
+ argv++;
}
- if (argc == 1)
- cnt = strtol(argv[0], NULL, 0);
+ if (argc == 2)
+ cnt = strtol(argv[1], NULL, 0);
setup_git_directory();
git_config(git_default_config, NULL);
for (i = 0; i < cnt; i++) {
- repo_read_index(r);
-
- if (expand)
- ensure_full_index(r->index);
-
+ read_cache();
if (name) {
int pos;
- refresh_index(r->index, REFRESH_QUIET,
+ refresh_index(&the_index, REFRESH_QUIET,
NULL, NULL, NULL);
- pos = index_name_pos(r->index, name, strlen(name));
+ pos = index_name_pos(&the_index, name, strlen(name));
if (pos < 0)
die("%s not in index", name);
printf("%s is%s up to date\n", name,
- ce_uptodate(r->index->cache[pos]) ? "" : " not");
+ ce_uptodate(the_index.cache[pos]) ? "" : " not");
write_file(name, "%d\n", i);
}
- if (table)
- print_cache(r->index);
- discard_index(r->index);
+ discard_cache();
}
return 0;
}
diff --git a/t/helper/test-read-graph.c b/t/helper/test-read-graph.c
index 75927b2..98b73bb 100644
--- a/t/helper/test-read-graph.c
+++ b/t/helper/test-read-graph.c
@@ -3,6 +3,7 @@
#include "commit-graph.h"
#include "repository.h"
#include "object-store.h"
+#include "bloom.h"
int cmd__read_graph(int argc, const char **argv)
{
@@ -45,6 +46,18 @@ int cmd__read_graph(int argc, const char **argv)
printf(" bloom_data");
printf("\n");
+ printf("options:");
+ if (graph->bloom_filter_settings)
+ printf(" bloom(%"PRIu32",%"PRIu32",%"PRIu32")",
+ graph->bloom_filter_settings->hash_version,
+ graph->bloom_filter_settings->bits_per_entry,
+ graph->bloom_filter_settings->num_hashes);
+ if (graph->read_generation_data)
+ printf(" read_generation_data");
+ if (graph->topo_levels)
+ printf(" topo_levels");
+ printf("\n");
+
UNLEAK(graph);
return 0;
diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c
index cb0d270..27072ba 100644
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -3,6 +3,7 @@
#include "midx.h"
#include "repository.h"
#include "object-store.h"
+#include "pack-bitmap.h"
static int read_midx_file(const char *object_dir, int show_objects)
{
@@ -54,9 +55,10 @@ static int read_midx_file(const char *object_dir, int show_objects)
printf("%s %"PRIu64"\t%s\n",
oid_to_hex(&oid), e.offset, e.p->pack_name);
}
- return 0;
}
+ close_midx(m);
+
return 0;
}
@@ -72,14 +74,40 @@ static int read_midx_checksum(const char *object_dir)
return 0;
}
+static int read_midx_preferred_pack(const char *object_dir)
+{
+ struct multi_pack_index *midx = NULL;
+ struct bitmap_index *bitmap = NULL;
+
+ setup_git_directory();
+
+ midx = load_multi_pack_index(object_dir, 1);
+ if (!midx)
+ return 1;
+
+ bitmap = prepare_bitmap_git(the_repository);
+ if (!bitmap)
+ return 1;
+ if (!bitmap_is_midx(bitmap)) {
+ free_bitmap_index(bitmap);
+ return 1;
+ }
+
+ printf("%s\n", midx->pack_names[midx_preferred_pack(bitmap)]);
+ free_bitmap_index(bitmap);
+ return 0;
+}
+
int cmd__read_midx(int argc, const char **argv)
{
if (!(argc == 2 || argc == 3))
- usage("read-midx [--show-objects|--checksum] <object-dir>");
+ usage("read-midx [--show-objects|--checksum|--preferred-pack] <object-dir>");
if (!strcmp(argv[1], "--show-objects"))
return read_midx_file(argv[2], 1);
else if (!strcmp(argv[1], "--checksum"))
return read_midx_checksum(argv[2]);
+ else if (!strcmp(argv[1], "--preferred-pack"))
+ return read_midx_preferred_pack(argv[2]);
return read_midx_file(argv[1], 0);
}
diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
index b314b81..9646d85 100644
--- a/t/helper/test-ref-store.c
+++ b/t/helper/test-ref-store.c
@@ -5,6 +5,48 @@
#include "object-store.h"
#include "repository.h"
+struct flag_definition {
+ const char *name;
+ uint64_t mask;
+};
+
+#define FLAG_DEF(x) \
+ { \
+#x, (x) \
+ }
+
+static unsigned int parse_flags(const char *str, struct flag_definition *defs)
+{
+ struct string_list masks = STRING_LIST_INIT_DUP;
+ int i = 0;
+ unsigned int result = 0;
+
+ if (!strcmp(str, "0"))
+ return 0;
+
+ string_list_split(&masks, str, ',', 64);
+ for (; i < masks.nr; i++) {
+ const char *name = masks.items[i].string;
+ struct flag_definition *def = defs;
+ int found = 0;
+ while (def->name) {
+ if (!strcmp(def->name, name)) {
+ result |= def->mask;
+ found = 1;
+ break;
+ }
+ def++;
+ }
+ if (!found)
+ die("unknown flag \"%s\"", name);
+ }
+
+ string_list_clear(&masks, 0);
+ return result;
+}
+
+static struct flag_definition empty_flags[] = { { NULL, 0 } };
+
static const char *notnull(const char *arg, const char *name)
{
if (!arg)
@@ -12,9 +54,10 @@ static const char *notnull(const char *arg, const char *name)
return arg;
}
-static unsigned int arg_flags(const char *arg, const char *name)
+static unsigned int arg_flags(const char *arg, const char *name,
+ struct flag_definition *defs)
{
- return atoi(notnull(arg, name));
+ return parse_flags(notnull(arg, name), defs);
}
static const char **get_store(const char **argv, struct ref_store **refs)
@@ -64,10 +107,13 @@ static const char **get_store(const char **argv, struct ref_store **refs)
return argv + 1;
}
+static struct flag_definition pack_flags[] = { FLAG_DEF(PACK_REFS_PRUNE),
+ FLAG_DEF(PACK_REFS_ALL),
+ { NULL, 0 } };
static int cmd_pack_refs(struct ref_store *refs, const char **argv)
{
- unsigned int flags = arg_flags(*argv++, "flags");
+ unsigned int flags = arg_flags(*argv++, "flags", pack_flags);
return refs_pack_refs(refs, flags);
}
@@ -81,16 +127,27 @@ static int cmd_create_symref(struct ref_store *refs, const char **argv)
return refs_create_symref(refs, refname, target, logmsg);
}
+static struct flag_definition transaction_flags[] = {
+ FLAG_DEF(REF_NO_DEREF),
+ FLAG_DEF(REF_FORCE_CREATE_REFLOG),
+ FLAG_DEF(REF_SKIP_OID_VERIFICATION),
+ FLAG_DEF(REF_SKIP_REFNAME_VERIFICATION),
+ { NULL, 0 }
+};
+
static int cmd_delete_refs(struct ref_store *refs, const char **argv)
{
- unsigned int flags = arg_flags(*argv++, "flags");
+ unsigned int flags = arg_flags(*argv++, "flags", transaction_flags);
const char *msg = *argv++;
struct string_list refnames = STRING_LIST_INIT_NODUP;
+ int result;
while (*argv)
string_list_append(&refnames, *argv++);
- return refs_delete_refs(refs, msg, &refnames, flags);
+ result = refs_delete_refs(refs, msg, &refnames, flags);
+ string_list_clear(&refnames, 0);
+ return result;
}
static int cmd_rename_ref(struct ref_store *refs, const char **argv)
@@ -120,7 +177,7 @@ static int cmd_resolve_ref(struct ref_store *refs, const char **argv)
{
struct object_id oid = *null_oid();
const char *refname = notnull(*argv++, "refname");
- int resolve_flags = arg_flags(*argv++, "resolve-flags");
+ int resolve_flags = arg_flags(*argv++, "resolve-flags", empty_flags);
int flags;
const char *ref;
@@ -151,9 +208,9 @@ static int each_reflog(struct object_id *old_oid, struct object_id *new_oid,
const char *committer, timestamp_t timestamp,
int tz, const char *msg, void *cb_data)
{
- printf("%s %s %s %"PRItime" %d %s\n",
- oid_to_hex(old_oid), oid_to_hex(new_oid),
- committer, timestamp, tz, msg);
+ printf("%s %s %s %" PRItime " %+05d%s%s", oid_to_hex(old_oid),
+ oid_to_hex(new_oid), committer, timestamp, tz,
+ *msg == '\n' ? "" : "\t", msg);
return 0;
}
@@ -181,11 +238,10 @@ static int cmd_reflog_exists(struct ref_store *refs, const char **argv)
static int cmd_create_reflog(struct ref_store *refs, const char **argv)
{
const char *refname = notnull(*argv++, "refname");
- int force_create = arg_flags(*argv++, "force-create");
struct strbuf err = STRBUF_INIT;
int ret;
- ret = refs_create_reflog(refs, refname, force_create, &err);
+ ret = refs_create_reflog(refs, refname, &err);
if (err.len)
puts(err.buf);
return ret;
@@ -208,11 +264,11 @@ static int cmd_delete_ref(struct ref_store *refs, const char **argv)
const char *msg = notnull(*argv++, "msg");
const char *refname = notnull(*argv++, "refname");
const char *sha1_buf = notnull(*argv++, "old-sha1");
- unsigned int flags = arg_flags(*argv++, "flags");
+ unsigned int flags = arg_flags(*argv++, "flags", transaction_flags);
struct object_id old_oid;
if (get_oid_hex(sha1_buf, &old_oid))
- die("not sha-1");
+ die("cannot parse %s as %s", sha1_buf, the_hash_algo->name);
return refs_delete_ref(refs, msg, refname, &old_oid, flags);
}
@@ -223,13 +279,14 @@ static int cmd_update_ref(struct ref_store *refs, const char **argv)
const char *refname = notnull(*argv++, "refname");
const char *new_sha1_buf = notnull(*argv++, "new-sha1");
const char *old_sha1_buf = notnull(*argv++, "old-sha1");
- unsigned int flags = arg_flags(*argv++, "flags");
+ unsigned int flags = arg_flags(*argv++, "flags", transaction_flags);
struct object_id old_oid;
struct object_id new_oid;
- if (get_oid_hex(old_sha1_buf, &old_oid) ||
- get_oid_hex(new_sha1_buf, &new_oid))
- die("not sha-1");
+ if (get_oid_hex(old_sha1_buf, &old_oid))
+ die("cannot parse %s as %s", old_sha1_buf, the_hash_algo->name);
+ if (get_oid_hex(new_sha1_buf, &new_oid))
+ die("cannot parse %s as %s", new_sha1_buf, the_hash_algo->name);
return refs_update_ref(refs, msg, refname,
&new_oid, &old_oid,
diff --git a/t/helper/test-reftable.c b/t/helper/test-reftable.c
new file mode 100644
index 0000000..1f0a28c
--- /dev/null
+++ b/t/helper/test-reftable.c
@@ -0,0 +1,22 @@
+#include "reftable/reftable-tests.h"
+#include "test-tool.h"
+
+int cmd__reftable(int argc, const char **argv)
+{
+ /* test from simple to complex. */
+ basics_test_main(argc, argv);
+ record_test_main(argc, argv);
+ block_test_main(argc, argv);
+ tree_test_main(argc, argv);
+ pq_test_main(argc, argv);
+ readwrite_test_main(argc, argv);
+ merged_test_main(argc, argv);
+ stack_test_main(argc, argv);
+ refname_test_main(argc, argv);
+ return 0;
+}
+
+int cmd__dump_reftable(int argc, const char **argv)
+{
+ return reftable_dump_main(argc, (char *const *)argv);
+}
diff --git a/t/helper/test-revision-walking.c b/t/helper/test-revision-walking.c
index 625b2db..4a45d5b 100644
--- a/t/helper/test-revision-walking.c
+++ b/t/helper/test-revision-walking.c
@@ -43,6 +43,7 @@ static int run_revision_walk(void)
}
reset_revision_walk();
+ release_revisions(&rev);
return got_revision;
}
diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 3c4fb86..9050e31 100644
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -19,7 +19,6 @@
#include "thread-utils.h"
#include "wildmatch.h"
#include "gettext.h"
-#include "parse-options.h"
static int number_callbacks;
static int parallel_next(struct child_process *cp,
@@ -31,7 +30,7 @@ static int parallel_next(struct child_process *cp,
if (number_callbacks >= 4)
return 0;
- strvec_pushv(&cp->args, d->argv);
+ strvec_pushv(&cp->args, d->args.v);
strbuf_addstr(err, "preloaded output of a child\n");
number_callbacks++;
return 1;
@@ -180,15 +179,16 @@ static int testsuite(int argc, const char **argv)
if (max_jobs > suite.tests.nr)
max_jobs = suite.tests.nr;
- fprintf(stderr, "Running %d tests (%d at a time)\n",
- suite.tests.nr, max_jobs);
+ fprintf(stderr, "Running %"PRIuMAX" tests (%d at a time)\n",
+ (uintmax_t)suite.tests.nr, max_jobs);
ret = run_processes_parallel(max_jobs, next_test, test_failed,
test_finished, &suite);
if (suite.failed.nr > 0) {
ret = 1;
- fprintf(stderr, "%d tests failed:\n\n", suite.failed.nr);
+ fprintf(stderr, "%"PRIuMAX" tests failed:\n\n",
+ (uintmax_t)suite.failed.nr);
for (i = 0; i < suite.failed.nr; i++)
fprintf(stderr, "\t%s\n", suite.failed.items[i].string);
}
@@ -221,9 +221,9 @@ static int quote_stress_test(int argc, const char **argv)
struct strbuf out = STRBUF_INIT;
struct strvec args = STRVEC_INIT;
struct option options[] = {
- OPT_INTEGER('n', "trials", &trials, "Number of trials"),
- OPT_INTEGER('s', "skip", &skip, "Skip <n> trials"),
- OPT_BOOL('m', "msys2", &msys2, "Test quoting for MSYS2's sh"),
+ OPT_INTEGER('n', "trials", &trials, "number of trials"),
+ OPT_INTEGER('s', "skip", &skip, "skip <n> trials"),
+ OPT_BOOL('m', "msys2", &msys2, "test quoting for MSYS2's sh"),
OPT_END()
};
const char * const usage[] = {
@@ -274,7 +274,7 @@ static int quote_stress_test(int argc, const char **argv)
if (i < skip)
continue;
- cp.argv = args.v;
+ strvec_pushv(&cp.args, args.v);
strbuf_reset(&out);
if (pipe_command(&cp, NULL, 0, &out, 0, NULL, 0) < 0)
return error("Failed to spawn child process");
@@ -390,13 +390,13 @@ int cmd__run_command(int argc, const char **argv)
while (!strcmp(argv[1], "env")) {
if (!argv[2])
die("env specifier without a value");
- strvec_push(&proc.env_array, argv[2]);
+ strvec_push(&proc.env, argv[2]);
argv += 2;
argc -= 2;
}
if (argc < 3)
return 1;
- proc.argv = (const char **)argv + 2;
+ strvec_pushv(&proc.args, (const char **)argv + 2);
if (!strcmp(argv[1], "start-command-ENOENT")) {
if (start_command(&proc) < 0 && errno == ENOENT)
@@ -408,7 +408,8 @@ int cmd__run_command(int argc, const char **argv)
exit(run_command(&proc));
jobs = atoi(argv[2]);
- proc.argv = (const char **)argv + 3;
+ strvec_clear(&proc.args);
+ strvec_pushv(&proc.args, (const char **)argv + 3);
if (!strcmp(argv[1], "run-command-parallel"))
exit(run_processes_parallel(jobs, parallel_next,
diff --git a/t/helper/test-simple-ipc.c b/t/helper/test-simple-ipc.c
index 42040ef..28365ff 100644
--- a/t/helper/test-simple-ipc.c
+++ b/t/helper/test-simple-ipc.c
@@ -9,6 +9,7 @@
#include "parse-options.h"
#include "thread-utils.h"
#include "strvec.h"
+#include "run-command.h"
#ifndef SUPPORTS_SIMPLE_IPC
int cmd__simple_ipc(int argc, const char **argv)
@@ -112,7 +113,7 @@ static int app__slow_command(ipc_server_reply_cb *reply_cb,
/*
* The client sent a command followed by a (possibly very) large buffer.
*/
-static int app__sendbytes_command(const char *received,
+static int app__sendbytes_command(const char *received, size_t received_len,
ipc_server_reply_cb *reply_cb,
struct ipc_server_reply_data *reply_data)
{
@@ -123,6 +124,13 @@ static int app__sendbytes_command(const char *received,
int errs = 0;
int ret;
+ /*
+ * The test is setup to send:
+ * "sendbytes" SP <n * char>
+ */
+ if (received_len < strlen("sendbytes "))
+ BUG("received_len is short in app__sendbytes_command");
+
if (skip_prefix(received, "sendbytes ", &p))
len_ballast = strlen(p);
@@ -160,7 +168,7 @@ static ipc_server_application_cb test_app_cb;
* by this application.
*/
static int test_app_cb(void *application_data,
- const char *command,
+ const char *command, size_t command_len,
ipc_server_reply_cb *reply_cb,
struct ipc_server_reply_data *reply_data)
{
@@ -173,7 +181,7 @@ static int test_app_cb(void *application_data,
if (application_data != (void*)&my_app_data)
BUG("application_cb: application_data pointer wrong");
- if (!strcmp(command, "quit")) {
+ if (command_len == 4 && !strncmp(command, "quit", 4)) {
/*
* The client sent a "quit" command. This is an async
* request for the server to shutdown.
@@ -193,22 +201,23 @@ static int test_app_cb(void *application_data,
return SIMPLE_IPC_QUIT;
}
- if (!strcmp(command, "ping")) {
+ if (command_len == 4 && !strncmp(command, "ping", 4)) {
const char *answer = "pong";
return reply_cb(reply_data, answer, strlen(answer));
}
- if (!strcmp(command, "big"))
+ if (command_len == 3 && !strncmp(command, "big", 3))
return app__big_command(reply_cb, reply_data);
- if (!strcmp(command, "chunk"))
+ if (command_len == 5 && !strncmp(command, "chunk", 5))
return app__chunk_command(reply_cb, reply_data);
- if (!strcmp(command, "slow"))
+ if (command_len == 4 && !strncmp(command, "slow", 4))
return app__slow_command(reply_cb, reply_data);
- if (starts_with(command, "sendbytes "))
- return app__sendbytes_command(command, reply_cb, reply_data);
+ if (command_len >= 10 && starts_with(command, "sendbytes "))
+ return app__sendbytes_command(command, command_len,
+ reply_cb, reply_data);
return app__unhandled_command(command, reply_cb, reply_data);
}
@@ -259,183 +268,69 @@ static int daemon__run_server(void)
*/
ret = ipc_server_run(cl_args.path, &opts, test_app_cb, (void*)&my_app_data);
if (ret == -2)
- error(_("socket/pipe already in use: '%s'"), cl_args.path);
+ error("socket/pipe already in use: '%s'", cl_args.path);
else if (ret == -1)
- error_errno(_("could not start server on: '%s'"), cl_args.path);
+ error_errno("could not start server on: '%s'", cl_args.path);
return ret;
}
-#ifndef GIT_WINDOWS_NATIVE
-/*
- * This is adapted from `daemonize()`. Use `fork()` to directly create and
- * run the daemon in a child process.
- */
-static int spawn_server(pid_t *pid)
+static start_bg_wait_cb bg_wait_cb;
+
+static int bg_wait_cb(const struct child_process *cp, void *cb_data)
{
- struct ipc_server_opts opts = {
- .nr_threads = cl_args.nr_threads,
- };
+ int s = ipc_get_active_state(cl_args.path);
- *pid = fork();
+ switch (s) {
+ case IPC_STATE__LISTENING:
+ /* child is "ready" */
+ return 0;
- switch (*pid) {
- case 0:
- if (setsid() == -1)
- error_errno(_("setsid failed"));
- close(0);
- close(1);
- close(2);
- sanitize_stdfds();
-
- return ipc_server_run(cl_args.path, &opts, test_app_cb,
- (void*)&my_app_data);
-
- case -1:
- return error_errno(_("could not spawn daemon in the background"));
+ case IPC_STATE__NOT_LISTENING:
+ case IPC_STATE__PATH_NOT_FOUND:
+ /* give child more time */
+ return 1;
default:
- return 0;
- }
-}
-#else
-/*
- * Conceptually like `daemonize()` but different because Windows does not
- * have `fork(2)`. Spawn a normal Windows child process but without the
- * limitations of `start_command()` and `finish_command()`.
- */
-static int spawn_server(pid_t *pid)
-{
- char test_tool_exe[MAX_PATH];
- struct strvec args = STRVEC_INIT;
- int in, out;
-
- GetModuleFileNameA(NULL, test_tool_exe, MAX_PATH);
-
- in = open("/dev/null", O_RDONLY);
- out = open("/dev/null", O_WRONLY);
-
- strvec_push(&args, test_tool_exe);
- strvec_push(&args, "simple-ipc");
- strvec_push(&args, "run-daemon");
- strvec_pushf(&args, "--name=%s", cl_args.path);
- strvec_pushf(&args, "--threads=%d", cl_args.nr_threads);
-
- *pid = mingw_spawnvpe(args.v[0], args.v, NULL, NULL, in, out, out);
- close(in);
- close(out);
-
- strvec_clear(&args);
-
- if (*pid < 0)
- return error(_("could not spawn daemon in the background"));
-
- return 0;
-}
-#endif
-
-/*
- * This is adapted from `wait_or_whine()`. Watch the child process and
- * let it get started and begin listening for requests on the socket
- * before reporting our success.
- */
-static int wait_for_server_startup(pid_t pid_child)
-{
- int status;
- pid_t pid_seen;
- enum ipc_active_state s;
- time_t time_limit, now;
-
- time(&time_limit);
- time_limit += cl_args.max_wait_sec;
-
- for (;;) {
- pid_seen = waitpid(pid_child, &status, WNOHANG);
-
- if (pid_seen == -1)
- return error_errno(_("waitpid failed"));
-
- else if (pid_seen == 0) {
- /*
- * The child is still running (this should be
- * the normal case). Try to connect to it on
- * the socket and see if it is ready for
- * business.
- *
- * If there is another daemon already running,
- * our child will fail to start (possibly
- * after a timeout on the lock), but we don't
- * care (who responds) if the socket is live.
- */
- s = ipc_get_active_state(cl_args.path);
- if (s == IPC_STATE__LISTENING)
- return 0;
-
- time(&now);
- if (now > time_limit)
- return error(_("daemon not online yet"));
-
- continue;
- }
-
- else if (pid_seen == pid_child) {
- /*
- * The new child daemon process shutdown while
- * it was starting up, so it is not listening
- * on the socket.
- *
- * Try to ping the socket in the odd chance
- * that another daemon started (or was already
- * running) while our child was starting.
- *
- * Again, we don't care who services the socket.
- */
- s = ipc_get_active_state(cl_args.path);
- if (s == IPC_STATE__LISTENING)
- return 0;
-
- /*
- * We don't care about the WEXITSTATUS() nor
- * any of the WIF*(status) values because
- * `cmd__simple_ipc()` does the `!!result`
- * trick on all function return values.
- *
- * So it is sufficient to just report the
- * early shutdown as an error.
- */
- return error(_("daemon failed to start"));
- }
-
- else
- return error(_("waitpid is confused"));
+ case IPC_STATE__INVALID_PATH:
+ case IPC_STATE__OTHER_ERROR:
+ /* all the time in world won't help */
+ return -1;
}
}
-/*
- * This process will start a simple-ipc server in a background process and
- * wait for it to become ready. This is like `daemonize()` but gives us
- * more control and better error reporting (and makes it easier to write
- * unit tests).
- */
static int daemon__start_server(void)
{
- pid_t pid_child;
- int ret;
+ struct child_process cp = CHILD_PROCESS_INIT;
+ enum start_bg_result sbgr;
- /*
- * Run the actual daemon in a background process.
- */
- ret = spawn_server(&pid_child);
- if (pid_child <= 0)
- return ret;
+ strvec_push(&cp.args, "test-tool");
+ strvec_push(&cp.args, "simple-ipc");
+ strvec_push(&cp.args, "run-daemon");
+ strvec_pushf(&cp.args, "--name=%s", cl_args.path);
+ strvec_pushf(&cp.args, "--threads=%d", cl_args.nr_threads);
- /*
- * Let the parent wait for the child process to get started
- * and begin listening for requests on the socket.
- */
- ret = wait_for_server_startup(pid_child);
+ cp.no_stdin = 1;
+ cp.no_stdout = 1;
+ cp.no_stderr = 1;
- return ret;
+ sbgr = start_bg_command(&cp, bg_wait_cb, NULL, cl_args.max_wait_sec);
+
+ switch (sbgr) {
+ case SBGR_READY:
+ return 0;
+
+ default:
+ case SBGR_ERROR:
+ case SBGR_CB_ERROR:
+ return error("daemon failed to start");
+
+ case SBGR_TIMEOUT:
+ return error("daemon not online yet");
+
+ case SBGR_DIED:
+ return error("daemon terminated");
+ }
}
/*
@@ -488,7 +383,9 @@ static int client__send_ipc(void)
options.wait_if_busy = 1;
options.wait_if_not_found = 0;
- if (!ipc_client_send_command(cl_args.path, &options, command, &buf)) {
+ if (!ipc_client_send_command(cl_args.path, &options,
+ command, strlen(command),
+ &buf)) {
if (buf.len) {
printf("%s\n", buf.buf);
fflush(stdout);
@@ -538,7 +435,7 @@ static int client__stop_server(void)
time(&now);
if (now > time_limit)
- return error(_("daemon has not shutdown yet"));
+ return error("daemon has not shutdown yet");
}
}
@@ -556,7 +453,9 @@ static int do_sendbytes(int bytecount, char byte, const char *path,
strbuf_addstr(&buf_send, "sendbytes ");
strbuf_addchars(&buf_send, byte, bytecount);
- if (!ipc_client_send_command(path, options, buf_send.buf, &buf_resp)) {
+ if (!ipc_client_send_command(path, options,
+ buf_send.buf, buf_send.len,
+ &buf_resp)) {
strbuf_rtrim(&buf_resp);
printf("sent:%c%08d %s\n", byte, bytecount, buf_resp.buf);
fflush(stdout);
diff --git a/t/helper/test-subprocess.c b/t/helper/test-subprocess.c
index 92b69de..ff22f2f 100644
--- a/t/helper/test-subprocess.c
+++ b/t/helper/test-subprocess.c
@@ -15,6 +15,6 @@ int cmd__subprocess(int argc, const char **argv)
argv++;
}
cp.git_cmd = 1;
- cp.argv = (const char **)argv + 1;
+ strvec_pushv(&cp.args, (const char **)argv + 1);
return run_command(&cp);
}
diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index 3ce5585..d2eacd3 100644
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -20,6 +20,7 @@ static struct test_cmd cmds[] = {
{ "chmtime", cmd__chmtime },
{ "config", cmd__config },
{ "crontab", cmd__crontab },
+ { "csprng", cmd__csprng },
{ "ctype", cmd__ctype },
{ "date", cmd__date },
{ "delta", cmd__delta },
@@ -31,6 +32,7 @@ static struct test_cmd cmds[] = {
{ "dump-untracked-cache", cmd__dump_untracked_cache },
{ "example-decorate", cmd__example_decorate },
{ "fast-rebase", cmd__fast_rebase },
+ { "fsmonitor-client", cmd__fsmonitor_client },
{ "genrandom", cmd__genrandom },
{ "genzeros", cmd__genzeros },
{ "getcwd", cmd__getcwd },
@@ -46,6 +48,7 @@ static struct test_cmd cmds[] = {
{ "oidmap", cmd__oidmap },
{ "oidtree", cmd__oidtree },
{ "online-cpus", cmd__online_cpus },
+ { "pack-mtimes", cmd__pack_mtimes },
{ "parse-options", cmd__parse_options },
{ "parse-pathspec-file", cmd__parse_pathspec_file },
{ "partial-clone", cmd__partial_clone },
@@ -53,13 +56,15 @@ static struct test_cmd cmds[] = {
{ "pcre2-config", cmd__pcre2_config },
{ "pkt-line", cmd__pkt_line },
{ "prio-queue", cmd__prio_queue },
- { "proc-receive", cmd__proc_receive},
+ { "proc-receive", cmd__proc_receive },
{ "progress", cmd__progress },
{ "reach", cmd__reach },
{ "read-cache", cmd__read_cache },
{ "read-graph", cmd__read_graph },
{ "read-midx", cmd__read_midx },
{ "ref-store", cmd__ref_store },
+ { "reftable", cmd__reftable },
+ { "dump-reftable", cmd__dump_reftable },
{ "regex", cmd__regex },
{ "repository", cmd__repository },
{ "revision-walking", cmd__revision_walking },
diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index 9f0f522..960cc27 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -10,6 +10,7 @@ int cmd__bloom(int argc, const char **argv);
int cmd__chmtime(int argc, const char **argv);
int cmd__config(int argc, const char **argv);
int cmd__crontab(int argc, const char **argv);
+int cmd__csprng(int argc, const char **argv);
int cmd__ctype(int argc, const char **argv);
int cmd__date(int argc, const char **argv);
int cmd__delta(int argc, const char **argv);
@@ -19,8 +20,10 @@ int cmd__dump_cache_tree(int argc, const char **argv);
int cmd__dump_fsmonitor(int argc, const char **argv);
int cmd__dump_split_index(int argc, const char **argv);
int cmd__dump_untracked_cache(int argc, const char **argv);
+int cmd__dump_reftable(int argc, const char **argv);
int cmd__example_decorate(int argc, const char **argv);
int cmd__fast_rebase(int argc, const char **argv);
+int cmd__fsmonitor_client(int argc, const char **argv);
int cmd__genrandom(int argc, const char **argv);
int cmd__genzeros(int argc, const char **argv);
int cmd__getcwd(int argc, const char **argv);
@@ -35,6 +38,7 @@ int cmd__mktemp(int argc, const char **argv);
int cmd__oidmap(int argc, const char **argv);
int cmd__oidtree(int argc, const char **argv);
int cmd__online_cpus(int argc, const char **argv);
+int cmd__pack_mtimes(int argc, const char **argv);
int cmd__parse_options(int argc, const char **argv);
int cmd__parse_pathspec_file(int argc, const char** argv);
int cmd__partial_clone(int argc, const char **argv);
@@ -49,6 +53,7 @@ int cmd__read_cache(int argc, const char **argv);
int cmd__read_graph(int argc, const char **argv);
int cmd__read_midx(int argc, const char **argv);
int cmd__ref_store(int argc, const char **argv);
+int cmd__reftable(int argc, const char **argv);
int cmd__regex(int argc, const char **argv);
int cmd__repository(int argc, const char **argv);
int cmd__revision_walking(int argc, const char **argv);
diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c
index f93633f..59b124b 100644
--- a/t/helper/test-trace2.c
+++ b/t/helper/test-trace2.c
@@ -262,8 +262,9 @@ static int print_usage(void)
* [] the "cmd_name" event has been generated.
* [] this writes various "def_param" events for interesting config values.
*
- * We further assume that if we return (rather than exit()), trace2_cmd_exit()
- * will be called by test-tool.c:cmd_main().
+ * We return from here and let test-tool.c::cmd_main() pass the exit
+ * code to common-main.c::main(), which will use it to call
+ * trace2_cmd_exit().
*/
int cmd__trace2(int argc, const char **argv)
{
diff --git a/t/interop/Makefile b/t/interop/Makefile
index 31a4bbc..6911c29 100644
--- a/t/interop/Makefile
+++ b/t/interop/Makefile
@@ -1,3 +1,6 @@
+# Import tree-wide shared Makefile behavior and libraries
+include ../../shared.mak
+
-include ../../config.mak
export GIT_TEST_OPTIONS
diff --git a/t/lib-bitmap.sh b/t/lib-bitmap.sh
index 21d0392..a95537e 100644
--- a/t/lib-bitmap.sh
+++ b/t/lib-bitmap.sh
@@ -1,6 +1,9 @@
# Helpers for scripts testing bitmap functionality; see t5310 for
# example usage.
+objdir=.git/objects
+midx=$objdir/pack/multi-pack-index
+
# Compare a file containing rev-list bitmap traversal output to its non-bitmap
# counterpart. You can't just use test_cmp for this, because the two produce
# subtly different output:
@@ -264,3 +267,185 @@
midx_checksum () {
test-tool read-midx --checksum "$1"
}
+
+# midx_pack_source <obj>
+midx_pack_source () {
+ test-tool read-midx --show-objects .git/objects | grep "^$1 " | cut -f2
+}
+
+test_rev_exists () {
+ commit="$1"
+ kind="$2"
+
+ test_expect_success "reverse index exists ($kind)" '
+ GIT_TRACE2_EVENT=$(pwd)/event.trace \
+ git rev-list --test-bitmap "$commit" &&
+
+ if test "rev" = "$kind"
+ then
+ test_path_is_file $midx-$(midx_checksum $objdir).rev
+ fi &&
+ grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
+ '
+}
+
+midx_bitmap_core () {
+ rev_kind="${1:-midx}"
+
+ setup_bitmap_history
+
+ test_expect_success 'create single-pack midx with bitmaps' '
+ git repack -ad &&
+ git multi-pack-index write --bitmap &&
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+ '
+
+ test_rev_exists HEAD "$rev_kind"
+
+ basic_bitmap_tests
+
+ test_expect_success 'create new additional packs' '
+ for i in $(test_seq 1 16)
+ do
+ test_commit "$i" &&
+ git repack -d || return 1
+ done &&
+
+ git checkout -b other2 HEAD~8 &&
+ for i in $(test_seq 1 8)
+ do
+ test_commit "side-$i" &&
+ git repack -d || return 1
+ done &&
+ git checkout second
+ '
+
+ test_expect_success 'create multi-pack midx with bitmaps' '
+ git multi-pack-index write --bitmap &&
+
+ ls $objdir/pack/pack-*.pack >packs &&
+ test_line_count = 25 packs &&
+
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+ '
+
+ test_rev_exists HEAD "$rev_kind"
+
+ basic_bitmap_tests
+
+ test_expect_success '--no-bitmap is respected when bitmaps exist' '
+ git multi-pack-index write --bitmap &&
+
+ test_commit respect--no-bitmap &&
+ git repack -d &&
+
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+ git multi-pack-index write --no-bitmap &&
+
+ test_path_is_file $midx &&
+ test_path_is_missing $midx-$(midx_checksum $objdir).bitmap &&
+ test_path_is_missing $midx-$(midx_checksum $objdir).rev
+ '
+
+ test_expect_success 'setup midx with base from later pack' '
+ # Write a and b so that "a" is a delta on top of base "b", since Git
+ # prefers to delete contents out of a base rather than add to a shorter
+ # object.
+ test_seq 1 128 >a &&
+ test_seq 1 130 >b &&
+
+ git add a b &&
+ git commit -m "initial commit" &&
+
+ a=$(git rev-parse HEAD:a) &&
+ b=$(git rev-parse HEAD:b) &&
+
+ # In the first pack, "a" is stored as a delta to "b".
+ p1=$(git pack-objects .git/objects/pack/pack <<-EOF
+ $a
+ $b
+ EOF
+ ) &&
+
+ # In the second pack, "a" is missing, and "b" is not a delta nor base to
+ # any other object.
+ p2=$(git pack-objects .git/objects/pack/pack <<-EOF
+ $b
+ $(git rev-parse HEAD)
+ $(git rev-parse HEAD^{tree})
+ EOF
+ ) &&
+
+ git prune-packed &&
+ # Use the second pack as the preferred source, so that "b" occurs
+ # earlier in the MIDX object order, rendering "a" unusable for pack
+ # reuse.
+ git multi-pack-index write --bitmap --preferred-pack=pack-$p2.idx &&
+
+ have_delta $a $b &&
+ test $(midx_pack_source $a) != $(midx_pack_source $b)
+ '
+
+ rev_list_tests 'full bitmap with backwards delta'
+
+ test_expect_success 'clone with bitmaps enabled' '
+ git clone --no-local --bare . clone-reverse-delta.git &&
+ test_when_finished "rm -fr clone-reverse-delta.git" &&
+
+ git rev-parse HEAD >expect &&
+ git --git-dir=clone-reverse-delta.git rev-parse HEAD >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success 'changing the preferred pack does not corrupt bitmaps' '
+ rm -fr repo &&
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit A &&
+ test_commit B &&
+
+ git rev-list --objects --no-object-names HEAD^ >A.objects &&
+ git rev-list --objects --no-object-names HEAD^.. >B.objects &&
+
+ A=$(git pack-objects $objdir/pack/pack <A.objects) &&
+ B=$(git pack-objects $objdir/pack/pack <B.objects) &&
+
+ cat >indexes <<-EOF &&
+ pack-$A.idx
+ pack-$B.idx
+ EOF
+
+ git multi-pack-index write --bitmap --stdin-packs \
+ --preferred-pack=pack-$A.pack <indexes &&
+ git rev-list --test-bitmap A &&
+
+ git multi-pack-index write --bitmap --stdin-packs \
+ --preferred-pack=pack-$B.pack <indexes &&
+ git rev-list --test-bitmap A
+ )
+ '
+}
+
+midx_bitmap_partial_tests () {
+ rev_kind="${1:-midx}"
+
+ test_expect_success 'setup partial bitmaps' '
+ test_commit packed &&
+ git repack &&
+ test_commit loose &&
+ git multi-pack-index write --bitmap 2>err &&
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+ '
+
+ test_rev_exists HEAD~ "$rev_kind"
+
+ basic_bitmap_tests HEAD~
+}
diff --git a/t/lib-commit-graph.sh b/t/lib-commit-graph.sh
new file mode 100755
index 0000000..5d79e1a
--- /dev/null
+++ b/t/lib-commit-graph.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# Helper functions for testing commit-graphs.
+
+# Initialize OID cache with oid_version
+test_oid_cache <<-EOF
+oid_version sha1:1
+oid_version sha256:2
+EOF
+
+graph_git_two_modes() {
+ git -c core.commitGraph=true $1 >output &&
+ git -c core.commitGraph=false $1 >expect &&
+ test_cmp expect output
+}
+
+graph_git_behavior() {
+ MSG=$1
+ DIR=$2
+ BRANCH=$3
+ COMPARE=$4
+ test_expect_success "check normal git operations: $MSG" '
+ cd "$TRASH_DIRECTORY/$DIR" &&
+ graph_git_two_modes "log --oneline $BRANCH" &&
+ graph_git_two_modes "log --topo-order $BRANCH" &&
+ graph_git_two_modes "log --graph $COMPARE..$BRANCH" &&
+ graph_git_two_modes "branch -vv" &&
+ graph_git_two_modes "merge-base -a $BRANCH $COMPARE"
+ '
+}
+
+graph_read_expect() {
+ OPTIONAL=""
+ NUM_CHUNKS=3
+ if test -n "$2"
+ then
+ OPTIONAL=" $2"
+ NUM_CHUNKS=$((3 + $(echo "$2" | wc -w)))
+ fi
+ GENERATION_VERSION=2
+ if test -n "$3"
+ then
+ GENERATION_VERSION=$3
+ fi
+ OPTIONS=
+ if test $GENERATION_VERSION -gt 1
+ then
+ OPTIONS=" read_generation_data"
+ fi
+ cat >expect <<- EOF
+ header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0
+ num_commits: $1
+ chunks: oid_fanout oid_lookup commit_metadata$OPTIONAL
+ options:$OPTIONS
+ EOF
+ test-tool read-graph >output &&
+ test_cmp expect output
+}
diff --git a/t/lib-diff-data.sh b/t/lib-diff-data.sh
new file mode 100644
index 0000000..c64ec18
--- /dev/null
+++ b/t/lib-diff-data.sh
@@ -0,0 +1,22 @@
+COPYING_test_data () {
+ cat <<\EOF
+
+ Note that the only valid version of the GPL as far as this project
+ is concerned is _this_ particular version of the license (ie v2, not
+ v2.2 or v3.x or whatever), unless explicitly otherwise stated.
+
+ HOWEVER, in order to allow a migration to GPLv3 if that seems like
+ a good idea, I also ask that people involved with the project make
+ their preferences known. In particular, if you trust me to make that
+ decision, you might note so in your copyright message, ie something
+ like
+
+ This file is licensed under the GPL v2, or a later version
+ at the discretion of Linus.
+
+ might avoid issues. But we can also just decide to synchronize and
+ contact all copyright holders on record if/when the occasion arises.
+
+ Linus Torvalds
+EOF
+}
diff --git a/t/lib-diff.sh b/t/lib-diff.sh
index 2de880f..c4606bd 100644
--- a/t/lib-diff.sh
+++ b/t/lib-diff.sh
@@ -1,3 +1,5 @@
+. "$TEST_DIRECTORY"/lib-diff-data.sh
+
:
sanitize_diff_raw='/^:/s/ '"\($OID_REGEX\)"' '"\($OID_REGEX\)"' \([A-Z]\)[0-9]* / \1 \2 \3# /'
diff --git a/t/lib-diff/COPYING b/t/lib-diff/COPYING
deleted file mode 100644
index 6ff87c4..0000000
--- a/t/lib-diff/COPYING
+++ /dev/null
@@ -1,361 +0,0 @@
-
- Note that the only valid version of the GPL as far as this project
- is concerned is _this_ particular version of the license (ie v2, not
- v2.2 or v3.x or whatever), unless explicitly otherwise stated.
-
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
- a good idea, I also ask that people involved with the project make
- their preferences known. In particular, if you trust me to make that
- decision, you might note so in your copyright message, ie something
- like
-
- This file is licensed under the GPL v2, or a later version
- at the discretion of Linus.
-
- might avoid issues. But we can also just decide to synchronize and
- contact all copyright holders on record if/when the occasion arises.
-
- Linus Torvalds
-
-----------------------------------------
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/t/lib-diff/README b/t/lib-diff/README
deleted file mode 100644
index 548142c..0000000
--- a/t/lib-diff/README
+++ /dev/null
@@ -1,46 +0,0 @@
-////////////////////////////////////////////////////////////////
-
- GIT - the stupid content tracker
-
-////////////////////////////////////////////////////////////////
-
-"git" can mean anything, depending on your mood.
-
- - random three-letter combination that is pronounceable, and not
- actually used by any common UNIX command. The fact that it is a
- mispronunciation of "get" may or may not be relevant.
- - stupid. contemptible and despicable. simple. Take your pick from the
- dictionary of slang.
- - "global information tracker": you're in a good mood, and it actually
- works for you. Angels sing, and a light suddenly fills the room.
- - "goddamn idiotic truckload of sh*t": when it breaks
-
-Git is a fast, scalable, distributed revision control system with an
-unusually rich command set that provides both high-level operations
-and full access to internals.
-
-Git is an Open Source project covered by the GNU General Public License.
-It was originally written by Linus Torvalds with help of a group of
-hackers around the net. It is currently maintained by Junio C Hamano.
-
-Please read the file INSTALL for installation instructions.
-See Documentation/tutorial.txt to get started, then see
-Documentation/everyday.txt for a useful minimum set of commands,
-and "man git-commandname" for documentation of each command.
-CVS users may also want to read Documentation/cvs-migration.txt.
-
-Many Git online resources are accessible from http://git.or.cz/
-including full documentation and Git related tools.
-
-The user discussion and development of Git take place on the Git
-mailing list -- everyone is welcome to post bug reports, feature
-requests, comments and patches to git@vger.kernel.org. To subscribe
-to the list, send an email with just "subscribe git" in the body to
-majordomo@vger.kernel.org. The mailing list archives are available at
-http://marc.theaimsgroup.com/?l=git and other archival sites.
-
-The messages titled "A note from the maintainer", "What's in
-git.git (stable)" and "What's cooking in git.git (topics)" and
-the discussion following them on the mailing list give a good
-reference for project status, development direction and
-remaining tasks.
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 5aff2ab..2a5b873 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -142,10 +142,11 @@
p4_add_user () {
name=$1 &&
+ fullname="${2:-Dr. $1}"
p4 user -f -i <<-EOF
User: $name
Email: $name@example.com
- FullName: Dr. $name
+ FullName: $fullname
EOF
}
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 2fde235..ea28971 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -1,3 +1,7 @@
+if test -z "$TEST_FAILS_SANITIZE_LEAK"
+then
+ TEST_PASSES_SANITIZE_LEAK=true
+fi
. ./test-lib.sh
if test -n "$NO_SVN_TESTS"
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 9fc5241..1147855 100644
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -40,7 +40,7 @@
# > lib-gpg/ownertrust
mkdir "$GNUPGHOME" &&
chmod 0700 "$GNUPGHOME" &&
- (gpgconf --kill gpg-agent || : ) &&
+ (gpgconf --kill all || : ) &&
gpg --homedir "${GNUPGHOME}" --import \
"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
gpg --homedir "${GNUPGHOME}" --import-ownertrust \
@@ -72,12 +72,11 @@
--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" &&
+ gpgsm --homedir "${GNUPGHOME}" -K --with-colons |
+ awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \
+ >"${GNUPGHOME}/trustlist.txt" &&
+ (gpgconf --reload all || : ) &&
- echo " S relax" >>"${GNUPGHOME}/trustlist.txt" &&
echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
-u committer@example.com -o /dev/null --sign -
'
@@ -87,6 +86,88 @@
echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null
'
+GPGSSH_KEY_PRIMARY="${GNUPGHOME}/ed25519_ssh_signing_key"
+GPGSSH_KEY_SECONDARY="${GNUPGHOME}/rsa_2048_ssh_signing_key"
+GPGSSH_KEY_UNTRUSTED="${GNUPGHOME}/untrusted_ssh_signing_key"
+GPGSSH_KEY_EXPIRED="${GNUPGHOME}/expired_ssh_signing_key"
+GPGSSH_KEY_NOTYETVALID="${GNUPGHOME}/notyetvalid_ssh_signing_key"
+GPGSSH_KEY_TIMEBOXEDVALID="${GNUPGHOME}/timeboxed_valid_ssh_signing_key"
+GPGSSH_KEY_TIMEBOXEDINVALID="${GNUPGHOME}/timeboxed_invalid_ssh_signing_key"
+GPGSSH_KEY_WITH_PASSPHRASE="${GNUPGHOME}/protected_ssh_signing_key"
+GPGSSH_KEY_ECDSA="${GNUPGHOME}/ecdsa_ssh_signing_key"
+GPGSSH_KEY_PASSPHRASE="super_secret"
+GPGSSH_ALLOWED_SIGNERS="${GNUPGHOME}/ssh.all_valid.allowedSignersFile"
+
+GPGSSH_GOOD_SIGNATURE_TRUSTED='Good "git" signature for'
+GPGSSH_GOOD_SIGNATURE_UNTRUSTED='Good "git" signature with'
+GPGSSH_KEY_NOT_TRUSTED="No principal matched"
+GPGSSH_BAD_SIGNATURE="Signature verification failed"
+
+test_lazy_prereq GPGSSH '
+ ssh_version=$(ssh-keygen -Y find-principals -n "git" 2>&1)
+ test $? != 127 || exit 1
+ echo $ssh_version | grep -q "find-principals:missing signature file"
+ test $? = 0 || exit 1;
+
+ # Setup some keys and an allowed signers file
+ mkdir -p "${GNUPGHOME}" &&
+ chmod 0700 "${GNUPGHOME}" &&
+ (setfacl -k "${GNUPGHOME}" 2>/dev/null || true) &&
+ ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_PRIMARY}" >/dev/null &&
+ ssh-keygen -t rsa -b 2048 -N "" -C "git rsa2048 key" -f "${GPGSSH_KEY_SECONDARY}" >/dev/null &&
+ ssh-keygen -t ed25519 -N "${GPGSSH_KEY_PASSPHRASE}" -C "git ed25519 encrypted key" -f "${GPGSSH_KEY_WITH_PASSPHRASE}" >/dev/null &&
+ ssh-keygen -t ecdsa -N "" -f "${GPGSSH_KEY_ECDSA}" >/dev/null &&
+ ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_UNTRUSTED}" >/dev/null &&
+
+ cat >"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
+ "principal with number 1" $(cat "${GPGSSH_KEY_PRIMARY}.pub")"
+ "principal with number 2" $(cat "${GPGSSH_KEY_SECONDARY}.pub")"
+ "principal with number 3" $(cat "${GPGSSH_KEY_WITH_PASSPHRASE}.pub")"
+ "principal with number 4" $(cat "${GPGSSH_KEY_ECDSA}.pub")"
+ EOF
+
+ # Verify if at least one key and ssh-keygen works as expected
+ echo "testpayload" |
+ ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_PRIMARY}" >gpgssh_prereq.sig &&
+ ssh-keygen -Y find-principals -f "${GPGSSH_ALLOWED_SIGNERS}" -s gpgssh_prereq.sig &&
+ echo "testpayload" |
+ ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with number 1" -s gpgssh_prereq.sig
+'
+
+test_lazy_prereq GPGSSH_VERIFYTIME '
+ # Check if ssh-keygen has a verify-time option by passing an invalid date to it
+ ssh-keygen -Overify-time=INVALID -Y check-novalidate -s doesnotmatter 2>&1 | grep -q -F "Invalid \"verify-time\"" &&
+
+ # Set up keys with key lifetimes
+ ssh-keygen -t ed25519 -N "" -C "timeboxed valid key" -f "${GPGSSH_KEY_TIMEBOXEDVALID}" >/dev/null &&
+ key_valid=$(cat "${GPGSSH_KEY_TIMEBOXEDVALID}.pub") &&
+ ssh-keygen -t ed25519 -N "" -C "timeboxed invalid key" -f "${GPGSSH_KEY_TIMEBOXEDINVALID}" >/dev/null &&
+ key_invalid=$(cat "${GPGSSH_KEY_TIMEBOXEDINVALID}.pub") &&
+ ssh-keygen -t ed25519 -N "" -C "expired key" -f "${GPGSSH_KEY_EXPIRED}" >/dev/null &&
+ key_expired=$(cat "${GPGSSH_KEY_EXPIRED}.pub") &&
+ ssh-keygen -t ed25519 -N "" -C "not yet valid key" -f "${GPGSSH_KEY_NOTYETVALID}" >/dev/null &&
+ key_notyetvalid=$(cat "${GPGSSH_KEY_NOTYETVALID}.pub") &&
+
+ # Timestamps outside of test_tick span
+ ts2005a=20050401000000 ts2005b=200504020000 &&
+ # Timestamps within test_tick span
+ ts2005c=20050407000000 ts2005d=200504100000 &&
+ # Definitely not yet valid / expired timestamps
+ ts2000=20000101000000 ts2999=29990101000000 &&
+
+ cat >>"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
+ "timeboxed valid key" valid-after="$ts2005c",valid-before="$ts2005d" $key_valid"
+ "timeboxed invalid key" valid-after="$ts2005a",valid-before="$ts2005b" $key_invalid"
+ "principal with expired key" valid-before="$ts2000" $key_expired"
+ "principal with not yet valid key" valid-after="$ts2999" $key_notyetvalid"
+ EOF
+
+ # and verify ssh-keygen verifies the key lifetime
+ echo "testpayload" |
+ ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_EXPIRED}" >gpgssh_verifytime_prereq.sig &&
+ ! (ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with expired key" -s gpgssh_verifytime_prereq.sig)
+'
+
sanitize_pgp() {
perl -ne '
/^-----END PGP/ and $in_pgp = 0;
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index d2edfa4..7828919 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -131,6 +131,7 @@
cp "$TEST_PATH"/passwd "$HTTPD_ROOT_PATH"
install_script incomplete-length-upload-pack-v2-http.sh
install_script incomplete-body-upload-pack-v2-http.sh
+ install_script error-no-report.sh
install_script broken-smart-http.sh
install_script error-smart-http.sh
install_script error.sh
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 180a41f..497b9b9 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -122,6 +122,7 @@
</LocationMatch>
ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/
ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/
+ScriptAlias /smart/no_report/git-receive-pack error-no-report.sh/
ScriptAliasMatch /error_git_upload_pack/(.*)/git-upload-pack error.sh/
ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
ScriptAlias /broken_smart/ broken-smart-http.sh/
@@ -137,6 +138,9 @@
<Files incomplete-body-upload-pack-v2-http.sh>
Options ExecCGI
</Files>
+<Files error-no-report.sh>
+ Options ExecCGI
+</Files>
<Files broken-smart-http.sh>
Options ExecCGI
</Files>
diff --git a/t/lib-httpd/error-no-report.sh b/t/lib-httpd/error-no-report.sh
new file mode 100644
index 0000000..39ff75b
--- /dev/null
+++ b/t/lib-httpd/error-no-report.sh
@@ -0,0 +1,6 @@
+echo "Content-Type: application/x-git-receive-pack-result"
+echo
+printf '0013\001000eunpack ok\n'
+printf '0015\002skipping report\n'
+printf '0009\0010000'
+printf '0000'
diff --git a/t/lib-midx.sh b/t/lib-midx.sh
new file mode 100644
index 0000000..1261994
--- /dev/null
+++ b/t/lib-midx.sh
@@ -0,0 +1,8 @@
+# test_midx_consistent <objdir>
+test_midx_consistent () {
+ ls $1/pack/pack-*.idx | xargs -n 1 basename | sort >expect &&
+ test-tool read-midx $1 | grep ^pack-.*\.idx$ | sort >actual &&
+
+ test_cmp expect actual &&
+ git multi-pack-index --object-dir=$1 verify
+}
diff --git a/t/lib-pager.sh b/t/lib-pager.sh
index 3aa7a3f..e5eb28d 100644
--- a/t/lib-pager.sh
+++ b/t/lib-pager.sh
@@ -3,7 +3,7 @@
test_expect_success 'determine default pager' '
test_might_fail git config --unset core.pager &&
less=$(
- unset PAGER GIT_PAGER;
+ sane_unset PAGER GIT_PAGER &&
git var GIT_PAGER
) &&
test -n "$less"
diff --git a/t/lib-read-tree-m-3way.sh b/t/lib-read-tree-m-3way.sh
index 168329a..2da25b3 100644
--- a/t/lib-read-tree-m-3way.sh
+++ b/t/lib-read-tree-m-3way.sh
@@ -3,21 +3,21 @@
mkdir Z
for a in N D M
do
- for b in N D M
- do
- p=$a$b
+ for b in N D M
+ do
+ p=$a$b
echo This is $p from the original tree. >$p
echo This is Z/$p from the original tree. >Z/$p
- test_expect_success \
- "adding test file $p and Z/$p" \
- 'git update-index --add $p &&
- git update-index --add Z/$p'
+ test_expect_success "adding test file $p and Z/$p" '
+ git update-index --add $p &&
+ git update-index --add Z/$p
+ '
done
done
echo This is SS from the original tree. >SS
-test_expect_success \
- 'adding test file SS' \
- 'git update-index --add SS'
+test_expect_success 'adding test file SS' '
+ git update-index --add SS
+'
cat >TT <<\EOF
This is a trivial merge sample text.
Branch A is expected to upcase this word, here.
@@ -30,12 +30,12 @@
the word, expected to be upcased by Branch B.
This concludes the trivial merge sample file.
EOF
-test_expect_success \
- 'adding test file TT' \
- 'git update-index --add TT'
-test_expect_success \
- 'prepare initial tree' \
- 'tree_O=$(git write-tree)'
+test_expect_success 'adding test file TT' '
+ git update-index --add TT
+'
+test_expect_success 'prepare initial tree' '
+ tree_O=$(git write-tree)
+'
################################################################
# Branch A and B makes the changes according to the above matrix.
@@ -45,48 +45,48 @@
to_remove=$(echo D? Z/D?)
rm -f $to_remove
-test_expect_success \
- 'change in branch A (removal)' \
- 'git update-index --remove $to_remove'
+test_expect_success 'change in branch A (removal)' '
+ git update-index --remove $to_remove
+'
for p in M? Z/M?
do
- echo This is modified $p in the branch A. >$p
- test_expect_success \
- 'change in branch A (modification)' \
- "git update-index $p"
+ echo This is modified $p in the branch A. >$p
+ test_expect_success 'change in branch A (modification)' '
+ git update-index $p
+ '
done
for p in AN AA Z/AN Z/AA
do
- echo This is added $p in the branch A. >$p
- test_expect_success \
- 'change in branch A (addition)' \
- "git update-index --add $p"
+ echo This is added $p in the branch A. >$p
+ test_expect_success 'change in branch A (addition)' '
+ git update-index --add $p
+ '
done
echo This is SS from the modified tree. >SS
echo This is LL from the modified tree. >LL
-test_expect_success \
- 'change in branch A (addition)' \
- 'git update-index --add LL &&
- git update-index SS'
+test_expect_success 'change in branch A (addition)' '
+ git update-index --add LL &&
+ git update-index SS
+'
mv TT TT-
sed -e '/Branch A/s/word/WORD/g' <TT- >TT
rm -f TT-
-test_expect_success \
- 'change in branch A (edit)' \
- 'git update-index TT'
+test_expect_success 'change in branch A (edit)' '
+ git update-index TT
+'
mkdir DF
echo Branch A makes a file at DF/DF, creating a directory DF. >DF/DF
-test_expect_success \
- 'change in branch A (change file to directory)' \
- 'git update-index --add DF/DF'
+test_expect_success 'change in branch A (change file to directory)' '
+ git update-index --add DF/DF
+'
-test_expect_success \
- 'recording branch A tree' \
- 'tree_A=$(git write-tree)'
+test_expect_success 'recording branch A tree' '
+ tree_A=$(git write-tree)
+'
################################################################
# Branch B
@@ -94,65 +94,65 @@
rm -rf [NDMASLT][NDMASLT] Z DF
mkdir Z
-test_expect_success \
- 'reading original tree and checking out' \
- 'git read-tree $tree_O &&
- git checkout-index -a'
+test_expect_success 'reading original tree and checking out' '
+ git read-tree $tree_O &&
+ git checkout-index -a
+'
to_remove=$(echo ?D Z/?D)
rm -f $to_remove
-test_expect_success \
- 'change in branch B (removal)' \
- "git update-index --remove $to_remove"
+test_expect_success 'change in branch B (removal)' '
+ git update-index --remove $to_remove
+'
for p in ?M Z/?M
do
- echo This is modified $p in the branch B. >$p
- test_expect_success \
- 'change in branch B (modification)' \
- "git update-index $p"
+ echo This is modified $p in the branch B. >$p
+ test_expect_success 'change in branch B (modification)' '
+ git update-index $p
+ '
done
for p in NA AA Z/NA Z/AA
do
- echo This is added $p in the branch B. >$p
- test_expect_success \
- 'change in branch B (addition)' \
- "git update-index --add $p"
+ echo This is added $p in the branch B. >$p
+ test_expect_success 'change in branch B (addition)' '
+ git update-index --add $p
+ '
done
echo This is SS from the modified tree. >SS
echo This is LL from the modified tree. >LL
-test_expect_success \
- 'change in branch B (addition and modification)' \
- 'git update-index --add LL &&
- git update-index SS'
+test_expect_success 'change in branch B (addition and modification)' '
+ git update-index --add LL &&
+ git update-index SS
+'
mv TT TT-
sed -e '/Branch B/s/word/WORD/g' <TT- >TT
rm -f TT-
-test_expect_success \
- 'change in branch B (modification)' \
- 'git update-index TT'
+test_expect_success 'change in branch B (modification)' '
+ git update-index TT
+'
echo Branch B makes a file at DF. >DF
-test_expect_success \
- 'change in branch B (addition of a file to conflict with directory)' \
- 'git update-index --add DF'
+test_expect_success 'change in branch B (addition of a file to conflict with directory)' '
+ git update-index --add DF
+'
-test_expect_success \
- 'recording branch B tree' \
- 'tree_B=$(git write-tree)'
+test_expect_success 'recording branch B tree' '
+ tree_B=$(git write-tree)
+'
-test_expect_success \
- 'keep contents of 3 trees for easy access' \
- 'rm -f .git/index &&
- git read-tree $tree_O &&
- mkdir .orig-O &&
- git checkout-index --prefix=.orig-O/ -f -q -a &&
- rm -f .git/index &&
- git read-tree $tree_A &&
- mkdir .orig-A &&
- git checkout-index --prefix=.orig-A/ -f -q -a &&
- rm -f .git/index &&
- git read-tree $tree_B &&
- mkdir .orig-B &&
- git checkout-index --prefix=.orig-B/ -f -q -a'
+test_expect_success 'keep contents of 3 trees for easy access' '
+ rm -f .git/index &&
+ git read-tree $tree_O &&
+ mkdir .orig-O &&
+ git checkout-index --prefix=.orig-O/ -f -q -a &&
+ rm -f .git/index &&
+ git read-tree $tree_A &&
+ mkdir .orig-A &&
+ git checkout-index --prefix=.orig-A/ -f -q -a &&
+ rm -f .git/index &&
+ git read-tree $tree_B &&
+ mkdir .orig-B &&
+ git checkout-index --prefix=.orig-B/ -f -q -a
+'
diff --git a/t/lib-subtest.sh b/t/lib-subtest.sh
new file mode 100644
index 0000000..56ee927
--- /dev/null
+++ b/t/lib-subtest.sh
@@ -0,0 +1,95 @@
+write_sub_test_lib_test () {
+ name="$1" # stdin is the body of the test code
+ mkdir "$name" &&
+ write_script "$name/$name.sh" "$TEST_SHELL_PATH" <<-EOF &&
+ test_description='A test of test-lib.sh itself'
+
+ # Point to the t/test-lib.sh, which isn't in ../ as usual
+ . "\$TEST_DIRECTORY"/test-lib.sh
+ EOF
+ cat >>"$name/$name.sh"
+}
+
+_run_sub_test_lib_test_common () {
+ cmp_op="$1" want_code="$2" name="$3" # stdin is the body of the test code
+ shift 3
+
+ # intercept pseudo-options at the front of the argument list that we
+ # will not pass to child script
+ skip=
+ while test $# -gt 0
+ do
+ case "$1" in
+ --skip=*)
+ skip=${1#--*=}
+ shift
+ ;;
+ *)
+ break
+ ;;
+ esac
+ done
+
+ (
+ cd "$name" &&
+
+ # Pretend we're not running under a test harness, whether we
+ # are or not. The test-lib output depends on the setting of
+ # this variable, so we need a stable setting under which to run
+ # the sub-test.
+ sane_unset HARNESS_ACTIVE &&
+
+ export TEST_DIRECTORY &&
+ # The child test re-sources GIT-BUILD-OPTIONS and may thus
+ # override the test output directory. We thus pass it as an
+ # explicit override to the child.
+ TEST_OUTPUT_DIRECTORY_OVERRIDE=$(pwd) &&
+ export TEST_OUTPUT_DIRECTORY_OVERRIDE &&
+ GIT_SKIP_TESTS=$skip &&
+ export GIT_SKIP_TESTS &&
+ sane_unset GIT_TEST_FAIL_PREREQS &&
+ ./"$name.sh" "$@" >out 2>err;
+ ret=$? &&
+ test "$ret" "$cmp_op" "$want_code"
+ )
+}
+
+write_and_run_sub_test_lib_test () {
+ name="$1" descr="$2" # stdin is the body of the test code
+ write_sub_test_lib_test "$@" || return 1
+ _run_sub_test_lib_test_common -eq 0 "$@"
+}
+
+write_and_run_sub_test_lib_test_err () {
+ name="$1" descr="$2" # stdin is the body of the test code
+ write_sub_test_lib_test "$@" || return 1
+ _run_sub_test_lib_test_common -eq 1 "$@"
+}
+
+run_sub_test_lib_test () {
+ _run_sub_test_lib_test_common -eq 0 "$@"
+}
+
+run_sub_test_lib_test_err () {
+ _run_sub_test_lib_test_common -eq 1 "$@"
+}
+
+_check_sub_test_lib_test_common () {
+ name="$1" &&
+ sed -e 's/^> //' -e 's/Z$//' >"$name"/expect.out &&
+ test_cmp "$name"/expect.out "$name"/out
+}
+
+check_sub_test_lib_test () {
+ name="$1" # stdin is the expected output from the test
+ _check_sub_test_lib_test_common "$name" &&
+ test_must_be_empty "$name"/err
+}
+
+check_sub_test_lib_test_err () {
+ name="$1" # stdin is the expected output from the test
+ _check_sub_test_lib_test_common "$name" &&
+ # expected error output is in descriptor 3
+ sed -e 's/^> //' -e 's/Z$//' <&3 >"$name"/expect.err &&
+ test_cmp "$name"/expect.err "$name"/err
+}
diff --git a/t/lib-sudo.sh b/t/lib-sudo.sh
new file mode 100644
index 0000000..b4d7788
--- /dev/null
+++ b/t/lib-sudo.sh
@@ -0,0 +1,15 @@
+# Helpers for running git commands under sudo.
+
+# Runs a scriplet passed through stdin under sudo.
+run_with_sudo () {
+ local ret
+ local RUN="$TEST_DIRECTORY/$$.sh"
+ write_script "$RUN" "$TEST_SHELL_PATH"
+ # avoid calling "$RUN" directly so sudo doesn't get a chance to
+ # override the shell, add aditional restrictions or even reject
+ # running the script because its security policy deem it unsafe
+ sudo "$TEST_SHELL_PATH" -c "\"$RUN\""
+ ret=$?
+ rm -f "$RUN"
+ return $ret
+}
diff --git a/t/lib-unique-files.sh b/t/lib-unique-files.sh
new file mode 100644
index 0000000..a14080f
--- /dev/null
+++ b/t/lib-unique-files.sh
@@ -0,0 +1,34 @@
+# Helper to create files with unique contents
+
+# Create multiple files with unique contents within this test run. Takes the
+# number of directories, the number of files in each directory, and the base
+# directory.
+#
+# test_create_unique_files 2 3 my_dir -- Creates 2 directories with 3 files
+# each in my_dir, all with contents
+# different from previous invocations
+# of this command in this run.
+
+test_create_unique_files () {
+ test "$#" -ne 3 && BUG "3 param"
+
+ local dirs="$1" &&
+ local files="$2" &&
+ local basedir="$3" &&
+ local counter="0" &&
+ local i &&
+ local j &&
+ test_tick &&
+ local basedata="$basedir$test_tick" &&
+ rm -rf "$basedir" &&
+ for i in $(test_seq $dirs)
+ do
+ local dir="$basedir/dir$i" &&
+ mkdir -p "$dir" &&
+ for j in $(test_seq $files)
+ do
+ counter=$((counter + 1)) &&
+ echo "$basedata.$counter">"$dir/file$j.txt"
+ done
+ done
+}
diff --git a/t/oid-info/oid b/t/oid-info/oid
index a754970..7547d2c 100644
--- a/t/oid-info/oid
+++ b/t/oid-info/oid
@@ -27,3 +27,5 @@
numeric sha256:0123456789012345678901234567890123456789012345678901234567890123
deadbeef sha1:deadbeefdeadbeefdeadbeefdeadbeefdeadbeef
deadbeef sha256:deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef
+deadbeef_short sha1:deadbeefdeadbeefdeadbeefdeadbeefdeadbee
+deadbeef_short sha256:deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbee
diff --git a/t/perf/Makefile b/t/perf/Makefile
index 2465770..e4808ae 100644
--- a/t/perf/Makefile
+++ b/t/perf/Makefile
@@ -1,3 +1,6 @@
+# Import tree-wide shared Makefile behavior and libraries
+include ../../shared.mak
+
-include ../../config.mak
export GIT_TEST_OPTIONS
diff --git a/t/perf/config b/t/perf/config
new file mode 100644
index 0000000..b92768b
--- /dev/null
+++ b/t/perf/config
@@ -0,0 +1,2 @@
+[gc]
+ auto = 0
diff --git a/t/perf/p0005-status.sh b/t/perf/p0005-status.sh
index 0b0aa98..ca58d6c 100755
--- a/t/perf/p0005-status.sh
+++ b/t/perf/p0005-status.sh
@@ -24,17 +24,17 @@
test_expect_success "setup repo" '
if git rev-parse --verify refs/heads/p0006-ballast^{commit}
then
- echo Assuming synthetic repo from many-files.sh
- git branch br_base master
- git branch br_ballast p0006-ballast
- git config --local core.sparsecheckout 1
+ echo Assuming synthetic repo from many-files.sh &&
+ git branch br_base master &&
+ git branch br_ballast p0006-ballast &&
+ git config --local core.sparsecheckout 1 &&
cat >.git/info/sparse-checkout <<-EOF
/*
!ballast/*
EOF
else
- echo Assuming non-synthetic repo...
- git branch br_base $(git rev-list HEAD | tail -n 1)
+ echo Assuming non-synthetic repo... &&
+ git branch br_base $(git rev-list HEAD | tail -n 1) &&
git branch br_ballast HEAD
fi &&
git checkout -q br_ballast &&
diff --git a/t/perf/p0006-read-tree-checkout.sh b/t/perf/p0006-read-tree-checkout.sh
index 78cc23f..900b385 100755
--- a/t/perf/p0006-read-tree-checkout.sh
+++ b/t/perf/p0006-read-tree-checkout.sh
@@ -24,21 +24,21 @@
test_expect_success "setup repo" '
if git rev-parse --verify refs/heads/p0006-ballast^{commit}
then
- echo Assuming synthetic repo from many-files.sh
- git branch br_base master
- git branch br_ballast p0006-ballast^
- git branch br_ballast_alias p0006-ballast^
- git branch br_ballast_plus_1 p0006-ballast
- git config --local core.sparsecheckout 1
+ echo Assuming synthetic repo from many-files.sh &&
+ git branch br_base master &&
+ git branch br_ballast p0006-ballast^ &&
+ git branch br_ballast_alias p0006-ballast^ &&
+ git branch br_ballast_plus_1 p0006-ballast &&
+ git config --local core.sparsecheckout 1 &&
cat >.git/info/sparse-checkout <<-EOF
/*
!ballast/*
EOF
else
- echo Assuming non-synthetic repo...
- git branch br_base $(git rev-list HEAD | tail -n 1)
- git branch br_ballast HEAD^ || error "no ancestor commit from current head"
- git branch br_ballast_alias HEAD^
+ echo Assuming non-synthetic repo... &&
+ git branch br_base $(git rev-list HEAD | tail -n 1) &&
+ git branch br_ballast HEAD^ || error "no ancestor commit from current head" &&
+ git branch br_ballast_alias HEAD^ &&
git branch br_ballast_plus_1 HEAD
fi &&
git checkout -q br_ballast &&
diff --git a/t/perf/p0007-write-cache.sh b/t/perf/p0007-write-cache.sh
index 0959526..25d8ff7 100755
--- a/t/perf/p0007-write-cache.sh
+++ b/t/perf/p0007-write-cache.sh
@@ -9,8 +9,8 @@
test_expect_success "setup repo" '
if git rev-parse --verify refs/heads/p0006-ballast^{commit}
then
- echo Assuming synthetic repo from many-files.sh
- git config --local core.sparsecheckout 1
+ echo Assuming synthetic repo from many-files.sh &&
+ git config --local core.sparsecheckout 1 &&
cat >.git/info/sparse-checkout <<-EOF
/*
!ballast/*
diff --git a/t/perf/p0008-odb-fsync.sh b/t/perf/p0008-odb-fsync.sh
new file mode 100755
index 0000000..b3a90f3
--- /dev/null
+++ b/t/perf/p0008-odb-fsync.sh
@@ -0,0 +1,82 @@
+#!/bin/sh
+#
+# This test measures the performance of adding new files to the object
+# database. The test was originally added to measure the effect of the
+# core.fsyncMethod=batch mode, which is why we are testing different values of
+# that setting explicitly and creating a lot of unique objects.
+
+test_description="Tests performance of adding things to the object database"
+
+. ./perf-lib.sh
+
+. $TEST_DIRECTORY/lib-unique-files.sh
+
+test_perf_fresh_repo
+test_checkout_worktree
+
+dir_count=10
+files_per_dir=50
+total_files=$((dir_count * files_per_dir))
+
+populate_files () {
+ test_create_unique_files $dir_count $files_per_dir files
+}
+
+setup_repo () {
+ (rm -rf .git || 1) &&
+ git init &&
+ test_commit first &&
+ populate_files
+}
+
+test_perf_fsync_cfgs () {
+ local method &&
+ local cfg &&
+ for method in none fsync batch writeout-only
+ do
+ case $method in
+ none)
+ cfg="-c core.fsync=none"
+ ;;
+ *)
+ cfg="-c core.fsync=loose-object -c core.fsyncMethod=$method"
+ esac &&
+
+ # Set GIT_TEST_FSYNC=1 explicitly since fsync is normally
+ # disabled by t/test-lib.sh.
+ if ! test_perf "$1 (fsyncMethod=$method)" \
+ --setup "$2" \
+ "GIT_TEST_FSYNC=1 git $cfg $3"
+ then
+ break
+ fi
+ done
+}
+
+test_perf_fsync_cfgs "add $total_files files" \
+ "setup_repo" \
+ "add -- files"
+
+test_perf_fsync_cfgs "stash $total_files files" \
+ "setup_repo" \
+ "stash push -u -- files"
+
+test_perf_fsync_cfgs "unpack $total_files files" \
+ "
+ setup_repo &&
+ git -c core.fsync=none add -- files &&
+ git -c core.fsync=none commit -q -m second &&
+ echo HEAD | git pack-objects -q --stdout --revs >test_pack.pack &&
+ setup_repo
+ " \
+ "unpack-objects -q <test_pack.pack"
+
+test_perf_fsync_cfgs "commit $total_files files" \
+ "
+ setup_repo &&
+ git -c core.fsync=none add -- files &&
+ populate_files
+ " \
+ "commit -q -a -m test"
+
+test_done
diff --git a/t/perf/p0071-sort.sh b/t/perf/p0071-sort.sh
index 6e924f5..ed366e2 100755
--- a/t/perf/p0071-sort.sh
+++ b/t/perf/p0071-sort.sh
@@ -11,16 +11,42 @@
git cat-file --batch >unsorted
'
-test_perf 'sort(1)' '
- sort <unsorted >expect
+test_perf 'sort(1) unsorted' '
+ sort <unsorted >sorted
'
-test_perf 'string_list_sort()' '
- test-tool string-list sort <unsorted >actual
+test_expect_success 'reverse' '
+ sort -r <unsorted >reversed
'
-test_expect_success 'string_list_sort() sorts like sort(1)' '
- test_cmp_bin expect actual
-'
+for file in sorted reversed
+do
+ test_perf "sort(1) $file" "
+ sort <$file >actual
+ "
+done
+
+for file in unsorted sorted reversed
+do
+
+ test_perf "string_list_sort() $file" "
+ test-tool string-list sort <$file >actual
+ "
+
+ test_expect_success "string_list_sort() $file sorts like sort(1)" "
+ test_cmp_bin sorted actual
+ "
+done
+
+for file in unsorted sorted reversed
+do
+ test_perf "llist_mergesort() $file" "
+ test-tool mergesort sort <$file >actual
+ "
+
+ test_expect_success "llist_mergesort() $file sorts like sort(1)" "
+ test_cmp_bin sorted actual
+ "
+done
test_done
diff --git a/t/perf/p0100-globbing.sh b/t/perf/p0100-globbing.sh
index dd18a9c..439e9c8 100755
--- a/t/perf/p0100-globbing.sh
+++ b/t/perf/p0100-globbing.sh
@@ -19,9 +19,9 @@
printf "a" >>refname &&
for j in $(test_seq 1 $i)
do
- printf "a*" >>refglob.$i
+ printf "a*" >>refglob.$i || return 1
done &&
- echo b >>refglob.$i
+ echo b >>refglob.$i || return 1
done &&
test_commit test $(cat refname).t "" $(cat refname).t
'
diff --git a/t/perf/p1006-cat-file.sh b/t/perf/p1006-cat-file.sh
new file mode 100755
index 0000000..dcd8015
--- /dev/null
+++ b/t/perf/p1006-cat-file.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+test_description='Tests listing object info performance'
+. ./perf-lib.sh
+
+test_perf_large_repo
+
+test_perf 'cat-file --batch-check' '
+ git cat-file --batch-all-objects --batch-check
+'
+
+test_done
diff --git a/t/perf/p1400-update-ref.sh b/t/perf/p1400-update-ref.sh
index dda8a74..a75969c 100755
--- a/t/perf/p1400-update-ref.sh
+++ b/t/perf/p1400-update-ref.sh
@@ -13,7 +13,7 @@
do
printf "start\ncreate refs/heads/%d PRE\ncommit\n" $i &&
printf "start\nupdate refs/heads/%d POST PRE\ncommit\n" $i &&
- printf "start\ndelete refs/heads/%d POST\ncommit\n" $i
+ printf "start\ndelete refs/heads/%d POST\ncommit\n" $i || return 1
done >instructions
'
@@ -22,7 +22,7 @@
do
git update-ref refs/heads/branch PRE &&
git update-ref refs/heads/branch POST PRE &&
- git update-ref -d refs/heads/branch
+ git update-ref -d refs/heads/branch || return 1
done
'
diff --git a/t/perf/p1451-fsck-skip-list.sh b/t/perf/p1451-fsck-skip-list.sh
index c2b97d2..f767d83 100755
--- a/t/perf/p1451-fsck-skip-list.sh
+++ b/t/perf/p1451-fsck-skip-list.sh
@@ -15,7 +15,7 @@
echo "committer C <c@example.com> 1234567890 +0000" &&
echo "data <<EOF" &&
echo "$i.Q." &&
- echo "EOF"
+ echo "EOF" || return 1
done | q_to_nul | git fast-import
'
diff --git a/t/perf/p2000-sparse-operations.sh b/t/perf/p2000-sparse-operations.sh
index 5976262..c181110 100755
--- a/t/perf/p2000-sparse-operations.sh
+++ b/t/perf/p2000-sparse-operations.sh
@@ -106,9 +106,22 @@
}
test_perf_on_all git status
+test_perf_on_all 'git stash && git stash pop'
+test_perf_on_all 'echo >>new && git stash -u && git stash pop'
test_perf_on_all git add -A
test_perf_on_all git add .
test_perf_on_all git commit -a -m A
test_perf_on_all git checkout -f -
+test_perf_on_all "git sparse-checkout add f2/f3/f1 && git sparse-checkout set $SPARSE_CONE"
+test_perf_on_all git reset
+test_perf_on_all git reset --hard
+test_perf_on_all git reset -- does-not-exist
+test_perf_on_all git diff
+test_perf_on_all git diff --cached
+test_perf_on_all git blame $SPARSE_CONE/a
+test_perf_on_all git blame $SPARSE_CONE/f3/a
+test_perf_on_all git read-tree -mu HEAD
+test_perf_on_all git checkout-index -f --all
+test_perf_on_all git update-index --add --remove $SPARSE_CONE/a
test_done
diff --git a/t/perf/p3400-rebase.sh b/t/perf/p3400-rebase.sh
index 43d5a34..e6b0277 100755
--- a/t/perf/p3400-rebase.sh
+++ b/t/perf/p3400-rebase.sh
@@ -22,7 +22,7 @@
git add unrelated-file$i &&
test_tick &&
git commit -m commit$i-reverse unrelated-file$i ||
- break
+ return 1
done &&
git checkout to-rebase &&
test_commit our-patch interesting-file
diff --git a/t/perf/p4002-diff-color-moved.sh b/t/perf/p4002-diff-color-moved.sh
new file mode 100755
index 0000000..ab2af93
--- /dev/null
+++ b/t/perf/p4002-diff-color-moved.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+test_description='Tests diff --color-moved performance'
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+# The endpoints of the diff can be customized by setting TEST_REV_A
+# and TEST_REV_B in the environment when running this test.
+
+rev="${TEST_REV_A:-v2.28.0}"
+if ! rev_a="$(git rev-parse --quiet --verify "$rev")"
+then
+ skip_all="skipping because '$rev' was not found. \
+ Use TEST_REV_A and TEST_REV_B to set the revs to use"
+ test_done
+fi
+rev="${TEST_REV_B:-v2.29.0}"
+if ! rev_b="$(git rev-parse --quiet --verify "$rev")"
+then
+ skip_all="skipping because '$rev' was not found. \
+ Use TEST_REV_A and TEST_REV_B to set the revs to use"
+ test_done
+fi
+
+GIT_PAGER_IN_USE=1
+test_export GIT_PAGER_IN_USE rev_a rev_b
+
+test_perf 'diff --no-color-moved --no-color-moved-ws large change' '
+ git diff --no-color-moved --no-color-moved-ws $rev_a $rev_b
+'
+
+test_perf 'diff --color-moved --no-color-moved-ws large change' '
+ git diff --color-moved=zebra --no-color-moved-ws $rev_a $rev_b
+'
+
+test_perf 'diff --color-moved-ws=allow-indentation-change large change' '
+ git diff --color-moved=zebra --color-moved-ws=allow-indentation-change \
+ $rev_a $rev_b
+'
+
+test_perf 'log --no-color-moved --no-color-moved-ws' '
+ git log --no-color-moved --no-color-moved-ws --no-merges --patch \
+ -n1000 $rev_b
+'
+
+test_perf 'log --color-moved --no-color-moved-ws' '
+ git log --color-moved=zebra --no-color-moved-ws --no-merges --patch \
+ -n1000 $rev_b
+'
+
+test_perf 'log --color-moved-ws=allow-indentation-change' '
+ git log --color-moved=zebra --color-moved-ws=allow-indentation-change \
+ --no-merges --patch -n1000 $rev_b
+'
+
+test_done
diff --git a/t/perf/p4220-log-grep-engines.sh b/t/perf/p4220-log-grep-engines.sh
index 2bc47de..03fbfbb 100755
--- a/t/perf/p4220-log-grep-engines.sh
+++ b/t/perf/p4220-log-grep-engines.sh
@@ -36,7 +36,8 @@
else
prereq=""
fi
- test_perf $prereq "$engine log$GIT_PERF_4220_LOG_OPTS --grep='$pattern'" "
+ test_perf "$engine log$GIT_PERF_4220_LOG_OPTS --grep='$pattern'" \
+ --prereq "$prereq" "
git -c grep.patternType=$engine log --pretty=format:%h$GIT_PERF_4220_LOG_OPTS --grep='$pattern' >'out.$engine' || :
"
done
diff --git a/t/perf/p4221-log-grep-engines-fixed.sh b/t/perf/p4221-log-grep-engines-fixed.sh
index 0609712..0a6d6df 100755
--- a/t/perf/p4221-log-grep-engines-fixed.sh
+++ b/t/perf/p4221-log-grep-engines-fixed.sh
@@ -26,7 +26,8 @@
else
prereq=""
fi
- test_perf $prereq "$engine log$GIT_PERF_4221_LOG_OPTS --grep='$pattern'" "
+ test_perf "$engine log$GIT_PERF_4221_LOG_OPTS --grep='$pattern'" \
+ --prereq "$prereq" "
git -c grep.patternType=$engine log --pretty=format:%h$GIT_PERF_4221_LOG_OPTS --grep='$pattern' >'out.$engine' || :
"
done
diff --git a/t/perf/p5302-pack-index.sh b/t/perf/p5302-pack-index.sh
index 228593d..14c601b 100755
--- a/t/perf/p5302-pack-index.sh
+++ b/t/perf/p5302-pack-index.sh
@@ -21,14 +21,13 @@
threads= &&
while test $t -gt 0
do
- threads="$t $threads"
- t=$((t / 2))
+ threads="$t $threads" &&
+ t=$((t / 2)) || return 1
done
'
-test_perf PERF_EXTRA 'index-pack 0 threads' '
- rm -rf repo.git &&
- git init --bare repo.git &&
+test_perf 'index-pack 0 threads' --prereq PERF_EXTRA \
+ --setup 'rm -rf repo.git && git init --bare repo.git' '
GIT_DIR=repo.git git index-pack --threads=1 --stdin < $PACK
'
@@ -36,17 +35,15 @@
do
THREADS=$t
export THREADS
- test_perf PERF_EXTRA "index-pack $t threads" '
- rm -rf repo.git &&
- git init --bare repo.git &&
+ test_perf "index-pack $t threads" --prereq PERF_EXTRA \
+ --setup 'rm -rf repo.git && git init --bare repo.git' '
GIT_DIR=repo.git GIT_FORCE_THREADS=1 \
git index-pack --threads=$THREADS --stdin <$PACK
'
done
-test_perf 'index-pack default number of threads' '
- rm -rf repo.git &&
- git init --bare repo.git &&
+test_perf 'index-pack default number of threads' \
+ --setup 'rm -rf repo.git && git init --bare repo.git' '
GIT_DIR=repo.git git index-pack --stdin < $PACK
'
diff --git a/t/perf/p5303-many-packs.sh b/t/perf/p5303-many-packs.sh
index 35c0cbd..af173a7 100755
--- a/t/perf/p5303-many-packs.sh
+++ b/t/perf/p5303-many-packs.sh
@@ -126,11 +126,11 @@
# Measure pack loading with 10,000 packs.
test_expect_success 'generate lots of packs' '
for i in $(test_seq 10000); do
- echo "blob"
- echo "data <<EOF"
- echo "blob $i"
- echo "EOF"
- echo "checkpoint"
+ echo "blob" &&
+ echo "data <<EOF" &&
+ echo "blob $i" &&
+ echo "EOF" &&
+ echo "checkpoint" || return 1
done |
git -c fastimport.unpackLimit=0 fast-import
'
diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh
index 5eb5044..b1cb238 100755
--- a/t/perf/p7519-fsmonitor.sh
+++ b/t/perf/p7519-fsmonitor.sh
@@ -60,19 +60,7 @@
esac
fi
-if test -n "$GIT_PERF_7519_DROP_CACHE"
-then
- # When using GIT_PERF_7519_DROP_CACHE, GIT_PERF_REPEAT_COUNT must be 1 to
- # generate valid results. Otherwise the caching that happens for the nth
- # run will negate the validity of the comparisons.
- if test "$GIT_PERF_REPEAT_COUNT" -ne 1
- then
- echo "warning: Setting GIT_PERF_REPEAT_COUNT=1" >&2
- GIT_PERF_REPEAT_COUNT=1
- fi
-fi
-
-trace_start() {
+trace_start () {
if test -n "$GIT_PERF_7519_TRACE"
then
name="$1"
@@ -91,13 +79,20 @@
fi
}
-trace_stop() {
+trace_stop () {
if test -n "$GIT_PERF_7519_TRACE"
then
unset GIT_TRACE2_PERF
fi
}
+touch_files () {
+ n=$1 &&
+ d="$n"_files &&
+
+ (cd $d && test_seq 1 $n | xargs touch )
+}
+
test_expect_success "one time repo setup" '
# set untrackedCache depending on the environment
if test -n "$GIT_PERF_7519_UNTRACKED_CACHE"
@@ -119,10 +114,11 @@
fi &&
mkdir 1_file 10_files 100_files 1000_files 10000_files &&
- for i in $(test_seq 1 10); do touch 10_files/$i; done &&
- for i in $(test_seq 1 100); do touch 100_files/$i; done &&
- for i in $(test_seq 1 1000); do touch 1000_files/$i; done &&
- for i in $(test_seq 1 10000); do touch 10000_files/$i; done &&
+ : 1_file directory should be left empty &&
+ touch_files 10 &&
+ touch_files 100 &&
+ touch_files 1000 &&
+ touch_files 10000 &&
git add 1_file 10_files 100_files 1000_files 10000_files &&
git commit -qm "Add files" &&
@@ -133,7 +129,7 @@
fi
'
-setup_for_fsmonitor() {
+setup_for_fsmonitor_hook () {
# set INTEGRATION_SCRIPT depending on the environment
if test -n "$INTEGRATION_PATH"
then
@@ -167,14 +163,18 @@
test_perf_w_drop_caches () {
if test -n "$GIT_PERF_7519_DROP_CACHE"; then
- test-tool drop-caches
+ test_perf "$1" --setup "test-tool drop-caches" "$2"
+ else
+ test_perf "$@"
fi
-
- test_perf "$@"
}
-test_fsmonitor_suite() {
- if test -n "$INTEGRATION_SCRIPT"; then
+test_fsmonitor_suite () {
+ if test -n "$USE_FSMONITOR_DAEMON"
+ then
+ DESC="builtin fsmonitor--daemon"
+ elif test -n "$INTEGRATION_SCRIPT"
+ then
DESC="fsmonitor=$(basename $INTEGRATION_SCRIPT)"
else
DESC="fsmonitor=disabled"
@@ -199,15 +199,15 @@
# Update the mtimes on upto 100k files to make status think
# that they are dirty. For simplicity, omit any files with
- # LFs (i.e. anything that ls-files thinks it needs to dquote).
- # Then fully backslash-quote the paths to capture any
- # whitespace so that they pass thru xargs properly.
+ # LFs (i.e. anything that ls-files thinks it needs to dquote)
+ # and any files with whitespace so that they pass thru xargs
+ # properly.
#
test_perf_w_drop_caches "status (dirty) ($DESC)" '
git ls-files | \
head -100000 | \
grep -v \" | \
- sed '\''s/\(.\)/\\\1/g'\'' | \
+ grep -v " ." | \
xargs test-tool chmtime -300 &&
git status
'
@@ -253,11 +253,11 @@
trace_start fsmonitor-watchman
if test -n "$GIT_PERF_7519_FSMONITOR"; then
for INTEGRATION_PATH in $GIT_PERF_7519_FSMONITOR; do
- test_expect_success "setup for fsmonitor $INTEGRATION_PATH" 'setup_for_fsmonitor'
+ test_expect_success "setup for fsmonitor $INTEGRATION_PATH" 'setup_for_fsmonitor_hook'
test_fsmonitor_suite
done
else
- test_expect_success "setup for fsmonitor" 'setup_for_fsmonitor'
+ test_expect_success "setup for fsmonitor hook" 'setup_for_fsmonitor_hook'
test_fsmonitor_suite
fi
@@ -285,4 +285,30 @@
test_fsmonitor_suite
trace_stop
+#
+# Run a full set of perf tests using the built-in fsmonitor--daemon.
+# It does not use the Hook API, so it has a different setup.
+# Explicitly start the daemon here and before we start client commands
+# so that we can later add custom tracing.
+#
+if test_have_prereq FSMONITOR_DAEMON
+then
+ USE_FSMONITOR_DAEMON=t
+
+ test_expect_success "setup for builtin fsmonitor" '
+ trace_start fsmonitor--daemon--server &&
+ git fsmonitor--daemon start &&
+
+ trace_start fsmonitor--daemon--client &&
+
+ git config core.fsmonitor true &&
+ git update-index --fsmonitor
+ '
+
+ test_fsmonitor_suite
+
+ git fsmonitor--daemon stop
+ trace_stop
+fi
+
test_done
diff --git a/t/perf/p7820-grep-engines.sh b/t/perf/p7820-grep-engines.sh
index 8b09c5b..9bfb868 100755
--- a/t/perf/p7820-grep-engines.sh
+++ b/t/perf/p7820-grep-engines.sh
@@ -49,13 +49,15 @@
fi
if ! test_have_prereq PERF_GREP_ENGINES_THREADS
then
- test_perf $prereq "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern'" "
+ test_perf "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern'" \
+ --prereq "$prereq" "
git -c grep.patternType=$engine grep$GIT_PERF_7820_GREP_OPTS -- '$pattern' >'out.$engine' || :
"
else
for threads in $GIT_PERF_GREP_THREADS
do
- test_perf PTHREADS,$prereq "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern' with $threads threads" "
+ test_perf "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern' with $threads threads"
+ --prereq PTHREADS,$prereq "
git -c grep.patternType=$engine -c grep.threads=$threads grep$GIT_PERF_7820_GREP_OPTS -- '$pattern' >'out.$engine.$threads' || :
"
done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index f5ed092..ab3687c 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -27,6 +27,10 @@
. ../test-lib.sh
+unset GIT_CONFIG_NOSYSTEM
+GIT_CONFIG_SYSTEM="$TEST_DIRECTORY/perf/config"
+export GIT_CONFIG_SYSTEM
+
if test -n "$GIT_TEST_INSTALLED" -a -z "$PERF_SET_GIT_TEST_INSTALLED"
then
error "Do not use GIT_TEST_INSTALLED with the perf tests.
@@ -74,7 +78,7 @@
for stuff in "$1"/*
do
case "$stuff" in
- */objects|*/hooks|*/config|*/commondir|*/gitdir|*/worktrees)
+ */objects|*/hooks|*/config|*/commondir|*/gitdir|*/worktrees|*/fsmonitor--daemon*)
;;
*)
cp -R "$stuff" "$repo/.git/" || exit 1
@@ -157,7 +161,7 @@
test_cleanup=:
test_export_="test_cleanup"
export test_cleanup test_export_
- "$GTIME" -f "%E %U %S" -o test_time.$i "$SHELL" -c '
+ "$GTIME" -f "%E %U %S" -o test_time.$i "$TEST_SHELL_PATH" -c '
. '"$TEST_DIRECTORY"/test-lib-functions.sh'
test_export () {
test_export_="$test_export_ $*"
@@ -185,19 +189,39 @@
}
test_wrapper_ () {
- test_wrapper_func_=$1; shift
+ local test_wrapper_func_="$1"; shift
+ local test_title_="$1"; shift
test_start_
- test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
- test "$#" = 2 ||
- BUG "not 2 or 3 parameters to test-expect-success"
+ test_prereq=
+ test_perf_setup_=
+ while test $# != 0
+ do
+ case $1 in
+ --prereq)
+ test_prereq=$2
+ shift
+ ;;
+ --setup)
+ test_perf_setup_=$2
+ shift
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+ done
+ test "$#" = 1 || BUG "test_wrapper_ needs 2 positional parameters"
export test_prereq
- if ! test_skip "$@"
+ export test_perf_setup_
+
+ if ! test_skip "$test_title_" "$@"
then
base=$(basename "$0" .sh)
echo "$test_count" >>"$perf_results_dir"/$base.subtests
echo "$1" >"$perf_results_dir"/$base.$test_count.descr
base="$perf_results_dir"/"$PERF_RESULTS_PREFIX$(basename "$0" .sh)"."$test_count"
- "$test_wrapper_func_" "$@"
+ "$test_wrapper_func_" "$test_title_" "$@"
fi
test_finish_
@@ -210,6 +234,16 @@
echo "perf $test_count - $1:"
fi
for i in $(test_seq 1 $GIT_PERF_REPEAT_COUNT); do
+ if test -n "$test_perf_setup_"
+ then
+ say >&3 "setup: $test_perf_setup_"
+ if ! test_eval_ $test_perf_setup_
+ then
+ test_failure_ "$test_perf_setup_"
+ break
+ fi
+
+ fi
say >&3 "running: $2"
if test_run_perf_ "$2"
then
@@ -230,13 +264,27 @@
test_ok_ "$1"
fi
"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result
+ rm test_time.*
}
+# Usage: test_perf 'title' [options] 'perf-test'
+# Run the performance test script specified in perf-test with
+# optional prerequisite and setup steps.
+# Options:
+# --prereq prerequisites: Skip the test if prequisites aren't met
+# --setup "setup-steps": Run setup steps prior to each measured iteration
+#
test_perf () {
test_wrapper_ test_perf_ "$@"
}
test_size_ () {
+ if test -n "$test_perf_setup_"
+ then
+ say >&3 "setup: $test_perf_setup_"
+ test_eval_ $test_perf_setup_
+ fi
+
say >&3 "running: $2"
if test_eval_ "$2" 3>"$base".result; then
test_ok_ "$1"
@@ -245,6 +293,14 @@
fi
}
+# Usage: test_size 'title' [options] 'size-test'
+# Run the size test script specified in size-test with optional
+# prerequisites and setup steps. Returns the numeric value
+# returned by size-test.
+# Options:
+# --prereq prerequisites: Skip the test if prequisites aren't met
+# --setup "setup-steps": Run setup steps prior to the size measurement
+
test_size () {
test_wrapper_ test_size_ "$@"
}
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 5c342de..17a268c 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -19,6 +19,7 @@
'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-subtest.sh
try_local_xy () {
local x="local" y="alsolocal" &&
@@ -66,95 +67,8 @@
:
'
-_run_sub_test_lib_test_common () {
- neg="$1" name="$2" descr="$3" # stdin is the body of the test code
- shift 3
-
- # intercept pseudo-options at the front of the argument list that we
- # will not pass to child script
- skip=
- while test $# -gt 0
- do
- case "$1" in
- --skip=*)
- skip=${1#--*=}
- shift
- ;;
- *)
- break
- ;;
- esac
- done
-
- mkdir "$name" &&
- (
- # Pretend we're not running under a test harness, whether we
- # are or not. The test-lib output depends on the setting of
- # this variable, so we need a stable setting under which to run
- # the sub-test.
- sane_unset HARNESS_ACTIVE &&
- cd "$name" &&
- 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
- passing metrics
- '
-
- # Point to the t/test-lib.sh, which isn't in ../ as usual
- . "\$TEST_DIRECTORY"/test-lib.sh
- EOF
- cat >>"$name.sh" &&
- export TEST_DIRECTORY &&
- # The child test re-sources GIT-BUILD-OPTIONS and may thus
- # override the test output directory. We thus pass it as an
- # explicit override to the child.
- TEST_OUTPUT_DIRECTORY_OVERRIDE=$(pwd) &&
- export TEST_OUTPUT_DIRECTORY_OVERRIDE &&
- GIT_SKIP_TESTS=$skip &&
- export GIT_SKIP_TESTS &&
- sane_unset GIT_TEST_FAIL_PREREQS &&
- if test -z "$neg"
- then
- ./"$name.sh" "$@" >out 2>err
- else
- ! ./"$name.sh" "$@" >out 2>err
- fi
- )
-}
-
-run_sub_test_lib_test () {
- _run_sub_test_lib_test_common '' "$@"
-}
-
-run_sub_test_lib_test_err () {
- _run_sub_test_lib_test_common '!' "$@"
-}
-
-check_sub_test_lib_test () {
- name="$1" # stdin is the expected output from the test
- (
- cd "$name" &&
- test_must_be_empty err &&
- sed -e 's/^> //' -e 's/Z$//' >expect &&
- test_cmp expect out
- )
-}
-
-check_sub_test_lib_test_err () {
- name="$1" # stdin is the expected output from the test
- # expected error output is in descriptor 3
- (
- cd "$name" &&
- sed -e 's/^> //' -e 's/Z$//' >expect.out &&
- test_cmp expect.out out &&
- sed -e 's/^> //' -e 's/Z$//' <&3 >expect.err &&
- test_cmp expect.err err
- )
-}
-
-test_expect_success 'pretend we have a fully passing test suite' '
- run_sub_test_lib_test full-pass "3 passing tests" <<-\EOF &&
+test_expect_success 'subtest: 3 passing tests' '
+ write_and_run_sub_test_lib_test full-pass <<-\EOF &&
for i in 1 2 3
do
test_expect_success "passing test #$i" "true"
@@ -170,9 +84,8 @@
EOF
'
-test_expect_success 'pretend we have a partially passing test suite' '
- run_sub_test_lib_test_err \
- partial-pass "2/3 tests passing" <<-\EOF &&
+test_expect_success 'subtest: 2/3 tests passing' '
+ write_and_run_sub_test_lib_test_err partial-pass <<-\EOF &&
test_expect_success "passing test #1" "true"
test_expect_success "failing test #2" "false"
test_expect_success "passing test #3" "true"
@@ -188,8 +101,21 @@
EOF
'
-test_expect_success 'pretend we have a known breakage' '
- run_sub_test_lib_test failing-todo "A failing TODO test" <<-\EOF &&
+test_expect_success 'subtest: --immediate' '
+ run_sub_test_lib_test_err partial-pass \
+ --immediate &&
+ check_sub_test_lib_test_err partial-pass \
+ <<-\EOF_OUT 3<<-EOF_ERR
+ > ok 1 - passing test #1
+ > not ok 2 - failing test #2
+ > # false
+ > 1..2
+ EOF_OUT
+ EOF_ERR
+'
+
+test_expect_success 'subtest: a failing TODO test' '
+ write_and_run_sub_test_lib_test failing-todo <<-\EOF &&
test_expect_success "passing test" "true"
test_expect_failure "pretend we have a known breakage" "false"
test_done
@@ -203,8 +129,8 @@
EOF
'
-test_expect_success 'pretend we have fixed a known breakage' '
- run_sub_test_lib_test passing-todo "A passing TODO test" <<-\EOF &&
+test_expect_success 'subtest: a passing TODO test' '
+ write_and_run_sub_test_lib_test passing-todo <<-\EOF &&
test_expect_failure "pretend we have fixed a known breakage" "true"
test_done
EOF
@@ -215,9 +141,8 @@
EOF
'
-test_expect_success 'pretend we have fixed one of two known breakages (run in sub test-lib)' '
- run_sub_test_lib_test partially-passing-todos \
- "2 TODO tests, one passing" <<-\EOF &&
+test_expect_success 'subtest: 2 TODO tests, one passin' '
+ write_and_run_sub_test_lib_test partially-passing-todos <<-\EOF &&
test_expect_failure "pretend we have a known breakage" "false"
test_expect_success "pretend we have a passing test" "true"
test_expect_failure "pretend we have fixed another known breakage" "true"
@@ -234,9 +159,8 @@
EOF
'
-test_expect_success 'pretend we have a pass, fail, and known breakage' '
- run_sub_test_lib_test_err \
- mixed-results1 "mixed results #1" <<-\EOF &&
+test_expect_success 'subtest: mixed results: pass, failure and a TODO test' '
+ write_and_run_sub_test_lib_test_err mixed-results1 <<-\EOF &&
test_expect_success "passing test" "true"
test_expect_success "failing test" "false"
test_expect_failure "pretend we have a known breakage" "false"
@@ -253,9 +177,8 @@
EOF
'
-test_expect_success 'pretend we have a mix of all possible results' '
- run_sub_test_lib_test_err \
- mixed-results2 "mixed results #2" <<-\EOF &&
+test_expect_success 'subtest: mixed results: a mixture of all possible results' '
+ write_and_run_sub_test_lib_test_err mixed-results2 <<-\EOF &&
test_expect_success "passing test" "true"
test_expect_success "passing test" "true"
test_expect_success "passing test" "true"
@@ -289,9 +212,8 @@
EOF
'
-test_expect_success 'test --verbose' '
- run_sub_test_lib_test_err \
- t1234-verbose "test verbose" --verbose <<-\EOF &&
+test_expect_success 'subtest: --verbose option' '
+ write_and_run_sub_test_lib_test_err t1234-verbose --verbose <<-\EOF &&
test_expect_success "passing test" true
test_expect_success "test with output" "echo foo"
test_expect_success "failing test" false
@@ -316,19 +238,14 @@
EOF
'
-test_expect_success 'test --verbose-only' '
+test_expect_success 'subtest: --verbose-only option' '
run_sub_test_lib_test_err \
- t2345-verbose-only-2 "test verbose-only=2" \
- --verbose-only=2 <<-\EOF &&
- test_expect_success "passing test" true
- test_expect_success "test with output" "echo foo"
- test_expect_success "failing test" false
- test_done
- EOF
- check_sub_test_lib_test t2345-verbose-only-2 <<-\EOF
+ t1234-verbose \
+ --verbose-only=2 &&
+ check_sub_test_lib_test t1234-verbose <<-\EOF
> ok 1 - passing test
> Z
- > expecting success of 2345.2 '\''test with output'\'': echo foo
+ > expecting success of 1234.2 '\''test with output'\'': echo foo
> foo
> ok 2 - test with output
> Z
@@ -339,18 +256,11 @@
EOF
'
-test_expect_success 'GIT_SKIP_TESTS' '
+test_expect_success 'subtest: skip one with GIT_SKIP_TESTS' '
(
- run_sub_test_lib_test git-skip-tests-basic \
- "GIT_SKIP_TESTS" \
- --skip="git.2" <<-\EOF &&
- for i in 1 2 3
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test git-skip-tests-basic <<-\EOF
+ run_sub_test_lib_test full-pass \
+ --skip="full.2" &&
+ check_sub_test_lib_test full-pass <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
> ok 3 - passing test #3
@@ -360,10 +270,9 @@
)
'
-test_expect_success 'GIT_SKIP_TESTS several tests' '
+test_expect_success 'subtest: skip several with GIT_SKIP_TESTS' '
(
- run_sub_test_lib_test git-skip-tests-several \
- "GIT_SKIP_TESTS several tests" \
+ write_and_run_sub_test_lib_test git-skip-tests-several \
--skip="git.2 git.5" <<-\EOF &&
for i in 1 2 3 4 5 6
do
@@ -384,18 +293,11 @@
)
'
-test_expect_success 'GIT_SKIP_TESTS sh pattern' '
+test_expect_success 'subtest: sh pattern skipping with GIT_SKIP_TESTS' '
(
- run_sub_test_lib_test git-skip-tests-sh-pattern \
- "GIT_SKIP_TESTS sh pattern" \
- --skip="git.[2-5]" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test git-skip-tests-sh-pattern <<-\EOF
+ run_sub_test_lib_test git-skip-tests-several \
+ --skip="git.[2-5]" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
> ok 3 # skip passing test #3 (GIT_SKIP_TESTS)
@@ -408,35 +310,23 @@
)
'
-test_expect_success 'GIT_SKIP_TESTS entire suite' '
+test_expect_success 'subtest: skip entire test suite with GIT_SKIP_TESTS' '
(
- run_sub_test_lib_test git-skip-tests-entire-suite \
- "GIT_SKIP_TESTS entire suite" \
- --skip="git" <<-\EOF &&
- for i in 1 2 3
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test git-skip-tests-entire-suite <<-\EOF
+ GIT_SKIP_TESTS="git" && export GIT_SKIP_TESTS &&
+ run_sub_test_lib_test git-skip-tests-several \
+ --skip="git" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> 1..0 # SKIP skip all tests in git
EOF
)
'
-test_expect_success 'GIT_SKIP_TESTS does not skip unmatched suite' '
+test_expect_success 'subtest: GIT_SKIP_TESTS does not skip unmatched suite' '
(
- run_sub_test_lib_test git-skip-tests-unmatched-suite \
- "GIT_SKIP_TESTS does not skip unmatched suite" \
- --skip="notgit" <<-\EOF &&
- for i in 1 2 3
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test git-skip-tests-unmatched-suite <<-\EOF
+ GIT_SKIP_TESTS="notgit" && export GIT_SKIP_TESTS &&
+ run_sub_test_lib_test full-pass \
+ --skip="notfull" &&
+ check_sub_test_lib_test full-pass <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 - passing test #3
@@ -446,16 +336,9 @@
)
'
-test_expect_success '--run basic' '
- run_sub_test_lib_test run-basic \
- "--run basic" --run="1,3,5" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-basic <<-\EOF
+test_expect_success 'subtest: --run basic' '
+ run_sub_test_lib_test git-skip-tests-several --run="1,3,5" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (--run)
> ok 3 - passing test #3
@@ -467,16 +350,10 @@
EOF
'
-test_expect_success '--run with a range' '
- run_sub_test_lib_test run-range \
- "--run with a range" --run="1-3" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-range <<-\EOF
+test_expect_success 'subtest: --run with a range' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="1-3" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 - passing test #3
@@ -488,16 +365,10 @@
EOF
'
-test_expect_success '--run with two ranges' '
- run_sub_test_lib_test run-two-ranges \
- "--run with two ranges" --run="1-2,5-6" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-two-ranges <<-\EOF
+test_expect_success 'subtest: --run with two ranges' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="1-2,5-6" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -509,16 +380,10 @@
EOF
'
-test_expect_success '--run with a left open range' '
- run_sub_test_lib_test run-left-open-range \
- "--run with a left open range" --run="-3" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-left-open-range <<-\EOF
+test_expect_success 'subtest: --run with a left open range' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="-3" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 - passing test #3
@@ -530,16 +395,10 @@
EOF
'
-test_expect_success '--run with a right open range' '
- run_sub_test_lib_test run-right-open-range \
- "--run with a right open range" --run="4-" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-right-open-range <<-\EOF
+test_expect_success 'subtest: --run with a right open range' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="4-" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 # skip passing test #1 (--run)
> ok 2 # skip passing test #2 (--run)
> ok 3 # skip passing test #3 (--run)
@@ -551,16 +410,10 @@
EOF
'
-test_expect_success '--run with basic negation' '
- run_sub_test_lib_test run-basic-neg \
- "--run with basic negation" --run="!3" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-basic-neg <<-\EOF
+test_expect_success 'subtest: --run with basic negation' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="!3" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -572,16 +425,10 @@
EOF
'
-test_expect_success '--run with two negations' '
- run_sub_test_lib_test run-two-neg \
- "--run with two negations" --run="!3,!6" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-two-neg <<-\EOF
+test_expect_success 'subtest: --run with two negations' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="!3,!6" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -593,16 +440,10 @@
EOF
'
-test_expect_success '--run a range and negation' '
- run_sub_test_lib_test run-range-and-neg \
- "--run a range and negation" --run="-4,!2" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-range-and-neg <<-\EOF
+test_expect_success 'subtest: --run a range and negation' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="-4,!2" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (--run)
> ok 3 - passing test #3
@@ -614,16 +455,10 @@
EOF
'
-test_expect_success '--run range negation' '
- run_sub_test_lib_test run-range-neg \
- "--run range negation" --run="!1-3" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-range-neg <<-\EOF
+test_expect_success 'subtest: --run range negation' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="!1-3" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 # skip passing test #1 (--run)
> ok 2 # skip passing test #2 (--run)
> ok 3 # skip passing test #3 (--run)
@@ -635,17 +470,10 @@
EOF
'
-test_expect_success '--run include, exclude and include' '
- run_sub_test_lib_test run-inc-neg-inc \
- "--run include, exclude and include" \
- --run="1-5,!1-3,2" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-inc-neg-inc <<-\EOF
+test_expect_success 'subtest: --run include, exclude and include' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="1-5,!1-3,2" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 # skip passing test #1 (--run)
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -657,17 +485,10 @@
EOF
'
-test_expect_success '--run include, exclude and include, comma separated' '
- run_sub_test_lib_test run-inc-neg-inc-comma \
- "--run include, exclude and include, comma separated" \
- --run=1-5,!1-3,2 <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-inc-neg-inc-comma <<-\EOF
+test_expect_success 'subtest: --run include, exclude and include, comma separated' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run=1-5,!1-3,2 &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 # skip passing test #1 (--run)
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -679,17 +500,10 @@
EOF
'
-test_expect_success '--run exclude and include' '
- run_sub_test_lib_test run-neg-inc \
- "--run exclude and include" \
- --run="!3-,5" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-neg-inc <<-\EOF
+test_expect_success 'subtest: --run exclude and include' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="!3-,5" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -701,17 +515,10 @@
EOF
'
-test_expect_success '--run empty selectors' '
- run_sub_test_lib_test run-empty-sel \
- "--run empty selectors" \
- --run="1,,3,,,5" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-empty-sel <<-\EOF
+test_expect_success 'subtest: --run empty selectors' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="1,,3,,,5" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (--run)
> ok 3 - passing test #3
@@ -723,9 +530,8 @@
EOF
'
-test_expect_success '--run substring selector' '
- run_sub_test_lib_test run-substring-selector \
- "--run empty selectors" \
+test_expect_success 'subtest: --run substring selector' '
+ write_and_run_sub_test_lib_test run-substring-selector \
--run="relevant" <<-\EOF &&
test_expect_success "relevant test" "true"
for i in 1 2 3 4 5 6
@@ -747,9 +553,8 @@
EOF
'
-test_expect_success '--run keyword selection' '
- run_sub_test_lib_test_err run-inv-range-start \
- "--run invalid range start" \
+test_expect_success 'subtest: --run keyword selection' '
+ write_and_run_sub_test_lib_test_err run-inv-range-start \
--run="a-5" <<-\EOF &&
test_expect_success "passing test #1" "true"
test_done
@@ -762,14 +567,10 @@
EOF_ERR
'
-test_expect_success '--run invalid range end' '
- run_sub_test_lib_test_err run-inv-range-end \
- "--run invalid range end" \
- --run="1-z" <<-\EOF &&
- test_expect_success "passing test #1" "true"
- test_done
- EOF
- check_sub_test_lib_test_err run-inv-range-end \
+test_expect_success 'subtest: --run invalid range end' '
+ run_sub_test_lib_test_err run-inv-range-start \
+ --run="1-z" &&
+ check_sub_test_lib_test_err run-inv-range-start \
<<-\EOF_OUT 3<<-EOF_ERR
> FATAL: Unexpected exit with code 1
EOF_OUT
@@ -777,8 +578,8 @@
EOF_ERR
'
-test_expect_success 'tests respect prerequisites' '
- run_sub_test_lib_test prereqs "tests respect prereqs" <<-\EOF &&
+test_expect_success 'subtest: tests respect prerequisites' '
+ write_and_run_sub_test_lib_test prereqs <<-\EOF &&
test_set_prereq HAVEIT
test_expect_success HAVEIT "prereq is satisfied" "true"
@@ -807,8 +608,8 @@
EOF
'
-test_expect_success 'tests respect lazy prerequisites' '
- run_sub_test_lib_test lazy-prereqs "respect lazy prereqs" <<-\EOF &&
+test_expect_success 'subtest: tests respect lazy prerequisites' '
+ write_and_run_sub_test_lib_test lazy-prereqs <<-\EOF &&
test_lazy_prereq LAZY_TRUE true
test_expect_success LAZY_TRUE "lazy prereq is satisifed" "true"
@@ -831,8 +632,8 @@
EOF
'
-test_expect_success 'nested lazy prerequisites' '
- run_sub_test_lib_test nested-lazy "nested lazy prereqs" <<-\EOF &&
+test_expect_success 'subtest: nested lazy prerequisites' '
+ write_and_run_sub_test_lib_test nested-lazy <<-\EOF &&
test_lazy_prereq NESTED_INNER "
>inner &&
@@ -857,9 +658,9 @@
EOF
'
-test_expect_success 'lazy prereqs do not turn off tracing' '
- run_sub_test_lib_test lazy-prereq-and-tracing \
- "lazy prereqs and -x" -v -x <<-\EOF &&
+test_expect_success 'subtest: lazy prereqs do not turn off tracing' '
+ write_and_run_sub_test_lib_test lazy-prereq-and-tracing \
+ -v -x <<-\EOF &&
test_lazy_prereq LAZY true
test_expect_success lazy "test_have_prereq LAZY && echo trace"
@@ -870,8 +671,8 @@
grep "echo trace" lazy-prereq-and-tracing/err
'
-test_expect_success 'tests clean up after themselves' '
- run_sub_test_lib_test cleanup "test with cleanup" <<-\EOF &&
+test_expect_success 'subtest: tests clean up after themselves' '
+ write_and_run_sub_test_lib_test cleanup <<-\EOF &&
clean=no
test_expect_success "do cleanup" "
test_when_finished clean=yes
@@ -890,9 +691,9 @@
EOF
'
-test_expect_success 'tests clean up even on failures' '
- run_sub_test_lib_test_err \
- failing-cleanup "Failing tests with cleanup commands" <<-\EOF &&
+test_expect_success 'subtest: tests clean up even on failures' '
+ write_and_run_sub_test_lib_test_err \
+ failing-cleanup <<-\EOF &&
test_expect_success "tests clean up even after a failure" "
touch clean-after-failure &&
test_when_finished rm clean-after-failure &&
@@ -919,9 +720,9 @@
EOF
'
-test_expect_success 'test_atexit is run' '
- run_sub_test_lib_test_err \
- atexit-cleanup "Run atexit commands" -i <<-\EOF &&
+test_expect_success 'subtest: test_atexit is run' '
+ write_and_run_sub_test_lib_test_err \
+ atexit-cleanup -i <<-\EOF &&
test_expect_success "tests clean up even after a failure" "
> ../../clean-atexit &&
test_atexit rm ../../clean-atexit &&
@@ -1301,7 +1102,8 @@
mv path2 path0 &&
mv tmp path2 &&
git update-index --add --replace path2 path0/file2 &&
- numpath0=$(git ls-files path0 | wc -l) &&
+ git ls-files path0 >tmp &&
+ numpath0=$(wc -l <tmp) &&
test $numpath0 = 1
'
@@ -1315,13 +1117,14 @@
>path4 &&
git update-index --add path4 &&
+ git ls-files -s path4 >tmp &&
(
- git ls-files -s path4 |
- sed -e "s/ .*/ /" |
+ sed -e "s/ .*/ /" tmp |
tr -d "\012" &&
echo "$a"
) | git update-index --index-info &&
- len=$(git ls-files "a*" | wc -c) &&
+ git ls-files "a*" >tmp &&
+ len=$(wc -c <tmp) &&
test $len = 4098
'
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index df544bb..d479303 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -2,10 +2,12 @@
test_description='git init'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
check_config () {
- if test -d "$1" && test -f "$1/config" && test -d "$1/refs"
+ if test_path_is_dir "$1" &&
+ test_path_is_file "$1/config" && test_path_is_dir "$1/refs"
then
: happy
else
@@ -330,7 +332,7 @@
test_expect_success 'explicit bare & --separate-git-dir incompatible' '
test_must_fail git init --bare --separate-git-dir goop.git bare.git 2>err &&
- test_i18ngrep "mutually exclusive" err
+ test_i18ngrep "cannot be used together" err
'
test_expect_success 'implicit bare & --separate-git-dir incompatible' '
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index 8440e6a..f6356db 100755
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@ -7,6 +7,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
objpath() {
@@ -64,9 +65,11 @@
test_path_is_file "$REAL/objects/$(objpath $SHA)"
'
-test_expect_success 'check rev-list' '
+test_expect_success !SANITIZE_LEAK 'check rev-list' '
git update-ref "HEAD" "$SHA" &&
- test "$SHA" = "$(git rev-list HEAD)"
+ git rev-list HEAD >actual &&
+ echo $SHA >expected &&
+ test_cmp expected actual
'
test_expect_success 'setup_git_dir twice in subdir' '
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index 1e4c672..143f100 100755
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -2,6 +2,7 @@
test_description=gitattributes
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
attr_check_basic () {
@@ -204,15 +205,18 @@
test_expect_success 'attribute test: --all option' '
grep -v unspecified <expect-all | sort >specified-all &&
sed -e "s/:.*//" <expect-all | uniq >stdin-all &&
- git check-attr --stdin --all <stdin-all | sort >actual &&
+ git check-attr --stdin --all <stdin-all >tmp &&
+ sort tmp >actual &&
test_cmp specified-all actual
'
test_expect_success 'attribute test: --cached option' '
- git check-attr --cached --stdin --all <stdin-all | sort >actual &&
+ git check-attr --cached --stdin --all <stdin-all >tmp &&
+ sort tmp >actual &&
test_must_be_empty actual &&
git add .gitattributes a/.gitattributes a/b/.gitattributes &&
- git check-attr --cached --stdin --all <stdin-all | sort >actual &&
+ git check-attr --cached --stdin --all <stdin-all >tmp &&
+ sort tmp >actual &&
test_cmp specified-all actual
'
diff --git a/t/t0004-unwritable.sh b/t/t0004-unwritable.sh
index 37d68ef..2e9d652 100755
--- a/t/t0004-unwritable.sh
+++ b/t/t0004-unwritable.sh
@@ -19,27 +19,66 @@
test_expect_success POSIXPERM,SANITY 'write-tree should notice unwritable repository' '
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
chmod a-w .git/objects .git/objects/?? &&
- test_must_fail git write-tree
+ test_must_fail git write-tree 2>out.write-tree
+'
+
+test_lazy_prereq WRITE_TREE_OUT 'test -e "$TRASH_DIRECTORY"/out.write-tree'
+test_expect_success WRITE_TREE_OUT 'write-tree output on unwritable repository' '
+ cat >expect <<-\EOF &&
+ error: insufficient permission for adding an object to repository database .git/objects
+ fatal: git-write-tree: error building trees
+ EOF
+ test_cmp expect out.write-tree
'
test_expect_success POSIXPERM,SANITY,!SANITIZE_LEAK 'commit should notice unwritable repository' '
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
chmod a-w .git/objects .git/objects/?? &&
- test_must_fail git commit -m second
+ test_must_fail git commit -m second 2>out.commit
+'
+
+test_lazy_prereq COMMIT_OUT 'test -e "$TRASH_DIRECTORY"/out.commit'
+test_expect_success COMMIT_OUT 'commit output on unwritable repository' '
+ cat >expect <<-\EOF &&
+ error: insufficient permission for adding an object to repository database .git/objects
+ error: Error building trees
+ EOF
+ test_cmp expect out.commit
'
test_expect_success POSIXPERM,SANITY 'update-index should notice unwritable repository' '
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
echo 6O >file &&
chmod a-w .git/objects .git/objects/?? &&
- test_must_fail git update-index file
+ test_must_fail git update-index file 2>out.update-index
+'
+
+test_lazy_prereq UPDATE_INDEX_OUT 'test -e "$TRASH_DIRECTORY"/out.update-index'
+test_expect_success UPDATE_INDEX_OUT 'update-index output on unwritable repository' '
+ cat >expect <<-\EOF &&
+ error: insufficient permission for adding an object to repository database .git/objects
+ error: file: failed to insert into database
+ fatal: Unable to process path file
+ EOF
+ test_cmp expect out.update-index
'
test_expect_success POSIXPERM,SANITY 'add should notice unwritable repository' '
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
echo b >file &&
chmod a-w .git/objects .git/objects/?? &&
- test_must_fail git add file
+ test_must_fail git add file 2>out.add
+'
+
+test_lazy_prereq ADD_OUT 'test -e "$TRASH_DIRECTORY"/out.add'
+test_expect_success ADD_OUT 'add output on unwritable repository' '
+ cat >expect <<-\EOF &&
+ error: insufficient permission for adding an object to repository database .git/objects
+ error: file: failed to insert into database
+ error: unable to index file '\''file'\''
+ fatal: updating files failed
+ EOF
+ test_cmp expect out.add
'
test_done
diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh
index 4c214bd..eba75a2 100755
--- a/t/t0005-signals.sh
+++ b/t/t0005-signals.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='signals work as we expect'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >expect <<EOF
@@ -46,7 +48,7 @@
'
test_expect_success !MINGW 'a constipated git dies with SIGPIPE even if parent ignores it' '
- OUT=$( ((trap "" PIPE; large_git; echo $? 1>&3) | :) 3>&1 ) &&
+ OUT=$( ((trap "" PIPE && large_git; echo $? 1>&3) | :) 3>&1 ) &&
test_match_signal 13 "$OUT"
'
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 6b757d7..2490162 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test date parsing and printing'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# arbitrary reference time: 2009-08-30 19:20:00
@@ -63,6 +65,10 @@
check_show 'format:%Y-%m-%d %H:%M:%S' "$TIME" '2016-06-15 16:13:20'
check_show 'format-local:%Y-%m-%d %H:%M:%S' "$TIME" '2016-06-15 09:13:20' '' EST5
+check_show 'format:%s' '123456789 +1234' 123456789
+check_show 'format:%s' '123456789 -1234' 123456789
+check_show 'format-local:%s' '123456789 -1234' 123456789
+
# arbitrary time absurdly far in the future
FUTURE="5758122296 -0400"
check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" TIME_IS_64BIT,TIME_T_IS_64BIT
diff --git a/t/t0007-git-var.sh b/t/t0007-git-var.sh
index 88b9ae8..e56f4b9 100755
--- a/t/t0007-git-var.sh
+++ b/t/t0007-git-var.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='basic sanity checks for git var'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'get GIT_AUTHOR_IDENT' '
@@ -25,6 +27,26 @@
)
'
+test_expect_success 'get GIT_DEFAULT_BRANCH without configuration' '
+ (
+ sane_unset GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME &&
+ git init defbranch &&
+ git -C defbranch symbolic-ref --short HEAD >expect &&
+ git var GIT_DEFAULT_BRANCH >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'get GIT_DEFAULT_BRANCH with configuration' '
+ test_config init.defaultbranch foo &&
+ (
+ sane_unset GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME &&
+ echo foo >expect &&
+ git var GIT_DEFAULT_BRANCH >actual &&
+ test_cmp expect actual
+ )
+'
+
# For git var -l, we check only a representative variable;
# testing the whole output would make our test too brittle with
# respect to unrelated changes in the test suite's environment.
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index a594b4a..5575dad 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -2,6 +2,7 @@
test_description=check-ignore
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
init_vars () {
@@ -199,7 +200,7 @@
do
: >$dir/not-ignored &&
: >$dir/ignored-and-untracked &&
- : >$dir/ignored-but-in-index
+ : >$dir/ignored-but-in-index || return 1
done &&
git add -f ignored-but-in-index a/ignored-but-in-index &&
cat <<-\EOF >a/.gitignore &&
@@ -802,6 +803,49 @@
grep top-level-dir actual
'
+test_expect_success 'exact prefix matching (with root)' '
+ test_when_finished rm -r a &&
+ mkdir -p a/git a/git-foo &&
+ touch a/git/foo a/git-foo/bar &&
+ echo /git/ >a/.gitignore &&
+ git check-ignore a/git a/git/foo a/git-foo a/git-foo/bar >actual &&
+ cat >expect <<-\EOF &&
+ a/git
+ a/git/foo
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'exact prefix matching (without root)' '
+ test_when_finished rm -r a &&
+ mkdir -p a/git a/git-foo &&
+ touch a/git/foo a/git-foo/bar &&
+ echo git/ >a/.gitignore &&
+ git check-ignore a/git a/git/foo a/git-foo a/git-foo/bar >actual &&
+ cat >expect <<-\EOF &&
+ a/git
+ a/git/foo
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'directories and ** matches' '
+ cat >.gitignore <<-\EOF &&
+ data/**
+ !data/**/
+ !data/**/*.txt
+ EOF
+ git check-ignore file \
+ data/file data/data1/file1 data/data1/file1.txt \
+ data/data2/file2 data/data2/file2.txt >actual &&
+ cat >expect <<-\EOF &&
+ data/file
+ data/data1/file1
+ data/data2/file2
+ EOF
+ test_cmp expect actual
+'
+
############################################################################
#
# test whitespace handling
diff --git a/t/t0009-prio-queue.sh b/t/t0009-prio-queue.sh
index 3941ad2..eea9910 100755
--- a/t/t0009-prio-queue.sh
+++ b/t/t0009-prio-queue.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='basic tests for priority queue implementation'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >expect <<'EOF'
diff --git a/t/t0010-racy-git.sh b/t/t0010-racy-git.sh
index 5657c5a..837c8b7 100755
--- a/t/t0010-racy-git.sh
+++ b/t/t0010-racy-git.sh
@@ -2,6 +2,7 @@
test_description='racy GIT'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# This test can give false success if your machine is sufficiently
diff --git a/t/t0011-hashmap.sh b/t/t0011-hashmap.sh
index e094975..1cb6aa6 100755
--- a/t/t0011-hashmap.sh
+++ b/t/t0011-hashmap.sh
@@ -220,7 +220,7 @@
for n in $(test_seq 51)
do
echo put key$n value$n >> in &&
- echo NULL >> expect
+ echo NULL >> expect || return 1
done &&
echo size >> in &&
echo 64 51 >> expect &&
@@ -231,7 +231,7 @@
for n in $(test_seq 12)
do
echo remove key$n >> in &&
- echo value$n >> expect
+ echo value$n >> expect || return 1
done &&
echo size >> in &&
echo 256 40 >> expect &&
diff --git a/t/t0012-help.sh b/t/t0012-help.sh
index 913f34c..6c33a43 100755
--- a/t/t0012-help.sh
+++ b/t/t0012-help.sh
@@ -34,6 +34,44 @@
git help -a >/dev/null
'
+test_expect_success 'invalid usage' '
+ test_expect_code 129 git help -a add &&
+ test_expect_code 129 git help --all add &&
+
+ test_expect_code 129 git help -g add &&
+ test_expect_code 129 git help -a -c &&
+
+ test_expect_code 129 git help -g add &&
+ test_expect_code 129 git help -a -g &&
+
+ test_expect_code 129 git help -g -c &&
+ test_expect_code 129 git help --config-for-completion add &&
+ test_expect_code 129 git help --config-sections-for-completion add
+'
+
+for opt in '-a' '-g' '-c' '--config-for-completion' '--config-sections-for-completion'
+do
+ test_expect_success "invalid usage of '$opt' with [-i|-m|-w]" '
+ git help $opt &&
+ test_expect_code 129 git help $opt -i &&
+ test_expect_code 129 git help $opt -m &&
+ test_expect_code 129 git help $opt -w
+ '
+
+ if test "$opt" = "-a"
+ then
+ continue
+ fi
+
+ test_expect_success "invalid usage of '$opt' with --no-external-commands" '
+ test_expect_code 129 git help $opt --no-external-commands
+ '
+
+ test_expect_success "invalid usage of '$opt' with --no-aliases" '
+ test_expect_code 129 git help $opt --no-external-commands
+ '
+done
+
test_expect_success "works for commands and guides by default" '
configure_help &&
git help status &&
@@ -89,14 +127,124 @@
test_cmp expect test-browser.log
'
+test_expect_success 'git help -c' '
+ git help -c >help.output &&
+ cat >expect <<-\EOF &&
+
+ '\''git help config'\'' for more information
+ EOF
+ grep -v -E \
+ -e "^[^.]+\.[^.]+$" \
+ -e "^[^.]+\.[^.]+\.[^.]+$" \
+ help.output >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git help --config-for-completion' '
+ git help -c >human &&
+ grep -E \
+ -e "^[^.]+\.[^.]+$" \
+ -e "^[^.]+\.[^.]+\.[^.]+$" human |
+ sed -e "s/\*.*//" -e "s/<.*//" |
+ sort -u >human.munged &&
+
+ git help --config-for-completion >vars &&
+ test_cmp human.munged vars
+'
+
+test_expect_success 'git help --config-sections-for-completion' '
+ git help -c >human &&
+ grep -E \
+ -e "^[^.]+\.[^.]+$" \
+ -e "^[^.]+\.[^.]+\.[^.]+$" human |
+ sed -e "s/\..*//" |
+ sort -u >human.munged &&
+
+ git help --config-sections-for-completion >sections &&
+ test_cmp human.munged sections
+'
+
+test_section_spacing () {
+ cat >expect &&
+ "$@" >out &&
+ grep -E "(^[^ ]|^$)" out >actual
+}
+
+test_section_spacing_trailer () {
+ test_section_spacing "$@" &&
+ test_expect_code 1 git >out &&
+ sed -n '/list available subcommands/,$p' <out >>expect
+}
+
+
+for cmd in git "git help"
+do
+ test_expect_success "'$cmd' section spacing" '
+ test_section_spacing_trailer git help <<-\EOF &&
+ usage: git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
+
+ These are common Git commands used in various situations:
+
+ start a working area (see also: git help tutorial)
+
+ work on the current change (see also: git help everyday)
+
+ examine the history and state (see also: git help revisions)
+
+ grow, mark and tweak your common history
+
+ collaborate (see also: git help workflows)
+
+ EOF
+ test_cmp expect actual
+ '
+done
+
+test_expect_success "'git help -a' section spacing" '
+ test_section_spacing \
+ git help -a --no-external-commands --no-aliases <<-\EOF &&
+ See '\''git help <command>'\'' to read about a specific subcommand
+
+ Main Porcelain Commands
+
+ Ancillary Commands / Manipulators
+
+ Ancillary Commands / Interrogators
+
+ Interacting with Others
+
+ Low-level Commands / Manipulators
+
+ Low-level Commands / Interrogators
+
+ Low-level Commands / Syncing Repositories
+
+ Low-level Commands / Internal Helpers
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success "'git help -g' section spacing" '
+ test_section_spacing_trailer git help -g <<-\EOF &&
+ The Git concept guides are:
+
+ EOF
+ test_cmp expect actual
+'
+
test_expect_success 'generate builtin list' '
+ mkdir -p sub &&
git --list-cmds=builtins >builtins
'
while read builtin
do
test_expect_success "$builtin can handle -h" '
- test_expect_code 129 git $builtin -h >output 2>&1 &&
+ (
+ GIT_CEILING_DIRECTORIES=$(pwd) &&
+ export GIT_CEILING_DIRECTORIES &&
+ test_expect_code 129 git -C sub $builtin -h >output 2>&1
+ ) &&
test_i18ngrep usage output
'
done <builtins
diff --git a/t/t0013-sha1dc.sh b/t/t0013-sha1dc.sh
index 419f31a..9ad7608 100755
--- a/t/t0013-sha1dc.sh
+++ b/t/t0013-sha1dc.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test sha1 collision detection'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
TEST_DATA="$TEST_DIRECTORY/t0013"
diff --git a/t/t0015-hash.sh b/t/t0015-hash.sh
index 291e906..086822f 100755
--- a/t/t0015-hash.sh
+++ b/t/t0015-hash.sh
@@ -15,7 +15,7 @@
grep c12252ceda8be8994d5fa0290a47231c1d16aae3 actual &&
printf "abcdefghijklmnopqrstuvwxyz" | test-tool sha1 >actual &&
grep 32d10c7b8cf96570ca04ce37f2a19d84240d3a89 actual &&
- perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" | \
+ perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" |
test-tool sha1 >actual &&
grep 34aa973cd4c4daa4f61eeb2bdbad27316534016f actual &&
printf "blob 0\0" | test-tool sha1 >actual &&
@@ -38,10 +38,10 @@
printf "abcdefghijklmnopqrstuvwxyz" | test-tool sha256 >actual &&
grep 71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73 actual &&
# Try to exercise the chunking code by turning autoflush on.
- perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" | \
+ perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" |
test-tool sha256 >actual &&
grep cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0 actual &&
- perl -e "$| = 1; print q{abcdefghijklmnopqrstuvwxyz} for 1..100000;" | \
+ perl -e "$| = 1; print q{abcdefghijklmnopqrstuvwxyz} for 1..100000;" |
test-tool sha256 >actual &&
grep e406ba321ca712ad35a698bf0af8d61fc4dc40eca6bdcea4697962724ccbde35 actual &&
printf "blob 0\0" | test-tool sha256 >actual &&
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index f25ae8b..35cc8c3 100755
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
has_cr() {
@@ -22,10 +23,10 @@
git config core.autocrlf false &&
- for w in Hello world how are you; do echo $w; done >one &&
+ test_write_lines Hello world how are you >one &&
mkdir dir &&
- for w in I am very very fine thank you; do echo $w; done >dir/two &&
- for w in Oh here is NULQin text here; do echo $w; done | q_to_nul >three &&
+ test_write_lines I am very very fine thank you >dir/two &&
+ test_write_lines Oh here is NULQin text here | q_to_nul >three &&
git add . &&
git commit -m initial &&
@@ -35,7 +36,7 @@
two=$(git rev-parse HEAD:dir/two) &&
three=$(git rev-parse HEAD:three) &&
- for w in Some extra lines here; do echo $w; done >>one &&
+ test_write_lines Some extra lines here >>one &&
git diff >patch.file &&
patched=$(git hash-object --stdin <one) &&
git read-tree --reset -u HEAD
@@ -46,7 +47,7 @@
git config core.autocrlf input &&
git config core.safecrlf true &&
- for w in I am all CRLF; do echo $w; done | append_cr >allcrlf &&
+ test_write_lines I am all CRLF | append_cr >allcrlf &&
test_must_fail git add allcrlf
'
@@ -55,7 +56,7 @@
git config core.autocrlf input &&
git config core.safecrlf true &&
- for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >mixed &&
+ test_write_lines Oh here is CRLFQ in text | q_to_cr >mixed &&
test_must_fail git add mixed
'
@@ -64,7 +65,7 @@
git config core.autocrlf true &&
git config core.safecrlf true &&
- for w in I am all LF; do echo $w; done >alllf &&
+ test_write_lines I am all LF >alllf &&
test_must_fail git add alllf
'
@@ -73,7 +74,7 @@
git config core.autocrlf true &&
git config core.safecrlf true &&
- for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >mixed &&
+ test_write_lines Oh here is CRLFQ in text | q_to_cr >mixed &&
test_must_fail git add mixed
'
@@ -82,10 +83,10 @@
git config core.autocrlf input &&
git config core.safecrlf warn &&
- for w in I am all LF; do echo $w; done >doublewarn &&
+ test_write_lines I am all LF >doublewarn &&
git add doublewarn &&
git commit -m "nowarn" &&
- for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >doublewarn &&
+ test_write_lines Oh here is CRLFQ in text | q_to_cr >doublewarn &&
git add doublewarn 2>err &&
grep "CRLF will be replaced by LF" err >err.warnings &&
test_line_count = 1 err.warnings
@@ -103,7 +104,7 @@
git config core.autocrlf input &&
git config core.safecrlf false &&
- for w in I am all CRLF; do echo $w; done | append_cr >allcrlf &&
+ test_write_lines I am all CRLF | append_cr >allcrlf &&
git add allcrlf 2>err &&
test_must_be_empty err
'
@@ -351,9 +352,9 @@
git config core.autocrlf false &&
git config core.safecrlf false &&
rm -rf .????* * &&
- for w in I am all LF; do echo $w; done >alllf &&
- for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >mixed &&
- for w in I am all CRLF; do echo $w; done | append_cr >allcrlf &&
+ test_write_lines I am all LF >alllf &&
+ test_write_lines Oh here is CRLFQ in text | q_to_cr >mixed &&
+ test_write_lines I am all CRLF | append_cr >allcrlf &&
git add -A . &&
git commit -m "alllf, allcrlf and mixed only" &&
git tag -a -m "message" autocrlf-checkpoint
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 33dfc9c..bad37ab 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -76,13 +76,13 @@
git config filter.rot13.clean ./rot13.sh &&
{
- echo "*.t filter=rot13"
+ echo "*.t filter=rot13" &&
echo "*.i ident"
} >.gitattributes &&
{
- echo a b c d e f g h i j k l m
- echo n o p q r s t u v w x y z
+ echo a b c d e f g h i j k l m &&
+ echo n o p q r s t u v w x y z &&
echo '\''$Id$'\''
} >test &&
cat test >test.t &&
@@ -118,17 +118,17 @@
# If an expanded ident ever gets into the repository, we want to make sure that
# it is collapsed before being expanded again on checkout
test_expect_success expanded_in_repo '
- {
- echo "File with expanded keywords"
- echo "\$Id\$"
- echo "\$Id:\$"
- echo "\$Id: 0000000000000000000000000000000000000000 \$"
- echo "\$Id: NoSpaceAtEnd\$"
- echo "\$Id:NoSpaceAtFront \$"
- echo "\$Id:NoSpaceAtEitherEnd\$"
- echo "\$Id: NoTerminatingSymbol"
- echo "\$Id: Foreign Commit With Spaces \$"
- } >expanded-keywords.0 &&
+ cat >expanded-keywords.0 <<-\EOF &&
+ File with expanded keywords
+ $Id$
+ $Id:$
+ $Id: 0000000000000000000000000000000000000000 $
+ $Id: NoSpaceAtEnd$
+ $Id:NoSpaceAtFront $
+ $Id:NoSpaceAtEitherEnd$
+ $Id: NoTerminatingSymbol
+ $Id: Foreign Commit With Spaces $
+ EOF
{
cat expanded-keywords.0 &&
@@ -139,17 +139,17 @@
git commit -m "File with keywords expanded" &&
id=$(git rev-parse --verify :expanded-keywords) &&
- {
- echo "File with expanded keywords"
- echo "\$Id: $id \$"
- echo "\$Id: $id \$"
- echo "\$Id: $id \$"
- echo "\$Id: $id \$"
- echo "\$Id: $id \$"
- echo "\$Id: $id \$"
- echo "\$Id: NoTerminatingSymbol"
- echo "\$Id: Foreign Commit With Spaces \$"
- } >expected-output.0 &&
+ cat >expected-output.0 <<-EOF &&
+ File with expanded keywords
+ \$Id: $id \$
+ \$Id: $id \$
+ \$Id: $id \$
+ \$Id: $id \$
+ \$Id: $id \$
+ \$Id: $id \$
+ \$Id: NoTerminatingSymbol
+ \$Id: Foreign Commit With Spaces \$
+ EOF
{
cat expected-output.0 &&
printf "\$Id: NoTerminatingSymbolAtEOF"
@@ -159,7 +159,7 @@
printf "\$Id: NoTerminatingSymbolAtEOF"
} >expected-output-crlf &&
{
- echo "expanded-keywords ident"
+ echo "expanded-keywords ident" &&
echo "expanded-keywords-crlf ident text eol=crlf"
} >>.gitattributes &&
@@ -285,7 +285,7 @@
test_expect_success 'filtering large input to small output should use little memory' '
test_config filter.devnull.clean "cat >/dev/null" &&
test_config filter.devnull.required true &&
- for i in $(test_seq 1 30); do printf "%1048576d" 1; done >30MB &&
+ for i in $(test_seq 1 30); do printf "%1048576d" 1 || return 1; done >30MB &&
echo "30MB filter=devnull" >.gitattributes &&
GIT_MMAP_LIMIT=1m GIT_ALLOC_LIMIT=1m git add 30MB
'
@@ -303,7 +303,7 @@
test_expect_success EXPENSIVE 'filter large file' '
test_config filter.largefile.smudge cat &&
test_config filter.largefile.clean cat &&
- for i in $(test_seq 1 2048); do printf "%1048576d" 1; done >2GB &&
+ for i in $(test_seq 1 2048); do printf "%1048576d" 1 || return 1; done >2GB &&
echo "2GB filter=largefile" >.gitattributes &&
git add 2GB 2>err &&
test_must_be_empty err &&
@@ -643,7 +643,7 @@
for FILE in "$TEST_ROOT"/*.file
do
cp "$FILE" . &&
- rot13.sh <"$FILE" >"$FILE.rot13"
+ rot13.sh <"$FILE" >"$FILE.rot13" || return 1
done &&
echo "*.file filter=protocol" >.gitattributes &&
@@ -682,7 +682,7 @@
for FILE in *.file
do
- test_cmp_committed_rot13 "$TEST_ROOT/$FILE" $FILE
+ test_cmp_committed_rot13 "$TEST_ROOT/$FILE" $FILE || return 1
done
)
'
diff --git a/t/t0022-crlf-rename.sh b/t/t0022-crlf-rename.sh
index 7af3fbc..9fe9891 100755
--- a/t/t0022-crlf-rename.sh
+++ b/t/t0022-crlf-rename.sh
@@ -2,6 +2,7 @@
test_description='ignore CR in CRLF sequence while computing similiarity'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -23,8 +24,8 @@
test_expect_success 'diff -M' '
- git diff-tree -M -r --name-status HEAD^ HEAD |
- sed -e "s/R[0-9]*/RNUM/" >actual &&
+ git diff-tree -M -r --name-status HEAD^ HEAD >tmp &&
+ sed -e "s/R[0-9]*/RNUM/" tmp >actual &&
echo "RNUM sample elpmas" >expect &&
test_cmp expect actual
diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
index 4e9fa3c..a34de56 100755
--- a/t/t0024-crlf-archive.sh
+++ b/t/t0024-crlf-archive.sh
@@ -2,6 +2,7 @@
test_description='respect crlf in git archive'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t0025-crlf-renormalize.sh b/t/t0025-crlf-renormalize.sh
index e13363a..f7202c1 100755
--- a/t/t0025-crlf-renormalize.sh
+++ b/t/t0025-crlf-renormalize.sh
@@ -2,6 +2,7 @@
test_description='CRLF renormalization'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -21,8 +22,8 @@
i/lf w/lf attr/text=auto LF.txt
i/lf w/mixed attr/text=auto CRLF_mix_LF.txt
EOF
- git ls-files --eol |
- sed -e "s/ / /g" -e "s/ */ /g" |
+ git ls-files --eol >tmp &&
+ sed -e "s/ / /g" -e "s/ */ /g" tmp |
sort >actual &&
test_cmp expect actual
'
diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh
index c5203e2..f426a18 100755
--- a/t/t0026-eol-config.sh
+++ b/t/t0026-eol-config.sh
@@ -2,6 +2,7 @@
test_description='CRLF conversion'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
has_cr() {
@@ -14,8 +15,8 @@
echo "one text" > .gitattributes &&
- for w in Hello world how are you; do echo $w; done >one &&
- for w in I am very very fine thank you; do echo $w; done >two &&
+ test_write_lines Hello world how are you >one &&
+ test_write_lines I am very very fine thank you >two &&
git add . &&
git commit -m initial &&
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index 4a5c5c6..7f80f46 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -77,12 +77,12 @@
check_warning () {
case "$1" in
- LF_CRLF) echo "warning: LF will be replaced by CRLF" >"$2".expect ;;
- CRLF_LF) echo "warning: CRLF will be replaced by LF" >"$2".expect ;;
- '') >"$2".expect ;;
+ LF_CRLF) echo "LF will be replaced by CRLF" >"$2".expect ;;
+ CRLF_LF) echo "CRLF will be replaced by LF" >"$2".expect ;;
+ '') >"$2".expect ;;
*) echo >&2 "Illegal 1": "$1" ; return false ;;
esac
- grep "will be replaced by" "$2" | sed -e "s/\(.*\) in [^ ]*$/\1/" | uniq >"$2".actual
+ sed -e "s/^.* \([^ ]* will be replaced by [^ ]*\) .*$/\1/" "$2" | uniq >"$2".actual
test_cmp "$2".expect "$2".actual
}
@@ -311,8 +311,8 @@
i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
EOF
- git ls-files --eol crlf_false_attr__* |
- sed -e "s/ / /g" -e "s/ */ /g" |
+ git ls-files --eol crlf_false_attr__* >tmp &&
+ sed -e "s/ / /g" -e "s/ */ /g" tmp |
sort >actual &&
test_cmp expect actual
'
@@ -359,12 +359,12 @@
i/ w/crlf TeBi_126_CL
i/ w/-text TeBi_126_CLC
EOF
- git ls-files --eol -o |
+ git ls-files --eol -o >tmp &&
sed -n -e "/TeBi_/{s!attr/[ ]*!!g
s! ! !g
s! *! !g
p
- }" | sort >actual &&
+ }" tmp | sort >actual &&
test_cmp expect actual
'
@@ -597,6 +597,12 @@
# auto: core.autocrlf=false and core.eol unset(or native) uses native eol
checkout_files auto "$id" "" false "" $NL CRLF CRLF_mix_LF LF_mix_CR LF_nul
checkout_files auto "$id" "" false native $NL CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ # core.autocrlf false, .gitattributes sets eol
+ checkout_files "" "$id" "lf" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ checkout_files "" "$id" "crlf" false "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
+ # core.autocrlf true, .gitattributes sets eol
+ checkout_files "" "$id" "lf" true "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ checkout_files "" "$id" "crlf" true "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
done
# The rest of the tests are unique; do the usual linting.
@@ -611,8 +617,8 @@
i/lf w/ crlf_false_attr__LF.txt
i/mixed w/ crlf_false_attr__CRLF_mix_LF.txt
EOF
- git ls-files --eol -d |
- sed -e "s!attr/[^ ]*!!g" -e "s/ / /g" -e "s/ */ /g" |
+ git ls-files --eol -d >tmp &&
+ sed -e "s!attr/[^ ]*!!g" -e "s/ / /g" -e "s/ */ /g" tmp |
sort >actual &&
test_cmp expect actual
'
diff --git a/t/t0029-core-unsetenvvars.sh b/t/t0029-core-unsetenvvars.sh
index 24ce46a..4e8e90d 100755
--- a/t/t0029-core-unsetenvvars.sh
+++ b/t/t0029-core-unsetenvvars.sh
@@ -2,6 +2,7 @@
test_description='test the Windows-only core.unsetenvvars setting'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
if ! test_have_prereq MINGW
@@ -11,8 +12,7 @@
fi
test_expect_success 'setup' '
- mkdir -p "$TRASH_DIRECTORY/.git/hooks" &&
- write_script "$TRASH_DIRECTORY/.git/hooks/pre-commit" <<-\EOF
+ test_hook --setup pre-commit <<-\EOF
echo $HOBBES >&2
EOF
'
diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
index ae1ca38..0a5713c 100755
--- a/t/t0030-stripspace.sh
+++ b/t/t0030-stripspace.sh
@@ -13,6 +13,10 @@
sss="$s40$s40$s40$s40$s40$s40$s40$s40$s40$s40" # 400
ttt="$t40$t40$t40$t40$t40$t40$t40$t40$t40$t40" # 400
+printf_git_stripspace () {
+ printf "$1" | git stripspace
+}
+
test_expect_success \
'long lines without spaces should be unchanged' '
echo "$ttt" >expect &&
@@ -225,32 +229,38 @@
test_expect_success \
'text without newline at end should end with newline' '
- test $(printf "$ttt" | git stripspace | wc -l) -gt 0 &&
- test $(printf "$ttt$ttt" | git stripspace | wc -l) -gt 0 &&
- test $(printf "$ttt$ttt$ttt" | git stripspace | wc -l) -gt 0 &&
- test $(printf "$ttt$ttt$ttt$ttt" | git stripspace | wc -l) -gt 0
+ test_stdout_line_count -gt 0 printf_git_stripspace "$ttt" &&
+ test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt" &&
+ test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt" &&
+ test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt$ttt"
'
# text plus spaces at the end:
test_expect_success \
'text plus spaces without newline at end should end with newline' '
- test $(printf "$ttt$sss" | git stripspace | wc -l) -gt 0 &&
- test $(printf "$ttt$ttt$sss" | git stripspace | wc -l) -gt 0 &&
- test $(printf "$ttt$ttt$ttt$sss" | git stripspace | wc -l) -gt 0 &&
- test $(printf "$ttt$sss$sss" | git stripspace | wc -l) -gt 0 &&
- test $(printf "$ttt$ttt$sss$sss" | git stripspace | wc -l) -gt 0 &&
- test $(printf "$ttt$sss$sss$sss" | git stripspace | wc -l) -gt 0
+ test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss" &&
+ test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$sss" &&
+ test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt$sss" &&
+ test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss$sss" &&
+ test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$sss$sss" &&
+ test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss$sss$sss"
'
test_expect_success \
'text plus spaces without newline at end should not show spaces' '
- ! (printf "$ttt$sss" | git stripspace | grep " " >/dev/null) &&
- ! (printf "$ttt$ttt$sss" | git stripspace | grep " " >/dev/null) &&
- ! (printf "$ttt$ttt$ttt$sss" | git stripspace | grep " " >/dev/null) &&
- ! (printf "$ttt$sss$sss" | git stripspace | grep " " >/dev/null) &&
- ! (printf "$ttt$ttt$sss$sss" | git stripspace | grep " " >/dev/null) &&
- ! (printf "$ttt$sss$sss$sss" | git stripspace | grep " " >/dev/null)
+ printf "$ttt$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ printf "$ttt$ttt$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ printf "$ttt$ttt$ttt$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ printf "$ttt$sss$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ printf "$ttt$ttt$sss$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ printf "$ttt$sss$sss$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null
'
test_expect_success \
@@ -282,12 +292,18 @@
test_expect_success \
'text plus spaces at end should not show spaces' '
- ! (echo "$ttt$sss" | git stripspace | grep " " >/dev/null) &&
- ! (echo "$ttt$ttt$sss" | git stripspace | grep " " >/dev/null) &&
- ! (echo "$ttt$ttt$ttt$sss" | git stripspace | grep " " >/dev/null) &&
- ! (echo "$ttt$sss$sss" | git stripspace | grep " " >/dev/null) &&
- ! (echo "$ttt$ttt$sss$sss" | git stripspace | grep " " >/dev/null) &&
- ! (echo "$ttt$sss$sss$sss" | git stripspace | grep " " >/dev/null)
+ echo "$ttt$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ echo "$ttt$ttt$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ echo "$ttt$ttt$ttt$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ echo "$ttt$sss$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ echo "$ttt$ttt$sss$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ echo "$ttt$sss$sss$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null
'
test_expect_success \
@@ -339,11 +355,16 @@
test_expect_success \
'spaces without newline at end should not show spaces' '
- ! (printf "" | git stripspace | grep " " >/dev/null) &&
- ! (printf "$sss" | git stripspace | grep " " >/dev/null) &&
- ! (printf "$sss$sss" | git stripspace | grep " " >/dev/null) &&
- ! (printf "$sss$sss$sss" | git stripspace | grep " " >/dev/null) &&
- ! (printf "$sss$sss$sss$sss" | git stripspace | grep " " >/dev/null)
+ printf "" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ printf "$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ printf "$sss$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ printf "$sss$sss$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null &&
+ printf "$sss$sss$sss$sss" | git stripspace >tmp &&
+ ! grep " " tmp >/dev/null
'
test_expect_success \
diff --git a/t/t0032-reftable-unittest.sh b/t/t0032-reftable-unittest.sh
new file mode 100755
index 0000000..0ed1497
--- /dev/null
+++ b/t/t0032-reftable-unittest.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# Copyright (c) 2020 Google LLC
+#
+
+test_description='reftable unittests'
+
+. ./test-lib.sh
+
+test_expect_success 'unittests' '
+ TMPDIR=$(pwd) && export TMPDIR &&
+ test-tool reftable
+'
+
+test_done
diff --git a/t/t0033-safe-directory.sh b/t/t0033-safe-directory.sh
new file mode 100755
index 0000000..238b25f
--- /dev/null
+++ b/t/t0033-safe-directory.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+test_description='verify safe.directory checks'
+
+. ./test-lib.sh
+
+GIT_TEST_ASSUME_DIFFERENT_OWNER=1
+export GIT_TEST_ASSUME_DIFFERENT_OWNER
+
+expect_rejected_dir () {
+ test_must_fail git status 2>err &&
+ grep "unsafe repository" err
+}
+
+test_expect_success 'safe.directory is not set' '
+ expect_rejected_dir
+'
+
+test_expect_success 'ignoring safe.directory on the command line' '
+ test_must_fail git -c safe.directory="$(pwd)" status 2>err &&
+ grep "unsafe repository" err
+'
+
+test_expect_success 'ignoring safe.directory in the environment' '
+ test_must_fail env GIT_CONFIG_COUNT=1 \
+ GIT_CONFIG_KEY_0="safe.directory" \
+ GIT_CONFIG_VALUE_0="$(pwd)" \
+ git status 2>err &&
+ grep "unsafe repository" err
+'
+
+test_expect_success 'ignoring safe.directory in GIT_CONFIG_PARAMETERS' '
+ test_must_fail env \
+ GIT_CONFIG_PARAMETERS="${SQ}safe.directory${SQ}=${SQ}$(pwd)${SQ}" \
+ git status 2>err &&
+ grep "unsafe repository" err
+'
+
+test_expect_success 'ignoring safe.directory in repo config' '
+ (
+ unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+ git config safe.directory "$(pwd)"
+ ) &&
+ expect_rejected_dir
+'
+
+test_expect_success 'safe.directory does not match' '
+ git config --global safe.directory bogus &&
+ expect_rejected_dir
+'
+
+test_expect_success 'path exist as different key' '
+ git config --global foo.bar "$(pwd)" &&
+ expect_rejected_dir
+'
+
+test_expect_success 'safe.directory matches' '
+ git config --global --add safe.directory "$(pwd)" &&
+ git status
+'
+
+test_expect_success 'safe.directory matches, but is reset' '
+ git config --global --add safe.directory "" &&
+ expect_rejected_dir
+'
+
+test_expect_success 'safe.directory=*' '
+ git config --global --add safe.directory "*" &&
+ git status
+'
+
+test_expect_success 'safe.directory=*, but is reset' '
+ git config --global --add safe.directory "" &&
+ expect_rejected_dir
+'
+
+test_done
diff --git a/t/t0034-root-safe-directory.sh b/t/t0034-root-safe-directory.sh
new file mode 100755
index 0000000..a621f1e
--- /dev/null
+++ b/t/t0034-root-safe-directory.sh
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+test_description='verify safe.directory checks while running as root'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-sudo.sh
+
+if [ "$GIT_TEST_ALLOW_SUDO" != "YES" ]
+then
+ skip_all="You must set env var GIT_TEST_ALLOW_SUDO=YES in order to run this test"
+ test_done
+fi
+
+if ! test_have_prereq NOT_ROOT
+then
+ skip_all="These tests do not support running as root"
+ test_done
+fi
+
+test_lazy_prereq SUDO '
+ sudo -n id -u >u &&
+ id -u root >r &&
+ test_cmp u r &&
+ command -v git >u &&
+ sudo command -v git >r &&
+ test_cmp u r
+'
+
+if ! test_have_prereq SUDO
+then
+ skip_all="Your sudo/system configuration is either too strict or unsupported"
+ test_done
+fi
+
+test_expect_success SUDO 'setup' '
+ sudo rm -rf root &&
+ mkdir -p root/r &&
+ (
+ cd root/r &&
+ git init
+ )
+'
+
+test_expect_success SUDO 'sudo git status as original owner' '
+ (
+ cd root/r &&
+ git status &&
+ sudo git status
+ )
+'
+
+test_expect_success SUDO 'setup root owned repository' '
+ sudo mkdir -p root/p &&
+ sudo git init root/p
+'
+
+test_expect_success 'cannot access if owned by root' '
+ (
+ cd root/p &&
+ test_must_fail git status
+ )
+'
+
+test_expect_success 'can access if addressed explicitly' '
+ (
+ cd root/p &&
+ GIT_DIR=.git GIT_WORK_TREE=. git status
+ )
+'
+
+test_expect_failure SUDO 'can access with sudo if root' '
+ (
+ cd root/p &&
+ sudo git status
+ )
+'
+
+test_expect_success SUDO 'can access with sudo if root by removing SUDO_UID' '
+ (
+ cd root/p &&
+ run_with_sudo <<-END
+ unset SUDO_UID &&
+ git status
+ END
+ )
+'
+
+test_lazy_prereq SUDO_SUDO '
+ sudo sudo id -u >u &&
+ id -u root >r &&
+ test_cmp u r
+'
+
+test_expect_success SUDO_SUDO 'can access with sudo abusing SUDO_UID' '
+ (
+ cd root/p &&
+ sudo sudo git status
+ )
+'
+
+# this MUST be always the last test
+test_expect_success SUDO 'cleanup' '
+ sudo rm -rf root
+'
+
+test_done
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index da310ed..ed2fb62 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -5,6 +5,7 @@
test_description='our own option parser'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >expect <<\EOF
@@ -168,9 +169,45 @@
'
test_expect_success 'missing required value' '
- test_expect_code 129 test-tool parse-options -s &&
- test_expect_code 129 test-tool parse-options --string &&
- test_expect_code 129 test-tool parse-options --file
+ cat >expect <<-\EOF &&
+ error: switch `s'\'' requires a value
+ EOF
+ test_expect_code 129 test-tool parse-options -s 2>actual &&
+ test_cmp expect actual &&
+
+ cat >expect <<-\EOF &&
+ error: option `string'\'' requires a value
+ EOF
+ test_expect_code 129 test-tool parse-options --string 2>actual &&
+ test_cmp expect actual &&
+
+ cat >expect <<-\EOF &&
+ error: option `file'\'' requires a value
+ EOF
+ test_expect_code 129 test-tool parse-options --file 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'superfluous value provided: boolean' '
+ cat >expect <<-\EOF &&
+ error: option `yes'\'' takes no value
+ EOF
+ test_expect_code 129 test-tool parse-options --yes=hi 2>actual &&
+ test_cmp expect actual &&
+
+ cat >expect <<-\EOF &&
+ error: option `no-yes'\'' takes no value
+ EOF
+ test_expect_code 129 test-tool parse-options --no-yes=hi 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'superfluous value provided: cmdmode' '
+ cat >expect <<-\EOF &&
+ error: option `mode1'\'' takes no value
+ EOF
+ test_expect_code 129 test-tool parse-options --mode1=hi 2>actual &&
+ test_cmp expect actual
'
cat >expect <<\EOF
diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index afc343c..5c9dc90 100755
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -104,7 +104,8 @@
rm camelcase &&
echo 1 >CamelCase &&
git add CamelCase &&
- camel=$(git ls-files | grep -i camelcase) &&
+ git ls-files >tmp &&
+ camel=$(grep -i camelcase tmp) &&
test $(echo "$camel" | wc -l) = 1 &&
test "z$(git cat-file blob :$camel)" = z1
'
diff --git a/t/t0051-windows-named-pipe.sh b/t/t0051-windows-named-pipe.sh
index 10ac92d..412f413 100755
--- a/t/t0051-windows-named-pipe.sh
+++ b/t/t0051-windows-named-pipe.sh
@@ -3,8 +3,13 @@
test_description='Windows named pipes'
. ./test-lib.sh
+if ! test_have_prereq MINGW
+then
+ skip_all='skipping Windows-specific tests'
+ test_done
+fi
-test_expect_success MINGW 'o_append write to named pipe' '
+test_expect_success 'o_append write to named pipe' '
GIT_TRACE="$(pwd)/expect" git status >/dev/null 2>&1 &&
{ test-tool windows-named-pipe t0051 >actual 2>&1 & } &&
pid=$! &&
diff --git a/t/t0052-simple-ipc.sh b/t/t0052-simple-ipc.sh
index ff98be3..1a36a53 100755
--- a/t/t0052-simple-ipc.sh
+++ b/t/t0052-simple-ipc.sh
@@ -2,6 +2,7 @@
test_description='simple command server'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test-tool simple-ipc SUPPORTS_SIMPLE_IPC || {
diff --git a/t/t0055-beyond-symlinks.sh b/t/t0055-beyond-symlinks.sh
index 0c6ff56..6bada37 100755
--- a/t/t0055-beyond-symlinks.sh
+++ b/t/t0055-beyond-symlinks.sh
@@ -2,6 +2,7 @@
test_description='update-index and add refuse to add beyond symlinks'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success SYMLINKS setup '
diff --git a/t/t0056-git-C.sh b/t/t0056-git-C.sh
index 2630e75..752aa8c 100755
--- a/t/t0056-git-C.sh
+++ b/t/t0056-git-C.sh
@@ -2,6 +2,7 @@
test_description='"-C <path>" option and its effects on other path-related options'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success '"git -C <path>" runs git from the directory <path>' '
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 34d1061..aa35350 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -55,12 +55,15 @@
ancestor() {
# We do some math with the expected ancestor length.
expected=$3
- if test -n "$rootoff" && test "x$expected" != x-1; then
- expected=$(($expected-$rootslash))
- test $expected -lt 0 ||
- expected=$(($expected+$rootoff))
- fi
- test_expect_success "longest ancestor: $1 $2 => $expected" \
+ case "$rootoff,$expected,$2" in
+ *,*,//*) ;; # leave UNC paths alone
+ [0-9]*,[0-9]*,/*)
+ # On Windows, expect MSYS2 pseudo root translation for
+ # Unix-style absolute paths
+ expected=$(($expected-$rootslash+$rootoff))
+ ;;
+ esac
+ test_expect_success $4 "longest ancestor: $1 $2 => $expected" \
"actual=\$(test-tool path-utils longest_ancestor_length '$1' '$2') &&
test \"\$actual\" = '$expected'"
}
@@ -156,6 +159,11 @@
ancestor /foo/bar /foo:/bar 4
ancestor /foo/bar /bar -1
+# Windows-specific: DOS drives, network shares
+ancestor C:/Users/me C:/ 2 MINGW
+ancestor D:/Users/me C:/ -1 MINGW
+ancestor //server/share/my-directory //server/share/ 14 MINGW
+
test_expect_success 'strip_path_suffix' '
test c:/msysgit = $(test-tool path-utils strip_path_suffix \
c:/msysgit/libexec//git-core libexec/git-core)
@@ -216,7 +224,7 @@
mkdir second &&
ln -s ../first second/other &&
mkdir third &&
- dir="$(cd .git; pwd -P)" &&
+ dir="$(cd .git && pwd -P)" &&
dir2=third/../second/other/.git &&
test "$dir" = "$(test-tool path-utils real_path $dir2)" &&
file="$dir"/index &&
@@ -224,7 +232,7 @@
basename=blub &&
test "$dir/$basename" = "$(cd .git && test-tool path-utils real_path "$basename")" &&
ln -s ../first/file .git/syml &&
- sym="$(cd first; pwd -P)"/file &&
+ sym="$(cd first && pwd -P)"/file &&
test "$sym" = "$(test-tool path-utils real_path "$dir2/syml")"
'
@@ -534,7 +542,7 @@
./git rev-parse
'
-test_expect_success RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'RUNTIME_PREFIX works' '
+test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'RUNTIME_PREFIX works' '
mkdir -p pretend/bin pretend/libexec/git-core &&
echo "echo HERE" | write_script pretend/libexec/git-core/git-here &&
cp "$GIT_EXEC_PATH"/git$X pretend/bin/ &&
@@ -542,7 +550,7 @@
echo HERE >expect &&
test_cmp expect actual'
-test_expect_success RUNTIME_PREFIX,CAN_EXEC_IN_PWD '%(prefix)/ works' '
+test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD '%(prefix)/ works' '
mkdir -p pretend/bin &&
cp "$GIT_EXEC_PATH"/git$X pretend/bin/ &&
git config yes.path "%(prefix)/yes" &&
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index 7d59967..ee28190 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -5,6 +5,7 @@
test_description='Test run command'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >hello-script <<-EOF
diff --git a/t/t0062-revision-walking.sh b/t/t0062-revision-walking.sh
index 8e21586..b9480c8 100755
--- a/t/t0062-revision-walking.sh
+++ b/t/t0062-revision-walking.sh
@@ -5,6 +5,7 @@
test_description='Test revision walking api'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >run_twice_expected <<-EOF
diff --git a/t/t0064-oid-array.sh b/t/t0064-oid-array.sh
index 2e5438c..88c89e8 100755
--- a/t/t0064-oid-array.sh
+++ b/t/t0064-oid-array.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='basic tests for the oid array implementation'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
echoid () {
diff --git a/t/t0065-strcmp-offset.sh b/t/t0065-strcmp-offset.sh
index 91fa639..94e34c8 100755
--- a/t/t0065-strcmp-offset.sh
+++ b/t/t0065-strcmp-offset.sh
@@ -2,6 +2,7 @@
test_description='Test strcmp_offset functionality'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
while read s1 s2 expect
diff --git a/t/t0066-dir-iterator.sh b/t/t0066-dir-iterator.sh
index 92910e4..63a1a45 100755
--- a/t/t0066-dir-iterator.sh
+++ b/t/t0066-dir-iterator.sh
@@ -2,6 +2,7 @@
test_description='Test the dir-iterator functionality'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t0067-parse_pathspec_file.sh b/t/t0067-parse_pathspec_file.sh
index 7bab49f..0188d04 100755
--- a/t/t0067-parse_pathspec_file.sh
+++ b/t/t0067-parse_pathspec_file.sh
@@ -2,6 +2,7 @@
test_description='Test parse_pathspec_file()'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'one item from stdin' '
diff --git a/t/t0069-oidtree.sh b/t/t0069-oidtree.sh
index bfb1397..889db50 100755
--- a/t/t0069-oidtree.sh
+++ b/t/t0069-oidtree.sh
@@ -1,6 +1,7 @@
#!/bin/sh
test_description='basic tests for the oidtree implementation'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
maxhexsz=$(test_oid hexsz)
@@ -27,7 +28,7 @@
EOF
{
echoid insert 444 1 2 3 4 5 a b c d e &&
- echoid contains 44 441 440 444 4440 4444
+ echoid contains 44 441 440 444 4440 4444 &&
echo clear
} | test-tool oidtree >actual &&
test_cmp expect actual
@@ -36,11 +37,11 @@
test_expect_success 'oidtree each' '
echoid "" 123 321 321 >expect &&
{
- echoid insert f 9 8 123 321 a b c d e
- echo each 12300
- echo each 3211
- echo each 3210
- echo each 32100
+ echoid insert f 9 8 123 321 a b c d e &&
+ echo each 12300 &&
+ echo each 3211 &&
+ echo each 3210 &&
+ echo each 32100 &&
echo clear
} | test-tool oidtree >actual &&
test_cmp expect actual
diff --git a/t/t0071-sort.sh b/t/t0071-sort.sh
new file mode 100755
index 0000000..6f9a501
--- /dev/null
+++ b/t/t0071-sort.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+test_description='verify sort functions'
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+test_expect_success 'llist_mergesort()' '
+ test-tool mergesort test
+'
+
+test_done
diff --git a/t/t0091-bugreport.sh b/t/t0091-bugreport.sh
index eeedbfa..08f5fe9 100755
--- a/t/t0091-bugreport.sh
+++ b/t/t0091-bugreport.sh
@@ -60,18 +60,22 @@
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 &&
+
+ test_hook applypatch-msg <<-\EOF &&
+ true
+ EOF
+ test_hook unknown-hook <<-\EOF &&
+ true
+ EOF
git bugreport -s hooks &&
- grep applypatch-msg git-bugreport-hooks.txt &&
- ! grep prepare-commit-msg git-bugreport-hooks.txt
+
+ sort >expect <<-\EOF &&
+ [Enabled Hooks]
+ applypatch-msg
+ EOF
+
+ sed -ne "/^\[Enabled Hooks\]$/,/^$/p" <git-bugreport-hooks.txt >actual &&
+ test_cmp expect actual
'
test_done
diff --git a/t/t0095-bloom.sh b/t/t0095-bloom.sh
index 7e4ab17..5945973 100755
--- a/t/t0095-bloom.sh
+++ b/t/t0095-bloom.sh
@@ -84,7 +84,7 @@
mkdir smallDir &&
for i in $(test_seq 0 9)
do
- echo $i >smallDir/$i
+ echo $i >smallDir/$i || return 1
done &&
git add smallDir &&
git commit -m "commit with 10 changes" &&
@@ -102,7 +102,7 @@
mkdir bigDir &&
for i in $(test_seq 0 511)
do
- echo $i >bigDir/$i
+ echo $i >bigDir/$i || return 1
done &&
git add bigDir &&
git commit -m "commit with 513 changes" &&
diff --git a/t/t0100-previous.sh b/t/t0100-previous.sh
index 69beb59..a16cc3d 100755
--- a/t/t0100-previous.sh
+++ b/t/t0100-previous.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'branch -d @{-1}' '
diff --git a/t/t0101-at-syntax.sh b/t/t0101-at-syntax.sh
index a1998b5..878aadd 100755
--- a/t/t0101-at-syntax.sh
+++ b/t/t0101-at-syntax.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='various @{whatever} syntax tests'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t0110-urlmatch-normalization.sh b/t/t0110-urlmatch-normalization.sh
index f99529d..4dc9fec 100755
--- a/t/t0110-urlmatch-normalization.sh
+++ b/t/t0110-urlmatch-normalization.sh
@@ -47,7 +47,7 @@
test-tool urlmatch-normalization "scheme://@host" &&
test-tool urlmatch-normalization "scheme://%00@host" &&
! test-tool urlmatch-normalization "scheme://%%@host" &&
- ! test-tool urlmatch-normalization "scheme://host_" &&
+ test-tool urlmatch-normalization "scheme://host_" &&
test-tool urlmatch-normalization "scheme://user:pass@host/" &&
test-tool urlmatch-normalization "scheme://@host/" &&
test-tool urlmatch-normalization "scheme://host/" &&
diff --git a/t/t0200-gettext-basic.sh b/t/t0200-gettext-basic.sh
index 8853d8a..522fb2a 100755
--- a/t/t0200-gettext-basic.sh
+++ b/t/t0200-gettext-basic.sh
@@ -5,6 +5,7 @@
test_description='Gettext support for Git'
+TEST_PASSES_SANITIZE_LEAK=true
. ./lib-gettext.sh
test_expect_success "sanity: \$GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to $GIT_INTERNAL_GETTEXT_SH_SCHEME)" '
diff --git a/t/t0201-gettext-fallbacks.sh b/t/t0201-gettext-fallbacks.sh
index 6c74df0..8724ce1 100755
--- a/t/t0201-gettext-fallbacks.sh
+++ b/t/t0201-gettext-fallbacks.sh
@@ -8,6 +8,7 @@
GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease
export GIT_INTERNAL_GETTEXT_TEST_FALLBACKS
+TEST_PASSES_SANITIZE_LEAK=true
. ./lib-gettext.sh
test_expect_success "sanity: \$GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to $GIT_INTERNAL_GETTEXT_SH_SCHEME)" '
diff --git a/t/t0202-gettext-perl.sh b/t/t0202-gettext-perl.sh
index a29d166..df2ea34 100755
--- a/t/t0202-gettext-perl.sh
+++ b/t/t0202-gettext-perl.sh
@@ -5,6 +5,7 @@
test_description='Perl gettext interface (Git::I18N)'
+TEST_PASSES_SANITIZE_LEAK=true
. ./lib-gettext.sh
if ! test_have_prereq PERL; then
diff --git a/t/t0204-gettext-reencode-sanity.sh b/t/t0204-gettext-reencode-sanity.sh
index 8437e51..4f2e0dc 100755
--- a/t/t0204-gettext-reencode-sanity.sh
+++ b/t/t0204-gettext-reencode-sanity.sh
@@ -5,6 +5,7 @@
test_description="Gettext reencoding of our *.po/*.mo files works"
+TEST_PASSES_SANITIZE_LEAK=true
. ./lib-gettext.sh
# The constants used in a tricky observation for undefined behaviour
diff --git a/t/t0210-trace2-normal.sh b/t/t0210-trace2-normal.sh
index 0cf3a63..37c359b 100755
--- a/t/t0210-trace2-normal.sh
+++ b/t/t0210-trace2-normal.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test trace2 facility (normal target)'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Turn off any inherited trace2 settings for this test.
diff --git a/t/t0211-trace2-perf.sh b/t/t0211-trace2-perf.sh
index 6ee8ee3..22d0845 100755
--- a/t/t0211-trace2-perf.sh
+++ b/t/t0211-trace2-perf.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test trace2 facility (perf target)'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Turn off any inherited trace2 settings for this test.
diff --git a/t/t0211/scrub_perf.perl b/t/t0211/scrub_perf.perl
index d164b750..299999f 100644
--- a/t/t0211/scrub_perf.perl
+++ b/t/t0211/scrub_perf.perl
@@ -59,6 +59,10 @@
# and highly variable. Just omit them.
goto SKIP_LINE;
}
+ if ($tokens[$col_category] =~ m/fsync/) {
+ # fsync events aren't interesting for the test
+ goto SKIP_LINE;
+ }
}
# t_abs and t_rel are either blank or a float. Replace the float
diff --git a/t/t0212-trace2-event.sh b/t/t0212-trace2-event.sh
index 1529155..6d3374f 100755
--- a/t/t0212-trace2-event.sh
+++ b/t/t0212-trace2-event.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test trace2 facility'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Turn off any inherited trace2 settings for this test.
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index bba6796..1e864cf 100755
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -6,6 +6,10 @@
# missing promisor objects cause repacks which write bitmaps to fail
GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
+# When enabled, some commands will write commit-graphs. This causes fsck
+# to fail when delete_object() is called because fsck will attempt to
+# verify the out-of-sync commit graph.
+GIT_TEST_COMMIT_GRAPH=0
delete_object () {
rm $1/.git/objects/$(echo $2 | sed -e 's|^..|&/|')
@@ -322,7 +326,7 @@
git -C repo config core.repositoryformatversion 1 &&
git -C repo config extensions.partialclone "arbitrary string" &&
- GIT_TEST_COMMIT_GRAPH=0 git -C repo -c core.commitGraph=false rev-list --exclude-promisor-objects --objects bar >out &&
+ git -C repo rev-list --exclude-promisor-objects --objects bar >out &&
grep $(git -C repo rev-parse bar) out &&
! grep $FOO out
'
@@ -465,7 +469,7 @@
git -C repo rev-list --ignore-missing --objects \
--exclude-promisor-objects "$OBJ" &&
git -C repo rev-list --ignore-missing --objects-edge-aggressive \
- --exclude-promisor-objects "$OBJ"
+ --exclude-promisor-objects "$OBJ" || return 1
done
'
@@ -614,6 +618,25 @@
git -C repo cherry-pick side1
'
+test_expect_success 'exact rename does not need to fetch the blob lazily' '
+ rm -rf repo partial.git &&
+ test_create_repo repo &&
+ content="some dummy content" &&
+ test_commit -C repo create-a-file file.txt "$content" &&
+ git -C repo mv file.txt new-file.txt &&
+ git -C repo commit -m rename-the-file &&
+ FILE_HASH=$(git -C repo rev-parse HEAD:new-file.txt) &&
+ test_config -C repo uploadpack.allowfilter 1 &&
+ test_config -C repo uploadpack.allowanysha1inwant 1 &&
+
+ git clone --filter=blob:none --bare "file://$(pwd)/repo" partial.git &&
+ git -C partial.git rev-list --objects --missing=print HEAD >out &&
+ grep "[?]$FILE_HASH" out &&
+ git -C partial.git log --follow -- new-file.txt &&
+ git -C partial.git rev-list --objects --missing=print HEAD >out &&
+ grep "[?]$FILE_HASH" out
+'
+
test_expect_success 'lazy-fetch when accessing object not in the_repository' '
rm -rf full partial.git &&
test_create_repo full &&
diff --git a/t/t0500-progress-display.sh b/t/t0500-progress-display.sh
index 22058b5..1eb3a83 100755
--- a/t/t0500-progress-display.sh
+++ b/t/t0500-progress-display.sh
@@ -2,6 +2,7 @@
test_description='progress display'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
show_cr () {
@@ -17,6 +18,7 @@
EOF
cat >in <<-\EOF &&
+ start 0
update
progress 1
update
@@ -25,8 +27,9 @@
progress 4
update
progress 5
+ stop
EOF
- test-tool progress "Working hard" <in 2>stderr &&
+ test-tool progress <in 2>stderr &&
show_cr <stderr >out &&
test_cmp expect out
@@ -41,11 +44,13 @@
EOF
cat >in <<-\EOF &&
+ start 3
progress 1
progress 2
progress 3
+ stop
EOF
- test-tool progress --total=3 "Working hard" <in 2>stderr &&
+ test-tool progress <in 2>stderr &&
show_cr <stderr >out &&
test_cmp expect out
@@ -62,14 +67,14 @@
EOF
cat >in <<-\EOF &&
+ start 100000 Working hard.......2.........3.........4.........5.........6
progress 100
progress 1000
progress 10000
progress 100000
+ stop
EOF
- test-tool progress --total=100000 \
- "Working hard.......2.........3.........4.........5.........6" \
- <in 2>stderr &&
+ test-tool progress <in 2>stderr &&
show_cr <stderr >out &&
test_cmp expect out
@@ -88,16 +93,16 @@
EOF
cat >in <<-\EOF &&
+ start 100000 Working hard.......2.........3.........4.........5.........6
update
progress 1
update
progress 2
progress 10000
progress 100000
+ stop
EOF
- test-tool progress --total=100000 \
- "Working hard.......2.........3.........4.........5.........6" \
- <in 2>stderr &&
+ test-tool progress <in 2>stderr &&
show_cr <stderr >out &&
test_cmp expect out
@@ -116,14 +121,14 @@
EOF
cat >in <<-\EOF &&
+ start 100000 Working hard.......2.........3.........4.........5.........6
progress 25000
progress 50000
progress 75000
progress 100000
+ stop
EOF
- test-tool progress --total=100000 \
- "Working hard.......2.........3.........4.........5.........6" \
- <in 2>stderr &&
+ test-tool progress <in 2>stderr &&
show_cr <stderr >out &&
test_cmp expect out
@@ -140,14 +145,14 @@
EOF
cat >in <<-\EOF &&
+ start 100000 Working hard.......2.........3.........4.........5.........6.........7.........
progress 25000
progress 50000
progress 75000
progress 100000
+ stop
EOF
- test-tool progress --total=100000 \
- "Working hard.......2.........3.........4.........5.........6.........7........." \
- <in 2>stderr &&
+ test-tool progress <in 2>stderr &&
show_cr <stderr >out &&
test_cmp expect out
@@ -164,12 +169,14 @@
EOF
cat >in <<-\EOF &&
+ start 1000
progress 100
progress 200
progress 1
progress 1000
+ stop
EOF
- test-tool progress --total=1000 "Working hard" <in 2>stderr &&
+ test-tool progress <in 2>stderr &&
show_cr <stderr >out &&
test_cmp expect out
@@ -185,6 +192,7 @@
EOF
cat >in <<-\EOF &&
+ start 0
throughput 102400 1000
update
progress 10
@@ -197,8 +205,9 @@
throughput 409600 4000
update
progress 40
+ stop
EOF
- test-tool progress "Working hard" <in 2>stderr &&
+ test-tool progress <in 2>stderr &&
show_cr <stderr >out &&
test_cmp expect out
@@ -214,6 +223,7 @@
EOF
cat >in <<-\EOF &&
+ start 40
throughput 102400 1000
progress 10
throughput 204800 2000
@@ -222,8 +232,9 @@
progress 30
throughput 409600 4000
progress 40
+ stop
EOF
- test-tool progress --total=40 "Working hard" <in 2>stderr &&
+ test-tool progress <in 2>stderr &&
show_cr <stderr >out &&
test_cmp expect out
@@ -239,6 +250,7 @@
EOF
cat >in <<-\EOF &&
+ start 0
throughput 409600 1000
update
progress 1
@@ -251,8 +263,9 @@
throughput 1638400 4000
update
progress 4
+ stop
EOF
- test-tool progress "Working hard" <in 2>stderr &&
+ test-tool progress <in 2>stderr &&
show_cr <stderr >out &&
test_cmp expect out
@@ -267,6 +280,7 @@
EOF
cat >in <<-\EOF &&
+ start 0
throughput 1 1000
update
progress 1
@@ -276,8 +290,9 @@
throughput 3145728 3000
update
progress 3
+ stop
EOF
- test-tool progress "Working hard" <in 2>stderr &&
+ test-tool progress <in 2>stderr &&
show_cr <stderr >out &&
test_cmp expect out
@@ -285,6 +300,7 @@
test_expect_success 'progress generates traces' '
cat >in <<-\EOF &&
+ start 40
throughput 102400 1000
update
progress 10
@@ -297,10 +313,11 @@
throughput 409600 4000
update
progress 40
+ stop
EOF
- GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool progress --total=40 \
- "Working hard" <in 2>stderr &&
+ GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool progress \
+ <in 2>stderr &&
# t0212/parse_events.perl intentionally omits regions and data.
test_region progress "Working hard" trace.event &&
@@ -308,4 +325,54 @@
grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event
'
+test_expect_success 'progress generates traces: stop / start' '
+ cat >in <<-\EOF &&
+ start 0
+ stop
+ EOF
+
+ GIT_TRACE2_EVENT="$PWD/trace-startstop.event" test-tool progress \
+ <in 2>stderr &&
+ test_region progress "Working hard" trace-startstop.event
+'
+
+test_expect_success 'progress generates traces: start without stop' '
+ cat >in <<-\EOF &&
+ start 0
+ EOF
+
+ GIT_TRACE2_EVENT="$PWD/trace-start.event" \
+ LSAN_OPTIONS=detect_leaks=0 \
+ test-tool progress \
+ <in 2>stderr &&
+ grep region_enter.*progress trace-start.event &&
+ ! grep region_leave.*progress trace-start.event
+'
+
+test_expect_success 'progress generates traces: stop without start' '
+ cat >in <<-\EOF &&
+ stop
+ EOF
+
+ GIT_TRACE2_EVENT="$PWD/trace-stop.event" test-tool progress \
+ <in 2>stderr &&
+ ! grep region_enter.*progress trace-stop.event &&
+ ! grep region_leave.*progress trace-stop.event
+'
+
+test_expect_success 'progress generates traces: start with active progress bar (no stops)' '
+ cat >in <<-\EOF &&
+ start 0 One
+ start 0 Two
+ EOF
+
+ GIT_TRACE2_EVENT="$PWD/trace-2start.event" \
+ LSAN_OPTIONS=detect_leaks=0 \
+ test-tool progress \
+ <in 2>stderr &&
+ grep region_enter.*progress.*One trace-2start.event &&
+ grep region_enter.*progress.*Two trace-2start.event &&
+ ! grep region_leave trace-2start.event
+'
+
test_done
diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh
index 013c5a7..0e8c0df 100755
--- a/t/t1000-read-tree-m-3way.sh
+++ b/t/t1000-read-tree-m-3way.sh
@@ -71,6 +71,8 @@
DF: a special case, where A makes a directory and B makes a file.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh
. "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh
index 1057a96..516a611 100755
--- a/t/t1001-read-tree-m-2way.sh
+++ b/t/t1001-read-tree-m-2way.sh
@@ -20,6 +20,8 @@
rezrov - in H, deleted in M
yomin - not in H or M
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh
@@ -36,11 +38,12 @@
}
check_cache_at () {
- clean_if_empty=$(git diff-files -- "$1")
+ git diff-files -- "$1" >out &&
+ clean_if_empty=$(cat out) &&
case "$clean_if_empty" in
'') echo "$1: clean" ;;
?*) echo "$1: dirty" ;;
- esac
+ esac &&
case "$2,$clean_if_empty" in
clean,) : ;;
clean,?*) false ;;
diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
index 9c05f5e..bd5313c 100755
--- a/t/t1002-read-tree-m-u-2way.sh
+++ b/t/t1002-read-tree-m-u-2way.sh
@@ -8,6 +8,8 @@
This is identical to t1001, but uses -u to update the work tree as well.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh
@@ -21,11 +23,12 @@
}
check_cache_at () {
- clean_if_empty=$(git diff-files -- "$1")
+ git diff-files -- "$1" >out &&
+ clean_if_empty=$(cat out) &&
case "$clean_if_empty" in
'') echo "$1: clean" ;;
?*) echo "$1: dirty" ;;
- esac
+ esac &&
case "$2,$clean_if_empty" in
clean,) : ;;
clean,?*) false ;;
diff --git a/t/t1003-read-tree-prefix.sh b/t/t1003-read-tree-prefix.sh
index b6111cd..c860c08 100755
--- a/t/t1003-read-tree-prefix.sh
+++ b/t/t1003-read-tree-prefix.sh
@@ -6,6 +6,7 @@
test_description='git read-tree --prefix test.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -24,4 +25,14 @@
cmp expect actual
'
+test_expect_success 'read-tree --prefix with leading slash exits with error' '
+ git rm -rf . &&
+ test_must_fail git read-tree --prefix=/two/ $tree &&
+ git read-tree --prefix=two/ $tree &&
+
+ git rm -rf . &&
+ test_must_fail git read-tree --prefix=/ $tree &&
+ git read-tree --prefix= $tree
+'
+
test_done
diff --git a/t/t1005-read-tree-reset.sh b/t/t1005-read-tree-reset.sh
index 83b09e1..12e30d7 100755
--- a/t/t1005-read-tree-reset.sh
+++ b/t/t1005-read-tree-reset.sh
@@ -2,6 +2,7 @@
test_description='read-tree -u --reset'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 18b3779..dadf3b1 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -4,6 +4,98 @@
. ./test-lib.sh
+test_cmdmode_usage () {
+ test_expect_code 129 "$@" 2>err &&
+ grep "^error:.*is incompatible with" err
+}
+
+for switches in \
+ '-e -p' \
+ '-p -t' \
+ '-t -s' \
+ '-s --textconv' \
+ '--textconv --filters' \
+ '--batch-all-objects -e'
+do
+ test_expect_success "usage: cmdmode $switches" '
+ test_cmdmode_usage git cat-file $switches
+ '
+done
+
+test_incompatible_usage () {
+ test_expect_code 129 "$@" 2>err &&
+ grep -E "^(fatal|error):.*(requires|incompatible with|needs)" err
+}
+
+for opt in --batch --batch-check
+do
+ test_expect_success "usage: incompatible options: --path with $opt" '
+ test_incompatible_usage git cat-file --path=foo $opt
+ '
+done
+
+test_missing_usage () {
+ test_expect_code 129 "$@" 2>err &&
+ grep -E "^fatal:.*required" err
+}
+
+short_modes="-e -p -t -s"
+cw_modes="--textconv --filters"
+
+for opt in $cw_modes
+do
+ test_expect_success "usage: $opt requires another option" '
+ test_missing_usage git cat-file $opt
+ '
+done
+
+for opt in $short_modes
+do
+ test_expect_success "usage: $opt requires another option" '
+ test_missing_usage git cat-file $opt
+ '
+
+ for opt2 in --batch \
+ --batch-check \
+ --follow-symlinks \
+ "--path=foo HEAD:some-path.txt"
+ do
+ test_expect_success "usage: incompatible options: $opt and $opt2" '
+ test_incompatible_usage git cat-file $opt $opt2
+ '
+ done
+done
+
+test_too_many_arguments () {
+ test_expect_code 129 "$@" 2>err &&
+ grep -E "^fatal: too many arguments$" err
+}
+
+for opt in $short_modes $cw_modes
+do
+ args="one two three"
+ test_expect_success "usage: too many arguments: $opt $args" '
+ test_too_many_arguments git cat-file $opt $args
+ '
+
+ for opt2 in --buffer --follow-symlinks
+ do
+ test_expect_success "usage: incompatible arguments: $opt with batch option $opt2" '
+ test_incompatible_usage git cat-file $opt $opt2
+ '
+ done
+done
+
+for opt in --buffer \
+ --follow-symlinks \
+ --batch-all-objects
+do
+ test_expect_success "usage: bad option combination: $opt without batch mode" '
+ test_incompatible_usage git cat-file $opt &&
+ test_incompatible_usage git cat-file $opt commit HEAD
+ '
+done
+
echo_without_newline () {
printf '%s' "$*"
}
@@ -13,13 +105,18 @@
}
maybe_remove_timestamp () {
- if test -z "$2"; then
- echo_without_newline "$1"
- else
- echo_without_newline "$(printf '%s\n' "$1" | sed -e 's/ [0-9][0-9]* [-+][0-9][0-9][0-9][0-9]$//')"
- fi
+ if test -z "$2"; then
+ echo_without_newline "$1"
+ else
+ echo_without_newline "$(printf '%s\n' "$1" | remove_timestamp)"
+ fi
}
+remove_timestamp () {
+ sed -e 's/ [0-9][0-9]* [-+][0-9][0-9][0-9][0-9]$//'
+}
+
+
run_tests () {
type=$1
sha1=$2
@@ -85,12 +182,36 @@
test_cmp expect actual
'
+ for opt in --buffer --no-buffer
+ do
+ test -z "$content" ||
+ test_expect_success "--batch-command $opt output of $type content is correct" '
+ maybe_remove_timestamp "$batch_output" $no_ts >expect &&
+ maybe_remove_timestamp "$(test_write_lines "contents $sha1" |
+ git cat-file --batch-command $opt)" $no_ts >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "--batch-command $opt output of $type info is correct" '
+ echo "$sha1 $type $size" >expect &&
+ test_write_lines "info $sha1" |
+ git cat-file --batch-command $opt >actual &&
+ test_cmp expect actual
+ '
+ done
+
test_expect_success "custom --batch-check format" '
echo "$type $sha1" >expect &&
echo $sha1 | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
test_cmp expect actual
'
+ test_expect_success "custom --batch-command format" '
+ echo "$type $sha1" >expect &&
+ echo "info $sha1" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
+ test_cmp expect actual
+ '
+
test_expect_success '--batch-check with %(rest)' '
echo "$type this is some extra content" >expect &&
echo "$sha1 this is some extra content" |
@@ -132,6 +253,22 @@
run_tests 'blob' $hello_sha1 $hello_size "$hello_content" "$hello_content"
+test_expect_success '--batch-command --buffer with flush for blob info' '
+ echo "$hello_sha1 blob $hello_size" >expect &&
+ test_write_lines "info $hello_sha1" "flush" |
+ GIT_TEST_CAT_FILE_NO_FLUSH_ON_EXIT=1 \
+ git cat-file --batch-command --buffer >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--batch-command --buffer without flush for blob info' '
+ touch output &&
+ test_write_lines "info $hello_sha1" |
+ GIT_TEST_CAT_FILE_NO_FLUSH_ON_EXIT=1 \
+ git cat-file --batch-command --buffer >>output &&
+ test_must_be_empty output
+'
+
test_expect_success '--batch-check without %(rest) considers whole line' '
echo "$hello_sha1 blob $hello_size" >expect &&
git update-index --add --cacheinfo 100644 $hello_sha1 "white space" &&
@@ -175,7 +312,7 @@
"Reach a blob from a tag pointing to it" \
"test '$hello_content' = \"\$(git cat-file blob $tag_sha1)\""
-for batch in batch batch-check
+for batch in batch batch-check batch-command
do
for opt in t s e p
do
@@ -211,14 +348,14 @@
test_expect_success "--batch-check for a non-existent named object" '
test "foobar42 missing
foobar84 missing" = \
- "$( ( echo foobar42; echo_without_newline foobar84; ) | git cat-file --batch-check)"
+ "$( ( echo foobar42 && echo_without_newline foobar84 ) | git cat-file --batch-check)"
'
test_expect_success "--batch-check for a non-existent hash" '
test "0000000000000000000000000000000000000042 missing
0000000000000000000000000000000000000084 missing" = \
- "$( ( echo 0000000000000000000000000000000000000042;
- echo_without_newline 0000000000000000000000000000000000000084; ) |
+ "$( ( echo 0000000000000000000000000000000000000042 &&
+ echo_without_newline 0000000000000000000000000000000000000084 ) |
git cat-file --batch-check)"
'
@@ -226,8 +363,8 @@
test "$tag_sha1 tag $tag_size
$tag_content
0000000000000000000000000000000000000000 missing" = \
- "$( ( echo $tag_sha1;
- echo_without_newline 0000000000000000000000000000000000000000; ) |
+ "$( ( echo $tag_sha1 &&
+ echo_without_newline 0000000000000000000000000000000000000000 ) |
git cat-file --batch)"
'
@@ -281,9 +418,52 @@
"$(echo_without_newline "$batch_check_input" | git cat-file --batch-check)"
'
+test_expect_success '--batch-command with multiple info calls gives correct format' '
+ cat >expect <<-EOF &&
+ $hello_sha1 blob $hello_size
+ $tree_sha1 tree $tree_size
+ $commit_sha1 commit $commit_size
+ $tag_sha1 tag $tag_size
+ deadbeef missing
+ EOF
+
+ git cat-file --batch-command --buffer >actual <<-EOF &&
+ info $hello_sha1
+ info $tree_sha1
+ info $commit_sha1
+ info $tag_sha1
+ info deadbeef
+ EOF
+
+ test_cmp expect actual
+'
+
+test_expect_success '--batch-command with multiple command calls gives correct format' '
+ remove_timestamp >expect <<-EOF &&
+ $hello_sha1 blob $hello_size
+ $hello_content
+ $commit_sha1 commit $commit_size
+ $commit_content
+ $tag_sha1 tag $tag_size
+ $tag_content
+ deadbeef missing
+ EOF
+
+ git cat-file --batch-command --buffer >actual_raw <<-EOF &&
+ contents $hello_sha1
+ contents $commit_sha1
+ contents $tag_sha1
+ contents deadbeef
+ flush
+ EOF
+
+ remove_timestamp <actual_raw >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'setup blobs which are likely to delta' '
test-tool genrandom foo 10240 >foo &&
- { cat foo; echo plus; } >foo-plus &&
+ { cat foo && echo plus; } >foo-plus &&
git add foo foo-plus &&
git commit -m foo &&
cat >blobs <<-\EOF
@@ -315,39 +495,243 @@
}
'
-bogus_type="bogus"
-bogus_content="bogus"
-bogus_size=$(strlen "$bogus_content")
-bogus_sha1=$(echo_without_newline "$bogus_content" | git hash-object -t $bogus_type --literally -w --stdin)
+test_expect_success 'setup bogus data' '
+ bogus_short_type="bogus" &&
+ bogus_short_content="bogus" &&
+ bogus_short_size=$(strlen "$bogus_short_content") &&
+ bogus_short_sha1=$(echo_without_newline "$bogus_short_content" | git hash-object -t $bogus_short_type --literally -w --stdin) &&
+
+ bogus_long_type="abcdefghijklmnopqrstuvwxyz1234679" &&
+ bogus_long_content="bogus" &&
+ bogus_long_size=$(strlen "$bogus_long_content") &&
+ bogus_long_sha1=$(echo_without_newline "$bogus_long_content" | git hash-object -t $bogus_long_type --literally -w --stdin)
+'
+
+for arg1 in '' --allow-unknown-type
+do
+ for arg2 in -s -t -p
+ do
+ if test "$arg1" = "--allow-unknown-type" && test "$arg2" = "-p"
+ then
+ continue
+ fi
+
+
+ test_expect_success "cat-file $arg1 $arg2 error on bogus short OID" '
+ cat >expect <<-\EOF &&
+ fatal: invalid object type
+ EOF
+
+ if test "$arg1" = "--allow-unknown-type"
+ then
+ git cat-file $arg1 $arg2 $bogus_short_sha1
+ else
+ test_must_fail git cat-file $arg1 $arg2 $bogus_short_sha1 >out 2>actual &&
+ test_must_be_empty out &&
+ test_cmp expect actual
+ fi
+ '
+
+ test_expect_success "cat-file $arg1 $arg2 error on bogus full OID" '
+ if test "$arg2" = "-p"
+ then
+ cat >expect <<-EOF
+ error: header for $bogus_long_sha1 too long, exceeds 32 bytes
+ fatal: Not a valid object name $bogus_long_sha1
+ EOF
+ else
+ cat >expect <<-EOF
+ error: header for $bogus_long_sha1 too long, exceeds 32 bytes
+ fatal: git cat-file: could not get object info
+ EOF
+ fi &&
+
+ if test "$arg1" = "--allow-unknown-type"
+ then
+ git cat-file $arg1 $arg2 $bogus_short_sha1
+ else
+ test_must_fail git cat-file $arg1 $arg2 $bogus_long_sha1 >out 2>actual &&
+ test_must_be_empty out &&
+ test_cmp expect actual
+ fi
+ '
+
+ test_expect_success "cat-file $arg1 $arg2 error on missing short OID" '
+ cat >expect.err <<-EOF &&
+ fatal: Not a valid object name $(test_oid deadbeef_short)
+ EOF
+ test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
+ test_must_be_empty out
+ '
+
+ test_expect_success "cat-file $arg1 $arg2 error on missing full OID" '
+ if test "$arg2" = "-p"
+ then
+ cat >expect.err <<-EOF
+ fatal: Not a valid object name $(test_oid deadbeef)
+ EOF
+ else
+ cat >expect.err <<-\EOF
+ fatal: git cat-file: could not get object info
+ EOF
+ fi &&
+ test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
+ test_must_be_empty out &&
+ test_cmp expect.err err.actual
+ '
+ done
+done
+
+test_expect_success '-e is OK with a broken object without --allow-unknown-type' '
+ git cat-file -e $bogus_short_sha1
+'
+
+test_expect_success '-e can not be combined with --allow-unknown-type' '
+ test_expect_code 128 git cat-file -e --allow-unknown-type $bogus_short_sha1
+'
+
+test_expect_success '-p cannot print a broken object even with --allow-unknown-type' '
+ test_must_fail git cat-file -p $bogus_short_sha1 &&
+ test_expect_code 128 git cat-file -p --allow-unknown-type $bogus_short_sha1
+'
+
+test_expect_success '<type> <hash> does not work with objects of broken types' '
+ cat >err.expect <<-\EOF &&
+ fatal: invalid object type "bogus"
+ EOF
+ test_must_fail git cat-file $bogus_short_type $bogus_short_sha1 2>err.actual &&
+ test_cmp err.expect err.actual
+'
+
+test_expect_success 'broken types combined with --batch and --batch-check' '
+ echo $bogus_short_sha1 >bogus-oid &&
+
+ cat >err.expect <<-\EOF &&
+ fatal: invalid object type
+ EOF
+
+ test_must_fail git cat-file --batch <bogus-oid 2>err.actual &&
+ test_cmp err.expect err.actual &&
+
+ test_must_fail git cat-file --batch-check <bogus-oid 2>err.actual &&
+ test_cmp err.expect err.actual
+'
+
+test_expect_success 'the --batch and --batch-check options do not combine with --allow-unknown-type' '
+ test_expect_code 128 git cat-file --batch --allow-unknown-type <bogus-oid &&
+ test_expect_code 128 git cat-file --batch-check --allow-unknown-type <bogus-oid
+'
+
+test_expect_success 'the --allow-unknown-type option does not consider replacement refs' '
+ cat >expect <<-EOF &&
+ $bogus_short_type
+ EOF
+ git cat-file -t --allow-unknown-type $bogus_short_sha1 >actual &&
+ test_cmp expect actual &&
+
+ # Create it manually, as "git replace" will die on bogus
+ # types.
+ head=$(git rev-parse --verify HEAD) &&
+ test_when_finished "test-tool ref-store main delete-refs 0 msg refs/replace/$bogus_short_sha1" &&
+ test-tool ref-store main update-ref msg "refs/replace/$bogus_short_sha1" $head $ZERO_OID REF_SKIP_OID_VERIFICATION &&
+
+ cat >expect <<-EOF &&
+ commit
+ EOF
+ git cat-file -t --allow-unknown-type $bogus_short_sha1 >actual &&
+ test_cmp expect actual
+'
test_expect_success "Type of broken object is correct" '
- echo $bogus_type >expect &&
- git cat-file -t --allow-unknown-type $bogus_sha1 >actual &&
+ echo $bogus_short_type >expect &&
+ git cat-file -t --allow-unknown-type $bogus_short_sha1 >actual &&
test_cmp expect actual
'
test_expect_success "Size of broken object is correct" '
- echo $bogus_size >expect &&
- git cat-file -s --allow-unknown-type $bogus_sha1 >actual &&
+ echo $bogus_short_size >expect &&
+ git cat-file -s --allow-unknown-type $bogus_short_sha1 >actual &&
test_cmp expect actual
'
-bogus_type="abcdefghijklmnopqrstuvwxyz1234679"
-bogus_content="bogus"
-bogus_size=$(strlen "$bogus_content")
-bogus_sha1=$(echo_without_newline "$bogus_content" | git hash-object -t $bogus_type --literally -w --stdin)
+
+test_expect_success 'clean up broken object' '
+ rm .git/objects/$(test_oid_to_path $bogus_short_sha1)
+'
test_expect_success "Type of broken object is correct when type is large" '
- echo $bogus_type >expect &&
- git cat-file -t --allow-unknown-type $bogus_sha1 >actual &&
+ echo $bogus_long_type >expect &&
+ git cat-file -t --allow-unknown-type $bogus_long_sha1 >actual &&
test_cmp expect actual
'
test_expect_success "Size of large broken object is correct when type is large" '
- echo $bogus_size >expect &&
- git cat-file -s --allow-unknown-type $bogus_sha1 >actual &&
+ echo $bogus_long_size >expect &&
+ git cat-file -s --allow-unknown-type $bogus_long_sha1 >actual &&
test_cmp expect actual
'
+test_expect_success 'clean up broken object' '
+ rm .git/objects/$(test_oid_to_path $bogus_long_sha1)
+'
+
+test_expect_success 'cat-file -t and -s on corrupt loose object' '
+ git init --bare corrupt-loose.git &&
+ (
+ cd corrupt-loose.git &&
+
+ # Setup and create the empty blob and its path
+ empty_path=$(git rev-parse --git-path objects/$(test_oid_to_path "$EMPTY_BLOB")) &&
+ empty_blob=$(git hash-object -w --stdin </dev/null) &&
+
+ # Create another blob and its path
+ echo other >other.blob &&
+ other_blob=$(git hash-object -w --stdin <other.blob) &&
+ other_path=$(git rev-parse --git-path objects/$(test_oid_to_path "$other_blob")) &&
+
+ # Before the swap the size is 0
+ cat >out.expect <<-EOF &&
+ 0
+ EOF
+ git cat-file -s "$EMPTY_BLOB" >out.actual 2>err.actual &&
+ test_must_be_empty err.actual &&
+ test_cmp out.expect out.actual &&
+
+ # Swap the two to corrupt the repository
+ mv -f "$other_path" "$empty_path" &&
+ test_must_fail git fsck 2>err.fsck &&
+ grep "hash-path mismatch" err.fsck &&
+
+ # confirm that cat-file is reading the new swapped-in
+ # blob...
+ cat >out.expect <<-EOF &&
+ blob
+ EOF
+ git cat-file -t "$EMPTY_BLOB" >out.actual 2>err.actual &&
+ test_must_be_empty err.actual &&
+ test_cmp out.expect out.actual &&
+
+ # ... since it has a different size now.
+ cat >out.expect <<-EOF &&
+ 6
+ EOF
+ git cat-file -s "$EMPTY_BLOB" >out.actual 2>err.actual &&
+ test_must_be_empty err.actual &&
+ test_cmp out.expect out.actual &&
+
+ # So far "cat-file" has been happy to spew the found
+ # content out as-is. Try to make it zlib-invalid.
+ mv -f other.blob "$empty_path" &&
+ test_must_fail git fsck 2>err.fsck &&
+ cat >expect <<-EOF &&
+ error: inflate: data stream error (incorrect header check)
+ error: unable to unpack header of ./$empty_path
+ error: $empty_blob: object corrupt or missing: ./$empty_path
+ EOF
+ grep "^error: " err.fsck >actual &&
+ test_cmp expect actual
+ )
+'
+
# Tests for git cat-file --follow-symlinks
test_expect_success 'prep for symlink tests' '
echo_without_newline "$hello_content" >morx &&
@@ -608,4 +992,105 @@
cmp expect actual
'
+test_expect_success 'set up replacement object' '
+ orig=$(git rev-parse HEAD) &&
+ git cat-file commit $orig >orig &&
+ {
+ cat orig &&
+ echo extra
+ } >fake &&
+ fake=$(git hash-object -t commit -w fake) &&
+ orig_size=$(git cat-file -s $orig) &&
+ fake_size=$(git cat-file -s $fake) &&
+ git replace $orig $fake
+'
+
+test_expect_success 'cat-file --batch respects replace objects' '
+ git cat-file --batch >actual <<-EOF &&
+ $orig
+ EOF
+ {
+ echo "$orig commit $fake_size" &&
+ cat fake &&
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'cat-file --batch-check respects replace objects' '
+ git cat-file --batch-check >actual <<-EOF &&
+ $orig
+ EOF
+ echo "$orig commit $fake_size" >expect &&
+ test_cmp expect actual
+'
+
+# Pull the entry for object with oid "$1" out of the output of
+# "cat-file --batch", including its object content (which requires
+# parsing and reading a set amount of bytes, hence perl).
+extract_batch_output () {
+ perl -ne '
+ BEGIN { $oid = shift }
+ if (/^$oid \S+ (\d+)$/) {
+ print;
+ read STDIN, my $buf, $1;
+ print $buf;
+ print "\n";
+ }
+ ' "$@"
+}
+
+test_expect_success 'cat-file --batch-all-objects --batch ignores replace' '
+ git cat-file --batch-all-objects --batch >actual.raw &&
+ extract_batch_output $orig <actual.raw >actual &&
+ {
+ echo "$orig commit $orig_size" &&
+ cat orig &&
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'cat-file --batch-all-objects --batch-check ignores replace' '
+ git cat-file --batch-all-objects --batch-check >actual.raw &&
+ grep ^$orig actual.raw >actual &&
+ echo "$orig commit $orig_size" >expect &&
+ test_cmp expect actual
+'
+test_expect_success 'batch-command empty command' '
+ echo "" >cmd &&
+ test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
+ grep "^fatal:.*empty command in input.*" err
+'
+
+test_expect_success 'batch-command whitespace before command' '
+ echo " info deadbeef" >cmd &&
+ test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
+ grep "^fatal:.*whitespace before command.*" err
+'
+
+test_expect_success 'batch-command unknown command' '
+ echo unknown_command >cmd &&
+ test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
+ grep "^fatal:.*unknown command.*" err
+'
+
+test_expect_success 'batch-command missing arguments' '
+ echo "info" >cmd &&
+ test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
+ grep "^fatal:.*info requires arguments.*" err
+'
+
+test_expect_success 'batch-command flush with arguments' '
+ echo "flush arg" >cmd &&
+ test_expect_code 128 git cat-file --batch-command --buffer <cmd 2>err &&
+ grep "^fatal:.*flush takes no arguments.*" err
+'
+
+test_expect_success 'batch-command flush without --buffer' '
+ echo "flush" >cmd &&
+ test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
+ grep "^fatal:.*flush is only for --buffer mode.*" err
+'
+
test_done
diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh
index 64b340f..ac5ad8c 100755
--- a/t/t1007-hash-object.sh
+++ b/t/t1007-hash-object.sh
@@ -2,6 +2,7 @@
test_description="git hash-object"
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
echo_without_newline() {
diff --git a/t/t1008-read-tree-overlay.sh b/t/t1008-read-tree-overlay.sh
index 4512fb0b..ad5936e 100755
--- a/t/t1008-read-tree-overlay.sh
+++ b/t/t1008-read-tree-overlay.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh
diff --git a/t/t1009-read-tree-new-index.sh b/t/t1009-read-tree-new-index.sh
index 2935f68..fc179ac 100755
--- a/t/t1009-read-tree-new-index.sh
+++ b/t/t1009-read-tree-new-index.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t1010-mktree.sh b/t/t1010-mktree.sh
index b946f87..3c08194 100755
--- a/t/t1010-mktree.sh
+++ b/t/t1010-mktree.sh
@@ -2,13 +2,14 @@
test_description='git mktree'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
- for d in a a. a0
+ for d in a a- a0
do
mkdir "$d" && echo "$d/one" >"$d/one" &&
- git add "$d"
+ git add "$d" || return 1
done &&
echo zero >one &&
git update-index --add --info-only one &&
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index 24092c0..63a553d 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -57,8 +57,8 @@
read_tree_u_must_succeed -m -u HEAD &&
git ls-files -t >result &&
test_cmp expected.swt result &&
- test -f init.t &&
- test -f sub/added
+ test_path_is_file init.t &&
+ test_path_is_file sub/added
'
test_expect_success 'read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled' '
@@ -67,8 +67,8 @@
read_tree_u_must_succeed --no-sparse-checkout -m -u HEAD &&
git ls-files -t >result &&
test_cmp expected.swt result &&
- test -f init.t &&
- test -f sub/added
+ test_path_is_file init.t &&
+ test_path_is_file sub/added
'
test_expect_success 'read-tree with empty .git/info/sparse-checkout' '
@@ -85,8 +85,8 @@
S subsub/added
EOF
test_cmp expected.swt result &&
- ! test -f init.t &&
- ! test -f sub/added
+ test_path_is_missing init.t &&
+ test_path_is_missing sub/added
'
test_expect_success 'match directories with trailing slash' '
@@ -101,8 +101,8 @@
read_tree_u_must_succeed -m -u HEAD &&
git ls-files -t > result &&
test_cmp expected.swt-noinit result &&
- test ! -f init.t &&
- test -f sub/added
+ test_path_is_missing init.t &&
+ test_path_is_file sub/added
'
test_expect_success 'match directories without trailing slash' '
@@ -110,8 +110,8 @@
read_tree_u_must_succeed -m -u HEAD &&
git ls-files -t >result &&
test_cmp expected.swt-noinit result &&
- test ! -f init.t &&
- test -f sub/added
+ test_path_is_missing init.t &&
+ test_path_is_file sub/added
'
test_expect_success 'match directories with negated patterns' '
@@ -129,9 +129,9 @@
git read-tree -m -u HEAD &&
git ls-files -t >result &&
test_cmp expected.swt-negation result &&
- test ! -f init.t &&
- test ! -f sub/added &&
- test -f sub/addedtoo
+ test_path_is_missing init.t &&
+ test_path_is_missing sub/added &&
+ test_path_is_file sub/addedtoo
'
test_expect_success 'match directories with negated patterns (2)' '
@@ -150,9 +150,9 @@
git read-tree -m -u HEAD &&
git ls-files -t >result &&
test_cmp expected.swt-negation2 result &&
- test -f init.t &&
- test -f sub/added &&
- test ! -f sub/addedtoo
+ test_path_is_file init.t &&
+ test_path_is_file sub/added &&
+ test_path_is_missing sub/addedtoo
'
test_expect_success 'match directory pattern' '
@@ -160,8 +160,8 @@
read_tree_u_must_succeed -m -u HEAD &&
git ls-files -t >result &&
test_cmp expected.swt-noinit result &&
- test ! -f init.t &&
- test -f sub/added
+ test_path_is_missing init.t &&
+ test_path_is_file sub/added
'
test_expect_success 'checkout area changes' '
@@ -176,22 +176,43 @@
read_tree_u_must_succeed -m -u HEAD &&
git ls-files -t >result &&
test_cmp expected.swt-nosub result &&
- test -f init.t &&
- test ! -f sub/added
+ test_path_is_file init.t &&
+ test_path_is_missing sub/added
'
test_expect_success 'read-tree updates worktree, absent case' '
echo sub/added >.git/info/sparse-checkout &&
git checkout -f top &&
read_tree_u_must_succeed -m -u HEAD^ &&
- test ! -f init.t
+ test_path_is_missing init.t
+'
+
+test_expect_success 'read-tree will not throw away dirty changes, non-sparse' '
+ echo "/*" >.git/info/sparse-checkout &&
+ read_tree_u_must_succeed -m -u HEAD &&
+
+ echo dirty >init.t &&
+ read_tree_u_must_fail -m -u HEAD^ &&
+ test_path_is_file init.t &&
+ grep -q dirty init.t
+'
+
+test_expect_success 'read-tree will not throw away dirty changes, sparse' '
+ echo "/*" >.git/info/sparse-checkout &&
+ read_tree_u_must_succeed -m -u HEAD &&
+
+ echo dirty >init.t &&
+ echo sub/added >.git/info/sparse-checkout &&
+ read_tree_u_must_fail -m -u HEAD^ &&
+ test_path_is_file init.t &&
+ grep -q dirty init.t
'
test_expect_success 'read-tree updates worktree, dirty case' '
echo sub/added >.git/info/sparse-checkout &&
git checkout -f top &&
echo dirty >init.t &&
- read_tree_u_must_succeed -m -u HEAD^ &&
+ read_tree_u_must_fail -m -u HEAD^ &&
grep -q dirty init.t &&
rm init.t
'
@@ -208,7 +229,7 @@
echo init.t >.git/info/sparse-checkout &&
git checkout -f removed &&
read_tree_u_must_succeed -u -m HEAD^ &&
- test ! -f sub/added
+ test_path_is_missing sub/added
'
test_expect_success 'read-tree adds to worktree, dirty case' '
@@ -227,7 +248,7 @@
echo init.t >.git/info/sparse-checkout &&
git checkout removed &&
git ls-files sub/added >result &&
- test ! -f sub/added &&
+ test_path_is_missing sub/added &&
test_must_be_empty result
'
diff --git a/t/t1012-read-tree-df.sh b/t/t1012-read-tree-df.sh
index 57f0770..cde93d2 100755
--- a/t/t1012-read-tree-df.sh
+++ b/t/t1012-read-tree-df.sh
@@ -2,6 +2,7 @@
test_description='read-tree D/F conflict corner cases'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh
diff --git a/t/t1013-read-tree-submodule.sh b/t/t1013-read-tree-submodule.sh
index b6df744..bfc90d4 100755
--- a/t/t1013-read-tree-submodule.sh
+++ b/t/t1013-read-tree-submodule.sh
@@ -6,7 +6,6 @@
. "$TEST_DIRECTORY"/lib-submodule-update.sh
KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
-KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
test_submodule_switch_recursing_with_args "read-tree -u -m"
diff --git a/t/t1014-read-tree-confusing.sh b/t/t1014-read-tree-confusing.sh
index da3376b..8ea8d36 100755
--- a/t/t1014-read-tree-confusing.sh
+++ b/t/t1014-read-tree-confusing.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='check that read-tree rejects confusing paths'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'create base tree' '
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index c2df75e..9fdbb2a 100755
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -11,9 +11,9 @@
test_expect_success setup '
long="a b c d e f g h i j k l m n o p q r s t u v w x y z" &&
- for c in $long; do echo $c; done >one &&
+ test_write_lines $long >one &&
mkdir dir &&
- for c in x y z $long a b c; do echo $c; done >dir/two &&
+ test_write_lines x y z $long a b c >dir/two &&
cp one original.one &&
cp dir/two original.two
'
@@ -22,7 +22,7 @@
git update-index --add one &&
case "$(git ls-files)" in
one) echo pass one ;;
- *) echo bad one; exit 1 ;;
+ *) echo bad one; return 1 ;;
esac &&
(
cd dir &&
@@ -34,7 +34,7 @@
) &&
case "$(git ls-files)" in
dir/two"$LF"one) echo pass both ;;
- *) echo bad; exit 1 ;;
+ *) echo bad; return 1 ;;
esac
'
@@ -57,7 +57,7 @@
echo d >>dir/two &&
case "$(git diff-files --name-only)" in
dir/two"$LF"one) echo pass top ;;
- *) echo bad top; exit 1 ;;
+ *) echo bad top; return 1 ;;
esac &&
# diff should not omit leading paths
(
diff --git a/t/t1022-read-tree-partial-clone.sh b/t/t1022-read-tree-partial-clone.sh
index a763e27..a9953b6 100755
--- a/t/t1022-read-tree-partial-clone.sh
+++ b/t/t1022-read-tree-partial-clone.sh
@@ -4,9 +4,6 @@
TEST_NO_CREATE_REPO=1
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./test-lib.sh
test_expect_success 'read-tree in partial clone prefetches in one batch' '
diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index 4bab6a5..4f3aa17 100755
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -17,6 +17,14 @@
export GIT_ALLOC_LIMIT
'
+test_expect_success 'enter "large" codepath, with small core.bigFileThreshold' '
+ test_when_finished "rm -rf repo" &&
+
+ git init --bare repo &&
+ echo large | git -C repo hash-object -w --stdin &&
+ git -C repo -c core.bigfilethreshold=4 fsck
+'
+
# add a large file with different settings
while read expect config
do
@@ -43,42 +51,32 @@
test_expect_success 'add a large file or two' '
git add large1 huge large2 &&
# make sure we got a single packfile and no loose objects
- bad= count=0 idx= &&
+ count=0 idx= &&
for p in .git/objects/pack/pack-*.pack
do
- count=$(( $count + 1 ))
- if test_path_is_file "$p" &&
- idx=${p%.pack}.idx && test_path_is_file "$idx"
- then
- continue
- fi
- bad=t
+ count=$(( $count + 1 )) &&
+ test_path_is_file "$p" &&
+ idx=${p%.pack}.idx &&
+ test_path_is_file "$idx" || return 1
done &&
- test -z "$bad" &&
test $count = 1 &&
cnt=$(git show-index <"$idx" | wc -l) &&
test $cnt = 2 &&
for l in .git/objects/$OIDPATH_REGEX
do
- test_path_is_file "$l" || continue
- bad=t
+ test_path_is_missing "$l" || return 1
done &&
- test -z "$bad" &&
# attempt to add another copy of the same
git add large3 &&
bad= count=0 &&
for p in .git/objects/pack/pack-*.pack
do
- count=$(( $count + 1 ))
- if test_path_is_file "$p" &&
- idx=${p%.pack}.idx && test_path_is_file "$idx"
- then
- continue
- fi
- bad=t
+ count=$(( $count + 1 )) &&
+ test_path_is_file "$p" &&
+ idx=${p%.pack}.idx &&
+ test_path_is_file "$idx" || return 1
done &&
- test -z "$bad" &&
test $count = 1
'
@@ -107,7 +105,7 @@
count=0 &&
for pi in .git/objects/pack/pack-*.idx
do
- test_path_is_file "$pi" && count=$(( $count + 1 ))
+ test_path_is_file "$pi" && count=$(( $count + 1 )) || return 1
done &&
test $count = 2 &&
@@ -120,7 +118,7 @@
for pi in .git/objects/pack/pack-*.idx
do
- git show-index <"$pi"
+ git show-index <"$pi" || return 1
done |
sed -e "s/^[0-9]* \([0-9a-f]*\) .*/\1/" |
sort >actual &&
diff --git a/t/t1051-large-conversion.sh b/t/t1051-large-conversion.sh
index 8b7640b..042b0e4 100755
--- a/t/t1051-large-conversion.sh
+++ b/t/t1051-large-conversion.sh
@@ -83,4 +83,30 @@
test_cmp small.clean large.clean
'
+# This smudge filter prepends 5GB of zeros to the file it checks out. This
+# ensures that smudging doesn't mangle large files on 64-bit Windows.
+test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
+ 'files over 4GB convert on output' '
+ test_commit test small "a small file" &&
+ small_size=$(test_file_size small) &&
+ test_config filter.makelarge.smudge \
+ "test-tool genzeros $((5*1024*1024*1024)) && cat" &&
+ echo "small filter=makelarge" >.gitattributes &&
+ rm small &&
+ git checkout -- small &&
+ size=$(test_file_size small) &&
+ test "$size" -eq $((5 * 1024 * 1024 * 1024 + $small_size))
+'
+
+# This clean filter writes down the size of input it receives. By checking against
+# the actual size, we ensure that cleaning doesn't mangle large files on 64-bit Windows.
+test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
+ 'files over 4GB convert on input' '
+ test-tool genzeros $((5*1024*1024*1024)) >big &&
+ test_config filter.checklarge.clean "wc -c >big.size" &&
+ echo "big filter=checklarge" >.gitattributes &&
+ git add big &&
+ test $(test_file_size big) -eq $(cat big.size)
+'
+
test_done
diff --git a/t/t1060-object-corruption.sh b/t/t1060-object-corruption.sh
index bc89371..5b8e47e 100755
--- a/t/t1060-object-corruption.sh
+++ b/t/t1060-object-corruption.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='see how we handle various forms of corruption'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# convert "1234abcd" to ".git/objects/12/34abcd"
diff --git a/t/t1090-sparse-checkout-scope.sh b/t/t1090-sparse-checkout-scope.sh
index 3deb490..d1833c0 100755
--- a/t/t1090-sparse-checkout-scope.sh
+++ b/t/t1090-sparse-checkout-scope.sh
@@ -52,6 +52,25 @@
test "$(cat b)" = "modified"
'
+test_expect_success 'skip-worktree on files outside sparse patterns' '
+ git sparse-checkout disable &&
+ git sparse-checkout set --no-cone "a*" &&
+ git checkout-index --all --ignore-skip-worktree-bits &&
+
+ git ls-files -t >output &&
+ ! grep ^S output >actual &&
+ test_must_be_empty actual &&
+
+ test_config sparse.expectFilesOutsideOfPatterns true &&
+ cat <<-\EOF >expect &&
+ S b
+ S c
+ EOF
+ git ls-files -t >output &&
+ grep ^S output >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'in partial clone, sparse checkout only fetches needed blobs' '
test_create_repo server &&
git clone "file://$(pwd)/server" client &&
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
index 8675ad5..de1ec89 100755
--- a/t/t1091-sparse-checkout-builtin.sh
+++ b/t/t1091-sparse-checkout-builtin.sh
@@ -5,6 +5,9 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+GIT_TEST_SPLIT_INDEX=false
+export GIT_TEST_SPLIT_INDEX
+
. ./test-lib.sh
list_files() {
@@ -41,7 +44,15 @@
)
'
-test_expect_success 'git sparse-checkout list (empty)' '
+test_expect_success 'git sparse-checkout list (not sparse)' '
+ test_must_fail git -C repo sparse-checkout list >list 2>err &&
+ test_must_be_empty list &&
+ test_i18ngrep "this worktree is not sparse" err
+'
+
+test_expect_success 'git sparse-checkout list (not sparse)' '
+ git -C repo sparse-checkout set &&
+ rm repo/.git/info/sparse-checkout &&
git -C repo sparse-checkout list >list 2>err &&
test_must_be_empty list &&
test_i18ngrep "this worktree is not sparse (sparse-checkout file may not exist)" err
@@ -61,7 +72,7 @@
'
test_expect_success 'git sparse-checkout init' '
- git -C repo sparse-checkout init &&
+ git -C repo sparse-checkout init --no-cone &&
cat >expect <<-\EOF &&
/*
!/*/
@@ -71,6 +82,12 @@
check_files repo a
'
+test_expect_success 'git sparse-checkout init in empty repo' '
+ test_when_finished rm -rf empty-repo blank-template &&
+ git init --template= empty-repo &&
+ git -C empty-repo sparse-checkout init
+'
+
test_expect_success 'git sparse-checkout list after init' '
git -C repo sparse-checkout list >actual &&
cat >expect <<-\EOF &&
@@ -94,6 +111,7 @@
test_expect_success 'clone --sparse' '
git clone --sparse "file://$(pwd)/repo" clone &&
+ git -C clone sparse-checkout reapply --no-cone &&
git -C clone sparse-checkout list >actual &&
cat >expect <<-\EOF &&
/*
@@ -103,6 +121,18 @@
check_files clone a
'
+test_expect_success 'switching to cone mode with non-cone mode patterns' '
+ git init bad-patterns &&
+ (
+ cd bad-patterns &&
+ git sparse-checkout init --no-cone &&
+ git sparse-checkout add dir &&
+ git config --worktree core.sparseCheckoutCone true &&
+ test_must_fail git sparse-checkout add dir 2>err &&
+ grep "existing sparse-checkout patterns do not use cone mode" err
+ )
+'
+
test_expect_success 'interaction with clone --no-checkout (unborn index)' '
git clone --no-checkout "file://$(pwd)/repo" clone_no_checkout &&
git -C clone_no_checkout sparse-checkout init --cone &&
@@ -126,9 +156,9 @@
'
test_expect_success 'set enables config' '
- git init empty-config &&
+ git init worktree-config &&
(
- cd empty-config &&
+ cd worktree-config &&
test_commit test file &&
test_path_is_missing .git/config.worktree &&
git sparse-checkout set nothing &&
@@ -165,12 +195,14 @@
'
test_expect_success 'add to sparse-checkout' '
- cat repo/.git/info/sparse-checkout >expect &&
+ cat repo/.git/info/sparse-checkout >old &&
+ test_when_finished cp old repo/.git/info/sparse-checkout &&
cat >add <<-\EOF &&
pattern1
/folder1/
pattern2
EOF
+ cat old >expect &&
cat add >>expect &&
git -C repo sparse-checkout add --stdin <add &&
git -C repo sparse-checkout list >actual &&
@@ -179,6 +211,21 @@
check_files repo "a folder1 folder2"
'
+test_expect_success 'worktree: add copies sparse-checkout patterns' '
+ cat repo/.git/info/sparse-checkout >old &&
+ test_when_finished cp old repo/.git/info/sparse-checkout &&
+ test_when_finished git -C repo worktree remove ../worktree &&
+ git -C repo sparse-checkout set --no-cone "/*" &&
+ git -C repo worktree add --quiet ../worktree 2>err &&
+ test_must_be_empty err &&
+ new="$(git -C worktree rev-parse --git-path info/sparse-checkout)" &&
+ test_path_is_file "$new" &&
+ test_cmp repo/.git/info/sparse-checkout "$new" &&
+ git -C worktree sparse-checkout set --cone &&
+ test_cmp_config -C worktree true core.sparseCheckoutCone &&
+ test_must_fail git -C repo core.sparseCheckoutCone
+'
+
test_expect_success 'cone mode: match patterns' '
git -C repo config --worktree core.sparseCheckoutCone true &&
rm -rf repo/a repo/folder1 repo/folder2 &&
@@ -206,21 +253,31 @@
'
test_expect_success 'sparse-index enabled and disabled' '
- (
- sane_unset GIT_TEST_SPLIT_INDEX &&
- git -C repo update-index --no-split-index &&
+ git -C repo sparse-checkout init --cone --sparse-index &&
+ test_cmp_config -C repo true index.sparse &&
+ git -C repo ls-files --sparse >sparse &&
+ git -C repo sparse-checkout disable &&
+ git -C repo ls-files --sparse >full &&
- git -C repo sparse-checkout init --cone --sparse-index &&
- test_cmp_config -C repo true index.sparse &&
- test-tool -C repo read-cache --table >cache &&
- grep " tree " cache &&
+ cat >expect <<-\EOF &&
+ @@ -1,4 +1,7 @@
+ a
+ -deep/
+ -folder1/
+ -folder2/
+ +deep/a
+ +deep/deeper1/a
+ +deep/deeper1/deepest/a
+ +deep/deeper2/a
+ +folder1/a
+ +folder2/a
+ EOF
- git -C repo sparse-checkout disable &&
- test-tool -C repo read-cache --table >cache &&
- ! grep " tree " cache &&
- git -C repo config --list >config &&
- ! grep index.sparse config
- )
+ diff -u sparse full | tail -n +3 >actual &&
+ test_cmp expect actual &&
+
+ git -C repo config --list >config &&
+ test_cmp_config -C repo false index.sparse
'
test_expect_success 'cone mode: init and set' '
@@ -346,7 +403,7 @@
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
+ git sparse-checkout set --no-cone file
)
'
@@ -368,7 +425,7 @@
git clone repo dirty &&
echo dirty >dirty/folder1/a &&
- git -C dirty sparse-checkout init 2>err &&
+ git -C dirty sparse-checkout init --no-cone 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 &&
@@ -379,7 +436,7 @@
test_must_be_empty err &&
git -C dirty reset --hard &&
- git -C dirty sparse-checkout init &&
+ git -C dirty sparse-checkout init --no-cone &&
git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* &&
test_path_is_missing dirty/folder1/a &&
git -C dirty sparse-checkout disable &&
@@ -395,7 +452,7 @@
EOF
git -C unmerged update-index --index-info <input &&
- git -C unmerged sparse-checkout init 2>err &&
+ git -C unmerged sparse-checkout init --no-cone 2>err &&
test_i18ngrep "warning.*The following paths are unmerged" err &&
git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
@@ -406,12 +463,12 @@
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 init --no-cone &&
git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* &&
git -C unmerged sparse-checkout disable
'
-test_expect_success 'sparse-checkout reapply' '
+test_expect_failure 'sparse-checkout reapply' '
git clone repo tweak &&
echo dirty >tweak/deep/deeper2/a &&
@@ -443,6 +500,8 @@
test_i18ngrep "warning.*The following paths are unmerged" err &&
test_path_is_file tweak/folder1/a &&
+ # NEEDSWORK: We are asking to update a file outside of the
+ # sparse-checkout cone, but this is no longer allowed.
git -C tweak add folder1/a &&
git -C tweak sparse-checkout reapply 2>err &&
test_must_be_empty err &&
@@ -452,6 +511,37 @@
git -C tweak sparse-checkout disable
'
+test_expect_success 'reapply can handle config options' '
+ git -C repo sparse-checkout init --cone --no-sparse-index &&
+ git -C repo config --worktree --list >actual &&
+ cat >expect <<-\EOF &&
+ core.sparsecheckout=true
+ core.sparsecheckoutcone=true
+ index.sparse=false
+ EOF
+ test_cmp expect actual &&
+
+ git -C repo sparse-checkout reapply --no-cone --no-sparse-index &&
+ git -C repo config --worktree --list >actual &&
+ cat >expect <<-\EOF &&
+ core.sparsecheckout=true
+ core.sparsecheckoutcone=false
+ index.sparse=false
+ EOF
+ test_cmp expect actual &&
+
+ git -C repo sparse-checkout reapply --cone --sparse-index &&
+ git -C repo config --worktree --list >actual &&
+ cat >expect <<-\EOF &&
+ core.sparsecheckout=true
+ core.sparsecheckoutcone=true
+ index.sparse=true
+ EOF
+ test_cmp expect actual &&
+
+ git -C repo 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 &&
@@ -481,17 +571,17 @@
'
test_expect_success 'different sparse-checkouts with worktrees' '
+ git -C repo sparse-checkout set --cone deep folder1 &&
git -C repo worktree add --detach ../worktree &&
- check_files worktree "a deep folder1 folder2" &&
- git -C worktree sparse-checkout init --cone &&
- git -C repo sparse-checkout set folder1 &&
- git -C worktree sparse-checkout set deep/deeper1 &&
- check_files repo a folder1 &&
- check_files worktree a deep
+ check_files worktree "a deep folder1" &&
+ git -C repo sparse-checkout set --cone folder1 &&
+ git -C worktree sparse-checkout set --cone deep/deeper1 &&
+ check_files repo "a folder1" &&
+ check_files worktree "a deep"
'
test_expect_success 'set using filename keeps file on-disk' '
- git -C repo sparse-checkout set a deep &&
+ git -C repo sparse-checkout set --skip-checks a deep &&
cat >expect <<-\EOF &&
/*
!/*/
@@ -584,7 +674,7 @@
!/*/
something$c-else/
EOF
- check_read_tree_errors repo "a" "disabling cone pattern matching"
+ check_read_tree_errors repo "a" "disabling cone pattern matching" || return 1
done
'
@@ -602,7 +692,7 @@
git -C escaped reset --hard $COMMIT &&
check_files escaped "a deep folder1 folder2 zbad\\dir zdoes*exist" zglob[!a]? &&
git -C escaped sparse-checkout init --cone &&
- git -C escaped sparse-checkout set zbad\\dir/bogus "zdoes*not*exist" "zdoes*exist" "zglob[!a]?" &&
+ git -C escaped sparse-checkout set --skip-checks zbad\\dir/bogus "zdoes*not*exist" "zdoes*exist" "zglob[!a]?" &&
cat >expect <<-\EOF &&
/*
!/*/
@@ -706,4 +796,80 @@
test_cmp expect out
'
+test_expect_success 'malformed cone-mode patterns' '
+ git -C repo sparse-checkout init --cone &&
+ mkdir -p repo/foo/bar &&
+ touch repo/foo/bar/x repo/foo/y &&
+ cat >repo/.git/info/sparse-checkout <<-\EOF &&
+ /*
+ !/*/
+ /foo/
+ !/foo/*/
+ /foo/\*/
+ EOF
+
+ # Listing the patterns will notice the duplicate pattern and
+ # emit a warning. It will list the patterns directly instead
+ # of using the cone-mode translation to a set of directories.
+ git -C repo sparse-checkout list >actual 2>err &&
+ test_cmp repo/.git/info/sparse-checkout actual &&
+ grep "warning: your sparse-checkout file may have issues: pattern .* is repeated" err &&
+ grep "warning: disabling cone pattern matching" err
+'
+
+test_expect_success 'set from subdir pays attention to prefix' '
+ git -C repo sparse-checkout disable &&
+ git -C repo/deep sparse-checkout set --cone deeper2 ../folder1 &&
+
+ git -C repo sparse-checkout list >actual &&
+
+ cat >expect <<-\EOF &&
+ deep/deeper2
+ folder1
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'add from subdir pays attention to prefix' '
+ git -C repo sparse-checkout set --cone deep/deeper2 &&
+ git -C repo/deep sparse-checkout add deeper1/deepest ../folder1 &&
+
+ git -C repo sparse-checkout list >actual &&
+
+ cat >expect <<-\EOF &&
+ deep/deeper1/deepest
+ deep/deeper2
+ folder1
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'set from subdir in non-cone mode throws an error' '
+ git -C repo sparse-checkout disable &&
+ test_must_fail git -C repo/deep sparse-checkout set --no-cone deeper2 ../folder1 2>error &&
+
+ grep "run from the toplevel directory in non-cone mode" error
+'
+
+test_expect_success 'set from subdir in non-cone mode throws an error' '
+ git -C repo sparse-checkout set --no-cone deep/deeper2 &&
+ test_must_fail git -C repo/deep sparse-checkout add deeper1/deepest ../folder1 2>error &&
+
+ grep "run from the toplevel directory in non-cone mode" error
+'
+
+test_expect_success 'by default, cone mode will error out when passed files' '
+ git -C repo sparse-checkout reapply --cone &&
+ test_must_fail git -C repo sparse-checkout add .gitignore 2>error &&
+
+ grep ".gitignore.*is not a directory" error
+'
+
+test_expect_success 'by default, non-cone mode will warn on individual files' '
+ git -C repo sparse-checkout reapply --no-cone &&
+ git -C repo sparse-checkout add .gitignore 2>warning &&
+
+ grep "pass a leading slash before paths.*if you want a single file" warning
+'
+
test_done
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index 886e787..f9f8c98 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -16,9 +16,13 @@
echo "after deep" >e &&
echo "after folder1" >g &&
echo "after x" >z &&
- mkdir folder1 folder2 deep x &&
+ mkdir folder1 folder2 deep before x &&
+ echo "before deep" >before/a &&
+ echo "before deep again" >before/b &&
mkdir deep/deeper1 deep/deeper2 deep/before deep/later &&
mkdir deep/deeper1/deepest &&
+ mkdir deep/deeper1/deepest2 &&
+ mkdir deep/deeper1/deepest3 &&
echo "after deeper1" >deep/e &&
echo "after deepest" >deep/deeper1/e &&
cp a folder1 &&
@@ -30,7 +34,9 @@
cp a deep/deeper2 &&
cp a deep/later &&
cp a deep/deeper1/deepest &&
- cp -r deep/deeper1/deepest deep/deeper2 &&
+ cp a deep/deeper1/deepest2 &&
+ cp a deep/deeper1/deepest3 &&
+ cp -r deep/deeper1/ deep/deeper2 &&
mkdir deep/deeper1/0 &&
mkdir deep/deeper1/0/0 &&
touch deep/deeper1/0/1 &&
@@ -126,6 +132,8 @@
git checkout -b deepest base &&
echo "updated deepest" >deep/deeper1/deepest/a &&
+ echo "updated deepest2" >deep/deeper1/deepest2/a &&
+ echo "updated deepest3" >deep/deeper1/deepest3/a &&
git commit -a -m "update deepest" &&
git checkout -f base &&
@@ -187,48 +195,106 @@
test_cmp sparse-checkout-err sparse-index-err
}
+test_sparse_unstaged () {
+ file=$1 &&
+ for repo in sparse-checkout sparse-index
+ do
+ # Skip "unmerged" paths
+ git -C $repo diff --staged --diff-filter=u -- "$file" >diff &&
+ test_must_be_empty diff || return 1
+ done
+}
+
+# Usage: test_sprase_checkout_set "<c1> ... <cN>" "<s1> ... <sM>"
+# Verifies that "git sparse-checkout set <c1> ... <cN>" succeeds and
+# leaves the sparse index in a state where <s1> ... <sM> are sparse
+# directories (and <c1> ... <cN> are not).
+test_sparse_checkout_set () {
+ CONE_DIRS=$1 &&
+ SPARSE_DIRS=$2 &&
+ git -C sparse-index sparse-checkout set --skip-checks $CONE_DIRS &&
+ git -C sparse-index ls-files --sparse --stage >cache &&
+
+ # Check that the directories outside of the sparse-checkout cone
+ # have sparse directory entries.
+ for dir in $SPARSE_DIRS
+ do
+ TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
+ grep "040000 $TREE 0 $dir/" cache \
+ || return 1
+ done &&
+
+ # Check that the directories in the sparse-checkout cone
+ # are not sparse directory entries.
+ for dir in $CONE_DIRS
+ do
+ # Allow TREE to not exist because
+ # $dir does not exist at HEAD.
+ TREE=$(git -C sparse-index rev-parse HEAD:$dir) ||
+ ! grep "040000 $TREE 0 $dir/" cache \
+ || return 1
+ done
+}
+
test_expect_success 'sparse-index contents' '
init_repos &&
- test-tool -C sparse-index read-cache --table >cache &&
- for dir in folder1 folder2 x
- do
- TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
- grep "040000 tree $TREE $dir/" cache \
- || return 1
- done &&
+ # Remove deep, add three other directories.
+ test_sparse_checkout_set \
+ "folder1 folder2 x" \
+ "before deep" &&
- git -C sparse-index sparse-checkout set folder1 &&
+ # Remove folder1, add deep
+ test_sparse_checkout_set \
+ "deep folder2 x" \
+ "before folder1" &&
- test-tool -C sparse-index read-cache --table >cache &&
- for dir in deep folder2 x
- do
- TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
- grep "040000 tree $TREE $dir/" cache \
- || return 1
- done &&
+ # Replace deep with deep/deeper2 (dropping deep/deeper1)
+ # Add folder1
+ test_sparse_checkout_set \
+ "deep/deeper2 folder1 folder2 x" \
+ "before deep/deeper1" &&
- git -C sparse-index sparse-checkout set deep/deeper1 &&
+ # Replace deep/deeper2 with deep/deeper1
+ # Replace folder1 with folder1/0/0
+ # Replace folder2 with non-existent folder2/2/3
+ # Add non-existent "bogus"
+ test_sparse_checkout_set \
+ "bogus deep/deeper1 folder1/0/0 folder2/2/3 x" \
+ "before deep/deeper2 folder2/0" &&
- test-tool -C sparse-index read-cache --table >cache &&
- for dir in deep/deeper2 folder1 folder2 x
- do
- TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
- grep "040000 tree $TREE $dir/" cache \
- || return 1
- done &&
+ # Drop down to only files at root
+ test_sparse_checkout_set \
+ "" \
+ "before deep folder1 folder2 x" &&
- # Disabling the sparse-index removes tree entries with full ones
+ # Disabling the sparse-index replaces tree entries with full ones
git -C sparse-index sparse-checkout init --no-sparse-index &&
-
- test-tool -C sparse-index read-cache --table >cache &&
- ! grep "040000 tree" cache &&
- test_sparse_match test-tool read-cache --table
+ test_sparse_match git ls-files --stage --sparse
'
test_expect_success 'expanded in-memory index matches full index' '
init_repos &&
- test_sparse_match test-tool read-cache --expand --table
+ test_sparse_match git ls-files --stage
+'
+
+test_expect_success 'root directory cannot be sparse' '
+ init_repos &&
+
+ # Remove all in-cone files and directories from the index, collapse index
+ # with `git sparse-checkout reapply`
+ git -C sparse-index rm -r . &&
+ git -C sparse-index sparse-checkout reapply &&
+
+ # Verify sparse directories still present, root directory is not sparse
+ cat >expect <<-EOF &&
+ before/
+ folder1/
+ folder2/
+ x/
+ EOF
+ git -C sparse-index ls-files --sparse >actual &&
+ test_cmp expect actual
'
test_expect_success 'status with options' '
@@ -247,6 +313,13 @@
test_all_match git status --porcelain=v2 -uno
'
+test_expect_success 'status with diff in unexpanded sparse directory' '
+ init_repos &&
+ test_all_match git checkout rename-base &&
+ test_all_match git reset --soft rename-out-to-out &&
+ test_all_match git status --porcelain=v2
+'
+
test_expect_success 'status reports sparse-checkout' '
init_repos &&
git -C sparse-checkout status >full &&
@@ -291,6 +364,28 @@
test_all_match git checkout -
'
+test_expect_success 'deep changes during checkout' '
+ init_repos &&
+
+ test_sparse_match git sparse-checkout set deep/deeper1/deepest &&
+ test_all_match git checkout deepest &&
+ test_all_match git checkout base
+'
+
+test_expect_success 'add outside sparse cone' '
+ init_repos &&
+
+ run_on_sparse mkdir folder1 &&
+ run_on_sparse ../edit-contents folder1/a &&
+ run_on_sparse ../edit-contents folder1/newfile &&
+ test_sparse_match test_must_fail git add folder1/a &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/a &&
+ test_sparse_match test_must_fail git add folder1/newfile &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/newfile
+'
+
test_expect_success 'commit including unstaged changes' '
init_repos &&
@@ -332,25 +427,31 @@
write_script edit-contents <<-\EOF &&
echo text >>$1
EOF
- run_on_sparse ../edit-contents folder1/a &&
+ run_on_all ../edit-contents folder1/a &&
run_on_all ../edit-contents folder1/new &&
test_sparse_match git status --porcelain=v2 &&
# Adding the path outside of the sparse-checkout cone should fail.
test_sparse_match test_must_fail git add folder1/a &&
- test_sparse_match test_must_fail git add --refresh folder1/a &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/a &&
+ test_all_match git add --refresh folder1/a &&
+ test_must_be_empty sparse-checkout-err &&
+ test_sparse_unstaged folder1/a &&
+ test_sparse_match test_must_fail git add folder1/new &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/new &&
+ test_sparse_match git add --sparse folder1/a &&
+ test_sparse_match git add --sparse folder1/new &&
- # NEEDSWORK: Adding a newly-tracked file outside the cone succeeds
- test_sparse_match git add folder1/new &&
-
- test_all_match git add . &&
+ test_all_match git add --sparse . &&
test_all_match git status --porcelain=v2 &&
test_all_match git commit -m folder1/new &&
test_all_match git rev-parse HEAD^{tree} &&
run_on_all ../edit-contents folder1/newer &&
- test_all_match git add folder1/ &&
+ test_all_match git add --sparse folder1/ &&
test_all_match git status --porcelain=v2 &&
test_all_match git commit -m folder1/newer &&
test_all_match git rev-parse HEAD^{tree}
@@ -371,7 +472,7 @@
test_all_match git reset --hard update-folder2
'
-test_expect_success 'diff --staged' '
+test_expect_success 'diff --cached' '
init_repos &&
write_script edit-contents <<-\EOF &&
@@ -380,10 +481,10 @@
run_on_all ../edit-contents &&
test_all_match git diff &&
- test_all_match git diff --staged &&
+ test_all_match git diff --cached &&
test_all_match git add README.md &&
test_all_match git diff &&
- test_all_match git diff --staged
+ test_all_match git diff --cached
'
# NEEDSWORK: sparse-checkout behaves differently from full-checkout when
@@ -400,8 +501,8 @@
test_all_match git checkout rename-base &&
test_all_match git checkout $branch -- . &&
test_all_match git status --porcelain=v2 &&
- test_all_match git diff --staged --no-renames &&
- test_all_match git diff --staged --find-renames || return 1
+ test_all_match git diff --cached --no-renames &&
+ test_all_match git diff --cached --find-renames || return 1
done
'
@@ -420,8 +521,8 @@
test_all_match git checkout $branch &&
test_all_match git checkout rename-base -- . &&
test_all_match git status --porcelain=v2 &&
- test_all_match git diff --staged --no-renames &&
- test_all_match git diff --staged --find-renames || return 1
+ test_all_match git diff --cached --no-renames &&
+ test_all_match git diff --cached --find-renames || return 1
done
'
@@ -442,49 +543,408 @@
test_expect_success 'blame with pathspec inside sparse definition' '
init_repos &&
- test_all_match git blame a &&
- test_all_match git blame deep/a &&
- test_all_match git blame deep/deeper1/a &&
- test_all_match git blame deep/deeper1/deepest/a
+ for file in a \
+ deep/a \
+ deep/deeper1/a \
+ deep/deeper1/deepest/a
+ do
+ test_all_match git blame $file
+ done
'
-# TODO: blame currently does not support blaming files outside of the
-# sparse definition. It complains that the file doesn't exist locally.
-test_expect_failure 'blame with pathspec outside sparse definition' '
+# Without a revision specified, blame will error if passed any file that
+# is not present in the working directory (even if the file is tracked).
+# Here we just verify that this is also true with sparse checkouts.
+test_expect_success 'blame with pathspec outside sparse definition' '
init_repos &&
+ test_sparse_match git sparse-checkout set &&
- test_all_match git blame folder1/a &&
- test_all_match git blame folder2/a &&
- test_all_match git blame deep/deeper2/a &&
- test_all_match git blame deep/deeper2/deepest/a
+ for file in a \
+ deep/a \
+ deep/deeper1/a \
+ deep/deeper1/deepest/a
+ do
+ test_sparse_match test_must_fail git blame $file &&
+ cat >expect <<-EOF &&
+ fatal: Cannot lstat '"'"'$file'"'"': No such file or directory
+ EOF
+ # We compare sparse-checkout-err and sparse-index-err in
+ # `test_sparse_match`. Given we know they are the same, we
+ # only check the content of sparse-index-err here.
+ test_cmp expect sparse-index-err
+ done
'
-# NEEDSWORK: a sparse-checkout behaves differently from a full checkout
-# in this scenario, but it shouldn't.
-test_expect_failure 'checkout and reset (mixed)' '
+test_expect_success 'checkout and reset (mixed)' '
init_repos &&
test_all_match git checkout -b reset-test update-deep &&
test_all_match git reset deepest &&
- test_all_match git reset update-folder1 &&
- test_all_match git reset update-folder2
+
+ # Because skip-worktree is preserved, resetting to update-folder1
+ # will show worktree changes for folder1/a in full-checkout, but not
+ # in sparse-checkout or sparse-index.
+ git -C full-checkout reset update-folder1 >full-checkout-out &&
+ test_sparse_match git reset update-folder1 &&
+ grep "M folder1/a" full-checkout-out &&
+ ! grep "M folder1/a" sparse-checkout-out &&
+ run_on_sparse test_path_is_missing folder1
'
-# NEEDSWORK: a sparse-checkout behaves differently from a full checkout
-# in this scenario, but it shouldn't.
-test_expect_success 'checkout and reset (mixed) [sparse]' '
+test_expect_success 'checkout and reset (merge)' '
init_repos &&
- test_sparse_match git checkout -b reset-test update-deep &&
- test_sparse_match git reset deepest &&
- test_sparse_match git reset update-folder1 &&
- test_sparse_match git reset update-folder2
+ write_script edit-contents <<-\EOF &&
+ echo text >>$1
+ EOF
+
+ test_all_match git checkout -b reset-test update-deep &&
+ run_on_all ../edit-contents a &&
+ test_all_match git reset --merge deepest &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git reset --hard update-deep &&
+ run_on_all ../edit-contents deep/a &&
+ test_all_match test_must_fail git reset --merge deepest
+'
+
+test_expect_success 'checkout and reset (keep)' '
+ init_repos &&
+
+ write_script edit-contents <<-\EOF &&
+ echo text >>$1
+ EOF
+
+ test_all_match git checkout -b reset-test update-deep &&
+ run_on_all ../edit-contents a &&
+ test_all_match git reset --keep deepest &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git reset --hard update-deep &&
+ run_on_all ../edit-contents deep/a &&
+ test_all_match test_must_fail git reset --keep deepest
+'
+
+test_expect_success 'reset with pathspecs inside sparse definition' '
+ init_repos &&
+
+ write_script edit-contents <<-\EOF &&
+ echo text >>$1
+ EOF
+
+ test_all_match git checkout -b reset-test update-deep &&
+ run_on_all ../edit-contents deep/a &&
+
+ test_all_match git reset base -- deep/a &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git reset base -- nonexistent-file &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git reset deepest -- deep &&
+ test_all_match git status --porcelain=v2
+'
+
+# Although the working tree differs between full and sparse checkouts after
+# reset, the state of the index is the same.
+test_expect_success 'reset with pathspecs outside sparse definition' '
+ init_repos &&
+ test_all_match git checkout -b reset-test base &&
+
+ test_sparse_match git reset update-folder1 -- folder1 &&
+ git -C full-checkout reset update-folder1 -- folder1 &&
+ test_all_match git ls-files -s -- folder1 &&
+
+ test_sparse_match git reset update-folder2 -- folder2/a &&
+ git -C full-checkout reset update-folder2 -- folder2/a &&
+ test_all_match git ls-files -s -- folder2/a
+'
+
+test_expect_success 'reset with wildcard pathspec' '
+ init_repos &&
+
+ test_all_match git reset update-deep -- deep\* &&
+ test_all_match git ls-files -s -- deep &&
+
+ test_all_match git reset deepest -- deep\*\*\* &&
+ test_all_match git ls-files -s -- deep &&
+
+ # The following `git reset`s result in updating the index on files with
+ # `skip-worktree` enabled. To avoid failing due to discrepencies in reported
+ # "modified" files, `test_sparse_match` reset is performed separately from
+ # "full-checkout" reset, then the index contents of all repos are verified.
+
+ test_sparse_match git reset update-folder1 -- \*/a &&
+ git -C full-checkout reset update-folder1 -- \*/a &&
+ test_all_match git ls-files -s -- deep/a folder1/a &&
+
+ test_sparse_match git reset update-folder2 -- folder\* &&
+ git -C full-checkout reset update-folder2 -- folder\* &&
+ test_all_match git ls-files -s -- folder10 folder1 folder2 &&
+
+ test_sparse_match git reset base -- folder1/\* &&
+ git -C full-checkout reset base -- folder1/\* &&
+ test_all_match git ls-files -s -- folder1
+'
+
+test_expect_success 'update-index modify outside sparse definition' '
+ init_repos &&
+
+ write_script edit-contents <<-\EOF &&
+ echo text >>$1
+ EOF
+
+ # Create & modify folder1/a
+ # Note that this setup is a manual way of reaching the erroneous
+ # condition in which a `skip-worktree` enabled, outside-of-cone file
+ # exists on disk. It is used here to ensure `update-index` is stable
+ # and behaves predictably if such a condition occurs.
+ run_on_sparse mkdir -p folder1 &&
+ run_on_sparse cp ../initial-repo/folder1/a folder1/a &&
+ run_on_all ../edit-contents folder1/a &&
+
+ # If file has skip-worktree enabled, but the file is present, it is
+ # treated the same as if skip-worktree is disabled
+ test_all_match git status --porcelain=v2 &&
+ test_all_match git update-index folder1/a &&
+ test_all_match git status --porcelain=v2 &&
+
+ # When skip-worktree is disabled (even on files outside sparse cone), file
+ # is updated in the index
+ test_sparse_match git update-index --no-skip-worktree folder1/a &&
+ test_all_match git status --porcelain=v2 &&
+ test_all_match git update-index folder1/a &&
+ test_all_match git status --porcelain=v2
+'
+
+test_expect_success 'update-index --add outside sparse definition' '
+ init_repos &&
+
+ write_script edit-contents <<-\EOF &&
+ echo text >>$1
+ EOF
+
+ # Create folder1, add new file
+ run_on_sparse mkdir -p folder1 &&
+ run_on_all ../edit-contents folder1/b &&
+
+ # The *untracked* out-of-cone file is added to the index because it does
+ # not have a `skip-worktree` bit to signal that it should be ignored
+ # (unlike in `git add`, which will fail due to the file being outside
+ # the sparse checkout definition).
+ test_all_match git update-index --add folder1/b &&
+ test_all_match git status --porcelain=v2
+'
+
+# NEEDSWORK: `--remove`, unlike the rest of `update-index`, does not ignore
+# `skip-worktree` entries by default and will remove them from the index.
+# The `--ignore-skip-worktree-entries` flag must be used in conjunction with
+# `--remove` to ignore the `skip-worktree` entries and prevent their removal
+# from the index.
+test_expect_success 'update-index --remove outside sparse definition' '
+ init_repos &&
+
+ # When --ignore-skip-worktree-entries is _not_ specified:
+ # out-of-cone, not-on-disk files are removed from the index
+ test_sparse_match git update-index --remove folder1/a &&
+ cat >expect <<-EOF &&
+ D folder1/a
+ EOF
+ test_sparse_match git diff --cached --name-status &&
+ test_cmp expect sparse-checkout-out &&
+
+ # Reset the state
+ test_all_match git reset --hard &&
+
+ # When --ignore-skip-worktree-entries is specified, out-of-cone
+ # (skip-worktree) files are ignored
+ test_sparse_match git update-index --remove --ignore-skip-worktree-entries folder1/a &&
+ test_sparse_match git diff --cached --name-status &&
+ test_must_be_empty sparse-checkout-out &&
+
+ # Reset the state
+ test_all_match git reset --hard &&
+
+ # --force-remove supercedes --ignore-skip-worktree-entries, removing
+ # a skip-worktree file from the index (and disk) when both are specified
+ # with --remove
+ test_sparse_match git update-index --force-remove --ignore-skip-worktree-entries folder1/a &&
+ cat >expect <<-EOF &&
+ D folder1/a
+ EOF
+ test_sparse_match git diff --cached --name-status &&
+ test_cmp expect sparse-checkout-out
+'
+
+test_expect_success 'update-index with directories' '
+ init_repos &&
+
+ # update-index will exit silently when provided with a directory name
+ # containing a trailing slash
+ test_all_match git update-index deep/ folder1/ &&
+ grep "Ignoring path deep/" sparse-checkout-err &&
+ grep "Ignoring path folder1/" sparse-checkout-err &&
+
+ # When update-index is given a directory name WITHOUT a trailing slash, it will
+ # behave in different ways depending on the status of the directory on disk:
+ # * if it exists, the command exits with an error ("add individual files instead")
+ # * if it does NOT exist (e.g., in a sparse-checkout), it is assumed to be a
+ # file and either triggers an error ("does not exist and --remove not passed")
+ # or is ignored completely (when using --remove)
+ test_all_match test_must_fail git update-index deep &&
+ run_on_all test_must_fail git update-index folder1 &&
+ test_must_fail git -C full-checkout update-index --remove folder1 &&
+ test_sparse_match git update-index --remove folder1 &&
+ test_all_match git status --porcelain=v2
+'
+
+test_expect_success 'update-index --again file outside sparse definition' '
+ init_repos &&
+
+ test_all_match git checkout -b test-reupdate &&
+
+ # Update HEAD without modifying the index to introduce a difference in
+ # folder1/a
+ test_sparse_match git reset --soft update-folder1 &&
+
+ # Because folder1/a differs in the index vs HEAD,
+ # `git update-index --no-skip-worktree --again` will effectively perform
+ # `git update-index --no-skip-worktree folder1/a` and remove the skip-worktree
+ # flag from folder1/a
+ test_sparse_match git update-index --no-skip-worktree --again &&
+ test_sparse_match git status --porcelain=v2 &&
+
+ cat >expect <<-EOF &&
+ D folder1/a
+ EOF
+ test_sparse_match git diff --name-status &&
+ test_cmp expect sparse-checkout-out
+'
+
+test_expect_success 'update-index --cacheinfo' '
+ init_repos &&
+
+ deep_a_oid=$(git -C full-checkout rev-parse update-deep:deep/a) &&
+ folder2_oid=$(git -C full-checkout rev-parse update-folder2:folder2) &&
+ folder1_a_oid=$(git -C full-checkout rev-parse update-folder1:folder1/a) &&
+
+ test_all_match git update-index --cacheinfo 100644 $deep_a_oid deep/a &&
+ test_all_match git status --porcelain=v2 &&
+
+ # Cannot add sparse directory, even in sparse index case
+ test_all_match test_must_fail git update-index --add --cacheinfo 040000 $folder2_oid folder2/ &&
+
+ # Sparse match only: the new outside-of-cone entry is added *without* skip-worktree,
+ # so `git status` reports it as "deleted" in the worktree
+ test_sparse_match git update-index --add --cacheinfo 100644 $folder1_a_oid folder1/a &&
+ test_sparse_match git status --porcelain=v2 &&
+ cat >expect <<-EOF &&
+ MD folder1/a
+ EOF
+ test_sparse_match git status --short -- folder1/a &&
+ test_cmp expect sparse-checkout-out &&
+
+ # To return folder1/a to "normal" for a sparse checkout (ignored &
+ # outside-of-cone), add the skip-worktree flag.
+ test_sparse_match git update-index --skip-worktree folder1/a &&
+ cat >expect <<-EOF &&
+ S folder1/a
+ EOF
+ test_sparse_match git ls-files -t -- folder1/a &&
+ test_cmp expect sparse-checkout-out
+'
+
+for MERGE_TREES in "base HEAD update-folder2" \
+ "update-folder1 update-folder2" \
+ "update-folder2"
+do
+ test_expect_success "'read-tree -mu $MERGE_TREES' with files outside sparse definition" '
+ init_repos &&
+
+ # Although the index matches, without --no-sparse-checkout, outside-of-
+ # definition files will not exist on disk for sparse checkouts
+ test_all_match git read-tree -mu $MERGE_TREES &&
+ test_all_match git status --porcelain=v2 &&
+ test_path_is_missing sparse-checkout/folder2 &&
+ test_path_is_missing sparse-index/folder2 &&
+
+ test_all_match git read-tree --reset -u HEAD &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
+ test_all_match git status --porcelain=v2 &&
+ test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
+ test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
+
+ '
+done
+
+test_expect_success 'read-tree --merge with edit/edit conflicts in sparse directories' '
+ init_repos &&
+
+ # Merge of multiple changes to same directory (but not same files) should
+ # succeed
+ test_all_match git read-tree -mu base rename-base update-folder1 &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git reset --hard &&
+
+ test_all_match git read-tree -mu rename-base update-folder2 &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git reset --hard &&
+
+ test_all_match test_must_fail git read-tree -mu base update-folder1 rename-out-to-in &&
+ test_all_match test_must_fail git read-tree -mu rename-out-to-in update-folder1
+'
+
+test_expect_success 'read-tree --prefix' '
+ init_repos &&
+
+ # If files differing between the index and target <commit-ish> exist
+ # inside the prefix, `read-tree --prefix` should fail
+ test_all_match test_must_fail git read-tree --prefix=deep/ deepest &&
+ test_all_match test_must_fail git read-tree --prefix=folder1/ update-folder1 &&
+
+ # If no differing index entries exist matching the prefix,
+ # `read-tree --prefix` updates the index successfully
+ test_all_match git rm -rf deep/deeper1/deepest/ &&
+ test_all_match git read-tree --prefix=deep/deeper1/deepest -u deepest &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git rm -rf --sparse folder1/ &&
+ test_all_match git read-tree --prefix=folder1/ -u update-folder1 &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git rm -rf --sparse folder2/0 &&
+ test_all_match git read-tree --prefix=folder2/0/ -u rename-out-to-out &&
+ test_all_match git status --porcelain=v2
+'
+
+test_expect_success 'read-tree --merge with directory-file conflicts' '
+ init_repos &&
+
+ test_all_match git checkout -b test-branch rename-base &&
+
+ # Although the index matches, without --no-sparse-checkout, outside-of-
+ # definition files will not exist on disk for sparse checkouts
+ test_sparse_match git read-tree -mu rename-out-to-out &&
+ test_sparse_match git status --porcelain=v2 &&
+ test_path_is_missing sparse-checkout/folder2 &&
+ test_path_is_missing sparse-index/folder2 &&
+
+ test_sparse_match git read-tree --reset -u HEAD &&
+ test_sparse_match git status --porcelain=v2 &&
+
+ test_sparse_match git read-tree -mu --no-sparse-checkout rename-out-to-out &&
+ test_sparse_match git status --porcelain=v2 &&
+ test_cmp sparse-checkout/folder2/0/1 sparse-index/folder2/0/1
'
test_expect_success 'merge, cherry-pick, and rebase' '
init_repos &&
- for OPERATION in "merge -m merge" cherry-pick rebase
+ for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
do
test_all_match git checkout -B temp update-deep &&
test_all_match git $OPERATION update-folder1 &&
@@ -494,11 +954,6 @@
done
'
-# NEEDSWORK: This test is documenting current behavior, but that
-# behavior can be confusing to users so there is desire to change it.
-# Right now, users might be using this flow to work through conflicts,
-# so any solution should present advice to users who try this sequence
-# of commands to follow whatever new method we create.
test_expect_success 'merge with conflict outside cone' '
init_repos &&
@@ -513,13 +968,19 @@
test_all_match git status --porcelain=v2 &&
# 2. Add the file with conflict markers
- test_all_match git add folder1/a &&
+ test_sparse_match test_must_fail git add folder1/a &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/a &&
+ test_all_match git add --sparse folder1/a &&
test_all_match git status --porcelain=v2 &&
# 3. Rename the file to another sparse filename and
# accept conflict markers as resolved content.
run_on_all mv folder2/a folder2/z &&
- test_all_match git add folder2 &&
+ test_sparse_match test_must_fail git add folder2 &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder2/z &&
+ test_all_match git add --sparse folder2 &&
test_all_match git status --porcelain=v2 &&
test_all_match git merge --continue &&
@@ -544,13 +1005,25 @@
test_all_match git status --porcelain=v2 &&
# 2. Add the file with conflict markers
- test_all_match git add folder1/a &&
+ # NEEDSWORK: Even though the merge conflict removed the
+ # SKIP_WORKTREE bit from the index entry for folder1/a, we should
+ # warn that this is a problematic add.
+ test_sparse_match test_must_fail git add folder1/a &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/a &&
+ test_all_match git add --sparse folder1/a &&
test_all_match git status --porcelain=v2 &&
# 3. Rename the file to another sparse filename and
# accept conflict markers as resolved content.
+ # NEEDSWORK: This mode now fails, because folder2/z is
+ # outside of the sparse-checkout cone and does not match an
+ # existing index entry with the SKIP_WORKTREE bit cleared.
run_on_all mv folder2/a folder2/z &&
- test_all_match git add folder2 &&
+ test_sparse_match test_must_fail git add folder2 &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder2/z &&
+ test_all_match git add --sparse folder2 &&
test_all_match git status --porcelain=v2 &&
test_all_match git $OPERATION --continue &&
@@ -593,6 +1066,123 @@
test_all_match test_must_fail git cherry-pick to-cherry-pick
'
+test_expect_success 'stash' '
+ init_repos &&
+
+ write_script edit-contents <<-\EOF &&
+ echo text >>$1
+ EOF
+
+ # Stash a sparse directory (folder1)
+ test_all_match git checkout -b test-branch rename-base &&
+ test_all_match git reset --soft rename-out-to-out &&
+ test_all_match git stash &&
+ test_all_match git status --porcelain=v2 &&
+
+ # Apply the sparse directory stash without reinstating the index
+ test_all_match git stash apply -q &&
+ test_all_match git status --porcelain=v2 &&
+
+ # Reset to state where stash can be applied
+ test_sparse_match git sparse-checkout reapply &&
+ test_all_match git reset --hard rename-out-to-out &&
+
+ # Apply the sparse directory stash *with* reinstating the index
+ test_all_match git stash apply --index -q &&
+ test_all_match git status --porcelain=v2 &&
+
+ # Reset to state where we will get a conflict applying the stash
+ test_sparse_match git sparse-checkout reapply &&
+ test_all_match git reset --hard update-folder1 &&
+
+ # Apply the sparse directory stash with conflicts
+ test_all_match test_must_fail git stash apply --index -q &&
+ test_all_match test_must_fail git stash apply -q &&
+ test_all_match git status --porcelain=v2 &&
+
+ # Reset to base branch
+ test_sparse_match git sparse-checkout reapply &&
+ test_all_match git reset --hard base &&
+
+ # Stash & unstash an untracked file outside of the sparse checkout
+ # definition.
+ run_on_sparse mkdir -p folder1 &&
+ run_on_all ../edit-contents folder1/new &&
+ test_all_match git stash -u &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git stash pop -q &&
+ test_all_match git status --porcelain=v2
+'
+
+test_expect_success 'checkout-index inside sparse definition' '
+ init_repos &&
+
+ run_on_all rm -f deep/a &&
+ test_all_match git checkout-index -- deep/a &&
+ test_all_match git status --porcelain=v2 &&
+
+ echo test >>new-a &&
+ run_on_all cp ../new-a a &&
+ test_all_match test_must_fail git checkout-index -- a &&
+ test_all_match git checkout-index -f -- a &&
+ test_all_match git status --porcelain=v2
+'
+
+test_expect_success 'checkout-index outside sparse definition' '
+ init_repos &&
+
+ # Without --ignore-skip-worktree-bits, outside-of-cone files will trigger
+ # an error
+ test_sparse_match test_must_fail git checkout-index -- folder1/a &&
+ test_i18ngrep "folder1/a has skip-worktree enabled" sparse-checkout-err &&
+ test_path_is_missing folder1/a &&
+
+ # With --ignore-skip-worktree-bits, outside-of-cone files are checked out
+ test_sparse_match git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
+ test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
+ test_cmp sparse-checkout/folder1/a full-checkout/folder1/a &&
+
+ run_on_sparse rm -rf folder1 &&
+ echo test >new-a &&
+ run_on_sparse mkdir -p folder1 &&
+ run_on_all cp ../new-a folder1/a &&
+
+ test_all_match test_must_fail git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
+ test_all_match git checkout-index -f --ignore-skip-worktree-bits -- folder1/a &&
+ test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
+ test_cmp sparse-checkout/folder1/a full-checkout/folder1/a
+'
+
+test_expect_success 'checkout-index with folders' '
+ init_repos &&
+
+ # Inside checkout definition
+ test_all_match test_must_fail git checkout-index -f -- deep/ &&
+
+ # Outside checkout definition
+ # Note: although all tests fail (as expected), the messaging differs. For
+ # non-sparse index checkouts, the error is that the "file" does not appear
+ # in the index; for sparse checkouts, the error is explicitly that the
+ # entry is a sparse directory.
+ run_on_all test_must_fail git checkout-index -f -- folder1/ &&
+ test_cmp full-checkout-err sparse-checkout-err &&
+ ! test_cmp full-checkout-err sparse-index-err &&
+ grep "is a sparse directory" sparse-index-err
+'
+
+test_expect_success 'checkout-index --all' '
+ init_repos &&
+
+ test_all_match git checkout-index --all &&
+ test_sparse_match test_path_is_missing folder1 &&
+
+ # --ignore-skip-worktree-bits will cause `skip-worktree` files to be
+ # checked out, causing the outside-of-cone `folder1` to exist on-disk
+ test_all_match git checkout-index --ignore-skip-worktree-bits --all &&
+ test_all_match test_path_exists folder1
+'
+
test_expect_success 'clean' '
init_repos &&
@@ -602,30 +1192,77 @@
test_all_match git commit -m "ignore bogus files" &&
run_on_sparse mkdir folder1 &&
+ run_on_all mkdir -p deep/untracked-deep &&
run_on_all touch folder1/bogus &&
+ run_on_all touch folder1/untracked &&
+ run_on_all touch deep/untracked-deep/bogus &&
+ run_on_all touch deep/untracked-deep/untracked &&
test_all_match git status --porcelain=v2 &&
test_all_match git clean -f &&
test_all_match git status --porcelain=v2 &&
test_sparse_match ls &&
test_sparse_match ls folder1 &&
+ run_on_all test_path_exists folder1/bogus &&
+ run_on_all test_path_is_missing folder1/untracked &&
+ run_on_all test_path_exists deep/untracked-deep/bogus &&
+ run_on_all test_path_exists deep/untracked-deep/untracked &&
+
+ test_all_match git clean -fd &&
+ test_all_match git status --porcelain=v2 &&
+ test_sparse_match ls &&
+ test_sparse_match ls folder1 &&
+ run_on_all test_path_exists folder1/bogus &&
+ run_on_all test_path_exists deep/untracked-deep/bogus &&
+ run_on_all test_path_is_missing deep/untracked-deep/untracked &&
test_all_match git clean -xf &&
test_all_match git status --porcelain=v2 &&
test_sparse_match ls &&
test_sparse_match ls folder1 &&
+ run_on_all test_path_is_missing folder1/bogus &&
+ run_on_all test_path_exists deep/untracked-deep/bogus &&
test_all_match git clean -xdf &&
test_all_match git status --porcelain=v2 &&
test_sparse_match ls &&
test_sparse_match ls folder1 &&
+ run_on_all test_path_is_missing deep/untracked-deep/bogus &&
test_sparse_match test_path_is_dir folder1
'
+for builtin in show rev-parse
+do
+ test_expect_success "$builtin (cached blobs/trees)" "
+ init_repos &&
+
+ test_all_match git $builtin :a &&
+ test_all_match git $builtin :deep/a &&
+ test_sparse_match git $builtin :folder1/a &&
+
+ # The error message differs depending on whether
+ # the directory exists in the worktree.
+ test_all_match test_must_fail git $builtin :deep/ &&
+ test_must_fail git -C full-checkout $builtin :folder1/ &&
+ test_sparse_match test_must_fail git $builtin :folder1/ &&
+
+ # Change the sparse cone for an extra case:
+ run_on_sparse git sparse-checkout set deep/deeper1 &&
+
+ # deep/deeper2 is a sparse directory in the sparse index.
+ test_sparse_match test_must_fail git $builtin :deep/deeper2/ &&
+
+ # deep/deeper2/deepest is not in the sparse index, but
+ # will trigger an index expansion.
+ test_sparse_match test_must_fail git $builtin :deep/deeper2/deepest/
+ "
+done
+
test_expect_success 'submodule handling' '
init_repos &&
+ test_sparse_match git sparse-checkout add modules &&
test_all_match mkdir modules &&
test_all_match touch modules/a &&
test_all_match git add modules &&
@@ -635,32 +1272,77 @@
test_all_match git commit -m "add submodule" &&
# having a submodule prevents "modules" from collapse
- test-tool -C sparse-index read-cache --table >cache &&
- grep "100644 blob .* modules/a" cache &&
- grep "160000 commit $(git -C initial-repo rev-parse HEAD) modules/sub" cache
+ test_sparse_match git sparse-checkout set deep/deeper1 &&
+ git -C sparse-index ls-files --sparse --stage >cache &&
+ grep "100644 .* modules/a" cache &&
+ grep "160000 $(git -C initial-repo rev-parse HEAD) 0 modules/sub" cache
'
+# When working with a sparse index, some commands will need to expand the
+# index to operate properly. If those commands also write the index back
+# to disk, they need to convert the index to sparse before writing.
+# This test verifies that both of these events are logged in trace2 logs.
test_expect_success 'sparse-index is expanded and converted back' '
init_repos &&
- GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
- git -C sparse-index -c core.fsmonitor="" reset --hard &&
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+ git -C sparse-index reset -- folder1/a &&
test_region index convert_to_sparse trace2.txt &&
+ test_region index ensure_full_index trace2.txt &&
+
+ # ls-files expands on read, but does not write.
+ rm trace2.txt &&
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+ git -C sparse-index ls-files &&
test_region index ensure_full_index trace2.txt
'
+test_expect_success 'index.sparse disabled inline uses full index' '
+ init_repos &&
+
+ # When index.sparse is disabled inline with `git status`, the
+ # index is expanded at the beginning of the execution then never
+ # converted back to sparse. It is then written to disk as a full index.
+ rm -f trace2.txt &&
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+ git -C sparse-index -c index.sparse=false status &&
+ ! test_region index convert_to_sparse trace2.txt &&
+ test_region index ensure_full_index trace2.txt &&
+
+ # Since index.sparse is set to true at a repo level, the index
+ # is converted from full to sparse when read, then never expanded
+ # over the course of `git status`. It is written to disk as a sparse
+ # index.
+ rm -f trace2.txt &&
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+ git -C sparse-index status &&
+ test_region index convert_to_sparse trace2.txt &&
+ ! test_region index ensure_full_index trace2.txt &&
+
+ # Now that the index has been written to disk as sparse, it is not
+ # converted to sparse (or expanded to full) when read by `git status`.
+ rm -f trace2.txt &&
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+ git -C sparse-index status &&
+ ! test_region index convert_to_sparse trace2.txt &&
+ ! test_region index ensure_full_index trace2.txt
+'
+
ensure_not_expanded () {
rm -f trace2.txt &&
- echo >>sparse-index/untracked.txt &&
+ if test -z "$WITHOUT_UNTRACKED_TXT"
+ then
+ echo >>sparse-index/untracked.txt
+ fi &&
if test "$1" = "!"
then
shift &&
test_must_fail env \
- GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
git -C sparse-index "$@" || return 1
else
- GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
git -C sparse-index "$@" || return 1
fi &&
test_region ! index ensure_full_index trace2.txt
@@ -670,6 +1352,7 @@
init_repos &&
ensure_not_expanded status &&
+ ensure_not_expanded ls-files --sparse &&
ensure_not_expanded commit --allow-empty -m empty &&
echo >>sparse-index/a &&
ensure_not_expanded commit -a -m a &&
@@ -681,9 +1364,9 @@
ensure_not_expanded checkout - &&
ensure_not_expanded switch rename-out-to-out &&
ensure_not_expanded switch - &&
- git -C sparse-index reset --hard &&
+ ensure_not_expanded reset --hard &&
ensure_not_expanded checkout rename-out-to-out -- deep/deeper1 &&
- git -C sparse-index reset --hard &&
+ ensure_not_expanded reset --hard &&
ensure_not_expanded restore -s rename-out-to-out -- deep/deeper1 &&
echo >>sparse-index/README.md &&
@@ -693,6 +1376,38 @@
echo >>sparse-index/untracked.txt &&
ensure_not_expanded add . &&
+ ensure_not_expanded checkout-index -f a &&
+ ensure_not_expanded checkout-index -f --all &&
+ for ref in update-deep update-folder1 update-folder2 update-deep
+ do
+ echo >>sparse-index/README.md &&
+ ensure_not_expanded reset --hard $ref || return 1
+ done &&
+
+ ensure_not_expanded reset --mixed base &&
+ ensure_not_expanded reset --hard update-deep &&
+ ensure_not_expanded reset --keep base &&
+ ensure_not_expanded reset --merge update-deep &&
+ ensure_not_expanded reset --hard &&
+
+ ensure_not_expanded reset base -- deep/a &&
+ ensure_not_expanded reset base -- nonexistent-file &&
+ ensure_not_expanded reset deepest -- deep &&
+
+ # Although folder1 is outside the sparse definition, it exists as a
+ # directory entry in the index, so the pathspec will not force the
+ # index to be expanded.
+ ensure_not_expanded reset deepest -- folder1 &&
+ ensure_not_expanded reset deepest -- folder1/ &&
+
+ # Wildcard identifies only in-cone files, no index expansion
+ ensure_not_expanded reset deepest -- deep/\* &&
+
+ # Wildcard identifies only full sparse directories, no index expansion
+ ensure_not_expanded reset deepest -- folder\* &&
+
+ ensure_not_expanded clean -fd &&
+
ensure_not_expanded checkout -f update-deep &&
test_config -C sparse-index pull.twohead ort &&
(
@@ -722,6 +1437,254 @@
)
'
+test_expect_success 'sparse-index is not expanded: stash' '
+ init_repos &&
+
+ echo >>sparse-index/a &&
+ ensure_not_expanded stash &&
+ ensure_not_expanded stash list &&
+ ensure_not_expanded stash show stash@{0} &&
+ ensure_not_expanded stash apply stash@{0} &&
+ ensure_not_expanded stash drop stash@{0} &&
+
+ echo >>sparse-index/deep/new &&
+ ensure_not_expanded stash -u &&
+ (
+ WITHOUT_UNTRACKED_TXT=1 &&
+ ensure_not_expanded stash pop
+ ) &&
+
+ ensure_not_expanded stash create &&
+ oid=$(git -C sparse-index stash create) &&
+ ensure_not_expanded stash store -m "test" $oid &&
+ ensure_not_expanded reset --hard &&
+ ensure_not_expanded stash pop
+'
+
+test_expect_success 'sparse index is not expanded: diff' '
+ init_repos &&
+
+ write_script edit-contents <<-\EOF &&
+ echo text >>$1
+ EOF
+
+ # Add file within cone
+ test_sparse_match git sparse-checkout set deep &&
+ run_on_all ../edit-contents deep/testfile &&
+ test_all_match git add deep/testfile &&
+ run_on_all ../edit-contents deep/testfile &&
+
+ test_all_match git diff &&
+ test_all_match git diff --cached &&
+ ensure_not_expanded diff &&
+ ensure_not_expanded diff --cached &&
+
+ # Add file outside cone
+ test_all_match git reset --hard &&
+ run_on_all mkdir newdirectory &&
+ run_on_all ../edit-contents newdirectory/testfile &&
+ test_sparse_match git sparse-checkout set newdirectory &&
+ test_all_match git add newdirectory/testfile &&
+ run_on_all ../edit-contents newdirectory/testfile &&
+ test_sparse_match git sparse-checkout set &&
+
+ test_all_match git diff &&
+ test_all_match git diff --cached &&
+ ensure_not_expanded diff &&
+ ensure_not_expanded diff --cached &&
+
+ # Merge conflict outside cone
+ # The sparse checkout will report a warning that is not in the
+ # full checkout, so we use `run_on_all` instead of
+ # `test_all_match`
+ run_on_all git reset --hard &&
+ test_all_match git checkout merge-left &&
+ test_all_match test_must_fail git merge merge-right &&
+
+ test_all_match git diff &&
+ test_all_match git diff --cached &&
+ ensure_not_expanded diff &&
+ ensure_not_expanded diff --cached
+'
+
+test_expect_success 'sparse index is not expanded: show and rev-parse' '
+ init_repos &&
+
+ ensure_not_expanded show :a &&
+ ensure_not_expanded show :deep/a &&
+ ensure_not_expanded rev-parse :a &&
+ ensure_not_expanded rev-parse :deep/a
+'
+
+test_expect_success 'sparse index is not expanded: update-index' '
+ init_repos &&
+
+ deep_a_oid=$(git -C full-checkout rev-parse update-deep:deep/a) &&
+ ensure_not_expanded update-index --cacheinfo 100644 $deep_a_oid deep/a &&
+
+ echo "test" >sparse-index/README.md &&
+ echo "test2" >sparse-index/a &&
+ rm -f sparse-index/deep/a &&
+
+ ensure_not_expanded update-index --add README.md &&
+ ensure_not_expanded update-index a &&
+ ensure_not_expanded update-index --remove deep/a &&
+
+ ensure_not_expanded reset --soft update-deep &&
+ ensure_not_expanded update-index --add --remove --again
+'
+
+test_expect_success 'sparse index is not expanded: blame' '
+ init_repos &&
+
+ for file in a \
+ deep/a \
+ deep/deeper1/a \
+ deep/deeper1/deepest/a
+ do
+ ensure_not_expanded blame $file
+ done
+'
+
+test_expect_success 'sparse index is not expanded: fetch/pull' '
+ init_repos &&
+
+ git -C sparse-index remote add full "file://$(pwd)/full-checkout" &&
+ ensure_not_expanded fetch full &&
+ git -C full-checkout commit --allow-empty -m "for pull merge" &&
+ git -C sparse-index commit --allow-empty -m "for pull merge" &&
+ ensure_not_expanded pull full base
+'
+
+test_expect_success 'sparse index is not expanded: read-tree' '
+ init_repos &&
+
+ ensure_not_expanded checkout -b test-branch update-folder1 &&
+ for MERGE_TREES in "base HEAD update-folder2" \
+ "base HEAD rename-base" \
+ "base update-folder2" \
+ "base rename-base" \
+ "update-folder2"
+ do
+ ensure_not_expanded read-tree -mu $MERGE_TREES &&
+ ensure_not_expanded reset --hard || return 1
+ done &&
+
+ rm -rf sparse-index/deep/deeper2 &&
+ ensure_not_expanded add . &&
+ ensure_not_expanded commit -m "test" &&
+
+ ensure_not_expanded read-tree --prefix=deep/deeper2 -u deepest
+'
+
+test_expect_success 'ls-files' '
+ init_repos &&
+
+ # Use a smaller sparse-checkout for reduced output
+ test_sparse_match git sparse-checkout set &&
+
+ # Behavior agrees by default. Sparse index is expanded.
+ test_all_match git ls-files &&
+
+ # With --sparse, the sparse index data changes behavior.
+ git -C sparse-index ls-files --sparse >actual &&
+
+ cat >expect <<-\EOF &&
+ a
+ before/
+ deep/
+ e
+ folder1-
+ folder1.x
+ folder1/
+ folder10
+ folder2/
+ g
+ x/
+ z
+ EOF
+
+ test_cmp expect actual &&
+
+ # With --sparse and no sparse index, nothing changes.
+ git -C sparse-checkout ls-files >dense &&
+ git -C sparse-checkout ls-files --sparse >sparse &&
+ test_cmp dense sparse &&
+
+ # Set up a strange condition of having a file edit
+ # outside of the sparse-checkout cone. We want to verify
+ # that all modes handle this the same, and detect the
+ # modification.
+ write_script edit-content <<-\EOF &&
+ mkdir -p folder1 &&
+ echo content >>folder1/a
+ EOF
+ run_on_all ../edit-content &&
+
+ test_all_match git ls-files --modified &&
+
+ git -C sparse-index ls-files --sparse --modified >sparse-index-out &&
+ cat >expect <<-\EOF &&
+ folder1/a
+ EOF
+ test_cmp expect sparse-index-out &&
+
+ # Add folder1 to the sparse-checkout cone and
+ # check that ls-files shows the expanded files.
+ test_sparse_match git sparse-checkout add folder1 &&
+ test_all_match git ls-files --modified &&
+
+ test_all_match git ls-files &&
+ git -C sparse-index ls-files --sparse >actual &&
+
+ cat >expect <<-\EOF &&
+ a
+ before/
+ deep/
+ e
+ folder1-
+ folder1.x
+ folder1/0/0/0
+ folder1/0/1
+ folder1/a
+ folder10
+ folder2/
+ g
+ x/
+ z
+ EOF
+
+ test_cmp expect actual &&
+
+ # Double-check index expansion is avoided
+ ensure_not_expanded ls-files --sparse
+'
+
+test_expect_success 'sparse index is not expanded: sparse-checkout' '
+ init_repos &&
+
+ ensure_not_expanded sparse-checkout set deep/deeper2 &&
+ ensure_not_expanded sparse-checkout set deep/deeper1 &&
+ ensure_not_expanded sparse-checkout set deep &&
+ ensure_not_expanded sparse-checkout add folder1 &&
+ ensure_not_expanded sparse-checkout set deep/deeper1 &&
+ ensure_not_expanded sparse-checkout set folder2 &&
+
+ # Demonstrate that the checks that "folder1/a" is a file
+ # do not cause a sparse-index expansion (since it is in the
+ # sparse-checkout cone).
+ echo >>sparse-index/folder2/a &&
+ git -C sparse-index add folder2/a &&
+
+ ensure_not_expanded sparse-checkout add folder1 &&
+
+ # Skip checks here, since deep/deeper1 is inside a sparse directory
+ # that must be expanded to check whether `deep/deeper1` is a file
+ # or not.
+ ensure_not_expanded sparse-checkout set --skip-checks deep/deeper1 &&
+ ensure_not_expanded sparse-checkout set
+'
+
# NEEDSWORK: a sparse-checkout behaves differently from a full checkout
# in this scenario, but it shouldn't.
test_expect_success 'reset mixed and checkout orphan' '
@@ -737,13 +1700,13 @@
# the sparse checkouts skip "adding" the other side of
# the conflict.
test_sparse_match git reset --mixed HEAD~1 &&
- test_sparse_match test-tool read-cache --table --expand &&
+ test_sparse_match git ls-files --stage &&
test_sparse_match git status --porcelain=v2 &&
# At this point, sparse-checkouts behave differently
# from the full-checkout.
test_sparse_match git checkout --orphan new-branch &&
- test_sparse_match test-tool read-cache --table --expand &&
+ test_sparse_match git ls-files --stage &&
test_sparse_match git status --porcelain=v2
'
diff --git a/t/t1100-commit-tree-options.sh b/t/t1100-commit-tree-options.sh
index ae66ba5..0f37a43 100755
--- a/t/t1100-commit-tree-options.sh
+++ b/t/t1100-commit-tree-options.sh
@@ -12,6 +12,7 @@
"flags first and then non flag arguments" command line.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >expected <<EOF
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 9ff46f3..7dd9b32 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -8,6 +8,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'clear default config' '
@@ -717,8 +718,8 @@
rm -f result &&
for i in 1 2 3 4
do
- git config --bool --get bool.true$i >>result
- git config --bool --get bool.false$i >>result
+ git config --bool --get bool.true$i >>result &&
+ git config --bool --get bool.false$i >>result || return 1
done &&
test_cmp expect result'
@@ -901,7 +902,7 @@
EOF
: "work around heredoc parsing bug fixed in dash 0.5.7 (in ec2c84d)" &&
{
- echo "$rel_out $(git config --expiry-date date.valid1)"
+ echo "$rel_out $(git config --expiry-date date.valid1)" &&
git config --expiry-date date.valid2 &&
git config --expiry-date date.valid3 &&
git config --expiry-date date.valid4 &&
@@ -2387,4 +2388,122 @@
test_must_fail git config --file=config --get-regexp --fixed-value fixed+ non-existent
'
+test_expect_success 'includeIf.hasconfig:remote.*.url' '
+ git init hasremoteurlTest &&
+ test_when_finished "rm -rf hasremoteurlTest" &&
+
+ cat >include-this <<-\EOF &&
+ [user]
+ this = this-is-included
+ EOF
+ cat >dont-include-that <<-\EOF &&
+ [user]
+ that = that-is-not-included
+ EOF
+ cat >>hasremoteurlTest/.git/config <<-EOF &&
+ [includeIf "hasconfig:remote.*.url:foourl"]
+ path = "$(pwd)/include-this"
+ [includeIf "hasconfig:remote.*.url:barurl"]
+ path = "$(pwd)/dont-include-that"
+ [remote "foo"]
+ url = foourl
+ EOF
+
+ echo this-is-included >expect-this &&
+ git -C hasremoteurlTest config --get user.this >actual-this &&
+ test_cmp expect-this actual-this &&
+
+ test_must_fail git -C hasremoteurlTest config --get user.that
+'
+
+test_expect_success 'includeIf.hasconfig:remote.*.url respects last-config-wins' '
+ git init hasremoteurlTest &&
+ test_when_finished "rm -rf hasremoteurlTest" &&
+
+ cat >include-two-three <<-\EOF &&
+ [user]
+ two = included-config
+ three = included-config
+ EOF
+ cat >>hasremoteurlTest/.git/config <<-EOF &&
+ [remote "foo"]
+ url = foourl
+ [user]
+ one = main-config
+ two = main-config
+ [includeIf "hasconfig:remote.*.url:foourl"]
+ path = "$(pwd)/include-two-three"
+ [user]
+ three = main-config
+ EOF
+
+ echo main-config >expect-main-config &&
+ echo included-config >expect-included-config &&
+
+ git -C hasremoteurlTest config --get user.one >actual &&
+ test_cmp expect-main-config actual &&
+
+ git -C hasremoteurlTest config --get user.two >actual &&
+ test_cmp expect-included-config actual &&
+
+ git -C hasremoteurlTest config --get user.three >actual &&
+ test_cmp expect-main-config actual
+'
+
+test_expect_success 'includeIf.hasconfig:remote.*.url globs' '
+ git init hasremoteurlTest &&
+ test_when_finished "rm -rf hasremoteurlTest" &&
+
+ printf "[user]\ndss = yes\n" >double-star-start &&
+ printf "[user]\ndse = yes\n" >double-star-end &&
+ printf "[user]\ndsm = yes\n" >double-star-middle &&
+ printf "[user]\nssm = yes\n" >single-star-middle &&
+ printf "[user]\nno = no\n" >no &&
+
+ cat >>hasremoteurlTest/.git/config <<-EOF &&
+ [remote "foo"]
+ url = https://foo/bar/baz
+ [includeIf "hasconfig:remote.*.url:**/baz"]
+ path = "$(pwd)/double-star-start"
+ [includeIf "hasconfig:remote.*.url:**/nomatch"]
+ path = "$(pwd)/no"
+ [includeIf "hasconfig:remote.*.url:https:/**"]
+ path = "$(pwd)/double-star-end"
+ [includeIf "hasconfig:remote.*.url:nomatch:/**"]
+ path = "$(pwd)/no"
+ [includeIf "hasconfig:remote.*.url:https:/**/baz"]
+ path = "$(pwd)/double-star-middle"
+ [includeIf "hasconfig:remote.*.url:https:/**/nomatch"]
+ path = "$(pwd)/no"
+ [includeIf "hasconfig:remote.*.url:https://*/bar/baz"]
+ path = "$(pwd)/single-star-middle"
+ [includeIf "hasconfig:remote.*.url:https://*/baz"]
+ path = "$(pwd)/no"
+ EOF
+
+ git -C hasremoteurlTest config --get user.dss &&
+ git -C hasremoteurlTest config --get user.dse &&
+ git -C hasremoteurlTest config --get user.dsm &&
+ git -C hasremoteurlTest config --get user.ssm &&
+ test_must_fail git -C hasremoteurlTest config --get user.no
+'
+
+test_expect_success 'includeIf.hasconfig:remote.*.url forbids remote url in such included files' '
+ git init hasremoteurlTest &&
+ test_when_finished "rm -rf hasremoteurlTest" &&
+
+ cat >include-with-url <<-\EOF &&
+ [remote "bar"]
+ url = barurl
+ EOF
+ cat >>hasremoteurlTest/.git/config <<-EOF &&
+ [includeIf "hasconfig:remote.*.url:foourl"]
+ path = "$(pwd)/include-with-url"
+ EOF
+
+ # test with any Git command
+ test_must_fail git -C hasremoteurlTest status 2>err &&
+ grep "fatal: remote URLs cannot be configured in file directly or indirectly included by includeIf.hasconfig:remote.*.url" err
+'
+
test_done
diff --git a/t/t1303-wacky-config.sh b/t/t1303-wacky-config.sh
index 0000e66..0506f3d 100755
--- a/t/t1303-wacky-config.sh
+++ b/t/t1303-wacky-config.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='Test wacky input to git config'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Leaving off the newline is intentional!
diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh
index ccbb116..5cde79e 100755
--- a/t/t1305-config-include.sh
+++ b/t/t1305-config-include.sh
@@ -1,6 +1,7 @@
#!/bin/sh
test_description='test config file include directives'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Force setup_explicit_git_dir() to run until the end. This is needed
diff --git a/t/t1307-config-blob.sh b/t/t1307-config-blob.sh
index 930dce0..0a7099d 100755
--- a/t/t1307-config-blob.sh
+++ b/t/t1307-config-blob.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='support for reading config from a blob'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'create config blob' '
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 88b119a..b38e158 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -2,6 +2,7 @@
test_description='Test git config-set API in different settings'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# 'check_config get_* section.key value' verifies that the entry for
diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
index b4a9158..537435b 100755
--- a/t/t1309-early-config.sh
+++ b/t/t1309-early-config.sh
@@ -2,6 +2,7 @@
test_description='Test read_early_config()'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'read early config' '
diff --git a/t/t1310-config-default.sh b/t/t1310-config-default.sh
index 6049d91..09b10c1 100755
--- a/t/t1310-config-default.sh
+++ b/t/t1310-config-default.sh
@@ -2,6 +2,7 @@
test_description='Test git config in different settings (with --default)'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'uses --default when entry missing' '
diff --git a/t/t1350-config-hooks-path.sh b/t/t1350-config-hooks-path.sh
index fa9647a..f6dc83e 100755
--- a/t/t1350-config-hooks-path.sh
+++ b/t/t1350-config-hooks-path.sh
@@ -6,11 +6,11 @@
test_expect_success 'set up a pre-commit hook in core.hooksPath' '
>actual &&
- mkdir -p .git/custom-hooks .git/hooks &&
+ mkdir -p .git/custom-hooks &&
write_script .git/custom-hooks/pre-commit <<-\EOF &&
echo CUSTOM >>actual
EOF
- write_script .git/hooks/pre-commit <<-\EOF
+ test_hook --setup pre-commit <<-\EOF
echo NORMAL >>actual
EOF
'
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 0d4f73a..cf58cf0 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -4,9 +4,6 @@
#
test_description='Test git update-ref and basic ref logging'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./test-lib.sh
Z=$ZERO_OID
@@ -321,8 +318,9 @@
$B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150860 +0000
EOF
test_expect_success "verifying $m's log (logged by touch)" '
- test_when_finished "rm -rf .git/$m .git/logs expect" &&
- test_cmp expect .git/logs/$m
+ test_when_finished "git update-ref -d $m && rm -rf .git/logs actual expect" &&
+ test-tool ref-store main for-each-reflog-ent $m >actual &&
+ test_cmp actual expect
'
test_expect_success "create $m (logged by config)" '
@@ -350,8 +348,9 @@
$B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 +0000
EOF
test_expect_success "verifying $m's log (logged by config)" '
- test_when_finished "rm -f .git/$m .git/logs/$m expect" &&
- test_cmp expect .git/logs/$m
+ test_when_finished "git update-ref -d $m && rm -rf .git/logs actual expect" &&
+ test-tool ref-store main for-each-reflog-ent $m >actual &&
+ test_cmp actual expect
'
test_expect_success 'set up for querying the reflog' '
@@ -467,7 +466,8 @@
$h_FIXED $h_MERGED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151100 +0000 commit (merge): Merged initial commit and a later commit.
EOF
test_expect_success 'git commit logged updates' '
- test_cmp expect .git/logs/$m
+ test-tool ref-store main for-each-reflog-ent $m >actual &&
+ test_cmp expect actual
'
unset h_TEST h_OTHER h_FIXED h_MERGED
@@ -1368,7 +1368,7 @@
(
for i in $(test_seq 33)
do
- echo "create refs/heads/$i HEAD"
+ echo "create refs/heads/$i HEAD" || exit 1
done >large_input &&
run_with_limited_open_files git update-ref --stdin <large_input &&
git rev-parse --verify -q refs/heads/33
@@ -1379,7 +1379,7 @@
(
for i in $(test_seq 33)
do
- echo "delete refs/heads/$i HEAD"
+ echo "delete refs/heads/$i HEAD" || exit 1
done >large_input &&
run_with_limited_open_files git update-ref --stdin <large_input &&
test_must_fail git rev-parse --verify -q refs/heads/33
diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh
index 132a1b8..9fb0b90 100755
--- a/t/t1401-symbolic-ref.sh
+++ b/t/t1401-symbolic-ref.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='basic symbolic-ref tests'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# If the tests munging HEAD fail, they can break detection of
diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh
index 17d3cc1..9252a58 100755
--- a/t/t1403-show-ref.sh
+++ b/t/t1403-show-ref.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -78,7 +79,7 @@
test_expect_success 'show-ref -d' '
{
echo $(git rev-parse refs/tags/A) refs/tags/A &&
- echo $(git rev-parse refs/tags/A^0) "refs/tags/A^{}"
+ echo $(git rev-parse refs/tags/A^0) "refs/tags/A^{}" &&
echo $(git rev-parse refs/tags/C) refs/tags/C
} >expect &&
git show-ref -d A C >actual &&
@@ -123,14 +124,14 @@
test_expect_success 'show-ref --heads, --tags, --head, pattern' '
for branch in B main side
do
- echo $(git rev-parse refs/heads/$branch) refs/heads/$branch
+ echo $(git rev-parse refs/heads/$branch) refs/heads/$branch || return 1
done >expect.heads &&
git show-ref --heads >actual &&
test_cmp expect.heads actual &&
for tag in A B C
do
- echo $(git rev-parse refs/tags/$tag) refs/tags/$tag
+ echo $(git rev-parse refs/tags/$tag) refs/tags/$tag || return 1
done >expect.tags &&
git show-ref --tags >actual &&
test_cmp expect.tags actual &&
@@ -148,7 +149,7 @@
{
echo $(git rev-parse HEAD) HEAD &&
- echo $(git rev-parse refs/heads/B) refs/heads/B
+ echo $(git rev-parse refs/heads/B) refs/heads/B &&
echo $(git rev-parse refs/tags/B) refs/tags/B
} >expect &&
git show-ref --head B >actual &&
@@ -156,8 +157,8 @@
{
echo $(git rev-parse HEAD) HEAD &&
- echo $(git rev-parse refs/heads/B) refs/heads/B
- echo $(git rev-parse refs/tags/B) refs/tags/B
+ echo $(git rev-parse refs/heads/B) refs/heads/B &&
+ echo $(git rev-parse refs/tags/B) refs/tags/B &&
echo $(git rev-parse refs/tags/B^0) "refs/tags/B^{}"
} >expect &&
git show-ref --head -d B >actual &&
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
index b729c1f..13c2b43 100755
--- a/t/t1404-update-ref-errors.sh
+++ b/t/t1404-update-ref-errors.sh
@@ -261,69 +261,69 @@
git update-ref --stdin
'
-test_expect_success 'D/F conflict prevents add long + delete short' '
+test_expect_success REFFILES 'D/F conflict prevents add long + delete short' '
df_test refs/df-al-ds --add-del foo/bar foo
'
-test_expect_success 'D/F conflict prevents add short + delete long' '
+test_expect_success REFFILES 'D/F conflict prevents add short + delete long' '
df_test refs/df-as-dl --add-del foo foo/bar
'
-test_expect_success 'D/F conflict prevents delete long + add short' '
+test_expect_success REFFILES 'D/F conflict prevents delete long + add short' '
df_test refs/df-dl-as --del-add foo/bar foo
'
-test_expect_success 'D/F conflict prevents delete short + add long' '
+test_expect_success REFFILES 'D/F conflict prevents delete short + add long' '
df_test refs/df-ds-al --del-add foo foo/bar
'
-test_expect_success 'D/F conflict prevents add long + delete short packed' '
+test_expect_success REFFILES 'D/F conflict prevents add long + delete short packed' '
df_test refs/df-al-dsp --pack --add-del foo/bar foo
'
-test_expect_success 'D/F conflict prevents add short + delete long packed' '
+test_expect_success REFFILES 'D/F conflict prevents add short + delete long packed' '
df_test refs/df-as-dlp --pack --add-del foo foo/bar
'
-test_expect_success 'D/F conflict prevents delete long packed + add short' '
+test_expect_success REFFILES 'D/F conflict prevents delete long packed + add short' '
df_test refs/df-dlp-as --pack --del-add foo/bar foo
'
-test_expect_success 'D/F conflict prevents delete short packed + add long' '
+test_expect_success REFFILES 'D/F conflict prevents delete short packed + add long' '
df_test refs/df-dsp-al --pack --del-add foo foo/bar
'
# Try some combinations involving symbolic refs...
-test_expect_success 'D/F conflict prevents indirect add long + delete short' '
+test_expect_success REFFILES 'D/F conflict prevents indirect add long + delete short' '
df_test refs/df-ial-ds --sym-add --add-del foo/bar foo
'
-test_expect_success 'D/F conflict prevents indirect add long + indirect delete short' '
+test_expect_success REFFILES 'D/F conflict prevents indirect add long + indirect delete short' '
df_test refs/df-ial-ids --sym-add --sym-del --add-del foo/bar foo
'
-test_expect_success 'D/F conflict prevents indirect add short + indirect delete long' '
+test_expect_success REFFILES 'D/F conflict prevents indirect add short + indirect delete long' '
df_test refs/df-ias-idl --sym-add --sym-del --add-del foo foo/bar
'
-test_expect_success 'D/F conflict prevents indirect delete long + indirect add short' '
+test_expect_success REFFILES 'D/F conflict prevents indirect delete long + indirect add short' '
df_test refs/df-idl-ias --sym-add --sym-del --del-add foo/bar foo
'
-test_expect_success 'D/F conflict prevents indirect add long + delete short packed' '
+test_expect_success REFFILES 'D/F conflict prevents indirect add long + delete short packed' '
df_test refs/df-ial-dsp --sym-add --pack --add-del foo/bar foo
'
-test_expect_success 'D/F conflict prevents indirect add long + indirect delete short packed' '
+test_expect_success REFFILES 'D/F conflict prevents indirect add long + indirect delete short packed' '
df_test refs/df-ial-idsp --sym-add --sym-del --pack --add-del foo/bar foo
'
-test_expect_success 'D/F conflict prevents add long + indirect delete short packed' '
+test_expect_success REFFILES 'D/F conflict prevents add long + indirect delete short packed' '
df_test refs/df-al-idsp --sym-del --pack --add-del foo/bar foo
'
-test_expect_success 'D/F conflict prevents indirect delete long packed + indirect add short' '
+test_expect_success REFFILES 'D/F conflict prevents indirect delete long packed + indirect add short' '
df_test refs/df-idlp-ias --sym-add --sym-del --pack --del-add foo/bar foo
'
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
index 49718b7..51f8291 100755
--- a/t/t1405-main-ref-store.sh
+++ b/t/t1405-main-ref-store.sh
@@ -17,8 +17,7 @@
test_expect_success REFFILES 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
N=`find .git/refs -type f | wc -l` &&
test "$N" != 0 &&
- ALL_OR_PRUNE_FLAG=3 &&
- $RUN pack-refs ${ALL_OR_PRUNE_FLAG} &&
+ $RUN pack-refs PACK_REFS_PRUNE,PACK_REFS_ALL &&
N=`find .git/refs -type f` &&
test -z "$N"
'
@@ -35,13 +34,18 @@
git rev-parse FOO -- &&
git rev-parse refs/tags/new-tag -- &&
m=$(git rev-parse main) &&
- REF_NO_DEREF=1 &&
- $RUN delete-refs $REF_NO_DEREF nothing FOO refs/tags/new-tag &&
+ $RUN delete-refs REF_NO_DEREF nothing FOO refs/tags/new-tag &&
test_must_fail git rev-parse --symbolic-full-name FOO &&
test_must_fail git rev-parse FOO -- &&
test_must_fail git rev-parse refs/tags/new-tag --
'
+# In reftable, we keep the reflogs around for deleted refs.
+test_expect_success !REFFILES 'delete-reflog(FOO, refs/tags/new-tag)' '
+ $RUN delete-reflog FOO &&
+ $RUN delete-reflog refs/tags/new-tag
+'
+
test_expect_success 'rename_refs(main, new-main)' '
git rev-parse main >expected &&
$RUN rename-ref refs/heads/main refs/heads/new-main &&
@@ -89,13 +93,13 @@
test_expect_success 'for_each_reflog_ent()' '
$RUN for-each-reflog-ent HEAD >actual &&
head -n1 actual | grep one &&
- tail -n2 actual | head -n1 | grep recreate-main
+ tail -n1 actual | grep recreate-main
'
test_expect_success 'for_each_reflog_ent_reverse()' '
$RUN for-each-reflog-ent-reverse HEAD >actual &&
head -n1 actual | grep recreate-main &&
- tail -n2 actual | head -n1 | grep one
+ tail -n1 actual | grep one
'
test_expect_success 'reflog_exists(HEAD)' '
@@ -107,8 +111,8 @@
test_must_fail git reflog exists HEAD
'
-test_expect_success 'create-reflog(HEAD)' '
- $RUN create-reflog HEAD 1 &&
+test_expect_success REFFILES 'create-reflog(HEAD)' '
+ $RUN create-reflog HEAD &&
git reflog exists HEAD
'
diff --git a/t/t1406-submodule-ref-store.sh b/t/t1406-submodule-ref-store.sh
index 0a87058..e6a7f73 100755
--- a/t/t1406-submodule-ref-store.sh
+++ b/t/t1406-submodule-ref-store.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
RUN="test-tool ref-store submodule:sub"
@@ -74,13 +75,13 @@
test_expect_success 'for_each_reflog_ent()' '
$RUN for-each-reflog-ent HEAD >actual &&
head -n1 actual | grep first &&
- tail -n2 actual | head -n1 | grep main.to.new
+ tail -n1 actual | grep main.to.new
'
test_expect_success 'for_each_reflog_ent_reverse()' '
$RUN for-each-reflog-ent-reverse HEAD >actual &&
head -n1 actual | grep main.to.new &&
- tail -n2 actual | head -n1 | grep first
+ tail -n1 actual | grep first
'
test_expect_success 'reflog_exists(HEAD)' '
@@ -92,7 +93,7 @@
'
test_expect_success 'create-reflog() not allowed' '
- test_must_fail $RUN create-reflog HEAD 1
+ test_must_fail $RUN create-reflog HEAD
'
test_done
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index d42f067..aa59954 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -106,6 +106,28 @@
test_line_count = 4 output
'
+test_expect_success 'correct usage on sub-command -h' '
+ test_expect_code 129 git reflog expire -h >err &&
+ grep "git reflog expire" err
+'
+
+test_expect_success 'correct usage on "git reflog show -h"' '
+ test_expect_code 129 git reflog show -h >err &&
+ grep -F "git reflog [show]" err
+'
+
+test_expect_success 'pass through -- to sub-command' '
+ test_when_finished "rm -rf repo" &&
+ git init repo &&
+ test_commit -C repo message --a-file contents dash-tag &&
+
+ git -C repo reflog show -- --does-not-exist >out &&
+ test_must_be_empty out &&
+ git -C repo reflog show >expect &&
+ git -C repo reflog show -- --a-file >actual &&
+ test_cmp expect actual
+'
+
test_expect_success rewind '
test_tick && git reset --hard HEAD~2 &&
test -f C &&
@@ -341,7 +363,7 @@
# Each line is 114 characters, so we need 75 to still have a few before the
# last 8K. The 89-character padding on the final entry lines up our
# newline exactly.
-test_expect_success SHA1 'parsing reverse reflogs at BUFSIZ boundaries' '
+test_expect_success REFFILES,SHA1 'parsing reverse reflogs at BUFSIZ boundaries' '
git checkout -b reflogskip &&
zf=$(test_oid zero_2) &&
ident="abc <xyz> 0000000001 +0000" &&
@@ -349,12 +371,12 @@
printf "$zf%02d $zf%02d %s\t" $i $(($i+1)) "$ident" &&
if test $i = 75; then
for j in $(test_seq 1 89); do
- printf X
+ printf X || return 1
done
else
printf X
fi &&
- printf "\n"
+ printf "\n" || return 1
done >.git/logs/refs/heads/reflogskip &&
git rev-parse reflogskip@{73} >actual &&
echo ${zf}03 >expect &&
@@ -418,8 +440,18 @@
test_commit -C link-wt foobar &&
test_tick &&
git reflog expire --verbose --all --expire=$test_tick &&
- test_must_be_empty .git/worktrees/link-wt/logs/HEAD
+ test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD >actual &&
+ test_must_be_empty actual
)
'
+test_expect_success REFFILES 'empty reflog' '
+ test_when_finished "rm -rf empty" &&
+ git init empty &&
+ test_commit -C empty A &&
+ >empty/.git/logs/refs/heads/foo &&
+ git -C empty reflog expire --all 2>err &&
+ test_must_be_empty err
+'
+
test_done
diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh
index 0bb319b..da581ec 100755
--- a/t/t1411-reflog-show.sh
+++ b/t/t1411-reflog-show.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
@@ -169,9 +170,4 @@
test_cmp expect actual
'
-test_expect_success 'reflog exists works' '
- git reflog exists refs/heads/main &&
- ! git reflog exists refs/heads/nonexistent
-'
-
test_done
diff --git a/t/t1412-reflog-loop.sh b/t/t1412-reflog-loop.sh
index 977603f..ff30874 100755
--- a/t/t1412-reflog-loop.sh
+++ b/t/t1412-reflog-loop.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='reflog walk shows repeated commits again'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup commits' '
diff --git a/t/t1415-worktree-refs.sh b/t/t1415-worktree-refs.sh
index a3e6ea0..3b53184 100755
--- a/t/t1415-worktree-refs.sh
+++ b/t/t1415-worktree-refs.sh
@@ -2,6 +2,7 @@
test_description='per-worktree refs'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t1416-ref-transaction-hooks.sh b/t/t1416-ref-transaction-hooks.sh
index 6c94102..2773172 100755
--- a/t/t1416-ref-transaction-hooks.sh
+++ b/t/t1416-ref-transaction-hooks.sh
@@ -8,7 +8,6 @@
. ./test-lib.sh
test_expect_success setup '
- mkdir -p .git/hooks &&
test_commit PRE &&
PRE_OID=$(git rev-parse PRE) &&
test_commit POST &&
@@ -16,9 +15,8 @@
'
test_expect_success 'hook allows updating ref if successful' '
- test_when_finished "rm .git/hooks/reference-transaction" &&
git reset --hard PRE &&
- write_script .git/hooks/reference-transaction <<-\EOF &&
+ test_hook reference-transaction <<-\EOF &&
echo "$*" >>actual
EOF
cat >expect <<-EOF &&
@@ -30,9 +28,8 @@
'
test_expect_success 'hook aborts updating ref in prepared state' '
- test_when_finished "rm .git/hooks/reference-transaction" &&
git reset --hard PRE &&
- write_script .git/hooks/reference-transaction <<-\EOF &&
+ test_hook reference-transaction <<-\EOF &&
if test "$1" = prepared
then
exit 1
@@ -43,9 +40,9 @@
'
test_expect_success 'hook gets all queued updates in prepared state' '
- test_when_finished "rm .git/hooks/reference-transaction actual" &&
+ test_when_finished "rm actual" &&
git reset --hard PRE &&
- write_script .git/hooks/reference-transaction <<-\EOF &&
+ test_hook reference-transaction <<-\EOF &&
if test "$1" = prepared
then
while read -r line
@@ -66,9 +63,9 @@
'
test_expect_success 'hook gets all queued updates in committed state' '
- test_when_finished "rm .git/hooks/reference-transaction actual" &&
+ test_when_finished "rm actual" &&
git reset --hard PRE &&
- write_script .git/hooks/reference-transaction <<-\EOF &&
+ test_hook reference-transaction <<-\EOF &&
if test "$1" = committed
then
while read -r line
@@ -86,9 +83,9 @@
'
test_expect_success 'hook gets all queued updates in aborted state' '
- test_when_finished "rm .git/hooks/reference-transaction actual" &&
+ test_when_finished "rm actual" &&
git reset --hard PRE &&
- write_script .git/hooks/reference-transaction <<-\EOF &&
+ test_hook reference-transaction <<-\EOF &&
if test "$1" = aborted
then
while read -r line
@@ -115,11 +112,11 @@
git init --bare target-repo.git &&
- write_script target-repo.git/hooks/reference-transaction <<-\EOF &&
+ test_hook -C target-repo.git reference-transaction <<-\EOF &&
echo $0 "$@" >>actual
EOF
- write_script target-repo.git/hooks/update <<-\EOF &&
+ test_hook -C target-repo.git update <<-\EOF &&
echo $0 "$@" >>actual
EOF
diff --git a/t/t1417-reflog-updateref.sh b/t/t1417-reflog-updateref.sh
new file mode 100755
index 0000000..14f13b5
--- /dev/null
+++ b/t/t1417-reflog-updateref.sh
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+test_description='git reflog --updateref'
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ git init -b main repo &&
+ (
+ cd repo &&
+
+ test_commit A &&
+ test_commit B &&
+ test_commit C &&
+
+ cp .git/logs/HEAD HEAD.old &&
+ git reset --hard HEAD~ &&
+ cp HEAD.old .git/logs/HEAD
+ )
+'
+
+test_reflog_updateref () {
+ exp=$1
+ shift
+ args="$@"
+
+ test_expect_success REFFILES "get '$exp' with '$args'" '
+ test_when_finished "rm -rf copy" &&
+ cp -R repo copy &&
+
+ (
+ cd copy &&
+
+ $args &&
+ git rev-parse $exp >expect &&
+ git rev-parse HEAD >actual &&
+
+ test_cmp expect actual
+ )
+ '
+}
+
+test_reflog_updateref B git reflog delete --updateref HEAD@{0}
+test_reflog_updateref B git reflog delete --updateref HEAD@{1}
+test_reflog_updateref C git reflog delete --updateref main@{0}
+test_reflog_updateref B git reflog delete --updateref main@{1}
+test_reflog_updateref B git reflog delete --updateref --rewrite HEAD@{0}
+test_reflog_updateref B git reflog delete --updateref --rewrite HEAD@{1}
+test_reflog_updateref C git reflog delete --updateref --rewrite main@{0}
+test_reflog_updateref B git reflog delete --updateref --rewrite main@{1}
+test_reflog_updateref B test_must_fail git reflog expire HEAD@{0}
+test_reflog_updateref B test_must_fail git reflog expire HEAD@{1}
+test_reflog_updateref B test_must_fail git reflog expire main@{0}
+test_reflog_updateref B test_must_fail git reflog expire main@{1}
+test_reflog_updateref B test_must_fail git reflog expire --updateref HEAD@{0}
+test_reflog_updateref B test_must_fail git reflog expire --updateref HEAD@{1}
+test_reflog_updateref B test_must_fail git reflog expire --updateref main@{0}
+test_reflog_updateref B test_must_fail git reflog expire --updateref main@{1}
+test_reflog_updateref B test_must_fail git reflog expire --updateref --rewrite HEAD@{0}
+test_reflog_updateref B test_must_fail git reflog expire --updateref --rewrite HEAD@{1}
+test_reflog_updateref B test_must_fail git reflog expire --updateref --rewrite main@{0}
+test_reflog_updateref B test_must_fail git reflog expire --updateref --rewrite main@{1}
+
+test_done
diff --git a/t/t1418-reflog-exists.sh b/t/t1418-reflog-exists.sh
new file mode 100755
index 0000000..d51ecd5
--- /dev/null
+++ b/t/t1418-reflog-exists.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+test_description='Test reflog display routines'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_commit A
+'
+
+test_expect_success 'usage' '
+ test_expect_code 129 git reflog exists &&
+ test_expect_code 129 git reflog exists -h
+'
+
+test_expect_success 'usage: unknown option' '
+ test_expect_code 129 git reflog exists --unknown-option
+'
+
+test_expect_success 'reflog exists works' '
+ git reflog exists refs/heads/main &&
+ test_must_fail git reflog exists refs/heads/nonexistent
+'
+
+test_expect_success 'reflog exists works with a "--" delimiter' '
+ git reflog exists -- refs/heads/main &&
+ test_must_fail git reflog exists -- refs/heads/nonexistent
+'
+
+test_expect_success 'reflog exists works with a "--end-of-options" delimiter' '
+ git reflog exists --end-of-options refs/heads/main &&
+ test_must_fail git reflog exists --end-of-options refs/heads/nonexistent
+'
+
+test_done
diff --git a/t/t1420-lost-found.sh b/t/t1420-lost-found.sh
index dc9e402..dbe15a0 100755
--- a/t/t1420-lost-found.sh
+++ b/t/t1420-lost-found.sh
@@ -4,6 +4,8 @@
#
test_description='Test fsck --lost-found'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh
index fa3aeb8..ff1c967 100755
--- a/t/t1430-bad-ref-name.sh
+++ b/t/t1430-bad-ref-name.sh
@@ -4,11 +4,13 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
test_commit one &&
- test_commit two
+ test_commit two &&
+ main_sha1=$(git rev-parse refs/heads/main)
'
test_expect_success 'fast-import: fail on invalid branch name ".badbranchname"' '
@@ -42,16 +44,16 @@
'
test_expect_success 'git branch shows badly named ref as warning' '
- cp .git/refs/heads/main .git/refs/heads/broken...ref &&
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch >output 2>error &&
test_i18ngrep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
! grep -e "broken\.\.\.ref" output
'
test_expect_success 'branch -d can delete badly named ref' '
- cp .git/refs/heads/main .git/refs/heads/broken...ref &&
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch -d broken...ref &&
git branch >output 2>error &&
! grep -e "broken\.\.\.ref" error &&
@@ -59,8 +61,8 @@
'
test_expect_success 'branch -D can delete badly named ref' '
- cp .git/refs/heads/main .git/refs/heads/broken...ref &&
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch -D broken...ref &&
git branch >output 2>error &&
! grep -e "broken\.\.\.ref" error &&
@@ -89,7 +91,7 @@
'
test_expect_success 'git branch cannot create a badly named ref' '
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
test_must_fail git branch broken...ref &&
git branch >output 2>error &&
! grep -e "broken\.\.\.ref" error &&
@@ -97,7 +99,7 @@
'
test_expect_success 'branch -m cannot rename to a bad ref name' '
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
test_might_fail git branch -D goodref &&
git branch goodref &&
test_must_fail git branch -m goodref broken...ref &&
@@ -108,8 +110,9 @@
'
test_expect_failure 'branch -m can rename from a bad ref name' '
- cp .git/refs/heads/main .git/refs/heads/broken...ref &&
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch -m broken...ref renamed &&
test_cmp_rev main renamed &&
git branch >output 2>error &&
@@ -118,7 +121,7 @@
'
test_expect_success 'push cannot create a badly named ref' '
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
test_must_fail git push "file://$(pwd)" HEAD:refs/heads/broken...ref &&
git branch >output 2>error &&
! grep -e "broken\.\.\.ref" error &&
@@ -138,7 +141,7 @@
cd dest &&
test_commit two &&
git checkout --detach &&
- cp .git/refs/heads/main .git/refs/heads/broken...ref
+ test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION
) &&
git -C src push --mirror "file://$top/dest" &&
git -C dest branch >output 2>error &&
@@ -147,11 +150,11 @@
'
test_expect_success 'rev-parse skips symref pointing to broken name' '
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch shadow one &&
- cp .git/refs/heads/main .git/refs/heads/broken...ref &&
- printf "ref: refs/heads/broken...ref\n" >.git/refs/tags/shadow &&
- test_when_finished "rm -f .git/refs/tags/shadow" &&
+ test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+ test-tool ref-store main create-symref refs/tags/shadow refs/heads/broken...ref msg &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/tags/shadow" &&
git rev-parse --verify one >expect &&
git rev-parse --verify shadow >actual 2>err &&
test_cmp expect actual &&
@@ -159,12 +162,12 @@
'
test_expect_success 'for-each-ref emits warnings for broken names' '
- cp .git/refs/heads/main .git/refs/heads/broken...ref &&
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
- test_when_finished "rm -f .git/refs/heads/badname" &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
- test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
git for-each-ref >output 2>error &&
! grep -e "broken\.\.\.ref" output &&
! grep -e "badname" output &&
@@ -175,8 +178,8 @@
'
test_expect_success 'update-ref -d can delete broken name' '
- cp .git/refs/heads/main .git/refs/heads/broken...ref &&
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git update-ref -d refs/heads/broken...ref >output 2>error &&
test_must_be_empty output &&
test_must_be_empty error &&
@@ -186,8 +189,8 @@
'
test_expect_success 'branch -d can delete broken name' '
- cp .git/refs/heads/main .git/refs/heads/broken...ref &&
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch -d broken...ref >output 2>error &&
test_i18ngrep "Deleted branch broken...ref (was broken)" output &&
test_must_be_empty error &&
@@ -197,10 +200,11 @@
'
test_expect_success 'update-ref --no-deref -d can delete symref to broken name' '
- cp .git/refs/heads/main .git/refs/heads/broken...ref &&
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
- printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
- test_when_finished "rm -f .git/refs/heads/badname" &&
+ test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+ test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
git update-ref --no-deref -d refs/heads/badname >output 2>error &&
test_path_is_missing .git/refs/heads/badname &&
test_must_be_empty output &&
@@ -208,10 +212,10 @@
'
test_expect_success 'branch -d can delete symref to broken name' '
- cp .git/refs/heads/main .git/refs/heads/broken...ref &&
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
- printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
- test_when_finished "rm -f .git/refs/heads/badname" &&
+ test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+ test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
git branch -d badname >output 2>error &&
test_path_is_missing .git/refs/heads/badname &&
test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
@@ -219,8 +223,8 @@
'
test_expect_success 'update-ref --no-deref -d can delete dangling symref to broken name' '
- printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
- test_when_finished "rm -f .git/refs/heads/badname" &&
+ test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
git update-ref --no-deref -d refs/heads/badname >output 2>error &&
test_path_is_missing .git/refs/heads/badname &&
test_must_be_empty output &&
@@ -228,8 +232,8 @@
'
test_expect_success 'branch -d can delete dangling symref to broken name' '
- printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
- test_when_finished "rm -f .git/refs/heads/badname" &&
+ test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
git branch -d badname >output 2>error &&
test_path_is_missing .git/refs/heads/badname &&
test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
@@ -237,10 +241,10 @@
'
test_expect_success 'update-ref -d can delete broken name through symref' '
- cp .git/refs/heads/main .git/refs/heads/broken...ref &&
- test_when_finished "rm -f .git/refs/heads/broken...ref" &&
- printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
- test_when_finished "rm -f .git/refs/heads/badname" &&
+ test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+ test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
git update-ref -d refs/heads/badname >output 2>error &&
test_path_is_missing .git/refs/heads/broken...ref &&
test_must_be_empty output &&
@@ -249,7 +253,7 @@
test_expect_success 'update-ref --no-deref -d can delete symref with broken name' '
printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
- test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
test_path_is_missing .git/refs/heads/broken...symref &&
test_must_be_empty output &&
@@ -258,7 +262,7 @@
test_expect_success 'branch -d can delete symref with broken name' '
printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
- test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
git branch -d broken...symref >output 2>error &&
test_path_is_missing .git/refs/heads/broken...symref &&
test_i18ngrep "Deleted branch broken...symref (was refs/heads/main)" output &&
@@ -267,7 +271,7 @@
test_expect_success 'update-ref --no-deref -d can delete dangling symref with broken name' '
printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
- test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
test_path_is_missing .git/refs/heads/broken...symref &&
test_must_be_empty output &&
@@ -276,7 +280,7 @@
test_expect_success 'branch -d can delete dangling symref with broken name' '
printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
- test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
git branch -d broken...symref >output 2>error &&
test_path_is_missing .git/refs/heads/broken...symref &&
test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 5071ac6..ab7f31f 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -48,24 +48,70 @@
rm "$(sha1_file "$1")"
}
-test_expect_success 'object with bad sha1' '
- sha=$(echo blob | git hash-object -w --stdin) &&
- old=$(test_oid_to_path "$sha") &&
- new=$(dirname $old)/$(test_oid ff_2) &&
- sha="$(dirname $new)$(basename $new)" &&
- mv .git/objects/$old .git/objects/$new &&
- test_when_finished "remove_object $sha" &&
- git update-index --add --cacheinfo 100644 $sha foo &&
- test_when_finished "git read-tree -u --reset HEAD" &&
- tree=$(git write-tree) &&
- test_when_finished "remove_object $tree" &&
- cmt=$(echo bogus | git commit-tree $tree) &&
- test_when_finished "remove_object $cmt" &&
- git update-ref refs/heads/bogus $cmt &&
- test_when_finished "git update-ref -d refs/heads/bogus" &&
+test_expect_success 'object with hash mismatch' '
+ git init --bare hash-mismatch &&
+ (
+ cd hash-mismatch &&
- test_must_fail git fsck 2>out &&
- test_i18ngrep "$sha.*corrupt" out
+ oid=$(echo blob | git hash-object -w --stdin) &&
+ oldoid=$oid &&
+ old=$(test_oid_to_path "$oid") &&
+ new=$(dirname $old)/$(test_oid ff_2) &&
+ oid="$(dirname $new)$(basename $new)" &&
+
+ mv objects/$old objects/$new &&
+ git update-index --add --cacheinfo 100644 $oid foo &&
+ tree=$(git write-tree) &&
+ cmt=$(echo bogus | git commit-tree $tree) &&
+ git update-ref refs/heads/bogus $cmt &&
+
+ test_must_fail git fsck 2>out &&
+ grep "$oldoid: hash-path mismatch, found at: .*$new" out
+ )
+'
+
+test_expect_success 'object with hash and type mismatch' '
+ git init --bare hash-type-mismatch &&
+ (
+ cd hash-type-mismatch &&
+
+ oid=$(echo blob | git hash-object -w --stdin -t garbage --literally) &&
+ oldoid=$oid &&
+ old=$(test_oid_to_path "$oid") &&
+ new=$(dirname $old)/$(test_oid ff_2) &&
+ oid="$(dirname $new)$(basename $new)" &&
+
+ mv objects/$old objects/$new &&
+ git update-index --add --cacheinfo 100644 $oid foo &&
+ tree=$(git write-tree) &&
+ cmt=$(echo bogus | git commit-tree $tree) &&
+ git update-ref refs/heads/bogus $cmt &&
+
+
+ test_must_fail git fsck 2>out &&
+ grep "^error: $oldoid: hash-path mismatch, found at: .*$new" out &&
+ grep "^error: $oldoid: object is of unknown type '"'"'garbage'"'"'" out
+ )
+'
+
+test_expect_success 'zlib corrupt loose object output ' '
+ git init --bare corrupt-loose-output &&
+ (
+ cd corrupt-loose-output &&
+ oid=$(git hash-object -w --stdin --literally </dev/null) &&
+ oidf=objects/$(test_oid_to_path "$oid") &&
+ chmod +w $oidf &&
+ echo extra garbage >>$oidf &&
+
+ cat >expect.error <<-EOF &&
+ error: garbage at end of loose object '\''$oid'\''
+ error: unable to unpack contents of ./$oidf
+ error: $oid: object corrupt or missing: ./$oidf
+ EOF
+ test_must_fail git fsck 2>actual &&
+ grep ^error: actual >error &&
+ test_cmp expect.error error
+ )
'
test_expect_success 'branch pointing to non-commit' '
@@ -728,10 +774,19 @@
# no "-d" here, so we end up with duplicates
git repack &&
# now corrupt the loose copy
- file=$(sha1_file "$(git rev-parse HEAD)") &&
+ oid="$(git rev-parse HEAD)" &&
+ file=$(sha1_file "$oid") &&
rm "$file" &&
echo broken >"$file" &&
- test_must_fail git fsck
+ test_must_fail git fsck 2>err &&
+
+ cat >expect <<-EOF &&
+ error: inflate: data stream error (incorrect header check)
+ error: unable to unpack header of $file
+ error: $oid: object corrupt or missing: $file
+ EOF
+ grep "^error: " err >actual &&
+ test_cmp expect actual
)
'
@@ -865,4 +920,21 @@
test_i18ngrep "bad index file" errors
'
+test_expect_success 'fsck error and recovery on invalid object type' '
+ git init --bare garbage-type &&
+ (
+ cd garbage-type &&
+
+ garbage_blob=$(git hash-object --stdin -w -t garbage --literally </dev/null) &&
+
+ cat >err.expect <<-\EOF &&
+ fatal: invalid object type
+ EOF
+ test_must_fail git fsck >out 2>err &&
+ grep -e "^error" -e "^fatal" err >errors &&
+ test_line_count = 1 errors &&
+ grep "$garbage_blob: object is of unknown type '"'"'garbage'"'"':" err
+ )
+'
+
test_done
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index b29563f..284fe18 100755
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -282,4 +282,58 @@
test_cmp expect output
'
+test_expect_success 'test --parseopt help output: "wrapped" options normal "or:" lines' '
+ sed -e "s/^|//" >spec <<-\EOF &&
+ |cmd [--some-option]
+ | [--another-option]
+ |cmd [--yet-another-option]
+ |--
+ |h,help show the help
+ EOF
+
+ sed -e "s/^|//" >expect <<-\END_EXPECT &&
+ |cat <<\EOF
+ |usage: cmd [--some-option]
+ | or: [--another-option]
+ | or: cmd [--yet-another-option]
+ |
+ | -h, --help show the help
+ |
+ |EOF
+ END_EXPECT
+
+ test_must_fail git rev-parse --parseopt -- -h >out <spec >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'test --parseopt help output: multi-line blurb after empty line' '
+ sed -e "s/^|//" >spec <<-\EOF &&
+ |cmd [--some-option]
+ | [--another-option]
+ |
+ |multi
+ |line
+ |blurb
+ |--
+ |h,help show the help
+ EOF
+
+ sed -e "s/^|//" >expect <<-\END_EXPECT &&
+ |cat <<\EOF
+ |usage: cmd [--some-option]
+ | or: [--another-option]
+ |
+ | multi
+ | line
+ | blurb
+ |
+ | -h, --help show the help
+ |
+ |EOF
+ END_EXPECT
+
+ test_must_fail git rev-parse --parseopt -- -h >out <spec >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index 4095861..ba43168 100755
--- a/t/t1503-rev-parse-verify.sh
+++ b/t/t1503-rev-parse-verify.sh
@@ -9,6 +9,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
add_line_into_file()
@@ -131,8 +132,9 @@
test_must_fail git rev-parse --verify --default bar
'
-test_expect_success 'main@{n} for various n' '
- N=$(git reflog | wc -l) &&
+test_expect_success !SANITIZE_LEAK 'main@{n} for various n' '
+ git reflog >out &&
+ N=$(wc -l <out) &&
Nm1=$(($N-1)) &&
Np1=$(($N+1)) &&
git rev-parse --verify main@{0} &&
diff --git a/t/t1504-ceiling-dirs.sh b/t/t1504-ceiling-dirs.sh
index 3d51615..0fafcf9 100755
--- a/t/t1504-ceiling-dirs.sh
+++ b/t/t1504-ceiling-dirs.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test GIT_CEILING_DIRECTORIES'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_prefix() {
diff --git a/t/t1505-rev-parse-last.sh b/t/t1505-rev-parse-last.sh
index 2803ca9..4a5758f 100755
--- a/t/t1505-rev-parse-last.sh
+++ b/t/t1505-rev-parse-last.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index 65a154a..18688ca 100755
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -7,6 +7,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_did_you_mean ()
diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh
index bbfe05b..591505a 100755
--- a/t/t1510-repo-setup.sh
+++ b/t/t1510-repo-setup.sh
@@ -43,6 +43,7 @@
# This test heavily relies on the standard error of nested function calls.
test_untraceable=UnfortunatelyYes
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
here=$(pwd)
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 7891a6b..98cefe3 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -25,6 +25,87 @@
. ./test-lib.sh
+test_cmp_failed_rev_parse () {
+ dir=$1
+ rev=$2
+
+ cat >expect &&
+ test_must_fail git -C "$dir" rev-parse "$rev" 2>actual.raw &&
+ sed "s/\($rev\)[0-9a-f]*/\1.../" <actual.raw >actual &&
+ test_cmp expect actual
+}
+
+test_expect_success 'ambiguous blob output' '
+ git init --bare blob.prefix &&
+ (
+ cd blob.prefix &&
+
+ # Both start with "dead..", under both SHA-1 and SHA-256
+ echo brocdnra | git hash-object -w --stdin &&
+ echo brigddsv | git hash-object -w --stdin &&
+
+ # Both start with "beef.."
+ echo 1agllotbh | git hash-object -w --stdin &&
+ echo 1bbfctrkc | git hash-object -w --stdin
+ ) &&
+
+ test_must_fail git -C blob.prefix rev-parse dead &&
+ test_cmp_failed_rev_parse blob.prefix beef <<-\EOF
+ error: short object ID beef... is ambiguous
+ hint: The candidates are:
+ hint: beef... blob
+ hint: beef... blob
+ fatal: ambiguous argument '\''beef...'\'': unknown revision or path not in the working tree.
+ Use '\''--'\'' to separate paths from revisions, like this:
+ '\''git <command> [<revision>...] -- [<file>...]'\''
+ EOF
+'
+
+test_expect_success 'ambiguous loose bad object parsed as OBJ_BAD' '
+ git init --bare blob.bad &&
+ (
+ cd blob.bad &&
+
+ # Both have the prefix "bad0"
+ echo xyzfaowcoh | git hash-object -t bad -w --stdin --literally &&
+ echo xyzhjpyvwl | git hash-object -t bad -w --stdin --literally
+ ) &&
+
+ test_cmp_failed_rev_parse blob.bad bad0 <<-\EOF
+ error: short object ID bad0... is ambiguous
+ fatal: invalid object type
+ EOF
+'
+
+test_expect_success POSIXPERM 'ambigous zlib corrupt loose blob' '
+ git init --bare blob.corrupt &&
+ (
+ cd blob.corrupt &&
+
+ # Both have the prefix "cafe"
+ echo bnkxmdwz | git hash-object -w --stdin &&
+ oid=$(echo bmwsjxzi | git hash-object -w --stdin) &&
+
+ oidf=objects/$(test_oid_to_path "$oid") &&
+ chmod 755 $oidf &&
+ echo broken >$oidf
+ ) &&
+
+ test_cmp_failed_rev_parse blob.corrupt cafe <<-\EOF
+ error: short object ID cafe... is ambiguous
+ error: inflate: data stream error (incorrect header check)
+ error: unable to unpack cafe... header
+ error: inflate: data stream error (incorrect header check)
+ error: unable to unpack cafe... header
+ hint: The candidates are:
+ hint: cafe... [bad object]
+ hint: cafe... blob
+ fatal: ambiguous argument '\''cafe...'\'': unknown revision or path not in the working tree.
+ Use '\''--'\'' to separate paths from revisions, like this:
+ '\''git <command> [<revision>...] -- [<file>...]'\''
+ EOF
+'
+
if ! test_have_prereq SHA1
then
skip_all='not using SHA-1 for objects'
@@ -34,10 +115,7 @@
test_expect_success 'blob and tree' '
test_tick &&
(
- for i in 0 1 2 3 4 5 6 7 8 9
- do
- echo $i
- done &&
+ test_write_lines 0 1 2 3 4 5 6 7 8 9 &&
echo &&
echo b1rwzyc3
) >a0blgqsjc &&
@@ -204,10 +282,7 @@
git checkout v1.0.0^0 &&
git mv a0blgqsjc f5518nwu &&
- for i in h62xsjeu j08bekfvt kg7xflhm
- do
- echo $i
- done >>f5518nwu &&
+ test_write_lines h62xsjeu j08bekfvt kg7xflhm >>f5518nwu &&
git add f5518nwu &&
test_tick &&
@@ -387,7 +462,7 @@
do
grep $type objects >$type.objects &&
sort $type.objects >$type.objects.sorted &&
- test_cmp $type.objects.sorted $type.objects
+ test_cmp $type.objects.sorted $type.objects || return 1
done
'
diff --git a/t/t1513-rev-parse-prefix.sh b/t/t1513-rev-parse-prefix.sh
index 5f437be..ba43387 100755
--- a/t/t1513-rev-parse-prefix.sh
+++ b/t/t1513-rev-parse-prefix.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t1515-rev-parse-outside-repo.sh b/t/t1515-rev-parse-outside-repo.sh
index 3ec2971..cdb26a3 100755
--- a/t/t1515-rev-parse-outside-repo.sh
+++ b/t/t1515-rev-parse-outside-repo.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='check that certain rev-parse options work outside repo'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'set up non-repo directory' '
diff --git a/t/t1600-index.sh b/t/t1600-index.sh
index 46329c4..010989f 100755
--- a/t/t1600-index.sh
+++ b/t/t1600-index.sh
@@ -2,6 +2,7 @@
test_description='index file specific tests'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
sane_unset GIT_TEST_SPLIT_INDEX
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index decd252..b4ab166 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -48,10 +48,10 @@
# NEEDSWORK: Stop hard-coding checksums.
if test "$indexversion" = "4"
then
- own=$(test_oid own_v4)
+ own=$(test_oid own_v4) &&
base=$(test_oid base_v4)
else
- own=$(test_oid own_v3)
+ own=$(test_oid own_v3) &&
base=$(test_oid base_v3)
fi &&
diff --git a/t/t1800-hook.sh b/t/t1800-hook.sh
new file mode 100755
index 0000000..26ed5e1
--- /dev/null
+++ b/t/t1800-hook.sh
@@ -0,0 +1,123 @@
+#!/bin/sh
+
+test_description='git-hook command'
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+test_expect_success 'git hook usage' '
+ test_expect_code 129 git hook &&
+ test_expect_code 129 git hook run &&
+ test_expect_code 129 git hook run -h &&
+ test_expect_code 129 git hook run --unknown 2>err &&
+ grep "unknown option" err
+'
+
+test_expect_success 'git hook run: nonexistent hook' '
+ cat >stderr.expect <<-\EOF &&
+ error: cannot find a hook named test-hook
+ EOF
+ test_expect_code 1 git hook run test-hook 2>stderr.actual &&
+ test_cmp stderr.expect stderr.actual
+'
+
+test_expect_success 'git hook run: nonexistent hook with --ignore-missing' '
+ git hook run --ignore-missing does-not-exist 2>stderr.actual &&
+ test_must_be_empty stderr.actual
+'
+
+test_expect_success 'git hook run: basic' '
+ test_hook test-hook <<-EOF &&
+ echo Test hook
+ EOF
+
+ cat >expect <<-\EOF &&
+ Test hook
+ EOF
+ git hook run test-hook 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git hook run: stdout and stderr both write to our stderr' '
+ test_hook test-hook <<-EOF &&
+ echo >&1 Will end up on stderr
+ echo >&2 Will end up on stderr
+ EOF
+
+ cat >stderr.expect <<-\EOF &&
+ Will end up on stderr
+ Will end up on stderr
+ EOF
+ git hook run test-hook >stdout.actual 2>stderr.actual &&
+ test_cmp stderr.expect stderr.actual &&
+ test_must_be_empty stdout.actual
+'
+
+for code in 1 2 128 129
+do
+ test_expect_success "git hook run: exit code $code is passed along" '
+ test_hook test-hook <<-EOF &&
+ exit $code
+ EOF
+
+ test_expect_code $code git hook run test-hook
+ '
+done
+
+test_expect_success 'git hook run arg u ments without -- is not allowed' '
+ test_expect_code 129 git hook run test-hook arg u ments
+'
+
+test_expect_success 'git hook run -- pass arguments' '
+ test_hook test-hook <<-\EOF &&
+ echo $1
+ echo $2
+ EOF
+
+ cat >expect <<-EOF &&
+ arg
+ u ments
+ EOF
+
+ git hook run test-hook -- arg "u ments" 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git hook run -- out-of-repo runs excluded' '
+ test_hook test-hook <<-EOF &&
+ echo Test hook
+ EOF
+
+ nongit test_must_fail git hook run test-hook
+'
+
+test_expect_success 'git -c core.hooksPath=<PATH> hook run' '
+ mkdir my-hooks &&
+ write_script my-hooks/test-hook <<-\EOF &&
+ echo Hook ran $1 >>actual
+ EOF
+
+ cat >expect <<-\EOF &&
+ Test hook
+ Hook ran one
+ Hook ran two
+ Hook ran three
+ Hook ran four
+ EOF
+
+ test_hook test-hook <<-EOF &&
+ echo Test hook
+ EOF
+
+ # Test various ways of specifying the path. See also
+ # t1350-config-hooks-path.sh
+ >actual &&
+ git hook run test-hook -- ignored 2>>actual &&
+ git -c core.hooksPath=my-hooks hook run test-hook -- one 2>>actual &&
+ git -c core.hooksPath=my-hooks/ hook run test-hook -- two 2>>actual &&
+ git -c core.hooksPath="$PWD/my-hooks" hook run test-hook -- three 2>>actual &&
+ git -c core.hooksPath="$PWD/my-hooks/" hook run test-hook -- four 2>>actual &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t2000-conflict-when-checking-files-out.sh b/t/t2000-conflict-when-checking-files-out.sh
index f18616a..79fc97f 100755
--- a/t/t2000-conflict-when-checking-files-out.sh
+++ b/t/t2000-conflict-when-checking-files-out.sh
@@ -21,6 +21,7 @@
# path1 is occupied by a non-directory. With "-f" flag, it should remove
# the conflicting paths and succeed.
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
show_files() {
diff --git a/t/t2002-checkout-cache-u.sh b/t/t2002-checkout-cache-u.sh
index 70361c8..fc95cf9 100755
--- a/t/t2002-checkout-cache-u.sh
+++ b/t/t2002-checkout-cache-u.sh
@@ -8,6 +8,7 @@
With -u flag, git checkout-index internally runs the equivalent of
git update-index --refresh on the checked out entry.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success \
diff --git a/t/t2003-checkout-cache-mkdir.sh b/t/t2003-checkout-cache-mkdir.sh
index ff163cf..f0fd441 100755
--- a/t/t2003-checkout-cache-mkdir.sh
+++ b/t/t2003-checkout-cache-mkdir.sh
@@ -10,6 +10,7 @@
the GIT controlled paths.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh
index a9352b0..b16d69c 100755
--- a/t/t2004-checkout-cache-temp.sh
+++ b/t/t2004-checkout-cache-temp.sh
@@ -8,6 +8,7 @@
With --temp flag, git checkout-index writes to temporary merge files
rather than the tracked path.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
@@ -56,7 +57,7 @@
test $(grep $f actual | cut "-d " -f2) = $f &&
p=$(grep $f actual | cut "-d " -f1) &&
test -f $p &&
- test $(cat $p) = tree1$f
+ test $(cat $p) = tree1$f || return 1
done
'
@@ -84,7 +85,7 @@
test $(grep $f actual | cut "-d " -f2) = $f &&
p=$(grep $f actual | cut "-d " -f1) &&
test -f $p &&
- test $(cat $p) = tree2$f
+ test $(cat $p) = tree2$f || return 1
done
'
diff --git a/t/t2005-checkout-index-symlinks.sh b/t/t2005-checkout-index-symlinks.sh
index 9fa5610..112682a 100755
--- a/t/t2005-checkout-index-symlinks.sh
+++ b/t/t2005-checkout-index-symlinks.sh
@@ -8,6 +8,7 @@
This tests that git checkout-index creates a symbolic link as a plain
file if core.symlinks is false.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success \
diff --git a/t/t2007-checkout-symlink.sh b/t/t2007-checkout-symlink.sh
index 6f0b90c..bd9e9e7 100755
--- a/t/t2007-checkout-symlink.sh
+++ b/t/t2007-checkout-symlink.sh
@@ -7,6 +7,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t2008-checkout-subdir.sh b/t/t2008-checkout-subdir.sh
index eadb943..8a518a4 100755
--- a/t/t2008-checkout-subdir.sh
+++ b/t/t2008-checkout-subdir.sh
@@ -4,6 +4,7 @@
test_description='git checkout from subdirectories'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t2009-checkout-statinfo.sh b/t/t2009-checkout-statinfo.sh
index b054063..71195dd 100755
--- a/t/t2009-checkout-statinfo.sh
+++ b/t/t2009-checkout-statinfo.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh
index 6e87573..9d4b375 100755
--- a/t/t2010-checkout-ambiguous.sh
+++ b/t/t2010-checkout-ambiguous.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t2011-checkout-invalid-head.sh b/t/t2011-checkout-invalid-head.sh
index e52022e..d9997e7 100755
--- a/t/t2011-checkout-invalid-head.sh
+++ b/t/t2011-checkout-invalid-head.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t2012-checkout-last.sh b/t/t2012-checkout-last.sh
index 0e7d47a..1f6c4ed 100755
--- a/t/t2012-checkout-last.sh
+++ b/t/t2012-checkout-last.sh
@@ -21,14 +21,20 @@
git checkout other
'
+test_cmp_symbolic_HEAD_ref () {
+ echo refs/heads/"$1" >expect &&
+ git symbolic-ref HEAD >actual &&
+ test_cmp expect actual
+}
+
test_expect_success '"checkout -" switches back' '
git checkout - &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
+ test_cmp_symbolic_HEAD_ref main
'
test_expect_success '"checkout -" switches forth' '
git checkout - &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/other"
+ test_cmp_symbolic_HEAD_ref other
'
test_expect_success 'detach HEAD' '
@@ -37,57 +43,61 @@
test_expect_success '"checkout -" attaches again' '
git checkout - &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/other"
+ test_cmp_symbolic_HEAD_ref other
'
test_expect_success '"checkout -" detaches again' '
git checkout - &&
- test "z$(git rev-parse HEAD)" = "z$(git rev-parse other)" &&
+
+ git rev-parse other >expect &&
+ git rev-parse HEAD >actual &&
+ test_cmp expect actual &&
+
test_must_fail git symbolic-ref HEAD
'
test_expect_success 'more switches' '
for i in 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1
do
- git checkout -b branch$i
+ git checkout -b branch$i || return 1
done
'
more_switches () {
for i in 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1
do
- git checkout branch$i
+ git checkout branch$i || return 1
done
}
test_expect_success 'switch to the last' '
more_switches &&
git checkout @{-1} &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch2"
+ test_cmp_symbolic_HEAD_ref branch2
'
test_expect_success 'switch to second from the last' '
more_switches &&
git checkout @{-2} &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch3"
+ test_cmp_symbolic_HEAD_ref branch3
'
test_expect_success 'switch to third from the last' '
more_switches &&
git checkout @{-3} &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch4"
+ test_cmp_symbolic_HEAD_ref branch4
'
test_expect_success 'switch to fourth from the last' '
more_switches &&
git checkout @{-4} &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch5"
+ test_cmp_symbolic_HEAD_ref branch5
'
test_expect_success 'switch to twelfth from the last' '
more_switches &&
git checkout @{-12} &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch13"
+ test_cmp_symbolic_HEAD_ref branch13
'
test_expect_success 'merge base test setup' '
@@ -98,19 +108,28 @@
test_expect_success 'another...main' '
git checkout another &&
git checkout another...main &&
- test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify main^)"
+
+ git rev-parse --verify main^ >expect &&
+ git rev-parse --verify HEAD >actual &&
+ test_cmp expect actual
'
test_expect_success '...main' '
git checkout another &&
git checkout ...main &&
- test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify main^)"
+
+ git rev-parse --verify main^ >expect &&
+ git rev-parse --verify HEAD >actual &&
+ test_cmp expect actual
'
test_expect_success 'main...' '
git checkout another &&
git checkout main... &&
- test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify main^)"
+
+ git rev-parse --verify main^ >expect &&
+ git rev-parse --verify HEAD >actual &&
+ test_cmp expect actual
'
test_expect_success '"checkout -" works after a rebase A' '
@@ -118,7 +137,7 @@
git checkout other &&
git rebase main &&
git checkout - &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
+ test_cmp_symbolic_HEAD_ref main
'
test_expect_success '"checkout -" works after a rebase A B' '
@@ -127,7 +146,7 @@
git checkout other &&
git rebase main moodle &&
git checkout - &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
+ test_cmp_symbolic_HEAD_ref main
'
test_expect_success '"checkout -" works after a rebase -i A' '
@@ -135,7 +154,7 @@
git checkout other &&
git rebase -i main &&
git checkout - &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
+ test_cmp_symbolic_HEAD_ref main
'
test_expect_success '"checkout -" works after a rebase -i A B' '
@@ -144,7 +163,7 @@
git checkout other &&
git rebase main foodle &&
git checkout - &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
+ test_cmp_symbolic_HEAD_ref main
'
test_done
diff --git a/t/t2014-checkout-switch.sh b/t/t2014-checkout-switch.sh
index ccfb147..c138bdd 100755
--- a/t/t2014-checkout-switch.sh
+++ b/t/t2014-checkout-switch.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='Peter MacMillan'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t2015-checkout-unborn.sh b/t/t2015-checkout-unborn.sh
index a972121..9425aae 100755
--- a/t/t2015-checkout-unborn.sh
+++ b/t/t2015-checkout-unborn.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh
index abfd586..bc3f69b 100755
--- a/t/t2016-checkout-patch.sh
+++ b/t/t2016-checkout-patch.sh
@@ -4,7 +4,13 @@
. ./lib-patch-mode.sh
-test_expect_success PERL 'setup' '
+if ! test_bool_env GIT_TEST_ADD_I_USE_BUILTIN true && ! test_have_prereq PERL
+then
+ skip_all='skipping interactive add tests, PERL not set'
+ test_done
+fi
+
+test_expect_success 'setup' '
mkdir dir &&
echo parent > dir/foo &&
echo dummy > bar &&
@@ -18,44 +24,40 @@
# note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar'
-# NEEDSWORK: Since the builtin add-p is used when $GIT_TEST_ADD_I_USE_BUILTIN
-# is given, we should replace the PERL prerequisite with an ADD_I prerequisite
-# which first checks if $GIT_TEST_ADD_I_USE_BUILTIN is defined before checking
-# PERL.
-test_expect_success PERL 'saying "n" does nothing' '
+test_expect_success 'saying "n" does nothing' '
set_and_save_state dir/foo work head &&
test_write_lines n n | git checkout -p &&
verify_saved_state bar &&
verify_saved_state dir/foo
'
-test_expect_success PERL 'git checkout -p' '
+test_expect_success 'git checkout -p' '
test_write_lines n y | git checkout -p &&
verify_saved_state bar &&
verify_state dir/foo head head
'
-test_expect_success PERL 'git checkout -p with staged changes' '
+test_expect_success 'git checkout -p with staged changes' '
set_state dir/foo work index &&
test_write_lines n y | git checkout -p &&
verify_saved_state bar &&
verify_state dir/foo index index
'
-test_expect_success PERL 'git checkout -p HEAD with NO staged changes: abort' '
+test_expect_success 'git checkout -p HEAD with NO staged changes: abort' '
set_and_save_state dir/foo work head &&
test_write_lines n y n | git checkout -p HEAD &&
verify_saved_state bar &&
verify_saved_state dir/foo
'
-test_expect_success PERL 'git checkout -p HEAD with NO staged changes: apply' '
+test_expect_success 'git checkout -p HEAD with NO staged changes: apply' '
test_write_lines n y y | git checkout -p HEAD &&
verify_saved_state bar &&
verify_state dir/foo head head
'
-test_expect_success PERL 'git checkout -p HEAD with change already staged' '
+test_expect_success 'git checkout -p HEAD with change already staged' '
set_state dir/foo index index &&
# the third n is to get out in case it mistakenly does not apply
test_write_lines n y n | git checkout -p HEAD &&
@@ -63,21 +65,21 @@
verify_state dir/foo head head
'
-test_expect_success PERL 'git checkout -p HEAD^...' '
+test_expect_success 'git checkout -p HEAD^...' '
# the third n is to get out in case it mistakenly does not apply
test_write_lines n y n | git checkout -p HEAD^... &&
verify_saved_state bar &&
verify_state dir/foo parent parent
'
-test_expect_success PERL 'git checkout -p HEAD^' '
+test_expect_success 'git checkout -p HEAD^' '
# the third n is to get out in case it mistakenly does not apply
test_write_lines n y n | git checkout -p HEAD^ &&
verify_saved_state bar &&
verify_state dir/foo parent parent
'
-test_expect_success PERL 'git checkout -p handles deletion' '
+test_expect_success 'git checkout -p handles deletion' '
set_state dir/foo work index &&
rm dir/foo &&
test_write_lines n y | git checkout -p &&
@@ -90,28 +92,28 @@
# dir/foo. There's always an extra 'n' to reject edits to dir/foo in
# the failure case (and thus get out of the loop).
-test_expect_success PERL 'path limiting works: dir' '
+test_expect_success 'path limiting works: dir' '
set_state dir/foo work head &&
test_write_lines y n | git checkout -p dir &&
verify_saved_state bar &&
verify_state dir/foo head head
'
-test_expect_success PERL 'path limiting works: -- dir' '
+test_expect_success 'path limiting works: -- dir' '
set_state dir/foo work head &&
test_write_lines y n | git checkout -p -- dir &&
verify_saved_state bar &&
verify_state dir/foo head head
'
-test_expect_success PERL 'path limiting works: HEAD^ -- dir' '
+test_expect_success 'path limiting works: HEAD^ -- dir' '
# the third n is to get out in case it mistakenly does not apply
test_write_lines y n n | git checkout -p HEAD^ -- dir &&
verify_saved_state bar &&
verify_state dir/foo parent parent
'
-test_expect_success PERL 'path limiting works: foo inside dir' '
+test_expect_success 'path limiting works: foo inside dir' '
set_state dir/foo work head &&
# the third n is to get out in case it mistakenly does not apply
test_write_lines y n n | (cd dir && git checkout -p foo) &&
@@ -119,11 +121,11 @@
verify_state dir/foo head head
'
-test_expect_success PERL 'none of this moved HEAD' '
+test_expect_success 'none of this moved HEAD' '
verify_saved_head
'
-test_expect_success PERL 'empty tree can be handled' '
+test_expect_success 'empty tree can be handled' '
test_when_finished "git reset --hard" &&
git checkout -p $(test_oid empty_tree) --
'
diff --git a/t/t2017-checkout-orphan.sh b/t/t2017-checkout-orphan.sh
index 88d6992..947d158 100755
--- a/t/t2017-checkout-orphan.sh
+++ b/t/t2017-checkout-orphan.sh
@@ -10,6 +10,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
TEST_FILE=foo
@@ -62,8 +63,17 @@
git checkout main &&
git config branch.autosetupmerge always &&
git checkout --orphan gamma &&
- test -z "$(git config branch.gamma.merge)" &&
+ test_cmp_config "" --default "" branch.gamma.merge &&
test refs/heads/gamma = "$(git symbolic-ref HEAD)" &&
+ test_must_fail git rev-parse --verify HEAD^ &&
+ git checkout main &&
+ git config branch.autosetupmerge inherit &&
+ git checkout --orphan eta &&
+ test_cmp_config "" --default "" branch.eta.merge &&
+ test_cmp_config "" --default "" branch.eta.remote &&
+ echo refs/heads/eta >expected &&
+ git symbolic-ref HEAD >actual &&
+ test_cmp expected actual &&
test_must_fail git rev-parse --verify HEAD^
'
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index 93be1c0..52e51b0 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -85,6 +85,19 @@
git branch -m branch1
'
+test_expect_success 'checkout a branch without refs/heads/* prefix' '
+ git clone --no-tags . repo-odd-prefix &&
+ (
+ cd repo-odd-prefix &&
+
+ origin=$(git symbolic-ref refs/remotes/origin/HEAD) &&
+ git symbolic-ref refs/heads/a-branch "$origin" &&
+
+ git checkout -f a-branch &&
+ git checkout -f a-branch
+ )
+'
+
test_expect_success 'checkout -b to a new branch, set to HEAD' '
test_when_finished "
git checkout branch1 &&
@@ -148,7 +161,7 @@
test_expect_success 'checkout -b to @{-1} fails with the right branch name' '
git checkout branch1 &&
git checkout branch2 &&
- echo >expect "fatal: A branch named '\''branch1'\'' already exists." &&
+ echo >expect "fatal: a branch named '\''branch1'\'' already exists" &&
test_must_fail git checkout -b @{-1} 2>actual &&
test_cmp expect actual
'
diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh
index b99d519..2c8c926 100755
--- a/t/t2019-checkout-ambiguous-ref.sh
+++ b/t/t2019-checkout-ambiguous-ref.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='checkout handling of ambiguous (branch/tag) refs'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup ambiguous refs' '
diff --git a/t/t2021-checkout-overwrite.sh b/t/t2021-checkout-overwrite.sh
index 660132f..713c3fa 100755
--- a/t/t2021-checkout-overwrite.sh
+++ b/t/t2021-checkout-overwrite.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='checkout must not overwrite an untracked objects'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t2022-checkout-paths.sh b/t/t2022-checkout-paths.sh
index c49ba7f..f1b709d 100755
--- a/t/t2022-checkout-paths.sh
+++ b/t/t2022-checkout-paths.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t2025-checkout-no-overlay.sh b/t/t2025-checkout-no-overlay.sh
index fa9e098..8f13341 100755
--- a/t/t2025-checkout-no-overlay.sh
+++ b/t/t2025-checkout-no-overlay.sh
@@ -25,7 +25,7 @@
test_expect_success 'checkout -p --overlay is disallowed' '
test_must_fail git checkout -p --overlay HEAD 2>actual &&
- test_i18ngrep "fatal: -p and --overlay are mutually exclusive" actual
+ test_i18ngrep "fatal: options .-p. and .--overlay. cannot be used together" actual
'
test_expect_success '--no-overlay --theirs with D/F conflict deletes file' '
diff --git a/t/t2026-checkout-pathspec-file.sh b/t/t2026-checkout-pathspec-file.sh
index 43d31d7..9c651ae 100755
--- a/t/t2026-checkout-pathspec-file.sh
+++ b/t/t2026-checkout-pathspec-file.sh
@@ -2,6 +2,7 @@
test_description='checkout --pathspec-from-file'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_tick
@@ -148,16 +149,16 @@
echo fileA.t >list &&
test_must_fail git checkout --pathspec-from-file=list --detach 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with --detach" err &&
+ test_i18ngrep -e "options .--pathspec-from-file. and .--detach. cannot be used together" err &&
test_must_fail git checkout --pathspec-from-file=list --patch 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
+ test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
test_must_fail git checkout --pathspec-from-file=list -- fileA.t 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+ test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git checkout --pathspec-file-nul 2>err &&
- test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err
+ test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
'
test_done
diff --git a/t/t2027-checkout-track.sh b/t/t2027-checkout-track.sh
index 4453741..dca35aa 100755
--- a/t/t2027-checkout-track.sh
+++ b/t/t2027-checkout-track.sh
@@ -24,4 +24,27 @@
test_i18ngrep "cannot be used with updating paths" err
'
+test_expect_success 'checkout --track -b overrides autoSetupMerge=inherit' '
+ # Set up tracking config on main
+ test_config branch.main.remote origin &&
+ test_config branch.main.merge refs/heads/some-branch &&
+ test_config branch.autoSetupMerge inherit &&
+ # With --track=inherit, we copy the tracking config from main
+ git checkout --track=inherit -b b1 main &&
+ test_cmp_config origin branch.b1.remote &&
+ test_cmp_config refs/heads/some-branch branch.b1.merge &&
+ # With branch.autoSetupMerge=inherit, we do the same
+ git checkout -b b2 main &&
+ test_cmp_config origin branch.b2.remote &&
+ test_cmp_config refs/heads/some-branch branch.b2.merge &&
+ # But --track overrides this
+ git checkout --track -b b3 main &&
+ test_cmp_config . branch.b3.remote &&
+ test_cmp_config refs/heads/main branch.b3.merge &&
+ # And --track=direct does as well
+ git checkout --track=direct -b b4 main &&
+ test_cmp_config . branch.b4.remote &&
+ test_cmp_config refs/heads/main branch.b4.merge
+'
+
test_done
diff --git a/t/t2050-git-dir-relative.sh b/t/t2050-git-dir-relative.sh
index 21f4659..1f193cd 100755
--- a/t/t2050-git-dir-relative.sh
+++ b/t/t2050-git-dir-relative.sh
@@ -12,6 +12,7 @@
and tries commits from the top and the subdir, checking
that the commit-hook still gets called.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
COMMIT_FILE="$(pwd)/output"
diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh
index 9bc6a3a..5a7caf9 100755
--- a/t/t2060-switch.sh
+++ b/t/t2060-switch.sh
@@ -32,6 +32,17 @@
test_must_fail git symbolic-ref HEAD
'
+test_expect_success 'suggestion to detach' '
+ test_must_fail git switch main^{commit} 2>stderr &&
+ grep "try again with the --detach option" stderr
+'
+
+test_expect_success 'suggestion to detach is suppressed with advice.suggestDetachingHead=false' '
+ test_config advice.suggestDetachingHead false &&
+ test_must_fail git switch main^{commit} 2>stderr &&
+ ! grep "try again with the --detach option" stderr
+'
+
test_expect_success 'switch and detach current branch' '
test_when_finished git switch main &&
git switch main &&
@@ -107,4 +118,32 @@
test_must_fail git switch -d @^
'
+test_expect_success 'tracking info copied with autoSetupMerge=inherit' '
+ # default config does not copy tracking info
+ git switch -c foo-no-inherit foo &&
+ test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
+ test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
+ # with --track=inherit, we copy tracking info from foo
+ git switch --track=inherit -c foo2 foo &&
+ test_cmp_config origin branch.foo2.remote &&
+ test_cmp_config refs/heads/foo branch.foo2.merge &&
+ # with autoSetupMerge=inherit, we do the same
+ test_config branch.autoSetupMerge inherit &&
+ git switch -c foo3 foo &&
+ test_cmp_config origin branch.foo3.remote &&
+ test_cmp_config refs/heads/foo branch.foo3.merge &&
+ # with --track, we override autoSetupMerge
+ git switch --track -c foo4 foo &&
+ test_cmp_config . branch.foo4.remote &&
+ test_cmp_config refs/heads/foo branch.foo4.merge &&
+ # and --track=direct does as well
+ git switch --track=direct -c foo5 foo &&
+ test_cmp_config . branch.foo5.remote &&
+ test_cmp_config refs/heads/foo branch.foo5.merge &&
+ # no tracking info to inherit from main
+ git switch -c main2 main &&
+ test_cmp_config "" --default "" branch.main2.remote &&
+ test_cmp_config "" --default "" branch.main2.merge
+'
+
test_done
diff --git a/t/t2072-restore-pathspec-file.sh b/t/t2072-restore-pathspec-file.sh
index b48345b..c22669b 100755
--- a/t/t2072-restore-pathspec-file.sh
+++ b/t/t2072-restore-pathspec-file.sh
@@ -152,13 +152,13 @@
>empty_list &&
test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
+ test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+ test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err &&
- test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+ test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err &&
test_i18ngrep -e "you must specify path(s) to restore" err
diff --git a/t/t2081-parallel-checkout-collisions.sh b/t/t2081-parallel-checkout-collisions.sh
index f6fcfc0..6acdb89 100755
--- a/t/t2081-parallel-checkout-collisions.sh
+++ b/t/t2081-parallel-checkout-collisions.sh
@@ -11,6 +11,7 @@
both these mechanics.
"
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-parallel-checkout.sh"
diff --git a/t/t2100-update-cache-badpath.sh b/t/t2100-update-cache-badpath.sh
index 2df3fdd..7915e7b 100755
--- a/t/t2100-update-cache-badpath.sh
+++ b/t/t2100-update-cache-badpath.sh
@@ -22,6 +22,7 @@
All of the attempts should fail.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
mkdir path2 path3
diff --git a/t/t2101-update-index-reupdate.sh b/t/t2101-update-index-reupdate.sh
index 6c32d42..e3c7acd 100755
--- a/t/t2101-update-index-reupdate.sh
+++ b/t/t2101-update-index-reupdate.sh
@@ -6,6 +6,7 @@
test_description='git update-index --again test.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'update-index --add' '
diff --git a/t/t2102-update-index-symlinks.sh b/t/t2102-update-index-symlinks.sh
index 22f2c73..c49cdfb 100755
--- a/t/t2102-update-index-symlinks.sh
+++ b/t/t2102-update-index-symlinks.sh
@@ -8,6 +8,7 @@
This tests that git update-index keeps the symbolic link property
even if a plain file is in the working tree if core.symlinks is false.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success \
@@ -25,7 +26,7 @@
'the index entry must still be a symbolic link' '
case "$(git ls-files --stage --cached symlink)" in
120000" "*symlink) echo pass;;
-*) echo fail; git ls-files --stage --cached symlink; (exit 1);;
+*) echo fail; git ls-files --stage --cached symlink; false;;
esac'
test_done
diff --git a/t/t2103-update-index-ignore-missing.sh b/t/t2103-update-index-ignore-missing.sh
index 0114f05..e9451cd 100755
--- a/t/t2103-update-index-ignore-missing.sh
+++ b/t/t2103-update-index-ignore-missing.sh
@@ -2,6 +2,7 @@
test_description='update-index with options'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success basics '
@@ -23,7 +24,7 @@
test_cmp expect actual &&
git update-index --add one two three &&
- for i in one three two; do echo $i; done >expect &&
+ test_write_lines one three two >expect &&
git ls-files >actual &&
test_cmp expect actual &&
diff --git a/t/t2104-update-index-skip-worktree.sh b/t/t2104-update-index-skip-worktree.sh
index 30666fc..b8686aa 100755
--- a/t/t2104-update-index-skip-worktree.sh
+++ b/t/t2104-update-index-skip-worktree.sh
@@ -5,6 +5,7 @@
test_description='skip-worktree bit test'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
sane_unset GIT_TEST_SPLIT_INDEX
diff --git a/t/t2105-update-index-gitfile.sh b/t/t2105-update-index-gitfile.sh
index a7f3d47..963ebe7 100755
--- a/t/t2105-update-index-gitfile.sh
+++ b/t/t2105-update-index-gitfile.sh
@@ -6,6 +6,7 @@
test_description='git update-index for gitlink to .git file.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'submodule with absolute .git file' '
diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh
index 2d450da..d943ddf 100755
--- a/t/t2106-update-index-assume-unchanged.sh
+++ b/t/t2106-update-index-assume-unchanged.sh
@@ -3,6 +3,7 @@
test_description='git update-index --assume-unchanged test.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t2108-update-index-refresh-racy.sh b/t/t2108-update-index-refresh-racy.sh
new file mode 100755
index 0000000..bc5f288
--- /dev/null
+++ b/t/t2108-update-index-refresh-racy.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+test_description='update-index refresh tests related to racy timestamps'
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+reset_files () {
+ echo content >file &&
+ echo content >other &&
+ test_set_magic_mtime file &&
+ test_set_magic_mtime other
+}
+
+update_assert_changed () {
+ test_set_magic_mtime .git/index &&
+ test_might_fail git update-index "$1" &&
+ ! test_is_magic_mtime .git/index
+}
+
+test_expect_success 'setup' '
+ reset_files &&
+ # we are calling reset_files() a couple of times during tests;
+ # test-tool chmtime does not change the ctime; to not weaken
+ # or even break our tests, disable ctime-checks entirely
+ git config core.trustctime false &&
+ git add file other &&
+ git commit -m "initial import"
+'
+
+test_expect_success '--refresh has no racy timestamps to fix' '
+ reset_files &&
+ # set the index time far enough to the future;
+ # it must be at least 3 seconds for VFAT
+ test_set_magic_mtime .git/index +60 &&
+ git update-index --refresh &&
+ test_is_magic_mtime .git/index +60
+'
+
+test_expect_success '--refresh should fix racy timestamp' '
+ reset_files &&
+ update_assert_changed --refresh
+'
+
+test_expect_success '--really-refresh should fix racy timestamp' '
+ reset_files &&
+ update_assert_changed --really-refresh
+'
+
+test_expect_success '--refresh should fix racy timestamp if other file needs update' '
+ reset_files &&
+ echo content2 >other &&
+ test_set_magic_mtime other &&
+ update_assert_changed --refresh
+'
+
+test_expect_success '--refresh should fix racy timestamp if racy file needs update' '
+ reset_files &&
+ echo content2 >file &&
+ test_set_magic_mtime file &&
+ update_assert_changed --refresh
+'
+
+test_done
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 45ca35d..be394f1 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -14,6 +14,7 @@
Also tested are "git add -u" without limiting, and "git add -u"
without contents changes, and other conditions'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -40,20 +41,28 @@
'
test_expect_success 'update noticed a removal' '
- test "$(git ls-files dir1/sub1)" = ""
+ git ls-files dir1/sub1 >out &&
+ test_must_be_empty out
'
test_expect_success 'update touched correct path' '
- test "$(git diff-files --name-status dir2/sub3)" = ""
+ git diff-files --name-status dir2/sub3 >out &&
+ test_must_be_empty out
'
test_expect_success 'update did not touch other tracked files' '
- test "$(git diff-files --name-status check)" = "M check" &&
- test "$(git diff-files --name-status top)" = "M top"
+ echo "M check" >expect &&
+ git diff-files --name-status check >actual &&
+ test_cmp expect actual &&
+
+ echo "M top" >expect &&
+ git diff-files --name-status top >actual &&
+ test_cmp expect actual
'
test_expect_success 'update did not touch untracked files' '
- test "$(git ls-files dir2/other)" = ""
+ git ls-files dir2/other >out &&
+ test_must_be_empty out
'
test_expect_success 'cache tree has not been corrupted' '
@@ -75,9 +84,8 @@
'
test_expect_success 'change gets noticed' '
-
- test "$(git diff-files --name-status dir1)" = ""
-
+ git diff-files --name-status dir1 >out &&
+ test_must_be_empty out
'
test_expect_success 'non-qualified update in subdir updates from the root' '
@@ -102,7 +110,8 @@
test_expect_success 'add everything changed' '
git add -u &&
- test -z "$(git diff-files)"
+ git diff-files >out &&
+ test_must_be_empty out
'
@@ -110,7 +119,8 @@
touch check &&
git add -u &&
- test -z "$(git diff-files)"
+ git diff-files >out &&
+ test_must_be_empty out
'
@@ -118,7 +128,8 @@
touch check &&
git add check &&
- test -z "$(git diff-files)"
+ git diff-files >out &&
+ test_must_be_empty out
'
@@ -129,12 +140,15 @@
echo "remove '\''top'\''"
) >expect &&
before=$(git ls-files -s check top) &&
+ git count-objects -v >objects_before &&
echo changed >>check &&
rm -f top &&
git add -n -u >actual &&
after=$(git ls-files -s check top) &&
+ git count-objects -v >objects_after &&
test "$before" = "$after" &&
+ test_cmp objects_before objects_after &&
test_cmp expect actual
'
@@ -147,13 +161,13 @@
{
for path in path1 path2
do
- echo "100644 $one 1 $path"
- echo "100644 $two 2 $path"
- echo "100644 $three 3 $path"
- done
- echo "100644 $one 1 path3"
- echo "100644 $one 1 path4"
- echo "100644 $one 3 path5"
+ echo "100644 $one 1 $path" &&
+ echo "100644 $two 2 $path" &&
+ echo "100644 $three 3 $path" || return 1
+ done &&
+ echo "100644 $one 1 path3" &&
+ echo "100644 $one 1 path4" &&
+ echo "100644 $one 3 path5" &&
echo "100644 $one 3 path6"
} |
git update-index --index-info &&
@@ -170,8 +184,8 @@
git add -u &&
git ls-files -s path1 path2 path3 path4 path5 path6 >actual &&
{
- echo "100644 $three 0 path1"
- echo "100644 $two 0 path3"
+ echo "100644 $three 0 path1" &&
+ echo "100644 $two 0 path3" &&
echo "100644 $two 0 path5"
} >expect &&
test_cmp expect actual
diff --git a/t/t2201-add-update-typechange.sh b/t/t2201-add-update-typechange.sh
index a4eec0a..dba62d6 100755
--- a/t/t2201-add-update-typechange.sh
+++ b/t/t2201-add-update-typechange.sh
@@ -2,6 +2,7 @@
test_description='more git add -u'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -97,17 +98,17 @@
"
} >expect &&
{
- cat expect
- echo ":100644 160000 $_empty $ZERO_OID T yonk"
+ cat expect &&
+ echo ":100644 160000 $_empty $ZERO_OID T yonk" &&
echo ":100644 000000 $_empty $ZERO_OID D zifmia"
} >expect-files &&
{
- cat expect
+ cat expect &&
echo ":000000 160000 $ZERO_OID $ZERO_OID A yonk"
} >expect-index &&
{
- echo "100644 $_empty 0 nitfol"
- echo "160000 $yomin 0 yomin"
+ echo "100644 $_empty 0 nitfol" &&
+ echo "160000 $yomin 0 yomin" &&
echo "160000 $yonk 0 yonk"
} >expect-final
'
diff --git a/t/t2202-add-addremove.sh b/t/t2202-add-addremove.sh
index 9ee6590..24c60bf 100755
--- a/t/t2202-add-addremove.sh
+++ b/t/t2202-add-addremove.sh
@@ -2,6 +2,7 @@
test_description='git add --all'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index cf0175a..ebf58db 100755
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -2,6 +2,7 @@
test_description='Intent to add'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'intent to add' '
@@ -116,7 +117,7 @@
mkdir 2 &&
for f in 1 2/1 2/2 3
do
- echo "$f" >"$f"
+ echo "$f" >"$f" || return 1
done &&
git add 1 2/2 3 &&
git add -N 2/1 &&
diff --git a/t/t2204-add-ignored.sh b/t/t2204-add-ignored.sh
index 2e07365..89424ab 100755
--- a/t/t2204-add-ignored.sh
+++ b/t/t2204-add-ignored.sh
@@ -2,6 +2,7 @@
test_description='giving ignored paths to git add'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
index c8de6d8..b40eeb2 100755
--- a/t/t2300-cd-to-toplevel.sh
+++ b/t/t2300-cd-to-toplevel.sh
@@ -2,6 +2,7 @@
test_description='cd_to_toplevel'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
EXEC_PATH="$(git --exec-path)"
diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh
index 37ad794..2f564d5 100755
--- a/t/t2400-worktree-add.sh
+++ b/t/t2400-worktree-add.sh
@@ -165,8 +165,62 @@
(
git clone --bare . bare2 &&
cd bare2 &&
- git worktree add ../there3 main
- )
+ git worktree add ../there3 main &&
+ cd ../there3 &&
+ # Simple check that a Git command does not
+ # immediately fail with the current setup
+ git status
+ ) &&
+ cat >expect <<-EOF &&
+ init.t
+ EOF
+ ls there3 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '"add" to bare repo with worktree config' '
+ (
+ git clone --bare . bare3 &&
+ cd bare3 &&
+ git config extensions.worktreeconfig true &&
+
+ # Add config values that are erroneous to have in
+ # a config.worktree file outside of the main
+ # working tree, to check that Git filters them out
+ # when copying config during "git worktree add".
+ git config --worktree core.bare true &&
+ git config --worktree core.worktree "$(pwd)" &&
+
+ # We want to check that bogus.key is copied
+ git config --worktree bogus.key value &&
+ git config --unset core.bare &&
+ git worktree add ../there4 main &&
+ cd ../there4 &&
+
+ # Simple check that a Git command does not
+ # immediately fail with the current setup
+ git status &&
+ git worktree add --detach ../there5 &&
+ cd ../there5 &&
+ git status
+ ) &&
+
+ # the worktree has the arbitrary value copied.
+ test_cmp_config -C there4 value bogus.key &&
+ test_cmp_config -C there5 value bogus.key &&
+
+ # however, core.bare and core.worktree were removed.
+ test_must_fail git -C there4 config core.bare &&
+ test_must_fail git -C there4 config core.worktree &&
+
+ cat >expect <<-EOF &&
+ init.t
+ EOF
+
+ ls there4 >actual &&
+ test_cmp expect actual &&
+ ls there5 >actual &&
+ test_cmp expect actual
'
test_expect_success 'checkout with grafts' '
@@ -505,10 +559,7 @@
'
post_checkout_hook () {
- gitdir=${1:-.git}
- test_when_finished "rm -f $gitdir/hooks/post-checkout" &&
- mkdir -p $gitdir/hooks &&
- write_script $gitdir/hooks/post-checkout <<-\EOF
+ test_hook -C "$1" post-checkout <<-\EOF
{
echo $*
git rev-parse --git-dir --show-toplevel
diff --git a/t/t2401-worktree-prune.sh b/t/t2401-worktree-prune.sh
index a615d3b..3d28c7f 100755
--- a/t/t2401-worktree-prune.sh
+++ b/t/t2401-worktree-prune.sh
@@ -19,7 +19,7 @@
test_expect_success 'prune files inside $GIT_DIR/worktrees' '
mkdir .git/worktrees &&
: >.git/worktrees/abc &&
- git worktree prune --verbose >actual &&
+ git worktree prune --verbose 2>actual &&
cat >expect <<EOF &&
Removing worktrees/abc: not a valid directory
EOF
@@ -34,7 +34,7 @@
cat >expect <<EOF &&
Removing worktrees/def: gitdir file does not exist
EOF
- git worktree prune --verbose >actual &&
+ git worktree prune --verbose 2>actual &&
test_cmp expect actual &&
! test -d .git/worktrees/def &&
! test -d .git/worktrees
@@ -45,7 +45,7 @@
: >.git/worktrees/def/def &&
: >.git/worktrees/def/gitdir &&
chmod u-r .git/worktrees/def/gitdir &&
- git worktree prune --verbose >actual &&
+ git worktree prune --verbose 2>actual &&
test_i18ngrep "Removing worktrees/def: unable to read gitdir file" actual &&
! test -d .git/worktrees/def &&
! test -d .git/worktrees
@@ -55,7 +55,7 @@
mkdir -p .git/worktrees/def/abc &&
: >.git/worktrees/def/def &&
: >.git/worktrees/def/gitdir &&
- git worktree prune --verbose >actual &&
+ git worktree prune --verbose 2>actual &&
test_i18ngrep "Removing worktrees/def: invalid gitdir file" actual &&
! test -d .git/worktrees/def &&
! test -d .git/worktrees
@@ -65,7 +65,7 @@
mkdir -p .git/worktrees/def/abc &&
: >.git/worktrees/def/def &&
echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
- git worktree prune --verbose >actual &&
+ git worktree prune --verbose 2>actual &&
test_i18ngrep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
! test -d .git/worktrees/def &&
! test -d .git/worktrees
@@ -101,7 +101,7 @@
git worktree add --detach w2 &&
sed "s/w2/w1/" .git/worktrees/w2/gitdir >.git/worktrees/w2/gitdir.new &&
mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir &&
- git worktree prune --verbose >actual &&
+ git worktree prune --verbose 2>actual &&
test_i18ngrep "duplicate entry" actual &&
test -d .git/worktrees/w1 &&
! test -d .git/worktrees/w2
@@ -114,7 +114,7 @@
git -C repo worktree add --detach ../wt &&
rm -fr wt &&
mv repo wt &&
- git -C wt worktree prune --verbose >actual &&
+ git -C wt worktree prune --verbose 2>actual &&
test_i18ngrep "duplicate entry" actual &&
! test -d .git/worktrees/wt
'
diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
index 4012bd6..79e0fce 100755
--- a/t/t2402-worktree-list.sh
+++ b/t/t2402-worktree-list.sh
@@ -64,6 +64,25 @@
test_cmp expect actual
'
+test_expect_success '"list" all worktrees --porcelain -z' '
+ test_when_finished "rm -rf here _actual actual expect &&
+ git worktree prune" &&
+ printf "worktree %sQHEAD %sQbranch %sQQ" \
+ "$(git rev-parse --show-toplevel)" \
+ $(git rev-parse HEAD --symbolic-full-name HEAD) >expect &&
+ git worktree add --detach here main &&
+ printf "worktree %sQHEAD %sQdetachedQQ" \
+ "$(git -C here rev-parse --show-toplevel)" \
+ "$(git rev-parse HEAD)" >>expect &&
+ git worktree list --porcelain -z >_actual &&
+ nul_to_q <_actual >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '"list" -z fails without --porcelain' '
+ test_must_fail git worktree list -z
+'
+
test_expect_success '"list" all worktrees with locked annotation' '
test_when_finished "rm -rf locked unlocked out && git worktree prune" &&
git worktree add --detach locked main &&
@@ -134,7 +153,7 @@
git worktree list >out &&
grep "/prunable *[0-9a-f].* prunable$" out &&
! grep "/unprunable *[0-9a-f].* unprunable$" out &&
- git worktree prune --verbose >out &&
+ git worktree prune --verbose 2>out &&
test_i18ngrep "^Removing worktrees/prunable" out &&
test_i18ngrep ! "^Removing worktrees/unprunable" out
'
diff --git a/t/t2404-worktree-config.sh b/t/t2404-worktree-config.sh
index 9536d10..842937b 100755
--- a/t/t2404-worktree-config.sh
+++ b/t/t2404-worktree-config.sh
@@ -2,6 +2,7 @@
test_description="config file in multi worktree"
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t2406-worktree-repair.sh b/t/t2406-worktree-repair.sh
index f737418..5c44453 100755
--- a/t/t2406-worktree-repair.sh
+++ b/t/t2406-worktree-repair.sh
@@ -45,9 +45,8 @@
git worktree add --detach corrupt &&
git -C corrupt rev-parse --absolute-git-dir >expect &&
eval "$butcher" &&
- git -C "$repairdir" worktree repair >out 2>err &&
- test_i18ngrep "$problem" out &&
- test_must_be_empty err &&
+ git -C "$repairdir" worktree repair 2>err &&
+ test_i18ngrep "$problem" err &&
git -C corrupt rev-parse --absolute-git-dir >actual &&
test_cmp expect actual
}
@@ -130,10 +129,9 @@
sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
rm .git/worktrees/orig/gitdir &&
mv orig moved &&
- git worktree repair moved >out 2>err &&
+ git worktree repair moved 2>err &&
test_cmp expect .git/worktrees/orig/gitdir &&
- test_i18ngrep "gitdir unreadable" out &&
- test_must_be_empty err
+ test_i18ngrep "gitdir unreadable" err
'
test_expect_success 'repair incorrect gitdir' '
@@ -141,10 +139,9 @@
git worktree add --detach orig &&
sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
mv orig moved &&
- git worktree repair moved >out 2>err &&
+ git worktree repair moved 2>err &&
test_cmp expect .git/worktrees/orig/gitdir &&
- test_i18ngrep "gitdir incorrect" out &&
- test_must_be_empty err
+ test_i18ngrep "gitdir incorrect" err
'
test_expect_success 'repair gitdir (implicit) from linked worktree' '
@@ -152,10 +149,9 @@
git worktree add --detach orig &&
sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
mv orig moved &&
- git -C moved worktree repair >out 2>err &&
+ git -C moved worktree repair 2>err &&
test_cmp expect .git/worktrees/orig/gitdir &&
- test_i18ngrep "gitdir incorrect" out &&
- test_must_be_empty err
+ test_i18ngrep "gitdir incorrect" err
'
test_expect_success 'unable to repair gitdir (implicit) from main worktree' '
@@ -163,9 +159,8 @@
git worktree add --detach orig &&
cat .git/worktrees/orig/gitdir >expect &&
mv orig moved &&
- git worktree repair >out 2>err &&
+ git worktree repair 2>err &&
test_cmp expect .git/worktrees/orig/gitdir &&
- test_must_be_empty out &&
test_must_be_empty err
'
@@ -178,12 +173,11 @@
sed s,orig2/\.git$,moved2/.git, .git/worktrees/orig2/gitdir >expect2 &&
mv orig1 moved1 &&
mv orig2 moved2 &&
- git worktree repair moved1 moved2 >out 2>err &&
+ git worktree repair moved1 moved2 2>err &&
test_cmp expect1 .git/worktrees/orig1/gitdir &&
test_cmp expect2 .git/worktrees/orig2/gitdir &&
- test_i18ngrep "gitdir incorrect:.*orig1/gitdir$" out &&
- test_i18ngrep "gitdir incorrect:.*orig2/gitdir$" out &&
- test_must_be_empty err
+ test_i18ngrep "gitdir incorrect:.*orig1/gitdir$" err &&
+ test_i18ngrep "gitdir incorrect:.*orig2/gitdir$" err
'
test_expect_success 'repair moved main and linked worktrees' '
diff --git a/t/t2500-untracked-overwriting.sh b/t/t2500-untracked-overwriting.sh
new file mode 100755
index 0000000..5c0bf4d
--- /dev/null
+++ b/t/t2500-untracked-overwriting.sh
@@ -0,0 +1,244 @@
+#!/bin/sh
+
+test_description='Test handling of overwriting untracked files'
+
+. ./test-lib.sh
+
+test_setup_reset () {
+ git init reset_$1 &&
+ (
+ cd reset_$1 &&
+ test_commit init &&
+
+ git branch stable &&
+ git branch work &&
+
+ git checkout work &&
+ test_commit foo &&
+
+ git checkout stable
+ )
+}
+
+test_expect_success 'reset --hard will nuke untracked files/dirs' '
+ test_setup_reset hard &&
+ (
+ cd reset_hard &&
+ git ls-tree -r stable &&
+ git log --all --name-status --oneline &&
+ git ls-tree -r work &&
+
+ mkdir foo.t &&
+ echo precious >foo.t/file &&
+ echo foo >expect &&
+
+ git reset --hard work &&
+
+ # check that untracked directory foo.t/ was nuked
+ test_path_is_file foo.t &&
+ test_cmp expect foo.t
+ )
+'
+
+test_expect_success 'reset --merge will preserve untracked files/dirs' '
+ test_setup_reset merge &&
+ (
+ cd reset_merge &&
+
+ mkdir foo.t &&
+ echo precious >foo.t/file &&
+ cp foo.t/file expect &&
+
+ test_must_fail git reset --merge work 2>error &&
+ test_cmp expect foo.t/file &&
+ grep "Updating .foo.t. would lose untracked files" error
+ )
+'
+
+test_expect_success 'reset --keep will preserve untracked files/dirs' '
+ test_setup_reset keep &&
+ (
+ cd reset_keep &&
+
+ mkdir foo.t &&
+ echo precious >foo.t/file &&
+ cp foo.t/file expect &&
+
+ test_must_fail git reset --merge work 2>error &&
+ test_cmp expect foo.t/file &&
+ grep "Updating.*foo.t.*would lose untracked files" error
+ )
+'
+
+test_setup_checkout_m () {
+ git init checkout &&
+ (
+ cd checkout &&
+ test_commit init &&
+
+ test_write_lines file has some >filler &&
+ git add filler &&
+ git commit -m filler &&
+
+ git branch stable &&
+
+ git switch -c work &&
+ echo stuff >notes.txt &&
+ test_write_lines file has some words >filler &&
+ git add notes.txt filler &&
+ git commit -m filler &&
+
+ git checkout stable
+ )
+}
+
+test_expect_success 'checkout -m does not nuke untracked file' '
+ test_setup_checkout_m &&
+ (
+ cd checkout &&
+
+ # Tweak filler
+ test_write_lines this file has some >filler &&
+ # Make an untracked file, save its contents in "expect"
+ echo precious >notes.txt &&
+ cp notes.txt expect &&
+
+ test_must_fail git checkout -m work &&
+ test_cmp expect notes.txt
+ )
+'
+
+test_setup_sequencing () {
+ git init sequencing_$1 &&
+ (
+ cd sequencing_$1 &&
+ test_commit init &&
+
+ test_write_lines this file has some words >filler &&
+ git add filler &&
+ git commit -m filler &&
+
+ mkdir -p foo/bar &&
+ test_commit foo/bar/baz &&
+
+ git branch simple &&
+ git branch fooey &&
+
+ git checkout fooey &&
+ git rm foo/bar/baz.t &&
+ echo stuff >>filler &&
+ git add -u &&
+ git commit -m "changes" &&
+
+ git checkout simple &&
+ echo items >>filler &&
+ echo newstuff >>newfile &&
+ git add filler newfile &&
+ git commit -m another
+ )
+}
+
+test_expect_success 'git rebase --abort and untracked files' '
+ test_setup_sequencing rebase_abort_and_untracked &&
+ (
+ cd sequencing_rebase_abort_and_untracked &&
+ git checkout fooey &&
+ test_must_fail git rebase simple &&
+
+ cat init.t &&
+ git rm init.t &&
+ echo precious >init.t &&
+ cp init.t expect &&
+ git status --porcelain &&
+ test_must_fail git rebase --abort &&
+ test_cmp expect init.t
+ )
+'
+
+test_expect_success 'git rebase fast forwarding and untracked files' '
+ test_setup_sequencing rebase_fast_forward_and_untracked &&
+ (
+ cd sequencing_rebase_fast_forward_and_untracked &&
+ git checkout init &&
+ echo precious >filler &&
+ cp filler expect &&
+ test_must_fail git rebase init simple &&
+ test_cmp expect filler
+ )
+'
+
+test_expect_failure 'git rebase --autostash and untracked files' '
+ test_setup_sequencing rebase_autostash_and_untracked &&
+ (
+ cd sequencing_rebase_autostash_and_untracked &&
+ git checkout simple &&
+ git rm filler &&
+ mkdir filler &&
+ echo precious >filler/file &&
+ cp filler/file expect &&
+ git rebase --autostash init &&
+ test_path_is_file filler/file
+ )
+'
+
+test_expect_failure 'git stash and untracked files' '
+ test_setup_sequencing stash_and_untracked_files &&
+ (
+ cd sequencing_stash_and_untracked_files &&
+ git checkout simple &&
+ git rm filler &&
+ mkdir filler &&
+ echo precious >filler/file &&
+ cp filler/file expect &&
+ git status --porcelain &&
+ git stash push &&
+ git status --porcelain &&
+ test_path_is_file filler/file
+ )
+'
+
+test_expect_success 'git am --abort and untracked dir vs. unmerged file' '
+ test_setup_sequencing am_abort_and_untracked &&
+ (
+ cd sequencing_am_abort_and_untracked &&
+ git format-patch -1 --stdout fooey >changes.mbox &&
+ test_must_fail git am --3way changes.mbox &&
+
+ # Delete the conflicted file; we will stage and commit it later
+ rm filler &&
+
+ # Put an unrelated untracked directory there
+ mkdir filler &&
+ echo foo >filler/file1 &&
+ echo bar >filler/file2 &&
+
+ test_must_fail git am --abort 2>errors &&
+ test_path_is_dir filler &&
+ grep "Updating .filler. would lose untracked files in it" errors
+ )
+'
+
+test_expect_success 'git am --skip and untracked dir vs deleted file' '
+ test_setup_sequencing am_skip_and_untracked &&
+ (
+ cd sequencing_am_skip_and_untracked &&
+ git checkout fooey &&
+ git format-patch -1 --stdout simple >changes.mbox &&
+ test_must_fail git am --3way changes.mbox &&
+
+ # Delete newfile
+ rm newfile &&
+
+ # Put an unrelated untracked directory there
+ mkdir newfile &&
+ echo foo >newfile/file1 &&
+ echo bar >newfile/file2 &&
+
+ # Change our mind about resolutions, just skip this patch
+ test_must_fail git am --skip 2>errors &&
+ test_path_is_dir newfile &&
+ grep "Updating .newfile. would lose untracked files in it" errors
+ )
+'
+
+test_done
diff --git a/t/t2501-cwd-empty.sh b/t/t2501-cwd-empty.sh
new file mode 100755
index 0000000..f6d8d7d
--- /dev/null
+++ b/t/t2501-cwd-empty.sh
@@ -0,0 +1,277 @@
+#!/bin/sh
+
+test_description='Test handling of the current working directory becoming empty'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ test_commit init &&
+
+ git branch fd_conflict &&
+
+ mkdir -p foo/bar &&
+ test_commit foo/bar/baz &&
+
+ git revert HEAD &&
+ git tag reverted &&
+
+ git checkout fd_conflict &&
+ mkdir dirORfile &&
+ test_commit dirORfile/foo &&
+
+ git rm -r dirORfile &&
+ echo not-a-directory >dirORfile &&
+ git add dirORfile &&
+ git commit -m dirORfile &&
+
+ git switch -c df_conflict HEAD~1 &&
+ test_commit random_file &&
+
+ git switch -c undo_fd_conflict fd_conflict &&
+ git revert HEAD
+'
+
+test_incidental_dir_removal () {
+ test_when_finished "git reset --hard" &&
+
+ git checkout foo/bar/baz^{commit} &&
+ test_path_is_dir foo/bar &&
+
+ (
+ cd foo &&
+ "$@" &&
+
+ # Make sure foo still exists, and commands needing it work
+ test-tool getcwd &&
+ git status --porcelain
+ ) &&
+ test_path_is_missing foo/bar/baz &&
+ test_path_is_missing foo/bar &&
+
+ test_path_is_dir foo
+}
+
+test_required_dir_removal () {
+ git checkout df_conflict^{commit} &&
+ test_when_finished "git clean -fdx" &&
+
+ (
+ cd dirORfile &&
+
+ # Ensure command refuses to run
+ test_must_fail "$@" 2>../error &&
+ grep "Refusing to remove.*current working directory" ../error &&
+
+ # ...and that the index and working tree are left clean
+ git diff --exit-code HEAD &&
+
+ # Ensure that getcwd and git status do not error out (which
+ # they might if the current working directory had been removed)
+ test-tool getcwd &&
+ git status --porcelain
+ ) &&
+
+ test_path_is_dir dirORfile
+}
+
+test_expect_success 'checkout does not clean cwd incidentally' '
+ test_incidental_dir_removal git checkout init
+'
+
+test_expect_success 'checkout fails if cwd needs to be removed' '
+ test_required_dir_removal git checkout fd_conflict
+'
+
+test_expect_success 'reset --hard does not clean cwd incidentally' '
+ test_incidental_dir_removal git reset --hard init
+'
+
+test_expect_success 'reset --hard fails if cwd needs to be removed' '
+ test_required_dir_removal git reset --hard fd_conflict
+'
+
+test_expect_success 'merge does not clean cwd incidentally' '
+ test_incidental_dir_removal git merge reverted
+'
+
+# This file uses some simple merges where
+# Base: 'dirORfile/' exists
+# Side1: random other file changed
+# Side2: 'dirORfile/' removed, 'dirORfile' added
+# this should resolve cleanly, but merge-recursive throws merge conflicts
+# because it's dumb. Add a special test for checking merge-recursive (and
+# merge-ort), then after this just hard require ort for all remaining tests.
+#
+test_expect_success 'merge fails if cwd needs to be removed; recursive friendly' '
+ git checkout foo/bar/baz &&
+ test_when_finished "git clean -fdx" &&
+
+ mkdir dirORfile &&
+ (
+ cd dirORfile &&
+
+ test_must_fail git merge fd_conflict 2>../error
+ ) &&
+
+ test_path_is_dir dirORfile &&
+ grep "Refusing to remove the current working directory" error
+'
+
+GIT_TEST_MERGE_ALGORITHM=ort
+
+test_expect_success 'merge fails if cwd needs to be removed' '
+ test_required_dir_removal git merge fd_conflict
+'
+
+test_expect_success 'cherry-pick does not clean cwd incidentally' '
+ test_incidental_dir_removal git cherry-pick reverted
+'
+
+test_expect_success 'cherry-pick fails if cwd needs to be removed' '
+ test_required_dir_removal git cherry-pick fd_conflict
+'
+
+test_expect_success 'rebase does not clean cwd incidentally' '
+ test_incidental_dir_removal git rebase reverted
+'
+
+test_expect_success 'rebase fails if cwd needs to be removed' '
+ test_required_dir_removal git rebase fd_conflict
+'
+
+test_expect_success 'revert does not clean cwd incidentally' '
+ test_incidental_dir_removal git revert HEAD
+'
+
+test_expect_success 'revert fails if cwd needs to be removed' '
+ test_required_dir_removal git revert undo_fd_conflict
+'
+
+test_expect_success 'rm does not clean cwd incidentally' '
+ test_incidental_dir_removal git rm bar/baz.t
+'
+
+test_expect_success 'apply does not remove cwd incidentally' '
+ git diff HEAD HEAD~1 >patch &&
+ test_incidental_dir_removal git apply ../patch
+'
+
+test_incidental_untracked_dir_removal () {
+ test_when_finished "git reset --hard" &&
+
+ git checkout foo/bar/baz^{commit} &&
+ mkdir -p untracked &&
+ mkdir empty
+ >untracked/random &&
+
+ (
+ cd untracked &&
+ "$@" &&
+
+ # Make sure untracked still exists, and commands needing it work
+ test-tool getcwd &&
+ git status --porcelain
+ ) &&
+ test_path_is_missing empty &&
+ test_path_is_missing untracked/random &&
+
+ test_path_is_dir untracked
+}
+
+test_expect_success 'clean does not remove cwd incidentally' '
+ test_incidental_untracked_dir_removal \
+ git -C .. clean -fd -e warnings . >warnings &&
+ grep "Refusing to remove current working directory" warnings
+'
+
+test_expect_success 'stash does not remove cwd incidentally' '
+ test_incidental_untracked_dir_removal \
+ git stash --include-untracked
+'
+
+test_expect_success '`rm -rf dir` only removes a subset of dir' '
+ test_when_finished "rm -rf a/" &&
+
+ mkdir -p a/b/c &&
+ >a/b/c/untracked &&
+ >a/b/c/tracked &&
+ git add a/b/c/tracked &&
+
+ (
+ cd a/b &&
+ git rm -rf ../b
+ ) &&
+
+ test_path_is_dir a/b &&
+ test_path_is_missing a/b/c/tracked &&
+ test_path_is_file a/b/c/untracked
+'
+
+test_expect_success '`rm -rf dir` even with only tracked files will remove something else' '
+ test_when_finished "rm -rf a/" &&
+
+ mkdir -p a/b/c &&
+ >a/b/c/tracked &&
+ git add a/b/c/tracked &&
+
+ (
+ cd a/b &&
+ git rm -rf ../b
+ ) &&
+
+ test_path_is_missing a/b/c/tracked &&
+ test_path_is_missing a/b/c &&
+ test_path_is_dir a/b
+'
+
+test_expect_success 'git version continues working from a deleted dir' '
+ mkdir tmp &&
+ (
+ cd tmp &&
+ rm -rf ../tmp &&
+ git version
+ )
+'
+
+test_submodule_removal () {
+ path_status=$1 &&
+ shift &&
+
+ test_status=
+ test "$path_status" = dir && test_status=test_must_fail
+
+ test_when_finished "git reset --hard HEAD~1" &&
+ test_when_finished "rm -rf .git/modules/my_submodule" &&
+
+ git checkout foo/bar/baz &&
+
+ git init my_submodule &&
+ touch my_submodule/file &&
+ git -C my_submodule add file &&
+ git -C my_submodule commit -m "initial commit" &&
+ git submodule add ./my_submodule &&
+ git commit -m "Add the submodule" &&
+
+ (
+ cd my_submodule &&
+ $test_status "$@"
+ ) &&
+
+ test_path_is_${path_status} my_submodule
+}
+
+test_expect_success 'rm -r with -C leaves submodule if cwd inside' '
+ test_submodule_removal dir git -C .. rm -r my_submodule/
+'
+
+test_expect_success 'rm -r leaves submodule if cwd inside' '
+ test_submodule_removal dir \
+ git --git-dir=../.git --work-tree=.. rm -r ../my_submodule/
+'
+
+test_expect_success 'rm -rf removes submodule even if cwd inside' '
+ test_submodule_removal missing \
+ git --git-dir=../.git --work-tree=.. rm -rf ../my_submodule/
+'
+
+test_done
diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index 740ce56..11af455 100755
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -15,6 +15,8 @@
path3/file3 - a file in a directory
path4 - an empty directory
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup ' '
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index 516c95e..48cec4e 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -8,6 +8,7 @@
This test runs git ls-files --others and tests --exclude patterns.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
rm -fr one three
@@ -102,7 +103,7 @@
>output &&
test_cmp expect output'
-test_expect_success 'restore gitignore' '
+test_expect_success !SANITIZE_LEAK 'restore gitignore' '
git checkout --ignore-skip-worktree-bits $allignores &&
rm .git/index
'
@@ -125,7 +126,7 @@
# three/
EOF
-test_expect_success 'git status honors core.excludesfile' \
+test_expect_success !SANITIZE_LEAK 'git status honors core.excludesfile' \
'test_cmp expect output'
test_expect_success 'trailing slash in exclude allows directory match(1)' '
diff --git a/t/t3002-ls-files-dashpath.sh b/t/t3002-ls-files-dashpath.sh
index 8704b04..54d22a4 100755
--- a/t/t3002-ls-files-dashpath.sh
+++ b/t/t3002-ls-files-dashpath.sh
@@ -12,6 +12,8 @@
-foo - a file with a funny name.
-- - another file with a funny name.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success \
diff --git a/t/t3003-ls-files-exclude.sh b/t/t3003-ls-files-exclude.sh
index c41c4f0..7933dff 100755
--- a/t/t3003-ls-files-exclude.sh
+++ b/t/t3003-ls-files-exclude.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='ls-files --exclude does not affect index files'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'create repo with file' '
diff --git a/t/t3004-ls-files-basic.sh b/t/t3004-ls-files-basic.sh
index 9fd5a1f..a16e25c 100755
--- a/t/t3004-ls-files-basic.sh
+++ b/t/t3004-ls-files-basic.sh
@@ -6,6 +6,7 @@
command-line arguments.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'ls-files in empty repository' '
diff --git a/t/t3005-ls-files-relative.sh b/t/t3005-ls-files-relative.sh
index 727e9ae..fbfa210 100755
--- a/t/t3005-ls-files-relative.sh
+++ b/t/t3005-ls-files-relative.sh
@@ -5,6 +5,7 @@
This test runs git ls-files with various relative path arguments.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'prepare' '
@@ -38,10 +39,7 @@
test_expect_success 'ls-files -c' '
(
cd top/sub &&
- for f in ../y*
- do
- echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
- done >expect.err &&
+ printf "error: pathspec $SQ%s$SQ did not match any file(s) known to git\n" ../y* >expect.err &&
echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
ls ../x* >expect.out &&
test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
@@ -53,10 +51,7 @@
test_expect_success 'ls-files -o' '
(
cd top/sub &&
- for f in ../x*
- do
- echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
- done >expect.err &&
+ printf "error: pathspec $SQ%s$SQ did not match any file(s) known to git\n" ../x* >expect.err &&
echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
ls ../y* >expect.out &&
test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
diff --git a/t/t3006-ls-files-long.sh b/t/t3006-ls-files-long.sh
index e109c3f..2aaf91e 100755
--- a/t/t3006-ls-files-long.sh
+++ b/t/t3006-ls-files-long.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='overly long paths'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t3007-ls-files-recurse-submodules.sh b/t/t3007-ls-files-recurse-submodules.sh
index 4a08000..dd7770e 100755
--- a/t/t3007-ls-files-recurse-submodules.sh
+++ b/t/t3007-ls-files-recurse-submodules.sh
@@ -34,6 +34,23 @@
test_cmp expect actual
'
+test_expect_success '--stage' '
+ GITMODULES_HASH=$(git rev-parse HEAD:.gitmodules) &&
+ A_HASH=$(git rev-parse HEAD:a) &&
+ B_HASH=$(git rev-parse HEAD:b/b) &&
+ C_HASH=$(git -C submodule rev-parse HEAD:c) &&
+
+ cat >expect <<-EOF &&
+ 100644 $GITMODULES_HASH 0 .gitmodules
+ 100644 $A_HASH 0 a
+ 100644 $B_HASH 0 b/b
+ 100644 $C_HASH 0 submodule/c
+ EOF
+
+ git ls-files --stage --recurse-submodules >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'ls-files correctly outputs files in submodule with -z' '
lf_to_nul >expect <<-\EOF &&
.gitmodules
@@ -292,7 +309,6 @@
test_incompatible_with_recurse_submodules --deleted
test_incompatible_with_recurse_submodules --modified
test_incompatible_with_recurse_submodules --others
-test_incompatible_with_recurse_submodules --stage
test_incompatible_with_recurse_submodules --killed
test_incompatible_with_recurse_submodules --unmerged
diff --git a/t/t3008-ls-files-lazy-init-name-hash.sh b/t/t3008-ls-files-lazy-init-name-hash.sh
index 85f3704..51d3dff 100755
--- a/t/t3008-ls-files-lazy-init-name-hash.sh
+++ b/t/t3008-ls-files-lazy-init-name-hash.sh
@@ -2,6 +2,7 @@
test_description='Test the lazy init name hash with various folder structures'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
if test 1 -eq $(test-tool online-cpus)
diff --git a/t/t3020-ls-files-error-unmatch.sh b/t/t3020-ls-files-error-unmatch.sh
index 124e73b..2cbcbc0 100755
--- a/t/t3020-ls-files-error-unmatch.sh
+++ b/t/t3020-ls-files-error-unmatch.sh
@@ -9,6 +9,8 @@
returns an error when a non-existent path is provided on the command
line.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t3040-subprojects-basic.sh b/t/t3040-subprojects-basic.sh
index 6abdcbb..bd65dfc 100755
--- a/t/t3040-subprojects-basic.sh
+++ b/t/t3040-subprojects-basic.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='Basic subproject functionality'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup: create superproject' '
diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index 56ea4bd..f953996 100755
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -2,6 +2,7 @@
test_description='wildmatch tests'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Disable expensive chain-lint tests; all of the tests in this script
@@ -192,7 +193,7 @@
file=$(cat .git/expected_test_file) &&
if should_create_test_file "$file"
then
- dirs=${file%/*}
+ dirs=${file%/*} &&
if test "$file" != "$dirs"
then
mkdir -p -- "$dirs" &&
diff --git a/t/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh
index 18baf49..436de44 100755
--- a/t/t3100-ls-tree-restrict.sh
+++ b/t/t3100-ls-tree-restrict.sh
@@ -16,6 +16,8 @@
The new path restriction code should do the right thing for path2 and
path2/baz. Also path0/ should snow nothing.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success \
diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh
index 12bf310..217006d 100755
--- a/t/t3101-ls-tree-dirname.sh
+++ b/t/t3101-ls-tree-dirname.sh
@@ -19,6 +19,8 @@
Test the handling of multiple directories which have matching file
entries. Also test odd filename and missing entries handling.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
@@ -199,31 +201,34 @@
test_cmp expected check
'
-test_expect_success 'ls-tree --name-only' '
- git ls-tree --name-only $tree >current &&
- cat >expected <<\EOF &&
-1.txt
-2.txt
-path0
-path1
-path2
-path3
-EOF
- test_output
-'
+for opt in --name-only --name-status
+do
+ test_expect_success "ls-tree $opt" '
+ git ls-tree $opt $tree >current &&
+ cat >expected <<-\EOF &&
+ 1.txt
+ 2.txt
+ path0
+ path1
+ path2
+ path3
+ EOF
+ test_output
+ '
-test_expect_success 'ls-tree --name-only -r' '
- git ls-tree --name-only -r $tree >current &&
- cat >expected <<\EOF &&
-1.txt
-2.txt
-path0/a/b/c/1.txt
-path1/b/c/1.txt
-path2/1.txt
-path3/1.txt
-path3/2.txt
-EOF
- test_output
-'
+ test_expect_success "ls-tree $opt -r" '
+ git ls-tree $opt -r $tree >current &&
+ cat >expected <<-\EOF &&
+ 1.txt
+ 2.txt
+ path0/a/b/c/1.txt
+ path1/b/c/1.txt
+ path2/1.txt
+ path3/1.txt
+ path3/2.txt
+ EOF
+ test_output
+ '
+done
test_done
diff --git a/t/t3102-ls-tree-wildcards.sh b/t/t3102-ls-tree-wildcards.sh
index 1e16c6b..3942db2 100755
--- a/t/t3102-ls-tree-wildcards.sh
+++ b/t/t3102-ls-tree-wildcards.sh
@@ -2,6 +2,7 @@
test_description='ls-tree with(out) globs'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t3103-ls-tree-misc.sh b/t/t3103-ls-tree-misc.sh
index 1452091..81c6343 100755
--- a/t/t3103-ls-tree-misc.sh
+++ b/t/t3103-ls-tree-misc.sh
@@ -7,6 +7,7 @@
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
@@ -22,4 +23,19 @@
test_must_fail git ls-tree -r HEAD
'
+for opts in \
+ "--long --name-only" \
+ "--name-only --name-status" \
+ "--name-status --object-only" \
+ "--object-only --long"
+do
+ test_expect_success "usage: incompatible options: $opts" '
+ test_expect_code 129 git ls-tree $opts $tree
+ '
+
+ one_opt=$(echo "$opts" | cut -d' ' -f1)
+ test_expect_success "usage: incompatible options: $one_opt and --format" '
+ test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
+ '
+done
test_done
diff --git a/t/t3104-ls-tree-format.sh b/t/t3104-ls-tree-format.sh
new file mode 100755
index 0000000..0769a93
--- /dev/null
+++ b/t/t3104-ls-tree-format.sh
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+test_description='ls-tree --format'
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+test_expect_success 'ls-tree --format usage' '
+ test_expect_code 129 git ls-tree --format=fmt -l HEAD &&
+ test_expect_code 129 git ls-tree --format=fmt --name-only HEAD &&
+ test_expect_code 129 git ls-tree --format=fmt --name-status HEAD
+'
+
+test_expect_success 'setup' '
+ mkdir dir &&
+ test_commit dir/sub-file &&
+ test_commit top-file
+'
+
+test_ls_tree_format () {
+ format=$1 &&
+ opts=$2 &&
+ fmtopts=$3 &&
+ shift 2 &&
+
+ test_expect_success "ls-tree '--format=<$format>' is like options '$opts $fmtopts'" '
+ git ls-tree $opts -r HEAD >expect &&
+ git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "ls-tree '--format=<$format>' on optimized v.s. non-optimized path" '
+ git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
+ git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
+ sed "s/^> //" >actual <actual.raw &&
+ test_cmp expect actual
+ '
+}
+
+test_ls_tree_format \
+ "%(objectmode) %(objecttype) %(objectname)%x09%(path)" \
+ ""
+
+test_ls_tree_format \
+ "%(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)" \
+ "--long"
+
+test_ls_tree_format \
+ "%(path)" \
+ "--name-only"
+
+test_ls_tree_format \
+ "%(objectname)" \
+ "--object-only"
+
+test_ls_tree_format \
+ "%(objectname)" \
+ "--object-only --abbrev" \
+ "--abbrev"
+
+test_ls_tree_format \
+ "%(objectmode) %(objecttype) %(objectname)%x09%(path)" \
+ "-t" \
+ "-t"
+
+test_ls_tree_format \
+ "%(objectmode) %(objecttype) %(objectname)%x09%(path)" \
+ "--full-name" \
+ "--full-name"
+
+test_ls_tree_format \
+ "%(objectmode) %(objecttype) %(objectname)%x09%(path)" \
+ "--full-tree" \
+ "--full-tree"
+
+test_done
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index e575ffb..9723c28 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -42,6 +42,23 @@
git branch abc && test_path_is_file .git/refs/heads/abc
'
+test_expect_success 'git branch abc should fail when abc exists' '
+ test_must_fail git branch abc
+'
+
+test_expect_success 'git branch --force abc should fail when abc is checked out' '
+ test_when_finished git switch main &&
+ git switch abc &&
+ test_must_fail git branch --force abc HEAD~1
+'
+
+test_expect_success 'git branch --force abc should succeed when abc exists' '
+ git rev-parse HEAD~1 >expect &&
+ git branch --force abc HEAD~1 &&
+ git rev-parse abc >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'git branch a/b/c should create a branch' '
git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c
'
@@ -168,6 +185,13 @@
test_must_fail git branch -M bar foo
'
+test_expect_success 'git branch -M foo bar should fail when bar is checked out in worktree' '
+ git branch -f bar &&
+ test_when_finished "git worktree remove wt && git branch -D wt" &&
+ git worktree add wt &&
+ test_must_fail git branch -M bar wt
+'
+
test_expect_success 'git branch -M baz bam should succeed when baz is checked out' '
git checkout -b baz &&
git branch bam &&
@@ -731,6 +755,28 @@
test_must_fail git branch -m u v
'
+test_expect_success SYMLINKS 'git branch -m with symlinked .git/refs' '
+ test_when_finished "rm -rf subdir" &&
+ git init --bare subdir &&
+
+ rm -rfv subdir/refs subdir/objects subdir/packed-refs &&
+ ln -s ../.git/refs subdir/refs &&
+ ln -s ../.git/objects subdir/objects &&
+ ln -s ../.git/packed-refs subdir/packed-refs &&
+
+ git -C subdir rev-parse --absolute-git-dir >subdir.dir &&
+ git rev-parse --absolute-git-dir >our.dir &&
+ ! test_cmp subdir.dir our.dir &&
+
+ git -C subdir log &&
+ git -C subdir branch rename-src &&
+ git rev-parse rename-src >expect &&
+ git -C subdir branch -m rename-src rename-dest &&
+ git rev-parse rename-dest >actual &&
+ test_cmp expect actual &&
+ git branch -D rename-dest
+'
+
test_expect_success 'test tracking setup via --track' '
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
@@ -840,6 +886,41 @@
test_must_fail git branch --track my11 foobar
'
+test_expect_success 'simple tracking works when remote branch name matches' '
+ test_when_finished "rm -rf otherserver" &&
+ git init otherserver &&
+ test_commit -C otherserver my_commit 1 &&
+ git -C otherserver branch feature &&
+ test_config branch.autosetupmerge simple &&
+ test_config remote.otherserver.url otherserver &&
+ test_config remote.otherserver.fetch refs/heads/*:refs/remotes/otherserver/* &&
+ git fetch otherserver &&
+ git branch feature otherserver/feature &&
+ test_cmp_config otherserver branch.feature.remote &&
+ test_cmp_config refs/heads/feature branch.feature.merge
+'
+
+test_expect_success 'simple tracking skips when remote branch name does not match' '
+ test_config branch.autosetupmerge simple &&
+ test_config remote.local.url . &&
+ test_config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+ git fetch local &&
+ git branch my-other local/main &&
+ test_cmp_config "" --default "" branch.my-other.remote &&
+ test_cmp_config "" --default "" branch.my-other.merge
+'
+
+test_expect_success 'simple tracking skips when remote ref is not a branch' '
+ test_config branch.autosetupmerge simple &&
+ test_config remote.localtags.url . &&
+ test_config remote.localtags.fetch refs/tags/*:refs/remotes/localtags/* &&
+ git tag mytag12 main &&
+ git fetch localtags &&
+ git branch mytag12 localtags/mytag12 &&
+ test_cmp_config "" --default "" branch.mytag12.remote &&
+ test_cmp_config "" --default "" branch.mytag12.merge
+'
+
test_expect_success '--set-upstream-to fails on multiple branches' '
echo "fatal: too many arguments to set new upstream" >expect &&
test_must_fail git branch --set-upstream-to main a b c 2>err &&
@@ -866,7 +947,7 @@
'
test_expect_success '--set-upstream-to fails on a non-ref' '
- echo "fatal: Cannot setup tracking information; starting point '"'"'HEAD^{}'"'"' is not a branch." >expect &&
+ echo "fatal: cannot set up tracking information; starting point '"'"'HEAD^{}'"'"' is not a branch" >expect &&
test_must_fail git branch --set-upstream-to HEAD^{} 2>err &&
test_cmp expect err
'
@@ -950,15 +1031,15 @@
test_must_fail git branch --set-upstream origin/main
'
-test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
+test_expect_success '--set-upstream-to notices an error to set branch as own upstream' "
git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
cat >expect <<-\EOF &&
- warning: Not setting branch my13 as its own upstream.
+ warning: not setting branch 'my13' as its own upstream
EOF
test_expect_code 1 git config branch.my13.remote &&
test_expect_code 1 git config branch.my13.merge &&
test_cmp expect actual
-'
+"
# Keep this test last, as it changes the current branch
cat >expect <<EOF
@@ -993,13 +1074,27 @@
git rev-parse --verify gamma@{0}
'
-test_expect_success 'avoid ambiguous track' '
+test_expect_success 'avoid ambiguous track and advise' '
git config branch.autosetupmerge true &&
git config remote.ambi1.url lalala &&
git config remote.ambi1.fetch refs/heads/lalala:refs/heads/main &&
git config remote.ambi2.url lilili &&
git config remote.ambi2.fetch refs/heads/lilili:refs/heads/main &&
- test_must_fail git branch all1 main &&
+ cat <<-EOF >expected &&
+ fatal: not tracking: ambiguous information for ref '\''refs/heads/main'\''
+ hint: There are multiple remotes whose fetch refspecs map to the remote
+ hint: tracking ref '\''refs/heads/main'\'':
+ hint: ambi1
+ hint: ambi2
+ hint: ''
+ hint: This is typically a configuration error.
+ hint: ''
+ hint: To support setting up tracking branches, ensure that
+ hint: different remotes'\'' fetch refspecs map into different
+ hint: tracking namespaces.
+ EOF
+ test_must_fail git branch all1 main 2>actual &&
+ test_cmp expected actual &&
test -z "$(git config branch.all1.merge)"
'
@@ -1418,8 +1513,51 @@
(
cd sort &&
git config branch.sort "v:notvalid" &&
- test_must_fail git branch
+
+ # this works in the "listing" mode, so bad sort key
+ # is a dying offence.
+ test_must_fail git branch &&
+
+ # these do not need to use sorting, and should all
+ # succeed
+ git branch newone main &&
+ git branch -c newone newerone &&
+ git branch -m newone newestone &&
+ git branch -d newerone newestone
)
'
+test_expect_success 'tracking info copied with --track=inherit' '
+ git branch --track=inherit foo2 my1 &&
+ test_cmp_config local branch.foo2.remote &&
+ test_cmp_config refs/heads/main branch.foo2.merge
+'
+
+test_expect_success 'tracking info copied with autoSetupMerge=inherit' '
+ test_unconfig branch.autoSetupMerge &&
+ # default config does not copy tracking info
+ git branch foo-no-inherit my1 &&
+ test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
+ test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
+ # with autoSetupMerge=inherit, we copy tracking info from my1
+ test_config branch.autoSetupMerge inherit &&
+ git branch foo3 my1 &&
+ test_cmp_config local branch.foo3.remote &&
+ test_cmp_config refs/heads/main branch.foo3.merge &&
+ # no tracking info to inherit from main
+ git branch main2 main &&
+ test_cmp_config "" --default "" branch.main2.remote &&
+ test_cmp_config "" --default "" branch.main2.merge
+'
+
+test_expect_success '--track overrides branch.autoSetupMerge' '
+ test_config branch.autoSetupMerge inherit &&
+ git branch --track=direct foo4 my1 &&
+ test_cmp_config . branch.foo4.remote &&
+ test_cmp_config refs/heads/my1 branch.foo4.merge &&
+ git branch --no-track foo5 my1 &&
+ test_cmp_config "" --default "" branch.foo5.remote &&
+ test_cmp_config "" --default "" branch.foo5.merge
+'
+
test_done
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
index 349a810..800fc33 100755
--- a/t/t3201-branch-contains.sh
+++ b/t/t3201-branch-contains.sh
@@ -2,9 +2,6 @@
test_description='branch --contains <commit>, --no-contains <commit> --merged, and --no-merged'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t3202-show-branch.sh b/t/t3202-show-branch.sh
index ad9902a..f2b9199 100755
--- a/t/t3202-show-branch.sh
+++ b/t/t3202-show-branch.sh
@@ -4,12 +4,15 @@
. ./test-lib.sh
+# arbitrary reference time: 2009-08-30 19:20:00
+GIT_TEST_DATE_NOW=1251660000; export GIT_TEST_DATE_NOW
+
test_expect_success 'setup' '
test_commit initial &&
for i in $(test_seq 1 10)
do
git checkout -b branch$i initial &&
- test_commit --no-tag branch$i
+ test_commit --no-tag branch$i || return 1
done &&
git for-each-ref \
--sort=version:refname \
@@ -49,7 +52,7 @@
test_expect_success 'show-branch with showbranch.default' '
for branch in $(cat branches.sorted)
do
- test_config showbranch.default $branch --add
+ test_config showbranch.default $branch --add || return 1
done &&
git show-branch >actual &&
test_cmp expect actual
@@ -124,7 +127,7 @@
do
git rev-parse $branch >expect &&
git show-branch --merge-base $branch >actual &&
- test_cmp expect actual
+ test_cmp expect actual || return 1
done
'
@@ -133,7 +136,7 @@
do
git rev-parse initial >expect &&
git show-branch --merge-base initial $branch >actual &&
- test_cmp expect actual
+ test_cmp expect actual || return 1
done
'
@@ -146,4 +149,30 @@
test_cmp expect actual
'
+test_expect_success 'show branch --reflog=2' '
+ sed "s/^> //" >expect <<-\EOF &&
+ > ! [refs/heads/branch10@{0}] (4 years, 5 months ago) commit: branch10
+ > ! [refs/heads/branch10@{1}] (4 years, 5 months ago) commit: branch10
+ > --
+ > + [refs/heads/branch10@{0}] branch10
+ > ++ [refs/heads/branch10@{1}] initial
+ EOF
+ git show-branch --reflog=2 >actual &&
+ test_cmp actual expect
+'
+
+# incompatible options
+while read combo
+do
+ test_expect_success "show-branch $combo (should fail)" '
+ test_must_fail git show-branch $combo 2>error &&
+ grep -e "cannot be used together" -e "usage:" error
+ '
+done <<\EOF
+--all --reflog
+--merge-base --reflog
+--list --merge-base
+--reflog --current
+EOF
+
test_done
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 6e94c6d..d34d77f 100755
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -1,9 +1,6 @@
#!/bin/sh
test_description='git branch display tests'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
diff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh
index 08bd906..0b61da9 100755
--- a/t/t3205-branch-color.sh
+++ b/t/t3205-branch-color.sh
@@ -1,9 +1,7 @@
#!/bin/sh
test_description='basic branch output coloring'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'set up some sample branches' '
diff --git a/t/t3207-branch-submodule.sh b/t/t3207-branch-submodule.sh
new file mode 100755
index 0000000..cfde6b2
--- /dev/null
+++ b/t/t3207-branch-submodule.sh
@@ -0,0 +1,328 @@
+#!/bin/sh
+
+test_description='git branch submodule tests'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-rebase.sh
+
+pwd=$(pwd)
+
+# Creates a clean test environment in "pwd" by copying the repo setup
+# from test_dirs.
+reset_test () {
+ rm -fr super &&
+ rm -fr sub-sub-upstream &&
+ rm -fr sub-upstream &&
+ cp -r test_dirs/* .
+}
+
+# Tests that the expected branch does not exist
+test_no_branch () {
+ DIR=$1 &&
+ BRANCH_NAME=$2 &&
+ test_must_fail git -C "$DIR" rev-parse "$BRANCH_NAME" 2>err &&
+ grep "ambiguous argument .$BRANCH_NAME." err
+}
+
+test_expect_success 'setup superproject and submodule' '
+ mkdir test_dirs &&
+ (
+ cd test_dirs &&
+ git init super &&
+ test_commit -C super foo &&
+ git init sub-sub-upstream &&
+ test_commit -C sub-sub-upstream foo &&
+ git init sub-upstream &&
+ # Submodule in a submodule
+ git -C sub-upstream submodule add "${pwd}/test_dirs/sub-sub-upstream" sub-sub &&
+ git -C sub-upstream commit -m "add submodule" &&
+ # Regular submodule
+ git -C super submodule add "${pwd}/test_dirs/sub-upstream" sub &&
+ # Submodule in a subdirectory
+ git -C super submodule add "${pwd}/test_dirs/sub-sub-upstream" second/sub &&
+ git -C super commit -m "add submodule" &&
+ git -C super config submodule.propagateBranches true &&
+ git -C super/sub submodule update --init
+ ) &&
+ reset_test
+'
+
+# Test the argument parsing
+test_expect_success '--recurse-submodules should create branches' '
+ test_when_finished "reset_test" &&
+ (
+ cd super &&
+ git branch --recurse-submodules branch-a &&
+ git rev-parse branch-a &&
+ git -C sub rev-parse branch-a &&
+ git -C sub/sub-sub rev-parse branch-a &&
+ git -C second/sub rev-parse branch-a
+ )
+'
+
+test_expect_success '--recurse-submodules should die if submodule.propagateBranches is false' '
+ test_when_finished "reset_test" &&
+ (
+ cd super &&
+ echo "fatal: branch with --recurse-submodules can only be used if submodule.propagateBranches is enabled" >expected &&
+ test_must_fail git -c submodule.propagateBranches=false branch --recurse-submodules branch-a 2>actual &&
+ test_cmp expected actual
+ )
+'
+
+test_expect_success '--recurse-submodules should fail when not creating branches' '
+ test_when_finished "reset_test" &&
+ (
+ cd super &&
+ git branch --recurse-submodules branch-a &&
+ echo "fatal: --recurse-submodules can only be used to create branches" >expected &&
+ test_must_fail git branch --recurse-submodules -D branch-a 2>actual &&
+ test_cmp expected actual &&
+ # Assert that the branches were not deleted
+ git rev-parse branch-a &&
+ git -C sub rev-parse branch-a
+ )
+'
+
+test_expect_success 'should respect submodule.recurse when creating branches' '
+ test_when_finished "reset_test" &&
+ (
+ cd super &&
+ git -c submodule.recurse=true branch branch-a &&
+ git rev-parse branch-a &&
+ git -C sub rev-parse branch-a
+ )
+'
+
+test_expect_success 'should ignore submodule.recurse when not creating branches' '
+ test_when_finished "reset_test" &&
+ (
+ cd super &&
+ git branch --recurse-submodules branch-a &&
+ git -c submodule.recurse=true branch -D branch-a &&
+ test_no_branch . branch-a &&
+ git -C sub rev-parse branch-a
+ )
+'
+
+# Test branch creation behavior
+test_expect_success 'should create branches based off commit id in superproject' '
+ test_when_finished "reset_test" &&
+ (
+ cd super &&
+ git branch --recurse-submodules branch-a &&
+ git checkout --recurse-submodules branch-a &&
+ git -C sub rev-parse HEAD >expected &&
+ # Move the tip of sub:branch-a so that it no longer matches the commit in super:branch-a
+ git -C sub checkout branch-a &&
+ test_commit -C sub bar &&
+ # Create a new branch-b branch with start-point=branch-a
+ git branch --recurse-submodules branch-b branch-a &&
+ git rev-parse branch-b &&
+ git -C sub rev-parse branch-b >actual &&
+ # Assert that the commit id of sub:second-branch matches super:branch-a and not sub:branch-a
+ test_cmp expected actual
+ )
+'
+
+test_expect_success 'should not create any branches if branch is not valid for all repos' '
+ test_when_finished "reset_test" &&
+ (
+ cd super &&
+ git -C sub branch branch-a &&
+ test_must_fail git branch --recurse-submodules branch-a 2>actual &&
+ test_no_branch . branch-a &&
+ grep "submodule .sub.: fatal: a branch named .branch-a. already exists" actual
+ )
+'
+
+test_expect_success 'should create branches if branch exists and --force is given' '
+ test_when_finished "reset_test" &&
+ (
+ cd super &&
+ git -C sub rev-parse HEAD >expected &&
+ test_commit -C sub baz &&
+ # branch-a in sub now points to a newer commit.
+ git -C sub branch branch-a HEAD &&
+ git -C sub rev-parse branch-a >actual-old-branch-a &&
+ git branch --recurse-submodules --force branch-a &&
+ git rev-parse branch-a &&
+ git -C sub rev-parse branch-a >actual-new-branch-a &&
+ test_cmp expected actual-new-branch-a &&
+ # assert that branch --force actually moved the sub
+ # branch
+ ! test_cmp expected actual-old-branch-a
+ )
+'
+
+test_expect_success 'should create branch when submodule is not in HEAD:.gitmodules' '
+ test_when_finished "reset_test" &&
+ (
+ cd super &&
+ git branch branch-a &&
+ git checkout -b branch-b &&
+ git submodule add ../sub-upstream sub2 &&
+ git -C sub2 submodule update --init &&
+ # branch-b now has a committed submodule not in branch-a
+ git commit -m "add second submodule" &&
+ git checkout branch-a &&
+ git branch --recurse-submodules branch-c branch-b &&
+ git checkout --recurse-submodules branch-c &&
+ git -C sub2 rev-parse branch-c &&
+ git -C sub2/sub-sub rev-parse branch-c
+ )
+'
+
+test_expect_success 'should not create branches in inactive submodules' '
+ test_when_finished "reset_test" &&
+ test_config -C super submodule.sub.active false &&
+ (
+ cd super &&
+ git branch --recurse-submodules branch-a &&
+ git rev-parse branch-a &&
+ test_no_branch sub branch-a
+ )
+'
+
+test_expect_success 'should set up tracking of local branches with track=always' '
+ test_when_finished "reset_test" &&
+ (
+ cd super &&
+ git -c branch.autoSetupMerge=always branch --recurse-submodules branch-a main &&
+ git -C sub rev-parse main &&
+ test_cmp_config -C sub . branch.branch-a.remote &&
+ test_cmp_config -C sub refs/heads/main branch.branch-a.merge
+ )
+'
+
+test_expect_success 'should set up tracking of local branches with explicit track' '
+ test_when_finished "reset_test" &&
+ (
+ cd super &&
+ git branch --track --recurse-submodules branch-a main &&
+ git -C sub rev-parse main &&
+ test_cmp_config -C sub . branch.branch-a.remote &&
+ test_cmp_config -C sub refs/heads/main branch.branch-a.merge
+ )
+'
+
+test_expect_success 'should not set up unnecessary tracking of local branches' '
+ test_when_finished "reset_test" &&
+ (
+ cd super &&
+ git branch --recurse-submodules branch-a main &&
+ git -C sub rev-parse main &&
+ test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
+ test_cmp_config -C sub "" --default "" branch.branch-a.merge
+ )
+'
+
+reset_remote_test () {
+ rm -fr super-clone &&
+ reset_test
+}
+
+test_expect_success 'setup tests with remotes' '
+ (
+ cd test_dirs &&
+ (
+ cd super &&
+ git branch branch-a &&
+ git checkout -b branch-b &&
+ git submodule add ../sub-upstream sub2 &&
+ # branch-b now has a committed submodule not in branch-a
+ git commit -m "add second submodule"
+ ) &&
+ git clone --branch main --recurse-submodules super super-clone &&
+ git -C super-clone config submodule.propagateBranches true
+ ) &&
+ reset_remote_test
+'
+
+test_expect_success 'should get fatal error upon branch creation when submodule is not in .git/modules' '
+ test_when_finished "reset_remote_test" &&
+ (
+ cd super-clone &&
+ # This should succeed because super-clone has sub in .git/modules
+ git branch --recurse-submodules branch-a origin/branch-a &&
+ # This should fail because super-clone does not have sub2 .git/modules
+ test_must_fail git branch --recurse-submodules branch-b origin/branch-b 2>actual &&
+ grep "fatal: submodule .sub2.: unable to find submodule" actual &&
+ test_no_branch . branch-b &&
+ test_no_branch sub branch-b &&
+ # User can fix themselves by initializing the submodule
+ git checkout origin/branch-b &&
+ git submodule update --init --recursive &&
+ git branch --recurse-submodules branch-b origin/branch-b
+ )
+'
+
+test_expect_success 'should set up tracking of remote-tracking branches by default' '
+ test_when_finished "reset_remote_test" &&
+ (
+ cd super-clone &&
+ git branch --recurse-submodules branch-a origin/branch-a &&
+ test_cmp_config origin branch.branch-a.remote &&
+ test_cmp_config refs/heads/branch-a branch.branch-a.merge &&
+ # "origin/branch-a" does not exist for "sub", but it matches the refspec
+ # so tracking should be set up
+ test_cmp_config -C sub origin branch.branch-a.remote &&
+ test_cmp_config -C sub refs/heads/branch-a branch.branch-a.merge &&
+ test_cmp_config -C sub/sub-sub origin branch.branch-a.remote &&
+ test_cmp_config -C sub/sub-sub refs/heads/branch-a branch.branch-a.merge
+ )
+'
+
+test_expect_success 'should not fail when unable to set up tracking in submodule' '
+ test_when_finished "reset_remote_test" &&
+ (
+ cd super-clone &&
+ git remote rename origin ex-origin &&
+ git branch --recurse-submodules branch-a ex-origin/branch-a &&
+ test_cmp_config ex-origin branch.branch-a.remote &&
+ test_cmp_config refs/heads/branch-a branch.branch-a.merge &&
+ test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
+ test_cmp_config -C sub "" --default "" branch.branch-a.merge
+ )
+'
+
+test_expect_success '--track=inherit should set up tracking correctly' '
+ test_when_finished "reset_remote_test" &&
+ (
+ cd super-clone &&
+ git branch --recurse-submodules branch-a origin/branch-a &&
+ # Set this manually instead of using branch --set-upstream-to
+ # to circumvent the "nonexistent upstream" check.
+ git -C sub config branch.branch-a.remote origin &&
+ git -C sub config branch.branch-a.merge refs/heads/sub-branch-a &&
+ git -C sub/sub-sub config branch.branch-a.remote other &&
+ git -C sub/sub-sub config branch.branch-a.merge refs/heads/sub-sub-branch-a &&
+
+ git branch --recurse-submodules --track=inherit branch-b branch-a &&
+ test_cmp_config origin branch.branch-b.remote &&
+ test_cmp_config refs/heads/branch-a branch.branch-b.merge &&
+ test_cmp_config -C sub origin branch.branch-b.remote &&
+ test_cmp_config -C sub refs/heads/sub-branch-a branch.branch-b.merge &&
+ test_cmp_config -C sub/sub-sub other branch.branch-b.remote &&
+ test_cmp_config -C sub/sub-sub refs/heads/sub-sub-branch-a branch.branch-b.merge
+ )
+'
+
+test_expect_success '--no-track should not set up tracking' '
+ test_when_finished "reset_remote_test" &&
+ (
+ cd super-clone &&
+ git branch --recurse-submodules --no-track branch-a origin/branch-a &&
+ test_cmp_config "" --default "" branch.branch-a.remote &&
+ test_cmp_config "" --default "" branch.branch-a.merge &&
+ test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
+ test_cmp_config -C sub "" --default "" branch.branch-a.merge &&
+ test_cmp_config -C sub/sub-sub "" --default "" branch.branch-a.remote &&
+ test_cmp_config -C sub/sub-sub "" --default "" branch.branch-a.merge
+ )
+'
+
+test_done
diff --git a/t/t3211-peel-ref.sh b/t/t3211-peel-ref.sh
index 37b9d26..9cbc34f 100755
--- a/t/t3211-peel-ref.sh
+++ b/t/t3211-peel-ref.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'create annotated tag in refs/tags' '
diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh
index f5bf16a..d3ac826 100755
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -9,6 +9,7 @@
tree, index, and tree objects.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
HT=' '
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index ef8b639..d0c4d38 100755
--- a/t/t3302-notes-index-expensive.sh
+++ b/t/t3302-notes-index-expensive.sh
@@ -8,6 +8,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
create_repo () {
@@ -64,7 +65,8 @@
test_notes () {
count=$1 &&
git config core.notesRef refs/notes/commits &&
- git log | grep "^ " >output &&
+ git log >tmp &&
+ grep "^ " tmp >output &&
i=$count &&
while test $i -gt 0
do
@@ -89,7 +91,7 @@
unset GIT_NOTES_REF
;;
esac
- git log
+ git log || exit $?
i=$(($i+1))
done >/dev/null
EOF
diff --git a/t/t3303-notes-subtrees.sh b/t/t3303-notes-subtrees.sh
index d47ce00..bc9b791 100755
--- a/t/t3303-notes-subtrees.sh
+++ b/t/t3303-notes-subtrees.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
number_of_commits=100
@@ -30,7 +31,7 @@
while [ $i -gt 0 ]; do
echo " commit #$i" &&
echo " note for commit #$i" &&
- i=$(($i-1));
+ i=$(($i-1)) || return 1
done > expect &&
test_cmp expect output
}
@@ -42,7 +43,7 @@
while [ $nr -lt $number_of_commits ]; do
nr=$(($nr+1)) &&
test_tick &&
- cat <<INPUT_END
+ cat <<INPUT_END || return 1
commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
@@ -78,7 +79,7 @@
(
start_note_commit &&
nr=$number_of_commits &&
- git rev-list refs/heads/main |
+ git rev-list refs/heads/main >out &&
while read sha1; do
note_path=$(echo "$sha1" | sed "$1")
cat <<INPUT_END &&
@@ -90,9 +91,9 @@
INPUT_END
nr=$(($nr-1))
- done
- ) |
- git fast-import --quiet
+ done <out
+ ) >gfi &&
+ git fast-import --quiet <gfi
}
test_expect_success 'test notes in 2/38-fanout' 'test_sha1_based "s|^..|&/|"'
@@ -178,7 +179,7 @@
echo " first note for commit #$i" &&
echo " " &&
echo " second note for commit #$i" &&
- i=$(($i-1));
+ i=$(($i-1)) || return 1
done > expect &&
test_cmp expect output
}
diff --git a/t/t3305-notes-fanout.sh b/t/t3305-notes-fanout.sh
index 94c1b02..64a9915 100755
--- a/t/t3305-notes-fanout.sh
+++ b/t/t3305-notes-fanout.sh
@@ -2,6 +2,7 @@
test_description='Test that adding/removing many notes triggers automatic fanout restructuring'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
path_has_fanout() {
@@ -23,7 +24,7 @@
all_notes_have_fanout() {
notes_commit=$1 &&
fanout=$2 &&
- git ls-tree -r --name-only $notes_commit 2>/dev/null |
+ git ls-tree -r --name-only $notes_commit |
while read path
do
path_has_fanout $path $fanout || return 1
@@ -50,14 +51,15 @@
done
'
-test_expect_success 'many notes created correctly with git-notes' '
- git log | grep "^ " > output &&
+test_expect_success !SANITIZE_LEAK 'many notes created correctly with git-notes' '
+ git log >output.raw &&
+ grep "^ " output.raw >output &&
i=$num_notes &&
while test $i -gt 0
do
echo " commit #$i" &&
echo " note #$i" &&
- i=$(($i - 1));
+ i=$(($i - 1)) || return 1
done > expect &&
test_cmp expect output
'
@@ -90,13 +92,13 @@
test_expect_success 'deleting most notes with git-notes' '
remove_notes=285 &&
i=0 &&
- git rev-list HEAD |
+ git rev-list HEAD >revs &&
while test $i -lt $remove_notes && read sha1
do
i=$(($i + 1)) &&
test_tick &&
- git notes remove "$sha1" 2>/dev/null || return 1
- done
+ git notes remove "$sha1" || return 1
+ done <revs
'
test_expect_success 'most notes deleted correctly with git-notes' '
@@ -106,7 +108,7 @@
do
echo " commit #$i" &&
echo " note #$i" &&
- i=$(($i - 1));
+ i=$(($i - 1)) || return 1
done > expect &&
test_cmp expect output
'
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index 6b2d507..bff0aea 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -8,6 +8,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup commit' '
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 23dbd3c..d5a8ee3 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -18,10 +18,7 @@
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
test_expect_success 'prepare repository with topic branches' '
- git config core.logAllRefUpdates true &&
- echo First >A &&
- git update-index --add A &&
- git commit -m "Add A." &&
+ test_commit "Add A." A First First &&
git checkout -b force-3way &&
echo Dummy >Y &&
git update-index --add Y &&
@@ -32,9 +29,7 @@
git mv A D/A &&
git commit -m "Move A." &&
git checkout -b my-topic-branch main &&
- echo Second >B &&
- git update-index --add B &&
- git commit -m "Add B." &&
+ test_commit "Add B." B Second Second &&
git checkout -f main &&
echo Third >>A &&
git update-index A &&
@@ -399,6 +394,15 @@
git rebase main other
'
+test_expect_success 'switch to non-branch detaches HEAD' '
+ git checkout main &&
+ old_main=$(git rev-parse HEAD) &&
+ git rebase First Second^0 &&
+ test_cmp_rev HEAD Second &&
+ test_cmp_rev main $old_main &&
+ test_must_fail git symbolic-ref HEAD
+'
+
test_expect_success 'refuse to switch to branch checked out elsewhere' '
git checkout main &&
git worktree add wt &&
@@ -416,4 +420,25 @@
mv actual_logs .git/logs
'
+test_expect_success 'rebase when inside worktree subdirectory' '
+ git init main-wt &&
+ (
+ cd main-wt &&
+ git commit --allow-empty -m "initial" &&
+ mkdir -p foo/bar &&
+ test_commit foo/bar/baz &&
+ mkdir -p a/b &&
+ test_commit a/b/c &&
+ # create another branch for our other worktree
+ git branch other &&
+ git worktree add ../other-wt other &&
+ cd ../other-wt &&
+ # create and cd into a subdirectory
+ mkdir -p random/dir &&
+ cd random/dir &&
+ # now do the rebase
+ git rebase --onto HEAD^^ HEAD^ # drops the HEAD^ commit
+ )
+'
+
test_done
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index cfde68f..7e46f4c 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -68,7 +68,7 @@
if test -s difference
then
cat difference
- (exit 1)
+ false
else
echo happy
fi
@@ -102,7 +102,7 @@
if test -s difference
then
cat difference
- (exit 1)
+ false
else
echo happy
fi
@@ -117,7 +117,7 @@
echo happy
else
git show-branch
- (exit 1)
+ false
fi &&
f=$(git diff-tree --name-only HEAD^ HEAD) &&
g=$(git diff-tree --name-only HEAD^^ HEAD^) &&
@@ -127,7 +127,7 @@
*)
echo "$f"
echo "$g"
- (exit 1)
+ false
esac
'
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 972ce02..f31afd4 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -25,8 +25,6 @@
where A, B, D and G all touch file1, and one, two, three, four all
touch file "conflict".
'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@@ -352,82 +350,6 @@
git show HEAD | grep "^Author: Twerp Snog"
'
-test_expect_success REBASE_P '-p handles "no changes" gracefully' '
- HEAD=$(git rev-parse HEAD) &&
- git rebase -i -p HEAD^ &&
- git update-index --refresh &&
- git diff-files --quiet &&
- git diff-index --quiet --cached HEAD -- &&
- test $HEAD = $(git rev-parse HEAD)
-'
-
-test_expect_failure REBASE_P 'exchange two commits with -p' '
- git checkout H &&
- (
- set_fake_editor &&
- FAKE_LINES="2 1" git rebase -i -p HEAD~2
- ) &&
- test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
- test G = $(git cat-file commit HEAD | sed -ne \$p)
-'
-
-test_expect_success REBASE_P 'preserve merges with -p' '
- git checkout -b to-be-preserved primary^ &&
- : > unrelated-file &&
- git add unrelated-file &&
- test_tick &&
- git commit -m "unrelated" &&
- git checkout -b another-branch primary &&
- echo B > file1 &&
- test_tick &&
- git commit -m J file1 &&
- test_tick &&
- git merge to-be-preserved &&
- echo C > file1 &&
- test_tick &&
- git commit -m K file1 &&
- echo D > file1 &&
- test_tick &&
- git commit -m L1 file1 &&
- git checkout HEAD^ &&
- echo 1 > unrelated-file &&
- test_tick &&
- git commit -m L2 unrelated-file &&
- test_tick &&
- git merge another-branch &&
- echo E > file1 &&
- test_tick &&
- git commit -m M file1 &&
- git checkout -b to-be-rebased &&
- test_tick &&
- git rebase -i -p --onto branch1 primary &&
- git update-index --refresh &&
- git diff-files --quiet &&
- git diff-index --quiet --cached 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 &&
- test $(git show HEAD:unrelated-file) = 1
-'
-
-test_expect_success REBASE_P 'edit ancestor with -p' '
- (
- set_fake_editor &&
- FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3
- ) &&
- echo 2 > unrelated-file &&
- test_tick &&
- git commit -m L2-modified --amend unrelated-file &&
- git rebase --continue &&
- git update-index --refresh &&
- git diff-files --quiet &&
- git diff-index --quiet --cached HEAD -- &&
- test $(git show HEAD:unrelated-file) = 2
-'
-
test_expect_success '--continue tries to commit' '
git reset --hard D &&
test_tick &&
@@ -697,9 +619,7 @@
'
test_expect_success 'rebase a commit violating pre-commit' '
-
- mkdir -p .git/hooks &&
- write_script .git/hooks/pre-commit <<-\EOF &&
+ test_hook pre-commit <<-\EOF &&
test -z "$(git diff --cached --check)"
EOF
echo "monde! " >> file1 &&
@@ -714,8 +634,6 @@
'
test_expect_success 'rebase with a file named HEAD in worktree' '
-
- rm -fr .git/hooks &&
git reset --hard &&
git checkout -b branch3 A &&
@@ -902,7 +820,7 @@
do
test ! $(git rev-parse HEAD~$p) = $(git rev-parse original-no-ff-branch~$p) &&
git diff HEAD~$p original-no-ff-branch~$p > out &&
- test_must_be_empty out
+ test_must_be_empty out || return 1
done &&
test_cmp_rev HEAD~3 original-no-ff-branch~3 &&
git diff HEAD~3 original-no-ff-branch~3 > out &&
@@ -1417,7 +1335,7 @@
test_seq 5 | sed "s/$double/&&/" >seq &&
git add seq &&
test_tick &&
- git commit -m seq-$double
+ git commit -m seq-$double || return 1
done &&
git tag seq-onto &&
git reset --hard HEAD~2 &&
@@ -1766,10 +1684,8 @@
'
test_expect_success 'post-commit hook is called' '
- test_when_finished "rm -f .git/hooks/post-commit" &&
>actual &&
- mkdir -p .git/hooks &&
- write_script .git/hooks/post-commit <<-\EOS &&
+ test_hook post-commit <<-\EOS &&
git rev-parse HEAD >>actual
EOS
(
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 77a313f..d17b450 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -105,6 +105,29 @@
test_cmp expect actual
'
+test_expect_success 'rebase --apply reflog' '
+ git checkout -b reflog-apply start &&
+ old_head_reflog="$(git log -g --format=%gs -1 HEAD)" &&
+
+ git rebase --apply Y &&
+
+ git log -g --format=%gs -4 HEAD >actual &&
+ cat >expect <<-EOF &&
+ rebase finished: returning to refs/heads/reflog-apply
+ rebase: Z
+ rebase: checkout Y
+ $old_head_reflog
+ EOF
+ test_cmp expect actual &&
+
+ git log -g --format=%gs -2 reflog-apply >actual &&
+ cat >expect <<-EOF &&
+ rebase finished: refs/heads/reflog-apply onto $(git rev-parse Y)
+ branch: Created from start
+ EOF
+ test_cmp expect actual
+'
+
test_expect_success 'rebase -i onto unrelated history' '
git init unrelated &&
test_commit -C unrelated 1 &&
diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh
index ab0960e..7b4607d 100755
--- a/t/t3408-rebase-multi-line.sh
+++ b/t/t3408-rebase-multi-line.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -55,14 +56,4 @@
test_cmp expect actual
'
-test_expect_success REBASE_P rebasep '
-
- git checkout side-merge &&
- git rebase -p side &&
- git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
- git cat-file commit side-merge-original | sed -e "1,/^\$/d" >expect &&
- test_cmp expect actual
-
-'
-
test_done
diff --git a/t/t3409-rebase-environ.sh b/t/t3409-rebase-environ.sh
new file mode 100755
index 0000000..83ffb39
--- /dev/null
+++ b/t/t3409-rebase-environ.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+test_description='git rebase interactive environment'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_commit one &&
+ test_commit two &&
+ test_commit three
+'
+
+test_expect_success 'rebase --exec does not muck with GIT_DIR' '
+ git rebase --exec "printf %s \$GIT_DIR >environ" HEAD~1 &&
+ test_must_be_empty environ
+'
+
+test_expect_success 'rebase --exec does not muck with GIT_WORK_TREE' '
+ git rebase --exec "printf %s \$GIT_WORK_TREE >environ" HEAD~1 &&
+ test_must_be_empty environ
+'
+
+test_done
diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh
deleted file mode 100755
index ec8062a..0000000
--- a/t/t3409-rebase-preserve-merges.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-#
-# Copyright(C) 2008 Stephen Habermann & Andreas Ericsson
-#
-test_description='git rebase -p should preserve merges
-
-Run "git rebase -p" and check that merges are properly carried along
-'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
-. ./test-lib.sh
-
-if ! test_have_prereq REBASE_P; then
- skip_all='skipping git rebase -p tests, as asked for'
- test_done
-fi
-
-GIT_AUTHOR_EMAIL=bogus_email_address
-export GIT_AUTHOR_EMAIL
-
-# Clone 2 (conflicting merge):
-#
-# A1--A2--B3 <-- origin/main
-# \ \
-# B1------M <-- topic
-# \
-# B2 <-- origin/topic
-#
-# Clone 3 (no-ff merge):
-#
-# A1--A2--B3 <-- origin/main
-# \
-# B1------M <-- topic
-# \ /
-# \--A3 <-- topic2
-# \
-# B2 <-- origin/topic
-#
-# Clone 4 (same as Clone 3)
-
-test_expect_success 'setup for merge-preserving rebase' \
- 'echo First > A &&
- git add A &&
- git commit -m "Add A1" &&
- git checkout -b topic &&
- echo Second > B &&
- git add B &&
- git commit -m "Add B1" &&
- git checkout -f main &&
- echo Third >> A &&
- git commit -a -m "Modify A2" &&
- echo Fifth > B &&
- git add B &&
- git commit -m "Add different B" &&
-
- git clone ./. clone2 &&
- (
- cd clone2 &&
- git checkout -b topic origin/topic &&
- test_must_fail git merge origin/main &&
- echo Resolved >B &&
- git add B &&
- git commit -m "Merge origin/main into topic"
- ) &&
-
- git clone ./. clone3 &&
- (
- cd clone3 &&
- git checkout -b topic2 origin/topic &&
- echo Sixth > A &&
- git commit -a -m "Modify A3" &&
- git checkout -b topic origin/topic &&
- git merge --no-ff topic2
- ) &&
-
- git clone ./. clone4 &&
- (
- cd clone4 &&
- git checkout -b topic2 origin/topic &&
- echo Sixth > A &&
- git commit -a -m "Modify A3" &&
- git checkout -b topic origin/topic &&
- git merge --no-ff topic2
- ) &&
-
- git checkout topic &&
- echo Fourth >> B &&
- git commit -a -m "Modify B2"
-'
-
-test_expect_success '--continue works after a conflict' '
- (
- cd clone2 &&
- git fetch &&
- test_must_fail git rebase -p origin/topic &&
- test 2 = $(git ls-files B | wc -l) &&
- echo Resolved again > B &&
- test_must_fail git rebase --continue &&
- grep "^@@@ " .git/rebase-merge/patch &&
- git add B &&
- git rebase --continue &&
- test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
- test 1 = $(git rev-list --all --pretty=oneline | grep "Add different" | wc -l) &&
- test 1 = $(git rev-list --all --pretty=oneline | grep "Merge origin" | wc -l)
- )
-'
-
-test_expect_success 'rebase -p preserves no-ff merges' '
- (
- cd clone3 &&
- git fetch &&
- git rebase -p origin/topic &&
- test 3 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
- test 1 = $(git rev-list --all --pretty=oneline | grep "Merge branch" | wc -l)
- )
-'
-
-test_expect_success 'rebase -p ignores merge.log config' '
- (
- cd clone4 &&
- git fetch &&
- git -c merge.log=1 rebase -p origin/topic &&
- echo >expected &&
- git log --format="%b" -1 >current &&
- test_cmp expected current
- )
-'
-
-test_done
diff --git a/t/t3410-rebase-preserve-dropped-merges.sh b/t/t3410-rebase-preserve-dropped-merges.sh
deleted file mode 100755
index 2e29866..0000000
--- a/t/t3410-rebase-preserve-dropped-merges.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2008 Stephen Haberman
-#
-
-test_description='git rebase preserve merges
-
-This test runs git rebase with preserve merges and ensures commits
-dropped by the --cherry-pick flag have their childrens parents
-rewritten.
-'
-. ./test-lib.sh
-
-if ! test_have_prereq REBASE_P; then
- skip_all='skipping git rebase -p tests, as asked for'
- test_done
-fi
-
-# set up two branches like this:
-#
-# A - B - C - D - E
-# \
-# F - G - H
-# \
-# I
-#
-# where B, D and G touch the same file.
-
-test_expect_success 'setup' '
- test_commit A file1 &&
- test_commit B file1 1 &&
- test_commit C file2 &&
- test_commit D file1 2 &&
- test_commit E file3 &&
- git checkout A &&
- test_commit F file4 &&
- test_commit G file1 3 &&
- test_commit H file5 &&
- git checkout F &&
- test_commit I file6
-'
-
-# A - B - C - D - E
-# \ \ \
-# F - G - H -- L \ --> L
-# \ | \
-# I -- G2 -- J -- K I -- K
-# G2 = same changes as G
-test_expect_success 'skip same-resolution merges with -p' '
- git checkout H &&
- test_must_fail git merge E &&
- test_commit L file1 23 &&
- git checkout I &&
- test_commit G2 file1 3 &&
- test_must_fail git merge E &&
- test_commit J file1 23 &&
- test_commit K file7 file7 &&
- git rebase -i -p L &&
- test $(git rev-parse HEAD^^) = $(git rev-parse L) &&
- test "23" = "$(cat file1)" &&
- test "I" = "$(cat file6)" &&
- test "file7" = "$(cat file7)"
-'
-
-# A - B - C - D - E
-# \ \ \
-# F - G - H -- L2 \ --> L2
-# \ | \
-# I -- G3 --- J2 -- K2 I -- G3 -- K2
-# G2 = different changes as G
-test_expect_success 'keep different-resolution merges with -p' '
- git checkout H &&
- test_must_fail git merge E &&
- test_commit L2 file1 23 &&
- git checkout I &&
- test_commit G3 file1 4 &&
- test_must_fail git merge E &&
- test_commit J2 file1 24 &&
- test_commit K2 file7 file7 &&
- test_must_fail git rebase -i -p L2 &&
- echo 234 > file1 &&
- git add file1 &&
- git rebase --continue &&
- test $(git rev-parse HEAD^^^) = $(git rev-parse L2) &&
- test "234" = "$(cat file1)" &&
- test "I" = "$(cat file6)" &&
- test "file7" = "$(cat file7)"
-'
-
-test_done
diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh
deleted file mode 100755
index fb45e7b..0000000
--- a/t/t3411-rebase-preserve-around-merges.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2008 Stephen Haberman
-#
-
-test_description='git rebase preserve merges
-
-This test runs git rebase with -p and tries to squash a commit from after
-a merge to before the merge.
-'
-. ./test-lib.sh
-
-if ! test_have_prereq REBASE_P; then
- skip_all='skipping git rebase -p tests, as asked for'
- test_done
-fi
-
-. "$TEST_DIRECTORY"/lib-rebase.sh
-
-set_fake_editor
-
-# set up two branches like this:
-#
-# A1 - B1 - D1 - E1 - F1
-# \ /
-# -- C1 --
-
-test_expect_success 'setup' '
- test_commit A1 &&
- test_commit B1 &&
- test_commit C1 &&
- git reset --hard B1 &&
- test_commit D1 &&
- test_merge E1 C1 &&
- test_commit F1
-'
-
-# Should result in:
-#
-# A1 - B1 - D2 - E2
-# \ /
-# -- C1 --
-#
-test_expect_success 'squash F1 into D1' '
- FAKE_LINES="1 squash 4 2 3" git rebase -i -p B1 &&
- test "$(git rev-parse HEAD^2)" = "$(git rev-parse C1)" &&
- test "$(git rev-parse HEAD~2)" = "$(git rev-parse B1)" &&
- git tag E2
-'
-
-# Start with:
-#
-# A1 - B1 - D2 - E2
-# \
-# G1 ---- L1 ---- M1
-# \ /
-# H1 -- J1 -- K1
-# \ /
-# -- I1 --
-#
-# And rebase G1..M1 onto E2
-
-test_expect_success 'rebase two levels of merge' '
- git checkout A1 &&
- test_commit G1 &&
- test_commit H1 &&
- test_commit I1 &&
- git checkout -b branch3 H1 &&
- test_commit J1 &&
- test_merge K1 I1 &&
- git checkout -b branch2 G1 &&
- test_commit L1 &&
- test_merge M1 K1 &&
- GIT_EDITOR=: git rebase -i -p E2 &&
- test "$(git rev-parse HEAD~3)" = "$(git rev-parse E2)" &&
- test "$(git rev-parse HEAD~2)" = "$(git rev-parse HEAD^2^2~2)" &&
- test "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse HEAD^2^2^1)"
-'
-
-test_done
diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index fda62c6..58371d8 100755
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@ -11,7 +11,7 @@
log_with_names () {
git rev-list --topo-order --parents --pretty="tformat:%s" HEAD |
- git name-rev --stdin --name-only --refs=refs/heads/$1
+ git name-rev --annotate-stdin --name-only --refs=refs/heads/$1
}
@@ -31,12 +31,9 @@
'
test_expect_success 'setup pre-rebase hook' '
- mkdir -p .git/hooks &&
- cat >.git/hooks/pre-rebase <<EOF &&
-#!$SHELL_PATH
-echo "\$1,\$2" >.git/PRE-REBASE-INPUT
-EOF
- chmod +x .git/hooks/pre-rebase
+ test_hook --setup pre-rebase <<-\EOF
+ echo "$1,$2" >.git/PRE-REBASE-INPUT
+ EOF
'
cat > expect <<EOF
4
@@ -89,17 +86,6 @@
test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4
'
-test_expect_success REBASE_P 'rebase -i -p with linear history' '
- git checkout -b work5 other &&
- git rebase -i -p --root --onto main &&
- git log --pretty=tformat:"%s" > rebased5 &&
- test_cmp expect rebased5
-'
-
-test_expect_success REBASE_P 'pre-rebase got correct input (5)' '
- test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
-'
-
test_expect_success 'set up merge history' '
git checkout other^ &&
git checkout -b side &&
@@ -123,13 +109,6 @@
1
EOF
-test_expect_success REBASE_P 'rebase -i -p with merge' '
- git checkout -b work6 other &&
- git rebase -i -p --root --onto main &&
- log_with_names work6 > rebased6 &&
- test_cmp expect-side rebased6
-'
-
test_expect_success 'set up second root and merge' '
git symbolic-ref HEAD refs/heads/third &&
rm .git/index &&
@@ -158,20 +137,10 @@
1
EOF
-test_expect_success REBASE_P 'rebase -i -p with two roots' '
- git checkout -b work7 other &&
- git rebase -i -p --root --onto main &&
- log_with_names work7 > rebased7 &&
- test_cmp expect-third rebased7
-'
-
test_expect_success 'setup pre-rebase hook that fails' '
- mkdir -p .git/hooks &&
- cat >.git/hooks/pre-rebase <<EOF &&
-#!$SHELL_PATH
-false
-EOF
- chmod +x .git/hooks/pre-rebase
+ test_hook --setup --clobber pre-rebase <<-\EOF
+ false
+ EOF
'
test_expect_success 'pre-rebase hook stops rebase' '
@@ -264,21 +233,9 @@
1
EOF
-test_expect_success REBASE_P 'rebase -i -p --root with conflict (first part)' '
- git checkout -b conflict3 other &&
- test_must_fail git rebase -i -p --root --onto main &&
- git ls-files -u | grep "B$"
-'
-
test_expect_success 'fix the conflict' '
echo 3 > B &&
git add B
'
-test_expect_success REBASE_P 'rebase -i -p --root with conflict (second part)' '
- git rebase --continue &&
- log_with_names conflict3 >out &&
- test_cmp expect-conflict-p out
-'
-
test_done
diff --git a/t/t3413-rebase-hook.sh b/t/t3413-rebase-hook.sh
index b4acb3b..9fab0d7 100755
--- a/t/t3413-rebase-hook.sh
+++ b/t/t3413-rebase-hook.sh
@@ -41,12 +41,9 @@
'
test_expect_success 'setup pre-rebase hook' '
- mkdir -p .git/hooks &&
- cat >.git/hooks/pre-rebase <<EOF &&
-#!$SHELL_PATH
-echo "\$1,\$2" >.git/PRE-REBASE-INPUT
-EOF
- chmod +x .git/hooks/pre-rebase
+ test_hook --setup pre-rebase <<-\EOF
+ echo "$1,$2" >.git/PRE-REBASE-INPUT
+ EOF
'
test_expect_success 'pre-rebase hook gets correct input (1)' '
@@ -102,12 +99,9 @@
'
test_expect_success 'setup pre-rebase hook that fails' '
- mkdir -p .git/hooks &&
- cat >.git/hooks/pre-rebase <<EOF &&
-#!$SHELL_PATH
-false
-EOF
- chmod +x .git/hooks/pre-rebase
+ test_hook --setup --clobber pre-rebase <<-\EOF
+ false
+ EOF
'
test_expect_success 'pre-rebase hook stops rebase (1)' '
diff --git a/t/t3414-rebase-preserve-onto.sh b/t/t3414-rebase-preserve-onto.sh
deleted file mode 100755
index 72e04b5..0000000
--- a/t/t3414-rebase-preserve-onto.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2009 Greg Price
-#
-
-test_description='git rebase -p should respect --onto
-
-In a rebase with --onto, we should rewrite all the commits that
-aren'"'"'t on top of $ONTO, even if they are on top of $UPSTREAM.
-'
-. ./test-lib.sh
-
-if ! test_have_prereq REBASE_P; then
- skip_all='skipping git rebase -p tests, as asked for'
- test_done
-fi
-
-. "$TEST_DIRECTORY"/lib-rebase.sh
-
-# Set up branches like this:
-# A1---B1---E1---F1---G1
-# \ \ /
-# \ \--C1---D1--/
-# H1
-
-test_expect_success 'setup' '
- test_commit A1 &&
- test_commit B1 &&
- test_commit C1 &&
- test_commit D1 &&
- git reset --hard B1 &&
- test_commit E1 &&
- test_commit F1 &&
- test_merge G1 D1 &&
- git reset --hard A1 &&
- test_commit H1
-'
-
-# Now rebase merge G1 from both branches' base B1, both should move:
-# A1---B1---E1---F1---G1
-# \ \ /
-# \ \--C1---D1--/
-# \
-# H1---E2---F2---G2
-# \ /
-# \--C2---D2--/
-
-test_expect_success 'rebase from B1 onto H1' '
- git checkout G1 &&
- git rebase -p --onto H1 B1 &&
- test "$(git rev-parse HEAD^1^1^1)" = "$(git rev-parse H1)" &&
- test "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse H1)"
-'
-
-# On the other hand if rebase from E1 which is within one branch,
-# then the other branch stays:
-# A1---B1---E1---F1---G1
-# \ \ /
-# \ \--C1---D1--/
-# \ \
-# H1-----F3-----G3
-
-test_expect_success 'rebase from E1 onto H1' '
- git checkout G1 &&
- git rebase -p --onto H1 E1 &&
- test "$(git rev-parse HEAD^1^1)" = "$(git rev-parse H1)" &&
- test "$(git rev-parse HEAD^2)" = "$(git rev-parse D1)"
-'
-
-# And the same if we rebase from a commit in the second-parent branch.
-# A1---B1---E1---F1----G1
-# \ \ \ /
-# \ \--C1---D1-\-/
-# \ \
-# H1------D3------G4
-
-test_expect_success 'rebase from C1 onto H1' '
- git checkout G1 &&
- git rev-list --first-parent --pretty=oneline C1..G1 &&
- git rebase -p --onto H1 C1 &&
- test "$(git rev-parse HEAD^2^1)" = "$(git rev-parse H1)" &&
- test "$(git rev-parse HEAD^1)" = "$(git rev-parse F1)"
-'
-
-test_done
diff --git a/t/t3416-rebase-onto-threedots.sh b/t/t3416-rebase-onto-threedots.sh
index 3716a42..3e04802 100755
--- a/t/t3416-rebase-onto-threedots.sh
+++ b/t/t3416-rebase-onto-threedots.sh
@@ -129,6 +129,20 @@
test_cmp expect actual
'
+test_expect_success 'rebase --keep-base main topic from main' '
+ git checkout main &&
+ git branch -f topic G &&
+
+ git rebase --keep-base main topic &&
+ git rev-parse C >base.expect &&
+ git merge-base main HEAD >base.actual &&
+ test_cmp base.expect base.actual &&
+
+ git rev-parse HEAD~2 >actual &&
+ git rev-parse C^0 >expect &&
+ test_cmp expect actual
+'
+
test_expect_success 'rebase --keep-base main from side' '
git reset --hard &&
git checkout side &&
@@ -153,6 +167,21 @@
test_cmp expect actual
'
+test_expect_success 'rebase -i --keep-base main topic from main' '
+ git checkout main &&
+ git branch -f topic G &&
+
+ set_fake_editor &&
+ EXPECT_COUNT=2 git rebase -i --keep-base main topic &&
+ git rev-parse C >base.expect &&
+ git merge-base main HEAD >base.actual &&
+ test_cmp base.expect base.actual &&
+
+ git rev-parse HEAD~2 >actual &&
+ git rev-parse C^0 >expect &&
+ test_cmp expect actual
+'
+
test_expect_success 'rebase -i --keep-base main from side' '
git reset --hard &&
git checkout side &&
diff --git a/t/t3417-rebase-whitespace-fix.sh b/t/t3417-rebase-whitespace-fix.sh
index 946e92f..96f2cf2 100755
--- a/t/t3417-rebase-whitespace-fix.sh
+++ b/t/t3417-rebase-whitespace-fix.sh
@@ -115,9 +115,7 @@
git config core.whitespace "blank-at-eol" &&
cp beginning file &&
git commit -m beginning file &&
- for i in 1 2 3 4 5; do
- echo $i
- done >> file &&
+ test_write_lines 1 2 3 4 5 >>file &&
git commit -m more file &&
git rebase --whitespace=fix HEAD^^ &&
test_cmp expect-beginning file
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
index 738fbae..130e2f9 100755
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -119,20 +119,6 @@
test -f funny.was.run
'
-test_expect_success REBASE_P 'rebase passes merge strategy options correctly' '
- rm -fr .git/rebase-* &&
- git reset --hard commit-new-file-F3-on-topic-branch &&
- test_commit theirs-to-merge &&
- git reset --hard HEAD^ &&
- test_commit some-commit &&
- test_tick &&
- git merge --no-ff theirs-to-merge &&
- FAKE_LINES="1 edit 2 3" git rebase -i -f -p -m \
- -s recursive --strategy-option=theirs HEAD~2 &&
- test_commit force-change &&
- git rebase --continue
-'
-
test_expect_success 'rebase -r passes merge strategy options correctly' '
rm -fr .git/rebase-* &&
git reset --hard commit-new-file-F3-on-topic-branch &&
@@ -268,7 +254,6 @@
test_rerere_autoupdate -m
GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
test_rerere_autoupdate -i
-test_have_prereq !REBASE_P || test_rerere_autoupdate --preserve-merges
unset GIT_SEQUENCE_EDITOR
test_expect_success 'the todo command "break" works' '
@@ -323,4 +308,30 @@
test_expect_code 129 git rebase --edit-todo --no-reschedule-failed-exec
'
+test_orig_head_helper () {
+ test_when_finished 'git rebase --abort &&
+ git checkout topic &&
+ git reset --hard commit-new-file-F2-on-topic-branch' &&
+ git update-ref -d ORIG_HEAD &&
+ test_must_fail git rebase "$@" &&
+ test_cmp_rev ORIG_HEAD commit-new-file-F2-on-topic-branch
+}
+
+test_orig_head () {
+ type=$1
+ test_expect_success "rebase $type sets ORIG_HEAD correctly" '
+ git checkout topic &&
+ git reset --hard commit-new-file-F2-on-topic-branch &&
+ test_orig_head_helper $type main
+ '
+
+ test_expect_success "rebase $type <upstream> <branch> sets ORIG_HEAD correctly" '
+ git checkout main &&
+ test_orig_head_helper $type main topic
+ '
+}
+
+test_orig_head --apply
+test_orig_head --merge
+
test_done
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh
index 4a9204b..62d86d5 100755
--- a/t/t3421-rebase-topology-linear.sh
+++ b/t/t3421-rebase-topology-linear.sh
@@ -29,7 +29,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_expect_success 'setup branches and remote tracking' '
git tag -l >tags &&
@@ -53,7 +52,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -70,7 +68,6 @@
test_run_rebase success --fork-point
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
test_run_rebase () {
result=$1
@@ -87,7 +84,6 @@
test_run_rebase success --fork-point
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -102,7 +98,6 @@
test_run_rebase success --fork-point
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
# f
# /
@@ -142,7 +137,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -157,7 +151,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -172,7 +165,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -187,7 +179,6 @@
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
# a---b---c---j!
# \
@@ -215,7 +206,6 @@
test_run_rebase failure --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
test_run_rebase () {
result=$1
@@ -229,7 +219,6 @@
}
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -243,7 +232,6 @@
}
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase success --rebase-merges
# m
@@ -283,7 +271,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -298,7 +285,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
test_run_rebase () {
result=$1
@@ -313,7 +299,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -329,7 +314,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
test_run_rebase () {
result=$1
@@ -344,7 +328,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
test_run_rebase () {
result=$1
@@ -358,7 +341,6 @@
test_run_rebase success ''
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
test_run_rebase () {
result=$1
@@ -373,6 +355,5 @@
test_run_rebase success ''
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_done
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
index c823406..6dabb05 100755
--- a/t/t3422-rebase-incompatible-options.sh
+++ b/t/t3422-rebase-incompatible-options.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test if rebase detects and aborts on incompatible options'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
@@ -63,15 +65,4 @@
test_rebase_am_only --whitespace=fix
test_rebase_am_only -C4
-test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '
- git checkout B^0 &&
- test_must_fail git rebase --preserve-merges --signoff A
-'
-
-test_expect_success REBASE_P \
- '--preserve-merges incompatible with --rebase-merges' '
- git checkout B^0 &&
- test_must_fail git rebase --preserve-merges --rebase-merges A
-'
-
test_done
diff --git a/t/t3425-rebase-topology-merges.sh b/t/t3425-rebase-topology-merges.sh
index e42faa4..63acc1e 100755
--- a/t/t3425-rebase-topology-merges.sh
+++ b/t/t3425-rebase-topology-merges.sh
@@ -106,155 +106,4 @@
test_run_rebase success 'd n o e' -m
test_run_rebase success 'd n o e' -i
-if ! test_have_prereq REBASE_P; then
- skip_all='skipping git rebase -p tests, as asked for'
- test_done
-fi
-
-test_expect_success "rebase -p is no-op in non-linear history" "
- reset_rebase &&
- git rebase -p d w &&
- test_cmp_rev w HEAD
-"
-
-test_expect_success "rebase -p is no-op when base inside second parent" "
- reset_rebase &&
- git rebase -p e w &&
- test_cmp_rev w HEAD
-"
-
-test_expect_failure "rebase -p --root on non-linear history is a no-op" "
- reset_rebase &&
- git rebase -p --root w &&
- test_cmp_rev w HEAD
-"
-
-test_expect_success "rebase -p re-creates merge from side branch" "
- reset_rebase &&
- git rebase -p z w &&
- test_cmp_rev z HEAD^ &&
- test_cmp_rev w^2 HEAD^2
-"
-
-test_expect_success "rebase -p re-creates internal merge" "
- reset_rebase &&
- git rebase -p c w &&
- test_cmp_rev c HEAD~4 &&
- test_cmp_rev HEAD^2^ HEAD~3 &&
- test_revision_subjects 'd n e o w' HEAD~3 HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-test_expect_success "rebase -p can re-create two branches on onto" "
- reset_rebase &&
- git rebase -p --onto c d w &&
- test_cmp_rev c HEAD~3 &&
- test_cmp_rev c HEAD^2^ &&
- test_revision_subjects 'n e o w' HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-# f
-# /
-# a---b---c---g---h
-# \
-# d---gp--i
-# \ \
-# e-------u
-#
-# gp = cherry-picked g
-# h = reverted g
-test_expect_success 'setup of non-linear-history for patch-equivalence tests' '
- git checkout e &&
- test_merge u i
-'
-
-test_expect_success "rebase -p re-creates history around dropped commit matching upstream" "
- reset_rebase &&
- git rebase -p h u &&
- test_cmp_rev h HEAD~3 &&
- test_cmp_rev HEAD^2^ HEAD~2 &&
- test_revision_subjects 'd i e u' HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-test_expect_success "rebase -p --onto in merged history drops patches in upstream" "
- reset_rebase &&
- git rebase -p --onto f h u &&
- test_cmp_rev f HEAD~3 &&
- test_cmp_rev HEAD^2^ HEAD~2 &&
- test_revision_subjects 'd i e u' HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-test_expect_success "rebase -p --onto in merged history does not drop patches in onto" "
- reset_rebase &&
- git rebase -p --onto h f u &&
- test_cmp_rev h HEAD~3 &&
- test_cmp_rev HEAD^2~2 HEAD~2 &&
- test_revision_subjects 'd gp i e u' HEAD~2 HEAD^2^ HEAD^2 HEAD^ HEAD
-"
-
-# a---b---c---g---h
-# \
-# d---gp--s
-# \ \ /
-# \ X
-# \ / \
-# e---t
-#
-# gp = cherry-picked g
-# h = reverted g
-test_expect_success 'setup of non-linear-history for dropping whole side' '
- git checkout gp &&
- test_merge s e &&
- git checkout e &&
- test_merge t gp
-'
-
-test_expect_failure "rebase -p drops merge commit when entire first-parent side is dropped" "
- reset_rebase &&
- git rebase -p h s &&
- test_cmp_rev h HEAD~2 &&
- test_linear_range 'd e' h..
-"
-
-test_expect_success "rebase -p drops merge commit when entire second-parent side is dropped" "
- reset_rebase &&
- git rebase -p h t &&
- test_cmp_rev h HEAD~2 &&
- test_linear_range 'd e' h..
-"
-
-# a---b---c
-# \
-# d---e
-# \ \
-# n---r
-# \
-# o
-#
-# r = tree-same with n
-test_expect_success 'setup of non-linear-history for empty commits' '
- git checkout n &&
- git merge --no-commit e &&
- git reset n . &&
- git commit -m r &&
- git reset --hard &&
- git clean -f &&
- git tag r
-'
-
-test_expect_success "rebase -p re-creates empty internal merge commit" "
- reset_rebase &&
- git rebase -p c r &&
- test_cmp_rev c HEAD~3 &&
- test_cmp_rev HEAD^2^ HEAD~2 &&
- test_revision_subjects 'd e n r' HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-test_expect_success "rebase -p re-creates empty merge commit" "
- reset_rebase &&
- git rebase -p o r &&
- test_cmp_rev e HEAD^2 &&
- test_cmp_rev o HEAD^ &&
- test_revision_subjects 'r' HEAD
-"
-
test_done
diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index e78c7e3..48b76f8 100755
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -36,11 +36,10 @@
# where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t.
#
# This commit history is then rebased onto `topic_3` with the
-# `-Xsubtree=files_subtree` option in three different ways:
+# `-Xsubtree=files_subtree` option in two different ways:
#
-# 1. using `--preserve-merges`
-# 2. using `--preserve-merges` and --keep-empty
-# 3. without specifying a rebase backend
+# 1. without specifying a rebase backend
+# 2. using the `--rebase-merges` backend
test_expect_success 'setup' '
test_commit README &&
@@ -69,25 +68,6 @@
git commit -m "Empty commit" --allow-empty
'
-# FAILURE: Does not preserve topic_4.
-test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '
- reset_rebase &&
- git checkout -b rebase-preserve-merges to-rebase &&
- git rebase -Xsubtree=files_subtree --preserve-merges --onto files-main main &&
- verbose test "$(commit_message HEAD~)" = "topic_4" &&
- verbose test "$(commit_message HEAD)" = "files_subtree/topic_5"
-'
-
-# FAILURE: Does not preserve topic_4.
-test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '
- reset_rebase &&
- git checkout -b rebase-keep-empty to-rebase &&
- git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-main main &&
- verbose test "$(commit_message HEAD~2)" = "topic_4" &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
- verbose test "$(commit_message HEAD)" = "Empty commit"
-'
-
test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
reset_rebase &&
git checkout -b rebase-onto to-rebase &&
diff --git a/t/t3429-rebase-edit-todo.sh b/t/t3429-rebase-edit-todo.sh
index 7024d49..abd66f3 100755
--- a/t/t3429-rebase-edit-todo.sh
+++ b/t/t3429-rebase-edit-todo.sh
@@ -13,10 +13,15 @@
test_expect_success 'rebase exec modifies rebase-todo' '
todo=.git/rebase-merge/git-rebase-todo &&
- git rebase HEAD -x "echo exec touch F >>$todo" &&
+ git rebase HEAD~1 -x "echo exec touch F >>$todo" &&
test -e F
'
+test_expect_success 'rebase exec with an empty list does not exec anything' '
+ git rebase HEAD -x "true" 2>output &&
+ ! grep "Executing: true" output
+'
+
test_expect_success 'loose object cache vs re-reading todo list' '
GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo &&
export GIT_REBASE_TODO &&
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index 43c82d9..f351701 100755
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -292,9 +292,9 @@
git commit --fixup HEAD same2.t &&
fixup="$(git rev-parse HEAD)" &&
- mkdir -p .git/hooks &&
- test_when_finished "rm .git/hooks/post-rewrite" &&
- echo "cat >actual" | write_script .git/hooks/post-rewrite &&
+ test_hook post-rewrite <<-\EOF &&
+ cat >actual
+ EOF
test_tick &&
git rebase -i --autosquash -r HEAD^^^ &&
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
index 4c98d99..1d0b153 100755
--- a/t/t3431-rebase-fork-point.sh
+++ b/t/t3431-rebase-fork-point.sh
@@ -83,7 +83,7 @@
test_expect_success '--fork-point and --root both given' '
test_must_fail git rebase --fork-point --root 2>err &&
- test_i18ngrep "cannot combine" err
+ test_i18ngrep "cannot be used together" err
'
test_expect_success 'rebase.forkPoint set to false' '
diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh
index 4d10664..94671d3 100755
--- a/t/t3436-rebase-more-options.sh
+++ b/t/t3436-rebase-more-options.sh
@@ -82,6 +82,20 @@
test_ctime_is_atime -1
'
+test_expect_success '--committer-date-is-author-date works when rewording' '
+ GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+ (
+ set_fake_editor &&
+ FAKE_COMMIT_MESSAGE=edited \
+ FAKE_LINES="reword 1" \
+ git rebase -i --committer-date-is-author-date HEAD^
+ ) &&
+ test_write_lines edited "" >expect &&
+ git log --format="%B" -1 >actual &&
+ test_cmp expect actual &&
+ test_ctime_is_atime -1
+'
+
test_expect_success '--committer-date-is-author-date works with rebase -r' '
git checkout side &&
GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
@@ -155,6 +169,21 @@
test_atime_is_ignored -2
'
+test_expect_success 'reset-author-date with --committer-date-is-author-date works when rewording' '
+ GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+ (
+ set_fake_editor &&
+ FAKE_COMMIT_MESSAGE=edited \
+ FAKE_LINES="reword 1" \
+ git rebase -i --committer-date-is-author-date \
+ --reset-author-date HEAD^
+ ) &&
+ test_write_lines edited "" >expect &&
+ git log --format="%B" -1 >actual &&
+ test_cmp expect actual &&
+ test_atime_is_ignored -1
+'
+
test_expect_success '--reset-author-date --committer-date-is-author-date works when forking merge' '
GIT_SEQUENCE_EDITOR="echo \"merge -C $(git rev-parse HEAD) commit3\">" \
PATH="./test-bin:$PATH" git rebase -i --strategy=test \
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 4b5b607..9eb1920 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -19,7 +19,7 @@
for l in a b c d e f g h i j k l m n o
do
- echo $l$l$l$l$l$l$l$l$l
+ echo $l$l$l$l$l$l$l$l$l || return 1
done >oops &&
test_tick &&
@@ -66,8 +66,7 @@
git checkout rename2 &&
git cherry-pick added &&
- test $(git rev-parse HEAD^) = $(git rev-parse rename2) &&
- test -f opos &&
+ test_cmp_rev rename2 HEAD^ &&
grep "Add extra line at the end" opos &&
git reflog -1 | grep cherry-pick
@@ -77,9 +76,9 @@
git checkout rename1 &&
git revert added &&
- test $(git rev-parse HEAD^) = $(git rev-parse rename1) &&
- test -f spoo &&
- ! grep "Add extra line at the end" spoo &&
+ test_cmp_rev rename1 HEAD^ &&
+ test_path_is_file spoo &&
+ test_cmp_rev initial:oops HEAD:spoo &&
git reflog -1 | grep revert
'
diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh
index e8375d1..2d53ce7 100755
--- a/t/t3508-cherry-pick-many-commits.sh
+++ b/t/t3508-cherry-pick-many-commits.sh
@@ -29,7 +29,7 @@
git add file1 &&
test_tick &&
git commit -m "$val" &&
- git tag $val
+ git tag $val || return 1
done
'
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index bb9ef35..e74a318 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -265,7 +265,7 @@
test_expect_success !MINGW 'choking "git rm" should not let it die with cruft (induce and check SIGPIPE)' '
choke_git_rm_setup &&
- OUT=$( ((trap "" PIPE; git rm -n "some-file-*"; echo $? 1>&3) | :) 3>&1 ) &&
+ OUT=$( ((trap "" PIPE && git rm -n "some-file-*"; echo $? 1>&3) | :) 3>&1 ) &&
test_match_signal 13 "$OUT" &&
test_path_is_missing .git/index.lock
'
@@ -274,10 +274,7 @@
git reset -q --hard &&
test_when_finished "rm -f .git/index.lock msg && git reset -q --hard" &&
blob=$(echo blob | git hash-object -w --stdin) &&
- for stage in 1 2 3
- do
- echo "100644 $blob $stage blob"
- done | git update-index --index-info &&
+ printf "100644 $blob %d\tblob\n" 1 2 3 | git update-index --index-info &&
git rm blob >msg 2>&1 &&
test_i18ngrep ! "needs merge" msg &&
test_must_fail git ls-files -s --error-unmatch blob
diff --git a/t/t3601-rm-pathspec-file.sh b/t/t3601-rm-pathspec-file.sh
index 7de21f8..a2a0c82 100755
--- a/t/t3601-rm-pathspec-file.sh
+++ b/t/t3601-rm-pathspec-file.sh
@@ -2,6 +2,7 @@
test_description='rm --pathspec-from-file'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_tick
@@ -66,10 +67,10 @@
echo fileA.t >list &&
test_must_fail git rm --pathspec-from-file=list -- fileA.t 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+ test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git rm --pathspec-file-nul 2>err &&
- test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+ test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
>empty_list &&
test_must_fail git rm --pathspec-from-file=empty_list 2>err &&
diff --git a/t/t3602-rm-sparse-checkout.sh b/t/t3602-rm-sparse-checkout.sh
index e9e9a15..08580fd 100755
--- a/t/t3602-rm-sparse-checkout.sh
+++ b/t/t3602-rm-sparse-checkout.sh
@@ -11,12 +11,15 @@
git commit -m files &&
cat >sparse_error_header <<-EOF &&
- The following pathspecs didn't match any eligible path, but they do match index
- entries outside the current sparse checkout:
+ The following paths and/or pathspecs matched paths that exist
+ outside of your sparse-checkout definition, so will not be
+ updated in the index:
EOF
cat >sparse_hint <<-EOF &&
- hint: Disable or modify the sparsity rules if you intend to update such entries.
+ hint: If you intend to update such entries, try one of the following:
+ hint: * Use the --sparse option.
+ hint: * Disable or modify the sparsity rules.
hint: Disable this message with \"git config advice.updateSparsePath false\"
EOF
@@ -27,7 +30,7 @@
for opt in "" -f --dry-run
do
test_expect_success "rm${opt:+ $opt} does not remove sparse entries" '
- git sparse-checkout set a &&
+ git sparse-checkout set --no-cone a &&
test_must_fail git rm $opt b 2>stderr &&
test_cmp b_error_and_hint stderr &&
git ls-files --error-unmatch b
@@ -39,7 +42,29 @@
git sparse-checkout set sub/dir &&
git rm -r sub &&
git status --porcelain -uno >actual &&
- echo "D sub/dir/e" >expected &&
+ cat >expected <<-\EOF &&
+ D sub/dir/e
+ EOF
+ test_cmp expected actual &&
+
+ git rm --sparse -r sub &&
+ git status --porcelain -uno >actual2 &&
+ cat >expected2 <<-\EOF &&
+ D sub/d
+ D sub/dir/e
+ EOF
+ test_cmp expected2 actual2
+'
+
+test_expect_success 'recursive rm --sparse removes sparse entries' '
+ git reset --hard &&
+ git sparse-checkout set "sub/dir" &&
+ git rm --sparse -r sub &&
+ git status --porcelain -uno >actual &&
+ cat >expected <<-\EOF &&
+ D sub/d
+ D sub/dir/e
+ EOF
test_cmp expected actual
'
@@ -75,4 +100,40 @@
git ls-files --error-unmatch b
'
+test_expect_success 'refuse to rm a non-skip-worktree path outside sparse cone' '
+ git reset --hard &&
+ git sparse-checkout set a &&
+ git update-index --no-skip-worktree b &&
+ test_must_fail git rm b 2>stderr &&
+ test_cmp b_error_and_hint stderr &&
+ git rm --sparse b 2>stderr &&
+ test_must_be_empty stderr &&
+ test_path_is_missing b
+'
+
+test_expect_success 'can remove files from non-sparse dir' '
+ git reset --hard &&
+ git sparse-checkout disable &&
+ mkdir -p w x/y &&
+ test_commit w/f &&
+ test_commit x/y/f &&
+
+ git sparse-checkout set --no-cone w !/x y/ &&
+ git rm w/f.t x/y/f.t 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'refuse to remove non-skip-worktree file from sparse dir' '
+ git reset --hard &&
+ git sparse-checkout disable &&
+ mkdir -p x/y/z &&
+ test_commit x/y/z/f &&
+ git sparse-checkout set --no-cone !/x y/ !x/y/z &&
+
+ git update-index --no-skip-worktree x/y/z/f.t &&
+ test_must_fail git rm x/y/z/f.t 2>stderr &&
+ echo x/y/z/f.t | cat sparse_error_header - sparse_hint >expect &&
+ test_cmp expect stderr
+'
+
test_done
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 4086e1e..8979c8a 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -5,8 +5,11 @@
test_description='Test of git add, including the -- option.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
+. $TEST_DIRECTORY/lib-unique-files.sh
+
# Test the file mode "$1" of the file "$2" in the index.
test_mode_in_index () {
case "$(git ls-files -s "$2")" in
@@ -33,6 +36,32 @@
'Test that "git add -- -q" works' \
'touch -- -q && git add -- -q'
+BATCH_CONFIGURATION='-c core.fsync=loose-object -c core.fsyncmethod=batch'
+
+test_expect_success 'git add: core.fsyncmethod=batch' "
+ test_create_unique_files 2 4 files_base_dir1 &&
+ GIT_TEST_FSYNC=1 git $BATCH_CONFIGURATION add -- ./files_base_dir1/ &&
+ git ls-files --stage files_base_dir1/ |
+ test_parse_ls_files_stage_oids >added_files_oids &&
+
+ # We created 2 subdirs with 4 files each (8 files total) above
+ test_line_count = 8 added_files_oids &&
+ git cat-file --batch-check='%(objectname)' <added_files_oids >added_files_actual &&
+ test_cmp added_files_oids added_files_actual
+"
+
+test_expect_success 'git update-index: core.fsyncmethod=batch' "
+ test_create_unique_files 2 4 files_base_dir2 &&
+ find files_base_dir2 ! -type d -print | xargs git $BATCH_CONFIGURATION update-index --add -- &&
+ git ls-files --stage files_base_dir2 |
+ test_parse_ls_files_stage_oids >added_files2_oids &&
+
+ # We created 2 subdirs with 4 files each (8 files total) above
+ test_line_count = 8 added_files2_oids &&
+ git cat-file --batch-check='%(objectname)' <added_files2_oids >added_files2_actual &&
+ test_cmp added_files2_oids added_files2_actual
+"
+
test_expect_success \
'git add: Test that executable bit is not used if core.filemode=0' \
'git config core.filemode 0 &&
@@ -140,9 +169,9 @@
test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' '
for s in 1 2 3
do
- echo $s > stage$s
- echo "100755 $(git hash-object -w stage$s) $s file"
- echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s symlink"
+ echo $s > stage$s &&
+ echo "100755 $(git hash-object -w stage$s) $s file" &&
+ echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s symlink" || return 1
done | git update-index --index-info &&
git config core.filemode 0 &&
git config core.symlinks 0 &&
@@ -176,7 +205,7 @@
git read-tree HEAD &&
case "$(git diff-index HEAD -- foo)" in
:100644" "*"M foo") echo pass;;
- *) echo fail; (exit 1);;
+ *) echo fail; false;;
esac &&
git add --refresh -- foo &&
test -z "$(git diff-index HEAD -- foo)"
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 2077146..94537a6 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -326,7 +326,9 @@
test_expect_success 'setup again' '
git reset --hard &&
test_chmod +x file &&
- echo content >>file
+ echo content >>file &&
+ test_write_lines A B C D>file2 &&
+ git add file2
'
# Write the patch file with a new line at the top and bottom
@@ -341,13 +343,27 @@
content
+lastline
\ No newline at end of file
+ diff --git a/file2 b/file2
+ index 8422d40..35b930a 100644
+ --- a/file2
+ +++ b/file2
+ @@ -1,4 +1,5 @@
+ -A
+ +Z
+ B
+ +Y
+ C
+ -D
+ +X
EOF
'
# Expected output, diff is similar to the patch but w/ diff at the top
test_expect_success 'setup expected' '
echo diff --git a/file b/file >expected &&
- cat patch |sed "/^index/s/ 100644/ 100755/" >>expected &&
+ sed -e "/^index 180b47c/s/ 100644/ 100755/" \
+ -e /1,5/s//1,4/ \
+ -e /Y/d patch >>expected &&
cat >expected-output <<-\EOF
--- a/file
+++ b/file
@@ -366,6 +382,28 @@
content
+lastline
\ No newline at end of file
+ --- a/file2
+ +++ b/file2
+ @@ -1,4 +1,5 @@
+ -A
+ +Z
+ B
+ +Y
+ C
+ -D
+ +X
+ @@ -1,2 +1,2 @@
+ -A
+ +Z
+ B
+ @@ -2,2 +2,3 @@
+ B
+ +Y
+ C
+ @@ -3,2 +4,2 @@
+ C
+ -D
+ +X
EOF
'
@@ -373,9 +411,9 @@
test_expect_success 'add first line works' '
git commit -am "clear local changes" &&
git apply patch &&
- printf "%s\n" s y y | git add -p file 2>error |
- sed -n -e "s/^([1-2]\/[1-2]) Stage this hunk[^@]*\(@@ .*\)/\1/" \
- -e "/^[-+@ \\\\]"/p >output &&
+ test_write_lines s y y s y n y | git add -p 2>error >raw-output &&
+ sed -n -e "s/^([1-9]\/[1-9]) Stage this hunk[^@]*\(@@ .*\)/\1/" \
+ -e "/^[-+@ \\\\]"/p raw-output >output &&
test_must_be_empty error &&
git diff --cached >diff &&
diff_cmp expected diff &&
diff --git a/t/t3702-add-edit.sh b/t/t3702-add-edit.sh
index 6c67664..a1801a8 100755
--- a/t/t3702-add-edit.sh
+++ b/t/t3702-add-edit.sh
@@ -4,6 +4,8 @@
#
test_description='add -e basic tests'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
diff --git a/t/t3703-add-magic-pathspec.sh b/t/t3703-add-magic-pathspec.sh
index 3ef525a..d840710 100755
--- a/t/t3703-add-magic-pathspec.sh
+++ b/t/t3703-add-magic-pathspec.sh
@@ -2,6 +2,7 @@
test_description='magic pathspec tests using git-add'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t3704-add-pathspec-file.sh b/t/t3704-add-pathspec-file.sh
index 9e35c1f..4e6b517 100755
--- a/t/t3704-add-pathspec-file.sh
+++ b/t/t3704-add-pathspec-file.sh
@@ -2,6 +2,7 @@
test_description='add --pathspec-from-file'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_tick
@@ -137,19 +138,19 @@
>empty_list &&
test_must_fail git add --pathspec-from-file=list --interactive 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
+ test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
test_must_fail git add --pathspec-from-file=list --patch 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
+ test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
test_must_fail git add --pathspec-from-file=list --edit 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with --edit" err &&
+ test_i18ngrep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err &&
test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+ test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git add --pathspec-file-nul 2>err &&
- test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+ test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
# This case succeeds, but still prints to stderr
git add --pathspec-from-file=empty_list 2>err &&
diff --git a/t/t3705-add-sparse-checkout.sh b/t/t3705-add-sparse-checkout.sh
index 2b1fd0d..2bade9e 100755
--- a/t/t3705-add-sparse-checkout.sh
+++ b/t/t3705-add-sparse-checkout.sh
@@ -19,6 +19,8 @@
fi &&
git add sparse_entry &&
git update-index --skip-worktree sparse_entry &&
+ git config core.sparseCheckout false &&
+ git commit --allow-empty -m "ensure sparse_entry exists at HEAD" &&
SPARSE_ENTRY_BLOB=$(git rev-parse :sparse_entry)
}
@@ -36,14 +38,22 @@
EOF
}
+test_sparse_entry_unstaged () {
+ git diff --staged -- sparse_entry >diff &&
+ test_must_be_empty diff
+}
+
test_expect_success 'setup' "
cat >sparse_error_header <<-EOF &&
- The following pathspecs didn't match any eligible path, but they do match index
- entries outside the current sparse checkout:
+ The following paths and/or pathspecs matched paths that exist
+ outside of your sparse-checkout definition, so will not be
+ updated in the index:
EOF
cat >sparse_hint <<-EOF &&
- hint: Disable or modify the sparsity rules if you intend to update such entries.
+ hint: If you intend to update such entries, try one of the following:
+ hint: * Use the --sparse option.
+ hint: * Disable or modify the sparsity rules.
hint: Disable this message with \"git config advice.updateSparsePath false\"
EOF
@@ -55,6 +65,7 @@
setup_sparse_entry &&
rm sparse_entry &&
test_must_fail git add sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp error_and_hint stderr &&
test_sparse_entry_unchanged
'
@@ -73,6 +84,7 @@
rm sparse_entry &&
setup_gitignore &&
test_must_fail git add . 2>stderr &&
+ test_sparse_entry_unstaged &&
cat sparse_error_header >expect &&
echo . >>expect &&
@@ -88,6 +100,7 @@
setup_sparse_entry &&
echo modified >sparse_entry &&
test_must_fail git add $opt sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp error_and_hint stderr &&
test_sparse_entry_unchanged
'
@@ -98,6 +111,7 @@
git ls-files --debug sparse_entry | grep mtime >before &&
test-tool chmtime -60 sparse_entry &&
test_must_fail git add --refresh sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp error_and_hint stderr &&
git ls-files --debug sparse_entry | grep mtime >after &&
test_cmp before after
@@ -106,16 +120,19 @@
test_expect_success 'git add --chmod does not update sparse entries' '
setup_sparse_entry &&
test_must_fail git add --chmod=+x sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp error_and_hint stderr &&
test_sparse_entry_unchanged &&
! test -x sparse_entry
'
test_expect_success 'git add --renormalize does not update sparse entries' '
+ test_when_finished rm .gitattributes &&
test_config core.autocrlf false &&
setup_sparse_entry "LINEONE\r\nLINETWO\r\n" &&
echo "sparse_entry text=auto" >.gitattributes &&
test_must_fail git add --renormalize sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp error_and_hint stderr &&
test_sparse_entry_unchanged
'
@@ -124,6 +141,7 @@
setup_sparse_entry &&
rm sparse_entry &&
test_must_fail git add --dry-run --ignore-missing sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp error_and_hint stderr &&
test_sparse_entry_unchanged
'
@@ -145,11 +163,74 @@
git ls-files --error-unmatch dense_entry
'
+test_expect_success 'git add fails outside of sparse-checkout definition' '
+ test_when_finished git sparse-checkout disable &&
+ test_commit a &&
+ git sparse-checkout init --no-cone &&
+ git sparse-checkout set a &&
+ echo >>sparse_entry &&
+
+ git update-index --no-skip-worktree sparse_entry &&
+ test_must_fail git add sparse_entry &&
+ test_sparse_entry_unstaged &&
+
+ test_must_fail git add --chmod=+x sparse_entry &&
+ test_sparse_entry_unstaged &&
+
+ test_must_fail git add --renormalize sparse_entry &&
+ test_sparse_entry_unstaged &&
+
+ # Avoid munging CRLFs to avoid an error message
+ git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
+ test_must_be_empty stderr &&
+ git ls-files --stage >actual &&
+ grep "^100644 .*sparse_entry\$" actual &&
+
+ git add --sparse --chmod=+x sparse_entry 2>stderr &&
+ test_must_be_empty stderr &&
+ git ls-files --stage >actual &&
+ grep "^100755 .*sparse_entry\$" actual &&
+
+ git reset &&
+
+ # This will print a message over stderr on Windows.
+ git add --sparse --renormalize sparse_entry &&
+ git status --porcelain >actual &&
+ grep "^M sparse_entry\$" actual
+'
+
test_expect_success 'add obeys advice.updateSparsePath' '
setup_sparse_entry &&
test_must_fail git -c advice.updateSparsePath=false add sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp sparse_entry_error stderr
'
+test_expect_success 'add allows sparse entries with --sparse' '
+ git sparse-checkout set --no-cone a &&
+ echo modified >sparse_entry &&
+ test_must_fail git add sparse_entry &&
+ test_sparse_entry_unchanged &&
+ git add --sparse sparse_entry 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'can add files from non-sparse dir' '
+ git sparse-checkout set w !/x y/ &&
+ mkdir -p w x/y &&
+ touch w/f x/y/f &&
+ git add w/f x/y/f 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'refuse to add non-skip-worktree file from sparse dir' '
+ git sparse-checkout set !/x y/ !x/y/z &&
+ mkdir -p x/y/z &&
+ touch x/y/z/f &&
+ test_must_fail git add x/y/z/f 2>stderr &&
+ echo x/y/z/f | cat sparse_error_header - sparse_hint >expect &&
+ test_cmp expect stderr
+'
+
test_done
diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh
index 0544d58..e3cf0ff 100755
--- a/t/t3800-mktag.sh
+++ b/t/t3800-mktag.sh
@@ -72,7 +72,8 @@
# Manually create the broken, we cannot do it with
# update-ref
- echo "$bad_tag" >"bad-tag/$tag_ref" &&
+ test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+ test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
# Unlike fsck-ing unreachable content above, this
# will always fail.
@@ -83,7 +84,8 @@
# Make sure the earlier test created it for us
git rev-parse "$bad_tag" &&
- echo "$bad_tag" >"bad-tag/$tag_ref" &&
+ test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+ test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
git -C bad-tag for-each-ref "$tag_ref" >actual &&
diff --git a/t/t3902-quoted.sh b/t/t3902-quoted.sh
index f528008..72a5a56 100755
--- a/t/t3902-quoted.sh
+++ b/t/t3902-quoted.sh
@@ -5,6 +5,7 @@
test_description='quoted output'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
FN='濱野'
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index f0a82be..20e9488 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -9,6 +9,26 @@
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
+. $TEST_DIRECTORY/lib-unique-files.sh
+
+test_expect_success 'usage on cmd and subcommand invalid option' '
+ test_expect_code 129 git stash --invalid-option 2>usage &&
+ grep "or: git stash" usage &&
+
+ test_expect_code 129 git stash push --invalid-option 2>usage &&
+ ! grep "or: git stash" usage
+'
+
+test_expect_success 'usage on main command -h emits a summary of subcommands' '
+ test_expect_code 129 git stash -h >usage &&
+ grep -F "usage: git stash list" usage &&
+ grep -F "or: git stash show" usage
+'
+
+test_expect_failure 'usage for subcommands should emit subcommand usage' '
+ test_expect_code 129 git stash push -h >usage &&
+ grep -F "usage: git stash [push" usage
+'
diff_cmp () {
for i in "$1" "$2"
@@ -22,7 +42,7 @@
rm -f "$1.compare" "$2.compare"
}
-test_expect_success 'stash some dirty working directory' '
+setup_stash() {
echo 1 >file &&
git add file &&
echo unrelated >other-file &&
@@ -36,6 +56,10 @@
git stash &&
git diff-files --quiet &&
git diff-index --cached --quiet HEAD
+}
+
+test_expect_success 'stash some dirty working directory' '
+ setup_stash
'
cat >expect <<EOF
@@ -166,6 +190,43 @@
test 1 = $(git show HEAD:file)
'
+test_expect_success 'drop stash reflog updates refs/stash' '
+ git reset --hard &&
+ git rev-parse refs/stash >expect &&
+ echo 9 >file &&
+ git stash &&
+ git stash drop stash@{0} &&
+ git rev-parse refs/stash >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success REFFILES 'drop stash reflog updates refs/stash with rewrite' '
+ git init repo &&
+ (
+ cd repo &&
+ setup_stash
+ ) &&
+ echo 9 >repo/file &&
+
+ old_oid="$(git -C repo rev-parse stash@{0})" &&
+ git -C repo stash &&
+ new_oid="$(git -C repo rev-parse stash@{0})" &&
+
+ cat >expect <<-EOF &&
+ $(test_oid zero) $old_oid
+ $old_oid $new_oid
+ EOF
+ cut -d" " -f1-2 repo/.git/logs/refs/stash >actual &&
+ test_cmp expect actual &&
+
+ git -C repo stash drop stash@{1} &&
+ cut -d" " -f1-2 repo/.git/logs/refs/stash >actual &&
+ cat >expect <<-EOF &&
+ $(test_oid zero) $new_oid
+ EOF
+ test_cmp expect actual
+'
+
test_expect_success 'stash pop' '
git reset --hard &&
git stash pop &&
@@ -242,6 +303,18 @@
test_must_be_empty output.out
'
+test_expect_success 'apply --index -q is quiet' '
+ # Added file, deleted file, modified file all staged for commit
+ echo foo >new-file &&
+ echo test >file &&
+ git add new-file file &&
+ git rm other-file &&
+
+ git stash &&
+ git stash apply --index -q >output.out 2>&1 &&
+ test_must_be_empty output.out
+'
+
test_expect_success 'save -q is quiet' '
git stash save --quiet >output.out 2>&1 &&
test_must_be_empty output.out
@@ -272,6 +345,27 @@
test_must_be_empty output.out
'
+test_expect_success 'stash push -q --staged refreshes the index' '
+ git reset --hard &&
+ echo test >file &&
+ git add file &&
+ git stash push -q --staged &&
+ git diff-files >output.out &&
+ test_must_be_empty output.out
+'
+
+test_expect_success 'stash apply -q --index refreshes the index' '
+ echo test >other-file &&
+ git add other-file &&
+ echo another-change >other-file &&
+ git diff-files >expect &&
+ git stash &&
+
+ git stash apply -q --index &&
+ git diff-files >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'stash -k' '
echo bar3 >file &&
echo bar4 >file2 &&
@@ -288,6 +382,17 @@
test bar,bar2 = $(cat file),$(cat file2)
'
+test_expect_success 'stash --staged' '
+ echo bar3 >file &&
+ echo bar4 >file2 &&
+ git add file2 &&
+ git stash --staged &&
+ test bar3,bar2 = $(cat file),$(cat file2) &&
+ git reset --hard &&
+ git stash pop &&
+ test bar,bar4 = $(cat file),$(cat file2)
+'
+
test_expect_success 'dont assume push with non-option args' '
test_must_fail git stash -q drop 2>err &&
test_i18ngrep -e "subcommand wasn'\''t specified; '\''push'\'' can'\''t be assumed due to unexpected token '\''drop'\''" err
@@ -360,10 +465,11 @@
rm file &&
ln -s file2 file &&
git stash save "file to symlink" &&
- test -f file &&
+ test_path_is_file_not_symlink file &&
test bar = "$(cat file)" &&
git stash apply &&
- case "$(ls -l file)" in *" file -> file2") :;; *) false;; esac
+ test_path_is_symlink file &&
+ test "$(test_readlink file)" = file2
'
test_expect_success SYMLINKS 'stash file to symlink (stage rm)' '
@@ -371,10 +477,11 @@
git rm file &&
ln -s file2 file &&
git stash save "file to symlink (stage rm)" &&
- test -f file &&
+ test_path_is_file_not_symlink file &&
test bar = "$(cat file)" &&
git stash apply &&
- case "$(ls -l file)" in *" file -> file2") :;; *) false;; esac
+ test_path_is_symlink file &&
+ test "$(test_readlink file)" = file2
'
test_expect_success SYMLINKS 'stash file to symlink (full stage)' '
@@ -383,10 +490,11 @@
ln -s file2 file &&
git add file &&
git stash save "file to symlink (full stage)" &&
- test -f file &&
+ test_path_is_file_not_symlink file &&
test bar = "$(cat file)" &&
git stash apply &&
- case "$(ls -l file)" in *" file -> file2") :;; *) false;; esac
+ test_path_is_symlink file &&
+ test "$(test_readlink file)" = file2
'
# This test creates a commit with a symlink used for the following tests
@@ -457,7 +565,7 @@
rm -fr dir &&
echo bar >dir &&
git stash save "directory to file" &&
- test -d dir &&
+ test_path_is_dir dir &&
test foo = "$(cat dir/file)" &&
test_must_fail git stash apply &&
test bar = "$(cat dir)" &&
@@ -470,10 +578,10 @@
mkdir file &&
echo foo >file/file &&
git stash save "file to directory" &&
- test -f file &&
+ test_path_is_file file &&
test bar = "$(cat file)" &&
git stash apply &&
- test -f file/file &&
+ test_path_is_file file/file &&
test foo = "$(cat file/file)"
'
@@ -1012,6 +1120,17 @@
test_cmp expect actual
'
+test_expect_success 'create when branch name has /' '
+ test_when_finished "git checkout main" &&
+ git checkout -b some/topic &&
+ >foo &&
+ git add foo &&
+ STASH_ID=$(git stash create "create test message") &&
+ echo "On some/topic: create test message" >expect &&
+ git show --pretty=%s -s ${STASH_ID} >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'create with multiple arguments for the message' '
>foo &&
git add foo &&
@@ -1242,7 +1361,6 @@
>2 &&
git add 2 &&
test_config user.useconfigonly true &&
- test_config stash.usebuiltin true &&
(
sane_unset GIT_AUTHOR_NAME &&
sane_unset GIT_AUTHOR_EMAIL &&
@@ -1293,19 +1411,24 @@
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 &&
+BATCH_CONFIGURATION='-c core.fsync=loose-object -c core.fsyncmethod=batch'
- 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_expect_success 'stash with core.fsyncmethod=batch' "
+ test_create_unique_files 2 4 files_base_dir &&
+ GIT_TEST_FSYNC=1 git $BATCH_CONFIGURATION stash push -u -- ./files_base_dir/ &&
+
+ # The files were untracked, so use the third parent,
+ # which contains the untracked files
+ git ls-tree -r stash^3 -- ./files_base_dir/ |
+ test_parse_ls_tree_oids >stashed_files_oids &&
+
+ # We created 2 dirs with 4 files each (8 files total) above
+ test_line_count = 8 stashed_files_oids &&
+ git cat-file --batch-check='%(objectname)' <stashed_files_oids >stashed_files_actual &&
+ test_cmp stashed_files_oids stashed_files_actual
+"
+
test_expect_success 'git stash succeeds despite directory/file change' '
test_create_repo directory_file_switch_v1 &&
@@ -1365,4 +1488,28 @@
)
'
+test_expect_success 'restore untracked files even when we hit conflicts' '
+ git init restore_untracked_after_conflict &&
+ (
+ cd restore_untracked_after_conflict &&
+
+ echo hi >a &&
+ echo there >b &&
+ git add . &&
+ git commit -m first &&
+ echo hello >a &&
+ echo something >c &&
+
+ git stash push --include-untracked &&
+
+ echo conflict >a &&
+ git add a &&
+ git commit -m second &&
+
+ test_must_fail git stash pop &&
+
+ test_path_is_file c
+ )
+'
+
test_done
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index dd2cdcc..5390eec 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh
@@ -422,4 +422,10 @@
test_must_be_empty actual
'
+test_expect_success 'stash -u ignores sub-repository' '
+ test_when_finished "rm -rf sub-repo" &&
+ git init sub-repo &&
+ git stash -u
+'
+
test_done
diff --git a/t/t3908-stash-in-worktree.sh b/t/t3908-stash-in-worktree.sh
index 2b2b366..347a89b 100755
--- a/t/t3908-stash-in-worktree.sh
+++ b/t/t3908-stash-in-worktree.sh
@@ -5,6 +5,7 @@
test_description='Test git stash in a worktree'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t3909-stash-pathspec-file.sh b/t/t3909-stash-pathspec-file.sh
index 55e050c..dead9f1 100755
--- a/t/t3909-stash-pathspec-file.sh
+++ b/t/t3909-stash-pathspec-file.sh
@@ -88,13 +88,13 @@
echo fileA.t >list &&
test_must_fail git stash push --pathspec-from-file=list --patch 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
+ test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
test_must_fail git stash push --pathspec-from-file=list -- fileA.t 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+ test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git stash push --pathspec-file-nul 2>err &&
- test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err
+ test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
'
test_done
diff --git a/t/t3920-crlf-messages.sh b/t/t3920-crlf-messages.sh
index a8ad546..0276edb 100755
--- a/t/t3920-crlf-messages.sh
+++ b/t/t3920-crlf-messages.sh
@@ -70,7 +70,7 @@
for ref in ${LIB_CRLF_BRANCHES}
do
cat .crlf-${file}-\"\${ref}\".txt >>expect &&
- printf \"\n\" >>expect
+ printf \"\n\" >>expect || return 1
done &&
git $command_and_args --format=\"%${atom}\" >actual &&
test_cmp expect actual
@@ -90,7 +90,7 @@
do
printf " " >>expect &&
cat .crlf-subject-${branch}.txt >>expect &&
- printf "\n" >>expect
+ printf "\n" >>expect || return 1
done &&
git branch -v >tmp &&
# Remove first two columns, and the line for the currently checked out branch
diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index cce3349..bfcaae3 100755
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -6,6 +6,8 @@
test_description='Test built-in diff output engine.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 68f2ebc..3dc9047 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -174,7 +174,7 @@
do
for j in 0 1 2 3 4 5 6 7 8 9;
do
- echo "$i$j" >"path$i$j"
+ echo "$i$j" >"path$i$j" || return 1
done
done &&
git add "path??" &&
diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
index 6a9f010..ea52e5b 100755
--- a/t/t4002-diff-basic.sh
+++ b/t/t4002-diff-basic.sh
@@ -6,6 +6,8 @@
test_description='Test diff raw-output.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh
index db07ff3..181e968 100755
--- a/t/t4003-diff-rename-1.sh
+++ b/t/t4003-diff-rename-1.sh
@@ -6,12 +6,14 @@
test_description='More rename detection
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success \
'prepare reference tree' \
- 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+ 'COPYING_test_data >COPYING &&
echo frotz >rezrov &&
git update-index --add COPYING rezrov &&
tree=$(git write-tree) &&
@@ -99,7 +101,7 @@
test_expect_success \
'prepare work tree once again' \
- 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+ 'COPYING_test_data >COPYING &&
git update-index --add --remove COPYING COPYING.1'
# tree has COPYING and rezrov. work tree has COPYING and COPYING.1,
diff --git a/t/t4004-diff-rename-symlink.sh b/t/t4004-diff-rename-symlink.sh
index 3d495e3..8def4d4 100755
--- a/t/t4004-diff-rename-symlink.sh
+++ b/t/t4004-diff-rename-symlink.sh
@@ -9,6 +9,8 @@
copy of symbolic links, but should not produce rename/copy followed
by an edit for them.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh
index 8647906..5c756dc 100755
--- a/t/t4005-diff-rename-2.sh
+++ b/t/t4005-diff-rename-2.sh
@@ -5,11 +5,13 @@
test_description='Same rename detection as t4003 but testing diff-raw.'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success 'setup reference tree' '
- cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+ COPYING_test_data >COPYING &&
echo frotz >rezrov &&
git update-index --add COPYING rezrov &&
tree=$(git write-tree) &&
@@ -64,7 +66,7 @@
# nows how to say Copy.
test_expect_success 'validate output from rename/copy detection (#3)' '
- cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+ COPYING_test_data >COPYING &&
git update-index --add --remove COPYING COPYING.1 &&
cat <<-EOF >expected &&
diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 6cdee2a..dbd4c0d 100755
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -6,6 +6,8 @@
test_description='Test mode change diffs.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
sed_script='s/\(:100644 100755\) \('"$OID_REGEX"'\) \2 /\1 X X /'
diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh
index cbb9c62..b86165c 100755
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
@@ -6,18 +6,19 @@
test_description='Rename interaction with pathspec.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success 'prepare reference tree' '
mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/lib-diff/COPYING path0/COPYING &&
+ COPYING_test_data >path0/COPYING &&
git update-index --add path0/COPYING &&
tree=$(git write-tree) &&
- echo $tree
+ blob=$(git rev-parse :path0/COPYING)
'
-blob=$(git hash-object "$TEST_DIRECTORY/lib-diff/COPYING")
test_expect_success 'prepare work tree' '
cp path0/COPYING path1/COPYING &&
git update-index --add --remove path0/COPYING path1/COPYING
diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.sh
index 2299f27..562aaf3 100755
--- a/t/t4008-diff-break-rewrite.sh
+++ b/t/t4008-diff-break-rewrite.sh
@@ -25,8 +25,8 @@
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success setup '
- cat "$TEST_DIRECTORY"/lib-diff/README >file0 &&
- cat "$TEST_DIRECTORY"/lib-diff/COPYING >file1 &&
+ echo some dissimilar content >file0 &&
+ COPYING_test_data >file1 &&
blob0_id=$(git hash-object file0) &&
blob1_id=$(git hash-object file1) &&
git update-index --add file0 file1 &&
diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh
index b1da807..3480781 100755
--- a/t/t4009-diff-rename-4.sh
+++ b/t/t4009-diff-rename-4.sh
@@ -6,12 +6,14 @@
test_description='Same rename detection as t4003 but testing diff-raw -z.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success \
'prepare reference tree' \
- 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+ 'COPYING_test_data >COPYING &&
echo frotz >rezrov &&
git update-index --add COPYING rezrov &&
orig=$(git hash-object COPYING) &&
@@ -81,7 +83,7 @@
test_expect_success \
'prepare work tree once again' \
- 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+ 'COPYING_test_data >COPYING &&
git update-index --add --remove COPYING COPYING.1'
git diff-index -z -C --find-copies-harder $tree >current
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index 1bbced7..9d9650e 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -9,6 +9,8 @@
file0
path1/file1
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh
index 5a25c25..d7a5f7a 100755
--- a/t/t4011-diff-symlink.sh
+++ b/t/t4011-diff-symlink.sh
@@ -6,6 +6,8 @@
test_description='Test diff of symlinks.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 33ff588..c509143 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -6,6 +6,7 @@
test_description='Binary diff and apply
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >expect.binary-numstat <<\EOF
@@ -122,7 +123,7 @@
i=0 &&
while test $i -lt 10000; do
echo $i &&
- i=$(($i + 1))
+ i=$(($i + 1)) || return 1
done >textfile &&
git add textfile &&
git diff --cached --stat binfile textfile >output &&
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 28683d0..056e922 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -19,8 +19,8 @@
mkdir dir &&
mkdir dir2 &&
- for i in 1 2 3; do echo $i; done >file0 &&
- for i in A B; do echo $i; done >dir/sub &&
+ test_write_lines 1 2 3 >file0 &&
+ test_write_lines A B >dir/sub &&
cat file0 >file2 &&
git add file0 file2 dir/sub &&
git commit -m Initial &&
@@ -32,8 +32,8 @@
GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
- for i in 4 5 6; do echo $i; done >>file0 &&
- for i in C D; do echo $i; done >>dir/sub &&
+ test_write_lines 4 5 6 >>file0 &&
+ test_write_lines C D >>dir/sub &&
rm -f file2 &&
git update-index --remove file0 file2 dir/sub &&
git commit -m "Second${LF}${LF}This is the second commit." &&
@@ -42,9 +42,9 @@
GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
- for i in A B C; do echo $i; done >file1 &&
+ test_write_lines A B C >file1 &&
git add file1 &&
- for i in E F; do echo $i; done >>dir/sub &&
+ test_write_lines E F >>dir/sub &&
git update-index dir/sub &&
git commit -m Third &&
@@ -53,8 +53,8 @@
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
git checkout side &&
- for i in A B C; do echo $i; done >>file0 &&
- for i in 1 2; do echo $i; done >>dir/sub &&
+ test_write_lines A B C >>file0 &&
+ test_write_lines 1 2 >>dir/sub &&
cat dir/sub >file3 &&
git add file3 &&
git update-index file0 dir/sub &&
@@ -71,8 +71,8 @@
GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
- for i in A B C; do echo $i; done >>file0 &&
- for i in 1 2; do echo $i; done >>dir/sub &&
+ test_write_lines A B C >>file0 &&
+ test_write_lines 1 2 >>dir/sub &&
git update-index file0 dir/sub &&
mkdir dir3 &&
@@ -86,7 +86,7 @@
GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
git checkout -b rearrange initial &&
- for i in B A; do echo $i; done >dir/sub &&
+ test_write_lines B A >dir/sub &&
git add dir/sub &&
git commit -m "Rearranged lines in dir/sub" &&
git checkout master &&
@@ -542,6 +542,39 @@
test_cmp expect actual
'
+test_expect_success 'diff-tree --stdin with pathspec' '
+ cat >expect <<-EOF &&
+ Third
+
+ dir/sub
+ Second
+
+ dir/sub
+ EOF
+ git rev-list master^ |
+ git diff-tree -r --stdin --name-only --format=%s dir >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'show A B ... -- <pathspec>' '
+ # side touches dir/sub, file0, and file3
+ # master^ touches dir/sub, and file1
+ # master^^ touches dir/sub, file0, and file2
+ git show --name-only --format="<%s>" side master^ master^^ -- dir >actual &&
+ cat >expect <<-\EOF &&
+ <Side>
+
+ dir/sub
+ <Third>
+
+ dir/sub
+ <Second>
+
+ dir/sub
+ EOF
+ test_cmp expect actual
+'
+
test_expect_success 'diff -I<regex>: setup' '
git checkout master &&
test_seq 50 >file0 &&
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 712d4b5..fbec8ad 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -12,25 +12,25 @@
. "$TEST_DIRECTORY"/lib-terminal.sh
test_expect_success setup '
- for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
+ test_write_lines 1 2 3 4 5 6 7 8 9 10 >file &&
cat file >elif &&
git add file elif &&
test_tick &&
git commit -m Initial &&
git checkout -b side &&
- for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
+ test_write_lines 1 2 5 6 A B C 7 8 9 10 >file &&
test_chmod +x elif &&
test_tick &&
git commit -m "Side changes #1" &&
- for i in D E F; do echo "$i"; done >>file &&
+ test_write_lines D E F >>file &&
git update-index file &&
test_tick &&
git commit -m "Side changes #2" &&
git tag C2 &&
- for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
+ test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >file &&
git update-index file &&
test_tick &&
git commit -m "Side changes #3 with \\n backslash-n in it." &&
@@ -43,18 +43,18 @@
git checkout side &&
git checkout -b patchid &&
- for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file2 &&
- for i in 1 2 3 A 4 B C 7 8 9 10 D E F 5 6; do echo "$i"; done >file3 &&
- for i in 8 9 10; do echo "$i"; done >file &&
+ test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >file2 &&
+ test_write_lines 1 2 3 A 4 B C 7 8 9 10 D E F 5 6 >file3 &&
+ test_write_lines 8 9 10 >file &&
git add file file2 file3 &&
test_tick &&
git commit -m "patchid 1" &&
- for i in 4 A B 7 8 9 10; do echo "$i"; done >file2 &&
- for i in 8 9 10 5 6; do echo "$i"; done >file3 &&
+ test_write_lines 4 A B 7 8 9 10 >file2 &&
+ test_write_lines 8 9 10 5 6 >file3 &&
git add file2 file3 &&
test_tick &&
git commit -m "patchid 2" &&
- for i in 10 5 6; do echo "$i"; done >file &&
+ test_write_lines 10 5 6 >file &&
git add file &&
test_tick &&
git commit -m "patchid 3" &&
@@ -325,7 +325,7 @@
max=$(
for patch in 000[1-9]-*.patch
do
- echo "$patch" | wc -c
+ echo "$patch" | wc -c || exit 1
done |
sort -nr |
head -n 1
@@ -343,7 +343,7 @@
max=$(
for patch in 000[1-9]-*.patch
do
- echo "$patch" | wc -c
+ echo "$patch" | wc -c || exit 1
done |
sort -nr |
head -n 1
@@ -361,7 +361,7 @@
max=$(
for patch in patches/000[1-9]-*.patch
do
- echo "${patch#patches/}" | wc -c
+ echo "${patch#patches/}" | wc -c || exit 1
done |
sort -nr |
head -n 1
@@ -653,7 +653,7 @@
git checkout side &&
before=$(git hash-object file) &&
before=$(git rev-parse --short $before) &&
- for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >>file &&
+ test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >>file &&
after=$(git hash-object file) &&
after=$(git rev-parse --short $after) &&
git update-index file &&
@@ -926,11 +926,40 @@
'
test_expect_success 'format-patch -- <path>' '
- git format-patch main..side -- file 2>error &&
- ! grep "Use .--" error
+ rm -f *.patch &&
+ git checkout -b pathspec main &&
+
+ echo file_a 1 >file_a &&
+ echo file_b 1 >file_b &&
+ git add file_a file_b &&
+ git commit -m pathspec_initial &&
+
+ echo file_a 2 >>file_a &&
+ git add file_a &&
+ git commit -m pathspec_a &&
+
+ echo file_b 2 >>file_b &&
+ git add file_b &&
+ git commit -m pathspec_b &&
+
+ echo file_a 3 >>file_a &&
+ echo file_b 3 >>file_b &&
+ git add file_a file_b &&
+ git commit -m pathspec_ab &&
+
+ cat >expect <<-\EOF &&
+ 0001-pathspec_initial.patch
+ 0002-pathspec_a.patch
+ 0003-pathspec_ab.patch
+ EOF
+
+ git format-patch main..pathspec -- file_a >output &&
+ test_cmp expect output &&
+ ! grep file_b *.patch
'
test_expect_success 'format-patch --ignore-if-in-upstream HEAD' '
+ git checkout side &&
git format-patch --ignore-if-in-upstream HEAD
'
@@ -1086,7 +1115,7 @@
test_expect_success 'format-patch handles multi-line subjects' '
rm -rf patches/ &&
echo content >>file &&
- for i in one two three; do echo $i; done >msg &&
+ test_write_lines one two three >msg &&
git add file &&
git commit -F msg &&
git format-patch -o patches -1 &&
@@ -1098,7 +1127,7 @@
test_expect_success 'format-patch handles multi-line encoded subjects' '
rm -rf patches/ &&
echo content >>file &&
- for i in en två tre; do echo $i; done >msg &&
+ test_write_lines en två tre >msg &&
git add file &&
git commit -F msg &&
git format-patch -o patches -1 &&
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 2c13b62..f3e20dd 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -6,6 +6,8 @@
test_description='Test special whitespace in diff engine.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh
@@ -843,7 +845,7 @@
test_expect_success 'whitespace-only changes reported across renames (diffstat)' '
git reset --hard &&
- for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
+ for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i" || return 1; done >x &&
git add x &&
git commit -m "base" &&
sed -e "5s/^/ /" x >z &&
@@ -859,7 +861,7 @@
test_expect_success 'whitespace-only changes reported across renames' '
git reset --hard HEAD~1 &&
- for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
+ for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i" || return 1; done >x &&
git add x &&
hash_x=$(git hash-object x) &&
before=$(git rev-parse --short "$hash_x") &&
@@ -1442,6 +1444,143 @@
test_cmp expected actual
'
+test_expect_success 'zebra alternate color is only used when necessary' '
+ cat >old.txt <<-\EOF &&
+ line 1A should be marked as oldMoved newMovedAlternate
+ line 1B should be marked as oldMoved newMovedAlternate
+ unchanged
+ line 2A should be marked as oldMoved newMovedAlternate
+ line 2B should be marked as oldMoved newMovedAlternate
+ line 3A should be marked as oldMovedAlternate newMoved
+ line 3B should be marked as oldMovedAlternate newMoved
+ unchanged
+ line 4A should be marked as oldMoved newMovedAlternate
+ line 4B should be marked as oldMoved newMovedAlternate
+ line 5A should be marked as oldMovedAlternate newMoved
+ line 5B should be marked as oldMovedAlternate newMoved
+ line 6A should be marked as oldMoved newMoved
+ line 6B should be marked as oldMoved newMoved
+ EOF
+ cat >new.txt <<-\EOF &&
+ line 1A should be marked as oldMoved newMovedAlternate
+ line 1B should be marked as oldMoved newMovedAlternate
+ unchanged
+ line 3A should be marked as oldMovedAlternate newMoved
+ line 3B should be marked as oldMovedAlternate newMoved
+ line 2A should be marked as oldMoved newMovedAlternate
+ line 2B should be marked as oldMoved newMovedAlternate
+ unchanged
+ line 6A should be marked as oldMoved newMoved
+ line 6B should be marked as oldMoved newMoved
+ line 4A should be marked as oldMoved newMovedAlternate
+ line 4B should be marked as oldMoved newMovedAlternate
+ line 5A should be marked as oldMovedAlternate newMoved
+ line 5B should be marked as oldMovedAlternate newMoved
+ EOF
+ test_expect_code 1 git diff --no-index --color --color-moved=zebra \
+ --color-moved-ws=allow-indentation-change \
+ old.txt new.txt >output &&
+ grep -v index output | test_decode_color >actual &&
+ cat >expected <<-\EOF &&
+ <BOLD>diff --git a/old.txt b/new.txt<RESET>
+ <BOLD>--- a/old.txt<RESET>
+ <BOLD>+++ b/new.txt<RESET>
+ <CYAN>@@ -1,14 +1,14 @@<RESET>
+ <BOLD;MAGENTA>-line 1A should be marked as oldMoved newMovedAlternate<RESET>
+ <BOLD;MAGENTA>-line 1B should be marked as oldMoved newMovedAlternate<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN> line 1A should be marked as oldMoved newMovedAlternate<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN> line 1B should be marked as oldMoved newMovedAlternate<RESET>
+ unchanged<RESET>
+ <BOLD;MAGENTA>-line 2A should be marked as oldMoved newMovedAlternate<RESET>
+ <BOLD;MAGENTA>-line 2B should be marked as oldMoved newMovedAlternate<RESET>
+ <BOLD;BLUE>-line 3A should be marked as oldMovedAlternate newMoved<RESET>
+ <BOLD;BLUE>-line 3B should be marked as oldMovedAlternate newMoved<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN> line 3A should be marked as oldMovedAlternate newMoved<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN> line 3B should be marked as oldMovedAlternate newMoved<RESET>
+ <BOLD;YELLOW>+<RESET><BOLD;YELLOW> line 2A should be marked as oldMoved newMovedAlternate<RESET>
+ <BOLD;YELLOW>+<RESET><BOLD;YELLOW> line 2B should be marked as oldMoved newMovedAlternate<RESET>
+ unchanged<RESET>
+ <BOLD;MAGENTA>-line 4A should be marked as oldMoved newMovedAlternate<RESET>
+ <BOLD;MAGENTA>-line 4B should be marked as oldMoved newMovedAlternate<RESET>
+ <BOLD;BLUE>-line 5A should be marked as oldMovedAlternate newMoved<RESET>
+ <BOLD;BLUE>-line 5B should be marked as oldMovedAlternate newMoved<RESET>
+ <BOLD;MAGENTA>-line 6A should be marked as oldMoved newMoved<RESET>
+ <BOLD;MAGENTA>-line 6B should be marked as oldMoved newMoved<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN> line 6A should be marked as oldMoved newMoved<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN> line 6B should be marked as oldMoved newMoved<RESET>
+ <BOLD;YELLOW>+<RESET><BOLD;YELLOW> line 4A should be marked as oldMoved newMovedAlternate<RESET>
+ <BOLD;YELLOW>+<RESET><BOLD;YELLOW> line 4B should be marked as oldMoved newMovedAlternate<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN> line 5A should be marked as oldMovedAlternate newMoved<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN> line 5B should be marked as oldMovedAlternate newMoved<RESET>
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'short lines of opposite sign do not get marked as moved' '
+ cat >old.txt <<-\EOF &&
+ this line should be marked as moved
+ unchanged
+ unchanged
+ unchanged
+ unchanged
+ too short
+ this line should be marked as oldMoved newMoved
+ this line should be marked as oldMovedAlternate newMoved
+ unchanged 1
+ unchanged 2
+ unchanged 3
+ unchanged 4
+ this line should be marked as oldMoved newMoved/newMovedAlternate
+ EOF
+ cat >new.txt <<-\EOF &&
+ too short
+ unchanged
+ unchanged
+ this line should be marked as moved
+ too short
+ unchanged
+ unchanged
+ this line should be marked as oldMoved newMoved/newMovedAlternate
+ unchanged 1
+ unchanged 2
+ this line should be marked as oldMovedAlternate newMoved
+ this line should be marked as oldMoved newMoved/newMovedAlternate
+ unchanged 3
+ this line should be marked as oldMoved newMoved
+ unchanged 4
+ EOF
+ test_expect_code 1 git diff --no-index --color --color-moved=zebra \
+ old.txt new.txt >output && cat output &&
+ grep -v index output | test_decode_color >actual &&
+ cat >expect <<-\EOF &&
+ <BOLD>diff --git a/old.txt b/new.txt<RESET>
+ <BOLD>--- a/old.txt<RESET>
+ <BOLD>+++ b/new.txt<RESET>
+ <CYAN>@@ -1,13 +1,15 @@<RESET>
+ <BOLD;MAGENTA>-this line should be marked as moved<RESET>
+ <GREEN>+<RESET><GREEN>too short<RESET>
+ unchanged<RESET>
+ unchanged<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as moved<RESET>
+ <GREEN>+<RESET><GREEN>too short<RESET>
+ unchanged<RESET>
+ unchanged<RESET>
+ <RED>-too short<RESET>
+ <BOLD;MAGENTA>-this line should be marked as oldMoved newMoved<RESET>
+ <BOLD;BLUE>-this line should be marked as oldMovedAlternate newMoved<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
+ unchanged 1<RESET>
+ unchanged 2<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMovedAlternate newMoved<RESET>
+ <BOLD;YELLOW>+<RESET><BOLD;YELLOW>this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
+ unchanged 3<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMoved newMoved<RESET>
+ unchanged 4<RESET>
+ <BOLD;MAGENTA>-this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
+ EOF
+ test_cmp expect actual
+'
+
test_expect_success 'cmd option assumes configured colored-moved' '
test_config color.diff.oldMoved "magenta" &&
test_config color.diff.newMoved "cyan" &&
@@ -1485,7 +1624,7 @@
test_cmp expected actual
'
-test_expect_success 'no effect from --color-moved with --word-diff' '
+test_expect_success 'no effect on diff from --color-moved with --word-diff' '
cat <<-\EOF >text.txt &&
Lorem Ipsum is simply dummy text of the printing and typesetting industry.
EOF
@@ -1499,6 +1638,12 @@
test_cmp expect actual
'
+test_expect_success !SANITIZE_LEAK 'no effect on show from --color-moved with --word-diff' '
+ git show --color-moved --word-diff >actual &&
+ git show --word-diff >expect &&
+ test_cmp expect actual
+'
+
test_expect_success 'set up whitespace tests' '
git reset --hard &&
# Note that these lines have no leading or trailing whitespace.
@@ -1833,7 +1978,53 @@
test_cmp expected actual
'
-test_expect_success 'move detection with submodules' '
+test_expect_success '--color-moved rewinds for MIN_ALNUM_COUNT' '
+ git reset --hard &&
+ test_write_lines >file \
+ A B C one two three four five six seven D E F G H I J &&
+ git add file &&
+ test_write_lines >file \
+ one two A B C D E F G H I J two three four five six seven &&
+ git diff --color-moved=zebra -- file &&
+
+ git diff --color-moved=zebra --color -- file >actual.raw &&
+ grep -v "index" actual.raw | test_decode_color >actual &&
+ cat >expected <<-\EOF &&
+ <BOLD>diff --git a/file b/file<RESET>
+ <BOLD>--- a/file<RESET>
+ <BOLD>+++ b/file<RESET>
+ <CYAN>@@ -1,13 +1,8 @@<RESET>
+ <GREEN>+<RESET><GREEN>one<RESET>
+ <GREEN>+<RESET><GREEN>two<RESET>
+ A<RESET>
+ B<RESET>
+ C<RESET>
+ <RED>-one<RESET>
+ <BOLD;MAGENTA>-two<RESET>
+ <BOLD;MAGENTA>-three<RESET>
+ <BOLD;MAGENTA>-four<RESET>
+ <BOLD;MAGENTA>-five<RESET>
+ <BOLD;MAGENTA>-six<RESET>
+ <BOLD;MAGENTA>-seven<RESET>
+ D<RESET>
+ E<RESET>
+ F<RESET>
+ <CYAN>@@ -15,3 +10,9 @@<RESET> <RESET>G<RESET>
+ H<RESET>
+ I<RESET>
+ J<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN>two<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN>three<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN>four<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN>five<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN>six<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN>seven<RESET>
+ EOF
+
+ test_cmp expected actual
+'
+
+test_expect_success !SANITIZE_LEAK 'move detection with submodules' '
test_create_repo bananas &&
echo ripe >bananas/recipe &&
git -C bananas add recipe &&
@@ -2023,10 +2214,10 @@
test_expect_success 'compare mixed whitespace delta across moved blocks' '
git reset --hard &&
- tr Q_ "\t " <<-EOF >text.txt &&
- ${EMPTY}
- ____too short without
- ${EMPTY}
+ tr "^|Q_" "\f\v\t " <<-EOF >text.txt &&
+ ^__
+ |____too short without
+ ^
___being grouped across blank line
${EMPTY}
context
@@ -2045,7 +2236,7 @@
git add text.txt &&
git commit -m "add text.txt" &&
- tr Q_ "\t " <<-EOF >text.txt &&
+ tr "^|Q_" "\f\v\t " <<-EOF >text.txt &&
context
lines
to
@@ -2056,7 +2247,7 @@
${EMPTY}
QQtoo short without
${EMPTY}
- Q_______being grouped across blank line
+ ^Q_______being grouped across blank line
${EMPTY}
Q_QThese two lines have had their
indentation reduced by four spaces
@@ -2068,16 +2259,16 @@
-c core.whitespace=space-before-tab \
diff --color --color-moved --ws-error-highlight=all \
--color-moved-ws=allow-indentation-change >actual.raw &&
- grep -v "index" actual.raw | test_decode_color >actual &&
+ grep -v "index" actual.raw | tr "\f\v" "^|" | test_decode_color >actual &&
cat <<-\EOF >expected &&
<BOLD>diff --git a/text.txt b/text.txt<RESET>
<BOLD>--- a/text.txt<RESET>
<BOLD>+++ b/text.txt<RESET>
<CYAN>@@ -1,16 +1,16 @@<RESET>
- <BOLD;MAGENTA>-<RESET>
- <BOLD;MAGENTA>-<RESET><BOLD;MAGENTA> too short without<RESET>
- <BOLD;MAGENTA>-<RESET>
+ <BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>^<RESET><BRED> <RESET>
+ <BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>| too short without<RESET>
+ <BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>^<RESET>
<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA> being grouped across blank line<RESET>
<BOLD;MAGENTA>-<RESET>
<RESET>context<RESET>
@@ -2097,7 +2288,7 @@
<BOLD;YELLOW>+<RESET>
<BOLD;YELLOW>+<RESET> <BOLD;YELLOW>too short without<RESET>
<BOLD;YELLOW>+<RESET>
- <BOLD;YELLOW>+<RESET> <BOLD;YELLOW> being grouped across blank line<RESET>
+ <BOLD;YELLOW>+<RESET><BOLD;YELLOW>^ being grouped across blank line<RESET>
<BOLD;YELLOW>+<RESET>
<BOLD;CYAN>+<RESET> <BRED> <RESET> <BOLD;CYAN>These two lines have had their<RESET>
<BOLD;CYAN>+<RESET><BOLD;CYAN>indentation reduced by four spaces<RESET>
diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh
index 876271d..5a8d887 100755
--- a/t/t4016-diff-quote.sh
+++ b/t/t4016-diff-quote.sh
@@ -6,6 +6,7 @@
test_description='Quoting paths in diff output.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
P0='pathname'
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 740696c..42a2b9a 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -75,7 +75,7 @@
test_expect_success 'setup hunk header tests' '
for i in $diffpatterns
do
- echo "$i-* diff=$i"
+ echo "$i-* diff=$i" || return 1
done > .gitattributes &&
# add all test files to the index
diff --git a/t/t4018/kotlin-class b/t/t4018/kotlin-class
new file mode 100644
index 0000000..bb864f2
--- /dev/null
+++ b/t/t4018/kotlin-class
@@ -0,0 +1,5 @@
+class RIGHT {
+ //comment
+ //comment
+ return ChangeMe
+}
diff --git a/t/t4018/kotlin-enum-class b/t/t4018/kotlin-enum-class
new file mode 100644
index 0000000..8885f90
--- /dev/null
+++ b/t/t4018/kotlin-enum-class
@@ -0,0 +1,5 @@
+enum class RIGHT{
+ // Left
+ // a comment
+ ChangeMe
+}
diff --git a/t/t4018/kotlin-fun b/t/t4018/kotlin-fun
new file mode 100644
index 0000000..2a60280
--- /dev/null
+++ b/t/t4018/kotlin-fun
@@ -0,0 +1,5 @@
+fun RIGHT(){
+ //a comment
+ //b comment
+ return ChangeMe()
+}
diff --git a/t/t4018/kotlin-inheritace-class b/t/t4018/kotlin-inheritace-class
new file mode 100644
index 0000000..77376c1
--- /dev/null
+++ b/t/t4018/kotlin-inheritace-class
@@ -0,0 +1,5 @@
+open class RIGHT{
+ // a comment
+ // b comment
+ // ChangeMe
+}
diff --git a/t/t4018/kotlin-inline-class b/t/t4018/kotlin-inline-class
new file mode 100644
index 0000000..7bf46dd
--- /dev/null
+++ b/t/t4018/kotlin-inline-class
@@ -0,0 +1,5 @@
+value class RIGHT(Args){
+ // a comment
+ // b comment
+ ChangeMe
+}
diff --git a/t/t4018/kotlin-interface b/t/t4018/kotlin-interface
new file mode 100644
index 0000000..f686ba7
--- /dev/null
+++ b/t/t4018/kotlin-interface
@@ -0,0 +1,5 @@
+interface RIGHT{
+ //another comment
+ //another comment
+ //ChangeMe
+}
diff --git a/t/t4018/kotlin-nested-fun b/t/t4018/kotlin-nested-fun
new file mode 100644
index 0000000..1218685
--- /dev/null
+++ b/t/t4018/kotlin-nested-fun
@@ -0,0 +1,9 @@
+class LEFT{
+ class CENTER{
+ fun RIGHT( a:Int){
+ //comment
+ //comment
+ ChangeMe
+ }
+ }
+}
diff --git a/t/t4018/kotlin-public-class b/t/t4018/kotlin-public-class
new file mode 100644
index 0000000..9433fcc
--- /dev/null
+++ b/t/t4018/kotlin-public-class
@@ -0,0 +1,5 @@
+public class RIGHT{
+ //comment1
+ //comment2
+ ChangeMe
+}
diff --git a/t/t4018/kotlin-sealed-class b/t/t4018/kotlin-sealed-class
new file mode 100644
index 0000000..0efa4a4
--- /dev/null
+++ b/t/t4018/kotlin-sealed-class
@@ -0,0 +1,5 @@
+sealed class RIGHT {
+ // a comment
+ // b comment
+ ChangeMe
+}
diff --git a/t/t4019-diff-wserror.sh b/t/t4019-diff-wserror.sh
index c6135c7..d2b3109 100755
--- a/t/t4019-diff-wserror.sh
+++ b/t/t4019-diff-wserror.sh
@@ -2,6 +2,7 @@
test_description='diff whitespace error detection'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -286,9 +287,9 @@
'
test_expect_success 'color new trailing blank lines' '
- { echo a; echo b; echo; echo; } >x &&
+ test_write_lines a b "" "" >x &&
git add x &&
- { echo a; echo; echo; echo; echo c; echo; echo; echo; echo; } >x &&
+ test_write_lines a "" "" "" c "" "" "" "" >x &&
git diff --color x >output &&
cnt=$($grep_a "${blue_grep}" output | wc -l) &&
test $cnt = 2
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index e009826..858a552 100755
--- a/t/t4020-diff-external.sh
+++ b/t/t4020-diff-external.sh
@@ -2,6 +2,7 @@
test_description='external diff interface test'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -23,45 +24,38 @@
'
test_expect_success 'GIT_EXTERNAL_DIFF environment' '
-
- GIT_EXTERNAL_DIFF=echo git diff | {
- read path oldfile oldhex oldmode newfile newhex newmode &&
- test "z$path" = zfile &&
- test "z$oldmode" = z100644 &&
- test "z$newhex" = "z$ZERO_OID" &&
- test "z$newmode" = z100644 &&
- oh=$(git rev-parse --verify HEAD:file) &&
- test "z$oh" = "z$oldhex"
- }
+ cat >expect <<-EOF &&
+ file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
+ EOF
+ GIT_EXTERNAL_DIFF=echo git diff >out &&
+ cut -d" " -f1,3- <out >actual &&
+ test_cmp expect actual
'
-test_expect_success 'GIT_EXTERNAL_DIFF environment should apply only to diff' '
-
- GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD |
- grep "^diff --git a/file b/file"
+test_expect_success !SANITIZE_LEAK 'GIT_EXTERNAL_DIFF environment should apply only to diff' '
+ GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD >out &&
+ grep "^diff --git a/file b/file" out
'
test_expect_success 'GIT_EXTERNAL_DIFF environment and --no-ext-diff' '
-
- GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff |
- grep "^diff --git a/file b/file"
+ GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >out &&
+ grep "^diff --git a/file b/file" out
'
test_expect_success SYMLINKS 'typechange diff' '
rm -f file &&
ln -s elif file &&
- GIT_EXTERNAL_DIFF=echo git diff | {
- read path oldfile oldhex oldmode newfile newhex newmode &&
- test "z$path" = zfile &&
- test "z$oldmode" = z100644 &&
- test "z$newhex" = "z$ZERO_OID" &&
- test "z$newmode" = z120000 &&
- oh=$(git rev-parse --verify HEAD:file) &&
- test "z$oh" = "z$oldhex"
- } &&
+
+ cat >expect <<-EOF &&
+ file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 120000
+ EOF
+ GIT_EXTERNAL_DIFF=echo git diff >out &&
+ cut -d" " -f1,3-4,6- <out >actual &&
+ test_cmp expect actual &&
+
GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >actual &&
git diff >expect &&
test_cmp expect actual
@@ -71,27 +65,25 @@
git reset --hard &&
echo third >file &&
test_config diff.external echo &&
- git diff | {
- read path oldfile oldhex oldmode newfile newhex newmode &&
- test "z$path" = zfile &&
- test "z$oldmode" = z100644 &&
- test "z$newhex" = "z$ZERO_OID" &&
- test "z$newmode" = z100644 &&
- oh=$(git rev-parse --verify HEAD:file) &&
- test "z$oh" = "z$oldhex"
- }
+
+ cat >expect <<-EOF &&
+ file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
+ EOF
+ git diff >out &&
+ cut -d" " -f1,3-4,6- <out >actual &&
+ test_cmp expect actual
'
-test_expect_success 'diff.external should apply only to diff' '
+test_expect_success !SANITIZE_LEAK 'diff.external should apply only to diff' '
test_config diff.external echo &&
- git log -p -1 HEAD |
- grep "^diff --git a/file b/file"
+ git log -p -1 HEAD >out &&
+ grep "^diff --git a/file b/file" out
'
test_expect_success 'diff.external and --no-ext-diff' '
test_config diff.external echo &&
- git diff --no-ext-diff |
- grep "^diff --git a/file b/file"
+ git diff --no-ext-diff >out &&
+ grep "^diff --git a/file b/file" out
'
test_expect_success 'diff attribute' '
@@ -102,29 +94,23 @@
echo >.gitattributes "file diff=parrot" &&
- git diff | {
- read path oldfile oldhex oldmode newfile newhex newmode &&
- test "z$path" = zfile &&
- test "z$oldmode" = z100644 &&
- test "z$newhex" = "z$ZERO_OID" &&
- test "z$newmode" = z100644 &&
- oh=$(git rev-parse --verify HEAD:file) &&
- test "z$oh" = "z$oldhex"
- }
-
+ cat >expect <<-EOF &&
+ file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
+ EOF
+ git diff >out &&
+ cut -d" " -f1,3-4,6- <out >actual &&
+ test_cmp expect actual
'
-test_expect_success 'diff attribute should apply only to diff' '
-
- git log -p -1 HEAD |
- grep "^diff --git a/file b/file"
+test_expect_success !SANITIZE_LEAK 'diff attribute should apply only to diff' '
+ git log -p -1 HEAD >out &&
+ grep "^diff --git a/file b/file" out
'
test_expect_success 'diff attribute and --no-ext-diff' '
-
- git diff --no-ext-diff |
- grep "^diff --git a/file b/file"
+ git diff --no-ext-diff >out &&
+ grep "^diff --git a/file b/file" out
'
@@ -135,48 +121,55 @@
echo >.gitattributes "file diff=color" &&
- git diff | {
- read path oldfile oldhex oldmode newfile newhex newmode &&
- test "z$path" = zfile &&
- test "z$oldmode" = z100644 &&
- test "z$newhex" = "z$ZERO_OID" &&
- test "z$newmode" = z100644 &&
- oh=$(git rev-parse --verify HEAD:file) &&
- test "z$oh" = "z$oldhex"
- }
-
+ cat >expect <<-EOF &&
+ file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
+ EOF
+ git diff >out &&
+ cut -d" " -f1,3-4,6- <out >actual &&
+ test_cmp expect actual
'
-test_expect_success 'diff attribute should apply only to diff' '
-
- git log -p -1 HEAD |
- grep "^diff --git a/file b/file"
+test_expect_success !SANITIZE_LEAK 'diff attribute should apply only to diff' '
+ git log -p -1 HEAD >out &&
+ grep "^diff --git a/file b/file" out
'
test_expect_success 'diff attribute and --no-ext-diff' '
-
- git diff --no-ext-diff |
- grep "^diff --git a/file b/file"
+ git diff --no-ext-diff >out &&
+ grep "^diff --git a/file b/file" out
'
test_expect_success 'GIT_EXTERNAL_DIFF trumps diff.external' '
>.gitattributes &&
test_config diff.external "echo ext-global" &&
- GIT_EXTERNAL_DIFF="echo ext-env" git diff | grep ext-env
+
+ cat >expect <<-EOF &&
+ ext-env file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
+ EOF
+ GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
+ cut -d" " -f1-2,4- <out >actual &&
+ test_cmp expect actual
'
test_expect_success 'attributes trump GIT_EXTERNAL_DIFF and diff.external' '
test_config diff.foo.command "echo ext-attribute" &&
test_config diff.external "echo ext-global" &&
echo "file diff=foo" >.gitattributes &&
- GIT_EXTERNAL_DIFF="echo ext-env" git diff | grep ext-attribute
+
+ cat >expect <<-EOF &&
+ ext-attribute file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
+ EOF
+ GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
+ cut -d" " -f1-2,4- <out >actual &&
+ test_cmp expect actual
'
test_expect_success 'no diff with -diff' '
echo >.gitattributes "file -diff" &&
- git diff | grep Binary
+ git diff >out &&
+ grep Binary out
'
echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file
@@ -213,12 +206,17 @@
'
test_expect_success 'GIT_EXTERNAL_DIFF generates pretty paths' '
+ test_when_finished "git rm -f file.ext" &&
touch file.ext &&
git add file.ext &&
echo with extension > file.ext &&
- GIT_EXTERNAL_DIFF=echo git diff file.ext | grep ......_file\.ext &&
- git update-index --force-remove file.ext &&
- rm file.ext
+
+ cat >expect <<-EOF &&
+ file.ext
+ EOF
+ GIT_EXTERNAL_DIFF=echo git diff file.ext >out &&
+ basename $(cut -d" " -f2 <out) >actual &&
+ test_cmp expect actual
'
echo "#!$SHELL_PATH" >fake-diff.sh
diff --git a/t/t4021-format-patch-numbered.sh b/t/t4021-format-patch-numbered.sh
index 9be65fd..1219aa2 100755
--- a/t/t4021-format-patch-numbered.sh
+++ b/t/t4021-format-patch-numbered.sh
@@ -5,6 +5,7 @@
test_description='Format-patch numbering options'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh
index 6d1c3d9..1c89050 100755
--- a/t/t4022-diff-rewrite.sh
+++ b/t/t4022-diff-rewrite.sh
@@ -3,15 +3,17 @@
test_description='rewrite diff'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success setup '
- cat "$TEST_DIRECTORY"/../COPYING >test &&
+ COPYING_test_data >test.data &&
+ cp test.data test &&
git add test &&
tr \
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
"nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
- <"$TEST_DIRECTORY"/../COPYING >test &&
+ <test.data >test &&
echo "to be deleted" >test2 &&
blob=$(git hash-object test2) &&
blob=$(git rev-parse --short $blob) &&
diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 8c98237..7cb9909 100755
--- a/t/t4023-diff-rename-typechange.sh
+++ b/t/t4023-diff-rename-typechange.sh
@@ -3,25 +3,26 @@
test_description='typechange rename detection'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
test_expect_success setup '
rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
test_ln_s_add linklink bar &&
git add foo &&
git commit -a -m Initial &&
git tag one &&
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >bar &&
+ COPYING_test_data >bar &&
test_ln_s_add linklink foo &&
git add bar &&
git commit -a -m Second &&
git tag two &&
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
git add foo &&
git commit -a -m Third &&
git tag three &&
@@ -35,7 +36,7 @@
# This is purely for sanity check
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
cat "$TEST_DIRECTORY"/../Makefile >bar &&
git add foo bar &&
git commit -a -m Fifth &&
@@ -43,7 +44,7 @@
git rm -f foo bar &&
cat "$TEST_DIRECTORY"/../Makefile >foo &&
- cat "$TEST_DIRECTORY"/../COPYING >bar &&
+ COPYING_test_data >bar &&
git add foo bar &&
git commit -a -m Sixth &&
git tag six
@@ -54,7 +55,7 @@
git diff-tree five six -r --name-status -B -M | sort >actual &&
{
- echo "R100 foo bar"
+ echo "R100 foo bar" &&
echo "R100 bar foo"
} | sort >expect &&
test_cmp expect actual
@@ -65,7 +66,7 @@
git diff-tree one two -r --name-status -B -M | sort >actual &&
{
- echo "R100 foo bar"
+ echo "R100 foo bar" &&
echo "R100 bar foo"
} | sort >expect &&
test_cmp expect actual
@@ -77,7 +78,7 @@
git diff-tree three four -r --name-status -B -M | sort >actual &&
{
# see -B -M (#6) in t4008
- echo "C100 foo bar"
+ echo "C100 foo bar" &&
echo "T100 foo"
} | sort >expect &&
test_cmp expect actual
diff --git a/t/t4024-diff-optimize-common.sh b/t/t4024-diff-optimize-common.sh
index 6b44ce1..e2f0eca 100755
--- a/t/t4024-diff-optimize-common.sh
+++ b/t/t4024-diff-optimize-common.sh
@@ -2,6 +2,7 @@
test_description='common tail optimization'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
z=zzzzzzzz ;# 8
@@ -148,7 +149,7 @@
for n in $sample
do
- git diff -U0 file-?$n
+ git diff -U0 file-?$n || return 1
done | zc >actual &&
test_cmp expect actual
diff --git a/t/t4025-hunk-header.sh b/t/t4025-hunk-header.sh
index 35578f2..5397cb7 100755
--- a/t/t4025-hunk-header.sh
+++ b/t/t4025-hunk-header.sh
@@ -2,6 +2,7 @@
test_description='diff hunk header truncation'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
N='日本語'
@@ -13,15 +14,9 @@
(
echo "A $NS" &&
- for c in B C D E F G H I J K
- do
- echo " $c"
- done &&
+ printf " %s\n" B C D E F G H I J K &&
echo "L $NS" &&
- for c in M N O P Q R S T U V
- do
- echo " $c"
- done
+ printf " %s\n" M N O P Q R S T U V
) >file &&
git add file &&
diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index c0b642c..cc3f60d 100755
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -4,6 +4,8 @@
#
test_description='Test diff/status color escape codes'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
ESC=$(printf '\033')
@@ -58,6 +60,10 @@
color "blue bold dim ul blink reverse" "[1;2;4;5;7;34m"
'
+test_expect_success 'reset fg bg attr...' '
+ color "reset blue bold dim ul blink reverse" "[;1;2;4;5;7;34m"
+'
+
# note that nobold and nodim are the same code (22)
test_expect_success 'attr negation' '
color "nobold nodim noul noblink noreverse" "[22;24;25;27m"
@@ -94,6 +100,18 @@
color "#ff00ff black" "[38;2;255;0;255;40m"
'
+test_expect_success '"default" foreground' '
+ color "default" "[39m"
+'
+
+test_expect_success '"normal default" to clear background' '
+ color "normal default" "[49m"
+'
+
+test_expect_success '"default" can be combined with attributes' '
+ color "default default no-reverse bold" "[1;27;39;49m"
+'
+
test_expect_success '"normal" yields no color at all"' '
color "normal black" "[40m"
'
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 94ef77e..40164ae 100755
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -2,6 +2,7 @@
test_description='difference in submodules'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh
@@ -27,10 +28,8 @@
git commit -m "submodule #2"
) &&
- set x $(
- cd sub &&
- git rev-list HEAD
- ) &&
+ git -C sub rev-list HEAD >revs &&
+ set x $(cat revs) &&
echo ":160000 160000 $3 $ZERO_OID M sub" >expect &&
subtip=$3 subprev=$2
'
diff --git a/t/t4028-format-patch-mime-headers.sh b/t/t4028-format-patch-mime-headers.sh
index 204ba67..60cb819 100755
--- a/t/t4028-format-patch-mime-headers.sh
+++ b/t/t4028-format-patch-mime-headers.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='format-patch mime headers and extra headers do not conflict'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'create commit with utf-8 body' '
diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing-space.sh
index 32b6e9a..5f8ffef 100755
--- a/t/t4029-diff-trailing-space.sh
+++ b/t/t4029-diff-trailing-space.sh
@@ -4,6 +4,7 @@
#
test_description='diff honors config option, diff.suppressBlankEmpty'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat <<\EOF >expected ||
diff --git a/t/t4032-diff-inter-hunk-context.sh b/t/t4032-diff-inter-hunk-context.sh
index bada0cb..7db92d0 100755
--- a/t/t4032-diff-inter-hunk-context.sh
+++ b/t/t4032-diff-inter-hunk-context.sh
@@ -2,6 +2,7 @@
test_description='diff hunk fusing'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
f() {
diff --git a/t/t4033-diff-patience.sh b/t/t4033-diff-patience.sh
index 113304d..f7be7f5 100755
--- a/t/t4033-diff-patience.sh
+++ b/t/t4033-diff-patience.sh
@@ -2,6 +2,7 @@
test_description='patience diff algorithm'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff-alternative.sh
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 561c582..15764ee 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -2,6 +2,7 @@
test_description='word diff colors'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh
@@ -323,6 +324,7 @@
test_language_driver fortran
test_language_driver html
test_language_driver java
+test_language_driver kotlin
test_language_driver matlab
test_language_driver objc
test_language_driver pascal
diff --git a/t/t4034/cpp/expect b/t/t4034/cpp/expect
index 37d1ea2..dc500ae 100644
--- a/t/t4034/cpp/expect
+++ b/t/t4034/cpp/expect
@@ -1,36 +1,35 @@
<BOLD>diff --git a/pre b/post<RESET>
-<BOLD>index 23d5c8a..7e8c026 100644<RESET>
+<BOLD>index a1a09b7..f1b6f3c 100644<RESET>
<BOLD>--- a/pre<RESET>
<BOLD>+++ b/post<RESET>
-<CYAN>@@ -1,19 +1,19 @@<RESET>
-Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <GREEN>bar(x);<RESET> }
+<CYAN>@@ -1,30 +1,30 @@<RESET>
+Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <RED>foo0<RESET><GREEN>bar<RESET>(x.<RED>find<RESET><GREEN>Find<RESET>); }
cout<<"Hello World<RED>!<RESET><GREEN>?<RESET>\n"<<endl;
-<GREEN>(<RESET>1<GREEN>) (<RESET>-1e10<GREEN>) (<RESET>0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>y<RESET>'
-[<RED>a<RESET><GREEN>x<RESET>] <RED>a<RESET><GREEN>x<RESET>-><RED>b a<RESET><GREEN>y x<RESET>.<RED>b<RESET><GREEN>y<RESET>
-!<RED>a<RESET><GREEN>x<RESET> ~<RED>a a<RESET><GREEN>x x<RESET>++ <RED>a<RESET><GREEN>x<RESET>-- <RED>a<RESET><GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>&<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>/<RED>b a<RESET><GREEN>y x<RESET>%<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>+<RED>b a<RESET><GREEN>y x<RESET>-<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET><<<RED>b a<RESET><GREEN>y x<RESET>>><RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET><<RED>b a<RESET><GREEN>y x<RESET><=<RED>b a<RESET><GREEN>y x<RESET>><RED>b a<RESET><GREEN>y x<RESET>>=<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>==<RED>b a<RESET><GREEN>y x<RESET>!=<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>&<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>^<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>|<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>&&<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>||<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>?<RED>b<RESET><GREEN>y<RESET>:z
-<RED>a<RESET><GREEN>x<RESET>=<RED>b a<RESET><GREEN>y x<RESET>+=<RED>b a<RESET><GREEN>y x<RESET>-=<RED>b a<RESET><GREEN>y x<RESET>*=<RED>b a<RESET><GREEN>y x<RESET>/=<RED>b a<RESET><GREEN>y x<RESET>%=<RED>b a<RESET><GREEN>y x<RESET><<=<RED>b a<RESET><GREEN>y x<RESET>>>=<RED>b a<RESET><GREEN>y x<RESET>&=<RED>b a<RESET><GREEN>y x<RESET>^=<RED>b a<RESET><GREEN>y x<RESET>|=<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>,y
-<RED>a<RESET><GREEN>x<RESET>::<RED>b<RESET><GREEN>y<RESET>
+<GREEN>(<RESET>1 <RED>-<RESET><GREEN>+<RESET>1e10 0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>2<RESET>'
+// long double<RESET>
+<RED>3.141592653e-10l<RESET><GREEN>3.141592654e+10l<RESET>
+// float<RESET>
+<RED>120E5f<RESET><GREEN>120E6f<RESET>
+// hex<RESET>
+<RED>0xdead<RESET><GREEN>0xdeaf<RESET>'1<RED>eaF<RESET><GREEN>eaf<RESET>+<RED>8ULL<RESET><GREEN>7ULL<RESET>
+// octal<RESET>
+<RED>01234567<RESET><GREEN>01234560<RESET>
+// binary<RESET>
+<RED>0b1000<RESET><GREEN>0b1100<RESET>+e1
+// expression<RESET>
+1.5-e+<RED>2<RESET><GREEN>3<RESET>+f
+// another one<RESET>
+str.e+<RED>65<RESET><GREEN>75<RESET>
+[a] b<RED>-><RESET><GREEN>->*<RESET>v d<RED>.<RESET><GREEN>.*<RESET>e
+<GREEN>~<RESET>!a <GREEN>!<RESET>~b c<RED>++<RESET><GREEN>+<RESET> d<RED>--<RESET><GREEN>-<RESET> e*<GREEN>*<RESET>f g<RED>&<RESET><GREEN>&&<RESET>h
+a<RED>*<RESET><GREEN>*=<RESET>b c<RED>/<RESET><GREEN>/=<RESET>d e<RED>%<RESET><GREEN>%=<RESET>f
+a<RED>+<RESET><GREEN>++<RESET>b c<RED>-<RESET><GREEN>--<RESET>d
+a<RED><<<RESET><GREEN><<=<RESET>b c<RED>>><RESET><GREEN>>>=<RESET>d
+a<RED><<RESET><GREEN><=<RESET>b c<RED><=<RESET><GREEN><<RESET>d e<RED>><RESET><GREEN>>=<RESET>f g<RED>>=<RESET><GREEN>><RESET>h i<RED><=<RESET><GREEN><=><RESET>j
+a<RED>==<RESET><GREEN>!=<RESET>b c<RED>!=<RESET><GREEN>=<RESET>d
+a<RED>^<RESET><GREEN>^=<RESET>b c<RED>|<RESET><GREEN>|=<RESET>d e<RED>&&<RESET><GREEN>&=<RESET>f
+a<RED>||<RESET><GREEN>|<RESET>b
+a?<GREEN>:<RESET>b
+a<RED>=<RESET><GREEN>==<RESET>b c<RED>+=<RESET><GREEN>+<RESET>d e<RED>-=<RESET><GREEN>-<RESET>f g<RED>*=<RESET><GREEN>*<RESET>h i<RED>/=<RESET><GREEN>/<RESET>j k<RED>%=<RESET><GREEN>%<RESET>l m<RED><<=<RESET><GREEN><<<RESET>n o<RED>>>=<RESET><GREEN>>><RESET>p q<RED>&=<RESET><GREEN>&<RESET>r s<RED>^=<RESET><GREEN>^<RESET>t u<RED>|=<RESET><GREEN>|<RESET>v
+a,b<RESET>
+a<RED>::<RESET><GREEN>:<RESET>b
diff --git a/t/t4034/cpp/post b/t/t4034/cpp/post
index 7e8c026..f1b6f3c 100644
--- a/t/t4034/cpp/post
+++ b/t/t4034/cpp/post
@@ -1,19 +1,30 @@
-Foo() : x(0&42) { bar(x); }
+Foo() : x(0&42) { bar(x.Find); }
cout<<"Hello World?\n"<<endl;
-(1) (-1e10) (0xabcdef) 'y'
-[x] x->y x.y
-!x ~x x++ x-- x*y x&y
-x*y x/y x%y
-x+y x-y
-x<<y x>>y
-x<y x<=y x>y x>=y
-x==y x!=y
-x&y
-x^y
-x|y
-x&&y
-x||y
-x?y:z
-x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y
-x,y
-x::y
+(1 +1e10 0xabcdef) '2'
+// long double
+3.141592654e+10l
+// float
+120E6f
+// hex
+0xdeaf'1eaf+7ULL
+// octal
+01234560
+// binary
+0b1100+e1
+// expression
+1.5-e+3+f
+// another one
+str.e+75
+[a] b->*v d.*e
+~!a !~b c+ d- e**f g&&h
+a*=b c/=d e%=f
+a++b c--d
+a<<=b c>>=d
+a<=b c<d e>=f g>h i<=>j
+a!=b c=d
+a^=b c|=d e&=f
+a|b
+a?:b
+a==b c+d e-f g*h i/j k%l m<<n o>>p q&r s^t u|v
+a,b
+a:b
diff --git a/t/t4034/cpp/pre b/t/t4034/cpp/pre
index 23d5c8a..a1a09b7 100644
--- a/t/t4034/cpp/pre
+++ b/t/t4034/cpp/pre
@@ -1,19 +1,30 @@
-Foo():x(0&&1){}
+Foo():x(0&&1){ foo0( x.find); }
cout<<"Hello World!\n"<<endl;
1 -1e10 0xabcdef 'x'
-[a] a->b a.b
-!a ~a a++ a-- a*b a&b
-a*b a/b a%b
-a+b a-b
-a<<b a>>b
-a<b a<=b a>b a>=b
-a==b a!=b
-a&b
-a^b
-a|b
-a&&b
+// long double
+3.141592653e-10l
+// float
+120E5f
+// hex
+0xdead'1eaF+8ULL
+// octal
+01234567
+// binary
+0b1000+e1
+// expression
+1.5-e+2+f
+// another one
+str.e+65
+[a] b->v d.e
+!a ~b c++ d-- e*f g&h
+a*b c/d e%f
+a+b c-d
+a<<b c>>d
+a<b c<=d e>f g>=h i<=j
+a==b c!=d
+a^b c|d e&&f
a||b
-a?b:z
-a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b
-a,y
+a?b
+a=b c+=d e-=f g*=h i/=j k%=l m<<=n o>>=p q&=r s^=t u|=v
+a,b
a::b
diff --git a/t/t4034/kotlin/expect b/t/t4034/kotlin/expect
new file mode 100644
index 0000000..7f76f75
--- /dev/null
+++ b/t/t4034/kotlin/expect
@@ -0,0 +1,43 @@
+<BOLD>diff --git a/pre b/post<RESET>
+<BOLD>index 11ea3de..2e1df4c 100644<RESET>
+<BOLD>--- a/pre<RESET>
+<BOLD>+++ b/post<RESET>
+<CYAN>@@ -1,30 +1,30 @@<RESET>
+println("Hello World<RED>!\n<RESET><GREEN>?<RESET>")
+<GREEN>(<RESET>1<GREEN>) (<RESET>-1e10<GREEN>) (<RESET>0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>y<RESET>'
+[<RED>a<RESET><GREEN>x<RESET>] <RED>a<RESET><GREEN>x<RESET>-><RED>b a<RESET><GREEN>y x<RESET>.<RED>b<RESET><GREEN>y<RESET>
+!<RED>a a<RESET><GREEN>x x<RESET>.inv() <RED>a<RESET><GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>&<RED>b<RESET>
+<RED>a<RESET><GREEN>y<RESET>
+<GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>/<RED>b a<RESET><GREEN>y x<RESET>%<RED>b<RESET>
+<RED>a<RESET><GREEN>y<RESET>
+<GREEN>x<RESET>+<RED>b a<RESET><GREEN>y x<RESET>-<RED>b<RESET><GREEN>y<RESET>
+a <RED>shr<RESET><GREEN>shl<RESET> b
+<RED>a<RESET><GREEN>x<RESET><<RED>b a<RESET><GREEN>y x<RESET><=<RED>b a<RESET><GREEN>y x<RESET>><RED>b a<RESET><GREEN>y x<RESET>>=<RED>b<RESET>
+<RED>a<RESET><GREEN>y<RESET>
+<GREEN>x<RESET>==<RED>b a<RESET><GREEN>y x<RESET>!=<RED>b a<RESET><GREEN>y x<RESET>===<RED>b<RESET>
+<RED>a<RESET><GREEN>y<RESET>
+<GREEN>x<RESET> and <RED>b<RESET>
+<RED>a<RESET><GREEN>y<RESET>
+<GREEN>x<RESET>^<RED>b<RESET>
+<RED>a<RESET><GREEN>y<RESET>
+<GREEN>x<RESET> or <RED>b<RESET>
+<RED>a<RESET><GREEN>y<RESET>
+<GREEN>x<RESET>&&<RED>b a<RESET><GREEN>y x<RESET>||<RED>b<RESET>
+<RED>a<RESET><GREEN>y<RESET>
+<GREEN>x<RESET>=<RED>b a<RESET><GREEN>y x<RESET>+=<RED>b a<RESET><GREEN>y x<RESET>-=<RED>b a<RESET><GREEN>y x<RESET>*=<RED>b a<RESET><GREEN>y x<RESET>/=<RED>b a<RESET><GREEN>y x<RESET>%=<RED>b a<RESET><GREEN>y x<RESET><<=<RED>b a<RESET><GREEN>y x<RESET>>>=<RED>b a<RESET><GREEN>y x<RESET>&=<RED>b a<RESET><GREEN>y x<RESET>^=<RED>b a<RESET><GREEN>y x<RESET>|=<RED>b<RESET><GREEN>y<RESET>
+a<RED>=<RESET><GREEN>+=<RESET>b c<RED>+=<RESET><GREEN>=<RESET>d e<RED>-=<RESET><GREEN><=<RESET>f g<RED>*=<RESET><GREEN>>=<RESET>h i<RED>/=<RESET><GREEN>/<RESET>j k<RED>%=<RESET><GREEN>%<RESET>l m<RED><<=<RESET><GREEN><<<RESET>n o<RED>>>=<RESET><GREEN>>><RESET>p q<RED>&=<RESET><GREEN>&<RESET>r s<RED>^=<RESET><GREEN>^<RESET>t u<RED>|=<RESET><GREEN>|<RESET>v
+a<RED><<=<RESET><GREEN><=<RESET>b
+a<RED>||<RESET><GREEN>|<RESET>b a<RED>&&<RESET><GREEN>&<RESET>b
+<RED>a<RESET><GREEN>x<RESET>,y
+--a<RED>==<RESET><GREEN>!=<RESET>--b
+a++<RED>==<RESET><GREEN>!=<RESET>++b
+<RED>0xFF_EC_DE_5E 0b100_000 100_000<RESET><GREEN>0xFF_E1_DE_5E 0b100_100 200_000<RESET>
+a<RED>==<RESET><GREEN>===<RESET>b
+a<RED>!!<RESET><GREEN>!=<RESET>b
+<RED>_32<RESET><GREEN>_33<RESET>.find(arr)
+X.<RED>fill<RESET><GREEN>find<RESET>()
+X.<RED>u<RESET><GREEN>f<RESET>+1
+X.u<RED>-<RESET><GREEN>+<RESET>2
+a<RED>.<RESET><GREEN>..<RESET>b
+a<RED>?.<RESET><GREEN>?:<RESET>b
+<RED>.32_00_456<RESET><GREEN>.32_00_446<RESET>
diff --git a/t/t4034/kotlin/post b/t/t4034/kotlin/post
new file mode 100644
index 0000000..2e1df4c
--- /dev/null
+++ b/t/t4034/kotlin/post
@@ -0,0 +1,30 @@
+println("Hello World?")
+(1) (-1e10) (0xabcdef) 'y'
+[x] x->y x.y
+!x x.inv() x*y x&y
+x*y x/y x%y
+x+y x-y
+a shl b
+x<y x<=y x>y x>=y
+x==y x!=y x===y
+x and y
+x^y
+x or y
+x&&y x||y
+x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y
+a+=b c=d e<=f g>=h i/j k%l m<<n o>>p q&r s^t u|v
+a<=b
+a|b a&b
+x,y
+--a!=--b
+a++!=++b
+0xFF_E1_DE_5E 0b100_100 200_000
+a===b
+a!=b
+_33.find(arr)
+X.find()
+X.f+1
+X.u+2
+a..b
+a?:b
+.32_00_446
diff --git a/t/t4034/kotlin/pre b/t/t4034/kotlin/pre
new file mode 100644
index 0000000..11ea3de
--- /dev/null
+++ b/t/t4034/kotlin/pre
@@ -0,0 +1,30 @@
+println("Hello World!\n")
+1 -1e10 0xabcdef 'x'
+[a] a->b a.b
+!a a.inv() a*b a&b
+a*b a/b a%b
+a+b a-b
+a shr b
+a<b a<=b a>b a>=b
+a==b a!=b a===b
+a and b
+a^b
+a or b
+a&&b a||b
+a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b
+a=b c+=d e-=f g*=h i/=j k%=l m<<=n o>>=p q&=r s^=t u|=v
+a<<=b
+a||b a&&b
+a,y
+--a==--b
+a++==++b
+0xFF_EC_DE_5E 0b100_000 100_000
+a==b
+a!!b
+_32.find(arr)
+X.fill()
+X.u+1
+X.u-2
+a.b
+a?.b
+.32_00_456
diff --git a/t/t4035-diff-quiet.sh b/t/t4035-diff-quiet.sh
index 0352bf8..76f8034 100755
--- a/t/t4035-diff-quiet.sh
+++ b/t/t4035-diff-quiet.sh
@@ -2,6 +2,7 @@
test_description='Return value of diffs'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t4036-format-patch-signer-mime.sh b/t/t4036-format-patch-signer-mime.sh
index 98d9713..48655bc 100755
--- a/t/t4036-format-patch-signer-mime.sh
+++ b/t/t4036-format-patch-signer-mime.sh
@@ -2,6 +2,7 @@
test_description='format-patch -s should force MIME encoding as needed'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4037-diff-r-t-dirs.sh b/t/t4037-diff-r-t-dirs.sh
index f5ce3b2..b5f96fe 100755
--- a/t/t4037-diff-r-t-dirs.sh
+++ b/t/t4037-diff-r-t-dirs.sh
@@ -2,6 +2,7 @@
test_description='diff -r -t shows directory additions and deletions'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh
index aeac203..9a292ba 100755
--- a/t/t4038-diff-combined.sh
+++ b/t/t4038-diff-combined.sh
@@ -100,7 +100,7 @@
for i in $(test_seq 1 40)
do
blob=$(echo file$i | git hash-object --stdin -w) &&
- trees="$trees$(echo "100644 blob $blob file" | git mktree)$LF"
+ trees="$trees$(echo "100644 blob $blob file" | git mktree)$LF" || return 1
done
'
diff --git a/t/t4039-diff-assume-unchanged.sh b/t/t4039-diff-assume-unchanged.sh
index 0eb0314..78090e6 100755
--- a/t/t4039-diff-assume-unchanged.sh
+++ b/t/t4039-diff-assume-unchanged.sh
@@ -2,6 +2,7 @@
test_description='diff with assume-unchanged entries'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# external diff has been tested in t4020-diff-external.sh
diff --git a/t/t4040-whitespace-status.sh b/t/t4040-whitespace-status.sh
index 3c728a3..e70e020 100755
--- a/t/t4040-whitespace-status.sh
+++ b/t/t4040-whitespace-status.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='diff --exit-code with whitespace'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4046-diff-unmerged.sh b/t/t4046-diff-unmerged.sh
index ff7cfd8..0ae0cd3 100755
--- a/t/t4046-diff-unmerged.sh
+++ b/t/t4046-diff-unmerged.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='diff with unmerged index entries'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -18,7 +20,7 @@
for t in o x
do
path="$b$o$t" &&
- case "$path" in ooo) continue ;; esac
+ case "$path" in ooo) continue ;; esac &&
paths="$paths$path " &&
p=" $path" &&
case "$b" in x) echo "$m1$p" ;; esac &&
@@ -37,7 +39,7 @@
for path in $paths
do
>"$path" &&
- echo ":000000 100644 $ZERO_OID $ZERO_OID U $path"
+ echo ":000000 100644 $ZERO_OID $ZERO_OID U $path" || return 1
done >diff-files-0.expect &&
git diff-files -0 >diff-files-0.actual &&
test_cmp diff-files-0.expect diff-files-0.actual
@@ -50,7 +52,7 @@
echo ":000000 100644 $ZERO_OID $ZERO_OID U $path" &&
case "$path" in
x??) echo ":100644 100644 $blob1 $ZERO_OID M $path"
- esac
+ esac || return 1
done >diff-files-1.expect &&
git diff-files -1 >diff-files-1.actual &&
test_cmp diff-files-1.expect diff-files-1.actual
@@ -63,7 +65,7 @@
echo ":000000 100644 $ZERO_OID $ZERO_OID U $path" &&
case "$path" in
?x?) echo ":100644 100644 $blob2 $ZERO_OID M $path"
- esac
+ esac || return 1
done >diff-files-2.expect &&
git diff-files -2 >diff-files-2.actual &&
test_cmp diff-files-2.expect diff-files-2.actual &&
@@ -78,7 +80,7 @@
echo ":000000 100644 $ZERO_OID $ZERO_OID U $path" &&
case "$path" in
??x) echo ":100644 100644 $blob3 $ZERO_OID M $path"
- esac
+ esac || return 1
done >diff-files-3.expect &&
git diff-files -3 >diff-files-3.actual &&
test_cmp diff-files-3.expect diff-files-3.actual
diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
index 53061b1..0a4fc73 100755
--- a/t/t4049-diff-stat-count.sh
+++ b/t/t4049-diff-stat-count.sh
@@ -2,6 +2,8 @@
# Copyright (c) 2011, Google Inc.
test_description='diff --stat-count'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
@@ -51,7 +53,7 @@
git rm -f d &&
for stage in 1 2 3
do
- sed -e "s/ 0 a/ $stage d/" x
+ sed -e "s/ 0 a/ $stage d/" x || return 1
done |
git update-index --index-info &&
echo d >d &&
diff --git a/t/t4050-diff-histogram.sh b/t/t4050-diff-histogram.sh
index fd3e86a..c61b30f 100755
--- a/t/t4050-diff-histogram.sh
+++ b/t/t4050-diff-histogram.sh
@@ -2,6 +2,7 @@
test_description='histogram diff algorithm'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff-alternative.sh
diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh
index 9eba436..b5c281e 100755
--- a/t/t4052-stat-output.sh
+++ b/t/t4052-stat-output.sh
@@ -101,7 +101,7 @@
i=0 &&
while test $i -lt 1000
do
- echo $i && i=$(($i + 1))
+ echo $i && i=$(($i + 1)) || return 1
done >abcd &&
git commit -m message abcd
'
diff --git a/t/t4054-diff-bogus-tree.sh b/t/t4054-diff-bogus-tree.sh
index 8c95f15..294fb55 100755
--- a/t/t4054-diff-bogus-tree.sh
+++ b/t/t4054-diff-bogus-tree.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test diff with a bogus tree containing the null sha1'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'create bogus tree' '
diff --git a/t/t4055-diff-context.sh b/t/t4055-diff-context.sh
index 741e080..73048d0 100755
--- a/t/t4055-diff-context.sh
+++ b/t/t4055-diff-context.sh
@@ -5,6 +5,7 @@
test_description='diff.context configuration'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t4057-diff-combined-paths.sh b/t/t4057-diff-combined-paths.sh
index 7e5b74f..04b8a15 100755
--- a/t/t4057-diff-combined-paths.sh
+++ b/t/t4057-diff-combined-paths.sh
@@ -18,13 +18,13 @@
for i in $(test_seq 1 9)
do
echo $i >$i.txt &&
- git add $i.txt
+ git add $i.txt || return 1
done &&
git commit -m "init" &&
git checkout -b side &&
for i in $(test_seq 2 9)
do
- echo $i/2 >>$i.txt
+ echo $i/2 >>$i.txt || return 1
done &&
git commit -a -m "side 2-9" &&
git checkout main &&
@@ -40,14 +40,14 @@
git checkout side &&
for i in $(test_seq 2 9)
do
- echo $i/3 >>$i.txt
+ echo $i/3 >>$i.txt || return 1
done &&
echo "4side" >>4.txt &&
git commit -a -m "side 2-9 +4" &&
git checkout main &&
for i in $(test_seq 1 9)
do
- echo $i/3 >>$i.txt
+ echo $i/3 >>$i.txt || return 1
done &&
echo "4main" >>4.txt &&
git commit -a -m "main 1-9 +4" &&
@@ -69,13 +69,13 @@
git checkout side &&
for i in $(test_seq 5 9)
do
- echo $i/4 >>$i.txt
+ echo $i/4 >>$i.txt || return 1
done &&
git commit -a -m "side 5-9" &&
git checkout main &&
for i in $(test_seq 1 3)
do
- echo $i/4 >>$i.txt
+ echo $i/4 >>$i.txt || return 1
done &&
git commit -a -m "main 1-3 +4hello" &&
git merge side &&
@@ -90,13 +90,13 @@
git checkout side &&
for i in $(test_seq 5 9)
do
- echo $i/5 >>$i.txt
+ echo $i/5 >>$i.txt || return 1
done &&
git commit -a -m "side 5-9" &&
git checkout main &&
for i in $(test_seq 1 3)
do
- echo $i/4 >>$i.txt
+ echo $i/4 >>$i.txt || return 1
done &&
git commit -a -m "main 1-3" &&
git merge side &&
diff --git a/t/t4062-diff-pickaxe.sh b/t/t4062-diff-pickaxe.sh
index 1130c80..9aaa068 100755
--- a/t/t4062-diff-pickaxe.sh
+++ b/t/t4062-diff-pickaxe.sh
@@ -5,6 +5,7 @@
test_description='Pickaxe options'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4063-diff-blobs.sh b/t/t4063-diff-blobs.sh
index bc69e26..7e6c9d6 100755
--- a/t/t4063-diff-blobs.sh
+++ b/t/t4063-diff-blobs.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test direct comparison of blobs via git-diff'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
run_diff () {
diff --git a/t/t4066-diff-emit-delay.sh b/t/t4066-diff-emit-delay.sh
index a1de63b..0ecb391 100755
--- a/t/t4066-diff-emit-delay.sh
+++ b/t/t4066-diff-emit-delay.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# This test covers a weird 3-way interaction between "--cc -p", which will run
diff --git a/t/t4069-remerge-diff.sh b/t/t4069-remerge-diff.sh
new file mode 100755
index 0000000..35f9495
--- /dev/null
+++ b/t/t4069-remerge-diff.sh
@@ -0,0 +1,291 @@
+#!/bin/sh
+
+test_description='remerge-diff handling'
+
+. ./test-lib.sh
+
+# This test is ort-specific
+if test "${GIT_TEST_MERGE_ALGORITHM}" != ort
+then
+ skip_all="GIT_TEST_MERGE_ALGORITHM != ort"
+ test_done
+fi
+
+test_expect_success 'setup basic merges' '
+ test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
+ git add numbers &&
+ git commit -m base &&
+
+ git branch feature_a &&
+ git branch feature_b &&
+ git branch feature_c &&
+
+ git branch ab_resolution &&
+ git branch bc_resolution &&
+
+ git checkout feature_a &&
+ test_write_lines 1 2 three 4 5 6 7 eight 9 >numbers &&
+ git commit -a -m change_a &&
+
+ git checkout feature_b &&
+ test_write_lines 1 2 tres 4 5 6 7 8 9 >numbers &&
+ git commit -a -m change_b &&
+
+ git checkout feature_c &&
+ test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
+ git commit -a -m change_c &&
+
+ git checkout bc_resolution &&
+ git merge --ff-only feature_b &&
+ # no conflict
+ git merge feature_c &&
+
+ git checkout ab_resolution &&
+ git merge --ff-only feature_a &&
+ # conflicts!
+ test_must_fail git merge feature_b &&
+ # Resolve conflict...and make another change elsewhere
+ test_write_lines 1 2 drei 4 5 6 7 acht 9 >numbers &&
+ git add numbers &&
+ git merge --continue
+'
+
+test_expect_success 'remerge-diff on a clean merge' '
+ git log -1 --oneline bc_resolution >expect &&
+ git show --oneline --remerge-diff bc_resolution >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'remerge-diff with both a resolved conflict and an unrelated change' '
+ git log -1 --oneline ab_resolution >tmp &&
+ cat <<-EOF >>tmp &&
+ diff --git a/numbers b/numbers
+ remerge CONFLICT (content): Merge conflict in numbers
+ index a1fb731..6875544 100644
+ --- a/numbers
+ +++ b/numbers
+ @@ -1,13 +1,9 @@
+ 1
+ 2
+ -<<<<<<< b0ed5cb (change_a)
+ -three
+ -=======
+ -tres
+ ->>>>>>> 6cd3f82 (change_b)
+ +drei
+ 4
+ 5
+ 6
+ 7
+ -eight
+ +acht
+ 9
+ EOF
+ # Hashes above are sha1; rip them out so test works with sha256
+ sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+ git show --oneline --remerge-diff ab_resolution >tmp &&
+ sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'setup non-content conflicts' '
+ git switch --orphan base &&
+
+ test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
+ test_write_lines a b c d e f g h i >letters &&
+ test_write_lines in the way >content &&
+ git add numbers letters content &&
+ git commit -m base &&
+
+ git branch side1 &&
+ git branch side2 &&
+
+ git checkout side1 &&
+ test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
+ git mv letters letters_side1 &&
+ git mv content file_or_directory &&
+ git add numbers &&
+ git commit -m side1 &&
+
+ git checkout side2 &&
+ git rm numbers &&
+ git mv letters letters_side2 &&
+ mkdir file_or_directory &&
+ echo hello >file_or_directory/world &&
+ git add file_or_directory/world &&
+ git commit -m side2 &&
+
+ git checkout -b resolution side1 &&
+ test_must_fail git merge side2 &&
+ test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
+ git add numbers &&
+ git add letters_side1 &&
+ git rm letters &&
+ git rm letters_side2 &&
+ git add file_or_directory~HEAD &&
+ git mv file_or_directory~HEAD wanted_content &&
+ git commit -m resolved
+'
+
+test_expect_success 'remerge-diff with non-content conflicts' '
+ git log -1 --oneline resolution >tmp &&
+ cat <<-EOF >>tmp &&
+ diff --git a/file_or_directory~HASH (side1) b/wanted_content
+ similarity index 100%
+ rename from file_or_directory~HASH (side1)
+ rename to wanted_content
+ remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
+ diff --git a/letters b/letters
+ remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
+ diff --git a/letters_side2 b/letters_side2
+ deleted file mode 100644
+ index b236ae5..0000000
+ --- a/letters_side2
+ +++ /dev/null
+ @@ -1,9 +0,0 @@
+ -a
+ -b
+ -c
+ -d
+ -e
+ -f
+ -g
+ -h
+ -i
+ diff --git a/numbers b/numbers
+ remerge CONFLICT (modify/delete): numbers deleted in HASH (side2) and modified in HASH (side1). Version HASH (side1) of numbers left in tree.
+ EOF
+ # We still have some sha1 hashes above; rip them out so test works
+ # with sha256
+ sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+ git show --oneline --remerge-diff resolution >tmp &&
+ sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'remerge-diff w/ diff-filter=U: all conflict headers, no diff content' '
+ git log -1 --oneline resolution >tmp &&
+ cat <<-EOF >>tmp &&
+ diff --git a/file_or_directory~HASH (side1) b/file_or_directory~HASH (side1)
+ remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
+ diff --git a/letters b/letters
+ remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
+ diff --git a/numbers b/numbers
+ remerge CONFLICT (modify/delete): numbers deleted in HASH (side2) and modified in HASH (side1). Version HASH (side1) of numbers left in tree.
+ EOF
+ # We still have some sha1 hashes above; rip them out so test works
+ # with sha256
+ sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+ git show --oneline --remerge-diff --diff-filter=U resolution >tmp &&
+ sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'remerge-diff w/ diff-filter=R: relevant file + conflict header' '
+ git log -1 --oneline resolution >tmp &&
+ cat <<-EOF >>tmp &&
+ diff --git a/file_or_directory~HASH (side1) b/wanted_content
+ similarity index 100%
+ rename from file_or_directory~HASH (side1)
+ rename to wanted_content
+ remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
+ EOF
+ # We still have some sha1 hashes above; rip them out so test works
+ # with sha256
+ sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+ git show --oneline --remerge-diff --diff-filter=R resolution >tmp &&
+ sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'remerge-diff w/ pathspec: limits to relevant file including conflict header' '
+ git log -1 --oneline resolution >tmp &&
+ cat <<-EOF >>tmp &&
+ diff --git a/letters b/letters
+ remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
+ diff --git a/letters_side2 b/letters_side2
+ deleted file mode 100644
+ index b236ae5..0000000
+ --- a/letters_side2
+ +++ /dev/null
+ @@ -1,9 +0,0 @@
+ -a
+ -b
+ -c
+ -d
+ -e
+ -f
+ -g
+ -h
+ -i
+ EOF
+ # We still have some sha1 hashes above; rip them out so test works
+ # with sha256
+ sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+ git show --oneline --remerge-diff resolution -- "letters*" >tmp &&
+ sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'setup non-content conflicts' '
+ git switch --orphan newbase &&
+
+ test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
+ git add numbers &&
+ git commit -m base &&
+
+ git branch newside1 &&
+ git branch newside2 &&
+
+ git checkout newside1 &&
+ test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
+ git add numbers &&
+ git commit -m side1 &&
+
+ git checkout newside2 &&
+ test_write_lines 1 2 drei 4 5 6 7 8 9 >numbers &&
+ git add numbers &&
+ git commit -m side2 &&
+
+ git checkout -b newresolution newside1 &&
+ test_must_fail git merge newside2 &&
+ git checkout --theirs numbers &&
+ git add -u numbers &&
+ git commit -m resolved
+'
+
+test_expect_success 'remerge-diff turns off history simplification' '
+ git log -1 --oneline newresolution >tmp &&
+ cat <<-EOF >>tmp &&
+ diff --git a/numbers b/numbers
+ remerge CONFLICT (content): Merge conflict in numbers
+ index 070e9e7..5335e78 100644
+ --- a/numbers
+ +++ b/numbers
+ @@ -1,10 +1,6 @@
+ 1
+ 2
+ -<<<<<<< 96f1e45 (side1)
+ -three
+ -=======
+ drei
+ ->>>>>>> 4fd522f (side2)
+ 4
+ 5
+ 6
+ EOF
+ # We still have some sha1 hashes above; rip them out so test works
+ # with sha256
+ sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+ git show --oneline --remerge-diff newresolution -- numbers >tmp &&
+ sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh
index 9b433de..d503547 100755
--- a/t/t4100-apply-stat.sh
+++ b/t/t4100-apply-stat.sh
@@ -6,6 +6,8 @@
test_description='git apply --stat --summary test, with --recount
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
UNC='s/^\(@@ -[1-9][0-9]*\),[0-9]* \(+[1-9][0-9]*\),[0-9]* @@/\1,999 \2,999 @@/'
diff --git a/t/t4101-apply-nonl.sh b/t/t4101-apply-nonl.sh
index e3443d0..b116919 100755
--- a/t/t4101-apply-nonl.sh
+++ b/t/t4101-apply-nonl.sh
@@ -6,6 +6,8 @@
test_description='git apply should handle files with incomplete lines.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# setup
diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh
index fae3059..d1e06fc 100755
--- a/t/t4102-apply-rename.sh
+++ b/t/t4102-apply-rename.sh
@@ -6,6 +6,8 @@
test_description='git apply handling copy/rename patch.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# setup
diff --git a/t/t4105-apply-fuzz.sh b/t/t4105-apply-fuzz.sh
index 3266e39..ed814a8 100755
--- a/t/t4105-apply-fuzz.sh
+++ b/t/t4105-apply-fuzz.sh
@@ -2,6 +2,8 @@
test_description='apply with fuzz and offset'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
dotest () {
@@ -15,15 +17,9 @@
test_expect_success setup '
- for i in 1 2 3 4 5 6 7 8 9 10 11 12
- do
- echo $i
- done >file &&
+ test_write_lines 1 2 3 4 5 6 7 8 9 10 11 12 >file &&
git update-index --add file &&
- for i in 1 2 3 4 5 6 7 a b c d e 8 9 10 11 12
- do
- echo $i
- done >file &&
+ test_write_lines 1 2 3 4 5 6 7 a b c d e 8 9 10 11 12 >file &&
cat file >expect &&
git diff >O0.diff &&
diff --git a/t/t4106-apply-stdin.sh b/t/t4106-apply-stdin.sh
index 72467a1..5c150f3 100755
--- a/t/t4106-apply-stdin.sh
+++ b/t/t4106-apply-stdin.sh
@@ -2,6 +2,8 @@
test_description='git apply --numstat - <patch'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -18,7 +20,10 @@
'
test_expect_success 'git apply --numstat - < patch patch' '
- for i in 1 2; do echo "1 1 text"; done >expect &&
+ cat >expect <<-\EOF &&
+ 1 1 text
+ 1 1 text
+ EOF
git apply --numstat - < patch patch >actual &&
test_cmp expect actual
'
diff --git a/t/t4108-apply-threeway.sh b/t/t4108-apply-threeway.sh
index cc3aa33..c558282 100755
--- a/t/t4108-apply-threeway.sh
+++ b/t/t4108-apply-threeway.sh
@@ -275,4 +275,22 @@
git apply --3way --index bin.diff
'
+test_expect_success 'apply delete then new patch with 3way' '
+ git reset --hard main &&
+ test_write_lines 2 > delnew &&
+ git add delnew &&
+ git diff --cached >> new.patch &&
+ git reset --hard &&
+ test_write_lines 1 > delnew &&
+ git add delnew &&
+ git commit -m "delnew" &&
+ rm delnew &&
+ git diff >> delete-then-new.patch &&
+ cat new.patch >> delete-then-new.patch &&
+
+ git checkout -- . &&
+ # Apply must succeed.
+ git apply --3way delete-then-new.patch
+'
+
test_done
diff --git a/t/t4109-apply-multifrag.sh b/t/t4109-apply-multifrag.sh
index ac58083..4dc6d8e 100755
--- a/t/t4109-apply-multifrag.sh
+++ b/t/t4109-apply-multifrag.sh
@@ -6,6 +6,8 @@
test_description='git apply test patches with multiple fragments.'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cp "$TEST_DIRECTORY/t4109/patch1.patch" .
diff --git a/t/t4110-apply-scan.sh b/t/t4110-apply-scan.sh
index 09f5811..266302a 100755
--- a/t/t4110-apply-scan.sh
+++ b/t/t4110-apply-scan.sh
@@ -7,6 +7,8 @@
test_description='git apply test for patches which require scanning forwards and backwards.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'git apply scan' '
diff --git a/t/t4112-apply-renames.sh b/t/t4112-apply-renames.sh
index f9ad183..d53aa42 100755
--- a/t/t4112-apply-renames.sh
+++ b/t/t4112-apply-renames.sh
@@ -7,6 +7,8 @@
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# setup
diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh
index 872fcda..d0f3ede 100755
--- a/t/t4115-apply-symlink.sh
+++ b/t/t4115-apply-symlink.sh
@@ -7,6 +7,7 @@
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
index b99e65c..a9f4ddd 100755
--- a/t/t4116-apply-reverse.sh
+++ b/t/t4116-apply-reverse.sh
@@ -7,18 +7,20 @@
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
- for i in a b c d e f g h i j k l m n; do echo $i; done >file1 &&
+ test_write_lines a b c d e f g h i j k l m n >file1 &&
perl -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&
git add file1 file2 &&
git commit -m initial &&
git tag initial &&
- for i in a b c g h i J K L m o n p q; do echo $i; done >file1 &&
+ test_write_lines a b c g h i J K L m o n p q >file1 &&
perl -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&
git commit -a -m second &&
diff --git a/t/t4117-apply-reject.sh b/t/t4117-apply-reject.sh
index 0ee93fe..c86d05a 100755
--- a/t/t4117-apply-reject.sh
+++ b/t/t4117-apply-reject.sh
@@ -10,25 +10,16 @@
. ./test-lib.sh
test_expect_success setup '
- for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
- do
- echo $i
- done >file1 &&
+ test_write_lines 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 >file1 &&
cat file1 >saved.file1 &&
git update-index --add file1 &&
git commit -m initial &&
- for i in 1 2 A B 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 D 21
- do
- echo $i
- done >file1 &&
+ test_write_lines 1 2 A B 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 D 21 >file1 &&
git diff >patch.1 &&
cat file1 >clean &&
- for i in 1 E 2 3 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 F 21
- do
- echo $i
- done >expected &&
+ test_write_lines 1 E 2 3 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 F 21 >expected &&
mv file1 file2 &&
git update-index --add --remove file1 file2 &&
@@ -38,10 +29,7 @@
mv saved.file1 file1 &&
git update-index --add --remove file1 file2 &&
- for i in 1 E 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 F 21
- do
- echo $i
- done >file1 &&
+ test_write_lines 1 E 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 F 21 >file1 &&
cat file1 >saved.file1
'
diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh
index 65f2e4c..69c9c48 100755
--- a/t/t4118-apply-empty-context.sh
+++ b/t/t4118-apply-empty-context.sh
@@ -7,14 +7,12 @@
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
- {
- echo; echo;
- echo A; echo B; echo C;
- echo;
- } >file1 &&
+ test_write_lines "" "" A B C "" >file1 &&
cat file1 >file1.orig &&
{
cat file1 &&
diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index a9a0583..208c961 100755
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
@@ -7,6 +7,8 @@
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4121-apply-diffs.sh b/t/t4121-apply-diffs.sh
index b45454a..a80cec9 100755
--- a/t/t4121-apply-diffs.sh
+++ b/t/t4121-apply-diffs.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
echo '1
diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh
index aa52de4..9696537 100755
--- a/t/t4122-apply-symlink-inside.sh
+++ b/t/t4122-apply-symlink-inside.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4123-apply-shrink.sh b/t/t4123-apply-shrink.sh
index 984157f..3ef8461 100755
--- a/t/t4123-apply-shrink.sh
+++ b/t/t4123-apply-shrink.sh
@@ -39,20 +39,8 @@
'
test_expect_success 'apply should fail gracefully' '
-
- if git apply --index patch
- then
- echo Oops, should not have succeeded
- false
- else
- status=$?
- echo "Status was $status"
- if test -f .git/index.lock
- then
- echo Oops, should not have crashed
- false
- fi
- fi
+ test_must_fail git apply --index patch &&
+ test_path_is_missing .git/index.lock
'
test_done
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index 0ca2982..485c7d2 100755
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -230,10 +230,10 @@
test_might_fail git config --unset core.whitespace &&
rm -f .gitattributes &&
- { echo a; echo b; echo c; } >one &&
+ test_write_lines a b c >one &&
git add one &&
- { echo a; echo b; echo c; } >expect &&
- { cat expect; echo; } >one &&
+ test_write_lines a b c >expect &&
+ { cat expect && echo; } >one &&
git diff -- one >patch &&
git checkout one &&
@@ -242,10 +242,10 @@
'
test_expect_success 'blank at EOF with --whitespace=fix (2)' '
- { echo a; echo b; echo c; } >one &&
+ test_write_lines a b c >one &&
git add one &&
- { echo a; echo c; } >expect &&
- { cat expect; echo; echo; } >one &&
+ test_write_lines a b >expect &&
+ { cat expect && test_write_lines "" ""; } >one &&
git diff -- one >patch &&
git checkout one &&
@@ -254,10 +254,10 @@
'
test_expect_success 'blank at EOF with --whitespace=fix (3)' '
- { echo a; echo b; echo; } >one &&
+ test_write_lines a b "" >one &&
git add one &&
- { echo a; echo c; echo; } >expect &&
- { cat expect; echo; echo; } >one &&
+ test_write_lines a c "" >expect &&
+ { cat expect && test_write_lines "" ""; } >one &&
git diff -- one >patch &&
git checkout one &&
@@ -266,9 +266,9 @@
'
test_expect_success 'blank at end of hunk, not at EOF with --whitespace=fix' '
- { echo a; echo b; echo; echo; echo; echo; echo; echo d; } >one &&
+ test_write_lines a b "" "" "" "" "" d >one &&
git add one &&
- { echo a; echo c; echo; echo; echo; echo; echo; echo; echo d; } >expect &&
+ test_write_lines a b "" "" "" "" "" "" d >expect &&
cp expect one &&
git diff -- one >patch &&
@@ -278,7 +278,7 @@
'
test_expect_success 'blank at EOF with --whitespace=warn' '
- { echo a; echo b; echo c; } >one &&
+ test_write_lines a b c >one &&
git add one &&
echo >>one &&
cat one >expect &&
@@ -291,7 +291,7 @@
'
test_expect_success 'blank at EOF with --whitespace=error' '
- { echo a; echo b; echo c; } >one &&
+ test_write_lines a b c >one &&
git add one &&
cat one >expect &&
echo >>one &&
@@ -304,7 +304,7 @@
'
test_expect_success 'blank but not empty at EOF' '
- { echo a; echo b; echo c; } >one &&
+ test_write_lines a b c >one &&
git add one &&
echo " " >>one &&
cat one >expect &&
@@ -317,13 +317,13 @@
'
test_expect_success 'applying beyond EOF requires one non-blank context line' '
- { echo; echo; echo; echo; } >one &&
+ test_write_lines "" "" "" "" >one &&
git add one &&
- { echo b; } >>one &&
+ echo b >>one &&
git diff -- one >patch &&
git checkout one &&
- { echo a; echo; } >one &&
+ test_write_lines a "" >one &&
cp one expect &&
test_must_fail git apply --whitespace=fix patch &&
test_cmp expect one &&
@@ -333,7 +333,7 @@
test_expect_success 'tons of blanks at EOF should not apply' '
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
- echo; echo; echo; echo;
+ test_write_lines "" "" "" "" || return 1
done >one &&
git add one &&
echo a >>one &&
@@ -362,9 +362,9 @@
'
test_expect_success 'two missing blank lines at end with --whitespace=fix' '
- { echo a; echo; echo b; echo c; } >one &&
+ test_write_lines a "" b c >one &&
cp one no-blank-lines &&
- { echo; echo; } >>one &&
+ test_write_lines "" "" >>one &&
git add one &&
echo d >>one &&
cp one expect &&
@@ -381,9 +381,9 @@
'
test_expect_success 'missing blank line at end, insert before end, --whitespace=fix' '
- { echo a; echo; } >one &&
+ test_write_lines a "" >one &&
git add one &&
- { echo b; echo a; echo; } >one &&
+ test_write_lines b a "" >one &&
cp one expect &&
git diff -- one >patch &&
echo a >one &&
@@ -393,10 +393,10 @@
'
test_expect_success 'shrink file with tons of missing blanks at end of file' '
- { echo a; echo b; echo c; } >one &&
+ test_write_lines a b c >one &&
cp one no-blank-lines &&
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
- echo; echo; echo; echo;
+ test_write_lines "" "" "" "" || return 1
done >>one &&
git add one &&
echo a >one &&
@@ -412,9 +412,9 @@
'
test_expect_success 'missing blanks at EOF must only match blank lines' '
- { echo a; echo b; } >one &&
+ test_write_lines a b >one &&
git add one &&
- { echo c; echo d; } >>one &&
+ test_write_lines c d >>one &&
git diff -- one >patch &&
echo a >one &&
@@ -434,9 +434,9 @@
git add one &&
echo d >>one &&
git diff -- one >patch &&
- { echo a; echo b; echo c; } >one &&
+ test_write_lines a b c >one &&
cp one expect &&
- { echo; echo d; } >>expect &&
+ test_write_lines "" d >>expect &&
git add one &&
git apply --whitespace=fix patch &&
@@ -455,7 +455,7 @@
echo d >>one &&
cp one expect &&
git diff -- one >patch &&
- { echo a; echo b; echo c; } >one &&
+ test_write_lines a b c >one &&
git add one &&
git checkout-index -f one &&
diff --git a/t/t4125-apply-ws-fuzz.sh b/t/t4125-apply-ws-fuzz.sh
index 9671de7..090987c 100755
--- a/t/t4125-apply-ws-fuzz.sh
+++ b/t/t4125-apply-ws-fuzz.sh
@@ -10,10 +10,7 @@
git add file &&
# file-0 is full of whitespace breakages
- for l in a bb c d eeee f ggg h
- do
- echo "$l "
- done >file-0 &&
+ printf "%s \n" a bb c d eeee f ggg h >file-0 &&
# patch-0 creates a whitespace broken file
cat file-0 >file &&
diff --git a/t/t4126-apply-empty.sh b/t/t4126-apply-empty.sh
index ceb6a79..ece9fae 100755
--- a/t/t4126-apply-empty.sh
+++ b/t/t4126-apply-empty.sh
@@ -2,6 +2,7 @@
test_description='apply empty'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -9,10 +10,9 @@
git add empty &&
test_tick &&
git commit -m initial &&
- for i in a b c d e
- do
- echo $i
- done >empty &&
+ git commit --allow-empty -m "empty commit" &&
+ git format-patch --always HEAD~ >empty.patch &&
+ test_write_lines a b c d e >empty &&
cat empty >expect &&
git diff |
sed -e "/^diff --git/d" \
@@ -25,30 +25,42 @@
'
test_expect_success 'apply empty' '
- git reset --hard &&
rm -f missing &&
+ test_when_finished "git reset --hard" &&
git apply patch0 &&
test_cmp expect empty
'
+test_expect_success 'apply empty patch fails' '
+ test_when_finished "git reset --hard" &&
+ test_must_fail git apply empty.patch &&
+ test_must_fail git apply - </dev/null
+'
+
+test_expect_success 'apply with --allow-empty succeeds' '
+ test_when_finished "git reset --hard" &&
+ git apply --allow-empty empty.patch &&
+ git apply --allow-empty - </dev/null
+'
+
test_expect_success 'apply --index empty' '
- git reset --hard &&
rm -f missing &&
+ test_when_finished "git reset --hard" &&
git apply --index patch0 &&
test_cmp expect empty &&
git diff --exit-code
'
test_expect_success 'apply create' '
- git reset --hard &&
rm -f missing &&
+ test_when_finished "git reset --hard" &&
git apply patch1 &&
test_cmp expect missing
'
test_expect_success 'apply --index create' '
- git reset --hard &&
rm -f missing &&
+ test_when_finished "git reset --hard" &&
git apply --index patch1 &&
test_cmp expect missing &&
git diff --exit-code
diff --git a/t/t4127-apply-same-fn.sh b/t/t4127-apply-same-fn.sh
index 305b7e6..aa5cfae 100755
--- a/t/t4127-apply-same-fn.sh
+++ b/t/t4127-apply-same-fn.sh
@@ -2,6 +2,8 @@
test_description='apply same filename'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
modify () {
@@ -10,10 +12,7 @@
}
test_expect_success setup '
- for i in a b c d e f g h i j k l m
- do
- echo $i
- done >same_fn &&
+ test_write_lines a b c d e f g h i j k l m >same_fn &&
cp same_fn other_fn &&
git add same_fn other_fn &&
git commit -m initial
diff --git a/t/t4128-apply-root.sh b/t/t4128-apply-root.sh
index 6cc741a..ed94c90 100755
--- a/t/t4128-apply-root.sh
+++ b/t/t4128-apply-root.sh
@@ -2,6 +2,7 @@
test_description='apply same filename'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
@@ -24,10 +25,11 @@
EOF
test_expect_success 'apply --directory -p (1)' '
-
git apply --directory=some/sub -p3 --index patch &&
- test Bello = $(git show :some/sub/dir/file) &&
- test Bello = $(cat some/sub/dir/file)
+ echo Bello >expect &&
+ git show :some/sub/dir/file >actual &&
+ test_cmp expect actual &&
+ test_cmp expect some/sub/dir/file
'
@@ -35,8 +37,10 @@
git reset --hard initial &&
git apply --directory=some/sub/ -p3 --index patch &&
- test Bello = $(git show :some/sub/dir/file) &&
- test Bello = $(cat some/sub/dir/file)
+ echo Bello >expect &&
+ git show :some/sub/dir/file >actual &&
+ test_cmp expect actual &&
+ test_cmp expect some/sub/dir/file
'
@@ -53,8 +57,10 @@
test_expect_success 'apply --directory (new file)' '
git reset --hard initial &&
git apply --directory=some/sub/dir/ --index patch &&
- test content = $(git show :some/sub/dir/newfile) &&
- test content = $(cat some/sub/dir/newfile)
+ echo content >expect &&
+ git show :some/sub/dir/newfile >actual &&
+ test_cmp expect actual &&
+ test_cmp expect some/sub/dir/newfile
'
cat > patch << EOF
@@ -70,8 +76,10 @@
test_expect_success 'apply --directory -p (new file)' '
git reset --hard initial &&
git apply -p2 --directory=some/sub/dir/ --index patch &&
- test content = $(git show :some/sub/dir/newfile2) &&
- test content = $(cat some/sub/dir/newfile2)
+ echo content >expect &&
+ git show :some/sub/dir/newfile2 >actual &&
+ test_cmp expect actual &&
+ test_cmp expect some/sub/dir/newfile2
'
cat > patch << EOF
@@ -89,7 +97,8 @@
echo content >some/sub/dir/delfile &&
git add some/sub/dir/delfile &&
git apply --directory=some/sub/dir/ --index patch &&
- ! (git ls-files | grep delfile)
+ git ls-files >out &&
+ ! grep delfile out
'
cat > patch << 'EOF'
@@ -105,8 +114,10 @@
test_expect_success 'apply --directory (quoted filename)' '
git reset --hard initial &&
git apply --directory=some/sub/dir/ --index patch &&
- test content = $(git show :some/sub/dir/quotefile) &&
- test content = $(cat some/sub/dir/quotefile)
+ echo content >expect &&
+ git show :some/sub/dir/quotefile >actual &&
+ test_cmp expect actual &&
+ test_cmp expect some/sub/dir/quotefile
'
test_done
diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
index 576632f..a1c7686 100755
--- a/t/t4129-apply-samemode.sh
+++ b/t/t4129-apply-samemode.sh
@@ -2,6 +2,8 @@
test_description='applying patch with mode bits'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4130-apply-criss-cross-rename.sh b/t/t4130-apply-criss-cross-rename.sh
index f8a313b..f3ea632 100755
--- a/t/t4130-apply-criss-cross-rename.sh
+++ b/t/t4130-apply-criss-cross-rename.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='git apply handling criss-cross rename patch.'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
create_file() {
diff --git a/t/t4132-apply-removal.sh b/t/t4132-apply-removal.sh
index fec1d6f..c1e3049 100755
--- a/t/t4132-apply-removal.sh
+++ b/t/t4132-apply-removal.sh
@@ -4,6 +4,8 @@
test_description='git-apply notices removal patches generated by GNU diff'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4133-apply-filenames.sh b/t/t4133-apply-filenames.sh
index c5ed3b1..35f1060 100755
--- a/t/t4133-apply-filenames.sh
+++ b/t/t4133-apply-filenames.sh
@@ -5,6 +5,8 @@
test_description='git apply filename consistency check'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4134-apply-submodule.sh b/t/t4134-apply-submodule.sh
index d1c16ba..aceb4c4 100755
--- a/t/t4134-apply-submodule.sh
+++ b/t/t4134-apply-submodule.sh
@@ -5,6 +5,8 @@
test_description='git apply submodule tests'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4136-apply-check.sh b/t/t4136-apply-check.sh
index 4c3f264..dfec1c5 100755
--- a/t/t4136-apply-check.sh
+++ b/t/t4136-apply-check.sh
@@ -2,6 +2,8 @@
test_description='git apply should exit non-zero with unrecognized input.'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t4138-apply-ws-expansion.sh b/t/t4138-apply-ws-expansion.sh
index b19faeb..8bbf826 100755
--- a/t/t4138-apply-ws-expansion.sh
+++ b/t/t4138-apply-ws-expansion.sh
@@ -29,8 +29,8 @@
x=1 &&
while test $x -lt $n
do
- printf "%63s%d\n" "" $x >>after
- x=$(( $x + 1 ))
+ printf "%63s%d\n" "" $x >>after &&
+ x=$(( $x + 1 )) || return 1
done &&
printf "\t%s\n" d e f >>after &&
test_expect_code 1 git diff --no-index before after >patch2.patch.raw &&
@@ -40,8 +40,8 @@
x=1 &&
while test $x -lt $n
do
- printf "%63s%d\n" "" $x >>expect-2
- x=$(( $x + 1 ))
+ printf "%63s%d\n" "" $x >>expect-2 &&
+ x=$(( $x + 1 )) || return 1
done &&
printf "%64s\n" d e f >>expect-2 &&
@@ -52,8 +52,8 @@
x=0 &&
while test $x -lt $n
do
- printf "%63s%02d\n" "" $x >>after
- x=$(( $x + 1 ))
+ printf "%63s%02d\n" "" $x >>after &&
+ x=$(( $x + 1 )) || return 1
done &&
printf "\t%s\n" d e f >>after &&
test_expect_code 1 git diff --no-index before after >patch3.patch.raw &&
@@ -63,8 +63,8 @@
x=0 &&
while test $x -lt $n
do
- printf "%63s%02d\n" "" $x >>expect-3
- x=$(( $x + 1 ))
+ printf "%63s%02d\n" "" $x >>expect-3 &&
+ x=$(( $x + 1 )) || return 1
done &&
printf "%64s\n" d e f >>expect-3 &&
@@ -73,16 +73,16 @@
x=0 &&
while test $x -lt 50
do
- printf "\t%02d\n" $x >>before
- x=$(( $x + 1 ))
+ printf "\t%02d\n" $x >>before &&
+ x=$(( $x + 1 )) || return 1
done &&
cat before >after &&
printf "%64s\n" a b c >>after &&
while test $x -lt 100
do
- printf "\t%02d\n" $x >>before
- printf "\t%02d\n" $x >>after
- x=$(( $x + 1 ))
+ printf "\t%02d\n" $x >>before &&
+ printf "\t%02d\n" $x >>after &&
+ x=$(( $x + 1 )) || return 1
done &&
test_expect_code 1 git diff --no-index before after >patch4.patch.raw &&
sed -e "s/before/test-4/" -e "s/after/test-4/" patch4.patch.raw >patch4.patch &&
@@ -90,16 +90,16 @@
x=0 &&
while test $x -lt 50
do
- printf "%63s%02d\n" "" $x >>test-4
- x=$(( $x + 1 ))
+ printf "%63s%02d\n" "" $x >>test-4 &&
+ x=$(( $x + 1 )) || return 1
done &&
cat test-4 >expect-4 &&
printf "%64s\n" a b c >>expect-4 &&
while test $x -lt 100
do
- printf "%63s%02d\n" "" $x >>test-4
- printf "%63s%02d\n" "" $x >>expect-4
- x=$(( $x + 1 ))
+ printf "%63s%02d\n" "" $x >>test-4 &&
+ printf "%63s%02d\n" "" $x >>expect-4 &&
+ x=$(( $x + 1 )) || return 1
done &&
git config core.whitespace tab-in-indent,tabwidth=63 &&
diff --git a/t/t4139-apply-escape.sh b/t/t4139-apply-escape.sh
index 45b5660..e5c7439 100755
--- a/t/t4139-apply-escape.sh
+++ b/t/t4139-apply-escape.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='paths written by git-apply cannot escape the working tree'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# tests will try to write to ../foo, and we do not
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 2aaaa0d..cdad4b6 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -116,7 +116,7 @@
git format-patch --stdout first | sed -e "1d"
} | append_cr >patch1-crlf.eml &&
{
- printf "%255s\\n" ""
+ printf "%255s\\n" "" &&
echo "X-Fake-Field: Line One" &&
echo "X-Fake-Field: Line Two" &&
echo "X-Fake-Field: Line Three" &&
@@ -196,6 +196,12 @@
git format-patch -M --stdout lorem^ >rename-add.patch &&
+ git checkout -b empty-commit &&
+ git commit -m "empty commit" --allow-empty &&
+
+ : >empty.patch &&
+ git format-patch --always --stdout empty-commit^ >empty-commit.patch &&
+
# reset time
sane_unset test_tick &&
test_tick
@@ -309,12 +315,10 @@
'
test_expect_success 'am with applypatch-msg hook' '
- test_when_finished "rm -f .git/hooks/applypatch-msg" &&
rm -fr .git/rebase-apply &&
git reset --hard &&
git checkout first &&
- mkdir -p .git/hooks &&
- write_script .git/hooks/applypatch-msg <<-\EOF &&
+ test_hook applypatch-msg <<-\EOF &&
cat "$1" >actual-msg &&
echo hook-message >"$1"
EOF
@@ -329,12 +333,10 @@
'
test_expect_success 'am with failing applypatch-msg hook' '
- test_when_finished "rm -f .git/hooks/applypatch-msg" &&
rm -fr .git/rebase-apply &&
git reset --hard &&
git checkout first &&
- mkdir -p .git/hooks &&
- write_script .git/hooks/applypatch-msg <<-\EOF &&
+ test_hook applypatch-msg <<-\EOF &&
exit 1
EOF
test_must_fail git am patch1 &&
@@ -344,12 +346,10 @@
'
test_expect_success 'am with pre-applypatch hook' '
- test_when_finished "rm -f .git/hooks/pre-applypatch" &&
rm -fr .git/rebase-apply &&
git reset --hard &&
git checkout first &&
- mkdir -p .git/hooks &&
- write_script .git/hooks/pre-applypatch <<-\EOF &&
+ test_hook pre-applypatch <<-\EOF &&
git diff first >diff.actual
exit 0
EOF
@@ -362,12 +362,10 @@
'
test_expect_success 'am with failing pre-applypatch hook' '
- test_when_finished "rm -f .git/hooks/pre-applypatch" &&
rm -fr .git/rebase-apply &&
git reset --hard &&
git checkout first &&
- mkdir -p .git/hooks &&
- write_script .git/hooks/pre-applypatch <<-\EOF &&
+ test_hook pre-applypatch <<-\EOF &&
exit 1
EOF
test_must_fail git am patch1 &&
@@ -377,12 +375,10 @@
'
test_expect_success 'am with post-applypatch hook' '
- test_when_finished "rm -f .git/hooks/post-applypatch" &&
rm -fr .git/rebase-apply &&
git reset --hard &&
git checkout first &&
- mkdir -p .git/hooks &&
- write_script .git/hooks/post-applypatch <<-\EOF &&
+ test_hook post-applypatch <<-\EOF &&
git rev-parse HEAD >head.actual
git diff second >diff.actual
exit 0
@@ -397,12 +393,10 @@
'
test_expect_success 'am with failing post-applypatch hook' '
- test_when_finished "rm -f .git/hooks/post-applypatch" &&
rm -fr .git/rebase-apply &&
git reset --hard &&
git checkout first &&
- mkdir -p .git/hooks &&
- write_script .git/hooks/post-applypatch <<-\EOF &&
+ test_hook post-applypatch <<-\EOF &&
git rev-parse HEAD >head.actual
exit 1
EOF
@@ -1152,4 +1146,105 @@
git -C client am ../patch
'
+test_expect_success 'an empty input file is error regardless of --empty option' '
+ test_when_finished "git am --abort || :" &&
+ test_must_fail git am --empty=drop empty.patch 2>actual &&
+ echo "Patch format detection failed." >expected &&
+ test_cmp expected actual
+'
+
+test_expect_success 'invalid when passing the --empty option alone' '
+ test_when_finished "git am --abort || :" &&
+ git checkout empty-commit^ &&
+ test_must_fail git am --empty empty-commit.patch 2>err &&
+ echo "error: invalid value for '\''--empty'\'': '\''empty-commit.patch'\''" >expected &&
+ test_cmp expected err
+'
+
+test_expect_success 'a message without a patch is an error (default)' '
+ test_when_finished "git am --abort || :" &&
+ test_must_fail git am empty-commit.patch >err &&
+ grep "Patch is empty" err
+'
+
+test_expect_success 'a message without a patch is an error where an explicit "--empty=stop" is given' '
+ test_when_finished "git am --abort || :" &&
+ test_must_fail git am --empty=stop empty-commit.patch >err &&
+ grep "Patch is empty." err
+'
+
+test_expect_success 'a message without a patch will be skipped when "--empty=drop" is given' '
+ git am --empty=drop empty-commit.patch >output &&
+ git rev-parse empty-commit^ >expected &&
+ git rev-parse HEAD >actual &&
+ test_cmp expected actual &&
+ grep "Skipping: empty commit" output
+'
+
+test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '
+ git am --empty=keep empty-commit.patch >output &&
+ test_path_is_missing .git/rebase-apply &&
+ git show empty-commit --format="%B" >expected &&
+ git show HEAD --format="%B" >actual &&
+ grep -f actual expected &&
+ grep "Creating an empty commit: empty commit" output
+'
+
+test_expect_success 'skip an empty patch in the middle of an am session' '
+ git checkout empty-commit^ &&
+ test_must_fail git am empty-commit.patch >err &&
+ grep "Patch is empty." err &&
+ grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
+ git am --skip &&
+ test_path_is_missing .git/rebase-apply &&
+ git rev-parse empty-commit^ >expected &&
+ git rev-parse HEAD >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'record an empty patch as an empty commit in the middle of an am session' '
+ git checkout empty-commit^ &&
+ test_must_fail git am empty-commit.patch >err &&
+ grep "Patch is empty." err &&
+ grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
+ git am --allow-empty >output &&
+ grep "No changes - recorded it as an empty commit." output &&
+ test_path_is_missing .git/rebase-apply &&
+ git show empty-commit --format="%B" >expected &&
+ git show HEAD --format="%B" >actual &&
+ grep -f actual expected
+'
+
+test_expect_success 'create an non-empty commit when the index IS changed though "--allow-empty" is given' '
+ git checkout empty-commit^ &&
+ test_must_fail git am empty-commit.patch >err &&
+ : >empty-file &&
+ git add empty-file &&
+ git am --allow-empty &&
+ git show empty-commit --format="%B" >expected &&
+ git show HEAD --format="%B" >actual &&
+ grep -f actual expected &&
+ git diff HEAD^..HEAD --name-only
+'
+
+test_expect_success 'cannot create empty commits when there is a clean index due to merge conflicts' '
+ test_when_finished "git am --abort || :" &&
+ git rev-parse HEAD >expected &&
+ test_must_fail git am seq.patch &&
+ test_must_fail git am --allow-empty >err &&
+ ! grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
+ git rev-parse HEAD >actual &&
+ test_cmp actual expected
+'
+
+test_expect_success 'cannot create empty commits when there is unmerged index due to merge conflicts' '
+ test_when_finished "git am --abort || :" &&
+ git rev-parse HEAD >expected &&
+ test_must_fail git am -3 seq.patch &&
+ test_must_fail git am --allow-empty >err &&
+ ! grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
+ git rev-parse HEAD >actual &&
+ test_cmp actual expected
+'
+
test_done
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 2374151..5ed7e22 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -5,10 +5,7 @@
. ./test-lib.sh
test_expect_success setup '
- for i in a b c d e f g
- do
- echo $i
- done >file-1 &&
+ test_write_lines a b c d e f g >file-1 &&
cp file-1 file-2 &&
test_tick &&
git add file-1 file-2 &&
@@ -43,10 +40,7 @@
test_must_fail git am$with3 000[1245]-*.patch &&
git log --pretty=tformat:%s >actual &&
- for i in 3 2 initial
- do
- echo $i
- done >expect &&
+ test_write_lines 3 2 initial >expect &&
test_cmp expect actual
'
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 9dfead9..6e66352 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -120,48 +120,61 @@
test_expect_success 'diff-filter=M' '
- actual=$(git log --pretty="format:%s" --diff-filter=M HEAD) &&
- expect=$(echo second) &&
- verbose test "$actual" = "$expect"
+ git log --pretty="format:%s" --diff-filter=M HEAD >actual &&
+ printf "second" >expect &&
+ test_cmp expect actual
'
test_expect_success 'diff-filter=D' '
- actual=$(git log --no-renames --pretty="format:%s" --diff-filter=D HEAD) &&
- expect=$(echo sixth ; echo third) &&
- verbose test "$actual" = "$expect"
+ git log --no-renames --pretty="format:%s" --diff-filter=D HEAD >actual &&
+ printf "sixth\nthird" >expect &&
+ test_cmp expect actual
'
test_expect_success 'diff-filter=R' '
- actual=$(git log -M --pretty="format:%s" --diff-filter=R HEAD) &&
- expect=$(echo third) &&
- verbose test "$actual" = "$expect"
+ git log -M --pretty="format:%s" --diff-filter=R HEAD >actual &&
+ printf "third" >expect &&
+ test_cmp expect actual
+
+'
+
+test_expect_success 'multiple --diff-filter bits' '
+
+ git log -M --pretty="format:%s" --diff-filter=R HEAD >expect &&
+ git log -M --pretty="format:%s" --diff-filter=Ra HEAD >actual &&
+ test_cmp expect actual &&
+ git log -M --pretty="format:%s" --diff-filter=aR HEAD >actual &&
+ test_cmp expect actual &&
+ git log -M --pretty="format:%s" \
+ --diff-filter=a --diff-filter=R HEAD >actual &&
+ test_cmp expect actual
'
test_expect_success 'diff-filter=C' '
- actual=$(git log -C -C --pretty="format:%s" --diff-filter=C HEAD) &&
- expect=$(echo fourth) &&
- verbose test "$actual" = "$expect"
+ git log -C -C --pretty="format:%s" --diff-filter=C HEAD >actual &&
+ printf "fourth" >expect &&
+ test_cmp expect actual
'
test_expect_success 'git log --follow' '
- actual=$(git log --follow --pretty="format:%s" ichi) &&
- expect=$(echo third ; echo second ; echo initial) &&
- verbose test "$actual" = "$expect"
+ git log --follow --pretty="format:%s" ichi >actual &&
+ printf "third\nsecond\ninitial" >expect &&
+ test_cmp expect actual
'
test_expect_success 'git config log.follow works like --follow' '
test_config log.follow true &&
- actual=$(git log --pretty="format:%s" ichi) &&
- expect=$(echo third ; echo second ; echo initial) &&
- verbose test "$actual" = "$expect"
+ git log --pretty="format:%s" ichi >actual &&
+ printf "third\nsecond\ninitial" >expect &&
+ test_cmp expect actual
'
test_expect_success 'git config log.follow does not die with multiple paths' '
@@ -176,9 +189,9 @@
test_expect_success 'git config log.follow is overridden by --no-follow' '
test_config log.follow true &&
- actual=$(git log --no-follow --pretty="format:%s" ichi) &&
- expect="third" &&
- verbose test "$actual" = "$expect"
+ git log --no-follow --pretty="format:%s" ichi >actual &&
+ printf "third" >expect &&
+ test_cmp expect actual
'
# Note that these commits are intentionally listed out of order.
@@ -250,7 +263,7 @@
test_cmp expect actual &&
# POSIX extended
- git -c grep.patternType=basic log --pretty="tformat:%s" --invert-grep --grep=t[h] --grep=S[e]c >actual &&
+ git -c grep.patternType=extended log --pretty="tformat:%s" --invert-grep --grep=t[h] --grep=S[e]c >actual &&
test_cmp expect actual &&
# PCRE
@@ -449,6 +462,80 @@
)
'
+for cmd in show whatchanged reflog format-patch
+do
+ case "$cmd" in
+ format-patch) myarg="HEAD~.." ;;
+ *) myarg= ;;
+ esac
+
+ test_expect_success "$cmd: understands grep.patternType, like 'log'" '
+ git init "pattern-type-$cmd" &&
+ (
+ cd "pattern-type-$cmd" &&
+ test_commit 1 file A &&
+ test_commit "(1|2)" file B 2 &&
+
+ git -c grep.patternType=fixed $cmd --grep="..." $myarg >actual &&
+ test_must_be_empty actual &&
+
+ git -c grep.patternType=basic $cmd --grep="..." $myarg >actual &&
+ test_file_not_empty actual
+ )
+ '
+done
+
+test_expect_success 'log --author' '
+ cat >expect <<-\EOF &&
+ Author: <BOLD;RED>A U<RESET> Thor <author@example.com>
+ EOF
+ git log -1 --color=always --author="A U" >log &&
+ grep Author log >actual.raw &&
+ test_decode_color <actual.raw >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'log --committer' '
+ cat >expect <<-\EOF &&
+ Commit: C O Mitter <committer@<BOLD;RED>example<RESET>.com>
+ EOF
+ git log -1 --color=always --pretty=fuller --committer="example" >log &&
+ grep "Commit:" log >actual.raw &&
+ test_decode_color <actual.raw >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'log -i --grep with color' '
+ cat >expect <<-\EOF &&
+ <BOLD;RED>Sec<RESET>ond
+ <BOLD;RED>sec<RESET>ond
+ EOF
+ git log --color=always -i --grep=^sec >log &&
+ grep -i sec log >actual.raw &&
+ test_decode_color <actual.raw >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '-c color.grep.selected log --grep' '
+ cat >expect <<-\EOF &&
+ <GREEN>th<RESET><BOLD;RED>ir<RESET><GREEN>d<RESET>
+ EOF
+ git -c color.grep.selected="green" log --color=always --grep=ir >log &&
+ grep ir log >actual.raw &&
+ test_decode_color <actual.raw >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '-c color.grep.matchSelected log --grep' '
+ cat >expect <<-\EOF &&
+ <BLUE>i<RESET>n<BLUE>i<RESET>t<BLUE>i<RESET>al
+ EOF
+ git -c color.grep.matchSelected="blue" log --color=always --grep=i >log &&
+ grep al log >actual.raw &&
+ test_decode_color <actual.raw >actual &&
+ test_cmp expect actual
+'
+
cat > expect <<EOF
* Second
* sixth
@@ -608,7 +695,7 @@
test_expect_success 'log --graph with full output' '
git log --graph --date-order --pretty=short |
- git name-rev --name-only --stdin |
+ git name-rev --name-only --annotate-stdin |
sed "s/Merge:.*/Merge: A B/;s/ *\$//" >actual &&
test_cmp expect actual
'
@@ -901,6 +988,43 @@
test_cmp expect.decorate actual
'
+test_expect_success 'decorate-refs with implied decorate from format' '
+ cat >expect <<-\EOF &&
+ side-2 (tag: side-2)
+ side-1
+ EOF
+ git log --no-walk --format="%s%d" \
+ --decorate-refs="*side-2" side-1 side-2 \
+ >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'implied decorate does not override option' '
+ cat >expect <<-\EOF &&
+ side-2 (tag: refs/tags/side-2, refs/heads/side)
+ side-1 (tag: refs/tags/side-1)
+ EOF
+ git log --no-walk --format="%s%d" \
+ --decorate=full side-1 side-2 \
+ >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'decorate-refs and simplify-by-decoration without output' '
+ cat >expect <<-\EOF &&
+ side-2
+ initial
+ EOF
+ # Do not just use a --format without %d here; we want to
+ # make sure that we did not accidentally turn on displaying
+ # the decorations, too. And that requires one of the regular
+ # formats.
+ git log --decorate-refs="*side-2" --oneline \
+ --simplify-by-decoration >actual.raw &&
+ sed "s/^[0-9a-f]* //" <actual.raw >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'log.decorate config parsing' '
git log --oneline --decorate=full >expect.full &&
git log --oneline --decorate=short >expect.short &&
@@ -1583,6 +1707,75 @@
test_cmp_graph --name-only tangle..reach
'
+test_expect_success '--no-graph countermands --graph' '
+ git log >expect &&
+ git log --graph --no-graph >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--graph countermands --no-graph' '
+ git log --graph >expect &&
+ git log --no-graph --graph >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--no-graph does not unset --topo-order' '
+ git log --topo-order >expect &&
+ git log --topo-order --no-graph >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--no-graph does not unset --parents' '
+ git log --parents >expect &&
+ git log --parents --no-graph >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--reverse and --graph conflict' '
+ test_must_fail git log --reverse --graph 2>stderr &&
+ test_i18ngrep "cannot be used together" stderr
+'
+
+test_expect_success '--reverse --graph --no-graph works' '
+ git log --reverse >expect &&
+ git log --reverse --graph --no-graph >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--show-linear-break and --graph conflict' '
+ test_must_fail git log --show-linear-break --graph 2>stderr &&
+ test_i18ngrep "cannot be used together" stderr
+'
+
+test_expect_success '--show-linear-break --graph --no-graph works' '
+ git log --show-linear-break >expect &&
+ git log --show-linear-break --graph --no-graph >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--no-walk and --graph conflict' '
+ test_must_fail git log --no-walk --graph 2>stderr &&
+ test_i18ngrep "cannot be used together" stderr
+'
+
+test_expect_success '--no-walk --graph --no-graph works' '
+ git log --no-walk >expect &&
+ git log --no-walk --graph --no-graph >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--walk-reflogs and --graph conflict' '
+ test_must_fail git log --walk-reflogs --graph 2>stderr &&
+ (test_i18ngrep "cannot combine" stderr ||
+ test_i18ngrep "cannot be used together" stderr)
+'
+
+test_expect_success '--walk-reflogs --graph --no-graph works' '
+ git log --walk-reflogs >expect &&
+ git log --walk-reflogs --graph --no-graph >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'dotdot is a parent directory' '
mkdir -p a/b &&
( echo sixth && echo fifth ) >expect &&
@@ -1616,6 +1809,34 @@
git commit -S -m signed_commit
'
+test_expect_success GPGSSH 'setup sshkey signed branch' '
+ test_config gpg.format ssh &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+ test_when_finished "git reset --hard && git checkout main" &&
+ git checkout -b signed-ssh main &&
+ echo foo >foo &&
+ git add foo &&
+ git commit -S -m signed_commit
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'create signed commits with keys having defined lifetimes' '
+ test_config gpg.format ssh &&
+ touch file &&
+ git add file &&
+
+ echo expired >file && test_tick && git commit -a -m expired -S"${GPGSSH_KEY_EXPIRED}" &&
+ git tag expired-signed &&
+
+ echo notyetvalid >file && test_tick && git commit -a -m notyetvalid -S"${GPGSSH_KEY_NOTYETVALID}" &&
+ git tag notyetvalid-signed &&
+
+ echo timeboxedvalid >file && test_tick && git commit -a -m timeboxedvalid -S"${GPGSSH_KEY_TIMEBOXEDVALID}" &&
+ git tag timeboxedvalid-signed &&
+
+ echo timeboxedinvalid >file && test_tick && git commit -a -m timeboxedinvalid -S"${GPGSSH_KEY_TIMEBOXEDINVALID}" &&
+ git tag timeboxedinvalid-signed
+'
+
test_expect_success GPGSM 'log x509 fingerprint' '
echo "F8BF62E0693D0694816377099909C779FA23FD65 | " >expect &&
git log -n1 --format="%GF | %GP" signed-x509 >actual &&
@@ -1628,6 +1849,13 @@
test_cmp expect actual
'
+test_expect_success GPGSSH 'log ssh key fingerprint' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2\" | \"}" >expect &&
+ git log -n1 --format="%GF | %GP" signed-ssh >actual &&
+ test_cmp expect actual
+'
+
test_expect_success GPG 'log --graph --show-signature' '
git log --graph --show-signature -n1 signed >actual &&
grep "^| gpg: Signature made" actual &&
@@ -1640,6 +1868,37 @@
grep "^| gpgsm: Good signature" actual
'
+test_expect_success GPGSSH 'log --graph --show-signature ssh' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git log --graph --show-signature -n1 signed-ssh >actual &&
+ grep "${GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'log shows failure on expired signature key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git log --graph --show-signature -n1 expired-signed >actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'log shows failure on not yet valid signature key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git log --graph --show-signature -n1 notyetvalid-signed >actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'log show success with commit date and key validity matching' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git log --graph --show-signature -n1 timeboxedvalid-signed >actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'log shows failure with commit date outside of key validity' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git log --graph --show-signature -n1 timeboxedinvalid-signed >actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
test_expect_success GPG 'log --graph --show-signature for merged tag' '
test_when_finished "git reset --hard && git checkout main" &&
git checkout -b plain main &&
@@ -1733,10 +1992,13 @@
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
+ if ! test_have_prereq VALGRIND
+ then
+ TMPDIR="$(pwd)/bogus" git log --show-signature -n1 plain-fail >actual &&
+ grep "^merged tag" actual &&
+ grep "^No signature" actual &&
+ ! grep "^gpg: Signature made" actual
+ fi
'
test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
@@ -1777,7 +2039,8 @@
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
+ grep -e "^| | gpgsm: certificate not found" \
+ -e "^| | gpgsm: failed to find the certificate: Not found" actual
'
test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 bad signature' '
@@ -1936,4 +2199,23 @@
test_cmp expect actual
'
+test_expect_success 'set up commits with different authors' '
+ git checkout --orphan authors &&
+ test_commit --author "Jim <jim@example.com>" jim_1 &&
+ test_commit --author "Val <val@example.com>" val_1 &&
+ test_commit --author "Val <val@example.com>" val_2 &&
+ test_commit --author "Jim <jim@example.com>" jim_2 &&
+ test_commit --author "Val <val@example.com>" val_3 &&
+ test_commit --author "Jim <jim@example.com>" jim_3
+'
+
+test_expect_success 'log --invert-grep --grep --author' '
+ cat >expect <<-\EOF &&
+ val_3
+ val_1
+ EOF
+ git log --format=%s --author=Val --grep 2 --invert-grep >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index f120857..a730c0d 100755
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
@@ -27,7 +27,8 @@
'
test_expect_success 'patch-id output is well-formed' '
- git log -p -1 | git patch-id >output &&
+ git log -p -1 >log.output &&
+ git patch-id <log.output >output &&
grep "^$OID_REGEX $(git rev-parse HEAD)$" output
'
@@ -35,9 +36,9 @@
calc_patch_id () {
patch_name="$1"
shift
- git patch-id "$@" |
- sed "s/ .*//" >patch-id_"$patch_name" &&
- test_line_count -gt 0 patch-id_"$patch_name"
+ git patch-id "$@" >patch-id.output &&
+ sed "s/ .*//" patch-id.output >patch-id_"$patch_name" &&
+ test_line_count -eq 1 patch-id_"$patch_name"
}
get_top_diff () {
@@ -45,7 +46,8 @@
}
get_patch_id () {
- get_top_diff "$1" | calc_patch_id "$@"
+ get_top_diff "$1" >top-diff.output &&
+ calc_patch_id <top-diff.output "$@"
}
test_expect_success 'patch-id detects equality' '
@@ -63,16 +65,18 @@
test_expect_success 'patch-id supports git-format-patch output' '
get_patch_id main &&
git checkout same &&
- git format-patch -1 --stdout | calc_patch_id same &&
+ git format-patch -1 --stdout >format-patch.output &&
+ calc_patch_id same <format-patch.output &&
test_cmp patch-id_main patch-id_same &&
- set $(git format-patch -1 --stdout | git patch-id) &&
+ set $(git patch-id <format-patch.output) &&
test "$2" = $(git rev-parse HEAD)
'
test_expect_success 'whitespace is irrelevant in footer' '
get_patch_id main &&
git checkout same &&
- git format-patch -1 --stdout | sed "s/ \$//" | calc_patch_id same &&
+ git format-patch -1 --stdout >format-patch.output &&
+ sed "s/ \$//" format-patch.output | calc_patch_id same &&
test_cmp patch-id_main patch-id_same
'
@@ -91,10 +95,11 @@
shift
name="order-${1}-$relevant"
shift
- get_top_diff "main" | calc_patch_id "$name" "$@" &&
+ get_top_diff "main" >top-diff.output &&
+ calc_patch_id <top-diff.output "$name" "$@" &&
git checkout same &&
- git format-patch -1 --stdout -O foo-then-bar |
- calc_patch_id "ordered-$name" "$@" &&
+ git format-patch -1 --stdout -O foo-then-bar >format-patch.output &&
+ calc_patch_id <format-patch.output "ordered-$name" "$@" &&
cmp_patch_id $relevant "$name" "ordered-$name"
}
@@ -142,7 +147,8 @@
test_expect_success 'patch-id supports git-format-patch MIME output' '
get_patch_id main &&
git checkout same &&
- git format-patch -1 --attach --stdout | calc_patch_id same &&
+ git format-patch -1 --attach --stdout >format-patch.output &&
+ calc_patch_id <format-patch.output same &&
test_cmp patch-id_main patch-id_same
'
@@ -160,40 +166,67 @@
)
'
-cat >nonl <<\EOF
-diff --git i/a w/a
-index e69de29..2e65efe 100644
---- i/a
-+++ w/a
-@@ -0,0 +1 @@
-+a
-\ No newline at end of file
-diff --git i/b w/b
-index e69de29..6178079 100644
---- i/b
-+++ w/b
-@@ -0,0 +1 @@
-+b
-EOF
-
-cat >withnl <<\EOF
-diff --git i/a w/a
-index e69de29..7898192 100644
---- i/a
-+++ w/a
-@@ -0,0 +1 @@
-+a
-diff --git i/b w/b
-index e69de29..6178079 100644
---- i/b
-+++ w/b
-@@ -0,0 +1 @@
-+b
-EOF
-
test_expect_success 'patch-id handles no-nl-at-eof markers' '
- cat nonl | calc_patch_id nonl &&
- cat withnl | calc_patch_id withnl &&
+ cat >nonl <<-\EOF &&
+ diff --git i/a w/a
+ index e69de29..2e65efe 100644
+ --- i/a
+ +++ w/a
+ @@ -0,0 +1 @@
+ +a
+ \ No newline at end of file
+ diff --git i/b w/b
+ index e69de29..6178079 100644
+ --- i/b
+ +++ w/b
+ @@ -0,0 +1 @@
+ +b
+ EOF
+ cat >withnl <<-\EOF &&
+ diff --git i/a w/a
+ index e69de29..7898192 100644
+ --- i/a
+ +++ w/a
+ @@ -0,0 +1 @@
+ +a
+ diff --git i/b w/b
+ index e69de29..6178079 100644
+ --- i/b
+ +++ w/b
+ @@ -0,0 +1 @@
+ +b
+ EOF
+ calc_patch_id nonl <nonl &&
+ calc_patch_id withnl <withnl &&
test_cmp patch-id_nonl patch-id_withnl
'
+
+test_expect_success 'patch-id handles diffs with one line of before/after' '
+ cat >diffu1 <<-\EOF &&
+ diff --git a/bar b/bar
+ index bdaf90f..31051f6 100644
+ --- a/bar
+ +++ b/bar
+ @@ -2 +2,2 @@
+ b
+ +c
+ diff --git a/car b/car
+ index 00750ed..2ae5e34 100644
+ --- a/car
+ +++ b/car
+ @@ -1 +1,2 @@
+ 3
+ +d
+ diff --git a/foo b/foo
+ index e439850..7146eb8 100644
+ --- a/foo
+ +++ b/foo
+ @@ -2 +2,2 @@
+ a
+ +e
+ EOF
+ calc_patch_id diffu1 <diffu1 &&
+ test_config patchid.stable true &&
+ calc_patch_id diffu1stable <diffu1
+'
test_done
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 5865daa..e448ef2 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -976,7 +976,7 @@
else
: >expect-contains-bad
fi &&
- echo "$hash $desc"
+ echo "$hash $desc" || return 1
done >expect &&
test_path_exists expect-contains-good &&
test_path_exists expect-contains-bad &&
@@ -1002,4 +1002,20 @@
test_cmp expect actual
'
+test_expect_success '%(describe:tags) vs git describe --tags' '
+ test_when_finished "git tag -d tagname" &&
+ git tag tagname &&
+ git describe --tags >expect &&
+ git log -1 --format="%(describe:tags)" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(describe:abbrev=...) vs git describe --abbrev=...' '
+ test_when_finished "git tag -d tagname" &&
+ git tag -a -m tagged tagname &&
+ git describe --abbrev=15 >expect &&
+ git log -1 --format="%(describe:abbrev=15)" >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t4206-log-follow-harder-copies.sh b/t/t4206-log-follow-harder-copies.sh
index 4871a5d..33ecf82 100755
--- a/t/t4206-log-follow-harder-copies.sh
+++ b/t/t4206-log-follow-harder-copies.sh
@@ -6,6 +6,8 @@
test_description='Test --follow should always find copies hard in git log.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh
diff --git a/t/t4207-log-decoration-colors.sh b/t/t4207-log-decoration-colors.sh
index b870942..36ac6af 100755
--- a/t/t4207-log-decoration-colors.sh
+++ b/t/t4207-log-decoration-colors.sh
@@ -8,6 +8,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index 75795d0..7f6bb27 100755
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -63,21 +63,21 @@
test_i18ngrep "switch.*requires a value" err &&
test_expect_code 128 git log -Gregex -Sstring 2>err &&
- grep "mutually exclusive" err &&
+ grep "cannot be used together" err &&
test_expect_code 128 git log -Gregex --find-object=HEAD 2>err &&
- grep "mutually exclusive" err &&
+ grep "cannot be used together" err &&
test_expect_code 128 git log -Sstring --find-object=HEAD 2>err &&
- grep "mutually exclusive" err &&
+ grep "cannot be used together" err &&
test_expect_code 128 git log --pickaxe-all --find-object=HEAD 2>err &&
- grep "mutually exclusive" err
+ grep "cannot be used together" err
'
test_expect_success 'usage: --pickaxe-regex' '
test_expect_code 128 git log -Gregex --pickaxe-regex 2>err &&
- grep "mutually exclusive" err
+ grep "cannot be used together" err
'
test_expect_success 'usage: --no-pickaxe-regex' '
diff --git a/t/t4210-log-i18n.sh b/t/t4210-log-i18n.sh
index 0141f36..d2dfcf1 100755
--- a/t/t4210-log-i18n.sh
+++ b/t/t4210-log-i18n.sh
@@ -131,11 +131,4 @@
fi
done
-test_expect_success 'log shows warning when conversion fails' '
- enc=this-encoding-does-not-exist &&
- git log -1 --encoding=$enc 2>err &&
- echo "warning: unable to reencode commit to ${SQ}${enc}${SQ}" >expect &&
- test_cmp expect err
-'
-
test_done
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 560127c..ac9e4d0 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -137,7 +137,7 @@
test_seq 1000 > c.c &&
git add c.c &&
git commit -m "modify many lines" &&
- git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c; done)
+ git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c || return 1; done)
'
test_expect_success '-s shows only line-log commits' '
diff --git a/t/t4212-log-corrupt.sh b/t/t4212-log-corrupt.sh
index 03b952c..30a2198 100755
--- a/t/t4212-log-corrupt.sh
+++ b/t/t4212-log-corrupt.sh
@@ -2,6 +2,7 @@
test_description='git log with invalid commit headers'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
@@ -20,10 +21,10 @@
test_expect_success 'git log with broken author email' '
{
- echo commit $(cat broken_email.hash)
- echo "Author: A U Thor <author@example.com>"
- echo "Date: Thu Apr 7 15:13:13 2005 -0700"
- echo
+ echo commit $(cat broken_email.hash) &&
+ echo "Author: A U Thor <author@example.com>" &&
+ echo "Date: Thu Apr 7 15:13:13 2005 -0700" &&
+ echo &&
echo " foo"
} >expect.out &&
diff --git a/t/t4216-log-bloom.sh b/t/t4216-log-bloom.sh
index 50f206d..fa9d32f 100755
--- a/t/t4216-log-bloom.sh
+++ b/t/t4216-log-bloom.sh
@@ -48,6 +48,7 @@
header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0
num_commits: $1
chunks: oid_fanout oid_lookup commit_metadata generation_data bloom_indexes bloom_data
+ options: bloom(1,10,7) read_generation_data
EOF
test-tool read-graph >actual &&
test_cmp expect actual
@@ -175,13 +176,11 @@
test_when_finished rm -rf .git/objects/info/commit-graph* &&
rm -rf .git/objects/info/commit-graph* &&
GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
- GIT_TRACE2_EVENT_NESTING=5 \
GIT_TEST_BLOOM_SETTINGS_NUM_HASHES=9 \
GIT_TEST_BLOOM_SETTINGS_BITS_PER_ENTRY=15 \
git commit-graph write --reachable --changed-paths &&
grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2.txt &&
GIT_TRACE2_EVENT="$(pwd)/trace2-auto.txt" \
- GIT_TRACE2_EVENT_NESTING=5 \
git commit-graph write --reachable --changed-paths &&
grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2-auto.txt
'
@@ -376,7 +375,7 @@
cd empty &&
for i in $(test_seq 1 6)
do
- git commit --allow-empty -m "$i"
+ git commit --allow-empty -m "$i" || return 1
done &&
# Generate Bloom filters for empty commits 1-6, two at a time.
@@ -389,7 +388,7 @@
test_filter_computed 2 trace.event &&
test_filter_not_computed 4 trace.event &&
test_filter_trunc_empty 2 trace.event &&
- test_filter_trunc_large 0 trace.event
+ test_filter_trunc_large 0 trace.event || return 1
done &&
# Finally, make sure that once all commits have filters, that
diff --git a/t/t4217-log-limit.sh b/t/t4217-log-limit.sh
new file mode 100755
index 0000000..6e01e26
--- /dev/null
+++ b/t/t4217-log-limit.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+test_description='git log with filter options limiting the output'
+
+. ./test-lib.sh
+
+test_expect_success 'setup test' '
+ git init &&
+ echo a >file &&
+ git add file &&
+ GIT_COMMITTER_DATE="2021-02-01 00:00" git commit -m init &&
+ echo a >>file &&
+ git add file &&
+ GIT_COMMITTER_DATE="2022-02-01 00:00" git commit -m first &&
+ echo a >>file &&
+ git add file &&
+ GIT_COMMITTER_DATE="2021-03-01 00:00" git commit -m second &&
+ echo a >>file &&
+ git add file &&
+ GIT_COMMITTER_DATE="2022-03-01 00:00" git commit -m third
+'
+
+test_expect_success 'git log --since-as-filter=...' '
+ git log --since-as-filter="2022-01-01" --format=%s >actual &&
+ cat >expect <<-\EOF &&
+ third
+ first
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'git log --children --since-as-filter=...' '
+ git log --children --since-as-filter="2022-01-01" --format=%s >actual &&
+ cat >expect <<-\EOF &&
+ third
+ first
+ EOF
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
index e59601e..c52c8a2 100755
--- a/t/t4300-merge-tree.sh
+++ b/t/t4300-merge-tree.sh
@@ -4,6 +4,8 @@
#
test_description='git merge-tree'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 2c88d1c..7f8d2ab 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -77,7 +77,7 @@
path=$(get_pax_header $header path) &&
if test -n "$path"
then
- mv "$data" "$path"
+ mv "$data" "$path" || exit 1
fi
fi
done
@@ -133,7 +133,7 @@
for depth in 1 2 3 4 5
do
mkdir $p &&
- cd $p
+ cd $p || exit 1
done &&
echo text >file_with_long_path
) &&
diff --git a/t/t5002-archive-attr-pattern.sh b/t/t5002-archive-attr-pattern.sh
index bda6d7d..a66b5ba 100755
--- a/t/t5002-archive-attr-pattern.sh
+++ b/t/t5002-archive-attr-pattern.sh
@@ -2,6 +2,7 @@
test_description='git archive attribute pattern tests'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_exists() {
diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh
index 1e6d18b..3992d08 100755
--- a/t/t5003-archive-zip.sh
+++ b/t/t5003-archive-zip.sh
@@ -106,7 +106,7 @@
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
printf "A not substituted O" >a/substfile2 &&
(p=long_path_to_a_file && cd a &&
- for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
+ for depth in 1 2 3 4 5; do mkdir $p && cd $p || exit 1; done &&
echo text >file_with_long_path)
'
@@ -206,6 +206,26 @@
check_zip with_untracked
check_added with_untracked untracked untracked
+test_expect_success UNZIP 'git archive --format=zip --add-virtual-file' '
+ if test_have_prereq FUNNYNAMES
+ then
+ PATHNAME="pathname with : colon"
+ else
+ PATHNAME="pathname without colon"
+ fi &&
+ git archive --format=zip >with_file_with_content.zip \
+ --add-virtual-file=\""$PATHNAME"\": \
+ --add-virtual-file=hello:world $EMPTY_TREE &&
+ test_when_finished "rm -rf tmp-unpack" &&
+ mkdir tmp-unpack && (
+ cd tmp-unpack &&
+ "$GIT_UNZIP" ../with_file_with_content.zip &&
+ test_path_is_file hello &&
+ test_path_is_file "$PATHNAME" &&
+ test world = $(cat hello)
+ )
+'
+
test_expect_success 'git archive --format=zip --add-file twice' '
echo untracked >untracked &&
git archive --format=zip --prefix=one/ --add-file=untracked \
diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index 2d32d0e..ae508e2 100755
--- a/t/t5004-archive-corner-cases.sh
+++ b/t/t5004-archive-corner-cases.sh
@@ -131,7 +131,7 @@
do
for b in 0 1 2 3 4 5 6 7 8 9 a b c d e f
do
- : >00/$a$b
+ : >00/$a$b || return 1
done
done &&
git add 00 &&
@@ -143,7 +143,7 @@
do
for d in 0 1 2 3 4 5 6 7 8 9 a b c d e f
do
- echo "040000 tree $subtree $c$d"
+ echo "040000 tree $subtree $c$d" || return 1
done
done >tree &&
tree=$(git mktree <tree) &&
@@ -171,7 +171,7 @@
# create tree containing 65500 entries of that blob
for i in $(test_seq 1 65500)
do
- echo "100644 blob $blob $i"
+ echo "100644 blob $blob $i" || return 1
done >tree &&
tree=$(git mktree <tree) &&
diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index 141b29f..cebad10 100755
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -122,7 +122,7 @@
do
git mailinfo mboxrd/msg mboxrd/patch \
<mboxrd/$i >mboxrd/out &&
- test_cmp "$DATA/${i}mboxrd" mboxrd/msg
+ test_cmp "$DATA/${i}mboxrd" mboxrd/msg || return 1
done &&
sp=" " &&
echo "From " >expect &&
diff --git a/t/t5200-update-server-info.sh b/t/t5200-update-server-info.sh
index 21a58ee..ed9dfd6 100755
--- a/t/t5200-update-server-info.sh
+++ b/t/t5200-update-server-info.sh
@@ -2,6 +2,7 @@
test_description='Test git update-server-info'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' 'test_commit file'
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index e13a884..f8a0f30 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -161,22 +161,27 @@
'
check_unpack () {
+ local packname="$1" &&
+ local object_list="$2" &&
+ local git_config="$3" &&
test_when_finished "rm -rf git2" &&
- git init --bare git2 &&
- git -C git2 unpack-objects -n <"$1".pack &&
- git -C git2 unpack-objects <"$1".pack &&
- (cd .git && find objects -type f -print) |
- while read path
- do
- cmp git2/$path .git/$path || {
- echo $path differs.
- return 1
- }
- done
+ git $git_config init --bare git2 &&
+ (
+ git $git_config -C git2 unpack-objects -n <"$packname".pack &&
+ git $git_config -C git2 unpack-objects <"$packname".pack &&
+ git $git_config -C git2 cat-file --batch-check="%(objectname)"
+ ) <"$object_list" >current &&
+ cmp "$object_list" current
}
test_expect_success 'unpack without delta' '
- check_unpack test-1-${packname_1}
+ check_unpack test-1-${packname_1} obj-list
+'
+
+BATCH_CONFIGURATION='-c core.fsync=loose-object -c core.fsyncmethod=batch'
+
+test_expect_success 'unpack without delta (core.fsyncmethod=batch)' '
+ check_unpack test-1-${packname_1} obj-list "$BATCH_CONFIGURATION"
'
test_expect_success 'pack with REF_DELTA' '
@@ -185,7 +190,11 @@
'
test_expect_success 'unpack with REF_DELTA' '
- check_unpack test-2-${packname_2}
+ check_unpack test-2-${packname_2} obj-list
+'
+
+test_expect_success 'unpack with REF_DELTA (core.fsyncmethod=batch)' '
+ check_unpack test-2-${packname_2} obj-list "$BATCH_CONFIGURATION"
'
test_expect_success 'pack with OFS_DELTA' '
@@ -195,7 +204,11 @@
'
test_expect_success 'unpack with OFS_DELTA' '
- check_unpack test-3-${packname_3}
+ check_unpack test-3-${packname_3} obj-list
+'
+
+test_expect_success 'unpack with OFS_DELTA (core.fsyncmethod=batch)' '
+ check_unpack test-3-${packname_3} obj-list "$BATCH_CONFIGURATION"
'
test_expect_success 'compare delta flavors' '
@@ -315,8 +328,10 @@
git index-pack -o tmp.idx test-3.pack &&
cmp tmp.idx test-1-${packname_1}.idx &&
- git index-pack test-3.pack &&
+ git index-pack --promisor=message test-3.pack &&
cmp test-3.idx test-1-${packname_1}.idx &&
+ echo message >expect &&
+ test_cmp expect test-3.promisor &&
cat test-2-${packname_2}.pack >test-3.pack &&
git index-pack -o tmp.idx test-2-${packname_2}.pack &&
@@ -347,7 +362,7 @@
for i in 0 1 2 3 4 5 6 7 8 9
do
o=$(echo $j$i | git hash-object -w --stdin) &&
- echo "100644 $o 0 $j$i"
+ echo "100644 $o 0 $j$i" || return 1
done
done >LIST &&
rm -f .git/index &&
@@ -361,11 +376,7 @@
ST=$(git write-tree) &&
git rev-list --objects "$LIST" "$LI" "$ST" >actual &&
PACK5=$( git pack-objects test-5 <actual ) &&
- PACK6=$( (
- echo "$LIST"
- echo "$LI"
- echo "$ST"
- ) | git pack-objects test-6 ) &&
+ PACK6=$( test_write_lines "$LIST" "$LI" "$ST" | git pack-objects test-6 ) &&
test_create_repo test-5 &&
(
cd test-5 &&
@@ -394,7 +405,7 @@
for i in 0 1 2 3 4 5 6 7 8 9
do
o=$(echo $j$i | git hash-object -w --stdin) &&
- echo "100644 $o 0 $j$i"
+ echo "100644 $o 0 $j$i" || return 1
done
done >LIST &&
rm -f .git/index &&
@@ -408,11 +419,7 @@
ST=$(git write-tree) &&
git rev-list --objects "$LIST" "$LI" "$ST" >actual &&
PACK5=$( git pack-objects test-5 <actual ) &&
- PACK6=$( (
- echo "$LIST"
- echo "$LI"
- echo "$ST"
- ) | git pack-objects test-6 ) &&
+ PACK6=$( test_write_lines "$LIST" "$LI" "$ST" | git pack-objects test-6 ) &&
test_create_repo test-7 &&
(
cd test-7 &&
@@ -594,7 +601,7 @@
for id in A B C
do
git pack-objects .git/objects/pack/pack-$id \
- --incremental --revs <<-EOF
+ --incremental --revs <<-EOF || exit 1
refs/tags/$id
EOF
done &&
diff --git a/t/t5301-sliding-window.sh b/t/t5301-sliding-window.sh
index 76f9798..3ccaaeb 100755
--- a/t/t5301-sliding-window.sh
+++ b/t/t5301-sliding-window.sh
@@ -4,6 +4,8 @@
#
test_description='mmap sliding window tests'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success \
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index 7c9d687..b0095ab 100755
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -14,7 +14,7 @@
i=1 &&
while test $i -le 100
do
- iii=$(printf "%03i" $i)
+ iii=$(printf "%03i" $i) &&
test-tool genrandom "bar" 200 > wide_delta_$iii &&
test-tool genrandom "baz $iii" 50 >> wide_delta_$iii &&
test-tool genrandom "foo"$i 100 > deep_delta_$iii &&
@@ -284,4 +284,12 @@
test_i18ngrep "Resolving deltas" err
'
+test_expect_success 'too-large packs report the breach' '
+ pack=$(git pack-objects --all pack </dev/null) &&
+ sz="$(test_file_size pack-$pack.pack)" &&
+ test "$sz" -gt 20 &&
+ test_must_fail git index-pack --max-input-size=20 pack-$pack.pack 2>err &&
+ grep "maximum allowed size (20 bytes)" err
+'
+
test_done
diff --git a/t/t5306-pack-nobase.sh b/t/t5306-pack-nobase.sh
index f4931c0..51973f4 100755
--- a/t/t5306-pack-nobase.sh
+++ b/t/t5306-pack-nobase.sh
@@ -12,7 +12,7 @@
#
test_expect_success \
'setup base' \
- 'for a in a b c d e f g h i; do echo $a >>text; done &&
+ 'test_write_lines a b c d e f g h i >text &&
echo side >side &&
git update-index --add text side &&
A=$(echo A | git commit-tree $(git write-tree)) &&
diff --git a/t/t5307-pack-missing-commit.sh b/t/t5307-pack-missing-commit.sh
index f4338ab..1e02c30 100755
--- a/t/t5307-pack-missing-commit.sh
+++ b/t/t5307-pack-missing-commit.sh
@@ -2,6 +2,7 @@
test_description='pack should notice missing commit objects'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -11,7 +12,7 @@
git add "file$i" &&
test_tick &&
git commit -m "$i" &&
- git tag "tag$i"
+ git tag "tag$i" || return 1
done &&
obj=$(git rev-parse --verify tag3) &&
fanout=$(expr "$obj" : "\(..\)") &&
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index 673baa5..f775fc1 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -1,11 +1,8 @@
#!/bin/sh
test_description='exercise basic bitmap functionality'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-bundle.sh
. "$TEST_DIRECTORY"/lib-bitmap.sh
# t5310 deals only with single-pack bitmaps, so don't write MIDX bitmaps in
@@ -36,7 +33,7 @@
'
test_expect_success 'full repack creates bitmaps' '
- GIT_TRACE2_EVENT_NESTING=4 GIT_TRACE2_EVENT="$(pwd)/trace" \
+ GIT_TRACE2_EVENT="$(pwd)/trace" \
git repack -ad &&
ls .git/objects/pack/ | grep bitmap >output &&
test_line_count = 1 output &&
@@ -231,7 +228,7 @@
test_when_finished "rm -f .git/objects/pack/*.keep" &&
for i in .git/objects/pack/*.pack
do
- >${i%.pack}.keep
+ >${i%.pack}.keep || return 1
done &&
reusable_pack --honor-pack-keep >empty.pack &&
git index-pack empty.pack &&
@@ -400,4 +397,32 @@
)
'
+test_expect_success 'complains about multiple pack bitmaps' '
+ rm -fr repo &&
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit base &&
+
+ git repack -adb &&
+ bitmap="$(ls .git/objects/pack/pack-*.bitmap)" &&
+ mv "$bitmap" "$bitmap.bak" &&
+
+ test_commit other &&
+ git repack -ab &&
+
+ mv "$bitmap.bak" "$bitmap" &&
+
+ find .git/objects/pack -type f -name "*.pack" >packs &&
+ find .git/objects/pack -type f -name "*.bitmap" >bitmaps &&
+ test_line_count = 2 packs &&
+ test_line_count = 2 bitmaps &&
+
+ git rev-list --use-bitmap-index HEAD 2>err &&
+ grep "ignoring extra bitmap file" err
+ )
+'
+
test_done
diff --git a/t/t5312-prune-corruption.sh b/t/t5312-prune-corruption.sh
index ea889c0..9d8e249 100755
--- a/t/t5312-prune-corruption.sh
+++ b/t/t5312-prune-corruption.sh
@@ -22,8 +22,8 @@
'
create_bogus_ref () {
- test_when_finished 'rm -f .git/refs/heads/bogus..name' &&
- echo $bogus >.git/refs/heads/bogus..name
+ test-tool ref-store main update-ref msg "refs/heads/bogus..name" $bogus $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+ test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/bogus..name"
}
test_expect_success 'create history reachable only from a bogus-named ref' '
@@ -113,7 +113,7 @@
# we do not want to count on running pack-refs to
# actually pack it, as it is perfectly reasonable to
# skip processing a broken ref
-test_expect_success 'create packed-refs file with broken ref' '
+test_expect_success REFFILES 'create packed-refs file with broken ref' '
rm -f .git/refs/heads/main &&
cat >.git/packed-refs <<-EOF &&
$missing refs/heads/main
@@ -124,13 +124,13 @@
test_cmp expect actual
'
-test_expect_success 'pack-refs does not silently delete broken packed ref' '
+test_expect_success REFFILES 'pack-refs does not silently delete broken packed ref' '
git pack-refs --all --prune &&
git rev-parse refs/heads/main >actual &&
test_cmp expect actual
'
-test_expect_success 'pack-refs does not drop broken refs during deletion' '
+test_expect_success REFFILES 'pack-refs does not drop broken refs during deletion' '
git update-ref -d refs/heads/other &&
git rev-parse refs/heads/main >actual &&
test_cmp expect actual
diff --git a/t/t5313-pack-bounds-checks.sh b/t/t5313-pack-bounds-checks.sh
index 535313e..cc4cfaa 100755
--- a/t/t5313-pack-bounds-checks.sh
+++ b/t/t5313-pack-bounds-checks.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='bounds-checking of access to mmapped on-disk file formats'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
clear_base () {
diff --git a/t/t5316-pack-delta-depth.sh b/t/t5316-pack-delta-depth.sh
index 759169d..eb4ef3d 100755
--- a/t/t5316-pack-delta-depth.sh
+++ b/t/t5316-pack-delta-depth.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='pack-objects breaks long cross-pack delta chains'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# This mirrors a repeated push setup:
@@ -57,11 +59,18 @@
git commit -m $i &&
cur=$(git rev-parse HEAD^{tree}) &&
{
- test -n "$prev" && echo "-$prev"
- echo $cur
+ if test -n "$prev"
+ then
+ echo "-$prev"
+ fi &&
+ echo $cur &&
echo "$(git rev-parse :file) file"
} | git pack-objects --stdout >tmp &&
- git index-pack --stdin --fix-thin <tmp || return 1
+ GIT_TRACE2_EVENT=$PWD/trace \
+ git index-pack -v --stdin --fix-thin <tmp || return 1 &&
+ grep -c region_enter.*progress trace >enter &&
+ grep -c region_leave.*progress trace >leave &&
+ test_cmp enter leave &&
prev=$cur
done
'
diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
index 13ed3eb..bb633c9 100755
--- a/t/t5317-pack-objects-filter-objects.sh
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -10,22 +10,22 @@
# Test blob:none filter.
test_expect_success 'setup r1' '
- echo "{print \$1}" >print_1.awk &&
- echo "{print \$2}" >print_2.awk &&
-
git init r1 &&
for n in 1 2 3 4 5
do
- echo "This is file: $n" > r1/file.$n
- git -C r1 add file.$n
- git -C r1 commit -m "$n"
+ echo "This is file: $n" > r1/file.$n &&
+ git -C r1 add file.$n &&
+ git -C r1 commit -m "$n" || return 1
done
'
+parse_verify_pack_blob_oid () {
+ awk '{print $1}' -
+}
+
test_expect_success 'verify blob count in normal packfile' '
- git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
- >ls_files_result &&
- awk -f print_2.awk ls_files_result |
+ git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
+ test_parse_ls_files_stage_oids |
sort >expected &&
git -C r1 pack-objects --revs --stdout >all.pack <<-EOF &&
@@ -35,7 +35,7 @@
git -C r1 verify-pack -v ../all.pack >verify_result &&
grep blob verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
@@ -54,12 +54,12 @@
test_expect_success 'verify normal and blob:none packfiles have same commits/trees' '
git -C r1 verify-pack -v ../all.pack >verify_result &&
grep -E "commit|tree" verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >expected &&
git -C r1 verify-pack -v ../filter.pack >verify_result &&
grep -E "commit|tree" verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
@@ -116,15 +116,15 @@
git init r2 &&
for n in 1000 10000
do
- printf "%"$n"s" X > r2/large.$n
- git -C r2 add large.$n
- git -C r2 commit -m "$n"
+ printf "%"$n"s" X > r2/large.$n &&
+ git -C r2 add large.$n &&
+ git -C r2 commit -m "$n" || return 1
done
'
test_expect_success 'verify blob count in normal packfile' '
- git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
- awk -f print_2.awk ls_files_result |
+ git -C r2 ls-files -s large.1000 large.10000 |
+ test_parse_ls_files_stage_oids |
sort >expected &&
git -C r2 pack-objects --revs --stdout >all.pack <<-EOF &&
@@ -134,7 +134,7 @@
git -C r2 verify-pack -v ../all.pack >verify_result &&
grep blob verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
@@ -161,8 +161,8 @@
'
test_expect_success 'verify blob:limit=1001' '
- git -C r2 ls-files -s large.1000 >ls_files_result &&
- awk -f print_2.awk ls_files_result |
+ git -C r2 ls-files -s large.1000 |
+ test_parse_ls_files_stage_oids |
sort >expected &&
git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
@@ -172,15 +172,15 @@
git -C r2 verify-pack -v ../filter.pack >verify_result &&
grep blob verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
'
test_expect_success 'verify blob:limit=10001' '
- git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
- awk -f print_2.awk ls_files_result |
+ git -C r2 ls-files -s large.1000 large.10000 |
+ test_parse_ls_files_stage_oids |
sort >expected &&
git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
@@ -190,15 +190,15 @@
git -C r2 verify-pack -v ../filter.pack >verify_result &&
grep blob verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
'
test_expect_success 'verify blob:limit=1k' '
- git -C r2 ls-files -s large.1000 >ls_files_result &&
- awk -f print_2.awk ls_files_result |
+ git -C r2 ls-files -s large.1000 |
+ test_parse_ls_files_stage_oids |
sort >expected &&
git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
@@ -208,15 +208,15 @@
git -C r2 verify-pack -v ../filter.pack >verify_result &&
grep blob verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
'
test_expect_success 'verify explicitly specifying oversized blob in input' '
- git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
- awk -f print_2.awk ls_files_result |
+ git -C r2 ls-files -s large.1000 large.10000 |
+ test_parse_ls_files_stage_oids |
sort >expected &&
echo HEAD >objects &&
@@ -226,15 +226,15 @@
git -C r2 verify-pack -v ../filter.pack >verify_result &&
grep blob verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
'
test_expect_success 'verify blob:limit=1m' '
- git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
- awk -f print_2.awk ls_files_result |
+ git -C r2 ls-files -s large.1000 large.10000 |
+ test_parse_ls_files_stage_oids |
sort >expected &&
git -C r2 pack-objects --revs --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
@@ -244,7 +244,7 @@
git -C r2 verify-pack -v ../filter.pack >verify_result &&
grep blob verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
@@ -253,12 +253,12 @@
test_expect_success 'verify normal and blob:limit packfiles have same commits/trees' '
git -C r2 verify-pack -v ../all.pack >verify_result &&
grep -E "commit|tree" verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >expected &&
git -C r2 verify-pack -v ../filter.pack >verify_result &&
grep -E "commit|tree" verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
@@ -278,10 +278,10 @@
mkdir r3/dir1 &&
for n in sparse1 sparse2
do
- echo "This is file: $n" > r3/$n
- git -C r3 add $n
- echo "This is file: dir1/$n" > r3/dir1/$n
- git -C r3 add dir1/$n
+ echo "This is file: $n" > r3/$n &&
+ git -C r3 add $n &&
+ echo "This is file: dir1/$n" > r3/dir1/$n &&
+ git -C r3 add dir1/$n || return 1
done &&
git -C r3 commit -m "sparse" &&
echo dir1/ >pattern1 &&
@@ -289,9 +289,8 @@
'
test_expect_success 'verify blob count in normal packfile' '
- git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
- >ls_files_result &&
- awk -f print_2.awk ls_files_result |
+ git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 |
+ test_parse_ls_files_stage_oids |
sort >expected &&
git -C r3 pack-objects --revs --stdout >all.pack <<-EOF &&
@@ -301,7 +300,7 @@
git -C r3 verify-pack -v ../all.pack >verify_result &&
grep blob verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
@@ -331,10 +330,10 @@
mkdir r4/dir1 &&
for n in sparse1 sparse2
do
- echo "This is file: $n" > r4/$n
- git -C r4 add $n
- echo "This is file: dir1/$n" > r4/dir1/$n
- git -C r4 add dir1/$n
+ echo "This is file: $n" > r4/$n &&
+ git -C r4 add $n &&
+ echo "This is file: dir1/$n" > r4/dir1/$n &&
+ git -C r4 add dir1/$n || return 1
done &&
echo dir1/ >r4/pattern &&
git -C r4 add pattern &&
@@ -342,9 +341,8 @@
'
test_expect_success 'verify blob count in normal packfile' '
- git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
- >ls_files_result &&
- awk -f print_2.awk ls_files_result |
+ git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 |
+ test_parse_ls_files_stage_oids |
sort >expected &&
git -C r4 pack-objects --revs --stdout >all.pack <<-EOF &&
@@ -354,19 +352,19 @@
git -C r4 verify-pack -v ../all.pack >verify_result &&
grep blob verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
'
test_expect_success 'verify sparse:oid=OID' '
- git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
- awk -f print_2.awk ls_files_result |
+ git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 |
+ test_parse_ls_files_stage_oids |
sort >expected &&
git -C r4 ls-files -s pattern >staged &&
- oid=$(awk -f print_2.awk staged) &&
+ oid=$(test_parse_ls_files_stage_oids <staged) &&
git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
HEAD
EOF
@@ -374,15 +372,15 @@
git -C r4 verify-pack -v ../filter.pack >verify_result &&
grep blob verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
'
test_expect_success 'verify sparse:oid=oid-ish' '
- git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
- awk -f print_2.awk ls_files_result |
+ git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 |
+ test_parse_ls_files_stage_oids |
sort >expected &&
git -C r4 pack-objects --revs --stdout --filter=sparse:oid=main:pattern >filter.pack <<-EOF &&
@@ -392,7 +390,7 @@
git -C r4 verify-pack -v ../filter.pack >verify_result &&
grep blob verify_result |
- awk -f print_1.awk |
+ parse_verify_pack_blob_oid |
sort >observed &&
test_cmp expected observed
@@ -402,14 +400,13 @@
# This models previously omitted objects that we did not receive.
test_expect_success 'setup r1 - delete loose blobs' '
- git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
- >ls_files_result &&
- awk -f print_2.awk ls_files_result |
+ git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
+ test_parse_ls_files_stage_oids |
sort >expected &&
for id in `cat expected | sed "s|..|&/|"`
do
- rm r1/.git/objects/$id
+ rm r1/.git/objects/$id || return 1
done
'
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index 295c5bd..fbf0d64 100755
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -29,12 +29,7 @@
cd "$TRASH_DIRECTORY/full" &&
git init &&
git config core.commitGraph true &&
- objdir=".git/objects" &&
-
- test_oid_cache <<-EOF
- oid_version sha1:1
- oid_version sha256:2
- EOF
+ objdir=".git/objects"
'
test_expect_success POSIXPERM 'tweak umask for modebit tests' '
@@ -64,51 +59,15 @@
for i in $(test_seq 3)
do
test_commit $i &&
- git branch commits/$i
+ git branch commits/$i || return 1
done &&
git repack
'
-graph_git_two_modes() {
- git -c core.commitGraph=true $1 >output
- git -c core.commitGraph=false $1 >expect
- test_cmp expect output
-}
-
-graph_git_behavior() {
- MSG=$1
- DIR=$2
- BRANCH=$3
- COMPARE=$4
- test_expect_success "check normal git operations: $MSG" '
- cd "$TRASH_DIRECTORY/$DIR" &&
- graph_git_two_modes "log --oneline $BRANCH" &&
- graph_git_two_modes "log --topo-order $BRANCH" &&
- graph_git_two_modes "log --graph $COMPARE..$BRANCH" &&
- graph_git_two_modes "branch -vv" &&
- graph_git_two_modes "merge-base -a $BRANCH $COMPARE"
- '
-}
+. "$TEST_DIRECTORY"/lib-commit-graph.sh
graph_git_behavior 'no graph' full commits/3 commits/1
-graph_read_expect() {
- OPTIONAL=""
- NUM_CHUNKS=3
- if test ! -z "$2"
- then
- OPTIONAL=" $2"
- NUM_CHUNKS=$((3 + $(echo "$2" | wc -w)))
- fi
- cat >expect <<- EOF
- header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0
- num_commits: $1
- chunks: oid_fanout oid_lookup commit_metadata$OPTIONAL
- EOF
- test-tool read-graph >output &&
- test_cmp expect output
-}
-
test_expect_success 'exit with correct error on bad input to --stdin-commits' '
cd "$TRASH_DIRECTORY/full" &&
# invalid, non-hex OID
@@ -147,13 +106,13 @@
for i in $(test_seq 4 5)
do
test_commit $i &&
- git branch commits/$i
+ git branch commits/$i || return 1
done &&
git reset --hard commits/2 &&
for i in $(test_seq 6 7)
do
test_commit $i &&
- git branch commits/$i
+ git branch commits/$i || return 1
done &&
git reset --hard commits/2 &&
git merge commits/4 &&
@@ -385,6 +344,7 @@
git commit-graph write --reachable &&
test_path_is_file .git/objects/info/commit-graph &&
git replace HEAD~1 HEAD~2 &&
+ graph_git_two_modes "commit-graph verify" &&
git -c core.commitGraph=false log >expect &&
git -c core.commitGraph=true log >actual &&
test_cmp expect actual &&
@@ -465,10 +425,10 @@
)
'
-test_expect_success 'lower layers have overflow chunk' '
+test_expect_success TIME_IS_64BIT,TIME_T_IS_64BIT 'lower layers have overflow chunk' '
cd "$TRASH_DIRECTORY/full" &&
UNIX_EPOCH_ZERO="@0 +0000" &&
- FUTURE_DATE="@2147483646 +0000" &&
+ FUTURE_DATE="@4147483646 +0000" &&
rm -f .git/objects/info/commit-graph &&
test_commit --date "$FUTURE_DATE" future-1 &&
test_commit --date "$UNIX_EPOCH_ZERO" old-1 &&
@@ -496,7 +456,7 @@
cd "$TRASH_DIRECTORY/full" &&
git rev-parse commits/8 | git -c commitGraph.generationVersion=1 commit-graph write --stdin-commits &&
git commit-graph verify >output &&
- graph_read_expect 9 extra_edges
+ graph_read_expect 9 extra_edges 1
'
NUM_COMMITS=9
@@ -693,12 +653,33 @@
$GRAPH_CHUNK_LOOKUP_OFFSET
'
-test_expect_success 'git fsck (checks commit-graph)' '
+test_expect_success 'git fsck (checks commit-graph when config set to true)' '
cd "$TRASH_DIRECTORY/full" &&
git fsck &&
corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
"incorrect checksum" &&
cp commit-graph-pre-write-test $objdir/info/commit-graph &&
+ test_must_fail git -c core.commitGraph=true fsck
+'
+
+test_expect_success 'git fsck (ignores commit-graph when config set to false)' '
+ cd "$TRASH_DIRECTORY/full" &&
+ git fsck &&
+ corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
+ "incorrect checksum" &&
+ cp commit-graph-pre-write-test $objdir/info/commit-graph &&
+ git -c core.commitGraph=false fsck
+'
+
+test_expect_success 'git fsck (checks commit-graph when config unset)' '
+ cd "$TRASH_DIRECTORY/full" &&
+ test_when_finished "git config core.commitGraph true" &&
+
+ git fsck &&
+ corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
+ "incorrect checksum" &&
+ test_unconfig core.commitGraph &&
+ cp commit-graph-pre-write-test $objdir/info/commit-graph &&
test_must_fail git fsck
'
@@ -803,10 +784,6 @@
objdir=".git/objects" &&
UNIX_EPOCH_ZERO="@0 +0000" &&
FUTURE_DATE="@2147483646 +0000" &&
- test_oid_cache <<-EOF &&
- oid_version sha1:1
- oid_version sha256:2
- EOF
cd "$TRASH_DIRECTORY" &&
mkdir repo &&
cd repo &&
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index bd17f30..afbe93f 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -93,7 +93,7 @@
test_commit initial &&
for i in $(test_seq 1 5)
do
- generate_objects $i
+ generate_objects $i || return 1
done &&
commit_and_list_objects
'
@@ -155,7 +155,7 @@
test_expect_success 'add more objects' '
for i in $(test_seq 6 10)
do
- generate_objects $i
+ generate_objects $i || return 1
done &&
commit_and_list_objects
'
@@ -168,6 +168,21 @@
compare_results_with_midx "two packs"
+test_expect_success 'write midx with --stdin-packs' '
+ rm -fr $objdir/pack/multi-pack-index &&
+
+ idx="$(find $objdir/pack -name "test-2-*.idx")" &&
+ basename "$idx" >in &&
+
+ git multi-pack-index write --stdin-packs <in &&
+
+ test-tool read-midx $objdir | grep "\.idx$" >packs &&
+
+ test_cmp packs in
+'
+
+compare_results_with_midx "mixed mode (one pack + extra)"
+
test_expect_success 'write progress off for redirected stderr' '
git multi-pack-index --object-dir=$objdir write 2>err &&
test_line_count = 0 err
@@ -188,7 +203,7 @@
do
generate_objects $j &&
commit_and_list_objects &&
- git pack-objects --index-version=2 $objdir/pack/test-pack <obj-list
+ git pack-objects --index-version=2 $objdir/pack/test-pack <obj-list || return 1
done
'
@@ -452,7 +467,10 @@
test_expect_success 'git-fsck incorrect offset' '
corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \
"incorrect object offset" \
- "git -c core.multipackindex=true fsck"
+ "git -c core.multiPackIndex=true fsck" &&
+ test_unconfig core.multiPackIndex &&
+ test_must_fail git fsck &&
+ git -c core.multiPackIndex=false fsck
'
test_expect_success 'corrupt MIDX is not reused' '
@@ -464,8 +482,10 @@
'
test_expect_success 'verify incorrect checksum' '
- pos=$(($(wc -c <$objdir/pack/multi-pack-index) - 1)) &&
- corrupt_midx_and_verify $pos "\377" $objdir "incorrect checksum"
+ pos=$(($(wc -c <$objdir/pack/multi-pack-index) - 10)) &&
+ corrupt_midx_and_verify $pos \
+ "\377\377\377\377\377\377\377\377\377\377" \
+ $objdir "incorrect checksum"
'
test_expect_success 'repack progress off for redirected stderr' '
@@ -576,7 +596,7 @@
mkdir objects64/pack &&
for i in $(test_seq 1 11)
do
- generate_objects 11
+ generate_objects 11 || return 1
done &&
commit_and_list_objects &&
pack64=$(git pack-objects --index-version=2,0x40 objects64/pack/test-64 <obj-list) &&
@@ -620,7 +640,7 @@
git update-index --add large_file.txt &&
for i in $(test_seq 1 20)
do
- test_commit $i
+ test_commit $i || exit 1
done &&
git branch A HEAD &&
git branch B HEAD~8 &&
diff --git a/t/t5320-delta-islands.sh b/t/t5320-delta-islands.sh
index fea92a5..124d476 100755
--- a/t/t5320-delta-islands.sh
+++ b/t/t5320-delta-islands.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='exercise delta islands'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# returns true iff $1 is a delta based on $2
diff --git a/t/t5322-pack-objects-sparse.sh b/t/t5322-pack-objects-sparse.sh
index 61cb907..770695c 100755
--- a/t/t5322-pack-objects-sparse.sh
+++ b/t/t5322-pack-objects-sparse.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup repo' '
@@ -14,7 +15,7 @@
for j in $(test_seq 1 3)
do
mkdir f$i/f$j &&
- echo $j >f$i/f$j/data.txt
+ echo $j >f$i/f$j/data.txt || return 1
done
done &&
git add . &&
@@ -23,7 +24,7 @@
do
git checkout -b topic$i main &&
echo change-$i >f$i/f$i/data.txt &&
- git commit -a -m "Changed f$i/f$i/data.txt"
+ git commit -a -m "Changed f$i/f$i/data.txt" || return 1
done &&
cat >packinput.txt <<-EOF &&
topic1
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh
index 587226e..669ddc6 100755
--- a/t/t5324-split-commit-graph.sh
+++ b/t/t5324-split-commit-graph.sh
@@ -30,10 +30,16 @@
then
NUM_BASE=$2
fi
+ OPTIONS=
+ if test -z "$3"
+ then
+ OPTIONS=" read_generation_data"
+ fi
cat >expect <<- EOF
header: 43475048 1 $(test_oid oid_version) 4 $NUM_BASE
num_commits: $1
chunks: oid_fanout oid_lookup commit_metadata generation_data
+ options:$OPTIONS
EOF
test-tool read-graph >output &&
test_cmp expect output
@@ -55,8 +61,8 @@
'
graph_git_two_modes() {
- git -c core.commitGraph=true $1 >output
- git -c core.commitGraph=false $1 >expect
+ git ${2:+ -C "$2"} -c core.commitGraph=true $1 >output &&
+ git ${2:+ -C "$2"} -c core.commitGraph=false $1 >expect &&
test_cmp expect output
}
@@ -64,12 +70,13 @@
MSG=$1
BRANCH=$2
COMPARE=$3
+ DIR=$4
test_expect_success "check normal git operations: $MSG" '
- graph_git_two_modes "log --oneline $BRANCH" &&
- graph_git_two_modes "log --topo-order $BRANCH" &&
- graph_git_two_modes "log --graph $COMPARE..$BRANCH" &&
- graph_git_two_modes "branch -vv" &&
- graph_git_two_modes "merge-base -a $BRANCH $COMPARE"
+ graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
+ graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
+ graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
+ graph_git_two_modes "branch -vv" "$DIR" &&
+ graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
'
}
@@ -187,7 +194,10 @@
)
'
-graph_git_behavior 'alternate: commit 13 vs 6' commits/13 commits/6
+if test -d fork
+then
+ graph_git_behavior 'alternate: commit 13 vs 6' commits/13 origin/commits/6 "fork"
+fi
test_expect_success 'test merge stragety constants' '
git clone . merge-2 &&
@@ -504,6 +514,7 @@
header: 43475048 1 $(test_oid oid_version) 4 1
num_commits: $NUM_SECOND_LAYER_COMMITS
chunks: oid_fanout oid_lookup commit_metadata
+ options:
EOF
test_cmp expect output &&
git commit-graph verify &&
@@ -536,6 +547,7 @@
header: 43475048 1 $(test_oid oid_version) 4 2
num_commits: $NUM_THIRD_LAYER_COMMITS
chunks: oid_fanout oid_lookup commit_metadata
+ options:
EOF
test_cmp expect output &&
git commit-graph verify
@@ -577,6 +589,7 @@
header: 43475048 1 $(test_oid oid_version) 4 2
num_commits: $(($NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS))
chunks: oid_fanout oid_lookup commit_metadata
+ options:
EOF
test_cmp expect output &&
git commit-graph verify
@@ -616,6 +629,7 @@
header: 43475048 1 $(test_oid oid_version) 5 1
num_commits: $(($NUM_SECOND_LAYER_COMMITS + $NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS + $NUM_FIFTH_LAYER_COMMITS))
chunks: oid_fanout oid_lookup commit_metadata generation_data
+ options: read_generation_data
EOF
test_cmp expect output
)
diff --git a/t/t5325-reverse-index.sh b/t/t5325-reverse-index.sh
index da453f6..d042d26 100755
--- a/t/t5325-reverse-index.sh
+++ b/t/t5325-reverse-index.sh
@@ -46,7 +46,7 @@
test_path_exists $rev &&
test_index_pack "$conf" --no-rev-index &&
- test_path_is_missing $rev
+ test_path_is_missing $rev || return 1
done
'
diff --git a/t/t5326-multi-pack-bitmaps.sh b/t/t5326-multi-pack-bitmaps.sh
index ec4aa89..4fe5741 100755
--- a/t/t5326-multi-pack-bitmaps.sh
+++ b/t/t5326-multi-pack-bitmaps.sh
@@ -9,125 +9,13 @@
GIT_TEST_MULTI_PACK_INDEX=0
GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
-objdir=.git/objects
-midx=$objdir/pack/multi-pack-index
+# This test exercise multi-pack bitmap functionality where the object order is
+# stored and read from a special chunk within the MIDX, so use the default
+# behavior here.
+sane_unset GIT_TEST_MIDX_WRITE_REV
+sane_unset GIT_TEST_MIDX_READ_RIDX
-# midx_pack_source <obj>
-midx_pack_source () {
- test-tool read-midx --show-objects .git/objects | grep "^$1 " | cut -f2
-}
-
-setup_bitmap_history
-
-test_expect_success 'enable core.multiPackIndex' '
- git config core.multiPackIndex true
-'
-
-test_expect_success 'create single-pack midx with bitmaps' '
- git repack -ad &&
- git multi-pack-index write --bitmap &&
- test_path_is_file $midx &&
- test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
- test_path_is_file $midx-$(midx_checksum $objdir).rev
-'
-
-basic_bitmap_tests
-
-test_expect_success 'create new additional packs' '
- for i in $(test_seq 1 16)
- do
- test_commit "$i" &&
- git repack -d || return 1
- done &&
-
- git checkout -b other2 HEAD~8 &&
- for i in $(test_seq 1 8)
- do
- test_commit "side-$i" &&
- git repack -d || return 1
- done &&
- git checkout second
-'
-
-test_expect_success 'create multi-pack midx with bitmaps' '
- git multi-pack-index write --bitmap &&
-
- ls $objdir/pack/pack-*.pack >packs &&
- test_line_count = 25 packs &&
-
- test_path_is_file $midx &&
- test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
- test_path_is_file $midx-$(midx_checksum $objdir).rev
-'
-
-basic_bitmap_tests
-
-test_expect_success '--no-bitmap is respected when bitmaps exist' '
- git multi-pack-index write --bitmap &&
-
- test_commit respect--no-bitmap &&
- git repack -d &&
-
- test_path_is_file $midx &&
- test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
- test_path_is_file $midx-$(midx_checksum $objdir).rev &&
-
- git multi-pack-index write --no-bitmap &&
-
- test_path_is_file $midx &&
- test_path_is_missing $midx-$(midx_checksum $objdir).bitmap &&
- test_path_is_missing $midx-$(midx_checksum $objdir).rev
-'
-
-test_expect_success 'setup midx with base from later pack' '
- # Write a and b so that "a" is a delta on top of base "b", since Git
- # prefers to delete contents out of a base rather than add to a shorter
- # object.
- test_seq 1 128 >a &&
- test_seq 1 130 >b &&
-
- git add a b &&
- git commit -m "initial commit" &&
-
- a=$(git rev-parse HEAD:a) &&
- b=$(git rev-parse HEAD:b) &&
-
- # In the first pack, "a" is stored as a delta to "b".
- p1=$(git pack-objects .git/objects/pack/pack <<-EOF
- $a
- $b
- EOF
- ) &&
-
- # In the second pack, "a" is missing, and "b" is not a delta nor base to
- # any other object.
- p2=$(git pack-objects .git/objects/pack/pack <<-EOF
- $b
- $(git rev-parse HEAD)
- $(git rev-parse HEAD^{tree})
- EOF
- ) &&
-
- git prune-packed &&
- # Use the second pack as the preferred source, so that "b" occurs
- # earlier in the MIDX object order, rendering "a" unusable for pack
- # reuse.
- git multi-pack-index write --bitmap --preferred-pack=pack-$p2.idx &&
-
- have_delta $a $b &&
- test $(midx_pack_source $a) != $(midx_pack_source $b)
-'
-
-rev_list_tests 'full bitmap with backwards delta'
-
-test_expect_success 'clone with bitmaps enabled' '
- git clone --no-local --bare . clone-reverse-delta.git &&
- test_when_finished "rm -fr clone-reverse-delta.git" &&
-
- git rev-parse HEAD >expect &&
- git --git-dir=clone-reverse-delta.git rev-parse HEAD >actual &&
- test_cmp expect actual
-'
+midx_bitmap_core
bitmap_reuse_tests() {
from=$1
@@ -204,17 +92,7 @@
)
'
-test_expect_success 'setup partial bitmaps' '
- test_commit packed &&
- git repack &&
- test_commit loose &&
- git multi-pack-index write --bitmap 2>err &&
- test_path_is_file $midx &&
- test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
- test_path_is_file $midx-$(midx_checksum $objdir).rev
-'
-
-basic_bitmap_tests HEAD~
+midx_bitmap_partial_tests
test_expect_success 'removing a MIDX clears stale bitmaps' '
rm -fr repo &&
@@ -228,7 +106,6 @@
# Write a MIDX and bitmap; remove the MIDX but leave the bitmap.
stale_bitmap=$midx-$(midx_checksum $objdir).bitmap &&
- stale_rev=$midx-$(midx_checksum $objdir).rev &&
rm $midx &&
# Then write a new MIDX.
@@ -238,9 +115,7 @@
test_path_is_file $midx &&
test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
- test_path_is_file $midx-$(midx_checksum $objdir).rev &&
- test_path_is_missing $stale_bitmap &&
- test_path_is_missing $stale_rev
+ test_path_is_missing $stale_bitmap
)
'
@@ -261,7 +136,6 @@
git multi-pack-index write --bitmap &&
test_path_is_file $midx &&
test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
- test_path_is_file $midx-$(midx_checksum $objdir).rev &&
test-tool bitmap list-commits | sort >bitmaps &&
comm -13 bitmaps commits >before &&
@@ -271,7 +145,6 @@
<before | git update-ref --stdin &&
rm -fr $midx-$(midx_checksum $objdir).bitmap &&
- rm -fr $midx-$(midx_checksum $objdir).rev &&
rm -fr $midx &&
git -c pack.preferBitmapTips=refs/tags/include \
@@ -283,6 +156,86 @@
)
'
+test_expect_success 'writing a bitmap with --refs-snapshot' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit one &&
+ test_commit two &&
+
+ git rev-parse one >snapshot &&
+
+ git repack -ad &&
+
+ # First, write a MIDX which see both refs/tags/one and
+ # refs/tags/two (causing both of those commits to receive
+ # bitmaps).
+ git multi-pack-index write --bitmap &&
+
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+ test-tool bitmap list-commits | sort >bitmaps &&
+ grep "$(git rev-parse one)" bitmaps &&
+ grep "$(git rev-parse two)" bitmaps &&
+
+ rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+ rm -fr $midx &&
+
+ # Then again, but with a refs snapshot which only sees
+ # refs/tags/one.
+ git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
+
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+ test-tool bitmap list-commits | sort >bitmaps &&
+ grep "$(git rev-parse one)" bitmaps &&
+ ! grep "$(git rev-parse two)" bitmaps
+ )
+'
+
+test_expect_success 'write a bitmap with --refs-snapshot (preferred tips)' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit_bulk --message="%s" 103 &&
+
+ git log --format="%H" >commits.raw &&
+ sort <commits.raw >commits &&
+
+ git log --format="create refs/tags/%s %H" HEAD >refs &&
+ git update-ref --stdin <refs &&
+
+ git multi-pack-index write --bitmap &&
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+ test-tool bitmap list-commits | sort >bitmaps &&
+ comm -13 bitmaps commits >before &&
+ test_line_count = 1 before &&
+
+ (
+ grep -vf before commits.raw &&
+ # mark missing commits as preferred
+ sed "s/^/+/" before
+ ) >snapshot &&
+
+ rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+ rm -fr $midx &&
+
+ git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
+ test-tool bitmap list-commits | sort >bitmaps &&
+ comm -13 bitmaps commits >after &&
+
+ ! test_cmp before after
+ )
+'
+
test_expect_success 'hash-cache values are propagated from pack bitmaps' '
rm -fr repo &&
git init repo &&
@@ -313,4 +266,45 @@
)
'
+test_expect_success 'no .bitmap is written without any objects' '
+ rm -fr repo &&
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ empty="$(git pack-objects $objdir/pack/pack </dev/null)" &&
+ cat >packs <<-EOF &&
+ pack-$empty.idx
+ EOF
+
+ git multi-pack-index write --bitmap --stdin-packs \
+ <packs 2>err &&
+
+ grep "bitmap without any objects" err &&
+
+ test_path_is_file $midx &&
+ test_path_is_missing $midx-$(midx_checksum $objdir).bitmap
+ )
+'
+
+test_expect_success 'graceful fallback when missing reverse index' '
+ rm -fr repo &&
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit base &&
+
+ # write a pack and MIDX bitmap containing base
+ git repack -adb &&
+ git multi-pack-index write --bitmap &&
+
+ GIT_TEST_MIDX_READ_RIDX=0 \
+ git rev-list --use-bitmap-index HEAD 2>err &&
+ ! grep "ignoring extra bitmap file" err
+ )
+'
+
test_done
diff --git a/t/t5327-multi-pack-bitmaps-rev.sh b/t/t5327-multi-pack-bitmaps-rev.sh
new file mode 100755
index 0000000..d30ba63
--- /dev/null
+++ b/t/t5327-multi-pack-bitmaps-rev.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+test_description='exercise basic multi-pack bitmap functionality (.rev files)'
+
+. ./test-lib.sh
+. "${TEST_DIRECTORY}/lib-bitmap.sh"
+
+# We'll be writing our own midx and bitmaps, so avoid getting confused by the
+# automatic ones.
+GIT_TEST_MULTI_PACK_INDEX=0
+GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
+
+# Unlike t5326, this test exercise multi-pack bitmap functionality where the
+# object order is stored in a separate .rev file.
+GIT_TEST_MIDX_WRITE_REV=1
+GIT_TEST_MIDX_READ_RIDX=0
+export GIT_TEST_MIDX_WRITE_REV
+export GIT_TEST_MIDX_READ_RIDX
+
+midx_bitmap_core rev
+midx_bitmap_partial_tests rev
+
+test_done
diff --git a/t/t5328-commit-graph-64bit-time.sh b/t/t5328-commit-graph-64bit-time.sh
new file mode 100755
index 0000000..093f0c0
--- /dev/null
+++ b/t/t5328-commit-graph-64bit-time.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+test_description='commit graph with 64-bit timestamps'
+. ./test-lib.sh
+
+if ! test_have_prereq TIME_IS_64BIT || ! test_have_prereq TIME_T_IS_64BIT
+then
+ skip_all='skipping 64-bit timestamp tests'
+ test_done
+fi
+
+. "$TEST_DIRECTORY"/lib-commit-graph.sh
+
+UNIX_EPOCH_ZERO="@0 +0000"
+FUTURE_DATE="@4147483646 +0000"
+
+GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0
+
+test_expect_success 'lower layers have overflow chunk' '
+ rm -f .git/objects/info/commit-graph &&
+ test_commit --date "$FUTURE_DATE" future-1 &&
+ test_commit --date "$UNIX_EPOCH_ZERO" old-1 &&
+ git commit-graph write --reachable &&
+ test_commit --date "$FUTURE_DATE" future-2 &&
+ test_commit --date "$UNIX_EPOCH_ZERO" old-2 &&
+ git commit-graph write --reachable --split=no-merge &&
+ test_commit extra &&
+ git commit-graph write --reachable --split=no-merge &&
+ git commit-graph write --reachable &&
+ graph_read_expect 5 "generation_data generation_data_overflow" &&
+ mv .git/objects/info/commit-graph commit-graph-upgraded &&
+ git commit-graph write --reachable &&
+ graph_read_expect 5 "generation_data generation_data_overflow" &&
+ test_cmp .git/objects/info/commit-graph commit-graph-upgraded
+'
+
+graph_git_behavior 'overflow' '' HEAD~2 HEAD
+
+test_expect_success 'set up and verify repo with generation data overflow chunk' '
+ mkdir repo &&
+ cd repo &&
+ git init &&
+ test_commit --date "$UNIX_EPOCH_ZERO" 1 &&
+ test_commit 2 &&
+ test_commit --date "$UNIX_EPOCH_ZERO" 3 &&
+ git commit-graph write --reachable &&
+ graph_read_expect 3 generation_data &&
+ test_commit --date "$FUTURE_DATE" 4 &&
+ test_commit 5 &&
+ test_commit --date "$UNIX_EPOCH_ZERO" 6 &&
+ git branch left &&
+ git reset --hard 3 &&
+ test_commit 7 &&
+ test_commit --date "$FUTURE_DATE" 8 &&
+ test_commit 9 &&
+ git branch right &&
+ git reset --hard 3 &&
+ test_merge M left right &&
+ git commit-graph write --reachable &&
+ graph_read_expect 10 "generation_data generation_data_overflow" &&
+ git commit-graph verify
+'
+
+graph_git_behavior 'overflow 2' repo left right
+
+test_done
diff --git a/t/t5329-pack-objects-cruft.sh b/t/t5329-pack-objects-cruft.sh
new file mode 100755
index 0000000..b481224
--- /dev/null
+++ b/t/t5329-pack-objects-cruft.sh
@@ -0,0 +1,739 @@
+#!/bin/sh
+
+test_description='cruft pack related pack-objects tests'
+. ./test-lib.sh
+
+objdir=.git/objects
+packdir=$objdir/pack
+
+basic_cruft_pack_tests () {
+ expire="$1"
+
+ test_expect_success "unreachable loose objects are packed (expire $expire)" '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit base &&
+ git repack -Ad &&
+ test_commit loose &&
+
+ test-tool chmtime +2000 "$objdir/$(test_oid_to_path \
+ $(git rev-parse loose:loose.t))" &&
+ test-tool chmtime +1000 "$objdir/$(test_oid_to_path \
+ $(git rev-parse loose^{tree}))" &&
+
+ (
+ git rev-list --objects --no-object-names base..loose |
+ while read oid
+ do
+ path="$objdir/$(test_oid_to_path "$oid")" &&
+ printf "%s %d\n" "$oid" "$(test-tool chmtime --get "$path")"
+ done |
+ sort -k1
+ ) >expect &&
+
+ keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+ cruft="$(echo $keep | git pack-objects --cruft \
+ --cruft-expiration="$expire" $packdir/pack)" &&
+ test-tool pack-mtimes "pack-$cruft.mtimes" >actual &&
+
+ test_cmp expect actual
+ )
+ '
+
+ test_expect_success "unreachable packed objects are packed (expire $expire)" '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit packed &&
+ git repack -Ad &&
+ test_commit other &&
+
+ git rev-list --objects --no-object-names packed.. >objects &&
+ keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+ other="$(git pack-objects --delta-base-offset \
+ $packdir/pack <objects)" &&
+ git prune-packed &&
+
+ test-tool chmtime --get -100 "$packdir/pack-$other.pack" >expect &&
+
+ cruft="$(git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack <<-EOF
+ $keep
+ -pack-$other.pack
+ EOF
+ )" &&
+ test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+
+ cut -d" " -f2 <actual.raw | sort -u >actual &&
+
+ test_cmp expect actual
+ )
+ '
+
+ test_expect_success "unreachable cruft objects are repacked (expire $expire)" '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit packed &&
+ git repack -Ad &&
+ test_commit other &&
+
+ git rev-list --objects --no-object-names packed.. >objects &&
+ keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+
+ cruft_a="$(echo $keep | git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack)" &&
+ git prune-packed &&
+ cruft_b="$(git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack <<-EOF
+ $keep
+ -pack-$cruft_a.pack
+ EOF
+ )" &&
+
+ test-tool pack-mtimes "pack-$cruft_a.mtimes" >expect.raw &&
+ test-tool pack-mtimes "pack-$cruft_b.mtimes" >actual.raw &&
+
+ sort <expect.raw >expect &&
+ sort <actual.raw >actual &&
+
+ test_cmp expect actual
+ )
+ '
+
+ test_expect_success "multiple cruft packs (expire $expire)" '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit reachable &&
+ git repack -Ad &&
+ keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+
+ test_commit cruft &&
+ loose="$objdir/$(test_oid_to_path $(git rev-parse cruft))" &&
+
+ # generate three copies of the cruft object in different
+ # cruft packs, each with a unique mtime:
+ # - one expired (1000 seconds ago)
+ # - two non-expired (one 1000 seconds in the future,
+ # one 1500 seconds in the future)
+ test-tool chmtime =-1000 "$loose" &&
+ git pack-objects --cruft $packdir/pack-A <<-EOF &&
+ $keep
+ EOF
+ test-tool chmtime =+1000 "$loose" &&
+ git pack-objects --cruft $packdir/pack-B <<-EOF &&
+ $keep
+ -$(basename $(ls $packdir/pack-A-*.pack))
+ EOF
+ test-tool chmtime =+1500 "$loose" &&
+ git pack-objects --cruft $packdir/pack-C <<-EOF &&
+ $keep
+ -$(basename $(ls $packdir/pack-A-*.pack))
+ -$(basename $(ls $packdir/pack-B-*.pack))
+ EOF
+
+ # ensure the resulting cruft pack takes the most recent
+ # mtime among all copies
+ cruft="$(git pack-objects --cruft \
+ --cruft-expiration="$expire" \
+ $packdir/pack <<-EOF
+ $keep
+ -$(basename $(ls $packdir/pack-A-*.pack))
+ -$(basename $(ls $packdir/pack-B-*.pack))
+ -$(basename $(ls $packdir/pack-C-*.pack))
+ EOF
+ )" &&
+
+ test-tool pack-mtimes "$(basename $(ls $packdir/pack-C-*.mtimes))" >expect.raw &&
+ test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+
+ sort expect.raw >expect &&
+ sort actual.raw >actual &&
+ test_cmp expect actual
+ )
+ '
+
+ test_expect_success "cruft packs tolerate missing trees (expire $expire)" '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit reachable &&
+ test_commit cruft &&
+
+ tree="$(git rev-parse cruft^{tree})" &&
+
+ git reset --hard reachable &&
+ git tag -d cruft &&
+ git reflog expire --all --expire=all &&
+
+ # remove the unreachable tree, but leave the commit
+ # which has it as its root tree intact
+ rm -fr "$objdir/$(test_oid_to_path "$tree")" &&
+
+ git repack -Ad &&
+ basename $(ls $packdir/pack-*.pack) >in &&
+ git pack-objects --cruft --cruft-expiration="$expire" \
+ $packdir/pack <in
+ )
+ '
+
+ test_expect_success "cruft packs tolerate missing blobs (expire $expire)" '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit reachable &&
+ test_commit cruft &&
+
+ blob="$(git rev-parse cruft:cruft.t)" &&
+
+ git reset --hard reachable &&
+ git tag -d cruft &&
+ git reflog expire --all --expire=all &&
+
+ # remove the unreachable blob, but leave the commit (and
+ # the root tree of that commit) intact
+ rm -fr "$objdir/$(test_oid_to_path "$blob")" &&
+
+ git repack -Ad &&
+ basename $(ls $packdir/pack-*.pack) >in &&
+ git pack-objects --cruft --cruft-expiration="$expire" \
+ $packdir/pack <in
+ )
+ '
+}
+
+basic_cruft_pack_tests never
+basic_cruft_pack_tests 2.weeks.ago
+
+test_expect_success 'cruft tags rescue tagged objects' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit packed &&
+ git repack -Ad &&
+
+ test_commit tagged &&
+ git tag -a annotated -m tag &&
+
+ git rev-list --objects --no-object-names packed.. >objects &&
+ while read oid
+ do
+ test-tool chmtime -1000 \
+ "$objdir/$(test_oid_to_path $oid)"
+ done <objects &&
+
+ test-tool chmtime -500 \
+ "$objdir/$(test_oid_to_path $(git rev-parse annotated))" &&
+
+ keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+ cruft="$(echo $keep | git pack-objects --cruft \
+ --cruft-expiration=750.seconds.ago \
+ $packdir/pack)" &&
+ test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+ cut -f1 -d" " <actual.raw | sort >actual &&
+
+ (
+ cat objects &&
+ git rev-parse annotated
+ ) >expect.raw &&
+ sort <expect.raw >expect &&
+
+ test_cmp expect actual &&
+ cat actual
+ )
+'
+
+test_expect_success 'cruft commits rescue parents, trees' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit packed &&
+ git repack -Ad &&
+
+ test_commit old &&
+ test_commit new &&
+
+ git rev-list --objects --no-object-names packed..new >objects &&
+ while read object
+ do
+ test-tool chmtime -1000 \
+ "$objdir/$(test_oid_to_path $object)"
+ done <objects &&
+ test-tool chmtime +500 "$objdir/$(test_oid_to_path \
+ $(git rev-parse HEAD))" &&
+
+ keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+ cruft="$(echo $keep | git pack-objects --cruft \
+ --cruft-expiration=750.seconds.ago \
+ $packdir/pack)" &&
+ test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+
+ cut -d" " -f1 <actual.raw | sort >actual &&
+ sort <objects >expect &&
+
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'cruft trees rescue sub-trees, blobs' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit packed &&
+ git repack -Ad &&
+
+ mkdir -p dir/sub &&
+ echo foo >foo &&
+ echo bar >dir/bar &&
+ echo baz >dir/sub/baz &&
+
+ test_tick &&
+ git add . &&
+ git commit -m "pruned" &&
+
+ test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD))" &&
+ test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD^{tree}))" &&
+ test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:foo))" &&
+ test-tool chmtime -500 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir))" &&
+ test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir/bar))" &&
+ test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir/sub))" &&
+ test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir/sub/baz))" &&
+
+ keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+ cruft="$(echo $keep | git pack-objects --cruft \
+ --cruft-expiration=750.seconds.ago \
+ $packdir/pack)" &&
+ test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+ cut -f1 -d" " <actual.raw | sort >actual &&
+
+ git rev-parse HEAD:dir HEAD:dir/bar HEAD:dir/sub HEAD:dir/sub/baz >expect.raw &&
+ sort <expect.raw >expect &&
+
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'expired objects are pruned' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit packed &&
+ git repack -Ad &&
+
+ test_commit pruned &&
+
+ git rev-list --objects --no-object-names packed..pruned >objects &&
+ while read object
+ do
+ test-tool chmtime -1000 \
+ "$objdir/$(test_oid_to_path $object)"
+ done <objects &&
+
+ keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+ cruft="$(echo $keep | git pack-objects --cruft \
+ --cruft-expiration=750.seconds.ago \
+ $packdir/pack)" &&
+
+ test-tool pack-mtimes "pack-$cruft.mtimes" >actual &&
+ test_must_be_empty actual
+ )
+'
+
+test_expect_success 'repack --cruft generates a cruft pack' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit reachable &&
+ git branch -M main &&
+ git checkout --orphan other &&
+ test_commit unreachable &&
+
+ git checkout main &&
+ git branch -D other &&
+ git tag -d unreachable &&
+ # objects are not cruft if they are contained in the reflogs
+ git reflog expire --all --expire=all &&
+
+ git rev-list --objects --all --no-object-names >reachable.raw &&
+ git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
+ sort <reachable.raw >reachable &&
+ comm -13 reachable objects >unreachable &&
+
+ git repack --cruft -d &&
+
+ cruft=$(basename $(ls $packdir/pack-*.mtimes) .mtimes) &&
+ pack=$(basename $(ls $packdir/pack-*.pack | grep -v $cruft) .pack) &&
+
+ git show-index <$packdir/$pack.idx >actual.raw &&
+ cut -f2 -d" " actual.raw | sort >actual &&
+ test_cmp reachable actual &&
+
+ git show-index <$packdir/$cruft.idx >actual.raw &&
+ cut -f2 -d" " actual.raw | sort >actual &&
+ test_cmp unreachable actual
+ )
+'
+
+test_expect_success 'loose objects mtimes upsert others' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit reachable &&
+ git repack -Ad &&
+ git branch -M main &&
+
+ git checkout --orphan other &&
+ test_commit cruft &&
+ # incremental repack, leaving existing objects loose (so
+ # they can be "freshened")
+ git repack &&
+
+ tip="$(git rev-parse cruft)" &&
+ path="$objdir/$(test_oid_to_path "$tip")" &&
+ test-tool chmtime --get +1000 "$path" >expect &&
+
+ git checkout main &&
+ git branch -D other &&
+ git tag -d cruft &&
+ git reflog expire --all --expire=all &&
+
+ git repack --cruft -d &&
+
+ mtimes="$(basename $(ls $packdir/pack-*.mtimes))" &&
+ test-tool pack-mtimes "$mtimes" >actual.raw &&
+ grep "$tip" actual.raw | cut -d" " -f2 >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'expiring cruft objects with git gc' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit reachable &&
+ git branch -M main &&
+ git checkout --orphan other &&
+ test_commit unreachable &&
+
+ git checkout main &&
+ git branch -D other &&
+ git tag -d unreachable &&
+ # objects are not cruft if they are contained in the reflogs
+ git reflog expire --all --expire=all &&
+
+ git rev-list --objects --all --no-object-names >reachable.raw &&
+ git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
+ sort <reachable.raw >reachable &&
+ comm -13 reachable objects >unreachable &&
+
+ git repack --cruft -d &&
+
+ mtimes=$(ls .git/objects/pack/pack-*.mtimes) &&
+ test_path_is_file $mtimes &&
+
+ git gc --cruft --prune=now &&
+
+ git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
+
+ comm -23 unreachable objects >removed &&
+ test_cmp unreachable removed &&
+ test_path_is_missing $mtimes
+ )
+'
+
+test_expect_success 'cruft packs are not included in geometric repack' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit reachable &&
+ git repack -Ad &&
+ git branch -M main &&
+
+ git checkout --orphan other &&
+ test_commit cruft &&
+ git repack -d &&
+
+ git checkout main &&
+ git branch -D other &&
+ git tag -d cruft &&
+ git reflog expire --all --expire=all &&
+
+ git repack --cruft &&
+
+ find $packdir -type f | sort >before &&
+ git repack --geometric=2 -d &&
+ find $packdir -type f | sort >after &&
+
+ test_cmp before after
+ )
+'
+
+test_expect_success 'repack --geometric collects once-cruft objects' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit reachable &&
+ git repack -Ad &&
+ git branch -M main &&
+
+ git checkout --orphan other &&
+ git rm -rf . &&
+ test_commit --no-tag cruft &&
+ cruft="$(git rev-parse HEAD)" &&
+
+ git checkout main &&
+ git branch -D other &&
+ git reflog expire --all --expire=all &&
+
+ # Pack the objects created in the previous step into a cruft
+ # pack. Intentionally leave loose copies of those objects
+ # around so we can pick them up in a subsequent --geometric
+ # reapack.
+ git repack --cruft &&
+
+ # Now make those objects reachable, and ensure that they are
+ # packed into the new pack created via a --geometric repack.
+ git update-ref refs/heads/other $cruft &&
+
+ # Without this object, the set of unpacked objects is exactly
+ # the set of objects already in the cruft pack. Tweak that set
+ # to ensure we do not overwrite the cruft pack entirely.
+ test_commit reachable2 &&
+
+ find $packdir -name "pack-*.idx" | sort >before &&
+ git repack --geometric=2 -d &&
+ find $packdir -name "pack-*.idx" | sort >after &&
+
+ {
+ git rev-list --objects --no-object-names $cruft &&
+ git rev-list --objects --no-object-names reachable..reachable2
+ } >want.raw &&
+ sort want.raw >want &&
+
+ pack=$(comm -13 before after) &&
+ git show-index <$pack >objects.raw &&
+
+ cut -d" " -f2 objects.raw | sort >got &&
+
+ test_cmp want got
+ )
+'
+
+test_expect_success 'cruft repack with no reachable objects' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit base &&
+ git repack -ad &&
+
+ base="$(git rev-parse base)" &&
+
+ git for-each-ref --format="delete %(refname)" >in &&
+ git update-ref --stdin <in &&
+ git reflog expire --all --expire=all &&
+ rm -fr .git/index &&
+
+ git repack --cruft -d &&
+
+ git cat-file -t $base
+ )
+'
+
+test_expect_success 'cruft repack ignores --max-pack-size' '
+ git init max-pack-size &&
+ (
+ cd max-pack-size &&
+ test_commit base &&
+ # two cruft objects which exceed the maximum pack size
+ test-tool genrandom foo 1048576 | git hash-object --stdin -w &&
+ test-tool genrandom bar 1048576 | git hash-object --stdin -w &&
+ git repack --cruft --max-pack-size=1M &&
+ find $packdir -name "*.mtimes" >cruft &&
+ test_line_count = 1 cruft &&
+ test-tool pack-mtimes "$(basename "$(cat cruft)")" >objects &&
+ test_line_count = 2 objects
+ )
+'
+
+test_expect_success 'cruft repack ignores pack.packSizeLimit' '
+ (
+ cd max-pack-size &&
+ # repack everything back together to remove the existing cruft
+ # pack (but to keep its objects)
+ git repack -adk &&
+ git -c pack.packSizeLimit=1M repack --cruft &&
+ # ensure the same post condition is met when --max-pack-size
+ # would otherwise be inferred from the configuration
+ find $packdir -name "*.mtimes" >cruft &&
+ test_line_count = 1 cruft &&
+ test-tool pack-mtimes "$(basename "$(cat cruft)")" >objects &&
+ test_line_count = 2 objects
+ )
+'
+
+test_expect_success 'cruft repack respects repack.cruftWindow' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit base &&
+
+ GIT_TRACE2_EVENT=$(pwd)/event.trace \
+ git -c pack.window=1 -c repack.cruftWindow=2 repack \
+ --cruft --window=3 &&
+
+ grep "pack-objects.*--window=2.*--cruft" event.trace
+ )
+'
+
+test_expect_success 'cruft repack respects --window by default' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit base &&
+
+ GIT_TRACE2_EVENT=$(pwd)/event.trace \
+ git -c pack.window=2 repack --cruft --window=3 &&
+
+ grep "pack-objects.*--window=3.*--cruft" event.trace
+ )
+'
+
+test_expect_success 'cruft repack respects --quiet' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit base &&
+ GIT_PROGRESS_DELAY=0 git repack --cruft --quiet 2>err &&
+ test_must_be_empty err
+ )
+'
+
+test_expect_success 'cruft --local drops unreachable objects' '
+ git init alternate &&
+ git init repo &&
+ test_when_finished "rm -fr alternate repo" &&
+
+ test_commit -C alternate base &&
+ # Pack all objects in alterate so that the cruft repack in "repo" sees
+ # the object it dropped due to `--local` as packed. Otherwise this
+ # object would not appear packed anywhere (since it is not packed in
+ # alternate and likewise not part of the cruft pack in the other repo
+ # because of `--local`).
+ git -C alternate repack -ad &&
+
+ (
+ cd repo &&
+
+ object="$(git -C ../alternate rev-parse HEAD:base.t)" &&
+ git -C ../alternate cat-file -p $object >contents &&
+
+ # Write some reachable objects and two unreachable ones: one
+ # that the alternate has and another that is unique.
+ test_commit other &&
+ git hash-object -w -t blob contents &&
+ cruft="$(echo cruft | git hash-object -w -t blob --stdin)" &&
+
+ ( cd ../alternate/.git/objects && pwd ) \
+ >.git/objects/info/alternates &&
+
+ test_path_is_file $objdir/$(test_oid_to_path $cruft) &&
+ test_path_is_file $objdir/$(test_oid_to_path $object) &&
+
+ git repack -d --cruft --local &&
+
+ test-tool pack-mtimes "$(basename $(ls $packdir/pack-*.mtimes))" \
+ >objects &&
+ ! grep $object objects &&
+ grep $cruft objects
+ )
+'
+
+test_expect_success 'MIDX bitmaps tolerate reachable cruft objects' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit reachable &&
+ test_commit cruft &&
+ unreachable="$(git rev-parse cruft)" &&
+
+ git reset --hard $unreachable^ &&
+ git tag -d cruft &&
+ git reflog expire --all --expire=all &&
+
+ git repack --cruft -d &&
+
+ # resurrect the unreachable object via a new commit. the
+ # new commit will get selected for a bitmap, but be
+ # missing one of its parents from the selected packs.
+ git reset --hard $unreachable &&
+ test_commit resurrect &&
+
+ git repack --write-midx --write-bitmap-index --geometric=2 -d
+ )
+'
+
+test_expect_success 'cruft objects are freshend via loose' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ echo "cruft" >contents &&
+ blob="$(git hash-object -w -t blob contents)" &&
+ loose="$objdir/$(test_oid_to_path $blob)" &&
+
+ test_commit base &&
+
+ git repack --cruft -d &&
+
+ test_path_is_missing "$loose" &&
+ test-tool pack-mtimes "$(basename "$(ls $packdir/pack-*.mtimes)")" >cruft &&
+ grep "$blob" cruft &&
+
+ # write the same object again
+ git hash-object -w -t blob contents &&
+
+ test_path_is_file "$loose"
+ )
+'
+
+test_done
diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh
index 6012cc8..001b7a1 100755
--- a/t/t5401-update-hooks.sh
+++ b/t/t5401-update-hooks.sh
@@ -20,46 +20,38 @@
git clone --bare ./. victim.git &&
GIT_DIR=victim.git git update-ref refs/heads/tofail $commit1 &&
git update-ref refs/heads/main $commit1 &&
- git update-ref refs/heads/tofail $commit0
+ git update-ref refs/heads/tofail $commit0 &&
+
+ test_hook --setup -C victim.git pre-receive <<-\EOF &&
+ printf %s "$@" >>$GIT_DIR/pre-receive.args
+ cat - >$GIT_DIR/pre-receive.stdin
+ echo STDOUT pre-receive
+ echo STDERR pre-receive >&2
+ EOF
+
+ test_hook --setup -C victim.git update <<-\EOF &&
+ echo "$@" >>$GIT_DIR/update.args
+ read x; printf %s "$x" >$GIT_DIR/update.stdin
+ echo STDOUT update $1
+ echo STDERR update $1 >&2
+ test "$1" = refs/heads/main || exit
+ EOF
+
+ test_hook --setup -C victim.git post-receive <<-\EOF &&
+ printf %s "$@" >>$GIT_DIR/post-receive.args
+ cat - >$GIT_DIR/post-receive.stdin
+ echo STDOUT post-receive
+ echo STDERR post-receive >&2
+ EOF
+
+ test_hook --setup -C victim.git post-update <<-\EOF
+ echo "$@" >>$GIT_DIR/post-update.args
+ read x; printf %s "$x" >$GIT_DIR/post-update.stdin
+ echo STDOUT post-update
+ echo STDERR post-update >&2
+ EOF
'
-cat >victim.git/hooks/pre-receive <<'EOF'
-#!/bin/sh
-printf %s "$@" >>$GIT_DIR/pre-receive.args
-cat - >$GIT_DIR/pre-receive.stdin
-echo STDOUT pre-receive
-echo STDERR pre-receive >&2
-EOF
-chmod u+x victim.git/hooks/pre-receive
-
-cat >victim.git/hooks/update <<'EOF'
-#!/bin/sh
-echo "$@" >>$GIT_DIR/update.args
-read x; printf %s "$x" >$GIT_DIR/update.stdin
-echo STDOUT update $1
-echo STDERR update $1 >&2
-test "$1" = refs/heads/main || exit
-EOF
-chmod u+x victim.git/hooks/update
-
-cat >victim.git/hooks/post-receive <<'EOF'
-#!/bin/sh
-printf %s "$@" >>$GIT_DIR/post-receive.args
-cat - >$GIT_DIR/post-receive.stdin
-echo STDOUT post-receive
-echo STDERR post-receive >&2
-EOF
-chmod u+x victim.git/hooks/post-receive
-
-cat >victim.git/hooks/post-update <<'EOF'
-#!/bin/sh
-echo "$@" >>$GIT_DIR/post-update.args
-read x; printf %s "$x" >$GIT_DIR/post-update.stdin
-echo STDOUT post-update
-echo STDERR post-update >&2
-EOF
-chmod u+x victim.git/hooks/post-update
-
test_expect_success push '
test_must_fail git send-pack --force ./victim.git \
main tofail >send.out 2>send.err
@@ -136,7 +128,7 @@
'
test_expect_success 'pre-receive hook that forgets to read its input' '
- write_script victim.git/hooks/pre-receive <<-\EOF &&
+ test_hook --clobber -C victim.git pre-receive <<-\EOF &&
exit 0
EOF
rm -f victim.git/hooks/update victim.git/hooks/post-update &&
diff --git a/t/t5402-post-merge-hook.sh b/t/t5402-post-merge-hook.sh
index 3e5e19c..915af2d 100755
--- a/t/t5402-post-merge-hook.sh
+++ b/t/t5402-post-merge-hook.sh
@@ -25,13 +25,15 @@
GIT_DIR=clone2/.git git update-index --add a
'
-for clone in 1 2; do
- cat >clone${clone}/.git/hooks/post-merge <<'EOF'
-#!/bin/sh
-echo $@ >> $GIT_DIR/post-merge.args
-EOF
- chmod u+x clone${clone}/.git/hooks/post-merge
-done
+test_expect_success 'setup clone hooks' '
+ test_when_finished "rm -f hook" &&
+ cat >hook <<-\EOF &&
+ echo $@ >>$GIT_DIR/post-merge.args
+ EOF
+
+ test_hook --setup -C clone1 post-merge <hook &&
+ test_hook --setup -C clone2 post-merge <hook
+'
test_expect_success 'post-merge does not run for up-to-date ' '
GIT_DIR=clone1/.git git merge $commit0 &&
diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
index 1ec9e23..978f240 100755
--- a/t/t5403-post-checkout-hook.sh
+++ b/t/t5403-post-checkout-hook.sh
@@ -10,8 +10,7 @@
. ./test-lib.sh
test_expect_success setup '
- mkdir -p .git/hooks &&
- write_script .git/hooks/post-checkout <<-\EOF &&
+ test_hook --setup post-checkout <<-\EOF &&
echo "$@" >.git/post-checkout.args
EOF
test_commit one &&
@@ -49,23 +48,60 @@
test $old = $new && test $flag = 0
'
-test_expect_success 'post-checkout is triggered on rebase' '
- test_when_finished "rm -f .git/post-checkout.args" &&
- git checkout -b rebase-test main &&
- rm -f .git/post-checkout.args &&
- git rebase rebase-on-me &&
- read old new flag <.git/post-checkout.args &&
- test $old != $new && test $flag = 1
-'
+test_rebase () {
+ args="$*" &&
+ test_expect_success "post-checkout is triggered on rebase $args" '
+ test_when_finished "rm -f .git/post-checkout.args" &&
+ git checkout -B rebase-test main &&
+ rm -f .git/post-checkout.args &&
+ git rebase $args rebase-on-me &&
+ read old new flag <.git/post-checkout.args &&
+ test_cmp_rev main $old &&
+ test_cmp_rev rebase-on-me $new &&
+ test $flag = 1
+ '
-test_expect_success 'post-checkout is triggered on rebase with fast-forward' '
- test_when_finished "rm -f .git/post-checkout.args" &&
- git checkout -b ff-rebase-test rebase-on-me^ &&
- rm -f .git/post-checkout.args &&
- git rebase rebase-on-me &&
- read old new flag <.git/post-checkout.args &&
- test $old != $new && test $flag = 1
+ test_expect_success "post-checkout is triggered on rebase $args with fast-forward" '
+ test_when_finished "rm -f .git/post-checkout.args" &&
+ git checkout -B ff-rebase-test rebase-on-me^ &&
+ rm -f .git/post-checkout.args &&
+ git rebase $args rebase-on-me &&
+ read old new flag <.git/post-checkout.args &&
+ test_cmp_rev rebase-on-me^ $old &&
+ test_cmp_rev rebase-on-me $new &&
+ test $flag = 1
+ '
+
+ test_expect_success "rebase $args fast-forward branch checkout runs post-checkout hook" '
+ test_when_finished "test_might_fail git rebase --abort" &&
+ test_when_finished "rm -f .git/post-checkout.args" &&
+ git update-ref refs/heads/rebase-fast-forward three &&
+ git checkout two &&
+ rm -f .git/post-checkout.args &&
+ git rebase $args HEAD rebase-fast-forward &&
+ read old new flag <.git/post-checkout.args &&
+ test_cmp_rev two $old &&
+ test_cmp_rev three $new &&
+ test $flag = 1
+ '
+
+ test_expect_success "rebase $args checkout does not remove untracked files" '
+ test_when_finished "test_might_fail git rebase --abort" &&
+ test_when_finished "rm -f .git/post-checkout.args" &&
+ git update-ref refs/heads/rebase-fast-forward three &&
+ git checkout two &&
+ rm -f .git/post-checkout.args &&
+ echo untracked >three.t &&
+ test_when_finished "rm three.t" &&
+ test_must_fail git rebase $args HEAD rebase-fast-forward 2>err &&
+ grep "untracked working tree files would be overwritten by checkout" err &&
+ test_path_is_missing .git/post-checkout.args
+
'
+}
+
+test_rebase --apply &&
+test_rebase --merge
test_expect_success 'post-checkout hook is triggered by clone' '
mkdir -p templates/hooks &&
diff --git a/t/t5406-remote-rejects.sh b/t/t5406-remote-rejects.sh
index 5c509db..dcbeb42 100755
--- a/t/t5406-remote-rejects.sh
+++ b/t/t5406-remote-rejects.sh
@@ -5,7 +5,7 @@
. ./test-lib.sh
test_expect_success 'setup' '
- write_script .git/hooks/update <<-\EOF &&
+ test_hook update <<-\EOF &&
exit 1
EOF
echo 1 >file &&
diff --git a/t/t5407-post-rewrite-hook.sh b/t/t5407-post-rewrite-hook.sh
index 6da8d76..5f3ff05 100755
--- a/t/t5407-post-rewrite-hook.sh
+++ b/t/t5407-post-rewrite-hook.sh
@@ -17,15 +17,13 @@
git checkout A^0 &&
test_commit E bar E &&
test_commit F foo F &&
- git checkout main
-'
+ git checkout main &&
-cat >.git/hooks/post-rewrite <<EOF
-#!/bin/sh
-echo \$@ > "$TRASH_DIRECTORY"/post-rewrite.args
-cat > "$TRASH_DIRECTORY"/post-rewrite.data
-EOF
-chmod u+x .git/hooks/post-rewrite
+ test_hook --setup post-rewrite <<-EOF
+ echo \$@ > "$TRASH_DIRECTORY"/post-rewrite.args
+ cat > "$TRASH_DIRECTORY"/post-rewrite.data
+ EOF
+'
clear_hook_input () {
rm -f post-rewrite.args post-rewrite.data
diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh
index 9f1a483..fa5de45 100755
--- a/t/t5409-colorize-remote-messages.sh
+++ b/t/t5409-colorize-remote-messages.sh
@@ -5,7 +5,7 @@
. ./test-lib.sh
test_expect_success 'setup' '
- write_script .git/hooks/update <<-\EOF &&
+ test_hook --setup update <<-\EOF &&
echo error: error
echo ERROR: also highlighted
echo hint: hint
diff --git a/t/t5410-receive-pack-alternates.sh b/t/t5410-receive-pack-alternates.sh
index 0b28e4e..7a45d4c 100755
--- a/t/t5410-receive-pack-alternates.sh
+++ b/t/t5410-receive-pack-alternates.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t5411-proc-receive-hook.sh b/t/t5411-proc-receive-hook.sh
index 98b0e81..92cf52c 100755
--- a/t/t5411-proc-receive-hook.sh
+++ b/t/t5411-proc-receive-hook.sh
@@ -36,7 +36,7 @@
TAG=$(git -C workbench rev-parse v123) &&
# setup pre-receive hook
- write_script upstream.git/hooks/pre-receive <<-\EOF &&
+ test_hook --setup -C upstream.git pre-receive <<-\EOF &&
exec >&2
echo "# pre-receive hook"
while read old new ref
@@ -46,7 +46,7 @@
EOF
# setup post-receive hook
- write_script upstream.git/hooks/post-receive <<-\EOF &&
+ test_hook --setup -C upstream.git post-receive <<-\EOF &&
exec >&2
echo "# post-receive hook"
while read old new ref
diff --git a/t/t5411/once-0010-report-status-v1.sh b/t/t5411/once-0010-report-status-v1.sh
index 297b109..f9ffb01 100644
--- a/t/t5411/once-0010-report-status-v1.sh
+++ b/t/t5411/once-0010-report-status-v1.sh
@@ -3,7 +3,7 @@
'
test_expect_success "setup proc-receive hook" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic1" \
diff --git a/t/t5411/test-0002-pre-receive-declined.sh b/t/t5411/test-0002-pre-receive-declined.sh
index 0c3490c..98a9d13 100644
--- a/t/t5411/test-0002-pre-receive-declined.sh
+++ b/t/t5411/test-0002-pre-receive-declined.sh
@@ -1,6 +1,6 @@
test_expect_success "setup pre-receive hook ($PROTOCOL)" '
mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" &&
- write_script "$upstream/hooks/pre-receive" <<-EOF
+ test_hook -C "$upstream" --clobber pre-receive <<-\EOF
exit 1
EOF
'
@@ -21,7 +21,7 @@
EOF
test_cmp expect actual &&
- test_cmp_refs -C "$upstream" <<-EOF
+ test_cmp_refs -C "$upstream" <<-\EOF
<COMMIT-A> refs/heads/main
EOF
'
diff --git a/t/t5411/test-0003-pre-receive-declined--porcelain.sh b/t/t5411/test-0003-pre-receive-declined--porcelain.sh
index 2393b04..67ca6dc 100644
--- a/t/t5411/test-0003-pre-receive-declined--porcelain.sh
+++ b/t/t5411/test-0003-pre-receive-declined--porcelain.sh
@@ -1,6 +1,6 @@
test_expect_success "setup pre-receive hook ($PROTOCOL/porcelain)" '
mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" &&
- write_script "$upstream/hooks/pre-receive" <<-EOF
+ test_hook -C "$upstream" --clobber pre-receive <<-\EOF
exit 1
EOF
'
diff --git a/t/t5411/test-0013-bad-protocol.sh b/t/t5411/test-0013-bad-protocol.sh
index c08a00d..8d22e17 100644
--- a/t/t5411/test-0013-bad-protocol.sh
+++ b/t/t5411/test-0013-bad-protocol.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v --version 2
EOF
@@ -40,7 +40,7 @@
'
test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v --die-read-version
EOF
@@ -65,13 +65,13 @@
grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
- test_cmp_refs -C "$upstream" <<-EOF
+ test_cmp_refs -C "$upstream" <<-\EOF
<COMMIT-A> refs/heads/main
EOF
'
test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v --die-write-version
EOF
@@ -102,7 +102,7 @@
'
test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v --die-read-commands
EOF
@@ -132,7 +132,7 @@
'
test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v --die-read-push-options
EOF
@@ -164,7 +164,7 @@
'
test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v --die-write-report
EOF
@@ -194,7 +194,7 @@
'
test_expect_success "setup proc-receive hook (no report, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v
EOF
@@ -236,7 +236,7 @@
'
test_expect_success "setup proc-receive hook (no ref, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok"
@@ -269,7 +269,7 @@
'
test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "xx refs/for/main/topic"
diff --git a/t/t5411/test-0014-bad-protocol--porcelain.sh b/t/t5411/test-0014-bad-protocol--porcelain.sh
index 3eaa597..298a3d1 100644
--- a/t/t5411/test-0014-bad-protocol--porcelain.sh
+++ b/t/t5411/test-0014-bad-protocol--porcelain.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v --version 2
EOF
@@ -40,7 +40,7 @@
'
test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v --die-read-version
EOF
@@ -71,7 +71,7 @@
'
test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v --die-write-version
EOF
@@ -102,7 +102,7 @@
'
test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v --die-read-commands
EOF
@@ -132,7 +132,7 @@
'
test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v --die-read-push-options
EOF
@@ -164,7 +164,7 @@
'
test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v --die-write-report
EOF
@@ -194,7 +194,7 @@
'
test_expect_success "setup proc-receive hook (no report, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v
EOF
@@ -236,7 +236,7 @@
'
test_expect_success "setup proc-receive hook (no ref, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok"
@@ -270,7 +270,7 @@
'
test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "xx refs/for/main/topic"
diff --git a/t/t5411/test-0020-report-ng.sh b/t/t5411/test-0020-report-ng.sh
index e915dbc..6347c96 100644
--- a/t/t5411/test-0020-report-ng.sh
+++ b/t/t5411/test-0020-report-ng.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ng refs/for/main/topic"
@@ -31,7 +31,7 @@
'
test_expect_success "setup proc-receive hook (ng message, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ng refs/for/main/topic error msg"
diff --git a/t/t5411/test-0021-report-ng--porcelain.sh b/t/t5411/test-0021-report-ng--porcelain.sh
index 2a392e0..502b34f 100644
--- a/t/t5411/test-0021-report-ng--porcelain.sh
+++ b/t/t5411/test-0021-report-ng--porcelain.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ng refs/for/main/topic"
@@ -32,7 +32,7 @@
'
test_expect_success "setup proc-receive hook (ng message, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ng refs/for/main/topic error msg"
diff --git a/t/t5411/test-0022-report-unexpect-ref.sh b/t/t5411/test-0022-report-unexpect-ref.sh
index f7a494b..7744392 100644
--- a/t/t5411/test-0022-report-unexpect-ref.sh
+++ b/t/t5411/test-0022-report-unexpect-ref.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/heads/main"
diff --git a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
index 63c479e..6d116ef 100644
--- a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
+++ b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/heads/main"
diff --git a/t/t5411/test-0024-report-unknown-ref.sh b/t/t5411/test-0024-report-unknown-ref.sh
index af055aa..619ca2f 100644
--- a/t/t5411/test-0024-report-unknown-ref.sh
+++ b/t/t5411/test-0024-report-unknown-ref.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic"
diff --git a/t/t5411/test-0025-report-unknown-ref--porcelain.sh b/t/t5411/test-0025-report-unknown-ref--porcelain.sh
index 99601ca..8b3f5d0 100644
--- a/t/t5411/test-0025-report-unknown-ref--porcelain.sh
+++ b/t/t5411/test-0025-report-unknown-ref--porcelain.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic"
diff --git a/t/t5411/test-0026-push-options.sh b/t/t5411/test-0026-push-options.sh
index fec5f95..6dfc7b1 100644
--- a/t/t5411/test-0026-push-options.sh
+++ b/t/t5411/test-0026-push-options.sh
@@ -1,6 +1,6 @@
test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL)" '
git -C "$upstream" config receive.advertisePushOptions false &&
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic"
@@ -31,7 +31,7 @@
'
test_expect_success "setup version=0 for proc-receive hook ($PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
--version 0 \
@@ -75,7 +75,7 @@
'
test_expect_success "restore proc-receive hook ($PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic"
diff --git a/t/t5411/test-0027-push-options--porcelain.sh b/t/t5411/test-0027-push-options--porcelain.sh
index 8fb75a8..768880b 100644
--- a/t/t5411/test-0027-push-options--porcelain.sh
+++ b/t/t5411/test-0027-push-options--porcelain.sh
@@ -1,6 +1,6 @@
test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL/porcelain)" '
git -C "$upstream" config receive.advertisePushOptions false &&
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic"
@@ -32,7 +32,7 @@
'
test_expect_success "setup version=0 for proc-receive hook ($PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
--version 0 \
@@ -78,7 +78,7 @@
'
test_expect_success "restore proc-receive hook ($PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic"
diff --git a/t/t5411/test-0030-report-ok.sh b/t/t5411/test-0030-report-ok.sh
index a3a6278..0f190a6 100644
--- a/t/t5411/test-0030-report-ok.sh
+++ b/t/t5411/test-0030-report-ok.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (ok, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic"
diff --git a/t/t5411/test-0031-report-ok--porcelain.sh b/t/t5411/test-0031-report-ok--porcelain.sh
index 0e17538..7ec3981 100644
--- a/t/t5411/test-0031-report-ok--porcelain.sh
+++ b/t/t5411/test-0031-report-ok--porcelain.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (ok, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic"
diff --git a/t/t5411/test-0032-report-with-options.sh b/t/t5411/test-0032-report-with-options.sh
index 988a430..07733b9 100644
--- a/t/t5411/test-0032-report-with-options.sh
+++ b/t/t5411/test-0032-report-with-options.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "option refname refs/pull/123/head" \
@@ -30,7 +30,7 @@
'
test_expect_success "setup proc-receive hook (option refname, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -62,7 +62,7 @@
'
test_expect_success "setup proc-receive hook (option refname and forced-update, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -95,7 +95,7 @@
'
test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -129,7 +129,7 @@
'
test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -161,7 +161,7 @@
'
test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -195,7 +195,7 @@
'
test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/a/b/c/topic" \
diff --git a/t/t5411/test-0033-report-with-options--porcelain.sh b/t/t5411/test-0033-report-with-options--porcelain.sh
index daacb3d..2e1831b 100644
--- a/t/t5411/test-0033-report-with-options--porcelain.sh
+++ b/t/t5411/test-0033-report-with-options--porcelain.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "option refname refs/pull/123/head" \
@@ -31,7 +31,7 @@
'
test_expect_success "setup proc-receive hook (option refname, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -64,7 +64,7 @@
'
test_expect_success "setup proc-receive hook (option refname and forced-update, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -99,7 +99,7 @@
'
test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -134,7 +134,7 @@
'
test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -167,7 +167,7 @@
'
test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -202,7 +202,7 @@
'
test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/a/b/c/topic" \
diff --git a/t/t5411/test-0034-report-ft.sh b/t/t5411/test-0034-report-ft.sh
index 73a47d1..0e37535 100644
--- a/t/t5411/test-0034-report-ft.sh
+++ b/t/t5411/test-0034-report-ft.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (ft, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
diff --git a/t/t5411/test-0035-report-ft--porcelain.sh b/t/t5411/test-0035-report-ft--porcelain.sh
index c350201..b9a0518 100644
--- a/t/t5411/test-0035-report-ft--porcelain.sh
+++ b/t/t5411/test-0035-report-ft--porcelain.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (fall-through, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-\EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
diff --git a/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh b/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
index 8c8a6c1..889e970 100644
--- a/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
+++ b/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
@@ -14,7 +14,7 @@
'
test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -87,7 +87,7 @@
'
test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -162,7 +162,7 @@
'
test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
diff --git a/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh
index bc44810..1e523b1 100644
--- a/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh
+++ b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -58,7 +58,7 @@
'
test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
@@ -119,7 +119,7 @@
'
test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/main/topic" \
diff --git a/t/t5411/test-0038-report-mixed-refs.sh b/t/t5411/test-0038-report-mixed-refs.sh
index e63fe7b..4c70e84 100644
--- a/t/t5411/test-0038-report-mixed-refs.sh
+++ b/t/t5411/test-0038-report-mixed-refs.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook ($PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/next/topic2" \
diff --git a/t/t5411/test-0039-report-mixed-refs--porcelain.sh b/t/t5411/test-0039-report-mixed-refs--porcelain.sh
index 99d17b7..40f4c5b 100644
--- a/t/t5411/test-0039-report-mixed-refs--porcelain.sh
+++ b/t/t5411/test-0039-report-mixed-refs--porcelain.sh
@@ -1,5 +1,5 @@
test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/next/topic2" \
diff --git a/t/t5411/test-0040-process-all-refs.sh b/t/t5411/test-0040-process-all-refs.sh
index 2f405ad..7ae3851 100644
--- a/t/t5411/test-0040-process-all-refs.sh
+++ b/t/t5411/test-0040-process-all-refs.sh
@@ -17,7 +17,7 @@
'
test_expect_success "setup proc-receive hook ($PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/heads/main" \
diff --git a/t/t5411/test-0041-process-all-refs--porcelain.sh b/t/t5411/test-0041-process-all-refs--porcelain.sh
index c884057..02e1e08 100644
--- a/t/t5411/test-0041-process-all-refs--porcelain.sh
+++ b/t/t5411/test-0041-process-all-refs--porcelain.sh
@@ -17,7 +17,7 @@
'
test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/heads/main" \
diff --git a/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh b/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh
index 31989f0..7efdfe5 100644
--- a/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh
+++ b/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh
@@ -9,7 +9,7 @@
'
test_expect_success "setup proc-receive hook ($PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/heads/main" \
@@ -70,7 +70,7 @@
'
test_expect_success "setup proc-receive hook ($PROTOCOL)" '
- write_script "$upstream/hooks/proc-receive" <<-EOF
+ test_hook -C "$upstream" --clobber proc-receive <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/heads/main" \
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 8a5d349..ee6d2dd 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -95,7 +95,7 @@
while [ $cur -le 10 ]; do
add A$cur $(eval echo \$A$prev) &&
prev=$cur &&
- cur=$(($cur+1))
+ cur=$(($cur+1)) || return 1
done &&
add B1 $A1 &&
git update-ref refs/heads/A "$ATIP" &&
@@ -112,7 +112,7 @@
while [ $cur -le 65 ]; do
add B$cur $(eval echo \$B$prev) &&
prev=$cur &&
- cur=$(($cur+1))
+ cur=$(($cur+1)) || return 1
done
'
@@ -464,11 +464,11 @@
test_expect_success 'setup tests for the --stdin parameter' '
for head in C D E F
do
- add $head
+ add $head || return 1
done &&
for head in A B C D E F
do
- git tag $head $head
+ git tag $head $head || return 1
done &&
cat >input <<-\EOF &&
refs/heads/C
@@ -927,7 +927,8 @@
)
'
-test_expect_success 'use ref advertisement to prune "have" lines sent' '
+test_negotiation_algorithm_default () {
+ test_when_finished rm -rf clientv0 clientv2 &&
rm -rf server client &&
git init server &&
test_commit -C server both_have_1 &&
@@ -946,7 +947,7 @@
rm -f trace &&
cp -r client clientv0 &&
GIT_TRACE_PACKET="$(pwd)/trace" git -C clientv0 \
- fetch origin server_has both_have_2 &&
+ "$@" fetch origin server_has both_have_2 &&
grep "have $(git -C client rev-parse client_has)" trace &&
grep "have $(git -C client rev-parse both_have_2)" trace &&
! grep "have $(git -C client rev-parse both_have_2^)" trace &&
@@ -954,10 +955,27 @@
rm -f trace &&
cp -r client clientv2 &&
GIT_TRACE_PACKET="$(pwd)/trace" git -C clientv2 -c protocol.version=2 \
- fetch origin server_has both_have_2 &&
+ "$@" fetch origin server_has both_have_2 &&
grep "have $(git -C client rev-parse client_has)" trace &&
grep "have $(git -C client rev-parse both_have_2)" trace &&
! grep "have $(git -C client rev-parse both_have_2^)" trace
+}
+
+test_expect_success 'use ref advertisement to prune "have" lines sent' '
+ test_negotiation_algorithm_default
+'
+
+test_expect_success 'same as last but with config overrides' '
+ test_negotiation_algorithm_default \
+ -c feature.experimental=true \
+ -c fetch.negotiationAlgorithm=consecutive
+'
+
+test_expect_success 'ensure bogus fetch.negotiationAlgorithm yields error' '
+ test_when_finished rm -rf clientv0 &&
+ cp -r client clientv0 &&
+ test_must_fail git -C clientv0 --fetch.negotiationAlgorithm=bogus \
+ fetch origin server_has both_have_2
'
test_expect_success 'filtering by size' '
diff --git a/t/t5502-quickfetch.sh b/t/t5502-quickfetch.sh
index 8c05c77..b160f8b 100755
--- a/t/t5502-quickfetch.sh
+++ b/t/t5502-quickfetch.sh
@@ -130,7 +130,7 @@
for i in 0 1 2 3 4 5 6 7 8 9; do
for j in 0 1 2 3 4 5 6 7 8 9; do
for k in 0 1 2 3 4 5 6 7 8 9; do
- echo "$branchprefix$i$j$k" >> .git/packed-refs
+ echo "$branchprefix$i$j$k" >> .git/packed-refs || return 1
done
done
done &&
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index 6e5a9c2..b0b795a 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -292,7 +292,7 @@
receive.fsck.missingEmail warn &&
git push --porcelain dst bogus >act 2>&1 &&
grep "missingEmail" act &&
- test_i18ngrep "Skipping unknown msg id.*whatever" act &&
+ test_i18ngrep "skipping unknown msg id.*whatever" act &&
git --git-dir=dst/.git branch -D bogus &&
git --git-dir=dst/.git config --add \
receive.fsck.missingEmail ignore &&
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index e6e3c8f..fff14e1 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -2,9 +2,6 @@
test_description='git remote porcelain-ish'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./test-lib.sh
setup_repository () {
@@ -81,6 +78,40 @@
)
'
+test_expect_success 'setup bare clone for server' '
+ git clone --bare "file://$(pwd)/one" srv.bare &&
+ git -C srv.bare config --local uploadpack.allowfilter 1 &&
+ git -C srv.bare config --local uploadpack.allowanysha1inwant 1
+'
+
+test_expect_success 'filters for promisor remotes are listed by git remote -v' '
+ test_when_finished "rm -rf pc" &&
+ git clone --filter=blob:none "file://$(pwd)/srv.bare" pc &&
+ git -C pc remote -v >out &&
+ grep "srv.bare (fetch) \[blob:none\]" out &&
+
+ git -C pc config remote.origin.partialCloneFilter object:type=commit &&
+ git -C pc remote -v >out &&
+ grep "srv.bare (fetch) \[object:type=commit\]" out
+'
+
+test_expect_success 'filters should not be listed for non promisor remotes (remote -v)' '
+ test_when_finished "rm -rf pc" &&
+ git clone one pc &&
+ git -C pc remote -v >out &&
+ ! grep "(fetch) \[.*\]" out
+'
+
+test_expect_success 'filters are listed by git remote -v only' '
+ test_when_finished "rm -rf pc" &&
+ git clone --filter=blob:none "file://$(pwd)/srv.bare" pc &&
+ git -C pc remote >out &&
+ ! grep "\[blob:none\]" out &&
+
+ git -C pc remote show >out &&
+ ! grep "\[blob:none\]" out
+'
+
test_expect_success 'check remote-tracking' '
(
cd test &&
@@ -756,7 +787,9 @@
(
cd four &&
git config branch.main.pushRemote origin &&
- git remote rename origin upstream &&
+ GIT_TRACE2_EVENT=$(pwd)/trace \
+ git remote rename --progress origin upstream &&
+ test_region progress "Renaming remote references" trace &&
grep "pushRemote" .git/config &&
test -z "$(git for-each-ref refs/remotes/origin)" &&
test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/main" &&
@@ -1332,7 +1365,6 @@
(
cd test &&
git tag -a -m "Some tag" some-tag main &&
- exit_with=true &&
for type in commit tag tree blob
do
if test "$type" = "blob"
@@ -1348,9 +1380,8 @@
push origin $oid:dst 2>err &&
test_i18ngrep "error: The destination you" err &&
test_i18ngrep ! "hint: Did you mean" err ||
- exit_with=false
- done &&
- $exit_with
+ exit 1
+ done
)
'
diff --git a/t/t5506-remote-groups.sh b/t/t5506-remote-groups.sh
index 8f150c0..5bac03e 100755
--- a/t/t5506-remote-groups.sh
+++ b/t/t5506-remote-groups.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
mark() {
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index a0faf0d..4620f0c 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -5,9 +5,6 @@
'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-bundle.sh
@@ -40,11 +37,11 @@
git config branch.main.remote two &&
git config branch.main.merge refs/heads/one &&
mkdir -p .git/remotes &&
- {
- echo "URL: ../two/.git/"
- echo "Pull: refs/heads/main:refs/heads/two"
- echo "Pull: refs/heads/one:refs/heads/one"
- } >.git/remotes/two
+ cat >.git/remotes/two <<-\EOF
+ URL: ../two/.git/
+ Pull: refs/heads/main:refs/heads/two
+ Pull: refs/heads/one:refs/heads/one
+ EOF
) &&
git clone . bundle &&
git clone . seven
@@ -71,7 +68,7 @@
main_in_two=$(cd ../two && git rev-parse main) &&
one_in_two=$(cd ../two && git rev-parse one) &&
{
- echo "$one_in_two "
+ echo "$one_in_two " &&
echo "$main_in_two not-for-merge"
} >expected &&
cut -f -2 .git/FETCH_HEAD >actual &&
@@ -167,6 +164,17 @@
git rev-parse sometag
'
+test_expect_success REFFILES 'fetch --prune fails to delete branches' '
+ cd "$D" &&
+ git clone . prune-fail &&
+ cd prune-fail &&
+ git update-ref refs/remotes/origin/extrabranch main &&
+ : this will prevent --prune from locking packed-refs for deleting refs, but adding loose refs still succeeds &&
+ >.git/packed-refs.new &&
+
+ test_must_fail git fetch --prune origin
+'
+
test_expect_success 'fetch --atomic works with a single branch' '
test_when_finished "rm -rf \"$D\"/atomic" &&
@@ -265,7 +273,7 @@
EOF
rm -f atomic/actual &&
- write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
+ test_hook -C atomic reference-transaction <<-\EOF &&
( echo "$*" && cat ) >>actual
EOF
@@ -298,7 +306,7 @@
EOF
rm -f atomic/actual &&
- write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
+ test_hook -C atomic/.git reference-transaction <<-\EOF &&
( echo "$*" && cat ) >>actual
exit 1
EOF
@@ -326,7 +334,7 @@
test_line_count = 2 atomic/.git/FETCH_HEAD &&
cp atomic/.git/FETCH_HEAD expected &&
- write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
+ test_hook -C atomic reference-transaction <<-\EOF &&
exit 1
EOF
@@ -550,7 +558,7 @@
git bundle list-heads bundle5 >actual &&
for h in HEAD refs/heads/main
do
- echo "$(git rev-parse --verify $h) $h"
+ echo "$(git rev-parse --verify $h) $h" || return 1
done >expect &&
test_cmp expect actual
diff --git a/t/t5511-refspec.sh b/t/t5511-refspec.sh
index be025b9..fc55681 100755
--- a/t/t5511-refspec.sh
+++ b/t/t5511-refspec.sh
@@ -2,6 +2,7 @@
test_description='refspec parsing'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_refspec () {
diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index f53f588..20d063f 100755
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -15,6 +15,10 @@
done
}
+test_expect_success 'dies when no remote found' '
+ test_must_fail git ls-remote
+'
+
test_expect_success setup '
>file &&
git add file &&
@@ -30,7 +34,8 @@
git show-ref -d >refs &&
sed -e "s/ / /" refs >>expected.all &&
- git remote add self "$(pwd)/.git"
+ git remote add self "$(pwd)/.git" &&
+ git remote add self2 "."
'
test_expect_success 'ls-remote --tags .git' '
@@ -83,11 +88,17 @@
test_cmp expect actual
'
-test_expect_success 'dies when no remote specified and no default remotes found' '
+test_expect_success 'dies when no remote specified, multiple remotes found, and no default specified' '
test_must_fail git ls-remote
'
-test_expect_success 'use "origin" when no remote specified' '
+test_expect_success 'succeeds when no remote specified but only one found' '
+ test_when_finished git remote add self2 "." &&
+ git remote remove self2 &&
+ git ls-remote
+'
+
+test_expect_success 'use "origin" when no remote specified and multiple found' '
URL="$(pwd)/.git" &&
echo "From $URL" >exp_err &&
diff --git a/t/t5513-fetch-track.sh b/t/t5513-fetch-track.sh
index 65d1e05..c46c4db 100755
--- a/t/t5513-fetch-track.sh
+++ b/t/t5513-fetch-track.sh
@@ -2,6 +2,7 @@
test_description='fetch follows remote-tracking branches correctly'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 50f1410..c100a80 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -14,6 +14,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
build_script () {
@@ -105,19 +106,19 @@
remotes="$remotes config-glob" &&
mkdir -p .git/remotes &&
- {
- echo "URL: ../.git/"
- echo "Pull: refs/heads/main:remotes/rem/main"
- echo "Pull: refs/heads/one:remotes/rem/one"
- echo "Pull: two:remotes/rem/two"
- echo "Pull: refs/heads/three:remotes/rem/three"
- } >.git/remotes/remote-explicit &&
+ cat >.git/remotes/remote-explicit <<-\EOF &&
+ URL: ../.git/
+ Pull: refs/heads/main:remotes/rem/main
+ Pull: refs/heads/one:remotes/rem/one
+ Pull: two:remotes/rem/two
+ Pull: refs/heads/three:remotes/rem/three
+ EOF
remotes="$remotes remote-explicit" &&
- {
- echo "URL: ../.git/"
- echo "Pull: refs/heads/*:refs/remotes/rem/*"
- } >.git/remotes/remote-glob &&
+ cat >.git/remotes/remote-glob <<-\EOF &&
+ URL: ../.git/
+ Pull: refs/heads/*:refs/remotes/rem/*
+ EOF
remotes="$remotes remote-glob" &&
mkdir -p .git/branches &&
@@ -133,7 +134,7 @@
git config branch.br-$remote-merge.merge refs/heads/three &&
git config branch.br-$remote-octopus.remote $remote &&
git config branch.br-$remote-octopus.merge refs/heads/one &&
- git config --add branch.br-$remote-octopus.merge two
+ git config --add branch.br-$remote-octopus.merge two || return 1
done &&
build_script sed_script
'
@@ -191,17 +192,17 @@
cp "$expect_r" expect_r &&
convert_expected expect_r sed_script &&
{
- echo "# $cmd"
- set x $cmd; shift
- git symbolic-ref HEAD refs/heads/$1 ; shift
- rm -f .git/FETCH_HEAD
+ echo "# $cmd" &&
+ set x $cmd && shift &&
+ git symbolic-ref HEAD refs/heads/$1 && shift &&
+ rm -f .git/FETCH_HEAD &&
git for-each-ref \
refs/heads refs/remotes/rem refs/tags |
while read val type refname
do
- git update-ref -d "$refname" "$val"
- done
- git fetch "$@" >/dev/null
+ git update-ref -d "$refname" "$val" || return 1
+ done &&
+ git fetch "$@" >/dev/null &&
cat .git/FETCH_HEAD
} >"$actual_f" &&
git show-ref >"$actual_r" &&
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index ff38563..e99c31f 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -23,14 +23,10 @@
mk_empty () {
repo_name="$1"
- rm -fr "$repo_name" &&
- mkdir "$repo_name" &&
- (
- cd "$repo_name" &&
- git init &&
- git config receive.denyCurrentBranch warn &&
- mv .git/hooks .git/hooks-disabled
- )
+ test_when_finished "rm -rf \"$repo_name\"" &&
+ test_path_is_missing "$repo_name" &&
+ git init "$repo_name" &&
+ git -C "$repo_name" config receive.denyCurrentBranch warn
}
mk_test () {
@@ -59,40 +55,28 @@
mk_test_with_hooks() {
repo_name=$1
mk_test "$@" &&
- (
- cd "$repo_name" &&
- mkdir .git/hooks &&
- cd .git/hooks &&
+ test_hook -C "$repo_name" pre-receive <<-'EOF' &&
+ cat - >>pre-receive.actual
+ EOF
- cat >pre-receive <<-'EOF' &&
- #!/bin/sh
- cat - >>pre-receive.actual
- EOF
+ test_hook -C "$repo_name" update <<-'EOF' &&
+ printf "%s %s %s\n" "$@" >>update.actual
+ EOF
- cat >update <<-'EOF' &&
- #!/bin/sh
- printf "%s %s %s\n" "$@" >>update.actual
- EOF
+ test_hook -C "$repo_name" post-receive <<-'EOF' &&
+ cat - >>post-receive.actual
+ EOF
- cat >post-receive <<-'EOF' &&
- #!/bin/sh
- cat - >>post-receive.actual
- EOF
-
- cat >post-update <<-'EOF' &&
- #!/bin/sh
- for ref in "$@"
- do
- printf "%s\n" "$ref" >>post-update.actual
- done
- EOF
-
- chmod +x pre-receive update post-receive post-update
- )
+ test_hook -C "$repo_name" post-update <<-'EOF'
+ for ref in "$@"
+ do
+ printf "%s\n" "$ref" >>post-update.actual
+ done
+ EOF
}
mk_child() {
- rm -rf "$2" &&
+ test_when_finished "rm -rf \"$2\"" &&
git clone "$1" "$2"
}
@@ -197,38 +181,50 @@
grep 'write_pack_file/wrote.*"value":"'$1'"' $2
}
-test_expect_success 'push with negotiation' '
- # Without negotiation
+test_expect_success 'push without negotiation' '
mk_empty testrepo &&
git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
test_commit -C testrepo unrelated_commit &&
git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
- echo now pushing without negotiation &&
+ test_when_finished "rm event" &&
GIT_TRACE2_EVENT="$(pwd)/event" git -c protocol.version=2 push testrepo refs/heads/main:refs/remotes/origin/main &&
- grep_wrote 5 event && # 2 commits, 2 trees, 1 blob
+ grep_wrote 5 event # 2 commits, 2 trees, 1 blob
+'
- # Same commands, but with negotiation
- rm event &&
+test_expect_success 'push with negotiation' '
mk_empty testrepo &&
git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
test_commit -C testrepo unrelated_commit &&
git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+ test_when_finished "rm event" &&
GIT_TRACE2_EVENT="$(pwd)/event" git -c protocol.version=2 -c push.negotiate=1 push testrepo refs/heads/main:refs/remotes/origin/main &&
grep_wrote 2 event # 1 commit, 1 tree
'
test_expect_success 'push with negotiation proceeds anyway even if negotiation fails' '
- rm event &&
mk_empty testrepo &&
git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
test_commit -C testrepo unrelated_commit &&
git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+ test_when_finished "rm event" &&
GIT_TEST_PROTOCOL_VERSION=0 GIT_TRACE2_EVENT="$(pwd)/event" \
git -c push.negotiate=1 push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
grep_wrote 5 event && # 2 commits, 2 trees, 1 blob
test_i18ngrep "push negotiation failed" err
'
+test_expect_success 'push with negotiation does not attempt to fetch submodules' '
+ mk_empty submodule_upstream &&
+ test_commit -C submodule_upstream submodule_commit &&
+ git submodule add ./submodule_upstream submodule &&
+ mk_empty testrepo &&
+ git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+ test_commit -C testrepo unrelated_commit &&
+ git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+ git -c submodule.recurse=true -c protocol.version=2 -c push.negotiate=1 push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
+ ! grep "Fetching submodule" err
+'
+
test_expect_success 'push without wildcard' '
mk_empty testrepo &&
@@ -676,7 +672,6 @@
mk_test testrepo heads/main &&
mk_child testrepo child &&
- mkdir testrepo/.git/hooks &&
echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
chmod +x testrepo/.git/hooks/pre-receive &&
(
@@ -1338,19 +1333,17 @@
test_expect_success 'fetch follows tags by default' '
mk_test testrepo heads/main &&
- rm -fr src dst &&
+ test_when_finished "rm -rf src" &&
git init src &&
(
cd src &&
git pull ../testrepo main &&
git tag -m "annotated" tag &&
git for-each-ref >tmp1 &&
- (
- cat tmp1
- sed -n "s|refs/heads/main$|refs/remotes/origin/main|p" tmp1
- ) |
+ sed -n "p; s|refs/heads/main$|refs/remotes/origin/main|p" tmp1 |
sort -k 3 >../expect
) &&
+ test_when_finished "rm -rf dst" &&
git init dst &&
(
cd dst &&
@@ -1376,8 +1369,9 @@
test_expect_success 'pushing a specific ref applies remote.$name.push as refmap' '
mk_test testrepo heads/main &&
- rm -fr src dst &&
+ test_when_finished "rm -rf src" &&
git init src &&
+ test_when_finished "rm -rf dst" &&
git init --bare dst &&
(
cd src &&
@@ -1400,8 +1394,9 @@
test_expect_success 'with no remote.$name.push, it is not used as refmap' '
mk_test testrepo heads/main &&
- rm -fr src dst &&
+ test_when_finished "rm -rf src" &&
git init src &&
+ test_when_finished "rm -rf dst" &&
git init --bare dst &&
(
cd src &&
@@ -1422,8 +1417,9 @@
test_expect_success 'with no remote.$name.push, upstream mapping is used' '
mk_test testrepo heads/main &&
- rm -fr src dst &&
+ test_when_finished "rm -rf src" &&
git init src &&
+ test_when_finished "rm -rf dst" &&
git init --bare dst &&
(
cd src &&
@@ -1451,8 +1447,9 @@
test_expect_success 'push does not follow tags by default' '
mk_test testrepo heads/main &&
- rm -fr src dst &&
+ test_when_finished "rm -rf src" &&
git init src &&
+ test_when_finished "rm -rf dst" &&
git init --bare dst &&
(
cd src &&
@@ -1474,8 +1471,9 @@
test_expect_success 'push --follow-tags only pushes relevant tags' '
mk_test testrepo heads/main &&
- rm -fr src dst &&
+ test_when_finished "rm -rf src" &&
git init src &&
+ test_when_finished "rm -rf dst" &&
git init --bare dst &&
(
cd src &&
@@ -1513,9 +1511,9 @@
'
test_expect_success 'pushing a tag pushes the tagged object' '
- rm -rf dst.git &&
blob=$(echo unreferenced | git hash-object -w --stdin) &&
git tag -m foo tag-of-blob $blob &&
+ test_when_finished "rm -rf dst.git" &&
git init --bare dst.git &&
git push dst.git tag-of-blob &&
# the receiving index-pack should have noticed
@@ -1526,7 +1524,7 @@
'
test_expect_success 'push into bare respects core.logallrefupdates' '
- rm -rf dst.git &&
+ test_when_finished "rm -rf dst.git" &&
git init --bare dst.git &&
git -C dst.git config core.logallrefupdates true &&
@@ -1544,7 +1542,7 @@
'
test_expect_success 'fetch into bare respects core.logallrefupdates' '
- rm -rf dst.git &&
+ test_when_finished "rm -rf dst.git" &&
git init --bare dst.git &&
(
cd dst.git &&
@@ -1565,6 +1563,7 @@
'
test_expect_success 'receive.denyCurrentBranch = updateInstead' '
+ mk_empty testrepo &&
git push testrepo main &&
(
cd testrepo &&
@@ -1667,7 +1666,7 @@
) &&
# (5) push into void
- rm -fr void &&
+ test_when_finished "rm -rf void" &&
git init void &&
(
cd void &&
@@ -1689,26 +1688,23 @@
'
test_expect_success 'updateInstead with push-to-checkout hook' '
- rm -fr testrepo &&
+ test_when_finished "rm -rf testrepo" &&
git init testrepo &&
- (
- cd testrepo &&
- git pull .. main &&
- git reset --hard HEAD^^ &&
- git tag initial &&
- git config receive.denyCurrentBranch updateInstead &&
- write_script .git/hooks/push-to-checkout <<-\EOF
- echo >&2 updating from $(git rev-parse HEAD)
- echo >&2 updating to "$1"
+ git -C testrepo pull .. main &&
+ git -C testrepo reset --hard HEAD^^ &&
+ git -C testrepo tag initial &&
+ git -C testrepo config receive.denyCurrentBranch updateInstead &&
+ test_hook -C testrepo push-to-checkout <<-\EOF &&
+ echo >&2 updating from $(git rev-parse HEAD)
+ echo >&2 updating to "$1"
- git update-index -q --refresh &&
- git read-tree -u -m HEAD "$1" || {
- status=$?
- echo >&2 read-tree failed
- exit $status
- }
- EOF
- ) &&
+ git update-index -q --refresh &&
+ git read-tree -u -m HEAD "$1" || {
+ status=$?
+ echo >&2 read-tree failed
+ exit $status
+ }
+ EOF
# Try pushing into a pristine
git push testrepo main &&
@@ -1751,35 +1747,32 @@
) &&
# push into void
- rm -fr void &&
+ test_when_finished "rm -rf void" &&
git init void &&
- (
- cd void &&
- git config receive.denyCurrentBranch updateInstead &&
- write_script .git/hooks/push-to-checkout <<-\EOF
- if git rev-parse --quiet --verify HEAD
- then
- has_head=yes
- echo >&2 updating from $(git rev-parse HEAD)
- else
- has_head=no
- echo >&2 pushing into void
- fi
- echo >&2 updating to "$1"
+ git -C void config receive.denyCurrentBranch updateInstead &&
+ test_hook -C void push-to-checkout <<-\EOF &&
+ if git rev-parse --quiet --verify HEAD
+ then
+ has_head=yes
+ echo >&2 updating from $(git rev-parse HEAD)
+ else
+ has_head=no
+ echo >&2 pushing into void
+ fi
+ echo >&2 updating to "$1"
- git update-index -q --refresh &&
- case "$has_head" in
- yes)
- git read-tree -u -m HEAD "$1" ;;
- no)
- git read-tree -u -m "$1" ;;
- esac || {
- status=$?
- echo >&2 read-tree failed
- exit $status
- }
- EOF
- ) &&
+ git update-index -q --refresh &&
+ case "$has_head" in
+ yes)
+ git read-tree -u -m HEAD "$1" ;;
+ no)
+ git read-tree -u -m "$1" ;;
+ esac || {
+ status=$?
+ echo >&2 read-tree failed
+ exit $status
+ }
+ EOF
git push void main &&
(
@@ -1798,6 +1791,46 @@
test_must_fail git -C cloned push origin HEAD:new-wt &&
test_config receive.denyCurrentBranch updateInstead &&
git -C cloned push origin HEAD:new-wt &&
+ test_path_exists new-wt/first.t &&
test_must_fail git -C cloned push --delete origin new-wt
'
+
+test_expect_success 'denyCurrentBranch and bare repository worktrees' '
+ test_when_finished "rm -fr bare.git" &&
+ git clone --bare . bare.git &&
+ git -C bare.git worktree add wt &&
+ test_commit grape &&
+ git -C bare.git config receive.denyCurrentBranch refuse &&
+ test_must_fail git push bare.git HEAD:wt &&
+ git -C bare.git config receive.denyCurrentBranch updateInstead &&
+ git push bare.git HEAD:wt &&
+ test_path_exists bare.git/wt/grape.t &&
+ test_must_fail git push --delete bare.git wt
+'
+
+test_expect_success 'refuse fetch to current branch of worktree' '
+ test_when_finished "git worktree remove --force wt && git branch -D wt" &&
+ git worktree add wt &&
+ test_commit apple &&
+ test_must_fail git fetch . HEAD:wt &&
+ git fetch -u . HEAD:wt
+'
+
+test_expect_success 'refuse fetch to current branch of bare repository worktree' '
+ test_when_finished "rm -fr bare.git" &&
+ git clone --bare . bare.git &&
+ git -C bare.git worktree add wt &&
+ test_commit banana &&
+ test_must_fail git -C bare.git fetch .. HEAD:wt &&
+ git -C bare.git fetch -u .. HEAD:wt
+'
+
+test_expect_success 'refuse to push a hidden ref, and make sure do not pollute the repository' '
+ mk_empty testrepo &&
+ git -C testrepo config receive.hiderefs refs/hidden &&
+ git -C testrepo config receive.unpackLimit 1 &&
+ test_must_fail git push testrepo HEAD:refs/hidden/foo &&
+ test_dir_is_empty testrepo/.git/objects/pack
+'
+
test_done
diff --git a/t/t5518-fetch-exit-status.sh b/t/t5518-fetch-exit-status.sh
index 5c4ac25..c131200 100755
--- a/t/t5518-fetch-exit-status.sh
+++ b/t/t5518-fetch-exit-status.sh
@@ -8,6 +8,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 672001a..0818080 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -330,6 +330,19 @@
test_cmp_rev HEAD to-rebase-ff
'
+test_expect_success '--rebase with rebase.autostash succeeds on ff' '
+ test_when_finished "rm -fr src dst actual" &&
+ git init src &&
+ test_commit -C src "initial" file "content" &&
+ git clone src dst &&
+ test_commit -C src --printf "more_content" file "more content\ncontent\n" &&
+ echo "dirty" >>dst/file &&
+ test_config -C dst rebase.autostash true &&
+ git -C dst pull --rebase >actual 2>&1 &&
+ grep -q "Fast-forward" actual &&
+ grep -q "Applied autostash." actual
+'
+
test_expect_success '--rebase with conflicts shows advice' '
test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
git checkout -b seq &&
@@ -546,15 +559,6 @@
test_cmp expect actual
'
-test_expect_success REBASE_P \
- 'pull.rebase=preserve rebases and merges keep-merge' '
- git reset --hard before-preserve-rebase &&
- test_config pull.rebase preserve &&
- git pull . copy &&
- test_cmp_rev HEAD^^ copy &&
- test_cmp_rev HEAD^2 keep-merge
-'
-
test_expect_success 'pull.rebase=interactive' '
write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
echo I was here >fake.out &&
@@ -598,7 +602,7 @@
test_expect_success '--rebase=true rebases and flattens keep-merge' '
git reset --hard before-preserve-rebase &&
- test_config pull.rebase preserve &&
+ test_config pull.rebase merges &&
git pull --rebase=true . copy &&
test_cmp_rev HEAD^^ copy &&
echo file3 >expect &&
@@ -606,23 +610,14 @@
test_cmp expect actual
'
-test_expect_success REBASE_P \
- '--rebase=preserve rebases and merges keep-merge' '
- git reset --hard before-preserve-rebase &&
- test_config pull.rebase true &&
- git pull --rebase=preserve . copy &&
- test_cmp_rev HEAD^^ copy &&
- test_cmp_rev HEAD^2 keep-merge
-'
-
test_expect_success '--rebase=invalid fails' '
git reset --hard before-preserve-rebase &&
test_must_fail git pull --rebase=invalid . copy
'
-test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
+test_expect_success '--rebase overrides pull.rebase=merges and flattens keep-merge' '
git reset --hard before-preserve-rebase &&
- test_config pull.rebase preserve &&
+ test_config pull.rebase merges &&
git pull --rebase . copy &&
test_cmp_rev HEAD^^ copy &&
echo file3 >expect &&
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 7601c91..264de29 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -228,4 +228,28 @@
test_must_be_empty actual
'
+test_expect_success 'git pull --no-verify flag passed to merge' '
+ test_when_finished "rm -fr src dst actual" &&
+ git init src &&
+ test_commit -C src one &&
+ git clone src dst &&
+ test_hook -C dst commit-msg <<-\EOF &&
+ false
+ EOF
+ test_commit -C src two &&
+ git -C dst pull --no-ff --no-verify
+'
+
+test_expect_success 'git pull --no-verify --verify passed to merge' '
+ test_when_finished "rm -fr src dst actual" &&
+ git init src &&
+ test_commit -C src one &&
+ git clone src dst &&
+ test_hook -C dst commit-msg <<-\EOF &&
+ false
+ EOF
+ test_commit -C src two &&
+ test_must_fail git -C dst pull --no-ff --no-verify --verify
+'
+
test_done
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index ed11569..a301b56 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -3,40 +3,129 @@
test_description='Recursive "git fetch" for submodules'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
. ./test-lib.sh
pwd=$(pwd)
-add_upstream_commit() {
+write_expected_sub () {
+ NEW_HEAD=$1 &&
+ SUPER_HEAD=$2 &&
+ cat >"$pwd/expect.err.sub" <<-EOF
+ Fetching submodule submodule${SUPER_HEAD:+ at commit $SUPER_HEAD}
+ From $pwd/submodule
+ OLD_HEAD..$NEW_HEAD sub -> origin/sub
+ EOF
+}
+
+write_expected_sub2 () {
+ NEW_HEAD=$1 &&
+ SUPER_HEAD=$2 &&
+ cat >"$pwd/expect.err.sub2" <<-EOF
+ Fetching submodule submodule2${SUPER_HEAD:+ at commit $SUPER_HEAD}
+ From $pwd/submodule2
+ OLD_HEAD..$NEW_HEAD sub2 -> origin/sub2
+ EOF
+}
+
+write_expected_deep () {
+ NEW_HEAD=$1 &&
+ SUB_HEAD=$2 &&
+ cat >"$pwd/expect.err.deep" <<-EOF
+ Fetching submodule submodule/subdir/deepsubmodule${SUB_HEAD:+ at commit $SUB_HEAD}
+ From $pwd/deepsubmodule
+ OLD_HEAD..$NEW_HEAD deep -> origin/deep
+ EOF
+}
+
+write_expected_super () {
+ NEW_HEAD=$1 &&
+ cat >"$pwd/expect.err.super" <<-EOF
+ From $pwd/.
+ OLD_HEAD..$NEW_HEAD super -> origin/super
+ EOF
+}
+
+# For each submodule in the test setup, this creates a commit and writes
+# a file that contains the expected err if that new commit were fetched.
+# These output files get concatenated in the right order by
+# verify_fetch_result().
+add_submodule_commits () {
(
cd submodule &&
- head1=$(git rev-parse --short HEAD) &&
echo new >> subfile &&
test_tick &&
git add subfile &&
git commit -m new subfile &&
- head2=$(git rev-parse --short HEAD) &&
- echo "Fetching submodule submodule" > ../expect.err &&
- echo "From $pwd/submodule" >> ../expect.err &&
- echo " $head1..$head2 sub -> origin/sub" >> ../expect.err
+ new_head=$(git rev-parse --short HEAD) &&
+ write_expected_sub $new_head
) &&
(
cd deepsubmodule &&
- head1=$(git rev-parse --short HEAD) &&
echo new >> deepsubfile &&
test_tick &&
git add deepsubfile &&
git commit -m new deepsubfile &&
- head2=$(git rev-parse --short HEAD) &&
- echo "Fetching submodule submodule/subdir/deepsubmodule" >> ../expect.err
- echo "From $pwd/deepsubmodule" >> ../expect.err &&
- echo " $head1..$head2 deep -> origin/deep" >> ../expect.err
+ new_head=$(git rev-parse --short HEAD) &&
+ write_expected_deep $new_head
)
}
+# For each superproject in the test setup, update its submodule, add the
+# submodule and create a new commit with the submodule change.
+#
+# This requires add_submodule_commits() to be called first, otherwise
+# the submodules will not have changed and cannot be "git add"-ed.
+add_superproject_commits () {
+ (
+ cd submodule &&
+ (
+ cd subdir/deepsubmodule &&
+ git fetch &&
+ git checkout -q FETCH_HEAD
+ ) &&
+ git add subdir/deepsubmodule &&
+ git commit -m "new deep submodule"
+ ) &&
+ git add submodule &&
+ git commit -m "new submodule" &&
+ super_head=$(git rev-parse --short HEAD) &&
+ sub_head=$(git -C submodule rev-parse --short HEAD) &&
+ write_expected_super $super_head &&
+ write_expected_sub $sub_head
+}
+
+# Verifies that the expected repositories were fetched. This is done by
+# concatenating the files expect.err.[super|sub|deep] in the correct
+# order and comparing it to the actual stderr.
+#
+# If a repo should not be fetched in the test, its corresponding
+# expect.err file should be rm-ed.
+verify_fetch_result () {
+ ACTUAL_ERR=$1 &&
+ rm -f expect.err.combined &&
+ if test -f expect.err.super
+ then
+ cat expect.err.super >>expect.err.combined
+ fi &&
+ if test -f expect.err.sub
+ then
+ cat expect.err.sub >>expect.err.combined
+ fi &&
+ if test -f expect.err.deep
+ then
+ cat expect.err.deep >>expect.err.combined
+ fi &&
+ if test -f expect.err.sub2
+ then
+ cat expect.err.sub2 >>expect.err.combined
+ fi &&
+ sed -e 's/[0-9a-f][0-9a-f]*\.\./OLD_HEAD\.\./' "$ACTUAL_ERR" >actual.err.cmp &&
+ test_cmp expect.err.combined actual.err.cmp
+}
+
test_expect_success setup '
mkdir deepsubmodule &&
(
@@ -68,38 +157,38 @@
'
test_expect_success "fetch --recurse-submodules recurses into submodules" '
- add_upstream_commit &&
+ add_submodule_commits &&
(
cd downstream &&
git fetch --recurse-submodules >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err actual.err
+ verify_fetch_result actual.err
'
test_expect_success "submodule.recurse option triggers recursive fetch" '
- add_upstream_commit &&
+ add_submodule_commits &&
(
cd downstream &&
git -c submodule.recurse fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err actual.err
+ verify_fetch_result actual.err
'
test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" '
- add_upstream_commit &&
+ add_submodule_commits &&
(
cd downstream &&
GIT_TRACE="$TRASH_DIRECTORY/trace.out" git fetch --recurse-submodules -j2 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err actual.err &&
+ verify_fetch_result actual.err &&
grep "2 tasks" trace.out
'
test_expect_success "fetch alone only fetches superproject" '
- add_upstream_commit &&
+ add_submodule_commits &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
@@ -124,11 +213,11 @@
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err actual.err
+ verify_fetch_result actual.err
'
test_expect_success "--no-recurse-submodules overrides .gitmodules config" '
- add_upstream_commit &&
+ add_submodule_commits &&
(
cd downstream &&
git fetch --no-recurse-submodules >../actual.out 2>../actual.err
@@ -155,7 +244,7 @@
git config --unset submodule.submodule.fetchRecurseSubmodules
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err actual.err
+ verify_fetch_result actual.err
'
test_expect_success "--quiet propagates to submodules" '
@@ -177,13 +266,13 @@
'
test_expect_success "--dry-run propagates to submodules" '
- add_upstream_commit &&
+ add_submodule_commits &&
(
cd downstream &&
git fetch --recurse-submodules --dry-run >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err actual.err
+ verify_fetch_result actual.err
'
test_expect_success "Without --dry-run propagates to submodules" '
@@ -192,22 +281,22 @@
git fetch --recurse-submodules >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err actual.err
+ verify_fetch_result actual.err
'
test_expect_success "recurseSubmodules=true propagates into submodules" '
- add_upstream_commit &&
+ add_submodule_commits &&
(
cd downstream &&
git config fetch.recurseSubmodules true &&
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err actual.err
+ verify_fetch_result actual.err
'
test_expect_success "--recurse-submodules overrides config in submodule" '
- add_upstream_commit &&
+ add_submodule_commits &&
(
cd downstream &&
(
@@ -217,11 +306,11 @@
git fetch --recurse-submodules >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err actual.err
+ verify_fetch_result actual.err
'
test_expect_success "--no-recurse-submodules overrides config setting" '
- add_upstream_commit &&
+ add_submodule_commits &&
(
cd downstream &&
git config fetch.recurseSubmodules true &&
@@ -246,36 +335,34 @@
'
test_expect_success "Recursion stops when no new submodule commits are fetched" '
- head1=$(git rev-parse --short HEAD) &&
git add submodule &&
git commit -m "new submodule" &&
- head2=$(git rev-parse --short HEAD) &&
- echo "From $pwd/." > expect.err.sub &&
- echo " $head1..$head2 super -> origin/super" >>expect.err.sub &&
- head -3 expect.err >> expect.err.sub &&
+ new_head=$(git rev-parse --short HEAD) &&
+ write_expected_super $new_head &&
+ rm expect.err.deep &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
- test_cmp expect.err.sub actual.err &&
+ verify_fetch_result actual.err &&
test_must_be_empty actual.out
'
test_expect_success "Recursion doesn't happen when new superproject commits don't change any submodules" '
- add_upstream_commit &&
- head1=$(git rev-parse --short HEAD) &&
+ add_submodule_commits &&
echo a > file &&
git add file &&
git commit -m "new file" &&
- head2=$(git rev-parse --short HEAD) &&
- echo "From $pwd/." > expect.err.file &&
- echo " $head1..$head2 super -> origin/super" >> expect.err.file &&
+ new_head=$(git rev-parse --short HEAD) &&
+ write_expected_super $new_head &&
+ rm expect.err.sub &&
+ rm expect.err.deep &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err.file actual.err
+ verify_fetch_result actual.err
'
test_expect_success "Recursion picks up config in submodule" '
@@ -287,14 +374,11 @@
git config fetch.recurseSubmodules true
)
) &&
- add_upstream_commit &&
- head1=$(git rev-parse --short HEAD) &&
+ add_submodule_commits &&
git add submodule &&
git commit -m "new submodule" &&
- head2=$(git rev-parse --short HEAD) &&
- echo "From $pwd/." > expect.err.sub &&
- echo " $head1..$head2 super -> origin/super" >> expect.err.sub &&
- cat expect.err >> expect.err.sub &&
+ new_head=$(git rev-parse --short HEAD) &&
+ write_expected_super $new_head &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err &&
@@ -303,60 +387,23 @@
git config --unset fetch.recurseSubmodules
)
) &&
- test_cmp expect.err.sub actual.err &&
+ verify_fetch_result actual.err &&
test_must_be_empty actual.out
'
test_expect_success "Recursion picks up all submodules when necessary" '
- add_upstream_commit &&
- (
- cd submodule &&
- (
- cd subdir/deepsubmodule &&
- git fetch &&
- git checkout -q FETCH_HEAD
- ) &&
- head1=$(git rev-parse --short HEAD^) &&
- git add subdir/deepsubmodule &&
- git commit -m "new deepsubmodule" &&
- head2=$(git rev-parse --short HEAD) &&
- echo "Fetching submodule submodule" > ../expect.err.sub &&
- echo "From $pwd/submodule" >> ../expect.err.sub &&
- echo " $head1..$head2 sub -> origin/sub" >> ../expect.err.sub
- ) &&
- head1=$(git rev-parse --short HEAD) &&
- git add submodule &&
- git commit -m "new submodule" &&
- head2=$(git rev-parse --short HEAD) &&
- echo "From $pwd/." > expect.err.2 &&
- echo " $head1..$head2 super -> origin/super" >> expect.err.2 &&
- cat expect.err.sub >> expect.err.2 &&
- tail -3 expect.err >> expect.err.2 &&
+ add_submodule_commits &&
+ add_superproject_commits &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
- test_cmp expect.err.2 actual.err &&
+ verify_fetch_result actual.err &&
test_must_be_empty actual.out
'
test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)" '
- add_upstream_commit &&
- (
- cd submodule &&
- (
- cd subdir/deepsubmodule &&
- git fetch &&
- git checkout -q FETCH_HEAD
- ) &&
- head1=$(git rev-parse --short HEAD^) &&
- git add subdir/deepsubmodule &&
- git commit -m "new deepsubmodule" &&
- head2=$(git rev-parse --short HEAD) &&
- echo Fetching submodule submodule > ../expect.err.sub &&
- echo "From $pwd/submodule" >> ../expect.err.sub &&
- echo " $head1..$head2 sub -> origin/sub" >> ../expect.err.sub
- ) &&
+ add_submodule_commits &&
(
cd downstream &&
git config fetch.recurseSubmodules true &&
@@ -368,15 +415,8 @@
'
test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" '
- head1=$(git rev-parse --short HEAD) &&
- git add submodule &&
- git commit -m "new submodule" &&
- head2=$(git rev-parse --short HEAD) &&
- tail -3 expect.err > expect.err.deepsub &&
- echo "From $pwd/." > expect.err &&
- echo " $head1..$head2 super -> origin/super" >>expect.err &&
- cat expect.err.sub >> expect.err &&
- cat expect.err.deepsub >> expect.err &&
+ add_submodule_commits &&
+ add_superproject_commits &&
(
cd downstream &&
git config fetch.recurseSubmodules false &&
@@ -392,24 +432,165 @@
)
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err actual.err
+ verify_fetch_result actual.err
+'
+
+# These tests verify that we can fetch submodules that aren't in the
+# index.
+#
+# First, test the simple case where the index is empty and we only fetch
+# submodules that are not in the index.
+test_expect_success 'setup downstream branch without submodules' '
+ (
+ cd downstream &&
+ git checkout --recurse-submodules -b no-submodules &&
+ git rm .gitmodules &&
+ git rm submodule &&
+ git commit -m "no submodules" &&
+ git checkout --recurse-submodules super
+ )
+'
+
+test_expect_success "'--recurse-submodules=on-demand' should fetch submodule commits if the submodule is changed but the index has no submodules" '
+ add_submodule_commits &&
+ add_superproject_commits &&
+ # Fetch the new superproject commit
+ (
+ cd downstream &&
+ git switch --recurse-submodules no-submodules &&
+ git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err
+ ) &&
+ super_head=$(git rev-parse --short HEAD) &&
+ sub_head=$(git -C submodule rev-parse --short HEAD) &&
+ deep_head=$(git -C submodule/subdir/deepsubmodule rev-parse --short HEAD) &&
+
+ # assert that these are fetched from commits, not the index
+ write_expected_sub $sub_head $super_head &&
+ write_expected_deep $deep_head $sub_head &&
+
+ test_must_be_empty actual.out &&
+ verify_fetch_result actual.err
+'
+
+test_expect_success "'--recurse-submodules' should fetch submodule commits if the submodule is changed but the index has no submodules" '
+ add_submodule_commits &&
+ add_superproject_commits &&
+ # Fetch the new superproject commit
+ (
+ cd downstream &&
+ git switch --recurse-submodules no-submodules &&
+ git fetch --recurse-submodules >../actual.out 2>../actual.err
+ ) &&
+ super_head=$(git rev-parse --short HEAD) &&
+ sub_head=$(git -C submodule rev-parse --short HEAD) &&
+ deep_head=$(git -C submodule/subdir/deepsubmodule rev-parse --short HEAD) &&
+
+ # assert that these are fetched from commits, not the index
+ write_expected_sub $sub_head $super_head &&
+ write_expected_deep $deep_head $sub_head &&
+
+ test_must_be_empty actual.out &&
+ verify_fetch_result actual.err
+'
+
+test_expect_success "'--recurse-submodules' should ignore changed, inactive submodules" '
+ add_submodule_commits &&
+ add_superproject_commits &&
+
+ # Fetch the new superproject commit
+ (
+ cd downstream &&
+ git switch --recurse-submodules no-submodules &&
+ git -c submodule.submodule.active=false fetch --recurse-submodules >../actual.out 2>../actual.err
+ ) &&
+ test_must_be_empty actual.out &&
+ super_head=$(git rev-parse --short HEAD) &&
+ write_expected_super $super_head &&
+ # Neither should be fetched because the submodule is inactive
+ rm expect.err.sub &&
+ rm expect.err.deep &&
+ verify_fetch_result actual.err
+'
+
+# Now that we know we can fetch submodules that are not in the index,
+# test that we can fetch index and non-index submodules in the same
+# operation.
+test_expect_success 'setup downstream branch with other submodule' '
+ mkdir submodule2 &&
+ (
+ cd submodule2 &&
+ git init &&
+ echo sub2content >sub2file &&
+ git add sub2file &&
+ git commit -a -m new &&
+ git branch -M sub2
+ ) &&
+ git checkout -b super-sub2-only &&
+ git submodule add "$pwd/submodule2" submodule2 &&
+ git commit -m "add sub2" &&
+ git checkout super &&
+ (
+ cd downstream &&
+ git fetch --recurse-submodules origin &&
+ git checkout super-sub2-only &&
+ # Explicitly run "git submodule update" because sub2 is new
+ # and has not been cloned.
+ git submodule update --init &&
+ git checkout --recurse-submodules super
+ )
+'
+
+test_expect_success "'--recurse-submodules' should fetch submodule commits in changed submodules and the index" '
+ test_when_finished "rm expect.err.sub2" &&
+ # Create new commit in origin/super
+ add_submodule_commits &&
+ add_superproject_commits &&
+
+ # Create new commit in origin/super-sub2-only
+ git checkout super-sub2-only &&
+ (
+ cd submodule2 &&
+ test_commit --no-tag foo
+ ) &&
+ git add submodule2 &&
+ git commit -m "new submodule2" &&
+
+ git checkout super &&
+ (
+ cd downstream &&
+ git fetch --recurse-submodules >../actual.out 2>../actual.err
+ ) &&
+ test_must_be_empty actual.out &&
+ sub2_head=$(git -C submodule2 rev-parse --short HEAD) &&
+ super_head=$(git rev-parse --short super) &&
+ super_sub2_only_head=$(git rev-parse --short super-sub2-only) &&
+ write_expected_sub2 $sub2_head $super_sub2_only_head &&
+
+ # write_expected_super cannot handle >1 branch. Since this is a
+ # one-off, construct expect.err.super manually.
+ cat >"$pwd/expect.err.super" <<-EOF &&
+ From $pwd/.
+ OLD_HEAD..$super_head super -> origin/super
+ OLD_HEAD..$super_sub2_only_head super-sub2-only -> origin/super-sub2-only
+ EOF
+ verify_fetch_result actual.err
'
test_expect_success "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
- add_upstream_commit &&
- head1=$(git rev-parse --short HEAD) &&
+ add_submodule_commits &&
echo a >> file &&
git add file &&
git commit -m "new file" &&
- head2=$(git rev-parse --short HEAD) &&
- echo "From $pwd/." > expect.err.file &&
- echo " $head1..$head2 super -> origin/super" >> expect.err.file &&
+ new_head=$(git rev-parse --short HEAD) &&
+ write_expected_super $new_head &&
+ rm expect.err.sub &&
+ rm expect.err.deep &&
(
cd downstream &&
git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err.file actual.err
+ verify_fetch_result actual.err
'
test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config" '
@@ -417,15 +598,13 @@
cd downstream &&
git fetch --recurse-submodules
) &&
- add_upstream_commit &&
+ add_submodule_commits &&
git config --global fetch.recurseSubmodules false &&
- head1=$(git rev-parse --short HEAD) &&
git add submodule &&
git commit -m "new submodule" &&
- head2=$(git rev-parse --short HEAD) &&
- echo "From $pwd/." > expect.err.2 &&
- echo " $head1..$head2 super -> origin/super" >>expect.err.2 &&
- head -3 expect.err >> expect.err.2 &&
+ new_head=$(git rev-parse --short HEAD) &&
+ write_expected_super $new_head &&
+ rm expect.err.deep &&
(
cd downstream &&
git config fetch.recurseSubmodules on-demand &&
@@ -437,7 +616,7 @@
git config --unset fetch.recurseSubmodules
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err.2 actual.err
+ verify_fetch_result actual.err
'
test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
@@ -445,15 +624,13 @@
cd downstream &&
git fetch --recurse-submodules
) &&
- add_upstream_commit &&
+ add_submodule_commits &&
git config fetch.recurseSubmodules false &&
- head1=$(git rev-parse --short HEAD) &&
git add submodule &&
git commit -m "new submodule" &&
- head2=$(git rev-parse --short HEAD) &&
- echo "From $pwd/." > expect.err.2 &&
- echo " $head1..$head2 super -> origin/super" >>expect.err.2 &&
- head -3 expect.err >> expect.err.2 &&
+ new_head=$(git rev-parse --short HEAD) &&
+ write_expected_super $new_head &&
+ rm expect.err.deep &&
(
cd downstream &&
git config submodule.submodule.fetchRecurseSubmodules on-demand &&
@@ -465,7 +642,7 @@
git config --unset submodule.submodule.fetchRecurseSubmodules
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err.2 actual.err
+ verify_fetch_result actual.err
'
test_expect_success "don't fetch submodule when newly recorded commits are already present" '
@@ -473,18 +650,19 @@
cd submodule &&
git checkout -q HEAD^^
) &&
- head1=$(git rev-parse --short HEAD) &&
git add submodule &&
git commit -m "submodule rewound" &&
- head2=$(git rev-parse --short HEAD) &&
- echo "From $pwd/." > expect.err &&
- echo " $head1..$head2 super -> origin/super" >> expect.err &&
+ new_head=$(git rev-parse --short HEAD) &&
+ write_expected_super $new_head &&
+ rm expect.err.sub &&
+ # This file does not exist, but rm -f for readability
+ rm -f expect.err.deep &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err actual.err &&
+ verify_fetch_result actual.err &&
(
cd submodule &&
git checkout -q sub
@@ -496,15 +674,13 @@
cd downstream &&
git fetch --recurse-submodules
) &&
- add_upstream_commit &&
- head1=$(git rev-parse --short HEAD) &&
+ add_submodule_commits &&
git add submodule &&
git rm .gitmodules &&
git commit -m "new submodule without .gitmodules" &&
- head2=$(git rev-parse --short HEAD) &&
- echo "From $pwd/." >expect.err.2 &&
- echo " $head1..$head2 super -> origin/super" >>expect.err.2 &&
- head -3 expect.err >>expect.err.2 &&
+ new_head=$(git rev-parse --short HEAD) &&
+ write_expected_super $new_head &&
+ rm expect.err.deep &&
(
cd downstream &&
rm .gitmodules &&
@@ -520,7 +696,7 @@
git reset --hard
) &&
test_must_be_empty actual.out &&
- test_cmp expect.err.2 actual.err &&
+ verify_fetch_result actual.err &&
git checkout HEAD^ -- .gitmodules &&
git add .gitmodules &&
git commit -m "new submodule restored .gitmodules"
@@ -842,4 +1018,138 @@
test_cmp expect actual
'
+test_expect_success 'setup repo with upstreams that share a submodule name' '
+ mkdir same-name-1 &&
+ (
+ cd same-name-1 &&
+ git init -b main &&
+ test_commit --no-tag a
+ ) &&
+ git clone same-name-1 same-name-2 &&
+ # same-name-1 and same-name-2 both add a submodule with the
+ # name "submodule"
+ (
+ cd same-name-1 &&
+ mkdir submodule &&
+ git -C submodule init -b main &&
+ test_commit -C submodule --no-tag a1 &&
+ git submodule add "$pwd/same-name-1/submodule" &&
+ git add submodule &&
+ git commit -m "super-a1"
+ ) &&
+ (
+ cd same-name-2 &&
+ mkdir submodule &&
+ git -C submodule init -b main &&
+ test_commit -C submodule --no-tag a2 &&
+ git submodule add "$pwd/same-name-2/submodule" &&
+ git add submodule &&
+ git commit -m "super-a2"
+ ) &&
+ git clone same-name-1 -o same-name-1 same-name-downstream &&
+ (
+ cd same-name-downstream &&
+ git remote add same-name-2 ../same-name-2 &&
+ git fetch --all &&
+ # init downstream with same-name-1
+ git submodule update --init
+ )
+'
+
+test_expect_success 'fetch --recurse-submodules updates name-conflicted, populated submodule' '
+ test_when_finished "git -C same-name-downstream checkout main" &&
+ (
+ cd same-name-1 &&
+ test_commit -C submodule --no-tag b1 &&
+ git add submodule &&
+ git commit -m "super-b1"
+ ) &&
+ (
+ cd same-name-2 &&
+ test_commit -C submodule --no-tag b2 &&
+ git add submodule &&
+ git commit -m "super-b2"
+ ) &&
+ (
+ cd same-name-downstream &&
+ # even though the .gitmodules is correct, we cannot
+ # fetch from same-name-2
+ git checkout same-name-2/main &&
+ git fetch --recurse-submodules same-name-1 &&
+ test_must_fail git fetch --recurse-submodules same-name-2
+ ) &&
+ super_head1=$(git -C same-name-1 rev-parse HEAD) &&
+ git -C same-name-downstream cat-file -e $super_head1 &&
+
+ super_head2=$(git -C same-name-2 rev-parse HEAD) &&
+ git -C same-name-downstream cat-file -e $super_head2 &&
+
+ sub_head1=$(git -C same-name-1/submodule rev-parse HEAD) &&
+ git -C same-name-downstream/submodule cat-file -e $sub_head1 &&
+
+ sub_head2=$(git -C same-name-2/submodule rev-parse HEAD) &&
+ test_must_fail git -C same-name-downstream/submodule cat-file -e $sub_head2
+'
+
+test_expect_success 'fetch --recurse-submodules updates name-conflicted, unpopulated submodule' '
+ (
+ cd same-name-1 &&
+ test_commit -C submodule --no-tag c1 &&
+ git add submodule &&
+ git commit -m "super-c1"
+ ) &&
+ (
+ cd same-name-2 &&
+ test_commit -C submodule --no-tag c2 &&
+ git add submodule &&
+ git commit -m "super-c2"
+ ) &&
+ (
+ cd same-name-downstream &&
+ git checkout main &&
+ git rm .gitmodules &&
+ git rm submodule &&
+ git commit -m "no submodules" &&
+ git fetch --recurse-submodules same-name-1
+ ) &&
+ head1=$(git -C same-name-1/submodule rev-parse HEAD) &&
+ head2=$(git -C same-name-2/submodule rev-parse HEAD) &&
+ (
+ cd same-name-downstream/.git/modules/submodule &&
+ # The submodule has core.worktree pointing to the "git
+ # rm"-ed directory, overwrite the invalid value. See
+ # comment in get_fetch_task_from_changed() for more
+ # information.
+ git --work-tree=. cat-file -e $head1 &&
+ test_must_fail git --work-tree=. cat-file -e $head2
+ )
+'
+
+test_expect_success 'fetch --all with --recurse-submodules' '
+ test_when_finished "rm -fr src_clone" &&
+ git clone --recurse-submodules src src_clone &&
+ (
+ cd src_clone &&
+ git config submodule.recurse true &&
+ git config fetch.parallel 0 &&
+ git fetch --all 2>../fetch-log
+ ) &&
+ grep "^Fetching submodule sub$" fetch-log >fetch-subs &&
+ test_line_count = 1 fetch-subs
+'
+
+test_expect_success 'fetch --all with --recurse-submodules with multiple' '
+ test_when_finished "rm -fr src_clone" &&
+ git clone --recurse-submodules src src_clone &&
+ (
+ cd src_clone &&
+ git remote add secondary ../src &&
+ git config submodule.recurse true &&
+ git config fetch.parallel 0 &&
+ git fetch --all 2>../fetch-log
+ ) &&
+ grep "Fetching submodule sub" fetch-log >fetch-subs &&
+ test_line_count = 2 fetch-subs
+'
+
test_done
diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh
index f280e00..284e20f 100755
--- a/t/t5528-push-default.sh
+++ b/t/t5528-push-default.sh
@@ -94,13 +94,88 @@
test_must_fail git push parent2
'
-test_expect_success 'push from/to new branch with upstream, matching and simple' '
+test_expect_success '"current" does not push when multiple remotes and none origin' '
+ git checkout main &&
+ test_config push.default current &&
+ test_commit current-multi &&
+ test_must_fail git push
+'
+
+test_expect_success '"current" pushes when remote explicitly specified' '
+ git checkout main &&
+ test_config push.default current &&
+ test_commit current-specified &&
+ git push parent1
+'
+
+test_expect_success '"current" pushes to origin when no remote specified among multiple' '
+ git checkout main &&
+ test_config remote.origin.url repo1 &&
+ test_config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
+ test_commit current-origin &&
+ test_push_success current main
+'
+
+test_expect_success '"current" pushes to single remote even when not specified' '
+ git checkout main &&
+ test_when_finished git remote add parent1 repo1 &&
+ git remote remove parent1 &&
+ test_commit current-implied &&
+ test_push_success current main repo2
+'
+
+test_expect_success 'push from/to new branch with non-defaulted remote fails with upstream, matching, current and simple ' '
git checkout -b new-branch &&
test_push_failure simple &&
test_push_failure matching &&
+ test_push_failure upstream &&
+ test_push_failure current
+'
+
+test_expect_success 'push from/to new branch fails with upstream and simple ' '
+ git checkout -b new-branch-1 &&
+ test_config branch.new-branch-1.remote parent1 &&
+ test_push_failure simple &&
test_push_failure upstream
'
+# The behavior here is surprising but not entirely wrong:
+# - the current branch is used to determine the target remote
+# - the "matching" push default pushes matching branches, *ignoring* the
+# current new branch as it does not have upstream tracking
+# - the default push succeeds
+#
+# A previous test expected this to fail, but for the wrong reasons:
+# it expected a fail becaause the branch is new and cannot be pushed, but
+# in fact it was failing because of an ambiguous remote
+#
+test_expect_failure 'push from/to new branch fails with matching ' '
+ git checkout -b new-branch-2 &&
+ test_config branch.new-branch-2.remote parent1 &&
+ test_push_failure matching
+'
+
+test_expect_success 'push from/to branch with tracking fails with nothing ' '
+ git checkout -b tracked-branch &&
+ test_config branch.tracked-branch.remote parent1 &&
+ test_config branch.tracked-branch.merge refs/heads/tracked-branch &&
+ test_push_failure nothing
+'
+
+test_expect_success 'push from/to new branch succeeds with upstream if push.autoSetupRemote' '
+ git checkout -b new-branch-a &&
+ test_config push.autoSetupRemote true &&
+ test_config branch.new-branch-a.remote parent1 &&
+ test_push_success upstream new-branch-a
+'
+
+test_expect_success 'push from/to new branch succeeds with simple if push.autoSetupRemote' '
+ git checkout -b new-branch-c &&
+ test_config push.autoSetupRemote true &&
+ test_config branch.new-branch-c.remote parent1 &&
+ test_push_success simple new-branch-c
+'
+
test_expect_success '"matching" fails if none match' '
git init --bare empty &&
test_must_fail git push empty : 2>actual &&
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index d573ca4..3f58b51 100755
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -5,6 +5,9 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t5532-fetch-proxy.sh b/t/t5532-fetch-proxy.sh
index 9c27986..d664912 100755
--- a/t/t5532-fetch-proxy.sh
+++ b/t/t5532-fetch-proxy.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='fetching via git:// using core.gitproxy'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup remote repo' '
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index bba768f..7c0a148 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -35,8 +35,7 @@
test_expect_success 'unsigned push does not send push certificate' '
prepare_dst &&
- mkdir -p dst/.git/hooks &&
- write_script dst/.git/hooks/post-receive <<-\EOF &&
+ test_hook -C dst post-receive <<-\EOF &&
# discard the update list
cat >/dev/null
# record the push certificate
@@ -52,8 +51,7 @@
test_expect_success 'talking with a receiver without push certificate support' '
prepare_dst &&
- mkdir -p dst/.git/hooks &&
- write_script dst/.git/hooks/post-receive <<-\EOF &&
+ test_hook -C dst post-receive <<-\EOF &&
# discard the update list
cat >/dev/null
# record the push certificate
@@ -69,22 +67,19 @@
test_expect_success 'push --signed fails with a receiver without push certificate support' '
prepare_dst &&
- mkdir -p dst/.git/hooks &&
test_must_fail git push --signed dst noop ff +noff 2>err &&
test_i18ngrep "the receiving end does not support" err
'
test_expect_success 'push --signed=1 is accepted' '
prepare_dst &&
- mkdir -p dst/.git/hooks &&
test_must_fail git push --signed=1 dst noop ff +noff 2>err &&
test_i18ngrep "the receiving end does not support" err
'
test_expect_success GPG 'no certificate for a signed push with no update' '
prepare_dst &&
- mkdir -p dst/.git/hooks &&
- write_script dst/.git/hooks/post-receive <<-\EOF &&
+ test_hook -C dst post-receive <<-\EOF &&
if test -n "${GIT_PUSH_CERT-}"
then
git cat-file blob $GIT_PUSH_CERT >../push-cert
@@ -96,9 +91,8 @@
test_expect_success GPG 'signed push sends push certificate' '
prepare_dst &&
- mkdir -p dst/.git/hooks &&
git -C dst config receive.certnonceseed sekrit &&
- write_script dst/.git/hooks/post-receive <<-\EOF &&
+ test_hook -C dst post-receive <<-\EOF &&
# discard the update list
cat >/dev/null
# record the push certificate
@@ -137,6 +131,52 @@
test_cmp expect dst/push-cert-status
'
+test_expect_success GPGSSH 'ssh signed push sends push certificate' '
+ prepare_dst &&
+ git -C dst config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git -C dst config receive.certnonceseed sekrit &&
+ test_hook -C dst post-receive <<-\EOF &&
+ # discard the update list
+ cat >/dev/null
+ # record the push certificate
+ if test -n "${GIT_PUSH_CERT-}"
+ then
+ git cat-file blob $GIT_PUSH_CERT >../push-cert
+ fi &&
+
+ cat >../push-cert-status <<E_O_F
+ SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
+ KEY=${GIT_PUSH_CERT_KEY-nokey}
+ STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
+ NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
+ NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+ E_O_F
+
+ EOF
+
+ test_config gpg.format ssh &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+ FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
+ git push --signed dst noop ff +noff &&
+
+ (
+ cat <<-\EOF &&
+ SIGNER=principal with number 1
+ KEY=FINGERPRINT
+ STATUS=G
+ NONCE_STATUS=OK
+ EOF
+ sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
+ ) | sed -e "s|FINGERPRINT|$FINGERPRINT|" >expect &&
+
+ noop=$(git rev-parse noop) &&
+ ff=$(git rev-parse ff) &&
+ noff=$(git rev-parse noff) &&
+ grep "$noop $ff refs/heads/ff" dst/push-cert &&
+ grep "$noop $noff refs/heads/noff" dst/push-cert &&
+ test_cmp expect dst/push-cert-status
+'
+
test_expect_success GPG 'inconsistent push options in signed push not allowed' '
# First, invoke receive-pack with dummy input to obtain its preamble.
prepare_dst &&
@@ -176,9 +216,8 @@
test_expect_success GPG 'fail without key and heed user.signingkey' '
prepare_dst &&
- mkdir -p dst/.git/hooks &&
git -C dst config receive.certnonceseed sekrit &&
- write_script dst/.git/hooks/post-receive <<-\EOF &&
+ test_hook -C dst post-receive <<-\EOF &&
# discard the update list
cat >/dev/null
# record the push certificate
@@ -226,9 +265,8 @@
test_expect_success GPGSM 'fail without key and heed user.signingkey x509' '
test_config gpg.format x509 &&
prepare_dst &&
- mkdir -p dst/.git/hooks &&
git -C dst config receive.certnonceseed sekrit &&
- write_script dst/.git/hooks/post-receive <<-\EOF &&
+ test_hook -C dst post-receive <<-\EOF &&
# discard the update list
cat >/dev/null
# record the push certificate
@@ -276,6 +314,59 @@
test_cmp expect dst/push-cert-status
'
+test_expect_success GPGSSH 'fail without key and heed user.signingkey ssh' '
+ test_config gpg.format ssh &&
+ prepare_dst &&
+ git -C dst config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git -C dst config receive.certnonceseed sekrit &&
+ test_hook -C dst post-receive <<-\EOF &&
+ # discard the update list
+ cat >/dev/null
+ # record the push certificate
+ if test -n "${GIT_PUSH_CERT-}"
+ then
+ git cat-file blob $GIT_PUSH_CERT >../push-cert
+ fi &&
+
+ cat >../push-cert-status <<E_O_F
+ SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
+ KEY=${GIT_PUSH_CERT_KEY-nokey}
+ STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
+ NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
+ NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+ E_O_F
+
+ EOF
+
+ test_config user.email hasnokey@nowhere.com &&
+ test_config gpg.format ssh &&
+ test_config user.signingkey "" &&
+ (
+ sane_unset GIT_COMMITTER_EMAIL &&
+ test_must_fail git push --signed dst noop ff +noff
+ ) &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+ FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
+ git push --signed dst noop ff +noff &&
+
+ (
+ cat <<-\EOF &&
+ SIGNER=principal with number 1
+ KEY=FINGERPRINT
+ STATUS=G
+ NONCE_STATUS=OK
+ EOF
+ sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
+ ) | sed -e "s|FINGERPRINT|$FINGERPRINT|" >expect &&
+
+ noop=$(git rev-parse noop) &&
+ ff=$(git rev-parse ff) &&
+ noff=$(git rev-parse noff) &&
+ grep "$noop $ff refs/heads/ff" dst/push-cert &&
+ grep "$noop $noff refs/heads/noff" dst/push-cert &&
+ test_cmp expect dst/push-cert-status
+'
+
test_expect_success GPG 'failed atomic push does not execute GPG' '
prepare_dst &&
git -C dst config receive.certnonceseed sekrit &&
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index 11d5ea5..92948de 100755
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -161,6 +161,15 @@
)
'
+test_expect_success 'fetch --update-shallow into a repo with submodules' '
+ git init a-submodule &&
+ test_commit -C a-submodule foo &&
+ git init repo-with-sub &&
+ git -C repo-with-sub submodule add ../a-submodule a-submodule &&
+ git -C repo-with-sub commit -m "added submodule" &&
+ git -C repo-with-sub fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/*
+'
+
test_expect_success 'fetch --update-shallow (with fetch.writeCommitGraph)' '
(
cd shallow &&
diff --git a/t/t5540-http-push-webdav.sh b/t/t5540-http-push-webdav.sh
index 8b68bb3..37db3de 100755
--- a/t/t5540-http-push-webdav.sh
+++ b/t/t5540-http-push-webdav.sh
@@ -18,6 +18,12 @@
test_done
fi
+if test_have_prereq !REFFILES
+then
+ skip_all='skipping test; dumb HTTP protocol not supported with reftable.'
+ test_done
+fi
+
LIB_HTTPD_DAV=t
. "$TEST_DIRECTORY"/lib-httpd.sh
ROOT_PATH="$PWD"
@@ -36,7 +42,9 @@
git clone --bare test_repo test_repo.git &&
cd test_repo.git &&
git --bare update-server-info &&
- mv hooks/post-update.sample hooks/post-update &&
+ test_hook --setup post-update <<-\EOF &&
+ exec git update-server-info
+ EOF
ORIG_HEAD=$(git rev-parse --verify HEAD) &&
cd - &&
mv test_repo.git "$HTTPD_DOCUMENT_ROOT_PATH"
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index c024fa2..2f09ff4 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -96,18 +96,18 @@
test_must_fail git show-ref --verify refs/remotes/origin/dev
'
-cat >"$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update" <<EOF
-#!/bin/sh
-exit 1
-EOF
-chmod a+x "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
+test_expect_success 'setup rejected update hook' '
+ test_hook --setup -C "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git" update <<-\EOF &&
+ exit 1
+ EOF
-cat >exp <<EOF
-remote: error: hook declined to update refs/heads/dev2
-To http://127.0.0.1:$LIB_HTTPD_PORT/smart/test_repo.git
- ! [remote rejected] dev2 -> dev2 (hook declined)
-error: failed to push some refs to 'http://127.0.0.1:$LIB_HTTPD_PORT/smart/test_repo.git'
-EOF
+ cat >exp <<-EOF
+ remote: error: hook declined to update refs/heads/dev2
+ To http://127.0.0.1:$LIB_HTTPD_PORT/smart/test_repo.git
+ ! [remote rejected] dev2 -> dev2 (hook declined)
+ error: failed to push some refs to '\''http://127.0.0.1:$LIB_HTTPD_PORT/smart/test_repo.git'\''
+ EOF
+'
test_expect_success 'rejected update prints status' '
cd "$ROOT_PATH"/test_repo_clone &&
@@ -419,10 +419,7 @@
'
test_expect_success GPG 'push with post-receive to inspect certificate' '
- (
- cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
- mkdir -p hooks &&
- write_script hooks/post-receive <<-\EOF &&
+ test_hook -C "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git post-receive <<-\EOF &&
# discard the update list
cat >/dev/null
# record the push certificate
@@ -437,8 +434,9 @@
NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
NONCE=${GIT_PUSH_CERT_NONCE-nononce}
E_O_F
- EOF
-
+ EOF
+ (
+ cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
git config receive.certnonceseed sekrit &&
git config receive.certnonceslop 30
) &&
@@ -509,4 +507,20 @@
test_i18ngrep ! "^hint: " decoded
'
+test_expect_success 'report error server does not provide ref status' '
+ git init "$HTTPD_DOCUMENT_ROOT_PATH/no_report" &&
+ git -C "$HTTPD_DOCUMENT_ROOT_PATH/no_report" config http.receivepack true &&
+ test_must_fail git push --porcelain \
+ $HTTPD_URL_USER_PASS/smart/no_report \
+ HEAD:refs/tags/will-fail >actual &&
+ test_must_fail git -C "$HTTPD_DOCUMENT_ROOT_PATH/no_report" \
+ rev-parse --verify refs/tags/will-fail &&
+ cat >expect <<-EOF &&
+ To $HTTPD_URL/smart/no_report
+ ! HEAD:refs/tags/will-fail [remote failure] (remote failed to report status)
+ Done
+ EOF
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t5543-atomic-push.sh b/t/t5543-atomic-push.sh
index bfee461..7043112 100755
--- a/t/t5543-atomic-push.sh
+++ b/t/t5543-atomic-push.sh
@@ -162,16 +162,10 @@
test_commit two &&
git push --mirror up
) &&
- (
- cd upstream &&
- HOOKDIR="$(git rev-parse --git-dir)/hooks" &&
- HOOK="$HOOKDIR/update" &&
- mkdir -p "$HOOKDIR" &&
- write_script "$HOOK" <<-\EOF
- # only allow update to main from now on
- test "$1" = "refs/heads/main"
- EOF
- ) &&
+ test_hook -C upstream update <<-\EOF &&
+ # only allow update to main from now on
+ test "$1" = "refs/heads/main"
+ EOF
(
cd workbench &&
git checkout main &&
diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
index 58c7add..2142283 100755
--- a/t/t5545-push-options.sh
+++ b/t/t5545-push-options.sh
@@ -5,6 +5,9 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
. ./test-lib.sh
mk_repo_pair () {
diff --git a/t/t5547-push-quarantine.sh b/t/t5547-push-quarantine.sh
index faaa51c..1876fb3 100755
--- a/t/t5547-push-quarantine.sh
+++ b/t/t5547-push-quarantine.sh
@@ -5,7 +5,7 @@
test_expect_success 'create picky dest repo' '
git init --bare dest.git &&
- write_script dest.git/hooks/pre-receive <<-\EOF
+ test_hook --setup -C dest.git pre-receive <<-\EOF
while read old new ref; do
test "$(git log -1 --format=%s $new)" = reject && exit 1
done
@@ -60,7 +60,7 @@
test_expect_success 'updating a ref from quarantine is forbidden' '
git init --bare update.git &&
- write_script update.git/hooks/pre-receive <<-\EOF &&
+ test_hook -C update.git pre-receive <<-\EOF &&
read old new refname
git update-ref refs/heads/unrelated $new
exit 1
diff --git a/t/t5548-push-porcelain.sh b/t/t5548-push-porcelain.sh
index f11ff57..6282728 100755
--- a/t/t5548-push-porcelain.sh
+++ b/t/t5548-push-porcelain.sh
@@ -168,7 +168,7 @@
'
test_expect_success "prepare pre-receive hook ($PROTOCOL)" '
- write_script "$upstream/hooks/pre-receive" <<-EOF
+ test_hook --setup -C "$upstream" pre-receive <<-EOF
exit 1
EOF
'
diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
index 6d9142a..f0d9cd5 100755
--- a/t/t5550-http-fetch-dumb.sh
+++ b/t/t5550-http-fetch-dumb.sh
@@ -5,6 +5,13 @@
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
+
+if test_have_prereq !REFFILES
+then
+ skip_all='skipping test; dumb HTTP protocol not supported with reftable.'
+ test_done
+fi
+
. "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd
@@ -18,16 +25,17 @@
git commit -m two
'
+setup_post_update_server_info_hook () {
+ test_hook --setup -C "$1" post-update <<-\EOF &&
+ exec git update-server-info
+ EOF
+ git -C "$1" update-server-info
+}
+
test_expect_success 'create http-accessible bare repository with loose objects' '
cp -R .git "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
- (cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
- git config core.bare true &&
- mkdir -p hooks &&
- write_script "hooks/post-update" <<-\EOF &&
- exec git update-server-info
- EOF
- hooks/post-update
- ) &&
+ git -C "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" config core.bare true &&
+ setup_post_update_server_info_hook "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
git push public main:main
'
@@ -55,13 +63,7 @@
test_expect_success 'create empty remote repository' '
git init --bare "$HTTPD_DOCUMENT_ROOT_PATH/empty.git" &&
- (cd "$HTTPD_DOCUMENT_ROOT_PATH/empty.git" &&
- mkdir -p hooks &&
- write_script "hooks/post-update" <<-\EOF &&
- exec git update-server-info
- EOF
- hooks/post-update
- )
+ setup_post_update_server_info_hook "$HTTPD_DOCUMENT_ROOT_PATH/empty.git"
'
test_expect_success 'empty dumb HTTP repository has default hash algorithm' '
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index f92c79c..b9351a7 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -567,4 +567,11 @@
grep symref=HEAD:refs/heads/ trace
'
+test_expect_success 'passing hostname resolution information works' '
+ BOGUS_HOST=gitbogusexamplehost.invalid &&
+ BOGUS_HTTPD_URL=$HTTPD_PROTO://$BOGUS_HOST:$LIB_HTTPD_PORT &&
+ test_must_fail git ls-remote "$BOGUS_HTTPD_URL/smart/repo.git" >/dev/null &&
+ git -c "http.curloptResolve=$BOGUS_HOST:$LIB_HTTPD_PORT:127.0.0.1" ls-remote "$BOGUS_HTTPD_URL/smart/repo.git" >/dev/null
+'
+
test_done
diff --git a/t/t5552-skipping-fetch-negotiator.sh b/t/t5552-skipping-fetch-negotiator.sh
index 7b9fb4f..165427d 100755
--- a/t/t5552-skipping-fetch-negotiator.sh
+++ b/t/t5552-skipping-fetch-negotiator.sh
@@ -48,7 +48,7 @@
git init client &&
for i in $(test_seq 7)
do
- test_commit -C client c$i
+ test_commit -C client c$i || return 1
done &&
# We send: "c7" (skip 1) "c5" (skip 2) "c2" (skip 4). After that, since
@@ -68,7 +68,7 @@
git init client &&
for i in $(test_seq 11)
do
- test_commit -C client c$i
+ test_commit -C client c$i || return 1
done &&
git -C client checkout c5 &&
test_commit -C client c5side &&
@@ -155,14 +155,14 @@
for i in $(test_seq 8)
do
git -C client checkout --orphan b$i &&
- test_commit -C client b$i.c0
+ test_commit -C client b$i.c0 || return 1
done &&
for j in $(test_seq 19)
do
for i in $(test_seq 8)
do
git -C client checkout b$i &&
- test_commit -C client b$i.c$j
+ test_commit -C client b$i.c$j || return 1
done
done &&
@@ -201,7 +201,7 @@
# should still send the others (in this test, just check b2).
for i in $(test_seq 0 8)
do
- have_not_sent b1.c$i
+ have_not_sent b1.c$i || return 1
done &&
have_sent b2.c1 b2.c0
'
diff --git a/t/t5553-set-upstream.sh b/t/t5553-set-upstream.sh
index 9c12c0f..4805016 100755
--- a/t/t5553-set-upstream.sh
+++ b/t/t5553-set-upstream.sh
@@ -91,6 +91,17 @@
check_config_missing other2
'
+test_expect_success 'fetch --set-upstream with a detached HEAD' '
+ git checkout HEAD^0 &&
+ test_when_finished "git checkout -" &&
+ cat >expect <<-\EOF &&
+ warning: could not set upstream of HEAD to '"'"'main'"'"' from '"'"'upstream'"'"' when it does not point to any branch.
+ EOF
+ git fetch --set-upstream upstream main 2>actual.raw &&
+ grep ^warning: actual.raw >actual &&
+ test_cmp expect actual
+'
+
# tests for pull --set-upstream
test_expect_success 'setup bare parent pull' '
@@ -178,4 +189,15 @@
check_config_missing other2
'
+test_expect_success 'pull --set-upstream with a detached HEAD' '
+ git checkout HEAD^0 &&
+ test_when_finished "git checkout -" &&
+ cat >expect <<-\EOF &&
+ warning: could not set upstream of HEAD to '"'"'main'"'"' from '"'"'upstream'"'"' when it does not point to any branch.
+ EOF
+ git pull --no-rebase --set-upstream upstream main 2>actual.raw &&
+ grep ^warning: actual.raw >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t5555-http-smart-common.sh b/t/t5555-http-smart-common.sh
index 49faf5e..b1cfe8b 100755
--- a/t/t5555-http-smart-common.sh
+++ b/t/t5555-http-smart-common.sh
@@ -2,6 +2,7 @@
test_description='test functionality common to smart fetch & push'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t5562-http-backend-content-length.sh b/t/t5562-http-backend-content-length.sh
index 05a5806..b68ec22 100755
--- a/t/t5562-http-backend-content-length.sh
+++ b/t/t5562-http-backend-content-length.sh
@@ -63,7 +63,7 @@
hash_next=$(git commit-tree -p HEAD -m next HEAD^{tree}) &&
{
printf "%s %s refs/heads/newbranch\\0report-status object-format=%s\\n" \
- "$ZERO_OID" "$hash_next" "$(test_oid algo)" | packetize_raw
+ "$ZERO_OID" "$hash_next" "$(test_oid algo)" | packetize_raw &&
printf 0000 &&
echo "$hash_next" | git pack-objects --stdout
} >push_body &&
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index b87ca06..1131503 100755
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -194,7 +194,7 @@
test_expect_success FAKENC 'hostname interpolation works after LF-stripping' '
{
- printf "git-upload-pack /interp.git\n\0host=localhost" | packetize_raw
+ printf "git-upload-pack /interp.git\n\0host=localhost" | packetize_raw &&
printf "0000"
} >input &&
fake_nc "$GIT_DAEMON_HOST_PORT" <input >output &&
diff --git a/t/t5571-pre-push-hook.sh b/t/t5571-pre-push-hook.sh
index ad8d580..a11b20e 100755
--- a/t/t5571-pre-push-hook.sh
+++ b/t/t5571-pre-push-hook.sh
@@ -6,57 +6,66 @@
. ./test-lib.sh
-# Setup hook that always succeeds
-HOOKDIR="$(git rev-parse --git-dir)/hooks"
-HOOK="$HOOKDIR/pre-push"
-mkdir -p "$HOOKDIR"
-write_script "$HOOK" <<EOF
-cat >/dev/null
-exit 0
-EOF
-
test_expect_success 'setup' '
+ test_hook pre-push <<-\EOF &&
+ cat >actual
+ EOF
+
git config push.default upstream &&
git init --bare repo1 &&
git remote add parent1 repo1 &&
test_commit one &&
- git push parent1 HEAD:foreign
+ cat >expect <<-EOF &&
+ HEAD $(git rev-parse HEAD) refs/heads/foreign $(test_oid zero)
+ EOF
+
+ test_when_finished "rm actual" &&
+ git push parent1 HEAD:foreign &&
+ test_cmp expect actual
'
-write_script "$HOOK" <<EOF
-cat >/dev/null
-exit 1
-EOF
COMMIT1="$(git rev-parse HEAD)"
export COMMIT1
test_expect_success 'push with failing hook' '
+ test_hook pre-push <<-\EOF &&
+ cat >actual &&
+ exit 1
+ EOF
+
test_commit two &&
- test_must_fail git push parent1 HEAD
+ cat >expect <<-EOF &&
+ HEAD $(git rev-parse HEAD) refs/heads/main $(test_oid zero)
+ EOF
+
+ test_when_finished "rm actual" &&
+ test_must_fail git push parent1 HEAD &&
+ test_cmp expect actual
'
test_expect_success '--no-verify bypasses hook' '
- git push --no-verify parent1 HEAD
+ git push --no-verify parent1 HEAD &&
+ test_path_is_missing actual
'
COMMIT2="$(git rev-parse HEAD)"
export COMMIT2
-write_script "$HOOK" <<'EOF'
-echo "$1" >actual
-echo "$2" >>actual
-cat >>actual
-EOF
-
-cat >expected <<EOF
-parent1
-repo1
-refs/heads/main $COMMIT2 refs/heads/foreign $COMMIT1
-EOF
-
test_expect_success 'push with hook' '
+ test_hook --setup pre-push <<-\EOF &&
+ echo "$1" >actual
+ echo "$2" >>actual
+ cat >>actual
+ EOF
+
+ cat >expect <<-EOF &&
+ parent1
+ repo1
+ refs/heads/main $COMMIT2 refs/heads/foreign $COMMIT1
+ EOF
+
git push parent1 main:foreign &&
- diff expected actual
+ test_cmp expect actual
'
test_expect_success 'add a branch' '
@@ -67,64 +76,65 @@
COMMIT3="$(git rev-parse HEAD)"
export COMMIT3
-cat >expected <<EOF
-parent1
-repo1
-refs/heads/other $COMMIT3 refs/heads/foreign $COMMIT2
-EOF
-
test_expect_success 'push to default' '
+ cat >expect <<-EOF &&
+ parent1
+ repo1
+ refs/heads/other $COMMIT3 refs/heads/foreign $COMMIT2
+ EOF
git push &&
- diff expected actual
+ test_cmp expect actual
'
-cat >expected <<EOF
-parent1
-repo1
-refs/tags/one $COMMIT1 refs/tags/tag1 $ZERO_OID
-HEAD~ $COMMIT2 refs/heads/prev $ZERO_OID
-EOF
-
test_expect_success 'push non-branches' '
- git push parent1 one:tag1 HEAD~:refs/heads/prev &&
- diff expected actual
-'
+ cat >expect <<-EOF &&
+ parent1
+ repo1
+ refs/tags/one $COMMIT1 refs/tags/tag1 $ZERO_OID
+ HEAD~ $COMMIT2 refs/heads/prev $ZERO_OID
+ EOF
-cat >expected <<EOF
-parent1
-repo1
-(delete) $ZERO_OID refs/heads/prev $COMMIT2
-EOF
+ git push parent1 one:tag1 HEAD~:refs/heads/prev &&
+ test_cmp expect actual
+'
test_expect_success 'push delete' '
+ cat >expect <<-EOF &&
+ parent1
+ repo1
+ (delete) $ZERO_OID refs/heads/prev $COMMIT2
+ EOF
+
git push parent1 :prev &&
- diff expected actual
+ test_cmp expect actual
'
-cat >expected <<EOF
-repo1
-repo1
-HEAD $COMMIT3 refs/heads/other $ZERO_OID
-EOF
-
test_expect_success 'push to URL' '
+ cat >expect <<-EOF &&
+ repo1
+ repo1
+ HEAD $COMMIT3 refs/heads/other $ZERO_OID
+ EOF
+
git push repo1 HEAD &&
- diff expected actual
+ test_cmp expect actual
'
test_expect_success 'set up many-ref tests' '
{
- nr=1000
+ nr=1000 &&
while test $nr -lt 2000
do
- nr=$(( $nr + 1 ))
- echo "create refs/heads/b/$nr $COMMIT3"
+ nr=$(( $nr + 1 )) &&
+ echo "create refs/heads/b/$nr $COMMIT3" || return 1
done
} | git update-ref --stdin
'
test_expect_success 'sigpipe does not cause pre-push hook failure' '
- echo "exit 0" | write_script "$HOOK" &&
+ test_hook --clobber pre-push <<-\EOF &&
+ exit 0
+ EOF
git push parent1 "refs/heads/b/*:refs/heads/b/*"
'
diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh
index 4f92a11..a35396f 100755
--- a/t/t5572-pull-submodule.sh
+++ b/t/t5572-pull-submodule.sh
@@ -2,6 +2,9 @@
test_description='pull can handle submodules'
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh
@@ -104,6 +107,32 @@
test_path_is_file super/sub/merge_strategy_4.t
'
+test_expect_success "fetch.recurseSubmodules option triggers recursive fetch (but not recursive update)" '
+ test_commit -C child merge_strategy_5 &&
+ # Omit the parent commit, otherwise this passes with the
+ # default "pull" behavior.
+
+ git -C super -c fetch.recursesubmodules=true pull --no-rebase &&
+ # Check that the submodule commit was fetched
+ sub_oid=$(git -C child rev-parse HEAD) &&
+ git -C super/sub cat-file -e $sub_oid &&
+ # Check that the submodule worktree did not update
+ ! test_path_is_file super/sub/merge_strategy_5.t
+'
+
+test_expect_success "fetch.recurseSubmodules takes precedence over submodule.recurse" '
+ test_commit -C child merge_strategy_6 &&
+ # Omit the parent commit, otherwise this passes with the
+ # default "pull" behavior.
+
+ git -C super -c submodule.recurse=false -c fetch.recursesubmodules=true pull --no-rebase &&
+ # Check that the submodule commit was fetched
+ sub_oid=$(git -C child rev-parse HEAD) &&
+ git -C super/sub cat-file -e $sub_oid &&
+ # Check that the submodule worktree did not update
+ ! test_path_is_file super/sub/merge_strategy_6.t
+'
+
test_expect_success 'pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)' '
# This tests the following scenario :
# - local submodule has new commits
diff --git a/t/t5580-unc-paths.sh b/t/t5580-unc-paths.sh
index cd803ae..cd7604f 100755
--- a/t/t5580-unc-paths.sh
+++ b/t/t5580-unc-paths.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
if test_have_prereq CYGWIN
diff --git a/t/t5600-clone-fail-cleanup.sh b/t/t5600-clone-fail-cleanup.sh
index 34b3df4..c814afa 100755
--- a/t/t5600-clone-fail-cleanup.sh
+++ b/t/t5600-clone-fail-cleanup.sh
@@ -13,6 +13,7 @@
wrote.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
corrupt_repo () {
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 83c24fc..4a61f2c 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -79,12 +79,10 @@
cd .. &&
git init r1 &&
cd r1 &&
- cat >.git/hooks/pre-commit <<-\EOF &&
- #!/bin/sh
+ test_hook pre-commit <<-\EOF &&
git clone ../r0 ../r2
exit 1
EOF
- chmod u+x .git/hooks/pre-commit &&
: >file &&
git add file &&
test_must_fail git commit -m invoke-hook &&
diff --git a/t/t5602-clone-remote-exec.sh b/t/t5602-clone-remote-exec.sh
index cbcceab..56329aa 100755
--- a/t/t5602-clone-remote-exec.sh
+++ b/t/t5602-clone-remote-exec.sh
@@ -2,6 +2,7 @@
test_description=clone
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t5603-clone-dirname.sh b/t/t5603-clone-dirname.sh
index 13b5e5e..8ca1f09 100755
--- a/t/t5603-clone-dirname.sh
+++ b/t/t5603-clone-dirname.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='check output directory names used by git-clone'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# we use a fake ssh wrapper that ignores the arguments
diff --git a/t/t5605-clone-local.sh b/t/t5605-clone-local.sh
index 7d63365..21ab619 100755
--- a/t/t5605-clone-local.sh
+++ b/t/t5605-clone-local.sh
@@ -141,4 +141,13 @@
test_must_fail git clone --bare -u false a should_not_work.git
'
+test_expect_success 'local clone from repo with corrupt refs fails gracefully' '
+ git init corrupt &&
+ test_commit -C corrupt one &&
+ echo a >corrupt/.git/refs/heads/topic &&
+
+ test_must_fail git clone corrupt working 2>err &&
+ grep "has a null OID" err
+'
+
test_done
diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh
index d822153..8f676d6 100755
--- a/t/t5606-clone-options.sh
+++ b/t/t5606-clone-options.sh
@@ -46,7 +46,7 @@
test_must_fail git clone -o foo --bare parent clone-bare-o 2>err &&
test_debug "cat err" &&
- test_i18ngrep -e "--bare and --origin foo options are incompatible" err
+ test_i18ngrep -e "options .--bare. and .--origin foo. cannot be used together" err
'
@@ -54,7 +54,7 @@
test_must_fail git clone --bare --separate-git-dir dot-git-destiation parent clone-bare-sgd 2>err &&
test_debug "cat err" &&
- test_i18ngrep -e "--bare and --separate-git-dir are incompatible" err
+ test_i18ngrep -e "options .--bare. and .--separate-git-dir. cannot be used together" err
'
diff --git a/t/t5609-clone-branch.sh b/t/t5609-clone-branch.sh
index f86a674..252e1f7 100755
--- a/t/t5609-clone-branch.sh
+++ b/t/t5609-clone-branch.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
check_HEAD() {
diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh
index f8625f9..4b38772 100755
--- a/t/t5611-clone-config.sh
+++ b/t/t5611-clone-config.sh
@@ -17,7 +17,7 @@
test_expect_success 'clone -c can set multi-keys' '
rm -rf child &&
git clone -c core.foo=bar -c core.foo=baz . child &&
- { echo bar; echo baz; } >expect &&
+ test_write_lines bar baz >expect &&
git --git-dir=child/.git config --get-all core.foo >actual &&
test_cmp expect actual
'
diff --git a/t/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
index b4905b8..83513e4 100755
--- a/t/t5615-alternate-env.sh
+++ b/t/t5615-alternate-env.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='handling of alternates in environment variables'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
check_obj () {
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index cf3e82b..4a3778d 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -16,10 +16,10 @@
git init src &&
for n in 1 2 3 4
do
- echo "This is file: $n" > src/file.$n.txt
- git -C src add file.$n.txt
- git -C src commit -m "file $n"
- git -C src ls-files -s file.$n.txt >>temp
+ echo "This is file: $n" > src/file.$n.txt &&
+ git -C src add file.$n.txt &&
+ git -C src commit -m "file $n" &&
+ git -C src ls-files -s file.$n.txt >>temp || return 1
done &&
awk -f print_2.awk <temp | sort >expect_1.oids &&
test_line_count = 4 expect_1.oids
@@ -72,9 +72,9 @@
git -C src remote add srv "file://$(pwd)/srv.bare" &&
for x in a b c d e
do
- echo "Mod file.1.txt $x" >>src/file.1.txt
- git -C src add file.1.txt
- git -C src commit -m "mod $x"
+ echo "Mod file.1.txt $x" >>src/file.1.txt &&
+ git -C src add file.1.txt &&
+ git -C src commit -m "mod $x" || return 1
done &&
git -C src blame main -- file.1.txt >expect.blame &&
git -C src push -u srv main
@@ -114,9 +114,9 @@
test_expect_success 'push new commits to server for file.2.txt' '
for x in a b c d e f
do
- echo "Mod file.2.txt $x" >>src/file.2.txt
- git -C src add file.2.txt
- git -C src commit -m "mod $x"
+ echo "Mod file.2.txt $x" >>src/file.2.txt &&
+ git -C src add file.2.txt &&
+ git -C src commit -m "mod $x" || return 1
done &&
git -C src push -u srv main
'
@@ -135,9 +135,9 @@
test_expect_success 'push new commits to server for file.3.txt' '
for x in a b c d e f
do
- echo "Mod file.3.txt $x" >>src/file.3.txt
- git -C src add file.3.txt
- git -C src commit -m "mod $x"
+ echo "Mod file.3.txt $x" >>src/file.3.txt &&
+ git -C src add file.3.txt &&
+ git -C src commit -m "mod $x" || return 1
done &&
git -C src push -u srv main
'
@@ -166,6 +166,85 @@
test_line_count = 0 observed.oids
'
+# create new commits in "src" repo to establish a history on file.4.txt
+# and push to "srv.bare".
+test_expect_success 'push new commits to server for file.4.txt' '
+ for x in a b c d e f
+ do
+ echo "Mod file.4.txt $x" >src/file.4.txt &&
+ if list_contains "a,b" "$x"; then
+ printf "%10000s" X >>src/file.4.txt
+ fi &&
+ if list_contains "c,d" "$x"; then
+ printf "%20000s" X >>src/file.4.txt
+ fi &&
+ git -C src add file.4.txt &&
+ git -C src commit -m "mod $x" || return 1
+ done &&
+ git -C src push -u srv main
+'
+
+# Do partial fetch to fetch smaller files; then verify that without --refetch
+# applying a new filter does not refetch missing large objects. Then use
+# --refetch to apply the new filter on existing commits. Test it under both
+# protocol v2 & v0.
+test_expect_success 'apply a different filter using --refetch' '
+ git -C pc1 fetch --filter=blob:limit=999 origin &&
+ git -C pc1 rev-list --quiet --objects --missing=print \
+ main..origin/main >observed &&
+ test_line_count = 4 observed &&
+
+ git -C pc1 fetch --filter=blob:limit=19999 --refetch origin &&
+ git -C pc1 rev-list --quiet --objects --missing=print \
+ main..origin/main >observed &&
+ test_line_count = 2 observed &&
+
+ git -c protocol.version=0 -C pc1 fetch --filter=blob:limit=29999 \
+ --refetch origin &&
+ git -C pc1 rev-list --quiet --objects --missing=print \
+ main..origin/main >observed &&
+ test_line_count = 0 observed
+'
+
+test_expect_success 'fetch --refetch works with a shallow clone' '
+ git clone --no-checkout --depth=1 --filter=blob:none "file://$(pwd)/srv.bare" pc1s &&
+ git -C pc1s rev-list --objects --missing=print HEAD >observed &&
+ test_line_count = 6 observed &&
+
+ GIT_TRACE=1 git -C pc1s fetch --filter=blob:limit=999 --refetch origin &&
+ git -C pc1s rev-list --objects --missing=print HEAD >observed &&
+ test_line_count = 6 observed
+'
+
+test_expect_success 'fetch --refetch triggers repacking' '
+ GIT_TRACE2_CONFIG_PARAMS=gc.autoPackLimit,maintenance.incremental-repack.auto &&
+ export GIT_TRACE2_CONFIG_PARAMS &&
+
+ GIT_TRACE2_EVENT="$PWD/trace1.event" \
+ git -C pc1 fetch --refetch origin &&
+ test_subcommand git maintenance run --auto --no-quiet <trace1.event &&
+ grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace1.event &&
+ grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"-1\" trace1.event &&
+
+ GIT_TRACE2_EVENT="$PWD/trace2.event" \
+ git -c protocol.version=0 \
+ -c gc.autoPackLimit=0 \
+ -c maintenance.incremental-repack.auto=1234 \
+ -C pc1 fetch --refetch origin &&
+ test_subcommand git maintenance run --auto --no-quiet <trace2.event &&
+ grep \"param\":\"gc.autopacklimit\",\"value\":\"0\" trace2.event &&
+ grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"-1\" trace2.event &&
+
+ GIT_TRACE2_EVENT="$PWD/trace3.event" \
+ git -c protocol.version=0 \
+ -c gc.autoPackLimit=1234 \
+ -c maintenance.incremental-repack.auto=0 \
+ -C pc1 fetch --refetch origin &&
+ test_subcommand git maintenance run --auto --no-quiet <trace3.event &&
+ grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace3.event &&
+ grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"0\" trace3.event
+'
+
test_expect_success 'partial clone with transfer.fsckobjects=1 works with submodules' '
test_create_repo submodule &&
test_commit -C submodule mycommit &&
@@ -225,7 +304,7 @@
# Auto-fetch all remaining trees and blobs with --missing=error
git -C dst rev-list --missing=error --objects main >fetched_objects &&
- test_line_count = 70 fetched_objects &&
+ test_line_count = 88 fetched_objects &&
awk -f print_1.awk fetched_objects |
xargs -n1 git -C dst cat-file -t >fetched_types &&
@@ -385,7 +464,7 @@
for i in $(test_seq 1 100)
do
echo "make the tree big" >server/file$i &&
- git -C server add file$i
+ git -C server add file$i || return 1
done &&
git -C server commit -m "initial" &&
git clone --bare --filter=tree:0 "file://$(pwd)/server" client &&
@@ -669,7 +748,7 @@
for i in $(test_seq 10)
do
echo "this is a line" >>"$SERVER/foo.txt" &&
- echo "this is another line" >>"$SERVER/have.txt"
+ echo "this is another line" >>"$SERVER/have.txt" || return 1
done &&
git -C "$SERVER" add foo.txt have.txt &&
git -C "$SERVER" commit -m bar &&
diff --git a/t/t5617-clone-submodules-remote.sh b/t/t5617-clone-submodules-remote.sh
index e2dbb4e..ca8f800 100755
--- a/t/t5617-clone-submodules-remote.sh
+++ b/t/t5617-clone-submodules-remote.sh
@@ -28,6 +28,13 @@
)
'
+# bare clone giving "srv.bare" for use as our server.
+test_expect_success 'setup bare clone for server' '
+ git clone --bare "file://$(pwd)/." srv.bare &&
+ git -C srv.bare config --local uploadpack.allowfilter 1 &&
+ git -C srv.bare config --local uploadpack.allowanysha1inwant 1
+'
+
test_expect_success 'clone with --no-remote-submodules' '
test_when_finished "rm -rf super_clone" &&
git clone --recurse-submodules --no-remote-submodules "file://$pwd/." super_clone &&
@@ -65,4 +72,38 @@
)
'
+# do basic partial clone from "srv.bare"
+# confirm partial clone was registered in the local config for super and sub.
+test_expect_success 'clone with --filter' '
+ git clone --recurse-submodules \
+ --filter blob:none --also-filter-submodules \
+ "file://$pwd/srv.bare" super_clone &&
+ test_cmp_config -C super_clone true remote.origin.promisor &&
+ test_cmp_config -C super_clone blob:none remote.origin.partialclonefilter &&
+ test_cmp_config -C super_clone/sub true remote.origin.promisor &&
+ test_cmp_config -C super_clone/sub blob:none remote.origin.partialclonefilter
+'
+
+# check that clone.filterSubmodules works (--also-filter-submodules can be
+# omitted)
+test_expect_success 'filters applied with clone.filterSubmodules' '
+ test_config_global clone.filterSubmodules true &&
+ git clone --recurse-submodules --filter blob:none \
+ "file://$pwd/srv.bare" super_clone2 &&
+ test_cmp_config -C super_clone2 true remote.origin.promisor &&
+ test_cmp_config -C super_clone2 blob:none remote.origin.partialclonefilter &&
+ test_cmp_config -C super_clone2/sub true remote.origin.promisor &&
+ test_cmp_config -C super_clone2/sub blob:none remote.origin.partialclonefilter
+'
+
+test_expect_success '--no-also-filter-submodules overrides clone.filterSubmodules=true' '
+ test_config_global clone.filterSubmodules true &&
+ git clone --recurse-submodules --filter blob:none \
+ --no-also-filter-submodules \
+ "file://$pwd/srv.bare" super_clone3 &&
+ test_cmp_config -C super_clone3 true remote.origin.promisor &&
+ test_cmp_config -C super_clone3 blob:none remote.origin.partialclonefilter &&
+ test_cmp_config -C super_clone3/sub false --default false remote.origin.promisor
+'
+
test_done
diff --git a/t/t5700-protocol-v1.sh b/t/t5700-protocol-v1.sh
index 468bd3e..6c8d4c6 100755
--- a/t/t5700-protocol-v1.sh
+++ b/t/t5700-protocol-v1.sh
@@ -149,6 +149,21 @@
grep "push< version 1" log
'
+test_expect_success 'cloning branchless tagless but not refless remote' '
+ rm -rf server client &&
+
+ git -c init.defaultbranch=main init server &&
+ echo foo >server/foo.txt &&
+ git -C server add foo.txt &&
+ git -C server commit -m "message" &&
+ git -C server update-ref refs/notbranch/alsonottag HEAD &&
+ git -C server checkout --detach &&
+ git -C server branch -D main &&
+ git -C server symbolic-ref HEAD refs/heads/nonexistentbranch &&
+
+ git -c protocol.version=1 clone "file://$(pwd)/server" client
+'
+
# Test protocol v1 with 'ssh://' transport
#
test_expect_success 'setup ssh wrapper' '
diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh
index aa1827d..1896f67 100755
--- a/t/t5701-git-serve.sh
+++ b/t/t5701-git-serve.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'test capability advertisement' '
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index d527cf6..00ce9ae 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -619,7 +619,7 @@
setup_negotiate_only "$SERVER" "$URI" &&
cat >err.expect <<-\EOF &&
- fatal: --negotiate-only needs one or more --negotiate-tip=*
+ fatal: --negotiate-only needs one or more --negotiation-tip=*
EOF
test_must_fail git -c protocol.version=2 -C client fetch \
@@ -628,6 +628,18 @@
test_cmp err.expect err.actual
'
+test_expect_success 'usage: --negotiate-only with --recurse-submodules' '
+ cat >err.expect <<-\EOF &&
+ fatal: options '\''--negotiate-only'\'' and '\''--recurse-submodules'\'' cannot be used together
+ EOF
+
+ test_must_fail git -c protocol.version=2 -C client fetch \
+ --negotiate-only \
+ --recurse-submodules \
+ origin 2>err.actual &&
+ test_cmp err.expect err.actual
+'
+
test_expect_success 'file:// --negotiate-only' '
SERVER="server" &&
URI="file://$(pwd)/server" &&
@@ -747,7 +759,7 @@
echo "data 0" &&
echo "M 644 inline bla.txt" &&
echo "data 4" &&
- echo "bla"
+ echo "bla" || return 1
done | git -C "$HTTPD_DOCUMENT_ROOT_PATH/big" fast-import &&
GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" git \
@@ -942,7 +954,7 @@
then
>h2found
fi
- fi
+ fi || return 1
done &&
test -f hfound &&
test -f h2found &&
@@ -1107,6 +1119,57 @@
test_i18ngrep "disallowed submodule name" err
'
+test_expect_success 'packfile-uri path redacted in trace' '
+ P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ rm -rf "$P" http_child log &&
+
+ git init "$P" &&
+ git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+ echo my-blob >"$P/my-blob" &&
+ git -C "$P" add my-blob &&
+ git -C "$P" commit -m x &&
+
+ git -C "$P" hash-object my-blob >objh &&
+ git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
+ git -C "$P" config --add \
+ "uploadpack.blobpackfileuri" \
+ "$(cat objh) $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+
+ GIT_TRACE_PACKET="$(pwd)/log" \
+ git -c protocol.version=2 \
+ -c fetch.uriprotocols=http,https \
+ clone "$HTTPD_URL/smart/http_parent" http_child &&
+
+ grep -F "clone< \\1$(cat packh) $HTTPD_URL/<redacted>" log
+'
+
+test_expect_success 'packfile-uri path not redacted in trace when GIT_TRACE_REDACT=0' '
+ P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ rm -rf "$P" http_child log &&
+
+ git init "$P" &&
+ git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+ echo my-blob >"$P/my-blob" &&
+ git -C "$P" add my-blob &&
+ git -C "$P" commit -m x &&
+
+ git -C "$P" hash-object my-blob >objh &&
+ git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
+ git -C "$P" config --add \
+ "uploadpack.blobpackfileuri" \
+ "$(cat objh) $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+
+ GIT_TRACE_PACKET="$(pwd)/log" \
+ GIT_TRACE_REDACT=0 \
+ git -c protocol.version=2 \
+ -c fetch.uriprotocols=http,https \
+ clone "$HTTPD_URL/smart/http_parent" http_child &&
+
+ grep -F "clone< \\1$(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" log
+'
+
test_expect_success 'http:// --negotiate-only' '
SERVER="$HTTPD_DOCUMENT_ROOT_PATH/server" &&
URI="$HTTPD_URL/smart/server" &&
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh
index 2200985..9d6cd7d 100755
--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@ -2,9 +2,6 @@
test_description='upload-pack ref-in-want'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./test-lib.sh
get_actual_refs () {
diff --git a/t/t5704-protocol-violations.sh b/t/t5704-protocol-violations.sh
index bc393d7..ae1a00a 100755
--- a/t/t5704-protocol-violations.sh
+++ b/t/t5704-protocol-violations.sh
@@ -4,6 +4,8 @@
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_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'extra delim packet in v2 ls-refs args' '
diff --git a/t/t5705-session-id-in-capabilities.sh b/t/t5705-session-id-in-capabilities.sh
index eb8c79a..ed38c76 100755
--- a/t/t5705-session-id-in-capabilities.sh
+++ b/t/t5705-session-id-in-capabilities.sh
@@ -32,7 +32,6 @@
test_when_finished "git -C local push --delete origin new-branch" &&
cp -r "$LOCAL_PRISTINE" local &&
git -C local pull --no-rebase origin &&
- GIT_TRACE2_EVENT_NESTING=5 \
GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
git -c protocol.version=$PROTO -C local push \
--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
@@ -65,7 +64,6 @@
test_when_finished "git -C local push --delete origin new-branch" &&
cp -r "$LOCAL_PRISTINE" local &&
git -C local pull --no-rebase origin &&
- GIT_TRACE2_EVENT_NESTING=5 \
GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
git -c protocol.version=$PROTO -C local push \
--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
diff --git a/t/t5900-repo-selection.sh b/t/t5900-repo-selection.sh
index 14e59c5..a84faac 100755
--- a/t/t5900-repo-selection.sh
+++ b/t/t5900-repo-selection.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='selecting remote repo in ambiguous cases'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
reset() {
diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh
index ef849e5..12def7b 100755
--- a/t/t6000-rev-list-misc.sh
+++ b/t/t6000-rev-list-misc.sh
@@ -169,35 +169,4 @@
test_line_count = $count actual
'
-test_expect_success 'rev-list --unsorted-input results in different sorting' '
- git rev-list --unsorted-input HEAD HEAD~ >first &&
- git rev-list --unsorted-input HEAD~ HEAD >second &&
- ! test_cmp first second &&
- sort first >first.sorted &&
- sort second >second.sorted &&
- test_cmp first.sorted second.sorted
-'
-
-test_expect_success 'rev-list --unsorted-input incompatible with --no-walk' '
- cat >expect <<-EOF &&
- fatal: --no-walk is incompatible with --unsorted-input
- EOF
- test_must_fail git rev-list --unsorted-input --no-walk HEAD 2>error &&
- test_cmp expect error &&
- test_must_fail git rev-list --unsorted-input --no-walk=sorted HEAD 2>error &&
- test_cmp expect error &&
- test_must_fail git rev-list --unsorted-input --no-walk=unsorted HEAD 2>error &&
- test_cmp expect error &&
-
- cat >expect <<-EOF &&
- fatal: --unsorted-input is incompatible with --no-walk
- EOF
- test_must_fail git rev-list --no-walk --unsorted-input HEAD 2>error &&
- test_cmp expect error &&
- test_must_fail git rev-list --no-walk=sorted --unsorted-input HEAD 2>error &&
- test_cmp expect error &&
- test_must_fail git rev-list --no-walk=unsorted --unsorted-input HEAD 2>error &&
- test_cmp expect error
-'
-
test_done
diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh
index b95a021..162cf50 100755
--- a/t/t6002-rev-list-bisect.sh
+++ b/t/t6002-rev-list-bisect.sh
@@ -4,6 +4,7 @@
#
test_description='Tests git rev-list --bisect functionality'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions
diff --git a/t/t6003-rev-list-topo-order.sh b/t/t6003-rev-list-topo-order.sh
index 24d1836..1f7d7dd 100755
--- a/t/t6003-rev-list-topo-order.sh
+++ b/t/t6003-rev-list-topo-order.sh
@@ -5,6 +5,7 @@
test_description='Tests git rev-list --topo-order functionality'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions
diff --git a/t/t6005-rev-list-count.sh b/t/t6005-rev-list-count.sh
index 0b64822..0729f80 100755
--- a/t/t6005-rev-list-count.sh
+++ b/t/t6005-rev-list-count.sh
@@ -2,50 +2,51 @@
test_description='git rev-list --max-count and --skip test'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
- for n in 1 2 3 4 5 ; do \
- echo $n > a ; \
- git add a ; \
- git commit -m "$n" ; \
+ for n in 1 2 3 4 5 ; do
+ echo $n > a &&
+ git add a &&
+ git commit -m "$n" || return 1
done
'
test_expect_success 'no options' '
- test $(git rev-list HEAD | wc -l) = 5
+ test_stdout_line_count = 5 git rev-list HEAD
'
test_expect_success '--max-count' '
- test $(git rev-list HEAD --max-count=0 | wc -l) = 0 &&
- test $(git rev-list HEAD --max-count=3 | wc -l) = 3 &&
- test $(git rev-list HEAD --max-count=5 | wc -l) = 5 &&
- test $(git rev-list HEAD --max-count=10 | wc -l) = 5
+ test_stdout_line_count = 0 git rev-list HEAD --max-count=0 &&
+ test_stdout_line_count = 3 git rev-list HEAD --max-count=3 &&
+ test_stdout_line_count = 5 git rev-list HEAD --max-count=5 &&
+ test_stdout_line_count = 5 git rev-list HEAD --max-count=10
'
test_expect_success '--max-count all forms' '
- test $(git rev-list HEAD --max-count=1 | wc -l) = 1 &&
- test $(git rev-list HEAD -1 | wc -l) = 1 &&
- test $(git rev-list HEAD -n1 | wc -l) = 1 &&
- test $(git rev-list HEAD -n 1 | wc -l) = 1
+ test_stdout_line_count = 1 git rev-list HEAD --max-count=1 &&
+ test_stdout_line_count = 1 git rev-list HEAD -1 &&
+ test_stdout_line_count = 1 git rev-list HEAD -n1 &&
+ test_stdout_line_count = 1 git rev-list HEAD -n 1
'
test_expect_success '--skip' '
- test $(git rev-list HEAD --skip=0 | wc -l) = 5 &&
- test $(git rev-list HEAD --skip=3 | wc -l) = 2 &&
- test $(git rev-list HEAD --skip=5 | wc -l) = 0 &&
- test $(git rev-list HEAD --skip=10 | wc -l) = 0
+ test_stdout_line_count = 5 git rev-list HEAD --skip=0 &&
+ test_stdout_line_count = 2 git rev-list HEAD --skip=3 &&
+ test_stdout_line_count = 0 git rev-list HEAD --skip=5 &&
+ test_stdout_line_count = 0 git rev-list HEAD --skip=10
'
test_expect_success '--skip --max-count' '
- test $(git rev-list HEAD --skip=0 --max-count=0 | wc -l) = 0 &&
- test $(git rev-list HEAD --skip=0 --max-count=10 | wc -l) = 5 &&
- test $(git rev-list HEAD --skip=3 --max-count=0 | wc -l) = 0 &&
- test $(git rev-list HEAD --skip=3 --max-count=1 | wc -l) = 1 &&
- test $(git rev-list HEAD --skip=3 --max-count=2 | wc -l) = 2 &&
- test $(git rev-list HEAD --skip=3 --max-count=10 | wc -l) = 2 &&
- test $(git rev-list HEAD --skip=5 --max-count=10 | wc -l) = 0 &&
- test $(git rev-list HEAD --skip=10 --max-count=10 | wc -l) = 0
+ test_stdout_line_count = 0 git rev-list HEAD --skip=0 --max-count=0 &&
+ test_stdout_line_count = 5 git rev-list HEAD --skip=0 --max-count=10 &&
+ test_stdout_line_count = 0 git rev-list HEAD --skip=3 --max-count=0 &&
+ test_stdout_line_count = 1 git rev-list HEAD --skip=3 --max-count=1 &&
+ test_stdout_line_count = 2 git rev-list HEAD --skip=3 --max-count=2 &&
+ test_stdout_line_count = 2 git rev-list HEAD --skip=3 --max-count=10 &&
+ test_stdout_line_count = 0 git rev-list HEAD --skip=5 --max-count=10 &&
+ test_stdout_line_count = 0 git rev-list HEAD --skip=10 --max-count=10
'
test_done
diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index aebe4b6..6f3e543 100755
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -58,7 +58,7 @@
test_expect_success '--left-right' '
git rev-list --left-right B...C > actual &&
- git name-rev --stdin --name-only --refs="*tags/*" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
test_cmp expect actual.named
'
@@ -78,14 +78,14 @@
test_expect_success '--cherry-pick bar does not come up empty' '
git rev-list --left-right --cherry-pick B...C -- bar > actual &&
- git name-rev --stdin --name-only --refs="*tags/*" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
test_cmp expect actual.named
'
test_expect_success 'bar does not come up empty' '
git rev-list --left-right B...C -- bar > actual &&
- git name-rev --stdin --name-only --refs="*tags/*" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
test_cmp expect actual.named
'
@@ -97,14 +97,14 @@
test_expect_success '--cherry-pick bar does not come up empty (II)' '
git rev-list --left-right --cherry-pick F...E -- bar > actual &&
- git name-rev --stdin --name-only --refs="*tags/*" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
test_cmp expect actual.named
'
test_expect_success 'name-rev multiple --refs combine inclusive' '
git rev-list --left-right --cherry-pick F...E -- bar >actual &&
- git name-rev --stdin --name-only --refs="*tags/F" --refs="*tags/E" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/F" --refs="*tags/E" \
<actual >actual.named &&
test_cmp expect actual.named
'
@@ -116,7 +116,7 @@
test_expect_success 'name-rev --refs excludes non-matched patterns' '
git rev-list --left-right --right-only --cherry-pick F...E -- bar >>expect &&
git rev-list --left-right --cherry-pick F...E -- bar >actual &&
- git name-rev --stdin --name-only --refs="*tags/F" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/F" \
<actual >actual.named &&
test_cmp expect actual.named
'
@@ -128,14 +128,14 @@
test_expect_success 'name-rev --exclude excludes matched patterns' '
git rev-list --left-right --right-only --cherry-pick F...E -- bar >>expect &&
git rev-list --left-right --cherry-pick F...E -- bar >actual &&
- git name-rev --stdin --name-only --refs="*tags/*" --exclude="*E" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/*" --exclude="*E" \
<actual >actual.named &&
test_cmp expect actual.named
'
test_expect_success 'name-rev --no-refs clears the refs list' '
git rev-list --left-right --cherry-pick F...E -- bar >expect &&
- git name-rev --stdin --name-only --refs="*tags/F" --refs="*tags/E" --no-refs --refs="*tags/G" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/F" --refs="*tags/E" --no-refs --refs="*tags/G" \
<expect >actual &&
test_cmp expect actual
'
@@ -149,7 +149,7 @@
test_expect_success '--cherry-mark' '
git rev-list --cherry-mark F...E -- bar > actual &&
- git name-rev --stdin --name-only --refs="*tags/*" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
test_cmp expect actual.named
'
@@ -163,7 +163,7 @@
test_expect_success '--cherry-mark --left-right' '
git rev-list --cherry-mark --left-right F...E -- bar > actual &&
- git name-rev --stdin --name-only --refs="*tags/*" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
test_cmp expect actual.named
'
@@ -174,14 +174,14 @@
test_expect_success '--cherry-pick --right-only' '
git rev-list --cherry-pick --right-only F...E -- bar > actual &&
- git name-rev --stdin --name-only --refs="*tags/*" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
test_cmp expect actual.named
'
test_expect_success '--cherry-pick --left-only' '
git rev-list --cherry-pick --left-only E...F -- bar > actual &&
- git name-rev --stdin --name-only --refs="*tags/*" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
test_cmp expect actual.named
'
@@ -193,7 +193,7 @@
test_expect_success '--cherry' '
git rev-list --cherry F...E -- bar > actual &&
- git name-rev --stdin --name-only --refs="*tags/*" \
+ git name-rev --annotate-stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
test_cmp expect actual.named
'
diff --git a/t/t6009-rev-list-parent.sh b/t/t6009-rev-list-parent.sh
index 63fa7c8..5a67bbc 100755
--- a/t/t6009-rev-list-parent.sh
+++ b/t/t6009-rev-list-parent.sh
@@ -124,7 +124,7 @@
git checkout -b root$i five &&
test_commit $i &&
roots="$roots root$i" ||
- return
+ return 1
done &&
git checkout main &&
test_tick &&
@@ -142,8 +142,8 @@
test_tick_keep=$test_tick &&
for i in 1 2 3 4 5 6 7 8; do
- test_tick=$test_tick_keep
- test_commit t$i
+ test_tick=$test_tick_keep &&
+ test_commit t$i || return 1
done &&
git rev-list t1^! --not t$i >result &&
test_must_be_empty result
diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh
index 4f7fa8b..de1e87f 100755
--- a/t/t6012-rev-list-simplify.sh
+++ b/t/t6012-rev-list-simplify.sh
@@ -12,17 +12,18 @@
}
unnote () {
- git name-rev --tags --stdin | sed -e "s|$OID_REGEX (tags/\([^)]*\)) |\1 |g"
+ test_when_finished "rm -f tmp" &&
+ git name-rev --tags --annotate-stdin >tmp &&
+ sed -e "s|$OID_REGEX (tags/\([^)]*\)) |\1 |g" <tmp
}
#
-# Create a test repo with interesting commit graph:
+# Create a test repo with an interesting commit graph:
#
-# A--B----------G--H--I--K--L
-# \ \ / /
-# \ \ / /
-# C------E---F J
-# \_/
+# A-----B-----G--H--I--K--L
+# \ \ / /
+# \ \ / /
+# C--D--E--F J
#
# The commits are laid out from left-to-right starting with
# the root commit A and terminating at the tip commit L.
@@ -112,8 +113,8 @@
shift &&
param="$*" &&
test_expect_$outcome "log $param" '
- git log --pretty="$FMT" --parents $param |
- unnote >actual &&
+ git log --pretty="$FMT" --parents $param >out &&
+ unnote >actual <out &&
sed -e "s/^.* \([^ ]*\) .*/\1/" >check <actual &&
test_cmp expect check
'
@@ -142,11 +143,18 @@
check_result 'H' --first-parent -- another-file
check_result 'H' --first-parent --topo-order -- another-file
+check_result 'L K I H G B A' --first-parent L
+check_result 'F E D C' --exclude-first-parent-only F ^L
+check_result '' F ^L
+check_result 'L K I H G J' L ^F
+check_result 'L K I H G B J' --exclude-first-parent-only L ^F
+check_result 'L K I H G B' --exclude-first-parent-only --first-parent L ^F
+
check_result 'E C B A' --full-history E -- lost
test_expect_success 'full history simplification without parent' '
printf "%s\n" E C B A >expect &&
- git log --pretty="$FMT" --full-history E -- lost |
- unnote >actual &&
+ git log --pretty="$FMT" --full-history E -- lost >out &&
+ unnote >actual <out &&
sed -e "s/^.* \([^ ]*\) .*/\1/" >check <actual &&
test_cmp expect check
'
diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index 24b34ad..e1abc5c 100755
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
commit () {
diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh
index 20adbec..af57a04 100755
--- a/t/t6019-rev-list-ancestry-path.sh
+++ b/t/t6019-rev-list-ancestry-path.sh
@@ -51,7 +51,7 @@
'
test_expect_success 'rev-list D..M' '
- for c in E F G H I J K L M; do echo $c; done >expect &&
+ test_write_lines E F G H I J K L M >expect &&
git rev-list --format=%s D..M |
sed -e "/^commit /d" |
sort >actual &&
@@ -59,7 +59,7 @@
'
test_expect_success 'rev-list --ancestry-path D..M' '
- for c in E F H I J L M; do echo $c; done >expect &&
+ test_write_lines E F H I J L M >expect &&
git rev-list --ancestry-path --format=%s D..M |
sed -e "/^commit /d" |
sort >actual &&
@@ -81,7 +81,7 @@
'
test_expect_success 'rev-list F...I' '
- for c in F G H I; do echo $c; done >expect &&
+ test_write_lines F G H I >expect &&
git rev-list --format=%s F...I |
sed -e "/^commit /d" |
sort >actual &&
@@ -89,7 +89,7 @@
'
test_expect_success 'rev-list --ancestry-path F...I' '
- for c in F H I; do echo $c; done >expect &&
+ test_write_lines F H I >expect &&
git rev-list --ancestry-path --format=%s F...I |
sed -e "/^commit /d" |
sort >actual &&
@@ -111,7 +111,7 @@
'
test_expect_success 'rev-list --ancestry-path --simplify-merges G^..M -- G.t' '
- for c in G L; do echo $c; done >expect &&
+ test_write_lines G L >expect &&
git rev-list --ancestry-path --simplify-merges --format=%s G^..M -- G.t |
sed -e "/^commit /d" |
sort >actual &&
diff --git a/t/t6020-bundle-misc.sh b/t/t6020-bundle-misc.sh
index b13e8a5..8332051 100755
--- a/t/t6020-bundle-misc.sh
+++ b/t/t6020-bundle-misc.sh
@@ -122,6 +122,8 @@
sed -e 's/Z$//' >expect
}
+HASH_MESSAGE="The bundle uses this hash algorithm: $GIT_DEFAULT_HASH"
+
# (C) (D, pull/1/head, topic/1)
# o --- o
# / \ (L)
@@ -194,11 +196,12 @@
git bundle verify special-rev.bdl |
make_user_friendly_and_stable_output >actual &&
- format_and_save_expect <<-\EOF &&
+ format_and_save_expect <<-EOF &&
The bundle contains this ref:
<COMMIT-P> refs/heads/main
The bundle requires this ref:
<COMMIT-O> Z
+ $HASH_MESSAGE
EOF
test_cmp expect actual &&
@@ -215,12 +218,13 @@
git bundle verify max-count.bdl |
make_user_friendly_and_stable_output >actual &&
- format_and_save_expect <<-\EOF &&
+ format_and_save_expect <<-EOF &&
The bundle contains these 2 refs:
<COMMIT-P> refs/heads/main
<TAG-1> refs/tags/v1
The bundle requires this ref:
<COMMIT-O> Z
+ $HASH_MESSAGE
EOF
test_cmp expect actual &&
@@ -240,7 +244,7 @@
git bundle verify since.bdl |
make_user_friendly_and_stable_output >actual &&
- format_and_save_expect <<-\EOF &&
+ format_and_save_expect <<-EOF &&
The bundle contains these 5 refs:
<COMMIT-P> refs/heads/main
<COMMIT-N> refs/heads/release
@@ -250,6 +254,7 @@
The bundle requires these 2 refs:
<COMMIT-M> Z
<COMMIT-K> Z
+ $HASH_MESSAGE
EOF
test_cmp expect actual &&
@@ -267,11 +272,12 @@
EOF
git bundle create stdin-1.bdl --stdin <input &&
- cat >expect <<-\EOF &&
+ format_and_save_expect <<-EOF &&
The bundle contains these 2 refs:
<COMMIT-D> refs/heads/topic/1
<COMMIT-H> refs/heads/topic/2
The bundle records a complete history.
+ $HASH_MESSAGE
EOF
# verify bundle, which has no prerequisites
@@ -308,13 +314,14 @@
--stdin \
release <input &&
- format_and_save_expect <<-\EOF &&
+ format_and_save_expect <<-EOF &&
The bundle contains this ref:
<COMMIT-N> refs/heads/release
The bundle requires these 3 refs:
<COMMIT-D> Z
<COMMIT-E> Z
<COMMIT-G> Z
+ $HASH_MESSAGE
EOF
git bundle verify 2.bdl |
@@ -367,13 +374,14 @@
--stdin \
main HEAD <input &&
- format_and_save_expect <<-\EOF &&
+ format_and_save_expect <<-EOF &&
The bundle contains these 2 refs:
<COMMIT-P> refs/heads/main
<COMMIT-P> HEAD
The bundle requires these 2 refs:
<COMMIT-M> Z
<COMMIT-K> Z
+ $HASH_MESSAGE
EOF
git bundle verify 3.bdl |
@@ -409,12 +417,13 @@
--stdin \
--all <input &&
- cat >expect <<-\EOF &&
+ cat >expect <<-EOF &&
The bundle contains these 3 refs:
<TAG-1> refs/tags/v1
<TAG-2> refs/tags/v2
<TAG-3> refs/tags/v3
The bundle records a complete history.
+ $HASH_MESSAGE
EOF
git bundle verify 4.bdl |
@@ -475,4 +484,79 @@
test_cmp expect actual
'
+test_expect_success 'unfiltered bundle with --objects' '
+ git bundle create all-objects.bdl \
+ --all --objects &&
+ git bundle create all.bdl \
+ --all &&
+
+ # Compare the headers of these files.
+ sed -n -e "/^$/q" -e "p" all.bdl >expect &&
+ sed -n -e "/^$/q" -e "p" all-objects.bdl >actual &&
+ test_cmp expect actual
+'
+
+for filter in "blob:none" "tree:0" "tree:1" "blob:limit=100"
+do
+ test_expect_success "filtered bundle: $filter" '
+ test_when_finished rm -rf .git/objects/pack cloned unbundled &&
+ git bundle create partial.bdl \
+ --all \
+ --filter=$filter &&
+
+ git bundle verify partial.bdl >unfiltered &&
+ make_user_friendly_and_stable_output <unfiltered >actual &&
+
+ cat >expect <<-EOF &&
+ The bundle contains these 10 refs:
+ <COMMIT-P> refs/heads/main
+ <COMMIT-N> refs/heads/release
+ <COMMIT-D> refs/heads/topic/1
+ <COMMIT-H> refs/heads/topic/2
+ <COMMIT-D> refs/pull/1/head
+ <COMMIT-G> refs/pull/2/head
+ <TAG-1> refs/tags/v1
+ <TAG-2> refs/tags/v2
+ <TAG-3> refs/tags/v3
+ <COMMIT-P> HEAD
+ The bundle records a complete history.
+ $HASH_MESSAGE
+ The bundle uses this filter: $filter
+ EOF
+ test_cmp expect actual &&
+
+ test_config uploadpack.allowfilter 1 &&
+ test_config uploadpack.allowanysha1inwant 1 &&
+ git clone --no-local --filter=$filter --bare "file://$(pwd)" cloned &&
+
+ git init unbundled &&
+ git -C unbundled bundle unbundle ../partial.bdl >ref-list.txt &&
+ ls unbundled/.git/objects/pack/pack-*.promisor >promisor &&
+ test_line_count = 1 promisor &&
+
+ # Count the same number of reachable objects.
+ reflist=$(git for-each-ref --format="%(objectname)") &&
+ git rev-list --objects --filter=$filter --missing=allow-any \
+ $reflist >expect &&
+ for repo in cloned unbundled
+ do
+ git -C $repo rev-list --objects --missing=allow-any \
+ $reflist >actual &&
+ test_cmp expect actual || return 1
+ done
+ '
+done
+
+# NEEDSWORK: 'git clone --bare' should be able to clone from a filtered
+# bundle, but that requires a change to promisor/filter config options.
+# For now, we fail gracefully with a helpful error. This behavior can be
+# changed in the future to succeed as much as possible.
+test_expect_success 'cloning from filtered bundle has useful error' '
+ git bundle create partial.bdl \
+ --all \
+ --filter=blob:none &&
+ test_must_fail git clone --bare partial.bdl partial 2>err &&
+ grep "cannot clone from filtered bundle" err
+'
+
test_done
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 1be85d0..83931d4 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -278,6 +278,51 @@
git bisect reset
'
+test_expect_success 'bisect run accepts exit code 126 as bad' '
+ test_when_finished "git bisect reset" &&
+ write_script test_script.sh <<-\EOF &&
+ ! grep Another hello || exit 126 >/dev/null
+ EOF
+ git bisect start &&
+ git bisect good $HASH1 &&
+ git bisect bad $HASH4 &&
+ git bisect run ./test_script.sh >my_bisect_log.txt &&
+ grep "$HASH3 is the first bad commit" my_bisect_log.txt
+'
+
+test_expect_success POSIXPERM 'bisect run fails with non-executable test script' '
+ test_when_finished "git bisect reset" &&
+ >not-executable.sh &&
+ chmod -x not-executable.sh &&
+ git bisect start &&
+ git bisect good $HASH1 &&
+ git bisect bad $HASH4 &&
+ test_must_fail git bisect run ./not-executable.sh >my_bisect_log.txt &&
+ ! grep "is the first bad commit" my_bisect_log.txt
+'
+
+test_expect_success 'bisect run accepts exit code 127 as bad' '
+ test_when_finished "git bisect reset" &&
+ write_script test_script.sh <<-\EOF &&
+ ! grep Another hello || exit 127 >/dev/null
+ EOF
+ git bisect start &&
+ git bisect good $HASH1 &&
+ git bisect bad $HASH4 &&
+ git bisect run ./test_script.sh >my_bisect_log.txt &&
+ grep "$HASH3 is the first bad commit" my_bisect_log.txt
+'
+
+test_expect_success 'bisect run fails with missing test script' '
+ test_when_finished "git bisect reset" &&
+ rm -f does-not-exist.sh &&
+ git bisect start &&
+ git bisect good $HASH1 &&
+ git bisect bad $HASH4 &&
+ test_must_fail git bisect run ./does-not-exist.sh >my_bisect_log.txt &&
+ ! grep "is the first bad commit" my_bisect_log.txt
+'
+
# $HASH1 is good, $HASH5 is bad, we skip $HASH3
# but $HASH4 is good,
# so we should find $HASH5 as the first bad commit
@@ -980,4 +1025,32 @@
git bisect visualize -p -- "-hello 2"
'
+test_expect_success 'bisect state output with multiple good commits' '
+ git bisect reset &&
+ git bisect start >output &&
+ grep "waiting for both good and bad commits" output &&
+ git bisect log >output &&
+ grep "waiting for both good and bad commits" output &&
+ git bisect good "$HASH1" >output &&
+ grep "waiting for bad commit, 1 good commit known" output &&
+ git bisect log >output &&
+ grep "waiting for bad commit, 1 good commit known" output &&
+ git bisect good "$HASH2" >output &&
+ grep "waiting for bad commit, 2 good commits known" output &&
+ git bisect log >output &&
+ grep "waiting for bad commit, 2 good commits known" output
+'
+
+test_expect_success 'bisect state output with bad commit' '
+ git bisect reset &&
+ git bisect start >output &&
+ grep "waiting for both good and bad commits" output &&
+ git bisect log >output &&
+ grep "waiting for both good and bad commits" output &&
+ git bisect bad "$HASH4" >output &&
+ grep -F "waiting for good commit(s), bad commit known" output &&
+ git bisect log >output &&
+ grep -F "waiting for good commit(s), bad commit known" output
+'
+
test_done
diff --git a/t/t6060-merge-index.sh b/t/t6060-merge-index.sh
index ddf34f0..ed449ab 100755
--- a/t/t6060-merge-index.sh
+++ b/t/t6060-merge-index.sh
@@ -4,9 +4,7 @@
. ./test-lib.sh
test_expect_success 'setup diverging branches' '
- for i in 1 2 3 4 5 6 7 8 9 10; do
- echo $i
- done >file &&
+ test_write_lines 1 2 3 4 5 6 7 8 9 10 >file &&
git add file &&
git commit -m base &&
git tag base &&
diff --git a/t/t6100-rev-list-in-order.sh b/t/t6100-rev-list-in-order.sh
index e934bc2..88ed7bd 100755
--- a/t/t6100-rev-list-in-order.sh
+++ b/t/t6100-rev-list-in-order.sh
@@ -2,6 +2,7 @@
test_description='rev-list testing in-commit-order'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup a commit history with trees, blobs' '
diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh
index 78b5851..a3a41c7 100755
--- a/t/t6101-rev-parse-parents.sh
+++ b/t/t6101-rev-parse-parents.sh
@@ -8,6 +8,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_cmp_rev_output () {
@@ -32,7 +33,7 @@
test_tick &&
git commit --allow-empty -m "$i" &&
commit=$(git rev-parse --verify HEAD) &&
- printf "$commit " >>.git/info/grafts
+ printf "$commit " >>.git/info/grafts || return 1
done
'
diff --git a/t/t6102-rev-list-unexpected-objects.sh b/t/t6102-rev-list-unexpected-objects.sh
index 52cde09..cf0195e 100755
--- a/t/t6102-rev-list-unexpected-objects.sh
+++ b/t/t6102-rev-list-unexpected-objects.sh
@@ -2,6 +2,7 @@
test_description='git rev-list should handle unexpected object types'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup well-formed objects' '
@@ -16,8 +17,13 @@
broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
'
-test_expect_failure 'traverse unexpected non-blob entry (lone)' '
- test_must_fail git rev-list --objects $broken_tree
+test_expect_success !SANITIZE_LEAK 'TODO (should fail!): traverse unexpected non-blob entry (lone)' '
+ sed "s/Z$//" >expect <<-EOF &&
+ $broken_tree Z
+ $tree foo
+ EOF
+ git rev-list --objects $broken_tree >actual &&
+ test_cmp expect actual
'
test_expect_success 'traverse unexpected non-blob entry (seen)' '
@@ -115,8 +121,8 @@
tag=$(git hash-object -w --literally -t tag broken-tag)
'
-test_expect_failure 'traverse unexpected non-blob tag (lone)' '
- test_must_fail git rev-list --objects $tag
+test_expect_success !SANITIZE_LEAK 'TODO (should fail!): traverse unexpected non-blob tag (lone)' '
+ git rev-list --objects $tag
'
test_expect_success 'traverse unexpected non-blob tag (seen)' '
diff --git a/t/t6110-rev-list-sparse.sh b/t/t6110-rev-list-sparse.sh
index 13c1da5..ddefc7f 100755
--- a/t/t6110-rev-list-sparse.sh
+++ b/t/t6110-rev-list-sparse.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t6111-rev-list-treesame.sh b/t/t6111-rev-list-treesame.sh
index e07b607..90ff141 100755
--- a/t/t6111-rev-list-treesame.sh
+++ b/t/t6111-rev-list-treesame.sh
@@ -23,7 +23,8 @@
}
unnote () {
- git name-rev --tags --stdin | sed -e "s|$OID_REGEX (tags/\([^)]*\))\([ ]\)|\1\2|g"
+ git name-rev --tags --annotate-stdin | \
+ sed -e "s|$OID_REGEX (tags/\([^)]*\))\([ ]\)|\1\2|g"
}
test_expect_success setup '
diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
index 4ade105..8d9d660 100755
--- a/t/t6112-rev-list-filters-objects.sh
+++ b/t/t6112-rev-list-filters-objects.sh
@@ -16,9 +16,9 @@
git init r1 &&
for n in 1 2 3 4 5
do
- echo "This is file: $n" > r1/file.$n
- git -C r1 add file.$n
- git -C r1 commit -m "$n"
+ echo "This is file: $n" > r1/file.$n &&
+ git -C r1 add file.$n &&
+ git -C r1 commit -m "$n" || return 1
done
'
@@ -73,9 +73,9 @@
git init r2 &&
for n in 1000 10000
do
- printf "%"$n"s" X > r2/large.$n
- git -C r2 add large.$n
- git -C r2 commit -m "$n"
+ printf "%"$n"s" X > r2/large.$n &&
+ git -C r2 add large.$n &&
+ git -C r2 commit -m "$n" || return 1
done
'
@@ -245,10 +245,10 @@
mkdir r3/dir1 &&
for n in sparse1 sparse2
do
- echo "This is file: $n" > r3/$n
- git -C r3 add $n
- echo "This is file: dir1/$n" > r3/dir1/$n
- git -C r3 add dir1/$n
+ echo "This is file: $n" > r3/$n &&
+ git -C r3 add $n &&
+ echo "This is file: dir1/$n" > r3/dir1/$n &&
+ git -C r3 add dir1/$n || return 1
done &&
git -C r3 commit -m "sparse" &&
echo dir1/ >pattern1 &&
@@ -672,7 +672,7 @@
for id in `cat expected | sed "s|..|&/|"`
do
- rm r1/.git/objects/$id
+ rm r1/.git/objects/$id || return 1
done &&
git -C r1 rev-list --quiet --missing=print --objects HEAD >revs &&
diff --git a/t/t6114-keep-packs.sh b/t/t6114-keep-packs.sh
index 9239d8a..44246f8 100755
--- a/t/t6114-keep-packs.sh
+++ b/t/t6114-keep-packs.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='rev-list with .keep packs'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index bae2419..9a35e78 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -262,7 +262,7 @@
>expect.unsorted &&
for rev in $(git rev-list --all)
do
- git name-rev $rev >>expect.unsorted
+ git name-rev $rev >>expect.unsorted || return 1
done &&
sort <expect.unsorted >expect &&
git name-rev --all >actual.unsorted &&
@@ -270,19 +270,24 @@
test_cmp expect actual
'
-test_expect_success 'name-rev --stdin' '
+test_expect_success 'name-rev --annotate-stdin' '
>expect.unsorted &&
for rev in $(git rev-list --all)
do
name=$(git name-rev --name-only $rev) &&
- echo "$rev ($name)" >>expect.unsorted
+ echo "$rev ($name)" >>expect.unsorted || return 1
done &&
sort <expect.unsorted >expect &&
- git rev-list --all | git name-rev --stdin >actual.unsorted &&
+ git rev-list --all | git name-rev --annotate-stdin >actual.unsorted &&
sort <actual.unsorted >actual &&
test_cmp expect actual
'
+test_expect_success 'name-rev --stdin deprecated' "
+ git rev-list --all | git name-rev --stdin 2>actual &&
+ grep -E 'warning: --stdin is deprecated' actual
+"
+
test_expect_success 'describe --contains with the exact tags' '
echo "A^0" >expect &&
tag_object=$(git rev-parse refs/tags/A) &&
@@ -390,9 +395,12 @@
committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
data <<EOF
commit #$i
-EOF"
- test $i = 1 && echo "from refs/heads/main^0"
- i=$(($i + 1))
+EOF" &&
+ if test $i = 1
+ then
+ echo "from refs/heads/main^0"
+ fi &&
+ i=$(($i + 1)) || return 1
done | git fast-import &&
git checkout main &&
git tag far-far-away HEAD^ &&
@@ -480,6 +488,124 @@
)
'
+# A-B-C-D-E-main
+#
+# Where C has a non-monotonically increasing commit timestamp w.r.t. other
+# commits
+test_expect_success 'non-monotonic commit dates setup' '
+ UNIX_EPOCH_ZERO="@0 +0000" &&
+ git init non-monotonic &&
+ test_commit -C non-monotonic A &&
+ test_commit -C non-monotonic --no-tag B &&
+ test_commit -C non-monotonic --no-tag --date "$UNIX_EPOCH_ZERO" C &&
+ test_commit -C non-monotonic D &&
+ test_commit -C non-monotonic E
+'
+
+test_expect_success 'name-rev with commitGraph handles non-monotonic timestamps' '
+ test_config -C non-monotonic core.commitGraph true &&
+ (
+ cd non-monotonic &&
+
+ git commit-graph write --reachable &&
+
+ echo "main~3 tags/D~2" >expect &&
+ git name-rev --tags main~3 >actual &&
+
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'name-rev --all works with non-monotonic timestamps' '
+ test_config -C non-monotonic core.commitGraph false &&
+ (
+ cd non-monotonic &&
+
+ rm -rf .git/info/commit-graph* &&
+
+ cat >tags <<-\EOF &&
+ tags/E
+ tags/D
+ tags/D~1
+ tags/D~2
+ tags/A
+ EOF
+
+ git log --pretty=%H >revs &&
+
+ paste -d" " revs tags | sort >expect &&
+
+ git name-rev --tags --all | sort >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'name-rev --annotate-stdin works with non-monotonic timestamps' '
+ test_config -C non-monotonic core.commitGraph false &&
+ (
+ cd non-monotonic &&
+
+ rm -rf .git/info/commit-graph* &&
+
+ cat >expect <<-\EOF &&
+ E
+ D
+ D~1
+ D~2
+ A
+ EOF
+
+ git log --pretty=%H >revs &&
+ git name-rev --tags --annotate-stdin --name-only <revs >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'name-rev --all works with commitGraph' '
+ test_config -C non-monotonic core.commitGraph true &&
+ (
+ cd non-monotonic &&
+
+ git commit-graph write --reachable &&
+
+ cat >tags <<-\EOF &&
+ tags/E
+ tags/D
+ tags/D~1
+ tags/D~2
+ tags/A
+ EOF
+
+ git log --pretty=%H >revs &&
+
+ paste -d" " revs tags | sort >expect &&
+
+ git name-rev --tags --all | sort >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'name-rev --annotate-stdin works with commitGraph' '
+ test_config -C non-monotonic core.commitGraph true &&
+ (
+ cd non-monotonic &&
+
+ git commit-graph write --reachable &&
+
+ cat >expect <<-\EOF &&
+ E
+ D
+ D~1
+ D~2
+ A
+ EOF
+
+ git log --pretty=%H >revs &&
+ git name-rev --tags --annotate-stdin --name-only <revs >actual &&
+ test_cmp expect actual
+ )
+'
+
# B
# o
# \
diff --git a/t/t6131-pathspec-icase.sh b/t/t6131-pathspec-icase.sh
index 39fc3f6..770cce0 100755
--- a/t/t6131-pathspec-icase.sh
+++ b/t/t6131-pathspec-icase.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test case insensitive pathspec limiting'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
if test_have_prereq CASE_INSENSITIVE_FS
diff --git a/t/t6132-pathspec-exclude.sh b/t/t6132-pathspec-exclude.sh
index 30328b8..9fdafeb 100755
--- a/t/t6132-pathspec-exclude.sh
+++ b/t/t6132-pathspec-exclude.sh
@@ -11,7 +11,7 @@
fi &&
: >$p &&
git add $p &&
- git commit -m $p
+ git commit -m $p || return 1
done &&
git log --oneline --format=%s >actual &&
cat <<EOF >expect &&
@@ -195,6 +195,7 @@
'
test_expect_success 't_e_i() exclude case #8' '
+ test_when_finished "rm -fr case8" &&
git init case8 &&
(
cd case8 &&
@@ -244,4 +245,184 @@
test_cmp expect-grep actual-grep
'
+# Depending on the command, all negative pathspec needs to subtract
+# either from the full tree, or from the current directory.
+#
+# The sample tree checked out at this point has:
+# file
+# sub/file
+# sub/file2
+# sub/sub/file
+# sub/sub/sub/file
+# sub2/file
+#
+# but there may also be some cruft that interferes with "git clean"
+# and "git add" tests.
+
+test_expect_success 'archive with all negative' '
+ git reset --hard &&
+ git clean -f &&
+ git -C sub archive --format=tar HEAD -- ":!sub/" >archive &&
+ "$TAR" tf archive >actual &&
+ cat >expect <<-\EOF &&
+ file
+ file2
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'add with all negative' '
+ H=$(git rev-parse HEAD) &&
+ git reset --hard $H &&
+ git clean -f &&
+ test_when_finished "git reset --hard $H" &&
+ for path in file sub/file sub/sub/file sub2/file
+ do
+ echo smudge >>"$path" || return 1
+ done &&
+ git -C sub add -- ":!sub/" &&
+ git diff --name-only --no-renames --cached >actual &&
+ cat >expect <<-\EOF &&
+ file
+ sub/file
+ sub2/file
+ EOF
+ test_cmp expect actual &&
+ git diff --name-only --no-renames >actual &&
+ echo sub/sub/file >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'add -p with all negative' '
+ H=$(git rev-parse HEAD) &&
+ git reset --hard $H &&
+ git clean -f &&
+ test_when_finished "git reset --hard $H" &&
+ for path in file sub/file sub/sub/file sub2/file
+ do
+ echo smudge >>"$path" || return 1
+ done &&
+ yes | git -C sub add -p -- ":!sub/" &&
+ git diff --name-only --no-renames --cached >actual &&
+ cat >expect <<-\EOF &&
+ file
+ sub/file
+ sub2/file
+ EOF
+ test_cmp expect actual &&
+ git diff --name-only --no-renames >actual &&
+ echo sub/sub/file >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'clean with all negative' '
+ H=$(git rev-parse HEAD) &&
+ git reset --hard $H &&
+ test_when_finished "git reset --hard $H && git clean -f" &&
+ git clean -f &&
+ for path in file9 sub/file9 sub/sub/file9 sub2/file9
+ do
+ echo cruft >"$path" || return 1
+ done &&
+ git -C sub clean -f -- ":!sub" &&
+ test_path_is_file file9 &&
+ test_path_is_missing sub/file9 &&
+ test_path_is_file sub/sub/file9 &&
+ test_path_is_file sub2/file9
+'
+
+test_expect_success 'commit with all negative' '
+ H=$(git rev-parse HEAD) &&
+ git reset --hard $H &&
+ test_when_finished "git reset --hard $H" &&
+ for path in file sub/file sub/sub/file sub2/file
+ do
+ echo smudge >>"$path" || return 1
+ done &&
+ git -C sub commit -m sample -- ":!sub/" &&
+ git diff --name-only --no-renames HEAD^ HEAD >actual &&
+ cat >expect <<-\EOF &&
+ file
+ sub/file
+ sub2/file
+ EOF
+ test_cmp expect actual &&
+ git diff --name-only --no-renames HEAD >actual &&
+ echo sub/sub/file >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'reset with all negative' '
+ H=$(git rev-parse HEAD) &&
+ git reset --hard $H &&
+ test_when_finished "git reset --hard $H" &&
+ for path in file sub/file sub/sub/file sub2/file
+ do
+ echo smudge >>"$path" &&
+ git add "$path" || return 1
+ done &&
+ git -C sub reset --quiet -- ":!sub/" &&
+ git diff --name-only --no-renames --cached >actual &&
+ echo sub/sub/file >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'grep with all negative' '
+ H=$(git rev-parse HEAD) &&
+ git reset --hard $H &&
+ test_when_finished "git reset --hard $H" &&
+ for path in file sub/file sub/sub/file sub2/file
+ do
+ echo "needle $path" >>"$path" || return 1
+ done &&
+ git -C sub grep -h needle -- ":!sub/" >actual &&
+ cat >expect <<-\EOF &&
+ needle sub/file
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'ls-files with all negative' '
+ git reset --hard &&
+ git -C sub ls-files -- ":!sub/" >actual &&
+ cat >expect <<-\EOF &&
+ file
+ file2
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'rm with all negative' '
+ git reset --hard &&
+ test_when_finished "git reset --hard" &&
+ git -C sub rm -r --cached -- ":!sub/" >actual &&
+ git diff --name-only --no-renames --diff-filter=D --cached >actual &&
+ cat >expect <<-\EOF &&
+ sub/file
+ sub/file2
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'stash with all negative' '
+ H=$(git rev-parse HEAD) &&
+ git reset --hard $H &&
+ test_when_finished "git reset --hard $H" &&
+ for path in file sub/file sub/sub/file sub2/file
+ do
+ echo smudge >>"$path" || return 1
+ done &&
+ git -C sub stash push -m sample -- ":!sub/" &&
+ git diff --name-only --no-renames HEAD >actual &&
+ echo sub/sub/file >expect &&
+ test_cmp expect actual &&
+ git stash show --name-only >actual &&
+ cat >expect <<-\EOF &&
+ file
+ sub/file
+ sub2/file
+ EOF
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t6136-pathspec-in-bare.sh b/t/t6136-pathspec-in-bare.sh
index b117251..ae8b537 100755
--- a/t/t6136-pathspec-in-bare.sh
+++ b/t/t6136-pathspec-in-bare.sh
@@ -2,6 +2,7 @@
test_description='diagnosing out-of-scope pathspec'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup a bare and non-bare repository' '
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 44f55d9..5a221f8 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -81,6 +81,36 @@
git tag -s -m signed-tag-msg signed-good-tag left
'
+test_expect_success GPGSSH 'created ssh signed commit and tag' '
+ test_config gpg.format ssh &&
+ git checkout -b signed-ssh &&
+ touch file &&
+ git add file &&
+ git commit -m "ssh signed" -S"${GPGSSH_KEY_PRIMARY}" &&
+ git tag -s -u"${GPGSSH_KEY_PRIMARY}" -m signed-ssh-tag-msg signed-good-ssh-tag left &&
+ git tag -s -u"${GPGSSH_KEY_UNTRUSTED}" -m signed-ssh-tag-msg-untrusted signed-untrusted-ssh-tag left
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'create signed tags with keys having defined lifetimes' '
+ test_when_finished "test_unconfig commit.gpgsign" &&
+ test_config gpg.format ssh &&
+ git checkout -b signed-expiry-ssh &&
+ touch file &&
+ git add file &&
+
+ echo expired >file && test_tick && git commit -a -m expired -S"${GPGSSH_KEY_EXPIRED}" &&
+ git tag -s -u "${GPGSSH_KEY_EXPIRED}" -m expired-signed expired-signed &&
+
+ echo notyetvalid >file && test_tick && git commit -a -m notyetvalid -S"${GPGSSH_KEY_NOTYETVALID}" &&
+ git tag -s -u "${GPGSSH_KEY_NOTYETVALID}" -m notyetvalid-signed notyetvalid-signed &&
+
+ echo timeboxedvalid >file && test_tick && git commit -a -m timeboxedvalid -S"${GPGSSH_KEY_TIMEBOXEDVALID}" &&
+ git tag -s -u "${GPGSSH_KEY_TIMEBOXEDVALID}" -m timeboxedvalid-signed timeboxedvalid-signed &&
+
+ echo timeboxedinvalid >file && test_tick && git commit -a -m timeboxedinvalid -S"${GPGSSH_KEY_TIMEBOXEDINVALID}" &&
+ git tag -s -u "${GPGSSH_KEY_TIMEBOXEDINVALID}" -m timeboxedinvalid-signed timeboxedinvalid-signed
+'
+
test_expect_success 'message for merging local branch' '
echo "Merge branch ${apos}left${apos}" >expected &&
@@ -94,8 +124,9 @@
test_expect_success GPG 'message for merging local tag signed by good key' '
git checkout main &&
git fetch . signed-good-tag &&
- git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
+ git fmt-merge-msg <.git/FETCH_HEAD >actual &&
grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
+ grep "^signed-tag-msg" actual &&
grep "^# gpg: Signature made" actual &&
grep "^# gpg: Good signature from" actual
'
@@ -103,12 +134,77 @@
test_expect_success GPG 'message for merging local tag signed by unknown key' '
git checkout main &&
git fetch . signed-good-tag &&
- GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
+ GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual &&
grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
+ grep "^signed-tag-msg" actual &&
grep "^# gpg: Signature made" actual &&
grep -E "^# gpg: Can${apos}t check signature: (public key not found|No public key)" actual
'
+test_expect_success GPGSSH 'message for merging local tag signed by good ssh key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git checkout main &&
+ git fetch . signed-good-ssh-tag &&
+ git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+ grep "^Merge tag ${apos}signed-good-ssh-tag${apos}" actual &&
+ grep "^signed-ssh-tag-msg" actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH 'message for merging local tag signed by unknown ssh key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git checkout main &&
+ git fetch . signed-untrusted-ssh-tag &&
+ git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+ grep "^Merge tag ${apos}signed-untrusted-ssh-tag${apos}" actual &&
+ grep "^signed-ssh-tag-msg-untrusted" actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ grep "${GPGSSH_KEY_NOT_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag signed by expired ssh key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git checkout main &&
+ git fetch . expired-signed &&
+ git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+ grep "^Merge tag ${apos}expired-signed${apos}" actual &&
+ grep "^expired-signed" actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag signed by not yet valid ssh key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git checkout main &&
+ git fetch . notyetvalid-signed &&
+ git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+ grep "^Merge tag ${apos}notyetvalid-signed${apos}" actual &&
+ grep "^notyetvalid-signed" actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag signed by valid timeboxed ssh key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git checkout main &&
+ git fetch . timeboxedvalid-signed &&
+ git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+ grep "^Merge tag ${apos}timeboxedvalid-signed${apos}" actual &&
+ grep "^timeboxedvalid-signed" actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag signed by invalid timeboxed ssh key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git checkout main &&
+ git fetch . timeboxedinvalid-signed &&
+ git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+ grep "^Merge tag ${apos}timeboxedinvalid-signed${apos}" actual &&
+ grep "^timeboxedinvalid-signed" actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
test_expect_success 'message for merging external branch' '
echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
@@ -491,7 +587,7 @@
while test $i -gt 9
do
echo " $i" &&
- i=$(($i-1))
+ i=$(($i-1)) || return 1
done &&
echo " ..."
} >expected &&
@@ -545,7 +641,35 @@
test_cmp expected .git/MERGE_MSG
'
+test_expect_success 'merge --into-name=<name>' '
+ test_when_finished "git checkout main" &&
+ git checkout -B side main &&
+ git commit --allow-empty -m "One step ahead" &&
+
+ git checkout --detach main &&
+ git merge --no-ff side &&
+ git show -s --format="%s" >full.0 &&
+ head -n1 full.0 >actual &&
+ # expect that HEAD is shown as-is
+ grep -e "Merge branch .side. into HEAD$" actual &&
+
+ git reset --hard main &&
+ git merge --no-ff --into-name=main side &&
+ git show -s --format="%s" >full.1 &&
+ head -n1 full.1 >actual &&
+ # expect that we pretend to be merging to main, that is suppressed
+ grep -e "Merge branch .side.$" actual &&
+
+ git checkout -b throwaway main &&
+ git merge --no-ff --into-name=main side &&
+ git show -s --format="%s" >full.2 &&
+ head -n1 full.2 >actual &&
+ # expect that we pretend to be merging to main, that is suppressed
+ grep -e "Merge branch .side.$" actual
+'
+
test_expect_success 'merge.suppressDest configuration' '
+ test_when_finished "git checkout main" &&
git checkout -B side main &&
git commit --allow-empty -m "One step ahead" &&
git checkout main &&
@@ -562,7 +686,19 @@
git -c merge.suppressDest="ma?*[rn]" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
head -n1 full.3 >actual &&
grep -e "Merge branch .side." actual &&
- ! grep -e " into main$" actual
+ ! grep -e " into main$" actual &&
+
+ git checkout --detach HEAD &&
+ git -c merge.suppressDest="main" fmt-merge-msg <.git/FETCH_HEAD >full.4 &&
+ head -n1 full.4 >actual &&
+ grep -e "Merge branch .side. into HEAD$" actual &&
+
+ git -c merge.suppressDest="main" fmt-merge-msg \
+ --into-name=main <.git/FETCH_HEAD >full.5 &&
+ head -n1 full.5 >actual &&
+ grep -e "Merge branch .side." actual &&
+ ! grep -e " into main$" actual &&
+ ! grep -e " into HEAD$" actual
'
test_done
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 80679d5..dcaab72 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -5,9 +5,6 @@
test_description='for-each-ref test'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-gpg.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
@@ -419,6 +416,11 @@
test_cmp expected actual
'
+test_expect_success 'Give help even with invalid sort atoms' '
+ test_expect_code 129 git for-each-ref --sort=bogus -h >actual 2>&1 &&
+ grep "^usage: git for-each-ref" actual
+'
+
cat >expected <<\EOF
refs/tags/testtag
refs/tags/testtag-2
@@ -950,10 +952,7 @@
'
test_expect_success '%(raw:size) with --shell' '
- git for-each-ref --format="%(raw:size)" | while read line
- do
- echo "'\''$line'\''" >>expect
- done &&
+ git for-each-ref --format="%(raw:size)" | sed "s/^/$SQ/;s/$/$SQ/" >expect &&
git for-each-ref --format="%(raw:size)" --shell >actual &&
test_cmp expect actual
'
@@ -1019,6 +1018,27 @@
test_cmp expected actual
'
+test_expect_success '--no-sort cancels the previous sort keys' '
+ 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=-refname \
+ --sort=taggeremail \
+ --no-sort \
+ --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 main" &&
git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
@@ -1315,7 +1335,7 @@
echo "${pair#*=}" >expect &&
git for-each-ref --format="${pair%=*}" \
refs/heads/main >actual &&
- test_cmp expect actual
+ test_cmp expect actual || exit 1
done &&
git branch push-simple &&
git config branch.push-simple.pushRemote from &&
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index 1537aa2..1ce5f49 100755
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -2,9 +2,6 @@
test_description='test for-each-refs usage of ref-filter APIs'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-gpg.sh
diff --git a/t/t6404-recursive-merge.sh b/t/t6404-recursive-merge.sh
index eaf48e9..b8735c6 100755
--- a/t/t6404-recursive-merge.sh
+++ b/t/t6404-recursive-merge.sh
@@ -108,8 +108,13 @@
printf "\0\0" >binary-file &&
git add binary-file &&
git commit -m binary2 &&
- test_must_fail git merge F >merge.out 2>merge.err &&
- grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge.err
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_must_fail git merge F >merge_output
+ else
+ test_must_fail git merge F 2>merge_output
+ fi &&
+ grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge_output
'
test_expect_success 'mark rename/delete as unmerged' '
diff --git a/t/t6406-merge-attr.sh b/t/t6406-merge-attr.sh
index 8494645..99abefd 100755
--- a/t/t6406-merge-attr.sh
+++ b/t/t6406-merge-attr.sh
@@ -62,10 +62,10 @@
test_expect_success merge '
- {
- echo "binary -merge"
- echo "union merge=union"
- } >.gitattributes &&
+ cat >.gitattributes <<-\EOF &&
+ binary -merge
+ union merge=union
+ EOF
if git merge main
then
@@ -221,8 +221,13 @@
printf "two\0" >bin.txt &&
git commit -am two &&
- test_must_fail git merge bin-main 2>stderr &&
- grep -i "warning.*cannot merge.*HEAD vs. bin-main" stderr
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_must_fail git merge bin-main >output
+ else
+ test_must_fail git merge bin-main 2>output
+ fi &&
+ grep -i "warning.*cannot merge.*HEAD vs. bin-main" output
'
test_done
diff --git a/t/t6407-merge-binary.sh b/t/t6407-merge-binary.sh
index d4273f2..0753fc9 100755
--- a/t/t6407-merge-binary.sh
+++ b/t/t6407-merge-binary.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -42,14 +43,9 @@
rm -f a* m* &&
git reset --hard anchor &&
- if git merge -s resolve main
- then
- echo Oops, should not have succeeded
- false
- else
- git ls-files -s >current
- test_cmp expect current
- fi
+ test_must_fail git merge -s resolve main &&
+ git ls-files -s >current &&
+ test_cmp expect current
'
test_expect_success recursive '
@@ -57,14 +53,9 @@
rm -f a* m* &&
git reset --hard anchor &&
- if git merge -s recursive main
- then
- echo Oops, should not have succeeded
- false
- else
- git ls-files -s >current
- test_cmp expect current
- fi
+ test_must_fail git merge -s recursive main &&
+ git ls-files -s >current &&
+ test_cmp expect current
'
test_done
diff --git a/t/t6409-merge-subtree.sh b/t/t6409-merge-subtree.sh
index ba7890e..e9ba6f1 100755
--- a/t/t6409-merge-subtree.sh
+++ b/t/t6409-merge-subtree.sh
@@ -10,7 +10,7 @@
test_expect_success setup '
s="1 2 3 4 5 6 7 8" &&
- for i in $s; do echo $i; done >hello &&
+ test_write_lines $s >hello &&
git add hello &&
git commit -m initial &&
git checkout -b side &&
@@ -18,7 +18,7 @@
git add hello &&
git commit -m second &&
git checkout main &&
- for i in mundo $s; do echo $i; done >hello &&
+ test_write_lines mundo $s >hello &&
git add hello &&
git commit -m main
@@ -27,7 +27,7 @@
test_expect_success 'subtree available and works like recursive' '
git merge -s subtree side &&
- for i in mundo $s world; do echo $i; done >expect &&
+ test_write_lines mundo $s world >expect &&
test_cmp expect hello
'
diff --git a/t/t6411-merge-filemode.sh b/t/t6411-merge-filemode.sh
index f54c915..6ae2489 100755
--- a/t/t6411-merge-filemode.sh
+++ b/t/t6411-merge-filemode.sh
@@ -51,10 +51,10 @@
: >file2 &&
git add file2 &&
git commit -m b2 &&
- {
- echo "100755 $H 2 file2"
- echo "100644 $H 3 file2"
- } >expect
+ cat >expect <<-EOF
+ 100755 $H 2 file2
+ 100644 $H 3 file2
+ EOF
'
do_both_modes () {
diff --git a/t/t6412-merge-large-rename.sh b/t/t6412-merge-large-rename.sh
index c50d315..ca018d1 100755
--- a/t/t6412-merge-large-rename.sh
+++ b/t/t6412-merge-large-rename.sh
@@ -37,18 +37,18 @@
test_might_fail git branch -D test$n &&
git reset --hard initial &&
for i in $(count $n); do
- make_text $i initial initial >$i
+ make_text $i initial initial >$i || return 1
done &&
git add . &&
git commit -m add=$n &&
for i in $(count $n); do
- make_text $i changed initial >$i
+ make_text $i changed initial >$i || return 1
done &&
git commit -a -m change=$n &&
git checkout -b test$n HEAD^ &&
for i in $(count $n); do
- git rm $i
- make_text $i initial changed >$i.moved
+ git rm $i &&
+ make_text $i initial changed >$i.moved || return 1
done &&
git add . &&
git commit -m change+rename=$n &&
@@ -79,7 +79,7 @@
git reset --hard initial &&
for i in $(count 200); do
- make_text foo bar baz >$i
+ make_text foo bar baz >$i || return 1
done &&
git add . &&
git commit -m create-files &&
diff --git a/t/t6414-merge-rename-nocruft.sh b/t/t6414-merge-rename-nocruft.sh
index d7e3c1f..69fc1c9 100755
--- a/t/t6414-merge-rename-nocruft.sh
+++ b/t/t6414-merge-rename-nocruft.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh
index 84f5082..690c848 100755
--- a/t/t6416-recursive-corner-cases.sh
+++ b/t/t6416-recursive-corner-cases.sh
@@ -24,14 +24,8 @@
cd basic-rename &&
ten="0 1 2 3 4 5 6 7 8 9" &&
- for i in $ten
- do
- echo line $i in a sample file
- done >one &&
- for i in $ten
- do
- echo line $i in another sample file
- done >two &&
+ printf "line %d in a sample file\n" $ten >one &&
+ printf "line %d in another sample file\n" $ten >two &&
git add one two &&
test_tick && git commit -m initial &&
@@ -96,14 +90,8 @@
cd rename-modify &&
ten="0 1 2 3 4 5 6 7 8 9" &&
- for i in $ten
- do
- echo line $i in a sample file
- done >one &&
- for i in $ten
- do
- echo line $i in another sample file
- done >two &&
+ printf "line %d in a sample file\n" $ten >one &&
+ printf "line %d in another sample file\n" $ten >two &&
git add one two &&
test_tick && git commit -m initial &&
@@ -1588,10 +1576,7 @@
cd nested_conflicts &&
# Create some related files now
- for i in $(test_seq 1 10)
- do
- echo Random base content line $i
- done >initial &&
+ printf "Random base content line %d\n" $(test_seq 1 10) >initial &&
cp initial b_L1 &&
cp initial b_R1 &&
@@ -1777,10 +1762,7 @@
cd virtual_merge_base_has_nested_conflicts &&
# Create some related files now
- for i in $(test_seq 1 10)
- do
- echo Random base content line $i
- done >content &&
+ printf "Random base content line %d\n" $(test_seq 1 10) >content &&
# Setup original commit
git add content &&
diff --git a/t/t6417-merge-ours-theirs.sh b/t/t6417-merge-ours-theirs.sh
index ec065d6..62d1406 100755
--- a/t/t6417-merge-ours-theirs.sh
+++ b/t/t6417-merge-ours-theirs.sh
@@ -7,10 +7,7 @@
. ./test-lib.sh
test_expect_success setup '
- for i in 1 2 3 4 5 6 7 8 9
- do
- echo "$i"
- done >file &&
+ test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
git add file &&
cp file elif &&
git commit -m initial &&
diff --git a/t/t6418-merge-text-auto.sh b/t/t6418-merge-text-auto.sh
index 1e0296d..41288a6 100755
--- a/t/t6418-merge-text-auto.sh
+++ b/t/t6418-merge-text-auto.sh
@@ -204,4 +204,30 @@
test_path_is_missing file
'
+test_expect_success 'rename/delete vs. renormalization' '
+ git init subrepo &&
+ (
+ cd subrepo &&
+ echo foo >oldfile &&
+ git add oldfile &&
+ git commit -m original &&
+
+ git branch rename &&
+ git branch nuke &&
+
+ git checkout rename &&
+ git mv oldfile newfile &&
+ git commit -m renamed &&
+
+ git checkout nuke &&
+ git rm oldfile &&
+ git commit -m deleted &&
+
+ git checkout rename^0 &&
+ test_must_fail git -c merge.renormalize=true merge nuke >out &&
+
+ grep "rename/delete" out
+ )
+'
+
test_done
diff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh
index 5b81a13..479db32 100755
--- a/t/t6423-merge-rename-directories.sh
+++ b/t/t6423-merge-rename-directories.sh
@@ -4421,14 +4421,14 @@
git checkout A &&
git mv node2/ node1/ &&
- for i in `git ls-files`; do echo side A >>$i; done &&
+ for i in $(git ls-files); do echo side A >>$i; done &&
git add -u &&
test_tick &&
git commit -m "A" &&
git checkout B &&
git mv node1/ node2/ &&
- for i in `git ls-files`; do echo side B >>$i; done &&
+ for i in $(git ls-files); do echo side B >>$i; done &&
git add -u &&
test_tick &&
git commit -m "B"
@@ -4511,7 +4511,7 @@
git checkout A &&
git mv node2/ node1/ &&
- for i in `git ls-files`; do echo side A >>$i; done &&
+ for i in $(git ls-files); do echo side A >>$i; done &&
git add -u &&
echo leaf5 >node1/leaf5 &&
git add node1/leaf5 &&
@@ -4520,7 +4520,7 @@
git checkout B &&
git mv node1/ node2/ &&
- for i in `git ls-files`; do echo side B >>$i; done &&
+ for i in $(git ls-files); do echo side B >>$i; done &&
git add -u &&
echo leaf6 >node2/leaf6 &&
git add node2/leaf6 &&
@@ -4759,7 +4759,7 @@
echo g >dir/subdir/tweaked/g &&
echo h >dir/subdir/tweaked/h &&
test_seq 20 30 >dir/subdir/tweaked/Makefile &&
- for i in `test_seq 1 88`; do
+ for i in $(test_seq 1 88); do
echo content $i >dir/unchanged/file_$i
done &&
git add . &&
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index 89dd544..b6e424a 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -71,7 +71,9 @@
git merge E^0 &&
test_must_fail git rev-parse HEAD:random_file &&
- test "$(git diff --name-only --cached E)" = "random_file"
+ test "$(git diff --name-only --cached E)" = "random_file" &&
+ test_path_is_file random_file &&
+ git rev-parse --verify :random_file
'
test_expect_success 'ff update, important file modified' '
@@ -83,6 +85,8 @@
git add subdir/e &&
test_must_fail git merge E^0 &&
+ test_path_is_file subdir/e &&
+ git rev-parse --verify :subdir/e &&
test_path_is_missing .git/MERGE_HEAD
'
@@ -93,6 +97,8 @@
touch random_file && git add random_file &&
test_must_fail git merge -s resolve C^0 &&
+ test_path_is_file random_file &&
+ git rev-parse --verify :random_file &&
test_path_is_missing .git/MERGE_HEAD
'
@@ -103,6 +109,8 @@
touch random_file && git add random_file &&
test_must_fail git merge -s resolve D^0 &&
+ test_path_is_file random_file &&
+ git rev-parse --verify :random_file &&
test_path_is_missing .git/MERGE_HEAD
'
@@ -113,6 +121,8 @@
touch random_file && git add random_file &&
test_must_fail git merge -s recursive C^0 &&
+ test_path_is_file random_file &&
+ git rev-parse --verify :random_file &&
test_path_is_missing .git/MERGE_HEAD
'
@@ -145,9 +155,12 @@
mkdir subdir &&
test_seq 1 10 >subdir/a &&
git add subdir/a &&
+ git rev-parse --verify :subdir/a >expect &&
# We have staged changes; merge should error out
test_must_fail git merge -s recursive E^0 2>err &&
+ git rev-parse --verify :subdir/a >actual &&
+ test_cmp expect actual &&
test_i18ngrep "changes to the following files would be overwritten" err
'
@@ -158,9 +171,12 @@
mkdir subdir &&
test_seq 1 11 >subdir/a &&
git add subdir/a &&
+ git rev-parse --verify :subdir/a >expect &&
# We have staged changes; merge should error out
test_must_fail git merge -s recursive E^0 2>err &&
+ git rev-parse --verify :subdir/a >actual &&
+ test_cmp expect actual &&
test_i18ngrep "changes to the following files would be overwritten" err
'
@@ -171,7 +187,9 @@
touch random_file && git add random_file &&
test_must_fail git merge C^0 D^0 &&
- test_path_is_missing .git/MERGE_HEAD
+ test_path_is_missing .git/MERGE_HEAD &&
+ git rev-parse --verify :random_file &&
+ test_path_exists random_file
'
test_expect_success 'octopus, related file removed' '
@@ -181,6 +199,8 @@
git rm b &&
test_must_fail git merge C^0 D^0 &&
+ test_path_is_missing b &&
+ test_must_fail git rev-parse --verify :b &&
test_path_is_missing .git/MERGE_HEAD
'
@@ -189,8 +209,12 @@
git checkout B^0 &&
echo 12 >>a && git add a &&
+ git rev-parse --verify :a >expect &&
test_must_fail git merge C^0 D^0 &&
+ test_path_is_file a &&
+ git rev-parse --verify :a >actual &&
+ test_cmp expect actual &&
test_path_is_missing .git/MERGE_HEAD
'
@@ -201,6 +225,8 @@
touch random_file && git add random_file &&
test_must_fail git merge -s ours C^0 &&
+ test_path_is_file random_file &&
+ git rev-parse --verify :random_file &&
test_path_is_missing .git/MERGE_HEAD
'
@@ -211,6 +237,8 @@
touch random_file && git add random_file &&
test_must_fail git merge -s subtree E^0 &&
+ test_path_is_file random_file &&
+ git rev-parse --verify :random_file &&
test_path_is_missing .git/MERGE_HEAD
'
diff --git a/t/t6427-diff3-conflict-markers.sh b/t/t6427-diff3-conflict-markers.sh
index 25c4b72..a9ee4cb 100755
--- a/t/t6427-diff3-conflict-markers.sh
+++ b/t/t6427-diff3-conflict-markers.sh
@@ -211,4 +211,94 @@
)
'
+test_setup_zdiff3 () {
+ test_create_repo zdiff3 &&
+ (
+ cd zdiff3 &&
+
+ test_write_lines 1 2 3 4 5 6 7 8 9 >basic &&
+ test_write_lines 1 2 3 AA 4 5 BB 6 7 8 >middle-common &&
+ test_write_lines 1 2 3 4 5 6 7 8 9 >interesting &&
+ test_write_lines 1 2 3 4 5 6 7 8 9 >evil &&
+
+ git add basic middle-common interesting evil &&
+ git commit -m base &&
+
+ git branch left &&
+ git branch right &&
+
+ git checkout left &&
+ test_write_lines 1 2 3 4 A B C D E 7 8 9 >basic &&
+ test_write_lines 1 2 3 CC 4 5 DD 6 7 8 >middle-common &&
+ test_write_lines 1 2 3 4 A B C D E F G H I J 7 8 9 >interesting &&
+ test_write_lines 1 2 3 4 X A B C 7 8 9 >evil &&
+ git add -u &&
+ git commit -m letters &&
+
+ git checkout right &&
+ test_write_lines 1 2 3 4 A X C Y E 7 8 9 >basic &&
+ test_write_lines 1 2 3 EE 4 5 FF 6 7 8 >middle-common &&
+ test_write_lines 1 2 3 4 A B C 5 6 G H I J 7 8 9 >interesting &&
+ test_write_lines 1 2 3 4 Y A B C B C 7 8 9 >evil &&
+ git add -u &&
+ git commit -m permuted
+ )
+}
+
+test_expect_success 'check zdiff3 markers' '
+ test_setup_zdiff3 &&
+ (
+ cd zdiff3 &&
+
+ git checkout left^0 &&
+
+ base=$(git rev-parse --short HEAD^1) &&
+ test_must_fail git -c merge.conflictstyle=zdiff3 merge -s recursive right^0 &&
+
+ test_write_lines 1 2 3 4 A \
+ "<<<<<<< HEAD" B C D \
+ "||||||| $base" 5 6 \
+ ======= X C Y \
+ ">>>>>>> right^0" \
+ E 7 8 9 \
+ >expect &&
+ test_cmp expect basic &&
+
+ test_write_lines 1 2 3 \
+ "<<<<<<< HEAD" CC \
+ "||||||| $base" AA \
+ ======= EE \
+ ">>>>>>> right^0" \
+ 4 5 \
+ "<<<<<<< HEAD" DD \
+ "||||||| $base" BB \
+ ======= FF \
+ ">>>>>>> right^0" \
+ 6 7 8 \
+ >expect &&
+ test_cmp expect middle-common &&
+
+ test_write_lines 1 2 3 4 A B C \
+ "<<<<<<< HEAD" D E F \
+ "||||||| $base" 5 6 \
+ ======= 5 6 \
+ ">>>>>>> right^0" \
+ G H I J 7 8 9 \
+ >expect &&
+ test_cmp expect interesting &&
+
+ # Not passing this one yet; the common "B C" lines is still
+ # being left in the conflict blocks on the left and right
+ # sides.
+ test_write_lines 1 2 3 4 \
+ "<<<<<<< HEAD" X A \
+ "||||||| $base" 5 6 \
+ ======= Y A B C \
+ ">>>>>>> right^0" \
+ B C 7 8 9 \
+ >expect &&
+ test_cmp expect evil
+ )
+'
+
test_done
diff --git a/t/t6428-merge-conflicts-sparse.sh b/t/t6428-merge-conflicts-sparse.sh
index 7e8bf49..064be1b 100755
--- a/t/t6428-merge-conflicts-sparse.sh
+++ b/t/t6428-merge-conflicts-sparse.sh
@@ -87,7 +87,7 @@
test_path_is_file numerals &&
git sparse-checkout init &&
- git sparse-checkout set README &&
+ git sparse-checkout set --no-cone README &&
test_path_is_file README &&
test_path_is_missing numerals &&
@@ -112,7 +112,7 @@
)
'
-test_expect_merge_algorithm failure success 'present-despite-SKIP_WORKTREE handled reasonably' '
+test_expect_success 'present-despite-SKIP_WORKTREE handled reasonably' '
test_setup_numerals in_the_way &&
(
cd numerals_in_the_way &&
@@ -123,7 +123,7 @@
test_path_is_file numerals &&
git sparse-checkout init &&
- git sparse-checkout set README &&
+ git sparse-checkout set --no-cone README &&
test_path_is_file README &&
test_path_is_missing numerals &&
@@ -132,26 +132,13 @@
test_must_fail git merge -s recursive B^0 &&
- git ls-files -t >index_files &&
- test_cmp expected-index index_files &&
+ test_path_is_missing .git/MERGE_HEAD &&
- test_path_is_file README &&
test_path_is_file numerals &&
- test_cmp expected-merge numerals &&
-
- # There should still be a file with "foobar" in it
- grep foobar * &&
-
- # 5 other files:
- # * expected-merge
- # * expected-index
- # * index_files
- # * others
- # * whatever name was given to the numerals file that had
- # "foobar" in it
- git ls-files -o >others &&
- test_line_count = 5 others
+ # numerals should still have "foobar" in it
+ echo foobar >expect &&
+ test_cmp expect numerals
)
'
diff --git a/t/t6429-merge-sequence-rename-caching.sh b/t/t6429-merge-sequence-rename-caching.sh
index 035edc4..f2bc8a7 100755
--- a/t/t6429-merge-sequence-rename-caching.sh
+++ b/t/t6429-merge-sequence-rename-caching.sh
@@ -697,4 +697,71 @@
)
'
+#
+# The following testcase just creates two simple renames (slightly modified
+# on both sides but without conflicting changes), and a directory full of
+# files that are otherwise uninteresting. The setup is as follows:
+#
+# base: unrelated/<BUNCH OF FILES>
+# numbers
+# values
+# upstream: modify: numbers
+# modify: values
+# topic: add: unrelated/foo
+# modify: numbers
+# modify: values
+# rename: numbers -> sequence
+# rename: values -> progression
+#
+# This is a trivial rename case, but we're curious what happens with a very
+# low renameLimit interacting with the restart optimization trying to notice
+# that unrelated/ looks like a trivial merge candidate.
+#
+test_expect_success 'avoid assuming we detected renames' '
+ git init redo-weirdness &&
+ (
+ cd redo-weirdness &&
+
+ mkdir unrelated &&
+ for i in $(test_seq 1 10)
+ do
+ >unrelated/$i
+ done &&
+ test_seq 2 10 >numbers &&
+ test_seq 12 20 >values &&
+ git add numbers values unrelated/ &&
+ git commit -m orig &&
+
+ git branch upstream &&
+ git branch topic &&
+
+ git switch upstream &&
+ test_seq 1 10 >numbers &&
+ test_seq 11 20 >values &&
+ git add numbers &&
+ git commit -m "Some tweaks" &&
+
+ git switch topic &&
+
+ >unrelated/foo &&
+ test_seq 2 12 >numbers &&
+ test_seq 12 22 >values &&
+ git add numbers values unrelated/ &&
+ git mv numbers sequence &&
+ git mv values progression &&
+ git commit -m A &&
+
+ #
+ # Actual testing
+ #
+
+ git switch --detach topic^0 &&
+
+ test_must_fail git -c merge.renameLimit=1 rebase upstream &&
+
+ git ls-files -u >actual &&
+ ! test_file_is_empty actual
+ )
+'
+
test_done
diff --git a/t/t6430-merge-recursive.sh b/t/t6430-merge-recursive.sh
index a0efe7c..07067bb 100755
--- a/t/t6430-merge-recursive.sh
+++ b/t/t6430-merge-recursive.sh
@@ -706,7 +706,7 @@
# more trees than static slots used by oid_to_hex()
for commit in $c0 $c2 $c4 $c5 $c6 $c7
do
- git rev-parse "$commit^{tree}"
+ git rev-parse "$commit^{tree}" || return 1
done >trees &&
# ignore the return code; it only fails because the input is weird...
diff --git a/t/t6437-submodule-merge.sh b/t/t6437-submodule-merge.sh
index e5e89c2..178413c 100755
--- a/t/t6437-submodule-merge.sh
+++ b/t/t6437-submodule-merge.sh
@@ -5,6 +5,9 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-merge.sh
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index c202126..cd6c533 100755
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -101,12 +101,12 @@
EOF
git init pre-auto-gc-hook &&
+ test_hook -C pre-auto-gc-hook pre-auto-gc <<-\EOF &&
+ echo >&2 no gc for you &&
+ exit 1
+ EOF
(
cd pre-auto-gc-hook &&
- write_script ".git/hooks/pre-auto-gc" <<-\EOF &&
- echo >&2 no gc for you &&
- exit 1
- EOF
git config gc.auto 3 &&
git config gc.autoDetach false &&
@@ -128,14 +128,12 @@
See "git help gc" for manual housekeeping.
EOF
- (
- cd pre-auto-gc-hook &&
- write_script ".git/hooks/pre-auto-gc" <<-\EOF &&
- echo >&2 will gc for you &&
- exit 0
- EOF
- git gc --auto >../out.actual 2>../err.actual
- ) &&
+ test_hook -C pre-auto-gc-hook --clobber pre-auto-gc <<-\EOF &&
+ echo >&2 will gc for you &&
+ exit 0
+ EOF
+
+ git -C pre-auto-gc-hook gc --auto >out.actual 2>err.actual &&
test_must_be_empty out.actual &&
test_cmp err.expect err.actual
diff --git a/t/t6600-test-reach.sh b/t/t6600-test-reach.sh
index 3d7a62d..338a9c4 100755
--- a/t/t6600-test-reach.sh
+++ b/t/t6600-test-reach.sh
@@ -32,7 +32,7 @@
do
test_commit "1-$i" &&
git branch -f commit-1-$i &&
- git tag -a -m "1-$i" tag-1-$i commit-1-$i
+ git tag -a -m "1-$i" tag-1-$i commit-1-$i || return 1
done &&
for j in $(test_seq 1 9)
do
@@ -46,7 +46,7 @@
do
git merge commit-$j-$i -m "$x-$i" &&
git branch -f commit-$x-$i &&
- git tag -a -m "$x-$i" tag-$x-$i commit-$x-$i
+ git tag -a -m "$x-$i" tag-$x-$i commit-$x-$i || return 1
done
done &&
git commit-graph write --reachable &&
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 25bb9bb..a402908 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -2,10 +2,30 @@
test_description='git mv in subdirs'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
+
+test_expect_success 'mv -f refreshes updated index entry' '
+ echo test >bar &&
+ git add bar &&
+ git commit -m test &&
+
+ echo foo >foo &&
+ git add foo &&
+
+ # Wait one second to ensure ctime of rename will differ from original
+ # file creation ctime.
+ sleep 1 &&
+ git mv -f foo bar &&
+ git reset --merge HEAD &&
+
+ # Verify the index has been reset
+ git diff-files >out &&
+ test_must_be_empty out
+'
test_expect_success 'prepare reference tree' '
mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ COPYING_test_data >path0/COPYING &&
git add path0/COPYING &&
git commit -m add -a
'
@@ -107,7 +127,7 @@
'
test_expect_success 'adding another file' '
- cp "$TEST_DIRECTORY"/../README.md path0/README &&
+ COPYING_test_data | tr A-Za-z N-ZA-Mn-za-m >path0/README &&
git add path0/README &&
git commit -m add2 -a
'
diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh
new file mode 100755
index 0000000..f0f7cbf
--- /dev/null
+++ b/t/t7002-mv-sparse-checkout.sh
@@ -0,0 +1,209 @@
+#!/bin/sh
+
+test_description='git mv in sparse working trees'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' "
+ mkdir -p sub/dir sub/dir2 &&
+ touch a b c sub/d sub/dir/e sub/dir2/e &&
+ git add -A &&
+ git commit -m files &&
+
+ cat >sparse_error_header <<-EOF &&
+ The following paths and/or pathspecs matched paths that exist
+ outside of your sparse-checkout definition, so will not be
+ updated in the index:
+ EOF
+
+ cat >sparse_hint <<-EOF
+ hint: If you intend to update such entries, try one of the following:
+ hint: * Use the --sparse option.
+ hint: * Disable or modify the sparsity rules.
+ hint: Disable this message with \"git config advice.updateSparsePath false\"
+ EOF
+"
+
+test_expect_success 'mv refuses to move sparse-to-sparse' '
+ test_when_finished rm -f e &&
+ git reset --hard &&
+ git sparse-checkout set --no-cone a &&
+ touch b &&
+ test_must_fail git mv b e 2>stderr &&
+ cat sparse_error_header >expect &&
+ echo b >>expect &&
+ echo e >>expect &&
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+ git mv --sparse b e 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'mv refuses to move sparse-to-sparse, ignores failure' '
+ test_when_finished rm -f b c e &&
+ git reset --hard &&
+ git sparse-checkout set a &&
+
+ # tracked-to-untracked
+ touch b &&
+ git mv -k b e 2>stderr &&
+ test_path_exists b &&
+ test_path_is_missing e &&
+ cat sparse_error_header >expect &&
+ echo b >>expect &&
+ echo e >>expect &&
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+
+ git mv --sparse b e 2>stderr &&
+ test_must_be_empty stderr &&
+ test_path_is_missing b &&
+ test_path_exists e &&
+
+ # tracked-to-tracked
+ git reset --hard &&
+ touch b &&
+ git mv -k b c 2>stderr &&
+ test_path_exists b &&
+ test_path_is_missing c &&
+ cat sparse_error_header >expect &&
+ echo b >>expect &&
+ echo c >>expect &&
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+
+ git mv --sparse b c 2>stderr &&
+ test_must_be_empty stderr &&
+ test_path_is_missing b &&
+ test_path_exists c
+'
+
+test_expect_success 'mv refuses to move non-sparse-to-sparse' '
+ test_when_finished rm -f b c e &&
+ git reset --hard &&
+ git sparse-checkout set a &&
+
+ # tracked-to-untracked
+ test_must_fail git mv a e 2>stderr &&
+ test_path_exists a &&
+ test_path_is_missing e &&
+ cat sparse_error_header >expect &&
+ echo e >>expect &&
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+ git mv --sparse a e 2>stderr &&
+ test_must_be_empty stderr &&
+ test_path_is_missing a &&
+ test_path_exists e &&
+
+ # tracked-to-tracked
+ rm e &&
+ git reset --hard &&
+ test_must_fail git mv a c 2>stderr &&
+ test_path_exists a &&
+ test_path_is_missing c &&
+ cat sparse_error_header >expect &&
+ echo c >>expect &&
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+ git mv --sparse a c 2>stderr &&
+ test_must_be_empty stderr &&
+ test_path_is_missing a &&
+ test_path_exists c
+'
+
+test_expect_success 'mv refuses to move sparse-to-non-sparse' '
+ test_when_finished rm -f b c e &&
+ git reset --hard &&
+ git sparse-checkout set a e &&
+
+ # tracked-to-untracked
+ touch b &&
+ test_must_fail git mv b e 2>stderr &&
+ cat sparse_error_header >expect &&
+ echo b >>expect &&
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+ git mv --sparse b e 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'recursive mv refuses to move (possible) sparse' '
+ test_when_finished rm -rf b c e sub2 &&
+ git reset --hard &&
+ # Without cone mode, "sub" and "sub2" do not match
+ git sparse-checkout set sub/dir sub2/dir &&
+
+ # Add contained contents to ensure we avoid non-existence errors
+ mkdir sub/dir2 &&
+ touch sub/d sub/dir2/e &&
+
+ test_must_fail git mv sub sub2 2>stderr &&
+ cat sparse_error_header >expect &&
+ cat >>expect <<-\EOF &&
+ sub/d
+ sub2/d
+ sub/dir2/e
+ sub2/dir2/e
+ EOF
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+ git mv --sparse sub sub2 2>stderr &&
+ test_must_be_empty stderr &&
+ git commit -m "moved sub to sub2" &&
+ git rev-parse HEAD~1:sub >expect &&
+ git rev-parse HEAD:sub2 >actual &&
+ test_cmp expect actual &&
+ git reset --hard HEAD~1
+'
+
+test_expect_success 'recursive mv refuses to move sparse' '
+ git reset --hard &&
+ # Use cone mode so "sub/" matches the sparse-checkout patterns
+ git sparse-checkout init --cone &&
+ git sparse-checkout set sub/dir sub2/dir &&
+
+ # Add contained contents to ensure we avoid non-existence errors
+ mkdir sub/dir2 &&
+ touch sub/dir2/e &&
+
+ test_must_fail git mv sub sub2 2>stderr &&
+ cat sparse_error_header >expect &&
+ cat >>expect <<-\EOF &&
+ sub/dir2/e
+ sub2/dir2/e
+ EOF
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+ git mv --sparse sub sub2 2>stderr &&
+ test_must_be_empty stderr &&
+ git commit -m "moved sub to sub2" &&
+ git rev-parse HEAD~1:sub >expect &&
+ git rev-parse HEAD:sub2 >actual &&
+ test_cmp expect actual &&
+ git reset --hard HEAD~1
+'
+
+test_expect_success 'can move files to non-sparse dir' '
+ git reset --hard &&
+ git sparse-checkout init --no-cone &&
+ git sparse-checkout set a b c w !/x y/ &&
+ mkdir -p w x/y &&
+
+ git mv a w/new-a 2>stderr &&
+ git mv b x/y/new-b 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'refuse to move file to non-skip-worktree sparse path' '
+ git reset --hard &&
+ git sparse-checkout init --no-cone &&
+ git sparse-checkout set a !/x y/ !x/y/z &&
+ mkdir -p x/y/z &&
+
+ test_must_fail git mv a x/y/z/new-a 2>stderr &&
+ echo x/y/z/new-a | cat sparse_error_header - sparse_hint >expect &&
+ test_cmp expect stderr
+'
+
+test_done
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 082be85..9aa1660 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -94,10 +94,10 @@
git log -1 \
--format="format:tag: tagging %h (%s, %cd)%n" \
--date=format:%Y-%m-%d >expected &&
- test_when_finished "git tag -d tag_with_reflog" &&
- git tag --create-reflog tag_with_reflog &&
- git reflog exists refs/tags/tag_with_reflog &&
- sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog >actual &&
+ test_when_finished "git tag -d tag_with_reflog1" &&
+ git tag --create-reflog tag_with_reflog1 &&
+ git reflog exists refs/tags/tag_with_reflog1 &&
+ test-tool ref-store main for-each-reflog-ent refs/tags/tag_with_reflog1 | sed -e "s/^.* //" >actual &&
test_cmp expected actual
'
@@ -105,10 +105,10 @@
git log -1 \
--format="format:tag: tagging %h (%s, %cd)%n" \
--date=format:%Y-%m-%d >expected &&
- test_when_finished "git tag -d tag_with_reflog" &&
- git tag -m "annotated tag" --create-reflog tag_with_reflog &&
- git reflog exists refs/tags/tag_with_reflog &&
- sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog >actual &&
+ test_when_finished "git tag -d tag_with_reflog2" &&
+ git tag -m "annotated tag" --create-reflog tag_with_reflog2 &&
+ git reflog exists refs/tags/tag_with_reflog2 &&
+ test-tool ref-store main for-each-reflog-ent refs/tags/tag_with_reflog2 | sed -e "s/^.* //" >actual &&
test_cmp expected actual
'
@@ -118,10 +118,10 @@
'
test_expect_success 'option core.logAllRefUpdates=always creates reflog' '
- test_when_finished "git tag -d tag_with_reflog" &&
+ test_when_finished "git tag -d tag_with_reflog3" &&
test_config core.logAllRefUpdates always &&
- git tag tag_with_reflog &&
- git reflog exists refs/tags/tag_with_reflog
+ git tag tag_with_reflog3 &&
+ git reflog exists refs/tags/tag_with_reflog3
'
test_expect_success 'listing all tags if one exists should succeed' '
@@ -1976,9 +1976,12 @@
committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
data <<EOF
commit #$i
-EOF"
- test $i = 1 && echo "from refs/heads/main^0"
- i=$(($i + 1))
+EOF" &&
+ if test $i = 1
+ then
+ echo "from refs/heads/main^0"
+ fi &&
+ i=$(($i + 1)) || return 1
done | git fast-import &&
git checkout main &&
git tag far-far-away HEAD^ &&
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 0e7cf75..e56ca5b 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -661,6 +661,13 @@
export GIT_TRACE2_BRIEF
'
+test_expect_success 'setup large log output' '
+ perl -e "
+ print \"this is a long commit message\" x 50000
+ " >commit-msg &&
+ git commit --allow-empty -F commit-msg
+'
+
test_expect_success TTY 'git returns SIGPIPE on early pager exit' '
test_when_finished "rm pager-used trace.normal" &&
test_config core.pager ">pager-used; head -n 1; exit 0" &&
@@ -670,7 +677,7 @@
if test_have_prereq !MINGW
then
- OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
+ { test_terminal git log >/dev/null; OUT=$?; } &&
test_match_signal 13 "$OUT"
else
test_terminal git log
@@ -691,7 +698,7 @@
if test_have_prereq !MINGW
then
- OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
+ { test_terminal git log >/dev/null; OUT=$?; } &&
test_match_signal 13 "$OUT"
else
test_terminal git log
@@ -710,13 +717,7 @@
export GIT_TRACE2 &&
test_when_finished "unset GIT_TRACE2" &&
- if test_have_prereq !MINGW
- then
- OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
- test "$OUT" -eq 0
- else
- test_terminal git log
- fi &&
+ test_terminal git log &&
grep child_exit trace.normal >child-exits &&
test_line_count = 1 child-exits &&
@@ -724,41 +725,14 @@
test_path_is_file pager-used
'
-test_expect_success TTY 'git discards nonexisting pager without SIGPIPE' '
- test_when_finished "rm pager-used trace.normal" &&
- test_config core.pager "wc >pager-used; does-not-exist" &&
- GIT_TRACE2="$(pwd)/trace.normal" &&
- export GIT_TRACE2 &&
- test_when_finished "unset GIT_TRACE2" &&
-
- if test_have_prereq !MINGW
- then
- OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
- test "$OUT" -eq 0
- else
- test_terminal git log
- fi &&
-
- grep child_exit trace.normal >child-exits &&
- test_line_count = 1 child-exits &&
- grep " code:127 " child-exits &&
- test_path_is_file pager-used
-'
-
-test_expect_success TTY 'git attempts to page to nonexisting pager command, gets SIGPIPE' '
+test_expect_success TTY 'git skips paging nonexisting command' '
test_when_finished "rm trace.normal" &&
test_config core.pager "does-not-exist" &&
GIT_TRACE2="$(pwd)/trace.normal" &&
export GIT_TRACE2 &&
test_when_finished "unset GIT_TRACE2" &&
- if test_have_prereq !MINGW
- then
- OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
- test_match_signal 13 "$OUT"
- else
- test_terminal git log
- fi &&
+ test_terminal git log &&
grep child_exit trace.normal >child-exits &&
test_line_count = 1 child-exits &&
@@ -767,14 +741,14 @@
test_expect_success TTY 'git returns SIGPIPE on propagated signals from pager' '
test_when_finished "rm pager-used trace.normal" &&
- test_config core.pager ">pager-used; test-tool sigchain" &&
+ test_config core.pager ">pager-used; exec test-tool sigchain" &&
GIT_TRACE2="$(pwd)/trace.normal" &&
export GIT_TRACE2 &&
test_when_finished "unset GIT_TRACE2" &&
if test_have_prereq !MINGW
then
- OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
+ { test_terminal git log >/dev/null; OUT=$?; } &&
test_match_signal 13 "$OUT"
else
test_terminal git log
@@ -786,4 +760,9 @@
test_path_is_file pager-used
'
+test_expect_success TTY 'non-existent pager doesnt cause crash' '
+ test_config pager.show invalid-pager &&
+ test_terminal git show
+'
+
test_done
diff --git a/t/t7008-filter-branch-null-sha1.sh b/t/t7008-filter-branch-null-sha1.sh
index 9ba9f24..93fbc92 100755
--- a/t/t7008-filter-branch-null-sha1.sh
+++ b/t/t7008-filter-branch-null-sha1.sh
@@ -1,6 +1,7 @@
#!/bin/sh
test_description='filter-branch removal of trees with null sha1'
+
. ./test-lib.sh
test_expect_success 'setup: base commits' '
diff --git a/t/t7010-setup.sh b/t/t7010-setup.sh
index 0335a9a..520f96d 100755
--- a/t/t7010-setup.sh
+++ b/t/t7010-setup.sh
@@ -137,7 +137,7 @@
test_expect_success 'add a directory outside the work tree' '(
cd tester &&
- d1="$(cd .. ; pwd)" &&
+ d1="$(cd .. && pwd)" &&
test_must_fail git add "$d1"
)'
diff --git a/t/t7011-skip-worktree-reading.sh b/t/t7011-skip-worktree-reading.sh
index 1761a2b..4adac5a 100755
--- a/t/t7011-skip-worktree-reading.sh
+++ b/t/t7011-skip-worktree-reading.sh
@@ -5,6 +5,7 @@
test_description='skip-worktree bit test'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >expect.full <<EOF
diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh
index a1080b9..cd5c20f 100755
--- a/t/t7012-skip-worktree-writing.sh
+++ b/t/t7012-skip-worktree-writing.sh
@@ -151,7 +151,7 @@
git stash push &&
- git sparse-checkout set subdir &&
+ git sparse-checkout set --no-cone subdir &&
# Ensure after sparse-checkout we only have expected files
cat >expect <<-EOF &&
@@ -171,50 +171,20 @@
# Put a file in the working directory in the way
echo in the way >modified &&
- git stash apply &&
+ test_must_fail git stash apply 2>error&&
- # Ensure stash vivifies modifies paths...
- cat >expect <<-EOF &&
- H addme
- H modified
- H removeme
- H subdir/A
- S untouched
- EOF
- git ls-files -t >actual &&
- test_cmp expect actual &&
+ grep "changes.*would be overwritten by merge" error &&
- # ...and that the paths show up in status as changed...
- cat >expect <<-EOF &&
- A addme
- M modified
- D removeme
- M subdir/A
- ?? actual
- ?? expect
- ?? modified.stash.XXXXXX
- EOF
- git status --porcelain | \
- sed -e s/stash......./stash.XXXXXX/ >actual &&
- test_cmp expect actual &&
+ echo in the way >expect &&
+ test_cmp expect modified &&
+ git diff --quiet HEAD ":!modified" &&
# ...and that working directory reflects the files correctly
- test_path_is_file addme &&
+ test_path_is_missing addme &&
test_path_is_file modified &&
test_path_is_missing removeme &&
test_path_is_file subdir/A &&
- test_path_is_missing untouched &&
-
- # ...including that we have the expected "modified" file...
- cat >expect <<-EOF &&
- modified
- tweaked
- EOF
- test_cmp expect modified &&
-
- # ...and that the other "modified" file is still present...
- echo in the way >expect &&
- test_cmp expect modified.stash.*
+ test_path_is_missing untouched
)
'
diff --git a/t/t7031-verify-tag-signed-ssh.sh b/t/t7031-verify-tag-signed-ssh.sh
new file mode 100755
index 0000000..1cb36b9
--- /dev/null
+++ b/t/t7031-verify-tag-signed-ssh.sh
@@ -0,0 +1,203 @@
+#!/bin/sh
+
+test_description='signed tag tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-gpg.sh"
+
+test_expect_success GPGSSH 'create signed tags ssh' '
+ test_when_finished "test_unconfig commit.gpgsign" &&
+ test_config gpg.format ssh &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+
+ echo 1 >file && git add file &&
+ test_tick && git commit -m initial &&
+ git tag -s -m initial initial &&
+ git branch side &&
+
+ echo 2 >file && test_tick && git commit -a -m second &&
+ git tag -s -m second second &&
+
+ git checkout side &&
+ echo 3 >elif && git add elif &&
+ test_tick && git commit -m "third on side" &&
+
+ git checkout main &&
+ test_tick && git merge -S side &&
+ git tag -s -m merge merge &&
+
+ echo 4 >file && test_tick && git commit -a -S -m "fourth unsigned" &&
+ git tag -a -m fourth-unsigned fourth-unsigned &&
+
+ test_tick && git commit --amend -S -m "fourth signed" &&
+ git tag -s -m fourth fourth-signed &&
+
+ echo 5 >file && test_tick && git commit -a -m "fifth" &&
+ git tag fifth-unsigned &&
+
+ git config commit.gpgsign true &&
+ echo 6 >file && test_tick && git commit -a -m "sixth" &&
+ git tag -a -m sixth sixth-unsigned &&
+
+ test_tick && git rebase -f HEAD^^ && git tag -s -m 6th sixth-signed HEAD^ &&
+ git tag -m seventh -s seventh-signed &&
+
+ echo 8 >file && test_tick && git commit -a -m eighth &&
+ git tag -u"${GPGSSH_KEY_UNTRUSTED}" -m eighth eighth-signed-alt
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'create signed tags with keys having defined lifetimes' '
+ test_when_finished "test_unconfig commit.gpgsign" &&
+ test_config gpg.format ssh &&
+
+ echo expired >file && test_tick && git commit -a -m expired -S"${GPGSSH_KEY_EXPIRED}" &&
+ git tag -s -u "${GPGSSH_KEY_EXPIRED}" -m expired-signed expired-signed &&
+
+ echo notyetvalid >file && test_tick && git commit -a -m notyetvalid -S"${GPGSSH_KEY_NOTYETVALID}" &&
+ git tag -s -u "${GPGSSH_KEY_NOTYETVALID}" -m notyetvalid-signed notyetvalid-signed &&
+
+ echo timeboxedvalid >file && test_tick && git commit -a -m timeboxedvalid -S"${GPGSSH_KEY_TIMEBOXEDVALID}" &&
+ git tag -s -u "${GPGSSH_KEY_TIMEBOXEDVALID}" -m timeboxedvalid-signed timeboxedvalid-signed &&
+
+ echo timeboxedinvalid >file && test_tick && git commit -a -m timeboxedinvalid -S"${GPGSSH_KEY_TIMEBOXEDINVALID}" &&
+ git tag -s -u "${GPGSSH_KEY_TIMEBOXEDINVALID}" -m timeboxedinvalid-signed timeboxedinvalid-signed
+'
+
+test_expect_success GPGSSH 'verify and show ssh signatures' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ (
+ for tag in initial second merge fourth-signed sixth-signed seventh-signed
+ do
+ git verify-tag $tag 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $tag OK || exit 1
+ done
+ ) &&
+ (
+ for tag in fourth-unsigned fifth-unsigned sixth-unsigned
+ do
+ test_must_fail git verify-tag $tag 2>actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $tag OK || exit 1
+ done
+ ) &&
+ (
+ for tag in eighth-signed-alt
+ do
+ test_must_fail git verify-tag $tag 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ grep "${GPGSSH_KEY_NOT_TRUSTED}" actual &&
+ echo $tag OK || exit 1
+ done
+ )
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag exits failure on expired signature key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_must_fail git verify-tag expired-signed 2>actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag exits failure on not yet valid signature key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_must_fail git verify-tag notyetvalid-signed 2>actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag succeeds with tag date and key validity matching' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git verify-tag timeboxedvalid-signed 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag failes with tag date outside of key validity' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_must_fail git verify-tag timeboxedinvalid-signed 2>actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH 'detect fudged ssh signature' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git cat-file tag seventh-signed >raw &&
+ sed -e "/^tag / s/seventh/7th forged/" raw >forged1 &&
+ git hash-object -w -t tag forged1 >forged1.tag &&
+ test_must_fail git verify-tag $(cat forged1.tag) 2>actual1 &&
+ grep "${GPGSSH_BAD_SIGNATURE}" actual1 &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual1 &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual1
+'
+
+test_expect_success GPGSSH 'verify ssh signatures with --raw' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ (
+ for tag in initial second merge fourth-signed sixth-signed seventh-signed
+ do
+ git verify-tag --raw $tag 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $tag OK || exit 1
+ done
+ ) &&
+ (
+ for tag in fourth-unsigned fifth-unsigned sixth-unsigned
+ do
+ test_must_fail git verify-tag --raw $tag 2>actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $tag OK || exit 1
+ done
+ ) &&
+ (
+ for tag in eighth-signed-alt
+ do
+ test_must_fail git verify-tag --raw $tag 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $tag OK || exit 1
+ done
+ )
+'
+
+test_expect_success GPGSSH 'verify signatures with --raw ssh' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git verify-tag --raw sixth-signed 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo sixth-signed OK
+'
+
+test_expect_success GPGSSH 'verify multiple tags ssh' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ tags="seventh-signed sixth-signed" &&
+ for i in $tags
+ do
+ git verify-tag -v --raw $i || return 1
+ done >expect.stdout 2>expect.stderr.1 &&
+ grep "^${GPGSSH_GOOD_SIGNATURE_TRUSTED}" <expect.stderr.1 >expect.stderr &&
+ git verify-tag -v --raw $tags >actual.stdout 2>actual.stderr.1 &&
+ grep "^${GPGSSH_GOOD_SIGNATURE_TRUSTED}" <actual.stderr.1 >actual.stderr &&
+ test_cmp expect.stdout actual.stdout &&
+ test_cmp expect.stderr actual.stderr
+'
+
+test_expect_success GPGSSH 'verifying tag with --format - ssh' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ cat >expect <<-\EOF &&
+ tagname : fourth-signed
+ EOF
+ git verify-tag --format="tagname : %(tag)" "fourth-signed" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'verifying a forged tag with --format should fail silently - ssh' '
+ test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
+ test_must_be_empty actual-forged
+'
+
+test_done
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index a0c123b..9936cc3 100755
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -90,6 +90,9 @@
cd worktree &&
mkdir done dtwo dthree &&
touch one two three done/one dtwo/two dthree/three &&
+ test-tool chmtime =-300 one two three done/one dtwo/two dthree/three &&
+ test-tool chmtime =-300 done dtwo dthree &&
+ test-tool chmtime =-300 . &&
git add one two done/one &&
: >.git/info/exclude &&
git update-index --untracked-cache &&
@@ -142,7 +145,6 @@
EOF
test_expect_success 'status first time (empty cache)' '
- avoid_racy &&
: >../trace.output &&
GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
git status --porcelain >../actual &&
@@ -166,7 +168,6 @@
'
test_expect_success 'status second time (fully populated cache)' '
- avoid_racy &&
: >../trace.output &&
GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
git status --porcelain >../actual &&
@@ -189,9 +190,122 @@
test_cmp ../dump.expect ../actual
'
+cat >../status_uall.expect <<EOF &&
+A done/one
+A one
+A two
+?? dthree/three
+?? dtwo/two
+?? three
+EOF
+
+# Bypassing the untracked cache here is not desirable from an
+# end-user perspective, but is expected in the current design.
+# The untracked cache data stored for a -unormal run cannot be
+# correctly used in a -uall run - it would yield incorrect output.
+test_expect_success 'untracked cache is bypassed with -uall' '
+ : >../trace.output &&
+ GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+ git status -uall --porcelain >../actual &&
+ iuc status -uall --porcelain >../status.iuc &&
+ test_cmp ../status_uall.expect ../status.iuc &&
+ test_cmp ../status_uall.expect ../actual &&
+ get_relevant_traces ../trace.output ../trace.relevant &&
+ cat >../trace.expect <<EOF &&
+ ....path:
+EOF
+ test_cmp ../trace.expect ../trace.relevant
+'
+
+test_expect_success 'untracked cache remains after bypass' '
+ test-tool dump-untracked-cache >../actual &&
+ test_cmp ../dump.expect ../actual
+'
+
+test_expect_success 'if -uall is configured, untracked cache gets populated by default' '
+ test_config status.showuntrackedfiles all &&
+ : >../trace.output &&
+ GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+ git status --porcelain >../actual &&
+ iuc status --porcelain >../status.iuc &&
+ test_cmp ../status_uall.expect ../status.iuc &&
+ test_cmp ../status_uall.expect ../actual &&
+ get_relevant_traces ../trace.output ../trace.relevant &&
+ cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:3
+ ....gitignore-invalidation:1
+ ....directory-invalidation:0
+ ....opendir:4
+EOF
+ test_cmp ../trace.expect ../trace.relevant
+'
+
+cat >../dump_uall.expect <<EOF &&
+info/exclude $EMPTY_BLOB
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000000
+/ $ZERO_OID recurse valid
+three
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse valid
+three
+/dtwo/ $ZERO_OID recurse valid
+two
+EOF
+
+test_expect_success 'if -uall was configured, untracked cache is populated' '
+ test-tool dump-untracked-cache >../actual &&
+ test_cmp ../dump_uall.expect ../actual
+'
+
+test_expect_success 'if -uall is configured, untracked cache is used by default' '
+ test_config status.showuntrackedfiles all &&
+ : >../trace.output &&
+ GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+ git status --porcelain >../actual &&
+ iuc status --porcelain >../status.iuc &&
+ test_cmp ../status_uall.expect ../status.iuc &&
+ test_cmp ../status_uall.expect ../actual &&
+ get_relevant_traces ../trace.output ../trace.relevant &&
+ cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:0
+EOF
+ test_cmp ../trace.expect ../trace.relevant
+'
+
+# Bypassing the untracked cache here is not desirable from an
+# end-user perspective, but is expected in the current design.
+# The untracked cache data stored for a -all run cannot be
+# correctly used in a -unormal run - it would yield incorrect
+# output.
+test_expect_success 'if -uall is configured, untracked cache is bypassed with -unormal' '
+ test_config status.showuntrackedfiles all &&
+ : >../trace.output &&
+ GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+ git status -unormal --porcelain >../actual &&
+ iuc status -unormal --porcelain >../status.iuc &&
+ test_cmp ../status.expect ../status.iuc &&
+ test_cmp ../status.expect ../actual &&
+ get_relevant_traces ../trace.output ../trace.relevant &&
+ cat >../trace.expect <<EOF &&
+ ....path:
+EOF
+ test_cmp ../trace.expect ../trace.relevant
+'
+
+test_expect_success 'repopulate untracked cache for -unormal' '
+ git status --porcelain
+'
+
test_expect_success 'modify in root directory, one dir invalidation' '
- avoid_racy &&
: >four &&
+ test-tool chmtime =-240 four &&
: >../trace.output &&
GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
git status --porcelain >../actual &&
@@ -241,7 +355,6 @@
'
test_expect_success 'new .gitignore invalidates recursively' '
- avoid_racy &&
echo four >.gitignore &&
: >../trace.output &&
GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
@@ -292,7 +405,6 @@
'
test_expect_success 'new info/exclude invalidates everything' '
- avoid_racy &&
echo three >>.git/info/exclude &&
: >../trace.output &&
GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
@@ -520,14 +632,14 @@
echo three >done/three && # three is gitignored
echo four >done/four && # four is gitignored at a higher level
echo five >done/five && # five is not gitignored
- echo test >base && #we need to ensure that the root dir is touched
- rm base &&
+ test-tool chmtime =-180 done/two done/three done/four done/five done &&
+ # we need to ensure that the root dir is touched (in the past);
+ test-tool chmtime =-180 . &&
sync_mtime
'
test_expect_success 'test sparse status with untracked cache' '
: >../trace.output &&
- avoid_racy &&
GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
git status --porcelain >../status.actual &&
iuc status --porcelain >../status.iuc &&
@@ -570,7 +682,6 @@
'
test_expect_success 'test sparse status again with untracked cache' '
- avoid_racy &&
: >../trace.output &&
GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
git status --porcelain >../status.actual &&
@@ -597,11 +708,11 @@
test_expect_success 'set up for test of subdir and sparse checkouts' '
mkdir done/sub &&
mkdir done/sub/sub &&
- echo "sub" > done/sub/sub/file
+ echo "sub" > done/sub/sub/file &&
+ test-tool chmtime =-120 done/sub/sub/file done/sub/sub done/sub done
'
test_expect_success 'test sparse status with untracked cache and subdir' '
- avoid_racy &&
: >../trace.output &&
GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
git status --porcelain >../status.actual &&
@@ -651,7 +762,6 @@
'
test_expect_success 'test sparse status again with untracked cache and subdir' '
- avoid_racy &&
: >../trace.output &&
GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
git status --porcelain >../status.actual &&
diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh
index eeb0534..20a0d2a 100755
--- a/t/t7064-wtstatus-pv2.sh
+++ b/t/t7064-wtstatus-pv2.sh
@@ -4,10 +4,6 @@
This test exercises porcelain V2 output for git status.'
-
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./test-lib.sh
@@ -113,6 +109,21 @@
test_cmp expect actual
'
+test_expect_success 'after first commit, stash existing changes' '
+ cat >expect <<-EOF &&
+ # branch.oid $H0
+ # branch.head initial-branch
+ # stash 2
+ EOF
+
+ test_when_finished "git stash pop && git stash pop" &&
+
+ git stash -- file_x &&
+ git stash &&
+ git status --porcelain=v2 --branch --show-stash --untracked-files=no >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'after first commit but omit untracked files and branch' '
cat >expect <<-EOF &&
1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
diff --git a/t/t7101-reset-empty-subdirs.sh b/t/t7101-reset-empty-subdirs.sh
index bfce05a..638bb04 100755
--- a/t/t7101-reset-empty-subdirs.sh
+++ b/t/t7101-reset-empty-subdirs.sh
@@ -4,11 +4,14 @@
#
test_description='git reset should cull empty subdirs'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success 'creating initial files' '
mkdir path0 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ COPYING_test_data >path0/COPYING &&
git add path0/COPYING &&
git commit -m add -a
'
@@ -16,10 +19,10 @@
test_expect_success 'creating second files' '
mkdir path1 &&
mkdir path1/path2 &&
- cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING-TOO &&
+ COPYING_test_data >path1/path2/COPYING &&
+ COPYING_test_data >path1/COPYING &&
+ COPYING_test_data >COPYING &&
+ COPYING_test_data >path0/COPYING-TOO &&
git add path1/path2/COPYING &&
git add path1/COPYING &&
git add COPYING &&
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 601b2bf..22477f3 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -462,12 +462,55 @@
git diff-index --cached --exit-code HEAD
'
+test_reset_refreshes_index () {
+
+ # To test whether the index is refreshed in `git reset --mixed` with
+ # the given options, create a scenario where we clearly see different
+ # results depending on whether the refresh occurred or not.
+
+ # Step 0: start with a clean index
+ git reset --hard HEAD &&
+
+ # Step 1: remove file2, but only in the index (no change to worktree)
+ git rm --cached file2 &&
+
+ # Step 2: reset index & leave worktree unchanged from HEAD
+ git $1 reset $2 --mixed HEAD &&
+
+ # Step 3: verify whether the index is refreshed by checking whether
+ # file2 still has staged changes in the index differing from HEAD (if
+ # the refresh occurred, there should be no such changes)
+ git diff-files >output.log &&
+ test_must_be_empty output.log
+}
+
test_expect_success '--mixed refreshes the index' '
+ # Verify default behavior (without --[no-]refresh or reset.refresh)
+ test_reset_refreshes_index &&
+
+ # With --quiet
+ test_reset_refreshes_index "" --quiet
+'
+
+test_expect_success '--mixed --[no-]refresh sets refresh behavior' '
+ # Verify that --[no-]refresh controls index refresh
+ test_reset_refreshes_index "" --refresh &&
+ ! test_reset_refreshes_index "" --no-refresh
+'
+
+test_expect_success '--mixed preserves skip-worktree' '
+ echo 123 >>file2 &&
+ git add file2 &&
+ git update-index --skip-worktree file2 &&
+ git reset --mixed HEAD >output &&
+ test_must_be_empty output &&
+
cat >expect <<-\EOF &&
Unstaged changes after reset:
M file2
EOF
- echo 123 >>file2 &&
+ git update-index --no-skip-worktree file2 &&
+ git add file2 &&
git reset --mixed HEAD >output &&
test_cmp expect output
'
diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh
index afe36a5..a60153f 100755
--- a/t/t7103-reset-bare.sh
+++ b/t/t7103-reset-bare.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='git reset in a bare repository'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup non-bare' '
@@ -61,9 +63,12 @@
test_must_fail git reset --mixed HEAD^
'
-test_expect_success '"soft" reset is allowed in bare' '
+test_expect_success !SANITIZE_LEAK '"soft" reset is allowed in bare' '
git reset --soft HEAD^ &&
- test "$(git show --pretty=format:%s | head -n 1)" = "one"
+ git show --pretty=format:%s >out &&
+ echo one >expect &&
+ head -n 1 out >actual &&
+ test_cmp expect actual
'
test_done
diff --git a/t/t7104-reset-hard.sh b/t/t7104-reset-hard.sh
index 7948ec3..cf9697e 100755
--- a/t/t7104-reset-hard.sh
+++ b/t/t7104-reset-hard.sh
@@ -2,6 +2,7 @@
test_description='reset --hard unmerged'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t7107-reset-pathspec-file.sh b/t/t7107-reset-pathspec-file.sh
index 15ccb14..523efbe 100755
--- a/t/t7107-reset-pathspec-file.sh
+++ b/t/t7107-reset-pathspec-file.sh
@@ -160,13 +160,13 @@
git rm fileA.t &&
test_must_fail git reset --pathspec-from-file=list --patch 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
+ test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
test_must_fail git reset --pathspec-from-file=list -- fileA.t 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+ test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git reset --pathspec-file-nul 2>err &&
- test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+ test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
test_must_fail git reset --soft --pathspec-from-file=list 2>err &&
test_i18ngrep -e "fatal: Cannot do soft reset with paths" err &&
diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
index a82a07a..3d62e10 100755
--- a/t/t7110-reset-merge.sh
+++ b/t/t7110-reset-merge.sh
@@ -8,7 +8,7 @@
. ./test-lib.sh
test_expect_success setup '
- for i in 1 2 3; do echo line $i; done >file1 &&
+ printf "line %d\n" 1 2 3 >file1 &&
cat file1 >file2 &&
git add file1 file2 &&
test_tick &&
diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh
index 19830d9..a3e2413 100755
--- a/t/t7112-reset-submodule.sh
+++ b/t/t7112-reset-submodule.sh
@@ -6,7 +6,6 @@
. "$TEST_DIRECTORY"/lib-submodule-update.sh
KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
-KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
test_submodule_switch_recursing_with_args "reset --keep"
diff --git a/t/t7113-post-index-change-hook.sh b/t/t7113-post-index-change-hook.sh
index 688fa99..58e55a7 100755
--- a/t/t7113-post-index-change-hook.sh
+++ b/t/t7113-post-index-change-hook.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
@@ -16,8 +17,7 @@
'
test_expect_success 'test status, add, commit, others trigger hook without flags set' '
- mkdir -p .git/hooks &&
- write_script .git/hooks/post-index-change <<-\EOF &&
+ test_hook post-index-change <<-\EOF &&
if test "$1" -eq 1; then
echo "Invalid combination of flags passed to hook; updated_workdir is set." >testfailure
exit 1
@@ -62,7 +62,7 @@
'
test_expect_success 'test checkout and reset trigger the hook' '
- write_script .git/hooks/post-index-change <<-\EOF &&
+ test_hook post-index-change <<-\EOF &&
if test "$1" -eq 1 && test "$2" -eq 1; then
echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
exit 1
@@ -105,7 +105,7 @@
'
test_expect_success 'test reset --mixed and update-index triggers the hook' '
- write_script .git/hooks/post-index-change <<-\EOF &&
+ test_hook post-index-change <<-\EOF &&
if test "$1" -eq 1 && test "$2" -eq 1; then
echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
exit 1
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index b7ba1c3..61ad47b 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -658,4 +658,21 @@
test_cmp expect arm
'
+test_expect_success 'tracking info copied with autoSetupMerge=inherit' '
+ git reset --hard main &&
+ # default config does not copy tracking info
+ git checkout -b foo-no-inherit koala/bear &&
+ test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
+ test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
+ # with autoSetupMerge=inherit, we copy tracking info from koala/bear
+ test_config branch.autoSetupMerge inherit &&
+ git checkout -b foo koala/bear &&
+ test_cmp_config origin branch.foo.remote &&
+ test_cmp_config refs/heads/koala/bear branch.foo.merge &&
+ # no tracking info to inherit from main
+ git checkout -b main2 main &&
+ test_cmp_config "" --default "" branch.main2.remote &&
+ test_cmp_config "" --default "" branch.main2.merge
+'
+
test_done
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index cb1b8e3..e7cec2e 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -1182,18 +1182,17 @@
rmdir init example2
'
-test_expect_success 'submodule deinit fails when submodule has a .git directory even when forced' '
+test_expect_success 'submodule deinit absorbs .git directory if .git is a directory' '
git submodule update --init &&
(
cd init &&
rm .git &&
- cp -R ../.git/modules/example .git &&
+ mv ../.git/modules/example .git &&
GIT_WORK_TREE=. git config --unset core.worktree
) &&
- test_must_fail git submodule deinit init &&
- test_must_fail git submodule deinit -f init &&
- test -d init/.git &&
- test -n "$(git config --get-regexp "submodule\.example\.")"
+ git submodule deinit init &&
+ test_path_is_missing init/.git &&
+ test -z "$(git config --get-regexp "submodule\.example\.")"
'
test_expect_success 'submodule with UTF-8 name' '
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 11cccbb..43f779d 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -205,8 +205,18 @@
(cd submodule &&
compare_head
) &&
- test_must_fail git submodule update submodule
- )
+ test_must_fail git submodule update submodule 2>../actual.raw
+ ) &&
+ sed "s/^> //" >expect <<-\EOF &&
+ > error: Your local changes to the following files would be overwritten by checkout:
+ > file
+ > Please commit your changes or stash them before you switch branches.
+ > Aborting
+ > fatal: Unable to checkout OID in submodule path '\''submodule'\''
+ EOF
+ sed -e "s/checkout $SQ[^$SQ]*$SQ/checkout OID/" <actual.raw >actual &&
+ test_cmp expect actual
+
'
test_expect_success 'submodule update should throw away changes with --force ' '
(cd super &&
@@ -660,6 +670,39 @@
)
'
+test_expect_success 'submodule update with pathspec warns against uninitialized ones' '
+ test_when_finished "rm -fr selective" &&
+ git clone super selective &&
+ (
+ cd selective &&
+ git submodule init submodule &&
+
+ git submodule update submodule 2>err &&
+ ! grep "Submodule path .* not initialized" err &&
+
+ git submodule update rebasing 2>err &&
+ grep "Submodule path .rebasing. not initialized" err &&
+
+ test_path_exists submodule/.git &&
+ test_path_is_missing rebasing/.git
+ )
+
+'
+
+test_expect_success 'submodule update without pathspec updates only initialized ones' '
+ test_when_finished "rm -fr selective" &&
+ git clone super selective &&
+ (
+ cd selective &&
+ git submodule init submodule &&
+ git submodule update 2>err &&
+ test_path_exists submodule/.git &&
+ test_path_is_missing rebasing/.git &&
+ ! grep "Submodule path .* not initialized" err
+ )
+
+'
+
test_expect_success 'submodule update continues after checkout error' '
(cd super &&
git reset --hard HEAD &&
@@ -1061,4 +1104,16 @@
)
'
+test_expect_success 'submodule update --filter requires --init' '
+ test_expect_code 129 git -C super submodule update --filter blob:none
+'
+
+test_expect_success 'submodule update --filter sets partial clone settings' '
+ test_when_finished "rm -rf super-filter" &&
+ git clone cloned super-filter &&
+ git -C super-filter submodule update --init --filter blob:none &&
+ test_cmp_config -C super-filter/submodule true remote.origin.promisor &&
+ test_cmp_config -C super-filter/submodule blob:none remote.origin.partialclonefilter
+'
+
test_done
diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh
index a3892f4..c3a4545 100755
--- a/t/t7408-submodule-reference.sh
+++ b/t/t7408-submodule-reference.sh
@@ -193,7 +193,19 @@
cd supersuper-clone &&
check_that_two_of_three_alternates_are_used &&
# update of the submodule fails
- test_must_fail git submodule update --init --recursive
+ cat >expect <<-\EOF &&
+ fatal: submodule '\''sub'\'' cannot add alternate: path ... does not exist
+ Failed to clone '\''sub'\''. Retry scheduled
+ fatal: submodule '\''sub-dissociate'\'' cannot add alternate: path ... does not exist
+ Failed to clone '\''sub-dissociate'\''. Retry scheduled
+ fatal: submodule '\''sub'\'' cannot add alternate: path ... does not exist
+ Failed to clone '\''sub'\'' a second time, aborting
+ fatal: Failed to recurse into submodule path ...
+ EOF
+ test_must_fail git submodule update --init --recursive 2>err &&
+ grep -e fatal: -e ^Failed err >actual.raw &&
+ sed -e "s/path $SQ[^$SQ]*$SQ/path .../" <actual.raw >actual &&
+ test_cmp expect actual
)
'
diff --git a/t/t7418-submodule-sparse-gitmodules.sh b/t/t7418-submodule-sparse-gitmodules.sh
index 3f7f2718..f87e524 100755
--- a/t/t7418-submodule-sparse-gitmodules.sh
+++ b/t/t7418-submodule-sparse-gitmodules.sh
@@ -12,6 +12,9 @@
also by committing .gitmodules and then just removing it from the filesystem.
'
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
. ./test-lib.sh
test_expect_success 'sparse checkout setup which hides .gitmodules' '
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
index 8dd0f98..5fcaa0b 100755
--- a/t/t7500-commit-template-squash-signoff.sh
+++ b/t/t7500-commit-template-squash-signoff.sh
@@ -359,14 +359,14 @@
test_expect_success '--fixup=reword: error out with -m option' '
commit_for_rebase_autosquash_setup &&
- echo "fatal: cannot combine -m with --fixup:reword" >expect &&
+ echo "fatal: options '\''-m'\'' and '\''--fixup:reword'\'' cannot be used together" >expect &&
test_must_fail git commit --fixup=reword:HEAD~ -m "reword commit message" 2>actual &&
test_cmp expect actual
'
test_expect_success '--fixup=amend: error out with -m option' '
commit_for_rebase_autosquash_setup &&
- echo "fatal: cannot combine -m with --fixup:amend" >expect &&
+ echo "fatal: options '\''-m'\'' and '\''--fixup:amend'\'' cannot be used together" >expect &&
test_must_fail git commit --fixup=amend:HEAD~ -m "amend commit message" 2>actual &&
test_cmp expect actual
'
@@ -421,8 +421,9 @@
test_fixup_reword_opt () {
test_expect_success "--fixup=reword: incompatible with $1" "
- echo 'fatal: reword option of --fixup is mutually exclusive with'\
- '--patch/--interactive/--all/--include/--only' >expect &&
+ echo 'fatal: reword option of '\''--fixup'\'' and' \
+ ''\''--patch/--interactive/--all/--include/--only'\' \
+ 'cannot be used together' >expect &&
test_must_fail git commit --fixup=reword:HEAD~ $1 2>actual &&
test_cmp expect actual
"
@@ -435,13 +436,13 @@
test_expect_success '--fixup=reword: give error with pathsec' '
commit_for_rebase_autosquash_setup &&
- echo "fatal: cannot combine reword option of --fixup with path '\''foo'\''" >expect &&
+ echo "fatal: reword option of '\''--fixup'\'' and path '\''foo'\'' cannot be used together" >expect &&
test_must_fail git commit --fixup=reword:HEAD~ -- foo 2>actual &&
test_cmp expect actual
'
test_expect_success '--fixup=reword: -F give error message' '
- echo "fatal: Only one of -c/-C/-F/--fixup can be used." >expect &&
+ echo "fatal: options '\''-F'\'' and '\''--fixup'\'' cannot be used together" >expect &&
test_must_fail git commit --fixup=reword:HEAD~ -F msg 2>actual &&
test_cmp expect actual
'
diff --git a/t/t7501-commit-basic-functionality.sh b/t/t7501-commit-basic-functionality.sh
index 512ae27..fb5417d 100755
--- a/t/t7501-commit-basic-functionality.sh
+++ b/t/t7501-commit-basic-functionality.sh
@@ -667,10 +667,7 @@
test_expect_success 'commit a file whose name is a dash' '
git reset --hard &&
- for i in 1 2 3 4 5
- do
- echo $i
- done >./- &&
+ test_write_lines 1 2 3 4 5 >./- &&
git add ./- &&
test_tick &&
git commit -m "add dash" >output </dev/null &&
diff --git a/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh b/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
index 606d8d0..ad1eb64 100755
--- a/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
+++ b/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
@@ -7,37 +7,6 @@
. ./test-lib.sh
-HOOKDIR="$(git rev-parse --git-dir)/hooks"
-PRECOMMIT="$HOOKDIR/pre-commit"
-PREMERGE="$HOOKDIR/pre-merge-commit"
-
-# Prepare sample scripts that write their $0 to actual_hooks
-test_expect_success 'sample script setup' '
- mkdir -p "$HOOKDIR" &&
- write_script "$HOOKDIR/success.sample" <<-\EOF &&
- echo $0 >>actual_hooks
- exit 0
- EOF
- write_script "$HOOKDIR/fail.sample" <<-\EOF &&
- echo $0 >>actual_hooks
- exit 1
- EOF
- write_script "$HOOKDIR/non-exec.sample" <<-\EOF &&
- echo $0 >>actual_hooks
- exit 1
- EOF
- chmod -x "$HOOKDIR/non-exec.sample" &&
- write_script "$HOOKDIR/require-prefix.sample" <<-\EOF &&
- echo $0 >>actual_hooks
- test $GIT_PREFIX = "success/"
- EOF
- write_script "$HOOKDIR/check-author.sample" <<-\EOF
- echo $0 >>actual_hooks
- test "$GIT_AUTHOR_NAME" = "New Author" &&
- test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com"
- EOF
-'
-
test_expect_success 'root commit' '
echo "root" >file &&
git add file &&
@@ -96,10 +65,16 @@
test_path_is_missing actual_hooks
'
+setup_success_hook () {
+ test_when_finished "rm -f actual_hooks expected_hooks" &&
+ echo "$1" >expected_hooks &&
+ test_hook "$1" <<-EOF
+ echo $1 >>actual_hooks
+ EOF
+}
+
test_expect_success 'with succeeding hook' '
- test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
- cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
- echo "$PRECOMMIT" >expected_hooks &&
+ setup_success_hook "pre-commit" &&
echo "more" >>file &&
git add file &&
git commit -m "more" &&
@@ -107,9 +82,7 @@
'
test_expect_success 'with succeeding hook (merge)' '
- test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
- cp "$HOOKDIR/success.sample" "$PREMERGE" &&
- echo "$PREMERGE" >expected_hooks &&
+ setup_success_hook "pre-merge-commit" &&
git checkout side &&
git merge -m "merge main" main &&
git checkout main &&
@@ -117,17 +90,14 @@
'
test_expect_success 'automatic merge fails; both hooks are available' '
- test_when_finished "rm -f \"$PREMERGE\" \"$PRECOMMIT\"" &&
- test_when_finished "rm -f expected_hooks actual_hooks" &&
- test_when_finished "git checkout main" &&
- cp "$HOOKDIR/success.sample" "$PREMERGE" &&
- cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
+ setup_success_hook "pre-commit" &&
+ setup_success_hook "pre-merge-commit" &&
git checkout conflicting-a &&
test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
test_path_is_missing actual_hooks &&
- echo "$PRECOMMIT" >expected_hooks &&
+ echo "pre-commit" >expected_hooks &&
echo a+b >conflicting &&
git add conflicting &&
git commit -m "resolve conflict" &&
@@ -135,8 +105,7 @@
'
test_expect_success '--no-verify with succeeding hook' '
- test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
- cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
+ setup_success_hook "pre-commit" &&
echo "even more" >>file &&
git add file &&
git commit --no-verify -m "even more" &&
@@ -144,8 +113,7 @@
'
test_expect_success '--no-verify with succeeding hook (merge)' '
- test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
- cp "$HOOKDIR/success.sample" "$PREMERGE" &&
+ setup_success_hook "pre-merge-commit" &&
git branch -f side side-orig &&
git checkout side &&
git merge --no-verify -m "merge main" main &&
@@ -153,10 +121,19 @@
test_path_is_missing actual_hooks
'
+setup_failing_hook () {
+ test_when_finished "rm -f actual_hooks" &&
+ test_hook "$1" <<-EOF
+ echo $1-failing-hook >>actual_hooks
+ exit 1
+ EOF
+}
+
test_expect_success 'with failing hook' '
- test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
- cp "$HOOKDIR/fail.sample" "$PRECOMMIT" &&
- echo "$PRECOMMIT" >expected_hooks &&
+ setup_failing_hook "pre-commit" &&
+ test_when_finished "rm -f expected_hooks" &&
+ echo "pre-commit-failing-hook" >expected_hooks &&
+
echo "another" >>file &&
git add file &&
test_must_fail git commit -m "another" &&
@@ -164,8 +141,7 @@
'
test_expect_success '--no-verify with failing hook' '
- test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
- cp "$HOOKDIR/fail.sample" "$PRECOMMIT" &&
+ setup_failing_hook "pre-commit" &&
echo "stuff" >>file &&
git add file &&
git commit --no-verify -m "stuff" &&
@@ -173,9 +149,8 @@
'
test_expect_success 'with failing hook (merge)' '
- test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
- cp "$HOOKDIR/fail.sample" "$PREMERGE" &&
- echo "$PREMERGE" >expected_hooks &&
+ setup_failing_hook "pre-merge-commit" &&
+ echo "pre-merge-commit-failing-hook" >expected_hooks &&
git checkout side &&
test_must_fail git merge -m "merge main" main &&
git checkout main &&
@@ -183,8 +158,8 @@
'
test_expect_success '--no-verify with failing hook (merge)' '
- test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
- cp "$HOOKDIR/fail.sample" "$PREMERGE" &&
+ setup_failing_hook "pre-merge-commit" &&
+
git branch -f side side-orig &&
git checkout side &&
git merge --no-verify -m "merge main" main &&
@@ -192,9 +167,18 @@
test_path_is_missing actual_hooks
'
+setup_non_exec_hook () {
+ test_when_finished "rm -f actual_hooks" &&
+ test_hook "$1" <<-\EOF &&
+ echo non-exec >>actual_hooks
+ exit 1
+ EOF
+ test_hook --disable "$1"
+}
+
+
test_expect_success POSIXPERM 'with non-executable hook' '
- test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
- cp "$HOOKDIR/non-exec.sample" "$PRECOMMIT" &&
+ setup_non_exec_hook "pre-commit" &&
echo "content" >>file &&
git add file &&
git commit -m "content" &&
@@ -202,8 +186,7 @@
'
test_expect_success POSIXPERM '--no-verify with non-executable hook' '
- test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
- cp "$HOOKDIR/non-exec.sample" "$PRECOMMIT" &&
+ setup_non_exec_hook "pre-commit" &&
echo "more content" >>file &&
git add file &&
git commit --no-verify -m "more content" &&
@@ -211,8 +194,7 @@
'
test_expect_success POSIXPERM 'with non-executable hook (merge)' '
- test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
- cp "$HOOKDIR/non-exec.sample" "$PREMERGE" &&
+ setup_non_exec_hook "pre-merge" &&
git branch -f side side-orig &&
git checkout side &&
git merge -m "merge main" main &&
@@ -221,8 +203,7 @@
'
test_expect_success POSIXPERM '--no-verify with non-executable hook (merge)' '
- test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
- cp "$HOOKDIR/non-exec.sample" "$PREMERGE" &&
+ setup_non_exec_hook "pre-merge" &&
git branch -f side side-orig &&
git checkout side &&
git merge --no-verify -m "merge main" main &&
@@ -230,10 +211,18 @@
test_path_is_missing actual_hooks
'
+setup_require_prefix_hook () {
+ test_when_finished "rm -f expected_hooks" &&
+ echo require-prefix >expected_hooks &&
+ test_hook pre-commit <<-\EOF
+ echo require-prefix >>actual_hooks
+ test $GIT_PREFIX = "success/"
+ EOF
+}
+
test_expect_success 'with hook requiring GIT_PREFIX' '
- test_when_finished "rm -rf \"$PRECOMMIT\" expected_hooks actual_hooks success" &&
- cp "$HOOKDIR/require-prefix.sample" "$PRECOMMIT" &&
- echo "$PRECOMMIT" >expected_hooks &&
+ test_when_finished "rm -rf actual_hooks success" &&
+ setup_require_prefix_hook &&
echo "more content" >>file &&
git add file &&
mkdir success &&
@@ -245,9 +234,8 @@
'
test_expect_success 'with failing hook requiring GIT_PREFIX' '
- test_when_finished "rm -rf \"$PRECOMMIT\" expected_hooks actual_hooks fail" &&
- cp "$HOOKDIR/require-prefix.sample" "$PRECOMMIT" &&
- echo "$PRECOMMIT" >expected_hooks &&
+ test_when_finished "rm -rf actual_hooks fail" &&
+ setup_require_prefix_hook &&
echo "more content" >>file &&
git add file &&
mkdir fail &&
@@ -259,13 +247,23 @@
test_cmp expected_hooks actual_hooks
'
+setup_require_author_hook () {
+ test_when_finished "rm -f expected_hooks actual_hooks" &&
+ echo check-author >expected_hooks &&
+ test_hook pre-commit <<-\EOF
+ echo check-author >>actual_hooks
+ test "$GIT_AUTHOR_NAME" = "New Author" &&
+ test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com"
+ EOF
+}
+
+
test_expect_success 'check the author in hook' '
- test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
- cp "$HOOKDIR/check-author.sample" "$PRECOMMIT" &&
+ setup_require_author_hook &&
cat >expected_hooks <<-EOF &&
- $PRECOMMIT
- $PRECOMMIT
- $PRECOMMIT
+ check-author
+ check-author
+ check-author
EOF
test_must_fail git commit --allow-empty -m "by a.u.thor" &&
(
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 4e75925..a39de8c 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -54,15 +54,11 @@
'
-# now install hook that always succeeds
-HOOKDIR="$(git rev-parse --git-dir)/hooks"
-HOOK="$HOOKDIR/commit-msg"
-mkdir -p "$HOOKDIR"
-cat > "$HOOK" <<EOF
-#!/bin/sh
-exit 0
-EOF
-chmod +x "$HOOK"
+test_expect_success 'setup: commit-msg hook that always succeeds' '
+ test_hook --setup commit-msg <<-\EOF
+ exit 0
+ EOF
+'
test_expect_success 'with succeeding hook' '
@@ -98,11 +94,11 @@
'
-# now a hook that fails
-cat > "$HOOK" <<EOF
-#!/bin/sh
-exit 1
-EOF
+test_expect_success 'setup: commit-msg hook that always fails' '
+ test_hook --clobber commit-msg <<-\EOF
+ exit 1
+ EOF
+'
commit_msg_is () {
test "$(git log --pretty=format:%s%b -1)" = "$1"
@@ -133,6 +129,14 @@
'
+test_expect_success '-n followed by --verify with failing hook' '
+
+ echo "even more" >> file &&
+ git add file &&
+ test_must_fail git commit -n --verify -m "even more"
+
+'
+
test_expect_success '--no-verify with failing hook (editor)' '
echo "more stuff" >> file &&
@@ -168,8 +172,12 @@
commit_msg_is "Merge branch '\''main'\'' into newbranch"
'
+test_expect_success 'setup: commit-msg hook made non-executable' '
+ git_dir="$(git rev-parse --git-dir)" &&
+ chmod -x "$git_dir/hooks/commit-msg"
+'
-chmod -x "$HOOK"
+
test_expect_success POSIXPERM 'with non-executable hook' '
echo "content" >file &&
@@ -204,13 +212,12 @@
'
-# now a hook that edits the commit message
-cat > "$HOOK" <<'EOF'
-#!/bin/sh
-echo "new message" > "$1"
-exit 0
-EOF
-chmod +x "$HOOK"
+test_expect_success 'setup: commit-msg hook that edits the commit message' '
+ test_hook --clobber commit-msg <<-\EOF
+ echo "new message" >"$1"
+ exit 0
+ EOF
+'
test_expect_success 'hook edits commit message' '
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index 7a8194c..2128142 100755
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -16,7 +16,7 @@
test_commit rebase-b b bb &&
for i in $(test_seq 1 13)
do
- test_commit rebase-$i c $i
+ test_commit rebase-$i c $i || return 1
done &&
git checkout main &&
@@ -47,25 +47,19 @@
'
-# set up fake editor for interactive editing
-cat > fake-editor <<'EOF'
-#!/bin/sh
-exit 0
-EOF
-chmod +x fake-editor
+test_expect_success 'setup fake editor for interactive editing' '
+ write_script fake-editor <<-\EOF &&
+ exit 0
+ EOF
-## Not using test_set_editor here so we can easily ensure the editor variable
-## is only set for the editor tests
-FAKE_EDITOR="$(pwd)/fake-editor"
-export FAKE_EDITOR
+ ## Not using test_set_editor here so we can easily ensure the editor variable
+ ## is only set for the editor tests
+ FAKE_EDITOR="$(pwd)/fake-editor" &&
+ export FAKE_EDITOR
+'
-# now install hook that always succeeds and adds a message
-HOOKDIR="$(git rev-parse --git-dir)/hooks"
-HOOK="$HOOKDIR/prepare-commit-msg"
-mkdir -p "$HOOKDIR"
-echo "#!$SHELL_PATH" > "$HOOK"
-cat >> "$HOOK" <<'EOF'
-
+test_expect_success 'setup prepare-commit-msg hook' '
+ test_hook --setup prepare-commit-msg <<\EOF
GIT_DIR=$(git rev-parse --git-dir)
if test -d "$GIT_DIR/rebase-merge"
then
@@ -103,7 +97,7 @@
fi
exit 0
EOF
-chmod +x "$HOOK"
+'
echo dummy template > "$(git rev-parse --git-dir)/template"
@@ -250,7 +244,6 @@
}
test_rebase success
-test_have_prereq !REBASE_P || test_rebase success -p
test_expect_success 'with hook (cherry-pick)' '
test_when_finished "git checkout -f main" &&
@@ -266,10 +259,11 @@
test "$(git log -1 --pretty=format:%s)" = merge
'
-cat > "$HOOK" <<'EOF'
-#!/bin/sh
-exit 1
-EOF
+test_expect_success 'setup: commit-msg hook that always fails' '
+ test_hook --setup --clobber prepare-commit-msg <<-\EOF
+ exit 1
+ EOF
+'
test_expect_success 'with failing hook' '
@@ -297,9 +291,9 @@
git checkout -B other HEAD@{1} &&
echo "more" >> file &&
git add file &&
- rm -f "$HOOK" &&
+ test_hook --remove prepare-commit-msg &&
git commit -m other &&
- write_script "$HOOK" <<-EOF &&
+ test_hook --setup prepare-commit-msg <<-\EOF &&
exit 1
EOF
git checkout - &&
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 05c6c02..2b7ef6c 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -1647,13 +1647,33 @@
'
test_expect_success '--no-optional-locks prevents index update' '
- test-tool chmtime =1234567890 .git/index &&
+ test_set_magic_mtime .git/index &&
git --no-optional-locks status &&
- test-tool chmtime --get .git/index >out &&
- grep ^1234567890 out &&
+ test_is_magic_mtime .git/index &&
git status &&
- test-tool chmtime --get .git/index >out &&
- ! grep ^1234567890 out
+ ! test_is_magic_mtime .git/index
+'
+
+test_expect_success 'racy timestamps will be fixed for clean worktree' '
+ echo content >racy-dirty &&
+ echo content >racy-racy &&
+ git add racy* &&
+ git commit -m "racy test files" &&
+ # let status rewrite the index, if necessary; after that we expect
+ # no more index writes unless caused by racy timestamps; note that
+ # timestamps may already be racy now (depending on previous tests)
+ git status &&
+ test_set_magic_mtime .git/index &&
+ git status &&
+ ! test_is_magic_mtime .git/index
+'
+
+test_expect_success 'racy timestamps will be fixed for dirty worktree' '
+ echo content2 >racy-dirty &&
+ git status &&
+ test_set_magic_mtime .git/index &&
+ git status &&
+ ! test_is_magic_mtime .git/index
'
test_done
diff --git a/t/t7509-commit-authorship.sh b/t/t7509-commit-authorship.sh
index d568593..21c668f 100755
--- a/t/t7509-commit-authorship.sh
+++ b/t/t7509-commit-authorship.sh
@@ -5,6 +5,7 @@
test_description='commit tests of various authorhip options. '
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
author_header () {
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 8df5a74..8593b7e 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -110,6 +110,13 @@
)
'
+test_expect_success GPG 'verify-commit exits failure on unknown signature' '
+ test_must_fail env GNUPGHOME="$GNUPGHOME_NOT_USED" git verify-commit initial 2>actual &&
+ ! grep "Good signature from" actual &&
+ ! grep "BAD signature from" actual &&
+ grep -q -F -e "No public key" -e "public key not found" actual
+'
+
test_expect_success GPG 'verify-commit exits success on untrusted signature' '
git verify-commit eighth-signed-alt 2>actual &&
grep "Good signature from" actual &&
@@ -203,7 +210,7 @@
'
test_expect_success GPG 'amending already signed commit' '
- git checkout fourth-signed^0 &&
+ git checkout -f fourth-signed^0 &&
git commit --amend -S --no-edit &&
git verify-commit HEAD &&
git show -s --show-signature HEAD >actual &&
@@ -338,6 +345,8 @@
'
+# NEEDSWORK: This test relies on the test_tick commit/author dates from the first
+# 'create signed commits' test even though it creates its own
test_expect_success GPG 'verify-commit verifies multiply signed commits' '
git init multiply-signed &&
cd multiply-signed &&
diff --git a/t/t7511-status-index.sh b/t/t7511-status-index.sh
index b5fdc04..4ffa45a 100755
--- a/t/t7511-status-index.sh
+++ b/t/t7511-status-index.sh
@@ -2,6 +2,7 @@
test_description='git status with certain file name lengths'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
files="0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v w x y z"
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 7f2956d..2f16d57 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -659,6 +659,7 @@
You are in the middle of an am session.
The current patch is empty.
(use "git am --skip" to skip this patch)
+ (use "git am --allow-empty" to record this patch as an empty commit)
(use "git am --abort" to restore the original branch)
nothing to commit (use -u to show untracked files)
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index 04885d0..97f1090 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpret-trailers.sh
@@ -156,7 +156,7 @@
Acked-by: Johan
Reviewed-by: Peff
EOF
- { echo; echo "Acked-by: Johan"; } |
+ { echo && echo "Acked-by: Johan"; } |
git -c "trailer.Acked-by.ifexists=addifdifferent" interpret-trailers \
--trailer "Reviewed-by: Peff" --trailer "Acked-by: Johan" >actual &&
test_cmp expected actual
diff --git a/t/t7515-status-symlinks.sh b/t/t7515-status-symlinks.sh
index 9f989be..e3d6bb6 100755
--- a/t/t7515-status-symlinks.sh
+++ b/t/t7515-status-symlinks.sh
@@ -2,6 +2,7 @@
test_description='git status and symlinks'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh
index 405420a..163ae80 100755
--- a/t/t7517-per-repo-email.sh
+++ b/t/t7517-per-repo-email.sh
@@ -75,19 +75,6 @@
git rebase -i HEAD^
'
-test_expect_success REBASE_P \
- 'fast-forward rebase does not care about ident (preserve)' '
- git checkout -B tmp side-without-commit &&
- git rebase -p main
-'
-
-test_expect_success REBASE_P \
- 'non-fast-forward rebase refuses to write commits (preserve)' '
- test_when_finished "git rebase --abort || true" &&
- git checkout -B tmp side-with-commit &&
- test_must_fail git rebase -p main
-'
-
test_expect_success 'author.name overrides user.name' '
test_config user.name user &&
test_config user.email user@example.com &&
diff --git a/t/t7518-ident-corner-cases.sh b/t/t7518-ident-corner-cases.sh
index 905957b..fffdb6f 100755
--- a/t/t7518-ident-corner-cases.sh
+++ b/t/t7518-ident-corner-cases.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='corner cases in ident strings'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# confirm that we do not segfault _and_ that we do not say "(null)", as
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index f488d93..d4f9c6a 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -26,7 +26,7 @@
}
write_integration_script () {
- write_script .git/hooks/fsmonitor-test<<-\EOF
+ test_hook --setup --clobber fsmonitor-test<<-\EOF
if test "$#" -ne 2
then
echo "$0: exactly 2 arguments expected"
@@ -56,7 +56,6 @@
'
test_expect_success 'setup' '
- mkdir -p .git/hooks &&
: >tracked &&
: >modified &&
mkdir dir1 &&
@@ -108,7 +107,7 @@
# test that "update-index --fsmonitor-valid" sets the fsmonitor valid bit
test_expect_success 'update-index --fsmonitor-valid" sets the fsmonitor valid bit' '
- write_script .git/hooks/fsmonitor-test<<-\EOF &&
+ test_hook fsmonitor-test<<-\EOF &&
printf "last_update_token\0"
EOF
git update-index --fsmonitor &&
@@ -169,7 +168,7 @@
# test that newly added files are marked valid
test_expect_success 'newly added files are marked valid' '
- write_script .git/hooks/fsmonitor-test<<-\EOF &&
+ test_hook --setup --clobber fsmonitor-test<<-\EOF &&
printf "last_update_token\0"
EOF
git add new &&
@@ -210,7 +209,7 @@
# test that *only* files returned by the integration script get flagged as invalid
test_expect_success '*only* files returned by the integration script get flagged as invalid' '
- write_script .git/hooks/fsmonitor-test<<-\EOF &&
+ test_hook --clobber fsmonitor-test<<-\EOF &&
printf "last_update_token\0"
printf "dir1/modified\0"
EOF
@@ -231,7 +230,7 @@
dirty_repo &&
write_integration_script &&
git add . &&
- write_script .git/hooks/fsmonitor-test<<-\EOF &&
+ test_hook --clobber fsmonitor-test<<-\EOF &&
EOF
git commit -m "to reset" &&
git reset HEAD~1 &&
@@ -248,7 +247,7 @@
git config core.preloadIndex $preload_val &&
if test $preload_val = true
then
- GIT_TEST_PRELOAD_INDEX=$preload_val; export GIT_TEST_PRELOAD_INDEX
+ GIT_TEST_PRELOAD_INDEX=$preload_val && export GIT_TEST_PRELOAD_INDEX
else
sane_unset GIT_TEST_PRELOAD_INDEX
fi
@@ -280,7 +279,7 @@
# Make sure it's actually skipping the check for modified and untracked
# (if enabled) files unless it is told about them.
test_expect_success "status doesn't detect unreported modifications" '
- write_script .git/hooks/fsmonitor-test<<-\EOF &&
+ test_hook --clobber fsmonitor-test<<-\EOF &&
printf "last_update_token\0"
:>marker
EOF
@@ -322,19 +321,25 @@
test_create_repo dot-git &&
(
cd dot-git &&
- mkdir -p .git/hooks &&
: >tracked &&
+ test-tool chmtime =-60 tracked &&
: >modified &&
+ test-tool chmtime =-60 modified &&
mkdir dir1 &&
: >dir1/tracked &&
+ test-tool chmtime =-60 dir1/tracked &&
: >dir1/modified &&
+ test-tool chmtime =-60 dir1/modified &&
mkdir dir2 &&
: >dir2/tracked &&
+ test-tool chmtime =-60 dir2/tracked &&
: >dir2/modified &&
+ test-tool chmtime =-60 dir2/modified &&
write_integration_script &&
git config core.fsmonitor .git/hooks/fsmonitor-test &&
git update-index --untracked-cache &&
git update-index --fsmonitor &&
+ git status &&
GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace-before" \
git status &&
test-tool dump-untracked-cache >../before
@@ -390,7 +395,7 @@
# during a call to 'git status'. Otherwise, we verify that we _do_ call it.
check_sparse_index_behavior () {
git -C full status --porcelain=v2 >expect &&
- GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
git -C sparse status --porcelain=v2 >actual &&
test_region $1 index ensure_full_index trace2.txt &&
test_region fsm_hook query trace2.txt &&
@@ -407,14 +412,14 @@
git -C sparse sparse-checkout init --cone --sparse-index &&
git -C sparse sparse-checkout set dir1 dir2 &&
- write_script .git/hooks/fsmonitor-test <<-\EOF &&
+ test_hook --clobber fsmonitor-test <<-\EOF &&
printf "last_update_token\0"
EOF
git -C full config core.fsmonitor ../.git/hooks/fsmonitor-test &&
git -C sparse config core.fsmonitor ../.git/hooks/fsmonitor-test &&
check_sparse_index_behavior ! &&
- write_script .git/hooks/fsmonitor-test <<-\EOF &&
+ test_hook --clobber fsmonitor-test <<-\EOF &&
printf "last_update_token\0"
printf "dir1/modified\0"
EOF
@@ -432,7 +437,7 @@
# This one modifies outside the sparse-checkout definition
# and hence we expect to expand the sparse-index.
- write_script .git/hooks/fsmonitor-test <<-\EOF &&
+ test_hook --clobber fsmonitor-test <<-\EOF &&
printf "last_update_token\0"
printf "dir1a/modified\0"
EOF
diff --git a/t/t7520-ignored-hook-warning.sh b/t/t7520-ignored-hook-warning.sh
index 634fb7f..dc57526 100755
--- a/t/t7520-ignored-hook-warning.sh
+++ b/t/t7520-ignored-hook-warning.sh
@@ -5,10 +5,7 @@
. ./test-lib.sh
test_expect_success setup '
- hookdir="$(git rev-parse --git-dir)/hooks" &&
- hook="$hookdir/pre-commit" &&
- mkdir -p "$hookdir" &&
- write_script "$hook" <<-\EOF
+ test_hook --setup pre-commit <<-\EOF
exit 0
EOF
'
@@ -19,20 +16,20 @@
'
test_expect_success POSIXPERM 'warning if hook is ignored' '
- chmod -x "$hook" &&
+ test_hook --disable pre-commit &&
git commit --allow-empty -m "even more" 2>message &&
test_i18ngrep -e "hook was ignored" message
'
test_expect_success POSIXPERM 'no warning if advice.ignoredHook set to false' '
test_config advice.ignoredHook false &&
- chmod -x "$hook" &&
+ test_hook --disable pre-commit &&
git commit --allow-empty -m "even more" 2>message &&
test_i18ngrep ! -e "hook was ignored" message
'
test_expect_success 'no warning if unset advice.ignoredHook and hook removed' '
- rm -f "$hook" &&
+ test_hook --remove pre-commit &&
test_unconfig advice.ignoredHook &&
git commit --allow-empty -m "even more" 2>message &&
test_i18ngrep ! -e "hook was ignored" message
diff --git a/t/t7524-commit-summary.sh b/t/t7524-commit-summary.sh
new file mode 100755
index 0000000..47b2f1d
--- /dev/null
+++ b/t/t7524-commit-summary.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+test_description='git commit summary'
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_seq 101 200 >file &&
+ git add file &&
+ git commit -m initial &&
+ git tag initial
+'
+
+test_expect_success 'commit summary ignores rewrites' '
+ git reset --hard initial &&
+ test_seq 200 300 >file &&
+
+ git diff --stat >diffstat &&
+ git diff --stat --break-rewrites >diffstatrewrite &&
+
+ # make sure this scenario is a detectable rewrite
+ ! test_cmp_bin diffstat diffstatrewrite &&
+
+ git add file &&
+ git commit -m second >actual &&
+
+ grep "1 file" <actual >actual.total &&
+ grep "1 file" <diffstat >diffstat.total &&
+ test_cmp diffstat.total actual.total
+'
+
+test_done
diff --git a/t/t7525-status-rename.sh b/t/t7525-status-rename.sh
index a62736d..22bf5c7 100755
--- a/t/t7525-status-rename.sh
+++ b/t/t7525-status-rename.sh
@@ -2,6 +2,7 @@
test_description='git status rename detection options'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t7526-commit-pathspec-file.sh b/t/t7526-commit-pathspec-file.sh
index 5fbe47e..ad011bb 100755
--- a/t/t7526-commit-pathspec-file.sh
+++ b/t/t7526-commit-pathspec-file.sh
@@ -2,6 +2,7 @@
test_description='commit --pathspec-from-file'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_tick
@@ -140,19 +141,19 @@
>empty_list &&
test_must_fail git commit --pathspec-from-file=list --interactive -m "Commit" 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
+ test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
test_must_fail git commit --pathspec-from-file=list --patch -m "Commit" 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
+ test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
test_must_fail git commit --pathspec-from-file=list --all -m "Commit" 2>err &&
- test_i18ngrep -e "--pathspec-from-file with -a does not make sense" err &&
+ test_i18ngrep -e "options .--pathspec-from-file. and .-a. cannot be used together" err &&
test_must_fail git commit --pathspec-from-file=list -m "Commit" -- fileA.t 2>err &&
- test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+ test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git commit --pathspec-file-nul -m "Commit" 2>err &&
- test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+ test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
test_must_fail git commit --pathspec-from-file=empty_list --include -m "Commit" 2>err &&
test_i18ngrep -e "No paths with --include/--only does not make sense." err &&
diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh
new file mode 100755
index 0000000..bd0c952
--- /dev/null
+++ b/t/t7527-builtin-fsmonitor.sh
@@ -0,0 +1,609 @@
+#!/bin/sh
+
+test_description='built-in file system watcher'
+
+. ./test-lib.sh
+
+if ! test_have_prereq FSMONITOR_DAEMON
+then
+ skip_all="fsmonitor--daemon is not supported on this platform"
+ test_done
+fi
+
+stop_daemon_delete_repo () {
+ r=$1 &&
+ test_might_fail git -C $r fsmonitor--daemon stop &&
+ rm -rf $1
+}
+
+start_daemon () {
+ r= tf= t2= tk= &&
+
+ while test "$#" -ne 0
+ do
+ case "$1" in
+ -C)
+ r="-C ${2?}"
+ shift
+ ;;
+ --tf)
+ tf="${2?}"
+ shift
+ ;;
+ --t2)
+ t2="${2?}"
+ shift
+ ;;
+ --tk)
+ tk="${2?}"
+ shift
+ ;;
+ -*)
+ BUG "error: unknown option: '$1'"
+ ;;
+ *)
+ BUG "error: unbound argument: '$1'"
+ ;;
+ esac
+ shift
+ done &&
+
+ (
+ if test -n "$tf"
+ then
+ GIT_TRACE_FSMONITOR="$tf"
+ export GIT_TRACE_FSMONITOR
+ fi &&
+
+ if test -n "$t2"
+ then
+ GIT_TRACE2_PERF="$t2"
+ export GIT_TRACE2_PERF
+ fi &&
+
+ if test -n "$tk"
+ then
+ GIT_TEST_FSMONITOR_TOKEN="$tk"
+ export GIT_TEST_FSMONITOR_TOKEN
+ fi &&
+
+ git $r fsmonitor--daemon start &&
+ git $r fsmonitor--daemon status
+ )
+}
+
+# Is a Trace2 data event present with the given catetory and key?
+# We do not care what the value is.
+#
+have_t2_data_event () {
+ c=$1 &&
+ k=$2 &&
+
+ grep -e '"event":"data".*"category":"'"$c"'".*"key":"'"$k"'"'
+}
+
+test_expect_success 'explicit daemon start and stop' '
+ test_when_finished "stop_daemon_delete_repo test_explicit" &&
+
+ git init test_explicit &&
+ start_daemon -C test_explicit &&
+
+ git -C test_explicit fsmonitor--daemon stop &&
+ test_must_fail git -C test_explicit fsmonitor--daemon status
+'
+
+test_expect_success 'implicit daemon start' '
+ test_when_finished "stop_daemon_delete_repo test_implicit" &&
+
+ git init test_implicit &&
+ test_must_fail git -C test_implicit fsmonitor--daemon status &&
+
+ # query will implicitly start the daemon.
+ #
+ # for test-script simplicity, we send a V1 timestamp rather than
+ # a V2 token. either way, the daemon response to any query contains
+ # a new V2 token. (the daemon may complain that we sent a V1 request,
+ # but this test case is only concerned with whether the daemon was
+ # implicitly started.)
+
+ GIT_TRACE2_EVENT="$PWD/.git/trace" \
+ test-tool -C test_implicit fsmonitor-client query --token 0 >actual &&
+ nul_to_q <actual >actual.filtered &&
+ grep "builtin:" actual.filtered &&
+
+ # confirm that a daemon was started in the background.
+ #
+ # since the mechanism for starting the background daemon is platform
+ # dependent, just confirm that the foreground command received a
+ # response from the daemon.
+
+ have_t2_data_event fsm_client query/response-length <.git/trace &&
+
+ git -C test_implicit fsmonitor--daemon status &&
+ git -C test_implicit fsmonitor--daemon stop &&
+ test_must_fail git -C test_implicit fsmonitor--daemon status
+'
+
+test_expect_success 'implicit daemon stop (delete .git)' '
+ test_when_finished "stop_daemon_delete_repo test_implicit_1" &&
+
+ git init test_implicit_1 &&
+
+ start_daemon -C test_implicit_1 &&
+
+ # deleting the .git directory will implicitly stop the daemon.
+ rm -rf test_implicit_1/.git &&
+
+ # [1] Create an empty .git directory so that the following Git
+ # command will stay relative to the `-C` directory.
+ #
+ # Without this, the Git command will override the requested
+ # -C argument and crawl out to the containing Git source tree.
+ # This would make the test result dependent upon whether we
+ # were using fsmonitor on our development worktree.
+ #
+ sleep 1 &&
+ mkdir test_implicit_1/.git &&
+
+ test_must_fail git -C test_implicit_1 fsmonitor--daemon status
+'
+
+test_expect_success 'implicit daemon stop (rename .git)' '
+ test_when_finished "stop_daemon_delete_repo test_implicit_2" &&
+
+ git init test_implicit_2 &&
+
+ start_daemon -C test_implicit_2 &&
+
+ # renaming the .git directory will implicitly stop the daemon.
+ mv test_implicit_2/.git test_implicit_2/.xxx &&
+
+ # See [1] above.
+ #
+ sleep 1 &&
+ mkdir test_implicit_2/.git &&
+
+ test_must_fail git -C test_implicit_2 fsmonitor--daemon status
+'
+
+test_expect_success 'cannot start multiple daemons' '
+ test_when_finished "stop_daemon_delete_repo test_multiple" &&
+
+ git init test_multiple &&
+
+ start_daemon -C test_multiple &&
+
+ test_must_fail git -C test_multiple fsmonitor--daemon start 2>actual &&
+ grep "fsmonitor--daemon is already running" actual &&
+
+ git -C test_multiple fsmonitor--daemon stop &&
+ test_must_fail git -C test_multiple fsmonitor--daemon status
+'
+
+# These tests use the main repo in the trash directory
+
+test_expect_success 'setup' '
+ >tracked &&
+ >modified &&
+ >delete &&
+ >rename &&
+ mkdir dir1 &&
+ >dir1/tracked &&
+ >dir1/modified &&
+ >dir1/delete &&
+ >dir1/rename &&
+ mkdir dir2 &&
+ >dir2/tracked &&
+ >dir2/modified &&
+ >dir2/delete &&
+ >dir2/rename &&
+ mkdir dirtorename &&
+ >dirtorename/a &&
+ >dirtorename/b &&
+
+ cat >.gitignore <<-\EOF &&
+ .gitignore
+ expect*
+ actual*
+ flush*
+ trace*
+ EOF
+
+ git -c core.fsmonitor=false add . &&
+ test_tick &&
+ git -c core.fsmonitor=false commit -m initial &&
+
+ git config core.fsmonitor true
+'
+
+# The test already explicitly stopped (or tried to stop) the daemon.
+# This is here in case something else fails first.
+#
+redundant_stop_daemon () {
+ test_might_fail git fsmonitor--daemon stop
+}
+
+test_expect_success 'update-index implicitly starts daemon' '
+ test_when_finished redundant_stop_daemon &&
+
+ test_must_fail git fsmonitor--daemon status &&
+
+ GIT_TRACE2_EVENT="$PWD/.git/trace_implicit_1" \
+ git update-index --fsmonitor &&
+
+ git fsmonitor--daemon status &&
+ test_might_fail git fsmonitor--daemon stop &&
+
+ # Confirm that the trace2 log contains a record of the
+ # daemon starting.
+ test_subcommand git fsmonitor--daemon start <.git/trace_implicit_1
+'
+
+test_expect_success 'status implicitly starts daemon' '
+ test_when_finished redundant_stop_daemon &&
+
+ test_must_fail git fsmonitor--daemon status &&
+
+ GIT_TRACE2_EVENT="$PWD/.git/trace_implicit_2" \
+ git status >actual &&
+
+ git fsmonitor--daemon status &&
+ test_might_fail git fsmonitor--daemon stop &&
+
+ # Confirm that the trace2 log contains a record of the
+ # daemon starting.
+ test_subcommand git fsmonitor--daemon start <.git/trace_implicit_2
+'
+
+edit_files () {
+ echo 1 >modified &&
+ echo 2 >dir1/modified &&
+ echo 3 >dir2/modified &&
+ >dir1/untracked
+}
+
+delete_files () {
+ rm -f delete &&
+ rm -f dir1/delete &&
+ rm -f dir2/delete
+}
+
+create_files () {
+ echo 1 >new &&
+ echo 2 >dir1/new &&
+ echo 3 >dir2/new
+}
+
+rename_files () {
+ mv rename renamed &&
+ mv dir1/rename dir1/renamed &&
+ mv dir2/rename dir2/renamed
+}
+
+file_to_directory () {
+ rm -f delete &&
+ mkdir delete &&
+ echo 1 >delete/new
+}
+
+directory_to_file () {
+ rm -rf dir1 &&
+ echo 1 >dir1
+}
+
+# The next few test cases confirm that our fsmonitor daemon sees each type
+# of OS filesystem notification that we care about. At this layer we just
+# ensure we are getting the OS notifications and do not try to confirm what
+# is reported by `git status`.
+#
+# We run a simple query after modifying the filesystem just to introduce
+# a bit of a delay so that the trace logging from the daemon has time to
+# get flushed to disk.
+#
+# We `reset` and `clean` at the bottom of each test (and before stopping the
+# daemon) because these commands might implicitly restart the daemon.
+
+clean_up_repo_and_stop_daemon () {
+ git reset --hard HEAD &&
+ git clean -fd &&
+ test_might_fail git fsmonitor--daemon stop &&
+ rm -f .git/trace
+}
+
+test_expect_success 'edit some files' '
+ test_when_finished clean_up_repo_and_stop_daemon &&
+
+ start_daemon --tf "$PWD/.git/trace" &&
+
+ edit_files &&
+
+ test-tool fsmonitor-client query --token 0 &&
+
+ grep "^event: dir1/modified$" .git/trace &&
+ grep "^event: dir2/modified$" .git/trace &&
+ grep "^event: modified$" .git/trace &&
+ grep "^event: dir1/untracked$" .git/trace
+'
+
+test_expect_success 'create some files' '
+ test_when_finished clean_up_repo_and_stop_daemon &&
+
+ start_daemon --tf "$PWD/.git/trace" &&
+
+ create_files &&
+
+ test-tool fsmonitor-client query --token 0 &&
+
+ grep "^event: dir1/new$" .git/trace &&
+ grep "^event: dir2/new$" .git/trace &&
+ grep "^event: new$" .git/trace
+'
+
+test_expect_success 'delete some files' '
+ test_when_finished clean_up_repo_and_stop_daemon &&
+
+ start_daemon --tf "$PWD/.git/trace" &&
+
+ delete_files &&
+
+ test-tool fsmonitor-client query --token 0 &&
+
+ grep "^event: dir1/delete$" .git/trace &&
+ grep "^event: dir2/delete$" .git/trace &&
+ grep "^event: delete$" .git/trace
+'
+
+test_expect_success 'rename some files' '
+ test_when_finished clean_up_repo_and_stop_daemon &&
+
+ start_daemon --tf "$PWD/.git/trace" &&
+
+ rename_files &&
+
+ test-tool fsmonitor-client query --token 0 &&
+
+ grep "^event: dir1/rename$" .git/trace &&
+ grep "^event: dir2/rename$" .git/trace &&
+ grep "^event: rename$" .git/trace &&
+ grep "^event: dir1/renamed$" .git/trace &&
+ grep "^event: dir2/renamed$" .git/trace &&
+ grep "^event: renamed$" .git/trace
+'
+
+test_expect_success 'rename directory' '
+ test_when_finished clean_up_repo_and_stop_daemon &&
+
+ start_daemon --tf "$PWD/.git/trace" &&
+
+ mv dirtorename dirrenamed &&
+
+ test-tool fsmonitor-client query --token 0 &&
+
+ grep "^event: dirtorename/*$" .git/trace &&
+ grep "^event: dirrenamed/*$" .git/trace
+'
+
+test_expect_success 'file changes to directory' '
+ test_when_finished clean_up_repo_and_stop_daemon &&
+
+ start_daemon --tf "$PWD/.git/trace" &&
+
+ file_to_directory &&
+
+ test-tool fsmonitor-client query --token 0 &&
+
+ grep "^event: delete$" .git/trace &&
+ grep "^event: delete/new$" .git/trace
+'
+
+test_expect_success 'directory changes to a file' '
+ test_when_finished clean_up_repo_and_stop_daemon &&
+
+ start_daemon --tf "$PWD/.git/trace" &&
+
+ directory_to_file &&
+
+ test-tool fsmonitor-client query --token 0 &&
+
+ grep "^event: dir1$" .git/trace
+'
+
+# The next few test cases exercise the token-resync code. When filesystem
+# drops events (because of filesystem velocity or because the daemon isn't
+# polling fast enough), we need to discard the cached data (relative to the
+# current token) and start collecting events under a new token.
+#
+# the 'test-tool fsmonitor-client flush' command can be used to send a
+# "flush" message to a running daemon and ask it to do a flush/resync.
+
+test_expect_success 'flush cached data' '
+ test_when_finished "stop_daemon_delete_repo test_flush" &&
+
+ git init test_flush &&
+
+ start_daemon -C test_flush --tf "$PWD/.git/trace_daemon" --tk true &&
+
+ # The daemon should have an initial token with no events in _0 and
+ # then a few (probably platform-specific number of) events in _1.
+ # These should both have the same <token_id>.
+
+ test-tool -C test_flush fsmonitor-client query --token "builtin:test_00000001:0" >actual_0 &&
+ nul_to_q <actual_0 >actual_q0 &&
+
+ >test_flush/file_1 &&
+ >test_flush/file_2 &&
+
+ test-tool -C test_flush fsmonitor-client query --token "builtin:test_00000001:0" >actual_1 &&
+ nul_to_q <actual_1 >actual_q1 &&
+
+ grep "file_1" actual_q1 &&
+
+ # Force a flush. This will change the <token_id>, reset the <seq_nr>, and
+ # flush the file data. Then create some events and ensure that the file
+ # again appears in the cache. It should have the new <token_id>.
+
+ test-tool -C test_flush fsmonitor-client flush >flush_0 &&
+ nul_to_q <flush_0 >flush_q0 &&
+ grep "^builtin:test_00000002:0Q/Q$" flush_q0 &&
+
+ test-tool -C test_flush fsmonitor-client query --token "builtin:test_00000002:0" >actual_2 &&
+ nul_to_q <actual_2 >actual_q2 &&
+
+ grep "^builtin:test_00000002:0Q$" actual_q2 &&
+
+ >test_flush/file_3 &&
+
+ test-tool -C test_flush fsmonitor-client query --token "builtin:test_00000002:0" >actual_3 &&
+ nul_to_q <actual_3 >actual_q3 &&
+
+ grep "file_3" actual_q3
+'
+
+# The next few test cases create repos where the .git directory is NOT
+# inside the one of the working directory. That is, where .git is a file
+# that points to a directory elsewhere. This happens for submodules and
+# non-primary worktrees.
+
+test_expect_success 'setup worktree base' '
+ git init wt-base &&
+ echo 1 >wt-base/file1 &&
+ git -C wt-base add file1 &&
+ git -C wt-base commit -m "c1"
+'
+
+test_expect_success 'worktree with .git file' '
+ git -C wt-base worktree add ../wt-secondary &&
+
+ start_daemon -C wt-secondary \
+ --tf "$PWD/trace_wt_secondary" \
+ --t2 "$PWD/trace2_wt_secondary" &&
+
+ git -C wt-secondary fsmonitor--daemon stop &&
+ test_must_fail git -C wt-secondary fsmonitor--daemon status
+'
+
+# NEEDSWORK: Repeat one of the "edit" tests on wt-secondary and
+# confirm that we get the same events and behavior -- that is, that
+# fsmonitor--daemon correctly watches BOTH the working directory and
+# the external GITDIR directory and behaves the same as when ".git"
+# is a directory inside the working directory.
+
+test_expect_success 'cleanup worktrees' '
+ stop_daemon_delete_repo wt-secondary &&
+ stop_daemon_delete_repo wt-base
+'
+
+# The next few tests perform arbitrary/contrived file operations and
+# confirm that status is correct. That is, that the data (or lack of
+# data) from fsmonitor doesn't cause incorrect results. And doesn't
+# cause incorrect results when the untracked-cache is enabled.
+
+test_lazy_prereq UNTRACKED_CACHE '
+ git update-index --test-untracked-cache
+'
+
+test_expect_success 'Matrix: setup for untracked-cache,fsmonitor matrix' '
+ test_unconfig core.fsmonitor &&
+ git update-index --no-fsmonitor &&
+ test_might_fail git fsmonitor--daemon stop
+'
+
+matrix_clean_up_repo () {
+ git reset --hard HEAD &&
+ git clean -fd
+}
+
+matrix_try () {
+ uc=$1 &&
+ fsm=$2 &&
+ fn=$3 &&
+
+ if test $uc = true && test $fsm = false
+ then
+ # The untracked-cache is buggy when FSMonitor is
+ # DISABLED, so skip the tests for this matrix
+ # combination.
+ #
+ # We've observed random, occasional test failures on
+ # Windows and MacOS when the UC is turned on and FSM
+ # is turned off. These are rare, but they do happen
+ # indicating that it is probably a race condition within
+ # the untracked cache itself.
+ #
+ # It usually happens when a test does F/D trickery and
+ # then the NEXT test fails because of extra status
+ # output from stale UC data from the previous test.
+ #
+ # Since FSMonitor is not involved in the error, skip
+ # the tests for this matrix combination.
+ #
+ return 0
+ fi &&
+
+ test_expect_success "Matrix[uc:$uc][fsm:$fsm] $fn" '
+ matrix_clean_up_repo &&
+ $fn &&
+ if test $uc = false && test $fsm = false
+ then
+ git status --porcelain=v1 >.git/expect.$fn
+ else
+ git status --porcelain=v1 >.git/actual.$fn &&
+ test_cmp .git/expect.$fn .git/actual.$fn
+ fi
+ '
+}
+
+uc_values="false"
+test_have_prereq UNTRACKED_CACHE && uc_values="false true"
+for uc_val in $uc_values
+do
+ if test $uc_val = false
+ then
+ test_expect_success "Matrix[uc:$uc_val] disable untracked cache" '
+ git config core.untrackedcache false &&
+ git update-index --no-untracked-cache
+ '
+ else
+ test_expect_success "Matrix[uc:$uc_val] enable untracked cache" '
+ git config core.untrackedcache true &&
+ git update-index --untracked-cache
+ '
+ fi
+
+ fsm_values="false true"
+ for fsm_val in $fsm_values
+ do
+ if test $fsm_val = false
+ then
+ test_expect_success "Matrix[uc:$uc_val][fsm:$fsm_val] disable fsmonitor" '
+ test_unconfig core.fsmonitor &&
+ git update-index --no-fsmonitor &&
+ test_might_fail git fsmonitor--daemon stop
+ '
+ else
+ test_expect_success "Matrix[uc:$uc_val][fsm:$fsm_val] enable fsmonitor" '
+ git config core.fsmonitor true &&
+ git fsmonitor--daemon start &&
+ git update-index --fsmonitor
+ '
+ fi
+
+ matrix_try $uc_val $fsm_val edit_files
+ matrix_try $uc_val $fsm_val delete_files
+ matrix_try $uc_val $fsm_val create_files
+ matrix_try $uc_val $fsm_val rename_files
+ matrix_try $uc_val $fsm_val file_to_directory
+ matrix_try $uc_val $fsm_val directory_to_file
+
+ if test $fsm_val = true
+ then
+ test_expect_success "Matrix[uc:$uc_val][fsm:$fsm_val] disable fsmonitor at end" '
+ test_unconfig core.fsmonitor &&
+ git update-index --no-fsmonitor &&
+ test_might_fail git fsmonitor--daemon stop
+ '
+ fi
+ done
+done
+
+test_done
diff --git a/t/t7528-signed-commit-ssh.sh b/t/t7528-signed-commit-ssh.sh
new file mode 100755
index 0000000..f47e995
--- /dev/null
+++ b/t/t7528-signed-commit-ssh.sh
@@ -0,0 +1,462 @@
+#!/bin/sh
+
+test_description='ssh signed commit tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+GNUPGHOME_NOT_USED=$GNUPGHOME
+. "$TEST_DIRECTORY/lib-gpg.sh"
+
+test_expect_success GPGSSH 'create signed commits' '
+ test_oid_cache <<-\EOF &&
+ header sha1:gpgsig
+ header sha256:gpgsig-sha256
+ EOF
+
+ test_when_finished "test_unconfig commit.gpgsign" &&
+ test_config gpg.format ssh &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+
+ echo 1 >file && git add file &&
+ test_tick && git commit -S -m initial &&
+ git tag initial &&
+ git branch side &&
+
+ echo 2 >file && test_tick && git commit -a -S -m second &&
+ git tag second &&
+
+ git checkout side &&
+ echo 3 >elif && git add elif &&
+ test_tick && git commit -m "third on side" &&
+
+ git checkout main &&
+ test_tick && git merge -S side &&
+ git tag merge &&
+
+ echo 4 >file && test_tick && git commit -a -m "fourth unsigned" &&
+ git tag fourth-unsigned &&
+
+ test_tick && git commit --amend -S -m "fourth signed" &&
+ git tag fourth-signed &&
+
+ git config commit.gpgsign true &&
+ echo 5 >file && test_tick && git commit -a -m "fifth signed" &&
+ git tag fifth-signed &&
+
+ git config commit.gpgsign false &&
+ echo 6 >file && test_tick && git commit -a -m "sixth" &&
+ git tag sixth-unsigned &&
+
+ git config commit.gpgsign true &&
+ echo 7 >file && test_tick && git commit -a -m "seventh" --no-gpg-sign &&
+ git tag seventh-unsigned &&
+
+ test_tick && git rebase -f HEAD^^ && git tag sixth-signed HEAD^ &&
+ git tag seventh-signed &&
+
+ echo 8 >file && test_tick && git commit -a -m eighth -S"${GPGSSH_KEY_UNTRUSTED}" &&
+ git tag eighth-signed-alt &&
+
+ # commit.gpgsign is still on but this must not be signed
+ echo 9 | git commit-tree HEAD^{tree} >oid &&
+ test_line_count = 1 oid &&
+ git tag ninth-unsigned $(cat oid) &&
+ # explicit -S of course must sign.
+ echo 10 | git commit-tree -S HEAD^{tree} >oid &&
+ test_line_count = 1 oid &&
+ git tag tenth-signed $(cat oid) &&
+
+ # --gpg-sign[=<key-id>] must sign.
+ echo 11 | git commit-tree --gpg-sign HEAD^{tree} >oid &&
+ test_line_count = 1 oid &&
+ git tag eleventh-signed $(cat oid) &&
+ echo 12 | git commit-tree --gpg-sign="${GPGSSH_KEY_UNTRUSTED}" HEAD^{tree} >oid &&
+ test_line_count = 1 oid &&
+ git tag twelfth-signed-alt $(cat oid) &&
+
+ echo 13>file && test_tick && git commit -a -m thirteenth -S"${GPGSSH_KEY_ECDSA}" &&
+ git tag thirteenth-signed-ecdsa
+'
+
+test_expect_success GPGSSH 'sign commits using literal public keys with ssh-agent' '
+ test_when_finished "test_unconfig commit.gpgsign" &&
+ test_config gpg.format ssh &&
+ eval $(ssh-agent) &&
+ test_when_finished "kill ${SSH_AGENT_PID}" &&
+ ssh-add "${GPGSSH_KEY_PRIMARY}" &&
+ echo 1 >file && git add file &&
+ git commit -a -m rsa-inline -S"$(cat "${GPGSSH_KEY_PRIMARY}.pub")" &&
+ echo 2 >file &&
+ test_config user.signingkey "$(cat "${GPGSSH_KEY_PRIMARY}.pub")" &&
+ git commit -a -m rsa-config -S &&
+ ssh-add "${GPGSSH_KEY_ECDSA}" &&
+ echo 3 >file &&
+ git commit -a -m ecdsa-inline -S"key::$(cat "${GPGSSH_KEY_ECDSA}.pub")" &&
+ echo 4 >file &&
+ test_config user.signingkey "key::$(cat "${GPGSSH_KEY_ECDSA}.pub")" &&
+ git commit -a -m ecdsa-config -S
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'create signed commits with keys having defined lifetimes' '
+ test_when_finished "test_unconfig commit.gpgsign" &&
+ test_config gpg.format ssh &&
+
+ echo expired >file && test_tick && git commit -a -m expired -S"${GPGSSH_KEY_EXPIRED}" &&
+ git tag expired-signed &&
+
+ echo notyetvalid >file && test_tick && git commit -a -m notyetvalid -S"${GPGSSH_KEY_NOTYETVALID}" &&
+ git tag notyetvalid-signed &&
+
+ echo timeboxedvalid >file && test_tick && git commit -a -m timeboxedvalid -S"${GPGSSH_KEY_TIMEBOXEDVALID}" &&
+ git tag timeboxedvalid-signed &&
+
+ echo timeboxedinvalid >file && test_tick && git commit -a -m timeboxedinvalid -S"${GPGSSH_KEY_TIMEBOXEDINVALID}" &&
+ git tag timeboxedinvalid-signed
+'
+
+test_expect_success GPGSSH 'verify and show signatures' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_config gpg.mintrustlevel UNDEFINED &&
+ (
+ for commit in initial second merge fourth-signed \
+ fifth-signed sixth-signed seventh-signed tenth-signed \
+ eleventh-signed
+ do
+ git verify-commit $commit &&
+ git show --pretty=short --show-signature $commit >actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $commit OK || exit 1
+ done
+ ) &&
+ (
+ for commit in merge^2 fourth-unsigned sixth-unsigned \
+ seventh-unsigned ninth-unsigned
+ do
+ test_must_fail git verify-commit $commit &&
+ git show --pretty=short --show-signature $commit >actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $commit OK || exit 1
+ done
+ ) &&
+ (
+ for commit in eighth-signed-alt twelfth-signed-alt
+ do
+ git show --pretty=short --show-signature $commit >actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ grep "${GPGSSH_KEY_NOT_TRUSTED}" actual &&
+ echo $commit OK || exit 1
+ done
+ )
+'
+
+test_expect_success GPGSSH 'verify-commit exits failure on untrusted signature' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_must_fail git verify-commit eighth-signed-alt 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ grep "${GPGSSH_KEY_NOT_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-commit exits failure on expired signature key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_must_fail git verify-commit expired-signed 2>actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-commit exits failure on not yet valid signature key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_must_fail git verify-commit notyetvalid-signed 2>actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-commit succeeds with commit date and key validity matching' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git verify-commit timeboxedvalid-signed 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-commit exits failure with commit date outside of key validity' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_must_fail git verify-commit timeboxedinvalid-signed 2>actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH 'verify-commit exits success with matching minTrustLevel' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_config gpg.minTrustLevel fully &&
+ git verify-commit sixth-signed
+'
+
+test_expect_success GPGSSH 'verify-commit exits success with low minTrustLevel' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_config gpg.minTrustLevel marginal &&
+ git verify-commit sixth-signed
+'
+
+test_expect_success GPGSSH 'verify-commit exits failure with high minTrustLevel' '
+ test_config gpg.minTrustLevel ultimate &&
+ test_must_fail git verify-commit eighth-signed-alt
+'
+
+test_expect_success GPGSSH 'verify signatures with --raw' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ (
+ for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed
+ do
+ git verify-commit --raw $commit 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $commit OK || exit 1
+ done
+ ) &&
+ (
+ for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned
+ do
+ test_must_fail git verify-commit --raw $commit 2>actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $commit OK || exit 1
+ done
+ ) &&
+ (
+ for commit in eighth-signed-alt
+ do
+ test_must_fail git verify-commit --raw $commit 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $commit OK || exit 1
+ done
+ )
+'
+
+test_expect_success GPGSSH 'proper header is used for hash algorithm' '
+ git cat-file commit fourth-signed >output &&
+ grep "^$(test_oid header) -----BEGIN SSH SIGNATURE-----" output
+'
+
+test_expect_success GPGSSH 'show signed commit with signature' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git show -s initial >commit &&
+ git show -s --show-signature initial >show &&
+ git verify-commit -v initial >verify.1 2>verify.2 &&
+ git cat-file commit initial >cat &&
+ grep -v -e "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" -e "Warning: " show >show.commit &&
+ grep -e "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" -e "Warning: " show >show.gpg &&
+ grep -v "^ " cat | grep -v "^gpgsig.* " >cat.commit &&
+ test_cmp show.commit commit &&
+ test_cmp show.gpg verify.2 &&
+ test_cmp cat.commit verify.1
+'
+
+test_expect_success GPGSSH 'detect fudged signature' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git cat-file commit seventh-signed >raw &&
+ sed -e "s/^seventh/7th forged/" raw >forged1 &&
+ git hash-object -w -t commit forged1 >forged1.commit &&
+ test_must_fail git verify-commit $(cat forged1.commit) &&
+ git show --pretty=short --show-signature $(cat forged1.commit) >actual1 &&
+ grep "${GPGSSH_BAD_SIGNATURE}" actual1 &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual1 &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual1
+'
+
+test_expect_success GPGSSH 'detect fudged signature with NUL' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git cat-file commit seventh-signed >raw &&
+ cat raw >forged2 &&
+ echo Qwik | tr "Q" "\000" >>forged2 &&
+ git hash-object -w -t commit forged2 >forged2.commit &&
+ test_must_fail git verify-commit $(cat forged2.commit) &&
+ git show --pretty=short --show-signature $(cat forged2.commit) >actual2 &&
+ grep "${GPGSSH_BAD_SIGNATURE}" actual2 &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual2
+'
+
+test_expect_success GPGSSH 'amending already signed commit' '
+ test_config gpg.format ssh &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git checkout -f fourth-signed^0 &&
+ git commit --amend -S --no-edit &&
+ git verify-commit HEAD &&
+ git show -s --show-signature HEAD >actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH 'show good signature with custom format' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
+ cat >expect.tmpl <<-\EOF &&
+ G
+ FINGERPRINT
+ principal with number 1
+ FINGERPRINT
+
+ EOF
+ sed "s|FINGERPRINT|$FINGERPRINT|g" expect.tmpl >expect &&
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show bad signature with custom format' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ cat >expect <<-\EOF &&
+ B
+
+
+
+
+ EOF
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat forged1.commit) >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show untrusted signature with custom format' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ cat >expect.tmpl <<-\EOF &&
+ U
+ FINGERPRINT
+
+ FINGERPRINT
+
+ EOF
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
+ FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_UNTRUSTED}" | awk "{print \$2;}") &&
+ sed "s|FINGERPRINT|$FINGERPRINT|g" expect.tmpl >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show untrusted signature with undefined trust level' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ cat >expect.tmpl <<-\EOF &&
+ undefined
+ FINGERPRINT
+
+ FINGERPRINT
+
+ EOF
+ git log -1 --format="%GT%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
+ FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_UNTRUSTED}" | awk "{print \$2;}") &&
+ sed "s|FINGERPRINT|$FINGERPRINT|g" expect.tmpl >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show untrusted signature with ultimate trust level' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ cat >expect.tmpl <<-\EOF &&
+ fully
+ FINGERPRINT
+ principal with number 1
+ FINGERPRINT
+
+ EOF
+ git log -1 --format="%GT%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
+ FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
+ sed "s|FINGERPRINT|$FINGERPRINT|g" expect.tmpl >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show lack of signature with custom format' '
+ cat >expect <<-\EOF &&
+ N
+
+
+
+
+ EOF
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" seventh-unsigned >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'log.showsignature behaves like --show-signature' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_config log.showsignature true &&
+ git show initial >actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH 'check config gpg.format values' '
+ test_config gpg.format ssh &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+ test_config gpg.format ssh &&
+ git commit -S --amend -m "success" &&
+ test_config gpg.format OpEnPgP &&
+ test_must_fail git commit -S --amend -m "fail"
+'
+
+test_expect_failure GPGSSH 'detect fudged commit with double signature (TODO)' '
+ sed -e "/gpgsig/,/END PGP/d" forged1 >double-base &&
+ sed -n -e "/gpgsig/,/END PGP/p" forged1 | \
+ 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/^/$(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 &&
+ test_must_fail git verify-commit $(cat double-commit.commit) &&
+ git show --pretty=short --show-signature $(cat double-commit.commit) >double-actual &&
+ grep "BAD signature from" double-actual &&
+ grep "Good signature from" double-actual
+'
+
+test_expect_failure GPGSSH 'show double signature with custom format (TODO)' '
+ cat >expect <<-\EOF &&
+ E
+
+
+
+
+ EOF
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat double-commit.commit) >actual &&
+ test_cmp expect actual
+'
+
+
+test_expect_failure GPGSSH 'verify-commit verifies multiply signed commits (TODO)' '
+ git init multiply-signed &&
+ cd multiply-signed &&
+ test_commit first &&
+ echo 1 >second &&
+ git add second &&
+ tree=$(git write-tree) &&
+ parent=$(git rev-parse HEAD^{commit}) &&
+ git commit --gpg-sign -m second &&
+ git cat-file commit HEAD &&
+ # Avoid trailing whitespace.
+ sed -e "s/^Q//" -e "s/^Z/ /" >commit <<-EOF &&
+ Qtree $tree
+ Qparent $parent
+ Qauthor A U Thor <author@example.com> 1112912653 -0700
+ Qcommitter C O Mitter <committer@example.com> 1112912653 -0700
+ Qgpgsig -----BEGIN PGP SIGNATURE-----
+ QZ
+ Q iHQEABECADQWIQRz11h0S+chaY7FTocTtvUezd5DDQUCX/uBDRYcY29tbWl0dGVy
+ Q QGV4YW1wbGUuY29tAAoJEBO29R7N3kMNd+8AoK1I8mhLHviPH+q2I5fIVgPsEtYC
+ Q AKCTqBh+VabJceXcGIZuF0Ry+udbBQ==
+ Q =tQ0N
+ Q -----END PGP SIGNATURE-----
+ Qgpgsig-sha256 -----BEGIN PGP SIGNATURE-----
+ QZ
+ Q iHQEABECADQWIQRz11h0S+chaY7FTocTtvUezd5DDQUCX/uBIBYcY29tbWl0dGVy
+ Q QGV4YW1wbGUuY29tAAoJEBO29R7N3kMN/NEAn0XO9RYSBj2dFyozi0JKSbssYMtO
+ Q AJwKCQ1BQOtuwz//IjU8TiS+6S4iUw==
+ Q =pIwP
+ Q -----END PGP SIGNATURE-----
+ Q
+ Qsecond
+ EOF
+ head=$(git hash-object -t commit -w commit) &&
+ git reset --hard $head &&
+ git verify-commit $head 2>actual &&
+ grep "Good signature from" actual &&
+ ! grep "BAD signature from" actual
+'
+
+test_done
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index c773e30..f0f6fda 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -967,7 +967,7 @@
# 256 near-identical stanzas...
for i in $(test_seq 1 256); do
for j in 1 2 3 4 5; do
- echo $i-$j
+ echo $i-$j || return 1
done
done >file &&
git add file &&
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 1f652f4..bd238d8 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -2,7 +2,7 @@
test_description='git merge
-Testing pull.* configuration parsing.'
+Testing pull.* configuration parsing and other things.'
. ./test-lib.sh
@@ -387,6 +387,26 @@
test_must_fail git pull . c3
'
+test_expect_success 'already-up-to-date pull succeeds with unspecified pull.ff' '
+ git reset --hard c1 &&
+ git pull . c0 &&
+ test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+'
+
+test_expect_success 'already-up-to-date pull succeeds with "only" in pull.ff' '
+ git reset --hard c1 &&
+ test_config pull.ff only &&
+ git pull . c0 &&
+ test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+'
+
+test_expect_success 'already-up-to-date pull/rebase succeeds with "only" in pull.ff' '
+ git reset --hard c1 &&
+ test_config pull.ff only &&
+ git -c pull.rebase=true pull . c0 &&
+ test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+'
+
test_expect_success 'merge c1 with c2 (ours in pull.twohead)' '
git reset --hard c1 &&
git config pull.twohead ours &&
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index a9c816b..ff085b0 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -29,8 +29,8 @@
refs="" &&
while test $i -le 30
do
- refs="$refs c$i"
- i=$(expr $i + 1)
+ refs="$refs c$i" &&
+ i=$(expr $i + 1) || return 1
done &&
git merge $refs &&
test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
diff --git a/t/t7603-merge-reduce-heads.sh b/t/t7603-merge-reduce-heads.sh
index 27cd94a..4887ca7 100755
--- a/t/t7603-merge-reduce-heads.sh
+++ b/t/t7603-merge-reduce-heads.sh
@@ -95,7 +95,7 @@
echo $i > $i.c &&
git add $i.c &&
git commit -m $i &&
- git tag $i
+ git tag $i || return 1
done &&
git reset --hard A &&
for i in F G H I
@@ -103,7 +103,7 @@
echo $i > $i.c &&
git add $i.c &&
git commit -m $i &&
- git tag $i
+ git tag $i || return 1
done
'
diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh
index cd4f960..eca7555 100755
--- a/t/t7604-merge-custom-message.sh
+++ b/t/t7604-merge-custom-message.sh
@@ -4,6 +4,7 @@
Testing merge when using a custom message for the merge commit.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
create_merge_msgs() {
diff --git a/t/t7609-mergetool--lib.sh b/t/t7609-mergetool--lib.sh
new file mode 100755
index 0000000..d848fe6
--- /dev/null
+++ b/t/t7609-mergetool--lib.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+test_description='git mergetool
+
+Testing basic merge tools options'
+
+. ./test-lib.sh
+
+test_expect_success 'mergetool --tool=vimdiff creates the expected layout' '
+ . $GIT_BUILD_DIR/mergetools/vimdiff &&
+ run_unit_tests
+'
+
+test_done
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 98eda3b..ca45c4c 100755
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -3,6 +3,9 @@
test_description='git repack works correctly'
. ./test-lib.sh
+. "${TEST_DIRECTORY}/lib-bitmap.sh"
+. "${TEST_DIRECTORY}/lib-midx.sh"
+. "${TEST_DIRECTORY}/lib-terminal.sh"
commit_and_pack () {
test_commit "$@" 1>&2 &&
@@ -115,7 +118,7 @@
rm alt_objects/pack/$base_name.keep
else
touch alt_objects/pack/$base_name.keep
- fi
+ fi || return 1
done &&
git repack -a -d &&
test_no_missing_in_packs
@@ -234,4 +237,249 @@
test_must_be_empty actual
'
+objdir=.git/objects
+midx=$objdir/pack/multi-pack-index
+
+test_expect_success 'setup for --write-midx tests' '
+ git init midx &&
+ (
+ cd midx &&
+ git config core.multiPackIndex true &&
+
+ test_commit base
+ )
+'
+
+test_expect_success '--write-midx unchanged' '
+ (
+ cd midx &&
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack &&
+ test_path_is_missing $midx &&
+ test_path_is_missing $midx-*.bitmap &&
+
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack --write-midx &&
+
+ test_path_is_file $midx &&
+ test_path_is_missing $midx-*.bitmap &&
+ test_midx_consistent $objdir
+ )
+'
+
+test_expect_success '--write-midx with a new pack' '
+ (
+ cd midx &&
+ test_commit loose &&
+
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack --write-midx &&
+
+ test_path_is_file $midx &&
+ test_path_is_missing $midx-*.bitmap &&
+ test_midx_consistent $objdir
+ )
+'
+
+test_expect_success '--write-midx with -b' '
+ (
+ cd midx &&
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack -mb &&
+
+ test_path_is_file $midx &&
+ test_path_is_file $midx-*.bitmap &&
+ test_midx_consistent $objdir
+ )
+'
+
+test_expect_success '--write-midx with -d' '
+ (
+ cd midx &&
+ test_commit repack &&
+
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack -Ad --write-midx &&
+
+ test_path_is_file $midx &&
+ test_path_is_missing $midx-*.bitmap &&
+ test_midx_consistent $objdir
+ )
+'
+
+test_expect_success 'cleans up MIDX when appropriate' '
+ (
+ cd midx &&
+
+ test_commit repack-2 &&
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adb --write-midx &&
+
+ checksum=$(midx_checksum $objdir) &&
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$checksum.bitmap &&
+
+ test_commit repack-3 &&
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adb --write-midx &&
+
+ test_path_is_file $midx &&
+ test_path_is_missing $midx-$checksum.bitmap &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+ test_commit repack-4 &&
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adb &&
+
+ find $objdir/pack -type f -name "multi-pack-index*" >files &&
+ test_must_be_empty files
+ )
+'
+
+test_expect_success '--write-midx with preferred bitmap tips' '
+ git init midx-preferred-tips &&
+ test_when_finished "rm -fr midx-preferred-tips" &&
+ (
+ cd midx-preferred-tips &&
+
+ test_commit_bulk --message="%s" 103 &&
+
+ git log --format="%H" >commits.raw &&
+ sort <commits.raw >commits &&
+
+ git log --format="create refs/tags/%s/%s %H" HEAD >refs &&
+ git update-ref --stdin <refs &&
+
+ git repack --write-midx --write-bitmap-index &&
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+ test-tool bitmap list-commits | sort >bitmaps &&
+ comm -13 bitmaps commits >before &&
+ test_line_count = 1 before &&
+
+ rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+ rm -fr $midx &&
+
+ # instead of constructing the snapshot ourselves (c.f., the test
+ # "write a bitmap with --refs-snapshot (preferred tips)" in
+ # t5326), mark the missing commit as preferred by adding it to
+ # the pack.preferBitmapTips configuration.
+ git for-each-ref --format="%(refname:rstrip=1)" \
+ --points-at="$(cat before)" >missing &&
+ git config pack.preferBitmapTips "$(cat missing)" &&
+ git repack --write-midx --write-bitmap-index &&
+
+ test-tool bitmap list-commits | sort >bitmaps &&
+ comm -13 bitmaps commits >after &&
+
+ ! test_cmp before after
+ )
+'
+
+# The first argument is expected to be a filename
+# and that file should contain the name of a .idx
+# file. Send the list of objects in that .idx file
+# into stdout.
+get_sorted_objects_from_pack () {
+ git show-index <$(cat "$1") >raw &&
+ cut -d" " -f2 raw
+}
+
+test_expect_success '--write-midx -b packs non-kept objects' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ # Create a kept pack-file
+ test_commit base &&
+ git repack -ad &&
+ find $objdir/pack -name "*.idx" >before &&
+ test_line_count = 1 before &&
+ before_name=$(cat before) &&
+ >${before_name%.idx}.keep &&
+
+ # Create a non-kept pack-file
+ test_commit other &&
+ git repack &&
+
+ # Create loose objects
+ test_commit loose &&
+
+ # Repack everything
+ git repack --write-midx -a -b -d &&
+
+ # There should be two pack-files now, the
+ # old, kept pack and the new, non-kept pack.
+ find $objdir/pack -name "*.idx" | sort >after &&
+ test_line_count = 2 after &&
+ find $objdir/pack -name "*.keep" >kept &&
+ kept_name=$(cat kept) &&
+ echo ${kept_name%.keep}.idx >kept-idx &&
+ test_cmp before kept-idx &&
+
+ # Get object list from the kept pack.
+ get_sorted_objects_from_pack before >old.objects &&
+
+ # Get object list from the one non-kept pack-file
+ comm -13 before after >new-pack &&
+ test_line_count = 1 new-pack &&
+ get_sorted_objects_from_pack new-pack >new.objects &&
+
+ # None of the objects in the new pack should
+ # exist within the kept pack.
+ comm -12 old.objects new.objects >shared.objects &&
+ test_must_be_empty shared.objects
+ )
+'
+
+test_expect_success TTY '--quiet disables progress' '
+ test_terminal env GIT_PROGRESS_DELAY=0 \
+ git -C midx repack -ad --quiet --write-midx 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'setup for update-server-info' '
+ git init update-server-info &&
+ test_commit -C update-server-info message
+'
+
+test_server_info_present () {
+ test_path_is_file update-server-info/.git/objects/info/packs &&
+ test_path_is_file update-server-info/.git/info/refs
+}
+
+test_server_info_missing () {
+ test_path_is_missing update-server-info/.git/objects/info/packs &&
+ test_path_is_missing update-server-info/.git/info/refs
+}
+
+test_server_info_cleanup () {
+ rm -f update-server-info/.git/objects/info/packs update-server-info/.git/info/refs &&
+ test_server_info_missing
+}
+
+test_expect_success 'updates server info by default' '
+ test_server_info_cleanup &&
+ git -C update-server-info repack &&
+ test_server_info_present
+'
+
+test_expect_success '-n skips updating server info' '
+ test_server_info_cleanup &&
+ git -C update-server-info repack -n &&
+ test_server_info_missing
+'
+
+test_expect_success 'repack.updateServerInfo=true updates server info' '
+ test_server_info_cleanup &&
+ git -C update-server-info -c repack.updateServerInfo=true repack &&
+ test_server_info_present
+'
+
+test_expect_success 'repack.updateServerInfo=false skips updating server info' '
+ test_server_info_cleanup &&
+ git -C update-server-info -c repack.updateServerInfo=false repack &&
+ test_server_info_missing
+'
+
+test_expect_success '-n overrides repack.updateServerInfo=true' '
+ test_server_info_cleanup &&
+ git -C update-server-info -c repack.updateServerInfo=true repack -n &&
+ test_server_info_missing
+'
+
test_done
diff --git a/t/t7702-repack-cyclic-alternate.sh b/t/t7702-repack-cyclic-alternate.sh
index 93b7486..f3cdb98 100755
--- a/t/t7702-repack-cyclic-alternate.sh
+++ b/t/t7702-repack-cyclic-alternate.sh
@@ -4,6 +4,8 @@
#
test_description='repack involving cyclic alternate'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t7703-repack-geometric.sh b/t/t7703-repack-geometric.sh
index 5ccaa44..da87f8b 100755
--- a/t/t7703-repack-geometric.sh
+++ b/t/t7703-repack-geometric.sh
@@ -7,6 +7,7 @@
GIT_TEST_MULTI_PACK_INDEX=0
objdir=.git/objects
+packdir=$objdir/pack
midx=$objdir/pack/multi-pack-index
test_expect_success '--geometric with no packs' '
@@ -15,7 +16,7 @@
(
cd geometric &&
- git repack --geometric 2 >out &&
+ git repack --write-midx --geometric 2 >out &&
test_i18ngrep "Nothing new to pack" out
)
'
@@ -180,4 +181,100 @@
)
'
+test_expect_success '--geometric ignores --keep-pack packs' '
+ git init geometric &&
+ test_when_finished "rm -fr geometric" &&
+ (
+ cd geometric &&
+
+ # Create two equal-sized packs
+ test_commit kept && # 3 objects
+ git repack -d &&
+ test_commit pack && # 3 objects
+ git repack -d &&
+
+ find $objdir/pack -type f -name "*.pack" | sort >packs.before &&
+ git repack --geometric 2 -dm \
+ --keep-pack="$(basename "$(head -n 1 packs.before)")" >out &&
+ find $objdir/pack -type f -name "*.pack" | sort >packs.after &&
+
+ # Packs should not have changed (only one non-kept pack, no
+ # loose objects), but $midx should now exist.
+ grep "Nothing new to pack" out &&
+ test_path_is_file $midx &&
+
+ test_cmp packs.before packs.after &&
+
+ git fsck
+ )
+'
+
+test_expect_success '--geometric chooses largest MIDX preferred pack' '
+ git init geometric &&
+ test_when_finished "rm -fr geometric" &&
+ (
+ cd geometric &&
+
+ # These packs already form a geometric progression.
+ test_commit_bulk --start=1 1 && # 3 objects
+ test_commit_bulk --start=2 2 && # 6 objects
+ ls $objdir/pack/pack-*.idx >before &&
+ test_commit_bulk --start=4 4 && # 12 objects
+ ls $objdir/pack/pack-*.idx >after &&
+
+ git repack --geometric 2 -dbm &&
+
+ comm -3 before after | xargs -n 1 basename >expect &&
+ test-tool read-midx --preferred-pack $objdir >actual &&
+
+ test_cmp expect actual
+ )
+'
+
+test_expect_success '--geometric with pack.packSizeLimit' '
+ git init pack-rewrite &&
+ test_when_finished "rm -fr pack-rewrite" &&
+ (
+ cd pack-rewrite &&
+
+ test-tool genrandom foo 1048576 >foo &&
+ test-tool genrandom bar 1048576 >bar &&
+
+ git add foo bar &&
+ test_tick &&
+ git commit -m base &&
+
+ git rev-parse HEAD:foo HEAD:bar >p1.objects &&
+ git rev-parse HEAD HEAD^{tree} >p2.objects &&
+
+ # These two packs each contain two objects, so the following
+ # `--geometric` repack will try to combine them.
+ p1="$(git pack-objects $packdir/pack <p1.objects)" &&
+ p2="$(git pack-objects $packdir/pack <p2.objects)" &&
+
+ # Remove any loose objects in packs, since we do not want extra
+ # copies around (which would mask over potential object
+ # corruption issues).
+ git prune-packed &&
+
+ # Both p1 and p2 will be rolled up, but pack-objects will write
+ # three packs:
+ #
+ # - one containing object "foo",
+ # - another containing object "bar",
+ # - a final pack containing the commit and tree objects
+ # (identical to p2 above)
+ git repack --geometric 2 -d --max-pack-size=1048576 &&
+
+ # Ensure `repack` can detect that the third pack it wrote
+ # (containing just the tree and commit objects) was identical to
+ # one that was below the geometric split, so that we can save it
+ # from deletion.
+ #
+ # If `repack` fails to do that, we will incorrectly delete p2,
+ # causing object corruption.
+ git fsck
+ )
+'
+
test_done
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 6b6423a..6935601 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -31,28 +31,28 @@
EOF
test_expect_success setup '
- {
- echo foo mmap bar
- echo foo_mmap bar
- echo foo_mmap bar mmap
- echo foo mmap bar_mmap
- echo foo_mmap bar mmap baz
- } >file &&
- {
- echo Hello world
- echo HeLLo world
- echo Hello_world
- echo HeLLo_world
- } >hello_world &&
- {
- echo "a+b*c"
- echo "a+bc"
- echo "abc"
- } >ab &&
- {
- echo d &&
- echo 0
- } >d0 &&
+ cat >file <<-\EOF &&
+ foo mmap bar
+ foo_mmap bar
+ foo_mmap bar mmap
+ foo mmap bar_mmap
+ foo_mmap bar mmap baz
+ EOF
+ cat >hello_world <<-\EOF &&
+ Hello world
+ HeLLo world
+ Hello_world
+ HeLLo_world
+ EOF
+ cat >ab <<-\EOF &&
+ a+b*c
+ a+bc
+ abc
+ EOF
+ cat >d0 <<-\EOF &&
+ d
+ 0
+ EOF
echo vvv >v &&
echo ww w >w &&
echo x x xx x >x &&
@@ -63,13 +63,13 @@
echo vvv >t/v &&
mkdir t/a &&
echo vvv >t/a/v &&
- {
- echo "line without leading space1"
- echo " line with leading space1"
- echo " line with leading space2"
- echo " line with leading space3"
- echo "line without leading space2"
- } >space &&
+ qz_to_tab_space >space <<-\EOF &&
+ line without leading space1
+ Zline with leading space1
+ Zline with leading space2
+ Zline with leading space3
+ line without leading space2
+ EOF
cat >hello.ps1 <<-\EOF &&
# No-op.
function dummy() {}
@@ -98,6 +98,37 @@
test_invalid_grep_expression --and -e A
+test_pattern_type () {
+ H=$1 &&
+ HC=$2 &&
+ L=$3 &&
+ type=$4 &&
+ shift 4 &&
+
+ expected_str= &&
+ case "$type" in
+ BRE)
+ expected_str="${HC}ab:a+bc"
+ ;;
+ ERE)
+ expected_str="${HC}ab:abc"
+ ;;
+ FIX)
+ expected_str="${HC}ab:a+b*c"
+ ;;
+ *)
+ BUG "unknown pattern type '$type'"
+ ;;
+ esac &&
+ config_str="$@" &&
+
+ test_expect_success "grep $L with '$config_str' interpreted as $type" '
+ echo $expected_str >expected &&
+ git $config_str grep "a+b*c" $H ab >actual &&
+ test_cmp expected actual
+ '
+}
+
for H in HEAD ''
do
case "$H" in
@@ -106,129 +137,129 @@
esac
test_expect_success "grep -w $L" '
- {
- echo ${HC}file:1:foo mmap bar
- echo ${HC}file:3:foo_mmap bar mmap
- echo ${HC}file:4:foo mmap bar_mmap
- echo ${HC}file:5:foo_mmap bar mmap baz
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}file:1:foo mmap bar
+ ${HC}file:3:foo_mmap bar mmap
+ ${HC}file:4:foo mmap bar_mmap
+ ${HC}file:5:foo_mmap bar mmap baz
+ EOF
git -c grep.linenumber=false grep -n -w -e mmap $H >actual &&
test_cmp expected actual
'
test_expect_success "grep -w $L (with --column)" '
- {
- echo ${HC}file:5:foo mmap bar
- echo ${HC}file:14:foo_mmap bar mmap
- echo ${HC}file:5:foo mmap bar_mmap
- echo ${HC}file:14:foo_mmap bar mmap baz
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}file:5:foo mmap bar
+ ${HC}file:14:foo_mmap bar mmap
+ ${HC}file:5:foo mmap bar_mmap
+ ${HC}file:14:foo_mmap bar mmap baz
+ EOF
git grep --column -w -e mmap $H >actual &&
test_cmp expected actual
'
test_expect_success "grep -w $L (with --column, extended OR)" '
- {
- echo ${HC}file:14:foo_mmap bar mmap
- echo ${HC}file:19:foo_mmap bar mmap baz
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}file:14:foo_mmap bar mmap
+ ${HC}file:19:foo_mmap bar mmap baz
+ EOF
git grep --column -w -e mmap$ --or -e baz $H >actual &&
test_cmp expected actual
'
test_expect_success "grep -w $L (with --column, --invert-match)" '
- {
- echo ${HC}file:1:foo mmap bar
- echo ${HC}file:1:foo_mmap bar
- echo ${HC}file:1:foo_mmap bar mmap
- echo ${HC}file:1:foo mmap bar_mmap
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}file:1:foo mmap bar
+ ${HC}file:1:foo_mmap bar
+ ${HC}file:1:foo_mmap bar mmap
+ ${HC}file:1:foo mmap bar_mmap
+ EOF
git grep --column --invert-match -w -e baz $H -- file >actual &&
test_cmp expected actual
'
test_expect_success "grep $L (with --column, --invert-match, extended OR)" '
- {
- echo ${HC}hello_world:6:HeLLo_world
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}hello_world:6:HeLLo_world
+ EOF
git grep --column --invert-match -e ll --or --not -e _ $H -- hello_world \
>actual &&
test_cmp expected actual
'
test_expect_success "grep $L (with --column, --invert-match, extended AND)" '
- {
- echo ${HC}hello_world:3:Hello world
- echo ${HC}hello_world:3:Hello_world
- echo ${HC}hello_world:6:HeLLo_world
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}hello_world:3:Hello world
+ ${HC}hello_world:3:Hello_world
+ ${HC}hello_world:6:HeLLo_world
+ EOF
git grep --column --invert-match --not -e _ --and --not -e ll $H -- hello_world \
>actual &&
test_cmp expected actual
'
test_expect_success "grep $L (with --column, double-negation)" '
- {
- echo ${HC}file:1:foo_mmap bar mmap baz
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}file:1:foo_mmap bar mmap baz
+ EOF
git grep --column --not \( --not -e foo --or --not -e baz \) $H -- file \
>actual &&
test_cmp expected actual
'
test_expect_success "grep -w $L (with --column, -C)" '
- {
- echo ${HC}file:5:foo mmap bar
- echo ${HC}file-foo_mmap bar
- echo ${HC}file:14:foo_mmap bar mmap
- echo ${HC}file:5:foo mmap bar_mmap
- echo ${HC}file:14:foo_mmap bar mmap baz
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}file:5:foo mmap bar
+ ${HC}file-foo_mmap bar
+ ${HC}file:14:foo_mmap bar mmap
+ ${HC}file:5:foo mmap bar_mmap
+ ${HC}file:14:foo_mmap bar mmap baz
+ EOF
git grep --column -w -C1 -e mmap $H >actual &&
test_cmp expected actual
'
test_expect_success "grep -w $L (with --line-number, --column)" '
- {
- echo ${HC}file:1:5:foo mmap bar
- echo ${HC}file:3:14:foo_mmap bar mmap
- echo ${HC}file:4:5:foo mmap bar_mmap
- echo ${HC}file:5:14:foo_mmap bar mmap baz
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}file:1:5:foo mmap bar
+ ${HC}file:3:14:foo_mmap bar mmap
+ ${HC}file:4:5:foo mmap bar_mmap
+ ${HC}file:5:14:foo_mmap bar mmap baz
+ EOF
git grep -n --column -w -e mmap $H >actual &&
test_cmp expected actual
'
test_expect_success "grep -w $L (with non-extended patterns, --column)" '
- {
- echo ${HC}file:5:foo mmap bar
- echo ${HC}file:10:foo_mmap bar
- echo ${HC}file:10:foo_mmap bar mmap
- echo ${HC}file:5:foo mmap bar_mmap
- echo ${HC}file:10:foo_mmap bar mmap baz
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}file:5:foo mmap bar
+ ${HC}file:10:foo_mmap bar
+ ${HC}file:10:foo_mmap bar mmap
+ ${HC}file:5:foo mmap bar_mmap
+ ${HC}file:10:foo_mmap bar mmap baz
+ EOF
git grep --column -w -e bar -e mmap $H >actual &&
test_cmp expected actual
'
test_expect_success "grep -w $L" '
- {
- echo ${HC}file:1:foo mmap bar
- echo ${HC}file:3:foo_mmap bar mmap
- echo ${HC}file:4:foo mmap bar_mmap
- echo ${HC}file:5:foo_mmap bar mmap baz
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}file:1:foo mmap bar
+ ${HC}file:3:foo_mmap bar mmap
+ ${HC}file:4:foo mmap bar_mmap
+ ${HC}file:5:foo_mmap bar mmap baz
+ EOF
git -c grep.linenumber=true grep -w -e mmap $H >actual &&
test_cmp expected actual
'
test_expect_success "grep -w $L" '
- {
- echo ${HC}file:foo mmap bar
- echo ${HC}file:foo_mmap bar mmap
- echo ${HC}file:foo mmap bar_mmap
- echo ${HC}file:foo_mmap bar mmap baz
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}file:foo mmap bar
+ ${HC}file:foo_mmap bar mmap
+ ${HC}file:foo mmap bar_mmap
+ ${HC}file:foo_mmap bar mmap baz
+ EOF
git -c grep.linenumber=true grep --no-line-number -w -e mmap $H >actual &&
test_cmp expected actual
'
@@ -239,17 +270,17 @@
'
test_expect_success "grep -w $L (x)" '
- {
- echo ${HC}x:1:x x xx x
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}x:1:x x xx x
+ EOF
git grep -n -w -e "x xx* x" $H >actual &&
test_cmp expected actual
'
test_expect_success "grep -w $L (y-1)" '
- {
- echo ${HC}y:1:y yy
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}y:1:y yy
+ EOF
git grep -n -w -e "^y" $H >actual &&
test_cmp expected actual
'
@@ -277,16 +308,16 @@
'
test_expect_success "grep $L (with --column, --only-matching)" '
- {
- echo ${HC}file:1:5:mmap
- echo ${HC}file:2:5:mmap
- echo ${HC}file:3:5:mmap
- echo ${HC}file:3:13:mmap
- echo ${HC}file:4:5:mmap
- echo ${HC}file:4:13:mmap
- echo ${HC}file:5:5:mmap
- echo ${HC}file:5:13:mmap
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}file:1:5:mmap
+ ${HC}file:2:5:mmap
+ ${HC}file:3:5:mmap
+ ${HC}file:3:13:mmap
+ ${HC}file:4:5:mmap
+ ${HC}file:4:13:mmap
+ ${HC}file:5:5:mmap
+ ${HC}file:5:13:mmap
+ EOF
git grep --column -n -o -e mmap $H >actual &&
test_cmp expected actual
'
@@ -320,11 +351,11 @@
'
test_expect_success "grep --max-depth -1 $L" '
- {
- echo ${HC}t/a/v:1:vvv
- echo ${HC}t/v:1:vvv
- echo ${HC}v:1:vvv
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}t/a/v:1:vvv
+ ${HC}t/v:1:vvv
+ ${HC}v:1:vvv
+ EOF
git grep --max-depth -1 -n -e vvv $H >actual &&
test_cmp expected actual &&
git grep --recursive -n -e vvv $H >actual &&
@@ -332,9 +363,9 @@
'
test_expect_success "grep --max-depth 0 $L" '
- {
- echo ${HC}v:1:vvv
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}v:1:vvv
+ EOF
git grep --max-depth 0 -n -e vvv $H >actual &&
test_cmp expected actual &&
git grep --no-recursive -n -e vvv $H >actual &&
@@ -342,11 +373,11 @@
'
test_expect_success "grep --max-depth 0 -- '*' $L" '
- {
- echo ${HC}t/a/v:1:vvv
- echo ${HC}t/v:1:vvv
- echo ${HC}v:1:vvv
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}t/a/v:1:vvv
+ ${HC}t/v:1:vvv
+ ${HC}v:1:vvv
+ EOF
git grep --max-depth 0 -n -e vvv $H -- "*" >actual &&
test_cmp expected actual &&
git grep --no-recursive -n -e vvv $H -- "*" >actual &&
@@ -354,18 +385,18 @@
'
test_expect_success "grep --max-depth 1 $L" '
- {
- echo ${HC}t/v:1:vvv
- echo ${HC}v:1:vvv
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}t/v:1:vvv
+ ${HC}v:1:vvv
+ EOF
git grep --max-depth 1 -n -e vvv $H >actual &&
test_cmp expected actual
'
test_expect_success "grep --max-depth 0 -- t $L" '
- {
- echo ${HC}t/v:1:vvv
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}t/v:1:vvv
+ EOF
git grep --max-depth 0 -n -e vvv $H -- t >actual &&
test_cmp expected actual &&
git grep --no-recursive -n -e vvv $H -- t >actual &&
@@ -373,10 +404,10 @@
'
test_expect_success "grep --max-depth 0 -- . t $L" '
- {
- echo ${HC}t/v:1:vvv
- echo ${HC}v:1:vvv
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}t/v:1:vvv
+ ${HC}v:1:vvv
+ EOF
git grep --max-depth 0 -n -e vvv $H -- . t >actual &&
test_cmp expected actual &&
git grep --no-recursive -n -e vvv $H -- . t >actual &&
@@ -384,44 +415,22 @@
'
test_expect_success "grep --max-depth 0 -- t . $L" '
- {
- echo ${HC}t/v:1:vvv
- echo ${HC}v:1:vvv
- } >expected &&
+ cat >expected <<-EOF &&
+ ${HC}t/v:1:vvv
+ ${HC}v:1:vvv
+ EOF
git grep --max-depth 0 -n -e vvv $H -- t . >actual &&
test_cmp expected actual &&
git grep --no-recursive -n -e vvv $H -- t . >actual &&
test_cmp expected actual
'
- test_expect_success "grep $L with grep.extendedRegexp=false" '
- echo "${HC}ab:a+bc" >expected &&
- git -c grep.extendedRegexp=false grep "a+b*c" $H ab >actual &&
- test_cmp expected actual
- '
- test_expect_success "grep $L with grep.extendedRegexp=true" '
- echo "${HC}ab:abc" >expected &&
- git -c grep.extendedRegexp=true grep "a+b*c" $H ab >actual &&
- test_cmp expected actual
- '
- test_expect_success "grep $L with grep.patterntype=basic" '
- echo "${HC}ab:a+bc" >expected &&
- git -c grep.patterntype=basic grep "a+b*c" $H ab >actual &&
- test_cmp expected actual
- '
-
- test_expect_success "grep $L with grep.patterntype=extended" '
- echo "${HC}ab:abc" >expected &&
- git -c grep.patterntype=extended grep "a+b*c" $H ab >actual &&
- test_cmp expected actual
- '
-
- test_expect_success "grep $L with grep.patterntype=fixed" '
- echo "${HC}ab:a+b*c" >expected &&
- git -c grep.patterntype=fixed grep "a+b*c" $H ab >actual &&
- test_cmp expected actual
- '
+ test_pattern_type "$H" "$HC" "$L" BRE -c grep.extendedRegexp=false
+ test_pattern_type "$H" "$HC" "$L" ERE -c grep.extendedRegexp=true
+ test_pattern_type "$H" "$HC" "$L" BRE -c grep.patternType=basic
+ test_pattern_type "$H" "$HC" "$L" ERE -c grep.patternType=extended
+ test_pattern_type "$H" "$HC" "$L" FIX -c grep.patternType=fixed
test_expect_success PCRE "grep $L with grep.patterntype=perl" '
echo "${HC}ab:a+b*c" >expected &&
@@ -433,59 +442,76 @@
test_must_fail git -c grep.patterntype=perl grep "foo.*bar"
'
- test_expect_success "grep $L with grep.patternType=default and grep.extendedRegexp=true" '
- echo "${HC}ab:abc" >expected &&
- git \
- -c grep.patternType=default \
- -c grep.extendedRegexp=true \
- grep "a+b*c" $H ab >actual &&
- test_cmp expected actual
- '
+ test_pattern_type "$H" "$HC" "$L" ERE \
+ -c grep.patternType=default \
+ -c grep.extendedRegexp=true
+ test_pattern_type "$H" "$HC" "$L" ERE \
+ -c grep.extendedRegexp=true \
+ -c grep.patternType=default
+ test_pattern_type "$H" "$HC" "$L" ERE \
+ -c grep.patternType=extended \
+ -c grep.extendedRegexp=false
+ test_pattern_type "$H" "$HC" "$L" BRE \
+ -c grep.patternType=basic \
+ -c grep.extendedRegexp=true
+ test_pattern_type "$H" "$HC" "$L" ERE \
+ -c grep.extendedRegexp=false \
+ -c grep.patternType=extended
+ test_pattern_type "$H" "$HC" "$L" BRE \
+ -c grep.extendedRegexp=true \
+ -c grep.patternType=basic
- test_expect_success "grep $L with grep.extendedRegexp=true and grep.patternType=default" '
- echo "${HC}ab:abc" >expected &&
- git \
- -c grep.extendedRegexp=true \
- -c grep.patternType=default \
- grep "a+b*c" $H ab >actual &&
- test_cmp expected actual
- '
+ # grep.extendedRegexp is last-one-wins
+ test_pattern_type "$H" "$HC" "$L" BRE \
+ -c grep.extendedRegexp=true \
+ -c grep.extendedRegexp=false
- test_expect_success "grep $L with grep.patternType=extended and grep.extendedRegexp=false" '
- echo "${HC}ab:abc" >expected &&
- git \
- -c grep.patternType=extended \
- -c grep.extendedRegexp=false \
- grep "a+b*c" $H ab >actual &&
- test_cmp expected actual
- '
+ # grep.patternType=basic pays no attention to grep.extendedRegexp
+ test_pattern_type "$H" "$HC" "$L" BRE \
+ -c grep.extendedRegexp=true \
+ -c grep.patternType=basic \
+ -c grep.extendedRegexp=false
- test_expect_success "grep $L with grep.patternType=basic and grep.extendedRegexp=true" '
- echo "${HC}ab:a+bc" >expected &&
- git \
- -c grep.patternType=basic \
- -c grep.extendedRegexp=true \
- grep "a+b*c" $H ab >actual &&
- test_cmp expected actual
- '
+ # grep.patternType=extended pays no attention to grep.extendedRegexp
+ test_pattern_type "$H" "$HC" "$L" ERE \
+ -c grep.extendedRegexp=true \
+ -c grep.patternType=extended \
+ -c grep.extendedRegexp=false
- test_expect_success "grep $L with grep.extendedRegexp=false and grep.patternType=extended" '
- echo "${HC}ab:abc" >expected &&
- git \
- -c grep.extendedRegexp=false \
- -c grep.patternType=extended \
- grep "a+b*c" $H ab >actual &&
- test_cmp expected actual
- '
+ # grep.extendedRegexp is used with a last-one-wins grep.patternType=default
+ test_pattern_type "$H" "$HC" "$L" ERE \
+ -c grep.patternType=fixed \
+ -c grep.extendedRegexp=true \
+ -c grep.patternType=default
- test_expect_success "grep $L with grep.extendedRegexp=true and grep.patternType=basic" '
- echo "${HC}ab:a+bc" >expected &&
- git \
- -c grep.extendedRegexp=true \
- -c grep.patternType=basic \
- grep "a+b*c" $H ab >actual &&
- test_cmp expected actual
- '
+ # grep.extendedRegexp is used with earlier grep.patternType=default
+ test_pattern_type "$H" "$HC" "$L" ERE \
+ -c grep.extendedRegexp=false \
+ -c grep.patternType=default \
+ -c grep.extendedRegexp=true
+
+ # grep.extendedRegexp is used with a last-one-loses grep.patternType=default
+ test_pattern_type "$H" "$HC" "$L" ERE \
+ -c grep.extendedRegexp=false \
+ -c grep.extendedRegexp=true \
+ -c grep.patternType=default
+
+ # grep.extendedRegexp and grep.patternType are both last-one-wins independently
+ test_pattern_type "$H" "$HC" "$L" BRE \
+ -c grep.patternType=default \
+ -c grep.extendedRegexp=true \
+ -c grep.patternType=basic
+
+ # grep.patternType=extended and grep.patternType=default
+ test_pattern_type "$H" "$HC" "$L" BRE \
+ -c grep.patternType=extended \
+ -c grep.patternType=default
+
+ # grep.patternType=[extended -> default -> fixed] (BRE)" '
+ test_pattern_type "$H" "$HC" "$L" FIX \
+ -c grep.patternType=extended \
+ -c grep.patternType=default \
+ -c grep.patternType=fixed
test_expect_success "grep --count $L" '
echo ${HC}ab:3 >expected &&
@@ -1314,10 +1340,10 @@
'
test_expect_success PCRE 'grep -P -v pattern' '
- {
- echo "ab:a+b*c"
- echo "ab:a+bc"
- } >expected &&
+ cat >expected <<-\EOF &&
+ ab:a+b*c
+ ab:a+bc
+ EOF
git grep -P -v "abc" ab >actual &&
test_cmp expected actual
'
@@ -1331,10 +1357,10 @@
'
test_expect_success PCRE 'grep -P -w pattern' '
- {
- echo "hello_world:Hello world"
- echo "hello_world:HeLLo world"
- } >expected &&
+ cat >expected <<-\EOF &&
+ hello_world:Hello world
+ hello_world:HeLLo world
+ EOF
git grep -P -w "He((?i)ll)o" hello_world >actual &&
test_cmp expected actual
'
@@ -1469,10 +1495,10 @@
'
test_expect_success 'grep -G pattern with grep.patternType=fixed' '
- {
- echo "ab:a+b*c"
- echo "ab:a+bc"
- } >expected &&
+ cat >expected <<-\EOF &&
+ ab:a+b*c
+ ab:a+bc
+ EOF
git \
-c grep.patterntype=fixed \
grep -G "a+b" ab >actual &&
@@ -1480,11 +1506,11 @@
'
test_expect_success 'grep -E pattern with grep.patternType=fixed' '
- {
- echo "ab:a+b*c"
- echo "ab:a+bc"
- echo "ab:abc"
- } >expected &&
+ cat >expected <<-\EOF &&
+ ab:a+b*c
+ ab:a+bc
+ ab:abc
+ EOF
git \
-c grep.patterntype=fixed \
grep -E "a+" ab >actual &&
diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index a98785d..1dd0714 100755
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -3,6 +3,7 @@
test_description='git grep --open-files-in-pager
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-pager.sh
unset PAGER GIT_PAGER
@@ -114,8 +115,8 @@
unrelated
EOF
+ test_when_finished "git reset --hard" &&
echo "enum grep_pat_token" >unrelated &&
- test_when_finished "git checkout HEAD unrelated" &&
GIT_PAGER=./less git grep -F -O "enum grep_pat_token" >out &&
test_cmp expect actual &&
test_must_be_empty out
diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh
index e5d1e4e..ac7be54 100755
--- a/t/t7812-grep-icase-non-ascii.sh
+++ b/t/t7812-grep-icase-non-ascii.sh
@@ -4,6 +4,10 @@
. ./lib-gettext.sh
+doalarm () {
+ perl -e 'alarm shift; exec @ARGV' -- "$@"
+}
+
test_expect_success GETTEXT_LOCALE 'setup' '
test_write_lines "TILRAUN: Halló Heimur!" >file &&
git add file &&
@@ -11,9 +15,19 @@
export LC_ALL
'
-test_have_prereq GETTEXT_LOCALE &&
-test-tool regex "HALLÓ" "Halló" ICASE &&
-test_set_prereq REGEX_LOCALE
+test_expect_success GETTEXT_LOCALE 'setup REGEX_LOCALE prerequisite' '
+ # This "test-tool" invocation is identical...
+ if test-tool regex "HALLÓ" "Halló" ICASE
+ then
+ test_set_prereq REGEX_LOCALE
+ else
+
+ # ... to this one, but this way "test_must_fail" will
+ # tell a segfault or abort() from the regexec() test
+ # itself
+ test_must_fail test-tool regex "HALLÓ" "Halló" ICASE
+ fi
+'
test_expect_success REGEX_LOCALE 'grep literal string, no -F' '
git grep -i "TILRAUN: Halló Heimur!" &&
@@ -123,4 +137,16 @@
test_cmp invalid-0xe5 actual
'
+test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-literal ASCII from UTF-8' '
+ git grep --perl-regexp -h -o -e ll. file >actual &&
+ echo "lló" >expected &&
+ test_cmp expected actual
+'
+
+test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep avoid endless loop bug' '
+ echo " Halló" >leading-whitespace &&
+ git add leading-whitespace &&
+ doalarm 1 git grep --perl-regexp "^\s" leading-whitespace
+'
+
test_done
diff --git a/t/t7813-grep-icase-iso.sh b/t/t7813-grep-icase-iso.sh
index 701e08a..1227885 100755
--- a/t/t7813-grep-icase-iso.sh
+++ b/t/t7813-grep-icase-iso.sh
@@ -2,6 +2,7 @@
test_description='grep icase on non-English locales'
+TEST_PASSES_SANITIZE_LEAK=true
. ./lib-gettext.sh
test_expect_success GETTEXT_ISO_LOCALE 'setup' '
diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh
index 3172f5b..a4476dc 100755
--- a/t/t7814-grep-recurse-submodules.sh
+++ b/t/t7814-grep-recurse-submodules.sh
@@ -441,4 +441,148 @@
test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
test_must_be_empty actual
'
+
+test_expect_failure 'grep --textconv: superproject .gitattributes does not affect submodules' '
+ reset_and_clean &&
+ test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+ echo "a diff=d2x" >.gitattributes &&
+
+ cat >expect <<-\EOF &&
+ a:(1|2)x(3|4)
+ EOF
+ git grep --textconv --recurse-submodules x >actual &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'grep --textconv: superproject .gitattributes (from index) does not affect submodules' '
+ reset_and_clean &&
+ test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+ echo "a diff=d2x" >.gitattributes &&
+ git add .gitattributes &&
+ rm .gitattributes &&
+
+ cat >expect <<-\EOF &&
+ a:(1|2)x(3|4)
+ EOF
+ git grep --textconv --recurse-submodules x >actual &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'grep --textconv: superproject .git/info/attributes does not affect submodules' '
+ reset_and_clean &&
+ test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+ super_attr="$(git rev-parse --git-path info/attributes)" &&
+ test_when_finished "rm -f \"$super_attr\"" &&
+ echo "a diff=d2x" >"$super_attr" &&
+
+ cat >expect <<-\EOF &&
+ a:(1|2)x(3|4)
+ EOF
+ git grep --textconv --recurse-submodules x >actual &&
+ test_cmp expect actual
+'
+
+# Note: what currently prevents this test from passing is not that the
+# .gitattributes file from "./submodule" is being ignored, but that it is being
+# propagated to the nested "./submodule/sub" files.
+#
+test_expect_failure 'grep --textconv correctly reads submodule .gitattributes' '
+ reset_and_clean &&
+ test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+ echo "a diff=d2x" >submodule/.gitattributes &&
+
+ cat >expect <<-\EOF &&
+ submodule/a:(1|2)x(3|4)
+ EOF
+ git grep --textconv --recurse-submodules x >actual &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'grep --textconv correctly reads submodule .gitattributes (from index)' '
+ reset_and_clean &&
+ test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+ echo "a diff=d2x" >submodule/.gitattributes &&
+ git -C submodule add .gitattributes &&
+ rm submodule/.gitattributes &&
+
+ cat >expect <<-\EOF &&
+ submodule/a:(1|2)x(3|4)
+ EOF
+ git grep --textconv --recurse-submodules x >actual &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'grep --textconv correctly reads submodule .git/info/attributes' '
+ reset_and_clean &&
+ test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+
+ submodule_attr="$(git -C submodule rev-parse --path-format=absolute --git-path info/attributes)" &&
+ test_when_finished "rm -f \"$submodule_attr\"" &&
+ echo "a diff=d2x" >"$submodule_attr" &&
+
+ cat >expect <<-\EOF &&
+ submodule/a:(1|2)x(3|4)
+ EOF
+ git grep --textconv --recurse-submodules x >actual &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'grep saves textconv cache in the appropriate repository' '
+ reset_and_clean &&
+ test_config_global diff.d2x_cached.textconv "sed -e \"s/d/x/\"" &&
+ test_config_global diff.d2x_cached.cachetextconv true &&
+ echo "a diff=d2x_cached" >submodule/.gitattributes &&
+
+ # We only read/write to the textconv cache when grepping from an OID,
+ # as the working tree file might have modifications.
+ git grep --textconv --cached --recurse-submodules x &&
+
+ super_textconv_cache="$(git rev-parse --git-path refs/notes/textconv/d2x_cached)" &&
+ sub_textconv_cache="$(git -C submodule rev-parse \
+ --path-format=absolute --git-path refs/notes/textconv/d2x_cached)" &&
+ test_path_is_missing "$super_textconv_cache" &&
+ test_path_is_file "$sub_textconv_cache"
+'
+
+test_expect_success 'grep partially-cloned submodule' '
+ # Set up clean superproject and submodule for partial cloning.
+ git init super &&
+ git init super/sub &&
+ (
+ cd super &&
+ test_commit --no-tag "Add file in superproject" \
+ super-file "Some content for super-file" &&
+ test_commit -C sub --no-tag "Add file in submodule" \
+ sub-file "Some content for sub-file" &&
+ git submodule add ./sub &&
+ git commit -m "Add other as submodule sub" &&
+ test_tick &&
+ test_commit -C sub --no-tag --append "Update file in submodule" \
+ sub-file "Some more content for sub-file" &&
+ git add sub &&
+ git commit -m "Update submodule" &&
+ test_tick &&
+ git config --local uploadpack.allowfilter 1 &&
+ git config --local uploadpack.allowanysha1inwant 1 &&
+ git -C sub config --local uploadpack.allowfilter 1 &&
+ git -C sub config --local uploadpack.allowanysha1inwant 1
+ ) &&
+ # Clone the superproject & submodule, then make sure we can lazy-fetch submodule objects.
+ git clone --filter=blob:none --also-filter-submodules \
+ --recurse-submodules "file://$(pwd)/super" partial &&
+ (
+ cd partial &&
+ cat >expect <<-\EOF &&
+ HEAD^:sub/sub-file:Some content for sub-file
+ HEAD^:super-file:Some content for super-file
+ EOF
+
+ GIT_TRACE2_EVENT="$(pwd)/trace2.log" git grep -e content \
+ --recurse-submodules HEAD^ >actual &&
+ test_cmp expect actual &&
+ # Verify that we actually fetched data from the promisor remote:
+ grep \"category\":\"promisor\",\"key\":\"fetch_count\",\"value\":\"1\" trace2.log
+ )
+'
+
test_done
diff --git a/t/t7815-grep-binary.sh b/t/t7815-grep-binary.sh
index 90ebb64..ac87128 100755
--- a/t/t7815-grep-binary.sh
+++ b/t/t7815-grep-binary.sh
@@ -2,6 +2,7 @@
test_description='git grep in binary files'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' "
diff --git a/t/t7816-grep-binary-pattern.sh b/t/t7816-grep-binary-pattern.sh
index 9d67a5f..fdb2355 100755
--- a/t/t7816-grep-binary-pattern.sh
+++ b/t/t7816-grep-binary-pattern.sh
@@ -2,6 +2,7 @@
test_description='git grep with a binary pattern files'
+TEST_PASSES_SANITIZE_LEAK=true
. ./lib-gettext.sh
nul_match_internal () {
diff --git a/t/t7817-grep-sparse-checkout.sh b/t/t7817-grep-sparse-checkout.sh
index 590b99b..eb59564 100755
--- a/t/t7817-grep-sparse-checkout.sh
+++ b/t/t7817-grep-sparse-checkout.sh
@@ -83,10 +83,13 @@
# The test below covers a special case: the sparsity patterns exclude '/b' and
# sparse checkout is enabled, but the path exists in the working tree (e.g.
-# manually created after `git sparse-checkout init`). git grep should skip it.
+# manually created after `git sparse-checkout init`). Although b is marked
+# as SKIP_WORKTREE, git grep should notice it IS present in the worktree and
+# report it.
test_expect_success 'working tree grep honors sparse checkout' '
cat >expect <<-EOF &&
a:text
+ b:new-text
EOF
test_when_finished "rm -f b" &&
echo "new-text" >b &&
@@ -126,12 +129,16 @@
'
# Note that sub2/ is present in the worktree but it is excluded by the sparsity
-# patterns, so grep should not recurse into it.
+# patterns. We also explicitly mark it as SKIP_WORKTREE in case it got cleared
+# by previous git commands. Thus sub2 starts as SKIP_WORKTREE but since it is
+# present in the working tree, grep should recurse into it.
test_expect_success 'grep --recurse-submodules honors sparse checkout in submodule' '
cat >expect <<-EOF &&
a:text
sub/B/b:text
+ sub2/a:text
EOF
+ git update-index --skip-worktree sub2 &&
git grep --recurse-submodules "text" >actual &&
test_cmp expect actual
'
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
index 9b9f11a..74aa638 100755
--- a/t/t7900-maintenance.sh
+++ b/t/t7900-maintenance.sh
@@ -336,15 +336,15 @@
--no-progress --batch-size=2147483647 <run-2g.txt
'
-test_expect_success 'maintenance.incremental-repack.auto' '
+run_incremental_repack_and_verify () {
+ test_commit A &&
git repack -adk &&
- git config core.multiPackIndex true &&
git multi-pack-index write &&
GIT_TRACE2_EVENT="$(pwd)/midx-init.txt" git \
-c maintenance.incremental-repack.auto=1 \
maintenance run --auto --task=incremental-repack 2>/dev/null &&
test_subcommand ! git multi-pack-index write --no-progress <midx-init.txt &&
- test_commit A &&
+ test_commit B &&
git pack-objects --revs .git/objects/pack/pack <<-\EOF &&
HEAD
^HEAD~1
@@ -353,7 +353,7 @@
-c maintenance.incremental-repack.auto=2 \
maintenance run --auto --task=incremental-repack 2>/dev/null &&
test_subcommand ! git multi-pack-index write --no-progress <trace-A &&
- test_commit B &&
+ test_commit C &&
git pack-objects --revs .git/objects/pack/pack <<-\EOF &&
HEAD
^HEAD~1
@@ -362,6 +362,26 @@
-c maintenance.incremental-repack.auto=2 \
maintenance run --auto --task=incremental-repack 2>/dev/null &&
test_subcommand git multi-pack-index write --no-progress <trace-B
+}
+
+test_expect_success 'maintenance.incremental-repack.auto' '
+ rm -rf incremental-repack-true &&
+ git init incremental-repack-true &&
+ (
+ cd incremental-repack-true &&
+ git config core.multiPackIndex true &&
+ run_incremental_repack_and_verify
+ )
+'
+
+test_expect_success 'maintenance.incremental-repack.auto (when config is unset)' '
+ rm -rf incremental-repack-unset &&
+ git init incremental-repack-unset &&
+ (
+ cd incremental-repack-unset &&
+ test_unconfig core.multiPackIndex &&
+ run_incremental_repack_and_verify
+ )
'
test_expect_success 'pack-refs task' '
diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh
index 5bb302b..ee4fdd8 100755
--- a/t/t8002-blame.sh
+++ b/t/t8002-blame.sh
@@ -97,7 +97,7 @@
test_commit abbrev &&
sha1=$(git rev-parse --verify HEAD) &&
check_abbrev () {
- expect=$1; shift
+ expect=$1 && shift &&
echo $sha1 | cut -c 1-$expect >expect &&
git blame "$@" abbrev.t >actual &&
perl -lne "/[0-9a-f]+/ and print \$&" <actual >actual.sha &&
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index da80f81..d751d48 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -13,14 +13,8 @@
echo B B B B B >two &&
echo C C C C C >tres &&
echo ABC >mouse &&
- for i in 1 2 3 4 5 6 7 8 9
- do
- echo $i
- done >nine_lines &&
- for i in 1 2 3 4 5 6 7 8 9 a
- do
- echo $i
- done >ten_lines &&
+ test_write_lines 1 2 3 4 5 6 7 8 9 >nine_lines &&
+ test_write_lines 1 2 3 4 5 6 7 8 9 a >ten_lines &&
git add one two tres mouse nine_lines ten_lines &&
test_tick &&
GIT_AUTHOR_NAME=Initial git commit -m Initial &&
diff --git a/t/t8007-cat-file-textconv.sh b/t/t8007-cat-file-textconv.sh
index eacd49a..b067983 100755
--- a/t/t8007-cat-file-textconv.sh
+++ b/t/t8007-cat-file-textconv.sh
@@ -19,6 +19,48 @@
GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
'
+test_expect_success 'usage: <bad rev>' '
+ cat >expect <<-\EOF &&
+ fatal: Not a valid object name HEAD2
+ EOF
+ test_must_fail git cat-file --textconv HEAD2 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'usage: <bad rev>:<bad path>' '
+ cat >expect <<-\EOF &&
+ fatal: invalid object name '\''HEAD2'\''.
+ EOF
+ test_must_fail git cat-file --textconv HEAD2:two.bin 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'usage: <rev>:<bad path>' '
+ cat >expect <<-\EOF &&
+ fatal: path '\''two.bin'\'' does not exist in '\''HEAD'\''
+ EOF
+ test_must_fail git cat-file --textconv HEAD:two.bin 2>actual &&
+ test_cmp expect actual
+'
+
+
+test_expect_success 'usage: <rev> with no <path>' '
+ cat >expect <<-\EOF &&
+ fatal: <object>:<path> required, only <object> '\''HEAD'\'' given
+ EOF
+ test_must_fail git cat-file --textconv HEAD 2>actual &&
+ test_cmp expect actual
+'
+
+
+test_expect_success 'usage: <bad rev>:<good (in HEAD) path>' '
+ cat >expect <<-\EOF &&
+ fatal: invalid object name '\''HEAD2'\''.
+ EOF
+ test_must_fail git cat-file --textconv HEAD2:one.bin 2>actual &&
+ test_cmp expect actual
+'
+
cat >expected <<EOF
bin: test version 2
EOF
diff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
index e68e611..0bd0341 100755
--- a/t/t8014-blame-ignore-fuzzy.sh
+++ b/t/t8014-blame-ignore-fuzzy.sh
@@ -310,7 +310,7 @@
echo "$line" >>"$i" &&
git add "$i" &&
test_tick &&
- GIT_AUTHOR_NAME="$line_count" git commit -m "$line_count"
+ GIT_AUTHOR_NAME="$line_count" git commit -m "$line_count" || return 1
done <"a$i"
done &&
@@ -318,7 +318,7 @@
do
# Overwrite the files with the final content.
cp b$i $i &&
- git add $i
+ git add $i || return 1
done &&
test_tick &&
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index aa0c204..01c74b8 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# May be altered later in the test
@@ -539,7 +540,7 @@
test_path_is_file my-hooks.ran &&
cat >expect <<-EOF &&
fatal: longline.patch: rejected by sendemail-validate hook
- fatal: command '"'"'my-hooks/sendemail-validate'"'"' died with exit code 1
+ fatal: command '"'"'git hook run --ignore-missing sendemail-validate -- <patch>'"'"' died with exit code 1
warning: no patches were sent
EOF
test_cmp expect actual
@@ -558,7 +559,7 @@
test_path_is_file my-hooks.ran &&
cat >expect <<-EOF &&
fatal: longline.patch: rejected by sendemail-validate hook
- fatal: command '"'"'$hooks_path/sendemail-validate'"'"' died with exit code 1
+ fatal: command '"'"'git hook run --ignore-missing sendemail-validate -- <patch>'"'"' died with exit code 1
warning: no patches were sent
EOF
test_cmp expect actual
@@ -2288,9 +2289,7 @@
'
test_expect_success $PREREQ 'invoke hook' '
- mkdir -p .git/hooks &&
-
- write_script .git/hooks/sendemail-validate <<-\EOF &&
+ test_hook sendemail-validate <<-\EOF &&
# test that we have the correct environment variable, pwd, and
# argument
case "$GIT_DIR" in
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index fea41b3..7c5b847 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -8,6 +8,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
prepare_utf8_locale
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index 8b5681d..d043e80 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -4,6 +4,8 @@
#
test_description='git svn property tests'
+
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
mkdir import
diff --git a/t/t9102-git-svn-deep-rmdir.sh b/t/t9102-git-svn-deep-rmdir.sh
index 66cd511..946ef85 100755
--- a/t/t9102-git-svn-deep-rmdir.sh
+++ b/t/t9102-git-svn-deep-rmdir.sh
@@ -1,5 +1,6 @@
#!/bin/sh
test_description='git svn rmdir'
+
. ./lib-git-svn.sh
test_expect_success 'initialize repo' '
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 67eed2f..5cf2ef4 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -4,6 +4,8 @@
#
test_description='git svn fetching'
+
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
test_expect_success 'initialize repo' '
@@ -117,7 +119,7 @@
mkdir -p import/trunk/subversion/bindings/swig/perl/t &&
for i in a b c ; do \
echo $i > import/trunk/subversion/bindings/swig/perl/$i.pm &&
- echo _$i > import/trunk/subversion/bindings/swig/perl/t/$i.t; \
+ echo _$i > import/trunk/subversion/bindings/swig/perl/t/$i.t || return 1
done &&
echo "bad delete test" > \
import/trunk/subversion/bindings/swig/perl/t/larger-parent &&
@@ -134,7 +136,7 @@
svn mv t native/t &&
for i in a b c
do
- svn mv $i.pm native/$i.pm
+ svn mv $i.pm native/$i.pm || return 1
done &&
echo z >>native/t/c.t &&
poke native/t/c.t &&
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh
index aec45bc..3cab0b9 100755
--- a/t/t9106-git-svn-commit-diff-clobber.sh
+++ b/t/t9106-git-svn-commit-diff-clobber.sh
@@ -2,6 +2,8 @@
#
# Copyright (c) 2006 Eric Wong
test_description='git svn commit-diff clobber'
+
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
test_expect_success 'initialize repo' '
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index ceaa5ba..aa908bb 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -98,10 +98,10 @@
rm -rf "$GIT_DIR"/svn &&
for i in $(cat fetch.out)
do
- path=$(expr $i : "\([^:]*\):.*$")
- ref=$(expr $i : "[^:]*:\(refs/remotes/.*\)$")
- if test -z "$ref"; then continue; fi
- if test -n "$path"; then path="/$path"; fi
+ path=${i%%:*} &&
+ ref=${i#*:} &&
+ if test "$ref" = "${ref#refs/remotes/}"; then continue; fi &&
+ if test -n "$path"; then path="/$path"; fi &&
mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
echo "$svnrepo"$path >"$GIT_DIR"/svn/$ref/info/url ||
return 1
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
index 743fbe1..419f055 100755
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -5,6 +5,7 @@
test_description='git svn dcommit can commit renames of files with ugly names'
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
test_expect_success 'load repository with strange names' '
diff --git a/t/t9116-git-svn-log.sh b/t/t9116-git-svn-log.sh
index 0a9f1ef..d74d7b2 100755
--- a/t/t9116-git-svn-log.sh
+++ b/t/t9116-git-svn-log.sh
@@ -4,6 +4,7 @@
#
test_description='git svn log tests'
+
. ./lib-git-svn.sh
test_expect_success 'setup repository and import' '
diff --git a/t/t9122-git-svn-author.sh b/t/t9122-git-svn-author.sh
index 9e8fe38..527ba3d 100755
--- a/t/t9122-git-svn-author.sh
+++ b/t/t9122-git-svn-author.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='git svn authorship'
+
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
test_expect_success 'setup svn repository' '
diff --git a/t/t9127-git-svn-partial-rebuild.sh b/t/t9127-git-svn-partial-rebuild.sh
index 2e4789d..97f495b 100755
--- a/t/t9127-git-svn-partial-rebuild.sh
+++ b/t/t9127-git-svn-partial-rebuild.sh
@@ -4,6 +4,7 @@
#
test_description='git svn partial-rebuild tests'
+
. ./lib-git-svn.sh
test_expect_success 'initialize svnrepo' '
diff --git a/t/t9128-git-svn-cmd-branch.sh b/t/t9128-git-svn-cmd-branch.sh
index 4e95f79..783e3ba 100755
--- a/t/t9128-git-svn-cmd-branch.sh
+++ b/t/t9128-git-svn-cmd-branch.sh
@@ -4,6 +4,7 @@
#
test_description='git svn partial-rebuild tests'
+
. ./lib-git-svn.sh
test_expect_success 'initialize svnrepo' '
diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
index 01e1e8a..185248a 100755
--- a/t/t9129-git-svn-i18n-commitencoding.sh
+++ b/t/t9129-git-svn-i18n-commitencoding.sh
@@ -4,6 +4,7 @@
test_description='git svn honors i18n.commitEncoding in config'
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
compare_git_head_with () {
diff --git a/t/t9130-git-svn-authors-file.sh b/t/t9130-git-svn-authors-file.sh
index cb764bc..90325db 100755
--- a/t/t9130-git-svn-authors-file.sh
+++ b/t/t9130-git-svn-authors-file.sh
@@ -15,7 +15,7 @@
test_expect_success 'setup svnrepo' '
for i in aa bb cc dd
do
- svn_cmd mkdir -m $i --username $i "$svnrepo"/$i
+ svn_cmd mkdir -m $i --username $i "$svnrepo"/$i || return 1
done
'
@@ -59,8 +59,8 @@
git svn clone --authors-file=svn-authors -s "$svnrepo"/aa aa-work &&
for i in bb ee cc
do
- branch="aa/branches/$i"
- svn_cmd mkdir -m "$branch" --username $i "$svnrepo/$branch"
+ branch="aa/branches/$i" &&
+ svn_cmd mkdir -m "$branch" --username $i "$svnrepo/$branch" || return 1
done
'
diff --git a/t/t9132-git-svn-broken-symlink.sh b/t/t9132-git-svn-broken-symlink.sh
index aeceffa..4d8d058 100755
--- a/t/t9132-git-svn-broken-symlink.sh
+++ b/t/t9132-git-svn-broken-symlink.sh
@@ -2,6 +2,7 @@
test_description='test that git handles an svn repository with empty symlinks'
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
test_expect_success 'load svn dumpfile' '
svnadmin load "$rawsvnrepo" <<EOF
diff --git a/t/t9134-git-svn-ignore-paths.sh b/t/t9134-git-svn-ignore-paths.sh
index fff49c4..4a77eb9 100755
--- a/t/t9134-git-svn-ignore-paths.sh
+++ b/t/t9134-git-svn-ignore-paths.sh
@@ -27,7 +27,7 @@
test_expect_success 'clone an SVN repository with ignored www directory' '
git svn clone --ignore-paths="^www" "$svnrepo" g &&
echo test_qqq > expect &&
- for i in g/*/*.txt; do cat $i >> expect2; done &&
+ for i in g/*/*.txt; do cat $i >> expect2 || return 1; done &&
test_cmp expect expect2
'
@@ -36,7 +36,7 @@
( cd c && git svn fetch --ignore-paths="^www" ) &&
rm expect2 &&
echo test_qqq > expect &&
- for i in c/*/*.txt; do cat $i >> expect2; done &&
+ for i in c/*/*.txt; do cat $i >> expect2 || return 1; done &&
test_cmp expect expect2
'
@@ -62,7 +62,7 @@
cd g &&
git svn rebase &&
printf "test_qqq\nb\n" > expect &&
- for i in */*.txt; do cat $i >> expect2; done &&
+ for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
test_cmp expect2 expect &&
rm expect expect2
)
@@ -73,7 +73,7 @@
cd c &&
git svn rebase --ignore-paths="^www" &&
printf "test_qqq\nb\n" > expect &&
- for i in */*.txt; do cat $i >> expect2; done &&
+ for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
test_cmp expect2 expect &&
rm expect expect2
)
@@ -94,7 +94,7 @@
cd g &&
git svn rebase &&
printf "test_qqq\nb\n" > expect &&
- for i in */*.txt; do cat $i >> expect2; done &&
+ for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
test_cmp expect2 expect &&
rm expect expect2
)
@@ -105,7 +105,7 @@
cd c &&
git svn rebase --ignore-paths="^www" &&
printf "test_qqq\nb\n" > expect &&
- for i in */*.txt; do cat $i >> expect2; done &&
+ for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
test_cmp expect2 expect &&
rm expect expect2
)
@@ -127,7 +127,7 @@
cd g &&
git svn rebase &&
printf "test_qqq\nb\nygg\n" > expect &&
- for i in */*.txt; do cat $i >> expect2; done &&
+ for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
test_cmp expect2 expect &&
rm expect expect2
)
@@ -138,7 +138,7 @@
cd c &&
git svn rebase --ignore-paths="^www" &&
printf "test_qqq\nb\nygg\n" > expect &&
- for i in */*.txt; do cat $i >> expect2; done &&
+ for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
test_cmp expect2 expect &&
rm expect expect2
)
diff --git a/t/t9138-git-svn-authors-prog.sh b/t/t9138-git-svn-authors-prog.sh
index 027b416..784ec7f 100755
--- a/t/t9138-git-svn-authors-prog.sh
+++ b/t/t9138-git-svn-authors-prog.sh
@@ -27,7 +27,7 @@
test_expect_success 'setup svnrepo' '
for i in aa bb cc-sub dd-sub ee-foo ff
do
- svn mkdir -m $i --username $i "$svnrepo"/$i
+ svn mkdir -m $i --username $i "$svnrepo"/$i || return 1
done
'
diff --git a/t/t9139-git-svn-non-utf8-commitencoding.sh b/t/t9139-git-svn-non-utf8-commitencoding.sh
index 22d80b0..b7f756b 100755
--- a/t/t9139-git-svn-non-utf8-commitencoding.sh
+++ b/t/t9139-git-svn-non-utf8-commitencoding.sh
@@ -4,6 +4,7 @@
test_description='git svn refuses to dcommit non-UTF8 messages'
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
# ISO-2022-JP can pass for valid UTF-8, so skipping that in this test
diff --git a/t/t9146-git-svn-empty-dirs.sh b/t/t9146-git-svn-empty-dirs.sh
index 5f91c0d..79c26ed 100755
--- a/t/t9146-git-svn-empty-dirs.sh
+++ b/t/t9146-git-svn-empty-dirs.sh
@@ -3,12 +3,14 @@
# Copyright (c) 2009 Eric Wong
test_description='git svn creates empty directories'
+
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
test_expect_success 'initialize repo' '
for i in a b c d d/e d/e/f "weird file name"
do
- svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i"
+ svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i" || return 1
done
'
@@ -102,7 +104,7 @@
test_expect_success 'initialize trunk' '
for i in trunk trunk/a trunk/"weird file name"
do
- svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i"
+ svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i" || return 1
done
'
diff --git a/t/t9147-git-svn-include-paths.sh b/t/t9147-git-svn-include-paths.sh
index d292bf9..257fc8f 100755
--- a/t/t9147-git-svn-include-paths.sh
+++ b/t/t9147-git-svn-include-paths.sh
@@ -28,7 +28,7 @@
test_expect_success 'clone an SVN repository with filter to include qqq directory' '
git svn clone --include-paths="qqq" "$svnrepo" g &&
echo test_qqq > expect &&
- for i in g/*/*.txt; do cat $i >> expect2; done &&
+ for i in g/*/*.txt; do cat $i >> expect2 || return 1; done &&
test_cmp expect expect2
'
@@ -38,7 +38,7 @@
( cd c && git svn fetch --include-paths="qqq" ) &&
rm expect2 &&
echo test_qqq > expect &&
- for i in c/*/*.txt; do cat $i >> expect2; done &&
+ for i in c/*/*.txt; do cat $i >> expect2 || return 1; done &&
test_cmp expect expect2
'
@@ -64,7 +64,7 @@
cd g &&
git svn rebase &&
printf "test_qqq\nb\n" > expect &&
- for i in */*.txt; do cat $i >> expect2; done &&
+ for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
test_cmp expect2 expect &&
rm expect expect2
)
@@ -75,7 +75,7 @@
cd c &&
git svn rebase --include-paths="qqq" &&
printf "test_qqq\nb\n" > expect &&
- for i in */*.txt; do cat $i >> expect2; done &&
+ for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
test_cmp expect2 expect &&
rm expect expect2
)
@@ -96,7 +96,7 @@
cd g &&
git svn rebase &&
printf "test_qqq\nb\n" > expect &&
- for i in */*.txt; do cat $i >> expect2; done &&
+ for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
test_cmp expect2 expect &&
rm expect expect2
)
@@ -107,7 +107,7 @@
cd c &&
git svn rebase --include-paths="qqq" &&
printf "test_qqq\nb\n" > expect &&
- for i in */*.txt; do cat $i >> expect2; done &&
+ for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
test_cmp expect2 expect &&
rm expect expect2
)
@@ -129,7 +129,7 @@
cd g &&
git svn rebase &&
printf "test_qqq\nb\nygg\n" > expect &&
- for i in */*.txt; do cat $i >> expect2; done &&
+ for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
test_cmp expect2 expect &&
rm expect expect2
)
@@ -140,7 +140,7 @@
cd c &&
git svn rebase --include-paths="qqq" &&
printf "test_qqq\nb\nygg\n" > expect &&
- for i in */*.txt; do cat $i >> expect2; done &&
+ for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
test_cmp expect2 expect &&
rm expect expect2
)
diff --git a/t/t9148-git-svn-propset.sh b/t/t9148-git-svn-propset.sh
index aebb289..6cc76a0 100755
--- a/t/t9148-git-svn-propset.sh
+++ b/t/t9148-git-svn-propset.sh
@@ -5,6 +5,7 @@
test_description='git svn propset tests'
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
test_expect_success 'setup propset via import' '
diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
index 1fbe84f..c93a5be 100755
--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@@ -5,9 +5,6 @@
test_description='git-svn svn mergeinfo properties'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./lib-git-svn.sh
test_expect_success 'load svn dump' "
diff --git a/t/t9152-svn-empty-dirs-after-gc.sh b/t/t9152-svn-empty-dirs-after-gc.sh
index 89f285d..a597c42 100755
--- a/t/t9152-svn-empty-dirs-after-gc.sh
+++ b/t/t9152-svn-empty-dirs-after-gc.sh
@@ -8,7 +8,7 @@
test_expect_success 'initialize repo' '
for i in a b c d d/e d/e/f "weird file name"
do
- svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i"
+ svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i" || return 1
done
'
diff --git a/t/t9160-git-svn-preserve-empty-dirs.sh b/t/t9160-git-svn-preserve-empty-dirs.sh
index 36c6b1a..9cf7a14 100755
--- a/t/t9160-git-svn-preserve-empty-dirs.sh
+++ b/t/t9160-git-svn-preserve-empty-dirs.sh
@@ -9,6 +9,7 @@
directories, and checks that corresponding directories are created in the
local Git repository with placeholder files.'
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
GIT_REPO=git-svn-repo
diff --git a/t/t9162-git-svn-dcommit-interactive.sh b/t/t9162-git-svn-dcommit-interactive.sh
index e38d9fa..e2aa8ed 100755
--- a/t/t9162-git-svn-dcommit-interactive.sh
+++ b/t/t9162-git-svn-dcommit-interactive.sh
@@ -3,6 +3,8 @@
# Copyright (c) 2011 Frédéric Heitzmann
test_description='git svn dcommit --interactive series'
+
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
test_expect_success 'initialize repo' '
diff --git a/t/t9164-git-svn-dcommit-concurrent.sh b/t/t9164-git-svn-dcommit-concurrent.sh
index 8466269..1465156 100755
--- a/t/t9164-git-svn-dcommit-concurrent.sh
+++ b/t/t9164-git-svn-dcommit-concurrent.sh
@@ -4,6 +4,8 @@
#
test_description='concurrent git svn dcommit'
+
+TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh
diff --git a/t/t9167-git-svn-cmd-branch-subproject.sh b/t/t9167-git-svn-cmd-branch-subproject.sh
index ba35fc0..d812843 100755
--- a/t/t9167-git-svn-cmd-branch-subproject.sh
+++ b/t/t9167-git-svn-cmd-branch-subproject.sh
@@ -4,6 +4,7 @@
#
test_description='git svn branch for subproject clones'
+
. ./lib-git-svn.sh
test_expect_success 'initialize svnrepo' '
diff --git a/t/t9302-fast-import-unpack-limit.sh b/t/t9302-fast-import-unpack-limit.sh
index f519e4f..d8b1f94 100755
--- a/t/t9302-fast-import-unpack-limit.sh
+++ b/t/t9302-fast-import-unpack-limit.sh
@@ -1,5 +1,7 @@
#!/bin/sh
test_description='test git fast-import unpack limit'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'create loose objects on import' '
diff --git a/t/t9303-fast-import-compression.sh b/t/t9303-fast-import-compression.sh
index 57d9165..4f5bf40 100755
--- a/t/t9303-fast-import-compression.sh
+++ b/t/t9303-fast-import-compression.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='compression setting of fast-import utility'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
import_large () {
diff --git a/t/t9304-fast-import-marks.sh b/t/t9304-fast-import-marks.sh
index d4359db..bed01c9 100755
--- a/t/t9304-fast-import-marks.sh
+++ b/t/t9304-fast-import-marks.sh
@@ -16,7 +16,7 @@
blob=$(git rev-parse HEAD:one.t) &&
for i in $(test_seq 1024 16384)
do
- echo ":$i $blob"
+ echo ":$i $blob" || return 1
done >>marks
'
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 409b48e..fc99703 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -500,6 +500,13 @@
grep file0 actual
'
+test_expect_success 'path limiting works' '
+ git fast-export simple -- file >actual &&
+ sed -ne "s/^M .* //p" <actual | sort -u >actual.files &&
+ echo file >expect &&
+ test_cmp expect actual.files
+'
+
test_expect_success 'avoid corrupt stream with non-existent mark' '
test_create_repo avoid_non_existent_mark &&
(
@@ -750,4 +757,36 @@
)
'
+
+test_expect_success 'fast-export --first-parent outputs all revisions output by revision walk' '
+ git init first-parent &&
+ (
+ cd first-parent &&
+ test_commit A &&
+ git checkout -b topic1 &&
+ test_commit B &&
+ git checkout main &&
+ git merge --no-ff topic1 &&
+
+ git checkout -b topic2 &&
+ test_commit C &&
+ git checkout main &&
+ git merge --no-ff topic2 &&
+
+ test_commit D &&
+
+ git fast-export main -- --first-parent >first-parent-export &&
+ git fast-export main -- --first-parent --reverse >first-parent-reverse-export &&
+ test_cmp first-parent-export first-parent-reverse-export &&
+
+ git init import &&
+ git -C import fast-import <first-parent-export &&
+
+ git log --format="%ad %s" --first-parent main >expected &&
+ git -C import log --format="%ad %s" --all >actual &&
+ test_cmp expected actual &&
+ test_line_count = 4 actual
+ )
+'
+
test_done
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 17f988e..210ddf0 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -338,7 +338,7 @@
'(for dir in A A/B A/B/C A/D E; do
mkdir $dir &&
echo "test file in $dir" >"$dir/file_in_$(echo $dir|sed -e "s#/# #g")" &&
- git add $dir
+ git add $dir || exit 1
done) &&
git commit -q -m "deep sub directory structure" &&
git push gitcvs.git >/dev/null &&
@@ -350,10 +350,9 @@
test_cmp "$dir/$filename" "../$dir/$filename"; then
:
else
- echo >failure
+ exit 1
fi
- done) &&
- test ! -f failure'
+ done)'
cd "$WORKDIR"
test_expect_success 'cvs update (delete file)' \
@@ -382,7 +381,7 @@
for i in 1 2 3 4 5 6 7
do
echo Line $i >>merge &&
- echo Line $i >>expected
+ echo Line $i >>expected || return 1
done &&
echo Line 8 >>expected &&
git add merge &&
@@ -592,7 +591,7 @@
cd cvswork &&
GIT_CONFIG="$git_config" cvs annotate merge >../out &&
sed -e "s/ .*//" ../out >../actual &&
- for i in 3 1 1 1 1 1 1 1 2 4; do echo 1.$i; done >../expect &&
+ printf "1.%d\n" 3 1 1 1 1 1 1 1 2 4 >../expect &&
test_cmp ../expect ../actual
'
diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh
index 32814e7..c900231 100755
--- a/t/t9501-gitweb-standalone-http-status.sh
+++ b/t/t9501-gitweb-standalone-http-status.sh
@@ -13,6 +13,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./lib-gitweb.sh
#
diff --git a/t/t9502-gitweb-standalone-parse-output.sh b/t/t9502-gitweb-standalone-parse-output.sh
index 3167473..8cb582f 100755
--- a/t/t9502-gitweb-standalone-parse-output.sh
+++ b/t/t9502-gitweb-standalone-parse-output.sh
@@ -34,7 +34,7 @@
#
# This will check that gitweb HTTP header contains proposed filename
# as <basename> with '.tar' suffix added, and that generated tarfile
-# (gitweb message body) has <prefix> as prefix for al files in tarfile
+# (gitweb message body) has <prefix> as prefix for all files in tarfile
#
# <prefix> default to <basename>
check_snapshot () {
@@ -207,4 +207,17 @@
xss "" "$TAG+"
'
+no_http_equiv_content_type() {
+ gitweb_run "$@" &&
+ ! grep -E "http-equiv=['\"]?content-type" gitweb.body
+}
+
+# See: <https://html.spec.whatwg.org/dev/semantics.html#attr-meta-http-equiv-content-type>
+test_expect_success 'no http-equiv="content-type" in XHTML' '
+ no_http_equiv_content_type &&
+ no_http_equiv_content_type "p=.git" &&
+ no_http_equiv_content_type "p=.git;a=log" &&
+ no_http_equiv_content_type "p=.git;a=tree"
+'
+
test_done
diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
index 0e9daa5..19f38f7 100755
--- a/t/t9603-cvsimport-patchsets.sh
+++ b/t/t9603-cvsimport-patchsets.sh
@@ -12,9 +12,6 @@
# bug.
test_description='git cvsimport testing for correct patchset estimation'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./lib-cvs.sh
setup_cvs_test_repository t9603
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 81bc8e8..dc88d0e 100755
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -74,6 +74,91 @@
)
'
+#
+# Setup as before, and then explicitly sync imported branch, using a
+# different ref format.
+#
+test_expect_success 'git p4 sync existing branch without changes' '
+ test_create_repo "$git" &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ test_commit head &&
+ git p4 sync --branch=depot //depot@all &&
+ git p4 sync --branch=refs/remotes/p4/depot >out &&
+ test_i18ngrep "No changes to import!" out
+ )
+'
+
+#
+# Same as before, relative branch name.
+#
+test_expect_success 'git p4 sync existing branch with relative name' '
+ test_create_repo "$git" &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ test_commit head &&
+ git p4 sync --branch=branch1 //depot@all &&
+ git p4 sync --branch=p4/branch1 >out &&
+ test_i18ngrep "No changes to import!" out
+ )
+'
+
+#
+# Same as before, with a nested branch path, referenced different ways.
+#
+test_expect_success 'git p4 sync existing branch with nested path' '
+ test_create_repo "$git" &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ test_commit head &&
+ git p4 sync --branch=p4/some/path //depot@all &&
+ git p4 sync --branch=some/path >out &&
+ test_i18ngrep "No changes to import!" out
+ )
+'
+
+#
+# Same as before, with a full ref path outside the p4/* namespace.
+#
+test_expect_success 'git p4 sync branch explicit ref without p4 in path' '
+ test_create_repo "$git" &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ test_commit head &&
+ git p4 sync --branch=refs/remotes/someremote/depot //depot@all &&
+ git p4 sync --branch=refs/remotes/someremote/depot >out &&
+ test_i18ngrep "No changes to import!" out
+ )
+'
+
+test_expect_success 'git p4 sync nonexistent ref' '
+ test_create_repo "$git" &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ test_commit head &&
+ git p4 sync --branch=depot //depot@all &&
+ test_must_fail git p4 sync --branch=depot2 2>errs &&
+ test_i18ngrep "Perhaps you never did" errs
+ )
+'
+
+test_expect_success 'git p4 sync existing non-p4-imported ref' '
+ test_create_repo "$git" &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ test_commit head &&
+ git p4 sync --branch=depot //depot@all &&
+ test_must_fail git p4 sync --branch=refs/heads/master 2>errs &&
+ test_i18ngrep "Perhaps you never did" errs
+ )
+'
+
test_expect_success 'clone two dirs' '
(
cd "$cli" &&
@@ -171,7 +256,7 @@
cd "$git" &&
git ls-files >lines &&
test_line_count = 8 lines
- )
+ ) || return 1
done
'
@@ -277,16 +362,21 @@
git commit -m "add hello.txt" &&
git config git-p4.skipSubmitEdit true &&
git p4 submit --dry-run >out &&
- grep "Would apply" out &&
- mkdir -p .git/hooks &&
- write_script .git/hooks/p4-pre-submit <<-\EOF &&
- exit 0
- EOF
+ grep "Would apply" out
+ ) &&
+ test_hook -C "$git" p4-pre-submit <<-\EOF &&
+ exit 0
+ EOF
+ (
+ cd "$git" &&
git p4 submit --dry-run >out &&
- grep "Would apply" out &&
- write_script .git/hooks/p4-pre-submit <<-\EOF &&
- exit 1
- EOF
+ grep "Would apply" out
+ ) &&
+ test_hook -C "$git" --clobber p4-pre-submit <<-\EOF &&
+ exit 1
+ EOF
+ (
+ cd "$git" &&
test_must_fail git p4 submit --dry-run >errs 2>&1 &&
! grep "Would apply" errs
)
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
index 50a6f8b..759a14f 100755
--- a/t/t9801-git-p4-branch.sh
+++ b/t/t9801-git-p4-branch.sh
@@ -129,6 +129,16 @@
)
'
+test_expect_success 'sync specific detected branch' '
+ test_when_finished cleanup_git &&
+ git p4 clone --dest="$git" --detect-branches //depot@all &&
+ (
+ cd "$git" &&
+ git p4 sync --branch=depot/branch2 >out &&
+ test_i18ngrep "No changes to import!" out
+ )
+'
+
test_expect_success 'import depot, branch detection, branchList branch definition' '
test_when_finished cleanup_git &&
test_create_repo "$git" &&
diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
index 19073c6..2a6ee2a 100755
--- a/t/t9802-git-p4-filetype.sh
+++ b/t/t9802-git-p4-filetype.sh
@@ -333,4 +333,38 @@
)
'
+test_expect_success SYMLINKS 'utf-8 with and without BOM in text file' '
+ (
+ cd "$cli" &&
+
+ # some utf8 content
+ echo some tǣxt >utf8-nobom-test &&
+
+ # same utf8 content as before but with bom
+ echo some tǣxt | sed '\''s/^/\xef\xbb\xbf/'\'' >utf8-bom-test &&
+
+ # bom only
+ dd bs=1 count=3 if=utf8-bom-test of=utf8-bom-empty-test &&
+
+ p4 add utf8-nobom-test utf8-bom-test utf8-bom-empty-test &&
+ p4 submit -d "add utf8 test files"
+ ) &&
+ test_when_finished cleanup_git &&
+
+ git p4 clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git checkout refs/remotes/p4/master &&
+
+ echo some tǣxt >utf8-nobom-check &&
+ test_cmp utf8-nobom-check utf8-nobom-test &&
+
+ echo some tǣxt | sed '\''s/^/\xef\xbb\xbf/'\'' >utf8-bom-check &&
+ test_cmp utf8-bom-check utf8-bom-test &&
+
+ dd bs=1 count=3 if=utf8-bom-check of=utf8-bom-empty-check &&
+ test_cmp utf8-bom-empty-check utf8-bom-empty-test
+ )
+'
+
test_done
diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh
index e383688..5fe8331 100755
--- a/t/t9810-git-p4-rcs.sh
+++ b/t/t9810-git-p4-rcs.sh
@@ -4,6 +4,8 @@
. ./lib-git-p4.sh
+CP1252="\223\224"
+
test_expect_success 'start p4d' '
start_p4d
'
@@ -32,6 +34,9 @@
p4 submit -d "filek" &&
p4 add -t text+ko fileko &&
p4 submit -d "fileko" &&
+ printf "$CP1252" >fileko_cp1252 &&
+ p4 add -t text+ko fileko_cp1252 &&
+ p4 submit -d "fileko_cp1252" &&
p4 add -t text file_text &&
p4 submit -d "file_text"
)
@@ -359,4 +364,14 @@
)
'
+test_expect_success 'check cp1252 smart quote are preserved through RCS keyword processing' '
+ test_when_finished cleanup_git &&
+ git p4 clone --dest="$git" //depot &&
+ (
+ cd "$git" &&
+ printf "$CP1252" >expect &&
+ test_cmp_bin expect fileko_cp1252
+ )
+'
+
test_done
diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh
index 0db7ab9..de591d8 100755
--- a/t/t9818-git-p4-block.sh
+++ b/t/t9818-git-p4-block.sh
@@ -92,11 +92,11 @@
for i in $(test_seq 0 10)
do
p4_add_file "included/x$i" &&
- p4_add_file "excluded/x$i"
+ p4_add_file "excluded/x$i" || return 1
done &&
for i in $(test_seq 0 10)
do
- p4_add_file "excluded/y$i"
+ p4_add_file "excluded/y$i" || return 1
done
'
@@ -123,7 +123,7 @@
do
for i in $(test_seq 1 10)
do
- p4_add_file "$p/file$p$i"
+ p4_add_file "$p/file$p$i" || return 1
done
done
'
diff --git a/t/t9835-git-p4-metadata-encoding-python2.sh b/t/t9835-git-p4-metadata-encoding-python2.sh
new file mode 100755
index 0000000..036bf79
--- /dev/null
+++ b/t/t9835-git-p4-metadata-encoding-python2.sh
@@ -0,0 +1,213 @@
+#!/bin/sh
+
+test_description='git p4 metadata encoding
+
+This test checks that the import process handles inconsistent text
+encoding in p4 metadata (author names, commit messages, etc) without
+failing, and produces maximally sane output in git.'
+
+. ./lib-git-p4.sh
+
+python_target_version='2'
+
+###############################
+## SECTION REPEATED IN t9836 ##
+###############################
+
+# Please note: this test calls "git-p4.py" rather than "git-p4", because the
+# latter references a specific path so we can't easily force it to run under
+# the python version we need to.
+
+python_major_version=$(python -V 2>&1 | cut -c 8)
+python_target_binary=$(which python$python_target_version)
+if ! test "$python_major_version" = "$python_target_version" && test "$python_target_binary"
+then
+ mkdir temp_python
+ PATH="$(pwd)/temp_python:$PATH" && export PATH
+ ln -s $python_target_binary temp_python/python
+fi
+
+python_major_version=$(python -V 2>&1 | cut -c 8)
+if ! test "$python_major_version" = "$python_target_version"
+then
+ skip_all="skipping python$python_target_version-specific git p4 tests; python$python_target_version not available"
+ test_done
+fi
+
+remove_user_cache () {
+ rm "$HOME/.gitp4-usercache.txt" || true
+}
+
+test_expect_success 'start p4d' '
+ start_p4d
+'
+
+test_expect_success 'init depot' '
+ (
+ cd "$cli" &&
+
+ p4_add_user "utf8_author" "ǣuthor" &&
+ P4USER=utf8_author &&
+ touch file1 &&
+ p4 add file1 &&
+ p4 submit -d "first CL has some utf-8 tǣxt" &&
+
+ p4_add_user "latin1_author" "$(echo æuthor |
+ iconv -f utf8 -t latin1)" &&
+ P4USER=latin1_author &&
+ touch file2 &&
+ p4 add file2 &&
+ p4 submit -d "$(echo second CL has some latin-1 tæxt |
+ iconv -f utf8 -t latin1)" &&
+
+ p4_add_user "cp1252_author" "$(echo æuthœr |
+ iconv -f utf8 -t cp1252)" &&
+ P4USER=cp1252_author &&
+ touch file3 &&
+ p4 add file3 &&
+ p4 submit -d "$(echo third CL has sœme cp-1252 tæxt |
+ iconv -f utf8 -t cp1252)" &&
+
+ p4_add_user "cp850_author" "$(echo Åuthor |
+ iconv -f utf8 -t cp850)" &&
+ P4USER=cp850_author &&
+ touch file4 &&
+ p4 add file4 &&
+ p4 submit -d "$(echo fourth CL hÅs some cp850 text |
+ iconv -f utf8 -t cp850)"
+ )
+'
+
+test_expect_success 'clone non-utf8 repo with strict encoding' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ test_must_fail git -c git-p4.metadataDecodingStrategy=strict p4.py clone --dest="$git" //depot@all 2>err &&
+ grep "Decoding perforce metadata failed!" err
+'
+
+test_expect_success 'check utf-8 contents with passthrough strategy' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=passthrough p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "some utf-8 tǣxt" actual &&
+ grep "ǣuthor" actual
+ )
+'
+
+test_expect_success 'check latin-1 contents corrupted in git with passthrough strategy' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=passthrough p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ badly_encoded_in_git=$(echo "some latin-1 tæxt" | iconv -f utf8 -t latin1) &&
+ grep "$badly_encoded_in_git" actual &&
+ bad_author_in_git="$(echo æuthor | iconv -f utf8 -t latin1)" &&
+ grep "$bad_author_in_git" actual
+ )
+'
+
+test_expect_success 'check utf-8 contents with fallback strategy' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "some utf-8 tǣxt" actual &&
+ grep "ǣuthor" actual
+ )
+'
+
+test_expect_success 'check latin-1 contents with fallback strategy' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "some latin-1 tæxt" actual &&
+ grep "æuthor" actual
+ )
+'
+
+test_expect_success 'check cp-1252 contents with fallback strategy' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "sœme cp-1252 tæxt" actual &&
+ grep "æuthœr" actual
+ )
+'
+
+test_expect_success 'check cp850 contents parsed with correct fallback' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=fallback -c git-p4.metadataFallbackEncoding=cp850 p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "hÅs some cp850 text" actual &&
+ grep "Åuthor" actual
+ )
+'
+
+test_expect_success 'check cp850-only contents escaped when cp1252 is fallback' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "h%8Fs some cp850 text" actual &&
+ grep "%8Futhor" actual
+ )
+'
+
+test_expect_success 'check cp-1252 contents on later sync after clone with fallback strategy' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$cli" &&
+ P4USER=cp1252_author &&
+ touch file10 &&
+ p4 add file10 &&
+ p4 submit -d "$(echo later CL has sœme more cp-1252 tæxt |
+ iconv -f utf8 -t cp1252)"
+ ) &&
+ (
+ cd "$git" &&
+
+ git p4.py sync --branch=master &&
+
+ git log p4/master >actual &&
+ grep "sœme more cp-1252 tæxt" actual &&
+ grep "æuthœr" actual
+ )
+'
+
+############################
+## / END REPEATED SECTION ##
+############################
+
+test_expect_success 'passthrough (latin-1 contents corrupted in git) is the default with python2' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=passthrough p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ badly_encoded_in_git=$(echo "some latin-1 tæxt" | iconv -f utf8 -t latin1) &&
+ grep "$badly_encoded_in_git" actual
+ )
+'
+
+test_done
diff --git a/t/t9836-git-p4-metadata-encoding-python3.sh b/t/t9836-git-p4-metadata-encoding-python3.sh
new file mode 100755
index 0000000..63350dc
--- /dev/null
+++ b/t/t9836-git-p4-metadata-encoding-python3.sh
@@ -0,0 +1,214 @@
+#!/bin/sh
+
+test_description='git p4 metadata encoding
+
+This test checks that the import process handles inconsistent text
+encoding in p4 metadata (author names, commit messages, etc) without
+failing, and produces maximally sane output in git.'
+
+. ./lib-git-p4.sh
+
+python_target_version='3'
+
+###############################
+## SECTION REPEATED IN t9835 ##
+###############################
+
+# Please note: this test calls "git-p4.py" rather than "git-p4", because the
+# latter references a specific path so we can't easily force it to run under
+# the python version we need to.
+
+python_major_version=$(python -V 2>&1 | cut -c 8)
+python_target_binary=$(which python$python_target_version)
+if ! test "$python_major_version" = "$python_target_version" && test "$python_target_binary"
+then
+ mkdir temp_python
+ PATH="$(pwd)/temp_python:$PATH" && export PATH
+ ln -s $python_target_binary temp_python/python
+fi
+
+python_major_version=$(python -V 2>&1 | cut -c 8)
+if ! test "$python_major_version" = "$python_target_version"
+then
+ skip_all="skipping python$python_target_version-specific git p4 tests; python$python_target_version not available"
+ test_done
+fi
+
+remove_user_cache () {
+ rm "$HOME/.gitp4-usercache.txt" || true
+}
+
+test_expect_success 'start p4d' '
+ start_p4d
+'
+
+test_expect_success 'init depot' '
+ (
+ cd "$cli" &&
+
+ p4_add_user "utf8_author" "ǣuthor" &&
+ P4USER=utf8_author &&
+ touch file1 &&
+ p4 add file1 &&
+ p4 submit -d "first CL has some utf-8 tǣxt" &&
+
+ p4_add_user "latin1_author" "$(echo æuthor |
+ iconv -f utf8 -t latin1)" &&
+ P4USER=latin1_author &&
+ touch file2 &&
+ p4 add file2 &&
+ p4 submit -d "$(echo second CL has some latin-1 tæxt |
+ iconv -f utf8 -t latin1)" &&
+
+ p4_add_user "cp1252_author" "$(echo æuthœr |
+ iconv -f utf8 -t cp1252)" &&
+ P4USER=cp1252_author &&
+ touch file3 &&
+ p4 add file3 &&
+ p4 submit -d "$(echo third CL has sœme cp-1252 tæxt |
+ iconv -f utf8 -t cp1252)" &&
+
+ p4_add_user "cp850_author" "$(echo Åuthor |
+ iconv -f utf8 -t cp850)" &&
+ P4USER=cp850_author &&
+ touch file4 &&
+ p4 add file4 &&
+ p4 submit -d "$(echo fourth CL hÅs some cp850 text |
+ iconv -f utf8 -t cp850)"
+ )
+'
+
+test_expect_success 'clone non-utf8 repo with strict encoding' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ test_must_fail git -c git-p4.metadataDecodingStrategy=strict p4.py clone --dest="$git" //depot@all 2>err &&
+ grep "Decoding perforce metadata failed!" err
+'
+
+test_expect_success 'check utf-8 contents with passthrough strategy' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=passthrough p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "some utf-8 tǣxt" actual &&
+ grep "ǣuthor" actual
+ )
+'
+
+test_expect_success 'check latin-1 contents corrupted in git with passthrough strategy' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=passthrough p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ badly_encoded_in_git=$(echo "some latin-1 tæxt" | iconv -f utf8 -t latin1) &&
+ grep "$badly_encoded_in_git" actual &&
+ bad_author_in_git="$(echo æuthor | iconv -f utf8 -t latin1)" &&
+ grep "$bad_author_in_git" actual
+ )
+'
+
+test_expect_success 'check utf-8 contents with fallback strategy' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "some utf-8 tǣxt" actual &&
+ grep "ǣuthor" actual
+ )
+'
+
+test_expect_success 'check latin-1 contents with fallback strategy' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "some latin-1 tæxt" actual &&
+ grep "æuthor" actual
+ )
+'
+
+test_expect_success 'check cp-1252 contents with fallback strategy' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "sœme cp-1252 tæxt" actual &&
+ grep "æuthœr" actual
+ )
+'
+
+test_expect_success 'check cp850 contents parsed with correct fallback' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=fallback -c git-p4.metadataFallbackEncoding=cp850 p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "hÅs some cp850 text" actual &&
+ grep "Åuthor" actual
+ )
+'
+
+test_expect_success 'check cp850-only contents escaped when cp1252 is fallback' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "h%8Fs some cp850 text" actual &&
+ grep "%8Futhor" actual
+ )
+'
+
+test_expect_success 'check cp-1252 contents on later sync after clone with fallback strategy' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$cli" &&
+ P4USER=cp1252_author &&
+ touch file10 &&
+ p4 add file10 &&
+ p4 submit -d "$(echo later CL has sœme more cp-1252 tæxt |
+ iconv -f utf8 -t cp1252)"
+ ) &&
+ (
+ cd "$git" &&
+
+ git p4.py sync --branch=master &&
+
+ git log p4/master >actual &&
+ grep "sœme more cp-1252 tæxt" actual &&
+ grep "æuthœr" actual
+ )
+'
+
+############################
+## / END REPEATED SECTION ##
+############################
+
+
+test_expect_success 'fallback (both utf-8 and cp-1252 contents handled) is the default with python3' '
+ test_when_finished cleanup_git &&
+ test_when_finished remove_user_cache &&
+ git p4.py clone --dest="$git" //depot@all &&
+ (
+ cd "$git" &&
+ git log >actual &&
+ grep "sœme cp-1252 tæxt" actual &&
+ grep "æuthœr" actual
+ )
+'
+
+test_done
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 5decc3b..31526e6 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -5,9 +5,6 @@
test_description='test bash completion'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
. ./lib-bash.sh
complete ()
@@ -879,7 +876,7 @@
refs/remotes/remote/branch-in-remote
do
git update-ref $remote_ref main &&
- test_when_finished "git update-ref -d $remote_ref"
+ test_when_finished "git update-ref -d $remote_ref" || return 1
done &&
(
cur= &&
@@ -1052,7 +1049,7 @@
refs/remotes/remote/branch-in-remote
do
git update-ref $remote_ref main &&
- test_when_finished "git update-ref -d $remote_ref"
+ test_when_finished "git update-ref -d $remote_ref" || return 1
done &&
(
cur=mat &&
@@ -1447,6 +1444,161 @@
EOF
'
+test_expect_success 'setup sparse-checkout tests' '
+ # set up sparse-checkout repo
+ git init sparse-checkout &&
+ (
+ cd sparse-checkout &&
+ mkdir -p folder1/0/1 folder2/0 folder3 &&
+ touch folder1/0/1/t.txt &&
+ touch folder2/0/t.txt &&
+ touch folder3/t.txt &&
+ git add . &&
+ git commit -am "Initial commit"
+ )
+'
+
+test_expect_success 'sparse-checkout completes subcommands' '
+ test_completion "git sparse-checkout " <<-\EOF
+ list Z
+ init Z
+ set Z
+ add Z
+ reapply Z
+ disable Z
+ EOF
+'
+
+test_expect_success 'cone mode sparse-checkout completes directory names' '
+ # initialize sparse-checkout definitions
+ git -C sparse-checkout sparse-checkout set --cone folder1/0 folder3 &&
+
+ # test tab completion
+ (
+ cd sparse-checkout &&
+ test_completion "git sparse-checkout set f" <<-\EOF
+ folder1/
+ folder2/
+ folder3/
+ EOF
+ ) &&
+
+ (
+ cd sparse-checkout &&
+ test_completion "git sparse-checkout set folder1/" <<-\EOF
+ folder1/0/
+ EOF
+ ) &&
+
+ (
+ cd sparse-checkout &&
+ test_completion "git sparse-checkout set folder1/0/" <<-\EOF
+ folder1/0/1/
+ EOF
+ ) &&
+
+ (
+ cd sparse-checkout/folder1 &&
+ test_completion "git sparse-checkout add 0" <<-\EOF
+ 0/
+ EOF
+ )
+'
+
+test_expect_success 'cone mode sparse-checkout completes directory names with spaces and accents' '
+ # reset sparse-checkout
+ git -C sparse-checkout sparse-checkout disable &&
+ (
+ cd sparse-checkout &&
+ mkdir "directory with spaces" &&
+ mkdir "directory-with-áccent" &&
+ >"directory with spaces/randomfile" &&
+ >"directory-with-áccent/randomfile" &&
+ git add . &&
+ git commit -m "Add directory with spaces and directory with accent" &&
+ git sparse-checkout set --cone "directory with spaces" \
+ "directory-with-áccent" &&
+ test_completion "git sparse-checkout add dir" <<-\EOF &&
+ directory with spaces/
+ directory-with-áccent/
+ EOF
+ rm -rf "directory with spaces" &&
+ rm -rf "directory-with-áccent" &&
+ git add . &&
+ git commit -m "Remove directory with spaces and directory with accent"
+ )
+'
+
+# use FUNNYNAMES to avoid running on Windows, which doesn't permit tabs in paths
+test_expect_success FUNNYNAMES 'cone mode sparse-checkout completes directory names with tabs' '
+ # reset sparse-checkout
+ git -C sparse-checkout sparse-checkout disable &&
+ (
+ cd sparse-checkout &&
+ mkdir "$(printf "directory\twith\ttabs")" &&
+ >"$(printf "directory\twith\ttabs")/randomfile" &&
+ git add . &&
+ git commit -m "Add directory with tabs" &&
+ git sparse-checkout set --cone \
+ "$(printf "directory\twith\ttabs")" &&
+ test_completion "git sparse-checkout add dir" <<-\EOF &&
+ directory with tabs/
+ EOF
+ rm -rf "$(printf "directory\twith\ttabs")" &&
+ git add . &&
+ git commit -m "Remove directory with tabs"
+ )
+'
+
+# use FUNNYNAMES to avoid running on Windows, and !CYGWIN for Cygwin, as neither permit backslashes in paths
+test_expect_success FUNNYNAMES,!CYGWIN 'cone mode sparse-checkout completes directory names with backslashes' '
+ # reset sparse-checkout
+ git -C sparse-checkout sparse-checkout disable &&
+ (
+ cd sparse-checkout &&
+ mkdir "directory\with\backslashes" &&
+ >"directory\with\backslashes/randomfile" &&
+ git add . &&
+ git commit -m "Add directory with backslashes" &&
+ git sparse-checkout set --cone \
+ "directory\with\backslashes" &&
+ test_completion "git sparse-checkout add dir" <<-\EOF &&
+ directory\with\backslashes/
+ EOF
+ rm -rf "directory\with\backslashes" &&
+ git add . &&
+ git commit -m "Remove directory with backslashes"
+ )
+'
+
+test_expect_success 'non-cone mode sparse-checkout uses bash completion' '
+ # reset sparse-checkout repo to non-cone mode
+ git -C sparse-checkout sparse-checkout disable &&
+ git -C sparse-checkout sparse-checkout set --no-cone &&
+
+ (
+ cd sparse-checkout &&
+ # expected to be empty since we have not configured
+ # custom completion for non-cone mode
+ test_completion "git sparse-checkout set f" <<-\EOF
+
+ EOF
+ )
+'
+
+test_expect_success 'git sparse-checkout set --cone completes directory names' '
+ git -C sparse-checkout sparse-checkout disable &&
+
+ (
+ cd sparse-checkout &&
+ test_completion "git sparse-checkout set --cone f" <<-\EOF
+ folder1/
+ folder2/
+ folder3/
+ EOF
+ )
+'
+
test_expect_success 'git switch - with -d, complete all references' '
test_completion "git switch -d " <<-\EOF
HEAD Z
@@ -2148,6 +2300,9 @@
--cover-from-description=Z
--cover-letter Z
EOF
+ test_completion "git send-email --val" <<-\EOF &&
+ --validate Z
+ EOF
test_completion "git send-email ma" "main "
'
@@ -2396,27 +2551,33 @@
'
test_expect_success 'sourcing the completion script clears cached commands' '
- __git_compute_all_commands &&
- verbose test -n "$__git_all_commands" &&
- . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
- verbose test -z "$__git_all_commands"
+ (
+ __git_compute_all_commands &&
+ verbose test -n "$__git_all_commands" &&
+ . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+ verbose test -z "$__git_all_commands"
+ )
'
test_expect_success 'sourcing the completion script clears cached merge strategies' '
- __git_compute_merge_strategies &&
- verbose test -n "$__git_merge_strategies" &&
- . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
- verbose test -z "$__git_merge_strategies"
+ (
+ __git_compute_merge_strategies &&
+ verbose test -n "$__git_merge_strategies" &&
+ . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+ verbose test -z "$__git_merge_strategies"
+ )
'
test_expect_success 'sourcing the completion script clears cached --options' '
- __gitcomp_builtin checkout &&
- verbose test -n "$__gitcomp_builtin_checkout" &&
- __gitcomp_builtin notes_edit &&
- verbose test -n "$__gitcomp_builtin_notes_edit" &&
- . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
- verbose test -z "$__gitcomp_builtin_checkout" &&
- verbose test -z "$__gitcomp_builtin_notes_edit"
+ (
+ __gitcomp_builtin checkout &&
+ verbose test -n "$__gitcomp_builtin_checkout" &&
+ __gitcomp_builtin notes_edit &&
+ verbose test -n "$__gitcomp_builtin_notes_edit" &&
+ . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+ verbose test -z "$__gitcomp_builtin_checkout" &&
+ verbose test -z "$__gitcomp_builtin_notes_edit"
+ )
'
test_expect_success 'option aliases are not shown by default' '
@@ -2424,12 +2585,45 @@
'
test_expect_success 'option aliases are shown with GIT_COMPLETION_SHOW_ALL' '
- . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
- GIT_COMPLETION_SHOW_ALL=1 && export GIT_COMPLETION_SHOW_ALL &&
- test_completion "git clone --recurs" <<-\EOF
- --recurse-submodules Z
- --recursive Z
- EOF
+ (
+ . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+ GIT_COMPLETION_SHOW_ALL=1 && export GIT_COMPLETION_SHOW_ALL &&
+ test_completion "git clone --recurs" <<-\EOF
+ --recurse-submodules Z
+ --recursive Z
+ EOF
+ )
+'
+
+test_expect_success 'plumbing commands are excluded without GIT_COMPLETION_SHOW_ALL_COMMANDS' '
+ (
+ . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+ sane_unset GIT_TESTING_PORCELAIN_COMMAND_LIST &&
+
+ # Just mainporcelain, not plumbing commands
+ run_completion "git c" &&
+ grep checkout out &&
+ ! grep cat-file out
+ )
+'
+
+test_expect_success 'all commands are shown with GIT_COMPLETION_SHOW_ALL_COMMANDS (also main non-builtin)' '
+ (
+ . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+ GIT_COMPLETION_SHOW_ALL_COMMANDS=1 &&
+ export GIT_COMPLETION_SHOW_ALL_COMMANDS &&
+ sane_unset GIT_TESTING_PORCELAIN_COMMAND_LIST &&
+
+ # Both mainporcelain and plumbing commands
+ run_completion "git c" &&
+ grep checkout out &&
+ grep cat-file out &&
+
+ # Check "gitk", a "main" command, but not a built-in + more plumbing
+ run_completion "git g" &&
+ grep gitk out &&
+ grep get-tar-commit-id out
+ )
'
test_expect_success '__git_complete' '
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index eef2262..6da7273 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -329,7 +329,7 @@
else
$echo "${3-$1}" >"$indir$file"
fi &&
- git ${indir:+ -C "$indir"} add "$file" &&
+ git ${indir:+ -C "$indir"} add -- "$file" &&
if test -z "$notick"
then
test_tick
@@ -551,6 +551,82 @@
chmod +x "$1"
}
+# Usage: test_hook [options] <hook-name> <<-\EOF
+#
+# -C <dir>:
+# Run all git commands in directory <dir>
+# --setup
+# Setup a hook for subsequent tests, i.e. don't remove it in a
+# "test_when_finished"
+# --clobber
+# Overwrite an existing <hook-name>, if it exists. Implies
+# --setup (i.e. the "test_when_finished" is assumed to have been
+# set up already).
+# --disable
+# Disable (chmod -x) an existing <hook-name>, which must exist.
+# --remove
+# Remove (rm -f) an existing <hook-name>, which must exist.
+test_hook () {
+ setup= &&
+ clobber= &&
+ disable= &&
+ remove= &&
+ indir= &&
+ while test $# != 0
+ do
+ case "$1" in
+ -C)
+ indir="$2" &&
+ shift
+ ;;
+ --setup)
+ setup=t
+ ;;
+ --clobber)
+ clobber=t
+ ;;
+ --disable)
+ disable=t
+ ;;
+ --remove)
+ remove=t
+ ;;
+ -*)
+ BUG "invalid argument: $1"
+ ;;
+ *)
+ break
+ ;;
+ esac &&
+ shift
+ done &&
+
+ git_dir=$(git -C "$indir" rev-parse --absolute-git-dir) &&
+ hook_dir="$git_dir/hooks" &&
+ hook_file="$hook_dir/$1" &&
+ if test -n "$disable$remove"
+ then
+ test_path_is_file "$hook_file" &&
+ if test -n "$disable"
+ then
+ chmod -x "$hook_file"
+ elif test -n "$remove"
+ then
+ rm -f "$hook_file"
+ fi &&
+ return 0
+ fi &&
+ if test -z "$clobber"
+ then
+ test_path_is_missing "$hook_file"
+ fi &&
+ if test -z "$setup$clobber"
+ then
+ test_when_finished "rm \"$hook_file\""
+ fi &&
+ write_script "$hook_file"
+}
+
# Use test_set_prereq to tell that a particular prerequisite is available.
# The prerequisite can later be checked for in two ways:
#
@@ -680,6 +756,17 @@
# Keep a list of missing prerequisites; restore
# the negative marker if necessary.
prerequisite=${negative_prereq:+!}$prerequisite
+
+ # Abort if this prereq was marked as required
+ if test -n "$GIT_TEST_REQUIRE_PREREQ"
+ then
+ case " $GIT_TEST_REQUIRE_PREREQ " in
+ *" $prerequisite "*)
+ BAIL_OUT "required prereq $prerequisite failed"
+ ;;
+ esac
+ fi
+
if test -z "$missing_prereq"
then
missing_prereq=$prerequisite
@@ -708,7 +795,7 @@
}
test_expect_failure () {
- test_start_
+ test_start_ "$@"
test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
test "$#" = 2 ||
BUG "not 2 or 3 parameters to test-expect-failure"
@@ -716,6 +803,7 @@
export test_prereq
if ! test_skip "$@"
then
+ test -n "$test_skip_test_preamble" ||
say >&3 "checking known breakage of $TEST_NUMBER.$test_count '$1': $2"
if test_run_ "$2" expecting_failure
then
@@ -728,7 +816,7 @@
}
test_expect_success () {
- test_start_
+ test_start_ "$@"
test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
test "$#" = 2 ||
BUG "not 2 or 3 parameters to test-expect-success"
@@ -736,6 +824,7 @@
export test_prereq
if ! test_skip "$@"
then
+ test -n "$test_skip_test_preamble" ||
say >&3 "expecting success of $TEST_NUMBER.$test_count '$1': $2"
if test_run_ "$2"
then
@@ -845,6 +934,16 @@
fi
}
+test_path_is_file_not_symlink () {
+ test "$#" -ne 1 && BUG "1 param"
+ test_path_is_file "$1" &&
+ if test -h "$1"
+ then
+ echo "$1 shouldn't be a symbolic link"
+ false
+ fi
+}
+
test_path_is_dir () {
test "$#" -ne 1 && BUG "1 param"
if ! test -d "$1"
@@ -854,6 +953,16 @@
fi
}
+test_path_is_dir_not_symlink () {
+ test "$#" -ne 1 && BUG "1 param"
+ test_path_is_dir "$1" &&
+ if test -h "$1"
+ then
+ echo "$1 shouldn't be a symbolic link"
+ false
+ fi
+}
+
test_path_exists () {
test "$#" -ne 1 && BUG "1 param"
if ! test -e "$1"
@@ -863,6 +972,15 @@
fi
}
+test_path_is_symlink () {
+ test "$#" -ne 1 && BUG "1 param"
+ if ! test -h "$1"
+ then
+ echo "Symbolic link $1 doesn't exist"
+ false
+ fi
+}
+
# Check if the directory exists and is empty as expected, barf otherwise.
test_dir_is_empty () {
test "$#" -ne 1 && BUG "1 param"
@@ -1666,6 +1784,16 @@
echo "${1%$basename}/$basename"
}
+# Parse oids from git ls-files --staged output
+test_parse_ls_files_stage_oids () {
+ awk '{print $2}' -
+}
+
+# Parse oids from git ls-tree output
+test_parse_ls_tree_oids () {
+ awk '{print $3}' -
+}
+
# Choose a port number based on the test script's number and store it in
# the given variable name, unless that variable already contains a number.
test_set_port () {
@@ -1795,3 +1923,36 @@
test_readlink () {
perl -le 'print readlink($_) for @ARGV' "$@"
}
+
+# Set mtime to a fixed "magic" timestamp in mid February 2009, before we
+# run an operation that may or may not touch the file. If the file was
+# touched, its timestamp will not accidentally have such an old timestamp,
+# as long as your filesystem clock is reasonably correct. To verify the
+# timestamp, follow up with test_is_magic_mtime.
+#
+# An optional increment to the magic timestamp may be specified as second
+# argument.
+test_set_magic_mtime () {
+ local inc=${2:-0} &&
+ local mtime=$((1234567890 + $inc)) &&
+ test-tool chmtime =$mtime "$1" &&
+ test_is_magic_mtime "$1" $inc
+}
+
+# Test whether the given file has the "magic" mtime set. This is meant to
+# be used in combination with test_set_magic_mtime.
+#
+# An optional increment to the magic timestamp may be specified as second
+# argument. Usually, this should be the same increment which was used for
+# the associated test_set_magic_mtime.
+test_is_magic_mtime () {
+ local inc=${2:-0} &&
+ local mtime=$((1234567890 + $inc)) &&
+ echo $mtime >.git/test-mtime-expect &&
+ test-tool chmtime --get "$1" >.git/test-mtime-actual &&
+ test_cmp .git/test-mtime-expect .git/test-mtime-actual
+ local ret=$?
+ rm -f .git/test-mtime-expect
+ rm -f .git/test-mtime-actual
+ return $ret
+}
diff --git a/t/test-lib-github-workflow-markup.sh b/t/test-lib-github-workflow-markup.sh
new file mode 100644
index 0000000..9c5339c
--- /dev/null
+++ b/t/test-lib-github-workflow-markup.sh
@@ -0,0 +1,56 @@
+# Library of functions to mark up test scripts' output suitable for
+# pretty-printing it in GitHub workflows.
+#
+# Copyright (c) 2022 Johannes Schindelin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/ .
+#
+# The idea is for `test-lib.sh` to source this file when run in GitHub
+# workflows; these functions will then override (empty) functions
+# that are are called at the appropriate times during the test runs.
+
+test_skip_test_preamble=t
+
+start_test_output () {
+ test -n "$GIT_TEST_TEE_OUTPUT_FILE" ||
+ die "--github-workflow-markup requires --verbose-log"
+ github_markup_output="${GIT_TEST_TEE_OUTPUT_FILE%.out}.markup"
+ >$github_markup_output
+ GIT_TEST_TEE_OFFSET=0
+}
+
+# No need to override start_test_case_output
+
+finalize_test_case_output () {
+ test_case_result=$1
+ shift
+ case "$test_case_result" in
+ failure)
+ echo >>$github_markup_output "::error::failed: $this_test.$test_count $1"
+ ;;
+ fixed)
+ echo >>$github_markup_output "::notice::fixed: $this_test.$test_count $1"
+ ;;
+ ok)
+ # Exit without printing the "ok" tests
+ return
+ ;;
+ esac
+ echo >>$github_markup_output "::group::$test_case_result: $this_test.$test_count $*"
+ test-tool >>$github_markup_output path-utils skip-n-bytes \
+ "$GIT_TEST_TEE_OUTPUT_FILE" $GIT_TEST_TEE_OFFSET
+ echo >>$github_markup_output "::endgroup::"
+}
+
+# No need to override finalize_test_output
diff --git a/t/test-lib-junit.sh b/t/test-lib-junit.sh
new file mode 100644
index 0000000..c959183
--- /dev/null
+++ b/t/test-lib-junit.sh
@@ -0,0 +1,132 @@
+# Library of functions to format test scripts' output in JUnit XML
+# format, to support Git's test suite result to be presented in an
+# easily digestible way on Azure Pipelines.
+#
+# Copyright (c) 2022 Johannes Schindelin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/ .
+#
+# The idea is for `test-lib.sh` to source this file when the user asks
+# for JUnit XML; these functions will then override (empty) functions
+# that are are called at the appropriate times during the test runs.
+
+start_test_output () {
+ junit_xml_dir="$TEST_OUTPUT_DIRECTORY/out"
+ mkdir -p "$junit_xml_dir"
+ junit_xml_base=${1##*/}
+ junit_xml_path="$junit_xml_dir/TEST-${junit_xml_base%.sh}.xml"
+ junit_attrs="name=\"${junit_xml_base%.sh}\""
+ junit_attrs="$junit_attrs timestamp=\"$(TZ=UTC \
+ date +%Y-%m-%dT%H:%M:%S)\""
+ write_junit_xml --truncate "<testsuites>" " <testsuite $junit_attrs>"
+ junit_suite_start=$(test-tool date getnanos)
+ if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
+ then
+ GIT_TEST_TEE_OFFSET=0
+ fi
+}
+
+start_test_case_output () {
+ junit_start=$(test-tool date getnanos)
+}
+
+finalize_test_case_output () {
+ test_case_result=$1
+ shift
+ case "$test_case_result" in
+ ok)
+ set "$*"
+ ;;
+ failure)
+ junit_insert="<failure message=\"not ok $test_count -"
+ junit_insert="$junit_insert $(xml_attr_encode --no-lf "$1")\">"
+ junit_insert="$junit_insert $(xml_attr_encode \
+ "$(if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
+ then
+ test-tool path-utils skip-n-bytes \
+ "$GIT_TEST_TEE_OUTPUT_FILE" $GIT_TEST_TEE_OFFSET
+ else
+ printf '%s\n' "$@" | sed 1d
+ fi)")"
+ junit_insert="$junit_insert</failure>"
+ if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
+ then
+ junit_insert="$junit_insert<system-err>$(xml_attr_encode \
+ "$(cat "$GIT_TEST_TEE_OUTPUT_FILE")")</system-err>"
+ fi
+ set "$1" " $junit_insert"
+ ;;
+ fixed)
+ set "$* (breakage fixed)"
+ ;;
+ broken)
+ set "$* (known breakage)"
+ ;;
+ skip)
+ message="$(xml_attr_encode --no-lf "$skipped_reason")"
+ set "$1" " <skipped message=\"$message\" />"
+ ;;
+ esac
+
+ junit_attrs="name=\"$(xml_attr_encode --no-lf "$this_test.$test_count $1")\""
+ shift
+ junit_attrs="$junit_attrs classname=\"$this_test\""
+ junit_attrs="$junit_attrs time=\"$(test-tool \
+ date getnanos $junit_start)\""
+ write_junit_xml "$(printf '%s\n' \
+ " <testcase $junit_attrs>" "$@" " </testcase>")"
+ junit_have_testcase=t
+}
+
+finalize_test_output () {
+ if test -n "$junit_xml_path"
+ then
+ test -n "$junit_have_testcase" || {
+ junit_start=$(test-tool date getnanos)
+ write_junit_xml_testcase "all tests skipped"
+ }
+
+ # adjust the overall time
+ junit_time=$(test-tool date getnanos $junit_suite_start)
+ sed -e "s/\(<testsuite.*\) time=\"[^\"]*\"/\1/" \
+ -e "s/<testsuite [^>]*/& time=\"$junit_time\"/" \
+ -e '/^ *<\/testsuite/d' \
+ <"$junit_xml_path" >"$junit_xml_path.new"
+ mv "$junit_xml_path.new" "$junit_xml_path"
+
+ write_junit_xml " </testsuite>" "</testsuites>"
+ write_junit_xml=
+ fi
+}
+
+write_junit_xml () {
+ case "$1" in
+ --truncate)
+ >"$junit_xml_path"
+ junit_have_testcase=
+ shift
+ ;;
+ esac
+ printf '%s\n' "$@" >>"$junit_xml_path"
+}
+
+xml_attr_encode () {
+ if test "x$1" = "x--no-lf"
+ then
+ shift
+ printf '%s' "$*" | test-tool xml-encode
+ else
+ printf '%s\n' "$@" | test-tool xml-encode
+ fi
+}
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 8361b5c..736c644 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -19,13 +19,20 @@
# t/ subdirectory and are run in 'trash directory' subdirectory.
if test -z "$TEST_DIRECTORY"
then
- # We allow tests to override this, in case they want to run tests
- # outside of t/, e.g. for running tests on the test library
- # itself.
- TEST_DIRECTORY=$(pwd)
-else
# ensure that TEST_DIRECTORY is an absolute path so that it
# is valid even if the current working directory is changed
+ TEST_DIRECTORY=$(pwd)
+else
+ # The TEST_DIRECTORY will always be the path to the "t"
+ # directory in the git.git checkout. This is overridden by
+ # e.g. t/lib-subtest.sh, but only because its $(pwd) is
+ # different. Those tests still set "$TEST_DIRECTORY" to the
+ # same path.
+ #
+ # See use of "$GIT_BUILD_DIR" and "$TEST_DIRECTORY" below for
+ # hard assumptions about "$GIT_BUILD_DIR/t" existing and being
+ # the "$TEST_DIRECTORY", and e.g. "$TEST_DIRECTORY/helper"
+ # needing to exist.
TEST_DIRECTORY=$(cd "$TEST_DIRECTORY" && pwd) || exit 1
fi
if test -z "$TEST_OUTPUT_DIRECTORY"
@@ -34,19 +41,42 @@
# elsewhere
TEST_OUTPUT_DIRECTORY=$TEST_DIRECTORY
fi
-GIT_BUILD_DIR="$TEST_DIRECTORY"/..
+GIT_BUILD_DIR="${TEST_DIRECTORY%/t}"
+if test "$TEST_DIRECTORY" = "$GIT_BUILD_DIR"
+then
+ echo "PANIC: Running in a $TEST_DIRECTORY that doesn't end in '/t'?" >&2
+ exit 1
+fi
+
+# Prepend a string to a VAR using an arbitrary ":" delimiter, not
+# adding the delimiter if VAR or VALUE is empty. I.e. a generalized:
+#
+# VAR=$1${VAR:+${1:+$2}$VAR}
+#
+# Usage (using ":" as the $2 delimiter):
+#
+# prepend_var VAR : VALUE
+prepend_var () {
+ eval "$1=$3\${$1:+${3:+$2}\$$1}"
+}
+
+# If [AL]SAN is in effect we want to abort so that we notice
+# problems. The GIT_SAN_OPTIONS variable can be used to set common
+# defaults shared between [AL]SAN_OPTIONS.
+prepend_var GIT_SAN_OPTIONS : abort_on_error=1
+prepend_var GIT_SAN_OPTIONS : strip_path_prefix=\"$GIT_BUILD_DIR/\"
# If we were built with ASAN, it may complain about leaks
# of program-lifetime variables. Disable it by default to lower
# the noise level. This needs to happen at the start of the script,
# before we even do our "did we build git yet" check (since we don't
# want that one to complain to stderr).
-: ${ASAN_OPTIONS=detect_leaks=0:abort_on_error=1}
+prepend_var ASAN_OPTIONS : $GIT_SAN_OPTIONS
+prepend_var ASAN_OPTIONS : detect_leaks=0
export ASAN_OPTIONS
-# If LSAN is in effect we _do_ want leak checking, but we still
-# want to abort so that we notice the problems.
-: ${LSAN_OPTIONS=abort_on_error=1}
+prepend_var LSAN_OPTIONS : $GIT_SAN_OPTIONS
+prepend_var LSAN_OPTIONS : fast_unwind_on_malloc=0
export LSAN_OPTIONS
if test ! -f "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
@@ -107,6 +137,12 @@
store_arg_to=$2
}
+# These functions can be overridden e.g. to output JUnit XML
+start_test_output () { :; }
+start_test_case_output () { :; }
+finalize_test_case_output () { :; }
+finalize_test_output () { :; }
+
parse_option () {
local opt="$1"
@@ -166,7 +202,10 @@
tee=t
;;
--write-junit-xml)
- write_junit_xml=t
+ . "$TEST_DIRECTORY/test-lib-junit.sh"
+ ;;
+ --github-workflow-markup)
+ . "$TEST_DIRECTORY/test-lib-github-workflow-markup.sh"
;;
--stress)
stress=t ;;
@@ -449,6 +488,8 @@
unset XDG_CACHE_HOME
unset XDG_CONFIG_HOME
unset GITPERLLIB
+unset GIT_TRACE2_PARENT_NAME
+unset GIT_TRACE2_PARENT_SID
TEST_AUTHOR_LOCALNAME=author
TEST_AUTHOR_DOMAIN=example.com
GIT_AUTHOR_EMAIL=${TEST_AUTHOR_LOCALNAME}@${TEST_AUTHOR_DOMAIN}
@@ -476,6 +517,13 @@
GIT_TRACE_BARE=1
export GIT_TRACE_BARE
+# Some tests scan the GIT_TRACE2_EVENT feed for events, but the
+# default depth is 2, which frequently causes issues when the
+# events are wrapped in new regions. Set it to a sufficiently
+# large depth to avoid custom changes in the test suite.
+GIT_TRACE2_EVENT_NESTING=100
+export GIT_TRACE2_EVENT_NESTING
+
# Use specific version of the index file format
if test -n "${GIT_TEST_INDEX_VERSION:+isset}"
then
@@ -489,9 +537,17 @@
export GIT_PERL_FATAL_WARNINGS
fi
-# Add libc MALLOC and MALLOC_PERTURB test
-# only if we are not executing the test with valgrind
+case $GIT_TEST_FSYNC in
+'')
+ GIT_TEST_FSYNC=0
+ export GIT_TEST_FSYNC
+ ;;
+esac
+
+# Add libc MALLOC and MALLOC_PERTURB test only if we are not executing
+# the test with valgrind and have not compiled with SANITIZE=address.
if test -n "$valgrind" ||
+ test -n "$SANITIZE_ADDRESS" ||
test -n "$TEST_NO_MALLOC_CHECK"
then
setup_malloc_check () {
@@ -502,11 +558,29 @@
}
else
setup_malloc_check () {
+ local g
+ local t
MALLOC_CHECK_=3 MALLOC_PERTURB_=165
export MALLOC_CHECK_ MALLOC_PERTURB_
+ if _GLIBC_VERSION=$(getconf GNU_LIBC_VERSION 2>/dev/null) &&
+ _GLIBC_VERSION=${_GLIBC_VERSION#"glibc "} &&
+ expr 2.34 \<= "$_GLIBC_VERSION" >/dev/null
+ then
+ g=
+ LD_PRELOAD="libc_malloc_debug.so.0"
+ for t in \
+ glibc.malloc.check=1 \
+ glibc.malloc.perturb=165
+ do
+ g="${g#:}:$t"
+ done
+ GLIBC_TUNABLES=$g
+ export LD_PRELOAD GLIBC_TUNABLES
+ fi
}
teardown_malloc_check () {
unset MALLOC_CHECK_ MALLOC_PERTURB_
+ unset LD_PRELOAD GLIBC_TUNABLES
}
fi
@@ -589,17 +663,42 @@
TERM=dumb
export TERM USER_TERM
-error () {
- say_color error "error: $*"
- finalize_junit_xml
+# What is written by tests to stdout and stderr is sent to different places
+# depending on the test mode (e.g. /dev/null in non-verbose mode, piped to tee
+# with --tee option, etc.). We save the original stdin to FD #6 and stdout and
+# stderr to #5 and #7, so that the test framework can use them (e.g. for
+# printing errors within the test framework) independently of the test mode.
+exec 5>&1
+exec 6<&0
+exec 7>&2
+
+_error_exit () {
+ finalize_test_output
GIT_EXIT_OK=t
exit 1
}
+error () {
+ say_color error "error: $*"
+ _error_exit
+}
+
BUG () {
error >&7 "bug in the test script: $*"
}
+BAIL_OUT () {
+ test $# -ne 1 && BUG "1 param"
+
+ # Do not change "Bail out! " string. It's part of TAP syntax:
+ # https://testanything.org/tap-specification.html
+ local bail_out="Bail out! "
+ local message="$1"
+
+ say_color >&5 error $bail_out "$message"
+ _error_exit
+}
+
say () {
say_color info "$*"
}
@@ -608,9 +707,7 @@
then
if test "$verbose" = t || test -n "$verbose_only"
then
- printf 'Bail out! %s\n' \
- 'verbose mode forbidden under TAP harness; try --verbose-log'
- exit 1
+ BAIL_OUT 'verbose mode forbidden under TAP harness; try --verbose-log'
fi
fi
@@ -623,9 +720,6 @@
exit 0
fi
-exec 5>&1
-exec 6<&0
-exec 7>&2
if test "$verbose_log" = "t"
then
exec 3>>"$GIT_TEST_TEE_OUTPUT_FILE" 4>&3
@@ -655,6 +749,8 @@
test_broken=0
test_success=0
+test_missing_prereq=
+
test_external_has_tap=0
die () {
@@ -687,58 +783,35 @@
# the test_expect_* functions instead.
test_ok_ () {
- if test -n "$write_junit_xml"
- then
- write_junit_xml_testcase "$*"
- fi
test_success=$(($test_success + 1))
say_color "" "ok $test_count - $@"
+ finalize_test_case_output ok "$@"
}
test_failure_ () {
- if test -n "$write_junit_xml"
- then
- junit_insert="<failure message=\"not ok $test_count -"
- junit_insert="$junit_insert $(xml_attr_encode "$1")\">"
- junit_insert="$junit_insert $(xml_attr_encode \
- "$(if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
- then
- test-tool path-utils skip-n-bytes \
- "$GIT_TEST_TEE_OUTPUT_FILE" $GIT_TEST_TEE_OFFSET
- else
- printf '%s\n' "$@" | sed 1d
- fi)")"
- junit_insert="$junit_insert</failure>"
- if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
- then
- junit_insert="$junit_insert<system-err>$(xml_attr_encode \
- "$(cat "$GIT_TEST_TEE_OUTPUT_FILE")")</system-err>"
- fi
- write_junit_xml_testcase "$1" " $junit_insert"
- fi
+ failure_label=$1
test_failure=$(($test_failure + 1))
say_color error "not ok $test_count - $1"
shift
printf '%s\n' "$*" | sed -e 's/^/# /'
- test "$immediate" = "" || { finalize_junit_xml; GIT_EXIT_OK=t; exit 1; }
+ if test -n "$immediate"
+ then
+ say_color error "1..$test_count"
+ _error_exit
+ fi
+ finalize_test_case_output failure "$failure_label" "$@"
}
test_known_broken_ok_ () {
- if test -n "$write_junit_xml"
- then
- write_junit_xml_testcase "$* (breakage fixed)"
- fi
test_fixed=$(($test_fixed+1))
say_color error "ok $test_count - $@ # TODO known breakage vanished"
+ finalize_test_case_output fixed "$@"
}
test_known_broken_failure_ () {
- if test -n "$write_junit_xml"
- then
- write_junit_xml_testcase "$* (known breakage)"
- fi
test_broken=$(($test_broken+1))
say_color warn "not ok $test_count - $@ # TODO known breakage"
+ finalize_test_case_output broken "$@"
}
test_debug () {
@@ -1013,10 +1086,7 @@
test_count=$(($test_count+1))
maybe_setup_verbose
maybe_setup_valgrind
- if test -n "$write_junit_xml"
- then
- junit_start=$(test-tool date getnanos)
- fi
+ start_test_case_output "$@"
}
test_finish_ () {
@@ -1055,19 +1125,22 @@
of_prereq=" of $test_prereq"
fi
skipped_reason="missing $missing_prereq${of_prereq}"
+
+ # Keep a list of all the missing prereq for result aggregation
+ if test -z "$missing_prereq"
+ then
+ test_missing_prereq=$missing_prereq
+ else
+ test_missing_prereq="$test_missing_prereq,$missing_prereq"
+ fi
fi
case "$to_skip" in
t)
- if test -n "$write_junit_xml"
- then
- message="$(xml_attr_encode "$skipped_reason")"
- write_junit_xml_testcase "$1" \
- " <skipped message=\"$message\" />"
- fi
say_color skip "ok $test_count # skip $1 ($skipped_reason)"
: true
+ finalize_test_case_output skip "$@"
;;
*)
false
@@ -1080,53 +1153,6 @@
:
}
-write_junit_xml () {
- case "$1" in
- --truncate)
- >"$junit_xml_path"
- junit_have_testcase=
- shift
- ;;
- esac
- printf '%s\n' "$@" >>"$junit_xml_path"
-}
-
-xml_attr_encode () {
- printf '%s\n' "$@" | test-tool xml-encode
-}
-
-write_junit_xml_testcase () {
- junit_attrs="name=\"$(xml_attr_encode "$this_test.$test_count $1")\""
- shift
- junit_attrs="$junit_attrs classname=\"$this_test\""
- junit_attrs="$junit_attrs time=\"$(test-tool \
- date getnanos $junit_start)\""
- write_junit_xml "$(printf '%s\n' \
- " <testcase $junit_attrs>" "$@" " </testcase>")"
- junit_have_testcase=t
-}
-
-finalize_junit_xml () {
- if test -n "$write_junit_xml" && test -n "$junit_xml_path"
- then
- test -n "$junit_have_testcase" || {
- junit_start=$(test-tool date getnanos)
- write_junit_xml_testcase "all tests skipped"
- }
-
- # adjust the overall time
- junit_time=$(test-tool date getnanos $junit_suite_start)
- sed -e "s/\(<testsuite.*\) time=\"[^\"]*\"/\1/" \
- -e "s/<testsuite [^>]*/& time=\"$junit_time\"/" \
- -e '/^ *<\/testsuite/d' \
- <"$junit_xml_path" >"$junit_xml_path.new"
- mv "$junit_xml_path.new" "$junit_xml_path"
-
- write_junit_xml " </testsuite>" "</testsuites>"
- write_junit_xml=
- fi
-}
-
test_atexit_cleanup=:
test_atexit_handler () {
# In a succeeding test script 'test_atexit_handler' is invoked
@@ -1149,7 +1175,7 @@
# removed, so the commands can access pidfiles and socket files.
test_atexit_handler
- finalize_junit_xml
+ finalize_test_output
if test -z "$HARNESS_ACTIVE"
then
@@ -1161,6 +1187,7 @@
fixed $test_fixed
broken $test_broken
failed $test_failure
+ missing_prereq $test_missing_prereq
EOF
fi
@@ -1398,7 +1425,7 @@
fi
elif test_bool_env GIT_TEST_PASSING_SANITIZE_LEAK false
then
- error "GIT_TEST_PASSING_SANITIZE_LEAK=true has no effect except when compiled with SANITIZE=leak"
+ BAIL_OUT "GIT_TEST_PASSING_SANITIZE_LEAK=true has no effect except when compiled with SANITIZE=leak"
fi
# Last-minute variable setup
@@ -1407,8 +1434,20 @@
GNUPGHOME="$HOME/gnupg-home-not-used"
export HOME GNUPGHOME USER_HOME
+# "rm -rf" existing trash directory, even if a previous run left it
+# with bad permissions.
+remove_trash_directory () {
+ dir="$1"
+ if ! rm -rf "$dir" 2>/dev/null
+ then
+ chmod -R u+rwx "$dir"
+ rm -rf "$dir"
+ fi
+ ! test -d "$dir"
+}
+
# Test repository
-rm -fr "$TRASH_DIRECTORY" || {
+remove_trash_directory "$TRASH_DIRECTORY" || {
GIT_EXIT_OK=t
echo >&5 "FATAL: Cannot prepare test area"
exit 1
@@ -1427,22 +1466,7 @@
# in subprocesses like git equals our $PWD (for pathname comparisons).
cd -P "$TRASH_DIRECTORY" || exit 1
-if test -n "$write_junit_xml"
-then
- junit_xml_dir="$TEST_OUTPUT_DIRECTORY/out"
- mkdir -p "$junit_xml_dir"
- junit_xml_base=${0##*/}
- junit_xml_path="$junit_xml_dir/TEST-${junit_xml_base%.sh}.xml"
- junit_attrs="name=\"${junit_xml_base%.sh}\""
- junit_attrs="$junit_attrs timestamp=\"$(TZ=UTC \
- date +%Y-%m-%dT%H:%M:%S)\""
- write_junit_xml --truncate "<testsuites>" " <testsuite $junit_attrs>"
- junit_suite_start=$(test-tool date getnanos)
- if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
- then
- GIT_TEST_TEE_OFFSET=0
- fi
-fi
+start_test_output "$0"
# Convenience
# A regexp to match 5 and 35 hexdigits
@@ -1555,6 +1579,7 @@
test -n "$USE_LIBPCRE2" && test_set_prereq LIBPCRE2
test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
test -n "$SANITIZE_LEAK" && test_set_prereq SANITIZE_LEAK
+test -n "$GIT_VALGRIND_ENABLED" && test_set_prereq VALGRIND
if test -z "$GIT_TEST_CHECK_CACHE_TREE"
then
@@ -1708,6 +1733,10 @@
sed -ne "s/^$1: //p"
}
+test_lazy_prereq SIZE_T_IS_64BIT '
+ test 8 -eq "$(build_option sizeof-size_t)"
+'
+
test_lazy_prereq LONG_IS_64BIT '
test 8 -le "$(build_option sizeof-long)"
'
@@ -1730,13 +1759,16 @@
esac
'
-test_lazy_prereq REBASE_P '
- test -z "$GIT_TEST_SKIP_REBASE_P"
-'
-
# Ensure that no test accidentally triggers a Git command
# that runs the actual maintenance scheduler, affecting a user's
# system permanently.
# Tests that verify the scheduler integration must set this locally
# to avoid errors.
GIT_TEST_MAINT_SCHEDULER="none:exit 1"
+
+# Does this platform support `git fsmonitor--daemon`
+#
+test_lazy_prereq FSMONITOR_DAEMON '
+ git version --build-options >output &&
+ grep "feature: fsmonitor--daemon" output
+'
diff --git a/tag.c b/tag.c
index 3e18a41..dfbcd7f 100644
--- a/tag.c
+++ b/tag.c
@@ -25,8 +25,9 @@ static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
return error("no signature found");
}
- ret = check_signature(payload.buf, payload.len, signature.buf,
- signature.len, &sigc);
+ sigc.payload_type = SIGNATURE_PAYLOAD_TAG;
+ sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
+ ret = check_signature(&sigc, signature.buf, signature.len);
if (!(flags & GPG_VERIFY_OMIT_STATUS))
print_signature_buffer(&sigc, flags);
diff --git a/tempfile.c b/tempfile.c
index 94aa18f..2024c82 100644
--- a/tempfile.c
+++ b/tempfile.c
@@ -56,6 +56,20 @@
static VOLATILE_LIST_HEAD(tempfile_list);
+static void remove_template_directory(struct tempfile *tempfile,
+ int in_signal_handler)
+{
+ if (tempfile->directorylen > 0 &&
+ tempfile->directorylen < tempfile->filename.len &&
+ tempfile->filename.buf[tempfile->directorylen] == '/') {
+ strbuf_setlen(&tempfile->filename, tempfile->directorylen);
+ if (in_signal_handler)
+ rmdir(tempfile->filename.buf);
+ else
+ rmdir_or_warn(tempfile->filename.buf);
+ }
+}
+
static void remove_tempfiles(int in_signal_handler)
{
pid_t me = getpid();
@@ -74,6 +88,7 @@ static void remove_tempfiles(int in_signal_handler)
unlink(p->filename.buf);
else
unlink_or_warn(p->filename.buf);
+ remove_template_directory(p, in_signal_handler);
p->active = 0;
}
@@ -100,6 +115,7 @@ static struct tempfile *new_tempfile(void)
tempfile->owner = 0;
INIT_LIST_HEAD(&tempfile->list);
strbuf_init(&tempfile->filename, 0);
+ tempfile->directorylen = 0;
return tempfile;
}
@@ -198,6 +214,52 @@ struct tempfile *mks_tempfile_tsm(const char *filename_template, int suffixlen,
return tempfile;
}
+struct tempfile *mks_tempfile_dt(const char *directory_template,
+ const char *filename)
+{
+ struct tempfile *tempfile;
+ const char *tmpdir;
+ struct strbuf sb = STRBUF_INIT;
+ int fd;
+ size_t directorylen;
+
+ if (!ends_with(directory_template, "XXXXXX")) {
+ errno = EINVAL;
+ return NULL;
+ }
+
+ tmpdir = getenv("TMPDIR");
+ if (!tmpdir)
+ tmpdir = "/tmp";
+
+ strbuf_addf(&sb, "%s/%s", tmpdir, directory_template);
+ directorylen = sb.len;
+ if (!mkdtemp(sb.buf)) {
+ int orig_errno = errno;
+ strbuf_release(&sb);
+ errno = orig_errno;
+ return NULL;
+ }
+
+ strbuf_addf(&sb, "/%s", filename);
+ fd = open(sb.buf, O_CREAT | O_EXCL | O_RDWR, 0600);
+ if (fd < 0) {
+ int orig_errno = errno;
+ strbuf_setlen(&sb, directorylen);
+ rmdir(sb.buf);
+ strbuf_release(&sb);
+ errno = orig_errno;
+ return NULL;
+ }
+
+ tempfile = new_tempfile();
+ strbuf_swap(&tempfile->filename, &sb);
+ tempfile->directorylen = directorylen;
+ tempfile->fd = fd;
+ activate_tempfile(tempfile);
+ return tempfile;
+}
+
struct tempfile *xmks_tempfile_m(const char *filename_template, int mode)
{
struct tempfile *tempfile;
@@ -316,6 +378,7 @@ void delete_tempfile(struct tempfile **tempfile_p)
close_tempfile_gently(tempfile);
unlink_or_warn(tempfile->filename.buf);
+ remove_template_directory(tempfile, 0);
deactivate_tempfile(tempfile);
*tempfile_p = NULL;
}
diff --git a/tempfile.h b/tempfile.h
index 4de3bc7..d7804a2 100644
--- a/tempfile.h
+++ b/tempfile.h
@@ -82,6 +82,7 @@ struct tempfile {
FILE *volatile fp;
volatile pid_t owner;
struct strbuf filename;
+ size_t directorylen;
};
/*
@@ -199,6 +200,18 @@ static inline struct tempfile *xmks_tempfile(const char *filename_template)
}
/*
+ * Attempt to create a temporary directory in $TMPDIR and to create and
+ * open a file in that new directory. Derive the directory name from the
+ * template in the manner of mkdtemp(). Arrange for directory and file
+ * to be deleted if the program exits before they are deleted
+ * explicitly. On success return a tempfile whose "filename" member
+ * contains the full path of the file and its "fd" member is open for
+ * writing the file. On error return NULL and set errno appropriately.
+ */
+struct tempfile *mks_tempfile_dt(const char *directory_template,
+ const char *filename);
+
+/*
* Associate a stdio stream with the temporary file (which must still
* be open). Return `NULL` (*without* deleting the file) on error. The
* stream is closed automatically when `close_tempfile_gently()` is called or
diff --git a/templates/Makefile b/templates/Makefile
index d22a71a..367ad00 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,9 +1,7 @@
+# Import tree-wide shared Makefile behavior and libraries
+include ../shared.mak
+
# make and install sample templates
-
-ifndef V
- QUIET = @
-endif
-
INSTALL ?= install
TAR ?= tar
RM ?= rm -f
diff --git a/tmp-objdir.c b/tmp-objdir.c
index b8d880e..adf6033 100644
--- a/tmp-objdir.c
+++ b/tmp-objdir.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "tmp-objdir.h"
+#include "chdir-notify.h"
#include "dir.h"
#include "sigchain.h"
#include "string-list.h"
@@ -11,6 +12,8 @@
struct tmp_objdir {
struct strbuf path;
struct strvec env;
+ struct object_directory *prev_odb;
+ int will_destroy;
};
/*
@@ -38,6 +41,9 @@ static int tmp_objdir_destroy_1(struct tmp_objdir *t, int on_signal)
if (t == the_tmp_objdir)
the_tmp_objdir = NULL;
+ if (!on_signal && t->prev_odb)
+ restore_primary_odb(t->prev_odb, t->path.buf);
+
/*
* This may use malloc via strbuf_grow(), but we should
* have pre-grown t->path sufficiently so that this
@@ -52,6 +58,7 @@ static int tmp_objdir_destroy_1(struct tmp_objdir *t, int on_signal)
*/
if (!on_signal)
tmp_objdir_free(t);
+
return err;
}
@@ -72,6 +79,11 @@ static void remove_tmp_objdir_on_signal(int signo)
raise(signo);
}
+void tmp_objdir_discard_objects(struct tmp_objdir *t)
+{
+ remove_dir_recursively(&t->path, REMOVE_DIR_KEEP_TOPLEVEL);
+}
+
/*
* These env_* functions are for setting up the child environment; the
* "replace" variant overrides the value of any existing variable with that
@@ -121,7 +133,7 @@ static int setup_tmp_objdir(const char *root)
return ret;
}
-struct tmp_objdir *tmp_objdir_create(void)
+struct tmp_objdir *tmp_objdir_create(const char *prefix)
{
static int installed_handlers;
struct tmp_objdir *t;
@@ -129,11 +141,16 @@ struct tmp_objdir *tmp_objdir_create(void)
if (the_tmp_objdir)
BUG("only one tmp_objdir can be used at a time");
- t = xmalloc(sizeof(*t));
+ t = xcalloc(1, sizeof(*t));
strbuf_init(&t->path, 0);
strvec_init(&t->env);
- strbuf_addf(&t->path, "%s/incoming-XXXXXX", get_object_directory());
+ /*
+ * Use a string starting with tmp_ so that the builtin/prune.c code
+ * can recognize any stale objdirs left behind by a crash and delete
+ * them.
+ */
+ strbuf_addf(&t->path, "%s/tmp_objdir-%s-XXXXXX", get_object_directory(), prefix);
/*
* Grow the strbuf beyond any filename we expect to be placed in it.
@@ -269,6 +286,13 @@ int tmp_objdir_migrate(struct tmp_objdir *t)
if (!t)
return 0;
+ if (t->prev_odb) {
+ if (the_repository->objects->odb->will_destroy)
+ BUG("migrating an ODB that was marked for destruction");
+ restore_primary_odb(t->prev_odb, t->path.buf);
+ t->prev_odb = NULL;
+ }
+
strbuf_addbuf(&src, &t->path);
strbuf_addstr(&dst, get_object_directory());
@@ -292,3 +316,33 @@ void tmp_objdir_add_as_alternate(const struct tmp_objdir *t)
{
add_to_alternates_memory(t->path.buf);
}
+
+void tmp_objdir_replace_primary_odb(struct tmp_objdir *t, int will_destroy)
+{
+ if (t->prev_odb)
+ BUG("the primary object database is already replaced");
+ t->prev_odb = set_temporary_primary_odb(t->path.buf, will_destroy);
+ t->will_destroy = will_destroy;
+}
+
+struct tmp_objdir *tmp_objdir_unapply_primary_odb(void)
+{
+ if (!the_tmp_objdir || !the_tmp_objdir->prev_odb)
+ return NULL;
+
+ restore_primary_odb(the_tmp_objdir->prev_odb, the_tmp_objdir->path.buf);
+ the_tmp_objdir->prev_odb = NULL;
+ return the_tmp_objdir;
+}
+
+void tmp_objdir_reapply_primary_odb(struct tmp_objdir *t, const char *old_cwd,
+ const char *new_cwd)
+{
+ char *path;
+
+ path = reparent_relative_path(old_cwd, new_cwd, t->path.buf);
+ strbuf_reset(&t->path);
+ strbuf_addstr(&t->path, path);
+ free(path);
+ tmp_objdir_replace_primary_odb(t, t->will_destroy);
+}
diff --git a/tmp-objdir.h b/tmp-objdir.h
index b1e45b4..76efc7e 100644
--- a/tmp-objdir.h
+++ b/tmp-objdir.h
@@ -10,7 +10,7 @@
*
* Example:
*
- * struct tmp_objdir *t = tmp_objdir_create();
+ * struct tmp_objdir *t = tmp_objdir_create("incoming");
* if (!run_command_v_opt_cd_env(cmd, 0, NULL, tmp_objdir_env(t)) &&
* !tmp_objdir_migrate(t))
* printf("success!\n");
@@ -22,9 +22,10 @@
struct tmp_objdir;
/*
- * Create a new temporary object directory; returns NULL on failure.
+ * Create a new temporary object directory with the specified prefix;
+ * returns NULL on failure.
*/
-struct tmp_objdir *tmp_objdir_create(void);
+struct tmp_objdir *tmp_objdir_create(const char *prefix);
/*
* Return a list of environment strings, suitable for use with
@@ -46,9 +47,37 @@ int tmp_objdir_migrate(struct tmp_objdir *);
int tmp_objdir_destroy(struct tmp_objdir *);
/*
+ * Remove all objects from the temporary object directory, while leaving it
+ * around so more objects can be added.
+ */
+void tmp_objdir_discard_objects(struct tmp_objdir *);
+
+/*
* Add the temporary object directory as an alternate object store in the
* current process.
*/
void tmp_objdir_add_as_alternate(const struct tmp_objdir *);
+/*
+ * Replaces the writable object store in the current process with the temporary
+ * object directory and makes the former main object store an alternate.
+ * If will_destroy is nonzero, the object directory may not be migrated.
+ */
+void tmp_objdir_replace_primary_odb(struct tmp_objdir *, int will_destroy);
+
+/*
+ * If the primary object database was replaced by a temporary object directory,
+ * restore it to its original value while keeping the directory contents around.
+ * Returns NULL if the primary object database was not replaced.
+ */
+struct tmp_objdir *tmp_objdir_unapply_primary_odb(void);
+
+/*
+ * Reapplies the former primary temporary object database, after potentially
+ * changing its relative path.
+ */
+void tmp_objdir_reapply_primary_odb(struct tmp_objdir *, const char *old_cwd,
+ const char *new_cwd);
+
+
#endif /* TMP_OBJDIR_H */
diff --git a/trace.c b/trace.c
index f726686..794a087 100644
--- a/trace.c
+++ b/trace.c
@@ -108,16 +108,11 @@ static int prepare_trace_line(const char *file, int line,
gettimeofday(&tv, NULL);
secs = tv.tv_sec;
localtime_r(&secs, &tm);
- strbuf_addf(buf, "%02d:%02d:%02d.%06ld ", tm.tm_hour, tm.tm_min,
- tm.tm_sec, (long) tv.tv_usec);
-
-#ifdef HAVE_VARIADIC_MACROS
- /* print file:line */
- strbuf_addf(buf, "%s:%d ", file, line);
+ strbuf_addf(buf, "%02d:%02d:%02d.%06ld %s:%d", tm.tm_hour, tm.tm_min,
+ tm.tm_sec, (long) tv.tv_usec, file, line);
/* align trace output (column 40 catches most files names in git) */
while (buf->len < 40)
strbuf_addch(buf, ' ');
-#endif
return 1;
}
@@ -229,74 +224,6 @@ static void trace_performance_vprintf_fl(const char *file, int line,
strbuf_release(&buf);
}
-#ifndef HAVE_VARIADIC_MACROS
-
-void trace_printf(const char *format, ...)
-{
- va_list ap;
- va_start(ap, format);
- trace_vprintf_fl(NULL, 0, &trace_default_key, format, ap);
- va_end(ap);
-}
-
-void trace_printf_key(struct trace_key *key, const char *format, ...)
-{
- va_list ap;
- va_start(ap, format);
- trace_vprintf_fl(NULL, 0, key, format, ap);
- va_end(ap);
-}
-
-void trace_argv_printf(const char **argv, const char *format, ...)
-{
- va_list ap;
- va_start(ap, format);
- trace_argv_vprintf_fl(NULL, 0, argv, format, ap);
- va_end(ap);
-}
-
-void trace_strbuf(struct trace_key *key, const struct strbuf *data)
-{
- trace_strbuf_fl(NULL, 0, key, data);
-}
-
-void trace_performance(uint64_t nanos, const char *format, ...)
-{
- va_list ap;
- va_start(ap, format);
- trace_performance_vprintf_fl(NULL, 0, nanos, format, ap);
- va_end(ap);
-}
-
-void trace_performance_since(uint64_t start, const char *format, ...)
-{
- va_list ap;
- va_start(ap, format);
- trace_performance_vprintf_fl(NULL, 0, getnanotime() - start,
- format, ap);
- va_end(ap);
-}
-
-void trace_performance_leave(const char *format, ...)
-{
- va_list ap;
- uint64_t since;
-
- if (perf_indent)
- perf_indent--;
-
- if (!format) /* Allow callers to leave without tracing anything */
- return;
-
- since = perf_start_times[perf_indent];
- va_start(ap, format);
- trace_performance_vprintf_fl(NULL, 0, getnanotime() - since,
- format, ap);
- va_end(ap);
-}
-
-#else
-
void trace_printf_key_fl(const char *file, int line, struct trace_key *key,
const char *format, ...)
{
@@ -342,9 +269,6 @@ void trace_performance_leave_fl(const char *file, int line,
va_end(ap);
}
-#endif /* HAVE_VARIADIC_MACROS */
-
-
static const char *quote_crnl(const char *path)
{
static struct strbuf new_path = STRBUF_INIT;
diff --git a/trace.h b/trace.h
index e259840..4e771f8 100644
--- a/trace.h
+++ b/trace.h
@@ -126,71 +126,6 @@ void trace_command_performance(const char **argv);
void trace_verbatim(struct trace_key *key, const void *buf, unsigned len);
uint64_t trace_performance_enter(void);
-#ifndef HAVE_VARIADIC_MACROS
-
-/**
- * Prints a formatted message, similar to printf.
- */
-__attribute__((format (printf, 1, 2)))
-void trace_printf(const char *format, ...);
-
-__attribute__((format (printf, 2, 3)))
-void trace_printf_key(struct trace_key *key, const char *format, ...);
-
-/**
- * Prints a formatted message, followed by a quoted list of arguments.
- */
-__attribute__((format (printf, 2, 3)))
-void trace_argv_printf(const char **argv, const char *format, ...);
-
-/**
- * Prints the strbuf, without additional formatting (i.e. doesn't
- * choke on `%` or even `\0`).
- */
-void trace_strbuf(struct trace_key *key, const struct strbuf *data);
-
-/**
- * Prints elapsed time (in nanoseconds) if GIT_TRACE_PERFORMANCE is enabled.
- *
- * Example:
- * ------------
- * uint64_t t = 0;
- * for (;;) {
- * // ignore
- * t -= getnanotime();
- * // code section to measure
- * t += getnanotime();
- * // ignore
- * }
- * trace_performance(t, "frotz");
- * ------------
- */
-__attribute__((format (printf, 2, 3)))
-void trace_performance(uint64_t nanos, const char *format, ...);
-
-/**
- * Prints elapsed time since 'start' if GIT_TRACE_PERFORMANCE is enabled.
- *
- * Example:
- * ------------
- * uint64_t start = getnanotime();
- * // code section to measure
- * trace_performance_since(start, "foobar");
- * ------------
- */
-__attribute__((format (printf, 2, 3)))
-void trace_performance_since(uint64_t start, const char *format, ...);
-
-__attribute__((format (printf, 1, 2)))
-void trace_performance_leave(const char *format, ...);
-
-#else
-
-/*
- * Macros to add file:line - see above for C-style declarations of how these
- * should be used.
- */
-
/*
* TRACE_CONTEXT may be set to __FUNCTION__ if the compiler supports it. The
* default is __FILE__, as it is consistent with assert(), and static function
@@ -204,7 +139,10 @@ void trace_performance_leave(const char *format, ...);
# define TRACE_CONTEXT __FILE__
#endif
-/*
+/**
+ * Macros to add the file:line of the calling code, instead of that of
+ * the trace function itself.
+ *
* Note: with C99 variadic macros, __VA_ARGS__ must include the last fixed
* parameter ('format' in this case). Otherwise, a call without variable
* arguments will have a surplus ','. E.g.:
@@ -220,6 +158,16 @@ void trace_performance_leave(const char *format, ...);
* comma, but this is non-standard.
*/
+/**
+ * trace_printf(), accepts "const char *format, ...".
+ *
+ * Prints a formatted message, similar to printf.
+ */
+#define trace_printf(...) trace_printf_key(&trace_default_key, __VA_ARGS__)
+
+/**
+ * trace_printf_key(), accepts "struct trace_key *key, const char *format, ...".
+ */
#define trace_printf_key(key, ...) \
do { \
if (trace_pass_fl(key)) \
@@ -227,8 +175,11 @@ void trace_performance_leave(const char *format, ...);
__VA_ARGS__); \
} while (0)
-#define trace_printf(...) trace_printf_key(&trace_default_key, __VA_ARGS__)
-
+/**
+ * trace_argv_printf(), accepts "struct trace_key *key, const char *format, ...)".
+ *
+ * Prints a formatted message, followed by a quoted list of arguments.
+ */
#define trace_argv_printf(argv, ...) \
do { \
if (trace_pass_fl(&trace_default_key)) \
@@ -236,12 +187,36 @@ void trace_performance_leave(const char *format, ...);
argv, __VA_ARGS__); \
} while (0)
+/**
+ * trace_strbuf(), accepts "struct trace_key *key, const struct strbuf *data".
+ *
+ * Prints the strbuf, without additional formatting (i.e. doesn't
+ * choke on `%` or even `\0`).
+ */
#define trace_strbuf(key, data) \
do { \
if (trace_pass_fl(key)) \
trace_strbuf_fl(TRACE_CONTEXT, __LINE__, key, data);\
} while (0)
+/**
+ * trace_performance(), accepts "uint64_t nanos, const char *format, ...".
+ *
+ * Prints elapsed time (in nanoseconds) if GIT_TRACE_PERFORMANCE is enabled.
+ *
+ * Example:
+ * ------------
+ * uint64_t t = 0;
+ * for (;;) {
+ * // ignore
+ * t -= getnanotime();
+ * // code section to measure
+ * t += getnanotime();
+ * // ignore
+ * }
+ * trace_performance(t, "frotz");
+ * ------------
+ */
#define trace_performance(nanos, ...) \
do { \
if (trace_pass_fl(&trace_perf_key)) \
@@ -249,6 +224,18 @@ void trace_performance_leave(const char *format, ...);
__VA_ARGS__); \
} while (0)
+/**
+ * trace_performance_since(), accepts "uint64_t start, const char *format, ...".
+ *
+ * Prints elapsed time since 'start' if GIT_TRACE_PERFORMANCE is enabled.
+ *
+ * Example:
+ * ------------
+ * uint64_t start = getnanotime();
+ * // code section to measure
+ * trace_performance_since(start, "foobar");
+ * ------------
+ */
#define trace_performance_since(start, ...) \
do { \
if (trace_pass_fl(&trace_perf_key)) \
@@ -257,6 +244,9 @@ void trace_performance_leave(const char *format, ...);
__VA_ARGS__); \
} while (0)
+/**
+ * trace_performance_leave(), accepts "const char *format, ...".
+ */
#define trace_performance_leave(...) \
do { \
if (trace_pass_fl(&trace_perf_key)) \
@@ -285,6 +275,4 @@ static inline int trace_pass_fl(struct trace_key *key)
return key->fd || !key->initialized;
}
-#endif /* HAVE_VARIADIC_MACROS */
-
#endif /* TRACE_H */
diff --git a/trace2.c b/trace2.c
index b9b154a..e01cf77 100644
--- a/trace2.c
+++ b/trace2.c
@@ -214,6 +214,7 @@ int trace2_cmd_exit_fl(const char *file, int line, int code)
if (!trace2_enabled)
return code;
+ trace_git_fsync_stats();
trace2_collect_process_info(TRACE2_PROCESS_INFO_EXIT);
tr2main_exit_code = code;
@@ -394,6 +395,37 @@ void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd,
us_elapsed_child);
}
+void trace2_child_ready_fl(const char *file, int line,
+ struct child_process *cmd,
+ const char *ready)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+ uint64_t us_elapsed_child;
+
+ if (!trace2_enabled)
+ return;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ if (cmd->trace2_child_us_start)
+ us_elapsed_child = us_now - cmd->trace2_child_us_start;
+ else
+ us_elapsed_child = 0;
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_child_ready_fl)
+ tgt_j->pfn_child_ready_fl(file, line,
+ us_elapsed_absolute,
+ cmd->trace2_child_id,
+ cmd->pid,
+ ready,
+ us_elapsed_child);
+}
+
int trace2_exec_fl(const char *file, int line, const char *exe,
const char **argv)
{
@@ -610,20 +642,6 @@ void trace2_region_enter_printf_fl(const char *file, int line,
va_end(ap);
}
-#ifndef HAVE_VARIADIC_MACROS
-void trace2_region_enter_printf(const char *category, const char *label,
- const struct repository *repo, const char *fmt,
- ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- trace2_region_enter_printf_va_fl(NULL, 0, category, label, repo, fmt,
- ap);
- va_end(ap);
-}
-#endif
-
void trace2_region_leave_printf_va_fl(const char *file, int line,
const char *category, const char *label,
const struct repository *repo,
@@ -686,20 +704,6 @@ void trace2_region_leave_printf_fl(const char *file, int line,
va_end(ap);
}
-#ifndef HAVE_VARIADIC_MACROS
-void trace2_region_leave_printf(const char *category, const char *label,
- const struct repository *repo, const char *fmt,
- ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- trace2_region_leave_printf_va_fl(NULL, 0, category, label, repo, fmt,
- ap);
- va_end(ap);
-}
-#endif
-
void trace2_data_string_fl(const char *file, int line, const char *category,
const struct repository *repo, const char *key,
const char *value)
@@ -795,17 +799,6 @@ void trace2_printf_fl(const char *file, int line, const char *fmt, ...)
va_end(ap);
}
-#ifndef HAVE_VARIADIC_MACROS
-void trace2_printf(const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- trace2_printf_va_fl(NULL, 0, fmt, ap);
- va_end(ap);
-}
-#endif
-
const char *trace2_session_id(void)
{
return tr2_sid_get();
diff --git a/trace2.h b/trace2.h
index 2f450ab..1b109f5 100644
--- a/trace2.h
+++ b/trace2.h
@@ -254,6 +254,31 @@ void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd,
trace2_child_exit_fl(__FILE__, __LINE__, (cmd), (code))
/**
+ * Emits a "child_ready" message containing the "child-id" and a flag
+ * indicating whether the child was considered "ready" when we
+ * released it.
+ *
+ * This function should be called after starting a daemon process in
+ * the background (and after giving it sufficient time to boot
+ * up) to indicate that we no longer control or own it.
+ *
+ * The "ready" argument should contain one of { "ready", "timeout",
+ * "error" } to indicate the state of the running daemon when we
+ * released it.
+ *
+ * If the daemon process fails to start or it exits or is terminated
+ * while we are still waiting for it, the caller should emit a
+ * regular "child_exit" to report the normal process exit information.
+ *
+ */
+void trace2_child_ready_fl(const char *file, int line,
+ struct child_process *cmd,
+ const char *ready);
+
+#define trace2_child_ready(cmd, ready) \
+ trace2_child_ready_fl(__FILE__, __LINE__, (cmd), (ready))
+
+/**
* Emit an 'exec' event prior to calling one of exec(), execv(),
* execvp(), and etc. On Unix-derived systems, this will be the
* last event emitted for the current process, unless the exec
@@ -372,18 +397,9 @@ void trace2_region_enter_printf_fl(const char *file, int line,
const struct repository *repo,
const char *fmt, ...);
-#ifdef HAVE_VARIADIC_MACROS
#define trace2_region_enter_printf(category, label, repo, ...) \
trace2_region_enter_printf_fl(__FILE__, __LINE__, (category), (label), \
(repo), __VA_ARGS__)
-#else
-/* clang-format off */
-__attribute__((format (region_enter_printf, 4, 5)))
-void trace2_region_enter_printf(const char *category, const char *label,
- const struct repository *repo, const char *fmt,
- ...);
-/* clang-format on */
-#endif
/**
* Emit a 'region_leave' event for <category>.<label> with optional
@@ -417,18 +433,9 @@ void trace2_region_leave_printf_fl(const char *file, int line,
const struct repository *repo,
const char *fmt, ...);
-#ifdef HAVE_VARIADIC_MACROS
#define trace2_region_leave_printf(category, label, repo, ...) \
trace2_region_leave_printf_fl(__FILE__, __LINE__, (category), (label), \
(repo), __VA_ARGS__)
-#else
-/* clang-format off */
-__attribute__((format (region_leave_printf, 4, 5)))
-void trace2_region_leave_printf(const char *category, const char *label,
- const struct repository *repo, const char *fmt,
- ...);
-/* clang-format on */
-#endif
/**
* Emit a key-value pair 'data' event of the form <category>.<key> = <value>.
@@ -481,14 +488,7 @@ void trace2_printf_va_fl(const char *file, int line, const char *fmt,
void trace2_printf_fl(const char *file, int line, const char *fmt, ...);
-#ifdef HAVE_VARIADIC_MACROS
#define trace2_printf(...) trace2_printf_fl(__FILE__, __LINE__, __VA_ARGS__)
-#else
-/* clang-format off */
-__attribute__((format (printf, 1, 2)))
-void trace2_printf(const char *fmt, ...);
-/* clang-format on */
-#endif
/*
* Optional platform-specific code to dump information about the
diff --git a/trace2/tr2_dst.c b/trace2/tr2_dst.c
index bda283e..8a21dd2 100644
--- a/trace2/tr2_dst.c
+++ b/trace2/tr2_dst.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "sigchain.h"
#include "trace2/tr2_dst.h"
#include "trace2/tr2_sid.h"
#include "trace2/tr2_sysenv.h"
@@ -360,6 +361,7 @@ int tr2_dst_trace_want(struct tr2_dst *dst)
void tr2_dst_write_line(struct tr2_dst *dst, struct strbuf *buf_line)
{
int fd = tr2_dst_get_trace_fd(dst);
+ ssize_t bytes;
strbuf_complete_line(buf_line); /* ensure final NL on buffer */
@@ -378,12 +380,15 @@ void tr2_dst_write_line(struct tr2_dst *dst, struct strbuf *buf_line)
*
* If we get an IO error, just close the trace dst.
*/
- if (write(fd, buf_line->buf, buf_line->len) >= 0)
+ sigchain_push(SIGPIPE, SIG_IGN);
+ bytes = write(fd, buf_line->buf, buf_line->len);
+ sigchain_pop(SIGPIPE);
+ if (bytes >= 0)
return;
+ tr2_dst_trace_disable(dst);
if (tr2_dst_want_warning())
warning("unable to write trace to '%s': %s",
tr2_sysenv_display_name(dst->sysenv_var),
strerror(errno));
- tr2_dst_trace_disable(dst);
}
diff --git a/trace2/tr2_tgt.h b/trace2/tr2_tgt.h
index 1f66fd6..65f94e1 100644
--- a/trace2/tr2_tgt.h
+++ b/trace2/tr2_tgt.h
@@ -45,6 +45,10 @@ typedef void(tr2_tgt_evt_child_exit_fl_t)(const char *file, int line,
uint64_t us_elapsed_absolute, int cid,
int pid, int code,
uint64_t us_elapsed_child);
+typedef void(tr2_tgt_evt_child_ready_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ int cid, int pid, const char *ready,
+ uint64_t us_elapsed_child);
typedef void(tr2_tgt_evt_thread_start_fl_t)(const char *file, int line,
uint64_t us_elapsed_absolute);
@@ -116,6 +120,7 @@ struct tr2_tgt {
tr2_tgt_evt_alias_fl_t *pfn_alias_fl;
tr2_tgt_evt_child_start_fl_t *pfn_child_start_fl;
tr2_tgt_evt_child_exit_fl_t *pfn_child_exit_fl;
+ tr2_tgt_evt_child_ready_fl_t *pfn_child_ready_fl;
tr2_tgt_evt_thread_start_fl_t *pfn_thread_start_fl;
tr2_tgt_evt_thread_exit_fl_t *pfn_thread_exit_fl;
tr2_tgt_evt_exec_fl_t *pfn_exec_fl;
diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c
index 578a9a5..c5c8cfb 100644
--- a/trace2/tr2_tgt_event.c
+++ b/trace2/tr2_tgt_event.c
@@ -10,7 +10,9 @@
#include "trace2/tr2_tgt.h"
#include "trace2/tr2_tls.h"
-static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0, 0 };
+static struct tr2_dst tr2dst_event = {
+ .sysenv_var = TR2_SYSENV_EVENT,
+};
/*
* The version number of the JSON data generated by the EVENT target in this
@@ -20,7 +22,7 @@ static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0, 0 };
* a new field to an existing event, do not require an increment to the EVENT
* format version.
*/
-#define TR2_EVENT_VERSION "2"
+#define TR2_EVENT_VERSION "3"
/*
* Region nesting limit for messages written to the event target.
@@ -354,7 +356,7 @@ static void fn_child_start_fl(const char *file, int line,
jw_object_inline_begin_array(&jw, "argv");
if (cmd->git_cmd)
jw_array_string(&jw, "git");
- jw_array_argv(&jw, cmd->argv);
+ jw_array_argv(&jw, cmd->args.v);
jw_end(&jw);
jw_end(&jw);
@@ -383,6 +385,27 @@ static void fn_child_exit_fl(const char *file, int line,
jw_release(&jw);
}
+static void fn_child_ready_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, int cid, int pid,
+ const char *ready, uint64_t us_elapsed_child)
+{
+ const char *event_name = "child_ready";
+ struct json_writer jw = JSON_WRITER_INIT;
+ double t_rel = (double)us_elapsed_child / 1000000.0;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_intmax(&jw, "child_id", cid);
+ jw_object_intmax(&jw, "pid", pid);
+ jw_object_string(&jw, "ready", ready);
+ jw_object_double(&jw, "t_rel", 6, t_rel);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+
+ jw_release(&jw);
+}
+
static void fn_thread_start_fl(const char *file, int line,
uint64_t us_elapsed_absolute)
{
@@ -592,33 +615,34 @@ static void fn_data_json_fl(const char *file, int line,
}
struct tr2_tgt tr2_tgt_event = {
- &tr2dst_event,
+ .pdst = &tr2dst_event,
- fn_init,
- fn_term,
+ .pfn_init = fn_init,
+ .pfn_term = fn_term,
- fn_version_fl,
- fn_start_fl,
- fn_exit_fl,
- fn_signal,
- fn_atexit,
- fn_error_va_fl,
- fn_command_path_fl,
- fn_command_ancestry_fl,
- fn_command_name_fl,
- fn_command_mode_fl,
- fn_alias_fl,
- fn_child_start_fl,
- fn_child_exit_fl,
- fn_thread_start_fl,
- fn_thread_exit_fl,
- fn_exec_fl,
- fn_exec_result_fl,
- fn_param_fl,
- fn_repo_fl,
- fn_region_enter_printf_va_fl,
- fn_region_leave_printf_va_fl,
- fn_data_fl,
- fn_data_json_fl,
- NULL, /* printf */
+ .pfn_version_fl = fn_version_fl,
+ .pfn_start_fl = fn_start_fl,
+ .pfn_exit_fl = fn_exit_fl,
+ .pfn_signal = fn_signal,
+ .pfn_atexit = fn_atexit,
+ .pfn_error_va_fl = fn_error_va_fl,
+ .pfn_command_path_fl = fn_command_path_fl,
+ .pfn_command_ancestry_fl = fn_command_ancestry_fl,
+ .pfn_command_name_fl = fn_command_name_fl,
+ .pfn_command_mode_fl = fn_command_mode_fl,
+ .pfn_alias_fl = fn_alias_fl,
+ .pfn_child_start_fl = fn_child_start_fl,
+ .pfn_child_exit_fl = fn_child_exit_fl,
+ .pfn_child_ready_fl = fn_child_ready_fl,
+ .pfn_thread_start_fl = fn_thread_start_fl,
+ .pfn_thread_exit_fl = fn_thread_exit_fl,
+ .pfn_exec_fl = fn_exec_fl,
+ .pfn_exec_result_fl = fn_exec_result_fl,
+ .pfn_param_fl = fn_param_fl,
+ .pfn_repo_fl = fn_repo_fl,
+ .pfn_region_enter_printf_va_fl = fn_region_enter_printf_va_fl,
+ .pfn_region_leave_printf_va_fl = fn_region_leave_printf_va_fl,
+ .pfn_data_fl = fn_data_fl,
+ .pfn_data_json_fl = fn_data_json_fl,
+ .pfn_printf_va_fl = NULL,
};
diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
index a5751c8..c42fbad 100644
--- a/trace2/tr2_tgt_normal.c
+++ b/trace2/tr2_tgt_normal.c
@@ -9,7 +9,9 @@
#include "trace2/tr2_tgt.h"
#include "trace2/tr2_tls.h"
-static struct tr2_dst tr2dst_normal = { TR2_SYSENV_NORMAL, 0, 0, 0, 0 };
+static struct tr2_dst tr2dst_normal = {
+ .sysenv_var = TR2_SYSENV_NORMAL,
+};
/*
* Use the TR2_SYSENV_NORMAL_BRIEF setting to omit the "<time> <file>:<line>"
@@ -232,7 +234,7 @@ static void fn_child_start_fl(const char *file, int line,
strbuf_addch(&buf_payload, ' ');
if (cmd->git_cmd)
strbuf_addstr(&buf_payload, "git ");
- sq_append_quote_argv_pretty(&buf_payload, cmd->argv);
+ sq_append_quote_argv_pretty(&buf_payload, cmd->args.v);
normal_io_write_fl(file, line, &buf_payload);
strbuf_release(&buf_payload);
@@ -251,6 +253,19 @@ static void fn_child_exit_fl(const char *file, int line,
strbuf_release(&buf_payload);
}
+static void fn_child_ready_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, int cid, int pid,
+ const char *ready, uint64_t us_elapsed_child)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+ double elapsed = (double)us_elapsed_child / 1000000.0;
+
+ strbuf_addf(&buf_payload, "child_ready[%d] pid:%d ready:%s elapsed:%.6f",
+ cid, pid, ready, elapsed);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
int exec_id, const char *exe, const char **argv)
{
@@ -312,33 +327,34 @@ static void fn_printf_va_fl(const char *file, int line,
}
struct tr2_tgt tr2_tgt_normal = {
- &tr2dst_normal,
+ .pdst = &tr2dst_normal,
- fn_init,
- fn_term,
+ .pfn_init = fn_init,
+ .pfn_term = fn_term,
- fn_version_fl,
- fn_start_fl,
- fn_exit_fl,
- fn_signal,
- fn_atexit,
- fn_error_va_fl,
- fn_command_path_fl,
- fn_command_ancestry_fl,
- fn_command_name_fl,
- fn_command_mode_fl,
- fn_alias_fl,
- fn_child_start_fl,
- fn_child_exit_fl,
- NULL, /* thread_start */
- NULL, /* thread_exit */
- fn_exec_fl,
- fn_exec_result_fl,
- fn_param_fl,
- fn_repo_fl,
- NULL, /* region_enter */
- NULL, /* region_leave */
- NULL, /* data */
- NULL, /* data_json */
- fn_printf_va_fl,
+ .pfn_version_fl = fn_version_fl,
+ .pfn_start_fl = fn_start_fl,
+ .pfn_exit_fl = fn_exit_fl,
+ .pfn_signal = fn_signal,
+ .pfn_atexit = fn_atexit,
+ .pfn_error_va_fl = fn_error_va_fl,
+ .pfn_command_path_fl = fn_command_path_fl,
+ .pfn_command_ancestry_fl = fn_command_ancestry_fl,
+ .pfn_command_name_fl = fn_command_name_fl,
+ .pfn_command_mode_fl = fn_command_mode_fl,
+ .pfn_alias_fl = fn_alias_fl,
+ .pfn_child_start_fl = fn_child_start_fl,
+ .pfn_child_exit_fl = fn_child_exit_fl,
+ .pfn_child_ready_fl = fn_child_ready_fl,
+ .pfn_thread_start_fl = NULL,
+ .pfn_thread_exit_fl = NULL,
+ .pfn_exec_fl = fn_exec_fl,
+ .pfn_exec_result_fl = fn_exec_result_fl,
+ .pfn_param_fl = fn_param_fl,
+ .pfn_repo_fl = fn_repo_fl,
+ .pfn_region_enter_printf_va_fl = NULL,
+ .pfn_region_leave_printf_va_fl = NULL,
+ .pfn_data_fl = NULL,
+ .pfn_data_json_fl = NULL,
+ .pfn_printf_va_fl = fn_printf_va_fl,
};
diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c
index af4d65a..a1eff8b 100644
--- a/trace2/tr2_tgt_perf.c
+++ b/trace2/tr2_tgt_perf.c
@@ -11,7 +11,9 @@
#include "trace2/tr2_tgt.h"
#include "trace2/tr2_tls.h"
-static struct tr2_dst tr2dst_perf = { TR2_SYSENV_PERF, 0, 0, 0, 0 };
+static struct tr2_dst tr2dst_perf = {
+ .sysenv_var = TR2_SYSENV_PERF,
+};
/*
* Use TR2_SYSENV_PERF_BRIEF to omit the "<time> <file>:<line>"
@@ -335,10 +337,10 @@ static void fn_child_start_fl(const char *file, int line,
strbuf_addstr(&buf_payload, " argv:[");
if (cmd->git_cmd) {
strbuf_addstr(&buf_payload, "git");
- if (cmd->argv[0])
+ if (cmd->args.nr)
strbuf_addch(&buf_payload, ' ');
}
- sq_append_quote_argv_pretty(&buf_payload, cmd->argv);
+ sq_append_quote_argv_pretty(&buf_payload, cmd->args.v);
strbuf_addch(&buf_payload, ']');
perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
@@ -360,6 +362,20 @@ static void fn_child_exit_fl(const char *file, int line,
strbuf_release(&buf_payload);
}
+static void fn_child_ready_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, int cid, int pid,
+ const char *ready, uint64_t us_elapsed_child)
+{
+ const char *event_name = "child_ready";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "[ch%d] pid:%d ready:%s", cid, pid, ready);
+
+ perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
+ &us_elapsed_child, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
static void fn_thread_start_fl(const char *file, int line,
uint64_t us_elapsed_absolute)
{
@@ -535,33 +551,34 @@ static void fn_printf_va_fl(const char *file, int line,
}
struct tr2_tgt tr2_tgt_perf = {
- &tr2dst_perf,
+ .pdst = &tr2dst_perf,
- fn_init,
- fn_term,
+ .pfn_init = fn_init,
+ .pfn_term = fn_term,
- fn_version_fl,
- fn_start_fl,
- fn_exit_fl,
- fn_signal,
- fn_atexit,
- fn_error_va_fl,
- fn_command_path_fl,
- fn_command_ancestry_fl,
- fn_command_name_fl,
- fn_command_mode_fl,
- fn_alias_fl,
- fn_child_start_fl,
- fn_child_exit_fl,
- fn_thread_start_fl,
- fn_thread_exit_fl,
- fn_exec_fl,
- fn_exec_result_fl,
- fn_param_fl,
- fn_repo_fl,
- fn_region_enter_printf_va_fl,
- fn_region_leave_printf_va_fl,
- fn_data_fl,
- fn_data_json_fl,
- fn_printf_va_fl,
+ .pfn_version_fl = fn_version_fl,
+ .pfn_start_fl = fn_start_fl,
+ .pfn_exit_fl = fn_exit_fl,
+ .pfn_signal = fn_signal,
+ .pfn_atexit = fn_atexit,
+ .pfn_error_va_fl = fn_error_va_fl,
+ .pfn_command_path_fl = fn_command_path_fl,
+ .pfn_command_ancestry_fl = fn_command_ancestry_fl,
+ .pfn_command_name_fl = fn_command_name_fl,
+ .pfn_command_mode_fl = fn_command_mode_fl,
+ .pfn_alias_fl = fn_alias_fl,
+ .pfn_child_start_fl = fn_child_start_fl,
+ .pfn_child_exit_fl = fn_child_exit_fl,
+ .pfn_child_ready_fl = fn_child_ready_fl,
+ .pfn_thread_start_fl = fn_thread_start_fl,
+ .pfn_thread_exit_fl = fn_thread_exit_fl,
+ .pfn_exec_fl = fn_exec_fl,
+ .pfn_exec_result_fl = fn_exec_result_fl,
+ .pfn_param_fl = fn_param_fl,
+ .pfn_repo_fl = fn_repo_fl,
+ .pfn_region_enter_printf_va_fl = fn_region_enter_printf_va_fl,
+ .pfn_region_leave_printf_va_fl = fn_region_leave_printf_va_fl,
+ .pfn_data_fl = fn_data_fl,
+ .pfn_data_json_fl = fn_data_json_fl,
+ .pfn_printf_va_fl = fn_printf_va_fl,
};
diff --git a/trailer.c b/trailer.c
index 7c7cb61..d419c20 100644
--- a/trailer.c
+++ b/trailer.c
@@ -236,7 +236,7 @@ static char *apply_command(struct conf_info *conf, const char *arg)
strbuf_replace(&cmd, TRAILER_ARG_STRING, arg);
strvec_push(&cp.args, cmd.buf);
}
- cp.env = local_repo_env;
+ strvec_pushv(&cp.env, (const char **)local_repo_env);
cp.no_stdin = 1;
cp.use_shell = 1;
@@ -1029,7 +1029,7 @@ static FILE *create_in_place_tempfile(const char *file)
/* Create temporary file in the same directory as the original */
tail = strrchr(file, '/');
- if (tail != NULL)
+ if (tail)
strbuf_add(&filename_template, file, tail - file + 1);
strbuf_addstr(&filename_template, "git-interpret-trailers-XXXXXX");
diff --git a/transport-helper.c b/transport-helper.c
index e8dbdd1..322c722 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -135,7 +135,7 @@ static struct child_process *get_helper(struct transport *transport)
helper->silent_exec_failure = 1;
if (have_git_dir())
- strvec_pushf(&helper->env_array, "%s=%s",
+ strvec_pushf(&helper->env, "%s=%s",
GIT_DIR_ENVIRONMENT, get_git_dir());
helper->trace2_child_class = helper->args.v[0]; /* "remote-<name>" */
@@ -715,6 +715,9 @@ static int fetch_refs(struct transport *transport,
if (data->transport_options.update_shallow)
set_helper_option(transport, "update-shallow", "true");
+ if (data->transport_options.refetch)
+ set_helper_option(transport, "refetch", "true");
+
if (data->transport_options.filter_options.choice) {
const char *spec = expand_list_objects_filter_spec(
&data->transport_options.filter_options);
@@ -845,6 +848,10 @@ static int push_update_ref_status(struct strbuf *buf,
forced = 1;
FREE_AND_NULL(msg);
}
+ else if (!strcmp(msg, "expecting report")) {
+ status = REF_STATUS_EXPECTING_REPORT;
+ FREE_AND_NULL(msg);
+ }
}
if (state->hint)
diff --git a/transport.c b/transport.c
index b37664b..52db7a3 100644
--- a/transport.c
+++ b/transport.c
@@ -1,7 +1,7 @@
#include "cache.h"
#include "config.h"
#include "transport.h"
-#include "run-command.h"
+#include "hook.h"
#include "pkt-line.h"
#include "fetch-pack.h"
#include "remote.h"
@@ -125,6 +125,21 @@ struct bundle_transport_data {
unsigned get_refs_from_bundle_called : 1;
};
+static void get_refs_from_bundle_inner(struct transport *transport)
+{
+ struct bundle_transport_data *data = transport->data;
+
+ data->get_refs_from_bundle_called = 1;
+
+ if (data->fd > 0)
+ close(data->fd);
+ data->fd = read_bundle_header(transport->url, &data->header);
+ if (data->fd < 0)
+ die(_("could not read bundle '%s'"), transport->url);
+
+ transport->hash_algo = data->header.hash_algo;
+}
+
static struct ref *get_refs_from_bundle(struct transport *transport,
int for_push,
struct transport_ls_refs_options *transport_options)
@@ -136,15 +151,7 @@ static struct ref *get_refs_from_bundle(struct transport *transport,
if (for_push)
return NULL;
- data->get_refs_from_bundle_called = 1;
-
- if (data->fd > 0)
- close(data->fd);
- data->fd = read_bundle_header(transport->url, &data->header);
- if (data->fd < 0)
- die(_("could not read bundle '%s'"), transport->url);
-
- transport->hash_algo = data->header.hash_algo;
+ get_refs_from_bundle_inner(transport);
for (i = 0; i < data->header.references.nr; i++) {
struct string_list_item *e = data->header.references.items + i;
@@ -169,7 +176,7 @@ static int fetch_refs_from_bundle(struct transport *transport,
strvec_push(&extra_index_pack_args, "-v");
if (!data->get_refs_from_bundle_called)
- get_refs_from_bundle(transport, 0, NULL);
+ get_refs_from_bundle_inner(transport);
ret = unbundle(the_repository, &data->header, data->fd,
&extra_index_pack_args);
transport->hash_algo = data->header.hash_algo;
@@ -243,6 +250,9 @@ static int set_git_option(struct git_transport_options *opts,
list_objects_filter_die_if_populated(&opts->filter_options);
parse_list_objects_filter(&opts->filter_options, value);
return 0;
+ } else if (!strcmp(name, TRANS_OPT_REFETCH)) {
+ opts->refetch = !!value;
+ return 0;
} else if (!strcmp(name, TRANS_OPT_REJECT_SHALLOW)) {
opts->reject_shallow = !!value;
return 0;
@@ -377,6 +387,7 @@ static int fetch_refs_via_pack(struct transport *transport,
args.update_shallow = data->options.update_shallow;
args.from_promisor = data->options.from_promisor;
args.filter_options = data->options.filter_options;
+ args.refetch = data->options.refetch;
args.stateless_rpc = transport->stateless_rpc;
args.server_options = transport->server_options;
args.negotiation_tips = data->options.negotiation_tips;
@@ -427,7 +438,7 @@ static int fetch_refs_via_pack(struct transport *transport,
args.self_contained_and_connected;
data->options.connectivity_checked = args.connectivity_checked;
- if (refs == NULL)
+ if (!refs)
ret = -1;
if (report_unmatched_refs(to_fetch, nr_heads))
ret = -1;
@@ -1204,16 +1215,15 @@ static int run_pre_push_hook(struct transport *transport,
struct ref *r;
struct child_process proc = CHILD_PROCESS_INIT;
struct strbuf buf;
- const char *argv[4];
+ const char *hook_path = find_hook("pre-push");
- if (!(argv[0] = find_hook("pre-push")))
+ if (!hook_path)
return 0;
- argv[1] = transport->remote->name;
- argv[2] = transport->url;
- argv[3] = NULL;
+ strvec_push(&proc.args, hook_path);
+ strvec_push(&proc.args, transport->remote->name);
+ strvec_push(&proc.args, transport->url);
- proc.argv = argv;
proc.in = -1;
proc.trace2_hook_name = "pre-push";
@@ -1266,146 +1276,152 @@ int transport_push(struct repository *r,
struct refspec *rs, int flags,
unsigned int *reject_reasons)
{
+ struct ref *remote_refs = NULL;
+ struct ref *local_refs = NULL;
+ int match_flags = MATCH_REFS_NONE;
+ int verbose = (transport->verbose > 0);
+ int quiet = (transport->verbose < 0);
+ int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
+ int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
+ int push_ret, err;
+ int ret = -1;
+ struct transport_ls_refs_options transport_options =
+ TRANSPORT_LS_REFS_OPTIONS_INIT;
+
*reject_reasons = 0;
if (transport_color_config() < 0)
- return -1;
+ goto done;
- if (transport->vtable->push_refs) {
- struct ref *remote_refs;
- struct ref *local_refs = get_local_heads();
- int match_flags = MATCH_REFS_NONE;
- int verbose = (transport->verbose > 0);
- int quiet = (transport->verbose < 0);
- int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
- int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
- int push_ret, ret, err;
- struct transport_ls_refs_options transport_options =
- TRANSPORT_LS_REFS_OPTIONS_INIT;
+ if (!transport->vtable->push_refs)
+ goto done;
- if (check_push_refs(local_refs, rs) < 0)
- return -1;
+ local_refs = get_local_heads();
- refspec_ref_prefixes(rs, &transport_options.ref_prefixes);
+ if (check_push_refs(local_refs, rs) < 0)
+ goto done;
- trace2_region_enter("transport_push", "get_refs_list", r);
- remote_refs = transport->vtable->get_refs_list(transport, 1,
- &transport_options);
- trace2_region_leave("transport_push", "get_refs_list", r);
+ refspec_ref_prefixes(rs, &transport_options.ref_prefixes);
- strvec_clear(&transport_options.ref_prefixes);
+ trace2_region_enter("transport_push", "get_refs_list", r);
+ remote_refs = transport->vtable->get_refs_list(transport, 1,
+ &transport_options);
+ trace2_region_leave("transport_push", "get_refs_list", r);
- if (flags & TRANSPORT_PUSH_ALL)
- match_flags |= MATCH_REFS_ALL;
- if (flags & TRANSPORT_PUSH_MIRROR)
- match_flags |= MATCH_REFS_MIRROR;
- if (flags & TRANSPORT_PUSH_PRUNE)
- match_flags |= MATCH_REFS_PRUNE;
- if (flags & TRANSPORT_PUSH_FOLLOW_TAGS)
- match_flags |= MATCH_REFS_FOLLOW_TAGS;
+ transport_ls_refs_options_release(&transport_options);
- if (match_push_refs(local_refs, &remote_refs, rs, match_flags))
- return -1;
+ if (flags & TRANSPORT_PUSH_ALL)
+ match_flags |= MATCH_REFS_ALL;
+ if (flags & TRANSPORT_PUSH_MIRROR)
+ match_flags |= MATCH_REFS_MIRROR;
+ if (flags & TRANSPORT_PUSH_PRUNE)
+ match_flags |= MATCH_REFS_PRUNE;
+ if (flags & TRANSPORT_PUSH_FOLLOW_TAGS)
+ match_flags |= MATCH_REFS_FOLLOW_TAGS;
- if (transport->smart_options &&
- transport->smart_options->cas &&
- !is_empty_cas(transport->smart_options->cas))
- apply_push_cas(transport->smart_options->cas,
- transport->remote, remote_refs);
+ if (match_push_refs(local_refs, &remote_refs, rs, match_flags))
+ goto done;
- set_ref_status_for_push(remote_refs,
- flags & TRANSPORT_PUSH_MIRROR,
- flags & TRANSPORT_PUSH_FORCE);
+ if (transport->smart_options &&
+ transport->smart_options->cas &&
+ !is_empty_cas(transport->smart_options->cas))
+ apply_push_cas(transport->smart_options->cas,
+ transport->remote, remote_refs);
- if (!(flags & TRANSPORT_PUSH_NO_HOOK))
- if (run_pre_push_hook(transport, remote_refs))
- return -1;
+ set_ref_status_for_push(remote_refs,
+ flags & TRANSPORT_PUSH_MIRROR,
+ flags & TRANSPORT_PUSH_FORCE);
- if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
- TRANSPORT_RECURSE_SUBMODULES_ONLY)) &&
- !is_bare_repository()) {
- struct ref *ref = remote_refs;
- struct oid_array commits = OID_ARRAY_INIT;
+ if (!(flags & TRANSPORT_PUSH_NO_HOOK))
+ if (run_pre_push_hook(transport, remote_refs))
+ goto done;
- trace2_region_enter("transport_push", "push_submodules", r);
- for (; ref; ref = ref->next)
- if (!is_null_oid(&ref->new_oid))
- oid_array_append(&commits,
- &ref->new_oid);
+ if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
+ TRANSPORT_RECURSE_SUBMODULES_ONLY)) &&
+ !is_bare_repository()) {
+ struct ref *ref = remote_refs;
+ struct oid_array commits = OID_ARRAY_INIT;
- if (!push_unpushed_submodules(r,
- &commits,
- transport->remote,
- rs,
- transport->push_options,
- pretend)) {
- oid_array_clear(&commits);
- trace2_region_leave("transport_push", "push_submodules", r);
- die(_("failed to push all needed submodules"));
- }
+ trace2_region_enter("transport_push", "push_submodules", r);
+ for (; ref; ref = ref->next)
+ if (!is_null_oid(&ref->new_oid))
+ oid_array_append(&commits,
+ &ref->new_oid);
+
+ if (!push_unpushed_submodules(r,
+ &commits,
+ transport->remote,
+ rs,
+ transport->push_options,
+ pretend)) {
oid_array_clear(&commits);
trace2_region_leave("transport_push", "push_submodules", r);
+ die(_("failed to push all needed submodules"));
}
+ oid_array_clear(&commits);
+ trace2_region_leave("transport_push", "push_submodules", r);
+ }
- if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) ||
- ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
- TRANSPORT_RECURSE_SUBMODULES_ONLY)) &&
- !pretend)) && !is_bare_repository()) {
- struct ref *ref = remote_refs;
- struct string_list needs_pushing = STRING_LIST_INIT_DUP;
- struct oid_array commits = OID_ARRAY_INIT;
+ if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) ||
+ ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
+ TRANSPORT_RECURSE_SUBMODULES_ONLY)) &&
+ !pretend)) && !is_bare_repository()) {
+ struct ref *ref = remote_refs;
+ struct string_list needs_pushing = STRING_LIST_INIT_DUP;
+ struct oid_array commits = OID_ARRAY_INIT;
- trace2_region_enter("transport_push", "check_submodules", r);
- for (; ref; ref = ref->next)
- if (!is_null_oid(&ref->new_oid))
- oid_array_append(&commits,
- &ref->new_oid);
+ trace2_region_enter("transport_push", "check_submodules", r);
+ for (; ref; ref = ref->next)
+ if (!is_null_oid(&ref->new_oid))
+ oid_array_append(&commits,
+ &ref->new_oid);
- if (find_unpushed_submodules(r,
- &commits,
- transport->remote->name,
- &needs_pushing)) {
- oid_array_clear(&commits);
- trace2_region_leave("transport_push", "check_submodules", r);
- die_with_unpushed_submodules(&needs_pushing);
- }
- string_list_clear(&needs_pushing, 0);
+ if (find_unpushed_submodules(r,
+ &commits,
+ transport->remote->name,
+ &needs_pushing)) {
oid_array_clear(&commits);
trace2_region_leave("transport_push", "check_submodules", r);
+ die_with_unpushed_submodules(&needs_pushing);
}
-
- if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) {
- trace2_region_enter("transport_push", "push_refs", r);
- push_ret = transport->vtable->push_refs(transport, remote_refs, flags);
- trace2_region_leave("transport_push", "push_refs", r);
- } else
- push_ret = 0;
- err = push_had_errors(remote_refs);
- ret = push_ret | err;
-
- if (!quiet || err)
- transport_print_push_status(transport->url, remote_refs,
- verbose | porcelain, porcelain,
- reject_reasons);
-
- if (flags & TRANSPORT_PUSH_SET_UPSTREAM)
- set_upstreams(transport, remote_refs, pretend);
-
- if (!(flags & (TRANSPORT_PUSH_DRY_RUN |
- TRANSPORT_RECURSE_SUBMODULES_ONLY))) {
- struct ref *ref;
- for (ref = remote_refs; ref; ref = ref->next)
- transport_update_tracking_ref(transport->remote, ref, verbose);
- }
-
- if (porcelain && !push_ret)
- puts("Done");
- else if (!quiet && !ret && !transport_refs_pushed(remote_refs))
- fprintf(stderr, "Everything up-to-date\n");
-
- return ret;
+ string_list_clear(&needs_pushing, 0);
+ oid_array_clear(&commits);
+ trace2_region_leave("transport_push", "check_submodules", r);
}
- return 1;
+
+ if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) {
+ trace2_region_enter("transport_push", "push_refs", r);
+ push_ret = transport->vtable->push_refs(transport, remote_refs, flags);
+ trace2_region_leave("transport_push", "push_refs", r);
+ } else
+ push_ret = 0;
+ err = push_had_errors(remote_refs);
+ ret = push_ret | err;
+
+ if (!quiet || err)
+ transport_print_push_status(transport->url, remote_refs,
+ verbose | porcelain, porcelain,
+ reject_reasons);
+
+ if (flags & TRANSPORT_PUSH_SET_UPSTREAM)
+ set_upstreams(transport, remote_refs, pretend);
+
+ if (!(flags & (TRANSPORT_PUSH_DRY_RUN |
+ TRANSPORT_RECURSE_SUBMODULES_ONLY))) {
+ struct ref *ref;
+ for (ref = remote_refs; ref; ref = ref->next)
+ transport_update_tracking_ref(transport->remote, ref, verbose);
+ }
+
+ if (porcelain && !push_ret)
+ puts("Done");
+ else if (!quiet && !ret && !transport_refs_pushed(remote_refs))
+ fprintf(stderr, "Everything up-to-date\n");
+
+done:
+ free_refs(local_refs);
+ free_refs(remote_refs);
+ return ret;
}
const struct ref *transport_get_remote_refs(struct transport *transport,
@@ -1421,6 +1437,12 @@ const struct ref *transport_get_remote_refs(struct transport *transport,
return transport->remote_refs;
}
+void transport_ls_refs_options_release(struct transport_ls_refs_options *opts)
+{
+ strvec_clear(&opts->ref_prefixes);
+ free((char *)opts->unborn_head_target);
+}
+
int transport_fetch_refs(struct transport *transport, struct ref *refs)
{
int rc;
@@ -1457,13 +1479,18 @@ int transport_fetch_refs(struct transport *transport, struct ref *refs)
return rc;
}
-void transport_unlock_pack(struct transport *transport)
+void transport_unlock_pack(struct transport *transport, unsigned int flags)
{
+ int in_signal_handler = !!(flags & TRANSPORT_UNLOCK_PACK_IN_SIGNAL_HANDLER);
int i;
for (i = 0; i < transport->pack_lockfiles.nr; i++)
- unlink_or_warn(transport->pack_lockfiles.items[i].string);
- string_list_clear(&transport->pack_lockfiles, 0);
+ if (in_signal_handler)
+ unlink(transport->pack_lockfiles.items[i].string);
+ else
+ unlink_or_warn(transport->pack_lockfiles.items[i].string);
+ if (!in_signal_handler)
+ string_list_clear(&transport->pack_lockfiles, 0);
}
int transport_connect(struct transport *transport, const char *name,
diff --git a/transport.h b/transport.h
index 8bb4c8b..b5bf7b3 100644
--- a/transport.h
+++ b/transport.h
@@ -16,6 +16,7 @@ struct git_transport_options {
unsigned update_shallow : 1;
unsigned reject_shallow : 1;
unsigned deepen_relative : 1;
+ unsigned refetch : 1;
/* see documentation of corresponding flag in fetch-pack.h */
unsigned from_promisor : 1;
@@ -144,6 +145,7 @@ struct transport {
#define TRANSPORT_PUSH_OPTIONS (1<<14)
#define TRANSPORT_RECURSE_SUBMODULES_ONLY (1<<15)
#define TRANSPORT_PUSH_FORCE_IF_INCLUDES (1<<16)
+#define TRANSPORT_PUSH_AUTO_UPSTREAM (1<<17)
int transport_summary_width(const struct ref *refs);
@@ -216,6 +218,9 @@ void transport_check_allowed(const char *type);
/* Filter objects for partial clone and fetch */
#define TRANS_OPT_LIST_OBJECTS_FILTER "filter"
+/* Refetch all objects without negotiating */
+#define TRANS_OPT_REFETCH "refetch"
+
/* Request atomic (all-or-nothing) updates when pushing */
#define TRANS_OPT_ATOMIC "atomic"
@@ -257,15 +262,19 @@ struct transport_ls_refs_options {
/*
* If unborn_head_target is not NULL, and the remote reports HEAD as
* pointing to an unborn branch, transport_get_remote_refs() stores the
- * unborn branch in unborn_head_target. It should be freed by the
- * caller.
+ * unborn branch in unborn_head_target.
*/
- char *unborn_head_target;
+ const char *unborn_head_target;
};
#define TRANSPORT_LS_REFS_OPTIONS_INIT { \
.ref_prefixes = STRVEC_INIT, \
}
+/**
+ * Release the "struct transport_ls_refs_options".
+ */
+void transport_ls_refs_options_release(struct transport_ls_refs_options *opts);
+
/*
* Retrieve refs from a remote.
*/
@@ -279,7 +288,19 @@ const struct ref *transport_get_remote_refs(struct transport *transport,
*/
const struct git_hash_algo *transport_get_hash_algo(struct transport *transport);
int transport_fetch_refs(struct transport *transport, struct ref *refs);
-void transport_unlock_pack(struct transport *transport);
+
+/*
+ * If this flag is set, unlocking will avoid to call non-async-signal-safe
+ * functions. This will necessarily leave behind some data structures which
+ * cannot be cleaned up.
+ */
+#define TRANSPORT_UNLOCK_PACK_IN_SIGNAL_HANDLER (1 << 0)
+
+/*
+ * Unlock all packfiles locked by the transport.
+ */
+void transport_unlock_pack(struct transport *transport, unsigned int flags);
+
int transport_disconnect(struct transport *transport);
char *transport_anonymize_url(const char *url);
void transport_take_over(struct transport *transport,
diff --git a/tree-diff.c b/tree-diff.c
index 437c98a..69031d7 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -603,8 +603,7 @@ static void try_to_follow_renames(const struct object_id *old_oid,
* about dry-run mode and returns wildcard info.
*/
if (opt->pathspec.has_wildcard)
- die("BUG:%s:%d: wildcards are not supported",
- __FILE__, __LINE__);
+ BUG("wildcards are not supported");
#endif
/* Remove the file creation entry from the diff queue, and remember it */
diff --git a/tree-walk.c b/tree-walk.c
index 3a94959..506234b 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -89,7 +89,7 @@ void *fill_tree_descriptor(struct repository *r,
void *buf = NULL;
if (oid) {
- buf = read_object_with_reference(r, oid, tree_type, &size, NULL);
+ buf = read_object_with_reference(r, oid, OBJ_TREE, &size, NULL);
if (!buf)
die("unable to read tree %s", oid_to_hex(oid));
}
@@ -605,7 +605,7 @@ int get_tree_entry(struct repository *r,
unsigned long size;
struct object_id root;
- tree = read_object_with_reference(r, tree_oid, tree_type, &size, &root);
+ tree = read_object_with_reference(r, tree_oid, OBJ_TREE, &size, &root);
if (!tree)
return -1;
@@ -677,7 +677,7 @@ enum get_oid_result get_tree_entry_follow_symlinks(struct repository *r,
unsigned long size;
tree = read_object_with_reference(r,
¤t_tree_oid,
- tree_type, &size,
+ OBJ_TREE, &size,
&root);
if (!tree)
goto done;
diff --git a/unpack-trees.c b/unpack-trees.c
index 8ea0a54..7d73f62 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -11,6 +11,7 @@
#include "refs.h"
#include "attr.h"
#include "split-index.h"
+#include "sparse-index.h"
#include "submodule.h"
#include "submodule-config.h"
#include "fsmonitor.h"
@@ -18,6 +19,7 @@
#include "promisor-remote.h"
#include "entry.h"
#include "parallel-checkout.h"
+#include "sparse-index.h"
/*
* Error messages expected by scripts out of plumbing commands such as
@@ -36,6 +38,9 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = {
/* ERROR_NOT_UPTODATE_DIR */
"Updating '%s' would lose untracked files in it",
+ /* ERROR_CWD_IN_THE_WAY */
+ "Refusing to remove '%s' since it is the current working directory.",
+
/* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
"Untracked working tree file '%s' would be overwritten by merge.",
@@ -131,6 +136,9 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
msgs[ERROR_NOT_UPTODATE_DIR] =
_("Updating the following directories would lose untracked files in them:\n%s");
+ msgs[ERROR_CWD_IN_THE_WAY] =
+ _("Refusing to remove the current working directory:\n%s");
+
if (!strcmp(cmd, "checkout"))
msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
? _("The following untracked working tree files would be removed by checkout:\n%%s"
@@ -589,13 +597,6 @@ static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o)
{
ce->ce_flags |= CE_UNPACKED;
- /*
- * If this is a sparse directory, don't advance cache_bottom.
- * That will be advanced later using the cache-tree data.
- */
- if (S_ISSPARSEDIR(ce->ce_mode))
- return;
-
if (o->cache_bottom < o->src_index->cache_nr &&
o->src_index->cache[o->cache_bottom] == ce) {
int bottom = o->cache_bottom;
@@ -1231,7 +1232,9 @@ static int find_cache_pos(struct traverse_info *info,
/*
* Given a sparse directory entry 'ce', compare ce->name to
- * info->name + '/' + p->path + '/' if info->name is non-empty.
+ * info->traverse_path + p->path + '/' if info->traverse_path
+ * is non-empty.
+ *
* Compare ce->name to p->path + '/' otherwise. Note that
* ce->name must end in a trailing '/' because it is a sparse
* directory entry.
@@ -1243,11 +1246,11 @@ static int sparse_dir_matches_path(const struct cache_entry *ce,
assert(S_ISSPARSEDIR(ce->ce_mode));
assert(ce->name[ce->ce_namelen - 1] == '/');
- if (info->namelen)
- return ce->ce_namelen == info->namelen + p->pathlen + 2 &&
- ce->name[info->namelen] == '/' &&
- !strncmp(ce->name, info->name, info->namelen) &&
- !strncmp(ce->name + info->namelen + 1, p->path, p->pathlen);
+ if (info->pathlen)
+ return ce->ce_namelen == info->pathlen + p->pathlen + 1 &&
+ ce->name[info->pathlen - 1] == '/' &&
+ !strncmp(ce->name, info->traverse_path, info->pathlen) &&
+ !strncmp(ce->name + info->pathlen, p->path, p->pathlen);
return ce->ce_namelen == p->pathlen + 1 &&
!strncmp(ce->name, p->path, p->pathlen);
}
@@ -1345,6 +1348,42 @@ static int is_sparse_directory_entry(struct cache_entry *ce,
return sparse_dir_matches_path(ce, info, name);
}
+static int unpack_sparse_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
+{
+ struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
+ struct unpack_trees_options *o = info->data;
+ int ret;
+
+ assert(o->merge);
+
+ /*
+ * Unlike in 'unpack_callback', where src[0] is derived from the index when
+ * merging, src[0] is a transient cache entry derived from the first tree
+ * provided. Create the temporary entry as if it came from a non-sparse index.
+ */
+ if (!is_null_oid(&names[0].oid)) {
+ src[0] = create_ce_entry(info, &names[0], 0,
+ &o->result, 1,
+ dirmask & (1ul << 0));
+ src[0]->ce_flags |= (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
+ }
+
+ /*
+ * 'unpack_single_entry' assumes that src[0] is derived directly from
+ * the index, rather than from an entry in 'names'. This is *not* true when
+ * merging a sparse directory, in which case names[0] is the "index" source
+ * entry. To match the expectations of 'unpack_single_entry', shift past the
+ * "index" tree (i.e., names[0]) and adjust 'names', 'n', 'mask', and
+ * 'dirmask' accordingly.
+ */
+ ret = unpack_single_entry(n - 1, mask >> 1, dirmask >> 1, src, names + 1, info);
+
+ if (src[0])
+ discard_cache_entry(src[0]);
+
+ return ret >= 0 ? mask : -1;
+}
+
/*
* Note that traverse_by_cache_tree() duplicates some logic in this function
* without actually calling it. If you change the logic here you may need to
@@ -1426,7 +1465,14 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str
* it does not do any look-ahead, so this is safe.
*/
if (matches) {
- o->cache_bottom += matches;
+ /*
+ * Only increment the cache_bottom if the
+ * directory isn't a sparse directory index
+ * entry (if it is, it was already incremented)
+ * in 'mark_ce_used()'
+ */
+ if (!src[0] || !S_ISSPARSEDIR(src[0]->ce_mode))
+ o->cache_bottom += matches;
return mask;
}
}
@@ -1677,6 +1723,41 @@ static void populate_from_existing_patterns(struct unpack_trees_options *o,
o->pl = pl;
}
+static void update_sparsity_for_prefix(const char *prefix,
+ struct index_state *istate)
+{
+ int prefix_len = strlen(prefix);
+ struct strbuf ce_prefix = STRBUF_INIT;
+
+ if (!istate->sparse_index)
+ return;
+
+ while (prefix_len > 0 && prefix[prefix_len - 1] == '/')
+ prefix_len--;
+
+ if (prefix_len <= 0)
+ BUG("Invalid prefix passed to update_sparsity_for_prefix");
+
+ strbuf_grow(&ce_prefix, prefix_len + 1);
+ strbuf_add(&ce_prefix, prefix, prefix_len);
+ strbuf_addch(&ce_prefix, '/');
+
+ /*
+ * If the prefix points to a sparse directory or a path inside a sparse
+ * directory, the index should be expanded. This is accomplished in one
+ * of two ways:
+ * - if the prefix is inside a sparse directory, it will be expanded by
+ * the 'ensure_full_index(...)' call in 'index_name_pos(...)'.
+ * - if the prefix matches an existing sparse directory entry,
+ * 'index_name_pos(...)' will return its index position, triggering
+ * the 'ensure_full_index(...)' below.
+ */
+ if (!path_in_cone_mode_sparse_checkout(ce_prefix.buf, istate) &&
+ index_name_pos(istate, ce_prefix.buf, ce_prefix.len) >= 0)
+ ensure_full_index(istate);
+
+ strbuf_release(&ce_prefix);
+}
static int verify_absent(const struct cache_entry *,
enum unpack_trees_error_types,
@@ -1694,9 +1775,15 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
static struct cache_entry *dfc;
struct pattern_list pl;
int free_pattern_list = 0;
+ struct dir_struct dir = DIR_INIT;
+
+ if (o->reset == UNPACK_RESET_INVALID)
+ BUG("o->reset had a value of 1; should be UNPACK_TREES_*_UNTRACKED");
if (len > MAX_UNPACK_TREES)
die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
+ if (o->dir)
+ BUG("o->dir is for internal use only");
trace_performance_enter();
trace2_region_enter("unpack_trees", "unpack_trees", the_repository);
@@ -1707,6 +1794,19 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
ensure_full_index(o->dst_index);
}
+ if (o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED &&
+ o->preserve_ignored)
+ BUG("UNPACK_RESET_OVERWRITE_UNTRACKED incompatible with preserved ignored files");
+
+ if (!o->preserve_ignored) {
+ o->dir = &dir;
+ o->dir->flags |= DIR_SHOW_IGNORED;
+ setup_standard_excludes(o->dir);
+ }
+
+ if (o->prefix)
+ update_sparsity_for_prefix(o->prefix, o->src_index);
+
if (!core_apply_sparse_checkout || !o->update)
o->skip_sparse_checkout = 1;
if (!o->skip_sparse_checkout && !o->pl) {
@@ -1741,6 +1841,11 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
o->result.fsmonitor_last_update =
xstrdup_or_null(o->src_index->fsmonitor_last_update);
+ if (!o->src_index->initialized &&
+ !repo->settings.command_requires_full_index &&
+ is_sparse_index_allowed(&o->result, 0))
+ o->result.sparse_index = 1;
+
/*
* Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
*/
@@ -1868,6 +1973,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
done:
if (free_pattern_list)
clear_pattern_list(&pl);
+ if (o->dir) {
+ dir_clear(o->dir);
+ o->dir = NULL;
+ }
trace2_region_leave("unpack_trees", "unpack_trees", the_repository);
trace_performance_leave("unpack_trees");
return ret;
@@ -1916,6 +2025,9 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o)
goto skip_sparse_checkout;
}
+ /* Expand sparse directories as needed */
+ expand_index(o->src_index, o->pl);
+
/* Set NEW_SKIP_WORKTREE on existing entries. */
mark_all_ce_unused(o->src_index);
mark_new_skip_worktree(o->pl, o->src_index, 0,
@@ -2026,7 +2138,9 @@ static int verify_uptodate_1(const struct cache_entry *ce,
int verify_uptodate(const struct cache_entry *ce,
struct unpack_trees_options *o)
{
- if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
+ if (!o->skip_sparse_checkout &&
+ (ce->ce_flags & CE_SKIP_WORKTREE) &&
+ (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
return 0;
return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);
}
@@ -2126,19 +2240,23 @@ static int verify_clean_subdirectory(const struct cache_entry *ce,
cnt++;
}
- /*
- * Then we need to make sure that we do not lose a locally
- * present file that is not ignored.
- */
+ /* Do not lose a locally present file that is not ignored. */
pathbuf = xstrfmt("%.*s/", namelen, ce->name);
memset(&d, 0, sizeof(d));
if (o->dir)
d.exclude_per_dir = o->dir->exclude_per_dir;
i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);
+ dir_clear(&d);
+ free(pathbuf);
if (i)
return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
- free(pathbuf);
+
+ /* Do not lose startup_info->original_cwd */
+ if (startup_info->original_cwd &&
+ !strcmp(startup_info->original_cwd, ce->name))
+ return add_rejected_path(o, ERROR_CWD_IN_THE_WAY, ce->name);
+
return cnt;
}
@@ -2158,9 +2276,15 @@ static int icase_exists(struct unpack_trees_options *o, const char *name, int le
return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
}
+enum absent_checking_type {
+ COMPLETELY_ABSENT,
+ ABSENT_ANY_DIRECTORY
+};
+
static int check_ok_to_remove(const char *name, int len, int dtype,
const struct cache_entry *ce, struct stat *st,
enum unpack_trees_error_types error_type,
+ enum absent_checking_type absent_type,
struct unpack_trees_options *o)
{
const struct cache_entry *result;
@@ -2195,6 +2319,10 @@ static int check_ok_to_remove(const char *name, int len, int dtype,
return 0;
}
+ /* If we only care about directories, then we can remove */
+ if (absent_type == ABSENT_ANY_DIRECTORY)
+ return 0;
+
/*
* The previous round may already have decided to
* delete this path, which is in a subdirectory that
@@ -2215,14 +2343,25 @@ static int check_ok_to_remove(const char *name, int len, int dtype,
*/
static int verify_absent_1(const struct cache_entry *ce,
enum unpack_trees_error_types error_type,
+ enum absent_checking_type absent_type,
struct unpack_trees_options *o)
{
int len;
struct stat st;
- if (o->index_only || o->reset || !o->update)
+ if (o->index_only || !o->update)
return 0;
+ if (o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED) {
+ /* Avoid nuking startup_info->original_cwd... */
+ if (startup_info->original_cwd &&
+ !strcmp(startup_info->original_cwd, ce->name))
+ return add_rejected_path(o, ERROR_CWD_IN_THE_WAY,
+ ce->name);
+ /* ...but nuke anything else. */
+ return 0;
+ }
+
len = check_leading_path(ce->name, ce_namelen(ce), 0);
if (!len)
return 0;
@@ -2240,7 +2379,8 @@ static int verify_absent_1(const struct cache_entry *ce,
NULL, o);
else
ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL,
- &st, error_type, o);
+ &st, error_type,
+ absent_type, o);
}
free(path);
return ret;
@@ -2255,7 +2395,7 @@ static int verify_absent_1(const struct cache_entry *ce,
return check_ok_to_remove(ce->name, ce_namelen(ce),
ce_to_dtype(ce), ce, &st,
- error_type, o);
+ error_type, absent_type, o);
}
}
@@ -2265,14 +2405,23 @@ static int verify_absent(const struct cache_entry *ce,
{
if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
return 0;
- return verify_absent_1(ce, error_type, o);
+ return verify_absent_1(ce, error_type, COMPLETELY_ABSENT, o);
+}
+
+static int verify_absent_if_directory(const struct cache_entry *ce,
+ enum unpack_trees_error_types error_type,
+ struct unpack_trees_options *o)
+{
+ if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
+ return 0;
+ return verify_absent_1(ce, error_type, ABSENT_ANY_DIRECTORY, o);
}
static int verify_absent_sparse(const struct cache_entry *ce,
enum unpack_trees_error_types error_type,
struct unpack_trees_options *o)
{
- return verify_absent_1(ce, error_type, o);
+ return verify_absent_1(ce, error_type, COMPLETELY_ABSENT, o);
}
static int merged_entry(const struct cache_entry *ce,
@@ -2346,6 +2495,12 @@ static int merged_entry(const struct cache_entry *ce,
* Previously unmerged entry left as an existence
* marker by read_index_unmerged();
*/
+ if (verify_absent_if_directory(merge,
+ ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
+ discard_cache_entry(merge);
+ return -1;
+ }
+
invalidate_ce_path(old, o);
}
@@ -2354,6 +2509,37 @@ static int merged_entry(const struct cache_entry *ce,
return 1;
}
+static int merged_sparse_dir(const struct cache_entry * const *src, int n,
+ struct unpack_trees_options *o)
+{
+ struct tree_desc t[MAX_UNPACK_TREES + 1];
+ void * tree_bufs[MAX_UNPACK_TREES + 1];
+ struct traverse_info info;
+ int i, ret;
+
+ /*
+ * Create the tree traversal information for traversing into *only* the
+ * sparse directory.
+ */
+ setup_traverse_info(&info, src[0]->name);
+ info.fn = unpack_sparse_callback;
+ info.data = o;
+ info.show_all_errors = o->show_all_errors;
+ info.pathspec = o->pathspec;
+
+ /* Get the tree descriptors of the sparse directory in each of the merging trees */
+ for (i = 0; i < n; i++)
+ tree_bufs[i] = fill_tree_descriptor(o->src_index->repo, &t[i],
+ src[i] && !is_null_oid(&src[i]->oid) ? &src[i]->oid : NULL);
+
+ ret = traverse_trees(o->src_index, n, t, &info);
+
+ for (i = 0; i < n; i++)
+ free(tree_bufs[i]);
+
+ return ret;
+}
+
static int deleted_entry(const struct cache_entry *ce,
const struct cache_entry *old,
struct unpack_trees_options *o)
@@ -2363,7 +2549,10 @@ static int deleted_entry(const struct cache_entry *ce,
if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
return -1;
return 0;
+ } else if (verify_absent_if_directory(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) {
+ return -1;
}
+
if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
return -1;
add_entry(o, ce, CE_REMOVE, 0);
@@ -2455,16 +2644,24 @@ int threeway_merge(const struct cache_entry * const *stages,
*/
/* #14, #14ALT, #2ALT */
if (remote && !df_conflict_head && head_match && !remote_match) {
- if (index && !same(index, remote) && !same(index, head))
- return reject_merge(index, o);
+ if (index && !same(index, remote) && !same(index, head)) {
+ if (S_ISSPARSEDIR(index->ce_mode))
+ return merged_sparse_dir(stages, 4, o);
+ else
+ return reject_merge(index, o);
+ }
return merged_entry(remote, index, o);
}
/*
* If we have an entry in the index cache, then we want to
* make sure that it matches head.
*/
- if (index && !same(index, head))
- return reject_merge(index, o);
+ if (index && !same(index, head)) {
+ if (S_ISSPARSEDIR(index->ce_mode))
+ return merged_sparse_dir(stages, 4, o);
+ else
+ return reject_merge(index, o);
+ }
if (head) {
/* #5ALT, #15 */
@@ -2526,11 +2723,21 @@ int threeway_merge(const struct cache_entry * const *stages,
}
- /* Below are "no merge" cases, which require that the index be
- * up-to-date to avoid the files getting overwritten with
- * conflict resolution files.
- */
+ /* Handle "no merge" cases (see t/t1000-read-tree-m-3way.sh) */
if (index) {
+ /*
+ * If we've reached the "no merge" cases and we're merging
+ * a sparse directory, we may have an "edit/edit" conflict that
+ * can be resolved by individually merging directory contents.
+ */
+ if (S_ISSPARSEDIR(index->ce_mode))
+ return merged_sparse_dir(stages, 4, o);
+
+ /*
+ * If we're not merging a sparse directory, ensure the index is
+ * up-to-date to avoid files getting overwritten with conflict
+ * resolution files
+ */
if (verify_uptodate(index, o))
return -1;
}
@@ -2621,6 +2828,14 @@ int twoway_merge(const struct cache_entry * const *src,
* reject the merge instead.
*/
return merged_entry(newtree, current, o);
+ } else if (S_ISSPARSEDIR(current->ce_mode)) {
+ /*
+ * The sparse directories differ, but we don't know whether that's
+ * because of two different files in the directory being modified
+ * (can be trivially merged) or if there is a real file conflict.
+ * Merge the sparse directory by OID to compare file-by-file.
+ */
+ return merged_sparse_dir(src, 3, o);
} else
return reject_merge(current, o);
}
diff --git a/unpack-trees.h b/unpack-trees.h
index 2d88b19..efb9edf 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -19,6 +19,7 @@ enum unpack_trees_error_types {
ERROR_WOULD_OVERWRITE = 0,
ERROR_NOT_UPTODATE_FILE,
ERROR_NOT_UPTODATE_DIR,
+ ERROR_CWD_IN_THE_WAY,
ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
ERROR_BIND_OVERLAP,
@@ -45,10 +46,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
*/
void clear_unpack_trees_porcelain(struct unpack_trees_options *opts);
+enum unpack_trees_reset_type {
+ UNPACK_RESET_NONE = 0, /* traditional "false" value; still valid */
+ UNPACK_RESET_INVALID = 1, /* "true" no longer valid; use below values */
+ UNPACK_RESET_PROTECT_UNTRACKED,
+ UNPACK_RESET_OVERWRITE_UNTRACKED
+};
+
struct unpack_trees_options {
- unsigned int reset,
- merge,
+ unsigned int merge,
update,
+ preserve_ignored,
clone,
index_only,
nontrivial_merge,
@@ -64,9 +72,9 @@ struct unpack_trees_options {
exiting_early,
show_all_errors,
dry_run;
+ enum unpack_trees_reset_type reset;
const char *prefix;
int cache_bottom;
- struct dir_struct *dir;
struct pathspec *pathspec;
merge_fn_t fn;
const char *msgs[NB_UNPACK_TREES_WARNING_TYPES];
@@ -88,6 +96,7 @@ struct unpack_trees_options {
struct index_state result;
struct pattern_list *pl; /* for internal use */
+ struct dir_struct *dir; /* for internal use only */
struct checkout_metadata meta;
};
diff --git a/upload-pack.c b/upload-pack.c
index c78d55b..3a851b3 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -194,7 +194,13 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
}
struct output_state {
- char buffer[8193];
+ /*
+ * We do writes no bigger than LARGE_PACKET_DATA_MAX - 1, because with
+ * sideband-64k the band designator takes up 1 byte of space. Because
+ * relay_pack_data keeps the last byte to itself, we make the buffer 1
+ * byte bigger than the intended maximum write size.
+ */
+ char buffer[(LARGE_PACKET_DATA_MAX - 1) + 1];
int used;
unsigned packfile_uris_started : 1;
unsigned packfile_started : 1;
@@ -269,7 +275,7 @@ static void create_pack_file(struct upload_pack_data *pack_data,
const struct string_list *uri_protocols)
{
struct child_process pack_objects = CHILD_PROCESS_INIT;
- struct output_state output_state = { { 0 } };
+ struct output_state *output_state = xcalloc(1, sizeof(struct output_state));
char progress[128];
char abort_msg[] = "aborting due to possible repository "
"corruption on the remote side.";
@@ -404,7 +410,7 @@ static void create_pack_file(struct upload_pack_data *pack_data,
}
if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
int result = relay_pack_data(pack_objects.out,
- &output_state,
+ output_state,
pack_data->use_sideband,
!!uri_protocols);
@@ -438,11 +444,12 @@ static void create_pack_file(struct upload_pack_data *pack_data,
}
/* flush the data */
- if (output_state.used > 0) {
- send_client_data(1, output_state.buffer, output_state.used,
+ if (output_state->used > 0) {
+ send_client_data(1, output_state->buffer, output_state->used,
pack_data->use_sideband);
fprintf(stderr, "flushed.\n");
}
+ free(output_state);
if (pack_data->use_sideband)
packet_flush(1);
return;
@@ -596,14 +603,11 @@ static int do_reachable_revlist(struct child_process *cmd,
struct object_array *reachable,
enum allow_uor allow_uor)
{
- static const char *argv[] = {
- "rev-list", "--stdin", NULL,
- };
struct object *o;
FILE *cmd_in = NULL;
int i;
- cmd->argv = argv;
+ strvec_pushl(&cmd->args, "rev-list", "--stdin", NULL);
cmd->git_cmd = 1;
cmd->no_stderr = 1;
cmd->in = -1;
@@ -1396,13 +1400,19 @@ static int parse_want(struct packet_writer *writer, const char *line,
const char *arg;
if (skip_prefix(line, "want ", &arg)) {
struct object_id oid;
+ struct commit *commit;
struct object *o;
if (get_oid_hex(arg, &oid))
die("git upload-pack: protocol error, "
"expected to get oid, not '%s'", line);
- o = parse_object(the_repository, &oid);
+ commit = lookup_commit_in_graph(the_repository, &oid);
+ if (commit)
+ o = &commit->object;
+ else
+ o = parse_object(the_repository, &oid);
+
if (!o) {
packet_writer_error(writer,
"upload-pack: not our ref %s",
@@ -1430,7 +1440,7 @@ static int parse_want_ref(struct packet_writer *writer, const char *line,
if (skip_prefix(line, "want-ref ", &refname_nons)) {
struct object_id oid;
struct string_list_item *item;
- struct object *o;
+ struct object *o = NULL;
struct strbuf refname = STRBUF_INIT;
strbuf_addf(&refname, "%s%s", get_git_namespace(), refname_nons);
@@ -1444,7 +1454,15 @@ static int parse_want_ref(struct packet_writer *writer, const char *line,
item = string_list_append(wanted_refs, refname_nons);
item->util = oiddup(&oid);
- o = parse_object_or_die(&oid, refname_nons);
+ if (!starts_with(refname_nons, "refs/tags/")) {
+ struct commit *commit = lookup_commit_in_graph(the_repository, &oid);
+ if (commit)
+ o = &commit->object;
+ }
+
+ if (!o)
+ o = parse_object_or_die(&oid, refname_nons);
+
if (!(o->flags & WANTED)) {
o->flags |= WANTED;
add_object_array(o, NULL, want_obj);
diff --git a/urlmatch.c b/urlmatch.c
index 33a2ccd..b615adc 100644
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -5,7 +5,7 @@
#define URL_DIGIT "0123456789"
#define URL_ALPHADIGIT URL_ALPHA URL_DIGIT
#define URL_SCHEME_CHARS URL_ALPHADIGIT "+.-"
-#define URL_HOST_CHARS URL_ALPHADIGIT ".-[:]" /* IPv6 literals need [:] */
+#define URL_HOST_CHARS URL_ALPHADIGIT ".-_[:]" /* IPv6 literals need [:] */
#define URL_UNSAFE_CHARS " <>\"%{}|\\^`" /* plus 0x00-0x1F,0x7F-0xFF */
#define URL_GEN_RESERVED ":/?#[]@"
#define URL_SUB_RESERVED "!$&'()*+,;="
@@ -611,3 +611,8 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb)
strbuf_release(&synthkey);
return retval;
}
+
+void urlmatch_config_release(struct urlmatch_config *config)
+{
+ string_list_clear(&config->vars, 1);
+}
diff --git a/urlmatch.h b/urlmatch.h
index 6ff42f8..9f40b00 100644
--- a/urlmatch.h
+++ b/urlmatch.h
@@ -66,6 +66,11 @@ struct urlmatch_config {
int (*fallback_match_fn)(const char *url, void *cb);
};
+#define URLMATCH_CONFIG_INIT { \
+ .vars = STRING_LIST_INIT_DUP, \
+}
+
int urlmatch_config_entry(const char *var, const char *value, void *cb);
+void urlmatch_config_release(struct urlmatch_config *config);
#endif /* URL_MATCH_H */
diff --git a/usage.c b/usage.c
index c7d233b..b738dd1 100644
--- a/usage.c
+++ b/usage.c
@@ -6,7 +6,7 @@
#include "git-compat-util.h"
#include "cache.h"
-void vreportf(const char *prefix, const char *err, va_list params)
+static void vreportf(const char *prefix, const char *err, va_list params)
{
char msg[4096];
char *p, *pend = msg + sizeof(msg);
@@ -55,6 +55,12 @@ static NORETURN void usage_builtin(const char *err, va_list params)
exit(129);
}
+static void die_message_builtin(const char *err, va_list params)
+{
+ trace2_cmd_error_va(err, params);
+ vreportf("fatal: ", err, params);
+}
+
/*
* We call trace2_cmd_error_va() in the below functions first and
* expect it to va_copy 'params' before using it (because an 'ap' can
@@ -62,10 +68,9 @@ static NORETURN void usage_builtin(const char *err, va_list params)
*/
static NORETURN void die_builtin(const char *err, va_list params)
{
- trace2_cmd_error_va(err, params);
+ report_fn die_message_fn = get_die_message_routine();
- vreportf("fatal: ", err, params);
-
+ die_message_fn(err, params);
exit(128);
}
@@ -109,6 +114,7 @@ static int die_is_recursing_builtin(void)
* (ugh), so keep things static. */
static NORETURN_PTR report_fn usage_routine = usage_builtin;
static NORETURN_PTR report_fn die_routine = die_builtin;
+static report_fn die_message_routine = die_message_builtin;
static report_fn error_routine = error_builtin;
static report_fn warn_routine = warn_builtin;
static int (*die_is_recursing)(void) = die_is_recursing_builtin;
@@ -118,6 +124,11 @@ void set_die_routine(NORETURN_PTR report_fn routine)
die_routine = routine;
}
+report_fn get_die_message_routine(void)
+{
+ return die_message_routine;
+}
+
void set_error_routine(report_fn routine)
{
error_routine = routine;
@@ -211,6 +222,29 @@ void NORETURN die_errno(const char *fmt, ...)
va_end(params);
}
+#undef die_message
+int die_message(const char *err, ...)
+{
+ va_list params;
+
+ va_start(params, err);
+ die_message_routine(err, params);
+ va_end(params);
+ return 128;
+}
+
+#undef die_message_errno
+int die_message_errno(const char *fmt, ...)
+{
+ char buf[1024];
+ va_list params;
+
+ va_start(params, fmt);
+ die_message_routine(fmt_with_err(buf, sizeof(buf), fmt), params);
+ va_end(params);
+ return 128;
+}
+
#undef error_errno
int error_errno(const char *fmt, ...)
{
@@ -265,10 +299,7 @@ static NORETURN void BUG_vfl(const char *file, int line, const char *fmt, va_lis
va_copy(params_copy, params);
/* truncation via snprintf is OK here */
- if (file)
- snprintf(prefix, sizeof(prefix), "BUG: %s:%d: ", file, line);
- else
- snprintf(prefix, sizeof(prefix), "BUG: ");
+ snprintf(prefix, sizeof(prefix), "BUG: %s:%d: ", file, line);
vreportf(prefix, fmt, params);
@@ -283,7 +314,6 @@ static NORETURN void BUG_vfl(const char *file, int line, const char *fmt, va_lis
abort();
}
-#ifdef HAVE_VARIADIC_MACROS
NORETURN void BUG_fl(const char *file, int line, const char *fmt, ...)
{
va_list ap;
@@ -291,15 +321,6 @@ NORETURN void BUG_fl(const char *file, int line, const char *fmt, ...)
BUG_vfl(file, line, fmt, ap);
va_end(ap);
}
-#else
-NORETURN void BUG(const char *fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- BUG_vfl(NULL, 0, fmt, ap);
- va_end(ap);
-}
-#endif
#ifdef SUPPRESS_ANNOTATED_LEAKS
void unleak_memory(const void *ptr, size_t len)
diff --git a/userdiff.c b/userdiff.c
index af02b18..151d9a5 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -7,12 +7,24 @@ static struct userdiff_driver *drivers;
static int ndrivers;
static int drivers_alloc;
-#define PATTERNS(name, pattern, word_regex) \
- { name, NULL, -1, { pattern, REG_EXTENDED }, \
- word_regex "|[^[:space:]]|[\xc0-\xff][\x80-\xbf]+" }
-#define IPATTERN(name, pattern, word_regex) \
- { name, NULL, -1, { pattern, REG_EXTENDED | REG_ICASE }, \
- word_regex "|[^[:space:]]|[\xc0-\xff][\x80-\xbf]+" }
+#define PATTERNS(lang, rx, wrx) { \
+ .name = lang, \
+ .binary = -1, \
+ .funcname = { \
+ .pattern = rx, \
+ .cflags = REG_EXTENDED, \
+ }, \
+ .word_regex = wrx "|[^[:space:]]|[\xc0-\xff][\x80-\xbf]+", \
+}
+#define IPATTERN(lang, rx, wrx) { \
+ .name = lang, \
+ .binary = -1, \
+ .funcname = { \
+ .pattern = rx, \
+ .cflags = REG_EXTENDED | REG_ICASE, \
+ }, \
+ .word_regex = wrx "|[^[:space:]]|[\xc0-\xff][\x80-\xbf]+", \
+}
/*
* Built-in drivers for various languages, sorted by their names
@@ -64,9 +76,15 @@ PATTERNS("cpp",
/* functions/methods, variables, and compounds at top level */
"^((::[[:space:]]*)?[A-Za-z_].*)$",
/* -- */
+ /* identifiers and keywords */
"[a-zA-Z_][a-zA-Z0-9_]*"
- "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lLuU]*"
- "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"),
+ /* decimal and octal integers as well as floatingpoint numbers */
+ "|[0-9][0-9.]*([Ee][-+]?[0-9]+)?[fFlLuU]*"
+ /* hexadecimal and binary integers */
+ "|0[xXbB][0-9a-fA-F]+[lLuU]*"
+ /* floatingpoint numbers that begin with a decimal point */
+ "|\\.[0-9][0-9]*([Ee][-+]?[0-9]+)?[fFlL]?"
+ "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*|<=>"),
PATTERNS("csharp",
/* Keywords */
"!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n"
@@ -162,6 +180,18 @@ PATTERNS("java",
"|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
"|[-+*/<>%&^|=!]="
"|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
+PATTERNS("kotlin",
+ "^[ \t]*(([a-z]+[ \t]+)*(fun|class|interface)[ \t]+.*)$",
+ /* -- */
+ "[a-zA-Z_][a-zA-Z0-9_]*"
+ /* hexadecimal and binary numbers */
+ "|0[xXbB][0-9a-fA-F_]+[lLuU]*"
+ /* integers and floats */
+ "|[0-9][0-9_]*([.][0-9_]*)?([Ee][-+]?[0-9]+)?[fFlLuU]*"
+ /* floating point numbers beginning with decimal point */
+ "|[.][0-9][0-9_]*([Ee][-+]?[0-9]+)?[fFlLuU]?"
+ /* unary and binary operators */
+ "|[-+*/<>%&^|=!]==?|--|\\+\\+|<<=|>>=|&&|\\|\\||->|\\.\\*|!!|[?:.][.:]"),
PATTERNS("markdown",
"^ {0,3}#{1,6}[ \t].*",
/* -- */
@@ -269,17 +299,13 @@ PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
#undef IPATTERN
static struct userdiff_driver driver_true = {
- "diff=true",
- NULL,
- 0,
- { NULL, 0 }
+ .name = "diff=true",
+ .binary = 0,
};
static struct userdiff_driver driver_false = {
- "!diff",
- NULL,
- 1,
- { NULL, 0 }
+ .name = "!diff",
+ .binary = 1,
};
struct find_by_namelen_data {
diff --git a/wildmatch.c b/wildmatch.c
index 9e9e2a2..7e5a7ea 100644
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -113,7 +113,7 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
/* Trailing "**" matches everything. Trailing "*" matches
* only if there are no more slash characters. */
if (!match_slash) {
- if (strchr((char*)text, '/') != NULL)
+ if (strchr((char *)text, '/'))
return WM_NOMATCH;
}
return WM_MATCH;
diff --git a/worktree.c b/worktree.c
index 092a4f9..257ba4c 100644
--- a/worktree.c
+++ b/worktree.c
@@ -5,6 +5,7 @@
#include "worktree.h"
#include "dir.h"
#include "wt-status.h"
+#include "config.h"
void free_worktrees(struct worktree **worktrees)
{
@@ -402,17 +403,13 @@ int is_worktree_being_bisected(const struct worktree *wt,
* bisect). New commands that do similar things should update this
* function as well.
*/
-const struct worktree *find_shared_symref(const char *symref,
+const struct worktree *find_shared_symref(struct worktree **worktrees,
+ const char *symref,
const char *target)
{
const struct worktree *existing = NULL;
- static struct worktree **worktrees;
int i = 0;
- if (worktrees)
- free_worktrees(worktrees);
- worktrees = get_worktrees();
-
for (i = 0; worktrees[i]; i++) {
struct worktree *wt = worktrees[i];
const char *symref_target;
@@ -486,7 +483,7 @@ int submodule_uses_worktrees(const char *path)
return 0;
d = readdir_skip_dot_and_dotdot(dir);
- if (d != NULL)
+ if (d)
ret = 1;
closedir(dir);
return ret;
@@ -569,10 +566,10 @@ int other_head_refs(each_ref_fn fn, void *cb_data)
strbuf_reset(&refname);
strbuf_worktree_ref(wt, &refname, "HEAD");
- if (!refs_read_ref_full(get_main_ref_store(the_repository),
- refname.buf,
- RESOLVE_REF_READING,
- &oid, &flag))
+ if (refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
+ refname.buf,
+ RESOLVE_REF_READING,
+ &oid, &flag))
ret = fn(refname.buf, &oid, flag, cb_data);
if (ret)
break;
@@ -825,3 +822,75 @@ int should_prune_worktree(const char *id, struct strbuf *reason, char **wtpath,
*wtpath = path;
return 0;
}
+
+static int move_config_setting(const char *key, const char *value,
+ const char *from_file, const char *to_file)
+{
+ if (git_config_set_in_file_gently(to_file, key, value))
+ return error(_("unable to set %s in '%s'"), key, to_file);
+ if (git_config_set_in_file_gently(from_file, key, NULL))
+ return error(_("unable to unset %s in '%s'"), key, from_file);
+ return 0;
+}
+
+int init_worktree_config(struct repository *r)
+{
+ int res = 0;
+ int bare = 0;
+ struct config_set cs = { { 0 } };
+ const char *core_worktree;
+ char *common_config_file;
+ char *main_worktree_file;
+
+ /*
+ * If the extension is already enabled, then we can skip the
+ * upgrade process.
+ */
+ if (repository_format_worktree_config)
+ return 0;
+ if ((res = git_config_set_gently("extensions.worktreeConfig", "true")))
+ return error(_("failed to set extensions.worktreeConfig setting"));
+
+ common_config_file = xstrfmt("%s/config", r->commondir);
+ main_worktree_file = xstrfmt("%s/config.worktree", r->commondir);
+
+ git_configset_init(&cs);
+ git_configset_add_file(&cs, common_config_file);
+
+ /*
+ * If core.bare is true in the common config file, then we need to
+ * move it to the main worktree's config file or it will break all
+ * worktrees. If it is false, then leave it in place because it
+ * _could_ be negating a global core.bare=true.
+ */
+ if (!git_configset_get_bool(&cs, "core.bare", &bare) && bare) {
+ if ((res = move_config_setting("core.bare", "true",
+ common_config_file,
+ main_worktree_file)))
+ goto cleanup;
+ }
+ /*
+ * If core.worktree is set, then the main worktree is located
+ * somewhere different than the parent of the common Git dir.
+ * Relocate that value to avoid breaking all worktrees with this
+ * upgrade to worktree config.
+ */
+ if (!git_configset_get_value(&cs, "core.worktree", &core_worktree)) {
+ if ((res = move_config_setting("core.worktree", core_worktree,
+ common_config_file,
+ main_worktree_file)))
+ goto cleanup;
+ }
+
+ /*
+ * Ensure that we use worktree config for the remaining lifetime
+ * of the current process.
+ */
+ repository_format_worktree_config = 1;
+
+cleanup:
+ git_configset_clear(&cs);
+ free(common_config_file);
+ free(main_worktree_file);
+ return res;
+}
diff --git a/worktree.h b/worktree.h
index 8b7c408..e9e8399 100644
--- a/worktree.h
+++ b/worktree.h
@@ -143,9 +143,10 @@ void free_worktrees(struct worktree **);
/*
* Check if a per-worktree symref points to a ref in the main worktree
* or any linked worktree, and return the worktree that holds the ref,
- * or NULL otherwise. The result may be destroyed by the next call.
+ * or NULL otherwise.
*/
-const struct worktree *find_shared_symref(const char *symref,
+const struct worktree *find_shared_symref(struct worktree **worktrees,
+ const char *symref,
const char *target);
/*
@@ -182,4 +183,25 @@ void strbuf_worktree_ref(const struct worktree *wt,
struct strbuf *sb,
const char *refname);
+/**
+ * Enable worktree config for the first time. This will make the following
+ * adjustments:
+ *
+ * 1. Add extensions.worktreeConfig=true in the common config file.
+ *
+ * 2. If the common config file has a core.worktree value, then that value
+ * is moved to the main worktree's config.worktree file.
+ *
+ * 3. If the common config file has a core.bare enabled, then that value
+ * is moved to the main worktree's config.worktree file.
+ *
+ * If extensions.worktreeConfig is already true, then this method
+ * terminates early without any of the above steps. The existing config
+ * arrangement is assumed to be intentional.
+ *
+ * Returns 0 on success. Reports an error message and returns non-zero
+ * if any of these steps fail.
+ */
+int init_worktree_config(struct repository *r);
+
#endif
diff --git a/wrapper.c b/wrapper.c
index 1460d4e..1c3c970 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -4,6 +4,16 @@
#include "cache.h"
#include "config.h"
+static intmax_t count_fsync_writeout_only;
+static intmax_t count_fsync_hardware_flush;
+
+#ifdef HAVE_RTLGENRANDOM
+/* This is required to get access to RtlGenRandom. */
+#define SystemFunction036 NTAPI SystemFunction036
+#include <NTSecAPI.h>
+#undef SystemFunction036
+#endif
+
static int memory_limit_check(size_t size, int gentle)
{
static size_t limit = 0;
@@ -151,12 +161,6 @@ void xsetenv(const char *name, const char *value, int overwrite)
die_errno(_("could not setenv '%s'"), name ? name : "(null)");
}
-void xunsetenv(const char *name)
-{
- if (!unsetenv(name))
- die_errno(_("could not unsetenv '%s'"), name ? name : "(null)");
-}
-
/*
* Limit size of IO chunks, because huge chunks only cause pain. OS X
* 64-bit is buggy, returning EINVAL if len >= INT_MAX; and even in
@@ -389,7 +393,7 @@ FILE *xfopen(const char *path, const char *mode)
FILE *xfdopen(int fd, const char *mode)
{
FILE *stream = fdopen(fd, mode);
- if (stream == NULL)
+ if (!stream)
die_errno("Out of memory? fdopen failed");
return stream;
}
@@ -469,8 +473,6 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
static const int num_letters = ARRAY_SIZE(letters) - 1;
static const char x_pattern[] = "XXXXXX";
static const int num_x = ARRAY_SIZE(x_pattern) - 1;
- uint64_t value;
- struct timeval tv;
char *filename_template;
size_t len;
int fd, count;
@@ -491,12 +493,13 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
* Replace pattern's XXXXXX characters with randomness.
* Try TMP_MAX different filenames.
*/
- gettimeofday(&tv, NULL);
- value = ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid();
filename_template = &pattern[len - num_x - suffix_len];
for (count = 0; count < TMP_MAX; ++count) {
- uint64_t v = value;
int i;
+ uint64_t v;
+ if (csprng_bytes(&v, sizeof(v)) < 0)
+ return error_errno("unable to get random bytes for temporary file");
+
/* Fill in the random bits. */
for (i = 0; i < num_x; i++) {
filename_template[i] = letters[v % num_letters];
@@ -512,12 +515,6 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
*/
if (errno != EEXIST)
break;
- /*
- * This is a random value. It is only necessary that
- * the next TMP_MAX values generated by adding 7777 to
- * VALUE are different with (module 2^32).
- */
- value += 7777;
}
/* We return the null string if we can't find a unique file name. */
pattern[0] = '\0';
@@ -552,6 +549,79 @@ int xmkstemp_mode(char *filename_template, int mode)
return fd;
}
+/*
+ * Some platforms return EINTR from fsync. Since fsync is invoked in some
+ * cases by a wrapper that dies on failure, do not expose EINTR to callers.
+ */
+static int fsync_loop(int fd)
+{
+ int err;
+
+ do {
+ err = fsync(fd);
+ } while (err < 0 && errno == EINTR);
+ return err;
+}
+
+int git_fsync(int fd, enum fsync_action action)
+{
+ switch (action) {
+ case FSYNC_WRITEOUT_ONLY:
+ count_fsync_writeout_only += 1;
+
+#ifdef __APPLE__
+ /*
+ * On macOS, fsync just causes filesystem cache writeback but
+ * does not flush hardware caches.
+ */
+ return fsync_loop(fd);
+#endif
+
+#ifdef HAVE_SYNC_FILE_RANGE
+ /*
+ * On linux 2.6.17 and above, sync_file_range is the way to
+ * issue a writeback without a hardware flush. An offset of
+ * 0 and size of 0 indicates writeout of the entire file and the
+ * wait flags ensure that all dirty data is written to the disk
+ * (potentially in a disk-side cache) before we continue.
+ */
+
+ return sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WAIT_BEFORE |
+ SYNC_FILE_RANGE_WRITE |
+ SYNC_FILE_RANGE_WAIT_AFTER);
+#endif
+
+#ifdef fsync_no_flush
+ return fsync_no_flush(fd);
+#endif
+
+ errno = ENOSYS;
+ return -1;
+
+ case FSYNC_HARDWARE_FLUSH:
+ count_fsync_hardware_flush += 1;
+
+ /*
+ * On macOS, a special fcntl is required to really flush the
+ * caches within the storage controller. As of this writing,
+ * this is a very expensive operation on Apple SSDs.
+ */
+#ifdef __APPLE__
+ return fcntl(fd, F_FULLFSYNC);
+#else
+ return fsync_loop(fd);
+#endif
+ default:
+ BUG("unexpected git_fsync(%d) call", action);
+ }
+}
+
+void trace_git_fsync_stats(void)
+{
+ trace2_data_intmax("fsync", the_repository, "fsync/writeout-only", count_fsync_writeout_only);
+ trace2_data_intmax("fsync", the_repository, "fsync/hardware-flush", count_fsync_hardware_flush);
+}
+
static int warn_if_unremovable(const char *op, const char *file, int rc)
{
int err;
@@ -708,3 +778,69 @@ int open_nofollow(const char *path, int flags)
return open(path, flags);
#endif
}
+
+int csprng_bytes(void *buf, size_t len)
+{
+#if defined(HAVE_ARC4RANDOM) || defined(HAVE_ARC4RANDOM_LIBBSD)
+ /* This function never returns an error. */
+ arc4random_buf(buf, len);
+ return 0;
+#elif defined(HAVE_GETRANDOM)
+ ssize_t res;
+ char *p = buf;
+ while (len) {
+ res = getrandom(p, len, 0);
+ if (res < 0)
+ return -1;
+ len -= res;
+ p += res;
+ }
+ return 0;
+#elif defined(HAVE_GETENTROPY)
+ int res;
+ char *p = buf;
+ while (len) {
+ /* getentropy has a maximum size of 256 bytes. */
+ size_t chunk = len < 256 ? len : 256;
+ res = getentropy(p, chunk);
+ if (res < 0)
+ return -1;
+ len -= chunk;
+ p += chunk;
+ }
+ return 0;
+#elif defined(HAVE_RTLGENRANDOM)
+ if (!RtlGenRandom(buf, len))
+ return -1;
+ return 0;
+#elif defined(HAVE_OPENSSL_CSPRNG)
+ int res = RAND_bytes(buf, len);
+ if (res == 1)
+ return 0;
+ if (res == -1)
+ errno = ENOTSUP;
+ else
+ errno = EIO;
+ return -1;
+#else
+ ssize_t res;
+ char *p = buf;
+ int fd, err;
+ fd = open("/dev/urandom", O_RDONLY);
+ if (fd < 0)
+ return -1;
+ while (len) {
+ res = xread(fd, p, len);
+ if (res < 0) {
+ err = errno;
+ close(fd);
+ errno = err;
+ return -1;
+ }
+ len -= res;
+ p += res;
+ }
+ close(fd);
+ return 0;
+#endif
+}
diff --git a/write-or-die.c b/write-or-die.c
index 0b1ec81..c4fd91b 100644
--- a/write-or-die.c
+++ b/write-or-die.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "config.h"
#include "run-command.h"
/*
@@ -55,12 +56,37 @@ void fprintf_or_die(FILE *f, const char *fmt, ...)
}
}
+static int maybe_fsync(int fd)
+{
+ if (use_fsync < 0)
+ use_fsync = git_env_bool("GIT_TEST_FSYNC", 1);
+ if (!use_fsync)
+ return 0;
+
+ if (fsync_method == FSYNC_METHOD_WRITEOUT_ONLY &&
+ git_fsync(fd, FSYNC_WRITEOUT_ONLY) >= 0)
+ return 0;
+
+ return git_fsync(fd, FSYNC_HARDWARE_FLUSH);
+}
+
void fsync_or_die(int fd, const char *msg)
{
- while (fsync(fd) < 0) {
- if (errno != EINTR)
- die_errno("fsync error on '%s'", msg);
- }
+ if (maybe_fsync(fd) < 0)
+ die_errno("fsync error on '%s'", msg);
+}
+
+int fsync_component(enum fsync_component component, int fd)
+{
+ if (fsync_components & component)
+ return maybe_fsync(fd);
+ return 0;
+}
+
+void fsync_component_or_die(enum fsync_component component, int fd, const char *msg)
+{
+ if (fsync_components & component)
+ fsync_or_die(fd, msg);
}
void write_or_die(int fd, const void *buf, size_t count)
diff --git a/wt-status.c b/wt-status.c
index e4f29b2..867e3e4 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -616,7 +616,7 @@ static void wt_status_collect_changes_worktree(struct wt_status *s)
rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
copy_pathspec(&rev.prune_data, &s->pathspec);
run_diff_files(&rev, 0);
- clear_pathspec(&rev.prune_data);
+ release_revisions(&rev);
}
static void wt_status_collect_changes_index(struct wt_status *s)
@@ -651,10 +651,18 @@ static void wt_status_collect_changes_index(struct wt_status *s)
rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
+
+ /*
+ * The `recursive` option must be enabled to allow the diff to recurse
+ * into subdirectories of sparse directory index entries. If it is not
+ * enabled, a subdirectory containing file(s) with changes is reported
+ * as "modified", rather than the modified files themselves.
+ */
+ rev.diffopt.flags.recursive = 1;
+
copy_pathspec(&rev.prune_data, &s->pathspec);
run_diff_index(&rev, 1);
- object_array_clear(&rev.pending);
- clear_pathspec(&rev.prune_data);
+ release_revisions(&rev);
}
static int add_file_to_list(const struct object_id *oid,
@@ -948,11 +956,17 @@ static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
return 0;
}
+static int count_stash_entries(void)
+{
+ int n = 0;
+ for_each_reflog_ent("refs/stash", stash_count_refs, &n);
+ return n;
+}
+
static void wt_longstatus_print_stash_summary(struct wt_status *s)
{
- int stash_count = 0;
+ int stash_count = count_stash_entries();
- for_each_reflog_ent("refs/stash", stash_count_refs, &stash_count);
if (stash_count > 0)
status_printf_ln(s, GIT_COLOR_NORMAL,
Q_("Your stash currently has %d entry",
@@ -967,7 +981,7 @@ static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncom
struct strbuf summary = STRBUF_INIT;
char *summary_content;
- strvec_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", s->index_file);
+ strvec_pushf(&sm_summary.env, "GIT_INDEX_FILE=%s", s->index_file);
strvec_push(&sm_summary.args, "submodule");
strvec_push(&sm_summary.args, "summary");
@@ -1137,6 +1151,7 @@ static void wt_longstatus_print_verbose(struct wt_status *s)
rev.diffopt.b_prefix = "w/";
run_diff_files(&rev, 0);
}
+ release_revisions(&rev);
}
static void wt_longstatus_print_tracking(struct wt_status *s)
@@ -1212,17 +1227,23 @@ static void show_merge_in_progress(struct wt_status *s,
static void show_am_in_progress(struct wt_status *s,
const char *color)
{
+ int am_empty_patch;
+
status_printf_ln(s, color,
_("You are in the middle of an am session."));
if (s->state.am_empty_patch)
status_printf_ln(s, color,
_("The current patch is empty."));
if (s->hints) {
- if (!s->state.am_empty_patch)
+ am_empty_patch = s->state.am_empty_patch;
+ if (!am_empty_patch)
status_printf_ln(s, color,
_(" (fix conflicts and then run \"git am --continue\")"));
status_printf_ln(s, color,
_(" (use \"git am --skip\" to skip this patch)"));
+ if (am_empty_patch)
+ status_printf_ln(s, color,
+ _(" (use \"git am --allow-empty\" to record this patch as an empty commit)"));
status_printf_ln(s, color,
_(" (use \"git am --abort\" to restore the original branch)"));
}
@@ -1362,10 +1383,10 @@ static void show_rebase_information(struct wt_status *s,
status_printf_ln(s, color, _("No commands done."));
else {
status_printf_ln(s, color,
- Q_("Last command done (%d command done):",
- "Last commands done (%d commands done):",
+ Q_("Last command done (%"PRIuMAX" command done):",
+ "Last commands done (%"PRIuMAX" commands done):",
have_done.nr),
- have_done.nr);
+ (uintmax_t)have_done.nr);
for (i = (have_done.nr > nr_lines_to_show)
? have_done.nr - nr_lines_to_show : 0;
i < have_done.nr;
@@ -1381,10 +1402,10 @@ static void show_rebase_information(struct wt_status *s,
_("No commands remaining."));
else {
status_printf_ln(s, color,
- Q_("Next command to do (%d remaining command):",
- "Next commands to do (%d remaining commands):",
+ Q_("Next command to do (%"PRIuMAX" remaining command):",
+ "Next commands to do (%"PRIuMAX" remaining commands):",
yet_to_do.nr),
- yet_to_do.nr);
+ (uintmax_t)yet_to_do.nr);
for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
if (s->hints)
@@ -2177,6 +2198,18 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s)
}
/*
+ * Print the stash count in a porcelain-friendly format
+ */
+static void wt_porcelain_v2_print_stash(struct wt_status *s)
+{
+ int stash_count = count_stash_entries();
+ char eol = s->null_termination ? '\0' : '\n';
+
+ if (stash_count > 0)
+ fprintf(s->fp, "# stash %d%c", stash_count, eol);
+}
+
+/*
* Convert various submodule status values into a
* fixed-length string of characters in the buffer provided.
*/
@@ -2437,6 +2470,9 @@ static void wt_porcelain_v2_print(struct wt_status *s)
if (s->show_branch)
wt_porcelain_v2_print_tracking(s);
+ if (s->show_stash)
+ wt_porcelain_v2_print_stash(s);
+
for (i = 0; i < s->change.nr; i++) {
it = &(s->change.items[i]);
d = it->util;
@@ -2509,7 +2545,9 @@ int has_unstaged_changes(struct repository *r, int ignore_submodules)
rev_info.diffopt.flags.quick = 1;
diff_setup_done(&rev_info.diffopt);
result = run_diff_files(&rev_info, 0);
- return diff_result_code(&rev_info.diffopt, result);
+ result = diff_result_code(&rev_info.diffopt, result);
+ release_revisions(&rev_info);
+ return result;
}
/**
@@ -2541,8 +2579,9 @@ int has_uncommitted_changes(struct repository *r,
diff_setup_done(&rev_info.diffopt);
result = run_diff_index(&rev_info, 1);
- object_array_clear(&rev_info.pending);
- return diff_result_code(&rev_info.diffopt, result);
+ result = diff_result_code(&rev_info.diffopt, result);
+ release_revisions(&rev_info);
+ return result;
}
/**
diff --git a/xdiff-interface.c b/xdiff-interface.c
index 75b32ae..e87950d 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -159,7 +159,7 @@ int read_mmfile(mmfile_t *ptr, const char *filename)
if (stat(filename, &st))
return error_errno("Could not stat %s", filename);
- if ((f = fopen(filename, "rb")) == NULL)
+ if (!(f = fopen(filename, "rb")))
return error_errno("Could not open %s", filename);
sz = xsize_t(st.st_size);
ptr->ptr = xmalloc(sz ? sz : 1);
@@ -313,6 +313,8 @@ int git_xmerge_config(const char *var, const char *value, void *cb)
die("'%s' is not a boolean", var);
if (!strcmp(value, "diff3"))
git_xmerge_style = XDL_MERGE_DIFF3;
+ else if (!strcmp(value, "zdiff3"))
+ git_xmerge_style = XDL_MERGE_ZEALOUS_DIFF3;
else if (!strcmp(value, "merge"))
git_xmerge_style = 0;
/*
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index b29deca..72e25a9 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -66,6 +66,7 @@ extern "C" {
/* merge output styles */
#define XDL_MERGE_DIFF3 1
+#define XDL_MERGE_ZEALOUS_DIFF3 2
typedef struct s_mmfile {
char *ptr;
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index a4542c0..758410c 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -315,16 +315,19 @@ int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
long *kvd, *kvdf, *kvdb;
xdalgoenv_t xenv;
diffdata_t dd1, dd2;
+ int res;
- if (XDF_DIFF_ALG(xpp->flags) == XDF_PATIENCE_DIFF)
- return xdl_do_patience_diff(mf1, mf2, xpp, xe);
-
- if (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF)
- return xdl_do_histogram_diff(mf1, mf2, xpp, xe);
-
- if (xdl_prepare_env(mf1, mf2, xpp, xe) < 0) {
-
+ if (xdl_prepare_env(mf1, mf2, xpp, xe) < 0)
return -1;
+
+ if (XDF_DIFF_ALG(xpp->flags) == XDF_PATIENCE_DIFF) {
+ res = xdl_do_patience_diff(mf1, mf2, xpp, xe);
+ goto out;
+ }
+
+ if (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF) {
+ res = xdl_do_histogram_diff(mf1, mf2, xpp, xe);
+ goto out;
}
/*
@@ -359,17 +362,15 @@ int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
dd2.rchg = xe->xdf2.rchg;
dd2.rindex = xe->xdf2.rindex;
- if (xdl_recs_cmp(&dd1, 0, dd1.nrec, &dd2, 0, dd2.nrec,
- kvdf, kvdb, (xpp->flags & XDF_NEED_MINIMAL) != 0, &xenv) < 0) {
-
- xdl_free(kvd);
- xdl_free_env(xe);
- return -1;
- }
-
+ res = xdl_recs_cmp(&dd1, 0, dd1.nrec, &dd2, 0, dd2.nrec,
+ kvdf, kvdb, (xpp->flags & XDF_NEED_MINIMAL) != 0,
+ &xenv);
xdl_free(kvd);
+ out:
+ if (res < 0)
+ xdl_free_env(xe);
- return 0;
+ return res;
}
@@ -390,12 +391,9 @@ static xdchange_t *xdl_add_change(xdchange_t *xscr, long i1, long i2, long chg1,
}
-static int recs_match(xrecord_t *rec1, xrecord_t *rec2, long flags)
+static int recs_match(xrecord_t *rec1, xrecord_t *rec2)
{
- return (rec1->ha == rec2->ha &&
- xdl_recmatch(rec1->ptr, rec1->size,
- rec2->ptr, rec2->size,
- flags));
+ return (rec1->ha == rec2->ha);
}
/*
@@ -759,10 +757,10 @@ static inline int group_previous(xdfile_t *xdf, struct xdlgroup *g)
* following group, expand this group to include it. Return 0 on success or -1
* if g cannot be slid down.
*/
-static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g, long flags)
+static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g)
{
if (g->end < xdf->nrec &&
- recs_match(xdf->recs[g->start], xdf->recs[g->end], flags)) {
+ recs_match(xdf->recs[g->start], xdf->recs[g->end])) {
xdf->rchg[g->start++] = 0;
xdf->rchg[g->end++] = 1;
@@ -780,10 +778,10 @@ static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g, long flags)
* into a previous group, expand this group to include it. Return 0 on success
* or -1 if g cannot be slid up.
*/
-static int group_slide_up(xdfile_t *xdf, struct xdlgroup *g, long flags)
+static int group_slide_up(xdfile_t *xdf, struct xdlgroup *g)
{
if (g->start > 0 &&
- recs_match(xdf->recs[g->start - 1], xdf->recs[g->end - 1], flags)) {
+ recs_match(xdf->recs[g->start - 1], xdf->recs[g->end - 1])) {
xdf->rchg[--g->start] = 1;
xdf->rchg[--g->end] = 0;
@@ -833,7 +831,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
end_matching_other = -1;
/* Shift the group backward as much as possible: */
- while (!group_slide_up(xdf, &g, flags))
+ while (!group_slide_up(xdf, &g))
if (group_previous(xdfo, &go))
BUG("group sync broken sliding up");
@@ -848,7 +846,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
/* Now shift the group forward as far as possible: */
while (1) {
- if (group_slide_down(xdf, &g, flags))
+ if (group_slide_down(xdf, &g))
break;
if (group_next(xdfo, &go))
BUG("group sync broken sliding down");
@@ -875,7 +873,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* other file that it can align with.
*/
while (go.end == go.start) {
- if (group_slide_up(xdf, &g, flags))
+ if (group_slide_up(xdf, &g))
BUG("match disappeared");
if (group_previous(xdfo, &go))
BUG("group sync broken sliding to match");
@@ -918,7 +916,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
}
while (g.end > best_shift) {
- if (group_slide_up(xdf, &g, flags))
+ if (group_slide_up(xdf, &g))
BUG("best shift unreached");
if (group_previous(xdfo, &go))
BUG("group sync broken sliding to blank line");
diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 1cbf2b9..c4ccd68 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -65,7 +65,7 @@ xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg)
*xscr = xch;
}
- if (*xscr == NULL)
+ if (!*xscr)
return NULL;
lxch = *xscr;
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
index e694bfd..01decff 100644
--- a/xdiff/xhistogram.c
+++ b/xdiff/xhistogram.c
@@ -88,19 +88,14 @@ struct region {
#define REC(env, s, l) \
(env->xdf##s.recs[l - 1])
-static int cmp_recs(xpparam_t const *xpp,
- xrecord_t *r1, xrecord_t *r2)
+static int cmp_recs(xrecord_t *r1, xrecord_t *r2)
{
- return r1->ha == r2->ha &&
- xdl_recmatch(r1->ptr, r1->size, r2->ptr, r2->size,
- xpp->flags);
+ return r1->ha == r2->ha;
+
}
-#define CMP_ENV(xpp, env, s1, l1, s2, l2) \
- (cmp_recs(xpp, REC(env, s1, l1), REC(env, s2, l2)))
-
#define CMP(i, s1, l1, s2, l2) \
- (cmp_recs(i->xpp, REC(i->env, s1, l1), REC(i->env, s2, l2)))
+ (cmp_recs(REC(i->env, s1, l1), REC(i->env, s2, l2)))
#define TABLE_HASH(index, side, line) \
XDL_HASHLONG((REC(index->env, side, line))->ha, index->table_bits)
@@ -377,9 +372,6 @@ static int histogram_diff(xpparam_t const *xpp, xdfenv_t *env,
int xdl_do_histogram_diff(mmfile_t *file1, mmfile_t *file2,
xpparam_t const *xpp, xdfenv_t *env)
{
- if (xdl_prepare_env(file1, file2, xpp, env) < 0)
- return -1;
-
return histogram_diff(xpp, env,
env->xdf1.dstart + 1, env->xdf1.dend - env->xdf1.dstart + 1,
env->xdf2.dstart + 1, env->xdf2.dend - env->xdf2.dstart + 1);
diff --git a/xdiff/xmacros.h b/xdiff/xmacros.h
index 2809a28..ae4636c 100644
--- a/xdiff/xmacros.h
+++ b/xdiff/xmacros.h
@@ -34,7 +34,6 @@
#define XDL_ADDBITS(v,b) ((v) + ((v) >> (b)))
#define XDL_MASKBITS(b) ((1UL << (b)) - 1)
#define XDL_HASHLONG(v,b) (XDL_ADDBITS((unsigned long)(v), b) & XDL_MASKBITS(b))
-#define XDL_PTRFREE(p) do { if (p) { xdl_free(p); (p) = NULL; } } while (0)
#define XDL_LE32_PUT(p, v) \
do { \
unsigned char *__p = (unsigned char *) (p); \
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index 1659edb..af40c88 100644
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@ -230,7 +230,7 @@ static int fill_conflict_hunk(xdfenv_t *xe1, const char *name1,
size += xdl_recs_copy(xe1, m->i1, m->chg1, needs_cr, 1,
dest ? dest + size : NULL);
- if (style == XDL_MERGE_DIFF3) {
+ if (style == XDL_MERGE_DIFF3 || style == XDL_MERGE_ZEALOUS_DIFF3) {
/* Shared preimage */
if (!dest) {
size += marker_size + 1 + needs_cr + marker3_size;
@@ -322,6 +322,40 @@ static int xdl_fill_merge_buffer(xdfenv_t *xe1, const char *name1,
return size;
}
+static int recmatch(xrecord_t *rec1, xrecord_t *rec2, unsigned long flags)
+{
+ return xdl_recmatch(rec1->ptr, rec1->size,
+ rec2->ptr, rec2->size, flags);
+}
+
+/*
+ * Remove any common lines from the beginning and end of the conflicted region.
+ */
+static void xdl_refine_zdiff3_conflicts(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m,
+ xpparam_t const *xpp)
+{
+ xrecord_t **rec1 = xe1->xdf2.recs, **rec2 = xe2->xdf2.recs;
+ for (; m; m = m->next) {
+ /* let's handle just the conflicts */
+ if (m->mode)
+ continue;
+
+ while(m->chg1 && m->chg2 &&
+ recmatch(rec1[m->i1], rec2[m->i2], xpp->flags)) {
+ m->chg1--;
+ m->chg2--;
+ m->i1++;
+ m->i2++;
+ }
+ while (m->chg1 && m->chg2 &&
+ recmatch(rec1[m->i1 + m->chg1 - 1],
+ rec2[m->i2 + m->chg2 - 1], xpp->flags)) {
+ m->chg1--;
+ m->chg2--;
+ }
+ }
+}
+
/*
* Sometimes, changes are not quite identical, but differ in only a few
* lines. Try hard to show only these few lines as conflicting.
@@ -482,7 +516,22 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1,
int style = xmp->style;
int favor = xmp->favor;
- if (style == XDL_MERGE_DIFF3) {
+ /*
+ * XDL_MERGE_DIFF3 does not attempt to refine conflicts by looking
+ * at common areas of sides 1 & 2, because the base (side 0) does
+ * not match and is being shown. Similarly, simplification of
+ * non-conflicts is also skipped due to the skipping of conflict
+ * refinement.
+ *
+ * XDL_MERGE_ZEALOUS_DIFF3, on the other hand, will attempt to
+ * refine conflicts looking for common areas of sides 1 & 2.
+ * However, since the base is being shown and does not match,
+ * it will only look for common areas at the beginning or end
+ * of the conflict block. Since XDL_MERGE_ZEALOUS_DIFF3's
+ * conflict refinement is much more limited in this fashion, the
+ * conflict simplification will be skipped.
+ */
+ if (style == XDL_MERGE_DIFF3 || style == XDL_MERGE_ZEALOUS_DIFF3) {
/*
* "diff3 -m" output does not make sense for anything
* more aggressive than XDL_MERGE_EAGER.
@@ -603,10 +652,12 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1,
if (!changes)
changes = c;
/* refine conflicts */
- if (XDL_MERGE_ZEALOUS <= level &&
- (xdl_refine_conflicts(xe1, xe2, changes, xpp) < 0 ||
- xdl_simplify_non_conflicts(xe1, changes,
- XDL_MERGE_ZEALOUS < level) < 0)) {
+ if (style == XDL_MERGE_ZEALOUS_DIFF3) {
+ xdl_refine_zdiff3_conflicts(xe1, xe2, changes, xpp);
+ } else if (XDL_MERGE_ZEALOUS <= level &&
+ (xdl_refine_conflicts(xe1, xe2, changes, xpp) < 0 ||
+ xdl_simplify_non_conflicts(xe1, changes,
+ XDL_MERGE_ZEALOUS < level) < 0)) {
xdl_cleanup_merge(changes);
return -1;
}
@@ -633,42 +684,42 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1,
int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
xmparam_t const *xmp, mmbuffer_t *result)
{
- xdchange_t *xscr1, *xscr2;
+ xdchange_t *xscr1 = NULL, *xscr2 = NULL;
xdfenv_t xe1, xe2;
- int status;
+ int status = -1;
xpparam_t const *xpp = &xmp->xpp;
result->ptr = NULL;
result->size = 0;
- if (xdl_do_diff(orig, mf1, xpp, &xe1) < 0) {
+ if (xdl_do_diff(orig, mf1, xpp, &xe1) < 0)
return -1;
- }
- if (xdl_do_diff(orig, mf2, xpp, &xe2) < 0) {
- xdl_free_env(&xe1);
- return -1;
- }
+
+ if (xdl_do_diff(orig, mf2, xpp, &xe2) < 0)
+ goto free_xe1; /* avoid double free of xe2 */
+
if (xdl_change_compact(&xe1.xdf1, &xe1.xdf2, xpp->flags) < 0 ||
xdl_change_compact(&xe1.xdf2, &xe1.xdf1, xpp->flags) < 0 ||
- xdl_build_script(&xe1, &xscr1) < 0) {
- xdl_free_env(&xe1);
- return -1;
- }
+ xdl_build_script(&xe1, &xscr1) < 0)
+ goto out;
+
if (xdl_change_compact(&xe2.xdf1, &xe2.xdf2, xpp->flags) < 0 ||
xdl_change_compact(&xe2.xdf2, &xe2.xdf1, xpp->flags) < 0 ||
- xdl_build_script(&xe2, &xscr2) < 0) {
- xdl_free_script(xscr1);
- xdl_free_env(&xe1);
- xdl_free_env(&xe2);
- return -1;
- }
- status = 0;
+ xdl_build_script(&xe2, &xscr2) < 0)
+ goto out;
+
if (!xscr1) {
result->ptr = xdl_malloc(mf2->size);
+ if (!result->ptr)
+ goto out;
+ status = 0;
memcpy(result->ptr, mf2->ptr, mf2->size);
result->size = mf2->size;
} else if (!xscr2) {
result->ptr = xdl_malloc(mf1->size);
+ if (!result->ptr)
+ goto out;
+ status = 0;
memcpy(result->ptr, mf1->ptr, mf1->size);
result->size = mf1->size;
} else {
@@ -676,11 +727,13 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
&xe2, xscr2,
xmp, result);
}
+ out:
xdl_free_script(xscr1);
xdl_free_script(xscr2);
- xdl_free_env(&xe1);
xdl_free_env(&xe2);
+ free_xe1:
+ xdl_free_env(&xe1);
return status;
}
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
index c5d48e8..1a21c6a 100644
--- a/xdiff/xpatience.c
+++ b/xdiff/xpatience.c
@@ -198,7 +198,7 @@ static int binary_search(struct entry **sequence, int longest,
* item per sequence length: the sequence with the smallest last
* element (in terms of line2).
*/
-static struct entry *find_longest_common_sequence(struct hashmap *map)
+static int find_longest_common_sequence(struct hashmap *map, struct entry **res)
{
struct entry **sequence = xdl_malloc(map->nr * sizeof(struct entry *));
int longest = 0, i;
@@ -211,6 +211,9 @@ static struct entry *find_longest_common_sequence(struct hashmap *map)
*/
int anchor_i = -1;
+ if (!sequence)
+ return -1;
+
for (entry = map->first; entry; entry = entry->next) {
if (!entry->line2 || entry->line2 == NON_UNIQUE)
continue;
@@ -230,8 +233,9 @@ static struct entry *find_longest_common_sequence(struct hashmap *map)
/* No common unique lines were found */
if (!longest) {
+ *res = NULL;
xdl_free(sequence);
- return NULL;
+ return 0;
}
/* Iterate starting at the last element, adjusting the "next" members */
@@ -241,8 +245,9 @@ static struct entry *find_longest_common_sequence(struct hashmap *map)
entry->previous->next = entry;
entry = entry->previous;
}
+ *res = entry;
xdl_free(sequence);
- return entry;
+ return 0;
}
static int match(struct hashmap *map, int line1, int line2)
@@ -358,14 +363,16 @@ static int patience_diff(mmfile_t *file1, mmfile_t *file2,
return 0;
}
- first = find_longest_common_sequence(&map);
+ result = find_longest_common_sequence(&map, &first);
+ if (result)
+ goto out;
if (first)
result = walk_common_sequence(&map, first,
line1, count1, line2, count2);
else
result = fall_back_to_classic_diff(&map,
line1, count1, line2, count2);
-
+ out:
xdl_free(map.entries);
return result;
}
@@ -373,10 +380,6 @@ static int patience_diff(mmfile_t *file1, mmfile_t *file2,
int xdl_do_patience_diff(mmfile_t *file1, mmfile_t *file2,
xpparam_t const *xpp, xdfenv_t *env)
{
- if (xdl_prepare_env(file1, file2, xpp, env) < 0)
- return -1;
-
- /* environment is cleaned up in xdl_diff() */
return patience_diff(file1, file2, xpp, env,
1, env->xdf1.nrec, 1, env->xdf2.nrec);
}
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index abeb8fb..1057527 100644
--- a/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
@@ -181,18 +181,14 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
if (!(recs = (xrecord_t **) xdl_malloc(narec * sizeof(xrecord_t *))))
goto abort;
- if (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF)
- hbits = hsize = 0;
- else {
- hbits = xdl_hashbits((unsigned int) narec);
- hsize = 1 << hbits;
- if (!(rhash = (xrecord_t **) xdl_malloc(hsize * sizeof(xrecord_t *))))
- goto abort;
- memset(rhash, 0, hsize * sizeof(xrecord_t *));
- }
+ hbits = xdl_hashbits((unsigned int) narec);
+ hsize = 1 << hbits;
+ if (!(rhash = (xrecord_t **) xdl_malloc(hsize * sizeof(xrecord_t *))))
+ goto abort;
+ memset(rhash, 0, hsize * sizeof(xrecord_t *));
nrec = 0;
- if ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) {
+ if ((cur = blk = xdl_mmfile_first(mf, &bsize))) {
for (top = blk + bsize; cur < top; ) {
prev = cur;
hav = xdl_hash_record(&cur, top, xpp->flags);
@@ -208,9 +204,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
crec->size = (long) (cur - prev);
crec->ha = hav;
recs[nrec++] = crec;
-
- if ((XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF) &&
- xdl_classify_record(pass, cf, rhash, hbits, crec) < 0)
+ if (xdl_classify_record(pass, cf, rhash, hbits, crec) < 0)
goto abort;
}
}
@@ -219,10 +213,13 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
goto abort;
memset(rchg, 0, (nrec + 2) * sizeof(char));
- if (!(rindex = (long *) xdl_malloc((nrec + 1) * sizeof(long))))
- goto abort;
- if (!(ha = (unsigned long *) xdl_malloc((nrec + 1) * sizeof(unsigned long))))
- goto abort;
+ if ((XDF_DIFF_ALG(xpp->flags) != XDF_PATIENCE_DIFF) &&
+ (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF)) {
+ if (!(rindex = xdl_malloc((nrec + 1) * sizeof(*rindex))))
+ goto abort;
+ if (!(ha = xdl_malloc((nrec + 1) * sizeof(*ha))))
+ goto abort;
+ }
xdf->nrec = nrec;
xdf->recs = recs;
@@ -279,8 +276,7 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
enl1 = xdl_guess_lines(mf1, sample) + 1;
enl2 = xdl_guess_lines(mf2, sample) + 1;
- if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF &&
- xdl_init_classifier(&cf, enl1 + enl2 + 1, xpp->flags) < 0)
+ if (xdl_init_classifier(&cf, enl1 + enl2 + 1, xpp->flags) < 0)
return -1;
if (xdl_prepare_ctx(1, mf1, enl1, xpp, &cf, &xe->xdf1) < 0) {
@@ -305,8 +301,7 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
return -1;
}
- if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF)
- xdl_free_classifier(&cf);
+ xdl_free_classifier(&cf);
return 0;
}
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index cfa6e22..115b2b1 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -122,7 +122,7 @@ long xdl_guess_lines(mmfile_t *mf, long sample) {
long nl = 0, size, tsize = 0;
char const *data, *cur, *top;
- if ((cur = data = xdl_mmfile_first(mf, &size)) != NULL) {
+ if ((cur = data = xdl_mmfile_first(mf, &size))) {
for (top = data + size; nl < sample && cur < top; ) {
nl++;
if (!(cur = memchr(cur, '\n', top - cur)))
